From a15f658ed0840dc7d8e47d4c2c91aa35bdc0a96c Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 15 Dec 2019 20:52:31 +0100 Subject: [PATCH 001/480] odhcpd: update to latest git HEAD d60f0a6 treewide: optimize syslog priority values Signed-off-by: Hans Dedecker --- package/network/services/odhcpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 13a2f262fb..9994b6f6f6 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git -PKG_SOURCE_DATE:=2019-10-13 -PKG_SOURCE_VERSION:=9a4531a4313c4b32a9ffae92c00a59a4d4b738a8 -PKG_MIRROR_HASH:=08ae6b130669cd269134ccf68c5fe8dd4b95743e7dd8221eb8280056c8cdc6bc +PKG_SOURCE_DATE:=2019-12-15 +PKG_SOURCE_VERSION:=d60f0a6284e8f5fac733a1b269ea614ccdf47fcd +PKG_MIRROR_HASH:=4fb653528ecab08e6ba5aa3f9af020c856d3b4b99d44352552df96b944606154 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 From 6ec288a178de37c30831398f5a470fdc43b18130 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 14 Dec 2019 23:38:02 +0100 Subject: [PATCH 002/480] mac80211: fix txpower when using DFS channels With this patch, txpower for the PHY is applied when configuring the PHY instead of the VIF. Otherwise, the configured txpower is not applied for the first initialized VIF when using DFS channels, as it is currently applied too early when the CAC hasn't finished. Reported-by: Martin Weinelt Tested-by: Martin Weinelt --- .../mac80211/files/lib/netifd/wireless/mac80211.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 18033e9d56..f1882ec509 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -743,7 +743,7 @@ mac80211_setup_vif() { json_select config json_get_vars mode - json_get_var vif_txpower txpower + json_get_var vif_txpower json_get_var vif_enable enable 1 [ "$vif_enable" = 1 ] || action=down @@ -753,7 +753,6 @@ mac80211_setup_vif() { json_select .. return } - set_default vif_txpower "$txpower" [ -z "$vif_txpower" ] || iw dev "$ifname" set txpower fixed "${vif_txpower%%.*}00" case "$mode" in @@ -908,6 +907,12 @@ drv_mac80211_setup() { iw phy "$phy" set antenna_gain $antenna_gain iw phy "$phy" set distance "$distance" + if [ -n "$txpower" ]; then + iw phy "$phy" set txpower fixed "${txpower%%.*}00" + else + iw phy "$phy" set txpower auto + fi + [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}" [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}" From 9e1e4324690ecf3874acfab76566e856f133bf6f Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 14 Dec 2019 19:15:21 +0100 Subject: [PATCH 003/480] ar71xx: indicate upgrade using system LED This enables the system LED to indicate a running firmware upgrade. This pattern is used on most platforms provided by the generic base-files package. ar71xx uses it's own implementation for the system-LED, where the upgrade case is not yet implemented. Signed-off-by: David Bauer --- target/linux/ar71xx/base-files/etc/diag.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 8ff75627a5..c5fe5bdcc1 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -575,6 +575,9 @@ set_state() { preinit_regular) status_led_blink_preinit_regular ;; + upgrade) + status_led_blink_preinit_regular + ;; done) status_led_on case $(board_name) in From 762aac50c09cca494bbc8cfbe8aff967f39ce8cd Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 17 Dec 2019 08:33:33 +0100 Subject: [PATCH 004/480] rpcd: update to latest Git HEAD aaa0836 file: extend exec acl checks to commands with arguments Signed-off-by: Jo-Philipp Wich --- package/system/rpcd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index b0cf7fa24b..853554b5a0 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -12,10 +12,10 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git -PKG_SOURCE_DATE:=2019-11-10 -PKG_SOURCE_VERSION:=77ad0de09247b9bdce50f4cecf3e5beb5636f57f +PKG_SOURCE_DATE:=2019-12-10 +PKG_SOURCE_VERSION:=aaa08366e6384d9933a405d1218b03c1b167f9e5 PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=d36caff85bebbf7fb1b512359243bdbb7d9b16140e0d631afae9de2c3b8e4dff +PKG_MIRROR_HASH:=9b126ab4af26e5bd16e21175ccc24318e0a98afaf60f14199cebd4ec50ed2d8f PKG_LICENSE:=ISC PKG_LICENSE_FILES:= From 8007853f79b83766088dd4cfa8610d19a3f270ef Mon Sep 17 00:00:00 2001 From: Birger Koblitz Date: Mon, 16 Dec 2019 13:55:03 +0100 Subject: [PATCH 005/480] ramips: remove unnecessary nodes in DTS for Edimax RG21S This sdhci and i2c nodes were copy-pasted, but are not needed as the device does not provide that functionality. Remove them. Signed-off-by: Birger Koblitz [added commit title/message, split patch] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7621_edimax_rg21s.dts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index 6ed08413c1..3d88d588ac 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -21,12 +21,6 @@ bootargs = "console=ttyS0,57600"; }; - palmbus: palmbus@1E000000 { - i2c@900 { - status = "okay"; - }; - }; - keys { compatible = "gpio-keys"; @@ -68,10 +62,6 @@ }; }; -&sdhci { - status = "okay"; -}; - &spi0 { status = "okay"; From c79df949abd075b39bfcfc8839feb05f16930e78 Mon Sep 17 00:00:00 2001 From: Birger Koblitz Date: Mon, 16 Dec 2019 13:57:44 +0100 Subject: [PATCH 006/480] ramips: increase SPI frequency for Edimax RG21S This increases SPI frequency from the relatively low 10 MHz to 40 MHz. Signed-off-by: Birger Koblitz [added commit title/message, split patch] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7621_edimax_rg21s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index 3d88d588ac..be38beef12 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -68,7 +68,7 @@ flash@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <10000000>; + spi-max-frequency = <40000000>; partitions { compatible = "fixed-partitions"; From 2708d58c1d7b9b224d02ee36f531fe24a2112360 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 16 Dec 2019 14:01:41 +0100 Subject: [PATCH 007/480] ramips: add label MAC address for Edimax RG21S The Edimax RG21S has a label which bears two MAC addresses: 2.4 GHz (n) and 5 GHz (n+1) The complete MAC address setup is as follows: 2.4 GHz *:83 factory 0x4, u-boot-env wlanaddr 5 GHz *:84 factory 0x8004 LAN *:83 u-boot-env ethaddr WAN *:85 u-boot-env wanaddr Since 2.4 GHz is the first address on the label and the same as used for ethernet, take this one for label MAC address. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 5c6b5659cb..aad9a60bfe 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -201,6 +201,7 @@ ramips_setup_macs() edimax,rg21s) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) + label_mac=$(mtd_get_mac_binary factory 0x4) ;; hiwifi,hc5962) lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ") From 01d39cd18c4035e362f179548cd2c051aac03042 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 15 Dec 2019 18:16:55 +0900 Subject: [PATCH 008/480] ath79: migrate LED paths of TL-WDR4300 board TL-WDR4300 board uses only green LED names in DTSI. This patch adds migration for them. The actual LED colors on the devices have been reported to vary across subrevisions (v1.x). Despite, the USB LEDs on the back might have different color than the other LEDs on the front. Signed-off-by: Sungbo Eo [extended commit message] Signed-off-by: Adrian Schmutzler --- .../generic/base-files/etc/uci-defaults/04_led_migration | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration index b23e5f7db6..c8301d0769 100644 --- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration @@ -20,7 +20,10 @@ tplink,archer-c7-v4|\ tplink,archer-c7-v5) migrate_leds "^$boardonly:=tp-link:" ;; -tplink,archer-c7-v2) +tplink,archer-c7-v2|\ +tplink,tl-wdr3600-v1|\ +tplink,tl-wdr4300-v1|\ +tplink,tl-wdr4300-v1-il) migrate_leds ":blue:=:green:" ;; tplink,re355-v1) From 38bdfcdb87e9b3a1232e9820bd6534da4c28282b Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Fri, 27 Sep 2019 00:16:33 +0900 Subject: [PATCH 009/480] ramips: add support for ipTIME A104ns ipTIME A104ns is a 2.4/5GHz band AC750 router, based on MediaTek MT7620A. Specifications: - SoC: MT7620A - RAM: DDR2 64MB - Flash: SPI NOR 8MB - WiFi: - 2.4GHz: SoC internal - 5GHz: MT7610EN - Ethernet: 5x 10/100Mbps - Switch: SoC internal - USB: 1x 2.0 - UART: - J2: 3.3V, TX, RX, GND (3.3V is the square pad) / 57600 8N1 Installation via web interface: 1. Flash **initramfs** image through the stock web interface. 2. Boot into OpenWrt and perform sysupgrade with sysupgrade image. Revert to stock firmware: 1. Perform sysupgrade with stock image. In contrast to to-be-supported A1004ns, the A104ns has no usable value in 0x1fc40 (uboot), so wan_mac needs to be calculated. Also note that GPIOs for the LEDs really are inverted compared to the A1004ns. Signed-off-by: Sungbo Eo [moved state_default to device DTS, reordered properties in wmac, added comment about wan_mac and LED GPIOs] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_iptime.dtsi | 86 +++++++++++++++++++ .../ramips/dts/mt7620a_iptime_a104ns.dts | 59 +++++++++++++ target/linux/ramips/image/mt7620.mk | 10 +++ .../mt7620/base-files/etc/board.d/02_network | 7 ++ 4 files changed, 162 insertions(+) create mode 100644 target/linux/ramips/dts/mt7620a_iptime.dtsi create mode 100644 target/linux/ramips/dts/mt7620a_iptime_a104ns.dts diff --git a/target/linux/ramips/dts/mt7620a_iptime.dtsi b/target/linux/ramips/dts/mt7620a_iptime.dtsi new file mode 100644 index 0000000000..5a6fdacb52 --- /dev/null +++ b/target/linux/ramips/dts/mt7620a_iptime.dtsi @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7620a.dtsi" + +#include +#include + +/ { + aliases { + label-mac-device = ðernet; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + partition@20000 { + label = "config"; + reg = <0x20000 0x10000>; + read-only; + }; + + firmware: partition@30000 { + compatible = "denx,uimage"; + label = "firmware"; + }; + }; + }; +}; + +ðernet { + mtd-mac-address = <&uboot 0x1fc20>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&uboot 0x1f800>; + ieee80211-freq-limit = <5000000 6000000>; + + led { + led-sources = <0>; + led-active-low; + }; + }; +}; + +&wmac { + pinctrl-names = "default"; + pinctrl-0 = <&wled_pins>; + + ralink,mtd-eeprom = <&uboot 0x1f400>; +}; diff --git a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts new file mode 100644 index 0000000000..14b5071007 --- /dev/null +++ b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7620a_iptime.dtsi" + +/ { + compatible = "iptime,a104ns", "ralink,mt7620a-soc"; + model = "ipTIME A104ns"; + + aliases { + led-boot = &led_cpu; + led-failsafe = &led_cpu; + led-running = &led_cpu; + led-upgrade = &led_cpu; + }; + + leds { + compatible = "gpio-leds"; + + usb { + label = "a104ns:blue:usb"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port1>, <&ehci_port1>; + linux,default-trigger = "usbport"; + }; + + led_cpu: cpu { + label = "a104ns:blue:cpu"; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + wps { + label = "wps"; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&firmware { + reg = <0x30000 0x7d0000>; +}; + +&state_default { + gpio { + ralink,group = "uartf", "spi refclk"; + ralink,function = "gpio"; + }; +}; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 8aea7f05f1..e8169c2294 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -494,6 +494,16 @@ define Device/iodata_wn-ac733gr3 endef TARGET_DEVICES += iodata_wn-ac733gr3 +define Device/iptime_a104ns + MTK_SOC := mt7620a + IMAGE_SIZE := 8000k + UIMAGE_NAME := a104ns + DEVICE_VENDOR := ipTIME + DEVICE_MODEL := A104ns + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport +endef +TARGET_DEVICES += iptime_a104ns + define Device/kimax_u25awf-h1 MTK_SOC := mt7620a IMAGE_SIZE := 16064k diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index 20846ef202..852336f811 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -139,6 +139,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch1" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" ;; + iptime,a104ns) + ucidef_add_switch "switch0" \ + "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" + ;; kingston,mlw221) ucidef_set_interface_lan "eth0.2" ;; @@ -301,6 +305,9 @@ ramips_setup_macs() iodata,wn-ac733gr3) wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) ;; + iptime,a104ns) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary u-boot 0x1fc20)" 2) + ;; lenovo,newifi-y1|\ lenovo,newifi-y1s|\ ohyeah,oy-0001|\ From f45a16dead15169f06a999f71061e66df1fc478c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 16 Dec 2019 18:07:03 +0100 Subject: [PATCH 010/480] ramips: allow to set switchdev by board in ramips_set_preinit_iface This adds the option to determine switchdev by board when setting preinit iface for failsafe. The patch reorganizes the code to use functions for setting correct switchdev based on SOC and board, which is supposed to improve readability and maintainability. In this patch, the ramips_switchdev_from_board function is added without specifying an actual device using it. This is meant to make the life of device supporters waiting for merge easier, as there is less to rebase and keep track of. Signed-off-by: Adrian Schmutzler --- .../lib/preinit/07_set_preinit_iface_ramips | 67 +++++++++++++------ 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips index 003a4dda7b..68c1285eb4 100644 --- a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips +++ b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips @@ -3,27 +3,54 @@ # Copyright (C) 2013 OpenWrt.org # -ramips_set_preinit_iface() { - RT3X5X=$(grep -E "(RT3.5|RT5350|MT7628|MT7688|MT7620|MT7621)" /proc/cpuinfo) +. /lib/functions.sh - if [ -n "${RT3X5X}" ]; then - # The ethernet switch driver enables VLAN by default, but - # failsafe uses eth0, making the device unreachable: - # https://dev.openwrt.org/ticket/18768 - case "${RT3X5X}" in - *MT7620*) - ralink_switchdev=mt7620 - ;; - *MT7621*) - ralink_switchdev=mt7530 - ;; - *) - ralink_switchdev=rt305x - ;; - esac - swconfig dev $ralink_switchdev set reset 1 - swconfig dev $ralink_switchdev set enable_vlan 0 - swconfig dev $ralink_switchdev set apply 1 +ramips_switchdev_from_soc() { + # The ethernet switch driver enables VLAN by default, but + # failsafe uses eth0, making the device unreachable: + # https://dev.openwrt.org/ticket/18768 + + local switchdev + local RT3X5X=$(grep -E "(RT3.5|RT5350|MT7628|MT7688|MT7620|MT7621)" /proc/cpuinfo) + + [ -n "$RT3X5X" ] || return 1 + + case "$RT3X5X" in + *MT7620*) + switchdev=mt7620 + ;; + *MT7621*) + switchdev=mt7530 + ;; + *) + switchdev=rt305x + ;; + esac + + echo "$switchdev" +} + +ramips_switchdev_from_board() { + # For these devices, external ethernet switch should be used + # instead of the SoC internal switch. + + local switchdev + local board=$(board_name) + + case "$board" in + esac + + echo "$switchdev" +} + +ramips_set_preinit_iface() { + local switchdev=$(ramips_switchdev_from_board) + [ -n "$switchdev" ] || switchdev=$(ramips_switchdev_from_soc) + + if [ -n "$switchdev" ]; then + swconfig dev $switchdev set reset 1 + swconfig dev $switchdev set enable_vlan 0 + swconfig dev $switchdev set apply 1 fi ifname=eth0 From 27d69d25612e857268492678b86aa88e8ea924ac Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Tue, 17 Dec 2019 05:59:28 -0800 Subject: [PATCH 011/480] uboot-envtools: check for config prior to append In the rare event a pre-populated fw_env.config exists in the rootfs prior to firstboot, calling fw_setenv after the system has initialised will annihilate the devices environment due to two identical lines in fw_env.config. Check for existence prior to blind appendage. Signed-off-by: Imran Khan Signed-off-by: Daniel Golle [daniel@makrotopia.org: fixed patch format, improved grep, cosmetics] --- package/boot/uboot-envtools/Makefile | 2 +- package/boot/uboot-envtools/files/uboot-envtools.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index f880698e9c..1c6b789716 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot PKG_VERSION:=2019.07 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.xz diff --git a/package/boot/uboot-envtools/files/uboot-envtools.sh b/package/boot/uboot-envtools/files/uboot-envtools.sh index e21b283677..9218bc4e39 100644 --- a/package/boot/uboot-envtools/files/uboot-envtools.sh +++ b/package/boot/uboot-envtools/files/uboot-envtools.sh @@ -31,6 +31,6 @@ ubootenv_add_app_config() { config_get envsize "$1" envsize config_get secsize "$1" secsize config_get numsec "$1" numsec - echo "$dev $offset $envsize $secsize $numsec" >>/etc/fw_env.config + grep -q "^[[:space:]]*${dev}[[:space:]]*${offset}" /etc/fw_env.config || echo "$dev $offset $envsize $secsize $numsec" >>/etc/fw_env.config } From e332453857c76669072f309ec552fe8f1e192ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 4 Sep 2019 17:20:36 +0200 Subject: [PATCH 012/480] cypress-firmware: add new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package contains firmwares provided by Cypress See https://community.cypress.com/community/linux Signed-off-by: Álvaro Fernández Rojas --- package/firmware/cypress-firmware/Makefile | 239 +++++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 package/firmware/cypress-firmware/Makefile diff --git a/package/firmware/cypress-firmware/Makefile b/package/firmware/cypress-firmware/Makefile new file mode 100644 index 0000000000..40aab06c98 --- /dev/null +++ b/package/firmware/cypress-firmware/Makefile @@ -0,0 +1,239 @@ +# +# Copyright (C) 2019 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +UNPACK_CMD=unzip -q -p $(DL_DIR)/$(PKG_SOURCE) $(PKG_SOURCE_UNZIP) | gzip -dc | $(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +PKG_NAME:=cypress-firmware +PKG_VERSION:=v4.14.77-2019_1031 + +PKG_SOURCE_UNZIP:=cypress-firmware-$(PKG_VERSION).tar.gz +PKG_SOURCE:=cypress-fmac-$(PKG_VERSION).zip +PKG_SOURCE_URL:=https://community.cypress.com/servlet/JiveServlet/download/17441-2-50210/ +PKG_HASH:=bc2eec0d144a88e3105a06cac8039a7f13becde67dfe2a86793ba66f6a2510e0 + +PKG_MAINTAINER:=Álvaro Fernández Rojas + +include $(INCLUDE_DIR)/package.mk + +define Package/cypress-firmware-default + SECTION:=firmware + CATEGORY:=Firmware + URL:=https://community.cypress.com/community/linux +endef + +define Build/Compile + true +endef + +# Cypress 43340 SDIO Firmware +define Package/cypress-firmware-43340-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW43340 FullMac SDIO firmware +endef + +define Package/cypress-firmware-43340-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac43340-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac43340-sdio.bin +endef + +$(eval $(call BuildPackage,cypress-firmware-43340-sdio)) + +# Cypress 43362 SDIO Firmware +define Package/cypress-firmware-43362-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW43362 FullMac SDIO firmware +endef + +define Package/cypress-firmware-43362-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac43362-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac43362-sdio.bin +endef + +$(eval $(call BuildPackage,cypress-firmware-43362-sdio)) + +# Cypress 4339 SDIO Firmware +define Package/cypress-firmware-4339-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW4339 FullMac SDIO firmware +endef + +define Package/cypress-firmware-4339-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4339-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac4339-sdio.bin +endef + +$(eval $(call BuildPackage,cypress-firmware-4339-sdio)) + +# Cypress 43430 SDIO Firmware +define Package/cypress-firmware-43430-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW43430 FullMac SDIO firmware +endef + +define Package/cypress-firmware-43430-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac43430-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac43430-sdio.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-43430-sdio)) + +# Cypress 43455 SDIO Firmware +define Package/cypress-firmware-43455-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW43455 FullMac SDIO firmware +endef + +define Package/cypress-firmware-43455-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac43455-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac43455-sdio.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-43455-sdio)) + +# Cypress 4354 SDIO Firmware +define Package/cypress-firmware-4354-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW4354 FullMac SDIO firmware +endef + +define Package/cypress-firmware-4354-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4354-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac4354-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4354-sdio.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4354-sdio.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4354-sdio)) + +# Cypress 4356 PCIe Firmware +define Package/cypress-firmware-4356-pcie + $(Package/cypress-firmware-default) + TITLE:=CYW4356 FullMac PCIe firmware +endef + +define Package/cypress-firmware-4356-pcie/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4356-pcie.bin \ + $(1)/lib/firmware/brcm/brcmfmac4356-pcie.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4356-pcie.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4356-pcie.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4356-pcie)) + +# Cypress 4356 SDIO Firmware +define Package/cypress-firmware-4356-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW4356 FullMac SDIO firmware +endef + +define Package/cypress-firmware-4356-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4356-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac4356-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4356-sdio.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4356-sdio.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4356-sdio)) + +# Cypress 4359 PCIe Firmware +define Package/cypress-firmware-4359-pcie + $(Package/cypress-firmware-default) + TITLE:=CYW4359 FullMac PCIe firmware +endef + +define Package/cypress-firmware-4359-pcie/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4359-pcie.bin \ + $(1)/lib/firmware/brcm/brcmfmac4359-pcie.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4359-pcie.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4359-pcie.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4359-pcie)) + +# Cypress 4359 SDIO Firmware +define Package/cypress-firmware-4359-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW4359 FullMac SDIO firmware +endef + +define Package/cypress-firmware-4359-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4359-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac4359-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4359-sdio.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4359-sdio.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4359-sdio)) + +# Cypress 4373 SDIO Firmware +define Package/cypress-firmware-4373-sdio + $(Package/cypress-firmware-default) + TITLE:=CYW4373 FullMac SDIO firmware +endef + +define Package/cypress-firmware-4373-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4373-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac4373-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4373-sdio.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4373-sdio.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4373-sdio)) + +# Cypress 4373 USB Firmware +define Package/cypress-firmware-4373-usb + $(Package/cypress-firmware-default) + TITLE:=CYW4373 FullMac USB firmware +endef + +define Package/cypress-firmware-4373-usb/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4373-usb.bin \ + $(1)/lib/firmware/brcm/brcmfmac4373-usb.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/firmware/brcmfmac4373.clm_blob \ + $(1)/lib/firmware/brcm/brcmfmac4373.clm_blob +endef + +$(eval $(call BuildPackage,cypress-firmware-4373-usb)) From efe15993d38535cc2f3bdafde2bba728789257cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 4 Sep 2019 17:22:54 +0200 Subject: [PATCH 013/480] brcm2708: switch to cypress-firmware package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- target/linux/brcm2708/image/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index db2b3b5562..057b89d267 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -82,7 +82,7 @@ define Device/rpi raspberrypi,compute-module raspberrypi,compute-module-1 \ raspberrypi,model-zero raspberrypi,model-zero-w DEVICE_PACKAGES := \ - brcmfmac-firmware-43430-sdio \ + cypress-firmware-43430-sdio \ brcmfmac-firmware-43430-sdio-rpi-zero-w \ kmod-brcmfmac wpad-basic endef @@ -104,9 +104,9 @@ define Device/rpi-2 raspberrypi,3-compute-module raspberrypi,compute-module-3 \ raspberrypi,4-model-b DEVICE_PACKAGES := \ - brcmfmac-firmware-43430-sdio \ + cypress-firmware-43430-sdio \ brcmfmac-firmware-43430-sdio-rpi-3b \ - brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \ + cypress-firmware-43455-sdio \ brcmfmac-firmware-43455-sdio-rpi-3b-plus brcmfmac-firmware-43455-sdio-rpi-4b \ kmod-brcmfmac wpad-basic IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata @@ -129,9 +129,9 @@ define Device/rpi-3 raspberrypi,3-model-b raspberrypi,3-model-b-plus \ raspberrypi,3-compute-module raspberrypi,compute-module-3 DEVICE_PACKAGES := \ - brcmfmac-firmware-43430-sdio \ + cypress-firmware-43430-sdio \ brcmfmac-firmware-43430-sdio-rpi-3b \ - brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \ + cypress-firmware-43455-sdio \ brcmfmac-firmware-43455-sdio-rpi-3b-plus \ kmod-brcmfmac wpad-basic endef @@ -146,7 +146,7 @@ define Device/rpi-4 SUPPORTED_DEVICES := \ raspberrypi,4-model-b DEVICE_PACKAGES := \ - brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \ + cypress-firmware-43455-sdio \ brcmfmac-firmware-43455-sdio-rpi-4b \ kmod-brcmfmac wpad-basic IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata From 1115c9aad3d5ecba0cf75ce16118c30919f94e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 4 Sep 2019 17:32:08 +0200 Subject: [PATCH 014/480] brcmfmac-board-rpi: remove uneeded package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- package/firmware/brcmfmac-board-rpi/Makefile | 53 -------------------- 1 file changed, 53 deletions(-) delete mode 100644 package/firmware/brcmfmac-board-rpi/Makefile diff --git a/package/firmware/brcmfmac-board-rpi/Makefile b/package/firmware/brcmfmac-board-rpi/Makefile deleted file mode 100644 index e622280ba8..0000000000 --- a/package/firmware/brcmfmac-board-rpi/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=brcmfmac-board-rpi -PKG_VERSION:=2018-03-12 -PKG_RELEASE:=86e88fbf0345da49555d0ec34c80b4fbae7d0cd3 -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/package.mk - -BRCMFMAC434XX_SDIO_URL:=@GITHUB/RPi-Distro/firmware-nonfree/$(PKG_RELEASE)/brcm/ -BRCMFMAC43455_SDIO_FILE:=brcmfmac43455-sdio-$(PKG_RELEASE) - -define Download/brcmfmac43455_sdio_clm_blob - FILE:=$(BRCMFMAC43455_SDIO_FILE).clm_blob - URL:=$(BRCMFMAC434XX_SDIO_URL) - URL_FILE:=brcmfmac43455-sdio.clm_blob - HASH:=8e2250518bc789e53109728c3c0a6124bc3801a75a1cb4966125753cf1f0252e -endef -$(eval $(call Download,brcmfmac43455_sdio_clm_blob)) - -define Package/brcmfmac-board-rpi/Default - SECTION:=firmware - CATEGORY:=Firmware - URL:=https://github.com/RPi-Distro/firmware-nonfree/ - DEPENDS:=@TARGET_brcm2708 - PKGARCH:=all -endef - -define Package/brcmfmac-firmware-43455-clm_blob - $(call Package/brcmfmac-board-rpi/Default) - TITLE:=BCM43455 RPi SDIO Localisation Blob -endef - -define Package/brcmfmac-firmware-43455-clm_blob/description - Localisation blob for the Broadcom BCM43455 on RPi boards. -endef - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - cp $(DL_DIR)/$(BRCMFMAC43455_SDIO_FILE).clm_blob $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob -endef - -define Build/Compile - true -endef - -define Package/brcmfmac-firmware-43455-clm_blob/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob $(1)/lib/firmware/brcm/ -endef - -$(eval $(call BuildPackage,brcmfmac-firmware-43455-clm_blob)) From ca7ed1712e1213467aa915a84b329d67b717932f Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Tue, 17 Dec 2019 14:10:13 +0000 Subject: [PATCH 015/480] wireguard: bump to 0.0.20191212 1ec6ece version: bump snapshot e13de91 main: remove unused include 72eb17c wg-quick: linux: support older nft(8) 1d8e978 global: fix up spelling e02713e wg-quick: linux: add support for nft and prefer it b4e3a83 compat: support building for RHEL-8.1 instead of RHEL-8.0 f29e3ac socket: convert to ipv6_dst_lookup_flow for 5.5 Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 7aac5566da..075f416408 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20191205 +PKG_VERSION:=0.0.20191212 PKG_RELEASE:=1 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ -PKG_HASH:=4de4c0efa35f8eb170c27a0bc8977e5c0634b8e19c03915d03218cc88bb0adbe +PKG_HASH:=b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071 PKG_LICENSE:=GPL-2.0 Apache-2.0 PKG_LICENSE_FILES:=COPYING From 859fac2b93c6faff11c76bf7f0c85ec98fa833fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 4 Sep 2019 17:21:26 +0200 Subject: [PATCH 016/480] cypress-nvram: add new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package contains nvram files for brcmfmac, a mac80211 driver for FullMAC Cypress devices. Signed-off-by: Álvaro Fernández Rojas --- package/firmware/cypress-nvram/Makefile | 95 +++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 package/firmware/cypress-nvram/Makefile diff --git a/package/firmware/cypress-nvram/Makefile b/package/firmware/cypress-nvram/Makefile new file mode 100644 index 0000000000..418a2b0d7e --- /dev/null +++ b/package/firmware/cypress-nvram/Makefile @@ -0,0 +1,95 @@ +# +# Copyright (C) 2019 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=cypress-nvram +PKG_SOURCE_DATE:=2019-09-03 +PKG_SOURCE_VERSION:=e7b78df22f2a0c5f56abb7b5880661611de35e5f +PKG_MIRROR_HASH:=1cb20a749696852be0a512d51961365dd9c031362af0af1a2b9f5a3fb894885f +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/openwrt/cypress-nvram.git + +PKG_MAINTAINER:=Álvaro Fernández Rojas + +include $(INCLUDE_DIR)/package.mk + +define Package/cypress-nvram-default + SECTION:=firmware + CATEGORY:=Firmware + URL:=https://community.cypress.com/community/linux +endef + +define Build/Compile + true +endef + +# Cypress 43430 SDIO Raspberry Pi 3B NVRAM +define Package/cypress-nvram-43430-sdio-rpi-3b + $(Package/cypress-nvram-default) + TITLE:=CYW43430 NVRAM for Raspberry Pi 3B + DEPENDS:=@TARGET_brcm2708 +endef + +define Package/cypress-nvram-43430-sdio-rpi-3b/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt +endef + +$(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-3b)) + +# Cypress 43430 SDIO Raspberry Pi Zero W NVRAM +define Package/cypress-nvram-43430-sdio-rpi-zero-w + $(Package/cypress-nvram-default) + TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W + DEPENDS:=@TARGET_brcm2708 +endef + +define Package/cypress-nvram-43430-sdio-rpi-zero-w/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt \ + $(1)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt +endef + +$(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-zero-w)) + +# Cypress 43455 SDIO Raspberry Pi 3B+ NVRAM +define Package/cypress-nvram-43455-sdio-rpi-3b-plus + $(Package/cypress-nvram-default) + TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+ + DEPENDS:=@TARGET_brcm2708 +endef + +define Package/cypress-nvram-43455-sdio-rpi-3b-plus/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt +endef + +$(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-3b-plus)) + +# Cypress 43455 SDIO Raspberry Pi 4B NVRAM +define Package/cypress-nvram-43455-sdio-rpi-4b + $(Package/cypress-nvram-default) + TITLE:=CYW43455 NVRAM for Raspberry Pi 4B + DEPENDS:=@TARGET_brcm2708 +endef + +define Package/cypress-nvram-43455-sdio-rpi-4b/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcmfmac43455-sdio.raspberrypi,4-model-b.txt \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt +endef + +$(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-4b)) From 922b538cc955a0dd3a7a381a116fba3983c2bc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 4 Sep 2019 17:22:54 +0200 Subject: [PATCH 017/480] brcm2708: switch to cypress-nvram package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- target/linux/brcm2708/image/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 057b89d267..e5b8c8aa0b 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -83,7 +83,7 @@ define Device/rpi raspberrypi,model-zero raspberrypi,model-zero-w DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-zero-w \ + cypress-nvram-43430-sdio-rpi-zero-w \ kmod-brcmfmac wpad-basic endef ifeq ($(SUBTARGET),bcm2708) @@ -105,9 +105,9 @@ define Device/rpi-2 raspberrypi,4-model-b DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-3b \ + cypress-nvram-43430-sdio-rpi-3b \ cypress-firmware-43455-sdio \ - brcmfmac-firmware-43455-sdio-rpi-3b-plus brcmfmac-firmware-43455-sdio-rpi-4b \ + cypress-nvram-43455-sdio-rpi-3b-plus cypress-nvram-43455-sdio-rpi-4b \ kmod-brcmfmac wpad-basic IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip @@ -130,9 +130,9 @@ define Device/rpi-3 raspberrypi,3-compute-module raspberrypi,compute-module-3 DEVICE_PACKAGES := \ cypress-firmware-43430-sdio \ - brcmfmac-firmware-43430-sdio-rpi-3b \ + cypress-nvram-43430-sdio-rpi-3b \ cypress-firmware-43455-sdio \ - brcmfmac-firmware-43455-sdio-rpi-3b-plus \ + cypress-nvram-43455-sdio-rpi-3b-plus \ kmod-brcmfmac wpad-basic endef ifeq ($(SUBTARGET),bcm2710) @@ -147,7 +147,7 @@ define Device/rpi-4 raspberrypi,4-model-b DEVICE_PACKAGES := \ cypress-firmware-43455-sdio \ - brcmfmac-firmware-43455-sdio-rpi-4b \ + cypress-nvram-43455-sdio-rpi-4b \ kmod-brcmfmac wpad-basic IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata IMAGE/factory.img.gz := boot-common | boot-2711 | sdcard-img | gzip From c3aa33bf705027751b344bc668541e5d08ed9495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 19 Dec 2019 08:40:12 +0100 Subject: [PATCH 018/480] mac80211: brcm: backport 5.5 and 5.6 kernel patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update doesn't include: 3b1e0a7bdfee brcmfmac: add support for SAE authentication offload be898fed355e brcmfmac: send port authorized event for FT-802.1X due to nl80211 dependencies. Signed-off-by: Rafał Miłecki --- ...on-t-WARN-when-there-are-no-requests.patch | 28 +++++ ...suspend-resume-when-power-is-cut-off.patch | 109 ++++++++++++++++++ ...set-but-not-used-variable-mpnum-nsp-.patch | 58 ++++++++++ ...le-PCIe-interrupts-before-bus-reset.patch} | 0 ...ve-monitor-interface-when-detaching.patch} | 0 ...mory-leak-in-brcmf_p2p_create_p2pdev.patch | 29 +++++ ...-after-free-in-brcmf_sdio_readframes.patch | 31 +++++ ...-interface-carrier-to-off-by-default.patch | 29 +++++ ...-brcmfmac-fix-interface-sanity-check.patch | 40 +++++++ ...-register-wiphy-s-during-module_init.patch | 2 +- 10 files changed, 325 insertions(+), 1 deletion(-) create mode 100644 package/kernel/mac80211/patches/brcm/101-v5.5-0001-brcmfmac-don-t-WARN-when-there-are-no-requests.patch create mode 100644 package/kernel/mac80211/patches/brcm/101-v5.5-0002-brcmfmac-fix-suspend-resume-when-power-is-cut-off.patch create mode 100644 package/kernel/mac80211/patches/brcm/103-v5.5-brcmfmac-remove-set-but-not-used-variable-mpnum-nsp-.patch rename package/kernel/mac80211/patches/brcm/{100-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch => 104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch} (100%) rename package/kernel/mac80211/patches/brcm/{101-brcmfmac-remove-monitor-interface-when-detaching.patch => 105-v5.5-brcmfmac-remove-monitor-interface-when-detaching.patch} (100%) create mode 100644 package/kernel/mac80211/patches/brcm/110-v5.6-brcmfmac-Fix-memory-leak-in-brcmf_p2p_create_p2pdev.patch create mode 100644 package/kernel/mac80211/patches/brcm/111-v5.6-brcmfmac-Fix-use-after-free-in-brcmf_sdio_readframes.patch create mode 100644 package/kernel/mac80211/patches/brcm/112-v5.6-brcmfmac-set-interface-carrier-to-off-by-default.patch create mode 100644 package/kernel/mac80211/patches/brcm/113-v5.6-brcmfmac-fix-interface-sanity-check.patch diff --git a/package/kernel/mac80211/patches/brcm/101-v5.5-0001-brcmfmac-don-t-WARN-when-there-are-no-requests.patch b/package/kernel/mac80211/patches/brcm/101-v5.5-0001-brcmfmac-don-t-WARN-when-there-are-no-requests.patch new file mode 100644 index 0000000000..a1311e0a49 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/101-v5.5-0001-brcmfmac-don-t-WARN-when-there-are-no-requests.patch @@ -0,0 +1,28 @@ +From 1524cbf3621576c639405e7aabeac415f9617c8d Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Wed, 25 Sep 2019 16:44:57 +0300 +Subject: [PATCH] brcmfmac: don't WARN when there are no requests + +When n_reqs == 0 there is nothing to do so it doesn't make sense to +search for requests and issue a warning because none is found. + +Signed-off-by: Martyn Welch +Signed-off-by: Adrian Ratiu +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c +@@ -57,6 +57,10 @@ static int brcmf_pno_remove_request(stru + + mutex_lock(&pi->req_lock); + ++ /* Nothing to do if we have no requests */ ++ if (pi->n_reqs == 0) ++ goto done; ++ + /* find request */ + for (i = 0; i < pi->n_reqs; i++) { + if (pi->reqs[i]->reqid == reqid) diff --git a/package/kernel/mac80211/patches/brcm/101-v5.5-0002-brcmfmac-fix-suspend-resume-when-power-is-cut-off.patch b/package/kernel/mac80211/patches/brcm/101-v5.5-0002-brcmfmac-fix-suspend-resume-when-power-is-cut-off.patch new file mode 100644 index 0000000000..eafc96b901 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/101-v5.5-0002-brcmfmac-fix-suspend-resume-when-power-is-cut-off.patch @@ -0,0 +1,109 @@ +From e0ae4bac22effbd644add326f658a3aeeb8d45ee Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Wed, 25 Sep 2019 16:44:58 +0300 +Subject: [PATCH] brcmfmac: fix suspend/resume when power is cut off + +brcmfmac assumed the wifi device always remains powered on and thus +hardcoded the MMC_PM_KEEP_POWER flag expecting the wifi device to +remain on even during suspend/resume cycles. + +This is not always the case, some appliances cut power to everything +connected via SDIO for efficiency reasons and this leads to wifi not +being usable after coming out of suspend because the device was not +correctly reinitialized. + +So we check for the keep_power capability and if it's not present then +we remove the device and probe it again during resume to mirror what's +happening in hardware and ensure correct reinitialization in the case +when MMC_PM_KEEP_POWER is not supported. + +Suggested-by: Gustavo Padovan +Signed-off-by: Adrian Ratiu +Signed-off-by: Kalle Valo +--- + .../broadcom/brcm80211/brcmfmac/bcmsdh.c | 53 ++++++++++++++----- + 1 file changed, 39 insertions(+), 14 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +@@ -1108,7 +1108,8 @@ static int brcmf_ops_sdio_suspend(struct + struct sdio_func *func; + struct brcmf_bus *bus_if; + struct brcmf_sdio_dev *sdiodev; +- mmc_pm_flag_t sdio_flags; ++ mmc_pm_flag_t pm_caps, sdio_flags; ++ int ret = 0; + + func = container_of(dev, struct sdio_func, dev); + brcmf_dbg(SDIO, "Enter: F%d\n", func->num); +@@ -1119,19 +1120,33 @@ static int brcmf_ops_sdio_suspend(struct + bus_if = dev_get_drvdata(dev); + sdiodev = bus_if->bus_priv.sdio; + +- brcmf_sdiod_freezer_on(sdiodev); +- brcmf_sdio_wd_timer(sdiodev->bus, 0); ++ pm_caps = sdio_get_host_pm_caps(func); + +- sdio_flags = MMC_PM_KEEP_POWER; +- if (sdiodev->wowl_enabled) { +- if (sdiodev->settings->bus.sdio.oob_irq_supported) +- enable_irq_wake(sdiodev->settings->bus.sdio.oob_irq_nr); +- else +- sdio_flags |= MMC_PM_WAKE_SDIO_IRQ; ++ if (pm_caps & MMC_PM_KEEP_POWER) { ++ /* preserve card power during suspend */ ++ brcmf_sdiod_freezer_on(sdiodev); ++ brcmf_sdio_wd_timer(sdiodev->bus, 0); ++ ++ sdio_flags = MMC_PM_KEEP_POWER; ++ if (sdiodev->wowl_enabled) { ++ if (sdiodev->settings->bus.sdio.oob_irq_supported) ++ enable_irq_wake(sdiodev->settings->bus.sdio.oob_irq_nr); ++ else ++ sdio_flags |= MMC_PM_WAKE_SDIO_IRQ; ++ } ++ ++ if (sdio_set_host_pm_flags(sdiodev->func1, sdio_flags)) ++ brcmf_err("Failed to set pm_flags %x\n", sdio_flags); ++ ++ } else { ++ /* power will be cut so remove device, probe again in resume */ ++ brcmf_sdiod_intr_unregister(sdiodev); ++ ret = brcmf_sdiod_remove(sdiodev); ++ if (ret) ++ brcmf_err("Failed to remove device on suspend\n"); + } +- if (sdio_set_host_pm_flags(sdiodev->func1, sdio_flags)) +- brcmf_err("Failed to set pm_flags %x\n", sdio_flags); +- return 0; ++ ++ return ret; + } + + static int brcmf_ops_sdio_resume(struct device *dev) +@@ -1139,13 +1154,23 @@ static int brcmf_ops_sdio_resume(struct + struct brcmf_bus *bus_if = dev_get_drvdata(dev); + struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; + struct sdio_func *func = container_of(dev, struct sdio_func, dev); ++ mmc_pm_flag_t pm_caps = sdio_get_host_pm_caps(func); ++ int ret = 0; + + brcmf_dbg(SDIO, "Enter: F%d\n", func->num); + if (func->num != 2) + return 0; + +- brcmf_sdiod_freezer_off(sdiodev); +- return 0; ++ if (!(pm_caps & MMC_PM_KEEP_POWER)) { ++ /* bus was powered off and device removed, probe again */ ++ ret = brcmf_sdiod_probe(sdiodev); ++ if (ret) ++ brcmf_err("Failed to probe device on resume\n"); ++ } else { ++ brcmf_sdiod_freezer_off(sdiodev); ++ } ++ ++ return ret; + } + + static const struct dev_pm_ops brcmf_sdio_pm_ops = { diff --git a/package/kernel/mac80211/patches/brcm/103-v5.5-brcmfmac-remove-set-but-not-used-variable-mpnum-nsp-.patch b/package/kernel/mac80211/patches/brcm/103-v5.5-brcmfmac-remove-set-but-not-used-variable-mpnum-nsp-.patch new file mode 100644 index 0000000000..25b3ceb959 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/103-v5.5-brcmfmac-remove-set-but-not-used-variable-mpnum-nsp-.patch @@ -0,0 +1,58 @@ +From 7af496b9eb0433bc4cb478c9a46f85509cdb5541 Mon Sep 17 00:00:00 2001 +From: zhengbin +Date: Sat, 16 Nov 2019 15:22:47 +0800 +Subject: [PATCH] brcmfmac: remove set but not used variable + 'mpnum','nsp','nmp' + +Fixes gcc '-Wunused-but-set-variable' warning: + +drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_get_regaddr: +drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:790:5: warning: variable mpnum set but not used [-Wunused-but-set-variable] +drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_erom_scan: +drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:866:10: warning: variable nsp set but not used [-Wunused-but-set-variable] +drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_erom_scan: +drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:866:5: warning: variable nmp set but not used [-Wunused-but-set-variable] + +Reported-by: Hulk Robot +Signed-off-by: zhengbin +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +@@ -778,7 +778,6 @@ static int brcmf_chip_dmp_get_regaddr(st + { + u8 desc; + u32 val, szdesc; +- u8 mpnum = 0; + u8 stype, sztype, wraptype; + + *regbase = 0; +@@ -786,7 +785,6 @@ static int brcmf_chip_dmp_get_regaddr(st + + val = brcmf_chip_dmp_get_desc(ci, eromaddr, &desc); + if (desc == DMP_DESC_MASTER_PORT) { +- mpnum = (val & DMP_MASTER_PORT_NUM) >> DMP_MASTER_PORT_NUM_S; + wraptype = DMP_SLAVE_TYPE_MWRAP; + } else if (desc == DMP_DESC_ADDRESS) { + /* revert erom address */ +@@ -854,7 +852,7 @@ int brcmf_chip_dmp_erom_scan(struct brcm + u8 desc_type = 0; + u32 val; + u16 id; +- u8 nmp, nsp, nmw, nsw, rev; ++ u8 nmw, nsw, rev; + u32 base, wrap; + int err; + +@@ -880,8 +878,6 @@ int brcmf_chip_dmp_erom_scan(struct brcm + return -EFAULT; + + /* only look at cores with master port(s) */ +- nmp = (val & DMP_COMP_NUM_MPORT) >> DMP_COMP_NUM_MPORT_S; +- nsp = (val & DMP_COMP_NUM_SPORT) >> DMP_COMP_NUM_SPORT_S; + nmw = (val & DMP_COMP_NUM_MWRAP) >> DMP_COMP_NUM_MWRAP_S; + nsw = (val & DMP_COMP_NUM_SWRAP) >> DMP_COMP_NUM_SWRAP_S; + rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S; diff --git a/package/kernel/mac80211/patches/brcm/100-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch b/package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch similarity index 100% rename from package/kernel/mac80211/patches/brcm/100-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch rename to package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch diff --git a/package/kernel/mac80211/patches/brcm/101-brcmfmac-remove-monitor-interface-when-detaching.patch b/package/kernel/mac80211/patches/brcm/105-v5.5-brcmfmac-remove-monitor-interface-when-detaching.patch similarity index 100% rename from package/kernel/mac80211/patches/brcm/101-brcmfmac-remove-monitor-interface-when-detaching.patch rename to package/kernel/mac80211/patches/brcm/105-v5.5-brcmfmac-remove-monitor-interface-when-detaching.patch diff --git a/package/kernel/mac80211/patches/brcm/110-v5.6-brcmfmac-Fix-memory-leak-in-brcmf_p2p_create_p2pdev.patch b/package/kernel/mac80211/patches/brcm/110-v5.6-brcmfmac-Fix-memory-leak-in-brcmf_p2p_create_p2pdev.patch new file mode 100644 index 0000000000..5bf4ad278a --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/110-v5.6-brcmfmac-Fix-memory-leak-in-brcmf_p2p_create_p2pdev.patch @@ -0,0 +1,29 @@ +From 5cc509aa83c6acd2c5cd94f99065c39d2bd0a490 Mon Sep 17 00:00:00 2001 +From: Navid Emamdoost +Date: Fri, 22 Nov 2019 13:19:48 -0600 +Subject: [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() + +In the implementation of brcmf_p2p_create_p2pdev() the allocated memory +for p2p_vif is leaked when the mac address is the same as primary +interface. To fix this, go to error path to release p2p_vif via +brcmf_free_vif(). + +Fixes: cb746e47837a ("brcmfmac: check p2pdev mac address uniqueness") +Signed-off-by: Navid Emamdoost +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +@@ -2092,7 +2092,8 @@ static struct wireless_dev *brcmf_p2p_cr + /* firmware requires unique mac address for p2pdev interface */ + if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) { + bphy_err(drvr, "discovery vif must be different from primary interface\n"); +- return ERR_PTR(-EINVAL); ++ err = -EINVAL; ++ goto fail; + } + + brcmf_p2p_generate_bss_mac(p2p, addr); diff --git a/package/kernel/mac80211/patches/brcm/111-v5.6-brcmfmac-Fix-use-after-free-in-brcmf_sdio_readframes.patch b/package/kernel/mac80211/patches/brcm/111-v5.6-brcmfmac-Fix-use-after-free-in-brcmf_sdio_readframes.patch new file mode 100644 index 0000000000..1b56f6d7ce --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/111-v5.6-brcmfmac-Fix-use-after-free-in-brcmf_sdio_readframes.patch @@ -0,0 +1,31 @@ +From 216b44000ada87a63891a8214c347e05a4aea8fe Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Tue, 3 Dec 2019 12:58:55 +0300 +Subject: [PATCH] brcmfmac: Fix use after free in brcmf_sdio_readframes() + +The brcmu_pkt_buf_free_skb() function frees "pkt" so it leads to a +static checker warning: + + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:1974 brcmf_sdio_readframes() + error: dereferencing freed memory 'pkt' + +It looks like there was supposed to be a continue after we free "pkt". + +Fixes: 4754fceeb9a6 ("brcmfmac: streamline SDIO read frame routine") +Signed-off-by: Dan Carpenter +Acked-by: Franky Lin +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +@@ -1935,6 +1935,7 @@ static uint brcmf_sdio_readframes(struct + BRCMF_SDIO_FT_NORMAL)) { + rd->len = 0; + brcmu_pkt_buf_free_skb(pkt); ++ continue; + } + bus->sdcnt.rx_readahead_cnt++; + if (rd->len != roundup(rd_new.len, 16)) { diff --git a/package/kernel/mac80211/patches/brcm/112-v5.6-brcmfmac-set-interface-carrier-to-off-by-default.patch b/package/kernel/mac80211/patches/brcm/112-v5.6-brcmfmac-set-interface-carrier-to-off-by-default.patch new file mode 100644 index 0000000000..bb4782a7a4 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/112-v5.6-brcmfmac-set-interface-carrier-to-off-by-default.patch @@ -0,0 +1,29 @@ +From 8d9627b05b2c33e4468e65739eb7caf9c3f274d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Tue, 10 Dec 2019 12:35:55 +0100 +Subject: [PATCH] brcmfmac: set interface carrier to off by default +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's important as brcmfmac creates one main interface for each PHY and +doesn't allow deleting it. Not setting carrier could result in other +subsystems misbehaving (e.g. LEDs "netdev" trigger turning LED on). + +Signed-off-by: Rafał Miłecki +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +@@ -678,6 +678,8 @@ int brcmf_net_attach(struct brcmf_if *if + goto fail; + } + ++ netif_carrier_off(ndev); ++ + netdev_set_priv_destructor(ndev, brcmf_cfg80211_free_netdev); + brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name); + return 0; diff --git a/package/kernel/mac80211/patches/brcm/113-v5.6-brcmfmac-fix-interface-sanity-check.patch b/package/kernel/mac80211/patches/brcm/113-v5.6-brcmfmac-fix-interface-sanity-check.patch new file mode 100644 index 0000000000..e1dfe84c97 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/113-v5.6-brcmfmac-fix-interface-sanity-check.patch @@ -0,0 +1,40 @@ +From 3428fbcd6e6c0850b1a8b2a12082b7b2aabb3da3 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 10 Dec 2019 12:44:22 +0100 +Subject: [PATCH] brcmfmac: fix interface sanity check + +Make sure to use the current alternate setting when verifying the +interface descriptors to avoid binding to an invalid interface. + +Failing to do so could cause the driver to misbehave or trigger a WARN() +in usb_submit_urb() that kernels with panic_on_warn set would choke on. + +Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for bcm43235/6/8 chipsets") +Cc: stable # 3.4 +Cc: Arend van Spriel +Signed-off-by: Johan Hovold +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +@@ -1348,7 +1348,7 @@ brcmf_usb_probe(struct usb_interface *in + goto fail; + } + +- desc = &intf->altsetting[0].desc; ++ desc = &intf->cur_altsetting->desc; + if ((desc->bInterfaceClass != USB_CLASS_VENDOR_SPEC) || + (desc->bInterfaceSubClass != 2) || + (desc->bInterfaceProtocol != 0xff)) { +@@ -1361,7 +1361,7 @@ brcmf_usb_probe(struct usb_interface *in + + num_of_eps = desc->bNumEndpoints; + for (ep = 0; ep < num_of_eps; ep++) { +- endpoint = &intf->altsetting[0].endpoint[ep].desc; ++ endpoint = &intf->cur_altsetting->endpoint[ep].desc; + endpoint_num = usb_endpoint_num(endpoint); + if (!usb_endpoint_xfer_bulk(endpoint)) + continue; diff --git a/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch index 8194c07695..f64167b1c3 100644 --- a/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch +++ b/package/kernel/mac80211/patches/brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch @@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1477,6 +1477,7 @@ int __init brcmf_core_init(void) +@@ -1479,6 +1479,7 @@ int __init brcmf_core_init(void) { if (!schedule_work(&brcmf_driver_work)) return -EBUSY; From 17e2246eca901fec79fbac5b7a90f68f60785c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 19 Dec 2019 09:16:59 +0100 Subject: [PATCH 019/480] mac80211: brcm: add support for BCM4359 SDIO chipset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- ...wo-D11-cores-if-chip-has-two-D11-cor.patch | 121 ++++++++++++++++ ...-F2-blocksize-and-watermark-for-4359.patch | 79 +++++++++++ ...0003-brcmfmac-fix-rambase-for-4359-9.patch | 34 +++++ ...rors-when-setting-roaming-parameters.patch | 42 ++++++ ...add-support-for-BCM4359-SDIO-chipset.patch | 75 ++++++++++ ...B-condition-when-setting-interface-c.patch | 130 ++++++++++++++++++ ...-mbss-in-vif-if-firmware-does-not-su.patch | 38 +++++ 7 files changed, 519 insertions(+) create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0001-brcmfmac-reset-two-D11-cores-if-chip-has-two-D11-cor.patch create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0002-brcmfmac-set-F2-blocksize-and-watermark-for-4359.patch create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0003-brcmfmac-fix-rambase-for-4359-9.patch create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0004-brcmfmac-make-errors-when-setting-roaming-parameters.patch create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0005-brcmfmac-add-support-for-BCM4359-SDIO-chipset.patch create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0006-brcmfmac-add-RSDB-condition-when-setting-interface-c.patch create mode 100644 package/kernel/mac80211/patches/brcm/114-v5.6-0007-brcmfmac-not-set-mbss-in-vif-if-firmware-does-not-su.patch diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0001-brcmfmac-reset-two-D11-cores-if-chip-has-two-D11-cor.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0001-brcmfmac-reset-two-D11-cores-if-chip-has-two-D11-cor.patch new file mode 100644 index 0000000000..19bf41ad9b --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0001-brcmfmac-reset-two-D11-cores-if-chip-has-two-D11-cor.patch @@ -0,0 +1,121 @@ +From 1b8d2e0a9e4221b99eea375c079507ce8ef655f5 Mon Sep 17 00:00:00 2001 +From: Wright Feng +Date: Thu, 12 Dec 2019 00:52:45 +0100 +Subject: [PATCH 1/7] brcmfmac: reset two D11 cores if chip has two D11 cores + +There are two D11 cores in RSDB chips like 4359. We have to reset two +D11 cores simutaneously before firmware download, or the firmware may +not be initialized correctly and cause "fw initialized failed" error. + +Signed-off-by: Wright Feng +Signed-off-by: Soeren Moch +Reviewed-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +--- + .../broadcom/brcm80211/brcmfmac/chip.c | 50 +++++++++++++++++++ + .../broadcom/brcm80211/brcmfmac/chip.h | 1 + + .../broadcom/brcm80211/brcmfmac/pcie.c | 2 +- + 3 files changed, 52 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +@@ -433,11 +433,25 @@ static void brcmf_chip_ai_resetcore(stru + { + struct brcmf_chip_priv *ci; + int count; ++ struct brcmf_core *d11core2 = NULL; ++ struct brcmf_core_priv *d11priv2 = NULL; + + ci = core->chip; + ++ /* special handle two D11 cores reset */ ++ if (core->pub.id == BCMA_CORE_80211) { ++ d11core2 = brcmf_chip_get_d11core(&ci->pub, 1); ++ if (d11core2) { ++ brcmf_dbg(INFO, "found two d11 cores, reset both\n"); ++ d11priv2 = container_of(d11core2, ++ struct brcmf_core_priv, pub); ++ } ++ } ++ + /* must disable first to work for arbitrary current core state */ + brcmf_chip_ai_coredisable(core, prereset, reset); ++ if (d11priv2) ++ brcmf_chip_ai_coredisable(d11priv2, prereset, reset); + + count = 0; + while (ci->ops->read32(ci->ctx, core->wrapbase + BCMA_RESET_CTL) & +@@ -449,9 +463,30 @@ static void brcmf_chip_ai_resetcore(stru + usleep_range(40, 60); + } + ++ if (d11priv2) { ++ count = 0; ++ while (ci->ops->read32(ci->ctx, ++ d11priv2->wrapbase + BCMA_RESET_CTL) & ++ BCMA_RESET_CTL_RESET) { ++ ci->ops->write32(ci->ctx, ++ d11priv2->wrapbase + BCMA_RESET_CTL, ++ 0); ++ count++; ++ if (count > 50) ++ break; ++ usleep_range(40, 60); ++ } ++ } ++ + ci->ops->write32(ci->ctx, core->wrapbase + BCMA_IOCTL, + postreset | BCMA_IOCTL_CLK); + ci->ops->read32(ci->ctx, core->wrapbase + BCMA_IOCTL); ++ ++ if (d11priv2) { ++ ci->ops->write32(ci->ctx, d11priv2->wrapbase + BCMA_IOCTL, ++ postreset | BCMA_IOCTL_CLK); ++ ci->ops->read32(ci->ctx, d11priv2->wrapbase + BCMA_IOCTL); ++ } + } + + char *brcmf_chip_name(u32 id, u32 rev, char *buf, uint len) +@@ -1109,6 +1144,21 @@ void brcmf_chip_detach(struct brcmf_chip + kfree(chip); + } + ++struct brcmf_core *brcmf_chip_get_d11core(struct brcmf_chip *pub, u8 unit) ++{ ++ struct brcmf_chip_priv *chip; ++ struct brcmf_core_priv *core; ++ ++ chip = container_of(pub, struct brcmf_chip_priv, pub); ++ list_for_each_entry(core, &chip->cores, list) { ++ if (core->pub.id == BCMA_CORE_80211) { ++ if (unit-- == 0) ++ return &core->pub; ++ } ++ } ++ return NULL; ++} ++ + struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *pub, u16 coreid) + { + struct brcmf_chip_priv *chip; +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h +@@ -74,6 +74,7 @@ struct brcmf_chip *brcmf_chip_attach(voi + const struct brcmf_buscore_ops *ops); + void brcmf_chip_detach(struct brcmf_chip *chip); + struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *chip, u16 coreid); ++struct brcmf_core *brcmf_chip_get_d11core(struct brcmf_chip *pub, u8 unit); + struct brcmf_core *brcmf_chip_get_chipcommon(struct brcmf_chip *chip); + struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub); + bool brcmf_chip_iscoreup(struct brcmf_core *core); +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +@@ -78,7 +78,7 @@ static const struct brcmf_firmware_mappi + BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371), + }; + +-#define BRCMF_PCIE_FW_UP_TIMEOUT 2000 /* msec */ ++#define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */ + + #define BRCMF_PCIE_REG_MAP_SIZE (32 * 1024) + diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0002-brcmfmac-set-F2-blocksize-and-watermark-for-4359.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0002-brcmfmac-set-F2-blocksize-and-watermark-for-4359.patch new file mode 100644 index 0000000000..bdfe2ae85f --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0002-brcmfmac-set-F2-blocksize-and-watermark-for-4359.patch @@ -0,0 +1,79 @@ +From 172f6854551d48d1c9530f84513b421db944e714 Mon Sep 17 00:00:00 2001 +From: Chung-Hsien Hsu +Date: Thu, 12 Dec 2019 00:52:46 +0100 +Subject: [PATCH 2/7] brcmfmac: set F2 blocksize and watermark for 4359 + +Set F2 blocksize to 256 bytes and watermark to 0x40 for 4359. Also +enable and configure F1 MesBusyCtrl. It fixes DMA error while having +UDP bi-directional traffic. + +Signed-off-by: Chung-Hsien Hsu +[slightly adapted for rebase on mainline linux] +Signed-off-by: Soeren Moch +Reviewed-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +--- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +++++- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 15 +++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +@@ -43,6 +43,7 @@ + + #define SDIO_FUNC1_BLOCKSIZE 64 + #define SDIO_FUNC2_BLOCKSIZE 512 ++#define SDIO_4359_FUNC2_BLOCKSIZE 256 + /* Maximum milliseconds to wait for F2 to come up */ + #define SDIO_WAIT_F2RDY 3000 + +@@ -903,6 +904,7 @@ static void brcmf_sdiod_host_fixup(struc + static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) + { + int ret = 0; ++ unsigned int f2_blksz = SDIO_FUNC2_BLOCKSIZE; + + sdio_claim_host(sdiodev->func1); + +@@ -912,7 +914,9 @@ static int brcmf_sdiod_probe(struct brcm + sdio_release_host(sdiodev->func1); + goto out; + } +- ret = sdio_set_block_size(sdiodev->func2, SDIO_FUNC2_BLOCKSIZE); ++ if (sdiodev->func2->device == SDIO_DEVICE_ID_BROADCOM_4359) ++ f2_blksz = SDIO_4359_FUNC2_BLOCKSIZE; ++ ret = sdio_set_block_size(sdiodev->func2, f2_blksz); + if (ret) { + brcmf_err("Failed to set F2 blocksize\n"); + sdio_release_host(sdiodev->func1); +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +@@ -42,6 +42,8 @@ + #define DEFAULT_F2_WATERMARK 0x8 + #define CY_4373_F2_WATERMARK 0x40 + #define CY_43012_F2_WATERMARK 0x60 ++#define CY_4359_F2_WATERMARK 0x40 ++#define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB) + + #ifdef DEBUG + +@@ -4206,6 +4208,19 @@ static void brcmf_sdio_firmware_callback + brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl, + &err); + break; ++ case SDIO_DEVICE_ID_BROADCOM_4359: ++ brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n", ++ CY_4359_F2_WATERMARK); ++ brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK, ++ CY_4359_F2_WATERMARK, &err); ++ devctl = brcmf_sdiod_readb(sdiod, SBSDIO_DEVICE_CTL, ++ &err); ++ devctl |= SBSDIO_DEVCTL_F2WM_ENAB; ++ brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl, ++ &err); ++ brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL, ++ CY_4359_F1_MESBUSYCTRL, &err); ++ break; + default: + brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK, + DEFAULT_F2_WATERMARK, &err); diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0003-brcmfmac-fix-rambase-for-4359-9.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0003-brcmfmac-fix-rambase-for-4359-9.patch new file mode 100644 index 0000000000..7e4e32ffdd --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0003-brcmfmac-fix-rambase-for-4359-9.patch @@ -0,0 +1,34 @@ +From 6647274ed995a172369cb04754eb5f8b85f68f6d Mon Sep 17 00:00:00 2001 +From: Soeren Moch +Date: Thu, 12 Dec 2019 00:52:47 +0100 +Subject: [PATCH 3/7] brcmfmac: fix rambase for 4359/9 + +Newer 4359 chip revisions need a different rambase address. +This fixes firmware download on such devices which fails otherwise. + +Signed-off-by: Soeren Moch +Acked-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +@@ -712,7 +712,6 @@ static u32 brcmf_chip_tcm_rambase(struct + case BRCM_CC_43569_CHIP_ID: + case BRCM_CC_43570_CHIP_ID: + case BRCM_CC_4358_CHIP_ID: +- case BRCM_CC_4359_CHIP_ID: + case BRCM_CC_43602_CHIP_ID: + case BRCM_CC_4371_CHIP_ID: + return 0x180000; +@@ -722,6 +721,8 @@ static u32 brcmf_chip_tcm_rambase(struct + case BRCM_CC_4366_CHIP_ID: + case BRCM_CC_43664_CHIP_ID: + return 0x200000; ++ case BRCM_CC_4359_CHIP_ID: ++ return (ci->pub.chiprev < 9) ? 0x180000 : 0x160000; + case CY_CC_4373_CHIP_ID: + return 0x160000; + default: diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0004-brcmfmac-make-errors-when-setting-roaming-parameters.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0004-brcmfmac-make-errors-when-setting-roaming-parameters.patch new file mode 100644 index 0000000000..cd7ccb0439 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0004-brcmfmac-make-errors-when-setting-roaming-parameters.patch @@ -0,0 +1,42 @@ +From c12c8913d79c49ceccb38f42714d25b783833758 Mon Sep 17 00:00:00 2001 +From: Soeren Moch +Date: Thu, 12 Dec 2019 00:52:48 +0100 +Subject: [PATCH 4/7] brcmfmac: make errors when setting roaming parameters + non-fatal + +4359 dongles do not support setting roaming parameters (error -52). +Do not fail the 80211 configuration in this case. + +Signed-off-by: Soeren Moch +Acked-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +--- + .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -5944,19 +5944,17 @@ static s32 brcmf_dongle_roam(struct brcm + roamtrigger[1] = cpu_to_le32(BRCM_BAND_ALL); + err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER, + (void *)roamtrigger, sizeof(roamtrigger)); +- if (err) { ++ if (err) + bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err); +- goto roam_setup_done; +- } + + roam_delta[0] = cpu_to_le32(WL_ROAM_DELTA); + roam_delta[1] = cpu_to_le32(BRCM_BAND_ALL); + err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA, + (void *)roam_delta, sizeof(roam_delta)); +- if (err) { ++ if (err) + bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err); +- goto roam_setup_done; +- } ++ ++ return 0; + + roam_setup_done: + return err; diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0005-brcmfmac-add-support-for-BCM4359-SDIO-chipset.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0005-brcmfmac-add-support-for-BCM4359-SDIO-chipset.patch new file mode 100644 index 0000000000..0001fb17a7 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0005-brcmfmac-add-support-for-BCM4359-SDIO-chipset.patch @@ -0,0 +1,75 @@ +From d4aef159394d5940bd7158ab789969dab82f7c76 Mon Sep 17 00:00:00 2001 +From: Soeren Moch +Date: Thu, 12 Dec 2019 00:52:49 +0100 +Subject: [PATCH 5/7] brcmfmac: add support for BCM4359 SDIO chipset + +BCM4359 is a 2x2 802.11 abgn+ac Dual-Band HT80 combo chip and it +supports Real Simultaneous Dual Band feature. + +Based on a similar patch by: Wright Feng + +Signed-off-by: Soeren Moch +Acked-by: Chi-Hsien Lin +Acked-by: Ulf Hansson +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 ++ + drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 ++ + include/linux/mmc/sdio_ids.h | 2 ++ + 4 files changed, 7 insertions(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +@@ -973,8 +973,10 @@ static const struct sdio_device_id brcmf + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356), ++ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_43012), ++ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_89359), + { /* end: all zeroes */ } + }; + MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids); +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +@@ -1408,6 +1408,7 @@ bool brcmf_chip_sr_capable(struct brcmf_ + addr = CORE_CC_REG(base, sr_control0); + reg = chip->ops->read32(chip->ctx, addr); + return (reg & CC_SR_CTL0_ENABLE_MASK) != 0; ++ case BRCM_CC_4359_CHIP_ID: + case CY_CC_43012_CHIP_ID: + addr = CORE_CC_REG(pmu->base, retention_ctl); + reg = chip->ops->read32(chip->ctx, addr); +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +@@ -616,6 +616,7 @@ BRCMF_FW_DEF(43455, "brcmfmac43455-sdio" + BRCMF_FW_DEF(43456, "brcmfmac43456-sdio"); + BRCMF_FW_DEF(4354, "brcmfmac4354-sdio"); + BRCMF_FW_DEF(4356, "brcmfmac4356-sdio"); ++BRCMF_FW_DEF(4359, "brcmfmac4359-sdio"); + BRCMF_FW_DEF(4373, "brcmfmac4373-sdio"); + BRCMF_FW_DEF(43012, "brcmfmac43012-sdio"); + +@@ -638,6 +639,7 @@ static const struct brcmf_firmware_mappi + BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455), + BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354), + BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356), ++ BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359), + BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373), + BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012) + }; +--- a/include/linux/mmc/sdio_ids.h ++++ b/include/linux/mmc/sdio_ids.h +@@ -41,8 +41,10 @@ + #define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf + #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 + #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 ++#define SDIO_DEVICE_ID_BROADCOM_4359 0x4359 + #define SDIO_DEVICE_ID_CYPRESS_4373 0x4373 + #define SDIO_DEVICE_ID_CYPRESS_43012 43012 ++#define SDIO_DEVICE_ID_CYPRESS_89359 0x4355 + + #define SDIO_VENDOR_ID_INTEL 0x0089 + #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0006-brcmfmac-add-RSDB-condition-when-setting-interface-c.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0006-brcmfmac-add-RSDB-condition-when-setting-interface-c.patch new file mode 100644 index 0000000000..d00c59c07c --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0006-brcmfmac-add-RSDB-condition-when-setting-interface-c.patch @@ -0,0 +1,130 @@ +From 837482e69a3f0d7cbc73922020012f83635f5ddb Mon Sep 17 00:00:00 2001 +From: Wright Feng +Date: Thu, 12 Dec 2019 00:52:50 +0100 +Subject: [PATCH 6/7] brcmfmac: add RSDB condition when setting interface + combinations + +With firmware RSDB feature +1. The maximum support interface is four. +2. The maximum difference channel is two. +3. The maximum interfaces of {station/p2p client/AP} are two. +4. The maximum interface of p2p device is one. + +Signed-off-by: Wright Feng +Signed-off-by: Soeren Moch +Reviewed-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +--- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 54 ++++++++++++++++--- + 1 file changed, 46 insertions(+), 8 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -6452,6 +6452,9 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = + * #STA <= 1, #AP <= 1, channels = 1, 2 total + * #AP <= 4, matching BI, channels = 1, 4 total + * ++ * no p2p and rsdb: ++ * #STA <= 2, #AP <= 2, channels = 2, 4 total ++ * + * p2p, no mchan, and mbss: + * + * #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 1, 3 total +@@ -6463,6 +6466,10 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = + * #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 2, 3 total + * #STA <= 1, #P2P-DEV <= 1, #AP <= 1, #P2P-CL <= 1, channels = 1, 4 total + * #AP <= 4, matching BI, channels = 1, 4 total ++ * ++ * p2p, rsdb, and no mbss: ++ * #STA <= 2, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 2, AP <= 2, ++ * channels = 2, 4 total + */ + static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) + { +@@ -6470,13 +6477,14 @@ static int brcmf_setup_ifmodes(struct wi + struct ieee80211_iface_limit *c0_limits = NULL; + struct ieee80211_iface_limit *p2p_limits = NULL; + struct ieee80211_iface_limit *mbss_limits = NULL; +- bool mbss, p2p; ++ bool mbss, p2p, rsdb; + int i, c, n_combos; + + mbss = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS); + p2p = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P); ++ rsdb = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB); + +- n_combos = 1 + !!p2p + !!mbss; ++ n_combos = 1 + !!(p2p && !rsdb) + !!mbss; + combo = kcalloc(n_combos, sizeof(*combo), GFP_KERNEL); + if (!combo) + goto err; +@@ -6487,16 +6495,36 @@ static int brcmf_setup_ifmodes(struct wi + + c = 0; + i = 0; +- c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL); ++ if (p2p && rsdb) ++ c0_limits = kcalloc(4, sizeof(*c0_limits), GFP_KERNEL); ++ else if (p2p) ++ c0_limits = kcalloc(3, sizeof(*c0_limits), GFP_KERNEL); ++ else ++ c0_limits = kcalloc(2, sizeof(*c0_limits), GFP_KERNEL); + if (!c0_limits) + goto err; +- c0_limits[i].max = 1; +- c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION); +- if (p2p) { ++ if (p2p && rsdb) { ++ combo[c].num_different_channels = 2; ++ wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) | ++ BIT(NL80211_IFTYPE_P2P_GO) | ++ BIT(NL80211_IFTYPE_P2P_DEVICE); ++ c0_limits[i].max = 2; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION); ++ c0_limits[i].max = 1; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE); ++ c0_limits[i].max = 2; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) | ++ BIT(NL80211_IFTYPE_P2P_GO); ++ c0_limits[i].max = 2; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP); ++ combo[c].max_interfaces = 5; ++ } else if (p2p) { + if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN)) + combo[c].num_different_channels = 2; + else + combo[c].num_different_channels = 1; ++ c0_limits[i].max = 1; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION); + wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_P2P_GO) | + BIT(NL80211_IFTYPE_P2P_DEVICE); +@@ -6505,16 +6533,26 @@ static int brcmf_setup_ifmodes(struct wi + c0_limits[i].max = 1; + c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_P2P_GO); ++ combo[c].max_interfaces = i; ++ } else if (rsdb) { ++ combo[c].num_different_channels = 2; ++ c0_limits[i].max = 2; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION); ++ c0_limits[i].max = 2; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP); ++ combo[c].max_interfaces = 3; + } else { + combo[c].num_different_channels = 1; + c0_limits[i].max = 1; ++ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION); ++ c0_limits[i].max = 1; + c0_limits[i++].types = BIT(NL80211_IFTYPE_AP); ++ combo[c].max_interfaces = i; + } +- combo[c].max_interfaces = i; + combo[c].n_limits = i; + combo[c].limits = c0_limits; + +- if (p2p) { ++ if (p2p && !rsdb) { + c++; + i = 0; + p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL); diff --git a/package/kernel/mac80211/patches/brcm/114-v5.6-0007-brcmfmac-not-set-mbss-in-vif-if-firmware-does-not-su.patch b/package/kernel/mac80211/patches/brcm/114-v5.6-0007-brcmfmac-not-set-mbss-in-vif-if-firmware-does-not-su.patch new file mode 100644 index 0000000000..9c211a68d0 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/114-v5.6-0007-brcmfmac-not-set-mbss-in-vif-if-firmware-does-not-su.patch @@ -0,0 +1,38 @@ +From 2635853ce4ab7654a77ab7080fb56de83408606b Mon Sep 17 00:00:00 2001 +From: Wright Feng +Date: Thu, 12 Dec 2019 00:52:51 +0100 +Subject: [PATCH 7/7] brcmfmac: not set mbss in vif if firmware does not + support MBSS + +With RSDB mode, FMAC and firmware are able to create 2 or more AP, +so we should not set mbss in vif structure if firmware does not +support MBSS feature. + +Signed-off-by: Wright Feng +Signed-off-by: Soeren Moch +Reviewed-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -5301,6 +5301,7 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v + struct brcmf_cfg80211_vif *vif_walk; + struct brcmf_cfg80211_vif *vif; + bool mbss; ++ struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0); + + brcmf_dbg(TRACE, "allocating virtual interface (size=%zu)\n", + sizeof(*vif)); +@@ -5313,7 +5314,8 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v + + brcmf_init_prof(&vif->profile); + +- if (type == NL80211_IFTYPE_AP) { ++ if (type == NL80211_IFTYPE_AP && ++ brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) { + mbss = false; + list_for_each_entry(vif_walk, &cfg->vif_list, list) { + if (vif_walk->wdev.iftype == NL80211_IFTYPE_AP) { From ebf535a6cfefef5b0afb74cb01c9a17ab242b85b Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Wed, 18 Dec 2019 10:06:14 +0300 Subject: [PATCH 020/480] ramips: fix portmap for TP-Link Archer C50 v4 According to 02_network portmap is wan=0 lan1=1 lan2=2 lan3=3 lan4=4 Signed-off-by: Maxim Anisimov --- target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi index 6d7fb01c56..8807f7f274 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi @@ -84,5 +84,5 @@ ðernet { mtd-mac-address = <&rom 0xf100>; - mediatek,portmap = "llllw"; + mediatek,portmap = "wllll"; }; From 60de1fdbb4492b5270edf49d634979c0cfd1e743 Mon Sep 17 00:00:00 2001 From: Lech Perczak Date: Sun, 1 Dec 2019 19:31:32 +0100 Subject: [PATCH 021/480] ath79: add support for TP-Link TL-WR902AC v1 TP-Link TL-WR902AC v1 is a pocket-size, dual-band (AC750), successor of TL-MR3020 (both devices use very similar enclosure, in same size). New device is based on Qualcomm QCA9531 v2 + QCA9887. FCC ID: TE7WR902AC. Specification: - 650/391/216 MHz (CPU/DDR/AHB) - 1x 10/100 Mbps Ethernet - 1x USB 2.0 (GPIO-controlled power) - 64 MB of RAM (DDR2) - 8 MB of FLASH - 2T2R 2.4 GHz (QCA9531) - 1T1R 5 GHz (QCA9887) - 5x LED (GPIO-controlled), 2x button, 1x 3-pos switch - UART pads on PCB (TP1 -> TX, TP2 -> RX, TP3 -> GND, TP4 -> 3V3, jumper resitors are missing on TX/RX lines) - 1x micro USB (for power only) Flash instructions: Use "factory" image under vendor GUI. Recovery instructions: This device contains tftp recovery mode inside U-Boot. You can use it to flash OpenWrt (use "factory" image) or vendor firmware. 1. Configure PC with static IP 192.168.0.66/24 and tftp server. 2. Rename "openwrt-ath79-generic-tplink_tl-wr902ac-v1-squashfs-factory.bin" to "wr902acv1_un_tp_recovery.bin" and place it in tftp server dir. 3. Connect PC with LAN port, press the reset button, power up the router and keep button pressed until WPS LED lights up. 4. Router will download file from server, write it to flash and reboot. MAC Address summary: - wlan1 (2.4GHz Wi-Fi): Label MAC - wlan0 (5GHz Wi-Fi): Offset -1 from label - eth0 (Wired): Offset +1 from label Root access over serial line in vendor firmware: root/sohoadmin. Based on support in ar71xx target by: Piotr Dymacz Signed-off-by: Lech Perczak [remove size-cells from gpio-export] Signed-off-by: Adrian Schmutzler --- .../dts/qca9531_tplink_tl-wr902ac-v1.dts | 188 ++++++++++++++++++ .../generic/base-files/etc/board.d/01_leds | 3 +- .../generic/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 4 + .../etc/uci-defaults/04_led_migration | 3 +- target/linux/ath79/image/generic-tp-link.mk | 15 ++ 6 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts new file mode 100644 index 0000000000..9eca13d82b --- /dev/null +++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts @@ -0,0 +1,188 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca953x.dtsi" + +/ { + compatible = "tplink,tl-wr902ac-v1", "qca,qca9531"; + model = "TP-Link TL-WR902AC v1"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = &wmac; + }; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "tp-link:green:power"; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + + internet { + label = "tp-link:green:internet"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + wlan2g { + label = "tp-link:green:wlan2g"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + usb { + label = "tp-link:green:usb"; + gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; + trigger-sources = <&hub_port0>; + linux,default-trigger = "usbport"; + }; + + wps { + label = "tp-link:green:wps"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "tp-link:green:lan"; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset button"; + linux,code = ; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "WPS button"; + linux,code = ; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + }; + + sw1 { + label = "Mode switch 1"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + + sw2 { + label = "Mode switch 2"; + linux,code = ; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + }; + + gpio-export { + compatible = "gpio-export"; + + gpio_usb_power { + gpio-export,name = "tp-link:power:usb"; + gpio-export,output = <1>; + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x020000>; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + label = "firmware"; + reg = <0x020000 0x730000>; + }; + + tplink: partition@750000 { + label = "tplink"; + reg = <0x750000 0x0a0000>; + read-only; + }; + + art: partition@7f0000 { + label = "art"; + reg = <0x7f0000 0x010000>; + read-only; + }; + }; + }; +}; + +ð0 { + status = "okay"; + + phy-handle = <&swphy4>; + + mtd-mac-address = <&tplink 0x8>; + mtd-mac-address-increment = <1>; +}; + +ð1 { + compatible = "syscon", "simple-mfd"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&tplink 0x8>; +}; + +&pcie0 { + status = "okay"; + + wifi@0,0 { + compatible = "pci168c,0050"; + reg = <0x0000 0 0 0 0>; + }; +}; + +&usb_phy { + status = "okay"; +}; + +&usb0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_port0: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index 5561677ec3..de4e8b4a7f 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -205,7 +205,8 @@ tplink,cpe510-v3) ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:link3" "wlan0" "51" "100" "-50" "13" ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "76" "100" "-75" "13" ;; -tplink,cpe610-v1) +tplink,cpe610-v1|\ +tplink,tl-wr902ac-v1) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" ;; tplink,re355-v1|\ diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 77e2db762f..d16ae670b4 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -37,6 +37,7 @@ ath79_setup_interfaces() tplink,re355-v1|\ tplink,re450-v1|\ tplink,re450-v2|\ + tplink,tl-wr902ac-v1|\ ubnt,bullet-m|\ ubnt,bullet-m-xw|\ ubnt,lap-120|\ diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 55c6b74e74..c24e062b5c 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -111,6 +111,10 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) ;; + tplink,tl-wr902ac-v1) + caldata_extract "art" 0x5000 0x844 + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary tplink 0x8) -1) + ;; esac ;; "ath10k/pre-cal-pci-0000:00:00.0.bin") diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration index c8301d0769..56fac4a36b 100644 --- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration @@ -17,7 +17,8 @@ tplink,archer-c59-v2|\ tplink,archer-c60-v1|\ tplink,archer-c60-v2|\ tplink,archer-c7-v4|\ -tplink,archer-c7-v5) +tplink,archer-c7-v5|\ +tplink,tl-wr902ac-v1) migrate_leds "^$boardonly:=tp-link:" ;; tplink,archer-c7-v2|\ diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 8915552322..c43927e19b 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -563,6 +563,21 @@ define Device/tplink_tl-wr842n-v3 endef TARGET_DEVICES += tplink_tl-wr842n-v3 +define Device/tplink_tl-wr902ac-v1 + $(Device/tplink-safeloader) + ATH_SOC := qca9531 + DEVICE_MODEL := TL-WR902AC + DEVICE_VARIANT := v1 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-ath10k-ct ath10k-firmware-qca9887-ct -swconfig -uboot-envtools + TPLINK_BOARD_ID := TL-WR902AC-V1 + IMAGE_SIZE := 7360k + TPLINK_HWID := 0x0 + TPLINK_HWREV := 0 + SUPPORTED_DEVICES += tl-wr902ac-v1 +endef +TARGET_DEVICES += tplink_tl-wr902ac-v1 + define Device/tplink_wbs210-v2 $(Device/tplink-loader-okli) ATH_SOC := ar9344 From b1e8a390ea7bde59eb47bdd729228cb377aa6f6f Mon Sep 17 00:00:00 2001 From: Lech Perczak Date: Sun, 8 Dec 2019 15:23:54 +0100 Subject: [PATCH 022/480] ath79: restore gpio-export on TL-WDR3600/4300 This partially reverts commit 32144ba275d163ce6e7d93546ab4414f03f508fb. This commit replaced gpio-exports in favor of gpio-hogs for enabling USB power at boot, but this rids the user of control of the USB port power present on this device for a long time. It was agreed on a mailing list [1] that this is not the way to go, and this patch breaks a very common use-case of WWAN modem reset by power cycle, used on a lot USB equipped routers, hence revert this change until a better solution can be found. [1] http://lists.infradead.org/pipermail/openwrt-devel/2019-November/020151.html Tested-by: Sungbo Eo Signed-off-by: Lech Perczak [adjusted commit title] Signed-off-by: Adrian Schmutzler --- .../ath79/dts/ar9344_tplink_tl-wdr4300.dtsi | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi index 9ca96cc7cd..7071d35e24 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi @@ -6,6 +6,34 @@ aliases { label-mac-device = &ath9k; }; + + gpio-export { + compatible = "gpio-export"; + + gpio_usb1_power { + gpio-export,name = "tp-link:power:usb1"; + gpio-export,output = <1>; + gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; + }; + + gpio_usb2_power { + gpio-export,name = "tp-link:power:usb2"; + gpio-export,output = <1>; + gpios = <&gpio 21 GPIO_ACTIVE_HIGH>; + }; + + gpio_ext_lna0 { + gpio-export,name = "tp-link:ext:lna0"; + gpio-export,output = <1>; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; + }; + + gpio_ext_lna1 { + gpio-export,name = "tp-link:ext:lna1"; + gpio-export,output = <1>; + gpios = <&gpio 19 GPIO_ACTIVE_HIGH>; + }; + }; }; &leds { @@ -24,36 +52,6 @@ }; }; -&gpio { - lna0 { - gpio-hog; - gpios = <18 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "tp-link:ext:lna0"; - }; - - lna1 { - gpio-hog; - gpios = <19 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "tp-link:ext:lna1"; - }; - - usb1_power { - gpio-hog; - gpios = <22 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "tp-link:power:usb1"; - }; - - usb2_power { - gpio-hog; - gpios = <21 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "tp-link:power:usb2"; - }; -}; - &usb { #address-cells = <1>; #size-cells = <0>; From c5d2f3c4765a93dbca9654858a8dec8bf307ad5f Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Thu, 28 Nov 2019 21:41:20 +0100 Subject: [PATCH 023/480] ipq806x: copy files from 4.14 to 4.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This copies files from files-4.14 to files-4.19 directory in order to get clear diffs for any changes done from now on. Signed-off-by: Ansuel Smith [added missing commit description, refreshed ea8500 and wpq864 DTS] Signed-off-by: Petr Štetiar --- target/linux/ipq806x/config-4.19 | 489 + .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 248 + .../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 277 + .../arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 494 + .../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 408 + .../arch/arm/boot/dts/qcom-ipq8064-db149.dts | 232 + .../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 400 + .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 382 + .../arm/boot/dts/qcom-ipq8064-r7500v2.dts | 407 + .../arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 30 + .../arm/boot/dts/qcom-ipq8064-vr2600v.dts | 417 + .../arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 442 + .../arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 568 + .../arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 535 + .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 1410 ++ .../arm/boot/dts/qcom-ipq8065-nbg6817.dts | 386 + .../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 513 + .../arch/arm/boot/dts/qcom-ipq8065.dtsi | 78 + ...ings-qcom_adm-Fix-channel-specifiers.patch | 71 + .../0002-dmaengine-Add-ADM-driver.patch | 966 ++ ...0030-clk-Disable-i2c-device-on-gsbi4.patch | 40 + ...d-add-SMEM-parser-for-QCOM-platforms.patch | 282 + .../0032-phy-add-qcom-dwc3-phy.patch | 616 + ...ically-select-PCI_DOMAINS-if-PCI-is-.patch | 29 + ...Krait-L2-register-accessor-functions.patch | 147 + ...lit-out-register-accessors-for-reuse.patch | 195 + ...pport-for-High-Frequency-PLLs-HFPLLs.patch | 352 + .../0039-clk-qcom-Add-HFPLL-driver.patch | 206 + .../0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch | 129 + ...lk-qcom-Add-support-for-Krait-clocks.patch | 241 + ...042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch | 209 + ...om-Add-Krait-clock-controller-driver.patch | 436 + .../0044-clk-Add-safe-switch-hook.patch | 160 + ...le-to-register-cpufreq-on-Krait-CPUs.patch | 307 + ...cpufreq-qcom-independent-core-clocks.patch | 66 + ...a-BBT-flag-to-access-bad-block-marke.patch | 72 + ...ow-to-set-regulator-without-opp_list.patch | 26 + ...rt-adjusting-OPP-voltages-at-runtime.patch | 147 + ...per-to-get-an-opp-regulator-for-devi.patch | 52 + ...e-voltage-tolerance-when-adjusting-t.patch | 38 + .../0053-regulator-add-smb208-support.patch | 55 + ...-dt-Handle-OPP-voltage-adjust-events.patch | 128 + ...-dt-Add-L2-frequency-scaling-support.patch | 90 + ...056-cpufreq-dt-Add-missing-rcu-locks.patch | 23 + ...le-Add-cpuidle-support-for-QCOM-cpus.patch | 29 + ...arch-arm-force-ZRELADDR-on-arch-qcom.patch | 62 + ...conflicts-with-OpenWrt-auto-mounting.patch | 23 + ...ed-the-enable-regs-and-mask-for-PRNG.patch | 25 + .../0063-1-ipq806x-tsens-driver.patch | 627 + ...sens-support-configurable-interrupts.patch | 453 + .../patches-4.19/0064-clk-clk-rpm-fixes.patch | 93 + .../0065-arm-override-compiler-flags.patch | 21 + ...Mangle-bootloader-s-kernel-arguments.patch | 189 + .../0069-arm-boot-add-dts-files.patch | 31 + .../0070-qcom-spm-fix-probe-order.patch | 16 + ...I-qcom-Fixed-IPQ806x-specific-clocks.patch | 95 + ...com-Fixed-IPQ806x-PCIE-reset-changes.patch | 85 + ...qcom-Fixed-IPQ806x-PCIE-init-changes.patch | 126 + ...rogramming-the-PCIE-iATU-for-IPQ806x.patch | 114 + .../0071-6-PCI-qcom-Force-GEN1-support.patch | 61 + ...7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch | 69 + ...qcom-Fixed-pcie_phy_clk-branch-issue.patch | 91 + ...nge-duplicate-pci-reset-to-phy-reset.patch | 25 + .../0072-add-ipq806x-with-no-clocks.patch | 12 + ...e-scm_call-to-route-GPIO-irq-to-Apps.patch | 183 + ...ipq806x-usb-Control-USB-master-reset.patch | 71 + ...Fixed-missing-RGMII-pincontrol-defin.patch | 50 + .../105-mtd-nor-add-mx25l25635f.patch | 22 + .../310-msm-adhoc-bus-support.patch | 11026 ++++++++++++++++ .../850-soc-add-qualcomm-syscon.patch | 177 + 70 files changed, 26575 insertions(+) create mode 100644 target/linux/ipq806x/config-4.19 create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts create mode 100644 target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi create mode 100644 target/linux/ipq806x/patches-4.19/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch create mode 100644 target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0030-clk-Disable-i2c-device-on-gsbi4.patch create mode 100644 target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch create mode 100644 target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch create mode 100644 target/linux/ipq806x/patches-4.19/0033-ARM-qcom-automatically-select-PCI_DOMAINS-if-PCI-is-.patch create mode 100644 target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch create mode 100644 target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch create mode 100644 target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch create mode 100644 target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch create mode 100644 target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch create mode 100644 target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch create mode 100644 target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch create mode 100644 target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch create mode 100644 target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch create mode 100644 target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch create mode 100644 target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch create mode 100644 target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch create mode 100644 target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch create mode 100644 target/linux/ipq806x/patches-4.19/0053-regulator-add-smb208-support.patch create mode 100644 target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch create mode 100644 target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch create mode 100644 target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch create mode 100644 target/linux/ipq806x/patches-4.19/0059-ARM-cpuidle-Add-cpuidle-support-for-QCOM-cpus.patch create mode 100644 target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch create mode 100644 target/linux/ipq806x/patches-4.19/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch create mode 100644 target/linux/ipq806x/patches-4.19/0062-ipq806x-gcc-Added-the-enable-regs-and-mask-for-PRNG.patch create mode 100644 target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch create mode 100644 target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch create mode 100644 target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch create mode 100644 target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch create mode 100644 target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch create mode 100644 target/linux/ipq806x/patches-4.19/0070-qcom-spm-fix-probe-order.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch create mode 100644 target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch create mode 100644 target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch create mode 100644 target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch create mode 100644 target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch create mode 100644 target/linux/ipq806x/patches-4.19/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch create mode 100644 target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch create mode 100644 target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch create mode 100644 target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 new file mode 100644 index 0000000000..38f5c94507 --- /dev/null +++ b/target/linux/ipq806x/config-4.19 @@ -0,0 +1,489 @@ +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_AMBA_PL08X is not set +# CONFIG_APQ_GCC_8084 is not set +# CONFIG_APQ_MMCC_8084 is not set +CONFIG_AR8216_PHY=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +# CONFIG_ARCH_MDM9615 is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y +CONFIG_ARCH_MSM8X60=y +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_QCOM=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set +CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_CPU_SUSPEND=y +# CONFIG_ARM_CPU_TOPOLOGY is not set +CONFIG_ARM_GIC=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_L1_CACHE_SHIFT_6=y +# CONFIG_ARM_LPAE is not set +CONFIG_ARM_PATCH_IDIV=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARM_QCOM_CPUFREQ=y +CONFIG_ARM_QCOM_CPUIDLE=y +# CONFIG_ARM_SMMU is not set +# CONFIG_ARM_SP805_WATCHDOG is not set +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_UNWIND=y +CONFIG_ARM_VIRT_EXT=y +# CONFIG_BINFMT_FLAT is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_MQ_PCI=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_BOUNCE=y +CONFIG_BUS_TOPOLOGY_ADHOC=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y +CONFIG_CLKSRC_QCOM=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +# CONFIG_CPU_BIG_ENDIAN is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_HAS_ASID=y +# CONFIG_CPU_ICACHE_DISABLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_PM=y +CONFIG_CPU_RMAP=y +CONFIG_CPU_THERMAL=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_V7=y +CONFIG_CRC16=y +# CONFIG_CRC32_SARWATE is not set +CONFIG_CRC32_SLICEBY8=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DEBUG_GPIO=y +# CONFIG_DEBUG_UART_8250 is not set +CONFIG_DEBUG_UNCOMPRESS=y +# CONFIG_DEBUG_USER is not set +CONFIG_DMADEVICES=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +CONFIG_DMA_VIRTUAL_CHANNELS=y +CONFIG_DTC=y +CONFIG_DT_IDLE_STATES=y +# CONFIG_DWMAC_DWC_QOS_ETH is not set +# CONFIG_DWMAC_GENERIC is not set +CONFIG_DWMAC_IPQ806X=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_EARLY_PRINTK=y +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_ETHERNET_PACKET_MANGLE=y +CONFIG_FIXED_PHY=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_PHY=y +CONFIG_GENERIC_PINCONF=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_IRQCHIP=y +CONFIG_GPIO_SYSFS=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_HAVE_ARM_SMCCC=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_CBPF_JIT=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_SMP=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HIGHMEM=y +# CONFIG_HIGHPTE is not set +CONFIG_HWMON=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_QCOM=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_MSM=y +CONFIG_HZ_FIXED=0 +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_QUP=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_IOMMU_HELPER=y +# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set +# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set +CONFIG_IOMMU_SUPPORT=y +# CONFIG_IPQ_GCC_4019 is not set +CONFIG_IPQ_GCC_806X=y +# CONFIG_IPQ_GCC_8074 is not set +# CONFIG_IPQ_LCC_806X is not set +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_WORK=y +CONFIG_KPSS_XCC=y +CONFIG_KRAITCC=y +CONFIG_KRAIT_CLOCKS=y +CONFIG_KRAIT_L2_ACCESSORS=y +CONFIG_LIBFDT=y +CONFIG_LOCKUP_DETECTOR=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_MDIO_BITBANG=y +CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_GPIO=y +# CONFIG_MDM_GCC_9615 is not set +# CONFIG_MDM_LCC_9615 is not set +# CONFIG_MFD_MAX77620 is not set +CONFIG_MFD_QCOM_RPM=y +# CONFIG_MFD_SPMI_PMIC is not set +CONFIG_MFD_SYSCON=y +CONFIG_MIGHT_HAVE_CACHE_L2X0=y +CONFIG_MIGHT_HAVE_PCI=y +CONFIG_MMC=y +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_QCOM_DML=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_MSM=y +# CONFIG_MMC_SDHCI_PCI is not set +CONFIG_MMC_SDHCI_PLTFM=y +# CONFIG_MMC_TIFM_SD is not set +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_MSM_BUS_SCALING=y +CONFIG_MSM_GCC_8660=y +# CONFIG_MSM_GCC_8916 is not set +# CONFIG_MSM_GCC_8960 is not set +# CONFIG_MSM_GCC_8974 is not set +# CONFIG_MSM_GCC_8994 is not set +# CONFIG_MSM_GCC_8996 is not set +# CONFIG_MSM_IOMMU is not set +# CONFIG_MSM_LCC_8960 is not set +# CONFIG_MSM_MMCC_8960 is not set +# CONFIG_MSM_MMCC_8974 is not set +# CONFIG_MSM_MMCC_8996 is not set +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_QCOM=y +# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set +CONFIG_MTD_QCOM_SMEM_PARTS=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_SPLIT_FIRMWARE=y +CONFIG_MTD_SPLIT_FIT_FW=y +CONFIG_MTD_SPLIT_UIMAGE_FW=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_BEB_LIMIT=20 +CONFIG_MTD_UBI_BLOCK=y +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MULTI_IRQ_HANDLER=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEON=y +CONFIG_NET_DSA=y +CONFIG_NET_DSA_HWMON=y +CONFIG_NET_DSA_QCA8K=y +CONFIG_NET_DSA_TAG_QCA=y +CONFIG_NET_FLOW_LIMIT=y +CONFIG_NET_PTP_CLASSIFY=y +CONFIG_NET_SWITCHDEV=y +CONFIG_NLS=y +CONFIG_NO_BOOTMEM=y +CONFIG_NO_HZ=y +CONFIG_NO_HZ_COMMON=y +CONFIG_NO_HZ_IDLE=y +CONFIG_NR_CPUS=2 +CONFIG_NVMEM=y +CONFIG_OF=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_ADDRESS_PCI=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_FLATTREE=y +CONFIG_OF_GPIO=y +CONFIG_OF_IRQ=y +CONFIG_OF_MDIO=y +CONFIG_OF_NET=y +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_PADATA=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PCI=y +CONFIG_PCIEAER=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIE_DW=y +CONFIG_PCIE_QCOM=y +CONFIG_PCI_DEBUG=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PERF_USE_VMALLOC=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_PHYLIB=y +# CONFIG_PHY_QCOM_APQ8064_SATA is not set +CONFIG_PHY_QCOM_IPQ806X_SATA=y +# CONFIG_PHY_QCOM_QMP is not set +# CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_UFS is not set +CONFIG_PINCTRL=y +# CONFIG_PINCTRL_APQ8064 is not set +# CONFIG_PINCTRL_APQ8084 is not set +# CONFIG_PINCTRL_IPQ4019 is not set +CONFIG_PINCTRL_IPQ8064=y +# CONFIG_PINCTRL_IPQ8074 is not set +# CONFIG_PINCTRL_MDM9615 is not set +CONFIG_PINCTRL_MSM=y +# CONFIG_PINCTRL_MSM8660 is not set +# CONFIG_PINCTRL_MSM8916 is not set +# CONFIG_PINCTRL_MSM8960 is not set +# CONFIG_PINCTRL_MSM8994 is not set +# CONFIG_PINCTRL_MSM8996 is not set +# CONFIG_PINCTRL_MSM8X74 is not set +# CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set +# CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set +# CONFIG_PL330_DMA is not set +CONFIG_PM_OPP=y +CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_BRCMKONA is not set +CONFIG_POWER_RESET_MSM=y +CONFIG_POWER_SUPPLY=y +CONFIG_PPS=y +CONFIG_PRINTK_TIME=y +CONFIG_PTP_1588_CLOCK=y +CONFIG_QCOM_ADM=y +CONFIG_QCOM_BAM_DMA=y +CONFIG_QCOM_CLK_RPM=y +# CONFIG_QCOM_EBI2 is not set +CONFIG_QCOM_GDSC=y +CONFIG_QCOM_GSBI=y +CONFIG_QCOM_HFPLL=y +# CONFIG_QCOM_IOMMU is not set +CONFIG_QCOM_PM=y +# CONFIG_QCOM_Q6V5_PIL is not set +CONFIG_QCOM_QFPROM=y +CONFIG_QCOM_RPMCC=y +CONFIG_QCOM_SCM=y +CONFIG_QCOM_SCM_32=y +# CONFIG_QCOM_SMD is not set +CONFIG_QCOM_SMEM=y +# CONFIG_QCOM_SMP2P is not set +# CONFIG_QCOM_SMSM is not set +CONFIG_QCOM_TCSR=y +CONFIG_QCOM_TSENS=y +# CONFIG_QCOM_WCNSS_PIL is not set +CONFIG_QCOM_WDT=y +# CONFIG_QRTR is not set +CONFIG_RAS=y +CONFIG_RATIONAL=y +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +CONFIG_RCU_STALL_COMMON=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_SPI=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_QCOM_RPM=y +# CONFIG_REGULATOR_QCOM_SPMI is not set +CONFIG_RESET_CONTROLLER=y +CONFIG_RFS_ACCEL=y +# CONFIG_RPMSG_QCOM_SMD is not set +CONFIG_RPS=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_DRV_CMOS is not set +CONFIG_RTC_I2C_AND_SPI=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_SCHED_INFO is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SERIAL_AMBA_PL011 is not set +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y +CONFIG_SMP=y +CONFIG_SMP_ON_UP=y +CONFIG_SPARSE_IRQ=y +CONFIG_SPI=y +# CONFIG_SPI_CADENCE_QUADSPI is not set +CONFIG_SPI_MASTER=y +CONFIG_SPI_QUP=y +CONFIG_SPMI=y +CONFIG_SPMI_MSM_PMIC_ARB=y +CONFIG_SRCU=y +CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y +CONFIG_SWCONFIG=y +CONFIG_SWCONFIG_LEDS=y +CONFIG_SWIOTLB=y +CONFIG_SWPHY=y +CONFIG_SWP_EMULATE=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_THERMAL=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y +# CONFIG_THUMB2_KERNEL is not set +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TREE_RCU=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +CONFIG_USB=y +CONFIG_USB_COMMON=y +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_QCOM_8X16_PHY is not set +CONFIG_USB_SUPPORT=y +# CONFIG_USB_UHCI_HCD is not set +CONFIG_USE_OF=y +CONFIG_VDSO=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_WATCHDOG_CORE=y +CONFIG_XPS=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZLIB_DEFLATE=y +CONFIG_ZLIB_INFLATE=y diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts new file mode 100644 index 0000000000..655f9fba37 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -0,0 +1,248 @@ +#include "qcom-ipq8064-v1.0.dtsi" + +/ { + model = "Qualcomm IPQ8064/AP148"; + compatible = "qcom,ipq8064-ap148", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + i2c4_pins: i2c4_pinmux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + bias-disable; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + drive-strength = <10>; + bias-none; + }; + }; + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + gsbi5: gsbi@1a200000 { + qcom,mode = ; + status = "ok"; + + spi4: spi@1a280000 { + status = "ok"; + spi-max-frequency = <50000000>; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 0>; + + flash: m25p80@0 { + compatible = "s25fl256s1"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; + + partitions { + compatible = "qcom,smem"; + }; + }; + }; + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + }; + + usb30@1 { + status = "ok"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + force_gen1 = <1>; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "qcom,smem"; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts new file mode 100644 index 0000000000..7e589be2c3 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -0,0 +1,277 @@ +#include "qcom-ipq8064-v1.0.dtsi" + +/ { + model = "Qualcomm IPQ8064/AP161"; + compatible = "qcom,ipq8064-ap161", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + }; + + chosen { + linux,stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + i2c4_pins: i2c4_pinmux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + bias-disable; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + drive-strength = <10>; + bias-none; + }; + }; + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio2", "gpio27", "gpio28", + "gpio29", "gpio30", "gpio31", + "gpio32", "gpio51", "gpio52", + "gpio59", "gpio60", "gpio61", + "gpio62" , "gpio66"; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + gsbi5: gsbi@1a200000 { + qcom,mode = ; + status = "ok"; + + spi4: spi@1a280000 { + status = "ok"; + spi-max-frequency = <50000000>; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 0>; + + flash: m25p80@0 { + compatible = "s25fl256s1"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; + + partitions { + compatible = "qcom,smem"; + }; + }; + }; + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + }; + + usb30@1 { + status = "ok"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + force_gen1 = <1>; + }; + + pcie2: pci@1b900000 { + status = "ok"; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "qcom,smem"; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x20080 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + qca,phy-rgmii-en; + qca,txclk-delay-en; + qca,rxclk-delay-en; + }; + + phy3: ethernet-phy@3 { + device_type = "ethernet-phy"; + reg = <3>; + }; + }; + + gmac0: ethernet@37000000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <0>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + mdiobus = <&mdio0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + mdiobus = <&mdio0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + mdiobus = <&mdio0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts new file mode 100644 index 0000000000..c4fb2524c8 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -0,0 +1,494 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "TP-Link Archer C2600"; + compatible = "tplink,c2600", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power; + led-failsafe = &general; + led-running = &power; + led-upgrade = &general; + label-mac-device = &gmac2; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio16", "gpio54", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33", + "gpio53", "gpio66"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + bias-pull-down; + }; + + data { + pins = "gpio18", "gpio19"; + drive-strength = <10>; + }; + + cs { + pins = "gpio20"; + function = "gpio"; + drive-strength = <10>; + bias-pull-up; + }; + + clk { + pins = "gpio21"; + drive-strength = <12>; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + + usb0_pwr_en_pin: usb0_pwr_en_pin { + mux { + pins = "gpio25"; + function = "gpio"; + drive-strength = <10>; + bias-pull-up; + output-high; + }; + }; + + usb1_pwr_en_pin: usb1_pwr_en_pin { + mux { + pins = "gpio23"; + function = "gpio"; + drive-strength = <10>; + bias-pull-up; + output-high; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + gsbi5: gsbi@1a200000 { + qcom,mode = ; + status = "ok"; + + spi5: spi@1a280000 { + status = "ok"; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; + + flash: m25p80@0 { + compatible = "jedec,spi-nor"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; + + SBL1@0 { + label = "SBL1"; + reg = <0x0 0x20000>; + read-only; + }; + + MIBIB@20000 { + label = "MIBIB"; + reg = <0x20000 0x20000>; + read-only; + }; + + SBL2@40000 { + label = "SBL2"; + reg = <0x40000 0x20000>; + read-only; + }; + + SBL3@60000 { + label = "SBL3"; + reg = <0x60000 0x30000>; + read-only; + }; + + DDRCONFIG@90000 { + label = "DDRCONFIG"; + reg = <0x90000 0x10000>; + read-only; + }; + + SSD@a0000 { + label = "SSD"; + reg = <0xa0000 0x10000>; + read-only; + }; + + TZ@b0000 { + label = "TZ"; + reg = <0xb0000 0x30000>; + read-only; + }; + + RPM@e0000 { + label = "RPM"; + reg = <0xe0000 0x20000>; + read-only; + }; + + fs-uboot@100000 { + label = "fs-uboot"; + reg = <0x100000 0x70000>; + read-only; + }; + + uboot-env@170000 { + label = "uboot-env"; + reg = <0x170000 0x40000>; + read-only; + }; + + radio@1b0000 { + label = "radio"; + reg = <0x1b0000 0x40000>; + read-only; + }; + + os-image@1f0000 { + label = "os-image"; + reg = <0x1f0000 0x400000>; + }; + + rootfs@5f0000 { + label = "rootfs"; + reg = <0x5f0000 0x1900000>; + }; + + defaultmac: default-mac@1ef0000 { + label = "default-mac"; + reg = <0x1ef0000 0x00200>; + read-only; + }; + + pin@1ef0200 { + label = "pin"; + reg = <0x1ef0200 0x00200>; + read-only; + }; + + product-info@1ef0400 { + label = "product-info"; + reg = <0x1ef0400 0x0fc00>; + read-only; + }; + + partition-table@1f00000 { + label = "partition-table"; + reg = <0x1f00000 0x10000>; + read-only; + }; + + soft-version@1f10000 { + label = "soft-version"; + reg = <0x1f10000 0x10000>; + read-only; + }; + + support-list@1f20000 { + label = "support-list"; + reg = <0x1f20000 0x10000>; + read-only; + }; + + profile@1f30000 { + label = "profile"; + reg = <0x1f30000 0x10000>; + read-only; + }; + + default-config@1f40000 { + label = "default-config"; + reg = <0x1f40000 0x10000>; + read-only; + }; + + user-config@1f50000 { + label = "user-config"; + reg = <0x1f50000 0x40000>; + read-only; + }; + + qos-db@1f90000 { + label = "qos-db"; + reg = <0x1f90000 0x40000>; + read-only; + }; + + usb-config@1fd0000 { + label = "usb-config"; + reg = <0x1fd0000 0x10000>; + read-only; + }; + + log@1fe0000 { + label = "log"; + reg = <0x1fe0000 0x20000>; + read-only; + }; + }; + }; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + + pinctrl-0 = <&usb0_pwr_en_pin>; + pinctrl-names = "default"; + }; + + usb30@1 { + status = "ok"; + + pinctrl-0 = <&usb1_pwr_en_pin>; + pinctrl-names = "default"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + force_gen1 = <1>; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&defaultmac 0x8>; + mtd-mac-address-increment = <1>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&defaultmac 0x8>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 49 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + ledswitch { + label = "ledswitch"; + gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + lan { + label = "c2600:white:lan"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>; + }; + + usb4 { + label = "c2600:white:usb_4"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb2 { + label = "c2600:white:usb_2"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "c2600:white:wps"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + wan_amber { + label = "c2600:amber:wan"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>; + }; + + wan_white { + label = "c2600:white:wan"; + gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>; + }; + + power: power { + label = "c2600:white:power"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + general: general { + label = "c2600:white:general"; + gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts new file mode 100644 index 0000000000..1760b1968f --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -0,0 +1,408 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "Netgear Nighthawk X4 D7800"; + compatible = "netgear,d7800", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0xe000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power_white; + led-failsafe = &power_amber; + led-running = &power_white; + led-upgrade = &power_amber; + }; + + chosen { + bootargs = "rootfstype=squashfs noinitrd"; + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio6", "gpio54", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", + "gpio24","gpio26", "gpio53", "gpio64"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + + usb0_pwr_en_pins: usb0_pwr_en_pins { + mux { + pins = "gpio15"; + function = "gpio"; + drive-strength = <12>; + bias-pull-down; + output-high; + }; + }; + + usb1_pwr_en_pins: usb1_pwr_en_pins { + mux { + pins = "gpio16", "gpio68"; + function = "gpio"; + drive-strength = <12>; + bias-pull-down; + output-high; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + ports-implemented = <0x1>; + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + + pinctrl-0 = <&usb0_pwr_en_pins>; + pinctrl-names = "default"; + }; + + usb30@1 { + status = "ok"; + + pinctrl-0 = <&usb1_pwr_en_pins>; + pinctrl-names = "default"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&pcie0_pins>; + pinctrl-names = "default"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&pcie1_pins>; + pinctrl-names = "default"; + force_gen1 = <1>; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + #address-cells = <1>; + #size-cells = <1>; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + qcadata@0 { + label = "qcadata"; + reg = <0x0000000 0x0c80000>; + read-only; + }; + + APPSBL@c80000 { + label = "APPSBL"; + reg = <0x0c80000 0x0500000>; + read-only; + }; + + APPSBLENV@1180000 { + label = "APPSBLENV"; + reg = <0x1180000 0x0080000>; + read-only; + }; + + art: art@1200000 { + label = "art"; + reg = <0x1200000 0x0140000>; + read-only; + }; + + artbak: art@1340000 { + label = "artbak"; + reg = <0x1340000 0x0140000>; + read-only; + }; + + kernel@1480000 { + label = "kernel"; + reg = <0x1480000 0x0400000>; + }; + + ubi@1880000 { + label = "ubi"; + reg = <0x1880000 0x1C00000>; + }; + + netgear@3480000 { + label = "netgear"; + reg = <0x3480000 0x4480000>; + read-only; + }; + + reserve@7900000 { + label = "reserve"; + reg = <0x7900000 0x0700000>; + read-only; + }; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + phy-handle = <&phy4>; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&art 6>; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&art 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + usb1 { + label = "d7800:white:usb1"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb2 { + label = "d7800:white:usb2"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + power_amber: power_amber { + label = "d7800:amber:power"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + wan_white { + label = "d7800:white:wan"; + gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; + }; + + wan_amber { + label = "d7800:amber:wan"; + gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "d7800:white:wps"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; + }; + + esata { + label = "d7800:white:esata"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; + }; + + power_white: power_white { + label = "d7800:white:power"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + wifi { + label = "d7800:white:wifi"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts new file mode 100644 index 0000000000..f4cface193 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -0,0 +1,232 @@ +#include "qcom-ipq8064-v1.0.dtsi" + +/ { + model = "Qualcomm IPQ8064/DB149"; + compatible = "qcom,ipq8064-db149", "qcom,ipq8064"; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + alias { + serial0 = &uart2; + mdio-gpio0 = &mdio0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + i2c4_pins: i2c4_pinmux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + bias-disable; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + drive-strength = <10>; + bias-none; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii0_pins: rgmii0_pins { + mux { + pins = "gpio2", "gpio66"; + drive-strength = <8>; + bias-disable; + }; + }; + }; + + gsbi2: gsbi@12480000 { + qcom,mode = ; + status = "ok"; + uart2: serial@12490000 { + status = "ok"; + }; + }; + + gsbi5: gsbi@1a200000 { + qcom,mode = ; + status = "ok"; + + spi4: spi@1a280000 { + status = "ok"; + spi-max-frequency = <50000000>; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 0>; + + flash: m25p80@0 { + compatible = "s25fl256s1"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; + m25p,fast-read; + + partition@0 { + label = "lowlevel_init"; + reg = <0x0 0x1b0000>; + }; + + partition@1 { + label = "u-boot"; + reg = <0x1b0000 0x80000>; + }; + + partition@2 { + label = "u-boot-env"; + reg = <0x230000 0x40000>; + }; + + partition@3 { + label = "caldata"; + reg = <0x270000 0x40000>; + }; + + partition@4 { + label = "firmware"; + reg = <0x2b0000 0x1d50000>; + }; + }; + }; + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + }; + + usb30@1 { + status = "ok"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + }; + + pcie2: pci@1b900000 { + status = "ok"; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>; + + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + + phy6: ethernet-phy@6 { + reg = <6>; + }; + + phy7: ethernet-phy@7 { + reg = <7>; + }; + }; + + gmac0: ethernet@37000000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <0>; + phy-handle = <&phy4>; + + pinctrl-0 = <&rgmii0_pins>; + pinctrl-names = "default"; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <1>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + phy-handle = <&phy6>; + }; + + gmac3: ethernet@37600000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <3>; + phy-handle = <&phy7>; + }; + }; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts new file mode 100644 index 0000000000..ca8376afd7 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -0,0 +1,400 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "Linksys EA8500 WiFi Router"; + compatible = "linksys,ea8500", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power; + led-failsafe = &power; + led-running = &power; + led-upgrade = &power; + }; + + chosen { + bootargs = "console=ttyMSM0,115200n8"; + stdout-path = "serial0:115200n8"; + append-rootblock = "ubi.mtd="; /* append to bootargs adding the root deviceblock nbr from bootloader */ + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio65", "gpio67", "gpio68"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio6", "gpio53", "gpio54"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + }; + + usb30@1 { + status = "ok"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + force_gen1 = <1>; + }; + + pcie1: pci@1b700000 { + status = "ok"; + }; + + pcie2: pci@1b900000 { + status = "ok"; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + SBL1@0 { + label = "SBL1"; + reg = <0x0000000 0x0040000>; + read-only; + }; + + MIBIB@40000 { + label = "MIBIB"; + reg = <0x0040000 0x0140000>; + read-only; + }; + + SBL2@180000 { + label = "SBL2"; + reg = <0x0180000 0x0140000>; + read-only; + }; + + SBL3@2c0000 { + label = "SBL3"; + reg = <0x02c0000 0x0280000>; + read-only; + }; + + DDRCONFIG@540000 { + label = "DDRCONFIG"; + reg = <0x0540000 0x0120000>; + read-only; + }; + + SSD@660000 { + label = "SSD"; + reg = <0x0660000 0x0120000>; + read-only; + }; + + TZ@780000 { + label = "TZ"; + reg = <0x0780000 0x0280000>; + read-only; + }; + + RPM@a00000 { + label = "RPM"; + reg = <0x0a00000 0x0280000>; + read-only; + }; + + art: art@c80000 { + label = "art"; + reg = <0x0c80000 0x0140000>; + read-only; + }; + + APPSBL@dc0000 { + label = "APPSBL"; + reg = <0x0dc0000 0x0100000>; + read-only; + }; + + u_env@ec0000 { + label = "u_env"; + reg = <0x0ec0000 0x0040000>; + }; + + s_env@f00000 { + label = "s_env"; + reg = <0x0f00000 0x0040000>; + }; + + devinfo@f40000 { + label = "devinfo"; + reg = <0x0f40000 0x0040000>; + }; + + linux@f80000 { + label = "kernel1"; + reg = <0x0f80000 0x2800000>; /* 3 MB spill to rootfs*/ + }; + + rootfs@1280000 { + label = "rootfs1"; + reg = <0x1280000 0x2500000>; + }; + + linux2@3780000 { + label = "kernel2"; + reg = <0x3780000 0x2800000>; + }; + + rootfs2@3a80000 { + label = "rootfs2"; + reg = <0x3a80000 0x2500000>; + }; + + syscfg@5f80000 { + label = "syscfg"; + reg = <0x5f80000 0x2080000>; + }; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + qcom,phy_mdio_addr = <4>; + qcom,poll_required = <1>; + qcom,rgmii_delay = <0>; + qcom,emulation = <0>; + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + //lan + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + qcom,phy_mdio_addr = <0>; /* none */ + qcom,poll_required = <0>; /* no polling */ + qcom,rgmii_delay = <0>; + qcom,emulation = <0>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + adm_dma: dma@18300000 { + status = "ok"; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 67 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 68 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + wps { + label = "ea8500:green:wps"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + }; + + power: power { + label = "ea8500:white:power"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>; + default-state = "keep"; + }; + + wifi { + label = "ea8500:green:wifi"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_HIGH>; + }; + }; +}; + diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts new file mode 100644 index 0000000000..b6505dd541 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -0,0 +1,382 @@ +#include "qcom-ipq8064-v1.0.dtsi" + +#include +#include + +/ { + model = "Netgear Nighthawk X4 R7500"; + compatible = "netgear,r7500", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0xe000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power_white; + led-failsafe = &power_amber; + led-running = &power_white; + led-upgrade = &power_amber; + }; + + chosen { + bootargs = "rootfstype=squashfs noinitrd"; + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio6", "gpio54", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", + "gpio24","gpio26", "gpio53", "gpio64"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + clocks = <&gcc USB30_0_UTMI_CLK>; + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + clocks = <&gcc USB30_0_MASTER_CLK>; + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + clocks = <&gcc USB30_1_UTMI_CLK>; + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + clocks = <&gcc USB30_1_MASTER_CLK>; + status = "ok"; + }; + + usb30@0 { + clocks = <&gcc USB30_1_MASTER_CLK>; + status = "ok"; + }; + + usb30@1 { + clocks = <&gcc USB30_0_MASTER_CLK>; + status = "ok"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + force_gen1 = <1>; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + qcadata@0 { + label = "qcadata"; + reg = <0x0000000 0x0c80000>; + read-only; + }; + + APPSBL@c80000 { + label = "APPSBL"; + reg = <0x0c80000 0x0500000>; + read-only; + }; + + APPSBLENV@1180000 { + label = "APPSBLENV"; + reg = <0x1180000 0x0080000>; + read-only; + }; + + art: art@1200000 { + label = "art"; + reg = <0x1200000 0x0140000>; + read-only; + }; + + kernel@1340000 { + label = "kernel"; + reg = <0x1340000 0x0400000>; + }; + + ubi@1740000 { + label = "ubi"; + reg = <0x1740000 0x1600000>; + }; + + netgear@2d40000 { + label = "netgear"; + reg = <0x2d40000 0x0c00000>; + read-only; + }; + + reserve@3940000 { + label = "reserve"; + reg = <0x3940000 0x46c0000>; + read-only; + }; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&art 6>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&art 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + usb1 { + label = "r7500:white:usb1"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb2 { + label = "r7500:white:usb2"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + power_amber: power_amber { + label = "r7500:amber:power"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + wan_white { + label = "r7500:white:wan"; + gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; + }; + + wan_amber { + label = "r7500:amber:wan"; + gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "r7500:white:wps"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; + }; + + esata { + label = "r7500:white:esata"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; + }; + + power_white: power_white { + label = "r7500:white:power"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + wifi { + label = "r7500:white:wifi"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&tcsr { + qcom,usb-ctrl-select = ; + compatible = "qcom,tcsr"; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts new file mode 100644 index 0000000000..faec8b35ae --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -0,0 +1,407 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "Netgear Nighthawk X4 R7500v2"; + compatible = "netgear,r7500v2", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + + rsvd@5fe00000 { + reg = <0x5fe00000 0x200000>; + reusable; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power; + led-failsafe = &power; + led-running = &power; + led-upgrade = &power; + }; + + chosen { + bootargs = "rootfstype=squashfs noinitrd"; + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio6", "gpio54", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", + "gpio24","gpio26", "gpio53", "gpio64"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + + usb0_pwr_en_pins: usb0_pwr_en_pins { + mux { + pins = "gpio15"; + function = "gpio"; + drive-strength = <12>; + bias-pull-down; + output-high; + }; + }; + + usb1_pwr_en_pins: usb1_pwr_en_pins { + mux { + pins = "gpio16", "gpio68"; + function = "gpio"; + drive-strength = <12>; + bias-pull-down; + output-high; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + + pinctrl-0 = <&usb0_pwr_en_pins>; + pinctrl-names = "default"; + }; + + usb30@1 { + status = "ok"; + + pinctrl-0 = <&usb1_pwr_en_pins>; + pinctrl-names = "default"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&pcie0_pins>; + pinctrl-names = "default"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&pcie1_pins>; + pinctrl-names = "default"; + force_gen1 = <1>; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + qcadata@0 { + label = "qcadata"; + reg = <0x0000000 0x0c80000>; + read-only; + }; + + APPSBL@c80000 { + label = "APPSBL"; + reg = <0x0c80000 0x0500000>; + read-only; + }; + + APPSBLENV@1180000 { + label = "APPSBLENV"; + reg = <0x1180000 0x0080000>; + read-only; + }; + + art: art@1200000 { + label = "art"; + reg = <0x1200000 0x0140000>; + read-only; + }; + + artbak: art@1340000 { + label = "artbak"; + reg = <0x1340000 0x0140000>; + read-only; + }; + + kernel@1480000 { + label = "kernel"; + reg = <0x1480000 0x0400000>; + }; + + ubi@1880000 { + label = "ubi"; + reg = <0x1880000 0x6080000>; + }; + + reserve@7900000 { + label = "reserve"; + reg = <0x7900000 0x0700000>; + read-only; + }; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0xaa545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&art 6>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&art 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + usb1 { + label = "r7500v2:amber:usb1"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb3 { + label = "r7500v2:amber:usb3"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + status { + label = "r7500v2:amber:status"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + internet { + label = "r7500v2:white:internet"; + gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; + }; + + wan { + label = "r7500v2:white:wan"; + gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "r7500v2:white:wps"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; + }; + + esata { + label = "r7500v2:white:esata"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; + }; + + power: power { + label = "r7500v2:white:power"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + wifi { + label = "r7500v2:white:wifi"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi new file mode 100644 index 0000000000..8c522a897d --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi @@ -0,0 +1,30 @@ +#include "qcom-ipq8064-v1.0.dtsi" + +/ { + soc: soc { + + ss_phy_0: phy@110f8830 { + rx_eq = <2>; + tx_deamp_3_5db = <32>; + mpll = <0xa0>; + }; + + ss_phy_1: phy@100f8830 { + rx_eq = <2>; + tx_deamp_3_5db = <32>; + mpll = <0xa0>; + }; + + pcie0: pci@1b500000 { + phy-tx0-term-offset = <0>; + }; + + pcie1: pci@1b700000 { + phy-tx0-term-offset = <0>; + }; + + pcie2: pci@1b900000 { + phy-tx0-term-offset = <0>; + }; + }; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts new file mode 100644 index 0000000000..2c224016b6 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -0,0 +1,417 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "TP-Link Archer VR2600v"; + compatible = "tplink,vr2600v", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power; + led-failsafe = &general; + led-running = &power; + led-upgrade = &general; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + led_pins: led_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", "gpio16", "gpio17", + "gpio26", "gpio53", "gpio56", "gpio66"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + button_pins: button_pins { + mux { + pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + bias-pull-down; + }; + + data { + pins = "gpio18", "gpio19"; + drive-strength = <10>; + }; + + cs { + pins = "gpio20"; + drive-strength = <10>; + bias-pull-up; + }; + + clk { + pins = "gpio21"; + drive-strength = <12>; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + gsbi5: gsbi@1a200000 { + qcom,mode = ; + status = "ok"; + + spi4: spi@1a280000 { + status = "ok"; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; + + flash: W25Q128@0 { + compatible = "jedec,spi-nor"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; + + SBL1@0 { + label = "SBL1"; + reg = <0x0 0x20000>; + read-only; + }; + + MIBIB@20000 { + label = "MIBIB"; + reg = <0x20000 0x20000>; + read-only; + }; + + SBL2@40000 { + label = "SBL2"; + reg = <0x40000 0x40000>; + read-only; + }; + + SBL3@80000 { + label = "SBL3"; + reg = <0x80000 0x80000>; + read-only; + }; + + DDRCONFIG@100000 { + label = "DDRCONFIG"; + reg = <0x100000 0x10000>; + read-only; + }; + + SSD@110000 { + label = "SSD"; + reg = <0x110000 0x10000>; + read-only; + }; + + TZ@120000 { + label = "TZ"; + reg = <0x120000 0x80000>; + read-only; + }; + + RPM@1a0000 { + label = "RPM"; + reg = <0x1a0000 0x80000>; + read-only; + }; + + APPSBL@220000 { + label = "APPSBL"; + reg = <0x220000 0x80000>; + read-only; + }; + + APPSBLENV@2a0000 { + label = "APPSBLENV"; + reg = <0x2a0000 0x40000>; + read-only; + }; + + OLDART@2e0000 { + label = "OLDART"; + reg = <0x2e0000 0x40000>; + read-only; + }; + + kernel@320000 { + label = "kernel"; + reg = <0x320000 0x300000>; + }; + + rootfs@620000 { + label = "rootfs"; + reg = <0x620000 0x960000>; + }; + + defaultmac: default-mac@0xfaf100 { + label = "default-mac"; + reg = <0xfaf100 0x00200>; + read-only; + }; + + ART@fc0000 { + label = "ART"; + reg = <0xfc0000 0x40000>; + read-only; + }; + }; + }; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + }; + + usb30@1 { + status = "ok"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + force_gen1 = <1>; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&defaultmac 0>; + mtd-mac-address-increment = <1>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&defaultmac 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + dect { + label = "dect"; + gpios = <&qcom_pinmux 67 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + ledswitch { + label = "ledswitch"; + gpios = <&qcom_pinmux 68 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + dsl { + label = "vr2600v:white:dsl"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb { + label = "vr2600v:white:usb"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + lan { + label = "vr2600v:white:lan"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + wlan2g { + label = "vr2600v:white:wlan2g"; + gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>; + }; + + wlan5g { + label = "vr2600v:white:wlan5g"; + gpios = <&qcom_pinmux 17 GPIO_ACTIVE_HIGH>; + }; + + power: power { + label = "vr2600v:white:power"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + phone { + label = "vr2600v:white:phone"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + }; + + wan { + label = "vr2600v:white:wan"; + gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>; + }; + + general: general { + label = "vr2600v:white:general"; + gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts new file mode 100644 index 0000000000..e2a481723b --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts @@ -0,0 +1,442 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "NEC Aterm WG2600HP"; + compatible = "nec,wg2600hp", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; + led-upgrade = &power_green; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x06000000 /* PAD0_MODE */ + 0x0000c 0x00080080 /* PAD6_MODE */ + 0x000e4 0x0006a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x0000004e /* PORT0_STATUS */ + 0x00094 0x0000004e /* PORT6_STATUS */ + >; + }; + + ethernet-phy@4 { + reg = <4>; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + bridge { + label = "bridge"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + converter { + label = "converter"; + gpios = <&qcom_pinmux 25 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + converter_green { + label = "wg2600hp:green:converter"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>; + }; + + power_red: power_red { + label = "wg2600hp:red:power"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + active_green { + label = "wg2600hp:green:active"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + active_red { + label = "wg2600hp:red:active"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + power_green: power_green { + label = "wg2600hp:green:power"; + gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>; + }; + + converter_red { + label = "wg2600hp:red:converter"; + gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>; + }; + + wlan2g_green { + label = "wg2600hp:green:wlan2g"; + gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>; + }; + + wlan2g_red { + label = "wg2600hp:red:wlan2g"; + gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>; + }; + + wlan5g_green { + label = "wg2600hp:green:wlan5g"; + gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>; + }; + + wlan5g_red { + label = "wg2600hp:red:wlan5g"; + gpios = <&qcom_pinmux 58 GPIO_ACTIVE_HIGH>; + }; + + tv_green { + label = "wg2600hp:green:tv"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; + }; + + tv_red { + label = "wg2600hp:red:tv"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&adm_dma { + status = "okay"; +}; + +&gmac1 { + status = "okay"; + + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&PRODUCTDATA 6>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gmac2 { + status = "okay"; + + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&PRODUCTDATA 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gsbi4 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi4_serial { + status = "okay"; +}; + +&gsbi5 { + status = "okay"; + + qcom,mode = ; + + spi@1a280000 { + status = "okay"; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + SBL1@0 { + label = "SBL1"; + reg = <0x0 0x20000>; + read-only; + }; + + MIBIB@20000 { + label = "MIBIB"; + reg = <0x20000 0x20000>; + read-only; + }; + + SBL2@40000 { + label = "SBL2"; + reg = <0x40000 0x40000>; + read-only; + }; + + SBL3@80000 { + label = "SBL3"; + reg = <0x80000 0x80000>; + read-only; + }; + + DDRCONFIG@100000 { + label = "DDRCONFIG"; + reg = <0x100000 0x10000>; + read-only; + }; + + SSD@110000 { + label = "SSD"; + reg = <0x110000 0x10000>; + read-only; + }; + + TZ@120000 { + label = "TZ"; + reg = <0x120000 0x80000>; + read-only; + }; + + RPM@1a0000 { + label = "RPM"; + reg = <0x1a0000 0x80000>; + read-only; + }; + + APPSBL@220000 { + label = "APPSBL"; + reg = <0x220000 0x80000>; + read-only; + }; + + APPSBLENV@2a0000 { + label = "APPSBLENV"; + reg = <0x2a0000 0x10000>; + }; + + PRODUCTDATA: PRODUCTDATA@2b0000 { + label = "PRODUCTDATA"; + reg = <0x2b0000 0x30000>; + read-only; + }; + + ART@2e0000 { + label = "ART"; + reg = <0x2e0000 0x40000>; + read-only; + }; + + TP@320000 { + label = "TP"; + reg = <0x320000 0x40000>; + read-only; + }; + + TINY@360000 { + label = "TINY"; + reg = <0x360000 0x500000>; + read-only; + }; + + firmware@860000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x860000 0x17a0000>; + }; + }; + }; + }; +}; + +&hs_phy_0 { /* USB3 port 0 HS phy */ + status = "okay"; +}; + +&ss_phy_0 { /* USB3 port 0 SS phy */ + status = "okay"; +}; + +&hs_phy_1 { /* USB3 port 1 HS phy */ + status = "okay"; +}; + +&ss_phy_1 { /* USB3 port 1 SS phy */ + status = "okay"; +}; + +&usb3_0 { + status = "okay"; + + pinctrl-0 = <&usb_pwr_en_pins>; + pinctrl-names = "default"; +}; + +&usb3_1 { + status = "okay"; +}; + +&pcie0 { + status = "okay"; +}; + +&pcie1 { + status = "okay"; + force_gen1 = <1>; +}; + +&qcom_pinmux { + button_pins: button_pins { + mux { + pins = "gpio16", "gpio54", "gpio24", "gpio25"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14", + "gpio15", "gpio55", "gpio56", "gpio57", "gpio58", + "gpio64", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + bias-pull-down; + }; + + data { + pins = "gpio18", "gpio19"; + drive-strength = <10>; + }; + + cs { + pins = "gpio20"; + drive-strength = <10>; + bias-pull-up; + }; + + clk { + pins = "gpio21"; + drive-strength = <12>; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + + usb_pwr_en_pins: usb_pwr_en_pins { + mux { + pins = "gpio22"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + output-high; + }; + }; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts new file mode 100644 index 0000000000..14258d594e --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -0,0 +1,568 @@ +/* + * BSD LICENSE + * + * Copyright (C) 2017 Christian Mehlis + * Copyright (C) 2018 Mathias Kresin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the names of the copyright holders nor the names of any + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "qcom-ipq8064-v1.0.dtsi" + +#include +#include + +/ { + compatible = "compex,wpq864", "qcom,ipq8064"; + model = "Compex WPQ864"; + + aliases { + mdio-gpio0 = &mdio0; + serial0 = &gsbi4_serial; + ethernet0 = &gmac1; + ethernet1 = &gmac0; + + led-boot = &led_pass; + led-failsafe = &led_fail; + led-running = &led_pass; + led-upgrade = &led_pass; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + rpm@108000 { + pinctrl-0 = <&rpm_pins>; + pinctrl-names = "default"; + }; + + nand@1ac00000 { + status = "okay"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + mt29f2g08abbeah4@0 { + compatible = "qcom,nandcs"; + + reg = <0>; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + SBL1@0 { + label = "SBL1"; + reg = <0x0000000 0x0040000>; + read-only; + }; + + MIBIB@40000 { + label = "MIBIB"; + reg = <0x0040000 0x0140000>; + read-only; + }; + + SBL2@180000 { + label = "SBL2"; + reg = <0x0180000 0x0140000>; + read-only; + }; + + SBL3@2c0000 { + label = "SBL3"; + reg = <0x02c0000 0x0280000>; + read-only; + }; + + DDRCONFIG@540000 { + label = "DDRCONFIG"; + reg = <0x0540000 0x0120000>; + read-only; + }; + + SSD@660000 { + label = "SSD"; + reg = <0x0660000 0x0120000>; + read-only; + }; + + TZ@780000 { + label = "TZ"; + reg = <0x0780000 0x0280000>; + read-only; + }; + + RPM@a00000 { + label = "RPM"; + reg = <0x0a00000 0x0280000>; + read-only; + }; + + APPSBL@c80000 { + label = "APPSBL"; + reg = <0x0c80000 0x0500000>; + read-only; + }; + + APPSBLENV@1180000 { + label = "APPSBLENV"; + reg = <0x1180000 0x0080000>; + }; + + ART@1200000 { + label = "ART"; + reg = <0x1200000 0x0140000>; + }; + + ubi@1340000 { + label = "ubi"; + reg = <0x1340000 0x4000000>; + }; + + BOOTCONFIG@5340000 { + label = "BOOTCONFIG"; + reg = <0x5340000 0x0060000>; + }; + + SBL2-1@53a0000- { + label = "SBL2_1"; + reg = <0x53a0000 0x0140000>; + read-only; + }; + + SBL3-1@54e0000 { + label = "SBL3_1"; + reg = <0x54e0000 0x0280000>; + read-only; + }; + + DDRCONFIG-1@5760000 { + label = "DDRCONFIG_1"; + reg = <0x5760000 0x0120000>; + read-only; + }; + + SSD-1@5880000 { + label = "SSD_1"; + reg = <0x5880000 0x0120000>; + read-only; + }; + + TZ-1@59a0000 { + label = "TZ_1"; + reg = <0x59a0000 0x0280000>; + read-only; + }; + + RPM-1@5c20000 { + label = "RPM_1"; + reg = <0x5c20000 0x0280000>; + read-only; + }; + + BOOTCONFIG1@5ea0000 { + label = "BOOTCONFIG1"; + reg = <0x5ea0000 0x0060000>; + }; + + APPSBL-1@5f00000 { + label = "APPSBL_1"; + reg = <0x5f00000 0x0500000>; + read-only; + }; + + ubi-1@6400000 { + label = "ubi_1"; + reg = <0x6400000 0x4000000>; + }; + + unused@a400000 { + label = "unused"; + reg = <0xa400000 0x5c00000>; + }; + }; + }; + }; + }; + + mdio0: mdio { + #address-cells = <1>; + #size-cells = <0>; + + compatible = "virtual,mdio-gpio"; + + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + + ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + ethernet-phy@4 { + reg = <4>; + }; + }; + + leds { + compatible = "gpio-leds"; + + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + rss4 { + label = "wpq864:green:rss4"; + gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; + }; + + rss3 { + label = "wpq864:green:rss3"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + rss2 { + label = "wpq864:orange:rss2"; + gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>; + }; + + rss1 { + label = "wpq864:red:rss1"; + gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; + }; + + led_pass: pass { + label = "wpq864:green:pass"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + }; + + led_fail: fail { + label = "wpq864:green:fail"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + usb { + label = "wpq864:green:usb"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb-pcie { + label = "wpq864:green:usb-pcie"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + beeper { + compatible = "gpio-beeper"; + + pinctrl-0 = <&beeper_pins>; + pinctrl-names = "default"; + + gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>; + }; +}; + +&adm_dma { + status = "okay"; +}; + +&gmac1 { + status = "okay"; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + phy-mode = "rgmii"; + qcom,id = <1>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gmac2 { + status = "okay"; + + phy-mode = "sgmii"; + qcom,id = <2>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gsbi4 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi4_serial { + status = "okay"; + + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; +}; + +&gsbi5 { + status = "okay"; + + qcom,mode = ; + + spi@1a280000 { + status = "okay"; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; + + s25fl256s1@0 { + compatible = "jedec,spi-nor"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + spi-max-frequency = <50000000>; + }; + }; +}; + +&hs_phy_0 { /* USB3 port 0 HS phy */ + status = "okay"; +}; + +&hs_phy_1 { /* USB3 port 1 HS phy */ + status = "okay"; +}; + +&ss_phy_0 { /* USB3 port 0 SS phy */ + status = "okay"; + + rx_eq = <2>; + tx_deamp_3_5db = <32>; + mpll = <160>; +}; + +&ss_phy_1 { /* USB3 port 1 SS phy */ + status = "okay"; + + rx_eq = <2>; + tx_deamp_3_5db = <32>; + mpll = <160>; +}; + +&pcie0 { + status = "okay"; + + /delete-property/ pinctrl-0; + /delete-property/ pinctrl-names; + /delete-property/ perst-gpios; +}; + +&pcie1 { + status = "okay"; +}; + +&pcie2 { + status = "okay"; + + /delete-property/ pinctrl-0; + /delete-property/ pinctrl-names; + /delete-property/ perst-gpios; +}; + +&qcom_pinmux { + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinctrl0 { + pcie0_pcie2_perst { + pins = "gpio3"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", "gpio22", + "gpio23", "gpio24", "gpio25", "gpio53"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + button_pins: button_pins { + mux { + pins = "gpio54"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + beeper_pins: beeper_pins { + mux { + pins = "gpio55"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + rpm_pins: rpm_pins { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <10>; + bias-disable; + }; + }; + + uart0_pins: uart0_pins { + mux { + pins = "gpio10", "gpio11"; + function = "gsbi4"; + drive-strength = <10>; + bias-disable; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19"; + function = "gsbi5"; + drive-strength = <10>; + bias-pull-down; + }; + + clk { + pins = "gpio21"; + function = "gsbi5"; + drive-strength = <12>; + bias-pull-down; + }; + + cs { + pins = "gpio20"; + function = "gpio"; + drive-strength = <10>; + bias-pull-up; + }; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", "gpio37", + "gpio38", "gpio39", "gpio40", "gpio41", + "gpio42", "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + + pullups { + pins = "gpio39"; + bias-pull-up; + }; + + hold { + pins = "gpio40", "gpio41", "gpio42", "gpio43", + "gpio44", "gpio45", "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", + "gpio31", "gpio32", "gpio51", "gpio52", + "gpio59", "gpio60", "gpio61", "gpio62"; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; +}; + +&usb3_0 { + status = "okay"; +}; + + +&usb3_1 { + status = "okay"; +}; + +&tcsr { + qcom,usb-ctrl-select = ; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts new file mode 100644 index 0000000000..7b5ee799ee --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -0,0 +1,535 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +#include "qcom-ipq8064-v2.0.dtsi" + +#include + +/ { + model = "Buffalo WXR-2533DHP"; + compatible = "buffalo,wxr-2533dhp", "qcom,ipq8064"; + + memory@42000000 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + + led-boot = &power; + led-failsafe = &diag; + led-running = &power; + led-upgrade = &power; + }; + + chosen { + /* use "ubi_rootfs" volume in "ubi" partition as rootfs */ + bootargs = "ubi.block=0,1 root=/dev/ubiblock0_1 rootfstype=squashfs"; + stdout-path = "serial0:115200n8"; + }; + + soc { + nand@1ac00000 { + status = "okay"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs@0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + ubi@0 { + label = "ubi"; + reg = <0x0000000 0x4000000>; + }; + + rootfs_1@4000000 { + label = "rootfs_1"; + reg = <0x4000000 0x4000000>; + }; + }; + }; + }; + + mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x07600000 /* PAD0_MODE */ + 0x00008 0x01000000 /* PAD5_MODE */ + 0x0000c 0x00000080 /* PAD6_MODE */ + 0x00050 0xcc35cc35 /* LED_CTRL0 */ + 0x00054 0xca35ca35 /* LED_CTRL1 */ + 0x00058 0xc935c935 /* LED_CTRL2 */ + 0x0005c 0x03ffff00 /* LED_CTRL3 */ + 0x000e4 0x0006a545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x0000007e /* PORT0_STATUS */ + 0x00094 0x0000007e /* PORT6_STATUS */ + >; + }; + + ethernet-phy@4 { + reg = <4>; + }; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + usb { + label = "wxr-2533dhp:green:usb"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "usbport"; + trigger-sources = <&hub_port0 &hub_port1>; + }; + + guestport { + label = "wxr-2533dhp:green:guestport"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + diag: diag { + label = "wxr-2533dhp:orange:diag"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + internet_orange { + label = "wxr-2533dhp:orange:internet"; + gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>; + }; + + internet_white { + label = "wxr-2533dhp:white:internet"; + gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; + }; + + wireless_orange { + label = "wxr-2533dhp:orange:wireless"; + gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; + }; + + wireless_white { + label = "wxr-2533dhp:white:wireless"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; + }; + + router_orange { + label = "wxr-2533dhp:orange:router"; + gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>; + }; + + router_white { + label = "wxr-2533dhp:white:router"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>; + }; + + power: power { + label = "wxr-2533dhp:white:power"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + power { + label = "power"; + gpios = <&qcom_pinmux 58 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + eject { + label = "eject"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + guest { + label = "guest"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + ap { + label = "ap"; + gpios = <&qcom_pinmux 55 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + router { + label = "router"; + gpios = <&qcom_pinmux 56 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + auto { + label = "auto"; + gpios = <&qcom_pinmux 57 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + }; +}; + +&adm_dma { + status = "okay"; +}; + +&gmac1 { + status = "okay"; + + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&ART 6>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gmac2 { + status = "ok"; + + phy-mode = "sgmii"; + qcom,id = <2>; + + mtd-mac-address = <&ART 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gsbi4 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi4_serial { + status = "okay"; + + pinctrl-0 = <&uart0_pins>; + pinctrl-names = "default"; +}; + +&gsbi5 { + status = "okay"; + qcom,mode = ; + + spi@1a280000 { + status = "okay"; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + SBL1@0 { + label = "SBL1"; + reg = <0x0 0x10000>; + read-only; + }; + + MIBIB@10000 { + label = "MIBIB"; + reg = <0x10000 0x20000>; + read-only; + }; + + SBL2@30000 { + label = "SBL2"; + reg = <0x30000 0x30000>; + read-only; + }; + + SBL3@60000 { + label = "SBL3"; + reg = <0x60000 0x30000>; + read-only; + }; + + DDRCONFIG@90000 { + label = "DDRCONFIG"; + reg = <0x90000 0x10000>; + read-only; + }; + + SSD@a0000 { + label = "SSD"; + reg = <0xa0000 0x10000>; + read-only; + }; + + TZ@b0000 { + label = "TZ"; + reg = <0xb0000 0x30000>; + read-only; + }; + + RPM@e0000 { + label = "RPM"; + reg = <0xe0000 0x20000>; + read-only; + }; + + APPSBL@100000 { + label = "APPSBL"; + reg = <0x100000 0x70000>; + read-only; + }; + + APPSBLENV@170000 { + label = "APPSBLENV"; + reg = <0x170000 0x10000>; + read-only; + }; + + ART: ART@180000 { + label = "ART"; + reg = <0x180000 0x40000>; + read-only; + }; + + BOOTCONFIG@1c0000 { + label = "BOOTCONFIG"; + reg = <0x1c0000 0x10000>; + read-only; + }; + + APPSBL_1@1d0000 { + label = "APPSBL_1"; + reg = <0x1d0000 0x70000>; + read-only; + }; + }; + }; + }; +}; + +&hs_phy_0 { /* USB3 port 0 HS phy */ + status = "okay"; +}; + +&ss_phy_0 { /* USB3 port 0 SS phy */ + status = "okay"; +}; + +&hs_phy_1 { /* USB3 port 1 HS phy */ + status = "okay"; +}; + +&ss_phy_1 { /* USB3 port 1 SS phy */ + status = "okay"; +}; + +&usb3_0 { + status = "okay"; + + pinctrl-0 = <&usb_pwr_en_pins>; + pinctrl-names = "default"; +}; + +&usb3_1 { + status = "okay"; +}; + +&dwc3_0 { + #address-cells = <1>; + #size-cells = <0>; + + hub_port0: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + +&dwc3_1 { + #address-cells = <1>; + #size-cells = <0>; + + hub_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + +&pcie0 { + status = "okay"; +}; + +&pcie1 { + status = "okay"; + force_gen1 = <1>; +}; + +&qcom_pinmux { + button_pins: button_pins { + mux { + pins = "gpio6", "gpio54", "gpio55", "gpio56", "gpio57", + "gpio58", "gpio64", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", "gpio16", "gpio22", + "gpio23", "gpio24", "gpio25", "gpio26", "gpio53"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + uart0_pins: uart0_pins { + mux { + pins = "gpio10", "gpio11"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + bias-pull-down; + }; + + data { + pins = "gpio18", "gpio19"; + drive-strength = <10>; + }; + + cs{ + pins = "gpio20"; + drive-strength = <10>; + bias-pull-up; + }; + + clk { + pins = "gpio21"; + drive-strength = <12>; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + + pullups { + pins = "gpio39"; + bias-pull-up; + }; + + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + }; + + usb_pwr_en_pins: usb_pwr_en_pins { + mux{ + pins = "gpio68"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + output-high; + }; + }; +}; \ No newline at end of file diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi new file mode 100644 index 0000000000..8387460d27 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -0,0 +1,1410 @@ +/dts-v1/; + +#include "skeleton.dtsi" +#include +#include +#include +#include +#include +#include +#include +#include + +/ { + model = "Qualcomm IPQ8064"; + compatible = "qcom,ipq8064"; + interrupt-parent = <&intc>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu0: cpu@0 { + compatible = "qcom,krait"; + enable-method = "qcom,kpss-acc-v1"; + device_type = "cpu"; + reg = <0>; + next-level-cache = <&L2>; + qcom,acc = <&acc0>; + qcom,saw = <&saw0>; + clocks = <&kraitcc 0>, <&kraitcc 4>; + clock-names = "cpu", "l2"; + clock-latency = <100000>; + cpu-supply = <&smb208_s2a>; + voltage-tolerance = <5>; + cooling-min-state = <0>; + cooling-max-state = <10>; + #cooling-cells = <2>; + cpu-idle-states = <&CPU_SPC>; + }; + + cpu1: cpu@1 { + compatible = "qcom,krait"; + enable-method = "qcom,kpss-acc-v1"; + device_type = "cpu"; + reg = <1>; + next-level-cache = <&L2>; + qcom,acc = <&acc1>; + qcom,saw = <&saw1>; + clocks = <&kraitcc 1>, <&kraitcc 4>; + clock-names = "cpu", "l2"; + clock-latency = <100000>; + cpu-supply = <&smb208_s2b>; + cooling-min-state = <0>; + cooling-max-state = <10>; + #cooling-cells = <2>; + cpu-idle-states = <&CPU_SPC>; + }; + + L2: l2-cache { + compatible = "cache"; + cache-level = <2>; + qcom,saw = <&saw_l2>; + }; + + qcom,l2 { + qcom,l2-rates = <384000000 1000000000 1200000000>; + }; + + idle-states { + CPU_SPC: spc { + compatible = "qcom,idle-state-spc", + "arm,idle-state"; + entry-latency-us = <400>; + exit-latency-us = <900>; + min-residency-us = <3000>; + }; + }; + }; + + thermal-zones { + tsens_tz_sensor0 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 0>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor1 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 1>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor2 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 2>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor3 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 3>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor4 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 4>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor5 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 5>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor6 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 6>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor7 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 7>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor8 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 8>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor9 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 9>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + + tsens_tz_sensor10 { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens 10>; + + trips { + cpu-critical-hi { + temperature = <125000>; + hysteresis = <2000>; + type = "critical_high"; + }; + + cpu-config-hi { + temperature = <105000>; + hysteresis = <2000>; + type = "configurable_hi"; + }; + + cpu-config-lo { + temperature = <95000>; + hysteresis = <2000>; + type = "configurable_lo"; + }; + + cpu-critical-low { + temperature = <0>; + hysteresis = <2000>; + type = "critical_low"; + }; + }; + }; + }; + + cpu-pmu { + compatible = "qcom,krait-pmu"; + interrupts = <1 10 0x304>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + nss@40000000 { + reg = <0x40000000 0x1000000>; + no-map; + }; + + smem: smem@41000000 { + reg = <0x41000000 0x200000>; + no-map; + }; + }; + + clocks { + cxo_board { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + }; + + pxo_board { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + }; + + sleep_clk: sleep_clk { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; + }; + }; + + firmware { + scm { + compatible = "qcom,scm-ipq806x"; + }; + }; + + kraitcc: clock-controller { + compatible = "qcom,krait-cc-v1"; + #clock-cells = <1>; + }; + + qcom,pvs { + qcom,pvs-format-a; + qcom,speed0-pvs0-bin-v0 = + < 1400000000 1250000 >, + < 1200000000 1200000 >, + < 1000000000 1150000 >, + < 800000000 1100000 >, + < 600000000 1050000 >, + < 384000000 1000000 >; + + qcom,speed0-pvs1-bin-v0 = + < 1400000000 1175000 >, + < 1200000000 1125000 >, + < 1000000000 1075000 >, + < 800000000 1025000 >, + < 600000000 975000 >, + < 384000000 925000 >; + + qcom,speed0-pvs2-bin-v0 = + < 1400000000 1125000 >, + < 1200000000 1075000 >, + < 1000000000 1025000 >, + < 800000000 995000 >, + < 600000000 925000 >, + < 384000000 875000 >; + + qcom,speed0-pvs3-bin-v0 = + < 1400000000 1050000 >, + < 1200000000 1000000 >, + < 1000000000 950000 >, + < 800000000 900000 >, + < 600000000 850000 >, + < 384000000 800000 >; + }; + + soc: soc { + #address-cells = <1>; + #size-cells = <1>; + ranges; + compatible = "simple-bus"; + + lpass@28100000 { + compatible = "qcom,lpass-cpu"; + status = "disabled"; + clocks = <&lcc AHBIX_CLK>, + <&lcc MI2S_OSR_CLK>, + <&lcc MI2S_BIT_CLK>; + clock-names = "ahbix-clk", + "mi2s-osr-clk", + "mi2s-bit-clk"; + interrupts = <0 85 1>; + interrupt-names = "lpass-irq-lpaif"; + reg = <0x28100000 0x10000>; + reg-names = "lpass-lpaif"; + }; + + qfprom: qfprom@700000 { + compatible = "qcom,qfprom", "syscon"; + reg = <0x700000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + status = "okay"; + tsens_calib: calib@400 { + reg = <0x400 0x10>; + }; + tsens_backup: backup@410 { + reg = <0x410 0x10>; + }; + }; + + rpm@108000 { + compatible = "qcom,rpm-ipq8064"; + reg = <0x108000 0x1000>; + qcom,ipc = <&l2cc 0x8 2>; + + interrupts = <0 19 0>, + <0 21 0>, + <0 22 0>; + interrupt-names = "ack", + "err", + "wakeup"; + + clocks = <&gcc RPM_MSG_RAM_H_CLK>; + clock-names = "ram"; + + #address-cells = <1>; + #size-cells = <0>; + + rpmcc: clock-controller { + compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc"; + #clock-cells = <1>; + }; + + regulators { + compatible = "qcom,rpm-smb208-regulators"; + + smb208_s1a: s1a { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1150000>; + + qcom,switch-mode-frequency = <1200000>; + + }; + + smb208_s1b: s1b { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1150000>; + + qcom,switch-mode-frequency = <1200000>; + }; + + smb208_s2a: s2a { + regulator-min-microvolt = < 800000>; + regulator-max-microvolt = <1250000>; + + qcom,switch-mode-frequency = <1200000>; + }; + + smb208_s2b: s2b { + regulator-min-microvolt = < 800000>; + regulator-max-microvolt = <1250000>; + + qcom,switch-mode-frequency = <1200000>; + }; + }; + }; + + rng@1a500000 { + compatible = "qcom,prng"; + reg = <0x1a500000 0x200>; + clocks = <&gcc PRNG_CLK>; + clock-names = "core"; + }; + + qcom_pinmux: pinmux@800000 { + compatible = "qcom,ipq8064-pinctrl"; + reg = <0x800000 0x4000>; + + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + interrupts = <0 16 0x4>; + + pcie0_pins: pcie0_pinmux { + mux { + pins = "gpio3"; + function = "pcie1_rst"; + drive-strength = <2>; + bias-disable; + }; + }; + + pcie1_pins: pcie1_pinmux { + mux { + pins = "gpio48"; + function = "pcie2_rst"; + drive-strength = <2>; + bias-disable; + }; + }; + + pcie2_pins: pcie2_pinmux { + mux { + pins = "gpio63"; + function = "pcie3_rst"; + drive-strength = <2>; + bias-disable; + output-low; + }; + }; + }; + + intc: interrupt-controller@2000000 { + compatible = "qcom,msm-qgic2"; + interrupt-controller; + #interrupt-cells = <3>; + reg = <0x02000000 0x1000>, + <0x02002000 0x1000>; + }; + + timer@200a000 { + compatible = "qcom,kpss-timer", "qcom,msm-timer"; + interrupts = <1 1 0x301>, + <1 2 0x301>, + <1 3 0x301>, + <1 4 0x301>, + <1 5 0x301>; + reg = <0x0200a000 0x100>; + clock-frequency = <25000000>, + <32768>; + clocks = <&sleep_clk>; + clock-names = "sleep"; + cpu-offset = <0x80000>; + }; + + acc0: clock-controller@2088000 { + compatible = "qcom,kpss-acc-v1"; + reg = <0x02088000 0x1000>, <0x02008000 0x1000>; + clock-output-names = "acpu0_aux"; + }; + + acc1: clock-controller@2098000 { + compatible = "qcom,kpss-acc-v1"; + reg = <0x02098000 0x1000>, <0x02008000 0x1000>; + clock-output-names = "acpu1_aux"; + }; + + l2cc: clock-controller@2011000 { + compatible = "qcom,kpss-gcc", "syscon"; + reg = <0x2011000 0x1000>; + clock-output-names = "acpu_l2_aux"; + }; + + saw0: regulator@2089000 { + compatible = "qcom,saw2", "syscon"; + reg = <0x02089000 0x1000>, <0x02009000 0x1000>; + regulator; + }; + + saw1: regulator@2099000 { + compatible = "qcom,saw2", "syscon"; + reg = <0x02099000 0x1000>, <0x02009000 0x1000>; + regulator; + }; + + saw_l2: regulator@02012000 { + compatible = "qcom,saw2", "syscon"; + reg = <0x02012000 0x1000>; + regulator; + }; + + sic_non_secure: sic-non-secure@12100000 { + compatible = "syscon"; + reg = <0x12100000 0x10000>; + }; + + gsbi2: gsbi@12480000 { + compatible = "qcom,gsbi-v1.0.0"; + cell-index = <2>; + reg = <0x12480000 0x100>; + clocks = <&gcc GSBI2_H_CLK>; + clock-names = "iface"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "disabled"; + + syscon-tcsr = <&tcsr>; + + uart2: serial@12490000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x12490000 0x1000>, + <0x12480000 0x1000>; + interrupts = <0 195 0x0>; + clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + }; + + i2c@124a0000 { + compatible = "qcom,i2c-qup-v1.1.1"; + reg = <0x124a0000 0x1000>; + interrupts = <0 196 0>; + + clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + }; + + }; + + gsbi4: gsbi@16300000 { + compatible = "qcom,gsbi-v1.0.0"; + cell-index = <4>; + reg = <0x16300000 0x100>; + clocks = <&gcc GSBI4_H_CLK>; + clock-names = "iface"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "disabled"; + + syscon-tcsr = <&tcsr>; + + gsbi4_serial: serial@16340000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x16340000 0x1000>, + <0x16300000 0x1000>; + interrupts = <0 152 0x0>; + clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + }; + + i2c@16380000 { + compatible = "qcom,i2c-qup-v1.1.1"; + reg = <0x16380000 0x1000>; + interrupts = <0 153 0>; + + clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + gsbi5: gsbi@1a200000 { + compatible = "qcom,gsbi-v1.0.0"; + cell-index = <5>; + reg = <0x1a200000 0x100>; + clocks = <&gcc GSBI5_H_CLK>; + clock-names = "iface"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "disabled"; + + syscon-tcsr = <&tcsr>; + + uart5: serial@1a240000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x1a240000 0x1000>, + <0x1a200000 0x1000>; + interrupts = <0 154 0x0>; + clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + }; + + i2c@1a280000 { + compatible = "qcom,i2c-qup-v1.1.1"; + reg = <0x1a280000 0x1000>; + interrupts = <0 155 0>; + + clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + }; + + spi@1a280000 { + compatible = "qcom,spi-qup-v1.1.1"; + reg = <0x1a280000 0x1000>; + interrupts = <0 155 0>; + + clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + sata_phy: sata-phy@1b400000 { + compatible = "qcom,ipq806x-sata-phy"; + reg = <0x1b400000 0x200>; + + clocks = <&gcc SATA_PHY_CFG_CLK>; + clock-names = "cfg"; + + #phy-cells = <0>; + status = "disabled"; + }; + + sata@29000000 { + compatible = "qcom,ipq806x-ahci", "generic-ahci"; + reg = <0x29000000 0x180>; + + ports-implemented = <0x1>; + + interrupts = <0 209 0x0>; + + clocks = <&gcc SFAB_SATA_S_H_CLK>, + <&gcc SATA_H_CLK>, + <&gcc SATA_A_CLK>, + <&gcc SATA_RXOOB_CLK>, + <&gcc SATA_PMALIVE_CLK>; + clock-names = "slave_face", "iface", "core", + "rxoob", "pmalive"; + + assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>; + assigned-clock-rates = <100000000>, <100000000>; + + phys = <&sata_phy>; + phy-names = "sata-phy"; + status = "disabled"; + }; + + qcom,ssbi@500000 { + compatible = "qcom,ssbi"; + reg = <0x00500000 0x1000>; + qcom,controller-type = "pmic-arbiter"; + }; + + gcc: clock-controller@900000 { + compatible = "qcom,gcc-ipq8064"; + reg = <0x00900000 0x4000>; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + + tsens: thermal-sensor@900000 { + compatible = "qcom,ipq8064-tsens"; + reg = <0x900000 0x3680>; + nvmem-cells = <&tsens_calib>, <&tsens_backup>; + nvmem-cell-names = "calib", "calib_backup"; + interrupts = <0 178 0>; + #thermal-sensor-cells = <1>; + }; + + tcsr: syscon@1a400000 { + compatible = "qcom,tcsr-ipq8064", "syscon"; + reg = <0x1a400000 0x100>; + }; + + lcc: clock-controller@28000000 { + compatible = "qcom,lcc-ipq8064"; + reg = <0x28000000 0x1000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + sfpb_mutex_block: syscon@1200600 { + compatible = "syscon"; + reg = <0x01200600 0x100>; + }; + + hs_phy_1: phy@100f8800 { + compatible = "qcom,dwc3-hs-usb-phy"; + reg = <0x100f8800 0x30>; + clocks = <&gcc USB30_1_UTMI_CLK>; + clock-names = "ref"; + #phy-cells = <0>; + + status = "disabled"; + }; + + ss_phy_1: phy@100f8830 { + compatible = "qcom,dwc3-ss-usb-phy"; + reg = <0x100f8830 0x30>; + clocks = <&gcc USB30_1_MASTER_CLK>; + clock-names = "ref"; + #phy-cells = <0>; + + status = "disabled"; + }; + + hs_phy_0: phy@110f8800 { + compatible = "qcom,dwc3-hs-usb-phy"; + reg = <0x110f8800 0x30>; + clocks = <&gcc USB30_0_UTMI_CLK>; + clock-names = "ref"; + #phy-cells = <0>; + + status = "disabled"; + }; + + ss_phy_0: phy@110f8830 { + compatible = "qcom,dwc3-ss-usb-phy"; + reg = <0x110f8830 0x30>; + clocks = <&gcc USB30_0_MASTER_CLK>; + clock-names = "ref"; + #phy-cells = <0>; + + status = "disabled"; + }; + + usb3_0: usb30@0 { + compatible = "qcom,dwc3"; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&gcc USB30_0_MASTER_CLK>; + clock-names = "core"; + + ranges; + + resets = <&gcc USB30_0_MASTER_RESET>; + reset-names = "usb30_0_mstr_rst"; + + status = "disabled"; + + dwc3_0: dwc3@11000000 { + compatible = "snps,dwc3"; + reg = <0x11000000 0xcd00>; + interrupts = <0 110 0x4>; + phys = <&hs_phy_0>, <&ss_phy_0>; + phy-names = "usb2-phy", "usb3-phy"; + dr_mode = "host"; + snps,dis_u3_susphy_quirk; + }; + }; + + usb3_1: usb30@1 { + compatible = "qcom,dwc3"; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&gcc USB30_1_MASTER_CLK>; + clock-names = "core"; + + ranges; + + resets = <&gcc USB30_1_MASTER_RESET>; + reset-names = "usb30_1_mstr_rst"; + + status = "disabled"; + + dwc3_1: dwc3@10000000 { + compatible = "snps,dwc3"; + reg = <0x10000000 0xcd00>; + interrupts = <0 205 0x4>; + phys = <&hs_phy_1>, <&ss_phy_1>; + phy-names = "usb2-phy", "usb3-phy"; + dr_mode = "host"; + snps,dis_u3_susphy_quirk; + }; + }; + + pcie0: pci@1b500000 { + compatible = "qcom,pcie-ipq8064"; + reg = <0x1b500000 0x1000 + 0x1b502000 0x80 + 0x1b600000 0x100 + 0x0ff00000 0x100000>; + reg-names = "dbi", "elbi", "parf", "config"; + device_type = "pci"; + linux,pci-domain = <0>; + bus-range = <0x00 0xff>; + num-lanes = <1>; + #address-cells = <3>; + #size-cells = <2>; + + ranges = <0x81000000 0 0x0fe00000 0x0fe00000 0 0x00100000 /* downstream I/O */ + 0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */ + + interrupts = ; + interrupt-names = "msi"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0x7>; + interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ + <0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ + <0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ + <0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + + clocks = <&gcc PCIE_A_CLK>, + <&gcc PCIE_H_CLK>, + <&gcc PCIE_PHY_CLK>, + <&gcc PCIE_AUX_CLK>, + <&gcc PCIE_ALT_REF_CLK>; + clock-names = "core", "iface", "phy", "aux", "ref"; + + assigned-clocks = <&gcc PCIE_ALT_REF_CLK>; + assigned-clock-rates = <100000000>; + + resets = <&gcc PCIE_ACLK_RESET>, + <&gcc PCIE_HCLK_RESET>, + <&gcc PCIE_POR_RESET>, + <&gcc PCIE_PCI_RESET>, + <&gcc PCIE_PHY_RESET>, + <&gcc PCIE_EXT_RESET>; + reset-names = "axi", "ahb", "por", "pci", "phy", "ext"; + + pinctrl-0 = <&pcie0_pins>; + pinctrl-names = "default"; + + perst-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; + + phy-tx0-term-offset = <7>; + + status = "disabled"; + }; + + pcie1: pci@1b700000 { + compatible = "qcom,pcie-ipq8064"; + reg = <0x1b700000 0x1000 + 0x1b702000 0x80 + 0x1b800000 0x100 + 0x31f00000 0x100000>; + reg-names = "dbi", "elbi", "parf", "config"; + device_type = "pci"; + linux,pci-domain = <1>; + bus-range = <0x00 0xff>; + num-lanes = <1>; + #address-cells = <3>; + #size-cells = <2>; + + ranges = <0x81000000 0 0x31e00000 0x31e00000 0 0x00100000 /* downstream I/O */ + 0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */ + + interrupts = ; + interrupt-names = "msi"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0x7>; + interrupt-map = <0 0 0 1 &intc 0 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ + <0 0 0 2 &intc 0 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ + <0 0 0 3 &intc 0 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ + <0 0 0 4 &intc 0 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + + clocks = <&gcc PCIE_1_A_CLK>, + <&gcc PCIE_1_H_CLK>, + <&gcc PCIE_1_PHY_CLK>, + <&gcc PCIE_1_AUX_CLK>, + <&gcc PCIE_1_ALT_REF_CLK>; + clock-names = "core", "iface", "phy", "aux", "ref"; + + assigned-clocks = <&gcc PCIE_1_ALT_REF_CLK>; + assigned-clock-rates = <100000000>; + + resets = <&gcc PCIE_1_ACLK_RESET>, + <&gcc PCIE_1_HCLK_RESET>, + <&gcc PCIE_1_POR_RESET>, + <&gcc PCIE_1_PCI_RESET>, + <&gcc PCIE_1_PHY_RESET>, + <&gcc PCIE_1_EXT_RESET>; + reset-names = "axi", "ahb", "por", "pci", "phy", "ext"; + + pinctrl-0 = <&pcie1_pins>; + pinctrl-names = "default"; + + perst-gpios = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; + + phy-tx0-term-offset = <7>; + + status = "disabled"; + }; + + pcie2: pci@1b900000 { + compatible = "qcom,pcie-ipq8064"; + reg = <0x1b900000 0x1000 + 0x1b902000 0x80 + 0x1ba00000 0x100 + 0x35f00000 0x100000>; + reg-names = "dbi", "elbi", "parf", "config"; + device_type = "pci"; + linux,pci-domain = <2>; + bus-range = <0x00 0xff>; + num-lanes = <1>; + #address-cells = <3>; + #size-cells = <2>; + + ranges = <0x81000000 0 0x35e00000 0x35e00000 0 0x00100000 /* downstream I/O */ + 0x82000000 0 0x32000000 0x32000000 0 0x03e00000>; /* non-prefetchable memory */ + + interrupts = ; + interrupt-names = "msi"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0x7>; + interrupt-map = <0 0 0 1 &intc 0 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ + <0 0 0 2 &intc 0 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ + <0 0 0 3 &intc 0 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ + <0 0 0 4 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + + clocks = <&gcc PCIE_2_A_CLK>, + <&gcc PCIE_2_H_CLK>, + <&gcc PCIE_2_PHY_CLK>, + <&gcc PCIE_2_AUX_CLK>, + <&gcc PCIE_2_ALT_REF_CLK>; + clock-names = "core", "iface", "phy", "aux", "ref"; + + assigned-clocks = <&gcc PCIE_2_ALT_REF_CLK>; + assigned-clock-rates = <100000000>; + + resets = <&gcc PCIE_2_ACLK_RESET>, + <&gcc PCIE_2_HCLK_RESET>, + <&gcc PCIE_2_POR_RESET>, + <&gcc PCIE_2_PCI_RESET>, + <&gcc PCIE_2_PHY_RESET>, + <&gcc PCIE_2_EXT_RESET>; + reset-names = "axi", "ahb", "por", "pci", "phy", "ext"; + + pinctrl-0 = <&pcie2_pins>; + pinctrl-names = "default"; + + perst-gpios = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>; + + phy-tx0-term-offset = <7>; + + status = "disabled"; + }; + + adm_dma: dma@18300000 { + compatible = "qcom,adm"; + reg = <0x18300000 0x100000>; + interrupts = <0 170 0>; + #dma-cells = <1>; + + clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>; + clock-names = "core", "iface"; + + resets = <&gcc ADM0_RESET>, + <&gcc ADM0_PBUS_RESET>, + <&gcc ADM0_C0_RESET>, + <&gcc ADM0_C1_RESET>, + <&gcc ADM0_C2_RESET>; + reset-names = "clk", "pbus", "c0", "c1", "c2"; + qcom,ee = <0>; + + status = "disabled"; + }; + + nand@1ac00000 { + compatible = "qcom,ipq806x-nand"; + reg = <0x1ac00000 0x800>; + + clocks = <&gcc EBI2_CLK>, + <&gcc EBI2_AON_CLK>; + clock-names = "core", "aon"; + + dmas = <&adm_dma 3>; + dma-names = "rxtx"; + qcom,cmd-crci = <15>; + qcom,data-crci = <3>; + + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + }; + + nss_common: syscon@03000000 { + compatible = "syscon"; + reg = <0x03000000 0x0000FFFF>; + }; + + qsgmii_csr: syscon@1bb00000 { + compatible = "syscon"; + reg = <0x1bb00000 0x000001FF>; + }; + + stmmac_axi_setup: stmmac-axi-config { + snps,wr_osr_lmt = <7>; + snps,rd_osr_lmt = <7>; + snps,blen = <16 0 0 0 0 0 0>; + }; + + gmac0: ethernet@37000000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37000000 0x200000>; + interrupts = ; + interrupt-names = "macirq"; + + snps,axi-config = <&stmmac_axi_setup>; + snps,pbl = <32>; + snps,aal = <1>; + + qcom,nss-common = <&nss_common>; + qcom,qsgmii-csr = <&qsgmii_csr>; + + clocks = <&gcc GMAC_CORE1_CLK>; + clock-names = "stmmaceth"; + + resets = <&gcc GMAC_CORE1_RESET>; + reset-names = "stmmaceth"; + + status = "disabled"; + }; + + gmac1: ethernet@37200000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37200000 0x200000>; + interrupts = ; + interrupt-names = "macirq"; + + snps,axi-config = <&stmmac_axi_setup>; + snps,pbl = <32>; + snps,aal = <1>; + + qcom,nss-common = <&nss_common>; + qcom,qsgmii-csr = <&qsgmii_csr>; + + clocks = <&gcc GMAC_CORE2_CLK>; + clock-names = "stmmaceth"; + + resets = <&gcc GMAC_CORE2_RESET>; + reset-names = "stmmaceth"; + + status = "disabled"; + }; + + gmac2: ethernet@37400000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37400000 0x200000>; + interrupts = ; + interrupt-names = "macirq"; + + snps,axi-config = <&stmmac_axi_setup>; + snps,pbl = <32>; + snps,aal = <1>; + + qcom,nss-common = <&nss_common>; + qcom,qsgmii-csr = <&qsgmii_csr>; + + clocks = <&gcc GMAC_CORE3_CLK>; + clock-names = "stmmaceth"; + + resets = <&gcc GMAC_CORE3_RESET>; + reset-names = "stmmaceth"; + + status = "disabled"; + }; + + gmac3: ethernet@37600000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37600000 0x200000>; + interrupts = ; + interrupt-names = "macirq"; + + snps,axi-config = <&stmmac_axi_setup>; + snps,pbl = <32>; + snps,aal = <1>; + + qcom,nss-common = <&nss_common>; + qcom,qsgmii-csr = <&qsgmii_csr>; + + clocks = <&gcc GMAC_CORE4_CLK>; + clock-names = "stmmaceth"; + + resets = <&gcc GMAC_CORE4_RESET>; + reset-names = "stmmaceth"; + + status = "disabled"; + }; + + /* Temporary fixed regulator */ + vsdcc_fixed: vsdcc-regulator { + compatible = "regulator-fixed"; + regulator-name = "SDCC Power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + sdcc1bam:dma@12402000 { + compatible = "qcom,bam-v1.3.0"; + reg = <0x12402000 0x8000>; + interrupts = <0 98 0>; + clocks = <&gcc SDC1_H_CLK>; + clock-names = "bam_clk"; + #dma-cells = <1>; + qcom,ee = <0>; + }; + + sdcc3bam:dma@12182000 { + compatible = "qcom,bam-v1.3.0"; + reg = <0x12182000 0x8000>; + interrupts = <0 96 0>; + clocks = <&gcc SDC3_H_CLK>; + clock-names = "bam_clk"; + #dma-cells = <1>; + qcom,ee = <0>; + }; + + amba { + compatible = "arm,amba-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + sdcc1: sdcc@12400000 { + status = "disabled"; + compatible = "arm,pl18x", "arm,primecell"; + arm,primecell-periphid = <0x00051180>; + reg = <0x12400000 0x2000>; + interrupts = ; + interrupt-names = "cmd_irq"; + clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>; + clock-names = "mclk", "apb_pclk"; + bus-width = <8>; + max-frequency = <96000000>; + non-removable; + cap-sd-highspeed; + cap-mmc-highspeed; + vmmc-supply = <&vsdcc_fixed>; + dmas = <&sdcc1bam 2>, <&sdcc1bam 1>; + dma-names = "tx", "rx"; + }; + + sdcc3: sdcc@12180000 { + compatible = "arm,pl18x", "arm,primecell"; + arm,primecell-periphid = <0x00051180>; + status = "disabled"; + reg = <0x12180000 0x2000>; + interrupts = ; + interrupt-names = "cmd_irq"; + clocks = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>; + clock-names = "mclk", "apb_pclk"; + bus-width = <8>; + cap-sd-highspeed; + cap-mmc-highspeed; + max-frequency = <192000000>; + #mmc-ddr-1_8v; + sd-uhs-sdr104; + sd-uhs-ddr50; + vqmmc-supply = <&vsdcc_fixed>; + dmas = <&sdcc3bam 2>, <&sdcc3bam 1>; + dma-names = "tx", "rx"; + }; + }; + }; + + sfpb_mutex: sfpb-mutex { + compatible = "qcom,sfpb-mutex"; + syscon = <&sfpb_mutex_block 4 4>; + + #hwlock-cells = <1>; + }; + + smem { + compatible = "qcom,smem"; + memory-region = <&smem>; + hwlocks = <&sfpb_mutex 3>; + }; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts new file mode 100644 index 0000000000..7cd1c7b567 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -0,0 +1,386 @@ +#include "qcom-ipq8065.dtsi" + +#include + +/ { + model = "ZyXEL NBG6817"; + compatible = "zyxel,nbg6817", "qcom,ipq8065"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + sdcc1 = &sdcc1; + + led-boot = &power; + led-failsafe = &power; + led-running = &power; + led-upgrade = &power; + }; + + chosen { + bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd"; + stdout-path = "serial0:115200n8"; + append-rootblock = "root=/dev/mmcblk0p"; + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio53", "gpio54", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + mux { + pins = "gpio9", "gpio26", "gpio33", "gpio64"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + + clk { + pins = "gpio1"; + input-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + + tx { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ; + input-disable; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + drive-strength = <10>; + bias-none; + }; + + cs { + pins = "gpio20"; + drive-strength = <12>; + }; + }; + + usb0_pwr_en_pins: usb0_pwr_en_pins { + mux { + pins = "gpio16", "gpio17"; + function = "gpio"; + drive-strength = <12>; + }; + + pwr { + pins = "gpio17"; + bias-pull-down; + output-high; + }; + + ovc { + pins = "gpio16"; + bias-pull-up; + }; + }; + + usb1_pwr_en_pins: usb1_pwr_en_pins { + mux { + pins = "gpio14", "gpio15"; + function = "gpio"; + drive-strength = <12>; + }; + + pwr { + pins = "gpio14"; + bias-pull-down; + output-high; + }; + + ovc { + pins = "gpio15"; + bias-pull-up; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + gsbi5: gsbi@1a200000 { + qcom,mode = ; + status = "ok"; + + spi4: spi@1a280000 { + status = "ok"; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; + + flash: m25p80@0 { + compatible = "jedec,spi-nor"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <51200000>; + reg = <0>; + + partitions { + compatible = "qcom,smem"; + }; + }; + }; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + + pinctrl-0 = <&usb0_pwr_en_pins>; + pinctrl-names = "default"; + }; + + usb30@1 { + status = "ok"; + + pinctrl-0 = <&usb1_pwr_en_pins>; + pinctrl-names = "default"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&pcie0_pins>; + pinctrl-names = "default"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&pcie1_pins>; + pinctrl-names = "default"; + force_gen1 = <1>; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0xaa545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + 0x00970 0x1e864443 /* QM_PORT0_CTRL0 */ + 0x00974 0x000001c6 /* QM_PORT0_CTRL1 */ + 0x00978 0x19008643 /* QM_PORT1_CTRL0 */ + 0x0097c 0x000001c6 /* QM_PORT1_CTRL1 */ + 0x00980 0x19008643 /* QM_PORT2_CTRL0 */ + 0x00984 0x000001c6 /* QM_PORT2_CTRL1 */ + 0x00988 0x19008643 /* QM_PORT3_CTRL0 */ + 0x0098c 0x000001c6 /* QM_PORT3_CTRL1 */ + 0x00990 0x19008643 /* QM_PORT4_CTRL0 */ + 0x00994 0x000001c6 /* QM_PORT4_CTRL1 */ + 0x00998 0x1e864443 /* QM_PORT5_CTRL0 */ + 0x0099c 0x000001c6 /* QM_PORT5_CTRL1 */ + 0x009a0 0x1e864443 /* QM_PORT6_CTRL0 */ + 0x009a4 0x000001c6 /* QM_PORT6_CTRL1 */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + qca,ar8327-initvals = < + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x0000c 0x80 /* PAD6_MODE */ + >; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + qcom,phy_mdio_addr = <4>; + qcom,poll_required = <0>; + qcom,rgmii_delay = <1>; + qcom,phy_mii_type = <0>; + qcom,emulation = <0>; + qcom,irq = <255>; + mdiobus = <&mdio0>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + qcom,phy_mdio_addr = <0>; /* none */ + qcom,poll_required = <0>; /* no polling */ + qcom,rgmii_delay = <0>; + qcom,phy_mii_type = <1>; + qcom,emulation = <0>; + qcom,irq = <258>; + mdiobus = <&mdio0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + amba { + sdcc1: sdcc@12400000 { + status = "okay"; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + internet { + label = "nbg6817:white:internet"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; + }; + + power: power { + label = "nbg6817:white:power"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + wifi2g { + label = "nbg6817:amber:wifi2g"; + gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>; + }; + + /* wifi2g amber from the manual is missing */ + + wifi5g { + label = "nbg6817:amber:wifi5g"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; + }; + + /* wifi5g amber from the manual is missing */ + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts new file mode 100644 index 0000000000..447c0da696 --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -0,0 +1,513 @@ +#include "qcom-ipq8065.dtsi" + +#include + +/ { + model = "Netgear Nighthawk X4S R7800"; + compatible = "netgear,r7800", "qcom,ipq8065", "qcom,ipq8064"; + + memory@0 { + reg = <0x42000000 0x1e000000>; + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + + rsvd@5fe00000 { + reg = <0x5fe00000 0x200000>; + reusable; + }; + }; + + aliases { + serial0 = &gsbi4_serial; + mdio-gpio0 = &mdio0; + + led-boot = &power_white; + led-failsafe = &power_amber; + led-running = &power_white; + led-upgrade = &power_amber; + label-mac-device = &gmac2; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + soc { + pinmux@800000 { + button_pins: button_pins { + mux { + pins = "gpio6", "gpio54", "gpio65"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + i2c4_pins: i2c4_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + led_pins: led_pins { + pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", + "gpio24","gpio26", "gpio53", "gpio64"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; + }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; + + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + + clk { + pins = "gpio1"; + input-disable; + }; + }; + + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; + }; + + tx { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ; + input-disable; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + bias-pull-down; + }; + + data { + pins = "gpio18", "gpio19"; + drive-strength = <10>; + }; + + cs { + pins = "gpio20"; + drive-strength = <10>; + bias-pull-up; + }; + + clk { + pins = "gpio21"; + drive-strength = <12>; + }; + }; + + spi6_pins: spi6_pins { + mux { + pins = "gpio55", "gpio56", "gpio58"; + function = "gsbi6"; + bias-pull-down; + }; + + mosi { + pins = "gpio55"; + drive-strength = <12>; + }; + + miso { + pins = "gpio56"; + drive-strength = <14>; + }; + + cs { + pins = "gpio57"; + drive-strength = <12>; + bias-pull-up; + }; + + clk { + pins = "gpio58"; + drive-strength = <12>; + }; + + reset { + pins = "gpio33"; + drive-strength = <10>; + bias-pull-down; + output-high; + }; + }; + + usb0_pwr_en_pins: usb0_pwr_en_pins { + mux { + pins = "gpio15"; + function = "gpio"; + drive-strength = <12>; + bias-pull-down; + output-high; + }; + }; + + usb1_pwr_en_pins: usb1_pwr_en_pins { + mux { + pins = "gpio16", "gpio68"; + function = "gpio"; + drive-strength = <12>; + bias-pull-down; + output-high; + }; + }; + }; + + gsbi@16300000 { + qcom,mode = ; + status = "ok"; + serial@16340000 { + status = "ok"; + }; + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ + }; + + sata-phy@1b400000 { + status = "ok"; + }; + + sata@29000000 { + ports-implemented = <0x1>; + status = "ok"; + }; + + phy@100f8800 { /* USB3 port 1 HS phy */ + status = "ok"; + }; + + phy@100f8830 { /* USB3 port 1 SS phy */ + status = "ok"; + }; + + phy@110f8800 { /* USB3 port 0 HS phy */ + status = "ok"; + }; + + phy@110f8830 { /* USB3 port 0 SS phy */ + status = "ok"; + }; + + usb30@0 { + status = "ok"; + + pinctrl-0 = <&usb0_pwr_en_pins>; + pinctrl-names = "default"; + }; + + usb30@1 { + status = "ok"; + + pinctrl-0 = <&usb1_pwr_en_pins>; + pinctrl-names = "default"; + }; + + pcie0: pci@1b500000 { + status = "ok"; + }; + + pcie1: pci@1b700000 { + status = "ok"; + force_gen1 = <1>; + }; + + nand@1ac00000 { + status = "ok"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + qcadata@0 { + label = "qcadata"; + reg = <0x0000000 0x0c80000>; + read-only; + }; + + APPSBL@c80000 { + label = "APPSBL"; + reg = <0x0c80000 0x0500000>; + read-only; + }; + + APPSBLENV@1180000 { + label = "APPSBLENV"; + reg = <0x1180000 0x0080000>; + read-only; + }; + + art: art@1200000 { + label = "art"; + reg = <0x1200000 0x0140000>; + read-only; + }; + + artbak: art@1340000 { + label = "artbak"; + reg = <0x1340000 0x0140000>; + read-only; + }; + + kernel@1480000 { + label = "kernel"; + reg = <0x1480000 0x0400000>; + }; + + ubi@1880000 { + label = "ubi"; + reg = <0x1880000 0x6080000>; + }; + + reserve@7900000 { + label = "reserve"; + reg = <0x7900000 0x0700000>; + read-only; + }; + }; + }; + }; + + mdio0: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0xaa545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + 0x00970 0x1e864443 /* QM_PORT0_CTRL0 */ + 0x00974 0x000001c6 /* QM_PORT0_CTRL1 */ + 0x00978 0x19008643 /* QM_PORT1_CTRL0 */ + 0x0097c 0x000001c6 /* QM_PORT1_CTRL1 */ + 0x00980 0x19008643 /* QM_PORT2_CTRL0 */ + 0x00984 0x000001c6 /* QM_PORT2_CTRL1 */ + 0x00988 0x19008643 /* QM_PORT3_CTRL0 */ + 0x0098c 0x000001c6 /* QM_PORT3_CTRL1 */ + 0x00990 0x19008643 /* QM_PORT4_CTRL0 */ + 0x00994 0x000001c6 /* QM_PORT4_CTRL1 */ + 0x00998 0x1e864443 /* QM_PORT5_CTRL0 */ + 0x0099c 0x000001c6 /* QM_PORT5_CTRL1 */ + 0x009a0 0x1e864443 /* QM_PORT6_CTRL0 */ + 0x009a4 0x000001c6 /* QM_PORT6_CTRL1 */ + >; + qca,ar8327-vlans = < + 0x1 0x5e /* VLAN1 Ports 1/2/3/4/6 */ + 0x2 0x21 /* VLAN2 Ports 0/5 */ + >; + }; + + phy4: ethernet-phy@4 { + reg = <4>; + qca,ar8327-initvals = < + 0x000e4 0x6a545 /* MAC_POWER_SEL */ + 0x0000c 0x80 /* PAD6_MODE */ + >; + }; + }; + + gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + qcom,id = <1>; + qcom,phy_mdio_addr = <4>; + qcom,poll_required = <0>; + qcom,rgmii_delay = <1>; + qcom,phy_mii_type = <0>; + qcom,emulation = <0>; + qcom,irq = <255>; + mdiobus = <&mdio0>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + mtd-mac-address = <&art 6>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; + qcom,phy_mdio_addr = <0>; /* none */ + qcom,poll_required = <0>; /* no polling */ + qcom,rgmii_delay = <0>; + qcom,phy_mii_type = <1>; + qcom,emulation = <0>; + qcom,irq = <258>; + mdiobus = <&mdio0>; + + mtd-mac-address = <&art 0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + wifi { + label = "wifi"; + gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>; + linux,code = ; + debounce-interval = <60>; + wakeup-source; + }; + + reset { + label = "reset"; + gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; + linux,code = ; + debounce-interval = <60>; + wakeup-source; + }; + + wps { + label = "wps"; + gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>; + linux,code = ; + debounce-interval = <60>; + wakeup-source; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&led_pins>; + pinctrl-names = "default"; + + power_white: power_white { + label = "r7800:white:power"; + gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + power_amber: power_amber { + label = "r7800:amber:power"; + gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + }; + + wan_white { + label = "r7800:white:wan"; + gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; + }; + + wan_amber { + label = "r7800:amber:wan"; + gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; + }; + + usb1 { + label = "r7800:white:usb1"; + gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; + }; + + usb2 { + label = "r7800:white:usb2"; + gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; + }; + + esata { + label = "r7800:white:esata"; + gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; + }; + + wifi { + label = "r7800:white:wifi"; + gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "r7800:white:wps"; + gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&adm_dma { + status = "ok"; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi new file mode 100644 index 0000000000..86de2bd8be --- /dev/null +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi @@ -0,0 +1,78 @@ +#include "qcom-ipq8064-v2.0.dtsi" + +/ { + model = "Qualcomm IPQ8065"; + compatible = "qcom,ipq8065", "qcom,ipq8064"; + + qcom,pvs { + qcom,pvs-format-a; + qcom,speed0-pvs0-bin-v0 = + < 1725000000 1262500 >, + < 1400000000 1175000 >, + < 1000000000 1100000 >, + < 800000000 1050000 >, + < 600000000 1000000 >, + < 384000000 975000 >; + qcom,speed0-pvs1-bin-v0 = + < 1725000000 1225000 >, + < 1400000000 1150000 >, + < 1000000000 1075000 >, + < 800000000 1025000 >, + < 600000000 975000 >, + < 384000000 950000 >; + qcom,speed0-pvs2-bin-v0 = + < 1725000000 1200000 >, + < 1400000000 1125000 >, + < 1000000000 1050000 >, + < 800000000 1000000 >, + < 600000000 950000 >, + < 384000000 925000 >; + qcom,speed0-pvs3-bin-v0 = + < 1725000000 1175000 >, + < 1400000000 1100000 >, + < 1000000000 1025000 >, + < 800000000 975000 >, + < 600000000 925000 >, + < 384000000 900000 >; + qcom,speed0-pvs4-bin-v0 = + < 1725000000 1150000 >, + < 1400000000 1075000 >, + < 1000000000 1000000 >, + < 800000000 950000 >, + < 600000000 900000 >, + < 384000000 875000 >; + qcom,speed0-pvs5-bin-v0 = + < 1725000000 1100000 >, + < 1400000000 1025000 >, + < 1000000000 950000 >, + < 800000000 900000 >, + < 600000000 850000 >, + < 384000000 825000 >; + qcom,speed0-pvs6-bin-v0 = + < 1725000000 1050000 >, + < 1400000000 975000 >, + < 1000000000 900000 >, + < 800000000 850000 >, + < 600000000 800000 >, + < 384000000 775000 >; + }; + + soc: soc { + + rpm@108000 { + + regulators { + + smb208_s2a: s2a { + regulator-min-microvolt = <775000>; + regulator-max-microvolt = <1275000>; + }; + + smb208_s2b: s2b { + regulator-min-microvolt = <775000>; + regulator-max-microvolt = <1275000>; + }; + }; + }; + }; +}; diff --git a/target/linux/ipq806x/patches-4.19/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch b/target/linux/ipq806x/patches-4.19/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch new file mode 100644 index 0000000000..83d7bbc6f4 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch @@ -0,0 +1,71 @@ +From 28d0ed88f536dd639adf1b0c7c08e04be3c8f294 Mon Sep 17 00:00:00 2001 +From: Thomas Pedersen +Date: Mon, 16 May 2016 17:58:50 -0700 +Subject: [PATCH 01/69] dtbindings: qcom_adm: Fix channel specifiers + +Original patch from Andy Gross. + +This patch removes the crci information from the dma +channel property. At least one client device requires +using more than one CRCI value for a channel. This does +not match the current binding and the crci information +needs to be removed. + +Instead, the client device will provide this information +via other means. + +Signed-off-by: Andy Gross +Signed-off-by: Thomas Pedersen +--- + Documentation/devicetree/bindings/dma/qcom_adm.txt | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +--- a/Documentation/devicetree/bindings/dma/qcom_adm.txt ++++ b/Documentation/devicetree/bindings/dma/qcom_adm.txt +@@ -4,8 +4,7 @@ Required properties: + - compatible: must contain "qcom,adm" for IPQ/APQ8064 and MSM8960 + - reg: Address range for DMA registers + - interrupts: Should contain one interrupt shared by all channels +-- #dma-cells: must be <2>. First cell denotes the channel number. Second cell +- denotes CRCI (client rate control interface) flow control assignment. ++- #dma-cells: must be <1>. First cell denotes the channel number. + - clocks: Should contain the core clock and interface clock. + - clock-names: Must contain "core" for the core clock and "iface" for the + interface clock. +@@ -22,7 +21,7 @@ Example: + compatible = "qcom,adm"; + reg = <0x18300000 0x100000>; + interrupts = <0 170 0>; +- #dma-cells = <2>; ++ #dma-cells = <1>; + + clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>; + clock-names = "core", "iface"; +@@ -35,15 +34,12 @@ Example: + qcom,ee = <0>; + }; + +-DMA clients must use the format descripted in the dma.txt file, using a three ++DMA clients must use the format descripted in the dma.txt file, using a two + cell specifier for each channel. + +-Each dmas request consists of 3 cells: ++Each dmas request consists of two cells: + 1. phandle pointing to the DMA controller + 2. channel number +- 3. CRCI assignment, if applicable. If no CRCI flow control is required, use 0. +- The CRCI is used for flow control. It identifies the peripheral device that +- is the source/destination for the transferred data. + + Example: + +@@ -55,7 +51,7 @@ Example: + + cs-gpios = <&qcom_pinmux 20 0>; + +- dmas = <&adm_dma 6 9>, +- <&adm_dma 5 10>; ++ dmas = <&adm_dma 6>, ++ <&adm_dma 5>; + dma-names = "rx", "tx"; + }; diff --git a/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch b/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch new file mode 100644 index 0000000000..fedb8ed798 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch @@ -0,0 +1,966 @@ +From 563fa24db4e529c5a3311928d73a8a90531ee527 Mon Sep 17 00:00:00 2001 +From: Thomas Pedersen +Date: Mon, 16 May 2016 17:58:51 -0700 +Subject: [PATCH 02/69] dmaengine: Add ADM driver + +Original patch by Andy Gross. + +Add the DMA engine driver for the QCOM Application Data Mover (ADM) DMA +controller found in the MSM8x60 and IPQ/APQ8064 platforms. + +The ADM supports both memory to memory transactions and memory +to/from peripheral device transactions. The controller also provides flow +control capabilities for transactions to/from peripheral devices. + +The initial release of this driver supports slave transfers to/from peripherals +and also incorporates CRCI (client rate control interface) flow control. + +Signed-off-by: Andy Gross +Signed-off-by: Thomas Pedersen +--- + drivers/dma/qcom/Kconfig | 10 + + drivers/dma/qcom/Makefile | 1 + + drivers/dma/qcom/qcom_adm.c | 900 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 911 insertions(+) + create mode 100644 drivers/dma/qcom/qcom_adm.c + +--- a/drivers/dma/qcom/Kconfig ++++ b/drivers/dma/qcom/Kconfig +@@ -27,3 +27,13 @@ config QCOM_HIDMA + (user to kernel, kernel to kernel, etc.). It only supports + memcpy interface. The core is not intended for general + purpose slave DMA. ++ ++config QCOM_ADM ++ tristate "Qualcomm ADM support" ++ depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM) ++ select DMA_ENGINE ++ select DMA_VIRTUAL_CHANNELS ++ ---help--- ++ Enable support for the Qualcomm ADM DMA controller. This controller ++ provides DMA capabilities for both general purpose and on-chip ++ peripheral devices. +--- a/drivers/dma/qcom/Makefile ++++ b/drivers/dma/qcom/Makefile +@@ -4,3 +4,4 @@ obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mg + hdma_mgmt-objs := hidma_mgmt.o hidma_mgmt_sys.o + obj-$(CONFIG_QCOM_HIDMA) += hdma.o + hdma-objs := hidma_ll.o hidma.o hidma_dbg.o ++obj-$(CONFIG_QCOM_ADM) += qcom_adm.o +--- /dev/null ++++ b/drivers/dma/qcom/qcom_adm.c +@@ -0,0 +1,914 @@ ++/* ++ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "../dmaengine.h" ++#include "../virt-dma.h" ++ ++/* ADM registers - calculated from channel number and security domain */ ++#define ADM_CHAN_MULTI 0x4 ++#define ADM_CI_MULTI 0x4 ++#define ADM_CRCI_MULTI 0x4 ++#define ADM_EE_MULTI 0x800 ++#define ADM_CHAN_OFFS(chan) (ADM_CHAN_MULTI * chan) ++#define ADM_EE_OFFS(ee) (ADM_EE_MULTI * ee) ++#define ADM_CHAN_EE_OFFS(chan, ee) (ADM_CHAN_OFFS(chan) + ADM_EE_OFFS(ee)) ++#define ADM_CHAN_OFFS(chan) (ADM_CHAN_MULTI * chan) ++#define ADM_CI_OFFS(ci) (ADM_CHAN_OFF(ci)) ++#define ADM_CH_CMD_PTR(chan, ee) (ADM_CHAN_EE_OFFS(chan, ee)) ++#define ADM_CH_RSLT(chan, ee) (0x40 + ADM_CHAN_EE_OFFS(chan, ee)) ++#define ADM_CH_FLUSH_STATE0(chan, ee) (0x80 + ADM_CHAN_EE_OFFS(chan, ee)) ++#define ADM_CH_STATUS_SD(chan, ee) (0x200 + ADM_CHAN_EE_OFFS(chan, ee)) ++#define ADM_CH_CONF(chan) (0x240 + ADM_CHAN_OFFS(chan)) ++#define ADM_CH_RSLT_CONF(chan, ee) (0x300 + ADM_CHAN_EE_OFFS(chan, ee)) ++#define ADM_SEC_DOMAIN_IRQ_STATUS(ee) (0x380 + ADM_EE_OFFS(ee)) ++#define ADM_CI_CONF(ci) (0x390 + ci * ADM_CI_MULTI) ++#define ADM_GP_CTL 0x3d8 ++#define ADM_CRCI_CTL(crci, ee) (0x400 + crci * ADM_CRCI_MULTI + \ ++ ADM_EE_OFFS(ee)) ++ ++/* channel status */ ++#define ADM_CH_STATUS_VALID BIT(1) ++ ++/* channel result */ ++#define ADM_CH_RSLT_VALID BIT(31) ++#define ADM_CH_RSLT_ERR BIT(3) ++#define ADM_CH_RSLT_FLUSH BIT(2) ++#define ADM_CH_RSLT_TPD BIT(1) ++ ++/* channel conf */ ++#define ADM_CH_CONF_SHADOW_EN BIT(12) ++#define ADM_CH_CONF_MPU_DISABLE BIT(11) ++#define ADM_CH_CONF_PERM_MPU_CONF BIT(9) ++#define ADM_CH_CONF_FORCE_RSLT_EN BIT(7) ++#define ADM_CH_CONF_SEC_DOMAIN(ee) (((ee & 0x3) << 4) | ((ee & 0x4) << 11)) ++ ++/* channel result conf */ ++#define ADM_CH_RSLT_CONF_FLUSH_EN BIT(1) ++#define ADM_CH_RSLT_CONF_IRQ_EN BIT(0) ++ ++/* CRCI CTL */ ++#define ADM_CRCI_CTL_MUX_SEL BIT(18) ++#define ADM_CRCI_CTL_RST BIT(17) ++ ++/* CI configuration */ ++#define ADM_CI_RANGE_END(x) (x << 24) ++#define ADM_CI_RANGE_START(x) (x << 16) ++#define ADM_CI_BURST_4_WORDS BIT(2) ++#define ADM_CI_BURST_8_WORDS BIT(3) ++ ++/* GP CTL */ ++#define ADM_GP_CTL_LP_EN BIT(12) ++#define ADM_GP_CTL_LP_CNT(x) (x << 8) ++ ++/* Command pointer list entry */ ++#define ADM_CPLE_LP BIT(31) ++#define ADM_CPLE_CMD_PTR_LIST BIT(29) ++ ++/* Command list entry */ ++#define ADM_CMD_LC BIT(31) ++#define ADM_CMD_DST_CRCI(n) (((n) & 0xf) << 7) ++#define ADM_CMD_SRC_CRCI(n) (((n) & 0xf) << 3) ++ ++#define ADM_CMD_TYPE_SINGLE 0x0 ++#define ADM_CMD_TYPE_BOX 0x3 ++ ++#define ADM_CRCI_MUX_SEL BIT(4) ++#define ADM_DESC_ALIGN 8 ++#define ADM_MAX_XFER (SZ_64K-1) ++#define ADM_MAX_ROWS (SZ_64K-1) ++#define ADM_MAX_CHANNELS 16 ++ ++struct adm_desc_hw_box { ++ u32 cmd; ++ u32 src_addr; ++ u32 dst_addr; ++ u32 row_len; ++ u32 num_rows; ++ u32 row_offset; ++}; ++ ++struct adm_desc_hw_single { ++ u32 cmd; ++ u32 src_addr; ++ u32 dst_addr; ++ u32 len; ++}; ++ ++struct adm_async_desc { ++ struct virt_dma_desc vd; ++ struct adm_device *adev; ++ ++ size_t length; ++ enum dma_transfer_direction dir; ++ dma_addr_t dma_addr; ++ size_t dma_len; ++ ++ void *cpl; ++ dma_addr_t cp_addr; ++ u32 crci; ++ u32 mux; ++ u32 blk_size; ++}; ++ ++struct adm_chan { ++ struct virt_dma_chan vc; ++ struct adm_device *adev; ++ ++ /* parsed from DT */ ++ u32 id; /* channel id */ ++ ++ struct adm_async_desc *curr_txd; ++ struct dma_slave_config slave; ++ struct list_head node; ++ ++ int error; ++ int initialized; ++}; ++ ++static inline struct adm_chan *to_adm_chan(struct dma_chan *common) ++{ ++ return container_of(common, struct adm_chan, vc.chan); ++} ++ ++struct adm_device { ++ void __iomem *regs; ++ struct device *dev; ++ struct dma_device common; ++ struct device_dma_parameters dma_parms; ++ struct adm_chan *channels; ++ ++ u32 ee; ++ ++ struct clk *core_clk; ++ struct clk *iface_clk; ++ ++ struct reset_control *clk_reset; ++ struct reset_control *c0_reset; ++ struct reset_control *c1_reset; ++ struct reset_control *c2_reset; ++ int irq; ++}; ++ ++/** ++ * adm_free_chan - Frees dma resources associated with the specific channel ++ * ++ * Free all allocated descriptors associated with this channel ++ * ++ */ ++static void adm_free_chan(struct dma_chan *chan) ++{ ++ /* free all queued descriptors */ ++ vchan_free_chan_resources(to_virt_chan(chan)); ++} ++ ++/** ++ * adm_get_blksize - Get block size from burst value ++ * ++ */ ++static int adm_get_blksize(unsigned int burst) ++{ ++ int ret; ++ ++ switch (burst) { ++ case 16: ++ case 32: ++ case 64: ++ case 128: ++ ret = ffs(burst>>4) - 1; ++ break; ++ case 192: ++ ret = 4; ++ break; ++ case 256: ++ ret = 5; ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ return ret; ++} ++ ++/** ++ * adm_process_fc_descriptors - Process descriptors for flow controlled xfers ++ * ++ * @achan: ADM channel ++ * @desc: Descriptor memory pointer ++ * @sg: Scatterlist entry ++ * @crci: CRCI value ++ * @burst: Burst size of transaction ++ * @direction: DMA transfer direction ++ */ ++static void *adm_process_fc_descriptors(struct adm_chan *achan, ++ void *desc, struct scatterlist *sg, u32 crci, u32 burst, ++ enum dma_transfer_direction direction) ++{ ++ struct adm_desc_hw_box *box_desc = NULL; ++ struct adm_desc_hw_single *single_desc; ++ u32 remainder = sg_dma_len(sg); ++ u32 rows, row_offset, crci_cmd; ++ u32 mem_addr = sg_dma_address(sg); ++ u32 *incr_addr = &mem_addr; ++ u32 *src, *dst; ++ ++ if (direction == DMA_DEV_TO_MEM) { ++ crci_cmd = ADM_CMD_SRC_CRCI(crci); ++ row_offset = burst; ++ src = &achan->slave.src_addr; ++ dst = &mem_addr; ++ } else { ++ crci_cmd = ADM_CMD_DST_CRCI(crci); ++ row_offset = burst << 16; ++ src = &mem_addr; ++ dst = &achan->slave.dst_addr; ++ } ++ ++ while (remainder >= burst) { ++ box_desc = desc; ++ box_desc->cmd = ADM_CMD_TYPE_BOX | crci_cmd; ++ box_desc->row_offset = row_offset; ++ box_desc->src_addr = *src; ++ box_desc->dst_addr = *dst; ++ ++ rows = remainder / burst; ++ rows = min_t(u32, rows, ADM_MAX_ROWS); ++ box_desc->num_rows = rows << 16 | rows; ++ box_desc->row_len = burst << 16 | burst; ++ ++ *incr_addr += burst * rows; ++ remainder -= burst * rows; ++ desc += sizeof(*box_desc); ++ } ++ ++ /* if leftover bytes, do one single descriptor */ ++ if (remainder) { ++ single_desc = desc; ++ single_desc->cmd = ADM_CMD_TYPE_SINGLE | crci_cmd; ++ single_desc->len = remainder; ++ single_desc->src_addr = *src; ++ single_desc->dst_addr = *dst; ++ desc += sizeof(*single_desc); ++ ++ if (sg_is_last(sg)) ++ single_desc->cmd |= ADM_CMD_LC; ++ } else { ++ if (box_desc && sg_is_last(sg)) ++ box_desc->cmd |= ADM_CMD_LC; ++ } ++ ++ return desc; ++} ++ ++/** ++ * adm_process_non_fc_descriptors - Process descriptors for non-fc xfers ++ * ++ * @achan: ADM channel ++ * @desc: Descriptor memory pointer ++ * @sg: Scatterlist entry ++ * @direction: DMA transfer direction ++ */ ++static void *adm_process_non_fc_descriptors(struct adm_chan *achan, ++ void *desc, struct scatterlist *sg, ++ enum dma_transfer_direction direction) ++{ ++ struct adm_desc_hw_single *single_desc; ++ u32 remainder = sg_dma_len(sg); ++ u32 mem_addr = sg_dma_address(sg); ++ u32 *incr_addr = &mem_addr; ++ u32 *src, *dst; ++ ++ if (direction == DMA_DEV_TO_MEM) { ++ src = &achan->slave.src_addr; ++ dst = &mem_addr; ++ } else { ++ src = &mem_addr; ++ dst = &achan->slave.dst_addr; ++ } ++ ++ do { ++ single_desc = desc; ++ single_desc->cmd = ADM_CMD_TYPE_SINGLE; ++ single_desc->src_addr = *src; ++ single_desc->dst_addr = *dst; ++ single_desc->len = (remainder > ADM_MAX_XFER) ? ++ ADM_MAX_XFER : remainder; ++ ++ remainder -= single_desc->len; ++ *incr_addr += single_desc->len; ++ desc += sizeof(*single_desc); ++ } while (remainder); ++ ++ /* set last command if this is the end of the whole transaction */ ++ if (sg_is_last(sg)) ++ single_desc->cmd |= ADM_CMD_LC; ++ ++ return desc; ++} ++ ++/** ++ * adm_prep_slave_sg - Prep slave sg transaction ++ * ++ * @chan: dma channel ++ * @sgl: scatter gather list ++ * @sg_len: length of sg ++ * @direction: DMA transfer direction ++ * @flags: DMA flags ++ * @context: transfer context (unused) ++ */ ++static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan, ++ struct scatterlist *sgl, unsigned int sg_len, ++ enum dma_transfer_direction direction, unsigned long flags, ++ void *context) ++{ ++ struct adm_chan *achan = to_adm_chan(chan); ++ struct adm_device *adev = achan->adev; ++ struct adm_async_desc *async_desc; ++ struct scatterlist *sg; ++ dma_addr_t cple_addr; ++ u32 i, burst; ++ u32 single_count = 0, box_count = 0, crci = 0; ++ void *desc; ++ u32 *cple; ++ int blk_size = 0; ++ ++ if (!is_slave_direction(direction)) { ++ dev_err(adev->dev, "invalid dma direction\n"); ++ return NULL; ++ } ++ ++ /* ++ * get burst value from slave configuration ++ */ ++ burst = (direction == DMA_MEM_TO_DEV) ? ++ achan->slave.dst_maxburst : ++ achan->slave.src_maxburst; ++ ++ /* if using flow control, validate burst and crci values */ ++ if (achan->slave.device_fc) { ++ ++ blk_size = adm_get_blksize(burst); ++ if (blk_size < 0) { ++ dev_err(adev->dev, "invalid burst value: %d\n", ++ burst); ++ return ERR_PTR(-EINVAL); ++ } ++ ++ crci = achan->slave.slave_id & 0xf; ++ if (!crci || achan->slave.slave_id > 0x1f) { ++ dev_err(adev->dev, "invalid crci value\n"); ++ return ERR_PTR(-EINVAL); ++ } ++ } ++ ++ /* iterate through sgs and compute allocation size of structures */ ++ for_each_sg(sgl, sg, sg_len, i) { ++ if (achan->slave.device_fc) { ++ box_count += DIV_ROUND_UP(sg_dma_len(sg) / burst, ++ ADM_MAX_ROWS); ++ if (sg_dma_len(sg) % burst) ++ single_count++; ++ } else { ++ single_count += DIV_ROUND_UP(sg_dma_len(sg), ++ ADM_MAX_XFER); ++ } ++ } ++ ++ async_desc = kzalloc(sizeof(*async_desc), GFP_ATOMIC); ++ if (!async_desc) ++ return ERR_PTR(-ENOMEM); ++ ++ if (crci) ++ async_desc->mux = achan->slave.slave_id & ADM_CRCI_MUX_SEL ? ++ ADM_CRCI_CTL_MUX_SEL : 0; ++ async_desc->crci = crci; ++ async_desc->blk_size = blk_size; ++ async_desc->dma_len = single_count * sizeof(struct adm_desc_hw_single) + ++ box_count * sizeof(struct adm_desc_hw_box) + ++ sizeof(*cple) + 2 * ADM_DESC_ALIGN; ++ ++ async_desc->cpl = kzalloc(async_desc->dma_len, GFP_ATOMIC); ++ if (!async_desc->cpl) ++ goto free; ++ ++ async_desc->adev = adev; ++ ++ /* both command list entry and descriptors must be 8 byte aligned */ ++ cple = PTR_ALIGN(async_desc->cpl, ADM_DESC_ALIGN); ++ desc = PTR_ALIGN(cple + 1, ADM_DESC_ALIGN); ++ ++ for_each_sg(sgl, sg, sg_len, i) { ++ async_desc->length += sg_dma_len(sg); ++ ++ if (achan->slave.device_fc) ++ desc = adm_process_fc_descriptors(achan, desc, sg, crci, ++ burst, direction); ++ else ++ desc = adm_process_non_fc_descriptors(achan, desc, sg, ++ direction); ++ } ++ ++ async_desc->dma_addr = dma_map_single(adev->dev, async_desc->cpl, ++ async_desc->dma_len, ++ DMA_TO_DEVICE); ++ if (dma_mapping_error(adev->dev, async_desc->dma_addr)) ++ goto free; ++ ++ cple_addr = async_desc->dma_addr + ((void *)cple - async_desc->cpl); ++ ++ /* init cmd list */ ++ dma_sync_single_for_cpu(adev->dev, cple_addr, sizeof(*cple), ++ DMA_TO_DEVICE); ++ *cple = ADM_CPLE_LP; ++ *cple |= (async_desc->dma_addr + ADM_DESC_ALIGN) >> 3; ++ dma_sync_single_for_device(adev->dev, cple_addr, sizeof(*cple), ++ DMA_TO_DEVICE); ++ ++ return vchan_tx_prep(&achan->vc, &async_desc->vd, flags); ++ ++free: ++ kfree(async_desc); ++ return ERR_PTR(-ENOMEM); ++} ++ ++/** ++ * adm_terminate_all - terminate all transactions on a channel ++ * @achan: adm dma channel ++ * ++ * Dequeues and frees all transactions, aborts current transaction ++ * No callbacks are done ++ * ++ */ ++static int adm_terminate_all(struct dma_chan *chan) ++{ ++ struct adm_chan *achan = to_adm_chan(chan); ++ struct adm_device *adev = achan->adev; ++ unsigned long flags; ++ LIST_HEAD(head); ++ ++ spin_lock_irqsave(&achan->vc.lock, flags); ++ vchan_get_all_descriptors(&achan->vc, &head); ++ ++ /* send flush command to terminate current transaction */ ++ writel_relaxed(0x0, ++ adev->regs + ADM_CH_FLUSH_STATE0(achan->id, adev->ee)); ++ ++ spin_unlock_irqrestore(&achan->vc.lock, flags); ++ ++ vchan_dma_desc_free_list(&achan->vc, &head); ++ ++ return 0; ++} ++ ++static int adm_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg) ++{ ++ struct adm_chan *achan = to_adm_chan(chan); ++ unsigned long flag; ++ ++ spin_lock_irqsave(&achan->vc.lock, flag); ++ memcpy(&achan->slave, cfg, sizeof(struct dma_slave_config)); ++ spin_unlock_irqrestore(&achan->vc.lock, flag); ++ ++ return 0; ++} ++ ++/** ++ * adm_start_dma - start next transaction ++ * @achan - ADM dma channel ++ */ ++static void adm_start_dma(struct adm_chan *achan) ++{ ++ struct virt_dma_desc *vd = vchan_next_desc(&achan->vc); ++ struct adm_device *adev = achan->adev; ++ struct adm_async_desc *async_desc; ++ ++ lockdep_assert_held(&achan->vc.lock); ++ ++ if (!vd) ++ return; ++ ++ list_del(&vd->node); ++ ++ /* write next command list out to the CMD FIFO */ ++ async_desc = container_of(vd, struct adm_async_desc, vd); ++ achan->curr_txd = async_desc; ++ ++ /* reset channel error */ ++ achan->error = 0; ++ ++ if (!achan->initialized) { ++ /* enable interrupts */ ++ writel(ADM_CH_CONF_SHADOW_EN | ++ ADM_CH_CONF_PERM_MPU_CONF | ++ ADM_CH_CONF_MPU_DISABLE | ++ ADM_CH_CONF_SEC_DOMAIN(adev->ee), ++ adev->regs + ADM_CH_CONF(achan->id)); ++ ++ writel(ADM_CH_RSLT_CONF_IRQ_EN | ADM_CH_RSLT_CONF_FLUSH_EN, ++ adev->regs + ADM_CH_RSLT_CONF(achan->id, adev->ee)); ++ ++ achan->initialized = 1; ++ } ++ ++ /* set the crci block size if this transaction requires CRCI */ ++ if (async_desc->crci) { ++ writel(async_desc->mux | async_desc->blk_size, ++ adev->regs + ADM_CRCI_CTL(async_desc->crci, adev->ee)); ++ } ++ ++ /* make sure IRQ enable doesn't get reordered */ ++ wmb(); ++ ++ /* write next command list out to the CMD FIFO */ ++ writel(ALIGN(async_desc->dma_addr, ADM_DESC_ALIGN) >> 3, ++ adev->regs + ADM_CH_CMD_PTR(achan->id, adev->ee)); ++} ++ ++/** ++ * adm_dma_irq - irq handler for ADM controller ++ * @irq: IRQ of interrupt ++ * @data: callback data ++ * ++ * IRQ handler for the bam controller ++ */ ++static irqreturn_t adm_dma_irq(int irq, void *data) ++{ ++ struct adm_device *adev = data; ++ u32 srcs, i; ++ struct adm_async_desc *async_desc; ++ unsigned long flags; ++ ++ srcs = readl_relaxed(adev->regs + ++ ADM_SEC_DOMAIN_IRQ_STATUS(adev->ee)); ++ ++ for (i = 0; i < ADM_MAX_CHANNELS; i++) { ++ struct adm_chan *achan = &adev->channels[i]; ++ u32 status, result; ++ ++ if (srcs & BIT(i)) { ++ status = readl_relaxed(adev->regs + ++ ADM_CH_STATUS_SD(i, adev->ee)); ++ ++ /* if no result present, skip */ ++ if (!(status & ADM_CH_STATUS_VALID)) ++ continue; ++ ++ result = readl_relaxed(adev->regs + ++ ADM_CH_RSLT(i, adev->ee)); ++ ++ /* no valid results, skip */ ++ if (!(result & ADM_CH_RSLT_VALID)) ++ continue; ++ ++ /* flag error if transaction was flushed or failed */ ++ if (result & (ADM_CH_RSLT_ERR | ADM_CH_RSLT_FLUSH)) ++ achan->error = 1; ++ ++ spin_lock_irqsave(&achan->vc.lock, flags); ++ async_desc = achan->curr_txd; ++ ++ achan->curr_txd = NULL; ++ ++ if (async_desc) { ++ vchan_cookie_complete(&async_desc->vd); ++ ++ /* kick off next DMA */ ++ adm_start_dma(achan); ++ } ++ ++ spin_unlock_irqrestore(&achan->vc.lock, flags); ++ } ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++/** ++ * adm_tx_status - returns status of transaction ++ * @chan: dma channel ++ * @cookie: transaction cookie ++ * @txstate: DMA transaction state ++ * ++ * Return status of dma transaction ++ */ ++static enum dma_status adm_tx_status(struct dma_chan *chan, dma_cookie_t cookie, ++ struct dma_tx_state *txstate) ++{ ++ struct adm_chan *achan = to_adm_chan(chan); ++ struct virt_dma_desc *vd; ++ enum dma_status ret; ++ unsigned long flags; ++ size_t residue = 0; ++ ++ ret = dma_cookie_status(chan, cookie, txstate); ++ if (ret == DMA_COMPLETE || !txstate) ++ return ret; ++ ++ spin_lock_irqsave(&achan->vc.lock, flags); ++ ++ vd = vchan_find_desc(&achan->vc, cookie); ++ if (vd) ++ residue = container_of(vd, struct adm_async_desc, vd)->length; ++ ++ spin_unlock_irqrestore(&achan->vc.lock, flags); ++ ++ /* ++ * residue is either the full length if it is in the issued list, or 0 ++ * if it is in progress. We have no reliable way of determining ++ * anything inbetween ++ */ ++ dma_set_residue(txstate, residue); ++ ++ if (achan->error) ++ return DMA_ERROR; ++ ++ return ret; ++} ++ ++/** ++ * adm_issue_pending - starts pending transactions ++ * @chan: dma channel ++ * ++ * Issues all pending transactions and starts DMA ++ */ ++static void adm_issue_pending(struct dma_chan *chan) ++{ ++ struct adm_chan *achan = to_adm_chan(chan); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&achan->vc.lock, flags); ++ ++ if (vchan_issue_pending(&achan->vc) && !achan->curr_txd) ++ adm_start_dma(achan); ++ spin_unlock_irqrestore(&achan->vc.lock, flags); ++} ++ ++/** ++ * adm_dma_free_desc - free descriptor memory ++ * @vd: virtual descriptor ++ * ++ */ ++static void adm_dma_free_desc(struct virt_dma_desc *vd) ++{ ++ struct adm_async_desc *async_desc = container_of(vd, ++ struct adm_async_desc, vd); ++ ++ dma_unmap_single(async_desc->adev->dev, async_desc->dma_addr, ++ async_desc->dma_len, DMA_TO_DEVICE); ++ kfree(async_desc->cpl); ++ kfree(async_desc); ++} ++ ++static void adm_channel_init(struct adm_device *adev, struct adm_chan *achan, ++ u32 index) ++{ ++ achan->id = index; ++ achan->adev = adev; ++ ++ vchan_init(&achan->vc, &adev->common); ++ achan->vc.desc_free = adm_dma_free_desc; ++} ++ ++static int adm_dma_probe(struct platform_device *pdev) ++{ ++ struct adm_device *adev; ++ struct resource *iores; ++ int ret; ++ u32 i; ++ ++ adev = devm_kzalloc(&pdev->dev, sizeof(*adev), GFP_KERNEL); ++ if (!adev) ++ return -ENOMEM; ++ ++ adev->dev = &pdev->dev; ++ ++ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ adev->regs = devm_ioremap_resource(&pdev->dev, iores); ++ if (IS_ERR(adev->regs)) ++ return PTR_ERR(adev->regs); ++ ++ adev->irq = platform_get_irq(pdev, 0); ++ if (adev->irq < 0) ++ return adev->irq; ++ ++ ret = of_property_read_u32(pdev->dev.of_node, "qcom,ee", &adev->ee); ++ if (ret) { ++ dev_err(adev->dev, "Execution environment unspecified\n"); ++ return ret; ++ } ++ ++ adev->core_clk = devm_clk_get(adev->dev, "core"); ++ if (IS_ERR(adev->core_clk)) ++ return PTR_ERR(adev->core_clk); ++ ++ ret = clk_prepare_enable(adev->core_clk); ++ if (ret) { ++ dev_err(adev->dev, "failed to prepare/enable core clock\n"); ++ return ret; ++ } ++ ++ adev->iface_clk = devm_clk_get(adev->dev, "iface"); ++ if (IS_ERR(adev->iface_clk)) { ++ ret = PTR_ERR(adev->iface_clk); ++ goto err_disable_core_clk; ++ } ++ ++ ret = clk_prepare_enable(adev->iface_clk); ++ if (ret) { ++ dev_err(adev->dev, "failed to prepare/enable iface clock\n"); ++ goto err_disable_core_clk; ++ } ++ ++ adev->clk_reset = devm_reset_control_get(&pdev->dev, "clk"); ++ if (IS_ERR(adev->clk_reset)) { ++ dev_err(adev->dev, "failed to get ADM0 reset\n"); ++ ret = PTR_ERR(adev->clk_reset); ++ goto err_disable_clks; ++ } ++ ++ adev->c0_reset = devm_reset_control_get(&pdev->dev, "c0"); ++ if (IS_ERR(adev->c0_reset)) { ++ dev_err(adev->dev, "failed to get ADM0 C0 reset\n"); ++ ret = PTR_ERR(adev->c0_reset); ++ goto err_disable_clks; ++ } ++ ++ adev->c1_reset = devm_reset_control_get(&pdev->dev, "c1"); ++ if (IS_ERR(adev->c1_reset)) { ++ dev_err(adev->dev, "failed to get ADM0 C1 reset\n"); ++ ret = PTR_ERR(adev->c1_reset); ++ goto err_disable_clks; ++ } ++ ++ adev->c2_reset = devm_reset_control_get(&pdev->dev, "c2"); ++ if (IS_ERR(adev->c2_reset)) { ++ dev_err(adev->dev, "failed to get ADM0 C2 reset\n"); ++ ret = PTR_ERR(adev->c2_reset); ++ goto err_disable_clks; ++ } ++ ++ reset_control_assert(adev->clk_reset); ++ reset_control_assert(adev->c0_reset); ++ reset_control_assert(adev->c1_reset); ++ reset_control_assert(adev->c2_reset); ++ ++ reset_control_deassert(adev->clk_reset); ++ reset_control_deassert(adev->c0_reset); ++ reset_control_deassert(adev->c1_reset); ++ reset_control_deassert(adev->c2_reset); ++ ++ adev->channels = devm_kcalloc(adev->dev, ADM_MAX_CHANNELS, ++ sizeof(*adev->channels), GFP_KERNEL); ++ ++ if (!adev->channels) { ++ ret = -ENOMEM; ++ goto err_disable_clks; ++ } ++ ++ /* allocate and initialize channels */ ++ INIT_LIST_HEAD(&adev->common.channels); ++ ++ for (i = 0; i < ADM_MAX_CHANNELS; i++) ++ adm_channel_init(adev, &adev->channels[i], i); ++ ++ /* reset CRCIs */ ++ for (i = 0; i < 16; i++) ++ writel(ADM_CRCI_CTL_RST, adev->regs + ++ ADM_CRCI_CTL(i, adev->ee)); ++ ++ /* configure client interfaces */ ++ writel(ADM_CI_RANGE_START(0x40) | ADM_CI_RANGE_END(0xb0) | ++ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(0)); ++ writel(ADM_CI_RANGE_START(0x2a) | ADM_CI_RANGE_END(0x2c) | ++ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(1)); ++ writel(ADM_CI_RANGE_START(0x12) | ADM_CI_RANGE_END(0x28) | ++ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(2)); ++ writel(ADM_GP_CTL_LP_EN | ADM_GP_CTL_LP_CNT(0xf), ++ adev->regs + ADM_GP_CTL); ++ ++ ret = devm_request_irq(adev->dev, adev->irq, adm_dma_irq, ++ 0, "adm_dma", adev); ++ if (ret) ++ goto err_disable_clks; ++ ++ platform_set_drvdata(pdev, adev); ++ ++ adev->common.dev = adev->dev; ++ adev->common.dev->dma_parms = &adev->dma_parms; ++ ++ /* set capabilities */ ++ dma_cap_zero(adev->common.cap_mask); ++ dma_cap_set(DMA_SLAVE, adev->common.cap_mask); ++ dma_cap_set(DMA_PRIVATE, adev->common.cap_mask); ++ ++ /* initialize dmaengine apis */ ++ adev->common.directions = BIT(DMA_DEV_TO_MEM | DMA_MEM_TO_DEV); ++ adev->common.residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR; ++ adev->common.src_addr_widths = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ adev->common.dst_addr_widths = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ adev->common.device_free_chan_resources = adm_free_chan; ++ adev->common.device_prep_slave_sg = adm_prep_slave_sg; ++ adev->common.device_issue_pending = adm_issue_pending; ++ adev->common.device_tx_status = adm_tx_status; ++ adev->common.device_terminate_all = adm_terminate_all; ++ adev->common.device_config = adm_slave_config; ++ ++ ret = dma_async_device_register(&adev->common); ++ if (ret) { ++ dev_err(adev->dev, "failed to register dma async device\n"); ++ goto err_disable_clks; ++ } ++ ++ ret = of_dma_controller_register(pdev->dev.of_node, ++ of_dma_xlate_by_chan_id, ++ &adev->common); ++ if (ret) ++ goto err_unregister_dma; ++ ++ return 0; ++ ++err_unregister_dma: ++ dma_async_device_unregister(&adev->common); ++err_disable_clks: ++ clk_disable_unprepare(adev->iface_clk); ++err_disable_core_clk: ++ clk_disable_unprepare(adev->core_clk); ++ ++ return ret; ++} ++ ++static int adm_dma_remove(struct platform_device *pdev) ++{ ++ struct adm_device *adev = platform_get_drvdata(pdev); ++ struct adm_chan *achan; ++ u32 i; ++ ++ of_dma_controller_free(pdev->dev.of_node); ++ dma_async_device_unregister(&adev->common); ++ ++ for (i = 0; i < ADM_MAX_CHANNELS; i++) { ++ achan = &adev->channels[i]; ++ ++ /* mask IRQs for this channel/EE pair */ ++ writel(0, adev->regs + ADM_CH_RSLT_CONF(achan->id, adev->ee)); ++ ++ adm_terminate_all(&adev->channels[i].vc.chan); ++ } ++ ++ devm_free_irq(adev->dev, adev->irq, adev); ++ ++ clk_disable_unprepare(adev->core_clk); ++ clk_disable_unprepare(adev->iface_clk); ++ ++ return 0; ++} ++ ++static const struct of_device_id adm_of_match[] = { ++ { .compatible = "qcom,adm", }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, adm_of_match); ++ ++static struct platform_driver adm_dma_driver = { ++ .probe = adm_dma_probe, ++ .remove = adm_dma_remove, ++ .driver = { ++ .name = "adm-dma-engine", ++ .of_match_table = adm_of_match, ++ }, ++}; ++ ++module_platform_driver(adm_dma_driver); ++ ++MODULE_AUTHOR("Andy Gross "); ++MODULE_DESCRIPTION("QCOM ADM DMA engine driver"); ++MODULE_LICENSE("GPL v2"); diff --git a/target/linux/ipq806x/patches-4.19/0030-clk-Disable-i2c-device-on-gsbi4.patch b/target/linux/ipq806x/patches-4.19/0030-clk-Disable-i2c-device-on-gsbi4.patch new file mode 100644 index 0000000000..b2a6afe0dd --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0030-clk-Disable-i2c-device-on-gsbi4.patch @@ -0,0 +1,40 @@ +From 0c974b87829e007dc4fae94e20d488204e20e662 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 9 Mar 2017 08:16:10 +0100 +Subject: [PATCH 30/69] clk: Disable i2c device on gsbi4 + +This patch was not annotated and comes from the v4.4 tree. + +Signed-off-by: John Crispin +--- + drivers/clk/qcom/gcc-ipq806x.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/clk/qcom/gcc-ipq806x.c ++++ b/drivers/clk/qcom/gcc-ipq806x.c +@@ -294,7 +294,7 @@ static struct clk_rcg gsbi1_uart_src = { + .parent_names = gcc_pxo_pll8, + .num_parents = 2, + .ops = &clk_rcg_ops, +- .flags = CLK_SET_PARENT_GATE, ++ .flags = CLK_SET_PARENT_GATE | CLK_IGNORE_UNUSED, + }, + }, + }; +@@ -312,7 +312,7 @@ static struct clk_branch gsbi1_uart_clk + }, + .num_parents = 1, + .ops = &clk_branch_ops, +- .flags = CLK_SET_RATE_PARENT, ++ .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, + }, + }, + }; +@@ -890,6 +890,7 @@ static struct clk_branch gsbi1_h_clk = { + .hw.init = &(struct clk_init_data){ + .name = "gsbi1_h_clk", + .ops = &clk_branch_ops, ++ .flags = CLK_IGNORE_UNUSED, + }, + }, + }; diff --git a/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch b/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch new file mode 100644 index 0000000000..a7cfac5447 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch @@ -0,0 +1,282 @@ +From d8eeb4de90e968ba32d956728c866f20752cf2c3 Mon Sep 17 00:00:00 2001 +From: Mathieu Olivari +Date: Thu, 9 Mar 2017 08:18:08 +0100 +Subject: [PATCH 31/69] mtd: add SMEM parser for QCOM platforms + +On QCOM platforms using MTD devices storage (such as IPQ806x), SMEM is +used to store partition layout. This new parser can now be used to read +SMEM and use it to register an MTD layout according to its content. + +Signed-off-by: Mathieu Olivari +Signed-off-by: Ram Chandra Jangir +--- + drivers/mtd/Kconfig | 7 ++ + drivers/mtd/Makefile | 1 + + drivers/mtd/qcom_smem_part.c | 228 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 236 insertions(+) + create mode 100644 drivers/mtd/qcom_smem_part.c + +--- a/drivers/mtd/Kconfig ++++ b/drivers/mtd/Kconfig +@@ -194,6 +194,13 @@ config MTD_MYLOADER_PARTS + You will still need the parsing functions to be called by the driver + for your particular device. It won't happen automatically. + ++config MTD_QCOM_SMEM_PARTS ++ tristate "QCOM SMEM partitioning support" ++ depends on QCOM_SMEM ++ help ++ This provides partitions parser for QCOM devices using SMEM ++ such as IPQ806x. ++ + comment "User Modules And Translation Layers" + + # +--- /dev/null ++++ b/drivers/mtd/qcom_smem_part.c +@@ -0,0 +1,235 @@ ++/* ++ * Copyright (c) 2015, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++/* Processor/host identifier for the application processor */ ++#define SMEM_HOST_APPS 0 ++ ++/* SMEM items index */ ++#define SMEM_AARM_PARTITION_TABLE 9 ++#define SMEM_BOOT_FLASH_TYPE 421 ++#define SMEM_BOOT_FLASH_BLOCK_SIZE 424 ++ ++/* SMEM Flash types */ ++#define SMEM_FLASH_NAND 2 ++#define SMEM_FLASH_SPI 6 ++ ++#define SMEM_PART_NAME_SZ 16 ++#define SMEM_PARTS_MAX 32 ++ ++struct smem_partition { ++ char name[SMEM_PART_NAME_SZ]; ++ __le32 start; ++ __le32 size; ++ __le32 attr; ++}; ++ ++struct smem_partition_table { ++ u8 magic[8]; ++ __le32 version; ++ __le32 len; ++ struct smem_partition parts[SMEM_PARTS_MAX]; ++}; ++ ++/* SMEM Magic values in partition table */ ++static const u8 SMEM_PTABLE_MAGIC[] = { ++ 0xaa, 0x73, 0xee, 0x55, ++ 0xdb, 0xbd, 0x5e, 0xe3, ++}; ++ ++static int qcom_smem_get_flash_blksz(u64 **smem_blksz) ++{ ++ size_t size; ++ ++ *smem_blksz = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_BLOCK_SIZE, ++ &size); ++ ++ if (IS_ERR(*smem_blksz)) { ++ pr_err("Unable to read flash blksz from SMEM\n"); ++ return -ENOENT; ++ } ++ ++ if (size != sizeof(**smem_blksz)) { ++ pr_err("Invalid flash blksz size in SMEM\n"); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int qcom_smem_get_flash_type(u64 **smem_flash_type) ++{ ++ size_t size; ++ ++ *smem_flash_type = qcom_smem_get(SMEM_HOST_APPS, SMEM_BOOT_FLASH_TYPE, ++ &size); ++ ++ if (IS_ERR(*smem_flash_type)) { ++ pr_err("Unable to read flash type from SMEM\n"); ++ return -ENOENT; ++ } ++ ++ if (size != sizeof(**smem_flash_type)) { ++ pr_err("Invalid flash type size in SMEM\n"); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int qcom_smem_get_flash_partitions(struct smem_partition_table **pparts) ++{ ++ size_t size; ++ ++ *pparts = qcom_smem_get(SMEM_HOST_APPS, SMEM_AARM_PARTITION_TABLE, ++ &size); ++ ++ if (IS_ERR(*pparts)) { ++ pr_err("Unable to read partition table from SMEM\n"); ++ return -ENOENT; ++ } ++ ++ return 0; ++} ++ ++static int of_dev_node_match(struct device *dev, void *data) ++{ ++ return dev->of_node == data; ++} ++ ++static bool is_spi_device(struct device_node *np) ++{ ++ struct device *dev; ++ ++ dev = bus_find_device(&spi_bus_type, NULL, np, of_dev_node_match); ++ if (!dev) ++ return false; ++ ++ put_device(dev); ++ return true; ++} ++ ++static int parse_qcom_smem_partitions(struct mtd_info *master, ++ const struct mtd_partition **pparts, ++ struct mtd_part_parser_data *data) ++{ ++ struct smem_partition_table *smem_parts; ++ u64 *smem_flash_type, *smem_blksz; ++ struct mtd_partition *mtd_parts; ++ struct device_node *of_node = master->dev.of_node; ++ int i, ret; ++ ++ /* ++ * SMEM will only store the partition table of the boot device. ++ * If this is not the boot device, do not return any partition. ++ */ ++ ret = qcom_smem_get_flash_type(&smem_flash_type); ++ if (ret < 0) ++ return ret; ++ ++ if ((*smem_flash_type == SMEM_FLASH_NAND && !mtd_type_is_nand(master)) ++ || (*smem_flash_type == SMEM_FLASH_SPI && !is_spi_device(of_node))) ++ return 0; ++ ++ /* ++ * Just for sanity purpose, make sure the block size in SMEM matches the ++ * block size of the MTD device ++ */ ++ ret = qcom_smem_get_flash_blksz(&smem_blksz); ++ if (ret < 0) ++ return ret; ++ ++ if (*smem_blksz != master->erasesize) { ++ pr_err("SMEM block size differs from MTD block size\n"); ++ return -EINVAL; ++ } ++ ++ /* Get partition pointer from SMEM */ ++ ret = qcom_smem_get_flash_partitions(&smem_parts); ++ if (ret < 0) ++ return ret; ++ ++ if (memcmp(SMEM_PTABLE_MAGIC, smem_parts->magic, ++ sizeof(SMEM_PTABLE_MAGIC))) { ++ pr_err("SMEM partition magic invalid\n"); ++ return -EINVAL; ++ } ++ ++ /* Allocate and populate the mtd structures */ ++ mtd_parts = kcalloc(le32_to_cpu(smem_parts->len), sizeof(*mtd_parts), ++ GFP_KERNEL); ++ if (!mtd_parts) ++ return -ENOMEM; ++ ++ for (i = 0; i < smem_parts->len; i++) { ++ struct smem_partition *s_part = &smem_parts->parts[i]; ++ struct mtd_partition *m_part = &mtd_parts[i]; ++ ++ m_part->name = s_part->name; ++ m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz); ++ m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz); ++ ++ /* ++ * The last SMEM partition may have its size marked as ++ * something like 0xffffffff, which means "until the end of the ++ * flash device". In this case, truncate it. ++ */ ++ if (m_part->offset + m_part->size > master->size) ++ m_part->size = master->size - m_part->offset; ++ } ++ ++ *pparts = mtd_parts; ++ ++ return smem_parts->len; ++} ++ ++static const struct of_device_id qcom_smem_of_match_table[] = { ++ { .compatible = "qcom,smem" }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, qcom_smem_of_match_table); ++ ++static struct mtd_part_parser qcom_smem_parser = { ++ .owner = THIS_MODULE, ++ .parse_fn = parse_qcom_smem_partitions, ++ .name = "qcom-smem", ++ .of_match_table = qcom_smem_of_match_table, ++}; ++ ++static int __init qcom_smem_parser_init(void) ++{ ++ register_mtd_parser(&qcom_smem_parser); ++ return 0; ++} ++ ++static void __exit qcom_smem_parser_exit(void) ++{ ++ deregister_mtd_parser(&qcom_smem_parser); ++} ++ ++module_init(qcom_smem_parser_init); ++module_exit(qcom_smem_parser_exit); ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Mathieu Olivari "); ++MODULE_DESCRIPTION("Parsing code for SMEM based partition tables"); +--- a/drivers/mtd/Makefile ++++ b/drivers/mtd/Makefile +@@ -17,6 +17,7 @@ obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o + obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o + obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o + obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o ++obj-$(CONFIG_MTD_QCOM_SMEM_PARTS) += qcom_smem_part.o + obj-y += parsers/ + + # 'Users' - code which presents functionality to userspace. diff --git a/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch b/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch new file mode 100644 index 0000000000..e430329acd --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch @@ -0,0 +1,616 @@ +From b9004f4fd23e4c614d71c972f3a9311665480e29 Mon Sep 17 00:00:00 2001 +From: Andy Gross +Date: Thu, 9 Mar 2017 08:19:18 +0100 +Subject: [PATCH 32/69] phy: add qcom dwc3 phy + +Signed-off-by: Andy Gross +--- + drivers/phy/Kconfig | 12 + + drivers/phy/Makefile | 1 + + drivers/phy/phy-qcom-dwc3.c | 575 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 588 insertions(+) + create mode 100644 drivers/phy/phy-qcom-dwc3.c + +--- a/drivers/phy/qualcomm/Kconfig ++++ b/drivers/phy/qualcomm/Kconfig +@@ -56,3 +56,15 @@ config PHY_QCOM_USB_HSIC + select GENERIC_PHY + help + Support for the USB HSIC ULPI compliant PHY on QCOM chipsets. ++ ++config PHY_QCOM_DWC3 ++ tristate "QCOM DWC3 USB PHY support" ++ depends on ARCH_QCOM ++ depends on HAS_IOMEM ++ depends on OF ++ select GENERIC_PHY ++ help ++ This option enables support for the Synopsis PHYs present inside the ++ Qualcomm USB3.0 DWC3 controller. This driver supports both HS and SS ++ PHY controllers. ++ +--- a/drivers/phy/qualcomm/Makefile ++++ b/drivers/phy/qualcomm/Makefile +@@ -8,3 +8,4 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom- + obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o + obj-$(CONFIG_PHY_QCOM_USB_HS) += phy-qcom-usb-hs.o + obj-$(CONFIG_PHY_QCOM_USB_HSIC) += phy-qcom-usb-hsic.o ++obj-$(CONFIG_PHY_QCOM_DWC3) += phy-qcom-dwc3.o +--- /dev/null ++++ b/drivers/phy/qualcomm/phy-qcom-dwc3.c +@@ -0,0 +1,575 @@ ++/* Copyright (c) 2014-2015, Code Aurora Forum. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++* This program is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++* GNU General Public License for more details. ++*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/** ++ * USB QSCRATCH Hardware registers ++ */ ++#define QSCRATCH_GENERAL_CFG (0x08) ++#define HSUSB_PHY_CTRL_REG (0x10) ++ ++/* PHY_CTRL_REG */ ++#define HSUSB_CTRL_DMSEHV_CLAMP BIT(24) ++#define HSUSB_CTRL_USB2_SUSPEND BIT(23) ++#define HSUSB_CTRL_UTMI_CLK_EN BIT(21) ++#define HSUSB_CTRL_UTMI_OTG_VBUS_VALID BIT(20) ++#define HSUSB_CTRL_USE_CLKCORE BIT(18) ++#define HSUSB_CTRL_DPSEHV_CLAMP BIT(17) ++#define HSUSB_CTRL_COMMONONN BIT(11) ++#define HSUSB_CTRL_ID_HV_CLAMP BIT(9) ++#define HSUSB_CTRL_OTGSESSVLD_CLAMP BIT(8) ++#define HSUSB_CTRL_CLAMP_EN BIT(7) ++#define HSUSB_CTRL_RETENABLEN BIT(1) ++#define HSUSB_CTRL_POR BIT(0) ++ ++/* QSCRATCH_GENERAL_CFG */ ++#define HSUSB_GCFG_XHCI_REV BIT(2) ++ ++/** ++ * USB QSCRATCH Hardware registers ++ */ ++#define SSUSB_PHY_CTRL_REG (0x00) ++#define SSUSB_PHY_PARAM_CTRL_1 (0x04) ++#define SSUSB_PHY_PARAM_CTRL_2 (0x08) ++#define CR_PROTOCOL_DATA_IN_REG (0x0c) ++#define CR_PROTOCOL_DATA_OUT_REG (0x10) ++#define CR_PROTOCOL_CAP_ADDR_REG (0x14) ++#define CR_PROTOCOL_CAP_DATA_REG (0x18) ++#define CR_PROTOCOL_READ_REG (0x1c) ++#define CR_PROTOCOL_WRITE_REG (0x20) ++ ++/* PHY_CTRL_REG */ ++#define SSUSB_CTRL_REF_USE_PAD BIT(28) ++#define SSUSB_CTRL_TEST_POWERDOWN BIT(27) ++#define SSUSB_CTRL_LANE0_PWR_PRESENT BIT(24) ++#define SSUSB_CTRL_SS_PHY_EN BIT(8) ++#define SSUSB_CTRL_SS_PHY_RESET BIT(7) ++ ++/* SSPHY control registers */ ++#define SSPHY_CTRL_RX_OVRD_IN_HI(lane) (0x1006 + 0x100 * lane) ++#define SSPHY_CTRL_TX_OVRD_DRV_LO(lane) (0x1002 + 0x100 * lane) ++ ++/* SSPHY SoC version specific values */ ++#define SSPHY_RX_EQ_VALUE 4 /* Override value for rx_eq */ ++#define SSPHY_TX_DEEMPH_3_5DB 23 /* Override value for transmit ++ preemphasis */ ++#define SSPHY_MPLL_VALUE 0 /* Override value for mpll */ ++ ++/* QSCRATCH PHY_PARAM_CTRL1 fields */ ++#define PHY_PARAM_CTRL1_TX_FULL_SWING_MASK 0x07f00000u ++#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK 0x000fc000u ++#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK 0x00003f00u ++#define PHY_PARAM_CTRL1_LOS_BIAS_MASK 0x000000f8u ++ ++#define PHY_PARAM_CTRL1_MASK \ ++ (PHY_PARAM_CTRL1_TX_FULL_SWING_MASK | \ ++ PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK | \ ++ PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK | \ ++ PHY_PARAM_CTRL1_LOS_BIAS_MASK) ++ ++#define PHY_PARAM_CTRL1_TX_FULL_SWING(x) \ ++ (((x) << 20) & PHY_PARAM_CTRL1_TX_FULL_SWING_MASK) ++#define PHY_PARAM_CTRL1_TX_DEEMPH_6DB(x) \ ++ (((x) << 14) & PHY_PARAM_CTRL1_TX_DEEMPH_6DB_MASK) ++#define PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(x) \ ++ (((x) << 8) & PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB_MASK) ++#define PHY_PARAM_CTRL1_LOS_BIAS(x) \ ++ (((x) << 3) & PHY_PARAM_CTRL1_LOS_BIAS_MASK) ++ ++/* RX OVRD IN HI bits */ ++#define RX_OVRD_IN_HI_RX_RESET_OVRD BIT(13) ++#define RX_OVRD_IN_HI_RX_RX_RESET BIT(12) ++#define RX_OVRD_IN_HI_RX_EQ_OVRD BIT(11) ++#define RX_OVRD_IN_HI_RX_EQ_MASK 0x0700 ++#define RX_OVRD_IN_HI_RX_EQ_SHIFT 8 ++#define RX_OVRD_IN_HI_RX_EQ_EN_OVRD BIT(7) ++#define RX_OVRD_IN_HI_RX_EQ_EN BIT(6) ++#define RX_OVRD_IN_HI_RX_LOS_FILTER_OVRD BIT(5) ++#define RX_OVRD_IN_HI_RX_LOS_FILTER_MASK 0x0018 ++#define RX_OVRD_IN_HI_RX_RATE_OVRD BIT(2) ++#define RX_OVRD_IN_HI_RX_RATE_MASK 0x0003 ++ ++/* TX OVRD DRV LO register bits */ ++#define TX_OVRD_DRV_LO_AMPLITUDE_MASK 0x007F ++#define TX_OVRD_DRV_LO_PREEMPH_MASK 0x3F80 ++#define TX_OVRD_DRV_LO_PREEMPH_SHIFT 7 ++#define TX_OVRD_DRV_LO_EN BIT(14) ++ ++/* SS CAP register bits */ ++#define SS_CR_CAP_ADDR_REG BIT(0) ++#define SS_CR_CAP_DATA_REG BIT(0) ++#define SS_CR_READ_REG BIT(0) ++#define SS_CR_WRITE_REG BIT(0) ++ ++struct qcom_dwc3_usb_phy { ++ void __iomem *base; ++ struct device *dev; ++ struct clk *xo_clk; ++ struct clk *ref_clk; ++ u32 rx_eq; ++ u32 tx_deamp_3_5db; ++ u32 mpll; ++}; ++ ++struct qcom_dwc3_phy_drvdata { ++ struct phy_ops ops; ++ u32 clk_rate; ++}; ++ ++/** ++ * Write register and read back masked value to confirm it is written ++ * ++ * @base - QCOM DWC3 PHY base virtual address. ++ * @offset - register offset. ++ * @mask - register bitmask specifying what should be updated ++ * @val - value to write. ++ */ ++static inline void qcom_dwc3_phy_write_readback( ++ struct qcom_dwc3_usb_phy *phy_dwc3, u32 offset, ++ const u32 mask, u32 val) ++{ ++ u32 write_val, tmp = readl(phy_dwc3->base + offset); ++ ++ tmp &= ~mask; /* retain other bits */ ++ write_val = tmp | val; ++ ++ writel(write_val, phy_dwc3->base + offset); ++ ++ /* Read back to see if val was written */ ++ tmp = readl(phy_dwc3->base + offset); ++ tmp &= mask; /* clear other bits */ ++ ++ if (tmp != val) ++ dev_err(phy_dwc3->dev, "write: %x to QSCRATCH: %x FAILED\n", ++ val, offset); ++} ++ ++static int wait_for_latch(void __iomem *addr) ++{ ++ u32 retry = 10; ++ ++ while (true) { ++ if (!readl(addr)) ++ break; ++ ++ if (--retry == 0) ++ return -ETIMEDOUT; ++ ++ usleep_range(10, 20); ++ } ++ ++ return 0; ++} ++ ++/** ++ * Write SSPHY register ++ * ++ * @base - QCOM DWC3 PHY base virtual address. ++ * @addr - SSPHY address to write. ++ * @val - value to write. ++ */ ++static int qcom_dwc3_ss_write_phycreg(struct qcom_dwc3_usb_phy *phy_dwc3, ++ u32 addr, u32 val) ++{ ++ int ret; ++ ++ writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG); ++ writel(SS_CR_CAP_ADDR_REG, phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG); ++ ++ ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG); ++ if (ret) ++ goto err_wait; ++ ++ writel(val, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG); ++ writel(SS_CR_CAP_DATA_REG, phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG); ++ ++ ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG); ++ if (ret) ++ goto err_wait; ++ ++ writel(SS_CR_WRITE_REG, phy_dwc3->base + CR_PROTOCOL_WRITE_REG); ++ ++ ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_WRITE_REG); ++ ++err_wait: ++ if (ret) ++ dev_err(phy_dwc3->dev, "timeout waiting for latch\n"); ++ return ret; ++} ++ ++/** ++ * Read SSPHY register. ++ * ++ * @base - QCOM DWC3 PHY base virtual address. ++ * @addr - SSPHY address to read. ++ */ ++static int qcom_dwc3_ss_read_phycreg(void __iomem *base, u32 addr, u32 *val) ++{ ++ int ret; ++ ++ writel(addr, base + CR_PROTOCOL_DATA_IN_REG); ++ writel(SS_CR_CAP_ADDR_REG, base + CR_PROTOCOL_CAP_ADDR_REG); ++ ++ ret = wait_for_latch(base + CR_PROTOCOL_CAP_ADDR_REG); ++ if (ret) ++ goto err_wait; ++ ++ /* ++ * Due to hardware bug, first read of SSPHY register might be ++ * incorrect. Hence as workaround, SW should perform SSPHY register ++ * read twice, but use only second read and ignore first read. ++ */ ++ writel(SS_CR_READ_REG, base + CR_PROTOCOL_READ_REG); ++ ++ ret = wait_for_latch(base + CR_PROTOCOL_READ_REG); ++ if (ret) ++ goto err_wait; ++ ++ /* throwaway read */ ++ readl(base + CR_PROTOCOL_DATA_OUT_REG); ++ ++ writel(SS_CR_READ_REG, base + CR_PROTOCOL_READ_REG); ++ ++ ret = wait_for_latch(base + CR_PROTOCOL_READ_REG); ++ if (ret) ++ goto err_wait; ++ ++ *val = readl(base + CR_PROTOCOL_DATA_OUT_REG); ++ ++err_wait: ++ return ret; ++} ++ ++static int qcom_dwc3_hs_phy_init(struct phy *phy) ++{ ++ struct qcom_dwc3_usb_phy *phy_dwc3 = phy_get_drvdata(phy); ++ int ret; ++ u32 val; ++ ++ ret = clk_prepare_enable(phy_dwc3->xo_clk); ++ if (ret) ++ return ret; ++ ++ ret = clk_prepare_enable(phy_dwc3->ref_clk); ++ if (ret) { ++ clk_disable_unprepare(phy_dwc3->xo_clk); ++ return ret; ++ } ++ ++ /* ++ * HSPHY Initialization: Enable UTMI clock, select 19.2MHz fsel ++ * enable clamping, and disable RETENTION (power-on default is ENABLED) ++ */ ++ val = HSUSB_CTRL_DPSEHV_CLAMP | HSUSB_CTRL_DMSEHV_CLAMP | ++ HSUSB_CTRL_RETENABLEN | HSUSB_CTRL_COMMONONN | ++ HSUSB_CTRL_OTGSESSVLD_CLAMP | HSUSB_CTRL_ID_HV_CLAMP | ++ HSUSB_CTRL_DPSEHV_CLAMP | HSUSB_CTRL_UTMI_OTG_VBUS_VALID | ++ HSUSB_CTRL_UTMI_CLK_EN | HSUSB_CTRL_CLAMP_EN | 0x70; ++ ++ /* use core clock if external reference is not present */ ++ if (!phy_dwc3->xo_clk) ++ val |= HSUSB_CTRL_USE_CLKCORE; ++ ++ writel(val, phy_dwc3->base + HSUSB_PHY_CTRL_REG); ++ usleep_range(2000, 2200); ++ ++ /* Disable (bypass) VBUS and ID filters */ ++ writel(HSUSB_GCFG_XHCI_REV, phy_dwc3->base + QSCRATCH_GENERAL_CFG); ++ ++ return 0; ++} ++ ++static int qcom_dwc3_hs_phy_exit(struct phy *phy) ++{ ++ struct qcom_dwc3_usb_phy *phy_dwc3 = phy_get_drvdata(phy); ++ ++ clk_disable_unprepare(phy_dwc3->ref_clk); ++ clk_disable_unprepare(phy_dwc3->xo_clk); ++ ++ return 0; ++} ++ ++static int qcom_dwc3_ss_phy_init(struct phy *phy) ++{ ++ struct qcom_dwc3_usb_phy *phy_dwc3 = phy_get_drvdata(phy); ++ int ret; ++ u32 data = 0; ++ ++ ret = clk_prepare_enable(phy_dwc3->xo_clk); ++ if (ret) ++ return ret; ++ ++ ret = clk_prepare_enable(phy_dwc3->ref_clk); ++ if (ret) { ++ clk_disable_unprepare(phy_dwc3->xo_clk); ++ return ret; ++ } ++ ++ /* reset phy */ ++ data = readl(phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ writel(data | SSUSB_CTRL_SS_PHY_RESET, ++ phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ usleep_range(2000, 2200); ++ writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ ++ /* clear REF_PAD if we don't have XO clk */ ++ if (!phy_dwc3->xo_clk) ++ data &= ~SSUSB_CTRL_REF_USE_PAD; ++ else ++ data |= SSUSB_CTRL_REF_USE_PAD; ++ ++ writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ ++ /* wait for ref clk to become stable, this can take up to 30ms */ ++ msleep(30); ++ ++ data |= SSUSB_CTRL_SS_PHY_EN | SSUSB_CTRL_LANE0_PWR_PRESENT; ++ writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ ++ /* ++ * WORKAROUND: There is SSPHY suspend bug due to which USB enumerates ++ * in HS mode instead of SS mode. Workaround it by asserting ++ * LANE0.TX_ALT_BLOCK.EN_ALT_BUS to enable TX to use alt bus mode ++ */ ++ ret = qcom_dwc3_ss_read_phycreg(phy_dwc3->base, 0x102D, &data); ++ if (ret) ++ goto err_phy_trans; ++ ++ data |= (1 << 7); ++ ret = qcom_dwc3_ss_write_phycreg(phy_dwc3, 0x102D, data); ++ if (ret) ++ goto err_phy_trans; ++ ++ ret = qcom_dwc3_ss_read_phycreg(phy_dwc3->base, 0x1010, &data); ++ if (ret) ++ goto err_phy_trans; ++ ++ data &= ~0xff0; ++ data |= 0x20; ++ ret = qcom_dwc3_ss_write_phycreg(phy_dwc3, 0x1010, data); ++ if (ret) ++ goto err_phy_trans; ++ ++ /* ++ * Fix RX Equalization setting as follows ++ * LANE0.RX_OVRD_IN_HI. RX_EQ_EN set to 0 ++ * LANE0.RX_OVRD_IN_HI.RX_EQ_EN_OVRD set to 1 ++ * LANE0.RX_OVRD_IN_HI.RX_EQ set based on SoC version ++ * LANE0.RX_OVRD_IN_HI.RX_EQ_OVRD set to 1 ++ */ ++ ret = qcom_dwc3_ss_read_phycreg(phy_dwc3->base, ++ SSPHY_CTRL_RX_OVRD_IN_HI(0), &data); ++ if (ret) ++ goto err_phy_trans; ++ ++ data &= ~RX_OVRD_IN_HI_RX_EQ_EN; ++ data |= RX_OVRD_IN_HI_RX_EQ_EN_OVRD; ++ data &= ~RX_OVRD_IN_HI_RX_EQ_MASK; ++ data |= phy_dwc3->rx_eq << RX_OVRD_IN_HI_RX_EQ_SHIFT; ++ data |= RX_OVRD_IN_HI_RX_EQ_OVRD; ++ ret = qcom_dwc3_ss_write_phycreg(phy_dwc3, ++ SSPHY_CTRL_RX_OVRD_IN_HI(0), data); ++ if (ret) ++ goto err_phy_trans; ++ ++ /* ++ * Set EQ and TX launch amplitudes as follows ++ * LANE0.TX_OVRD_DRV_LO.PREEMPH set based on SoC version ++ * LANE0.TX_OVRD_DRV_LO.AMPLITUDE set to 110 ++ * LANE0.TX_OVRD_DRV_LO.EN set to 1. ++ */ ++ ret = qcom_dwc3_ss_read_phycreg(phy_dwc3->base, ++ SSPHY_CTRL_TX_OVRD_DRV_LO(0), &data); ++ if (ret) ++ goto err_phy_trans; ++ ++ data &= ~TX_OVRD_DRV_LO_PREEMPH_MASK; ++ data |= phy_dwc3->tx_deamp_3_5db << TX_OVRD_DRV_LO_PREEMPH_SHIFT; ++ data &= ~TX_OVRD_DRV_LO_AMPLITUDE_MASK; ++ data |= 0x6E; ++ data |= TX_OVRD_DRV_LO_EN; ++ ret = qcom_dwc3_ss_write_phycreg(phy_dwc3, ++ SSPHY_CTRL_TX_OVRD_DRV_LO(0), data); ++ if (ret) ++ goto err_phy_trans; ++ ++ qcom_dwc3_ss_write_phycreg(phy_dwc3, 0x30, phy_dwc3->mpll); ++ ++ /* ++ * Set the QSCRATCH PHY_PARAM_CTRL1 parameters as follows ++ * TX_FULL_SWING [26:20] amplitude to 110 ++ * TX_DEEMPH_6DB [19:14] to 32 ++ * TX_DEEMPH_3_5DB [13:8] set based on SoC version ++ * LOS_BIAS [7:3] to 9 ++ */ ++ data = readl(phy_dwc3->base + SSUSB_PHY_PARAM_CTRL_1); ++ ++ data &= ~PHY_PARAM_CTRL1_MASK; ++ ++ data |= PHY_PARAM_CTRL1_TX_FULL_SWING(0x6e) | ++ PHY_PARAM_CTRL1_TX_DEEMPH_6DB(0x20) | ++ PHY_PARAM_CTRL1_TX_DEEMPH_3_5DB(phy_dwc3->tx_deamp_3_5db) | ++ PHY_PARAM_CTRL1_LOS_BIAS(0x9); ++ ++ qcom_dwc3_phy_write_readback(phy_dwc3, SSUSB_PHY_PARAM_CTRL_1, ++ PHY_PARAM_CTRL1_MASK, data); ++ ++err_phy_trans: ++ return ret; ++} ++ ++static int qcom_dwc3_ss_phy_exit(struct phy *phy) ++{ ++ struct qcom_dwc3_usb_phy *phy_dwc3 = phy_get_drvdata(phy); ++ ++ /* Sequence to put SSPHY in low power state: ++ * 1. Clear REF_PHY_EN in PHY_CTRL_REG ++ * 2. Clear REF_USE_PAD in PHY_CTRL_REG ++ * 3. Set TEST_POWERED_DOWN in PHY_CTRL_REG to enable PHY retention ++ */ ++ qcom_dwc3_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG, ++ SSUSB_CTRL_SS_PHY_EN, 0x0); ++ qcom_dwc3_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG, ++ SSUSB_CTRL_REF_USE_PAD, 0x0); ++ qcom_dwc3_phy_write_readback(phy_dwc3, SSUSB_PHY_CTRL_REG, ++ SSUSB_CTRL_TEST_POWERDOWN, 0x0); ++ ++ clk_disable_unprepare(phy_dwc3->ref_clk); ++ clk_disable_unprepare(phy_dwc3->xo_clk); ++ ++ return 0; ++} ++ ++static const struct qcom_dwc3_phy_drvdata qcom_dwc3_hs_drvdata = { ++ .ops = { ++ .init = qcom_dwc3_hs_phy_init, ++ .exit = qcom_dwc3_hs_phy_exit, ++ .owner = THIS_MODULE, ++ }, ++ .clk_rate = 60000000, ++}; ++ ++static const struct qcom_dwc3_phy_drvdata qcom_dwc3_ss_drvdata = { ++ .ops = { ++ .init = qcom_dwc3_ss_phy_init, ++ .exit = qcom_dwc3_ss_phy_exit, ++ .owner = THIS_MODULE, ++ }, ++ .clk_rate = 125000000, ++}; ++ ++static const struct of_device_id qcom_dwc3_phy_table[] = { ++ { .compatible = "qcom,dwc3-hs-usb-phy", .data = &qcom_dwc3_hs_drvdata }, ++ { .compatible = "qcom,dwc3-ss-usb-phy", .data = &qcom_dwc3_ss_drvdata }, ++ { /* Sentinel */ } ++}; ++MODULE_DEVICE_TABLE(of, qcom_dwc3_phy_table); ++ ++static int qcom_dwc3_phy_probe(struct platform_device *pdev) ++{ ++ struct qcom_dwc3_usb_phy *phy_dwc3; ++ struct phy_provider *phy_provider; ++ struct phy *generic_phy; ++ struct resource *res; ++ const struct of_device_id *match; ++ const struct qcom_dwc3_phy_drvdata *data; ++ struct device_node *np; ++ ++ phy_dwc3 = devm_kzalloc(&pdev->dev, sizeof(*phy_dwc3), GFP_KERNEL); ++ if (!phy_dwc3) ++ return -ENOMEM; ++ ++ match = of_match_node(qcom_dwc3_phy_table, pdev->dev.of_node); ++ data = match->data; ++ ++ phy_dwc3->dev = &pdev->dev; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ phy_dwc3->base = devm_ioremap_resource(phy_dwc3->dev, res); ++ if (IS_ERR(phy_dwc3->base)) ++ return PTR_ERR(phy_dwc3->base); ++ ++ phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref"); ++ if (IS_ERR(phy_dwc3->ref_clk)) { ++ dev_dbg(phy_dwc3->dev, "cannot get reference clock\n"); ++ return PTR_ERR(phy_dwc3->ref_clk); ++ } ++ ++ clk_set_rate(phy_dwc3->ref_clk, data->clk_rate); ++ ++ phy_dwc3->xo_clk = devm_clk_get(phy_dwc3->dev, "xo"); ++ if (IS_ERR(phy_dwc3->xo_clk)) { ++ dev_dbg(phy_dwc3->dev, "cannot get TCXO clock\n"); ++ phy_dwc3->xo_clk = NULL; ++ } ++ ++ /* Parse device node to probe HSIO settings */ ++ np = of_node_get(pdev->dev.of_node); ++ if (!of_compat_cmp(match->compatible, "qcom,dwc3-ss-usb-phy", ++ strlen(match->compatible))) { ++ ++ if (of_property_read_u32(np, "rx_eq", &phy_dwc3->rx_eq) || ++ of_property_read_u32(np, "tx_deamp_3_5db", ++ &phy_dwc3->tx_deamp_3_5db) || ++ of_property_read_u32(np, "mpll", &phy_dwc3->mpll)) { ++ ++ dev_err(phy_dwc3->dev, "cannot get HSIO settings from device node, using default values\n"); ++ ++ /* Default HSIO settings */ ++ phy_dwc3->rx_eq = SSPHY_RX_EQ_VALUE; ++ phy_dwc3->tx_deamp_3_5db = SSPHY_TX_DEEMPH_3_5DB; ++ phy_dwc3->mpll = SSPHY_MPLL_VALUE; ++ } ++ } ++ ++ generic_phy = devm_phy_create(phy_dwc3->dev, pdev->dev.of_node, ++ &data->ops); ++ ++ if (IS_ERR(generic_phy)) ++ return PTR_ERR(generic_phy); ++ ++ phy_set_drvdata(generic_phy, phy_dwc3); ++ platform_set_drvdata(pdev, phy_dwc3); ++ ++ phy_provider = devm_of_phy_provider_register(phy_dwc3->dev, ++ of_phy_simple_xlate); ++ ++ if (IS_ERR(phy_provider)) ++ return PTR_ERR(phy_provider); ++ ++ return 0; ++} ++ ++static struct platform_driver qcom_dwc3_phy_driver = { ++ .probe = qcom_dwc3_phy_probe, ++ .driver = { ++ .name = "qcom-dwc3-usb-phy", ++ .owner = THIS_MODULE, ++ .of_match_table = qcom_dwc3_phy_table, ++ }, ++}; ++ ++module_platform_driver(qcom_dwc3_phy_driver); ++ ++MODULE_ALIAS("platform:phy-qcom-dwc3"); ++MODULE_LICENSE("GPL v2"); ++MODULE_AUTHOR("Andy Gross "); ++MODULE_AUTHOR("Ivan T. Ivanov "); ++MODULE_DESCRIPTION("DesignWare USB3 QCOM PHY driver"); diff --git a/target/linux/ipq806x/patches-4.19/0033-ARM-qcom-automatically-select-PCI_DOMAINS-if-PCI-is-.patch b/target/linux/ipq806x/patches-4.19/0033-ARM-qcom-automatically-select-PCI_DOMAINS-if-PCI-is-.patch new file mode 100644 index 0000000000..a6c7953aaa --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0033-ARM-qcom-automatically-select-PCI_DOMAINS-if-PCI-is-.patch @@ -0,0 +1,29 @@ +From 48051ece78136e4235a2415a52797db56f8a4478 Mon Sep 17 00:00:00 2001 +From: Mathieu Olivari +Date: Tue, 21 Apr 2015 19:09:07 -0700 +Subject: [PATCH 33/69] ARM: qcom: automatically select PCI_DOMAINS if PCI is + enabled + +If multiple PCIe devices are present in the system, the kernel will +panic at boot time when trying to scan the PCI buses. This happens on +IPQ806x based platforms, which has 3 PCIe ports. + +Enabling this option allows the kernel to assign the pci-domains +according to the device-tree content. This allows multiple PCIe +controllers to coexist in the system. + +Signed-off-by: Mathieu Olivari +--- + arch/arm/mach-qcom/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/mach-qcom/Kconfig ++++ b/arch/arm/mach-qcom/Kconfig +@@ -6,6 +6,7 @@ menuconfig ARCH_QCOM + select ARM_AMBA + select PINCTRL + select QCOM_SCM if SMP ++ select PCI_DOMAINS if PCI + help + Support for Qualcomm's devicetree based systems. + diff --git a/target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch b/target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch new file mode 100644 index 0000000000..5380f2c7f9 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch @@ -0,0 +1,147 @@ +From patchwork Fri Dec 8 09:42:19 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,01/12] ARM: Add Krait L2 register accessor functions +From: Sricharan R +X-Patchwork-Id: 10102101 +Message-Id: <1512726150-7204-2-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org, Mark Rutland , + Russell King , + Courtney Cavin +Date: Fri, 8 Dec 2017 15:12:19 +0530 + +From: Stephen Boyd + +Krait CPUs have a handful of L2 cache controller registers that +live behind a cp15 based indirection register. First you program +the indirection register (l2cpselr) to point the L2 'window' +register (l2cpdr) at what you want to read/write. Then you +read/write the 'window' register to do what you want. The +l2cpselr register is not banked per-cpu so we must lock around +accesses to it to prevent other CPUs from re-pointing l2cpdr +underneath us. + +Cc: Mark Rutland +Cc: Russell King +Cc: Courtney Cavin +Signed-off-by: Stephen Boyd +--- + arch/arm/common/Kconfig | 3 ++ + arch/arm/common/Makefile | 1 + + arch/arm/common/krait-l2-accessors.c | 58 +++++++++++++++++++++++++++++++ + arch/arm/include/asm/krait-l2-accessors.h | 20 +++++++++++ + 4 files changed, 82 insertions(+) + create mode 100644 arch/arm/common/krait-l2-accessors.c + create mode 100644 arch/arm/include/asm/krait-l2-accessors.h + +--- a/arch/arm/common/Kconfig ++++ b/arch/arm/common/Kconfig +@@ -7,6 +7,9 @@ config DMABOUNCE + bool + select ZONE_DMA + ++config KRAIT_L2_ACCESSORS ++ bool ++ + config SHARP_LOCOMO + bool + +--- a/arch/arm/common/Makefile ++++ b/arch/arm/common/Makefile +@@ -7,6 +7,7 @@ obj-y += firmware.o + + obj-$(CONFIG_SA1111) += sa1111.o + obj-$(CONFIG_DMABOUNCE) += dmabounce.o ++obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o + obj-$(CONFIG_SHARP_LOCOMO) += locomo.o + obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o + obj-$(CONFIG_SHARP_SCOOP) += scoop.o +--- /dev/null ++++ b/arch/arm/common/krait-l2-accessors.c +@@ -0,0 +1,58 @@ ++/* ++ * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++ ++static DEFINE_RAW_SPINLOCK(krait_l2_lock); ++ ++void krait_set_l2_indirect_reg(u32 addr, u32 val) ++{ ++ unsigned long flags; ++ ++ raw_spin_lock_irqsave(&krait_l2_lock, flags); ++ /* ++ * Select the L2 window by poking l2cpselr, then write to the window ++ * via l2cpdr. ++ */ ++ asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); ++ isb(); ++ asm volatile ("mcr p15, 3, %0, c15, c0, 7 @ l2cpdr" : : "r" (val)); ++ isb(); ++ ++ raw_spin_unlock_irqrestore(&krait_l2_lock, flags); ++} ++EXPORT_SYMBOL(krait_set_l2_indirect_reg); ++ ++u32 krait_get_l2_indirect_reg(u32 addr) ++{ ++ u32 val; ++ unsigned long flags; ++ ++ raw_spin_lock_irqsave(&krait_l2_lock, flags); ++ /* ++ * Select the L2 window by poking l2cpselr, then read from the window ++ * via l2cpdr. ++ */ ++ asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); ++ isb(); ++ asm volatile ("mrc p15, 3, %0, c15, c0, 7 @ l2cpdr" : "=r" (val)); ++ ++ raw_spin_unlock_irqrestore(&krait_l2_lock, flags); ++ ++ return val; ++} ++EXPORT_SYMBOL(krait_get_l2_indirect_reg); +--- /dev/null ++++ b/arch/arm/include/asm/krait-l2-accessors.h +@@ -0,0 +1,20 @@ ++/* ++ * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef __ASMARM_KRAIT_L2_ACCESSORS_H ++#define __ASMARM_KRAIT_L2_ACCESSORS_H ++ ++extern void krait_set_l2_indirect_reg(u32 addr, u32 val); ++extern u32 krait_get_l2_indirect_reg(u32 addr); ++ ++#endif diff --git a/target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch b/target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch new file mode 100644 index 0000000000..e65ca02980 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch @@ -0,0 +1,195 @@ +From patchwork Fri Dec 8 09:42:20 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,02/12] clk: mux: Split out register accessors for reuse +From: Sricharan R +X-Patchwork-Id: 10102103 +Message-Id: <1512726150-7204-3-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:20 +0530 + +From: Stephen Boyd + +We want to reuse the logic in clk-mux.c for other clock drivers +that don't use readl as register accessors. Fortunately, there +really isn't much to the mux code besides the table indirection +and quirk flags if you assume any bit shifting and masking has +been done already. Pull that logic out into reusable functions +that operate on an optional table and some flags so that other +drivers can use the same logic. + +Signed-off-by: Stephen Boyd +--- + drivers/clk/clk-mux.c | 75 +++++++++++++++++++++++++++----------------- + include/linux/clk-provider.h | 9 ++++-- + 2 files changed, 54 insertions(+), 30 deletions(-) + +--- a/drivers/clk/clk-mux.c ++++ b/drivers/clk/clk-mux.c +@@ -26,35 +26,24 @@ + * parent - parent is adjustable through clk_set_parent + */ + +-static u8 clk_mux_get_parent(struct clk_hw *hw) ++unsigned int clk_mux_get_parent(struct clk_hw *hw, unsigned int val, ++ unsigned int *table, unsigned long flags) + { +- struct clk_mux *mux = to_clk_mux(hw); + int num_parents = clk_hw_get_num_parents(hw); +- u32 val; +- +- /* +- * FIXME need a mux-specific flag to determine if val is bitwise or numeric +- * e.g. sys_clkin_ck's clksel field is 3 bits wide, but ranges from 0x1 +- * to 0x7 (index starts at one) +- * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so +- * val = 0x4 really means "bit 2, index starts at bit 0" +- */ +- val = clk_readl(mux->reg) >> mux->shift; +- val &= mux->mask; + +- if (mux->table) { ++ if (table) { + int i; + + for (i = 0; i < num_parents; i++) +- if (mux->table[i] == val) ++ if (table[i] == val) + return i; + return -EINVAL; + } + +- if (val && (mux->flags & CLK_MUX_INDEX_BIT)) ++ if (val && (flags & CLK_MUX_INDEX_BIT)) + val = ffs(val) - 1; + +- if (val && (mux->flags & CLK_MUX_INDEX_ONE)) ++ if (val && (flags & CLK_MUX_INDEX_ONE)) + val--; + + if (val >= num_parents) +@@ -62,23 +51,53 @@ static u8 clk_mux_get_parent(struct clk_ + + return val; + } ++EXPORT_SYMBOL_GPL(clk_mux_get_parent); + +-static int clk_mux_set_parent(struct clk_hw *hw, u8 index) ++static u8 _clk_mux_get_parent(struct clk_hw *hw) + { + struct clk_mux *mux = to_clk_mux(hw); + u32 val; +- unsigned long flags = 0; + +- if (mux->table) { +- index = mux->table[index]; ++ /* ++ * FIXME need a mux-specific flag to determine if val is bitwise or ++ * numeric e.g. sys_clkin_ck's clksel field is 3 bits wide, ++ * but ranges from 0x1 to 0x7 (index starts at one) ++ * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so ++ * val = 0x4 really means "bit 2, index starts at bit 0" ++ */ ++ val = clk_readl(mux->reg) >> mux->shift; ++ val &= mux->mask; ++ ++ return clk_mux_get_parent(hw, val, mux->table, mux->flags); ++} ++ ++unsigned int clk_mux_reindex(u8 index, unsigned int *table, ++ unsigned long flags) ++{ ++ unsigned int val = index; ++ ++ if (table) { ++ val = table[val]; + } else { +- if (mux->flags & CLK_MUX_INDEX_BIT) +- index = 1 << index; ++ if (flags & CLK_MUX_INDEX_BIT) ++ val = 1 << index; + +- if (mux->flags & CLK_MUX_INDEX_ONE) +- index++; ++ if (flags & CLK_MUX_INDEX_ONE) ++ val++; + } + ++ return val; ++} ++EXPORT_SYMBOL_GPL(clk_mux_reindex); ++ ++static int clk_mux_set_parent(struct clk_hw *hw, u8 index) ++{ ++ struct clk_mux *mux = to_clk_mux(hw); ++ u32 val; ++ unsigned long flags = 0; ++ ++ index = clk_mux_reindex(index, mux->table, mux->flags); ++ + if (mux->lock) + spin_lock_irqsave(mux->lock, flags); + else +@@ -110,14 +129,14 @@ static int clk_mux_determine_rate(struct + } + + const struct clk_ops clk_mux_ops = { +- .get_parent = clk_mux_get_parent, ++ .get_parent = _clk_mux_get_parent, + .set_parent = clk_mux_set_parent, + .determine_rate = clk_mux_determine_rate, + }; + EXPORT_SYMBOL_GPL(clk_mux_ops); + + const struct clk_ops clk_mux_ro_ops = { +- .get_parent = clk_mux_get_parent, ++ .get_parent = _clk_mux_get_parent, + }; + EXPORT_SYMBOL_GPL(clk_mux_ro_ops); + +@@ -125,7 +144,7 @@ struct clk_hw *clk_hw_register_mux_table + const char * const *parent_names, u8 num_parents, + unsigned long flags, + void __iomem *reg, u8 shift, u32 mask, +- u8 clk_mux_flags, u32 *table, spinlock_t *lock) ++ u8 clk_mux_flags, unsigned int *table, spinlock_t *lock) + { + struct clk_mux *mux; + struct clk_hw *hw; +--- a/include/linux/clk-provider.h ++++ b/include/linux/clk-provider.h +@@ -468,7 +468,7 @@ void clk_hw_unregister_divider(struct cl + struct clk_mux { + struct clk_hw hw; + void __iomem *reg; +- u32 *table; ++ unsigned int *table; + u32 mask; + u8 shift; + u8 flags; +@@ -486,6 +486,11 @@ struct clk_mux { + extern const struct clk_ops clk_mux_ops; + extern const struct clk_ops clk_mux_ro_ops; + ++unsigned int clk_mux_get_parent(struct clk_hw *hw, unsigned int val, ++ unsigned int *table, unsigned long flags); ++unsigned int clk_mux_reindex(u8 index, unsigned int *table, ++ unsigned long flags); ++ + struct clk *clk_register_mux(struct device *dev, const char *name, + const char * const *parent_names, u8 num_parents, + unsigned long flags, +@@ -506,7 +511,7 @@ struct clk_hw *clk_hw_register_mux_table + const char * const *parent_names, u8 num_parents, + unsigned long flags, + void __iomem *reg, u8 shift, u32 mask, +- u8 clk_mux_flags, u32 *table, spinlock_t *lock); ++ u8 clk_mux_flags, unsigned int *table, spinlock_t *lock); + + void clk_unregister_mux(struct clk *clk); + void clk_hw_unregister_mux(struct clk_hw *hw); diff --git a/target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch b/target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch new file mode 100644 index 0000000000..45314e70d5 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch @@ -0,0 +1,352 @@ +From patchwork Fri Dec 8 09:42:21 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,03/12] clk: qcom: Add support for High-Frequency PLLs (HFPLLs) +From: Sricharan R +X-Patchwork-Id: 10102083 +Message-Id: <1512726150-7204-4-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:21 +0530 + +From: Stephen Boyd + +HFPLLs are the main frequency source for Krait CPU clocks. Add +support for changing the rate of these PLLs. + +Signed-off-by: Stephen Boyd +--- + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-hfpll.c | 253 +++++++++++++++++++++++++++++++++++++++++++ + drivers/clk/qcom/clk-hfpll.h | 54 +++++++++ + 3 files changed, 308 insertions(+) + create mode 100644 drivers/clk/qcom/clk-hfpll.c + create mode 100644 drivers/clk/qcom/clk-hfpll.h + +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -10,6 +10,7 @@ clk-qcom-y += clk-rcg2.o + clk-qcom-y += clk-branch.o + clk-qcom-y += clk-regmap-divider.o + clk-qcom-y += clk-regmap-mux.o ++clk-qcom-y += clk-hfpll.o + clk-qcom-y += reset.o + clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o + +--- /dev/null ++++ b/drivers/clk/qcom/clk-hfpll.c +@@ -0,0 +1,253 @@ ++/* ++ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "clk-regmap.h" ++#include "clk-hfpll.h" ++ ++#define PLL_OUTCTRL BIT(0) ++#define PLL_BYPASSNL BIT(1) ++#define PLL_RESET_N BIT(2) ++ ++/* Initialize a HFPLL at a given rate and enable it. */ ++static void __clk_hfpll_init_once(struct clk_hw *hw) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ ++ if (likely(h->init_done)) ++ return; ++ ++ /* Configure PLL parameters for integer mode. */ ++ if (hd->config_val) ++ regmap_write(regmap, hd->config_reg, hd->config_val); ++ regmap_write(regmap, hd->m_reg, 0); ++ regmap_write(regmap, hd->n_reg, 1); ++ ++ if (hd->user_reg) { ++ u32 regval = hd->user_val; ++ unsigned long rate; ++ ++ rate = clk_hw_get_rate(hw); ++ ++ /* Pick the right VCO. */ ++ if (hd->user_vco_mask && rate > hd->low_vco_max_rate) ++ regval |= hd->user_vco_mask; ++ regmap_write(regmap, hd->user_reg, regval); ++ } ++ ++ if (hd->droop_reg) ++ regmap_write(regmap, hd->droop_reg, hd->droop_val); ++ ++ h->init_done = true; ++} ++ ++static void __clk_hfpll_enable(struct clk_hw *hw) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ u32 val; ++ ++ __clk_hfpll_init_once(hw); ++ ++ /* Disable PLL bypass mode. */ ++ regmap_update_bits(regmap, hd->mode_reg, PLL_BYPASSNL, PLL_BYPASSNL); ++ ++ /* ++ * H/W requires a 5us delay between disabling the bypass and ++ * de-asserting the reset. Delay 10us just to be safe. ++ */ ++ udelay(10); ++ ++ /* De-assert active-low PLL reset. */ ++ regmap_update_bits(regmap, hd->mode_reg, PLL_RESET_N, PLL_RESET_N); ++ ++ /* Wait for PLL to lock. */ ++ if (hd->status_reg) { ++ do { ++ regmap_read(regmap, hd->status_reg, &val); ++ } while (!(val & BIT(hd->lock_bit))); ++ } else { ++ udelay(60); ++ } ++ ++ /* Enable PLL output. */ ++ regmap_update_bits(regmap, hd->mode_reg, PLL_OUTCTRL, PLL_OUTCTRL); ++} ++ ++/* Enable an already-configured HFPLL. */ ++static int clk_hfpll_enable(struct clk_hw *hw) ++{ ++ unsigned long flags; ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ u32 mode; ++ ++ spin_lock_irqsave(&h->lock, flags); ++ regmap_read(regmap, hd->mode_reg, &mode); ++ if (!(mode & (PLL_BYPASSNL | PLL_RESET_N | PLL_OUTCTRL))) ++ __clk_hfpll_enable(hw); ++ spin_unlock_irqrestore(&h->lock, flags); ++ ++ return 0; ++} ++ ++static void __clk_hfpll_disable(struct clk_hfpll *h) ++{ ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ ++ /* ++ * Disable the PLL output, disable test mode, enable the bypass mode, ++ * and assert the reset. ++ */ ++ regmap_update_bits(regmap, hd->mode_reg, ++ PLL_BYPASSNL | PLL_RESET_N | PLL_OUTCTRL, 0); ++} ++ ++static void clk_hfpll_disable(struct clk_hw *hw) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&h->lock, flags); ++ __clk_hfpll_disable(h); ++ spin_unlock_irqrestore(&h->lock, flags); ++} ++ ++static long clk_hfpll_round_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long *parent_rate) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ unsigned long rrate; ++ ++ rate = clamp(rate, hd->min_rate, hd->max_rate); ++ ++ rrate = DIV_ROUND_UP(rate, *parent_rate) * *parent_rate; ++ if (rrate > hd->max_rate) ++ rrate -= *parent_rate; ++ ++ return rrate; ++} ++ ++/* ++ * For optimization reasons, assumes no downstream clocks are actively using ++ * it. ++ */ ++static int clk_hfpll_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ unsigned long flags; ++ u32 l_val, val; ++ bool enabled; ++ ++ l_val = rate / parent_rate; ++ ++ spin_lock_irqsave(&h->lock, flags); ++ ++ enabled = __clk_is_enabled(hw->clk); ++ if (enabled) ++ __clk_hfpll_disable(h); ++ ++ /* Pick the right VCO. */ ++ if (hd->user_reg && hd->user_vco_mask) { ++ regmap_read(regmap, hd->user_reg, &val); ++ if (rate <= hd->low_vco_max_rate) ++ val &= ~hd->user_vco_mask; ++ else ++ val |= hd->user_vco_mask; ++ regmap_write(regmap, hd->user_reg, val); ++ } ++ ++ regmap_write(regmap, hd->l_reg, l_val); ++ ++ if (enabled) ++ __clk_hfpll_enable(hw); ++ ++ spin_unlock_irqrestore(&h->lock, flags); ++ ++ return 0; ++} ++ ++static unsigned long clk_hfpll_recalc_rate(struct clk_hw *hw, ++ unsigned long parent_rate) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ u32 l_val; ++ ++ regmap_read(regmap, hd->l_reg, &l_val); ++ ++ return l_val * parent_rate; ++} ++ ++static void clk_hfpll_init(struct clk_hw *hw) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ u32 mode, status; ++ ++ regmap_read(regmap, hd->mode_reg, &mode); ++ if (mode != (PLL_BYPASSNL | PLL_RESET_N | PLL_OUTCTRL)) { ++ __clk_hfpll_init_once(hw); ++ return; ++ } ++ ++ if (hd->status_reg) { ++ regmap_read(regmap, hd->status_reg, &status); ++ if (!(status & BIT(hd->lock_bit))) { ++ WARN(1, "HFPLL %s is ON, but not locked!\n", ++ __clk_get_name(hw->clk)); ++ clk_hfpll_disable(hw); ++ __clk_hfpll_init_once(hw); ++ } ++ } ++} ++ ++static int hfpll_is_enabled(struct clk_hw *hw) ++{ ++ struct clk_hfpll *h = to_clk_hfpll(hw); ++ struct hfpll_data const *hd = h->d; ++ struct regmap *regmap = h->clkr.regmap; ++ u32 mode; ++ ++ regmap_read(regmap, hd->mode_reg, &mode); ++ mode &= 0x7; ++ return mode == (PLL_BYPASSNL | PLL_RESET_N | PLL_OUTCTRL); ++} ++ ++const struct clk_ops clk_ops_hfpll = { ++ .enable = clk_hfpll_enable, ++ .disable = clk_hfpll_disable, ++ .is_enabled = hfpll_is_enabled, ++ .round_rate = clk_hfpll_round_rate, ++ .set_rate = clk_hfpll_set_rate, ++ .recalc_rate = clk_hfpll_recalc_rate, ++ .init = clk_hfpll_init, ++}; ++EXPORT_SYMBOL_GPL(clk_ops_hfpll); +--- /dev/null ++++ b/drivers/clk/qcom/clk-hfpll.h +@@ -0,0 +1,54 @@ ++/* ++ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++#ifndef __QCOM_CLK_HFPLL_H__ ++#define __QCOM_CLK_HFPLL_H__ ++ ++#include ++#include ++#include "clk-regmap.h" ++ ++struct hfpll_data { ++ u32 mode_reg; ++ u32 l_reg; ++ u32 m_reg; ++ u32 n_reg; ++ u32 user_reg; ++ u32 droop_reg; ++ u32 config_reg; ++ u32 status_reg; ++ u8 lock_bit; ++ ++ u32 droop_val; ++ u32 config_val; ++ u32 user_val; ++ u32 user_vco_mask; ++ unsigned long low_vco_max_rate; ++ ++ unsigned long min_rate; ++ unsigned long max_rate; ++}; ++ ++struct clk_hfpll { ++ struct hfpll_data const *d; ++ int init_done; ++ ++ struct clk_regmap clkr; ++ spinlock_t lock; ++}; ++ ++#define to_clk_hfpll(_hw) \ ++ container_of(to_clk_regmap(_hw), struct clk_hfpll, clkr) ++ ++extern const struct clk_ops clk_ops_hfpll; ++ ++#endif diff --git a/target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch b/target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch new file mode 100644 index 0000000000..884d564ae7 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch @@ -0,0 +1,206 @@ +From patchwork Fri Dec 8 09:42:22 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,04/12] clk: qcom: Add HFPLL driver +From: Sricharan R +X-Patchwork-Id: 10102079 +Message-Id: <1512726150-7204-5-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:22 +0530 + +From: Stephen Boyd + +On some devices (MSM8974 for example), the HFPLLs are +instantiated within the Krait processor subsystem as separate +register regions. Add a driver for these PLLs so that we can +provide HFPLL clocks for use by the system. + +Cc: +Signed-off-by: Stephen Boyd +--- + .../devicetree/bindings/clock/qcom,hfpll.txt | 40 ++++++++ + drivers/clk/qcom/Kconfig | 8 ++ + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/hfpll.c | 106 +++++++++++++++++++++ + 4 files changed, 155 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.txt + create mode 100644 drivers/clk/qcom/hfpll.c + +--- /dev/null ++++ b/Documentation/devicetree/bindings/clock/qcom,hfpll.txt +@@ -0,0 +1,40 @@ ++High-Frequency PLL (HFPLL) ++ ++PROPERTIES ++ ++- compatible: ++ Usage: required ++ Value type: ++ Definition: must be "qcom,hfpll" ++ ++- reg: ++ Usage: required ++ Value type: ++ Definition: address and size of HPLL registers. An optional second ++ element specifies the address and size of the alias ++ register region. ++ ++- clock-output-names: ++ Usage: required ++ Value type: ++ Definition: Name of the PLL. Typically hfpllX where X is a CPU number ++ starting at 0. Otherwise hfpll_Y where Y is more specific ++ such as "l2". ++ ++Example: ++ ++1) An HFPLL for the L2 cache. ++ ++ clock-controller@f9016000 { ++ compatible = "qcom,hfpll"; ++ reg = <0xf9016000 0x30>; ++ clock-output-names = "hfpll_l2"; ++ }; ++ ++2) An HFPLL for CPU0. This HFPLL has the alias register region. ++ ++ clock-controller@f908a000 { ++ compatible = "qcom,hfpll"; ++ reg = <0xf908a000 0x30>, <0xf900a000 0x30>; ++ clock-output-names = "hfpll0"; ++ }; +--- a/drivers/clk/qcom/Kconfig ++++ b/drivers/clk/qcom/Kconfig +@@ -196,3 +196,11 @@ config MSM_MMCC_8996 + Support for the multimedia clock controller on msm8996 devices. + Say Y if you want to support multimedia devices such as display, + graphics, video encode/decode, camera, etc. ++ ++config QCOM_HFPLL ++ tristate "High-Frequency PLL (HFPLL) Clock Controller" ++ depends on COMMON_CLK_QCOM ++ help ++ Support for the high-frequency PLLs present on Qualcomm devices. ++ Say Y if you want to support CPU frequency scaling on devices ++ such as MSM8974, APQ8084, etc. +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -35,3 +35,4 @@ obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8 + obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o + obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o + obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o ++obj-$(CONFIG_QCOM_HFPLL) += hfpll.o +--- /dev/null ++++ b/drivers/clk/qcom/hfpll.c +@@ -0,0 +1,106 @@ ++/* ++ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "clk-regmap.h" ++#include "clk-hfpll.h" ++ ++static const struct hfpll_data hdata = { ++ .mode_reg = 0x00, ++ .l_reg = 0x04, ++ .m_reg = 0x08, ++ .n_reg = 0x0c, ++ .user_reg = 0x10, ++ .config_reg = 0x14, ++ .config_val = 0x430405d, ++ .status_reg = 0x1c, ++ .lock_bit = 16, ++ ++ .user_val = 0x8, ++ .user_vco_mask = 0x100000, ++ .low_vco_max_rate = 1248000000, ++ .min_rate = 537600000UL, ++ .max_rate = 2900000000UL, ++}; ++ ++static const struct of_device_id qcom_hfpll_match_table[] = { ++ { .compatible = "qcom,hfpll" }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, qcom_hfpll_match_table); ++ ++static const struct regmap_config hfpll_regmap_config = { ++ .reg_bits = 32, ++ .reg_stride = 4, ++ .val_bits = 32, ++ .max_register = 0x30, ++ .fast_io = true, ++}; ++ ++static int qcom_hfpll_probe(struct platform_device *pdev) ++{ ++ struct resource *res; ++ struct device *dev = &pdev->dev; ++ void __iomem *base; ++ struct regmap *regmap; ++ struct clk_hfpll *h; ++ struct clk_init_data init = { ++ .parent_names = (const char *[]){ "xo" }, ++ .num_parents = 1, ++ .ops = &clk_ops_hfpll, ++ }; ++ ++ h = devm_kzalloc(dev, sizeof(*h), GFP_KERNEL); ++ if (!h) ++ return -ENOMEM; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ base = devm_ioremap_resource(dev, res); ++ if (IS_ERR(base)) ++ return PTR_ERR(base); ++ ++ regmap = devm_regmap_init_mmio(&pdev->dev, base, &hfpll_regmap_config); ++ if (IS_ERR(regmap)) ++ return PTR_ERR(regmap); ++ ++ if (of_property_read_string_index(dev->of_node, "clock-output-names", ++ 0, &init.name)) ++ return -ENODEV; ++ ++ h->d = &hdata; ++ h->clkr.hw.init = &init; ++ spin_lock_init(&h->lock); ++ ++ return devm_clk_register_regmap(&pdev->dev, &h->clkr); ++} ++ ++static struct platform_driver qcom_hfpll_driver = { ++ .probe = qcom_hfpll_probe, ++ .driver = { ++ .name = "qcom-hfpll", ++ .of_match_table = qcom_hfpll_match_table, ++ }, ++}; ++module_platform_driver(qcom_hfpll_driver); ++ ++MODULE_DESCRIPTION("QCOM HFPLL Clock Driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:qcom-hfpll"); diff --git a/target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch b/target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch new file mode 100644 index 0000000000..c3af0fa55c --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch @@ -0,0 +1,129 @@ +From patchwork Fri Dec 8 09:42:24 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,06/12] clk: qcom: Add IPQ806X's HFPLLs +From: Sricharan R +X-Patchwork-Id: 10102047 +Message-Id: <1512726150-7204-7-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:24 +0530 + +From: Stephen Boyd + +Describe the HFPLLs present on IPQ806X devices. + +Signed-off-by: Stephen Boyd +--- + drivers/clk/qcom/gcc-ipq806x.c | 82 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + +--- a/drivers/clk/qcom/gcc-ipq806x.c ++++ b/drivers/clk/qcom/gcc-ipq806x.c +@@ -30,6 +30,7 @@ + #include "clk-pll.h" + #include "clk-rcg.h" + #include "clk-branch.h" ++#include "clk-hfpll.h" + #include "reset.h" + + static struct clk_pll pll0 = { +@@ -113,6 +114,84 @@ static struct clk_regmap pll8_vote = { + }, + }; + ++static struct hfpll_data hfpll0_data = { ++ .mode_reg = 0x3200, ++ .l_reg = 0x3208, ++ .m_reg = 0x320c, ++ .n_reg = 0x3210, ++ .config_reg = 0x3204, ++ .status_reg = 0x321c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3214, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll0 = { ++ .d = &hfpll0_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll0", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll0.lock), ++}; ++ ++static struct hfpll_data hfpll1_data = { ++ .mode_reg = 0x3240, ++ .l_reg = 0x3248, ++ .m_reg = 0x324c, ++ .n_reg = 0x3250, ++ .config_reg = 0x3244, ++ .status_reg = 0x325c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3314, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll1 = { ++ .d = &hfpll1_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll1", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll1.lock), ++}; ++ ++static struct hfpll_data hfpll_l2_data = { ++ .mode_reg = 0x3300, ++ .l_reg = 0x3308, ++ .m_reg = 0x330c, ++ .n_reg = 0x3310, ++ .config_reg = 0x3304, ++ .status_reg = 0x331c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3314, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll_l2 = { ++ .d = &hfpll_l2_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll_l2", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll_l2.lock), ++}; ++ + static struct clk_pll pll14 = { + .l_reg = 0x31c4, + .m_reg = 0x31c8, +@@ -2801,6 +2880,9 @@ static struct clk_regmap *gcc_ipq806x_cl + [UBI32_CORE2_CLK_SRC] = &ubi32_core2_src_clk.clkr, + [NSSTCM_CLK_SRC] = &nss_tcm_src.clkr, + [NSSTCM_CLK] = &nss_tcm_clk.clkr, ++ [PLL9] = &hfpll0.clkr, ++ [PLL10] = &hfpll1.clkr, ++ [PLL12] = &hfpll_l2.clkr, + }; + + static const struct qcom_reset_map gcc_ipq806x_resets[] = { diff --git a/target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch b/target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch new file mode 100644 index 0000000000..5896ab3a26 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch @@ -0,0 +1,241 @@ +From patchwork Fri Dec 8 09:42:25 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,07/12] clk: qcom: Add support for Krait clocks +From: Sricharan R +X-Patchwork-Id: 10102051 +Message-Id: <1512726150-7204-8-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:25 +0530 + +From: Stephen Boyd + +The Krait clocks are made up of a series of muxes and a divider +that choose between a fixed rate clock and dedicated HFPLLs for +each CPU. Instead of using mmio accesses to remux parents, the +Krait implementation exposes the remux control via cp15 +registers. Support these clocks. + +Signed-off-by: Stephen Boyd +--- + drivers/clk/qcom/Kconfig | 4 ++ + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-krait.c | 134 +++++++++++++++++++++++++++++++++++++++++++ + drivers/clk/qcom/clk-krait.h | 48 ++++++++++++++++ + 4 files changed, 187 insertions(+) + create mode 100644 drivers/clk/qcom/clk-krait.c + create mode 100644 drivers/clk/qcom/clk-krait.h + +--- a/drivers/clk/qcom/Kconfig ++++ b/drivers/clk/qcom/Kconfig +@@ -204,3 +204,7 @@ config QCOM_HFPLL + Support for the high-frequency PLLs present on Qualcomm devices. + Say Y if you want to support CPU frequency scaling on devices + such as MSM8974, APQ8084, etc. ++ ++config KRAIT_CLOCKS ++ bool ++ select KRAIT_L2_ACCESSORS +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -10,6 +10,7 @@ clk-qcom-y += clk-rcg2.o + clk-qcom-y += clk-branch.o + clk-qcom-y += clk-regmap-divider.o + clk-qcom-y += clk-regmap-mux.o ++clk-qcom-$(CONFIG_KRAIT_CLOCKS) += clk-krait.o + clk-qcom-y += clk-hfpll.o + clk-qcom-y += reset.o + clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o +--- /dev/null ++++ b/drivers/clk/qcom/clk-krait.c +@@ -0,0 +1,134 @@ ++/* ++ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "clk-krait.h" ++ ++/* Secondary and primary muxes share the same cp15 register */ ++static DEFINE_SPINLOCK(krait_clock_reg_lock); ++ ++#define LPL_SHIFT 8 ++static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) ++{ ++ unsigned long flags; ++ u32 regval; ++ ++ spin_lock_irqsave(&krait_clock_reg_lock, flags); ++ regval = krait_get_l2_indirect_reg(mux->offset); ++ regval &= ~(mux->mask << mux->shift); ++ regval |= (sel & mux->mask) << mux->shift; ++ if (mux->lpl) { ++ regval &= ~(mux->mask << (mux->shift + LPL_SHIFT)); ++ regval |= (sel & mux->mask) << (mux->shift + LPL_SHIFT); ++ } ++ krait_set_l2_indirect_reg(mux->offset, regval); ++ spin_unlock_irqrestore(&krait_clock_reg_lock, flags); ++ ++ /* Wait for switch to complete. */ ++ mb(); ++ udelay(1); ++} ++ ++static int krait_mux_set_parent(struct clk_hw *hw, u8 index) ++{ ++ struct krait_mux_clk *mux = to_krait_mux_clk(hw); ++ u32 sel; ++ ++ sel = clk_mux_reindex(index, mux->parent_map, 0); ++ mux->en_mask = sel; ++ /* Don't touch mux if CPU is off as it won't work */ ++ if (__clk_is_enabled(hw->clk)) ++ __krait_mux_set_sel(mux, sel); ++ ++ return 0; ++} ++ ++static u8 krait_mux_get_parent(struct clk_hw *hw) ++{ ++ struct krait_mux_clk *mux = to_krait_mux_clk(hw); ++ u32 sel; ++ ++ sel = krait_get_l2_indirect_reg(mux->offset); ++ sel >>= mux->shift; ++ sel &= mux->mask; ++ mux->en_mask = sel; ++ ++ return clk_mux_get_parent(hw, sel, mux->parent_map, 0); ++} ++ ++const struct clk_ops krait_mux_clk_ops = { ++ .set_parent = krait_mux_set_parent, ++ .get_parent = krait_mux_get_parent, ++ .determine_rate = __clk_mux_determine_rate_closest, ++}; ++EXPORT_SYMBOL_GPL(krait_mux_clk_ops); ++ ++/* The divider can divide by 2, 4, 6 and 8. But we only really need div-2. */ ++static long krait_div2_round_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long *parent_rate) ++{ ++ *parent_rate = clk_hw_round_rate(clk_hw_get_parent(hw), rate * 2); ++ return DIV_ROUND_UP(*parent_rate, 2); ++} ++ ++static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct krait_div2_clk *d = to_krait_div2_clk(hw); ++ unsigned long flags; ++ u32 val; ++ u32 mask = BIT(d->width) - 1; ++ ++ if (d->lpl) ++ mask = mask << (d->shift + LPL_SHIFT) | mask << d->shift; ++ ++ spin_lock_irqsave(&krait_clock_reg_lock, flags); ++ val = krait_get_l2_indirect_reg(d->offset); ++ val &= ~mask; ++ krait_set_l2_indirect_reg(d->offset, val); ++ spin_unlock_irqrestore(&krait_clock_reg_lock, flags); ++ ++ return 0; ++} ++ ++static unsigned long ++krait_div2_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) ++{ ++ struct krait_div2_clk *d = to_krait_div2_clk(hw); ++ u32 mask = BIT(d->width) - 1; ++ u32 div; ++ ++ div = krait_get_l2_indirect_reg(d->offset); ++ div >>= d->shift; ++ div &= mask; ++ div = (div + 1) * 2; ++ ++ return DIV_ROUND_UP(parent_rate, div); ++} ++ ++const struct clk_ops krait_div2_clk_ops = { ++ .round_rate = krait_div2_round_rate, ++ .set_rate = krait_div2_set_rate, ++ .recalc_rate = krait_div2_recalc_rate, ++}; ++EXPORT_SYMBOL_GPL(krait_div2_clk_ops); +--- /dev/null ++++ b/drivers/clk/qcom/clk-krait.h +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (c) 2013, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef __QCOM_CLK_KRAIT_H ++#define __QCOM_CLK_KRAIT_H ++ ++#include ++ ++struct krait_mux_clk { ++ unsigned int *parent_map; ++ u32 offset; ++ u32 mask; ++ u32 shift; ++ u32 en_mask; ++ bool lpl; ++ ++ struct clk_hw hw; ++ struct notifier_block clk_nb; ++}; ++ ++#define to_krait_mux_clk(_hw) container_of(_hw, struct krait_mux_clk, hw) ++ ++extern const struct clk_ops krait_mux_clk_ops; ++ ++struct krait_div2_clk { ++ u32 offset; ++ u8 width; ++ u32 shift; ++ bool lpl; ++ ++ struct clk_hw hw; ++}; ++ ++#define to_krait_div2_clk(_hw) container_of(_hw, struct krait_div2_clk, hw) ++ ++extern const struct clk_ops krait_div2_clk_ops; ++ ++#endif diff --git a/target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch b/target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch new file mode 100644 index 0000000000..93c86ebb69 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch @@ -0,0 +1,209 @@ +From patchwork Fri Dec 8 09:42:26 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,08/12] clk: qcom: Add KPSS ACC/GCC driver +From: Sricharan R +X-Patchwork-Id: 10102023 +Message-Id: <1512726150-7204-9-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:26 +0530 + +From: Stephen Boyd + +The ACC and GCC regions present in KPSSv1 contain registers to +control clocks and power to each Krait CPU and L2. For CPUfreq +purposes probe these devices and expose a mux clock that chooses +between PXO and PLL8. + +Cc: +Signed-off-by: Stephen Boyd +--- + .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 7 ++ + .../devicetree/bindings/arm/msm/qcom,kpss-gcc.txt | 28 +++++++ + drivers/clk/qcom/Kconfig | 8 ++ + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/kpss-xcc.c | 96 ++++++++++++++++++++++ + 5 files changed, 140 insertions(+) + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt + create mode 100644 drivers/clk/qcom/kpss-xcc.c + +--- a/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt ++++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt +@@ -21,10 +21,17 @@ PROPERTIES + the register region. An optional second element specifies + the base address and size of the alias register region. + ++- clock-output-names: ++ Usage: optional ++ Value type: ++ Definition: Name of the output clock. Typically acpuX_aux where X is a ++ CPU number starting at 0. ++ + Example: + + clock-controller@2088000 { + compatible = "qcom,kpss-acc-v2"; + reg = <0x02088000 0x1000>, + <0x02008000 0x1000>; ++ clock-output-names = "acpu0_aux"; + }; +--- /dev/null ++++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt +@@ -0,0 +1,28 @@ ++Krait Processor Sub-system (KPSS) Global Clock Controller (GCC) ++ ++PROPERTIES ++ ++- compatible: ++ Usage: required ++ Value type: ++ Definition: should be one of: ++ "qcom,kpss-gcc" ++ ++- reg: ++ Usage: required ++ Value type: ++ Definition: base address and size of the register region ++ ++- clock-output-names: ++ Usage: required ++ Value type: ++ Definition: Name of the output clock. Typically acpu_l2_aux indicating ++ an L2 cache auxiliary clock. ++ ++Example: ++ ++ l2cc: clock-controller@2011000 { ++ compatible = "qcom,kpss-gcc"; ++ reg = <0x2011000 0x1000>; ++ clock-output-names = "acpu_l2_aux"; ++ }; +--- a/drivers/clk/qcom/Kconfig ++++ b/drivers/clk/qcom/Kconfig +@@ -205,6 +205,14 @@ config QCOM_HFPLL + Say Y if you want to support CPU frequency scaling on devices + such as MSM8974, APQ8084, etc. + ++config KPSS_XCC ++ tristate "KPSS Clock Controller" ++ depends on COMMON_CLK_QCOM ++ help ++ Support for the Krait ACC and GCC clock controllers. Say Y ++ if you want to support CPU frequency scaling on devices such ++ as MSM8960, APQ8064, etc. ++ + config KRAIT_CLOCKS + bool + select KRAIT_L2_ACCESSORS +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -36,4 +36,5 @@ obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8 + obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o + obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o + obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o ++obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o + obj-$(CONFIG_QCOM_HFPLL) += hfpll.o +--- /dev/null ++++ b/drivers/clk/qcom/kpss-xcc.c +@@ -0,0 +1,96 @@ ++/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static const char *aux_parents[] = { ++ "pll8_vote", ++ "pxo", ++}; ++ ++static unsigned int aux_parent_map[] = { ++ 3, ++ 0, ++}; ++ ++static const struct of_device_id kpss_xcc_match_table[] = { ++ { .compatible = "qcom,kpss-acc-v1", .data = (void *)1UL }, ++ { .compatible = "qcom,kpss-gcc" }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, kpss_xcc_match_table); ++ ++static int kpss_xcc_driver_probe(struct platform_device *pdev) ++{ ++ const struct of_device_id *id; ++ struct clk *clk; ++ struct resource *res; ++ void __iomem *base; ++ const char *name; ++ ++ id = of_match_device(kpss_xcc_match_table, &pdev->dev); ++ if (!id) ++ return -ENODEV; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ base = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(base)) ++ return PTR_ERR(base); ++ ++ if (id->data) { ++ if (of_property_read_string_index(pdev->dev.of_node, ++ "clock-output-names", ++ 0, &name)) ++ return -ENODEV; ++ base += 0x14; ++ } else { ++ name = "acpu_l2_aux"; ++ base += 0x28; ++ } ++ ++ clk = clk_register_mux_table(&pdev->dev, name, aux_parents, ++ ARRAY_SIZE(aux_parents), 0, base, 0, 0x3, ++ 0, aux_parent_map, NULL); ++ ++ platform_set_drvdata(pdev, clk); ++ ++ return PTR_ERR_OR_ZERO(clk); ++} ++ ++static int kpss_xcc_driver_remove(struct platform_device *pdev) ++{ ++ clk_unregister_mux(platform_get_drvdata(pdev)); ++ return 0; ++} ++ ++static struct platform_driver kpss_xcc_driver = { ++ .probe = kpss_xcc_driver_probe, ++ .remove = kpss_xcc_driver_remove, ++ .driver = { ++ .name = "kpss-xcc", ++ .of_match_table = kpss_xcc_match_table, ++ }, ++}; ++module_platform_driver(kpss_xcc_driver); ++ ++MODULE_DESCRIPTION("Krait Processor Sub System (KPSS) Clock Driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:kpss-xcc"); diff --git a/target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch b/target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch new file mode 100644 index 0000000000..dcc10ec79c --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch @@ -0,0 +1,436 @@ +From patchwork Fri Dec 8 09:42:27 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,09/12] clk: qcom: Add Krait clock controller driver +From: Sricharan R +X-Patchwork-Id: 10102061 +Message-Id: <1512726150-7204-10-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:27 +0530 + +From: Stephen Boyd + +The Krait CPU clocks are made up of a primary mux and secondary +mux for each CPU and the L2, controlled via cp15 accessors. For +Kraits within KPSSv1 each secondary mux accepts a different aux +source, but on KPSSv2 each secondary mux accepts the same aux +source. + +Cc: +Signed-off-by: Stephen Boyd +--- + .../devicetree/bindings/clock/qcom,krait-cc.txt | 22 ++ + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/krait-cc.c | 350 +++++++++++++++++++++ + 4 files changed, 381 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,krait-cc.txt + create mode 100644 drivers/clk/qcom/krait-cc.c + +--- /dev/null ++++ b/Documentation/devicetree/bindings/clock/qcom,krait-cc.txt +@@ -0,0 +1,22 @@ ++Krait Clock Controller ++ ++PROPERTIES ++ ++- compatible: ++ Usage: required ++ Value type: ++ Definition: must be one of: ++ "qcom,krait-cc-v1" ++ "qcom,krait-cc-v2" ++ ++- #clock-cells: ++ Usage: required ++ Value type: ++ Definition: must be 1 ++ ++Example: ++ ++ kraitcc: clock-controller { ++ compatible = "qcom,krait-cc-v1"; ++ #clock-cells = <1>; ++ }; +--- a/drivers/clk/qcom/Kconfig ++++ b/drivers/clk/qcom/Kconfig +@@ -213,6 +213,14 @@ config KPSS_XCC + if you want to support CPU frequency scaling on devices such + as MSM8960, APQ8064, etc. + ++config KRAITCC ++ tristate "Krait Clock Controller" ++ depends on COMMON_CLK_QCOM && ARM ++ select KRAIT_CLOCKS ++ help ++ Support for the Krait CPU clocks on Qualcomm devices. ++ Say Y if you want to support CPU frequency scaling. ++ + config KRAIT_CLOCKS + bool + select KRAIT_L2_ACCESSORS +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -38,3 +38,4 @@ obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o + obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o + obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o + obj-$(CONFIG_QCOM_HFPLL) += hfpll.o ++obj-$(CONFIG_KRAITCC) += krait-cc.o +--- /dev/null ++++ b/drivers/clk/qcom/krait-cc.c +@@ -0,0 +1,350 @@ ++/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "clk-krait.h" ++ ++static unsigned int sec_mux_map[] = { ++ 2, ++ 0, ++}; ++ ++static unsigned int pri_mux_map[] = { ++ 1, ++ 2, ++ 0, ++}; ++ ++static int ++krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) ++{ ++ struct krait_div2_clk *div; ++ struct clk_init_data init = { ++ .num_parents = 1, ++ .ops = &krait_div2_clk_ops, ++ .flags = CLK_SET_RATE_PARENT, ++ }; ++ const char *p_names[1]; ++ struct clk *clk; ++ ++ div = devm_kzalloc(dev, sizeof(*div), GFP_KERNEL); ++ if (!div) ++ return -ENOMEM; ++ ++ div->width = 2; ++ div->shift = 6; ++ div->lpl = id >= 0; ++ div->offset = offset; ++ div->hw.init = &init; ++ ++ init.name = kasprintf(GFP_KERNEL, "hfpll%s_div", s); ++ if (!init.name) ++ return -ENOMEM; ++ ++ init.parent_names = p_names; ++ p_names[0] = kasprintf(GFP_KERNEL, "hfpll%s", s); ++ if (!p_names[0]) { ++ kfree(init.name); ++ return -ENOMEM; ++ } ++ ++ clk = devm_clk_register(dev, &div->hw); ++ kfree(p_names[0]); ++ kfree(init.name); ++ ++ return PTR_ERR_OR_ZERO(clk); ++} ++ ++static int ++krait_add_sec_mux(struct device *dev, int id, const char *s, ++ unsigned int offset, bool unique_aux) ++{ ++ struct krait_mux_clk *mux; ++ static const char *sec_mux_list[] = { ++ "acpu_aux", ++ "qsb", ++ }; ++ struct clk_init_data init = { ++ .parent_names = sec_mux_list, ++ .num_parents = ARRAY_SIZE(sec_mux_list), ++ .ops = &krait_mux_clk_ops, ++ .flags = CLK_SET_RATE_PARENT, ++ }; ++ struct clk *clk; ++ ++ mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL); ++ if (!mux) ++ return -ENOMEM; ++ ++ mux->offset = offset; ++ mux->lpl = id >= 0; ++ mux->mask = 0x3; ++ mux->shift = 2; ++ mux->parent_map = sec_mux_map; ++ mux->hw.init = &init; ++ ++ init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); ++ if (!init.name) ++ return -ENOMEM; ++ ++ if (unique_aux) { ++ sec_mux_list[0] = kasprintf(GFP_KERNEL, "acpu%s_aux", s); ++ if (!sec_mux_list[0]) { ++ clk = ERR_PTR(-ENOMEM); ++ goto err_aux; ++ } ++ } ++ ++ clk = devm_clk_register(dev, &mux->hw); ++ ++ if (unique_aux) ++ kfree(sec_mux_list[0]); ++err_aux: ++ kfree(init.name); ++ return PTR_ERR_OR_ZERO(clk); ++} ++ ++static struct clk * ++krait_add_pri_mux(struct device *dev, int id, const char *s, ++ unsigned int offset) ++{ ++ struct krait_mux_clk *mux; ++ const char *p_names[3]; ++ struct clk_init_data init = { ++ .parent_names = p_names, ++ .num_parents = ARRAY_SIZE(p_names), ++ .ops = &krait_mux_clk_ops, ++ .flags = CLK_SET_RATE_PARENT, ++ }; ++ struct clk *clk; ++ ++ mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL); ++ if (!mux) ++ return ERR_PTR(-ENOMEM); ++ ++ mux->mask = 0x3; ++ mux->shift = 0; ++ mux->offset = offset; ++ mux->lpl = id >= 0; ++ mux->parent_map = pri_mux_map; ++ mux->hw.init = &init; ++ ++ init.name = kasprintf(GFP_KERNEL, "krait%s_pri_mux", s); ++ if (!init.name) ++ return ERR_PTR(-ENOMEM); ++ ++ p_names[0] = kasprintf(GFP_KERNEL, "hfpll%s", s); ++ if (!p_names[0]) { ++ clk = ERR_PTR(-ENOMEM); ++ goto err_p0; ++ } ++ ++ p_names[1] = kasprintf(GFP_KERNEL, "hfpll%s_div", s); ++ if (!p_names[1]) { ++ clk = ERR_PTR(-ENOMEM); ++ goto err_p1; ++ } ++ ++ p_names[2] = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); ++ if (!p_names[2]) { ++ clk = ERR_PTR(-ENOMEM); ++ goto err_p2; ++ } ++ ++ clk = devm_clk_register(dev, &mux->hw); ++ ++ kfree(p_names[2]); ++err_p2: ++ kfree(p_names[1]); ++err_p1: ++ kfree(p_names[0]); ++err_p0: ++ kfree(init.name); ++ return clk; ++} ++ ++/* id < 0 for L2, otherwise id == physical CPU number */ ++static struct clk *krait_add_clks(struct device *dev, int id, bool unique_aux) ++{ ++ int ret; ++ unsigned int offset; ++ void *p = NULL; ++ const char *s; ++ struct clk *clk; ++ ++ if (id >= 0) { ++ offset = 0x4501 + (0x1000 * id); ++ s = p = kasprintf(GFP_KERNEL, "%d", id); ++ if (!s) ++ return ERR_PTR(-ENOMEM); ++ } else { ++ offset = 0x500; ++ s = "_l2"; ++ } ++ ++ ret = krait_add_div(dev, id, s, offset); ++ if (ret) { ++ clk = ERR_PTR(ret); ++ goto err; ++ } ++ ++ ret = krait_add_sec_mux(dev, id, s, offset, unique_aux); ++ if (ret) { ++ clk = ERR_PTR(ret); ++ goto err; ++ } ++ ++ clk = krait_add_pri_mux(dev, id, s, offset); ++err: ++ kfree(p); ++ return clk; ++} ++ ++static struct clk *krait_of_get(struct of_phandle_args *clkspec, void *data) ++{ ++ unsigned int idx = clkspec->args[0]; ++ struct clk **clks = data; ++ ++ if (idx >= 5) { ++ pr_err("%s: invalid clock index %d\n", __func__, idx); ++ return ERR_PTR(-EINVAL); ++ } ++ ++ return clks[idx] ? : ERR_PTR(-ENODEV); ++} ++ ++static const struct of_device_id krait_cc_match_table[] = { ++ { .compatible = "qcom,krait-cc-v1", (void *)1UL }, ++ { .compatible = "qcom,krait-cc-v2" }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, krait_cc_match_table); ++ ++static int krait_cc_probe(struct platform_device *pdev) ++{ ++ struct device *dev = &pdev->dev; ++ const struct of_device_id *id; ++ unsigned long cur_rate, aux_rate; ++ int cpu; ++ struct clk *clk; ++ struct clk **clks; ++ struct clk *l2_pri_mux_clk; ++ ++ id = of_match_device(krait_cc_match_table, dev); ++ if (!id) ++ return -ENODEV; ++ ++ /* Rate is 1 because 0 causes problems for __clk_mux_determine_rate */ ++ clk = clk_register_fixed_rate(dev, "qsb", NULL, 0, 1); ++ if (IS_ERR(clk)) ++ return PTR_ERR(clk); ++ ++ if (!id->data) { ++ clk = clk_register_fixed_factor(dev, "acpu_aux", ++ "gpll0_vote", 0, 1, 2); ++ if (IS_ERR(clk)) ++ return PTR_ERR(clk); ++ } ++ ++ /* Krait configurations have at most 4 CPUs and one L2 */ ++ clks = devm_kcalloc(dev, 5, sizeof(*clks), GFP_KERNEL); ++ if (!clks) ++ return -ENOMEM; ++ ++ for_each_possible_cpu(cpu) { ++ clk = krait_add_clks(dev, cpu, id->data); ++ if (IS_ERR(clk)) ++ return PTR_ERR(clk); ++ clks[cpu] = clk; ++ } ++ ++ l2_pri_mux_clk = krait_add_clks(dev, -1, id->data); ++ if (IS_ERR(l2_pri_mux_clk)) ++ return PTR_ERR(l2_pri_mux_clk); ++ clks[4] = l2_pri_mux_clk; ++ ++ /* ++ * We don't want the CPU or L2 clocks to be turned off at late init ++ * if CPUFREQ or HOTPLUG configs are disabled. So, bump up the ++ * refcount of these clocks. Any cpufreq/hotplug manager can assume ++ * that the clocks have already been prepared and enabled by the time ++ * they take over. ++ */ ++ for_each_online_cpu(cpu) { ++ clk_prepare_enable(l2_pri_mux_clk); ++ WARN(clk_prepare_enable(clks[cpu]), ++ "Unable to turn on CPU%d clock", cpu); ++ } ++ ++ /* ++ * Force reinit of HFPLLs and muxes to overwrite any potential ++ * incorrect configuration of HFPLLs and muxes by the bootloader. ++ * While at it, also make sure the cores are running at known rates ++ * and print the current rate. ++ * ++ * The clocks are set to aux clock rate first to make sure the ++ * secondary mux is not sourcing off of QSB. The rate is then set to ++ * two different rates to force a HFPLL reinit under all ++ * circumstances. ++ */ ++ cur_rate = clk_get_rate(l2_pri_mux_clk); ++ aux_rate = 384000000; ++ if (cur_rate == 1) { ++ pr_info("L2 @ QSB rate. Forcing new rate.\n"); ++ cur_rate = aux_rate; ++ } ++ clk_set_rate(l2_pri_mux_clk, aux_rate); ++ clk_set_rate(l2_pri_mux_clk, 2); ++ clk_set_rate(l2_pri_mux_clk, cur_rate); ++ pr_info("L2 @ %lu KHz\n", clk_get_rate(l2_pri_mux_clk) / 1000); ++ for_each_possible_cpu(cpu) { ++ clk = clks[cpu]; ++ cur_rate = clk_get_rate(clk); ++ if (cur_rate == 1) { ++ pr_info("CPU%d @ QSB rate. Forcing new rate.\n", cpu); ++ cur_rate = aux_rate; ++ } ++ ++ clk_set_rate(clk, aux_rate); ++ clk_set_rate(clk, 2); ++ clk_set_rate(clk, cur_rate); ++ pr_info("CPU%d @ %lu KHz\n", cpu, clk_get_rate(clk) / 1000); ++ } ++ ++ of_clk_add_provider(dev->of_node, krait_of_get, clks); ++ ++ return 0; ++} ++ ++static struct platform_driver krait_cc_driver = { ++ .probe = krait_cc_probe, ++ .driver = { ++ .name = "krait-cc", ++ .of_match_table = krait_cc_match_table, ++ }, ++}; ++module_platform_driver(krait_cc_driver); ++ ++MODULE_DESCRIPTION("Krait CPU Clock Driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:krait-cc"); diff --git a/target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch new file mode 100644 index 0000000000..d0eddc64c2 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch @@ -0,0 +1,160 @@ +From patchwork Fri Dec 8 09:42:28 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,10/12] clk: qcom: Add safe switch hook for krait mux clocks +From: Sricharan R +X-Patchwork-Id: 10102057 +Message-Id: <1512726150-7204-11-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:28 +0530 + +When the Hfplls are reprogrammed during the rate change, +the primary muxes which are sourced from the same hfpll +for higher frequencies, needs to be switched to the 'safe +secondary mux' as the parent for that small window. This +is done by registering a clk notifier for the muxes and +switching to the safe parent in the PRE_RATE_CHANGE notifier +and back to the original parent in the POST_RATE_CHANGE notifier. + +Signed-off-by: Sricharan R +--- + drivers/clk/qcom/clk-krait.c | 2 ++ + drivers/clk/qcom/clk-krait.h | 3 +++ + drivers/clk/qcom/krait-cc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 61 insertions(+) + +--- a/drivers/clk/qcom/clk-krait.c ++++ b/drivers/clk/qcom/clk-krait.c +@@ -60,6 +60,8 @@ static int krait_mux_set_parent(struct c + if (__clk_is_enabled(hw->clk)) + __krait_mux_set_sel(mux, sel); + ++ mux->reparent = true; ++ + return 0; + } + +--- a/drivers/clk/qcom/clk-krait.h ++++ b/drivers/clk/qcom/clk-krait.h +@@ -23,6 +23,9 @@ struct krait_mux_clk { + u32 shift; + u32 en_mask; + bool lpl; ++ u8 safe_sel; ++ u8 old_index; ++ bool reparent; + + struct clk_hw hw; + struct notifier_block clk_nb; +--- a/drivers/clk/qcom/krait-cc.c ++++ b/drivers/clk/qcom/krait-cc.c +@@ -35,6 +35,49 @@ static unsigned int pri_mux_map[] = { + 0, + }; + ++/* ++ * Notifier function for switching the muxes to safe parent ++ * while the hfpll is getting reprogrammed. ++ */ ++static int krait_notifier_cb(struct notifier_block *nb, ++ unsigned long event, ++ void *data) ++{ ++ int ret = 0; ++ struct krait_mux_clk *mux = container_of(nb, struct krait_mux_clk, ++ clk_nb); ++ /* Switch to safe parent */ ++ if (event == PRE_RATE_CHANGE) { ++ mux->old_index = krait_mux_clk_ops.get_parent(&mux->hw); ++ ret = krait_mux_clk_ops.set_parent(&mux->hw, mux->safe_sel); ++ mux->reparent = false; ++ /* ++ * By the time POST_RATE_CHANGE notifier is called, ++ * clk framework itself would have changed the parent for the new rate. ++ * Only otherwise, put back to the old parent. ++ */ ++ } else if (event == POST_RATE_CHANGE) { ++ if (!mux->reparent) ++ ret = krait_mux_clk_ops.set_parent(&mux->hw, ++ mux->old_index); ++ } ++ ++ return notifier_from_errno(ret); ++} ++ ++static int krait_notifier_register(struct device *dev, struct clk *clk, ++ struct krait_mux_clk *mux) ++{ ++ int ret = 0; ++ ++ mux->clk_nb.notifier_call = krait_notifier_cb; ++ ret = clk_notifier_register(clk, &mux->clk_nb); ++ if (ret) ++ dev_err(dev, "failed to register clock notifier: %d\n", ret); ++ ++ return ret; ++} ++ + static int + krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) + { +@@ -79,6 +122,7 @@ static int + krait_add_sec_mux(struct device *dev, int id, const char *s, + unsigned int offset, bool unique_aux) + { ++ int ret; + struct krait_mux_clk *mux; + static const char *sec_mux_list[] = { + "acpu_aux", +@@ -102,6 +146,7 @@ krait_add_sec_mux(struct device *dev, in + mux->shift = 2; + mux->parent_map = sec_mux_map; + mux->hw.init = &init; ++ mux->safe_sel = 0; + + init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); + if (!init.name) +@@ -117,6 +162,11 @@ krait_add_sec_mux(struct device *dev, in + + clk = devm_clk_register(dev, &mux->hw); + ++ ret = krait_notifier_register(dev, clk, mux); ++ if (ret) ++ goto unique_aux; ++ ++unique_aux: + if (unique_aux) + kfree(sec_mux_list[0]); + err_aux: +@@ -128,6 +178,7 @@ static struct clk * + krait_add_pri_mux(struct device *dev, int id, const char *s, + unsigned int offset) + { ++ int ret; + struct krait_mux_clk *mux; + const char *p_names[3]; + struct clk_init_data init = { +@@ -148,6 +199,7 @@ krait_add_pri_mux(struct device *dev, in + mux->lpl = id >= 0; + mux->parent_map = pri_mux_map; + mux->hw.init = &init; ++ mux->safe_sel = 2; + + init.name = kasprintf(GFP_KERNEL, "krait%s_pri_mux", s); + if (!init.name) +@@ -173,6 +225,10 @@ krait_add_pri_mux(struct device *dev, in + + clk = devm_clk_register(dev, &mux->hw); + ++ ret = krait_notifier_register(dev, clk, mux); ++ if (ret) ++ goto err_p3; ++err_p3: + kfree(p_names[2]); + err_p2: + kfree(p_names[1]); diff --git a/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch b/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch new file mode 100644 index 0000000000..86cb4b9a3e --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch @@ -0,0 +1,307 @@ +From patchwork Fri Dec 8 09:42:29 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,11/12] cpufreq: Add module to register cpufreq on Krait CPUs +From: Sricharan R +X-Patchwork-Id: 10102075 +Message-Id: <1512726150-7204-12-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:29 +0530 + +From: Stephen Boyd + +Register a cpufreq-generic device whenever we detect that a +"qcom,krait" compatible CPU is present in DT. + +Cc: +Signed-off-by: Stephen Boyd +--- + .../devicetree/bindings/arm/msm/qcom,pvs.txt | 38 ++++ + drivers/cpufreq/Kconfig.arm | 9 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/qcom-cpufreq.c | 204 +++++++++++++++++++++ + 4 files changed, 252 insertions(+) + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,pvs.txt + create mode 100644 drivers/cpufreq/qcom-cpufreq.c + +--- /dev/null ++++ b/Documentation/devicetree/bindings/arm/msm/qcom,pvs.txt +@@ -0,0 +1,38 @@ ++Qualcomm Process Voltage Scaling Tables ++ ++The node name is required to be "qcom,pvs". There shall only be one ++such node present in the root of the tree. ++ ++PROPERTIES ++ ++- qcom,pvs-format-a or qcom,pvs-format-b: ++ Usage: required ++ Value type: ++ Definition: Indicates the format of qcom,speedX-pvsY-bin-vZ properties. ++ If qcom,pvs-format-a is used the table is two columns ++ (frequency and voltage in that order). If qcom,pvs-format-b is used the table is three columns (frequency, voltage, ++ and current in that order). ++ ++- qcom,speedX-pvsY-bin-vZ: ++ Usage: required ++ Value type: ++ Definition: The PVS table corresponding to the speed bin X, pvs bin Y, ++ and version Z. ++Example: ++ ++ qcom,pvs { ++ qcom,pvs-format-a; ++ qcom,speed0-pvs0-bin-v0 = ++ < 384000000 950000 >, ++ < 486000000 975000 >, ++ < 594000000 1000000 >, ++ < 702000000 1025000 >, ++ < 810000000 1075000 >, ++ < 918000000 1100000 >, ++ < 1026000000 1125000 >, ++ < 1134000000 1175000 >, ++ < 1242000000 1200000 >, ++ < 1350000000 1225000 >, ++ < 1458000000 1237500 >, ++ < 1512000000 1250000 >; ++ }; +--- a/drivers/cpufreq/Kconfig.arm ++++ b/drivers/cpufreq/Kconfig.arm +@@ -100,6 +100,15 @@ config ARM_OMAP2PLUS_CPUFREQ + depends on ARCH_OMAP2PLUS + default ARCH_OMAP2PLUS + ++config ARM_QCOM_CPUFREQ ++ tristate "Qualcomm based" ++ depends on ARCH_QCOM ++ select PM_OPP ++ help ++ This adds the CPUFreq driver for Qualcomm SoC based boards. ++ ++ If in doubt, say N. ++ + config ARM_S3C_CPUFREQ + bool + help +--- a/drivers/cpufreq/Makefile ++++ b/drivers/cpufreq/Makefile +@@ -62,6 +62,7 @@ obj-$(CONFIG_ARM_MEDIATEK_CPUFREQ) += me + obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o + obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o + obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o ++obj-$(CONFIG_ARM_QCOM_CPUFREQ) += qcom-cpufreq.o + obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o + obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o + obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o +--- /dev/null ++++ b/drivers/cpufreq/qcom-cpufreq.c +@@ -0,0 +1,204 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "cpufreq-dt.h" ++ ++static void __init get_krait_bin_format_a(int *speed, int *pvs, int *pvs_ver) ++{ ++ void __iomem *base; ++ u32 pte_efuse; ++ ++ *speed = *pvs = *pvs_ver = 0; ++ ++ base = ioremap(0x007000c0, 4); ++ if (!base) { ++ pr_warn("Unable to read efuse data. Defaulting to 0!\n"); ++ return; ++ } ++ ++ pte_efuse = readl_relaxed(base); ++ iounmap(base); ++ ++ *speed = pte_efuse & 0xf; ++ if (*speed == 0xf) ++ *speed = (pte_efuse >> 4) & 0xf; ++ ++ if (*speed == 0xf) { ++ *speed = 0; ++ pr_warn("Speed bin: Defaulting to %d\n", *speed); ++ } else { ++ pr_info("Speed bin: %d\n", *speed); ++ } ++ ++ *pvs = (pte_efuse >> 10) & 0x7; ++ if (*pvs == 0x7) ++ *pvs = (pte_efuse >> 13) & 0x7; ++ ++ if (*pvs == 0x7) { ++ *pvs = 0; ++ pr_warn("PVS bin: Defaulting to %d\n", *pvs); ++ } else { ++ pr_info("PVS bin: %d\n", *pvs); ++ } ++} ++ ++static void __init get_krait_bin_format_b(int *speed, int *pvs, int *pvs_ver) ++{ ++ u32 pte_efuse, redundant_sel; ++ void __iomem *base; ++ ++ *speed = 0; ++ *pvs = 0; ++ *pvs_ver = 0; ++ ++ base = ioremap(0xfc4b80b0, 8); ++ if (!base) { ++ pr_warn("Unable to read efuse data. Defaulting to 0!\n"); ++ return; ++ } ++ ++ pte_efuse = readl_relaxed(base); ++ redundant_sel = (pte_efuse >> 24) & 0x7; ++ *speed = pte_efuse & 0x7; ++ /* 4 bits of PVS are in efuse register bits 31, 8-6. */ ++ *pvs = ((pte_efuse >> 28) & 0x8) | ((pte_efuse >> 6) & 0x7); ++ *pvs_ver = (pte_efuse >> 4) & 0x3; ++ ++ switch (redundant_sel) { ++ case 1: ++ *speed = (pte_efuse >> 27) & 0xf; ++ break; ++ case 2: ++ *pvs = (pte_efuse >> 27) & 0xf; ++ break; ++ } ++ ++ /* Check SPEED_BIN_BLOW_STATUS */ ++ if (pte_efuse & BIT(3)) { ++ pr_info("Speed bin: %d\n", *speed); ++ } else { ++ pr_warn("Speed bin not set. Defaulting to 0!\n"); ++ *speed = 0; ++ } ++ ++ /* Check PVS_BLOW_STATUS */ ++ pte_efuse = readl_relaxed(base + 0x4) & BIT(21); ++ if (pte_efuse) { ++ pr_info("PVS bin: %d\n", *pvs); ++ } else { ++ pr_warn("PVS bin not set. Defaulting to 0!\n"); ++ *pvs = 0; ++ } ++ ++ pr_info("PVS version: %d\n", *pvs_ver); ++ iounmap(base); ++} ++ ++static int __init qcom_cpufreq_populate_opps(void) ++{ ++ int len, rows, cols, i, k, speed, pvs, pvs_ver; ++ char table_name[] = "qcom,speedXX-pvsXX-bin-vXX"; ++ struct device_node *np; ++ struct device *dev; ++ int cpu = 0; ++ ++ np = of_find_node_by_name(NULL, "qcom,pvs"); ++ if (!np) ++ return -ENODEV; ++ ++ if (of_property_read_bool(np, "qcom,pvs-format-a")) { ++ get_krait_bin_format_a(&speed, &pvs, &pvs_ver); ++ cols = 2; ++ } else if (of_property_read_bool(np, "qcom,pvs-format-b")) { ++ get_krait_bin_format_b(&speed, &pvs, &pvs_ver); ++ cols = 3; ++ } else { ++ return -ENODEV; ++ } ++ ++ snprintf(table_name, sizeof(table_name), ++ "qcom,speed%d-pvs%d-bin-v%d", speed, pvs, pvs_ver); ++ ++ if (!of_find_property(np, table_name, &len)) ++ return -EINVAL; ++ ++ len /= sizeof(u32); ++ if (len % cols || len == 0) ++ return -EINVAL; ++ ++ rows = len / cols; ++ ++ for (i = 0, k = 0; i < rows; i++) { ++ u32 freq, volt; ++ ++ of_property_read_u32_index(np, table_name, k++, &freq); ++ of_property_read_u32_index(np, table_name, k++, &volt); ++ while (k % cols) ++ k++; /* Skip uA entries if present */ ++ for (cpu = 0; cpu < num_possible_cpus(); cpu++) { ++ dev = get_cpu_device(cpu); ++ if (!dev) ++ return -ENODEV; ++ if (dev_pm_opp_add(dev, freq, volt)) ++ pr_warn("failed to add OPP %u\n", freq); ++ } ++ } ++ ++ return 0; ++} ++ ++static int __init qcom_cpufreq_driver_init(void) ++{ ++ struct cpufreq_dt_platform_data pdata = { .independent_clocks = true }; ++ struct platform_device_info devinfo = { ++ .name = "cpufreq-dt", ++ .data = &pdata, ++ .size_data = sizeof(pdata), ++ }; ++ struct device *cpu_dev; ++ struct device_node *np; ++ int ret; ++ ++ cpu_dev = get_cpu_device(0); ++ if (!cpu_dev) ++ return -ENODEV; ++ ++ np = of_node_get(cpu_dev->of_node); ++ if (!np) ++ return -ENOENT; ++ ++ if (!of_device_is_compatible(np, "qcom,krait")) { ++ of_node_put(np); ++ return -ENODEV; ++ } ++ of_node_put(np); ++ ++ ret = qcom_cpufreq_populate_opps(); ++ if (ret) ++ return ret; ++ ++ return PTR_ERR_OR_ZERO(platform_device_register_full(&devinfo)); ++} ++module_init(qcom_cpufreq_driver_init); ++ ++MODULE_DESCRIPTION("Qualcomm CPUfreq driver"); ++MODULE_LICENSE("GPL v2"); diff --git a/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch b/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch new file mode 100644 index 0000000000..b3b3072bcb --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch @@ -0,0 +1,66 @@ +From patchwork Fri Dec 8 09:42:30 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v4,12/12] cpufreq: dt: Reintroduce independent_clocks platform data +From: Sricharan R +X-Patchwork-Id: 10102073 +Message-Id: <1512726150-7204-13-git-send-email-sricharan@codeaurora.org> +To: mturquette@baylibre.com, sboyd@codeaurora.org, + devicetree@vger.kernel.org, linux-pm@vger.kernel.org, + linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, + viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org +Cc: sricharan@codeaurora.org +Date: Fri, 8 Dec 2017 15:12:30 +0530 + +The Platform data was removed earlier by, +'commit eb96924acddc ("cpufreq: dt: Kill platform-data")' +since there were no users at that time. +Now this is required when the each of the cpu clocks +can be scaled independently, which is the case +for krait cores. So reintroduce it. + +Signed-off-by: Sricharan R +--- + drivers/cpufreq/cpufreq-dt.c | 7 ++++++- + drivers/cpufreq/cpufreq-dt.h | 6 ++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/cpufreq/cpufreq-dt.c ++++ b/drivers/cpufreq/cpufreq-dt.c +@@ -231,7 +231,10 @@ static int cpufreq_init(struct cpufreq_p + } + + if (fallback) { +- cpumask_setall(policy->cpus); ++ struct cpufreq_dt_platform_data *pd = cpufreq_get_driver_data(); ++ ++ if (!pd || !pd->independent_clocks) ++ cpumask_setall(policy->cpus); + + /* + * OPP tables are initialized only for policy->cpu, do it for +@@ -376,6 +379,8 @@ static int dt_cpufreq_probe(struct platf + if (data && data->have_governor_per_policy) + dt_cpufreq_driver.flags |= CPUFREQ_HAVE_GOVERNOR_PER_POLICY; + ++ dt_cpufreq_driver.driver_data = data; ++ + ret = cpufreq_register_driver(&dt_cpufreq_driver); + if (ret) + dev_err(&pdev->dev, "failed register driver: %d\n", ret); +--- a/drivers/cpufreq/cpufreq-dt.h ++++ b/drivers/cpufreq/cpufreq-dt.h +@@ -13,6 +13,12 @@ + #include + + struct cpufreq_dt_platform_data { ++ /* ++ * True when each CPU has its own clock to control its ++ * frequency, false when all CPUs are controlled by a single ++ * clock. ++ */ ++ bool independent_clocks; + bool have_governor_per_policy; + }; + diff --git a/target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch b/target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch new file mode 100644 index 0000000000..fe98980766 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch @@ -0,0 +1,72 @@ +From c7c6a0f50f9ac3620c611ce06ba1f9fafea0444e Mon Sep 17 00:00:00 2001 +From: Archit Taneja +Date: Mon, 3 Aug 2015 10:38:14 +0530 +Subject: [PATCH 47/69] mtd: nand: Create a BBT flag to access bad block + markers in raw mode + +Some controllers can access the factory bad block marker from OOB only +when they read it in raw mode. When ECC is enabled, these controllers +discard reading/writing bad block markers, preventing access to them +altogether. + +The bbt driver assumes MTD_OPS_PLACE_OOB when scanning for bad blocks. +This results in the nand driver's ecc->read_oob() op to be called, which +works with ECC enabled. + +Create a new BBT option flag that tells nand_bbt to force the mode to +MTD_OPS_RAW. This would result in the correct op being called for the +underlying nand controller driver. + +Reviewed-by: Andy Gross +Signed-off-by: Archit Taneja +--- + drivers/mtd/nand/nand_base.c | 6 +++++- + drivers/mtd/nand/nand_bbt.c | 6 +++++- + include/linux/mtd/bbm.h | 6 ++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) + +--- a/drivers/mtd/nand/nand_base.c ++++ b/drivers/mtd/nand/nand_base.c +@@ -481,7 +481,11 @@ static int nand_default_block_markbad(st + } else { + ops.len = ops.ooblen = 1; + } +- ops.mode = MTD_OPS_PLACE_OOB; ++ ++ if (unlikely(chip->bbt_options & NAND_BBT_ACCESS_BBM_RAW)) ++ ops.mode = MTD_OPS_RAW; ++ else ++ ops.mode = MTD_OPS_PLACE_OOB; + + /* Write to first/last page(s) if necessary */ + if (chip->bbt_options & NAND_BBT_SCANLASTPAGE) +--- a/drivers/mtd/nand/nand_bbt.c ++++ b/drivers/mtd/nand/nand_bbt.c +@@ -420,7 +420,11 @@ static int scan_block_fast(struct mtd_in + ops.oobbuf = buf; + ops.ooboffs = 0; + ops.datbuf = NULL; +- ops.mode = MTD_OPS_PLACE_OOB; ++ ++ if (unlikely(bd->options & NAND_BBT_ACCESS_BBM_RAW)) ++ ops.mode = MTD_OPS_RAW; ++ else ++ ops.mode = MTD_OPS_PLACE_OOB; + + for (j = 0; j < numpages; j++) { + /* +--- a/include/linux/mtd/bbm.h ++++ b/include/linux/mtd/bbm.h +@@ -116,6 +116,12 @@ struct nand_bbt_descr { + #define NAND_BBT_NO_OOB_BBM 0x00080000 + + /* ++ * Force MTD_OPS_RAW mode when trying to access bad block markes from OOB. To ++ * be used by controllers which can access BBM only when ECC is disabled, i.e, ++ * when in RAW access mode ++ */ ++#define NAND_BBT_ACCESS_BBM_RAW 0x00100000 ++/* + * Flag set by nand_create_default_bbt_descr(), marking that the nand_bbt_descr + * was allocated dynamicaly and must be freed in nand_release(). Has no meaning + * in nand_chip.bbt_options. diff --git a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch new file mode 100644 index 0000000000..7c78d444f8 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch @@ -0,0 +1,26 @@ +From 5c294df1715d673f94f3b0a6e1ea3a426ca35e6e Mon Sep 17 00:00:00 2001 +From: Georgi Djakov +Date: Thu, 28 Apr 2016 16:20:12 +0300 +Subject: [PATCH 48/69] PM / OPP: HACK: Allow to set regulator without opp_list + +Signed-off-by: Georgi Djakov +--- + drivers/base/power/opp/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/base/power/opp/core.c ++++ b/drivers/base/power/opp/core.c +@@ -1280,11 +1280,13 @@ struct opp_table *dev_pm_opp_set_regulat + if (!opp_table) + return ERR_PTR(-ENOMEM); + ++#if 0 + /* This should be called before OPPs are initialized */ + if (WARN_ON(!list_empty(&opp_table->opp_list))) { + ret = -EBUSY; + goto err; + } ++#endif + + /* Already have regulators set */ + if (opp_table->regulators) { diff --git a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch new file mode 100644 index 0000000000..ef48e9f01b --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -0,0 +1,147 @@ +From c949f08cf20fe82971fbdb4015daa38210da492e Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Fri, 18 Sep 2015 17:52:06 -0700 +Subject: [PATCH 49/69] PM / OPP: Support adjusting OPP voltages at runtime + +On some SoCs the Adaptive Voltage Scaling (AVS) technique is +employed to optimize the operating voltage of a device. At a +given frequency, the hardware monitors dynamic factors and either +makes a suggestion for how much to adjust a voltage for the +current frequency, or it automatically adjusts the voltage +without software intervention. Add an API to the OPP library for +the former case, so that AVS type devices can update the voltages +for an OPP when the hardware determines the voltage should +change. The assumption is that drivers like CPUfreq or devfreq +will register for the OPP notifiers and adjust the voltage +according to suggestions that AVS makes. + +Cc: Nishanth Menon +Acked-by: Viresh Kumar +Signed-off-by: Stephen Boyd +Acked-by: Viresh Kumar +Signed-off-by: Georgi Djakov +--- + drivers/base/power/opp/core.c | 77 +++++++++++++++++++++++++++++++++++++++++++ + include/linux/pm_opp.h | 11 +++++++ + 2 files changed, 88 insertions(+) + +--- a/drivers/base/power/opp/core.c ++++ b/drivers/base/power/opp/core.c +@@ -1608,6 +1608,83 @@ put_table: + } + + /** ++ * dev_pm_opp_adjust_voltage() - helper to change the voltage of an OPP ++ * @dev: device for which we do this operation ++ * @freq: OPP frequency to adjust voltage of ++ * @u_volt: new OPP voltage ++ * ++ * Change the voltage of an OPP with an RCU operation. ++ * ++ * Return: -EINVAL for bad pointers, -ENOMEM if no memory available for the ++ * copy operation, returns 0 if no modifcation was done OR modification was ++ * successful. ++ * ++ * Locking: The internal device_opp and opp structures are RCU protected. ++ * Hence this function internally uses RCU updater strategy with mutex locks to ++ * keep the integrity of the internal data structures. Callers should ensure ++ * that this function is *NOT* called under RCU protection or in contexts where ++ * mutex locking or synchronize_rcu() blocking calls cannot be used. ++ */ ++int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, ++ unsigned long u_volt) ++{ ++ struct opp_table *opp_table; ++ struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); ++ int r = 0; ++ ++ /* keep the node allocated */ ++ new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); ++ if (!new_opp) ++ return -ENOMEM; ++ ++ mutex_lock(&opp_table_lock); ++ ++ /* Find the opp_table */ ++ opp_table = _find_opp_table(dev); ++ if (IS_ERR(opp_table)) { ++ r = PTR_ERR(opp_table); ++ dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r); ++ goto unlock; ++ } ++ ++ /* Do we have the frequency? */ ++ list_for_each_entry(tmp_opp, &opp_table->opp_list, node) { ++ if (tmp_opp->rate == freq) { ++ opp = tmp_opp; ++ break; ++ } ++ } ++ if (IS_ERR(opp)) { ++ r = PTR_ERR(opp); ++ goto unlock; ++ } ++ ++ /* Is update really needed? */ ++ if (opp->supplies[0].u_volt == u_volt) ++ goto unlock; ++ /* copy the old data over */ ++ *new_opp = *opp; ++ ++ /* plug in new node */ ++ new_opp->supplies[0].u_volt = u_volt; ++ ++ list_replace(&opp->node, &new_opp->node); ++ mutex_unlock(&opp_table_lock); ++ kfree(opp); ++ ++ /* Notify the change of the OPP */ ++ blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ADJUST_VOLTAGE, ++ new_opp); ++ ++ return 0; ++ ++unlock: ++ mutex_unlock(&opp_table_lock); ++ kfree(new_opp); ++ return r; ++} ++ ++/** + * dev_pm_opp_enable() - Enable a specific OPP + * @dev: device for which we do this operation + * @freq: OPP frequency to enable +--- a/include/linux/pm_opp.h ++++ b/include/linux/pm_opp.h +@@ -25,6 +25,7 @@ struct opp_table; + + enum dev_pm_opp_event { + OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, ++ OPP_EVENT_ADJUST_VOLTAGE, + }; + + /** +@@ -108,6 +109,9 @@ int dev_pm_opp_add(struct device *dev, u + unsigned long u_volt); + void dev_pm_opp_remove(struct device *dev, unsigned long freq); + ++int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, ++ unsigned long u_volt); ++ + int dev_pm_opp_enable(struct device *dev, unsigned long freq); + + int dev_pm_opp_disable(struct device *dev, unsigned long freq); +@@ -208,6 +212,13 @@ static inline void dev_pm_opp_remove(str + { + } + ++static inline int ++dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, ++ unsigned long u_volt) ++{ ++ return 0; ++} ++ + static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq) + { + return 0; diff --git a/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch b/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch new file mode 100644 index 0000000000..22ae309801 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch @@ -0,0 +1,52 @@ +From d06ca5e7a3cf726f5be5ffd96e93ccd798b8c09a Mon Sep 17 00:00:00 2001 +From: Georgi Djakov +Date: Thu, 12 May 2016 14:41:33 +0300 +Subject: [PATCH 51/69] PM / OPP: Add a helper to get an opp regulator for + device + +Signed-off-by: Georgi Djakov +--- + drivers/base/power/opp/core.c | 21 +++++++++++++++++++++ + include/linux/pm_opp.h | 1 + + 2 files changed, 22 insertions(+) + +--- a/drivers/base/power/opp/core.c ++++ b/drivers/base/power/opp/core.c +@@ -126,6 +126,27 @@ unsigned long dev_pm_opp_get_freq(struct + } + EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq); + ++struct regulator *dev_pm_opp_get_regulator(struct device *dev) ++{ ++ struct opp_table *opp_table; ++ struct regulator *reg; ++ ++ rcu_read_lock(); ++ ++ opp_table = _find_opp_table(dev); ++ if (IS_ERR(opp_table)) { ++ rcu_read_unlock(); ++ return ERR_CAST(opp_table); ++ } ++ ++ reg = opp_table->regulators[0]; ++ ++ rcu_read_unlock(); ++ ++ return reg; ++} ++EXPORT_SYMBOL_GPL(dev_pm_opp_get_regulator); ++ + /** + * dev_pm_opp_is_turbo() - Returns if opp is turbo OPP or not + * @opp: opp for which turbo mode is being verified +--- a/include/linux/pm_opp.h ++++ b/include/linux/pm_opp.h +@@ -85,6 +85,7 @@ void dev_pm_opp_put_opp_table(struct opp + unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp); + + unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp); ++struct regulator *dev_pm_opp_get_regulator(struct device *dev); + + bool dev_pm_opp_is_turbo(struct dev_pm_opp *opp); + diff --git a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch new file mode 100644 index 0000000000..7cde22be0b --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -0,0 +1,38 @@ +From 4533c285c2aedce6d4434d7b877066de3b1ecb33 Mon Sep 17 00:00:00 2001 +From: Georgi Djakov +Date: Thu, 25 Aug 2016 18:43:35 +0300 +Subject: [PATCH 52/69] PM / OPP: Update the voltage tolerance when adjusting + the OPP + +When the voltage is adjusted, the voltage tolerance is not updated. +This can lead to situations where the voltage min value is greater +than the voltage max value. The final result is triggering a BUG() +in the regulator core. +Fix this by updating the voltage tolerance values too. + +Signed-off-by: Georgi Djakov +--- + drivers/base/power/opp/core.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/base/power/opp/core.c ++++ b/drivers/base/power/opp/core.c +@@ -1652,6 +1652,7 @@ int dev_pm_opp_adjust_voltage(struct dev + struct opp_table *opp_table; + struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); + int r = 0; ++ unsigned long tol; + + /* keep the node allocated */ + new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); +@@ -1688,6 +1689,10 @@ int dev_pm_opp_adjust_voltage(struct dev + + /* plug in new node */ + new_opp->supplies[0].u_volt = u_volt; ++ tol = u_volt * opp_table->voltage_tolerance_v1 / 100; ++ new_opp->supplies[0].u_volt = u_volt; ++ new_opp->supplies[0].u_volt_min = u_volt - tol; ++ new_opp->supplies[0].u_volt_max = u_volt + tol; + + list_replace(&opp->node, &new_opp->node); + mutex_unlock(&opp_table_lock); diff --git a/target/linux/ipq806x/patches-4.19/0053-regulator-add-smb208-support.patch b/target/linux/ipq806x/patches-4.19/0053-regulator-add-smb208-support.patch new file mode 100644 index 0000000000..0d2862c609 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0053-regulator-add-smb208-support.patch @@ -0,0 +1,55 @@ +From ef10381ca4d01848ebedb4afb2c78feb8052f103 Mon Sep 17 00:00:00 2001 +From: Adrian Panella +Date: Thu, 9 Mar 2017 08:26:54 +0100 +Subject: [PATCH 53/69] regulator: add smb208 support + +Signed-off-by: Adrian Panella +--- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 4 ++++ + drivers/regulator/qcom_rpm-regulator.c | 9 +++++++++ + 2 files changed, 13 insertions(+) + +--- a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt ++++ b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt +@@ -61,6 +61,7 @@ Regulator nodes are identified by their + "qcom,rpm-pm8901-regulators" + "qcom,rpm-pm8921-regulators" + "qcom,rpm-pm8018-regulators" ++ "qcom,rpm-smb208-regulators" + + - vdd_l0_l1_lvs-supply: + - vdd_l2_l11_l12-supply: +@@ -171,6 +172,9 @@ pm8018: + s1, s2, s3, s4, s5, , l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, + l12, l14, lvs1 + ++smb208: ++ s1a, s1b, s2a, s2b ++ + The content of each sub-node is defined by the standard binding for regulators - + see regulator.txt - with additional custom properties described below: + +--- a/drivers/regulator/qcom_rpm-regulator.c ++++ b/drivers/regulator/qcom_rpm-regulator.c +@@ -933,12 +933,21 @@ static const struct rpm_regulator_data r + { } + }; + ++static const struct rpm_regulator_data rpm_smb208_regulators[] = { ++ { "s1a", QCOM_RPM_SMB208_S1a, &smb208_smps, "vin_s1a" }, ++ { "s1b", QCOM_RPM_SMB208_S1b, &smb208_smps, "vin_s1b" }, ++ { "s2a", QCOM_RPM_SMB208_S2a, &smb208_smps, "vin_s2a" }, ++ { "s2b", QCOM_RPM_SMB208_S2b, &smb208_smps, "vin_s2b" }, ++ { } ++}; ++ + static const struct of_device_id rpm_of_match[] = { + { .compatible = "qcom,rpm-pm8018-regulators", + .data = &rpm_pm8018_regulators }, + { .compatible = "qcom,rpm-pm8058-regulators", .data = &rpm_pm8058_regulators }, + { .compatible = "qcom,rpm-pm8901-regulators", .data = &rpm_pm8901_regulators }, + { .compatible = "qcom,rpm-pm8921-regulators", .data = &rpm_pm8921_regulators }, ++ { .compatible = "qcom,rpm-smb208-regulators", .data = &rpm_smb208_regulators }, + { } + }; + MODULE_DEVICE_TABLE(of, rpm_of_match); diff --git a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch new file mode 100644 index 0000000000..dcf0bcd3f2 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch @@ -0,0 +1,128 @@ +From 10577f74c35bd395951d1b2382c8d821089b5745 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Fri, 18 Sep 2015 17:52:08 -0700 +Subject: [PATCH 54/69] cpufreq-dt: Handle OPP voltage adjust events + +On some SoCs the Adaptive Voltage Scaling (AVS) technique is +employed to optimize the operating voltage of a device. At a +given frequency, the hardware monitors dynamic factors and either +makes a suggestion for how much to adjust a voltage for the +current frequency, or it automatically adjusts the voltage +without software intervention. + +In the former case, an AVS driver will call +dev_pm_opp_modify_voltage() and update the voltage for the +particular OPP the CPUs are using. Add an OPP notifier to +cpufreq-dt so that we can adjust the voltage of the CPU when AVS +updates the OPP. + +Signed-off-by: Stephen Boyd +Acked-by: Viresh Kumar +Signed-off-by: Georgi Djakov +--- + drivers/cpufreq/cpufreq-dt.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 65 insertions(+), 3 deletions(-) + +--- a/drivers/cpufreq/cpufreq-dt.c ++++ b/drivers/cpufreq/cpufreq-dt.c +@@ -32,6 +32,9 @@ struct private_data { + struct device *cpu_dev; + struct thermal_cooling_device *cdev; + const char *reg_name; ++ struct notifier_block opp_nb; ++ struct mutex lock; ++ unsigned long opp_freq; + bool have_static_opps; + }; + +@@ -44,9 +47,16 @@ static struct freq_attr *cpufreq_dt_attr + static int set_target(struct cpufreq_policy *policy, unsigned int index) + { + struct private_data *priv = policy->driver_data; ++ int ret; ++ unsigned long target_freq = policy->freq_table[index].frequency * 1000; ++ ++ mutex_lock(&priv->lock); ++ ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq); ++ if (!ret) ++ priv->opp_freq = target_freq; ++ mutex_unlock(&priv->lock); + +- return dev_pm_opp_set_rate(priv->cpu_dev, +- policy->freq_table[index].frequency * 1000); ++ return ret; + } + + /* +@@ -87,6 +97,39 @@ node_put: + return name; + } + ++static int opp_notifier(struct notifier_block *nb, unsigned long event, ++ void *data) ++{ ++ struct dev_pm_opp *opp = data; ++ struct private_data *priv = container_of(nb, struct private_data, ++ opp_nb); ++ struct device *cpu_dev = priv->cpu_dev; ++ struct regulator *cpu_reg; ++ unsigned long volt, freq; ++ int ret = 0; ++ ++ if (event == OPP_EVENT_ADJUST_VOLTAGE) { ++ cpu_reg = dev_pm_opp_get_regulator(cpu_dev); ++ if (IS_ERR(cpu_reg)) { ++ ret = PTR_ERR(cpu_reg); ++ goto out; ++ } ++ volt = dev_pm_opp_get_voltage(opp); ++ freq = dev_pm_opp_get_freq(opp); ++ ++ mutex_lock(&priv->lock); ++ if (freq == priv->opp_freq) { ++ ret = regulator_set_voltage_triplet(cpu_reg, volt, volt, volt); ++ } ++ mutex_unlock(&priv->lock); ++ if (ret) ++ dev_err(cpu_dev, "failed to scale voltage: %d\n", ret); ++ } ++ ++out: ++ return notifier_from_errno(ret); ++} ++ + static int resources_available(void) + { + struct device *cpu_dev; +@@ -153,6 +196,7 @@ static int cpufreq_init(struct cpufreq_p + bool fallback = false; + const char *name; + int ret; ++ struct srcu_notifier_head *opp_srcu_head; + + cpu_dev = get_cpu_device(policy->cpu); + if (!cpu_dev) { +@@ -246,10 +290,13 @@ static int cpufreq_init(struct cpufreq_p + __func__, ret); + } + ++ mutex_init(&priv->lock); ++ dev_pm_opp_register_notifier(cpu_dev, &priv->opp_nb); ++ + ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table); + if (ret) { + dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret); +- goto out_free_opp; ++ goto out_unregister_nb; + } + + priv->cpu_dev = cpu_dev; +@@ -285,6 +332,8 @@ static int cpufreq_init(struct cpufreq_p + + out_free_cpufreq_table: + dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); ++out_unregister_nb: ++ dev_pm_opp_unregister_notifier(cpu_dev, &priv->opp_nb); + out_free_opp: + if (priv->have_static_opps) + dev_pm_opp_of_cpumask_remove_table(policy->cpus); diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch new file mode 100644 index 0000000000..1c26650b78 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -0,0 +1,90 @@ +From 0759cdff49f1cf361bf503c13f7bcb33da43ab95 Mon Sep 17 00:00:00 2001 +From: Georgi Djakov +Date: Tue, 8 Sep 2015 11:24:41 +0300 +Subject: [PATCH 55/69] cpufreq-dt: Add L2 frequency scaling support + +Signed-off-by: Georgi Djakov +--- + drivers/cpufreq/cpufreq-dt.c | 41 ++++++++++++++++++++++++++++++++++++++++- + include/linux/cpufreq.h | 2 ++ + 2 files changed, 42 insertions(+), 1 deletion(-) + +--- a/drivers/cpufreq/cpufreq-dt.c ++++ b/drivers/cpufreq/cpufreq-dt.c +@@ -49,11 +49,41 @@ static int set_target(struct cpufreq_pol + struct private_data *priv = policy->driver_data; + int ret; + unsigned long target_freq = policy->freq_table[index].frequency * 1000; ++ struct clk *l2_clk = policy->l2_clk; ++ unsigned int l2_freq; ++ unsigned long new_l2_freq = 0; + + mutex_lock(&priv->lock); + ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq); +- if (!ret) ++ ++ if (!ret) { ++ if (!IS_ERR(l2_clk) && policy->l2_rate[0] && policy->l2_rate[1] && ++ policy->l2_rate[2]) { ++ static unsigned long krait_l2[CONFIG_NR_CPUS] = { }; ++ int cpu, ret = 0; ++ ++ if (target_freq >= policy->l2_rate[2]) ++ new_l2_freq = policy->l2_rate[2]; ++ else if (target_freq >= policy->l2_rate[1]) ++ new_l2_freq = policy->l2_rate[1]; ++ else ++ new_l2_freq = policy->l2_rate[0]; ++ ++ krait_l2[policy->cpu] = new_l2_freq; ++ for_each_present_cpu(cpu) ++ new_l2_freq = max(new_l2_freq, krait_l2[cpu]); ++ ++ l2_freq = clk_get_rate(l2_clk); ++ ++ if (l2_freq != new_l2_freq) { ++ /* scale l2 with the core */ ++ ret = clk_set_rate(l2_clk, new_l2_freq); ++ } ++ } ++ + priv->opp_freq = target_freq; ++ } ++ + mutex_unlock(&priv->lock); + + return ret; +@@ -197,6 +227,8 @@ static int cpufreq_init(struct cpufreq_p + const char *name; + int ret; + struct srcu_notifier_head *opp_srcu_head; ++ struct device_node *l2_np; ++ struct clk *l2_clk = NULL; + + cpu_dev = get_cpu_device(policy->cpu); + if (!cpu_dev) { +@@ -305,6 +337,13 @@ static int cpufreq_init(struct cpufreq_p + + policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000; + ++ l2_clk = clk_get(cpu_dev, "l2"); ++ if (!IS_ERR(l2_clk)) ++ policy->l2_clk = l2_clk; ++ l2_np = of_find_node_by_name(NULL, "qcom,l2"); ++ if (l2_np) ++ of_property_read_u32_array(l2_np, "qcom,l2-rates", policy->l2_rate, 3); ++ + ret = cpufreq_table_validate_and_show(policy, freq_table); + if (ret) { + dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__, +--- a/include/linux/cpufreq.h ++++ b/include/linux/cpufreq.h +@@ -73,6 +73,8 @@ struct cpufreq_policy { + unsigned int cpu; /* cpu managing this policy, must be online */ + + struct clk *clk; ++ struct clk *l2_clk; /* L2 clock */ ++ unsigned int l2_rate[3]; /* L2 bus clock rate thresholds */ + struct cpufreq_cpuinfo cpuinfo;/* see above */ + + unsigned int min; /* in kHz */ diff --git a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch new file mode 100644 index 0000000000..d9d76e409b --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch @@ -0,0 +1,23 @@ +From 001a8dcb56ced58c518aaa10a4f0ba5e878705b6 Mon Sep 17 00:00:00 2001 +From: Georgi Djakov +Date: Tue, 17 May 2016 16:15:43 +0300 +Subject: [PATCH 56/69] cpufreq-dt: Add missing rcu locks + +Signed-off-by: Georgi Djakov +--- + drivers/cpufreq/cpufreq-dt.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/cpufreq/cpufreq-dt.c ++++ b/drivers/cpufreq/cpufreq-dt.c +@@ -144,8 +144,10 @@ static int opp_notifier(struct notifier_ + ret = PTR_ERR(cpu_reg); + goto out; + } ++ rcu_read_lock(); + volt = dev_pm_opp_get_voltage(opp); + freq = dev_pm_opp_get_freq(opp); ++ rcu_read_unlock(); + + mutex_lock(&priv->lock); + if (freq == priv->opp_freq) { diff --git a/target/linux/ipq806x/patches-4.19/0059-ARM-cpuidle-Add-cpuidle-support-for-QCOM-cpus.patch b/target/linux/ipq806x/patches-4.19/0059-ARM-cpuidle-Add-cpuidle-support-for-QCOM-cpus.patch new file mode 100644 index 0000000000..5bd58c8137 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0059-ARM-cpuidle-Add-cpuidle-support-for-QCOM-cpus.patch @@ -0,0 +1,29 @@ +From 04ca10340f1b4d92e849724d322a7ca225d11539 Mon Sep 17 00:00:00 2001 +From: Lina Iyer +Date: Wed, 25 Mar 2015 14:25:29 -0600 +Subject: [PATCH 59/69] ARM: cpuidle: Add cpuidle support for QCOM cpus + +Define ARM_QCOM_CPUIDLE config item to enable cpuidle support. + +Cc: Stephen Boyd +Cc: Arnd Bergmann +Cc: Kevin Hilman +Cc: Daniel Lezcano +Signed-off-by: Lina Iyer +--- + drivers/cpuidle/Kconfig.arm | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/cpuidle/Kconfig.arm ++++ b/drivers/cpuidle/Kconfig.arm +@@ -75,3 +75,10 @@ config ARM_MVEBU_V7_CPUIDLE + depends on ARCH_MVEBU && !ARM64 + help + Select this to enable cpuidle on Armada 370, 38x and XP processors. ++ ++config ARM_QCOM_CPUIDLE ++ bool "CPU Idle Driver for QCOM processors" ++ depends on ARCH_QCOM ++ select ARM_CPUIDLE ++ help ++ Select this to enable cpuidle on QCOM processors. diff --git a/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch b/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch new file mode 100644 index 0000000000..f810f6ac46 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch @@ -0,0 +1,62 @@ +From fa71139b55e114aa8c3c4823ff8ee7d49ee810d4 Mon Sep 17 00:00:00 2001 +From: Mathieu Olivari +Date: Wed, 29 Apr 2015 15:21:46 -0700 +Subject: [PATCH 60/69] HACK: arch: arm: force ZRELADDR on arch-qcom + +ARCH_QCOM is using the ARCH_MULTIPLATFORM option, as now recommended +on most ARM architectures. This automatically calculate ZRELADDR by +masking PHYS_OFFSET with 0xf8000000. + +However, on IPQ806x, the first ~20MB of RAM is reserved for the hardware +network accelerators, and the bootloader removes this section from the +layout passed from the ATAGS (when used). + +For newer bootloader, when DT is used, this is not a problem, we just +reserve this memory in the device tree. But if the bootloader doesn't +have DT support, then ATAGS have to be used. In this case, the ARM +decompressor will position the kernel in this low mem, which will not be +in the RAM section mapped by the bootloader, which means the kernel will +freeze in the middle of the boot process trying to map the memory. + +As a work around, this patch allows disabling AUTO_ZRELADDR when +ARCH_QCOM is selected. It makes the zImage usage possible on bootloaders +which don't support device-tree, which is the case on certain early +IPQ806x based designs. + +Signed-off-by: Mathieu Olivari +--- + arch/arm/Kconfig | 2 +- + arch/arm/Makefile | 2 ++ + arch/arm/mach-qcom/Makefile.boot | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/mach-qcom/Makefile.boot + +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -341,7 +341,7 @@ config ARCH_MULTIPLATFORM + depends on MMU + select ARM_HAS_SG_CHAIN + select ARM_PATCH_PHYS_VIRT +- select AUTO_ZRELADDR ++ select AUTO_ZRELADDR if !ARCH_QCOM + select TIMER_OF + select COMMON_CLK + select GENERIC_CLOCKEVENTS +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -255,9 +255,11 @@ MACHINE := arch/arm/mach-$(word 1,$(mac + else + MACHINE := + endif ++ifeq ($(CONFIG_ARCH_QCOM),) + ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y) + MACHINE := + endif ++endif + + machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) + platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) +--- /dev/null ++++ b/arch/arm/mach-qcom/Makefile.boot +@@ -0,0 +1 @@ ++zreladdr-y+= 0x42208000 diff --git a/target/linux/ipq806x/patches-4.19/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch b/target/linux/ipq806x/patches-4.19/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch new file mode 100644 index 0000000000..a4a957545b --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch @@ -0,0 +1,23 @@ +From 5001f2e1a325b68dbf225bd17f69a4d3d975cca5 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 9 Mar 2017 09:31:44 +0100 +Subject: [PATCH 61/69] mtd: "rootfs" conflicts with OpenWrt auto mounting + +Signed-off-by: John Crispin +--- + drivers/mtd/qcom_smem_part.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/mtd/qcom_smem_part.c ++++ b/drivers/mtd/qcom_smem_part.c +@@ -189,6 +189,10 @@ static int parse_qcom_smem_partitions(st + m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz); + m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz); + ++ /* "rootfs" conflicts with OpenWrt auto mounting */ ++ if (mtd_type_is_nand(master) && !strcmp(m_part->name, "rootfs")) ++ m_part->name = "ubi"; ++ + /* + * The last SMEM partition may have its size marked as + * something like 0xffffffff, which means "until the end of the diff --git a/target/linux/ipq806x/patches-4.19/0062-ipq806x-gcc-Added-the-enable-regs-and-mask-for-PRNG.patch b/target/linux/ipq806x/patches-4.19/0062-ipq806x-gcc-Added-the-enable-regs-and-mask-for-PRNG.patch new file mode 100644 index 0000000000..717934315a --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0062-ipq806x-gcc-Added-the-enable-regs-and-mask-for-PRNG.patch @@ -0,0 +1,25 @@ +From a16fcf911a020e46439a3bb3e702463fc3159831 Mon Sep 17 00:00:00 2001 +From: Abhishek Sahu +Date: Wed, 18 Nov 2015 12:38:56 +0530 +Subject: [PATCH 62/69] ipq806x: gcc: Added the enable regs and mask for PRNG + +kernel got hanged while reading from /dev/hwrng at the +time of PRNG clock enable + +Change-Id: I89856c7e19e6639508e6a2774304583a3ec91172 +Signed-off-by: Abhishek Sahu +--- + drivers/clk/qcom/gcc-ipq806x.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/clk/qcom/gcc-ipq806x.c ++++ b/drivers/clk/qcom/gcc-ipq806x.c +@@ -1233,6 +1233,8 @@ static struct clk_rcg prng_src = { + .parent_map = gcc_pxo_pll8_map, + }, + .clkr = { ++ .enable_reg = 0x2e80, ++ .enable_mask = BIT(11), + .hw.init = &(struct clk_init_data){ + .name = "prng_src", + .parent_names = gcc_pxo_pll8, diff --git a/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch b/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch new file mode 100644 index 0000000000..685b0c3ce1 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch @@ -0,0 +1,627 @@ +From 3302e1e1a3cfa4e67fda2a61d6f0c42205d40932 Mon Sep 17 00:00:00 2001 +From: Rajith Cherian +Date: Tue, 14 Feb 2017 18:30:43 +0530 +Subject: [PATCH] ipq8064: tsens: Base tsens driver for IPQ8064 + +Add TSENS driver template to support IPQ8064. +This is a base file copied from tsens-8960.c + +Change-Id: I47c573fdfa2d898243c6a6ba952d1632f91391f7 +Signed-off-by: Rajith Cherian + +ipq8064: tsens: TSENS driver support for IPQ8064 + +Support for IPQ8064 tsens driver. The driver works +with the thermal framework. The driver overrides the +following fucntionalities: + +1. Get current temperature. +2. Get/Set trip temperatures. +3. Enabled/Disable trip points. +4. ISR for threshold generated interrupt. +5. Notify userspace when trip points are hit. + +Change-Id: I8bc7204fd627d10875ab13fc1de8cb6c2ed7a918 +Signed-off-by: Rajith Cherian +--- + .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + + drivers/thermal/qcom/Makefile | 3 +- + drivers/thermal/qcom/tsens-ipq8064.c | 551 +++++++++++++++++++++ + drivers/thermal/qcom/tsens.c | 3 + + drivers/thermal/qcom/tsens.h | 2 +- + 5 files changed, 558 insertions(+), 2 deletions(-) + create mode 100644 drivers/thermal/qcom/tsens-ipq8064.c + +--- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt ++++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt +@@ -5,6 +5,7 @@ Required properties: + - "qcom,msm8916-tsens" : For 8916 Family of SoCs + - "qcom,msm8974-tsens" : For 8974 Family of SoCs + - "qcom,msm8996-tsens" : For 8996 Family of SoCs ++ - "qcom,ipq8064-tsens" : For IPQ8064 + + - reg: Address range of the thermal registers + - #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. +--- a/drivers/thermal/qcom/Makefile ++++ b/drivers/thermal/qcom/Makefile +@@ -1,2 +1,3 @@ + obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o +-qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o ++qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o \ ++ tsens-ipq8064.o +--- /dev/null ++++ b/drivers/thermal/qcom/tsens-ipq8064.c +@@ -0,0 +1,551 @@ ++/* ++ * Copyright (c) 2015, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "tsens.h" ++ ++#define CAL_MDEGC 30000 ++ ++#define CONFIG_ADDR 0x3640 ++/* CONFIG_ADDR bitmasks */ ++#define CONFIG 0x9b ++#define CONFIG_MASK 0xf ++#define CONFIG_SHIFT 0 ++ ++#define STATUS_CNTL_8064 0x3660 ++#define CNTL_ADDR 0x3620 ++/* CNTL_ADDR bitmasks */ ++#define EN BIT(0) ++#define SW_RST BIT(1) ++#define SENSOR0_EN BIT(3) ++#define SLP_CLK_ENA BIT(26) ++#define MEASURE_PERIOD 1 ++#define SENSOR0_SHIFT 3 ++ ++/* INT_STATUS_ADDR bitmasks */ ++#define MIN_STATUS_MASK BIT(0) ++#define LOWER_STATUS_CLR BIT(1) ++#define UPPER_STATUS_CLR BIT(2) ++#define MAX_STATUS_MASK BIT(3) ++ ++#define THRESHOLD_ADDR 0x3624 ++/* THRESHOLD_ADDR bitmasks */ ++#define THRESHOLD_MAX_CODE 0x20000 ++#define THRESHOLD_MIN_CODE 0 ++#define THRESHOLD_MAX_LIMIT_SHIFT 24 ++#define THRESHOLD_MIN_LIMIT_SHIFT 16 ++#define THRESHOLD_UPPER_LIMIT_SHIFT 8 ++#define THRESHOLD_LOWER_LIMIT_SHIFT 0 ++#define THRESHOLD_MAX_LIMIT_MASK (THRESHOLD_MAX_CODE << \ ++ THRESHOLD_MAX_LIMIT_SHIFT) ++#define THRESHOLD_MIN_LIMIT_MASK (THRESHOLD_MAX_CODE << \ ++ THRESHOLD_MIN_LIMIT_SHIFT) ++#define THRESHOLD_UPPER_LIMIT_MASK (THRESHOLD_MAX_CODE << \ ++ THRESHOLD_UPPER_LIMIT_SHIFT) ++#define THRESHOLD_LOWER_LIMIT_MASK (THRESHOLD_MAX_CODE << \ ++ THRESHOLD_LOWER_LIMIT_SHIFT) ++ ++/* Initial temperature threshold values */ ++#define LOWER_LIMIT_TH 0x9d /* 95C */ ++#define UPPER_LIMIT_TH 0xa6 /* 105C */ ++#define MIN_LIMIT_TH 0x0 ++#define MAX_LIMIT_TH 0xff ++ ++#define S0_STATUS_ADDR 0x3628 ++#define STATUS_ADDR_OFFSET 2 ++#define SENSOR_STATUS_SIZE 4 ++#define INT_STATUS_ADDR 0x363c ++#define TRDY_MASK BIT(7) ++#define TIMEOUT_US 100 ++ ++#define TSENS_EN BIT(0) ++#define TSENS_SW_RST BIT(1) ++#define TSENS_ADC_CLK_SEL BIT(2) ++#define SENSOR0_EN BIT(3) ++#define SENSOR1_EN BIT(4) ++#define SENSOR2_EN BIT(5) ++#define SENSOR3_EN BIT(6) ++#define SENSOR4_EN BIT(7) ++#define SENSORS_EN (SENSOR0_EN | SENSOR1_EN | \ ++ SENSOR2_EN | SENSOR3_EN | SENSOR4_EN) ++#define TSENS_8064_SENSOR5_EN BIT(8) ++#define TSENS_8064_SENSOR6_EN BIT(9) ++#define TSENS_8064_SENSOR7_EN BIT(10) ++#define TSENS_8064_SENSOR8_EN BIT(11) ++#define TSENS_8064_SENSOR9_EN BIT(12) ++#define TSENS_8064_SENSOR10_EN BIT(13) ++#define TSENS_8064_SENSORS_EN (SENSORS_EN | \ ++ TSENS_8064_SENSOR5_EN | \ ++ TSENS_8064_SENSOR6_EN | \ ++ TSENS_8064_SENSOR7_EN | \ ++ TSENS_8064_SENSOR8_EN | \ ++ TSENS_8064_SENSOR9_EN | \ ++ TSENS_8064_SENSOR10_EN) ++ ++#define TSENS_8064_SEQ_SENSORS 5 ++#define TSENS_8064_S4_S5_OFFSET 40 ++#define TSENS_FACTOR 1 ++ ++/* Trips: from very hot to very cold */ ++enum tsens_trip_type { ++ TSENS_TRIP_STAGE3 = 0, ++ TSENS_TRIP_STAGE2, ++ TSENS_TRIP_STAGE1, ++ TSENS_TRIP_STAGE0, ++ TSENS_TRIP_NUM, ++}; ++ ++u32 tsens_8064_slope[] = { ++ 1176, 1176, 1154, 1176, ++ 1111, 1132, 1132, 1199, ++ 1132, 1199, 1132 ++ }; ++ ++/* Temperature on y axis and ADC-code on x-axis */ ++static inline int code_to_degC(u32 adc_code, const struct tsens_sensor *s) ++{ ++ int degcbeforefactor, degc; ++ ++ degcbeforefactor = (adc_code * s->slope) + s->offset; ++ ++ if (degcbeforefactor == 0) ++ degc = degcbeforefactor; ++ else if (degcbeforefactor > 0) ++ degc = (degcbeforefactor + TSENS_FACTOR/2) ++ / TSENS_FACTOR; ++ else ++ degc = (degcbeforefactor - TSENS_FACTOR/2) ++ / TSENS_FACTOR; ++ ++ return degc; ++} ++ ++static int degC_to_code(int degC, const struct tsens_sensor *s) ++{ ++ int code = ((degC * TSENS_FACTOR - s->offset) + (s->slope/2)) ++ / s->slope; ++ ++ if (code > THRESHOLD_MAX_CODE) ++ code = THRESHOLD_MAX_CODE; ++ else if (code < THRESHOLD_MIN_CODE) ++ code = THRESHOLD_MIN_CODE; ++ return code; ++} ++ ++static int suspend_ipq8064(struct tsens_device *tmdev) ++{ ++ int ret; ++ unsigned int mask; ++ struct regmap *map = tmdev->map; ++ ++ ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold); ++ if (ret) ++ return ret; ++ ++ ret = regmap_read(map, CNTL_ADDR, &tmdev->ctx.control); ++ if (ret) ++ return ret; ++ ++ mask = SLP_CLK_ENA | EN; ++ ++ ret = regmap_update_bits(map, CNTL_ADDR, mask, 0); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int resume_ipq8064(struct tsens_device *tmdev) ++{ ++ int ret; ++ struct regmap *map = tmdev->map; ++ ++ ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST); ++ if (ret) ++ return ret; ++ ++ ret = regmap_update_bits(map, CONFIG_ADDR, CONFIG_MASK, CONFIG); ++ if (ret) ++ return ret; ++ ++ ret = regmap_write(map, THRESHOLD_ADDR, tmdev->ctx.threshold); ++ if (ret) ++ return ret; ++ ++ ret = regmap_write(map, CNTL_ADDR, tmdev->ctx.control); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static void notify_uspace_tsens_fn(struct work_struct *work) ++{ ++ struct tsens_sensor *s = container_of(work, struct tsens_sensor, ++ notify_work); ++ ++ sysfs_notify(&s->tzd->device.kobj, NULL, "type"); ++} ++ ++static void tsens_scheduler_fn(struct work_struct *work) ++{ ++ struct tsens_device *tmdev = container_of(work, struct tsens_device, ++ tsens_work); ++ unsigned int threshold, threshold_low, code, reg, sensor, mask; ++ unsigned int sensor_addr; ++ bool upper_th_x, lower_th_x; ++ int adc_code, ret; ++ ++ ret = regmap_read(tmdev->map, STATUS_CNTL_8064, ®); ++ if (ret) ++ return; ++ reg = reg | LOWER_STATUS_CLR | UPPER_STATUS_CLR; ++ ret = regmap_write(tmdev->map, STATUS_CNTL_8064, reg); ++ if (ret) ++ return; ++ ++ mask = ~(LOWER_STATUS_CLR | UPPER_STATUS_CLR); ++ ret = regmap_read(tmdev->map, THRESHOLD_ADDR, &threshold); ++ if (ret) ++ return; ++ threshold_low = (threshold & THRESHOLD_LOWER_LIMIT_MASK) ++ >> THRESHOLD_LOWER_LIMIT_SHIFT; ++ threshold = (threshold & THRESHOLD_UPPER_LIMIT_MASK) ++ >> THRESHOLD_UPPER_LIMIT_SHIFT; ++ ++ ret = regmap_read(tmdev->map, STATUS_CNTL_8064, ®); ++ if (ret) ++ return; ++ ++ ret = regmap_read(tmdev->map, CNTL_ADDR, &sensor); ++ if (ret) ++ return; ++ sensor &= (uint32_t) TSENS_8064_SENSORS_EN; ++ sensor >>= SENSOR0_SHIFT; ++ ++ /* Constraint: There is only 1 interrupt control register for all ++ * 11 temperature sensor. So monitoring more than 1 sensor based ++ * on interrupts will yield inconsistent result. To overcome this ++ * issue we will monitor only sensor 0 which is the master sensor. ++ */ ++ ++ /* Skip if the sensor is disabled */ ++ if (sensor & 1) { ++ ret = regmap_read(tmdev->map, tmdev->sensor[0].status, &code); ++ if (ret) ++ return; ++ upper_th_x = code >= threshold; ++ lower_th_x = code <= threshold_low; ++ if (upper_th_x) ++ mask |= UPPER_STATUS_CLR; ++ if (lower_th_x) ++ mask |= LOWER_STATUS_CLR; ++ if (upper_th_x || lower_th_x) { ++ /* Notify user space */ ++ schedule_work(&tmdev->sensor[0].notify_work); ++ regmap_read(tmdev->map, sensor_addr, &adc_code); ++ pr_debug("Trigger (%d degrees) for sensor %d\n", ++ code_to_degC(adc_code, &tmdev->sensor[0]), 0); ++ } ++ } ++ regmap_write(tmdev->map, STATUS_CNTL_8064, reg & mask); ++ ++ /* force memory to sync */ ++ mb(); ++} ++ ++static irqreturn_t tsens_isr(int irq, void *data) ++{ ++ struct tsens_device *tmdev = data; ++ ++ schedule_work(&tmdev->tsens_work); ++ return IRQ_HANDLED; ++} ++ ++static void hw_init(struct tsens_device *tmdev) ++{ ++ int ret; ++ unsigned int reg_cntl = 0, reg_cfg = 0, reg_thr = 0; ++ unsigned int reg_status_cntl = 0; ++ ++ regmap_read(tmdev->map, CNTL_ADDR, ®_cntl); ++ regmap_write(tmdev->map, CNTL_ADDR, reg_cntl | TSENS_SW_RST); ++ ++ reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18) ++ | (((1 << tmdev->num_sensors) - 1) << SENSOR0_SHIFT); ++ regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); ++ regmap_read(tmdev->map, STATUS_CNTL_8064, ®_status_cntl); ++ reg_status_cntl |= LOWER_STATUS_CLR | UPPER_STATUS_CLR ++ | MIN_STATUS_MASK | MAX_STATUS_MASK; ++ regmap_write(tmdev->map, STATUS_CNTL_8064, reg_status_cntl); ++ reg_cntl |= TSENS_EN; ++ regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); ++ ++ regmap_read(tmdev->map, CONFIG_ADDR, ®_cfg); ++ reg_cfg = (reg_cfg & ~CONFIG_MASK) | (CONFIG << CONFIG_SHIFT); ++ regmap_write(tmdev->map, CONFIG_ADDR, reg_cfg); ++ ++ reg_thr |= (LOWER_LIMIT_TH << THRESHOLD_LOWER_LIMIT_SHIFT) ++ | (UPPER_LIMIT_TH << THRESHOLD_UPPER_LIMIT_SHIFT) ++ | (MIN_LIMIT_TH << THRESHOLD_MIN_LIMIT_SHIFT) ++ | (MAX_LIMIT_TH << THRESHOLD_MAX_LIMIT_SHIFT); ++ ++ regmap_write(tmdev->map, THRESHOLD_ADDR, reg_thr); ++ ++ ret = devm_request_irq(tmdev->dev, tmdev->tsens_irq, tsens_isr, ++ IRQF_TRIGGER_RISING, "tsens_interrupt", tmdev); ++ if (ret < 0) { ++ pr_err("%s: request_irq FAIL: %d\n", __func__, ret); ++ return; ++ } ++ ++ INIT_WORK(&tmdev->tsens_work, tsens_scheduler_fn); ++} ++ ++static int init_ipq8064(struct tsens_device *tmdev) ++{ ++ int ret, i; ++ u32 reg_cntl, offset = 0; ++ ++ init_common(tmdev); ++ if (!tmdev->map) ++ return -ENODEV; ++ ++ /* ++ * The status registers for each sensor are discontiguous ++ * because some SoCs have 5 sensors while others have more ++ * but the control registers stay in the same place, i.e ++ * directly after the first 5 status registers. ++ */ ++ for (i = 0; i < tmdev->num_sensors; i++) { ++ if (i >= TSENS_8064_SEQ_SENSORS) ++ offset = TSENS_8064_S4_S5_OFFSET; ++ ++ tmdev->sensor[i].status = S0_STATUS_ADDR + offset ++ + (i << STATUS_ADDR_OFFSET); ++ tmdev->sensor[i].slope = tsens_8064_slope[i]; ++ INIT_WORK(&tmdev->sensor[i].notify_work, ++ notify_uspace_tsens_fn); ++ } ++ ++ reg_cntl = SW_RST; ++ ret = regmap_update_bits(tmdev->map, CNTL_ADDR, SW_RST, reg_cntl); ++ if (ret) ++ return ret; ++ ++ reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18); ++ reg_cntl &= ~SW_RST; ++ ret = regmap_update_bits(tmdev->map, CONFIG_ADDR, ++ CONFIG_MASK, CONFIG); ++ ++ reg_cntl |= GENMASK(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT; ++ ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); ++ if (ret) ++ return ret; ++ ++ reg_cntl |= EN; ++ ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int calibrate_ipq8064(struct tsens_device *tmdev) ++{ ++ int i; ++ char *data, *data_backup; ++ ++ ssize_t num_read = tmdev->num_sensors; ++ struct tsens_sensor *s = tmdev->sensor; ++ ++ data = qfprom_read(tmdev->dev, "calib"); ++ if (IS_ERR(data)) { ++ pr_err("Calibration not found.\n"); ++ return PTR_ERR(data); ++ } ++ ++ data_backup = qfprom_read(tmdev->dev, "calib_backup"); ++ if (IS_ERR(data_backup)) { ++ pr_err("Backup calibration not found.\n"); ++ return PTR_ERR(data_backup); ++ } ++ ++ for (i = 0; i < num_read; i++) { ++ s[i].calib_data = readb_relaxed(data + i); ++ s[i].calib_data_backup = readb_relaxed(data_backup + i); ++ ++ if (s[i].calib_data_backup) ++ s[i].calib_data = s[i].calib_data_backup; ++ if (!s[i].calib_data) { ++ pr_err("QFPROM TSENS calibration data not present\n"); ++ return -ENODEV; ++ } ++ s[i].slope = tsens_8064_slope[i]; ++ s[i].offset = CAL_MDEGC - (s[i].calib_data * s[i].slope); ++ } ++ ++ hw_init(tmdev); ++ ++ return 0; ++} ++ ++static int get_temp_ipq8064(struct tsens_device *tmdev, int id, int *temp) ++{ ++ int ret; ++ u32 code, trdy; ++ const struct tsens_sensor *s = &tmdev->sensor[id]; ++ unsigned long timeout; ++ ++ timeout = jiffies + usecs_to_jiffies(TIMEOUT_US); ++ do { ++ ret = regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy); ++ if (ret) ++ return ret; ++ if (!(trdy & TRDY_MASK)) ++ continue; ++ ret = regmap_read(tmdev->map, s->status, &code); ++ if (ret) ++ return ret; ++ *temp = code_to_degC(code, s); ++ return 0; ++ } while (time_before(jiffies, timeout)); ++ ++ return -ETIMEDOUT; ++} ++ ++static int set_trip_temp_ipq8064(void *data, int trip, int temp) ++{ ++ unsigned int reg_th, reg_cntl; ++ int ret, code, code_chk, hi_code, lo_code; ++ const struct tsens_sensor *s = data; ++ struct tsens_device *tmdev = s->tmdev; ++ ++ code_chk = code = degC_to_code(temp, s); ++ ++ if (code < THRESHOLD_MIN_CODE || code > THRESHOLD_MAX_CODE) ++ return -EINVAL; ++ ++ ret = regmap_read(tmdev->map, STATUS_CNTL_8064, ®_cntl); ++ if (ret) ++ return ret; ++ ++ ret = regmap_read(tmdev->map, THRESHOLD_ADDR, ®_th); ++ if (ret) ++ return ret; ++ ++ hi_code = (reg_th & THRESHOLD_UPPER_LIMIT_MASK) ++ >> THRESHOLD_UPPER_LIMIT_SHIFT; ++ lo_code = (reg_th & THRESHOLD_LOWER_LIMIT_MASK) ++ >> THRESHOLD_LOWER_LIMIT_SHIFT; ++ ++ switch (trip) { ++ case TSENS_TRIP_STAGE3: ++ code <<= THRESHOLD_MAX_LIMIT_SHIFT; ++ reg_th &= ~THRESHOLD_MAX_LIMIT_MASK; ++ break; ++ case TSENS_TRIP_STAGE2: ++ if (code_chk <= lo_code) ++ return -EINVAL; ++ code <<= THRESHOLD_UPPER_LIMIT_SHIFT; ++ reg_th &= ~THRESHOLD_UPPER_LIMIT_MASK; ++ break; ++ case TSENS_TRIP_STAGE1: ++ if (code_chk >= hi_code) ++ return -EINVAL; ++ code <<= THRESHOLD_LOWER_LIMIT_SHIFT; ++ reg_th &= ~THRESHOLD_LOWER_LIMIT_MASK; ++ break; ++ case TSENS_TRIP_STAGE0: ++ code <<= THRESHOLD_MIN_LIMIT_SHIFT; ++ reg_th &= ~THRESHOLD_MIN_LIMIT_MASK; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ ret = regmap_write(tmdev->map, THRESHOLD_ADDR, reg_th | code); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int set_trip_activate_ipq8064(void *data, int trip, ++ enum thermal_trip_activation_mode mode) ++{ ++ unsigned int reg_cntl, mask, val; ++ const struct tsens_sensor *s = data; ++ struct tsens_device *tmdev = s->tmdev; ++ int ret; ++ ++ if (!tmdev || trip < 0) ++ return -EINVAL; ++ ++ ret = regmap_read(tmdev->map, STATUS_CNTL_8064, ®_cntl); ++ if (ret) ++ return ret; ++ ++ switch (trip) { ++ case TSENS_TRIP_STAGE3: ++ mask = MAX_STATUS_MASK; ++ break; ++ case TSENS_TRIP_STAGE2: ++ mask = UPPER_STATUS_CLR; ++ break; ++ case TSENS_TRIP_STAGE1: ++ mask = LOWER_STATUS_CLR; ++ break; ++ case TSENS_TRIP_STAGE0: ++ mask = MIN_STATUS_MASK; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ if (mode == THERMAL_TRIP_ACTIVATION_DISABLED) ++ val = reg_cntl | mask; ++ else ++ val = reg_cntl & ~mask; ++ ++ ret = regmap_write(tmdev->map, STATUS_CNTL_8064, val); ++ if (ret) ++ return ret; ++ ++ /* force memory to sync */ ++ mb(); ++ return 0; ++} ++ ++const struct tsens_ops ops_ipq8064 = { ++ .init = init_ipq8064, ++ .calibrate = calibrate_ipq8064, ++ .get_temp = get_temp_ipq8064, ++ .suspend = suspend_ipq8064, ++ .resume = resume_ipq8064, ++ .set_trip_temp = set_trip_temp_ipq8064, ++ .set_trip_activate = set_trip_activate_ipq8064, ++}; ++ ++const struct tsens_data data_ipq8064 = { ++ .num_sensors = 11, ++ .ops = &ops_ipq8064, ++}; +--- a/drivers/thermal/qcom/tsens.c ++++ b/drivers/thermal/qcom/tsens.c +@@ -72,6 +72,9 @@ static const struct of_device_id tsens_t + }, { + .compatible = "qcom,msm8996-tsens", + .data = &data_8996, ++ }, { ++ .compatible = "qcom,ipq8064-tsens", ++ .data = &data_ipq8064, + }, + {} + }; +--- a/drivers/thermal/qcom/tsens.h ++++ b/drivers/thermal/qcom/tsens.h +@@ -89,6 +89,6 @@ void compute_intercept_slope(struct tsen + int init_common(struct tsens_device *); + int get_temp_common(struct tsens_device *, int, int *); + +-extern const struct tsens_data data_8916, data_8974, data_8960, data_8996; ++extern const struct tsens_data data_8916, data_8974, data_8960, data_8996, data_ipq8064; + + #endif /* __QCOM_TSENS_H__ */ diff --git a/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch b/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch new file mode 100644 index 0000000000..944d1e575b --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch @@ -0,0 +1,453 @@ +From 4e87400732c77765afae2ea89ed43837457aa604 Mon Sep 17 00:00:00 2001 +From: Rajith Cherian +Date: Wed, 1 Feb 2017 19:00:26 +0530 +Subject: [PATCH] ipq8064: tsens: Support for configurable interrupts + +Provide support for adding configurable high and +configurable low trip temperatures. An interrupts is +also triggerred when these trip points are hit. The +interrupts can be activated or deactivated from sysfs. +This functionality is made available only if +CONFIG_THERMAL_WRITABLE_TRIPS is defined. + +Change-Id: Ib73f3f9459de4fffce7bb985a0312a88291f4934 +Signed-off-by: Rajith Cherian +--- + .../devicetree/bindings/thermal/qcom-tsens.txt | 4 ++ + drivers/thermal/of-thermal.c | 63 ++++++++++++++++++---- + drivers/thermal/qcom/tsens.c | 43 ++++++++++++--- + drivers/thermal/qcom/tsens.h | 11 ++++ + drivers/thermal/thermal_core.c | 44 ++++++++++++++- + include/linux/thermal.h | 14 +++++ + 6 files changed, 162 insertions(+), 17 deletions(-) + +--- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt ++++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt +@@ -12,11 +12,15 @@ Required properties: + - Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify + nvmem cells + ++Optional properties: ++- interrupts: Interrupt which gets triggered when threshold is hit ++ + Example: + tsens: thermal-sensor@900000 { + compatible = "qcom,msm8916-tsens"; + reg = <0x4a8000 0x2000>; + nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; + nvmem-cell-names = "caldata", "calsel"; ++ interrupts = <0 178 0>; + #thermal-sensor-cells = <1>; + }; +--- a/drivers/thermal/of-thermal.c ++++ b/drivers/thermal/of-thermal.c +@@ -95,7 +95,7 @@ static int of_thermal_get_temp(struct th + { + struct __thermal_zone *data = tz->devdata; + +- if (!data->ops->get_temp) ++ if (!data->ops->get_temp || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EINVAL; + + return data->ops->get_temp(data->sensor_data, temp); +@@ -106,7 +106,8 @@ static int of_thermal_set_trips(struct t + { + struct __thermal_zone *data = tz->devdata; + +- if (!data->ops || !data->ops->set_trips) ++ if (!data->ops || !data->ops->set_trips ++ || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EINVAL; + + return data->ops->set_trips(data->sensor_data, low, high); +@@ -192,6 +193,9 @@ static int of_thermal_set_emul_temp(stru + { + struct __thermal_zone *data = tz->devdata; + ++ if (data->mode == THERMAL_DEVICE_DISABLED) ++ return -EINVAL; ++ + return data->ops->set_emul_temp(data->sensor_data, temp); + } + +@@ -200,7 +204,7 @@ static int of_thermal_get_trend(struct t + { + struct __thermal_zone *data = tz->devdata; + +- if (!data->ops->get_trend) ++ if (!data->ops->get_trend || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EINVAL; + + return data->ops->get_trend(data->sensor_data, trip, trend); +@@ -289,7 +293,9 @@ static int of_thermal_set_mode(struct th + mutex_unlock(&tz->lock); + + data->mode = mode; +- thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED); ++ ++ if (mode == THERMAL_DEVICE_ENABLED) ++ thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED); + + return 0; + } +@@ -299,7 +305,8 @@ static int of_thermal_get_trip_type(stru + { + struct __thermal_zone *data = tz->devdata; + +- if (trip >= data->ntrips || trip < 0) ++ if (trip >= data->ntrips || trip < 0 ++ || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EDOM; + + *type = data->trips[trip].type; +@@ -307,12 +314,39 @@ static int of_thermal_get_trip_type(stru + return 0; + } + ++static int of_thermal_activate_trip_type(struct thermal_zone_device *tz, ++ int trip, enum thermal_trip_activation_mode mode) ++{ ++ struct __thermal_zone *data = tz->devdata; ++ ++ if (trip >= data->ntrips || trip < 0 ++ || (data->mode == THERMAL_DEVICE_DISABLED)) ++ return -EDOM; ++ ++ /* ++ * The configurable_hi and configurable_lo trip points can be ++ * activated and deactivated. ++ */ ++ ++ if (data->ops->set_trip_activate) { ++ int ret; ++ ++ ret = data->ops->set_trip_activate(data->sensor_data, ++ trip, mode); ++ if (ret) ++ return ret; ++ } ++ ++ return 0; ++} ++ + static int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip, + int *temp) + { + struct __thermal_zone *data = tz->devdata; + +- if (trip >= data->ntrips || trip < 0) ++ if (trip >= data->ntrips || trip < 0 ++ || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EDOM; + + *temp = data->trips[trip].temperature; +@@ -325,7 +359,8 @@ static int of_thermal_set_trip_temp(stru + { + struct __thermal_zone *data = tz->devdata; + +- if (trip >= data->ntrips || trip < 0) ++ if (trip >= data->ntrips || trip < 0 ++ || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EDOM; + + if (data->ops->set_trip_temp) { +@@ -347,7 +382,8 @@ static int of_thermal_get_trip_hyst(stru + { + struct __thermal_zone *data = tz->devdata; + +- if (trip >= data->ntrips || trip < 0) ++ if (trip >= data->ntrips || trip < 0 ++ || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EDOM; + + *hyst = data->trips[trip].hysteresis; +@@ -360,7 +396,8 @@ static int of_thermal_set_trip_hyst(stru + { + struct __thermal_zone *data = tz->devdata; + +- if (trip >= data->ntrips || trip < 0) ++ if (trip >= data->ntrips || trip < 0 ++ || (data->mode == THERMAL_DEVICE_DISABLED)) + return -EDOM; + + /* thermal framework should take care of data->mask & (1 << trip) */ +@@ -435,6 +472,9 @@ thermal_zone_of_add_sensor(struct device + if (ops->set_emul_temp) + tzd->ops->set_emul_temp = of_thermal_set_emul_temp; + ++ if (ops->set_trip_activate) ++ tzd->ops->set_trip_activate = of_thermal_activate_trip_type; ++ + mutex_unlock(&tzd->lock); + + return tzd; +@@ -729,7 +769,10 @@ static const char * const trip_types[] = + [THERMAL_TRIP_ACTIVE] = "active", + [THERMAL_TRIP_PASSIVE] = "passive", + [THERMAL_TRIP_HOT] = "hot", +- [THERMAL_TRIP_CRITICAL] = "critical", ++ [THERMAL_TRIP_CRITICAL] = "critical_high", ++ [THERMAL_TRIP_CONFIGURABLE_HI] = "configurable_hi", ++ [THERMAL_TRIP_CONFIGURABLE_LOW] = "configurable_lo", ++ [THERMAL_TRIP_CRITICAL_LOW] = "critical_low", + }; + + /** +--- a/drivers/thermal/qcom/tsens.c ++++ b/drivers/thermal/qcom/tsens.c +@@ -31,7 +31,7 @@ static int tsens_get_temp(void *data, in + + static int tsens_get_trend(void *p, int trip, enum thermal_trend *trend) + { +- const struct tsens_sensor *s = p; ++ struct tsens_sensor *s = p; + struct tsens_device *tmdev = s->tmdev; + + if (tmdev->ops->get_trend) +@@ -40,9 +40,10 @@ static int tsens_get_trend(void *p, int + return -ENOTSUPP; + } + +-static int __maybe_unused tsens_suspend(struct device *dev) ++static int __maybe_unused tsens_suspend(void *data) + { +- struct tsens_device *tmdev = dev_get_drvdata(dev); ++ struct tsens_sensor *s = data; ++ struct tsens_device *tmdev = s->tmdev; + + if (tmdev->ops && tmdev->ops->suspend) + return tmdev->ops->suspend(tmdev); +@@ -50,9 +51,10 @@ static int __maybe_unused tsens_suspend + return 0; + } + +-static int __maybe_unused tsens_resume(struct device *dev) ++static int __maybe_unused tsens_resume(void *data) + { +- struct tsens_device *tmdev = dev_get_drvdata(dev); ++ struct tsens_sensor *s = data; ++ struct tsens_device *tmdev = s->tmdev; + + if (tmdev->ops && tmdev->ops->resume) + return tmdev->ops->resume(tmdev); +@@ -60,6 +62,30 @@ static int __maybe_unused tsens_resume(s + return 0; + } + ++static int __maybe_unused tsens_set_trip_temp(void *data, int trip, int temp) ++{ ++ struct tsens_sensor *s = data; ++ struct tsens_device *tmdev = s->tmdev; ++ ++ if (tmdev->ops && tmdev->ops->set_trip_temp) ++ return tmdev->ops->set_trip_temp(s, trip, temp); ++ ++ return 0; ++} ++ ++static int __maybe_unused tsens_activate_trip_type(void *data, int trip, ++ enum thermal_trip_activation_mode mode) ++{ ++ struct tsens_sensor *s = data; ++ struct tsens_device *tmdev = s->tmdev; ++ ++ if (tmdev->ops && tmdev->ops->set_trip_activate) ++ return tmdev->ops->set_trip_activate(s, trip, mode); ++ ++ return 0; ++} ++ ++ + static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume); + + static const struct of_device_id tsens_table[] = { +@@ -83,6 +109,8 @@ MODULE_DEVICE_TABLE(of, tsens_table); + static const struct thermal_zone_of_device_ops tsens_of_ops = { + .get_temp = tsens_get_temp, + .get_trend = tsens_get_trend, ++ .set_trip_temp = tsens_set_trip_temp, ++ .set_trip_activate = tsens_activate_trip_type, + }; + + static int tsens_register(struct tsens_device *tmdev) +@@ -131,7 +159,7 @@ static int tsens_probe(struct platform_d + if (id) + data = id->data; + else +- data = &data_8960; ++ return -EINVAL; + + if (data->num_sensors <= 0) { + dev_err(dev, "invalid number of sensors\n"); +@@ -146,6 +174,9 @@ static int tsens_probe(struct platform_d + tmdev->dev = dev; + tmdev->num_sensors = data->num_sensors; + tmdev->ops = data->ops; ++ ++ tmdev->tsens_irq = platform_get_irq(pdev, 0); ++ + for (i = 0; i < tmdev->num_sensors; i++) { + if (data->hw_ids) + tmdev->sensor[i].hw_id = data->hw_ids[i]; +--- a/drivers/thermal/qcom/tsens.h ++++ b/drivers/thermal/qcom/tsens.h +@@ -24,9 +24,12 @@ struct tsens_device; + struct tsens_sensor { + struct tsens_device *tmdev; + struct thermal_zone_device *tzd; ++ struct work_struct notify_work; + int offset; + int id; + int hw_id; ++ int calib_data; ++ int calib_data_backup; + int slope; + u32 status; + }; +@@ -41,6 +44,9 @@ struct tsens_sensor { + * @suspend: Function to suspend the tsens device + * @resume: Function to resume the tsens device + * @get_trend: Function to get the thermal/temp trend ++ * @set_trip_temp: Function to set trip temp ++ * @get_trip_temp: Function to get trip temp ++ * @set_trip_activate: Function to activate trip points + */ + struct tsens_ops { + /* mandatory callbacks */ +@@ -53,6 +59,9 @@ struct tsens_ops { + int (*suspend)(struct tsens_device *); + int (*resume)(struct tsens_device *); + int (*get_trend)(struct tsens_device *, int, enum thermal_trend *); ++ int (*set_trip_temp)(void *, int, int); ++ int (*set_trip_activate)(void *, int, ++ enum thermal_trip_activation_mode); + }; + + /** +@@ -76,11 +85,13 @@ struct tsens_context { + struct tsens_device { + struct device *dev; + u32 num_sensors; ++ u32 tsens_irq; + struct regmap *map; + struct regmap_field *status_field; + struct tsens_context ctx; + bool trdy; + const struct tsens_ops *ops; ++ struct work_struct tsens_work; + struct tsens_sensor sensor[0]; + }; + +--- a/drivers/thermal/thermal_sysfs.c ++++ b/drivers/thermal/thermal_sysfs.c +@@ -115,12 +115,48 @@ trip_point_type_show(struct device *dev, + return sprintf(buf, "passive\n"); + case THERMAL_TRIP_ACTIVE: + return sprintf(buf, "active\n"); ++ case THERMAL_TRIP_CONFIGURABLE_HI: ++ return sprintf(buf, "configurable_hi\n"); ++ case THERMAL_TRIP_CONFIGURABLE_LOW: ++ return sprintf(buf, "configurable_low\n"); ++ case THERMAL_TRIP_CRITICAL_LOW: ++ return sprintf(buf, "critical_low\n"); + default: + return sprintf(buf, "unknown\n"); + } + } + + static ssize_t ++trip_point_type_activate(struct device *dev, struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct thermal_zone_device *tz = to_thermal_zone(dev); ++ int trip, ret; ++ char *enabled = "enabled"; ++ char *disabled = "disabled"; ++ ++ if (!tz->ops->set_trip_activate) ++ return -EPERM; ++ ++ if (!sscanf(attr->attr.name, "trip_point_%d_type", &trip)) ++ return -EINVAL; ++ ++ if (!strncmp(buf, enabled, strlen(enabled))) ++ ret = tz->ops->set_trip_activate(tz, trip, ++ THERMAL_TRIP_ACTIVATION_ENABLED); ++ else if (!strncmp(buf, disabled, strlen(disabled))) ++ ret = tz->ops->set_trip_activate(tz, trip, ++ THERMAL_TRIP_ACTIVATION_DISABLED); ++ else ++ ret = -EINVAL; ++ ++ if (ret) ++ return ret; ++ ++ return count; ++} ++ ++static ssize_t + trip_point_temp_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) + { +@@ -562,6 +598,12 @@ static int create_trip_attrs(struct ther + tz->trip_type_attrs[indx].attr.show = trip_point_type_show; + attrs[indx] = &tz->trip_type_attrs[indx].attr.attr; + ++ if (IS_ENABLED(CONFIG_THERMAL_WRITABLE_TRIPS)) { ++ tz->trip_type_attrs[indx].attr.store ++ = trip_point_type_activate; ++ tz->trip_type_attrs[indx].attr.attr.mode |= S_IWUSR; ++ } ++ + /* create trip temp attribute */ + snprintf(tz->trip_temp_attrs[indx].name, THERMAL_NAME_LENGTH, + "trip_point_%d_temp", indx); +--- a/include/linux/thermal.h ++++ b/include/linux/thermal.h +@@ -78,11 +78,19 @@ enum thermal_device_mode { + THERMAL_DEVICE_ENABLED, + }; + ++enum thermal_trip_activation_mode { ++ THERMAL_TRIP_ACTIVATION_DISABLED = 0, ++ THERMAL_TRIP_ACTIVATION_ENABLED, ++}; ++ + enum thermal_trip_type { + THERMAL_TRIP_ACTIVE = 0, + THERMAL_TRIP_PASSIVE, + THERMAL_TRIP_HOT, + THERMAL_TRIP_CRITICAL, ++ THERMAL_TRIP_CONFIGURABLE_HI, ++ THERMAL_TRIP_CONFIGURABLE_LOW, ++ THERMAL_TRIP_CRITICAL_LOW, + }; + + enum thermal_trend { +@@ -120,6 +128,8 @@ struct thermal_zone_device_ops { + enum thermal_trip_type *); + int (*get_trip_temp) (struct thermal_zone_device *, int, int *); + int (*set_trip_temp) (struct thermal_zone_device *, int, int); ++ int (*set_trip_activate) (struct thermal_zone_device *, int, ++ enum thermal_trip_activation_mode); + int (*get_trip_hyst) (struct thermal_zone_device *, int, int *); + int (*set_trip_hyst) (struct thermal_zone_device *, int, int); + int (*get_crit_temp) (struct thermal_zone_device *, int *); +@@ -363,6 +373,8 @@ struct thermal_genl_event { + * temperature. + * @set_trip_temp: a pointer to a function that sets the trip temperature on + * hardware. ++ * @activate_trip_type: a pointer to a function to enable/disable trip ++ * temperature interrupts + */ + struct thermal_zone_of_device_ops { + int (*get_temp)(void *, int *); +@@ -370,6 +382,8 @@ struct thermal_zone_of_device_ops { + int (*set_trips)(void *, int, int); + int (*set_emul_temp)(void *, int); + int (*set_trip_temp)(void *, int, int); ++ int (*set_trip_activate)(void *, int, ++ enum thermal_trip_activation_mode); + }; + + /** diff --git a/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch b/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch new file mode 100644 index 0000000000..167278a701 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch @@ -0,0 +1,93 @@ +From d30840e2b1cf79d90392e6051b0c0b6006d29d8b Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 9 Mar 2017 09:32:40 +0100 +Subject: [PATCH 64/69] clk: clk-rpm fixes + +Signed-off-by: John Crispin +--- + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + drivers/clk/qcom/clk-rpm.c | 35 ++++++++++++++++++++++ + include/dt-bindings/clock/qcom,rpmcc.h | 4 +++ + 3 files changed, 40 insertions(+) + +--- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt ++++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt +@@ -13,6 +13,7 @@ Required properties : + "qcom,rpmcc-msm8916", "qcom,rpmcc" + "qcom,rpmcc-msm8974", "qcom,rpmcc" + "qcom,rpmcc-apq8064", "qcom,rpmcc" ++ "qcom,rpmcc-ipq806x", "qcom,rpmcc" + + - #clock-cells : shall contain 1 + +--- a/drivers/clk/qcom/clk-rpm.c ++++ b/drivers/clk/qcom/clk-rpm.c +@@ -359,6 +359,16 @@ DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a + DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK); + DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK); + ++/* ipq806x */ ++DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK); ++DEFINE_CLK_RPM(ipq806x, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK); ++DEFINE_CLK_RPM(ipq806x, daytona_clk, daytona_a_clk, QCOM_RPM_DAYTONA_FABRIC_CLK); ++DEFINE_CLK_RPM(ipq806x, ebi1_clk, ebi1_a_clk, QCOM_RPM_EBI1_CLK); ++DEFINE_CLK_RPM(ipq806x, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK); ++DEFINE_CLK_RPM(ipq806x, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK); ++DEFINE_CLK_RPM(ipq806x, nss_fabric_0_clk, nss_fabric_0_a_clk, QCOM_RPM_NSS_FABRIC_0_CLK); ++DEFINE_CLK_RPM(ipq806x, nss_fabric_1_clk, nss_fabric_1_a_clk, QCOM_RPM_NSS_FABRIC_1_CLK); ++ + static struct clk_rpm *apq8064_clks[] = { + [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk, + [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk, +@@ -380,13 +390,38 @@ static struct clk_rpm *apq8064_clks[] = + [RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk, + }; + ++static struct clk_rpm *ipq806x_clks[] = { ++ [RPM_APPS_FABRIC_CLK] = &ipq806x_afab_clk, ++ [RPM_APPS_FABRIC_A_CLK] = &ipq806x_afab_a_clk, ++ [RPM_CFPB_CLK] = &ipq806x_cfpb_clk, ++ [RPM_CFPB_A_CLK] = &ipq806x_cfpb_a_clk, ++ [RPM_DAYTONA_FABRIC_CLK] = &ipq806x_daytona_clk, ++ [RPM_DAYTONA_FABRIC_A_CLK] = &ipq806x_daytona_a_clk, ++ [RPM_EBI1_CLK] = &ipq806x_ebi1_clk, ++ [RPM_EBI1_A_CLK] = &ipq806x_ebi1_a_clk, ++ [RPM_SYS_FABRIC_CLK] = &ipq806x_sfab_clk, ++ [RPM_SYS_FABRIC_A_CLK] = &ipq806x_sfab_a_clk, ++ [RPM_SFPB_CLK] = &ipq806x_sfpb_clk, ++ [RPM_SFPB_A_CLK] = &ipq806x_sfpb_a_clk, ++ [RPM_NSS_FABRIC_0_CLK] = &ipq806x_nss_fabric_0_clk, ++ [RPM_NSS_FABRIC_0_A_CLK] = &ipq806x_nss_fabric_0_a_clk, ++ [RPM_NSS_FABRIC_1_CLK] = &ipq806x_nss_fabric_1_clk, ++ [RPM_NSS_FABRIC_1_A_CLK] = &ipq806x_nss_fabric_1_a_clk, ++}; ++ + static const struct rpm_clk_desc rpm_clk_apq8064 = { + .clks = apq8064_clks, + .num_clks = ARRAY_SIZE(apq8064_clks), + }; + ++static const struct rpm_clk_desc rpm_clk_ipq806x = { ++ .clks = ipq806x_clks, ++ .num_clks = ARRAY_SIZE(ipq806x_clks), ++}; ++ + static const struct of_device_id rpm_clk_match_table[] = { + { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 }, ++ { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x }, + { } + }; + MODULE_DEVICE_TABLE(of, rpm_clk_match_table); +--- a/include/dt-bindings/clock/qcom,rpmcc.h ++++ b/include/dt-bindings/clock/qcom,rpmcc.h +@@ -37,6 +37,10 @@ + #define RPM_SYS_FABRIC_A_CLK 19 + #define RPM_SFPB_CLK 20 + #define RPM_SFPB_A_CLK 21 ++#define RPM_NSS_FABRIC_0_CLK 22 ++#define RPM_NSS_FABRIC_0_A_CLK 23 ++#define RPM_NSS_FABRIC_1_CLK 24 ++#define RPM_NSS_FABRIC_1_A_CLK 25 + + /* SMD RPM clocks */ + #define RPM_SMD_XO_CLK_SRC 0 diff --git a/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch b/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch new file mode 100644 index 0000000000..0d2a4274c7 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch @@ -0,0 +1,21 @@ +From 4d8e29642661397a339ac3485f212c6360445421 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 9 Mar 2017 09:33:32 +0100 +Subject: [PATCH 65/69] arm: override compiler flags + +Signed-off-by: John Crispin +--- + arch/arm/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -67,7 +67,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-i + # macro, but instead defines a whole series of macros which makes + # testing for a specific architecture or later rather impossible. + arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m +-arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) ++arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -mcpu=cortex-a15 + arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) + # Only override the compiler option if ARMv6. The ARMv6K extensions are + # always available in ARMv7 diff --git a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch new file mode 100644 index 0000000000..b6f1f47424 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -0,0 +1,189 @@ +From 71270226b14733a4b1f2cde58ea9265caa50b38d Mon Sep 17 00:00:00 2001 +From: Adrian Panella +Date: Thu, 9 Mar 2017 09:37:17 +0100 +Subject: [PATCH 67/69] generic: Mangle bootloader's kernel arguments + +The command-line arguments provided by the boot loader will be +appended to a new device tree property: bootloader-args. +If there is a property "append-rootblock" in DT under /chosen +and a root= option in bootloaders command line it will be parsed +and added to DT bootargs with the form: XX. +Only command line ATAG will be processed, the rest of the ATAGs +sent by bootloader will be ignored. +This is usefull in dual boot systems, to get the current root partition +without afecting the rest of the system. + +Signed-off-by: Adrian Panella +--- + arch/arm/Kconfig | 11 +++++ + arch/arm/boot/compressed/atags_to_fdt.c | 72 ++++++++++++++++++++++++++++++++- + init/main.c | 16 ++++++++ + 3 files changed, 98 insertions(+), 1 deletion(-) + +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1939,6 +1939,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN + The command-line arguments provided by the boot loader will be + appended to the the device tree bootargs property. + ++config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE ++ bool "Append rootblock parsing bootloader's kernel arguments" ++ help ++ The command-line arguments provided by the boot loader will be ++ appended to a new device tree property: bootloader-args. ++ If there is a property "append-rootblock" in DT under /chosen ++ and a root= option in bootloaders command line it will be parsed ++ and added to DT bootargs with the form: XX. ++ Only command line ATAG will be processed, the rest of the ATAGs ++ sent by bootloader will be ignored. ++ + endchoice + + config CMDLINE +--- a/arch/arm/boot/compressed/atags_to_fdt.c ++++ b/arch/arm/boot/compressed/atags_to_fdt.c +@@ -4,6 +4,8 @@ + + #if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND) + #define do_extend_cmdline 1 ++#elif defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) ++#define do_extend_cmdline 1 + #else + #define do_extend_cmdline 0 + #endif +@@ -67,6 +69,59 @@ static uint32_t get_cell_size(const void + return cell_size; + } + ++#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) ++ ++static char *append_rootblock(char *dest, const char *str, int len, void *fdt) ++{ ++ char *ptr, *end; ++ char *root="root="; ++ int i, l; ++ const char *rootblock; ++ ++ //ARM doesn't have __HAVE_ARCH_STRSTR, so search manually ++ ptr = str - 1; ++ ++ do { ++ //first find an 'r' at the begining or after a space ++ do { ++ ptr++; ++ ptr = strchr(ptr, 'r'); ++ if(!ptr) return dest; ++ ++ } while (ptr != str && *(ptr-1) != ' '); ++ ++ //then check for the rest ++ for(i = 1; i <= 4; i++) ++ if(*(ptr+i) != *(root+i)) break; ++ ++ } while (i != 5); ++ ++ end = strchr(ptr, ' '); ++ end = end ? (end - 1) : (strchr(ptr, 0) - 1); ++ ++ //find partition number (assumes format root=/dev/mtdXX | /dev/mtdblockXX | yy:XX ) ++ for( i = 0; end >= ptr && *end >= '0' && *end <= '9'; end--, i++); ++ ptr = end + 1; ++ ++ /* if append-rootblock property is set use it to append to command line */ ++ rootblock = getprop(fdt, "/chosen", "append-rootblock", &l); ++ if(rootblock != NULL) { ++ if(*dest != ' ') { ++ *dest = ' '; ++ dest++; ++ len++; ++ } ++ if (len + l + i <= COMMAND_LINE_SIZE) { ++ memcpy(dest, rootblock, l); ++ dest += l - 1; ++ memcpy(dest, ptr, i); ++ dest += i; ++ } ++ } ++ return dest; ++} ++#endif ++ + static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline) + { + char cmdline[COMMAND_LINE_SIZE]; +@@ -86,12 +141,21 @@ static void merge_fdt_bootargs(void *fdt + + /* and append the ATAG_CMDLINE */ + if (fdt_cmdline) { ++ ++#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) ++ //save original bootloader args ++ //and append ubi.mtd with root partition number to current cmdline ++ setprop_string(fdt, "/chosen", "bootloader-args", fdt_cmdline); ++ ptr = append_rootblock(ptr, fdt_cmdline, len, fdt); ++ ++#else + len = strlen(fdt_cmdline); + if (ptr - cmdline + len + 2 < COMMAND_LINE_SIZE) { + *ptr++ = ' '; + memcpy(ptr, fdt_cmdline, len); + ptr += len; + } ++#endif + } + *ptr = '\0'; + +@@ -148,7 +212,9 @@ int atags_to_fdt(void *atag_list, void * + else + setprop_string(fdt, "/chosen", "bootargs", + atag->u.cmdline.cmdline); +- } else if (atag->hdr.tag == ATAG_MEM) { ++ } ++#ifndef CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE ++ else if (atag->hdr.tag == ATAG_MEM) { + if (memcount >= sizeof(mem_reg_property)/4) + continue; + if (!atag->u.mem.size) +@@ -187,6 +253,10 @@ int atags_to_fdt(void *atag_list, void * + setprop(fdt, "/memory", "reg", mem_reg_property, + 4 * memcount * memsize); + } ++#else ++ ++ } ++#endif + + return fdt_pack(fdt); + } +--- a/init/main.c ++++ b/init/main.c +@@ -95,6 +95,10 @@ + #include + #include + ++#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) ++#include ++#endif ++ + static int kernel_init(void *); + + extern void init_IRQ(void); +@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k + page_alloc_init(); + + pr_notice("Kernel command line: %s\n", boot_command_line); ++ ++#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) ++ //Show bootloader's original command line for reference ++ if(of_chosen) { ++ const char *prop = of_get_property(of_chosen, "bootloader-args", NULL); ++ if(prop) ++ pr_notice("Bootloader command line (ignored): %s\n", prop); ++ else ++ pr_notice("Bootloader command line not present\n"); ++ } ++#endif ++ + /* parameters may set static keys */ + jump_label_init(); + parse_early_param(); diff --git a/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch new file mode 100644 index 0000000000..e11378b42a --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch @@ -0,0 +1,31 @@ +From 8f68331e14dff9a101f2d0e1d6bec84a031f27ee Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 9 Mar 2017 11:03:18 +0100 +Subject: [PATCH 69/69] arm: boot: add dts files + +Signed-off-by: John Crispin +--- + arch/arm/boot/dts/Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -699,6 +699,18 @@ dtb-$(CONFIG_ARCH_QCOM) += \ + qcom-apq8084-mtp.dtb \ + qcom-ipq4019-ap.dk01.1-c1.dtb \ + qcom-ipq8064-ap148.dtb \ ++ qcom-ipq8064-c2600.dtb \ ++ qcom-ipq8064-d7800.dtb \ ++ qcom-ipq8064-db149.dtb \ ++ qcom-ipq8064-ap161.dtb \ ++ qcom-ipq8064-ea8500.dtb \ ++ qcom-ipq8064-r7500.dtb \ ++ qcom-ipq8064-r7500v2.dtb \ ++ qcom-ipq8064-wg2600hp.dtb \ ++ qcom-ipq8064-wpq864.dtb \ ++ qcom-ipq8064-wxr-2533dhp.dtb \ ++ qcom-ipq8065-nbg6817.dtb \ ++ qcom-ipq8065-r7800.dtb \ + qcom-msm8660-surf.dtb \ + qcom-msm8960-cdp.dtb \ + qcom-msm8974-lge-nexus5-hammerhead.dtb \ diff --git a/target/linux/ipq806x/patches-4.19/0070-qcom-spm-fix-probe-order.patch b/target/linux/ipq806x/patches-4.19/0070-qcom-spm-fix-probe-order.patch new file mode 100644 index 0000000000..b7e375dfb2 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0070-qcom-spm-fix-probe-order.patch @@ -0,0 +1,16 @@ +Check for SCM availability before attempting to use SPM + +Signed-off-by: Felix Fietkau + +--- a/drivers/soc/qcom/spm.c ++++ b/drivers/soc/qcom/spm.c +@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(stru + cpumask_t mask; + bool use_scm_power_down = false; + ++ if (!qcom_scm_is_available()) ++ return -EPROBE_DEFER; ++ + for (i = 0; ; i++) { + state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); + if (!state_node) diff --git a/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch b/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch new file mode 100644 index 0000000000..b9f6e33be6 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch @@ -0,0 +1,95 @@ +From 86655aa14304ca88a8ce8847276147dbc1a83238 Mon Sep 17 00:00:00 2001 +From: Sham Muthayyan +Date: Tue, 19 Jul 2016 18:44:49 +0530 +Subject: PCI: qcom: Fixed IPQ806x specific clocks + +Change-Id: I488e1bc707d6a22b37a338f41935e3922009ba5e +Signed-off-by: Sham Muthayyan +--- + drivers/pci/host/pcie-qcom.c | 38 +++++++++++++++++++++++++++++++++----- + 1 file changed, 33 insertions(+), 5 deletions(-) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -91,6 +91,8 @@ struct qcom_pcie_resources_2_1_0 { + struct clk *iface_clk; + struct clk *core_clk; + struct clk *phy_clk; ++ struct clk *aux_clk; ++ struct clk *ref_clk; + struct reset_control *pci_reset; + struct reset_control *axi_reset; + struct reset_control *ahb_reset; +@@ -249,6 +251,14 @@ static int qcom_pcie_get_resources_2_1_0 + if (IS_ERR(res->phy_clk)) + return PTR_ERR(res->phy_clk); + ++ res->aux_clk = devm_clk_get(dev, "aux"); ++ if (IS_ERR(res->aux_clk)) ++ return PTR_ERR(res->aux_clk); ++ ++ res->ref_clk = devm_clk_get(dev, "ref"); ++ if (IS_ERR(res->ref_clk)) ++ return PTR_ERR(res->ref_clk); ++ + res->pci_reset = devm_reset_control_get_exclusive(dev, "pci"); + if (IS_ERR(res->pci_reset)) + return PTR_ERR(res->pci_reset); +@@ -281,6 +291,8 @@ static void qcom_pcie_deinit_2_1_0(struc + clk_disable_unprepare(res->iface_clk); + clk_disable_unprepare(res->core_clk); + clk_disable_unprepare(res->phy_clk); ++ clk_disable_unprepare(res->aux_clk); ++ clk_disable_unprepare(res->ref_clk); + regulator_disable(res->vdda); + regulator_disable(res->vdda_phy); + regulator_disable(res->vdda_refclk); +@@ -324,16 +336,28 @@ static int qcom_pcie_init_2_1_0(struct q + goto err_assert_ahb; + } + ++ ret = clk_prepare_enable(res->core_clk); ++ if (ret) { ++ dev_err(dev, "cannot prepare/enable core clock\n"); ++ goto err_clk_core; ++ } ++ + ret = clk_prepare_enable(res->phy_clk); + if (ret) { + dev_err(dev, "cannot prepare/enable phy clock\n"); + goto err_clk_phy; + } + +- ret = clk_prepare_enable(res->core_clk); ++ ret = clk_prepare_enable(res->aux_clk); + if (ret) { +- dev_err(dev, "cannot prepare/enable core clock\n"); +- goto err_clk_core; ++ dev_err(dev, "cannot prepare/enable aux clock\n"); ++ goto err_clk_aux; ++ } ++ ++ ret = clk_prepare_enable(res->ref_clk); ++ if (ret) { ++ dev_err(dev, "cannot prepare/enable ref clock\n"); ++ goto err_clk_ref; + } + + ret = reset_control_deassert(res->ahb_reset); +@@ -389,10 +413,14 @@ static int qcom_pcie_init_2_1_0(struct q + return 0; + + err_deassert_ahb: +- clk_disable_unprepare(res->core_clk); +-err_clk_core: ++ clk_disable_unprepare(res->ref_clk); ++err_clk_ref: ++ clk_disable_unprepare(res->aux_clk); ++err_clk_aux: + clk_disable_unprepare(res->phy_clk); + err_clk_phy: ++ clk_disable_unprepare(res->core_clk); ++err_clk_core: + clk_disable_unprepare(res->iface_clk); + err_assert_ahb: + regulator_disable(res->vdda_phy); diff --git a/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch b/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch new file mode 100644 index 0000000000..8b9e5ff5d1 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch @@ -0,0 +1,85 @@ +From 490d103232287eb51c92c49a4ef8865fd0a9d59e Mon Sep 17 00:00:00 2001 +From: Sham Muthayyan +Date: Tue, 19 Jul 2016 18:58:18 +0530 +Subject: PCI: qcom: Fixed IPQ806x PCIE reset changes + +Change-Id: Ia6590e960b9754b1e8b7a51f318788cd63e9e321 +Signed-off-by: Sham Muthayyan +--- + drivers/pci/host/pcie-qcom.c | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -98,6 +98,7 @@ struct qcom_pcie_resources_2_1_0 { + struct reset_control *ahb_reset; + struct reset_control *por_reset; + struct reset_control *phy_reset; ++ struct reset_control *ext_reset; + struct regulator *vdda; + struct regulator *vdda_phy; + struct regulator *vdda_refclk; +@@ -275,6 +276,10 @@ static int qcom_pcie_get_resources_2_1_0 + if (IS_ERR(res->por_reset)) + return PTR_ERR(res->por_reset); + ++ res->ext_reset = devm_reset_control_get(dev, "ext"); ++ if (IS_ERR(res->ext_reset)) ++ return PTR_ERR(res->ext_reset); ++ + res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); + return PTR_ERR_OR_ZERO(res->phy_reset); + } +@@ -288,6 +293,7 @@ static void qcom_pcie_deinit_2_1_0(struc + reset_control_assert(res->ahb_reset); + reset_control_assert(res->por_reset); + reset_control_assert(res->pci_reset); ++ reset_control_assert(res->ext_reset); + clk_disable_unprepare(res->iface_clk); + clk_disable_unprepare(res->core_clk); + clk_disable_unprepare(res->phy_clk); +@@ -306,6 +312,12 @@ static int qcom_pcie_init_2_1_0(struct q + u32 val; + int ret; + ++ ret = reset_control_assert(res->ahb_reset); ++ if (ret) { ++ dev_err(dev, "cannot assert ahb reset\n"); ++ return ret; ++ } ++ + ret = regulator_enable(res->vdda); + if (ret) { + dev_err(dev, "cannot enable vdda regulator\n"); +@@ -324,16 +336,16 @@ static int qcom_pcie_init_2_1_0(struct q + goto err_vdda_phy; + } + +- ret = reset_control_assert(res->ahb_reset); ++ ret = reset_control_deassert(res->ext_reset); + if (ret) { +- dev_err(dev, "cannot assert ahb reset\n"); +- goto err_assert_ahb; ++ dev_err(dev, "cannot assert ext reset\n"); ++ goto err_reset_ext; + } + + ret = clk_prepare_enable(res->iface_clk); + if (ret) { + dev_err(dev, "cannot prepare/enable iface clock\n"); +- goto err_assert_ahb; ++ goto err_iface; + } + + ret = clk_prepare_enable(res->core_clk); +@@ -422,7 +434,9 @@ err_clk_phy: + clk_disable_unprepare(res->core_clk); + err_clk_core: + clk_disable_unprepare(res->iface_clk); +-err_assert_ahb: ++err_iface: ++ reset_control_assert(res->ext_reset); ++err_reset_ext: + regulator_disable(res->vdda_phy); + err_vdda_phy: + regulator_disable(res->vdda_refclk); diff --git a/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch b/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch new file mode 100644 index 0000000000..57ee082c83 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch @@ -0,0 +1,126 @@ +From eddd13215d0f2b549ebc5f0e8796d5b1231f90a0 Mon Sep 17 00:00:00 2001 +From: Sham Muthayyan +Date: Tue, 19 Jul 2016 19:58:22 +0530 +Subject: PCI: qcom: Fixed IPQ806x PCIE init changes + +Change-Id: Ic319b1aec27a47809284759f8fcb6a8815b7cf7e +Signed-off-by: Sham Muthayyan +--- + drivers/pci/host/pcie-qcom.c | 62 +++++++++++++++++++++++++++++++++++++------- + 1 file changed, 53 insertions(+), 9 deletions(-) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -52,7 +52,13 @@ + #define PCIE_CAP_CPL_TIMEOUT_DISABLE 0x10 + + #define PCIE20_PARF_PHY_CTRL 0x40 ++#define PHY_CTRL_PHY_TX0_TERM_OFFSET_MASK (0x1f << 16) ++#define PHY_CTRL_PHY_TX0_TERM_OFFSET(x) (x << 16) ++ + #define PCIE20_PARF_PHY_REFCLK 0x4C ++#define REF_SSP_EN BIT(16) ++#define REF_USE_PAD BIT(12) ++ + #define PCIE20_PARF_DBI_BASE_ADDR 0x168 + #define PCIE20_PARF_SLV_ADDR_SPACE_SIZE 0x16C + #define PCIE20_PARF_MHI_CLOCK_RESET_CTRL 0x174 +@@ -83,6 +89,18 @@ + #define DBI_RO_WR_EN 1 + + #define PERST_DELAY_US 1000 ++/* PARF registers */ ++#define PCIE20_PARF_PCS_DEEMPH 0x34 ++#define PCS_DEEMPH_TX_DEEMPH_GEN1(x) (x << 16) ++#define PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB(x) (x << 8) ++#define PCS_DEEMPH_TX_DEEMPH_GEN2_6DB(x) (x << 0) ++ ++#define PCIE20_PARF_PCS_SWING 0x38 ++#define PCS_SWING_TX_SWING_FULL(x) (x << 8) ++#define PCS_SWING_TX_SWING_LOW(x) (x << 0) ++ ++#define PCIE20_PARF_CONFIG_BITS 0x50 ++#define PHY_RX0_EQ(x) (x << 24) + + #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 + #define SLV_ADDR_SPACE_SZ 0x10000000 +@@ -102,6 +120,7 @@ struct qcom_pcie_resources_2_1_0 { + struct regulator *vdda; + struct regulator *vdda_phy; + struct regulator *vdda_refclk; ++ uint8_t phy_tx0_term_offset; + }; + + struct qcom_pcie_resources_1_0_0 { +@@ -179,6 +198,16 @@ struct qcom_pcie { + + #define to_qcom_pcie(x) dev_get_drvdata((x)->dev) + ++static inline void ++writel_masked(void __iomem *addr, u32 clear_mask, u32 set_mask) ++{ ++ u32 val = readl(addr); ++ ++ val &= ~clear_mask; ++ val |= set_mask; ++ writel(val, addr); ++} ++ + static void qcom_ep_reset_assert(struct qcom_pcie *pcie) + { + gpiod_set_value_cansleep(pcie->reset, 1); +@@ -280,6 +309,10 @@ static int qcom_pcie_get_resources_2_1_0 + if (IS_ERR(res->ext_reset)) + return PTR_ERR(res->ext_reset); + ++ if (of_property_read_u8(dev->of_node, "phy-tx0-term-offset", ++ &res->phy_tx0_term_offset)) ++ res->phy_tx0_term_offset = 0; ++ + res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); + return PTR_ERR_OR_ZERO(res->phy_reset); + } +@@ -309,7 +342,6 @@ static int qcom_pcie_init_2_1_0(struct q + struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; + struct dw_pcie *pci = pcie->pci; + struct device *dev = pci->dev; +- u32 val; + int ret; + + ret = reset_control_assert(res->ahb_reset); +@@ -378,15 +410,26 @@ static int qcom_pcie_init_2_1_0(struct q + goto err_deassert_ahb; + } + +- /* enable PCIe clocks and resets */ +- val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL); +- val &= ~BIT(0); +- writel(val, pcie->parf + PCIE20_PARF_PHY_CTRL); +- +- /* enable external reference clock */ +- val = readl(pcie->parf + PCIE20_PARF_PHY_REFCLK); +- val |= BIT(16); +- writel(val, pcie->parf + PCIE20_PARF_PHY_REFCLK); ++ writel_masked(pcie->parf + PCIE20_PARF_PHY_CTRL, BIT(0), 0); ++ ++ /* Set Tx termination offset */ ++ writel_masked(pcie->parf + PCIE20_PARF_PHY_CTRL, ++ PHY_CTRL_PHY_TX0_TERM_OFFSET_MASK, ++ PHY_CTRL_PHY_TX0_TERM_OFFSET(res->phy_tx0_term_offset)); ++ ++ /* PARF programming */ ++ writel(PCS_DEEMPH_TX_DEEMPH_GEN1(0x18) | ++ PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB(0x18) | ++ PCS_DEEMPH_TX_DEEMPH_GEN2_6DB(0x22), ++ pcie->parf + PCIE20_PARF_PCS_DEEMPH); ++ writel(PCS_SWING_TX_SWING_FULL(0x78) | ++ PCS_SWING_TX_SWING_LOW(0x78), ++ pcie->parf + PCIE20_PARF_PCS_SWING); ++ writel(PHY_RX0_EQ(0x4), pcie->parf + PCIE20_PARF_CONFIG_BITS); ++ ++ /* Enable reference clock */ ++ writel_masked(pcie->parf + PCIE20_PARF_PHY_REFCLK, ++ REF_USE_PAD, REF_SSP_EN); + + ret = reset_control_deassert(res->phy_reset); + if (ret) { diff --git a/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch b/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch new file mode 100644 index 0000000000..92100481c8 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch @@ -0,0 +1,114 @@ +From d27c303e828d7e42f339a459d2abfe30c51698e9 Mon Sep 17 00:00:00 2001 +From: Sham Muthayyan +Date: Tue, 26 Jul 2016 12:28:31 +0530 +Subject: PCI: qcom: Programming the PCIE iATU for IPQ806x + +Resolved PCIE EP detection errors caused due to missing iATU programming. + +Change-Id: Ie95c0f8cb940abc0192a8a3c4e825ddba54b72fe +Signed-off-by: Sham Muthayyan +--- + drivers/pci/host/pcie-qcom.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 77 insertions(+) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -83,6 +83,30 @@ + #define PCIE20_CAP_LINK_1 (PCIE20_CAP + 0x14) + #define PCIE_CAP_LINK1_VAL 0x2FD7F + ++#define PCIE20_CAP_LINKCTRLSTATUS (PCIE20_CAP + 0x10) ++ ++#define PCIE20_AXI_MSTR_RESP_COMP_CTRL0 0x818 ++#define PCIE20_AXI_MSTR_RESP_COMP_CTRL1 0x81c ++ ++#define PCIE20_PLR_IATU_VIEWPORT 0x900 ++#define PCIE20_PLR_IATU_REGION_OUTBOUND (0x0 << 31) ++#define PCIE20_PLR_IATU_REGION_INDEX(x) (x << 0) ++ ++#define PCIE20_PLR_IATU_CTRL1 0x904 ++#define PCIE20_PLR_IATU_TYPE_CFG0 (0x4 << 0) ++#define PCIE20_PLR_IATU_TYPE_MEM (0x0 << 0) ++ ++#define PCIE20_PLR_IATU_CTRL2 0x908 ++#define PCIE20_PLR_IATU_ENABLE BIT(31) ++ ++#define PCIE20_PLR_IATU_LBAR 0x90C ++#define PCIE20_PLR_IATU_UBAR 0x910 ++#define PCIE20_PLR_IATU_LAR 0x914 ++#define PCIE20_PLR_IATU_LTAR 0x918 ++#define PCIE20_PLR_IATU_UTAR 0x91c ++ ++#define MSM_PCIE_DEV_CFG_ADDR 0x01000000 ++ + #define PCIE20_PARF_Q2A_FLUSH 0x1AC + + #define PCIE20_MISC_CONTROL_1_REG 0x8BC +@@ -251,6 +275,57 @@ static void qcom_pcie_2_1_0_ltssm_enable + writel(val, pcie->elbi + PCIE20_ELBI_SYS_CTRL); + } + ++static void qcom_pcie_prog_viewport_cfg0(struct qcom_pcie *pcie, u32 busdev) ++{ ++ struct pcie_port *pp = &pcie->pci->pp; ++ ++ /* ++ * program and enable address translation region 0 (device config ++ * address space); region type config; ++ * axi config address range to device config address range ++ */ ++ writel(PCIE20_PLR_IATU_REGION_OUTBOUND | ++ PCIE20_PLR_IATU_REGION_INDEX(0), ++ pcie->pci->dbi_base + PCIE20_PLR_IATU_VIEWPORT); ++ ++ writel(PCIE20_PLR_IATU_TYPE_CFG0, pcie->pci->dbi_base + PCIE20_PLR_IATU_CTRL1); ++ writel(PCIE20_PLR_IATU_ENABLE, pcie->pci->dbi_base + PCIE20_PLR_IATU_CTRL2); ++ writel(pp->cfg0_base, pcie->pci->dbi_base + PCIE20_PLR_IATU_LBAR); ++ writel((pp->cfg0_base >> 32), pcie->pci->dbi_base + PCIE20_PLR_IATU_UBAR); ++ writel((pp->cfg0_base + pp->cfg0_size - 1), ++ pcie->pci->dbi_base + PCIE20_PLR_IATU_LAR); ++ writel(busdev, pcie->pci->dbi_base + PCIE20_PLR_IATU_LTAR); ++ writel(0, pcie->pci->dbi_base + PCIE20_PLR_IATU_UTAR); ++} ++ ++static void qcom_pcie_prog_viewport_mem2_outbound(struct qcom_pcie *pcie) ++{ ++ struct pcie_port *pp = &pcie->pci->pp; ++ ++ /* ++ * program and enable address translation region 2 (device resource ++ * address space); region type memory; ++ * axi device bar address range to device bar address range ++ */ ++ writel(PCIE20_PLR_IATU_REGION_OUTBOUND | ++ PCIE20_PLR_IATU_REGION_INDEX(2), ++ pcie->pci->dbi_base + PCIE20_PLR_IATU_VIEWPORT); ++ ++ writel(PCIE20_PLR_IATU_TYPE_MEM, pcie->pci->dbi_base + PCIE20_PLR_IATU_CTRL1); ++ writel(PCIE20_PLR_IATU_ENABLE, pcie->pci->dbi_base + PCIE20_PLR_IATU_CTRL2); ++ writel(pp->mem_base, pcie->pci->dbi_base + PCIE20_PLR_IATU_LBAR); ++ writel((pp->mem_base >> 32), pcie->pci->dbi_base + PCIE20_PLR_IATU_UBAR); ++ writel(pp->mem_base + pp->mem_size - 1, ++ pcie->pci->dbi_base + PCIE20_PLR_IATU_LAR); ++ writel(pp->mem_bus_addr, pcie->pci->dbi_base + PCIE20_PLR_IATU_LTAR); ++ writel(upper_32_bits(pp->mem_bus_addr), ++ pcie->pci->dbi_base + PCIE20_PLR_IATU_UTAR); ++ ++ /* 256B PCIE buffer setting */ ++ writel(0x1, pcie->pci->dbi_base + PCIE20_AXI_MSTR_RESP_COMP_CTRL0); ++ writel(0x1, pcie->pci->dbi_base + PCIE20_AXI_MSTR_RESP_COMP_CTRL1); ++} ++ + static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie) + { + struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; +@@ -465,6 +540,9 @@ static int qcom_pcie_init_2_1_0(struct q + writel(CFG_BRIDGE_SB_INIT, + pci->dbi_base + PCIE20_AXI_MSTR_RESP_COMP_CTRL1); + ++ qcom_pcie_prog_viewport_cfg0(pcie, MSM_PCIE_DEV_CFG_ADDR); ++ qcom_pcie_prog_viewport_mem2_outbound(pcie); ++ + return 0; + + err_deassert_ahb: diff --git a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch new file mode 100644 index 0000000000..5dea084bfa --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch @@ -0,0 +1,61 @@ +From 4910cfd150342ec7b038892262923c725a9c4001 Mon Sep 17 00:00:00 2001 +From: Sham Muthayyan +Date: Wed, 7 Sep 2016 16:44:28 +0530 +Subject: PCI: qcom: Force GEN1 support + +Change-Id: Ica54ddb737d7b851469deab1745f54bf431bd3f0 +Signed-off-by: Sham Muthayyan +--- + drivers/pci/host/pcie-qcom.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -129,6 +129,8 @@ + #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 + #define SLV_ADDR_SPACE_SZ 0x10000000 + ++#define PCIE20_LNK_CONTROL2_LINK_STATUS2 0xA0 ++ + struct qcom_pcie_resources_2_1_0 { + struct clk *iface_clk; + struct clk *core_clk; +@@ -218,6 +220,7 @@ struct qcom_pcie { + struct phy *phy; + struct gpio_desc *reset; + struct qcom_pcie_ops *ops; ++ uint32_t force_gen1; + }; + + #define to_qcom_pcie(x) dev_get_drvdata((x)->dev) +@@ -532,6 +535,11 @@ static int qcom_pcie_init_2_1_0(struct q + + /* wait for clock acquisition */ + usleep_range(1000, 1500); ++ if (pcie->force_gen1) { ++ writel_relaxed((readl_relaxed( ++ pcie->pci->dbi_base + PCIE20_LNK_CONTROL2_LINK_STATUS2) | 1), ++ pcie->pci->dbi_base + PCIE20_LNK_CONTROL2_LINK_STATUS2); ++ } + + + /* Set the Max TLP size to 2K, instead of using default of 4K */ +@@ -1382,6 +1390,8 @@ static int qcom_pcie_probe(struct platfo + struct dw_pcie *pci; + struct qcom_pcie *pcie; + int ret; ++ uint32_t force_gen1 = 0; ++ struct device_node *np = pdev->dev.of_node; + + pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); + if (!pcie) +@@ -1403,6 +1413,9 @@ static int qcom_pcie_probe(struct platfo + if (IS_ERR(pcie->reset)) + return PTR_ERR(pcie->reset); + ++ of_property_read_u32(np, "force_gen1", &force_gen1); ++ pcie->force_gen1 = force_gen1; ++ + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "parf"); + pcie->parf = devm_ioremap_resource(dev, res); + if (IS_ERR(pcie->parf)) diff --git a/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch b/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch new file mode 100644 index 0000000000..c7dfd53cb1 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch @@ -0,0 +1,69 @@ +From edff8f777c6321ca89bb950a382f409c4a126e28 Mon Sep 17 00:00:00 2001 +From: Gokul Sriram Palanisamy +Date: Thu, 15 Dec 2016 17:38:18 +0530 +Subject: pcie: Set PCIE MRRS and MPS to 256B + +Set Max Read Request Size and Max Payload Size to 256 bytes, +per chip team recommendation. + +Change-Id: I097004be2ced1b3096ffc10c318aae0b2bb155e8 +Signed-off-by: Gokul Sriram Palanisamy +--- + drivers/pci/host/pcie-qcom.c | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +(limited to 'drivers/pci/host/pcie-qcom.c') + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -131,6 +131,14 @@ + + #define PCIE20_LNK_CONTROL2_LINK_STATUS2 0xA0 + ++#define __set(v, a, b) (((v) << (b)) & GENMASK(a, b)) ++#define __mask(a, b) (((1 << ((a) + 1)) - 1) & ~((1 << (b)) - 1)) ++#define PCIE20_DEV_CAS 0x78 ++#define PCIE20_MRRS_MASK __mask(14, 12) ++#define PCIE20_MRRS(x) __set(x, 14, 12) ++#define PCIE20_MPS_MASK __mask(7, 5) ++#define PCIE20_MPS(x) __set(x, 7, 5) ++ + struct qcom_pcie_resources_2_1_0 { + struct clk *iface_clk; + struct clk *core_clk; +@@ -1472,6 +1480,35 @@ static int qcom_pcie_probe(struct platfo + return 0; + } + ++static void qcom_pcie_fixup_final(struct pci_dev *dev) ++{ ++ int cap, err; ++ u16 ctl, reg_val; ++ ++ cap = pci_pcie_cap(dev); ++ if (!cap) ++ return; ++ ++ err = pci_read_config_word(dev, cap + PCI_EXP_DEVCTL, &ctl); ++ ++ if (err) ++ return; ++ ++ reg_val = ctl; ++ ++ if (((reg_val & PCIE20_MRRS_MASK) >> 12) > 1) ++ reg_val = (reg_val & ~(PCIE20_MRRS_MASK)) | PCIE20_MRRS(0x1); ++ ++ if (((ctl & PCIE20_MPS_MASK) >> 5) > 1) ++ reg_val = (reg_val & ~(PCIE20_MPS_MASK)) | PCIE20_MPS(0x1); ++ ++ err = pci_write_config_word(dev, cap + PCI_EXP_DEVCTL, reg_val); ++ ++ if (err) ++ pr_err("pcie config write failed %d\n", err); ++} ++DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, qcom_pcie_fixup_final); ++ + static const struct of_device_id qcom_pcie_match[] = { + { .compatible = "qcom,pcie-apq8084", .data = &ops_1_0_0 }, + { .compatible = "qcom,pcie-ipq8064", .data = &ops_2_1_0 }, diff --git a/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch b/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch new file mode 100644 index 0000000000..88bd7730c1 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch @@ -0,0 +1,91 @@ +From b74bab6186131eea09459eedf5d737645a3559c9 Mon Sep 17 00:00:00 2001 +From: Abhishek Sahu +Date: Thu, 22 Dec 2016 11:18:45 +0530 +Subject: pcie: qcom: Fixed pcie_phy_clk branch issue + +Following backtraces are observed in PCIe deinit operation. + + Hardware name: Qualcomm (Flattened Device Tree) + (unwind_backtrace) from [] (show_stack+0x10/0x14) + (show_stack) from [] (dump_stack+0x84/0x98) + (dump_stack) from [] (warn_slowpath_common+0x9c/0xb8) + (warn_slowpath_common) from [] (warn_slowpath_fmt+0x30/0x40) + (warn_slowpath_fmt) from [] (clk_branch_wait+0x114/0x120) + (clk_branch_wait) from [] (clk_core_disable+0xd0/0x1f4) + (clk_core_disable) from [] (clk_disable+0x24/0x30) + (clk_disable) from [] (qcom_pcie_deinit_v0+0x6c/0xb8) + (qcom_pcie_deinit_v0) from [] (qcom_pcie_host_init+0xe0/0xe8) + (qcom_pcie_host_init) from [] (dw_pcie_host_init+0x3b0/0x538) + (dw_pcie_host_init) from [] (qcom_pcie_probe+0x20c/0x2e4) + +pcie_phy_clk is generated for PCIe controller itself and the +GCC controls its branch operation. This error is coming since +the assert operations turn off the parent clock before branch +clock. Now this patch moves clk_disable_unprepare before assert +operations. + +Similarly, during probe function, the clock branch operation +should be done after dessert operation. Currently, it does not +generate any error since bootloader enables the pcie_phy_clk +but the same error is coming during probe, if bootloader +disables pcie_phy_clk. + +Change-Id: Ib29c154d10eb64363d9cc982ce5fd8107af5627d +Signed-off-by: Abhishek Sahu +--- + drivers/pci/host/pcie-qcom.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -407,6 +407,7 @@ static void qcom_pcie_deinit_2_1_0(struc + { + struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; + ++ clk_disable_unprepare(res->phy_clk); + reset_control_assert(res->pci_reset); + reset_control_assert(res->axi_reset); + reset_control_assert(res->ahb_reset); +@@ -415,7 +416,6 @@ static void qcom_pcie_deinit_2_1_0(struc + reset_control_assert(res->ext_reset); + clk_disable_unprepare(res->iface_clk); + clk_disable_unprepare(res->core_clk); +- clk_disable_unprepare(res->phy_clk); + clk_disable_unprepare(res->aux_clk); + clk_disable_unprepare(res->ref_clk); + regulator_disable(res->vdda); +@@ -472,12 +472,6 @@ static int qcom_pcie_init_2_1_0(struct q + goto err_clk_core; + } + +- ret = clk_prepare_enable(res->phy_clk); +- if (ret) { +- dev_err(dev, "cannot prepare/enable phy clock\n"); +- goto err_clk_phy; +- } +- + ret = clk_prepare_enable(res->aux_clk); + if (ret) { + dev_err(dev, "cannot prepare/enable aux clock\n"); +@@ -541,6 +535,12 @@ static int qcom_pcie_init_2_1_0(struct q + return ret; + } + ++ ret = clk_prepare_enable(res->phy_clk); ++ if (ret) { ++ dev_err(dev, "cannot prepare/enable phy clock\n"); ++ goto err_deassert_ahb; ++ } ++ + /* wait for clock acquisition */ + usleep_range(1000, 1500); + if (pcie->force_gen1) { +@@ -566,8 +566,6 @@ err_deassert_ahb: + err_clk_ref: + clk_disable_unprepare(res->aux_clk); + err_clk_aux: +- clk_disable_unprepare(res->phy_clk); +-err_clk_phy: + clk_disable_unprepare(res->core_clk); + err_clk_core: + clk_disable_unprepare(res->iface_clk); diff --git a/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch b/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch new file mode 100644 index 0000000000..227a1b4e7a --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch @@ -0,0 +1,25 @@ +From 1a9c48123bd09f75562b6a2ee0f0a7b2d533cd45 Mon Sep 17 00:00:00 2001 +From: Abhishek Sahu +Date: Thu, 22 Dec 2016 11:50:49 +0530 +Subject: pcie: qcom: change duplicate pci reset to phy reset + +The deinit issues reset_control_assert for pci twice and +does not contain phy reset. + +Change-Id: Iba849963c7e5f9a2a1063f0e2e89635df70b8a99 +Signed-off-by: Abhishek Sahu +--- + drivers/pci/host/pcie-qcom.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -408,7 +408,7 @@ static void qcom_pcie_deinit_2_1_0(struc + struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; + + clk_disable_unprepare(res->phy_clk); +- reset_control_assert(res->pci_reset); ++ reset_control_assert(res->phy_reset); + reset_control_assert(res->axi_reset); + reset_control_assert(res->ahb_reset); + reset_control_assert(res->por_reset); diff --git a/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch b/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch new file mode 100644 index 0000000000..035281f66a --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch @@ -0,0 +1,12 @@ +--- a/drivers/firmware/qcom_scm.c ++++ b/drivers/firmware/qcom_scm.c +@@ -422,6 +422,9 @@ static const struct of_device_id qcom_sc + { .compatible = "qcom,scm-msm8996", + .data = NULL, /* no clocks */ + }, ++ { .compatible = "qcom,scm-ipq806x", ++ .data = NULL, /* no clocks */ ++ }, + { .compatible = "qcom,scm", + .data = (void *)(SCM_HAS_CORE_CLK + | SCM_HAS_IFACE_CLK diff --git a/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch b/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch new file mode 100644 index 0000000000..1507686456 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch @@ -0,0 +1,183 @@ +From 2034addc7e193dc81d7ca60d8884832751b76758 Mon Sep 17 00:00:00 2001 +From: Ajay Kishore +Date: Tue, 24 Jan 2017 14:14:16 +0530 +Subject: pinctrl: qcom: use scm_call to route GPIO irq to Apps + +For IPQ806x targets, TZ protects the registers that are used to +configure the routing of interrupts to a target processor. +To resolve this, this patch uses scm call to route GPIO interrupts +to application processor. Also the scm call interface is changed. + +Change-Id: Ib6c06829d04bc8c20483c36e63da92e26cdef9ce +Signed-off-by: Ajay Kishore +--- + drivers/firmware/qcom_scm-32.c | 17 +++++++++++++++++ + drivers/firmware/qcom_scm-64.c | 9 +++++++++ + drivers/firmware/qcom_scm.c | 13 +++++++++++++ + drivers/firmware/qcom_scm.h | 8 ++++++++ + drivers/pinctrl/qcom/pinctrl-msm.c | 34 ++++++++++++++++++++++++++++------ + include/linux/qcom_scm.h | 3 ++- + 6 files changed, 77 insertions(+), 7 deletions(-) + +--- a/drivers/firmware/qcom_scm-32.c ++++ b/drivers/firmware/qcom_scm-32.c +@@ -561,6 +561,24 @@ int __qcom_scm_pas_mss_reset(struct devi + return ret ? : le32_to_cpu(out); + } + ++int __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1) ++{ ++ s32 ret; ++ ++ ret = qcom_scm_call_atomic1(svc_id, cmd_id, arg1); ++ ++ return ret; ++} ++ ++int __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2) ++{ ++ s32 ret; ++ ++ ret = qcom_scm_call_atomic2(svc_id, cmd_id, arg1, arg2); ++ ++ return ret; ++} ++ + int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id) + { + struct { +--- a/drivers/firmware/qcom_scm-64.c ++++ b/drivers/firmware/qcom_scm-64.c +@@ -366,6 +366,16 @@ int __qcom_scm_pas_mss_reset(struct devi + return ret ? : res.a1; + } + ++int __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1) ++{ ++ return -ENOTSUPP; ++} ++ ++int __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2) ++{ ++ return -ENOTSUPP; ++} ++ + int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id) + { + struct qcom_scm_desc desc = {0}; +--- a/drivers/firmware/qcom_scm.c ++++ b/drivers/firmware/qcom_scm.c +@@ -470,3 +470,16 @@ static int __init qcom_scm_init(void) + return platform_driver_register(&qcom_scm_driver); + } + subsys_initcall(qcom_scm_init); ++ ++int qcom_scm_pinmux_read(u32 arg1) ++{ ++ return __qcom_scm_pinmux_read(SCM_SVC_IO_ACCESS, SCM_IO_READ, arg1); ++} ++EXPORT_SYMBOL(qcom_scm_pinmux_read); ++ ++int qcom_scm_pinmux_write(u32 arg1, u32 arg2) ++{ ++ return __qcom_scm_pinmux_write(SCM_SVC_IO_ACCESS, SCM_IO_WRITE, ++ arg1, arg2); ++} ++EXPORT_SYMBOL(qcom_scm_pinmux_write); +--- a/drivers/firmware/qcom_scm.h ++++ b/drivers/firmware/qcom_scm.h +@@ -58,6 +58,13 @@ extern int __qcom_scm_pas_auth_and_rese + extern int __qcom_scm_pas_shutdown(struct device *dev, u32 peripheral); + extern int __qcom_scm_pas_mss_reset(struct device *dev, bool reset); + ++#define SCM_IO_READ 1 ++#define SCM_IO_WRITE 2 ++#define SCM_SVC_IO_ACCESS 0x5 ++ ++s32 __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1); ++s32 __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2); ++ + /* common error codes */ + #define QCOM_SCM_V2_EBUSY -12 + #define QCOM_SCM_ENOMEM -5 +--- a/drivers/pinctrl/qcom/pinctrl-msm.c ++++ b/drivers/pinctrl/qcom/pinctrl-msm.c +@@ -30,7 +30,8 @@ + #include + #include + #include +- ++#include ++#include + #include "../core.h" + #include "../pinconf.h" + #include "pinctrl-msm.h" +@@ -646,6 +647,9 @@ static void msm_gpio_irq_ack(struct irq_ + const struct msm_pingroup *g; + unsigned long flags; + u32 val; ++ u32 addr; ++ int ret; ++ const __be32 *reg; + + g = &pctrl->soc->groups[d->hwirq]; + +@@ -684,11 +688,30 @@ static int msm_gpio_irq_set_type(struct + else + clear_bit(d->hwirq, pctrl->dual_edge_irqs); + ++ int ret = of_device_is_compatible(pctrl->dev->of_node, ++ "qcom,ipq8064-pinctrl"); + /* Route interrupts to application cpu */ +- val = readl(pctrl->regs + g->intr_target_reg); +- val &= ~(7 << g->intr_target_bit); +- val |= g->intr_target_kpss_val << g->intr_target_bit; +- writel(val, pctrl->regs + g->intr_target_reg); ++ if (!ret) { ++ val = readl(pctrl->regs + g->intr_target_reg); ++ val &= ~(7 << g->intr_target_bit); ++ val |= g->intr_target_kpss_val << g->intr_target_bit; ++ writel(val, pctrl->regs + g->intr_target_reg); ++ } else { ++ const __be32 *reg = of_get_property(pctrl->dev->of_node, "reg", NULL); ++ if (reg) { ++ u32 addr = be32_to_cpup(reg) + g->intr_target_reg; ++ val = qcom_scm_pinmux_read(addr); ++ __iormb(); ++ ++ val &= ~(7 << g->intr_target_bit); ++ val |= g->intr_target_kpss_val << g->intr_target_bit; ++ ++ __iowmb(); ++ ret = qcom_scm_pinmux_write(addr, val); ++ if (ret) ++ pr_err("\n Routing interrupts to Apps proc failed"); ++ } ++ } + + /* Update configuration for gpio. + * RAW_STATUS_EN is left on for all gpio irqs. Due to the +@@ -975,4 +998,3 @@ int msm_pinctrl_remove(struct platform_d + return 0; + } + EXPORT_SYMBOL(msm_pinctrl_remove); +- +--- a/include/linux/qcom_scm.h ++++ b/include/linux/qcom_scm.h +@@ -43,6 +43,8 @@ extern int qcom_scm_set_remote_state(u32 + extern int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare); + extern int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size); + extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare); ++extern s32 qcom_scm_pinmux_read(u32 arg1); ++extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2); + #else + static inline + int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) +@@ -73,5 +75,7 @@ qcom_scm_set_remote_state(u32 state,u32 + static inline int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) { return -ENODEV; } + static inline int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) { return -ENODEV; } + static inline int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) { return -ENODEV; } ++extern s32 qcom_scm_pinmux_read(u32 arg1) { return -ENODEV; } ++extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2) { return -ENODEV; } + #endif + #endif diff --git a/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch b/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch new file mode 100644 index 0000000000..ee410ca6fa --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch @@ -0,0 +1,71 @@ +From a86bda9f8a7965f0cedd347a9c04800eb9f41ea3 Mon Sep 17 00:00:00 2001 +From: Vasudevan Murugesan +Date: Tue, 21 Jul 2015 10:22:38 +0530 +Subject: ipq806x: usb: Control USB master reset + +During removal of the glue layer(dwc3-of-simple), +USB master reset is set to active and during insertion +it is de-activated. + +Change-Id: I537dc810f6cb2a46664ee674840145066432b957 +Signed-off-by: Vasudevan Murugesan +(cherry picked from commit 4611e13580a216812f85f0801b95442d02eeb836) +--- + drivers/usb/dwc3/dwc3-of-simple.c | 22 ++++++++++++++++++++++ + 1 file changed, 12 insertions(+) + +(limited to 'drivers/usb/dwc3/dwc3-of-simple.c') + +--- a/drivers/usb/dwc3/dwc3-of-simple.c ++++ b/drivers/usb/dwc3/dwc3-of-simple.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -33,6 +34,8 @@ struct dwc3_of_simple { + struct device *dev; + struct clk **clks; + int num_clocks; ++ struct reset_control *mstr_rst_30_0; ++ struct reset_control *mstr_rst_30_1; + }; + + static int dwc3_of_simple_clk_init(struct dwc3_of_simple *simple, int count) +@@ -102,6 +105,20 @@ static int dwc3_of_simple_probe(struct p + if (ret) + return ret; + ++ simple->mstr_rst_30_0 = devm_reset_control_get(dev, "usb30_0_mstr_rst"); ++ ++ if (!IS_ERR(simple->mstr_rst_30_0)) ++ reset_control_deassert(simple->mstr_rst_30_0); ++ else ++ dev_dbg(simple->dev, "cannot get handle for USB PHY 0 master reset control\n"); ++ ++ simple->mstr_rst_30_1 = devm_reset_control_get(dev, "usb30_1_mstr_rst"); ++ ++ if (!IS_ERR(simple->mstr_rst_30_1)) ++ reset_control_deassert(simple->mstr_rst_30_1); ++ else ++ dev_dbg(simple->dev, "cannot get handle for USB PHY 1 master reset control\n"); ++ + ret = of_platform_populate(np, NULL, NULL, dev); + if (ret) { + for (i = 0; i < simple->num_clocks; i++) { +@@ -130,6 +147,12 @@ static int dwc3_of_simple_remove(struct + clk_put(simple->clks[i]); + } + ++ if (!IS_ERR(simple->mstr_rst_30_0)) ++ reset_control_assert(simple->mstr_rst_30_0); ++ ++ if (!IS_ERR(simple->mstr_rst_30_1)) ++ reset_control_assert(simple->mstr_rst_30_1); ++ + of_platform_depopulate(dev); + + pm_runtime_disable(dev); diff --git a/target/linux/ipq806x/patches-4.19/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch b/target/linux/ipq806x/patches-4.19/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch new file mode 100644 index 0000000000..2867239d1c --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch @@ -0,0 +1,50 @@ +From a3488aa9bed37c56e405967d44e821c484b5d6b9 Mon Sep 17 00:00:00 2001 +From: Ram Chandra Jangir +Date: Fri, 28 Sep 2018 15:19:50 +0530 +Subject: [PATCH] ipq8064: pinctrl: Fixed missing RGMII pincontrol definitions + +Signed-off-by: Ram Chandra Jangir +--- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/pinctrl/qcom/pinctrl-ipq8064.c ++++ b/drivers/pinctrl/qcom/pinctrl-ipq8064.c +@@ -308,7 +308,7 @@ static const char * const gpio_groups[] + }; + + static const char * const mdio_groups[] = { +- "gpio0", "gpio1", "gpio10", "gpio11", ++ "gpio0", "gpio1", "gpio2", "gpio10", "gpio11", "gpio66", + }; + + static const char * const mi2s_groups[] = { +@@ -412,8 +412,8 @@ static const char * const usb2_hsic_grou + }; + + static const char * const rgmii2_groups[] = { +- "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", +- "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62", ++ "gpio2", "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", ++ "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62", "gpio66", + }; + + static const char * const sata_groups[] = { +@@ -548,7 +548,7 @@ static const struct msm_function ipq8064 + static const struct msm_pingroup ipq8064_groups[] = { + PINGROUP(0, mdio, NA, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(1, mdio, NA, NA, NA, NA, NA, NA, NA, NA, NA), +- PINGROUP(2, gsbi5_spi_cs3, NA, NA, NA, NA, NA, NA, NA, NA, NA), ++ PINGROUP(2, gsbi5_spi_cs3, rgmii2, mdio, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(3, pcie1_rst, pcie1_prsnt, pdm, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(4, pcie1_pwren_n, pcie1_pwren, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(5, pcie1_clk_req, pcie1_pwrflt, NA, NA, NA, NA, NA, NA, NA, NA), +@@ -612,7 +612,7 @@ static const struct msm_pingroup ipq8064 + PINGROUP(63, pcie3_rst, NA, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(64, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(65, pcie3_clk_req, NA, NA, NA, NA, NA, NA, NA, NA, NA), +- PINGROUP(66, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), ++ PINGROUP(66, rgmii2, mdio, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(67, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(68, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA), + SDC_PINGROUP(sdc3_clk, 0x204a, 14, 6), diff --git a/target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch b/target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch new file mode 100644 index 0000000000..1c903bbc3b --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch @@ -0,0 +1,22 @@ +Subject: mtd: spi-nor: add mx25l25635f with SECT_4K + +This patch fixes an issue with the creation of the +ubi volume on the AVM FRITZ!Box 4040. The mx25l25635f +and mx25l25635e support SECT_4K which will set the +erase size to 4K. This is used by ubi to calculate +VID header offsets. Without this, uboot and linux +disagrees about the layout and refuse to attach +the ubi volume created by the other. + +--- +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -1031,7 +1031,7 @@ static const struct flash_info spi_nor_i + { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, + { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, + { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, +- { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SECT_4K) }, + { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) }, + { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, + { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, diff --git a/target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch b/target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch new file mode 100644 index 0000000000..cd9fd895c5 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch @@ -0,0 +1,11026 @@ +From: Christian Lamparter +Subject: BUS: add MSM_BUS +--- a/drivers/bus/Makefile ++++ b/drivers/bus/Makefile +@@ -11,6 +11,7 @@ obj-$(CONFIG_BRCMSTB_GISB_ARB) += brcmst + obj-$(CONFIG_IMX_WEIM) += imx-weim.o + obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o + obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o ++obj-$(CONFIG_BUS_TOPOLOGY_ADHOC)+= msm_bus/ + + # Interconnect bus driver for OMAP SoCs. + obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o +--- a/drivers/bus/Kconfig ++++ b/drivers/bus/Kconfig +@@ -93,6 +93,8 @@ config MVEBU_MBUS + Driver needed for the MBus configuration on Marvell EBU SoCs + (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP). + ++source "drivers/bus/msm_bus/Kconfig" ++ + config OMAP_INTERCONNECT + tristate "OMAP INTERCONNECT DRIVER" + depends on ARCH_OMAP2PLUS +--- /dev/null ++++ b/include/dt-bindings/msm/msm-bus-ids.h +@@ -0,0 +1,869 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef __MSM_BUS_IDS_H ++#define __MSM_BUS_IDS_H ++ ++/* Topology related enums */ ++#define MSM_BUS_FAB_DEFAULT 0 ++#define MSM_BUS_FAB_APPSS 0 ++#define MSM_BUS_FAB_SYSTEM 1024 ++#define MSM_BUS_FAB_MMSS 2048 ++#define MSM_BUS_FAB_SYSTEM_FPB 3072 ++#define MSM_BUS_FAB_CPSS_FPB 4096 ++ ++#define MSM_BUS_FAB_BIMC 0 ++#define MSM_BUS_FAB_SYS_NOC 1024 ++#define MSM_BUS_FAB_MMSS_NOC 2048 ++#define MSM_BUS_FAB_OCMEM_NOC 3072 ++#define MSM_BUS_FAB_PERIPH_NOC 4096 ++#define MSM_BUS_FAB_CONFIG_NOC 5120 ++#define MSM_BUS_FAB_OCMEM_VNOC 6144 ++#define MSM_BUS_FAB_MMSS_AHB 2049 ++#define MSM_BUS_FAB_A0_NOC 6145 ++#define MSM_BUS_FAB_A1_NOC 6146 ++#define MSM_BUS_FAB_A2_NOC 6147 ++ ++#define MSM_BUS_MASTER_FIRST 1 ++#define MSM_BUS_MASTER_AMPSS_M0 1 ++#define MSM_BUS_MASTER_AMPSS_M1 2 ++#define MSM_BUS_APPSS_MASTER_FAB_MMSS 3 ++#define MSM_BUS_APPSS_MASTER_FAB_SYSTEM 4 ++#define MSM_BUS_SYSTEM_MASTER_FAB_APPSS 5 ++#define MSM_BUS_MASTER_SPS 6 ++#define MSM_BUS_MASTER_ADM_PORT0 7 ++#define MSM_BUS_MASTER_ADM_PORT1 8 ++#define MSM_BUS_SYSTEM_MASTER_ADM1_PORT0 9 ++#define MSM_BUS_MASTER_ADM1_PORT1 10 ++#define MSM_BUS_MASTER_LPASS_PROC 11 ++#define MSM_BUS_MASTER_MSS_PROCI 12 ++#define MSM_BUS_MASTER_MSS_PROCD 13 ++#define MSM_BUS_MASTER_MSS_MDM_PORT0 14 ++#define MSM_BUS_MASTER_LPASS 15 ++#define MSM_BUS_SYSTEM_MASTER_CPSS_FPB 16 ++#define MSM_BUS_SYSTEM_MASTER_SYSTEM_FPB 17 ++#define MSM_BUS_SYSTEM_MASTER_MMSS_FPB 18 ++#define MSM_BUS_MASTER_ADM1_CI 19 ++#define MSM_BUS_MASTER_ADM0_CI 20 ++#define MSM_BUS_MASTER_MSS_MDM_PORT1 21 ++#define MSM_BUS_MASTER_MDP_PORT0 22 ++#define MSM_BUS_MASTER_MDP_PORT1 23 ++#define MSM_BUS_MMSS_MASTER_ADM1_PORT0 24 ++#define MSM_BUS_MASTER_ROTATOR 25 ++#define MSM_BUS_MASTER_GRAPHICS_3D 26 ++#define MSM_BUS_MASTER_JPEG_DEC 27 ++#define MSM_BUS_MASTER_GRAPHICS_2D_CORE0 28 ++#define MSM_BUS_MASTER_VFE 29 ++#define MSM_BUS_MASTER_VPE 30 ++#define MSM_BUS_MASTER_JPEG_ENC 31 ++#define MSM_BUS_MASTER_GRAPHICS_2D_CORE1 32 ++#define MSM_BUS_MMSS_MASTER_APPS_FAB 33 ++#define MSM_BUS_MASTER_HD_CODEC_PORT0 34 ++#define MSM_BUS_MASTER_HD_CODEC_PORT1 35 ++#define MSM_BUS_MASTER_SPDM 36 ++#define MSM_BUS_MASTER_RPM 37 ++#define MSM_BUS_MASTER_MSS 38 ++#define MSM_BUS_MASTER_RIVA 39 ++#define MSM_BUS_MASTER_SNOC_VMEM 40 ++#define MSM_BUS_MASTER_MSS_SW_PROC 41 ++#define MSM_BUS_MASTER_MSS_FW_PROC 42 ++#define MSM_BUS_MASTER_HMSS 43 ++#define MSM_BUS_MASTER_GSS_NAV 44 ++#define MSM_BUS_MASTER_PCIE 45 ++#define MSM_BUS_MASTER_SATA 46 ++#define MSM_BUS_MASTER_CRYPTO 47 ++#define MSM_BUS_MASTER_VIDEO_CAP 48 ++#define MSM_BUS_MASTER_GRAPHICS_3D_PORT1 49 ++#define MSM_BUS_MASTER_VIDEO_ENC 50 ++#define MSM_BUS_MASTER_VIDEO_DEC 51 ++#define MSM_BUS_MASTER_LPASS_AHB 52 ++#define MSM_BUS_MASTER_QDSS_BAM 53 ++#define MSM_BUS_MASTER_SNOC_CFG 54 ++#define MSM_BUS_MASTER_CRYPTO_CORE0 55 ++#define MSM_BUS_MASTER_CRYPTO_CORE1 56 ++#define MSM_BUS_MASTER_MSS_NAV 57 ++#define MSM_BUS_MASTER_OCMEM_DMA 58 ++#define MSM_BUS_MASTER_WCSS 59 ++#define MSM_BUS_MASTER_QDSS_ETR 60 ++#define MSM_BUS_MASTER_USB3 61 ++#define MSM_BUS_MASTER_JPEG 62 ++#define MSM_BUS_MASTER_VIDEO_P0 63 ++#define MSM_BUS_MASTER_VIDEO_P1 64 ++#define MSM_BUS_MASTER_MSS_PROC 65 ++#define MSM_BUS_MASTER_JPEG_OCMEM 66 ++#define MSM_BUS_MASTER_MDP_OCMEM 67 ++#define MSM_BUS_MASTER_VIDEO_P0_OCMEM 68 ++#define MSM_BUS_MASTER_VIDEO_P1_OCMEM 69 ++#define MSM_BUS_MASTER_VFE_OCMEM 70 ++#define MSM_BUS_MASTER_CNOC_ONOC_CFG 71 ++#define MSM_BUS_MASTER_RPM_INST 72 ++#define MSM_BUS_MASTER_RPM_DATA 73 ++#define MSM_BUS_MASTER_RPM_SYS 74 ++#define MSM_BUS_MASTER_DEHR 75 ++#define MSM_BUS_MASTER_QDSS_DAP 76 ++#define MSM_BUS_MASTER_TIC 77 ++#define MSM_BUS_MASTER_SDCC_1 78 ++#define MSM_BUS_MASTER_SDCC_3 79 ++#define MSM_BUS_MASTER_SDCC_4 80 ++#define MSM_BUS_MASTER_SDCC_2 81 ++#define MSM_BUS_MASTER_TSIF 82 ++#define MSM_BUS_MASTER_BAM_DMA 83 ++#define MSM_BUS_MASTER_BLSP_2 84 ++#define MSM_BUS_MASTER_USB_HSIC 85 ++#define MSM_BUS_MASTER_BLSP_1 86 ++#define MSM_BUS_MASTER_USB_HS 87 ++#define MSM_BUS_MASTER_PNOC_CFG 88 ++#define MSM_BUS_MASTER_V_OCMEM_GFX3D 89 ++#define MSM_BUS_MASTER_IPA 90 ++#define MSM_BUS_MASTER_QPIC 91 ++#define MSM_BUS_MASTER_MDPE 92 ++#define MSM_BUS_MASTER_USB_HS2 93 ++#define MSM_BUS_MASTER_VPU 94 ++#define MSM_BUS_MASTER_UFS 95 ++#define MSM_BUS_MASTER_BCAST 96 ++#define MSM_BUS_MASTER_CRYPTO_CORE2 97 ++#define MSM_BUS_MASTER_EMAC 98 ++#define MSM_BUS_MASTER_VPU_1 99 ++#define MSM_BUS_MASTER_PCIE_1 100 ++#define MSM_BUS_MASTER_USB3_1 101 ++#define MSM_BUS_MASTER_CNOC_MNOC_MMSS_CFG 102 ++#define MSM_BUS_MASTER_CNOC_MNOC_CFG 103 ++#define MSM_BUS_MASTER_TCU_0 104 ++#define MSM_BUS_MASTER_TCU_1 105 ++#define MSM_BUS_MASTER_CPP 106 ++#define MSM_BUS_MASTER_AUDIO 107 ++#define MSM_BUS_MASTER_PCIE_2 108 ++#define MSM_BUS_MASTER_BLSP_BAM 109 ++#define MSM_BUS_MASTER_USB2_BAM 110 ++#define MSM_BUS_MASTER_ADDS_DMA0 111 ++#define MSM_BUS_MASTER_ADDS_DMA1 112 ++#define MSM_BUS_MASTER_ADDS_DMA2 113 ++#define MSM_BUS_MASTER_ADDS_DMA3 114 ++#define MSM_BUS_MASTER_QPIC_BAM 115 ++#define MSM_BUS_MASTER_SDCC_BAM 116 ++#define MSM_BUS_MASTER_DDRC_SNOC 117 ++#define MSM_BUS_MASTER_WSS_0 118 ++#define MSM_BUS_MASTER_WSS_1 119 ++#define MSM_BUS_MASTER_ESS 120 ++#define MSM_BUS_MASTER_QDSS_BAMNDP 121 ++#define MSM_BUS_MASTER_QDSS_SNOC_CFG 122 ++#define MSM_BUS_MASTER_LAST 130 ++ ++#define MSM_BUS_SYSTEM_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_SYSTEM_FPB ++#define MSM_BUS_CPSS_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_CPSS_FPB ++ ++#define MSM_BUS_SNOC_MM_INT_0 10000 ++#define MSM_BUS_SNOC_MM_INT_1 10001 ++#define MSM_BUS_SNOC_MM_INT_2 10002 ++#define MSM_BUS_SNOC_MM_INT_BIMC 10003 ++#define MSM_BUS_SNOC_INT_0 10004 ++#define MSM_BUS_SNOC_INT_1 10005 ++#define MSM_BUS_SNOC_INT_BIMC 10006 ++#define MSM_BUS_SNOC_BIMC_0_MAS 10007 ++#define MSM_BUS_SNOC_BIMC_1_MAS 10008 ++#define MSM_BUS_SNOC_QDSS_INT 10009 ++#define MSM_BUS_PNOC_SNOC_MAS 10010 ++#define MSM_BUS_PNOC_SNOC_SLV 10011 ++#define MSM_BUS_PNOC_INT_0 10012 ++#define MSM_BUS_PNOC_INT_1 10013 ++#define MSM_BUS_PNOC_M_0 10014 ++#define MSM_BUS_PNOC_M_1 10015 ++#define MSM_BUS_BIMC_SNOC_MAS 10016 ++#define MSM_BUS_BIMC_SNOC_SLV 10017 ++#define MSM_BUS_PNOC_SLV_0 10018 ++#define MSM_BUS_PNOC_SLV_1 10019 ++#define MSM_BUS_PNOC_SLV_2 10020 ++#define MSM_BUS_PNOC_SLV_3 10021 ++#define MSM_BUS_PNOC_SLV_4 10022 ++#define MSM_BUS_PNOC_SLV_8 10023 ++#define MSM_BUS_PNOC_SLV_9 10024 ++#define MSM_BUS_SNOC_BIMC_0_SLV 10025 ++#define MSM_BUS_SNOC_BIMC_1_SLV 10026 ++#define MSM_BUS_MNOC_BIMC_MAS 10027 ++#define MSM_BUS_MNOC_BIMC_SLV 10028 ++#define MSM_BUS_BIMC_MNOC_MAS 10029 ++#define MSM_BUS_BIMC_MNOC_SLV 10030 ++#define MSM_BUS_SNOC_BIMC_MAS 10031 ++#define MSM_BUS_SNOC_BIMC_SLV 10032 ++#define MSM_BUS_CNOC_SNOC_MAS 10033 ++#define MSM_BUS_CNOC_SNOC_SLV 10034 ++#define MSM_BUS_SNOC_CNOC_MAS 10035 ++#define MSM_BUS_SNOC_CNOC_SLV 10036 ++#define MSM_BUS_OVNOC_SNOC_MAS 10037 ++#define MSM_BUS_OVNOC_SNOC_SLV 10038 ++#define MSM_BUS_SNOC_OVNOC_MAS 10039 ++#define MSM_BUS_SNOC_OVNOC_SLV 10040 ++#define MSM_BUS_SNOC_PNOC_MAS 10041 ++#define MSM_BUS_SNOC_PNOC_SLV 10042 ++#define MSM_BUS_BIMC_INT_APPS_EBI 10043 ++#define MSM_BUS_BIMC_INT_APPS_SNOC 10044 ++#define MSM_BUS_SNOC_BIMC_2_MAS 10045 ++#define MSM_BUS_SNOC_BIMC_2_SLV 10046 ++#define MSM_BUS_PNOC_SLV_5 10047 ++#define MSM_BUS_PNOC_SLV_6 10048 ++#define MSM_BUS_PNOC_INT_2 10049 ++#define MSM_BUS_PNOC_INT_3 10050 ++#define MSM_BUS_PNOC_INT_4 10051 ++#define MSM_BUS_PNOC_INT_5 10052 ++#define MSM_BUS_PNOC_INT_6 10053 ++#define MSM_BUS_PNOC_INT_7 10054 ++#define MSM_BUS_BIMC_SNOC_1_MAS 10055 ++#define MSM_BUS_BIMC_SNOC_1_SLV 10056 ++#define MSM_BUS_PNOC_A1NOC_MAS 10057 ++#define MSM_BUS_PNOC_A1NOC_SLV 10058 ++#define MSM_BUS_CNOC_A1NOC_MAS 10059 ++#define MSM_BUS_A0NOC_SNOC_MAS 10060 ++#define MSM_BUS_A0NOC_SNOC_SLV 10061 ++#define MSM_BUS_A1NOC_SNOC_SLV 10062 ++#define MSM_BUS_A1NOC_SNOC_MAS 10063 ++#define MSM_BUS_A2NOC_SNOC_MAS 10064 ++#define MSM_BUS_A2NOC_SNOC_SLV 10065 ++#define MSM_BUS_PNOC_SLV_7 10066 ++#define MSM_BUS_INT_LAST 10067 ++ ++#define MSM_BUS_SLAVE_FIRST 512 ++#define MSM_BUS_SLAVE_EBI_CH0 512 ++#define MSM_BUS_SLAVE_EBI_CH1 513 ++#define MSM_BUS_SLAVE_AMPSS_L2 514 ++#define MSM_BUS_APPSS_SLAVE_FAB_MMSS 515 ++#define MSM_BUS_APPSS_SLAVE_FAB_SYSTEM 516 ++#define MSM_BUS_SYSTEM_SLAVE_FAB_APPS 517 ++#define MSM_BUS_SLAVE_SPS 518 ++#define MSM_BUS_SLAVE_SYSTEM_IMEM 519 ++#define MSM_BUS_SLAVE_AMPSS 520 ++#define MSM_BUS_SLAVE_MSS 521 ++#define MSM_BUS_SLAVE_LPASS 522 ++#define MSM_BUS_SYSTEM_SLAVE_CPSS_FPB 523 ++#define MSM_BUS_SYSTEM_SLAVE_SYSTEM_FPB 524 ++#define MSM_BUS_SYSTEM_SLAVE_MMSS_FPB 525 ++#define MSM_BUS_SLAVE_CORESIGHT 526 ++#define MSM_BUS_SLAVE_RIVA 527 ++#define MSM_BUS_SLAVE_SMI 528 ++#define MSM_BUS_MMSS_SLAVE_FAB_APPS 529 ++#define MSM_BUS_MMSS_SLAVE_FAB_APPS_1 530 ++#define MSM_BUS_SLAVE_MM_IMEM 531 ++#define MSM_BUS_SLAVE_CRYPTO 532 ++#define MSM_BUS_SLAVE_SPDM 533 ++#define MSM_BUS_SLAVE_RPM 534 ++#define MSM_BUS_SLAVE_RPM_MSG_RAM 535 ++#define MSM_BUS_SLAVE_MPM 536 ++#define MSM_BUS_SLAVE_PMIC1_SSBI1_A 537 ++#define MSM_BUS_SLAVE_PMIC1_SSBI1_B 538 ++#define MSM_BUS_SLAVE_PMIC1_SSBI1_C 539 ++#define MSM_BUS_SLAVE_PMIC2_SSBI2_A 540 ++#define MSM_BUS_SLAVE_PMIC2_SSBI2_B 541 ++#define MSM_BUS_SLAVE_GSBI1_UART 542 ++#define MSM_BUS_SLAVE_GSBI2_UART 543 ++#define MSM_BUS_SLAVE_GSBI3_UART 544 ++#define MSM_BUS_SLAVE_GSBI4_UART 545 ++#define MSM_BUS_SLAVE_GSBI5_UART 546 ++#define MSM_BUS_SLAVE_GSBI6_UART 547 ++#define MSM_BUS_SLAVE_GSBI7_UART 548 ++#define MSM_BUS_SLAVE_GSBI8_UART 549 ++#define MSM_BUS_SLAVE_GSBI9_UART 550 ++#define MSM_BUS_SLAVE_GSBI10_UART 551 ++#define MSM_BUS_SLAVE_GSBI11_UART 552 ++#define MSM_BUS_SLAVE_GSBI12_UART 553 ++#define MSM_BUS_SLAVE_GSBI1_QUP 554 ++#define MSM_BUS_SLAVE_GSBI2_QUP 555 ++#define MSM_BUS_SLAVE_GSBI3_QUP 556 ++#define MSM_BUS_SLAVE_GSBI4_QUP 557 ++#define MSM_BUS_SLAVE_GSBI5_QUP 558 ++#define MSM_BUS_SLAVE_GSBI6_QUP 559 ++#define MSM_BUS_SLAVE_GSBI7_QUP 560 ++#define MSM_BUS_SLAVE_GSBI8_QUP 561 ++#define MSM_BUS_SLAVE_GSBI9_QUP 562 ++#define MSM_BUS_SLAVE_GSBI10_QUP 563 ++#define MSM_BUS_SLAVE_GSBI11_QUP 564 ++#define MSM_BUS_SLAVE_GSBI12_QUP 565 ++#define MSM_BUS_SLAVE_EBI2_NAND 566 ++#define MSM_BUS_SLAVE_EBI2_CS0 567 ++#define MSM_BUS_SLAVE_EBI2_CS1 568 ++#define MSM_BUS_SLAVE_EBI2_CS2 569 ++#define MSM_BUS_SLAVE_EBI2_CS3 570 ++#define MSM_BUS_SLAVE_EBI2_CS4 571 ++#define MSM_BUS_SLAVE_EBI2_CS5 572 ++#define MSM_BUS_SLAVE_USB_FS1 573 ++#define MSM_BUS_SLAVE_USB_FS2 574 ++#define MSM_BUS_SLAVE_TSIF 575 ++#define MSM_BUS_SLAVE_MSM_TSSC 576 ++#define MSM_BUS_SLAVE_MSM_PDM 577 ++#define MSM_BUS_SLAVE_MSM_DIMEM 578 ++#define MSM_BUS_SLAVE_MSM_TCSR 579 ++#define MSM_BUS_SLAVE_MSM_PRNG 580 ++#define MSM_BUS_SLAVE_GSS 581 ++#define MSM_BUS_SLAVE_SATA 582 ++#define MSM_BUS_SLAVE_USB3 583 ++#define MSM_BUS_SLAVE_WCSS 584 ++#define MSM_BUS_SLAVE_OCIMEM 585 ++#define MSM_BUS_SLAVE_SNOC_OCMEM 586 ++#define MSM_BUS_SLAVE_SERVICE_SNOC 587 ++#define MSM_BUS_SLAVE_QDSS_STM 588 ++#define MSM_BUS_SLAVE_CAMERA_CFG 589 ++#define MSM_BUS_SLAVE_DISPLAY_CFG 590 ++#define MSM_BUS_SLAVE_OCMEM_CFG 591 ++#define MSM_BUS_SLAVE_CPR_CFG 592 ++#define MSM_BUS_SLAVE_CPR_XPU_CFG 593 ++#define MSM_BUS_SLAVE_MISC_CFG 594 ++#define MSM_BUS_SLAVE_MISC_XPU_CFG 595 ++#define MSM_BUS_SLAVE_VENUS_CFG 596 ++#define MSM_BUS_SLAVE_MISC_VENUS_CFG 597 ++#define MSM_BUS_SLAVE_GRAPHICS_3D_CFG 598 ++#define MSM_BUS_SLAVE_MMSS_CLK_CFG 599 ++#define MSM_BUS_SLAVE_MMSS_CLK_XPU_CFG 600 ++#define MSM_BUS_SLAVE_MNOC_MPU_CFG 601 ++#define MSM_BUS_SLAVE_ONOC_MPU_CFG 602 ++#define MSM_BUS_SLAVE_SERVICE_MNOC 603 ++#define MSM_BUS_SLAVE_OCMEM 604 ++#define MSM_BUS_SLAVE_SERVICE_ONOC 605 ++#define MSM_BUS_SLAVE_SDCC_1 606 ++#define MSM_BUS_SLAVE_SDCC_3 607 ++#define MSM_BUS_SLAVE_SDCC_2 608 ++#define MSM_BUS_SLAVE_SDCC_4 609 ++#define MSM_BUS_SLAVE_BAM_DMA 610 ++#define MSM_BUS_SLAVE_BLSP_2 611 ++#define MSM_BUS_SLAVE_USB_HSIC 612 ++#define MSM_BUS_SLAVE_BLSP_1 613 ++#define MSM_BUS_SLAVE_USB_HS 614 ++#define MSM_BUS_SLAVE_PDM 615 ++#define MSM_BUS_SLAVE_PERIPH_APU_CFG 616 ++#define MSM_BUS_SLAVE_PNOC_MPU_CFG 617 ++#define MSM_BUS_SLAVE_PRNG 618 ++#define MSM_BUS_SLAVE_SERVICE_PNOC 619 ++#define MSM_BUS_SLAVE_CLK_CTL 620 ++#define MSM_BUS_SLAVE_CNOC_MSS 621 ++#define MSM_BUS_SLAVE_SECURITY 622 ++#define MSM_BUS_SLAVE_TCSR 623 ++#define MSM_BUS_SLAVE_TLMM 624 ++#define MSM_BUS_SLAVE_CRYPTO_0_CFG 625 ++#define MSM_BUS_SLAVE_CRYPTO_1_CFG 626 ++#define MSM_BUS_SLAVE_IMEM_CFG 627 ++#define MSM_BUS_SLAVE_MESSAGE_RAM 628 ++#define MSM_BUS_SLAVE_BIMC_CFG 629 ++#define MSM_BUS_SLAVE_BOOT_ROM 630 ++#define MSM_BUS_SLAVE_CNOC_MNOC_MMSS_CFG 631 ++#define MSM_BUS_SLAVE_PMIC_ARB 632 ++#define MSM_BUS_SLAVE_SPDM_WRAPPER 633 ++#define MSM_BUS_SLAVE_DEHR_CFG 634 ++#define MSM_BUS_SLAVE_QDSS_CFG 635 ++#define MSM_BUS_SLAVE_RBCPR_CFG 636 ++#define MSM_BUS_SLAVE_RBCPR_QDSS_APU_CFG 637 ++#define MSM_BUS_SLAVE_SNOC_MPU_CFG 638 ++#define MSM_BUS_SLAVE_CNOC_ONOC_CFG 639 ++#define MSM_BUS_SLAVE_CNOC_MNOC_CFG 640 ++#define MSM_BUS_SLAVE_PNOC_CFG 641 ++#define MSM_BUS_SLAVE_SNOC_CFG 642 ++#define MSM_BUS_SLAVE_EBI1_DLL_CFG 643 ++#define MSM_BUS_SLAVE_PHY_APU_CFG 644 ++#define MSM_BUS_SLAVE_EBI1_PHY_CFG 645 ++#define MSM_BUS_SLAVE_SERVICE_CNOC 646 ++#define MSM_BUS_SLAVE_IPS_CFG 647 ++#define MSM_BUS_SLAVE_QPIC 648 ++#define MSM_BUS_SLAVE_DSI_CFG 649 ++#define MSM_BUS_SLAVE_UFS_CFG 650 ++#define MSM_BUS_SLAVE_RBCPR_CX_CFG 651 ++#define MSM_BUS_SLAVE_RBCPR_MX_CFG 652 ++#define MSM_BUS_SLAVE_PCIE_CFG 653 ++#define MSM_BUS_SLAVE_USB_PHYS_CFG 654 ++#define MSM_BUS_SLAVE_VIDEO_CAP_CFG 655 ++#define MSM_BUS_SLAVE_AVSYNC_CFG 656 ++#define MSM_BUS_SLAVE_CRYPTO_2_CFG 657 ++#define MSM_BUS_SLAVE_VPU_CFG 658 ++#define MSM_BUS_SLAVE_BCAST_CFG 659 ++#define MSM_BUS_SLAVE_KLM_CFG 660 ++#define MSM_BUS_SLAVE_GENI_IR_CFG 661 ++#define MSM_BUS_SLAVE_OCMEM_GFX 662 ++#define MSM_BUS_SLAVE_CATS_128 663 ++#define MSM_BUS_SLAVE_OCMEM_64 664 ++#define MSM_BUS_SLAVE_PCIE_0 665 ++#define MSM_BUS_SLAVE_PCIE_1 666 ++#define MSM_BUS_SLAVE_PCIE_0_CFG 667 ++#define MSM_BUS_SLAVE_PCIE_1_CFG 668 ++#define MSM_BUS_SLAVE_SRVC_MNOC 669 ++#define MSM_BUS_SLAVE_USB_HS2 670 ++#define MSM_BUS_SLAVE_AUDIO 671 ++#define MSM_BUS_SLAVE_TCU 672 ++#define MSM_BUS_SLAVE_APPSS 673 ++#define MSM_BUS_SLAVE_PCIE_PARF 674 ++#define MSM_BUS_SLAVE_USB3_PHY_CFG 675 ++#define MSM_BUS_SLAVE_IPA_CFG 676 ++#define MSM_BUS_SLAVE_A0NOC_SNOC 677 ++#define MSM_BUS_SLAVE_A1NOC_SNOC 678 ++#define MSM_BUS_SLAVE_A2NOC_SNOC 679 ++#define MSM_BUS_SLAVE_HMSS_L3 680 ++#define MSM_BUS_SLAVE_PIMEM_CFG 681 ++#define MSM_BUS_SLAVE_DCC_CFG 682 ++#define MSM_BUS_SLAVE_QDSS_RBCPR_APU_CFG 683 ++#define MSM_BUS_SLAVE_PCIE_2_CFG 684 ++#define MSM_BUS_SLAVE_PCIE20_AHB2PHY 685 ++#define MSM_BUS_SLAVE_A0NOC_CFG 686 ++#define MSM_BUS_SLAVE_A1NOC_CFG 687 ++#define MSM_BUS_SLAVE_A2NOC_CFG 688 ++#define MSM_BUS_SLAVE_A1NOC_MPU_CFG 689 ++#define MSM_BUS_SLAVE_A2NOC_MPU_CFG 690 ++#define MSM_BUS_SLAVE_A0NOC_SMMU_CFG 691 ++#define MSM_BUS_SLAVE_A1NOC_SMMU_CFG 692 ++#define MSM_BUS_SLAVE_A2NOC_SMMU_CFG 693 ++#define MSM_BUS_SLAVE_LPASS_SMMU_CFG 694 ++#define MSM_BUS_SLAVE_MMAGIC_CFG 695 ++#define MSM_BUS_SLAVE_VENUS_THROTTLE_CFG 696 ++#define MSM_BUS_SLAVE_SSC_CFG 697 ++#define MSM_BUS_SLAVE_DSA_CFG 698 ++#define MSM_BUS_SLAVE_DSA_MPU_CFG 699 ++#define MSM_BUS_SLAVE_DISPLAY_THROTTLE_CFG 700 ++#define MSM_BUS_SLAVE_SMMU_CPP_CFG 701 ++#define MSM_BUS_SLAVE_SMMU_JPEG_CFG 702 ++#define MSM_BUS_SLAVE_SMMU_MDP_CFG 703 ++#define MSM_BUS_SLAVE_SMMU_ROTATOR_CFG 704 ++#define MSM_BUS_SLAVE_SMMU_VENUS_CFG 705 ++#define MSM_BUS_SLAVE_SMMU_VFE_CFG 706 ++#define MSM_BUS_SLAVE_A0NOC_MPU_CFG 707 ++#define MSM_BUS_SLAVE_VMEM_CFG 708 ++#define MSM_BUS_SLAVE_CAMERA_THROTTLE_CFG 700 ++#define MSM_BUS_SLAVE_VMEM 709 ++#define MSM_BUS_SLAVE_AHB2PHY 710 ++#define MSM_BUS_SLAVE_PIMEM 711 ++#define MSM_BUS_SLAVE_SNOC_VMEM 712 ++#define MSM_BUS_SLAVE_PCIE_2 713 ++#define MSM_BUS_SLAVE_RBCPR_MX 714 ++#define MSM_BUS_SLAVE_RBCPR_CX 715 ++#define MSM_BUS_SLAVE_PRNG_APU_CFG 716 ++#define MSM_BUS_SLAVE_PERIPH_MPU_CFG 717 ++#define MSM_BUS_SLAVE_GCNT 718 ++#define MSM_BUS_SLAVE_ADSS_CFG 719 ++#define MSM_BUS_SLAVE_ADSS_VMIDMT_CFG 720 ++#define MSM_BUS_SLAVE_QHSS_APU_CFG 721 ++#define MSM_BUS_SLAVE_MDIO 722 ++#define MSM_BUS_SLAVE_FEPHY_CFG 723 ++#define MSM_BUS_SLAVE_SRIF 724 ++#define MSM_BUS_SLAVE_LAST 730 ++#define MSM_BUS_SLAVE_DDRC_CFG 731 ++#define MSM_BUS_SLAVE_DDRC_APU_CFG 732 ++#define MSM_BUS_SLAVE_MPU0_CFG 733 ++#define MSM_BUS_SLAVE_MPU1_CFG 734 ++#define MSM_BUS_SLAVE_MPU2_CFG 734 ++#define MSM_BUS_SLAVE_ESS_VMIDMT_CFG 735 ++#define MSM_BUS_SLAVE_ESS_APU_CFG 736 ++#define MSM_BUS_SLAVE_USB2_CFG 737 ++#define MSM_BUS_SLAVE_BLSP_CFG 738 ++#define MSM_BUS_SLAVE_QPIC_CFG 739 ++#define MSM_BUS_SLAVE_SDCC_CFG 740 ++#define MSM_BUS_SLAVE_WSS0_VMIDMT_CFG 741 ++#define MSM_BUS_SLAVE_WSS0_APU_CFG 742 ++#define MSM_BUS_SLAVE_WSS1_VMIDMT_CFG 743 ++#define MSM_BUS_SLAVE_WSS1_APU_CFG 744 ++#define MSM_BUS_SLAVE_SRVC_PCNOC 745 ++#define MSM_BUS_SLAVE_SNOC_DDRC 746 ++#define MSM_BUS_SLAVE_A7SS 747 ++#define MSM_BUS_SLAVE_WSS0_CFG 748 ++#define MSM_BUS_SLAVE_WSS1_CFG 749 ++#define MSM_BUS_SLAVE_PCIE 750 ++#define MSM_BUS_SLAVE_USB3_CFG 751 ++#define MSM_BUS_SLAVE_CRYPTO_CFG 752 ++#define MSM_BUS_SLAVE_ESS_CFG 753 ++#define MSM_BUS_SLAVE_SRVC_SNOC 754 ++ ++#define MSM_BUS_SYSTEM_FPB_SLAVE_SYSTEM MSM_BUS_SYSTEM_SLAVE_SYSTEM_FPB ++#define MSM_BUS_CPSS_FPB_SLAVE_SYSTEM MSM_BUS_SYSTEM_SLAVE_CPSS_FPB ++ ++/* ++ * ID's used in RPM messages ++ */ ++#define ICBID_MASTER_APPSS_PROC 0 ++#define ICBID_MASTER_MSS_PROC 1 ++#define ICBID_MASTER_MNOC_BIMC 2 ++#define ICBID_MASTER_SNOC_BIMC 3 ++#define ICBID_MASTER_SNOC_BIMC_0 ICBID_MASTER_SNOC_BIMC ++#define ICBID_MASTER_CNOC_MNOC_MMSS_CFG 4 ++#define ICBID_MASTER_CNOC_MNOC_CFG 5 ++#define ICBID_MASTER_GFX3D 6 ++#define ICBID_MASTER_JPEG 7 ++#define ICBID_MASTER_MDP 8 ++#define ICBID_MASTER_MDP0 ICBID_MASTER_MDP ++#define ICBID_MASTER_MDPS ICBID_MASTER_MDP ++#define ICBID_MASTER_VIDEO 9 ++#define ICBID_MASTER_VIDEO_P0 ICBID_MASTER_VIDEO ++#define ICBID_MASTER_VIDEO_P1 10 ++#define ICBID_MASTER_VFE 11 ++#define ICBID_MASTER_CNOC_ONOC_CFG 12 ++#define ICBID_MASTER_JPEG_OCMEM 13 ++#define ICBID_MASTER_MDP_OCMEM 14 ++#define ICBID_MASTER_VIDEO_P0_OCMEM 15 ++#define ICBID_MASTER_VIDEO_P1_OCMEM 16 ++#define ICBID_MASTER_VFE_OCMEM 17 ++#define ICBID_MASTER_LPASS_AHB 18 ++#define ICBID_MASTER_QDSS_BAM 19 ++#define ICBID_MASTER_SNOC_CFG 20 ++#define ICBID_MASTER_BIMC_SNOC 21 ++#define ICBID_MASTER_CNOC_SNOC 22 ++#define ICBID_MASTER_CRYPTO 23 ++#define ICBID_MASTER_CRYPTO_CORE0 ICBID_MASTER_CRYPTO ++#define ICBID_MASTER_CRYPTO_CORE1 24 ++#define ICBID_MASTER_LPASS_PROC 25 ++#define ICBID_MASTER_MSS 26 ++#define ICBID_MASTER_MSS_NAV 27 ++#define ICBID_MASTER_OCMEM_DMA 28 ++#define ICBID_MASTER_PNOC_SNOC 29 ++#define ICBID_MASTER_WCSS 30 ++#define ICBID_MASTER_QDSS_ETR 31 ++#define ICBID_MASTER_USB3 32 ++#define ICBID_MASTER_USB3_0 ICBID_MASTER_USB3 ++#define ICBID_MASTER_SDCC_1 33 ++#define ICBID_MASTER_SDCC_3 34 ++#define ICBID_MASTER_SDCC_2 35 ++#define ICBID_MASTER_SDCC_4 36 ++#define ICBID_MASTER_TSIF 37 ++#define ICBID_MASTER_BAM_DMA 38 ++#define ICBID_MASTER_BLSP_2 39 ++#define ICBID_MASTER_USB_HSIC 40 ++#define ICBID_MASTER_BLSP_1 41 ++#define ICBID_MASTER_USB_HS 42 ++#define ICBID_MASTER_USB_HS1 ICBID_MASTER_USB_HS ++#define ICBID_MASTER_PNOC_CFG 43 ++#define ICBID_MASTER_SNOC_PNOC 44 ++#define ICBID_MASTER_RPM_INST 45 ++#define ICBID_MASTER_RPM_DATA 46 ++#define ICBID_MASTER_RPM_SYS 47 ++#define ICBID_MASTER_DEHR 48 ++#define ICBID_MASTER_QDSS_DAP 49 ++#define ICBID_MASTER_SPDM 50 ++#define ICBID_MASTER_TIC 51 ++#define ICBID_MASTER_SNOC_CNOC 52 ++#define ICBID_MASTER_GFX3D_OCMEM 53 ++#define ICBID_MASTER_GFX3D_GMEM ICBID_MASTER_GFX3D_OCMEM ++#define ICBID_MASTER_OVIRT_SNOC 54 ++#define ICBID_MASTER_SNOC_OVIRT 55 ++#define ICBID_MASTER_SNOC_GVIRT ICBID_MASTER_SNOC_OVIRT ++#define ICBID_MASTER_ONOC_OVIRT 56 ++#define ICBID_MASTER_USB_HS2 57 ++#define ICBID_MASTER_QPIC 58 ++#define ICBID_MASTER_IPA 59 ++#define ICBID_MASTER_DSI 60 ++#define ICBID_MASTER_MDP1 61 ++#define ICBID_MASTER_MDPE ICBID_MASTER_MDP1 ++#define ICBID_MASTER_VPU_PROC 62 ++#define ICBID_MASTER_VPU 63 ++#define ICBID_MASTER_VPU0 ICBID_MASTER_VPU ++#define ICBID_MASTER_CRYPTO_CORE2 64 ++#define ICBID_MASTER_PCIE_0 65 ++#define ICBID_MASTER_PCIE_1 66 ++#define ICBID_MASTER_SATA 67 ++#define ICBID_MASTER_UFS 68 ++#define ICBID_MASTER_USB3_1 69 ++#define ICBID_MASTER_VIDEO_OCMEM 70 ++#define ICBID_MASTER_VPU1 71 ++#define ICBID_MASTER_VCAP 72 ++#define ICBID_MASTER_EMAC 73 ++#define ICBID_MASTER_BCAST 74 ++#define ICBID_MASTER_MMSS_PROC 75 ++#define ICBID_MASTER_SNOC_BIMC_1 76 ++#define ICBID_MASTER_SNOC_PCNOC 77 ++#define ICBID_MASTER_AUDIO 78 ++#define ICBID_MASTER_MM_INT_0 79 ++#define ICBID_MASTER_MM_INT_1 80 ++#define ICBID_MASTER_MM_INT_2 81 ++#define ICBID_MASTER_MM_INT_BIMC 82 ++#define ICBID_MASTER_MSS_INT 83 ++#define ICBID_MASTER_PCNOC_CFG 84 ++#define ICBID_MASTER_PCNOC_INT_0 85 ++#define ICBID_MASTER_PCNOC_INT_1 86 ++#define ICBID_MASTER_PCNOC_M_0 87 ++#define ICBID_MASTER_PCNOC_M_1 88 ++#define ICBID_MASTER_PCNOC_S_0 89 ++#define ICBID_MASTER_PCNOC_S_1 90 ++#define ICBID_MASTER_PCNOC_S_2 91 ++#define ICBID_MASTER_PCNOC_S_3 92 ++#define ICBID_MASTER_PCNOC_S_4 93 ++#define ICBID_MASTER_PCNOC_S_6 94 ++#define ICBID_MASTER_PCNOC_S_7 95 ++#define ICBID_MASTER_PCNOC_S_8 96 ++#define ICBID_MASTER_PCNOC_S_9 97 ++#define ICBID_MASTER_QDSS_INT 98 ++#define ICBID_MASTER_SNOC_INT_0 99 ++#define ICBID_MASTER_SNOC_INT_1 100 ++#define ICBID_MASTER_SNOC_INT_BIMC 101 ++#define ICBID_MASTER_TCU_0 102 ++#define ICBID_MASTER_TCU_1 103 ++#define ICBID_MASTER_BIMC_INT_0 104 ++#define ICBID_MASTER_BIMC_INT_1 105 ++#define ICBID_MASTER_CAMERA 106 ++#define ICBID_MASTER_RICA 107 ++#define ICBID_MASTER_PCNOC_S_5 129 ++#define ICBID_MASTER_PCNOC_INT_2 124 ++#define ICBID_MASTER_PCNOC_INT_3 125 ++#define ICBID_MASTER_PCNOC_INT_4 126 ++#define ICBID_MASTER_PCNOC_INT_5 127 ++#define ICBID_MASTER_PCNOC_INT_6 128 ++#define ICBID_MASTER_PCIE_2 119 ++#define ICBID_MASTER_MASTER_CNOC_A1NOC 116 ++#define ICBID_MASTER_A0NOC_SNOC 110 ++#define ICBID_MASTER_A1NOC_SNOC 111 ++#define ICBID_MASTER_A2NOC_SNOC 112 ++#define ICBID_MASTER_PNOC_A1NOC 117 ++#define ICBID_MASTER_ROTATOR 120 ++#define ICBID_MASTER_SNOC_VMEM 114 ++#define ICBID_MASTER_VENUS_VMEM 121 ++#define ICBID_MASTER_HMSS 118 ++#define ICBID_MASTER_BIMC_SNOC_1 109 ++#define ICBID_MASTER_CNOC_A1NOC 116 ++#define ICBID_MASTER_CPP 115 ++#define ICBID_MASTER_BLSP_BAM 130 ++#define ICBID_MASTER_USB2_BAM 131 ++#define ICBID_MASTER_ADSS_DMA0 132 ++#define ICBID_MASTER_ADSS_DMA1 133 ++#define ICBID_MASTER_ADSS_DMA2 134 ++#define ICBID_MASTER_ADSS_DMA3 135 ++#define ICBID_MASTER_QPIC_BAM 136 ++#define ICBID_MASTER_SDCC_BAM 137 ++#define ICBID_MASTER_DDRC_SNOC 138 ++#define ICBID_MASTER_WSS_0 139 ++#define ICBID_MASTER_WSS_1 140 ++#define ICBID_MASTER_ESS 141 ++#define ICBID_MASTER_PCIE 142 ++#define ICBID_MASTER_QDSS_BAMNDP 143 ++#define ICBID_MASTER_QDSS_SNOC_CFG 144 ++ ++#define ICBID_SLAVE_EBI1 0 ++#define ICBID_SLAVE_APPSS_L2 1 ++#define ICBID_SLAVE_BIMC_SNOC 2 ++#define ICBID_SLAVE_CAMERA_CFG 3 ++#define ICBID_SLAVE_DISPLAY_CFG 4 ++#define ICBID_SLAVE_OCMEM_CFG 5 ++#define ICBID_SLAVE_CPR_CFG 6 ++#define ICBID_SLAVE_CPR_XPU_CFG 7 ++#define ICBID_SLAVE_MISC_CFG 8 ++#define ICBID_SLAVE_MISC_XPU_CFG 9 ++#define ICBID_SLAVE_VENUS_CFG 10 ++#define ICBID_SLAVE_GFX3D_CFG 11 ++#define ICBID_SLAVE_MMSS_CLK_CFG 12 ++#define ICBID_SLAVE_MMSS_CLK_XPU_CFG 13 ++#define ICBID_SLAVE_MNOC_MPU_CFG 14 ++#define ICBID_SLAVE_ONOC_MPU_CFG 15 ++#define ICBID_SLAVE_MNOC_BIMC 16 ++#define ICBID_SLAVE_SERVICE_MNOC 17 ++#define ICBID_SLAVE_OCMEM 18 ++#define ICBID_SLAVE_GMEM ICBID_SLAVE_OCMEM ++#define ICBID_SLAVE_SERVICE_ONOC 19 ++#define ICBID_SLAVE_APPSS 20 ++#define ICBID_SLAVE_LPASS 21 ++#define ICBID_SLAVE_USB3 22 ++#define ICBID_SLAVE_USB3_0 ICBID_SLAVE_USB3 ++#define ICBID_SLAVE_WCSS 23 ++#define ICBID_SLAVE_SNOC_BIMC 24 ++#define ICBID_SLAVE_SNOC_BIMC_0 ICBID_SLAVE_SNOC_BIMC ++#define ICBID_SLAVE_SNOC_CNOC 25 ++#define ICBID_SLAVE_IMEM 26 ++#define ICBID_SLAVE_OCIMEM ICBID_SLAVE_IMEM ++#define ICBID_SLAVE_SNOC_OVIRT 27 ++#define ICBID_SLAVE_SNOC_GVIRT ICBID_SLAVE_SNOC_OVIRT ++#define ICBID_SLAVE_SNOC_PNOC 28 ++#define ICBID_SLAVE_SNOC_PCNOC ICBID_SLAVE_SNOC_PNOC ++#define ICBID_SLAVE_SERVICE_SNOC 29 ++#define ICBID_SLAVE_QDSS_STM 30 ++#define ICBID_SLAVE_SDCC_1 31 ++#define ICBID_SLAVE_SDCC_3 32 ++#define ICBID_SLAVE_SDCC_2 33 ++#define ICBID_SLAVE_SDCC_4 34 ++#define ICBID_SLAVE_TSIF 35 ++#define ICBID_SLAVE_BAM_DMA 36 ++#define ICBID_SLAVE_BLSP_2 37 ++#define ICBID_SLAVE_USB_HSIC 38 ++#define ICBID_SLAVE_BLSP_1 39 ++#define ICBID_SLAVE_USB_HS 40 ++#define ICBID_SLAVE_USB_HS1 ICBID_SLAVE_USB_HS ++#define ICBID_SLAVE_PDM 41 ++#define ICBID_SLAVE_PERIPH_APU_CFG 42 ++#define ICBID_SLAVE_PNOC_MPU_CFG 43 ++#define ICBID_SLAVE_PRNG 44 ++#define ICBID_SLAVE_PNOC_SNOC 45 ++#define ICBID_SLAVE_PCNOC_SNOC ICBID_SLAVE_PNOC_SNOC ++#define ICBID_SLAVE_SERVICE_PNOC 46 ++#define ICBID_SLAVE_CLK_CTL 47 ++#define ICBID_SLAVE_CNOC_MSS 48 ++#define ICBID_SLAVE_PCNOC_MSS ICBID_SLAVE_CNOC_MSS ++#define ICBID_SLAVE_SECURITY 49 ++#define ICBID_SLAVE_TCSR 50 ++#define ICBID_SLAVE_TLMM 51 ++#define ICBID_SLAVE_CRYPTO_0_CFG 52 ++#define ICBID_SLAVE_CRYPTO_1_CFG 53 ++#define ICBID_SLAVE_IMEM_CFG 54 ++#define ICBID_SLAVE_MESSAGE_RAM 55 ++#define ICBID_SLAVE_BIMC_CFG 56 ++#define ICBID_SLAVE_BOOT_ROM 57 ++#define ICBID_SLAVE_CNOC_MNOC_MMSS_CFG 58 ++#define ICBID_SLAVE_PMIC_ARB 59 ++#define ICBID_SLAVE_SPDM_WRAPPER 60 ++#define ICBID_SLAVE_DEHR_CFG 61 ++#define ICBID_SLAVE_MPM 62 ++#define ICBID_SLAVE_QDSS_CFG 63 ++#define ICBID_SLAVE_RBCPR_CFG 64 ++#define ICBID_SLAVE_RBCPR_CX_CFG ICBID_SLAVE_RBCPR_CFG ++#define ICBID_SLAVE_RBCPR_QDSS_APU_CFG 65 ++#define ICBID_SLAVE_CNOC_MNOC_CFG 66 ++#define ICBID_SLAVE_SNOC_MPU_CFG 67 ++#define ICBID_SLAVE_CNOC_ONOC_CFG 68 ++#define ICBID_SLAVE_PNOC_CFG 69 ++#define ICBID_SLAVE_SNOC_CFG 70 ++#define ICBID_SLAVE_EBI1_DLL_CFG 71 ++#define ICBID_SLAVE_PHY_APU_CFG 72 ++#define ICBID_SLAVE_EBI1_PHY_CFG 73 ++#define ICBID_SLAVE_RPM 74 ++#define ICBID_SLAVE_CNOC_SNOC 75 ++#define ICBID_SLAVE_SERVICE_CNOC 76 ++#define ICBID_SLAVE_OVIRT_SNOC 77 ++#define ICBID_SLAVE_OVIRT_OCMEM 78 ++#define ICBID_SLAVE_USB_HS2 79 ++#define ICBID_SLAVE_QPIC 80 ++#define ICBID_SLAVE_IPS_CFG 81 ++#define ICBID_SLAVE_DSI_CFG 82 ++#define ICBID_SLAVE_USB3_1 83 ++#define ICBID_SLAVE_PCIE_0 84 ++#define ICBID_SLAVE_PCIE_1 85 ++#define ICBID_SLAVE_PSS_SMMU_CFG 86 ++#define ICBID_SLAVE_CRYPTO_2_CFG 87 ++#define ICBID_SLAVE_PCIE_0_CFG 88 ++#define ICBID_SLAVE_PCIE_1_CFG 89 ++#define ICBID_SLAVE_SATA_CFG 90 ++#define ICBID_SLAVE_SPSS_GENI_IR 91 ++#define ICBID_SLAVE_UFS_CFG 92 ++#define ICBID_SLAVE_AVSYNC_CFG 93 ++#define ICBID_SLAVE_VPU_CFG 94 ++#define ICBID_SLAVE_USB_PHY_CFG 95 ++#define ICBID_SLAVE_RBCPR_MX_CFG 96 ++#define ICBID_SLAVE_PCIE_PARF 97 ++#define ICBID_SLAVE_VCAP_CFG 98 ++#define ICBID_SLAVE_EMAC_CFG 99 ++#define ICBID_SLAVE_BCAST_CFG 100 ++#define ICBID_SLAVE_KLM_CFG 101 ++#define ICBID_SLAVE_DISPLAY_PWM 102 ++#define ICBID_SLAVE_GENI 103 ++#define ICBID_SLAVE_SNOC_BIMC_1 104 ++#define ICBID_SLAVE_AUDIO 105 ++#define ICBID_SLAVE_CATS_0 106 ++#define ICBID_SLAVE_CATS_1 107 ++#define ICBID_SLAVE_MM_INT_0 108 ++#define ICBID_SLAVE_MM_INT_1 109 ++#define ICBID_SLAVE_MM_INT_2 110 ++#define ICBID_SLAVE_MM_INT_BIMC 111 ++#define ICBID_SLAVE_MMU_MODEM_XPU_CFG 112 ++#define ICBID_SLAVE_MSS_INT 113 ++#define ICBID_SLAVE_PCNOC_INT_0 114 ++#define ICBID_SLAVE_PCNOC_INT_1 115 ++#define ICBID_SLAVE_PCNOC_M_0 116 ++#define ICBID_SLAVE_PCNOC_M_1 117 ++#define ICBID_SLAVE_PCNOC_S_0 118 ++#define ICBID_SLAVE_PCNOC_S_1 119 ++#define ICBID_SLAVE_PCNOC_S_2 120 ++#define ICBID_SLAVE_PCNOC_S_3 121 ++#define ICBID_SLAVE_PCNOC_S_4 122 ++#define ICBID_SLAVE_PCNOC_S_6 123 ++#define ICBID_SLAVE_PCNOC_S_7 124 ++#define ICBID_SLAVE_PCNOC_S_8 125 ++#define ICBID_SLAVE_PCNOC_S_9 126 ++#define ICBID_SLAVE_PRNG_XPU_CFG 127 ++#define ICBID_SLAVE_QDSS_INT 128 ++#define ICBID_SLAVE_RPM_XPU_CFG 129 ++#define ICBID_SLAVE_SNOC_INT_0 130 ++#define ICBID_SLAVE_SNOC_INT_1 131 ++#define ICBID_SLAVE_SNOC_INT_BIMC 132 ++#define ICBID_SLAVE_TCU 133 ++#define ICBID_SLAVE_BIMC_INT_0 134 ++#define ICBID_SLAVE_BIMC_INT_1 135 ++#define ICBID_SLAVE_RICA_CFG 136 ++#define ICBID_SLAVE_PCNOC_S_5 189 ++#define ICBID_SLAVE_PCNOC_S_7 124 ++#define ICBID_SLAVE_PCNOC_INT_2 184 ++#define ICBID_SLAVE_PCNOC_INT_3 185 ++#define ICBID_SLAVE_PCNOC_INT_4 186 ++#define ICBID_SLAVE_PCNOC_INT_5 187 ++#define ICBID_SLAVE_PCNOC_INT_6 188 ++#define ICBID_SLAVE_USB3_PHY_CFG 182 ++#define ICBID_SLAVE_IPA_CFG 183 ++ ++#define ICBID_SLAVE_A0NOC_SNOC 141 ++#define ICBID_SLAVE_A1NOC_SNOC 142 ++#define ICBID_SLAVE_A2NOC_SNOC 143 ++#define ICBID_SLAVE_BIMC_SNOC_1 138 ++#define ICBID_SLAVE_PIMEM 167 ++#define ICBID_SLAVE_PIMEM_CFG 168 ++#define ICBID_SLAVE_DCC_CFG 155 ++#define ICBID_SLAVE_QDSS_RBCPR_APU_CFG 168 ++#define ICBID_SLAVE_A0NOC_CFG 144 ++#define ICBID_SLAVE_PCIE_2_CFG 165 ++#define ICBID_SLAVE_PCIE20_AHB2PHY 163 ++#define ICBID_SLAVE_PCIE_2 164 ++#define ICBID_SLAVE_A1NOC_CFG 147 ++#define ICBID_SLAVE_A1NOC_MPU_CFG 148 ++#define ICBID_SLAVE_A1NOC_SMMU_CFG 149 ++#define ICBID_SLAVE_A2NOC_CFG 150 ++#define ICBID_SLAVE_A2NOC_MPU_CFG 151 ++#define ICBID_SLAVE_A2NOC_SMMU_CFG 152 ++#define ICBID_SLAVE_AHB2PHY 153 ++#define ICBID_SLAVE_HMSS_L3 161 ++#define ICBID_SLAVE_LPASS_SMMU_CFG 161 ++#define ICBID_SLAVE_MMAGIC_CFG 162 ++#define ICBID_SLAVE_SSC_CFG 177 ++#define ICBID_SLAVE_VENUS_THROTTLE_CFG 178 ++#define ICBID_SLAVE_DISPLAY_THROTTLE_CFG 156 ++#define ICBID_SLAVE_CAMERA_THROTTLE_CFG 154 ++#define ICBID_SLAVE_DSA_CFG 157 ++#define ICBID_SLAVE_DSA_MPU_CFG 158 ++#define ICBID_SLAVE_SMMU_CPP_CFG 171 ++#define ICBID_SLAVE_SMMU_JPEG_CFG 172 ++#define ICBID_SLAVE_SMMU_MDP_CFG 173 ++#define ICBID_SLAVE_SMMU_ROTATOR_CFG 174 ++#define ICBID_SLAVE_SMMU_VENUS_CFG 175 ++#define ICBID_SLAVE_SMMU_VFE_CFG 176 ++#define ICBID_SLAVE_A0NOC_MPU_CFG 145 ++#define ICBID_SLAVE_A0NOC_SMMU_CFG 146 ++#define ICBID_SLAVE_VMEM_CFG 180 ++#define ICBID_SLAVE_VMEM 179 ++#define ICBID_SLAVE_PNOC_A1NOC 139 ++#define ICBID_SLAVE_SNOC_VMEM 140 ++#define ICBID_SLAVE_RBCPR_MX 170 ++#define ICBID_SLAVE_RBCPR_CX 169 ++#define ICBID_SLAVE_PRNG_APU_CFG 190 ++#define ICBID_SLAVE_PERIPH_MPU_CFG 191 ++#define ICBID_SLAVE_GCNT 192 ++#define ICBID_SLAVE_ADSS_CFG 193 ++#define ICBID_SLAVE_ADSS_APU 194 ++#define ICBID_SLAVE_ADSS_VMIDMT_CFG 195 ++#define ICBID_SLAVE_QHSS_APU_CFG 196 ++#define ICBID_SLAVE_MDIO 197 ++#define ICBID_SLAVE_FEPHY_CFG 198 ++#define ICBID_SLAVE_SRIF 199 ++#define ICBID_SLAVE_DDRC_CFG 200 ++#define ICBID_SLAVE_DDRC_APU_CFG 201 ++#define ICBID_SLAVE_DDRC_MPU0_CFG 202 ++#define ICBID_SLAVE_DDRC_MPU1_CFG 203 ++#define ICBID_SLAVE_DDRC_MPU2_CFG 210 ++#define ICBID_SLAVE_ESS_VMIDMT_CFG 211 ++#define ICBID_SLAVE_ESS_APU_CFG 212 ++#define ICBID_SLAVE_USB2_CFG 213 ++#define ICBID_SLAVE_BLSP_CFG 214 ++#define ICBID_SLAVE_QPIC_CFG 215 ++#define ICBID_SLAVE_SDCC_CFG 216 ++#define ICBID_SLAVE_WSS0_VMIDMT_CFG 217 ++#define ICBID_SLAVE_WSS0_APU_CFG 218 ++#define ICBID_SLAVE_WSS1_VMIDMT_CFG 219 ++#define ICBID_SLAVE_WSS1_APU_CFG 220 ++#define ICBID_SLAVE_SRVC_PCNOC 221 ++#define ICBID_SLAVE_SNOC_DDRC 222 ++#define ICBID_SLAVE_A7SS 223 ++#define ICBID_SLAVE_WSS0_CFG 224 ++#define ICBID_SLAVE_WSS1_CFG 225 ++#define ICBID_SLAVE_PCIE 226 ++#define ICBID_SLAVE_USB3_CFG 227 ++#define ICBID_SLAVE_CRYPTO_CFG 228 ++#define ICBID_SLAVE_ESS_CFG 229 ++#define ICBID_SLAVE_SRVC_SNOC 230 ++#endif +--- /dev/null ++++ b/include/dt-bindings/msm/msm-bus-rule-ops.h +@@ -0,0 +1,32 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef __MSM_BUS_RULE_OPS_H ++#define __MSM_BUS_RULE_OPS_H ++ ++#define FLD_IB 0 ++#define FLD_AB 1 ++#define FLD_CLK 2 ++ ++#define OP_LE 0 ++#define OP_LT 1 ++#define OP_GE 2 ++#define OP_GT 3 ++#define OP_NOOP 4 ++ ++#define RULE_STATE_NOT_APPLIED 0 ++#define RULE_STATE_APPLIED 1 ++ ++#define THROTTLE_ON 0 ++#define THROTTLE_OFF 1 ++ ++#endif +--- /dev/null ++++ b/drivers/bus/msm_bus/Kconfig +@@ -0,0 +1,19 @@ ++config BUS_TOPOLOGY_ADHOC ++ bool "ad-hoc bus scaling topology" ++ depends on ARCH_QCOM ++ default n ++ help ++ This option enables a driver that can handle adhoc bus topologies. ++ Adhoc bus topology driver allows one to many connections and maintains ++ directionality of connections by explicitly listing device connections ++ thus avoiding illegal routes. ++ ++config MSM_BUS_SCALING ++ bool "Bus scaling driver" ++ depends on BUS_TOPOLOGY_ADHOC ++ default n ++ help ++ This option enables bus scaling on MSM devices. Bus scaling ++ allows devices to request the clocks be set to rates sufficient ++ for the active devices needs without keeping the clocks at max ++ frequency when a slower speed is sufficient. +--- /dev/null ++++ b/drivers/bus/msm_bus/Makefile +@@ -0,0 +1,12 @@ ++# ++# Makefile for msm-bus driver specific files ++# ++obj-y += msm_bus_bimc.o msm_bus_noc.o msm_bus_core.o msm_bus_client_api.o \ ++ msm_bus_id.o ++obj-$(CONFIG_OF) += msm_bus_of.o ++ ++obj-y += msm_bus_fabric_adhoc.o msm_bus_arb_adhoc.o msm_bus_rules.o ++obj-$(CONFIG_OF) += msm_bus_of_adhoc.o ++obj-$(CONFIG_CORESIGHT) += msm_buspm_coresight_adhoc.o ++ ++obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o +--- /dev/null ++++ b/drivers/bus/msm_bus/msm-bus-board.h +@@ -0,0 +1,198 @@ ++/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef __ASM_ARCH_MSM_BUS_BOARD_H ++#define __ASM_ARCH_MSM_BUS_BOARD_H ++ ++#include ++#include ++ ++enum context { ++ DUAL_CTX, ++ ACTIVE_CTX, ++ NUM_CTX ++}; ++ ++struct msm_bus_fabric_registration { ++ unsigned int id; ++ const char *name; ++ struct msm_bus_node_info *info; ++ unsigned int len; ++ int ahb; ++ const char *fabclk[NUM_CTX]; ++ const char *iface_clk; ++ unsigned int offset; ++ unsigned int haltid; ++ unsigned int rpm_enabled; ++ unsigned int nmasters; ++ unsigned int nslaves; ++ unsigned int ntieredslaves; ++ bool il_flag; ++ const struct msm_bus_board_algorithm *board_algo; ++ int hw_sel; ++ void *hw_data; ++ uint32_t qos_freq; ++ uint32_t qos_baseoffset; ++ u64 nr_lim_thresh; ++ uint32_t eff_fact; ++ uint32_t qos_delta; ++ bool virt; ++}; ++ ++struct msm_bus_device_node_registration { ++ struct msm_bus_node_device_type *info; ++ unsigned int num_devices; ++ bool virt; ++}; ++ ++enum msm_bus_bw_tier_type { ++ MSM_BUS_BW_TIER1 = 1, ++ MSM_BUS_BW_TIER2, ++ MSM_BUS_BW_COUNT, ++ MSM_BUS_BW_SIZE = 0x7FFFFFFF, ++}; ++ ++struct msm_bus_halt_vector { ++ uint32_t haltval; ++ uint32_t haltmask; ++}; ++ ++extern struct msm_bus_fabric_registration msm_bus_apps_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_sys_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_mm_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_sys_fpb_pdata; ++extern struct msm_bus_fabric_registration msm_bus_cpss_fpb_pdata; ++extern struct msm_bus_fabric_registration msm_bus_def_fab_pdata; ++ ++extern struct msm_bus_fabric_registration msm_bus_8960_apps_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8960_sys_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8960_mm_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8960_sg_mm_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8960_sys_fpb_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8960_cpss_fpb_pdata; ++ ++extern struct msm_bus_fabric_registration msm_bus_8064_apps_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8064_sys_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8064_mm_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8064_sys_fpb_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8064_cpss_fpb_pdata; ++ ++extern struct msm_bus_fabric_registration msm_bus_9615_sys_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_9615_def_fab_pdata; ++ ++extern struct msm_bus_fabric_registration msm_bus_8930_apps_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8930_sys_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8930_mm_fabric_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8930_sys_fpb_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8930_cpss_fpb_pdata; ++ ++extern struct msm_bus_fabric_registration msm_bus_8974_sys_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8974_mmss_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8974_bimc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8974_ocmem_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8974_periph_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8974_config_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_8974_ocmem_vnoc_pdata; ++ ++extern struct msm_bus_fabric_registration msm_bus_9625_sys_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_9625_bimc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_9625_periph_noc_pdata; ++extern struct msm_bus_fabric_registration msm_bus_9625_config_noc_pdata; ++ ++extern int msm_bus_device_match_adhoc(struct device *dev, void *id); ++ ++void msm_bus_rpm_set_mt_mask(void); ++int msm_bus_board_rpm_get_il_ids(uint16_t *id); ++int msm_bus_board_get_iid(int id); ++ ++#define NFAB_MSM8226 6 ++#define NFAB_MSM8610 5 ++ ++/* ++ * These macros specify the convention followed for allocating ++ * ids to fabrics, masters and slaves for 8x60. ++ * ++ * A node can be identified as a master/slave/fabric by using ++ * these ids. ++ */ ++#define FABRIC_ID_KEY 1024 ++#define SLAVE_ID_KEY ((FABRIC_ID_KEY) >> 1) ++#define MAX_FAB_KEY 7168 /* OR(All fabric ids) */ ++#define INT_NODE_START 10000 ++ ++#define GET_FABID(id) ((id) & MAX_FAB_KEY) ++ ++#define NODE_ID(id) ((id) & (FABRIC_ID_KEY - 1)) ++#define IS_SLAVE(id) ((NODE_ID(id)) >= SLAVE_ID_KEY ? 1 : 0) ++#define CHECK_ID(iid, id) (((iid & id) != id) ? -ENXIO : iid) ++ ++/* ++ * The following macros are used to format the data for port halt ++ * and unhalt requests. ++ */ ++#define MSM_BUS_CLK_HALT 0x1 ++#define MSM_BUS_CLK_HALT_MASK 0x1 ++#define MSM_BUS_CLK_HALT_FIELDSIZE 0x1 ++#define MSM_BUS_CLK_UNHALT 0x0 ++ ++#define MSM_BUS_MASTER_SHIFT(master, fieldsize) \ ++ ((master) * (fieldsize)) ++ ++#define MSM_BUS_SET_BITFIELD(word, fieldmask, fieldvalue) \ ++ { \ ++ (word) &= ~(fieldmask); \ ++ (word) |= (fieldvalue); \ ++ } ++ ++ ++#define MSM_BUS_MASTER_HALT(u32haltmask, u32haltval, master) \ ++ MSM_BUS_SET_BITFIELD(u32haltmask, \ ++ MSM_BUS_CLK_HALT_MASK< ++ ++ ++#endif /*__ASM_ARCH_MSM_BUS_BOARD_H */ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm-bus.h +@@ -0,0 +1,139 @@ ++/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef _ARCH_ARM_MACH_MSM_BUS_H ++#define _ARCH_ARM_MACH_MSM_BUS_H ++ ++#include ++#include ++#include ++ ++/* ++ * Macros for clients to convert their data to ib and ab ++ * Ws : Time window over which to transfer the data in SECONDS ++ * Bs : Size of the data block in bytes ++ * Per : Recurrence period ++ * Tb : Throughput bandwidth to prevent stalling ++ * R : Ratio of actual bandwidth used to Tb ++ * Ib : Instantaneous bandwidth ++ * Ab : Arbitrated bandwidth ++ * ++ * IB_RECURRBLOCK and AB_RECURRBLOCK: ++ * These are used if the requirement is to transfer a ++ * recurring block of data over a known time window. ++ * ++ * IB_THROUGHPUTBW and AB_THROUGHPUTBW: ++ * These are used for CPU style masters. Here the requirement ++ * is to have minimum throughput bandwidth available to avoid ++ * stalling. ++ */ ++#define IB_RECURRBLOCK(Ws, Bs) ((Ws) == 0 ? 0 : ((Bs)/(Ws))) ++#define AB_RECURRBLOCK(Ws, Per) ((Ws) == 0 ? 0 : ((Bs)/(Per))) ++#define IB_THROUGHPUTBW(Tb) (Tb) ++#define AB_THROUGHPUTBW(Tb, R) ((Tb) * (R)) ++ ++struct msm_bus_vectors { ++ int src; /* Master */ ++ int dst; /* Slave */ ++ uint64_t ab; /* Arbitrated bandwidth */ ++ uint64_t ib; /* Instantaneous bandwidth */ ++}; ++ ++struct msm_bus_paths { ++ int num_paths; ++ struct msm_bus_vectors *vectors; ++}; ++ ++struct msm_bus_scale_pdata { ++ struct msm_bus_paths *usecase; ++ int num_usecases; ++ const char *name; ++ /* ++ * If the active_only flag is set to 1, the BW request is applied ++ * only when at least one CPU is active (powered on). If the flag ++ * is set to 0, then the BW request is always applied irrespective ++ * of the CPU state. ++ */ ++ unsigned int active_only; ++}; ++ ++/* Scaling APIs */ ++ ++/* ++ * This function returns a handle to the client. This should be used to ++ * call msm_bus_scale_client_update_request. ++ * The function returns 0 if bus driver is unable to register a client ++ */ ++ ++#if (defined(CONFIG_MSM_BUS_SCALING) || defined(CONFIG_BUS_TOPOLOGY_ADHOC)) ++int __init msm_bus_fabric_init_driver(void); ++uint32_t msm_bus_scale_register_client(struct msm_bus_scale_pdata *pdata); ++int msm_bus_scale_client_update_request(uint32_t cl, unsigned int index); ++void msm_bus_scale_unregister_client(uint32_t cl); ++/* AXI Port configuration APIs */ ++int msm_bus_axi_porthalt(int master_port); ++int msm_bus_axi_portunhalt(int master_port); ++ ++#else ++static inline int __init msm_bus_fabric_init_driver(void) { return 0; } ++ ++static inline uint32_t ++msm_bus_scale_register_client(struct msm_bus_scale_pdata *pdata) ++{ ++ return 1; ++} ++ ++static inline int ++msm_bus_scale_client_update_request(uint32_t cl, unsigned int index) ++{ ++ return 0; ++} ++ ++static inline void ++msm_bus_scale_unregister_client(uint32_t cl) ++{ ++} ++ ++static inline int msm_bus_axi_porthalt(int master_port) ++{ ++ return 0; ++} ++ ++static inline int msm_bus_axi_portunhalt(int master_port) ++{ ++ return 0; ++} ++#endif ++ ++#if defined(CONFIG_OF) && defined(CONFIG_MSM_BUS_SCALING) ++struct msm_bus_scale_pdata *msm_bus_pdata_from_node( ++ struct platform_device *pdev, struct device_node *of_node); ++struct msm_bus_scale_pdata *msm_bus_cl_get_pdata(struct platform_device *pdev); ++void msm_bus_cl_clear_pdata(struct msm_bus_scale_pdata *pdata); ++#else ++static inline struct msm_bus_scale_pdata ++*msm_bus_cl_get_pdata(struct platform_device *pdev) ++{ ++ return NULL; ++} ++ ++static inline struct msm_bus_scale_pdata *msm_bus_pdata_from_node( ++ struct platform_device *pdev, struct device_node *of_node) ++{ ++ return NULL; ++} ++ ++static inline void msm_bus_cl_clear_pdata(struct msm_bus_scale_pdata *pdata) ++{ ++} ++#endif ++#endif /*_ARCH_ARM_MACH_MSM_BUS_H*/ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_adhoc.h +@@ -0,0 +1,141 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef _ARCH_ARM_MACH_MSM_BUS_ADHOC_H ++#define _ARCH_ARM_MACH_MSM_BUS_ADHOC_H ++ ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm-bus.h" ++#include "msm_bus_rules.h" ++#include "msm_bus_core.h" ++ ++struct msm_bus_node_device_type; ++struct link_node { ++ uint64_t lnode_ib[NUM_CTX]; ++ uint64_t lnode_ab[NUM_CTX]; ++ int next; ++ struct device *next_dev; ++ struct list_head link; ++ uint32_t in_use; ++}; ++ ++/* New types introduced for adhoc topology */ ++struct msm_bus_noc_ops { ++ int (*qos_init)(struct msm_bus_node_device_type *dev, ++ void __iomem *qos_base, uint32_t qos_off, ++ uint32_t qos_delta, uint32_t qos_freq); ++ int (*set_bw)(struct msm_bus_node_device_type *dev, ++ void __iomem *qos_base, uint32_t qos_off, ++ uint32_t qos_delta, uint32_t qos_freq); ++ int (*limit_mport)(struct msm_bus_node_device_type *dev, ++ void __iomem *qos_base, uint32_t qos_off, ++ uint32_t qos_delta, uint32_t qos_freq, bool enable_lim, ++ uint64_t lim_bw); ++ bool (*update_bw_reg)(int mode); ++}; ++ ++struct nodebw { ++ uint64_t ab[NUM_CTX]; ++ bool dirty; ++}; ++ ++struct msm_bus_fab_device_type { ++ void __iomem *qos_base; ++ phys_addr_t pqos_base; ++ size_t qos_range; ++ uint32_t base_offset; ++ uint32_t qos_freq; ++ uint32_t qos_off; ++ uint32_t util_fact; ++ uint32_t vrail_comp; ++ struct msm_bus_noc_ops noc_ops; ++ enum msm_bus_hw_sel bus_type; ++ bool bypass_qos_prg; ++}; ++ ++struct qos_params_type { ++ int mode; ++ unsigned int prio_lvl; ++ unsigned int prio_rd; ++ unsigned int prio_wr; ++ unsigned int prio1; ++ unsigned int prio0; ++ unsigned int gp; ++ unsigned int thmp; ++ unsigned int ws; ++ int cur_mode; ++ u64 bw_buffer; ++}; ++ ++struct msm_bus_node_info_type { ++ const char *name; ++ unsigned int id; ++ int mas_rpm_id; ++ int slv_rpm_id; ++ int num_ports; ++ int num_qports; ++ int *qport; ++ struct qos_params_type qos_params; ++ unsigned int num_connections; ++ unsigned int num_blist; ++ bool is_fab_dev; ++ bool virt_dev; ++ bool is_traversed; ++ unsigned int *connections; ++ unsigned int *black_listed_connections; ++ struct device **dev_connections; ++ struct device **black_connections; ++ unsigned int bus_device_id; ++ struct device *bus_device; ++ unsigned int buswidth; ++ struct rule_update_path_info rule; ++ uint64_t lim_bw; ++ uint32_t util_fact; ++ uint32_t vrail_comp; ++}; ++ ++struct msm_bus_node_device_type { ++ struct msm_bus_node_info_type *node_info; ++ struct msm_bus_fab_device_type *fabdev; ++ int num_lnodes; ++ struct link_node *lnode_list; ++ uint64_t cur_clk_hz[NUM_CTX]; ++ struct nodebw node_ab; ++ struct list_head link; ++ unsigned int ap_owned; ++ struct nodeclk clk[NUM_CTX]; ++ struct nodeclk qos_clk; ++}; ++ ++int msm_bus_enable_limiter(struct msm_bus_node_device_type *nodedev, ++ bool throttle_en, uint64_t lim_bw); ++int msm_bus_update_clks(struct msm_bus_node_device_type *nodedev, ++ int ctx, int **dirty_nodes, int *num_dirty); ++int msm_bus_commit_data(int *dirty_nodes, int ctx, int num_dirty); ++int msm_bus_update_bw(struct msm_bus_node_device_type *nodedev, int ctx, ++ int64_t add_bw, int **dirty_nodes, int *num_dirty); ++void *msm_bus_realloc_devmem(struct device *dev, void *p, size_t old_size, ++ size_t new_size, gfp_t flags); ++ ++extern struct msm_bus_device_node_registration ++ *msm_bus_of_to_pdata(struct platform_device *pdev); ++extern void msm_bus_arb_setops_adhoc(struct msm_bus_arb_ops *arb_ops); ++extern int msm_bus_bimc_set_ops(struct msm_bus_node_device_type *bus_dev); ++extern int msm_bus_noc_set_ops(struct msm_bus_node_device_type *bus_dev); ++extern int msm_bus_of_get_static_rules(struct platform_device *pdev, ++ struct bus_rule_type **static_rule); ++extern int msm_rules_update_path(struct list_head *input_list, ++ struct list_head *output_list); ++extern void print_all_rules(void); ++#endif /* _ARCH_ARM_MACH_MSM_BUS_ADHOC_H */ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_arb_adhoc.c +@@ -0,0 +1,998 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is Mree software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "msm-bus.h" ++#include "msm_bus_core.h" ++#include "msm_bus_adhoc.h" ++ ++#define NUM_CL_HANDLES 50 ++#define NUM_LNODES 3 ++ ++struct bus_search_type { ++ struct list_head link; ++ struct list_head node_list; ++}; ++ ++struct handle_type { ++ int num_entries; ++ struct msm_bus_client **cl_list; ++}; ++ ++static struct handle_type handle_list; ++struct list_head input_list; ++struct list_head apply_list; ++ ++DEFINE_MUTEX(msm_bus_adhoc_lock); ++ ++static bool chk_bl_list(struct list_head *black_list, unsigned int id) ++{ ++ struct msm_bus_node_device_type *bus_node = NULL; ++ ++ list_for_each_entry(bus_node, black_list, link) { ++ if (bus_node->node_info->id == id) ++ return true; ++ } ++ return false; ++} ++ ++static void copy_remaining_nodes(struct list_head *edge_list, struct list_head ++ *traverse_list, struct list_head *route_list) ++{ ++ struct bus_search_type *search_node; ++ ++ if (list_empty(edge_list) && list_empty(traverse_list)) ++ return; ++ ++ search_node = kzalloc(sizeof(struct bus_search_type), GFP_KERNEL); ++ INIT_LIST_HEAD(&search_node->node_list); ++ list_splice_init(edge_list, traverse_list); ++ list_splice_init(traverse_list, &search_node->node_list); ++ list_add_tail(&search_node->link, route_list); ++} ++ ++/* ++ * Duplicate instantiaion from msm_bus_arb.c. Todo there needs to be a ++ * "util" file for these common func/macros. ++ * ++ * */ ++uint64_t msm_bus_div64(unsigned int w, uint64_t bw) ++{ ++ uint64_t *b = &bw; ++ ++ if ((bw > 0) && (bw < w)) ++ return 1; ++ ++ switch (w) { ++ case 0: ++ WARN(1, "AXI: Divide by 0 attempted\n"); ++ case 1: return bw; ++ case 2: return (bw >> 1); ++ case 4: return (bw >> 2); ++ case 8: return (bw >> 3); ++ case 16: return (bw >> 4); ++ case 32: return (bw >> 5); ++ } ++ ++ do_div(*b, w); ++ return *b; ++} ++ ++int msm_bus_device_match_adhoc(struct device *dev, void *id) ++{ ++ int ret = 0; ++ struct msm_bus_node_device_type *bnode = dev->platform_data; ++ ++ if (bnode) ++ ret = (bnode->node_info->id == *(unsigned int *)id); ++ else ++ ret = 0; ++ ++ return ret; ++} ++ ++static int gen_lnode(struct device *dev, ++ int next_hop, int prev_idx) ++{ ++ struct link_node *lnode; ++ struct msm_bus_node_device_type *cur_dev = NULL; ++ int lnode_idx = -1; ++ ++ if (!dev) ++ goto exit_gen_lnode; ++ ++ cur_dev = dev->platform_data; ++ if (!cur_dev) { ++ MSM_BUS_ERR("%s: Null device ptr", __func__); ++ goto exit_gen_lnode; ++ } ++ ++ if (!cur_dev->num_lnodes) { ++ cur_dev->lnode_list = devm_kzalloc(dev, ++ sizeof(struct link_node) * NUM_LNODES, ++ GFP_KERNEL); ++ if (!cur_dev->lnode_list) ++ goto exit_gen_lnode; ++ ++ lnode = cur_dev->lnode_list; ++ cur_dev->num_lnodes = NUM_LNODES; ++ lnode_idx = 0; ++ } else { ++ int i; ++ for (i = 0; i < cur_dev->num_lnodes; i++) { ++ if (!cur_dev->lnode_list[i].in_use) ++ break; ++ } ++ ++ if (i < cur_dev->num_lnodes) { ++ lnode = &cur_dev->lnode_list[i]; ++ lnode_idx = i; ++ } else { ++ struct link_node *realloc_list; ++ size_t cur_size = sizeof(struct link_node) * ++ cur_dev->num_lnodes; ++ ++ cur_dev->num_lnodes += NUM_LNODES; ++ realloc_list = msm_bus_realloc_devmem( ++ dev, ++ cur_dev->lnode_list, ++ cur_size, ++ sizeof(struct link_node) * ++ cur_dev->num_lnodes, GFP_KERNEL); ++ ++ if (!realloc_list) ++ goto exit_gen_lnode; ++ ++ cur_dev->lnode_list = realloc_list; ++ lnode = &cur_dev->lnode_list[i]; ++ lnode_idx = i; ++ } ++ } ++ ++ lnode->in_use = 1; ++ if (next_hop == cur_dev->node_info->id) { ++ lnode->next = -1; ++ lnode->next_dev = NULL; ++ } else { ++ lnode->next = prev_idx; ++ lnode->next_dev = bus_find_device(&msm_bus_type, NULL, ++ (void *) &next_hop, ++ msm_bus_device_match_adhoc); ++ } ++ ++ memset(lnode->lnode_ib, 0, sizeof(uint64_t) * NUM_CTX); ++ memset(lnode->lnode_ab, 0, sizeof(uint64_t) * NUM_CTX); ++ ++exit_gen_lnode: ++ return lnode_idx; ++} ++ ++static int remove_lnode(struct msm_bus_node_device_type *cur_dev, ++ int lnode_idx) ++{ ++ int ret = 0; ++ ++ if (!cur_dev) { ++ MSM_BUS_ERR("%s: Null device ptr", __func__); ++ ret = -ENODEV; ++ goto exit_remove_lnode; ++ } ++ ++ if (lnode_idx != -1) { ++ if (!cur_dev->num_lnodes || ++ (lnode_idx > (cur_dev->num_lnodes - 1))) { ++ MSM_BUS_ERR("%s: Invalid Idx %d, num_lnodes %d", ++ __func__, lnode_idx, cur_dev->num_lnodes); ++ ret = -ENODEV; ++ goto exit_remove_lnode; ++ } ++ ++ cur_dev->lnode_list[lnode_idx].next = -1; ++ cur_dev->lnode_list[lnode_idx].next_dev = NULL; ++ cur_dev->lnode_list[lnode_idx].in_use = 0; ++ } ++ ++exit_remove_lnode: ++ return ret; ++} ++ ++static int prune_path(struct list_head *route_list, int dest, int src, ++ struct list_head *black_list, int found) ++{ ++ struct bus_search_type *search_node, *temp_search_node; ++ struct msm_bus_node_device_type *bus_node; ++ struct list_head *bl_list; ++ struct list_head *temp_bl_list; ++ int search_dev_id = dest; ++ struct device *dest_dev = bus_find_device(&msm_bus_type, NULL, ++ (void *) &dest, ++ msm_bus_device_match_adhoc); ++ int lnode_hop = -1; ++ ++ if (!found) ++ goto reset_links; ++ ++ if (!dest_dev) { ++ MSM_BUS_ERR("%s: Can't find dest dev %d", __func__, dest); ++ goto exit_prune_path; ++ } ++ ++ lnode_hop = gen_lnode(dest_dev, search_dev_id, lnode_hop); ++ ++ list_for_each_entry_reverse(search_node, route_list, link) { ++ list_for_each_entry(bus_node, &search_node->node_list, link) { ++ unsigned int i; ++ for (i = 0; i < bus_node->node_info->num_connections; ++ i++) { ++ if (bus_node->node_info->connections[i] == ++ search_dev_id) { ++ dest_dev = bus_find_device( ++ &msm_bus_type, ++ NULL, ++ (void *) ++ &bus_node->node_info-> ++ id, ++ msm_bus_device_match_adhoc); ++ ++ if (!dest_dev) { ++ lnode_hop = -1; ++ goto reset_links; ++ } ++ ++ lnode_hop = gen_lnode(dest_dev, ++ search_dev_id, ++ lnode_hop); ++ search_dev_id = ++ bus_node->node_info->id; ++ break; ++ } ++ } ++ } ++ } ++reset_links: ++ list_for_each_entry_safe(search_node, temp_search_node, route_list, ++ link) { ++ list_for_each_entry(bus_node, &search_node->node_list, ++ link) ++ bus_node->node_info->is_traversed = false; ++ ++ list_del(&search_node->link); ++ kfree(search_node); ++ } ++ ++ list_for_each_safe(bl_list, temp_bl_list, black_list) ++ list_del(bl_list); ++ ++exit_prune_path: ++ return lnode_hop; ++} ++ ++static void setup_bl_list(struct msm_bus_node_device_type *node, ++ struct list_head *black_list) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < node->node_info->num_blist; i++) { ++ struct msm_bus_node_device_type *bdev; ++ bdev = node->node_info->black_connections[i]->platform_data; ++ list_add_tail(&bdev->link, black_list); ++ } ++} ++ ++static int getpath(int src, int dest) ++{ ++ struct list_head traverse_list; ++ struct list_head edge_list; ++ struct list_head route_list; ++ struct list_head black_list; ++ struct device *src_dev = bus_find_device(&msm_bus_type, NULL, ++ (void *) &src, ++ msm_bus_device_match_adhoc); ++ struct msm_bus_node_device_type *src_node; ++ struct bus_search_type *search_node; ++ int found = 0; ++ int depth_index = 0; ++ int first_hop = -1; ++ ++ INIT_LIST_HEAD(&traverse_list); ++ INIT_LIST_HEAD(&edge_list); ++ INIT_LIST_HEAD(&route_list); ++ INIT_LIST_HEAD(&black_list); ++ ++ if (!src_dev) { ++ MSM_BUS_ERR("%s: Cannot locate src dev %d", __func__, src); ++ goto exit_getpath; ++ } ++ ++ src_node = src_dev->platform_data; ++ if (!src_node) { ++ MSM_BUS_ERR("%s:Fatal, Source dev %d not found", __func__, src); ++ goto exit_getpath; ++ } ++ list_add_tail(&src_node->link, &traverse_list); ++ ++ while ((!found && !list_empty(&traverse_list))) { ++ struct msm_bus_node_device_type *bus_node = NULL; ++ /* Locate dest_id in the traverse list */ ++ list_for_each_entry(bus_node, &traverse_list, link) { ++ if (bus_node->node_info->id == dest) { ++ found = 1; ++ break; ++ } ++ } ++ ++ if (!found) { ++ unsigned int i; ++ /* Setup the new edge list */ ++ list_for_each_entry(bus_node, &traverse_list, link) { ++ /* Setup list of black-listed nodes */ ++ setup_bl_list(bus_node, &black_list); ++ ++ for (i = 0; i < bus_node->node_info-> ++ num_connections; i++) { ++ bool skip; ++ struct msm_bus_node_device_type ++ *node_conn; ++ node_conn = bus_node->node_info-> ++ dev_connections[i]-> ++ platform_data; ++ if (node_conn->node_info-> ++ is_traversed) { ++ MSM_BUS_ERR("Circ Path %d\n", ++ node_conn->node_info->id); ++ goto reset_traversed; ++ } ++ skip = chk_bl_list(&black_list, ++ bus_node->node_info-> ++ connections[i]); ++ if (!skip) { ++ list_add_tail(&node_conn->link, ++ &edge_list); ++ node_conn->node_info-> ++ is_traversed = true; ++ } ++ } ++ } ++ ++ /* Keep tabs of the previous search list */ ++ search_node = kzalloc(sizeof(struct bus_search_type), ++ GFP_KERNEL); ++ INIT_LIST_HEAD(&search_node->node_list); ++ list_splice_init(&traverse_list, ++ &search_node->node_list); ++ /* Add the previous search list to a route list */ ++ list_add_tail(&search_node->link, &route_list); ++ /* Advancing the list depth */ ++ depth_index++; ++ list_splice_init(&edge_list, &traverse_list); ++ } ++ } ++reset_traversed: ++ copy_remaining_nodes(&edge_list, &traverse_list, &route_list); ++ first_hop = prune_path(&route_list, dest, src, &black_list, found); ++ ++exit_getpath: ++ return first_hop; ++} ++ ++static uint64_t arbitrate_bus_req(struct msm_bus_node_device_type *bus_dev, ++ int ctx) ++{ ++ int i; ++ uint64_t max_ib = 0; ++ uint64_t sum_ab = 0; ++ uint64_t bw_max_hz; ++ struct msm_bus_node_device_type *fab_dev = NULL; ++ uint32_t util_fact = 0; ++ uint32_t vrail_comp = 0; ++ ++ /* Find max ib */ ++ for (i = 0; i < bus_dev->num_lnodes; i++) { ++ max_ib = max(max_ib, bus_dev->lnode_list[i].lnode_ib[ctx]); ++ sum_ab += bus_dev->lnode_list[i].lnode_ab[ctx]; ++ } ++ /* ++ * Account for Util factor and vrail comp. The new aggregation ++ * formula is: ++ * Freq_hz = max((sum(ab) * util_fact)/num_chan, max(ib)/vrail_comp) ++ * / bus-width ++ * util_fact and vrail comp are obtained from fabric/Node's dts ++ * properties. ++ * They default to 100 if absent. ++ */ ++ fab_dev = bus_dev->node_info->bus_device->platform_data; ++ /* Don't do this for virtual fabrics */ ++ if (fab_dev && fab_dev->fabdev) { ++ util_fact = bus_dev->node_info->util_fact ? ++ bus_dev->node_info->util_fact : ++ fab_dev->fabdev->util_fact; ++ vrail_comp = bus_dev->node_info->vrail_comp ? ++ bus_dev->node_info->vrail_comp : ++ fab_dev->fabdev->vrail_comp; ++ sum_ab *= util_fact; ++ sum_ab = msm_bus_div64(100, sum_ab); ++ max_ib *= 100; ++ max_ib = msm_bus_div64(vrail_comp, max_ib); ++ } ++ ++ /* Account for multiple channels if any */ ++ if (bus_dev->node_info->num_qports > 1) ++ sum_ab = msm_bus_div64(bus_dev->node_info->num_qports, ++ sum_ab); ++ ++ if (!bus_dev->node_info->buswidth) { ++ MSM_BUS_WARN("No bus width found for %d. Using default\n", ++ bus_dev->node_info->id); ++ bus_dev->node_info->buswidth = 8; ++ } ++ ++ bw_max_hz = max(max_ib, sum_ab); ++ bw_max_hz = msm_bus_div64(bus_dev->node_info->buswidth, ++ bw_max_hz); ++ ++ return bw_max_hz; ++} ++ ++static void del_inp_list(struct list_head *list) ++{ ++ struct rule_update_path_info *rule_node; ++ struct rule_update_path_info *rule_node_tmp; ++ ++ list_for_each_entry_safe(rule_node, rule_node_tmp, list, link) ++ list_del(&rule_node->link); ++} ++ ++static void del_op_list(struct list_head *list) ++{ ++ struct rule_apply_rcm_info *rule; ++ struct rule_apply_rcm_info *rule_tmp; ++ ++ list_for_each_entry_safe(rule, rule_tmp, list, link) ++ list_del(&rule->link); ++} ++ ++static int msm_bus_apply_rules(struct list_head *list, bool after_clk_commit) ++{ ++ struct rule_apply_rcm_info *rule; ++ struct device *dev = NULL; ++ struct msm_bus_node_device_type *dev_info = NULL; ++ int ret = 0; ++ bool throttle_en = false; ++ ++ list_for_each_entry(rule, list, link) { ++ if (!rule) ++ break; ++ ++ if (rule && (rule->after_clk_commit != after_clk_commit)) ++ continue; ++ ++ dev = bus_find_device(&msm_bus_type, NULL, ++ (void *) &rule->id, ++ msm_bus_device_match_adhoc); ++ ++ if (!dev) { ++ MSM_BUS_ERR("Can't find dev node for %d", rule->id); ++ continue; ++ } ++ dev_info = dev->platform_data; ++ ++ throttle_en = ((rule->throttle == THROTTLE_ON) ? true : false); ++ ret = msm_bus_enable_limiter(dev_info, throttle_en, ++ rule->lim_bw); ++ if (ret) ++ MSM_BUS_ERR("Failed to set limiter for %d", rule->id); ++ } ++ ++ return ret; ++} ++ ++static uint64_t get_node_aggab(struct msm_bus_node_device_type *bus_dev) ++{ ++ int i; ++ int ctx; ++ uint64_t max_agg_ab = 0; ++ uint64_t agg_ab = 0; ++ ++ for (ctx = 0; ctx < NUM_CTX; ctx++) { ++ for (i = 0; i < bus_dev->num_lnodes; i++) ++ agg_ab += bus_dev->lnode_list[i].lnode_ab[ctx]; ++ ++ if (bus_dev->node_info->num_qports > 1) ++ agg_ab = msm_bus_div64(bus_dev->node_info->num_qports, ++ agg_ab); ++ ++ max_agg_ab = max(max_agg_ab, agg_ab); ++ } ++ ++ return max_agg_ab; ++} ++ ++static uint64_t get_node_ib(struct msm_bus_node_device_type *bus_dev) ++{ ++ int i; ++ int ctx; ++ uint64_t max_ib = 0; ++ ++ for (ctx = 0; ctx < NUM_CTX; ctx++) { ++ for (i = 0; i < bus_dev->num_lnodes; i++) ++ max_ib = max(max_ib, ++ bus_dev->lnode_list[i].lnode_ib[ctx]); ++ } ++ return max_ib; ++} ++ ++static int update_path(int src, int dest, uint64_t req_ib, uint64_t req_bw, ++ uint64_t cur_ib, uint64_t cur_bw, int src_idx, int ctx) ++{ ++ struct device *src_dev = NULL; ++ struct device *next_dev = NULL; ++ struct link_node *lnode = NULL; ++ struct msm_bus_node_device_type *dev_info = NULL; ++ int curr_idx; ++ int ret = 0; ++ int *dirty_nodes = NULL; ++ int num_dirty = 0; ++ struct rule_update_path_info *rule_node; ++ bool rules_registered = msm_rule_are_rules_registered(); ++ ++ src_dev = bus_find_device(&msm_bus_type, NULL, ++ (void *) &src, ++ msm_bus_device_match_adhoc); ++ ++ if (!src_dev) { ++ MSM_BUS_ERR("%s: Can't find source device %d", __func__, src); ++ ret = -ENODEV; ++ goto exit_update_path; ++ } ++ ++ next_dev = src_dev; ++ ++ if (src_idx < 0) { ++ MSM_BUS_ERR("%s: Invalid lnode idx %d", __func__, src_idx); ++ ret = -ENXIO; ++ goto exit_update_path; ++ } ++ curr_idx = src_idx; ++ ++ INIT_LIST_HEAD(&input_list); ++ INIT_LIST_HEAD(&apply_list); ++ ++ while (next_dev) { ++ dev_info = next_dev->platform_data; ++ ++ if (curr_idx >= dev_info->num_lnodes) { ++ MSM_BUS_ERR("%s: Invalid lnode Idx %d num lnodes %d", ++ __func__, curr_idx, dev_info->num_lnodes); ++ ret = -ENXIO; ++ goto exit_update_path; ++ } ++ ++ lnode = &dev_info->lnode_list[curr_idx]; ++ lnode->lnode_ib[ctx] = req_ib; ++ lnode->lnode_ab[ctx] = req_bw; ++ ++ dev_info->cur_clk_hz[ctx] = arbitrate_bus_req(dev_info, ctx); ++ ++ /* Start updating the clocks at the first hop. ++ * Its ok to figure out the aggregated ++ * request at this node. ++ */ ++ if (src_dev != next_dev) { ++ ret = msm_bus_update_clks(dev_info, ctx, &dirty_nodes, ++ &num_dirty); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to update clks dev %d", ++ __func__, dev_info->node_info->id); ++ goto exit_update_path; ++ } ++ } ++ ++ ret = msm_bus_update_bw(dev_info, ctx, req_bw, &dirty_nodes, ++ &num_dirty); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to update bw dev %d", ++ __func__, dev_info->node_info->id); ++ goto exit_update_path; ++ } ++ ++ if (rules_registered) { ++ rule_node = &dev_info->node_info->rule; ++ rule_node->id = dev_info->node_info->id; ++ rule_node->ib = get_node_ib(dev_info); ++ rule_node->ab = get_node_aggab(dev_info); ++ rule_node->clk = max(dev_info->cur_clk_hz[ACTIVE_CTX], ++ dev_info->cur_clk_hz[DUAL_CTX]); ++ list_add_tail(&rule_node->link, &input_list); ++ } ++ ++ next_dev = lnode->next_dev; ++ curr_idx = lnode->next; ++ } ++ ++ if (rules_registered) { ++ msm_rules_update_path(&input_list, &apply_list); ++ msm_bus_apply_rules(&apply_list, false); ++ } ++ ++ msm_bus_commit_data(dirty_nodes, ctx, num_dirty); ++ ++ if (rules_registered) { ++ msm_bus_apply_rules(&apply_list, true); ++ del_inp_list(&input_list); ++ del_op_list(&apply_list); ++ } ++exit_update_path: ++ return ret; ++} ++ ++static int remove_path(int src, int dst, uint64_t cur_ib, uint64_t cur_ab, ++ int src_idx, int active_only) ++{ ++ struct device *src_dev = NULL; ++ struct device *next_dev = NULL; ++ struct link_node *lnode = NULL; ++ struct msm_bus_node_device_type *dev_info = NULL; ++ int ret = 0; ++ int cur_idx = src_idx; ++ int next_idx; ++ ++ /* Update the current path to zero out all request from ++ * this cient on all paths ++ */ ++ ++ ret = update_path(src, dst, 0, 0, cur_ib, cur_ab, src_idx, ++ active_only); ++ if (ret) { ++ MSM_BUS_ERR("%s: Error zeroing out path ctx %d", ++ __func__, ACTIVE_CTX); ++ goto exit_remove_path; ++ } ++ ++ src_dev = bus_find_device(&msm_bus_type, NULL, ++ (void *) &src, ++ msm_bus_device_match_adhoc); ++ if (!src_dev) { ++ MSM_BUS_ERR("%s: Can't find source device %d", __func__, src); ++ ret = -ENODEV; ++ goto exit_remove_path; ++ } ++ ++ next_dev = src_dev; ++ ++ while (next_dev) { ++ dev_info = next_dev->platform_data; ++ lnode = &dev_info->lnode_list[cur_idx]; ++ next_idx = lnode->next; ++ next_dev = lnode->next_dev; ++ remove_lnode(dev_info, cur_idx); ++ cur_idx = next_idx; ++ } ++ ++exit_remove_path: ++ return ret; ++} ++ ++static void getpath_debug(int src, int curr, int active_only) ++{ ++ struct device *dev_node; ++ struct device *dev_it; ++ unsigned int hop = 1; ++ int idx; ++ struct msm_bus_node_device_type *devinfo; ++ int i; ++ ++ dev_node = bus_find_device(&msm_bus_type, NULL, ++ (void *) &src, ++ msm_bus_device_match_adhoc); ++ ++ if (!dev_node) { ++ MSM_BUS_ERR("SRC NOT FOUND %d", src); ++ return; ++ } ++ ++ idx = curr; ++ devinfo = dev_node->platform_data; ++ dev_it = dev_node; ++ ++ MSM_BUS_ERR("Route list Src %d", src); ++ while (dev_it) { ++ struct msm_bus_node_device_type *busdev = ++ devinfo->node_info->bus_device->platform_data; ++ ++ MSM_BUS_ERR("Hop[%d] at Device %d ctx %d", hop, ++ devinfo->node_info->id, active_only); ++ ++ for (i = 0; i < NUM_CTX; i++) { ++ MSM_BUS_ERR("dev info sel ib %llu", ++ devinfo->cur_clk_hz[i]); ++ MSM_BUS_ERR("dev info sel ab %llu", ++ devinfo->node_ab.ab[i]); ++ } ++ ++ dev_it = devinfo->lnode_list[idx].next_dev; ++ idx = devinfo->lnode_list[idx].next; ++ if (dev_it) ++ devinfo = dev_it->platform_data; ++ ++ MSM_BUS_ERR("Bus Device %d", busdev->node_info->id); ++ MSM_BUS_ERR("Bus Clock %llu", busdev->clk[active_only].rate); ++ ++ if (idx < 0) ++ break; ++ hop++; ++ } ++} ++ ++static void unregister_client_adhoc(uint32_t cl) ++{ ++ int i; ++ struct msm_bus_scale_pdata *pdata; ++ int lnode, src, curr, dest; ++ uint64_t cur_clk, cur_bw; ++ struct msm_bus_client *client; ++ ++ mutex_lock(&msm_bus_adhoc_lock); ++ if (!cl) { ++ MSM_BUS_ERR("%s: Null cl handle passed unregister\n", ++ __func__); ++ goto exit_unregister_client; ++ } ++ client = handle_list.cl_list[cl]; ++ pdata = client->pdata; ++ if (!pdata) { ++ MSM_BUS_ERR("%s: Null pdata passed to unregister\n", ++ __func__); ++ goto exit_unregister_client; ++ } ++ ++ curr = client->curr; ++ if (curr >= pdata->num_usecases) { ++ MSM_BUS_ERR("Invalid index Defaulting curr to 0"); ++ curr = 0; ++ } ++ ++ MSM_BUS_DBG("%s: Unregistering client %p", __func__, client); ++ ++ for (i = 0; i < pdata->usecase->num_paths; i++) { ++ src = client->pdata->usecase[curr].vectors[i].src; ++ dest = client->pdata->usecase[curr].vectors[i].dst; ++ ++ lnode = client->src_pnode[i]; ++ cur_clk = client->pdata->usecase[curr].vectors[i].ib; ++ cur_bw = client->pdata->usecase[curr].vectors[i].ab; ++ remove_path(src, dest, cur_clk, cur_bw, lnode, ++ pdata->active_only); ++ } ++ msm_bus_dbg_client_data(client->pdata, MSM_BUS_DBG_UNREGISTER, cl); ++ kfree(client->src_pnode); ++ kfree(client); ++ handle_list.cl_list[cl] = NULL; ++exit_unregister_client: ++ mutex_unlock(&msm_bus_adhoc_lock); ++ return; ++} ++ ++static int alloc_handle_lst(int size) ++{ ++ int ret = 0; ++ struct msm_bus_client **t_cl_list; ++ ++ if (!handle_list.num_entries) { ++ t_cl_list = kzalloc(sizeof(struct msm_bus_client *) ++ * NUM_CL_HANDLES, GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(t_cl_list)) { ++ ret = -ENOMEM; ++ MSM_BUS_ERR("%s: Failed to allocate handles list", ++ __func__); ++ goto exit_alloc_handle_lst; ++ } ++ handle_list.cl_list = t_cl_list; ++ handle_list.num_entries += NUM_CL_HANDLES; ++ } else { ++ t_cl_list = krealloc(handle_list.cl_list, ++ sizeof(struct msm_bus_client *) * ++ handle_list.num_entries + NUM_CL_HANDLES, ++ GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(t_cl_list)) { ++ ret = -ENOMEM; ++ MSM_BUS_ERR("%s: Failed to allocate handles list", ++ __func__); ++ goto exit_alloc_handle_lst; ++ } ++ ++ memset(&handle_list.cl_list[handle_list.num_entries], 0, ++ NUM_CL_HANDLES * sizeof(struct msm_bus_client *)); ++ handle_list.num_entries += NUM_CL_HANDLES; ++ handle_list.cl_list = t_cl_list; ++ } ++exit_alloc_handle_lst: ++ return ret; ++} ++ ++static uint32_t gen_handle(struct msm_bus_client *client) ++{ ++ uint32_t handle = 0; ++ int i; ++ int ret = 0; ++ ++ for (i = 0; i < handle_list.num_entries; i++) { ++ if (i && !handle_list.cl_list[i]) { ++ handle = i; ++ break; ++ } ++ } ++ ++ if (!handle) { ++ ret = alloc_handle_lst(NUM_CL_HANDLES); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to allocate handle list", ++ __func__); ++ goto exit_gen_handle; ++ } ++ handle = i + 1; ++ } ++ handle_list.cl_list[handle] = client; ++exit_gen_handle: ++ return handle; ++} ++ ++static uint32_t register_client_adhoc(struct msm_bus_scale_pdata *pdata) ++{ ++ int src, dest; ++ int i; ++ struct msm_bus_client *client = NULL; ++ int *lnode; ++ uint32_t handle = 0; ++ ++ mutex_lock(&msm_bus_adhoc_lock); ++ client = kzalloc(sizeof(struct msm_bus_client), GFP_KERNEL); ++ if (!client) { ++ MSM_BUS_ERR("%s: Error allocating client data", __func__); ++ goto exit_register_client; ++ } ++ client->pdata = pdata; ++ ++ lnode = kzalloc(pdata->usecase->num_paths * sizeof(int), GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(lnode)) { ++ MSM_BUS_ERR("%s: Error allocating pathnode ptr!", __func__); ++ goto exit_register_client; ++ } ++ client->src_pnode = lnode; ++ ++ for (i = 0; i < pdata->usecase->num_paths; i++) { ++ src = pdata->usecase->vectors[i].src; ++ dest = pdata->usecase->vectors[i].dst; ++ ++ if ((src < 0) || (dest < 0)) { ++ MSM_BUS_ERR("%s:Invalid src/dst.src %d dest %d", ++ __func__, src, dest); ++ goto exit_register_client; ++ } ++ ++ lnode[i] = getpath(src, dest); ++ if (lnode[i] < 0) { ++ MSM_BUS_ERR("%s:Failed to find path.src %d dest %d", ++ __func__, src, dest); ++ goto exit_register_client; ++ } ++ } ++ ++ handle = gen_handle(client); ++ msm_bus_dbg_client_data(client->pdata, MSM_BUS_DBG_REGISTER, ++ handle); ++ MSM_BUS_DBG("%s:Client handle %d %s", __func__, handle, ++ client->pdata->name); ++exit_register_client: ++ mutex_unlock(&msm_bus_adhoc_lock); ++ return handle; ++} ++ ++static int update_request_adhoc(uint32_t cl, unsigned int index) ++{ ++ int i, ret = 0; ++ struct msm_bus_scale_pdata *pdata; ++ int lnode, src, curr, dest; ++ uint64_t req_clk, req_bw, curr_clk, curr_bw; ++ struct msm_bus_client *client; ++ const char *test_cl = "Null"; ++ bool log_transaction = false; ++ ++ mutex_lock(&msm_bus_adhoc_lock); ++ ++ if (!cl) { ++ MSM_BUS_ERR("%s: Invalid client handle %d", __func__, cl); ++ ret = -ENXIO; ++ goto exit_update_request; ++ } ++ ++ client = handle_list.cl_list[cl]; ++ pdata = client->pdata; ++ if (!pdata) { ++ MSM_BUS_ERR("%s: Client data Null.[client didn't register]", ++ __func__); ++ ret = -ENXIO; ++ goto exit_update_request; ++ } ++ ++ if (index >= pdata->num_usecases) { ++ MSM_BUS_ERR("Client %u passed invalid index: %d\n", ++ cl, index); ++ ret = -ENXIO; ++ goto exit_update_request; ++ } ++ ++ if (client->curr == index) { ++ MSM_BUS_DBG("%s: Not updating client request idx %d unchanged", ++ __func__, index); ++ goto exit_update_request; ++ } ++ ++ curr = client->curr; ++ client->curr = index; ++ ++ if (!strcmp(test_cl, pdata->name)) ++ log_transaction = true; ++ ++ MSM_BUS_DBG("%s: cl: %u index: %d curr: %d num_paths: %d\n", __func__, ++ cl, index, client->curr, client->pdata->usecase->num_paths); ++ ++ for (i = 0; i < pdata->usecase->num_paths; i++) { ++ src = client->pdata->usecase[index].vectors[i].src; ++ dest = client->pdata->usecase[index].vectors[i].dst; ++ ++ lnode = client->src_pnode[i]; ++ req_clk = client->pdata->usecase[index].vectors[i].ib; ++ req_bw = client->pdata->usecase[index].vectors[i].ab; ++ if (curr < 0) { ++ curr_clk = 0; ++ curr_bw = 0; ++ } else { ++ curr_clk = client->pdata->usecase[curr].vectors[i].ib; ++ curr_bw = client->pdata->usecase[curr].vectors[i].ab; ++ MSM_BUS_DBG("%s:ab: %llu ib: %llu\n", __func__, ++ curr_bw, curr_clk); ++ } ++ ++ ret = update_path(src, dest, req_clk, req_bw, ++ curr_clk, curr_bw, lnode, pdata->active_only); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Update path failed! %d ctx %d\n", ++ __func__, ret, ACTIVE_CTX); ++ goto exit_update_request; ++ } ++ ++ if (log_transaction) ++ getpath_debug(src, lnode, pdata->active_only); ++ } ++ msm_bus_dbg_client_data(client->pdata, index , cl); ++exit_update_request: ++ mutex_unlock(&msm_bus_adhoc_lock); ++ return ret; ++} ++ ++/** ++ * msm_bus_arb_setops_adhoc() : Setup the bus arbitration ops ++ * @ arb_ops: pointer to the arb ops. ++ */ ++void msm_bus_arb_setops_adhoc(struct msm_bus_arb_ops *arb_ops) ++{ ++ arb_ops->register_client = register_client_adhoc; ++ arb_ops->update_request = update_request_adhoc; ++ arb_ops->unregister_client = unregister_client_adhoc; ++} +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_bimc.c +@@ -0,0 +1,2112 @@ ++/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#define pr_fmt(fmt) "AXI: BIMC: %s(): " fmt, __func__ ++ ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm_bus_core.h" ++#include "msm_bus_bimc.h" ++#include "msm_bus_adhoc.h" ++#include ++ ++enum msm_bus_bimc_slave_block { ++ SLAVE_BLOCK_RESERVED = 0, ++ SLAVE_BLOCK_SLAVE_WAY, ++ SLAVE_BLOCK_XPU, ++ SLAVE_BLOCK_ARBITER, ++ SLAVE_BLOCK_SCMO, ++}; ++ ++enum bke_sw { ++ BKE_OFF = 0, ++ BKE_ON = 1, ++}; ++ ++/* M_Generic */ ++ ++#define M_REG_BASE(b) ((b) + 0x00008000) ++ ++#define M_COMPONENT_INFO_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000000) ++enum bimc_m_component_info { ++ M_COMPONENT_INFO_RMSK = 0xffffff, ++ M_COMPONENT_INFO_INSTANCE_BMSK = 0xff0000, ++ M_COMPONENT_INFO_INSTANCE_SHFT = 0x10, ++ M_COMPONENT_INFO_SUB_TYPE_BMSK = 0xff00, ++ M_COMPONENT_INFO_SUB_TYPE_SHFT = 0x8, ++ M_COMPONENT_INFO_TYPE_BMSK = 0xff, ++ M_COMPONENT_INFO_TYPE_SHFT = 0x0, ++}; ++ ++#define M_CONFIG_INFO_0_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000020) ++enum bimc_m_config_info_0 { ++ M_CONFIG_INFO_0_RMSK = 0xff00ffff, ++ M_CONFIG_INFO_0_SYNC_MODE_BMSK = 0xff000000, ++ M_CONFIG_INFO_0_SYNC_MODE_SHFT = 0x18, ++ M_CONFIG_INFO_0_CONNECTION_TYPE_BMSK = 0xff00, ++ M_CONFIG_INFO_0_CONNECTION_TYPE_SHFT = 0x8, ++ M_CONFIG_INFO_0_FUNC_BMSK = 0xff, ++ M_CONFIG_INFO_0_FUNC_SHFT = 0x0, ++}; ++ ++#define M_CONFIG_INFO_1_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000030) ++enum bimc_m_config_info_1 { ++ M_CONFIG_INFO_1_RMSK = 0xffffffff, ++ M_CONFIG_INFO_1_SWAY_CONNECTIVITY_BMSK = 0xffffffff, ++ M_CONFIG_INFO_1_SWAY_CONNECTIVITY_SHFT = 0x0, ++}; ++ ++#define M_CONFIG_INFO_2_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000040) ++enum bimc_m_config_info_2 { ++ M_CONFIG_INFO_2_RMSK = 0xffffffff, ++ M_CONFIG_INFO_2_M_DATA_WIDTH_BMSK = 0xffff0000, ++ M_CONFIG_INFO_2_M_DATA_WIDTH_SHFT = 0x10, ++ M_CONFIG_INFO_2_M_TID_WIDTH_BMSK = 0xff00, ++ M_CONFIG_INFO_2_M_TID_WIDTH_SHFT = 0x8, ++ M_CONFIG_INFO_2_M_MID_WIDTH_BMSK = 0xff, ++ M_CONFIG_INFO_2_M_MID_WIDTH_SHFT = 0x0, ++}; ++ ++#define M_CONFIG_INFO_3_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000050) ++enum bimc_m_config_info_3 { ++ M_CONFIG_INFO_3_RMSK = 0xffffffff, ++ M_CONFIG_INFO_3_RCH_DEPTH_BMSK = 0xff000000, ++ M_CONFIG_INFO_3_RCH_DEPTH_SHFT = 0x18, ++ M_CONFIG_INFO_3_BCH_DEPTH_BMSK = 0xff0000, ++ M_CONFIG_INFO_3_BCH_DEPTH_SHFT = 0x10, ++ M_CONFIG_INFO_3_WCH_DEPTH_BMSK = 0xff00, ++ M_CONFIG_INFO_3_WCH_DEPTH_SHFT = 0x8, ++ M_CONFIG_INFO_3_ACH_DEPTH_BMSK = 0xff, ++ M_CONFIG_INFO_3_ACH_DEPTH_SHFT = 0x0, ++}; ++ ++#define M_CONFIG_INFO_4_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000060) ++enum bimc_m_config_info_4 { ++ M_CONFIG_INFO_4_RMSK = 0xffff, ++ M_CONFIG_INFO_4_REORDER_BUF_DEPTH_BMSK = 0xff00, ++ M_CONFIG_INFO_4_REORDER_BUF_DEPTH_SHFT = 0x8, ++ M_CONFIG_INFO_4_REORDER_TABLE_DEPTH_BMSK = 0xff, ++ M_CONFIG_INFO_4_REORDER_TABLE_DEPTH_SHFT = 0x0, ++}; ++ ++#define M_CONFIG_INFO_5_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000070) ++enum bimc_m_config_info_5 { ++ M_CONFIG_INFO_5_RMSK = 0x111, ++ M_CONFIG_INFO_5_MP2ARB_PIPELINE_EN_BMSK = 0x100, ++ M_CONFIG_INFO_5_MP2ARB_PIPELINE_EN_SHFT = 0x8, ++ M_CONFIG_INFO_5_MPBUF_PIPELINE_EN_BMSK = 0x10, ++ M_CONFIG_INFO_5_MPBUF_PIPELINE_EN_SHFT = 0x4, ++ M_CONFIG_INFO_5_M2MP_PIPELINE_EN_BMSK = 0x1, ++ M_CONFIG_INFO_5_M2MP_PIPELINE_EN_SHFT = 0x0, ++}; ++ ++#define M_INT_STATUS_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000100) ++enum bimc_m_int_status { ++ M_INT_STATUS_RMSK = 0x3, ++}; ++ ++#define M_INT_CLR_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000108) ++enum bimc_m_int_clr { ++ M_INT_CLR_RMSK = 0x3, ++}; ++ ++#define M_INT_EN_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x0000010c) ++enum bimc_m_int_en { ++ M_INT_EN_RMSK = 0x3, ++}; ++ ++#define M_CLK_CTRL_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000200) ++enum bimc_m_clk_ctrl { ++ M_CLK_CTRL_RMSK = 0x3, ++ M_CLK_CTRL_MAS_CLK_GATING_EN_BMSK = 0x2, ++ M_CLK_CTRL_MAS_CLK_GATING_EN_SHFT = 0x1, ++ M_CLK_CTRL_CORE_CLK_GATING_EN_BMSK = 0x1, ++ M_CLK_CTRL_CORE_CLK_GATING_EN_SHFT = 0x0, ++}; ++ ++#define M_MODE_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000210) ++enum bimc_m_mode { ++ M_MODE_RMSK = 0xf0000011, ++ M_MODE_WR_GATHER_BEATS_BMSK = 0xf0000000, ++ M_MODE_WR_GATHER_BEATS_SHFT = 0x1c, ++ M_MODE_NARROW_WR_BMSK = 0x10, ++ M_MODE_NARROW_WR_SHFT = 0x4, ++ M_MODE_ORDERING_MODEL_BMSK = 0x1, ++ M_MODE_ORDERING_MODEL_SHFT = 0x0, ++}; ++ ++#define M_PRIOLVL_OVERRIDE_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000230) ++enum bimc_m_priolvl_override { ++ M_PRIOLVL_OVERRIDE_RMSK = 0x301, ++ M_PRIOLVL_OVERRIDE_BMSK = 0x300, ++ M_PRIOLVL_OVERRIDE_SHFT = 0x8, ++ M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_BMSK = 0x1, ++ M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_SHFT = 0x0, ++}; ++ ++#define M_RD_CMD_OVERRIDE_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000240) ++enum bimc_m_read_command_override { ++ M_RD_CMD_OVERRIDE_RMSK = 0x3071f7f, ++ M_RD_CMD_OVERRIDE_AREQPRIO_BMSK = 0x3000000, ++ M_RD_CMD_OVERRIDE_AREQPRIO_SHFT = 0x18, ++ M_RD_CMD_OVERRIDE_AMEMTYPE_BMSK = 0x70000, ++ M_RD_CMD_OVERRIDE_AMEMTYPE_SHFT = 0x10, ++ M_RD_CMD_OVERRIDE_ATRANSIENT_BMSK = 0x1000, ++ M_RD_CMD_OVERRIDE_ATRANSIENT_SHFT = 0xc, ++ M_RD_CMD_OVERRIDE_ASHARED_BMSK = 0x800, ++ M_RD_CMD_OVERRIDE_ASHARED_SHFT = 0xb, ++ M_RD_CMD_OVERRIDE_AREDIRECT_BMSK = 0x400, ++ M_RD_CMD_OVERRIDE_AREDIRECT_SHFT = 0xa, ++ M_RD_CMD_OVERRIDE_AOOO_BMSK = 0x200, ++ M_RD_CMD_OVERRIDE_AOOO_SHFT = 0x9, ++ M_RD_CMD_OVERRIDE_AINNERSHARED_BMSK = 0x100, ++ M_RD_CMD_OVERRIDE_AINNERSHARED_SHFT = 0x8, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK = 0x40, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT = 0x6, ++ M_RD_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_BMSK = 0x20, ++ M_RD_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_SHFT = 0x5, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_BMSK = 0x10, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_SHFT = 0x4, ++ M_RD_CMD_OVERRIDE_OVERRIDE_ASHARED_BMSK = 0x8, ++ M_RD_CMD_OVERRIDE_OVERRIDE_ASHARED_SHFT = 0x3, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AREDIRECT_BMSK = 0x4, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AREDIRECT_SHFT = 0x2, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AOOO_BMSK = 0x2, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AOOO_SHFT = 0x1, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_BMSK = 0x1, ++ M_RD_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_SHFT = 0x0, ++}; ++ ++#define M_WR_CMD_OVERRIDE_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000250) ++enum bimc_m_write_command_override { ++ M_WR_CMD_OVERRIDE_RMSK = 0x3071f7f, ++ M_WR_CMD_OVERRIDE_AREQPRIO_BMSK = 0x3000000, ++ M_WR_CMD_OVERRIDE_AREQPRIO_SHFT = 0x18, ++ M_WR_CMD_OVERRIDE_AMEMTYPE_BMSK = 0x70000, ++ M_WR_CMD_OVERRIDE_AMEMTYPE_SHFT = 0x10, ++ M_WR_CMD_OVERRIDE_ATRANSIENT_BMSK = 0x1000, ++ M_WR_CMD_OVERRIDE_ATRANSIENT_SHFT = 0xc, ++ M_WR_CMD_OVERRIDE_ASHARED_BMSK = 0x800, ++ M_WR_CMD_OVERRIDE_ASHARED_SHFT = 0xb, ++ M_WR_CMD_OVERRIDE_AREDIRECT_BMSK = 0x400, ++ M_WR_CMD_OVERRIDE_AREDIRECT_SHFT = 0xa, ++ M_WR_CMD_OVERRIDE_AOOO_BMSK = 0x200, ++ M_WR_CMD_OVERRIDE_AOOO_SHFT = 0x9, ++ M_WR_CMD_OVERRIDE_AINNERSHARED_BMSK = 0x100, ++ M_WR_CMD_OVERRIDE_AINNERSHARED_SHFT = 0x8, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK = 0x40, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT = 0x6, ++ M_WR_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_BMSK = 0x20, ++ M_WR_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_SHFT = 0x5, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_BMSK = 0x10, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_SHFT = 0x4, ++ M_WR_CMD_OVERRIDE_OVERRIDE_ASHARED_BMSK = 0x8, ++ M_WR_CMD_OVERRIDE_OVERRIDE_ASHARED_SHFT = 0x3, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AREDIRECT_BMSK = 0x4, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AREDIRECT_SHFT = 0x2, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AOOO_BMSK = 0x2, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AOOO_SHFT = 0x1, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_BMSK = 0x1, ++ M_WR_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_SHFT = 0x0, ++}; ++ ++#define M_BKE_EN_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000300) ++enum bimc_m_bke_en { ++ M_BKE_EN_RMSK = 0x1, ++ M_BKE_EN_EN_BMSK = 0x1, ++ M_BKE_EN_EN_SHFT = 0x0, ++}; ++ ++/* Grant Period registers */ ++#define M_BKE_GP_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000304) ++enum bimc_m_bke_grant_period { ++ M_BKE_GP_RMSK = 0x3ff, ++ M_BKE_GP_GP_BMSK = 0x3ff, ++ M_BKE_GP_GP_SHFT = 0x0, ++}; ++ ++/* Grant count register. ++ * The Grant count register represents a signed 16 bit ++ * value, range 0-0x7fff ++ */ ++#define M_BKE_GC_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000308) ++enum bimc_m_bke_grant_count { ++ M_BKE_GC_RMSK = 0xffff, ++ M_BKE_GC_GC_BMSK = 0xffff, ++ M_BKE_GC_GC_SHFT = 0x0, ++}; ++ ++/* Threshold High Registers */ ++#define M_BKE_THH_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000320) ++enum bimc_m_bke_thresh_high { ++ M_BKE_THH_RMSK = 0xffff, ++ M_BKE_THH_THRESH_BMSK = 0xffff, ++ M_BKE_THH_THRESH_SHFT = 0x0, ++}; ++ ++/* Threshold Medium Registers */ ++#define M_BKE_THM_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000324) ++enum bimc_m_bke_thresh_medium { ++ M_BKE_THM_RMSK = 0xffff, ++ M_BKE_THM_THRESH_BMSK = 0xffff, ++ M_BKE_THM_THRESH_SHFT = 0x0, ++}; ++ ++/* Threshold Low Registers */ ++#define M_BKE_THL_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000328) ++enum bimc_m_bke_thresh_low { ++ M_BKE_THL_RMSK = 0xffff, ++ M_BKE_THL_THRESH_BMSK = 0xffff, ++ M_BKE_THL_THRESH_SHFT = 0x0, ++}; ++ ++#define M_BKE_HEALTH_0_CONFIG_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000340) ++enum bimc_m_bke_health_0 { ++ M_BKE_HEALTH_0_CONFIG_RMSK = 0x80000303, ++ M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_BMSK = 0x80000000, ++ M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_SHFT = 0x1f, ++ M_BKE_HEALTH_0_CONFIG_AREQPRIO_BMSK = 0x300, ++ M_BKE_HEALTH_0_CONFIG_AREQPRIO_SHFT = 0x8, ++ M_BKE_HEALTH_0_CONFIG_PRIOLVL_BMSK = 0x3, ++ M_BKE_HEALTH_0_CONFIG_PRIOLVL_SHFT = 0x0, ++}; ++ ++#define M_BKE_HEALTH_1_CONFIG_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000344) ++enum bimc_m_bke_health_1 { ++ M_BKE_HEALTH_1_CONFIG_RMSK = 0x80000303, ++ M_BKE_HEALTH_1_CONFIG_LIMIT_CMDS_BMSK = 0x80000000, ++ M_BKE_HEALTH_1_CONFIG_LIMIT_CMDS_SHFT = 0x1f, ++ M_BKE_HEALTH_1_CONFIG_AREQPRIO_BMSK = 0x300, ++ M_BKE_HEALTH_1_CONFIG_AREQPRIO_SHFT = 0x8, ++ M_BKE_HEALTH_1_CONFIG_PRIOLVL_BMSK = 0x3, ++ M_BKE_HEALTH_1_CONFIG_PRIOLVL_SHFT = 0x0, ++}; ++ ++#define M_BKE_HEALTH_2_CONFIG_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000348) ++enum bimc_m_bke_health_2 { ++ M_BKE_HEALTH_2_CONFIG_RMSK = 0x80000303, ++ M_BKE_HEALTH_2_CONFIG_LIMIT_CMDS_BMSK = 0x80000000, ++ M_BKE_HEALTH_2_CONFIG_LIMIT_CMDS_SHFT = 0x1f, ++ M_BKE_HEALTH_2_CONFIG_AREQPRIO_BMSK = 0x300, ++ M_BKE_HEALTH_2_CONFIG_AREQPRIO_SHFT = 0x8, ++ M_BKE_HEALTH_2_CONFIG_PRIOLVL_BMSK = 0x3, ++ M_BKE_HEALTH_2_CONFIG_PRIOLVL_SHFT = 0x0, ++}; ++ ++#define M_BKE_HEALTH_3_CONFIG_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x0000034c) ++enum bimc_m_bke_health_3 { ++ M_BKE_HEALTH_3_CONFIG_RMSK = 0x303, ++ M_BKE_HEALTH_3_CONFIG_AREQPRIO_BMSK = 0x300, ++ M_BKE_HEALTH_3_CONFIG_AREQPRIO_SHFT = 0x8, ++ M_BKE_HEALTH_3_CONFIG_PRIOLVL_BMSK = 0x3, ++ M_BKE_HEALTH_3_CONFIG_PRIOLVL_SHFT = 0x0, ++}; ++ ++#define M_BUF_STATUS_ADDR(b, n) \ ++ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000400) ++enum bimc_m_buf_status { ++ M_BUF_STATUS_RMSK = 0xf03f030, ++ M_BUF_STATUS_RCH_DATA_WR_FULL_BMSK = 0x8000000, ++ M_BUF_STATUS_RCH_DATA_WR_FULL_SHFT = 0x1b, ++ M_BUF_STATUS_RCH_DATA_WR_EMPTY_BMSK = 0x4000000, ++ M_BUF_STATUS_RCH_DATA_WR_EMPTY_SHFT = 0x1a, ++ M_BUF_STATUS_RCH_CTRL_WR_FULL_BMSK = 0x2000000, ++ M_BUF_STATUS_RCH_CTRL_WR_FULL_SHFT = 0x19, ++ M_BUF_STATUS_RCH_CTRL_WR_EMPTY_BMSK = 0x1000000, ++ M_BUF_STATUS_RCH_CTRL_WR_EMPTY_SHFT = 0x18, ++ M_BUF_STATUS_BCH_WR_FULL_BMSK = 0x20000, ++ M_BUF_STATUS_BCH_WR_FULL_SHFT = 0x11, ++ M_BUF_STATUS_BCH_WR_EMPTY_BMSK = 0x10000, ++ M_BUF_STATUS_BCH_WR_EMPTY_SHFT = 0x10, ++ M_BUF_STATUS_WCH_DATA_RD_FULL_BMSK = 0x8000, ++ M_BUF_STATUS_WCH_DATA_RD_FULL_SHFT = 0xf, ++ M_BUF_STATUS_WCH_DATA_RD_EMPTY_BMSK = 0x4000, ++ M_BUF_STATUS_WCH_DATA_RD_EMPTY_SHFT = 0xe, ++ M_BUF_STATUS_WCH_CTRL_RD_FULL_BMSK = 0x2000, ++ M_BUF_STATUS_WCH_CTRL_RD_FULL_SHFT = 0xd, ++ M_BUF_STATUS_WCH_CTRL_RD_EMPTY_BMSK = 0x1000, ++ M_BUF_STATUS_WCH_CTRL_RD_EMPTY_SHFT = 0xc, ++ M_BUF_STATUS_ACH_RD_FULL_BMSK = 0x20, ++ M_BUF_STATUS_ACH_RD_FULL_SHFT = 0x5, ++ M_BUF_STATUS_ACH_RD_EMPTY_BMSK = 0x10, ++ M_BUF_STATUS_ACH_RD_EMPTY_SHFT = 0x4, ++}; ++/*BIMC Generic */ ++ ++#define S_REG_BASE(b) ((b) + 0x00048000) ++ ++#define S_COMPONENT_INFO_ADDR(b, n) \ ++ (S_REG_BASE(b) + (0x8000 * (n)) + 0x00000000) ++enum bimc_s_component_info { ++ S_COMPONENT_INFO_RMSK = 0xffffff, ++ S_COMPONENT_INFO_INSTANCE_BMSK = 0xff0000, ++ S_COMPONENT_INFO_INSTANCE_SHFT = 0x10, ++ S_COMPONENT_INFO_SUB_TYPE_BMSK = 0xff00, ++ S_COMPONENT_INFO_SUB_TYPE_SHFT = 0x8, ++ S_COMPONENT_INFO_TYPE_BMSK = 0xff, ++ S_COMPONENT_INFO_TYPE_SHFT = 0x0, ++}; ++ ++#define S_HW_INFO_ADDR(b, n) \ ++ (S_REG_BASE(b) + (0x80000 * (n)) + 0x00000010) ++enum bimc_s_hw_info { ++ S_HW_INFO_RMSK = 0xffffffff, ++ S_HW_INFO_MAJOR_BMSK = 0xff000000, ++ S_HW_INFO_MAJOR_SHFT = 0x18, ++ S_HW_INFO_BRANCH_BMSK = 0xff0000, ++ S_HW_INFO_BRANCH_SHFT = 0x10, ++ S_HW_INFO_MINOR_BMSK = 0xff00, ++ S_HW_INFO_MINOR_SHFT = 0x8, ++ S_HW_INFO_ECO_BMSK = 0xff, ++ S_HW_INFO_ECO_SHFT = 0x0, ++}; ++ ++ ++/* S_SCMO_GENERIC */ ++ ++#define S_SCMO_REG_BASE(b) ((b) + 0x00048000) ++ ++#define S_SCMO_CONFIG_INFO_0_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000020) ++enum bimc_s_scmo_config_info_0 { ++ S_SCMO_CONFIG_INFO_0_RMSK = 0xffffffff, ++ S_SCMO_CONFIG_INFO_0_DATA_WIDTH_BMSK = 0xffff0000, ++ S_SCMO_CONFIG_INFO_0_DATA_WIDTH_SHFT = 0x10, ++ S_SCMO_CONFIG_INFO_0_TID_WIDTH_BMSK = 0xff00, ++ S_SCMO_CONFIG_INFO_0_TID_WIDTH_SHFT = 0x8, ++ S_SCMO_CONFIG_INFO_0_MID_WIDTH_BMSK = 0xff, ++ S_SCMO_CONFIG_INFO_0_MID_WIDTH_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CONFIG_INFO_1_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000030) ++enum bimc_s_scmo_config_info_1 { ++ S_SCMO_CONFIG_INFO_1_RMSK = 0xffffffff, ++ S_SCMO_CONFIG_INFO_1_MPORT_CONNECTIVITY_BMSK = 0xffffffff, ++ S_SCMO_CONFIG_INFO_1_MPORT_CONNECTIVITY_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CONFIG_INFO_2_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000040) ++enum bimc_s_scmo_config_info_2 { ++ S_SCMO_CONFIG_INFO_2_RMSK = 0xff00ff, ++ S_SCMO_CONFIG_INFO_2_NUM_GLOBAL_MONS_BMSK = 0xff0000, ++ S_SCMO_CONFIG_INFO_2_NUM_GLOBAL_MONS_SHFT = 0x10, ++ S_SCMO_CONFIG_INFO_2_VMID_WIDTH_BMSK = 0xff, ++ S_SCMO_CONFIG_INFO_2_VMID_WIDTH_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CONFIG_INFO_3_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000050) ++enum bimc_s_scmo_config_info_3 { ++ S_SCMO_CONFIG_INFO_3_RMSK = 0xffffffff, ++ S_SCMO_CONFIG_INFO_3_RCH0_CTRL_DEPTH_BMSK = 0xff000000, ++ S_SCMO_CONFIG_INFO_3_RCH0_CTRL_DEPTH_SHFT = 0x18, ++ S_SCMO_CONFIG_INFO_3_RCH0_DEPTH_BMSK = 0xff0000, ++ S_SCMO_CONFIG_INFO_3_RCH0_DEPTH_SHFT = 0x10, ++ S_SCMO_CONFIG_INFO_3_BCH_DEPTH_BMSK = 0xff00, ++ S_SCMO_CONFIG_INFO_3_BCH_DEPTH_SHFT = 0x8, ++ S_SCMO_CONFIG_INFO_3_WCH_DEPTH_BMSK = 0xff, ++ S_SCMO_CONFIG_INFO_3_WCH_DEPTH_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CONFIG_INFO_4_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000060) ++enum bimc_s_scmo_config_info_4 { ++ S_SCMO_CONFIG_INFO_4_RMSK = 0xffff, ++ S_SCMO_CONFIG_INFO_4_RCH1_CTRL_DEPTH_BMSK = 0xff00, ++ S_SCMO_CONFIG_INFO_4_RCH1_CTRL_DEPTH_SHFT = 0x8, ++ S_SCMO_CONFIG_INFO_4_RCH1_DEPTH_BMSK = 0xff, ++ S_SCMO_CONFIG_INFO_4_RCH1_DEPTH_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CONFIG_INFO_5_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000070) ++enum bimc_s_scmo_config_info_5 { ++ S_SCMO_CONFIG_INFO_5_RMSK = 0xffff, ++ S_SCMO_CONFIG_INFO_5_DPE_CQ_DEPTH_BMSK = 0xff00, ++ S_SCMO_CONFIG_INFO_5_DPE_CQ_DEPTH_SHFT = 0x8, ++ S_SCMO_CONFIG_INFO_5_DDR_BUS_WIDTH_BMSK = 0xff, ++ S_SCMO_CONFIG_INFO_5_DDR_BUS_WIDTH_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CONFIG_INFO_6_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000080) ++enum bimc_s_scmo_config_info_6 { ++ S_SCMO_CONFIG_INFO_6_RMSK = 0x1111, ++ S_SCMO_CONFIG_INFO_6_WBUFC_PIPE_BMSK = 0x1000, ++ S_SCMO_CONFIG_INFO_6_WBUFC_PIPE_SHFT = 0xc, ++ S_SCMO_CONFIG_INFO_6_RDOPT_PIPE_BMSK = 0x100, ++ S_SCMO_CONFIG_INFO_6_RDOPT_PIPE_SHFT = 0x8, ++ S_SCMO_CONFIG_INFO_6_ACHAN_INTF_PIPE_BMSK = 0x10, ++ S_SCMO_CONFIG_INFO_6_ACHAN_INTF_PIPE_SHFT = 0x4, ++ S_SCMO_CONFIG_INFO_6_ADDR_DECODE_HT_BMSK = 0x1, ++ S_SCMO_CONFIG_INFO_6_ADDR_DECODE_HT_SHFT = 0x0, ++}; ++ ++#define S_SCMO_INT_STATUS_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000100) ++enum bimc_s_scmo_int_status { ++ S_SCMO_INT_STATUS_RMSK = 0x1, ++ S_SCMO_INT_STATUS_ERR_OCCURED_BMSK = 0x1, ++ S_SCMO_INT_STATUS_ERR_OCCURED_SHFT = 0x0, ++}; ++ ++#define S_SCMO_INT_CLR_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000108) ++enum bimc_s_scmo_int_clr { ++ S_SCMO_INT_CLR_RMSK = 0x1, ++ S_SCMO_INT_CLR_IRQ_CLR_BMSK = 0x1, ++ S_SCMO_INT_CLR_IRQ_CLR_SHFT = 0x0, ++}; ++ ++#define S_SCMO_INT_EN_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x0000010c) ++enum bimc_s_scmo_int_en { ++ S_SCMO_INT_EN_RMSK = 0x1, ++ S_SCMO_INT_EN_IRQ_EN_BMSK = 0x1, ++ S_SCMO_INT_EN_IRQ_EN_SHFT = 0x0, ++}; ++ ++#define S_SCMO_ESYN_ADDR_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000120) ++enum bimc_s_scmo_esyn_addr { ++ S_SCMO_ESYN_ADDR_RMSK = 0xffffffff, ++ S_SCMO_ESYN_ADDR_ESYN_ADDR_ERR_ADDR_BMSK = 0xffffffff, ++ S_SCMO_ESYN_ADDR_ESYN_ADDR_ERR_ADDR_SHFT = 0x0, ++}; ++ ++#define S_SCMO_ESYN_APACKET_0_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000128) ++enum bimc_s_scmo_esyn_apacket_0 { ++ S_SCMO_ESYN_APACKET_0_RMSK = 0xff1fffff, ++ S_SCMO_ESYN_APACKET_0_ERR_ATID_BMSK = 0xff000000, ++ S_SCMO_ESYN_APACKET_0_ERR_ATID_SHFT = 0x18, ++ S_SCMO_ESYN_APACKET_0_ERR_AVMID_BMSK = 0x1f0000, ++ S_SCMO_ESYN_APACKET_0_ERR_AVMID_SHFT = 0x10, ++ S_SCMO_ESYN_APACKET_0_ERR_AMID_BMSK = 0xffff, ++ S_SCMO_ESYN_APACKET_0_ERR_AMID_SHFT = 0x0, ++}; ++ ++#define S_SCMO_ESYN_APACKET_1_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x0000012c) ++enum bimc_s_scmo_esyn_apacket_1 { ++ S_SCMO_ESYN_APACKET_1_RMSK = 0x10ff117, ++ S_SCMO_ESYN_APACKET_1_ERR_CODE_BMSK = 0x1000000, ++ S_SCMO_ESYN_APACKET_1_ERR_CODE_SHFT = 0x18, ++ S_SCMO_ESYN_APACKET_1_ERR_ALEN_BMSK = 0xf0000, ++ S_SCMO_ESYN_APACKET_1_ERR_ALEN_SHFT = 0x10, ++ S_SCMO_ESYN_APACKET_1_ERR_ASIZE_BMSK = 0xe000, ++ S_SCMO_ESYN_APACKET_1_ERR_ASIZE_SHFT = 0xd, ++ S_SCMO_ESYN_APACKET_1_ERR_ABURST_BMSK = 0x1000, ++ S_SCMO_ESYN_APACKET_1_ERR_ABURST_SHFT = 0xc, ++ S_SCMO_ESYN_APACKET_1_ERR_AEXCLUSIVE_BMSK = 0x100, ++ S_SCMO_ESYN_APACKET_1_ERR_AEXCLUSIVE_SHFT = 0x8, ++ S_SCMO_ESYN_APACKET_1_ERR_APRONTS_BMSK = 0x10, ++ S_SCMO_ESYN_APACKET_1_ERR_APRONTS_SHFT = 0x4, ++ S_SCMO_ESYN_APACKET_1_ERR_AOOORD_BMSK = 0x4, ++ S_SCMO_ESYN_APACKET_1_ERR_AOOORD_SHFT = 0x2, ++ S_SCMO_ESYN_APACKET_1_ERR_AOOOWR_BMSK = 0x2, ++ S_SCMO_ESYN_APACKET_1_ERR_AOOOWR_SHFT = 0x1, ++ S_SCMO_ESYN_APACKET_1_ERR_AWRITE_BMSK = 0x1, ++ S_SCMO_ESYN_APACKET_1_ERR_AWRITE_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CLK_CTRL_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000200) ++enum bimc_s_scmo_clk_ctrl { ++ S_SCMO_CLK_CTRL_RMSK = 0xffff1111, ++ S_SCMO_CLK_CTRL_PEN_CMD_CG_EN_BMSK = 0x10000, ++ S_SCMO_CLK_CTRL_PEN_CMD_CG_EN_SHFT = 0x10, ++ S_SCMO_CLK_CTRL_RCH_CG_EN_BMSK = 0x1000, ++ S_SCMO_CLK_CTRL_RCH_CG_EN_SHFT = 0xc, ++ S_SCMO_CLK_CTRL_FLUSH_CG_EN_BMSK = 0x100, ++ S_SCMO_CLK_CTRL_FLUSH_CG_EN_SHFT = 0x8, ++ S_SCMO_CLK_CTRL_WCH_CG_EN_BMSK = 0x10, ++ S_SCMO_CLK_CTRL_WCH_CG_EN_SHFT = 0x4, ++ S_SCMO_CLK_CTRL_ACH_CG_EN_BMSK = 0x1, ++ S_SCMO_CLK_CTRL_ACH_CG_EN_SHFT = 0x0, ++}; ++ ++#define S_SCMO_SLV_INTERLEAVE_CFG_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000400) ++enum bimc_s_scmo_slv_interleave_cfg { ++ S_SCMO_SLV_INTERLEAVE_CFG_RMSK = 0xff, ++ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS1_BMSK = 0x10, ++ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS1_SHFT = 0x4, ++ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS0_BMSK = 0x1, ++ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS0_SHFT = 0x0, ++}; ++ ++#define S_SCMO_ADDR_BASE_CSn_ADDR(b, n, o) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000410 + 0x4 * (o)) ++enum bimc_s_scmo_addr_base_csn { ++ S_SCMO_ADDR_BASE_CSn_RMSK = 0xffff, ++ S_SCMO_ADDR_BASE_CSn_MAXn = 1, ++ S_SCMO_ADDR_BASE_CSn_ADDR_BASE_BMSK = 0xfc, ++ S_SCMO_ADDR_BASE_CSn_ADDR_BASE_SHFT = 0x2, ++}; ++ ++#define S_SCMO_ADDR_MAP_CSn_ADDR(b, n, o) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000420 + 0x4 * (o)) ++enum bimc_s_scmo_addr_map_csn { ++ S_SCMO_ADDR_MAP_CSn_RMSK = 0xffff, ++ S_SCMO_ADDR_MAP_CSn_MAXn = 1, ++ S_SCMO_ADDR_MAP_CSn_RANK_EN_BMSK = 0x8000, ++ S_SCMO_ADDR_MAP_CSn_RANK_EN_SHFT = 0xf, ++ S_SCMO_ADDR_MAP_CSn_ADDR_MODE_BMSK = 0x1000, ++ S_SCMO_ADDR_MAP_CSn_ADDR_MODE_SHFT = 0xc, ++ S_SCMO_ADDR_MAP_CSn_BANK_SIZE_BMSK = 0x100, ++ S_SCMO_ADDR_MAP_CSn_BANK_SIZE_SHFT = 0x8, ++ S_SCMO_ADDR_MAP_CSn_ROW_SIZE_BMSK = 0x30, ++ S_SCMO_ADDR_MAP_CSn_ROW_SIZE_SHFT = 0x4, ++ S_SCMO_ADDR_MAP_CSn_COL_SIZE_BMSK = 0x3, ++ S_SCMO_ADDR_MAP_CSn_COL_SIZE_SHFT = 0x0, ++}; ++ ++#define S_SCMO_ADDR_MASK_CSn_ADDR(b, n, o) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000430 + 0x4 * (0)) ++enum bimc_s_scmo_addr_mask_csn { ++ S_SCMO_ADDR_MASK_CSn_RMSK = 0xffff, ++ S_SCMO_ADDR_MASK_CSn_MAXn = 1, ++ S_SCMO_ADDR_MASK_CSn_ADDR_MASK_BMSK = 0xfc, ++ S_SCMO_ADDR_MASK_CSn_ADDR_MASK_SHFT = 0x2, ++}; ++ ++#define S_SCMO_SLV_STATUS_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000450) ++enum bimc_s_scmo_slv_status { ++ S_SCMO_SLV_STATUS_RMSK = 0xff3, ++ S_SCMO_SLV_STATUS_GLOBAL_MONS_IN_USE_BMSK = 0xff0, ++ S_SCMO_SLV_STATUS_GLOBAL_MONS_IN_USE_SHFT = 0x4, ++ S_SCMO_SLV_STATUS_SLAVE_IDLE_BMSK = 0x3, ++ S_SCMO_SLV_STATUS_SLAVE_IDLE_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CMD_BUF_CFG_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000500) ++enum bimc_s_scmo_cmd_buf_cfg { ++ S_SCMO_CMD_BUF_CFG_RMSK = 0xf1f, ++ S_SCMO_CMD_BUF_CFG_CMD_ORDERING_BMSK = 0x300, ++ S_SCMO_CMD_BUF_CFG_CMD_ORDERING_SHFT = 0x8, ++ S_SCMO_CMD_BUF_CFG_HP_CMD_AREQPRIO_MAP_BMSK = 0x10, ++ S_SCMO_CMD_BUF_CFG_HP_CMD_AREQPRIO_MAP_SHFT = 0x4, ++ S_SCMO_CMD_BUF_CFG_HP_CMD_Q_DEPTH_BMSK = 0x7, ++ S_SCMO_CMD_BUF_CFG_HP_CMD_Q_DEPTH_SHFT = 0x0, ++}; ++ ++#define S_SCM_CMD_BUF_STATUS_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000520) ++enum bimc_s_scm_cmd_buf_status { ++ S_SCMO_CMD_BUF_STATUS_RMSK = 0x77, ++ S_SCMO_CMD_BUF_STATUS_HP_CMD_BUF_ENTRIES_IN_USE_BMSK = 0x70, ++ S_SCMO_CMD_BUF_STATUS_HP_CMD_BUF_ENTRIES_IN_USE_SHFT = 0x4, ++ S_SCMO_CMD_BUF_STATUS_LP_CMD_BUF_ENTRIES_IN_USE_BMSK = 0x7, ++ S_SCMO_CMD_BUF_STATUS_LP_CMD_BUF_ENTRIES_IN_USE_SHFT = 0x0, ++}; ++ ++#define S_SCMO_RCH_SEL_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000540) ++enum bimc_s_scmo_rch_sel { ++ S_SCMO_RCH_SEL_RMSK = 0xffffffff, ++ S_SCMO_CMD_BUF_STATUS_RCH_PORTS_BMSK = 0xffffffff, ++ S_SCMO_CMD_BUF_STATUS_RCH_PORTS_SHFT = 0x0, ++}; ++ ++#define S_SCMO_RCH_BKPR_CFG_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000544) ++enum bimc_s_scmo_rch_bkpr_cfg { ++ S_SCMO_RCH_BKPR_CFG_RMSK = 0xffffffff, ++ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_HI_TH_BMSK = 0x3f000000, ++ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_HI_TH_SHFT = 0x18, ++ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_LO_TH_BMSK = 0x3f0000, ++ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_LO_TH_SHFT = 0x10, ++ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_HI_TH_BMSK = 0x3f00, ++ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_HI_TH_SHFT = 0x8, ++ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_LO_TH_BMSK = 0x3f, ++ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_LO_TH_SHFT = 0x0, ++}; ++ ++#define S_SCMO_RCH_STATUS_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000560) ++enum bimc_s_scmo_rch_status { ++ S_SCMO_RCH_STATUS_RMSK = 0x33333, ++ S_SCMO_RCH_STATUS_PRQ_FIFO_FULL_BMSK = 0x20000, ++ S_SCMO_RCH_STATUS_PRQ_FIFO_FULL_SHFT = 0x11, ++ S_SCMO_RCH_STATUS_PRQ_FIFO_EMPTY_BMSK = 0x10000, ++ S_SCMO_RCH_STATUS_PRQ_FIFO_EMPTY_SHFT = 0x10, ++ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_FULL_BMSK = 0x2000, ++ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_FULL_SHFT = 0xd, ++ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_EMPTY_BMSK = 0x1000, ++ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_EMPTY_SHFT = 0xc, ++ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_FULL_BMSK = 0x200, ++ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_FULL_SHFT = 0x9, ++ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_EMPTY_BMSK = 0x100, ++ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_EMPTY_SHFT = 0x8, ++ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_FULL_BMSK = 0x20, ++ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_FULL_SHFT = 0x5, ++ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_EMPTY_BMSK = 0x10, ++ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_EMPTY_SHFT = 0x4, ++ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_FULL_BMSK = 0x2, ++ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_FULL_SHFT = 0x1, ++ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_EMPTY_BMSK = 0x1, ++ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_EMPTY_SHFT = 0x0, ++}; ++ ++#define S_SCMO_WCH_BUF_CFG_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000580) ++enum bimc_s_scmo_wch_buf_cfg { ++ S_SCMO_WCH_BUF_CFG_RMSK = 0xff, ++ S_SCMO_WCH_BUF_CFG_WRITE_BLOCK_READ_BMSK = 0x10, ++ S_SCMO_WCH_BUF_CFG_WRITE_BLOCK_READ_SHFT = 0x4, ++ S_SCMO_WCH_BUF_CFG_COALESCE_EN_BMSK = 0x1, ++ S_SCMO_WCH_BUF_CFG_COALESCE_EN_SHFT = 0x0, ++}; ++ ++#define S_SCMO_WCH_STATUS_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x000005a0) ++enum bimc_s_scmo_wch_status { ++ S_SCMO_WCH_STATUS_RMSK = 0x333, ++ S_SCMO_WCH_STATUS_BRESP_FIFO_FULL_BMSK = 0x200, ++ S_SCMO_WCH_STATUS_BRESP_FIFO_FULL_SHFT = 0x9, ++ S_SCMO_WCH_STATUS_BRESP_FIFO_EMPTY_BMSK = 0x100, ++ S_SCMO_WCH_STATUS_BRESP_FIFO_EMPTY_SHFT = 0x8, ++ S_SCMO_WCH_STATUS_WDATA_FIFO_FULL_BMSK = 0x20, ++ S_SCMO_WCH_STATUS_WDATA_FIFO_FULL_SHFT = 0x5, ++ S_SCMO_WCH_STATUS_WDATA_FIFO_EMPTY_BMSK = 0x10, ++ S_SCMO_WCH_STATUS_WDATA_FIFO_EMPTY_SHFT = 0x4, ++ S_SCMO_WCH_STATUS_WBUF_FULL_BMSK = 0x2, ++ S_SCMO_WCH_STATUS_WBUF_FULL_SHFT = 0x1, ++ S_SCMO_WCH_STATUS_WBUF_EMPTY_BMSK = 0x1, ++ S_SCMO_WCH_STATUS_WBUF_EMPTY_SHFT = 0x0, ++}; ++ ++#define S_SCMO_FLUSH_CFG_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x000005c0) ++enum bimc_s_scmo_flush_cfg { ++ S_SCMO_FLUSH_CFG_RMSK = 0xffffffff, ++ S_SCMO_FLUSH_CFG_FLUSH_IN_ORDER_BMSK = 0x10000000, ++ S_SCMO_FLUSH_CFG_FLUSH_IN_ORDER_SHFT = 0x1c, ++ S_SCMO_FLUSH_CFG_FLUSH_IDLE_DELAY_BMSK = 0x3ff0000, ++ S_SCMO_FLUSH_CFG_FLUSH_IDLE_DELAY_SHFT = 0x10, ++ S_SCMO_FLUSH_CFG_FLUSH_UPPER_LIMIT_BMSK = 0xf00, ++ S_SCMO_FLUSH_CFG_FLUSH_UPPER_LIMIT_SHFT = 0x8, ++ S_SCMO_FLUSH_CFG_FLUSH_LOWER_LIMIT_BMSK = 0xf, ++ S_SCMO_FLUSH_CFG_FLUSH_LOWER_LIMIT_SHFT = 0x0, ++}; ++ ++#define S_SCMO_FLUSH_CMD_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x000005c4) ++enum bimc_s_scmo_flush_cmd { ++ S_SCMO_FLUSH_CMD_RMSK = 0xf, ++ S_SCMO_FLUSH_CMD_FLUSH_ALL_BUF_BMSK = 0x3, ++ S_SCMO_FLUSH_CMD_FLUSH_ALL_BUF_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CMD_OPT_CFG0_ADDR(b, n) \ ++ (S_SCM0_REG_BASE(b) + (0x8000 * (n)) + 0x00000700) ++enum bimc_s_scmo_cmd_opt_cfg0 { ++ S_SCMO_CMD_OPT_CFG0_RMSK = 0xffffff, ++ S_SCMO_CMD_OPT_CFG0_IGNORE_BANK_UNAVL_BMSK = 0x100000, ++ S_SCMO_CMD_OPT_CFG0_IGNORE_BANK_UNAVL_SHFT = 0x14, ++ S_SCMO_CMD_OPT_CFG0_MASK_CMDOUT_PRI_BMSK = 0x10000, ++ S_SCMO_CMD_OPT_CFG0_MASK_CMDOUT_PRI_SHFT = 0x10, ++ S_SCMO_CMD_OPT_CFG0_DPE_CMD_REORDERING_BMSK = 0x1000, ++ S_SCMO_CMD_OPT_CFG0_DPE_CMD_REORDERING_SHFT = 0xc, ++ S_SCMO_CMD_OPT_CFG0_WR_OPT_EN_BMSK = 0x100, ++ S_SCMO_CMD_OPT_CFG0_WR_OPT_EN_SHFT = 0x8, ++ S_SCMO_CMD_OPT_CFG0_RD_OPT_EN_BMSK = 0x10, ++ S_SCMO_CMD_OPT_CFG0_RD_OPT_EN_SHFT = 0x4, ++ S_SCMO_CMD_OPT_CFG0_PAGE_MGMT_POLICY_BMSK = 0x1, ++ S_SCMO_CMD_OPT_CFG0_PAGE_MGMT_POLICY_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CMD_OPT_CFG1_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000704) ++enum bimc_s_scmo_cmd_opt_cfg1 { ++ S_SCMO_CMD_OPT_CFG1_RMSK = 0xffffffff, ++ S_SCMO_CMD_OPT_CFG1_HSTP_CMD_TIMEOUT_BMSK = 0x1f000000, ++ S_SCMO_CMD_OPT_CFG1_HSTP_CMD_TIMEOUT_SHFT = 0x18, ++ S_SCMO_CMD_OPT_CFG1_HP_CMD_TIMEOUT_BMSK = 0x1f0000, ++ S_SCMO_CMD_OPT_CFG1_HP_CMD_TIMEOUT_SHFT = 0x10, ++ S_SCMO_CMD_OPT_CFG1_MP_CMD_TIMEOUT_BMSK = 0x1f00, ++ S_SCMO_CMD_OPT_CFG1_MP_CMD_TIMEOUT_SHFT = 0x8, ++ S_SCMO_CMD_OPT_CFG1_LP_CMD_TIMEOUT_BMSK = 0x1f, ++ S_SCMO_CMD_OPT_CFG1_LP_CMD_TIMEOUT_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CMD_OPT_CFG2_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000708) ++enum bimc_s_scmo_cmd_opt_cfg2 { ++ S_SCMO_CMD_OPT_CFG2_RMSK = 0xff, ++ S_SCMO_CMD_OPT_CFG2_RWOPT_CMD_TIMEOUT_BMSK = 0xf, ++ S_SCMO_CMD_OPT_CFG2_RWOPT_CMD_TIMEOUT_SHFT = 0x0, ++}; ++ ++#define S_SCMO_CMD_OPT_CFG3_ADDR(b, n) \ ++ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x0000070c) ++enum bimc_s_scmo_cmd_opt_cfg3 { ++ S_SCMO_CMD_OPT_CFG3_RMSK = 0xff, ++ S_SCMO_CMD_OPT_CFG3_FLUSH_CMD_TIMEOUT_BMSK = 0xf, ++ S_SCMO_CMD_OPT_CFG3_FLUSH_CMD_TIMEOUT_SHFT = 0x0, ++}; ++ ++/* S_SWAY_GENERIC */ ++#define S_SWAY_REG_BASE(b) ((b) + 0x00048000) ++ ++#define S_SWAY_CONFIG_INFO_0_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000020) ++enum bimc_s_sway_config_info_0 { ++ S_SWAY_CONFIG_INFO_0_RMSK = 0xff0000ff, ++ S_SWAY_CONFIG_INFO_0_SYNC_MODE_BMSK = 0xff000000, ++ S_SWAY_CONFIG_INFO_0_SYNC_MODE_SHFT = 0x18, ++ S_SWAY_CONFIG_INFO_0_FUNC_BMSK = 0xff, ++ S_SWAY_CONFIG_INFO_0_FUNC_SHFT = 0x0, ++}; ++ ++#define S_SWAY_CONFIG_INFO_1_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000030) ++enum bimc_s_sway_config_info_1 { ++ S_SWAY_CONFIG_INFO_1_RMSK = 0xffffffff, ++ S_SWAY_CONFIG_INFO_1_MPORT_CONNECTIVITY_BMSK = 0xffffffff, ++ S_SWAY_CONFIG_INFO_1_MPORT_CONNECTIVITY_SHFT = 0x0, ++}; ++ ++#define S_SWAY_CONFIG_INFO_2_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000040) ++enum bimc_s_sway_config_info_2 { ++ S_SWAY_CONFIG_INFO_2_RMSK = 0xffff0000, ++ S_SWAY_CONFIG_INFO_2_MPORT_CONNECTIVITY_BMSK = 0xffff0000, ++ S_SWAY_CONFIG_INFO_2_MPORT_CONNECTIVITY_SHFT = 0x10, ++}; ++ ++#define S_SWAY_CONFIG_INFO_3_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000050) ++enum bimc_s_sway_config_info_3 { ++ S_SWAY_CONFIG_INFO_3_RMSK = 0xffffffff, ++ S_SWAY_CONFIG_INFO_3_RCH0_DEPTH_BMSK = 0xff000000, ++ S_SWAY_CONFIG_INFO_3_RCH0_DEPTH_SHFT = 0x18, ++ S_SWAY_CONFIG_INFO_3_BCH_DEPTH_BMSK = 0xff0000, ++ S_SWAY_CONFIG_INFO_3_BCH_DEPTH_SHFT = 0x10, ++ S_SWAY_CONFIG_INFO_3_WCH_DEPTH_BMSK = 0xff, ++ S_SWAY_CONFIG_INFO_3_WCH_DEPTH_SHFT = 0x0, ++}; ++ ++#define S_SWAY_CONFIG_INFO_4_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000060) ++enum bimc_s_sway_config_info_4 { ++ S_SWAY_CONFIG_INFO_4_RMSK = 0x800000ff, ++ S_SWAY_CONFIG_INFO_4_DUAL_RCH_EN_BMSK = 0x80000000, ++ S_SWAY_CONFIG_INFO_4_DUAL_RCH_EN_SHFT = 0x1f, ++ S_SWAY_CONFIG_INFO_4_RCH1_DEPTH_BMSK = 0xff, ++ S_SWAY_CONFIG_INFO_4_RCH1_DEPTH_SHFT = 0x0, ++}; ++ ++#define S_SWAY_CONFIG_INFO_5_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000070) ++enum bimc_s_sway_config_info_5 { ++ S_SWAY_CONFIG_INFO_5_RMSK = 0x800000ff, ++ S_SWAY_CONFIG_INFO_5_QCH_EN_BMSK = 0x80000000, ++ S_SWAY_CONFIG_INFO_5_QCH_EN_SHFT = 0x1f, ++ S_SWAY_CONFIG_INFO_5_QCH_DEPTH_BMSK = 0xff, ++ S_SWAY_CONFIG_INFO_5_QCH_DEPTH_SHFT = 0x0, ++}; ++ ++#define S_SWAY_CONFIG_INFO_6_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000080) ++enum bimc_s_sway_config_info_6 { ++ S_SWAY_CONFIG_INFO_6_RMSK = 0x1, ++ S_SWAY_CONFIG_INFO_6_S2SW_PIPELINE_EN_BMSK = 0x1, ++ S_SWAY_CONFIG_INFO_6_S2SW_PIPELINE_EN_SHFT = 0x0, ++}; ++ ++#define S_SWAY_INT_STATUS_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000100) ++enum bimc_s_sway_int_status { ++ S_SWAY_INT_STATUS_RMSK = 0x3, ++ S_SWAY_INT_STATUS_RFU_BMSK = 0x3, ++ S_SWAY_INT_STATUS_RFU_SHFT = 0x0, ++}; ++ ++#define S_SWAY_INT_CLR_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000108) ++enum bimc_s_sway_int_clr { ++ S_SWAY_INT_CLR_RMSK = 0x3, ++ S_SWAY_INT_CLR_RFU_BMSK = 0x3, ++ S_SWAY_INT_CLR_RFU_SHFT = 0x0, ++}; ++ ++ ++#define S_SWAY_INT_EN_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x0000010c) ++enum bimc_s_sway_int_en { ++ S_SWAY_INT_EN_RMSK = 0x3, ++ S_SWAY_INT_EN_RFU_BMSK = 0x3, ++ S_SWAY_INT_EN_RFU_SHFT = 0x0, ++}; ++ ++#define S_SWAY_CLK_CTRL_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000200) ++enum bimc_s_sway_clk_ctrl { ++ S_SWAY_CLK_CTRL_RMSK = 0x3, ++ S_SWAY_CLK_CTRL_SLAVE_CLK_GATING_EN_BMSK = 0x2, ++ S_SWAY_CLK_CTRL_SLAVE_CLK_GATING_EN_SHFT = 0x1, ++ S_SWAY_CLK_CTRL_CORE_CLK_GATING_EN_BMSK = 0x1, ++ S_SWAY_CLK_CTRL_CORE_CLK_GATING_EN_SHFT = 0x0, ++}; ++ ++#define S_SWAY_RCH_SEL_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000210) ++enum bimc_s_sway_rch_sel { ++ S_SWAY_RCH_SEL_RMSK = 0x7f, ++ S_SWAY_RCH_SEL_UNUSED_BMSK = 0x7f, ++ S_SWAY_RCH_SEL_UNUSED_SHFT = 0x0, ++}; ++ ++ ++#define S_SWAY_MAX_OUTSTANDING_REQS_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000220) ++enum bimc_s_sway_max_outstanding_reqs { ++ S_SWAY_MAX_OUTSTANDING_REQS_RMSK = 0xffff, ++ S_SWAY_MAX_OUTSTANDING_REQS_WRITE_BMSK = 0xff00, ++ S_SWAY_MAX_OUTSTANDING_REQS_WRITE_SHFT = 0x8, ++ S_SWAY_MAX_OUTSTANDING_REQS_READ_BMSK = 0xff, ++ S_SWAY_MAX_OUTSTANDING_REQS_READ_SHFT = 0x0, ++}; ++ ++ ++#define S_SWAY_BUF_STATUS_0_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000400) ++enum bimc_s_sway_buf_status_0 { ++ S_SWAY_BUF_STATUS_0_RMSK = 0xf0300f03, ++ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_FULL_BMSK = 0x80000000, ++ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_FULL_SHFT = 0x1f, ++ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_EMPTY_BMSK = 0x40000000, ++ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_EMPTY_SHFT = 0x1e, ++ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_FULL_BMSK = 0x20000000, ++ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_FULL_SHFT = 0x1d, ++ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_EMPTY_BMSK = 0x10000000, ++ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_EMPTY_SHFT = 0x1c, ++ S_SWAY_BUF_STATUS_0_BCH_RD_FULL_BMSK = 0x200000, ++ S_SWAY_BUF_STATUS_0_BCH_RD_FULL_SHFT = 0x15, ++ S_SWAY_BUF_STATUS_0_BCH_RD_EMPTY_BMSK = 0x100000, ++ S_SWAY_BUF_STATUS_0_BCH_RD_EMPTY_SHFT = 0x14, ++ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_FULL_BMSK = 0x800, ++ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_FULL_SHFT = 0xb, ++ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_EMPTY_BMSK = 0x400, ++ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_EMPTY_SHFT = 0xa, ++ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_FULL_BMSK = 0x200, ++ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_FULL_SHFT = 0x9, ++ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_EMPTY_BMSK = 0x100, ++ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_EMPTY_SHFT = 0x8, ++ S_SWAY_BUF_STATUS_0_ACH_WR_FULL_BMSK = 0x2, ++ S_SWAY_BUF_STATUS_0_ACH_WR_FULL_SHFT = 0x1, ++ S_SWAY_BUF_STATUS_0_ACH_WR_EMPTY_BMSK = 0x1, ++ S_SWAY_BUF_STATUS_0_ACH_WR_EMPTY_SHFT = 0x0, ++}; ++ ++#define S_SWAY_BUF_STATUS_1_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000410) ++enum bimc_s_sway_buf_status_1 { ++ S_SWAY_BUF_STATUS_1_RMSK = 0xf0, ++ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_FULL_BMSK = 0x80, ++ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_FULL_SHFT = 0x7, ++ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_EMPTY_BMSK = 0x40, ++ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_EMPTY_SHFT = 0x6, ++ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_FULL_BMSK = 0x20, ++ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_FULL_SHFT = 0x5, ++ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_EMPTY_BMSK = 0x10, ++ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_EMPTY_SHFT = 0x4, ++}; ++ ++#define S_SWAY_BUF_STATUS_2_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000420) ++enum bimc_s_sway_buf_status_2 { ++ S_SWAY_BUF_STATUS_2_RMSK = 0x30, ++ S_SWAY_BUF_STATUS_2_QCH_RD_FULL_BMSK = 0x20, ++ S_SWAY_BUF_STATUS_2_QCH_RD_FULL_SHFT = 0x5, ++ S_SWAY_BUF_STATUS_2_QCH_RD_EMPTY_BMSK = 0x10, ++ S_SWAY_BUF_STATUS_2_QCH_RD_EMPTY_SHFT = 0x4, ++}; ++ ++/* S_ARB_GENERIC */ ++ ++#define S_ARB_REG_BASE(b) ((b) + 0x00049000) ++ ++#define S_ARB_COMPONENT_INFO_ADDR(b, n) \ ++ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000000) ++enum bimc_s_arb_component_info { ++ S_ARB_COMPONENT_INFO_RMSK = 0xffffff, ++ S_ARB_COMPONENT_INFO_INSTANCE_BMSK = 0xff0000, ++ S_ARB_COMPONENT_INFO_INSTANCE_SHFT = 0x10, ++ S_ARB_COMPONENT_INFO_SUB_TYPE_BMSK = 0xff00, ++ S_ARB_COMPONENT_INFO_SUB_TYPE_SHFT = 0x8, ++ S_ARB_COMPONENT_INFO_TYPE_BMSK = 0xff, ++ S_ARB_COMPONENT_INFO_TYPE_SHFT = 0x0, ++}; ++ ++#define S_ARB_CONFIG_INFO_0_ADDR(b, n) \ ++ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000020) ++enum bimc_s_arb_config_info_0 { ++ S_ARB_CONFIG_INFO_0_RMSK = 0x800000ff, ++ S_ARB_CONFIG_INFO_0_ARB2SW_PIPELINE_EN_BMSK = 0x80000000, ++ S_ARB_CONFIG_INFO_0_ARB2SW_PIPELINE_EN_SHFT = 0x1f, ++ S_ARB_CONFIG_INFO_0_FUNC_BMSK = 0xff, ++ S_ARB_CONFIG_INFO_0_FUNC_SHFT = 0x0, ++}; ++ ++#define S_ARB_CONFIG_INFO_1_ADDR(b, n) \ ++ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000030) ++enum bimc_s_arb_config_info_1 { ++ S_ARB_CONFIG_INFO_1_RMSK = 0xffffffff, ++ S_ARB_CONFIG_INFO_1_MPORT_CONNECTIVITY_BMSK = 0xffffffff, ++ S_ARB_CONFIG_INFO_1_MPORT_CONNECTIVITY_SHFT = 0x0, ++}; ++ ++#define S_ARB_CLK_CTRL_ADDR(b) \ ++ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000200) ++enum bimc_s_arb_clk_ctrl { ++ S_ARB_CLK_CTRL_RMSK = 0x1, ++ S_ARB_CLK_CTRL_SLAVE_CLK_GATING_EN_BMSK = 0x2, ++ S_ARB_CLK_CTRL_SLAVE_CLK_GATING_EN_SHFT = 0x1, ++ S_ARB_CLK_CTRL_CORE_CLK_GATING_EN_BMSK = 0x1, ++ S_ARB_CLK_CTRL_CORE_CLK_GATING_EN_SHFT = 0x0, ++ S_ARB_CLK_CTRL_CLK_GATING_EN_BMSK = 0x1, ++ S_ARB_CLK_CTRL_CLK_GATING_EN_SHFT = 0x0, ++}; ++ ++#define S_ARB_MODE_ADDR(b, n) \ ++ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000210) ++enum bimc_s_arb_mode { ++ S_ARB_MODE_RMSK = 0xf0000001, ++ S_ARB_MODE_WR_GRANTS_AHEAD_BMSK = 0xf0000000, ++ S_ARB_MODE_WR_GRANTS_AHEAD_SHFT = 0x1c, ++ S_ARB_MODE_PRIO_RR_EN_BMSK = 0x1, ++ S_ARB_MODE_PRIO_RR_EN_SHFT = 0x0, ++}; ++ ++#define BKE_HEALTH_MASK \ ++ (M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_BMSK |\ ++ M_BKE_HEALTH_0_CONFIG_AREQPRIO_BMSK |\ ++ M_BKE_HEALTH_0_CONFIG_PRIOLVL_BMSK) ++ ++#define BKE_HEALTH_VAL(limit, areq, plvl) \ ++ ((((limit) << M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_SHFT) & \ ++ M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_BMSK) | \ ++ (((areq) << M_BKE_HEALTH_0_CONFIG_AREQPRIO_SHFT) & \ ++ M_BKE_HEALTH_0_CONFIG_AREQPRIO_BMSK) | \ ++ (((plvl) << M_BKE_HEALTH_0_CONFIG_PRIOLVL_SHFT) & \ ++ M_BKE_HEALTH_0_CONFIG_PRIOLVL_BMSK)) ++ ++#define MAX_GRANT_PERIOD \ ++ (M_BKE_GP_GP_BMSK >> \ ++ M_BKE_GP_GP_SHFT) ++ ++#define MAX_GC \ ++ (M_BKE_GC_GC_BMSK >> \ ++ (M_BKE_GC_GC_SHFT + 1)) ++ ++static int bimc_div(int64_t *a, uint32_t b) ++{ ++ if ((*a > 0) && (*a < b)) { ++ *a = 0; ++ return 1; ++ } else { ++ return do_div(*a, b); ++ } ++} ++ ++#define ENABLE(val) ((val) == 1 ? 1 : 0) ++void msm_bus_bimc_set_mas_clk_gate(struct msm_bus_bimc_info *binfo, ++ uint32_t mas_index, struct msm_bus_bimc_clk_gate *bgate) ++{ ++ uint32_t val, mask, reg_val; ++ void __iomem *addr; ++ ++ reg_val = readl_relaxed(M_CLK_CTRL_ADDR(binfo->base, ++ mas_index)) & M_CLK_CTRL_RMSK; ++ addr = M_CLK_CTRL_ADDR(binfo->base, mas_index); ++ mask = (M_CLK_CTRL_MAS_CLK_GATING_EN_BMSK | ++ M_CLK_CTRL_CORE_CLK_GATING_EN_BMSK); ++ val = (bgate->core_clk_gate_en << ++ M_CLK_CTRL_MAS_CLK_GATING_EN_SHFT) | ++ bgate->port_clk_gate_en; ++ writel_relaxed(((reg_val & (~mask)) | (val & mask)), addr); ++ /* Ensure clock gating enable mask is set before exiting */ ++ wmb(); ++} ++ ++void msm_bus_bimc_arb_en(struct msm_bus_bimc_info *binfo, ++ uint32_t slv_index, bool en) ++{ ++ uint32_t reg_val, reg_mask_val, enable, val; ++ ++ reg_mask_val = (readl_relaxed(S_ARB_CONFIG_INFO_0_ADDR(binfo-> ++ base, slv_index)) & S_ARB_CONFIG_INFO_0_FUNC_BMSK) ++ >> S_ARB_CONFIG_INFO_0_FUNC_SHFT; ++ enable = ENABLE(en); ++ val = enable << S_ARB_MODE_PRIO_RR_EN_SHFT; ++ if (reg_mask_val == BIMC_ARB_MODE_PRIORITY_RR) { ++ reg_val = readl_relaxed(S_ARB_CONFIG_INFO_0_ADDR(binfo-> ++ base, slv_index)) & S_ARB_MODE_RMSK; ++ writel_relaxed(((reg_val & (~(S_ARB_MODE_PRIO_RR_EN_BMSK))) | ++ (val & S_ARB_MODE_PRIO_RR_EN_BMSK)), ++ S_ARB_MODE_ADDR(binfo->base, slv_index)); ++ /* Ensure arbitration mode is set before returning */ ++ wmb(); ++ } ++} ++ ++static void set_qos_mode(void __iomem *baddr, uint32_t index, uint32_t val0, ++ uint32_t val1, uint32_t val2) ++{ ++ uint32_t reg_val, val; ++ ++ reg_val = readl_relaxed(M_PRIOLVL_OVERRIDE_ADDR(baddr, ++ index)) & M_PRIOLVL_OVERRIDE_RMSK; ++ val = val0 << M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_SHFT; ++ writel_relaxed(((reg_val & ~(M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_BMSK)) ++ | (val & M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_BMSK)), ++ M_PRIOLVL_OVERRIDE_ADDR(baddr, index)); ++ reg_val = readl_relaxed(M_RD_CMD_OVERRIDE_ADDR(baddr, index)) & ++ M_RD_CMD_OVERRIDE_RMSK; ++ val = val1 << M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT; ++ writel_relaxed(((reg_val & ~(M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK ++ )) | (val & M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK)), ++ M_RD_CMD_OVERRIDE_ADDR(baddr, index)); ++ reg_val = readl_relaxed(M_WR_CMD_OVERRIDE_ADDR(baddr, index)) & ++ M_WR_CMD_OVERRIDE_RMSK; ++ val = val2 << M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT; ++ writel_relaxed(((reg_val & ~(M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK ++ )) | (val & M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK)), ++ M_WR_CMD_OVERRIDE_ADDR(baddr, index)); ++ /* Ensure the priority register writes go through */ ++ wmb(); ++} ++ ++static void msm_bus_bimc_set_qos_mode(void __iomem *base, ++ uint32_t mas_index, uint8_t qmode_sel) ++{ ++ uint32_t reg_val, val; ++ ++ switch (qmode_sel) { ++ case BIMC_QOS_MODE_FIXED: ++ reg_val = readl_relaxed(M_BKE_EN_ADDR(base, ++ mas_index)); ++ writel_relaxed((reg_val & (~M_BKE_EN_EN_BMSK)), ++ M_BKE_EN_ADDR(base, mas_index)); ++ /* Ensure that the book-keeping register writes ++ * go through before setting QoS mode. ++ * QoS mode registers might write beyond 1K ++ * boundary in future ++ */ ++ wmb(); ++ set_qos_mode(base, mas_index, 1, 1, 1); ++ break; ++ ++ case BIMC_QOS_MODE_BYPASS: ++ reg_val = readl_relaxed(M_BKE_EN_ADDR(base, ++ mas_index)); ++ writel_relaxed((reg_val & (~M_BKE_EN_EN_BMSK)), ++ M_BKE_EN_ADDR(base, mas_index)); ++ /* Ensure that the book-keeping register writes ++ * go through before setting QoS mode. ++ * QoS mode registers might write beyond 1K ++ * boundary in future ++ */ ++ wmb(); ++ set_qos_mode(base, mas_index, 0, 0, 0); ++ break; ++ ++ case BIMC_QOS_MODE_REGULATOR: ++ case BIMC_QOS_MODE_LIMITER: ++ set_qos_mode(base, mas_index, 0, 0, 0); ++ reg_val = readl_relaxed(M_BKE_EN_ADDR(base, ++ mas_index)); ++ val = 1 << M_BKE_EN_EN_SHFT; ++ /* Ensure that the book-keeping register writes ++ * go through before setting QoS mode. ++ * QoS mode registers might write beyond 1K ++ * boundary in future ++ */ ++ wmb(); ++ writel_relaxed(((reg_val & (~M_BKE_EN_EN_BMSK)) | (val & ++ M_BKE_EN_EN_BMSK)), M_BKE_EN_ADDR(base, ++ mas_index)); ++ break; ++ default: ++ break; ++ } ++} ++ ++static void set_qos_prio_rl(void __iomem *addr, uint32_t rmsk, ++ uint8_t index, struct msm_bus_bimc_qos_mode *qmode) ++{ ++ uint32_t reg_val, val0, val; ++ ++ /* Note, addr is already passed with right mas_index */ ++ reg_val = readl_relaxed(addr) & rmsk; ++ val0 = BKE_HEALTH_VAL(qmode->rl.qhealth[index].limit_commands, ++ qmode->rl.qhealth[index].areq_prio, ++ qmode->rl.qhealth[index].prio_level); ++ val = ((reg_val & (~(BKE_HEALTH_MASK))) | (val0 & BKE_HEALTH_MASK)); ++ writel_relaxed(val, addr); ++ /* Ensure that priority for regulator/limiter modes are ++ * set before returning ++ */ ++ wmb(); ++ ++} ++ ++static void msm_bus_bimc_set_qos_prio(void __iomem *base, ++ uint32_t mas_index, uint8_t qmode_sel, ++ struct msm_bus_bimc_qos_mode *qmode) ++{ ++ uint32_t reg_val, val; ++ ++ switch (qmode_sel) { ++ case BIMC_QOS_MODE_FIXED: ++ reg_val = readl_relaxed(M_PRIOLVL_OVERRIDE_ADDR( ++ base, mas_index)) & M_PRIOLVL_OVERRIDE_RMSK; ++ val = qmode->fixed.prio_level << ++ M_PRIOLVL_OVERRIDE_SHFT; ++ writel_relaxed(((reg_val & ++ ~(M_PRIOLVL_OVERRIDE_BMSK)) | (val ++ & M_PRIOLVL_OVERRIDE_BMSK)), ++ M_PRIOLVL_OVERRIDE_ADDR(base, mas_index)); ++ ++ reg_val = readl_relaxed(M_RD_CMD_OVERRIDE_ADDR( ++ base, mas_index)) & M_RD_CMD_OVERRIDE_RMSK; ++ val = qmode->fixed.areq_prio_rd << ++ M_RD_CMD_OVERRIDE_AREQPRIO_SHFT; ++ writel_relaxed(((reg_val & ~(M_RD_CMD_OVERRIDE_AREQPRIO_BMSK)) ++ | (val & M_RD_CMD_OVERRIDE_AREQPRIO_BMSK)), ++ M_RD_CMD_OVERRIDE_ADDR(base, mas_index)); ++ ++ reg_val = readl_relaxed(M_WR_CMD_OVERRIDE_ADDR( ++ base, mas_index)) & M_WR_CMD_OVERRIDE_RMSK; ++ val = qmode->fixed.areq_prio_wr << ++ M_WR_CMD_OVERRIDE_AREQPRIO_SHFT; ++ writel_relaxed(((reg_val & ~(M_WR_CMD_OVERRIDE_AREQPRIO_BMSK)) ++ | (val & M_WR_CMD_OVERRIDE_AREQPRIO_BMSK)), ++ M_WR_CMD_OVERRIDE_ADDR(base, mas_index)); ++ /* Ensure that fixed mode register writes go through ++ * before returning ++ */ ++ wmb(); ++ break; ++ ++ case BIMC_QOS_MODE_REGULATOR: ++ case BIMC_QOS_MODE_LIMITER: ++ set_qos_prio_rl(M_BKE_HEALTH_3_CONFIG_ADDR(base, ++ mas_index), M_BKE_HEALTH_3_CONFIG_RMSK, 3, qmode); ++ set_qos_prio_rl(M_BKE_HEALTH_2_CONFIG_ADDR(base, ++ mas_index), M_BKE_HEALTH_2_CONFIG_RMSK, 2, qmode); ++ set_qos_prio_rl(M_BKE_HEALTH_1_CONFIG_ADDR(base, ++ mas_index), M_BKE_HEALTH_1_CONFIG_RMSK, 1, qmode); ++ set_qos_prio_rl(M_BKE_HEALTH_0_CONFIG_ADDR(base, ++ mas_index), M_BKE_HEALTH_0_CONFIG_RMSK, 0 , qmode); ++ break; ++ case BIMC_QOS_MODE_BYPASS: ++ default: ++ break; ++ } ++} ++ ++static void set_qos_bw_regs(void __iomem *baddr, uint32_t mas_index, ++ int32_t th, int32_t tm, int32_t tl, uint32_t gp, ++ uint32_t gc) ++{ ++ int32_t reg_val, val; ++ int32_t bke_reg_val; ++ int16_t val2; ++ ++ /* Disable BKE before writing to registers as per spec */ ++ bke_reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index)); ++ writel_relaxed((bke_reg_val & ~(M_BKE_EN_EN_BMSK)), ++ M_BKE_EN_ADDR(baddr, mas_index)); ++ ++ /* Write values of registers calculated */ ++ reg_val = readl_relaxed(M_BKE_GP_ADDR(baddr, mas_index)) ++ & M_BKE_GP_RMSK; ++ val = gp << M_BKE_GP_GP_SHFT; ++ writel_relaxed(((reg_val & ~(M_BKE_GP_GP_BMSK)) | (val & ++ M_BKE_GP_GP_BMSK)), M_BKE_GP_ADDR(baddr, mas_index)); ++ ++ reg_val = readl_relaxed(M_BKE_GC_ADDR(baddr, mas_index)) & ++ M_BKE_GC_RMSK; ++ val = gc << M_BKE_GC_GC_SHFT; ++ writel_relaxed(((reg_val & ~(M_BKE_GC_GC_BMSK)) | (val & ++ M_BKE_GC_GC_BMSK)), M_BKE_GC_ADDR(baddr, mas_index)); ++ ++ reg_val = readl_relaxed(M_BKE_THH_ADDR(baddr, mas_index)) & ++ M_BKE_THH_RMSK; ++ val = th << M_BKE_THH_THRESH_SHFT; ++ writel_relaxed(((reg_val & ~(M_BKE_THH_THRESH_BMSK)) | (val & ++ M_BKE_THH_THRESH_BMSK)), M_BKE_THH_ADDR(baddr, mas_index)); ++ ++ reg_val = readl_relaxed(M_BKE_THM_ADDR(baddr, mas_index)) & ++ M_BKE_THM_RMSK; ++ val2 = tm << M_BKE_THM_THRESH_SHFT; ++ writel_relaxed(((reg_val & ~(M_BKE_THM_THRESH_BMSK)) | (val2 & ++ M_BKE_THM_THRESH_BMSK)), M_BKE_THM_ADDR(baddr, mas_index)); ++ ++ reg_val = readl_relaxed(M_BKE_THL_ADDR(baddr, mas_index)) & ++ M_BKE_THL_RMSK; ++ val2 = tl << M_BKE_THL_THRESH_SHFT; ++ writel_relaxed(((reg_val & ~(M_BKE_THL_THRESH_BMSK)) | ++ (val2 & M_BKE_THL_THRESH_BMSK)), M_BKE_THL_ADDR(baddr, ++ mas_index)); ++ ++ /* Ensure that all bandwidth register writes have completed ++ * before returning ++ */ ++ wmb(); ++} ++ ++static void msm_bus_bimc_set_qos_bw(void __iomem *base, uint32_t qos_freq, ++ uint32_t mas_index, struct msm_bus_bimc_qos_bw *qbw) ++{ ++ uint32_t bke_en; ++ ++ /* Validate QOS Frequency */ ++ if (qos_freq == 0) { ++ MSM_BUS_DBG("Zero frequency\n"); ++ return; ++ } ++ ++ /* Get enable bit for BKE before programming the period */ ++ bke_en = (readl_relaxed(M_BKE_EN_ADDR(base, mas_index)) & ++ M_BKE_EN_EN_BMSK) >> M_BKE_EN_EN_SHFT; ++ ++ /* Only calculate if there's a requested bandwidth and window */ ++ if (qbw->bw && qbw->ws) { ++ int64_t th, tm, tl; ++ uint32_t gp, gc; ++ int64_t gp_nominal, gp_required, gp_calc, data, temp; ++ int64_t win = qbw->ws * qos_freq; ++ temp = win; ++ /* ++ * Calculate nominal grant period defined by requested ++ * window size. ++ * Ceil this value to max grant period. ++ */ ++ bimc_div(&temp, 1000000); ++ gp_nominal = min_t(uint64_t, MAX_GRANT_PERIOD, temp); ++ /* ++ * Calculate max window size, defined by bw request. ++ * Units: (KHz, MB/s) ++ */ ++ gp_calc = MAX_GC * qos_freq * 1000; ++ gp_required = gp_calc; ++ bimc_div(&gp_required, qbw->bw); ++ ++ /* User min of two grant periods */ ++ gp = min_t(int64_t, gp_nominal, gp_required); ++ ++ /* Calculate bandwith in grants and ceil. */ ++ temp = qbw->bw * gp; ++ data = qos_freq * 1000; ++ bimc_div(&temp, data); ++ gc = min_t(int64_t, MAX_GC, temp); ++ ++ /* Calculate thresholds */ ++ th = qbw->bw - qbw->thh; ++ tm = qbw->bw - qbw->thm; ++ tl = qbw->bw - qbw->thl; ++ ++ th = th * gp; ++ bimc_div(&th, data); ++ tm = tm * gp; ++ bimc_div(&tm, data); ++ tl = tl * gp; ++ bimc_div(&tl, data); ++ ++ MSM_BUS_DBG("BIMC: BW: mas_index: %d, th: %llu tm: %llu\n", ++ mas_index, th, tm); ++ MSM_BUS_DBG("BIMC: tl: %llu gp:%u gc: %u bke_en: %u\n", ++ tl, gp, gc, bke_en); ++ set_qos_bw_regs(base, mas_index, th, tm, tl, gp, gc); ++ } else ++ /* Clear bandwidth registers */ ++ set_qos_bw_regs(base, mas_index, 0, 0, 0, 0, 0); ++} ++ ++static int msm_bus_bimc_allocate_commit_data(struct msm_bus_fabric_registration ++ *fab_pdata, void **cdata, int ctx) ++{ ++ struct msm_bus_bimc_commit **cd = (struct msm_bus_bimc_commit **)cdata; ++ struct msm_bus_bimc_info *binfo = ++ (struct msm_bus_bimc_info *)fab_pdata->hw_data; ++ ++ MSM_BUS_DBG("Allocating BIMC commit data\n"); ++ *cd = kzalloc(sizeof(struct msm_bus_bimc_commit), GFP_KERNEL); ++ if (!*cd) { ++ MSM_BUS_DBG("Couldn't alloc mem for cdata\n"); ++ return -ENOMEM; ++ } ++ ++ (*cd)->mas = binfo->cdata[ctx].mas; ++ (*cd)->slv = binfo->cdata[ctx].slv; ++ ++ return 0; ++} ++ ++static void *msm_bus_bimc_allocate_bimc_data(struct platform_device *pdev, ++ struct msm_bus_fabric_registration *fab_pdata) ++{ ++ struct resource *bimc_mem; ++ struct resource *bimc_io; ++ struct msm_bus_bimc_info *binfo; ++ int i; ++ ++ MSM_BUS_DBG("Allocating BIMC data\n"); ++ binfo = kzalloc(sizeof(struct msm_bus_bimc_info), GFP_KERNEL); ++ if (!binfo) { ++ WARN(!binfo, "Couldn't alloc mem for bimc_info\n"); ++ return NULL; ++ } ++ ++ binfo->qos_freq = fab_pdata->qos_freq; ++ ++ binfo->params.nmasters = fab_pdata->nmasters; ++ binfo->params.nslaves = fab_pdata->nslaves; ++ binfo->params.bus_id = fab_pdata->id; ++ ++ for (i = 0; i < NUM_CTX; i++) { ++ binfo->cdata[i].mas = kzalloc(sizeof(struct ++ msm_bus_node_hw_info) * fab_pdata->nmasters * 2, ++ GFP_KERNEL); ++ if (!binfo->cdata[i].mas) { ++ MSM_BUS_ERR("Couldn't alloc mem for bimc master hw\n"); ++ kfree(binfo); ++ return NULL; ++ } ++ ++ binfo->cdata[i].slv = kzalloc(sizeof(struct ++ msm_bus_node_hw_info) * fab_pdata->nslaves * 2, ++ GFP_KERNEL); ++ if (!binfo->cdata[i].slv) { ++ MSM_BUS_DBG("Couldn't alloc mem for bimc slave hw\n"); ++ kfree(binfo->cdata[i].mas); ++ kfree(binfo); ++ return NULL; ++ } ++ } ++ ++ if (fab_pdata->virt) { ++ MSM_BUS_DBG("Don't get memory regions for virtual fabric\n"); ++ goto skip_mem; ++ } ++ ++ bimc_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!bimc_mem) { ++ MSM_BUS_ERR("Cannot get BIMC Base address\n"); ++ kfree(binfo); ++ return NULL; ++ } ++ ++ bimc_io = request_mem_region(bimc_mem->start, ++ resource_size(bimc_mem), pdev->name); ++ if (!bimc_io) { ++ MSM_BUS_ERR("BIMC memory unavailable\n"); ++ kfree(binfo); ++ return NULL; ++ } ++ ++ binfo->base = ioremap(bimc_mem->start, resource_size(bimc_mem)); ++ if (!binfo->base) { ++ MSM_BUS_ERR("IOremap failed for BIMC!\n"); ++ release_mem_region(bimc_mem->start, resource_size(bimc_mem)); ++ kfree(binfo); ++ return NULL; ++ } ++ ++skip_mem: ++ fab_pdata->hw_data = (void *)binfo; ++ return (void *)binfo; ++} ++ ++static void free_commit_data(void *cdata) ++{ ++ struct msm_bus_bimc_commit *cd = (struct msm_bus_bimc_commit *)cdata; ++ ++ kfree(cd->mas); ++ kfree(cd->slv); ++ kfree(cd); ++} ++ ++static void bke_switch( ++ void __iomem *baddr, uint32_t mas_index, bool req, int mode) ++{ ++ uint32_t reg_val, val, cur_val; ++ ++ val = req << M_BKE_EN_EN_SHFT; ++ reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index)); ++ cur_val = reg_val & M_BKE_EN_RMSK; ++ if (val == cur_val) ++ return; ++ ++ if (!req && mode == BIMC_QOS_MODE_FIXED) ++ set_qos_mode(baddr, mas_index, 1, 1, 1); ++ ++ writel_relaxed(((reg_val & ~(M_BKE_EN_EN_BMSK)) | (val & ++ M_BKE_EN_EN_BMSK)), M_BKE_EN_ADDR(baddr, mas_index)); ++ /* Make sure BKE on/off goes through before changing priorities */ ++ wmb(); ++ ++ if (req) ++ set_qos_mode(baddr, mas_index, 0, 0, 0); ++} ++ ++static void bimc_set_static_qos_bw(void __iomem *base, unsigned int qos_freq, ++ int mport, struct msm_bus_bimc_qos_bw *qbw) ++{ ++ int32_t bw_mbps, thh = 0, thm, thl, gc; ++ int32_t gp; ++ u64 temp; ++ ++ if (qos_freq == 0) { ++ MSM_BUS_DBG("No QoS Frequency.\n"); ++ return; ++ } ++ ++ if (!(qbw->bw && qbw->gp)) { ++ MSM_BUS_DBG("No QoS Bandwidth or Window size\n"); ++ return; ++ } ++ ++ /* Convert bandwidth to MBPS */ ++ temp = qbw->bw; ++ bimc_div(&temp, 1000000); ++ bw_mbps = temp; ++ ++ /* Grant period in clock cycles ++ * Grant period from bandwidth structure ++ * is in nano seconds, QoS freq is in KHz. ++ * Divide by 1000 to get clock cycles. ++ */ ++ gp = (qos_freq * qbw->gp) / (1000 * NSEC_PER_USEC); ++ ++ /* Grant count = BW in MBps * Grant period ++ * in micro seconds ++ */ ++ gc = bw_mbps * (qbw->gp / NSEC_PER_USEC); ++ gc = min(gc, MAX_GC); ++ ++ /* Medium threshold = -((Medium Threshold percentage * ++ * Grant count) / 100) ++ */ ++ thm = -((qbw->thmp * gc) / 100); ++ qbw->thm = thm; ++ ++ /* Low threshold = -(Grant count) */ ++ thl = -gc; ++ qbw->thl = thl; ++ ++ MSM_BUS_DBG("%s: BKE parameters: gp %d, gc %d, thm %d thl %d thh %d", ++ __func__, gp, gc, thm, thl, thh); ++ ++ trace_bus_bke_params(gc, gp, thl, thm, thl); ++ set_qos_bw_regs(base, mport, thh, thm, thl, gp, gc); ++} ++ ++static void msm_bus_bimc_config_master( ++ struct msm_bus_fabric_registration *fab_pdata, ++ struct msm_bus_inode_info *info, ++ uint64_t req_clk, uint64_t req_bw) ++{ ++ int mode, i, ports; ++ struct msm_bus_bimc_info *binfo; ++ uint64_t bw = 0; ++ ++ binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data; ++ ports = info->node_info->num_mports; ++ ++ /** ++ * Here check the details of dual configuration. ++ * Take actions based on different modes. ++ * Check for threshold if limiter mode, etc. ++ */ ++ ++ if (req_clk <= info->node_info->th[0]) { ++ mode = info->node_info->mode; ++ bw = info->node_info->bimc_bw[0]; ++ } else if ((info->node_info->num_thresh > 1) && ++ (req_clk <= info->node_info->th[1])) { ++ mode = info->node_info->mode; ++ bw = info->node_info->bimc_bw[1]; ++ } else ++ mode = info->node_info->mode_thresh; ++ ++ switch (mode) { ++ case BIMC_QOS_MODE_BYPASS: ++ case BIMC_QOS_MODE_FIXED: ++ for (i = 0; i < ports; i++) ++ bke_switch(binfo->base, info->node_info->qport[i], ++ BKE_OFF, mode); ++ break; ++ case BIMC_QOS_MODE_REGULATOR: ++ case BIMC_QOS_MODE_LIMITER: ++ for (i = 0; i < ports; i++) { ++ /* If not in fixed mode, update bandwidth */ ++ if ((info->node_info->cur_lim_bw != bw) ++ && (mode != BIMC_QOS_MODE_FIXED)) { ++ struct msm_bus_bimc_qos_bw qbw; ++ qbw.ws = info->node_info->ws; ++ qbw.bw = bw; ++ qbw.gp = info->node_info->bimc_gp; ++ qbw.thmp = info->node_info->bimc_thmp; ++ bimc_set_static_qos_bw(binfo->base, ++ binfo->qos_freq, ++ info->node_info->qport[i], &qbw); ++ info->node_info->cur_lim_bw = bw; ++ MSM_BUS_DBG("%s: Qos is %d reqclk %llu bw %llu", ++ __func__, mode, req_clk, bw); ++ } ++ bke_switch(binfo->base, info->node_info->qport[i], ++ BKE_ON, mode); ++ } ++ break; ++ default: ++ break; ++ } ++} ++ ++static void msm_bus_bimc_update_bw(struct msm_bus_inode_info *hop, ++ struct msm_bus_inode_info *info, ++ struct msm_bus_fabric_registration *fab_pdata, ++ void *sel_cdata, int *master_tiers, ++ int64_t add_bw) ++{ ++ struct msm_bus_bimc_info *binfo; ++ struct msm_bus_bimc_qos_bw qbw; ++ int i; ++ int64_t bw; ++ int ports = info->node_info->num_mports; ++ struct msm_bus_bimc_commit *sel_cd = ++ (struct msm_bus_bimc_commit *)sel_cdata; ++ ++ MSM_BUS_DBG("BIMC: Update bw for ID %d, with IID: %d: %lld\n", ++ info->node_info->id, info->node_info->priv_id, add_bw); ++ ++ binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data; ++ ++ if (info->node_info->num_mports == 0) { ++ MSM_BUS_DBG("BIMC: Skip Master BW\n"); ++ goto skip_mas_bw; ++ } ++ ++ ports = info->node_info->num_mports; ++ bw = INTERLEAVED_BW(fab_pdata, add_bw, ports); ++ ++ for (i = 0; i < ports; i++) { ++ sel_cd->mas[info->node_info->masterp[i]].bw += bw; ++ sel_cd->mas[info->node_info->masterp[i]].hw_id = ++ info->node_info->mas_hw_id; ++ MSM_BUS_DBG("BIMC: Update mas_bw for ID: %d -> %llu\n", ++ info->node_info->priv_id, ++ sel_cd->mas[info->node_info->masterp[i]].bw); ++ if (info->node_info->hw_sel == MSM_BUS_RPM) ++ sel_cd->mas[info->node_info->masterp[i]].dirty = 1; ++ else { ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No qos ports to update!\n"); ++ break; ++ } ++ if (!(info->node_info->mode == BIMC_QOS_MODE_REGULATOR) ++ || (info->node_info->mode == ++ BIMC_QOS_MODE_LIMITER)) { ++ MSM_BUS_DBG("Skip QoS reg programming\n"); ++ break; ++ } ++ ++ MSM_BUS_DBG("qport: %d\n", info->node_info->qport[i]); ++ qbw.bw = sel_cd->mas[info->node_info->masterp[i]].bw; ++ qbw.ws = info->node_info->ws; ++ /* Threshold low = 90% of bw */ ++ qbw.thl = div_s64((90 * bw), 100); ++ /* Threshold medium = bw */ ++ qbw.thm = bw; ++ /* Threshold high = 10% more than bw */ ++ qbw.thh = div_s64((110 * bw), 100); ++ /* Check if info is a shared master. ++ * If it is, mark it dirty ++ * If it isn't, then set QOS Bandwidth. ++ * Also if dual-conf is set, don't program bw regs. ++ **/ ++ if (!info->node_info->dual_conf && ++ ((info->node_info->mode == BIMC_QOS_MODE_LIMITER) || ++ (info->node_info->mode == BIMC_QOS_MODE_REGULATOR))) ++ msm_bus_bimc_set_qos_bw(binfo->base, ++ binfo->qos_freq, ++ info->node_info->qport[i], &qbw); ++ } ++ } ++ ++skip_mas_bw: ++ ports = hop->node_info->num_sports; ++ MSM_BUS_DBG("BIMC: ID: %d, Sports: %d\n", hop->node_info->priv_id, ++ ports); ++ ++ for (i = 0; i < ports; i++) { ++ sel_cd->slv[hop->node_info->slavep[i]].bw += add_bw; ++ sel_cd->slv[hop->node_info->slavep[i]].hw_id = ++ hop->node_info->slv_hw_id; ++ MSM_BUS_DBG("BIMC: Update slave_bw: ID: %d -> %llu\n", ++ hop->node_info->priv_id, ++ sel_cd->slv[hop->node_info->slavep[i]].bw); ++ MSM_BUS_DBG("BIMC: Update slave_bw: index: %d\n", ++ hop->node_info->slavep[i]); ++ /* Check if hop is a shared slave. ++ * If it is, mark it dirty ++ * If it isn't, then nothing to be done as the ++ * slaves are in bypass mode. ++ **/ ++ if (hop->node_info->hw_sel == MSM_BUS_RPM) { ++ MSM_BUS_DBG("Slave dirty: %d, slavep: %d\n", ++ hop->node_info->priv_id, ++ hop->node_info->slavep[i]); ++ sel_cd->slv[hop->node_info->slavep[i]].dirty = 1; ++ } ++ } ++} ++ ++static int msm_bus_bimc_commit(struct msm_bus_fabric_registration ++ *fab_pdata, void *hw_data, void **cdata) ++{ ++ MSM_BUS_DBG("\nReached BIMC Commit\n"); ++ msm_bus_remote_hw_commit(fab_pdata, hw_data, cdata); ++ return 0; ++} ++ ++static void msm_bus_bimc_config_limiter( ++ struct msm_bus_fabric_registration *fab_pdata, ++ struct msm_bus_inode_info *info) ++{ ++ struct msm_bus_bimc_info *binfo; ++ int mode, i, ports; ++ ++ binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data; ++ ports = info->node_info->num_mports; ++ ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No QoS Ports to init\n"); ++ return; ++ } ++ ++ if (info->cur_lim_bw) ++ mode = BIMC_QOS_MODE_LIMITER; ++ else ++ mode = info->node_info->mode; ++ ++ switch (mode) { ++ case BIMC_QOS_MODE_BYPASS: ++ case BIMC_QOS_MODE_FIXED: ++ for (i = 0; i < ports; i++) ++ bke_switch(binfo->base, info->node_info->qport[i], ++ BKE_OFF, mode); ++ break; ++ case BIMC_QOS_MODE_REGULATOR: ++ case BIMC_QOS_MODE_LIMITER: ++ if (info->cur_lim_bw != info->cur_prg_bw) { ++ MSM_BUS_DBG("Enabled BKE throttling node %d to %llu\n", ++ info->node_info->id, info->cur_lim_bw); ++ trace_bus_bimc_config_limiter(info->node_info->id, ++ info->cur_lim_bw); ++ for (i = 0; i < ports; i++) { ++ /* If not in fixed mode, update bandwidth */ ++ struct msm_bus_bimc_qos_bw qbw; ++ ++ qbw.ws = info->node_info->ws; ++ qbw.bw = info->cur_lim_bw; ++ qbw.gp = info->node_info->bimc_gp; ++ qbw.thmp = info->node_info->bimc_thmp; ++ bimc_set_static_qos_bw(binfo->base, ++ binfo->qos_freq, ++ info->node_info->qport[i], &qbw); ++ bke_switch(binfo->base, ++ info->node_info->qport[i], ++ BKE_ON, mode); ++ info->cur_prg_bw = qbw.bw; ++ } ++ } ++ break; ++ default: ++ break; ++ } ++} ++ ++static void bimc_init_mas_reg(struct msm_bus_bimc_info *binfo, ++ struct msm_bus_inode_info *info, ++ struct msm_bus_bimc_qos_mode *qmode, int mode) ++{ ++ int i; ++ ++ switch (mode) { ++ case BIMC_QOS_MODE_FIXED: ++ qmode->fixed.prio_level = info->node_info->prio_lvl; ++ qmode->fixed.areq_prio_rd = info->node_info->prio_rd; ++ qmode->fixed.areq_prio_wr = info->node_info->prio_wr; ++ break; ++ case BIMC_QOS_MODE_LIMITER: ++ qmode->rl.qhealth[0].limit_commands = 1; ++ qmode->rl.qhealth[1].limit_commands = 0; ++ qmode->rl.qhealth[2].limit_commands = 0; ++ qmode->rl.qhealth[3].limit_commands = 0; ++ break; ++ default: ++ break; ++ } ++ ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No QoS Ports to init\n"); ++ return; ++ } ++ ++ for (i = 0; i < info->node_info->num_mports; i++) { ++ /* If not in bypass mode, update priority */ ++ if (mode != BIMC_QOS_MODE_BYPASS) { ++ msm_bus_bimc_set_qos_prio(binfo->base, ++ info->node_info-> ++ qport[i], mode, qmode); ++ ++ /* If not in fixed mode, update bandwidth */ ++ if (mode != BIMC_QOS_MODE_FIXED) { ++ struct msm_bus_bimc_qos_bw qbw; ++ qbw.ws = info->node_info->ws; ++ qbw.bw = info->node_info->bimc_bw[0]; ++ qbw.gp = info->node_info->bimc_gp; ++ qbw.thmp = info->node_info->bimc_thmp; ++ bimc_set_static_qos_bw(binfo->base, ++ binfo->qos_freq, ++ info->node_info->qport[i], &qbw); ++ } ++ } ++ ++ /* set mode */ ++ msm_bus_bimc_set_qos_mode(binfo->base, ++ info->node_info->qport[i], ++ mode); ++ } ++} ++ ++static void init_health_regs(struct msm_bus_bimc_info *binfo, ++ struct msm_bus_inode_info *info, ++ struct msm_bus_bimc_qos_mode *qmode, ++ int mode) ++{ ++ int i; ++ ++ if (mode == BIMC_QOS_MODE_LIMITER) { ++ qmode->rl.qhealth[0].limit_commands = 1; ++ qmode->rl.qhealth[1].limit_commands = 0; ++ qmode->rl.qhealth[2].limit_commands = 0; ++ qmode->rl.qhealth[3].limit_commands = 0; ++ ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No QoS Ports to init\n"); ++ return; ++ } ++ ++ for (i = 0; i < info->node_info->num_mports; i++) { ++ /* If not in bypass mode, update priority */ ++ if (mode != BIMC_QOS_MODE_BYPASS) ++ msm_bus_bimc_set_qos_prio(binfo->base, ++ info->node_info->qport[i], mode, qmode); ++ } ++ } ++} ++ ++ ++static int msm_bus_bimc_mas_init(struct msm_bus_bimc_info *binfo, ++ struct msm_bus_inode_info *info) ++{ ++ struct msm_bus_bimc_qos_mode *qmode; ++ qmode = kzalloc(sizeof(struct msm_bus_bimc_qos_mode), ++ GFP_KERNEL); ++ if (!qmode) { ++ MSM_BUS_WARN("Couldn't alloc prio data for node: %d\n", ++ info->node_info->id); ++ return -ENOMEM; ++ } ++ ++ info->hw_data = (void *)qmode; ++ ++ /** ++ * If the master supports dual configuration, ++ * configure registers for both modes ++ */ ++ if (info->node_info->dual_conf) ++ bimc_init_mas_reg(binfo, info, qmode, ++ info->node_info->mode_thresh); ++ else if (info->node_info->nr_lim) ++ init_health_regs(binfo, info, qmode, BIMC_QOS_MODE_LIMITER); ++ ++ bimc_init_mas_reg(binfo, info, qmode, info->node_info->mode); ++ return 0; ++} ++ ++static void msm_bus_bimc_node_init(void *hw_data, ++ struct msm_bus_inode_info *info) ++{ ++ struct msm_bus_bimc_info *binfo = ++ (struct msm_bus_bimc_info *)hw_data; ++ ++ if (!IS_SLAVE(info->node_info->priv_id) && ++ (info->node_info->hw_sel != MSM_BUS_RPM)) ++ msm_bus_bimc_mas_init(binfo, info); ++} ++ ++static int msm_bus_bimc_port_halt(uint32_t haltid, uint8_t mport) ++{ ++ return 0; ++} ++ ++static int msm_bus_bimc_port_unhalt(uint32_t haltid, uint8_t mport) ++{ ++ return 0; ++} ++ ++static int msm_bus_bimc_limit_mport(struct msm_bus_node_device_type *info, ++ void __iomem *qos_base, uint32_t qos_off, ++ uint32_t qos_delta, uint32_t qos_freq, ++ bool enable_lim, u64 lim_bw) ++{ ++ int mode; ++ int i; ++ ++ if (ZERO_OR_NULL_PTR(info->node_info->qport)) { ++ MSM_BUS_DBG("No QoS Ports to limit\n"); ++ return 0; ++ } ++ ++ if (enable_lim && lim_bw) { ++ mode = BIMC_QOS_MODE_LIMITER; ++ ++ if (!info->node_info->lim_bw) { ++ struct msm_bus_bimc_qos_mode qmode; ++ qmode.rl.qhealth[0].limit_commands = 1; ++ qmode.rl.qhealth[1].limit_commands = 0; ++ qmode.rl.qhealth[2].limit_commands = 0; ++ qmode.rl.qhealth[3].limit_commands = 0; ++ ++ for (i = 0; i < info->node_info->num_qports; i++) { ++ /* If not in bypass mode, update priority */ ++ if (mode != BIMC_QOS_MODE_BYPASS) ++ msm_bus_bimc_set_qos_prio(qos_base, ++ info->node_info->qport[i], mode, ++ &qmode); ++ } ++ } ++ ++ for (i = 0; i < info->node_info->num_qports; i++) { ++ struct msm_bus_bimc_qos_bw qbw; ++ /* If not in fixed mode, update bandwidth */ ++ if ((info->node_info->lim_bw != lim_bw)) { ++ qbw.ws = info->node_info->qos_params.ws; ++ qbw.bw = lim_bw; ++ qbw.gp = info->node_info->qos_params.gp; ++ qbw.thmp = info->node_info->qos_params.thmp; ++ bimc_set_static_qos_bw(qos_base, qos_freq, ++ info->node_info->qport[i], &qbw); ++ } ++ bke_switch(qos_base, info->node_info->qport[i], ++ BKE_ON, mode); ++ } ++ info->node_info->lim_bw = lim_bw; ++ } else { ++ mode = info->node_info->qos_params.mode; ++ for (i = 0; i < info->node_info->num_qports; i++) { ++ bke_switch(qos_base, info->node_info->qport[i], ++ BKE_OFF, mode); ++ } ++ } ++ info->node_info->qos_params.cur_mode = mode; ++ return 0; ++} ++ ++static bool msm_bus_bimc_update_bw_reg(int mode) ++{ ++ bool ret = false; ++ ++ if ((mode == BIMC_QOS_MODE_LIMITER) ++ || (mode == BIMC_QOS_MODE_REGULATOR)) ++ ret = true; ++ ++ return ret; ++} ++ ++static int msm_bus_bimc_qos_init(struct msm_bus_node_device_type *info, ++ void __iomem *qos_base, ++ uint32_t qos_off, uint32_t qos_delta, ++ uint32_t qos_freq) ++{ ++ int i; ++ struct msm_bus_bimc_qos_mode qmode; ++ ++ switch (info->node_info->qos_params.mode) { ++ case BIMC_QOS_MODE_FIXED: ++ qmode.fixed.prio_level = info->node_info->qos_params.prio_lvl; ++ qmode.fixed.areq_prio_rd = info->node_info->qos_params.prio_rd; ++ qmode.fixed.areq_prio_wr = info->node_info->qos_params.prio_wr; ++ break; ++ case BIMC_QOS_MODE_LIMITER: ++ qmode.rl.qhealth[0].limit_commands = 1; ++ qmode.rl.qhealth[1].limit_commands = 0; ++ qmode.rl.qhealth[2].limit_commands = 0; ++ qmode.rl.qhealth[3].limit_commands = 0; ++ break; ++ default: ++ break; ++ } ++ ++ if (ZERO_OR_NULL_PTR(info->node_info->qport)) { ++ MSM_BUS_DBG("No QoS Ports to init\n"); ++ return 0; ++ } ++ ++ for (i = 0; i < info->node_info->num_qports; i++) { ++ /* If not in bypass mode, update priority */ ++ if (info->node_info->qos_params.mode != BIMC_QOS_MODE_BYPASS) ++ msm_bus_bimc_set_qos_prio(qos_base, info->node_info-> ++ qport[i], info->node_info->qos_params.mode, ++ &qmode); ++ ++ /* set mode */ ++ if (info->node_info->qos_params.mode == BIMC_QOS_MODE_LIMITER) ++ bke_switch(qos_base, info->node_info->qport[i], ++ BKE_OFF, BIMC_QOS_MODE_FIXED); ++ else ++ msm_bus_bimc_set_qos_mode(qos_base, ++ info->node_info->qport[i], ++ info->node_info->qos_params.mode); ++ } ++ ++ return 0; ++} ++ ++static int msm_bus_bimc_set_bw(struct msm_bus_node_device_type *dev, ++ void __iomem *qos_base, uint32_t qos_off, ++ uint32_t qos_delta, uint32_t qos_freq) ++{ ++ struct msm_bus_bimc_qos_bw qbw; ++ int i; ++ int64_t bw = 0; ++ int ret = 0; ++ struct msm_bus_node_info_type *info = dev->node_info; ++ ++ if (info && info->num_qports && ++ ((info->qos_params.mode == BIMC_QOS_MODE_LIMITER) || ++ (info->qos_params.mode == BIMC_QOS_MODE_REGULATOR))) { ++ bw = msm_bus_div64(info->num_qports, ++ dev->node_ab.ab[DUAL_CTX]); ++ ++ for (i = 0; i < info->num_qports; i++) { ++ MSM_BUS_DBG("BIMC: Update mas_bw for ID: %d -> %llu\n", ++ info->id, bw); ++ ++ if (!info->qport) { ++ MSM_BUS_DBG("No qos ports to update!\n"); ++ break; ++ } ++ ++ qbw.bw = bw + info->qos_params.bw_buffer; ++ trace_bus_bimc_config_limiter(info->id, bw); ++ ++ /* Default to gp of 5us */ ++ qbw.gp = (info->qos_params.gp ? ++ info->qos_params.gp : 5000); ++ /* Default to thmp of 50% */ ++ qbw.thmp = (info->qos_params.thmp ? ++ info->qos_params.thmp : 50); ++ /* ++ * If the BW vote is 0 then set the QoS mode to ++ * Fixed. ++ */ ++ if (bw) { ++ bimc_set_static_qos_bw(qos_base, qos_freq, ++ info->qport[i], &qbw); ++ bke_switch(qos_base, info->qport[i], ++ BKE_ON, info->qos_params.mode); ++ } else { ++ bke_switch(qos_base, info->qport[i], ++ BKE_OFF, BIMC_QOS_MODE_FIXED); ++ } ++ } ++ } ++ return ret; ++} ++ ++int msm_bus_bimc_hw_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo) ++{ ++ /* Set interleaving to true by default */ ++ MSM_BUS_DBG("\nInitializing BIMC...\n"); ++ pdata->il_flag = true; ++ hw_algo->allocate_commit_data = msm_bus_bimc_allocate_commit_data; ++ hw_algo->allocate_hw_data = msm_bus_bimc_allocate_bimc_data; ++ hw_algo->node_init = msm_bus_bimc_node_init; ++ hw_algo->free_commit_data = free_commit_data; ++ hw_algo->update_bw = msm_bus_bimc_update_bw; ++ hw_algo->commit = msm_bus_bimc_commit; ++ hw_algo->port_halt = msm_bus_bimc_port_halt; ++ hw_algo->port_unhalt = msm_bus_bimc_port_unhalt; ++ hw_algo->config_master = msm_bus_bimc_config_master; ++ hw_algo->config_limiter = msm_bus_bimc_config_limiter; ++ hw_algo->update_bw_reg = msm_bus_bimc_update_bw_reg; ++ /* BIMC slaves are shared. Slave registers are set through RPM */ ++ if (!pdata->ahb) ++ pdata->rpm_enabled = 1; ++ return 0; ++} ++ ++int msm_bus_bimc_set_ops(struct msm_bus_node_device_type *bus_dev) ++{ ++ if (!bus_dev) ++ return -ENODEV; ++ else { ++ bus_dev->fabdev->noc_ops.qos_init = msm_bus_bimc_qos_init; ++ bus_dev->fabdev->noc_ops.set_bw = msm_bus_bimc_set_bw; ++ bus_dev->fabdev->noc_ops.limit_mport = msm_bus_bimc_limit_mport; ++ bus_dev->fabdev->noc_ops.update_bw_reg = ++ msm_bus_bimc_update_bw_reg; ++ } ++ return 0; ++} ++EXPORT_SYMBOL(msm_bus_bimc_set_ops); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_bimc.h +@@ -0,0 +1,127 @@ ++/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef _ARCH_ARM_MACH_MSM_BUS_BIMC_H ++#define _ARCH_ARM_MACH_MSM_BUS_BIMC_H ++ ++struct msm_bus_bimc_params { ++ uint32_t bus_id; ++ uint32_t addr_width; ++ uint32_t data_width; ++ uint32_t nmasters; ++ uint32_t nslaves; ++}; ++ ++struct msm_bus_bimc_commit { ++ struct msm_bus_node_hw_info *mas; ++ struct msm_bus_node_hw_info *slv; ++}; ++ ++struct msm_bus_bimc_info { ++ void __iomem *base; ++ uint32_t base_addr; ++ uint32_t qos_freq; ++ struct msm_bus_bimc_params params; ++ struct msm_bus_bimc_commit cdata[NUM_CTX]; ++}; ++ ++struct msm_bus_bimc_node { ++ uint32_t conn_mask; ++ uint32_t data_width; ++ uint8_t slv_arb_mode; ++}; ++ ++enum msm_bus_bimc_arb_mode { ++ BIMC_ARB_MODE_RR = 0, ++ BIMC_ARB_MODE_PRIORITY_RR, ++ BIMC_ARB_MODE_TIERED_RR, ++}; ++ ++ ++enum msm_bus_bimc_interleave { ++ BIMC_INTERLEAVE_NONE = 0, ++ BIMC_INTERLEAVE_ODD, ++ BIMC_INTERLEAVE_EVEN, ++}; ++ ++struct msm_bus_bimc_slave_seg { ++ bool enable; ++ uint64_t start_addr; ++ uint64_t seg_size; ++ uint8_t interleave; ++}; ++ ++enum msm_bus_bimc_qos_mode_type { ++ BIMC_QOS_MODE_FIXED = 0, ++ BIMC_QOS_MODE_LIMITER, ++ BIMC_QOS_MODE_BYPASS, ++ BIMC_QOS_MODE_REGULATOR, ++}; ++ ++struct msm_bus_bimc_qos_health { ++ bool limit_commands; ++ uint32_t areq_prio; ++ uint32_t prio_level; ++}; ++ ++struct msm_bus_bimc_mode_fixed { ++ uint32_t prio_level; ++ uint32_t areq_prio_rd; ++ uint32_t areq_prio_wr; ++}; ++ ++struct msm_bus_bimc_mode_rl { ++ uint8_t qhealthnum; ++ struct msm_bus_bimc_qos_health qhealth[4]; ++}; ++ ++struct msm_bus_bimc_qos_mode { ++ uint8_t mode; ++ struct msm_bus_bimc_mode_fixed fixed; ++ struct msm_bus_bimc_mode_rl rl; ++}; ++ ++struct msm_bus_bimc_qos_bw { ++ uint64_t bw; /* bw is in Bytes/sec */ ++ uint32_t ws; /* Window size in nano seconds*/ ++ int64_t thh; /* Threshold high, bytes per second */ ++ int64_t thm; /* Threshold medium, bytes per second */ ++ int64_t thl; /* Threshold low, bytes per second */ ++ u32 gp; /* Grant Period in micro seconds */ ++ u32 thmp; /* Threshold medium in percentage */ ++}; ++ ++struct msm_bus_bimc_clk_gate { ++ bool core_clk_gate_en; ++ bool arb_clk_gate_en; /* For arbiter */ ++ bool port_clk_gate_en; /* For regs on BIMC core clock */ ++}; ++ ++void msm_bus_bimc_set_slave_seg(struct msm_bus_bimc_info *binfo, ++ uint32_t slv_index, uint32_t seg_index, ++ struct msm_bus_bimc_slave_seg *bsseg); ++void msm_bus_bimc_set_slave_clk_gate(struct msm_bus_bimc_info *binfo, ++ uint32_t slv_index, struct msm_bus_bimc_clk_gate *bgate); ++void msm_bus_bimc_set_mas_clk_gate(struct msm_bus_bimc_info *binfo, ++ uint32_t mas_index, struct msm_bus_bimc_clk_gate *bgate); ++void msm_bus_bimc_arb_en(struct msm_bus_bimc_info *binfo, ++ uint32_t slv_index, bool en); ++void msm_bus_bimc_get_params(struct msm_bus_bimc_info *binfo, ++ struct msm_bus_bimc_params *params); ++void msm_bus_bimc_get_mas_params(struct msm_bus_bimc_info *binfo, ++ uint32_t mas_index, struct msm_bus_bimc_node *mparams); ++void msm_bus_bimc_get_slv_params(struct msm_bus_bimc_info *binfo, ++ uint32_t slv_index, struct msm_bus_bimc_node *sparams); ++bool msm_bus_bimc_get_arb_en(struct msm_bus_bimc_info *binfo, ++ uint32_t slv_index); ++ ++#endif /*_ARCH_ARM_MACH_MSM_BUS_BIMC_H*/ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_client_api.c +@@ -0,0 +1,83 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "msm-bus.h" ++#include "msm_bus_core.h" ++ ++struct msm_bus_arb_ops arb_ops; ++ ++/** ++ * msm_bus_scale_register_client() - Register the clients with the msm bus ++ * driver ++ * @pdata: Platform data of the client, containing src, dest, ab, ib. ++ * Return non-zero value in case of success, 0 in case of failure. ++ * ++ * Client data contains the vectors specifying arbitrated bandwidth (ab) ++ * and instantaneous bandwidth (ib) requested between a particular ++ * src and dest. ++ */ ++uint32_t msm_bus_scale_register_client(struct msm_bus_scale_pdata *pdata) ++{ ++ if (arb_ops.register_client) ++ return arb_ops.register_client(pdata); ++ else { ++ pr_err("%s: Bus driver not ready.", ++ __func__); ++ return 0; ++ } ++} ++EXPORT_SYMBOL(msm_bus_scale_register_client); ++ ++/** ++ * msm_bus_scale_client_update_request() - Update the request for bandwidth ++ * from a particular client ++ * ++ * cl: Handle to the client ++ * index: Index into the vector, to which the bw and clock values need to be ++ * updated ++ */ ++int msm_bus_scale_client_update_request(uint32_t cl, unsigned int index) ++{ ++ if (arb_ops.update_request) ++ return arb_ops.update_request(cl, index); ++ else { ++ pr_err("%s: Bus driver not ready.", ++ __func__); ++ return -EPROBE_DEFER; ++ } ++} ++EXPORT_SYMBOL(msm_bus_scale_client_update_request); ++ ++/** ++ * msm_bus_scale_unregister_client() - Unregister the client from the bus driver ++ * @cl: Handle to the client ++ */ ++void msm_bus_scale_unregister_client(uint32_t cl) ++{ ++ if (arb_ops.unregister_client) ++ arb_ops.unregister_client(cl); ++ else { ++ pr_err("%s: Bus driver not ready.", ++ __func__); ++ } ++} ++EXPORT_SYMBOL(msm_bus_scale_unregister_client); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_core.c +@@ -0,0 +1,125 @@ ++/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm-bus.h" ++#include "msm_bus_core.h" ++ ++static atomic_t num_fab = ATOMIC_INIT(0); ++ ++int msm_bus_get_num_fab(void) ++{ ++ return atomic_read(&num_fab); ++} ++ ++int msm_bus_device_match(struct device *dev, void *id) ++{ ++ struct msm_bus_fabric_device *fabdev = to_msm_bus_fabric_device(dev); ++ ++ if (!fabdev) { ++ MSM_BUS_WARN("Fabric %p returning 0\n", fabdev); ++ return 0; ++ } ++ return fabdev->id == *(int *)id; ++} ++ ++static void msm_bus_release(struct device *device) ++{ ++} ++ ++struct bus_type msm_bus_type = { ++ .name = "msm-bus-type", ++}; ++EXPORT_SYMBOL(msm_bus_type); ++ ++/** ++ * msm_bus_get_fabric_device() - This function is used to search for ++ * the fabric device on the bus ++ * @fabid: Fabric id ++ * Function returns: Pointer to the fabric device ++ */ ++struct msm_bus_fabric_device *msm_bus_get_fabric_device(int fabid) ++{ ++ struct device *dev; ++ struct msm_bus_fabric_device *fabric; ++ dev = bus_find_device(&msm_bus_type, NULL, (void *)&fabid, ++ msm_bus_device_match); ++ if (!dev) ++ return NULL; ++ fabric = to_msm_bus_fabric_device(dev); ++ return fabric; ++} ++ ++/** ++ * msm_bus_fabric_device_register() - Registers a fabric on msm bus ++ * @fabdev: Fabric device to be registered ++ */ ++int msm_bus_fabric_device_register(struct msm_bus_fabric_device *fabdev) ++{ ++ int ret = 0; ++ fabdev->dev.bus = &msm_bus_type; ++ fabdev->dev.release = msm_bus_release; ++ ret = dev_set_name(&fabdev->dev, fabdev->name); ++ if (ret) { ++ MSM_BUS_ERR("error setting dev name\n"); ++ goto err; ++ } ++ ++ ret = device_register(&fabdev->dev); ++ if (ret < 0) { ++ MSM_BUS_ERR("error registering device%d %s\n", ++ ret, fabdev->name); ++ goto err; ++ } ++ atomic_inc(&num_fab); ++err: ++ return ret; ++} ++ ++/** ++ * msm_bus_fabric_device_unregister() - Unregisters the fabric ++ * devices from the msm bus ++ */ ++void msm_bus_fabric_device_unregister(struct msm_bus_fabric_device *fabdev) ++{ ++ device_unregister(&fabdev->dev); ++ atomic_dec(&num_fab); ++} ++ ++static void __exit msm_bus_exit(void) ++{ ++ bus_unregister(&msm_bus_type); ++} ++ ++static int __init msm_bus_init(void) ++{ ++ int retval = 0; ++ retval = bus_register(&msm_bus_type); ++ if (retval) ++ MSM_BUS_ERR("bus_register error! %d\n", ++ retval); ++ return retval; ++} ++postcore_initcall(msm_bus_init); ++module_exit(msm_bus_exit); ++MODULE_LICENSE("GPL v2"); ++MODULE_VERSION("0.2"); ++MODULE_ALIAS("platform:msm_bus"); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_core.h +@@ -0,0 +1,375 @@ ++/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef _ARCH_ARM_MACH_MSM_BUS_CORE_H ++#define _ARCH_ARM_MACH_MSM_BUS_CORE_H ++ ++#include ++#include ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm-bus.h" ++ ++#define MSM_BUS_DBG(msg, ...) \ ++ pr_debug(msg, ## __VA_ARGS__) ++#define MSM_BUS_ERR(msg, ...) \ ++ pr_err(msg, ## __VA_ARGS__) ++#define MSM_BUS_WARN(msg, ...) \ ++ pr_warn(msg, ## __VA_ARGS__) ++#define MSM_FAB_ERR(msg, ...) \ ++ dev_err(&fabric->fabdev.dev, msg, ## __VA_ARGS__) ++ ++#define IS_MASTER_VALID(mas) \ ++ (((mas >= MSM_BUS_MASTER_FIRST) && (mas <= MSM_BUS_MASTER_LAST)) \ ++ ? 1 : 0) ++#define IS_SLAVE_VALID(slv) \ ++ (((slv >= MSM_BUS_SLAVE_FIRST) && (slv <= MSM_BUS_SLAVE_LAST)) ? 1 : 0) ++ ++#define INTERLEAVED_BW(fab_pdata, bw, ports) \ ++ ((fab_pdata->il_flag) ? ((bw < 0) \ ++ ? -msm_bus_div64((ports), (-bw)) : msm_bus_div64((ports), (bw))) : (bw)) ++#define INTERLEAVED_VAL(fab_pdata, n) \ ++ ((fab_pdata->il_flag) ? (n) : 1) ++#define KBTOB(a) (a * 1000ULL) ++ ++enum msm_bus_dbg_op_type { ++ MSM_BUS_DBG_UNREGISTER = -2, ++ MSM_BUS_DBG_REGISTER, ++ MSM_BUS_DBG_OP = 1, ++}; ++ ++enum msm_bus_hw_sel { ++ MSM_BUS_RPM = 0, ++ MSM_BUS_NOC, ++ MSM_BUS_BIMC, ++}; ++ ++struct msm_bus_arb_ops { ++ uint32_t (*register_client)(struct msm_bus_scale_pdata *pdata); ++ int (*update_request)(uint32_t cl, unsigned int index); ++ void (*unregister_client)(uint32_t cl); ++}; ++ ++enum { ++ SLAVE_NODE, ++ MASTER_NODE, ++ CLK_NODE, ++ NR_LIM_NODE, ++}; ++ ++ ++extern struct bus_type msm_bus_type; ++extern struct msm_bus_arb_ops arb_ops; ++extern void msm_bus_arb_setops_legacy(struct msm_bus_arb_ops *arb_ops); ++ ++struct msm_bus_node_info { ++ unsigned int id; ++ unsigned int priv_id; ++ unsigned int mas_hw_id; ++ unsigned int slv_hw_id; ++ int gateway; ++ int *masterp; ++ int *qport; ++ int num_mports; ++ int *slavep; ++ int num_sports; ++ int *tier; ++ int num_tiers; ++ int ahb; ++ int hw_sel; ++ const char *slaveclk[NUM_CTX]; ++ const char *memclk[NUM_CTX]; ++ const char *iface_clk_node; ++ unsigned int buswidth; ++ unsigned int ws; ++ unsigned int mode; ++ unsigned int perm_mode; ++ unsigned int prio_lvl; ++ unsigned int prio_rd; ++ unsigned int prio_wr; ++ unsigned int prio1; ++ unsigned int prio0; ++ unsigned int num_thresh; ++ u64 *th; ++ u64 cur_lim_bw; ++ unsigned int mode_thresh; ++ bool dual_conf; ++ u64 *bimc_bw; ++ bool nr_lim; ++ u32 ff; ++ bool rt_mas; ++ u32 bimc_gp; ++ u32 bimc_thmp; ++ u64 floor_bw; ++ const char *name; ++}; ++ ++struct path_node { ++ uint64_t clk[NUM_CTX]; ++ uint64_t bw[NUM_CTX]; ++ uint64_t *sel_clk; ++ uint64_t *sel_bw; ++ int next; ++}; ++ ++struct msm_bus_link_info { ++ uint64_t clk[NUM_CTX]; ++ uint64_t *sel_clk; ++ uint64_t memclk; ++ int64_t bw[NUM_CTX]; ++ int64_t *sel_bw; ++ int *tier; ++ int num_tiers; ++}; ++ ++struct nodeclk { ++ struct clk *clk; ++ uint64_t rate; ++ bool dirty; ++ bool enable; ++}; ++ ++struct msm_bus_inode_info { ++ struct msm_bus_node_info *node_info; ++ uint64_t max_bw; ++ uint64_t max_clk; ++ uint64_t cur_lim_bw; ++ uint64_t cur_prg_bw; ++ struct msm_bus_link_info link_info; ++ int num_pnodes; ++ struct path_node *pnode; ++ int commit_index; ++ struct nodeclk nodeclk[NUM_CTX]; ++ struct nodeclk memclk[NUM_CTX]; ++ struct nodeclk iface_clk; ++ void *hw_data; ++}; ++ ++struct msm_bus_node_hw_info { ++ bool dirty; ++ unsigned int hw_id; ++ uint64_t bw; ++}; ++ ++struct msm_bus_hw_algorithm { ++ int (*allocate_commit_data)(struct msm_bus_fabric_registration ++ *fab_pdata, void **cdata, int ctx); ++ void *(*allocate_hw_data)(struct platform_device *pdev, ++ struct msm_bus_fabric_registration *fab_pdata); ++ void (*node_init)(void *hw_data, struct msm_bus_inode_info *info); ++ void (*free_commit_data)(void *cdata); ++ void (*update_bw)(struct msm_bus_inode_info *hop, ++ struct msm_bus_inode_info *info, ++ struct msm_bus_fabric_registration *fab_pdata, ++ void *sel_cdata, int *master_tiers, ++ int64_t add_bw); ++ void (*fill_cdata_buffer)(int *curr, char *buf, const int max_size, ++ void *cdata, int nmasters, int nslaves, int ntslaves); ++ int (*commit)(struct msm_bus_fabric_registration ++ *fab_pdata, void *hw_data, void **cdata); ++ int (*port_unhalt)(uint32_t haltid, uint8_t mport); ++ int (*port_halt)(uint32_t haltid, uint8_t mport); ++ void (*config_master)(struct msm_bus_fabric_registration *fab_pdata, ++ struct msm_bus_inode_info *info, ++ uint64_t req_clk, uint64_t req_bw); ++ void (*config_limiter)(struct msm_bus_fabric_registration *fab_pdata, ++ struct msm_bus_inode_info *info); ++ bool (*update_bw_reg)(int mode); ++}; ++ ++struct msm_bus_fabric_device { ++ int id; ++ const char *name; ++ struct device dev; ++ const struct msm_bus_fab_algorithm *algo; ++ const struct msm_bus_board_algorithm *board_algo; ++ struct msm_bus_hw_algorithm hw_algo; ++ int visited; ++ int num_nr_lim; ++ u64 nr_lim_thresh; ++ u32 eff_fact; ++}; ++#define to_msm_bus_fabric_device(d) container_of(d, \ ++ struct msm_bus_fabric_device, d) ++ ++struct msm_bus_fabric { ++ struct msm_bus_fabric_device fabdev; ++ int ahb; ++ void *cdata[NUM_CTX]; ++ bool arb_dirty; ++ bool clk_dirty; ++ struct radix_tree_root fab_tree; ++ int num_nodes; ++ struct list_head gateways; ++ struct msm_bus_inode_info info; ++ struct msm_bus_fabric_registration *pdata; ++ void *hw_data; ++}; ++#define to_msm_bus_fabric(d) container_of(d, \ ++ struct msm_bus_fabric, d) ++ ++ ++struct msm_bus_fab_algorithm { ++ int (*update_clks)(struct msm_bus_fabric_device *fabdev, ++ struct msm_bus_inode_info *pme, int index, ++ uint64_t curr_clk, uint64_t req_clk, ++ uint64_t bwsum, int flag, int ctx, ++ unsigned int cl_active_flag); ++ int (*port_halt)(struct msm_bus_fabric_device *fabdev, int portid); ++ int (*port_unhalt)(struct msm_bus_fabric_device *fabdev, int portid); ++ int (*commit)(struct msm_bus_fabric_device *fabdev); ++ struct msm_bus_inode_info *(*find_node)(struct msm_bus_fabric_device ++ *fabdev, int id); ++ struct msm_bus_inode_info *(*find_gw_node)(struct msm_bus_fabric_device ++ *fabdev, int id); ++ struct list_head *(*get_gw_list)(struct msm_bus_fabric_device *fabdev); ++ void (*update_bw)(struct msm_bus_fabric_device *fabdev, struct ++ msm_bus_inode_info * hop, struct msm_bus_inode_info *info, ++ int64_t add_bw, int *master_tiers, int ctx); ++ void (*config_master)(struct msm_bus_fabric_device *fabdev, ++ struct msm_bus_inode_info *info, uint64_t req_clk, ++ uint64_t req_bw); ++ void (*config_limiter)(struct msm_bus_fabric_device *fabdev, ++ struct msm_bus_inode_info *info); ++}; ++ ++struct msm_bus_board_algorithm { ++ int board_nfab; ++ void (*assign_iids)(struct msm_bus_fabric_registration *fabreg, ++ int fabid); ++ int (*get_iid)(int id); ++}; ++ ++/** ++ * Used to store the list of fabrics and other info to be ++ * maintained outside the fabric structure. ++ * Used while calculating path, and to find fabric ptrs ++ */ ++struct msm_bus_fabnodeinfo { ++ struct list_head list; ++ struct msm_bus_inode_info *info; ++}; ++ ++struct msm_bus_client { ++ int id; ++ struct msm_bus_scale_pdata *pdata; ++ int *src_pnode; ++ int curr; ++}; ++ ++uint64_t msm_bus_div64(unsigned int width, uint64_t bw); ++int msm_bus_fabric_device_register(struct msm_bus_fabric_device *fabric); ++void msm_bus_fabric_device_unregister(struct msm_bus_fabric_device *fabric); ++struct msm_bus_fabric_device *msm_bus_get_fabric_device(int fabid); ++int msm_bus_get_num_fab(void); ++ ++ ++int msm_bus_hw_fab_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo); ++void msm_bus_board_init(struct msm_bus_fabric_registration *pdata); ++void msm_bus_board_set_nfab(struct msm_bus_fabric_registration *pdata, ++ int nfab); ++#if defined(CONFIG_MSM_RPM_SMD) ++int msm_bus_rpm_hw_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo); ++int msm_bus_remote_hw_commit(struct msm_bus_fabric_registration ++ *fab_pdata, void *hw_data, void **cdata); ++void msm_bus_rpm_fill_cdata_buffer(int *curr, char *buf, const int max_size, ++ void *cdata, int nmasters, int nslaves, int ntslaves); ++#else ++static inline int msm_bus_rpm_hw_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo) ++{ ++ return 0; ++} ++static inline int msm_bus_remote_hw_commit(struct msm_bus_fabric_registration ++ *fab_pdata, void *hw_data, void **cdata) ++{ ++ return 0; ++} ++static inline void msm_bus_rpm_fill_cdata_buffer(int *curr, char *buf, ++ const int max_size, void *cdata, int nmasters, int nslaves, ++ int ntslaves) ++{ ++} ++#endif ++ ++int msm_bus_noc_hw_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo); ++int msm_bus_bimc_hw_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo); ++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) ++void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata, int index, ++ uint32_t cl); ++void msm_bus_dbg_commit_data(const char *fabname, void *cdata, ++ int nmasters, int nslaves, int ntslaves, int op); ++#else ++static inline void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata, ++ int index, uint32_t cl) ++{ ++} ++static inline void msm_bus_dbg_commit_data(const char *fabname, ++ void *cdata, int nmasters, int nslaves, int ntslaves, ++ int op) ++{ ++} ++#endif ++ ++#ifdef CONFIG_CORESIGHT ++int msmbus_coresight_init(struct platform_device *pdev); ++void msmbus_coresight_remove(struct platform_device *pdev); ++int msmbus_coresight_init_adhoc(struct platform_device *pdev, ++ struct device_node *of_node); ++void msmbus_coresight_remove_adhoc(struct platform_device *pdev); ++#else ++static inline int msmbus_coresight_init(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static inline void msmbus_coresight_remove(struct platform_device *pdev) ++{ ++} ++ ++static inline int msmbus_coresight_init_adhoc(struct platform_device *pdev, ++ struct device_node *of_node) ++{ ++ return 0; ++} ++ ++static inline void msmbus_coresight_remove_adhoc(struct platform_device *pdev) ++{ ++} ++#endif ++ ++ ++#ifdef CONFIG_OF ++void msm_bus_of_get_nfab(struct platform_device *pdev, ++ struct msm_bus_fabric_registration *pdata); ++struct msm_bus_fabric_registration ++ *msm_bus_of_get_fab_data(struct platform_device *pdev); ++#else ++static inline void msm_bus_of_get_nfab(struct platform_device *pdev, ++ struct msm_bus_fabric_registration *pdata) ++{ ++ return; ++} ++ ++static inline struct msm_bus_fabric_registration ++ *msm_bus_of_get_fab_data(struct platform_device *pdev) ++{ ++ return NULL; ++} ++#endif ++ ++#endif /*_ARCH_ARM_MACH_MSM_BUS_CORE_H*/ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_dbg.c +@@ -0,0 +1,810 @@ ++/* Copyright (c) 2010-2012, 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ ++#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm-bus.h" ++#include "msm_bus_rules.h" ++#include "msm_bus_core.h" ++#include "msm_bus_adhoc.h" ++ ++#define CREATE_TRACE_POINTS ++#include ++ ++#define MAX_BUFF_SIZE 4096 ++#define FILL_LIMIT 128 ++ ++static struct dentry *clients; ++static struct dentry *dir; ++static DEFINE_MUTEX(msm_bus_dbg_fablist_lock); ++struct msm_bus_dbg_state { ++ uint32_t cl; ++ uint8_t enable; ++ uint8_t current_index; ++} clstate; ++ ++struct msm_bus_cldata { ++ const struct msm_bus_scale_pdata *pdata; ++ int index; ++ uint32_t clid; ++ int size; ++ struct dentry *file; ++ struct list_head list; ++ char buffer[MAX_BUFF_SIZE]; ++}; ++ ++struct msm_bus_fab_list { ++ const char *name; ++ int size; ++ struct dentry *file; ++ struct list_head list; ++ char buffer[MAX_BUFF_SIZE]; ++}; ++ ++static char *rules_buf; ++ ++LIST_HEAD(fabdata_list); ++LIST_HEAD(cl_list); ++ ++/** ++ * The following structures and funtions are used for ++ * the test-client which can be created at run-time. ++ */ ++ ++static struct msm_bus_vectors init_vectors[1]; ++static struct msm_bus_vectors current_vectors[1]; ++static struct msm_bus_vectors requested_vectors[1]; ++ ++static struct msm_bus_paths shell_client_usecases[] = { ++ { ++ .num_paths = ARRAY_SIZE(init_vectors), ++ .vectors = init_vectors, ++ }, ++ { ++ .num_paths = ARRAY_SIZE(current_vectors), ++ .vectors = current_vectors, ++ }, ++ { ++ .num_paths = ARRAY_SIZE(requested_vectors), ++ .vectors = requested_vectors, ++ }, ++}; ++ ++static struct msm_bus_scale_pdata shell_client = { ++ .usecase = shell_client_usecases, ++ .num_usecases = ARRAY_SIZE(shell_client_usecases), ++ .name = "test-client", ++}; ++ ++static void msm_bus_dbg_init_vectors(void) ++{ ++ init_vectors[0].src = -1; ++ init_vectors[0].dst = -1; ++ init_vectors[0].ab = 0; ++ init_vectors[0].ib = 0; ++ current_vectors[0].src = -1; ++ current_vectors[0].dst = -1; ++ current_vectors[0].ab = 0; ++ current_vectors[0].ib = 0; ++ requested_vectors[0].src = -1; ++ requested_vectors[0].dst = -1; ++ requested_vectors[0].ab = 0; ++ requested_vectors[0].ib = 0; ++ clstate.enable = 0; ++ clstate.current_index = 0; ++} ++ ++static int msm_bus_dbg_update_cl_request(uint32_t cl) ++{ ++ int ret = 0; ++ ++ if (clstate.current_index < 2) ++ clstate.current_index = 2; ++ else { ++ clstate.current_index = 1; ++ current_vectors[0].ab = requested_vectors[0].ab; ++ current_vectors[0].ib = requested_vectors[0].ib; ++ } ++ ++ if (clstate.enable) { ++ MSM_BUS_DBG("Updating request for shell client, index: %d\n", ++ clstate.current_index); ++ ret = msm_bus_scale_client_update_request(clstate.cl, ++ clstate.current_index); ++ } else ++ MSM_BUS_DBG("Enable bit not set. Skipping update request\n"); ++ ++ return ret; ++} ++ ++static void msm_bus_dbg_unregister_client(uint32_t cl) ++{ ++ MSM_BUS_DBG("Unregistering shell client\n"); ++ msm_bus_scale_unregister_client(clstate.cl); ++ clstate.cl = 0; ++} ++ ++static uint32_t msm_bus_dbg_register_client(void) ++{ ++ int ret = 0; ++ ++ if (init_vectors[0].src != requested_vectors[0].src) { ++ MSM_BUS_DBG("Shell client master changed. Unregistering\n"); ++ msm_bus_dbg_unregister_client(clstate.cl); ++ } ++ if (init_vectors[0].dst != requested_vectors[0].dst) { ++ MSM_BUS_DBG("Shell client slave changed. Unregistering\n"); ++ msm_bus_dbg_unregister_client(clstate.cl); ++ } ++ ++ current_vectors[0].src = init_vectors[0].src; ++ requested_vectors[0].src = init_vectors[0].src; ++ current_vectors[0].dst = init_vectors[0].dst; ++ requested_vectors[0].dst = init_vectors[0].dst; ++ ++ if (!clstate.enable) { ++ MSM_BUS_DBG("Enable bit not set, skipping registration: cl " ++ "%d\n", clstate.cl); ++ return 0; ++ } ++ ++ if (clstate.cl) { ++ MSM_BUS_DBG("Client registered, skipping registration\n"); ++ return clstate.cl; ++ } ++ ++ MSM_BUS_DBG("Registering shell client\n"); ++ ret = msm_bus_scale_register_client(&shell_client); ++ return ret; ++} ++ ++static int msm_bus_dbg_mas_get(void *data, u64 *val) ++{ ++ *val = init_vectors[0].src; ++ MSM_BUS_DBG("Get master: %llu\n", *val); ++ return 0; ++} ++ ++static int msm_bus_dbg_mas_set(void *data, u64 val) ++{ ++ init_vectors[0].src = val; ++ MSM_BUS_DBG("Set master: %llu\n", val); ++ clstate.cl = msm_bus_dbg_register_client(); ++ return 0; ++} ++DEFINE_SIMPLE_ATTRIBUTE(shell_client_mas_fops, msm_bus_dbg_mas_get, ++ msm_bus_dbg_mas_set, "%llu\n"); ++ ++static int msm_bus_dbg_slv_get(void *data, u64 *val) ++{ ++ *val = init_vectors[0].dst; ++ MSM_BUS_DBG("Get slave: %llu\n", *val); ++ return 0; ++} ++ ++static int msm_bus_dbg_slv_set(void *data, u64 val) ++{ ++ init_vectors[0].dst = val; ++ MSM_BUS_DBG("Set slave: %llu\n", val); ++ clstate.cl = msm_bus_dbg_register_client(); ++ return 0; ++} ++DEFINE_SIMPLE_ATTRIBUTE(shell_client_slv_fops, msm_bus_dbg_slv_get, ++ msm_bus_dbg_slv_set, "%llu\n"); ++ ++static int msm_bus_dbg_ab_get(void *data, u64 *val) ++{ ++ *val = requested_vectors[0].ab; ++ MSM_BUS_DBG("Get ab: %llu\n", *val); ++ return 0; ++} ++ ++static int msm_bus_dbg_ab_set(void *data, u64 val) ++{ ++ requested_vectors[0].ab = val; ++ MSM_BUS_DBG("Set ab: %llu\n", val); ++ return 0; ++} ++DEFINE_SIMPLE_ATTRIBUTE(shell_client_ab_fops, msm_bus_dbg_ab_get, ++ msm_bus_dbg_ab_set, "%llu\n"); ++ ++static int msm_bus_dbg_ib_get(void *data, u64 *val) ++{ ++ *val = requested_vectors[0].ib; ++ MSM_BUS_DBG("Get ib: %llu\n", *val); ++ return 0; ++} ++ ++static int msm_bus_dbg_ib_set(void *data, u64 val) ++{ ++ requested_vectors[0].ib = val; ++ MSM_BUS_DBG("Set ib: %llu\n", val); ++ return 0; ++} ++DEFINE_SIMPLE_ATTRIBUTE(shell_client_ib_fops, msm_bus_dbg_ib_get, ++ msm_bus_dbg_ib_set, "%llu\n"); ++ ++static int msm_bus_dbg_en_get(void *data, u64 *val) ++{ ++ *val = clstate.enable; ++ MSM_BUS_DBG("Get enable: %llu\n", *val); ++ return 0; ++} ++ ++static int msm_bus_dbg_en_set(void *data, u64 val) ++{ ++ int ret = 0; ++ ++ clstate.enable = val; ++ if (clstate.enable) { ++ if (!clstate.cl) { ++ MSM_BUS_DBG("client: %u\n", clstate.cl); ++ clstate.cl = msm_bus_dbg_register_client(); ++ if (clstate.cl) ++ ret = msm_bus_dbg_update_cl_request(clstate.cl); ++ } else { ++ MSM_BUS_DBG("update request for cl: %u\n", clstate.cl); ++ ret = msm_bus_dbg_update_cl_request(clstate.cl); ++ } ++ } ++ ++ MSM_BUS_DBG("Set enable: %llu\n", val); ++ return ret; ++} ++DEFINE_SIMPLE_ATTRIBUTE(shell_client_en_fops, msm_bus_dbg_en_get, ++ msm_bus_dbg_en_set, "%llu\n"); ++ ++/** ++ * The following funtions are used for viewing the client data ++ * and changing the client request at run-time ++ */ ++ ++static ssize_t client_data_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ int bsize = 0; ++ uint32_t cl = (uint32_t)(uintptr_t)file->private_data; ++ struct msm_bus_cldata *cldata = NULL; ++ int found = 0; ++ ++ list_for_each_entry(cldata, &cl_list, list) { ++ if (cldata->clid == cl) { ++ found = 1; ++ break; ++ } ++ } ++ if (!found) ++ return 0; ++ ++ bsize = cldata->size; ++ return simple_read_from_buffer(buf, count, ppos, ++ cldata->buffer, bsize); ++} ++ ++static int client_data_open(struct inode *inode, struct file *file) ++{ ++ file->private_data = inode->i_private; ++ return 0; ++} ++ ++static const struct file_operations client_data_fops = { ++ .open = client_data_open, ++ .read = client_data_read, ++}; ++ ++struct dentry *msm_bus_dbg_create(const char *name, mode_t mode, ++ struct dentry *dent, uint32_t clid) ++{ ++ if (dent == NULL) { ++ MSM_BUS_DBG("debugfs not ready yet\n"); ++ return NULL; ++ } ++ return debugfs_create_file(name, mode, dent, (void *)(uintptr_t)clid, ++ &client_data_fops); ++} ++ ++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) ++static int msm_bus_dbg_record_client(const struct msm_bus_scale_pdata *pdata, ++ int index, uint32_t clid, struct dentry *file) ++{ ++ struct msm_bus_cldata *cldata; ++ ++ cldata = kmalloc(sizeof(struct msm_bus_cldata), GFP_KERNEL); ++ if (!cldata) { ++ MSM_BUS_DBG("Failed to allocate memory for client data\n"); ++ return -ENOMEM; ++ } ++ cldata->pdata = pdata; ++ cldata->index = index; ++ cldata->clid = clid; ++ cldata->file = file; ++ cldata->size = 0; ++ list_add_tail(&cldata->list, &cl_list); ++ return 0; ++} ++ ++static void msm_bus_dbg_free_client(uint32_t clid) ++{ ++ struct msm_bus_cldata *cldata = NULL; ++ ++ list_for_each_entry(cldata, &cl_list, list) { ++ if (cldata->clid == clid) { ++ debugfs_remove(cldata->file); ++ list_del(&cldata->list); ++ kfree(cldata); ++ break; ++ } ++ } ++} ++ ++static int msm_bus_dbg_fill_cl_buffer(const struct msm_bus_scale_pdata *pdata, ++ int index, uint32_t clid) ++{ ++ int i = 0, j; ++ char *buf = NULL; ++ struct msm_bus_cldata *cldata = NULL; ++ struct timespec ts; ++ int found = 0; ++ ++ list_for_each_entry(cldata, &cl_list, list) { ++ if (cldata->clid == clid) { ++ found = 1; ++ break; ++ } ++ } ++ ++ if (!found) ++ return -ENOENT; ++ ++ if (cldata->file == NULL) { ++ if (pdata->name == NULL) { ++ MSM_BUS_DBG("Client doesn't have a name\n"); ++ return -EINVAL; ++ } ++ cldata->file = msm_bus_dbg_create(pdata->name, S_IRUGO, ++ clients, clid); ++ } ++ ++ if (cldata->size < (MAX_BUFF_SIZE - FILL_LIMIT)) ++ i = cldata->size; ++ else { ++ i = 0; ++ cldata->size = 0; ++ } ++ buf = cldata->buffer; ++ ts = ktime_to_timespec(ktime_get()); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n", ++ (int)ts.tv_sec, (int)ts.tv_nsec); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "curr : %d\n", index); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "masters: "); ++ ++ for (j = 0; j < pdata->usecase->num_paths; j++) ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%d ", ++ pdata->usecase[index].vectors[j].src); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\nslaves : "); ++ for (j = 0; j < pdata->usecase->num_paths; j++) ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%d ", ++ pdata->usecase[index].vectors[j].dst); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\nab : "); ++ for (j = 0; j < pdata->usecase->num_paths; j++) ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%llu ", ++ pdata->usecase[index].vectors[j].ab); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\nib : "); ++ for (j = 0; j < pdata->usecase->num_paths; j++) ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%llu ", ++ pdata->usecase[index].vectors[j].ib); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n"); ++ ++ for (j = 0; j < pdata->usecase->num_paths; j++) ++ trace_bus_update_request((int)ts.tv_sec, (int)ts.tv_nsec, ++ pdata->name, index, ++ pdata->usecase[index].vectors[j].src, ++ pdata->usecase[index].vectors[j].dst, ++ pdata->usecase[index].vectors[j].ab, ++ pdata->usecase[index].vectors[j].ib); ++ ++ cldata->size = i; ++ return i; ++} ++#endif ++ ++static int msm_bus_dbg_update_request(struct msm_bus_cldata *cldata, int index) ++{ ++ int ret = 0; ++ ++ if ((index < 0) || (index > cldata->pdata->num_usecases)) { ++ MSM_BUS_DBG("Invalid index!\n"); ++ return -EINVAL; ++ } ++ ret = msm_bus_scale_client_update_request(cldata->clid, index); ++ return ret; ++} ++ ++static ssize_t msm_bus_dbg_update_request_write(struct file *file, ++ const char __user *ubuf, size_t cnt, loff_t *ppos) ++{ ++ struct msm_bus_cldata *cldata; ++ unsigned long index = 0; ++ int ret = 0; ++ char *chid; ++ char *buf = kmalloc((sizeof(char) * (cnt + 1)), GFP_KERNEL); ++ int found = 0; ++ ++ if (!buf || IS_ERR(buf)) { ++ MSM_BUS_ERR("Memory allocation for buffer failed\n"); ++ return -ENOMEM; ++ } ++ if (cnt == 0) { ++ kfree(buf); ++ return 0; ++ } ++ if (copy_from_user(buf, ubuf, cnt)) { ++ kfree(buf); ++ return -EFAULT; ++ } ++ buf[cnt] = '\0'; ++ chid = buf; ++ MSM_BUS_DBG("buffer: %s\n size: %zu\n", buf, sizeof(ubuf)); ++ ++ list_for_each_entry(cldata, &cl_list, list) { ++ if (strnstr(chid, cldata->pdata->name, cnt)) { ++ found = 1; ++ cldata = cldata; ++ strsep(&chid, " "); ++ if (chid) { ++ ret = kstrtoul(chid, 10, &index); ++ if (ret) { ++ MSM_BUS_DBG("Index conversion" ++ " failed\n"); ++ return -EFAULT; ++ } ++ } else { ++ MSM_BUS_DBG("Error parsing input. Index not" ++ " found\n"); ++ found = 0; ++ } ++ break; ++ } ++ } ++ ++ if (found) ++ msm_bus_dbg_update_request(cldata, index); ++ kfree(buf); ++ return cnt; ++} ++ ++/** ++ * The following funtions are used for viewing the commit data ++ * for each fabric ++ */ ++static ssize_t fabric_data_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct msm_bus_fab_list *fablist = NULL; ++ int bsize = 0; ++ ssize_t ret; ++ const char *name = file->private_data; ++ int found = 0; ++ ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ list_for_each_entry(fablist, &fabdata_list, list) { ++ if (strcmp(fablist->name, name) == 0) { ++ found = 1; ++ break; ++ } ++ } ++ if (!found) ++ return -ENOENT; ++ bsize = fablist->size; ++ ret = simple_read_from_buffer(buf, count, ppos, ++ fablist->buffer, bsize); ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++ return ret; ++} ++ ++static const struct file_operations fabric_data_fops = { ++ .open = client_data_open, ++ .read = fabric_data_read, ++}; ++ ++static ssize_t rules_dbg_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ ssize_t ret; ++ memset(rules_buf, 0, MAX_BUFF_SIZE); ++ print_rules_buf(rules_buf, MAX_BUFF_SIZE); ++ ret = simple_read_from_buffer(buf, count, ppos, ++ rules_buf, MAX_BUFF_SIZE); ++ return ret; ++} ++ ++static int rules_dbg_open(struct inode *inode, struct file *file) ++{ ++ file->private_data = inode->i_private; ++ return 0; ++} ++ ++static const struct file_operations rules_dbg_fops = { ++ .open = rules_dbg_open, ++ .read = rules_dbg_read, ++}; ++ ++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) ++static int msm_bus_dbg_record_fabric(const char *fabname, struct dentry *file) ++{ ++ struct msm_bus_fab_list *fablist; ++ int ret = 0; ++ ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ fablist = kmalloc(sizeof(struct msm_bus_fab_list), GFP_KERNEL); ++ if (!fablist) { ++ MSM_BUS_DBG("Failed to allocate memory for commit data\n"); ++ ret = -ENOMEM; ++ goto err; ++ } ++ ++ fablist->name = fabname; ++ fablist->size = 0; ++ list_add_tail(&fablist->list, &fabdata_list); ++err: ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++ return ret; ++} ++ ++static void msm_bus_dbg_free_fabric(const char *fabname) ++{ ++ struct msm_bus_fab_list *fablist = NULL; ++ ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ list_for_each_entry(fablist, &fabdata_list, list) { ++ if (strcmp(fablist->name, fabname) == 0) { ++ debugfs_remove(fablist->file); ++ list_del(&fablist->list); ++ kfree(fablist); ++ break; ++ } ++ } ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++} ++ ++static int msm_bus_dbg_fill_fab_buffer(const char *fabname, ++ void *cdata, int nmasters, int nslaves, ++ int ntslaves) ++{ ++ int i; ++ char *buf = NULL; ++ struct msm_bus_fab_list *fablist = NULL; ++ struct timespec ts; ++ int found = 0; ++ ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ list_for_each_entry(fablist, &fabdata_list, list) { ++ if (strcmp(fablist->name, fabname) == 0) { ++ found = 1; ++ break; ++ } ++ } ++ if (!found) ++ return -ENOENT; ++ ++ if (fablist->file == NULL) { ++ MSM_BUS_DBG("Fabric dbg entry does not exist\n"); ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++ return -EFAULT; ++ } ++ ++ if (fablist->size < MAX_BUFF_SIZE - 256) ++ i = fablist->size; ++ else { ++ i = 0; ++ fablist->size = 0; ++ } ++ buf = fablist->buffer; ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++ ts = ktime_to_timespec(ktime_get()); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n", ++ (int)ts.tv_sec, (int)ts.tv_nsec); ++ ++ msm_bus_rpm_fill_cdata_buffer(&i, buf, MAX_BUFF_SIZE, cdata, ++ nmasters, nslaves, ntslaves); ++ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n"); ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ fablist->size = i; ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++ return 0; ++} ++#endif ++ ++static const struct file_operations msm_bus_dbg_update_request_fops = { ++ .open = client_data_open, ++ .write = msm_bus_dbg_update_request_write, ++}; ++ ++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) ++/** ++ * msm_bus_dbg_client_data() - Add debug data for clients ++ * @pdata: Platform data of the client ++ * @index: The current index or operation to be performed ++ * @clid: Client handle obtained during registration ++ */ ++void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata, int index, ++ uint32_t clid) ++{ ++ struct dentry *file = NULL; ++ ++ if (index == MSM_BUS_DBG_REGISTER) { ++ msm_bus_dbg_record_client(pdata, index, clid, file); ++ if (!pdata->name) { ++ MSM_BUS_DBG("Cannot create debugfs entry. Null name\n"); ++ return; ++ } ++ } else if (index == MSM_BUS_DBG_UNREGISTER) { ++ msm_bus_dbg_free_client(clid); ++ MSM_BUS_DBG("Client %d unregistered\n", clid); ++ } else ++ msm_bus_dbg_fill_cl_buffer(pdata, index, clid); ++} ++EXPORT_SYMBOL(msm_bus_dbg_client_data); ++ ++/** ++ * msm_bus_dbg_commit_data() - Add commit data from fabrics ++ * @fabname: Fabric name specified in platform data ++ * @cdata: Commit Data ++ * @nmasters: Number of masters attached to fabric ++ * @nslaves: Number of slaves attached to fabric ++ * @ntslaves: Number of tiered slaves attached to fabric ++ * @op: Operation to be performed ++ */ ++void msm_bus_dbg_commit_data(const char *fabname, void *cdata, ++ int nmasters, int nslaves, int ntslaves, int op) ++{ ++ struct dentry *file = NULL; ++ ++ if (op == MSM_BUS_DBG_REGISTER) ++ msm_bus_dbg_record_fabric(fabname, file); ++ else if (op == MSM_BUS_DBG_UNREGISTER) ++ msm_bus_dbg_free_fabric(fabname); ++ else ++ msm_bus_dbg_fill_fab_buffer(fabname, cdata, nmasters, ++ nslaves, ntslaves); ++} ++EXPORT_SYMBOL(msm_bus_dbg_commit_data); ++#endif ++ ++static int __init msm_bus_debugfs_init(void) ++{ ++ struct dentry *commit, *shell_client, *rules_dbg; ++ struct msm_bus_fab_list *fablist; ++ struct msm_bus_cldata *cldata = NULL; ++ uint64_t val = 0; ++ ++ dir = debugfs_create_dir("msm-bus-dbg", NULL); ++ if ((!dir) || IS_ERR(dir)) { ++ MSM_BUS_ERR("Couldn't create msm-bus-dbg\n"); ++ goto err; ++ } ++ ++ clients = debugfs_create_dir("client-data", dir); ++ if ((!dir) || IS_ERR(dir)) { ++ MSM_BUS_ERR("Couldn't create clients\n"); ++ goto err; ++ } ++ ++ shell_client = debugfs_create_dir("shell-client", dir); ++ if ((!dir) || IS_ERR(dir)) { ++ MSM_BUS_ERR("Couldn't create clients\n"); ++ goto err; ++ } ++ ++ commit = debugfs_create_dir("commit-data", dir); ++ if ((!dir) || IS_ERR(dir)) { ++ MSM_BUS_ERR("Couldn't create commit\n"); ++ goto err; ++ } ++ ++ rules_dbg = debugfs_create_dir("rules-dbg", dir); ++ if ((!rules_dbg) || IS_ERR(rules_dbg)) { ++ MSM_BUS_ERR("Couldn't create rules-dbg\n"); ++ goto err; ++ } ++ ++ if (debugfs_create_file("print_rules", S_IRUGO | S_IWUSR, ++ rules_dbg, &val, &rules_dbg_fops) == NULL) ++ goto err; ++ ++ if (debugfs_create_file("update_request", S_IRUGO | S_IWUSR, ++ shell_client, &val, &shell_client_en_fops) == NULL) ++ goto err; ++ if (debugfs_create_file("ib", S_IRUGO | S_IWUSR, shell_client, &val, ++ &shell_client_ib_fops) == NULL) ++ goto err; ++ if (debugfs_create_file("ab", S_IRUGO | S_IWUSR, shell_client, &val, ++ &shell_client_ab_fops) == NULL) ++ goto err; ++ if (debugfs_create_file("slv", S_IRUGO | S_IWUSR, shell_client, ++ &val, &shell_client_slv_fops) == NULL) ++ goto err; ++ if (debugfs_create_file("mas", S_IRUGO | S_IWUSR, shell_client, ++ &val, &shell_client_mas_fops) == NULL) ++ goto err; ++ if (debugfs_create_file("update-request", S_IRUGO | S_IWUSR, ++ clients, NULL, &msm_bus_dbg_update_request_fops) == NULL) ++ goto err; ++ ++ rules_buf = kzalloc(MAX_BUFF_SIZE, GFP_KERNEL); ++ if (!rules_buf) { ++ MSM_BUS_ERR("Failed to alloc rules_buf"); ++ goto err; ++ } ++ ++ list_for_each_entry(cldata, &cl_list, list) { ++ if (cldata->pdata->name == NULL) { ++ MSM_BUS_DBG("Client name not found\n"); ++ continue; ++ } ++ cldata->file = msm_bus_dbg_create(cldata-> ++ pdata->name, S_IRUGO, clients, cldata->clid); ++ } ++ ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ list_for_each_entry(fablist, &fabdata_list, list) { ++ fablist->file = debugfs_create_file(fablist->name, S_IRUGO, ++ commit, (void *)fablist->name, &fabric_data_fops); ++ if (fablist->file == NULL) { ++ MSM_BUS_DBG("Cannot create files for commit data\n"); ++ kfree(rules_buf); ++ goto err; ++ } ++ } ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++ ++ msm_bus_dbg_init_vectors(); ++ return 0; ++err: ++ debugfs_remove_recursive(dir); ++ return -ENODEV; ++} ++late_initcall(msm_bus_debugfs_init); ++ ++static void __exit msm_bus_dbg_teardown(void) ++{ ++ struct msm_bus_fab_list *fablist = NULL, *fablist_temp; ++ struct msm_bus_cldata *cldata = NULL, *cldata_temp; ++ ++ debugfs_remove_recursive(dir); ++ list_for_each_entry_safe(cldata, cldata_temp, &cl_list, list) { ++ list_del(&cldata->list); ++ kfree(cldata); ++ } ++ mutex_lock(&msm_bus_dbg_fablist_lock); ++ list_for_each_entry_safe(fablist, fablist_temp, &fabdata_list, list) { ++ list_del(&fablist->list); ++ kfree(fablist); ++ } ++ kfree(rules_buf); ++ mutex_unlock(&msm_bus_dbg_fablist_lock); ++} ++module_exit(msm_bus_dbg_teardown); ++MODULE_DESCRIPTION("Debugfs for msm bus scaling client"); ++MODULE_LICENSE("GPL v2"); ++MODULE_AUTHOR("Gagan Mac "); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_fabric_adhoc.c +@@ -0,0 +1,1281 @@ ++/* Copyright (c) 2014, Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "rpm-smd.h" ++#include "msm_bus_core.h" ++#include "msm_bus_adhoc.h" ++#include "msm_bus_noc.h" ++#include "msm_bus_bimc.h" ++ ++ssize_t vrail_show(struct device *dev, struct device_attribute *attr, ++ char *buf) ++{ ++ struct msm_bus_node_info_type *node_info = NULL; ++ struct msm_bus_node_device_type *bus_node = NULL; ++ ++ bus_node = dev->platform_data; ++ if (!bus_node) ++ return -EINVAL; ++ node_info = bus_node->node_info; ++ ++ return snprintf(buf, PAGE_SIZE, "%u", node_info->vrail_comp); ++} ++ ++ssize_t vrail_store(struct device *dev, struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct msm_bus_node_info_type *node_info = NULL; ++ struct msm_bus_node_device_type *bus_node = NULL; ++ int ret = 0; ++ ++ bus_node = dev->platform_data; ++ if (!bus_node) ++ return -EINVAL; ++ node_info = bus_node->node_info; ++ ++ ret = sscanf(buf, "%u", &node_info->vrail_comp); ++ if (ret != 1) ++ return -EINVAL; ++ return count; ++} ++ ++DEVICE_ATTR(vrail, 0600, vrail_show, vrail_store); ++ ++struct static_rules_type { ++ int num_rules; ++ struct bus_rule_type *rules; ++}; ++ ++static struct static_rules_type static_rules; ++ ++static int enable_nodeclk(struct nodeclk *nclk) ++{ ++ int ret = 0; ++ ++ if (!nclk->enable) { ++ ret = clk_prepare_enable(nclk->clk); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: failed to enable clk ", __func__); ++ nclk->enable = false; ++ } else ++ nclk->enable = true; ++ } ++ return ret; ++} ++ ++static int disable_nodeclk(struct nodeclk *nclk) ++{ ++ int ret = 0; ++ ++ if (nclk->enable) { ++ clk_disable_unprepare(nclk->clk); ++ nclk->enable = false; ++ } ++ return ret; ++} ++ ++static int setrate_nodeclk(struct nodeclk *nclk, long rate) ++{ ++ int ret = 0; ++ ++ ret = clk_set_rate(nclk->clk, rate); ++ ++ if (ret) ++ MSM_BUS_ERR("%s: failed to setrate clk", __func__); ++ return ret; ++} ++ ++static int msm_bus_agg_fab_clks(struct device *bus_dev, void *data) ++{ ++ struct msm_bus_node_device_type *node = NULL; ++ int ret = 0; ++ int ctx = *(int *)data; ++ ++ if (ctx >= NUM_CTX) { ++ MSM_BUS_ERR("%s: Invalid Context %d", __func__, ctx); ++ goto exit_agg_fab_clks; ++ } ++ ++ node = bus_dev->platform_data; ++ if (!node) { ++ MSM_BUS_ERR("%s: Can't get device info", __func__); ++ goto exit_agg_fab_clks; ++ } ++ ++ if (!node->node_info->is_fab_dev) { ++ struct msm_bus_node_device_type *bus_dev = NULL; ++ ++ bus_dev = node->node_info->bus_device->platform_data; ++ ++ if (node->cur_clk_hz[ctx] >= bus_dev->cur_clk_hz[ctx]) ++ bus_dev->cur_clk_hz[ctx] = node->cur_clk_hz[ctx]; ++ } ++ ++exit_agg_fab_clks: ++ return ret; ++} ++ ++static int msm_bus_reset_fab_clks(struct device *bus_dev, void *data) ++{ ++ struct msm_bus_node_device_type *node = NULL; ++ int ret = 0; ++ int ctx = *(int *)data; ++ ++ if (ctx >= NUM_CTX) { ++ MSM_BUS_ERR("%s: Invalid Context %d", __func__, ctx); ++ goto exit_reset_fab_clks; ++ } ++ ++ node = bus_dev->platform_data; ++ if (!node) { ++ MSM_BUS_ERR("%s: Can't get device info", __func__); ++ goto exit_reset_fab_clks; ++ } ++ ++ if (node->node_info->is_fab_dev) { ++ node->cur_clk_hz[ctx] = 0; ++ MSM_BUS_DBG("Resetting for node %d", node->node_info->id); ++ } ++exit_reset_fab_clks: ++ return ret; ++} ++ ++ ++static int send_rpm_msg(struct device *device) ++{ ++ int ret = 0; ++ int ctx; ++ int rsc_type; ++ struct msm_bus_node_device_type *ndev = ++ device->platform_data; ++ struct msm_rpm_kvp rpm_kvp; ++ ++ if (!ndev) { ++ MSM_BUS_ERR("%s: Error getting node info.", __func__); ++ ret = -ENODEV; ++ goto exit_send_rpm_msg; ++ } ++ ++ rpm_kvp.length = sizeof(uint64_t); ++ rpm_kvp.key = RPM_MASTER_FIELD_BW; ++ ++ for (ctx = MSM_RPM_CTX_ACTIVE_SET; ctx <= MSM_RPM_CTX_SLEEP_SET; ++ ctx++) { ++ if (ctx == MSM_RPM_CTX_ACTIVE_SET) ++ rpm_kvp.data = ++ (uint8_t *)&ndev->node_ab.ab[MSM_RPM_CTX_ACTIVE_SET]; ++ else { ++ rpm_kvp.data = ++ (uint8_t *) &ndev->node_ab.ab[MSM_RPM_CTX_SLEEP_SET]; ++ } ++ ++ if (ndev->node_info->mas_rpm_id != -1) { ++ rsc_type = RPM_BUS_MASTER_REQ; ++ ret = msm_rpm_send_message(ctx, rsc_type, ++ ndev->node_info->mas_rpm_id, &rpm_kvp, 1); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to send RPM message:", ++ __func__); ++ MSM_BUS_ERR("%s:Node Id %d RPM id %d", ++ __func__, ndev->node_info->id, ++ ndev->node_info->mas_rpm_id); ++ goto exit_send_rpm_msg; ++ } ++ } ++ ++ if (ndev->node_info->slv_rpm_id != -1) { ++ rsc_type = RPM_BUS_SLAVE_REQ; ++ ret = msm_rpm_send_message(ctx, rsc_type, ++ ndev->node_info->slv_rpm_id, &rpm_kvp, 1); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to send RPM message:", ++ __func__); ++ MSM_BUS_ERR("%s: Node Id %d RPM id %d", ++ __func__, ndev->node_info->id, ++ ndev->node_info->slv_rpm_id); ++ goto exit_send_rpm_msg; ++ } ++ } ++ } ++exit_send_rpm_msg: ++ return ret; ++} ++ ++static int flush_bw_data(struct device *node_device, int ctx) ++{ ++ struct msm_bus_node_device_type *node_info; ++ int ret = 0; ++ ++ node_info = node_device->platform_data; ++ if (!node_info) { ++ MSM_BUS_ERR("%s: Unable to find bus device for device", ++ __func__); ++ ret = -ENODEV; ++ goto exit_flush_bw_data; ++ } ++ ++ if (node_info->node_ab.dirty) { ++ if (node_info->ap_owned) { ++ struct msm_bus_node_device_type *bus_device = ++ node_info->node_info->bus_device->platform_data; ++ struct msm_bus_fab_device_type *fabdev = ++ bus_device->fabdev; ++ ++ if (fabdev && fabdev->noc_ops.update_bw_reg && ++ fabdev->noc_ops.update_bw_reg ++ (node_info->node_info->qos_params.mode)) ++ ret = fabdev->noc_ops.set_bw(node_info, ++ fabdev->qos_base, ++ fabdev->base_offset, ++ fabdev->qos_off, ++ fabdev->qos_freq); ++ } else { ++ ret = send_rpm_msg(node_device); ++ ++ if (ret) ++ MSM_BUS_ERR("%s: Failed to send RPM msg for%d", ++ __func__, node_info->node_info->id); ++ } ++ node_info->node_ab.dirty = false; ++ } ++ ++exit_flush_bw_data: ++ return ret; ++ ++} ++ ++static int flush_clk_data(struct device *node_device, int ctx) ++{ ++ struct msm_bus_node_device_type *node; ++ struct nodeclk *nodeclk = NULL; ++ int ret = 0; ++ ++ node = node_device->platform_data; ++ if (!node) { ++ MSM_BUS_ERR("Unable to find bus device"); ++ ret = -ENODEV; ++ goto exit_flush_clk_data; ++ } ++ ++ nodeclk = &node->clk[ctx]; ++ if (node->node_info->is_fab_dev) { ++ if (nodeclk->rate != node->cur_clk_hz[ctx]) { ++ nodeclk->rate = node->cur_clk_hz[ctx]; ++ nodeclk->dirty = true; ++ } ++ } ++ ++ if (nodeclk && nodeclk->clk && nodeclk->dirty) { ++ long rounded_rate; ++ ++ if (nodeclk->rate) { ++ rounded_rate = clk_round_rate(nodeclk->clk, ++ nodeclk->rate); ++ ret = setrate_nodeclk(nodeclk, rounded_rate); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to set_rate %lu for %d", ++ __func__, rounded_rate, ++ node->node_info->id); ++ ret = -ENODEV; ++ goto exit_flush_clk_data; ++ } ++ ++ ret = enable_nodeclk(nodeclk); ++ } else ++ ret = disable_nodeclk(nodeclk); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to enable for %d", __func__, ++ node->node_info->id); ++ ret = -ENODEV; ++ goto exit_flush_clk_data; ++ } ++ MSM_BUS_DBG("%s: Updated %d clk to %llu", __func__, ++ node->node_info->id, nodeclk->rate); ++ ++ } ++exit_flush_clk_data: ++ /* Reset the aggregated clock rate for fab devices*/ ++ if (node && node->node_info->is_fab_dev) ++ node->cur_clk_hz[ctx] = 0; ++ ++ if (nodeclk) ++ nodeclk->dirty = 0; ++ return ret; ++} ++ ++int msm_bus_commit_data(int *dirty_nodes, int ctx, int num_dirty) ++{ ++ int ret = 0; ++ int i = 0; ++ ++ /* Aggregate the bus clocks */ ++ bus_for_each_dev(&msm_bus_type, NULL, (void *)&ctx, ++ msm_bus_agg_fab_clks); ++ ++ for (i = 0; i < num_dirty; i++) { ++ struct device *node_device = ++ bus_find_device(&msm_bus_type, NULL, ++ (void *)&dirty_nodes[i], ++ msm_bus_device_match_adhoc); ++ ++ if (!node_device) { ++ MSM_BUS_ERR("Can't find device for %d", dirty_nodes[i]); ++ continue; ++ } ++ ++ ret = flush_bw_data(node_device, ctx); ++ if (ret) ++ MSM_BUS_ERR("%s: Error flushing bw data for node %d", ++ __func__, dirty_nodes[i]); ++ ++ ret = flush_clk_data(node_device, ctx); ++ if (ret) ++ MSM_BUS_ERR("%s: Error flushing clk data for node %d", ++ __func__, dirty_nodes[i]); ++ } ++ kfree(dirty_nodes); ++ /* Aggregate the bus clocks */ ++ bus_for_each_dev(&msm_bus_type, NULL, (void *)&ctx, ++ msm_bus_reset_fab_clks); ++ return ret; ++} ++ ++void *msm_bus_realloc_devmem(struct device *dev, void *p, size_t old_size, ++ size_t new_size, gfp_t flags) ++{ ++ void *ret; ++ size_t copy_size = old_size; ++ ++ if (!new_size) { ++ devm_kfree(dev, p); ++ return ZERO_SIZE_PTR; ++ } ++ ++ if (new_size < old_size) ++ copy_size = new_size; ++ ++ ret = devm_kzalloc(dev, new_size, flags); ++ if (!ret) { ++ MSM_BUS_ERR("%s: Error Reallocating memory", __func__); ++ goto exit_realloc_devmem; ++ } ++ ++ memcpy(ret, p, copy_size); ++ devm_kfree(dev, p); ++exit_realloc_devmem: ++ return ret; ++} ++ ++ ++static int add_dirty_node(int **dirty_nodes, int id, int *num_dirty) ++{ ++ int i; ++ int found = 0; ++ int ret = 0; ++ int *dnode = NULL; ++ ++ for (i = 0; i < *num_dirty; i++) { ++ if ((*dirty_nodes)[i] == id) { ++ found = 1; ++ break; ++ } ++ } ++ ++ if (!found) { ++ (*num_dirty)++; ++ dnode = ++ krealloc(*dirty_nodes, sizeof(int) * (*num_dirty), ++ GFP_KERNEL); ++ ++ if (ZERO_OR_NULL_PTR(dnode)) { ++ MSM_BUS_ERR("%s: Failure allocating dirty nodes array", ++ __func__); ++ ret = -ENOMEM; ++ } else { ++ *dirty_nodes = dnode; ++ (*dirty_nodes)[(*num_dirty) - 1] = id; ++ } ++ } ++ ++ return ret; ++} ++ ++int msm_bus_update_bw(struct msm_bus_node_device_type *nodedev, int ctx, ++ int64_t add_bw, int **dirty_nodes, int *num_dirty) ++{ ++ int ret = 0; ++ int i, j; ++ uint64_t cur_ab_slp = 0; ++ uint64_t cur_ab_act = 0; ++ ++ if (nodedev->node_info->virt_dev) ++ goto exit_update_bw; ++ ++ for (i = 0; i < NUM_CTX; i++) { ++ for (j = 0; j < nodedev->num_lnodes; j++) { ++ if (i == DUAL_CTX) { ++ cur_ab_act += ++ nodedev->lnode_list[j].lnode_ab[i]; ++ cur_ab_slp += ++ nodedev->lnode_list[j].lnode_ab[i]; ++ } else ++ cur_ab_act += ++ nodedev->lnode_list[j].lnode_ab[i]; ++ } ++ } ++ ++ if (nodedev->node_ab.ab[MSM_RPM_CTX_ACTIVE_SET] != cur_ab_act) { ++ nodedev->node_ab.ab[MSM_RPM_CTX_ACTIVE_SET] = cur_ab_act; ++ nodedev->node_ab.ab[MSM_RPM_CTX_SLEEP_SET] = cur_ab_slp; ++ nodedev->node_ab.dirty = true; ++ ret = add_dirty_node(dirty_nodes, nodedev->node_info->id, ++ num_dirty); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to add dirty node %d", __func__, ++ nodedev->node_info->id); ++ goto exit_update_bw; ++ } ++ } ++ ++exit_update_bw: ++ return ret; ++} ++ ++int msm_bus_update_clks(struct msm_bus_node_device_type *nodedev, ++ int ctx, int **dirty_nodes, int *num_dirty) ++{ ++ int status = 0; ++ struct nodeclk *nodeclk; ++ struct nodeclk *busclk; ++ struct msm_bus_node_device_type *bus_info = NULL; ++ uint64_t req_clk; ++ ++ bus_info = nodedev->node_info->bus_device->platform_data; ++ ++ if (!bus_info) { ++ MSM_BUS_ERR("%s: Unable to find bus device for device %d", ++ __func__, nodedev->node_info->id); ++ status = -ENODEV; ++ goto exit_set_clks; ++ } ++ ++ req_clk = nodedev->cur_clk_hz[ctx]; ++ busclk = &bus_info->clk[ctx]; ++ ++ if (busclk->rate != req_clk) { ++ busclk->rate = req_clk; ++ busclk->dirty = 1; ++ MSM_BUS_DBG("%s: Modifying bus clk %d Rate %llu", __func__, ++ bus_info->node_info->id, req_clk); ++ status = add_dirty_node(dirty_nodes, bus_info->node_info->id, ++ num_dirty); ++ ++ if (status) { ++ MSM_BUS_ERR("%s: Failed to add dirty node %d", __func__, ++ bus_info->node_info->id); ++ goto exit_set_clks; ++ } ++ } ++ ++ req_clk = nodedev->cur_clk_hz[ctx]; ++ nodeclk = &nodedev->clk[ctx]; ++ ++ if (IS_ERR_OR_NULL(nodeclk)) ++ goto exit_set_clks; ++ ++ if (!nodeclk->dirty || (nodeclk->dirty && (nodeclk->rate < req_clk))) { ++ nodeclk->rate = req_clk; ++ nodeclk->dirty = 1; ++ MSM_BUS_DBG("%s: Modifying node clk %d Rate %llu", __func__, ++ nodedev->node_info->id, req_clk); ++ status = add_dirty_node(dirty_nodes, nodedev->node_info->id, ++ num_dirty); ++ if (status) { ++ MSM_BUS_ERR("%s: Failed to add dirty node %d", __func__, ++ nodedev->node_info->id); ++ goto exit_set_clks; ++ } ++ } ++ ++exit_set_clks: ++ return status; ++} ++ ++static void msm_bus_fab_init_noc_ops(struct msm_bus_node_device_type *bus_dev) ++{ ++ switch (bus_dev->fabdev->bus_type) { ++ case MSM_BUS_NOC: ++ msm_bus_noc_set_ops(bus_dev); ++ break; ++ case MSM_BUS_BIMC: ++ msm_bus_bimc_set_ops(bus_dev); ++ break; ++ default: ++ MSM_BUS_ERR("%s: Invalid Bus type", __func__); ++ } ++} ++ ++static int msm_bus_qos_disable_clk(struct msm_bus_node_device_type *node, ++ int disable_bus_qos_clk) ++{ ++ struct msm_bus_node_device_type *bus_node = NULL; ++ int ret = 0; ++ ++ if (!node) { ++ ret = -ENXIO; ++ goto exit_disable_qos_clk; ++ } ++ ++ bus_node = node->node_info->bus_device->platform_data; ++ ++ if (!bus_node) { ++ ret = -ENXIO; ++ goto exit_disable_qos_clk; ++ } ++ ++ if (disable_bus_qos_clk) ++ ret = disable_nodeclk(&bus_node->clk[DUAL_CTX]); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to disable bus clk, node %d", ++ __func__, node->node_info->id); ++ goto exit_disable_qos_clk; ++ } ++ ++ if (!IS_ERR_OR_NULL(node->qos_clk.clk)) { ++ ret = disable_nodeclk(&node->qos_clk); ++ ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to disable mas qos clk,node %d", ++ __func__, node->node_info->id); ++ goto exit_disable_qos_clk; ++ } ++ } ++ ++exit_disable_qos_clk: ++ return ret; ++} ++ ++static int msm_bus_qos_enable_clk(struct msm_bus_node_device_type *node) ++{ ++ struct msm_bus_node_device_type *bus_node = NULL; ++ long rounded_rate; ++ int ret = 0; ++ int bus_qos_enabled = 0; ++ ++ if (!node) { ++ ret = -ENXIO; ++ goto exit_enable_qos_clk; ++ } ++ ++ bus_node = node->node_info->bus_device->platform_data; ++ ++ if (!bus_node) { ++ ret = -ENXIO; ++ goto exit_enable_qos_clk; ++ } ++ ++ /* Check if the bus clk is already set before trying to set it ++ * Do this only during ++ * a. Bootup ++ * b. Only for bus clks ++ **/ ++ if (!clk_get_rate(bus_node->clk[DUAL_CTX].clk)) { ++ rounded_rate = clk_round_rate(bus_node->clk[DUAL_CTX].clk, 1); ++ ret = setrate_nodeclk(&bus_node->clk[DUAL_CTX], rounded_rate); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to set bus clk, node %d", ++ __func__, node->node_info->id); ++ goto exit_enable_qos_clk; ++ } ++ ++ ret = enable_nodeclk(&bus_node->clk[DUAL_CTX]); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to enable bus clk, node %d", ++ __func__, node->node_info->id); ++ goto exit_enable_qos_clk; ++ } ++ bus_qos_enabled = 1; ++ } ++ ++ if (!IS_ERR_OR_NULL(node->qos_clk.clk)) { ++ rounded_rate = clk_round_rate(node->qos_clk.clk, 1); ++ ret = setrate_nodeclk(&node->qos_clk, rounded_rate); ++ if (ret) { ++ MSM_BUS_ERR("%s: Failed to enable mas qos clk, node %d", ++ __func__, node->node_info->id); ++ goto exit_enable_qos_clk; ++ } ++ ++ ret = enable_nodeclk(&node->qos_clk); ++ if (ret) { ++ MSM_BUS_ERR("Err enable mas qos clk, node %d ret %d", ++ node->node_info->id, ret); ++ goto exit_enable_qos_clk; ++ } ++ } ++ ret = bus_qos_enabled; ++ ++exit_enable_qos_clk: ++ return ret; ++} ++ ++int msm_bus_enable_limiter(struct msm_bus_node_device_type *node_dev, ++ bool enable, uint64_t lim_bw) ++{ ++ int ret = 0; ++ struct msm_bus_node_device_type *bus_node_dev; ++ ++ if (!node_dev) { ++ MSM_BUS_ERR("No device specified"); ++ ret = -ENXIO; ++ goto exit_enable_limiter; ++ } ++ ++ if (!node_dev->ap_owned) { ++ MSM_BUS_ERR("Device is not AP owned %d.", ++ node_dev->node_info->id); ++ ret = -ENXIO; ++ goto exit_enable_limiter; ++ } ++ ++ bus_node_dev = node_dev->node_info->bus_device->platform_data; ++ if (!bus_node_dev) { ++ MSM_BUS_ERR("Unable to get bus device infofor %d", ++ node_dev->node_info->id); ++ ret = -ENXIO; ++ goto exit_enable_limiter; ++ } ++ if (bus_node_dev->fabdev && ++ bus_node_dev->fabdev->noc_ops.limit_mport) { ++ ret = msm_bus_qos_enable_clk(node_dev); ++ if (ret < 0) { ++ MSM_BUS_ERR("Can't Enable QoS clk %d", ++ node_dev->node_info->id); ++ goto exit_enable_limiter; ++ } ++ bus_node_dev->fabdev->noc_ops.limit_mport( ++ node_dev, ++ bus_node_dev->fabdev->qos_base, ++ bus_node_dev->fabdev->base_offset, ++ bus_node_dev->fabdev->qos_off, ++ bus_node_dev->fabdev->qos_freq, ++ enable, lim_bw); ++ msm_bus_qos_disable_clk(node_dev, ret); ++ } ++ ++exit_enable_limiter: ++ return ret; ++} ++ ++static int msm_bus_dev_init_qos(struct device *dev, void *data) ++{ ++ int ret = 0; ++ struct msm_bus_node_device_type *node_dev = NULL; ++ ++ node_dev = dev->platform_data; ++ ++ if (!node_dev) { ++ MSM_BUS_ERR("%s: Unable to get node device info" , __func__); ++ ret = -ENXIO; ++ goto exit_init_qos; ++ } ++ ++ MSM_BUS_DBG("Device = %d", node_dev->node_info->id); ++ ++ if (node_dev->ap_owned) { ++ struct msm_bus_node_device_type *bus_node_info; ++ ++ bus_node_info = node_dev->node_info->bus_device->platform_data; ++ ++ if (!bus_node_info) { ++ MSM_BUS_ERR("%s: Unable to get bus device infofor %d", ++ __func__, ++ node_dev->node_info->id); ++ ret = -ENXIO; ++ goto exit_init_qos; ++ } ++ ++ if (bus_node_info->fabdev && ++ bus_node_info->fabdev->noc_ops.qos_init) { ++ int ret = 0; ++ ++ if (node_dev->ap_owned && ++ (node_dev->node_info->qos_params.mode) != -1) { ++ ++ if (bus_node_info->fabdev->bypass_qos_prg) ++ goto exit_init_qos; ++ ++ ret = msm_bus_qos_enable_clk(node_dev); ++ if (ret < 0) { ++ MSM_BUS_ERR("Can't Enable QoS clk %d", ++ node_dev->node_info->id); ++ goto exit_init_qos; ++ } ++ ++ bus_node_info->fabdev->noc_ops.qos_init( ++ node_dev, ++ bus_node_info->fabdev->qos_base, ++ bus_node_info->fabdev->base_offset, ++ bus_node_info->fabdev->qos_off, ++ bus_node_info->fabdev->qos_freq); ++ msm_bus_qos_disable_clk(node_dev, ret); ++ } ++ } else ++ MSM_BUS_ERR("%s: Skipping QOS init for %d", ++ __func__, node_dev->node_info->id); ++ } ++exit_init_qos: ++ return ret; ++} ++ ++static int msm_bus_fabric_init(struct device *dev, ++ struct msm_bus_node_device_type *pdata) ++{ ++ struct msm_bus_fab_device_type *fabdev; ++ struct msm_bus_node_device_type *node_dev = NULL; ++ int ret = 0; ++ ++ node_dev = dev->platform_data; ++ if (!node_dev) { ++ MSM_BUS_ERR("%s: Unable to get bus device info" , __func__); ++ ret = -ENXIO; ++ goto exit_fabric_init; ++ } ++ ++ if (node_dev->node_info->virt_dev) { ++ MSM_BUS_ERR("%s: Skip Fab init for virtual device %d", __func__, ++ node_dev->node_info->id); ++ goto exit_fabric_init; ++ } ++ ++ fabdev = devm_kzalloc(dev, sizeof(struct msm_bus_fab_device_type), ++ GFP_KERNEL); ++ if (!fabdev) { ++ MSM_BUS_ERR("Fabric alloc failed\n"); ++ ret = -ENOMEM; ++ goto exit_fabric_init; ++ } ++ ++ node_dev->fabdev = fabdev; ++ fabdev->pqos_base = pdata->fabdev->pqos_base; ++ fabdev->qos_range = pdata->fabdev->qos_range; ++ fabdev->base_offset = pdata->fabdev->base_offset; ++ fabdev->qos_off = pdata->fabdev->qos_off; ++ fabdev->qos_freq = pdata->fabdev->qos_freq; ++ fabdev->bus_type = pdata->fabdev->bus_type; ++ fabdev->bypass_qos_prg = pdata->fabdev->bypass_qos_prg; ++ fabdev->util_fact = pdata->fabdev->util_fact; ++ fabdev->vrail_comp = pdata->fabdev->vrail_comp; ++ msm_bus_fab_init_noc_ops(node_dev); ++ ++ fabdev->qos_base = devm_ioremap(dev, ++ fabdev->pqos_base, fabdev->qos_range); ++ if (!fabdev->qos_base) { ++ MSM_BUS_ERR("%s: Error remapping address 0x%zx :bus device %d", ++ __func__, ++ (size_t)fabdev->pqos_base, node_dev->node_info->id); ++ ret = -ENOMEM; ++ goto exit_fabric_init; ++ } ++ ++ /*if (msmbus_coresight_init(pdev)) ++ pr_warn("Coresight support absent for bus: %d\n", pdata->id);*/ ++exit_fabric_init: ++ return ret; ++} ++ ++static int msm_bus_init_clk(struct device *bus_dev, ++ struct msm_bus_node_device_type *pdata) ++{ ++ unsigned int ctx; ++ int ret = 0; ++ struct msm_bus_node_device_type *node_dev = bus_dev->platform_data; ++ ++ for (ctx = 0; ctx < NUM_CTX; ctx++) { ++ if (!IS_ERR_OR_NULL(pdata->clk[ctx].clk)) { ++ node_dev->clk[ctx].clk = pdata->clk[ctx].clk; ++ node_dev->clk[ctx].enable = false; ++ node_dev->clk[ctx].dirty = false; ++ MSM_BUS_ERR("%s: Valid node clk node %d ctx %d", ++ __func__, node_dev->node_info->id, ctx); ++ } ++ } ++ ++ if (!IS_ERR_OR_NULL(pdata->qos_clk.clk)) { ++ node_dev->qos_clk.clk = pdata->qos_clk.clk; ++ node_dev->qos_clk.enable = false; ++ MSM_BUS_ERR("%s: Valid Iface clk node %d", __func__, ++ node_dev->node_info->id); ++ } ++ ++ return ret; ++} ++ ++static int msm_bus_copy_node_info(struct msm_bus_node_device_type *pdata, ++ struct device *bus_dev) ++{ ++ int ret = 0; ++ struct msm_bus_node_info_type *node_info = NULL; ++ struct msm_bus_node_info_type *pdata_node_info = NULL; ++ struct msm_bus_node_device_type *bus_node = NULL; ++ ++ bus_node = bus_dev->platform_data; ++ ++ if (!bus_node || !pdata) { ++ ret = -ENXIO; ++ MSM_BUS_ERR("%s: Invalid pointers pdata %p, bus_node %p", ++ __func__, pdata, bus_node); ++ goto exit_copy_node_info; ++ } ++ ++ node_info = bus_node->node_info; ++ pdata_node_info = pdata->node_info; ++ ++ node_info->name = pdata_node_info->name; ++ node_info->id = pdata_node_info->id; ++ node_info->bus_device_id = pdata_node_info->bus_device_id; ++ node_info->mas_rpm_id = pdata_node_info->mas_rpm_id; ++ node_info->slv_rpm_id = pdata_node_info->slv_rpm_id; ++ node_info->num_connections = pdata_node_info->num_connections; ++ node_info->num_blist = pdata_node_info->num_blist; ++ node_info->num_qports = pdata_node_info->num_qports; ++ node_info->buswidth = pdata_node_info->buswidth; ++ node_info->virt_dev = pdata_node_info->virt_dev; ++ node_info->is_fab_dev = pdata_node_info->is_fab_dev; ++ node_info->qos_params.mode = pdata_node_info->qos_params.mode; ++ node_info->qos_params.prio1 = pdata_node_info->qos_params.prio1; ++ node_info->qos_params.prio0 = pdata_node_info->qos_params.prio0; ++ node_info->qos_params.prio_lvl = pdata_node_info->qos_params.prio_lvl; ++ node_info->qos_params.prio_rd = pdata_node_info->qos_params.prio_rd; ++ node_info->qos_params.prio_wr = pdata_node_info->qos_params.prio_wr; ++ node_info->qos_params.gp = pdata_node_info->qos_params.gp; ++ node_info->qos_params.thmp = pdata_node_info->qos_params.thmp; ++ node_info->qos_params.ws = pdata_node_info->qos_params.ws; ++ node_info->qos_params.bw_buffer = pdata_node_info->qos_params.bw_buffer; ++ node_info->util_fact = pdata_node_info->util_fact; ++ node_info->vrail_comp = pdata_node_info->vrail_comp; ++ ++ node_info->dev_connections = devm_kzalloc(bus_dev, ++ sizeof(struct device *) * ++ pdata_node_info->num_connections, ++ GFP_KERNEL); ++ if (!node_info->dev_connections) { ++ MSM_BUS_ERR("%s:Bus dev connections alloc failed\n", __func__); ++ ret = -ENOMEM; ++ goto exit_copy_node_info; ++ } ++ ++ node_info->connections = devm_kzalloc(bus_dev, ++ sizeof(int) * pdata_node_info->num_connections, ++ GFP_KERNEL); ++ if (!node_info->connections) { ++ MSM_BUS_ERR("%s:Bus connections alloc failed\n", __func__); ++ devm_kfree(bus_dev, node_info->dev_connections); ++ ret = -ENOMEM; ++ goto exit_copy_node_info; ++ } ++ ++ memcpy(node_info->connections, ++ pdata_node_info->connections, ++ sizeof(int) * pdata_node_info->num_connections); ++ ++ node_info->black_connections = devm_kzalloc(bus_dev, ++ sizeof(struct device *) * ++ pdata_node_info->num_blist, ++ GFP_KERNEL); ++ if (!node_info->black_connections) { ++ MSM_BUS_ERR("%s: Bus black connections alloc failed\n", ++ __func__); ++ devm_kfree(bus_dev, node_info->dev_connections); ++ devm_kfree(bus_dev, node_info->connections); ++ ret = -ENOMEM; ++ goto exit_copy_node_info; ++ } ++ ++ node_info->black_listed_connections = devm_kzalloc(bus_dev, ++ pdata_node_info->num_blist * sizeof(int), ++ GFP_KERNEL); ++ if (!node_info->black_listed_connections) { ++ MSM_BUS_ERR("%s:Bus black list connections alloc failed\n", ++ __func__); ++ devm_kfree(bus_dev, node_info->black_connections); ++ devm_kfree(bus_dev, node_info->dev_connections); ++ devm_kfree(bus_dev, node_info->connections); ++ ret = -ENOMEM; ++ goto exit_copy_node_info; ++ } ++ ++ memcpy(node_info->black_listed_connections, ++ pdata_node_info->black_listed_connections, ++ sizeof(int) * pdata_node_info->num_blist); ++ ++ node_info->qport = devm_kzalloc(bus_dev, ++ sizeof(int) * pdata_node_info->num_qports, ++ GFP_KERNEL); ++ if (!node_info->qport) { ++ MSM_BUS_ERR("%s:Bus qport allocation failed\n", __func__); ++ devm_kfree(bus_dev, node_info->dev_connections); ++ devm_kfree(bus_dev, node_info->connections); ++ devm_kfree(bus_dev, node_info->black_listed_connections); ++ ret = -ENOMEM; ++ goto exit_copy_node_info; ++ } ++ ++ memcpy(node_info->qport, ++ pdata_node_info->qport, ++ sizeof(int) * pdata_node_info->num_qports); ++ ++exit_copy_node_info: ++ return ret; ++} ++ ++static struct device *msm_bus_device_init( ++ struct msm_bus_node_device_type *pdata) ++{ ++ struct device *bus_dev = NULL; ++ struct msm_bus_node_device_type *bus_node = NULL; ++ struct msm_bus_node_info_type *node_info = NULL; ++ int ret = 0; ++ ++ bus_dev = kzalloc(sizeof(struct device), GFP_KERNEL); ++ if (!bus_dev) { ++ MSM_BUS_ERR("%s:Device alloc failed\n", __func__); ++ bus_dev = NULL; ++ goto exit_device_init; ++ } ++ /** ++ * Init here so we can use devm calls ++ */ ++ device_initialize(bus_dev); ++ ++ bus_node = devm_kzalloc(bus_dev, ++ sizeof(struct msm_bus_node_device_type), GFP_KERNEL); ++ if (!bus_node) { ++ MSM_BUS_ERR("%s:Bus node alloc failed\n", __func__); ++ kfree(bus_dev); ++ bus_dev = NULL; ++ goto exit_device_init; ++ } ++ ++ node_info = devm_kzalloc(bus_dev, ++ sizeof(struct msm_bus_node_info_type), GFP_KERNEL); ++ if (!node_info) { ++ MSM_BUS_ERR("%s:Bus node info alloc failed\n", __func__); ++ devm_kfree(bus_dev, bus_node); ++ kfree(bus_dev); ++ bus_dev = NULL; ++ goto exit_device_init; ++ } ++ ++ bus_node->node_info = node_info; ++ bus_node->ap_owned = pdata->ap_owned; ++ bus_dev->platform_data = bus_node; ++ ++ if (msm_bus_copy_node_info(pdata, bus_dev) < 0) { ++ devm_kfree(bus_dev, bus_node); ++ devm_kfree(bus_dev, node_info); ++ kfree(bus_dev); ++ bus_dev = NULL; ++ goto exit_device_init; ++ } ++ ++ bus_dev->bus = &msm_bus_type; ++ dev_set_name(bus_dev, bus_node->node_info->name); ++ ++ ret = device_add(bus_dev); ++ if (ret < 0) { ++ MSM_BUS_ERR("%s: Error registering device %d", ++ __func__, pdata->node_info->id); ++ devm_kfree(bus_dev, bus_node); ++ devm_kfree(bus_dev, node_info->dev_connections); ++ devm_kfree(bus_dev, node_info->connections); ++ devm_kfree(bus_dev, node_info->black_connections); ++ devm_kfree(bus_dev, node_info->black_listed_connections); ++ devm_kfree(bus_dev, node_info); ++ kfree(bus_dev); ++ bus_dev = NULL; ++ goto exit_device_init; ++ } ++ device_create_file(bus_dev, &dev_attr_vrail); ++ ++exit_device_init: ++ return bus_dev; ++} ++ ++static int msm_bus_setup_dev_conn(struct device *bus_dev, void *data) ++{ ++ struct msm_bus_node_device_type *bus_node = NULL; ++ int ret = 0; ++ int j; ++ ++ bus_node = bus_dev->platform_data; ++ if (!bus_node) { ++ MSM_BUS_ERR("%s: Can't get device info", __func__); ++ ret = -ENODEV; ++ goto exit_setup_dev_conn; ++ } ++ ++ /* Setup parent bus device for this node */ ++ if (!bus_node->node_info->is_fab_dev) { ++ struct device *bus_parent_device = ++ bus_find_device(&msm_bus_type, NULL, ++ (void *)&bus_node->node_info->bus_device_id, ++ msm_bus_device_match_adhoc); ++ ++ if (!bus_parent_device) { ++ MSM_BUS_ERR("%s: Error finding parentdev %d parent %d", ++ __func__, ++ bus_node->node_info->id, ++ bus_node->node_info->bus_device_id); ++ ret = -ENXIO; ++ goto exit_setup_dev_conn; ++ } ++ bus_node->node_info->bus_device = bus_parent_device; ++ } ++ ++ bus_node->node_info->is_traversed = false; ++ ++ for (j = 0; j < bus_node->node_info->num_connections; j++) { ++ bus_node->node_info->dev_connections[j] = ++ bus_find_device(&msm_bus_type, NULL, ++ (void *)&bus_node->node_info->connections[j], ++ msm_bus_device_match_adhoc); ++ ++ if (!bus_node->node_info->dev_connections[j]) { ++ MSM_BUS_ERR("%s: Error finding conn %d for device %d", ++ __func__, bus_node->node_info->connections[j], ++ bus_node->node_info->id); ++ ret = -ENODEV; ++ goto exit_setup_dev_conn; ++ } ++ } ++ ++ for (j = 0; j < bus_node->node_info->num_blist; j++) { ++ bus_node->node_info->black_connections[j] = ++ bus_find_device(&msm_bus_type, NULL, ++ (void *)&bus_node->node_info-> ++ black_listed_connections[j], ++ msm_bus_device_match_adhoc); ++ ++ if (!bus_node->node_info->black_connections[j]) { ++ MSM_BUS_ERR("%s: Error finding conn %d for device %d\n", ++ __func__, bus_node->node_info-> ++ black_listed_connections[j], ++ bus_node->node_info->id); ++ ret = -ENODEV; ++ goto exit_setup_dev_conn; ++ } ++ } ++ ++exit_setup_dev_conn: ++ return ret; ++} ++ ++static int msm_bus_node_debug(struct device *bus_dev, void *data) ++{ ++ int j; ++ int ret = 0; ++ struct msm_bus_node_device_type *bus_node = NULL; ++ ++ bus_node = bus_dev->platform_data; ++ if (!bus_node) { ++ MSM_BUS_ERR("%s: Can't get device info", __func__); ++ ret = -ENODEV; ++ goto exit_node_debug; ++ } ++ ++ MSM_BUS_DBG("Device = %d buswidth %u", bus_node->node_info->id, ++ bus_node->node_info->buswidth); ++ for (j = 0; j < bus_node->node_info->num_connections; j++) { ++ struct msm_bus_node_device_type *bdev = ++ (struct msm_bus_node_device_type *) ++ bus_node->node_info->dev_connections[j]->platform_data; ++ MSM_BUS_DBG("\n\t Connection[%d] %d", j, bdev->node_info->id); ++ } ++ ++exit_node_debug: ++ return ret; ++} ++ ++static int msm_bus_device_probe(struct platform_device *pdev) ++{ ++ unsigned int i, ret; ++ struct msm_bus_device_node_registration *pdata; ++ ++ /* If possible, get pdata from device-tree */ ++ if (pdev->dev.of_node) ++ pdata = msm_bus_of_to_pdata(pdev); ++ else { ++ pdata = (struct msm_bus_device_node_registration *)pdev-> ++ dev.platform_data; ++ } ++ ++ if (IS_ERR_OR_NULL(pdata)) { ++ MSM_BUS_ERR("No platform data found"); ++ ret = -ENODATA; ++ goto exit_device_probe; ++ } ++ ++ for (i = 0; i < pdata->num_devices; i++) { ++ struct device *node_dev = NULL; ++ ++ node_dev = msm_bus_device_init(&pdata->info[i]); ++ ++ if (!node_dev) { ++ MSM_BUS_ERR("%s: Error during dev init for %d", ++ __func__, pdata->info[i].node_info->id); ++ ret = -ENXIO; ++ goto exit_device_probe; ++ } ++ ++ ret = msm_bus_init_clk(node_dev, &pdata->info[i]); ++ /*Is this a fabric device ?*/ ++ if (pdata->info[i].node_info->is_fab_dev) { ++ MSM_BUS_DBG("%s: %d is a fab", __func__, ++ pdata->info[i].node_info->id); ++ ret = msm_bus_fabric_init(node_dev, &pdata->info[i]); ++ if (ret) { ++ MSM_BUS_ERR("%s: Error intializing fab %d", ++ __func__, pdata->info[i].node_info->id); ++ goto exit_device_probe; ++ } ++ } ++ } ++ ++ ret = bus_for_each_dev(&msm_bus_type, NULL, NULL, ++ msm_bus_setup_dev_conn); ++ if (ret) { ++ MSM_BUS_ERR("%s: Error setting up dev connections", __func__); ++ goto exit_device_probe; ++ } ++ ++ ret = bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_dev_init_qos); ++ if (ret) { ++ MSM_BUS_ERR("%s: Error during qos init", __func__); ++ goto exit_device_probe; ++ } ++ ++ bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_node_debug); ++ ++ /* Register the arb layer ops */ ++ msm_bus_arb_setops_adhoc(&arb_ops); ++ devm_kfree(&pdev->dev, pdata->info); ++ devm_kfree(&pdev->dev, pdata); ++exit_device_probe: ++ return ret; ++} ++ ++static int msm_bus_device_rules_probe(struct platform_device *pdev) ++{ ++ struct bus_rule_type *rule_data = NULL; ++ int num_rules = 0; ++ ++ num_rules = msm_bus_of_get_static_rules(pdev, &rule_data); ++ ++ if (!rule_data) ++ goto exit_rules_probe; ++ ++ msm_rule_register(num_rules, rule_data, NULL); ++ static_rules.num_rules = num_rules; ++ static_rules.rules = rule_data; ++ pdev->dev.platform_data = &static_rules; ++ ++exit_rules_probe: ++ return 0; ++} ++ ++int msm_bus_device_rules_remove(struct platform_device *pdev) ++{ ++ struct static_rules_type *static_rules = NULL; ++ ++ static_rules = pdev->dev.platform_data; ++ if (static_rules) ++ msm_rule_unregister(static_rules->num_rules, ++ static_rules->rules, NULL); ++ return 0; ++} ++ ++static int msm_bus_free_dev(struct device *dev, void *data) ++{ ++ struct msm_bus_node_device_type *bus_node = NULL; ++ ++ bus_node = dev->platform_data; ++ ++ if (bus_node) ++ MSM_BUS_ERR("\n%s: Removing device %d", __func__, ++ bus_node->node_info->id); ++ device_unregister(dev); ++ return 0; ++} ++ ++int msm_bus_device_remove(struct platform_device *pdev) ++{ ++ bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_free_dev); ++ return 0; ++} ++ ++static struct of_device_id rules_match[] = { ++ {.compatible = "qcom,msm-bus-static-bw-rules"}, ++ {} ++}; ++ ++static struct platform_driver msm_bus_rules_driver = { ++ .probe = msm_bus_device_rules_probe, ++ .remove = msm_bus_device_rules_remove, ++ .driver = { ++ .name = "msm_bus_rules_device", ++ .owner = THIS_MODULE, ++ .of_match_table = rules_match, ++ }, ++}; ++ ++static struct of_device_id fabric_match[] = { ++ {.compatible = "qcom,msm-bus-device"}, ++ {} ++}; ++ ++static struct platform_driver msm_bus_device_driver = { ++ .probe = msm_bus_device_probe, ++ .remove = msm_bus_device_remove, ++ .driver = { ++ .name = "msm_bus_device", ++ .owner = THIS_MODULE, ++ .of_match_table = fabric_match, ++ }, ++}; ++ ++int __init msm_bus_device_init_driver(void) ++{ ++ int rc; ++ ++ MSM_BUS_ERR("msm_bus_fabric_init_driver\n"); ++ rc = platform_driver_register(&msm_bus_device_driver); ++ ++ if (rc) { ++ MSM_BUS_ERR("Failed to register bus device driver"); ++ return rc; ++ } ++ return platform_driver_register(&msm_bus_rules_driver); ++} ++subsys_initcall(msm_bus_device_init_driver); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_id.c +@@ -0,0 +1,94 @@ ++/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include "msm-bus.h" ++#include "msm-bus-board.h" ++#include "msm_bus_core.h" ++#include "msm_bus_noc.h" ++#include "msm_bus_bimc.h" ++ ++static uint32_t master_iids[MSM_BUS_MASTER_LAST]; ++static uint32_t slave_iids[MSM_BUS_SLAVE_LAST - SLAVE_ID_KEY]; ++ ++static void msm_bus_assign_iids(struct msm_bus_fabric_registration ++ *fabreg, int fabid) ++{ ++ int i; ++ for (i = 0; i < fabreg->len; i++) { ++ if (!fabreg->info[i].gateway) { ++ fabreg->info[i].priv_id = fabid + fabreg->info[i].id; ++ if (fabreg->info[i].id < SLAVE_ID_KEY) { ++ if (fabreg->info[i].id >= MSM_BUS_MASTER_LAST) { ++ WARN(1, "id %d exceeds array size!\n", ++ fabreg->info[i].id); ++ continue; ++ } ++ ++ master_iids[fabreg->info[i].id] = ++ fabreg->info[i].priv_id; ++ } else { ++ if ((fabreg->info[i].id - SLAVE_ID_KEY) >= ++ (MSM_BUS_SLAVE_LAST - SLAVE_ID_KEY)) { ++ WARN(1, "id %d exceeds array size!\n", ++ fabreg->info[i].id); ++ continue; ++ } ++ ++ slave_iids[fabreg->info[i].id - (SLAVE_ID_KEY)] ++ = fabreg->info[i].priv_id; ++ } ++ } else { ++ fabreg->info[i].priv_id = fabreg->info[i].id; ++ } ++ } ++} ++ ++static int msm_bus_get_iid(int id) ++{ ++ if ((id < SLAVE_ID_KEY && id >= MSM_BUS_MASTER_LAST) || ++ id >= MSM_BUS_SLAVE_LAST) { ++ MSM_BUS_ERR("Cannot get iid. Invalid id %d passed\n", id); ++ return -EINVAL; ++ } ++ ++ return CHECK_ID(((id < SLAVE_ID_KEY) ? master_iids[id] : ++ slave_iids[id - SLAVE_ID_KEY]), id); ++} ++ ++static struct msm_bus_board_algorithm msm_bus_id_algo = { ++ .get_iid = msm_bus_get_iid, ++ .assign_iids = msm_bus_assign_iids, ++}; ++ ++int msm_bus_board_rpm_get_il_ids(uint16_t *id) ++{ ++ return -ENXIO; ++} ++ ++void msm_bus_board_init(struct msm_bus_fabric_registration *pdata) ++{ ++ pdata->board_algo = &msm_bus_id_algo; ++} ++ ++void msm_bus_board_set_nfab(struct msm_bus_fabric_registration *pdata, ++ int nfab) ++{ ++ if (nfab <= 0) ++ return; ++ ++ msm_bus_id_algo.board_nfab = nfab; ++} +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_noc.c +@@ -0,0 +1,770 @@ ++/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#define pr_fmt(fmt) "AXI: NOC: %s(): " fmt, __func__ ++ ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm_bus_core.h" ++#include "msm_bus_noc.h" ++#include "msm_bus_adhoc.h" ++ ++/* NOC_QOS generic */ ++#define __CLZ(x) ((8 * sizeof(uint32_t)) - 1 - __fls(x)) ++#define SAT_SCALE 16 /* 16 bytes minimum for saturation */ ++#define BW_SCALE 256 /* 1/256 byte per cycle unit */ ++#define QOS_DEFAULT_BASEOFFSET 0x00003000 ++#define QOS_DEFAULT_DELTA 0x80 ++#define MAX_BW_FIELD (NOC_QOS_BWn_BW_BMSK >> NOC_QOS_BWn_BW_SHFT) ++#define MAX_SAT_FIELD (NOC_QOS_SATn_SAT_BMSK >> NOC_QOS_SATn_SAT_SHFT) ++ ++#define NOC_QOS_REG_BASE(b, o) ((b) + (o)) ++ ++#define NOC_QOS_ID_COREIDn_ADDR(b, o, n, d) \ ++ (NOC_QOS_REG_BASE(b, o) + (d) * (n)) ++enum noc_qos_id_coreidn { ++ NOC_QOS_ID_COREIDn_RMSK = 0xffffffff, ++ NOC_QOS_ID_COREIDn_MAXn = 32, ++ NOC_QOS_ID_COREIDn_CORECHSUM_BMSK = 0xffffff00, ++ NOC_QOS_ID_COREIDn_CORECHSUM_SHFT = 0x8, ++ NOC_QOS_ID_COREIDn_CORETYPEID_BMSK = 0xff, ++ NOC_QOS_ID_COREIDn_CORETYPEID_SHFT = 0x0, ++}; ++ ++#define NOC_QOS_ID_REVISIONIDn_ADDR(b, o, n, d) \ ++ (NOC_QOS_REG_BASE(b, o) + 0x4 + (d) * (n)) ++enum noc_qos_id_revisionidn { ++ NOC_QOS_ID_REVISIONIDn_RMSK = 0xffffffff, ++ NOC_QOS_ID_REVISIONIDn_MAXn = 32, ++ NOC_QOS_ID_REVISIONIDn_FLEXNOCID_BMSK = 0xffffff00, ++ NOC_QOS_ID_REVISIONIDn_FLEXNOCID_SHFT = 0x8, ++ NOC_QOS_ID_REVISIONIDn_USERID_BMSK = 0xff, ++ NOC_QOS_ID_REVISIONIDn_USERID_SHFT = 0x0, ++}; ++ ++#define NOC_QOS_PRIORITYn_ADDR(b, o, n, d) \ ++ (NOC_QOS_REG_BASE(b, o) + 0x8 + (d) * (n)) ++enum noc_qos_id_priorityn { ++ NOC_QOS_PRIORITYn_RMSK = 0x0000000f, ++ NOC_QOS_PRIORITYn_MAXn = 32, ++ NOC_QOS_PRIORITYn_P1_BMSK = 0xc, ++ NOC_QOS_PRIORITYn_P1_SHFT = 0x2, ++ NOC_QOS_PRIORITYn_P0_BMSK = 0x3, ++ NOC_QOS_PRIORITYn_P0_SHFT = 0x0, ++}; ++ ++#define NOC_QOS_MODEn_ADDR(b, o, n, d) \ ++ (NOC_QOS_REG_BASE(b, o) + 0xC + (d) * (n)) ++enum noc_qos_id_moden_rmsk { ++ NOC_QOS_MODEn_RMSK = 0x00000003, ++ NOC_QOS_MODEn_MAXn = 32, ++ NOC_QOS_MODEn_MODE_BMSK = 0x3, ++ NOC_QOS_MODEn_MODE_SHFT = 0x0, ++}; ++ ++#define NOC_QOS_BWn_ADDR(b, o, n, d) \ ++ (NOC_QOS_REG_BASE(b, o) + 0x10 + (d) * (n)) ++enum noc_qos_id_bwn { ++ NOC_QOS_BWn_RMSK = 0x0000ffff, ++ NOC_QOS_BWn_MAXn = 32, ++ NOC_QOS_BWn_BW_BMSK = 0xffff, ++ NOC_QOS_BWn_BW_SHFT = 0x0, ++}; ++ ++/* QOS Saturation registers */ ++#define NOC_QOS_SATn_ADDR(b, o, n, d) \ ++ (NOC_QOS_REG_BASE(b, o) + 0x14 + (d) * (n)) ++enum noc_qos_id_saturationn { ++ NOC_QOS_SATn_RMSK = 0x000003ff, ++ NOC_QOS_SATn_MAXn = 32, ++ NOC_QOS_SATn_SAT_BMSK = 0x3ff, ++ NOC_QOS_SATn_SAT_SHFT = 0x0, ++}; ++ ++static int noc_div(uint64_t *a, uint32_t b) ++{ ++ if ((*a > 0) && (*a < b)) ++ return 1; ++ else ++ return do_div(*a, b); ++} ++ ++/** ++ * Calculates bw hardware is using from register values ++ * bw returned is in bytes/sec ++ */ ++static uint64_t noc_bw(uint32_t bw_field, uint32_t qos_freq) ++{ ++ uint64_t res; ++ uint32_t rem, scale; ++ ++ res = 2 * qos_freq * bw_field; ++ scale = BW_SCALE * 1000; ++ rem = noc_div(&res, scale); ++ MSM_BUS_DBG("NOC: Calculated bw: %llu\n", res * 1000000ULL); ++ return res * 1000000ULL; ++} ++ ++static uint32_t noc_bw_ceil(long int bw_field, uint32_t qos_freq) ++{ ++ uint64_t bw_temp = 2 * qos_freq * bw_field; ++ uint32_t scale = 1000 * BW_SCALE; ++ noc_div(&bw_temp, scale); ++ return bw_temp * 1000000; ++} ++#define MAX_BW(timebase) noc_bw_ceil(MAX_BW_FIELD, (timebase)) ++ ++/** ++ * Calculates ws hardware is using from register values ++ * ws returned is in nanoseconds ++ */ ++static uint32_t noc_ws(uint64_t bw, uint32_t sat, uint32_t qos_freq) ++{ ++ if (bw && qos_freq) { ++ uint32_t bwf = bw * qos_freq; ++ uint64_t scale = 1000000000000LL * BW_SCALE * ++ SAT_SCALE * sat; ++ noc_div(&scale, bwf); ++ MSM_BUS_DBG("NOC: Calculated ws: %llu\n", scale); ++ return scale; ++ } ++ ++ return 0; ++} ++#define MAX_WS(bw, timebase) noc_ws((bw), MAX_SAT_FIELD, (timebase)) ++ ++/* Calculate bandwidth field value for requested bandwidth */ ++static uint32_t noc_bw_field(uint64_t bw, uint32_t qos_freq) ++{ ++ uint32_t bw_field = 0; ++ ++ if (bw) { ++ uint32_t rem; ++ uint64_t bw_capped = min_t(uint64_t, bw, MAX_BW(qos_freq)); ++ uint64_t bwc = bw_capped * BW_SCALE; ++ uint64_t qf = 2 * qos_freq * 1000; ++ ++ rem = noc_div(&bwc, qf); ++ bw_field = (uint32_t)min_t(uint64_t, bwc, MAX_BW_FIELD); ++ } ++ ++ MSM_BUS_DBG("NOC: bw_field: %u\n", bw_field); ++ return bw_field; ++} ++ ++static uint32_t noc_sat_field(uint64_t bw, uint32_t ws, uint32_t qos_freq) ++{ ++ uint32_t sat_field = 0, win; ++ ++ if (bw) { ++ /* Limit to max bw and scale bw to 100 KB increments */ ++ uint64_t tbw, tscale; ++ uint64_t bw_scaled = min_t(uint64_t, bw, MAX_BW(qos_freq)); ++ uint32_t rem = noc_div(&bw_scaled, 100000); ++ ++ /** ++ * Calculate saturation from windows size. ++ * WS must be at least one arb period. ++ * Saturation must not exceed max field size ++ * ++ * Bandwidth is in 100KB increments ++ * Window size is in ns ++ * qos_freq is in KHz ++ */ ++ win = max(ws, 1000000 / qos_freq); ++ tbw = bw_scaled * win * qos_freq; ++ tscale = 10000000ULL * BW_SCALE * SAT_SCALE; ++ rem = noc_div(&tbw, tscale); ++ sat_field = (uint32_t)min_t(uint64_t, tbw, MAX_SAT_FIELD); ++ } ++ ++ MSM_BUS_DBG("NOC: sat_field: %d\n", sat_field); ++ return sat_field; ++} ++ ++static void noc_set_qos_mode(void __iomem *base, uint32_t qos_off, ++ uint32_t mport, uint32_t qos_delta, uint8_t mode, ++ uint8_t perm_mode) ++{ ++ if (mode < NOC_QOS_MODE_MAX && ++ ((1 << mode) & perm_mode)) { ++ uint32_t reg_val; ++ ++ reg_val = readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, ++ mport, qos_delta)) & NOC_QOS_MODEn_RMSK; ++ writel_relaxed(((reg_val & (~(NOC_QOS_MODEn_MODE_BMSK))) | ++ (mode & NOC_QOS_MODEn_MODE_BMSK)), ++ NOC_QOS_MODEn_ADDR(base, qos_off, mport, qos_delta)); ++ } ++ /* Ensure qos mode is set before exiting */ ++ wmb(); ++} ++ ++static void noc_set_qos_priority(void __iomem *base, uint32_t qos_off, ++ uint32_t mport, uint32_t qos_delta, ++ struct msm_bus_noc_qos_priority *priority) ++{ ++ uint32_t reg_val, val; ++ ++ reg_val = readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, ++ qos_delta)) & NOC_QOS_PRIORITYn_RMSK; ++ val = priority->p1 << NOC_QOS_PRIORITYn_P1_SHFT; ++ writel_relaxed(((reg_val & (~(NOC_QOS_PRIORITYn_P1_BMSK))) | ++ (val & NOC_QOS_PRIORITYn_P1_BMSK)), ++ NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, qos_delta)); ++ ++ reg_val = readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, ++ qos_delta)) ++ & NOC_QOS_PRIORITYn_RMSK; ++ writel_relaxed(((reg_val & (~(NOC_QOS_PRIORITYn_P0_BMSK))) | ++ (priority->p0 & NOC_QOS_PRIORITYn_P0_BMSK)), ++ NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, qos_delta)); ++ /* Ensure qos priority is set before exiting */ ++ wmb(); ++} ++ ++static void msm_bus_noc_set_qos_bw(void __iomem *base, uint32_t qos_off, ++ uint32_t qos_freq, uint32_t mport, uint32_t qos_delta, ++ uint8_t perm_mode, struct msm_bus_noc_qos_bw *qbw) ++{ ++ uint32_t reg_val, val, mode; ++ ++ if (!qos_freq) { ++ MSM_BUS_DBG("Zero QoS Freq\n"); ++ return; ++ } ++ ++ ++ /* If Limiter or Regulator modes are not supported, bw not available*/ ++ if (perm_mode & (NOC_QOS_PERM_MODE_LIMITER | ++ NOC_QOS_PERM_MODE_REGULATOR)) { ++ uint32_t bw_val = noc_bw_field(qbw->bw, qos_freq); ++ uint32_t sat_val = noc_sat_field(qbw->bw, qbw->ws, ++ qos_freq); ++ ++ MSM_BUS_DBG("NOC: BW: perm_mode: %d bw_val: %d, sat_val: %d\n", ++ perm_mode, bw_val, sat_val); ++ /* ++ * If in Limiter/Regulator mode, first go to fixed mode. ++ * Clear QoS accumulator ++ **/ ++ mode = readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, ++ mport, qos_delta)) & NOC_QOS_MODEn_MODE_BMSK; ++ if (mode == NOC_QOS_MODE_REGULATOR || mode == ++ NOC_QOS_MODE_LIMITER) { ++ reg_val = readl_relaxed(NOC_QOS_MODEn_ADDR( ++ base, qos_off, mport, qos_delta)); ++ val = NOC_QOS_MODE_FIXED; ++ writel_relaxed((reg_val & (~(NOC_QOS_MODEn_MODE_BMSK))) ++ | (val & NOC_QOS_MODEn_MODE_BMSK), ++ NOC_QOS_MODEn_ADDR(base, qos_off, mport, ++ qos_delta)); ++ } ++ ++ reg_val = readl_relaxed(NOC_QOS_BWn_ADDR(base, qos_off, mport, ++ qos_delta)); ++ val = bw_val << NOC_QOS_BWn_BW_SHFT; ++ writel_relaxed(((reg_val & (~(NOC_QOS_BWn_BW_BMSK))) | ++ (val & NOC_QOS_BWn_BW_BMSK)), ++ NOC_QOS_BWn_ADDR(base, qos_off, mport, qos_delta)); ++ ++ MSM_BUS_DBG("NOC: BW: Wrote value: 0x%x\n", ((reg_val & ++ (~NOC_QOS_BWn_BW_BMSK)) | (val & ++ NOC_QOS_BWn_BW_BMSK))); ++ ++ reg_val = readl_relaxed(NOC_QOS_SATn_ADDR(base, qos_off, ++ mport, qos_delta)); ++ val = sat_val << NOC_QOS_SATn_SAT_SHFT; ++ writel_relaxed(((reg_val & (~(NOC_QOS_SATn_SAT_BMSK))) | ++ (val & NOC_QOS_SATn_SAT_BMSK)), ++ NOC_QOS_SATn_ADDR(base, qos_off, mport, qos_delta)); ++ ++ MSM_BUS_DBG("NOC: SAT: Wrote value: 0x%x\n", ((reg_val & ++ (~NOC_QOS_SATn_SAT_BMSK)) | (val & ++ NOC_QOS_SATn_SAT_BMSK))); ++ ++ /* Set mode back to what it was initially */ ++ reg_val = readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, ++ mport, qos_delta)); ++ writel_relaxed((reg_val & (~(NOC_QOS_MODEn_MODE_BMSK))) ++ | (mode & NOC_QOS_MODEn_MODE_BMSK), ++ NOC_QOS_MODEn_ADDR(base, qos_off, mport, qos_delta)); ++ /* Ensure that all writes for bandwidth registers have ++ * completed before returning ++ */ ++ wmb(); ++ } ++} ++ ++uint8_t msm_bus_noc_get_qos_mode(void __iomem *base, uint32_t qos_off, ++ uint32_t mport, uint32_t qos_delta, uint32_t mode, uint32_t perm_mode) ++{ ++ if (NOC_QOS_MODES_ALL_PERM == perm_mode) ++ return readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, ++ mport, qos_delta)) & NOC_QOS_MODEn_MODE_BMSK; ++ else ++ return 31 - __CLZ(mode & ++ NOC_QOS_MODES_ALL_PERM); ++} ++ ++void msm_bus_noc_get_qos_priority(void __iomem *base, uint32_t qos_off, ++ uint32_t mport, uint32_t qos_delta, ++ struct msm_bus_noc_qos_priority *priority) ++{ ++ priority->p1 = (readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, ++ mport, qos_delta)) & NOC_QOS_PRIORITYn_P1_BMSK) >> ++ NOC_QOS_PRIORITYn_P1_SHFT; ++ ++ priority->p0 = (readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, ++ mport, qos_delta)) & NOC_QOS_PRIORITYn_P0_BMSK) >> ++ NOC_QOS_PRIORITYn_P0_SHFT; ++} ++ ++void msm_bus_noc_get_qos_bw(void __iomem *base, uint32_t qos_off, ++ uint32_t qos_freq, ++ uint32_t mport, uint32_t qos_delta, uint8_t perm_mode, ++ struct msm_bus_noc_qos_bw *qbw) ++{ ++ if (perm_mode & (NOC_QOS_PERM_MODE_LIMITER | ++ NOC_QOS_PERM_MODE_REGULATOR)) { ++ uint32_t bw_val = readl_relaxed(NOC_QOS_BWn_ADDR( ++ base, qos_off, mport, qos_delta)) & NOC_QOS_BWn_BW_BMSK; ++ uint32_t sat = readl_relaxed(NOC_QOS_SATn_ADDR( ++ base, qos_off, mport, qos_delta)) ++ & NOC_QOS_SATn_SAT_BMSK; ++ ++ qbw->bw = noc_bw(bw_val, qos_freq); ++ qbw->ws = noc_ws(qbw->bw, sat, qos_freq); ++ } else { ++ qbw->bw = 0; ++ qbw->ws = 0; ++ } ++} ++ ++static int msm_bus_noc_mas_init(struct msm_bus_noc_info *ninfo, ++ struct msm_bus_inode_info *info) ++{ ++ int i; ++ struct msm_bus_noc_qos_priority *prio; ++ prio = kzalloc(sizeof(struct msm_bus_noc_qos_priority), ++ GFP_KERNEL); ++ if (!prio) { ++ MSM_BUS_WARN("Couldn't alloc prio data for node: %d\n", ++ info->node_info->id); ++ return -ENOMEM; ++ } ++ ++ prio->read_prio = info->node_info->prio_rd; ++ prio->write_prio = info->node_info->prio_wr; ++ prio->p1 = info->node_info->prio1; ++ prio->p0 = info->node_info->prio0; ++ info->hw_data = (void *)prio; ++ ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No QoS Ports to init\n"); ++ return 0; ++ } ++ ++ for (i = 0; i < info->node_info->num_mports; i++) { ++ if (info->node_info->mode != NOC_QOS_MODE_BYPASS) { ++ noc_set_qos_priority(ninfo->base, ninfo->qos_baseoffset, ++ info->node_info->qport[i], ninfo->qos_delta, ++ prio); ++ ++ if (info->node_info->mode != NOC_QOS_MODE_FIXED) { ++ struct msm_bus_noc_qos_bw qbw; ++ qbw.ws = info->node_info->ws; ++ qbw.bw = 0; ++ msm_bus_noc_set_qos_bw(ninfo->base, ++ ninfo->qos_baseoffset, ++ ninfo->qos_freq, info->node_info-> ++ qport[i], ninfo->qos_delta, ++ info->node_info->perm_mode, ++ &qbw); ++ } ++ } ++ ++ noc_set_qos_mode(ninfo->base, ninfo->qos_baseoffset, ++ info->node_info->qport[i], ninfo->qos_delta, ++ info->node_info->mode, ++ info->node_info->perm_mode); ++ } ++ ++ return 0; ++} ++ ++static void msm_bus_noc_node_init(void *hw_data, ++ struct msm_bus_inode_info *info) ++{ ++ struct msm_bus_noc_info *ninfo = ++ (struct msm_bus_noc_info *)hw_data; ++ ++ if (!IS_SLAVE(info->node_info->priv_id)) ++ if (info->node_info->hw_sel != MSM_BUS_RPM) ++ msm_bus_noc_mas_init(ninfo, info); ++} ++ ++static int msm_bus_noc_allocate_commit_data(struct msm_bus_fabric_registration ++ *fab_pdata, void **cdata, int ctx) ++{ ++ struct msm_bus_noc_commit **cd = (struct msm_bus_noc_commit **)cdata; ++ struct msm_bus_noc_info *ninfo = ++ (struct msm_bus_noc_info *)fab_pdata->hw_data; ++ ++ *cd = kzalloc(sizeof(struct msm_bus_noc_commit), GFP_KERNEL); ++ if (!*cd) { ++ MSM_BUS_DBG("Couldn't alloc mem for cdata\n"); ++ return -ENOMEM; ++ } ++ ++ (*cd)->mas = ninfo->cdata[ctx].mas; ++ (*cd)->slv = ninfo->cdata[ctx].slv; ++ ++ return 0; ++} ++ ++static void *msm_bus_noc_allocate_noc_data(struct platform_device *pdev, ++ struct msm_bus_fabric_registration *fab_pdata) ++{ ++ struct resource *noc_mem; ++ struct resource *noc_io; ++ struct msm_bus_noc_info *ninfo; ++ int i; ++ ++ ninfo = kzalloc(sizeof(struct msm_bus_noc_info), GFP_KERNEL); ++ if (!ninfo) { ++ MSM_BUS_DBG("Couldn't alloc mem for noc info\n"); ++ return NULL; ++ } ++ ++ ninfo->nmasters = fab_pdata->nmasters; ++ ninfo->nqos_masters = fab_pdata->nmasters; ++ ninfo->nslaves = fab_pdata->nslaves; ++ ninfo->qos_freq = fab_pdata->qos_freq; ++ ++ if (!fab_pdata->qos_baseoffset) ++ ninfo->qos_baseoffset = QOS_DEFAULT_BASEOFFSET; ++ else ++ ninfo->qos_baseoffset = fab_pdata->qos_baseoffset; ++ ++ if (!fab_pdata->qos_delta) ++ ninfo->qos_delta = QOS_DEFAULT_DELTA; ++ else ++ ninfo->qos_delta = fab_pdata->qos_delta; ++ ++ ninfo->mas_modes = kzalloc(sizeof(uint32_t) * fab_pdata->nmasters, ++ GFP_KERNEL); ++ if (!ninfo->mas_modes) { ++ MSM_BUS_DBG("Couldn't alloc mem for noc master-modes\n"); ++ kfree(ninfo); ++ return NULL; ++ } ++ ++ for (i = 0; i < NUM_CTX; i++) { ++ ninfo->cdata[i].mas = kzalloc(sizeof(struct ++ msm_bus_node_hw_info) * fab_pdata->nmasters * 2, ++ GFP_KERNEL); ++ if (!ninfo->cdata[i].mas) { ++ MSM_BUS_DBG("Couldn't alloc mem for noc master-bw\n"); ++ kfree(ninfo->mas_modes); ++ kfree(ninfo); ++ return NULL; ++ } ++ ++ ninfo->cdata[i].slv = kzalloc(sizeof(struct ++ msm_bus_node_hw_info) * fab_pdata->nslaves * 2, ++ GFP_KERNEL); ++ if (!ninfo->cdata[i].slv) { ++ MSM_BUS_DBG("Couldn't alloc mem for noc master-bw\n"); ++ kfree(ninfo->cdata[i].mas); ++ goto err; ++ } ++ } ++ ++ /* If it's a virtual fabric, don't get memory info */ ++ if (fab_pdata->virt) ++ goto skip_mem; ++ ++ noc_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!noc_mem && !fab_pdata->virt) { ++ MSM_BUS_ERR("Cannot get NoC Base address\n"); ++ goto err; ++ } ++ ++ noc_io = request_mem_region(noc_mem->start, ++ resource_size(noc_mem), pdev->name); ++ if (!noc_io) { ++ MSM_BUS_ERR("NoC memory unavailable\n"); ++ goto err; ++ } ++ ++ ninfo->base = ioremap(noc_mem->start, resource_size(noc_mem)); ++ if (!ninfo->base) { ++ MSM_BUS_ERR("IOremap failed for NoC!\n"); ++ release_mem_region(noc_mem->start, resource_size(noc_mem)); ++ goto err; ++ } ++ ++skip_mem: ++ fab_pdata->hw_data = (void *)ninfo; ++ return (void *)ninfo; ++ ++err: ++ kfree(ninfo->mas_modes); ++ kfree(ninfo); ++ return NULL; ++} ++ ++static void free_commit_data(void *cdata) ++{ ++ struct msm_bus_noc_commit *cd = (struct msm_bus_noc_commit *)cdata; ++ ++ kfree(cd->mas); ++ kfree(cd->slv); ++ kfree(cd); ++} ++ ++static bool msm_bus_noc_update_bw_reg(int mode) ++{ ++ bool ret = false; ++ ++ if ((mode == NOC_QOS_MODE_LIMITER) || ++ (mode == NOC_QOS_MODE_REGULATOR)) ++ ret = true; ++ ++ return ret; ++} ++ ++static void msm_bus_noc_update_bw(struct msm_bus_inode_info *hop, ++ struct msm_bus_inode_info *info, ++ struct msm_bus_fabric_registration *fab_pdata, ++ void *sel_cdata, int *master_tiers, ++ int64_t add_bw) ++{ ++ struct msm_bus_noc_info *ninfo; ++ struct msm_bus_noc_qos_bw qos_bw; ++ int i, ports; ++ int64_t bw; ++ struct msm_bus_noc_commit *sel_cd = ++ (struct msm_bus_noc_commit *)sel_cdata; ++ ++ ninfo = (struct msm_bus_noc_info *)fab_pdata->hw_data; ++ if (!ninfo->qos_freq) { ++ MSM_BUS_DBG("NOC: No qos frequency to update bw\n"); ++ return; ++ } ++ ++ if (info->node_info->num_mports == 0) { ++ MSM_BUS_DBG("NOC: Skip Master BW\n"); ++ goto skip_mas_bw; ++ } ++ ++ ports = info->node_info->num_mports; ++ bw = INTERLEAVED_BW(fab_pdata, add_bw, ports); ++ ++ MSM_BUS_DBG("NOC: Update bw for: %d: %lld\n", ++ info->node_info->priv_id, add_bw); ++ for (i = 0; i < ports; i++) { ++ sel_cd->mas[info->node_info->masterp[i]].bw += bw; ++ sel_cd->mas[info->node_info->masterp[i]].hw_id = ++ info->node_info->mas_hw_id; ++ MSM_BUS_DBG("NOC: Update mas_bw: ID: %d, BW: %llu ports:%d\n", ++ info->node_info->priv_id, ++ sel_cd->mas[info->node_info->masterp[i]].bw, ++ ports); ++ /* Check if info is a shared master. ++ * If it is, mark it dirty ++ * If it isn't, then set QOS Bandwidth ++ **/ ++ if (info->node_info->hw_sel == MSM_BUS_RPM) ++ sel_cd->mas[info->node_info->masterp[i]].dirty = 1; ++ else { ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No qos ports to update!\n"); ++ break; ++ } ++ ++ if (!(info->node_info->mode == NOC_QOS_MODE_REGULATOR) ++ || (info->node_info->mode == ++ NOC_QOS_MODE_LIMITER)) { ++ MSM_BUS_DBG("Skip QoS reg programming\n"); ++ break; ++ } ++ qos_bw.bw = sel_cd->mas[info->node_info->masterp[i]]. ++ bw; ++ qos_bw.ws = info->node_info->ws; ++ msm_bus_noc_set_qos_bw(ninfo->base, ++ ninfo->qos_baseoffset, ++ ninfo->qos_freq, ++ info->node_info->qport[i], ninfo->qos_delta, ++ info->node_info->perm_mode, &qos_bw); ++ MSM_BUS_DBG("NOC: QoS: Update mas_bw: ws: %u\n", ++ qos_bw.ws); ++ } ++ } ++ ++skip_mas_bw: ++ ports = hop->node_info->num_sports; ++ for (i = 0; i < ports; i++) { ++ sel_cd->slv[hop->node_info->slavep[i]].bw += add_bw; ++ sel_cd->slv[hop->node_info->slavep[i]].hw_id = ++ hop->node_info->slv_hw_id; ++ MSM_BUS_DBG("NOC: Update slave_bw for ID: %d -> %llu\n", ++ hop->node_info->priv_id, ++ sel_cd->slv[hop->node_info->slavep[i]].bw); ++ MSM_BUS_DBG("NOC: Update slave_bw for hw_id: %d, index: %d\n", ++ hop->node_info->slv_hw_id, hop->node_info->slavep[i]); ++ /* Check if hop is a shared slave. ++ * If it is, mark it dirty ++ * If it isn't, then nothing to be done as the ++ * slaves are in bypass mode. ++ **/ ++ if (hop->node_info->hw_sel == MSM_BUS_RPM) ++ sel_cd->slv[hop->node_info->slavep[i]].dirty = 1; ++ } ++} ++ ++static int msm_bus_noc_commit(struct msm_bus_fabric_registration ++ *fab_pdata, void *hw_data, void **cdata) ++{ ++ MSM_BUS_DBG("\nReached NOC Commit\n"); ++ msm_bus_remote_hw_commit(fab_pdata, hw_data, cdata); ++ return 0; ++} ++ ++static int msm_bus_noc_port_halt(uint32_t haltid, uint8_t mport) ++{ ++ return 0; ++} ++ ++static int msm_bus_noc_port_unhalt(uint32_t haltid, uint8_t mport) ++{ ++ return 0; ++} ++ ++static int msm_bus_noc_qos_init(struct msm_bus_node_device_type *info, ++ void __iomem *qos_base, ++ uint32_t qos_off, uint32_t qos_delta, ++ uint32_t qos_freq) ++{ ++ struct msm_bus_noc_qos_priority prio; ++ int ret = 0; ++ int i; ++ ++ prio.p1 = info->node_info->qos_params.prio1; ++ prio.p0 = info->node_info->qos_params.prio0; ++ ++ if (!info->node_info->qport) { ++ MSM_BUS_DBG("No QoS Ports to init\n"); ++ ret = 0; ++ goto err_qos_init; ++ } ++ ++ for (i = 0; i < info->node_info->num_qports; i++) { ++ if (info->node_info->qos_params.mode != NOC_QOS_MODE_BYPASS) { ++ noc_set_qos_priority(qos_base, qos_off, ++ info->node_info->qport[i], qos_delta, ++ &prio); ++ ++ if (info->node_info->qos_params.mode != ++ NOC_QOS_MODE_FIXED) { ++ struct msm_bus_noc_qos_bw qbw; ++ qbw.ws = info->node_info->qos_params.ws; ++ qbw.bw = 0; ++ msm_bus_noc_set_qos_bw(qos_base, qos_off, ++ qos_freq, ++ info->node_info->qport[i], ++ qos_delta, ++ info->node_info->qos_params.mode, ++ &qbw); ++ } ++ } ++ ++ noc_set_qos_mode(qos_base, qos_off, info->node_info->qport[i], ++ qos_delta, info->node_info->qos_params.mode, ++ (1 << info->node_info->qos_params.mode)); ++ } ++err_qos_init: ++ return ret; ++} ++ ++static int msm_bus_noc_set_bw(struct msm_bus_node_device_type *dev, ++ void __iomem *qos_base, ++ uint32_t qos_off, uint32_t qos_delta, ++ uint32_t qos_freq) ++{ ++ int ret = 0; ++ uint64_t bw = 0; ++ int i; ++ struct msm_bus_node_info_type *info = dev->node_info; ++ ++ if (info && info->num_qports && ++ ((info->qos_params.mode == NOC_QOS_MODE_REGULATOR) || ++ (info->qos_params.mode == ++ NOC_QOS_MODE_LIMITER))) { ++ struct msm_bus_noc_qos_bw qos_bw; ++ ++ bw = msm_bus_div64(info->num_qports, ++ dev->node_ab.ab[DUAL_CTX]); ++ ++ for (i = 0; i < info->num_qports; i++) { ++ if (!info->qport) { ++ MSM_BUS_DBG("No qos ports to update!\n"); ++ break; ++ } ++ ++ qos_bw.bw = bw; ++ qos_bw.ws = info->qos_params.ws; ++ msm_bus_noc_set_qos_bw(qos_base, qos_off, qos_freq, ++ info->qport[i], qos_delta, ++ info->qos_params.mode, &qos_bw); ++ MSM_BUS_DBG("NOC: QoS: Update mas_bw: ws: %u\n", ++ qos_bw.ws); ++ } ++ } ++ return ret; ++} ++int msm_bus_noc_hw_init(struct msm_bus_fabric_registration *pdata, ++ struct msm_bus_hw_algorithm *hw_algo) ++{ ++ /* Set interleaving to true by default */ ++ pdata->il_flag = true; ++ hw_algo->allocate_commit_data = msm_bus_noc_allocate_commit_data; ++ hw_algo->allocate_hw_data = msm_bus_noc_allocate_noc_data; ++ hw_algo->node_init = msm_bus_noc_node_init; ++ hw_algo->free_commit_data = free_commit_data; ++ hw_algo->update_bw = msm_bus_noc_update_bw; ++ hw_algo->commit = msm_bus_noc_commit; ++ hw_algo->port_halt = msm_bus_noc_port_halt; ++ hw_algo->port_unhalt = msm_bus_noc_port_unhalt; ++ hw_algo->update_bw_reg = msm_bus_noc_update_bw_reg; ++ hw_algo->config_master = NULL; ++ hw_algo->config_limiter = NULL; ++ ++ return 0; ++} ++ ++int msm_bus_noc_set_ops(struct msm_bus_node_device_type *bus_dev) ++{ ++ if (!bus_dev) ++ return -ENODEV; ++ else { ++ bus_dev->fabdev->noc_ops.qos_init = msm_bus_noc_qos_init; ++ bus_dev->fabdev->noc_ops.set_bw = msm_bus_noc_set_bw; ++ bus_dev->fabdev->noc_ops.limit_mport = NULL; ++ bus_dev->fabdev->noc_ops.update_bw_reg = ++ msm_bus_noc_update_bw_reg; ++ } ++ return 0; ++} ++EXPORT_SYMBOL(msm_bus_noc_set_ops); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_noc.h +@@ -0,0 +1,76 @@ ++/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef _ARCH_ARM_MACH_MSM_BUS_BIMC_H ++#define _ARCH_ARM_MACH_MSM_BUS_BIMC_H ++ ++enum msm_bus_noc_qos_mode_type { ++ NOC_QOS_MODE_FIXED = 0, ++ NOC_QOS_MODE_LIMITER, ++ NOC_QOS_MODE_BYPASS, ++ NOC_QOS_MODE_REGULATOR, ++ NOC_QOS_MODE_MAX, ++}; ++ ++enum msm_bus_noc_qos_mode_perm { ++ NOC_QOS_PERM_MODE_FIXED = (1 << NOC_QOS_MODE_FIXED), ++ NOC_QOS_PERM_MODE_LIMITER = (1 << NOC_QOS_MODE_LIMITER), ++ NOC_QOS_PERM_MODE_BYPASS = (1 << NOC_QOS_MODE_BYPASS), ++ NOC_QOS_PERM_MODE_REGULATOR = (1 << NOC_QOS_MODE_REGULATOR), ++}; ++ ++#define NOC_QOS_MODES_ALL_PERM (NOC_QOS_PERM_MODE_FIXED | \ ++ NOC_QOS_PERM_MODE_LIMITER | NOC_QOS_PERM_MODE_BYPASS | \ ++ NOC_QOS_PERM_MODE_REGULATOR) ++ ++struct msm_bus_noc_commit { ++ struct msm_bus_node_hw_info *mas; ++ struct msm_bus_node_hw_info *slv; ++}; ++ ++struct msm_bus_noc_info { ++ void __iomem *base; ++ uint32_t base_addr; ++ uint32_t nmasters; ++ uint32_t nqos_masters; ++ uint32_t nslaves; ++ uint32_t qos_freq; /* QOS Clock in KHz */ ++ uint32_t qos_baseoffset; ++ uint32_t qos_delta; ++ uint32_t *mas_modes; ++ struct msm_bus_noc_commit cdata[NUM_CTX]; ++}; ++ ++struct msm_bus_noc_qos_priority { ++ uint32_t high_prio; ++ uint32_t low_prio; ++ uint32_t read_prio; ++ uint32_t write_prio; ++ uint32_t p1; ++ uint32_t p0; ++}; ++ ++struct msm_bus_noc_qos_bw { ++ uint64_t bw; /* Bandwidth in bytes per second */ ++ uint32_t ws; /* Window size in nano seconds */ ++}; ++ ++void msm_bus_noc_init(struct msm_bus_noc_info *ninfo); ++uint8_t msm_bus_noc_get_qos_mode(void __iomem *base, uint32_t qos_off, ++ uint32_t mport, uint32_t qos_delta, uint32_t mode, uint32_t perm_mode); ++void msm_bus_noc_get_qos_priority(void __iomem *base, uint32_t qos_off, ++ uint32_t mport, uint32_t qos_delta, ++ struct msm_bus_noc_qos_priority *qprio); ++void msm_bus_noc_get_qos_bw(void __iomem *base, uint32_t qos_off, ++ uint32_t qos_freq, uint32_t mport, uint32_t qos_delta, ++ uint8_t perm_mode, struct msm_bus_noc_qos_bw *qbw); ++#endif /*_ARCH_ARM_MACH_MSM_BUS_NOC_H */ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_of.c +@@ -0,0 +1,705 @@ ++/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include "msm-bus.h" ++#include "msm-bus-board.h" ++#include "msm_bus_core.h" ++ ++static const char * const hw_sel_name[] = {"RPM", "NoC", "BIMC", NULL}; ++static const char * const mode_sel_name[] = {"Fixed", "Limiter", "Bypass", ++ "Regulator", NULL}; ++ ++static int get_num(const char *const str[], const char *name) ++{ ++ int i = 0; ++ ++ do { ++ if (!strcmp(name, str[i])) ++ return i; ++ ++ i++; ++ } while (str[i] != NULL); ++ ++ pr_err("Error: string %s not found\n", name); ++ return -EINVAL; ++} ++ ++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) ++static struct msm_bus_scale_pdata *get_pdata(struct platform_device *pdev, ++ struct device_node *of_node) ++{ ++ struct msm_bus_scale_pdata *pdata = NULL; ++ struct msm_bus_paths *usecase = NULL; ++ int i = 0, j, ret, num_usecases = 0, num_paths, len; ++ const uint32_t *vec_arr = NULL; ++ bool mem_err = false; ++ ++ if (!pdev) { ++ pr_err("Error: Null Platform device\n"); ++ return NULL; ++ } ++ ++ pdata = devm_kzalloc(&pdev->dev, sizeof(struct msm_bus_scale_pdata), ++ GFP_KERNEL); ++ if (!pdata) { ++ pr_err("Error: Memory allocation for pdata failed\n"); ++ mem_err = true; ++ goto err; ++ } ++ ++ ret = of_property_read_string(of_node, "qcom,msm-bus,name", ++ &pdata->name); ++ if (ret) { ++ pr_err("Error: Client name not found\n"); ++ goto err; ++ } ++ ++ ret = of_property_read_u32(of_node, "qcom,msm-bus,num-cases", ++ &num_usecases); ++ if (ret) { ++ pr_err("Error: num-usecases not found\n"); ++ goto err; ++ } ++ ++ pdata->num_usecases = num_usecases; ++ ++ if (of_property_read_bool(of_node, "qcom,msm-bus,active-only")) ++ pdata->active_only = 1; ++ else { ++ pr_debug("active_only flag absent.\n"); ++ pr_debug("Using dual context by default\n"); ++ } ++ ++ usecase = devm_kzalloc(&pdev->dev, (sizeof(struct msm_bus_paths) * ++ pdata->num_usecases), GFP_KERNEL); ++ if (!usecase) { ++ pr_err("Error: Memory allocation for paths failed\n"); ++ mem_err = true; ++ goto err; ++ } ++ ++ ret = of_property_read_u32(of_node, "qcom,msm-bus,num-paths", ++ &num_paths); ++ if (ret) { ++ pr_err("Error: num_paths not found\n"); ++ goto err; ++ } ++ ++ vec_arr = of_get_property(of_node, "qcom,msm-bus,vectors-KBps", &len); ++ if (vec_arr == NULL) { ++ pr_err("Error: Vector array not found\n"); ++ goto err; ++ } ++ ++ if (len != num_usecases * num_paths * sizeof(uint32_t) * 4) { ++ pr_err("Error: Length-error on getting vectors\n"); ++ goto err; ++ } ++ ++ for (i = 0; i < num_usecases; i++) { ++ usecase[i].num_paths = num_paths; ++ usecase[i].vectors = devm_kzalloc(&pdev->dev, num_paths * ++ sizeof(struct msm_bus_vectors), GFP_KERNEL); ++ if (!usecase[i].vectors) { ++ mem_err = true; ++ pr_err("Error: Mem alloc failure in vectors\n"); ++ goto err; ++ } ++ ++ for (j = 0; j < num_paths; j++) { ++ int index = ((i * num_paths) + j) * 4; ++ usecase[i].vectors[j].src = be32_to_cpu(vec_arr[index]); ++ usecase[i].vectors[j].dst = ++ be32_to_cpu(vec_arr[index + 1]); ++ usecase[i].vectors[j].ab = (uint64_t) ++ KBTOB(be32_to_cpu(vec_arr[index + 2])); ++ usecase[i].vectors[j].ib = (uint64_t) ++ KBTOB(be32_to_cpu(vec_arr[index + 3])); ++ } ++ } ++ ++ pdata->usecase = usecase; ++ return pdata; ++err: ++ if (mem_err) { ++ for (; i > 0; i--) ++ kfree(usecase[i-1].vectors); ++ ++ kfree(usecase); ++ kfree(pdata); ++ } ++ ++ return NULL; ++} ++ ++/** ++ * msm_bus_cl_get_pdata() - Generate bus client data from device tree ++ * provided by clients. ++ * ++ * of_node: Device tree node to extract information from ++ * ++ * The function returns a valid pointer to the allocated bus-scale-pdata ++ * if the vectors were correctly read from the client's device node. ++ * Any error in reading or parsing the device node will return NULL ++ * to the caller. ++ */ ++struct msm_bus_scale_pdata *msm_bus_cl_get_pdata(struct platform_device *pdev) ++{ ++ struct device_node *of_node; ++ struct msm_bus_scale_pdata *pdata = NULL; ++ ++ if (!pdev) { ++ pr_err("Error: Null Platform device\n"); ++ return NULL; ++ } ++ ++ of_node = pdev->dev.of_node; ++ pdata = get_pdata(pdev, of_node); ++ if (!pdata) { ++ pr_err("client has to provide missing entry for successful registration\n"); ++ return NULL; ++ } ++ ++ return pdata; ++} ++EXPORT_SYMBOL(msm_bus_cl_get_pdata); ++ ++/** ++ * msm_bus_cl_pdata_from_node() - Generate bus client data from device tree ++ * node provided by clients. This function should be used when a client ++ * driver needs to register multiple bus-clients from a single device-tree ++ * node associated with the platform-device. ++ * ++ * of_node: The subnode containing information about the bus scaling ++ * data ++ * ++ * pdev: Platform device associated with the device-tree node ++ * ++ * The function returns a valid pointer to the allocated bus-scale-pdata ++ * if the vectors were correctly read from the client's device node. ++ * Any error in reading or parsing the device node will return NULL ++ * to the caller. ++ */ ++struct msm_bus_scale_pdata *msm_bus_pdata_from_node( ++ struct platform_device *pdev, struct device_node *of_node) ++{ ++ struct msm_bus_scale_pdata *pdata = NULL; ++ ++ if (!pdev) { ++ pr_err("Error: Null Platform device\n"); ++ return NULL; ++ } ++ ++ if (!of_node) { ++ pr_err("Error: Null of_node passed to bus driver\n"); ++ return NULL; ++ } ++ ++ pdata = get_pdata(pdev, of_node); ++ if (!pdata) { ++ pr_err("client has to provide missing entry for successful registration\n"); ++ return NULL; ++ } ++ ++ return pdata; ++} ++EXPORT_SYMBOL(msm_bus_pdata_from_node); ++ ++/** ++ * msm_bus_cl_clear_pdata() - Clear pdata allocated from device-tree ++ * of_node: Device tree node to extract information from ++ */ ++void msm_bus_cl_clear_pdata(struct msm_bus_scale_pdata *pdata) ++{ ++ int i; ++ ++ for (i = 0; i < pdata->num_usecases; i++) ++ kfree(pdata->usecase[i].vectors); ++ ++ kfree(pdata->usecase); ++ kfree(pdata); ++} ++EXPORT_SYMBOL(msm_bus_cl_clear_pdata); ++#endif ++ ++static int *get_arr(struct platform_device *pdev, ++ const struct device_node *node, const char *prop, ++ int *nports) ++{ ++ int size = 0, ret; ++ int *arr = NULL; ++ ++ if (of_get_property(node, prop, &size)) { ++ *nports = size / sizeof(int); ++ } else { ++ pr_debug("Property %s not available\n", prop); ++ *nports = 0; ++ return NULL; ++ } ++ ++ if (!size) { ++ *nports = 0; ++ return NULL; ++ } ++ ++ arr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(arr)) { ++ pr_err("Error: Failed to alloc mem for %s\n", prop); ++ return NULL; ++ } ++ ++ ret = of_property_read_u32_array(node, prop, (u32 *)arr, *nports); ++ if (ret) { ++ pr_err("Error in reading property: %s\n", prop); ++ goto err; ++ } ++ ++ return arr; ++err: ++ devm_kfree(&pdev->dev, arr); ++ return NULL; ++} ++ ++static u64 *get_th_params(struct platform_device *pdev, ++ const struct device_node *node, const char *prop, ++ int *nports) ++{ ++ int size = 0, ret; ++ u64 *ret_arr = NULL; ++ int *arr = NULL; ++ int i; ++ ++ if (of_get_property(node, prop, &size)) { ++ *nports = size / sizeof(int); ++ } else { ++ pr_debug("Property %s not available\n", prop); ++ *nports = 0; ++ return NULL; ++ } ++ ++ if (!size) { ++ *nports = 0; ++ return NULL; ++ } ++ ++ ret_arr = devm_kzalloc(&pdev->dev, (*nports * sizeof(u64)), ++ GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(ret_arr)) { ++ pr_err("Error: Failed to alloc mem for ret arr %s\n", prop); ++ return NULL; ++ } ++ ++ arr = kzalloc(size, GFP_KERNEL); ++ if ((ZERO_OR_NULL_PTR(arr))) { ++ pr_err("Error: Failed to alloc temp mem for %s\n", prop); ++ return NULL; ++ } ++ ++ ret = of_property_read_u32_array(node, prop, (u32 *)arr, *nports); ++ if (ret) { ++ pr_err("Error in reading property: %s\n", prop); ++ goto err; ++ } ++ ++ for (i = 0; i < *nports; i++) ++ ret_arr[i] = (uint64_t)KBTOB(arr[i]); ++ ++ MSM_BUS_DBG("%s: num entries %d prop %s", __func__, *nports, prop); ++ ++ for (i = 0; i < *nports; i++) ++ MSM_BUS_DBG("Th %d val %llu", i, ret_arr[i]); ++ ++ kfree(arr); ++ return ret_arr; ++err: ++ kfree(arr); ++ devm_kfree(&pdev->dev, ret_arr); ++ return NULL; ++} ++ ++static struct msm_bus_node_info *get_nodes(struct device_node *of_node, ++ struct platform_device *pdev, ++ struct msm_bus_fabric_registration *pdata) ++{ ++ struct msm_bus_node_info *info; ++ struct device_node *child_node = NULL; ++ int i = 0, ret; ++ int num_bw = 0; ++ u32 temp; ++ ++ for_each_child_of_node(of_node, child_node) { ++ i++; ++ } ++ ++ pdata->len = i; ++ info = (struct msm_bus_node_info *) ++ devm_kzalloc(&pdev->dev, sizeof(struct msm_bus_node_info) * ++ pdata->len, GFP_KERNEL); ++ if (ZERO_OR_NULL_PTR(info)) { ++ pr_err("Failed to alloc memory for nodes: %d\n", pdata->len); ++ goto err; ++ } ++ ++ i = 0; ++ child_node = NULL; ++ for_each_child_of_node(of_node, child_node) { ++ const char *sel_str; ++ ++ ret = of_property_read_string(child_node, "label", ++ &info[i].name); ++ if (ret) ++ pr_err("Error reading node label\n"); ++ ++ ret = of_property_read_u32(child_node, "cell-id", &info[i].id); ++ if (ret) { ++ pr_err("Error reading node id\n"); ++ goto err; ++ } ++ ++ if (of_property_read_bool(child_node, "qcom,gateway")) ++ info[i].gateway = 1; ++ ++ of_property_read_u32(child_node, "qcom,mas-hw-id", ++ &info[i].mas_hw_id); ++ ++ of_property_read_u32(child_node, "qcom,slv-hw-id", ++ &info[i].slv_hw_id); ++ info[i].masterp = get_arr(pdev, child_node, ++ "qcom,masterp", &info[i].num_mports); ++ /* No need to store number of qports */ ++ info[i].qport = get_arr(pdev, child_node, ++ "qcom,qport", &ret); ++ pdata->nmasters += info[i].num_mports; ++ ++ ++ info[i].slavep = get_arr(pdev, child_node, ++ "qcom,slavep", &info[i].num_sports); ++ pdata->nslaves += info[i].num_sports; ++ ++ ++ info[i].tier = get_arr(pdev, child_node, ++ "qcom,tier", &info[i].num_tiers); ++ ++ if (of_property_read_bool(child_node, "qcom,ahb")) ++ info[i].ahb = 1; ++ ++ ret = of_property_read_string(child_node, "qcom,hw-sel", ++ &sel_str); ++ if (ret) ++ info[i].hw_sel = 0; ++ else { ++ ret = get_num(hw_sel_name, sel_str); ++ if (ret < 0) { ++ pr_err("Invalid hw-sel\n"); ++ goto err; ++ } ++ ++ info[i].hw_sel = ret; ++ } ++ ++ of_property_read_u32(child_node, "qcom,buswidth", ++ &info[i].buswidth); ++ of_property_read_u32(child_node, "qcom,ws", &info[i].ws); ++ ++ info[i].dual_conf = ++ of_property_read_bool(child_node, "qcom,dual-conf"); ++ ++ ++ info[i].th = get_th_params(pdev, child_node, "qcom,thresh", ++ &info[i].num_thresh); ++ ++ info[i].bimc_bw = get_th_params(pdev, child_node, ++ "qcom,bimc,bw", &num_bw); ++ ++ if (num_bw != info[i].num_thresh) { ++ pr_err("%s:num_bw %d must equal num_thresh %d", ++ __func__, num_bw, info[i].num_thresh); ++ pr_err("%s:Err setting up dual conf for %s", ++ __func__, info[i].name); ++ goto err; ++ } ++ ++ of_property_read_u32(child_node, "qcom,bimc,gp", ++ &info[i].bimc_gp); ++ of_property_read_u32(child_node, "qcom,bimc,thmp", ++ &info[i].bimc_thmp); ++ ++ ret = of_property_read_string(child_node, "qcom,mode-thresh", ++ &sel_str); ++ if (ret) ++ info[i].mode_thresh = 0; ++ else { ++ ret = get_num(mode_sel_name, sel_str); ++ if (ret < 0) { ++ pr_err("Unknown mode :%s\n", sel_str); ++ goto err; ++ } ++ ++ info[i].mode_thresh = ret; ++ MSM_BUS_DBG("AXI: THreshold mode set: %d\n", ++ info[i].mode_thresh); ++ } ++ ++ ret = of_property_read_string(child_node, "qcom,mode", ++ &sel_str); ++ ++ if (ret) ++ info[i].mode = 0; ++ else { ++ ret = get_num(mode_sel_name, sel_str); ++ if (ret < 0) { ++ pr_err("Unknown mode :%s\n", sel_str); ++ goto err; ++ } ++ ++ info[i].mode = ret; ++ } ++ ++ info[i].nr_lim = ++ of_property_read_bool(child_node, "qcom,nr-lim"); ++ ++ ret = of_property_read_u32(child_node, "qcom,ff", ++ &info[i].ff); ++ if (ret) { ++ pr_debug("fudge factor not present %d", info[i].id); ++ info[i].ff = 0; ++ } ++ ++ ret = of_property_read_u32(child_node, "qcom,floor-bw", ++ &temp); ++ if (ret) { ++ pr_debug("fabdev floor bw not present %d", info[i].id); ++ info[i].floor_bw = 0; ++ } else { ++ info[i].floor_bw = KBTOB(temp); ++ } ++ ++ info[i].rt_mas = ++ of_property_read_bool(child_node, "qcom,rt-mas"); ++ ++ ret = of_property_read_string(child_node, "qcom,perm-mode", ++ &sel_str); ++ if (ret) ++ info[i].perm_mode = 0; ++ else { ++ ret = get_num(mode_sel_name, sel_str); ++ if (ret < 0) ++ goto err; ++ ++ info[i].perm_mode = 1 << ret; ++ } ++ ++ of_property_read_u32(child_node, "qcom,prio-lvl", ++ &info[i].prio_lvl); ++ of_property_read_u32(child_node, "qcom,prio-rd", ++ &info[i].prio_rd); ++ of_property_read_u32(child_node, "qcom,prio-wr", ++ &info[i].prio_wr); ++ of_property_read_u32(child_node, "qcom,prio0", &info[i].prio0); ++ of_property_read_u32(child_node, "qcom,prio1", &info[i].prio1); ++ ret = of_property_read_string(child_node, "qcom,slaveclk-dual", ++ &info[i].slaveclk[DUAL_CTX]); ++ if (!ret) ++ pr_debug("Got slaveclk_dual: %s\n", ++ info[i].slaveclk[DUAL_CTX]); ++ else ++ info[i].slaveclk[DUAL_CTX] = NULL; ++ ++ ret = of_property_read_string(child_node, ++ "qcom,slaveclk-active", &info[i].slaveclk[ACTIVE_CTX]); ++ if (!ret) ++ pr_debug("Got slaveclk_active\n"); ++ else ++ info[i].slaveclk[ACTIVE_CTX] = NULL; ++ ++ ret = of_property_read_string(child_node, "qcom,memclk-dual", ++ &info[i].memclk[DUAL_CTX]); ++ if (!ret) ++ pr_debug("Got memclk_dual\n"); ++ else ++ info[i].memclk[DUAL_CTX] = NULL; ++ ++ ret = of_property_read_string(child_node, "qcom,memclk-active", ++ &info[i].memclk[ACTIVE_CTX]); ++ if (!ret) ++ pr_debug("Got memclk_active\n"); ++ else ++ info[i].memclk[ACTIVE_CTX] = NULL; ++ ++ ret = of_property_read_string(child_node, "qcom,iface-clk-node", ++ &info[i].iface_clk_node); ++ if (!ret) ++ pr_debug("Got iface_clk_node\n"); ++ else ++ info[i].iface_clk_node = NULL; ++ ++ pr_debug("Node name: %s\n", info[i].name); ++ of_node_put(child_node); ++ i++; ++ } ++ ++ pr_debug("Bus %d added: %d masters\n", pdata->id, pdata->nmasters); ++ pr_debug("Bus %d added: %d slaves\n", pdata->id, pdata->nslaves); ++ return info; ++err: ++ return NULL; ++} ++ ++void msm_bus_of_get_nfab(struct platform_device *pdev, ++ struct msm_bus_fabric_registration *pdata) ++{ ++ struct device_node *of_node; ++ int ret, nfab = 0; ++ ++ if (!pdev) { ++ pr_err("Error: Null platform device\n"); ++ return; ++ } ++ ++ of_node = pdev->dev.of_node; ++ ret = of_property_read_u32(of_node, "qcom,nfab", ++ &nfab); ++ if (!ret) ++ pr_debug("Fab_of: Read number of buses: %u\n", nfab); ++ ++ msm_bus_board_set_nfab(pdata, nfab); ++} ++ ++struct msm_bus_fabric_registration ++ *msm_bus_of_get_fab_data(struct platform_device *pdev) ++{ ++ struct device_node *of_node; ++ struct msm_bus_fabric_registration *pdata; ++ bool mem_err = false; ++ int ret = 0; ++ const char *sel_str; ++ u32 temp; ++ ++ if (!pdev) { ++ pr_err("Error: Null platform device\n"); ++ return NULL; ++ } ++ ++ of_node = pdev->dev.of_node; ++ pdata = devm_kzalloc(&pdev->dev, ++ sizeof(struct msm_bus_fabric_registration), GFP_KERNEL); ++ if (!pdata) { ++ pr_err("Error: Memory allocation for pdata failed\n"); ++ mem_err = true; ++ goto err; ++ } ++ ++ ret = of_property_read_string(of_node, "label", &pdata->name); ++ if (ret) { ++ pr_err("Error: label not found\n"); ++ goto err; ++ } ++ pr_debug("Fab_of: Read name: %s\n", pdata->name); ++ ++ ret = of_property_read_u32(of_node, "cell-id", ++ &pdata->id); ++ if (ret) { ++ pr_err("Error: num-usecases not found\n"); ++ goto err; ++ } ++ pr_debug("Fab_of: Read id: %u\n", pdata->id); ++ ++ if (of_property_read_bool(of_node, "qcom,ahb")) ++ pdata->ahb = 1; ++ ++ ret = of_property_read_string(of_node, "qcom,fabclk-dual", ++ &pdata->fabclk[DUAL_CTX]); ++ if (ret) { ++ pr_debug("fabclk_dual not available\n"); ++ pdata->fabclk[DUAL_CTX] = NULL; ++ } else ++ pr_debug("Fab_of: Read clk dual ctx: %s\n", ++ pdata->fabclk[DUAL_CTX]); ++ ret = of_property_read_string(of_node, "qcom,fabclk-active", ++ &pdata->fabclk[ACTIVE_CTX]); ++ if (ret) { ++ pr_debug("Error: fabclk_active not available\n"); ++ pdata->fabclk[ACTIVE_CTX] = NULL; ++ } else ++ pr_debug("Fab_of: Read clk act ctx: %s\n", ++ pdata->fabclk[ACTIVE_CTX]); ++ ++ ret = of_property_read_u32(of_node, "qcom,ntieredslaves", ++ &pdata->ntieredslaves); ++ if (ret) { ++ pr_err("Error: ntieredslaves not found\n"); ++ goto err; ++ } ++ ++ ret = of_property_read_u32(of_node, "qcom,qos-freq", &pdata->qos_freq); ++ if (ret) ++ pr_debug("qos_freq not available\n"); ++ ++ ret = of_property_read_string(of_node, "qcom,hw-sel", &sel_str); ++ if (ret) { ++ pr_err("Error: hw_sel not found\n"); ++ goto err; ++ } else { ++ ret = get_num(hw_sel_name, sel_str); ++ if (ret < 0) ++ goto err; ++ ++ pdata->hw_sel = ret; ++ } ++ ++ if (of_property_read_bool(of_node, "qcom,virt")) ++ pdata->virt = true; ++ ++ ret = of_property_read_u32(of_node, "qcom,qos-baseoffset", ++ &pdata->qos_baseoffset); ++ if (ret) ++ pr_debug("%s:qos_baseoffset not available\n", __func__); ++ ++ ret = of_property_read_u32(of_node, "qcom,qos-delta", ++ &pdata->qos_delta); ++ if (ret) ++ pr_debug("%s:qos_delta not available\n", __func__); ++ ++ if (of_property_read_bool(of_node, "qcom,rpm-en")) ++ pdata->rpm_enabled = 1; ++ ++ ret = of_property_read_u32(of_node, "qcom,nr-lim-thresh", ++ &temp); ++ ++ if (ret) { ++ pr_err("nr-lim threshold not specified"); ++ pdata->nr_lim_thresh = 0; ++ } else { ++ pdata->nr_lim_thresh = KBTOB(temp); ++ } ++ ++ ret = of_property_read_u32(of_node, "qcom,eff-fact", ++ &pdata->eff_fact); ++ if (ret) { ++ pr_err("Fab eff-factor not present"); ++ pdata->eff_fact = 0; ++ } ++ ++ pdata->info = get_nodes(of_node, pdev, pdata); ++ return pdata; ++err: ++ return NULL; ++} ++EXPORT_SYMBOL(msm_bus_of_get_fab_data); +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_of_adhoc.c +@@ -0,0 +1,641 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "msm-bus.h" ++#include "msm-bus-board.h" ++#include "msm_bus_rules.h" ++#include "msm_bus_core.h" ++#include "msm_bus_adhoc.h" ++ ++#define DEFAULT_QOS_FREQ 19200 ++#define DEFAULT_UTIL_FACT 100 ++#define DEFAULT_VRAIL_COMP 100 ++ ++static int get_qos_mode(struct platform_device *pdev, ++ struct device_node *node, const char *qos_mode) ++{ ++ const char *qos_names[] = {"fixed", "limiter", "bypass", "regulator"}; ++ int i = 0; ++ int ret = -1; ++ ++ if (!qos_mode) ++ goto exit_get_qos_mode; ++ ++ for (i = 0; i < ARRAY_SIZE(qos_names); i++) { ++ if (!strcmp(qos_mode, qos_names[i])) ++ break; ++ } ++ if (i == ARRAY_SIZE(qos_names)) ++ dev_err(&pdev->dev, "Cannot match mode qos %s using Bypass", ++ qos_mode); ++ else ++ ret = i; ++ ++exit_get_qos_mode: ++ return ret; ++} ++ ++static int *get_arr(struct platform_device *pdev, ++ struct device_node *node, const char *prop, ++ int *nports) ++{ ++ int size = 0, ret; ++ int *arr = NULL; ++ ++ if (of_get_property(node, prop, &size)) { ++ *nports = size / sizeof(int); ++ } else { ++ dev_dbg(&pdev->dev, "Property %s not available\n", prop); ++ *nports = 0; ++ return NULL; ++ } ++ ++ arr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); ++ if ((size > 0) && ZERO_OR_NULL_PTR(arr)) { ++ dev_err(&pdev->dev, "Error: Failed to alloc mem for %s\n", ++ prop); ++ return NULL; ++ } ++ ++ ret = of_property_read_u32_array(node, prop, (u32 *)arr, *nports); ++ if (ret) { ++ dev_err(&pdev->dev, "Error in reading property: %s\n", prop); ++ goto arr_err; ++ } ++ ++ return arr; ++arr_err: ++ devm_kfree(&pdev->dev, arr); ++ return NULL; ++} ++ ++static struct msm_bus_fab_device_type *get_fab_device_info( ++ struct device_node *dev_node, ++ struct platform_device *pdev) ++{ ++ struct msm_bus_fab_device_type *fab_dev; ++ unsigned int ret; ++ struct resource *res; ++ const char *base_name; ++ ++ fab_dev = devm_kzalloc(&pdev->dev, ++ sizeof(struct msm_bus_fab_device_type), ++ GFP_KERNEL); ++ if (!fab_dev) { ++ dev_err(&pdev->dev, ++ "Error: Unable to allocate memory for fab_dev\n"); ++ return NULL; ++ } ++ ++ ret = of_property_read_string(dev_node, "qcom,base-name", &base_name); ++ if (ret) { ++ dev_err(&pdev->dev, "Error: Unable to get base address name\n"); ++ goto fab_dev_err; ++ } ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, base_name); ++ if (!res) { ++ dev_err(&pdev->dev, "Error getting qos base addr %s\n", ++ base_name); ++ goto fab_dev_err; ++ } ++ fab_dev->pqos_base = res->start; ++ fab_dev->qos_range = resource_size(res); ++ fab_dev->bypass_qos_prg = of_property_read_bool(dev_node, ++ "qcom,bypass-qos-prg"); ++ ++ ret = of_property_read_u32(dev_node, "qcom,base-offset", ++ &fab_dev->base_offset); ++ if (ret) ++ dev_dbg(&pdev->dev, "Bus base offset is missing\n"); ++ ++ ret = of_property_read_u32(dev_node, "qcom,qos-off", ++ &fab_dev->qos_off); ++ if (ret) ++ dev_dbg(&pdev->dev, "Bus qos off is missing\n"); ++ ++ ++ ret = of_property_read_u32(dev_node, "qcom,bus-type", ++ &fab_dev->bus_type); ++ if (ret) { ++ dev_warn(&pdev->dev, "Bus type is missing\n"); ++ goto fab_dev_err; ++ } ++ ++ ret = of_property_read_u32(dev_node, "qcom,qos-freq", ++ &fab_dev->qos_freq); ++ if (ret) { ++ dev_dbg(&pdev->dev, "Bus qos freq is missing\n"); ++ fab_dev->qos_freq = DEFAULT_QOS_FREQ; ++ } ++ ++ ret = of_property_read_u32(dev_node, "qcom,util-fact", ++ &fab_dev->util_fact); ++ if (ret) { ++ dev_info(&pdev->dev, "Util-fact is missing, default to %d\n", ++ DEFAULT_UTIL_FACT); ++ fab_dev->util_fact = DEFAULT_UTIL_FACT; ++ } ++ ++ ret = of_property_read_u32(dev_node, "qcom,vrail-comp", ++ &fab_dev->vrail_comp); ++ if (ret) { ++ dev_info(&pdev->dev, "Vrail-comp is missing, default to %d\n", ++ DEFAULT_VRAIL_COMP); ++ fab_dev->vrail_comp = DEFAULT_VRAIL_COMP; ++ } ++ ++ return fab_dev; ++ ++fab_dev_err: ++ devm_kfree(&pdev->dev, fab_dev); ++ fab_dev = 0; ++ return NULL; ++} ++ ++static void get_qos_params( ++ struct device_node * const dev_node, ++ struct platform_device * const pdev, ++ struct msm_bus_node_info_type *node_info) ++{ ++ const char *qos_mode = NULL; ++ unsigned int ret; ++ unsigned int temp; ++ ++ ret = of_property_read_string(dev_node, "qcom,qos-mode", &qos_mode); ++ ++ if (ret) ++ node_info->qos_params.mode = -1; ++ else ++ node_info->qos_params.mode = get_qos_mode(pdev, dev_node, ++ qos_mode); ++ ++ of_property_read_u32(dev_node, "qcom,prio-lvl", ++ &node_info->qos_params.prio_lvl); ++ ++ of_property_read_u32(dev_node, "qcom,prio1", ++ &node_info->qos_params.prio1); ++ ++ of_property_read_u32(dev_node, "qcom,prio0", ++ &node_info->qos_params.prio0); ++ ++ of_property_read_u32(dev_node, "qcom,prio-rd", ++ &node_info->qos_params.prio_rd); ++ ++ of_property_read_u32(dev_node, "qcom,prio-wr", ++ &node_info->qos_params.prio_wr); ++ ++ of_property_read_u32(dev_node, "qcom,gp", ++ &node_info->qos_params.gp); ++ ++ of_property_read_u32(dev_node, "qcom,thmp", ++ &node_info->qos_params.thmp); ++ ++ of_property_read_u32(dev_node, "qcom,ws", ++ &node_info->qos_params.ws); ++ ++ ret = of_property_read_u32(dev_node, "qcom,bw_buffer", &temp); ++ ++ if (ret) ++ node_info->qos_params.bw_buffer = 0; ++ else ++ node_info->qos_params.bw_buffer = KBTOB(temp); ++ ++} ++ ++ ++static struct msm_bus_node_info_type *get_node_info_data( ++ struct device_node * const dev_node, ++ struct platform_device * const pdev) ++{ ++ struct msm_bus_node_info_type *node_info; ++ unsigned int ret; ++ int size; ++ int i; ++ struct device_node *con_node; ++ struct device_node *bus_dev; ++ ++ node_info = devm_kzalloc(&pdev->dev, ++ sizeof(struct msm_bus_node_info_type), ++ GFP_KERNEL); ++ if (!node_info) { ++ dev_err(&pdev->dev, ++ "Error: Unable to allocate memory for node_info\n"); ++ return NULL; ++ } ++ ++ ret = of_property_read_u32(dev_node, "cell-id", &node_info->id); ++ if (ret) { ++ dev_warn(&pdev->dev, "Bus node is missing cell-id\n"); ++ goto node_info_err; ++ } ++ ret = of_property_read_string(dev_node, "label", &node_info->name); ++ if (ret) { ++ dev_warn(&pdev->dev, "Bus node is missing name\n"); ++ goto node_info_err; ++ } ++ node_info->qport = get_arr(pdev, dev_node, "qcom,qport", ++ &node_info->num_qports); ++ ++ if (of_get_property(dev_node, "qcom,connections", &size)) { ++ node_info->num_connections = size / sizeof(int); ++ node_info->connections = devm_kzalloc(&pdev->dev, size, ++ GFP_KERNEL); ++ } else { ++ node_info->num_connections = 0; ++ node_info->connections = 0; ++ } ++ ++ for (i = 0; i < node_info->num_connections; i++) { ++ con_node = of_parse_phandle(dev_node, "qcom,connections", i); ++ if (IS_ERR_OR_NULL(con_node)) ++ goto node_info_err; ++ ++ if (of_property_read_u32(con_node, "cell-id", ++ &node_info->connections[i])) ++ goto node_info_err; ++ of_node_put(con_node); ++ } ++ ++ if (of_get_property(dev_node, "qcom,blacklist", &size)) { ++ node_info->num_blist = size/sizeof(u32); ++ node_info->black_listed_connections = devm_kzalloc(&pdev->dev, ++ size, GFP_KERNEL); ++ } else { ++ node_info->num_blist = 0; ++ node_info->black_listed_connections = 0; ++ } ++ ++ for (i = 0; i < node_info->num_blist; i++) { ++ con_node = of_parse_phandle(dev_node, "qcom,blacklist", i); ++ if (IS_ERR_OR_NULL(con_node)) ++ goto node_info_err; ++ ++ if (of_property_read_u32(con_node, "cell-id", ++ &node_info->black_listed_connections[i])) ++ goto node_info_err; ++ of_node_put(con_node); ++ } ++ ++ bus_dev = of_parse_phandle(dev_node, "qcom,bus-dev", 0); ++ if (!IS_ERR_OR_NULL(bus_dev)) { ++ if (of_property_read_u32(bus_dev, "cell-id", ++ &node_info->bus_device_id)) { ++ dev_err(&pdev->dev, "Can't find bus device. Node %d", ++ node_info->id); ++ goto node_info_err; ++ } ++ ++ of_node_put(bus_dev); ++ } else ++ dev_dbg(&pdev->dev, "Can't find bdev phandle for %d", ++ node_info->id); ++ ++ node_info->is_fab_dev = of_property_read_bool(dev_node, "qcom,fab-dev"); ++ node_info->virt_dev = of_property_read_bool(dev_node, "qcom,virt-dev"); ++ ++ ret = of_property_read_u32(dev_node, "qcom,buswidth", ++ &node_info->buswidth); ++ if (ret) { ++ dev_dbg(&pdev->dev, "Using default 8 bytes %d", node_info->id); ++ node_info->buswidth = 8; ++ } ++ ++ ret = of_property_read_u32(dev_node, "qcom,mas-rpm-id", ++ &node_info->mas_rpm_id); ++ if (ret) { ++ dev_dbg(&pdev->dev, "mas rpm id is missing\n"); ++ node_info->mas_rpm_id = -1; ++ } ++ ++ ret = of_property_read_u32(dev_node, "qcom,slv-rpm-id", ++ &node_info->slv_rpm_id); ++ if (ret) { ++ dev_dbg(&pdev->dev, "slv rpm id is missing\n"); ++ node_info->slv_rpm_id = -1; ++ } ++ ret = of_property_read_u32(dev_node, "qcom,util-fact", ++ &node_info->util_fact); ++ if (ret) ++ node_info->util_fact = 0; ++ ret = of_property_read_u32(dev_node, "qcom,vrail-comp", ++ &node_info->vrail_comp); ++ if (ret) ++ node_info->vrail_comp = 0; ++ get_qos_params(dev_node, pdev, node_info); ++ ++ return node_info; ++ ++node_info_err: ++ devm_kfree(&pdev->dev, node_info); ++ node_info = 0; ++ return NULL; ++} ++ ++static unsigned int get_bus_node_device_data( ++ struct device_node * const dev_node, ++ struct platform_device * const pdev, ++ struct msm_bus_node_device_type * const node_device) ++{ ++ node_device->node_info = get_node_info_data(dev_node, pdev); ++ if (IS_ERR_OR_NULL(node_device->node_info)) { ++ dev_err(&pdev->dev, "Error: Node info missing\n"); ++ return -ENODATA; ++ } ++ node_device->ap_owned = of_property_read_bool(dev_node, ++ "qcom,ap-owned"); ++ ++ if (node_device->node_info->is_fab_dev) { ++ dev_dbg(&pdev->dev, "Dev %d\n", node_device->node_info->id); ++ ++ if (!node_device->node_info->virt_dev) { ++ node_device->fabdev = ++ get_fab_device_info(dev_node, pdev); ++ if (IS_ERR_OR_NULL(node_device->fabdev)) { ++ dev_err(&pdev->dev, ++ "Error: Fabric device info missing\n"); ++ devm_kfree(&pdev->dev, node_device->node_info); ++ return -ENODATA; ++ } ++ } ++ node_device->clk[DUAL_CTX].clk = of_clk_get_by_name(dev_node, ++ "bus_clk"); ++ ++ if (IS_ERR_OR_NULL(node_device->clk[DUAL_CTX].clk)) ++ dev_dbg(&pdev->dev, ++ "%s:Failed to get bus clk for bus%d ctx%d", ++ __func__, node_device->node_info->id, ++ DUAL_CTX); ++ ++ node_device->clk[ACTIVE_CTX].clk = of_clk_get_by_name(dev_node, ++ "bus_a_clk"); ++ if (IS_ERR_OR_NULL(node_device->clk[ACTIVE_CTX].clk)) ++ dev_err(&pdev->dev, ++ "Failed to get bus clk for bus%d ctx%d", ++ node_device->node_info->id, ACTIVE_CTX); ++ if (msmbus_coresight_init_adhoc(pdev, dev_node)) ++ dev_warn(&pdev->dev, ++ "Coresight support absent for bus: %d\n", ++ node_device->node_info->id); ++ } else { ++ node_device->qos_clk.clk = of_clk_get_by_name(dev_node, ++ "bus_qos_clk"); ++ ++ if (IS_ERR_OR_NULL(node_device->qos_clk.clk)) ++ dev_dbg(&pdev->dev, ++ "%s:Failed to get bus qos clk for mas%d", ++ __func__, node_device->node_info->id); ++ ++ node_device->clk[DUAL_CTX].clk = of_clk_get_by_name(dev_node, ++ "node_clk"); ++ ++ if (IS_ERR_OR_NULL(node_device->clk[DUAL_CTX].clk)) ++ dev_dbg(&pdev->dev, ++ "%s:Failed to get bus clk for bus%d ctx%d", ++ __func__, node_device->node_info->id, ++ DUAL_CTX); ++ ++ } ++ return 0; ++} ++ ++struct msm_bus_device_node_registration ++ *msm_bus_of_to_pdata(struct platform_device *pdev) ++{ ++ struct device_node *of_node, *child_node; ++ struct msm_bus_device_node_registration *pdata; ++ unsigned int i = 0, j; ++ unsigned int ret; ++ ++ if (!pdev) { ++ pr_err("Error: Null platform device\n"); ++ return NULL; ++ } ++ ++ of_node = pdev->dev.of_node; ++ ++ pdata = devm_kzalloc(&pdev->dev, ++ sizeof(struct msm_bus_device_node_registration), ++ GFP_KERNEL); ++ if (!pdata) { ++ dev_err(&pdev->dev, ++ "Error: Memory allocation for pdata failed\n"); ++ return NULL; ++ } ++ ++ pdata->num_devices = of_get_child_count(of_node); ++ ++ pdata->info = devm_kzalloc(&pdev->dev, ++ sizeof(struct msm_bus_node_device_type) * ++ pdata->num_devices, GFP_KERNEL); ++ ++ if (!pdata->info) { ++ dev_err(&pdev->dev, ++ "Error: Memory allocation for pdata->info failed\n"); ++ goto node_reg_err; ++ } ++ ++ ret = 0; ++ for_each_child_of_node(of_node, child_node) { ++ ret = get_bus_node_device_data(child_node, pdev, ++ &pdata->info[i]); ++ if (ret) { ++ dev_err(&pdev->dev, "Error: unable to initialize bus nodes\n"); ++ goto node_reg_err_1; ++ } ++ i++; ++ } ++ ++ dev_dbg(&pdev->dev, "bus topology:\n"); ++ for (i = 0; i < pdata->num_devices; i++) { ++ dev_dbg(&pdev->dev, "id %d\nnum_qports %d\nnum_connections %d", ++ pdata->info[i].node_info->id, ++ pdata->info[i].node_info->num_qports, ++ pdata->info[i].node_info->num_connections); ++ dev_dbg(&pdev->dev, "\nbus_device_id %d\n buswidth %d\n", ++ pdata->info[i].node_info->bus_device_id, ++ pdata->info[i].node_info->buswidth); ++ for (j = 0; j < pdata->info[i].node_info->num_connections; ++ j++) { ++ dev_dbg(&pdev->dev, "connection[%d]: %d\n", j, ++ pdata->info[i].node_info->connections[j]); ++ } ++ for (j = 0; j < pdata->info[i].node_info->num_blist; ++ j++) { ++ dev_dbg(&pdev->dev, "black_listed_node[%d]: %d\n", j, ++ pdata->info[i].node_info-> ++ black_listed_connections[j]); ++ } ++ if (pdata->info[i].fabdev) ++ dev_dbg(&pdev->dev, "base_addr %zu\nbus_type %d\n", ++ (size_t)pdata->info[i]. ++ fabdev->pqos_base, ++ pdata->info[i].fabdev->bus_type); ++ } ++ return pdata; ++ ++node_reg_err_1: ++ devm_kfree(&pdev->dev, pdata->info); ++node_reg_err: ++ devm_kfree(&pdev->dev, pdata); ++ pdata = NULL; ++ return NULL; ++} ++ ++static int msm_bus_of_get_ids(struct platform_device *pdev, ++ struct device_node *dev_node, int **dev_ids, ++ int *num_ids, char *prop_name) ++{ ++ int ret = 0; ++ int size, i; ++ struct device_node *rule_node; ++ int *ids = NULL; ++ ++ if (of_get_property(dev_node, prop_name, &size)) { ++ *num_ids = size / sizeof(int); ++ ids = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); ++ } else { ++ dev_err(&pdev->dev, "No rule nodes, skipping node"); ++ ret = -ENXIO; ++ goto exit_get_ids; ++ } ++ ++ *dev_ids = ids; ++ for (i = 0; i < *num_ids; i++) { ++ rule_node = of_parse_phandle(dev_node, prop_name, i); ++ if (IS_ERR_OR_NULL(rule_node)) { ++ dev_err(&pdev->dev, "Can't get rule node id"); ++ ret = -ENXIO; ++ goto err_get_ids; ++ } ++ ++ if (of_property_read_u32(rule_node, "cell-id", ++ &ids[i])) { ++ dev_err(&pdev->dev, "Can't get rule node id"); ++ ret = -ENXIO; ++ goto err_get_ids; ++ } ++ of_node_put(rule_node); ++ } ++exit_get_ids: ++ return ret; ++err_get_ids: ++ devm_kfree(&pdev->dev, ids); ++ of_node_put(rule_node); ++ ids = NULL; ++ return ret; ++} ++ ++int msm_bus_of_get_static_rules(struct platform_device *pdev, ++ struct bus_rule_type **static_rules) ++{ ++ int ret = 0; ++ struct device_node *of_node, *child_node; ++ int num_rules = 0; ++ int rule_idx = 0; ++ int bw_fld = 0; ++ int i; ++ struct bus_rule_type *static_rule = NULL; ++ ++ of_node = pdev->dev.of_node; ++ num_rules = of_get_child_count(of_node); ++ static_rule = devm_kzalloc(&pdev->dev, ++ sizeof(struct bus_rule_type) * num_rules, ++ GFP_KERNEL); ++ ++ if (IS_ERR_OR_NULL(static_rule)) { ++ ret = -ENOMEM; ++ goto exit_static_rules; ++ } ++ ++ *static_rules = static_rule; ++ for_each_child_of_node(of_node, child_node) { ++ ret = msm_bus_of_get_ids(pdev, child_node, ++ &static_rule[rule_idx].src_id, ++ &static_rule[rule_idx].num_src, ++ "qcom,src-nodes"); ++ ++ ret = msm_bus_of_get_ids(pdev, child_node, ++ &static_rule[rule_idx].dst_node, ++ &static_rule[rule_idx].num_dst, ++ "qcom,dest-node"); ++ ++ ret = of_property_read_u32(child_node, "qcom,src-field", ++ &static_rule[rule_idx].src_field); ++ if (ret) { ++ dev_err(&pdev->dev, "src-field missing"); ++ ret = -ENXIO; ++ goto err_static_rules; ++ } ++ ++ ret = of_property_read_u32(child_node, "qcom,src-op", ++ &static_rule[rule_idx].op); ++ if (ret) { ++ dev_err(&pdev->dev, "src-op missing"); ++ ret = -ENXIO; ++ goto err_static_rules; ++ } ++ ++ ret = of_property_read_u32(child_node, "qcom,mode", ++ &static_rule[rule_idx].mode); ++ if (ret) { ++ dev_err(&pdev->dev, "mode missing"); ++ ret = -ENXIO; ++ goto err_static_rules; ++ } ++ ++ ret = of_property_read_u32(child_node, "qcom,thresh", &bw_fld); ++ if (ret) { ++ dev_err(&pdev->dev, "thresh missing"); ++ ret = -ENXIO; ++ goto err_static_rules; ++ } else ++ static_rule[rule_idx].thresh = KBTOB(bw_fld); ++ ++ ret = of_property_read_u32(child_node, "qcom,dest-bw", ++ &bw_fld); ++ if (ret) ++ static_rule[rule_idx].dst_bw = 0; ++ else ++ static_rule[rule_idx].dst_bw = KBTOB(bw_fld); ++ ++ rule_idx++; ++ } ++ ret = rule_idx; ++exit_static_rules: ++ return ret; ++err_static_rules: ++ for (i = 0; i < num_rules; i++) { ++ if (!IS_ERR_OR_NULL(static_rule)) { ++ if (!IS_ERR_OR_NULL(static_rule[i].src_id)) ++ devm_kfree(&pdev->dev, ++ static_rule[i].src_id); ++ if (!IS_ERR_OR_NULL(static_rule[i].dst_node)) ++ devm_kfree(&pdev->dev, ++ static_rule[i].dst_node); ++ devm_kfree(&pdev->dev, static_rule); ++ } ++ } ++ devm_kfree(&pdev->dev, *static_rules); ++ static_rules = NULL; ++ return ret; ++} +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_rules.c +@@ -0,0 +1,624 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include "msm-bus-board.h" ++#include "msm_bus_rules.h" ++#include ++ ++struct node_vote_info { ++ int id; ++ u64 ib; ++ u64 ab; ++ u64 clk; ++}; ++ ++struct rules_def { ++ int rule_id; ++ int num_src; ++ int state; ++ struct node_vote_info *src_info; ++ struct bus_rule_type rule_ops; ++ bool state_change; ++ struct list_head link; ++}; ++ ++struct rule_node_info { ++ int id; ++ void *data; ++ struct raw_notifier_head rule_notify_list; ++ int cur_rule; ++ int num_rules; ++ struct list_head node_rules; ++ struct list_head link; ++ struct rule_apply_rcm_info apply; ++}; ++ ++DEFINE_MUTEX(msm_bus_rules_lock); ++static LIST_HEAD(node_list); ++static struct rule_node_info *get_node(u32 id, void *data); ++ ++#define LE(op1, op2) (op1 <= op2) ++#define LT(op1, op2) (op1 < op2) ++#define GE(op1, op2) (op1 >= op2) ++#define GT(op1, op2) (op1 > op2) ++#define NB_ID (0x201) ++ ++static struct rule_node_info *get_node(u32 id, void *data) ++{ ++ struct rule_node_info *node_it = NULL; ++ struct rule_node_info *node_match = NULL; ++ ++ list_for_each_entry(node_it, &node_list, link) { ++ if (node_it->id == id) { ++ if ((id == NB_ID)) { ++ if ((node_it->data == data)) { ++ node_match = node_it; ++ break; ++ } ++ } else { ++ node_match = node_it; ++ break; ++ } ++ } ++ } ++ return node_match; ++} ++ ++static struct rule_node_info *gen_node(u32 id, void *data) ++{ ++ struct rule_node_info *node_it = NULL; ++ struct rule_node_info *node_match = NULL; ++ ++ list_for_each_entry(node_it, &node_list, link) { ++ if (node_it->id == id) { ++ node_match = node_it; ++ break; ++ } ++ } ++ ++ if (!node_match) { ++ node_match = kzalloc(sizeof(struct rule_node_info), GFP_KERNEL); ++ if (!node_match) { ++ pr_err("%s: Cannot allocate memory", __func__); ++ goto exit_node_match; ++ } ++ ++ node_match->id = id; ++ node_match->cur_rule = -1; ++ node_match->num_rules = 0; ++ node_match->data = data; ++ list_add_tail(&node_match->link, &node_list); ++ INIT_LIST_HEAD(&node_match->node_rules); ++ RAW_INIT_NOTIFIER_HEAD(&node_match->rule_notify_list); ++ pr_debug("Added new node %d to list\n", id); ++ } ++exit_node_match: ++ return node_match; ++} ++ ++static bool do_compare_op(u64 op1, u64 op2, int op) ++{ ++ bool ret = false; ++ ++ switch (op) { ++ case OP_LE: ++ ret = LE(op1, op2); ++ break; ++ case OP_LT: ++ ret = LT(op1, op2); ++ break; ++ case OP_GT: ++ ret = GT(op1, op2); ++ break; ++ case OP_GE: ++ ret = GE(op1, op2); ++ break; ++ case OP_NOOP: ++ ret = true; ++ break; ++ default: ++ pr_info("Invalid OP %d", op); ++ break; ++ } ++ return ret; ++} ++ ++static void update_src_id_vote(struct rule_update_path_info *inp_node, ++ struct rule_node_info *rule_node) ++{ ++ struct rules_def *rule; ++ int i; ++ ++ list_for_each_entry(rule, &rule_node->node_rules, link) { ++ for (i = 0; i < rule->num_src; i++) { ++ if (rule->src_info[i].id == inp_node->id) { ++ rule->src_info[i].ib = inp_node->ib; ++ rule->src_info[i].ab = inp_node->ab; ++ rule->src_info[i].clk = inp_node->clk; ++ } ++ } ++ } ++} ++ ++static u64 get_field(struct rules_def *rule, int src_id) ++{ ++ u64 field = 0; ++ int i; ++ ++ for (i = 0; i < rule->num_src; i++) { ++ switch (rule->rule_ops.src_field) { ++ case FLD_IB: ++ field += rule->src_info[i].ib; ++ break; ++ case FLD_AB: ++ field += rule->src_info[i].ab; ++ break; ++ case FLD_CLK: ++ field += rule->src_info[i].clk; ++ break; ++ } ++ } ++ ++ return field; ++} ++ ++static bool check_rule(struct rules_def *rule, ++ struct rule_update_path_info *inp) ++{ ++ bool ret = false; ++ ++ if (!rule) ++ return ret; ++ ++ switch (rule->rule_ops.op) { ++ case OP_LE: ++ case OP_LT: ++ case OP_GT: ++ case OP_GE: ++ { ++ u64 src_field = get_field(rule, inp->id); ++ if (!src_field) ++ ret = false; ++ else ++ ret = do_compare_op(src_field, rule->rule_ops.thresh, ++ rule->rule_ops.op); ++ break; ++ } ++ default: ++ pr_err("Unsupported op %d", rule->rule_ops.op); ++ break; ++ } ++ return ret; ++} ++ ++static void match_rule(struct rule_update_path_info *inp_node, ++ struct rule_node_info *node) ++{ ++ struct rules_def *rule; ++ int i; ++ ++ list_for_each_entry(rule, &node->node_rules, link) { ++ for (i = 0; i < rule->num_src; i++) { ++ if (rule->src_info[i].id == inp_node->id) { ++ if (check_rule(rule, inp_node)) { ++ trace_bus_rules_matches(node->cur_rule, ++ inp_node->id, inp_node->ab, ++ inp_node->ib, inp_node->clk); ++ if (rule->state == ++ RULE_STATE_NOT_APPLIED) ++ rule->state_change = true; ++ rule->state = RULE_STATE_APPLIED; ++ } else { ++ if (rule->state == ++ RULE_STATE_APPLIED) ++ rule->state_change = true; ++ rule->state = RULE_STATE_NOT_APPLIED; ++ } ++ } ++ } ++ } ++} ++ ++static void apply_rule(struct rule_node_info *node, ++ struct list_head *output_list) ++{ ++ struct rules_def *rule; ++ ++ node->cur_rule = -1; ++ list_for_each_entry(rule, &node->node_rules, link) { ++ if ((rule->state == RULE_STATE_APPLIED) && ++ (node->cur_rule == -1)) ++ node->cur_rule = rule->rule_id; ++ ++ if (node->id == NB_ID) { ++ if (rule->state_change) { ++ rule->state_change = false; ++ raw_notifier_call_chain(&node->rule_notify_list, ++ rule->state, (void *)&rule->rule_ops); ++ } ++ } else { ++ if ((rule->state == RULE_STATE_APPLIED) && ++ (node->cur_rule == rule->rule_id)) { ++ node->apply.id = rule->rule_ops.dst_node[0]; ++ node->apply.throttle = rule->rule_ops.mode; ++ node->apply.lim_bw = rule->rule_ops.dst_bw; ++ list_add_tail(&node->apply.link, output_list); ++ } ++ rule->state_change = false; ++ } ++ } ++ ++} ++ ++int msm_rules_update_path(struct list_head *input_list, ++ struct list_head *output_list) ++{ ++ int ret = 0; ++ struct rule_update_path_info *inp_node; ++ struct rule_node_info *node_it = NULL; ++ ++ mutex_lock(&msm_bus_rules_lock); ++ list_for_each_entry(inp_node, input_list, link) { ++ list_for_each_entry(node_it, &node_list, link) { ++ update_src_id_vote(inp_node, node_it); ++ match_rule(inp_node, node_it); ++ } ++ } ++ ++ list_for_each_entry(node_it, &node_list, link) ++ apply_rule(node_it, output_list); ++ ++ mutex_unlock(&msm_bus_rules_lock); ++ return ret; ++} ++ ++static bool ops_equal(int op1, int op2) ++{ ++ bool ret = false; ++ ++ switch (op1) { ++ case OP_GT: ++ case OP_GE: ++ case OP_LT: ++ case OP_LE: ++ if (abs(op1 - op2) <= 1) ++ ret = true; ++ break; ++ default: ++ ret = (op1 == op2); ++ } ++ ++ return ret; ++} ++ ++static int node_rules_compare(void *priv, struct list_head *a, ++ struct list_head *b) ++{ ++ struct rules_def *ra = container_of(a, struct rules_def, link); ++ struct rules_def *rb = container_of(b, struct rules_def, link); ++ int ret = -1; ++ int64_t th_diff = 0; ++ ++ ++ if (ra->rule_ops.mode == rb->rule_ops.mode) { ++ if (ops_equal(ra->rule_ops.op, rb->rule_ops.op)) { ++ if ((ra->rule_ops.op == OP_LT) || ++ (ra->rule_ops.op == OP_LE)) { ++ th_diff = ra->rule_ops.thresh - ++ rb->rule_ops.thresh; ++ if (th_diff > 0) ++ ret = 1; ++ else ++ ret = -1; ++ } else if ((ra->rule_ops.op == OP_GT) || ++ (ra->rule_ops.op == OP_GE)) { ++ th_diff = rb->rule_ops.thresh - ++ ra->rule_ops.thresh; ++ if (th_diff > 0) ++ ret = 1; ++ else ++ ret = -1; ++ } ++ } else ++ ret = ra->rule_ops.op - rb->rule_ops.op; ++ } else if ((ra->rule_ops.mode == THROTTLE_OFF) && ++ (rb->rule_ops.mode == THROTTLE_ON)) { ++ ret = 1; ++ } else if ((ra->rule_ops.mode == THROTTLE_ON) && ++ (rb->rule_ops.mode == THROTTLE_OFF)) { ++ ret = -1; ++ } ++ ++ return ret; ++} ++ ++static void print_rules(struct rule_node_info *node_it) ++{ ++ struct rules_def *node_rule = NULL; ++ int i; ++ ++ if (!node_it) { ++ pr_err("%s: no node for found", __func__); ++ return; ++ } ++ ++ pr_info("\n Now printing rules for Node %d cur rule %d\n", ++ node_it->id, node_it->cur_rule); ++ list_for_each_entry(node_rule, &node_it->node_rules, link) { ++ pr_info("\n num Rules %d rule Id %d\n", ++ node_it->num_rules, node_rule->rule_id); ++ pr_info("Rule: src_field %d\n", node_rule->rule_ops.src_field); ++ for (i = 0; i < node_rule->rule_ops.num_src; i++) ++ pr_info("Rule: src %d\n", ++ node_rule->rule_ops.src_id[i]); ++ for (i = 0; i < node_rule->rule_ops.num_dst; i++) ++ pr_info("Rule: dst %d dst_bw %llu\n", ++ node_rule->rule_ops.dst_node[i], ++ node_rule->rule_ops.dst_bw); ++ pr_info("Rule: thresh %llu op %d mode %d State %d\n", ++ node_rule->rule_ops.thresh, ++ node_rule->rule_ops.op, ++ node_rule->rule_ops.mode, ++ node_rule->state); ++ } ++} ++ ++void print_all_rules(void) ++{ ++ struct rule_node_info *node_it = NULL; ++ ++ list_for_each_entry(node_it, &node_list, link) ++ print_rules(node_it); ++} ++ ++void print_rules_buf(char *buf, int max_buf) ++{ ++ struct rule_node_info *node_it = NULL; ++ struct rules_def *node_rule = NULL; ++ int i; ++ int cnt = 0; ++ ++ list_for_each_entry(node_it, &node_list, link) { ++ cnt += scnprintf(buf + cnt, max_buf - cnt, ++ "\n Now printing rules for Node %d cur_rule %d\n", ++ node_it->id, node_it->cur_rule); ++ list_for_each_entry(node_rule, &node_it->node_rules, link) { ++ cnt += scnprintf(buf + cnt, max_buf - cnt, ++ "\nNum Rules:%d ruleId %d STATE:%d change:%d\n", ++ node_it->num_rules, node_rule->rule_id, ++ node_rule->state, node_rule->state_change); ++ cnt += scnprintf(buf + cnt, max_buf - cnt, ++ "Src_field %d\n", ++ node_rule->rule_ops.src_field); ++ for (i = 0; i < node_rule->rule_ops.num_src; i++) ++ cnt += scnprintf(buf + cnt, max_buf - cnt, ++ "Src %d Cur Ib %llu Ab %llu\n", ++ node_rule->rule_ops.src_id[i], ++ node_rule->src_info[i].ib, ++ node_rule->src_info[i].ab); ++ for (i = 0; i < node_rule->rule_ops.num_dst; i++) ++ cnt += scnprintf(buf + cnt, max_buf - cnt, ++ "Dst %d dst_bw %llu\n", ++ node_rule->rule_ops.dst_node[0], ++ node_rule->rule_ops.dst_bw); ++ cnt += scnprintf(buf + cnt, max_buf - cnt, ++ "Thresh %llu op %d mode %d\n", ++ node_rule->rule_ops.thresh, ++ node_rule->rule_ops.op, ++ node_rule->rule_ops.mode); ++ } ++ } ++} ++ ++static int copy_rule(struct bus_rule_type *src, struct rules_def *node_rule, ++ struct notifier_block *nb) ++{ ++ int i; ++ int ret = 0; ++ ++ memcpy(&node_rule->rule_ops, src, ++ sizeof(struct bus_rule_type)); ++ node_rule->rule_ops.src_id = kzalloc( ++ (sizeof(int) * node_rule->rule_ops.num_src), ++ GFP_KERNEL); ++ if (!node_rule->rule_ops.src_id) { ++ pr_err("%s:Failed to allocate for src_id", ++ __func__); ++ return -ENOMEM; ++ } ++ memcpy(node_rule->rule_ops.src_id, src->src_id, ++ sizeof(int) * src->num_src); ++ ++ ++ if (!nb) { ++ node_rule->rule_ops.dst_node = kzalloc( ++ (sizeof(int) * node_rule->rule_ops.num_dst), ++ GFP_KERNEL); ++ if (!node_rule->rule_ops.dst_node) { ++ pr_err("%s:Failed to allocate for src_id", ++ __func__); ++ return -ENOMEM; ++ } ++ memcpy(node_rule->rule_ops.dst_node, src->dst_node, ++ sizeof(int) * src->num_dst); ++ } ++ ++ node_rule->num_src = src->num_src; ++ node_rule->src_info = kzalloc( ++ (sizeof(struct node_vote_info) * node_rule->rule_ops.num_src), ++ GFP_KERNEL); ++ if (!node_rule->src_info) { ++ pr_err("%s:Failed to allocate for src_id", ++ __func__); ++ return -ENOMEM; ++ } ++ for (i = 0; i < src->num_src; i++) ++ node_rule->src_info[i].id = src->src_id[i]; ++ ++ return ret; ++} ++ ++void msm_rule_register(int num_rules, struct bus_rule_type *rule, ++ struct notifier_block *nb) ++{ ++ struct rule_node_info *node = NULL; ++ int i, j; ++ struct rules_def *node_rule = NULL; ++ int num_dst = 0; ++ ++ if (!rule) ++ return; ++ ++ mutex_lock(&msm_bus_rules_lock); ++ for (i = 0; i < num_rules; i++) { ++ if (nb) ++ num_dst = 1; ++ else ++ num_dst = rule[i].num_dst; ++ ++ for (j = 0; j < num_dst; j++) { ++ int id = 0; ++ ++ if (nb) ++ id = NB_ID; ++ else ++ id = rule[i].dst_node[j]; ++ ++ node = gen_node(id, nb); ++ if (!node) { ++ pr_info("Error getting rule"); ++ goto exit_rule_register; ++ } ++ node_rule = kzalloc(sizeof(struct rules_def), ++ GFP_KERNEL); ++ if (!node_rule) { ++ pr_err("%s: Failed to allocate for rule", ++ __func__); ++ goto exit_rule_register; ++ } ++ ++ if (copy_rule(&rule[i], node_rule, nb)) { ++ pr_err("Error copying rule"); ++ goto exit_rule_register; ++ } ++ ++ node_rule->rule_id = node->num_rules++; ++ if (nb) ++ node->data = nb; ++ ++ list_add_tail(&node_rule->link, &node->node_rules); ++ } ++ } ++ list_sort(NULL, &node->node_rules, node_rules_compare); ++ ++ if (nb) ++ raw_notifier_chain_register(&node->rule_notify_list, nb); ++exit_rule_register: ++ mutex_unlock(&msm_bus_rules_lock); ++ return; ++} ++ ++static int comp_rules(struct bus_rule_type *rulea, struct bus_rule_type *ruleb) ++{ ++ int ret = 1; ++ ++ if (rulea->num_src == ruleb->num_src) ++ ret = memcmp(rulea->src_id, ruleb->src_id, ++ (sizeof(int) * rulea->num_src)); ++ if (!ret && (rulea->num_dst == ruleb->num_dst)) ++ ret = memcmp(rulea->dst_node, ruleb->dst_node, ++ (sizeof(int) * rulea->num_dst)); ++ if (!ret && (rulea->dst_bw == ruleb->dst_bw) && ++ (rulea->op == ruleb->op) && (rulea->thresh == ruleb->thresh)) ++ ret = 0; ++ ++ return ret; ++} ++ ++void msm_rule_unregister(int num_rules, struct bus_rule_type *rule, ++ struct notifier_block *nb) ++{ ++ int i; ++ struct rule_node_info *node = NULL; ++ struct rule_node_info *node_tmp = NULL; ++ struct rules_def *node_rule; ++ struct rules_def *node_rule_tmp; ++ bool match_found = false; ++ ++ if (!rule) ++ return; ++ ++ mutex_lock(&msm_bus_rules_lock); ++ if (nb) { ++ node = get_node(NB_ID, nb); ++ if (!node) { ++ pr_err("%s: Can't find node", __func__); ++ goto exit_unregister_rule; ++ } ++ ++ list_for_each_entry_safe(node_rule, node_rule_tmp, ++ &node->node_rules, link) { ++ list_del(&node_rule->link); ++ kfree(node_rule); ++ node->num_rules--; ++ } ++ raw_notifier_chain_unregister(&node->rule_notify_list, nb); ++ } else { ++ for (i = 0; i < num_rules; i++) { ++ match_found = false; ++ ++ list_for_each_entry(node, &node_list, link) { ++ list_for_each_entry_safe(node_rule, ++ node_rule_tmp, &node->node_rules, link) { ++ if (comp_rules(&node_rule->rule_ops, ++ &rule[i]) == 0) { ++ list_del(&node_rule->link); ++ kfree(node_rule); ++ match_found = true; ++ node->num_rules--; ++ list_sort(NULL, ++ &node->node_rules, ++ node_rules_compare); ++ break; ++ } ++ } ++ } ++ } ++ } ++ ++ list_for_each_entry_safe(node, node_tmp, ++ &node_list, link) { ++ if (!node->num_rules) { ++ pr_debug("Deleting Rule node %d", node->id); ++ list_del(&node->link); ++ kfree(node); ++ } ++ } ++exit_unregister_rule: ++ mutex_unlock(&msm_bus_rules_lock); ++} ++ ++bool msm_rule_are_rules_registered(void) ++{ ++ bool ret = false; ++ ++ if (list_empty(&node_list)) ++ ret = false; ++ else ++ ret = true; ++ ++ return ret; ++} ++ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_bus_rules.h +@@ -0,0 +1,77 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef _ARCH_ARM_MACH_MSM_BUS_RULES_H ++#define _ARCH_ARM_MACH_MSM_BUS_RULES_H ++ ++#include ++#include ++#include ++#include ++ ++#define MAX_NODES (5) ++ ++struct rule_update_path_info { ++ u32 id; ++ u64 ab; ++ u64 ib; ++ u64 clk; ++ struct list_head link; ++}; ++ ++struct rule_apply_rcm_info { ++ u32 id; ++ u64 lim_bw; ++ int throttle; ++ bool after_clk_commit; ++ struct list_head link; ++}; ++ ++struct bus_rule_type { ++ int num_src; ++ int *src_id; ++ int src_field; ++ int op; ++ u64 thresh; ++ int num_dst; ++ int *dst_node; ++ u64 dst_bw; ++ int mode; ++ void *client_data; ++}; ++ ++#if (defined(CONFIG_BUS_TOPOLOGY_ADHOC)) ++void msm_rule_register(int num_rules, struct bus_rule_type *rule, ++ struct notifier_block *nb); ++void msm_rule_unregister(int num_rules, struct bus_rule_type *rule, ++ struct notifier_block *nb); ++void print_rules_buf(char *buf, int count); ++bool msm_rule_are_rules_registered(void); ++#else ++static inline void msm_rule_register(int num_rules, struct bus_rule_type *rule, ++ struct notifier_block *nb) ++{ ++} ++static inline void msm_rule_unregister(int num_rules, ++ struct bus_rule_type *rule, ++ struct notifier_block *nb) ++{ ++} ++static inline void print_rules_buf(char *buf, int count) ++{ ++} ++static inline bool msm_rule_are_rules_registered(void) ++{ ++ return false; ++} ++#endif /* defined(CONFIG_BUS_TOPOLOGY_ADHOC) */ ++#endif /* _ARCH_ARM_MACH_MSM_BUS_RULES_H */ +--- /dev/null ++++ b/drivers/bus/msm_bus/msm_buspm_coresight_adhoc.c +@@ -0,0 +1,189 @@ ++/* Copyright (c) 2014 The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct msmbus_coresight_adhoc_clock_drvdata { ++ int id; ++ struct clk *clk; ++ struct list_head list; ++}; ++ ++struct msmbus_coresight_adhoc_drvdata { ++ struct device *dev; ++ struct coresight_device *csdev; ++ struct coresight_desc *desc; ++ struct list_head clocks; ++}; ++ ++static int msmbus_coresight_enable_adhoc(struct coresight_device *csdev) ++{ ++ struct msmbus_coresight_adhoc_clock_drvdata *clk; ++ struct msmbus_coresight_adhoc_drvdata *drvdata = ++ dev_get_drvdata(csdev->dev.parent); ++ long rate; ++ ++ list_for_each_entry(clk, &drvdata->clocks, list) { ++ if (clk->id == csdev->id) { ++ rate = clk_round_rate(clk->clk, 1L); ++ clk_set_rate(clk->clk, rate); ++ return clk_prepare_enable(clk->clk); ++ } ++ } ++ ++ return -ENOENT; ++} ++ ++static void msmbus_coresight_disable_adhoc(struct coresight_device *csdev) ++{ ++ struct msmbus_coresight_adhoc_clock_drvdata *clk; ++ struct msmbus_coresight_adhoc_drvdata *drvdata = ++ dev_get_drvdata(csdev->dev.parent); ++ ++ list_for_each_entry(clk, &drvdata->clocks, list) { ++ if (clk->id == csdev->id) ++ clk_disable_unprepare(clk->clk); ++ } ++} ++ ++static const struct coresight_ops_source msmbus_coresight_adhoc_source_ops = { ++ .enable = msmbus_coresight_enable_adhoc, ++ .disable = msmbus_coresight_disable_adhoc, ++}; ++ ++static const struct coresight_ops msmbus_coresight_cs_ops = { ++ .source_ops = &msmbus_coresight_adhoc_source_ops, ++}; ++ ++void msmbus_coresight_remove_adhoc(struct platform_device *pdev) ++{ ++ struct msmbus_coresight_adhoc_clock_drvdata *clk, *next_clk; ++ struct msmbus_coresight_adhoc_drvdata *drvdata = ++ platform_get_drvdata(pdev); ++ ++ msmbus_coresight_disable_adhoc(drvdata->csdev); ++ coresight_unregister(drvdata->csdev); ++ list_for_each_entry_safe(clk, next_clk, &drvdata->clocks, list) { ++ list_del(&clk->list); ++ devm_kfree(&pdev->dev, clk); ++ } ++ devm_kfree(&pdev->dev, drvdata->desc); ++ devm_kfree(&pdev->dev, drvdata); ++ platform_set_drvdata(pdev, NULL); ++} ++EXPORT_SYMBOL(msmbus_coresight_remove_adhoc); ++ ++static int buspm_of_get_clk_adhoc(struct device_node *of_node, ++ struct msmbus_coresight_adhoc_drvdata *drvdata, int id) ++{ ++ struct msmbus_coresight_adhoc_clock_drvdata *clk; ++ clk = devm_kzalloc(drvdata->dev, sizeof(*clk), GFP_KERNEL); ++ ++ if (!clk) ++ return -ENOMEM; ++ ++ clk->id = id; ++ ++ clk->clk = of_clk_get_by_name(of_node, "bus_clk"); ++ if (IS_ERR(clk->clk)) { ++ pr_err("Error: unable to get clock for coresight node %d\n", ++ id); ++ goto err; ++ } ++ ++ list_add(&clk->list, &drvdata->clocks); ++ return 0; ++ ++err: ++ devm_kfree(drvdata->dev, clk); ++ return -EINVAL; ++} ++ ++int msmbus_coresight_init_adhoc(struct platform_device *pdev, ++ struct device_node *of_node) ++{ ++ int ret; ++ struct device *dev = &pdev->dev; ++ struct coresight_platform_data *pdata; ++ struct msmbus_coresight_adhoc_drvdata *drvdata; ++ struct coresight_desc *desc; ++ ++ pdata = of_get_coresight_platform_data(dev, of_node); ++ if (IS_ERR(pdata)) ++ return PTR_ERR(pdata); ++ ++ drvdata = platform_get_drvdata(pdev); ++ if (IS_ERR_OR_NULL(drvdata)) { ++ drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); ++ if (!drvdata) { ++ pr_err("coresight: Alloc for drvdata failed\n"); ++ return -ENOMEM; ++ } ++ INIT_LIST_HEAD(&drvdata->clocks); ++ drvdata->dev = &pdev->dev; ++ platform_set_drvdata(pdev, drvdata); ++ } ++ ret = buspm_of_get_clk_adhoc(of_node, drvdata, pdata->id); ++ if (ret) { ++ pr_err("Error getting clocks\n"); ++ ret = -ENXIO; ++ goto err1; ++ } ++ ++ desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); ++ if (!desc) { ++ pr_err("coresight: Error allocating memory\n"); ++ ret = -ENOMEM; ++ goto err1; ++ } ++ ++ desc->type = CORESIGHT_DEV_TYPE_SOURCE; ++ desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_BUS; ++ desc->ops = &msmbus_coresight_cs_ops; ++ desc->pdata = pdata; ++ desc->dev = &pdev->dev; ++ desc->owner = THIS_MODULE; ++ drvdata->desc = desc; ++ drvdata->csdev = coresight_register(desc); ++ if (IS_ERR(drvdata->csdev)) { ++ pr_err("coresight: Coresight register failed\n"); ++ ret = PTR_ERR(drvdata->csdev); ++ goto err0; ++ } ++ ++ dev_info(dev, "msmbus_coresight initialized\n"); ++ ++ return 0; ++err0: ++ devm_kfree(dev, desc); ++err1: ++ devm_kfree(dev, drvdata); ++ platform_set_drvdata(pdev, NULL); ++ return ret; ++} ++EXPORT_SYMBOL(msmbus_coresight_init_adhoc); ++ ++MODULE_LICENSE("GPL v2"); ++MODULE_DESCRIPTION("MSM BusPM Adhoc CoreSight Driver"); +--- /dev/null ++++ b/drivers/bus/msm_bus/rpm-smd.h +@@ -0,0 +1,268 @@ ++/* Copyright (c) 2012, 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ ++#ifndef __ARCH_ARM_MACH_MSM_RPM_SMD_H ++#define __ARCH_ARM_MACH_MSM_RPM_SMD_H ++ ++/** ++ * enum msm_rpm_set - RPM enumerations for sleep/active set ++ * %MSM_RPM_CTX_SET_0: Set resource parameters for active mode. ++ * %MSM_RPM_CTX_SET_SLEEP: Set resource parameters for sleep. ++ */ ++enum msm_rpm_set { ++ MSM_RPM_CTX_ACTIVE_SET, ++ MSM_RPM_CTX_SLEEP_SET, ++}; ++ ++struct msm_rpm_request; ++ ++struct msm_rpm_kvp { ++ uint32_t key; ++ uint32_t length; ++ uint8_t *data; ++}; ++#ifdef CONFIG_MSM_RPM_SMD ++/** ++ * msm_rpm_request() - Creates a parent element to identify the ++ * resource on the RPM, that stores the KVPs for different fields modified ++ * for a hardware resource ++ * ++ * @set: if the device is setting the active/sleep set parameter ++ * for the resource ++ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource ++ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type ++ * @num_elements: number of KVPs pairs associated with the resource ++ * ++ * returns pointer to a msm_rpm_request on success, NULL on error ++ */ ++struct msm_rpm_request *msm_rpm_create_request( ++ enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, int num_elements); ++ ++/** ++ * msm_rpm_request_noirq() - Creates a parent element to identify the ++ * resource on the RPM, that stores the KVPs for different fields modified ++ * for a hardware resource. This function is similar to msm_rpm_create_request ++ * except that it has to be called with interrupts masked. ++ * ++ * @set: if the device is setting the active/sleep set parameter ++ * for the resource ++ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource ++ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type ++ * @num_elements: number of KVPs pairs associated with the resource ++ * ++ * returns pointer to a msm_rpm_request on success, NULL on error ++ */ ++struct msm_rpm_request *msm_rpm_create_request_noirq( ++ enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, int num_elements); ++ ++/** ++ * msm_rpm_add_kvp_data() - Adds a Key value pair to a existing RPM resource. ++ * ++ * @handle: RPM resource handle to which the data should be appended ++ * @key: unsigned integer identify the parameter modified ++ * @data: byte array that contains the value corresponding to key. ++ * @size: size of data in bytes. ++ * ++ * returns 0 on success or errno ++ */ ++int msm_rpm_add_kvp_data(struct msm_rpm_request *handle, ++ uint32_t key, const uint8_t *data, int size); ++ ++/** ++ * msm_rpm_add_kvp_data_noirq() - Adds a Key value pair to a existing RPM ++ * resource. This function is similar to msm_rpm_add_kvp_data except that it ++ * has to be called with interrupts masked. ++ * ++ * @handle: RPM resource handle to which the data should be appended ++ * @key: unsigned integer identify the parameter modified ++ * @data: byte array that contains the value corresponding to key. ++ * @size: size of data in bytes. ++ * ++ * returns 0 on success or errno ++ */ ++int msm_rpm_add_kvp_data_noirq(struct msm_rpm_request *handle, ++ uint32_t key, const uint8_t *data, int size); ++ ++/** msm_rpm_free_request() - clean up the RPM request handle created with ++ * msm_rpm_create_request ++ * ++ * @handle: RPM resource handle to be cleared. ++ */ ++ ++void msm_rpm_free_request(struct msm_rpm_request *handle); ++ ++/** ++ * msm_rpm_send_request() - Send the RPM messages using SMD. The function ++ * assigns a message id before sending the data out to the RPM. RPM hardware ++ * uses the message id to acknowledge the messages. ++ * ++ * @handle: pointer to the msm_rpm_request for the resource being modified. ++ * ++ * returns non-zero message id on success and zero on a failed transaction. ++ * The drivers use message id to wait for ACK from RPM. ++ */ ++int msm_rpm_send_request(struct msm_rpm_request *handle); ++ ++/** ++ * msm_rpm_send_request_noirq() - Send the RPM messages using SMD. The ++ * function assigns a message id before sending the data out to the RPM. ++ * RPM hardware uses the message id to acknowledge the messages. This function ++ * is similar to msm_rpm_send_request except that it has to be called with ++ * interrupts masked. ++ * ++ * @handle: pointer to the msm_rpm_request for the resource being modified. ++ * ++ * returns non-zero message id on success and zero on a failed transaction. ++ * The drivers use message id to wait for ACK from RPM. ++ */ ++int msm_rpm_send_request_noirq(struct msm_rpm_request *handle); ++ ++/** ++ * msm_rpm_wait_for_ack() - A blocking call that waits for acknowledgment of ++ * a message from RPM. ++ * ++ * @msg_id: the return from msm_rpm_send_requests ++ * ++ * returns 0 on success or errno ++ */ ++int msm_rpm_wait_for_ack(uint32_t msg_id); ++ ++/** ++ * msm_rpm_wait_for_ack_noirq() - A blocking call that waits for acknowledgment ++ * of a message from RPM. This function is similar to msm_rpm_wait_for_ack ++ * except that it has to be called with interrupts masked. ++ * ++ * @msg_id: the return from msm_rpm_send_request ++ * ++ * returns 0 on success or errno ++ */ ++int msm_rpm_wait_for_ack_noirq(uint32_t msg_id); ++ ++/** ++ * msm_rpm_send_message() -Wrapper function for clients to send data given an ++ * array of key value pairs. ++ * ++ * @set: if the device is setting the active/sleep set parameter ++ * for the resource ++ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource ++ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type ++ * @kvp: array of KVP data. ++ * @nelem: number of KVPs pairs associated with the message. ++ * ++ * returns 0 on success and errno on failure. ++ */ ++int msm_rpm_send_message(enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, struct msm_rpm_kvp *kvp, int nelems); ++ ++/** ++ * msm_rpm_send_message_noirq() -Wrapper function for clients to send data ++ * given an array of key value pairs. This function is similar to the ++ * msm_rpm_send_message() except that it has to be called with interrupts ++ * disabled. Clients should choose the irq version when possible for system ++ * performance. ++ * ++ * @set: if the device is setting the active/sleep set parameter ++ * for the resource ++ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource ++ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type ++ * @kvp: array of KVP data. ++ * @nelem: number of KVPs pairs associated with the message. ++ * ++ * returns 0 on success and errno on failure. ++ */ ++int msm_rpm_send_message_noirq(enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, struct msm_rpm_kvp *kvp, int nelems); ++ ++/** ++ * msm_rpm_driver_init() - Initialization function that registers for a ++ * rpm platform driver. ++ * ++ * returns 0 on success. ++ */ ++int __init msm_rpm_driver_init(void); ++ ++#else ++ ++static inline struct msm_rpm_request *msm_rpm_create_request( ++ enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, int num_elements) ++{ ++ return NULL; ++} ++ ++static inline struct msm_rpm_request *msm_rpm_create_request_noirq( ++ enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, int num_elements) ++{ ++ return NULL; ++ ++} ++static inline uint32_t msm_rpm_add_kvp_data(struct msm_rpm_request *handle, ++ uint32_t key, const uint8_t *data, int count) ++{ ++ return 0; ++} ++static inline uint32_t msm_rpm_add_kvp_data_noirq( ++ struct msm_rpm_request *handle, uint32_t key, ++ const uint8_t *data, int count) ++{ ++ return 0; ++} ++ ++static inline void msm_rpm_free_request(struct msm_rpm_request *handle) ++{ ++ return; ++} ++ ++static inline int msm_rpm_send_request(struct msm_rpm_request *handle) ++{ ++ return 0; ++} ++ ++static inline int msm_rpm_send_request_noirq(struct msm_rpm_request *handle) ++{ ++ return 0; ++ ++} ++ ++static inline int msm_rpm_send_message(enum msm_rpm_set set, uint32_t rsc_type, ++ uint32_t rsc_id, struct msm_rpm_kvp *kvp, int nelems) ++{ ++ return 0; ++} ++ ++static inline int msm_rpm_send_message_noirq(enum msm_rpm_set set, ++ uint32_t rsc_type, uint32_t rsc_id, struct msm_rpm_kvp *kvp, ++ int nelems) ++{ ++ return 0; ++} ++ ++static inline int msm_rpm_wait_for_ack(uint32_t msg_id) ++{ ++ return 0; ++ ++} ++static inline int msm_rpm_wait_for_ack_noirq(uint32_t msg_id) ++{ ++ return 0; ++} ++ ++static inline int __init msm_rpm_driver_init(void) ++{ ++ return 0; ++} ++#endif ++#endif /*__ARCH_ARM_MACH_MSM_RPM_SMD_H*/ +--- /dev/null ++++ b/include/trace/events/trace_msm_bus.h +@@ -0,0 +1,163 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM msm_bus ++ ++#if !defined(_TRACE_MSM_BUS_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_MSM_BUS_H ++ ++#include ++ ++TRACE_EVENT(bus_update_request, ++ ++ TP_PROTO(int sec, int nsec, const char *name, unsigned int index, ++ int src, int dest, unsigned long long ab, ++ unsigned long long ib), ++ ++ TP_ARGS(sec, nsec, name, index, src, dest, ab, ib), ++ ++ TP_STRUCT__entry( ++ __field(int, sec) ++ __field(int, nsec) ++ __string(name, name) ++ __field(u32, index) ++ __field(int, src) ++ __field(int, dest) ++ __field(u64, ab) ++ __field(u64, ib) ++ ), ++ ++ TP_fast_assign( ++ __entry->sec = sec; ++ __entry->nsec = nsec; ++ __assign_str(name, name); ++ __entry->index = index; ++ __entry->src = src; ++ __entry->dest = dest; ++ __entry->ab = ab; ++ __entry->ib = ib; ++ ), ++ ++ TP_printk("time= %d.%d name=%s index=%u src=%d dest=%d ab=%llu ib=%llu", ++ __entry->sec, ++ __entry->nsec, ++ __get_str(name), ++ (unsigned int)__entry->index, ++ __entry->src, ++ __entry->dest, ++ (unsigned long long)__entry->ab, ++ (unsigned long long)__entry->ib) ++); ++ ++TRACE_EVENT(bus_bimc_config_limiter, ++ ++ TP_PROTO(int mas_id, unsigned long long cur_lim_bw), ++ ++ TP_ARGS(mas_id, cur_lim_bw), ++ ++ TP_STRUCT__entry( ++ __field(int, mas_id) ++ __field(u64, cur_lim_bw) ++ ), ++ ++ TP_fast_assign( ++ __entry->mas_id = mas_id; ++ __entry->cur_lim_bw = cur_lim_bw; ++ ), ++ ++ TP_printk("Master=%d cur_lim_bw=%llu", ++ __entry->mas_id, ++ (unsigned long long)__entry->cur_lim_bw) ++); ++ ++TRACE_EVENT(bus_avail_bw, ++ ++ TP_PROTO(unsigned long long cur_bimc_bw, unsigned long long cur_mdp_bw), ++ ++ TP_ARGS(cur_bimc_bw, cur_mdp_bw), ++ ++ TP_STRUCT__entry( ++ __field(u64, cur_bimc_bw) ++ __field(u64, cur_mdp_bw) ++ ), ++ ++ TP_fast_assign( ++ __entry->cur_bimc_bw = cur_bimc_bw; ++ __entry->cur_mdp_bw = cur_mdp_bw; ++ ), ++ ++ TP_printk("cur_bimc_bw = %llu cur_mdp_bw = %llu", ++ (unsigned long long)__entry->cur_bimc_bw, ++ (unsigned long long)__entry->cur_mdp_bw) ++); ++ ++TRACE_EVENT(bus_rules_matches, ++ ++ TP_PROTO(int node_id, int rule_id, unsigned long long node_ab, ++ unsigned long long node_ib, unsigned long long node_clk), ++ ++ TP_ARGS(node_id, rule_id, node_ab, node_ib, node_clk), ++ ++ TP_STRUCT__entry( ++ __field(int, node_id) ++ __field(int, rule_id) ++ __field(u64, node_ab) ++ __field(u64, node_ib) ++ __field(u64, node_clk) ++ ), ++ ++ TP_fast_assign( ++ __entry->node_id = node_id; ++ __entry->rule_id = rule_id; ++ __entry->node_ab = node_ab; ++ __entry->node_ib = node_ib; ++ __entry->node_clk = node_clk; ++ ), ++ ++ TP_printk("Rule match node%d rule%d node-ab%llu:ib%llu:clk%llu", ++ __entry->node_id, __entry->rule_id, ++ (unsigned long long)__entry->node_ab, ++ (unsigned long long)__entry->node_ib, ++ (unsigned long long)__entry->node_clk) ++); ++ ++TRACE_EVENT(bus_bke_params, ++ ++ TP_PROTO(u32 gc, u32 gp, u32 thl, u32 thm, u32 thh), ++ ++ TP_ARGS(gc, gp, thl, thm, thh), ++ ++ TP_STRUCT__entry( ++ __field(u32, gc) ++ __field(u32, gp) ++ __field(u32, thl) ++ __field(u32, thm) ++ __field(u32, thh) ++ ), ++ ++ TP_fast_assign( ++ __entry->gc = gc; ++ __entry->gp = gp; ++ __entry->thl = thl; ++ __entry->thm = thm; ++ __entry->thh = thh; ++ ), ++ ++ TP_printk("BKE Params GC=0x%x GP=0x%x THL=0x%x THM=0x%x THH=0x%x", ++ __entry->gc, __entry->gp, __entry->thl, __entry->thm, ++ __entry->thh) ++); ++ ++#endif ++#define TRACE_INCLUDE_FILE trace_msm_bus ++#include diff --git a/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch new file mode 100644 index 0000000000..59e277c349 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch @@ -0,0 +1,177 @@ +From: Christian Lamparter +Subject: SoC: add qualcomm syscon +--- a/drivers/soc/qcom/Makefile ++++ b/drivers/soc/qcom/Makefile +@@ -9,3 +9,4 @@ obj-$(CONFIG_QCOM_SMEM_STATE) += smem_st + obj-$(CONFIG_QCOM_SMP2P) += smp2p.o + obj-$(CONFIG_QCOM_SMSM) += smsm.o + obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o ++obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o +--- a/drivers/soc/qcom/Kconfig ++++ b/drivers/soc/qcom/Kconfig +@@ -78,6 +78,13 @@ config QCOM_SMSM + Say yes here to support the Qualcomm Shared Memory State Machine. + The state machine is represented by bits in shared memory. + ++config QCOM_TCSR ++ tristate "QCOM Top Control and Status Registers" ++ depends on ARCH_QCOM ++ help ++ Say y here to enable TCSR support. The TCSR provides control ++ functions for various peripherals. ++ + config QCOM_WCNSS_CTRL + tristate "Qualcomm WCNSS control driver" + depends on ARCH_QCOM +--- /dev/null ++++ b/drivers/soc/qcom/qcom_tcsr.c +@@ -0,0 +1,98 @@ ++/* ++ * Copyright (c) 2014, The Linux foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License rev 2 and ++ * only rev 2 as published by the free Software foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or fITNESS fOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define TCSR_USB_PORT_SEL 0xb0 ++#define TCSR_USB_HSPHY_CONFIG 0xC ++ ++#define TCSR_ESS_INTERFACE_SEL_OFFSET 0x0 ++#define TCSR_ESS_INTERFACE_SEL_MASK 0xf ++ ++#define TCSR_WIFI0_GLB_CFG_OFFSET 0x0 ++#define TCSR_WIFI1_GLB_CFG_OFFSET 0x4 ++#define TCSR_PNOC_SNOC_MEMTYPE_M0_M2 0x4 ++ ++static int tcsr_probe(struct platform_device *pdev) ++{ ++ struct resource *res; ++ const struct device_node *node = pdev->dev.of_node; ++ void __iomem *base; ++ u32 val; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ base = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(base)) ++ return PTR_ERR(base); ++ ++ if (!of_property_read_u32(node, "qcom,usb-ctrl-select", &val)) { ++ dev_err(&pdev->dev, "setting usb port select = %d\n", val); ++ writel(val, base + TCSR_USB_PORT_SEL); ++ } ++ ++ if (!of_property_read_u32(node, "qcom,usb-hsphy-mode-select", &val)) { ++ dev_info(&pdev->dev, "setting usb hs phy mode select = %x\n", val); ++ writel(val, base + TCSR_USB_HSPHY_CONFIG); ++ } ++ ++ if (!of_property_read_u32(node, "qcom,ess-interface-select", &val)) { ++ u32 tmp = 0; ++ dev_info(&pdev->dev, "setting ess interface select = %x\n", val); ++ tmp = readl(base + TCSR_ESS_INTERFACE_SEL_OFFSET); ++ tmp = tmp & (~TCSR_ESS_INTERFACE_SEL_MASK); ++ tmp = tmp | (val&TCSR_ESS_INTERFACE_SEL_MASK); ++ writel(tmp, base + TCSR_ESS_INTERFACE_SEL_OFFSET); ++ } ++ ++ if (!of_property_read_u32(node, "qcom,wifi_glb_cfg", &val)) { ++ dev_info(&pdev->dev, "setting wifi_glb_cfg = %x\n", val); ++ writel(val, base + TCSR_WIFI0_GLB_CFG_OFFSET); ++ writel(val, base + TCSR_WIFI1_GLB_CFG_OFFSET); ++ } ++ ++ if (!of_property_read_u32(node, "qcom,wifi_noc_memtype_m0_m2", &val)) { ++ dev_info(&pdev->dev, ++ "setting wifi_noc_memtype_m0_m2 = %x\n", val); ++ writel(val, base + TCSR_PNOC_SNOC_MEMTYPE_M0_M2); ++ } ++ ++ return 0; ++} ++ ++static const struct of_device_id tcsr_dt_match[] = { ++ { .compatible = "qcom,tcsr", }, ++ { }, ++}; ++ ++MODULE_DEVICE_TABLE(of, tcsr_dt_match); ++ ++static struct platform_driver tcsr_driver = { ++ .driver = { ++ .name = "tcsr", ++ .owner = THIS_MODULE, ++ .of_match_table = tcsr_dt_match, ++ }, ++ .probe = tcsr_probe, ++}; ++ ++module_platform_driver(tcsr_driver); ++ ++MODULE_AUTHOR("Andy Gross "); ++MODULE_DESCRIPTION("QCOM TCSR driver"); ++MODULE_LICENSE("GPL v2"); +--- /dev/null ++++ b/include/dt-bindings/soc/qcom,tcsr.h +@@ -0,0 +1,48 @@ ++/* Copyright (c) 2014, The Linux Foundation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++#ifndef __DT_BINDINGS_QCOM_TCSR_H ++#define __DT_BINDINGS_QCOM_TCSR_H ++ ++#define TCSR_USB_SELECT_USB3_P0 0x1 ++#define TCSR_USB_SELECT_USB3_P1 0x2 ++#define TCSR_USB_SELECT_USB3_DUAL 0x3 ++ ++/* IPQ40xx HS PHY Mode Select */ ++#define TCSR_USB_HSPHY_HOST_MODE 0x00E700E7 ++#define TCSR_USB_HSPHY_DEVICE_MODE 0x00C700E7 ++ ++/* IPQ40xx ess interface mode select */ ++#define TCSR_ESS_PSGMII 0 ++#define TCSR_ESS_PSGMII_RGMII5 1 ++#define TCSR_ESS_PSGMII_RMII0 2 ++#define TCSR_ESS_PSGMII_RMII1 4 ++#define TCSR_ESS_PSGMII_RMII0_RMII1 6 ++#define TCSR_ESS_PSGMII_RGMII4 9 ++ ++/* ++ * IPQ40xx WiFi Global Config ++ * Bit 30:AXID_EN ++ * Enable AXI master bus Axid translating to confirm all txn submitted by order ++ * Bit 24: Use locally generated socslv_wxi_bvalid ++ * 1: use locally generate socslv_wxi_bvalid for performance. ++ * 0: use SNOC socslv_wxi_bvalid. ++ */ ++#define TCSR_WIFI_GLB_CFG 0x41000000 ++ ++/* IPQ40xx MEM_TYPE_SEL_M0_M2 Select Bit 26:24 - 2 NORMAL */ ++#define TCSR_WIFI_NOC_MEMTYPE_M0_M2 0x02222222 ++ ++/* TCSR A/B REG */ ++#define IPQ806X_TCSR_REG_A_ADM_CRCI_MUX_SEL 0 ++#define IPQ806X_TCSR_REG_B_ADM_CRCI_MUX_SEL 1 ++ ++#endif From f81e148eb610c3caad3cff392cc014c89c947bea Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 14:06:02 +0100 Subject: [PATCH 024/480] ipq806x: update 4.19 kernel config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These changes are needed in order to migrate old kernel 4.14 config to the upcoming kernel version 4.19. Also add missing configuration options that comes up with this SoC. Signed-off-by: Ansuel Smith [line wrap long commit description, add 4.19 to subject, soc->SoC] Signed-off-by: Petr Štetiar --- target/linux/ipq806x/config-4.19 | 113 ++++++++++++++++++------------- 1 file changed, 67 insertions(+), 46 deletions(-) diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 index 38f5c94507..68de994370 100644 --- a/target/linux/ipq806x/config-4.19 +++ b/target/linux/ipq806x/config-4.19 @@ -1,12 +1,19 @@ CONFIG_ALIGNMENT_TRAP=y -# CONFIG_AMBA_PL08X is not set # CONFIG_APQ_GCC_8084 is not set # CONFIG_APQ_MMCC_8084 is not set CONFIG_AR8216_PHY=y CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_KCOV=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_ARCH_HAS_PHYS_TO_DMA=y +CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y @@ -16,13 +23,12 @@ CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_QCOM=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -58,17 +64,12 @@ CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y -# CONFIG_BINFMT_FLAT is not set +CONFIG_ARM_MODULE_PLTS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_MQ_PCI=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_BOUNCE=y -CONFIG_BUS_TOPOLOGY_ADHOC=y # CONFIG_CACHE_L2X0 is not set CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y CONFIG_CLKSRC_QCOM=y CONFIG_CLONE_BACKWARDS=y CONFIG_COMMON_CLK=y @@ -101,18 +102,23 @@ CONFIG_CPU_HAS_ASID=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y CONFIG_CPU_PABRT_V7=y CONFIG_CPU_PM=y CONFIG_CPU_RMAP=y +CONFIG_CPU_SPECTRE=y CONFIG_CPU_THERMAL=y +CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y CONFIG_CRC16=y # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_SLICEBY8=y +CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y @@ -132,8 +138,7 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_GPIO=y -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_DEBUG_UNCOMPRESS=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y @@ -145,7 +150,6 @@ CONFIG_DT_IDLE_STATES=y # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IPQ806X=y CONFIG_DYNAMIC_DEBUG=y -CONFIG_EARLY_PRINTK=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_ETHERNET_PACKET_MANGLE=y @@ -155,9 +159,11 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_MSI_IRQ=y @@ -165,6 +171,8 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PINCONF=y +CONFIG_GENERIC_PINCTRL_GROUPS=y +CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y @@ -179,27 +187,25 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_BITREVERSE=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_SMCCC=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y @@ -207,6 +213,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y @@ -217,6 +224,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SMP=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_UID16=y @@ -227,7 +235,6 @@ CONFIG_HWMON=y CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y CONFIG_HZ_FIXED=0 CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y @@ -235,7 +242,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_QUP=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_IOMMU_HELPER=y +# CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set CONFIG_IOMMU_SUPPORT=y @@ -253,39 +260,44 @@ CONFIG_KRAITCC=y CONFIG_KRAIT_CLOCKS=y CONFIG_KRAIT_L2_ACCESSORS=y CONFIG_LIBFDT=y -CONFIG_LOCKUP_DETECTOR=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y CONFIG_MDIO_GPIO=y +# CONFIG_MDIO_IPQ8064 is not set # CONFIG_MDM_GCC_9615 is not set # CONFIG_MDM_LCC_9615 is not set -# CONFIG_MFD_MAX77620 is not set +CONFIG_MEMFD_CREATE=y CONFIG_MFD_QCOM_RPM=y # CONFIG_MFD_SPMI_PMIC is not set CONFIG_MFD_SYSCON=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_PCI=y +CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_QCOM_DML=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_MSM=y # CONFIG_MMC_SDHCI_PCI is not set CONFIG_MMC_SDHCI_PLTFM=y # CONFIG_MMC_TIFM_SD is not set CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MSM_BUS_SCALING=y +# CONFIG_MSCC_OCELOT_SWITCH is not set CONFIG_MSM_GCC_8660=y # CONFIG_MSM_GCC_8916 is not set # CONFIG_MSM_GCC_8960 is not set # CONFIG_MSM_GCC_8974 is not set # CONFIG_MSM_GCC_8994 is not set # CONFIG_MSM_GCC_8996 is not set +# CONFIG_MSM_GCC_8998 is not set # CONFIG_MSM_IOMMU is not set # CONFIG_MSM_LCC_8960 is not set # CONFIG_MSM_MMCC_8960 is not set @@ -296,7 +308,6 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_QCOM=y -# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set CONFIG_MTD_QCOM_SMEM_PARTS=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIRMWARE=y @@ -308,7 +319,6 @@ CONFIG_MTD_UBI_BLOCK=y # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y @@ -316,6 +326,7 @@ CONFIG_NET_DSA=y CONFIG_NET_DSA_HWMON=y CONFIG_NET_DSA_QCA8K=y CONFIG_NET_DSA_TAG_QCA=y +# CONFIG_NET_DSA_VITESSE_VSC73XX is not set CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SWITCHDEV=y @@ -328,24 +339,24 @@ CONFIG_NR_CPUS=2 CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y -CONFIG_OF_ADDRESS_PCI=y CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y +CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PADATA=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PCI=y +# CONFIG_PCI_V3_SEMI is not set CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_QCOM=y CONFIG_PCI_DEBUG=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y @@ -356,7 +367,9 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y +CONFIG_PHYLINK=y # CONFIG_PHY_QCOM_APQ8064_SATA is not set +# CONFIG_PHY_QCOM_DWC3 is not set CONFIG_PHY_QCOM_IPQ806X_SATA=y # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set @@ -374,45 +387,49 @@ CONFIG_PINCTRL_MSM=y # CONFIG_PINCTRL_MSM8960 is not set # CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_MSM8996 is not set -# CONFIG_PINCTRL_MSM8X74 is not set +# CONFIG_PINCTRL_MSM8998 is not set # CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set -# CONFIG_PL330_DMA is not set +# CONFIG_PINCTRL_SDM845 is not set +CONFIG_PLUGIN_HOSTCC="g++" CONFIG_PM_OPP=y CONFIG_POWER_RESET=y -# CONFIG_POWER_RESET_BRCMKONA is not set CONFIG_POWER_RESET_MSM=y CONFIG_POWER_SUPPLY=y CONFIG_PPS=y CONFIG_PRINTK_TIME=y CONFIG_PTP_1588_CLOCK=y +# CONFIG_QCOM_A53PLL is not set CONFIG_QCOM_ADM=y CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_CLK_RPM=y +# CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_EBI2 is not set -CONFIG_QCOM_GDSC=y +# CONFIG_QCOM_GENI_SE is not set CONFIG_QCOM_GSBI=y CONFIG_QCOM_HFPLL=y # CONFIG_QCOM_IOMMU is not set +# CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_PDC is not set CONFIG_QCOM_PM=y -# CONFIG_QCOM_Q6V5_PIL is not set CONFIG_QCOM_QFPROM=y +# CONFIG_QCOM_RMTFS_MEM is not set CONFIG_QCOM_RPMCC=y CONFIG_QCOM_SCM=y CONFIG_QCOM_SCM_32=y -# CONFIG_QCOM_SMD is not set +# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_QCOM_SMEM=y -# CONFIG_QCOM_SMP2P is not set # CONFIG_QCOM_SMSM is not set CONFIG_QCOM_TCSR=y CONFIG_QCOM_TSENS=y -# CONFIG_QCOM_WCNSS_PIL is not set CONFIG_QCOM_WDT=y # CONFIG_QRTR is not set CONFIG_RAS=y CONFIG_RATIONAL=y CONFIG_RCU_CPU_STALL_TIMEOUT=21 +CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_STALL_COMMON=y +CONFIG_REFCOUNT_FULL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y @@ -422,34 +439,38 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_QCOM_RPM=y # CONFIG_REGULATOR_QCOM_SPMI is not set CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_QCOM_AOSS is not set CONFIG_RFS_ACCEL=y -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPS=y CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_CMOS is not set CONFIG_RTC_I2C_AND_SPI=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set +# CONFIG_SDM_DISPCC_845 is not set +# CONFIG_SDM_GCC_845 is not set +# CONFIG_SDM_VIDEOCC_845 is not set +CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y +# CONFIG_SFP is not set +CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SPARSE_IRQ=y CONFIG_SPI=y -# CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y CONFIG_SPI_QUP=y CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y +# CONFIG_SPMI_PMIC_CLKDIV is not set CONFIG_SRCU=y CONFIG_STMMAC_ETH=y CONFIG_STMMAC_PLATFORM=y CONFIG_SWCONFIG=y CONFIG_SWCONFIG_LEDS=y -CONFIG_SWIOTLB=y CONFIG_SWPHY=y CONFIG_SWP_EMULATE=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -461,7 +482,10 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y # CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y CONFIG_TREE_RCU=y +CONFIG_TREE_SRCU=y CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y @@ -471,12 +495,9 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_USB=y CONFIG_USB_COMMON=y # CONFIG_USB_EHCI_HCD is not set -# CONFIG_USB_QCOM_8X16_PHY is not set CONFIG_USB_SUPPORT=y -# CONFIG_USB_UHCI_HCD is not set CONFIG_USE_OF=y CONFIG_VDSO=y -CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_WATCHDOG_CORE=y From 53801ae1c79ecf5153d658951e3c3afed4a16d93 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Thu, 28 Nov 2019 21:58:19 +0100 Subject: [PATCH 025/480] kernel: generic: add missing config symbol to 4.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PCI_V3_SEMI config symbol was found missing in generic kernel config after ipq806x config refresh to 4.19. Signed-off-by: Ansuel Smith [commit subject and description facelift] Signed-off-by: Petr Štetiar --- target/linux/generic/config-4.19 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index d6c6a14f38..eb6cf46e95 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -3680,6 +3680,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PCIE_KIRIN is not set # CONFIG_PCIE_PTM is not set # CONFIG_PCIE_XILINX is not set +# CONFIG_PCI_V3_SEMI is not set # CONFIG_PCIPCWATCHDOG is not set # CONFIG_PCI_ATMEL is not set # CONFIG_PCI_CNB20LE_QUIRK is not set From 63066d3006958ca52df71f53c6f413ad4fb74974 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 28 Nov 2019 22:28:48 +0100 Subject: [PATCH 026/480] ipq806x: refresh 4.19 patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reworked: - 0034 patchset update Added: - 080 Add support for pinctrl-msm framework Removed: - 0074-ipq806x-usb-Control-USB-master-reset.patch (we now have a dedicated driver for qcom usb) - 0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke (merged upstream) - 310-msm-adhoc-bus-support (it looks like it was never actually used in any dts) Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith [commit subject and description facelift, SoB fix] Signed-off-by: Petr Štetiar --- ...d-add-SMEM-parser-for-QCOM-platforms.patch | 2 +- .../0032-phy-add-qcom-dwc3-phy.patch | 110 +- ...rait-L2-register-accessor-functions.patch} | 62 +- ...port-for-High-Frequency-PLLs-HFPLLs.patch} | 64 +- ...0034-0003-clk-qcom-Add-HFPLL-driver.patch} | 106 +- ...t-bindings-clock-Document-qcom-hfpll.patch | 81 + ...lk-qcom-Add-MSM8960-APQ8064-s-HFPLLs.patch | 236 + ...-0006-clk-qcom-Add-IPQ806X-s-HFPLLs.patch} | 25 +- ...k-qcom-Add-support-for-Krait-clocks.patch} | 78 +- ...008-clk-qcom-Add-KPSS-ACC-GCC-driver.patch | 134 + ...-bindings-arm-Document-qcom-kpss-gcc.patch | 99 + ...m-Add-Krait-clock-controller-driver.patch} | 105 +- ...indings-clock-Document-qcom-krait-cc.patch | 55 + ...fe-switch-hook-for-krait-mux-clocks.patch} | 40 +- ...lit-out-register-accessors-for-reuse.patch | 195 - ...042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch | 209 - ...le-to-register-cpufreq-on-Krait-CPUs.patch | 12 +- ...cpufreq-qcom-independent-core-clocks.patch | 14 +- ...a-BBT-flag-to-access-bad-block-marke.patch | 72 - ...ow-to-set-regulator-without-opp_list.patch | 10 +- ...rt-adjusting-OPP-voltages-at-runtime.patch | 8 +- ...per-to-get-an-opp-regulator-for-devi.patch | 8 +- ...e-voltage-tolerance-when-adjusting-t.patch | 10 +- ...-dt-Handle-OPP-voltage-adjust-events.patch | 35 +- ...-dt-Add-L2-frequency-scaling-support.patch | 31 +- ...056-cpufreq-dt-Add-missing-rcu-locks.patch | 2 +- ...arch-arm-force-ZRELADDR-on-arch-qcom.patch | 2 +- .../0063-1-ipq806x-tsens-driver.patch | 43 +- ...sens-support-configurable-interrupts.patch | 71 +- .../patches-4.19/0064-clk-clk-rpm-fixes.patch | 42 +- .../0065-arm-override-compiler-flags.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 18 +- .../0069-arm-boot-add-dts-files.patch | 8 +- ...I-qcom-Fixed-IPQ806x-specific-clocks.patch | 24 +- ...com-Fixed-IPQ806x-PCIE-reset-changes.patch | 51 +- ...qcom-Fixed-IPQ806x-PCIE-init-changes.patch | 26 +- ...rogramming-the-PCIE-iATU-for-IPQ806x.patch | 12 +- .../0071-6-PCI-qcom-Force-GEN1-support.patch | 20 +- ...7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch | 10 +- ...qcom-Fixed-pcie_phy_clk-branch-issue.patch | 16 +- ...nge-duplicate-pci-reset-to-phy-reset.patch | 6 +- .../0072-add-ipq806x-with-no-clocks.patch | 4 +- ...e-scm_call-to-route-GPIO-irq-to-Apps.patch | 120 +- ...ipq806x-usb-Control-USB-master-reset.patch | 71 - ...RM-dts-qcom-add-gpio-ranges-property.patch | 70 + .../105-mtd-nor-add-mx25l25635f.patch | 22 - .../310-msm-adhoc-bus-support.patch | 11026 ---------------- .../850-soc-add-qualcomm-syscon.patch | 70 +- 48 files changed, 1092 insertions(+), 12445 deletions(-) rename target/linux/ipq806x/patches-4.19/{0034-ARM-Add-Krait-L2-register-accessor-functions.patch => 0034-0001-ARM-Add-Krait-L2-register-accessor-functions.patch} (57%) rename target/linux/ipq806x/patches-4.19/{0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch => 0034-0002-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch} (78%) rename target/linux/ipq806x/patches-4.19/{0039-clk-qcom-Add-HFPLL-driver.patch => 0034-0003-clk-qcom-Add-HFPLL-driver.patch} (50%) create mode 100644 target/linux/ipq806x/patches-4.19/0034-0004-dt-bindings-clock-Document-qcom-hfpll.patch create mode 100644 target/linux/ipq806x/patches-4.19/0034-0005-clk-qcom-Add-MSM8960-APQ8064-s-HFPLLs.patch rename target/linux/ipq806x/patches-4.19/{0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch => 0034-0006-clk-qcom-Add-IPQ806X-s-HFPLLs.patch} (79%) rename target/linux/ipq806x/patches-4.19/{0041-clk-qcom-Add-support-for-Krait-clocks.patch => 0034-0007-clk-qcom-Add-support-for-Krait-clocks.patch} (68%) create mode 100644 target/linux/ipq806x/patches-4.19/0034-0008-clk-qcom-Add-KPSS-ACC-GCC-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0034-0009-dt-bindings-arm-Document-qcom-kpss-gcc.patch rename target/linux/ipq806x/patches-4.19/{0043-clk-qcom-Add-Krait-clock-controller-driver.patch => 0034-0010-clk-qcom-Add-Krait-clock-controller-driver.patch} (80%) create mode 100644 target/linux/ipq806x/patches-4.19/0034-0011-dt-bindings-clock-Document-qcom-krait-cc.patch rename target/linux/ipq806x/patches-4.19/{0044-clk-Add-safe-switch-hook.patch => 0034-0012-clk-qcom-Add-safe-switch-hook-for-krait-mux-clocks.patch} (76%) delete mode 100644 target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch delete mode 100644 target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch delete mode 100644 target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch delete mode 100644 target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch create mode 100644 target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch delete mode 100644 target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch delete mode 100644 target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch diff --git a/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch b/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch index a7cfac5447..a7e95513fd 100644 --- a/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch +++ b/target/linux/ipq806x/patches-4.19/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch @@ -18,7 +18,7 @@ Signed-off-by: Ram Chandra Jangir --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -194,6 +194,13 @@ config MTD_MYLOADER_PARTS +@@ -193,6 +193,13 @@ config MTD_MYLOADER_PARTS You will still need the parsing functions to be called by the driver for your particular device. It won't happen automatically. diff --git a/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch b/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch index e430329acd..0de0878f86 100644 --- a/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch +++ b/target/linux/ipq806x/patches-4.19/0032-phy-add-qcom-dwc3-phy.patch @@ -5,15 +5,10 @@ Subject: [PATCH 32/69] phy: add qcom dwc3 phy Signed-off-by: Andy Gross --- - drivers/phy/Kconfig | 12 + - drivers/phy/Makefile | 1 + - drivers/phy/phy-qcom-dwc3.c | 575 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 588 insertions(+) - create mode 100644 drivers/phy/phy-qcom-dwc3.c --- a/drivers/phy/qualcomm/Kconfig +++ b/drivers/phy/qualcomm/Kconfig -@@ -56,3 +56,15 @@ config PHY_QCOM_USB_HSIC +@@ -65,3 +65,15 @@ config PHY_QCOM_USB_HSIC select GENERIC_PHY help Support for the USB HSIC ULPI compliant PHY on QCOM chipsets. @@ -31,14 +26,14 @@ Signed-off-by: Andy Gross + --- a/drivers/phy/qualcomm/Makefile +++ b/drivers/phy/qualcomm/Makefile -@@ -8,3 +8,4 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom- +@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom- obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o obj-$(CONFIG_PHY_QCOM_USB_HS) += phy-qcom-usb-hs.o obj-$(CONFIG_PHY_QCOM_USB_HSIC) += phy-qcom-usb-hsic.o +obj-$(CONFIG_PHY_QCOM_DWC3) += phy-qcom-dwc3.o --- /dev/null +++ b/drivers/phy/qualcomm/phy-qcom-dwc3.c -@@ -0,0 +1,575 @@ +@@ -0,0 +1,578 @@ +/* Copyright (c) 2014-2015, Code Aurora Forum. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify @@ -59,6 +54,8 @@ Signed-off-by: Andy Gross +#include +#include +#include ++#include ++#include + +/** + * USB QSCRATCH Hardware registers @@ -86,15 +83,15 @@ Signed-off-by: Andy Gross +/** + * USB QSCRATCH Hardware registers + */ -+#define SSUSB_PHY_CTRL_REG (0x00) -+#define SSUSB_PHY_PARAM_CTRL_1 (0x04) -+#define SSUSB_PHY_PARAM_CTRL_2 (0x08) -+#define CR_PROTOCOL_DATA_IN_REG (0x0c) -+#define CR_PROTOCOL_DATA_OUT_REG (0x10) -+#define CR_PROTOCOL_CAP_ADDR_REG (0x14) -+#define CR_PROTOCOL_CAP_DATA_REG (0x18) -+#define CR_PROTOCOL_READ_REG (0x1c) -+#define CR_PROTOCOL_WRITE_REG (0x20) ++#define SSUSB_PHY_CTRL_REG (0x30) ++#define SSUSB_PHY_PARAM_CTRL_1 (0x34) ++#define SSUSB_PHY_PARAM_CTRL_2 (0x38) ++#define CR_PROTOCOL_DATA_IN_REG (0x3c) ++#define CR_PROTOCOL_DATA_OUT_REG (0x40) ++#define CR_PROTOCOL_CAP_ADDR_REG (0x44) ++#define CR_PROTOCOL_CAP_DATA_REG (0x48) ++#define CR_PROTOCOL_READ_REG (0x4c) ++#define CR_PROTOCOL_WRITE_REG (0x50) + +/* PHY_CTRL_REG */ +#define SSUSB_CTRL_REF_USE_PAD BIT(28) @@ -103,7 +100,7 @@ Signed-off-by: Andy Gross +#define SSUSB_CTRL_SS_PHY_EN BIT(8) +#define SSUSB_CTRL_SS_PHY_RESET BIT(7) + -+/* SSPHY control registers */ ++/* SSPHY control registers - Does this need 0x30? */ +#define SSPHY_CTRL_RX_OVRD_IN_HI(lane) (0x1006 + 0x100 * lane) +#define SSPHY_CTRL_TX_OVRD_DRV_LO(lane) (0x1002 + 0x100 * lane) + @@ -160,7 +157,7 @@ Signed-off-by: Andy Gross +#define SS_CR_WRITE_REG BIT(0) + +struct qcom_dwc3_usb_phy { -+ void __iomem *base; ++ struct regmap *base; + struct device *dev; + struct clk *xo_clk; + struct clk *ref_clk; @@ -186,15 +183,16 @@ Signed-off-by: Andy Gross + struct qcom_dwc3_usb_phy *phy_dwc3, u32 offset, + const u32 mask, u32 val) +{ -+ u32 write_val, tmp = readl(phy_dwc3->base + offset); ++ u32 write_val, tmp; + ++ tmp = regmap_read(phy_dwc3->base, offset, &tmp); + tmp &= ~mask; /* retain other bits */ + write_val = tmp | val; + -+ writel(write_val, phy_dwc3->base + offset); ++ regmap_write(phy_dwc3->base, offset, write_val); + + /* Read back to see if val was written */ -+ tmp = readl(phy_dwc3->base + offset); ++ regmap_read(phy_dwc3->base, offset, &tmp); + tmp &= mask; /* clear other bits */ + + if (tmp != val) @@ -202,12 +200,13 @@ Signed-off-by: Andy Gross + val, offset); +} + -+static int wait_for_latch(void __iomem *addr) ++static int wait_for_latch(struct regmap *base, u32 addr) +{ -+ u32 retry = 10; ++ u32 retry = 10, data; + + while (true) { -+ if (!readl(addr)) ++ regmap_read(base, addr, &data); ++ if (!data) + break; + + if (--retry == 0) @@ -231,23 +230,23 @@ Signed-off-by: Andy Gross +{ + int ret; + -+ writel(addr, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG); -+ writel(SS_CR_CAP_ADDR_REG, phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG); ++ regmap_write(phy_dwc3->base, CR_PROTOCOL_DATA_IN_REG, addr); ++ regmap_write(phy_dwc3->base, CR_PROTOCOL_CAP_ADDR_REG, SS_CR_CAP_ADDR_REG); + -+ ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_ADDR_REG); ++ ret = wait_for_latch(phy_dwc3->base, CR_PROTOCOL_CAP_ADDR_REG); + if (ret) + goto err_wait; + -+ writel(val, phy_dwc3->base + CR_PROTOCOL_DATA_IN_REG); -+ writel(SS_CR_CAP_DATA_REG, phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG); ++ regmap_write(phy_dwc3->base, CR_PROTOCOL_DATA_IN_REG, val); ++ regmap_write(phy_dwc3->base, CR_PROTOCOL_CAP_DATA_REG, SS_CR_CAP_DATA_REG); + -+ ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_CAP_DATA_REG); ++ ret = wait_for_latch(phy_dwc3->base, CR_PROTOCOL_CAP_DATA_REG); + if (ret) + goto err_wait; + -+ writel(SS_CR_WRITE_REG, phy_dwc3->base + CR_PROTOCOL_WRITE_REG); ++ regmap_write(phy_dwc3->base, CR_PROTOCOL_WRITE_REG, SS_CR_WRITE_REG); + -+ ret = wait_for_latch(phy_dwc3->base + CR_PROTOCOL_WRITE_REG); ++ ret = wait_for_latch(phy_dwc3->base, CR_PROTOCOL_WRITE_REG); + +err_wait: + if (ret) @@ -261,14 +260,14 @@ Signed-off-by: Andy Gross + * @base - QCOM DWC3 PHY base virtual address. + * @addr - SSPHY address to read. + */ -+static int qcom_dwc3_ss_read_phycreg(void __iomem *base, u32 addr, u32 *val) ++static int qcom_dwc3_ss_read_phycreg(struct regmap *base, u32 addr, u32 *val) +{ + int ret; + -+ writel(addr, base + CR_PROTOCOL_DATA_IN_REG); -+ writel(SS_CR_CAP_ADDR_REG, base + CR_PROTOCOL_CAP_ADDR_REG); ++ regmap_write(base, CR_PROTOCOL_DATA_IN_REG, addr); ++ regmap_write(base, CR_PROTOCOL_CAP_ADDR_REG, SS_CR_CAP_ADDR_REG); + -+ ret = wait_for_latch(base + CR_PROTOCOL_CAP_ADDR_REG); ++ ret = wait_for_latch(base, CR_PROTOCOL_CAP_ADDR_REG); + if (ret) + goto err_wait; + @@ -277,22 +276,22 @@ Signed-off-by: Andy Gross + * incorrect. Hence as workaround, SW should perform SSPHY register + * read twice, but use only second read and ignore first read. + */ -+ writel(SS_CR_READ_REG, base + CR_PROTOCOL_READ_REG); ++ regmap_write(base, CR_PROTOCOL_READ_REG, SS_CR_READ_REG); + -+ ret = wait_for_latch(base + CR_PROTOCOL_READ_REG); ++ ret = wait_for_latch(base, CR_PROTOCOL_READ_REG); + if (ret) + goto err_wait; + + /* throwaway read */ -+ readl(base + CR_PROTOCOL_DATA_OUT_REG); ++ regmap_read(base, CR_PROTOCOL_DATA_OUT_REG, &ret); + -+ writel(SS_CR_READ_REG, base + CR_PROTOCOL_READ_REG); ++ regmap_write(base, CR_PROTOCOL_READ_REG, SS_CR_READ_REG); + -+ ret = wait_for_latch(base + CR_PROTOCOL_READ_REG); ++ ret = wait_for_latch(base, CR_PROTOCOL_READ_REG); + if (ret) + goto err_wait; + -+ *val = readl(base + CR_PROTOCOL_DATA_OUT_REG); ++ regmap_read(base, CR_PROTOCOL_DATA_OUT_REG, val); + +err_wait: + return ret; @@ -328,11 +327,11 @@ Signed-off-by: Andy Gross + if (!phy_dwc3->xo_clk) + val |= HSUSB_CTRL_USE_CLKCORE; + -+ writel(val, phy_dwc3->base + HSUSB_PHY_CTRL_REG); ++ regmap_write(phy_dwc3->base, HSUSB_PHY_CTRL_REG, val); + usleep_range(2000, 2200); + + /* Disable (bypass) VBUS and ID filters */ -+ writel(HSUSB_GCFG_XHCI_REV, phy_dwc3->base + QSCRATCH_GENERAL_CFG); ++ regmap_write(phy_dwc3->base, QSCRATCH_GENERAL_CFG, HSUSB_GCFG_XHCI_REV); + + return 0; +} @@ -364,11 +363,11 @@ Signed-off-by: Andy Gross + } + + /* reset phy */ -+ data = readl(phy_dwc3->base + SSUSB_PHY_CTRL_REG); -+ writel(data | SSUSB_CTRL_SS_PHY_RESET, -+ phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ regmap_read(phy_dwc3->base, SSUSB_PHY_CTRL_REG, &data); ++ regmap_write(phy_dwc3->base, SSUSB_PHY_CTRL_REG, ++ data | SSUSB_CTRL_SS_PHY_RESET); + usleep_range(2000, 2200); -+ writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ regmap_write(phy_dwc3->base, SSUSB_PHY_CTRL_REG, data); + + /* clear REF_PAD if we don't have XO clk */ + if (!phy_dwc3->xo_clk) @@ -376,13 +375,13 @@ Signed-off-by: Andy Gross + else + data |= SSUSB_CTRL_REF_USE_PAD; + -+ writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ regmap_write(phy_dwc3->base, SSUSB_PHY_CTRL_REG, data); + + /* wait for ref clk to become stable, this can take up to 30ms */ + msleep(30); + + data |= SSUSB_CTRL_SS_PHY_EN | SSUSB_CTRL_LANE0_PWR_PRESENT; -+ writel(data, phy_dwc3->base + SSUSB_PHY_CTRL_REG); ++ regmap_write(phy_dwc3->base, SSUSB_PHY_CTRL_REG, data); + + /* + * WORKAROUND: There is SSPHY suspend bug due to which USB enumerates @@ -460,7 +459,7 @@ Signed-off-by: Andy Gross + * TX_DEEMPH_3_5DB [13:8] set based on SoC version + * LOS_BIAS [7:3] to 9 + */ -+ data = readl(phy_dwc3->base + SSUSB_PHY_PARAM_CTRL_1); ++ regmap_read(phy_dwc3->base, SSUSB_PHY_PARAM_CTRL_1, &data); + + data &= ~PHY_PARAM_CTRL1_MASK; + @@ -542,10 +541,9 @@ Signed-off-by: Andy Gross + + phy_dwc3->dev = &pdev->dev; + -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ phy_dwc3->base = devm_ioremap_resource(phy_dwc3->dev, res); -+ if (IS_ERR(phy_dwc3->base)) -+ return PTR_ERR(phy_dwc3->base); ++ phy_dwc3->base = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "regmap"); ++ if (IS_ERR_OR_NULL(phy_dwc3->base)) ++ return PTR_ERR_OR_ZERO(phy_dwc3->base) ? : -EINVAL; + + phy_dwc3->ref_clk = devm_clk_get(phy_dwc3->dev, "ref"); + if (IS_ERR(phy_dwc3->ref_clk)) { diff --git a/target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch b/target/linux/ipq806x/patches-4.19/0034-0001-ARM-Add-Krait-L2-register-accessor-functions.patch similarity index 57% rename from target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch rename to target/linux/ipq806x/patches-4.19/0034-0001-ARM-Add-Krait-L2-register-accessor-functions.patch index 5380f2c7f9..68acbeeec2 100644 --- a/target/linux/ipq806x/patches-4.19/0034-ARM-Add-Krait-L2-register-accessor-functions.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0001-ARM-Add-Krait-L2-register-accessor-functions.patch @@ -1,21 +1,7 @@ -From patchwork Fri Dec 8 09:42:19 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,01/12] ARM: Add Krait L2 register accessor functions -From: Sricharan R -X-Patchwork-Id: 10102101 -Message-Id: <1512726150-7204-2-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org, Mark Rutland , - Russell King , - Courtney Cavin -Date: Fri, 8 Dec 2017 15:12:19 +0530 - +From 36d68f64c411e09788687d5919886aadeb92adca Mon Sep 17 00:00:00 2001 From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:20 +0530 +Subject: [PATCH 01/12] ARM: Add Krait L2 register accessor functions Krait CPUs have a handful of L2 cache controller registers that live behind a cp15 based indirection register. First you program @@ -28,14 +14,17 @@ underneath us. Cc: Mark Rutland Cc: Russell King -Cc: Courtney Cavin +Acked-by: Bjorn Andersson Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd --- arch/arm/common/Kconfig | 3 ++ arch/arm/common/Makefile | 1 + - arch/arm/common/krait-l2-accessors.c | 58 +++++++++++++++++++++++++++++++ - arch/arm/include/asm/krait-l2-accessors.h | 20 +++++++++++ - 4 files changed, 82 insertions(+) + arch/arm/common/krait-l2-accessors.c | 48 +++++++++++++++++++++++ + arch/arm/include/asm/krait-l2-accessors.h | 9 +++++ + 4 files changed, 61 insertions(+) create mode 100644 arch/arm/common/krait-l2-accessors.c create mode 100644 arch/arm/include/asm/krait-l2-accessors.h @@ -63,19 +52,9 @@ Signed-off-by: Stephen Boyd obj-$(CONFIG_SHARP_SCOOP) += scoop.o --- /dev/null +++ b/arch/arm/common/krait-l2-accessors.c -@@ -0,0 +1,58 @@ -+/* -+ * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,48 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Copyright (c) 2018, The Linux Foundation. All rights reserved. + +#include +#include @@ -124,19 +103,8 @@ Signed-off-by: Stephen Boyd +EXPORT_SYMBOL(krait_get_l2_indirect_reg); --- /dev/null +++ b/arch/arm/include/asm/krait-l2-accessors.h -@@ -0,0 +1,20 @@ -+/* -+ * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,9 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASMARM_KRAIT_L2_ACCESSORS_H +#define __ASMARM_KRAIT_L2_ACCESSORS_H diff --git a/target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch b/target/linux/ipq806x/patches-4.19/0034-0002-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch similarity index 78% rename from target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch rename to target/linux/ipq806x/patches-4.19/0034-0002-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch index 45314e70d5..d43d0c89b5 100644 --- a/target/linux/ipq806x/patches-4.19/0038-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0002-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch @@ -1,57 +1,39 @@ -From patchwork Fri Dec 8 09:42:21 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,03/12] clk: qcom: Add support for High-Frequency PLLs (HFPLLs) -From: Sricharan R -X-Patchwork-Id: 10102083 -Message-Id: <1512726150-7204-4-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:21 +0530 - +From b3f2f10693aadeacf83ab5be03810941a4b77612 Mon Sep 17 00:00:00 2001 From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:21 +0530 +Subject: [PATCH 02/12] clk: qcom: Add support for High-Frequency PLLs (HFPLLs) HFPLLs are the main frequency source for Krait CPU clocks. Add support for changing the rate of these PLLs. Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd --- drivers/clk/qcom/Makefile | 1 + - drivers/clk/qcom/clk-hfpll.c | 253 +++++++++++++++++++++++++++++++++++++++++++ - drivers/clk/qcom/clk-hfpll.h | 54 +++++++++ - 3 files changed, 308 insertions(+) + drivers/clk/qcom/clk-hfpll.c | 244 +++++++++++++++++++++++++++++++++++ + drivers/clk/qcom/clk-hfpll.h | 44 +++++++ + 3 files changed, 289 insertions(+) create mode 100644 drivers/clk/qcom/clk-hfpll.c create mode 100644 drivers/clk/qcom/clk-hfpll.h --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -10,6 +10,7 @@ clk-qcom-y += clk-rcg2.o - clk-qcom-y += clk-branch.o +@@ -11,6 +11,7 @@ clk-qcom-y += clk-branch.o clk-qcom-y += clk-regmap-divider.o clk-qcom-y += clk-regmap-mux.o + clk-qcom-y += clk-regmap-mux-div.o +clk-qcom-y += clk-hfpll.o clk-qcom-y += reset.o clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o --- /dev/null +++ b/drivers/clk/qcom/clk-hfpll.c -@@ -0,0 +1,253 @@ -+/* -+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,244 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Copyright (c) 2018, The Linux Foundation. All rights reserved. ++ +#include +#include +#include @@ -295,19 +277,9 @@ Signed-off-by: Stephen Boyd +EXPORT_SYMBOL_GPL(clk_ops_hfpll); --- /dev/null +++ b/drivers/clk/qcom/clk-hfpll.h -@@ -0,0 +1,54 @@ -+/* -+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,44 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++ +#ifndef __QCOM_CLK_HFPLL_H__ +#define __QCOM_CLK_HFPLL_H__ + diff --git a/target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch b/target/linux/ipq806x/patches-4.19/0034-0003-clk-qcom-Add-HFPLL-driver.patch similarity index 50% rename from target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch rename to target/linux/ipq806x/patches-4.19/0034-0003-clk-qcom-Add-HFPLL-driver.patch index 884d564ae7..292eb66d67 100644 --- a/target/linux/ipq806x/patches-4.19/0039-clk-qcom-Add-HFPLL-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0003-clk-qcom-Add-HFPLL-driver.patch @@ -1,19 +1,7 @@ -From patchwork Fri Dec 8 09:42:22 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,04/12] clk: qcom: Add HFPLL driver -From: Sricharan R -X-Patchwork-Id: 10102079 -Message-Id: <1512726150-7204-5-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:22 +0530 - +From cb546b797a0da4dbb1a0c76a2a357921887b6189 Mon Sep 17 00:00:00 2001 From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:22 +0530 +Subject: [PATCH 03/12] clk: qcom: Add HFPLL driver On some devices (MSM8974 for example), the HFPLLs are instantiated within the Krait processor subsystem as separate @@ -22,64 +10,22 @@ provide HFPLL clocks for use by the system. Cc: Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd --- - .../devicetree/bindings/clock/qcom,hfpll.txt | 40 ++++++++ - drivers/clk/qcom/Kconfig | 8 ++ - drivers/clk/qcom/Makefile | 1 + - drivers/clk/qcom/hfpll.c | 106 +++++++++++++++++++++ - 4 files changed, 155 insertions(+) - create mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.txt + drivers/clk/qcom/Kconfig | 8 ++++ + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/hfpll.c | 96 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 105 insertions(+) create mode 100644 drivers/clk/qcom/hfpll.c ---- /dev/null -+++ b/Documentation/devicetree/bindings/clock/qcom,hfpll.txt -@@ -0,0 +1,40 @@ -+High-Frequency PLL (HFPLL) -+ -+PROPERTIES -+ -+- compatible: -+ Usage: required -+ Value type: -+ Definition: must be "qcom,hfpll" -+ -+- reg: -+ Usage: required -+ Value type: -+ Definition: address and size of HPLL registers. An optional second -+ element specifies the address and size of the alias -+ register region. -+ -+- clock-output-names: -+ Usage: required -+ Value type: -+ Definition: Name of the PLL. Typically hfpllX where X is a CPU number -+ starting at 0. Otherwise hfpll_Y where Y is more specific -+ such as "l2". -+ -+Example: -+ -+1) An HFPLL for the L2 cache. -+ -+ clock-controller@f9016000 { -+ compatible = "qcom,hfpll"; -+ reg = <0xf9016000 0x30>; -+ clock-output-names = "hfpll_l2"; -+ }; -+ -+2) An HFPLL for CPU0. This HFPLL has the alias register region. -+ -+ clock-controller@f908a000 { -+ compatible = "qcom,hfpll"; -+ reg = <0xf908a000 0x30>, <0xf900a000 0x30>; -+ clock-output-names = "hfpll0"; -+ }; --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig -@@ -196,3 +196,11 @@ config MSM_MMCC_8996 - Support for the multimedia clock controller on msm8996 devices. - Say Y if you want to support multimedia devices such as display, - graphics, video encode/decode, camera, etc. +@@ -272,3 +272,11 @@ config SPMI_PMIC_CLKDIV + Technologies, Inc. SPMI PMIC. It configures the frequency of + clkdiv outputs of the PMIC. These clocks are typically wired + through alternate functions on GPIO pins. + +config QCOM_HFPLL + tristate "High-Frequency PLL (HFPLL) Clock Controller" @@ -90,26 +36,16 @@ Signed-off-by: Stephen Boyd + such as MSM8974, APQ8084, etc. --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -35,3 +35,4 @@ obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8 - obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o - obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o - obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o +@@ -44,3 +44,4 @@ obj-$(CONFIG_SDM_DISPCC_845) += dispcc-s + obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o + obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o + obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o +obj-$(CONFIG_QCOM_HFPLL) += hfpll.o --- /dev/null +++ b/drivers/clk/qcom/hfpll.c -@@ -0,0 +1,106 @@ -+/* -+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,96 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Copyright (c) 2018, The Linux Foundation. All rights reserved. + +#include +#include diff --git a/target/linux/ipq806x/patches-4.19/0034-0004-dt-bindings-clock-Document-qcom-hfpll.patch b/target/linux/ipq806x/patches-4.19/0034-0004-dt-bindings-clock-Document-qcom-hfpll.patch new file mode 100644 index 0000000000..1db989f6d9 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0034-0004-dt-bindings-clock-Document-qcom-hfpll.patch @@ -0,0 +1,81 @@ +From 1f924faa8b1e4789ecc06ed0dd58ca3487c89012 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:23 +0530 +Subject: [PATCH 04/12] dt-bindings: clock: Document qcom,hfpll + +Adds bindings document for qcom,hfpll instantiated within +the Krait processor subsystem as separate register region. + +Reviewed-by: Rob Herring +Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd +--- + .../devicetree/bindings/clock/qcom,hfpll.txt | 60 +++++++++++++++++++ + 1 file changed, 60 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.txt + +--- /dev/null ++++ b/Documentation/devicetree/bindings/clock/qcom,hfpll.txt +@@ -0,0 +1,60 @@ ++High-Frequency PLL (HFPLL) ++ ++PROPERTIES ++ ++- compatible: ++ Usage: required ++ Value type: : ++ shall contain only one of the following. The generic ++ compatible "qcom,hfpll" should be also included. ++ ++ "qcom,hfpll-ipq8064", "qcom,hfpll" ++ "qcom,hfpll-apq8064", "qcom,hfpll" ++ "qcom,hfpll-msm8974", "qcom,hfpll" ++ "qcom,hfpll-msm8960", "qcom,hfpll" ++ ++- reg: ++ Usage: required ++ Value type: ++ Definition: address and size of HPLL registers. An optional second ++ element specifies the address and size of the alias ++ register region. ++ ++- clocks: ++ Usage: required ++ Value type: ++ Definition: reference to the xo clock. ++ ++- clock-names: ++ Usage: required ++ Value type: ++ Definition: must be "xo". ++ ++- clock-output-names: ++ Usage: required ++ Value type: ++ Definition: Name of the PLL. Typically hfpllX where X is a CPU number ++ starting at 0. Otherwise hfpll_Y where Y is more specific ++ such as "l2". ++ ++Example: ++ ++1) An HFPLL for the L2 cache. ++ ++ clock-controller@f9016000 { ++ compatible = "qcom,hfpll-ipq8064", "qcom,hfpll"; ++ reg = <0xf9016000 0x30>; ++ clocks = <&xo_board>; ++ clock-names = "xo"; ++ clock-output-names = "hfpll_l2"; ++ }; ++ ++2) An HFPLL for CPU0. This HFPLL has the alias register region. ++ ++ clock-controller@f908a000 { ++ compatible = "qcom,hfpll-ipq8064", "qcom,hfpll"; ++ reg = <0xf908a000 0x30>, <0xf900a000 0x30>; ++ clocks = <&xo_board>; ++ clock-names = "xo"; ++ clock-output-names = "hfpll0"; ++ }; diff --git a/target/linux/ipq806x/patches-4.19/0034-0005-clk-qcom-Add-MSM8960-APQ8064-s-HFPLLs.patch b/target/linux/ipq806x/patches-4.19/0034-0005-clk-qcom-Add-MSM8960-APQ8064-s-HFPLLs.patch new file mode 100644 index 0000000000..5ed5625f2e --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0034-0005-clk-qcom-Add-MSM8960-APQ8064-s-HFPLLs.patch @@ -0,0 +1,236 @@ +From 72ad7207954dd622a662ba884dc6c30a820123f2 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:24 +0530 +Subject: [PATCH 05/12] clk: qcom: Add MSM8960/APQ8064's HFPLLs + +Describe the HFPLLs present on MSM8960 and APQ8064 devices. + +Acked-by: Rob Herring (bindings) +Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd +--- + drivers/clk/qcom/gcc-msm8960.c | 172 +++++++++++++++++++ + include/dt-bindings/clock/qcom,gcc-msm8960.h | 2 + + 2 files changed, 174 insertions(+) + +--- a/drivers/clk/qcom/gcc-msm8960.c ++++ b/drivers/clk/qcom/gcc-msm8960.c +@@ -30,6 +30,7 @@ + #include "clk-pll.h" + #include "clk-rcg.h" + #include "clk-branch.h" ++#include "clk-hfpll.h" + #include "reset.h" + + static struct clk_pll pll3 = { +@@ -86,6 +87,164 @@ static struct clk_regmap pll8_vote = { + }, + }; + ++static struct hfpll_data hfpll0_data = { ++ .mode_reg = 0x3200, ++ .l_reg = 0x3208, ++ .m_reg = 0x320c, ++ .n_reg = 0x3210, ++ .config_reg = 0x3204, ++ .status_reg = 0x321c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3214, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll0 = { ++ .d = &hfpll0_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll0", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll0.lock), ++}; ++ ++static struct hfpll_data hfpll1_8064_data = { ++ .mode_reg = 0x3240, ++ .l_reg = 0x3248, ++ .m_reg = 0x324c, ++ .n_reg = 0x3250, ++ .config_reg = 0x3244, ++ .status_reg = 0x325c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3254, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct hfpll_data hfpll1_data = { ++ .mode_reg = 0x3300, ++ .l_reg = 0x3308, ++ .m_reg = 0x330c, ++ .n_reg = 0x3310, ++ .config_reg = 0x3304, ++ .status_reg = 0x331c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3314, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll1 = { ++ .d = &hfpll1_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll1", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll1.lock), ++}; ++ ++static struct hfpll_data hfpll2_data = { ++ .mode_reg = 0x3280, ++ .l_reg = 0x3288, ++ .m_reg = 0x328c, ++ .n_reg = 0x3290, ++ .config_reg = 0x3284, ++ .status_reg = 0x329c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3294, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll2 = { ++ .d = &hfpll2_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll2", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll2.lock), ++}; ++ ++static struct hfpll_data hfpll3_data = { ++ .mode_reg = 0x32c0, ++ .l_reg = 0x32c8, ++ .m_reg = 0x32cc, ++ .n_reg = 0x32d0, ++ .config_reg = 0x32c4, ++ .status_reg = 0x32dc, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x32d4, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll3 = { ++ .d = &hfpll3_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll3", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll3.lock), ++}; ++ ++static struct hfpll_data hfpll_l2_8064_data = { ++ .mode_reg = 0x3300, ++ .l_reg = 0x3308, ++ .m_reg = 0x330c, ++ .n_reg = 0x3310, ++ .config_reg = 0x3304, ++ .status_reg = 0x331c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3314, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct hfpll_data hfpll_l2_data = { ++ .mode_reg = 0x3400, ++ .l_reg = 0x3408, ++ .m_reg = 0x340c, ++ .n_reg = 0x3410, ++ .config_reg = 0x3404, ++ .status_reg = 0x341c, ++ .config_val = 0x7845c665, ++ .droop_reg = 0x3414, ++ .droop_val = 0x0108c000, ++ .min_rate = 600000000UL, ++ .max_rate = 1800000000UL, ++}; ++ ++static struct clk_hfpll hfpll_l2 = { ++ .d = &hfpll_l2_data, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .parent_names = (const char *[]){ "pxo" }, ++ .num_parents = 1, ++ .name = "hfpll_l2", ++ .ops = &clk_ops_hfpll, ++ .flags = CLK_IGNORE_UNUSED, ++ }, ++ .lock = __SPIN_LOCK_UNLOCKED(hfpll_l2.lock), ++}; ++ + static struct clk_pll pll14 = { + .l_reg = 0x31c4, + .m_reg = 0x31c8, +@@ -3107,6 +3266,9 @@ static struct clk_regmap *gcc_msm8960_cl + [PMIC_ARB1_H_CLK] = &pmic_arb1_h_clk.clkr, + [PMIC_SSBI2_CLK] = &pmic_ssbi2_clk.clkr, + [RPM_MSG_RAM_H_CLK] = &rpm_msg_ram_h_clk.clkr, ++ [PLL9] = &hfpll0.clkr, ++ [PLL10] = &hfpll1.clkr, ++ [PLL12] = &hfpll_l2.clkr, + }; + + static const struct qcom_reset_map gcc_msm8960_resets[] = { +@@ -3318,6 +3480,11 @@ static struct clk_regmap *gcc_apq8064_cl + [PMIC_ARB1_H_CLK] = &pmic_arb1_h_clk.clkr, + [PMIC_SSBI2_CLK] = &pmic_ssbi2_clk.clkr, + [RPM_MSG_RAM_H_CLK] = &rpm_msg_ram_h_clk.clkr, ++ [PLL9] = &hfpll0.clkr, ++ [PLL10] = &hfpll1.clkr, ++ [PLL12] = &hfpll_l2.clkr, ++ [PLL16] = &hfpll2.clkr, ++ [PLL17] = &hfpll3.clkr, + }; + + static const struct qcom_reset_map gcc_apq8064_resets[] = { +@@ -3477,6 +3644,11 @@ static int gcc_msm8960_probe(struct plat + if (ret) + return ret; + ++ if (match->data == &gcc_apq8064_desc) { ++ hfpll1.d = &hfpll1_8064_data; ++ hfpll_l2.d = &hfpll_l2_8064_data; ++ } ++ + tsens = platform_device_register_data(&pdev->dev, "qcom-tsens", -1, + NULL, 0); + if (IS_ERR(tsens)) +--- a/include/dt-bindings/clock/qcom,gcc-msm8960.h ++++ b/include/dt-bindings/clock/qcom,gcc-msm8960.h +@@ -319,5 +319,7 @@ + #define CE3_SRC 303 + #define CE3_CORE_CLK 304 + #define CE3_H_CLK 305 ++#define PLL16 306 ++#define PLL17 307 + + #endif diff --git a/target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch b/target/linux/ipq806x/patches-4.19/0034-0006-clk-qcom-Add-IPQ806X-s-HFPLLs.patch similarity index 79% rename from target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch rename to target/linux/ipq806x/patches-4.19/0034-0006-clk-qcom-Add-IPQ806X-s-HFPLLs.patch index c3af0fa55c..74c66178a8 100644 --- a/target/linux/ipq806x/patches-4.19/0040-clk-qcom-Add-IPQ806X-s-HFPLLs.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0006-clk-qcom-Add-IPQ806X-s-HFPLLs.patch @@ -1,25 +1,16 @@ -From patchwork Fri Dec 8 09:42:24 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,06/12] clk: qcom: Add IPQ806X's HFPLLs -From: Sricharan R -X-Patchwork-Id: 10102047 -Message-Id: <1512726150-7204-7-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:24 +0530 - +From 1f79131bfd512f322c16b58dca581ce39beafab9 Mon Sep 17 00:00:00 2001 From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:25 +0530 +Subject: [PATCH 06/12] clk: qcom: Add IPQ806X's HFPLLs Describe the HFPLLs present on IPQ806X devices. Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd --- - drivers/clk/qcom/gcc-ipq806x.c | 82 ++++++++++++++++++++++++++++++++++++++++++ + drivers/clk/qcom/gcc-ipq806x.c | 82 ++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) --- a/drivers/clk/qcom/gcc-ipq806x.c @@ -117,7 +108,7 @@ Signed-off-by: Stephen Boyd static struct clk_pll pll14 = { .l_reg = 0x31c4, .m_reg = 0x31c8, -@@ -2801,6 +2880,9 @@ static struct clk_regmap *gcc_ipq806x_cl +@@ -2798,6 +2877,9 @@ static struct clk_regmap *gcc_ipq806x_cl [UBI32_CORE2_CLK_SRC] = &ubi32_core2_src_clk.clkr, [NSSTCM_CLK_SRC] = &nss_tcm_src.clkr, [NSSTCM_CLK] = &nss_tcm_clk.clkr, diff --git a/target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch b/target/linux/ipq806x/patches-4.19/0034-0007-clk-qcom-Add-support-for-Krait-clocks.patch similarity index 68% rename from target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch rename to target/linux/ipq806x/patches-4.19/0034-0007-clk-qcom-Add-support-for-Krait-clocks.patch index 5896ab3a26..181b91f6eb 100644 --- a/target/linux/ipq806x/patches-4.19/0041-clk-qcom-Add-support-for-Krait-clocks.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0007-clk-qcom-Add-support-for-Krait-clocks.patch @@ -1,19 +1,7 @@ -From patchwork Fri Dec 8 09:42:25 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,07/12] clk: qcom: Add support for Krait clocks -From: Sricharan R -X-Patchwork-Id: 10102051 -Message-Id: <1512726150-7204-8-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:25 +0530 - +From 4d7dc77babfef1d6cb8fd825e2f17dc3384c3272 Mon Sep 17 00:00:00 2001 From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:26 +0530 +Subject: [PATCH 07/12] clk: qcom: Add support for Krait clocks The Krait clocks are made up of a series of muxes and a divider that choose between a fixed rate clock and dedicated HFPLLs for @@ -22,50 +10,45 @@ Krait implementation exposes the remux control via cp15 registers. Support these clocks. Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +[sboyd@kernel.org: Move hidden config to top outside of the visible qcom +config zone so that menuconfig looks nice] +Signed-off-by: Stephen Boyd --- drivers/clk/qcom/Kconfig | 4 ++ drivers/clk/qcom/Makefile | 1 + - drivers/clk/qcom/clk-krait.c | 134 +++++++++++++++++++++++++++++++++++++++++++ - drivers/clk/qcom/clk-krait.h | 48 ++++++++++++++++ - 4 files changed, 187 insertions(+) + drivers/clk/qcom/clk-krait.c | 124 +++++++++++++++++++++++++++++++++++ + drivers/clk/qcom/clk-krait.h | 37 +++++++++++ + 4 files changed, 166 insertions(+) create mode 100644 drivers/clk/qcom/clk-krait.c create mode 100644 drivers/clk/qcom/clk-krait.h --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig -@@ -204,3 +204,7 @@ config QCOM_HFPLL - Support for the high-frequency PLLs present on Qualcomm devices. - Say Y if you want to support CPU frequency scaling on devices - such as MSM8974, APQ8084, etc. -+ +@@ -1,3 +1,7 @@ +config KRAIT_CLOCKS -+ bool -+ select KRAIT_L2_ACCESSORS ++ bool ++ select KRAIT_L2_ACCESSORS ++ + config QCOM_GDSC + bool + select PM_GENERIC_DOMAINS if PM --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -10,6 +10,7 @@ clk-qcom-y += clk-rcg2.o - clk-qcom-y += clk-branch.o +@@ -11,6 +11,7 @@ clk-qcom-y += clk-branch.o clk-qcom-y += clk-regmap-divider.o clk-qcom-y += clk-regmap-mux.o + clk-qcom-y += clk-regmap-mux-div.o +clk-qcom-$(CONFIG_KRAIT_CLOCKS) += clk-krait.o clk-qcom-y += clk-hfpll.o clk-qcom-y += reset.o clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o --- /dev/null +++ b/drivers/clk/qcom/clk-krait.c -@@ -0,0 +1,134 @@ -+/* -+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,124 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Copyright (c) 2018, The Linux Foundation. All rights reserved. + +#include +#include @@ -190,19 +173,8 @@ Signed-off-by: Stephen Boyd +EXPORT_SYMBOL_GPL(krait_div2_clk_ops); --- /dev/null +++ b/drivers/clk/qcom/clk-krait.h -@@ -0,0 +1,48 @@ -+/* -+ * Copyright (c) 2013, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,37 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __QCOM_CLK_KRAIT_H +#define __QCOM_CLK_KRAIT_H diff --git a/target/linux/ipq806x/patches-4.19/0034-0008-clk-qcom-Add-KPSS-ACC-GCC-driver.patch b/target/linux/ipq806x/patches-4.19/0034-0008-clk-qcom-Add-KPSS-ACC-GCC-driver.patch new file mode 100644 index 0000000000..aa19ea2e3f --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0034-0008-clk-qcom-Add-KPSS-ACC-GCC-driver.patch @@ -0,0 +1,134 @@ +From 3ddc3564d3c9f097986bd4ccbe34152413811335 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:27 +0530 +Subject: [PATCH 08/12] clk: qcom: Add KPSS ACC/GCC driver + +The ACC and GCC regions present in KPSSv1 contain registers to +control clocks and power to each Krait CPU and L2. For CPUfreq +purposes probe these devices and expose a mux clock that chooses +between PXO and PLL8. + +Cc: +Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd +--- + drivers/clk/qcom/Kconfig | 8 ++++ + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/kpss-xcc.c | 87 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 96 insertions(+) + create mode 100644 drivers/clk/qcom/kpss-xcc.c + +--- a/drivers/clk/qcom/Kconfig ++++ b/drivers/clk/qcom/Kconfig +@@ -284,3 +284,11 @@ config QCOM_HFPLL + Support for the high-frequency PLLs present on Qualcomm devices. + Say Y if you want to support CPU frequency scaling on devices + such as MSM8974, APQ8084, etc. ++ ++config KPSS_XCC ++ tristate "KPSS Clock Controller" ++ depends on COMMON_CLK_QCOM ++ help ++ Support for the Krait ACC and GCC clock controllers. Say Y ++ if you want to support CPU frequency scaling on devices such ++ as MSM8960, APQ8064, etc. +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -45,4 +45,5 @@ obj-$(CONFIG_SDM_DISPCC_845) += dispcc-s + obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o + obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o + obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o ++obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o + obj-$(CONFIG_QCOM_HFPLL) += hfpll.o +--- /dev/null ++++ b/drivers/clk/qcom/kpss-xcc.c +@@ -0,0 +1,87 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Copyright (c) 2018, The Linux Foundation. All rights reserved. ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static const char *aux_parents[] = { ++ "pll8_vote", ++ "pxo", ++}; ++ ++static unsigned int aux_parent_map[] = { ++ 3, ++ 0, ++}; ++ ++static const struct of_device_id kpss_xcc_match_table[] = { ++ { .compatible = "qcom,kpss-acc-v1", .data = (void *)1UL }, ++ { .compatible = "qcom,kpss-gcc" }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, kpss_xcc_match_table); ++ ++static int kpss_xcc_driver_probe(struct platform_device *pdev) ++{ ++ const struct of_device_id *id; ++ struct clk *clk; ++ struct resource *res; ++ void __iomem *base; ++ const char *name; ++ ++ id = of_match_device(kpss_xcc_match_table, &pdev->dev); ++ if (!id) ++ return -ENODEV; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ base = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(base)) ++ return PTR_ERR(base); ++ ++ if (id->data) { ++ if (of_property_read_string_index(pdev->dev.of_node, ++ "clock-output-names", ++ 0, &name)) ++ return -ENODEV; ++ base += 0x14; ++ } else { ++ name = "acpu_l2_aux"; ++ base += 0x28; ++ } ++ ++ clk = clk_register_mux_table(&pdev->dev, name, aux_parents, ++ ARRAY_SIZE(aux_parents), 0, base, 0, 0x3, ++ 0, aux_parent_map, NULL); ++ ++ platform_set_drvdata(pdev, clk); ++ ++ return PTR_ERR_OR_ZERO(clk); ++} ++ ++static int kpss_xcc_driver_remove(struct platform_device *pdev) ++{ ++ clk_unregister_mux(platform_get_drvdata(pdev)); ++ return 0; ++} ++ ++static struct platform_driver kpss_xcc_driver = { ++ .probe = kpss_xcc_driver_probe, ++ .remove = kpss_xcc_driver_remove, ++ .driver = { ++ .name = "kpss-xcc", ++ .of_match_table = kpss_xcc_match_table, ++ }, ++}; ++module_platform_driver(kpss_xcc_driver); ++ ++MODULE_DESCRIPTION("Krait Processor Sub System (KPSS) Clock Driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:kpss-xcc"); diff --git a/target/linux/ipq806x/patches-4.19/0034-0009-dt-bindings-arm-Document-qcom-kpss-gcc.patch b/target/linux/ipq806x/patches-4.19/0034-0009-dt-bindings-arm-Document-qcom-kpss-gcc.patch new file mode 100644 index 0000000000..6af40895bc --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0034-0009-dt-bindings-arm-Document-qcom-kpss-gcc.patch @@ -0,0 +1,99 @@ +From 40e5ddf4f84869815129551f4a8cfc2c223ebeae Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:28 +0530 +Subject: [PATCH 09/12] dt-bindings: arm: Document qcom,kpss-gcc + +The ACC and GCC regions present in KPSSv1 contain registers to +control clocks and power to each Krait CPU and L2. Documenting +the bindings here. + +Reviewed-by: Rob Herring +Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd +--- + .../bindings/arm/msm/qcom,kpss-acc.txt | 19 ++++++++ + .../bindings/arm/msm/qcom,kpss-gcc.txt | 44 +++++++++++++++++++ + 2 files changed, 63 insertions(+) + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt + +--- a/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt ++++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt +@@ -21,10 +21,29 @@ PROPERTIES + the register region. An optional second element specifies + the base address and size of the alias register region. + ++- clocks: ++ Usage: required ++ Value type: ++ Definition: reference to the pll parents. ++ ++- clock-names: ++ Usage: required ++ Value type: ++ Definition: must be "pll8_vote", "pxo". ++ ++- clock-output-names: ++ Usage: optional ++ Value type: ++ Definition: Name of the output clock. Typically acpuX_aux where X is a ++ CPU number starting at 0. ++ + Example: + + clock-controller@2088000 { + compatible = "qcom,kpss-acc-v2"; + reg = <0x02088000 0x1000>, + <0x02008000 0x1000>; ++ clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>; ++ clock-names = "pll8_vote", "pxo"; ++ clock-output-names = "acpu0_aux"; + }; +--- /dev/null ++++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt +@@ -0,0 +1,44 @@ ++Krait Processor Sub-system (KPSS) Global Clock Controller (GCC) ++ ++PROPERTIES ++ ++- compatible: ++ Usage: required ++ Value type: ++ Definition: should be one of the following. The generic compatible ++ "qcom,kpss-gcc" should also be included. ++ "qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc" ++ "qcom,kpss-gcc-apq8064", "qcom,kpss-gcc" ++ "qcom,kpss-gcc-msm8974", "qcom,kpss-gcc" ++ "qcom,kpss-gcc-msm8960", "qcom,kpss-gcc" ++ ++- reg: ++ Usage: required ++ Value type: ++ Definition: base address and size of the register region ++ ++- clocks: ++ Usage: required ++ Value type: ++ Definition: reference to the pll parents. ++ ++- clock-names: ++ Usage: required ++ Value type: ++ Definition: must be "pll8_vote", "pxo". ++ ++- clock-output-names: ++ Usage: required ++ Value type: ++ Definition: Name of the output clock. Typically acpu_l2_aux indicating ++ an L2 cache auxiliary clock. ++ ++Example: ++ ++ l2cc: clock-controller@2011000 { ++ compatible = "qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc"; ++ reg = <0x2011000 0x1000>; ++ clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>; ++ clock-names = "pll8_vote", "pxo"; ++ clock-output-names = "acpu_l2_aux"; ++ }; diff --git a/target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch b/target/linux/ipq806x/patches-4.19/0034-0010-clk-qcom-Add-Krait-clock-controller-driver.patch similarity index 80% rename from target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch rename to target/linux/ipq806x/patches-4.19/0034-0010-clk-qcom-Add-Krait-clock-controller-driver.patch index dcc10ec79c..7ee1f50f41 100644 --- a/target/linux/ipq806x/patches-4.19/0043-clk-qcom-Add-Krait-clock-controller-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0010-clk-qcom-Add-Krait-clock-controller-driver.patch @@ -1,19 +1,7 @@ -From patchwork Fri Dec 8 09:42:27 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,09/12] clk: qcom: Add Krait clock controller driver -From: Sricharan R -X-Patchwork-Id: 10102061 -Message-Id: <1512726150-7204-10-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:27 +0530 - +From bb5c4a85051e5e0be39c775b6df85521f2ae807d Mon Sep 17 00:00:00 2001 From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:29 +0530 +Subject: [PATCH 10/12] clk: qcom: Add Krait clock controller driver The Krait CPU clocks are made up of a primary mux and secondary mux for each CPU and the L2, controlled via cp15 accessors. For @@ -23,46 +11,24 @@ source. Cc: Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd --- - .../devicetree/bindings/clock/qcom,krait-cc.txt | 22 ++ - drivers/clk/qcom/Kconfig | 8 + - drivers/clk/qcom/Makefile | 1 + - drivers/clk/qcom/krait-cc.c | 350 +++++++++++++++++++++ - 4 files changed, 381 insertions(+) - create mode 100644 Documentation/devicetree/bindings/clock/qcom,krait-cc.txt + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-krait.c | 4 +- + drivers/clk/qcom/krait-cc.c | 341 +++++++++++++++++++++++++++++++++++ + 4 files changed, 352 insertions(+), 2 deletions(-) create mode 100644 drivers/clk/qcom/krait-cc.c ---- /dev/null -+++ b/Documentation/devicetree/bindings/clock/qcom,krait-cc.txt -@@ -0,0 +1,22 @@ -+Krait Clock Controller -+ -+PROPERTIES -+ -+- compatible: -+ Usage: required -+ Value type: -+ Definition: must be one of: -+ "qcom,krait-cc-v1" -+ "qcom,krait-cc-v2" -+ -+- #clock-cells: -+ Usage: required -+ Value type: -+ Definition: must be 1 -+ -+Example: -+ -+ kraitcc: clock-controller { -+ compatible = "qcom,krait-cc-v1"; -+ #clock-cells = <1>; -+ }; --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig -@@ -213,6 +213,14 @@ config KPSS_XCC +@@ -292,3 +292,11 @@ config KPSS_XCC + Support for the Krait ACC and GCC clock controllers. Say Y if you want to support CPU frequency scaling on devices such as MSM8960, APQ8064, etc. - ++ +config KRAITCC + tristate "Krait Clock Controller" + depends on COMMON_CLK_QCOM && ARM @@ -70,31 +36,38 @@ Signed-off-by: Stephen Boyd + help + Support for the Krait CPU clocks on Qualcomm devices. + Say Y if you want to support CPU frequency scaling. -+ - config KRAIT_CLOCKS - bool - select KRAIT_L2_ACCESSORS --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -38,3 +38,4 @@ obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o - obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o +@@ -47,3 +47,4 @@ obj-$(CONFIG_SDM_VIDEOCC_845) += videocc + obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o obj-$(CONFIG_QCOM_HFPLL) += hfpll.o +obj-$(CONFIG_KRAITCC) += krait-cc.o +--- a/drivers/clk/qcom/clk-krait.c ++++ b/drivers/clk/qcom/clk-krait.c +@@ -44,7 +44,7 @@ static int krait_mux_set_parent(struct c + struct krait_mux_clk *mux = to_krait_mux_clk(hw); + u32 sel; + +- sel = clk_mux_reindex(index, mux->parent_map, 0); ++ sel = clk_mux_index_to_val(mux->parent_map, 0, index); + mux->en_mask = sel; + /* Don't touch mux if CPU is off as it won't work */ + if (__clk_is_enabled(hw->clk)) +@@ -63,7 +63,7 @@ static u8 krait_mux_get_parent(struct cl + sel &= mux->mask; + mux->en_mask = sel; + +- return clk_mux_get_parent(hw, sel, mux->parent_map, 0); ++ return clk_mux_val_to_index(hw, mux->parent_map, 0, sel); + } + + const struct clk_ops krait_mux_clk_ops = { --- /dev/null +++ b/drivers/clk/qcom/krait-cc.c -@@ -0,0 +1,350 @@ -+/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ +@@ -0,0 +1,341 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Copyright (c) 2018, The Linux Foundation. All rights reserved. + +#include +#include diff --git a/target/linux/ipq806x/patches-4.19/0034-0011-dt-bindings-clock-Document-qcom-krait-cc.patch b/target/linux/ipq806x/patches-4.19/0034-0011-dt-bindings-clock-Document-qcom-krait-cc.patch new file mode 100644 index 0000000000..13e05c425a --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0034-0011-dt-bindings-clock-Document-qcom-krait-cc.patch @@ -0,0 +1,55 @@ +From bf4503ccf321811192cb07f9711556237c3cf668 Mon Sep 17 00:00:00 2001 +From: Stephen Boyd +Date: Tue, 14 Aug 2018 17:42:30 +0530 +Subject: [PATCH 11/12] dt-bindings: clock: Document qcom,krait-cc + +The Krait clock controller controls the krait CPU and the L2 clocks +consisting a primary mux and secondary mux. Add document for that. + +Reviewed-by: Rob Herring +Signed-off-by: Stephen Boyd +Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd +--- + .../bindings/clock/qcom,krait-cc.txt | 34 +++++++++++++++++++ + 1 file changed, 34 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,krait-cc.txt + +--- /dev/null ++++ b/Documentation/devicetree/bindings/clock/qcom,krait-cc.txt +@@ -0,0 +1,34 @@ ++Krait Clock Controller ++ ++PROPERTIES ++ ++- compatible: ++ Usage: required ++ Value type: ++ Definition: must be one of: ++ "qcom,krait-cc-v1" ++ "qcom,krait-cc-v2" ++ ++- #clock-cells: ++ Usage: required ++ Value type: ++ Definition: must be 1 ++ ++- clocks: ++ Usage: required ++ Value type: ++ Definition: reference to the clock parents of hfpll, secondary muxes. ++ ++- clock-names: ++ Usage: required ++ Value type: ++ Definition: must be "hfpll0", "hfpll1", "acpu0_aux", "acpu1_aux", "qsb". ++ ++Example: ++ ++ kraitcc: clock-controller { ++ compatible = "qcom,krait-cc-v1"; ++ clocks = <&hfpll0>, <&hfpll1>, <&acpu0_aux>, <&acpu1_aux>, ; ++ clock-names = "hfpll0", "hfpll1", "acpu0_aux", "acpu1_aux", "qsb"; ++ #clock-cells = <1>; ++ }; diff --git a/target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches-4.19/0034-0012-clk-qcom-Add-safe-switch-hook-for-krait-mux-clocks.patch similarity index 76% rename from target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch rename to target/linux/ipq806x/patches-4.19/0034-0012-clk-qcom-Add-safe-switch-hook-for-krait-mux-clocks.patch index d0eddc64c2..847b4809a3 100644 --- a/target/linux/ipq806x/patches-4.19/0044-clk-Add-safe-switch-hook.patch +++ b/target/linux/ipq806x/patches-4.19/0034-0012-clk-qcom-Add-safe-switch-hook-for-krait-mux-clocks.patch @@ -1,17 +1,7 @@ -From patchwork Fri Dec 8 09:42:28 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,10/12] clk: qcom: Add safe switch hook for krait mux clocks +From 77612720a2362230af726baa4149c40ec7a7fb05 Mon Sep 17 00:00:00 2001 From: Sricharan R -X-Patchwork-Id: 10102057 -Message-Id: <1512726150-7204-11-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:28 +0530 +Date: Tue, 14 Aug 2018 17:42:31 +0530 +Subject: [PATCH 12/12] clk: qcom: Add safe switch hook for krait mux clocks When the Hfplls are reprogrammed during the rate change, the primary muxes which are sourced from the same hfpll @@ -22,15 +12,17 @@ switching to the safe parent in the PRE_RATE_CHANGE notifier and back to the original parent in the POST_RATE_CHANGE notifier. Signed-off-by: Sricharan R +Tested-by: Craig Tatlor +Signed-off-by: Stephen Boyd --- drivers/clk/qcom/clk-krait.c | 2 ++ - drivers/clk/qcom/clk-krait.h | 3 +++ - drivers/clk/qcom/krait-cc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/clk/qcom/clk-krait.h | 3 ++ + drivers/clk/qcom/krait-cc.c | 56 ++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) --- a/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c -@@ -60,6 +60,8 @@ static int krait_mux_set_parent(struct c +@@ -50,6 +50,8 @@ static int krait_mux_set_parent(struct c if (__clk_is_enabled(hw->clk)) __krait_mux_set_sel(mux, sel); @@ -41,7 +33,7 @@ Signed-off-by: Sricharan R --- a/drivers/clk/qcom/clk-krait.h +++ b/drivers/clk/qcom/clk-krait.h -@@ -23,6 +23,9 @@ struct krait_mux_clk { +@@ -12,6 +12,9 @@ struct krait_mux_clk { u32 shift; u32 en_mask; bool lpl; @@ -53,7 +45,7 @@ Signed-off-by: Sricharan R struct notifier_block clk_nb; --- a/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c -@@ -35,6 +35,49 @@ static unsigned int pri_mux_map[] = { +@@ -26,6 +26,49 @@ static unsigned int pri_mux_map[] = { 0, }; @@ -103,7 +95,7 @@ Signed-off-by: Sricharan R static int krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) { -@@ -79,6 +122,7 @@ static int +@@ -70,6 +113,7 @@ static int krait_add_sec_mux(struct device *dev, int id, const char *s, unsigned int offset, bool unique_aux) { @@ -111,7 +103,7 @@ Signed-off-by: Sricharan R struct krait_mux_clk *mux; static const char *sec_mux_list[] = { "acpu_aux", -@@ -102,6 +146,7 @@ krait_add_sec_mux(struct device *dev, in +@@ -93,6 +137,7 @@ krait_add_sec_mux(struct device *dev, in mux->shift = 2; mux->parent_map = sec_mux_map; mux->hw.init = &init; @@ -119,7 +111,7 @@ Signed-off-by: Sricharan R init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); if (!init.name) -@@ -117,6 +162,11 @@ krait_add_sec_mux(struct device *dev, in +@@ -108,6 +153,11 @@ krait_add_sec_mux(struct device *dev, in clk = devm_clk_register(dev, &mux->hw); @@ -131,7 +123,7 @@ Signed-off-by: Sricharan R if (unique_aux) kfree(sec_mux_list[0]); err_aux: -@@ -128,6 +178,7 @@ static struct clk * +@@ -119,6 +169,7 @@ static struct clk * krait_add_pri_mux(struct device *dev, int id, const char *s, unsigned int offset) { @@ -139,7 +131,7 @@ Signed-off-by: Sricharan R struct krait_mux_clk *mux; const char *p_names[3]; struct clk_init_data init = { -@@ -148,6 +199,7 @@ krait_add_pri_mux(struct device *dev, in +@@ -139,6 +190,7 @@ krait_add_pri_mux(struct device *dev, in mux->lpl = id >= 0; mux->parent_map = pri_mux_map; mux->hw.init = &init; @@ -147,7 +139,7 @@ Signed-off-by: Sricharan R init.name = kasprintf(GFP_KERNEL, "krait%s_pri_mux", s); if (!init.name) -@@ -173,6 +225,10 @@ krait_add_pri_mux(struct device *dev, in +@@ -164,6 +216,10 @@ krait_add_pri_mux(struct device *dev, in clk = devm_clk_register(dev, &mux->hw); diff --git a/target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch b/target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch deleted file mode 100644 index e65ca02980..0000000000 --- a/target/linux/ipq806x/patches-4.19/0035-clk-mux-Split-out-register-accessors-for-reuse.patch +++ /dev/null @@ -1,195 +0,0 @@ -From patchwork Fri Dec 8 09:42:20 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,02/12] clk: mux: Split out register accessors for reuse -From: Sricharan R -X-Patchwork-Id: 10102103 -Message-Id: <1512726150-7204-3-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:20 +0530 - -From: Stephen Boyd - -We want to reuse the logic in clk-mux.c for other clock drivers -that don't use readl as register accessors. Fortunately, there -really isn't much to the mux code besides the table indirection -and quirk flags if you assume any bit shifting and masking has -been done already. Pull that logic out into reusable functions -that operate on an optional table and some flags so that other -drivers can use the same logic. - -Signed-off-by: Stephen Boyd ---- - drivers/clk/clk-mux.c | 75 +++++++++++++++++++++++++++----------------- - include/linux/clk-provider.h | 9 ++++-- - 2 files changed, 54 insertions(+), 30 deletions(-) - ---- a/drivers/clk/clk-mux.c -+++ b/drivers/clk/clk-mux.c -@@ -26,35 +26,24 @@ - * parent - parent is adjustable through clk_set_parent - */ - --static u8 clk_mux_get_parent(struct clk_hw *hw) -+unsigned int clk_mux_get_parent(struct clk_hw *hw, unsigned int val, -+ unsigned int *table, unsigned long flags) - { -- struct clk_mux *mux = to_clk_mux(hw); - int num_parents = clk_hw_get_num_parents(hw); -- u32 val; -- -- /* -- * FIXME need a mux-specific flag to determine if val is bitwise or numeric -- * e.g. sys_clkin_ck's clksel field is 3 bits wide, but ranges from 0x1 -- * to 0x7 (index starts at one) -- * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so -- * val = 0x4 really means "bit 2, index starts at bit 0" -- */ -- val = clk_readl(mux->reg) >> mux->shift; -- val &= mux->mask; - -- if (mux->table) { -+ if (table) { - int i; - - for (i = 0; i < num_parents; i++) -- if (mux->table[i] == val) -+ if (table[i] == val) - return i; - return -EINVAL; - } - -- if (val && (mux->flags & CLK_MUX_INDEX_BIT)) -+ if (val && (flags & CLK_MUX_INDEX_BIT)) - val = ffs(val) - 1; - -- if (val && (mux->flags & CLK_MUX_INDEX_ONE)) -+ if (val && (flags & CLK_MUX_INDEX_ONE)) - val--; - - if (val >= num_parents) -@@ -62,23 +51,53 @@ static u8 clk_mux_get_parent(struct clk_ - - return val; - } -+EXPORT_SYMBOL_GPL(clk_mux_get_parent); - --static int clk_mux_set_parent(struct clk_hw *hw, u8 index) -+static u8 _clk_mux_get_parent(struct clk_hw *hw) - { - struct clk_mux *mux = to_clk_mux(hw); - u32 val; -- unsigned long flags = 0; - -- if (mux->table) { -- index = mux->table[index]; -+ /* -+ * FIXME need a mux-specific flag to determine if val is bitwise or -+ * numeric e.g. sys_clkin_ck's clksel field is 3 bits wide, -+ * but ranges from 0x1 to 0x7 (index starts at one) -+ * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so -+ * val = 0x4 really means "bit 2, index starts at bit 0" -+ */ -+ val = clk_readl(mux->reg) >> mux->shift; -+ val &= mux->mask; -+ -+ return clk_mux_get_parent(hw, val, mux->table, mux->flags); -+} -+ -+unsigned int clk_mux_reindex(u8 index, unsigned int *table, -+ unsigned long flags) -+{ -+ unsigned int val = index; -+ -+ if (table) { -+ val = table[val]; - } else { -- if (mux->flags & CLK_MUX_INDEX_BIT) -- index = 1 << index; -+ if (flags & CLK_MUX_INDEX_BIT) -+ val = 1 << index; - -- if (mux->flags & CLK_MUX_INDEX_ONE) -- index++; -+ if (flags & CLK_MUX_INDEX_ONE) -+ val++; - } - -+ return val; -+} -+EXPORT_SYMBOL_GPL(clk_mux_reindex); -+ -+static int clk_mux_set_parent(struct clk_hw *hw, u8 index) -+{ -+ struct clk_mux *mux = to_clk_mux(hw); -+ u32 val; -+ unsigned long flags = 0; -+ -+ index = clk_mux_reindex(index, mux->table, mux->flags); -+ - if (mux->lock) - spin_lock_irqsave(mux->lock, flags); - else -@@ -110,14 +129,14 @@ static int clk_mux_determine_rate(struct - } - - const struct clk_ops clk_mux_ops = { -- .get_parent = clk_mux_get_parent, -+ .get_parent = _clk_mux_get_parent, - .set_parent = clk_mux_set_parent, - .determine_rate = clk_mux_determine_rate, - }; - EXPORT_SYMBOL_GPL(clk_mux_ops); - - const struct clk_ops clk_mux_ro_ops = { -- .get_parent = clk_mux_get_parent, -+ .get_parent = _clk_mux_get_parent, - }; - EXPORT_SYMBOL_GPL(clk_mux_ro_ops); - -@@ -125,7 +144,7 @@ struct clk_hw *clk_hw_register_mux_table - const char * const *parent_names, u8 num_parents, - unsigned long flags, - void __iomem *reg, u8 shift, u32 mask, -- u8 clk_mux_flags, u32 *table, spinlock_t *lock) -+ u8 clk_mux_flags, unsigned int *table, spinlock_t *lock) - { - struct clk_mux *mux; - struct clk_hw *hw; ---- a/include/linux/clk-provider.h -+++ b/include/linux/clk-provider.h -@@ -468,7 +468,7 @@ void clk_hw_unregister_divider(struct cl - struct clk_mux { - struct clk_hw hw; - void __iomem *reg; -- u32 *table; -+ unsigned int *table; - u32 mask; - u8 shift; - u8 flags; -@@ -486,6 +486,11 @@ struct clk_mux { - extern const struct clk_ops clk_mux_ops; - extern const struct clk_ops clk_mux_ro_ops; - -+unsigned int clk_mux_get_parent(struct clk_hw *hw, unsigned int val, -+ unsigned int *table, unsigned long flags); -+unsigned int clk_mux_reindex(u8 index, unsigned int *table, -+ unsigned long flags); -+ - struct clk *clk_register_mux(struct device *dev, const char *name, - const char * const *parent_names, u8 num_parents, - unsigned long flags, -@@ -506,7 +511,7 @@ struct clk_hw *clk_hw_register_mux_table - const char * const *parent_names, u8 num_parents, - unsigned long flags, - void __iomem *reg, u8 shift, u32 mask, -- u8 clk_mux_flags, u32 *table, spinlock_t *lock); -+ u8 clk_mux_flags, unsigned int *table, spinlock_t *lock); - - void clk_unregister_mux(struct clk *clk); - void clk_hw_unregister_mux(struct clk_hw *hw); diff --git a/target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch b/target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch deleted file mode 100644 index 93c86ebb69..0000000000 --- a/target/linux/ipq806x/patches-4.19/0042-clk-qcom-Add-KPSS-ACC-GCC-driver.patch +++ /dev/null @@ -1,209 +0,0 @@ -From patchwork Fri Dec 8 09:42:26 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,08/12] clk: qcom: Add KPSS ACC/GCC driver -From: Sricharan R -X-Patchwork-Id: 10102023 -Message-Id: <1512726150-7204-9-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:26 +0530 - -From: Stephen Boyd - -The ACC and GCC regions present in KPSSv1 contain registers to -control clocks and power to each Krait CPU and L2. For CPUfreq -purposes probe these devices and expose a mux clock that chooses -between PXO and PLL8. - -Cc: -Signed-off-by: Stephen Boyd ---- - .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 7 ++ - .../devicetree/bindings/arm/msm/qcom,kpss-gcc.txt | 28 +++++++ - drivers/clk/qcom/Kconfig | 8 ++ - drivers/clk/qcom/Makefile | 1 + - drivers/clk/qcom/kpss-xcc.c | 96 ++++++++++++++++++++++ - 5 files changed, 140 insertions(+) - create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt - create mode 100644 drivers/clk/qcom/kpss-xcc.c - ---- a/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt -+++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt -@@ -21,10 +21,17 @@ PROPERTIES - the register region. An optional second element specifies - the base address and size of the alias register region. - -+- clock-output-names: -+ Usage: optional -+ Value type: -+ Definition: Name of the output clock. Typically acpuX_aux where X is a -+ CPU number starting at 0. -+ - Example: - - clock-controller@2088000 { - compatible = "qcom,kpss-acc-v2"; - reg = <0x02088000 0x1000>, - <0x02008000 0x1000>; -+ clock-output-names = "acpu0_aux"; - }; ---- /dev/null -+++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt -@@ -0,0 +1,28 @@ -+Krait Processor Sub-system (KPSS) Global Clock Controller (GCC) -+ -+PROPERTIES -+ -+- compatible: -+ Usage: required -+ Value type: -+ Definition: should be one of: -+ "qcom,kpss-gcc" -+ -+- reg: -+ Usage: required -+ Value type: -+ Definition: base address and size of the register region -+ -+- clock-output-names: -+ Usage: required -+ Value type: -+ Definition: Name of the output clock. Typically acpu_l2_aux indicating -+ an L2 cache auxiliary clock. -+ -+Example: -+ -+ l2cc: clock-controller@2011000 { -+ compatible = "qcom,kpss-gcc"; -+ reg = <0x2011000 0x1000>; -+ clock-output-names = "acpu_l2_aux"; -+ }; ---- a/drivers/clk/qcom/Kconfig -+++ b/drivers/clk/qcom/Kconfig -@@ -205,6 +205,14 @@ config QCOM_HFPLL - Say Y if you want to support CPU frequency scaling on devices - such as MSM8974, APQ8084, etc. - -+config KPSS_XCC -+ tristate "KPSS Clock Controller" -+ depends on COMMON_CLK_QCOM -+ help -+ Support for the Krait ACC and GCC clock controllers. Say Y -+ if you want to support CPU frequency scaling on devices such -+ as MSM8960, APQ8064, etc. -+ - config KRAIT_CLOCKS - bool - select KRAIT_L2_ACCESSORS ---- a/drivers/clk/qcom/Makefile -+++ b/drivers/clk/qcom/Makefile -@@ -36,4 +36,5 @@ obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8 - obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o - obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o - obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o -+obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o - obj-$(CONFIG_QCOM_HFPLL) += hfpll.o ---- /dev/null -+++ b/drivers/clk/qcom/kpss-xcc.c -@@ -0,0 +1,96 @@ -+/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static const char *aux_parents[] = { -+ "pll8_vote", -+ "pxo", -+}; -+ -+static unsigned int aux_parent_map[] = { -+ 3, -+ 0, -+}; -+ -+static const struct of_device_id kpss_xcc_match_table[] = { -+ { .compatible = "qcom,kpss-acc-v1", .data = (void *)1UL }, -+ { .compatible = "qcom,kpss-gcc" }, -+ {} -+}; -+MODULE_DEVICE_TABLE(of, kpss_xcc_match_table); -+ -+static int kpss_xcc_driver_probe(struct platform_device *pdev) -+{ -+ const struct of_device_id *id; -+ struct clk *clk; -+ struct resource *res; -+ void __iomem *base; -+ const char *name; -+ -+ id = of_match_device(kpss_xcc_match_table, &pdev->dev); -+ if (!id) -+ return -ENODEV; -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ base = devm_ioremap_resource(&pdev->dev, res); -+ if (IS_ERR(base)) -+ return PTR_ERR(base); -+ -+ if (id->data) { -+ if (of_property_read_string_index(pdev->dev.of_node, -+ "clock-output-names", -+ 0, &name)) -+ return -ENODEV; -+ base += 0x14; -+ } else { -+ name = "acpu_l2_aux"; -+ base += 0x28; -+ } -+ -+ clk = clk_register_mux_table(&pdev->dev, name, aux_parents, -+ ARRAY_SIZE(aux_parents), 0, base, 0, 0x3, -+ 0, aux_parent_map, NULL); -+ -+ platform_set_drvdata(pdev, clk); -+ -+ return PTR_ERR_OR_ZERO(clk); -+} -+ -+static int kpss_xcc_driver_remove(struct platform_device *pdev) -+{ -+ clk_unregister_mux(platform_get_drvdata(pdev)); -+ return 0; -+} -+ -+static struct platform_driver kpss_xcc_driver = { -+ .probe = kpss_xcc_driver_probe, -+ .remove = kpss_xcc_driver_remove, -+ .driver = { -+ .name = "kpss-xcc", -+ .of_match_table = kpss_xcc_match_table, -+ }, -+}; -+module_platform_driver(kpss_xcc_driver); -+ -+MODULE_DESCRIPTION("Krait Processor Sub System (KPSS) Clock Driver"); -+MODULE_LICENSE("GPL v2"); -+MODULE_ALIAS("platform:kpss-xcc"); diff --git a/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch b/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch index 86cb4b9a3e..5b081feac7 100644 --- a/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch +++ b/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch @@ -72,9 +72,9 @@ Signed-off-by: Stephen Boyd + }; --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm -@@ -100,6 +100,15 @@ config ARM_OMAP2PLUS_CPUFREQ - depends on ARCH_OMAP2PLUS - default ARCH_OMAP2PLUS +@@ -121,6 +121,15 @@ config ARM_QCOM_CPUFREQ_KRYO + + If in doubt, say N. +config ARM_QCOM_CPUFREQ + tristate "Qualcomm based" @@ -90,14 +90,14 @@ Signed-off-by: Stephen Boyd help --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile -@@ -62,6 +62,7 @@ obj-$(CONFIG_ARM_MEDIATEK_CPUFREQ) += me +@@ -64,6 +64,7 @@ obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cp obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o +obj-$(CONFIG_ARM_QCOM_CPUFREQ) += qcom-cpufreq.o - obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o - obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o + obj-$(CONFIG_ARM_QCOM_CPUFREQ_KRYO) += qcom-cpufreq-kryo.o obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o + obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o --- /dev/null +++ b/drivers/cpufreq/qcom-cpufreq.c @@ -0,0 +1,204 @@ diff --git a/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch b/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch index b3b3072bcb..7743dd1c4f 100644 --- a/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch +++ b/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch @@ -28,7 +28,7 @@ Signed-off-by: Sricharan R --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -231,7 +231,10 @@ static int cpufreq_init(struct cpufreq_p +@@ -239,7 +239,10 @@ static int cpufreq_init(struct cpufreq_p } if (fallback) { @@ -40,9 +40,9 @@ Signed-off-by: Sricharan R /* * OPP tables are initialized only for policy->cpu, do it for -@@ -376,6 +379,8 @@ static int dt_cpufreq_probe(struct platf - if (data && data->have_governor_per_policy) - dt_cpufreq_driver.flags |= CPUFREQ_HAVE_GOVERNOR_PER_POLICY; +@@ -359,6 +362,8 @@ static int dt_cpufreq_probe(struct platf + dt_cpufreq_driver.suspend = data->suspend; + } + dt_cpufreq_driver.driver_data = data; + @@ -51,8 +51,8 @@ Signed-off-by: Sricharan R dev_err(&pdev->dev, "failed register driver: %d\n", ret); --- a/drivers/cpufreq/cpufreq-dt.h +++ b/drivers/cpufreq/cpufreq-dt.h -@@ -13,6 +13,12 @@ - #include +@@ -15,6 +15,12 @@ + struct cpufreq_policy; struct cpufreq_dt_platform_data { + /* @@ -62,5 +62,5 @@ Signed-off-by: Sricharan R + */ + bool independent_clocks; bool have_governor_per_policy; - }; + int (*suspend)(struct cpufreq_policy *policy); diff --git a/target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch b/target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch deleted file mode 100644 index fe98980766..0000000000 --- a/target/linux/ipq806x/patches-4.19/0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c7c6a0f50f9ac3620c611ce06ba1f9fafea0444e Mon Sep 17 00:00:00 2001 -From: Archit Taneja -Date: Mon, 3 Aug 2015 10:38:14 +0530 -Subject: [PATCH 47/69] mtd: nand: Create a BBT flag to access bad block - markers in raw mode - -Some controllers can access the factory bad block marker from OOB only -when they read it in raw mode. When ECC is enabled, these controllers -discard reading/writing bad block markers, preventing access to them -altogether. - -The bbt driver assumes MTD_OPS_PLACE_OOB when scanning for bad blocks. -This results in the nand driver's ecc->read_oob() op to be called, which -works with ECC enabled. - -Create a new BBT option flag that tells nand_bbt to force the mode to -MTD_OPS_RAW. This would result in the correct op being called for the -underlying nand controller driver. - -Reviewed-by: Andy Gross -Signed-off-by: Archit Taneja ---- - drivers/mtd/nand/nand_base.c | 6 +++++- - drivers/mtd/nand/nand_bbt.c | 6 +++++- - include/linux/mtd/bbm.h | 6 ++++++ - 3 files changed, 16 insertions(+), 2 deletions(-) - ---- a/drivers/mtd/nand/nand_base.c -+++ b/drivers/mtd/nand/nand_base.c -@@ -481,7 +481,11 @@ static int nand_default_block_markbad(st - } else { - ops.len = ops.ooblen = 1; - } -- ops.mode = MTD_OPS_PLACE_OOB; -+ -+ if (unlikely(chip->bbt_options & NAND_BBT_ACCESS_BBM_RAW)) -+ ops.mode = MTD_OPS_RAW; -+ else -+ ops.mode = MTD_OPS_PLACE_OOB; - - /* Write to first/last page(s) if necessary */ - if (chip->bbt_options & NAND_BBT_SCANLASTPAGE) ---- a/drivers/mtd/nand/nand_bbt.c -+++ b/drivers/mtd/nand/nand_bbt.c -@@ -420,7 +420,11 @@ static int scan_block_fast(struct mtd_in - ops.oobbuf = buf; - ops.ooboffs = 0; - ops.datbuf = NULL; -- ops.mode = MTD_OPS_PLACE_OOB; -+ -+ if (unlikely(bd->options & NAND_BBT_ACCESS_BBM_RAW)) -+ ops.mode = MTD_OPS_RAW; -+ else -+ ops.mode = MTD_OPS_PLACE_OOB; - - for (j = 0; j < numpages; j++) { - /* ---- a/include/linux/mtd/bbm.h -+++ b/include/linux/mtd/bbm.h -@@ -116,6 +116,12 @@ struct nand_bbt_descr { - #define NAND_BBT_NO_OOB_BBM 0x00080000 - - /* -+ * Force MTD_OPS_RAW mode when trying to access bad block markes from OOB. To -+ * be used by controllers which can access BBM only when ECC is disabled, i.e, -+ * when in RAW access mode -+ */ -+#define NAND_BBT_ACCESS_BBM_RAW 0x00100000 -+/* - * Flag set by nand_create_default_bbt_descr(), marking that the nand_bbt_descr - * was allocated dynamicaly and must be freed in nand_release(). Has no meaning - * in nand_chip.bbt_options. diff --git a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch index 7c78d444f8..d415f7b744 100644 --- a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch +++ b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch @@ -8,9 +8,9 @@ Signed-off-by: Georgi Djakov drivers/base/power/opp/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- a/drivers/base/power/opp/core.c -+++ b/drivers/base/power/opp/core.c -@@ -1280,11 +1280,13 @@ struct opp_table *dev_pm_opp_set_regulat +--- a/drivers/opp/core.c ++++ b/drivers/opp/core.c +@@ -1317,11 +1317,13 @@ struct opp_table *dev_pm_opp_set_regulat if (!opp_table) return ERR_PTR(-ENOMEM); @@ -22,5 +22,5 @@ Signed-off-by: Georgi Djakov } +#endif - /* Already have regulators set */ - if (opp_table->regulators) { + /* Another CPU that shares the OPP table has set the regulators ? */ + if (opp_table->regulators) diff --git a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch index ef48e9f01b..1a0e50d3d3 100644 --- a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch +++ b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -21,13 +21,13 @@ Signed-off-by: Stephen Boyd Acked-by: Viresh Kumar Signed-off-by: Georgi Djakov --- - drivers/base/power/opp/core.c | 77 +++++++++++++++++++++++++++++++++++++++++++ + drivers/opp/core.c | 77 +++++++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 11 +++++++ 2 files changed, 88 insertions(+) ---- a/drivers/base/power/opp/core.c -+++ b/drivers/base/power/opp/core.c -@@ -1608,6 +1608,83 @@ put_table: +--- a/drivers/opp/core.c ++++ b/drivers/opp/core.c +@@ -1625,6 +1625,83 @@ put_table: } /** diff --git a/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch b/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch index 22ae309801..4312db905a 100644 --- a/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch +++ b/target/linux/ipq806x/patches-4.19/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch @@ -6,13 +6,13 @@ Subject: [PATCH 51/69] PM / OPP: Add a helper to get an opp regulator for Signed-off-by: Georgi Djakov --- - drivers/base/power/opp/core.c | 21 +++++++++++++++++++++ + drivers/opp/core.c | 21 +++++++++++++++++++++ include/linux/pm_opp.h | 1 + 2 files changed, 22 insertions(+) ---- a/drivers/base/power/opp/core.c -+++ b/drivers/base/power/opp/core.c -@@ -126,6 +126,27 @@ unsigned long dev_pm_opp_get_freq(struct +--- a/drivers/opp/core.c ++++ b/drivers/opp/core.c +@@ -125,6 +125,27 @@ unsigned long dev_pm_opp_get_freq(struct } EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq); diff --git a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch index 7cde22be0b..2882f505d9 100644 --- a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch +++ b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -12,12 +12,12 @@ Fix this by updating the voltage tolerance values too. Signed-off-by: Georgi Djakov --- - drivers/base/power/opp/core.c | 5 +++++ + drivers/opp/core.c | 5 +++++ 1 file changed, 5 insertions(+) ---- a/drivers/base/power/opp/core.c -+++ b/drivers/base/power/opp/core.c -@@ -1652,6 +1652,7 @@ int dev_pm_opp_adjust_voltage(struct dev +--- a/drivers/opp/core.c ++++ b/drivers/opp/core.c +@@ -1669,6 +1669,7 @@ int dev_pm_opp_adjust_voltage(struct dev struct opp_table *opp_table; struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); int r = 0; @@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov /* keep the node allocated */ new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); -@@ -1688,6 +1689,10 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -1705,6 +1706,10 @@ int dev_pm_opp_adjust_voltage(struct dev /* plug in new node */ new_opp->supplies[0].u_volt = u_volt; diff --git a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch index dcf0bcd3f2..5a4232ded3 100644 --- a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch +++ b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch @@ -35,26 +35,23 @@ Signed-off-by: Georgi Djakov bool have_static_opps; }; -@@ -44,9 +47,16 @@ static struct freq_attr *cpufreq_dt_attr - static int set_target(struct cpufreq_policy *policy, unsigned int index) - { - struct private_data *priv = policy->driver_data; -+ int ret; -+ unsigned long target_freq = policy->freq_table[index].frequency * 1000; -+ +@@ -47,12 +50,15 @@ static int set_target(struct cpufreq_pol + unsigned long freq = policy->freq_table[index].frequency; + int ret; + + mutex_lock(&priv->lock); -+ ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq); -+ if (!ret) -+ priv->opp_freq = target_freq; + ret = dev_pm_opp_set_rate(priv->cpu_dev, freq * 1000); + + if (!ret) { ++ priv->opp_freq = freq * 1000; + arch_set_freq_scale(policy->related_cpus, freq, + policy->cpuinfo.max_freq); + } + mutex_unlock(&priv->lock); -- return dev_pm_opp_set_rate(priv->cpu_dev, -- policy->freq_table[index].frequency * 1000); -+ return ret; + return ret; } - - /* -@@ -87,6 +97,39 @@ node_put: +@@ -95,6 +101,39 @@ node_put: return name; } @@ -94,7 +91,7 @@ Signed-off-by: Georgi Djakov static int resources_available(void) { struct device *cpu_dev; -@@ -153,6 +196,7 @@ static int cpufreq_init(struct cpufreq_p +@@ -161,6 +200,7 @@ static int cpufreq_init(struct cpufreq_p bool fallback = false; const char *name; int ret; @@ -102,7 +99,7 @@ Signed-off-by: Georgi Djakov cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { -@@ -246,10 +290,13 @@ static int cpufreq_init(struct cpufreq_p +@@ -254,10 +294,13 @@ static int cpufreq_init(struct cpufreq_p __func__, ret); } @@ -117,7 +114,7 @@ Signed-off-by: Georgi Djakov } priv->cpu_dev = cpu_dev; -@@ -285,6 +332,8 @@ static int cpufreq_init(struct cpufreq_p +@@ -287,6 +330,8 @@ static int cpufreq_init(struct cpufreq_p out_free_cpufreq_table: dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch index 1c26650b78..bf4935a7c9 100644 --- a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -11,23 +11,23 @@ Signed-off-by: Georgi Djakov --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -49,11 +49,41 @@ static int set_target(struct cpufreq_pol +@@ -49,11 +49,39 @@ static int set_target(struct cpufreq_pol struct private_data *priv = policy->driver_data; + unsigned long freq = policy->freq_table[index].frequency; int ret; - unsigned long target_freq = policy->freq_table[index].frequency * 1000; + struct clk *l2_clk = policy->l2_clk; + unsigned int l2_freq; + unsigned long new_l2_freq = 0; mutex_lock(&priv->lock); - ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq); -- if (!ret) -+ -+ if (!ret) { + ret = dev_pm_opp_set_rate(priv->cpu_dev, freq * 1000); + + if (!ret) { + if (!IS_ERR(l2_clk) && policy->l2_rate[0] && policy->l2_rate[1] && + policy->l2_rate[2]) { + static unsigned long krait_l2[CONFIG_NR_CPUS] = { }; + int cpu, ret = 0; ++ unsigned long target_freq = freq * 1000; + + if (target_freq >= policy->l2_rate[2]) + new_l2_freq = policy->l2_rate[2]; @@ -48,13 +48,10 @@ Signed-off-by: Georgi Djakov + } + } + - priv->opp_freq = target_freq; -+ } -+ - mutex_unlock(&priv->lock); - - return ret; -@@ -197,6 +227,8 @@ static int cpufreq_init(struct cpufreq_p + priv->opp_freq = freq * 1000; + arch_set_freq_scale(policy->related_cpus, freq, + policy->cpuinfo.max_freq); +@@ -201,6 +229,8 @@ static int cpufreq_init(struct cpufreq_p const char *name; int ret; struct srcu_notifier_head *opp_srcu_head; @@ -63,7 +60,7 @@ Signed-off-by: Georgi Djakov cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { -@@ -305,6 +337,13 @@ static int cpufreq_init(struct cpufreq_p +@@ -310,6 +340,13 @@ static int cpufreq_init(struct cpufreq_p policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000; @@ -74,9 +71,9 @@ Signed-off-by: Georgi Djakov + if (l2_np) + of_property_read_u32_array(l2_np, "qcom,l2-rates", policy->l2_rate, 3); + - ret = cpufreq_table_validate_and_show(policy, freq_table); - if (ret) { - dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__, + /* Support turbo/boost mode */ + if (policy_has_boost_freq(policy)) { + /* This gets disabled by core on driver unregister */ --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -73,6 +73,8 @@ struct cpufreq_policy { diff --git a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch index d9d76e409b..4925efabee 100644 --- a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch +++ b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch @@ -10,7 +10,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -144,8 +144,10 @@ static int opp_notifier(struct notifier_ +@@ -146,8 +146,10 @@ static int opp_notifier(struct notifier_ ret = PTR_ERR(cpu_reg); goto out; } diff --git a/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch b/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch index f810f6ac46..543f18ce4d 100644 --- a/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch +++ b/target/linux/ipq806x/patches-4.19/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch @@ -33,7 +33,7 @@ Signed-off-by: Mathieu Olivari --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -341,7 +341,7 @@ config ARCH_MULTIPLATFORM +@@ -331,7 +331,7 @@ config ARCH_MULTIPLATFORM depends on MMU select ARM_HAS_SG_CHAIN select ARM_PATCH_PHYS_VIRT diff --git a/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch b/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch index 685b0c3ce1..9ee88533aa 100644 --- a/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0063-1-ipq806x-tsens-driver.patch @@ -24,30 +24,13 @@ following fucntionalities: Change-Id: I8bc7204fd627d10875ab13fc1de8cb6c2ed7a918 Signed-off-by: Rajith Cherian --- - .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + - drivers/thermal/qcom/Makefile | 3 +- - drivers/thermal/qcom/tsens-ipq8064.c | 551 +++++++++++++++++++++ - drivers/thermal/qcom/tsens.c | 3 + - drivers/thermal/qcom/tsens.h | 2 +- - 5 files changed, 558 insertions(+), 2 deletions(-) - create mode 100644 drivers/thermal/qcom/tsens-ipq8064.c ---- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt -+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt -@@ -5,6 +5,7 @@ Required properties: - - "qcom,msm8916-tsens" : For 8916 Family of SoCs - - "qcom,msm8974-tsens" : For 8974 Family of SoCs - - "qcom,msm8996-tsens" : For 8996 Family of SoCs -+ - "qcom,ipq8064-tsens" : For IPQ8064 - - - reg: Address range of the thermal registers - - #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. --- a/drivers/thermal/qcom/Makefile +++ b/drivers/thermal/qcom/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o --qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o -+qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o \ +-qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o ++qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o \ + tsens-ipq8064.o --- /dev/null +++ b/drivers/thermal/qcom/tsens-ipq8064.c @@ -605,23 +588,27 @@ Signed-off-by: Rajith Cherian +}; --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c -@@ -72,6 +72,9 @@ static const struct of_device_id tsens_t +@@ -75,8 +75,11 @@ static const struct of_device_id tsens_t }, { - .compatible = "qcom,msm8996-tsens", - .data = &data_8996, + .compatible = "qcom,tsens-v2", + .data = &data_tsens_v2, + }, { + .compatible = "qcom,ipq8064-tsens", + .data = &data_ipq8064, }, - {} +- {} ++ {} }; + MODULE_DEVICE_TABLE(of, tsens_table); + --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h -@@ -89,6 +89,6 @@ void compute_intercept_slope(struct tsen - int init_common(struct tsens_device *); +@@ -89,7 +89,7 @@ int init_common(struct tsens_device *); int get_temp_common(struct tsens_device *, int, int *); --extern const struct tsens_data data_8916, data_8974, data_8960, data_8996; -+extern const struct tsens_data data_8916, data_8974, data_8960, data_8996, data_ipq8064; + /* TSENS v1 targets */ +-extern const struct tsens_data data_8916, data_8974, data_8960; ++extern const struct tsens_data data_8916, data_8974, data_8960, data_ipq8064; + /* TSENS v2 targets */ + extern const struct tsens_data data_8996, data_tsens_v2; - #endif /* __QCOM_TSENS_H__ */ diff --git a/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch b/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch index 944d1e575b..62e26cbee4 100644 --- a/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch +++ b/target/linux/ipq806x/patches-4.19/0063-2-tsens-support-configurable-interrupts.patch @@ -21,27 +21,9 @@ Signed-off-by: Rajith Cherian include/linux/thermal.h | 14 +++++ 6 files changed, 162 insertions(+), 17 deletions(-) ---- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt -+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt -@@ -12,11 +12,15 @@ Required properties: - - Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify - nvmem cells - -+Optional properties: -+- interrupts: Interrupt which gets triggered when threshold is hit -+ - Example: - tsens: thermal-sensor@900000 { - compatible = "qcom,msm8916-tsens"; - reg = <0x4a8000 0x2000>; - nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; - nvmem-cell-names = "caldata", "calsel"; -+ interrupts = <0 178 0>; - #thermal-sensor-cells = <1>; - }; --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c -@@ -95,7 +95,7 @@ static int of_thermal_get_temp(struct th +@@ -77,7 +77,7 @@ static int of_thermal_get_temp(struct th { struct __thermal_zone *data = tz->devdata; @@ -50,7 +32,7 @@ Signed-off-by: Rajith Cherian return -EINVAL; return data->ops->get_temp(data->sensor_data, temp); -@@ -106,7 +106,8 @@ static int of_thermal_set_trips(struct t +@@ -88,7 +88,8 @@ static int of_thermal_set_trips(struct t { struct __thermal_zone *data = tz->devdata; @@ -60,7 +42,7 @@ Signed-off-by: Rajith Cherian return -EINVAL; return data->ops->set_trips(data->sensor_data, low, high); -@@ -192,6 +193,9 @@ static int of_thermal_set_emul_temp(stru +@@ -174,6 +175,9 @@ static int of_thermal_set_emul_temp(stru { struct __thermal_zone *data = tz->devdata; @@ -70,7 +52,7 @@ Signed-off-by: Rajith Cherian return data->ops->set_emul_temp(data->sensor_data, temp); } -@@ -200,7 +204,7 @@ static int of_thermal_get_trend(struct t +@@ -182,7 +186,7 @@ static int of_thermal_get_trend(struct t { struct __thermal_zone *data = tz->devdata; @@ -79,7 +61,7 @@ Signed-off-by: Rajith Cherian return -EINVAL; return data->ops->get_trend(data->sensor_data, trip, trend); -@@ -289,7 +293,9 @@ static int of_thermal_set_mode(struct th +@@ -271,7 +275,9 @@ static int of_thermal_set_mode(struct th mutex_unlock(&tz->lock); data->mode = mode; @@ -90,7 +72,7 @@ Signed-off-by: Rajith Cherian return 0; } -@@ -299,7 +305,8 @@ static int of_thermal_get_trip_type(stru +@@ -281,7 +287,8 @@ static int of_thermal_get_trip_type(stru { struct __thermal_zone *data = tz->devdata; @@ -100,7 +82,7 @@ Signed-off-by: Rajith Cherian return -EDOM; *type = data->trips[trip].type; -@@ -307,12 +314,39 @@ static int of_thermal_get_trip_type(stru +@@ -289,12 +296,39 @@ static int of_thermal_get_trip_type(stru return 0; } @@ -141,7 +123,7 @@ Signed-off-by: Rajith Cherian return -EDOM; *temp = data->trips[trip].temperature; -@@ -325,7 +359,8 @@ static int of_thermal_set_trip_temp(stru +@@ -307,7 +341,8 @@ static int of_thermal_set_trip_temp(stru { struct __thermal_zone *data = tz->devdata; @@ -151,7 +133,7 @@ Signed-off-by: Rajith Cherian return -EDOM; if (data->ops->set_trip_temp) { -@@ -347,7 +382,8 @@ static int of_thermal_get_trip_hyst(stru +@@ -329,7 +364,8 @@ static int of_thermal_get_trip_hyst(stru { struct __thermal_zone *data = tz->devdata; @@ -161,7 +143,7 @@ Signed-off-by: Rajith Cherian return -EDOM; *hyst = data->trips[trip].hysteresis; -@@ -360,7 +396,8 @@ static int of_thermal_set_trip_hyst(stru +@@ -342,7 +378,8 @@ static int of_thermal_set_trip_hyst(stru { struct __thermal_zone *data = tz->devdata; @@ -171,7 +153,7 @@ Signed-off-by: Rajith Cherian return -EDOM; /* thermal framework should take care of data->mask & (1 << trip) */ -@@ -435,6 +472,9 @@ thermal_zone_of_add_sensor(struct device +@@ -417,6 +454,9 @@ thermal_zone_of_add_sensor(struct device if (ops->set_emul_temp) tzd->ops->set_emul_temp = of_thermal_set_emul_temp; @@ -181,7 +163,7 @@ Signed-off-by: Rajith Cherian mutex_unlock(&tzd->lock); return tzd; -@@ -729,7 +769,10 @@ static const char * const trip_types[] = +@@ -711,7 +751,10 @@ static const char * const trip_types[] = [THERMAL_TRIP_ACTIVE] = "active", [THERMAL_TRIP_PASSIVE] = "passive", [THERMAL_TRIP_HOT] = "hot", @@ -261,7 +243,7 @@ Signed-off-by: Rajith Cherian static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume); static const struct of_device_id tsens_table[] = { -@@ -83,6 +109,8 @@ MODULE_DEVICE_TABLE(of, tsens_table); +@@ -86,6 +112,8 @@ MODULE_DEVICE_TABLE(of, tsens_table); static const struct thermal_zone_of_device_ops tsens_of_ops = { .get_temp = tsens_get_temp, .get_trend = tsens_get_trend, @@ -270,18 +252,18 @@ Signed-off-by: Rajith Cherian }; static int tsens_register(struct tsens_device *tmdev) -@@ -131,7 +159,7 @@ static int tsens_probe(struct platform_d +@@ -134,7 +162,7 @@ static int tsens_probe(struct platform_d if (id) data = id->data; else - data = &data_8960; + return -EINVAL; - if (data->num_sensors <= 0) { - dev_err(dev, "invalid number of sensors\n"); -@@ -146,6 +174,9 @@ static int tsens_probe(struct platform_d + num_sensors = data->num_sensors; + +@@ -155,6 +183,9 @@ static int tsens_probe(struct platform_d tmdev->dev = dev; - tmdev->num_sensors = data->num_sensors; + tmdev->num_sensors = num_sensors; tmdev->ops = data->ops; + + tmdev->tsens_irq = platform_get_irq(pdev, 0); @@ -324,15 +306,14 @@ Signed-off-by: Rajith Cherian }; /** -@@ -76,11 +85,13 @@ struct tsens_context { +@@ -76,10 +85,12 @@ struct tsens_context { struct tsens_device { struct device *dev; u32 num_sensors; + u32 tsens_irq; struct regmap *map; - struct regmap_field *status_field; + u32 tm_offset; struct tsens_context ctx; - bool trdy; const struct tsens_ops *ops; + struct work_struct tsens_work; struct tsens_sensor sensor[0]; @@ -340,7 +321,7 @@ Signed-off-by: Rajith Cherian --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c -@@ -115,12 +115,48 @@ trip_point_type_show(struct device *dev, +@@ -113,12 +113,48 @@ trip_point_type_show(struct device *dev, return sprintf(buf, "passive\n"); case THERMAL_TRIP_ACTIVE: return sprintf(buf, "active\n"); @@ -389,7 +370,7 @@ Signed-off-by: Rajith Cherian trip_point_temp_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { -@@ -562,6 +598,12 @@ static int create_trip_attrs(struct ther +@@ -559,6 +595,12 @@ static int create_trip_attrs(struct ther tz->trip_type_attrs[indx].attr.show = trip_point_type_show; attrs[indx] = &tz->trip_type_attrs[indx].attr.attr; @@ -404,7 +385,7 @@ Signed-off-by: Rajith Cherian "trip_point_%d_temp", indx); --- a/include/linux/thermal.h +++ b/include/linux/thermal.h -@@ -78,11 +78,19 @@ enum thermal_device_mode { +@@ -63,11 +63,19 @@ enum thermal_device_mode { THERMAL_DEVICE_ENABLED, }; @@ -424,7 +405,7 @@ Signed-off-by: Rajith Cherian }; enum thermal_trend { -@@ -120,6 +128,8 @@ struct thermal_zone_device_ops { +@@ -105,6 +113,8 @@ struct thermal_zone_device_ops { enum thermal_trip_type *); int (*get_trip_temp) (struct thermal_zone_device *, int, int *); int (*set_trip_temp) (struct thermal_zone_device *, int, int); @@ -433,7 +414,7 @@ Signed-off-by: Rajith Cherian int (*get_trip_hyst) (struct thermal_zone_device *, int, int *); int (*set_trip_hyst) (struct thermal_zone_device *, int, int); int (*get_crit_temp) (struct thermal_zone_device *, int *); -@@ -363,6 +373,8 @@ struct thermal_genl_event { +@@ -349,6 +359,8 @@ struct thermal_genl_event { * temperature. * @set_trip_temp: a pointer to a function that sets the trip temperature on * hardware. @@ -442,7 +423,7 @@ Signed-off-by: Rajith Cherian */ struct thermal_zone_of_device_ops { int (*get_temp)(void *, int *); -@@ -370,6 +382,8 @@ struct thermal_zone_of_device_ops { +@@ -356,6 +368,8 @@ struct thermal_zone_of_device_ops { int (*set_trips)(void *, int, int); int (*set_emul_temp)(void *, int); int (*set_trip_temp)(void *, int, int); diff --git a/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch b/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch index 167278a701..72217de12e 100644 --- a/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch +++ b/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch @@ -12,19 +12,32 @@ Signed-off-by: John Crispin --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt -@@ -13,6 +13,7 @@ Required properties : - "qcom,rpmcc-msm8916", "qcom,rpmcc" +@@ -16,6 +16,7 @@ Required properties : "qcom,rpmcc-msm8974", "qcom,rpmcc" "qcom,rpmcc-apq8064", "qcom,rpmcc" + "qcom,rpmcc-msm8996", "qcom,rpmcc" + "qcom,rpmcc-ipq806x", "qcom,rpmcc" - #clock-cells : shall contain 1 +--- a/include/dt-bindings/clock/qcom,rpmcc.h ++++ b/include/dt-bindings/clock/qcom,rpmcc.h +@@ -45,6 +45,10 @@ + #define RPM_XO_A0 27 + #define RPM_XO_A1 28 + #define RPM_XO_A2 29 ++#define RPM_NSS_FABRIC_0_CLK 30 ++#define RPM_NSS_FABRIC_0_A_CLK 31 ++#define RPM_NSS_FABRIC_1_CLK 32 ++#define RPM_NSS_FABRIC_1_A_CLK 33 + + /* SMD RPM clocks */ + #define RPM_SMD_XO_CLK_SRC 0 --- a/drivers/clk/qcom/clk-rpm.c +++ b/drivers/clk/qcom/clk-rpm.c -@@ -359,6 +359,16 @@ DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a - DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK); - DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK); +@@ -520,6 +520,16 @@ DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a0_ + DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a1_clk, xo_a1_a_clk, 24); + DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a2_clk, xo_a2_a_clk, 28); +/* ipq806x */ +DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK); @@ -39,8 +52,8 @@ Signed-off-by: John Crispin static struct clk_rpm *apq8064_clks[] = { [RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk, [RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk, -@@ -380,13 +390,38 @@ static struct clk_rpm *apq8064_clks[] = - [RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk, +@@ -546,15 +556,40 @@ static struct clk_rpm *apq8064_clks[] = + [RPM_XO_A2] = &apq8064_xo_a2_clk, }; +static struct clk_rpm *ipq806x_clks[] = { @@ -73,21 +86,10 @@ Signed-off-by: John Crispin +}; + static const struct of_device_id rpm_clk_match_table[] = { + { .compatible = "qcom,rpmcc-msm8660", .data = &rpm_clk_msm8660 }, + { .compatible = "qcom,rpmcc-apq8060", .data = &rpm_clk_msm8660 }, { .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 }, + { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x }, { } }; MODULE_DEVICE_TABLE(of, rpm_clk_match_table); ---- a/include/dt-bindings/clock/qcom,rpmcc.h -+++ b/include/dt-bindings/clock/qcom,rpmcc.h -@@ -37,6 +37,10 @@ - #define RPM_SYS_FABRIC_A_CLK 19 - #define RPM_SFPB_CLK 20 - #define RPM_SFPB_A_CLK 21 -+#define RPM_NSS_FABRIC_0_CLK 22 -+#define RPM_NSS_FABRIC_0_A_CLK 23 -+#define RPM_NSS_FABRIC_1_CLK 24 -+#define RPM_NSS_FABRIC_1_A_CLK 25 - - /* SMD RPM clocks */ - #define RPM_SMD_XO_CLK_SRC 0 diff --git a/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch b/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch index 0d2a4274c7..6f1cdcf4d6 100644 --- a/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch +++ b/target/linux/ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/arm/Makefile +++ b/arch/arm/Makefile -@@ -67,7 +67,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-i +@@ -64,7 +64,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-i # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m diff --git a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index b6f1f47424..947eb08d75 100644 --- a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1939,6 +1939,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1925,6 +1925,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. @@ -157,9 +157,9 @@ Signed-off-by: Adrian Panella } --- a/init/main.c +++ b/init/main.c -@@ -95,6 +95,10 @@ - #include - #include +@@ -102,6 +102,10 @@ + #define CREATE_TRACE_POINTS + #include +#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) +#include @@ -168,10 +168,10 @@ Signed-off-by: Adrian Panella static int kernel_init(void *); extern void init_IRQ(void); -@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k - page_alloc_init(); - +@@ -594,6 +598,18 @@ asmlinkage __visible void __init start_k pr_notice("Kernel command line: %s\n", boot_command_line); + /* parameters may set static keys */ + jump_label_init(); + +#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE) + //Show bootloader's original command line for reference @@ -184,6 +184,6 @@ Signed-off-by: Adrian Panella + } +#endif + - /* parameters may set static keys */ - jump_label_init(); parse_early_param(); + after_dashes = parse_args("Booting kernel", + static_command_line, __start___param, diff --git a/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch index e11378b42a..77ce4c4245 100644 --- a/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch +++ b/target/linux/ipq806x/patches-4.19/0069-arm-boot-add-dts-files.patch @@ -10,9 +10,9 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -699,6 +699,18 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-apq8084-mtp.dtb \ - qcom-ipq4019-ap.dk01.1-c1.dtb \ +@@ -791,6 +791,18 @@ dtb-$(CONFIG_ARCH_QCOM) += \ + qcom-ipq4019-ap.dk07.1-c1.dtb \ + qcom-ipq4019-ap.dk07.1-c2.dtb \ qcom-ipq8064-ap148.dtb \ + qcom-ipq8064-c2600.dtb \ + qcom-ipq8064-d7800.dtb \ @@ -28,4 +28,4 @@ Signed-off-by: John Crispin + qcom-ipq8065-r7800.dtb \ qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ - qcom-msm8974-lge-nexus5-hammerhead.dtb \ + qcom-msm8974-fairphone-fp2.dtb \ diff --git a/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch b/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch index b9f6e33be6..3a3e0a0000 100644 --- a/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch +++ b/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch @@ -6,12 +6,10 @@ Subject: PCI: qcom: Fixed IPQ806x specific clocks Change-Id: I488e1bc707d6a22b37a338f41935e3922009ba5e Signed-off-by: Sham Muthayyan --- - drivers/pci/host/pcie-qcom.c | 38 +++++++++++++++++++++++++++++++++----- - 1 file changed, 33 insertions(+), 5 deletions(-) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -91,6 +91,8 @@ struct qcom_pcie_resources_2_1_0 { +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -85,6 +85,8 @@ struct qcom_pcie_resources_2_1_0 { struct clk *iface_clk; struct clk *core_clk; struct clk *phy_clk; @@ -20,7 +18,7 @@ Signed-off-by: Sham Muthayyan struct reset_control *pci_reset; struct reset_control *axi_reset; struct reset_control *ahb_reset; -@@ -249,6 +251,14 @@ static int qcom_pcie_get_resources_2_1_0 +@@ -235,6 +237,14 @@ static int qcom_pcie_get_resources_2_1_0 if (IS_ERR(res->phy_clk)) return PTR_ERR(res->phy_clk); @@ -35,16 +33,16 @@ Signed-off-by: Sham Muthayyan res->pci_reset = devm_reset_control_get_exclusive(dev, "pci"); if (IS_ERR(res->pci_reset)) return PTR_ERR(res->pci_reset); -@@ -281,6 +291,8 @@ static void qcom_pcie_deinit_2_1_0(struc +@@ -267,6 +277,8 @@ static void qcom_pcie_deinit_2_1_0(struc clk_disable_unprepare(res->iface_clk); clk_disable_unprepare(res->core_clk); clk_disable_unprepare(res->phy_clk); + clk_disable_unprepare(res->aux_clk); + clk_disable_unprepare(res->ref_clk); - regulator_disable(res->vdda); - regulator_disable(res->vdda_phy); - regulator_disable(res->vdda_refclk); -@@ -324,16 +336,28 @@ static int qcom_pcie_init_2_1_0(struct q + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); + } + +@@ -296,16 +308,28 @@ static int qcom_pcie_init_2_1_0(struct q goto err_assert_ahb; } @@ -76,7 +74,7 @@ Signed-off-by: Sham Muthayyan } ret = reset_control_deassert(res->ahb_reset); -@@ -389,10 +413,14 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -361,10 +385,14 @@ static int qcom_pcie_init_2_1_0(struct q return 0; err_deassert_ahb: @@ -92,4 +90,4 @@ Signed-off-by: Sham Muthayyan +err_clk_core: clk_disable_unprepare(res->iface_clk); err_assert_ahb: - regulator_disable(res->vdda_phy); + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); diff --git a/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch b/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch index 8b9e5ff5d1..5bd865a42e 100644 --- a/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch +++ b/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch @@ -6,20 +6,18 @@ Subject: PCI: qcom: Fixed IPQ806x PCIE reset changes Change-Id: Ia6590e960b9754b1e8b7a51f318788cd63e9e321 Signed-off-by: Sham Muthayyan --- - drivers/pci/host/pcie-qcom.c | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -98,6 +98,7 @@ struct qcom_pcie_resources_2_1_0 { +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -92,6 +92,7 @@ struct qcom_pcie_resources_2_1_0 { struct reset_control *ahb_reset; struct reset_control *por_reset; struct reset_control *phy_reset; + struct reset_control *ext_reset; - struct regulator *vdda; - struct regulator *vdda_phy; - struct regulator *vdda_refclk; -@@ -275,6 +276,10 @@ static int qcom_pcie_get_resources_2_1_0 + struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY]; + }; + +@@ -261,6 +262,10 @@ static int qcom_pcie_get_resources_2_1_0 if (IS_ERR(res->por_reset)) return PTR_ERR(res->por_reset); @@ -30,7 +28,7 @@ Signed-off-by: Sham Muthayyan res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); return PTR_ERR_OR_ZERO(res->phy_reset); } -@@ -288,6 +293,7 @@ static void qcom_pcie_deinit_2_1_0(struc +@@ -274,6 +279,7 @@ static void qcom_pcie_deinit_2_1_0(struc reset_control_assert(res->ahb_reset); reset_control_assert(res->por_reset); reset_control_assert(res->pci_reset); @@ -38,7 +36,7 @@ Signed-off-by: Sham Muthayyan clk_disable_unprepare(res->iface_clk); clk_disable_unprepare(res->core_clk); clk_disable_unprepare(res->phy_clk); -@@ -306,6 +312,12 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -290,15 +296,21 @@ static int qcom_pcie_init_2_1_0(struct q u32 val; int ret; @@ -48,38 +46,17 @@ Signed-off-by: Sham Muthayyan + return ret; + } + - ret = regulator_enable(res->vdda); - if (ret) { - dev_err(dev, "cannot enable vdda regulator\n"); -@@ -324,16 +336,16 @@ static int qcom_pcie_init_2_1_0(struct q - goto err_vdda_phy; + ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies); + if (ret < 0) { + dev_err(dev, "cannot enable regulators\n"); + return ret; } - ret = reset_control_assert(res->ahb_reset); + ret = reset_control_deassert(res->ext_reset); if (ret) { - dev_err(dev, "cannot assert ahb reset\n"); -- goto err_assert_ahb; + dev_err(dev, "cannot assert ext reset\n"); -+ goto err_reset_ext; + goto err_assert_ahb; } - ret = clk_prepare_enable(res->iface_clk); - if (ret) { - dev_err(dev, "cannot prepare/enable iface clock\n"); -- goto err_assert_ahb; -+ goto err_iface; - } - - ret = clk_prepare_enable(res->core_clk); -@@ -422,7 +434,9 @@ err_clk_phy: - clk_disable_unprepare(res->core_clk); - err_clk_core: - clk_disable_unprepare(res->iface_clk); --err_assert_ahb: -+err_iface: -+ reset_control_assert(res->ext_reset); -+err_reset_ext: - regulator_disable(res->vdda_phy); - err_vdda_phy: - regulator_disable(res->vdda_refclk); diff --git a/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch b/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch index 57ee082c83..dde8fbaa7b 100644 --- a/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch +++ b/target/linux/ipq806x/patches-4.19/0071-3-PCI-qcom-Fixed-IPQ806x-PCIE-init-changes.patch @@ -6,12 +6,10 @@ Subject: PCI: qcom: Fixed IPQ806x PCIE init changes Change-Id: Ic319b1aec27a47809284759f8fcb6a8815b7cf7e Signed-off-by: Sham Muthayyan --- - drivers/pci/host/pcie-qcom.c | 62 +++++++++++++++++++++++++++++++++++++------- - 1 file changed, 53 insertions(+), 9 deletions(-) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -52,7 +52,13 @@ +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -45,7 +45,13 @@ #define PCIE_CAP_CPL_TIMEOUT_DISABLE 0x10 #define PCIE20_PARF_PHY_CTRL 0x40 @@ -25,7 +23,7 @@ Signed-off-by: Sham Muthayyan #define PCIE20_PARF_DBI_BASE_ADDR 0x168 #define PCIE20_PARF_SLV_ADDR_SPACE_SIZE 0x16C #define PCIE20_PARF_MHI_CLOCK_RESET_CTRL 0x174 -@@ -83,6 +89,18 @@ +@@ -76,6 +82,18 @@ #define DBI_RO_WR_EN 1 #define PERST_DELAY_US 1000 @@ -44,15 +42,15 @@ Signed-off-by: Sham Muthayyan #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 #define SLV_ADDR_SPACE_SZ 0x10000000 -@@ -102,6 +120,7 @@ struct qcom_pcie_resources_2_1_0 { - struct regulator *vdda; - struct regulator *vdda_phy; - struct regulator *vdda_refclk; +@@ -94,6 +112,7 @@ struct qcom_pcie_resources_2_1_0 { + struct reset_control *phy_reset; + struct reset_control *ext_reset; + struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY]; + uint8_t phy_tx0_term_offset; }; struct qcom_pcie_resources_1_0_0 { -@@ -179,6 +198,16 @@ struct qcom_pcie { +@@ -173,6 +192,16 @@ struct qcom_pcie { #define to_qcom_pcie(x) dev_get_drvdata((x)->dev) @@ -69,7 +67,7 @@ Signed-off-by: Sham Muthayyan static void qcom_ep_reset_assert(struct qcom_pcie *pcie) { gpiod_set_value_cansleep(pcie->reset, 1); -@@ -280,6 +309,10 @@ static int qcom_pcie_get_resources_2_1_0 +@@ -266,6 +295,10 @@ static int qcom_pcie_get_resources_2_1_0 if (IS_ERR(res->ext_reset)) return PTR_ERR(res->ext_reset); @@ -80,7 +78,7 @@ Signed-off-by: Sham Muthayyan res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); return PTR_ERR_OR_ZERO(res->phy_reset); } -@@ -309,7 +342,6 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -293,7 +326,6 @@ static int qcom_pcie_init_2_1_0(struct q struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; struct dw_pcie *pci = pcie->pci; struct device *dev = pci->dev; @@ -88,7 +86,7 @@ Signed-off-by: Sham Muthayyan int ret; ret = reset_control_assert(res->ahb_reset); -@@ -378,15 +410,26 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -350,15 +382,26 @@ static int qcom_pcie_init_2_1_0(struct q goto err_deassert_ahb; } diff --git a/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch b/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch index 92100481c8..f6ebe0c0af 100644 --- a/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch +++ b/target/linux/ipq806x/patches-4.19/0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x.patch @@ -8,12 +8,10 @@ Resolved PCIE EP detection errors caused due to missing iATU programming. Change-Id: Ie95c0f8cb940abc0192a8a3c4e825ddba54b72fe Signed-off-by: Sham Muthayyan --- - drivers/pci/host/pcie-qcom.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 77 insertions(+) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -83,6 +83,30 @@ +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -76,6 +76,30 @@ #define PCIE20_CAP_LINK_1 (PCIE20_CAP + 0x14) #define PCIE_CAP_LINK1_VAL 0x2FD7F @@ -44,7 +42,7 @@ Signed-off-by: Sham Muthayyan #define PCIE20_PARF_Q2A_FLUSH 0x1AC #define PCIE20_MISC_CONTROL_1_REG 0x8BC -@@ -251,6 +275,57 @@ static void qcom_pcie_2_1_0_ltssm_enable +@@ -240,6 +264,57 @@ static void qcom_pcie_2_1_0_ltssm_enable writel(val, pcie->elbi + PCIE20_ELBI_SYS_CTRL); } @@ -102,7 +100,7 @@ Signed-off-by: Sham Muthayyan static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie) { struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; -@@ -465,6 +540,9 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -437,6 +512,9 @@ static int qcom_pcie_init_2_1_0(struct q writel(CFG_BRIDGE_SB_INIT, pci->dbi_base + PCIE20_AXI_MSTR_RESP_COMP_CTRL1); diff --git a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch index 5dea084bfa..90b232f8b7 100644 --- a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch +++ b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch @@ -6,29 +6,27 @@ Subject: PCI: qcom: Force GEN1 support Change-Id: Ica54ddb737d7b851469deab1745f54bf431bd3f0 Signed-off-by: Sham Muthayyan --- - drivers/pci/host/pcie-qcom.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -129,6 +129,8 @@ +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -122,6 +122,8 @@ #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 #define SLV_ADDR_SPACE_SZ 0x10000000 +#define PCIE20_LNK_CONTROL2_LINK_STATUS2 0xA0 + + #define QCOM_PCIE_2_1_0_MAX_SUPPLY 3 struct qcom_pcie_resources_2_1_0 { struct clk *iface_clk; - struct clk *core_clk; -@@ -218,6 +220,7 @@ struct qcom_pcie { +@@ -212,6 +214,7 @@ struct qcom_pcie { struct phy *phy; struct gpio_desc *reset; - struct qcom_pcie_ops *ops; + const struct qcom_pcie_ops *ops; + uint32_t force_gen1; }; #define to_qcom_pcie(x) dev_get_drvdata((x)->dev) -@@ -532,6 +535,11 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -504,6 +507,11 @@ static int qcom_pcie_init_2_1_0(struct q /* wait for clock acquisition */ usleep_range(1000, 1500); @@ -40,7 +38,7 @@ Signed-off-by: Sham Muthayyan /* Set the Max TLP size to 2K, instead of using default of 4K */ -@@ -1382,6 +1390,8 @@ static int qcom_pcie_probe(struct platfo +@@ -1369,6 +1377,8 @@ static int qcom_pcie_probe(struct platfo struct dw_pcie *pci; struct qcom_pcie *pcie; int ret; @@ -49,7 +47,7 @@ Signed-off-by: Sham Muthayyan pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); if (!pcie) -@@ -1403,6 +1413,9 @@ static int qcom_pcie_probe(struct platfo +@@ -1391,6 +1401,9 @@ static int qcom_pcie_probe(struct platfo if (IS_ERR(pcie->reset)) return PTR_ERR(pcie->reset); diff --git a/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch b/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch index c7dfd53cb1..78120d3e38 100644 --- a/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch +++ b/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch @@ -14,9 +14,9 @@ Signed-off-by: Gokul Sriram Palanisamy (limited to 'drivers/pci/host/pcie-qcom.c') ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -131,6 +131,14 @@ +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -124,6 +124,14 @@ #define PCIE20_LNK_CONTROL2_LINK_STATUS2 0xA0 @@ -28,10 +28,10 @@ Signed-off-by: Gokul Sriram Palanisamy +#define PCIE20_MPS_MASK __mask(7, 5) +#define PCIE20_MPS(x) __set(x, 7, 5) + + #define QCOM_PCIE_2_1_0_MAX_SUPPLY 3 struct qcom_pcie_resources_2_1_0 { struct clk *iface_clk; - struct clk *core_clk; -@@ -1472,6 +1480,35 @@ static int qcom_pcie_probe(struct platfo +@@ -1453,6 +1461,35 @@ static int qcom_pcie_probe(struct platfo return 0; } diff --git a/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch b/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch index 88bd7730c1..7cbeb3bed7 100644 --- a/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch +++ b/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch @@ -36,9 +36,9 @@ Signed-off-by: Abhishek Sahu drivers/pci/host/pcie-qcom.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -407,6 +407,7 @@ static void qcom_pcie_deinit_2_1_0(struc +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -393,6 +393,7 @@ static void qcom_pcie_deinit_2_1_0(struc { struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; @@ -46,15 +46,15 @@ Signed-off-by: Abhishek Sahu reset_control_assert(res->pci_reset); reset_control_assert(res->axi_reset); reset_control_assert(res->ahb_reset); -@@ -415,7 +416,6 @@ static void qcom_pcie_deinit_2_1_0(struc +@@ -401,7 +402,6 @@ static void qcom_pcie_deinit_2_1_0(struc reset_control_assert(res->ext_reset); clk_disable_unprepare(res->iface_clk); clk_disable_unprepare(res->core_clk); - clk_disable_unprepare(res->phy_clk); clk_disable_unprepare(res->aux_clk); clk_disable_unprepare(res->ref_clk); - regulator_disable(res->vdda); -@@ -472,12 +472,6 @@ static int qcom_pcie_init_2_1_0(struct q + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); +@@ -444,12 +444,6 @@ static int qcom_pcie_init_2_1_0(struct q goto err_clk_core; } @@ -67,7 +67,7 @@ Signed-off-by: Abhishek Sahu ret = clk_prepare_enable(res->aux_clk); if (ret) { dev_err(dev, "cannot prepare/enable aux clock\n"); -@@ -541,6 +535,12 @@ static int qcom_pcie_init_2_1_0(struct q +@@ -513,6 +507,12 @@ static int qcom_pcie_init_2_1_0(struct q return ret; } @@ -80,7 +80,7 @@ Signed-off-by: Abhishek Sahu /* wait for clock acquisition */ usleep_range(1000, 1500); if (pcie->force_gen1) { -@@ -566,8 +566,6 @@ err_deassert_ahb: +@@ -538,8 +538,6 @@ err_deassert_ahb: err_clk_ref: clk_disable_unprepare(res->aux_clk); err_clk_aux: diff --git a/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch b/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch index 227a1b4e7a..3fff78bfd4 100644 --- a/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch +++ b/target/linux/ipq806x/patches-4.19/0071-9-pcie-qcom-change-duplicate-pci-reset-to-phy-reset.patch @@ -12,9 +12,9 @@ Signed-off-by: Abhishek Sahu drivers/pci/host/pcie-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/drivers/pci/dwc/pcie-qcom.c -+++ b/drivers/pci/dwc/pcie-qcom.c -@@ -408,7 +408,7 @@ static void qcom_pcie_deinit_2_1_0(struc +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -394,7 +394,7 @@ static void qcom_pcie_deinit_2_1_0(struc struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; clk_disable_unprepare(res->phy_clk); diff --git a/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch b/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch index 035281f66a..ecd9672d1b 100644 --- a/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch +++ b/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch @@ -1,7 +1,7 @@ --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c -@@ -422,6 +422,9 @@ static const struct of_device_id qcom_sc - { .compatible = "qcom,scm-msm8996", +@@ -606,6 +606,9 @@ static const struct of_device_id qcom_sc + { .compatible = "qcom,scm-ipq4019", .data = NULL, /* no clocks */ }, + { .compatible = "qcom,scm-ipq806x", diff --git a/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch b/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch index 1507686456..78a5bb4173 100644 --- a/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch +++ b/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch @@ -11,95 +11,7 @@ to application processor. Also the scm call interface is changed. Change-Id: Ib6c06829d04bc8c20483c36e63da92e26cdef9ce Signed-off-by: Ajay Kishore --- - drivers/firmware/qcom_scm-32.c | 17 +++++++++++++++++ - drivers/firmware/qcom_scm-64.c | 9 +++++++++ - drivers/firmware/qcom_scm.c | 13 +++++++++++++ - drivers/firmware/qcom_scm.h | 8 ++++++++ - drivers/pinctrl/qcom/pinctrl-msm.c | 34 ++++++++++++++++++++++++++++------ - include/linux/qcom_scm.h | 3 ++- - 6 files changed, 77 insertions(+), 7 deletions(-) ---- a/drivers/firmware/qcom_scm-32.c -+++ b/drivers/firmware/qcom_scm-32.c -@@ -561,6 +561,24 @@ int __qcom_scm_pas_mss_reset(struct devi - return ret ? : le32_to_cpu(out); - } - -+int __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1) -+{ -+ s32 ret; -+ -+ ret = qcom_scm_call_atomic1(svc_id, cmd_id, arg1); -+ -+ return ret; -+} -+ -+int __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2) -+{ -+ s32 ret; -+ -+ ret = qcom_scm_call_atomic2(svc_id, cmd_id, arg1, arg2); -+ -+ return ret; -+} -+ - int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id) - { - struct { ---- a/drivers/firmware/qcom_scm-64.c -+++ b/drivers/firmware/qcom_scm-64.c -@@ -366,6 +366,16 @@ int __qcom_scm_pas_mss_reset(struct devi - return ret ? : res.a1; - } - -+int __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1) -+{ -+ return -ENOTSUPP; -+} -+ -+int __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2) -+{ -+ return -ENOTSUPP; -+} -+ - int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id) - { - struct qcom_scm_desc desc = {0}; ---- a/drivers/firmware/qcom_scm.c -+++ b/drivers/firmware/qcom_scm.c -@@ -470,3 +470,16 @@ static int __init qcom_scm_init(void) - return platform_driver_register(&qcom_scm_driver); - } - subsys_initcall(qcom_scm_init); -+ -+int qcom_scm_pinmux_read(u32 arg1) -+{ -+ return __qcom_scm_pinmux_read(SCM_SVC_IO_ACCESS, SCM_IO_READ, arg1); -+} -+EXPORT_SYMBOL(qcom_scm_pinmux_read); -+ -+int qcom_scm_pinmux_write(u32 arg1, u32 arg2) -+{ -+ return __qcom_scm_pinmux_write(SCM_SVC_IO_ACCESS, SCM_IO_WRITE, -+ arg1, arg2); -+} -+EXPORT_SYMBOL(qcom_scm_pinmux_write); ---- a/drivers/firmware/qcom_scm.h -+++ b/drivers/firmware/qcom_scm.h -@@ -58,6 +58,13 @@ extern int __qcom_scm_pas_auth_and_rese - extern int __qcom_scm_pas_shutdown(struct device *dev, u32 peripheral); - extern int __qcom_scm_pas_mss_reset(struct device *dev, bool reset); - -+#define SCM_IO_READ 1 -+#define SCM_IO_WRITE 2 -+#define SCM_SVC_IO_ACCESS 0x5 -+ -+s32 __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1); -+s32 __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2); -+ - /* common error codes */ - #define QCOM_SCM_V2_EBUSY -12 - #define QCOM_SCM_ENOMEM -5 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -30,7 +30,8 @@ @@ -112,7 +24,7 @@ Signed-off-by: Ajay Kishore #include "../core.h" #include "../pinconf.h" #include "pinctrl-msm.h" -@@ -646,6 +647,9 @@ static void msm_gpio_irq_ack(struct irq_ +@@ -628,6 +629,9 @@ static void msm_gpio_irq_mask(struct irq const struct msm_pingroup *g; unsigned long flags; u32 val; @@ -122,7 +34,7 @@ Signed-off-by: Ajay Kishore g = &pctrl->soc->groups[d->hwirq]; -@@ -684,11 +688,30 @@ static int msm_gpio_irq_set_type(struct +@@ -732,11 +736,30 @@ static int msm_gpio_irq_set_type(struct else clear_bit(d->hwirq, pctrl->dual_edge_irqs); @@ -142,14 +54,14 @@ Signed-off-by: Ajay Kishore + const __be32 *reg = of_get_property(pctrl->dev->of_node, "reg", NULL); + if (reg) { + u32 addr = be32_to_cpup(reg) + g->intr_target_reg; -+ val = qcom_scm_pinmux_read(addr); ++ qcom_scm_io_readl(addr, &val); + __iormb(); + + val &= ~(7 << g->intr_target_bit); + val |= g->intr_target_kpss_val << g->intr_target_bit; + + __iowmb(); -+ ret = qcom_scm_pinmux_write(addr, val); ++ ret = qcom_scm_io_writel(addr, val); + if (ret) + pr_err("\n Routing interrupts to Apps proc failed"); + } @@ -157,27 +69,3 @@ Signed-off-by: Ajay Kishore /* Update configuration for gpio. * RAW_STATUS_EN is left on for all gpio irqs. Due to the -@@ -975,4 +998,3 @@ int msm_pinctrl_remove(struct platform_d - return 0; - } - EXPORT_SYMBOL(msm_pinctrl_remove); -- ---- a/include/linux/qcom_scm.h -+++ b/include/linux/qcom_scm.h -@@ -43,6 +43,8 @@ extern int qcom_scm_set_remote_state(u32 - extern int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare); - extern int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size); - extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare); -+extern s32 qcom_scm_pinmux_read(u32 arg1); -+extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2); - #else - static inline - int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) -@@ -73,5 +75,7 @@ qcom_scm_set_remote_state(u32 state,u32 - static inline int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) { return -ENODEV; } - static inline int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) { return -ENODEV; } - static inline int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) { return -ENODEV; } -+extern s32 qcom_scm_pinmux_read(u32 arg1) { return -ENODEV; } -+extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2) { return -ENODEV; } - #endif - #endif diff --git a/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch b/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch deleted file mode 100644 index ee410ca6fa..0000000000 --- a/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch +++ /dev/null @@ -1,71 +0,0 @@ -From a86bda9f8a7965f0cedd347a9c04800eb9f41ea3 Mon Sep 17 00:00:00 2001 -From: Vasudevan Murugesan -Date: Tue, 21 Jul 2015 10:22:38 +0530 -Subject: ipq806x: usb: Control USB master reset - -During removal of the glue layer(dwc3-of-simple), -USB master reset is set to active and during insertion -it is de-activated. - -Change-Id: I537dc810f6cb2a46664ee674840145066432b957 -Signed-off-by: Vasudevan Murugesan -(cherry picked from commit 4611e13580a216812f85f0801b95442d02eeb836) ---- - drivers/usb/dwc3/dwc3-of-simple.c | 22 ++++++++++++++++++++++ - 1 file changed, 12 insertions(+) - -(limited to 'drivers/usb/dwc3/dwc3-of-simple.c') - ---- a/drivers/usb/dwc3/dwc3-of-simple.c -+++ b/drivers/usb/dwc3/dwc3-of-simple.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -33,6 +34,8 @@ struct dwc3_of_simple { - struct device *dev; - struct clk **clks; - int num_clocks; -+ struct reset_control *mstr_rst_30_0; -+ struct reset_control *mstr_rst_30_1; - }; - - static int dwc3_of_simple_clk_init(struct dwc3_of_simple *simple, int count) -@@ -102,6 +105,20 @@ static int dwc3_of_simple_probe(struct p - if (ret) - return ret; - -+ simple->mstr_rst_30_0 = devm_reset_control_get(dev, "usb30_0_mstr_rst"); -+ -+ if (!IS_ERR(simple->mstr_rst_30_0)) -+ reset_control_deassert(simple->mstr_rst_30_0); -+ else -+ dev_dbg(simple->dev, "cannot get handle for USB PHY 0 master reset control\n"); -+ -+ simple->mstr_rst_30_1 = devm_reset_control_get(dev, "usb30_1_mstr_rst"); -+ -+ if (!IS_ERR(simple->mstr_rst_30_1)) -+ reset_control_deassert(simple->mstr_rst_30_1); -+ else -+ dev_dbg(simple->dev, "cannot get handle for USB PHY 1 master reset control\n"); -+ - ret = of_platform_populate(np, NULL, NULL, dev); - if (ret) { - for (i = 0; i < simple->num_clocks; i++) { -@@ -130,6 +147,12 @@ static int dwc3_of_simple_remove(struct - clk_put(simple->clks[i]); - } - -+ if (!IS_ERR(simple->mstr_rst_30_0)) -+ reset_control_assert(simple->mstr_rst_30_0); -+ -+ if (!IS_ERR(simple->mstr_rst_30_1)) -+ reset_control_assert(simple->mstr_rst_30_1); -+ - of_platform_depopulate(dev); - - pm_runtime_disable(dev); diff --git a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch new file mode 100644 index 0000000000..500930cfe9 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch @@ -0,0 +1,70 @@ +From patchwork Mon May 21 20:57:38 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v5,3/4] ARM: dts: qcom: add gpio-ranges property +X-Patchwork-Submitter: Christian Lamparter +X-Patchwork-Id: 917856 +Message-Id: <0ae3376606a89bcdf3fe753a5c967f7103699e09.1526935804.git.chunkeey@gmail.com> +To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, + linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org +Cc: Bjorn Andersson , + Linus Walleij , + Stephen Boyd , David Brown , + Rob Herring , Mark Rutland , + Andy Gross , + Sven Eckelmann +Date: Mon, 21 May 2018 22:57:38 +0200 +From: Christian Lamparter +List-Id: + +This patch adds the gpio-ranges property to almost all of +the Qualcomm ARM platforms that utilize the pinctrl-msm +framework. + +The gpio-ranges property is part of the gpiolib subsystem. +As a result, the binding text is available in section +"2.1 gpio- and pin-controller interaction" of +Documentation/devicetree/bindings/gpio/gpio.txt + +For more information please see the patch titled: +"pinctrl: msm: fix gpio-hog related boot issues" from +this series. + +Reported-by: Sven Eckelmann +Tested-by: Sven Eckelmann [ipq4019] +Reviewed-by: Bjorn Andersson +Signed-off-by: Christian Lamparter +Reviewed-by: Linus Walleij +--- +To help with git bisect, the DT update patch has been intentionally +placed after the "pinctrl: msm: fix gpio-hog related boot issues". +Otherwise - if the order was reveresed - and bisect decides to split +between these two patches, the gpiochip_add_pin_ranges() function +will be executed twice with the same parameters for the same pinctrl. +--- + arch/arm/boot/dts/qcom-apq8064.dtsi | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq8064.dtsi | 1 + + arch/arm/boot/dts/qcom-mdm9615.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8960.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 1 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8992.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 1 + + 13 files changed, 14 insertions(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi +@@ -653,6 +653,7 @@ + reg = <0x800000 0x4000>; + + gpio-controller; ++ gpio-ranges = <&qcom_pinmux 0 0 69>; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; diff --git a/target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch b/target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch deleted file mode 100644 index 1c903bbc3b..0000000000 --- a/target/linux/ipq806x/patches-4.19/105-mtd-nor-add-mx25l25635f.patch +++ /dev/null @@ -1,22 +0,0 @@ -Subject: mtd: spi-nor: add mx25l25635f with SECT_4K - -This patch fixes an issue with the creation of the -ubi volume on the AVM FRITZ!Box 4040. The mx25l25635f -and mx25l25635e support SECT_4K which will set the -erase size to 4K. This is used by ubi to calculate -VID header offsets. Without this, uboot and linux -disagrees about the layout and refuse to attach -the ubi volume created by the other. - ---- ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1031,7 +1031,7 @@ static const struct flash_info spi_nor_i - { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, - { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, - { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, -- { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, -+ { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SECT_4K) }, - { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) }, - { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, - { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, diff --git a/target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch b/target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch deleted file mode 100644 index cd9fd895c5..0000000000 --- a/target/linux/ipq806x/patches-4.19/310-msm-adhoc-bus-support.patch +++ /dev/null @@ -1,11026 +0,0 @@ -From: Christian Lamparter -Subject: BUS: add MSM_BUS ---- a/drivers/bus/Makefile -+++ b/drivers/bus/Makefile -@@ -11,6 +11,7 @@ obj-$(CONFIG_BRCMSTB_GISB_ARB) += brcmst - obj-$(CONFIG_IMX_WEIM) += imx-weim.o - obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o - obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o -+obj-$(CONFIG_BUS_TOPOLOGY_ADHOC)+= msm_bus/ - - # Interconnect bus driver for OMAP SoCs. - obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o ---- a/drivers/bus/Kconfig -+++ b/drivers/bus/Kconfig -@@ -93,6 +93,8 @@ config MVEBU_MBUS - Driver needed for the MBus configuration on Marvell EBU SoCs - (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP). - -+source "drivers/bus/msm_bus/Kconfig" -+ - config OMAP_INTERCONNECT - tristate "OMAP INTERCONNECT DRIVER" - depends on ARCH_OMAP2PLUS ---- /dev/null -+++ b/include/dt-bindings/msm/msm-bus-ids.h -@@ -0,0 +1,869 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef __MSM_BUS_IDS_H -+#define __MSM_BUS_IDS_H -+ -+/* Topology related enums */ -+#define MSM_BUS_FAB_DEFAULT 0 -+#define MSM_BUS_FAB_APPSS 0 -+#define MSM_BUS_FAB_SYSTEM 1024 -+#define MSM_BUS_FAB_MMSS 2048 -+#define MSM_BUS_FAB_SYSTEM_FPB 3072 -+#define MSM_BUS_FAB_CPSS_FPB 4096 -+ -+#define MSM_BUS_FAB_BIMC 0 -+#define MSM_BUS_FAB_SYS_NOC 1024 -+#define MSM_BUS_FAB_MMSS_NOC 2048 -+#define MSM_BUS_FAB_OCMEM_NOC 3072 -+#define MSM_BUS_FAB_PERIPH_NOC 4096 -+#define MSM_BUS_FAB_CONFIG_NOC 5120 -+#define MSM_BUS_FAB_OCMEM_VNOC 6144 -+#define MSM_BUS_FAB_MMSS_AHB 2049 -+#define MSM_BUS_FAB_A0_NOC 6145 -+#define MSM_BUS_FAB_A1_NOC 6146 -+#define MSM_BUS_FAB_A2_NOC 6147 -+ -+#define MSM_BUS_MASTER_FIRST 1 -+#define MSM_BUS_MASTER_AMPSS_M0 1 -+#define MSM_BUS_MASTER_AMPSS_M1 2 -+#define MSM_BUS_APPSS_MASTER_FAB_MMSS 3 -+#define MSM_BUS_APPSS_MASTER_FAB_SYSTEM 4 -+#define MSM_BUS_SYSTEM_MASTER_FAB_APPSS 5 -+#define MSM_BUS_MASTER_SPS 6 -+#define MSM_BUS_MASTER_ADM_PORT0 7 -+#define MSM_BUS_MASTER_ADM_PORT1 8 -+#define MSM_BUS_SYSTEM_MASTER_ADM1_PORT0 9 -+#define MSM_BUS_MASTER_ADM1_PORT1 10 -+#define MSM_BUS_MASTER_LPASS_PROC 11 -+#define MSM_BUS_MASTER_MSS_PROCI 12 -+#define MSM_BUS_MASTER_MSS_PROCD 13 -+#define MSM_BUS_MASTER_MSS_MDM_PORT0 14 -+#define MSM_BUS_MASTER_LPASS 15 -+#define MSM_BUS_SYSTEM_MASTER_CPSS_FPB 16 -+#define MSM_BUS_SYSTEM_MASTER_SYSTEM_FPB 17 -+#define MSM_BUS_SYSTEM_MASTER_MMSS_FPB 18 -+#define MSM_BUS_MASTER_ADM1_CI 19 -+#define MSM_BUS_MASTER_ADM0_CI 20 -+#define MSM_BUS_MASTER_MSS_MDM_PORT1 21 -+#define MSM_BUS_MASTER_MDP_PORT0 22 -+#define MSM_BUS_MASTER_MDP_PORT1 23 -+#define MSM_BUS_MMSS_MASTER_ADM1_PORT0 24 -+#define MSM_BUS_MASTER_ROTATOR 25 -+#define MSM_BUS_MASTER_GRAPHICS_3D 26 -+#define MSM_BUS_MASTER_JPEG_DEC 27 -+#define MSM_BUS_MASTER_GRAPHICS_2D_CORE0 28 -+#define MSM_BUS_MASTER_VFE 29 -+#define MSM_BUS_MASTER_VPE 30 -+#define MSM_BUS_MASTER_JPEG_ENC 31 -+#define MSM_BUS_MASTER_GRAPHICS_2D_CORE1 32 -+#define MSM_BUS_MMSS_MASTER_APPS_FAB 33 -+#define MSM_BUS_MASTER_HD_CODEC_PORT0 34 -+#define MSM_BUS_MASTER_HD_CODEC_PORT1 35 -+#define MSM_BUS_MASTER_SPDM 36 -+#define MSM_BUS_MASTER_RPM 37 -+#define MSM_BUS_MASTER_MSS 38 -+#define MSM_BUS_MASTER_RIVA 39 -+#define MSM_BUS_MASTER_SNOC_VMEM 40 -+#define MSM_BUS_MASTER_MSS_SW_PROC 41 -+#define MSM_BUS_MASTER_MSS_FW_PROC 42 -+#define MSM_BUS_MASTER_HMSS 43 -+#define MSM_BUS_MASTER_GSS_NAV 44 -+#define MSM_BUS_MASTER_PCIE 45 -+#define MSM_BUS_MASTER_SATA 46 -+#define MSM_BUS_MASTER_CRYPTO 47 -+#define MSM_BUS_MASTER_VIDEO_CAP 48 -+#define MSM_BUS_MASTER_GRAPHICS_3D_PORT1 49 -+#define MSM_BUS_MASTER_VIDEO_ENC 50 -+#define MSM_BUS_MASTER_VIDEO_DEC 51 -+#define MSM_BUS_MASTER_LPASS_AHB 52 -+#define MSM_BUS_MASTER_QDSS_BAM 53 -+#define MSM_BUS_MASTER_SNOC_CFG 54 -+#define MSM_BUS_MASTER_CRYPTO_CORE0 55 -+#define MSM_BUS_MASTER_CRYPTO_CORE1 56 -+#define MSM_BUS_MASTER_MSS_NAV 57 -+#define MSM_BUS_MASTER_OCMEM_DMA 58 -+#define MSM_BUS_MASTER_WCSS 59 -+#define MSM_BUS_MASTER_QDSS_ETR 60 -+#define MSM_BUS_MASTER_USB3 61 -+#define MSM_BUS_MASTER_JPEG 62 -+#define MSM_BUS_MASTER_VIDEO_P0 63 -+#define MSM_BUS_MASTER_VIDEO_P1 64 -+#define MSM_BUS_MASTER_MSS_PROC 65 -+#define MSM_BUS_MASTER_JPEG_OCMEM 66 -+#define MSM_BUS_MASTER_MDP_OCMEM 67 -+#define MSM_BUS_MASTER_VIDEO_P0_OCMEM 68 -+#define MSM_BUS_MASTER_VIDEO_P1_OCMEM 69 -+#define MSM_BUS_MASTER_VFE_OCMEM 70 -+#define MSM_BUS_MASTER_CNOC_ONOC_CFG 71 -+#define MSM_BUS_MASTER_RPM_INST 72 -+#define MSM_BUS_MASTER_RPM_DATA 73 -+#define MSM_BUS_MASTER_RPM_SYS 74 -+#define MSM_BUS_MASTER_DEHR 75 -+#define MSM_BUS_MASTER_QDSS_DAP 76 -+#define MSM_BUS_MASTER_TIC 77 -+#define MSM_BUS_MASTER_SDCC_1 78 -+#define MSM_BUS_MASTER_SDCC_3 79 -+#define MSM_BUS_MASTER_SDCC_4 80 -+#define MSM_BUS_MASTER_SDCC_2 81 -+#define MSM_BUS_MASTER_TSIF 82 -+#define MSM_BUS_MASTER_BAM_DMA 83 -+#define MSM_BUS_MASTER_BLSP_2 84 -+#define MSM_BUS_MASTER_USB_HSIC 85 -+#define MSM_BUS_MASTER_BLSP_1 86 -+#define MSM_BUS_MASTER_USB_HS 87 -+#define MSM_BUS_MASTER_PNOC_CFG 88 -+#define MSM_BUS_MASTER_V_OCMEM_GFX3D 89 -+#define MSM_BUS_MASTER_IPA 90 -+#define MSM_BUS_MASTER_QPIC 91 -+#define MSM_BUS_MASTER_MDPE 92 -+#define MSM_BUS_MASTER_USB_HS2 93 -+#define MSM_BUS_MASTER_VPU 94 -+#define MSM_BUS_MASTER_UFS 95 -+#define MSM_BUS_MASTER_BCAST 96 -+#define MSM_BUS_MASTER_CRYPTO_CORE2 97 -+#define MSM_BUS_MASTER_EMAC 98 -+#define MSM_BUS_MASTER_VPU_1 99 -+#define MSM_BUS_MASTER_PCIE_1 100 -+#define MSM_BUS_MASTER_USB3_1 101 -+#define MSM_BUS_MASTER_CNOC_MNOC_MMSS_CFG 102 -+#define MSM_BUS_MASTER_CNOC_MNOC_CFG 103 -+#define MSM_BUS_MASTER_TCU_0 104 -+#define MSM_BUS_MASTER_TCU_1 105 -+#define MSM_BUS_MASTER_CPP 106 -+#define MSM_BUS_MASTER_AUDIO 107 -+#define MSM_BUS_MASTER_PCIE_2 108 -+#define MSM_BUS_MASTER_BLSP_BAM 109 -+#define MSM_BUS_MASTER_USB2_BAM 110 -+#define MSM_BUS_MASTER_ADDS_DMA0 111 -+#define MSM_BUS_MASTER_ADDS_DMA1 112 -+#define MSM_BUS_MASTER_ADDS_DMA2 113 -+#define MSM_BUS_MASTER_ADDS_DMA3 114 -+#define MSM_BUS_MASTER_QPIC_BAM 115 -+#define MSM_BUS_MASTER_SDCC_BAM 116 -+#define MSM_BUS_MASTER_DDRC_SNOC 117 -+#define MSM_BUS_MASTER_WSS_0 118 -+#define MSM_BUS_MASTER_WSS_1 119 -+#define MSM_BUS_MASTER_ESS 120 -+#define MSM_BUS_MASTER_QDSS_BAMNDP 121 -+#define MSM_BUS_MASTER_QDSS_SNOC_CFG 122 -+#define MSM_BUS_MASTER_LAST 130 -+ -+#define MSM_BUS_SYSTEM_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_SYSTEM_FPB -+#define MSM_BUS_CPSS_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_CPSS_FPB -+ -+#define MSM_BUS_SNOC_MM_INT_0 10000 -+#define MSM_BUS_SNOC_MM_INT_1 10001 -+#define MSM_BUS_SNOC_MM_INT_2 10002 -+#define MSM_BUS_SNOC_MM_INT_BIMC 10003 -+#define MSM_BUS_SNOC_INT_0 10004 -+#define MSM_BUS_SNOC_INT_1 10005 -+#define MSM_BUS_SNOC_INT_BIMC 10006 -+#define MSM_BUS_SNOC_BIMC_0_MAS 10007 -+#define MSM_BUS_SNOC_BIMC_1_MAS 10008 -+#define MSM_BUS_SNOC_QDSS_INT 10009 -+#define MSM_BUS_PNOC_SNOC_MAS 10010 -+#define MSM_BUS_PNOC_SNOC_SLV 10011 -+#define MSM_BUS_PNOC_INT_0 10012 -+#define MSM_BUS_PNOC_INT_1 10013 -+#define MSM_BUS_PNOC_M_0 10014 -+#define MSM_BUS_PNOC_M_1 10015 -+#define MSM_BUS_BIMC_SNOC_MAS 10016 -+#define MSM_BUS_BIMC_SNOC_SLV 10017 -+#define MSM_BUS_PNOC_SLV_0 10018 -+#define MSM_BUS_PNOC_SLV_1 10019 -+#define MSM_BUS_PNOC_SLV_2 10020 -+#define MSM_BUS_PNOC_SLV_3 10021 -+#define MSM_BUS_PNOC_SLV_4 10022 -+#define MSM_BUS_PNOC_SLV_8 10023 -+#define MSM_BUS_PNOC_SLV_9 10024 -+#define MSM_BUS_SNOC_BIMC_0_SLV 10025 -+#define MSM_BUS_SNOC_BIMC_1_SLV 10026 -+#define MSM_BUS_MNOC_BIMC_MAS 10027 -+#define MSM_BUS_MNOC_BIMC_SLV 10028 -+#define MSM_BUS_BIMC_MNOC_MAS 10029 -+#define MSM_BUS_BIMC_MNOC_SLV 10030 -+#define MSM_BUS_SNOC_BIMC_MAS 10031 -+#define MSM_BUS_SNOC_BIMC_SLV 10032 -+#define MSM_BUS_CNOC_SNOC_MAS 10033 -+#define MSM_BUS_CNOC_SNOC_SLV 10034 -+#define MSM_BUS_SNOC_CNOC_MAS 10035 -+#define MSM_BUS_SNOC_CNOC_SLV 10036 -+#define MSM_BUS_OVNOC_SNOC_MAS 10037 -+#define MSM_BUS_OVNOC_SNOC_SLV 10038 -+#define MSM_BUS_SNOC_OVNOC_MAS 10039 -+#define MSM_BUS_SNOC_OVNOC_SLV 10040 -+#define MSM_BUS_SNOC_PNOC_MAS 10041 -+#define MSM_BUS_SNOC_PNOC_SLV 10042 -+#define MSM_BUS_BIMC_INT_APPS_EBI 10043 -+#define MSM_BUS_BIMC_INT_APPS_SNOC 10044 -+#define MSM_BUS_SNOC_BIMC_2_MAS 10045 -+#define MSM_BUS_SNOC_BIMC_2_SLV 10046 -+#define MSM_BUS_PNOC_SLV_5 10047 -+#define MSM_BUS_PNOC_SLV_6 10048 -+#define MSM_BUS_PNOC_INT_2 10049 -+#define MSM_BUS_PNOC_INT_3 10050 -+#define MSM_BUS_PNOC_INT_4 10051 -+#define MSM_BUS_PNOC_INT_5 10052 -+#define MSM_BUS_PNOC_INT_6 10053 -+#define MSM_BUS_PNOC_INT_7 10054 -+#define MSM_BUS_BIMC_SNOC_1_MAS 10055 -+#define MSM_BUS_BIMC_SNOC_1_SLV 10056 -+#define MSM_BUS_PNOC_A1NOC_MAS 10057 -+#define MSM_BUS_PNOC_A1NOC_SLV 10058 -+#define MSM_BUS_CNOC_A1NOC_MAS 10059 -+#define MSM_BUS_A0NOC_SNOC_MAS 10060 -+#define MSM_BUS_A0NOC_SNOC_SLV 10061 -+#define MSM_BUS_A1NOC_SNOC_SLV 10062 -+#define MSM_BUS_A1NOC_SNOC_MAS 10063 -+#define MSM_BUS_A2NOC_SNOC_MAS 10064 -+#define MSM_BUS_A2NOC_SNOC_SLV 10065 -+#define MSM_BUS_PNOC_SLV_7 10066 -+#define MSM_BUS_INT_LAST 10067 -+ -+#define MSM_BUS_SLAVE_FIRST 512 -+#define MSM_BUS_SLAVE_EBI_CH0 512 -+#define MSM_BUS_SLAVE_EBI_CH1 513 -+#define MSM_BUS_SLAVE_AMPSS_L2 514 -+#define MSM_BUS_APPSS_SLAVE_FAB_MMSS 515 -+#define MSM_BUS_APPSS_SLAVE_FAB_SYSTEM 516 -+#define MSM_BUS_SYSTEM_SLAVE_FAB_APPS 517 -+#define MSM_BUS_SLAVE_SPS 518 -+#define MSM_BUS_SLAVE_SYSTEM_IMEM 519 -+#define MSM_BUS_SLAVE_AMPSS 520 -+#define MSM_BUS_SLAVE_MSS 521 -+#define MSM_BUS_SLAVE_LPASS 522 -+#define MSM_BUS_SYSTEM_SLAVE_CPSS_FPB 523 -+#define MSM_BUS_SYSTEM_SLAVE_SYSTEM_FPB 524 -+#define MSM_BUS_SYSTEM_SLAVE_MMSS_FPB 525 -+#define MSM_BUS_SLAVE_CORESIGHT 526 -+#define MSM_BUS_SLAVE_RIVA 527 -+#define MSM_BUS_SLAVE_SMI 528 -+#define MSM_BUS_MMSS_SLAVE_FAB_APPS 529 -+#define MSM_BUS_MMSS_SLAVE_FAB_APPS_1 530 -+#define MSM_BUS_SLAVE_MM_IMEM 531 -+#define MSM_BUS_SLAVE_CRYPTO 532 -+#define MSM_BUS_SLAVE_SPDM 533 -+#define MSM_BUS_SLAVE_RPM 534 -+#define MSM_BUS_SLAVE_RPM_MSG_RAM 535 -+#define MSM_BUS_SLAVE_MPM 536 -+#define MSM_BUS_SLAVE_PMIC1_SSBI1_A 537 -+#define MSM_BUS_SLAVE_PMIC1_SSBI1_B 538 -+#define MSM_BUS_SLAVE_PMIC1_SSBI1_C 539 -+#define MSM_BUS_SLAVE_PMIC2_SSBI2_A 540 -+#define MSM_BUS_SLAVE_PMIC2_SSBI2_B 541 -+#define MSM_BUS_SLAVE_GSBI1_UART 542 -+#define MSM_BUS_SLAVE_GSBI2_UART 543 -+#define MSM_BUS_SLAVE_GSBI3_UART 544 -+#define MSM_BUS_SLAVE_GSBI4_UART 545 -+#define MSM_BUS_SLAVE_GSBI5_UART 546 -+#define MSM_BUS_SLAVE_GSBI6_UART 547 -+#define MSM_BUS_SLAVE_GSBI7_UART 548 -+#define MSM_BUS_SLAVE_GSBI8_UART 549 -+#define MSM_BUS_SLAVE_GSBI9_UART 550 -+#define MSM_BUS_SLAVE_GSBI10_UART 551 -+#define MSM_BUS_SLAVE_GSBI11_UART 552 -+#define MSM_BUS_SLAVE_GSBI12_UART 553 -+#define MSM_BUS_SLAVE_GSBI1_QUP 554 -+#define MSM_BUS_SLAVE_GSBI2_QUP 555 -+#define MSM_BUS_SLAVE_GSBI3_QUP 556 -+#define MSM_BUS_SLAVE_GSBI4_QUP 557 -+#define MSM_BUS_SLAVE_GSBI5_QUP 558 -+#define MSM_BUS_SLAVE_GSBI6_QUP 559 -+#define MSM_BUS_SLAVE_GSBI7_QUP 560 -+#define MSM_BUS_SLAVE_GSBI8_QUP 561 -+#define MSM_BUS_SLAVE_GSBI9_QUP 562 -+#define MSM_BUS_SLAVE_GSBI10_QUP 563 -+#define MSM_BUS_SLAVE_GSBI11_QUP 564 -+#define MSM_BUS_SLAVE_GSBI12_QUP 565 -+#define MSM_BUS_SLAVE_EBI2_NAND 566 -+#define MSM_BUS_SLAVE_EBI2_CS0 567 -+#define MSM_BUS_SLAVE_EBI2_CS1 568 -+#define MSM_BUS_SLAVE_EBI2_CS2 569 -+#define MSM_BUS_SLAVE_EBI2_CS3 570 -+#define MSM_BUS_SLAVE_EBI2_CS4 571 -+#define MSM_BUS_SLAVE_EBI2_CS5 572 -+#define MSM_BUS_SLAVE_USB_FS1 573 -+#define MSM_BUS_SLAVE_USB_FS2 574 -+#define MSM_BUS_SLAVE_TSIF 575 -+#define MSM_BUS_SLAVE_MSM_TSSC 576 -+#define MSM_BUS_SLAVE_MSM_PDM 577 -+#define MSM_BUS_SLAVE_MSM_DIMEM 578 -+#define MSM_BUS_SLAVE_MSM_TCSR 579 -+#define MSM_BUS_SLAVE_MSM_PRNG 580 -+#define MSM_BUS_SLAVE_GSS 581 -+#define MSM_BUS_SLAVE_SATA 582 -+#define MSM_BUS_SLAVE_USB3 583 -+#define MSM_BUS_SLAVE_WCSS 584 -+#define MSM_BUS_SLAVE_OCIMEM 585 -+#define MSM_BUS_SLAVE_SNOC_OCMEM 586 -+#define MSM_BUS_SLAVE_SERVICE_SNOC 587 -+#define MSM_BUS_SLAVE_QDSS_STM 588 -+#define MSM_BUS_SLAVE_CAMERA_CFG 589 -+#define MSM_BUS_SLAVE_DISPLAY_CFG 590 -+#define MSM_BUS_SLAVE_OCMEM_CFG 591 -+#define MSM_BUS_SLAVE_CPR_CFG 592 -+#define MSM_BUS_SLAVE_CPR_XPU_CFG 593 -+#define MSM_BUS_SLAVE_MISC_CFG 594 -+#define MSM_BUS_SLAVE_MISC_XPU_CFG 595 -+#define MSM_BUS_SLAVE_VENUS_CFG 596 -+#define MSM_BUS_SLAVE_MISC_VENUS_CFG 597 -+#define MSM_BUS_SLAVE_GRAPHICS_3D_CFG 598 -+#define MSM_BUS_SLAVE_MMSS_CLK_CFG 599 -+#define MSM_BUS_SLAVE_MMSS_CLK_XPU_CFG 600 -+#define MSM_BUS_SLAVE_MNOC_MPU_CFG 601 -+#define MSM_BUS_SLAVE_ONOC_MPU_CFG 602 -+#define MSM_BUS_SLAVE_SERVICE_MNOC 603 -+#define MSM_BUS_SLAVE_OCMEM 604 -+#define MSM_BUS_SLAVE_SERVICE_ONOC 605 -+#define MSM_BUS_SLAVE_SDCC_1 606 -+#define MSM_BUS_SLAVE_SDCC_3 607 -+#define MSM_BUS_SLAVE_SDCC_2 608 -+#define MSM_BUS_SLAVE_SDCC_4 609 -+#define MSM_BUS_SLAVE_BAM_DMA 610 -+#define MSM_BUS_SLAVE_BLSP_2 611 -+#define MSM_BUS_SLAVE_USB_HSIC 612 -+#define MSM_BUS_SLAVE_BLSP_1 613 -+#define MSM_BUS_SLAVE_USB_HS 614 -+#define MSM_BUS_SLAVE_PDM 615 -+#define MSM_BUS_SLAVE_PERIPH_APU_CFG 616 -+#define MSM_BUS_SLAVE_PNOC_MPU_CFG 617 -+#define MSM_BUS_SLAVE_PRNG 618 -+#define MSM_BUS_SLAVE_SERVICE_PNOC 619 -+#define MSM_BUS_SLAVE_CLK_CTL 620 -+#define MSM_BUS_SLAVE_CNOC_MSS 621 -+#define MSM_BUS_SLAVE_SECURITY 622 -+#define MSM_BUS_SLAVE_TCSR 623 -+#define MSM_BUS_SLAVE_TLMM 624 -+#define MSM_BUS_SLAVE_CRYPTO_0_CFG 625 -+#define MSM_BUS_SLAVE_CRYPTO_1_CFG 626 -+#define MSM_BUS_SLAVE_IMEM_CFG 627 -+#define MSM_BUS_SLAVE_MESSAGE_RAM 628 -+#define MSM_BUS_SLAVE_BIMC_CFG 629 -+#define MSM_BUS_SLAVE_BOOT_ROM 630 -+#define MSM_BUS_SLAVE_CNOC_MNOC_MMSS_CFG 631 -+#define MSM_BUS_SLAVE_PMIC_ARB 632 -+#define MSM_BUS_SLAVE_SPDM_WRAPPER 633 -+#define MSM_BUS_SLAVE_DEHR_CFG 634 -+#define MSM_BUS_SLAVE_QDSS_CFG 635 -+#define MSM_BUS_SLAVE_RBCPR_CFG 636 -+#define MSM_BUS_SLAVE_RBCPR_QDSS_APU_CFG 637 -+#define MSM_BUS_SLAVE_SNOC_MPU_CFG 638 -+#define MSM_BUS_SLAVE_CNOC_ONOC_CFG 639 -+#define MSM_BUS_SLAVE_CNOC_MNOC_CFG 640 -+#define MSM_BUS_SLAVE_PNOC_CFG 641 -+#define MSM_BUS_SLAVE_SNOC_CFG 642 -+#define MSM_BUS_SLAVE_EBI1_DLL_CFG 643 -+#define MSM_BUS_SLAVE_PHY_APU_CFG 644 -+#define MSM_BUS_SLAVE_EBI1_PHY_CFG 645 -+#define MSM_BUS_SLAVE_SERVICE_CNOC 646 -+#define MSM_BUS_SLAVE_IPS_CFG 647 -+#define MSM_BUS_SLAVE_QPIC 648 -+#define MSM_BUS_SLAVE_DSI_CFG 649 -+#define MSM_BUS_SLAVE_UFS_CFG 650 -+#define MSM_BUS_SLAVE_RBCPR_CX_CFG 651 -+#define MSM_BUS_SLAVE_RBCPR_MX_CFG 652 -+#define MSM_BUS_SLAVE_PCIE_CFG 653 -+#define MSM_BUS_SLAVE_USB_PHYS_CFG 654 -+#define MSM_BUS_SLAVE_VIDEO_CAP_CFG 655 -+#define MSM_BUS_SLAVE_AVSYNC_CFG 656 -+#define MSM_BUS_SLAVE_CRYPTO_2_CFG 657 -+#define MSM_BUS_SLAVE_VPU_CFG 658 -+#define MSM_BUS_SLAVE_BCAST_CFG 659 -+#define MSM_BUS_SLAVE_KLM_CFG 660 -+#define MSM_BUS_SLAVE_GENI_IR_CFG 661 -+#define MSM_BUS_SLAVE_OCMEM_GFX 662 -+#define MSM_BUS_SLAVE_CATS_128 663 -+#define MSM_BUS_SLAVE_OCMEM_64 664 -+#define MSM_BUS_SLAVE_PCIE_0 665 -+#define MSM_BUS_SLAVE_PCIE_1 666 -+#define MSM_BUS_SLAVE_PCIE_0_CFG 667 -+#define MSM_BUS_SLAVE_PCIE_1_CFG 668 -+#define MSM_BUS_SLAVE_SRVC_MNOC 669 -+#define MSM_BUS_SLAVE_USB_HS2 670 -+#define MSM_BUS_SLAVE_AUDIO 671 -+#define MSM_BUS_SLAVE_TCU 672 -+#define MSM_BUS_SLAVE_APPSS 673 -+#define MSM_BUS_SLAVE_PCIE_PARF 674 -+#define MSM_BUS_SLAVE_USB3_PHY_CFG 675 -+#define MSM_BUS_SLAVE_IPA_CFG 676 -+#define MSM_BUS_SLAVE_A0NOC_SNOC 677 -+#define MSM_BUS_SLAVE_A1NOC_SNOC 678 -+#define MSM_BUS_SLAVE_A2NOC_SNOC 679 -+#define MSM_BUS_SLAVE_HMSS_L3 680 -+#define MSM_BUS_SLAVE_PIMEM_CFG 681 -+#define MSM_BUS_SLAVE_DCC_CFG 682 -+#define MSM_BUS_SLAVE_QDSS_RBCPR_APU_CFG 683 -+#define MSM_BUS_SLAVE_PCIE_2_CFG 684 -+#define MSM_BUS_SLAVE_PCIE20_AHB2PHY 685 -+#define MSM_BUS_SLAVE_A0NOC_CFG 686 -+#define MSM_BUS_SLAVE_A1NOC_CFG 687 -+#define MSM_BUS_SLAVE_A2NOC_CFG 688 -+#define MSM_BUS_SLAVE_A1NOC_MPU_CFG 689 -+#define MSM_BUS_SLAVE_A2NOC_MPU_CFG 690 -+#define MSM_BUS_SLAVE_A0NOC_SMMU_CFG 691 -+#define MSM_BUS_SLAVE_A1NOC_SMMU_CFG 692 -+#define MSM_BUS_SLAVE_A2NOC_SMMU_CFG 693 -+#define MSM_BUS_SLAVE_LPASS_SMMU_CFG 694 -+#define MSM_BUS_SLAVE_MMAGIC_CFG 695 -+#define MSM_BUS_SLAVE_VENUS_THROTTLE_CFG 696 -+#define MSM_BUS_SLAVE_SSC_CFG 697 -+#define MSM_BUS_SLAVE_DSA_CFG 698 -+#define MSM_BUS_SLAVE_DSA_MPU_CFG 699 -+#define MSM_BUS_SLAVE_DISPLAY_THROTTLE_CFG 700 -+#define MSM_BUS_SLAVE_SMMU_CPP_CFG 701 -+#define MSM_BUS_SLAVE_SMMU_JPEG_CFG 702 -+#define MSM_BUS_SLAVE_SMMU_MDP_CFG 703 -+#define MSM_BUS_SLAVE_SMMU_ROTATOR_CFG 704 -+#define MSM_BUS_SLAVE_SMMU_VENUS_CFG 705 -+#define MSM_BUS_SLAVE_SMMU_VFE_CFG 706 -+#define MSM_BUS_SLAVE_A0NOC_MPU_CFG 707 -+#define MSM_BUS_SLAVE_VMEM_CFG 708 -+#define MSM_BUS_SLAVE_CAMERA_THROTTLE_CFG 700 -+#define MSM_BUS_SLAVE_VMEM 709 -+#define MSM_BUS_SLAVE_AHB2PHY 710 -+#define MSM_BUS_SLAVE_PIMEM 711 -+#define MSM_BUS_SLAVE_SNOC_VMEM 712 -+#define MSM_BUS_SLAVE_PCIE_2 713 -+#define MSM_BUS_SLAVE_RBCPR_MX 714 -+#define MSM_BUS_SLAVE_RBCPR_CX 715 -+#define MSM_BUS_SLAVE_PRNG_APU_CFG 716 -+#define MSM_BUS_SLAVE_PERIPH_MPU_CFG 717 -+#define MSM_BUS_SLAVE_GCNT 718 -+#define MSM_BUS_SLAVE_ADSS_CFG 719 -+#define MSM_BUS_SLAVE_ADSS_VMIDMT_CFG 720 -+#define MSM_BUS_SLAVE_QHSS_APU_CFG 721 -+#define MSM_BUS_SLAVE_MDIO 722 -+#define MSM_BUS_SLAVE_FEPHY_CFG 723 -+#define MSM_BUS_SLAVE_SRIF 724 -+#define MSM_BUS_SLAVE_LAST 730 -+#define MSM_BUS_SLAVE_DDRC_CFG 731 -+#define MSM_BUS_SLAVE_DDRC_APU_CFG 732 -+#define MSM_BUS_SLAVE_MPU0_CFG 733 -+#define MSM_BUS_SLAVE_MPU1_CFG 734 -+#define MSM_BUS_SLAVE_MPU2_CFG 734 -+#define MSM_BUS_SLAVE_ESS_VMIDMT_CFG 735 -+#define MSM_BUS_SLAVE_ESS_APU_CFG 736 -+#define MSM_BUS_SLAVE_USB2_CFG 737 -+#define MSM_BUS_SLAVE_BLSP_CFG 738 -+#define MSM_BUS_SLAVE_QPIC_CFG 739 -+#define MSM_BUS_SLAVE_SDCC_CFG 740 -+#define MSM_BUS_SLAVE_WSS0_VMIDMT_CFG 741 -+#define MSM_BUS_SLAVE_WSS0_APU_CFG 742 -+#define MSM_BUS_SLAVE_WSS1_VMIDMT_CFG 743 -+#define MSM_BUS_SLAVE_WSS1_APU_CFG 744 -+#define MSM_BUS_SLAVE_SRVC_PCNOC 745 -+#define MSM_BUS_SLAVE_SNOC_DDRC 746 -+#define MSM_BUS_SLAVE_A7SS 747 -+#define MSM_BUS_SLAVE_WSS0_CFG 748 -+#define MSM_BUS_SLAVE_WSS1_CFG 749 -+#define MSM_BUS_SLAVE_PCIE 750 -+#define MSM_BUS_SLAVE_USB3_CFG 751 -+#define MSM_BUS_SLAVE_CRYPTO_CFG 752 -+#define MSM_BUS_SLAVE_ESS_CFG 753 -+#define MSM_BUS_SLAVE_SRVC_SNOC 754 -+ -+#define MSM_BUS_SYSTEM_FPB_SLAVE_SYSTEM MSM_BUS_SYSTEM_SLAVE_SYSTEM_FPB -+#define MSM_BUS_CPSS_FPB_SLAVE_SYSTEM MSM_BUS_SYSTEM_SLAVE_CPSS_FPB -+ -+/* -+ * ID's used in RPM messages -+ */ -+#define ICBID_MASTER_APPSS_PROC 0 -+#define ICBID_MASTER_MSS_PROC 1 -+#define ICBID_MASTER_MNOC_BIMC 2 -+#define ICBID_MASTER_SNOC_BIMC 3 -+#define ICBID_MASTER_SNOC_BIMC_0 ICBID_MASTER_SNOC_BIMC -+#define ICBID_MASTER_CNOC_MNOC_MMSS_CFG 4 -+#define ICBID_MASTER_CNOC_MNOC_CFG 5 -+#define ICBID_MASTER_GFX3D 6 -+#define ICBID_MASTER_JPEG 7 -+#define ICBID_MASTER_MDP 8 -+#define ICBID_MASTER_MDP0 ICBID_MASTER_MDP -+#define ICBID_MASTER_MDPS ICBID_MASTER_MDP -+#define ICBID_MASTER_VIDEO 9 -+#define ICBID_MASTER_VIDEO_P0 ICBID_MASTER_VIDEO -+#define ICBID_MASTER_VIDEO_P1 10 -+#define ICBID_MASTER_VFE 11 -+#define ICBID_MASTER_CNOC_ONOC_CFG 12 -+#define ICBID_MASTER_JPEG_OCMEM 13 -+#define ICBID_MASTER_MDP_OCMEM 14 -+#define ICBID_MASTER_VIDEO_P0_OCMEM 15 -+#define ICBID_MASTER_VIDEO_P1_OCMEM 16 -+#define ICBID_MASTER_VFE_OCMEM 17 -+#define ICBID_MASTER_LPASS_AHB 18 -+#define ICBID_MASTER_QDSS_BAM 19 -+#define ICBID_MASTER_SNOC_CFG 20 -+#define ICBID_MASTER_BIMC_SNOC 21 -+#define ICBID_MASTER_CNOC_SNOC 22 -+#define ICBID_MASTER_CRYPTO 23 -+#define ICBID_MASTER_CRYPTO_CORE0 ICBID_MASTER_CRYPTO -+#define ICBID_MASTER_CRYPTO_CORE1 24 -+#define ICBID_MASTER_LPASS_PROC 25 -+#define ICBID_MASTER_MSS 26 -+#define ICBID_MASTER_MSS_NAV 27 -+#define ICBID_MASTER_OCMEM_DMA 28 -+#define ICBID_MASTER_PNOC_SNOC 29 -+#define ICBID_MASTER_WCSS 30 -+#define ICBID_MASTER_QDSS_ETR 31 -+#define ICBID_MASTER_USB3 32 -+#define ICBID_MASTER_USB3_0 ICBID_MASTER_USB3 -+#define ICBID_MASTER_SDCC_1 33 -+#define ICBID_MASTER_SDCC_3 34 -+#define ICBID_MASTER_SDCC_2 35 -+#define ICBID_MASTER_SDCC_4 36 -+#define ICBID_MASTER_TSIF 37 -+#define ICBID_MASTER_BAM_DMA 38 -+#define ICBID_MASTER_BLSP_2 39 -+#define ICBID_MASTER_USB_HSIC 40 -+#define ICBID_MASTER_BLSP_1 41 -+#define ICBID_MASTER_USB_HS 42 -+#define ICBID_MASTER_USB_HS1 ICBID_MASTER_USB_HS -+#define ICBID_MASTER_PNOC_CFG 43 -+#define ICBID_MASTER_SNOC_PNOC 44 -+#define ICBID_MASTER_RPM_INST 45 -+#define ICBID_MASTER_RPM_DATA 46 -+#define ICBID_MASTER_RPM_SYS 47 -+#define ICBID_MASTER_DEHR 48 -+#define ICBID_MASTER_QDSS_DAP 49 -+#define ICBID_MASTER_SPDM 50 -+#define ICBID_MASTER_TIC 51 -+#define ICBID_MASTER_SNOC_CNOC 52 -+#define ICBID_MASTER_GFX3D_OCMEM 53 -+#define ICBID_MASTER_GFX3D_GMEM ICBID_MASTER_GFX3D_OCMEM -+#define ICBID_MASTER_OVIRT_SNOC 54 -+#define ICBID_MASTER_SNOC_OVIRT 55 -+#define ICBID_MASTER_SNOC_GVIRT ICBID_MASTER_SNOC_OVIRT -+#define ICBID_MASTER_ONOC_OVIRT 56 -+#define ICBID_MASTER_USB_HS2 57 -+#define ICBID_MASTER_QPIC 58 -+#define ICBID_MASTER_IPA 59 -+#define ICBID_MASTER_DSI 60 -+#define ICBID_MASTER_MDP1 61 -+#define ICBID_MASTER_MDPE ICBID_MASTER_MDP1 -+#define ICBID_MASTER_VPU_PROC 62 -+#define ICBID_MASTER_VPU 63 -+#define ICBID_MASTER_VPU0 ICBID_MASTER_VPU -+#define ICBID_MASTER_CRYPTO_CORE2 64 -+#define ICBID_MASTER_PCIE_0 65 -+#define ICBID_MASTER_PCIE_1 66 -+#define ICBID_MASTER_SATA 67 -+#define ICBID_MASTER_UFS 68 -+#define ICBID_MASTER_USB3_1 69 -+#define ICBID_MASTER_VIDEO_OCMEM 70 -+#define ICBID_MASTER_VPU1 71 -+#define ICBID_MASTER_VCAP 72 -+#define ICBID_MASTER_EMAC 73 -+#define ICBID_MASTER_BCAST 74 -+#define ICBID_MASTER_MMSS_PROC 75 -+#define ICBID_MASTER_SNOC_BIMC_1 76 -+#define ICBID_MASTER_SNOC_PCNOC 77 -+#define ICBID_MASTER_AUDIO 78 -+#define ICBID_MASTER_MM_INT_0 79 -+#define ICBID_MASTER_MM_INT_1 80 -+#define ICBID_MASTER_MM_INT_2 81 -+#define ICBID_MASTER_MM_INT_BIMC 82 -+#define ICBID_MASTER_MSS_INT 83 -+#define ICBID_MASTER_PCNOC_CFG 84 -+#define ICBID_MASTER_PCNOC_INT_0 85 -+#define ICBID_MASTER_PCNOC_INT_1 86 -+#define ICBID_MASTER_PCNOC_M_0 87 -+#define ICBID_MASTER_PCNOC_M_1 88 -+#define ICBID_MASTER_PCNOC_S_0 89 -+#define ICBID_MASTER_PCNOC_S_1 90 -+#define ICBID_MASTER_PCNOC_S_2 91 -+#define ICBID_MASTER_PCNOC_S_3 92 -+#define ICBID_MASTER_PCNOC_S_4 93 -+#define ICBID_MASTER_PCNOC_S_6 94 -+#define ICBID_MASTER_PCNOC_S_7 95 -+#define ICBID_MASTER_PCNOC_S_8 96 -+#define ICBID_MASTER_PCNOC_S_9 97 -+#define ICBID_MASTER_QDSS_INT 98 -+#define ICBID_MASTER_SNOC_INT_0 99 -+#define ICBID_MASTER_SNOC_INT_1 100 -+#define ICBID_MASTER_SNOC_INT_BIMC 101 -+#define ICBID_MASTER_TCU_0 102 -+#define ICBID_MASTER_TCU_1 103 -+#define ICBID_MASTER_BIMC_INT_0 104 -+#define ICBID_MASTER_BIMC_INT_1 105 -+#define ICBID_MASTER_CAMERA 106 -+#define ICBID_MASTER_RICA 107 -+#define ICBID_MASTER_PCNOC_S_5 129 -+#define ICBID_MASTER_PCNOC_INT_2 124 -+#define ICBID_MASTER_PCNOC_INT_3 125 -+#define ICBID_MASTER_PCNOC_INT_4 126 -+#define ICBID_MASTER_PCNOC_INT_5 127 -+#define ICBID_MASTER_PCNOC_INT_6 128 -+#define ICBID_MASTER_PCIE_2 119 -+#define ICBID_MASTER_MASTER_CNOC_A1NOC 116 -+#define ICBID_MASTER_A0NOC_SNOC 110 -+#define ICBID_MASTER_A1NOC_SNOC 111 -+#define ICBID_MASTER_A2NOC_SNOC 112 -+#define ICBID_MASTER_PNOC_A1NOC 117 -+#define ICBID_MASTER_ROTATOR 120 -+#define ICBID_MASTER_SNOC_VMEM 114 -+#define ICBID_MASTER_VENUS_VMEM 121 -+#define ICBID_MASTER_HMSS 118 -+#define ICBID_MASTER_BIMC_SNOC_1 109 -+#define ICBID_MASTER_CNOC_A1NOC 116 -+#define ICBID_MASTER_CPP 115 -+#define ICBID_MASTER_BLSP_BAM 130 -+#define ICBID_MASTER_USB2_BAM 131 -+#define ICBID_MASTER_ADSS_DMA0 132 -+#define ICBID_MASTER_ADSS_DMA1 133 -+#define ICBID_MASTER_ADSS_DMA2 134 -+#define ICBID_MASTER_ADSS_DMA3 135 -+#define ICBID_MASTER_QPIC_BAM 136 -+#define ICBID_MASTER_SDCC_BAM 137 -+#define ICBID_MASTER_DDRC_SNOC 138 -+#define ICBID_MASTER_WSS_0 139 -+#define ICBID_MASTER_WSS_1 140 -+#define ICBID_MASTER_ESS 141 -+#define ICBID_MASTER_PCIE 142 -+#define ICBID_MASTER_QDSS_BAMNDP 143 -+#define ICBID_MASTER_QDSS_SNOC_CFG 144 -+ -+#define ICBID_SLAVE_EBI1 0 -+#define ICBID_SLAVE_APPSS_L2 1 -+#define ICBID_SLAVE_BIMC_SNOC 2 -+#define ICBID_SLAVE_CAMERA_CFG 3 -+#define ICBID_SLAVE_DISPLAY_CFG 4 -+#define ICBID_SLAVE_OCMEM_CFG 5 -+#define ICBID_SLAVE_CPR_CFG 6 -+#define ICBID_SLAVE_CPR_XPU_CFG 7 -+#define ICBID_SLAVE_MISC_CFG 8 -+#define ICBID_SLAVE_MISC_XPU_CFG 9 -+#define ICBID_SLAVE_VENUS_CFG 10 -+#define ICBID_SLAVE_GFX3D_CFG 11 -+#define ICBID_SLAVE_MMSS_CLK_CFG 12 -+#define ICBID_SLAVE_MMSS_CLK_XPU_CFG 13 -+#define ICBID_SLAVE_MNOC_MPU_CFG 14 -+#define ICBID_SLAVE_ONOC_MPU_CFG 15 -+#define ICBID_SLAVE_MNOC_BIMC 16 -+#define ICBID_SLAVE_SERVICE_MNOC 17 -+#define ICBID_SLAVE_OCMEM 18 -+#define ICBID_SLAVE_GMEM ICBID_SLAVE_OCMEM -+#define ICBID_SLAVE_SERVICE_ONOC 19 -+#define ICBID_SLAVE_APPSS 20 -+#define ICBID_SLAVE_LPASS 21 -+#define ICBID_SLAVE_USB3 22 -+#define ICBID_SLAVE_USB3_0 ICBID_SLAVE_USB3 -+#define ICBID_SLAVE_WCSS 23 -+#define ICBID_SLAVE_SNOC_BIMC 24 -+#define ICBID_SLAVE_SNOC_BIMC_0 ICBID_SLAVE_SNOC_BIMC -+#define ICBID_SLAVE_SNOC_CNOC 25 -+#define ICBID_SLAVE_IMEM 26 -+#define ICBID_SLAVE_OCIMEM ICBID_SLAVE_IMEM -+#define ICBID_SLAVE_SNOC_OVIRT 27 -+#define ICBID_SLAVE_SNOC_GVIRT ICBID_SLAVE_SNOC_OVIRT -+#define ICBID_SLAVE_SNOC_PNOC 28 -+#define ICBID_SLAVE_SNOC_PCNOC ICBID_SLAVE_SNOC_PNOC -+#define ICBID_SLAVE_SERVICE_SNOC 29 -+#define ICBID_SLAVE_QDSS_STM 30 -+#define ICBID_SLAVE_SDCC_1 31 -+#define ICBID_SLAVE_SDCC_3 32 -+#define ICBID_SLAVE_SDCC_2 33 -+#define ICBID_SLAVE_SDCC_4 34 -+#define ICBID_SLAVE_TSIF 35 -+#define ICBID_SLAVE_BAM_DMA 36 -+#define ICBID_SLAVE_BLSP_2 37 -+#define ICBID_SLAVE_USB_HSIC 38 -+#define ICBID_SLAVE_BLSP_1 39 -+#define ICBID_SLAVE_USB_HS 40 -+#define ICBID_SLAVE_USB_HS1 ICBID_SLAVE_USB_HS -+#define ICBID_SLAVE_PDM 41 -+#define ICBID_SLAVE_PERIPH_APU_CFG 42 -+#define ICBID_SLAVE_PNOC_MPU_CFG 43 -+#define ICBID_SLAVE_PRNG 44 -+#define ICBID_SLAVE_PNOC_SNOC 45 -+#define ICBID_SLAVE_PCNOC_SNOC ICBID_SLAVE_PNOC_SNOC -+#define ICBID_SLAVE_SERVICE_PNOC 46 -+#define ICBID_SLAVE_CLK_CTL 47 -+#define ICBID_SLAVE_CNOC_MSS 48 -+#define ICBID_SLAVE_PCNOC_MSS ICBID_SLAVE_CNOC_MSS -+#define ICBID_SLAVE_SECURITY 49 -+#define ICBID_SLAVE_TCSR 50 -+#define ICBID_SLAVE_TLMM 51 -+#define ICBID_SLAVE_CRYPTO_0_CFG 52 -+#define ICBID_SLAVE_CRYPTO_1_CFG 53 -+#define ICBID_SLAVE_IMEM_CFG 54 -+#define ICBID_SLAVE_MESSAGE_RAM 55 -+#define ICBID_SLAVE_BIMC_CFG 56 -+#define ICBID_SLAVE_BOOT_ROM 57 -+#define ICBID_SLAVE_CNOC_MNOC_MMSS_CFG 58 -+#define ICBID_SLAVE_PMIC_ARB 59 -+#define ICBID_SLAVE_SPDM_WRAPPER 60 -+#define ICBID_SLAVE_DEHR_CFG 61 -+#define ICBID_SLAVE_MPM 62 -+#define ICBID_SLAVE_QDSS_CFG 63 -+#define ICBID_SLAVE_RBCPR_CFG 64 -+#define ICBID_SLAVE_RBCPR_CX_CFG ICBID_SLAVE_RBCPR_CFG -+#define ICBID_SLAVE_RBCPR_QDSS_APU_CFG 65 -+#define ICBID_SLAVE_CNOC_MNOC_CFG 66 -+#define ICBID_SLAVE_SNOC_MPU_CFG 67 -+#define ICBID_SLAVE_CNOC_ONOC_CFG 68 -+#define ICBID_SLAVE_PNOC_CFG 69 -+#define ICBID_SLAVE_SNOC_CFG 70 -+#define ICBID_SLAVE_EBI1_DLL_CFG 71 -+#define ICBID_SLAVE_PHY_APU_CFG 72 -+#define ICBID_SLAVE_EBI1_PHY_CFG 73 -+#define ICBID_SLAVE_RPM 74 -+#define ICBID_SLAVE_CNOC_SNOC 75 -+#define ICBID_SLAVE_SERVICE_CNOC 76 -+#define ICBID_SLAVE_OVIRT_SNOC 77 -+#define ICBID_SLAVE_OVIRT_OCMEM 78 -+#define ICBID_SLAVE_USB_HS2 79 -+#define ICBID_SLAVE_QPIC 80 -+#define ICBID_SLAVE_IPS_CFG 81 -+#define ICBID_SLAVE_DSI_CFG 82 -+#define ICBID_SLAVE_USB3_1 83 -+#define ICBID_SLAVE_PCIE_0 84 -+#define ICBID_SLAVE_PCIE_1 85 -+#define ICBID_SLAVE_PSS_SMMU_CFG 86 -+#define ICBID_SLAVE_CRYPTO_2_CFG 87 -+#define ICBID_SLAVE_PCIE_0_CFG 88 -+#define ICBID_SLAVE_PCIE_1_CFG 89 -+#define ICBID_SLAVE_SATA_CFG 90 -+#define ICBID_SLAVE_SPSS_GENI_IR 91 -+#define ICBID_SLAVE_UFS_CFG 92 -+#define ICBID_SLAVE_AVSYNC_CFG 93 -+#define ICBID_SLAVE_VPU_CFG 94 -+#define ICBID_SLAVE_USB_PHY_CFG 95 -+#define ICBID_SLAVE_RBCPR_MX_CFG 96 -+#define ICBID_SLAVE_PCIE_PARF 97 -+#define ICBID_SLAVE_VCAP_CFG 98 -+#define ICBID_SLAVE_EMAC_CFG 99 -+#define ICBID_SLAVE_BCAST_CFG 100 -+#define ICBID_SLAVE_KLM_CFG 101 -+#define ICBID_SLAVE_DISPLAY_PWM 102 -+#define ICBID_SLAVE_GENI 103 -+#define ICBID_SLAVE_SNOC_BIMC_1 104 -+#define ICBID_SLAVE_AUDIO 105 -+#define ICBID_SLAVE_CATS_0 106 -+#define ICBID_SLAVE_CATS_1 107 -+#define ICBID_SLAVE_MM_INT_0 108 -+#define ICBID_SLAVE_MM_INT_1 109 -+#define ICBID_SLAVE_MM_INT_2 110 -+#define ICBID_SLAVE_MM_INT_BIMC 111 -+#define ICBID_SLAVE_MMU_MODEM_XPU_CFG 112 -+#define ICBID_SLAVE_MSS_INT 113 -+#define ICBID_SLAVE_PCNOC_INT_0 114 -+#define ICBID_SLAVE_PCNOC_INT_1 115 -+#define ICBID_SLAVE_PCNOC_M_0 116 -+#define ICBID_SLAVE_PCNOC_M_1 117 -+#define ICBID_SLAVE_PCNOC_S_0 118 -+#define ICBID_SLAVE_PCNOC_S_1 119 -+#define ICBID_SLAVE_PCNOC_S_2 120 -+#define ICBID_SLAVE_PCNOC_S_3 121 -+#define ICBID_SLAVE_PCNOC_S_4 122 -+#define ICBID_SLAVE_PCNOC_S_6 123 -+#define ICBID_SLAVE_PCNOC_S_7 124 -+#define ICBID_SLAVE_PCNOC_S_8 125 -+#define ICBID_SLAVE_PCNOC_S_9 126 -+#define ICBID_SLAVE_PRNG_XPU_CFG 127 -+#define ICBID_SLAVE_QDSS_INT 128 -+#define ICBID_SLAVE_RPM_XPU_CFG 129 -+#define ICBID_SLAVE_SNOC_INT_0 130 -+#define ICBID_SLAVE_SNOC_INT_1 131 -+#define ICBID_SLAVE_SNOC_INT_BIMC 132 -+#define ICBID_SLAVE_TCU 133 -+#define ICBID_SLAVE_BIMC_INT_0 134 -+#define ICBID_SLAVE_BIMC_INT_1 135 -+#define ICBID_SLAVE_RICA_CFG 136 -+#define ICBID_SLAVE_PCNOC_S_5 189 -+#define ICBID_SLAVE_PCNOC_S_7 124 -+#define ICBID_SLAVE_PCNOC_INT_2 184 -+#define ICBID_SLAVE_PCNOC_INT_3 185 -+#define ICBID_SLAVE_PCNOC_INT_4 186 -+#define ICBID_SLAVE_PCNOC_INT_5 187 -+#define ICBID_SLAVE_PCNOC_INT_6 188 -+#define ICBID_SLAVE_USB3_PHY_CFG 182 -+#define ICBID_SLAVE_IPA_CFG 183 -+ -+#define ICBID_SLAVE_A0NOC_SNOC 141 -+#define ICBID_SLAVE_A1NOC_SNOC 142 -+#define ICBID_SLAVE_A2NOC_SNOC 143 -+#define ICBID_SLAVE_BIMC_SNOC_1 138 -+#define ICBID_SLAVE_PIMEM 167 -+#define ICBID_SLAVE_PIMEM_CFG 168 -+#define ICBID_SLAVE_DCC_CFG 155 -+#define ICBID_SLAVE_QDSS_RBCPR_APU_CFG 168 -+#define ICBID_SLAVE_A0NOC_CFG 144 -+#define ICBID_SLAVE_PCIE_2_CFG 165 -+#define ICBID_SLAVE_PCIE20_AHB2PHY 163 -+#define ICBID_SLAVE_PCIE_2 164 -+#define ICBID_SLAVE_A1NOC_CFG 147 -+#define ICBID_SLAVE_A1NOC_MPU_CFG 148 -+#define ICBID_SLAVE_A1NOC_SMMU_CFG 149 -+#define ICBID_SLAVE_A2NOC_CFG 150 -+#define ICBID_SLAVE_A2NOC_MPU_CFG 151 -+#define ICBID_SLAVE_A2NOC_SMMU_CFG 152 -+#define ICBID_SLAVE_AHB2PHY 153 -+#define ICBID_SLAVE_HMSS_L3 161 -+#define ICBID_SLAVE_LPASS_SMMU_CFG 161 -+#define ICBID_SLAVE_MMAGIC_CFG 162 -+#define ICBID_SLAVE_SSC_CFG 177 -+#define ICBID_SLAVE_VENUS_THROTTLE_CFG 178 -+#define ICBID_SLAVE_DISPLAY_THROTTLE_CFG 156 -+#define ICBID_SLAVE_CAMERA_THROTTLE_CFG 154 -+#define ICBID_SLAVE_DSA_CFG 157 -+#define ICBID_SLAVE_DSA_MPU_CFG 158 -+#define ICBID_SLAVE_SMMU_CPP_CFG 171 -+#define ICBID_SLAVE_SMMU_JPEG_CFG 172 -+#define ICBID_SLAVE_SMMU_MDP_CFG 173 -+#define ICBID_SLAVE_SMMU_ROTATOR_CFG 174 -+#define ICBID_SLAVE_SMMU_VENUS_CFG 175 -+#define ICBID_SLAVE_SMMU_VFE_CFG 176 -+#define ICBID_SLAVE_A0NOC_MPU_CFG 145 -+#define ICBID_SLAVE_A0NOC_SMMU_CFG 146 -+#define ICBID_SLAVE_VMEM_CFG 180 -+#define ICBID_SLAVE_VMEM 179 -+#define ICBID_SLAVE_PNOC_A1NOC 139 -+#define ICBID_SLAVE_SNOC_VMEM 140 -+#define ICBID_SLAVE_RBCPR_MX 170 -+#define ICBID_SLAVE_RBCPR_CX 169 -+#define ICBID_SLAVE_PRNG_APU_CFG 190 -+#define ICBID_SLAVE_PERIPH_MPU_CFG 191 -+#define ICBID_SLAVE_GCNT 192 -+#define ICBID_SLAVE_ADSS_CFG 193 -+#define ICBID_SLAVE_ADSS_APU 194 -+#define ICBID_SLAVE_ADSS_VMIDMT_CFG 195 -+#define ICBID_SLAVE_QHSS_APU_CFG 196 -+#define ICBID_SLAVE_MDIO 197 -+#define ICBID_SLAVE_FEPHY_CFG 198 -+#define ICBID_SLAVE_SRIF 199 -+#define ICBID_SLAVE_DDRC_CFG 200 -+#define ICBID_SLAVE_DDRC_APU_CFG 201 -+#define ICBID_SLAVE_DDRC_MPU0_CFG 202 -+#define ICBID_SLAVE_DDRC_MPU1_CFG 203 -+#define ICBID_SLAVE_DDRC_MPU2_CFG 210 -+#define ICBID_SLAVE_ESS_VMIDMT_CFG 211 -+#define ICBID_SLAVE_ESS_APU_CFG 212 -+#define ICBID_SLAVE_USB2_CFG 213 -+#define ICBID_SLAVE_BLSP_CFG 214 -+#define ICBID_SLAVE_QPIC_CFG 215 -+#define ICBID_SLAVE_SDCC_CFG 216 -+#define ICBID_SLAVE_WSS0_VMIDMT_CFG 217 -+#define ICBID_SLAVE_WSS0_APU_CFG 218 -+#define ICBID_SLAVE_WSS1_VMIDMT_CFG 219 -+#define ICBID_SLAVE_WSS1_APU_CFG 220 -+#define ICBID_SLAVE_SRVC_PCNOC 221 -+#define ICBID_SLAVE_SNOC_DDRC 222 -+#define ICBID_SLAVE_A7SS 223 -+#define ICBID_SLAVE_WSS0_CFG 224 -+#define ICBID_SLAVE_WSS1_CFG 225 -+#define ICBID_SLAVE_PCIE 226 -+#define ICBID_SLAVE_USB3_CFG 227 -+#define ICBID_SLAVE_CRYPTO_CFG 228 -+#define ICBID_SLAVE_ESS_CFG 229 -+#define ICBID_SLAVE_SRVC_SNOC 230 -+#endif ---- /dev/null -+++ b/include/dt-bindings/msm/msm-bus-rule-ops.h -@@ -0,0 +1,32 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef __MSM_BUS_RULE_OPS_H -+#define __MSM_BUS_RULE_OPS_H -+ -+#define FLD_IB 0 -+#define FLD_AB 1 -+#define FLD_CLK 2 -+ -+#define OP_LE 0 -+#define OP_LT 1 -+#define OP_GE 2 -+#define OP_GT 3 -+#define OP_NOOP 4 -+ -+#define RULE_STATE_NOT_APPLIED 0 -+#define RULE_STATE_APPLIED 1 -+ -+#define THROTTLE_ON 0 -+#define THROTTLE_OFF 1 -+ -+#endif ---- /dev/null -+++ b/drivers/bus/msm_bus/Kconfig -@@ -0,0 +1,19 @@ -+config BUS_TOPOLOGY_ADHOC -+ bool "ad-hoc bus scaling topology" -+ depends on ARCH_QCOM -+ default n -+ help -+ This option enables a driver that can handle adhoc bus topologies. -+ Adhoc bus topology driver allows one to many connections and maintains -+ directionality of connections by explicitly listing device connections -+ thus avoiding illegal routes. -+ -+config MSM_BUS_SCALING -+ bool "Bus scaling driver" -+ depends on BUS_TOPOLOGY_ADHOC -+ default n -+ help -+ This option enables bus scaling on MSM devices. Bus scaling -+ allows devices to request the clocks be set to rates sufficient -+ for the active devices needs without keeping the clocks at max -+ frequency when a slower speed is sufficient. ---- /dev/null -+++ b/drivers/bus/msm_bus/Makefile -@@ -0,0 +1,12 @@ -+# -+# Makefile for msm-bus driver specific files -+# -+obj-y += msm_bus_bimc.o msm_bus_noc.o msm_bus_core.o msm_bus_client_api.o \ -+ msm_bus_id.o -+obj-$(CONFIG_OF) += msm_bus_of.o -+ -+obj-y += msm_bus_fabric_adhoc.o msm_bus_arb_adhoc.o msm_bus_rules.o -+obj-$(CONFIG_OF) += msm_bus_of_adhoc.o -+obj-$(CONFIG_CORESIGHT) += msm_buspm_coresight_adhoc.o -+ -+obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o ---- /dev/null -+++ b/drivers/bus/msm_bus/msm-bus-board.h -@@ -0,0 +1,198 @@ -+/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef __ASM_ARCH_MSM_BUS_BOARD_H -+#define __ASM_ARCH_MSM_BUS_BOARD_H -+ -+#include -+#include -+ -+enum context { -+ DUAL_CTX, -+ ACTIVE_CTX, -+ NUM_CTX -+}; -+ -+struct msm_bus_fabric_registration { -+ unsigned int id; -+ const char *name; -+ struct msm_bus_node_info *info; -+ unsigned int len; -+ int ahb; -+ const char *fabclk[NUM_CTX]; -+ const char *iface_clk; -+ unsigned int offset; -+ unsigned int haltid; -+ unsigned int rpm_enabled; -+ unsigned int nmasters; -+ unsigned int nslaves; -+ unsigned int ntieredslaves; -+ bool il_flag; -+ const struct msm_bus_board_algorithm *board_algo; -+ int hw_sel; -+ void *hw_data; -+ uint32_t qos_freq; -+ uint32_t qos_baseoffset; -+ u64 nr_lim_thresh; -+ uint32_t eff_fact; -+ uint32_t qos_delta; -+ bool virt; -+}; -+ -+struct msm_bus_device_node_registration { -+ struct msm_bus_node_device_type *info; -+ unsigned int num_devices; -+ bool virt; -+}; -+ -+enum msm_bus_bw_tier_type { -+ MSM_BUS_BW_TIER1 = 1, -+ MSM_BUS_BW_TIER2, -+ MSM_BUS_BW_COUNT, -+ MSM_BUS_BW_SIZE = 0x7FFFFFFF, -+}; -+ -+struct msm_bus_halt_vector { -+ uint32_t haltval; -+ uint32_t haltmask; -+}; -+ -+extern struct msm_bus_fabric_registration msm_bus_apps_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_sys_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_mm_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_sys_fpb_pdata; -+extern struct msm_bus_fabric_registration msm_bus_cpss_fpb_pdata; -+extern struct msm_bus_fabric_registration msm_bus_def_fab_pdata; -+ -+extern struct msm_bus_fabric_registration msm_bus_8960_apps_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8960_sys_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8960_mm_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8960_sg_mm_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8960_sys_fpb_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8960_cpss_fpb_pdata; -+ -+extern struct msm_bus_fabric_registration msm_bus_8064_apps_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8064_sys_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8064_mm_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8064_sys_fpb_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8064_cpss_fpb_pdata; -+ -+extern struct msm_bus_fabric_registration msm_bus_9615_sys_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_9615_def_fab_pdata; -+ -+extern struct msm_bus_fabric_registration msm_bus_8930_apps_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8930_sys_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8930_mm_fabric_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8930_sys_fpb_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8930_cpss_fpb_pdata; -+ -+extern struct msm_bus_fabric_registration msm_bus_8974_sys_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8974_mmss_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8974_bimc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8974_ocmem_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8974_periph_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8974_config_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_8974_ocmem_vnoc_pdata; -+ -+extern struct msm_bus_fabric_registration msm_bus_9625_sys_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_9625_bimc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_9625_periph_noc_pdata; -+extern struct msm_bus_fabric_registration msm_bus_9625_config_noc_pdata; -+ -+extern int msm_bus_device_match_adhoc(struct device *dev, void *id); -+ -+void msm_bus_rpm_set_mt_mask(void); -+int msm_bus_board_rpm_get_il_ids(uint16_t *id); -+int msm_bus_board_get_iid(int id); -+ -+#define NFAB_MSM8226 6 -+#define NFAB_MSM8610 5 -+ -+/* -+ * These macros specify the convention followed for allocating -+ * ids to fabrics, masters and slaves for 8x60. -+ * -+ * A node can be identified as a master/slave/fabric by using -+ * these ids. -+ */ -+#define FABRIC_ID_KEY 1024 -+#define SLAVE_ID_KEY ((FABRIC_ID_KEY) >> 1) -+#define MAX_FAB_KEY 7168 /* OR(All fabric ids) */ -+#define INT_NODE_START 10000 -+ -+#define GET_FABID(id) ((id) & MAX_FAB_KEY) -+ -+#define NODE_ID(id) ((id) & (FABRIC_ID_KEY - 1)) -+#define IS_SLAVE(id) ((NODE_ID(id)) >= SLAVE_ID_KEY ? 1 : 0) -+#define CHECK_ID(iid, id) (((iid & id) != id) ? -ENXIO : iid) -+ -+/* -+ * The following macros are used to format the data for port halt -+ * and unhalt requests. -+ */ -+#define MSM_BUS_CLK_HALT 0x1 -+#define MSM_BUS_CLK_HALT_MASK 0x1 -+#define MSM_BUS_CLK_HALT_FIELDSIZE 0x1 -+#define MSM_BUS_CLK_UNHALT 0x0 -+ -+#define MSM_BUS_MASTER_SHIFT(master, fieldsize) \ -+ ((master) * (fieldsize)) -+ -+#define MSM_BUS_SET_BITFIELD(word, fieldmask, fieldvalue) \ -+ { \ -+ (word) &= ~(fieldmask); \ -+ (word) |= (fieldvalue); \ -+ } -+ -+ -+#define MSM_BUS_MASTER_HALT(u32haltmask, u32haltval, master) \ -+ MSM_BUS_SET_BITFIELD(u32haltmask, \ -+ MSM_BUS_CLK_HALT_MASK< -+ -+ -+#endif /*__ASM_ARCH_MSM_BUS_BOARD_H */ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm-bus.h -@@ -0,0 +1,139 @@ -+/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _ARCH_ARM_MACH_MSM_BUS_H -+#define _ARCH_ARM_MACH_MSM_BUS_H -+ -+#include -+#include -+#include -+ -+/* -+ * Macros for clients to convert their data to ib and ab -+ * Ws : Time window over which to transfer the data in SECONDS -+ * Bs : Size of the data block in bytes -+ * Per : Recurrence period -+ * Tb : Throughput bandwidth to prevent stalling -+ * R : Ratio of actual bandwidth used to Tb -+ * Ib : Instantaneous bandwidth -+ * Ab : Arbitrated bandwidth -+ * -+ * IB_RECURRBLOCK and AB_RECURRBLOCK: -+ * These are used if the requirement is to transfer a -+ * recurring block of data over a known time window. -+ * -+ * IB_THROUGHPUTBW and AB_THROUGHPUTBW: -+ * These are used for CPU style masters. Here the requirement -+ * is to have minimum throughput bandwidth available to avoid -+ * stalling. -+ */ -+#define IB_RECURRBLOCK(Ws, Bs) ((Ws) == 0 ? 0 : ((Bs)/(Ws))) -+#define AB_RECURRBLOCK(Ws, Per) ((Ws) == 0 ? 0 : ((Bs)/(Per))) -+#define IB_THROUGHPUTBW(Tb) (Tb) -+#define AB_THROUGHPUTBW(Tb, R) ((Tb) * (R)) -+ -+struct msm_bus_vectors { -+ int src; /* Master */ -+ int dst; /* Slave */ -+ uint64_t ab; /* Arbitrated bandwidth */ -+ uint64_t ib; /* Instantaneous bandwidth */ -+}; -+ -+struct msm_bus_paths { -+ int num_paths; -+ struct msm_bus_vectors *vectors; -+}; -+ -+struct msm_bus_scale_pdata { -+ struct msm_bus_paths *usecase; -+ int num_usecases; -+ const char *name; -+ /* -+ * If the active_only flag is set to 1, the BW request is applied -+ * only when at least one CPU is active (powered on). If the flag -+ * is set to 0, then the BW request is always applied irrespective -+ * of the CPU state. -+ */ -+ unsigned int active_only; -+}; -+ -+/* Scaling APIs */ -+ -+/* -+ * This function returns a handle to the client. This should be used to -+ * call msm_bus_scale_client_update_request. -+ * The function returns 0 if bus driver is unable to register a client -+ */ -+ -+#if (defined(CONFIG_MSM_BUS_SCALING) || defined(CONFIG_BUS_TOPOLOGY_ADHOC)) -+int __init msm_bus_fabric_init_driver(void); -+uint32_t msm_bus_scale_register_client(struct msm_bus_scale_pdata *pdata); -+int msm_bus_scale_client_update_request(uint32_t cl, unsigned int index); -+void msm_bus_scale_unregister_client(uint32_t cl); -+/* AXI Port configuration APIs */ -+int msm_bus_axi_porthalt(int master_port); -+int msm_bus_axi_portunhalt(int master_port); -+ -+#else -+static inline int __init msm_bus_fabric_init_driver(void) { return 0; } -+ -+static inline uint32_t -+msm_bus_scale_register_client(struct msm_bus_scale_pdata *pdata) -+{ -+ return 1; -+} -+ -+static inline int -+msm_bus_scale_client_update_request(uint32_t cl, unsigned int index) -+{ -+ return 0; -+} -+ -+static inline void -+msm_bus_scale_unregister_client(uint32_t cl) -+{ -+} -+ -+static inline int msm_bus_axi_porthalt(int master_port) -+{ -+ return 0; -+} -+ -+static inline int msm_bus_axi_portunhalt(int master_port) -+{ -+ return 0; -+} -+#endif -+ -+#if defined(CONFIG_OF) && defined(CONFIG_MSM_BUS_SCALING) -+struct msm_bus_scale_pdata *msm_bus_pdata_from_node( -+ struct platform_device *pdev, struct device_node *of_node); -+struct msm_bus_scale_pdata *msm_bus_cl_get_pdata(struct platform_device *pdev); -+void msm_bus_cl_clear_pdata(struct msm_bus_scale_pdata *pdata); -+#else -+static inline struct msm_bus_scale_pdata -+*msm_bus_cl_get_pdata(struct platform_device *pdev) -+{ -+ return NULL; -+} -+ -+static inline struct msm_bus_scale_pdata *msm_bus_pdata_from_node( -+ struct platform_device *pdev, struct device_node *of_node) -+{ -+ return NULL; -+} -+ -+static inline void msm_bus_cl_clear_pdata(struct msm_bus_scale_pdata *pdata) -+{ -+} -+#endif -+#endif /*_ARCH_ARM_MACH_MSM_BUS_H*/ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_adhoc.h -@@ -0,0 +1,141 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _ARCH_ARM_MACH_MSM_BUS_ADHOC_H -+#define _ARCH_ARM_MACH_MSM_BUS_ADHOC_H -+ -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm-bus.h" -+#include "msm_bus_rules.h" -+#include "msm_bus_core.h" -+ -+struct msm_bus_node_device_type; -+struct link_node { -+ uint64_t lnode_ib[NUM_CTX]; -+ uint64_t lnode_ab[NUM_CTX]; -+ int next; -+ struct device *next_dev; -+ struct list_head link; -+ uint32_t in_use; -+}; -+ -+/* New types introduced for adhoc topology */ -+struct msm_bus_noc_ops { -+ int (*qos_init)(struct msm_bus_node_device_type *dev, -+ void __iomem *qos_base, uint32_t qos_off, -+ uint32_t qos_delta, uint32_t qos_freq); -+ int (*set_bw)(struct msm_bus_node_device_type *dev, -+ void __iomem *qos_base, uint32_t qos_off, -+ uint32_t qos_delta, uint32_t qos_freq); -+ int (*limit_mport)(struct msm_bus_node_device_type *dev, -+ void __iomem *qos_base, uint32_t qos_off, -+ uint32_t qos_delta, uint32_t qos_freq, bool enable_lim, -+ uint64_t lim_bw); -+ bool (*update_bw_reg)(int mode); -+}; -+ -+struct nodebw { -+ uint64_t ab[NUM_CTX]; -+ bool dirty; -+}; -+ -+struct msm_bus_fab_device_type { -+ void __iomem *qos_base; -+ phys_addr_t pqos_base; -+ size_t qos_range; -+ uint32_t base_offset; -+ uint32_t qos_freq; -+ uint32_t qos_off; -+ uint32_t util_fact; -+ uint32_t vrail_comp; -+ struct msm_bus_noc_ops noc_ops; -+ enum msm_bus_hw_sel bus_type; -+ bool bypass_qos_prg; -+}; -+ -+struct qos_params_type { -+ int mode; -+ unsigned int prio_lvl; -+ unsigned int prio_rd; -+ unsigned int prio_wr; -+ unsigned int prio1; -+ unsigned int prio0; -+ unsigned int gp; -+ unsigned int thmp; -+ unsigned int ws; -+ int cur_mode; -+ u64 bw_buffer; -+}; -+ -+struct msm_bus_node_info_type { -+ const char *name; -+ unsigned int id; -+ int mas_rpm_id; -+ int slv_rpm_id; -+ int num_ports; -+ int num_qports; -+ int *qport; -+ struct qos_params_type qos_params; -+ unsigned int num_connections; -+ unsigned int num_blist; -+ bool is_fab_dev; -+ bool virt_dev; -+ bool is_traversed; -+ unsigned int *connections; -+ unsigned int *black_listed_connections; -+ struct device **dev_connections; -+ struct device **black_connections; -+ unsigned int bus_device_id; -+ struct device *bus_device; -+ unsigned int buswidth; -+ struct rule_update_path_info rule; -+ uint64_t lim_bw; -+ uint32_t util_fact; -+ uint32_t vrail_comp; -+}; -+ -+struct msm_bus_node_device_type { -+ struct msm_bus_node_info_type *node_info; -+ struct msm_bus_fab_device_type *fabdev; -+ int num_lnodes; -+ struct link_node *lnode_list; -+ uint64_t cur_clk_hz[NUM_CTX]; -+ struct nodebw node_ab; -+ struct list_head link; -+ unsigned int ap_owned; -+ struct nodeclk clk[NUM_CTX]; -+ struct nodeclk qos_clk; -+}; -+ -+int msm_bus_enable_limiter(struct msm_bus_node_device_type *nodedev, -+ bool throttle_en, uint64_t lim_bw); -+int msm_bus_update_clks(struct msm_bus_node_device_type *nodedev, -+ int ctx, int **dirty_nodes, int *num_dirty); -+int msm_bus_commit_data(int *dirty_nodes, int ctx, int num_dirty); -+int msm_bus_update_bw(struct msm_bus_node_device_type *nodedev, int ctx, -+ int64_t add_bw, int **dirty_nodes, int *num_dirty); -+void *msm_bus_realloc_devmem(struct device *dev, void *p, size_t old_size, -+ size_t new_size, gfp_t flags); -+ -+extern struct msm_bus_device_node_registration -+ *msm_bus_of_to_pdata(struct platform_device *pdev); -+extern void msm_bus_arb_setops_adhoc(struct msm_bus_arb_ops *arb_ops); -+extern int msm_bus_bimc_set_ops(struct msm_bus_node_device_type *bus_dev); -+extern int msm_bus_noc_set_ops(struct msm_bus_node_device_type *bus_dev); -+extern int msm_bus_of_get_static_rules(struct platform_device *pdev, -+ struct bus_rule_type **static_rule); -+extern int msm_rules_update_path(struct list_head *input_list, -+ struct list_head *output_list); -+extern void print_all_rules(void); -+#endif /* _ARCH_ARM_MACH_MSM_BUS_ADHOC_H */ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_arb_adhoc.c -@@ -0,0 +1,998 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is Mree software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "msm-bus.h" -+#include "msm_bus_core.h" -+#include "msm_bus_adhoc.h" -+ -+#define NUM_CL_HANDLES 50 -+#define NUM_LNODES 3 -+ -+struct bus_search_type { -+ struct list_head link; -+ struct list_head node_list; -+}; -+ -+struct handle_type { -+ int num_entries; -+ struct msm_bus_client **cl_list; -+}; -+ -+static struct handle_type handle_list; -+struct list_head input_list; -+struct list_head apply_list; -+ -+DEFINE_MUTEX(msm_bus_adhoc_lock); -+ -+static bool chk_bl_list(struct list_head *black_list, unsigned int id) -+{ -+ struct msm_bus_node_device_type *bus_node = NULL; -+ -+ list_for_each_entry(bus_node, black_list, link) { -+ if (bus_node->node_info->id == id) -+ return true; -+ } -+ return false; -+} -+ -+static void copy_remaining_nodes(struct list_head *edge_list, struct list_head -+ *traverse_list, struct list_head *route_list) -+{ -+ struct bus_search_type *search_node; -+ -+ if (list_empty(edge_list) && list_empty(traverse_list)) -+ return; -+ -+ search_node = kzalloc(sizeof(struct bus_search_type), GFP_KERNEL); -+ INIT_LIST_HEAD(&search_node->node_list); -+ list_splice_init(edge_list, traverse_list); -+ list_splice_init(traverse_list, &search_node->node_list); -+ list_add_tail(&search_node->link, route_list); -+} -+ -+/* -+ * Duplicate instantiaion from msm_bus_arb.c. Todo there needs to be a -+ * "util" file for these common func/macros. -+ * -+ * */ -+uint64_t msm_bus_div64(unsigned int w, uint64_t bw) -+{ -+ uint64_t *b = &bw; -+ -+ if ((bw > 0) && (bw < w)) -+ return 1; -+ -+ switch (w) { -+ case 0: -+ WARN(1, "AXI: Divide by 0 attempted\n"); -+ case 1: return bw; -+ case 2: return (bw >> 1); -+ case 4: return (bw >> 2); -+ case 8: return (bw >> 3); -+ case 16: return (bw >> 4); -+ case 32: return (bw >> 5); -+ } -+ -+ do_div(*b, w); -+ return *b; -+} -+ -+int msm_bus_device_match_adhoc(struct device *dev, void *id) -+{ -+ int ret = 0; -+ struct msm_bus_node_device_type *bnode = dev->platform_data; -+ -+ if (bnode) -+ ret = (bnode->node_info->id == *(unsigned int *)id); -+ else -+ ret = 0; -+ -+ return ret; -+} -+ -+static int gen_lnode(struct device *dev, -+ int next_hop, int prev_idx) -+{ -+ struct link_node *lnode; -+ struct msm_bus_node_device_type *cur_dev = NULL; -+ int lnode_idx = -1; -+ -+ if (!dev) -+ goto exit_gen_lnode; -+ -+ cur_dev = dev->platform_data; -+ if (!cur_dev) { -+ MSM_BUS_ERR("%s: Null device ptr", __func__); -+ goto exit_gen_lnode; -+ } -+ -+ if (!cur_dev->num_lnodes) { -+ cur_dev->lnode_list = devm_kzalloc(dev, -+ sizeof(struct link_node) * NUM_LNODES, -+ GFP_KERNEL); -+ if (!cur_dev->lnode_list) -+ goto exit_gen_lnode; -+ -+ lnode = cur_dev->lnode_list; -+ cur_dev->num_lnodes = NUM_LNODES; -+ lnode_idx = 0; -+ } else { -+ int i; -+ for (i = 0; i < cur_dev->num_lnodes; i++) { -+ if (!cur_dev->lnode_list[i].in_use) -+ break; -+ } -+ -+ if (i < cur_dev->num_lnodes) { -+ lnode = &cur_dev->lnode_list[i]; -+ lnode_idx = i; -+ } else { -+ struct link_node *realloc_list; -+ size_t cur_size = sizeof(struct link_node) * -+ cur_dev->num_lnodes; -+ -+ cur_dev->num_lnodes += NUM_LNODES; -+ realloc_list = msm_bus_realloc_devmem( -+ dev, -+ cur_dev->lnode_list, -+ cur_size, -+ sizeof(struct link_node) * -+ cur_dev->num_lnodes, GFP_KERNEL); -+ -+ if (!realloc_list) -+ goto exit_gen_lnode; -+ -+ cur_dev->lnode_list = realloc_list; -+ lnode = &cur_dev->lnode_list[i]; -+ lnode_idx = i; -+ } -+ } -+ -+ lnode->in_use = 1; -+ if (next_hop == cur_dev->node_info->id) { -+ lnode->next = -1; -+ lnode->next_dev = NULL; -+ } else { -+ lnode->next = prev_idx; -+ lnode->next_dev = bus_find_device(&msm_bus_type, NULL, -+ (void *) &next_hop, -+ msm_bus_device_match_adhoc); -+ } -+ -+ memset(lnode->lnode_ib, 0, sizeof(uint64_t) * NUM_CTX); -+ memset(lnode->lnode_ab, 0, sizeof(uint64_t) * NUM_CTX); -+ -+exit_gen_lnode: -+ return lnode_idx; -+} -+ -+static int remove_lnode(struct msm_bus_node_device_type *cur_dev, -+ int lnode_idx) -+{ -+ int ret = 0; -+ -+ if (!cur_dev) { -+ MSM_BUS_ERR("%s: Null device ptr", __func__); -+ ret = -ENODEV; -+ goto exit_remove_lnode; -+ } -+ -+ if (lnode_idx != -1) { -+ if (!cur_dev->num_lnodes || -+ (lnode_idx > (cur_dev->num_lnodes - 1))) { -+ MSM_BUS_ERR("%s: Invalid Idx %d, num_lnodes %d", -+ __func__, lnode_idx, cur_dev->num_lnodes); -+ ret = -ENODEV; -+ goto exit_remove_lnode; -+ } -+ -+ cur_dev->lnode_list[lnode_idx].next = -1; -+ cur_dev->lnode_list[lnode_idx].next_dev = NULL; -+ cur_dev->lnode_list[lnode_idx].in_use = 0; -+ } -+ -+exit_remove_lnode: -+ return ret; -+} -+ -+static int prune_path(struct list_head *route_list, int dest, int src, -+ struct list_head *black_list, int found) -+{ -+ struct bus_search_type *search_node, *temp_search_node; -+ struct msm_bus_node_device_type *bus_node; -+ struct list_head *bl_list; -+ struct list_head *temp_bl_list; -+ int search_dev_id = dest; -+ struct device *dest_dev = bus_find_device(&msm_bus_type, NULL, -+ (void *) &dest, -+ msm_bus_device_match_adhoc); -+ int lnode_hop = -1; -+ -+ if (!found) -+ goto reset_links; -+ -+ if (!dest_dev) { -+ MSM_BUS_ERR("%s: Can't find dest dev %d", __func__, dest); -+ goto exit_prune_path; -+ } -+ -+ lnode_hop = gen_lnode(dest_dev, search_dev_id, lnode_hop); -+ -+ list_for_each_entry_reverse(search_node, route_list, link) { -+ list_for_each_entry(bus_node, &search_node->node_list, link) { -+ unsigned int i; -+ for (i = 0; i < bus_node->node_info->num_connections; -+ i++) { -+ if (bus_node->node_info->connections[i] == -+ search_dev_id) { -+ dest_dev = bus_find_device( -+ &msm_bus_type, -+ NULL, -+ (void *) -+ &bus_node->node_info-> -+ id, -+ msm_bus_device_match_adhoc); -+ -+ if (!dest_dev) { -+ lnode_hop = -1; -+ goto reset_links; -+ } -+ -+ lnode_hop = gen_lnode(dest_dev, -+ search_dev_id, -+ lnode_hop); -+ search_dev_id = -+ bus_node->node_info->id; -+ break; -+ } -+ } -+ } -+ } -+reset_links: -+ list_for_each_entry_safe(search_node, temp_search_node, route_list, -+ link) { -+ list_for_each_entry(bus_node, &search_node->node_list, -+ link) -+ bus_node->node_info->is_traversed = false; -+ -+ list_del(&search_node->link); -+ kfree(search_node); -+ } -+ -+ list_for_each_safe(bl_list, temp_bl_list, black_list) -+ list_del(bl_list); -+ -+exit_prune_path: -+ return lnode_hop; -+} -+ -+static void setup_bl_list(struct msm_bus_node_device_type *node, -+ struct list_head *black_list) -+{ -+ unsigned int i; -+ -+ for (i = 0; i < node->node_info->num_blist; i++) { -+ struct msm_bus_node_device_type *bdev; -+ bdev = node->node_info->black_connections[i]->platform_data; -+ list_add_tail(&bdev->link, black_list); -+ } -+} -+ -+static int getpath(int src, int dest) -+{ -+ struct list_head traverse_list; -+ struct list_head edge_list; -+ struct list_head route_list; -+ struct list_head black_list; -+ struct device *src_dev = bus_find_device(&msm_bus_type, NULL, -+ (void *) &src, -+ msm_bus_device_match_adhoc); -+ struct msm_bus_node_device_type *src_node; -+ struct bus_search_type *search_node; -+ int found = 0; -+ int depth_index = 0; -+ int first_hop = -1; -+ -+ INIT_LIST_HEAD(&traverse_list); -+ INIT_LIST_HEAD(&edge_list); -+ INIT_LIST_HEAD(&route_list); -+ INIT_LIST_HEAD(&black_list); -+ -+ if (!src_dev) { -+ MSM_BUS_ERR("%s: Cannot locate src dev %d", __func__, src); -+ goto exit_getpath; -+ } -+ -+ src_node = src_dev->platform_data; -+ if (!src_node) { -+ MSM_BUS_ERR("%s:Fatal, Source dev %d not found", __func__, src); -+ goto exit_getpath; -+ } -+ list_add_tail(&src_node->link, &traverse_list); -+ -+ while ((!found && !list_empty(&traverse_list))) { -+ struct msm_bus_node_device_type *bus_node = NULL; -+ /* Locate dest_id in the traverse list */ -+ list_for_each_entry(bus_node, &traverse_list, link) { -+ if (bus_node->node_info->id == dest) { -+ found = 1; -+ break; -+ } -+ } -+ -+ if (!found) { -+ unsigned int i; -+ /* Setup the new edge list */ -+ list_for_each_entry(bus_node, &traverse_list, link) { -+ /* Setup list of black-listed nodes */ -+ setup_bl_list(bus_node, &black_list); -+ -+ for (i = 0; i < bus_node->node_info-> -+ num_connections; i++) { -+ bool skip; -+ struct msm_bus_node_device_type -+ *node_conn; -+ node_conn = bus_node->node_info-> -+ dev_connections[i]-> -+ platform_data; -+ if (node_conn->node_info-> -+ is_traversed) { -+ MSM_BUS_ERR("Circ Path %d\n", -+ node_conn->node_info->id); -+ goto reset_traversed; -+ } -+ skip = chk_bl_list(&black_list, -+ bus_node->node_info-> -+ connections[i]); -+ if (!skip) { -+ list_add_tail(&node_conn->link, -+ &edge_list); -+ node_conn->node_info-> -+ is_traversed = true; -+ } -+ } -+ } -+ -+ /* Keep tabs of the previous search list */ -+ search_node = kzalloc(sizeof(struct bus_search_type), -+ GFP_KERNEL); -+ INIT_LIST_HEAD(&search_node->node_list); -+ list_splice_init(&traverse_list, -+ &search_node->node_list); -+ /* Add the previous search list to a route list */ -+ list_add_tail(&search_node->link, &route_list); -+ /* Advancing the list depth */ -+ depth_index++; -+ list_splice_init(&edge_list, &traverse_list); -+ } -+ } -+reset_traversed: -+ copy_remaining_nodes(&edge_list, &traverse_list, &route_list); -+ first_hop = prune_path(&route_list, dest, src, &black_list, found); -+ -+exit_getpath: -+ return first_hop; -+} -+ -+static uint64_t arbitrate_bus_req(struct msm_bus_node_device_type *bus_dev, -+ int ctx) -+{ -+ int i; -+ uint64_t max_ib = 0; -+ uint64_t sum_ab = 0; -+ uint64_t bw_max_hz; -+ struct msm_bus_node_device_type *fab_dev = NULL; -+ uint32_t util_fact = 0; -+ uint32_t vrail_comp = 0; -+ -+ /* Find max ib */ -+ for (i = 0; i < bus_dev->num_lnodes; i++) { -+ max_ib = max(max_ib, bus_dev->lnode_list[i].lnode_ib[ctx]); -+ sum_ab += bus_dev->lnode_list[i].lnode_ab[ctx]; -+ } -+ /* -+ * Account for Util factor and vrail comp. The new aggregation -+ * formula is: -+ * Freq_hz = max((sum(ab) * util_fact)/num_chan, max(ib)/vrail_comp) -+ * / bus-width -+ * util_fact and vrail comp are obtained from fabric/Node's dts -+ * properties. -+ * They default to 100 if absent. -+ */ -+ fab_dev = bus_dev->node_info->bus_device->platform_data; -+ /* Don't do this for virtual fabrics */ -+ if (fab_dev && fab_dev->fabdev) { -+ util_fact = bus_dev->node_info->util_fact ? -+ bus_dev->node_info->util_fact : -+ fab_dev->fabdev->util_fact; -+ vrail_comp = bus_dev->node_info->vrail_comp ? -+ bus_dev->node_info->vrail_comp : -+ fab_dev->fabdev->vrail_comp; -+ sum_ab *= util_fact; -+ sum_ab = msm_bus_div64(100, sum_ab); -+ max_ib *= 100; -+ max_ib = msm_bus_div64(vrail_comp, max_ib); -+ } -+ -+ /* Account for multiple channels if any */ -+ if (bus_dev->node_info->num_qports > 1) -+ sum_ab = msm_bus_div64(bus_dev->node_info->num_qports, -+ sum_ab); -+ -+ if (!bus_dev->node_info->buswidth) { -+ MSM_BUS_WARN("No bus width found for %d. Using default\n", -+ bus_dev->node_info->id); -+ bus_dev->node_info->buswidth = 8; -+ } -+ -+ bw_max_hz = max(max_ib, sum_ab); -+ bw_max_hz = msm_bus_div64(bus_dev->node_info->buswidth, -+ bw_max_hz); -+ -+ return bw_max_hz; -+} -+ -+static void del_inp_list(struct list_head *list) -+{ -+ struct rule_update_path_info *rule_node; -+ struct rule_update_path_info *rule_node_tmp; -+ -+ list_for_each_entry_safe(rule_node, rule_node_tmp, list, link) -+ list_del(&rule_node->link); -+} -+ -+static void del_op_list(struct list_head *list) -+{ -+ struct rule_apply_rcm_info *rule; -+ struct rule_apply_rcm_info *rule_tmp; -+ -+ list_for_each_entry_safe(rule, rule_tmp, list, link) -+ list_del(&rule->link); -+} -+ -+static int msm_bus_apply_rules(struct list_head *list, bool after_clk_commit) -+{ -+ struct rule_apply_rcm_info *rule; -+ struct device *dev = NULL; -+ struct msm_bus_node_device_type *dev_info = NULL; -+ int ret = 0; -+ bool throttle_en = false; -+ -+ list_for_each_entry(rule, list, link) { -+ if (!rule) -+ break; -+ -+ if (rule && (rule->after_clk_commit != after_clk_commit)) -+ continue; -+ -+ dev = bus_find_device(&msm_bus_type, NULL, -+ (void *) &rule->id, -+ msm_bus_device_match_adhoc); -+ -+ if (!dev) { -+ MSM_BUS_ERR("Can't find dev node for %d", rule->id); -+ continue; -+ } -+ dev_info = dev->platform_data; -+ -+ throttle_en = ((rule->throttle == THROTTLE_ON) ? true : false); -+ ret = msm_bus_enable_limiter(dev_info, throttle_en, -+ rule->lim_bw); -+ if (ret) -+ MSM_BUS_ERR("Failed to set limiter for %d", rule->id); -+ } -+ -+ return ret; -+} -+ -+static uint64_t get_node_aggab(struct msm_bus_node_device_type *bus_dev) -+{ -+ int i; -+ int ctx; -+ uint64_t max_agg_ab = 0; -+ uint64_t agg_ab = 0; -+ -+ for (ctx = 0; ctx < NUM_CTX; ctx++) { -+ for (i = 0; i < bus_dev->num_lnodes; i++) -+ agg_ab += bus_dev->lnode_list[i].lnode_ab[ctx]; -+ -+ if (bus_dev->node_info->num_qports > 1) -+ agg_ab = msm_bus_div64(bus_dev->node_info->num_qports, -+ agg_ab); -+ -+ max_agg_ab = max(max_agg_ab, agg_ab); -+ } -+ -+ return max_agg_ab; -+} -+ -+static uint64_t get_node_ib(struct msm_bus_node_device_type *bus_dev) -+{ -+ int i; -+ int ctx; -+ uint64_t max_ib = 0; -+ -+ for (ctx = 0; ctx < NUM_CTX; ctx++) { -+ for (i = 0; i < bus_dev->num_lnodes; i++) -+ max_ib = max(max_ib, -+ bus_dev->lnode_list[i].lnode_ib[ctx]); -+ } -+ return max_ib; -+} -+ -+static int update_path(int src, int dest, uint64_t req_ib, uint64_t req_bw, -+ uint64_t cur_ib, uint64_t cur_bw, int src_idx, int ctx) -+{ -+ struct device *src_dev = NULL; -+ struct device *next_dev = NULL; -+ struct link_node *lnode = NULL; -+ struct msm_bus_node_device_type *dev_info = NULL; -+ int curr_idx; -+ int ret = 0; -+ int *dirty_nodes = NULL; -+ int num_dirty = 0; -+ struct rule_update_path_info *rule_node; -+ bool rules_registered = msm_rule_are_rules_registered(); -+ -+ src_dev = bus_find_device(&msm_bus_type, NULL, -+ (void *) &src, -+ msm_bus_device_match_adhoc); -+ -+ if (!src_dev) { -+ MSM_BUS_ERR("%s: Can't find source device %d", __func__, src); -+ ret = -ENODEV; -+ goto exit_update_path; -+ } -+ -+ next_dev = src_dev; -+ -+ if (src_idx < 0) { -+ MSM_BUS_ERR("%s: Invalid lnode idx %d", __func__, src_idx); -+ ret = -ENXIO; -+ goto exit_update_path; -+ } -+ curr_idx = src_idx; -+ -+ INIT_LIST_HEAD(&input_list); -+ INIT_LIST_HEAD(&apply_list); -+ -+ while (next_dev) { -+ dev_info = next_dev->platform_data; -+ -+ if (curr_idx >= dev_info->num_lnodes) { -+ MSM_BUS_ERR("%s: Invalid lnode Idx %d num lnodes %d", -+ __func__, curr_idx, dev_info->num_lnodes); -+ ret = -ENXIO; -+ goto exit_update_path; -+ } -+ -+ lnode = &dev_info->lnode_list[curr_idx]; -+ lnode->lnode_ib[ctx] = req_ib; -+ lnode->lnode_ab[ctx] = req_bw; -+ -+ dev_info->cur_clk_hz[ctx] = arbitrate_bus_req(dev_info, ctx); -+ -+ /* Start updating the clocks at the first hop. -+ * Its ok to figure out the aggregated -+ * request at this node. -+ */ -+ if (src_dev != next_dev) { -+ ret = msm_bus_update_clks(dev_info, ctx, &dirty_nodes, -+ &num_dirty); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to update clks dev %d", -+ __func__, dev_info->node_info->id); -+ goto exit_update_path; -+ } -+ } -+ -+ ret = msm_bus_update_bw(dev_info, ctx, req_bw, &dirty_nodes, -+ &num_dirty); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to update bw dev %d", -+ __func__, dev_info->node_info->id); -+ goto exit_update_path; -+ } -+ -+ if (rules_registered) { -+ rule_node = &dev_info->node_info->rule; -+ rule_node->id = dev_info->node_info->id; -+ rule_node->ib = get_node_ib(dev_info); -+ rule_node->ab = get_node_aggab(dev_info); -+ rule_node->clk = max(dev_info->cur_clk_hz[ACTIVE_CTX], -+ dev_info->cur_clk_hz[DUAL_CTX]); -+ list_add_tail(&rule_node->link, &input_list); -+ } -+ -+ next_dev = lnode->next_dev; -+ curr_idx = lnode->next; -+ } -+ -+ if (rules_registered) { -+ msm_rules_update_path(&input_list, &apply_list); -+ msm_bus_apply_rules(&apply_list, false); -+ } -+ -+ msm_bus_commit_data(dirty_nodes, ctx, num_dirty); -+ -+ if (rules_registered) { -+ msm_bus_apply_rules(&apply_list, true); -+ del_inp_list(&input_list); -+ del_op_list(&apply_list); -+ } -+exit_update_path: -+ return ret; -+} -+ -+static int remove_path(int src, int dst, uint64_t cur_ib, uint64_t cur_ab, -+ int src_idx, int active_only) -+{ -+ struct device *src_dev = NULL; -+ struct device *next_dev = NULL; -+ struct link_node *lnode = NULL; -+ struct msm_bus_node_device_type *dev_info = NULL; -+ int ret = 0; -+ int cur_idx = src_idx; -+ int next_idx; -+ -+ /* Update the current path to zero out all request from -+ * this cient on all paths -+ */ -+ -+ ret = update_path(src, dst, 0, 0, cur_ib, cur_ab, src_idx, -+ active_only); -+ if (ret) { -+ MSM_BUS_ERR("%s: Error zeroing out path ctx %d", -+ __func__, ACTIVE_CTX); -+ goto exit_remove_path; -+ } -+ -+ src_dev = bus_find_device(&msm_bus_type, NULL, -+ (void *) &src, -+ msm_bus_device_match_adhoc); -+ if (!src_dev) { -+ MSM_BUS_ERR("%s: Can't find source device %d", __func__, src); -+ ret = -ENODEV; -+ goto exit_remove_path; -+ } -+ -+ next_dev = src_dev; -+ -+ while (next_dev) { -+ dev_info = next_dev->platform_data; -+ lnode = &dev_info->lnode_list[cur_idx]; -+ next_idx = lnode->next; -+ next_dev = lnode->next_dev; -+ remove_lnode(dev_info, cur_idx); -+ cur_idx = next_idx; -+ } -+ -+exit_remove_path: -+ return ret; -+} -+ -+static void getpath_debug(int src, int curr, int active_only) -+{ -+ struct device *dev_node; -+ struct device *dev_it; -+ unsigned int hop = 1; -+ int idx; -+ struct msm_bus_node_device_type *devinfo; -+ int i; -+ -+ dev_node = bus_find_device(&msm_bus_type, NULL, -+ (void *) &src, -+ msm_bus_device_match_adhoc); -+ -+ if (!dev_node) { -+ MSM_BUS_ERR("SRC NOT FOUND %d", src); -+ return; -+ } -+ -+ idx = curr; -+ devinfo = dev_node->platform_data; -+ dev_it = dev_node; -+ -+ MSM_BUS_ERR("Route list Src %d", src); -+ while (dev_it) { -+ struct msm_bus_node_device_type *busdev = -+ devinfo->node_info->bus_device->platform_data; -+ -+ MSM_BUS_ERR("Hop[%d] at Device %d ctx %d", hop, -+ devinfo->node_info->id, active_only); -+ -+ for (i = 0; i < NUM_CTX; i++) { -+ MSM_BUS_ERR("dev info sel ib %llu", -+ devinfo->cur_clk_hz[i]); -+ MSM_BUS_ERR("dev info sel ab %llu", -+ devinfo->node_ab.ab[i]); -+ } -+ -+ dev_it = devinfo->lnode_list[idx].next_dev; -+ idx = devinfo->lnode_list[idx].next; -+ if (dev_it) -+ devinfo = dev_it->platform_data; -+ -+ MSM_BUS_ERR("Bus Device %d", busdev->node_info->id); -+ MSM_BUS_ERR("Bus Clock %llu", busdev->clk[active_only].rate); -+ -+ if (idx < 0) -+ break; -+ hop++; -+ } -+} -+ -+static void unregister_client_adhoc(uint32_t cl) -+{ -+ int i; -+ struct msm_bus_scale_pdata *pdata; -+ int lnode, src, curr, dest; -+ uint64_t cur_clk, cur_bw; -+ struct msm_bus_client *client; -+ -+ mutex_lock(&msm_bus_adhoc_lock); -+ if (!cl) { -+ MSM_BUS_ERR("%s: Null cl handle passed unregister\n", -+ __func__); -+ goto exit_unregister_client; -+ } -+ client = handle_list.cl_list[cl]; -+ pdata = client->pdata; -+ if (!pdata) { -+ MSM_BUS_ERR("%s: Null pdata passed to unregister\n", -+ __func__); -+ goto exit_unregister_client; -+ } -+ -+ curr = client->curr; -+ if (curr >= pdata->num_usecases) { -+ MSM_BUS_ERR("Invalid index Defaulting curr to 0"); -+ curr = 0; -+ } -+ -+ MSM_BUS_DBG("%s: Unregistering client %p", __func__, client); -+ -+ for (i = 0; i < pdata->usecase->num_paths; i++) { -+ src = client->pdata->usecase[curr].vectors[i].src; -+ dest = client->pdata->usecase[curr].vectors[i].dst; -+ -+ lnode = client->src_pnode[i]; -+ cur_clk = client->pdata->usecase[curr].vectors[i].ib; -+ cur_bw = client->pdata->usecase[curr].vectors[i].ab; -+ remove_path(src, dest, cur_clk, cur_bw, lnode, -+ pdata->active_only); -+ } -+ msm_bus_dbg_client_data(client->pdata, MSM_BUS_DBG_UNREGISTER, cl); -+ kfree(client->src_pnode); -+ kfree(client); -+ handle_list.cl_list[cl] = NULL; -+exit_unregister_client: -+ mutex_unlock(&msm_bus_adhoc_lock); -+ return; -+} -+ -+static int alloc_handle_lst(int size) -+{ -+ int ret = 0; -+ struct msm_bus_client **t_cl_list; -+ -+ if (!handle_list.num_entries) { -+ t_cl_list = kzalloc(sizeof(struct msm_bus_client *) -+ * NUM_CL_HANDLES, GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(t_cl_list)) { -+ ret = -ENOMEM; -+ MSM_BUS_ERR("%s: Failed to allocate handles list", -+ __func__); -+ goto exit_alloc_handle_lst; -+ } -+ handle_list.cl_list = t_cl_list; -+ handle_list.num_entries += NUM_CL_HANDLES; -+ } else { -+ t_cl_list = krealloc(handle_list.cl_list, -+ sizeof(struct msm_bus_client *) * -+ handle_list.num_entries + NUM_CL_HANDLES, -+ GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(t_cl_list)) { -+ ret = -ENOMEM; -+ MSM_BUS_ERR("%s: Failed to allocate handles list", -+ __func__); -+ goto exit_alloc_handle_lst; -+ } -+ -+ memset(&handle_list.cl_list[handle_list.num_entries], 0, -+ NUM_CL_HANDLES * sizeof(struct msm_bus_client *)); -+ handle_list.num_entries += NUM_CL_HANDLES; -+ handle_list.cl_list = t_cl_list; -+ } -+exit_alloc_handle_lst: -+ return ret; -+} -+ -+static uint32_t gen_handle(struct msm_bus_client *client) -+{ -+ uint32_t handle = 0; -+ int i; -+ int ret = 0; -+ -+ for (i = 0; i < handle_list.num_entries; i++) { -+ if (i && !handle_list.cl_list[i]) { -+ handle = i; -+ break; -+ } -+ } -+ -+ if (!handle) { -+ ret = alloc_handle_lst(NUM_CL_HANDLES); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to allocate handle list", -+ __func__); -+ goto exit_gen_handle; -+ } -+ handle = i + 1; -+ } -+ handle_list.cl_list[handle] = client; -+exit_gen_handle: -+ return handle; -+} -+ -+static uint32_t register_client_adhoc(struct msm_bus_scale_pdata *pdata) -+{ -+ int src, dest; -+ int i; -+ struct msm_bus_client *client = NULL; -+ int *lnode; -+ uint32_t handle = 0; -+ -+ mutex_lock(&msm_bus_adhoc_lock); -+ client = kzalloc(sizeof(struct msm_bus_client), GFP_KERNEL); -+ if (!client) { -+ MSM_BUS_ERR("%s: Error allocating client data", __func__); -+ goto exit_register_client; -+ } -+ client->pdata = pdata; -+ -+ lnode = kzalloc(pdata->usecase->num_paths * sizeof(int), GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(lnode)) { -+ MSM_BUS_ERR("%s: Error allocating pathnode ptr!", __func__); -+ goto exit_register_client; -+ } -+ client->src_pnode = lnode; -+ -+ for (i = 0; i < pdata->usecase->num_paths; i++) { -+ src = pdata->usecase->vectors[i].src; -+ dest = pdata->usecase->vectors[i].dst; -+ -+ if ((src < 0) || (dest < 0)) { -+ MSM_BUS_ERR("%s:Invalid src/dst.src %d dest %d", -+ __func__, src, dest); -+ goto exit_register_client; -+ } -+ -+ lnode[i] = getpath(src, dest); -+ if (lnode[i] < 0) { -+ MSM_BUS_ERR("%s:Failed to find path.src %d dest %d", -+ __func__, src, dest); -+ goto exit_register_client; -+ } -+ } -+ -+ handle = gen_handle(client); -+ msm_bus_dbg_client_data(client->pdata, MSM_BUS_DBG_REGISTER, -+ handle); -+ MSM_BUS_DBG("%s:Client handle %d %s", __func__, handle, -+ client->pdata->name); -+exit_register_client: -+ mutex_unlock(&msm_bus_adhoc_lock); -+ return handle; -+} -+ -+static int update_request_adhoc(uint32_t cl, unsigned int index) -+{ -+ int i, ret = 0; -+ struct msm_bus_scale_pdata *pdata; -+ int lnode, src, curr, dest; -+ uint64_t req_clk, req_bw, curr_clk, curr_bw; -+ struct msm_bus_client *client; -+ const char *test_cl = "Null"; -+ bool log_transaction = false; -+ -+ mutex_lock(&msm_bus_adhoc_lock); -+ -+ if (!cl) { -+ MSM_BUS_ERR("%s: Invalid client handle %d", __func__, cl); -+ ret = -ENXIO; -+ goto exit_update_request; -+ } -+ -+ client = handle_list.cl_list[cl]; -+ pdata = client->pdata; -+ if (!pdata) { -+ MSM_BUS_ERR("%s: Client data Null.[client didn't register]", -+ __func__); -+ ret = -ENXIO; -+ goto exit_update_request; -+ } -+ -+ if (index >= pdata->num_usecases) { -+ MSM_BUS_ERR("Client %u passed invalid index: %d\n", -+ cl, index); -+ ret = -ENXIO; -+ goto exit_update_request; -+ } -+ -+ if (client->curr == index) { -+ MSM_BUS_DBG("%s: Not updating client request idx %d unchanged", -+ __func__, index); -+ goto exit_update_request; -+ } -+ -+ curr = client->curr; -+ client->curr = index; -+ -+ if (!strcmp(test_cl, pdata->name)) -+ log_transaction = true; -+ -+ MSM_BUS_DBG("%s: cl: %u index: %d curr: %d num_paths: %d\n", __func__, -+ cl, index, client->curr, client->pdata->usecase->num_paths); -+ -+ for (i = 0; i < pdata->usecase->num_paths; i++) { -+ src = client->pdata->usecase[index].vectors[i].src; -+ dest = client->pdata->usecase[index].vectors[i].dst; -+ -+ lnode = client->src_pnode[i]; -+ req_clk = client->pdata->usecase[index].vectors[i].ib; -+ req_bw = client->pdata->usecase[index].vectors[i].ab; -+ if (curr < 0) { -+ curr_clk = 0; -+ curr_bw = 0; -+ } else { -+ curr_clk = client->pdata->usecase[curr].vectors[i].ib; -+ curr_bw = client->pdata->usecase[curr].vectors[i].ab; -+ MSM_BUS_DBG("%s:ab: %llu ib: %llu\n", __func__, -+ curr_bw, curr_clk); -+ } -+ -+ ret = update_path(src, dest, req_clk, req_bw, -+ curr_clk, curr_bw, lnode, pdata->active_only); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Update path failed! %d ctx %d\n", -+ __func__, ret, ACTIVE_CTX); -+ goto exit_update_request; -+ } -+ -+ if (log_transaction) -+ getpath_debug(src, lnode, pdata->active_only); -+ } -+ msm_bus_dbg_client_data(client->pdata, index , cl); -+exit_update_request: -+ mutex_unlock(&msm_bus_adhoc_lock); -+ return ret; -+} -+ -+/** -+ * msm_bus_arb_setops_adhoc() : Setup the bus arbitration ops -+ * @ arb_ops: pointer to the arb ops. -+ */ -+void msm_bus_arb_setops_adhoc(struct msm_bus_arb_ops *arb_ops) -+{ -+ arb_ops->register_client = register_client_adhoc; -+ arb_ops->update_request = update_request_adhoc; -+ arb_ops->unregister_client = unregister_client_adhoc; -+} ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_bimc.c -@@ -0,0 +1,2112 @@ -+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#define pr_fmt(fmt) "AXI: BIMC: %s(): " fmt, __func__ -+ -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm_bus_core.h" -+#include "msm_bus_bimc.h" -+#include "msm_bus_adhoc.h" -+#include -+ -+enum msm_bus_bimc_slave_block { -+ SLAVE_BLOCK_RESERVED = 0, -+ SLAVE_BLOCK_SLAVE_WAY, -+ SLAVE_BLOCK_XPU, -+ SLAVE_BLOCK_ARBITER, -+ SLAVE_BLOCK_SCMO, -+}; -+ -+enum bke_sw { -+ BKE_OFF = 0, -+ BKE_ON = 1, -+}; -+ -+/* M_Generic */ -+ -+#define M_REG_BASE(b) ((b) + 0x00008000) -+ -+#define M_COMPONENT_INFO_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000000) -+enum bimc_m_component_info { -+ M_COMPONENT_INFO_RMSK = 0xffffff, -+ M_COMPONENT_INFO_INSTANCE_BMSK = 0xff0000, -+ M_COMPONENT_INFO_INSTANCE_SHFT = 0x10, -+ M_COMPONENT_INFO_SUB_TYPE_BMSK = 0xff00, -+ M_COMPONENT_INFO_SUB_TYPE_SHFT = 0x8, -+ M_COMPONENT_INFO_TYPE_BMSK = 0xff, -+ M_COMPONENT_INFO_TYPE_SHFT = 0x0, -+}; -+ -+#define M_CONFIG_INFO_0_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000020) -+enum bimc_m_config_info_0 { -+ M_CONFIG_INFO_0_RMSK = 0xff00ffff, -+ M_CONFIG_INFO_0_SYNC_MODE_BMSK = 0xff000000, -+ M_CONFIG_INFO_0_SYNC_MODE_SHFT = 0x18, -+ M_CONFIG_INFO_0_CONNECTION_TYPE_BMSK = 0xff00, -+ M_CONFIG_INFO_0_CONNECTION_TYPE_SHFT = 0x8, -+ M_CONFIG_INFO_0_FUNC_BMSK = 0xff, -+ M_CONFIG_INFO_0_FUNC_SHFT = 0x0, -+}; -+ -+#define M_CONFIG_INFO_1_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000030) -+enum bimc_m_config_info_1 { -+ M_CONFIG_INFO_1_RMSK = 0xffffffff, -+ M_CONFIG_INFO_1_SWAY_CONNECTIVITY_BMSK = 0xffffffff, -+ M_CONFIG_INFO_1_SWAY_CONNECTIVITY_SHFT = 0x0, -+}; -+ -+#define M_CONFIG_INFO_2_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000040) -+enum bimc_m_config_info_2 { -+ M_CONFIG_INFO_2_RMSK = 0xffffffff, -+ M_CONFIG_INFO_2_M_DATA_WIDTH_BMSK = 0xffff0000, -+ M_CONFIG_INFO_2_M_DATA_WIDTH_SHFT = 0x10, -+ M_CONFIG_INFO_2_M_TID_WIDTH_BMSK = 0xff00, -+ M_CONFIG_INFO_2_M_TID_WIDTH_SHFT = 0x8, -+ M_CONFIG_INFO_2_M_MID_WIDTH_BMSK = 0xff, -+ M_CONFIG_INFO_2_M_MID_WIDTH_SHFT = 0x0, -+}; -+ -+#define M_CONFIG_INFO_3_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000050) -+enum bimc_m_config_info_3 { -+ M_CONFIG_INFO_3_RMSK = 0xffffffff, -+ M_CONFIG_INFO_3_RCH_DEPTH_BMSK = 0xff000000, -+ M_CONFIG_INFO_3_RCH_DEPTH_SHFT = 0x18, -+ M_CONFIG_INFO_3_BCH_DEPTH_BMSK = 0xff0000, -+ M_CONFIG_INFO_3_BCH_DEPTH_SHFT = 0x10, -+ M_CONFIG_INFO_3_WCH_DEPTH_BMSK = 0xff00, -+ M_CONFIG_INFO_3_WCH_DEPTH_SHFT = 0x8, -+ M_CONFIG_INFO_3_ACH_DEPTH_BMSK = 0xff, -+ M_CONFIG_INFO_3_ACH_DEPTH_SHFT = 0x0, -+}; -+ -+#define M_CONFIG_INFO_4_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000060) -+enum bimc_m_config_info_4 { -+ M_CONFIG_INFO_4_RMSK = 0xffff, -+ M_CONFIG_INFO_4_REORDER_BUF_DEPTH_BMSK = 0xff00, -+ M_CONFIG_INFO_4_REORDER_BUF_DEPTH_SHFT = 0x8, -+ M_CONFIG_INFO_4_REORDER_TABLE_DEPTH_BMSK = 0xff, -+ M_CONFIG_INFO_4_REORDER_TABLE_DEPTH_SHFT = 0x0, -+}; -+ -+#define M_CONFIG_INFO_5_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000070) -+enum bimc_m_config_info_5 { -+ M_CONFIG_INFO_5_RMSK = 0x111, -+ M_CONFIG_INFO_5_MP2ARB_PIPELINE_EN_BMSK = 0x100, -+ M_CONFIG_INFO_5_MP2ARB_PIPELINE_EN_SHFT = 0x8, -+ M_CONFIG_INFO_5_MPBUF_PIPELINE_EN_BMSK = 0x10, -+ M_CONFIG_INFO_5_MPBUF_PIPELINE_EN_SHFT = 0x4, -+ M_CONFIG_INFO_5_M2MP_PIPELINE_EN_BMSK = 0x1, -+ M_CONFIG_INFO_5_M2MP_PIPELINE_EN_SHFT = 0x0, -+}; -+ -+#define M_INT_STATUS_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000100) -+enum bimc_m_int_status { -+ M_INT_STATUS_RMSK = 0x3, -+}; -+ -+#define M_INT_CLR_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000108) -+enum bimc_m_int_clr { -+ M_INT_CLR_RMSK = 0x3, -+}; -+ -+#define M_INT_EN_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x0000010c) -+enum bimc_m_int_en { -+ M_INT_EN_RMSK = 0x3, -+}; -+ -+#define M_CLK_CTRL_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000200) -+enum bimc_m_clk_ctrl { -+ M_CLK_CTRL_RMSK = 0x3, -+ M_CLK_CTRL_MAS_CLK_GATING_EN_BMSK = 0x2, -+ M_CLK_CTRL_MAS_CLK_GATING_EN_SHFT = 0x1, -+ M_CLK_CTRL_CORE_CLK_GATING_EN_BMSK = 0x1, -+ M_CLK_CTRL_CORE_CLK_GATING_EN_SHFT = 0x0, -+}; -+ -+#define M_MODE_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000210) -+enum bimc_m_mode { -+ M_MODE_RMSK = 0xf0000011, -+ M_MODE_WR_GATHER_BEATS_BMSK = 0xf0000000, -+ M_MODE_WR_GATHER_BEATS_SHFT = 0x1c, -+ M_MODE_NARROW_WR_BMSK = 0x10, -+ M_MODE_NARROW_WR_SHFT = 0x4, -+ M_MODE_ORDERING_MODEL_BMSK = 0x1, -+ M_MODE_ORDERING_MODEL_SHFT = 0x0, -+}; -+ -+#define M_PRIOLVL_OVERRIDE_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000230) -+enum bimc_m_priolvl_override { -+ M_PRIOLVL_OVERRIDE_RMSK = 0x301, -+ M_PRIOLVL_OVERRIDE_BMSK = 0x300, -+ M_PRIOLVL_OVERRIDE_SHFT = 0x8, -+ M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_BMSK = 0x1, -+ M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_SHFT = 0x0, -+}; -+ -+#define M_RD_CMD_OVERRIDE_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000240) -+enum bimc_m_read_command_override { -+ M_RD_CMD_OVERRIDE_RMSK = 0x3071f7f, -+ M_RD_CMD_OVERRIDE_AREQPRIO_BMSK = 0x3000000, -+ M_RD_CMD_OVERRIDE_AREQPRIO_SHFT = 0x18, -+ M_RD_CMD_OVERRIDE_AMEMTYPE_BMSK = 0x70000, -+ M_RD_CMD_OVERRIDE_AMEMTYPE_SHFT = 0x10, -+ M_RD_CMD_OVERRIDE_ATRANSIENT_BMSK = 0x1000, -+ M_RD_CMD_OVERRIDE_ATRANSIENT_SHFT = 0xc, -+ M_RD_CMD_OVERRIDE_ASHARED_BMSK = 0x800, -+ M_RD_CMD_OVERRIDE_ASHARED_SHFT = 0xb, -+ M_RD_CMD_OVERRIDE_AREDIRECT_BMSK = 0x400, -+ M_RD_CMD_OVERRIDE_AREDIRECT_SHFT = 0xa, -+ M_RD_CMD_OVERRIDE_AOOO_BMSK = 0x200, -+ M_RD_CMD_OVERRIDE_AOOO_SHFT = 0x9, -+ M_RD_CMD_OVERRIDE_AINNERSHARED_BMSK = 0x100, -+ M_RD_CMD_OVERRIDE_AINNERSHARED_SHFT = 0x8, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK = 0x40, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT = 0x6, -+ M_RD_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_BMSK = 0x20, -+ M_RD_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_SHFT = 0x5, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_BMSK = 0x10, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_SHFT = 0x4, -+ M_RD_CMD_OVERRIDE_OVERRIDE_ASHARED_BMSK = 0x8, -+ M_RD_CMD_OVERRIDE_OVERRIDE_ASHARED_SHFT = 0x3, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AREDIRECT_BMSK = 0x4, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AREDIRECT_SHFT = 0x2, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AOOO_BMSK = 0x2, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AOOO_SHFT = 0x1, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_BMSK = 0x1, -+ M_RD_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_SHFT = 0x0, -+}; -+ -+#define M_WR_CMD_OVERRIDE_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000250) -+enum bimc_m_write_command_override { -+ M_WR_CMD_OVERRIDE_RMSK = 0x3071f7f, -+ M_WR_CMD_OVERRIDE_AREQPRIO_BMSK = 0x3000000, -+ M_WR_CMD_OVERRIDE_AREQPRIO_SHFT = 0x18, -+ M_WR_CMD_OVERRIDE_AMEMTYPE_BMSK = 0x70000, -+ M_WR_CMD_OVERRIDE_AMEMTYPE_SHFT = 0x10, -+ M_WR_CMD_OVERRIDE_ATRANSIENT_BMSK = 0x1000, -+ M_WR_CMD_OVERRIDE_ATRANSIENT_SHFT = 0xc, -+ M_WR_CMD_OVERRIDE_ASHARED_BMSK = 0x800, -+ M_WR_CMD_OVERRIDE_ASHARED_SHFT = 0xb, -+ M_WR_CMD_OVERRIDE_AREDIRECT_BMSK = 0x400, -+ M_WR_CMD_OVERRIDE_AREDIRECT_SHFT = 0xa, -+ M_WR_CMD_OVERRIDE_AOOO_BMSK = 0x200, -+ M_WR_CMD_OVERRIDE_AOOO_SHFT = 0x9, -+ M_WR_CMD_OVERRIDE_AINNERSHARED_BMSK = 0x100, -+ M_WR_CMD_OVERRIDE_AINNERSHARED_SHFT = 0x8, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK = 0x40, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT = 0x6, -+ M_WR_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_BMSK = 0x20, -+ M_WR_CMD_OVERRIDE_OVERRIDE_ATRANSIENT_SHFT = 0x5, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_BMSK = 0x10, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AMEMTYPE_SHFT = 0x4, -+ M_WR_CMD_OVERRIDE_OVERRIDE_ASHARED_BMSK = 0x8, -+ M_WR_CMD_OVERRIDE_OVERRIDE_ASHARED_SHFT = 0x3, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AREDIRECT_BMSK = 0x4, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AREDIRECT_SHFT = 0x2, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AOOO_BMSK = 0x2, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AOOO_SHFT = 0x1, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_BMSK = 0x1, -+ M_WR_CMD_OVERRIDE_OVERRIDE_AINNERSHARED_SHFT = 0x0, -+}; -+ -+#define M_BKE_EN_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000300) -+enum bimc_m_bke_en { -+ M_BKE_EN_RMSK = 0x1, -+ M_BKE_EN_EN_BMSK = 0x1, -+ M_BKE_EN_EN_SHFT = 0x0, -+}; -+ -+/* Grant Period registers */ -+#define M_BKE_GP_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000304) -+enum bimc_m_bke_grant_period { -+ M_BKE_GP_RMSK = 0x3ff, -+ M_BKE_GP_GP_BMSK = 0x3ff, -+ M_BKE_GP_GP_SHFT = 0x0, -+}; -+ -+/* Grant count register. -+ * The Grant count register represents a signed 16 bit -+ * value, range 0-0x7fff -+ */ -+#define M_BKE_GC_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000308) -+enum bimc_m_bke_grant_count { -+ M_BKE_GC_RMSK = 0xffff, -+ M_BKE_GC_GC_BMSK = 0xffff, -+ M_BKE_GC_GC_SHFT = 0x0, -+}; -+ -+/* Threshold High Registers */ -+#define M_BKE_THH_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000320) -+enum bimc_m_bke_thresh_high { -+ M_BKE_THH_RMSK = 0xffff, -+ M_BKE_THH_THRESH_BMSK = 0xffff, -+ M_BKE_THH_THRESH_SHFT = 0x0, -+}; -+ -+/* Threshold Medium Registers */ -+#define M_BKE_THM_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000324) -+enum bimc_m_bke_thresh_medium { -+ M_BKE_THM_RMSK = 0xffff, -+ M_BKE_THM_THRESH_BMSK = 0xffff, -+ M_BKE_THM_THRESH_SHFT = 0x0, -+}; -+ -+/* Threshold Low Registers */ -+#define M_BKE_THL_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000328) -+enum bimc_m_bke_thresh_low { -+ M_BKE_THL_RMSK = 0xffff, -+ M_BKE_THL_THRESH_BMSK = 0xffff, -+ M_BKE_THL_THRESH_SHFT = 0x0, -+}; -+ -+#define M_BKE_HEALTH_0_CONFIG_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000340) -+enum bimc_m_bke_health_0 { -+ M_BKE_HEALTH_0_CONFIG_RMSK = 0x80000303, -+ M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_BMSK = 0x80000000, -+ M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_SHFT = 0x1f, -+ M_BKE_HEALTH_0_CONFIG_AREQPRIO_BMSK = 0x300, -+ M_BKE_HEALTH_0_CONFIG_AREQPRIO_SHFT = 0x8, -+ M_BKE_HEALTH_0_CONFIG_PRIOLVL_BMSK = 0x3, -+ M_BKE_HEALTH_0_CONFIG_PRIOLVL_SHFT = 0x0, -+}; -+ -+#define M_BKE_HEALTH_1_CONFIG_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000344) -+enum bimc_m_bke_health_1 { -+ M_BKE_HEALTH_1_CONFIG_RMSK = 0x80000303, -+ M_BKE_HEALTH_1_CONFIG_LIMIT_CMDS_BMSK = 0x80000000, -+ M_BKE_HEALTH_1_CONFIG_LIMIT_CMDS_SHFT = 0x1f, -+ M_BKE_HEALTH_1_CONFIG_AREQPRIO_BMSK = 0x300, -+ M_BKE_HEALTH_1_CONFIG_AREQPRIO_SHFT = 0x8, -+ M_BKE_HEALTH_1_CONFIG_PRIOLVL_BMSK = 0x3, -+ M_BKE_HEALTH_1_CONFIG_PRIOLVL_SHFT = 0x0, -+}; -+ -+#define M_BKE_HEALTH_2_CONFIG_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000348) -+enum bimc_m_bke_health_2 { -+ M_BKE_HEALTH_2_CONFIG_RMSK = 0x80000303, -+ M_BKE_HEALTH_2_CONFIG_LIMIT_CMDS_BMSK = 0x80000000, -+ M_BKE_HEALTH_2_CONFIG_LIMIT_CMDS_SHFT = 0x1f, -+ M_BKE_HEALTH_2_CONFIG_AREQPRIO_BMSK = 0x300, -+ M_BKE_HEALTH_2_CONFIG_AREQPRIO_SHFT = 0x8, -+ M_BKE_HEALTH_2_CONFIG_PRIOLVL_BMSK = 0x3, -+ M_BKE_HEALTH_2_CONFIG_PRIOLVL_SHFT = 0x0, -+}; -+ -+#define M_BKE_HEALTH_3_CONFIG_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x0000034c) -+enum bimc_m_bke_health_3 { -+ M_BKE_HEALTH_3_CONFIG_RMSK = 0x303, -+ M_BKE_HEALTH_3_CONFIG_AREQPRIO_BMSK = 0x300, -+ M_BKE_HEALTH_3_CONFIG_AREQPRIO_SHFT = 0x8, -+ M_BKE_HEALTH_3_CONFIG_PRIOLVL_BMSK = 0x3, -+ M_BKE_HEALTH_3_CONFIG_PRIOLVL_SHFT = 0x0, -+}; -+ -+#define M_BUF_STATUS_ADDR(b, n) \ -+ (M_REG_BASE(b) + (0x4000 * (n)) + 0x00000400) -+enum bimc_m_buf_status { -+ M_BUF_STATUS_RMSK = 0xf03f030, -+ M_BUF_STATUS_RCH_DATA_WR_FULL_BMSK = 0x8000000, -+ M_BUF_STATUS_RCH_DATA_WR_FULL_SHFT = 0x1b, -+ M_BUF_STATUS_RCH_DATA_WR_EMPTY_BMSK = 0x4000000, -+ M_BUF_STATUS_RCH_DATA_WR_EMPTY_SHFT = 0x1a, -+ M_BUF_STATUS_RCH_CTRL_WR_FULL_BMSK = 0x2000000, -+ M_BUF_STATUS_RCH_CTRL_WR_FULL_SHFT = 0x19, -+ M_BUF_STATUS_RCH_CTRL_WR_EMPTY_BMSK = 0x1000000, -+ M_BUF_STATUS_RCH_CTRL_WR_EMPTY_SHFT = 0x18, -+ M_BUF_STATUS_BCH_WR_FULL_BMSK = 0x20000, -+ M_BUF_STATUS_BCH_WR_FULL_SHFT = 0x11, -+ M_BUF_STATUS_BCH_WR_EMPTY_BMSK = 0x10000, -+ M_BUF_STATUS_BCH_WR_EMPTY_SHFT = 0x10, -+ M_BUF_STATUS_WCH_DATA_RD_FULL_BMSK = 0x8000, -+ M_BUF_STATUS_WCH_DATA_RD_FULL_SHFT = 0xf, -+ M_BUF_STATUS_WCH_DATA_RD_EMPTY_BMSK = 0x4000, -+ M_BUF_STATUS_WCH_DATA_RD_EMPTY_SHFT = 0xe, -+ M_BUF_STATUS_WCH_CTRL_RD_FULL_BMSK = 0x2000, -+ M_BUF_STATUS_WCH_CTRL_RD_FULL_SHFT = 0xd, -+ M_BUF_STATUS_WCH_CTRL_RD_EMPTY_BMSK = 0x1000, -+ M_BUF_STATUS_WCH_CTRL_RD_EMPTY_SHFT = 0xc, -+ M_BUF_STATUS_ACH_RD_FULL_BMSK = 0x20, -+ M_BUF_STATUS_ACH_RD_FULL_SHFT = 0x5, -+ M_BUF_STATUS_ACH_RD_EMPTY_BMSK = 0x10, -+ M_BUF_STATUS_ACH_RD_EMPTY_SHFT = 0x4, -+}; -+/*BIMC Generic */ -+ -+#define S_REG_BASE(b) ((b) + 0x00048000) -+ -+#define S_COMPONENT_INFO_ADDR(b, n) \ -+ (S_REG_BASE(b) + (0x8000 * (n)) + 0x00000000) -+enum bimc_s_component_info { -+ S_COMPONENT_INFO_RMSK = 0xffffff, -+ S_COMPONENT_INFO_INSTANCE_BMSK = 0xff0000, -+ S_COMPONENT_INFO_INSTANCE_SHFT = 0x10, -+ S_COMPONENT_INFO_SUB_TYPE_BMSK = 0xff00, -+ S_COMPONENT_INFO_SUB_TYPE_SHFT = 0x8, -+ S_COMPONENT_INFO_TYPE_BMSK = 0xff, -+ S_COMPONENT_INFO_TYPE_SHFT = 0x0, -+}; -+ -+#define S_HW_INFO_ADDR(b, n) \ -+ (S_REG_BASE(b) + (0x80000 * (n)) + 0x00000010) -+enum bimc_s_hw_info { -+ S_HW_INFO_RMSK = 0xffffffff, -+ S_HW_INFO_MAJOR_BMSK = 0xff000000, -+ S_HW_INFO_MAJOR_SHFT = 0x18, -+ S_HW_INFO_BRANCH_BMSK = 0xff0000, -+ S_HW_INFO_BRANCH_SHFT = 0x10, -+ S_HW_INFO_MINOR_BMSK = 0xff00, -+ S_HW_INFO_MINOR_SHFT = 0x8, -+ S_HW_INFO_ECO_BMSK = 0xff, -+ S_HW_INFO_ECO_SHFT = 0x0, -+}; -+ -+ -+/* S_SCMO_GENERIC */ -+ -+#define S_SCMO_REG_BASE(b) ((b) + 0x00048000) -+ -+#define S_SCMO_CONFIG_INFO_0_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000020) -+enum bimc_s_scmo_config_info_0 { -+ S_SCMO_CONFIG_INFO_0_RMSK = 0xffffffff, -+ S_SCMO_CONFIG_INFO_0_DATA_WIDTH_BMSK = 0xffff0000, -+ S_SCMO_CONFIG_INFO_0_DATA_WIDTH_SHFT = 0x10, -+ S_SCMO_CONFIG_INFO_0_TID_WIDTH_BMSK = 0xff00, -+ S_SCMO_CONFIG_INFO_0_TID_WIDTH_SHFT = 0x8, -+ S_SCMO_CONFIG_INFO_0_MID_WIDTH_BMSK = 0xff, -+ S_SCMO_CONFIG_INFO_0_MID_WIDTH_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CONFIG_INFO_1_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000030) -+enum bimc_s_scmo_config_info_1 { -+ S_SCMO_CONFIG_INFO_1_RMSK = 0xffffffff, -+ S_SCMO_CONFIG_INFO_1_MPORT_CONNECTIVITY_BMSK = 0xffffffff, -+ S_SCMO_CONFIG_INFO_1_MPORT_CONNECTIVITY_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CONFIG_INFO_2_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000040) -+enum bimc_s_scmo_config_info_2 { -+ S_SCMO_CONFIG_INFO_2_RMSK = 0xff00ff, -+ S_SCMO_CONFIG_INFO_2_NUM_GLOBAL_MONS_BMSK = 0xff0000, -+ S_SCMO_CONFIG_INFO_2_NUM_GLOBAL_MONS_SHFT = 0x10, -+ S_SCMO_CONFIG_INFO_2_VMID_WIDTH_BMSK = 0xff, -+ S_SCMO_CONFIG_INFO_2_VMID_WIDTH_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CONFIG_INFO_3_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000050) -+enum bimc_s_scmo_config_info_3 { -+ S_SCMO_CONFIG_INFO_3_RMSK = 0xffffffff, -+ S_SCMO_CONFIG_INFO_3_RCH0_CTRL_DEPTH_BMSK = 0xff000000, -+ S_SCMO_CONFIG_INFO_3_RCH0_CTRL_DEPTH_SHFT = 0x18, -+ S_SCMO_CONFIG_INFO_3_RCH0_DEPTH_BMSK = 0xff0000, -+ S_SCMO_CONFIG_INFO_3_RCH0_DEPTH_SHFT = 0x10, -+ S_SCMO_CONFIG_INFO_3_BCH_DEPTH_BMSK = 0xff00, -+ S_SCMO_CONFIG_INFO_3_BCH_DEPTH_SHFT = 0x8, -+ S_SCMO_CONFIG_INFO_3_WCH_DEPTH_BMSK = 0xff, -+ S_SCMO_CONFIG_INFO_3_WCH_DEPTH_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CONFIG_INFO_4_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000060) -+enum bimc_s_scmo_config_info_4 { -+ S_SCMO_CONFIG_INFO_4_RMSK = 0xffff, -+ S_SCMO_CONFIG_INFO_4_RCH1_CTRL_DEPTH_BMSK = 0xff00, -+ S_SCMO_CONFIG_INFO_4_RCH1_CTRL_DEPTH_SHFT = 0x8, -+ S_SCMO_CONFIG_INFO_4_RCH1_DEPTH_BMSK = 0xff, -+ S_SCMO_CONFIG_INFO_4_RCH1_DEPTH_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CONFIG_INFO_5_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000070) -+enum bimc_s_scmo_config_info_5 { -+ S_SCMO_CONFIG_INFO_5_RMSK = 0xffff, -+ S_SCMO_CONFIG_INFO_5_DPE_CQ_DEPTH_BMSK = 0xff00, -+ S_SCMO_CONFIG_INFO_5_DPE_CQ_DEPTH_SHFT = 0x8, -+ S_SCMO_CONFIG_INFO_5_DDR_BUS_WIDTH_BMSK = 0xff, -+ S_SCMO_CONFIG_INFO_5_DDR_BUS_WIDTH_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CONFIG_INFO_6_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000080) -+enum bimc_s_scmo_config_info_6 { -+ S_SCMO_CONFIG_INFO_6_RMSK = 0x1111, -+ S_SCMO_CONFIG_INFO_6_WBUFC_PIPE_BMSK = 0x1000, -+ S_SCMO_CONFIG_INFO_6_WBUFC_PIPE_SHFT = 0xc, -+ S_SCMO_CONFIG_INFO_6_RDOPT_PIPE_BMSK = 0x100, -+ S_SCMO_CONFIG_INFO_6_RDOPT_PIPE_SHFT = 0x8, -+ S_SCMO_CONFIG_INFO_6_ACHAN_INTF_PIPE_BMSK = 0x10, -+ S_SCMO_CONFIG_INFO_6_ACHAN_INTF_PIPE_SHFT = 0x4, -+ S_SCMO_CONFIG_INFO_6_ADDR_DECODE_HT_BMSK = 0x1, -+ S_SCMO_CONFIG_INFO_6_ADDR_DECODE_HT_SHFT = 0x0, -+}; -+ -+#define S_SCMO_INT_STATUS_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000100) -+enum bimc_s_scmo_int_status { -+ S_SCMO_INT_STATUS_RMSK = 0x1, -+ S_SCMO_INT_STATUS_ERR_OCCURED_BMSK = 0x1, -+ S_SCMO_INT_STATUS_ERR_OCCURED_SHFT = 0x0, -+}; -+ -+#define S_SCMO_INT_CLR_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000108) -+enum bimc_s_scmo_int_clr { -+ S_SCMO_INT_CLR_RMSK = 0x1, -+ S_SCMO_INT_CLR_IRQ_CLR_BMSK = 0x1, -+ S_SCMO_INT_CLR_IRQ_CLR_SHFT = 0x0, -+}; -+ -+#define S_SCMO_INT_EN_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x0000010c) -+enum bimc_s_scmo_int_en { -+ S_SCMO_INT_EN_RMSK = 0x1, -+ S_SCMO_INT_EN_IRQ_EN_BMSK = 0x1, -+ S_SCMO_INT_EN_IRQ_EN_SHFT = 0x0, -+}; -+ -+#define S_SCMO_ESYN_ADDR_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000120) -+enum bimc_s_scmo_esyn_addr { -+ S_SCMO_ESYN_ADDR_RMSK = 0xffffffff, -+ S_SCMO_ESYN_ADDR_ESYN_ADDR_ERR_ADDR_BMSK = 0xffffffff, -+ S_SCMO_ESYN_ADDR_ESYN_ADDR_ERR_ADDR_SHFT = 0x0, -+}; -+ -+#define S_SCMO_ESYN_APACKET_0_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000128) -+enum bimc_s_scmo_esyn_apacket_0 { -+ S_SCMO_ESYN_APACKET_0_RMSK = 0xff1fffff, -+ S_SCMO_ESYN_APACKET_0_ERR_ATID_BMSK = 0xff000000, -+ S_SCMO_ESYN_APACKET_0_ERR_ATID_SHFT = 0x18, -+ S_SCMO_ESYN_APACKET_0_ERR_AVMID_BMSK = 0x1f0000, -+ S_SCMO_ESYN_APACKET_0_ERR_AVMID_SHFT = 0x10, -+ S_SCMO_ESYN_APACKET_0_ERR_AMID_BMSK = 0xffff, -+ S_SCMO_ESYN_APACKET_0_ERR_AMID_SHFT = 0x0, -+}; -+ -+#define S_SCMO_ESYN_APACKET_1_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x0000012c) -+enum bimc_s_scmo_esyn_apacket_1 { -+ S_SCMO_ESYN_APACKET_1_RMSK = 0x10ff117, -+ S_SCMO_ESYN_APACKET_1_ERR_CODE_BMSK = 0x1000000, -+ S_SCMO_ESYN_APACKET_1_ERR_CODE_SHFT = 0x18, -+ S_SCMO_ESYN_APACKET_1_ERR_ALEN_BMSK = 0xf0000, -+ S_SCMO_ESYN_APACKET_1_ERR_ALEN_SHFT = 0x10, -+ S_SCMO_ESYN_APACKET_1_ERR_ASIZE_BMSK = 0xe000, -+ S_SCMO_ESYN_APACKET_1_ERR_ASIZE_SHFT = 0xd, -+ S_SCMO_ESYN_APACKET_1_ERR_ABURST_BMSK = 0x1000, -+ S_SCMO_ESYN_APACKET_1_ERR_ABURST_SHFT = 0xc, -+ S_SCMO_ESYN_APACKET_1_ERR_AEXCLUSIVE_BMSK = 0x100, -+ S_SCMO_ESYN_APACKET_1_ERR_AEXCLUSIVE_SHFT = 0x8, -+ S_SCMO_ESYN_APACKET_1_ERR_APRONTS_BMSK = 0x10, -+ S_SCMO_ESYN_APACKET_1_ERR_APRONTS_SHFT = 0x4, -+ S_SCMO_ESYN_APACKET_1_ERR_AOOORD_BMSK = 0x4, -+ S_SCMO_ESYN_APACKET_1_ERR_AOOORD_SHFT = 0x2, -+ S_SCMO_ESYN_APACKET_1_ERR_AOOOWR_BMSK = 0x2, -+ S_SCMO_ESYN_APACKET_1_ERR_AOOOWR_SHFT = 0x1, -+ S_SCMO_ESYN_APACKET_1_ERR_AWRITE_BMSK = 0x1, -+ S_SCMO_ESYN_APACKET_1_ERR_AWRITE_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CLK_CTRL_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000200) -+enum bimc_s_scmo_clk_ctrl { -+ S_SCMO_CLK_CTRL_RMSK = 0xffff1111, -+ S_SCMO_CLK_CTRL_PEN_CMD_CG_EN_BMSK = 0x10000, -+ S_SCMO_CLK_CTRL_PEN_CMD_CG_EN_SHFT = 0x10, -+ S_SCMO_CLK_CTRL_RCH_CG_EN_BMSK = 0x1000, -+ S_SCMO_CLK_CTRL_RCH_CG_EN_SHFT = 0xc, -+ S_SCMO_CLK_CTRL_FLUSH_CG_EN_BMSK = 0x100, -+ S_SCMO_CLK_CTRL_FLUSH_CG_EN_SHFT = 0x8, -+ S_SCMO_CLK_CTRL_WCH_CG_EN_BMSK = 0x10, -+ S_SCMO_CLK_CTRL_WCH_CG_EN_SHFT = 0x4, -+ S_SCMO_CLK_CTRL_ACH_CG_EN_BMSK = 0x1, -+ S_SCMO_CLK_CTRL_ACH_CG_EN_SHFT = 0x0, -+}; -+ -+#define S_SCMO_SLV_INTERLEAVE_CFG_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000400) -+enum bimc_s_scmo_slv_interleave_cfg { -+ S_SCMO_SLV_INTERLEAVE_CFG_RMSK = 0xff, -+ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS1_BMSK = 0x10, -+ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS1_SHFT = 0x4, -+ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS0_BMSK = 0x1, -+ S_SCMO_SLV_INTERLEAVE_CFG_INTERLEAVE_CS0_SHFT = 0x0, -+}; -+ -+#define S_SCMO_ADDR_BASE_CSn_ADDR(b, n, o) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000410 + 0x4 * (o)) -+enum bimc_s_scmo_addr_base_csn { -+ S_SCMO_ADDR_BASE_CSn_RMSK = 0xffff, -+ S_SCMO_ADDR_BASE_CSn_MAXn = 1, -+ S_SCMO_ADDR_BASE_CSn_ADDR_BASE_BMSK = 0xfc, -+ S_SCMO_ADDR_BASE_CSn_ADDR_BASE_SHFT = 0x2, -+}; -+ -+#define S_SCMO_ADDR_MAP_CSn_ADDR(b, n, o) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000420 + 0x4 * (o)) -+enum bimc_s_scmo_addr_map_csn { -+ S_SCMO_ADDR_MAP_CSn_RMSK = 0xffff, -+ S_SCMO_ADDR_MAP_CSn_MAXn = 1, -+ S_SCMO_ADDR_MAP_CSn_RANK_EN_BMSK = 0x8000, -+ S_SCMO_ADDR_MAP_CSn_RANK_EN_SHFT = 0xf, -+ S_SCMO_ADDR_MAP_CSn_ADDR_MODE_BMSK = 0x1000, -+ S_SCMO_ADDR_MAP_CSn_ADDR_MODE_SHFT = 0xc, -+ S_SCMO_ADDR_MAP_CSn_BANK_SIZE_BMSK = 0x100, -+ S_SCMO_ADDR_MAP_CSn_BANK_SIZE_SHFT = 0x8, -+ S_SCMO_ADDR_MAP_CSn_ROW_SIZE_BMSK = 0x30, -+ S_SCMO_ADDR_MAP_CSn_ROW_SIZE_SHFT = 0x4, -+ S_SCMO_ADDR_MAP_CSn_COL_SIZE_BMSK = 0x3, -+ S_SCMO_ADDR_MAP_CSn_COL_SIZE_SHFT = 0x0, -+}; -+ -+#define S_SCMO_ADDR_MASK_CSn_ADDR(b, n, o) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000430 + 0x4 * (0)) -+enum bimc_s_scmo_addr_mask_csn { -+ S_SCMO_ADDR_MASK_CSn_RMSK = 0xffff, -+ S_SCMO_ADDR_MASK_CSn_MAXn = 1, -+ S_SCMO_ADDR_MASK_CSn_ADDR_MASK_BMSK = 0xfc, -+ S_SCMO_ADDR_MASK_CSn_ADDR_MASK_SHFT = 0x2, -+}; -+ -+#define S_SCMO_SLV_STATUS_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000450) -+enum bimc_s_scmo_slv_status { -+ S_SCMO_SLV_STATUS_RMSK = 0xff3, -+ S_SCMO_SLV_STATUS_GLOBAL_MONS_IN_USE_BMSK = 0xff0, -+ S_SCMO_SLV_STATUS_GLOBAL_MONS_IN_USE_SHFT = 0x4, -+ S_SCMO_SLV_STATUS_SLAVE_IDLE_BMSK = 0x3, -+ S_SCMO_SLV_STATUS_SLAVE_IDLE_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CMD_BUF_CFG_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000500) -+enum bimc_s_scmo_cmd_buf_cfg { -+ S_SCMO_CMD_BUF_CFG_RMSK = 0xf1f, -+ S_SCMO_CMD_BUF_CFG_CMD_ORDERING_BMSK = 0x300, -+ S_SCMO_CMD_BUF_CFG_CMD_ORDERING_SHFT = 0x8, -+ S_SCMO_CMD_BUF_CFG_HP_CMD_AREQPRIO_MAP_BMSK = 0x10, -+ S_SCMO_CMD_BUF_CFG_HP_CMD_AREQPRIO_MAP_SHFT = 0x4, -+ S_SCMO_CMD_BUF_CFG_HP_CMD_Q_DEPTH_BMSK = 0x7, -+ S_SCMO_CMD_BUF_CFG_HP_CMD_Q_DEPTH_SHFT = 0x0, -+}; -+ -+#define S_SCM_CMD_BUF_STATUS_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000520) -+enum bimc_s_scm_cmd_buf_status { -+ S_SCMO_CMD_BUF_STATUS_RMSK = 0x77, -+ S_SCMO_CMD_BUF_STATUS_HP_CMD_BUF_ENTRIES_IN_USE_BMSK = 0x70, -+ S_SCMO_CMD_BUF_STATUS_HP_CMD_BUF_ENTRIES_IN_USE_SHFT = 0x4, -+ S_SCMO_CMD_BUF_STATUS_LP_CMD_BUF_ENTRIES_IN_USE_BMSK = 0x7, -+ S_SCMO_CMD_BUF_STATUS_LP_CMD_BUF_ENTRIES_IN_USE_SHFT = 0x0, -+}; -+ -+#define S_SCMO_RCH_SEL_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000540) -+enum bimc_s_scmo_rch_sel { -+ S_SCMO_RCH_SEL_RMSK = 0xffffffff, -+ S_SCMO_CMD_BUF_STATUS_RCH_PORTS_BMSK = 0xffffffff, -+ S_SCMO_CMD_BUF_STATUS_RCH_PORTS_SHFT = 0x0, -+}; -+ -+#define S_SCMO_RCH_BKPR_CFG_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000544) -+enum bimc_s_scmo_rch_bkpr_cfg { -+ S_SCMO_RCH_BKPR_CFG_RMSK = 0xffffffff, -+ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_HI_TH_BMSK = 0x3f000000, -+ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_HI_TH_SHFT = 0x18, -+ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_LO_TH_BMSK = 0x3f0000, -+ S_SCMO_RCH_BKPR_CFG_RCH1_FIFO_BKPR_LO_TH_SHFT = 0x10, -+ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_HI_TH_BMSK = 0x3f00, -+ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_HI_TH_SHFT = 0x8, -+ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_LO_TH_BMSK = 0x3f, -+ S_SCMO_RCH_BKPR_CFG_RCH0_FIFO_BKPR_LO_TH_SHFT = 0x0, -+}; -+ -+#define S_SCMO_RCH_STATUS_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000560) -+enum bimc_s_scmo_rch_status { -+ S_SCMO_RCH_STATUS_RMSK = 0x33333, -+ S_SCMO_RCH_STATUS_PRQ_FIFO_FULL_BMSK = 0x20000, -+ S_SCMO_RCH_STATUS_PRQ_FIFO_FULL_SHFT = 0x11, -+ S_SCMO_RCH_STATUS_PRQ_FIFO_EMPTY_BMSK = 0x10000, -+ S_SCMO_RCH_STATUS_PRQ_FIFO_EMPTY_SHFT = 0x10, -+ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_FULL_BMSK = 0x2000, -+ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_FULL_SHFT = 0xd, -+ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_EMPTY_BMSK = 0x1000, -+ S_SCMO_RCH_STATUS_RCH1_QUAL_FIFO_EMPTY_SHFT = 0xc, -+ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_FULL_BMSK = 0x200, -+ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_FULL_SHFT = 0x9, -+ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_EMPTY_BMSK = 0x100, -+ S_SCMO_RCH_STATUS_RCH1_DATA_FIFO_EMPTY_SHFT = 0x8, -+ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_FULL_BMSK = 0x20, -+ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_FULL_SHFT = 0x5, -+ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_EMPTY_BMSK = 0x10, -+ S_SCMO_RCH_STATUS_RCH0_QUAL_FIFO_EMPTY_SHFT = 0x4, -+ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_FULL_BMSK = 0x2, -+ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_FULL_SHFT = 0x1, -+ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_EMPTY_BMSK = 0x1, -+ S_SCMO_RCH_STATUS_RCH0_DATA_FIFO_EMPTY_SHFT = 0x0, -+}; -+ -+#define S_SCMO_WCH_BUF_CFG_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000580) -+enum bimc_s_scmo_wch_buf_cfg { -+ S_SCMO_WCH_BUF_CFG_RMSK = 0xff, -+ S_SCMO_WCH_BUF_CFG_WRITE_BLOCK_READ_BMSK = 0x10, -+ S_SCMO_WCH_BUF_CFG_WRITE_BLOCK_READ_SHFT = 0x4, -+ S_SCMO_WCH_BUF_CFG_COALESCE_EN_BMSK = 0x1, -+ S_SCMO_WCH_BUF_CFG_COALESCE_EN_SHFT = 0x0, -+}; -+ -+#define S_SCMO_WCH_STATUS_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x000005a0) -+enum bimc_s_scmo_wch_status { -+ S_SCMO_WCH_STATUS_RMSK = 0x333, -+ S_SCMO_WCH_STATUS_BRESP_FIFO_FULL_BMSK = 0x200, -+ S_SCMO_WCH_STATUS_BRESP_FIFO_FULL_SHFT = 0x9, -+ S_SCMO_WCH_STATUS_BRESP_FIFO_EMPTY_BMSK = 0x100, -+ S_SCMO_WCH_STATUS_BRESP_FIFO_EMPTY_SHFT = 0x8, -+ S_SCMO_WCH_STATUS_WDATA_FIFO_FULL_BMSK = 0x20, -+ S_SCMO_WCH_STATUS_WDATA_FIFO_FULL_SHFT = 0x5, -+ S_SCMO_WCH_STATUS_WDATA_FIFO_EMPTY_BMSK = 0x10, -+ S_SCMO_WCH_STATUS_WDATA_FIFO_EMPTY_SHFT = 0x4, -+ S_SCMO_WCH_STATUS_WBUF_FULL_BMSK = 0x2, -+ S_SCMO_WCH_STATUS_WBUF_FULL_SHFT = 0x1, -+ S_SCMO_WCH_STATUS_WBUF_EMPTY_BMSK = 0x1, -+ S_SCMO_WCH_STATUS_WBUF_EMPTY_SHFT = 0x0, -+}; -+ -+#define S_SCMO_FLUSH_CFG_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x000005c0) -+enum bimc_s_scmo_flush_cfg { -+ S_SCMO_FLUSH_CFG_RMSK = 0xffffffff, -+ S_SCMO_FLUSH_CFG_FLUSH_IN_ORDER_BMSK = 0x10000000, -+ S_SCMO_FLUSH_CFG_FLUSH_IN_ORDER_SHFT = 0x1c, -+ S_SCMO_FLUSH_CFG_FLUSH_IDLE_DELAY_BMSK = 0x3ff0000, -+ S_SCMO_FLUSH_CFG_FLUSH_IDLE_DELAY_SHFT = 0x10, -+ S_SCMO_FLUSH_CFG_FLUSH_UPPER_LIMIT_BMSK = 0xf00, -+ S_SCMO_FLUSH_CFG_FLUSH_UPPER_LIMIT_SHFT = 0x8, -+ S_SCMO_FLUSH_CFG_FLUSH_LOWER_LIMIT_BMSK = 0xf, -+ S_SCMO_FLUSH_CFG_FLUSH_LOWER_LIMIT_SHFT = 0x0, -+}; -+ -+#define S_SCMO_FLUSH_CMD_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x000005c4) -+enum bimc_s_scmo_flush_cmd { -+ S_SCMO_FLUSH_CMD_RMSK = 0xf, -+ S_SCMO_FLUSH_CMD_FLUSH_ALL_BUF_BMSK = 0x3, -+ S_SCMO_FLUSH_CMD_FLUSH_ALL_BUF_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CMD_OPT_CFG0_ADDR(b, n) \ -+ (S_SCM0_REG_BASE(b) + (0x8000 * (n)) + 0x00000700) -+enum bimc_s_scmo_cmd_opt_cfg0 { -+ S_SCMO_CMD_OPT_CFG0_RMSK = 0xffffff, -+ S_SCMO_CMD_OPT_CFG0_IGNORE_BANK_UNAVL_BMSK = 0x100000, -+ S_SCMO_CMD_OPT_CFG0_IGNORE_BANK_UNAVL_SHFT = 0x14, -+ S_SCMO_CMD_OPT_CFG0_MASK_CMDOUT_PRI_BMSK = 0x10000, -+ S_SCMO_CMD_OPT_CFG0_MASK_CMDOUT_PRI_SHFT = 0x10, -+ S_SCMO_CMD_OPT_CFG0_DPE_CMD_REORDERING_BMSK = 0x1000, -+ S_SCMO_CMD_OPT_CFG0_DPE_CMD_REORDERING_SHFT = 0xc, -+ S_SCMO_CMD_OPT_CFG0_WR_OPT_EN_BMSK = 0x100, -+ S_SCMO_CMD_OPT_CFG0_WR_OPT_EN_SHFT = 0x8, -+ S_SCMO_CMD_OPT_CFG0_RD_OPT_EN_BMSK = 0x10, -+ S_SCMO_CMD_OPT_CFG0_RD_OPT_EN_SHFT = 0x4, -+ S_SCMO_CMD_OPT_CFG0_PAGE_MGMT_POLICY_BMSK = 0x1, -+ S_SCMO_CMD_OPT_CFG0_PAGE_MGMT_POLICY_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CMD_OPT_CFG1_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000704) -+enum bimc_s_scmo_cmd_opt_cfg1 { -+ S_SCMO_CMD_OPT_CFG1_RMSK = 0xffffffff, -+ S_SCMO_CMD_OPT_CFG1_HSTP_CMD_TIMEOUT_BMSK = 0x1f000000, -+ S_SCMO_CMD_OPT_CFG1_HSTP_CMD_TIMEOUT_SHFT = 0x18, -+ S_SCMO_CMD_OPT_CFG1_HP_CMD_TIMEOUT_BMSK = 0x1f0000, -+ S_SCMO_CMD_OPT_CFG1_HP_CMD_TIMEOUT_SHFT = 0x10, -+ S_SCMO_CMD_OPT_CFG1_MP_CMD_TIMEOUT_BMSK = 0x1f00, -+ S_SCMO_CMD_OPT_CFG1_MP_CMD_TIMEOUT_SHFT = 0x8, -+ S_SCMO_CMD_OPT_CFG1_LP_CMD_TIMEOUT_BMSK = 0x1f, -+ S_SCMO_CMD_OPT_CFG1_LP_CMD_TIMEOUT_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CMD_OPT_CFG2_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x00000708) -+enum bimc_s_scmo_cmd_opt_cfg2 { -+ S_SCMO_CMD_OPT_CFG2_RMSK = 0xff, -+ S_SCMO_CMD_OPT_CFG2_RWOPT_CMD_TIMEOUT_BMSK = 0xf, -+ S_SCMO_CMD_OPT_CFG2_RWOPT_CMD_TIMEOUT_SHFT = 0x0, -+}; -+ -+#define S_SCMO_CMD_OPT_CFG3_ADDR(b, n) \ -+ (S_SCMO_REG_BASE(b) + (0x8000 * (n)) + 0x0000070c) -+enum bimc_s_scmo_cmd_opt_cfg3 { -+ S_SCMO_CMD_OPT_CFG3_RMSK = 0xff, -+ S_SCMO_CMD_OPT_CFG3_FLUSH_CMD_TIMEOUT_BMSK = 0xf, -+ S_SCMO_CMD_OPT_CFG3_FLUSH_CMD_TIMEOUT_SHFT = 0x0, -+}; -+ -+/* S_SWAY_GENERIC */ -+#define S_SWAY_REG_BASE(b) ((b) + 0x00048000) -+ -+#define S_SWAY_CONFIG_INFO_0_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000020) -+enum bimc_s_sway_config_info_0 { -+ S_SWAY_CONFIG_INFO_0_RMSK = 0xff0000ff, -+ S_SWAY_CONFIG_INFO_0_SYNC_MODE_BMSK = 0xff000000, -+ S_SWAY_CONFIG_INFO_0_SYNC_MODE_SHFT = 0x18, -+ S_SWAY_CONFIG_INFO_0_FUNC_BMSK = 0xff, -+ S_SWAY_CONFIG_INFO_0_FUNC_SHFT = 0x0, -+}; -+ -+#define S_SWAY_CONFIG_INFO_1_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000030) -+enum bimc_s_sway_config_info_1 { -+ S_SWAY_CONFIG_INFO_1_RMSK = 0xffffffff, -+ S_SWAY_CONFIG_INFO_1_MPORT_CONNECTIVITY_BMSK = 0xffffffff, -+ S_SWAY_CONFIG_INFO_1_MPORT_CONNECTIVITY_SHFT = 0x0, -+}; -+ -+#define S_SWAY_CONFIG_INFO_2_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000040) -+enum bimc_s_sway_config_info_2 { -+ S_SWAY_CONFIG_INFO_2_RMSK = 0xffff0000, -+ S_SWAY_CONFIG_INFO_2_MPORT_CONNECTIVITY_BMSK = 0xffff0000, -+ S_SWAY_CONFIG_INFO_2_MPORT_CONNECTIVITY_SHFT = 0x10, -+}; -+ -+#define S_SWAY_CONFIG_INFO_3_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000050) -+enum bimc_s_sway_config_info_3 { -+ S_SWAY_CONFIG_INFO_3_RMSK = 0xffffffff, -+ S_SWAY_CONFIG_INFO_3_RCH0_DEPTH_BMSK = 0xff000000, -+ S_SWAY_CONFIG_INFO_3_RCH0_DEPTH_SHFT = 0x18, -+ S_SWAY_CONFIG_INFO_3_BCH_DEPTH_BMSK = 0xff0000, -+ S_SWAY_CONFIG_INFO_3_BCH_DEPTH_SHFT = 0x10, -+ S_SWAY_CONFIG_INFO_3_WCH_DEPTH_BMSK = 0xff, -+ S_SWAY_CONFIG_INFO_3_WCH_DEPTH_SHFT = 0x0, -+}; -+ -+#define S_SWAY_CONFIG_INFO_4_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000060) -+enum bimc_s_sway_config_info_4 { -+ S_SWAY_CONFIG_INFO_4_RMSK = 0x800000ff, -+ S_SWAY_CONFIG_INFO_4_DUAL_RCH_EN_BMSK = 0x80000000, -+ S_SWAY_CONFIG_INFO_4_DUAL_RCH_EN_SHFT = 0x1f, -+ S_SWAY_CONFIG_INFO_4_RCH1_DEPTH_BMSK = 0xff, -+ S_SWAY_CONFIG_INFO_4_RCH1_DEPTH_SHFT = 0x0, -+}; -+ -+#define S_SWAY_CONFIG_INFO_5_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000070) -+enum bimc_s_sway_config_info_5 { -+ S_SWAY_CONFIG_INFO_5_RMSK = 0x800000ff, -+ S_SWAY_CONFIG_INFO_5_QCH_EN_BMSK = 0x80000000, -+ S_SWAY_CONFIG_INFO_5_QCH_EN_SHFT = 0x1f, -+ S_SWAY_CONFIG_INFO_5_QCH_DEPTH_BMSK = 0xff, -+ S_SWAY_CONFIG_INFO_5_QCH_DEPTH_SHFT = 0x0, -+}; -+ -+#define S_SWAY_CONFIG_INFO_6_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000080) -+enum bimc_s_sway_config_info_6 { -+ S_SWAY_CONFIG_INFO_6_RMSK = 0x1, -+ S_SWAY_CONFIG_INFO_6_S2SW_PIPELINE_EN_BMSK = 0x1, -+ S_SWAY_CONFIG_INFO_6_S2SW_PIPELINE_EN_SHFT = 0x0, -+}; -+ -+#define S_SWAY_INT_STATUS_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000100) -+enum bimc_s_sway_int_status { -+ S_SWAY_INT_STATUS_RMSK = 0x3, -+ S_SWAY_INT_STATUS_RFU_BMSK = 0x3, -+ S_SWAY_INT_STATUS_RFU_SHFT = 0x0, -+}; -+ -+#define S_SWAY_INT_CLR_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000108) -+enum bimc_s_sway_int_clr { -+ S_SWAY_INT_CLR_RMSK = 0x3, -+ S_SWAY_INT_CLR_RFU_BMSK = 0x3, -+ S_SWAY_INT_CLR_RFU_SHFT = 0x0, -+}; -+ -+ -+#define S_SWAY_INT_EN_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x0000010c) -+enum bimc_s_sway_int_en { -+ S_SWAY_INT_EN_RMSK = 0x3, -+ S_SWAY_INT_EN_RFU_BMSK = 0x3, -+ S_SWAY_INT_EN_RFU_SHFT = 0x0, -+}; -+ -+#define S_SWAY_CLK_CTRL_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000200) -+enum bimc_s_sway_clk_ctrl { -+ S_SWAY_CLK_CTRL_RMSK = 0x3, -+ S_SWAY_CLK_CTRL_SLAVE_CLK_GATING_EN_BMSK = 0x2, -+ S_SWAY_CLK_CTRL_SLAVE_CLK_GATING_EN_SHFT = 0x1, -+ S_SWAY_CLK_CTRL_CORE_CLK_GATING_EN_BMSK = 0x1, -+ S_SWAY_CLK_CTRL_CORE_CLK_GATING_EN_SHFT = 0x0, -+}; -+ -+#define S_SWAY_RCH_SEL_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000210) -+enum bimc_s_sway_rch_sel { -+ S_SWAY_RCH_SEL_RMSK = 0x7f, -+ S_SWAY_RCH_SEL_UNUSED_BMSK = 0x7f, -+ S_SWAY_RCH_SEL_UNUSED_SHFT = 0x0, -+}; -+ -+ -+#define S_SWAY_MAX_OUTSTANDING_REQS_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000220) -+enum bimc_s_sway_max_outstanding_reqs { -+ S_SWAY_MAX_OUTSTANDING_REQS_RMSK = 0xffff, -+ S_SWAY_MAX_OUTSTANDING_REQS_WRITE_BMSK = 0xff00, -+ S_SWAY_MAX_OUTSTANDING_REQS_WRITE_SHFT = 0x8, -+ S_SWAY_MAX_OUTSTANDING_REQS_READ_BMSK = 0xff, -+ S_SWAY_MAX_OUTSTANDING_REQS_READ_SHFT = 0x0, -+}; -+ -+ -+#define S_SWAY_BUF_STATUS_0_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000400) -+enum bimc_s_sway_buf_status_0 { -+ S_SWAY_BUF_STATUS_0_RMSK = 0xf0300f03, -+ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_FULL_BMSK = 0x80000000, -+ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_FULL_SHFT = 0x1f, -+ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_EMPTY_BMSK = 0x40000000, -+ S_SWAY_BUF_STATUS_0_RCH0_DATA_RD_EMPTY_SHFT = 0x1e, -+ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_FULL_BMSK = 0x20000000, -+ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_FULL_SHFT = 0x1d, -+ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_EMPTY_BMSK = 0x10000000, -+ S_SWAY_BUF_STATUS_0_RCH0_CTRL_RD_EMPTY_SHFT = 0x1c, -+ S_SWAY_BUF_STATUS_0_BCH_RD_FULL_BMSK = 0x200000, -+ S_SWAY_BUF_STATUS_0_BCH_RD_FULL_SHFT = 0x15, -+ S_SWAY_BUF_STATUS_0_BCH_RD_EMPTY_BMSK = 0x100000, -+ S_SWAY_BUF_STATUS_0_BCH_RD_EMPTY_SHFT = 0x14, -+ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_FULL_BMSK = 0x800, -+ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_FULL_SHFT = 0xb, -+ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_EMPTY_BMSK = 0x400, -+ S_SWAY_BUF_STATUS_0_WCH_DATA_WR_EMPTY_SHFT = 0xa, -+ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_FULL_BMSK = 0x200, -+ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_FULL_SHFT = 0x9, -+ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_EMPTY_BMSK = 0x100, -+ S_SWAY_BUF_STATUS_0_WCH_CTRL_WR_EMPTY_SHFT = 0x8, -+ S_SWAY_BUF_STATUS_0_ACH_WR_FULL_BMSK = 0x2, -+ S_SWAY_BUF_STATUS_0_ACH_WR_FULL_SHFT = 0x1, -+ S_SWAY_BUF_STATUS_0_ACH_WR_EMPTY_BMSK = 0x1, -+ S_SWAY_BUF_STATUS_0_ACH_WR_EMPTY_SHFT = 0x0, -+}; -+ -+#define S_SWAY_BUF_STATUS_1_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000410) -+enum bimc_s_sway_buf_status_1 { -+ S_SWAY_BUF_STATUS_1_RMSK = 0xf0, -+ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_FULL_BMSK = 0x80, -+ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_FULL_SHFT = 0x7, -+ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_EMPTY_BMSK = 0x40, -+ S_SWAY_BUF_STATUS_1_RCH1_DATA_RD_EMPTY_SHFT = 0x6, -+ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_FULL_BMSK = 0x20, -+ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_FULL_SHFT = 0x5, -+ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_EMPTY_BMSK = 0x10, -+ S_SWAY_BUF_STATUS_1_RCH1_CTRL_RD_EMPTY_SHFT = 0x4, -+}; -+ -+#define S_SWAY_BUF_STATUS_2_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000420) -+enum bimc_s_sway_buf_status_2 { -+ S_SWAY_BUF_STATUS_2_RMSK = 0x30, -+ S_SWAY_BUF_STATUS_2_QCH_RD_FULL_BMSK = 0x20, -+ S_SWAY_BUF_STATUS_2_QCH_RD_FULL_SHFT = 0x5, -+ S_SWAY_BUF_STATUS_2_QCH_RD_EMPTY_BMSK = 0x10, -+ S_SWAY_BUF_STATUS_2_QCH_RD_EMPTY_SHFT = 0x4, -+}; -+ -+/* S_ARB_GENERIC */ -+ -+#define S_ARB_REG_BASE(b) ((b) + 0x00049000) -+ -+#define S_ARB_COMPONENT_INFO_ADDR(b, n) \ -+ (S_SWAY_REG_BASE(b) + (0x8000 * (n)) + 0x00000000) -+enum bimc_s_arb_component_info { -+ S_ARB_COMPONENT_INFO_RMSK = 0xffffff, -+ S_ARB_COMPONENT_INFO_INSTANCE_BMSK = 0xff0000, -+ S_ARB_COMPONENT_INFO_INSTANCE_SHFT = 0x10, -+ S_ARB_COMPONENT_INFO_SUB_TYPE_BMSK = 0xff00, -+ S_ARB_COMPONENT_INFO_SUB_TYPE_SHFT = 0x8, -+ S_ARB_COMPONENT_INFO_TYPE_BMSK = 0xff, -+ S_ARB_COMPONENT_INFO_TYPE_SHFT = 0x0, -+}; -+ -+#define S_ARB_CONFIG_INFO_0_ADDR(b, n) \ -+ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000020) -+enum bimc_s_arb_config_info_0 { -+ S_ARB_CONFIG_INFO_0_RMSK = 0x800000ff, -+ S_ARB_CONFIG_INFO_0_ARB2SW_PIPELINE_EN_BMSK = 0x80000000, -+ S_ARB_CONFIG_INFO_0_ARB2SW_PIPELINE_EN_SHFT = 0x1f, -+ S_ARB_CONFIG_INFO_0_FUNC_BMSK = 0xff, -+ S_ARB_CONFIG_INFO_0_FUNC_SHFT = 0x0, -+}; -+ -+#define S_ARB_CONFIG_INFO_1_ADDR(b, n) \ -+ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000030) -+enum bimc_s_arb_config_info_1 { -+ S_ARB_CONFIG_INFO_1_RMSK = 0xffffffff, -+ S_ARB_CONFIG_INFO_1_MPORT_CONNECTIVITY_BMSK = 0xffffffff, -+ S_ARB_CONFIG_INFO_1_MPORT_CONNECTIVITY_SHFT = 0x0, -+}; -+ -+#define S_ARB_CLK_CTRL_ADDR(b) \ -+ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000200) -+enum bimc_s_arb_clk_ctrl { -+ S_ARB_CLK_CTRL_RMSK = 0x1, -+ S_ARB_CLK_CTRL_SLAVE_CLK_GATING_EN_BMSK = 0x2, -+ S_ARB_CLK_CTRL_SLAVE_CLK_GATING_EN_SHFT = 0x1, -+ S_ARB_CLK_CTRL_CORE_CLK_GATING_EN_BMSK = 0x1, -+ S_ARB_CLK_CTRL_CORE_CLK_GATING_EN_SHFT = 0x0, -+ S_ARB_CLK_CTRL_CLK_GATING_EN_BMSK = 0x1, -+ S_ARB_CLK_CTRL_CLK_GATING_EN_SHFT = 0x0, -+}; -+ -+#define S_ARB_MODE_ADDR(b, n) \ -+ (S_ARB_REG_BASE(b) + (0x8000 * (n)) + 0x00000210) -+enum bimc_s_arb_mode { -+ S_ARB_MODE_RMSK = 0xf0000001, -+ S_ARB_MODE_WR_GRANTS_AHEAD_BMSK = 0xf0000000, -+ S_ARB_MODE_WR_GRANTS_AHEAD_SHFT = 0x1c, -+ S_ARB_MODE_PRIO_RR_EN_BMSK = 0x1, -+ S_ARB_MODE_PRIO_RR_EN_SHFT = 0x0, -+}; -+ -+#define BKE_HEALTH_MASK \ -+ (M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_BMSK |\ -+ M_BKE_HEALTH_0_CONFIG_AREQPRIO_BMSK |\ -+ M_BKE_HEALTH_0_CONFIG_PRIOLVL_BMSK) -+ -+#define BKE_HEALTH_VAL(limit, areq, plvl) \ -+ ((((limit) << M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_SHFT) & \ -+ M_BKE_HEALTH_0_CONFIG_LIMIT_CMDS_BMSK) | \ -+ (((areq) << M_BKE_HEALTH_0_CONFIG_AREQPRIO_SHFT) & \ -+ M_BKE_HEALTH_0_CONFIG_AREQPRIO_BMSK) | \ -+ (((plvl) << M_BKE_HEALTH_0_CONFIG_PRIOLVL_SHFT) & \ -+ M_BKE_HEALTH_0_CONFIG_PRIOLVL_BMSK)) -+ -+#define MAX_GRANT_PERIOD \ -+ (M_BKE_GP_GP_BMSK >> \ -+ M_BKE_GP_GP_SHFT) -+ -+#define MAX_GC \ -+ (M_BKE_GC_GC_BMSK >> \ -+ (M_BKE_GC_GC_SHFT + 1)) -+ -+static int bimc_div(int64_t *a, uint32_t b) -+{ -+ if ((*a > 0) && (*a < b)) { -+ *a = 0; -+ return 1; -+ } else { -+ return do_div(*a, b); -+ } -+} -+ -+#define ENABLE(val) ((val) == 1 ? 1 : 0) -+void msm_bus_bimc_set_mas_clk_gate(struct msm_bus_bimc_info *binfo, -+ uint32_t mas_index, struct msm_bus_bimc_clk_gate *bgate) -+{ -+ uint32_t val, mask, reg_val; -+ void __iomem *addr; -+ -+ reg_val = readl_relaxed(M_CLK_CTRL_ADDR(binfo->base, -+ mas_index)) & M_CLK_CTRL_RMSK; -+ addr = M_CLK_CTRL_ADDR(binfo->base, mas_index); -+ mask = (M_CLK_CTRL_MAS_CLK_GATING_EN_BMSK | -+ M_CLK_CTRL_CORE_CLK_GATING_EN_BMSK); -+ val = (bgate->core_clk_gate_en << -+ M_CLK_CTRL_MAS_CLK_GATING_EN_SHFT) | -+ bgate->port_clk_gate_en; -+ writel_relaxed(((reg_val & (~mask)) | (val & mask)), addr); -+ /* Ensure clock gating enable mask is set before exiting */ -+ wmb(); -+} -+ -+void msm_bus_bimc_arb_en(struct msm_bus_bimc_info *binfo, -+ uint32_t slv_index, bool en) -+{ -+ uint32_t reg_val, reg_mask_val, enable, val; -+ -+ reg_mask_val = (readl_relaxed(S_ARB_CONFIG_INFO_0_ADDR(binfo-> -+ base, slv_index)) & S_ARB_CONFIG_INFO_0_FUNC_BMSK) -+ >> S_ARB_CONFIG_INFO_0_FUNC_SHFT; -+ enable = ENABLE(en); -+ val = enable << S_ARB_MODE_PRIO_RR_EN_SHFT; -+ if (reg_mask_val == BIMC_ARB_MODE_PRIORITY_RR) { -+ reg_val = readl_relaxed(S_ARB_CONFIG_INFO_0_ADDR(binfo-> -+ base, slv_index)) & S_ARB_MODE_RMSK; -+ writel_relaxed(((reg_val & (~(S_ARB_MODE_PRIO_RR_EN_BMSK))) | -+ (val & S_ARB_MODE_PRIO_RR_EN_BMSK)), -+ S_ARB_MODE_ADDR(binfo->base, slv_index)); -+ /* Ensure arbitration mode is set before returning */ -+ wmb(); -+ } -+} -+ -+static void set_qos_mode(void __iomem *baddr, uint32_t index, uint32_t val0, -+ uint32_t val1, uint32_t val2) -+{ -+ uint32_t reg_val, val; -+ -+ reg_val = readl_relaxed(M_PRIOLVL_OVERRIDE_ADDR(baddr, -+ index)) & M_PRIOLVL_OVERRIDE_RMSK; -+ val = val0 << M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_SHFT; -+ writel_relaxed(((reg_val & ~(M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_BMSK)) -+ | (val & M_PRIOLVL_OVERRIDE_OVERRIDE_PRIOLVL_BMSK)), -+ M_PRIOLVL_OVERRIDE_ADDR(baddr, index)); -+ reg_val = readl_relaxed(M_RD_CMD_OVERRIDE_ADDR(baddr, index)) & -+ M_RD_CMD_OVERRIDE_RMSK; -+ val = val1 << M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT; -+ writel_relaxed(((reg_val & ~(M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK -+ )) | (val & M_RD_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK)), -+ M_RD_CMD_OVERRIDE_ADDR(baddr, index)); -+ reg_val = readl_relaxed(M_WR_CMD_OVERRIDE_ADDR(baddr, index)) & -+ M_WR_CMD_OVERRIDE_RMSK; -+ val = val2 << M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_SHFT; -+ writel_relaxed(((reg_val & ~(M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK -+ )) | (val & M_WR_CMD_OVERRIDE_OVERRIDE_AREQPRIO_BMSK)), -+ M_WR_CMD_OVERRIDE_ADDR(baddr, index)); -+ /* Ensure the priority register writes go through */ -+ wmb(); -+} -+ -+static void msm_bus_bimc_set_qos_mode(void __iomem *base, -+ uint32_t mas_index, uint8_t qmode_sel) -+{ -+ uint32_t reg_val, val; -+ -+ switch (qmode_sel) { -+ case BIMC_QOS_MODE_FIXED: -+ reg_val = readl_relaxed(M_BKE_EN_ADDR(base, -+ mas_index)); -+ writel_relaxed((reg_val & (~M_BKE_EN_EN_BMSK)), -+ M_BKE_EN_ADDR(base, mas_index)); -+ /* Ensure that the book-keeping register writes -+ * go through before setting QoS mode. -+ * QoS mode registers might write beyond 1K -+ * boundary in future -+ */ -+ wmb(); -+ set_qos_mode(base, mas_index, 1, 1, 1); -+ break; -+ -+ case BIMC_QOS_MODE_BYPASS: -+ reg_val = readl_relaxed(M_BKE_EN_ADDR(base, -+ mas_index)); -+ writel_relaxed((reg_val & (~M_BKE_EN_EN_BMSK)), -+ M_BKE_EN_ADDR(base, mas_index)); -+ /* Ensure that the book-keeping register writes -+ * go through before setting QoS mode. -+ * QoS mode registers might write beyond 1K -+ * boundary in future -+ */ -+ wmb(); -+ set_qos_mode(base, mas_index, 0, 0, 0); -+ break; -+ -+ case BIMC_QOS_MODE_REGULATOR: -+ case BIMC_QOS_MODE_LIMITER: -+ set_qos_mode(base, mas_index, 0, 0, 0); -+ reg_val = readl_relaxed(M_BKE_EN_ADDR(base, -+ mas_index)); -+ val = 1 << M_BKE_EN_EN_SHFT; -+ /* Ensure that the book-keeping register writes -+ * go through before setting QoS mode. -+ * QoS mode registers might write beyond 1K -+ * boundary in future -+ */ -+ wmb(); -+ writel_relaxed(((reg_val & (~M_BKE_EN_EN_BMSK)) | (val & -+ M_BKE_EN_EN_BMSK)), M_BKE_EN_ADDR(base, -+ mas_index)); -+ break; -+ default: -+ break; -+ } -+} -+ -+static void set_qos_prio_rl(void __iomem *addr, uint32_t rmsk, -+ uint8_t index, struct msm_bus_bimc_qos_mode *qmode) -+{ -+ uint32_t reg_val, val0, val; -+ -+ /* Note, addr is already passed with right mas_index */ -+ reg_val = readl_relaxed(addr) & rmsk; -+ val0 = BKE_HEALTH_VAL(qmode->rl.qhealth[index].limit_commands, -+ qmode->rl.qhealth[index].areq_prio, -+ qmode->rl.qhealth[index].prio_level); -+ val = ((reg_val & (~(BKE_HEALTH_MASK))) | (val0 & BKE_HEALTH_MASK)); -+ writel_relaxed(val, addr); -+ /* Ensure that priority for regulator/limiter modes are -+ * set before returning -+ */ -+ wmb(); -+ -+} -+ -+static void msm_bus_bimc_set_qos_prio(void __iomem *base, -+ uint32_t mas_index, uint8_t qmode_sel, -+ struct msm_bus_bimc_qos_mode *qmode) -+{ -+ uint32_t reg_val, val; -+ -+ switch (qmode_sel) { -+ case BIMC_QOS_MODE_FIXED: -+ reg_val = readl_relaxed(M_PRIOLVL_OVERRIDE_ADDR( -+ base, mas_index)) & M_PRIOLVL_OVERRIDE_RMSK; -+ val = qmode->fixed.prio_level << -+ M_PRIOLVL_OVERRIDE_SHFT; -+ writel_relaxed(((reg_val & -+ ~(M_PRIOLVL_OVERRIDE_BMSK)) | (val -+ & M_PRIOLVL_OVERRIDE_BMSK)), -+ M_PRIOLVL_OVERRIDE_ADDR(base, mas_index)); -+ -+ reg_val = readl_relaxed(M_RD_CMD_OVERRIDE_ADDR( -+ base, mas_index)) & M_RD_CMD_OVERRIDE_RMSK; -+ val = qmode->fixed.areq_prio_rd << -+ M_RD_CMD_OVERRIDE_AREQPRIO_SHFT; -+ writel_relaxed(((reg_val & ~(M_RD_CMD_OVERRIDE_AREQPRIO_BMSK)) -+ | (val & M_RD_CMD_OVERRIDE_AREQPRIO_BMSK)), -+ M_RD_CMD_OVERRIDE_ADDR(base, mas_index)); -+ -+ reg_val = readl_relaxed(M_WR_CMD_OVERRIDE_ADDR( -+ base, mas_index)) & M_WR_CMD_OVERRIDE_RMSK; -+ val = qmode->fixed.areq_prio_wr << -+ M_WR_CMD_OVERRIDE_AREQPRIO_SHFT; -+ writel_relaxed(((reg_val & ~(M_WR_CMD_OVERRIDE_AREQPRIO_BMSK)) -+ | (val & M_WR_CMD_OVERRIDE_AREQPRIO_BMSK)), -+ M_WR_CMD_OVERRIDE_ADDR(base, mas_index)); -+ /* Ensure that fixed mode register writes go through -+ * before returning -+ */ -+ wmb(); -+ break; -+ -+ case BIMC_QOS_MODE_REGULATOR: -+ case BIMC_QOS_MODE_LIMITER: -+ set_qos_prio_rl(M_BKE_HEALTH_3_CONFIG_ADDR(base, -+ mas_index), M_BKE_HEALTH_3_CONFIG_RMSK, 3, qmode); -+ set_qos_prio_rl(M_BKE_HEALTH_2_CONFIG_ADDR(base, -+ mas_index), M_BKE_HEALTH_2_CONFIG_RMSK, 2, qmode); -+ set_qos_prio_rl(M_BKE_HEALTH_1_CONFIG_ADDR(base, -+ mas_index), M_BKE_HEALTH_1_CONFIG_RMSK, 1, qmode); -+ set_qos_prio_rl(M_BKE_HEALTH_0_CONFIG_ADDR(base, -+ mas_index), M_BKE_HEALTH_0_CONFIG_RMSK, 0 , qmode); -+ break; -+ case BIMC_QOS_MODE_BYPASS: -+ default: -+ break; -+ } -+} -+ -+static void set_qos_bw_regs(void __iomem *baddr, uint32_t mas_index, -+ int32_t th, int32_t tm, int32_t tl, uint32_t gp, -+ uint32_t gc) -+{ -+ int32_t reg_val, val; -+ int32_t bke_reg_val; -+ int16_t val2; -+ -+ /* Disable BKE before writing to registers as per spec */ -+ bke_reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index)); -+ writel_relaxed((bke_reg_val & ~(M_BKE_EN_EN_BMSK)), -+ M_BKE_EN_ADDR(baddr, mas_index)); -+ -+ /* Write values of registers calculated */ -+ reg_val = readl_relaxed(M_BKE_GP_ADDR(baddr, mas_index)) -+ & M_BKE_GP_RMSK; -+ val = gp << M_BKE_GP_GP_SHFT; -+ writel_relaxed(((reg_val & ~(M_BKE_GP_GP_BMSK)) | (val & -+ M_BKE_GP_GP_BMSK)), M_BKE_GP_ADDR(baddr, mas_index)); -+ -+ reg_val = readl_relaxed(M_BKE_GC_ADDR(baddr, mas_index)) & -+ M_BKE_GC_RMSK; -+ val = gc << M_BKE_GC_GC_SHFT; -+ writel_relaxed(((reg_val & ~(M_BKE_GC_GC_BMSK)) | (val & -+ M_BKE_GC_GC_BMSK)), M_BKE_GC_ADDR(baddr, mas_index)); -+ -+ reg_val = readl_relaxed(M_BKE_THH_ADDR(baddr, mas_index)) & -+ M_BKE_THH_RMSK; -+ val = th << M_BKE_THH_THRESH_SHFT; -+ writel_relaxed(((reg_val & ~(M_BKE_THH_THRESH_BMSK)) | (val & -+ M_BKE_THH_THRESH_BMSK)), M_BKE_THH_ADDR(baddr, mas_index)); -+ -+ reg_val = readl_relaxed(M_BKE_THM_ADDR(baddr, mas_index)) & -+ M_BKE_THM_RMSK; -+ val2 = tm << M_BKE_THM_THRESH_SHFT; -+ writel_relaxed(((reg_val & ~(M_BKE_THM_THRESH_BMSK)) | (val2 & -+ M_BKE_THM_THRESH_BMSK)), M_BKE_THM_ADDR(baddr, mas_index)); -+ -+ reg_val = readl_relaxed(M_BKE_THL_ADDR(baddr, mas_index)) & -+ M_BKE_THL_RMSK; -+ val2 = tl << M_BKE_THL_THRESH_SHFT; -+ writel_relaxed(((reg_val & ~(M_BKE_THL_THRESH_BMSK)) | -+ (val2 & M_BKE_THL_THRESH_BMSK)), M_BKE_THL_ADDR(baddr, -+ mas_index)); -+ -+ /* Ensure that all bandwidth register writes have completed -+ * before returning -+ */ -+ wmb(); -+} -+ -+static void msm_bus_bimc_set_qos_bw(void __iomem *base, uint32_t qos_freq, -+ uint32_t mas_index, struct msm_bus_bimc_qos_bw *qbw) -+{ -+ uint32_t bke_en; -+ -+ /* Validate QOS Frequency */ -+ if (qos_freq == 0) { -+ MSM_BUS_DBG("Zero frequency\n"); -+ return; -+ } -+ -+ /* Get enable bit for BKE before programming the period */ -+ bke_en = (readl_relaxed(M_BKE_EN_ADDR(base, mas_index)) & -+ M_BKE_EN_EN_BMSK) >> M_BKE_EN_EN_SHFT; -+ -+ /* Only calculate if there's a requested bandwidth and window */ -+ if (qbw->bw && qbw->ws) { -+ int64_t th, tm, tl; -+ uint32_t gp, gc; -+ int64_t gp_nominal, gp_required, gp_calc, data, temp; -+ int64_t win = qbw->ws * qos_freq; -+ temp = win; -+ /* -+ * Calculate nominal grant period defined by requested -+ * window size. -+ * Ceil this value to max grant period. -+ */ -+ bimc_div(&temp, 1000000); -+ gp_nominal = min_t(uint64_t, MAX_GRANT_PERIOD, temp); -+ /* -+ * Calculate max window size, defined by bw request. -+ * Units: (KHz, MB/s) -+ */ -+ gp_calc = MAX_GC * qos_freq * 1000; -+ gp_required = gp_calc; -+ bimc_div(&gp_required, qbw->bw); -+ -+ /* User min of two grant periods */ -+ gp = min_t(int64_t, gp_nominal, gp_required); -+ -+ /* Calculate bandwith in grants and ceil. */ -+ temp = qbw->bw * gp; -+ data = qos_freq * 1000; -+ bimc_div(&temp, data); -+ gc = min_t(int64_t, MAX_GC, temp); -+ -+ /* Calculate thresholds */ -+ th = qbw->bw - qbw->thh; -+ tm = qbw->bw - qbw->thm; -+ tl = qbw->bw - qbw->thl; -+ -+ th = th * gp; -+ bimc_div(&th, data); -+ tm = tm * gp; -+ bimc_div(&tm, data); -+ tl = tl * gp; -+ bimc_div(&tl, data); -+ -+ MSM_BUS_DBG("BIMC: BW: mas_index: %d, th: %llu tm: %llu\n", -+ mas_index, th, tm); -+ MSM_BUS_DBG("BIMC: tl: %llu gp:%u gc: %u bke_en: %u\n", -+ tl, gp, gc, bke_en); -+ set_qos_bw_regs(base, mas_index, th, tm, tl, gp, gc); -+ } else -+ /* Clear bandwidth registers */ -+ set_qos_bw_regs(base, mas_index, 0, 0, 0, 0, 0); -+} -+ -+static int msm_bus_bimc_allocate_commit_data(struct msm_bus_fabric_registration -+ *fab_pdata, void **cdata, int ctx) -+{ -+ struct msm_bus_bimc_commit **cd = (struct msm_bus_bimc_commit **)cdata; -+ struct msm_bus_bimc_info *binfo = -+ (struct msm_bus_bimc_info *)fab_pdata->hw_data; -+ -+ MSM_BUS_DBG("Allocating BIMC commit data\n"); -+ *cd = kzalloc(sizeof(struct msm_bus_bimc_commit), GFP_KERNEL); -+ if (!*cd) { -+ MSM_BUS_DBG("Couldn't alloc mem for cdata\n"); -+ return -ENOMEM; -+ } -+ -+ (*cd)->mas = binfo->cdata[ctx].mas; -+ (*cd)->slv = binfo->cdata[ctx].slv; -+ -+ return 0; -+} -+ -+static void *msm_bus_bimc_allocate_bimc_data(struct platform_device *pdev, -+ struct msm_bus_fabric_registration *fab_pdata) -+{ -+ struct resource *bimc_mem; -+ struct resource *bimc_io; -+ struct msm_bus_bimc_info *binfo; -+ int i; -+ -+ MSM_BUS_DBG("Allocating BIMC data\n"); -+ binfo = kzalloc(sizeof(struct msm_bus_bimc_info), GFP_KERNEL); -+ if (!binfo) { -+ WARN(!binfo, "Couldn't alloc mem for bimc_info\n"); -+ return NULL; -+ } -+ -+ binfo->qos_freq = fab_pdata->qos_freq; -+ -+ binfo->params.nmasters = fab_pdata->nmasters; -+ binfo->params.nslaves = fab_pdata->nslaves; -+ binfo->params.bus_id = fab_pdata->id; -+ -+ for (i = 0; i < NUM_CTX; i++) { -+ binfo->cdata[i].mas = kzalloc(sizeof(struct -+ msm_bus_node_hw_info) * fab_pdata->nmasters * 2, -+ GFP_KERNEL); -+ if (!binfo->cdata[i].mas) { -+ MSM_BUS_ERR("Couldn't alloc mem for bimc master hw\n"); -+ kfree(binfo); -+ return NULL; -+ } -+ -+ binfo->cdata[i].slv = kzalloc(sizeof(struct -+ msm_bus_node_hw_info) * fab_pdata->nslaves * 2, -+ GFP_KERNEL); -+ if (!binfo->cdata[i].slv) { -+ MSM_BUS_DBG("Couldn't alloc mem for bimc slave hw\n"); -+ kfree(binfo->cdata[i].mas); -+ kfree(binfo); -+ return NULL; -+ } -+ } -+ -+ if (fab_pdata->virt) { -+ MSM_BUS_DBG("Don't get memory regions for virtual fabric\n"); -+ goto skip_mem; -+ } -+ -+ bimc_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!bimc_mem) { -+ MSM_BUS_ERR("Cannot get BIMC Base address\n"); -+ kfree(binfo); -+ return NULL; -+ } -+ -+ bimc_io = request_mem_region(bimc_mem->start, -+ resource_size(bimc_mem), pdev->name); -+ if (!bimc_io) { -+ MSM_BUS_ERR("BIMC memory unavailable\n"); -+ kfree(binfo); -+ return NULL; -+ } -+ -+ binfo->base = ioremap(bimc_mem->start, resource_size(bimc_mem)); -+ if (!binfo->base) { -+ MSM_BUS_ERR("IOremap failed for BIMC!\n"); -+ release_mem_region(bimc_mem->start, resource_size(bimc_mem)); -+ kfree(binfo); -+ return NULL; -+ } -+ -+skip_mem: -+ fab_pdata->hw_data = (void *)binfo; -+ return (void *)binfo; -+} -+ -+static void free_commit_data(void *cdata) -+{ -+ struct msm_bus_bimc_commit *cd = (struct msm_bus_bimc_commit *)cdata; -+ -+ kfree(cd->mas); -+ kfree(cd->slv); -+ kfree(cd); -+} -+ -+static void bke_switch( -+ void __iomem *baddr, uint32_t mas_index, bool req, int mode) -+{ -+ uint32_t reg_val, val, cur_val; -+ -+ val = req << M_BKE_EN_EN_SHFT; -+ reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index)); -+ cur_val = reg_val & M_BKE_EN_RMSK; -+ if (val == cur_val) -+ return; -+ -+ if (!req && mode == BIMC_QOS_MODE_FIXED) -+ set_qos_mode(baddr, mas_index, 1, 1, 1); -+ -+ writel_relaxed(((reg_val & ~(M_BKE_EN_EN_BMSK)) | (val & -+ M_BKE_EN_EN_BMSK)), M_BKE_EN_ADDR(baddr, mas_index)); -+ /* Make sure BKE on/off goes through before changing priorities */ -+ wmb(); -+ -+ if (req) -+ set_qos_mode(baddr, mas_index, 0, 0, 0); -+} -+ -+static void bimc_set_static_qos_bw(void __iomem *base, unsigned int qos_freq, -+ int mport, struct msm_bus_bimc_qos_bw *qbw) -+{ -+ int32_t bw_mbps, thh = 0, thm, thl, gc; -+ int32_t gp; -+ u64 temp; -+ -+ if (qos_freq == 0) { -+ MSM_BUS_DBG("No QoS Frequency.\n"); -+ return; -+ } -+ -+ if (!(qbw->bw && qbw->gp)) { -+ MSM_BUS_DBG("No QoS Bandwidth or Window size\n"); -+ return; -+ } -+ -+ /* Convert bandwidth to MBPS */ -+ temp = qbw->bw; -+ bimc_div(&temp, 1000000); -+ bw_mbps = temp; -+ -+ /* Grant period in clock cycles -+ * Grant period from bandwidth structure -+ * is in nano seconds, QoS freq is in KHz. -+ * Divide by 1000 to get clock cycles. -+ */ -+ gp = (qos_freq * qbw->gp) / (1000 * NSEC_PER_USEC); -+ -+ /* Grant count = BW in MBps * Grant period -+ * in micro seconds -+ */ -+ gc = bw_mbps * (qbw->gp / NSEC_PER_USEC); -+ gc = min(gc, MAX_GC); -+ -+ /* Medium threshold = -((Medium Threshold percentage * -+ * Grant count) / 100) -+ */ -+ thm = -((qbw->thmp * gc) / 100); -+ qbw->thm = thm; -+ -+ /* Low threshold = -(Grant count) */ -+ thl = -gc; -+ qbw->thl = thl; -+ -+ MSM_BUS_DBG("%s: BKE parameters: gp %d, gc %d, thm %d thl %d thh %d", -+ __func__, gp, gc, thm, thl, thh); -+ -+ trace_bus_bke_params(gc, gp, thl, thm, thl); -+ set_qos_bw_regs(base, mport, thh, thm, thl, gp, gc); -+} -+ -+static void msm_bus_bimc_config_master( -+ struct msm_bus_fabric_registration *fab_pdata, -+ struct msm_bus_inode_info *info, -+ uint64_t req_clk, uint64_t req_bw) -+{ -+ int mode, i, ports; -+ struct msm_bus_bimc_info *binfo; -+ uint64_t bw = 0; -+ -+ binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data; -+ ports = info->node_info->num_mports; -+ -+ /** -+ * Here check the details of dual configuration. -+ * Take actions based on different modes. -+ * Check for threshold if limiter mode, etc. -+ */ -+ -+ if (req_clk <= info->node_info->th[0]) { -+ mode = info->node_info->mode; -+ bw = info->node_info->bimc_bw[0]; -+ } else if ((info->node_info->num_thresh > 1) && -+ (req_clk <= info->node_info->th[1])) { -+ mode = info->node_info->mode; -+ bw = info->node_info->bimc_bw[1]; -+ } else -+ mode = info->node_info->mode_thresh; -+ -+ switch (mode) { -+ case BIMC_QOS_MODE_BYPASS: -+ case BIMC_QOS_MODE_FIXED: -+ for (i = 0; i < ports; i++) -+ bke_switch(binfo->base, info->node_info->qport[i], -+ BKE_OFF, mode); -+ break; -+ case BIMC_QOS_MODE_REGULATOR: -+ case BIMC_QOS_MODE_LIMITER: -+ for (i = 0; i < ports; i++) { -+ /* If not in fixed mode, update bandwidth */ -+ if ((info->node_info->cur_lim_bw != bw) -+ && (mode != BIMC_QOS_MODE_FIXED)) { -+ struct msm_bus_bimc_qos_bw qbw; -+ qbw.ws = info->node_info->ws; -+ qbw.bw = bw; -+ qbw.gp = info->node_info->bimc_gp; -+ qbw.thmp = info->node_info->bimc_thmp; -+ bimc_set_static_qos_bw(binfo->base, -+ binfo->qos_freq, -+ info->node_info->qport[i], &qbw); -+ info->node_info->cur_lim_bw = bw; -+ MSM_BUS_DBG("%s: Qos is %d reqclk %llu bw %llu", -+ __func__, mode, req_clk, bw); -+ } -+ bke_switch(binfo->base, info->node_info->qport[i], -+ BKE_ON, mode); -+ } -+ break; -+ default: -+ break; -+ } -+} -+ -+static void msm_bus_bimc_update_bw(struct msm_bus_inode_info *hop, -+ struct msm_bus_inode_info *info, -+ struct msm_bus_fabric_registration *fab_pdata, -+ void *sel_cdata, int *master_tiers, -+ int64_t add_bw) -+{ -+ struct msm_bus_bimc_info *binfo; -+ struct msm_bus_bimc_qos_bw qbw; -+ int i; -+ int64_t bw; -+ int ports = info->node_info->num_mports; -+ struct msm_bus_bimc_commit *sel_cd = -+ (struct msm_bus_bimc_commit *)sel_cdata; -+ -+ MSM_BUS_DBG("BIMC: Update bw for ID %d, with IID: %d: %lld\n", -+ info->node_info->id, info->node_info->priv_id, add_bw); -+ -+ binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data; -+ -+ if (info->node_info->num_mports == 0) { -+ MSM_BUS_DBG("BIMC: Skip Master BW\n"); -+ goto skip_mas_bw; -+ } -+ -+ ports = info->node_info->num_mports; -+ bw = INTERLEAVED_BW(fab_pdata, add_bw, ports); -+ -+ for (i = 0; i < ports; i++) { -+ sel_cd->mas[info->node_info->masterp[i]].bw += bw; -+ sel_cd->mas[info->node_info->masterp[i]].hw_id = -+ info->node_info->mas_hw_id; -+ MSM_BUS_DBG("BIMC: Update mas_bw for ID: %d -> %llu\n", -+ info->node_info->priv_id, -+ sel_cd->mas[info->node_info->masterp[i]].bw); -+ if (info->node_info->hw_sel == MSM_BUS_RPM) -+ sel_cd->mas[info->node_info->masterp[i]].dirty = 1; -+ else { -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No qos ports to update!\n"); -+ break; -+ } -+ if (!(info->node_info->mode == BIMC_QOS_MODE_REGULATOR) -+ || (info->node_info->mode == -+ BIMC_QOS_MODE_LIMITER)) { -+ MSM_BUS_DBG("Skip QoS reg programming\n"); -+ break; -+ } -+ -+ MSM_BUS_DBG("qport: %d\n", info->node_info->qport[i]); -+ qbw.bw = sel_cd->mas[info->node_info->masterp[i]].bw; -+ qbw.ws = info->node_info->ws; -+ /* Threshold low = 90% of bw */ -+ qbw.thl = div_s64((90 * bw), 100); -+ /* Threshold medium = bw */ -+ qbw.thm = bw; -+ /* Threshold high = 10% more than bw */ -+ qbw.thh = div_s64((110 * bw), 100); -+ /* Check if info is a shared master. -+ * If it is, mark it dirty -+ * If it isn't, then set QOS Bandwidth. -+ * Also if dual-conf is set, don't program bw regs. -+ **/ -+ if (!info->node_info->dual_conf && -+ ((info->node_info->mode == BIMC_QOS_MODE_LIMITER) || -+ (info->node_info->mode == BIMC_QOS_MODE_REGULATOR))) -+ msm_bus_bimc_set_qos_bw(binfo->base, -+ binfo->qos_freq, -+ info->node_info->qport[i], &qbw); -+ } -+ } -+ -+skip_mas_bw: -+ ports = hop->node_info->num_sports; -+ MSM_BUS_DBG("BIMC: ID: %d, Sports: %d\n", hop->node_info->priv_id, -+ ports); -+ -+ for (i = 0; i < ports; i++) { -+ sel_cd->slv[hop->node_info->slavep[i]].bw += add_bw; -+ sel_cd->slv[hop->node_info->slavep[i]].hw_id = -+ hop->node_info->slv_hw_id; -+ MSM_BUS_DBG("BIMC: Update slave_bw: ID: %d -> %llu\n", -+ hop->node_info->priv_id, -+ sel_cd->slv[hop->node_info->slavep[i]].bw); -+ MSM_BUS_DBG("BIMC: Update slave_bw: index: %d\n", -+ hop->node_info->slavep[i]); -+ /* Check if hop is a shared slave. -+ * If it is, mark it dirty -+ * If it isn't, then nothing to be done as the -+ * slaves are in bypass mode. -+ **/ -+ if (hop->node_info->hw_sel == MSM_BUS_RPM) { -+ MSM_BUS_DBG("Slave dirty: %d, slavep: %d\n", -+ hop->node_info->priv_id, -+ hop->node_info->slavep[i]); -+ sel_cd->slv[hop->node_info->slavep[i]].dirty = 1; -+ } -+ } -+} -+ -+static int msm_bus_bimc_commit(struct msm_bus_fabric_registration -+ *fab_pdata, void *hw_data, void **cdata) -+{ -+ MSM_BUS_DBG("\nReached BIMC Commit\n"); -+ msm_bus_remote_hw_commit(fab_pdata, hw_data, cdata); -+ return 0; -+} -+ -+static void msm_bus_bimc_config_limiter( -+ struct msm_bus_fabric_registration *fab_pdata, -+ struct msm_bus_inode_info *info) -+{ -+ struct msm_bus_bimc_info *binfo; -+ int mode, i, ports; -+ -+ binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data; -+ ports = info->node_info->num_mports; -+ -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No QoS Ports to init\n"); -+ return; -+ } -+ -+ if (info->cur_lim_bw) -+ mode = BIMC_QOS_MODE_LIMITER; -+ else -+ mode = info->node_info->mode; -+ -+ switch (mode) { -+ case BIMC_QOS_MODE_BYPASS: -+ case BIMC_QOS_MODE_FIXED: -+ for (i = 0; i < ports; i++) -+ bke_switch(binfo->base, info->node_info->qport[i], -+ BKE_OFF, mode); -+ break; -+ case BIMC_QOS_MODE_REGULATOR: -+ case BIMC_QOS_MODE_LIMITER: -+ if (info->cur_lim_bw != info->cur_prg_bw) { -+ MSM_BUS_DBG("Enabled BKE throttling node %d to %llu\n", -+ info->node_info->id, info->cur_lim_bw); -+ trace_bus_bimc_config_limiter(info->node_info->id, -+ info->cur_lim_bw); -+ for (i = 0; i < ports; i++) { -+ /* If not in fixed mode, update bandwidth */ -+ struct msm_bus_bimc_qos_bw qbw; -+ -+ qbw.ws = info->node_info->ws; -+ qbw.bw = info->cur_lim_bw; -+ qbw.gp = info->node_info->bimc_gp; -+ qbw.thmp = info->node_info->bimc_thmp; -+ bimc_set_static_qos_bw(binfo->base, -+ binfo->qos_freq, -+ info->node_info->qport[i], &qbw); -+ bke_switch(binfo->base, -+ info->node_info->qport[i], -+ BKE_ON, mode); -+ info->cur_prg_bw = qbw.bw; -+ } -+ } -+ break; -+ default: -+ break; -+ } -+} -+ -+static void bimc_init_mas_reg(struct msm_bus_bimc_info *binfo, -+ struct msm_bus_inode_info *info, -+ struct msm_bus_bimc_qos_mode *qmode, int mode) -+{ -+ int i; -+ -+ switch (mode) { -+ case BIMC_QOS_MODE_FIXED: -+ qmode->fixed.prio_level = info->node_info->prio_lvl; -+ qmode->fixed.areq_prio_rd = info->node_info->prio_rd; -+ qmode->fixed.areq_prio_wr = info->node_info->prio_wr; -+ break; -+ case BIMC_QOS_MODE_LIMITER: -+ qmode->rl.qhealth[0].limit_commands = 1; -+ qmode->rl.qhealth[1].limit_commands = 0; -+ qmode->rl.qhealth[2].limit_commands = 0; -+ qmode->rl.qhealth[3].limit_commands = 0; -+ break; -+ default: -+ break; -+ } -+ -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No QoS Ports to init\n"); -+ return; -+ } -+ -+ for (i = 0; i < info->node_info->num_mports; i++) { -+ /* If not in bypass mode, update priority */ -+ if (mode != BIMC_QOS_MODE_BYPASS) { -+ msm_bus_bimc_set_qos_prio(binfo->base, -+ info->node_info-> -+ qport[i], mode, qmode); -+ -+ /* If not in fixed mode, update bandwidth */ -+ if (mode != BIMC_QOS_MODE_FIXED) { -+ struct msm_bus_bimc_qos_bw qbw; -+ qbw.ws = info->node_info->ws; -+ qbw.bw = info->node_info->bimc_bw[0]; -+ qbw.gp = info->node_info->bimc_gp; -+ qbw.thmp = info->node_info->bimc_thmp; -+ bimc_set_static_qos_bw(binfo->base, -+ binfo->qos_freq, -+ info->node_info->qport[i], &qbw); -+ } -+ } -+ -+ /* set mode */ -+ msm_bus_bimc_set_qos_mode(binfo->base, -+ info->node_info->qport[i], -+ mode); -+ } -+} -+ -+static void init_health_regs(struct msm_bus_bimc_info *binfo, -+ struct msm_bus_inode_info *info, -+ struct msm_bus_bimc_qos_mode *qmode, -+ int mode) -+{ -+ int i; -+ -+ if (mode == BIMC_QOS_MODE_LIMITER) { -+ qmode->rl.qhealth[0].limit_commands = 1; -+ qmode->rl.qhealth[1].limit_commands = 0; -+ qmode->rl.qhealth[2].limit_commands = 0; -+ qmode->rl.qhealth[3].limit_commands = 0; -+ -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No QoS Ports to init\n"); -+ return; -+ } -+ -+ for (i = 0; i < info->node_info->num_mports; i++) { -+ /* If not in bypass mode, update priority */ -+ if (mode != BIMC_QOS_MODE_BYPASS) -+ msm_bus_bimc_set_qos_prio(binfo->base, -+ info->node_info->qport[i], mode, qmode); -+ } -+ } -+} -+ -+ -+static int msm_bus_bimc_mas_init(struct msm_bus_bimc_info *binfo, -+ struct msm_bus_inode_info *info) -+{ -+ struct msm_bus_bimc_qos_mode *qmode; -+ qmode = kzalloc(sizeof(struct msm_bus_bimc_qos_mode), -+ GFP_KERNEL); -+ if (!qmode) { -+ MSM_BUS_WARN("Couldn't alloc prio data for node: %d\n", -+ info->node_info->id); -+ return -ENOMEM; -+ } -+ -+ info->hw_data = (void *)qmode; -+ -+ /** -+ * If the master supports dual configuration, -+ * configure registers for both modes -+ */ -+ if (info->node_info->dual_conf) -+ bimc_init_mas_reg(binfo, info, qmode, -+ info->node_info->mode_thresh); -+ else if (info->node_info->nr_lim) -+ init_health_regs(binfo, info, qmode, BIMC_QOS_MODE_LIMITER); -+ -+ bimc_init_mas_reg(binfo, info, qmode, info->node_info->mode); -+ return 0; -+} -+ -+static void msm_bus_bimc_node_init(void *hw_data, -+ struct msm_bus_inode_info *info) -+{ -+ struct msm_bus_bimc_info *binfo = -+ (struct msm_bus_bimc_info *)hw_data; -+ -+ if (!IS_SLAVE(info->node_info->priv_id) && -+ (info->node_info->hw_sel != MSM_BUS_RPM)) -+ msm_bus_bimc_mas_init(binfo, info); -+} -+ -+static int msm_bus_bimc_port_halt(uint32_t haltid, uint8_t mport) -+{ -+ return 0; -+} -+ -+static int msm_bus_bimc_port_unhalt(uint32_t haltid, uint8_t mport) -+{ -+ return 0; -+} -+ -+static int msm_bus_bimc_limit_mport(struct msm_bus_node_device_type *info, -+ void __iomem *qos_base, uint32_t qos_off, -+ uint32_t qos_delta, uint32_t qos_freq, -+ bool enable_lim, u64 lim_bw) -+{ -+ int mode; -+ int i; -+ -+ if (ZERO_OR_NULL_PTR(info->node_info->qport)) { -+ MSM_BUS_DBG("No QoS Ports to limit\n"); -+ return 0; -+ } -+ -+ if (enable_lim && lim_bw) { -+ mode = BIMC_QOS_MODE_LIMITER; -+ -+ if (!info->node_info->lim_bw) { -+ struct msm_bus_bimc_qos_mode qmode; -+ qmode.rl.qhealth[0].limit_commands = 1; -+ qmode.rl.qhealth[1].limit_commands = 0; -+ qmode.rl.qhealth[2].limit_commands = 0; -+ qmode.rl.qhealth[3].limit_commands = 0; -+ -+ for (i = 0; i < info->node_info->num_qports; i++) { -+ /* If not in bypass mode, update priority */ -+ if (mode != BIMC_QOS_MODE_BYPASS) -+ msm_bus_bimc_set_qos_prio(qos_base, -+ info->node_info->qport[i], mode, -+ &qmode); -+ } -+ } -+ -+ for (i = 0; i < info->node_info->num_qports; i++) { -+ struct msm_bus_bimc_qos_bw qbw; -+ /* If not in fixed mode, update bandwidth */ -+ if ((info->node_info->lim_bw != lim_bw)) { -+ qbw.ws = info->node_info->qos_params.ws; -+ qbw.bw = lim_bw; -+ qbw.gp = info->node_info->qos_params.gp; -+ qbw.thmp = info->node_info->qos_params.thmp; -+ bimc_set_static_qos_bw(qos_base, qos_freq, -+ info->node_info->qport[i], &qbw); -+ } -+ bke_switch(qos_base, info->node_info->qport[i], -+ BKE_ON, mode); -+ } -+ info->node_info->lim_bw = lim_bw; -+ } else { -+ mode = info->node_info->qos_params.mode; -+ for (i = 0; i < info->node_info->num_qports; i++) { -+ bke_switch(qos_base, info->node_info->qport[i], -+ BKE_OFF, mode); -+ } -+ } -+ info->node_info->qos_params.cur_mode = mode; -+ return 0; -+} -+ -+static bool msm_bus_bimc_update_bw_reg(int mode) -+{ -+ bool ret = false; -+ -+ if ((mode == BIMC_QOS_MODE_LIMITER) -+ || (mode == BIMC_QOS_MODE_REGULATOR)) -+ ret = true; -+ -+ return ret; -+} -+ -+static int msm_bus_bimc_qos_init(struct msm_bus_node_device_type *info, -+ void __iomem *qos_base, -+ uint32_t qos_off, uint32_t qos_delta, -+ uint32_t qos_freq) -+{ -+ int i; -+ struct msm_bus_bimc_qos_mode qmode; -+ -+ switch (info->node_info->qos_params.mode) { -+ case BIMC_QOS_MODE_FIXED: -+ qmode.fixed.prio_level = info->node_info->qos_params.prio_lvl; -+ qmode.fixed.areq_prio_rd = info->node_info->qos_params.prio_rd; -+ qmode.fixed.areq_prio_wr = info->node_info->qos_params.prio_wr; -+ break; -+ case BIMC_QOS_MODE_LIMITER: -+ qmode.rl.qhealth[0].limit_commands = 1; -+ qmode.rl.qhealth[1].limit_commands = 0; -+ qmode.rl.qhealth[2].limit_commands = 0; -+ qmode.rl.qhealth[3].limit_commands = 0; -+ break; -+ default: -+ break; -+ } -+ -+ if (ZERO_OR_NULL_PTR(info->node_info->qport)) { -+ MSM_BUS_DBG("No QoS Ports to init\n"); -+ return 0; -+ } -+ -+ for (i = 0; i < info->node_info->num_qports; i++) { -+ /* If not in bypass mode, update priority */ -+ if (info->node_info->qos_params.mode != BIMC_QOS_MODE_BYPASS) -+ msm_bus_bimc_set_qos_prio(qos_base, info->node_info-> -+ qport[i], info->node_info->qos_params.mode, -+ &qmode); -+ -+ /* set mode */ -+ if (info->node_info->qos_params.mode == BIMC_QOS_MODE_LIMITER) -+ bke_switch(qos_base, info->node_info->qport[i], -+ BKE_OFF, BIMC_QOS_MODE_FIXED); -+ else -+ msm_bus_bimc_set_qos_mode(qos_base, -+ info->node_info->qport[i], -+ info->node_info->qos_params.mode); -+ } -+ -+ return 0; -+} -+ -+static int msm_bus_bimc_set_bw(struct msm_bus_node_device_type *dev, -+ void __iomem *qos_base, uint32_t qos_off, -+ uint32_t qos_delta, uint32_t qos_freq) -+{ -+ struct msm_bus_bimc_qos_bw qbw; -+ int i; -+ int64_t bw = 0; -+ int ret = 0; -+ struct msm_bus_node_info_type *info = dev->node_info; -+ -+ if (info && info->num_qports && -+ ((info->qos_params.mode == BIMC_QOS_MODE_LIMITER) || -+ (info->qos_params.mode == BIMC_QOS_MODE_REGULATOR))) { -+ bw = msm_bus_div64(info->num_qports, -+ dev->node_ab.ab[DUAL_CTX]); -+ -+ for (i = 0; i < info->num_qports; i++) { -+ MSM_BUS_DBG("BIMC: Update mas_bw for ID: %d -> %llu\n", -+ info->id, bw); -+ -+ if (!info->qport) { -+ MSM_BUS_DBG("No qos ports to update!\n"); -+ break; -+ } -+ -+ qbw.bw = bw + info->qos_params.bw_buffer; -+ trace_bus_bimc_config_limiter(info->id, bw); -+ -+ /* Default to gp of 5us */ -+ qbw.gp = (info->qos_params.gp ? -+ info->qos_params.gp : 5000); -+ /* Default to thmp of 50% */ -+ qbw.thmp = (info->qos_params.thmp ? -+ info->qos_params.thmp : 50); -+ /* -+ * If the BW vote is 0 then set the QoS mode to -+ * Fixed. -+ */ -+ if (bw) { -+ bimc_set_static_qos_bw(qos_base, qos_freq, -+ info->qport[i], &qbw); -+ bke_switch(qos_base, info->qport[i], -+ BKE_ON, info->qos_params.mode); -+ } else { -+ bke_switch(qos_base, info->qport[i], -+ BKE_OFF, BIMC_QOS_MODE_FIXED); -+ } -+ } -+ } -+ return ret; -+} -+ -+int msm_bus_bimc_hw_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo) -+{ -+ /* Set interleaving to true by default */ -+ MSM_BUS_DBG("\nInitializing BIMC...\n"); -+ pdata->il_flag = true; -+ hw_algo->allocate_commit_data = msm_bus_bimc_allocate_commit_data; -+ hw_algo->allocate_hw_data = msm_bus_bimc_allocate_bimc_data; -+ hw_algo->node_init = msm_bus_bimc_node_init; -+ hw_algo->free_commit_data = free_commit_data; -+ hw_algo->update_bw = msm_bus_bimc_update_bw; -+ hw_algo->commit = msm_bus_bimc_commit; -+ hw_algo->port_halt = msm_bus_bimc_port_halt; -+ hw_algo->port_unhalt = msm_bus_bimc_port_unhalt; -+ hw_algo->config_master = msm_bus_bimc_config_master; -+ hw_algo->config_limiter = msm_bus_bimc_config_limiter; -+ hw_algo->update_bw_reg = msm_bus_bimc_update_bw_reg; -+ /* BIMC slaves are shared. Slave registers are set through RPM */ -+ if (!pdata->ahb) -+ pdata->rpm_enabled = 1; -+ return 0; -+} -+ -+int msm_bus_bimc_set_ops(struct msm_bus_node_device_type *bus_dev) -+{ -+ if (!bus_dev) -+ return -ENODEV; -+ else { -+ bus_dev->fabdev->noc_ops.qos_init = msm_bus_bimc_qos_init; -+ bus_dev->fabdev->noc_ops.set_bw = msm_bus_bimc_set_bw; -+ bus_dev->fabdev->noc_ops.limit_mport = msm_bus_bimc_limit_mport; -+ bus_dev->fabdev->noc_ops.update_bw_reg = -+ msm_bus_bimc_update_bw_reg; -+ } -+ return 0; -+} -+EXPORT_SYMBOL(msm_bus_bimc_set_ops); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_bimc.h -@@ -0,0 +1,127 @@ -+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _ARCH_ARM_MACH_MSM_BUS_BIMC_H -+#define _ARCH_ARM_MACH_MSM_BUS_BIMC_H -+ -+struct msm_bus_bimc_params { -+ uint32_t bus_id; -+ uint32_t addr_width; -+ uint32_t data_width; -+ uint32_t nmasters; -+ uint32_t nslaves; -+}; -+ -+struct msm_bus_bimc_commit { -+ struct msm_bus_node_hw_info *mas; -+ struct msm_bus_node_hw_info *slv; -+}; -+ -+struct msm_bus_bimc_info { -+ void __iomem *base; -+ uint32_t base_addr; -+ uint32_t qos_freq; -+ struct msm_bus_bimc_params params; -+ struct msm_bus_bimc_commit cdata[NUM_CTX]; -+}; -+ -+struct msm_bus_bimc_node { -+ uint32_t conn_mask; -+ uint32_t data_width; -+ uint8_t slv_arb_mode; -+}; -+ -+enum msm_bus_bimc_arb_mode { -+ BIMC_ARB_MODE_RR = 0, -+ BIMC_ARB_MODE_PRIORITY_RR, -+ BIMC_ARB_MODE_TIERED_RR, -+}; -+ -+ -+enum msm_bus_bimc_interleave { -+ BIMC_INTERLEAVE_NONE = 0, -+ BIMC_INTERLEAVE_ODD, -+ BIMC_INTERLEAVE_EVEN, -+}; -+ -+struct msm_bus_bimc_slave_seg { -+ bool enable; -+ uint64_t start_addr; -+ uint64_t seg_size; -+ uint8_t interleave; -+}; -+ -+enum msm_bus_bimc_qos_mode_type { -+ BIMC_QOS_MODE_FIXED = 0, -+ BIMC_QOS_MODE_LIMITER, -+ BIMC_QOS_MODE_BYPASS, -+ BIMC_QOS_MODE_REGULATOR, -+}; -+ -+struct msm_bus_bimc_qos_health { -+ bool limit_commands; -+ uint32_t areq_prio; -+ uint32_t prio_level; -+}; -+ -+struct msm_bus_bimc_mode_fixed { -+ uint32_t prio_level; -+ uint32_t areq_prio_rd; -+ uint32_t areq_prio_wr; -+}; -+ -+struct msm_bus_bimc_mode_rl { -+ uint8_t qhealthnum; -+ struct msm_bus_bimc_qos_health qhealth[4]; -+}; -+ -+struct msm_bus_bimc_qos_mode { -+ uint8_t mode; -+ struct msm_bus_bimc_mode_fixed fixed; -+ struct msm_bus_bimc_mode_rl rl; -+}; -+ -+struct msm_bus_bimc_qos_bw { -+ uint64_t bw; /* bw is in Bytes/sec */ -+ uint32_t ws; /* Window size in nano seconds*/ -+ int64_t thh; /* Threshold high, bytes per second */ -+ int64_t thm; /* Threshold medium, bytes per second */ -+ int64_t thl; /* Threshold low, bytes per second */ -+ u32 gp; /* Grant Period in micro seconds */ -+ u32 thmp; /* Threshold medium in percentage */ -+}; -+ -+struct msm_bus_bimc_clk_gate { -+ bool core_clk_gate_en; -+ bool arb_clk_gate_en; /* For arbiter */ -+ bool port_clk_gate_en; /* For regs on BIMC core clock */ -+}; -+ -+void msm_bus_bimc_set_slave_seg(struct msm_bus_bimc_info *binfo, -+ uint32_t slv_index, uint32_t seg_index, -+ struct msm_bus_bimc_slave_seg *bsseg); -+void msm_bus_bimc_set_slave_clk_gate(struct msm_bus_bimc_info *binfo, -+ uint32_t slv_index, struct msm_bus_bimc_clk_gate *bgate); -+void msm_bus_bimc_set_mas_clk_gate(struct msm_bus_bimc_info *binfo, -+ uint32_t mas_index, struct msm_bus_bimc_clk_gate *bgate); -+void msm_bus_bimc_arb_en(struct msm_bus_bimc_info *binfo, -+ uint32_t slv_index, bool en); -+void msm_bus_bimc_get_params(struct msm_bus_bimc_info *binfo, -+ struct msm_bus_bimc_params *params); -+void msm_bus_bimc_get_mas_params(struct msm_bus_bimc_info *binfo, -+ uint32_t mas_index, struct msm_bus_bimc_node *mparams); -+void msm_bus_bimc_get_slv_params(struct msm_bus_bimc_info *binfo, -+ uint32_t slv_index, struct msm_bus_bimc_node *sparams); -+bool msm_bus_bimc_get_arb_en(struct msm_bus_bimc_info *binfo, -+ uint32_t slv_index); -+ -+#endif /*_ARCH_ARM_MACH_MSM_BUS_BIMC_H*/ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_client_api.c -@@ -0,0 +1,83 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "msm-bus.h" -+#include "msm_bus_core.h" -+ -+struct msm_bus_arb_ops arb_ops; -+ -+/** -+ * msm_bus_scale_register_client() - Register the clients with the msm bus -+ * driver -+ * @pdata: Platform data of the client, containing src, dest, ab, ib. -+ * Return non-zero value in case of success, 0 in case of failure. -+ * -+ * Client data contains the vectors specifying arbitrated bandwidth (ab) -+ * and instantaneous bandwidth (ib) requested between a particular -+ * src and dest. -+ */ -+uint32_t msm_bus_scale_register_client(struct msm_bus_scale_pdata *pdata) -+{ -+ if (arb_ops.register_client) -+ return arb_ops.register_client(pdata); -+ else { -+ pr_err("%s: Bus driver not ready.", -+ __func__); -+ return 0; -+ } -+} -+EXPORT_SYMBOL(msm_bus_scale_register_client); -+ -+/** -+ * msm_bus_scale_client_update_request() - Update the request for bandwidth -+ * from a particular client -+ * -+ * cl: Handle to the client -+ * index: Index into the vector, to which the bw and clock values need to be -+ * updated -+ */ -+int msm_bus_scale_client_update_request(uint32_t cl, unsigned int index) -+{ -+ if (arb_ops.update_request) -+ return arb_ops.update_request(cl, index); -+ else { -+ pr_err("%s: Bus driver not ready.", -+ __func__); -+ return -EPROBE_DEFER; -+ } -+} -+EXPORT_SYMBOL(msm_bus_scale_client_update_request); -+ -+/** -+ * msm_bus_scale_unregister_client() - Unregister the client from the bus driver -+ * @cl: Handle to the client -+ */ -+void msm_bus_scale_unregister_client(uint32_t cl) -+{ -+ if (arb_ops.unregister_client) -+ arb_ops.unregister_client(cl); -+ else { -+ pr_err("%s: Bus driver not ready.", -+ __func__); -+ } -+} -+EXPORT_SYMBOL(msm_bus_scale_unregister_client); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_core.c -@@ -0,0 +1,125 @@ -+/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm-bus.h" -+#include "msm_bus_core.h" -+ -+static atomic_t num_fab = ATOMIC_INIT(0); -+ -+int msm_bus_get_num_fab(void) -+{ -+ return atomic_read(&num_fab); -+} -+ -+int msm_bus_device_match(struct device *dev, void *id) -+{ -+ struct msm_bus_fabric_device *fabdev = to_msm_bus_fabric_device(dev); -+ -+ if (!fabdev) { -+ MSM_BUS_WARN("Fabric %p returning 0\n", fabdev); -+ return 0; -+ } -+ return fabdev->id == *(int *)id; -+} -+ -+static void msm_bus_release(struct device *device) -+{ -+} -+ -+struct bus_type msm_bus_type = { -+ .name = "msm-bus-type", -+}; -+EXPORT_SYMBOL(msm_bus_type); -+ -+/** -+ * msm_bus_get_fabric_device() - This function is used to search for -+ * the fabric device on the bus -+ * @fabid: Fabric id -+ * Function returns: Pointer to the fabric device -+ */ -+struct msm_bus_fabric_device *msm_bus_get_fabric_device(int fabid) -+{ -+ struct device *dev; -+ struct msm_bus_fabric_device *fabric; -+ dev = bus_find_device(&msm_bus_type, NULL, (void *)&fabid, -+ msm_bus_device_match); -+ if (!dev) -+ return NULL; -+ fabric = to_msm_bus_fabric_device(dev); -+ return fabric; -+} -+ -+/** -+ * msm_bus_fabric_device_register() - Registers a fabric on msm bus -+ * @fabdev: Fabric device to be registered -+ */ -+int msm_bus_fabric_device_register(struct msm_bus_fabric_device *fabdev) -+{ -+ int ret = 0; -+ fabdev->dev.bus = &msm_bus_type; -+ fabdev->dev.release = msm_bus_release; -+ ret = dev_set_name(&fabdev->dev, fabdev->name); -+ if (ret) { -+ MSM_BUS_ERR("error setting dev name\n"); -+ goto err; -+ } -+ -+ ret = device_register(&fabdev->dev); -+ if (ret < 0) { -+ MSM_BUS_ERR("error registering device%d %s\n", -+ ret, fabdev->name); -+ goto err; -+ } -+ atomic_inc(&num_fab); -+err: -+ return ret; -+} -+ -+/** -+ * msm_bus_fabric_device_unregister() - Unregisters the fabric -+ * devices from the msm bus -+ */ -+void msm_bus_fabric_device_unregister(struct msm_bus_fabric_device *fabdev) -+{ -+ device_unregister(&fabdev->dev); -+ atomic_dec(&num_fab); -+} -+ -+static void __exit msm_bus_exit(void) -+{ -+ bus_unregister(&msm_bus_type); -+} -+ -+static int __init msm_bus_init(void) -+{ -+ int retval = 0; -+ retval = bus_register(&msm_bus_type); -+ if (retval) -+ MSM_BUS_ERR("bus_register error! %d\n", -+ retval); -+ return retval; -+} -+postcore_initcall(msm_bus_init); -+module_exit(msm_bus_exit); -+MODULE_LICENSE("GPL v2"); -+MODULE_VERSION("0.2"); -+MODULE_ALIAS("platform:msm_bus"); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_core.h -@@ -0,0 +1,375 @@ -+/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _ARCH_ARM_MACH_MSM_BUS_CORE_H -+#define _ARCH_ARM_MACH_MSM_BUS_CORE_H -+ -+#include -+#include -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm-bus.h" -+ -+#define MSM_BUS_DBG(msg, ...) \ -+ pr_debug(msg, ## __VA_ARGS__) -+#define MSM_BUS_ERR(msg, ...) \ -+ pr_err(msg, ## __VA_ARGS__) -+#define MSM_BUS_WARN(msg, ...) \ -+ pr_warn(msg, ## __VA_ARGS__) -+#define MSM_FAB_ERR(msg, ...) \ -+ dev_err(&fabric->fabdev.dev, msg, ## __VA_ARGS__) -+ -+#define IS_MASTER_VALID(mas) \ -+ (((mas >= MSM_BUS_MASTER_FIRST) && (mas <= MSM_BUS_MASTER_LAST)) \ -+ ? 1 : 0) -+#define IS_SLAVE_VALID(slv) \ -+ (((slv >= MSM_BUS_SLAVE_FIRST) && (slv <= MSM_BUS_SLAVE_LAST)) ? 1 : 0) -+ -+#define INTERLEAVED_BW(fab_pdata, bw, ports) \ -+ ((fab_pdata->il_flag) ? ((bw < 0) \ -+ ? -msm_bus_div64((ports), (-bw)) : msm_bus_div64((ports), (bw))) : (bw)) -+#define INTERLEAVED_VAL(fab_pdata, n) \ -+ ((fab_pdata->il_flag) ? (n) : 1) -+#define KBTOB(a) (a * 1000ULL) -+ -+enum msm_bus_dbg_op_type { -+ MSM_BUS_DBG_UNREGISTER = -2, -+ MSM_BUS_DBG_REGISTER, -+ MSM_BUS_DBG_OP = 1, -+}; -+ -+enum msm_bus_hw_sel { -+ MSM_BUS_RPM = 0, -+ MSM_BUS_NOC, -+ MSM_BUS_BIMC, -+}; -+ -+struct msm_bus_arb_ops { -+ uint32_t (*register_client)(struct msm_bus_scale_pdata *pdata); -+ int (*update_request)(uint32_t cl, unsigned int index); -+ void (*unregister_client)(uint32_t cl); -+}; -+ -+enum { -+ SLAVE_NODE, -+ MASTER_NODE, -+ CLK_NODE, -+ NR_LIM_NODE, -+}; -+ -+ -+extern struct bus_type msm_bus_type; -+extern struct msm_bus_arb_ops arb_ops; -+extern void msm_bus_arb_setops_legacy(struct msm_bus_arb_ops *arb_ops); -+ -+struct msm_bus_node_info { -+ unsigned int id; -+ unsigned int priv_id; -+ unsigned int mas_hw_id; -+ unsigned int slv_hw_id; -+ int gateway; -+ int *masterp; -+ int *qport; -+ int num_mports; -+ int *slavep; -+ int num_sports; -+ int *tier; -+ int num_tiers; -+ int ahb; -+ int hw_sel; -+ const char *slaveclk[NUM_CTX]; -+ const char *memclk[NUM_CTX]; -+ const char *iface_clk_node; -+ unsigned int buswidth; -+ unsigned int ws; -+ unsigned int mode; -+ unsigned int perm_mode; -+ unsigned int prio_lvl; -+ unsigned int prio_rd; -+ unsigned int prio_wr; -+ unsigned int prio1; -+ unsigned int prio0; -+ unsigned int num_thresh; -+ u64 *th; -+ u64 cur_lim_bw; -+ unsigned int mode_thresh; -+ bool dual_conf; -+ u64 *bimc_bw; -+ bool nr_lim; -+ u32 ff; -+ bool rt_mas; -+ u32 bimc_gp; -+ u32 bimc_thmp; -+ u64 floor_bw; -+ const char *name; -+}; -+ -+struct path_node { -+ uint64_t clk[NUM_CTX]; -+ uint64_t bw[NUM_CTX]; -+ uint64_t *sel_clk; -+ uint64_t *sel_bw; -+ int next; -+}; -+ -+struct msm_bus_link_info { -+ uint64_t clk[NUM_CTX]; -+ uint64_t *sel_clk; -+ uint64_t memclk; -+ int64_t bw[NUM_CTX]; -+ int64_t *sel_bw; -+ int *tier; -+ int num_tiers; -+}; -+ -+struct nodeclk { -+ struct clk *clk; -+ uint64_t rate; -+ bool dirty; -+ bool enable; -+}; -+ -+struct msm_bus_inode_info { -+ struct msm_bus_node_info *node_info; -+ uint64_t max_bw; -+ uint64_t max_clk; -+ uint64_t cur_lim_bw; -+ uint64_t cur_prg_bw; -+ struct msm_bus_link_info link_info; -+ int num_pnodes; -+ struct path_node *pnode; -+ int commit_index; -+ struct nodeclk nodeclk[NUM_CTX]; -+ struct nodeclk memclk[NUM_CTX]; -+ struct nodeclk iface_clk; -+ void *hw_data; -+}; -+ -+struct msm_bus_node_hw_info { -+ bool dirty; -+ unsigned int hw_id; -+ uint64_t bw; -+}; -+ -+struct msm_bus_hw_algorithm { -+ int (*allocate_commit_data)(struct msm_bus_fabric_registration -+ *fab_pdata, void **cdata, int ctx); -+ void *(*allocate_hw_data)(struct platform_device *pdev, -+ struct msm_bus_fabric_registration *fab_pdata); -+ void (*node_init)(void *hw_data, struct msm_bus_inode_info *info); -+ void (*free_commit_data)(void *cdata); -+ void (*update_bw)(struct msm_bus_inode_info *hop, -+ struct msm_bus_inode_info *info, -+ struct msm_bus_fabric_registration *fab_pdata, -+ void *sel_cdata, int *master_tiers, -+ int64_t add_bw); -+ void (*fill_cdata_buffer)(int *curr, char *buf, const int max_size, -+ void *cdata, int nmasters, int nslaves, int ntslaves); -+ int (*commit)(struct msm_bus_fabric_registration -+ *fab_pdata, void *hw_data, void **cdata); -+ int (*port_unhalt)(uint32_t haltid, uint8_t mport); -+ int (*port_halt)(uint32_t haltid, uint8_t mport); -+ void (*config_master)(struct msm_bus_fabric_registration *fab_pdata, -+ struct msm_bus_inode_info *info, -+ uint64_t req_clk, uint64_t req_bw); -+ void (*config_limiter)(struct msm_bus_fabric_registration *fab_pdata, -+ struct msm_bus_inode_info *info); -+ bool (*update_bw_reg)(int mode); -+}; -+ -+struct msm_bus_fabric_device { -+ int id; -+ const char *name; -+ struct device dev; -+ const struct msm_bus_fab_algorithm *algo; -+ const struct msm_bus_board_algorithm *board_algo; -+ struct msm_bus_hw_algorithm hw_algo; -+ int visited; -+ int num_nr_lim; -+ u64 nr_lim_thresh; -+ u32 eff_fact; -+}; -+#define to_msm_bus_fabric_device(d) container_of(d, \ -+ struct msm_bus_fabric_device, d) -+ -+struct msm_bus_fabric { -+ struct msm_bus_fabric_device fabdev; -+ int ahb; -+ void *cdata[NUM_CTX]; -+ bool arb_dirty; -+ bool clk_dirty; -+ struct radix_tree_root fab_tree; -+ int num_nodes; -+ struct list_head gateways; -+ struct msm_bus_inode_info info; -+ struct msm_bus_fabric_registration *pdata; -+ void *hw_data; -+}; -+#define to_msm_bus_fabric(d) container_of(d, \ -+ struct msm_bus_fabric, d) -+ -+ -+struct msm_bus_fab_algorithm { -+ int (*update_clks)(struct msm_bus_fabric_device *fabdev, -+ struct msm_bus_inode_info *pme, int index, -+ uint64_t curr_clk, uint64_t req_clk, -+ uint64_t bwsum, int flag, int ctx, -+ unsigned int cl_active_flag); -+ int (*port_halt)(struct msm_bus_fabric_device *fabdev, int portid); -+ int (*port_unhalt)(struct msm_bus_fabric_device *fabdev, int portid); -+ int (*commit)(struct msm_bus_fabric_device *fabdev); -+ struct msm_bus_inode_info *(*find_node)(struct msm_bus_fabric_device -+ *fabdev, int id); -+ struct msm_bus_inode_info *(*find_gw_node)(struct msm_bus_fabric_device -+ *fabdev, int id); -+ struct list_head *(*get_gw_list)(struct msm_bus_fabric_device *fabdev); -+ void (*update_bw)(struct msm_bus_fabric_device *fabdev, struct -+ msm_bus_inode_info * hop, struct msm_bus_inode_info *info, -+ int64_t add_bw, int *master_tiers, int ctx); -+ void (*config_master)(struct msm_bus_fabric_device *fabdev, -+ struct msm_bus_inode_info *info, uint64_t req_clk, -+ uint64_t req_bw); -+ void (*config_limiter)(struct msm_bus_fabric_device *fabdev, -+ struct msm_bus_inode_info *info); -+}; -+ -+struct msm_bus_board_algorithm { -+ int board_nfab; -+ void (*assign_iids)(struct msm_bus_fabric_registration *fabreg, -+ int fabid); -+ int (*get_iid)(int id); -+}; -+ -+/** -+ * Used to store the list of fabrics and other info to be -+ * maintained outside the fabric structure. -+ * Used while calculating path, and to find fabric ptrs -+ */ -+struct msm_bus_fabnodeinfo { -+ struct list_head list; -+ struct msm_bus_inode_info *info; -+}; -+ -+struct msm_bus_client { -+ int id; -+ struct msm_bus_scale_pdata *pdata; -+ int *src_pnode; -+ int curr; -+}; -+ -+uint64_t msm_bus_div64(unsigned int width, uint64_t bw); -+int msm_bus_fabric_device_register(struct msm_bus_fabric_device *fabric); -+void msm_bus_fabric_device_unregister(struct msm_bus_fabric_device *fabric); -+struct msm_bus_fabric_device *msm_bus_get_fabric_device(int fabid); -+int msm_bus_get_num_fab(void); -+ -+ -+int msm_bus_hw_fab_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo); -+void msm_bus_board_init(struct msm_bus_fabric_registration *pdata); -+void msm_bus_board_set_nfab(struct msm_bus_fabric_registration *pdata, -+ int nfab); -+#if defined(CONFIG_MSM_RPM_SMD) -+int msm_bus_rpm_hw_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo); -+int msm_bus_remote_hw_commit(struct msm_bus_fabric_registration -+ *fab_pdata, void *hw_data, void **cdata); -+void msm_bus_rpm_fill_cdata_buffer(int *curr, char *buf, const int max_size, -+ void *cdata, int nmasters, int nslaves, int ntslaves); -+#else -+static inline int msm_bus_rpm_hw_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo) -+{ -+ return 0; -+} -+static inline int msm_bus_remote_hw_commit(struct msm_bus_fabric_registration -+ *fab_pdata, void *hw_data, void **cdata) -+{ -+ return 0; -+} -+static inline void msm_bus_rpm_fill_cdata_buffer(int *curr, char *buf, -+ const int max_size, void *cdata, int nmasters, int nslaves, -+ int ntslaves) -+{ -+} -+#endif -+ -+int msm_bus_noc_hw_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo); -+int msm_bus_bimc_hw_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo); -+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) -+void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata, int index, -+ uint32_t cl); -+void msm_bus_dbg_commit_data(const char *fabname, void *cdata, -+ int nmasters, int nslaves, int ntslaves, int op); -+#else -+static inline void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata, -+ int index, uint32_t cl) -+{ -+} -+static inline void msm_bus_dbg_commit_data(const char *fabname, -+ void *cdata, int nmasters, int nslaves, int ntslaves, -+ int op) -+{ -+} -+#endif -+ -+#ifdef CONFIG_CORESIGHT -+int msmbus_coresight_init(struct platform_device *pdev); -+void msmbus_coresight_remove(struct platform_device *pdev); -+int msmbus_coresight_init_adhoc(struct platform_device *pdev, -+ struct device_node *of_node); -+void msmbus_coresight_remove_adhoc(struct platform_device *pdev); -+#else -+static inline int msmbus_coresight_init(struct platform_device *pdev) -+{ -+ return 0; -+} -+ -+static inline void msmbus_coresight_remove(struct platform_device *pdev) -+{ -+} -+ -+static inline int msmbus_coresight_init_adhoc(struct platform_device *pdev, -+ struct device_node *of_node) -+{ -+ return 0; -+} -+ -+static inline void msmbus_coresight_remove_adhoc(struct platform_device *pdev) -+{ -+} -+#endif -+ -+ -+#ifdef CONFIG_OF -+void msm_bus_of_get_nfab(struct platform_device *pdev, -+ struct msm_bus_fabric_registration *pdata); -+struct msm_bus_fabric_registration -+ *msm_bus_of_get_fab_data(struct platform_device *pdev); -+#else -+static inline void msm_bus_of_get_nfab(struct platform_device *pdev, -+ struct msm_bus_fabric_registration *pdata) -+{ -+ return; -+} -+ -+static inline struct msm_bus_fabric_registration -+ *msm_bus_of_get_fab_data(struct platform_device *pdev) -+{ -+ return NULL; -+} -+#endif -+ -+#endif /*_ARCH_ARM_MACH_MSM_BUS_CORE_H*/ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_dbg.c -@@ -0,0 +1,810 @@ -+/* Copyright (c) 2010-2012, 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm-bus.h" -+#include "msm_bus_rules.h" -+#include "msm_bus_core.h" -+#include "msm_bus_adhoc.h" -+ -+#define CREATE_TRACE_POINTS -+#include -+ -+#define MAX_BUFF_SIZE 4096 -+#define FILL_LIMIT 128 -+ -+static struct dentry *clients; -+static struct dentry *dir; -+static DEFINE_MUTEX(msm_bus_dbg_fablist_lock); -+struct msm_bus_dbg_state { -+ uint32_t cl; -+ uint8_t enable; -+ uint8_t current_index; -+} clstate; -+ -+struct msm_bus_cldata { -+ const struct msm_bus_scale_pdata *pdata; -+ int index; -+ uint32_t clid; -+ int size; -+ struct dentry *file; -+ struct list_head list; -+ char buffer[MAX_BUFF_SIZE]; -+}; -+ -+struct msm_bus_fab_list { -+ const char *name; -+ int size; -+ struct dentry *file; -+ struct list_head list; -+ char buffer[MAX_BUFF_SIZE]; -+}; -+ -+static char *rules_buf; -+ -+LIST_HEAD(fabdata_list); -+LIST_HEAD(cl_list); -+ -+/** -+ * The following structures and funtions are used for -+ * the test-client which can be created at run-time. -+ */ -+ -+static struct msm_bus_vectors init_vectors[1]; -+static struct msm_bus_vectors current_vectors[1]; -+static struct msm_bus_vectors requested_vectors[1]; -+ -+static struct msm_bus_paths shell_client_usecases[] = { -+ { -+ .num_paths = ARRAY_SIZE(init_vectors), -+ .vectors = init_vectors, -+ }, -+ { -+ .num_paths = ARRAY_SIZE(current_vectors), -+ .vectors = current_vectors, -+ }, -+ { -+ .num_paths = ARRAY_SIZE(requested_vectors), -+ .vectors = requested_vectors, -+ }, -+}; -+ -+static struct msm_bus_scale_pdata shell_client = { -+ .usecase = shell_client_usecases, -+ .num_usecases = ARRAY_SIZE(shell_client_usecases), -+ .name = "test-client", -+}; -+ -+static void msm_bus_dbg_init_vectors(void) -+{ -+ init_vectors[0].src = -1; -+ init_vectors[0].dst = -1; -+ init_vectors[0].ab = 0; -+ init_vectors[0].ib = 0; -+ current_vectors[0].src = -1; -+ current_vectors[0].dst = -1; -+ current_vectors[0].ab = 0; -+ current_vectors[0].ib = 0; -+ requested_vectors[0].src = -1; -+ requested_vectors[0].dst = -1; -+ requested_vectors[0].ab = 0; -+ requested_vectors[0].ib = 0; -+ clstate.enable = 0; -+ clstate.current_index = 0; -+} -+ -+static int msm_bus_dbg_update_cl_request(uint32_t cl) -+{ -+ int ret = 0; -+ -+ if (clstate.current_index < 2) -+ clstate.current_index = 2; -+ else { -+ clstate.current_index = 1; -+ current_vectors[0].ab = requested_vectors[0].ab; -+ current_vectors[0].ib = requested_vectors[0].ib; -+ } -+ -+ if (clstate.enable) { -+ MSM_BUS_DBG("Updating request for shell client, index: %d\n", -+ clstate.current_index); -+ ret = msm_bus_scale_client_update_request(clstate.cl, -+ clstate.current_index); -+ } else -+ MSM_BUS_DBG("Enable bit not set. Skipping update request\n"); -+ -+ return ret; -+} -+ -+static void msm_bus_dbg_unregister_client(uint32_t cl) -+{ -+ MSM_BUS_DBG("Unregistering shell client\n"); -+ msm_bus_scale_unregister_client(clstate.cl); -+ clstate.cl = 0; -+} -+ -+static uint32_t msm_bus_dbg_register_client(void) -+{ -+ int ret = 0; -+ -+ if (init_vectors[0].src != requested_vectors[0].src) { -+ MSM_BUS_DBG("Shell client master changed. Unregistering\n"); -+ msm_bus_dbg_unregister_client(clstate.cl); -+ } -+ if (init_vectors[0].dst != requested_vectors[0].dst) { -+ MSM_BUS_DBG("Shell client slave changed. Unregistering\n"); -+ msm_bus_dbg_unregister_client(clstate.cl); -+ } -+ -+ current_vectors[0].src = init_vectors[0].src; -+ requested_vectors[0].src = init_vectors[0].src; -+ current_vectors[0].dst = init_vectors[0].dst; -+ requested_vectors[0].dst = init_vectors[0].dst; -+ -+ if (!clstate.enable) { -+ MSM_BUS_DBG("Enable bit not set, skipping registration: cl " -+ "%d\n", clstate.cl); -+ return 0; -+ } -+ -+ if (clstate.cl) { -+ MSM_BUS_DBG("Client registered, skipping registration\n"); -+ return clstate.cl; -+ } -+ -+ MSM_BUS_DBG("Registering shell client\n"); -+ ret = msm_bus_scale_register_client(&shell_client); -+ return ret; -+} -+ -+static int msm_bus_dbg_mas_get(void *data, u64 *val) -+{ -+ *val = init_vectors[0].src; -+ MSM_BUS_DBG("Get master: %llu\n", *val); -+ return 0; -+} -+ -+static int msm_bus_dbg_mas_set(void *data, u64 val) -+{ -+ init_vectors[0].src = val; -+ MSM_BUS_DBG("Set master: %llu\n", val); -+ clstate.cl = msm_bus_dbg_register_client(); -+ return 0; -+} -+DEFINE_SIMPLE_ATTRIBUTE(shell_client_mas_fops, msm_bus_dbg_mas_get, -+ msm_bus_dbg_mas_set, "%llu\n"); -+ -+static int msm_bus_dbg_slv_get(void *data, u64 *val) -+{ -+ *val = init_vectors[0].dst; -+ MSM_BUS_DBG("Get slave: %llu\n", *val); -+ return 0; -+} -+ -+static int msm_bus_dbg_slv_set(void *data, u64 val) -+{ -+ init_vectors[0].dst = val; -+ MSM_BUS_DBG("Set slave: %llu\n", val); -+ clstate.cl = msm_bus_dbg_register_client(); -+ return 0; -+} -+DEFINE_SIMPLE_ATTRIBUTE(shell_client_slv_fops, msm_bus_dbg_slv_get, -+ msm_bus_dbg_slv_set, "%llu\n"); -+ -+static int msm_bus_dbg_ab_get(void *data, u64 *val) -+{ -+ *val = requested_vectors[0].ab; -+ MSM_BUS_DBG("Get ab: %llu\n", *val); -+ return 0; -+} -+ -+static int msm_bus_dbg_ab_set(void *data, u64 val) -+{ -+ requested_vectors[0].ab = val; -+ MSM_BUS_DBG("Set ab: %llu\n", val); -+ return 0; -+} -+DEFINE_SIMPLE_ATTRIBUTE(shell_client_ab_fops, msm_bus_dbg_ab_get, -+ msm_bus_dbg_ab_set, "%llu\n"); -+ -+static int msm_bus_dbg_ib_get(void *data, u64 *val) -+{ -+ *val = requested_vectors[0].ib; -+ MSM_BUS_DBG("Get ib: %llu\n", *val); -+ return 0; -+} -+ -+static int msm_bus_dbg_ib_set(void *data, u64 val) -+{ -+ requested_vectors[0].ib = val; -+ MSM_BUS_DBG("Set ib: %llu\n", val); -+ return 0; -+} -+DEFINE_SIMPLE_ATTRIBUTE(shell_client_ib_fops, msm_bus_dbg_ib_get, -+ msm_bus_dbg_ib_set, "%llu\n"); -+ -+static int msm_bus_dbg_en_get(void *data, u64 *val) -+{ -+ *val = clstate.enable; -+ MSM_BUS_DBG("Get enable: %llu\n", *val); -+ return 0; -+} -+ -+static int msm_bus_dbg_en_set(void *data, u64 val) -+{ -+ int ret = 0; -+ -+ clstate.enable = val; -+ if (clstate.enable) { -+ if (!clstate.cl) { -+ MSM_BUS_DBG("client: %u\n", clstate.cl); -+ clstate.cl = msm_bus_dbg_register_client(); -+ if (clstate.cl) -+ ret = msm_bus_dbg_update_cl_request(clstate.cl); -+ } else { -+ MSM_BUS_DBG("update request for cl: %u\n", clstate.cl); -+ ret = msm_bus_dbg_update_cl_request(clstate.cl); -+ } -+ } -+ -+ MSM_BUS_DBG("Set enable: %llu\n", val); -+ return ret; -+} -+DEFINE_SIMPLE_ATTRIBUTE(shell_client_en_fops, msm_bus_dbg_en_get, -+ msm_bus_dbg_en_set, "%llu\n"); -+ -+/** -+ * The following funtions are used for viewing the client data -+ * and changing the client request at run-time -+ */ -+ -+static ssize_t client_data_read(struct file *file, char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ int bsize = 0; -+ uint32_t cl = (uint32_t)(uintptr_t)file->private_data; -+ struct msm_bus_cldata *cldata = NULL; -+ int found = 0; -+ -+ list_for_each_entry(cldata, &cl_list, list) { -+ if (cldata->clid == cl) { -+ found = 1; -+ break; -+ } -+ } -+ if (!found) -+ return 0; -+ -+ bsize = cldata->size; -+ return simple_read_from_buffer(buf, count, ppos, -+ cldata->buffer, bsize); -+} -+ -+static int client_data_open(struct inode *inode, struct file *file) -+{ -+ file->private_data = inode->i_private; -+ return 0; -+} -+ -+static const struct file_operations client_data_fops = { -+ .open = client_data_open, -+ .read = client_data_read, -+}; -+ -+struct dentry *msm_bus_dbg_create(const char *name, mode_t mode, -+ struct dentry *dent, uint32_t clid) -+{ -+ if (dent == NULL) { -+ MSM_BUS_DBG("debugfs not ready yet\n"); -+ return NULL; -+ } -+ return debugfs_create_file(name, mode, dent, (void *)(uintptr_t)clid, -+ &client_data_fops); -+} -+ -+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) -+static int msm_bus_dbg_record_client(const struct msm_bus_scale_pdata *pdata, -+ int index, uint32_t clid, struct dentry *file) -+{ -+ struct msm_bus_cldata *cldata; -+ -+ cldata = kmalloc(sizeof(struct msm_bus_cldata), GFP_KERNEL); -+ if (!cldata) { -+ MSM_BUS_DBG("Failed to allocate memory for client data\n"); -+ return -ENOMEM; -+ } -+ cldata->pdata = pdata; -+ cldata->index = index; -+ cldata->clid = clid; -+ cldata->file = file; -+ cldata->size = 0; -+ list_add_tail(&cldata->list, &cl_list); -+ return 0; -+} -+ -+static void msm_bus_dbg_free_client(uint32_t clid) -+{ -+ struct msm_bus_cldata *cldata = NULL; -+ -+ list_for_each_entry(cldata, &cl_list, list) { -+ if (cldata->clid == clid) { -+ debugfs_remove(cldata->file); -+ list_del(&cldata->list); -+ kfree(cldata); -+ break; -+ } -+ } -+} -+ -+static int msm_bus_dbg_fill_cl_buffer(const struct msm_bus_scale_pdata *pdata, -+ int index, uint32_t clid) -+{ -+ int i = 0, j; -+ char *buf = NULL; -+ struct msm_bus_cldata *cldata = NULL; -+ struct timespec ts; -+ int found = 0; -+ -+ list_for_each_entry(cldata, &cl_list, list) { -+ if (cldata->clid == clid) { -+ found = 1; -+ break; -+ } -+ } -+ -+ if (!found) -+ return -ENOENT; -+ -+ if (cldata->file == NULL) { -+ if (pdata->name == NULL) { -+ MSM_BUS_DBG("Client doesn't have a name\n"); -+ return -EINVAL; -+ } -+ cldata->file = msm_bus_dbg_create(pdata->name, S_IRUGO, -+ clients, clid); -+ } -+ -+ if (cldata->size < (MAX_BUFF_SIZE - FILL_LIMIT)) -+ i = cldata->size; -+ else { -+ i = 0; -+ cldata->size = 0; -+ } -+ buf = cldata->buffer; -+ ts = ktime_to_timespec(ktime_get()); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n", -+ (int)ts.tv_sec, (int)ts.tv_nsec); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "curr : %d\n", index); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "masters: "); -+ -+ for (j = 0; j < pdata->usecase->num_paths; j++) -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%d ", -+ pdata->usecase[index].vectors[j].src); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\nslaves : "); -+ for (j = 0; j < pdata->usecase->num_paths; j++) -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%d ", -+ pdata->usecase[index].vectors[j].dst); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\nab : "); -+ for (j = 0; j < pdata->usecase->num_paths; j++) -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%llu ", -+ pdata->usecase[index].vectors[j].ab); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\nib : "); -+ for (j = 0; j < pdata->usecase->num_paths; j++) -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%llu ", -+ pdata->usecase[index].vectors[j].ib); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n"); -+ -+ for (j = 0; j < pdata->usecase->num_paths; j++) -+ trace_bus_update_request((int)ts.tv_sec, (int)ts.tv_nsec, -+ pdata->name, index, -+ pdata->usecase[index].vectors[j].src, -+ pdata->usecase[index].vectors[j].dst, -+ pdata->usecase[index].vectors[j].ab, -+ pdata->usecase[index].vectors[j].ib); -+ -+ cldata->size = i; -+ return i; -+} -+#endif -+ -+static int msm_bus_dbg_update_request(struct msm_bus_cldata *cldata, int index) -+{ -+ int ret = 0; -+ -+ if ((index < 0) || (index > cldata->pdata->num_usecases)) { -+ MSM_BUS_DBG("Invalid index!\n"); -+ return -EINVAL; -+ } -+ ret = msm_bus_scale_client_update_request(cldata->clid, index); -+ return ret; -+} -+ -+static ssize_t msm_bus_dbg_update_request_write(struct file *file, -+ const char __user *ubuf, size_t cnt, loff_t *ppos) -+{ -+ struct msm_bus_cldata *cldata; -+ unsigned long index = 0; -+ int ret = 0; -+ char *chid; -+ char *buf = kmalloc((sizeof(char) * (cnt + 1)), GFP_KERNEL); -+ int found = 0; -+ -+ if (!buf || IS_ERR(buf)) { -+ MSM_BUS_ERR("Memory allocation for buffer failed\n"); -+ return -ENOMEM; -+ } -+ if (cnt == 0) { -+ kfree(buf); -+ return 0; -+ } -+ if (copy_from_user(buf, ubuf, cnt)) { -+ kfree(buf); -+ return -EFAULT; -+ } -+ buf[cnt] = '\0'; -+ chid = buf; -+ MSM_BUS_DBG("buffer: %s\n size: %zu\n", buf, sizeof(ubuf)); -+ -+ list_for_each_entry(cldata, &cl_list, list) { -+ if (strnstr(chid, cldata->pdata->name, cnt)) { -+ found = 1; -+ cldata = cldata; -+ strsep(&chid, " "); -+ if (chid) { -+ ret = kstrtoul(chid, 10, &index); -+ if (ret) { -+ MSM_BUS_DBG("Index conversion" -+ " failed\n"); -+ return -EFAULT; -+ } -+ } else { -+ MSM_BUS_DBG("Error parsing input. Index not" -+ " found\n"); -+ found = 0; -+ } -+ break; -+ } -+ } -+ -+ if (found) -+ msm_bus_dbg_update_request(cldata, index); -+ kfree(buf); -+ return cnt; -+} -+ -+/** -+ * The following funtions are used for viewing the commit data -+ * for each fabric -+ */ -+static ssize_t fabric_data_read(struct file *file, char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ struct msm_bus_fab_list *fablist = NULL; -+ int bsize = 0; -+ ssize_t ret; -+ const char *name = file->private_data; -+ int found = 0; -+ -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ list_for_each_entry(fablist, &fabdata_list, list) { -+ if (strcmp(fablist->name, name) == 0) { -+ found = 1; -+ break; -+ } -+ } -+ if (!found) -+ return -ENOENT; -+ bsize = fablist->size; -+ ret = simple_read_from_buffer(buf, count, ppos, -+ fablist->buffer, bsize); -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+ return ret; -+} -+ -+static const struct file_operations fabric_data_fops = { -+ .open = client_data_open, -+ .read = fabric_data_read, -+}; -+ -+static ssize_t rules_dbg_read(struct file *file, char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ ssize_t ret; -+ memset(rules_buf, 0, MAX_BUFF_SIZE); -+ print_rules_buf(rules_buf, MAX_BUFF_SIZE); -+ ret = simple_read_from_buffer(buf, count, ppos, -+ rules_buf, MAX_BUFF_SIZE); -+ return ret; -+} -+ -+static int rules_dbg_open(struct inode *inode, struct file *file) -+{ -+ file->private_data = inode->i_private; -+ return 0; -+} -+ -+static const struct file_operations rules_dbg_fops = { -+ .open = rules_dbg_open, -+ .read = rules_dbg_read, -+}; -+ -+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) -+static int msm_bus_dbg_record_fabric(const char *fabname, struct dentry *file) -+{ -+ struct msm_bus_fab_list *fablist; -+ int ret = 0; -+ -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ fablist = kmalloc(sizeof(struct msm_bus_fab_list), GFP_KERNEL); -+ if (!fablist) { -+ MSM_BUS_DBG("Failed to allocate memory for commit data\n"); -+ ret = -ENOMEM; -+ goto err; -+ } -+ -+ fablist->name = fabname; -+ fablist->size = 0; -+ list_add_tail(&fablist->list, &fabdata_list); -+err: -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+ return ret; -+} -+ -+static void msm_bus_dbg_free_fabric(const char *fabname) -+{ -+ struct msm_bus_fab_list *fablist = NULL; -+ -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ list_for_each_entry(fablist, &fabdata_list, list) { -+ if (strcmp(fablist->name, fabname) == 0) { -+ debugfs_remove(fablist->file); -+ list_del(&fablist->list); -+ kfree(fablist); -+ break; -+ } -+ } -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+} -+ -+static int msm_bus_dbg_fill_fab_buffer(const char *fabname, -+ void *cdata, int nmasters, int nslaves, -+ int ntslaves) -+{ -+ int i; -+ char *buf = NULL; -+ struct msm_bus_fab_list *fablist = NULL; -+ struct timespec ts; -+ int found = 0; -+ -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ list_for_each_entry(fablist, &fabdata_list, list) { -+ if (strcmp(fablist->name, fabname) == 0) { -+ found = 1; -+ break; -+ } -+ } -+ if (!found) -+ return -ENOENT; -+ -+ if (fablist->file == NULL) { -+ MSM_BUS_DBG("Fabric dbg entry does not exist\n"); -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+ return -EFAULT; -+ } -+ -+ if (fablist->size < MAX_BUFF_SIZE - 256) -+ i = fablist->size; -+ else { -+ i = 0; -+ fablist->size = 0; -+ } -+ buf = fablist->buffer; -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+ ts = ktime_to_timespec(ktime_get()); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n", -+ (int)ts.tv_sec, (int)ts.tv_nsec); -+ -+ msm_bus_rpm_fill_cdata_buffer(&i, buf, MAX_BUFF_SIZE, cdata, -+ nmasters, nslaves, ntslaves); -+ i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n"); -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ fablist->size = i; -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+ return 0; -+} -+#endif -+ -+static const struct file_operations msm_bus_dbg_update_request_fops = { -+ .open = client_data_open, -+ .write = msm_bus_dbg_update_request_write, -+}; -+ -+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) -+/** -+ * msm_bus_dbg_client_data() - Add debug data for clients -+ * @pdata: Platform data of the client -+ * @index: The current index or operation to be performed -+ * @clid: Client handle obtained during registration -+ */ -+void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata, int index, -+ uint32_t clid) -+{ -+ struct dentry *file = NULL; -+ -+ if (index == MSM_BUS_DBG_REGISTER) { -+ msm_bus_dbg_record_client(pdata, index, clid, file); -+ if (!pdata->name) { -+ MSM_BUS_DBG("Cannot create debugfs entry. Null name\n"); -+ return; -+ } -+ } else if (index == MSM_BUS_DBG_UNREGISTER) { -+ msm_bus_dbg_free_client(clid); -+ MSM_BUS_DBG("Client %d unregistered\n", clid); -+ } else -+ msm_bus_dbg_fill_cl_buffer(pdata, index, clid); -+} -+EXPORT_SYMBOL(msm_bus_dbg_client_data); -+ -+/** -+ * msm_bus_dbg_commit_data() - Add commit data from fabrics -+ * @fabname: Fabric name specified in platform data -+ * @cdata: Commit Data -+ * @nmasters: Number of masters attached to fabric -+ * @nslaves: Number of slaves attached to fabric -+ * @ntslaves: Number of tiered slaves attached to fabric -+ * @op: Operation to be performed -+ */ -+void msm_bus_dbg_commit_data(const char *fabname, void *cdata, -+ int nmasters, int nslaves, int ntslaves, int op) -+{ -+ struct dentry *file = NULL; -+ -+ if (op == MSM_BUS_DBG_REGISTER) -+ msm_bus_dbg_record_fabric(fabname, file); -+ else if (op == MSM_BUS_DBG_UNREGISTER) -+ msm_bus_dbg_free_fabric(fabname); -+ else -+ msm_bus_dbg_fill_fab_buffer(fabname, cdata, nmasters, -+ nslaves, ntslaves); -+} -+EXPORT_SYMBOL(msm_bus_dbg_commit_data); -+#endif -+ -+static int __init msm_bus_debugfs_init(void) -+{ -+ struct dentry *commit, *shell_client, *rules_dbg; -+ struct msm_bus_fab_list *fablist; -+ struct msm_bus_cldata *cldata = NULL; -+ uint64_t val = 0; -+ -+ dir = debugfs_create_dir("msm-bus-dbg", NULL); -+ if ((!dir) || IS_ERR(dir)) { -+ MSM_BUS_ERR("Couldn't create msm-bus-dbg\n"); -+ goto err; -+ } -+ -+ clients = debugfs_create_dir("client-data", dir); -+ if ((!dir) || IS_ERR(dir)) { -+ MSM_BUS_ERR("Couldn't create clients\n"); -+ goto err; -+ } -+ -+ shell_client = debugfs_create_dir("shell-client", dir); -+ if ((!dir) || IS_ERR(dir)) { -+ MSM_BUS_ERR("Couldn't create clients\n"); -+ goto err; -+ } -+ -+ commit = debugfs_create_dir("commit-data", dir); -+ if ((!dir) || IS_ERR(dir)) { -+ MSM_BUS_ERR("Couldn't create commit\n"); -+ goto err; -+ } -+ -+ rules_dbg = debugfs_create_dir("rules-dbg", dir); -+ if ((!rules_dbg) || IS_ERR(rules_dbg)) { -+ MSM_BUS_ERR("Couldn't create rules-dbg\n"); -+ goto err; -+ } -+ -+ if (debugfs_create_file("print_rules", S_IRUGO | S_IWUSR, -+ rules_dbg, &val, &rules_dbg_fops) == NULL) -+ goto err; -+ -+ if (debugfs_create_file("update_request", S_IRUGO | S_IWUSR, -+ shell_client, &val, &shell_client_en_fops) == NULL) -+ goto err; -+ if (debugfs_create_file("ib", S_IRUGO | S_IWUSR, shell_client, &val, -+ &shell_client_ib_fops) == NULL) -+ goto err; -+ if (debugfs_create_file("ab", S_IRUGO | S_IWUSR, shell_client, &val, -+ &shell_client_ab_fops) == NULL) -+ goto err; -+ if (debugfs_create_file("slv", S_IRUGO | S_IWUSR, shell_client, -+ &val, &shell_client_slv_fops) == NULL) -+ goto err; -+ if (debugfs_create_file("mas", S_IRUGO | S_IWUSR, shell_client, -+ &val, &shell_client_mas_fops) == NULL) -+ goto err; -+ if (debugfs_create_file("update-request", S_IRUGO | S_IWUSR, -+ clients, NULL, &msm_bus_dbg_update_request_fops) == NULL) -+ goto err; -+ -+ rules_buf = kzalloc(MAX_BUFF_SIZE, GFP_KERNEL); -+ if (!rules_buf) { -+ MSM_BUS_ERR("Failed to alloc rules_buf"); -+ goto err; -+ } -+ -+ list_for_each_entry(cldata, &cl_list, list) { -+ if (cldata->pdata->name == NULL) { -+ MSM_BUS_DBG("Client name not found\n"); -+ continue; -+ } -+ cldata->file = msm_bus_dbg_create(cldata-> -+ pdata->name, S_IRUGO, clients, cldata->clid); -+ } -+ -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ list_for_each_entry(fablist, &fabdata_list, list) { -+ fablist->file = debugfs_create_file(fablist->name, S_IRUGO, -+ commit, (void *)fablist->name, &fabric_data_fops); -+ if (fablist->file == NULL) { -+ MSM_BUS_DBG("Cannot create files for commit data\n"); -+ kfree(rules_buf); -+ goto err; -+ } -+ } -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+ -+ msm_bus_dbg_init_vectors(); -+ return 0; -+err: -+ debugfs_remove_recursive(dir); -+ return -ENODEV; -+} -+late_initcall(msm_bus_debugfs_init); -+ -+static void __exit msm_bus_dbg_teardown(void) -+{ -+ struct msm_bus_fab_list *fablist = NULL, *fablist_temp; -+ struct msm_bus_cldata *cldata = NULL, *cldata_temp; -+ -+ debugfs_remove_recursive(dir); -+ list_for_each_entry_safe(cldata, cldata_temp, &cl_list, list) { -+ list_del(&cldata->list); -+ kfree(cldata); -+ } -+ mutex_lock(&msm_bus_dbg_fablist_lock); -+ list_for_each_entry_safe(fablist, fablist_temp, &fabdata_list, list) { -+ list_del(&fablist->list); -+ kfree(fablist); -+ } -+ kfree(rules_buf); -+ mutex_unlock(&msm_bus_dbg_fablist_lock); -+} -+module_exit(msm_bus_dbg_teardown); -+MODULE_DESCRIPTION("Debugfs for msm bus scaling client"); -+MODULE_LICENSE("GPL v2"); -+MODULE_AUTHOR("Gagan Mac "); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_fabric_adhoc.c -@@ -0,0 +1,1281 @@ -+/* Copyright (c) 2014, Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "rpm-smd.h" -+#include "msm_bus_core.h" -+#include "msm_bus_adhoc.h" -+#include "msm_bus_noc.h" -+#include "msm_bus_bimc.h" -+ -+ssize_t vrail_show(struct device *dev, struct device_attribute *attr, -+ char *buf) -+{ -+ struct msm_bus_node_info_type *node_info = NULL; -+ struct msm_bus_node_device_type *bus_node = NULL; -+ -+ bus_node = dev->platform_data; -+ if (!bus_node) -+ return -EINVAL; -+ node_info = bus_node->node_info; -+ -+ return snprintf(buf, PAGE_SIZE, "%u", node_info->vrail_comp); -+} -+ -+ssize_t vrail_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) -+{ -+ struct msm_bus_node_info_type *node_info = NULL; -+ struct msm_bus_node_device_type *bus_node = NULL; -+ int ret = 0; -+ -+ bus_node = dev->platform_data; -+ if (!bus_node) -+ return -EINVAL; -+ node_info = bus_node->node_info; -+ -+ ret = sscanf(buf, "%u", &node_info->vrail_comp); -+ if (ret != 1) -+ return -EINVAL; -+ return count; -+} -+ -+DEVICE_ATTR(vrail, 0600, vrail_show, vrail_store); -+ -+struct static_rules_type { -+ int num_rules; -+ struct bus_rule_type *rules; -+}; -+ -+static struct static_rules_type static_rules; -+ -+static int enable_nodeclk(struct nodeclk *nclk) -+{ -+ int ret = 0; -+ -+ if (!nclk->enable) { -+ ret = clk_prepare_enable(nclk->clk); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: failed to enable clk ", __func__); -+ nclk->enable = false; -+ } else -+ nclk->enable = true; -+ } -+ return ret; -+} -+ -+static int disable_nodeclk(struct nodeclk *nclk) -+{ -+ int ret = 0; -+ -+ if (nclk->enable) { -+ clk_disable_unprepare(nclk->clk); -+ nclk->enable = false; -+ } -+ return ret; -+} -+ -+static int setrate_nodeclk(struct nodeclk *nclk, long rate) -+{ -+ int ret = 0; -+ -+ ret = clk_set_rate(nclk->clk, rate); -+ -+ if (ret) -+ MSM_BUS_ERR("%s: failed to setrate clk", __func__); -+ return ret; -+} -+ -+static int msm_bus_agg_fab_clks(struct device *bus_dev, void *data) -+{ -+ struct msm_bus_node_device_type *node = NULL; -+ int ret = 0; -+ int ctx = *(int *)data; -+ -+ if (ctx >= NUM_CTX) { -+ MSM_BUS_ERR("%s: Invalid Context %d", __func__, ctx); -+ goto exit_agg_fab_clks; -+ } -+ -+ node = bus_dev->platform_data; -+ if (!node) { -+ MSM_BUS_ERR("%s: Can't get device info", __func__); -+ goto exit_agg_fab_clks; -+ } -+ -+ if (!node->node_info->is_fab_dev) { -+ struct msm_bus_node_device_type *bus_dev = NULL; -+ -+ bus_dev = node->node_info->bus_device->platform_data; -+ -+ if (node->cur_clk_hz[ctx] >= bus_dev->cur_clk_hz[ctx]) -+ bus_dev->cur_clk_hz[ctx] = node->cur_clk_hz[ctx]; -+ } -+ -+exit_agg_fab_clks: -+ return ret; -+} -+ -+static int msm_bus_reset_fab_clks(struct device *bus_dev, void *data) -+{ -+ struct msm_bus_node_device_type *node = NULL; -+ int ret = 0; -+ int ctx = *(int *)data; -+ -+ if (ctx >= NUM_CTX) { -+ MSM_BUS_ERR("%s: Invalid Context %d", __func__, ctx); -+ goto exit_reset_fab_clks; -+ } -+ -+ node = bus_dev->platform_data; -+ if (!node) { -+ MSM_BUS_ERR("%s: Can't get device info", __func__); -+ goto exit_reset_fab_clks; -+ } -+ -+ if (node->node_info->is_fab_dev) { -+ node->cur_clk_hz[ctx] = 0; -+ MSM_BUS_DBG("Resetting for node %d", node->node_info->id); -+ } -+exit_reset_fab_clks: -+ return ret; -+} -+ -+ -+static int send_rpm_msg(struct device *device) -+{ -+ int ret = 0; -+ int ctx; -+ int rsc_type; -+ struct msm_bus_node_device_type *ndev = -+ device->platform_data; -+ struct msm_rpm_kvp rpm_kvp; -+ -+ if (!ndev) { -+ MSM_BUS_ERR("%s: Error getting node info.", __func__); -+ ret = -ENODEV; -+ goto exit_send_rpm_msg; -+ } -+ -+ rpm_kvp.length = sizeof(uint64_t); -+ rpm_kvp.key = RPM_MASTER_FIELD_BW; -+ -+ for (ctx = MSM_RPM_CTX_ACTIVE_SET; ctx <= MSM_RPM_CTX_SLEEP_SET; -+ ctx++) { -+ if (ctx == MSM_RPM_CTX_ACTIVE_SET) -+ rpm_kvp.data = -+ (uint8_t *)&ndev->node_ab.ab[MSM_RPM_CTX_ACTIVE_SET]; -+ else { -+ rpm_kvp.data = -+ (uint8_t *) &ndev->node_ab.ab[MSM_RPM_CTX_SLEEP_SET]; -+ } -+ -+ if (ndev->node_info->mas_rpm_id != -1) { -+ rsc_type = RPM_BUS_MASTER_REQ; -+ ret = msm_rpm_send_message(ctx, rsc_type, -+ ndev->node_info->mas_rpm_id, &rpm_kvp, 1); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to send RPM message:", -+ __func__); -+ MSM_BUS_ERR("%s:Node Id %d RPM id %d", -+ __func__, ndev->node_info->id, -+ ndev->node_info->mas_rpm_id); -+ goto exit_send_rpm_msg; -+ } -+ } -+ -+ if (ndev->node_info->slv_rpm_id != -1) { -+ rsc_type = RPM_BUS_SLAVE_REQ; -+ ret = msm_rpm_send_message(ctx, rsc_type, -+ ndev->node_info->slv_rpm_id, &rpm_kvp, 1); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to send RPM message:", -+ __func__); -+ MSM_BUS_ERR("%s: Node Id %d RPM id %d", -+ __func__, ndev->node_info->id, -+ ndev->node_info->slv_rpm_id); -+ goto exit_send_rpm_msg; -+ } -+ } -+ } -+exit_send_rpm_msg: -+ return ret; -+} -+ -+static int flush_bw_data(struct device *node_device, int ctx) -+{ -+ struct msm_bus_node_device_type *node_info; -+ int ret = 0; -+ -+ node_info = node_device->platform_data; -+ if (!node_info) { -+ MSM_BUS_ERR("%s: Unable to find bus device for device", -+ __func__); -+ ret = -ENODEV; -+ goto exit_flush_bw_data; -+ } -+ -+ if (node_info->node_ab.dirty) { -+ if (node_info->ap_owned) { -+ struct msm_bus_node_device_type *bus_device = -+ node_info->node_info->bus_device->platform_data; -+ struct msm_bus_fab_device_type *fabdev = -+ bus_device->fabdev; -+ -+ if (fabdev && fabdev->noc_ops.update_bw_reg && -+ fabdev->noc_ops.update_bw_reg -+ (node_info->node_info->qos_params.mode)) -+ ret = fabdev->noc_ops.set_bw(node_info, -+ fabdev->qos_base, -+ fabdev->base_offset, -+ fabdev->qos_off, -+ fabdev->qos_freq); -+ } else { -+ ret = send_rpm_msg(node_device); -+ -+ if (ret) -+ MSM_BUS_ERR("%s: Failed to send RPM msg for%d", -+ __func__, node_info->node_info->id); -+ } -+ node_info->node_ab.dirty = false; -+ } -+ -+exit_flush_bw_data: -+ return ret; -+ -+} -+ -+static int flush_clk_data(struct device *node_device, int ctx) -+{ -+ struct msm_bus_node_device_type *node; -+ struct nodeclk *nodeclk = NULL; -+ int ret = 0; -+ -+ node = node_device->platform_data; -+ if (!node) { -+ MSM_BUS_ERR("Unable to find bus device"); -+ ret = -ENODEV; -+ goto exit_flush_clk_data; -+ } -+ -+ nodeclk = &node->clk[ctx]; -+ if (node->node_info->is_fab_dev) { -+ if (nodeclk->rate != node->cur_clk_hz[ctx]) { -+ nodeclk->rate = node->cur_clk_hz[ctx]; -+ nodeclk->dirty = true; -+ } -+ } -+ -+ if (nodeclk && nodeclk->clk && nodeclk->dirty) { -+ long rounded_rate; -+ -+ if (nodeclk->rate) { -+ rounded_rate = clk_round_rate(nodeclk->clk, -+ nodeclk->rate); -+ ret = setrate_nodeclk(nodeclk, rounded_rate); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to set_rate %lu for %d", -+ __func__, rounded_rate, -+ node->node_info->id); -+ ret = -ENODEV; -+ goto exit_flush_clk_data; -+ } -+ -+ ret = enable_nodeclk(nodeclk); -+ } else -+ ret = disable_nodeclk(nodeclk); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to enable for %d", __func__, -+ node->node_info->id); -+ ret = -ENODEV; -+ goto exit_flush_clk_data; -+ } -+ MSM_BUS_DBG("%s: Updated %d clk to %llu", __func__, -+ node->node_info->id, nodeclk->rate); -+ -+ } -+exit_flush_clk_data: -+ /* Reset the aggregated clock rate for fab devices*/ -+ if (node && node->node_info->is_fab_dev) -+ node->cur_clk_hz[ctx] = 0; -+ -+ if (nodeclk) -+ nodeclk->dirty = 0; -+ return ret; -+} -+ -+int msm_bus_commit_data(int *dirty_nodes, int ctx, int num_dirty) -+{ -+ int ret = 0; -+ int i = 0; -+ -+ /* Aggregate the bus clocks */ -+ bus_for_each_dev(&msm_bus_type, NULL, (void *)&ctx, -+ msm_bus_agg_fab_clks); -+ -+ for (i = 0; i < num_dirty; i++) { -+ struct device *node_device = -+ bus_find_device(&msm_bus_type, NULL, -+ (void *)&dirty_nodes[i], -+ msm_bus_device_match_adhoc); -+ -+ if (!node_device) { -+ MSM_BUS_ERR("Can't find device for %d", dirty_nodes[i]); -+ continue; -+ } -+ -+ ret = flush_bw_data(node_device, ctx); -+ if (ret) -+ MSM_BUS_ERR("%s: Error flushing bw data for node %d", -+ __func__, dirty_nodes[i]); -+ -+ ret = flush_clk_data(node_device, ctx); -+ if (ret) -+ MSM_BUS_ERR("%s: Error flushing clk data for node %d", -+ __func__, dirty_nodes[i]); -+ } -+ kfree(dirty_nodes); -+ /* Aggregate the bus clocks */ -+ bus_for_each_dev(&msm_bus_type, NULL, (void *)&ctx, -+ msm_bus_reset_fab_clks); -+ return ret; -+} -+ -+void *msm_bus_realloc_devmem(struct device *dev, void *p, size_t old_size, -+ size_t new_size, gfp_t flags) -+{ -+ void *ret; -+ size_t copy_size = old_size; -+ -+ if (!new_size) { -+ devm_kfree(dev, p); -+ return ZERO_SIZE_PTR; -+ } -+ -+ if (new_size < old_size) -+ copy_size = new_size; -+ -+ ret = devm_kzalloc(dev, new_size, flags); -+ if (!ret) { -+ MSM_BUS_ERR("%s: Error Reallocating memory", __func__); -+ goto exit_realloc_devmem; -+ } -+ -+ memcpy(ret, p, copy_size); -+ devm_kfree(dev, p); -+exit_realloc_devmem: -+ return ret; -+} -+ -+ -+static int add_dirty_node(int **dirty_nodes, int id, int *num_dirty) -+{ -+ int i; -+ int found = 0; -+ int ret = 0; -+ int *dnode = NULL; -+ -+ for (i = 0; i < *num_dirty; i++) { -+ if ((*dirty_nodes)[i] == id) { -+ found = 1; -+ break; -+ } -+ } -+ -+ if (!found) { -+ (*num_dirty)++; -+ dnode = -+ krealloc(*dirty_nodes, sizeof(int) * (*num_dirty), -+ GFP_KERNEL); -+ -+ if (ZERO_OR_NULL_PTR(dnode)) { -+ MSM_BUS_ERR("%s: Failure allocating dirty nodes array", -+ __func__); -+ ret = -ENOMEM; -+ } else { -+ *dirty_nodes = dnode; -+ (*dirty_nodes)[(*num_dirty) - 1] = id; -+ } -+ } -+ -+ return ret; -+} -+ -+int msm_bus_update_bw(struct msm_bus_node_device_type *nodedev, int ctx, -+ int64_t add_bw, int **dirty_nodes, int *num_dirty) -+{ -+ int ret = 0; -+ int i, j; -+ uint64_t cur_ab_slp = 0; -+ uint64_t cur_ab_act = 0; -+ -+ if (nodedev->node_info->virt_dev) -+ goto exit_update_bw; -+ -+ for (i = 0; i < NUM_CTX; i++) { -+ for (j = 0; j < nodedev->num_lnodes; j++) { -+ if (i == DUAL_CTX) { -+ cur_ab_act += -+ nodedev->lnode_list[j].lnode_ab[i]; -+ cur_ab_slp += -+ nodedev->lnode_list[j].lnode_ab[i]; -+ } else -+ cur_ab_act += -+ nodedev->lnode_list[j].lnode_ab[i]; -+ } -+ } -+ -+ if (nodedev->node_ab.ab[MSM_RPM_CTX_ACTIVE_SET] != cur_ab_act) { -+ nodedev->node_ab.ab[MSM_RPM_CTX_ACTIVE_SET] = cur_ab_act; -+ nodedev->node_ab.ab[MSM_RPM_CTX_SLEEP_SET] = cur_ab_slp; -+ nodedev->node_ab.dirty = true; -+ ret = add_dirty_node(dirty_nodes, nodedev->node_info->id, -+ num_dirty); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to add dirty node %d", __func__, -+ nodedev->node_info->id); -+ goto exit_update_bw; -+ } -+ } -+ -+exit_update_bw: -+ return ret; -+} -+ -+int msm_bus_update_clks(struct msm_bus_node_device_type *nodedev, -+ int ctx, int **dirty_nodes, int *num_dirty) -+{ -+ int status = 0; -+ struct nodeclk *nodeclk; -+ struct nodeclk *busclk; -+ struct msm_bus_node_device_type *bus_info = NULL; -+ uint64_t req_clk; -+ -+ bus_info = nodedev->node_info->bus_device->platform_data; -+ -+ if (!bus_info) { -+ MSM_BUS_ERR("%s: Unable to find bus device for device %d", -+ __func__, nodedev->node_info->id); -+ status = -ENODEV; -+ goto exit_set_clks; -+ } -+ -+ req_clk = nodedev->cur_clk_hz[ctx]; -+ busclk = &bus_info->clk[ctx]; -+ -+ if (busclk->rate != req_clk) { -+ busclk->rate = req_clk; -+ busclk->dirty = 1; -+ MSM_BUS_DBG("%s: Modifying bus clk %d Rate %llu", __func__, -+ bus_info->node_info->id, req_clk); -+ status = add_dirty_node(dirty_nodes, bus_info->node_info->id, -+ num_dirty); -+ -+ if (status) { -+ MSM_BUS_ERR("%s: Failed to add dirty node %d", __func__, -+ bus_info->node_info->id); -+ goto exit_set_clks; -+ } -+ } -+ -+ req_clk = nodedev->cur_clk_hz[ctx]; -+ nodeclk = &nodedev->clk[ctx]; -+ -+ if (IS_ERR_OR_NULL(nodeclk)) -+ goto exit_set_clks; -+ -+ if (!nodeclk->dirty || (nodeclk->dirty && (nodeclk->rate < req_clk))) { -+ nodeclk->rate = req_clk; -+ nodeclk->dirty = 1; -+ MSM_BUS_DBG("%s: Modifying node clk %d Rate %llu", __func__, -+ nodedev->node_info->id, req_clk); -+ status = add_dirty_node(dirty_nodes, nodedev->node_info->id, -+ num_dirty); -+ if (status) { -+ MSM_BUS_ERR("%s: Failed to add dirty node %d", __func__, -+ nodedev->node_info->id); -+ goto exit_set_clks; -+ } -+ } -+ -+exit_set_clks: -+ return status; -+} -+ -+static void msm_bus_fab_init_noc_ops(struct msm_bus_node_device_type *bus_dev) -+{ -+ switch (bus_dev->fabdev->bus_type) { -+ case MSM_BUS_NOC: -+ msm_bus_noc_set_ops(bus_dev); -+ break; -+ case MSM_BUS_BIMC: -+ msm_bus_bimc_set_ops(bus_dev); -+ break; -+ default: -+ MSM_BUS_ERR("%s: Invalid Bus type", __func__); -+ } -+} -+ -+static int msm_bus_qos_disable_clk(struct msm_bus_node_device_type *node, -+ int disable_bus_qos_clk) -+{ -+ struct msm_bus_node_device_type *bus_node = NULL; -+ int ret = 0; -+ -+ if (!node) { -+ ret = -ENXIO; -+ goto exit_disable_qos_clk; -+ } -+ -+ bus_node = node->node_info->bus_device->platform_data; -+ -+ if (!bus_node) { -+ ret = -ENXIO; -+ goto exit_disable_qos_clk; -+ } -+ -+ if (disable_bus_qos_clk) -+ ret = disable_nodeclk(&bus_node->clk[DUAL_CTX]); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to disable bus clk, node %d", -+ __func__, node->node_info->id); -+ goto exit_disable_qos_clk; -+ } -+ -+ if (!IS_ERR_OR_NULL(node->qos_clk.clk)) { -+ ret = disable_nodeclk(&node->qos_clk); -+ -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to disable mas qos clk,node %d", -+ __func__, node->node_info->id); -+ goto exit_disable_qos_clk; -+ } -+ } -+ -+exit_disable_qos_clk: -+ return ret; -+} -+ -+static int msm_bus_qos_enable_clk(struct msm_bus_node_device_type *node) -+{ -+ struct msm_bus_node_device_type *bus_node = NULL; -+ long rounded_rate; -+ int ret = 0; -+ int bus_qos_enabled = 0; -+ -+ if (!node) { -+ ret = -ENXIO; -+ goto exit_enable_qos_clk; -+ } -+ -+ bus_node = node->node_info->bus_device->platform_data; -+ -+ if (!bus_node) { -+ ret = -ENXIO; -+ goto exit_enable_qos_clk; -+ } -+ -+ /* Check if the bus clk is already set before trying to set it -+ * Do this only during -+ * a. Bootup -+ * b. Only for bus clks -+ **/ -+ if (!clk_get_rate(bus_node->clk[DUAL_CTX].clk)) { -+ rounded_rate = clk_round_rate(bus_node->clk[DUAL_CTX].clk, 1); -+ ret = setrate_nodeclk(&bus_node->clk[DUAL_CTX], rounded_rate); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to set bus clk, node %d", -+ __func__, node->node_info->id); -+ goto exit_enable_qos_clk; -+ } -+ -+ ret = enable_nodeclk(&bus_node->clk[DUAL_CTX]); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to enable bus clk, node %d", -+ __func__, node->node_info->id); -+ goto exit_enable_qos_clk; -+ } -+ bus_qos_enabled = 1; -+ } -+ -+ if (!IS_ERR_OR_NULL(node->qos_clk.clk)) { -+ rounded_rate = clk_round_rate(node->qos_clk.clk, 1); -+ ret = setrate_nodeclk(&node->qos_clk, rounded_rate); -+ if (ret) { -+ MSM_BUS_ERR("%s: Failed to enable mas qos clk, node %d", -+ __func__, node->node_info->id); -+ goto exit_enable_qos_clk; -+ } -+ -+ ret = enable_nodeclk(&node->qos_clk); -+ if (ret) { -+ MSM_BUS_ERR("Err enable mas qos clk, node %d ret %d", -+ node->node_info->id, ret); -+ goto exit_enable_qos_clk; -+ } -+ } -+ ret = bus_qos_enabled; -+ -+exit_enable_qos_clk: -+ return ret; -+} -+ -+int msm_bus_enable_limiter(struct msm_bus_node_device_type *node_dev, -+ bool enable, uint64_t lim_bw) -+{ -+ int ret = 0; -+ struct msm_bus_node_device_type *bus_node_dev; -+ -+ if (!node_dev) { -+ MSM_BUS_ERR("No device specified"); -+ ret = -ENXIO; -+ goto exit_enable_limiter; -+ } -+ -+ if (!node_dev->ap_owned) { -+ MSM_BUS_ERR("Device is not AP owned %d.", -+ node_dev->node_info->id); -+ ret = -ENXIO; -+ goto exit_enable_limiter; -+ } -+ -+ bus_node_dev = node_dev->node_info->bus_device->platform_data; -+ if (!bus_node_dev) { -+ MSM_BUS_ERR("Unable to get bus device infofor %d", -+ node_dev->node_info->id); -+ ret = -ENXIO; -+ goto exit_enable_limiter; -+ } -+ if (bus_node_dev->fabdev && -+ bus_node_dev->fabdev->noc_ops.limit_mport) { -+ ret = msm_bus_qos_enable_clk(node_dev); -+ if (ret < 0) { -+ MSM_BUS_ERR("Can't Enable QoS clk %d", -+ node_dev->node_info->id); -+ goto exit_enable_limiter; -+ } -+ bus_node_dev->fabdev->noc_ops.limit_mport( -+ node_dev, -+ bus_node_dev->fabdev->qos_base, -+ bus_node_dev->fabdev->base_offset, -+ bus_node_dev->fabdev->qos_off, -+ bus_node_dev->fabdev->qos_freq, -+ enable, lim_bw); -+ msm_bus_qos_disable_clk(node_dev, ret); -+ } -+ -+exit_enable_limiter: -+ return ret; -+} -+ -+static int msm_bus_dev_init_qos(struct device *dev, void *data) -+{ -+ int ret = 0; -+ struct msm_bus_node_device_type *node_dev = NULL; -+ -+ node_dev = dev->platform_data; -+ -+ if (!node_dev) { -+ MSM_BUS_ERR("%s: Unable to get node device info" , __func__); -+ ret = -ENXIO; -+ goto exit_init_qos; -+ } -+ -+ MSM_BUS_DBG("Device = %d", node_dev->node_info->id); -+ -+ if (node_dev->ap_owned) { -+ struct msm_bus_node_device_type *bus_node_info; -+ -+ bus_node_info = node_dev->node_info->bus_device->platform_data; -+ -+ if (!bus_node_info) { -+ MSM_BUS_ERR("%s: Unable to get bus device infofor %d", -+ __func__, -+ node_dev->node_info->id); -+ ret = -ENXIO; -+ goto exit_init_qos; -+ } -+ -+ if (bus_node_info->fabdev && -+ bus_node_info->fabdev->noc_ops.qos_init) { -+ int ret = 0; -+ -+ if (node_dev->ap_owned && -+ (node_dev->node_info->qos_params.mode) != -1) { -+ -+ if (bus_node_info->fabdev->bypass_qos_prg) -+ goto exit_init_qos; -+ -+ ret = msm_bus_qos_enable_clk(node_dev); -+ if (ret < 0) { -+ MSM_BUS_ERR("Can't Enable QoS clk %d", -+ node_dev->node_info->id); -+ goto exit_init_qos; -+ } -+ -+ bus_node_info->fabdev->noc_ops.qos_init( -+ node_dev, -+ bus_node_info->fabdev->qos_base, -+ bus_node_info->fabdev->base_offset, -+ bus_node_info->fabdev->qos_off, -+ bus_node_info->fabdev->qos_freq); -+ msm_bus_qos_disable_clk(node_dev, ret); -+ } -+ } else -+ MSM_BUS_ERR("%s: Skipping QOS init for %d", -+ __func__, node_dev->node_info->id); -+ } -+exit_init_qos: -+ return ret; -+} -+ -+static int msm_bus_fabric_init(struct device *dev, -+ struct msm_bus_node_device_type *pdata) -+{ -+ struct msm_bus_fab_device_type *fabdev; -+ struct msm_bus_node_device_type *node_dev = NULL; -+ int ret = 0; -+ -+ node_dev = dev->platform_data; -+ if (!node_dev) { -+ MSM_BUS_ERR("%s: Unable to get bus device info" , __func__); -+ ret = -ENXIO; -+ goto exit_fabric_init; -+ } -+ -+ if (node_dev->node_info->virt_dev) { -+ MSM_BUS_ERR("%s: Skip Fab init for virtual device %d", __func__, -+ node_dev->node_info->id); -+ goto exit_fabric_init; -+ } -+ -+ fabdev = devm_kzalloc(dev, sizeof(struct msm_bus_fab_device_type), -+ GFP_KERNEL); -+ if (!fabdev) { -+ MSM_BUS_ERR("Fabric alloc failed\n"); -+ ret = -ENOMEM; -+ goto exit_fabric_init; -+ } -+ -+ node_dev->fabdev = fabdev; -+ fabdev->pqos_base = pdata->fabdev->pqos_base; -+ fabdev->qos_range = pdata->fabdev->qos_range; -+ fabdev->base_offset = pdata->fabdev->base_offset; -+ fabdev->qos_off = pdata->fabdev->qos_off; -+ fabdev->qos_freq = pdata->fabdev->qos_freq; -+ fabdev->bus_type = pdata->fabdev->bus_type; -+ fabdev->bypass_qos_prg = pdata->fabdev->bypass_qos_prg; -+ fabdev->util_fact = pdata->fabdev->util_fact; -+ fabdev->vrail_comp = pdata->fabdev->vrail_comp; -+ msm_bus_fab_init_noc_ops(node_dev); -+ -+ fabdev->qos_base = devm_ioremap(dev, -+ fabdev->pqos_base, fabdev->qos_range); -+ if (!fabdev->qos_base) { -+ MSM_BUS_ERR("%s: Error remapping address 0x%zx :bus device %d", -+ __func__, -+ (size_t)fabdev->pqos_base, node_dev->node_info->id); -+ ret = -ENOMEM; -+ goto exit_fabric_init; -+ } -+ -+ /*if (msmbus_coresight_init(pdev)) -+ pr_warn("Coresight support absent for bus: %d\n", pdata->id);*/ -+exit_fabric_init: -+ return ret; -+} -+ -+static int msm_bus_init_clk(struct device *bus_dev, -+ struct msm_bus_node_device_type *pdata) -+{ -+ unsigned int ctx; -+ int ret = 0; -+ struct msm_bus_node_device_type *node_dev = bus_dev->platform_data; -+ -+ for (ctx = 0; ctx < NUM_CTX; ctx++) { -+ if (!IS_ERR_OR_NULL(pdata->clk[ctx].clk)) { -+ node_dev->clk[ctx].clk = pdata->clk[ctx].clk; -+ node_dev->clk[ctx].enable = false; -+ node_dev->clk[ctx].dirty = false; -+ MSM_BUS_ERR("%s: Valid node clk node %d ctx %d", -+ __func__, node_dev->node_info->id, ctx); -+ } -+ } -+ -+ if (!IS_ERR_OR_NULL(pdata->qos_clk.clk)) { -+ node_dev->qos_clk.clk = pdata->qos_clk.clk; -+ node_dev->qos_clk.enable = false; -+ MSM_BUS_ERR("%s: Valid Iface clk node %d", __func__, -+ node_dev->node_info->id); -+ } -+ -+ return ret; -+} -+ -+static int msm_bus_copy_node_info(struct msm_bus_node_device_type *pdata, -+ struct device *bus_dev) -+{ -+ int ret = 0; -+ struct msm_bus_node_info_type *node_info = NULL; -+ struct msm_bus_node_info_type *pdata_node_info = NULL; -+ struct msm_bus_node_device_type *bus_node = NULL; -+ -+ bus_node = bus_dev->platform_data; -+ -+ if (!bus_node || !pdata) { -+ ret = -ENXIO; -+ MSM_BUS_ERR("%s: Invalid pointers pdata %p, bus_node %p", -+ __func__, pdata, bus_node); -+ goto exit_copy_node_info; -+ } -+ -+ node_info = bus_node->node_info; -+ pdata_node_info = pdata->node_info; -+ -+ node_info->name = pdata_node_info->name; -+ node_info->id = pdata_node_info->id; -+ node_info->bus_device_id = pdata_node_info->bus_device_id; -+ node_info->mas_rpm_id = pdata_node_info->mas_rpm_id; -+ node_info->slv_rpm_id = pdata_node_info->slv_rpm_id; -+ node_info->num_connections = pdata_node_info->num_connections; -+ node_info->num_blist = pdata_node_info->num_blist; -+ node_info->num_qports = pdata_node_info->num_qports; -+ node_info->buswidth = pdata_node_info->buswidth; -+ node_info->virt_dev = pdata_node_info->virt_dev; -+ node_info->is_fab_dev = pdata_node_info->is_fab_dev; -+ node_info->qos_params.mode = pdata_node_info->qos_params.mode; -+ node_info->qos_params.prio1 = pdata_node_info->qos_params.prio1; -+ node_info->qos_params.prio0 = pdata_node_info->qos_params.prio0; -+ node_info->qos_params.prio_lvl = pdata_node_info->qos_params.prio_lvl; -+ node_info->qos_params.prio_rd = pdata_node_info->qos_params.prio_rd; -+ node_info->qos_params.prio_wr = pdata_node_info->qos_params.prio_wr; -+ node_info->qos_params.gp = pdata_node_info->qos_params.gp; -+ node_info->qos_params.thmp = pdata_node_info->qos_params.thmp; -+ node_info->qos_params.ws = pdata_node_info->qos_params.ws; -+ node_info->qos_params.bw_buffer = pdata_node_info->qos_params.bw_buffer; -+ node_info->util_fact = pdata_node_info->util_fact; -+ node_info->vrail_comp = pdata_node_info->vrail_comp; -+ -+ node_info->dev_connections = devm_kzalloc(bus_dev, -+ sizeof(struct device *) * -+ pdata_node_info->num_connections, -+ GFP_KERNEL); -+ if (!node_info->dev_connections) { -+ MSM_BUS_ERR("%s:Bus dev connections alloc failed\n", __func__); -+ ret = -ENOMEM; -+ goto exit_copy_node_info; -+ } -+ -+ node_info->connections = devm_kzalloc(bus_dev, -+ sizeof(int) * pdata_node_info->num_connections, -+ GFP_KERNEL); -+ if (!node_info->connections) { -+ MSM_BUS_ERR("%s:Bus connections alloc failed\n", __func__); -+ devm_kfree(bus_dev, node_info->dev_connections); -+ ret = -ENOMEM; -+ goto exit_copy_node_info; -+ } -+ -+ memcpy(node_info->connections, -+ pdata_node_info->connections, -+ sizeof(int) * pdata_node_info->num_connections); -+ -+ node_info->black_connections = devm_kzalloc(bus_dev, -+ sizeof(struct device *) * -+ pdata_node_info->num_blist, -+ GFP_KERNEL); -+ if (!node_info->black_connections) { -+ MSM_BUS_ERR("%s: Bus black connections alloc failed\n", -+ __func__); -+ devm_kfree(bus_dev, node_info->dev_connections); -+ devm_kfree(bus_dev, node_info->connections); -+ ret = -ENOMEM; -+ goto exit_copy_node_info; -+ } -+ -+ node_info->black_listed_connections = devm_kzalloc(bus_dev, -+ pdata_node_info->num_blist * sizeof(int), -+ GFP_KERNEL); -+ if (!node_info->black_listed_connections) { -+ MSM_BUS_ERR("%s:Bus black list connections alloc failed\n", -+ __func__); -+ devm_kfree(bus_dev, node_info->black_connections); -+ devm_kfree(bus_dev, node_info->dev_connections); -+ devm_kfree(bus_dev, node_info->connections); -+ ret = -ENOMEM; -+ goto exit_copy_node_info; -+ } -+ -+ memcpy(node_info->black_listed_connections, -+ pdata_node_info->black_listed_connections, -+ sizeof(int) * pdata_node_info->num_blist); -+ -+ node_info->qport = devm_kzalloc(bus_dev, -+ sizeof(int) * pdata_node_info->num_qports, -+ GFP_KERNEL); -+ if (!node_info->qport) { -+ MSM_BUS_ERR("%s:Bus qport allocation failed\n", __func__); -+ devm_kfree(bus_dev, node_info->dev_connections); -+ devm_kfree(bus_dev, node_info->connections); -+ devm_kfree(bus_dev, node_info->black_listed_connections); -+ ret = -ENOMEM; -+ goto exit_copy_node_info; -+ } -+ -+ memcpy(node_info->qport, -+ pdata_node_info->qport, -+ sizeof(int) * pdata_node_info->num_qports); -+ -+exit_copy_node_info: -+ return ret; -+} -+ -+static struct device *msm_bus_device_init( -+ struct msm_bus_node_device_type *pdata) -+{ -+ struct device *bus_dev = NULL; -+ struct msm_bus_node_device_type *bus_node = NULL; -+ struct msm_bus_node_info_type *node_info = NULL; -+ int ret = 0; -+ -+ bus_dev = kzalloc(sizeof(struct device), GFP_KERNEL); -+ if (!bus_dev) { -+ MSM_BUS_ERR("%s:Device alloc failed\n", __func__); -+ bus_dev = NULL; -+ goto exit_device_init; -+ } -+ /** -+ * Init here so we can use devm calls -+ */ -+ device_initialize(bus_dev); -+ -+ bus_node = devm_kzalloc(bus_dev, -+ sizeof(struct msm_bus_node_device_type), GFP_KERNEL); -+ if (!bus_node) { -+ MSM_BUS_ERR("%s:Bus node alloc failed\n", __func__); -+ kfree(bus_dev); -+ bus_dev = NULL; -+ goto exit_device_init; -+ } -+ -+ node_info = devm_kzalloc(bus_dev, -+ sizeof(struct msm_bus_node_info_type), GFP_KERNEL); -+ if (!node_info) { -+ MSM_BUS_ERR("%s:Bus node info alloc failed\n", __func__); -+ devm_kfree(bus_dev, bus_node); -+ kfree(bus_dev); -+ bus_dev = NULL; -+ goto exit_device_init; -+ } -+ -+ bus_node->node_info = node_info; -+ bus_node->ap_owned = pdata->ap_owned; -+ bus_dev->platform_data = bus_node; -+ -+ if (msm_bus_copy_node_info(pdata, bus_dev) < 0) { -+ devm_kfree(bus_dev, bus_node); -+ devm_kfree(bus_dev, node_info); -+ kfree(bus_dev); -+ bus_dev = NULL; -+ goto exit_device_init; -+ } -+ -+ bus_dev->bus = &msm_bus_type; -+ dev_set_name(bus_dev, bus_node->node_info->name); -+ -+ ret = device_add(bus_dev); -+ if (ret < 0) { -+ MSM_BUS_ERR("%s: Error registering device %d", -+ __func__, pdata->node_info->id); -+ devm_kfree(bus_dev, bus_node); -+ devm_kfree(bus_dev, node_info->dev_connections); -+ devm_kfree(bus_dev, node_info->connections); -+ devm_kfree(bus_dev, node_info->black_connections); -+ devm_kfree(bus_dev, node_info->black_listed_connections); -+ devm_kfree(bus_dev, node_info); -+ kfree(bus_dev); -+ bus_dev = NULL; -+ goto exit_device_init; -+ } -+ device_create_file(bus_dev, &dev_attr_vrail); -+ -+exit_device_init: -+ return bus_dev; -+} -+ -+static int msm_bus_setup_dev_conn(struct device *bus_dev, void *data) -+{ -+ struct msm_bus_node_device_type *bus_node = NULL; -+ int ret = 0; -+ int j; -+ -+ bus_node = bus_dev->platform_data; -+ if (!bus_node) { -+ MSM_BUS_ERR("%s: Can't get device info", __func__); -+ ret = -ENODEV; -+ goto exit_setup_dev_conn; -+ } -+ -+ /* Setup parent bus device for this node */ -+ if (!bus_node->node_info->is_fab_dev) { -+ struct device *bus_parent_device = -+ bus_find_device(&msm_bus_type, NULL, -+ (void *)&bus_node->node_info->bus_device_id, -+ msm_bus_device_match_adhoc); -+ -+ if (!bus_parent_device) { -+ MSM_BUS_ERR("%s: Error finding parentdev %d parent %d", -+ __func__, -+ bus_node->node_info->id, -+ bus_node->node_info->bus_device_id); -+ ret = -ENXIO; -+ goto exit_setup_dev_conn; -+ } -+ bus_node->node_info->bus_device = bus_parent_device; -+ } -+ -+ bus_node->node_info->is_traversed = false; -+ -+ for (j = 0; j < bus_node->node_info->num_connections; j++) { -+ bus_node->node_info->dev_connections[j] = -+ bus_find_device(&msm_bus_type, NULL, -+ (void *)&bus_node->node_info->connections[j], -+ msm_bus_device_match_adhoc); -+ -+ if (!bus_node->node_info->dev_connections[j]) { -+ MSM_BUS_ERR("%s: Error finding conn %d for device %d", -+ __func__, bus_node->node_info->connections[j], -+ bus_node->node_info->id); -+ ret = -ENODEV; -+ goto exit_setup_dev_conn; -+ } -+ } -+ -+ for (j = 0; j < bus_node->node_info->num_blist; j++) { -+ bus_node->node_info->black_connections[j] = -+ bus_find_device(&msm_bus_type, NULL, -+ (void *)&bus_node->node_info-> -+ black_listed_connections[j], -+ msm_bus_device_match_adhoc); -+ -+ if (!bus_node->node_info->black_connections[j]) { -+ MSM_BUS_ERR("%s: Error finding conn %d for device %d\n", -+ __func__, bus_node->node_info-> -+ black_listed_connections[j], -+ bus_node->node_info->id); -+ ret = -ENODEV; -+ goto exit_setup_dev_conn; -+ } -+ } -+ -+exit_setup_dev_conn: -+ return ret; -+} -+ -+static int msm_bus_node_debug(struct device *bus_dev, void *data) -+{ -+ int j; -+ int ret = 0; -+ struct msm_bus_node_device_type *bus_node = NULL; -+ -+ bus_node = bus_dev->platform_data; -+ if (!bus_node) { -+ MSM_BUS_ERR("%s: Can't get device info", __func__); -+ ret = -ENODEV; -+ goto exit_node_debug; -+ } -+ -+ MSM_BUS_DBG("Device = %d buswidth %u", bus_node->node_info->id, -+ bus_node->node_info->buswidth); -+ for (j = 0; j < bus_node->node_info->num_connections; j++) { -+ struct msm_bus_node_device_type *bdev = -+ (struct msm_bus_node_device_type *) -+ bus_node->node_info->dev_connections[j]->platform_data; -+ MSM_BUS_DBG("\n\t Connection[%d] %d", j, bdev->node_info->id); -+ } -+ -+exit_node_debug: -+ return ret; -+} -+ -+static int msm_bus_device_probe(struct platform_device *pdev) -+{ -+ unsigned int i, ret; -+ struct msm_bus_device_node_registration *pdata; -+ -+ /* If possible, get pdata from device-tree */ -+ if (pdev->dev.of_node) -+ pdata = msm_bus_of_to_pdata(pdev); -+ else { -+ pdata = (struct msm_bus_device_node_registration *)pdev-> -+ dev.platform_data; -+ } -+ -+ if (IS_ERR_OR_NULL(pdata)) { -+ MSM_BUS_ERR("No platform data found"); -+ ret = -ENODATA; -+ goto exit_device_probe; -+ } -+ -+ for (i = 0; i < pdata->num_devices; i++) { -+ struct device *node_dev = NULL; -+ -+ node_dev = msm_bus_device_init(&pdata->info[i]); -+ -+ if (!node_dev) { -+ MSM_BUS_ERR("%s: Error during dev init for %d", -+ __func__, pdata->info[i].node_info->id); -+ ret = -ENXIO; -+ goto exit_device_probe; -+ } -+ -+ ret = msm_bus_init_clk(node_dev, &pdata->info[i]); -+ /*Is this a fabric device ?*/ -+ if (pdata->info[i].node_info->is_fab_dev) { -+ MSM_BUS_DBG("%s: %d is a fab", __func__, -+ pdata->info[i].node_info->id); -+ ret = msm_bus_fabric_init(node_dev, &pdata->info[i]); -+ if (ret) { -+ MSM_BUS_ERR("%s: Error intializing fab %d", -+ __func__, pdata->info[i].node_info->id); -+ goto exit_device_probe; -+ } -+ } -+ } -+ -+ ret = bus_for_each_dev(&msm_bus_type, NULL, NULL, -+ msm_bus_setup_dev_conn); -+ if (ret) { -+ MSM_BUS_ERR("%s: Error setting up dev connections", __func__); -+ goto exit_device_probe; -+ } -+ -+ ret = bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_dev_init_qos); -+ if (ret) { -+ MSM_BUS_ERR("%s: Error during qos init", __func__); -+ goto exit_device_probe; -+ } -+ -+ bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_node_debug); -+ -+ /* Register the arb layer ops */ -+ msm_bus_arb_setops_adhoc(&arb_ops); -+ devm_kfree(&pdev->dev, pdata->info); -+ devm_kfree(&pdev->dev, pdata); -+exit_device_probe: -+ return ret; -+} -+ -+static int msm_bus_device_rules_probe(struct platform_device *pdev) -+{ -+ struct bus_rule_type *rule_data = NULL; -+ int num_rules = 0; -+ -+ num_rules = msm_bus_of_get_static_rules(pdev, &rule_data); -+ -+ if (!rule_data) -+ goto exit_rules_probe; -+ -+ msm_rule_register(num_rules, rule_data, NULL); -+ static_rules.num_rules = num_rules; -+ static_rules.rules = rule_data; -+ pdev->dev.platform_data = &static_rules; -+ -+exit_rules_probe: -+ return 0; -+} -+ -+int msm_bus_device_rules_remove(struct platform_device *pdev) -+{ -+ struct static_rules_type *static_rules = NULL; -+ -+ static_rules = pdev->dev.platform_data; -+ if (static_rules) -+ msm_rule_unregister(static_rules->num_rules, -+ static_rules->rules, NULL); -+ return 0; -+} -+ -+static int msm_bus_free_dev(struct device *dev, void *data) -+{ -+ struct msm_bus_node_device_type *bus_node = NULL; -+ -+ bus_node = dev->platform_data; -+ -+ if (bus_node) -+ MSM_BUS_ERR("\n%s: Removing device %d", __func__, -+ bus_node->node_info->id); -+ device_unregister(dev); -+ return 0; -+} -+ -+int msm_bus_device_remove(struct platform_device *pdev) -+{ -+ bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_free_dev); -+ return 0; -+} -+ -+static struct of_device_id rules_match[] = { -+ {.compatible = "qcom,msm-bus-static-bw-rules"}, -+ {} -+}; -+ -+static struct platform_driver msm_bus_rules_driver = { -+ .probe = msm_bus_device_rules_probe, -+ .remove = msm_bus_device_rules_remove, -+ .driver = { -+ .name = "msm_bus_rules_device", -+ .owner = THIS_MODULE, -+ .of_match_table = rules_match, -+ }, -+}; -+ -+static struct of_device_id fabric_match[] = { -+ {.compatible = "qcom,msm-bus-device"}, -+ {} -+}; -+ -+static struct platform_driver msm_bus_device_driver = { -+ .probe = msm_bus_device_probe, -+ .remove = msm_bus_device_remove, -+ .driver = { -+ .name = "msm_bus_device", -+ .owner = THIS_MODULE, -+ .of_match_table = fabric_match, -+ }, -+}; -+ -+int __init msm_bus_device_init_driver(void) -+{ -+ int rc; -+ -+ MSM_BUS_ERR("msm_bus_fabric_init_driver\n"); -+ rc = platform_driver_register(&msm_bus_device_driver); -+ -+ if (rc) { -+ MSM_BUS_ERR("Failed to register bus device driver"); -+ return rc; -+ } -+ return platform_driver_register(&msm_bus_rules_driver); -+} -+subsys_initcall(msm_bus_device_init_driver); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_id.c -@@ -0,0 +1,94 @@ -+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include "msm-bus.h" -+#include "msm-bus-board.h" -+#include "msm_bus_core.h" -+#include "msm_bus_noc.h" -+#include "msm_bus_bimc.h" -+ -+static uint32_t master_iids[MSM_BUS_MASTER_LAST]; -+static uint32_t slave_iids[MSM_BUS_SLAVE_LAST - SLAVE_ID_KEY]; -+ -+static void msm_bus_assign_iids(struct msm_bus_fabric_registration -+ *fabreg, int fabid) -+{ -+ int i; -+ for (i = 0; i < fabreg->len; i++) { -+ if (!fabreg->info[i].gateway) { -+ fabreg->info[i].priv_id = fabid + fabreg->info[i].id; -+ if (fabreg->info[i].id < SLAVE_ID_KEY) { -+ if (fabreg->info[i].id >= MSM_BUS_MASTER_LAST) { -+ WARN(1, "id %d exceeds array size!\n", -+ fabreg->info[i].id); -+ continue; -+ } -+ -+ master_iids[fabreg->info[i].id] = -+ fabreg->info[i].priv_id; -+ } else { -+ if ((fabreg->info[i].id - SLAVE_ID_KEY) >= -+ (MSM_BUS_SLAVE_LAST - SLAVE_ID_KEY)) { -+ WARN(1, "id %d exceeds array size!\n", -+ fabreg->info[i].id); -+ continue; -+ } -+ -+ slave_iids[fabreg->info[i].id - (SLAVE_ID_KEY)] -+ = fabreg->info[i].priv_id; -+ } -+ } else { -+ fabreg->info[i].priv_id = fabreg->info[i].id; -+ } -+ } -+} -+ -+static int msm_bus_get_iid(int id) -+{ -+ if ((id < SLAVE_ID_KEY && id >= MSM_BUS_MASTER_LAST) || -+ id >= MSM_BUS_SLAVE_LAST) { -+ MSM_BUS_ERR("Cannot get iid. Invalid id %d passed\n", id); -+ return -EINVAL; -+ } -+ -+ return CHECK_ID(((id < SLAVE_ID_KEY) ? master_iids[id] : -+ slave_iids[id - SLAVE_ID_KEY]), id); -+} -+ -+static struct msm_bus_board_algorithm msm_bus_id_algo = { -+ .get_iid = msm_bus_get_iid, -+ .assign_iids = msm_bus_assign_iids, -+}; -+ -+int msm_bus_board_rpm_get_il_ids(uint16_t *id) -+{ -+ return -ENXIO; -+} -+ -+void msm_bus_board_init(struct msm_bus_fabric_registration *pdata) -+{ -+ pdata->board_algo = &msm_bus_id_algo; -+} -+ -+void msm_bus_board_set_nfab(struct msm_bus_fabric_registration *pdata, -+ int nfab) -+{ -+ if (nfab <= 0) -+ return; -+ -+ msm_bus_id_algo.board_nfab = nfab; -+} ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_noc.c -@@ -0,0 +1,770 @@ -+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#define pr_fmt(fmt) "AXI: NOC: %s(): " fmt, __func__ -+ -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm_bus_core.h" -+#include "msm_bus_noc.h" -+#include "msm_bus_adhoc.h" -+ -+/* NOC_QOS generic */ -+#define __CLZ(x) ((8 * sizeof(uint32_t)) - 1 - __fls(x)) -+#define SAT_SCALE 16 /* 16 bytes minimum for saturation */ -+#define BW_SCALE 256 /* 1/256 byte per cycle unit */ -+#define QOS_DEFAULT_BASEOFFSET 0x00003000 -+#define QOS_DEFAULT_DELTA 0x80 -+#define MAX_BW_FIELD (NOC_QOS_BWn_BW_BMSK >> NOC_QOS_BWn_BW_SHFT) -+#define MAX_SAT_FIELD (NOC_QOS_SATn_SAT_BMSK >> NOC_QOS_SATn_SAT_SHFT) -+ -+#define NOC_QOS_REG_BASE(b, o) ((b) + (o)) -+ -+#define NOC_QOS_ID_COREIDn_ADDR(b, o, n, d) \ -+ (NOC_QOS_REG_BASE(b, o) + (d) * (n)) -+enum noc_qos_id_coreidn { -+ NOC_QOS_ID_COREIDn_RMSK = 0xffffffff, -+ NOC_QOS_ID_COREIDn_MAXn = 32, -+ NOC_QOS_ID_COREIDn_CORECHSUM_BMSK = 0xffffff00, -+ NOC_QOS_ID_COREIDn_CORECHSUM_SHFT = 0x8, -+ NOC_QOS_ID_COREIDn_CORETYPEID_BMSK = 0xff, -+ NOC_QOS_ID_COREIDn_CORETYPEID_SHFT = 0x0, -+}; -+ -+#define NOC_QOS_ID_REVISIONIDn_ADDR(b, o, n, d) \ -+ (NOC_QOS_REG_BASE(b, o) + 0x4 + (d) * (n)) -+enum noc_qos_id_revisionidn { -+ NOC_QOS_ID_REVISIONIDn_RMSK = 0xffffffff, -+ NOC_QOS_ID_REVISIONIDn_MAXn = 32, -+ NOC_QOS_ID_REVISIONIDn_FLEXNOCID_BMSK = 0xffffff00, -+ NOC_QOS_ID_REVISIONIDn_FLEXNOCID_SHFT = 0x8, -+ NOC_QOS_ID_REVISIONIDn_USERID_BMSK = 0xff, -+ NOC_QOS_ID_REVISIONIDn_USERID_SHFT = 0x0, -+}; -+ -+#define NOC_QOS_PRIORITYn_ADDR(b, o, n, d) \ -+ (NOC_QOS_REG_BASE(b, o) + 0x8 + (d) * (n)) -+enum noc_qos_id_priorityn { -+ NOC_QOS_PRIORITYn_RMSK = 0x0000000f, -+ NOC_QOS_PRIORITYn_MAXn = 32, -+ NOC_QOS_PRIORITYn_P1_BMSK = 0xc, -+ NOC_QOS_PRIORITYn_P1_SHFT = 0x2, -+ NOC_QOS_PRIORITYn_P0_BMSK = 0x3, -+ NOC_QOS_PRIORITYn_P0_SHFT = 0x0, -+}; -+ -+#define NOC_QOS_MODEn_ADDR(b, o, n, d) \ -+ (NOC_QOS_REG_BASE(b, o) + 0xC + (d) * (n)) -+enum noc_qos_id_moden_rmsk { -+ NOC_QOS_MODEn_RMSK = 0x00000003, -+ NOC_QOS_MODEn_MAXn = 32, -+ NOC_QOS_MODEn_MODE_BMSK = 0x3, -+ NOC_QOS_MODEn_MODE_SHFT = 0x0, -+}; -+ -+#define NOC_QOS_BWn_ADDR(b, o, n, d) \ -+ (NOC_QOS_REG_BASE(b, o) + 0x10 + (d) * (n)) -+enum noc_qos_id_bwn { -+ NOC_QOS_BWn_RMSK = 0x0000ffff, -+ NOC_QOS_BWn_MAXn = 32, -+ NOC_QOS_BWn_BW_BMSK = 0xffff, -+ NOC_QOS_BWn_BW_SHFT = 0x0, -+}; -+ -+/* QOS Saturation registers */ -+#define NOC_QOS_SATn_ADDR(b, o, n, d) \ -+ (NOC_QOS_REG_BASE(b, o) + 0x14 + (d) * (n)) -+enum noc_qos_id_saturationn { -+ NOC_QOS_SATn_RMSK = 0x000003ff, -+ NOC_QOS_SATn_MAXn = 32, -+ NOC_QOS_SATn_SAT_BMSK = 0x3ff, -+ NOC_QOS_SATn_SAT_SHFT = 0x0, -+}; -+ -+static int noc_div(uint64_t *a, uint32_t b) -+{ -+ if ((*a > 0) && (*a < b)) -+ return 1; -+ else -+ return do_div(*a, b); -+} -+ -+/** -+ * Calculates bw hardware is using from register values -+ * bw returned is in bytes/sec -+ */ -+static uint64_t noc_bw(uint32_t bw_field, uint32_t qos_freq) -+{ -+ uint64_t res; -+ uint32_t rem, scale; -+ -+ res = 2 * qos_freq * bw_field; -+ scale = BW_SCALE * 1000; -+ rem = noc_div(&res, scale); -+ MSM_BUS_DBG("NOC: Calculated bw: %llu\n", res * 1000000ULL); -+ return res * 1000000ULL; -+} -+ -+static uint32_t noc_bw_ceil(long int bw_field, uint32_t qos_freq) -+{ -+ uint64_t bw_temp = 2 * qos_freq * bw_field; -+ uint32_t scale = 1000 * BW_SCALE; -+ noc_div(&bw_temp, scale); -+ return bw_temp * 1000000; -+} -+#define MAX_BW(timebase) noc_bw_ceil(MAX_BW_FIELD, (timebase)) -+ -+/** -+ * Calculates ws hardware is using from register values -+ * ws returned is in nanoseconds -+ */ -+static uint32_t noc_ws(uint64_t bw, uint32_t sat, uint32_t qos_freq) -+{ -+ if (bw && qos_freq) { -+ uint32_t bwf = bw * qos_freq; -+ uint64_t scale = 1000000000000LL * BW_SCALE * -+ SAT_SCALE * sat; -+ noc_div(&scale, bwf); -+ MSM_BUS_DBG("NOC: Calculated ws: %llu\n", scale); -+ return scale; -+ } -+ -+ return 0; -+} -+#define MAX_WS(bw, timebase) noc_ws((bw), MAX_SAT_FIELD, (timebase)) -+ -+/* Calculate bandwidth field value for requested bandwidth */ -+static uint32_t noc_bw_field(uint64_t bw, uint32_t qos_freq) -+{ -+ uint32_t bw_field = 0; -+ -+ if (bw) { -+ uint32_t rem; -+ uint64_t bw_capped = min_t(uint64_t, bw, MAX_BW(qos_freq)); -+ uint64_t bwc = bw_capped * BW_SCALE; -+ uint64_t qf = 2 * qos_freq * 1000; -+ -+ rem = noc_div(&bwc, qf); -+ bw_field = (uint32_t)min_t(uint64_t, bwc, MAX_BW_FIELD); -+ } -+ -+ MSM_BUS_DBG("NOC: bw_field: %u\n", bw_field); -+ return bw_field; -+} -+ -+static uint32_t noc_sat_field(uint64_t bw, uint32_t ws, uint32_t qos_freq) -+{ -+ uint32_t sat_field = 0, win; -+ -+ if (bw) { -+ /* Limit to max bw and scale bw to 100 KB increments */ -+ uint64_t tbw, tscale; -+ uint64_t bw_scaled = min_t(uint64_t, bw, MAX_BW(qos_freq)); -+ uint32_t rem = noc_div(&bw_scaled, 100000); -+ -+ /** -+ * Calculate saturation from windows size. -+ * WS must be at least one arb period. -+ * Saturation must not exceed max field size -+ * -+ * Bandwidth is in 100KB increments -+ * Window size is in ns -+ * qos_freq is in KHz -+ */ -+ win = max(ws, 1000000 / qos_freq); -+ tbw = bw_scaled * win * qos_freq; -+ tscale = 10000000ULL * BW_SCALE * SAT_SCALE; -+ rem = noc_div(&tbw, tscale); -+ sat_field = (uint32_t)min_t(uint64_t, tbw, MAX_SAT_FIELD); -+ } -+ -+ MSM_BUS_DBG("NOC: sat_field: %d\n", sat_field); -+ return sat_field; -+} -+ -+static void noc_set_qos_mode(void __iomem *base, uint32_t qos_off, -+ uint32_t mport, uint32_t qos_delta, uint8_t mode, -+ uint8_t perm_mode) -+{ -+ if (mode < NOC_QOS_MODE_MAX && -+ ((1 << mode) & perm_mode)) { -+ uint32_t reg_val; -+ -+ reg_val = readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, -+ mport, qos_delta)) & NOC_QOS_MODEn_RMSK; -+ writel_relaxed(((reg_val & (~(NOC_QOS_MODEn_MODE_BMSK))) | -+ (mode & NOC_QOS_MODEn_MODE_BMSK)), -+ NOC_QOS_MODEn_ADDR(base, qos_off, mport, qos_delta)); -+ } -+ /* Ensure qos mode is set before exiting */ -+ wmb(); -+} -+ -+static void noc_set_qos_priority(void __iomem *base, uint32_t qos_off, -+ uint32_t mport, uint32_t qos_delta, -+ struct msm_bus_noc_qos_priority *priority) -+{ -+ uint32_t reg_val, val; -+ -+ reg_val = readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, -+ qos_delta)) & NOC_QOS_PRIORITYn_RMSK; -+ val = priority->p1 << NOC_QOS_PRIORITYn_P1_SHFT; -+ writel_relaxed(((reg_val & (~(NOC_QOS_PRIORITYn_P1_BMSK))) | -+ (val & NOC_QOS_PRIORITYn_P1_BMSK)), -+ NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, qos_delta)); -+ -+ reg_val = readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, -+ qos_delta)) -+ & NOC_QOS_PRIORITYn_RMSK; -+ writel_relaxed(((reg_val & (~(NOC_QOS_PRIORITYn_P0_BMSK))) | -+ (priority->p0 & NOC_QOS_PRIORITYn_P0_BMSK)), -+ NOC_QOS_PRIORITYn_ADDR(base, qos_off, mport, qos_delta)); -+ /* Ensure qos priority is set before exiting */ -+ wmb(); -+} -+ -+static void msm_bus_noc_set_qos_bw(void __iomem *base, uint32_t qos_off, -+ uint32_t qos_freq, uint32_t mport, uint32_t qos_delta, -+ uint8_t perm_mode, struct msm_bus_noc_qos_bw *qbw) -+{ -+ uint32_t reg_val, val, mode; -+ -+ if (!qos_freq) { -+ MSM_BUS_DBG("Zero QoS Freq\n"); -+ return; -+ } -+ -+ -+ /* If Limiter or Regulator modes are not supported, bw not available*/ -+ if (perm_mode & (NOC_QOS_PERM_MODE_LIMITER | -+ NOC_QOS_PERM_MODE_REGULATOR)) { -+ uint32_t bw_val = noc_bw_field(qbw->bw, qos_freq); -+ uint32_t sat_val = noc_sat_field(qbw->bw, qbw->ws, -+ qos_freq); -+ -+ MSM_BUS_DBG("NOC: BW: perm_mode: %d bw_val: %d, sat_val: %d\n", -+ perm_mode, bw_val, sat_val); -+ /* -+ * If in Limiter/Regulator mode, first go to fixed mode. -+ * Clear QoS accumulator -+ **/ -+ mode = readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, -+ mport, qos_delta)) & NOC_QOS_MODEn_MODE_BMSK; -+ if (mode == NOC_QOS_MODE_REGULATOR || mode == -+ NOC_QOS_MODE_LIMITER) { -+ reg_val = readl_relaxed(NOC_QOS_MODEn_ADDR( -+ base, qos_off, mport, qos_delta)); -+ val = NOC_QOS_MODE_FIXED; -+ writel_relaxed((reg_val & (~(NOC_QOS_MODEn_MODE_BMSK))) -+ | (val & NOC_QOS_MODEn_MODE_BMSK), -+ NOC_QOS_MODEn_ADDR(base, qos_off, mport, -+ qos_delta)); -+ } -+ -+ reg_val = readl_relaxed(NOC_QOS_BWn_ADDR(base, qos_off, mport, -+ qos_delta)); -+ val = bw_val << NOC_QOS_BWn_BW_SHFT; -+ writel_relaxed(((reg_val & (~(NOC_QOS_BWn_BW_BMSK))) | -+ (val & NOC_QOS_BWn_BW_BMSK)), -+ NOC_QOS_BWn_ADDR(base, qos_off, mport, qos_delta)); -+ -+ MSM_BUS_DBG("NOC: BW: Wrote value: 0x%x\n", ((reg_val & -+ (~NOC_QOS_BWn_BW_BMSK)) | (val & -+ NOC_QOS_BWn_BW_BMSK))); -+ -+ reg_val = readl_relaxed(NOC_QOS_SATn_ADDR(base, qos_off, -+ mport, qos_delta)); -+ val = sat_val << NOC_QOS_SATn_SAT_SHFT; -+ writel_relaxed(((reg_val & (~(NOC_QOS_SATn_SAT_BMSK))) | -+ (val & NOC_QOS_SATn_SAT_BMSK)), -+ NOC_QOS_SATn_ADDR(base, qos_off, mport, qos_delta)); -+ -+ MSM_BUS_DBG("NOC: SAT: Wrote value: 0x%x\n", ((reg_val & -+ (~NOC_QOS_SATn_SAT_BMSK)) | (val & -+ NOC_QOS_SATn_SAT_BMSK))); -+ -+ /* Set mode back to what it was initially */ -+ reg_val = readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, -+ mport, qos_delta)); -+ writel_relaxed((reg_val & (~(NOC_QOS_MODEn_MODE_BMSK))) -+ | (mode & NOC_QOS_MODEn_MODE_BMSK), -+ NOC_QOS_MODEn_ADDR(base, qos_off, mport, qos_delta)); -+ /* Ensure that all writes for bandwidth registers have -+ * completed before returning -+ */ -+ wmb(); -+ } -+} -+ -+uint8_t msm_bus_noc_get_qos_mode(void __iomem *base, uint32_t qos_off, -+ uint32_t mport, uint32_t qos_delta, uint32_t mode, uint32_t perm_mode) -+{ -+ if (NOC_QOS_MODES_ALL_PERM == perm_mode) -+ return readl_relaxed(NOC_QOS_MODEn_ADDR(base, qos_off, -+ mport, qos_delta)) & NOC_QOS_MODEn_MODE_BMSK; -+ else -+ return 31 - __CLZ(mode & -+ NOC_QOS_MODES_ALL_PERM); -+} -+ -+void msm_bus_noc_get_qos_priority(void __iomem *base, uint32_t qos_off, -+ uint32_t mport, uint32_t qos_delta, -+ struct msm_bus_noc_qos_priority *priority) -+{ -+ priority->p1 = (readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, -+ mport, qos_delta)) & NOC_QOS_PRIORITYn_P1_BMSK) >> -+ NOC_QOS_PRIORITYn_P1_SHFT; -+ -+ priority->p0 = (readl_relaxed(NOC_QOS_PRIORITYn_ADDR(base, qos_off, -+ mport, qos_delta)) & NOC_QOS_PRIORITYn_P0_BMSK) >> -+ NOC_QOS_PRIORITYn_P0_SHFT; -+} -+ -+void msm_bus_noc_get_qos_bw(void __iomem *base, uint32_t qos_off, -+ uint32_t qos_freq, -+ uint32_t mport, uint32_t qos_delta, uint8_t perm_mode, -+ struct msm_bus_noc_qos_bw *qbw) -+{ -+ if (perm_mode & (NOC_QOS_PERM_MODE_LIMITER | -+ NOC_QOS_PERM_MODE_REGULATOR)) { -+ uint32_t bw_val = readl_relaxed(NOC_QOS_BWn_ADDR( -+ base, qos_off, mport, qos_delta)) & NOC_QOS_BWn_BW_BMSK; -+ uint32_t sat = readl_relaxed(NOC_QOS_SATn_ADDR( -+ base, qos_off, mport, qos_delta)) -+ & NOC_QOS_SATn_SAT_BMSK; -+ -+ qbw->bw = noc_bw(bw_val, qos_freq); -+ qbw->ws = noc_ws(qbw->bw, sat, qos_freq); -+ } else { -+ qbw->bw = 0; -+ qbw->ws = 0; -+ } -+} -+ -+static int msm_bus_noc_mas_init(struct msm_bus_noc_info *ninfo, -+ struct msm_bus_inode_info *info) -+{ -+ int i; -+ struct msm_bus_noc_qos_priority *prio; -+ prio = kzalloc(sizeof(struct msm_bus_noc_qos_priority), -+ GFP_KERNEL); -+ if (!prio) { -+ MSM_BUS_WARN("Couldn't alloc prio data for node: %d\n", -+ info->node_info->id); -+ return -ENOMEM; -+ } -+ -+ prio->read_prio = info->node_info->prio_rd; -+ prio->write_prio = info->node_info->prio_wr; -+ prio->p1 = info->node_info->prio1; -+ prio->p0 = info->node_info->prio0; -+ info->hw_data = (void *)prio; -+ -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No QoS Ports to init\n"); -+ return 0; -+ } -+ -+ for (i = 0; i < info->node_info->num_mports; i++) { -+ if (info->node_info->mode != NOC_QOS_MODE_BYPASS) { -+ noc_set_qos_priority(ninfo->base, ninfo->qos_baseoffset, -+ info->node_info->qport[i], ninfo->qos_delta, -+ prio); -+ -+ if (info->node_info->mode != NOC_QOS_MODE_FIXED) { -+ struct msm_bus_noc_qos_bw qbw; -+ qbw.ws = info->node_info->ws; -+ qbw.bw = 0; -+ msm_bus_noc_set_qos_bw(ninfo->base, -+ ninfo->qos_baseoffset, -+ ninfo->qos_freq, info->node_info-> -+ qport[i], ninfo->qos_delta, -+ info->node_info->perm_mode, -+ &qbw); -+ } -+ } -+ -+ noc_set_qos_mode(ninfo->base, ninfo->qos_baseoffset, -+ info->node_info->qport[i], ninfo->qos_delta, -+ info->node_info->mode, -+ info->node_info->perm_mode); -+ } -+ -+ return 0; -+} -+ -+static void msm_bus_noc_node_init(void *hw_data, -+ struct msm_bus_inode_info *info) -+{ -+ struct msm_bus_noc_info *ninfo = -+ (struct msm_bus_noc_info *)hw_data; -+ -+ if (!IS_SLAVE(info->node_info->priv_id)) -+ if (info->node_info->hw_sel != MSM_BUS_RPM) -+ msm_bus_noc_mas_init(ninfo, info); -+} -+ -+static int msm_bus_noc_allocate_commit_data(struct msm_bus_fabric_registration -+ *fab_pdata, void **cdata, int ctx) -+{ -+ struct msm_bus_noc_commit **cd = (struct msm_bus_noc_commit **)cdata; -+ struct msm_bus_noc_info *ninfo = -+ (struct msm_bus_noc_info *)fab_pdata->hw_data; -+ -+ *cd = kzalloc(sizeof(struct msm_bus_noc_commit), GFP_KERNEL); -+ if (!*cd) { -+ MSM_BUS_DBG("Couldn't alloc mem for cdata\n"); -+ return -ENOMEM; -+ } -+ -+ (*cd)->mas = ninfo->cdata[ctx].mas; -+ (*cd)->slv = ninfo->cdata[ctx].slv; -+ -+ return 0; -+} -+ -+static void *msm_bus_noc_allocate_noc_data(struct platform_device *pdev, -+ struct msm_bus_fabric_registration *fab_pdata) -+{ -+ struct resource *noc_mem; -+ struct resource *noc_io; -+ struct msm_bus_noc_info *ninfo; -+ int i; -+ -+ ninfo = kzalloc(sizeof(struct msm_bus_noc_info), GFP_KERNEL); -+ if (!ninfo) { -+ MSM_BUS_DBG("Couldn't alloc mem for noc info\n"); -+ return NULL; -+ } -+ -+ ninfo->nmasters = fab_pdata->nmasters; -+ ninfo->nqos_masters = fab_pdata->nmasters; -+ ninfo->nslaves = fab_pdata->nslaves; -+ ninfo->qos_freq = fab_pdata->qos_freq; -+ -+ if (!fab_pdata->qos_baseoffset) -+ ninfo->qos_baseoffset = QOS_DEFAULT_BASEOFFSET; -+ else -+ ninfo->qos_baseoffset = fab_pdata->qos_baseoffset; -+ -+ if (!fab_pdata->qos_delta) -+ ninfo->qos_delta = QOS_DEFAULT_DELTA; -+ else -+ ninfo->qos_delta = fab_pdata->qos_delta; -+ -+ ninfo->mas_modes = kzalloc(sizeof(uint32_t) * fab_pdata->nmasters, -+ GFP_KERNEL); -+ if (!ninfo->mas_modes) { -+ MSM_BUS_DBG("Couldn't alloc mem for noc master-modes\n"); -+ kfree(ninfo); -+ return NULL; -+ } -+ -+ for (i = 0; i < NUM_CTX; i++) { -+ ninfo->cdata[i].mas = kzalloc(sizeof(struct -+ msm_bus_node_hw_info) * fab_pdata->nmasters * 2, -+ GFP_KERNEL); -+ if (!ninfo->cdata[i].mas) { -+ MSM_BUS_DBG("Couldn't alloc mem for noc master-bw\n"); -+ kfree(ninfo->mas_modes); -+ kfree(ninfo); -+ return NULL; -+ } -+ -+ ninfo->cdata[i].slv = kzalloc(sizeof(struct -+ msm_bus_node_hw_info) * fab_pdata->nslaves * 2, -+ GFP_KERNEL); -+ if (!ninfo->cdata[i].slv) { -+ MSM_BUS_DBG("Couldn't alloc mem for noc master-bw\n"); -+ kfree(ninfo->cdata[i].mas); -+ goto err; -+ } -+ } -+ -+ /* If it's a virtual fabric, don't get memory info */ -+ if (fab_pdata->virt) -+ goto skip_mem; -+ -+ noc_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!noc_mem && !fab_pdata->virt) { -+ MSM_BUS_ERR("Cannot get NoC Base address\n"); -+ goto err; -+ } -+ -+ noc_io = request_mem_region(noc_mem->start, -+ resource_size(noc_mem), pdev->name); -+ if (!noc_io) { -+ MSM_BUS_ERR("NoC memory unavailable\n"); -+ goto err; -+ } -+ -+ ninfo->base = ioremap(noc_mem->start, resource_size(noc_mem)); -+ if (!ninfo->base) { -+ MSM_BUS_ERR("IOremap failed for NoC!\n"); -+ release_mem_region(noc_mem->start, resource_size(noc_mem)); -+ goto err; -+ } -+ -+skip_mem: -+ fab_pdata->hw_data = (void *)ninfo; -+ return (void *)ninfo; -+ -+err: -+ kfree(ninfo->mas_modes); -+ kfree(ninfo); -+ return NULL; -+} -+ -+static void free_commit_data(void *cdata) -+{ -+ struct msm_bus_noc_commit *cd = (struct msm_bus_noc_commit *)cdata; -+ -+ kfree(cd->mas); -+ kfree(cd->slv); -+ kfree(cd); -+} -+ -+static bool msm_bus_noc_update_bw_reg(int mode) -+{ -+ bool ret = false; -+ -+ if ((mode == NOC_QOS_MODE_LIMITER) || -+ (mode == NOC_QOS_MODE_REGULATOR)) -+ ret = true; -+ -+ return ret; -+} -+ -+static void msm_bus_noc_update_bw(struct msm_bus_inode_info *hop, -+ struct msm_bus_inode_info *info, -+ struct msm_bus_fabric_registration *fab_pdata, -+ void *sel_cdata, int *master_tiers, -+ int64_t add_bw) -+{ -+ struct msm_bus_noc_info *ninfo; -+ struct msm_bus_noc_qos_bw qos_bw; -+ int i, ports; -+ int64_t bw; -+ struct msm_bus_noc_commit *sel_cd = -+ (struct msm_bus_noc_commit *)sel_cdata; -+ -+ ninfo = (struct msm_bus_noc_info *)fab_pdata->hw_data; -+ if (!ninfo->qos_freq) { -+ MSM_BUS_DBG("NOC: No qos frequency to update bw\n"); -+ return; -+ } -+ -+ if (info->node_info->num_mports == 0) { -+ MSM_BUS_DBG("NOC: Skip Master BW\n"); -+ goto skip_mas_bw; -+ } -+ -+ ports = info->node_info->num_mports; -+ bw = INTERLEAVED_BW(fab_pdata, add_bw, ports); -+ -+ MSM_BUS_DBG("NOC: Update bw for: %d: %lld\n", -+ info->node_info->priv_id, add_bw); -+ for (i = 0; i < ports; i++) { -+ sel_cd->mas[info->node_info->masterp[i]].bw += bw; -+ sel_cd->mas[info->node_info->masterp[i]].hw_id = -+ info->node_info->mas_hw_id; -+ MSM_BUS_DBG("NOC: Update mas_bw: ID: %d, BW: %llu ports:%d\n", -+ info->node_info->priv_id, -+ sel_cd->mas[info->node_info->masterp[i]].bw, -+ ports); -+ /* Check if info is a shared master. -+ * If it is, mark it dirty -+ * If it isn't, then set QOS Bandwidth -+ **/ -+ if (info->node_info->hw_sel == MSM_BUS_RPM) -+ sel_cd->mas[info->node_info->masterp[i]].dirty = 1; -+ else { -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No qos ports to update!\n"); -+ break; -+ } -+ -+ if (!(info->node_info->mode == NOC_QOS_MODE_REGULATOR) -+ || (info->node_info->mode == -+ NOC_QOS_MODE_LIMITER)) { -+ MSM_BUS_DBG("Skip QoS reg programming\n"); -+ break; -+ } -+ qos_bw.bw = sel_cd->mas[info->node_info->masterp[i]]. -+ bw; -+ qos_bw.ws = info->node_info->ws; -+ msm_bus_noc_set_qos_bw(ninfo->base, -+ ninfo->qos_baseoffset, -+ ninfo->qos_freq, -+ info->node_info->qport[i], ninfo->qos_delta, -+ info->node_info->perm_mode, &qos_bw); -+ MSM_BUS_DBG("NOC: QoS: Update mas_bw: ws: %u\n", -+ qos_bw.ws); -+ } -+ } -+ -+skip_mas_bw: -+ ports = hop->node_info->num_sports; -+ for (i = 0; i < ports; i++) { -+ sel_cd->slv[hop->node_info->slavep[i]].bw += add_bw; -+ sel_cd->slv[hop->node_info->slavep[i]].hw_id = -+ hop->node_info->slv_hw_id; -+ MSM_BUS_DBG("NOC: Update slave_bw for ID: %d -> %llu\n", -+ hop->node_info->priv_id, -+ sel_cd->slv[hop->node_info->slavep[i]].bw); -+ MSM_BUS_DBG("NOC: Update slave_bw for hw_id: %d, index: %d\n", -+ hop->node_info->slv_hw_id, hop->node_info->slavep[i]); -+ /* Check if hop is a shared slave. -+ * If it is, mark it dirty -+ * If it isn't, then nothing to be done as the -+ * slaves are in bypass mode. -+ **/ -+ if (hop->node_info->hw_sel == MSM_BUS_RPM) -+ sel_cd->slv[hop->node_info->slavep[i]].dirty = 1; -+ } -+} -+ -+static int msm_bus_noc_commit(struct msm_bus_fabric_registration -+ *fab_pdata, void *hw_data, void **cdata) -+{ -+ MSM_BUS_DBG("\nReached NOC Commit\n"); -+ msm_bus_remote_hw_commit(fab_pdata, hw_data, cdata); -+ return 0; -+} -+ -+static int msm_bus_noc_port_halt(uint32_t haltid, uint8_t mport) -+{ -+ return 0; -+} -+ -+static int msm_bus_noc_port_unhalt(uint32_t haltid, uint8_t mport) -+{ -+ return 0; -+} -+ -+static int msm_bus_noc_qos_init(struct msm_bus_node_device_type *info, -+ void __iomem *qos_base, -+ uint32_t qos_off, uint32_t qos_delta, -+ uint32_t qos_freq) -+{ -+ struct msm_bus_noc_qos_priority prio; -+ int ret = 0; -+ int i; -+ -+ prio.p1 = info->node_info->qos_params.prio1; -+ prio.p0 = info->node_info->qos_params.prio0; -+ -+ if (!info->node_info->qport) { -+ MSM_BUS_DBG("No QoS Ports to init\n"); -+ ret = 0; -+ goto err_qos_init; -+ } -+ -+ for (i = 0; i < info->node_info->num_qports; i++) { -+ if (info->node_info->qos_params.mode != NOC_QOS_MODE_BYPASS) { -+ noc_set_qos_priority(qos_base, qos_off, -+ info->node_info->qport[i], qos_delta, -+ &prio); -+ -+ if (info->node_info->qos_params.mode != -+ NOC_QOS_MODE_FIXED) { -+ struct msm_bus_noc_qos_bw qbw; -+ qbw.ws = info->node_info->qos_params.ws; -+ qbw.bw = 0; -+ msm_bus_noc_set_qos_bw(qos_base, qos_off, -+ qos_freq, -+ info->node_info->qport[i], -+ qos_delta, -+ info->node_info->qos_params.mode, -+ &qbw); -+ } -+ } -+ -+ noc_set_qos_mode(qos_base, qos_off, info->node_info->qport[i], -+ qos_delta, info->node_info->qos_params.mode, -+ (1 << info->node_info->qos_params.mode)); -+ } -+err_qos_init: -+ return ret; -+} -+ -+static int msm_bus_noc_set_bw(struct msm_bus_node_device_type *dev, -+ void __iomem *qos_base, -+ uint32_t qos_off, uint32_t qos_delta, -+ uint32_t qos_freq) -+{ -+ int ret = 0; -+ uint64_t bw = 0; -+ int i; -+ struct msm_bus_node_info_type *info = dev->node_info; -+ -+ if (info && info->num_qports && -+ ((info->qos_params.mode == NOC_QOS_MODE_REGULATOR) || -+ (info->qos_params.mode == -+ NOC_QOS_MODE_LIMITER))) { -+ struct msm_bus_noc_qos_bw qos_bw; -+ -+ bw = msm_bus_div64(info->num_qports, -+ dev->node_ab.ab[DUAL_CTX]); -+ -+ for (i = 0; i < info->num_qports; i++) { -+ if (!info->qport) { -+ MSM_BUS_DBG("No qos ports to update!\n"); -+ break; -+ } -+ -+ qos_bw.bw = bw; -+ qos_bw.ws = info->qos_params.ws; -+ msm_bus_noc_set_qos_bw(qos_base, qos_off, qos_freq, -+ info->qport[i], qos_delta, -+ info->qos_params.mode, &qos_bw); -+ MSM_BUS_DBG("NOC: QoS: Update mas_bw: ws: %u\n", -+ qos_bw.ws); -+ } -+ } -+ return ret; -+} -+int msm_bus_noc_hw_init(struct msm_bus_fabric_registration *pdata, -+ struct msm_bus_hw_algorithm *hw_algo) -+{ -+ /* Set interleaving to true by default */ -+ pdata->il_flag = true; -+ hw_algo->allocate_commit_data = msm_bus_noc_allocate_commit_data; -+ hw_algo->allocate_hw_data = msm_bus_noc_allocate_noc_data; -+ hw_algo->node_init = msm_bus_noc_node_init; -+ hw_algo->free_commit_data = free_commit_data; -+ hw_algo->update_bw = msm_bus_noc_update_bw; -+ hw_algo->commit = msm_bus_noc_commit; -+ hw_algo->port_halt = msm_bus_noc_port_halt; -+ hw_algo->port_unhalt = msm_bus_noc_port_unhalt; -+ hw_algo->update_bw_reg = msm_bus_noc_update_bw_reg; -+ hw_algo->config_master = NULL; -+ hw_algo->config_limiter = NULL; -+ -+ return 0; -+} -+ -+int msm_bus_noc_set_ops(struct msm_bus_node_device_type *bus_dev) -+{ -+ if (!bus_dev) -+ return -ENODEV; -+ else { -+ bus_dev->fabdev->noc_ops.qos_init = msm_bus_noc_qos_init; -+ bus_dev->fabdev->noc_ops.set_bw = msm_bus_noc_set_bw; -+ bus_dev->fabdev->noc_ops.limit_mport = NULL; -+ bus_dev->fabdev->noc_ops.update_bw_reg = -+ msm_bus_noc_update_bw_reg; -+ } -+ return 0; -+} -+EXPORT_SYMBOL(msm_bus_noc_set_ops); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_noc.h -@@ -0,0 +1,76 @@ -+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _ARCH_ARM_MACH_MSM_BUS_BIMC_H -+#define _ARCH_ARM_MACH_MSM_BUS_BIMC_H -+ -+enum msm_bus_noc_qos_mode_type { -+ NOC_QOS_MODE_FIXED = 0, -+ NOC_QOS_MODE_LIMITER, -+ NOC_QOS_MODE_BYPASS, -+ NOC_QOS_MODE_REGULATOR, -+ NOC_QOS_MODE_MAX, -+}; -+ -+enum msm_bus_noc_qos_mode_perm { -+ NOC_QOS_PERM_MODE_FIXED = (1 << NOC_QOS_MODE_FIXED), -+ NOC_QOS_PERM_MODE_LIMITER = (1 << NOC_QOS_MODE_LIMITER), -+ NOC_QOS_PERM_MODE_BYPASS = (1 << NOC_QOS_MODE_BYPASS), -+ NOC_QOS_PERM_MODE_REGULATOR = (1 << NOC_QOS_MODE_REGULATOR), -+}; -+ -+#define NOC_QOS_MODES_ALL_PERM (NOC_QOS_PERM_MODE_FIXED | \ -+ NOC_QOS_PERM_MODE_LIMITER | NOC_QOS_PERM_MODE_BYPASS | \ -+ NOC_QOS_PERM_MODE_REGULATOR) -+ -+struct msm_bus_noc_commit { -+ struct msm_bus_node_hw_info *mas; -+ struct msm_bus_node_hw_info *slv; -+}; -+ -+struct msm_bus_noc_info { -+ void __iomem *base; -+ uint32_t base_addr; -+ uint32_t nmasters; -+ uint32_t nqos_masters; -+ uint32_t nslaves; -+ uint32_t qos_freq; /* QOS Clock in KHz */ -+ uint32_t qos_baseoffset; -+ uint32_t qos_delta; -+ uint32_t *mas_modes; -+ struct msm_bus_noc_commit cdata[NUM_CTX]; -+}; -+ -+struct msm_bus_noc_qos_priority { -+ uint32_t high_prio; -+ uint32_t low_prio; -+ uint32_t read_prio; -+ uint32_t write_prio; -+ uint32_t p1; -+ uint32_t p0; -+}; -+ -+struct msm_bus_noc_qos_bw { -+ uint64_t bw; /* Bandwidth in bytes per second */ -+ uint32_t ws; /* Window size in nano seconds */ -+}; -+ -+void msm_bus_noc_init(struct msm_bus_noc_info *ninfo); -+uint8_t msm_bus_noc_get_qos_mode(void __iomem *base, uint32_t qos_off, -+ uint32_t mport, uint32_t qos_delta, uint32_t mode, uint32_t perm_mode); -+void msm_bus_noc_get_qos_priority(void __iomem *base, uint32_t qos_off, -+ uint32_t mport, uint32_t qos_delta, -+ struct msm_bus_noc_qos_priority *qprio); -+void msm_bus_noc_get_qos_bw(void __iomem *base, uint32_t qos_off, -+ uint32_t qos_freq, uint32_t mport, uint32_t qos_delta, -+ uint8_t perm_mode, struct msm_bus_noc_qos_bw *qbw); -+#endif /*_ARCH_ARM_MACH_MSM_BUS_NOC_H */ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_of.c -@@ -0,0 +1,705 @@ -+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include "msm-bus.h" -+#include "msm-bus-board.h" -+#include "msm_bus_core.h" -+ -+static const char * const hw_sel_name[] = {"RPM", "NoC", "BIMC", NULL}; -+static const char * const mode_sel_name[] = {"Fixed", "Limiter", "Bypass", -+ "Regulator", NULL}; -+ -+static int get_num(const char *const str[], const char *name) -+{ -+ int i = 0; -+ -+ do { -+ if (!strcmp(name, str[i])) -+ return i; -+ -+ i++; -+ } while (str[i] != NULL); -+ -+ pr_err("Error: string %s not found\n", name); -+ return -EINVAL; -+} -+ -+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_MSM_BUS_SCALING) -+static struct msm_bus_scale_pdata *get_pdata(struct platform_device *pdev, -+ struct device_node *of_node) -+{ -+ struct msm_bus_scale_pdata *pdata = NULL; -+ struct msm_bus_paths *usecase = NULL; -+ int i = 0, j, ret, num_usecases = 0, num_paths, len; -+ const uint32_t *vec_arr = NULL; -+ bool mem_err = false; -+ -+ if (!pdev) { -+ pr_err("Error: Null Platform device\n"); -+ return NULL; -+ } -+ -+ pdata = devm_kzalloc(&pdev->dev, sizeof(struct msm_bus_scale_pdata), -+ GFP_KERNEL); -+ if (!pdata) { -+ pr_err("Error: Memory allocation for pdata failed\n"); -+ mem_err = true; -+ goto err; -+ } -+ -+ ret = of_property_read_string(of_node, "qcom,msm-bus,name", -+ &pdata->name); -+ if (ret) { -+ pr_err("Error: Client name not found\n"); -+ goto err; -+ } -+ -+ ret = of_property_read_u32(of_node, "qcom,msm-bus,num-cases", -+ &num_usecases); -+ if (ret) { -+ pr_err("Error: num-usecases not found\n"); -+ goto err; -+ } -+ -+ pdata->num_usecases = num_usecases; -+ -+ if (of_property_read_bool(of_node, "qcom,msm-bus,active-only")) -+ pdata->active_only = 1; -+ else { -+ pr_debug("active_only flag absent.\n"); -+ pr_debug("Using dual context by default\n"); -+ } -+ -+ usecase = devm_kzalloc(&pdev->dev, (sizeof(struct msm_bus_paths) * -+ pdata->num_usecases), GFP_KERNEL); -+ if (!usecase) { -+ pr_err("Error: Memory allocation for paths failed\n"); -+ mem_err = true; -+ goto err; -+ } -+ -+ ret = of_property_read_u32(of_node, "qcom,msm-bus,num-paths", -+ &num_paths); -+ if (ret) { -+ pr_err("Error: num_paths not found\n"); -+ goto err; -+ } -+ -+ vec_arr = of_get_property(of_node, "qcom,msm-bus,vectors-KBps", &len); -+ if (vec_arr == NULL) { -+ pr_err("Error: Vector array not found\n"); -+ goto err; -+ } -+ -+ if (len != num_usecases * num_paths * sizeof(uint32_t) * 4) { -+ pr_err("Error: Length-error on getting vectors\n"); -+ goto err; -+ } -+ -+ for (i = 0; i < num_usecases; i++) { -+ usecase[i].num_paths = num_paths; -+ usecase[i].vectors = devm_kzalloc(&pdev->dev, num_paths * -+ sizeof(struct msm_bus_vectors), GFP_KERNEL); -+ if (!usecase[i].vectors) { -+ mem_err = true; -+ pr_err("Error: Mem alloc failure in vectors\n"); -+ goto err; -+ } -+ -+ for (j = 0; j < num_paths; j++) { -+ int index = ((i * num_paths) + j) * 4; -+ usecase[i].vectors[j].src = be32_to_cpu(vec_arr[index]); -+ usecase[i].vectors[j].dst = -+ be32_to_cpu(vec_arr[index + 1]); -+ usecase[i].vectors[j].ab = (uint64_t) -+ KBTOB(be32_to_cpu(vec_arr[index + 2])); -+ usecase[i].vectors[j].ib = (uint64_t) -+ KBTOB(be32_to_cpu(vec_arr[index + 3])); -+ } -+ } -+ -+ pdata->usecase = usecase; -+ return pdata; -+err: -+ if (mem_err) { -+ for (; i > 0; i--) -+ kfree(usecase[i-1].vectors); -+ -+ kfree(usecase); -+ kfree(pdata); -+ } -+ -+ return NULL; -+} -+ -+/** -+ * msm_bus_cl_get_pdata() - Generate bus client data from device tree -+ * provided by clients. -+ * -+ * of_node: Device tree node to extract information from -+ * -+ * The function returns a valid pointer to the allocated bus-scale-pdata -+ * if the vectors were correctly read from the client's device node. -+ * Any error in reading or parsing the device node will return NULL -+ * to the caller. -+ */ -+struct msm_bus_scale_pdata *msm_bus_cl_get_pdata(struct platform_device *pdev) -+{ -+ struct device_node *of_node; -+ struct msm_bus_scale_pdata *pdata = NULL; -+ -+ if (!pdev) { -+ pr_err("Error: Null Platform device\n"); -+ return NULL; -+ } -+ -+ of_node = pdev->dev.of_node; -+ pdata = get_pdata(pdev, of_node); -+ if (!pdata) { -+ pr_err("client has to provide missing entry for successful registration\n"); -+ return NULL; -+ } -+ -+ return pdata; -+} -+EXPORT_SYMBOL(msm_bus_cl_get_pdata); -+ -+/** -+ * msm_bus_cl_pdata_from_node() - Generate bus client data from device tree -+ * node provided by clients. This function should be used when a client -+ * driver needs to register multiple bus-clients from a single device-tree -+ * node associated with the platform-device. -+ * -+ * of_node: The subnode containing information about the bus scaling -+ * data -+ * -+ * pdev: Platform device associated with the device-tree node -+ * -+ * The function returns a valid pointer to the allocated bus-scale-pdata -+ * if the vectors were correctly read from the client's device node. -+ * Any error in reading or parsing the device node will return NULL -+ * to the caller. -+ */ -+struct msm_bus_scale_pdata *msm_bus_pdata_from_node( -+ struct platform_device *pdev, struct device_node *of_node) -+{ -+ struct msm_bus_scale_pdata *pdata = NULL; -+ -+ if (!pdev) { -+ pr_err("Error: Null Platform device\n"); -+ return NULL; -+ } -+ -+ if (!of_node) { -+ pr_err("Error: Null of_node passed to bus driver\n"); -+ return NULL; -+ } -+ -+ pdata = get_pdata(pdev, of_node); -+ if (!pdata) { -+ pr_err("client has to provide missing entry for successful registration\n"); -+ return NULL; -+ } -+ -+ return pdata; -+} -+EXPORT_SYMBOL(msm_bus_pdata_from_node); -+ -+/** -+ * msm_bus_cl_clear_pdata() - Clear pdata allocated from device-tree -+ * of_node: Device tree node to extract information from -+ */ -+void msm_bus_cl_clear_pdata(struct msm_bus_scale_pdata *pdata) -+{ -+ int i; -+ -+ for (i = 0; i < pdata->num_usecases; i++) -+ kfree(pdata->usecase[i].vectors); -+ -+ kfree(pdata->usecase); -+ kfree(pdata); -+} -+EXPORT_SYMBOL(msm_bus_cl_clear_pdata); -+#endif -+ -+static int *get_arr(struct platform_device *pdev, -+ const struct device_node *node, const char *prop, -+ int *nports) -+{ -+ int size = 0, ret; -+ int *arr = NULL; -+ -+ if (of_get_property(node, prop, &size)) { -+ *nports = size / sizeof(int); -+ } else { -+ pr_debug("Property %s not available\n", prop); -+ *nports = 0; -+ return NULL; -+ } -+ -+ if (!size) { -+ *nports = 0; -+ return NULL; -+ } -+ -+ arr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(arr)) { -+ pr_err("Error: Failed to alloc mem for %s\n", prop); -+ return NULL; -+ } -+ -+ ret = of_property_read_u32_array(node, prop, (u32 *)arr, *nports); -+ if (ret) { -+ pr_err("Error in reading property: %s\n", prop); -+ goto err; -+ } -+ -+ return arr; -+err: -+ devm_kfree(&pdev->dev, arr); -+ return NULL; -+} -+ -+static u64 *get_th_params(struct platform_device *pdev, -+ const struct device_node *node, const char *prop, -+ int *nports) -+{ -+ int size = 0, ret; -+ u64 *ret_arr = NULL; -+ int *arr = NULL; -+ int i; -+ -+ if (of_get_property(node, prop, &size)) { -+ *nports = size / sizeof(int); -+ } else { -+ pr_debug("Property %s not available\n", prop); -+ *nports = 0; -+ return NULL; -+ } -+ -+ if (!size) { -+ *nports = 0; -+ return NULL; -+ } -+ -+ ret_arr = devm_kzalloc(&pdev->dev, (*nports * sizeof(u64)), -+ GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(ret_arr)) { -+ pr_err("Error: Failed to alloc mem for ret arr %s\n", prop); -+ return NULL; -+ } -+ -+ arr = kzalloc(size, GFP_KERNEL); -+ if ((ZERO_OR_NULL_PTR(arr))) { -+ pr_err("Error: Failed to alloc temp mem for %s\n", prop); -+ return NULL; -+ } -+ -+ ret = of_property_read_u32_array(node, prop, (u32 *)arr, *nports); -+ if (ret) { -+ pr_err("Error in reading property: %s\n", prop); -+ goto err; -+ } -+ -+ for (i = 0; i < *nports; i++) -+ ret_arr[i] = (uint64_t)KBTOB(arr[i]); -+ -+ MSM_BUS_DBG("%s: num entries %d prop %s", __func__, *nports, prop); -+ -+ for (i = 0; i < *nports; i++) -+ MSM_BUS_DBG("Th %d val %llu", i, ret_arr[i]); -+ -+ kfree(arr); -+ return ret_arr; -+err: -+ kfree(arr); -+ devm_kfree(&pdev->dev, ret_arr); -+ return NULL; -+} -+ -+static struct msm_bus_node_info *get_nodes(struct device_node *of_node, -+ struct platform_device *pdev, -+ struct msm_bus_fabric_registration *pdata) -+{ -+ struct msm_bus_node_info *info; -+ struct device_node *child_node = NULL; -+ int i = 0, ret; -+ int num_bw = 0; -+ u32 temp; -+ -+ for_each_child_of_node(of_node, child_node) { -+ i++; -+ } -+ -+ pdata->len = i; -+ info = (struct msm_bus_node_info *) -+ devm_kzalloc(&pdev->dev, sizeof(struct msm_bus_node_info) * -+ pdata->len, GFP_KERNEL); -+ if (ZERO_OR_NULL_PTR(info)) { -+ pr_err("Failed to alloc memory for nodes: %d\n", pdata->len); -+ goto err; -+ } -+ -+ i = 0; -+ child_node = NULL; -+ for_each_child_of_node(of_node, child_node) { -+ const char *sel_str; -+ -+ ret = of_property_read_string(child_node, "label", -+ &info[i].name); -+ if (ret) -+ pr_err("Error reading node label\n"); -+ -+ ret = of_property_read_u32(child_node, "cell-id", &info[i].id); -+ if (ret) { -+ pr_err("Error reading node id\n"); -+ goto err; -+ } -+ -+ if (of_property_read_bool(child_node, "qcom,gateway")) -+ info[i].gateway = 1; -+ -+ of_property_read_u32(child_node, "qcom,mas-hw-id", -+ &info[i].mas_hw_id); -+ -+ of_property_read_u32(child_node, "qcom,slv-hw-id", -+ &info[i].slv_hw_id); -+ info[i].masterp = get_arr(pdev, child_node, -+ "qcom,masterp", &info[i].num_mports); -+ /* No need to store number of qports */ -+ info[i].qport = get_arr(pdev, child_node, -+ "qcom,qport", &ret); -+ pdata->nmasters += info[i].num_mports; -+ -+ -+ info[i].slavep = get_arr(pdev, child_node, -+ "qcom,slavep", &info[i].num_sports); -+ pdata->nslaves += info[i].num_sports; -+ -+ -+ info[i].tier = get_arr(pdev, child_node, -+ "qcom,tier", &info[i].num_tiers); -+ -+ if (of_property_read_bool(child_node, "qcom,ahb")) -+ info[i].ahb = 1; -+ -+ ret = of_property_read_string(child_node, "qcom,hw-sel", -+ &sel_str); -+ if (ret) -+ info[i].hw_sel = 0; -+ else { -+ ret = get_num(hw_sel_name, sel_str); -+ if (ret < 0) { -+ pr_err("Invalid hw-sel\n"); -+ goto err; -+ } -+ -+ info[i].hw_sel = ret; -+ } -+ -+ of_property_read_u32(child_node, "qcom,buswidth", -+ &info[i].buswidth); -+ of_property_read_u32(child_node, "qcom,ws", &info[i].ws); -+ -+ info[i].dual_conf = -+ of_property_read_bool(child_node, "qcom,dual-conf"); -+ -+ -+ info[i].th = get_th_params(pdev, child_node, "qcom,thresh", -+ &info[i].num_thresh); -+ -+ info[i].bimc_bw = get_th_params(pdev, child_node, -+ "qcom,bimc,bw", &num_bw); -+ -+ if (num_bw != info[i].num_thresh) { -+ pr_err("%s:num_bw %d must equal num_thresh %d", -+ __func__, num_bw, info[i].num_thresh); -+ pr_err("%s:Err setting up dual conf for %s", -+ __func__, info[i].name); -+ goto err; -+ } -+ -+ of_property_read_u32(child_node, "qcom,bimc,gp", -+ &info[i].bimc_gp); -+ of_property_read_u32(child_node, "qcom,bimc,thmp", -+ &info[i].bimc_thmp); -+ -+ ret = of_property_read_string(child_node, "qcom,mode-thresh", -+ &sel_str); -+ if (ret) -+ info[i].mode_thresh = 0; -+ else { -+ ret = get_num(mode_sel_name, sel_str); -+ if (ret < 0) { -+ pr_err("Unknown mode :%s\n", sel_str); -+ goto err; -+ } -+ -+ info[i].mode_thresh = ret; -+ MSM_BUS_DBG("AXI: THreshold mode set: %d\n", -+ info[i].mode_thresh); -+ } -+ -+ ret = of_property_read_string(child_node, "qcom,mode", -+ &sel_str); -+ -+ if (ret) -+ info[i].mode = 0; -+ else { -+ ret = get_num(mode_sel_name, sel_str); -+ if (ret < 0) { -+ pr_err("Unknown mode :%s\n", sel_str); -+ goto err; -+ } -+ -+ info[i].mode = ret; -+ } -+ -+ info[i].nr_lim = -+ of_property_read_bool(child_node, "qcom,nr-lim"); -+ -+ ret = of_property_read_u32(child_node, "qcom,ff", -+ &info[i].ff); -+ if (ret) { -+ pr_debug("fudge factor not present %d", info[i].id); -+ info[i].ff = 0; -+ } -+ -+ ret = of_property_read_u32(child_node, "qcom,floor-bw", -+ &temp); -+ if (ret) { -+ pr_debug("fabdev floor bw not present %d", info[i].id); -+ info[i].floor_bw = 0; -+ } else { -+ info[i].floor_bw = KBTOB(temp); -+ } -+ -+ info[i].rt_mas = -+ of_property_read_bool(child_node, "qcom,rt-mas"); -+ -+ ret = of_property_read_string(child_node, "qcom,perm-mode", -+ &sel_str); -+ if (ret) -+ info[i].perm_mode = 0; -+ else { -+ ret = get_num(mode_sel_name, sel_str); -+ if (ret < 0) -+ goto err; -+ -+ info[i].perm_mode = 1 << ret; -+ } -+ -+ of_property_read_u32(child_node, "qcom,prio-lvl", -+ &info[i].prio_lvl); -+ of_property_read_u32(child_node, "qcom,prio-rd", -+ &info[i].prio_rd); -+ of_property_read_u32(child_node, "qcom,prio-wr", -+ &info[i].prio_wr); -+ of_property_read_u32(child_node, "qcom,prio0", &info[i].prio0); -+ of_property_read_u32(child_node, "qcom,prio1", &info[i].prio1); -+ ret = of_property_read_string(child_node, "qcom,slaveclk-dual", -+ &info[i].slaveclk[DUAL_CTX]); -+ if (!ret) -+ pr_debug("Got slaveclk_dual: %s\n", -+ info[i].slaveclk[DUAL_CTX]); -+ else -+ info[i].slaveclk[DUAL_CTX] = NULL; -+ -+ ret = of_property_read_string(child_node, -+ "qcom,slaveclk-active", &info[i].slaveclk[ACTIVE_CTX]); -+ if (!ret) -+ pr_debug("Got slaveclk_active\n"); -+ else -+ info[i].slaveclk[ACTIVE_CTX] = NULL; -+ -+ ret = of_property_read_string(child_node, "qcom,memclk-dual", -+ &info[i].memclk[DUAL_CTX]); -+ if (!ret) -+ pr_debug("Got memclk_dual\n"); -+ else -+ info[i].memclk[DUAL_CTX] = NULL; -+ -+ ret = of_property_read_string(child_node, "qcom,memclk-active", -+ &info[i].memclk[ACTIVE_CTX]); -+ if (!ret) -+ pr_debug("Got memclk_active\n"); -+ else -+ info[i].memclk[ACTIVE_CTX] = NULL; -+ -+ ret = of_property_read_string(child_node, "qcom,iface-clk-node", -+ &info[i].iface_clk_node); -+ if (!ret) -+ pr_debug("Got iface_clk_node\n"); -+ else -+ info[i].iface_clk_node = NULL; -+ -+ pr_debug("Node name: %s\n", info[i].name); -+ of_node_put(child_node); -+ i++; -+ } -+ -+ pr_debug("Bus %d added: %d masters\n", pdata->id, pdata->nmasters); -+ pr_debug("Bus %d added: %d slaves\n", pdata->id, pdata->nslaves); -+ return info; -+err: -+ return NULL; -+} -+ -+void msm_bus_of_get_nfab(struct platform_device *pdev, -+ struct msm_bus_fabric_registration *pdata) -+{ -+ struct device_node *of_node; -+ int ret, nfab = 0; -+ -+ if (!pdev) { -+ pr_err("Error: Null platform device\n"); -+ return; -+ } -+ -+ of_node = pdev->dev.of_node; -+ ret = of_property_read_u32(of_node, "qcom,nfab", -+ &nfab); -+ if (!ret) -+ pr_debug("Fab_of: Read number of buses: %u\n", nfab); -+ -+ msm_bus_board_set_nfab(pdata, nfab); -+} -+ -+struct msm_bus_fabric_registration -+ *msm_bus_of_get_fab_data(struct platform_device *pdev) -+{ -+ struct device_node *of_node; -+ struct msm_bus_fabric_registration *pdata; -+ bool mem_err = false; -+ int ret = 0; -+ const char *sel_str; -+ u32 temp; -+ -+ if (!pdev) { -+ pr_err("Error: Null platform device\n"); -+ return NULL; -+ } -+ -+ of_node = pdev->dev.of_node; -+ pdata = devm_kzalloc(&pdev->dev, -+ sizeof(struct msm_bus_fabric_registration), GFP_KERNEL); -+ if (!pdata) { -+ pr_err("Error: Memory allocation for pdata failed\n"); -+ mem_err = true; -+ goto err; -+ } -+ -+ ret = of_property_read_string(of_node, "label", &pdata->name); -+ if (ret) { -+ pr_err("Error: label not found\n"); -+ goto err; -+ } -+ pr_debug("Fab_of: Read name: %s\n", pdata->name); -+ -+ ret = of_property_read_u32(of_node, "cell-id", -+ &pdata->id); -+ if (ret) { -+ pr_err("Error: num-usecases not found\n"); -+ goto err; -+ } -+ pr_debug("Fab_of: Read id: %u\n", pdata->id); -+ -+ if (of_property_read_bool(of_node, "qcom,ahb")) -+ pdata->ahb = 1; -+ -+ ret = of_property_read_string(of_node, "qcom,fabclk-dual", -+ &pdata->fabclk[DUAL_CTX]); -+ if (ret) { -+ pr_debug("fabclk_dual not available\n"); -+ pdata->fabclk[DUAL_CTX] = NULL; -+ } else -+ pr_debug("Fab_of: Read clk dual ctx: %s\n", -+ pdata->fabclk[DUAL_CTX]); -+ ret = of_property_read_string(of_node, "qcom,fabclk-active", -+ &pdata->fabclk[ACTIVE_CTX]); -+ if (ret) { -+ pr_debug("Error: fabclk_active not available\n"); -+ pdata->fabclk[ACTIVE_CTX] = NULL; -+ } else -+ pr_debug("Fab_of: Read clk act ctx: %s\n", -+ pdata->fabclk[ACTIVE_CTX]); -+ -+ ret = of_property_read_u32(of_node, "qcom,ntieredslaves", -+ &pdata->ntieredslaves); -+ if (ret) { -+ pr_err("Error: ntieredslaves not found\n"); -+ goto err; -+ } -+ -+ ret = of_property_read_u32(of_node, "qcom,qos-freq", &pdata->qos_freq); -+ if (ret) -+ pr_debug("qos_freq not available\n"); -+ -+ ret = of_property_read_string(of_node, "qcom,hw-sel", &sel_str); -+ if (ret) { -+ pr_err("Error: hw_sel not found\n"); -+ goto err; -+ } else { -+ ret = get_num(hw_sel_name, sel_str); -+ if (ret < 0) -+ goto err; -+ -+ pdata->hw_sel = ret; -+ } -+ -+ if (of_property_read_bool(of_node, "qcom,virt")) -+ pdata->virt = true; -+ -+ ret = of_property_read_u32(of_node, "qcom,qos-baseoffset", -+ &pdata->qos_baseoffset); -+ if (ret) -+ pr_debug("%s:qos_baseoffset not available\n", __func__); -+ -+ ret = of_property_read_u32(of_node, "qcom,qos-delta", -+ &pdata->qos_delta); -+ if (ret) -+ pr_debug("%s:qos_delta not available\n", __func__); -+ -+ if (of_property_read_bool(of_node, "qcom,rpm-en")) -+ pdata->rpm_enabled = 1; -+ -+ ret = of_property_read_u32(of_node, "qcom,nr-lim-thresh", -+ &temp); -+ -+ if (ret) { -+ pr_err("nr-lim threshold not specified"); -+ pdata->nr_lim_thresh = 0; -+ } else { -+ pdata->nr_lim_thresh = KBTOB(temp); -+ } -+ -+ ret = of_property_read_u32(of_node, "qcom,eff-fact", -+ &pdata->eff_fact); -+ if (ret) { -+ pr_err("Fab eff-factor not present"); -+ pdata->eff_fact = 0; -+ } -+ -+ pdata->info = get_nodes(of_node, pdev, pdata); -+ return pdata; -+err: -+ return NULL; -+} -+EXPORT_SYMBOL(msm_bus_of_get_fab_data); ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_of_adhoc.c -@@ -0,0 +1,641 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "msm-bus.h" -+#include "msm-bus-board.h" -+#include "msm_bus_rules.h" -+#include "msm_bus_core.h" -+#include "msm_bus_adhoc.h" -+ -+#define DEFAULT_QOS_FREQ 19200 -+#define DEFAULT_UTIL_FACT 100 -+#define DEFAULT_VRAIL_COMP 100 -+ -+static int get_qos_mode(struct platform_device *pdev, -+ struct device_node *node, const char *qos_mode) -+{ -+ const char *qos_names[] = {"fixed", "limiter", "bypass", "regulator"}; -+ int i = 0; -+ int ret = -1; -+ -+ if (!qos_mode) -+ goto exit_get_qos_mode; -+ -+ for (i = 0; i < ARRAY_SIZE(qos_names); i++) { -+ if (!strcmp(qos_mode, qos_names[i])) -+ break; -+ } -+ if (i == ARRAY_SIZE(qos_names)) -+ dev_err(&pdev->dev, "Cannot match mode qos %s using Bypass", -+ qos_mode); -+ else -+ ret = i; -+ -+exit_get_qos_mode: -+ return ret; -+} -+ -+static int *get_arr(struct platform_device *pdev, -+ struct device_node *node, const char *prop, -+ int *nports) -+{ -+ int size = 0, ret; -+ int *arr = NULL; -+ -+ if (of_get_property(node, prop, &size)) { -+ *nports = size / sizeof(int); -+ } else { -+ dev_dbg(&pdev->dev, "Property %s not available\n", prop); -+ *nports = 0; -+ return NULL; -+ } -+ -+ arr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); -+ if ((size > 0) && ZERO_OR_NULL_PTR(arr)) { -+ dev_err(&pdev->dev, "Error: Failed to alloc mem for %s\n", -+ prop); -+ return NULL; -+ } -+ -+ ret = of_property_read_u32_array(node, prop, (u32 *)arr, *nports); -+ if (ret) { -+ dev_err(&pdev->dev, "Error in reading property: %s\n", prop); -+ goto arr_err; -+ } -+ -+ return arr; -+arr_err: -+ devm_kfree(&pdev->dev, arr); -+ return NULL; -+} -+ -+static struct msm_bus_fab_device_type *get_fab_device_info( -+ struct device_node *dev_node, -+ struct platform_device *pdev) -+{ -+ struct msm_bus_fab_device_type *fab_dev; -+ unsigned int ret; -+ struct resource *res; -+ const char *base_name; -+ -+ fab_dev = devm_kzalloc(&pdev->dev, -+ sizeof(struct msm_bus_fab_device_type), -+ GFP_KERNEL); -+ if (!fab_dev) { -+ dev_err(&pdev->dev, -+ "Error: Unable to allocate memory for fab_dev\n"); -+ return NULL; -+ } -+ -+ ret = of_property_read_string(dev_node, "qcom,base-name", &base_name); -+ if (ret) { -+ dev_err(&pdev->dev, "Error: Unable to get base address name\n"); -+ goto fab_dev_err; -+ } -+ -+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, base_name); -+ if (!res) { -+ dev_err(&pdev->dev, "Error getting qos base addr %s\n", -+ base_name); -+ goto fab_dev_err; -+ } -+ fab_dev->pqos_base = res->start; -+ fab_dev->qos_range = resource_size(res); -+ fab_dev->bypass_qos_prg = of_property_read_bool(dev_node, -+ "qcom,bypass-qos-prg"); -+ -+ ret = of_property_read_u32(dev_node, "qcom,base-offset", -+ &fab_dev->base_offset); -+ if (ret) -+ dev_dbg(&pdev->dev, "Bus base offset is missing\n"); -+ -+ ret = of_property_read_u32(dev_node, "qcom,qos-off", -+ &fab_dev->qos_off); -+ if (ret) -+ dev_dbg(&pdev->dev, "Bus qos off is missing\n"); -+ -+ -+ ret = of_property_read_u32(dev_node, "qcom,bus-type", -+ &fab_dev->bus_type); -+ if (ret) { -+ dev_warn(&pdev->dev, "Bus type is missing\n"); -+ goto fab_dev_err; -+ } -+ -+ ret = of_property_read_u32(dev_node, "qcom,qos-freq", -+ &fab_dev->qos_freq); -+ if (ret) { -+ dev_dbg(&pdev->dev, "Bus qos freq is missing\n"); -+ fab_dev->qos_freq = DEFAULT_QOS_FREQ; -+ } -+ -+ ret = of_property_read_u32(dev_node, "qcom,util-fact", -+ &fab_dev->util_fact); -+ if (ret) { -+ dev_info(&pdev->dev, "Util-fact is missing, default to %d\n", -+ DEFAULT_UTIL_FACT); -+ fab_dev->util_fact = DEFAULT_UTIL_FACT; -+ } -+ -+ ret = of_property_read_u32(dev_node, "qcom,vrail-comp", -+ &fab_dev->vrail_comp); -+ if (ret) { -+ dev_info(&pdev->dev, "Vrail-comp is missing, default to %d\n", -+ DEFAULT_VRAIL_COMP); -+ fab_dev->vrail_comp = DEFAULT_VRAIL_COMP; -+ } -+ -+ return fab_dev; -+ -+fab_dev_err: -+ devm_kfree(&pdev->dev, fab_dev); -+ fab_dev = 0; -+ return NULL; -+} -+ -+static void get_qos_params( -+ struct device_node * const dev_node, -+ struct platform_device * const pdev, -+ struct msm_bus_node_info_type *node_info) -+{ -+ const char *qos_mode = NULL; -+ unsigned int ret; -+ unsigned int temp; -+ -+ ret = of_property_read_string(dev_node, "qcom,qos-mode", &qos_mode); -+ -+ if (ret) -+ node_info->qos_params.mode = -1; -+ else -+ node_info->qos_params.mode = get_qos_mode(pdev, dev_node, -+ qos_mode); -+ -+ of_property_read_u32(dev_node, "qcom,prio-lvl", -+ &node_info->qos_params.prio_lvl); -+ -+ of_property_read_u32(dev_node, "qcom,prio1", -+ &node_info->qos_params.prio1); -+ -+ of_property_read_u32(dev_node, "qcom,prio0", -+ &node_info->qos_params.prio0); -+ -+ of_property_read_u32(dev_node, "qcom,prio-rd", -+ &node_info->qos_params.prio_rd); -+ -+ of_property_read_u32(dev_node, "qcom,prio-wr", -+ &node_info->qos_params.prio_wr); -+ -+ of_property_read_u32(dev_node, "qcom,gp", -+ &node_info->qos_params.gp); -+ -+ of_property_read_u32(dev_node, "qcom,thmp", -+ &node_info->qos_params.thmp); -+ -+ of_property_read_u32(dev_node, "qcom,ws", -+ &node_info->qos_params.ws); -+ -+ ret = of_property_read_u32(dev_node, "qcom,bw_buffer", &temp); -+ -+ if (ret) -+ node_info->qos_params.bw_buffer = 0; -+ else -+ node_info->qos_params.bw_buffer = KBTOB(temp); -+ -+} -+ -+ -+static struct msm_bus_node_info_type *get_node_info_data( -+ struct device_node * const dev_node, -+ struct platform_device * const pdev) -+{ -+ struct msm_bus_node_info_type *node_info; -+ unsigned int ret; -+ int size; -+ int i; -+ struct device_node *con_node; -+ struct device_node *bus_dev; -+ -+ node_info = devm_kzalloc(&pdev->dev, -+ sizeof(struct msm_bus_node_info_type), -+ GFP_KERNEL); -+ if (!node_info) { -+ dev_err(&pdev->dev, -+ "Error: Unable to allocate memory for node_info\n"); -+ return NULL; -+ } -+ -+ ret = of_property_read_u32(dev_node, "cell-id", &node_info->id); -+ if (ret) { -+ dev_warn(&pdev->dev, "Bus node is missing cell-id\n"); -+ goto node_info_err; -+ } -+ ret = of_property_read_string(dev_node, "label", &node_info->name); -+ if (ret) { -+ dev_warn(&pdev->dev, "Bus node is missing name\n"); -+ goto node_info_err; -+ } -+ node_info->qport = get_arr(pdev, dev_node, "qcom,qport", -+ &node_info->num_qports); -+ -+ if (of_get_property(dev_node, "qcom,connections", &size)) { -+ node_info->num_connections = size / sizeof(int); -+ node_info->connections = devm_kzalloc(&pdev->dev, size, -+ GFP_KERNEL); -+ } else { -+ node_info->num_connections = 0; -+ node_info->connections = 0; -+ } -+ -+ for (i = 0; i < node_info->num_connections; i++) { -+ con_node = of_parse_phandle(dev_node, "qcom,connections", i); -+ if (IS_ERR_OR_NULL(con_node)) -+ goto node_info_err; -+ -+ if (of_property_read_u32(con_node, "cell-id", -+ &node_info->connections[i])) -+ goto node_info_err; -+ of_node_put(con_node); -+ } -+ -+ if (of_get_property(dev_node, "qcom,blacklist", &size)) { -+ node_info->num_blist = size/sizeof(u32); -+ node_info->black_listed_connections = devm_kzalloc(&pdev->dev, -+ size, GFP_KERNEL); -+ } else { -+ node_info->num_blist = 0; -+ node_info->black_listed_connections = 0; -+ } -+ -+ for (i = 0; i < node_info->num_blist; i++) { -+ con_node = of_parse_phandle(dev_node, "qcom,blacklist", i); -+ if (IS_ERR_OR_NULL(con_node)) -+ goto node_info_err; -+ -+ if (of_property_read_u32(con_node, "cell-id", -+ &node_info->black_listed_connections[i])) -+ goto node_info_err; -+ of_node_put(con_node); -+ } -+ -+ bus_dev = of_parse_phandle(dev_node, "qcom,bus-dev", 0); -+ if (!IS_ERR_OR_NULL(bus_dev)) { -+ if (of_property_read_u32(bus_dev, "cell-id", -+ &node_info->bus_device_id)) { -+ dev_err(&pdev->dev, "Can't find bus device. Node %d", -+ node_info->id); -+ goto node_info_err; -+ } -+ -+ of_node_put(bus_dev); -+ } else -+ dev_dbg(&pdev->dev, "Can't find bdev phandle for %d", -+ node_info->id); -+ -+ node_info->is_fab_dev = of_property_read_bool(dev_node, "qcom,fab-dev"); -+ node_info->virt_dev = of_property_read_bool(dev_node, "qcom,virt-dev"); -+ -+ ret = of_property_read_u32(dev_node, "qcom,buswidth", -+ &node_info->buswidth); -+ if (ret) { -+ dev_dbg(&pdev->dev, "Using default 8 bytes %d", node_info->id); -+ node_info->buswidth = 8; -+ } -+ -+ ret = of_property_read_u32(dev_node, "qcom,mas-rpm-id", -+ &node_info->mas_rpm_id); -+ if (ret) { -+ dev_dbg(&pdev->dev, "mas rpm id is missing\n"); -+ node_info->mas_rpm_id = -1; -+ } -+ -+ ret = of_property_read_u32(dev_node, "qcom,slv-rpm-id", -+ &node_info->slv_rpm_id); -+ if (ret) { -+ dev_dbg(&pdev->dev, "slv rpm id is missing\n"); -+ node_info->slv_rpm_id = -1; -+ } -+ ret = of_property_read_u32(dev_node, "qcom,util-fact", -+ &node_info->util_fact); -+ if (ret) -+ node_info->util_fact = 0; -+ ret = of_property_read_u32(dev_node, "qcom,vrail-comp", -+ &node_info->vrail_comp); -+ if (ret) -+ node_info->vrail_comp = 0; -+ get_qos_params(dev_node, pdev, node_info); -+ -+ return node_info; -+ -+node_info_err: -+ devm_kfree(&pdev->dev, node_info); -+ node_info = 0; -+ return NULL; -+} -+ -+static unsigned int get_bus_node_device_data( -+ struct device_node * const dev_node, -+ struct platform_device * const pdev, -+ struct msm_bus_node_device_type * const node_device) -+{ -+ node_device->node_info = get_node_info_data(dev_node, pdev); -+ if (IS_ERR_OR_NULL(node_device->node_info)) { -+ dev_err(&pdev->dev, "Error: Node info missing\n"); -+ return -ENODATA; -+ } -+ node_device->ap_owned = of_property_read_bool(dev_node, -+ "qcom,ap-owned"); -+ -+ if (node_device->node_info->is_fab_dev) { -+ dev_dbg(&pdev->dev, "Dev %d\n", node_device->node_info->id); -+ -+ if (!node_device->node_info->virt_dev) { -+ node_device->fabdev = -+ get_fab_device_info(dev_node, pdev); -+ if (IS_ERR_OR_NULL(node_device->fabdev)) { -+ dev_err(&pdev->dev, -+ "Error: Fabric device info missing\n"); -+ devm_kfree(&pdev->dev, node_device->node_info); -+ return -ENODATA; -+ } -+ } -+ node_device->clk[DUAL_CTX].clk = of_clk_get_by_name(dev_node, -+ "bus_clk"); -+ -+ if (IS_ERR_OR_NULL(node_device->clk[DUAL_CTX].clk)) -+ dev_dbg(&pdev->dev, -+ "%s:Failed to get bus clk for bus%d ctx%d", -+ __func__, node_device->node_info->id, -+ DUAL_CTX); -+ -+ node_device->clk[ACTIVE_CTX].clk = of_clk_get_by_name(dev_node, -+ "bus_a_clk"); -+ if (IS_ERR_OR_NULL(node_device->clk[ACTIVE_CTX].clk)) -+ dev_err(&pdev->dev, -+ "Failed to get bus clk for bus%d ctx%d", -+ node_device->node_info->id, ACTIVE_CTX); -+ if (msmbus_coresight_init_adhoc(pdev, dev_node)) -+ dev_warn(&pdev->dev, -+ "Coresight support absent for bus: %d\n", -+ node_device->node_info->id); -+ } else { -+ node_device->qos_clk.clk = of_clk_get_by_name(dev_node, -+ "bus_qos_clk"); -+ -+ if (IS_ERR_OR_NULL(node_device->qos_clk.clk)) -+ dev_dbg(&pdev->dev, -+ "%s:Failed to get bus qos clk for mas%d", -+ __func__, node_device->node_info->id); -+ -+ node_device->clk[DUAL_CTX].clk = of_clk_get_by_name(dev_node, -+ "node_clk"); -+ -+ if (IS_ERR_OR_NULL(node_device->clk[DUAL_CTX].clk)) -+ dev_dbg(&pdev->dev, -+ "%s:Failed to get bus clk for bus%d ctx%d", -+ __func__, node_device->node_info->id, -+ DUAL_CTX); -+ -+ } -+ return 0; -+} -+ -+struct msm_bus_device_node_registration -+ *msm_bus_of_to_pdata(struct platform_device *pdev) -+{ -+ struct device_node *of_node, *child_node; -+ struct msm_bus_device_node_registration *pdata; -+ unsigned int i = 0, j; -+ unsigned int ret; -+ -+ if (!pdev) { -+ pr_err("Error: Null platform device\n"); -+ return NULL; -+ } -+ -+ of_node = pdev->dev.of_node; -+ -+ pdata = devm_kzalloc(&pdev->dev, -+ sizeof(struct msm_bus_device_node_registration), -+ GFP_KERNEL); -+ if (!pdata) { -+ dev_err(&pdev->dev, -+ "Error: Memory allocation for pdata failed\n"); -+ return NULL; -+ } -+ -+ pdata->num_devices = of_get_child_count(of_node); -+ -+ pdata->info = devm_kzalloc(&pdev->dev, -+ sizeof(struct msm_bus_node_device_type) * -+ pdata->num_devices, GFP_KERNEL); -+ -+ if (!pdata->info) { -+ dev_err(&pdev->dev, -+ "Error: Memory allocation for pdata->info failed\n"); -+ goto node_reg_err; -+ } -+ -+ ret = 0; -+ for_each_child_of_node(of_node, child_node) { -+ ret = get_bus_node_device_data(child_node, pdev, -+ &pdata->info[i]); -+ if (ret) { -+ dev_err(&pdev->dev, "Error: unable to initialize bus nodes\n"); -+ goto node_reg_err_1; -+ } -+ i++; -+ } -+ -+ dev_dbg(&pdev->dev, "bus topology:\n"); -+ for (i = 0; i < pdata->num_devices; i++) { -+ dev_dbg(&pdev->dev, "id %d\nnum_qports %d\nnum_connections %d", -+ pdata->info[i].node_info->id, -+ pdata->info[i].node_info->num_qports, -+ pdata->info[i].node_info->num_connections); -+ dev_dbg(&pdev->dev, "\nbus_device_id %d\n buswidth %d\n", -+ pdata->info[i].node_info->bus_device_id, -+ pdata->info[i].node_info->buswidth); -+ for (j = 0; j < pdata->info[i].node_info->num_connections; -+ j++) { -+ dev_dbg(&pdev->dev, "connection[%d]: %d\n", j, -+ pdata->info[i].node_info->connections[j]); -+ } -+ for (j = 0; j < pdata->info[i].node_info->num_blist; -+ j++) { -+ dev_dbg(&pdev->dev, "black_listed_node[%d]: %d\n", j, -+ pdata->info[i].node_info-> -+ black_listed_connections[j]); -+ } -+ if (pdata->info[i].fabdev) -+ dev_dbg(&pdev->dev, "base_addr %zu\nbus_type %d\n", -+ (size_t)pdata->info[i]. -+ fabdev->pqos_base, -+ pdata->info[i].fabdev->bus_type); -+ } -+ return pdata; -+ -+node_reg_err_1: -+ devm_kfree(&pdev->dev, pdata->info); -+node_reg_err: -+ devm_kfree(&pdev->dev, pdata); -+ pdata = NULL; -+ return NULL; -+} -+ -+static int msm_bus_of_get_ids(struct platform_device *pdev, -+ struct device_node *dev_node, int **dev_ids, -+ int *num_ids, char *prop_name) -+{ -+ int ret = 0; -+ int size, i; -+ struct device_node *rule_node; -+ int *ids = NULL; -+ -+ if (of_get_property(dev_node, prop_name, &size)) { -+ *num_ids = size / sizeof(int); -+ ids = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); -+ } else { -+ dev_err(&pdev->dev, "No rule nodes, skipping node"); -+ ret = -ENXIO; -+ goto exit_get_ids; -+ } -+ -+ *dev_ids = ids; -+ for (i = 0; i < *num_ids; i++) { -+ rule_node = of_parse_phandle(dev_node, prop_name, i); -+ if (IS_ERR_OR_NULL(rule_node)) { -+ dev_err(&pdev->dev, "Can't get rule node id"); -+ ret = -ENXIO; -+ goto err_get_ids; -+ } -+ -+ if (of_property_read_u32(rule_node, "cell-id", -+ &ids[i])) { -+ dev_err(&pdev->dev, "Can't get rule node id"); -+ ret = -ENXIO; -+ goto err_get_ids; -+ } -+ of_node_put(rule_node); -+ } -+exit_get_ids: -+ return ret; -+err_get_ids: -+ devm_kfree(&pdev->dev, ids); -+ of_node_put(rule_node); -+ ids = NULL; -+ return ret; -+} -+ -+int msm_bus_of_get_static_rules(struct platform_device *pdev, -+ struct bus_rule_type **static_rules) -+{ -+ int ret = 0; -+ struct device_node *of_node, *child_node; -+ int num_rules = 0; -+ int rule_idx = 0; -+ int bw_fld = 0; -+ int i; -+ struct bus_rule_type *static_rule = NULL; -+ -+ of_node = pdev->dev.of_node; -+ num_rules = of_get_child_count(of_node); -+ static_rule = devm_kzalloc(&pdev->dev, -+ sizeof(struct bus_rule_type) * num_rules, -+ GFP_KERNEL); -+ -+ if (IS_ERR_OR_NULL(static_rule)) { -+ ret = -ENOMEM; -+ goto exit_static_rules; -+ } -+ -+ *static_rules = static_rule; -+ for_each_child_of_node(of_node, child_node) { -+ ret = msm_bus_of_get_ids(pdev, child_node, -+ &static_rule[rule_idx].src_id, -+ &static_rule[rule_idx].num_src, -+ "qcom,src-nodes"); -+ -+ ret = msm_bus_of_get_ids(pdev, child_node, -+ &static_rule[rule_idx].dst_node, -+ &static_rule[rule_idx].num_dst, -+ "qcom,dest-node"); -+ -+ ret = of_property_read_u32(child_node, "qcom,src-field", -+ &static_rule[rule_idx].src_field); -+ if (ret) { -+ dev_err(&pdev->dev, "src-field missing"); -+ ret = -ENXIO; -+ goto err_static_rules; -+ } -+ -+ ret = of_property_read_u32(child_node, "qcom,src-op", -+ &static_rule[rule_idx].op); -+ if (ret) { -+ dev_err(&pdev->dev, "src-op missing"); -+ ret = -ENXIO; -+ goto err_static_rules; -+ } -+ -+ ret = of_property_read_u32(child_node, "qcom,mode", -+ &static_rule[rule_idx].mode); -+ if (ret) { -+ dev_err(&pdev->dev, "mode missing"); -+ ret = -ENXIO; -+ goto err_static_rules; -+ } -+ -+ ret = of_property_read_u32(child_node, "qcom,thresh", &bw_fld); -+ if (ret) { -+ dev_err(&pdev->dev, "thresh missing"); -+ ret = -ENXIO; -+ goto err_static_rules; -+ } else -+ static_rule[rule_idx].thresh = KBTOB(bw_fld); -+ -+ ret = of_property_read_u32(child_node, "qcom,dest-bw", -+ &bw_fld); -+ if (ret) -+ static_rule[rule_idx].dst_bw = 0; -+ else -+ static_rule[rule_idx].dst_bw = KBTOB(bw_fld); -+ -+ rule_idx++; -+ } -+ ret = rule_idx; -+exit_static_rules: -+ return ret; -+err_static_rules: -+ for (i = 0; i < num_rules; i++) { -+ if (!IS_ERR_OR_NULL(static_rule)) { -+ if (!IS_ERR_OR_NULL(static_rule[i].src_id)) -+ devm_kfree(&pdev->dev, -+ static_rule[i].src_id); -+ if (!IS_ERR_OR_NULL(static_rule[i].dst_node)) -+ devm_kfree(&pdev->dev, -+ static_rule[i].dst_node); -+ devm_kfree(&pdev->dev, static_rule); -+ } -+ } -+ devm_kfree(&pdev->dev, *static_rules); -+ static_rules = NULL; -+ return ret; -+} ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_rules.c -@@ -0,0 +1,624 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include "msm-bus-board.h" -+#include "msm_bus_rules.h" -+#include -+ -+struct node_vote_info { -+ int id; -+ u64 ib; -+ u64 ab; -+ u64 clk; -+}; -+ -+struct rules_def { -+ int rule_id; -+ int num_src; -+ int state; -+ struct node_vote_info *src_info; -+ struct bus_rule_type rule_ops; -+ bool state_change; -+ struct list_head link; -+}; -+ -+struct rule_node_info { -+ int id; -+ void *data; -+ struct raw_notifier_head rule_notify_list; -+ int cur_rule; -+ int num_rules; -+ struct list_head node_rules; -+ struct list_head link; -+ struct rule_apply_rcm_info apply; -+}; -+ -+DEFINE_MUTEX(msm_bus_rules_lock); -+static LIST_HEAD(node_list); -+static struct rule_node_info *get_node(u32 id, void *data); -+ -+#define LE(op1, op2) (op1 <= op2) -+#define LT(op1, op2) (op1 < op2) -+#define GE(op1, op2) (op1 >= op2) -+#define GT(op1, op2) (op1 > op2) -+#define NB_ID (0x201) -+ -+static struct rule_node_info *get_node(u32 id, void *data) -+{ -+ struct rule_node_info *node_it = NULL; -+ struct rule_node_info *node_match = NULL; -+ -+ list_for_each_entry(node_it, &node_list, link) { -+ if (node_it->id == id) { -+ if ((id == NB_ID)) { -+ if ((node_it->data == data)) { -+ node_match = node_it; -+ break; -+ } -+ } else { -+ node_match = node_it; -+ break; -+ } -+ } -+ } -+ return node_match; -+} -+ -+static struct rule_node_info *gen_node(u32 id, void *data) -+{ -+ struct rule_node_info *node_it = NULL; -+ struct rule_node_info *node_match = NULL; -+ -+ list_for_each_entry(node_it, &node_list, link) { -+ if (node_it->id == id) { -+ node_match = node_it; -+ break; -+ } -+ } -+ -+ if (!node_match) { -+ node_match = kzalloc(sizeof(struct rule_node_info), GFP_KERNEL); -+ if (!node_match) { -+ pr_err("%s: Cannot allocate memory", __func__); -+ goto exit_node_match; -+ } -+ -+ node_match->id = id; -+ node_match->cur_rule = -1; -+ node_match->num_rules = 0; -+ node_match->data = data; -+ list_add_tail(&node_match->link, &node_list); -+ INIT_LIST_HEAD(&node_match->node_rules); -+ RAW_INIT_NOTIFIER_HEAD(&node_match->rule_notify_list); -+ pr_debug("Added new node %d to list\n", id); -+ } -+exit_node_match: -+ return node_match; -+} -+ -+static bool do_compare_op(u64 op1, u64 op2, int op) -+{ -+ bool ret = false; -+ -+ switch (op) { -+ case OP_LE: -+ ret = LE(op1, op2); -+ break; -+ case OP_LT: -+ ret = LT(op1, op2); -+ break; -+ case OP_GT: -+ ret = GT(op1, op2); -+ break; -+ case OP_GE: -+ ret = GE(op1, op2); -+ break; -+ case OP_NOOP: -+ ret = true; -+ break; -+ default: -+ pr_info("Invalid OP %d", op); -+ break; -+ } -+ return ret; -+} -+ -+static void update_src_id_vote(struct rule_update_path_info *inp_node, -+ struct rule_node_info *rule_node) -+{ -+ struct rules_def *rule; -+ int i; -+ -+ list_for_each_entry(rule, &rule_node->node_rules, link) { -+ for (i = 0; i < rule->num_src; i++) { -+ if (rule->src_info[i].id == inp_node->id) { -+ rule->src_info[i].ib = inp_node->ib; -+ rule->src_info[i].ab = inp_node->ab; -+ rule->src_info[i].clk = inp_node->clk; -+ } -+ } -+ } -+} -+ -+static u64 get_field(struct rules_def *rule, int src_id) -+{ -+ u64 field = 0; -+ int i; -+ -+ for (i = 0; i < rule->num_src; i++) { -+ switch (rule->rule_ops.src_field) { -+ case FLD_IB: -+ field += rule->src_info[i].ib; -+ break; -+ case FLD_AB: -+ field += rule->src_info[i].ab; -+ break; -+ case FLD_CLK: -+ field += rule->src_info[i].clk; -+ break; -+ } -+ } -+ -+ return field; -+} -+ -+static bool check_rule(struct rules_def *rule, -+ struct rule_update_path_info *inp) -+{ -+ bool ret = false; -+ -+ if (!rule) -+ return ret; -+ -+ switch (rule->rule_ops.op) { -+ case OP_LE: -+ case OP_LT: -+ case OP_GT: -+ case OP_GE: -+ { -+ u64 src_field = get_field(rule, inp->id); -+ if (!src_field) -+ ret = false; -+ else -+ ret = do_compare_op(src_field, rule->rule_ops.thresh, -+ rule->rule_ops.op); -+ break; -+ } -+ default: -+ pr_err("Unsupported op %d", rule->rule_ops.op); -+ break; -+ } -+ return ret; -+} -+ -+static void match_rule(struct rule_update_path_info *inp_node, -+ struct rule_node_info *node) -+{ -+ struct rules_def *rule; -+ int i; -+ -+ list_for_each_entry(rule, &node->node_rules, link) { -+ for (i = 0; i < rule->num_src; i++) { -+ if (rule->src_info[i].id == inp_node->id) { -+ if (check_rule(rule, inp_node)) { -+ trace_bus_rules_matches(node->cur_rule, -+ inp_node->id, inp_node->ab, -+ inp_node->ib, inp_node->clk); -+ if (rule->state == -+ RULE_STATE_NOT_APPLIED) -+ rule->state_change = true; -+ rule->state = RULE_STATE_APPLIED; -+ } else { -+ if (rule->state == -+ RULE_STATE_APPLIED) -+ rule->state_change = true; -+ rule->state = RULE_STATE_NOT_APPLIED; -+ } -+ } -+ } -+ } -+} -+ -+static void apply_rule(struct rule_node_info *node, -+ struct list_head *output_list) -+{ -+ struct rules_def *rule; -+ -+ node->cur_rule = -1; -+ list_for_each_entry(rule, &node->node_rules, link) { -+ if ((rule->state == RULE_STATE_APPLIED) && -+ (node->cur_rule == -1)) -+ node->cur_rule = rule->rule_id; -+ -+ if (node->id == NB_ID) { -+ if (rule->state_change) { -+ rule->state_change = false; -+ raw_notifier_call_chain(&node->rule_notify_list, -+ rule->state, (void *)&rule->rule_ops); -+ } -+ } else { -+ if ((rule->state == RULE_STATE_APPLIED) && -+ (node->cur_rule == rule->rule_id)) { -+ node->apply.id = rule->rule_ops.dst_node[0]; -+ node->apply.throttle = rule->rule_ops.mode; -+ node->apply.lim_bw = rule->rule_ops.dst_bw; -+ list_add_tail(&node->apply.link, output_list); -+ } -+ rule->state_change = false; -+ } -+ } -+ -+} -+ -+int msm_rules_update_path(struct list_head *input_list, -+ struct list_head *output_list) -+{ -+ int ret = 0; -+ struct rule_update_path_info *inp_node; -+ struct rule_node_info *node_it = NULL; -+ -+ mutex_lock(&msm_bus_rules_lock); -+ list_for_each_entry(inp_node, input_list, link) { -+ list_for_each_entry(node_it, &node_list, link) { -+ update_src_id_vote(inp_node, node_it); -+ match_rule(inp_node, node_it); -+ } -+ } -+ -+ list_for_each_entry(node_it, &node_list, link) -+ apply_rule(node_it, output_list); -+ -+ mutex_unlock(&msm_bus_rules_lock); -+ return ret; -+} -+ -+static bool ops_equal(int op1, int op2) -+{ -+ bool ret = false; -+ -+ switch (op1) { -+ case OP_GT: -+ case OP_GE: -+ case OP_LT: -+ case OP_LE: -+ if (abs(op1 - op2) <= 1) -+ ret = true; -+ break; -+ default: -+ ret = (op1 == op2); -+ } -+ -+ return ret; -+} -+ -+static int node_rules_compare(void *priv, struct list_head *a, -+ struct list_head *b) -+{ -+ struct rules_def *ra = container_of(a, struct rules_def, link); -+ struct rules_def *rb = container_of(b, struct rules_def, link); -+ int ret = -1; -+ int64_t th_diff = 0; -+ -+ -+ if (ra->rule_ops.mode == rb->rule_ops.mode) { -+ if (ops_equal(ra->rule_ops.op, rb->rule_ops.op)) { -+ if ((ra->rule_ops.op == OP_LT) || -+ (ra->rule_ops.op == OP_LE)) { -+ th_diff = ra->rule_ops.thresh - -+ rb->rule_ops.thresh; -+ if (th_diff > 0) -+ ret = 1; -+ else -+ ret = -1; -+ } else if ((ra->rule_ops.op == OP_GT) || -+ (ra->rule_ops.op == OP_GE)) { -+ th_diff = rb->rule_ops.thresh - -+ ra->rule_ops.thresh; -+ if (th_diff > 0) -+ ret = 1; -+ else -+ ret = -1; -+ } -+ } else -+ ret = ra->rule_ops.op - rb->rule_ops.op; -+ } else if ((ra->rule_ops.mode == THROTTLE_OFF) && -+ (rb->rule_ops.mode == THROTTLE_ON)) { -+ ret = 1; -+ } else if ((ra->rule_ops.mode == THROTTLE_ON) && -+ (rb->rule_ops.mode == THROTTLE_OFF)) { -+ ret = -1; -+ } -+ -+ return ret; -+} -+ -+static void print_rules(struct rule_node_info *node_it) -+{ -+ struct rules_def *node_rule = NULL; -+ int i; -+ -+ if (!node_it) { -+ pr_err("%s: no node for found", __func__); -+ return; -+ } -+ -+ pr_info("\n Now printing rules for Node %d cur rule %d\n", -+ node_it->id, node_it->cur_rule); -+ list_for_each_entry(node_rule, &node_it->node_rules, link) { -+ pr_info("\n num Rules %d rule Id %d\n", -+ node_it->num_rules, node_rule->rule_id); -+ pr_info("Rule: src_field %d\n", node_rule->rule_ops.src_field); -+ for (i = 0; i < node_rule->rule_ops.num_src; i++) -+ pr_info("Rule: src %d\n", -+ node_rule->rule_ops.src_id[i]); -+ for (i = 0; i < node_rule->rule_ops.num_dst; i++) -+ pr_info("Rule: dst %d dst_bw %llu\n", -+ node_rule->rule_ops.dst_node[i], -+ node_rule->rule_ops.dst_bw); -+ pr_info("Rule: thresh %llu op %d mode %d State %d\n", -+ node_rule->rule_ops.thresh, -+ node_rule->rule_ops.op, -+ node_rule->rule_ops.mode, -+ node_rule->state); -+ } -+} -+ -+void print_all_rules(void) -+{ -+ struct rule_node_info *node_it = NULL; -+ -+ list_for_each_entry(node_it, &node_list, link) -+ print_rules(node_it); -+} -+ -+void print_rules_buf(char *buf, int max_buf) -+{ -+ struct rule_node_info *node_it = NULL; -+ struct rules_def *node_rule = NULL; -+ int i; -+ int cnt = 0; -+ -+ list_for_each_entry(node_it, &node_list, link) { -+ cnt += scnprintf(buf + cnt, max_buf - cnt, -+ "\n Now printing rules for Node %d cur_rule %d\n", -+ node_it->id, node_it->cur_rule); -+ list_for_each_entry(node_rule, &node_it->node_rules, link) { -+ cnt += scnprintf(buf + cnt, max_buf - cnt, -+ "\nNum Rules:%d ruleId %d STATE:%d change:%d\n", -+ node_it->num_rules, node_rule->rule_id, -+ node_rule->state, node_rule->state_change); -+ cnt += scnprintf(buf + cnt, max_buf - cnt, -+ "Src_field %d\n", -+ node_rule->rule_ops.src_field); -+ for (i = 0; i < node_rule->rule_ops.num_src; i++) -+ cnt += scnprintf(buf + cnt, max_buf - cnt, -+ "Src %d Cur Ib %llu Ab %llu\n", -+ node_rule->rule_ops.src_id[i], -+ node_rule->src_info[i].ib, -+ node_rule->src_info[i].ab); -+ for (i = 0; i < node_rule->rule_ops.num_dst; i++) -+ cnt += scnprintf(buf + cnt, max_buf - cnt, -+ "Dst %d dst_bw %llu\n", -+ node_rule->rule_ops.dst_node[0], -+ node_rule->rule_ops.dst_bw); -+ cnt += scnprintf(buf + cnt, max_buf - cnt, -+ "Thresh %llu op %d mode %d\n", -+ node_rule->rule_ops.thresh, -+ node_rule->rule_ops.op, -+ node_rule->rule_ops.mode); -+ } -+ } -+} -+ -+static int copy_rule(struct bus_rule_type *src, struct rules_def *node_rule, -+ struct notifier_block *nb) -+{ -+ int i; -+ int ret = 0; -+ -+ memcpy(&node_rule->rule_ops, src, -+ sizeof(struct bus_rule_type)); -+ node_rule->rule_ops.src_id = kzalloc( -+ (sizeof(int) * node_rule->rule_ops.num_src), -+ GFP_KERNEL); -+ if (!node_rule->rule_ops.src_id) { -+ pr_err("%s:Failed to allocate for src_id", -+ __func__); -+ return -ENOMEM; -+ } -+ memcpy(node_rule->rule_ops.src_id, src->src_id, -+ sizeof(int) * src->num_src); -+ -+ -+ if (!nb) { -+ node_rule->rule_ops.dst_node = kzalloc( -+ (sizeof(int) * node_rule->rule_ops.num_dst), -+ GFP_KERNEL); -+ if (!node_rule->rule_ops.dst_node) { -+ pr_err("%s:Failed to allocate for src_id", -+ __func__); -+ return -ENOMEM; -+ } -+ memcpy(node_rule->rule_ops.dst_node, src->dst_node, -+ sizeof(int) * src->num_dst); -+ } -+ -+ node_rule->num_src = src->num_src; -+ node_rule->src_info = kzalloc( -+ (sizeof(struct node_vote_info) * node_rule->rule_ops.num_src), -+ GFP_KERNEL); -+ if (!node_rule->src_info) { -+ pr_err("%s:Failed to allocate for src_id", -+ __func__); -+ return -ENOMEM; -+ } -+ for (i = 0; i < src->num_src; i++) -+ node_rule->src_info[i].id = src->src_id[i]; -+ -+ return ret; -+} -+ -+void msm_rule_register(int num_rules, struct bus_rule_type *rule, -+ struct notifier_block *nb) -+{ -+ struct rule_node_info *node = NULL; -+ int i, j; -+ struct rules_def *node_rule = NULL; -+ int num_dst = 0; -+ -+ if (!rule) -+ return; -+ -+ mutex_lock(&msm_bus_rules_lock); -+ for (i = 0; i < num_rules; i++) { -+ if (nb) -+ num_dst = 1; -+ else -+ num_dst = rule[i].num_dst; -+ -+ for (j = 0; j < num_dst; j++) { -+ int id = 0; -+ -+ if (nb) -+ id = NB_ID; -+ else -+ id = rule[i].dst_node[j]; -+ -+ node = gen_node(id, nb); -+ if (!node) { -+ pr_info("Error getting rule"); -+ goto exit_rule_register; -+ } -+ node_rule = kzalloc(sizeof(struct rules_def), -+ GFP_KERNEL); -+ if (!node_rule) { -+ pr_err("%s: Failed to allocate for rule", -+ __func__); -+ goto exit_rule_register; -+ } -+ -+ if (copy_rule(&rule[i], node_rule, nb)) { -+ pr_err("Error copying rule"); -+ goto exit_rule_register; -+ } -+ -+ node_rule->rule_id = node->num_rules++; -+ if (nb) -+ node->data = nb; -+ -+ list_add_tail(&node_rule->link, &node->node_rules); -+ } -+ } -+ list_sort(NULL, &node->node_rules, node_rules_compare); -+ -+ if (nb) -+ raw_notifier_chain_register(&node->rule_notify_list, nb); -+exit_rule_register: -+ mutex_unlock(&msm_bus_rules_lock); -+ return; -+} -+ -+static int comp_rules(struct bus_rule_type *rulea, struct bus_rule_type *ruleb) -+{ -+ int ret = 1; -+ -+ if (rulea->num_src == ruleb->num_src) -+ ret = memcmp(rulea->src_id, ruleb->src_id, -+ (sizeof(int) * rulea->num_src)); -+ if (!ret && (rulea->num_dst == ruleb->num_dst)) -+ ret = memcmp(rulea->dst_node, ruleb->dst_node, -+ (sizeof(int) * rulea->num_dst)); -+ if (!ret && (rulea->dst_bw == ruleb->dst_bw) && -+ (rulea->op == ruleb->op) && (rulea->thresh == ruleb->thresh)) -+ ret = 0; -+ -+ return ret; -+} -+ -+void msm_rule_unregister(int num_rules, struct bus_rule_type *rule, -+ struct notifier_block *nb) -+{ -+ int i; -+ struct rule_node_info *node = NULL; -+ struct rule_node_info *node_tmp = NULL; -+ struct rules_def *node_rule; -+ struct rules_def *node_rule_tmp; -+ bool match_found = false; -+ -+ if (!rule) -+ return; -+ -+ mutex_lock(&msm_bus_rules_lock); -+ if (nb) { -+ node = get_node(NB_ID, nb); -+ if (!node) { -+ pr_err("%s: Can't find node", __func__); -+ goto exit_unregister_rule; -+ } -+ -+ list_for_each_entry_safe(node_rule, node_rule_tmp, -+ &node->node_rules, link) { -+ list_del(&node_rule->link); -+ kfree(node_rule); -+ node->num_rules--; -+ } -+ raw_notifier_chain_unregister(&node->rule_notify_list, nb); -+ } else { -+ for (i = 0; i < num_rules; i++) { -+ match_found = false; -+ -+ list_for_each_entry(node, &node_list, link) { -+ list_for_each_entry_safe(node_rule, -+ node_rule_tmp, &node->node_rules, link) { -+ if (comp_rules(&node_rule->rule_ops, -+ &rule[i]) == 0) { -+ list_del(&node_rule->link); -+ kfree(node_rule); -+ match_found = true; -+ node->num_rules--; -+ list_sort(NULL, -+ &node->node_rules, -+ node_rules_compare); -+ break; -+ } -+ } -+ } -+ } -+ } -+ -+ list_for_each_entry_safe(node, node_tmp, -+ &node_list, link) { -+ if (!node->num_rules) { -+ pr_debug("Deleting Rule node %d", node->id); -+ list_del(&node->link); -+ kfree(node); -+ } -+ } -+exit_unregister_rule: -+ mutex_unlock(&msm_bus_rules_lock); -+} -+ -+bool msm_rule_are_rules_registered(void) -+{ -+ bool ret = false; -+ -+ if (list_empty(&node_list)) -+ ret = false; -+ else -+ ret = true; -+ -+ return ret; -+} -+ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_bus_rules.h -@@ -0,0 +1,77 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _ARCH_ARM_MACH_MSM_BUS_RULES_H -+#define _ARCH_ARM_MACH_MSM_BUS_RULES_H -+ -+#include -+#include -+#include -+#include -+ -+#define MAX_NODES (5) -+ -+struct rule_update_path_info { -+ u32 id; -+ u64 ab; -+ u64 ib; -+ u64 clk; -+ struct list_head link; -+}; -+ -+struct rule_apply_rcm_info { -+ u32 id; -+ u64 lim_bw; -+ int throttle; -+ bool after_clk_commit; -+ struct list_head link; -+}; -+ -+struct bus_rule_type { -+ int num_src; -+ int *src_id; -+ int src_field; -+ int op; -+ u64 thresh; -+ int num_dst; -+ int *dst_node; -+ u64 dst_bw; -+ int mode; -+ void *client_data; -+}; -+ -+#if (defined(CONFIG_BUS_TOPOLOGY_ADHOC)) -+void msm_rule_register(int num_rules, struct bus_rule_type *rule, -+ struct notifier_block *nb); -+void msm_rule_unregister(int num_rules, struct bus_rule_type *rule, -+ struct notifier_block *nb); -+void print_rules_buf(char *buf, int count); -+bool msm_rule_are_rules_registered(void); -+#else -+static inline void msm_rule_register(int num_rules, struct bus_rule_type *rule, -+ struct notifier_block *nb) -+{ -+} -+static inline void msm_rule_unregister(int num_rules, -+ struct bus_rule_type *rule, -+ struct notifier_block *nb) -+{ -+} -+static inline void print_rules_buf(char *buf, int count) -+{ -+} -+static inline bool msm_rule_are_rules_registered(void) -+{ -+ return false; -+} -+#endif /* defined(CONFIG_BUS_TOPOLOGY_ADHOC) */ -+#endif /* _ARCH_ARM_MACH_MSM_BUS_RULES_H */ ---- /dev/null -+++ b/drivers/bus/msm_bus/msm_buspm_coresight_adhoc.c -@@ -0,0 +1,189 @@ -+/* Copyright (c) 2014 The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+struct msmbus_coresight_adhoc_clock_drvdata { -+ int id; -+ struct clk *clk; -+ struct list_head list; -+}; -+ -+struct msmbus_coresight_adhoc_drvdata { -+ struct device *dev; -+ struct coresight_device *csdev; -+ struct coresight_desc *desc; -+ struct list_head clocks; -+}; -+ -+static int msmbus_coresight_enable_adhoc(struct coresight_device *csdev) -+{ -+ struct msmbus_coresight_adhoc_clock_drvdata *clk; -+ struct msmbus_coresight_adhoc_drvdata *drvdata = -+ dev_get_drvdata(csdev->dev.parent); -+ long rate; -+ -+ list_for_each_entry(clk, &drvdata->clocks, list) { -+ if (clk->id == csdev->id) { -+ rate = clk_round_rate(clk->clk, 1L); -+ clk_set_rate(clk->clk, rate); -+ return clk_prepare_enable(clk->clk); -+ } -+ } -+ -+ return -ENOENT; -+} -+ -+static void msmbus_coresight_disable_adhoc(struct coresight_device *csdev) -+{ -+ struct msmbus_coresight_adhoc_clock_drvdata *clk; -+ struct msmbus_coresight_adhoc_drvdata *drvdata = -+ dev_get_drvdata(csdev->dev.parent); -+ -+ list_for_each_entry(clk, &drvdata->clocks, list) { -+ if (clk->id == csdev->id) -+ clk_disable_unprepare(clk->clk); -+ } -+} -+ -+static const struct coresight_ops_source msmbus_coresight_adhoc_source_ops = { -+ .enable = msmbus_coresight_enable_adhoc, -+ .disable = msmbus_coresight_disable_adhoc, -+}; -+ -+static const struct coresight_ops msmbus_coresight_cs_ops = { -+ .source_ops = &msmbus_coresight_adhoc_source_ops, -+}; -+ -+void msmbus_coresight_remove_adhoc(struct platform_device *pdev) -+{ -+ struct msmbus_coresight_adhoc_clock_drvdata *clk, *next_clk; -+ struct msmbus_coresight_adhoc_drvdata *drvdata = -+ platform_get_drvdata(pdev); -+ -+ msmbus_coresight_disable_adhoc(drvdata->csdev); -+ coresight_unregister(drvdata->csdev); -+ list_for_each_entry_safe(clk, next_clk, &drvdata->clocks, list) { -+ list_del(&clk->list); -+ devm_kfree(&pdev->dev, clk); -+ } -+ devm_kfree(&pdev->dev, drvdata->desc); -+ devm_kfree(&pdev->dev, drvdata); -+ platform_set_drvdata(pdev, NULL); -+} -+EXPORT_SYMBOL(msmbus_coresight_remove_adhoc); -+ -+static int buspm_of_get_clk_adhoc(struct device_node *of_node, -+ struct msmbus_coresight_adhoc_drvdata *drvdata, int id) -+{ -+ struct msmbus_coresight_adhoc_clock_drvdata *clk; -+ clk = devm_kzalloc(drvdata->dev, sizeof(*clk), GFP_KERNEL); -+ -+ if (!clk) -+ return -ENOMEM; -+ -+ clk->id = id; -+ -+ clk->clk = of_clk_get_by_name(of_node, "bus_clk"); -+ if (IS_ERR(clk->clk)) { -+ pr_err("Error: unable to get clock for coresight node %d\n", -+ id); -+ goto err; -+ } -+ -+ list_add(&clk->list, &drvdata->clocks); -+ return 0; -+ -+err: -+ devm_kfree(drvdata->dev, clk); -+ return -EINVAL; -+} -+ -+int msmbus_coresight_init_adhoc(struct platform_device *pdev, -+ struct device_node *of_node) -+{ -+ int ret; -+ struct device *dev = &pdev->dev; -+ struct coresight_platform_data *pdata; -+ struct msmbus_coresight_adhoc_drvdata *drvdata; -+ struct coresight_desc *desc; -+ -+ pdata = of_get_coresight_platform_data(dev, of_node); -+ if (IS_ERR(pdata)) -+ return PTR_ERR(pdata); -+ -+ drvdata = platform_get_drvdata(pdev); -+ if (IS_ERR_OR_NULL(drvdata)) { -+ drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); -+ if (!drvdata) { -+ pr_err("coresight: Alloc for drvdata failed\n"); -+ return -ENOMEM; -+ } -+ INIT_LIST_HEAD(&drvdata->clocks); -+ drvdata->dev = &pdev->dev; -+ platform_set_drvdata(pdev, drvdata); -+ } -+ ret = buspm_of_get_clk_adhoc(of_node, drvdata, pdata->id); -+ if (ret) { -+ pr_err("Error getting clocks\n"); -+ ret = -ENXIO; -+ goto err1; -+ } -+ -+ desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); -+ if (!desc) { -+ pr_err("coresight: Error allocating memory\n"); -+ ret = -ENOMEM; -+ goto err1; -+ } -+ -+ desc->type = CORESIGHT_DEV_TYPE_SOURCE; -+ desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_BUS; -+ desc->ops = &msmbus_coresight_cs_ops; -+ desc->pdata = pdata; -+ desc->dev = &pdev->dev; -+ desc->owner = THIS_MODULE; -+ drvdata->desc = desc; -+ drvdata->csdev = coresight_register(desc); -+ if (IS_ERR(drvdata->csdev)) { -+ pr_err("coresight: Coresight register failed\n"); -+ ret = PTR_ERR(drvdata->csdev); -+ goto err0; -+ } -+ -+ dev_info(dev, "msmbus_coresight initialized\n"); -+ -+ return 0; -+err0: -+ devm_kfree(dev, desc); -+err1: -+ devm_kfree(dev, drvdata); -+ platform_set_drvdata(pdev, NULL); -+ return ret; -+} -+EXPORT_SYMBOL(msmbus_coresight_init_adhoc); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_DESCRIPTION("MSM BusPM Adhoc CoreSight Driver"); ---- /dev/null -+++ b/drivers/bus/msm_bus/rpm-smd.h -@@ -0,0 +1,268 @@ -+/* Copyright (c) 2012, 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#ifndef __ARCH_ARM_MACH_MSM_RPM_SMD_H -+#define __ARCH_ARM_MACH_MSM_RPM_SMD_H -+ -+/** -+ * enum msm_rpm_set - RPM enumerations for sleep/active set -+ * %MSM_RPM_CTX_SET_0: Set resource parameters for active mode. -+ * %MSM_RPM_CTX_SET_SLEEP: Set resource parameters for sleep. -+ */ -+enum msm_rpm_set { -+ MSM_RPM_CTX_ACTIVE_SET, -+ MSM_RPM_CTX_SLEEP_SET, -+}; -+ -+struct msm_rpm_request; -+ -+struct msm_rpm_kvp { -+ uint32_t key; -+ uint32_t length; -+ uint8_t *data; -+}; -+#ifdef CONFIG_MSM_RPM_SMD -+/** -+ * msm_rpm_request() - Creates a parent element to identify the -+ * resource on the RPM, that stores the KVPs for different fields modified -+ * for a hardware resource -+ * -+ * @set: if the device is setting the active/sleep set parameter -+ * for the resource -+ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource -+ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type -+ * @num_elements: number of KVPs pairs associated with the resource -+ * -+ * returns pointer to a msm_rpm_request on success, NULL on error -+ */ -+struct msm_rpm_request *msm_rpm_create_request( -+ enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, int num_elements); -+ -+/** -+ * msm_rpm_request_noirq() - Creates a parent element to identify the -+ * resource on the RPM, that stores the KVPs for different fields modified -+ * for a hardware resource. This function is similar to msm_rpm_create_request -+ * except that it has to be called with interrupts masked. -+ * -+ * @set: if the device is setting the active/sleep set parameter -+ * for the resource -+ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource -+ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type -+ * @num_elements: number of KVPs pairs associated with the resource -+ * -+ * returns pointer to a msm_rpm_request on success, NULL on error -+ */ -+struct msm_rpm_request *msm_rpm_create_request_noirq( -+ enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, int num_elements); -+ -+/** -+ * msm_rpm_add_kvp_data() - Adds a Key value pair to a existing RPM resource. -+ * -+ * @handle: RPM resource handle to which the data should be appended -+ * @key: unsigned integer identify the parameter modified -+ * @data: byte array that contains the value corresponding to key. -+ * @size: size of data in bytes. -+ * -+ * returns 0 on success or errno -+ */ -+int msm_rpm_add_kvp_data(struct msm_rpm_request *handle, -+ uint32_t key, const uint8_t *data, int size); -+ -+/** -+ * msm_rpm_add_kvp_data_noirq() - Adds a Key value pair to a existing RPM -+ * resource. This function is similar to msm_rpm_add_kvp_data except that it -+ * has to be called with interrupts masked. -+ * -+ * @handle: RPM resource handle to which the data should be appended -+ * @key: unsigned integer identify the parameter modified -+ * @data: byte array that contains the value corresponding to key. -+ * @size: size of data in bytes. -+ * -+ * returns 0 on success or errno -+ */ -+int msm_rpm_add_kvp_data_noirq(struct msm_rpm_request *handle, -+ uint32_t key, const uint8_t *data, int size); -+ -+/** msm_rpm_free_request() - clean up the RPM request handle created with -+ * msm_rpm_create_request -+ * -+ * @handle: RPM resource handle to be cleared. -+ */ -+ -+void msm_rpm_free_request(struct msm_rpm_request *handle); -+ -+/** -+ * msm_rpm_send_request() - Send the RPM messages using SMD. The function -+ * assigns a message id before sending the data out to the RPM. RPM hardware -+ * uses the message id to acknowledge the messages. -+ * -+ * @handle: pointer to the msm_rpm_request for the resource being modified. -+ * -+ * returns non-zero message id on success and zero on a failed transaction. -+ * The drivers use message id to wait for ACK from RPM. -+ */ -+int msm_rpm_send_request(struct msm_rpm_request *handle); -+ -+/** -+ * msm_rpm_send_request_noirq() - Send the RPM messages using SMD. The -+ * function assigns a message id before sending the data out to the RPM. -+ * RPM hardware uses the message id to acknowledge the messages. This function -+ * is similar to msm_rpm_send_request except that it has to be called with -+ * interrupts masked. -+ * -+ * @handle: pointer to the msm_rpm_request for the resource being modified. -+ * -+ * returns non-zero message id on success and zero on a failed transaction. -+ * The drivers use message id to wait for ACK from RPM. -+ */ -+int msm_rpm_send_request_noirq(struct msm_rpm_request *handle); -+ -+/** -+ * msm_rpm_wait_for_ack() - A blocking call that waits for acknowledgment of -+ * a message from RPM. -+ * -+ * @msg_id: the return from msm_rpm_send_requests -+ * -+ * returns 0 on success or errno -+ */ -+int msm_rpm_wait_for_ack(uint32_t msg_id); -+ -+/** -+ * msm_rpm_wait_for_ack_noirq() - A blocking call that waits for acknowledgment -+ * of a message from RPM. This function is similar to msm_rpm_wait_for_ack -+ * except that it has to be called with interrupts masked. -+ * -+ * @msg_id: the return from msm_rpm_send_request -+ * -+ * returns 0 on success or errno -+ */ -+int msm_rpm_wait_for_ack_noirq(uint32_t msg_id); -+ -+/** -+ * msm_rpm_send_message() -Wrapper function for clients to send data given an -+ * array of key value pairs. -+ * -+ * @set: if the device is setting the active/sleep set parameter -+ * for the resource -+ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource -+ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type -+ * @kvp: array of KVP data. -+ * @nelem: number of KVPs pairs associated with the message. -+ * -+ * returns 0 on success and errno on failure. -+ */ -+int msm_rpm_send_message(enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, struct msm_rpm_kvp *kvp, int nelems); -+ -+/** -+ * msm_rpm_send_message_noirq() -Wrapper function for clients to send data -+ * given an array of key value pairs. This function is similar to the -+ * msm_rpm_send_message() except that it has to be called with interrupts -+ * disabled. Clients should choose the irq version when possible for system -+ * performance. -+ * -+ * @set: if the device is setting the active/sleep set parameter -+ * for the resource -+ * @rsc_type: unsigned 32 bit integer that identifies the type of the resource -+ * @rsc_id: unsigned 32 bit that uniquely identifies a resource within a type -+ * @kvp: array of KVP data. -+ * @nelem: number of KVPs pairs associated with the message. -+ * -+ * returns 0 on success and errno on failure. -+ */ -+int msm_rpm_send_message_noirq(enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, struct msm_rpm_kvp *kvp, int nelems); -+ -+/** -+ * msm_rpm_driver_init() - Initialization function that registers for a -+ * rpm platform driver. -+ * -+ * returns 0 on success. -+ */ -+int __init msm_rpm_driver_init(void); -+ -+#else -+ -+static inline struct msm_rpm_request *msm_rpm_create_request( -+ enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, int num_elements) -+{ -+ return NULL; -+} -+ -+static inline struct msm_rpm_request *msm_rpm_create_request_noirq( -+ enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, int num_elements) -+{ -+ return NULL; -+ -+} -+static inline uint32_t msm_rpm_add_kvp_data(struct msm_rpm_request *handle, -+ uint32_t key, const uint8_t *data, int count) -+{ -+ return 0; -+} -+static inline uint32_t msm_rpm_add_kvp_data_noirq( -+ struct msm_rpm_request *handle, uint32_t key, -+ const uint8_t *data, int count) -+{ -+ return 0; -+} -+ -+static inline void msm_rpm_free_request(struct msm_rpm_request *handle) -+{ -+ return; -+} -+ -+static inline int msm_rpm_send_request(struct msm_rpm_request *handle) -+{ -+ return 0; -+} -+ -+static inline int msm_rpm_send_request_noirq(struct msm_rpm_request *handle) -+{ -+ return 0; -+ -+} -+ -+static inline int msm_rpm_send_message(enum msm_rpm_set set, uint32_t rsc_type, -+ uint32_t rsc_id, struct msm_rpm_kvp *kvp, int nelems) -+{ -+ return 0; -+} -+ -+static inline int msm_rpm_send_message_noirq(enum msm_rpm_set set, -+ uint32_t rsc_type, uint32_t rsc_id, struct msm_rpm_kvp *kvp, -+ int nelems) -+{ -+ return 0; -+} -+ -+static inline int msm_rpm_wait_for_ack(uint32_t msg_id) -+{ -+ return 0; -+ -+} -+static inline int msm_rpm_wait_for_ack_noirq(uint32_t msg_id) -+{ -+ return 0; -+} -+ -+static inline int __init msm_rpm_driver_init(void) -+{ -+ return 0; -+} -+#endif -+#endif /*__ARCH_ARM_MACH_MSM_RPM_SMD_H*/ ---- /dev/null -+++ b/include/trace/events/trace_msm_bus.h -@@ -0,0 +1,163 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#undef TRACE_SYSTEM -+#define TRACE_SYSTEM msm_bus -+ -+#if !defined(_TRACE_MSM_BUS_H) || defined(TRACE_HEADER_MULTI_READ) -+#define _TRACE_MSM_BUS_H -+ -+#include -+ -+TRACE_EVENT(bus_update_request, -+ -+ TP_PROTO(int sec, int nsec, const char *name, unsigned int index, -+ int src, int dest, unsigned long long ab, -+ unsigned long long ib), -+ -+ TP_ARGS(sec, nsec, name, index, src, dest, ab, ib), -+ -+ TP_STRUCT__entry( -+ __field(int, sec) -+ __field(int, nsec) -+ __string(name, name) -+ __field(u32, index) -+ __field(int, src) -+ __field(int, dest) -+ __field(u64, ab) -+ __field(u64, ib) -+ ), -+ -+ TP_fast_assign( -+ __entry->sec = sec; -+ __entry->nsec = nsec; -+ __assign_str(name, name); -+ __entry->index = index; -+ __entry->src = src; -+ __entry->dest = dest; -+ __entry->ab = ab; -+ __entry->ib = ib; -+ ), -+ -+ TP_printk("time= %d.%d name=%s index=%u src=%d dest=%d ab=%llu ib=%llu", -+ __entry->sec, -+ __entry->nsec, -+ __get_str(name), -+ (unsigned int)__entry->index, -+ __entry->src, -+ __entry->dest, -+ (unsigned long long)__entry->ab, -+ (unsigned long long)__entry->ib) -+); -+ -+TRACE_EVENT(bus_bimc_config_limiter, -+ -+ TP_PROTO(int mas_id, unsigned long long cur_lim_bw), -+ -+ TP_ARGS(mas_id, cur_lim_bw), -+ -+ TP_STRUCT__entry( -+ __field(int, mas_id) -+ __field(u64, cur_lim_bw) -+ ), -+ -+ TP_fast_assign( -+ __entry->mas_id = mas_id; -+ __entry->cur_lim_bw = cur_lim_bw; -+ ), -+ -+ TP_printk("Master=%d cur_lim_bw=%llu", -+ __entry->mas_id, -+ (unsigned long long)__entry->cur_lim_bw) -+); -+ -+TRACE_EVENT(bus_avail_bw, -+ -+ TP_PROTO(unsigned long long cur_bimc_bw, unsigned long long cur_mdp_bw), -+ -+ TP_ARGS(cur_bimc_bw, cur_mdp_bw), -+ -+ TP_STRUCT__entry( -+ __field(u64, cur_bimc_bw) -+ __field(u64, cur_mdp_bw) -+ ), -+ -+ TP_fast_assign( -+ __entry->cur_bimc_bw = cur_bimc_bw; -+ __entry->cur_mdp_bw = cur_mdp_bw; -+ ), -+ -+ TP_printk("cur_bimc_bw = %llu cur_mdp_bw = %llu", -+ (unsigned long long)__entry->cur_bimc_bw, -+ (unsigned long long)__entry->cur_mdp_bw) -+); -+ -+TRACE_EVENT(bus_rules_matches, -+ -+ TP_PROTO(int node_id, int rule_id, unsigned long long node_ab, -+ unsigned long long node_ib, unsigned long long node_clk), -+ -+ TP_ARGS(node_id, rule_id, node_ab, node_ib, node_clk), -+ -+ TP_STRUCT__entry( -+ __field(int, node_id) -+ __field(int, rule_id) -+ __field(u64, node_ab) -+ __field(u64, node_ib) -+ __field(u64, node_clk) -+ ), -+ -+ TP_fast_assign( -+ __entry->node_id = node_id; -+ __entry->rule_id = rule_id; -+ __entry->node_ab = node_ab; -+ __entry->node_ib = node_ib; -+ __entry->node_clk = node_clk; -+ ), -+ -+ TP_printk("Rule match node%d rule%d node-ab%llu:ib%llu:clk%llu", -+ __entry->node_id, __entry->rule_id, -+ (unsigned long long)__entry->node_ab, -+ (unsigned long long)__entry->node_ib, -+ (unsigned long long)__entry->node_clk) -+); -+ -+TRACE_EVENT(bus_bke_params, -+ -+ TP_PROTO(u32 gc, u32 gp, u32 thl, u32 thm, u32 thh), -+ -+ TP_ARGS(gc, gp, thl, thm, thh), -+ -+ TP_STRUCT__entry( -+ __field(u32, gc) -+ __field(u32, gp) -+ __field(u32, thl) -+ __field(u32, thm) -+ __field(u32, thh) -+ ), -+ -+ TP_fast_assign( -+ __entry->gc = gc; -+ __entry->gp = gp; -+ __entry->thl = thl; -+ __entry->thm = thm; -+ __entry->thh = thh; -+ ), -+ -+ TP_printk("BKE Params GC=0x%x GP=0x%x THL=0x%x THM=0x%x THH=0x%x", -+ __entry->gc, __entry->gp, __entry->thl, __entry->thm, -+ __entry->thh) -+); -+ -+#endif -+#define TRACE_INCLUDE_FILE trace_msm_bus -+#include diff --git a/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch index 59e277c349..50414596d9 100644 --- a/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch +++ b/target/linux/ipq806x/patches-4.19/850-soc-add-qualcomm-syscon.patch @@ -2,14 +2,17 @@ From: Christian Lamparter Subject: SoC: add qualcomm syscon --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile -@@ -9,3 +9,4 @@ obj-$(CONFIG_QCOM_SMEM_STATE) += smem_st +@@ -18,6 +18,7 @@ obj-$(CONFIG_QCOM_SMEM_STATE) += smem_st obj-$(CONFIG_QCOM_SMP2P) += smp2p.o obj-$(CONFIG_QCOM_SMSM) += smsm.o obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o +obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o + obj-$(CONFIG_QCOM_APR) += apr.o + obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o + obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig -@@ -78,6 +78,13 @@ config QCOM_SMSM +@@ -146,6 +146,13 @@ config QCOM_SMSM Say yes here to support the Qualcomm Shared Memory State Machine. The state machine is represented by bits in shared memory. @@ -25,7 +28,7 @@ Subject: SoC: add qualcomm syscon depends on ARCH_QCOM --- /dev/null +++ b/drivers/soc/qcom/qcom_tcsr.c -@@ -0,0 +1,98 @@ +@@ -0,0 +1,64 @@ +/* + * Copyright (c) 2014, The Linux foundation. All rights reserved. + * @@ -48,14 +51,6 @@ Subject: SoC: add qualcomm syscon +#include + +#define TCSR_USB_PORT_SEL 0xb0 -+#define TCSR_USB_HSPHY_CONFIG 0xC -+ -+#define TCSR_ESS_INTERFACE_SEL_OFFSET 0x0 -+#define TCSR_ESS_INTERFACE_SEL_MASK 0xf -+ -+#define TCSR_WIFI0_GLB_CFG_OFFSET 0x0 -+#define TCSR_WIFI1_GLB_CFG_OFFSET 0x4 -+#define TCSR_PNOC_SNOC_MEMTYPE_M0_M2 0x4 + +static int tcsr_probe(struct platform_device *pdev) +{ @@ -74,32 +69,6 @@ Subject: SoC: add qualcomm syscon + writel(val, base + TCSR_USB_PORT_SEL); + } + -+ if (!of_property_read_u32(node, "qcom,usb-hsphy-mode-select", &val)) { -+ dev_info(&pdev->dev, "setting usb hs phy mode select = %x\n", val); -+ writel(val, base + TCSR_USB_HSPHY_CONFIG); -+ } -+ -+ if (!of_property_read_u32(node, "qcom,ess-interface-select", &val)) { -+ u32 tmp = 0; -+ dev_info(&pdev->dev, "setting ess interface select = %x\n", val); -+ tmp = readl(base + TCSR_ESS_INTERFACE_SEL_OFFSET); -+ tmp = tmp & (~TCSR_ESS_INTERFACE_SEL_MASK); -+ tmp = tmp | (val&TCSR_ESS_INTERFACE_SEL_MASK); -+ writel(tmp, base + TCSR_ESS_INTERFACE_SEL_OFFSET); -+ } -+ -+ if (!of_property_read_u32(node, "qcom,wifi_glb_cfg", &val)) { -+ dev_info(&pdev->dev, "setting wifi_glb_cfg = %x\n", val); -+ writel(val, base + TCSR_WIFI0_GLB_CFG_OFFSET); -+ writel(val, base + TCSR_WIFI1_GLB_CFG_OFFSET); -+ } -+ -+ if (!of_property_read_u32(node, "qcom,wifi_noc_memtype_m0_m2", &val)) { -+ dev_info(&pdev->dev, -+ "setting wifi_noc_memtype_m0_m2 = %x\n", val); -+ writel(val, base + TCSR_PNOC_SNOC_MEMTYPE_M0_M2); -+ } -+ + return 0; +} + @@ -126,7 +95,7 @@ Subject: SoC: add qualcomm syscon +MODULE_LICENSE("GPL v2"); --- /dev/null +++ b/include/dt-bindings/soc/qcom,tcsr.h -@@ -0,0 +1,48 @@ +@@ -0,0 +1,23 @@ +/* Copyright (c) 2014, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify @@ -145,31 +114,6 @@ Subject: SoC: add qualcomm syscon +#define TCSR_USB_SELECT_USB3_P1 0x2 +#define TCSR_USB_SELECT_USB3_DUAL 0x3 + -+/* IPQ40xx HS PHY Mode Select */ -+#define TCSR_USB_HSPHY_HOST_MODE 0x00E700E7 -+#define TCSR_USB_HSPHY_DEVICE_MODE 0x00C700E7 -+ -+/* IPQ40xx ess interface mode select */ -+#define TCSR_ESS_PSGMII 0 -+#define TCSR_ESS_PSGMII_RGMII5 1 -+#define TCSR_ESS_PSGMII_RMII0 2 -+#define TCSR_ESS_PSGMII_RMII1 4 -+#define TCSR_ESS_PSGMII_RMII0_RMII1 6 -+#define TCSR_ESS_PSGMII_RGMII4 9 -+ -+/* -+ * IPQ40xx WiFi Global Config -+ * Bit 30:AXID_EN -+ * Enable AXI master bus Axid translating to confirm all txn submitted by order -+ * Bit 24: Use locally generated socslv_wxi_bvalid -+ * 1: use locally generate socslv_wxi_bvalid for performance. -+ * 0: use SNOC socslv_wxi_bvalid. -+ */ -+#define TCSR_WIFI_GLB_CFG 0x41000000 -+ -+/* IPQ40xx MEM_TYPE_SEL_M0_M2 Select Bit 26:24 - 2 NORMAL */ -+#define TCSR_WIFI_NOC_MEMTYPE_M0_M2 0x02222222 -+ +/* TCSR A/B REG */ +#define IPQ806X_TCSR_REG_A_ADM_CRCI_MUX_SEL 0 +#define IPQ806X_TCSR_REG_B_ADM_CRCI_MUX_SEL 1 From 9e9fe2392e4ce902745737d4dc379c4fda1f2534 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 4 Dec 2019 01:20:45 +0100 Subject: [PATCH 027/480] ipq806x: convert ok to okay in dts DT spec require okay instead of ok in dts files Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 36 ++++++++--------- .../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 40 +++++++++---------- .../arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 30 +++++++------- .../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 32 +++++++-------- .../arch/arm/boot/dts/qcom-ipq8064-db149.dts | 38 +++++++++--------- .../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 34 ++++++++-------- .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 32 +++++++-------- .../arm/boot/dts/qcom-ipq8064-r7500v2.dts | 32 +++++++-------- .../arm/boot/dts/qcom-ipq8064-vr2600v.dts | 30 +++++++------- .../arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 2 +- .../arm/boot/dts/qcom-ipq8065-nbg6817.dts | 30 +++++++------- .../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 32 +++++++-------- 12 files changed, 184 insertions(+), 184 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 655f9fba37..552d03f789 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -89,9 +89,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* @@ -104,10 +104,10 @@ gsbi5: gsbi@1a200000 { qcom,mode = ; - status = "ok"; + status = "okay"; spi4: spi@1a280000 { - status = "ok"; + status = "okay"; spi-max-frequency = <50000000>; pinctrl-0 = <&spi_pins>; @@ -130,48 +130,48 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; }; usb30@1 { - status = "ok"; + status = "okay"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -217,7 +217,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; @@ -231,7 +231,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; @@ -244,5 +244,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index 7e589be2c3..1dad12cfd6 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -92,9 +92,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* @@ -107,10 +107,10 @@ gsbi5: gsbi@1a200000 { qcom,mode = ; - status = "ok"; + status = "okay"; spi4: spi@1a280000 { - status = "ok"; + status = "okay"; spi-max-frequency = <50000000>; pinctrl-0 = <&spi_pins>; @@ -133,52 +133,52 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; }; usb30@1 { - status = "ok"; + status = "okay"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; pcie2: pci@1b900000 { - status = "ok"; + status = "okay"; }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -232,7 +232,7 @@ }; gmac0: ethernet@37000000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <0>; @@ -247,7 +247,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; mdiobus = <&mdio0>; @@ -259,7 +259,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; mdiobus = <&mdio0>; @@ -273,5 +273,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index c4fb2524c8..de80a11bdf 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -133,9 +133,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -147,10 +147,10 @@ gsbi5: gsbi@1a200000 { qcom,mode = ; - status = "ok"; + status = "okay"; spi5: spi@1a280000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&spi_pins>; pinctrl-names = "default"; @@ -316,41 +316,41 @@ }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb0_pwr_en_pin>; pinctrl-names = "default"; }; usb30@1 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb1_pwr_en_pin>; pinctrl-names = "default"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; @@ -381,7 +381,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; @@ -398,7 +398,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; @@ -490,5 +490,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index 1760b1968f..fc7aea0dca 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -131,9 +131,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -144,53 +144,53 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { ports-implemented = <0x1>; - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; usb30@1 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; pinctrl-names = "default"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&pcie0_pins>; pinctrl-names = "default"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; @@ -198,7 +198,7 @@ }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -301,7 +301,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; phy-handle = <&phy4>; qcom,id = <1>; @@ -313,7 +313,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; @@ -404,5 +404,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts index f4cface193..a873bf94f5 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -60,18 +60,18 @@ gsbi2: gsbi@12480000 { qcom,mode = ; - status = "ok"; + status = "okay"; uart2: serial@12490000 { - status = "ok"; + status = "okay"; }; }; gsbi5: gsbi@1a200000 { qcom,mode = ; - status = "ok"; + status = "okay"; spi4: spi@1a280000 { - status = "ok"; + status = "okay"; spi-max-frequency = <50000000>; pinctrl-0 = <&spi_pins>; @@ -116,47 +116,47 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; }; usb30@1 { - status = "ok"; + status = "okay"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; }; pcie2: pci@1b900000 { - status = "ok"; + status = "okay"; }; mdio0: mdio { @@ -195,7 +195,7 @@ }; gmac0: ethernet@37000000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <0>; phy-handle = <&phy4>; @@ -205,7 +205,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <1>; @@ -216,14 +216,14 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; phy-handle = <&phy6>; }; gmac3: ethernet@37600000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <3>; phy-handle = <&phy7>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index ca8376afd7..7fe45a8798 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -111,9 +111,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -124,52 +124,52 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; }; usb30@1 { - status = "ok"; + status = "okay"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; }; pcie2: pci@1b900000 { - status = "ok"; + status = "okay"; }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -317,7 +317,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; qcom,phy_mdio_addr = <4>; @@ -333,7 +333,7 @@ }; //lan gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; qcom,phy_mdio_addr = <0>; /* none */ @@ -347,7 +347,7 @@ }; adm_dma: dma@18300000 { - status = "ok"; + status = "okay"; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index b6505dd541..9755567560 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -112,9 +112,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -125,54 +125,54 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ clocks = <&gcc USB30_0_UTMI_CLK>; - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ clocks = <&gcc USB30_0_MASTER_CLK>; - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ clocks = <&gcc USB30_1_UTMI_CLK>; - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ clocks = <&gcc USB30_1_MASTER_CLK>; - status = "ok"; + status = "okay"; }; usb30@0 { clocks = <&gcc USB30_1_MASTER_CLK>; - status = "ok"; + status = "okay"; }; usb30@1 { clocks = <&gcc USB30_0_MASTER_CLK>; - status = "ok"; + status = "okay"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -266,7 +266,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; @@ -282,7 +282,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; @@ -378,5 +378,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index faec8b35ae..471e02c5f1 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -136,9 +136,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -149,52 +149,52 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; usb30@1 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; pinctrl-names = "default"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pcie0_pins>; pinctrl-names = "default"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; @@ -202,7 +202,7 @@ }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -296,7 +296,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; @@ -312,7 +312,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; @@ -403,5 +403,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index 2c224016b6..2510ca1081 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -111,9 +111,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -125,10 +125,10 @@ gsbi5: gsbi@1a200000 { qcom,mode = ; - status = "ok"; + status = "okay"; spi4: spi@1a280000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&spi_pins>; pinctrl-names = "default"; @@ -234,35 +234,35 @@ }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; }; usb30@1 { - status = "ok"; + status = "okay"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; @@ -293,7 +293,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; @@ -310,7 +310,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; @@ -413,5 +413,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts index 7b5ee799ee..2f511e498e 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -240,7 +240,7 @@ }; &gmac2 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 7cd1c7b567..e1fa475310 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -151,9 +151,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -165,10 +165,10 @@ gsbi5: gsbi@1a200000 { qcom,mode = ; - status = "ok"; + status = "okay"; spi4: spi@1a280000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&spi_pins>; pinctrl-names = "default"; @@ -190,44 +190,44 @@ }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; usb30@1 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; pinctrl-names = "default"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pcie0_pins>; pinctrl-names = "default"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; @@ -279,7 +279,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; qcom,phy_mdio_addr = <4>; @@ -300,7 +300,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; qcom,phy_mdio_addr = <0>; /* none */ @@ -382,5 +382,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 447c0da696..304f948296 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -204,9 +204,9 @@ gsbi@16300000 { qcom,mode = ; - status = "ok"; + status = "okay"; serial@16340000 { - status = "ok"; + status = "okay"; }; /* * The i2c device on gsbi4 should not be enabled. @@ -217,55 +217,55 @@ }; sata-phy@1b400000 { - status = "ok"; + status = "okay"; }; sata@29000000 { ports-implemented = <0x1>; - status = "ok"; + status = "okay"; }; phy@100f8800 { /* USB3 port 1 HS phy */ - status = "ok"; + status = "okay"; }; phy@100f8830 { /* USB3 port 1 SS phy */ - status = "ok"; + status = "okay"; }; phy@110f8800 { /* USB3 port 0 HS phy */ - status = "ok"; + status = "okay"; }; phy@110f8830 { /* USB3 port 0 SS phy */ - status = "ok"; + status = "okay"; }; usb30@0 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; usb30@1 { - status = "ok"; + status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; pinctrl-names = "default"; }; pcie0: pci@1b500000 { - status = "ok"; + status = "okay"; }; pcie1: pci@1b700000 { - status = "ok"; + status = "okay"; force_gen1 = <1>; }; nand@1ac00000 { - status = "ok"; + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; @@ -382,7 +382,7 @@ }; gmac1: ethernet@37200000 { - status = "ok"; + status = "okay"; phy-mode = "rgmii"; qcom,id = <1>; qcom,phy_mdio_addr = <4>; @@ -405,7 +405,7 @@ }; gmac2: ethernet@37400000 { - status = "ok"; + status = "okay"; phy-mode = "sgmii"; qcom,id = <2>; qcom,phy_mdio_addr = <0>; /* none */ @@ -509,5 +509,5 @@ }; &adm_dma { - status = "ok"; + status = "okay"; }; From 96a509eeeb6125e147b11752e02f3176f43e3db5 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Mon, 16 Dec 2019 20:29:17 +0100 Subject: [PATCH 028/480] ipq806x: fix missing compatible and rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ipq8064 compatible was missing from nbg6817. - Rename ap148 with a better descriptive name. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith [proper authorship of the patch] Signed-off-by: Petr Štetiar --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 552d03f789..381fcee5ea 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -1,7 +1,7 @@ #include "qcom-ipq8064-v1.0.dtsi" / { - model = "Qualcomm IPQ8064/AP148"; + model = "Qualcomm Technologies, Inc. IPQ8064/AP-148"; compatible = "qcom,ipq8064-ap148", "qcom,ipq8064"; memory@0 { diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index e1fa475310..954d3fe853 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -4,7 +4,7 @@ / { model = "ZyXEL NBG6817"; - compatible = "zyxel,nbg6817", "qcom,ipq8065"; + compatible = "zyxel,nbg6817", "qcom,ipq8065", "qcom,ipq8064"; memory@0 { reg = <0x42000000 0x1e000000>; From afcb78f1035da7ca93b2afc9305aab18e930c43d Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 02:10:26 +0100 Subject: [PATCH 029/480] ipq806x: use new usb3 implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use new usb3 implementation and refresh dts to the new dwc3 structure Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith [proper authorship of the patch] Signed-off-by: Petr Štetiar --- .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-db149.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 24 +------ .../arm/boot/dts/qcom-ipq8064-r7500v2.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 24 +++---- .../arm/boot/dts/qcom-ipq8064-vr2600v.dts | 20 +----- .../arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 16 ----- .../arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 8 --- .../arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 16 ----- .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 66 +++++++++---------- .../arm/boot/dts/qcom-ipq8065-nbg6817.dts | 20 +----- .../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 20 +----- 16 files changed, 64 insertions(+), 290 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 381fcee5ea..987731b04f 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -137,27 +137,11 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ + usb3_0: usb3@110f8800 { status = "okay"; }; - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { - status = "okay"; - }; - - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index 1dad12cfd6..edfa18d73a 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -140,27 +140,11 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ + usb3_0: usb3@110f8800 { status = "okay"; }; - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { - status = "okay"; - }; - - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index de80a11bdf..865e27ff73 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -315,30 +315,14 @@ }; }; - phy@100f8800 { /* USB3 port 1 HS phy */ - status = "okay"; - }; - - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { + usb3_0: usb3@110f8800 { status = "okay"; pinctrl-0 = <&usb0_pwr_en_pin>; pinctrl-names = "default"; }; - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; pinctrl-0 = <&usb1_pwr_en_pin>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index fc7aea0dca..9e5ff273a4 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -152,30 +152,14 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ - status = "okay"; - }; - - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { + usb3_0: usb3@110f8800 { status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts index a873bf94f5..5da523a728 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -123,27 +123,11 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ + usb3_0: usb3@110f8800 { status = "okay"; }; - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { - status = "okay"; - }; - - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index 7fe45a8798..8d6c981d1d 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -131,27 +131,11 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ + usb3_0: usb3@110f8800 { status = "okay"; }; - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { - status = "okay"; - }; - - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index 9755567560..6c51d95072 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -132,32 +132,12 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ - clocks = <&gcc USB30_0_UTMI_CLK>; - status = "okay"; - }; - - phy@100f8830 { /* USB3 port 1 SS phy */ - clocks = <&gcc USB30_0_MASTER_CLK>; - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - clocks = <&gcc USB30_1_UTMI_CLK>; - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ + usb3_0: usb3@110f8800 { clocks = <&gcc USB30_1_MASTER_CLK>; status = "okay"; }; - usb30@0 { - clocks = <&gcc USB30_1_MASTER_CLK>; - status = "okay"; - }; - - usb30@1 { + usb3_1: usb3@100f8800 { clocks = <&gcc USB30_0_MASTER_CLK>; status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index 471e02c5f1..7445d92f61 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -156,30 +156,14 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ - status = "okay"; - }; - - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { + usb3_0: usb3@110f8800 { status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi index 8c522a897d..dd272c7fc7 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi @@ -3,18 +3,6 @@ / { soc: soc { - ss_phy_0: phy@110f8830 { - rx_eq = <2>; - tx_deamp_3_5db = <32>; - mpll = <0xa0>; - }; - - ss_phy_1: phy@100f8830 { - rx_eq = <2>; - tx_deamp_3_5db = <32>; - mpll = <0xa0>; - }; - pcie0: pci@1b500000 { phy-tx0-term-offset = <0>; }; @@ -28,3 +16,15 @@ }; }; }; + +&ss_phy_0 { + rx_eq = <2>; + tx_deamp_3_5db = <32>; + mpll = <0xa0>; +}; + +&ss_phy_1 { + rx_eq = <2>; + tx_deamp_3_5db = <32>; + mpll = <0xa0>; +}; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index 2510ca1081..485a4b90e3 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -233,27 +233,11 @@ }; }; - phy@100f8800 { /* USB3 port 1 HS phy */ + usb3_0: usb3@110f8800 { status = "okay"; }; - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { - status = "okay"; - }; - - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts index e2a481723b..f0c377aa30 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts @@ -321,22 +321,6 @@ }; }; -&hs_phy_0 { /* USB3 port 0 HS phy */ - status = "okay"; -}; - -&ss_phy_0 { /* USB3 port 0 SS phy */ - status = "okay"; -}; - -&hs_phy_1 { /* USB3 port 1 HS phy */ - status = "okay"; -}; - -&ss_phy_1 { /* USB3 port 1 SS phy */ - status = "okay"; -}; - &usb3_0 { status = "okay"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts index 14258d594e..e2c87f33e1 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -383,14 +383,6 @@ }; }; -&hs_phy_0 { /* USB3 port 0 HS phy */ - status = "okay"; -}; - -&hs_phy_1 { /* USB3 port 1 HS phy */ - status = "okay"; -}; - &ss_phy_0 { /* USB3 port 0 SS phy */ status = "okay"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts index 2f511e498e..12cfa3b0fc 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -369,22 +369,6 @@ }; }; -&hs_phy_0 { /* USB3 port 0 HS phy */ - status = "okay"; -}; - -&ss_phy_0 { /* USB3 port 0 SS phy */ - status = "okay"; -}; - -&hs_phy_1 { /* USB3 port 1 HS phy */ - status = "okay"; -}; - -&ss_phy_1 { /* USB3 port 1 SS phy */ - status = "okay"; -}; - &usb3_0 { status = "okay"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index 8387460d27..54869de44f 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -920,64 +920,41 @@ reg = <0x01200600 0x100>; }; - hs_phy_1: phy@100f8800 { + hs_phy_0: hs_phy_0 { compatible = "qcom,dwc3-hs-usb-phy"; - reg = <0x100f8800 0x30>; - clocks = <&gcc USB30_1_UTMI_CLK>; - clock-names = "ref"; - #phy-cells = <0>; - - status = "disabled"; - }; - - ss_phy_1: phy@100f8830 { - compatible = "qcom,dwc3-ss-usb-phy"; - reg = <0x100f8830 0x30>; - clocks = <&gcc USB30_1_MASTER_CLK>; - clock-names = "ref"; - #phy-cells = <0>; - - status = "disabled"; - }; - - hs_phy_0: phy@110f8800 { - compatible = "qcom,dwc3-hs-usb-phy"; - reg = <0x110f8800 0x30>; + regmap = <&usb3_0>; clocks = <&gcc USB30_0_UTMI_CLK>; clock-names = "ref"; #phy-cells = <0>; - - status = "disabled"; }; - ss_phy_0: phy@110f8830 { + ss_phy_0: ss_phy_0 { compatible = "qcom,dwc3-ss-usb-phy"; - reg = <0x110f8830 0x30>; + regmap = <&usb3_0>; clocks = <&gcc USB30_0_MASTER_CLK>; clock-names = "ref"; #phy-cells = <0>; - - status = "disabled"; }; - usb3_0: usb30@0 { - compatible = "qcom,dwc3"; + usb3_0: usb3@110f8800 { + compatible = "qcom,dwc3", "syscon"; #address-cells = <1>; #size-cells = <1>; + reg = <0x110f8800 0x8000>; clocks = <&gcc USB30_0_MASTER_CLK>; clock-names = "core"; ranges; resets = <&gcc USB30_0_MASTER_RESET>; - reset-names = "usb30_0_mstr_rst"; + reset-names = "master"; status = "disabled"; dwc3_0: dwc3@11000000 { compatible = "snps,dwc3"; reg = <0x11000000 0xcd00>; - interrupts = <0 110 0x4>; + interrupts = ; phys = <&hs_phy_0>, <&ss_phy_0>; phy-names = "usb2-phy", "usb3-phy"; dr_mode = "host"; @@ -985,24 +962,41 @@ }; }; - usb3_1: usb30@1 { - compatible = "qcom,dwc3"; + hs_phy_1: hs_phy_1 { + compatible = "qcom,dwc3-hs-usb-phy"; + regmap = <&usb3_1>; + clocks = <&gcc USB30_1_UTMI_CLK>; + clock-names = "ref"; + #phy-cells = <0>; + }; + + ss_phy_1: ss_phy_1 { + compatible = "qcom,dwc3-ss-usb-phy"; + regmap = <&usb3_1>; + clocks = <&gcc USB30_1_MASTER_CLK>; + clock-names = "ref"; + #phy-cells = <0>; + }; + + usb3_1: usb3@100f8800 { + compatible = "qcom,dwc3", "syscon"; #address-cells = <1>; #size-cells = <1>; + reg = <0x100f8800 0x8000>; clocks = <&gcc USB30_1_MASTER_CLK>; clock-names = "core"; ranges; resets = <&gcc USB30_1_MASTER_RESET>; - reset-names = "usb30_1_mstr_rst"; + reset-names = "master"; status = "disabled"; dwc3_1: dwc3@10000000 { compatible = "snps,dwc3"; reg = <0x10000000 0xcd00>; - interrupts = <0 205 0x4>; + interrupts = ; phys = <&hs_phy_1>, <&ss_phy_1>; phy-names = "usb2-phy", "usb3-phy"; dr_mode = "host"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 954d3fe853..6576d74154 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -189,30 +189,14 @@ }; }; - phy@100f8800 { /* USB3 port 1 HS phy */ - status = "okay"; - }; - - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { + usb3_0: usb3@110f8800 { status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 304f948296..82a4f348ed 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -225,30 +225,14 @@ status = "okay"; }; - phy@100f8800 { /* USB3 port 1 HS phy */ - status = "okay"; - }; - - phy@100f8830 { /* USB3 port 1 SS phy */ - status = "okay"; - }; - - phy@110f8800 { /* USB3 port 0 HS phy */ - status = "okay"; - }; - - phy@110f8830 { /* USB3 port 0 SS phy */ - status = "okay"; - }; - - usb30@0 { + usb3_0: usb3@110f8800 { status = "okay"; pinctrl-0 = <&usb0_pwr_en_pins>; pinctrl-names = "default"; }; - usb30@1 { + usb3_1: usb3@100f8800 { status = "okay"; pinctrl-0 = <&usb1_pwr_en_pins>; From 61505922dc0ff846e576f6fd5626e2d7b6f8c3e5 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 01:11:01 +0100 Subject: [PATCH 030/480] ipq806x: convert ipq8064 dtsi interrupts Convert hardcoded interrupts value to types defined in gci include file. Interrupts sets to 0 are converted to IRQ_TYPE_LEVEL_HIGH to fix kernel warning. Same fix has been applied to arm64 dts. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1797143 https://patchwork.kernel.org/patch/10367453/ https://patchwork.kernel.org/patch/10315315/ Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 60 ++++++++++--------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index 54869de44f..bdeec812f6 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -433,7 +433,8 @@ cpu-pmu { compatible = "qcom,krait-pmu"; - interrupts = <1 10 0x304>; + interrupts = ; }; reserved-memory { @@ -533,7 +534,7 @@ clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk"; - interrupts = <0 85 1>; + interrupts = ; interrupt-names = "lpass-irq-lpaif"; reg = <0x28100000 0x10000>; reg-names = "lpass-lpaif"; @@ -558,9 +559,9 @@ reg = <0x108000 0x1000>; qcom,ipc = <&l2cc 0x8 2>; - interrupts = <0 19 0>, - <0 21 0>, - <0 22 0>; + interrupts = , + , + ; interrupt-names = "ack", "err", "wakeup"; @@ -625,7 +626,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; - interrupts = <0 16 0x4>; + interrupts = ; pcie0_pins: pcie0_pinmux { mux { @@ -666,11 +667,16 @@ timer@200a000 { compatible = "qcom,kpss-timer", "qcom,msm-timer"; - interrupts = <1 1 0x301>, - <1 2 0x301>, - <1 3 0x301>, - <1 4 0x301>, - <1 5 0x301>; + interrupts = , + , + , + , + ; reg = <0x0200a000 0x100>; clock-frequency = <25000000>, <32768>; @@ -737,7 +743,7 @@ compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>, <0x12480000 0x1000>; - interrupts = <0 195 0x0>; + interrupts = ; clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>; clock-names = "core", "iface"; status = "disabled"; @@ -746,7 +752,7 @@ i2c@124a0000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x124a0000 0x1000>; - interrupts = <0 196 0>; + interrupts = ; clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>; clock-names = "core", "iface"; @@ -775,7 +781,7 @@ compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16340000 0x1000>, <0x16300000 0x1000>; - interrupts = <0 152 0x0>; + interrupts = ; clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>; clock-names = "core", "iface"; status = "disabled"; @@ -784,7 +790,7 @@ i2c@16380000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x16380000 0x1000>; - interrupts = <0 153 0>; + interrupts = ; clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>; clock-names = "core", "iface"; @@ -812,7 +818,7 @@ compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>, <0x1a200000 0x1000>; - interrupts = <0 154 0x0>; + interrupts = ; clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; status = "disabled"; @@ -821,7 +827,7 @@ i2c@1a280000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x1a280000 0x1000>; - interrupts = <0 155 0>; + interrupts = ; clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; @@ -834,7 +840,7 @@ spi@1a280000 { compatible = "qcom,spi-qup-v1.1.1"; reg = <0x1a280000 0x1000>; - interrupts = <0 155 0>; + interrupts = ; clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; @@ -862,7 +868,7 @@ ports-implemented = <0x1>; - interrupts = <0 209 0x0>; + interrupts = ; clocks = <&gcc SFAB_SATA_S_H_CLK>, <&gcc SATA_H_CLK>, @@ -899,7 +905,7 @@ reg = <0x900000 0x3680>; nvmem-cells = <&tsens_calib>, <&tsens_backup>; nvmem-cell-names = "calib", "calib_backup"; - interrupts = <0 178 0>; + interrupts = ; #thermal-sensor-cells = <1>; }; @@ -969,7 +975,7 @@ clock-names = "ref"; #phy-cells = <0>; }; - + ss_phy_1: ss_phy_1 { compatible = "qcom,dwc3-ss-usb-phy"; regmap = <&usb3_1>; @@ -1021,7 +1027,7 @@ ranges = <0x81000000 0 0x0fe00000 0x0fe00000 0 0x00100000 /* downstream I/O */ 0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */ - interrupts = ; + interrupts = ; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; @@ -1075,7 +1081,7 @@ ranges = <0x81000000 0 0x31e00000 0x31e00000 0 0x00100000 /* downstream I/O */ 0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */ - interrupts = ; + interrupts = ; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; @@ -1129,7 +1135,7 @@ ranges = <0x81000000 0 0x35e00000 0x35e00000 0 0x00100000 /* downstream I/O */ 0x82000000 0 0x32000000 0x32000000 0 0x03e00000>; /* non-prefetchable memory */ - interrupts = ; + interrupts = ; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; @@ -1169,7 +1175,7 @@ adm_dma: dma@18300000 { compatible = "qcom,adm"; reg = <0x18300000 0x100000>; - interrupts = <0 170 0>; + interrupts = ; #dma-cells = <1>; clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>; @@ -1325,7 +1331,7 @@ sdcc1bam:dma@12402000 { compatible = "qcom,bam-v1.3.0"; reg = <0x12402000 0x8000>; - interrupts = <0 98 0>; + interrupts = ; clocks = <&gcc SDC1_H_CLK>; clock-names = "bam_clk"; #dma-cells = <1>; @@ -1335,7 +1341,7 @@ sdcc3bam:dma@12182000 { compatible = "qcom,bam-v1.3.0"; reg = <0x12182000 0x8000>; - interrupts = <0 96 0>; + interrupts = ; clocks = <&gcc SDC3_H_CLK>; clock-names = "bam_clk"; #dma-cells = <1>; From 71b106223067dd37e749482ef70d5b62444c8f52 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Thu, 5 Dec 2019 01:12:32 +0100 Subject: [PATCH 031/480] ipq806x: set apq8064 regulator to support cpuidle Set qcom,apq8064-saw2-v1.1-cpu as regulator to make cpuidle work. Signed-off-by: Ansuel Smith --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index bdeec812f6..a7a9c49fc5 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -70,6 +70,7 @@ CPU_SPC: spc { compatible = "qcom,idle-state-spc", "arm,idle-state"; + status = "okay"; entry-latency-us = <400>; exit-latency-us = <900>; min-residency-us = <3000>; @@ -704,13 +705,13 @@ }; saw0: regulator@2089000 { - compatible = "qcom,saw2", "syscon"; + compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; reg = <0x02089000 0x1000>, <0x02009000 0x1000>; regulator; }; saw1: regulator@2099000 { - compatible = "qcom,saw2", "syscon"; + compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; reg = <0x02099000 0x1000>, <0x02009000 0x1000>; regulator; }; From 2336c2dbb1929837f7e42d4315c8073342a5b46b Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Thu, 5 Dec 2019 01:12:55 +0100 Subject: [PATCH 032/480] ipq806x: disable spc on ipq8065 soc Spc is disabled in ipq8065 board as it does cause cpu lockup (probably caused by wrong register being set) Signed-off-by: Ansuel Smith --- .../files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi index 86de2bd8be..d18aea4c54 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi @@ -75,4 +75,12 @@ }; }; }; + + cpus { + idle-states { + CPU_SPC: spc { + status = "disabled"; + }; + }; + }; }; From 9e7a8beb9c0ed3105f86465bc64dfc79bae34d1f Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 01:24:55 +0100 Subject: [PATCH 033/480] ipq806x: add missing gpio and gsbi declaration Adds missing gpio and gsbi declaration. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index a7a9c49fc5..efaa6abd78 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -656,6 +656,34 @@ output-low; }; }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + drive-strength = <10>; + bias-none; + }; + }; + + leds_pins: leds_pins { + mux { + pins = "gpio7", "gpio8", "gpio9", + "gpio26", "gpio53"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + output-low; + }; + }; + + buttons_pins: buttons_pins { + mux { + pins = "gpio54"; + drive-strength = <2>; + bias-pull-up; + }; + }; }; intc: interrupt-controller@2000000 { @@ -852,6 +880,29 @@ }; }; + gsbi7: gsbi@16600000 { + status = "disabled"; + compatible = "qcom,gsbi-v1.0.0"; + cell-index = <7>; + reg = <0x16600000 0x100>; + clocks = <&gcc GSBI7_H_CLK>; + clock-names = "iface"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + syscon-tcsr = <&tcsr>; + + gsbi7_serial: serial@16640000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x16640000 0x1000>, + <0x16600000 0x1000>; + interrupts = ; + clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + }; + }; + sata_phy: sata-phy@1b400000 { compatible = "qcom,ipq806x-sata-phy"; reg = <0x1b400000 0x200>; From 5ce72009ac11ebe6f83a7a4465c7371008605bda Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 01:25:33 +0100 Subject: [PATCH 034/480] ipq806x: increase drive-strength for pinmux Increase drive-strength from https://lore.kernel.org/patchwork/patch/626885/ 2mA drive strength is not enough when we connect multiple i2c devices on the bus with different pull up resistors. This issue was detected when multiple i2c devices connected on the other side of level shifters on Linaro sensor board. Maxing up to 16mA made i2c much stable. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index efaa6abd78..17e8a62381 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -633,7 +633,7 @@ mux { pins = "gpio3"; function = "pcie1_rst"; - drive-strength = <2>; + drive-strength = <12>; bias-disable; }; }; @@ -642,7 +642,7 @@ mux { pins = "gpio48"; function = "pcie2_rst"; - drive-strength = <2>; + drive-strength = <12>; bias-disable; }; }; @@ -651,7 +651,7 @@ mux { pins = "gpio63"; function = "pcie3_rst"; - drive-strength = <2>; + drive-strength = <12>; bias-disable; output-low; }; From df35293000a1f4b87fa87164e9e9ef4c71a327af Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 01:23:26 +0100 Subject: [PATCH 035/480] ipq806x: add nand and sata tags Add some tags for nand and sata structure to easily reference them in other dts. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index 17e8a62381..ec76fcf240 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -914,7 +914,7 @@ status = "disabled"; }; - sata@29000000 { + sata: sata@29000000 { compatible = "qcom,ipq806x-ahci", "generic-ahci"; reg = <0x29000000 0x180>; @@ -1244,7 +1244,7 @@ status = "disabled"; }; - nand@1ac00000 { + nand: nand@1ac00000 { compatible = "qcom,ipq806x-nand"; reg = <0x1ac00000 0x800>; From 2da033eaa6dd6c124c5ca2f3b96f136bbb45ff6a Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 01:26:22 +0100 Subject: [PATCH 036/480] ipq806x: use ipq8064 dedicated watchdog Add missing watchdog to list of compatible timers Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index ec76fcf240..b3ad6db46d 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -695,7 +695,8 @@ }; timer@200a000 { - compatible = "qcom,kpss-timer", "qcom,msm-timer"; + compatible = "qcom,kpss-timer", + "qcom,kpss-wdt-ipq8064", "qcom,msm-timer"; interrupts = , Date: Thu, 5 Dec 2019 02:24:44 +0100 Subject: [PATCH 037/480] ipq806x: r7800: add missing wifi definition for pcie Add missing wifi compatible definition for r7800 device. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 82a4f348ed..c6c066aade 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -241,11 +241,41 @@ pcie0: pci@1b500000 { status = "okay"; + + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "pci168c,0046"; + reg = <0x00010000 0 0 0 0>; + + mtd-mac-address = <&art 6>; + mtd-mac-address-increment = <(1)>; + }; + }; }; pcie1: pci@1b700000 { status = "okay"; force_gen1 = <1>; + + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "pci168c,0046"; + reg = <0x00010000 0 0 0 0>; + + mtd-mac-address = <&art 6>; + mtd-mac-address-increment = <(2)>; + }; + }; }; nand@1ac00000 { From fe26364065a1477fa5807d147b24a481b2d4abc2 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 5 Dec 2019 02:26:30 +0100 Subject: [PATCH 038/480] ipq806x: d7800: fix warning on dtc compilation There is warning with "property has invalid length (4 bytes)" related to nand definition. Set size-cells to zero to fix this. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index 9e5ff273a4..ac1a965896 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -188,7 +188,7 @@ pinctrl-names = "default"; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; cs0 { reg = <0>; @@ -262,7 +262,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; From 044c79689bc1117abc5eee394a7f8e312ac9f8d0 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 4 Dec 2019 02:28:22 +0100 Subject: [PATCH 039/480] ipq806x: ap148: reorganize dts Reorganize dts to use tags from ipq8064 dtsi Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 324 +++++++++--------- 1 file changed, 159 insertions(+), 165 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 987731b04f..8ef5b92b52 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -29,156 +29,12 @@ }; soc { - pinmux@800000 { - i2c4_pins: i2c4_pinmux { - pins = "gpio12", "gpio13"; - function = "gsbi4"; - bias-disable; - }; - - spi_pins: spi_pins { - mux { - pins = "gpio18", "gpio19", "gpio21"; - function = "gsbi5"; - drive-strength = <10>; - bias-none; - }; - }; - nand_pins: nand_pins { - mux { - pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; - function = "nand"; - drive-strength = <10>; - bias-disable; - }; - pullups { - pins = "gpio39"; - bias-pull-up; - }; - hold { - pins = "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; - bias-bus-hold; - }; - }; - - mdio0_pins: mdio0_pins { - mux { - pins = "gpio0", "gpio1"; - function = "gpio"; - drive-strength = <8>; - bias-disable; - }; - }; - - rgmii2_pins: rgmii2_pins { - mux { - pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", - "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; - function = "rgmii2"; - drive-strength = <8>; - bias-disable; - }; - }; - }; - - gsbi@16300000 { - qcom,mode = ; - status = "okay"; - serial@16340000 { - status = "okay"; - }; - - /* - * The i2c device on gsbi4 should not be enabled. - * On ipq806x designs gsbi4 i2c is meant for exclusive - * RPM usage. Turning this on in kernel manifests as - * i2c failure for the RPM. - */ - }; - - gsbi5: gsbi@1a200000 { - qcom,mode = ; - status = "okay"; - - spi4: spi@1a280000 { - status = "okay"; - spi-max-frequency = <50000000>; - - pinctrl-0 = <&spi_pins>; - pinctrl-names = "default"; - - cs-gpios = <&qcom_pinmux 20 0>; - - flash: m25p80@0 { - compatible = "s25fl256s1"; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - reg = <0>; - - partitions { - compatible = "qcom,smem"; - }; - }; - }; - }; - - sata-phy@1b400000 { - status = "okay"; - }; - - sata@29000000 { - status = "okay"; - }; - - usb3_0: usb3@110f8800 { - status = "okay"; - }; - - usb3_1: usb3@100f8800 { - status = "okay"; - }; - - pcie0: pci@1b500000 { - status = "okay"; - }; - - pcie1: pci@1b700000 { - status = "okay"; - force_gen1 = <1>; - }; - - nand@1ac00000 { - status = "okay"; - - pinctrl-0 = <&nand_pins>; - pinctrl-names = "default"; - - cs0 { - reg = <0>; - compatible = "qcom,nandcs"; - - nand-ecc-strength = <4>; - nand-bus-width = <8>; - nand-ecc-step-size = <512>; - - partitions { - compatible = "qcom,smem"; - }; - }; - }; - mdio0: mdio { compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; @@ -199,30 +55,55 @@ reg = <4>; }; }; + }; +}; - gmac1: ethernet@37200000 { - status = "okay"; - phy-mode = "rgmii"; - qcom,id = <1>; +&qcom_pinmux { + i2c4_pins: i2c4_pinmux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + bias-disable; + }; - pinctrl-0 = <&rgmii2_pins>; - pinctrl-names = "default"; - - fixed-link { - speed = <1000>; - full-duplex; - }; + nand_pins: nand_pins { + mux { + pins = "gpio34", "gpio35", "gpio36", + "gpio37", "gpio38", "gpio39", + "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; + bias-disable; }; + pullups { + pins = "gpio39"; + bias-pull-up; + }; + hold { + pins = "gpio40", "gpio41", "gpio42", + "gpio43", "gpio44", "gpio45", + "gpio46", "gpio47"; + bias-bus-hold; + }; + }; - gmac2: ethernet@37400000 { - status = "okay"; - phy-mode = "sgmii"; - qcom,id = <2>; + mdio0_pins: mdio0_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + }; - fixed-link { - speed = <1000>; - full-duplex; - }; + rgmii2_pins: rgmii2_pins { + mux { + pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", + "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; + function = "rgmii2"; + drive-strength = <8>; + bias-disable; }; }; }; @@ -230,3 +111,116 @@ &adm_dma { status = "okay"; }; + +&gsbi4 { + qcom,mode = ; + status = "okay"; + + serial@16340000 { + status = "okay"; + }; + + /* + * The i2c device on gsbi4 should not be enabled. + * On ipq806x designs gsbi4 i2c is meant for exclusive + * RPM usage. Turning this on in kernel manifests as + * i2c failure for the RPM. + */ +}; + +&gsbi5 { + qcom,mode = ; + status = "okay"; + + spi4: spi@1a280000 { + status = "okay"; + spi-max-frequency = <50000000>; + + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 0>; + + flash: m25p80@0 { + compatible = "s25fl256s1"; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <50000000>; + reg = <0>; + + partitions { + compatible = "qcom,smem"; + }; + }; + }; +}; + +&usb3_0 { + status = "okay"; +}; + +&usb3_1 { + status = "okay"; +}; + +&pcie0 { + status = "okay"; +}; + +&pcie1 { + status = "okay"; + force_gen1 = <1>; +}; + +&nand { + status = "okay"; + + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + cs0 { + reg = <0>; + compatible = "qcom,nandcs"; + + nand-ecc-strength = <4>; + nand-bus-width = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "qcom,smem"; + }; + }; +}; + +&gmac1 { + status = "okay"; + phy-mode = "rgmii"; + qcom,id = <1>; + + pinctrl-0 = <&rgmii2_pins>; + pinctrl-names = "default"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gmac2 { + status = "okay"; + phy-mode = "sgmii"; + qcom,id = <2>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&sata_phy { + status = "okay"; +}; + +&sata { + status = "okay"; +}; From 2296d41a1c42c96e7409ec437c1952a3895eeaa0 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 4 Dec 2019 02:28:53 +0100 Subject: [PATCH 040/480] ipq806x: ap161: fix wrong definition stdout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From documentation https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt should be just stdout-path Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith [proper authorship of the patch] Signed-off-by: Petr Štetiar --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index edfa18d73a..6a16167e1f 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -25,7 +25,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { From f28e6ae7ceb89651082f75b9dceb23fecf788b73 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 4 Dec 2019 02:57:38 +0100 Subject: [PATCH 041/480] ipq806x: improve mdio gpios list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improve rediability of gpio mdio list. No functional change. Signed-off-by: Christian Lamparter Signed-off-by: Ansuel Smith [proper authorship of the patch] Signed-off-by: Petr Štetiar --- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 3 ++- .../files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index 865e27ff73..d90518bf22 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -342,7 +342,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index 8d6c981d1d..6f54e19da2 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -278,7 +278,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index 6c51d95072..8130b583d3 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -223,7 +223,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index 7445d92f61..21287ef9d7 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -257,7 +257,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index 485a4b90e3..bdcd302802 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -254,7 +254,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts index f0c377aa30..6667b1f473 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts @@ -40,7 +40,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts index e2c87f33e1..280dc88569 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -226,7 +226,8 @@ pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; ethernet-phy@0 { reg = <0>; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 6576d74154..378ea775b5 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -222,7 +222,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index c6c066aade..6a1d016f7a 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -350,7 +350,8 @@ compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; From 402153623d927c35e4ee66cf2111e8e7d456d428 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Thu, 28 Nov 2019 22:29:15 +0100 Subject: [PATCH 042/480] ipq806x: fix tsens driver in 4.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added patch: - 063-3 Fix tsense shared memory problem Recent changes in ioremap_resource function are causing fails for the memory areas which are already mapped. This changes are causing tsense driver failures during initialization: qcom-tsens 900000.thermal-sensor: tsens init failed So this patch uses simple ioremap in order to use this shared memory space. Signed-off-by: Ansuel Smith [commit subject and desciption facelitf] Signed-off-by: Petr Štetiar --- .../0063-3-tsens-fix-kernel-4_19.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch diff --git a/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch b/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch new file mode 100644 index 0000000000..19afe8c212 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch @@ -0,0 +1,20 @@ +--- a/drivers/thermal/qcom/tsens-common.c ++++ b/drivers/thermal/qcom/tsens-common.c +@@ -128,6 +128,7 @@ + { + void __iomem *base; + struct resource *res; ++ resource_size_t size; + struct platform_device *op = of_find_device_by_node(tmdev->dev->of_node); + + if (!op) +@@ -142,7 +143,8 @@ int __init init_common(struct tsens_devi + } + + res = platform_get_resource(op, IORESOURCE_MEM, 0); +- base = devm_ioremap_resource(&op->dev, res); ++ size = resource_size(res); ++ base = devm_ioremap(&op->dev, res->start, size); + if (IS_ERR(base)) + return PTR_ERR(base); + From 1698b36bb45e4e0fe7a6e21280ebeea227922beb Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Fri, 29 Nov 2019 17:24:14 +0100 Subject: [PATCH 043/480] kernel: make dwc3 usb driver depends on kernel 4.14 - usb-dwc3-of-simple is not used anymore as we have qcom dedicated driver - usb-phy-qcom-dwc3 is not dependent of dwc3-of-simple Signed-off-by: Ansuel Smith --- package/kernel/linux/modules/usb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 2a5f1d7d5f..a95528a176 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -72,7 +72,7 @@ $(eval $(call KernelPackage,usb-phy-nop)) define KernelPackage/usb-phy-qcom-dwc3 TITLE:=DWC3 USB QCOM PHY driver - DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3-of-simple + DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x) KCONFIG:= CONFIG_PHY_QCOM_DWC3 FILES:= \ $(LINUX_DIR)/drivers/phy/phy-qcom-dwc3.ko@lt4.13 \ @@ -480,7 +480,7 @@ $(eval $(call KernelPackage,usb-dwc3)) define KernelPackage/usb-dwc3-of-simple TITLE:=DWC3 USB simple OF driver - DEPENDS:=@!LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3 + DEPENDS:=@LINUX_4_14 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3 KCONFIG:= CONFIG_USB_DWC3_OF_SIMPLE FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-of-simple.ko AUTOLOAD:=$(call AutoLoad,53,dwc3-of-simple,1) From 77e7d6c20dc6d5e50600fb4d013f4b71341e4168 Mon Sep 17 00:00:00 2001 From: Pavel Kubelun Date: Tue, 3 Dec 2019 00:45:47 +0100 Subject: [PATCH 044/480] ipq806x: add missing core1 voltage tolerance Voltage tolerance is accounted per core, not per cpu, so add missing DT entry. Signed-off-by: Pavel Kubelun Signed-off-by: Ansuel Smith --- .../linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index b3ad6db46d..5cb4a5e78a 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -50,6 +50,7 @@ clock-names = "cpu", "l2"; clock-latency = <100000>; cpu-supply = <&smb208_s2b>; + voltage-tolerance = <5>; cooling-min-state = <0>; cooling-max-state = <10>; #cooling-cells = <2>; From ce8707ea79b189a06d7dee72047a587d44dd82cf Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 14:07:46 +0100 Subject: [PATCH 045/480] ipq806x: update USB3 modules for 4.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use new dwc3-qcom usb driver. - Drop dwc3-of-simple as we have a dedicated driver now. Signed-off-by: Ansuel Smith [split into separate commit, commit subject facelift] Signed-off-by: Petr Štetiar --- target/linux/ipq806x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 6dc1cfca79..bb968e75d3 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -20,7 +20,7 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform \ kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \ + kmod-usb-phy-qcom-dwc3 kmod-usb3 kmod-usb-dwc3-qcom \ kmod-ath10k-ct wpad-basic \ uboot-envtools From 2a82e0e1ca0f10406e6d6d8d7b95e9bb4445940d Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 14:08:46 +0100 Subject: [PATCH 046/480] ipq806x: switch to 4.19 kernel version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It has been used by several people for some time already and feedback has been mostly positive. Ref: https://github.com/openwrt/openwrt/pull/2472 Tested-by: Hannu Nyman [ipq8065, R7800] Tested-by: Stefan Lippers-Hollmann [ipq8065, NBG6817] Signed-off-by: Ansuel Smith [separate commit, commit subject and description facelift] Signed-off-by: Petr Štetiar --- target/linux/ipq806x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index bb968e75d3..24409d6719 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -11,7 +11,7 @@ CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin SUBTARGETS:=generic -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=4.19 KERNELNAME:=zImage Image dtbs From 98b3526bf23e8d1b48939c937c9b12e4f2160415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Fri, 6 Dec 2019 06:55:24 +0100 Subject: [PATCH 047/480] iputils: move iputils tools to packages feed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit iputils has moved from the master tree to the packages feed, and is switching from the abandoned skbuff.net upstream to github.com/iputils/iputils. Ref: https://git.openwrt.org/556698cedf9e86a0ffe9f148d4e8e733676c26f6 Signed-off-by: Petr Štetiar --- package/network/utils/iputils/Makefile | 182 ---------------- .../utils/iputils/patches/001-iputils.patch | 14 -- .../utils/iputils/patches/002-fix-ipv6.patch | 14 -- .../iputils/patches/003-fix-makefile.patch | 18 -- .../patches/010-ping6_uclibc_resolv.patch | 200 ------------------ .../patches/011-ping6_use_gnu_source.patch | 11 - .../iputils/patches/020-include_fixes.patch | 71 ------- 7 files changed, 510 deletions(-) delete mode 100644 package/network/utils/iputils/Makefile delete mode 100644 package/network/utils/iputils/patches/001-iputils.patch delete mode 100644 package/network/utils/iputils/patches/002-fix-ipv6.patch delete mode 100644 package/network/utils/iputils/patches/003-fix-makefile.patch delete mode 100644 package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch delete mode 100644 package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch delete mode 100644 package/network/utils/iputils/patches/020-include_fixes.patch diff --git a/package/network/utils/iputils/Makefile b/package/network/utils/iputils/Makefile deleted file mode 100644 index 03ad7d2031..0000000000 --- a/package/network/utils/iputils/Makefile +++ /dev/null @@ -1,182 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=iputils -PKG_VERSION:=20101006 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-s$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.skbuff.net/iputils -PKG_HASH:=fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7 - -PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=GPL-2.0+ -PKG_CPE_ID:=cpe:/a:skbuff:iputils - -PKG_BUILD_DEPENDS:=sysfsutils -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-s$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - - -define Package/iputils/Default - SECTION:=net - CATEGORY:=Network - URL:=http://www.skbuff.net/iputils -endef - - -define Package/iputils-arping -$(call Package/iputils/Default) - TITLE:=iputils - arping - DEPENDS+= +libsysfs -endef - -define Package/iputils-arping/description - Program arping from iputils. - Sends ARP REQUEST to a neighbour host. -endef - - -define Package/iputils-clockdiff -$(call Package/iputils/Default) - TITLE:=iputils - clockdiff -endef - -define Package/iputils-clockdiff/description - Program clockdiff from iputils. - Measures clock difference between hosts. -endef - - -define Package/iputils-ping -$(call Package/iputils/Default) - TITLE:=iputils - ping -endef - -define Package/iputils-ping/description - Program ping from iputils. - Sends ICMP ECHO_REQUEST to network hosts (IPv4). -endef - - -define Package/iputils-ping6 -$(call Package/iputils/Default) - TITLE:=iputils - ping6 - DEPENDS+= @IPV6 +USE_GLIBC:libopenssl -endef - -define Package/iputils-ping6/description - Program ping6 from iputils. - Sends ICMP ECHO_REQUEST to network hosts (IPv6). -endef - - -define Package/iputils-tftpd -$(call Package/iputils/Default) - TITLE:=iputils - tftpd -endef - -define Package/iputils-tftpd/description - Program tftpd from iputils - Trivial File Transfer Protocol server. -endef - - -define Package/iputils-tracepath -$(call Package/iputils/Default) - TITLE:=iputils - tracepath -endef - -define Package/iputils-tracepath/description - Program tracepath from iputils. - Traces path to a network host discovering MTU along this path (IPv4). -endef - - -define Package/iputils-tracepath6 -$(call Package/iputils/Default) - TITLE:=iputils - tracepath6 - DEPENDS+= @IPV6 -endef - -define Package/iputils-tracepath6/description - Program tracepath6 from iputils. - Traces path to a network host discovering MTU along this path (IPv6). -endef - - -define Package/iputils-traceroute6 -$(call Package/iputils/Default) - TITLE:=iputils - traceroute6 - DEPENDS+= @IPV6 -endef - -define Package/iputils-traceroute6/description - Program traceroute6 from iputils. - Traces path to a network host (IPv6). -endef - -ifdef CONFIG_USE_MUSL - TARGET_CFLAGS += -D__UCLIBC__ -endif - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ - CONFIG_IPV6="$(CONFIG_IPV6)" \ - CONFIG_USE_UCLIBC="$(CONFIG_USE_UCLIBC)$(CONFIG_USE_MUSL)" \ - -define Package/iputils-arping/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/arping $(1)/usr/bin/ -endef - -define Package/iputils-clockdiff/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/clockdiff $(1)/usr/bin/ -endef - -define Package/iputils-ping/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_SUID) $(PKG_BUILD_DIR)/ping $(1)/usr/bin/ -endef - -define Package/iputils-ping6/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_SUID) $(PKG_BUILD_DIR)/ping6 $(1)/usr/bin/ -endef - -define Package/iputils-tftpd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tftpd $(1)/usr/sbin/ -endef - -define Package/iputils-tracepath/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tracepath $(1)/usr/bin/ -endef - -define Package/iputils-tracepath6/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tracepath6 $(1)/usr/bin/ -endef - -define Package/iputils-traceroute6/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_SUID) $(PKG_BUILD_DIR)/traceroute6 $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,iputils-arping)) -$(eval $(call BuildPackage,iputils-clockdiff)) -$(eval $(call BuildPackage,iputils-ping)) -$(eval $(call BuildPackage,iputils-tftpd)) -$(eval $(call BuildPackage,iputils-tracepath)) -$(eval $(call BuildPackage,iputils-ping6)) -$(eval $(call BuildPackage,iputils-tracepath6)) -$(eval $(call BuildPackage,iputils-traceroute6)) diff --git a/package/network/utils/iputils/patches/001-iputils.patch b/package/network/utils/iputils/patches/001-iputils.patch deleted file mode 100644 index e57db1379e..0000000000 --- a/package/network/utils/iputils/patches/001-iputils.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 2002-09-20 18:23:55.000000000 +0000 -+++ b/Makefile 2007-05-17 13:59:55.000000000 +0000 -@@ -16,8 +16,8 @@ - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g - CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) - --IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd --IPV6_TARGETS=tracepath6 traceroute6 ping6 -+IPV4_TARGETS=tracepath ping clockdiff arping tftpd -+IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - - LASTTAG:=`git describe HEAD | sed -e 's/-.*//'` diff --git a/package/network/utils/iputils/patches/002-fix-ipv6.patch b/package/network/utils/iputils/patches/002-fix-ipv6.patch deleted file mode 100644 index 4411ca7ef3..0000000000 --- a/package/network/utils/iputils/patches/002-fix-ipv6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -18,7 +18,10 @@ CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) - - IPV4_TARGETS=tracepath ping clockdiff arping tftpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 --TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) -+TARGETS=$(IPV4_TARGETS) -+ifeq ($(CONFIG_IPV6),y) -+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) -+endif - - LASTTAG:=`git describe HEAD | sed -e 's/-.*//'` - TAG:=`date +s%Y%m%d` diff --git a/package/network/utils/iputils/patches/003-fix-makefile.patch b/package/network/utils/iputils/patches/003-fix-makefile.patch deleted file mode 100644 index 926c685519..0000000000 --- a/package/network/utils/iputils/patches/003-fix-makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -30,9 +30,13 @@ all: $(TARGETS) - - - tftpd: tftpd.o tftpsubs.o --arping: arping.o -lsysfs -+arping: arping.o -+ $(CC) $(CFLAGS) -o $@ arping.o -lsysfs - ping: ping.o ping_common.o --ping6: ping6.o ping_common.o -lresolv -lcrypto -+ping6: ping6.o ping_common.o -+ifneq ($(CONFIG_USE_UCLIBC),y) -+ $(CC) $(CFLAGS) -o $@ ping6.o ping_common.o -lresolv -lcrypto -+endif - ping.o ping6.o ping_common.o: ping_common.h - tftpd.o tftpsubs.o: tftp.h - diff --git a/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch b/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch deleted file mode 100644 index 695580347b..0000000000 --- a/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff --git a/ping6.c b/ping6.c -index c5ff881..ef2243f 100644 ---- a/ping6.c -+++ b/ping6.c -@@ -71,9 +71,11 @@ char copyright[] = - #include - #include - #include -+#ifndef __UCLIBC__ - #include - - #include "ping6_niquery.h" -+#endif /* __UCLIBC__ */ - - #ifndef SOL_IPV6 - #define SOL_IPV6 IPPROTO_IPV6 -@@ -154,6 +156,7 @@ int pmtudisc=-1; - - static int icmp_sock; - -+#ifndef __UCLIBC__ - #include - - /* Node Information query */ -@@ -165,6 +168,7 @@ int ni_subject_type = 0; - char *ni_group; - - __u8 ni_nonce[8]; -+#endif /* __UCLIBC__ */ - - static struct in6_addr in6_anyaddr; - static __inline__ int ipv6_addr_any(struct in6_addr *addr) -@@ -223,6 +227,7 @@ unsigned int if_name2index(const char *ifname) - return i; - } - -+#ifndef __UCLIBC__ - struct niquery_option { - char *name; - int namelen; -@@ -512,6 +517,7 @@ char *ni_groupaddr(const char *name) - strcat(nigroup_buf, q); - return nigroup_buf; - } -+#endif /* __UCLIBC__ */ - - int main(int argc, char *argv[]) - { -@@ -595,12 +601,14 @@ int main(int argc, char *argv[]) - case 'V': - printf("ping6 utility, iputils-ss%s\n", SNAPSHOT); - exit(0); -+#ifndef __UCLIBC__ - case 'N': - if (niquery_option_handler(optarg) < 0) { - usage(); - break; - } - break; -+#endif /* __UCLIBC__ */ - COMMON_OPTIONS - common_options(ch); - break; -@@ -663,6 +671,7 @@ int main(int argc, char *argv[]) - argc--; - } - -+#ifndef __UCLIBC__ - if (ni_query >= 0) { - int i; - for (i = 0; i < 8; i++) -@@ -674,15 +683,20 @@ int main(int argc, char *argv[]) - ni_subject_type = NI_SUBJ_IPV6; - } - } -+#endif /* __UCLIBC__ */ - - if (argc > 1) - usage(); - else if (argc == 1) { - target = *argv; - } else { -+#ifndef __UCLIBC__ - if (ni_query < 0 && ni_subject_type != NI_SUBJ_NAME) -+#endif /* __UCLIBC__ */ - usage(); -+#ifndef __UCLIBC__ - target = ni_group; -+#endif /* __UCLIBC__ */ - } - - memset(&hints, 0, sizeof(hints)); -@@ -817,7 +831,11 @@ int main(int argc, char *argv[]) - exit(2); - } - -+#ifndef __UCLIBC__ - if (datalen >= sizeof(struct timeval) && (ni_query < 0)) { -+#else -+ if (datalen >= sizeof(struct timeval)) { -+#endif /* __UCLIBC__ */ - /* can we time transfer */ - timing = 1; - } -@@ -866,9 +884,11 @@ int main(int argc, char *argv[]) - ICMP6_FILTER_SETPASS(ICMP6_PARAM_PROB, &filter); - } - -+#ifndef __UCLIBC__ - if (ni_query >= 0) - ICMP6_FILTER_SETPASS(ICMPV6_NI_REPLY, &filter); - else -+#endif /* __UCLIBC__ */ - ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filter); - - err = setsockopt(icmp_sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filter, -@@ -1100,6 +1120,7 @@ int build_echo(__u8 *_icmph) - return cc; - } - -+#ifndef __UCLIBC__ - int build_niquery(__u8 *_nih) - { - struct ni_hdr *nih; -@@ -1125,6 +1146,7 @@ int build_niquery(__u8 *_nih) - - return cc; - } -+#endif /* __UCLIBC__ */ - - int send_probe(void) - { -@@ -1132,9 +1154,11 @@ int send_probe(void) - - CLR((ntransmitted+1) % mx_dup_ck); - -+#ifndef __UCLIBC__ - if (ni_query >= 0) - len = build_niquery(outpack); - else -+#endif /* __UCLIBC__ */ - len = build_echo(outpack); - - if (cmsglen == 0) { -@@ -1176,6 +1200,7 @@ static void putchar_safe(char c) - printf("\\%03o", c); - } - -+#ifndef __UCLIBC__ - void pr_niquery_reply_name(struct ni_hdr *nih, int len) - { - __u8 *h = (__u8 *)(nih + 1); -@@ -1304,6 +1329,7 @@ void pr_niquery_reply(__u8 *_nih, int len) - } - putchar(';'); - } -+#endif /* __UCLIBC__ */ - - /* - * parse_reply -- -@@ -1353,6 +1379,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) - hops, 0, tv, pr_addr(&from->sin6_addr), - pr_echo_reply)) - return 0; -+#ifndef __UCLIBC__ - } else if (icmph->icmp6_type == ICMPV6_NI_REPLY) { - struct ni_hdr *nih = (struct ni_hdr *)icmph; - __u16 seq = ntohs(*(__u16 *)nih->ni_nonce); -@@ -1363,6 +1390,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) - hops, 0, tv, pr_addr(&from->sin6_addr), - pr_niquery_reply)) - return 0; -+#endif /* __UCLIBC__ */ - } else { - int nexthdr; - struct ip6_hdr *iph1 = (struct ip6_hdr*)(icmph+1); -@@ -1557,7 +1585,9 @@ void usage(void) - "Usage: ping6 [-LUdfnqrvVaAD] [-c count] [-i interval] [-w deadline]\n" - " [-p pattern] [-s packetsize] [-t ttl] [-I interface]\n" - " [-M pmtudisc-hint] [-S sndbuf] [-F flowlabel] [-Q tclass]\n" -+#ifndef __UCLIBC__ - " [[-N nodeinfo-option] ...]\n" -+#endif /* __UCLIBC__ */ - " [hop1 ...] destination\n"); - exit(2); - } -diff --git a/ping6_niquery.h b/ping6_niquery.h -index 61a5cfa..34c31f8 100644 ---- a/ping6_niquery.h -+++ b/ping6_niquery.h -@@ -1,3 +1,4 @@ -+#ifndef __UCLIBC__ - #include - - /* Node Information Query */ -@@ -45,3 +46,4 @@ struct ni_hdr { - #define NI_IPV4ADDR_F_TRUNCATE NI_IPV6ADDR_F_TRUNCATE - #define NI_IPV4ADDR_F_ALL NI_IPV6ADDR_F_ALL - -+#endif /* __UCLIBC__ */ diff --git a/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch b/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch deleted file mode 100644 index dc61b8c22f..0000000000 --- a/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ping6.c -+++ b/ping6.c -@@ -66,6 +66,8 @@ char copyright[] = - * More statistics could always be gathered. - * This program has to run SUID to ROOT to access the ICMP socket. - */ -+ -+#define _GNU_SOURCE - #include "ping_common.h" - - #include diff --git a/package/network/utils/iputils/patches/020-include_fixes.patch b/package/network/utils/iputils/patches/020-include_fixes.patch deleted file mode 100644 index e982dabc37..0000000000 --- a/package/network/utils/iputils/patches/020-include_fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/ping_common.h -+++ b/ping_common.h -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -11,7 +12,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -24,6 +25,10 @@ - - #include "SNAPSHOT.h" - -+#ifndef HZ -+#define HZ 100 -+#endif -+ - #define DEFDATALEN (64 - 8) /* default data length */ - - #define MAXWAIT 10 /* max seconds to wait for response */ ---- a/clockdiff.c -+++ b/clockdiff.c -@@ -13,8 +13,6 @@ - #include - #include - #include --#define TSPTYPES --#include - #include - #include - #include ---- a/tracepath.c -+++ b/tracepath.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/ping.c -+++ b/ping.c -@@ -661,8 +661,15 @@ int send_probe() - - do { - static struct iovec iov = {outpack, 0}; -- static struct msghdr m = { &whereto, sizeof(whereto), -- &iov, 1, &cmsg, 0, 0 }; -+ static struct msghdr m = { -+ .msg_name = &whereto, -+ .msg_namelen = sizeof(whereto), -+ .msg_iov = &iov, -+ .msg_iovlen = 1, -+ .msg_control = &cmsg, -+ .msg_controllen = 0, -+ .msg_flags = 0 -+ }; - m.msg_controllen = cmsg_len; - iov.iov_len = cc; - From 174ff7d754b272cbf6169bfbb245dbd12b392830 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 10 Dec 2019 17:24:20 +0300 Subject: [PATCH 048/480] base-files: send informational UDP message each second waiting The preinit network initialisation and failsafe informational message are inherently racy as the interface takes some time to become functional after "ip link set $pi_ifname up" command. Consider this timing: [ 12.002713] IPv6: ADDRCONF(NETDEV_UP): eth1: link is not ready [ 12.008819] IPv6: ADDRCONF(NETDEV_UP): eth1.1: link is not ready [ 12.118877] random: procd: uninitialized urandom read (4 bytes read) [ 13.068614] eth1: link up (1000Mbps/Full duplex) [ 13.073309] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready [ 13.080445] IPv6: ADDRCONF(NETDEV_CHANGE): eth1.1: link becomes ready Since the UDP message was sent prior to link becoming ready, it was never seen on the wire. The default failsafe timeout is set to 2 seconds, so with this patch there are two attempts to send the message, one spent in vain, and the other visible in tcpdump on an attached host. Of course, in cases when the interface is brought up faster it leads to two messages, however it should be harmless. This patch (almost) doesn't affect normal boot time while still allowing to enter failsafe reliably with a single button press, matching the official "generic failsafe" documentation. Signed-off-by: Paul Fertser --- package/base-files/files/lib/preinit/30_failsafe_wait | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait index dd9c7e2b59..85dca398fa 100644 --- a/package/base-files/files/lib/preinit/30_failsafe_wait +++ b/package/base-files/files/lib/preinit/30_failsafe_wait @@ -31,6 +31,8 @@ fs_wait_for_key () { lock $keypress_wait { while [ $timer -gt 0 ]; do + pi_failsafe_net_message=true \ + preinit_net_echo "Please press button now to enter failsafe" echo "$timer" >$keypress_sec timer=$(($timer - 1)) sleep 1 @@ -88,9 +90,6 @@ failsafe_wait() { } grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE if [ "$FAILSAFE" != "true" ]; then - pi_failsafe_net_message=true - preinit_net_echo "Please press button now to enter failsafe" - pi_failsafe_net_message=false fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && echo "- failsafe button "`cat /tmp/failsafe_button`" was pressed -" [ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe From ad6c6361f9f85f7cf6f53558d109c82de73743a5 Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Tue, 12 Nov 2019 14:02:14 +0100 Subject: [PATCH 049/480] ath79: enable all space on Netgear ar9344-based WNDR routers Netgear WNDR routers (AR9344 models) like WNDR4300 have 128 MiB of flash memory but only first 32 MiB are used now - both by vendor's firmware and OpenWrt. This patch concatenates two regions of flash memory: ubi part of firmware partition and reserved (unused) space beyond 'caldata_backup' while preserving ART backup. No data is wiped or moved away. This increases area for OS ubi volumes from 23 to 119 Megabytes. Signed-off-by: Michal Cieslakiewicz --- .../linux/ath79/dts/ar9344_netgear_wndr.dtsi | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi index 18b9ae1778..38dd052f5f 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi @@ -96,6 +96,22 @@ linux,default-trigger = "usbport"; }; }; + + ubi-concat { + compatible = "mtd-concat"; + devices = <&ubipart0 &ubipart1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + ubi@8c0000 { + label = "ubi"; + reg = <0x0 0x7700000>; + }; + }; + }; }; &pinmux { @@ -154,8 +170,8 @@ reg = <0x6c0000 0x200000>; }; - ubi@8c0000 { - label = "ubi"; + ubipart0: partition@8c0000 { + label = "ubipart0"; reg = <0x8c0000 0x1700000>; }; @@ -171,10 +187,9 @@ read-only; }; - partition@2000000 { - label = "reserved"; + ubipart1: partition@2000000 { + label = "ubipart1"; reg = <0x2000000 0x6000000>; - read-only; }; }; }; From b14e529dd7f10646e3f9a6b36cd3d93fd6c36dc8 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 10 Dec 2019 13:52:02 +0300 Subject: [PATCH 050/480] ath79: add D-Link DIR-615 E4 Specifications: - FCC ID: KA2IR615E3 - SoC: MIPS32 24K 400 MHz Atheros AR7240 - RAM: 32 MiB DDR SDRAM ESMT M13S2561616A-5T - Flash: 4 MiB NOR SPI Macronix MX25L3208E - Wireless: AR9287 2.4 GHz 802.11n 2T2R, 2x RP-SMA connectors - Ethernet: 5x 100BASE-TX Fast Ethernet - LEDs: 9x GPIO, 1x ath9k - Buttons: 2x tactile switches - UART: 3.3 V, 115200 8n1 - USB: simple hardware modification required, 1x USB 1.1 Full Speed Partitioning notes: Vendor firmware (based on CameoAP99) defines two additional partitions: "mac" @0x3b0000, size 0x10000 and "lp" @0x3c0000, size 0x30000. The "mac" partition stores LAN MAC address and hardware board name. However, the vendor firmware uses addresses from "nvram" partition, and the board name is used only for informational purposes in the Web interface (included in the pages' header), not affecting the firmware image check. The "lp" partition is supposed to contain a "language pack" (which can be used to add an additional language support to the Web interface) and is flashed separately, using the vendor firmware upgrade page. Since these partitions are absolutely useless for OpenWrt and overwriting them doesn't prevent downgrading to obsolete vendor firmware, this patch appends the valueable space to "firmware". Installation instructions: - Upgrade from OpenWrt ar71xx with "sysupgrade -f -n" or - Upload as a firmware update via the vendor Web-interface or - Connect UART and use "loady" to upload and run OpenWrt initramfs image, then sysupgrade from it (TFTP client doesn't work) or - Before powering up hold "reset" button and keep it pressed for about 15 seconds after, then access fail safe Web server on 192.168.0.1 (the old uIP TCP/IP protocol stack is not compatible with modern Linux, the kernel, so you'll need to use some other OS to do this). Can be performed without a Web-browser too: curl http://192.168.0.1/cgi/index \ -F Send=@openwrt-ath79-tiny-dlink_dir-615-e4-squashfs-factory.bin Signed-off-by: Paul Fertser --- .../ath79/dts/ar7240_dlink_dir-615-e4.dts | 170 ++++++++++++++++++ target/linux/ath79/image/tiny.mk | 16 ++ .../ath79/tiny/base-files/etc/board.d/01_leds | 7 + .../tiny/base-files/etc/board.d/02_network | 6 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 + 5 files changed, 203 insertions(+) create mode 100644 target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts new file mode 100644 index 0000000000..537a99b8db --- /dev/null +++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar7240.dtsi" + +/ { + model = "D-Link DIR-615 E4"; + compatible = "dlink,dir-615-e4", "qca,ar7240"; + + aliases { + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + linux,code = ; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&switch_led_pins>; + + led_power_green: power_green { + label = "d-link:green:power"; + gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; + }; + + led_power_amber: power_amber { + label = "d-link:amber:power"; + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "d-link:blue:wps"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + }; + + lan1 { + label = "d-link:green:lan1"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + lan2 { + label = "d-link:green:lan2"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + lan3 { + label = "d-link:green:lan3"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + lan4 { + label = "d-link:green:lan4"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + wan_amber { + label = "d-link:amber:wan"; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; + }; + + wan_green { + label = "d-link:green:wan"; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + }; + + ath9k-leds { + compatible = "gpio-leds"; + + wlan { + label = "d-link:green:wlan"; + gpios = <&ath9k 1 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + }; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <33000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x0 0x30000>; + label = "u-boot"; + read-only; + }; + + partition@30000 { + reg = <0x30000 0x10000>; + label = "nvram"; + read-only; + }; + + partition@40000 { + compatible = "denx,uimage"; + reg = <0x40000 0x3b0000>; + label = "firmware"; + }; + + partition@3f0000 { + reg = <0x3f0000 0x10000>; + label = "art"; + read-only; + }; + }; + }; +}; + +ð0 { + status = "okay"; +}; + +ð1 { + status = "okay"; +}; + +&pcie { + status = "okay"; + + ath9k: wifi@0,0 { + compatible = "pci168c,002b"; + reg = <0x0000 0 0 0 0>; + qca,no-eeprom; + #gpio-cells = <2>; + gpio-controller; + }; +}; + +&pinmux { + switch_led_pins: pinmux_switch_led_pins { + pinctrl-single,bits = <0x0 0x0 0xf8>; + }; +}; + +&uart { + status = "okay"; +}; diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 8f867575af..5f6adeac86 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -13,6 +13,22 @@ define Device/buffalo_whr-g301n endef TARGET_DEVICES += buffalo_whr-g301n +define Device/dlink_dir-615-e4 + ATH_SOC := ar7240 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-615 + DEVICE_VARIANT := E4 + IMAGE_SIZE := 3776k + FACTORY_IMAGE_SIZE := 3456k + IMAGES += factory.bin + IMAGE/default := append-kernel | append-rootfs | pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | check-size $$$$(FACTORY_IMAGE_SIZE) | \ + pad-to $$$$(FACTORY_IMAGE_SIZE) | append-string "AP99-AR7240-RT-091105-05" + SUPPORTED_DEVICES += dir-615-e4 +endef +TARGET_DEVICES += dlink_dir-615-e4 + define Device/pqi_air-pen ATH_SOC := ar9330 DEVICE_VENDOR := PQI diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds index 03f135f0b0..199ad94bec 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds @@ -15,6 +15,13 @@ buffalo,whr-g301n) ucidef_set_led_switch "lan3" "LAN3" "$boardname:green:lan3" "switch0" "0x08" ucidef_set_led_switch "lan4" "LAN4" "$boardname:green:lan4" "switch0" "0x10" ;; +dlink,dir-615-e4) + ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth0" + ucidef_set_led_switch "lan1" "LAN1" "d-link:green:lan1" "switch0" "0x02" + ucidef_set_led_switch "lan2" "LAN2" "d-link:green:lan2" "switch0" "0x04" + ucidef_set_led_switch "lan3" "LAN3" "d-link:green:lan3" "switch0" "0x08" + ucidef_set_led_switch "lan4" "LAN4" "d-link:green:lan4" "switch0" "0x10" + ;; netgear,wnr1000-v2|\ netgear,wnr2000-v3) ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network index b2616456e4..b325c7cf8b 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network +++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network @@ -13,6 +13,7 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" ;; + dlink,dir-615-e4|\ netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ netgear,wnr612-v2|\ @@ -75,6 +76,11 @@ ath79_setup_macs() local board="$1" case "$board" in + dlink,dir-615-e4) + lan_mac=$(mtd_get_mac_ascii "nvram" "lan_mac") + wan_mac=$(mtd_get_mac_ascii "nvram" "wan_mac") + label_mac=$wan_mac + ;; tplink,tl-wr941-v2|\ tplink,tl-wr941n-v7-cn) base_mac=$(mtd_get_mac_binary u-boot 0x1fc00) diff --git a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 3da95cc161..5952a40195 100644 --- a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -14,6 +14,10 @@ case "$FIRMWARE" in tplink,tl-wr941-v4) caldata_extract "art" 0x1000 0xeb8 ;; + dlink,dir-615-e4) + caldata_extract "art" 0x1000 0x1000 + ath9k_patch_mac_crc $(mtd_get_mac_ascii "nvram" "lan_mac") 0x10c + ;; netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ netgear,wnr612-v2|\ From 05d35403b211ccb9bf20e2b3c0b7a30c82c6d6a2 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 26 Nov 2019 16:01:11 +0300 Subject: [PATCH 051/480] ath79-tiny: enable 4k sectors This enables using 4kiB sectors as erase blocks for 4MiB NOR flash ICs that support it. Writeable jffs2 overlay used to store settings requires a partition with at least 5 erase blocks, so using small sectors is essential for devices with 4MiB flash. Sysupgrading a device running firmware without this feature will likely not allow to preserve configs automatically but since ath79 is considered to be in a "technology preview" state it shouldn't be a problem. Signed-off-by: Paul Fertser --- target/linux/ath79/tiny/config-default | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ath79/tiny/config-default b/target/linux/ath79/tiny/config-default index 90cd5534c7..9b845abbff 100644 --- a/target/linux/ath79/tiny/config-default +++ b/target/linux/ath79/tiny/config-default @@ -1,4 +1,5 @@ CONFIG_LEDS_RESET=y +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y CONFIG_NET_DSA=y CONFIG_NET_DSA_MV88E6060=y CONFIG_NET_DSA_TAG_TRAILER=y From 34466afb28bc1779a8c7e8bec93785ff16de6ad2 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 13 Dec 2019 14:38:14 +0000 Subject: [PATCH 052/480] uboot-envtools: ath79: fix missing etactica eg200 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Was inadvertantly missed from the inital forward port from ar71xx to ath79. Fixes: 1588114cf2a3 ("ath79: add etactica-eg200 support") Signed-off-by: Karl Palsson [commit description/subject facelift] Signed-off-by: Petr Štetiar --- package/boot/uboot-envtools/files/ath79 | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index 1499aa19a2..f956cf4ed4 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -16,6 +16,7 @@ case "$board" in alfa-network,ap121f|\ buffalo,bhr-4grv2|\ engenius,ecb1750|\ +etactica,eg200|\ glinet,gl-ar300m-lite|\ glinet,gl-ar300m-nand|\ glinet,gl-ar300m-nor|\ From b70052c6e63f4fb3189ab2f9669c1fbd19478d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 11 Dec 2019 21:23:24 +0100 Subject: [PATCH 053/480] uci: update to latest Git HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 165b44413145 uci: Fix extra semicolons warnings 66264ed9ec9e cmake: add more hardening compiler flags cca6f105fae2 libuci: refactor uci_get_errorstr 750b046eb77f tests: cram: Lua: add test case for uci_get_errorstr 654d7c33da28 lua: add missing forward declaration 03dfbbe6fef7 cli: fix format string clang-10 warning Signed-off-by: Petr Štetiar --- package/system/uci/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index dd08c43d29..47566b8dc3 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -11,11 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uci PKG_RELEASE:=3 -PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git +#PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git +PKG_SOURCE_URL=https://gitlab.com/ynezz/openwrt-uci.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE=2019-11-14 -PKG_SOURCE_VERSION:=8dd50da20de0ece65118b2b4b71f8df8ac3a1f6d -PKG_MIRROR_HASH:=6c74d7dc777a64fd833c207fb7c7107f55d7b42ba7184ebaef5fc34f686c4a25 +PKG_SOURCE_DATE=2019-12-12 +PKG_SOURCE_VERSION:=165b444131453d63fc78c1d86f23c3ca36a2ffd7 +PKG_MIRROR_HASH:=d4baa6454523ee11ecbfc49188e949a76c07deebf4d048049847b3d1d5e5e40c PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:= From e417ff88f19b90fc7badbb67b2e8c1760dd024dc Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 19 Dec 2019 19:40:33 +0100 Subject: [PATCH 054/480] ramips: harmonize line breaks in image Makefiles This harmonizes the line wrapping in image Makefile device definitions, as those are frequently copy-pasted and are a common subject of review comments. Having the treatment unifying should reduce the cases where adjustment is necessary afterwards. Harmonization is achieved by consistently (read "strictly") applying certain rules: - Never put more than 80 characters into one line - Fill lines up (do not break after 40 chars because of ...) - Use one tab for indent after wrapping by "\" - Only break after pipe "|" for IMAGE variables Signed-off-by: Adrian Schmutzler --- target/linux/ramips/image/mt7620.mk | 111 +++++++++-------- target/linux/ramips/image/mt7621.mk | 178 ++++++++++++++-------------- target/linux/ramips/image/mt76x8.mk | 34 +++--- target/linux/ramips/image/rt288x.mk | 8 +- target/linux/ramips/image/rt305x.mk | 131 ++++++++++---------- 5 files changed, 235 insertions(+), 227 deletions(-) diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index e8169c2294..5cd964691a 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -40,7 +40,8 @@ define Device/alfa-network_r36m-e4g IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := R36M-E4G - DEVICE_PACKAGES := kmod-i2c-ralink kmod-usb2 kmod-usb-ohci uboot-envtools uqmi + DEVICE_PACKAGES := kmod-i2c-ralink kmod-usb2 kmod-usb-ohci uboot-envtools \ + uqmi endef TARGET_DEVICES += alfa-network_r36m-e4g @@ -49,8 +50,8 @@ define Device/alfa-network_tube-e4g IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := Tube-E4G - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi \ - -iwinfo -kmod-rt2800-soc -wpad-basic + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi -iwinfo \ + -kmod-rt2800-soc -wpad-basic endef TARGET_DEVICES += alfa-network_tube-e4g @@ -89,7 +90,8 @@ define Device/asus_rt-ac51u IMAGE_SIZE := 16064k DEVICE_VENDOR := Asus DEVICE_MODEL := RT-AC51U - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += rt-ac51u endef TARGET_DEVICES += asus_rt-ac51u @@ -118,7 +120,8 @@ define Device/bdcom_wap2100-sk IMAGE_SIZE := 15808k DEVICE_VENDOR := BDCOM DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130) - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e \ + kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport endef TARGET_DEVICES += bdcom_wap2100-sk @@ -306,7 +309,8 @@ define Device/edimax_br-6478ac-v2 IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \ append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += edimax_br-6478ac-v2 @@ -317,8 +321,8 @@ define Device/edimax_ew-7476rpc BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ - edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek endef TARGET_DEVICES += edimax_ew-7476rpc @@ -330,8 +334,8 @@ define Device/edimax_ew-7478ac BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ - edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek endef TARGET_DEVICES += edimax_ew-7478ac @@ -343,9 +347,10 @@ define Device/edimax_ew-7478apc BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ - edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += edimax_ew-7478apc @@ -368,10 +373,11 @@ define Device/engenius_esr600 IMAGE_SIZE := 15616k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x101 -p 0x57 -t 2 + senao-header -r 0x101 -p 0x57 -t 2 DEVICE_VENDOR := EnGenius DEVICE_MODEL := ESR600 - DEVICE_PACKAGES += kmod-rt2800-pci kmod-usb-storage kmod-usb-ohci kmod-usb-ehci + DEVICE_PACKAGES += kmod-rt2800-pci kmod-usb-storage kmod-usb-ohci \ + kmod-usb-ehci endef TARGET_DEVICES += engenius_esr600 @@ -382,9 +388,8 @@ define Device/fon_fon2601 DEVICE_MODEL := FON2601 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci KERNEL_INITRAMFS := $$(KERNEL) | fonfxcimage - IMAGE/sysupgrade.bin := append-kernel | append-rootfs |\ - fonfxcimage |\ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | fonfxcimage | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += fon_fon2601 @@ -424,7 +429,7 @@ define Device/head-weblink_hdrm200 DEVICE_VENDOR := Head Weblink DEVICE_MODEL := HDRM2000 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ - uqmi kmod-usb-serial kmod-usb-serial-option + uqmi kmod-usb-serial kmod-usb-serial-option endef TARGET_DEVICES += head-weblink_hdrm200 @@ -443,7 +448,8 @@ define Device/hiwifi_hc5761 IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5761 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += hc5761 endef TARGET_DEVICES += hiwifi_hc5761 @@ -453,7 +459,8 @@ define Device/hiwifi_hc5861 IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5861 - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += hc5861 endef TARGET_DEVICES += hiwifi_hc5861 @@ -474,9 +481,8 @@ define Device/iodata_wn-ac1167gr DEVICE_MODEL := WN-AC1167GR IMAGE_SIZE := 6864k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 01040016 8844A2D168B45A2D + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 01040016 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt76x2 endef TARGET_DEVICES += iodata_wn-ac1167gr @@ -487,9 +493,8 @@ define Device/iodata_wn-ac733gr3 DEVICE_MODEL := WN-AC733GR3 IMAGE_SIZE := 6992k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 01040006 8844A2D168B45A2D + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 01040006 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt76x0e kmod-switch-rtl8367b endef TARGET_DEVICES += iodata_wn-ac733gr3 @@ -500,7 +505,8 @@ define Device/iptime_a104ns UIMAGE_NAME := a104ns DEVICE_VENDOR := ipTIME DEVICE_MODEL := A104ns - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += iptime_a104ns @@ -511,7 +517,7 @@ define Device/kimax_u25awf-h1 DEVICE_MODEL := U25AWF DEVICE_VARIANT := H1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-storage kmod-scsi-core \ - kmod-fs-ext4 kmod-fs-vfat block-mount + kmod-fs-ext4 kmod-fs-vfat block-mount SUPPORTED_DEVICES += u25awf-h1 endef TARGET_DEVICES += kimax_u25awf-h1 @@ -522,7 +528,7 @@ define Device/kimax_u35wf DEVICE_VENDOR := Kimax DEVICE_MODEL := U35WF DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-storage kmod-scsi-core \ - kmod-fs-ext4 kmod-fs-vfat block-mount + kmod-fs-ext4 kmod-fs-vfat block-mount endef TARGET_DEVICES += kimax_u35wf @@ -608,7 +614,8 @@ define Device/netgear_ex2700 BLOCKSIZE := 4k IMAGE_SIZE := 3776k IMAGES += factory.bin - KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem + KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ + append-uImage-fakehdr filesystem IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ netgear-dni DEVICE_VENDOR := NETGEAR @@ -623,7 +630,8 @@ define Device/netgear_ex3700 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX3700/EX3800 @@ -637,7 +645,8 @@ define Device/netgear_ex6130 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6130 @@ -651,7 +660,8 @@ define Device/netgear_wn3000rp-v3 NETGEAR_BOARD_ID := WN3000RPv3 BLOCKSIZE := 4k IMAGES += factory.bin - KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem + KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ + append-uImage-fakehdr filesystem IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ netgear-dni DEVICE_VENDOR := NETGEAR @@ -745,9 +755,8 @@ define Device/planex_cs-qr10 IMAGE_SIZE := 7872k DEVICE_VENDOR := Planex DEVICE_MODEL := CS-QR10 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \ - kmod-sound-core kmod-sound-mt7620 \ - kmod-i2c-ralink kmod-sdhci-mt7620 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sound-core \ + kmod-sound-mt7620 kmod-i2c-ralink kmod-sdhci-mt7620 SUPPORTED_DEVICES += cs-qr10 endef TARGET_DEVICES += planex_cs-qr10 @@ -880,7 +889,8 @@ define Device/tplink_archer-c20-v1 IMAGES += factory.bin DEVICE_MODEL := Archer C20 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += tplink_archer-c20-v1 @@ -894,7 +904,8 @@ define Device/tplink_archer-c2-v1 IMAGES += factory.bin DEVICE_MODEL := Archer C2 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b endef TARGET_DEVICES += tplink_archer-c2-v1 @@ -920,7 +931,8 @@ define Device/tplink_archer-mr200 TPLINK_FLASHLAYOUT := 8MLmtk TPLINK_HWID := 0xd7500001 TPLINK_HWREV := 0x4a - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis \ + kmod-usb-serial kmod-usb-serial-option adb-enablemodem DEVICE_MODEL := Archer MR200 SUPPORTED_DEVICES += mr200 endef @@ -960,7 +972,8 @@ define Device/youku_yk1 IMAGE_SIZE := 32448k DEVICE_VENDOR := YOUKU DEVICE_MODEL := YK1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += youku-yk1 endef TARGET_DEVICES += youku_yk1 @@ -1064,7 +1077,7 @@ define Device/zbtlink_zbt-we826-e DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE826-E DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 uqmi \ - kmod-usb-serial kmod-usb-serial-option + kmod-usb-serial kmod-usb-serial-option endef TARGET_DEVICES += zbtlink_zbt-we826-e @@ -1095,8 +1108,8 @@ define Device/zyxel_keenetic-omni DEVICE_MODEL := Keenetic Omni DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ - zyimage -d 4882 -v "ZyXEL Keenetic Omni" + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | \ + check-size $$$$(IMAGE_SIZE) | zyimage -d 4882 -v "ZyXEL Keenetic Omni" SUPPORTED_DEVICES += kn_rc endef TARGET_DEVICES += zyxel_keenetic-omni @@ -1108,7 +1121,8 @@ define Device/zyxel_keenetic-omni-ii DEVICE_MODEL := Keenetic Omni II DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | \ + check-size $$$$(IMAGE_SIZE) | \ zyimage -d 2102034 -v "ZyXEL Keenetic Omni II" SUPPORTED_DEVICES += kn_rf endef @@ -1119,10 +1133,11 @@ define Device/zyxel_keenetic-viva IMAGE_SIZE := 16064k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Viva - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ + kmod-switch-rtl8366-smi kmod-switch-rtl8367b IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ - zyimage -d 8997 -v "ZyXEL Keenetic Viva" + IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ + check-size $$$$(IMAGE_SIZE) | zyimage -d 8997 -v "ZyXEL Keenetic Viva" SUPPORTED_DEVICES += kng_rc endef TARGET_DEVICES += zyxel_keenetic-viva diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index e9190844ac..0b178a8d6e 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -89,9 +89,8 @@ define Device/afoundry_ew1200 IMAGE_SIZE := 16064k DEVICE_VENDOR := AFOUNDRY DEVICE_MODEL := EW1200 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 \ + kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += ew1200 endef TARGET_DEVICES += afoundry_ew1200 @@ -111,8 +110,7 @@ define Device/asiarf_ap7621-001 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-001 - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 endef TARGET_DEVICES += asiarf_ap7621-001 @@ -121,8 +119,7 @@ define Device/asiarf_ap7621-nv1 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-NV1 - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 endef TARGET_DEVICES += asiarf_ap7621-nv1 @@ -131,7 +128,8 @@ define Device/asus_rt-ac57u DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U IMAGE_SIZE := 16064k - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += asus_rt-ac57u @@ -146,7 +144,8 @@ define Device/asus_rt-ac65p KERNEL_SIZE := 4096k IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac65p @@ -162,7 +161,8 @@ define Device/asus_rt-ac85p KERNEL_SIZE := 4096k IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac85p @@ -208,8 +208,8 @@ define Device/d-team_newifi-d2 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D2 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += d-team_newifi-d2 @@ -218,9 +218,8 @@ define Device/d-team_pbr-m1 IMAGE_SIZE := 16064k DEVICE_VENDOR := PandoraBox DEVICE_MODEL := PBR-M1 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 \ + kmod-sdhci-mt7620 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += pbr-m1 endef TARGET_DEVICES += d-team_pbr-m1 @@ -231,11 +230,9 @@ define Device/edimax_rg21s DEVICE_VENDOR := Edimax DEVICE_MODEL := Gemini AC2600 RG21S IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 02020038 8844A2D168B45A2D - DEVICE_PACKAGES := \ - kmod-mt7615e wpad-basic + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 02020038 8844A2D168B45A2D + DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef TARGET_DEVICES += edimax_rg21s @@ -245,8 +242,8 @@ define Device/elecom_wrc-1167ghbk2-s DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1167GHBK2-S IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\ - elecom-wrc-factory WRC-1167GHBK2-S 0.00 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elecom-wrc-factory WRC-1167GHBK2-S 0.00 DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s @@ -257,8 +254,8 @@ define Device/elecom_wrc-1900gst DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1900GST IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\ - elecom-gst-factory WRC-1900GST 0.00 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elecom-gst-factory WRC-1900GST 0.00 endef TARGET_DEVICES += elecom_wrc-1900gst @@ -268,8 +265,8 @@ define Device/elecom_wrc-2533gst DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-2533GST IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\ - elecom-gst-factory WRC-2533GST 0.00 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elecom-gst-factory WRC-2533GST 0.00 endef TARGET_DEVICES += elecom_wrc-2533gst @@ -288,8 +285,8 @@ define Device/gehua_ghl-r-001 IMAGE_SIZE := 32448k DEVICE_VENDOR := GeHua DEVICE_MODEL := GHL-R-001 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += gehua_ghl-r-001 @@ -320,7 +317,8 @@ define Device/hiwifi_hc5962 IMAGE_SIZE := 32768k IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5962 DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic @@ -332,7 +330,7 @@ define Device/iodata_wn-ax1167gr MTK_SOC := mt7621 IMAGE_SIZE := 15552k KERNEL_INITRAMFS := $$(KERNEL) | \ - iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin + iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AX1167GR DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic @@ -354,9 +352,8 @@ define Device/iodata_wnpr2600g DEVICE_MODEL := WNPR2600G IMAGE_SIZE := 13952k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 0104003a 8844A2D168B45A2D + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 0104003a 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef TARGET_DEVICES += iodata_wnpr2600g @@ -375,8 +372,8 @@ define Device/jcg_jhr-ac876m MTK_SOC := mt7621 IMAGE_SIZE := 16064k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 89.1 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 89.1 JCG_MAXSIZE := 16064k DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-AC876M @@ -389,8 +386,8 @@ define Device/lenovo_newifi-d1 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D1 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += newifi-d1 endef TARGET_DEVICES += lenovo_newifi-d1 @@ -433,8 +430,9 @@ define Device/MikroTik LOADER_TYPE := elf PLATFORM := mt7621 KERNEL := $(KERNEL_DTB) | loader-kernel - IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \ + pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef define Device/mikrotik_rb750gr3 @@ -462,9 +460,8 @@ define Device/mqmaker_witi IMAGE_SIZE := 16064k DEVICE_VENDOR := MQmaker DEVICE_MODEL := WiTi - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt76x2 \ + kmod-sdhci-mt7620 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += witi mqmaker,witi-256m mqmaker,witi-512m endef TARGET_DEVICES += mqmaker_witi @@ -475,8 +472,8 @@ define Device/mtc_wr1201 DEVICE_VENDOR := MTC DEVICE_MODEL := Wireless Router WR1201 KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += mtc_wr1201 @@ -488,7 +485,8 @@ define Device/netgear_ex6150 NETGEAR_BOARD_ID := U12H318T00_NETGEAR IMAGE_SIZE := 14848k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + netgear-chk endef TARGET_DEVICES += netgear_ex6150 @@ -499,8 +497,8 @@ define Device/netgear_sercomm_nand KERNEL_SIZE := 4096k UBINIZE_OPTS := -E 5 IMAGES += factory.img kernel.bin rootfs.bin - IMAGE/factory.img := pad-extra 2048k | append-kernel | pad-to 6144k | append-ubi | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ + IMAGE/factory.img := pad-extra 2048k | append-kernel | pad-to 6144k | \ + append-ubi | pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ zip $$$$(SERCOMM_HWNAME).bin | sercom-seal IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/kernel.bin := append-kernel @@ -568,15 +566,18 @@ define Device/netgear_wndr3700-v5 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x1054 IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \ - sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | \ + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ + zip WNDR3700v5.bin | sercom-seal DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WNDR3700 DEVICE_VARIANT := v5 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += wndr3700v5 endef TARGET_DEVICES += netgear_wndr3700-v5 @@ -589,7 +590,8 @@ define Device/netis_wf-2881 IMAGE_SIZE := 129280k KERNEL := $(KERNEL_DTB) | pad-offset $$(BLOCKSIZE) 64 | uImage lzma UBINIZE_OPTS := -E 5 - IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | \ + check-size $$$$(IMAGE_SIZE) DEVICE_VENDOR := NETIS DEVICE_MODEL := WF-2881 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic @@ -624,9 +626,8 @@ define Device/samknows_whitebox-v8 IMAGE_SIZE := 16064k DEVICE_VENDOR := SamKnows DEVICE_MODEL := Whitebox 8 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport \ - uboot-envtools wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport uboot-envtools wpad-basic SUPPORTED_DEVICES += sk-wb8 endef TARGET_DEVICES += samknows_whitebox-v8 @@ -719,7 +720,8 @@ define Device/ubiquiti_edgerouterx IMAGE_SIZE := 256768k FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 - KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar + KERNEL_INITRAMFS := $$(KERNEL) | \ + ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := EdgeRouter X @@ -764,7 +766,8 @@ define Device/wevo_11acnas UIMAGE_NAME := 11AC-NAS-Router(0.0.0) DEVICE_VENDOR := WeVO DEVICE_MODEL := 11AC NAS Router - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += 11acnas endef TARGET_DEVICES += wevo_11acnas @@ -776,8 +779,8 @@ define Device/wevo_w2914ns-v2 DEVICE_VENDOR := WeVO DEVICE_MODEL := W2914NS DEVICE_VARIANT := v2 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += w2914nsv2 endef TARGET_DEVICES += wevo_w2914ns-v2 @@ -797,9 +800,8 @@ define Device/xiaomi_mir3g DEVICE_MODEL := Mi Router 3G SUPPORTED_DEVICES += R3G SUPPORTED_DEVICES += mir3g - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \ - uboot-envtools + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic uboot-envtools endef TARGET_DEVICES += xiaomi_mir3g @@ -827,10 +829,10 @@ define Device/xiaomi_mir3p DEVICE_MODEL := Mi Router 3 Pro IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := \ - kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \ - uboot-envtools + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport \ + wpad-basic uboot-envtools endef TARGET_DEVICES += xiaomi_mir3p @@ -848,9 +850,8 @@ define Device/xzwifi_creativebox-v1 IMAGE_SIZE := 32448k DEVICE_VENDOR := CreativeBox DEVICE_MODEL := v1 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \ - kmod-usb3 + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 \ + kmod-sdhci-mt7620 kmod-usb3 endef TARGET_DEVICES += xzwifi_creativebox-v1 @@ -859,8 +860,8 @@ define Device/youhua_wr1200js IMAGE_SIZE := 16064k DEVICE_VENDOR := YouHua DEVICE_MODEL := WR1200JS - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += youhua_wr1200js @@ -869,8 +870,8 @@ define Device/youku_yk-l2 IMAGE_SIZE := 16064k DEVICE_VENDOR := Youku DEVICE_MODEL := YK-L2 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += youku_yk-l2 @@ -879,8 +880,8 @@ define Device/zbtlink_zbt-we1326 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \ + wpad-basic SUPPORTED_DEVICES += zbt-we1326 endef TARGET_DEVICES += zbtlink_zbt-we1326 @@ -890,9 +891,8 @@ define Device/zbtlink_zbt-we3526 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += zbtlink_zbt-we3526 @@ -901,9 +901,8 @@ define Device/zbtlink_zbt-wg2626 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 \ + kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += zbt-wg2626 endef TARGET_DEVICES += zbtlink_zbt-wg2626 @@ -914,9 +913,8 @@ define Device/zbtlink_zbt-wg3526-16m DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 16M - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += zbt-wg3526 zbt-wg3526-16M endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m @@ -927,9 +925,8 @@ define Device/zbtlink_zbt-wg3526-32m DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 32M - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += ac1200pro zbt-wg3526-32M endef TARGET_DEVICES += zbtlink_zbt-wg3526-32m @@ -939,6 +936,7 @@ define Device/zio_freezio IMAGE_SIZE := 16064k DEVICE_VENDOR := ZIO DEVICE_MODEL := FREEZIO - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += zio_freezio diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 758caf7fa2..6865d397e6 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -19,11 +19,9 @@ define Device/buffalo_wcr-1166ds BUFFALO_TAG_MINOR := 9.99 IMAGES += factory.bin IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata - IMAGE/factory.bin := \ - trx -M 0x746f435c | pad-rootfs | append-metadata | \ + IMAGE/factory.bin := trx -M 0x746f435c | pad-rootfs | append-metadata | \ buffalo-enc WCR-1166DS $$(BUFFALO_TAG_VERSION) -l | \ - buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | \ - buffalo-dhp-image + buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | buffalo-dhp-image DEVICE_VENDOR := Buffalo DEVICE_MODEL := WCR-1166DS DEVICE_PACKAGES := kmod-mt76x2 @@ -35,8 +33,8 @@ define Device/cudy_wr1000 MTK_SOC := mt7628an IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 92.122 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 92.122 JCG_MAXSIZE := 7872k DEVICE_VENDOR := Cudy DEVICE_MODEL := WR1000 @@ -184,10 +182,13 @@ define Device/netgear_r6120 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \ - sercom-footer | pad-to 128 | zip R6120.bin | sercom-seal + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | \ + pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6120.bin | \ + sercom-seal endef TARGET_DEVICES += netgear_r6120 @@ -263,7 +264,8 @@ define Device/tplink IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \ check-size $$$$(IMAGE_SIZE) endef -DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION +DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD +DEVICE_VARS += TPLINK_HVERSION define Device/tplink_archer-c20-v4 $(Device/tplink) @@ -450,7 +452,8 @@ define Device/tplink_tl-wr902ac-v3 TPLINK_HWREV := 0x89 TPLINK_HWREVADD := 0x1 TPLINK_HVERSION := 3 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += tplink_tl-wr902ac-v3 @@ -471,7 +474,7 @@ define Device/vocore_vocore2 DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ - kmod-sdhci-mt7620 + kmod-sdhci-mt7620 SUPPORTED_DEVICES += vocore2 endef TARGET_DEVICES += vocore_vocore2 @@ -482,7 +485,7 @@ define Device/vocore_vocore2-lite DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2-Lite DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ - kmod-sdhci-mt7620 + kmod-sdhci-mt7620 SUPPORTED_DEVICES += vocore2lite endef TARGET_DEVICES += vocore_vocore2-lite @@ -589,7 +592,8 @@ define Device/zyxel_keenetic-extra-ii BLOCKSIZE := 64k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Extra II - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to $$$$(BLOCKSIZE) | \ check-size $$$$(IMAGE_SIZE) | zyimage -d 6162 -v "ZyXEL Keenetic Extra II" diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index 460df28538..a66ee59881 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -53,7 +53,7 @@ define Device/belkin_f5d8235-v1 DEVICE_MODEL := F5D8235 DEVICE_VARIANT := V1 DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-ohci \ - kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport + kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += f5d8235-v1 endef TARGET_DEVICES += belkin_f5d8235-v1 @@ -90,10 +90,8 @@ define Device/dlink_dap-1522-a1 DEVICE_PACKAGES := kmod-switch-rtl8366s KERNEL := $(KERNEL_DTB) IMAGES += factory.bin - IMAGE/factory.bin := \ - append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \ - append-rootfs | pad-rootfs -x 96 | \ - wrg-header wapnd01_dlink_dap1522 | \ + IMAGE/factory.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \ + append-rootfs | pad-rootfs -x 96 | wrg-header wapnd01_dlink_dap1522 | \ check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += dlink_dap-1522-a1 diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index fac2a689a2..0550c7ffa9 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -111,7 +111,7 @@ define Device/allnet_all5002 DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5002 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x + kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x SUPPORTED_DEVICES += all5002 endef TARGET_DEVICES += allnet_all5002 @@ -122,7 +122,7 @@ define Device/allnet_all5003 DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5003 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x + kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x SUPPORTED_DEVICES += all5003 endef TARGET_DEVICES += allnet_all5003 @@ -153,7 +153,8 @@ define Device/arcwireless_freestation5 IMAGE_SIZE := 7872k DEVICE_VENDOR := ARC Wireless DEVICE_MODEL := FreeStation - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb \ + kmod-rt2x00-usb SUPPORTED_DEVICES += freestation5 endef TARGET_DEVICES += arcwireless_freestation5 @@ -183,8 +184,7 @@ define Device/asiarf_awm002-evb-4m DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB DEVICE_VARIANT := 4M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-gpio + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-gpio SUPPORTED_DEVICES += awm002-evb-4M endef TARGET_DEVICES += asiarf_awm002-evb-4m @@ -195,8 +195,7 @@ define Device/asiarf_awm002-evb-8m DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB/AWM003-EVB DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-gpio + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-gpio SUPPORTED_DEVICES += awm002-evb-8M endef TARGET_DEVICES += asiarf_awm002-evb-8m @@ -302,8 +301,8 @@ define Device/buffalo_whr-g300n DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-G300N IMAGES += tftp.bin - IMAGE/tftp.bin := $$(sysupgrade_bin) | \ - check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header + IMAGE/tftp.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + buffalo-tftp-header SUPPORTED_DEVICES += whr-g300n endef TARGET_DEVICES += buffalo_whr-g300n @@ -327,7 +326,8 @@ define Device/dlink_dcs-930 IMAGE_SIZE := 3776k DEVICE_VENDOR := D-Link DEVICE_MODEL := DCS-930 - DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core \ + kmod-usb-audio kmod-usb-dwc2 SUPPORTED_DEVICES += dcs-930 endef TARGET_DEVICES += dlink_dcs-930 @@ -338,7 +338,8 @@ define Device/dlink_dcs-930l-b1 DEVICE_VENDOR := D-Link DEVICE_MODEL := DCS-930L DEVICE_VARIANT := B1 - DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-ohci kmod-usb2 + DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core \ + kmod-usb-audio kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += dcs-930l-b1 endef TARGET_DEVICES += dlink_dcs-930l-b1 @@ -347,8 +348,8 @@ define Device/dlink_dir-300-b1 MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir300b + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + wrg-header wrgn23_dlwbr_dir300b DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-300 DEVICE_VARIANT := B1 @@ -381,8 +382,8 @@ define Device/dlink_dir-600-b1 MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + wrg-header wrgn23_dlwbr_dir600b DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-600 DEVICE_VARIANT := B1/B2 @@ -409,8 +410,8 @@ define Device/dlink_dir-615-d MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir615d + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + wrg-header wrgn23_dlwbr_dir615d DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-615 DEVICE_VARIANT := D @@ -423,8 +424,7 @@ define Device/dlink_dir-615-h1 BLOCKSIZE := 4k IMAGES += factory.bin IMAGE_SIZE := 3776k - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3 + IMAGE/factory.bin := $$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-615 DEVICE_VARIANT := H1 @@ -459,8 +459,7 @@ define Device/dlink_dwr-512-b DEVICE_MODEL := DWR-512 DEVICE_VARIANT := B DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \ - kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether \ - comgt-ncm + kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether comgt-ncm DLINK_ROM_ID := DLK6E2412001 DLINK_FAMILY_MEMBER := 0x6E24 DLINK_FIRMWARE_SIZE := 0x7E0000 @@ -569,8 +568,8 @@ define Device/hilink_hlk-rm04 MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + hilink-header DEVICE_VENDOR := Hi-Link DEVICE_MODEL := HLK-RM04 SUPPORTED_DEVICES += hlk-rm04 @@ -612,9 +611,8 @@ define Device/intenso_memory2move UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := Intenso DEVICE_MODEL := Memory 2 Move - DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer \ - kmod-usb2 kmod-usb-storage kmod-scsi-core \ - kmod-fs-ext4 kmod-fs-vfat block-mount + DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer kmod-usb2 \ + kmod-usb-storage kmod-scsi-core kmod-fs-ext4 kmod-fs-vfat block-mount SUPPORTED_DEVICES += m2m endef TARGET_DEVICES += intenso_memory2move @@ -623,8 +621,8 @@ define Device/jcg_jhr-n805r MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 29.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N805R SUPPORTED_DEVICES += jhr-n805r @@ -635,8 +633,8 @@ define Device/jcg_jhr-n825r MTK_SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 23.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N825R SUPPORTED_DEVICES += jhr-n825r @@ -647,8 +645,8 @@ define Device/jcg_jhr-n926r MTK_SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 25.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N926R SUPPORTED_DEVICES += jhr-n926r @@ -701,8 +699,8 @@ define Device/nexx_wt1520-4m MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B WT1520 -F 4M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT1520 DEVICE_VARIANT := 4M @@ -714,8 +712,8 @@ define Device/nexx_wt1520-8m MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B WT1520 -F 8M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT1520 DEVICE_VARIANT := 8M @@ -729,7 +727,8 @@ define Device/nixcore_x1-16m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-16M endef TARGET_DEVICES += nixcore_x1-16m @@ -740,7 +739,8 @@ define Device/nixcore_x1-8m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-8M endef TARGET_DEVICES += nixcore_x1-8m @@ -750,9 +750,8 @@ define Device/olimex_rt5350f-olinuxino IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino endef TARGET_DEVICES += olimex_rt5350f-olinuxino @@ -762,9 +761,8 @@ define Device/olimex_rt5350f-olinuxino-evb IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino-EVB - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino-evb endef TARGET_DEVICES += olimex_rt5350f-olinuxino-evb @@ -842,12 +840,11 @@ define Device/poray_m3 MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B M3 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M3 - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev \ - kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer SUPPORTED_DEVICES += m3 endef TARGET_DEVICES += poray_m3 @@ -856,13 +853,12 @@ define Device/poray_m4-4m MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B M4 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M4 DEVICE_VARIANT := 4M - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev \ - kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer SUPPORTED_DEVICES += m4-4M endef TARGET_DEVICES += poray_m4-4m @@ -871,8 +867,8 @@ define Device/poray_m4-8m MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B M4 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := M4 DEVICE_VARIANT := 8M @@ -885,8 +881,8 @@ define Device/poray_x5 MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B X5 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X5/X6 DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer @@ -898,8 +894,8 @@ define Device/poray_x8 MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B X8 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X8 DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer @@ -1017,7 +1013,7 @@ define Device/trendnet_tew-638apb-v2 BLOCKSIZE := 64k IMAGE_SIZE := 3776k IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-638APB DEVICE_VARIANT := v2 @@ -1038,8 +1034,8 @@ define Device/unbranded_a5-v11 MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B A5-V11 -F 4M DEVICE_VENDOR := DEVICE_MODEL := A5-V11 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 @@ -1104,9 +1100,8 @@ define Device/vocore_vocore-16m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-16M endef TARGET_DEVICES += vocore_vocore-16m @@ -1117,9 +1112,8 @@ define Device/vocore_vocore-8m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-8M endef TARGET_DEVICES += vocore_vocore-8m @@ -1129,8 +1123,7 @@ define Device/wansview_ncs601w IMAGE_SIZE := 7872k DEVICE_VENDOR := Wansview DEVICE_MODEL := NCS601W - DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \ - kmod-usb-ohci + DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-usb-ohci SUPPORTED_DEVICES += ncs601w endef TARGET_DEVICES += wansview_ncs601w From 0757f7fedca77d169682d41e7b861d86e7308a11 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 19 Dec 2019 20:42:19 +0100 Subject: [PATCH 055/480] ath79: harmonize line breaks in image Makefiles This harmonizes the line wrapping in image Makefile device definitions, as those are frequently copy-pasted and are a common subject of review comments. Having the treatment unifying should reduce the cases where adjustment is necessary afterwards. Harmonization is achieved by consistently (read "strictly") applying certain rules: - Never put more than 80 characters into one line - Fill lines up (do not break after 40 chars because of ...) - Use one tab for indent after wrapping by "\" - Only break after pipe "|" for IMAGE variables Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/common-netgear.mk | 6 +- target/linux/ath79/image/common-tp-link.mk | 34 ++-- target/linux/ath79/image/generic-tp-link.mk | 36 +++-- target/linux/ath79/image/generic-ubnt.mk | 22 ++- target/linux/ath79/image/generic.mk | 168 ++++++++++++-------- target/linux/ath79/image/nand.mk | 33 ++-- target/linux/ath79/image/tiny-netgear.mk | 12 +- target/linux/ath79/image/tiny.mk | 14 +- 8 files changed, 187 insertions(+), 138 deletions(-) diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk index 8311222a91..8fa6b030fc 100644 --- a/target/linux/ath79/image/common-netgear.mk +++ b/target/linux/ath79/image/common-netgear.mk @@ -37,6 +37,8 @@ define Device/netgear_ath79 DEVICE_VENDOR := NETGEAR KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGES += factory.img - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \ + check-size $$$$(IMAGE_SIZE) endef diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index bda81a3e2b..0dc58191a8 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -1,4 +1,5 @@ -DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION TPLINK_BOARD_NAME TPLINK_BOARD_ID +DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION +DEVICE_VARS += TPLINK_BOARD_NAME TPLINK_BOARD_ID define rootfs_align $(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1)))))) @@ -14,12 +15,9 @@ endef # -X reserve bytes in the firmware image (hexval prefixed with 0x) define Build/mktplinkfw -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \ - -m $(TPLINK_HEADER_VERSION) \ - -k $(IMAGE_KERNEL) \ - -r $@ \ - -o $@.new \ - -j -X 0x40000 \ + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ + -N OpenWrt -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \ + -k $(IMAGE_KERNEL) -r $@ -o $@.new -j -X 0x40000 \ -a $(call rootfs_align,$(FILESYSTEM)) \ $(wordlist 2,$(words $(1)),$(1)) \ $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ @@ -30,19 +28,16 @@ endef # -c combined image define Build/mktplinkfw-combined $(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \ - -m $(TPLINK_HEADER_VERSION) \ - -k $@ \ - -o $@.new \ - -s -S \ - -c + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ + -N OpenWrt -V $(REVISION) $(1) -m $(TPLINK_HEADER_VERSION) \ + -k $@ -o $@.new -s -S -c @mv $@.new $@ endef define Build/uImageArcher mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel \ - -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ + -O linux -T kernel -C $(1) -a $(KERNEL_LOADADDR) \ + -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ -n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new @mv $@.new $@ endef @@ -55,7 +50,8 @@ define Device/tplink KERNEL := kernel-bin | append-dtb | lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v1-header IMAGES += factory.bin - IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata + IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | \ + append-metadata IMAGE/factory.bin := append-rootfs | mktplinkfw factory endef @@ -64,7 +60,8 @@ define Device/tplink-nolzma LOADER_FLASH_OFFS := 0x22000 COMPILE := loader-$(1).gz COMPILE/loader-$(1).gz := loader-okli-compile - KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680 + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | \ + loader-okli $(1) 7680 KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | tplink-v1-header endef @@ -117,5 +114,6 @@ define Device/tplink-loader-okli LOADER_FLASH_OFFS := 0x43000 COMPILE := loader-$(1).elf COMPILE/loader-$(1).elf := loader-okli-compile - KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 12288 + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | \ + loader-okli $(1) 12288 endef diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index c43927e19b..260e5a37c4 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -6,7 +6,8 @@ define Device/tplink_archer-a7-v5 IMAGE_SIZE := 15104k DEVICE_MODEL := Archer A7 DEVICE_VARIANT := v5 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-A7-V5 BOARDNAME := ARCHER-A7-V5 SUPPORTED_DEVICES += archer-a7-v5 @@ -41,7 +42,8 @@ define Device/tplink_archer-c5-v1 ATH_SOC := qca9558 DEVICE_MODEL := Archer C5 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_HWID := 0xc5000001 SUPPORTED_DEVICES += archer-c5 endef @@ -66,7 +68,8 @@ define Device/tplink_archer-c59-v1 DEVICE_MODEL := Archer C59 DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C59-V1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c59-v1 endef TARGET_DEVICES += tplink_archer-c59-v1 @@ -78,7 +81,8 @@ define Device/tplink_archer-c59-v2 DEVICE_MODEL := Archer C59 DEVICE_VARIANT := v2 TPLINK_BOARD_ID := ARCHER-C59-V2 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c59-v2 endef TARGET_DEVICES += tplink_archer-c59-v2 @@ -148,7 +152,8 @@ define Device/tplink_archer-c7-v2 ATH_SOC := qca9558 DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v2 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_HWID := 0xc7000002 SUPPORTED_DEVICES += archer-c7 IMAGES += factory-us.bin factory-eu.bin @@ -163,7 +168,8 @@ define Device/tplink_archer-c7-v4 IMAGE_SIZE := 15104k DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v4 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-C7-V4 BOARDNAME := ARCHER-C7-V4 SUPPORTED_DEVICES += archer-c7-v4 @@ -176,7 +182,8 @@ define Device/tplink_archer-c7-v5 IMAGE_SIZE := 15360k DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v5 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-C7-V5 BOARDNAME := ARCHER-C7-V5 SUPPORTED_DEVICES += archer-c7-v5 @@ -188,7 +195,8 @@ define Device/tplink_archer-d50-v1 DEVICE_VENDOR := TP-Link DEVICE_MODEL := Archer D50 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-D50-V1 IMAGE_SIZE := 7808k TPLINK_HWID := 0xC1200001 @@ -198,10 +206,10 @@ define Device/tplink_archer-d50-v1 TPLINK_HVERSION := 3 KERNEL := kernel-bin | append-dtb | lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | \ - tplink-v2-header -s -V "ver. 1.0" + tplink-v2-header -s -V "ver. 1.0" IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += tplink_archer-d50-v1 @@ -495,7 +503,7 @@ define Device/tplink_tl-wr2543-v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x25430001 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-rootfs | mktplinkfw factory -v 3.13.99 SUPPORTED_DEVICES += tl-wr2543-v1 endef @@ -568,8 +576,8 @@ define Device/tplink_tl-wr902ac-v1 ATH_SOC := qca9531 DEVICE_MODEL := TL-WR902AC DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-ath10k-ct ath10k-firmware-qca9887-ct -swconfig -uboot-envtools + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca9887-ct -swconfig -uboot-envtools TPLINK_BOARD_ID := TL-WR902AC-V1 IMAGE_SIZE := 7360k TPLINK_HWID := 0x0 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 59c22b8af4..6deff781f7 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -8,11 +8,9 @@ UBNT_REVISION := $(VERSION_DIST)-$(REVISION) # mkubntimage is using the kernel image direct # routerboard creates partitions out of the ubnt header define Build/mkubntimage - -$(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ - -k $(IMAGE_KERNEL) \ - -r $@ \ - -o $@ + -$(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ + -k $(IMAGE_KERNEL) -r $@ -o $@ endef # all UBNT XM/WA devices expect the kernel image to have 1024k while flash, when @@ -21,11 +19,9 @@ define Build/mkubntimage-split -[ -f $@ ] && ( \ dd if=$@ of=$@.old1 bs=1024k count=1; \ dd if=$@ of=$@.old2 bs=1024k skip=1; \ - $(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v$(UBNT_VERSION)-$(UBNT_REVISION) \ - -k $@.old1 \ - -r $@.old2 \ - -o $@; \ + $(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v$(UBNT_VERSION)-$(UBNT_REVISION) \ + -k $@.old1 -r $@.old2 -o $@; \ rm $@.old1 $@.old2 ) endef @@ -184,12 +180,14 @@ endef TARGET_DEVICES += ubnt_rocket-m define Device/ubnt_routerstation_common - DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig + DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci \ + kmod-usb2 fconfig DEVICE_VENDOR := Ubiquiti ATH_SOC := ar7161 IMAGE_SIZE := 16128k IMAGES := factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ + check-size $$$$(IMAGE_SIZE) KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 865126549a..aa30c7c762 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -82,10 +82,10 @@ define Device/seama # - 28 bytes seama_header # - 36 bytes of META data (4-bytes aligned) IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs - IMAGE/sysupgrade.bin := \ - $$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ + seama-seal | check-size $$$$(IMAGE_SIZE) SEAMA_SIGNATURE := endef @@ -110,7 +110,8 @@ define Device/adtran_bsap1880 IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | \ + check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata endef define Device/adtran_bsap1800-v2 @@ -153,8 +154,8 @@ define Device/avm_fritz300e KERNEL_INITRAMFS := $$(KERNEL) IMAGE_SIZE := 15232k IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \ - append-squashfs-fakeroot-be | pad-to 256 | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + append-squashfs-fakeroot-be | pad-to 256 | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := fritz-tffs rssileds -swconfig endef TARGET_DEVICES += avm_fritz300e @@ -167,8 +168,8 @@ define Device/avm_fritz4020 KERNEL := kernel-bin | append-dtb | lzma | eva-image KERNEL_INITRAMFS := $$(KERNEL) IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \ - append-squashfs-fakeroot-be | pad-to 256 | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + append-squashfs-fakeroot-be | pad-to 256 | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := fritz-tffs SUPPORTED_DEVICES += fritz4020 endef @@ -181,8 +182,10 @@ define Device/buffalo_bhr-4grv DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc BHR-4GRV 1.99 | buffalo-tag BHR-4GRV 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc BHR-4GRV 1.99 | \ + buffalo-tag BHR-4GRV 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += wzr-hp-g450h endef @@ -202,10 +205,13 @@ define Device/buffalo_wzr-hp-ag300h DEVICE_MODEL := WZR-HP-AG300H IMAGE_SIZE := 32320k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-AG300H 1.99 | buffalo-tag WZR-HP-AG300H 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-AG300H 1.99 | \ + buffalo-tag WZR-HP-AG300H 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += wzr-hp-ag300h endef TARGET_DEVICES += buffalo_wzr-hp-ag300h @@ -218,8 +224,10 @@ define Device/buffalo_wzr-hp-g302h-a1a0 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32128k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G302H 1.99 | buffalo-tag WZR-HP-G302H 4 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G302H 1.99 | \ + buffalo-tag WZR-HP-G302H 4 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += wzr-hp-g300nh2 endef @@ -232,8 +240,10 @@ define Device/buffalo_wzr-hp-g450h DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G450H 1.99 | buffalo-tag WZR-HP-G450H 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G450H 1.99 | \ + buffalo-tag WZR-HP-G450H 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += wzr-hp-g450h endef @@ -263,8 +273,8 @@ define Device/comfast_cf-e313ac ATH_SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E313AC - DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct ath10k-firmware-qca9888-ct \ - -swconfig -uboot-envtools + DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct \ + ath10k-firmware-qca9888-ct -swconfig -uboot-envtools IMAGE_SIZE := 7936k endef TARGET_DEVICES += comfast_cf-e313ac @@ -369,8 +379,10 @@ define Device/dlink_dir-825-b1 DEVICE_MODEL := DIR-825 DEVICE_VARIANT := B1 IMAGE_SIZE := 6208k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += dir-825-b1 endef TARGET_DEVICES += dlink_dir-825-b1 @@ -380,14 +392,17 @@ define Device/dlink_dir-825-c1 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-825 DEVICE_VARIANT := C1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset \ + kmod-owl-loader SUPPORTED_DEVICES += dir-825-c1 IMAGE_SIZE := 15936k IMAGES := factory.bin sysupgrade.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ append-string 00DB120AR9344-RT-101214-00 | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += dlink_dir-825-c1 @@ -400,10 +415,12 @@ define Device/dlink_dir-835-a1 SUPPORTED_DEVICES += dir-835-a1 IMAGE_SIZE := 15936k IMAGES := factory.bin sysupgrade.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ append-string 00DB120AR9344-RT-101214-00 | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += dlink_dir-835-a1 @@ -419,11 +436,12 @@ define Device/dlink_dir-842-c # 64 bytes offset: # - 28 bytes seama_header # - 36 bytes of META data (4-bytes aligned) - IMAGE/default := append-kernel | uImage lzma | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs - IMAGE/sysupgrade.bin := \ - $$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size $$$$(IMAGE_SIZE) + IMAGE/default := append-kernel | uImage lzma | \ + pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ + seama-seal | check-size $$$$(IMAGE_SIZE) IMAGE_SIZE := 15680k endef @@ -498,9 +516,10 @@ define Device/engenius_ecb1750 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15680k IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x101 -p 0x6d -t 2 - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x101 -p 0x6d -t 2 + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += engenius_ecb1750 @@ -532,7 +551,7 @@ define Device/etactica_eg200 DEVICE_VENDOR := eTactica DEVICE_MODEL := EG200 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \ - kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4 + kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4 IMAGE_SIZE := 16000k SUPPORTED_DEVICES += rme-eg200 endef @@ -604,8 +623,8 @@ define Device/iodata_wn-ac1167dgr IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x61 -t 2 + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x61 -t 2 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef TARGET_DEVICES += iodata_wn-ac1167dgr @@ -617,8 +636,8 @@ define Device/iodata_wn-ac1600dgr IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x60 -t 2 -v 200 + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x60 -t 2 -v 200 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef TARGET_DEVICES += iodata_wn-ac1600dgr @@ -629,10 +648,9 @@ define Device/iodata_wn-ac1600dgr2 DEVICE_MODEL := WN-AC1600DGR2/DGR3 IMAGE_SIZE := 14656k IMAGES += dgr2-dgr3-factory.bin - IMAGE/dgr2-dgr3-factory.bin := \ - append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x60 -t 2 -v 200 + IMAGE/dgr2-dgr3-factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x60 -t 2 -v 200 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef TARGET_DEVICES += iodata_wn-ac1600dgr2 @@ -644,8 +662,8 @@ define Device/iodata_wn-ag300dgr IMAGE_SIZE := 15424k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x47 -t 2 + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x47 -t 2 DEVICE_PACKAGES := kmod-usb2 endef TARGET_DEVICES += iodata_wn-ag300dgr @@ -683,13 +701,11 @@ define Device/nec_wg1200cr SEAMA_MTDBLOCK := 6 SEAMA_SIGNATURE := wrgac72_necpf.2016gui_wg1200cr IMAGES += factory.bin - IMAGE/default := \ - append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs - IMAGE/sysupgrade.bin := \ - $$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | nec-enc 9gsiy9nzep452pad | \ - check-size $$$$(IMAGE_SIZE) + IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ + seama-seal | nec-enc 9gsiy9nzep452pad | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct endef TARGET_DEVICES += nec_wg1200cr @@ -701,9 +717,8 @@ define Device/nec_wg800hp IMAGE_SIZE := 7104k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - xor-image -p 6A57190601121E4C004C1E1201061957 -x | \ - nec-fw LASER_ATERM + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + xor-image -p 6A57190601121E4C004C1E1201061957 -x | nec-fw LASER_ATERM DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct-htt endef TARGET_DEVICES += nec_wg800hp @@ -714,7 +729,8 @@ define Device/netgear_ex6400_ex7300 NETGEAR_BOARD_ID := EX7300series NETGEAR_HW_ID := 29765104+16+0+128 IMAGE_SIZE := 15552k - IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | netgear-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \ + netgear-rootfs | pad-rootfs DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct $(Device/netgear_ath79) endef @@ -733,8 +749,10 @@ TARGET_DEVICES += netgear_ex7300 define Device/netgear_wndr3x00 ATH_SOC := ar7161 - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-leds-reset kmod-owl-loader $(Device/netgear_ath79) endef @@ -746,7 +764,8 @@ define Device/netgear_wndr3700 NETGEAR_BOARD_ID := WNDR3700 IMAGE_SIZE := 7680k IMAGES += factory-NA.img - IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | \ + check-size $$$$(IMAGE_SIZE) SUPPORTED_DEVICES += wndr3700 endef TARGET_DEVICES += netgear_wndr3700 @@ -826,7 +845,8 @@ define Device/ocedo_koala DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct SUPPORTED_DEVICES += koala IMAGE_SIZE := 7424k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += ocedo_koala @@ -835,7 +855,8 @@ define Device/ocedo_raccoon DEVICE_VENDOR := Ocedo DEVICE_MODEL := Raccoon IMAGE_SIZE := 7424k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += ocedo_raccoon @@ -845,7 +866,8 @@ define Device/ocedo_ursus DEVICE_MODEL := Ursus DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 7424k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += ocedo_ursus @@ -893,7 +915,8 @@ define Device/phicomm_k2t DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2T IMAGE_SIZE := 15744k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct endef TARGET_DEVICES += phicomm_k2t @@ -918,7 +941,8 @@ define Device/pisen_wmb001n LOADER_FLASH_OFFS := 0x20000 COMPILE := loader-$(1).bin loader-$(1).uImage COMPILE/loader-$(1).bin := loader-okli-compile - COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | lzma | uImage lzma + COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | lzma | \ + uImage lzma KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 IMAGES += factory.bin IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pisen_wmb001n-factory $(1) @@ -940,7 +964,8 @@ define Device/qihoo_c301 ATH_SOC := ar9344 DEVICE_VENDOR := Qihoo DEVICE_MODEL := C301 - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct uboot-envtools + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct \ + uboot-envtools IMAGE_SIZE := 15744k SEAMA_SIGNATURE := wrgac26_qihoo360_360rg SUPPORTED_DEVICES += qihoo-c301 @@ -979,10 +1004,12 @@ define Device/trendnet_tew-823dru SUPPORTED_DEVICES += tew-823dru IMAGE_SIZE := 15296k IMAGES := factory.bin sysupgrade.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ append-string 00AP135AR9558-RT-131129-00 | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += trendnet_tew-823dru @@ -1017,7 +1044,8 @@ define Device/winchannel_wb2000 DEVICE_VENDOR := Winchannel DEVICE_MODEL := WB2000 IMAGE_SIZE := 15872k - DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += winchannel_wb2000 @@ -1068,6 +1096,6 @@ define Device/zbtlink_zbt-wd323 DEVICE_MODEL := WD323 IMAGE_SIZE := 16000k DEVICE_PACKAGES := kmod-usb2 kmod-i2c-core kmod-i2c-gpio kmod-rtc-pcf8563 \ - kmod-usb-serial kmod-usb-serial-cp210x uqmi + kmod-usb-serial kmod-usb-serial-cp210x uqmi endef TARGET_DEVICES += zbtlink_zbt-wd323 diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 19c2d42142..50cf6831cc 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -40,7 +40,8 @@ define Device/aerohive_hiveap-121 UBINIZE_OPTS := -E 5 SUPPORTED_DEVICES += hiveap-121 IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += aerohive_hiveap-121 @@ -79,8 +80,8 @@ define Device/glinet_gl-ar750s-common ATH_SOC := qca9563 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-AR750S - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct \ - kmod-usb2 kmod-usb-storage block-mount + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \ + kmod-usb-storage block-mount KERNEL_SIZE := 4096k IMAGE_SIZE := 16000k PAGESIZE := 2048 @@ -115,13 +116,15 @@ define Device/netgear_ath79_nand PAGESIZE := 2048 IMAGE_SIZE := 25600k KERNEL := kernel-bin | append-dtb | lzma -d20 | \ - pad-offset $$(KERNEL_SIZE) 129 | \ - netgear-uImage lzma | append-string -e '\xff' | \ + pad-offset $$(KERNEL_SIZE) 129 | netgear-uImage lzma | \ + append-string -e '\xff' | \ append-uImage-fakehdr filesystem $$(NETGEAR_KERNEL_MAGIC) KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGES := sysupgrade.bin factory.img - IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | \ + check-size $$$$(IMAGE_SIZE) UBINIZE_OPTS := -E 5 endef @@ -152,19 +155,23 @@ define Device/zyxel_nbg6716 ATH_SOC := qca9558 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG6716 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct RAS_BOARD := NBG6716 RAS_ROOTFS_SIZE := 29696k RAS_VERSION := "OpenWrt Linux-$(LINUX_VERSION)" KERNEL_SIZE := 4096k BLOCKSIZE := 128k PAGESIZE := 2048 - KERNEL := kernel-bin | append-dtb | uImage none | \ - zyxel-buildkerneljffs | check-size 4096k + KERNEL := kernel-bin | append-dtb | uImage none | zyxel-buildkerneljffs | \ + check-size 4096k IMAGES := sysupgrade.tar sysupgrade-4M-Kernel.bin factory.bin - IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata - IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | zyxel-factory + IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | \ + sysupgrade-tar rootfs=$$$$@ | append-metadata + IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | \ + pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ + zyxel-factory UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += zyxel_nbg6716 diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk index d257ddd0ec..a65468522d 100644 --- a/target/linux/ath79/image/tiny-netgear.mk +++ b/target/linux/ath79/image/tiny-netgear.mk @@ -5,7 +5,8 @@ define Device/netgear_ar7240 NETGEAR_KERNEL_MAGIC := 0x32303631 KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs $(Device/netgear_ath79) endef @@ -36,7 +37,8 @@ define Device/netgear_wnr1000-v2 NETGEAR_BOARD_ID := WNR1000V2 NETGEAR_HW_ID := 29763331+4+32 IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs SUPPORTED_DEVICES += wnr1000-v2 $(Device/netgear_ath79) endef @@ -50,9 +52,11 @@ define Device/netgear_wnr2000-v3 NETGEAR_BOARD_ID := WNR2000V3 NETGEAR_HW_ID := 29763551+04+32 IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs IMAGES += factory-NA.img - IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | \ + check-size $$$$(IMAGE_SIZE) SUPPORTED_DEVICES += wnr2000-v3 $(Device/netgear_ath79) endef diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 5f6adeac86..039925e019 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -6,8 +6,10 @@ define Device/buffalo_whr-g301n DEVICE_MODEL := WHR-G301N IMAGE_SIZE := 3712k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WHR-G301N 1.99 | buffalo-tag WHR-G301N 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WHR-G301N 1.99 | \ + buffalo-tag WHR-G301N 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += whr-g301n endef @@ -22,9 +24,11 @@ define Device/dlink_dir-615-e4 FACTORY_IMAGE_SIZE := 3456k IMAGES += factory.bin IMAGE/default := append-kernel | append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | check-size $$$$(FACTORY_IMAGE_SIZE) | \ - pad-to $$$$(FACTORY_IMAGE_SIZE) | append-string "AP99-AR7240-RT-091105-05" + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | \ + check-size $$$$(FACTORY_IMAGE_SIZE) | pad-to $$$$(FACTORY_IMAGE_SIZE) | \ + append-string "AP99-AR7240-RT-091105-05" SUPPORTED_DEVICES += dir-615-e4 endef TARGET_DEVICES += dlink_dir-615-e4 From bc3783d22185513b0882fd3eb0530041bc8f0c7a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 16 Dec 2019 13:19:43 +0100 Subject: [PATCH 056/480] build: image: add SOC device variable This creates the device variable SOC and adds it to DEFAULT_DEVICE_VARS. It is supposed to replace target-specific SOC variables like ATH_SOC or MTK_SOC and thus unify variable names across targets. Signed-off-by: Adrian Schmutzler --- include/image.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/image.mk b/include/image.mk index 8592c19b99..26da4d6819 100644 --- a/include/image.mk +++ b/include/image.mk @@ -420,6 +420,7 @@ define Device/Init DEVICE_DTS := DEVICE_DTS_CONFIG := DEVICE_DTS_DIR := + SOC := BOARD_NAME := UIMAGE_NAME := @@ -437,7 +438,7 @@ DEFAULT_DEVICE_VARS := \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \ CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \ VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \ - DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \ + DEVICE_DTS_CONFIG DEVICE_DTS_DIR SOC BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \ IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH DEVICE_VENDOR \ DEVICE_MODEL DEVICE_VARIANT \ DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \ From 95030ac0b673165772daf27128359eaaf536d457 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 20 Dec 2019 01:12:42 +0100 Subject: [PATCH 057/480] ath79: rename ATH_SOC to SOC This replaces ATH_SOC by the newly introduced common SOC device variable. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/Makefile | 5 +- target/linux/ath79/image/generic-tp-link.mk | 100 ++++++------- target/linux/ath79/image/generic-ubnt.mk | 14 +- target/linux/ath79/image/generic.mk | 150 ++++++++++---------- target/linux/ath79/image/nand.mk | 12 +- target/linux/ath79/image/tiny-netgear.mk | 6 +- target/linux/ath79/image/tiny-tp-link.mk | 54 +++---- target/linux/ath79/image/tiny.mk | 6 +- 8 files changed, 173 insertions(+), 174 deletions(-) diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index 24768ef5e0..34bd0a2490 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR = 0x80060000 -DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE ATH_SOC +DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE define Build/loader-common rm -rf $@.src @@ -55,9 +55,8 @@ endef define Device/Default - ATH_SOC := DEVICE_DTS_DIR := ../dts - DEVICE_DTS = $$(ATH_SOC)_$(1) + DEVICE_DTS = $$(SOC)_$(1) PROFILES = Default MTDPARTS := BLOCKSIZE := 64k diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 260e5a37c4..cc5c13b919 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -2,7 +2,7 @@ include ./common-tp-link.mk define Device/tplink_archer-a7-v5 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 15104k DEVICE_MODEL := Archer A7 DEVICE_VARIANT := v5 @@ -16,7 +16,7 @@ TARGET_DEVICES += tplink_archer-a7-v5 define Device/tplink_archer-c2-v3 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 7808k DEVICE_MODEL := Archer C2 DEVICE_VARIANT := v3 @@ -27,7 +27,7 @@ TARGET_DEVICES += tplink_archer-c2-v3 define Device/tplink_archer-c25-v1 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9561 + SOC := qca9561 IMAGE_SIZE := 7808k DEVICE_MODEL := Archer C25 DEVICE_VARIANT := v1 @@ -39,7 +39,7 @@ TARGET_DEVICES += tplink_archer-c25-v1 define Device/tplink_archer-c5-v1 $(Device/tplink-16mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := Archer C5 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ @@ -51,7 +51,7 @@ TARGET_DEVICES += tplink_archer-c5-v1 define Device/tplink_archer-c58-v1 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9561 + SOC := qca9561 IMAGE_SIZE := 7936k DEVICE_MODEL := Archer C58 DEVICE_VARIANT := v1 @@ -63,7 +63,7 @@ TARGET_DEVICES += tplink_archer-c58-v1 define Device/tplink_archer-c59-v1 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9561 + SOC := qca9561 IMAGE_SIZE := 14528k DEVICE_MODEL := Archer C59 DEVICE_VARIANT := v1 @@ -76,7 +76,7 @@ TARGET_DEVICES += tplink_archer-c59-v1 define Device/tplink_archer-c59-v2 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9561 + SOC := qca9561 IMAGE_SIZE := 14400k DEVICE_MODEL := Archer C59 DEVICE_VARIANT := v2 @@ -89,7 +89,7 @@ TARGET_DEVICES += tplink_archer-c59-v2 define Device/tplink_archer-c6-v2 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 7808k DEVICE_MODEL := Archer C6 DEVICE_VARIANT := v2 (EU/RU/JP) @@ -100,7 +100,7 @@ TARGET_DEVICES += tplink_archer-c6-v2 define Device/tplink_archer-c6-v2-us $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 15872k DEVICE_MODEL := Archer C6 DEVICE_VARIANT := v2 (US) @@ -114,7 +114,7 @@ TARGET_DEVICES += tplink_archer-c6-v2-us define Device/tplink_archer-c60-v1 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9561 + SOC := qca9561 IMAGE_SIZE := 7936k DEVICE_MODEL := Archer C60 DEVICE_VARIANT := v1 @@ -126,7 +126,7 @@ TARGET_DEVICES += tplink_archer-c60-v1 define Device/tplink_archer-c60-v2 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9561 + SOC := qca9561 IMAGE_SIZE := 7808k DEVICE_MODEL := Archer C60 DEVICE_VARIANT := v2 @@ -138,7 +138,7 @@ TARGET_DEVICES += tplink_archer-c60-v2 define Device/tplink_archer-c7-v1 $(Device/tplink-8mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -149,7 +149,7 @@ TARGET_DEVICES += tplink_archer-c7-v1 define Device/tplink_archer-c7-v2 $(Device/tplink-16mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ @@ -164,7 +164,7 @@ TARGET_DEVICES += tplink_archer-c7-v2 define Device/tplink_archer-c7-v4 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 15104k DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v4 @@ -178,7 +178,7 @@ TARGET_DEVICES += tplink_archer-c7-v4 define Device/tplink_archer-c7-v5 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 15360k DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v5 @@ -191,7 +191,7 @@ endef TARGET_DEVICES += tplink_archer-c7-v5 define Device/tplink_archer-d50-v1 - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := TP-Link DEVICE_MODEL := Archer D50 DEVICE_VARIANT := v1 @@ -215,7 +215,7 @@ TARGET_DEVICES += tplink_archer-d50-v1 define Device/tplink_cpe210-v1 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE210 DEVICE_VARIANT := v1 @@ -227,7 +227,7 @@ TARGET_DEVICES += tplink_cpe210-v1 define Device/tplink_cpe210-v2 $(Device/tplink-safeloader) - ATH_SOC := qca9533 + SOC := qca9533 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE210 DEVICE_VARIANT := v2 @@ -240,7 +240,7 @@ TARGET_DEVICES += tplink_cpe210-v2 define Device/tplink_cpe210-v3 $(Device/tplink-safeloader) - ATH_SOC := qca9533 + SOC := qca9533 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE210 DEVICE_VARIANT := v3 @@ -253,7 +253,7 @@ TARGET_DEVICES += tplink_cpe210-v3 define Device/tplink_cpe220-v2 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE220 DEVICE_VARIANT := v2 @@ -264,7 +264,7 @@ TARGET_DEVICES += tplink_cpe220-v2 define Device/tplink_cpe220-v3 $(Device/tplink-safeloader) - ATH_SOC := qca9533 + SOC := qca9533 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE220 DEVICE_VARIANT := v3 @@ -276,7 +276,7 @@ TARGET_DEVICES += tplink_cpe220-v3 define Device/tplink_cpe510-v1 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE510 DEVICE_VARIANT := v1 @@ -288,7 +288,7 @@ TARGET_DEVICES += tplink_cpe510-v1 define Device/tplink_cpe510-v2 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE510 DEVICE_VARIANT := v2 @@ -300,7 +300,7 @@ TARGET_DEVICES += tplink_cpe510-v2 define Device/tplink_cpe510-v3 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE510 DEVICE_VARIANT := v3 @@ -312,7 +312,7 @@ TARGET_DEVICES += tplink_cpe510-v3 define Device/tplink_cpe610-v1 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := CPE610 DEVICE_VARIANT := v1 @@ -322,7 +322,7 @@ TARGET_DEVICES += tplink_cpe610-v1 define Device/tplink_re350k-v1 $(Device/tplink-safeloader) - ATH_SOC := qca9558 + SOC := qca9558 IMAGE_SIZE := 13760k DEVICE_MODEL := RE350K DEVICE_VARIANT := v1 @@ -335,7 +335,7 @@ TARGET_DEVICES += tplink_re350k-v1 define Device/tplink_rex5x-v1 $(Device/tplink-safeloader) - ATH_SOC := qca9558 + SOC := qca9558 IMAGE_SIZE := 6016k DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_HWID := 0x0 @@ -362,7 +362,7 @@ TARGET_DEVICES += tplink_re450-v1 define Device/tplink_re450-v2 $(Device/tplink-safeloader) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 6016k DEVICE_MODEL := RE450 DEVICE_VARIANT := v2 @@ -376,7 +376,7 @@ TARGET_DEVICES += tplink_re450-v2 define Device/tplink_tl-wdr3500-v1 $(Device/tplink-8mlzma) - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_MODEL := TL-WDR3500 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -387,7 +387,7 @@ TARGET_DEVICES += tplink_tl-wdr3500-v1 define Device/tplink_tl-wdr3600-v1 $(Device/tplink-8mlzma) - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_MODEL := TL-WDR3600 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -398,7 +398,7 @@ TARGET_DEVICES += tplink_tl-wdr3600-v1 define Device/tplink_tl-wdr4300-v1 $(Device/tplink-8mlzma) - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_MODEL := TL-WDR4300 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -409,7 +409,7 @@ TARGET_DEVICES += tplink_tl-wdr4300-v1 define Device/tplink_tl-wdr4300-v1-il $(Device/tplink-8mlzma) - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_MODEL := TL-WDR4300 DEVICE_VARIANT := v1 (IL) DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -420,7 +420,7 @@ TARGET_DEVICES += tplink_tl-wdr4300-v1-il define Device/tplink_tl-wdr4900-v2 $(Device/tplink-8mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := TL-WDR4900 DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -430,7 +430,7 @@ TARGET_DEVICES += tplink_tl-wdr4900-v2 define Device/tplink_tl-wr1043nd-v1 $(Device/tplink-8m) - ATH_SOC := ar9132 + SOC := ar9132 DEVICE_MODEL := TL-WR1043N/ND DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -441,7 +441,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v1 define Device/tplink_tl-wr1043nd-v2 $(Device/tplink-8mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := TL-WR1043N/ND DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -452,7 +452,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v2 define Device/tplink_tl-wr1043nd-v3 $(Device/tplink-8mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := TL-WR1043N/ND DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -463,7 +463,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v3 define Device/tplink_tl-wr1043nd-v4 $(Device/tplink-safeloader) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 15552k DEVICE_MODEL := TL-WR1043N/ND DEVICE_VARIANT := v4 @@ -476,7 +476,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v4 define Device/tplink_tl-wr1043n-v5 $(Device/tplink-safeloader-uimage) - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 15104k DEVICE_MODEL := TL-WR1043N DEVICE_VARIANT := v5 @@ -487,7 +487,7 @@ TARGET_DEVICES += tplink_tl-wr1043n-v5 define Device/tplink_tl-wr1045nd-v2 $(Device/tplink-8mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := TL-WR1045ND DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -497,7 +497,7 @@ TARGET_DEVICES += tplink_tl-wr1045nd-v2 define Device/tplink_tl-wr2543-v1 $(Device/tplink-8mlzma) - ATH_SOC := ar7242 + SOC := ar7242 DEVICE_MODEL := TL-WR2543N/ND DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -511,7 +511,7 @@ TARGET_DEVICES += tplink_tl-wr2543-v1 define Device/tplink_tl-wr710n-v1 $(Device/tplink-8mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-WR710N DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport @@ -522,7 +522,7 @@ TARGET_DEVICES += tplink_tl-wr710n-v1 define Device/tplink_tl-wr810n-v1 $(Device/tplink-8mlzma) - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_MODEL := TL-WR810N DEVICE_VARIANT := v1 TPLINK_HWID := 0x8100001 @@ -532,7 +532,7 @@ TARGET_DEVICES += tplink_tl-wr810n-v1 define Device/tplink_tl-wr810n-v2 $(Device/tplink-8mlzma) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := TL-WR810N DEVICE_VARIANT := v2 TPLINK_HWID := 0x8100002 @@ -541,7 +541,7 @@ TARGET_DEVICES += tplink_tl-wr810n-v2 define Device/tplink_tl-wr842n-v1 $(Device/tplink-8m) - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_MODEL := TL-WR842N/ND DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -551,7 +551,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v1 define Device/tplink_tl-wr842n-v2 $(Device/tplink-8mlzma) - ATH_SOC := ar9341 + SOC := ar9341 DEVICE_MODEL := TL-WR842N/ND DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -562,7 +562,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v2 define Device/tplink_tl-wr842n-v3 $(Device/tplink-16mlzma) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := TL-WR842N DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -573,7 +573,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v3 define Device/tplink_tl-wr902ac-v1 $(Device/tplink-safeloader) - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_MODEL := TL-WR902AC DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ @@ -588,7 +588,7 @@ TARGET_DEVICES += tplink_tl-wr902ac-v1 define Device/tplink_wbs210-v2 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := WBS210 DEVICE_VARIANT := v2 @@ -599,7 +599,7 @@ TARGET_DEVICES += tplink_wbs210-v2 define Device/tplink_wbs510-v1 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := WBS510 DEVICE_VARIANT := v1 @@ -611,7 +611,7 @@ TARGET_DEVICES += tplink_wbs510-v1 define Device/tplink_wbs510-v2 $(Device/tplink-loader-okli) - ATH_SOC := ar9344 + SOC := ar9344 IMAGE_SIZE := 7680k DEVICE_MODEL := WBS510 DEVICE_VARIANT := v2 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 6deff781f7..760d5be196 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -39,7 +39,7 @@ endef define Device/ubnt-bz $(Device/ubnt) - ATH_SOC := ar7241 + SOC := ar7241 IMAGE_SIZE := 7448k UBNT_BOARD := XM UBNT_CHIP := ar7240 @@ -49,7 +49,7 @@ endef define Device/ubnt-wa $(Device/ubnt) - ATH_SOC := ar9342 + SOC := ar9342 IMAGE_SIZE := 15744k UBNT_BOARD := WA UBNT_CHIP := ar934x @@ -59,7 +59,7 @@ endef define Device/ubnt-xm $(Device/ubnt) - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_VARIANT := XM DEVICE_PACKAGES += kmod-usb-ohci IMAGE_SIZE := 7448k @@ -72,7 +72,7 @@ endef define Device/ubnt-xw $(Device/ubnt) - ATH_SOC := ar9342 + SOC := ar9342 DEVICE_VARIANT := XW IMAGE_SIZE := 7552k UBNT_BOARD := XM @@ -84,7 +84,7 @@ endef define Device/ubnt_acb-isp $(Device/ubnt) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := airCube ISP IMAGE_SIZE := 15744k UBNT_BOARD := ACB-ISP @@ -183,7 +183,7 @@ define Device/ubnt_routerstation_common DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci \ kmod-usb2 fconfig DEVICE_VENDOR := Ubiquiti - ATH_SOC := ar7161 + SOC := ar7161 IMAGE_SIZE := 16128k IMAGES := factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ @@ -222,7 +222,7 @@ TARGET_DEVICES += ubnt_unifi define Device/ubnt_unifiac DEVICE_VENDOR := Ubiquiti - ATH_SOC := qca9563 + SOC := qca9563 IMAGE_SIZE := 7744k DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index aa30c7c762..10bd40abc1 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -91,7 +91,7 @@ endef define Device/8dev_carambola2 - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_VENDOR := 8devices DEVICE_MODEL := Carambola2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2 @@ -101,7 +101,7 @@ endef TARGET_DEVICES += 8dev_carambola2 define Device/adtran_bsap1880 - ATH_SOC := ar7161 + SOC := ar7161 DEVICE_VENDOR := Adtran/Bluesocket DEVICE_PACKAGES += -swconfig -uboot-envtools fconfig KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) @@ -128,7 +128,7 @@ endef TARGET_DEVICES += adtran_bsap1840 define Device/alfa-network_ap121f - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_VENDOR := ALFA Network DEVICE_MODEL := AP121F DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2 kmod-usb-storage -swconfig @@ -138,7 +138,7 @@ endef TARGET_DEVICES += alfa-network_ap121f define Device/aruba_ap-105 - ATH_SOC := ar7161 + SOC := ar7161 DEVICE_VENDOR := Aruba DEVICE_MODEL := AP-105 IMAGE_SIZE := 16000k @@ -147,7 +147,7 @@ endef TARGET_DEVICES += aruba_ap-105 define Device/avm_fritz300e - ATH_SOC := ar7242 + SOC := ar7242 DEVICE_VENDOR := AVM DEVICE_MODEL := FRITZ!WLAN Repeater 300E KERNEL := kernel-bin | append-dtb | lzma | eva-image @@ -161,7 +161,7 @@ endef TARGET_DEVICES += avm_fritz300e define Device/avm_fritz4020 - ATH_SOC := qca9561 + SOC := qca9561 DEVICE_VENDOR := AVM DEVICE_MODEL := FRITZ!Box 4020 IMAGE_SIZE := 15232k @@ -176,7 +176,7 @@ endef TARGET_DEVICES += avm_fritz4020 define Device/buffalo_bhr-4grv - ATH_SOC := ar7242 + SOC := ar7242 DEVICE_VENDOR := Buffalo DEVICE_MODEL := BHR-4GRV DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -192,7 +192,7 @@ endef TARGET_DEVICES += buffalo_bhr-4grv define Device/buffalo_bhr-4grv2 - ATH_SOC := qca9557 + SOC := qca9557 DEVICE_VENDOR := Buffalo DEVICE_MODEL := BHR-4GRV2 IMAGE_SIZE := 16000k @@ -200,7 +200,7 @@ endef TARGET_DEVICES += buffalo_bhr-4grv2 define Device/buffalo_wzr-hp-ag300h - ATH_SOC := ar7161 + SOC := ar7161 DEVICE_VENDOR := Buffalo DEVICE_MODEL := WZR-HP-AG300H IMAGE_SIZE := 32320k @@ -217,7 +217,7 @@ endef TARGET_DEVICES += buffalo_wzr-hp-ag300h define Device/buffalo_wzr-hp-g302h-a1a0 - ATH_SOC := ar7242 + SOC := ar7242 DEVICE_VENDOR := Buffalo DEVICE_MODEL := WZR-HP-G302H DEVICE_VARIANT := A1A0 @@ -234,7 +234,7 @@ endef TARGET_DEVICES += buffalo_wzr-hp-g302h-a1a0 define Device/buffalo_wzr-hp-g450h - ATH_SOC := ar7242 + SOC := ar7242 DEVICE_VENDOR := Buffalo DEVICE_MODEL := WZR-HP-G450H/WZR-450HP DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport @@ -250,7 +250,7 @@ endef TARGET_DEVICES += buffalo_wzr-hp-g450h define Device/comfast_cf-e110n-v2 - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E110N DEVICE_VARIANT := v2 @@ -260,7 +260,7 @@ endef TARGET_DEVICES += comfast_cf-e110n-v2 define Device/comfast_cf-e120a-v3 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E120A DEVICE_VARIANT := v3 @@ -270,7 +270,7 @@ endef TARGET_DEVICES += comfast_cf-e120a-v3 define Device/comfast_cf-e313ac - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E313AC DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct \ @@ -280,7 +280,7 @@ endef TARGET_DEVICES += comfast_cf-e313ac define Device/comfast_cf-e314n-v2 - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E314N DEVICE_VARIANT := v2 @@ -290,7 +290,7 @@ endef TARGET_DEVICES += comfast_cf-e314n-v2 define Device/comfast_cf-e5 - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E5/E7 DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-usb2 kmod-usb-net \ @@ -300,7 +300,7 @@ endef TARGET_DEVICES += comfast_cf-e5 define Device/comfast_cf-wr650ac-v1 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-WR650AC DEVICE_VARIANT := v1 @@ -310,7 +310,7 @@ endef TARGET_DEVICES += comfast_cf-wr650ac-v1 define Device/comfast_cf-wr650ac-v2 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-WR650AC DEVICE_VARIANT := v2 @@ -320,7 +320,7 @@ endef TARGET_DEVICES += comfast_cf-wr650ac-v2 define Device/devolo_dvl1200e - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := devolo DEVICE_MODEL := WiFi pro 1200e DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -329,7 +329,7 @@ endef TARGET_DEVICES += devolo_dvl1200e define Device/devolo_dvl1200i - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := devolo DEVICE_MODEL := WiFi pro 1200i DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -338,7 +338,7 @@ endef TARGET_DEVICES += devolo_dvl1200i define Device/devolo_dvl1750c - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := devolo DEVICE_MODEL := WiFi pro 1750c DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -347,7 +347,7 @@ endef TARGET_DEVICES += devolo_dvl1750c define Device/devolo_dvl1750e - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := devolo DEVICE_MODEL := WiFi pro 1750e DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -356,7 +356,7 @@ endef TARGET_DEVICES += devolo_dvl1750e define Device/devolo_dvl1750i - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := devolo DEVICE_MODEL := WiFi pro 1750i DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -365,7 +365,7 @@ endef TARGET_DEVICES += devolo_dvl1750i define Device/devolo_dvl1750x - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := devolo DEVICE_MODEL := WiFi pro 1750x DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -374,7 +374,7 @@ endef TARGET_DEVICES += devolo_dvl1750x define Device/dlink_dir-825-b1 - ATH_SOC := ar7161 + SOC := ar7161 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-825 DEVICE_VARIANT := B1 @@ -388,7 +388,7 @@ endef TARGET_DEVICES += dlink_dir-825-b1 define Device/dlink_dir-825-c1 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-825 DEVICE_VARIANT := C1 @@ -407,7 +407,7 @@ endef TARGET_DEVICES += dlink_dir-825-c1 define Device/dlink_dir-835-a1 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-835 DEVICE_VARIANT := A1 @@ -425,7 +425,7 @@ endef TARGET_DEVICES += dlink_dir-835-a1 define Device/dlink_dir-842-c - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-842 KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma @@ -468,7 +468,7 @@ TARGET_DEVICES += dlink_dir-842-c3 define Device/dlink_dir-859-a1 $(Device/seama) - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-859 DEVICE_VARIANT := A1 @@ -480,7 +480,7 @@ endef TARGET_DEVICES += dlink_dir-859-a1 define Device/elecom_wrc-1750ghbk2-i - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1750GHBK2-I/C IMAGE_SIZE := 15808k @@ -491,7 +491,7 @@ endef TARGET_DEVICES += elecom_wrc-1750ghbk2-i define Device/elecom_wrc-300ghbk2-i - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-300GHBK2-I IMAGE_SIZE := 7616k @@ -501,7 +501,7 @@ endef TARGET_DEVICES += elecom_wrc-300ghbk2-i define Device/embeddedwireless_dorin - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_VENDOR := Embedded Wireless DEVICE_MODEL := Dorin DEVICE_PACKAGES := kmod-usb-chipidea2 @@ -510,7 +510,7 @@ endef TARGET_DEVICES += embeddedwireless_dorin define Device/engenius_ecb1750 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := EnGenius DEVICE_MODEL := ECB1750 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -524,7 +524,7 @@ endef TARGET_DEVICES += engenius_ecb1750 define Device/engenius_epg5000 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := EnGenius DEVICE_MODEL := EPG5000 DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct kmod-usb2 @@ -538,7 +538,7 @@ endef TARGET_DEVICES += engenius_epg5000 define Device/engenius_ews511ap - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := EnGenius DEVICE_MODEL := EWS511AP DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct @@ -547,7 +547,7 @@ endef TARGET_DEVICES += engenius_ews511ap define Device/etactica_eg200 - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_VENDOR := eTactica DEVICE_MODEL := EG200 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \ @@ -558,7 +558,7 @@ endef TARGET_DEVICES += etactica_eg200 define Device/glinet_gl-ar150 - ATH_SOC := ar9330 + SOC := ar9330 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-AR150 DEVICE_PACKAGES := kmod-usb-chipidea2 @@ -568,7 +568,7 @@ endef TARGET_DEVICES += glinet_gl-ar150 define Device/glinet_gl-ar300m-common-nor - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := GL.iNet DEVICE_PACKAGES := kmod-usb2 IMAGE_SIZE := 16000k @@ -589,7 +589,7 @@ endef TARGET_DEVICES += glinet_gl-ar300m16 define Device/glinet_gl-ar750 - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-AR750 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct @@ -599,7 +599,7 @@ endef TARGET_DEVICES += glinet_gl-ar750 define Device/glinet_gl-x750 - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-X750 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct @@ -608,7 +608,7 @@ endef TARGET_DEVICES += glinet_gl-x750 define Device/iodata_etg3-r - ATH_SOC := ar9342 + SOC := ar9342 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := ETG3-R IMAGE_SIZE := 7680k @@ -617,7 +617,7 @@ endef TARGET_DEVICES += iodata_etg3-r define Device/iodata_wn-ac1167dgr - ATH_SOC := qca9557 + SOC := qca9557 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AC1167DGR IMAGE_SIZE := 14656k @@ -630,7 +630,7 @@ endef TARGET_DEVICES += iodata_wn-ac1167dgr define Device/iodata_wn-ac1600dgr - ATH_SOC := qca9557 + SOC := qca9557 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AC1600DGR IMAGE_SIZE := 14656k @@ -643,7 +643,7 @@ endef TARGET_DEVICES += iodata_wn-ac1600dgr define Device/iodata_wn-ac1600dgr2 - ATH_SOC := qca9557 + SOC := qca9557 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AC1600DGR2/DGR3 IMAGE_SIZE := 14656k @@ -656,7 +656,7 @@ endef TARGET_DEVICES += iodata_wn-ac1600dgr2 define Device/iodata_wn-ag300dgr - ATH_SOC := ar1022 + SOC := ar1022 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AG300DGR IMAGE_SIZE := 15424k @@ -669,7 +669,7 @@ endef TARGET_DEVICES += iodata_wn-ag300dgr define Device/jjplus_ja76pf2 - ATH_SOC := ar7161 + SOC := ar7161 DEVICE_VENDOR := jjPlus DEVICE_MODEL := JA76PF2 DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools fconfig @@ -684,7 +684,7 @@ endef TARGET_DEVICES += jjplus_ja76pf2 define Device/librerouter_librerouter-v1 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := Librerouter DEVICE_MODEL := LibreRouter DEVICE_VARIANT := v1 @@ -694,7 +694,7 @@ endef TARGET_DEVICES += librerouter_librerouter-v1 define Device/nec_wg1200cr - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := NEC DEVICE_MODEL := Aterm WG1200CR IMAGE_SIZE := 7616k @@ -711,7 +711,7 @@ endef TARGET_DEVICES += nec_wg1200cr define Device/nec_wg800hp - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := NEC DEVICE_MODEL := Aterm WG800HP IMAGE_SIZE := 7104k @@ -724,7 +724,7 @@ endef TARGET_DEVICES += nec_wg800hp define Device/netgear_ex6400_ex7300 - ATH_SOC := qca9558 + SOC := qca9558 NETGEAR_KERNEL_MAGIC := 0x27051956 NETGEAR_BOARD_ID := EX7300series NETGEAR_HW_ID := 29765104+16+0+128 @@ -748,7 +748,7 @@ endef TARGET_DEVICES += netgear_ex7300 define Device/netgear_wndr3x00 - ATH_SOC := ar7161 + SOC := ar7161 IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ append-rootfs | pad-rootfs DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ @@ -805,7 +805,7 @@ endef TARGET_DEVICES += netgear_wndr3800ch define Device/netgear_wnr2200_common - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_MODEL := WNR2200 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport NETGEAR_KERNEL_MAGIC := 0x32323030 @@ -839,7 +839,7 @@ endef TARGET_DEVICES += netgear_wnr2200-16m define Device/ocedo_koala - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := Ocedo DEVICE_MODEL := Koala DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -851,7 +851,7 @@ endef TARGET_DEVICES += ocedo_koala define Device/ocedo_raccoon - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := Ocedo DEVICE_MODEL := Raccoon IMAGE_SIZE := 7424k @@ -861,7 +861,7 @@ endef TARGET_DEVICES += ocedo_raccoon define Device/ocedo_ursus - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := Ocedo DEVICE_MODEL := Ursus DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct @@ -872,7 +872,7 @@ endef TARGET_DEVICES += ocedo_ursus define Device/openmesh_om5p-ac-v2 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := OpenMesh DEVICE_MODEL := OM5P-AC DEVICE_VARIANT := v2 @@ -883,7 +883,7 @@ endef TARGET_DEVICES += openmesh_om5p-ac-v2 define Device/pcs_cap324 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := PowerCloud Systems DEVICE_MODEL := CAP324 IMAGE_SIZE := 16000k @@ -892,7 +892,7 @@ endef TARGET_DEVICES += pcs_cap324 define Device/pcs_cr3000 - ATH_SOC := ar9341 + SOC := ar9341 DEVICE_VENDOR := PowerCloud Systems DEVICE_MODEL := CR3000 IMAGE_SIZE := 7808k @@ -901,7 +901,7 @@ endef TARGET_DEVICES += pcs_cr3000 define Device/pcs_cr5000 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := PowerCloud Systems DEVICE_MODEL := CR5000 DEVICE_PACKAGES := kmod-usb2 @@ -911,7 +911,7 @@ endef TARGET_DEVICES += pcs_cr5000 define Device/phicomm_k2t - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2T IMAGE_SIZE := 15744k @@ -923,7 +923,7 @@ TARGET_DEVICES += phicomm_k2t define Device/pisen_ts-d084 $(Device/tplink-8mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_VENDOR := PISEN DEVICE_MODEL := TS-D084 DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2 @@ -932,7 +932,7 @@ endef TARGET_DEVICES += pisen_ts-d084 define Device/pisen_wmb001n - ATH_SOC := ar9341 + SOC := ar9341 DEVICE_VENDOR := PISEN DEVICE_MODEL := WMB001N IMAGE_SIZE := 14080k @@ -951,7 +951,7 @@ TARGET_DEVICES += pisen_wmb001n define Device/pisen_wmm003n $(Device/tplink-8mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_VENDOR := PISEN DEVICE_MODEL := Cloud Easy Power (WMM003N) DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2 @@ -961,7 +961,7 @@ TARGET_DEVICES += pisen_wmm003n define Device/qihoo_c301 $(Device/seama) - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := Qihoo DEVICE_MODEL := C301 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct \ @@ -973,7 +973,7 @@ endef TARGET_DEVICES += qihoo_c301 define Device/rosinson_wr818 - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := Rosinson DEVICE_MODEL := WR818 IMAGE_SIZE := 15872k @@ -982,7 +982,7 @@ endef TARGET_DEVICES += rosinson_wr818 define Device/sitecom_wlr-7100 - ATH_SOC := ar1022 + SOC := ar1022 DEVICE_VENDOR := Sitecom DEVICE_MODEL := WLR-7100 DEVICE_VARIANT := v1 002 @@ -996,7 +996,7 @@ endef TARGET_DEVICES += sitecom_wlr-7100 define Device/trendnet_tew-823dru - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := Trendnet DEVICE_MODEL := TEW-823DRU DEVICE_VARIANT := v1.0R @@ -1015,7 +1015,7 @@ TARGET_DEVICES += trendnet_tew-823dru define Device/wd_mynet-n750 $(Device/seama) - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := Western Digital DEVICE_MODEL := My Net N750 IMAGE_SIZE := 15872k @@ -1026,7 +1026,7 @@ endef TARGET_DEVICES += wd_mynet-n750 define Device/wd_mynet-wifi-rangeextender - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := Western Digital DEVICE_MODEL := My Net Wi-Fi Range Extender DEVICE_PACKAGES := rssileds nvram -swconfig @@ -1040,7 +1040,7 @@ endef TARGET_DEVICES += wd_mynet-wifi-rangeextender define Device/winchannel_wb2000 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := Winchannel DEVICE_MODEL := WB2000 IMAGE_SIZE := 15872k @@ -1050,7 +1050,7 @@ endef TARGET_DEVICES += winchannel_wb2000 define Device/xiaomi_mi-router-4q - ATH_SOC := qca9561 + SOC := qca9561 DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 4Q IMAGE_SIZE := 14336k @@ -1058,7 +1058,7 @@ endef TARGET_DEVICES += xiaomi_mi-router-4q define Device/yuncore_a770 - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := YunCore DEVICE_MODEL := A770 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct @@ -1069,7 +1069,7 @@ endef TARGET_DEVICES += yuncore_a770 define Device/yuncore_a782 - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := YunCore DEVICE_MODEL := A782 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct @@ -1080,7 +1080,7 @@ endef TARGET_DEVICES += yuncore_a782 define Device/yuncore_xd4200 - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := YunCore DEVICE_MODEL := XD4200 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct @@ -1091,7 +1091,7 @@ endef TARGET_DEVICES += yuncore_xd4200 define Device/zbtlink_zbt-wd323 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := ZBT DEVICE_MODEL := WD323 IMAGE_SIZE := 16000k diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 50cf6831cc..c6a1441ed9 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -29,7 +29,7 @@ define Build/zyxel-factory endef define Device/aerohive_hiveap-121 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_VENDOR := Aerohive DEVICE_MODEL := HiveAP 121 DEVICE_PACKAGES := kmod-usb2 @@ -47,7 +47,7 @@ endef TARGET_DEVICES += aerohive_hiveap-121 define Device/glinet_gl-ar300m-common-nand - ATH_SOC := qca9531 + SOC := qca9531 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-AR300M DEVICE_PACKAGES := kmod-usb2 @@ -77,7 +77,7 @@ endef TARGET_DEVICES += glinet_gl-ar300m-nor define Device/glinet_gl-ar750s-common - ATH_SOC := qca9563 + SOC := qca9563 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-AR750S DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \ @@ -129,7 +129,7 @@ define Device/netgear_ath79_nand endef define Device/netgear_wndr3700-v4 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_MODEL := WNDR3700 DEVICE_VARIANT := v4 NETGEAR_KERNEL_MAGIC := 0x33373033 @@ -141,7 +141,7 @@ endef TARGET_DEVICES += netgear_wndr3700-v4 define Device/netgear_wndr4300 - ATH_SOC := ar9344 + SOC := ar9344 DEVICE_MODEL := WNDR4300 NETGEAR_KERNEL_MAGIC := 0x33373033 NETGEAR_BOARD_ID := WNDR4300 @@ -152,7 +152,7 @@ endef TARGET_DEVICES += netgear_wndr4300 define Device/zyxel_nbg6716 - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG6716 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk index a65468522d..591ea57222 100644 --- a/target/linux/ath79/image/tiny-netgear.mk +++ b/target/linux/ath79/image/tiny-netgear.mk @@ -1,7 +1,7 @@ include ./common-netgear.mk define Device/netgear_ar7240 - ATH_SOC := ar7240 + SOC := ar7240 NETGEAR_KERNEL_MAGIC := 0x32303631 KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGE_SIZE := 3712k @@ -30,7 +30,7 @@ endef TARGET_DEVICES += on_n150r define Device/netgear_wnr1000-v2 - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := WNR1000 DEVICE_VARIANT := v2 NETGEAR_KERNEL_MAGIC := 0x31303031 @@ -45,7 +45,7 @@ endef TARGET_DEVICES += netgear_wnr1000-v2 define Device/netgear_wnr2000-v3 - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_MODEL := WNR2000 DEVICE_VARIANT := v3 NETGEAR_KERNEL_MAGIC := 0x32303033 diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 3fc933392d..172f22f320 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -2,7 +2,7 @@ include ./common-tp-link.mk define Device/tplink_tl-mr10u $(Device/tplink-4mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-MR10U DEVICE_PACKAGES := kmod-usb-chipidea2 TPLINK_HWID := 0x00100101 @@ -13,7 +13,7 @@ TARGET_DEVICES += tplink_tl-mr10u define Device/tplink_tl-mr3020-v1 $(Device/tplink-4mlzma) IMAGE_SIZE := 3840k - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-MR3020 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport @@ -24,7 +24,7 @@ TARGET_DEVICES += tplink_tl-mr3020-v1 define Device/tplink_tl-mr3040-v2 $(Device/tplink-4mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-MR3040 DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-ledtrig-usbport @@ -35,7 +35,7 @@ TARGET_DEVICES += tplink_tl-mr3040-v2 define Device/tplink_tl-mr3220-v1 $(Device/tplink-4m) - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_MODEL := TL-MR3220 DEVICE_VARIANT := v1 TPLINK_HWID := 0x32200001 @@ -46,7 +46,7 @@ TARGET_DEVICES += tplink_tl-mr3220-v1 define Device/tplink_tl-mr3420-v1 $(Device/tplink-4m) - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_MODEL := TL-MR3420 DEVICE_VARIANT := v1 TPLINK_HWID := 0x34200001 @@ -57,7 +57,7 @@ TARGET_DEVICES += tplink_tl-mr3420-v1 define Device/tplink_tl-mr3420-v2 $(Device/tplink-4mlzma) - ATH_SOC := ar9341 + SOC := ar9341 DEVICE_MODEL := TL-MR3420 DEVICE_VARIANT := v2 TPLINK_HWID := 0x34200002 @@ -68,7 +68,7 @@ TARGET_DEVICES += tplink_tl-mr3420-v2 define Device/tplink_tl-wa901nd-v2 $(Device/tplink-4m) - ATH_SOC := ar9132 + SOC := ar9132 DEVICE_MODEL := TL-WA901ND DEVICE_VARIANT := v2 TPLINK_HWID := 0x09010002 @@ -77,7 +77,7 @@ TARGET_DEVICES += tplink_tl-wa901nd-v2 define Device/tplink_tl-wr703n $(Device/tplink-4mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-WR703N DEVICE_PACKAGES := kmod-usb-chipidea2 TPLINK_HWID := 0x07030101 @@ -87,7 +87,7 @@ TARGET_DEVICES += tplink_tl-wr703n define Device/tplink_tl-wr740n-v1 $(Device/tplink-4m) - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := TL-WR740N DEVICE_VARIANT := v1/v2 TPLINK_HWID := 0x07400001 @@ -96,7 +96,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v1 define Device/tplink_tl-wr740n-v3 $(Device/tplink-4m) - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := TL-WR740N DEVICE_VARIANT := v3 TPLINK_HWID := 0x07400003 @@ -105,7 +105,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v3 define Device/tplink_tl-wr740n-v4 $(Device/tplink-4mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-WR740N DEVICE_VARIANT := v4 TPLINK_HWID := 0x07400004 @@ -115,7 +115,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v4 define Device/tplink_tl-wr741-v1 $(Device/tplink-4m) - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := TL-WR741N/ND DEVICE_VARIANT := v1/v2 TPLINK_HWID := 0x07410001 @@ -124,7 +124,7 @@ TARGET_DEVICES += tplink_tl-wr741-v1 define Device/tplink_tl-wr741nd-v4 $(Device/tplink-4mlzma) - ATH_SOC := ar9331 + SOC := ar9331 DEVICE_MODEL := TL-WR741N/ND DEVICE_VARIANT := v4 TPLINK_HWID := 0x07410004 @@ -134,7 +134,7 @@ TARGET_DEVICES += tplink_tl-wr741nd-v4 define Device/tplink_tl-wr743nd-v1 $(Device/tplink-4m) - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := TL-WR743ND DEVICE_VARIANT := v1 TPLINK_HWID := 0x07430001 @@ -143,7 +143,7 @@ TARGET_DEVICES += tplink_tl-wr743nd-v1 define Device/tplink_tl-wr841-v5 $(Device/tplink-4m) - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v5/v6 TPLINK_HWID := 0x08410005 @@ -152,7 +152,7 @@ TARGET_DEVICES += tplink_tl-wr841-v5 define Device/tplink_tl-wr841-v7 $(Device/tplink-4m) - ATH_SOC := ar7241 + SOC := ar7241 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v7 TPLINK_HWID := 0x08410007 @@ -162,7 +162,7 @@ TARGET_DEVICES += tplink_tl-wr841-v7 define Device/tplink_tl-wr841-v8 $(Device/tplink-4mlzma) - ATH_SOC := ar9341 + SOC := ar9341 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v8 TPLINK_HWID := 0x08410008 @@ -172,7 +172,7 @@ TARGET_DEVICES += tplink_tl-wr841-v8 define Device/tplink_tl-wr841-v9 $(Device/tplink-4mlzma) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v9 TPLINK_HWID := 0x08410009 @@ -182,7 +182,7 @@ TARGET_DEVICES += tplink_tl-wr841-v9 define Device/tplink_tl-wr841-v10 $(Device/tplink-4mlzma) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v10 TPLINK_HWID := 0x08410010 @@ -192,7 +192,7 @@ TARGET_DEVICES += tplink_tl-wr841-v10 define Device/tplink_tl-wr841-v11 $(Device/tplink-4mlzma) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v11 TPLINK_HWID := 0x08410011 @@ -205,7 +205,7 @@ TARGET_DEVICES += tplink_tl-wr841-v11 define Device/tplink_tl-wr841-v12 $(Device/tplink-4mlzma) - ATH_SOC := qca9533 + SOC := qca9533 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v12 TPLINK_HWID := 0x08410012 @@ -218,7 +218,7 @@ TARGET_DEVICES += tplink_tl-wr841-v12 define Device/tplink_tl-wr940n-v3 $(Device/tplink-4mlzma) - ATH_SOC := tp9343 + SOC := tp9343 DEVICE_MODEL := TL-WR940N DEVICE_VARIANT := v3 TPLINK_HWID := 0x09410006 @@ -228,7 +228,7 @@ TARGET_DEVICES += tplink_tl-wr940n-v3 define Device/tplink_tl-wr940n-v4 $(Device/tplink-4mlzma) - ATH_SOC := tp9343 + SOC := tp9343 DEVICE_MODEL := TL-WR940N DEVICE_VARIANT := v4 TPLINK_HWID := 0x09400004 @@ -242,7 +242,7 @@ TARGET_DEVICES += tplink_tl-wr940n-v4 define Device/tplink_tl-wr941-v2 $(Device/tplink-4m) - ATH_SOC := ar9132 + SOC := ar9132 DEVICE_MODEL := TL-WR941ND DEVICE_VARIANT := v2/v3 DEVICE_ALT0_VENDOR := TP-Link @@ -255,7 +255,7 @@ TARGET_DEVICES += tplink_tl-wr941-v2 define Device/tplink_tl-wr941-v4 $(Device/tplink-4m) - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_MODEL := TL-WR941ND DEVICE_VARIANT := v4 DEVICE_ALT0_VENDOR := TP-Link @@ -267,7 +267,7 @@ TARGET_DEVICES += tplink_tl-wr941-v4 define Device/tplink_tl-wr941nd-v6 $(Device/tplink-4mlzma) - ATH_SOC := tp9343 + SOC := tp9343 DEVICE_MODEL := TL-WR941ND DEVICE_VARIANT := v6 TPLINK_HWID := 0x09410006 @@ -277,7 +277,7 @@ TARGET_DEVICES += tplink_tl-wr941nd-v6 define Device/tplink_tl-wr941n-v7-cn $(Device/tplink-4mlzma) - ATH_SOC := qca9558 + SOC := qca9558 DEVICE_MODEL := TL-WR941N DEVICE_VARIANT := v7 (CN) TPLINK_HWID := 0x09410007 diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 039925e019..b974777c61 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -1,7 +1,7 @@ include ./common-buffalo.mk define Device/buffalo_whr-g301n - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-G301N IMAGE_SIZE := 3712k @@ -16,7 +16,7 @@ endef TARGET_DEVICES += buffalo_whr-g301n define Device/dlink_dir-615-e4 - ATH_SOC := ar7240 + SOC := ar7240 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-615 DEVICE_VARIANT := E4 @@ -34,7 +34,7 @@ endef TARGET_DEVICES += dlink_dir-615-e4 define Device/pqi_air-pen - ATH_SOC := ar9330 + SOC := ar9330 DEVICE_VENDOR := PQI DEVICE_MODEL := Air-Pen DEVICE_PACKAGES := kmod-usb2 From 58e71e322bc0e0edd08157075e9022c15ae33ec5 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 20 Dec 2019 01:15:57 +0100 Subject: [PATCH 058/480] ramips: rename MTK_SOC to SOC This replaces MTK_SOC by the newly introduced common SOC device variable. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/image/Makefile | 3 +- target/linux/ramips/image/mt7620.mk | 186 ++++++++++++------------ target/linux/ramips/image/mt7621.mk | 128 ++++++++--------- target/linux/ramips/image/mt76x8.mk | 78 +++++------ target/linux/ramips/image/rt288x.mk | 16 +-- target/linux/ramips/image/rt305x.mk | 210 ++++++++++++++-------------- target/linux/ramips/image/rt3883.mk | 20 +-- 7 files changed, 320 insertions(+), 321 deletions(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 4f65583f13..b6f82c1151 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -23,9 +23,8 @@ KERNEL_DTB = kernel-bin | append-dtb | lzma define Device/Default PROFILES = Default KERNEL := $(KERNEL_DTB) | uImage lzma - MTK_SOC := DEVICE_DTS_DIR := ../dts - DEVICE_DTS = $$(MTK_SOC)_$(1) + DEVICE_DTS = $$(SOC)_$(1) IMAGES := sysupgrade.bin SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 5cd964691a..291495ec0d 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -17,7 +17,7 @@ define Build/elecom-header endef define Device/aigale_ai-br100 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7936k DEVICE_VENDOR := Aigale DEVICE_MODEL := Ai-BR100 @@ -27,7 +27,7 @@ endef TARGET_DEVICES += aigale_ai-br100 define Device/alfa-network_ac1200rm - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := AC1200RM @@ -36,7 +36,7 @@ endef TARGET_DEVICES += alfa-network_ac1200rm define Device/alfa-network_r36m-e4g - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := R36M-E4G @@ -46,7 +46,7 @@ endef TARGET_DEVICES += alfa-network_r36m-e4g define Device/alfa-network_tube-e4g - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := Tube-E4G @@ -65,7 +65,7 @@ define Device/amit_jboot endef define Device/Archer - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := TP-Link TPLINK_HWREVADD := 0 TPLINK_HVERSION := 3 @@ -76,7 +76,7 @@ define Device/Archer endef define Device/asus_rp-n53 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Asus DEVICE_MODEL := RP-N53 @@ -86,7 +86,7 @@ endef TARGET_DEVICES += asus_rp-n53 define Device/asus_rt-ac51u - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Asus DEVICE_MODEL := RT-AC51U @@ -97,7 +97,7 @@ endef TARGET_DEVICES += asus_rt-ac51u define Device/asus_rt-n12p - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 16064k DEVICE_VENDOR := Asus DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1 @@ -106,7 +106,7 @@ endef TARGET_DEVICES += asus_rt-n12p define Device/asus_rt-n14u - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 16064k DEVICE_VENDOR := Asus DEVICE_MODEL := RT-N14u @@ -116,7 +116,7 @@ endef TARGET_DEVICES += asus_rt-n14u define Device/bdcom_wap2100-sk - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15808k DEVICE_VENDOR := BDCOM DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130) @@ -126,7 +126,7 @@ endef TARGET_DEVICES += bdcom_wap2100-sk define Device/buffalo_whr-1166d - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-1166D @@ -136,7 +136,7 @@ endef TARGET_DEVICES += buffalo_whr-1166d define Device/buffalo_whr-300hp2 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-300HP2 @@ -145,7 +145,7 @@ endef TARGET_DEVICES += buffalo_whr-300hp2 define Device/buffalo_whr-600d - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-600D @@ -155,7 +155,7 @@ endef TARGET_DEVICES += buffalo_whr-600d define Device/buffalo_wmr-300 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WMR-300 @@ -164,7 +164,7 @@ endef TARGET_DEVICES += buffalo_wmr-300 define Device/comfast_cf-wr800n - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k DEVICE_VENDOR := Comfast DEVICE_MODEL := CF-WR800N @@ -174,7 +174,7 @@ TARGET_DEVICES += comfast_cf-wr800n define Device/dlink_dch-m225 $(Device/seama) - MTK_SOC := mt7620a + SOC := mt7620a BLOCKSIZE := 4k SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b IMAGE_SIZE := 6848k @@ -187,7 +187,7 @@ TARGET_DEVICES += dlink_dch-m225 define Device/dlink_dir-510l $(Device/amit_jboot) - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 14208k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-510L @@ -200,7 +200,7 @@ endef TARGET_DEVICES += dlink_dir-510l define Device/dlink_dir-810l - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_PACKAGES := kmod-mt76x0e DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-810L @@ -211,7 +211,7 @@ TARGET_DEVICES += dlink_dir-810l define Device/dlink_dwr-116-a1 $(Device/amit_jboot) - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 8064k DEVICE_VENDOR := D-Link DEVICE_MODEL := DWR-116 @@ -224,7 +224,7 @@ TARGET_DEVICES += dlink_dwr-116-a1 define Device/dlink_dwr-118-a1 $(Device/amit_jboot) - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16256k DEVICE_VENDOR := D-Link DEVICE_MODEL := DWR-118 @@ -238,7 +238,7 @@ TARGET_DEVICES += dlink_dwr-118-a1 define Device/dlink_dwr-118-a2 $(Device/amit_jboot) - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16256k DEVICE_VENDOR := D-Link DEVICE_MODEL := DWR-118 @@ -252,7 +252,7 @@ TARGET_DEVICES += dlink_dwr-118-a2 define Device/dlink_dwr-921-c1 $(Device/amit_jboot) - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 16256k DEVICE_VENDOR := D-Link DEVICE_MODEL := DWR-921 @@ -277,7 +277,7 @@ TARGET_DEVICES += dlink_dwr-921-c3 define Device/dlink_dwr-922-e2 $(Device/amit_jboot) - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 16256k DEVICE_VENDOR := D-Link DEVICE_MODEL := DWR-922 @@ -290,7 +290,7 @@ endef TARGET_DEVICES += dlink_dwr-922-e2 define Device/dovado_tiny-ac - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Dovado DEVICE_MODEL := Tiny AC @@ -300,7 +300,7 @@ endef TARGET_DEVICES += dovado_tiny-ac define Device/edimax_br-6478ac-v2 - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := BR-6478AC DEVICE_VARIANT := V2 @@ -315,7 +315,7 @@ endef TARGET_DEVICES += edimax_br-6478ac-v2 define Device/edimax_ew-7476rpc - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := EW-7476RPC BLOCKSIZE := 4k @@ -328,7 +328,7 @@ endef TARGET_DEVICES += edimax_ew-7476rpc define Device/edimax_ew-7478ac - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := EW-7478AC BLOCKSIZE := 4k @@ -341,7 +341,7 @@ endef TARGET_DEVICES += edimax_ew-7478ac define Device/edimax_ew-7478apc - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := EW-7478APC BLOCKSIZE := 4k @@ -355,7 +355,7 @@ endef TARGET_DEVICES += edimax_ew-7478apc define Device/elecom_wrh-300cr - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 14272k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -368,7 +368,7 @@ endef TARGET_DEVICES += elecom_wrh-300cr define Device/engenius_esr600 - MTK_SOC := mt7620a + SOC := mt7620a BLOCKSIZE := 64k IMAGE_SIZE := 15616k IMAGES += factory.dlf @@ -382,7 +382,7 @@ endef TARGET_DEVICES += engenius_esr600 define Device/fon_fon2601 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15936k DEVICE_VENDOR := Fon DEVICE_MODEL := FON2601 @@ -394,7 +394,7 @@ endef TARGET_DEVICES += fon_fon2601 define Device/glinet_gl-mt300a - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT300A @@ -404,7 +404,7 @@ endef TARGET_DEVICES += glinet_gl-mt300a define Device/glinet_gl-mt300n - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT300N @@ -414,7 +414,7 @@ endef TARGET_DEVICES += glinet_gl-mt300n define Device/glinet_gl-mt750 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT750 @@ -424,7 +424,7 @@ endef TARGET_DEVICES += glinet_gl-mt750 define Device/head-weblink_hdrm200 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Head Weblink DEVICE_MODEL := HDRM2000 @@ -434,7 +434,7 @@ endef TARGET_DEVICES += head-weblink_hdrm200 define Device/hiwifi_hc5661 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5661 @@ -444,7 +444,7 @@ endef TARGET_DEVICES += hiwifi_hc5661 define Device/hiwifi_hc5761 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5761 @@ -455,7 +455,7 @@ endef TARGET_DEVICES += hiwifi_hc5761 define Device/hiwifi_hc5861 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5861 @@ -466,7 +466,7 @@ endef TARGET_DEVICES += hiwifi_hc5861 define Device/hnet_c108 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := HNET DEVICE_MODEL := C108 @@ -476,7 +476,7 @@ endef TARGET_DEVICES += hnet_c108 define Device/iodata_wn-ac1167gr - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AC1167GR IMAGE_SIZE := 6864k @@ -488,7 +488,7 @@ endef TARGET_DEVICES += iodata_wn-ac1167gr define Device/iodata_wn-ac733gr3 - MTK_SOC := mt7620a + SOC := mt7620a DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AC733GR3 IMAGE_SIZE := 6992k @@ -500,7 +500,7 @@ endef TARGET_DEVICES += iodata_wn-ac733gr3 define Device/iptime_a104ns - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 8000k UIMAGE_NAME := a104ns DEVICE_VENDOR := ipTIME @@ -511,7 +511,7 @@ endef TARGET_DEVICES += iptime_a104ns define Device/kimax_u25awf-h1 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Kimax DEVICE_MODEL := U25AWF @@ -523,7 +523,7 @@ endef TARGET_DEVICES += kimax_u25awf-h1 define Device/kimax_u35wf - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 16064k DEVICE_VENDOR := Kimax DEVICE_MODEL := U35WF @@ -533,7 +533,7 @@ endef TARGET_DEVICES += kimax_u35wf define Device/kingston_mlw221 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 15744k DEVICE_VENDOR := Kingston DEVICE_MODEL := MLW221 @@ -543,7 +543,7 @@ endef TARGET_DEVICES += kingston_mlw221 define Device/kingston_mlwg2 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 15744k DEVICE_VENDOR := Kingston DEVICE_MODEL := MLWG2 @@ -554,7 +554,7 @@ TARGET_DEVICES += kingston_mlwg2 define Device/lava_lr-25g001 $(Device/amit_jboot) - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16256k DEVICE_VENDOR := LAVA DEVICE_MODEL := LR-25G001 @@ -566,7 +566,7 @@ endef TARGET_DEVICES += lava_lr-25g001 define Device/lenovo_newifi-y1 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Lenovo DEVICE_MODEL := Y1 @@ -576,7 +576,7 @@ endef TARGET_DEVICES += lenovo_newifi-y1 define Device/lenovo_newifi-y1s - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Lenovo DEVICE_MODEL := Y1S @@ -586,7 +586,7 @@ endef TARGET_DEVICES += lenovo_newifi-y1s define Device/linksys_e1700 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -598,7 +598,7 @@ endef TARGET_DEVICES += linksys_e1700 define Device/microduino_microwrt - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16128k DEVICE_VENDOR := Microduino DEVICE_MODEL := MicroWRT @@ -608,7 +608,7 @@ endef TARGET_DEVICES += microduino_microwrt define Device/netgear_ex2700 - MTK_SOC := mt7620a + SOC := mt7620a NETGEAR_HW_ID := 29764623+4+0+32+2x2+0 NETGEAR_BOARD_ID := EX2700 BLOCKSIZE := 4k @@ -625,7 +625,7 @@ endef TARGET_DEVICES += netgear_ex2700 define Device/netgear_ex3700 - MTK_SOC := mt7620a + SOC := mt7620a NETGEAR_BOARD_ID := U12H319T00_NETGEAR BLOCKSIZE := 4k IMAGE_SIZE := 7744k @@ -640,7 +640,7 @@ endef TARGET_DEVICES += netgear_ex3700 define Device/netgear_ex6130 - MTK_SOC := mt7620a + SOC := mt7620a NETGEAR_BOARD_ID := U12H319T50_NETGEAR BLOCKSIZE := 4k IMAGE_SIZE := 7744k @@ -654,7 +654,7 @@ endef TARGET_DEVICES += netgear_ex6130 define Device/netgear_wn3000rp-v3 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k NETGEAR_HW_ID := 29764836+8+0+32+2x2+0 NETGEAR_BOARD_ID := WN3000RPv3 @@ -672,7 +672,7 @@ endef TARGET_DEVICES += netgear_wn3000rp-v3 define Device/nexx_wt3020-4m - MTK_SOC := mt7620n + SOC := mt7620n BLOCKSIZE := 4k IMAGE_SIZE := 3776k IMAGES += factory.bin @@ -686,7 +686,7 @@ endef TARGET_DEVICES += nexx_wt3020-4m define Device/nexx_wt3020-8m - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -700,7 +700,7 @@ endef TARGET_DEVICES += nexx_wt3020-8m define Device/ohyeah_oy-0001 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Oh Yeah DEVICE_MODEL := OY-0001 @@ -710,7 +710,7 @@ endef TARGET_DEVICES += ohyeah_oy-0001 define Device/phicomm_k2g - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7552k DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2G @@ -719,7 +719,7 @@ endef TARGET_DEVICES += phicomm_k2g define Device/phicomm_psg1208 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Phicomm DEVICE_MODEL := PSG1208 @@ -729,7 +729,7 @@ endef TARGET_DEVICES += phicomm_psg1208 define Device/phicomm_psg1218a - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Phicomm DEVICE_MODEL := PSG1218 @@ -740,7 +740,7 @@ endef TARGET_DEVICES += phicomm_psg1218a define Device/phicomm_psg1218b - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Phicomm DEVICE_MODEL := PSG1218 @@ -751,7 +751,7 @@ endef TARGET_DEVICES += phicomm_psg1218b define Device/planex_cs-qr10 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Planex DEVICE_MODEL := CS-QR10 @@ -762,7 +762,7 @@ endef TARGET_DEVICES += planex_cs-qr10 define Device/planex_db-wrt01 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Planex DEVICE_MODEL := DB-WRT01 @@ -771,7 +771,7 @@ endef TARGET_DEVICES += planex_db-wrt01 define Device/planex_mzk-750dhp - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := Planex DEVICE_MODEL := MZK-750DHP @@ -781,7 +781,7 @@ endef TARGET_DEVICES += planex_mzk-750dhp define Device/planex_mzk-ex300np - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7360k DEVICE_VENDOR := Planex DEVICE_MODEL := MZK-EX300NP @@ -790,7 +790,7 @@ endef TARGET_DEVICES += planex_mzk-ex300np define Device/planex_mzk-ex750np - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7360k DEVICE_VENDOR := Planex DEVICE_MODEL := MZK-EX750NP @@ -800,7 +800,7 @@ endef TARGET_DEVICES += planex_mzk-ex750np define Device/ralink_mt7620a-evb - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7620a EVB @@ -808,7 +808,7 @@ endef TARGET_DEVICES += ralink_mt7620a-evb define Device/ralink_mt7620a-mt7530-evb - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7620a + MT7530 EVB @@ -817,7 +817,7 @@ endef TARGET_DEVICES += ralink_mt7620a-mt7530-evb define Device/ralink_mt7620a-mt7610e-evb - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7620a + MT7610e EVB @@ -827,7 +827,7 @@ endef TARGET_DEVICES += ralink_mt7620a-mt7610e-evb define Device/ralink_mt7620a-v22sg-evb - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 130560k DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7620a V22SG @@ -836,7 +836,7 @@ endef TARGET_DEVICES += ralink_mt7620a-v22sg-evb define Device/ravpower_wd03 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k DEVICE_VENDOR := Ravpower DEVICE_MODEL := WD03 @@ -845,7 +845,7 @@ endef TARGET_DEVICES += ravpower_wd03 define Device/sanlinking_d240 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Sanlinking Technologies DEVICE_MODEL := D240 @@ -855,7 +855,7 @@ endef TARGET_DEVICES += sanlinking_d240 define Device/sercomm_na930 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 20480k DEVICE_VENDOR := Sercomm DEVICE_MODEL := NA930 @@ -939,7 +939,7 @@ endef TARGET_DEVICES += tplink_archer-mr200 define Device/vonets_var11n-300 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 3776k BLOCKSIZE := 4k DEVICE_VENDOR := Vonets @@ -948,7 +948,7 @@ endef TARGET_DEVICES += vonets_var11n-300 define Device/wrtnode_wrtnode - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 16064k DEVICE_VENDOR := WRTNode DEVICE_MODEL := WRTNode @@ -958,7 +958,7 @@ endef TARGET_DEVICES += wrtnode_wrtnode define Device/xiaomi_miwifi-mini - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := MiWiFi Mini @@ -968,7 +968,7 @@ endef TARGET_DEVICES += xiaomi_miwifi-mini define Device/youku_yk1 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 32448k DEVICE_VENDOR := YOUKU DEVICE_MODEL := YK1 @@ -979,7 +979,7 @@ endef TARGET_DEVICES += youku_yk1 define Device/yukai_bocco - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := YUKAI Engineering DEVICE_MODEL := BOCCO @@ -989,7 +989,7 @@ endef TARGET_DEVICES += yukai_bocco define Device/zbtlink_zbt-ape522ii - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 15872k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-APE522II @@ -999,7 +999,7 @@ endef TARGET_DEVICES += zbtlink_zbt-ape522ii define Device/zbtlink_zbt-cpe102 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7552k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-CPE102 @@ -1009,7 +1009,7 @@ endef TARGET_DEVICES += zbtlink_zbt-cpe102 define Device/zbtlink_zbt-wa05 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7552k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WA05 @@ -1019,7 +1019,7 @@ endef TARGET_DEVICES += zbtlink_zbt-wa05 define Device/zbtlink_zbt-we1026-5g-16m - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1026-5G @@ -1030,7 +1030,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we1026-5g-16m define Device/zbtlink_zbt-we1026-h-32m - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 32448k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1026-H @@ -1041,7 +1041,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we1026-h-32m define Device/zbtlink_zbt-we2026 - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7552k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE2026 @@ -1050,7 +1050,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we2026 define Device/zbtlink_zbt-we826-16m - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE826 @@ -1061,7 +1061,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we826-16m define Device/zbtlink_zbt-we826-32m - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 32448k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE826 @@ -1072,7 +1072,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we826-32m define Device/zbtlink_zbt-we826-e - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 32448k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE826-E @@ -1082,7 +1082,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we826-e define Device/zbtlink_zbt-wr8305rt - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WR8305RT @@ -1092,7 +1092,7 @@ endef TARGET_DEVICES += zbtlink_zbt-wr8305rt define Device/zte_q7 - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 7872k DEVICE_VENDOR := ZTE DEVICE_MODEL := Q7 @@ -1102,7 +1102,7 @@ endef TARGET_DEVICES += zte_q7 define Device/zyxel_keenetic-omni - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Omni @@ -1115,7 +1115,7 @@ endef TARGET_DEVICES += zyxel_keenetic-omni define Device/zyxel_keenetic-omni-ii - MTK_SOC := mt7620n + SOC := mt7620n IMAGE_SIZE := 7872k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Omni II @@ -1129,7 +1129,7 @@ endef TARGET_DEVICES += zyxel_keenetic-omni-ii define Device/zyxel_keenetic-viva - MTK_SOC := mt7620a + SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Viva diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 0b178a8d6e..c0706f7998 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -85,7 +85,7 @@ define Build/wr1201-factory-header endef define Device/afoundry_ew1200 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := AFOUNDRY DEVICE_MODEL := EW1200 @@ -96,7 +96,7 @@ endef TARGET_DEVICES += afoundry_ew1200 define Device/alfa-network_quad-e4g - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := Quad-E4G @@ -106,7 +106,7 @@ endef TARGET_DEVICES += alfa-network_quad-e4g define Device/asiarf_ap7621-001 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-001 @@ -115,7 +115,7 @@ endef TARGET_DEVICES += asiarf_ap7621-001 define Device/asiarf_ap7621-nv1 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-NV1 @@ -124,7 +124,7 @@ endef TARGET_DEVICES += asiarf_ap7621-nv1 define Device/asus_rt-ac57u - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U IMAGE_SIZE := 16064k @@ -134,7 +134,7 @@ endef TARGET_DEVICES += asus_rt-ac57u define Device/asus_rt-ac65p - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC65P IMAGE_SIZE := 51200k @@ -151,7 +151,7 @@ endef TARGET_DEVICES += asus_rt-ac65p define Device/asus_rt-ac85p - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC85P IMAGE_SIZE := 51200k @@ -168,7 +168,7 @@ endef TARGET_DEVICES += asus_rt-ac85p define Device/buffalo_wsr-1166dhp - MTK_SOC := mt7621 + SOC := mt7621 IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata IMAGE_SIZE := 15936k DEVICE_VENDOR := Buffalo @@ -179,7 +179,7 @@ endef TARGET_DEVICES += buffalo_wsr-1166dhp define Device/buffalo_wsr-600dhp - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WSR-600DHP @@ -190,7 +190,7 @@ TARGET_DEVICES += buffalo_wsr-600dhp define Device/dlink_dir-860l-b1 $(Device/seama) - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 64k SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma @@ -204,7 +204,7 @@ endef TARGET_DEVICES += dlink_dir-860l-b1 define Device/d-team_newifi-d2 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D2 @@ -214,7 +214,7 @@ endef TARGET_DEVICES += d-team_newifi-d2 define Device/d-team_pbr-m1 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := PandoraBox DEVICE_MODEL := PBR-M1 @@ -225,7 +225,7 @@ endef TARGET_DEVICES += d-team_pbr-m1 define Device/edimax_rg21s - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Edimax DEVICE_MODEL := Gemini AC2600 RG21S @@ -237,7 +237,7 @@ endef TARGET_DEVICES += edimax_rg21s define Device/elecom_wrc-1167ghbk2-s - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 15488k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1167GHBK2-S @@ -249,7 +249,7 @@ endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s define Device/elecom_wrc-1900gst - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 11264k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1900GST @@ -260,7 +260,7 @@ endef TARGET_DEVICES += elecom_wrc-1900gst define Device/elecom_wrc-2533gst - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 11264k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-2533GST @@ -271,7 +271,7 @@ endef TARGET_DEVICES += elecom_wrc-2533gst define Device/firefly_firewrt - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Firefly DEVICE_MODEL := FireWRT @@ -281,7 +281,7 @@ endef TARGET_DEVICES += firefly_firewrt define Device/gehua_ghl-r-001 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := GeHua DEVICE_MODEL := GHL-R-001 @@ -291,7 +291,7 @@ endef TARGET_DEVICES += gehua_ghl-r-001 define Device/gnubee_gb-pc1 - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := GnuBee DEVICE_MODEL := Personal Cloud One DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620 @@ -300,7 +300,7 @@ endef TARGET_DEVICES += gnubee_gb-pc1 define Device/gnubee_gb-pc2 - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := GnuBee DEVICE_MODEL := Personal Cloud Two DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620 @@ -309,7 +309,7 @@ endef TARGET_DEVICES += gnubee_gb-pc2 define Device/hiwifi_hc5962 - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 2097152 @@ -327,7 +327,7 @@ endef TARGET_DEVICES += hiwifi_hc5962 define Device/iodata_wn-ax1167gr - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 15552k KERNEL_INITRAMFS := $$(KERNEL) | \ iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin @@ -338,7 +338,7 @@ endef TARGET_DEVICES += iodata_wn-ax1167gr define Device/iodata_wn-gx300gr - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 7616k DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-GX300GR @@ -347,7 +347,7 @@ endef TARGET_DEVICES += iodata_wn-gx300gr define Device/iodata_wnpr2600g - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WNPR2600G IMAGE_SIZE := 13952k @@ -359,7 +359,7 @@ endef TARGET_DEVICES += iodata_wnpr2600g define Device/iptime_a6ns-m - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16128k UIMAGE_NAME := a6nm DEVICE_VENDOR := ipTIME @@ -369,7 +369,7 @@ endef TARGET_DEVICES += iptime_a6ns-m define Device/jcg_jhr-ac876m - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -382,7 +382,7 @@ endef TARGET_DEVICES += jcg_jhr-ac876m define Device/lenovo_newifi-d1 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D1 @@ -393,7 +393,7 @@ endef TARGET_DEVICES += lenovo_newifi-d1 define Device/linksys_re6500 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 7872k DEVICE_VENDOR := Linksys DEVICE_MODEL := RE6500 @@ -403,7 +403,7 @@ endef TARGET_DEVICES += linksys_re6500 define Device/mediatek_ap-mt7621a-v60 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 7872k DEVICE_VENDOR := Mediatek DEVICE_MODEL := AP-MT7621A-V60 EVB @@ -412,7 +412,7 @@ endef TARGET_DEVICES += mediatek_ap-mt7621a-v60 define Device/mediatek_mt7621-eval-board - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 64k IMAGE_SIZE := 15104k DEVICE_VENDOR := MediaTek @@ -422,7 +422,7 @@ endef TARGET_DEVICES += mediatek_mt7621-eval-board define Device/MikroTik - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := MikroTik BLOCKSIZE := 64k IMAGE_SIZE := 16128k @@ -456,7 +456,7 @@ endef TARGET_DEVICES += mikrotik_rbm33g define Device/mqmaker_witi - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := MQmaker DEVICE_MODEL := WiTi @@ -467,7 +467,7 @@ endef TARGET_DEVICES += mqmaker_witi define Device/mtc_wr1201 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16000k DEVICE_VENDOR := MTC DEVICE_MODEL := Wireless Router WR1201 @@ -478,7 +478,7 @@ endef TARGET_DEVICES += mtc_wr1201 define Device/netgear_ex6150 - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6150 DEVICE_PACKAGES := kmod-mt76x2 wpad-basic @@ -491,7 +491,7 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 4096k @@ -559,7 +559,7 @@ endef TARGET_DEVICES += netgear_r6850 define Device/netgear_wndr3700-v5 - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 64k IMAGE_SIZE := 15232k SERCOMM_HWID := AYB @@ -583,7 +583,7 @@ endef TARGET_DEVICES += netgear_wndr3700-v5 define Device/netis_wf-2881 - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 FILESYSTEMS := squashfs @@ -600,7 +600,7 @@ endef TARGET_DEVICES += netis_wf-2881 define Device/phicomm_k2p - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 15744k DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2P @@ -612,7 +612,7 @@ endef TARGET_DEVICES += phicomm_k2p define Device/planex_vr500 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 65216k DEVICE_VENDOR := Planex DEVICE_MODEL := VR500 @@ -622,7 +622,7 @@ endef TARGET_DEVICES += planex_vr500 define Device/samknows_whitebox-v8 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := SamKnows DEVICE_MODEL := Whitebox 8 @@ -633,7 +633,7 @@ endef TARGET_DEVICES += samknows_whitebox-v8 define Device/storylink_sap-g3200u3 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 7872k DEVICE_VENDOR := STORYLiNK DEVICE_MODEL := SAP-G3200U3 @@ -643,7 +643,7 @@ endef TARGET_DEVICES += storylink_sap-g3200u3 define Device/telco-electronics_x1 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Telco Electronics DEVICE_MODEL := X1 @@ -652,7 +652,7 @@ endef TARGET_DEVICES += telco-electronics_x1 define Device/thunder_timecloud - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Thunder DEVICE_MODEL := Timecloud @@ -662,7 +662,7 @@ endef TARGET_DEVICES += thunder_timecloud define Device/totolink_a7000r - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k UIMAGE_NAME := C8340R1C-9999 DEVICE_VENDOR := TOTOLINK @@ -672,7 +672,7 @@ endef TARGET_DEVICES += totolink_a7000r define Device/adslr_g7 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := ADSLR DEVICE_MODEL := G7 @@ -681,7 +681,7 @@ endef TARGET_DEVICES += adslr_g7 define Device/tplink-safeloader - MTK_SOC := mt7621 + SOC := mt7621 DEVICE_VENDOR := TP-Link TPLINK_BOARD_ID := TPLINK_HWID := 0x0 @@ -716,7 +716,7 @@ endef TARGET_DEVICES += tplink_re650-v1 define Device/ubiquiti_edgerouterx - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 256768k FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 @@ -739,7 +739,7 @@ endef TARGET_DEVICES += ubiquiti_edgerouterx-sfp define Device/unielec_u7621-06-16m - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7621-06 @@ -750,7 +750,7 @@ endef TARGET_DEVICES += unielec_u7621-06-16m define Device/unielec_u7621-06-64m - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 65216k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7621-06 @@ -761,7 +761,7 @@ endef TARGET_DEVICES += unielec_u7621-06-64m define Device/wevo_11acnas - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k UIMAGE_NAME := 11AC-NAS-Router(0.0.0) DEVICE_VENDOR := WeVO @@ -773,7 +773,7 @@ endef TARGET_DEVICES += wevo_11acnas define Device/wevo_w2914ns-v2 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k UIMAGE_NAME := W2914NS-V2(0.0.0) DEVICE_VENDOR := WeVO @@ -786,7 +786,7 @@ endef TARGET_DEVICES += wevo_w2914ns-v2 define Device/xiaomi_mir3g - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 4096k @@ -806,7 +806,7 @@ endef TARGET_DEVICES += xiaomi_mir3g define Device/xiaomi_mir3g-v2 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 14848k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 3G @@ -819,7 +819,7 @@ endef TARGET_DEVICES += xiaomi_mir3g-v2 define Device/xiaomi_mir3p - MTK_SOC := mt7621 + SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE:= 4096k @@ -837,7 +837,7 @@ endef TARGET_DEVICES += xiaomi_mir3p define Device/xiaoyu_xy-c5 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := XiaoYu DEVICE_MODEL := XY-C5 @@ -846,7 +846,7 @@ endef TARGET_DEVICES += xiaoyu_xy-c5 define Device/xzwifi_creativebox-v1 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := CreativeBox DEVICE_MODEL := v1 @@ -856,7 +856,7 @@ endef TARGET_DEVICES += xzwifi_creativebox-v1 define Device/youhua_wr1200js - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := YouHua DEVICE_MODEL := WR1200JS @@ -866,7 +866,7 @@ endef TARGET_DEVICES += youhua_wr1200js define Device/youku_yk-l2 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Youku DEVICE_MODEL := YK-L2 @@ -876,7 +876,7 @@ endef TARGET_DEVICES += youku_yk-l2 define Device/zbtlink_zbt-we1326 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 @@ -887,7 +887,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we1326 define Device/zbtlink_zbt-we3526 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 @@ -897,7 +897,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we3526 define Device/zbtlink_zbt-wg2626 - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 @@ -908,7 +908,7 @@ endef TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 @@ -920,7 +920,7 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 @@ -932,7 +932,7 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-32m define Device/zio_freezio - MTK_SOC := mt7621 + SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := ZIO DEVICE_MODEL := FREEZIO diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 6865d397e6..2b5ec60a90 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -3,7 +3,7 @@ # define Device/alfa-network_awusfree1 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := AWUSFREE1 @@ -12,7 +12,7 @@ endef TARGET_DEVICES += alfa-network_awusfree1 define Device/buffalo_wcr-1166ds - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7936k BUFFALO_TAG_PLATFORM := MTK BUFFALO_TAG_VERSION := 9.99 @@ -30,7 +30,7 @@ endef TARGET_DEVICES += buffalo_wcr-1166ds define Device/cudy_wr1000 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -44,7 +44,7 @@ endef TARGET_DEVICES += cudy_wr1000 define Device/d-team_pbr-d1 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := PandoraBox DEVICE_MODEL := PBR-D1 @@ -54,7 +54,7 @@ endef TARGET_DEVICES += d-team_pbr-d1 define Device/duzun_dm06 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := DuZun DEVICE_MODEL := DM06 @@ -64,7 +64,7 @@ endef TARGET_DEVICES += duzun_dm06 define Device/glinet_gl-mt300n-v2 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT300N @@ -75,7 +75,7 @@ endef TARGET_DEVICES += glinet_gl-mt300n-v2 define Device/glinet_vixmini - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := VIXMINI @@ -84,7 +84,7 @@ endef TARGET_DEVICES += glinet_vixmini define Device/hilink_hlk-7628n - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := HILINK DEVICE_MODEL := HLK-7628N @@ -92,7 +92,7 @@ endef TARGET_DEVICES += hilink_hlk-7628n define Device/hiwifi_hc5661a - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 15808k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5661A @@ -101,7 +101,7 @@ endef TARGET_DEVICES += hiwifi_hc5661a define Device/hiwifi_hc5761a - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 15808k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5761A @@ -110,7 +110,7 @@ endef TARGET_DEVICES += hiwifi_hc5761a define Device/hiwifi_hc5861b - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 15808k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5861B @@ -119,7 +119,7 @@ endef TARGET_DEVICES += hiwifi_hc5861b define Device/iptime_a3 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7936k UIMAGE_NAME := a3 DEVICE_VENDOR := ipTIME @@ -129,7 +129,7 @@ endef TARGET_DEVICES += iptime_a3 define Device/iptime_a604m - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7936k UIMAGE_NAME := a604m DEVICE_VENDOR := ipTIME @@ -139,7 +139,7 @@ endef TARGET_DEVICES += iptime_a604m define Device/mediatek_linkit-smart-7688 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := MediaTek DEVICE_MODEL := LinkIt Smart 7688 @@ -149,7 +149,7 @@ endef TARGET_DEVICES += mediatek_linkit-smart-7688 define Device/mediatek_mt7628an-eval-board - MTK_SOC := mt7628an + SOC := mt7628an BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := MediaTek @@ -160,7 +160,7 @@ endef TARGET_DEVICES += mediatek_mt7628an-eval-board define Device/mercury_mac1200r-v2 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7936k DEVICE_VENDOR := Mercury DEVICE_MODEL := MAC1200R @@ -172,7 +172,7 @@ endef TARGET_DEVICES += mercury_mac1200r-v2 define Device/netgear_r6120 - MTK_SOC := mt7628an + SOC := mt7628an BLOCKSIZE := 64k IMAGE_SIZE := 15744k DEVICE_VENDOR := NETGEAR @@ -193,7 +193,7 @@ endef TARGET_DEVICES += netgear_r6120 define Device/onion_omega2 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Onion DEVICE_MODEL := Omega2 @@ -203,7 +203,7 @@ endef TARGET_DEVICES += onion_omega2 define Device/onion_omega2p - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := Onion DEVICE_MODEL := Omega2+ @@ -213,7 +213,7 @@ endef TARGET_DEVICES += onion_omega2p define Device/rakwireless_rak633 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Rakwireless DEVICE_MODEL := RAK633 @@ -222,7 +222,7 @@ endef TARGET_DEVICES += rakwireless_rak633 define Device/skylab_skw92a - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Skylab DEVICE_MODEL := SKW92A @@ -231,7 +231,7 @@ endef TARGET_DEVICES += skylab_skw92a define Device/tama_w06 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 15040k DEVICE_VENDOR := Tama DEVICE_MODEL := W06 @@ -240,7 +240,7 @@ endef TARGET_DEVICES += tama_w06 define Device/totolink_lr1200 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := TOTOLINK DEVICE_MODEL := LR1200 @@ -249,7 +249,7 @@ endef TARGET_DEVICES += totolink_lr1200 define Device/tplink - MTK_SOC := mt7628an + SOC := mt7628an DEVICE_VENDOR := TP-Link TPLINK_FLASHLAYOUT := TPLINK_HWID := @@ -382,7 +382,7 @@ endef TARGET_DEVICES += tplink_tl-wr840n-v4 define Device/tplink_tl-wr840n-v5 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 3904k DEVICE_VENDOR := TP-Link DEVICE_MODEL := TL-WR840N @@ -458,7 +458,7 @@ endef TARGET_DEVICES += tplink_tl-wr902ac-v3 define Device/unielec_u7628-01-16m - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7628-01 @@ -469,7 +469,7 @@ endef TARGET_DEVICES += unielec_u7628-01-16m define Device/vocore_vocore2 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2 @@ -480,7 +480,7 @@ endef TARGET_DEVICES += vocore_vocore2 define Device/vocore_vocore2-lite - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2-Lite @@ -491,7 +491,7 @@ endef TARGET_DEVICES += vocore_vocore2-lite define Device/wavlink_wl-wn570ha1 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Wavlink DEVICE_MODEL := WL-WN570HA1 @@ -500,7 +500,7 @@ endef TARGET_DEVICES += wavlink_wl-wn570ha1 define Device/wavlink_wl-wn575a3 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Wavlink DEVICE_MODEL := WL-WN575A3 @@ -510,7 +510,7 @@ endef TARGET_DEVICES += wavlink_wl-wn575a3 define Device/widora_neo-16m - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Widora DEVICE_MODEL := Widora-NEO @@ -521,7 +521,7 @@ endef TARGET_DEVICES += widora_neo-16m define Device/widora_neo-32m - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := Widora DEVICE_MODEL := Widora-NEO @@ -531,7 +531,7 @@ endef TARGET_DEVICES += widora_neo-32m define Device/wiznet_wizfi630s - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := WIZnet DEVICE_MODEL := WizFi630S @@ -539,7 +539,7 @@ endef TARGET_DEVICES += wiznet_wizfi630s define Device/wrtnode_wrtnode2p - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := WRTnode DEVICE_MODEL := WRTnode 2P @@ -549,7 +549,7 @@ endef TARGET_DEVICES += wrtnode_wrtnode2p define Device/wrtnode_wrtnode2r - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := WRTnode DEVICE_MODEL := WRTnode 2R @@ -559,7 +559,7 @@ endef TARGET_DEVICES += wrtnode_wrtnode2r define Device/xiaomi_mir4a-100m - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 14976k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 4A @@ -569,7 +569,7 @@ endef TARGET_DEVICES += xiaomi_mir4a-100m define Device/xiaomi_miwifi-nano - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := MiWiFi Nano @@ -579,7 +579,7 @@ endef TARGET_DEVICES += xiaomi_miwifi-nano define Device/zbtlink_zbt-we1226 - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1226 @@ -587,7 +587,7 @@ endef TARGET_DEVICES += zbtlink_zbt-we1226 define Device/zyxel_keenetic-extra-ii - MTK_SOC := mt7628an + SOC := mt7628an IMAGE_SIZE := 14912k BLOCKSIZE := 64k DEVICE_VENDOR := ZyXEL diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index a66ee59881..1b4880682a 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -10,7 +10,7 @@ define Build/gemtek-header endef define Device/airlink101_ar670w - MTK_SOC := rt2880 + SOC := rt2880 BLOCKSIZE := 64k DEVICE_VENDOR := Airlink DEVICE_MODEL := AR670W @@ -24,7 +24,7 @@ endef TARGET_DEVICES += airlink101_ar670w define Device/airlink101_ar725w - MTK_SOC := rt2880 + SOC := rt2880 IMAGE_SIZE := 3776k DEVICE_VENDOR := Airlink DEVICE_MODEL := AR725W @@ -36,7 +36,7 @@ endef TARGET_DEVICES += airlink101_ar725w define Device/asus_rt-n15 - MTK_SOC := rt2880 + SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Asus @@ -47,7 +47,7 @@ endef TARGET_DEVICES += asus_rt-n15 define Device/belkin_f5d8235-v1 - MTK_SOC := rt2880 + SOC := rt2880 IMAGE_SIZE := 7872k DEVICE_VENDOR := Belkin DEVICE_MODEL := F5D8235 @@ -59,7 +59,7 @@ endef TARGET_DEVICES += belkin_f5d8235-v1 define Device/buffalo_wli-tx4-ag300n - MTK_SOC := rt2880 + SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Buffalo @@ -70,7 +70,7 @@ endef TARGET_DEVICES += buffalo_wli-tx4-ag300n define Device/buffalo_wzr-agl300nh - MTK_SOC := rt2880 + SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Buffalo @@ -81,7 +81,7 @@ endef TARGET_DEVICES += buffalo_wzr-agl300nh define Device/dlink_dap-1522-a1 - MTK_SOC := rt2880 + SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3712k DEVICE_VENDOR := D-Link @@ -97,7 +97,7 @@ endef TARGET_DEVICES += dlink_dap-1522-a1 define Device/ralink_v11st-fe - MTK_SOC := rt2880 + SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Ralink diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index 0550c7ffa9..f63891ac7c 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -22,7 +22,7 @@ define Build/hilink-header endef define Device/7links_px-4885-4m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k DEVICE_VENDOR := 7Links DEVICE_MODEL := PX-4885 @@ -34,7 +34,7 @@ endef TARGET_DEVICES += 7links_px-4885-4m define Device/7links_px-4885-8m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := 7Links DEVICE_MODEL := PX-4885 @@ -46,7 +46,7 @@ endef TARGET_DEVICES += 7links_px-4885-8m define Device/8devices_carambola - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 7872k DEVICE_VENDOR := 8devices DEVICE_MODEL := Carambola @@ -56,7 +56,7 @@ endef TARGET_DEVICES += 8devices_carambola define Device/accton_wr6202 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Accton DEVICE_MODEL := WR6202 @@ -65,7 +65,7 @@ endef TARGET_DEVICES += accton_wr6202 define Device/airlive_air3gii - MTK_SOC := rt5350 + SOC := rt5350 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := AirLive @@ -75,7 +75,7 @@ endef TARGET_DEVICES += airlive_air3gii define Device/alfa-network_w502u - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := ALFA DEVICE_MODEL := Networks W502U @@ -84,7 +84,7 @@ endef TARGET_DEVICES += alfa-network_w502u define Device/allnet_all0256n-4m - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL0256N @@ -95,7 +95,7 @@ endef TARGET_DEVICES += allnet_all0256n-4m define Device/allnet_all0256n-8m - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 7872k DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL0256N @@ -106,7 +106,7 @@ endef TARGET_DEVICES += allnet_all0256n-8m define Device/allnet_all5002 - MTK_SOC := rt3352 + SOC := rt3352 IMAGE_SIZE := 32448k DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5002 @@ -117,7 +117,7 @@ endef TARGET_DEVICES += allnet_all5002 define Device/allnet_all5003 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 32448k DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5003 @@ -128,7 +128,7 @@ endef TARGET_DEVICES += allnet_all5003 define Device/alphanetworks_asl26555-16m - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 15872k DEVICE_VENDOR := Alpha DEVICE_MODEL := ASL26555 @@ -139,7 +139,7 @@ endef TARGET_DEVICES += alphanetworks_asl26555-16m define Device/alphanetworks_asl26555-8m - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 7744k DEVICE_VENDOR := Alpha DEVICE_MODEL := ASL26555 @@ -149,7 +149,7 @@ endef TARGET_DEVICES += alphanetworks_asl26555-8m define Device/arcwireless_freestation5 - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 7872k DEVICE_VENDOR := ARC Wireless DEVICE_MODEL := FreeStation @@ -160,7 +160,7 @@ endef TARGET_DEVICES += arcwireless_freestation5 define Device/argus_atp-52b - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7808k DEVICE_VENDOR := Argus DEVICE_MODEL := ATP-52B @@ -169,7 +169,7 @@ endef TARGET_DEVICES += argus_atp-52b define Device/asiarf_awapn2403 - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := AsiaRF @@ -179,7 +179,7 @@ endef TARGET_DEVICES += asiarf_awapn2403 define Device/asiarf_awm002-evb-4m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB @@ -190,7 +190,7 @@ endef TARGET_DEVICES += asiarf_awm002-evb-4m define Device/asiarf_awm002-evb-8m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB/AWM003-EVB @@ -201,7 +201,7 @@ endef TARGET_DEVICES += asiarf_awm002-evb-8m define Device/asus_rt-g32-b1 - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := Asus @@ -212,7 +212,7 @@ endef TARGET_DEVICES += asus_rt-g32-b1 define Device/asus_rt-n10-plus - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Asus @@ -222,7 +222,7 @@ endef TARGET_DEVICES += asus_rt-n10-plus define Device/asus_rt-n13u - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Asus DEVICE_MODEL := RT-N13U @@ -232,7 +232,7 @@ endef TARGET_DEVICES += asus_rt-n13u define Device/asus_wl-330n - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := Asus @@ -242,7 +242,7 @@ endef TARGET_DEVICES += asus_wl-330n define Device/asus_wl-330n3g - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := Asus @@ -253,7 +253,7 @@ endef TARGET_DEVICES += asus_wl-330n3g define Device/aximcom_mr-102n - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7744k DEVICE_VENDOR := AXIMCom DEVICE_MODEL := MR-102N @@ -262,7 +262,7 @@ endef TARGET_DEVICES += aximcom_mr-102n define Device/aztech_hw550-3g - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Aztech DEVICE_MODEL := HW550-3G @@ -274,7 +274,7 @@ endef TARGET_DEVICES += aztech_hw550-3g define Device/belkin_f5d8235-v2 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7744k DEVICE_VENDOR := Belkin DEVICE_MODEL := F5D8235 @@ -285,7 +285,7 @@ endef TARGET_DEVICES += belkin_f5d8235-v2 define Device/belkin_f7c027 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7616k DEVICE_VENDOR := Belkin DEVICE_MODEL := F7C027 @@ -295,7 +295,7 @@ endef TARGET_DEVICES += belkin_f7c027 define Device/buffalo_whr-g300n - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3712k DEVICE_VENDOR := Buffalo @@ -308,7 +308,7 @@ endef TARGET_DEVICES += buffalo_whr-g300n define Device/dlink_dap-1350 - MTK_SOC := rt3052 + SOC := rt3052 IMAGES += factory.bin factory-NA.bin IMAGE_SIZE := 7488k IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -322,7 +322,7 @@ endef TARGET_DEVICES += dlink_dap-1350 define Device/dlink_dcs-930 - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k DEVICE_VENDOR := D-Link DEVICE_MODEL := DCS-930 @@ -333,7 +333,7 @@ endef TARGET_DEVICES += dlink_dcs-930 define Device/dlink_dcs-930l-b1 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k DEVICE_VENDOR := D-Link DEVICE_MODEL := DCS-930L @@ -345,7 +345,7 @@ endef TARGET_DEVICES += dlink_dcs-930l-b1 define Device/dlink_dir-300-b1 - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -358,7 +358,7 @@ endef TARGET_DEVICES += dlink_dir-300-b1 define Device/dlink_dir-300-b7 - MTK_SOC := rt5350 + SOC := rt5350 BLOCKSIZE := 4k IMAGE_SIZE := 7872k DEVICE_VENDOR := D-Link @@ -369,7 +369,7 @@ endef TARGET_DEVICES += dlink_dir-300-b7 define Device/dlink_dir-320-b1 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-320 @@ -379,7 +379,7 @@ endef TARGET_DEVICES += dlink_dir-320-b1 define Device/dlink_dir-600-b1 - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -393,7 +393,7 @@ TARGET_DEVICES += dlink_dir-600-b1 define Device/dlink_dir-610-a1 $(Device/seama) - MTK_SOC := rt5350 + SOC := rt5350 BLOCKSIZE := 4k SEAMA_SIGNATURE := wrgn59_dlob.hans_dir610 KERNEL := $(KERNEL_DTB) @@ -407,7 +407,7 @@ endef TARGET_DEVICES += dlink_dir-610-a1 define Device/dlink_dir-615-d - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -420,7 +420,7 @@ endef TARGET_DEVICES += dlink_dir-615-d define Device/dlink_dir-615-h1 - MTK_SOC := rt3352 + SOC := rt3352 BLOCKSIZE := 4k IMAGES += factory.bin IMAGE_SIZE := 3776k @@ -433,7 +433,7 @@ endef TARGET_DEVICES += dlink_dir-615-h1 define Device/dlink_dir-620-a1 - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 7872k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-620 @@ -443,7 +443,7 @@ endef TARGET_DEVICES += dlink_dir-620-a1 define Device/dlink_dir-620-d1 - MTK_SOC := rt3352 + SOC := rt3352 IMAGE_SIZE := 7872k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-620 @@ -453,7 +453,7 @@ endef TARGET_DEVICES += dlink_dir-620-d1 define Device/dlink_dwr-512-b - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 8064k DEVICE_VENDOR := D-Link DEVICE_MODEL := DWR-512 @@ -472,7 +472,7 @@ endef TARGET_DEVICES += dlink_dwr-512-b define Device/easyacc_wizard-8800 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := EasyAcc @@ -482,7 +482,7 @@ endef TARGET_DEVICES += easyacc_wizard-8800 define Device/edimax_3g-6200n - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3648k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \ @@ -494,7 +494,7 @@ endef TARGET_DEVICES += edimax_3g-6200n define Device/edimax_3g-6200nl - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3648k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \ @@ -506,7 +506,7 @@ endef TARGET_DEVICES += edimax_3g-6200nl define Device/engenius_esr-9753 - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := EnGenius @@ -516,7 +516,7 @@ endef TARGET_DEVICES += engenius_esr-9753 define Device/fon_fonera-20n - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | \ @@ -529,7 +529,7 @@ endef TARGET_DEVICES += fon_fonera-20n define Device/hame_mpr-a1 - MTK_SOC := rt5350 + SOC := rt5350 BLOCKSIZE := 4k IMAGE_SIZE := 3776k UIMAGE_NAME:= Linux Kernel Image @@ -542,7 +542,7 @@ endef TARGET_DEVICES += hame_mpr-a1 define Device/hame_mpr-a2 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := HAME @@ -554,7 +554,7 @@ endef TARGET_DEVICES += hame_mpr-a2 define Device/hauppauge_broadway - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7744k UIMAGE_NAME:= Broadway Kernel Image DEVICE_VENDOR := Hauppauge @@ -565,7 +565,7 @@ endef TARGET_DEVICES += hauppauge_broadway define Device/hilink_hlk-rm04 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -577,7 +577,7 @@ endef TARGET_DEVICES += hilink_hlk-rm04 define Device/hootoo_ht-tm02 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := HooToo DEVICE_MODEL := HT-TM02 @@ -587,7 +587,7 @@ endef TARGET_DEVICES += hootoo_ht-tm02 define Device/huawei_d105 - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Huawei @@ -597,7 +597,7 @@ endef TARGET_DEVICES += huawei_d105 define Device/huawei_hg255d - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 15744k DEVICE_VENDOR := HuaWei DEVICE_MODEL := HG255D @@ -606,7 +606,7 @@ endef TARGET_DEVICES += huawei_hg255d define Device/intenso_memory2move - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := Intenso @@ -618,7 +618,7 @@ endef TARGET_DEVICES += intenso_memory2move define Device/jcg_jhr-n805r - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -630,7 +630,7 @@ endef TARGET_DEVICES += jcg_jhr-n805r define Device/jcg_jhr-n825r - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -642,7 +642,7 @@ endef TARGET_DEVICES += jcg_jhr-n825r define Device/jcg_jhr-n926r - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -654,7 +654,7 @@ endef TARGET_DEVICES += jcg_jhr-n926r define Device/mofinetwork_mofi3500-3gn - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := MoFi Network DEVICE_MODEL := MOFI3500-3GN @@ -663,7 +663,7 @@ endef TARGET_DEVICES += mofinetwork_mofi3500-3gn define Device/netcore_nw718 - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3712k UIMAGE_NAME:= ARA1B4NCRNW718;1 DEVICE_VENDOR := Netcore @@ -673,7 +673,7 @@ endef TARGET_DEVICES += netcore_nw718 define Device/netgear_wnce2001 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3392k IMAGES += factory.bin factory-NA.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -687,7 +687,7 @@ endef TARGET_DEVICES += netgear_wnce2001 define Device/nexaira_bc2 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := NexAira DEVICE_MODEL := BC2 @@ -696,7 +696,7 @@ endef TARGET_DEVICES += nexaira_bc2 define Device/nexx_wt1520-4m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -709,7 +709,7 @@ endef TARGET_DEVICES += nexx_wt1520-4m define Device/nexx_wt1520-8m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -722,7 +722,7 @@ endef TARGET_DEVICES += nexx_wt1520-8m define Device/nixcore_x1-16m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 16064k DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 @@ -734,7 +734,7 @@ endef TARGET_DEVICES += nixcore_x1-16m define Device/nixcore_x1-8m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 @@ -746,7 +746,7 @@ endef TARGET_DEVICES += nixcore_x1-8m define Device/olimex_rt5350f-olinuxino - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino @@ -757,7 +757,7 @@ endef TARGET_DEVICES += olimex_rt5350f-olinuxino define Device/olimex_rt5350f-olinuxino-evb - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino-EVB @@ -768,7 +768,7 @@ endef TARGET_DEVICES += olimex_rt5350f-olinuxino-evb define Device/omnima_miniembplug - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := Omnima DEVICE_MODEL := MiniEMBPlug @@ -777,7 +777,7 @@ endef TARGET_DEVICES += omnima_miniembplug define Device/omnima_miniembwifi - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Omnima DEVICE_MODEL := MiniEMBWiFi @@ -786,7 +786,7 @@ endef TARGET_DEVICES += omnima_miniembwifi define Device/petatel_psr-680w - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Petatel @@ -796,7 +796,7 @@ endef TARGET_DEVICES += petatel_psr-680w define Device/planex_mzk-dp150n - MTK_SOC := rt5350 + SOC := rt5350 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Planex @@ -807,7 +807,7 @@ endef TARGET_DEVICES += planex_mzk-dp150n define Device/planex_mzk-w300nh2 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3648k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | \ @@ -819,7 +819,7 @@ endef TARGET_DEVICES += planex_mzk-w300nh2 define Device/planex_mzk-wdpr - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 6656k DEVICE_VENDOR := Planex DEVICE_MODEL := MZK-WDPR @@ -828,7 +828,7 @@ endef TARGET_DEVICES += planex_mzk-wdpr define Device/poray_ip2202 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Poray DEVICE_MODEL := IP2202 @@ -837,7 +837,7 @@ endef TARGET_DEVICES += poray_ip2202 define Device/poray_m3 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -850,7 +850,7 @@ endef TARGET_DEVICES += poray_m3 define Device/poray_m4-4m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -864,7 +864,7 @@ endef TARGET_DEVICES += poray_m4-4m define Device/poray_m4-8m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -878,7 +878,7 @@ endef TARGET_DEVICES += poray_m4-8m define Device/poray_x5 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -891,7 +891,7 @@ endef TARGET_DEVICES += poray_x5 define Device/poray_x8 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -904,7 +904,7 @@ endef TARGET_DEVICES += poray_x8 define Device/prolink_pwh2004 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Prolink DEVICE_MODEL := PWH2004 @@ -914,7 +914,7 @@ endef TARGET_DEVICES += prolink_pwh2004 define Device/ralink_v22rw-2x2 - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Ralink @@ -924,7 +924,7 @@ endef TARGET_DEVICES += ralink_v22rw-2x2 define Device/sitecom_wl-351 - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Sitecom @@ -935,7 +935,7 @@ endef TARGET_DEVICES += sitecom_wl-351 define Device/skyline_sl-r7205 - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Skyline @@ -945,7 +945,7 @@ endef TARGET_DEVICES += skyline_sl-r7205 define Device/sparklan_wcr-150gn - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Sparklan @@ -955,7 +955,7 @@ endef TARGET_DEVICES += sparklan_wcr-150gn define Device/teltonika_rut5xx - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 16064k DEVICE_VENDOR := Teltonika DEVICE_MODEL := RUT5XX @@ -965,7 +965,7 @@ endef TARGET_DEVICES += teltonika_rut5xx define Device/tenda_3g150b - MTK_SOC := rt5350 + SOC := rt5350 BLOCKSIZE := 4k IMAGE_SIZE := 3776k UIMAGE_NAME:= Linux Kernel Image @@ -977,7 +977,7 @@ endef TARGET_DEVICES += tenda_3g150b define Device/tenda_3g300m - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3776k UIMAGE_NAME := 3G150M_SPI Kernel Image DEVICE_VENDOR := Tenda @@ -988,7 +988,7 @@ endef TARGET_DEVICES += tenda_3g300m define Device/tenda_w150m - MTK_SOC := rt3050 + SOC := rt3050 IMAGE_SIZE := 3776k UIMAGE_NAME:= W150M Kernel Image DEVICE_VENDOR := Tenda @@ -998,7 +998,7 @@ endef TARGET_DEVICES += tenda_w150m define Device/tenda_w306r-v2 - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3776k UIMAGE_NAME:= linkn Kernel Image DEVICE_VENDOR := Tenda @@ -1009,7 +1009,7 @@ endef TARGET_DEVICES += tenda_w306r-v2 define Device/trendnet_tew-638apb-v2 - MTK_SOC := rt3050 + SOC := rt3050 BLOCKSIZE := 64k IMAGE_SIZE := 3776k IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \ @@ -1022,7 +1022,7 @@ endef TARGET_DEVICES += trendnet_tew-638apb-v2 define Device/trendnet_tew-714tru - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-714TRU @@ -1031,7 +1031,7 @@ endef TARGET_DEVICES += trendnet_tew-714tru define Device/unbranded_a5-v11 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -1044,7 +1044,7 @@ endef TARGET_DEVICES += unbranded_a5-v11 define Device/unbranded_wr512-3gn-4m - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 3776k DEVICE_VENDOR := Ralink DEVICE_MODEL := WR512-3GN @@ -1054,7 +1054,7 @@ endef TARGET_DEVICES += unbranded_wr512-3gn-4m define Device/unbranded_wr512-3gn-8m - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := Ralink DEVICE_MODEL := WR512-3GN @@ -1064,7 +1064,7 @@ endef TARGET_DEVICES += unbranded_wr512-3gn-8m define Device/unbranded_xdx-rn502j - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := XDX @@ -1074,7 +1074,7 @@ endef TARGET_DEVICES += unbranded_xdx-rn502j define Device/upvel_ur-326n4g - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := UPVEL @@ -1085,7 +1085,7 @@ endef TARGET_DEVICES += upvel_ur-326n4g define Device/upvel_ur-336un - MTK_SOC := rt3052 + SOC := rt3052 IMAGE_SIZE := 7872k DEVICE_VENDOR := UPVEL DEVICE_MODEL := UR-336UN @@ -1095,7 +1095,7 @@ endef TARGET_DEVICES += upvel_ur-336un define Device/vocore_vocore-16m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 16064k DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore @@ -1107,7 +1107,7 @@ endef TARGET_DEVICES += vocore_vocore-16m define Device/vocore_vocore-8m - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore @@ -1119,7 +1119,7 @@ endef TARGET_DEVICES += vocore_vocore-8m define Device/wansview_ncs601w - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := Wansview DEVICE_MODEL := NCS601W @@ -1129,7 +1129,7 @@ endef TARGET_DEVICES += wansview_ncs601w define Device/wiznet_wizfi630a - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 16064k DEVICE_VENDOR := WIZnet DEVICE_MODEL := WizFi630A @@ -1138,7 +1138,7 @@ endef TARGET_DEVICES += wiznet_wizfi630a define Device/zorlik_zl5900v2 - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 7872k DEVICE_VENDOR := Zorlik DEVICE_MODEL := ZL5900V2 @@ -1147,7 +1147,7 @@ endef TARGET_DEVICES += zorlik_zl5900v2 define Device/zyxel_keenetic - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := ZyXEL @@ -1158,7 +1158,7 @@ endef TARGET_DEVICES += zyxel_keenetic define Device/zyxel_keenetic-start - MTK_SOC := rt5350 + SOC := rt5350 IMAGE_SIZE := 3776k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Start @@ -1166,7 +1166,7 @@ endef TARGET_DEVICES += zyxel_keenetic-start define Device/zyxel_nbg-419n - MTK_SOC := rt3052 + SOC := rt3052 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := ZyXEL @@ -1176,7 +1176,7 @@ endef TARGET_DEVICES += zyxel_nbg-419n define Device/zyxel_nbg-419n-v2 - MTK_SOC := rt3352 + SOC := rt3352 IMAGE_SIZE := 7872k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG-419N diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index 0279bcd2d3..d80909fd5a 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -6,7 +6,7 @@ define Build/mkrtn56uimg endef define Device/asus_rt-n56u - MTK_SOC := rt3662 + SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGE/sysupgrade.bin += | mkrtn56uimg -s @@ -18,7 +18,7 @@ endef TARGET_DEVICES += asus_rt-n56u define Device/belkin_f9k1109v1 - MTK_SOC := rt3883 + SOC := rt3883 BLOCKSIZE := 64k DEVICE_VENDOR := Belkin DEVICE_MODEL := F9K1109 @@ -33,7 +33,7 @@ TARGET_DEVICES += belkin_f9k1109v1 define Device/dlink_dir-645 $(Device/seama) - MTK_SOC := rt3662 + SOC := rt3662 BLOCKSIZE := 4k IMAGE_SIZE := 7872k KERNEL := $(KERNEL_DTB) @@ -46,7 +46,7 @@ endef TARGET_DEVICES += dlink_dir-645 define Device/edimax_br-6475nd - MTK_SOC := rt3662 + SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ @@ -60,7 +60,7 @@ endef TARGET_DEVICES += edimax_br-6475nd define Device/loewe_wmdr-143n - MTK_SOC := rt3662 + SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := Loewe @@ -70,7 +70,7 @@ endef TARGET_DEVICES += loewe_wmdr-143n define Device/omnima_hpm - MTK_SOC := rt3662 + SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 16064k DEVICE_VENDOR := Omnima @@ -82,7 +82,7 @@ TARGET_DEVICES += omnima_hpm define Device/samsung_cy-swr1100 $(Device/seama) - MTK_SOC := rt3662 + SOC := rt3662 BLOCKSIZE := 64k IMAGE_SIZE := 7872k KERNEL := $(KERNEL_DTB) @@ -95,7 +95,7 @@ endef TARGET_DEVICES += samsung_cy-swr1100 define Device/sitecom_wlr-6000 - MTK_SOC := rt3883 + SOC := rt3883 BLOCKSIZE := 4k IMAGE_SIZE := 7244k IMAGES += factory.dlf @@ -109,7 +109,7 @@ endef TARGET_DEVICES += sitecom_wlr-6000 define Device/trendnet_tew-691gr - MTK_SOC := rt3883 + SOC := rt3883 BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin @@ -123,7 +123,7 @@ endef TARGET_DEVICES += trendnet_tew-691gr define Device/trendnet_tew-692gr - MTK_SOC := rt3883 + SOC := rt3883 BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin From b085e0586faf4da4b2c296ddf31885dd781bd85c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 20 Dec 2019 01:18:44 +0100 Subject: [PATCH 059/480] sunxi: rename SUNXI_SOC to SOC This replaces SUNXI_SOC by the newly introduced common SOC device variable. Signed-off-by: Adrian Schmutzler --- target/linux/sunxi/image/Makefile | 5 ++- target/linux/sunxi/image/cortex-a53.mk | 12 +++---- target/linux/sunxi/image/cortex-a7.mk | 46 +++++++++++++------------- target/linux/sunxi/image/cortex-a8.mk | 12 +++---- 4 files changed, 37 insertions(+), 38 deletions(-) diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 929f4c70f9..888c1c5a9b 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -32,15 +32,14 @@ endef # why \x00\x00\x00\x00 for zImage-initramfs define Device/Default PROFILES := Default - DEVICE_VARS := SUNXI_SOC SUNXI_DTS SUNXI_DTS_DIR SUNXI_UBOOT + DEVICE_VARS := SUNXI_DTS SUNXI_DTS_DIR SUNXI_UBOOT KERNEL_NAME := zImage KERNEL := kernel-bin | uImage none IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) - SUNXI_SOC := SUNXI_DTS_DIR := - SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SUNXI_SOC)-$(lastword $(subst _, ,$(1))) + SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1))) endef include cortex-a7.mk diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index b0d087b9b1..ac82138938 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -12,7 +12,7 @@ define Device/friendlyarm_nanopi-neo-plus2 DEVICE_MODEL := NanoPi NEO Plus2 SUPPORTED_DEVICES:=nanopi-neo-plus2 SUNXI_DTS_DIR := allwinner/ - SUNXI_SOC := sun50i-h5 + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef @@ -24,7 +24,7 @@ define Device/friendlyarm_nanopi-neo2 DEVICE_MODEL := NanoPi NEO2 SUPPORTED_DEVICES:=nanopi-neo2 SUNXI_DTS_DIR := allwinner/ - SUNXI_SOC := sun50i-h5 + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef @@ -35,7 +35,7 @@ define Device/pine64_pine64-plus DEVICE_VENDOR := Pine64 DEVICE_MODEL := Pine64+ SUNXI_DTS_DIR := allwinner/ - SUNXI_SOC := sun50i-a64 + SOC := sun50i-a64 KERNEL_NAME := Image KERNEL := kernel-bin endef @@ -46,7 +46,7 @@ define Device/pine64_sopine-baseboard DEVICE_VENDOR := Pine64 DEVICE_MODEL := SoPine SUNXI_DTS_DIR := allwinner/ - SUNXI_SOC := sun50i-a64 + SOC := sun50i-a64 KERNEL_NAME := Image KERNEL := kernel-bin endef @@ -58,7 +58,7 @@ define Device/xunlong_orangepi-zero-plus DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi Zero Plus SUNXI_DTS_DIR := allwinner/ - SUNXI_SOC := sun50i-h5 + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef @@ -69,7 +69,7 @@ define Device/xunlong_orangepi-pc2 DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi PC 2 SUNXI_DTS_DIR := allwinner/ - SUNXI_SOC := sun50i-h5 + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index 83b313a378..3dad8b19b4 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -12,7 +12,7 @@ define Device/olimex_a20-olinuxino-lime DEVICE_VENDOR := Olimex DEVICE_MODEL := A20-OLinuXino-LIME DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi - SUNXI_SOC := sun7i + SOC := sun7i endef TARGET_DEVICES += olimex_a20-olinuxino-lime @@ -22,7 +22,7 @@ define Device/olimex_a20-olinuxino-lime2 DEVICE_VENDOR := Olimex DEVICE_MODEL := A20-OLinuXino-LIME2 DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid - SUNXI_SOC := sun7i + SOC := sun7i endef TARGET_DEVICES += olimex_a20-olinuxino-lime2 @@ -33,7 +33,7 @@ define Device/olimex_a20-olinuxino-lime2-emmc DEVICE_MODEL := A20-OLinuXino-LIME2 DEVICE_VARIANT := eMMC DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid - SUNXI_SOC := sun7i + SOC := sun7i endef TARGET_DEVICES += olimex_a20-olinuxino-lime2-emmc @@ -43,7 +43,7 @@ define Device/olimex_a20-olinuxino-micro DEVICE_VENDOR := Olimex DEVICE_MODEL := A20-OLinuXino-MICRO DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUNXI_SOC := sun7i + SOC := sun7i endef TARGET_DEVICES += olimex_a20-olinuxino-micro @@ -53,7 +53,7 @@ define Device/lemaker_bananapi DEVICE_VENDOR := LeMaker DEVICE_MODEL := Banana Pi DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi - SUNXI_SOC := sun7i-a20 + SOC := sun7i-a20 endef TARGET_DEVICES += lemaker_bananapi @@ -63,7 +63,7 @@ define Device/lemaker_bananapro DEVICE_VENDOR := LeMaker DEVICE_MODEL := Banana Pro DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac - SUNXI_SOC := sun7i-a20 + SOC := sun7i-a20 endef TARGET_DEVICES += lemaker_bananapro @@ -73,7 +73,7 @@ define Device/cubietech_cubieboard2 DEVICE_VENDOR := Cubietech DEVICE_MODEL := Cubieboard2 DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUNXI_SOC := sun7i-a20 + SOC := sun7i-a20 endef TARGET_DEVICES += cubietech_cubieboard2 @@ -83,7 +83,7 @@ define Device/cubietech_cubietruck DEVICE_VENDOR := Cubietech DEVICE_MODEL := Cubietruck DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac - SUNXI_SOC := sun7i-a20 + SOC := sun7i-a20 endef TARGET_DEVICES += cubietech_cubietruck @@ -93,7 +93,7 @@ define Device/lamobo_lamobo-r1 DEVICE_VENDOR := Lamobo DEVICE_MODEL := Lamobo R1 DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic - SUNXI_SOC := sun7i-a20 + SOC := sun7i-a20 endef TARGET_DEVICES += lamobo_lamobo-r1 @@ -103,7 +103,7 @@ define Device/mele_m9 DEVICE_VENDOR := Mele DEVICE_MODEL := M9 DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu - SUNXI_SOC := sun6i-a31 + SOC := sun6i-a31 endef TARGET_DEVICES += mele_m9 @@ -113,7 +113,7 @@ define Device/xunlong_orangepi-zero DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi Zero DEVICE_PACKAGES:=kmod-rtc-sunxi - SUNXI_SOC := sun8i-h2-plus + SOC := sun8i-h2-plus endef TARGET_DEVICES += xunlong_orangepi-zero @@ -123,7 +123,7 @@ define Device/xunlong_orangepi-r1 DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi R1 DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152 - SUNXI_SOC := sun8i-h2-plus + SOC := sun8i-h2-plus endef TARGET_DEVICES += xunlong_orangepi-r1 @@ -134,7 +134,7 @@ define Device/sinovoip_bananapi-m2-plus DEVICE_PACKAGES:=kmod-rtc-sunxi \ kmod-leds-gpio kmod-ledtrig-heartbeat \ kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += sinovoip_bananapi-m2-plus @@ -145,7 +145,7 @@ define Device/friendlyarm_nanopi-m1-plus DEVICE_PACKAGES:=kmod-rtc-sunxi \ kmod-leds-gpio kmod-ledtrig-heartbeat \ kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-m1-plus @@ -154,7 +154,7 @@ TARGET_DEVICES += friendlyarm_nanopi-m1-plus define Device/friendlyarm_nanopi-neo DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi NEO - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-neo @@ -166,7 +166,7 @@ define Device/friendlyarm_nanopi-neo-air DEVICE_PACKAGES := kmod-rtc-sunxi \ kmod-leds-gpio kmod-ledtrig-heartbeat \ kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-neo-air @@ -176,7 +176,7 @@ define Device/xunlong_orangepi-one DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi One DEVICE_PACKAGES:=kmod-rtc-sunxi - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += xunlong_orangepi-one @@ -186,7 +186,7 @@ define Device/xunlong_orangepi-pc DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi PC DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += xunlong_orangepi-pc @@ -196,7 +196,7 @@ define Device/xunlong_orangepi-pc-plus DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi PC Plus DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += xunlong_orangepi-pc-plus @@ -206,7 +206,7 @@ define Device/xunlong_orangepi-plus DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi Plus DEVICE_PACKAGES:=kmod-rtc-sunxi - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += xunlong_orangepi-plus @@ -215,7 +215,7 @@ define Device/xunlong_orangepi-2 DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi 2 DEVICE_PACKAGES:=kmod-rtc-sunxi - SUNXI_SOC := sun8i-h3 + SOC := sun8i-h3 endef TARGET_DEVICES += xunlong_orangepi-2 @@ -225,7 +225,7 @@ define Device/linksprite_pcduino3 DEVICE_VENDOR := LinkSprite DEVICE_MODEL := pcDuino3 DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-rtl8xxxu rtl8188eu-firmware - SUNXI_SOC := sun7i-a20 + SOC := sun7i-a20 endef TARGET_DEVICES += linksprite_pcduino3 @@ -234,7 +234,7 @@ define Device/lemaker_bananapi-m2-ultra DEVICE_VENDOR := LeMaker DEVICE_MODEL := Banana Pi M2 Ultra DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi - SUNXI_SOC := sun8i-r40 + SOC := sun8i-r40 endef TARGET_DEVICES += lemaker_bananapi-m2-ultra diff --git a/target/linux/sunxi/image/cortex-a8.mk b/target/linux/sunxi/image/cortex-a8.mk index d6b5a46a22..fdebfa716c 100644 --- a/target/linux/sunxi/image/cortex-a8.mk +++ b/target/linux/sunxi/image/cortex-a8.mk @@ -11,7 +11,7 @@ define Device/olimex_a10-olinuxino-lime DEVICE_VENDOR := Olimex DEVICE_MODEL := A10-OLinuXino-LIME DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUNXI_SOC := sun4i + SOC := sun4i endef TARGET_DEVICES += olimex_a10-olinuxino-lime @@ -22,7 +22,7 @@ define Device/olimex_a13-olimex-som DEVICE_MODEL := A13-SOM DEVICE_PACKAGES:=kmod-rtl8192cu SUPPORTED_DEVICES:=olimex,a13-olinuxino - SUNXI_SOC := sun5i-a13 + SOC := sun5i-a13 SUNXI_DTS := sun5i-a13-olinuxino endef @@ -33,7 +33,7 @@ define Device/olimex_a13-olinuxino DEVICE_VENDOR := Olimex DEVICE_MODEL := A13-OLinuXino DEVICE_PACKAGES:=kmod-rtl8192cu - SUNXI_SOC := sun5i + SOC := sun5i endef TARGET_DEVICES += olimex_a13-olinuxino @@ -43,7 +43,7 @@ define Device/cubietech_a10-cubieboard DEVICE_VENDOR := Cubietech DEVICE_MODEL := Cubieboard DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUNXI_SOC := sun4i + SOC := sun4i endef TARGET_DEVICES += cubietech_a10-cubieboard @@ -53,7 +53,7 @@ define Device/linksprite_a10-pcduino DEVICE_VENDOR := LinkSprite DEVICE_MODEL := pcDuino DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu - SUNXI_SOC := sun4i + SOC := sun4i endef TARGET_DEVICES += linksprite_a10-pcduino @@ -63,7 +63,7 @@ define Device/marsboard_a10-marsboard DEVICE_VENDOR := HAOYU Electronics DEVICE_MODEL := MarsBoard A10 DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi sound-soc-sunxi - SUNXI_SOC := sun4i + SOC := sun4i endef TARGET_DEVICES += marsboard_a10-marsboard From 4ebc9dc9c4faf8d9abc4197a74b892a66d9c1bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 20 Dec 2019 08:19:02 +0100 Subject: [PATCH 060/480] fstools: update to latest git HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 111a43f libblkid-tiny: vfat: Change parsing label in special cases f43a1aa libblkid-tiny: vfat: Fix reading labels which starts with byte 0x05 157924d libblkid-tiny: add blkid_probe_set_id_label() stub 0c5761f libblkid-tiny: use separated buffer for each block device read b82c5c1 libblkid-tiny: add functions for allocating & freeing probe struct 12851d6 blockd: don't flush devices list on "hotplug" call 5ea47fe blockd: fix vlist memory corruption Signed-off-by: Rafał Miłecki --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index b278a30a23..f2680ed2f2 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=7d67fe080d91b4bd6d32d5ee6c237c64a620c49cbd47b1ed9670f875b8f275f9 -PKG_SOURCE_DATE:=2019-11-03 -PKG_SOURCE_VERSION:=f438552ec8e777c271f5c2ec6713d9567eafa5b6 +PKG_MIRROR_HASH:=4411400675131aada73911c4afc80149485e2686479bc6479acff253eb25e9a7 +PKG_SOURCE_DATE:=2019-12-20 +PKG_SOURCE_VERSION:=111a43f8c64683e79859dcb3f4b7aa437e24502b CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 1f455418ef1ea67fda710e1b86a9e021bb4a2413 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Tue, 12 Nov 2019 01:19:03 +0900 Subject: [PATCH 061/480] ramips: fix USB LED for Belkin F9K1109v1 Device support for Belkin F9K1109v1 was added using set_usb_led() although this was removed in 772b27c20736 ("ramips: set F5D8235 v1 usb led trigger via devicetree"). Use ucidef_set_led_usbport() instead. Fixes: f2c83532f92c ("ramips: add support for Belkin F9K1109v1") Signed-off-by: Sungbo Eo [rephrase commit title and message] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/rt3883/base-files/etc/board.d/01_leds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds index 8502c8f417..e7c2cad3d2 100755 --- a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds @@ -18,7 +18,7 @@ led_wlan="$(get_dt_led wlan)" case $board in belkin,f9k1109v1) - set_usb_led "$boardname:green:usb1" + ucidef_set_led_usbport "usb" "USB" "$boardname:green:usb1" "usb1-port1" ucidef_set_led_netdev "lan" "lan" "$boardname:blue:wps" "eth0" ;; edimax,br-6475nd) From 4113d8a2554adf5ecee55cc07956eafad378eaff Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 15 Dec 2019 23:02:54 +0100 Subject: [PATCH 062/480] ipq-wifi: add BDF for Aruba AP-303 The BDF originates from the vendor-firmware. Signed-off-by: David Bauer --- package/firmware/ipq-wifi/Makefile | 2 ++ .../ipq-wifi/board-aruba_ap-303.qca4019 | Bin 0 -> 24316 bytes 2 files changed, 2 insertions(+) create mode 100644 package/firmware/ipq-wifi/board-aruba_ap-303.qca4019 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index b97fe2f1c9..906f11ac96 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -24,6 +24,7 @@ endef # ALLWIFIBOARDS:= \ + aruba_ap-303 \ avm_fritzrepeater-1200 \ linksys_ea8300 \ qxwlan_e2600ac @@ -89,6 +90,7 @@ endef # Place files in this directory as board-. # Add $(eval $(call generate-ipq-wifi-package,,)) +$(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303)) $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200)) $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300)) $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) diff --git a/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019 b/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019 new file mode 100644 index 0000000000000000000000000000000000000000..4848115cfbe3a4a0ed6b17cac929731ecbd7968c GIT binary patch literal 24316 zcmeHPdr(tX8b1l)p-UHTNDu)pAp}Se0tBi-!W$`%6c7~&un1I6BFeZwJ$y}AjvN}B`Pfz$mMbX<(NN~1F#FGd_`$kUSYm( zzFg|}UZJ$ePkJaU0I%hr$SXO7RRsaQWqBpiyyGXsqDmC`d45r;enA02aybRIXTiQ$ z{(Fv6D8Qnc9-NN#>(d1&AQynm*7jHxFaWR*!ZjM6>t{S38|w;yprD{vFJ4eY3@h-< z-!4WF$pUt;M0u#+u2DM@cmo9V_`vZ+ET^9yjw-&*$wzjskw6xF>07kKy8YxWZr<)vMT{juo&5WBJl$pvJ zSBe@2uw^qXb0;%4&|Y78I5R0hICi_exl*3FFCluYul;;oiF8lGjWOy2|{_1bA?;y|Gf7nVJwj){D78n-DgruPe_KCxqe+o_PC!v0LpI;0W&~ zgp7R#8_4hmJ+PC)%p@TfcGpx{l$j&E$%$G#3{F}KdUX|Jgd|puct0g5t8qXU6jp>E=A|Pc_n}{`jGyHYexpa) z8eg})+@@SU~bv!vW@t_*D0~j*k2Ra54<44 zGAfly!Ey@=__b^`E!H<{G6I~Qyq_vSIUEo8>&bR^_h7rT+37SJ;+lkrg)CPdfsBl_ zWH#Fk4)pWSFMfRe8oL4#@;p7Xw*UV4*B^9knBz8EYbuTQKj>!%PuOhxmoH!ZTkE^h zQ5Oxs>k&9eQFX%rmay^oy5hs-a5%Vu>&0fVaLp_>UjzM_W;28hf+9#18ifR+fk=_! zRP~t;8=70^D?l_Y4@^?%D4kD#N=KYgXTG!89<@iD&}cN8AN@2MNkkL*iQ-5!5{X9z zsDLkcDnNFjyZF1r0cZdsL}!9fUpK7I#3T~UL`ACe&W|yWIG_$w4u}it!gmqJpfOW1 zND`XFPZ9^AK~q6UC>qKS6>Cp|ZjKM7g?`0zZ0#0(s21q!}Wsktx^q!Hyz)q)K=GO zoF7djK!C#!ycz%kffr-~xxvJNR46t~SlLJq1Z=jeD_c)mpnblT&CYJ-0FjUaUY!7- z#TubR1_QvgL4XK|Xt`DhpfahOvtem(k8e884~Vp^8wB1A+A^rrLvRNI?k-blHXlQ| z28Ed52$bd6#2N6zwQKmBg-UNPPtI?dv^#g&y*lmgoH%t~Mt1I@LRDi+Ye!f2&4Iz; zkI`9mEA&tbcUZ z%raPCff}=CoSdFh&~W)`kLJ$!*9+*BuD^e+C^f1J|FyU;r!;;^^oI zutbQ7^|zo9O_y4-fz<*{BN<(cKQSIMS&pfWHI9R`Q7+)GZ~m87zSOtRt#@=xPIh$J z+RmlJ%=Iy)wjsB2$w?ctL{=e6#)NGiAEXw5z3>BC;Y0;D{!GEsIar?io&qX3RM0m- z1^qu!!LtzyFeRb^yHOg52(ttT)56l)JRy+1kO+_nY&ZmFIrD}%_y76l-@pIvyT3qG z!a_rK!Uv_0b8llsqdtHB4`|cp+)q8%a_-ajrKM^)`>$U7G-ZAsz9G)NzdxUkC2X$& zduqM~`z#Q)p7ZVawgPK2|7z4Vsn5hz4U5-aIh*Kyy`9 z2K#+`d{Fa=s!Ar2h&1D>cG=1J-CQSpgrl-7ZAjx2Fr>-5ns)VRm0Y%a{Fdgrx(+r@ z*4$UM$;#s6xh~@)>W}b{+^~=yKH~BKoNA}$qFSNKg(0ccXH~^YiRPBNQznm(68cZx z*IZXs$_@yfwGDV)*c_VFr&I;XWO(qZszR13@rQx5DHW0=A#d`I=8CFBmJ-jw8hkOq zgDBk|Z&R15a+I-?Bk*9UGFz4i!@LHuj1;2qXotF778Ab}Z}1q-!4z4Am-=K##+*PB zB@(3t5LgdOV}YrW<_(KL>(KEV5iNeTE@js=e`t@r=v}q-_{qz0XL!ZV`L=NnyANLo zQ+gcPBDpqn@zBNZRxW7|) z$*qbmtL@F{5S&95^!$;V#g`*L;FZw#KkAbCs3#V=uB4NN#U`sakZFU2HEI?ks7Dsq&ROrak#AvEH|GYk~cN z-oYbXaZQ|4jDps_<5wfH44oN*XPh1H-<59xMxzd~07FF+FO3!KO zkzNs<^C)%5zR+;s{a_h8iyk@DSK5($fm`l$c*8Cna^fTc>i~h}zJUY22WwUg;4xU6 zE40Voz~Sl1fxqzW8!QiZceZ;vST%3pn9qkNDEBsI+pnKL20^*sWVSI3z)zY;1PmfD zk8=M~&&^oEhq?Xq!q{llMLGBQ>t)~ra4xR!eZAQ1X^ph;*FG+*f4xJlJ!C>*eEV+r z#z~GXOppZ=2|4(iyLmNON}QN2ao#+YHqDy{lvv2w_X*(?ul{+G5$Yp=apGx^6Q9v~ z^YKb>;`PTfcYPtQJz@VX`S#e@Bso3?a_*Ok9NBKwB4Es(@j^U%UHht?;4%Xv NIrrxNmNc!u{{!hMI2Hf^ literal 0 HcmV?d00001 From 102c8c55f217606cdbdc9a449667e034676b3e75 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 23 Oct 2019 22:25:14 +0200 Subject: [PATCH 063/480] ipq40xx: add support for Aruba AP-303 Hardware -------- SoC: Qualcomm IPQ4029 RAM: 512M DDR3 FLASH: - 128MB NAND (Macronix MX30LF1G18AC) - 4MB SPI-NOR (Macronix MX25R3235F) TPM: Atmel AT97SC3203 BLE: Texas Instruments CC2540T attached to ttyMSM0 ETH: Atheros AR8035 LED: WiFi (amber / green) System (red / green) BTN: Reset To connect to the serial console, you can solder to the labled pads next to the USB port or use your Aruba supplied UARt adapter. Do NOT plug a standard USB cable into the Console labled USB-port! Aruba/HPE simply put UART on the micro-USB pins. You can solder yourself an adapter cable: VCC - NC D+ - TX D- - RX GND - GND The console setting in bootloader and OS is 9600 8N1. Voltage level is 3.3V. To enable a full list of commands in the U-Boot "help" command, execute the literal "diag" command. Installation ------------ 1. Get the OpenWrt initramfs image. Rename it to ipq40xx.ari and put it into the TFTP server root directory. Configure the TFTP server to be reachable at 192.168.1.75/24. Connect the machine running the TFTP server to the ethernet port of the access point. 2. Connect to the serial console. Interrupt autobooting by pressing Enter when prompted. 3. Configure the bootargs and bootcmd for OpenWrt. $ setenv bootargs_openwrt "setenv bootargs console=ttyMSM1,9600n8" $ setenv nandboot_openwrt "run bootargs_openwrt; ubi part aos1; ubi read 0x85000000 kernel; bootm 0x85000000" $ setenv ramboot_openwrt "run bootargs_openwrt; setenv ipaddr 192.168.1.105; setenv serverip 192.168.1.75; netget; set fdt_high 0x87000000; bootm" $ setenv bootcmd "run nandboot_openwrt" $ saveenv 4. Load OpenWrt into RAM: $ run ramboot_openwrt 5. After OpenWrt booted, transfer the OpenWrt sysupgrade image to the /tmp folder on the device. 6. Flash OpenWrt: $ ubidetach -p /dev/mtd1 $ ubiformat /dev/mtd1 $ sysupgrade -n /tmp/openwrt-sysupgrade.bin To go back to the stock firmware, simply reset the bootcmd in the bootloader to the original value: $ setenv bootcmd "boot" $ saveenv Signed-off-by: David Bauer --- .../ipq40xx/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 8 + target/linux/ipq40xx/base-files/etc/inittab | 1 + .../preinit/06_set_preinit_iface_ipq40xx.sh | 1 + .../base-files/lib/upgrade/platform.sh | 1 + .../arch/arm/boot/dts/qcom-ipq4029-ap-303.dts | 419 ++++++++++++++++++ target/linux/ipq40xx/image/Makefile | 10 + ...d-spi-nor-Add-support-for-mx25r3235f.patch | 26 ++ .../901-arm-boot-add-dts-files.patch | 3 +- 9 files changed, 469 insertions(+), 1 deletion(-) create mode 100644 target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts create mode 100644 target/linux/ipq40xx/patches-4.19/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 122c1a103d..dcf684f511 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -40,6 +40,7 @@ ipq40xx_setup_interfaces() ucidef_add_switch "switch0" \ "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" ;; + aruba,ap-303|\ avm,fritzrepeater-1200|\ engenius,eap1300|\ meraki,mr33|\ diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 3d46519415..8b6abc4ff7 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -51,6 +51,10 @@ case "$FIRMWARE" in qcom,ap-dk01.1-c1) caldata_extract "ART" 0x1000 0x2f20 ;; + aruba,ap-303) + caldata_extract "ART" 0x1000 0x2f20 + ath10k_patch_mac $(mtd_get_mac_binary mfginfo 0x1D) + ;; asus,map-ac2200) caldata_extract_ubi "Factory" 0x1000 0x2f20 ;; @@ -116,6 +120,10 @@ case "$FIRMWARE" in qcom,ap-dk01.1-c1) caldata_extract "ART" 0x5000 0x2f20 ;; + aruba,ap-303) + caldata_extract "ART" 0x5000 0x2f20 + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mfginfo 0x1D) +1) + ;; asus,map-ac2200) caldata_extract_ubi "Factory" 0x5000 0x2f20 ;; diff --git a/target/linux/ipq40xx/base-files/etc/inittab b/target/linux/ipq40xx/base-files/etc/inittab index 809bba5e5f..3181021a05 100644 --- a/target/linux/ipq40xx/base-files/etc/inittab +++ b/target/linux/ipq40xx/base-files/etc/inittab @@ -2,3 +2,4 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown ttyMSM0::askfirst:/usr/libexec/login.sh +ttyMSM1::askfirst:/usr/libexec/login.sh diff --git a/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh b/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh index be4b6322cb..a0dec1042a 100644 --- a/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh +++ b/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh @@ -4,6 +4,7 @@ set_preinit_iface() { . /lib/functions.sh case $(board_name) in + aruba,ap-303| \ asus,rt-ac58u| \ avm,fritzbox-4040| \ glinet,gl-b1300| \ diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index 41f8fcfccb..60070fa9e3 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -47,6 +47,7 @@ zyxel_do_upgrade() { platform_do_upgrade() { case "$(board_name)" in 8dev,jalapeno |\ + aruba,ap-303 |\ avm,fritzbox-7530 |\ avm,fritzrepeater-1200 |\ avm,fritzrepeater-3000 |\ diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts new file mode 100644 index 0000000000..24e5dc2809 --- /dev/null +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts @@ -0,0 +1,419 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT + +#include "qcom-ipq4019.dtsi" +#include +#include +#include + +/ { + model = "Aruba AP-303"; + compatible = "aruba,ap-303"; + + aliases { + led-boot = &led_system_green; + led-failsafe = &led_system_red; + led-running = &led_system_green; + led-upgrade = &led_system_red; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x10000000>; + }; + + soc { + rng@22000 { + status = "okay"; + }; + + mdio@90000 { + status = "okay"; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + + /delete-node/ ethernet-phy@0; + /delete-node/ ethernet-phy@2; + /delete-node/ ethernet-phy@3; + /delete-node/ ethernet-phy@4; + + ethernet-phy@5 { + reg = <0x5>; + }; + }; + + counter@4a1000 { + compatible = "qcom,qca-gcnt"; + reg = <0x4a1000 0x4>; + }; + + ess_tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + + crypto@8e3a000 { + status = "okay"; + }; + + watchdog@b017000 { + status = "okay"; + }; + + ess-switch@c000000 { + switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */ + switch_lan_bmp = <0x0>; /* lan port bitmap */ + switch_wan_bmp = <0x10>; /* wan port bitmap */ + }; + + edma@c080000 { + qcom,single-phy; + qcom,num_gmac = <1>; + phy-mode = "rgmii-id"; + status = "okay"; + }; + + i2c_0: i2c@78b7000 { + pinctrl-0 = <&i2c_0_pins>; + pinctrl-names = "default"; + status = "ok"; + + tpm@29 { + /* No Driver */ + compatible = "atmel,at97sc3203"; + reg = <0x29>; + read-only; + }; + }; + }; + + leds { + compatible = "gpio-leds"; + + wifi_green { + label = "ap-303:green:wifi"; + gpios = <&tlmm 39 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; + }; + + wifi_amber { + label = "ap-303:amber:wifi"; + gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1tpt"; + }; + + led_system_red: system_red { + label = "ap-303:red:system"; + gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; + }; + + led_system_green: system_green { + label = "ap-303:green:system"; + gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset button"; + gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&blsp_dma { + status = "okay"; +}; + +&blsp1_uart1 { + /* Texas Instruments CC2540T BLE radio */ + pinctrl-0 = <&serial_0_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&blsp1_uart2 { + pinctrl-0 = <&serial_1_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&cryptobam { + status = "okay"; +}; + +&gmac0 { + qcom,phy_mdio_addr = <5>; + qcom,poll_required = <1>; + vlan_tag = <0 0x20>; +}; + +&qpic_bam { + status = "okay"; +}; + +&tlmm { + /* + * In addition to the Pins listed below, + * the following GPIOs have "features": + * 54 - out - active low to force HW reset + * 41 - out - active low to reset TPM + * 43 - out - active low to reset BLE radio + * 19 - in - active high when DC powered + */ + mdio_pins: mdio_pinmux { + mux_1 { + pins = "gpio6"; + function = "mdio"; + bias-pull-up; + }; + mux_2 { + pins = "gpio7"; + function = "mdc"; + bias-pull-up; + }; + }; + + nand_pins: nand_pins { + pullups { + pins = "gpio53", "gpio58", "gpio59"; + function = "qpic"; + bias-pull-up; + }; + + pulldowns { + pins = "gpio54", "gpio55", "gpio56", + "gpio57", "gpio60", "gpio61", + "gpio62", "gpio63", "gpio64", + "gpio65", "gpio66", "gpio67", + "gpio68", "gpio69"; + function = "qpic"; + bias-pull-down; + }; + }; + + spi_0_pins: spi_0_pinmux { + pin { + function = "blsp_spi0"; + pins = "gpio13", "gpio14", "gpio15"; + drive-strength = <12>; + bias-disable; + }; + pin_cs { + function = "gpio"; + pins = "gpio12"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; + i2c_0_pins: i2c_0_pinmux { + mux { + pins = "gpio10", "gpio11"; + function = "blsp_i2c0"; + drive-strength = <4>; + bias-disable; + }; + }; + + serial_0_pins: serial_0_pinmux { + mux { + pins = "gpio16", "gpio17"; + function = "blsp_uart0"; + bias-disable; + }; + }; + + serial_1_pins: serial_1_pinmux { + mux { + pins = "gpio8", "gpio9"; + function = "blsp_uart1"; + bias-disable; + }; + }; + + phy-reset { + line-name = "PHY-reset"; + gpios = <42 GPIO_ACTIVE_HIGH>; + gpio-hog; + output-high; + }; +}; + +&nand { + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + status = "okay"; + + nand@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + /* 'aos0' in Aruba firmware */ + label = "aos0"; + reg = <0x0 0x2000000>; + read-only; + }; + + partition@2000000 { + /* 'aos1' in AVM firmware */ + label = "ubi"; + reg = <0x2000000 0x2000000>; + }; + + partition@4000000 { + label = "aruba-ubifs"; + reg = <0x4000000 0x4000000>; + read-only; + }; + }; + }; +}; + +&blsp1_spi1 { + pinctrl-0 = <&spi_0_pins>; + pinctrl-names = "default"; + status = "okay"; + cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <24000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* + * There is no partition map for the NOR flash + * in the stock firmware. + * + * All partitions here are based on offsets + * found in the U-Boot GPL code and information + * from smem. + */ + + partition@0 { + label = "sbl1"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "mibib"; + reg = <0x40000 0x20000>; + read-only; + }; + + partition@60000 { + label = "qsee"; + reg = <0x60000 0x60000>; + read-only; + }; + + partition@c0000 { + label = "cdt"; + reg = <0xc0000 0x10000>; + read-only; + }; + + partition@d0000 { + label = "ddrparams"; + reg = <0xd0000 0x10000>; + read-only; + }; + + partition@e0000 { + label = "ART"; + reg = <0xe0000 0x10000>; + read-only; + }; + + partition@f0000 { + label = "appsbl"; + reg = <0xf0000 0xf0000>; + read-only; + }; + + partition@1e0000 { + label = "mfginfo"; + reg = <0x1e0000 0x10000>; + read-only; + }; + + partition@1f0000 { + label = "apcd"; + reg = <0x1f0000 0x10000>; + read-only; + }; + + partition@200000 { + label = "osss"; + reg = <0x200000 0x180000>; + read-only; + }; + + partition@380000 { + /* This is empty */ + label = "appsblenv"; + reg = <0x380000 0x10000>; + read-only; + }; + + partition@390000 { + label = "pds"; + reg = <0x390000 0x10000>; + read-only; + }; + + partition@3a0000 { + label = "fcache"; + reg = <0x3a0000 0x10000>; + read-only; + }; + + partition@3b0000 { + /* Called osss1 in smem */ + label = "u-boot-env-bak"; + reg = <0x3b0000 0x10000>; + read-only; + }; + + partition@3f0000 { + label = "u-boot-env"; + reg = <0x3f0000 0x10000>; + read-only; + }; + }; + }; +}; + +&wifi0 { + status = "okay"; + qcom,ath10k-calibration-variant = "Aruba-AP-303"; +}; + +&wifi1 { + status = "okay"; + qcom,ath10k-calibration-variant = "Aruba-AP-303"; +}; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index ac34447475..fada35a49d 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -91,6 +91,16 @@ define Device/alfa-network_ap120c-ac endef TARGET_DEVICES += alfa-network_ap120c-ac +define Device/aruba_ap-303 + $(call Device/FitImageLzma) + DEVICE_VENDOR := Aruba + DEVICE_MODEL := AP-303 + DEVICE_DTS := qcom-ipq4029-ap-303 + DEVICE_PACKAGES := ipq-wifi-aruba_ap-303 + IMAGES := sysupgrade.bin +endef +TARGET_DEVICES += aruba_ap-303 + define Device/asus_map-ac2200 $(call Device/FitImageLzma) DEVICE_VENDOR := ASUS diff --git a/target/linux/ipq40xx/patches-4.19/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch b/target/linux/ipq40xx/patches-4.19/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch new file mode 100644 index 0000000000..7dee12fedd --- /dev/null +++ b/target/linux/ipq40xx/patches-4.19/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch @@ -0,0 +1,26 @@ +From 158acdbf0336f601971637f988b57a6a67a0869b Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 15 Dec 2019 13:10:50 +0100 +Subject: [PATCH] mtd: spi-nor: Add support for mx25r3235f + +Add MTD support for the Macronix MX25R3235F SPI NOR chip from Macronix. +The chip has 4MB of total capacity, divided into a total of 64 sectors, +each 64KB sized. The chip also supports 4KB large sectors. +Additionally, it supports dual and quad read modes. + +Signed-off-by: David Bauer +--- + drivers/mtd/spi-nor/spi-nor.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -1091,6 +1091,8 @@ static const struct flash_info spi_nor_i + { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, + { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, + { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, ++ { "mx25r3235f", INFO(0xc22816, 0, 64 * 1024, 64, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch index 93214e60e9..52484b3dd3 100644 --- a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -785,11 +785,37 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -785,11 +785,38 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ @@ -43,6 +43,7 @@ Signed-off-by: John Crispin + qcom-ipq4019-unielec-u4019-32m.dtb \ + qcom-ipq4019-wpj419.dtb \ + qcom-ipq4028-wpj428.dtb \ ++ qcom-ipq4029-ap-303.dtb \ + qcom-ipq4029-gl-b1300.dtb \ + qcom-ipq4029-mr33.dtb \ qcom-ipq8064-ap148.dtb \ From a4260eaab7744c8e3f1f7a62a61aab5e3b562342 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 15 Dec 2019 18:11:45 +0900 Subject: [PATCH 064/480] ath79: fix MAC address setup for TP-Link TL-WDR3600/TL-WDR4300 The current ethernet MAC address setup of TL-WDR4300 board is different from the setup of stock firmware: OpenWrt: lan = label_mac -2, wan = label_mac -2 stock: lan = label_mac, wan = label_mac +1 The full address assignment is as follows: LAN label WAN label + 1 5G label 2G label - 1 This patch changes all devices using TL-WDR4300 board: TL-WDR3600 v1 (checked on device) TL-WDR4300 v1 (checked on device) TL-WDR4300 v1 (IL) Signed-off-by: Sungbo Eo [rephrase/extend commit title/message] Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi | 1 - .../linux/ath79/generic/base-files/etc/board.d/02_network | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi index 7071d35e24..dc85075bcf 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi @@ -116,7 +116,6 @@ pll-data = <0x06000000 0x00000101 0x00001616>; mtd-mac-address = <&uboot 0x1fc00>; - mtd-mac-address-increment = <(-2)>; phy-mode = "rgmii"; phy-handle = <&phy0>; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index d16ae670b4..b1b40087ef 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -390,6 +390,12 @@ ath79_setup_macs() base_mac=$(mtd_get_mac_binary info 0x8) wan_mac=$(macaddr_add "$base_mac" 1) ;; + tplink,tl-wdr3600-v1|\ + tplink,tl-wdr4300-v1|\ + tplink,tl-wdr4300-v1-il) + base_mac=$(mtd_get_mac_binary u-boot 0x1fc00) + wan_mac=$(macaddr_add "$base_mac" 1) + ;; trendnet,tew-823dru) lan_mac=$(mtd_get_mac_text mac 0x4) wan_mac=$(mtd_get_mac_text mac 0x18) From 9b02d32e34df2bb8821ec6f08f525bee22d0d1ba Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 15 Dec 2019 18:10:18 +0900 Subject: [PATCH 065/480] ar71xx: fix MAC address setup for TL-WDR4300 board The current ethernet MAC address setup of TL-WDR4300 board is different from the setup of stock firmware: OpenWrt: lan = label_mac -2, wan = label_mac -2 stock: lan = label_mac, wan = label_mac +1 This patch applies to all devices using TL-WDR4300 board: TL-WDR3600 v1 TL-WDR4300 v1 TL-WDR4300 v1 (IL) TL-WDR4310 v1 Mercury MW4530R v1 Signed-off-by: Sungbo Eo --- target/linux/ar71xx/base-files/etc/board.d/02_network | 4 ++++ target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 5307dd23f2..6276ec166c 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -633,6 +633,10 @@ ar71xx_setup_macs() fritz300e) lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) ;; + tl-wdr4300) + base_mac=$(mtd_get_mac_binary u-boot 0x1fc00) + wan_mac=$(macaddr_add "$base_mac" 1) + ;; tl-wr1043n-v5|\ tl-wr1043nd-v4) lan_mac=$(mtd_get_mac_binary product-info 0x8) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c index 972cb7960d..b9fea95bc2 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c @@ -183,7 +183,7 @@ static void __init wdr4300_setup(void) ath79_register_mdio(0, 0x0); - ath79_init_mac(ath79_eth0_data.mac_addr, mac, -2); + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); /* GMAC0 is connected to an AR8327N switch */ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; From 80839694056d7eedb1fac1c4b61847c4a4f94d6a Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 21 Dec 2019 12:43:40 +0900 Subject: [PATCH 066/480] ipq40xx: improve ASUS RT-AC58U support This patch does the following: - move WiFi LED setup to DTS - fix LAN/WAN MAC addresses and add label MAC address - wan5G -> wlan5G, power -> led_power - increase flash SPI frequency to 30MHz MAC addresses are stored in Factory partition at: 0x1006: WiFi 2.4GHz, WAN (label_mac) 0x5006: WiFi 5GHz, LAN (label_mac +4) By improving flash speed, `time dd if=/dev/mtdblock8 of=/dev/null bs=2k` is reduced from 7m 10.26s to 5m 9.52s. Using higher frequencies did not improve speed further. Signed-off-by: Sungbo Eo --- .../ipq40xx/base-files/etc/board.d/01_leds | 2 -- .../ipq40xx/base-files/etc/board.d/02_network | 8 ++++++-- .../arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 18 ++++++++++-------- .../arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 18 ++++++++++-------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds index 9cd51e5de0..0326bab382 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds @@ -15,8 +15,6 @@ alfa-network,ap120c-ac) ucidef_set_led_netdev "wan" "WAN" "${boardname}:amber:wan" "eth1" ;; asus,rt-ac58u) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2G" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:blue:wlan5G" "phy1tpt" ucidef_set_led_netdev "wan" "WAN" "${boardname}:blue:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "${boardname}:blue:lan" "switch0" "0x1e" ;; diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index dcf684f511..ae8cb2efe7 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -79,12 +79,16 @@ ipq40xx_setup_interfaces() ipq40xx_setup_macs() { local board="$1" + local lan_mac="" + local wan_mac="" + local label_mac="" case "$board" in asus,rt-ac58u) CI_UBIPART=UBI_DEV - wan_mac=$(mtd_get_mac_binary_ubi Factory 0x5006) - lan_mac=$(mtd_get_mac_binary_ubi Factory 0x1006) + wan_mac=$(mtd_get_mac_binary_ubi Factory 0x1006) + lan_mac=$(mtd_get_mac_binary_ubi Factory 0x5006) + label_mac=$wan_mac ;; cilab,meshpoint-one) label_mac=$(mtd_get_mac_binary "ART" 0x1006) diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index 0f6cd689cf..4e5559386e 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -137,7 +137,7 @@ leds { compatible = "gpio-leds"; - power: status { + led_power: status { label = "rt-ac58u:blue:status"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; @@ -150,11 +150,13 @@ wlan2G { label = "rt-ac58u:blue:wlan2G"; gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; }; - wan5G { + wlan5G { label = "rt-ac58u:blue:wlan5G"; gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1tpt"; }; usb { @@ -224,7 +226,7 @@ compatible = "jedec,spi-nor"; reg = <0>; linux,modalias = "m25p80", "mx25l1606e", "n25q128a11"; - spi-max-frequency = <24000000>; + spi-max-frequency = <30000000>; partitions { compatible = "fixed-partitions"; @@ -280,7 +282,7 @@ #size-cells = <0>; compatible = "spinand,mt29f"; reg = <1>; - spi-max-frequency = <24000000>; + spi-max-frequency = <30000000>; /* * U-boot looks for "spinand,mt29f" node, diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index 26c086ed25..a569a158fd 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -131,7 +131,7 @@ leds { compatible = "gpio-leds"; - power: status { + led_power: status { label = "rt-ac58u:blue:status"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; @@ -144,11 +144,13 @@ wlan2G { label = "rt-ac58u:blue:wlan2G"; gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; }; - wan5G { + wlan5G { label = "rt-ac58u:blue:wlan5G"; gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1tpt"; }; usb { @@ -216,7 +218,7 @@ compatible = "jedec,spi-nor"; reg = <0>; linux,modalias = "m25p80", "mx25l1606e", "n25q128a11"; - spi-max-frequency = <24000000>; + spi-max-frequency = <30000000>; partitions { compatible = "fixed-partitions"; @@ -270,7 +272,7 @@ spi-nand@1 { compatible = "spi-nand"; reg = <1>; - spi-max-frequency = <24000000>; + spi-max-frequency = <30000000>; /* * U-boot looks for "spinand,mt29f" node, From d0efb1ba95f34b70dca759b6cfeb854be43a4edf Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 21 Dec 2019 21:43:24 +0900 Subject: [PATCH 067/480] ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U RT-AC58U has single USB 3.0 port, and only usb3_port1 is actually used. Signed-off-by: Sungbo Eo --- .../arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 25 +------------------ .../arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 25 +------------------ 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index 4e5559386e..f046bdcb5e 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -58,20 +58,6 @@ qcom,wifi_noc_memtype_m0_m2 = ; }; - usb2@60f8800 { - status = "okay"; - - dwc3@6000000 { - #address-cells = <1>; - #size-cells = <0>; - - usb2_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - }; - }; - usb3@8af8800 { status = "okay"; @@ -83,11 +69,6 @@ reg = <1>; #trigger-source-cells = <0>; }; - - usb3_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; }; }; @@ -162,7 +143,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; + trigger-sources = <&usb3_port1>; linux,default-trigger = "usbport"; }; @@ -316,7 +297,3 @@ &usb3_hs_phy { status = "okay"; }; - -&usb2_hs_phy { - status = "okay"; -}; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index a569a158fd..331d8e4d74 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -62,20 +62,6 @@ qcom,wifi_noc_memtype_m0_m2 = ; }; - usb2@60f8800 { - status = "okay"; - - dwc3@6000000 { - #address-cells = <1>; - #size-cells = <0>; - - usb2_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - }; - }; - usb3@8af8800 { status = "okay"; @@ -87,11 +73,6 @@ reg = <1>; #trigger-source-cells = <0>; }; - - usb3_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; }; }; @@ -156,7 +137,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; + trigger-sources = <&usb3_port1>; linux,default-trigger = "usbport"; }; @@ -312,10 +293,6 @@ status = "okay"; }; -&usb2_hs_phy { - status = "okay"; -}; - &wifi0 { status = "okay"; qcom,ath10k-calibration-variant = "RT-AC58U"; From 02f8dbc6fe71c04d89aa5e3129a5ec84903cf395 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 17 Dec 2019 13:43:25 +0100 Subject: [PATCH 068/480] ramips: add eth0 MAC address for Edimax RG21S So far, lan/wan MAC address for Edimax RG21S are only read using mtd_get_mac_ascii, so eth0.1 and eth0.2 addresses are set, but eth0 address is random. Since the device's LAN address is the same as for 2.4 GHz, though, this patch set's the eth0 address based on the 2.4 GHz one, which can be extracted by mtd-mac-address. This will also allow to move the label MAC address setup to DT. The setup of lan_mac and wan_mac are kept in 02_network, so those locations are still in use, too. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7621_edimax_rg21s.dts | 3 +++ target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index be38beef12..f1adf38e3e 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -15,6 +15,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; chosen { @@ -125,6 +126,8 @@ }; ðernet { + mtd-mac-address = <&factory 0x4>; + mediatek,portmap = "wllll"; port@5 { status = "disabled"; diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index aad9a60bfe..5c6b5659cb 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -201,7 +201,6 @@ ramips_setup_macs() edimax,rg21s) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) - label_mac=$(mtd_get_mac_binary factory 0x4) ;; hiwifi,hc5962) lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ") From 8ea7aa5380aba4301bd1804e326534c28249bb24 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 19 Dec 2019 19:03:44 +0100 Subject: [PATCH 069/480] ramips: further DTS improvements for Edimax RG21S This fixes the state_default node by setting the correct groups and inheriting &state_default from parent DTSI directly. The compatible for the wifi nodes is changed to the more generic mediatek,mt76. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7621_edimax_rg21s.dts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index f1adf38e3e..ce28e8e04d 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -109,7 +109,7 @@ &pcie0 { wifi0: wifi@0,0 { - compatible = "pci14c3,7615"; + compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x0000>; ieee80211-freq-limit = <2400000 2500000>; @@ -118,7 +118,7 @@ &pcie1 { wifi1: wifi@0,0 { - compatible = "pci14c3,7615"; + compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x8000>; ieee80211-freq-limit = <5000000 6000000>; @@ -134,12 +134,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "uart2", "jtag", "wdt"; + ralink,function = "gpio"; }; }; From b3bdfd5df55b104f3affea116a3c54075ea6549c Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 11:40:25 +0200 Subject: [PATCH 070/480] lantiq: dts: assign the MDIO pins to the gsw node Assign the MDIO pins to the switch node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. This converts amazonse, ar9 and vr9. danube is skipped because the pin controller doesn't define a pinmux for the MDIO pins (some of the SoC pads may be hardwired to the MDIO pins instead of being configurable). Signed-off-by: Martin Blumenstingl --- .../lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts | 4 ---- .../lantiq/files/arch/mips/boot/dts/ASL56026.dts | 12 ------------ .../lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts | 4 ---- .../linux/lantiq/files/arch/mips/boot/dts/DM200.dts | 10 ---------- .../lantiq/files/arch/mips/boot/dts/EASY80920.dtsi | 4 ---- .../files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi | 5 ----- .../lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi | 5 ----- .../lantiq/files/arch/mips/boot/dts/FRITZ7412.dts | 4 ---- .../lantiq/files/arch/mips/boot/dts/P2601HNFX.dts | 4 ---- .../lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi | 4 ---- .../lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi | 4 ---- .../lantiq/files/arch/mips/boot/dts/VG3503J.dts | 4 ---- .../lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi | 4 ---- .../lantiq/files/arch/mips/boot/dts/VGV7519.dtsi | 4 ---- .../linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi | 4 ---- .../lantiq/files/arch/mips/boot/dts/WBMR300.dts | 4 ---- .../lantiq/files/arch/mips/boot/dts/amazonse.dtsi | 9 +++++++++ .../linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi | 9 +++++++++ .../linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi | 9 +++++++++ 19 files changed, 27 insertions(+), 80 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts index f245fe370b..d6c521cfe7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts @@ -177,10 +177,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pcie-rst { lantiq,pins = "io21"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts index 1c7f03c355..3d10f582b0 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts @@ -119,18 +119,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - }; -}; - &localbus { flash@0 { compatible = "lantiq,nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts index c105f0a9ae..186ed37a9c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts @@ -197,10 +197,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts index 4796123c20..362dccfda7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts @@ -119,16 +119,6 @@ }; &gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - }; - pins_spi_default: pins_spi_default { spi_in { lantiq,groups = "spi_di"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index b7ccb4ed57..d09a9626bb 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -198,10 +198,6 @@ "nand rd", "nand rdy"; lantiq,function = "ebu"; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci { lantiq,groups = "gnt1", "req1"; lantiq,function = "pci"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi index 02e9589969..6790815a24 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi @@ -193,11 +193,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - nand { lantiq,groups = "nand cle", "nand ale", "nand rd", "nand cs1", "nand rdy"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi index f58a414a28..1553d2f7f4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi @@ -155,11 +155,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - phy-rst { lantiq,pins = "io37", "io44"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts index ccf61663ba..04aa99d185 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts @@ -167,10 +167,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pcie-rst { lantiq,pins = "io11"; lantiq,open-drain = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts index 62e5e70169..c238826932 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts @@ -123,10 +123,6 @@ lantiq,open-drain; lantiq,pull = <0>; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; }; usb_vbus: regulator-usb-vbus { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index 9956a5b89f..274abcc503 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -196,10 +196,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led1", "gphy1 led1", "gphy0 led2", "gphy1 led2"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi index 1a7d90a5bf..00475e734e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi @@ -175,10 +175,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led1", "gphy1 led1"; lantiq,function = "gphy"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts index 2d52176430..f37980a536 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts @@ -115,10 +115,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led0", "gphy0 led1", "gphy0 led2", "gphy1 led0", diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi index f10a9dd8e6..6dc45f057d 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi @@ -197,10 +197,6 @@ lantiq,pull = <2>; lantiq,output = <1>; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi index 0b3e72d3ab..e71e3837ea 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi @@ -216,10 +216,6 @@ lantiq,output = <1>; lantiq,pull = <0>; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi index 3c04785314..7fedcee92f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi @@ -95,10 +95,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led1", "gphy1 led1"; lantiq,function = "gphy"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts index 48f6dc71a1..7e5f58c71e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts @@ -225,10 +225,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi index feb4cd529a..33dc5612bf 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi @@ -148,6 +148,13 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; }; asc1: serial@e100c00 { @@ -198,6 +205,8 @@ reg = <0xe180000 0x40000>; interrupt-parent = <&icu0>; interrupts = <105 109>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index 37b44aecdd..3244908e32 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -168,6 +168,13 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; }; stp: stp@e100bb0 { @@ -238,6 +245,8 @@ interrupt-parent = <&icu0>; interrupts = <73 72>; mac-address = [ 00 11 22 33 44 55 ]; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; ppe@e234000 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index e8b87dbcc7..81e2fea549 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -210,6 +210,13 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; }; stp: stp@e100bb0 { @@ -285,6 +292,8 @@ resets = <&reset0 21 16>, <&reset0 8 8>; reset-names = "switch", "ppe"; lantiq,phys = <&gphy0>, <&gphy1>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; mei@e116000 { From edb0a936f0af134ed2fb01c05e5d31b9944d2454 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 11:50:23 +0200 Subject: [PATCH 071/480] lantiq: dts: define the SPI pins in {amazonse,ar9,vr9}.dtsi Define the SPI pins in the corresponding SoCs.dtsi and assign them to the SPI controller node. All known boards use CS4 and it's likely that this is hardcoded in bootrom so this doesn't bother with having per-board SPI pinmux settings. Signed-off-by: Martin Blumenstingl --- .../files/arch/mips/boot/dts/DGN1000B.dts | 14 ------------ .../files/arch/mips/boot/dts/DGN3500.dtsi | 15 ------------- .../lantiq/files/arch/mips/boot/dts/DM200.dts | 17 -------------- .../files/arch/mips/boot/dts/EASY80920.dtsi | 15 ------------- .../arch/mips/boot/dts/FRITZ3370-REV2.dtsi | 17 -------------- .../files/arch/mips/boot/dts/FRITZ7362SL.dts | 18 --------------- .../files/arch/mips/boot/dts/TDW89X0.dtsi | 15 ------------- .../files/arch/mips/boot/dts/VR200.dtsi | 15 ------------- .../files/arch/mips/boot/dts/WBMR300.dts | 15 ------------- .../files/arch/mips/boot/dts/amazonse.dtsi | 22 +++++++++++++++++++ .../lantiq/files/arch/mips/boot/dts/ar9.dtsi | 22 +++++++++++++++++++ .../lantiq/files/arch/mips/boot/dts/vr9.dtsi | 22 +++++++++++++++++++ 12 files changed, 66 insertions(+), 141 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts index b4eee73b73..0143a21a9c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts @@ -96,18 +96,6 @@ lantiq,open-drain = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs1"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &gsw { @@ -117,8 +105,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; flash@1 { compatible = "jedec,spi-nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi index 4a20dcefd3..b12101a5d1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi @@ -131,18 +131,6 @@ lantiq,pull = <0>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &gsw { @@ -163,9 +151,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts index 362dccfda7..cdba656e49 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts @@ -118,20 +118,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; -}; - &pcie0 { status = "disabled"; }; @@ -139,9 +125,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index d09a9626bb..687a2f4098 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -222,24 +222,9 @@ lantiq,pull = <2>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &spi { - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - status = "okay"; flash@4 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi index 6790815a24..b83f0f058a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi @@ -213,20 +213,6 @@ lantiq,output = <1>; }; }; - - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &pcie0 { @@ -250,9 +236,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts index cca79c926e..8f1fc261fb 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts @@ -35,22 +35,6 @@ label = "fritz7362sl:green:dect"; }; -&gpio { - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; -}; - &state_default { nand { lantiq,groups = "nand ale", "nand cle", @@ -67,8 +51,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; flash@4 { #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi index 00475e734e..d0e8cd8ced 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi @@ -194,18 +194,6 @@ lantiq,output = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &pcie0 { @@ -232,9 +220,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi index 7fedcee92f..44938eddd3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi @@ -114,18 +114,6 @@ lantiq,output = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &pci0 { @@ -136,9 +124,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts index 7e5f58c71e..4631ad4ffe 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts @@ -237,26 +237,11 @@ lantiq,output = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi index 33dc5612bf..6b5606d8ab 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi @@ -133,6 +133,8 @@ "spi_frm"; #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>; status = "disabled"; }; @@ -155,6 +157,26 @@ lantiq,function = "mdio"; }; }; + + spi_pins: spi { + mux-0 { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + mux-1 { + lantiq,groups = "spi_do", "spi_clk"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + spi_cs4_pins: spi-cs4 { + mux { + lantiq,groups = "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; asc1: serial@e100c00 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index 3244908e32..ab518e75c6 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -160,6 +160,8 @@ "spi_frm"; #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>; status = "disabled"; }; @@ -175,6 +177,26 @@ lantiq,function = "mdio"; }; }; + + spi_pins: spi { + mux-0 { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + mux-1 { + lantiq,groups = "spi_do", "spi_clk"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + spi_cs4_pins: spi-cs4 { + mux { + lantiq,groups = "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; stp: stp@e100bb0 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index 81e2fea549..4639aaf490 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -202,6 +202,8 @@ "spi_frm"; #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>; status = "disabled"; }; @@ -217,6 +219,26 @@ lantiq,function = "mdio"; }; }; + + spi_pins: spi { + mux-0 { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + mux-1 { + lantiq,groups = "spi_do", "spi_clk"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + spi_cs4_pins: spi-cs4 { + mux { + lantiq,groups = "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; stp: stp@e100bb0 { From 7298c25f744a042f021da7a5e0fa81268bb454ce Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 12:10:12 +0200 Subject: [PATCH 072/480] lantiq: dts: assign the NAND pins to the nand-controller node Assign the NAND pins to the NAND controller node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. While here, define all NAND pins (CLE, ALE, read/RD, ready busy/RDY and CE/CS1). This means that the pinctrl subsystem knows that these pins are in use and cannot be re-assigned as GPIOs for example. Signed-off-by: Martin Blumenstingl --- .../files/arch/mips/boot/dts/BTHOMEHUBV2B.dts | 16 +++--------- .../files/arch/mips/boot/dts/BTHOMEHUBV3A.dts | 17 +++--------- .../files/arch/mips/boot/dts/BTHOMEHUBV5A.dts | 17 +++--------- .../files/arch/mips/boot/dts/EASY80920.dtsi | 11 ++------ .../arch/mips/boot/dts/EASY80920NAND.dts | 3 +++ .../mips/boot/dts/FRITZ3370-REV2-HYNIX.dts | 3 +++ .../mips/boot/dts/FRITZ3370-REV2-MICRON.dts | 3 +++ .../arch/mips/boot/dts/FRITZ3370-REV2.dtsi | 7 ----- .../files/arch/mips/boot/dts/FRITZ7362SL.dts | 10 +++---- .../files/arch/mips/boot/dts/FRITZ7412.dts | 13 +++------- .../files/arch/mips/boot/dts/P2812HNUF1.dts | 3 +++ .../files/arch/mips/boot/dts/P2812HNUF3.dts | 3 +++ .../files/arch/mips/boot/dts/P2812HNUFX.dtsi | 13 ---------- .../lantiq/files/arch/mips/boot/dts/ar9.dtsi | 26 +++++++++++++++++++ .../files/arch/mips/boot/dts/danube.dtsi | 26 +++++++++++++++++++ .../lantiq/files/arch/mips/boot/dts/vr9.dtsi | 26 +++++++++++++++++++ 16 files changed, 112 insertions(+), 85 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts index 2b3afb2295..5d69ed8d72 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts @@ -108,19 +108,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -209,6 +196,9 @@ reg = <1 0x0 0x2000000 >; req-mask = <0x1>; /* PCI request lines to mask during NAND access */ + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts index 823a158fbf..b4d9fbea91 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts @@ -109,20 +109,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - pci_in { lantiq,groups = "req1"; lantiq,function = "pci"; @@ -158,6 +144,9 @@ reg = <1 0x0 0x2000000 >; req-mask = <0x1>; /* PCI request lines to mask during NAND access */ + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts index 186ed37a9c..f6a2d9f6a7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts @@ -214,19 +214,6 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; }; }; @@ -236,6 +223,10 @@ lantiq,cs = <1>; bank-width = <2>; reg = <0x1 0x0 0x2000000>; + + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-on-flash-bbt; nand-ecc-strength = <3>; nand-ecc-step-size = <256>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index 687a2f4098..33c8dd19f7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -193,18 +193,12 @@ lantiq,groups = "stp"; lantiq,function = "stp"; }; - nand { - lantiq,groups = "nand cle", "nand ale", - "nand rd", "nand rdy"; - lantiq,function = "ebu"; - }; pci { lantiq,groups = "gnt1", "req1"; lantiq,function = "pci"; }; conf_out { - lantiq,pins = "io24", "io13", "io49", /* nand cle, ale and rd */ - "io4", "io5", "io6", /* stp */ + lantiq,pins = "io4", "io5", "io6", /* stp */ "io21", "io33"; lantiq,open-drain; @@ -217,8 +211,7 @@ lantiq,output = <1>; }; conf_in { - lantiq,pins = "io39", /* exin3 */ - "io48"; /* nand rdy */ + lantiq,pins = "io39"; /* exin3 */ lantiq,pull = <2>; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts index f687edf54d..0bf8e1b7ef 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts @@ -19,6 +19,9 @@ bank-width = <2>; reg = <0 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts index c70f124db5..15bd0d2713 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts @@ -13,6 +13,9 @@ bank-width = <2>; reg = <1 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-ecc-mode = "soft"; nand-ecc-strength = <3>; nand-ecc-step-size = <256>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts index 3aaea4cb6d..7e4a3e1114 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts @@ -13,6 +13,9 @@ bank-width = <2>; reg = <1 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-ecc-mode = "on-die"; partitions { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi index b83f0f058a..bac27c3649 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi @@ -193,13 +193,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - nand { - lantiq,groups = "nand cle", "nand ale", - "nand rd", "nand cs1", "nand rdy"; - lantiq,function = "ebu"; - lantiq,pull = <1>; - }; - phy-rst { lantiq,pins = "io37", "io44"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts index 8f1fc261fb..feb9242574 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts @@ -36,12 +36,6 @@ }; &state_default { - nand { - lantiq,groups = "nand ale", "nand cle", - "nand cs1", "nand rd", "nand rdy"; - lantiq,function = "ebu"; - }; - pcie-rst { lantiq,pins = "io21"; lantiq,open-drain = <1>; @@ -85,6 +79,10 @@ lantiq,cs1 = <1>; bank-width = <1>; reg = <1 0x0 0x2000000>; + + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-ecc-mode = "on-die"; partitions { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts index 04aa99d185..43216d66be 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts @@ -89,6 +89,9 @@ reg = <0 0x0 0x2000000>; lantiq,cs = <1>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -172,16 +175,6 @@ lantiq,open-drain = <1>; lantiq,output = <1>; }; - nand-mux { - lantiq,groups = "nand cle", "nand ale", - "nand rd", "nand cs1", - "nand rdy"; - lantiq,function = "ebu"; - }; - nand-pins { - lantiq,pins = "io13", "io24", "io49"; - lantiq,pull = <1>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts index 3159a5a244..d1a04a4a78 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts @@ -30,6 +30,9 @@ bank-width = <2>; reg = <0 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts index f6e8fd8c83..a607311460 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts @@ -21,6 +21,9 @@ bank-width = <2>; reg = <0 0x0 0x800000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index 274abcc503..d02c8837f4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -242,19 +242,6 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index ab518e75c6..da56485214 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -178,6 +178,32 @@ }; }; + nand_pins: nand { + mux-0 { + lantiq,groups = "nand cle", "nand ale", + "nand rd"; + lantiq,function = "ebu"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + mux-1 { + lantiq,groups = "nand rdy"; + lantiq,function = "ebu"; + lantiq,output = <0>; + lantiq,pull = <2>; + }; + }; + + nand_cs1_pins: nand-cs1 { + mux { + lantiq,groups = "nand cs1"; + lantiq,function = "ebu"; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + spi_pins: spi { mux-0 { lantiq,groups = "spi_di"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi index cadfb80750..eec7a5d054 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi @@ -162,6 +162,32 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + nand_pins: nand { + mux-0 { + lantiq,groups = "nand cle", "nand ale", + "nand rd"; + lantiq,function = "ebu"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + mux-1 { + lantiq,groups = "nand rdy"; + lantiq,function = "ebu"; + lantiq,output = <0>; + lantiq,pull = <2>; + }; + }; + + nand_cs1_pins: nand-cs1 { + mux { + lantiq,groups = "nand cs1"; + lantiq,function = "ebu"; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; }; asc1: serial@e100c00 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index 4639aaf490..caedad8bce 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -220,6 +220,32 @@ }; }; + nand_pins: nand { + mux-0 { + lantiq,groups = "nand cle", "nand ale", + "nand rd"; + lantiq,function = "ebu"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + mux-1 { + lantiq,groups = "nand rdy"; + lantiq,function = "ebu"; + lantiq,output = <0>; + lantiq,pull = <2>; + }; + }; + + nand_cs1_pins: nand-cs1 { + mux { + lantiq,groups = "nand cs1"; + lantiq,function = "ebu"; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + spi_pins: spi { mux-0 { lantiq,groups = "spi_di"; From 660200e53d627aee107ac90ba611bd762b98a4f6 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 14:47:37 +0200 Subject: [PATCH 073/480] lantiq: dts: assign the GPHY LED pins to the Ethernet controller node Assign the GPHY LED pins to the Ethernet controller node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. Signed-off-by: Martin Blumenstingl --- .../files/arch/mips/boot/dts/P2812HNUFX.dtsi | 13 ++--- .../files/arch/mips/boot/dts/TDW89X0.dtsi | 10 ++-- .../files/arch/mips/boot/dts/VG3503J.dts | 21 ++------ .../files/arch/mips/boot/dts/VGV7510KW22.dtsi | 13 ++--- .../files/arch/mips/boot/dts/VGV7519.dtsi | 10 ++-- .../files/arch/mips/boot/dts/VR200.dtsi | 10 ++-- .../lantiq/files/arch/mips/boot/dts/vr9.dtsi | 48 +++++++++++++++++++ 7 files changed, 71 insertions(+), 54 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index d02c8837f4..f22dc912de 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -111,6 +111,11 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, + <&gphy0_led0_pins>, <&gphy0_led2_pins>, + <&gphy1_led1_pins>, <&gphy1_led2_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -196,14 +201,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led1", - "gphy0 led2", "gphy1 led2"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; stp { lantiq,groups = "stp"; lantiq,function = "stp"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi index d0e8cd8ced..eabbc0257f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi @@ -103,6 +103,9 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led1_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -175,13 +178,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led1"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts index f37980a536..e074147d66 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts @@ -57,6 +57,10 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, + <&gphy0_led0_pins>, <&gphy0_led1_pins>, <&gphy0_led2_pins>, + <&gphy1_led0_pins>, <&gphy1_led1_pins>, <&gphy1_led2_pins>; + interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -110,23 +114,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - gphy-leds { - lantiq,groups = "gphy0 led0", "gphy0 led1", - "gphy0 led2", "gphy1 led0", - "gphy1 led1", "gphy1 led2"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; - }; -}; - &localbus { flash@0 { compatible = "lantiq,nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi index 6dc45f057d..8db1ffbf81 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi @@ -107,6 +107,11 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, + <&gphy0_led0_pins>, <&gphy0_led1_pins>, + <&gphy1_led0_pins>, <&gphy1_led1_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -189,14 +194,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - gphy-leds { - lantiq,groups = "gphy0 led0", "gphy0 led1", - "gphy1 led0", "gphy1 led1"; - lantiq,function = "gphy"; - lantiq,open-drain = <0>; - lantiq,pull = <2>; - lantiq,output = <1>; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi index e71e3837ea..f9e60774cb 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi @@ -127,6 +127,9 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led0_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -222,13 +225,6 @@ lantiq,pull = <0>; lantiq,output = <1>; }; - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led0"; - lantiq,function = "gphy"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - lantiq,output = <1>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi index 44938eddd3..93178da7e2 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi @@ -23,6 +23,9 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led1_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -95,13 +98,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led1"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index caedad8bce..2cb34eab01 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -213,6 +213,54 @@ gpio-controller; reg = <0xe100b10 0xa0>; + gphy0_led0_pins: gphy0-led0 { + lantiq,groups = "gphy0 led0"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + + gphy0_led1_pins: gphy0-led1 { + lantiq,groups = "gphy0 led1"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + + gphy0_led2_pins: gphy0-led2 { + lantiq,groups = "gphy0 led2"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + + gphy1_led0_pins: gphy1-led0 { + lantiq,groups = "gphy1 led0"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + + gphy1_led1_pins: gphy1-led1 { + lantiq,groups = "gphy1 led1"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + + gphy1_led2_pins: gphy1-led2 { + lantiq,groups = "gphy1 led2"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + mdio_pins: mdio { mux { lantiq,groups = "mdio"; From dcb5e52209e52b6004b5888d41620386a28d2567 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 14:54:13 +0200 Subject: [PATCH 074/480] lantiq: dts: assign the STP pins to the STP GPIO controller node Assign the STP pins to the STP GPIO controller node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. Signed-off-by: Martin Blumenstingl --- .../lantiq/files/arch/mips/boot/dts/ARV4510PW.dts | 6 ------ .../lantiq/files/arch/mips/boot/dts/EASY50712.dts | 9 --------- .../lantiq/files/arch/mips/boot/dts/EASY50810.dts | 9 --------- .../lantiq/files/arch/mips/boot/dts/EASY80920.dtsi | 7 +------ .../lantiq/files/arch/mips/boot/dts/GIGASX76X.dts | 12 ------------ .../lantiq/files/arch/mips/boot/dts/P2601HNFX.dts | 12 ------------ .../lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi | 7 ------- .../lantiq/files/arch/mips/boot/dts/VGV7519.dtsi | 7 ------- .../linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi | 12 ++++++++++++ .../lantiq/files/arch/mips/boot/dts/danube.dtsi | 12 ++++++++++++ .../linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi | 11 +++++++++++ 11 files changed, 36 insertions(+), 68 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts index e15eb66b04..a61972518e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts @@ -131,12 +131,6 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; exin { lantiq,groups = "exin1", "exin2"; lantiq,function = "exin"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts index ba7f302c2e..74318a5f65 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts @@ -21,10 +21,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -33,11 +29,6 @@ lantiq,groups = "gnt1"; lantiq,function = "pci"; }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; /* stp */ - lantiq,open-drain; - lantiq,pull = <0>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts index 4f101151d1..492dbac98e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts @@ -21,10 +21,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -33,11 +29,6 @@ lantiq,groups = "gnt1"; lantiq,function = "pci"; }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; /* stp */ - lantiq,open-drain; - lantiq,pull = <0>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index 33c8dd19f7..37ba1c0c9a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -189,17 +189,12 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; pci { lantiq,groups = "gnt1", "req1"; lantiq,function = "pci"; }; conf_out { - lantiq,pins = "io4", "io5", "io6", /* stp */ - "io21", + lantiq,pins = "io21", "io33"; lantiq,open-drain; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts index a9a5cbae2f..0072f7e2b1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts @@ -52,18 +52,6 @@ }; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; - }; -}; - &gpios { status = "okay"; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts index c238826932..c31945fff0 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts @@ -103,13 +103,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -118,11 +111,6 @@ lantiq,groups = "gnt1"; lantiq,function = "pci"; }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; - lantiq,open-drain; - lantiq,pull = <0>; - }; }; usb_vbus: regulator-usb-vbus { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index f22dc912de..d6879009db 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -201,13 +201,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; pci-in { lantiq,groups = "req1"; lantiq,function = "pci"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi index f9e60774cb..e82407d7c3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi @@ -212,13 +212,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - lantiq,pull = <0>; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index da56485214..a613131e48 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -223,6 +223,14 @@ lantiq,output = <1>; }; }; + + stp_pins: stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; }; stp: stp@e100bb0 { @@ -230,6 +238,10 @@ compatible = "lantiq,gpio-stp-xway"; gpio-controller; reg = <0xe100bb0 0x40>; + + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + status = "disabled"; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi index eec7a5d054..795df712e2 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi @@ -144,6 +144,10 @@ compatible = "lantiq,gpio-stp-xway"; gpio-controller; reg = <0xe100bb0 0x40>; + + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + lantiq,shadow = <0xfff>; lantiq,groups = <0x3>; status = "disabled"; @@ -188,6 +192,14 @@ lantiq,pull = <0>; }; }; + + stp_pins: stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; }; asc1: serial@e100c00 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index 2cb34eab01..fa8d2fae63 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -313,6 +313,14 @@ lantiq,output = <1>; }; }; + + stp_pins: stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; }; stp: stp@e100bb0 { @@ -322,6 +330,9 @@ #gpio-cells = <2>; gpio-controller; + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + lantiq,shadow = <0xffffff>; lantiq,groups = <0x7>; lantiq,dsl = <0x0>; From 8e7b573b7aa4c08c7e838b271677dc68a0db128e Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 15:17:25 +0200 Subject: [PATCH 075/480] lantiq: dts: assign the PCI pins to the PCI controller node Assign the PCI pins to the PCI controller node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. Signed-off-by: Martin Blumenstingl --- .../files/arch/mips/boot/dts/ACMP252.dts | 7 +- .../files/arch/mips/boot/dts/ARV4510PW.dts | 17 ++--- .../arch/mips/boot/dts/ARV4518PWR01.dtsi | 18 ++---- .../files/arch/mips/boot/dts/ARV4520PW.dts | 16 ++--- .../files/arch/mips/boot/dts/ARV4525PW.dts | 16 ++--- .../files/arch/mips/boot/dts/ARV452CQW.dts | 16 ++--- .../files/arch/mips/boot/dts/ARV7506PW11.dts | 9 ++- .../files/arch/mips/boot/dts/ARV7510PW22.dts | 16 ++--- .../files/arch/mips/boot/dts/ARV7518PW.dts | 17 ++--- .../files/arch/mips/boot/dts/ARV7519PW.dts | 17 ++--- .../files/arch/mips/boot/dts/ARV7525PW.dts | 8 +-- .../files/arch/mips/boot/dts/ARV752DPW.dts | 16 ++--- .../files/arch/mips/boot/dts/ARV752DPW22.dts | 16 ++--- .../files/arch/mips/boot/dts/ARV8539PW22.dts | 16 ++--- .../files/arch/mips/boot/dts/BTHOMEHUBV2B.dts | 18 ++---- .../files/arch/mips/boot/dts/BTHOMEHUBV3A.dts | 19 ++---- .../files/arch/mips/boot/dts/DGN3500.dtsi | 19 ++---- .../files/arch/mips/boot/dts/EASY50712.dts | 9 +-- .../files/arch/mips/boot/dts/EASY50810.dts | 4 -- .../files/arch/mips/boot/dts/EASY80920.dtsi | 9 +-- .../files/arch/mips/boot/dts/FRITZ7312.dts | 22 ++----- .../files/arch/mips/boot/dts/FRITZ7320.dts | 29 ++------- .../files/arch/mips/boot/dts/P2601HNFX.dts | 9 +-- .../files/arch/mips/boot/dts/P2812HNUFX.dtsi | 18 ++---- .../lantiq/files/arch/mips/boot/dts/ar9.dtsi | 64 +++++++++++++++++++ .../files/arch/mips/boot/dts/danube.dtsi | 32 ++++++++++ .../lantiq/files/arch/mips/boot/dts/vr9.dtsi | 16 +++++ 27 files changed, 213 insertions(+), 260 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts index 7942535943..67b0f9631f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts @@ -37,10 +37,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; }; }; @@ -96,6 +92,9 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; }; &usb_phy { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts index a61972518e..19a44d5f6d 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts @@ -136,18 +136,6 @@ lantiq,function = "exin"; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req1", "req2"; - lantiq,function = "pci"; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1", "gnt2"; - lantiq,function = "pci"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; @@ -205,6 +193,11 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + lantiq,external-clock; interrupt-map = < 0x6000 0 0 1 &icu0 135 diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi index f5dec312f8..dcae06d894 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi @@ -119,19 +119,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1", "req2"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1", "gnt2"; - lantiq,function = "pci"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; }; }; @@ -189,6 +176,11 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; req-mask = <0xf>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts index 95944d9cfc..b59477cb19 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts @@ -135,18 +135,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; @@ -210,6 +198,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts index d55613a02b..cceb42164e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts @@ -80,18 +80,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -149,6 +137,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts index 4ff0f67ca3..eecff4bb0b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts @@ -147,18 +147,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <0>; @@ -228,6 +216,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts index c0bca84031..9e4216033b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts @@ -91,11 +91,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -149,6 +144,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts index 5c4a41e957..e5fd05fe40 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts @@ -86,18 +86,6 @@ lantiq,pull = <2>; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req1", "req2"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -173,6 +161,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + lantiq,external-clock; interrupt-map = < 0x7000 0 0 1 &icu0 30 diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts index 458fd65495..ae0d27a042 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts @@ -116,19 +116,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -215,6 +202,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; lantiq,external-clock; req-mask = <0xf>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts index e9c418e482..34b541af92 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts @@ -131,19 +131,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -200,6 +187,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; req-mask = <0xf>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts index bcdc2249fd..d673c9b204 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts @@ -83,10 +83,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; }; }; @@ -134,6 +130,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + interrupt-map = <0x7000 0 0 1 &icu0 135 1>; wifi@0,0 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts index dbec1eb6a1..069b1b1ed6 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts @@ -123,18 +123,6 @@ lantiq,pull = <2>; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req2", "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -220,6 +208,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; interrupt-map = <0x7000 0 0 1 &icu0 135>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts index de996d10cc..ec90a2bef9 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts @@ -151,18 +151,6 @@ lantiq,pull = <2>; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,open-drain = <1>; @@ -235,6 +223,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; interrupt-map = < 0x7000 0 0 1 &icu0 30 diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts index 00131f929c..4bf44a10e1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts @@ -95,18 +95,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -163,6 +151,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@168c,0029 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts index 5d69ed8d72..40886feec4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts @@ -112,20 +112,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; pci_rst { lantiq,pins = "io21"; @@ -225,6 +211,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@168c,0027 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts index b4d9fbea91..044ae2b417 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts @@ -109,21 +109,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; @@ -184,6 +169,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@7000 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi index b12101a5d1..a3dbbbdfad 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi @@ -115,21 +115,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; - pci-in { - lantiq,groups = "req1"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1"; - lantiq,output = <1>; - lantiq,pull = <0>; - }; }; }; @@ -139,6 +124,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@168c,0029 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts index 74318a5f65..1afc74900e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts @@ -25,10 +25,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - }; }; }; @@ -69,3 +65,8 @@ }; }; }; + +&pci0 { + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; +}; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts index 492dbac98e..87ba62de33 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts @@ -25,10 +25,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index 37ba1c0c9a..4fbc1ac496 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -189,10 +189,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; conf_out { lantiq,pins = "io21", "io33"; @@ -257,6 +253,11 @@ }; }; +&pci0 { + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; +}; + &stp { status = "okay"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts index 0190dd2f01..aa825abd9f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts @@ -75,21 +75,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci { - lantiq,groups = "gnt1", "req1", "req2", "req4", "gnt2", "gnt3", "gnt4"; - lantiq,function = "pci"; - }; - pci-in { - lantiq,groups = "req1", "req2", "req4"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4"; - lantiq,output = <1>; - lantiq,pull = <0>; - }; ar8030-intr { lantiq,groups = "exin3"; lantiq,function = "exin"; @@ -166,6 +151,13 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_gnt3_pins>, <&pci_gnt4_pins>, + <&pci_req1_pins>, <&pci_req2_pins>, + <&pci_req4_pins>; + pinctrl-names = "default"; + req-mask = <0xf>; gpio-reset = <&gpio 21 GPIO_ACTIVE_LOW>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts index 6c0dad873f..424b778bb4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts @@ -73,29 +73,6 @@ }; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - pci { - lantiq,groups = "gnt1", "req1", "req2", "req3", "req4", "gnt2", "gnt3", "gnt4"; - lantiq,function = "pci"; - }; - pci-in { - lantiq,groups = "req1", "req2", "req3", "req4"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4"; - lantiq,output = <1>; - lantiq,pull = <0>; - }; - }; -}; - &gsw { phy-mode = "mii"; mtd-mac-address = <&ath9k_cal 0xa91>; @@ -141,6 +118,12 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_gnt3_pins>, <&pci_gnt4_pins>, + <&pci_req1_pins>, <&pci_req2_pins>, + <&pci_req3_pins>, <&pci_req4_pins>; + req-mask = <0xf>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts index c31945fff0..79896c6478 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts @@ -107,10 +107,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - }; }; usb_vbus: regulator-usb-vbus { @@ -161,6 +157,11 @@ }; }; +&pci0 { + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; +}; + &stp { status = "okay"; lantiq,shadow = <0xfff>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index d6879009db..5f8392ca44 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -201,20 +201,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - pci-in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; @@ -237,6 +223,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index a613131e48..344c2f4fa8 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -204,6 +204,70 @@ }; }; + pci_gnt1_pins: pci-gnt1 { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_gnt2_pins: pci-gnt2 { + lantiq,groups = "gnt2"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_gnt3_pins: pci-gnt3 { + lantiq,groups = "gnt3"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_gnt4_pins: pci-gnt4 { + lantiq,groups = "gnt4"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_req1_pins: pci-req1 { + lantiq,groups = "req1"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + + pci_req2_pins: pci-req2 { + lantiq,groups = "req2"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + + pci_req3_pins: pci-req3 { + lantiq,groups = "req3"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + + pci_req4_pins: pci-req4 { + lantiq,groups = "req4"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + spi_pins: spi { mux-0 { lantiq,groups = "spi_di"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi index 795df712e2..6ee6dda571 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi @@ -193,6 +193,38 @@ }; }; + pci_gnt1_pins: pci-gnt1 { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_gnt2_pins: pci-gnt2 { + lantiq,groups = "gnt2"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_req1_pins: pci-req1 { + lantiq,groups = "req1"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + + pci_req2_pins: pci-req2 { + lantiq,groups = "req2"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + stp_pins: stp { lantiq,groups = "stp"; lantiq,function = "stp"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index fa8d2fae63..9e27830cb1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -294,6 +294,22 @@ }; }; + pci_gnt1_pins: pci-gnt1 { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + + pci_req1_pins: pci-req1 { + lantiq,groups = "req1"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + spi_pins: spi { mux-0 { lantiq,groups = "spi_di"; From 4c88b3b5dc4cae62f40fdf5adc0f32885eac7f9b Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 8 Jul 2019 15:24:22 +0200 Subject: [PATCH 076/480] lantiq: dts: assign the ASC pins to the serial controller node Assign the ASC pins to the serial controller node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. Signed-off-by: Martin Blumenstingl --- .../linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts | 4 ---- .../linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts | 4 ---- .../linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi | 9 +++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts index ef57b2f06b..c5dd1600f4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts @@ -61,10 +61,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - asc { - lantiq,groups = "asc"; - lantiq,function = "asc"; - }; keys_in { lantiq,pins = "io0",/* "io25", */"io29"; lantiq,pull = <2>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts index 0143a21a9c..943b00f898 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts @@ -86,10 +86,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - asc { - lantiq,groups = "asc"; - lantiq,function = "asc"; - }; keys_in { lantiq,pins = "io0",/* "io25", */"io29"; lantiq,pull = <2>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi index 6b5606d8ab..496150b7a7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi @@ -151,6 +151,13 @@ gpio-controller; reg = <0xe100b10 0xa0>; + asc_pins: asc-pins { + mux { + lantiq,groups = "asc"; + lantiq,function = "asc"; + }; + }; + mdio_pins: mdio { mux { lantiq,groups = "mdio"; @@ -184,6 +191,8 @@ reg = <0xe100c00 0x400>; interrupt-parent = <&icu0>; interrupts = <72 74 75>; + pinctrl-0 = <&asc_pins>; + pinctrl-names = "default"; }; mei@e116000 { From de6dd7a8db1c073734113156668bca6792dc123d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 15 Dec 2019 22:58:34 +0100 Subject: [PATCH 077/480] lantiq: split device definitions into files This splits device definitions into several *.mk files to increase overview. Signed-off-by: Adrian Schmutzler --- target/linux/lantiq/image/Makefile | 857 +---------------------- target/linux/lantiq/image/amazonse.mk | 22 + target/linux/lantiq/image/ar9.mk | 163 +++++ target/linux/lantiq/image/danube.mk | 219 ++++++ target/linux/lantiq/image/falcon.mk | 105 +++ target/linux/lantiq/image/vr9.mk | 246 +++++++ target/linux/lantiq/image/xway_legacy.mk | 77 ++ 7 files changed, 838 insertions(+), 851 deletions(-) create mode 100644 target/linux/lantiq/image/amazonse.mk create mode 100644 target/linux/lantiq/image/ar9.mk create mode 100644 target/linux/lantiq/image/danube.mk create mode 100644 target/linux/lantiq/image/falcon.mk create mode 100644 target/linux/lantiq/image/vr9.mk create mode 100644 target/linux/lantiq/image/xway_legacy.mk diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index bfb5390465..a2052ef924 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -108,872 +108,27 @@ define Device/AVM endef ifeq ($(SUBTARGET),ase) - -define Device/allnet_all0333cj - DEVICE_VENDOR := Allnet - DEVICE_MODEL := ALL0333CJ - IMAGE_SIZE := 3700k - DEVICE_DTS := ALL0333CJ - DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ - kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ - ltq-adsl-app ppp-mod-pppoe -endef -TARGET_DEVICES += allnet_all0333cj - -define Device/netgear_dgn1000b - DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := DGN1000B - IMAGE_SIZE := 6000k - DEVICE_DTS := DGN1000B - DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ - kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ - ltq-adsl-app ppp-mod-pppoe - SUPPORTED_DEVICES += DGN1000B -endef -TARGET_DEVICES += netgear_dgn1000b - +include amazonse.mk endif ifeq ($(SUBTARGET),xway_legacy) - -define Device/arcadyan_arv4518pwr01 - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV4518PWR01 - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4518PWR01 - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath5k wpad-mini - SUPPORTED_DEVICES += ARV4518PWR01 -endef -TARGET_DEVICES += arcadyan_arv4518pwr01 - -define Device/arcadyan_arv4518pwr01a - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV4518PWR01A - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4518PWR01A - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath5k wpad-basic - SUPPORTED_DEVICES += ARV4518PWR01A -endef -TARGET_DEVICES += arcadyan_arv4518pwr01a - -define Device/arcadyan_arv4520pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV4520PW - DEVICE_ALT0_VENDOR := Vodafone - DEVICE_ALT0_MODEL := Easybox 800 - DEVICE_ALT1_VENDOR := Airties - DEVICE_ALT1_MODEL := WAV-281 - IMAGE_SIZE := 3648k - DEVICE_DTS := ARV4520PW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-rt61-pci wpad-mini - SUPPORTED_DEVICES += ARV4520PW -endef -TARGET_DEVICES += arcadyan_arv4520pw - -define Device/arcadyan_arv4525pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV4525PW - DEVICE_ALT0_VENDOR := Telekom - DEVICE_ALT0_MODEL := Speedport W502V - DEVICE_ALT0_VARIANT := Typ A - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4525PW - DEVICE_PACKAGES := kmod-ath5k wpad-mini \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa -swconfig - SUPPORTED_DEVICES += ARV4525PW -endef -TARGET_DEVICES += arcadyan_arv4525pw - -define Device/arcadyan_arv452cqw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV452CQW - DEVICE_ALT0_VENDOR := Vodafone - DEVICE_ALT0_MODEL := Easybox 801 - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV452CQW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath5k wpad-mini \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa - SUPPORTED_DEVICES += ARV452CQW -endef -TARGET_DEVICES += arcadyan_arv452cqw - +include xway_legacy.mk endif ifeq ($(SUBTARGET),xway) - -# Danube - -define Device/arcadyan_arv4510pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV4510PW - DEVICE_ALT0_VENDOR := Wippies - DEVICE_ALT0_MODEL := BeWan iBox v1.0 - IMAGE_SIZE := 15616k - DEVICE_DTS := ARV4510PW - DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci kmod-ath5k wpad-basic - SUPPORTED_DEVICES += ARV4510PW -endef -TARGET_DEVICES += arcadyan_arv4510pw - -define Device/arcadyan_arv4519pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV4519PW - DEVICE_ALT0_VENDOR := Vodafone - DEVICE_ALT0_MODEL := NetFasteR IAD 2 - DEVICE_ALT1_VENDOR := Pirelli - DEVICE_ALT1_MODEL := P.RG A4201G - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4519PW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa - SUPPORTED_DEVICES += ARV4519PW -endef -TARGET_DEVICES += arcadyan_arv4519pw - -define Device/arcadyan_arv7506pw11 - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV7506PW11 - DEVICE_ALT0_VENDOR := Alice/O2 - DEVICE_ALT0_MODEL := IAD 4421 - IMAGE_SIZE := 7808k - DEVICE_DTS := ARV7506PW11 - DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV7506PW11 -endef -TARGET_DEVICES += arcadyan_arv7506pw11 - -define Device/arcadyan_arv7510pw22 - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV7510PW22 - DEVICE_ALT0_VENDOR := Astoria Networks - DEVICE_ALT0_MODEL := ARV7510PW22 - IMAGE_SIZE := 31232k - DEVICE_DTS := ARV7510PW22 - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic \ - kmod-usb-uhci kmod-usb2 kmod-usb2-pci - SUPPORTED_DEVICES += ARV7510PW22 -endef -TARGET_DEVICES += arcadyan_arv7510pw22 - -define Device/arcadyan_arv7518pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV7518PW - DEVICE_ALT0_VENDOR := Astoria Networks - DEVICE_ALT0_MODEL := ARV7518PW - IMAGE_SIZE := 7872k - DEVICE_DTS := ARV7518PW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES += ARV7518PW -endef -TARGET_DEVICES += arcadyan_arv7518pw - -define Device/arcadyan_arv7519pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV7519PW - DEVICE_ALT0_VENDOR := Astoria Networks - DEVICE_ALT0_MODEL := ARV7519PW - IMAGE_SIZE := 15488k - DEVICE_DTS := ARV7519PW - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV7519PW -endef -TARGET_DEVICES += arcadyan_arv7519pw - -define Device/arcadyan_arv7525pw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV7525PW - DEVICE_ALT0_VENDOR := Telekom - DEVICE_ALT0_MODEL := Speedport W303V - DEVICE_ALT0_VARIANT := Typ A - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4510PW - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa -swconfig - SUPPORTED_DEVICES += ARV4510PW -endef -TARGET_DEVICES += arcadyan_arv7525pw - -define Device/arcadyan_arv752dpw - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV752DPW - DEVICE_ALT0_VENDOR := Vodafone - DEVICE_ALT0_MODEL := Easybox 802 - IMAGE_SIZE := 7872k - DEVICE_DTS := ARV752DPW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV752DPW -endef -TARGET_DEVICES += arcadyan_arv752dpw - -define Device/arcadyan_arv752dpw22 - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV752DPW22 - DEVICE_ALT0_VENDOR := Vodafone - DEVICE_ALT0_MODEL := Easybox 803 - IMAGE_SIZE := 7616k - DEVICE_DTS := ARV752DPW22 - DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV752DPW22 -endef -TARGET_DEVICES += arcadyan_arv752dpw22 - -define Device/arcadyan_arv8539pw22 - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV8539PW22 - DEVICE_ALT0_VENDOR := Telekom - DEVICE_ALT0_MODEL := Speedport W504V Typ A - IMAGE_SIZE := 7616k - DEVICE_DTS := ARV8539PW22 - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES += ARV8539PW22 -endef -TARGET_DEVICES += arcadyan_arv8539pw22 - -define Device/audiocodes_mp-252 - DEVICE_VENDOR := AudioCodes - DEVICE_MODEL := MediaPack MP-252 - IMAGE_SIZE := 14848k - DEVICE_DTS := ACMP252 - DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ - kmod-rt2800-pci \ - ltq-adsl-app ppp-mod-pppoa \ - wpad-basic - SUPPORTED_DEVICES += ACMP252 -endef -TARGET_DEVICES += audiocodes_mp-252 - -define Device/bt_homehub-v2b - $(Device/NAND) - DEVICE_VENDOR := British Telecom - DEVICE_MODEL := Home Hub 2 - DEVICE_VARIANT := Type B - BOARD_NAME := BTHOMEHUBV2B - DEVICE_DTS := BTHOMEHUBV2B - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - kmod-ltq-deu-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES += BTHOMEHUBV2B -endef -TARGET_DEVICES += bt_homehub-v2b - -define Device/lantiq_easy50712 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Danube (EASY50712) - DEVICE_DTS := EASY50712 - IMAGE_SIZE := 3776k -endef -TARGET_DEVICES += lantiq_easy50712 - -define Device/siemens_gigaset-sx76x - DEVICE_VENDOR := Siemens - DEVICE_MODEL := Gigaset sx76x - IMAGE_SIZE := 7680k - DEVICE_DTS := GIGASX76X - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoe \ - kmod-ath5k wpad-basic - SUPPORTED_DEVICES += GIGASX76X -endef -TARGET_DEVICES += siemens_gigaset-sx76x - - -# AR9 - -define Device/avm_fritz7312 - $(Device/AVM) - DEVICE_MODEL := FRITZ!Box 7312 - DEVICE_DTS := FRITZ7312 - IMAGE_SIZE := 15744k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 -swconfig -endef -TARGET_DEVICES += avm_fritz7312 - -define Device/avm_fritz7320 - $(Device/AVM) - DEVICE_MODEL := FRITZ!Box 7320 - DEVICE_ALT0_VENDOR := 1&1 - DEVICE_ALT0_MODEL := HomeServer - DEVICE_DTS := FRITZ7320 - IMAGE_SIZE := 15744k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 -swconfig - SUPPORTED_DEVICES += FRITZ7320 -endef -TARGET_DEVICES += avm_fritz7320 - -define Device/bt_homehub-v3a - $(Device/NAND) - DEVICE_VENDOR := British Telecom - DEVICE_MODEL := Home Hub - DEVICE_VARIANT := Type A - BOARD_NAME := BTHOMEHUBV3A - DEVICE_DTS := BTHOMEHUBV3A - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - kmod-ltq-deu-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic \ - uboot-envtools - SUPPORTED_DEVICES += BTHOMEHUBV3A -endef -TARGET_DEVICES += bt_homehub-v3a - -define Device/buffalo_wbmr-hp-g300h-a - DEVICE_VENDOR := Buffalo - DEVICE_MODEL := WBMR-HP-G300H - DEVICE_VARIANT := A - IMAGE_SIZE := 31488k - DEVICE_DTS := WBMR - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h -endef -TARGET_DEVICES += buffalo_wbmr-hp-g300h-a - -define Device/buffalo_wbmr-hp-g300h-b - DEVICE_VENDOR := Buffalo - DEVICE_MODEL := WBMR-HP-G300H - DEVICE_VARIANT := B - IMAGE_SIZE := 31488k - DEVICE_DTS := WBMR - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h -endef -TARGET_DEVICES += buffalo_wbmr-hp-g300h-b - -DGN3500_KERNEL_OFFSET_HEX=0x50000 -DGN3500_KERNEL_OFFSET_DEC=327680 -define Device/netgear_dgn3500 - DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := DGN3500 - DEVICE_DTS := DGN3500 - IMAGE_SIZE := 16000k - IMAGES := \ - sysupgrade-na.bin sysupgrade.bin \ - factory-na.img factory.img - IMAGE/sysupgrade-na.bin := \ - append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := \ - append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory-na.img := \ - pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ - dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \ - check-size 16320k | pad-to 16384k - IMAGE/factory.img := \ - pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ - dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \ - check-size 16320k | pad-to 16384k - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 - SUPPORTED_DEVICES += DGN3500 -endef -TARGET_DEVICES += netgear_dgn3500 - -define Device/netgear_dgn3500b - DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := DGN3500B - DEVICE_DTS := DGN3500B - IMAGE_SIZE := 16000k - IMAGES += factory.img - IMAGE/sysupgrade.bin := \ - append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := \ - pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ - dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \ - check-size 16320k | pad-to 16384k - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 - SUPPORTED_DEVICES += DGN3500B -endef -TARGET_DEVICES += netgear_dgn3500b - -define Device/zte_h201l - DEVICE_VENDOR := ZTE - DEVICE_MODEL := H201L - IMAGE_SIZE := 7808k - DEVICE_DTS := H201L - DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoe \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += H201L -endef -TARGET_DEVICES += zte_h201l - -define Device/zyxel_p-2601hn - DEVICE_VENDOR := ZyXEL - DEVICE_MODEL := P-2601HN - DEVICE_VARIANT := F1/F3 - IMAGE_SIZE := 15616k - DEVICE_DTS := P2601HNFX - DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoe \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 - SUPPORTED_DEVICES += P2601HNFX -endef -TARGET_DEVICES += zyxel_p-2601hn - +include danube.mk +include ar9.mk endif ifeq ($(SUBTARGET),xrx200) - -# VR9 - include tp-link.mk - -define Device/alphanetworks_asl56026 - DEVICE_VENDOR := Alpha - DEVICE_MODEL := ASL56026 - DEVICE_ALT0_VENDOR := BT Openreach - DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I - DEVICE_DTS := ASL56026 - IMAGE_SIZE := 7488k -endef -TARGET_DEVICES += alphanetworks_asl56026 - -define Device/arcadyan_arv7519rw22 - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := ARV7519RW22 - DEVICE_ALT0_VENDOR := Orange - DEVICE_ALT0_MODEL := Livebox - DEVICE_ALT0_VARIANT := 2.1 - DEVICE_ALT1_VENDOR := Astoria Networks - DEVICE_ALT1_MODEL := ARV7519RW22 - IMAGE_SIZE := 31232k - DEVICE_DTS := ARV7519RW22 - DEVICE_PACKAGES := kmod-usb-dwc2 - SUPPORTED_DEVICES += ARV7519RW22 -endef -TARGET_DEVICES += arcadyan_arv7519rw22 - -define Device/arcadyan_vg3503j - DEVICE_VENDOR := BT Openreach - DEVICE_MODEL := ECI VDSL Modem V-2FUb/R - IMAGE_SIZE := 8000k - DEVICE_DTS := VG3503J - SUPPORTED_DEVICES += VG3503J -endef -TARGET_DEVICES += arcadyan_vg3503j - -define Device/arcadyan_vgv7510kw22-brn - $(Device/lantiqBrnImage) - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := VGV7510KW22 - DEVICE_VARIANT := BRN - DEVICE_ALT0_VENDOR := o2 - DEVICE_ALT0_MODEL := Box 6431 - DEVICE_ALT0_VARIANT := BRN - IMAGE_SIZE := 7168k - DEVICE_DTS := VGV7510KW22BRN - SIGNATURE := BRNDA6431 - MAGIC := 0x12345678 - CRC32_POLY := 0x04c11db7 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7510KW22BRN -endef -TARGET_DEVICES += arcadyan_vgv7510kw22-brn - -define Device/arcadyan_vgv7510kw22-nor - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := VGV7510KW22 - DEVICE_VARIANT := NOR - DEVICE_ALT0_VENDOR := o2 - DEVICE_ALT0_MODEL := Box 6431 - DEVICE_ALT0_VARIANT := NOR - IMAGE_SIZE := 15232k - DEVICE_DTS := VGV7510KW22NOR - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7510KW22NOR -endef -TARGET_DEVICES += arcadyan_vgv7510kw22-nor - -define Device/arcadyan_vgv7519-brn - $(Device/lantiqBrnImage) - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := VGV7519 - DEVICE_VARIANT := BRN - DEVICE_ALT0_VENDOR := KPN - DEVICE_ALT0_MODEL := Experiabox 8 - DEVICE_ALT0_VARIANT := BRN - IMAGE_SIZE := 7168k - DEVICE_DTS := VGV7519BRN - SIGNATURE := 5D00008000 - MAGIC := 0x12345678 - CRC32_POLY := 0x2083b8ed - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7519BRN -endef -TARGET_DEVICES += arcadyan_vgv7519-brn - -define Device/arcadyan_vgv7519-nor - DEVICE_VENDOR := Arcadyan - DEVICE_MODEL := VGV7519 - DEVICE_VARIANT := NOR - DEVICE_ALT0_VENDOR := KPN - DEVICE_ALT0_MODEL := Experiabox 8 - DEVICE_ALT0_VARIANT := NOR - IMAGE_SIZE := 15360k - DEVICE_DTS := VGV7519NOR - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7519NOR -endef -TARGET_DEVICES += arcadyan_vgv7519-nor - -define Device/avm_fritz3370 - $(Device/AVM) - $(Device/NAND) - DEVICE_MODEL := FRITZ!Box 3370 - DEVICE_VARIANT := Rev. 2 - DEVICE_DTS := FRITZ3370 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 - IMAGES += eva-kernel.bin eva-filesystem.bin - IMAGE/eva-kernel.bin := append-kernel - IMAGE/eva-filesystem.bin := append-ubi - DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-usb-dwc2 fritz-tffs -endef - -define Device/avm_fritz3370-rev2-hynix - $(Device/avm_fritz3370) - DEVICE_MODEL := FRITZ!Box 3370 - DEVICE_VARIANT := Rev. 2 (Hynix NAND) - DEVICE_DTS := FRITZ3370-REV2-HYNIX -endef -TARGET_DEVICES += avm_fritz3370-rev2-hynix - -define Device/avm_fritz3370-rev2-micron - $(Device/avm_fritz3370) - DEVICE_MODEL := FRITZ!Box 3370 - DEVICE_VARIANT := Rev. 2 (Micron NAND) - DEVICE_DTS := FRITZ3370-REV2-MICRON -endef -TARGET_DEVICES += avm_fritz3370-rev2-micron - -define Device/avm_fritz7360sl - $(Device/AVM) - DEVICE_MODEL := FRITZ!Box 7360 SL - IMAGE_SIZE := 15744k - DEVICE_DTS := FRITZ7360SL - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += FRITZ7360SL -endef -TARGET_DEVICES += avm_fritz7360sl - -define Device/avm_fritz7362sl - $(Device/AVM) - $(Device/NAND) - DEVICE_MODEL := FRITZ!Box 7362 SL - KERNEL_SIZE := 4096k - IMAGE_SIZE := 49152k - DEVICE_DTS := FRITZ7362SL - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs -endef -TARGET_DEVICES += avm_fritz7362sl - -define Device/avm_fritz7412 - $(Device/AVM) - $(Device/NAND) - DEVICE_MODEL := FRITZ!Box 7412 - BOARD_NAME := FRITZ7412 - DEVICE_DTS := FRITZ7412 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata -endef -TARGET_DEVICES += avm_fritz7412 - -define Device/bt_homehub-v5a - $(Device/NAND) - DEVICE_VENDOR := British Telecom - DEVICE_MODEL := Home Hub 5 - DEVICE_VARIANT := Type A - BOARD_NAME := BTHOMEHUBV5A - DEVICE_DTS := BTHOMEHUBV5A - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ - kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += BTHOMEHUBV5A -endef -TARGET_DEVICES += bt_homehub-v5a - -define Device/buffalo_wbmr-300hpd - DEVICE_VENDOR := Buffalo - DEVICE_MODEL := WBMR-300HPD - IMAGE_SIZE := 15616k - DEVICE_DTS := WBMR300 - DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += WBMR300 -endef -TARGET_DEVICES += buffalo_wbmr-300hpd - -define Device/lantiq_easy80920-nand - $(Device/lantiqFullImage) - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := VR9 EASY80920 - DEVICE_VARIANT := NAND - DEVICE_DTS := EASY80920NAND - IMAGE_SIZE := 64512k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += lantiq_easy80920-nand - -define Device/lantiq_easy80920-nor - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := VR9 EASY80920 - DEVICE_VARIANT := NOR - DEVICE_DTS := EASY80920NOR - IMAGE_SIZE := 7936k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += lantiq_easy80920-nor - -define Device/netgear_dm200 - DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := DM200 - DEVICE_DTS := DM200 - IMAGES := sysupgrade.bin factory.img - IMAGE/sysupgrade.bin := append-kernel | \ - pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ - pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni - IMAGE_SIZE := 7872k - NETGEAR_BOARD_ID := DM200 - NETGEAR_HW_ID := 29765233+8+0+64+0+0 -endef -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID -TARGET_DEVICES += netgear_dm200 - -define Device/zyxel_p-2812hnu-f1 - $(Device/NAND) - DEVICE_VENDOR := ZyXEL - DEVICE_MODEL := P-2812HNU - DEVICE_VARIANT := F1 - BOARD_NAME := P2812HNUF1 - DEVICE_DTS := P2812HNUF1 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport - KERNEL_SIZE := 3072k - SUPPORTED_DEVICES += P2812HNUF1 -endef -TARGET_DEVICES += zyxel_p-2812hnu-f1 - -define Device/zyxel_p-2812hnu-f3 - $(Device/NAND) - DEVICE_VENDOR := ZyXEL - DEVICE_MODEL := P-2812HNU - DEVICE_VARIANT := F3 - BOARD_NAME := P2812HNUF3 - DEVICE_DTS := P2812HNUF3 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += P2812HNUF3 -endef -TARGET_DEVICES += zyxel_p-2812hnu-f3 - +include vr9.mk endif ifeq ($(SUBTARGET),falcon) - -define Device/lantiq_easy88388 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY88388 -endef -TARGET_DEVICES += lantiq_easy88388 - -define Device/lantiq_easy88444 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY88444 -endef -TARGET_DEVICES += lantiq_easy88444 - -define Device/lantiq_easy98020 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) - DEVICE_VARIANT := v1.0-v1.7 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98020 -endef -TARGET_DEVICES += lantiq_easy98020 - -define Device/lantiq_easy98020-v18 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) - DEVICE_VARIANT := v1.8 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98020V18 -endef -TARGET_DEVICES += lantiq_easy98020-v18 - -define Device/lantiq_easy98021 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon HGU Reference Board (EASY98021) - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98021 -endef -TARGET_DEVICES += lantiq_easy98021 - -define Device/lantiq_easy98035synce - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE) - DEVICE_VARIANT := with Synchronous Ethernet - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98035SYNCE -endef -TARGET_DEVICES += lantiq_easy98035synce - -define Device/lantiq_easy98035synce1588 - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588) - DEVICE_VARIANT := with SyncE and IEEE1588 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98035SYNCE1588 -endef -TARGET_DEVICES += lantiq_easy98035synce1588 - -define Device/lantiq_easy98000-nand - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := EASY98000 Falcon Eval Board - DEVICE_VARIANT := NAND - IMAGE_SIZE := 3904k - DEVICE_DTS := EASY98000NAND - DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 -endef -TARGET_DEVICES += lantiq_easy98000-nand - -define Device/lantiq_easy98000-nor - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := EASY98000 Falcon Eval Board - DEVICE_VARIANT := NOR - IMAGE_SIZE := 3904k - DEVICE_DTS := EASY98000NOR - DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 -endef -TARGET_DEVICES += lantiq_easy98000-nor - -define Device/lantiq_easy98000-sflash - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := EASY98000 Falcon Eval Board - DEVICE_VARIANT := SFLASH - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98000SFLASH - DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 -endef -TARGET_DEVICES += lantiq_easy98000-sflash - -define Device/lantiq_falcon-mdu - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon / VINAXdp MDU Board - IMAGE_SIZE := 7424k - DEVICE_DTS := FALCON-MDU -endef -TARGET_DEVICES += lantiq_falcon-mdu - -define Device/lantiq_falcon-sfp - DEVICE_VENDOR := Lantiq - DEVICE_MODEL := Falcon SFP Stick - IMAGE_SIZE := 7424k - DEVICE_DTS := FALCON-SFP -endef -TARGET_DEVICES += lantiq_falcon-sfp - +include falcon.mk endif $(eval $(call BuildImage)) diff --git a/target/linux/lantiq/image/amazonse.mk b/target/linux/lantiq/image/amazonse.mk new file mode 100644 index 0000000000..77afaa8bed --- /dev/null +++ b/target/linux/lantiq/image/amazonse.mk @@ -0,0 +1,22 @@ +define Device/allnet_all0333cj + DEVICE_VENDOR := Allnet + DEVICE_MODEL := ALL0333CJ + IMAGE_SIZE := 3700k + DEVICE_DTS := ALL0333CJ + DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ + kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ + ltq-adsl-app ppp-mod-pppoe +endef +TARGET_DEVICES += allnet_all0333cj + +define Device/netgear_dgn1000b + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DGN1000B + IMAGE_SIZE := 6000k + DEVICE_DTS := DGN1000B + DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ + kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ + ltq-adsl-app ppp-mod-pppoe + SUPPORTED_DEVICES += DGN1000B +endef +TARGET_DEVICES += netgear_dgn1000b diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk new file mode 100644 index 0000000000..272227bdb3 --- /dev/null +++ b/target/linux/lantiq/image/ar9.mk @@ -0,0 +1,163 @@ +define Device/avm_fritz7312 + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7312 + DEVICE_DTS := FRITZ7312 + IMAGE_SIZE := 15744k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 -swconfig +endef +TARGET_DEVICES += avm_fritz7312 + +define Device/avm_fritz7320 + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7320 + DEVICE_ALT0_VENDOR := 1&1 + DEVICE_ALT0_MODEL := HomeServer + DEVICE_DTS := FRITZ7320 + IMAGE_SIZE := 15744k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 -swconfig + SUPPORTED_DEVICES += FRITZ7320 +endef +TARGET_DEVICES += avm_fritz7320 + +define Device/bt_homehub-v3a + $(Device/NAND) + DEVICE_VENDOR := British Telecom + DEVICE_MODEL := Home Hub + DEVICE_VARIANT := Type A + BOARD_NAME := BTHOMEHUBV3A + DEVICE_DTS := BTHOMEHUBV3A + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + kmod-ltq-deu-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic \ + uboot-envtools + SUPPORTED_DEVICES += BTHOMEHUBV3A +endef +TARGET_DEVICES += bt_homehub-v3a + +define Device/buffalo_wbmr-hp-g300h-a + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WBMR-HP-G300H + DEVICE_VARIANT := A + IMAGE_SIZE := 31488k + DEVICE_DTS := WBMR + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h +endef +TARGET_DEVICES += buffalo_wbmr-hp-g300h-a + +define Device/buffalo_wbmr-hp-g300h-b + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WBMR-HP-G300H + DEVICE_VARIANT := B + IMAGE_SIZE := 31488k + DEVICE_DTS := WBMR + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h +endef +TARGET_DEVICES += buffalo_wbmr-hp-g300h-b + +DGN3500_KERNEL_OFFSET_HEX=0x50000 +DGN3500_KERNEL_OFFSET_DEC=327680 +define Device/netgear_dgn3500 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DGN3500 + DEVICE_DTS := DGN3500 + IMAGE_SIZE := 16000k + IMAGES := \ + sysupgrade-na.bin sysupgrade.bin \ + factory-na.img factory.img + IMAGE/sysupgrade-na.bin := \ + append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := \ + append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-na.img := \ + pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ + dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \ + check-size 16320k | pad-to 16384k + IMAGE/factory.img := \ + pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ + dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \ + check-size 16320k | pad-to 16384k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 + SUPPORTED_DEVICES += DGN3500 +endef +TARGET_DEVICES += netgear_dgn3500 + +define Device/netgear_dgn3500b + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DGN3500B + DEVICE_DTS := DGN3500B + IMAGE_SIZE := 16000k + IMAGES += factory.img + IMAGE/sysupgrade.bin := \ + append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := \ + pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ + dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \ + check-size 16320k | pad-to 16384k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 + SUPPORTED_DEVICES += DGN3500B +endef +TARGET_DEVICES += netgear_dgn3500b + +define Device/zte_h201l + DEVICE_VENDOR := ZTE + DEVICE_MODEL := H201L + IMAGE_SIZE := 7808k + DEVICE_DTS := H201L + DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoe \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += H201L +endef +TARGET_DEVICES += zte_h201l + +define Device/zyxel_p-2601hn + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P-2601HN + DEVICE_VARIANT := F1/F3 + IMAGE_SIZE := 15616k + DEVICE_DTS := P2601HNFX + DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoe \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 + SUPPORTED_DEVICES += P2601HNFX +endef +TARGET_DEVICES += zyxel_p-2601hn diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk new file mode 100644 index 0000000000..8171900a6f --- /dev/null +++ b/target/linux/lantiq/image/danube.mk @@ -0,0 +1,219 @@ +define Device/arcadyan_arv4510pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4510PW + DEVICE_ALT0_VENDOR := Wippies + DEVICE_ALT0_MODEL := BeWan iBox v1.0 + IMAGE_SIZE := 15616k + DEVICE_DTS := ARV4510PW + DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci kmod-ath5k wpad-basic + SUPPORTED_DEVICES += ARV4510PW +endef +TARGET_DEVICES += arcadyan_arv4510pw + +define Device/arcadyan_arv4519pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4519PW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := NetFasteR IAD 2 + DEVICE_ALT1_VENDOR := Pirelli + DEVICE_ALT1_MODEL := P.RG A4201G + IMAGE_SIZE := 3776k + DEVICE_DTS := ARV4519PW + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa + SUPPORTED_DEVICES += ARV4519PW +endef +TARGET_DEVICES += arcadyan_arv4519pw + +define Device/arcadyan_arv7506pw11 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7506PW11 + DEVICE_ALT0_VENDOR := Alice/O2 + DEVICE_ALT0_MODEL := IAD 4421 + IMAGE_SIZE := 7808k + DEVICE_DTS := ARV7506PW11 + DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV7506PW11 +endef +TARGET_DEVICES += arcadyan_arv7506pw11 + +define Device/arcadyan_arv7510pw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7510PW22 + DEVICE_ALT0_VENDOR := Astoria Networks + DEVICE_ALT0_MODEL := ARV7510PW22 + IMAGE_SIZE := 31232k + DEVICE_DTS := ARV7510PW22 + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci wpad-basic \ + kmod-usb-uhci kmod-usb2 kmod-usb2-pci + SUPPORTED_DEVICES += ARV7510PW22 +endef +TARGET_DEVICES += arcadyan_arv7510pw22 + +define Device/arcadyan_arv7518pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7518PW + DEVICE_ALT0_VENDOR := Astoria Networks + DEVICE_ALT0_MODEL := ARV7518PW + IMAGE_SIZE := 7872k + DEVICE_DTS := ARV7518PW + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES += ARV7518PW +endef +TARGET_DEVICES += arcadyan_arv7518pw + +define Device/arcadyan_arv7519pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7519PW + DEVICE_ALT0_VENDOR := Astoria Networks + DEVICE_ALT0_MODEL := ARV7519PW + IMAGE_SIZE := 15488k + DEVICE_DTS := ARV7519PW + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV7519PW +endef +TARGET_DEVICES += arcadyan_arv7519pw + +define Device/arcadyan_arv7525pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7525PW + DEVICE_ALT0_VENDOR := Telekom + DEVICE_ALT0_MODEL := Speedport W303V + DEVICE_ALT0_VARIANT := Typ A + IMAGE_SIZE := 3776k + DEVICE_DTS := ARV4510PW + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa -swconfig + SUPPORTED_DEVICES += ARV4510PW +endef +TARGET_DEVICES += arcadyan_arv7525pw + +define Device/arcadyan_arv752dpw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV752DPW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 802 + IMAGE_SIZE := 7872k + DEVICE_DTS := ARV752DPW + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV752DPW +endef +TARGET_DEVICES += arcadyan_arv752dpw + +define Device/arcadyan_arv752dpw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV752DPW22 + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 803 + IMAGE_SIZE := 7616k + DEVICE_DTS := ARV752DPW22 + DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV752DPW22 +endef +TARGET_DEVICES += arcadyan_arv752dpw22 + +define Device/arcadyan_arv8539pw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV8539PW22 + DEVICE_ALT0_VENDOR := Telekom + DEVICE_ALT0_MODEL := Speedport W504V Typ A + IMAGE_SIZE := 7616k + DEVICE_DTS := ARV8539PW22 + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES += ARV8539PW22 +endef +TARGET_DEVICES += arcadyan_arv8539pw22 + +define Device/audiocodes_mp-252 + DEVICE_VENDOR := AudioCodes + DEVICE_MODEL := MediaPack MP-252 + IMAGE_SIZE := 14848k + DEVICE_DTS := ACMP252 + DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ + kmod-rt2800-pci \ + ltq-adsl-app ppp-mod-pppoa \ + wpad-basic + SUPPORTED_DEVICES += ACMP252 +endef +TARGET_DEVICES += audiocodes_mp-252 + +define Device/bt_homehub-v2b + $(Device/NAND) + DEVICE_VENDOR := British Telecom + DEVICE_MODEL := Home Hub 2 + DEVICE_VARIANT := Type B + BOARD_NAME := BTHOMEHUBV2B + DEVICE_DTS := BTHOMEHUBV2B + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + kmod-ltq-deu-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES += BTHOMEHUBV2B +endef +TARGET_DEVICES += bt_homehub-v2b + +define Device/lantiq_easy50712 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Danube (EASY50712) + DEVICE_DTS := EASY50712 + IMAGE_SIZE := 3776k +endef +TARGET_DEVICES += lantiq_easy50712 + +define Device/siemens_gigaset-sx76x + DEVICE_VENDOR := Siemens + DEVICE_MODEL := Gigaset sx76x + IMAGE_SIZE := 7680k + DEVICE_DTS := GIGASX76X + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoe \ + kmod-ath5k wpad-basic + SUPPORTED_DEVICES += GIGASX76X +endef +TARGET_DEVICES += siemens_gigaset-sx76x diff --git a/target/linux/lantiq/image/falcon.mk b/target/linux/lantiq/image/falcon.mk new file mode 100644 index 0000000000..38ba856cf8 --- /dev/null +++ b/target/linux/lantiq/image/falcon.mk @@ -0,0 +1,105 @@ +define Device/lantiq_easy88388 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY88388 +endef +TARGET_DEVICES += lantiq_easy88388 + +define Device/lantiq_easy88444 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY88444 +endef +TARGET_DEVICES += lantiq_easy88444 + +define Device/lantiq_easy98020 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) + DEVICE_VARIANT := v1.0-v1.7 + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY98020 +endef +TARGET_DEVICES += lantiq_easy98020 + +define Device/lantiq_easy98020-v18 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) + DEVICE_VARIANT := v1.8 + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY98020V18 +endef +TARGET_DEVICES += lantiq_easy98020-v18 + +define Device/lantiq_easy98021 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon HGU Reference Board (EASY98021) + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY98021 +endef +TARGET_DEVICES += lantiq_easy98021 + +define Device/lantiq_easy98035synce + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE) + DEVICE_VARIANT := with Synchronous Ethernet + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY98035SYNCE +endef +TARGET_DEVICES += lantiq_easy98035synce + +define Device/lantiq_easy98035synce1588 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588) + DEVICE_VARIANT := with SyncE and IEEE1588 + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY98035SYNCE1588 +endef +TARGET_DEVICES += lantiq_easy98035synce1588 + +define Device/lantiq_easy98000-nand + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY98000 Falcon Eval Board + DEVICE_VARIANT := NAND + IMAGE_SIZE := 3904k + DEVICE_DTS := EASY98000NAND + DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 +endef +TARGET_DEVICES += lantiq_easy98000-nand + +define Device/lantiq_easy98000-nor + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY98000 Falcon Eval Board + DEVICE_VARIANT := NOR + IMAGE_SIZE := 3904k + DEVICE_DTS := EASY98000NOR + DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 +endef +TARGET_DEVICES += lantiq_easy98000-nor + +define Device/lantiq_easy98000-sflash + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY98000 Falcon Eval Board + DEVICE_VARIANT := SFLASH + IMAGE_SIZE := 7424k + DEVICE_DTS := EASY98000SFLASH + DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 +endef +TARGET_DEVICES += lantiq_easy98000-sflash + +define Device/lantiq_falcon-mdu + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon / VINAXdp MDU Board + IMAGE_SIZE := 7424k + DEVICE_DTS := FALCON-MDU +endef +TARGET_DEVICES += lantiq_falcon-mdu + +define Device/lantiq_falcon-sfp + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFP Stick + IMAGE_SIZE := 7424k + DEVICE_DTS := FALCON-SFP +endef +TARGET_DEVICES += lantiq_falcon-sfp diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk new file mode 100644 index 0000000000..dee4b0d161 --- /dev/null +++ b/target/linux/lantiq/image/vr9.mk @@ -0,0 +1,246 @@ +define Device/alphanetworks_asl56026 + DEVICE_VENDOR := Alpha + DEVICE_MODEL := ASL56026 + DEVICE_ALT0_VENDOR := BT Openreach + DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I + DEVICE_DTS := ASL56026 + IMAGE_SIZE := 7488k +endef +TARGET_DEVICES += alphanetworks_asl56026 + +define Device/arcadyan_arv7519rw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7519RW22 + DEVICE_ALT0_VENDOR := Orange + DEVICE_ALT0_MODEL := Livebox + DEVICE_ALT0_VARIANT := 2.1 + DEVICE_ALT1_VENDOR := Astoria Networks + DEVICE_ALT1_MODEL := ARV7519RW22 + IMAGE_SIZE := 31232k + DEVICE_DTS := ARV7519RW22 + DEVICE_PACKAGES := kmod-usb-dwc2 + SUPPORTED_DEVICES += ARV7519RW22 +endef +TARGET_DEVICES += arcadyan_arv7519rw22 + +define Device/arcadyan_vg3503j + DEVICE_VENDOR := BT Openreach + DEVICE_MODEL := ECI VDSL Modem V-2FUb/R + IMAGE_SIZE := 8000k + DEVICE_DTS := VG3503J + SUPPORTED_DEVICES += VG3503J +endef +TARGET_DEVICES += arcadyan_vg3503j + +define Device/arcadyan_vgv7510kw22-brn + $(Device/lantiqBrnImage) + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7510KW22 + DEVICE_VARIANT := BRN + DEVICE_ALT0_VENDOR := o2 + DEVICE_ALT0_MODEL := Box 6431 + DEVICE_ALT0_VARIANT := BRN + IMAGE_SIZE := 7168k + DEVICE_DTS := VGV7510KW22BRN + SIGNATURE := BRNDA6431 + MAGIC := 0x12345678 + CRC32_POLY := 0x04c11db7 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7510KW22BRN +endef +TARGET_DEVICES += arcadyan_vgv7510kw22-brn + +define Device/arcadyan_vgv7510kw22-nor + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7510KW22 + DEVICE_VARIANT := NOR + DEVICE_ALT0_VENDOR := o2 + DEVICE_ALT0_MODEL := Box 6431 + DEVICE_ALT0_VARIANT := NOR + IMAGE_SIZE := 15232k + DEVICE_DTS := VGV7510KW22NOR + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7510KW22NOR +endef +TARGET_DEVICES += arcadyan_vgv7510kw22-nor + +define Device/arcadyan_vgv7519-brn + $(Device/lantiqBrnImage) + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7519 + DEVICE_VARIANT := BRN + DEVICE_ALT0_VENDOR := KPN + DEVICE_ALT0_MODEL := Experiabox 8 + DEVICE_ALT0_VARIANT := BRN + IMAGE_SIZE := 7168k + DEVICE_DTS := VGV7519BRN + SIGNATURE := 5D00008000 + MAGIC := 0x12345678 + CRC32_POLY := 0x2083b8ed + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7519BRN +endef +TARGET_DEVICES += arcadyan_vgv7519-brn + +define Device/arcadyan_vgv7519-nor + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7519 + DEVICE_VARIANT := NOR + DEVICE_ALT0_VENDOR := KPN + DEVICE_ALT0_MODEL := Experiabox 8 + DEVICE_ALT0_VARIANT := NOR + IMAGE_SIZE := 15360k + DEVICE_DTS := VGV7519NOR + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7519NOR +endef +TARGET_DEVICES += arcadyan_vgv7519-nor + +define Device/avm_fritz3370 + $(Device/AVM) + $(Device/NAND) + DEVICE_MODEL := FRITZ!Box 3370 + DEVICE_VARIANT := Rev. 2 + DEVICE_DTS := FRITZ3370 + KERNEL_SIZE := 4096k + UBINIZE_OPTS := -E 5 + IMAGES += eva-kernel.bin eva-filesystem.bin + IMAGE/eva-kernel.bin := append-kernel + IMAGE/eva-filesystem.bin := append-ubi + DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-usb-dwc2 fritz-tffs +endef + +define Device/avm_fritz3370-rev2-hynix + $(Device/avm_fritz3370) + DEVICE_MODEL := FRITZ!Box 3370 + DEVICE_VARIANT := Rev. 2 (Hynix NAND) + DEVICE_DTS := FRITZ3370-REV2-HYNIX +endef +TARGET_DEVICES += avm_fritz3370-rev2-hynix + +define Device/avm_fritz3370-rev2-micron + $(Device/avm_fritz3370) + DEVICE_MODEL := FRITZ!Box 3370 + DEVICE_VARIANT := Rev. 2 (Micron NAND) + DEVICE_DTS := FRITZ3370-REV2-MICRON +endef +TARGET_DEVICES += avm_fritz3370-rev2-micron + +define Device/avm_fritz7360sl + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7360 SL + IMAGE_SIZE := 15744k + DEVICE_DTS := FRITZ7360SL + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += FRITZ7360SL +endef +TARGET_DEVICES += avm_fritz7360sl + +define Device/avm_fritz7362sl + $(Device/AVM) + $(Device/NAND) + DEVICE_MODEL := FRITZ!Box 7362 SL + KERNEL_SIZE := 4096k + IMAGE_SIZE := 49152k + DEVICE_DTS := FRITZ7362SL + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs +endef +TARGET_DEVICES += avm_fritz7362sl + +define Device/avm_fritz7412 + $(Device/AVM) + $(Device/NAND) + DEVICE_MODEL := FRITZ!Box 7412 + BOARD_NAME := FRITZ7412 + DEVICE_DTS := FRITZ7412 + KERNEL_SIZE := 4096k + IMAGE_SIZE := 49152k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata +endef +TARGET_DEVICES += avm_fritz7412 + +define Device/bt_homehub-v5a + $(Device/NAND) + DEVICE_VENDOR := British Telecom + DEVICE_MODEL := Home Hub 5 + DEVICE_VARIANT := Type A + BOARD_NAME := BTHOMEHUBV5A + DEVICE_DTS := BTHOMEHUBV5A + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ + kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += BTHOMEHUBV5A +endef +TARGET_DEVICES += bt_homehub-v5a + +define Device/buffalo_wbmr-300hpd + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WBMR-300HPD + IMAGE_SIZE := 15616k + DEVICE_DTS := WBMR300 + DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += WBMR300 +endef +TARGET_DEVICES += buffalo_wbmr-300hpd + +define Device/lantiq_easy80920-nand + $(Device/lantiqFullImage) + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := VR9 EASY80920 + DEVICE_VARIANT := NAND + DEVICE_DTS := EASY80920NAND + IMAGE_SIZE := 64512k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport +endef +TARGET_DEVICES += lantiq_easy80920-nand + +define Device/lantiq_easy80920-nor + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := VR9 EASY80920 + DEVICE_VARIANT := NOR + DEVICE_DTS := EASY80920NOR + IMAGE_SIZE := 7936k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport +endef +TARGET_DEVICES += lantiq_easy80920-nor + +define Device/netgear_dm200 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DM200 + DEVICE_DTS := DM200 + IMAGES := sysupgrade.bin factory.img + IMAGE/sysupgrade.bin := append-kernel | \ + pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ + pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ + append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni + IMAGE_SIZE := 7872k + NETGEAR_BOARD_ID := DM200 + NETGEAR_HW_ID := 29765233+8+0+64+0+0 +endef +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID +TARGET_DEVICES += netgear_dm200 + +define Device/zyxel_p-2812hnu-f1 + $(Device/NAND) + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P-2812HNU + DEVICE_VARIANT := F1 + BOARD_NAME := P2812HNUF1 + DEVICE_DTS := P2812HNUF1 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + KERNEL_SIZE := 3072k + SUPPORTED_DEVICES += P2812HNUF1 +endef +TARGET_DEVICES += zyxel_p-2812hnu-f1 + +define Device/zyxel_p-2812hnu-f3 + $(Device/NAND) + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P-2812HNU + DEVICE_VARIANT := F3 + BOARD_NAME := P2812HNUF3 + DEVICE_DTS := P2812HNUF3 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += P2812HNUF3 +endef +TARGET_DEVICES += zyxel_p-2812hnu-f3 diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk new file mode 100644 index 0000000000..011de20914 --- /dev/null +++ b/target/linux/lantiq/image/xway_legacy.mk @@ -0,0 +1,77 @@ +define Device/arcadyan_arv4518pwr01 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4518PWR01 + IMAGE_SIZE := 3776k + DEVICE_DTS := ARV4518PWR01 + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath5k wpad-mini + SUPPORTED_DEVICES += ARV4518PWR01 +endef +TARGET_DEVICES += arcadyan_arv4518pwr01 + +define Device/arcadyan_arv4518pwr01a + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4518PWR01A + IMAGE_SIZE := 3776k + DEVICE_DTS := ARV4518PWR01A + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath5k wpad-basic + SUPPORTED_DEVICES += ARV4518PWR01A +endef +TARGET_DEVICES += arcadyan_arv4518pwr01a + +define Device/arcadyan_arv4520pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4520PW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 800 + DEVICE_ALT1_VENDOR := Airties + DEVICE_ALT1_MODEL := WAV-281 + IMAGE_SIZE := 3648k + DEVICE_DTS := ARV4520PW + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-rt61-pci wpad-mini + SUPPORTED_DEVICES += ARV4520PW +endef +TARGET_DEVICES += arcadyan_arv4520pw + +define Device/arcadyan_arv4525pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4525PW + DEVICE_ALT0_VENDOR := Telekom + DEVICE_ALT0_MODEL := Speedport W502V + DEVICE_ALT0_VARIANT := Typ A + IMAGE_SIZE := 3776k + DEVICE_DTS := ARV4525PW + DEVICE_PACKAGES := kmod-ath5k wpad-mini \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa -swconfig + SUPPORTED_DEVICES += ARV4525PW +endef +TARGET_DEVICES += arcadyan_arv4525pw + +define Device/arcadyan_arv452cqw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV452CQW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 801 + IMAGE_SIZE := 3776k + DEVICE_DTS := ARV452CQW + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ath5k wpad-mini \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa + SUPPORTED_DEVICES += ARV452CQW +endef +TARGET_DEVICES += arcadyan_arv452cqw From c640370939d725238aa6200423eb8aabf59ef23e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 16 Dec 2019 00:21:33 +0100 Subject: [PATCH 078/480] lantiq: use soc_vendor_device scheme on DTS file This renames lantiq DTS(I) files to follow soc_vendor_device scheme. This will make DTS files easier to maintain. As a side effect, DTS file name can be derived from device node names now, only having to specify a SOC variable in Makefiles. While at it, move files to arch/mips/boot/dts/lantiq subfolder. Signed-off-by: Adrian Schmutzler --- .../mips/boot/dts/{ => lantiq}/amazonse.dtsi | 0 .../amazonse_allnet_all0333cj.dts} | 0 .../amazonse_netgear_dgn1000b.dts} | 0 .../arch/mips/boot/dts/{ => lantiq}/ar9.dtsi | 0 .../ar9_avm_fritz7312.dts} | 0 .../ar9_avm_fritz7320.dts} | 0 .../ar9_bt_homehub-v3a.dts} | 0 .../ar9_buffalo_wbmr-hp-g300h.dts} | 0 .../ar9_lantiq_easy50810.dts} | 0 .../ar9_netgear_dgn3500.dts} | 2 +- .../ar9_netgear_dgn3500.dtsi} | 0 .../ar9_netgear_dgn3500b.dts} | 2 +- .../{H201L.dts => lantiq/ar9_zte_h201l.dts} | 0 .../ar9_zyxel_p-2601hn.dts} | 0 .../mips/boot/dts/{ => lantiq}/danube.dtsi | 0 .../danube_arcadyan_arv4510pw.dts} | 0 .../danube_arcadyan_arv4518pwr01.dts} | 2 +- .../danube_arcadyan_arv4518pwr01.dtsi} | 0 .../danube_arcadyan_arv4518pwr01a.dts} | 2 +- .../danube_arcadyan_arv4519pw.dts} | 0 .../danube_arcadyan_arv4520pw.dts} | 0 .../danube_arcadyan_arv4525pw.dts} | 0 .../danube_arcadyan_arv452cqw.dts} | 0 .../danube_arcadyan_arv7506pw11.dts} | 0 .../danube_arcadyan_arv7510pw22.dts} | 0 .../danube_arcadyan_arv7518pw.dts} | 0 .../danube_arcadyan_arv7519pw.dts} | 0 .../danube_arcadyan_arv7525pw.dts} | 0 .../danube_arcadyan_arv752dpw.dts} | 0 .../danube_arcadyan_arv752dpw22.dts} | 0 .../danube_arcadyan_arv8539pw22.dts} | 0 .../danube_audiocodes_mp-252.dts} | 0 .../danube_bt_homehub-v2b.dts} | 0 .../danube_lantiq_easy50712.dts} | 0 .../danube_siemens_gigaset-sx76x.dts} | 0 .../mips/boot/dts/{ => lantiq}/falcon.dtsi | 0 .../falcon_lantiq_easy88388.dts} | 2 +- .../falcon_lantiq_easy88444.dts} | 2 +- .../falcon_lantiq_easy98000-nand.dts} | 2 +- .../falcon_lantiq_easy98000-nor.dts} | 2 +- .../falcon_lantiq_easy98000-sflash.dts} | 4 +- .../falcon_lantiq_easy98000.dtsi} | 0 .../falcon_lantiq_easy98020-v18.dts} | 2 +- .../falcon_lantiq_easy98020.dts} | 2 +- .../falcon_lantiq_easy98021.dts} | 2 +- .../falcon_lantiq_easy98035synce.dts} | 2 +- .../falcon_lantiq_easy98035synce1588.dts} | 2 +- .../falcon_lantiq_falcon-mdu.dts} | 2 +- .../falcon_lantiq_falcon-sfp.dts} | 2 +- .../falcon_sflash-16m.dtsi} | 0 .../arch/mips/boot/dts/{ => lantiq}/vr9.dtsi | 0 .../vr9_alphanetworks_asl56026.dts} | 0 .../vr9_arcadyan_arv7519rw22.dts} | 0 .../vr9_arcadyan_vg3503j.dts} | 0 .../vr9_arcadyan_vgv7510kw22-brn.dts} | 2 +- .../vr9_arcadyan_vgv7510kw22-nor.dts} | 2 +- .../vr9_arcadyan_vgv7510kw22.dtsi} | 0 .../vr9_arcadyan_vgv7519-brn.dts} | 2 +- .../vr9_arcadyan_vgv7519-nor.dts} | 2 +- .../vr9_arcadyan_vgv7519.dtsi} | 0 .../vr9_avm_fritz3370-rev2-hynix.dts} | 2 +- .../vr9_avm_fritz3370-rev2-micron.dts} | 2 +- .../vr9_avm_fritz3370-rev2.dtsi} | 0 .../vr9_avm_fritz7360sl.dts} | 2 +- .../vr9_avm_fritz7362sl.dts} | 2 +- .../vr9_avm_fritz736x.dtsi} | 0 .../vr9_avm_fritz7412.dts} | 0 .../vr9_bt_homehub-v5a.dts} | 0 .../vr9_buffalo_wbmr-300hpd.dts} | 0 .../vr9_lantiq_easy80920-nand.dts} | 2 +- .../vr9_lantiq_easy80920-nor.dts} | 2 +- .../vr9_lantiq_easy80920.dtsi} | 0 .../vr9_netgear_dm200.dts} | 0 .../vr9_tplink_tdw8970.dts} | 2 +- .../vr9_tplink_tdw8980.dts} | 2 +- .../vr9_tplink_tdw89x0.dtsi} | 0 .../vr9_tplink_vr200.dts} | 2 +- .../vr9_tplink_vr200.dtsi} | 0 .../vr9_tplink_vr200v.dts} | 2 +- .../vr9_zyxel_p-2812hnu-f1.dts} | 2 +- .../vr9_zyxel_p-2812hnu-f3.dts} | 2 +- .../vr9_zyxel_p-2812hnu-fx.dtsi} | 0 target/linux/lantiq/image/Makefile | 2 + target/linux/lantiq/image/amazonse.mk | 4 +- target/linux/lantiq/image/ar9.mk | 20 +++++----- target/linux/lantiq/image/danube.mk | 28 +++++++------- target/linux/lantiq/image/falcon.mk | 24 ++++++------ target/linux/lantiq/image/tp-link.mk | 5 +-- target/linux/lantiq/image/vr9.mk | 38 +++++++++---------- target/linux/lantiq/image/xway_legacy.mk | 10 ++--- 90 files changed, 98 insertions(+), 99 deletions(-) rename target/linux/lantiq/files/arch/mips/boot/dts/{ => lantiq}/amazonse.dtsi (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ALL0333CJ.dts => lantiq/amazonse_allnet_all0333cj.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{DGN1000B.dts => lantiq/amazonse_netgear_dgn1000b.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ => lantiq}/ar9.dtsi (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ7312.dts => lantiq/ar9_avm_fritz7312.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ7320.dts => lantiq/ar9_avm_fritz7320.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{BTHOMEHUBV3A.dts => lantiq/ar9_bt_homehub-v3a.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{WBMR.dts => lantiq/ar9_buffalo_wbmr-hp-g300h.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY50810.dts => lantiq/ar9_lantiq_easy50810.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{DGN3500.dts => lantiq/ar9_netgear_dgn3500.dts} (75%) rename target/linux/lantiq/files/arch/mips/boot/dts/{DGN3500.dtsi => lantiq/ar9_netgear_dgn3500.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{DGN3500B.dts => lantiq/ar9_netgear_dgn3500b.dts} (75%) rename target/linux/lantiq/files/arch/mips/boot/dts/{H201L.dts => lantiq/ar9_zte_h201l.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{P2601HNFX.dts => lantiq/ar9_zyxel_p-2601hn.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ => lantiq}/danube.dtsi (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4510PW.dts => lantiq/danube_arcadyan_arv4510pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4518PWR01.dts => lantiq/danube_arcadyan_arv4518pwr01.dts} (71%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4518PWR01.dtsi => lantiq/danube_arcadyan_arv4518pwr01.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4518PWR01A.dts => lantiq/danube_arcadyan_arv4518pwr01a.dts} (78%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4519PW.dts => lantiq/danube_arcadyan_arv4519pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4520PW.dts => lantiq/danube_arcadyan_arv4520pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV4525PW.dts => lantiq/danube_arcadyan_arv4525pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV452CQW.dts => lantiq/danube_arcadyan_arv452cqw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV7506PW11.dts => lantiq/danube_arcadyan_arv7506pw11.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV7510PW22.dts => lantiq/danube_arcadyan_arv7510pw22.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV7518PW.dts => lantiq/danube_arcadyan_arv7518pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV7519PW.dts => lantiq/danube_arcadyan_arv7519pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV7525PW.dts => lantiq/danube_arcadyan_arv7525pw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV752DPW.dts => lantiq/danube_arcadyan_arv752dpw.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV752DPW22.dts => lantiq/danube_arcadyan_arv752dpw22.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV8539PW22.dts => lantiq/danube_arcadyan_arv8539pw22.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ACMP252.dts => lantiq/danube_audiocodes_mp-252.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{BTHOMEHUBV2B.dts => lantiq/danube_bt_homehub-v2b.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY50712.dts => lantiq/danube_lantiq_easy50712.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{GIGASX76X.dts => lantiq/danube_siemens_gigaset-sx76x.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ => lantiq}/falcon.dtsi (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY88388.dts => lantiq/falcon_lantiq_easy88388.dts} (98%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY88444.dts => lantiq/falcon_lantiq_easy88444.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98000NAND.dts => lantiq/falcon_lantiq_easy98000-nand.dts} (93%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98000NOR.dts => lantiq/falcon_lantiq_easy98000-nor.dts} (93%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98000SFLASH.dts => lantiq/falcon_lantiq_easy98000-sflash.dts} (73%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98000-base.dtsi => lantiq/falcon_lantiq_easy98000.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98020V18.dts => lantiq/falcon_lantiq_easy98020-v18.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98020.dts => lantiq/falcon_lantiq_easy98020.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98021.dts => lantiq/falcon_lantiq_easy98021.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98035SYNCE.dts => lantiq/falcon_lantiq_easy98035synce.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY98035SYNCE1588.dts => lantiq/falcon_lantiq_easy98035synce1588.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FALCON-MDU.dts => lantiq/falcon_lantiq_falcon-mdu.dts} (96%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FALCON-SFP.dts => lantiq/falcon_lantiq_falcon-sfp.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{falcon-sflash-16M.dtsi => lantiq/falcon_sflash-16m.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ => lantiq}/vr9.dtsi (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ASL56026.dts => lantiq/vr9_alphanetworks_asl56026.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{ARV7519RW22.dts => lantiq/vr9_arcadyan_arv7519rw22.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VG3503J.dts => lantiq/vr9_arcadyan_vg3503j.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VGV7510KW22BRN.dts => lantiq/vr9_arcadyan_vgv7510kw22-brn.dts} (96%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VGV7510KW22NOR.dts => lantiq/vr9_arcadyan_vgv7510kw22-nor.dts} (92%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VGV7510KW22.dtsi => lantiq/vr9_arcadyan_vgv7510kw22.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VGV7519BRN.dts => lantiq/vr9_arcadyan_vgv7519-brn.dts} (96%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VGV7519NOR.dts => lantiq/vr9_arcadyan_vgv7519-nor.dts} (92%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VGV7519.dtsi => lantiq/vr9_arcadyan_vgv7519.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ3370-REV2-HYNIX.dts => lantiq/vr9_avm_fritz3370-rev2-hynix.dts} (94%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ3370-REV2-MICRON.dts => lantiq/vr9_avm_fritz3370-rev2-micron.dts} (94%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ3370-REV2.dtsi => lantiq/vr9_avm_fritz3370-rev2.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ7360SL.dts => lantiq/vr9_avm_fritz7360sl.dts} (97%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ7362SL.dts => lantiq/vr9_avm_fritz7362sl.dts} (98%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ736X.dtsi => lantiq/vr9_avm_fritz736x.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{FRITZ7412.dts => lantiq/vr9_avm_fritz7412.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{BTHOMEHUBV5A.dts => lantiq/vr9_bt_homehub-v5a.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{WBMR300.dts => lantiq/vr9_buffalo_wbmr-300hpd.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY80920NAND.dts => lantiq/vr9_lantiq_easy80920-nand.dts} (96%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY80920NOR.dts => lantiq/vr9_lantiq_easy80920-nor.dts} (94%) rename target/linux/lantiq/files/arch/mips/boot/dts/{EASY80920.dtsi => lantiq/vr9_lantiq_easy80920.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{DM200.dts => lantiq/vr9_netgear_dm200.dts} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{TDW8970.dts => lantiq/vr9_tplink_tdw8970.dts} (78%) rename target/linux/lantiq/files/arch/mips/boot/dts/{TDW8980.dts => lantiq/vr9_tplink_tdw8980.dts} (94%) rename target/linux/lantiq/files/arch/mips/boot/dts/{TDW89X0.dtsi => lantiq/vr9_tplink_tdw89x0.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VR200.dts => lantiq/vr9_tplink_vr200.dts} (98%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VR200.dtsi => lantiq/vr9_tplink_vr200.dtsi} (100%) rename target/linux/lantiq/files/arch/mips/boot/dts/{VR200v.dts => lantiq/vr9_tplink_vr200v.dts} (98%) rename target/linux/lantiq/files/arch/mips/boot/dts/{P2812HNUF1.dts => lantiq/vr9_zyxel_p-2812hnu-f1.dts} (96%) rename target/linux/lantiq/files/arch/mips/boot/dts/{P2812HNUF3.dts => lantiq/vr9_zyxel_p-2812hnu-f3.dts} (96%) rename target/linux/lantiq/files/arch/mips/boot/dts/{P2812HNUFX.dtsi => lantiq/vr9_zyxel_p-2812hnu-fx.dtsi} (100%) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts similarity index 75% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts index 98a2ebd98e..cbc99fe620 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "DGN3500.dtsi" +#include "ar9_netgear_dgn3500.dtsi" / { compatible = "netgear,dgn3500", "lantiq,xway", "lantiq,ar9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts similarity index 75% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts index d1d788cc7d..b69613e48f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "DGN3500.dtsi" +#include "ar9_netgear_dgn3500.dtsi" / { compatible = "netgear,dgn3500b", "lantiq,xway", "lantiq,ar9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts similarity index 71% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts index 34f868f484..ff34068005 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "ARV4518PWR01.dtsi" +#include "danube_arcadyan_arv4518pwr01.dtsi" / { compatible = "arcadyan,arv4518pwr01", "lantiq,xway", "lantiq,danube"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts similarity index 78% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts index 9617398bbc..b261a2fa91 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "ARV4518PWR01.dtsi" +#include "danube_arcadyan_arv4518pwr01.dtsi" / { compatible = "arcadyan,arv4518pwr01a", "lantiq,xway", "lantiq,danube"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts index 12c448c2e6..22ce8caced 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts @@ -2,7 +2,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon FTTDP8 Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts index 3f29d319cd..fa331450bf 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts @@ -2,7 +2,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon FTTdp G.FAST Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts index 2155f0cb1d..e4719d59e0 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "EASY98000-base.dtsi" +#include "falcon_lantiq_easy98000.dtsi" / { model = "Lantiq Falcon (NAND)"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts index 3cb00343f5..cba277e6d1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "EASY98000-base.dtsi" +#include "falcon_lantiq_easy98000.dtsi" / { model = "Lantiq Falcon (NOR)"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts similarity index 73% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts index bbe524e94e..e8d8b42470 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts @@ -1,8 +1,8 @@ /dts-v1/; #include "falcon.dtsi" -#include "EASY98000-base.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_lantiq_easy98000.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon (SFLASH)"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts index 571e23454a..773a490019 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon Reference Board V1.8"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts index 7a3ef418d0..397764aac4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts index 7eb40bde24..aa63268149 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon HGU Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts index df941cdb67..f1ecebec3b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon SFP Stick with SyncE"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts index a3abc6e707..98421174d3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon SFP Stick with SyncE/1588"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts index c5da8b564f..130d49ebd7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon / Vinax MDU Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts index 8d45de4ebe..880c4edca8 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon SFP Stick"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts index 5a33121d72..9f6f405a09 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7510KW22.dtsi" +#include "vr9_arcadyan_vgv7510kw22.dtsi" / { compatible = "arcadyan,vgv7510kw22-brn", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts index 2accffaed7..613ff3782c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7510KW22.dtsi" +#include "vr9_arcadyan_vgv7510kw22.dtsi" / { compatible = "arcadyan,vgv7510kw22-nor", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts index c51a44bb3d..051de0c23e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7519.dtsi" +#include "vr9_arcadyan_vgv7519.dtsi" / { compatible = "arcadyan,vgv7519-brn", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts index aa6a96156f..2121fbf41d 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7519.dtsi" +#include "vr9_arcadyan_vgv7519.dtsi" / { compatible = "arcadyan,vgv7519-nor", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts index 15bd0d2713..1aea98260a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "FRITZ3370-REV2.dtsi" +#include "vr9_avm_fritz3370-rev2.dtsi" / { compatible = "avm,fritz3370-rev2-hynix", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts index 7e4a3e1114..a19d168159 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "FRITZ3370-REV2.dtsi" +#include "vr9_avm_fritz3370-rev2.dtsi" / { compatible = "avm,fritz3370-rev2-micron", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts index 0fbe6396a8..012300ec57 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "FRITZ736X.dtsi" +#include "vr9_avm_fritz736x.dtsi" #include #include diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts index feb9242574..a061a482da 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "FRITZ736X.dtsi" +#include "vr9_avm_fritz736x.dtsi" #include #include diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts index 0bf8e1b7ef..585521459b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts @@ -1,7 +1,7 @@ /dts-v1/; -#include "EASY80920.dtsi" +#include "vr9_lantiq_easy80920.dtsi" / { compatible = "lantiq,easy80920-nand", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts index 6ed6c5d427..c204c5e093 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "EASY80920.dtsi" +#include "vr9_lantiq_easy80920.dtsi" / { compatible = "lantiq,easy80920-nor", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts similarity index 78% rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts index 25eb3dac67..9b3055983a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "TDW89X0.dtsi" +#include "vr9_tplink_tdw89x0.dtsi" / { compatible = "tplink,tdw8970", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts index 76875e735d..725aa759d2 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "TDW89X0.dtsi" +#include "vr9_tplink_tdw89x0.dtsi" / { compatible = "tplink,tdw8980", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts index 8724e37b47..98f2282579 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VR200.dtsi" +#include "vr9_tplink_vr200.dtsi" / { compatible = "tplink,vr200", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts index 34805bb9f0..2e25a72a83 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VR200.dtsi" +#include "vr9_tplink_vr200.dtsi" / { compatible = "tplink,vr200v", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts index d1a04a4a78..4d7aac325b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "P2812HNUFX.dtsi" +#include "vr9_zyxel_p-2812hnu-fx.dtsi" / { compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts index a607311460..7da1533809 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "P2812HNUFX.dtsi" +#include "vr9_zyxel_p-2812hnu-fx.dtsi" / { compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index a2052ef924..3060ff920b 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -61,6 +61,8 @@ define Device/Default KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma FILESYSTEMS := squashfs IMAGE_SIZE := + DTS_DIR := $(DTS_DIR)/lantiq + DEVICE_DTS = $$(SOC)_$(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) diff --git a/target/linux/lantiq/image/amazonse.mk b/target/linux/lantiq/image/amazonse.mk index 77afaa8bed..c9329a4dd9 100644 --- a/target/linux/lantiq/image/amazonse.mk +++ b/target/linux/lantiq/image/amazonse.mk @@ -2,7 +2,7 @@ define Device/allnet_all0333cj DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL0333CJ IMAGE_SIZE := 3700k - DEVICE_DTS := ALL0333CJ + SOC := amazonse DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ ltq-adsl-app ppp-mod-pppoe @@ -13,7 +13,7 @@ define Device/netgear_dgn1000b DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DGN1000B IMAGE_SIZE := 6000k - DEVICE_DTS := DGN1000B + SOC := amazonse DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ ltq-adsl-app ppp-mod-pppoe diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index 272227bdb3..f86e2d1c68 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -1,7 +1,7 @@ define Device/avm_fritz7312 $(Device/AVM) DEVICE_MODEL := FRITZ!Box 7312 - DEVICE_DTS := FRITZ7312 + SOC := ar9 IMAGE_SIZE := 15744k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ @@ -16,7 +16,7 @@ define Device/avm_fritz7320 DEVICE_MODEL := FRITZ!Box 7320 DEVICE_ALT0_VENDOR := 1&1 DEVICE_ALT0_MODEL := HomeServer - DEVICE_DTS := FRITZ7320 + SOC := ar9 IMAGE_SIZE := 15744k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ @@ -33,7 +33,7 @@ define Device/bt_homehub-v3a DEVICE_MODEL := Home Hub DEVICE_VARIANT := Type A BOARD_NAME := BTHOMEHUBV3A - DEVICE_DTS := BTHOMEHUBV3A + SOC := ar9 DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ @@ -50,7 +50,8 @@ define Device/buffalo_wbmr-hp-g300h-a DEVICE_MODEL := WBMR-HP-G300H DEVICE_VARIANT := A IMAGE_SIZE := 31488k - DEVICE_DTS := WBMR + SOC := ar9 + DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ @@ -65,7 +66,8 @@ define Device/buffalo_wbmr-hp-g300h-b DEVICE_MODEL := WBMR-HP-G300H DEVICE_VARIANT := B IMAGE_SIZE := 31488k - DEVICE_DTS := WBMR + SOC := ar9 + DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ @@ -80,7 +82,7 @@ DGN3500_KERNEL_OFFSET_DEC=327680 define Device/netgear_dgn3500 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DGN3500 - DEVICE_DTS := DGN3500 + SOC := ar9 IMAGE_SIZE := 16000k IMAGES := \ sysupgrade-na.bin sysupgrade.bin \ @@ -112,7 +114,7 @@ TARGET_DEVICES += netgear_dgn3500 define Device/netgear_dgn3500b DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DGN3500B - DEVICE_DTS := DGN3500B + SOC := ar9 IMAGE_SIZE := 16000k IMAGES += factory.img IMAGE/sysupgrade.bin := \ @@ -136,7 +138,7 @@ define Device/zte_h201l DEVICE_VENDOR := ZTE DEVICE_MODEL := H201L IMAGE_SIZE := 7808k - DEVICE_DTS := H201L + SOC := ar9 DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ @@ -152,7 +154,7 @@ define Device/zyxel_p-2601hn DEVICE_MODEL := P-2601HN DEVICE_VARIANT := F1/F3 IMAGE_SIZE := 15616k - DEVICE_DTS := P2601HNFX + SOC := ar9 DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk index 8171900a6f..2fb5ea061f 100644 --- a/target/linux/lantiq/image/danube.mk +++ b/target/linux/lantiq/image/danube.mk @@ -4,7 +4,7 @@ define Device/arcadyan_arv4510pw DEVICE_ALT0_VENDOR := Wippies DEVICE_ALT0_MODEL := BeWan iBox v1.0 IMAGE_SIZE := 15616k - DEVICE_DTS := ARV4510PW + SOC := danube DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -23,7 +23,7 @@ define Device/arcadyan_arv4519pw DEVICE_ALT1_VENDOR := Pirelli DEVICE_ALT1_MODEL := P.RG A4201G IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4519PW + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -38,7 +38,7 @@ define Device/arcadyan_arv7506pw11 DEVICE_ALT0_VENDOR := Alice/O2 DEVICE_ALT0_MODEL := IAD 4421 IMAGE_SIZE := 7808k - DEVICE_DTS := ARV7506PW11 + SOC := danube DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ @@ -53,7 +53,7 @@ define Device/arcadyan_arv7510pw22 DEVICE_ALT0_VENDOR := Astoria Networks DEVICE_ALT0_MODEL := ARV7510PW22 IMAGE_SIZE := 31232k - DEVICE_DTS := ARV7510PW22 + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -71,7 +71,7 @@ define Device/arcadyan_arv7518pw DEVICE_ALT0_VENDOR := Astoria Networks DEVICE_ALT0_MODEL := ARV7518PW IMAGE_SIZE := 7872k - DEVICE_DTS := ARV7518PW + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -87,7 +87,7 @@ define Device/arcadyan_arv7519pw DEVICE_ALT0_VENDOR := Astoria Networks DEVICE_ALT0_MODEL := ARV7519PW IMAGE_SIZE := 15488k - DEVICE_DTS := ARV7519PW + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -104,7 +104,7 @@ define Device/arcadyan_arv7525pw DEVICE_ALT0_MODEL := Speedport W303V DEVICE_ALT0_VARIANT := Typ A IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4510PW + SOC := danube DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -119,7 +119,7 @@ define Device/arcadyan_arv752dpw DEVICE_ALT0_VENDOR := Vodafone DEVICE_ALT0_MODEL := Easybox 802 IMAGE_SIZE := 7872k - DEVICE_DTS := ARV752DPW + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -136,7 +136,7 @@ define Device/arcadyan_arv752dpw22 DEVICE_ALT0_VENDOR := Vodafone DEVICE_ALT0_MODEL := Easybox 803 IMAGE_SIZE := 7616k - DEVICE_DTS := ARV752DPW22 + SOC := danube DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -153,7 +153,7 @@ define Device/arcadyan_arv8539pw22 DEVICE_ALT0_VENDOR := Telekom DEVICE_ALT0_MODEL := Speedport W504V Typ A IMAGE_SIZE := 7616k - DEVICE_DTS := ARV8539PW22 + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -167,7 +167,7 @@ define Device/audiocodes_mp-252 DEVICE_VENDOR := AudioCodes DEVICE_MODEL := MediaPack MP-252 IMAGE_SIZE := 14848k - DEVICE_DTS := ACMP252 + SOC := danube DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ kmod-ltq-tapi kmod-ltq-vmmc \ @@ -185,7 +185,7 @@ define Device/bt_homehub-v2b DEVICE_MODEL := Home Hub 2 DEVICE_VARIANT := Type B BOARD_NAME := BTHOMEHUBV2B - DEVICE_DTS := BTHOMEHUBV2B + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -199,7 +199,7 @@ TARGET_DEVICES += bt_homehub-v2b define Device/lantiq_easy50712 DEVICE_VENDOR := Lantiq DEVICE_MODEL := Danube (EASY50712) - DEVICE_DTS := EASY50712 + SOC := danube IMAGE_SIZE := 3776k endef TARGET_DEVICES += lantiq_easy50712 @@ -208,7 +208,7 @@ define Device/siemens_gigaset-sx76x DEVICE_VENDOR := Siemens DEVICE_MODEL := Gigaset sx76x IMAGE_SIZE := 7680k - DEVICE_DTS := GIGASX76X + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ diff --git a/target/linux/lantiq/image/falcon.mk b/target/linux/lantiq/image/falcon.mk index 38ba856cf8..e6aae1240b 100644 --- a/target/linux/lantiq/image/falcon.mk +++ b/target/linux/lantiq/image/falcon.mk @@ -2,7 +2,7 @@ define Device/lantiq_easy88388 DEVICE_VENDOR := Lantiq DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board IMAGE_SIZE := 7424k - DEVICE_DTS := EASY88388 + SOC := falcon endef TARGET_DEVICES += lantiq_easy88388 @@ -10,7 +10,7 @@ define Device/lantiq_easy88444 DEVICE_VENDOR := Lantiq DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board IMAGE_SIZE := 7424k - DEVICE_DTS := EASY88444 + SOC := falcon endef TARGET_DEVICES += lantiq_easy88444 @@ -19,7 +19,7 @@ define Device/lantiq_easy98020 DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) DEVICE_VARIANT := v1.0-v1.7 IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98020 + SOC := falcon endef TARGET_DEVICES += lantiq_easy98020 @@ -28,7 +28,7 @@ define Device/lantiq_easy98020-v18 DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) DEVICE_VARIANT := v1.8 IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98020V18 + SOC := falcon endef TARGET_DEVICES += lantiq_easy98020-v18 @@ -36,7 +36,7 @@ define Device/lantiq_easy98021 DEVICE_VENDOR := Lantiq DEVICE_MODEL := Falcon HGU Reference Board (EASY98021) IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98021 + SOC := falcon endef TARGET_DEVICES += lantiq_easy98021 @@ -45,7 +45,7 @@ define Device/lantiq_easy98035synce DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE) DEVICE_VARIANT := with Synchronous Ethernet IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98035SYNCE + SOC := falcon endef TARGET_DEVICES += lantiq_easy98035synce @@ -54,7 +54,7 @@ define Device/lantiq_easy98035synce1588 DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588) DEVICE_VARIANT := with SyncE and IEEE1588 IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98035SYNCE1588 + SOC := falcon endef TARGET_DEVICES += lantiq_easy98035synce1588 @@ -63,7 +63,7 @@ define Device/lantiq_easy98000-nand DEVICE_MODEL := EASY98000 Falcon Eval Board DEVICE_VARIANT := NAND IMAGE_SIZE := 3904k - DEVICE_DTS := EASY98000NAND + SOC := falcon DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 endef TARGET_DEVICES += lantiq_easy98000-nand @@ -73,7 +73,7 @@ define Device/lantiq_easy98000-nor DEVICE_MODEL := EASY98000 Falcon Eval Board DEVICE_VARIANT := NOR IMAGE_SIZE := 3904k - DEVICE_DTS := EASY98000NOR + SOC := falcon DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 endef TARGET_DEVICES += lantiq_easy98000-nor @@ -83,7 +83,7 @@ define Device/lantiq_easy98000-sflash DEVICE_MODEL := EASY98000 Falcon Eval Board DEVICE_VARIANT := SFLASH IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98000SFLASH + SOC := falcon DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 endef TARGET_DEVICES += lantiq_easy98000-sflash @@ -92,7 +92,7 @@ define Device/lantiq_falcon-mdu DEVICE_VENDOR := Lantiq DEVICE_MODEL := Falcon / VINAXdp MDU Board IMAGE_SIZE := 7424k - DEVICE_DTS := FALCON-MDU + SOC := falcon endef TARGET_DEVICES += lantiq_falcon-mdu @@ -100,6 +100,6 @@ define Device/lantiq_falcon-sfp DEVICE_VENDOR := Lantiq DEVICE_MODEL := Falcon SFP Stick IMAGE_SIZE := 7424k - DEVICE_DTS := FALCON-SFP + SOC := falcon endef TARGET_DEVICES += lantiq_falcon-sfp diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk index 3be40fc947..56a7e5ca57 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -2,6 +2,7 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLIN define Device/lantiqTpLink DEVICE_VENDOR := TP-Link + SOC := vr9 TPLINK_HWREVADD := 0 TPLINK_HVERSION := 2 KERNEL := kernel-bin | append-dtb | lzma @@ -16,7 +17,6 @@ define Device/tplink_tdw8970 $(Device/lantiqTpLink) DEVICE_MODEL := TD-W8970 DEVICE_VARIANT := v1 - DEVICE_DTS := TDW8970 TPLINK_FLASHLAYOUT := 8Mltq TPLINK_HWID := 0x89700001 TPLINK_HWREV := 1 @@ -30,7 +30,6 @@ define Device/tplink_tdw8980 $(Device/lantiqTpLink) DEVICE_MODEL := TD-W8980 DEVICE_VARIANT := v1 - DEVICE_DTS := TDW8980 TPLINK_FLASHLAYOUT := 8Mltq TPLINK_HWID := 0x89800001 TPLINK_HWREV := 14 @@ -44,7 +43,6 @@ define Device/tplink_vr200 $(Device/lantiqTpLink) DEVICE_MODEL := Archer VR200 DEVICE_VARIANT := v1 - DEVICE_DTS := VR200 TPLINK_FLASHLAYOUT := 16Mltq TPLINK_HWID := 0x63e64801 TPLINK_HWREV := 0x53 @@ -58,7 +56,6 @@ define Device/tplink_vr200v $(Device/lantiqTpLink) DEVICE_MODEL := Archer VR200v DEVICE_VARIANT := v1 - DEVICE_DTS := VR200v TPLINK_FLASHLAYOUT := 16Mltq TPLINK_HWID := 0x73b70801 TPLINK_HWREV := 0x2f diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index dee4b0d161..cd43c61e6e 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -3,7 +3,7 @@ define Device/alphanetworks_asl56026 DEVICE_MODEL := ASL56026 DEVICE_ALT0_VENDOR := BT Openreach DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I - DEVICE_DTS := ASL56026 + SOC := vr9 IMAGE_SIZE := 7488k endef TARGET_DEVICES += alphanetworks_asl56026 @@ -17,7 +17,7 @@ define Device/arcadyan_arv7519rw22 DEVICE_ALT1_VENDOR := Astoria Networks DEVICE_ALT1_MODEL := ARV7519RW22 IMAGE_SIZE := 31232k - DEVICE_DTS := ARV7519RW22 + SOC := vr9 DEVICE_PACKAGES := kmod-usb-dwc2 SUPPORTED_DEVICES += ARV7519RW22 endef @@ -27,7 +27,7 @@ define Device/arcadyan_vg3503j DEVICE_VENDOR := BT Openreach DEVICE_MODEL := ECI VDSL Modem V-2FUb/R IMAGE_SIZE := 8000k - DEVICE_DTS := VG3503J + SOC := vr9 SUPPORTED_DEVICES += VG3503J endef TARGET_DEVICES += arcadyan_vg3503j @@ -41,7 +41,7 @@ define Device/arcadyan_vgv7510kw22-brn DEVICE_ALT0_MODEL := Box 6431 DEVICE_ALT0_VARIANT := BRN IMAGE_SIZE := 7168k - DEVICE_DTS := VGV7510KW22BRN + SOC := vr9 SIGNATURE := BRNDA6431 MAGIC := 0x12345678 CRC32_POLY := 0x04c11db7 @@ -58,7 +58,7 @@ define Device/arcadyan_vgv7510kw22-nor DEVICE_ALT0_MODEL := Box 6431 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15232k - DEVICE_DTS := VGV7510KW22NOR + SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7510KW22NOR endef @@ -73,7 +73,7 @@ define Device/arcadyan_vgv7519-brn DEVICE_ALT0_MODEL := Experiabox 8 DEVICE_ALT0_VARIANT := BRN IMAGE_SIZE := 7168k - DEVICE_DTS := VGV7519BRN + SOC := vr9 SIGNATURE := 5D00008000 MAGIC := 0x12345678 CRC32_POLY := 0x2083b8ed @@ -90,7 +90,7 @@ define Device/arcadyan_vgv7519-nor DEVICE_ALT0_MODEL := Experiabox 8 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15360k - DEVICE_DTS := VGV7519NOR + SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7519NOR endef @@ -101,7 +101,7 @@ define Device/avm_fritz3370 $(Device/NAND) DEVICE_MODEL := FRITZ!Box 3370 DEVICE_VARIANT := Rev. 2 - DEVICE_DTS := FRITZ3370 + SOC := vr9 KERNEL_SIZE := 4096k UBINIZE_OPTS := -E 5 IMAGES += eva-kernel.bin eva-filesystem.bin @@ -114,7 +114,6 @@ define Device/avm_fritz3370-rev2-hynix $(Device/avm_fritz3370) DEVICE_MODEL := FRITZ!Box 3370 DEVICE_VARIANT := Rev. 2 (Hynix NAND) - DEVICE_DTS := FRITZ3370-REV2-HYNIX endef TARGET_DEVICES += avm_fritz3370-rev2-hynix @@ -122,7 +121,6 @@ define Device/avm_fritz3370-rev2-micron $(Device/avm_fritz3370) DEVICE_MODEL := FRITZ!Box 3370 DEVICE_VARIANT := Rev. 2 (Micron NAND) - DEVICE_DTS := FRITZ3370-REV2-MICRON endef TARGET_DEVICES += avm_fritz3370-rev2-micron @@ -130,7 +128,7 @@ define Device/avm_fritz7360sl $(Device/AVM) DEVICE_MODEL := FRITZ!Box 7360 SL IMAGE_SIZE := 15744k - DEVICE_DTS := FRITZ7360SL + SOC := vr9 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += FRITZ7360SL endef @@ -142,7 +140,7 @@ define Device/avm_fritz7362sl DEVICE_MODEL := FRITZ!Box 7362 SL KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_DTS := FRITZ7362SL + SOC := vr9 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs endef TARGET_DEVICES += avm_fritz7362sl @@ -152,7 +150,7 @@ define Device/avm_fritz7412 $(Device/NAND) DEVICE_MODEL := FRITZ!Box 7412 BOARD_NAME := FRITZ7412 - DEVICE_DTS := FRITZ7412 + SOC := vr9 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata @@ -165,7 +163,7 @@ define Device/bt_homehub-v5a DEVICE_MODEL := Home Hub 5 DEVICE_VARIANT := Type A BOARD_NAME := BTHOMEHUBV5A - DEVICE_DTS := BTHOMEHUBV5A + SOC := vr9 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += BTHOMEHUBV5A @@ -176,7 +174,7 @@ define Device/buffalo_wbmr-300hpd DEVICE_VENDOR := Buffalo DEVICE_MODEL := WBMR-300HPD IMAGE_SIZE := 15616k - DEVICE_DTS := WBMR300 + SOC := vr9 DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += WBMR300 endef @@ -187,7 +185,7 @@ define Device/lantiq_easy80920-nand DEVICE_VENDOR := Lantiq DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NAND - DEVICE_DTS := EASY80920NAND + SOC := vr9 IMAGE_SIZE := 64512k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport endef @@ -197,7 +195,7 @@ define Device/lantiq_easy80920-nor DEVICE_VENDOR := Lantiq DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NOR - DEVICE_DTS := EASY80920NOR + SOC := vr9 IMAGE_SIZE := 7936k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport endef @@ -206,7 +204,7 @@ TARGET_DEVICES += lantiq_easy80920-nor define Device/netgear_dm200 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DM200 - DEVICE_DTS := DM200 + SOC := vr9 IMAGES := sysupgrade.bin factory.img IMAGE/sysupgrade.bin := append-kernel | \ pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ @@ -226,7 +224,7 @@ define Device/zyxel_p-2812hnu-f1 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F1 BOARD_NAME := P2812HNUF1 - DEVICE_DTS := P2812HNUF1 + SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport KERNEL_SIZE := 3072k SUPPORTED_DEVICES += P2812HNUF1 @@ -239,7 +237,7 @@ define Device/zyxel_p-2812hnu-f3 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F3 BOARD_NAME := P2812HNUF3 - DEVICE_DTS := P2812HNUF3 + SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += P2812HNUF3 endef diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk index 011de20914..8af2e1c3fc 100644 --- a/target/linux/lantiq/image/xway_legacy.mk +++ b/target/linux/lantiq/image/xway_legacy.mk @@ -2,7 +2,7 @@ define Device/arcadyan_arv4518pwr01 DEVICE_VENDOR := Arcadyan DEVICE_MODEL := ARV4518PWR01 IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4518PWR01 + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -16,7 +16,7 @@ define Device/arcadyan_arv4518pwr01a DEVICE_VENDOR := Arcadyan DEVICE_MODEL := ARV4518PWR01A IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4518PWR01A + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -34,7 +34,7 @@ define Device/arcadyan_arv4520pw DEVICE_ALT1_VENDOR := Airties DEVICE_ALT1_MODEL := WAV-281 IMAGE_SIZE := 3648k - DEVICE_DTS := ARV4520PW + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -51,7 +51,7 @@ define Device/arcadyan_arv4525pw DEVICE_ALT0_MODEL := Speedport W502V DEVICE_ALT0_VARIANT := Typ A IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4525PW + SOC := danube DEVICE_PACKAGES := kmod-ath5k wpad-mini \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -66,7 +66,7 @@ define Device/arcadyan_arv452cqw DEVICE_ALT0_VENDOR := Vodafone DEVICE_ALT0_MODEL := Easybox 801 IMAGE_SIZE := 3776k - DEVICE_DTS := ARV452CQW + SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ath5k wpad-mini \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ From 397aa5d37d2bb3762058a6aeb497fc804974bde7 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 16 Dec 2019 00:25:01 +0100 Subject: [PATCH 079/480] lantiq: remove ar9_lantiq_easy50810.dts This file seems to be orphaned, no device setup existing for it. Signed-off-by: Adrian Schmutzler --- .../boot/dts/lantiq/ar9_lantiq_easy50810.dts | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts deleted file mode 100644 index 87ba62de33..0000000000 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts +++ /dev/null @@ -1,73 +0,0 @@ -/dts-v1/; - -#include "ar9.dtsi" - -/ { - compatible = "lantiq,easy50810", "lantiq,xway", "lantiq,ar9"; - model = "Lantiq EASY50810"; - - chosen { - bootargs = "console=ttyLTQ0,115200"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x2000000>; - }; -}; - -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - exin { - lantiq,groups = "exin1"; - lantiq,function = "exin"; - }; - }; -}; - -&gsw { - phy-mode = "rmii"; -}; - -&localbus { - flash@0 { - compatible = "lantiq,nor"; - bank-width = <2>; - reg = <0 0x0 0x2000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "uboot"; - reg = <0x00000 0x10000>; /* 64 KB */ - }; - - partition@10000 { - label = "uboot_env"; - reg = <0x10000 0x10000>; /* 64 KB */ - }; - - partition@20000 { - label = "firmware"; - reg = <0x20000 0x3d0000>; - }; - - partition@400000 { - label = "rootfs"; - reg = <0x400000 0x400000>; - }; - }; - }; -}; - -&stp { - status = "okay"; - lantiq,shadow = <0xfff>; - lantiq,groups = <0x3>; -}; From e2eb6d5829c71ded0238059a7f2c6ade19c8b171 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 20 Dec 2019 14:08:55 +0100 Subject: [PATCH 080/480] lantiq: move include to parent falcon_lantiq_easy98000.dtsi This moves the include of lantiq.dtsi from the DTS files to the parent falcon_lantiq_easy98000.dtsi. Signed-off-by: Adrian Schmutzler --- .../mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts | 1 - .../arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts | 1 - .../mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts | 2 -- .../arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi | 4 ++-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts index e4719d59e0..2107da5435 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts @@ -1,6 +1,5 @@ /dts-v1/; -#include "falcon.dtsi" #include "falcon_lantiq_easy98000.dtsi" / { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts index cba277e6d1..56d0fe0bc3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts @@ -1,6 +1,5 @@ /dts-v1/; -#include "falcon.dtsi" #include "falcon_lantiq_easy98000.dtsi" / { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts index e8d8b42470..8c931746ed 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts @@ -1,6 +1,5 @@ /dts-v1/; -#include "falcon.dtsi" #include "falcon_lantiq_easy98000.dtsi" #include "falcon_sflash-16m.dtsi" @@ -13,4 +12,3 @@ spi1 = &spi; }; }; - diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi index fa8c0b4b06..5821c51def 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi @@ -1,7 +1,8 @@ - #include #include +#include "falcon.dtsi" + / { compatible = "lantiq,easy98000", "lantiq,falcon"; @@ -107,4 +108,3 @@ reg = <0x51>; }; }; - From bf43e5bbf91ca1a90df8dae3e2cce6bbb61d5cd9 Mon Sep 17 00:00:00 2001 From: Magnus Kroken Date: Sat, 2 Nov 2019 00:30:02 +0100 Subject: [PATCH 081/480] openvpn: update to 2.4.8 Backport two upstream commits that allow building openvpn-openssl without OpenSSLs deprecated APIs. Full changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24#OpenVPN2.4.8 Signed-off-by: Magnus Kroken --- package/network/services/openvpn/Makefile | 8 +-- ...l-dont-use-deprecated-ssleay-symbols.patch | 58 +++++++++++++++++ ...enssl-add-missing-include-statements.patch | 65 +++++++++++++++++++ .../210-build_always_use_internal_lz4.patch | 2 +- .../openvpn/patches/220-disable_des.patch | 2 +- 5 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch create mode 100644 package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index aed9f43f80..baa8c1d07e 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.4.7 -PKG_RELEASE:=2 +PKG_VERSION:=2.4.8 +PKG_RELEASE:=1 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ https://swupdate.openvpn.net/community/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648 +PKG_HASH:=fb8ca66bb7807fff595fbdf2a0afd085c02a6aa47715c9aa3171002f9f1a3f91 PKG_MAINTAINER:=Felix Fietkau @@ -44,7 +44,7 @@ else endif endef -Package/openvpn-openssl=$(call Package/openvpn/Default,openssl,OpenSSL,+PACKAGE_openvpn-openssl:libopenssl +@OPENSSL_WITH_DEPRECATED) +Package/openvpn-openssl=$(call Package/openvpn/Default,openssl,OpenSSL,+PACKAGE_openvpn-openssl:libopenssl) Package/openvpn-mbedtls=$(call Package/openvpn/Default,mbedtls,mbedTLS,+PACKAGE_openvpn-mbedtls:libmbedtls) Package/openvpn-nossl=$(call Package/openvpn/Default,nossl,plaintext (no SSL)) diff --git a/package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch b/package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch new file mode 100644 index 0000000000..7e9931f0f3 --- /dev/null +++ b/package/network/services/openvpn/patches/110-openssl-dont-use-deprecated-ssleay-symbols.patch @@ -0,0 +1,58 @@ +From 17a476fd5c8cc49f1d103a50199e87ede76b1b67 Mon Sep 17 00:00:00 2001 +From: Steffan Karger +Date: Sun, 26 Nov 2017 16:04:00 +0100 +Subject: [PATCH] openssl: don't use deprecated SSLEAY/SSLeay symbols + +Compiling our current master against OpenSSL 1.1 with +-DOPENSSL_API_COMPAT=0x10100000L screams bloody murder. This patch fixes +the errors about the deprecated SSLEAY/SSLeay symbols and defines. + +Signed-off-by: Steffan Karger +Acked-by: Gert Doering +Message-Id: <20171126150401.28565-1-steffan@karger.me> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15934.html +Signed-off-by: Gert Doering +--- + configure.ac | 1 + + src/openvpn/openssl_compat.h | 8 ++++++++ + src/openvpn/ssl_openssl.c | 2 +- + 3 files changed, 10 insertions(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -904,6 +904,7 @@ if test "${enable_crypto}" = "yes" -a "$ + EVP_MD_CTX_free \ + EVP_MD_CTX_reset \ + EVP_CIPHER_CTX_reset \ ++ OpenSSL_version \ + SSL_CTX_get_default_passwd_cb \ + SSL_CTX_get_default_passwd_cb_userdata \ + SSL_CTX_set_security_level \ +--- a/src/openvpn/openssl_compat.h ++++ b/src/openvpn/openssl_compat.h +@@ -689,6 +689,14 @@ EC_GROUP_order_bits(const EC_GROUP *grou + #endif + + /* SSLeay symbols have been renamed in OpenSSL 1.1 */ ++#ifndef OPENSSL_VERSION ++#define OPENSSL_VERSION SSLEAY_VERSION ++#endif ++ ++#ifndef HAVE_OPENSSL_VERSION ++#define OpenSSL_version SSLeay_version ++#endif ++ + #if !defined(RSA_F_RSA_OSSL_PRIVATE_ENCRYPT) + #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT RSA_F_RSA_EAY_PRIVATE_ENCRYPT + #endif +--- a/src/openvpn/ssl_openssl.c ++++ b/src/openvpn/ssl_openssl.c +@@ -1977,7 +1977,7 @@ get_highest_preference_tls_cipher(char * + const char * + get_ssl_library_version(void) + { +- return SSLeay_version(SSLEAY_VERSION); ++ return OpenSSL_version(OPENSSL_VERSION); + } + + #endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ diff --git a/package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch b/package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch new file mode 100644 index 0000000000..6a62b16500 --- /dev/null +++ b/package/network/services/openvpn/patches/111-openssl-add-missing-include-statements.patch @@ -0,0 +1,65 @@ +From 1987498271abadf042d8bb3feee1fe0d877a9d55 Mon Sep 17 00:00:00 2001 +From: Steffan Karger +Date: Sun, 26 Nov 2017 16:49:12 +0100 +Subject: [PATCH] openssl: add missing #include statements + +Compiling our current master against OpenSSL 1.1 with +-DOPENSSL_API_COMPAT=0x10100000L screams bloody murder. This patch fixes +the errors caused by missing includes. Previous openssl versions would +usually include 'the rest of the world', but they're fixing that. So we +should no longer rely on it. + +(And sneaking in alphabetic ordering of the includes while touching them.) + +Signed-off-by: Steffan Karger +Acked-by: Gert Doering +Message-Id: <20171126154912.13283-1-steffan@karger.me> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15936.html +Signed-off-by: Gert Doering +--- + src/openvpn/openssl_compat.h | 1 + + src/openvpn/ssl_openssl.c | 6 +++++- + src/openvpn/ssl_verify_openssl.c | 3 ++- + 3 files changed, 8 insertions(+), 2 deletions(-) + +--- a/src/openvpn/openssl_compat.h ++++ b/src/openvpn/openssl_compat.h +@@ -42,6 +42,7 @@ + + #include "buffer.h" + ++#include + #include + #include + +--- a/src/openvpn/ssl_openssl.c ++++ b/src/openvpn/ssl_openssl.c +@@ -52,10 +52,14 @@ + + #include "ssl_verify_openssl.h" + ++#include ++#include ++#include ++#include + #include + #include ++#include + #include +-#include + #ifndef OPENSSL_NO_EC + #include + #endif +--- a/src/openvpn/ssl_verify_openssl.c ++++ b/src/openvpn/ssl_verify_openssl.c +@@ -44,8 +44,9 @@ + #include "ssl_verify_backend.h" + #include "openssl_compat.h" + +-#include ++#include + #include ++#include + + int + verify_callback(int preverify_ok, X509_STORE_CTX *ctx) diff --git a/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch b/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch index dc4039c3e6..5cf5174a9d 100644 --- a/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch +++ b/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1078,68 +1078,15 @@ dnl +@@ -1080,68 +1080,15 @@ dnl AC_ARG_VAR([LZ4_CFLAGS], [C compiler flags for lz4]) AC_ARG_VAR([LZ4_LIBS], [linker flags for lz4]) if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then diff --git a/package/network/services/openvpn/patches/220-disable_des.patch b/package/network/services/openvpn/patches/220-disable_des.patch index 030958d1bc..2b8f47a802 100644 --- a/package/network/services/openvpn/patches/220-disable_des.patch +++ b/package/network/services/openvpn/patches/220-disable_des.patch @@ -66,7 +66,7 @@ } /* -@@ -710,10 +718,12 @@ cipher_des_encrypt_ecb(const unsigned ch +@@ -705,10 +713,12 @@ cipher_des_encrypt_ecb(const unsigned ch unsigned char *src, unsigned char *dst) { From 74e9f95c79dc574c2407ed798f37c9a4c989e55d Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 22 Dec 2019 23:47:24 +0900 Subject: [PATCH 082/480] ramips: further improve support for Xiaomi MiWiFi Nano This patch does the following: - prepend vendor name to model - set status LEDs to follow the behavior in stock FW - simplify state_default node definition - use generic name for flash node Stock FW status indicators: https://files.xiaomi-mi.com/files/Mi_Router_Wi-Fi_Nano/Mi_router-NANO_EN.pdf > Yellow: power on / off > Blue: during normal operation > Red: in case of problems with the operation of the device Signed-off-by: Sungbo Eo --- .../dts/mt7628an_xiaomi_miwifi-nano.dts | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index 8b2a3d6c9d..49c2a368d9 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -7,13 +7,13 @@ / { compatible = "xiaomi,miwifi-nano", "mediatek,mt7628an-soc"; - model = "MiWiFi Nano"; + model = "Xiaomi MiWiFi Nano"; aliases { - led-boot = &led_blue; - led-failsafe = &led_blue; - led-running = &led_blue; - led-upgrade = &led_blue; + led-boot = &led_status_amber; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_amber; }; chosen { @@ -23,17 +23,17 @@ leds { compatible = "gpio-leds"; - led_blue: status_blue { + led_status_blue: status_blue { label = "miwifi-nano:blue:status"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; - status_red { + led_status_red: status_red { label = "miwifi-nano:red:status"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; - status_amber { + led_status_amber: status_amber { label = "miwifi-nano:amber:status"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; }; @@ -50,12 +50,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio", "refclk", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; @@ -79,7 +77,7 @@ &spi0 { status = "okay"; - m25p80@0 { + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; From ea5cf7c0dd98db62de1b368096f903177636b6e7 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Mon, 23 Dec 2019 00:36:11 +0900 Subject: [PATCH 083/480] ramips: fix MAC address setup for Xiaomi MiWiFi Nano MAC addresses are stored in factory partition at: 0x0004: WiFi 2.4GHz (label_mac +1) 0x0028: LAN, WAN (label_mac) Signed-off-by: Sungbo Eo --- target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts | 1 + target/linux/ramips/mt76x8/base-files/etc/board.d/02_network | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index 49c2a368d9..bd3fc967f1 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -14,6 +14,7 @@ led-failsafe = &led_status_red; led-running = &led_status_blue; led-upgrade = &led_status_amber; + label-mac-device = ðernet; }; chosen { diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index aeaf296984..df795e5a36 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -171,8 +171,7 @@ ramips_setup_macs() rakwireless,rak633|\ unielec,u7628-01-16m|\ wavlink,wl-wn575a3|\ - wiznet,wizfi630s|\ - xiaomi,miwifi-nano) + wiznet,wizfi630s) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x28)" 1) ;; skylab,skw92a|\ From 5f4244150f99d7bf72a96ec4d9c1055386e66b53 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 22 Dec 2019 21:30:02 +0100 Subject: [PATCH 084/480] fstools: update to latest git HEAD b4e25d5 libblkid-tiny: fix symbol collision with full libblkid Fixes: FS#2691, FS#2692 Signed-off-by: Jo-Philipp Wich --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index f2680ed2f2..5bd31d7c00 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=4411400675131aada73911c4afc80149485e2686479bc6479acff253eb25e9a7 -PKG_SOURCE_DATE:=2019-12-20 -PKG_SOURCE_VERSION:=111a43f8c64683e79859dcb3f4b7aa437e24502b +PKG_MIRROR_HASH:=8cb1187b129a91537ff8f5b2751226e206f073742bd5c3673a0025f713d08203 +PKG_SOURCE_DATE:=2019-12-22 +PKG_SOURCE_VERSION:=b4e25d54035c5092e8e9b46ab63500e95ac8c730 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From f34f9a414dd32311bda950776eb77e63c0c772cb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 22 Dec 2019 22:50:00 +0100 Subject: [PATCH 085/480] uhttpd: update to latest Git HEAD 5f9ae57 client: fix invalid data access through invalid content-length values Signed-off-by: Jo-Philipp Wich --- package/network/services/uhttpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 85b7be7607..d9cc367d47 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git -PKG_SOURCE_DATE:=2019-08-17 -PKG_SOURCE_VERSION:=6b03f9605323df23d12e3876feb466f53f8d50c4 -PKG_MIRROR_HASH:=4df96054a4fce659e6c849feae7850d542b37ad5caffc1485b7a63c7c2764cb1 +PKG_SOURCE_DATE:=2019-12-22 +PKG_SOURCE_VERSION:=5f9ae5738372aaa3a6be2f0a278933563d3f191a +PKG_MIRROR_HASH:=16977c2d7e68f6db3241f874df625af9bd3bafa06fe4499ecb3561c825321e5d PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC From 97af1fc979d0683649c6bea8a9245a6a9fa5413a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 22 Dec 2019 23:03:59 +0100 Subject: [PATCH 086/480] uhttpd: reset PKG_RELEASE Signed-off-by: Jo-Philipp Wich --- package/network/services/uhttpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index d9cc367d47..e1418d64c4 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=4 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git From 692390225d76de8f2daf582454e74942b82d090a Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Wed, 11 Dec 2019 19:11:42 +0100 Subject: [PATCH 087/480] lantiq: fix phys led led2l and led2h value is incorrectly set by led3l and led3h. Bug was introduced in commit: 863e79f8d5544a8a884375d7e867f350fddca9b9 Signed-off-by: Aleksander Jan Bajkowski Fixes: 863e79f8d554 ("lantiq: add support for kernel 4.9") --- .../0023-NET-PHY-add-led-support-for-intel-xway.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch b/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch index 60a6dbafdd..e5ba24c3e7 100644 --- a/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch +++ b/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch @@ -42,10 +42,10 @@ Signed-off-by: John Crispin + phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED1L, tmp); + + if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led2h", &tmp)) -+ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED3H, tmp); ++ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED2H, tmp); + + if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led2l", &tmp)) -+ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED3L, tmp); ++ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED2L, tmp); + + if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led3h", &tmp)) + phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED3H, tmp); From 77e27e0f5354e3155c9951a0d5e570e36d548f1c Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Sat, 23 Nov 2019 22:18:32 +0100 Subject: [PATCH 088/480] lantiq: enable 5ghz wifi on VR200/VR200v Enable mt76 driver on VR200/VR200v. Signed-off-by: Kevin Schmidt --- .../boot/dts/lantiq/vr9_tplink_vr200.dtsi | 21 ++++++++++++++++++- target/linux/lantiq/image/tp-link.mk | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi index 93178da7e2..77b4f0defb 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi @@ -112,6 +112,25 @@ }; }; +&pcie0 { + pcie@0 { + reg = <0 0 0 0 0>; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + + wifi@0,0 { + reg = <0 0 0 0 0>; + mediatek,mtd-eeprom = <&radio 0x0000>; + big-endian; + ieee80211-freq-limit = <5000000 6000000>; + mtd-mac-address = <&romfile 0xf100>; + mtd-mac-address-increment = <2>; + }; + }; +}; + &pci0 { status = "okay"; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; @@ -166,7 +185,7 @@ read-only; }; - partition@ff0000 { + radio: partition@ff0000 { reg = <0xff0000 0x10000>; label = "radio"; read-only; diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk index 56a7e5ca57..fa98f31f59 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -47,7 +47,7 @@ define Device/tplink_vr200 TPLINK_HWID := 0x63e64801 TPLINK_HWREV := 0x53 IMAGE_SIZE := 15808k - DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += VR200 endef TARGET_DEVICES += tplink_vr200 @@ -60,7 +60,7 @@ define Device/tplink_vr200v TPLINK_HWID := 0x73b70801 TPLINK_HWREV := 0x2f IMAGE_SIZE := 15808k - DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VR200v endef TARGET_DEVICES += tplink_vr200v From 65a561fd0919eafff2363ae8324db64be2a57f77 Mon Sep 17 00:00:00 2001 From: Yorkie Liu Date: Tue, 19 Nov 2019 13:41:10 +0800 Subject: [PATCH 089/480] toolchain/gcc: correct the check expr for newer clang This fixes gcc build error within clang 11.0, it tweaks the version string from LLVM to clang. Signed-off-by: Yorkie Liu --- toolchain/gcc/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 8ce8d84a5f..24c923abef 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -89,7 +89,7 @@ endif GCC_CONFIGURE:= \ SHELL="$(BASH)" \ - $(if $(shell gcc --version 2>&1 | grep LLVM), \ + $(if $(shell gcc --version 2>&1 | grep -E "Apple.(LLVM|clang)"), \ CFLAGS="-O2 -fbracket-depth=512 -pipe" \ CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \ ) \ From c102f702e7dc976c2ad2c04c0ce4462373e62365 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 19 Nov 2019 06:04:59 +0800 Subject: [PATCH 090/480] toolchain/gcc: Backport patch to fix unconditional MULTIARCH_DIRNAME This backports the patch for GCC PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIARCH_DIRNAME, even when multiarch is disabled). This currently affects apm821xx and may cause issues when cross-compiling packages, e.g. Python 3[1]. This includes patches for GCC 8 (with the changelog diff removed); this change is already included in GCC 9.2 and 7.5. [1]: https://github.com/openwrt/packages/issues/10552 Signed-off-by: Jeffery To [Removed patch for GCC 7.4.0, GCC 7.5.0 already contains this] Signed-off-by: Hauke Mehrtens --- .../patches/8.3.0/090-rs6000-PR-89587.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch diff --git a/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch b/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch new file mode 100644 index 0000000000..83bfbbe712 --- /dev/null +++ b/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch @@ -0,0 +1,30 @@ +From 045e60da05ec1d4997864883143a951f152cfc9f Mon Sep 17 00:00:00 2001 +From: jakub +Date: Tue, 30 Apr 2019 20:37:12 +0000 +Subject: [PATCH] Backported from mainline 2019-03-05 Jakub + Jelinek + + PR target/89587 + * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only + if_multiarch. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@270720 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/ChangeLog | 4 ++++ + gcc/config/rs6000/t-linux | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux +index acfde1f48aec..aeb7440c4920 100644 +--- a/gcc/config/rs6000/t-linux ++++ b/gcc/config/rs6000/t-linux +@@ -4,7 +4,7 @@ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) + ifneq (,$(findstring powerpc64,$(target))) + MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) + else +-MULTIARCH_DIRNAME := powerpc-linux-gnu ++MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) + endif + ifneq (,$(findstring powerpcle,$(target))) + MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) From 36baba65ec3b5bc8b31f563d96045efa9d97c563 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Mon, 16 Dec 2019 00:43:08 +0800 Subject: [PATCH 091/480] linux-firmware: update to 20191215 Update linux-firmware to 20191215 git log --pretty=oneline --abbrev-commit 20190815..20191215 eefb5f7 inside-secure: add new "mini" firmware for the EIP197 driver dd1a12e Merge branch 'RB3-adsp-cdsp-mss-v4' of https://github.com/andersson/linux-firmware c523dcd WHENCE: Add raspberry-pi4 SDIO file 99a15a4 Merge branch 'rpi4-fw' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux-firmware 2260cbd Merge branch 'master' of https://github.com/dikshitaagarwal/video_firmware_5.4 4c688be Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware e10ed21 qcom: update venus firmware files for v5.4 af4c4be cxgb4: Update firmware to revision 1.24.11.0 f93c7a1 brcm: Add BCM43455 NVRAM for Raspberry Pi 4 B 212e441 qcom: Add SDM845 Compute DSP firmware ec84cf9 qcom: Add SDM845 Audio DSP firmware 62d0a1a qcom: Add SDM845 modem firmware e8a0f4c rtl_nic: add firmware rtl8168fp-3 9581f15 Merge branch 'nxp_mc' of https://github.com/NXP/linux-firmware 978c04e linux-firmware: Update NXP Management Complex firmware to version 10.18.0 c62c3c2 linux-firmware: Update firmware file for Intel Bluetooth AX201 6272383 linux-firmware: Update firmware file for Intel Bluetooth AX200 84a7ca5 linux-firmware: Update firmware file for Intel Bluetooth 9560 96c3994 linux-firmware: Update firmware file for Intel Bluetooth 9260 7319341 amdgpu: update navi14 vcn firmware b363d9d amdgpu: update navi10 vcn firmware f1100dd Merge branch 'ehl_tgl_guc_huc' of git://anongit.freedesktop.org/drm/drm-firmware 4debf21 i915: Add HuC firmware v7.0.3 for TGL 1eb2ac4 i915: Add GuC firmware v35.2.0 for TGL 4b0a210 i915: Add HuC firmware v9.0.0 for EHL 610fe75 i915: Add GuC firmware v33.0.4 for EHL 11bdc57 rtw88: RTL8723D: add firmware file v48 9e194c7 qed: Add firmware 8.40.33.0 4065643 amdgpu: add new navi14 wks gfx firmware for 19.30 d4f88ea amdgpu: update navi14 firmware for 19.30 ea755b6 amdgpu: update raven firmware for 19.30 340e06e linux-firmware: Add firmware file for Intel Bluetooth AX201 ad7a8b2 Mellanox: Add new mlxsw_spectrum2 firmware 29.2000.2308 e756bf3 Mellanox: Add new mlxsw_spectrum firmware 13.2000.2308 b27d123 rtl_nic: add firmware files for RTL8153 180e2b4 rtl_bt: Update configuration file for BT part of RTL8822CU 0acd93e bnx2x: Add FW 7.13.15.0. 2b016af linux-firmware: Update AMD cpu microcode 4c3e853 linux-firmware: Update firmware file for Intel Bluetooth AX200 7a79d22 linux-firmware: Update firmware file for Intel Bluetooth AX201 fdab23a linux-firmware: Update firmware file for Intel Bluetooth 9560 b68efd7 linux-firmware: Update firmware file for Intel Bluetooth 9260 aa95e90 amdgpu: add initial navi14 firmware form 19.30 c1ce20e rtlwifi: rtl8821ae: Add firmware for the RTL8812AE variant. 7d187ac ice: Fix up WHENCE entry and symlink 4c55b97 Merge branch 'dev-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/firmware 7c4db73 nvidia: Update Tegra210 XUSB firmware to v50.24 c054c53 nvidia: Add XUSB firmware for Tegra194 9cfefbd Remove duplicate symlinks 2de7abd copy-firmware: Create symlinks from WHENCE file 2116bcd Make symlinks consistent c0590d8 amdgpu: update vega20 ucode for 19.30 43cc648 amdgpu: update vega12 ucode for 19.30 ffa0ed7 amdgpu: update vega10 ucode for 19.30 83e1b41 amdgpu: update picasso ucode for 19.30 7008617 amdgpu: update raven2 ucode for 19.30 9200baa amdgpu: update raven ucode for 19.30 f25a39c amdgpu: add new raven rlc firmware 9ae61e7 ice: Add package file for Intel E800 series driver 417a9c6 amdgpu: add initial navi10 firmware 702cc63 Merge branch 'cml_tgl-icl-dmc_huc_updates' of git://anongit.freedesktop.org/drm/drm-firmware 3182b4b Merge branch 'gpu-845' of https://github.com/ndechesne/linux-firmware 3ea84e5 drm/i915/firmware: Add v9.0.0 of HuC for Icelake 60ddd0e drm/i915/firmware: Add v4.0.0 of HuC for Cometlake c47d8f8 drm/i915/firmware: Add v4.0.0 of HuC for Geminilake 2cdb78c drm/i915/firmware: Add v2.0.0 of HuC for Broxton 38965af drm/i915/firmware: Add v4.0.0 of HuC for Kabylake 8d127af drm/i915/firmware: Add v2.0.0 of HuC for Skylake e7b6fa7 drm/i915/firmware: Add v33 of GuC for CML e4ea25f drm/i915/firmware: Add v2.04 of DMC for TGL 51deca6 drm/i915/firmware: Add v1.09 of DMC for ICL 88ea23e qcom: add firmware files for Adreno a630 6c6918a linux-firmware: Update firmware file for Intel Bluetooth AX201 6ddb9d9 Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware d45c950 nvidia: Add XUSB firmware for Tegra186 65c6595 Add symlinks for Tegra VIC firmware binaries 0b22bfc rtl_bt: Update RTL8723D BT FW to 0x828A_96F1 f667c00 rtl_nic: add firmware rtl8125a-3 fe1ae0d linux-firmware: Add firmware file for Intel Bluetooth AX201 2f885ba Chelsio driver loads firmware configuration file to allow firmware to distribute resources before chip bring up. Chelsio NIC driver, cxgb4 searches for firmware config file at /lib/firmware/cxgb4/ directory. 7307a29 brcm: Add 43455 based AP6255 NVRAM for the Minix Neo Z83-4 Mini PC 65d02cd brcm: Add 43340 based AP6234 NVRAM for the PoV TAB-P1006W-232 tablet f38fb4f Merge tag 'iwlwifi-fw-2019-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware 40e4162 iwlwifi: update FWs to core45-152 release c0fb3d9 check_whence: Add copy-firmware.sh to the list of ignored files aa703aa rtl_bt: Update RTL8822C BT FW to V0x098A_94A4 665001a linux-firmware: Update firmware file for Intel Bluetooth AX200 c0ca980 linux-firmware: Update firmware file for Intel Bluetooth AX201 b6427bf linux-firmware: Update firmware file for Intel Bluetooth 9560 fe48882 linux-firmware: Update firmware file for Intel Bluetooth 9260 ebd40c6 Mellanox: Add new mlxsw_spectrum firmware 13.2000.1886 Signed-off-by: DENG Qingfang [Added missing symbolic links to Makefile] Signed-off-by: Hauke Mehrtens --- package/firmware/linux-firmware/Makefile | 4 ++-- package/firmware/linux-firmware/marvell.mk | 9 +++++++-- package/firmware/linux-firmware/ti.mk | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index ac4c3d4a63..085cce422d 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20190815 +PKG_VERSION:=20191215 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=15615d87ac9d93aa5c20939a6c65cca7f3bc656b5e8ffd998b8acb932c854327 +PKG_HASH:=c2068ff4a797c0f2c3edbb9488f82a48bca8a995855ea21310a8346195c0ae56 PKG_MAINTAINER:=Felix Fietkau diff --git a/package/firmware/linux-firmware/marvell.mk b/package/firmware/linux-firmware/marvell.mk index 1b99d7ae02..6c3f171216 100644 --- a/package/firmware/linux-firmware/marvell.mk +++ b/package/firmware/linux-firmware/marvell.mk @@ -47,9 +47,14 @@ define Package/libertas-sdio-firmware/install $(PKG_BUILD_DIR)/libertas/sd8385.bin \ $(PKG_BUILD_DIR)/libertas/sd8686_v9_helper.bin \ $(PKG_BUILD_DIR)/libertas/sd8686_v9.bin \ - $(PKG_BUILD_DIR)/libertas/sd8688_helper.bin \ - $(PKG_BUILD_DIR)/libertas/sd8688.bin \ $(1)/lib/firmware/libertas + $(INSTALL_DIR) $(1)/lib/firmware/mrvl + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/mrvl/sd8688_helper.bin \ + $(PKG_BUILD_DIR)/mrvl/sd8688.bin \ + $(1)/lib/firmware/mrvl + ln -s ../mrvl/sd8688_helper.bin $(1)/lib/firmware/libertas/sd8688_helper.bin + ln -s ../mrvl/sd8688.bin $(1)/lib/firmware/libertas/sd8688.bin endef $(eval $(call BuildPackage,libertas-sdio-firmware)) diff --git a/package/firmware/linux-firmware/ti.mk b/package/firmware/linux-firmware/ti.mk index ba1baa9793..2b9710706b 100644 --- a/package/firmware/linux-firmware/ti.mk +++ b/package/firmware/linux-firmware/ti.mk @@ -5,12 +5,13 @@ define Package/wl12xx-firmware/install $(PKG_BUILD_DIR)/ti-connectivity/wl127x-fw-5-mr.bin \ $(PKG_BUILD_DIR)/ti-connectivity/wl127x-fw-5-plt.bin \ $(PKG_BUILD_DIR)/ti-connectivity/wl127x-fw-5-sr.bin \ - $(PKG_BUILD_DIR)/ti-connectivity/wl1271-nvs.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl127x-nvs.bin \ $(PKG_BUILD_DIR)/ti-connectivity/wl128x-fw-5-mr.bin \ $(PKG_BUILD_DIR)/ti-connectivity/wl128x-fw-5-plt.bin \ $(PKG_BUILD_DIR)/ti-connectivity/wl128x-fw-5-sr.bin \ $(PKG_BUILD_DIR)/ti-connectivity/wl128x-nvs.bin \ $(1)/lib/firmware/ti-connectivity + ln -s wl127x-nvs.bin $(1)/lib/firmware/ti-connectivity/wl1271-nvs.bin endef $(eval $(call BuildPackage,wl12xx-firmware)) From 65982642668e859540b21c2bd3bf907493df830a Mon Sep 17 00:00:00 2001 From: Stefan Lippers-Hollmann Date: Thu, 19 Dec 2019 09:14:54 +0100 Subject: [PATCH 092/480] ath10k-firmware: update Candela Tech firmware images The release notes since last time for wave-1: * No changes to wave-1, but I make a version .014 copy anyway to keep the makefile in sync. The release notes since last time for wave-2: * December 16, 2019: Wave-2 has a fix to make setting txpower work better. Before setting the power was ignored at least some of the time (it also appeared to work mostly, so I guess it was being correctly set in other ways). Signed-off-by: Stefan Lippers-Hollmann --- package/firmware/ath10k-firmware/Makefile | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index a57fcb59ba..1ae813023c 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -64,14 +64,14 @@ define Download/ct-firmware-htt URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT) endef -QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.013 +QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.014 define Download/ath10k-firmware-qca988x-ct $(call Download/ct-firmware,QCA988X,) HASH:=19db86003509dedb8ace339c183813ca637d65af24d00666411d1590efe33e13 endef $(eval $(call Download,ath10k-firmware-qca988x-ct)) -QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.013 +QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.014 define Download/ath10k-firmware-qca988x-ct-htt $(call Download/ct-firmware-htt,QCA988X,) HASH:=454e67dab545e720369a07be2fee16de008c76db4ab3119e7760bf9f7504c066 @@ -79,14 +79,14 @@ endef $(eval $(call Download,ath10k-firmware-qca988x-ct-htt)) -QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.013 +QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.014 define Download/ath10k-firmware-qca9887-ct $(call Download/ct-firmware,QCA9887,ath10k-9887) HASH:=b3c738328427e124701a5735d65cde0f60e4172ae5bc23b00e5b16df7995dbd4 endef $(eval $(call Download,ath10k-firmware-qca9887-ct)) -QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.013 +QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.014 define Download/ath10k-firmware-qca9887-ct-htt $(call Download/ct-firmware-htt,QCA9887,ath10k-9887) HASH:=4432ccee23133bbaa4a5552e50a1e7e889b257362603e05530e751b67c29b7b5 @@ -94,62 +94,62 @@ endef $(eval $(call Download,ath10k-firmware-qca9887-ct-htt)) -QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013 +QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014 define Download/ath10k-firmware-qca99x0-ct $(call Download/ct-firmware,QCA99X0,ath10k-10-4b) - HASH:=6fa74a3fc87cba97dbc4a7213b760f8d997cd9c5f11900d47d387b23764cf20a + HASH:=9a908f743604a468b651a5f73c49e6b0ba11a05c677b9726fbf041b849d88b25 endef $(eval $(call Download,ath10k-firmware-qca99x0-ct)) -QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.013 +QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014 define Download/ath10k-firmware-qca99x0-ct-htt $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b) - HASH:=68e92820c51270eba4f68b24654c4a9408902b2600762b70204f4cb5419bb714 + HASH:=800dd0816702aaca75f3eb5436c2ea724a6c24833838cd54399b9286b4d4fbe8 endef $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt)) -QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013 +QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014 define Download/ath10k-firmware-qca9984-ct $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b) - HASH:=08aeb883bd2d9258e8f1907cca8a0d2eda1c559a66e228dadffd6798f6877c7d + HASH:=a8b12dba478e8c9d4a215f82324382c7554a900e83c31775f8511af84e59fef7 endef $(eval $(call Download,ath10k-firmware-qca9984-ct)) -QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.013 +QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014 define Download/ath10k-firmware-qca9984-ct-htt $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b) - HASH:=38ed59a2b3c66c10926706a21ae2d3aeaf83e589f19345a8f48d6520522e4fde + HASH:=d185651b5d3d1f0082720bc6c2bbe43b2a00cdb6333403fac9336a720b1d93ae endef $(eval $(call Download,ath10k-firmware-qca9984-ct-htt)) -QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013 +QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014 define Download/ath10k-firmware-qca4019-ct $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b) - HASH:=feca75fe89af9a3e998047f85ff3428676f4d574b770d51773bb419d0dd98e5a + HASH:=4c2e48835219f420b18dc58e31d1387dae0da70d8170c3fc5e7bce39c06cf355 endef $(eval $(call Download,ath10k-firmware-qca4019-ct)) -QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.013 +QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014 define Download/ath10k-firmware-qca4019-ct-htt $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b) - HASH:=6a4977689343f43edd934823512f031fd1a026e872004343b9952077f9607cb0 + HASH:=743da4d537d094a7839bd8e1f792e4cb8b517101f66777c84fd84585f0b85e64 endef $(eval $(call Download,ath10k-firmware-qca4019-ct-htt)) -QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.013 +QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.014 define Download/ath10k-firmware-qca9888-ct $(call Download/ct-firmware,QCA9888,ath10k-9888-10-4b) - HASH:=d6a59c17bfbec1abc8498762d9f00b2449cab352feb8bef8b621771168376dbf + HASH:=5809c8a6b3bd81cbc829b5e90af3c0a3300488fe194524a90e260448158016b6 endef $(eval $(call Download,ath10k-firmware-qca9888-ct)) -QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.013 +QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.014 define Download/ath10k-firmware-qca9888-ct-htt $(call Download/ct-firmware-htt,QCA9888,ath10k-9888-10-4b) - HASH:=fe242c0d56494975d7a1aeb6969d90cc21cb133fba99040d4da7a25fdb90d92c + HASH:=a284943c203ff66ec2e865f20ae2d2aa049b450801d7205b53c9163862228f15 endef $(eval $(call Download,ath10k-firmware-qca9888-ct-htt)) From dc34c695c4faa46efc6e2367a2ba06a47caa4840 Mon Sep 17 00:00:00 2001 From: Jiri Kastner Date: Thu, 28 Nov 2019 16:29:31 +0100 Subject: [PATCH 093/480] scripts/dowload.pl: add archive.apache.org to apache mirror list apache mirrors holds only latest releases, to download older releases, one must use archive.apache.org to get them. Signed-off-by: Jiri Kastner --- scripts/download.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/download.pl b/scripts/download.pl index 7d29d6bebd..dd49255367 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -197,6 +197,7 @@ foreach my $mirror (@ARGV) { push @mirrors, "https://mirror.netcologne.de/apache.org/$1"; push @mirrors, "https://mirror.aarnet.edu.au/pub/apache/$1"; push @mirrors, "https://mirror.csclub.uwaterloo.ca/apache/$1"; + push @mirrors, "https://archive.apache.org/dist/$1"; push @mirrors, "http://mirror.cogentco.com/pub/apache/$1"; push @mirrors, "http://mirror.navercorp.com/apache/$1"; push @mirrors, "http://ftp.jaist.ac.jp/pub/apache/$1"; From 9e2e48ff31cea669cfc9c1476f49b815ea9ac1b1 Mon Sep 17 00:00:00 2001 From: Brett Mastbergen Date: Wed, 2 Oct 2019 10:28:16 -0400 Subject: [PATCH 094/480] tools: qemu: Add patches to support adapter_type and monolithicFlat Its way more trouble to update this to a newer version of qemu than it is to backport the two additional features we need. Signed-off-by: Brett Mastbergen --- .../0001-vmdk-fix-endianness-bugs.patch | 75 +++ .../0002-VMDK-introduce-VmdkExtent.patch | 557 ++++++++++++++++ ...n-offset-to-cluster-in-get_whole_clu.patch | 46 ++ ...VMDK-probe-for-monolithicFlat-images.patch | 74 +++ ...separate-vmdk_open-by-format-version.patch | 241 +++++++ ...-add-field-BDRVVmdkState.desc_offset.patch | 102 +++ .../0007-VMDK-flush-multiple-extents.patch | 35 ++ ...e-static-cid_update-flag-to-bs-field.patch | 46 ++ ...hange-get_cluster_offset-return-type.patch | 198 ++++++ ...-read-write-for-monolithicFlat-image.patch | 257 ++++++++ ...011-VMDK-create-different-subformats.patch | 595 ++++++++++++++++++ ...cting-SCSI-adapter-in-image-creation.patch | 114 ++++ 12 files changed, 2340 insertions(+) create mode 100644 tools/qemu/patches/0001-vmdk-fix-endianness-bugs.patch create mode 100644 tools/qemu/patches/0002-VMDK-introduce-VmdkExtent.patch create mode 100644 tools/qemu/patches/0003-VMDK-bugfix-align-offset-to-cluster-in-get_whole_clu.patch create mode 100644 tools/qemu/patches/0004-VMDK-probe-for-monolithicFlat-images.patch create mode 100644 tools/qemu/patches/0005-VMDK-separate-vmdk_open-by-format-version.patch create mode 100644 tools/qemu/patches/0006-VMDK-add-field-BDRVVmdkState.desc_offset.patch create mode 100644 tools/qemu/patches/0007-VMDK-flush-multiple-extents.patch create mode 100644 tools/qemu/patches/0008-VMDK-move-static-cid_update-flag-to-bs-field.patch create mode 100644 tools/qemu/patches/0009-VMDK-change-get_cluster_offset-return-type.patch create mode 100644 tools/qemu/patches/0010-VMDK-open-read-write-for-monolithicFlat-image.patch create mode 100644 tools/qemu/patches/0011-VMDK-create-different-subformats.patch create mode 100644 tools/qemu/patches/0012-vmdk-Allow-selecting-SCSI-adapter-in-image-creation.patch diff --git a/tools/qemu/patches/0001-vmdk-fix-endianness-bugs.patch b/tools/qemu/patches/0001-vmdk-fix-endianness-bugs.patch new file mode 100644 index 0000000000..7e1abb49bf --- /dev/null +++ b/tools/qemu/patches/0001-vmdk-fix-endianness-bugs.patch @@ -0,0 +1,75 @@ +From 6afca0fc5430db0300fe53f2b9cd7d071a3925bb Mon Sep 17 00:00:00 2001 +From: Alexander Graf +Date: Wed, 25 May 2011 00:46:55 +0200 +Subject: [PATCH 01/12] vmdk: fix endianness bugs + +The vmdk code is sloppy when handling the header descriptor during +creation of an image. Fix all header accesses in the create path to +either store native endianness or convert it when appropriate. + +Reported-by: Yury Tsarev +Signed-off-by: Alexander Graf +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -716,11 +716,11 @@ static int vmdk_create(const char *filen + return -errno; + magic = cpu_to_be32(VMDK4_MAGIC); + memset(&header, 0, sizeof(header)); +- header.version = cpu_to_le32(1); +- header.flags = cpu_to_le32(3); /* ?? */ +- header.capacity = cpu_to_le64(total_size); +- header.granularity = cpu_to_le64(128); +- header.num_gtes_per_gte = cpu_to_le32(512); ++ header.version = 1; ++ header.flags = 3; /* ?? */ ++ header.capacity = total_size; ++ header.granularity = 128; ++ header.num_gtes_per_gte = 512; + + grains = (total_size + header.granularity - 1) / header.granularity; + gt_size = ((header.num_gtes_per_gte * sizeof(uint32_t)) + 511) >> 9; +@@ -736,6 +736,12 @@ static int vmdk_create(const char *filen + header.granularity - 1) / header.granularity) * + header.granularity; + ++ /* swap endianness for all header fields */ ++ header.version = cpu_to_le32(header.version); ++ header.flags = cpu_to_le32(header.flags); ++ header.capacity = cpu_to_le64(header.capacity); ++ header.granularity = cpu_to_le64(header.granularity); ++ header.num_gtes_per_gte = cpu_to_le32(header.num_gtes_per_gte); + header.desc_offset = cpu_to_le64(header.desc_offset); + header.desc_size = cpu_to_le64(header.desc_size); + header.rgd_offset = cpu_to_le64(header.rgd_offset); +@@ -759,7 +765,7 @@ static int vmdk_create(const char *filen + goto exit; + } + +- ret = ftruncate(fd, header.grain_offset << 9); ++ ret = ftruncate(fd, le64_to_cpu(header.grain_offset) << 9); + if (ret < 0) { + ret = -errno; + goto exit; +@@ -767,7 +773,7 @@ static int vmdk_create(const char *filen + + /* write grain directory */ + lseek(fd, le64_to_cpu(header.rgd_offset) << 9, SEEK_SET); +- for (i = 0, tmp = header.rgd_offset + gd_size; ++ for (i = 0, tmp = le64_to_cpu(header.rgd_offset) + gd_size; + i < gt_count; i++, tmp += gt_size) { + ret = qemu_write_full(fd, &tmp, sizeof(tmp)); + if (ret != sizeof(tmp)) { +@@ -778,7 +784,7 @@ static int vmdk_create(const char *filen + + /* write backup grain directory */ + lseek(fd, le64_to_cpu(header.gd_offset) << 9, SEEK_SET); +- for (i = 0, tmp = header.gd_offset + gd_size; ++ for (i = 0, tmp = le64_to_cpu(header.gd_offset) + gd_size; + i < gt_count; i++, tmp += gt_size) { + ret = qemu_write_full(fd, &tmp, sizeof(tmp)); + if (ret != sizeof(tmp)) { diff --git a/tools/qemu/patches/0002-VMDK-introduce-VmdkExtent.patch b/tools/qemu/patches/0002-VMDK-introduce-VmdkExtent.patch new file mode 100644 index 0000000000..054b143245 --- /dev/null +++ b/tools/qemu/patches/0002-VMDK-introduce-VmdkExtent.patch @@ -0,0 +1,557 @@ +From fcd9c52d160376184cbd25e04586aa6eef6abd61 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:28 +0800 +Subject: [PATCH 02/12] VMDK: introduce VmdkExtent + +Introduced VmdkExtent array into BDRVVmdkState, enable holding multiple +image extents for multiple file image support. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 348 +++++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 246 insertions(+), 102 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -60,7 +60,11 @@ typedef struct { + + #define L2_CACHE_SIZE 16 + +-typedef struct BDRVVmdkState { ++typedef struct VmdkExtent { ++ BlockDriverState *file; ++ bool flat; ++ int64_t sectors; ++ int64_t end_sector; + int64_t l1_table_offset; + int64_t l1_backup_table_offset; + uint32_t *l1_table; +@@ -74,7 +78,13 @@ typedef struct BDRVVmdkState { + uint32_t l2_cache_counts[L2_CACHE_SIZE]; + + unsigned int cluster_sectors; ++} VmdkExtent; ++ ++typedef struct BDRVVmdkState { + uint32_t parent_cid; ++ int num_extents; ++ /* Extent array with num_extents entries, ascend ordered by address */ ++ VmdkExtent *extents; + } BDRVVmdkState; + + typedef struct VmdkMetaData { +@@ -105,6 +115,19 @@ static int vmdk_probe(const uint8_t *buf + #define DESC_SIZE 20*SECTOR_SIZE // 20 sectors of 512 bytes each + #define HEADER_SIZE 512 // first sector of 512 bytes + ++static void vmdk_free_extents(BlockDriverState *bs) ++{ ++ int i; ++ BDRVVmdkState *s = bs->opaque; ++ ++ for (i = 0; i < s->num_extents; i++) { ++ qemu_free(s->extents[i].l1_table); ++ qemu_free(s->extents[i].l2_cache); ++ qemu_free(s->extents[i].l1_backup_table); ++ } ++ qemu_free(s->extents); ++} ++ + static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent) + { + char desc[DESC_SIZE]; +@@ -358,11 +381,50 @@ static int vmdk_parent_open(BlockDriverS + return 0; + } + ++/* Create and append extent to the extent array. Return the added VmdkExtent ++ * address. return NULL if allocation failed. */ ++static VmdkExtent *vmdk_add_extent(BlockDriverState *bs, ++ BlockDriverState *file, bool flat, int64_t sectors, ++ int64_t l1_offset, int64_t l1_backup_offset, ++ uint32_t l1_size, ++ int l2_size, unsigned int cluster_sectors) ++{ ++ VmdkExtent *extent; ++ BDRVVmdkState *s = bs->opaque; ++ ++ s->extents = qemu_realloc(s->extents, ++ (s->num_extents + 1) * sizeof(VmdkExtent)); ++ extent = &s->extents[s->num_extents]; ++ s->num_extents++; ++ ++ memset(extent, 0, sizeof(VmdkExtent)); ++ extent->file = file; ++ extent->flat = flat; ++ extent->sectors = sectors; ++ extent->l1_table_offset = l1_offset; ++ extent->l1_backup_table_offset = l1_backup_offset; ++ extent->l1_size = l1_size; ++ extent->l1_entry_sectors = l2_size * cluster_sectors; ++ extent->l2_size = l2_size; ++ extent->cluster_sectors = cluster_sectors; ++ ++ if (s->num_extents > 1) { ++ extent->end_sector = (*(extent - 1)).end_sector + extent->sectors; ++ } else { ++ extent->end_sector = extent->sectors; ++ } ++ bs->total_sectors = extent->end_sector; ++ return extent; ++} ++ ++ + static int vmdk_open(BlockDriverState *bs, int flags) + { + BDRVVmdkState *s = bs->opaque; + uint32_t magic; +- int l1_size, i; ++ int i; ++ uint32_t l1_size, l1_entry_sectors; ++ VmdkExtent *extent = NULL; + + if (bdrv_pread(bs->file, 0, &magic, sizeof(magic)) != sizeof(magic)) + goto fail; +@@ -370,32 +432,34 @@ static int vmdk_open(BlockDriverState *b + magic = be32_to_cpu(magic); + if (magic == VMDK3_MAGIC) { + VMDK3Header header; +- +- if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) != sizeof(header)) ++ if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) ++ != sizeof(header)) { + goto fail; +- s->cluster_sectors = le32_to_cpu(header.granularity); +- s->l2_size = 1 << 9; +- s->l1_size = 1 << 6; +- bs->total_sectors = le32_to_cpu(header.disk_sectors); +- s->l1_table_offset = le32_to_cpu(header.l1dir_offset) << 9; +- s->l1_backup_table_offset = 0; +- s->l1_entry_sectors = s->l2_size * s->cluster_sectors; ++ } ++ extent = vmdk_add_extent(bs, bs->file, false, ++ le32_to_cpu(header.disk_sectors), ++ le32_to_cpu(header.l1dir_offset) << 9, 0, ++ 1 << 6, 1 << 9, le32_to_cpu(header.granularity)); + } else if (magic == VMDK4_MAGIC) { + VMDK4Header header; +- +- if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) != sizeof(header)) ++ if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) ++ != sizeof(header)) { + goto fail; +- bs->total_sectors = le64_to_cpu(header.capacity); +- s->cluster_sectors = le64_to_cpu(header.granularity); +- s->l2_size = le32_to_cpu(header.num_gtes_per_gte); +- s->l1_entry_sectors = s->l2_size * s->cluster_sectors; +- if (s->l1_entry_sectors <= 0) ++ } ++ l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) ++ * le64_to_cpu(header.granularity); ++ l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) ++ / l1_entry_sectors; ++ extent = vmdk_add_extent(bs, bs->file, false, ++ le64_to_cpu(header.capacity), ++ le64_to_cpu(header.gd_offset) << 9, ++ le64_to_cpu(header.rgd_offset) << 9, ++ l1_size, ++ le32_to_cpu(header.num_gtes_per_gte), ++ le64_to_cpu(header.granularity)); ++ if (extent->l1_entry_sectors <= 0) { + goto fail; +- s->l1_size = (bs->total_sectors + s->l1_entry_sectors - 1) +- / s->l1_entry_sectors; +- s->l1_table_offset = le64_to_cpu(header.rgd_offset) << 9; +- s->l1_backup_table_offset = le64_to_cpu(header.gd_offset) << 9; +- ++ } + // try to open parent images, if exist + if (vmdk_parent_open(bs) != 0) + goto fail; +@@ -406,40 +470,49 @@ static int vmdk_open(BlockDriverState *b + } + + /* read the L1 table */ +- l1_size = s->l1_size * sizeof(uint32_t); +- s->l1_table = qemu_malloc(l1_size); +- if (bdrv_pread(bs->file, s->l1_table_offset, s->l1_table, l1_size) != l1_size) +- goto fail; +- for(i = 0; i < s->l1_size; i++) { +- le32_to_cpus(&s->l1_table[i]); +- } +- +- if (s->l1_backup_table_offset) { +- s->l1_backup_table = qemu_malloc(l1_size); +- if (bdrv_pread(bs->file, s->l1_backup_table_offset, s->l1_backup_table, l1_size) != l1_size) ++ l1_size = extent->l1_size * sizeof(uint32_t); ++ extent->l1_table = qemu_malloc(l1_size); ++ if (bdrv_pread(bs->file, ++ extent->l1_table_offset, ++ extent->l1_table, ++ l1_size) ++ != l1_size) { ++ goto fail; ++ } ++ for (i = 0; i < extent->l1_size; i++) { ++ le32_to_cpus(&extent->l1_table[i]); ++ } ++ ++ if (extent->l1_backup_table_offset) { ++ extent->l1_backup_table = qemu_malloc(l1_size); ++ if (bdrv_pread(bs->file, ++ extent->l1_backup_table_offset, ++ extent->l1_backup_table, ++ l1_size) ++ != l1_size) { + goto fail; +- for(i = 0; i < s->l1_size; i++) { +- le32_to_cpus(&s->l1_backup_table[i]); ++ } ++ for (i = 0; i < extent->l1_size; i++) { ++ le32_to_cpus(&extent->l1_backup_table[i]); + } + } + +- s->l2_cache = qemu_malloc(s->l2_size * L2_CACHE_SIZE * sizeof(uint32_t)); ++ extent->l2_cache = ++ qemu_malloc(extent->l2_size * L2_CACHE_SIZE * sizeof(uint32_t)); + return 0; + fail: +- qemu_free(s->l1_backup_table); +- qemu_free(s->l1_table); +- qemu_free(s->l2_cache); ++ vmdk_free_extents(bs); + return -1; + } + +-static uint64_t get_cluster_offset(BlockDriverState *bs, VmdkMetaData *m_data, +- uint64_t offset, int allocate); +- +-static int get_whole_cluster(BlockDriverState *bs, uint64_t cluster_offset, +- uint64_t offset, int allocate) ++static int get_whole_cluster(BlockDriverState *bs, ++ VmdkExtent *extent, ++ uint64_t cluster_offset, ++ uint64_t offset, ++ bool allocate) + { +- BDRVVmdkState *s = bs->opaque; +- uint8_t whole_grain[s->cluster_sectors*512]; // 128 sectors * 512 bytes each = grain size 64KB ++ /* 128 sectors * 512 bytes each = grain size 64KB */ ++ uint8_t whole_grain[extent->cluster_sectors * 512]; + + // we will be here if it's first write on non-exist grain(cluster). + // try to read from parent image, if exist +@@ -450,14 +523,14 @@ static int get_whole_cluster(BlockDriver + return -1; + + ret = bdrv_read(bs->backing_hd, offset >> 9, whole_grain, +- s->cluster_sectors); ++ extent->cluster_sectors); + if (ret < 0) { + return -1; + } + + //Write grain only into the active image +- ret = bdrv_write(bs->file, cluster_offset, whole_grain, +- s->cluster_sectors); ++ ret = bdrv_write(extent->file, cluster_offset, whole_grain, ++ extent->cluster_sectors); + if (ret < 0) { + return -1; + } +@@ -465,29 +538,39 @@ static int get_whole_cluster(BlockDriver + return 0; + } + +-static int vmdk_L2update(BlockDriverState *bs, VmdkMetaData *m_data) ++static int vmdk_L2update(VmdkExtent *extent, VmdkMetaData *m_data) + { +- BDRVVmdkState *s = bs->opaque; +- + /* update L2 table */ +- if (bdrv_pwrite_sync(bs->file, ((int64_t)m_data->l2_offset * 512) + (m_data->l2_index * sizeof(m_data->offset)), +- &(m_data->offset), sizeof(m_data->offset)) < 0) ++ if (bdrv_pwrite_sync( ++ extent->file, ++ ((int64_t)m_data->l2_offset * 512) ++ + (m_data->l2_index * sizeof(m_data->offset)), ++ &(m_data->offset), ++ sizeof(m_data->offset) ++ ) < 0) { + return -1; ++ } + /* update backup L2 table */ +- if (s->l1_backup_table_offset != 0) { +- m_data->l2_offset = s->l1_backup_table[m_data->l1_index]; +- if (bdrv_pwrite_sync(bs->file, ((int64_t)m_data->l2_offset * 512) + (m_data->l2_index * sizeof(m_data->offset)), +- &(m_data->offset), sizeof(m_data->offset)) < 0) ++ if (extent->l1_backup_table_offset != 0) { ++ m_data->l2_offset = extent->l1_backup_table[m_data->l1_index]; ++ if (bdrv_pwrite_sync( ++ extent->file, ++ ((int64_t)m_data->l2_offset * 512) ++ + (m_data->l2_index * sizeof(m_data->offset)), ++ &(m_data->offset), sizeof(m_data->offset) ++ ) < 0) { + return -1; ++ } + } + + return 0; + } + +-static uint64_t get_cluster_offset(BlockDriverState *bs, VmdkMetaData *m_data, +- uint64_t offset, int allocate) ++static uint64_t get_cluster_offset(BlockDriverState *bs, ++ VmdkExtent *extent, ++ VmdkMetaData *m_data, ++ uint64_t offset, int allocate) + { +- BDRVVmdkState *s = bs->opaque; + unsigned int l1_index, l2_offset, l2_index; + int min_index, i, j; + uint32_t min_count, *l2_table, tmp = 0; +@@ -496,21 +579,23 @@ static uint64_t get_cluster_offset(Block + if (m_data) + m_data->valid = 0; + +- l1_index = (offset >> 9) / s->l1_entry_sectors; +- if (l1_index >= s->l1_size) ++ l1_index = (offset >> 9) / extent->l1_entry_sectors; ++ if (l1_index >= extent->l1_size) { + return 0; +- l2_offset = s->l1_table[l1_index]; +- if (!l2_offset) ++ } ++ l2_offset = extent->l1_table[l1_index]; ++ if (!l2_offset) { + return 0; ++ } + for(i = 0; i < L2_CACHE_SIZE; i++) { +- if (l2_offset == s->l2_cache_offsets[i]) { ++ if (l2_offset == extent->l2_cache_offsets[i]) { + /* increment the hit count */ +- if (++s->l2_cache_counts[i] == 0xffffffff) { ++ if (++extent->l2_cache_counts[i] == 0xffffffff) { + for(j = 0; j < L2_CACHE_SIZE; j++) { +- s->l2_cache_counts[j] >>= 1; ++ extent->l2_cache_counts[j] >>= 1; + } + } +- l2_table = s->l2_cache + (i * s->l2_size); ++ l2_table = extent->l2_cache + (i * extent->l2_size); + goto found; + } + } +@@ -518,20 +603,25 @@ static uint64_t get_cluster_offset(Block + min_index = 0; + min_count = 0xffffffff; + for(i = 0; i < L2_CACHE_SIZE; i++) { +- if (s->l2_cache_counts[i] < min_count) { +- min_count = s->l2_cache_counts[i]; ++ if (extent->l2_cache_counts[i] < min_count) { ++ min_count = extent->l2_cache_counts[i]; + min_index = i; + } + } +- l2_table = s->l2_cache + (min_index * s->l2_size); +- if (bdrv_pread(bs->file, (int64_t)l2_offset * 512, l2_table, s->l2_size * sizeof(uint32_t)) != +- s->l2_size * sizeof(uint32_t)) ++ l2_table = extent->l2_cache + (min_index * extent->l2_size); ++ if (bdrv_pread( ++ extent->file, ++ (int64_t)l2_offset * 512, ++ l2_table, ++ extent->l2_size * sizeof(uint32_t) ++ ) != extent->l2_size * sizeof(uint32_t)) { + return 0; ++ } + +- s->l2_cache_offsets[min_index] = l2_offset; +- s->l2_cache_counts[min_index] = 1; ++ extent->l2_cache_offsets[min_index] = l2_offset; ++ extent->l2_cache_counts[min_index] = 1; + found: +- l2_index = ((offset >> 9) / s->cluster_sectors) % s->l2_size; ++ l2_index = ((offset >> 9) / extent->cluster_sectors) % extent->l2_size; + cluster_offset = le32_to_cpu(l2_table[l2_index]); + + if (!cluster_offset) { +@@ -539,8 +629,11 @@ static uint64_t get_cluster_offset(Block + return 0; + + // Avoid the L2 tables update for the images that have snapshots. +- cluster_offset = bdrv_getlength(bs->file); +- bdrv_truncate(bs->file, cluster_offset + (s->cluster_sectors << 9)); ++ cluster_offset = bdrv_getlength(extent->file); ++ bdrv_truncate( ++ extent->file, ++ cluster_offset + (extent->cluster_sectors << 9) ++ ); + + cluster_offset >>= 9; + tmp = cpu_to_le32(cluster_offset); +@@ -551,7 +644,8 @@ static uint64_t get_cluster_offset(Block + * This problem may occur because of insufficient space on host disk + * or inappropriate VM shutdown. + */ +- if (get_whole_cluster(bs, cluster_offset, offset, allocate) == -1) ++ if (get_whole_cluster( ++ bs, extent, cluster_offset, offset, allocate) == -1) + return 0; + + if (m_data) { +@@ -566,33 +660,69 @@ static uint64_t get_cluster_offset(Block + return cluster_offset; + } + ++static VmdkExtent *find_extent(BDRVVmdkState *s, ++ int64_t sector_num, VmdkExtent *start_hint) ++{ ++ VmdkExtent *extent = start_hint; ++ ++ if (!extent) { ++ extent = &s->extents[0]; ++ } ++ while (extent < &s->extents[s->num_extents]) { ++ if (sector_num < extent->end_sector) { ++ return extent; ++ } ++ extent++; ++ } ++ return NULL; ++} ++ + static int vmdk_is_allocated(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, int *pnum) + { + BDRVVmdkState *s = bs->opaque; +- int index_in_cluster, n; +- uint64_t cluster_offset; + +- cluster_offset = get_cluster_offset(bs, NULL, sector_num << 9, 0); +- index_in_cluster = sector_num % s->cluster_sectors; +- n = s->cluster_sectors - index_in_cluster; ++ int64_t index_in_cluster, n, ret; ++ uint64_t offset; ++ VmdkExtent *extent; ++ ++ extent = find_extent(s, sector_num, NULL); ++ if (!extent) { ++ return 0; ++ } ++ if (extent->flat) { ++ n = extent->end_sector - sector_num; ++ ret = 1; ++ } else { ++ offset = get_cluster_offset(bs, extent, NULL, sector_num * 512, 0); ++ index_in_cluster = sector_num % extent->cluster_sectors; ++ n = extent->cluster_sectors - index_in_cluster; ++ ret = offset ? 1 : 0; ++ } + if (n > nb_sectors) + n = nb_sectors; + *pnum = n; +- return (cluster_offset != 0); ++ return ret; + } + + static int vmdk_read(BlockDriverState *bs, int64_t sector_num, + uint8_t *buf, int nb_sectors) + { + BDRVVmdkState *s = bs->opaque; +- int index_in_cluster, n, ret; ++ int ret; ++ uint64_t n, index_in_cluster; ++ VmdkExtent *extent = NULL; + uint64_t cluster_offset; + + while (nb_sectors > 0) { +- cluster_offset = get_cluster_offset(bs, NULL, sector_num << 9, 0); +- index_in_cluster = sector_num % s->cluster_sectors; +- n = s->cluster_sectors - index_in_cluster; ++ extent = find_extent(s, sector_num, extent); ++ if (!extent) { ++ return -EIO; ++ } ++ cluster_offset = get_cluster_offset( ++ bs, extent, NULL, sector_num << 9, 0); ++ index_in_cluster = sector_num % extent->cluster_sectors; ++ n = extent->cluster_sectors - index_in_cluster; + if (n > nb_sectors) + n = nb_sectors; + if (!cluster_offset) { +@@ -621,10 +751,12 @@ static int vmdk_write(BlockDriverState * + const uint8_t *buf, int nb_sectors) + { + BDRVVmdkState *s = bs->opaque; +- VmdkMetaData m_data; +- int index_in_cluster, n; ++ VmdkExtent *extent = NULL; ++ int n; ++ int64_t index_in_cluster; + uint64_t cluster_offset; + static int cid_update = 0; ++ VmdkMetaData m_data; + + if (sector_num > bs->total_sectors) { + fprintf(stderr, +@@ -635,20 +767,35 @@ static int vmdk_write(BlockDriverState * + } + + while (nb_sectors > 0) { +- index_in_cluster = sector_num & (s->cluster_sectors - 1); +- n = s->cluster_sectors - index_in_cluster; +- if (n > nb_sectors) +- n = nb_sectors; +- cluster_offset = get_cluster_offset(bs, &m_data, sector_num << 9, 1); +- if (!cluster_offset) ++ extent = find_extent(s, sector_num, extent); ++ if (!extent) { ++ return -EIO; ++ } ++ cluster_offset = get_cluster_offset( ++ bs, ++ extent, ++ &m_data, ++ sector_num << 9, 1); ++ if (!cluster_offset) { + return -1; ++ } ++ index_in_cluster = sector_num % extent->cluster_sectors; ++ n = extent->cluster_sectors - index_in_cluster; ++ if (n > nb_sectors) { ++ n = nb_sectors; ++ } + +- if (bdrv_pwrite(bs->file, cluster_offset + index_in_cluster * 512, buf, n * 512) != n * 512) ++ if (bdrv_pwrite(bs->file, ++ cluster_offset + index_in_cluster * 512, ++ buf, n * 512) ++ != n * 512) { + return -1; ++ } + if (m_data.valid) { + /* update L2 tables */ +- if (vmdk_L2update(bs, &m_data) == -1) ++ if (vmdk_L2update(extent, &m_data) == -1) { + return -1; ++ } + } + nb_sectors -= n; + sector_num += n; +@@ -822,10 +969,7 @@ exit: + + static void vmdk_close(BlockDriverState *bs) + { +- BDRVVmdkState *s = bs->opaque; +- +- qemu_free(s->l1_table); +- qemu_free(s->l2_cache); ++ vmdk_free_extents(bs); + } + + static int vmdk_flush(BlockDriverState *bs) diff --git a/tools/qemu/patches/0003-VMDK-bugfix-align-offset-to-cluster-in-get_whole_clu.patch b/tools/qemu/patches/0003-VMDK-bugfix-align-offset-to-cluster-in-get_whole_clu.patch new file mode 100644 index 0000000000..38e6c0ae8f --- /dev/null +++ b/tools/qemu/patches/0003-VMDK-bugfix-align-offset-to-cluster-in-get_whole_clu.patch @@ -0,0 +1,46 @@ +From 66922efc83a670178b208dec2f5123ec85fb6ba3 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:29 +0800 +Subject: [PATCH 03/12] VMDK: bugfix, align offset to cluster in + get_whole_cluster + +In get_whole_cluster, the offset is not aligned to cluster when reading +from backing_hd. When the first write to child is not at the cluster +boundary, wrong address data from parent is copied to child. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -514,21 +514,23 @@ static int get_whole_cluster(BlockDriver + /* 128 sectors * 512 bytes each = grain size 64KB */ + uint8_t whole_grain[extent->cluster_sectors * 512]; + +- // we will be here if it's first write on non-exist grain(cluster). +- // try to read from parent image, if exist ++ /* we will be here if it's first write on non-exist grain(cluster). ++ * try to read from parent image, if exist */ + if (bs->backing_hd) { + int ret; + + if (!vmdk_is_cid_valid(bs)) + return -1; + ++ /* floor offset to cluster */ ++ offset -= offset % (extent->cluster_sectors * 512); + ret = bdrv_read(bs->backing_hd, offset >> 9, whole_grain, + extent->cluster_sectors); + if (ret < 0) { + return -1; + } + +- //Write grain only into the active image ++ /* Write grain only into the active image */ + ret = bdrv_write(extent->file, cluster_offset, whole_grain, + extent->cluster_sectors); + if (ret < 0) { diff --git a/tools/qemu/patches/0004-VMDK-probe-for-monolithicFlat-images.patch b/tools/qemu/patches/0004-VMDK-probe-for-monolithicFlat-images.patch new file mode 100644 index 0000000000..86451ea24d --- /dev/null +++ b/tools/qemu/patches/0004-VMDK-probe-for-monolithicFlat-images.patch @@ -0,0 +1,74 @@ +From 930e57ecb64bbab75c2b71d0d1ba07451fec4567 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:30 +0800 +Subject: [PATCH 04/12] VMDK: probe for monolithicFlat images + +Probe as the same behavior as VMware does. +Recognize image as monolithicFlat descriptor file when the file is text +and the first effective line (not '#' leaded comment or space line) is +either 'version=1' or 'version=2'. No space or upper case charactors +accepted. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 43 insertions(+), 2 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -103,10 +103,51 @@ static int vmdk_probe(const uint8_t *buf + return 0; + magic = be32_to_cpu(*(uint32_t *)buf); + if (magic == VMDK3_MAGIC || +- magic == VMDK4_MAGIC) ++ magic == VMDK4_MAGIC) { + return 100; +- else ++ } else { ++ const char *p = (const char *)buf; ++ const char *end = p + buf_size; ++ while (p < end) { ++ if (*p == '#') { ++ /* skip comment line */ ++ while (p < end && *p != '\n') { ++ p++; ++ } ++ p++; ++ continue; ++ } ++ if (*p == ' ') { ++ while (p < end && *p == ' ') { ++ p++; ++ } ++ /* skip '\r' if windows line endings used. */ ++ if (p < end && *p == '\r') { ++ p++; ++ } ++ /* only accept blank lines before 'version=' line */ ++ if (p == end || *p != '\n') { ++ return 0; ++ } ++ p++; ++ continue; ++ } ++ if (end - p >= strlen("version=X\n")) { ++ if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 || ++ strncmp("version=2\n", p, strlen("version=2\n")) == 0) { ++ return 100; ++ } ++ } ++ if (end - p >= strlen("version=X\r\n")) { ++ if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) == 0 || ++ strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0) { ++ return 100; ++ } ++ } ++ return 0; ++ } + return 0; ++ } + } + + #define CHECK_CID 1 diff --git a/tools/qemu/patches/0005-VMDK-separate-vmdk_open-by-format-version.patch b/tools/qemu/patches/0005-VMDK-separate-vmdk_open-by-format-version.patch new file mode 100644 index 0000000000..7323aa13be --- /dev/null +++ b/tools/qemu/patches/0005-VMDK-separate-vmdk_open-by-format-version.patch @@ -0,0 +1,241 @@ +From 97cf5df76657bab81d6b8669607f6f13215201c1 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:31 +0800 +Subject: [PATCH 05/12] VMDK: separate vmdk_open by format version + +Separate vmdk_open by subformats to: +* vmdk_open_vmdk3 +* vmdk_open_vmdk4 + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 178 +++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 112 insertions(+), 66 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -458,67 +458,20 @@ static VmdkExtent *vmdk_add_extent(Block + return extent; + } + +- +-static int vmdk_open(BlockDriverState *bs, int flags) ++static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent) + { +- BDRVVmdkState *s = bs->opaque; +- uint32_t magic; +- int i; +- uint32_t l1_size, l1_entry_sectors; +- VmdkExtent *extent = NULL; +- +- if (bdrv_pread(bs->file, 0, &magic, sizeof(magic)) != sizeof(magic)) +- goto fail; +- +- magic = be32_to_cpu(magic); +- if (magic == VMDK3_MAGIC) { +- VMDK3Header header; +- if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) +- != sizeof(header)) { +- goto fail; +- } +- extent = vmdk_add_extent(bs, bs->file, false, +- le32_to_cpu(header.disk_sectors), +- le32_to_cpu(header.l1dir_offset) << 9, 0, +- 1 << 6, 1 << 9, le32_to_cpu(header.granularity)); +- } else if (magic == VMDK4_MAGIC) { +- VMDK4Header header; +- if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) +- != sizeof(header)) { +- goto fail; +- } +- l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) +- * le64_to_cpu(header.granularity); +- l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) +- / l1_entry_sectors; +- extent = vmdk_add_extent(bs, bs->file, false, +- le64_to_cpu(header.capacity), +- le64_to_cpu(header.gd_offset) << 9, +- le64_to_cpu(header.rgd_offset) << 9, +- l1_size, +- le32_to_cpu(header.num_gtes_per_gte), +- le64_to_cpu(header.granularity)); +- if (extent->l1_entry_sectors <= 0) { +- goto fail; +- } +- // try to open parent images, if exist +- if (vmdk_parent_open(bs) != 0) +- goto fail; +- // write the CID once after the image creation +- s->parent_cid = vmdk_read_cid(bs,1); +- } else { +- goto fail; +- } ++ int ret; ++ int l1_size, i; + + /* read the L1 table */ + l1_size = extent->l1_size * sizeof(uint32_t); + extent->l1_table = qemu_malloc(l1_size); +- if (bdrv_pread(bs->file, +- extent->l1_table_offset, +- extent->l1_table, +- l1_size) +- != l1_size) { +- goto fail; ++ ret = bdrv_pread(extent->file, ++ extent->l1_table_offset, ++ extent->l1_table, ++ l1_size); ++ if (ret < 0) { ++ goto fail_l1; + } + for (i = 0; i < extent->l1_size; i++) { + le32_to_cpus(&extent->l1_table[i]); +@@ -526,12 +479,12 @@ static int vmdk_open(BlockDriverState *b + + if (extent->l1_backup_table_offset) { + extent->l1_backup_table = qemu_malloc(l1_size); +- if (bdrv_pread(bs->file, +- extent->l1_backup_table_offset, +- extent->l1_backup_table, +- l1_size) +- != l1_size) { +- goto fail; ++ ret = bdrv_pread(extent->file, ++ extent->l1_backup_table_offset, ++ extent->l1_backup_table, ++ l1_size); ++ if (ret < 0) { ++ goto fail_l1b; + } + for (i = 0; i < extent->l1_size; i++) { + le32_to_cpus(&extent->l1_backup_table[i]); +@@ -541,9 +494,102 @@ static int vmdk_open(BlockDriverState *b + extent->l2_cache = + qemu_malloc(extent->l2_size * L2_CACHE_SIZE * sizeof(uint32_t)); + return 0; ++ fail_l1b: ++ qemu_free(extent->l1_backup_table); ++ fail_l1: ++ qemu_free(extent->l1_table); ++ return ret; ++} ++ ++static int vmdk_open_vmdk3(BlockDriverState *bs, int flags) ++{ ++ int ret; ++ uint32_t magic; ++ VMDK3Header header; ++ VmdkExtent *extent; ++ ++ ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); ++ if (ret < 0) { ++ goto fail; ++ } ++ extent = vmdk_add_extent(bs, ++ bs->file, false, ++ le32_to_cpu(header.disk_sectors), ++ le32_to_cpu(header.l1dir_offset) << 9, ++ 0, 1 << 6, 1 << 9, ++ le32_to_cpu(header.granularity)); ++ ret = vmdk_init_tables(bs, extent); ++ if (ret) { ++ /* vmdk_init_tables cleans up on fail, so only free allocation of ++ * vmdk_add_extent here. */ ++ goto fail; ++ } ++ return 0; + fail: + vmdk_free_extents(bs); +- return -1; ++ return ret; ++} ++ ++static int vmdk_open_vmdk4(BlockDriverState *bs, int flags) ++{ ++ int ret; ++ uint32_t magic; ++ uint32_t l1_size, l1_entry_sectors; ++ VMDK4Header header; ++ BDRVVmdkState *s = bs->opaque; ++ VmdkExtent *extent; ++ ++ ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); ++ if (ret < 0) { ++ goto fail; ++ } ++ l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) ++ * le64_to_cpu(header.granularity); ++ l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) ++ / l1_entry_sectors; ++ extent = vmdk_add_extent(bs, bs->file, false, ++ le64_to_cpu(header.capacity), ++ le64_to_cpu(header.gd_offset) << 9, ++ le64_to_cpu(header.rgd_offset) << 9, ++ l1_size, ++ le32_to_cpu(header.num_gtes_per_gte), ++ le64_to_cpu(header.granularity)); ++ if (extent->l1_entry_sectors <= 0) { ++ ret = -EINVAL; ++ goto fail; ++ } ++ /* try to open parent images, if exist */ ++ ret = vmdk_parent_open(bs); ++ if (ret) { ++ goto fail; ++ } ++ s->parent_cid = vmdk_read_cid(bs, 1); ++ ret = vmdk_init_tables(bs, extent); ++ if (ret) { ++ goto fail; ++ } ++ return 0; ++ fail: ++ vmdk_free_extents(bs); ++ return ret; ++} ++ ++static int vmdk_open(BlockDriverState *bs, int flags) ++{ ++ uint32_t magic; ++ ++ if (bdrv_pread(bs->file, 0, &magic, sizeof(magic)) != sizeof(magic)) { ++ return -EIO; ++ } ++ ++ magic = be32_to_cpu(magic); ++ if (magic == VMDK3_MAGIC) { ++ return vmdk_open_vmdk3(bs, flags); ++ } else if (magic == VMDK4_MAGIC) { ++ return vmdk_open_vmdk4(bs, flags); ++ } else { ++ return -EINVAL; ++ } + } + + static int get_whole_cluster(BlockDriverState *bs, +@@ -630,11 +676,11 @@ static uint64_t get_cluster_offset(Block + if (!l2_offset) { + return 0; + } +- for(i = 0; i < L2_CACHE_SIZE; i++) { ++ for (i = 0; i < L2_CACHE_SIZE; i++) { + if (l2_offset == extent->l2_cache_offsets[i]) { + /* increment the hit count */ + if (++extent->l2_cache_counts[i] == 0xffffffff) { +- for(j = 0; j < L2_CACHE_SIZE; j++) { ++ for (j = 0; j < L2_CACHE_SIZE; j++) { + extent->l2_cache_counts[j] >>= 1; + } + } +@@ -645,7 +691,7 @@ static uint64_t get_cluster_offset(Block + /* not found: load a new entry in the least used one */ + min_index = 0; + min_count = 0xffffffff; +- for(i = 0; i < L2_CACHE_SIZE; i++) { ++ for (i = 0; i < L2_CACHE_SIZE; i++) { + if (extent->l2_cache_counts[i] < min_count) { + min_count = extent->l2_cache_counts[i]; + min_index = i; diff --git a/tools/qemu/patches/0006-VMDK-add-field-BDRVVmdkState.desc_offset.patch b/tools/qemu/patches/0006-VMDK-add-field-BDRVVmdkState.desc_offset.patch new file mode 100644 index 0000000000..51bbb3b010 --- /dev/null +++ b/tools/qemu/patches/0006-VMDK-add-field-BDRVVmdkState.desc_offset.patch @@ -0,0 +1,102 @@ +From 1c1781fa1c45a7c012f7b2c4be1be372f19e3cc6 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:32 +0800 +Subject: [PATCH 06/12] VMDK: add field BDRVVmdkState.desc_offset + +There are several occurrence of magic number 0x200 as the descriptor +offset within mono sparse image file. This is not the case for images +with separate descriptor file. So a field is added to BDRVVmdkState to +hold the correct value. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -81,6 +81,7 @@ typedef struct VmdkExtent { + } VmdkExtent; + + typedef struct BDRVVmdkState { ++ int desc_offset; + uint32_t parent_cid; + int num_extents; + /* Extent array with num_extents entries, ascend ordered by address */ +@@ -175,10 +176,11 @@ static uint32_t vmdk_read_cid(BlockDrive + uint32_t cid; + const char *p_name, *cid_str; + size_t cid_str_size; ++ BDRVVmdkState *s = bs->opaque; + +- /* the descriptor offset = 0x200 */ +- if (bdrv_pread(bs->file, 0x200, desc, DESC_SIZE) != DESC_SIZE) ++ if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { + return 0; ++ } + + if (parent) { + cid_str = "parentCID"; +@@ -200,10 +202,12 @@ static int vmdk_write_cid(BlockDriverSta + { + char desc[DESC_SIZE], tmp_desc[DESC_SIZE]; + char *p_name, *tmp_str; ++ BDRVVmdkState *s = bs->opaque; + +- /* the descriptor offset = 0x200 */ +- if (bdrv_pread(bs->file, 0x200, desc, DESC_SIZE) != DESC_SIZE) +- return -1; ++ memset(desc, 0, sizeof(desc)); ++ if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { ++ return -EIO; ++ } + + tmp_str = strstr(desc,"parentCID"); + pstrcpy(tmp_desc, sizeof(tmp_desc), tmp_str); +@@ -213,8 +217,9 @@ static int vmdk_write_cid(BlockDriverSta + pstrcat(desc, sizeof(desc), tmp_desc); + } + +- if (bdrv_pwrite_sync(bs->file, 0x200, desc, DESC_SIZE) < 0) +- return -1; ++ if (bdrv_pwrite_sync(bs->file, s->desc_offset, desc, DESC_SIZE) < 0) { ++ return -EIO; ++ } + return 0; + } + +@@ -402,10 +407,11 @@ static int vmdk_parent_open(BlockDriverS + { + char *p_name; + char desc[DESC_SIZE]; ++ BDRVVmdkState *s = bs->opaque; + +- /* the descriptor offset = 0x200 */ +- if (bdrv_pread(bs->file, 0x200, desc, DESC_SIZE) != DESC_SIZE) ++ if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { + return -1; ++ } + + if ((p_name = strstr(desc,"parentFileNameHint")) != NULL) { + char *end_name; +@@ -506,8 +512,10 @@ static int vmdk_open_vmdk3(BlockDriverSt + int ret; + uint32_t magic; + VMDK3Header header; ++ BDRVVmdkState *s = bs->opaque; + VmdkExtent *extent; + ++ s->desc_offset = 0x200; + ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); + if (ret < 0) { + goto fail; +@@ -539,6 +547,7 @@ static int vmdk_open_vmdk4(BlockDriverSt + BDRVVmdkState *s = bs->opaque; + VmdkExtent *extent; + ++ s->desc_offset = 0x200; + ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); + if (ret < 0) { + goto fail; diff --git a/tools/qemu/patches/0007-VMDK-flush-multiple-extents.patch b/tools/qemu/patches/0007-VMDK-flush-multiple-extents.patch new file mode 100644 index 0000000000..b228236517 --- /dev/null +++ b/tools/qemu/patches/0007-VMDK-flush-multiple-extents.patch @@ -0,0 +1,35 @@ +From 49885608e66c1e76a2b715fb36fd2f27f73e5202 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:33 +0800 +Subject: [PATCH 07/12] VMDK: flush multiple extents + +Flush all the file that referenced by the image. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -1072,7 +1072,17 @@ static void vmdk_close(BlockDriverState + + static int vmdk_flush(BlockDriverState *bs) + { +- return bdrv_flush(bs->file); ++ int i, ret, err; ++ BDRVVmdkState *s = bs->opaque; ++ ++ ret = bdrv_flush(bs->file); ++ for (i = 0; i < s->num_extents; i++) { ++ err = bdrv_flush(s->extents[i].file); ++ if (err < 0) { ++ ret = err; ++ } ++ } ++ return ret; + } + + diff --git a/tools/qemu/patches/0008-VMDK-move-static-cid_update-flag-to-bs-field.patch b/tools/qemu/patches/0008-VMDK-move-static-cid_update-flag-to-bs-field.patch new file mode 100644 index 0000000000..90a699d73b --- /dev/null +++ b/tools/qemu/patches/0008-VMDK-move-static-cid_update-flag-to-bs-field.patch @@ -0,0 +1,46 @@ +From 9d8117f00364c12cbd658de903b1ed26a30584e0 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:34 +0800 +Subject: [PATCH 08/12] VMDK: move 'static' cid_update flag to bs field + +Cid_update is the flag for updating CID on first write after opening the +image. This should be per image open rather than per program life cycle, +so change it from static var of vmdk_write to a field in BDRVVmdkState. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -82,6 +82,7 @@ typedef struct VmdkExtent { + + typedef struct BDRVVmdkState { + int desc_offset; ++ bool cid_updated; + uint32_t parent_cid; + int num_extents; + /* Extent array with num_extents entries, ascend ordered by address */ +@@ -853,7 +854,6 @@ static int vmdk_write(BlockDriverState * + int n; + int64_t index_in_cluster; + uint64_t cluster_offset; +- static int cid_update = 0; + VmdkMetaData m_data; + + if (sector_num > bs->total_sectors) { +@@ -900,9 +900,9 @@ static int vmdk_write(BlockDriverState * + buf += n * 512; + + // update CID on the first write every time the virtual disk is opened +- if (!cid_update) { ++ if (!s->cid_updated) { + vmdk_write_cid(bs, time(NULL)); +- cid_update++; ++ s->cid_updated = true; + } + } + return 0; diff --git a/tools/qemu/patches/0009-VMDK-change-get_cluster_offset-return-type.patch b/tools/qemu/patches/0009-VMDK-change-get_cluster_offset-return-type.patch new file mode 100644 index 0000000000..bc6e74656e --- /dev/null +++ b/tools/qemu/patches/0009-VMDK-change-get_cluster_offset-return-type.patch @@ -0,0 +1,198 @@ +From 9e1ddc6967e8739f4fa47fa4f6a767ebe319f6ff Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 12 Jul 2011 19:56:35 +0800 +Subject: [PATCH 09/12] VMDK: change get_cluster_offset return type + +The return type of get_cluster_offset was an offset that use 0 to denote +'not allocated', this will be no longer true for flat extents, as we see +flat extent file as a single huge cluster whose offset is 0 and length +is the whole file length. +So now we use int return value, 0 means success and otherwise offset +invalid. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 79 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 42 insertions(+), 37 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -665,26 +665,31 @@ static int vmdk_L2update(VmdkExtent *ext + return 0; + } + +-static uint64_t get_cluster_offset(BlockDriverState *bs, ++static int get_cluster_offset(BlockDriverState *bs, + VmdkExtent *extent, + VmdkMetaData *m_data, +- uint64_t offset, int allocate) ++ uint64_t offset, ++ int allocate, ++ uint64_t *cluster_offset) + { + unsigned int l1_index, l2_offset, l2_index; + int min_index, i, j; + uint32_t min_count, *l2_table, tmp = 0; +- uint64_t cluster_offset; + + if (m_data) + m_data->valid = 0; ++ if (extent->flat) { ++ *cluster_offset = 0; ++ return 0; ++ } + + l1_index = (offset >> 9) / extent->l1_entry_sectors; + if (l1_index >= extent->l1_size) { +- return 0; ++ return -1; + } + l2_offset = extent->l1_table[l1_index]; + if (!l2_offset) { +- return 0; ++ return -1; + } + for (i = 0; i < L2_CACHE_SIZE; i++) { + if (l2_offset == extent->l2_cache_offsets[i]) { +@@ -714,28 +719,29 @@ static uint64_t get_cluster_offset(Block + l2_table, + extent->l2_size * sizeof(uint32_t) + ) != extent->l2_size * sizeof(uint32_t)) { +- return 0; ++ return -1; + } + + extent->l2_cache_offsets[min_index] = l2_offset; + extent->l2_cache_counts[min_index] = 1; + found: + l2_index = ((offset >> 9) / extent->cluster_sectors) % extent->l2_size; +- cluster_offset = le32_to_cpu(l2_table[l2_index]); ++ *cluster_offset = le32_to_cpu(l2_table[l2_index]); + +- if (!cluster_offset) { +- if (!allocate) +- return 0; ++ if (!*cluster_offset) { ++ if (!allocate) { ++ return -1; ++ } + + // Avoid the L2 tables update for the images that have snapshots. +- cluster_offset = bdrv_getlength(extent->file); ++ *cluster_offset = bdrv_getlength(extent->file); + bdrv_truncate( + extent->file, +- cluster_offset + (extent->cluster_sectors << 9) ++ *cluster_offset + (extent->cluster_sectors << 9) + ); + +- cluster_offset >>= 9; +- tmp = cpu_to_le32(cluster_offset); ++ *cluster_offset >>= 9; ++ tmp = cpu_to_le32(*cluster_offset); + l2_table[l2_index] = tmp; + + /* First of all we write grain itself, to avoid race condition +@@ -744,8 +750,8 @@ static uint64_t get_cluster_offset(Block + * or inappropriate VM shutdown. + */ + if (get_whole_cluster( +- bs, extent, cluster_offset, offset, allocate) == -1) +- return 0; ++ bs, extent, *cluster_offset, offset, allocate) == -1) ++ return -1; + + if (m_data) { + m_data->offset = tmp; +@@ -755,8 +761,8 @@ static uint64_t get_cluster_offset(Block + m_data->valid = 1; + } + } +- cluster_offset <<= 9; +- return cluster_offset; ++ *cluster_offset <<= 9; ++ return 0; + } + + static VmdkExtent *find_extent(BDRVVmdkState *s, +@@ -780,7 +786,6 @@ static int vmdk_is_allocated(BlockDriver + int nb_sectors, int *pnum) + { + BDRVVmdkState *s = bs->opaque; +- + int64_t index_in_cluster, n, ret; + uint64_t offset; + VmdkExtent *extent; +@@ -789,15 +794,13 @@ static int vmdk_is_allocated(BlockDriver + if (!extent) { + return 0; + } +- if (extent->flat) { +- n = extent->end_sector - sector_num; +- ret = 1; +- } else { +- offset = get_cluster_offset(bs, extent, NULL, sector_num * 512, 0); +- index_in_cluster = sector_num % extent->cluster_sectors; +- n = extent->cluster_sectors - index_in_cluster; +- ret = offset ? 1 : 0; +- } ++ ret = get_cluster_offset(bs, extent, NULL, ++ sector_num * 512, 0, &offset); ++ /* get_cluster_offset returning 0 means success */ ++ ret = !ret; ++ ++ index_in_cluster = sector_num % extent->cluster_sectors; ++ n = extent->cluster_sectors - index_in_cluster; + if (n > nb_sectors) + n = nb_sectors; + *pnum = n; +@@ -818,14 +821,15 @@ static int vmdk_read(BlockDriverState *b + if (!extent) { + return -EIO; + } +- cluster_offset = get_cluster_offset( +- bs, extent, NULL, sector_num << 9, 0); ++ ret = get_cluster_offset( ++ bs, extent, NULL, ++ sector_num << 9, 0, &cluster_offset); + index_in_cluster = sector_num % extent->cluster_sectors; + n = extent->cluster_sectors - index_in_cluster; + if (n > nb_sectors) + n = nb_sectors; +- if (!cluster_offset) { +- // try to read from parent image, if exist ++ if (ret) { ++ /* if not allocated, try to read from parent image, if exist */ + if (bs->backing_hd) { + if (!vmdk_is_cid_valid(bs)) + return -1; +@@ -851,7 +855,7 @@ static int vmdk_write(BlockDriverState * + { + BDRVVmdkState *s = bs->opaque; + VmdkExtent *extent = NULL; +- int n; ++ int n, ret; + int64_t index_in_cluster; + uint64_t cluster_offset; + VmdkMetaData m_data; +@@ -869,13 +873,14 @@ static int vmdk_write(BlockDriverState * + if (!extent) { + return -EIO; + } +- cluster_offset = get_cluster_offset( ++ ret = get_cluster_offset( + bs, + extent, + &m_data, +- sector_num << 9, 1); +- if (!cluster_offset) { +- return -1; ++ sector_num << 9, 1, ++ &cluster_offset); ++ if (ret) { ++ return -EINVAL; + } + index_in_cluster = sector_num % extent->cluster_sectors; + n = extent->cluster_sectors - index_in_cluster; diff --git a/tools/qemu/patches/0010-VMDK-open-read-write-for-monolithicFlat-image.patch b/tools/qemu/patches/0010-VMDK-open-read-write-for-monolithicFlat-image.patch new file mode 100644 index 0000000000..b05d0d37d8 --- /dev/null +++ b/tools/qemu/patches/0010-VMDK-open-read-write-for-monolithicFlat-image.patch @@ -0,0 +1,257 @@ +From e6b783a12f7ff491a1a2147d9fe55b4535aa046e Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 19 Jul 2011 08:38:22 +0800 +Subject: [PATCH 10/12] VMDK: open/read/write for monolithicFlat image + +Parse vmdk decriptor file and open mono flat image. +Read/write the flat extent. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 158 insertions(+), 13 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -65,6 +65,7 @@ typedef struct VmdkExtent { + bool flat; + int64_t sectors; + int64_t end_sector; ++ int64_t flat_start_offset; + int64_t l1_table_offset; + int64_t l1_backup_table_offset; + uint32_t *l1_table; +@@ -407,9 +408,10 @@ fail: + static int vmdk_parent_open(BlockDriverState *bs) + { + char *p_name; +- char desc[DESC_SIZE]; ++ char desc[DESC_SIZE + 1]; + BDRVVmdkState *s = bs->opaque; + ++ desc[DESC_SIZE] = '\0'; + if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { + return -1; + } +@@ -584,6 +586,144 @@ static int vmdk_open_vmdk4(BlockDriverSt + return ret; + } + ++/* find an option value out of descriptor file */ ++static int vmdk_parse_description(const char *desc, const char *opt_name, ++ char *buf, int buf_size) ++{ ++ char *opt_pos, *opt_end; ++ const char *end = desc + strlen(desc); ++ ++ opt_pos = strstr(desc, opt_name); ++ if (!opt_pos) { ++ return -1; ++ } ++ /* Skip "=\"" following opt_name */ ++ opt_pos += strlen(opt_name) + 2; ++ if (opt_pos >= end) { ++ return -1; ++ } ++ opt_end = opt_pos; ++ while (opt_end < end && *opt_end != '"') { ++ opt_end++; ++ } ++ if (opt_end == end || buf_size < opt_end - opt_pos + 1) { ++ return -1; ++ } ++ pstrcpy(buf, opt_end - opt_pos + 1, opt_pos); ++ return 0; ++} ++ ++static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, ++ const char *desc_file_path) ++{ ++ int ret; ++ char access[11]; ++ char type[11]; ++ char fname[512]; ++ const char *p = desc; ++ int64_t sectors = 0; ++ int64_t flat_offset; ++ ++ while (*p) { ++ /* parse extent line: ++ * RW [size in sectors] FLAT "file-name.vmdk" OFFSET ++ * or ++ * RW [size in sectors] SPARSE "file-name.vmdk" ++ */ ++ flat_offset = -1; ++ ret = sscanf(p, "%10s %" SCNd64 " %10s %511s %" SCNd64, ++ access, §ors, type, fname, &flat_offset); ++ if (ret < 4 || strcmp(access, "RW")) { ++ goto next_line; ++ } else if (!strcmp(type, "FLAT")) { ++ if (ret != 5 || flat_offset < 0) { ++ return -EINVAL; ++ } ++ } else if (ret != 4) { ++ return -EINVAL; ++ } ++ ++ /* trim the quotation marks around */ ++ if (fname[0] == '"') { ++ memmove(fname, fname + 1, strlen(fname)); ++ if (strlen(fname) <= 1 || fname[strlen(fname) - 1] != '"') { ++ return -EINVAL; ++ } ++ fname[strlen(fname) - 1] = '\0'; ++ } ++ if (sectors <= 0 || ++ (strcmp(type, "FLAT") && strcmp(type, "SPARSE")) || ++ (strcmp(access, "RW"))) { ++ goto next_line; ++ } ++ ++ /* save to extents array */ ++ if (!strcmp(type, "FLAT")) { ++ /* FLAT extent */ ++ char extent_path[PATH_MAX]; ++ BlockDriverState *extent_file; ++ VmdkExtent *extent; ++ ++ path_combine(extent_path, sizeof(extent_path), ++ desc_file_path, fname); ++ ret = bdrv_file_open(&extent_file, extent_path, bs->open_flags); ++ if (ret) { ++ return ret; ++ } ++ extent = vmdk_add_extent(bs, extent_file, true, sectors, ++ 0, 0, 0, 0, sectors); ++ extent->flat_start_offset = flat_offset; ++ } else { ++ /* SPARSE extent, not supported for now */ ++ fprintf(stderr, ++ "VMDK: Not supported extent type \"%s\""".\n", type); ++ return -ENOTSUP; ++ } ++next_line: ++ /* move to next line */ ++ while (*p && *p != '\n') { ++ p++; ++ } ++ p++; ++ } ++ return 0; ++} ++ ++static int vmdk_open_desc_file(BlockDriverState *bs, int flags) ++{ ++ int ret; ++ char buf[2048]; ++ char ct[128]; ++ BDRVVmdkState *s = bs->opaque; ++ ++ ret = bdrv_pread(bs->file, 0, buf, sizeof(buf)); ++ if (ret < 0) { ++ return ret; ++ } ++ buf[2047] = '\0'; ++ if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) { ++ return -EINVAL; ++ } ++ if (strcmp(ct, "monolithicFlat")) { ++ fprintf(stderr, ++ "VMDK: Not supported image type \"%s\""".\n", ct); ++ return -ENOTSUP; ++ } ++ s->desc_offset = 0; ++ ret = vmdk_parse_extents(buf, bs, bs->file->filename); ++ if (ret) { ++ return ret; ++ } ++ ++ /* try to open parent images, if exist */ ++ if (vmdk_parent_open(bs)) { ++ qemu_free(s->extents); ++ return -EINVAL; ++ } ++ s->parent_cid = vmdk_read_cid(bs, 1); ++ return 0; ++} ++ + static int vmdk_open(BlockDriverState *bs, int flags) + { + uint32_t magic; +@@ -598,7 +738,7 @@ static int vmdk_open(BlockDriverState *b + } else if (magic == VMDK4_MAGIC) { + return vmdk_open_vmdk4(bs, flags); + } else { +- return -EINVAL; ++ return vmdk_open_desc_file(bs, flags); + } + } + +@@ -679,7 +819,7 @@ static int get_cluster_offset(BlockDrive + if (m_data) + m_data->valid = 0; + if (extent->flat) { +- *cluster_offset = 0; ++ *cluster_offset = extent->flat_start_offset; + return 0; + } + +@@ -832,16 +972,20 @@ static int vmdk_read(BlockDriverState *b + /* if not allocated, try to read from parent image, if exist */ + if (bs->backing_hd) { + if (!vmdk_is_cid_valid(bs)) +- return -1; ++ return -EINVAL; + ret = bdrv_read(bs->backing_hd, sector_num, buf, n); + if (ret < 0) +- return -1; ++ return ret; + } else { + memset(buf, 0, 512 * n); + } + } else { +- if(bdrv_pread(bs->file, cluster_offset + index_in_cluster * 512, buf, n * 512) != n * 512) +- return -1; ++ ret = bdrv_pread(extent->file, ++ cluster_offset + index_in_cluster * 512, ++ buf, n * 512); ++ if (ret < 0) { ++ return ret; ++ } + } + nb_sectors -= n; + sector_num += n; +@@ -865,7 +1009,7 @@ static int vmdk_write(BlockDriverState * + "(VMDK) Wrong offset: sector_num=0x%" PRIx64 + " total_sectors=0x%" PRIx64 "\n", + sector_num, bs->total_sectors); +- return -1; ++ return -EIO; + } + + while (nb_sectors > 0) { +@@ -888,16 +1032,17 @@ static int vmdk_write(BlockDriverState * + n = nb_sectors; + } + +- if (bdrv_pwrite(bs->file, ++ ret = bdrv_pwrite(extent->file, + cluster_offset + index_in_cluster * 512, +- buf, n * 512) +- != n * 512) { +- return -1; ++ buf, ++ n * 512); ++ if (ret < 0) { ++ return ret; + } + if (m_data.valid) { + /* update L2 tables */ + if (vmdk_L2update(extent, &m_data) == -1) { +- return -1; ++ return -EIO; + } + } + nb_sectors -= n; diff --git a/tools/qemu/patches/0011-VMDK-create-different-subformats.patch b/tools/qemu/patches/0011-VMDK-create-different-subformats.patch new file mode 100644 index 0000000000..7f02772d03 --- /dev/null +++ b/tools/qemu/patches/0011-VMDK-create-different-subformats.patch @@ -0,0 +1,595 @@ +From 0d0f2ba577bd05491b5954751787f8b969ca1ec3 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 19 Jul 2011 08:45:23 +0800 +Subject: [PATCH 11/12] VMDK: create different subformats + +Add create option 'format', with enums: + monolithicSparse + monolithicFlat + twoGbMaxExtentSparse + twoGbMaxExtentFlat +Each creates a subformat image file. The default is monolithicSparse. + +Signed-off-by: Fam Zheng +Reviewed-by: Stefan Hajnoczi +Signed-off-by: Kevin Wolf +--- + block/vmdk.c | 503 ++++++++++++++++++++++++++++++++--------------------------- + block_int.h | 1 + + 2 files changed, 275 insertions(+), 229 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -156,8 +156,9 @@ static int vmdk_probe(const uint8_t *buf + #define CHECK_CID 1 + + #define SECTOR_SIZE 512 +-#define DESC_SIZE 20*SECTOR_SIZE // 20 sectors of 512 bytes each +-#define HEADER_SIZE 512 // first sector of 512 bytes ++#define DESC_SIZE (20 * SECTOR_SIZE) /* 20 sectors of 512 bytes each */ ++#define BUF_SIZE 4096 ++#define HEADER_SIZE 512 /* first sector of 512 bytes */ + + static void vmdk_free_extents(BlockDriverState *bs) + { +@@ -243,168 +244,6 @@ static int vmdk_is_cid_valid(BlockDriver + return 1; + } + +-static int vmdk_snapshot_create(const char *filename, const char *backing_file) +-{ +- int snp_fd, p_fd; +- int ret; +- uint32_t p_cid; +- char *p_name, *gd_buf, *rgd_buf; +- const char *real_filename, *temp_str; +- VMDK4Header header; +- uint32_t gde_entries, gd_size; +- int64_t gd_offset, rgd_offset, capacity, gt_size; +- char p_desc[DESC_SIZE], s_desc[DESC_SIZE], hdr[HEADER_SIZE]; +- static const char desc_template[] = +- "# Disk DescriptorFile\n" +- "version=1\n" +- "CID=%x\n" +- "parentCID=%x\n" +- "createType=\"monolithicSparse\"\n" +- "parentFileNameHint=\"%s\"\n" +- "\n" +- "# Extent description\n" +- "RW %u SPARSE \"%s\"\n" +- "\n" +- "# The Disk Data Base \n" +- "#DDB\n" +- "\n"; +- +- snp_fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, 0644); +- if (snp_fd < 0) +- return -errno; +- p_fd = open(backing_file, O_RDONLY | O_BINARY | O_LARGEFILE); +- if (p_fd < 0) { +- close(snp_fd); +- return -errno; +- } +- +- /* read the header */ +- if (lseek(p_fd, 0x0, SEEK_SET) == -1) { +- ret = -errno; +- goto fail; +- } +- if (read(p_fd, hdr, HEADER_SIZE) != HEADER_SIZE) { +- ret = -errno; +- goto fail; +- } +- +- /* write the header */ +- if (lseek(snp_fd, 0x0, SEEK_SET) == -1) { +- ret = -errno; +- goto fail; +- } +- if (write(snp_fd, hdr, HEADER_SIZE) == -1) { +- ret = -errno; +- goto fail; +- } +- +- memset(&header, 0, sizeof(header)); +- memcpy(&header,&hdr[4], sizeof(header)); // skip the VMDK4_MAGIC +- +- if (ftruncate(snp_fd, header.grain_offset << 9)) { +- ret = -errno; +- goto fail; +- } +- /* the descriptor offset = 0x200 */ +- if (lseek(p_fd, 0x200, SEEK_SET) == -1) { +- ret = -errno; +- goto fail; +- } +- if (read(p_fd, p_desc, DESC_SIZE) != DESC_SIZE) { +- ret = -errno; +- goto fail; +- } +- +- if ((p_name = strstr(p_desc,"CID")) != NULL) { +- p_name += sizeof("CID"); +- sscanf(p_name,"%x",&p_cid); +- } +- +- real_filename = filename; +- if ((temp_str = strrchr(real_filename, '\\')) != NULL) +- real_filename = temp_str + 1; +- if ((temp_str = strrchr(real_filename, '/')) != NULL) +- real_filename = temp_str + 1; +- if ((temp_str = strrchr(real_filename, ':')) != NULL) +- real_filename = temp_str + 1; +- +- snprintf(s_desc, sizeof(s_desc), desc_template, p_cid, p_cid, backing_file, +- (uint32_t)header.capacity, real_filename); +- +- /* write the descriptor */ +- if (lseek(snp_fd, 0x200, SEEK_SET) == -1) { +- ret = -errno; +- goto fail; +- } +- if (write(snp_fd, s_desc, strlen(s_desc)) == -1) { +- ret = -errno; +- goto fail; +- } +- +- gd_offset = header.gd_offset * SECTOR_SIZE; // offset of GD table +- rgd_offset = header.rgd_offset * SECTOR_SIZE; // offset of RGD table +- capacity = header.capacity * SECTOR_SIZE; // Extent size +- /* +- * Each GDE span 32M disk, means: +- * 512 GTE per GT, each GTE points to grain +- */ +- gt_size = (int64_t)header.num_gtes_per_gte * header.granularity * SECTOR_SIZE; +- if (!gt_size) { +- ret = -EINVAL; +- goto fail; +- } +- gde_entries = (uint32_t)(capacity / gt_size); // number of gde/rgde +- gd_size = gde_entries * sizeof(uint32_t); +- +- /* write RGD */ +- rgd_buf = qemu_malloc(gd_size); +- if (lseek(p_fd, rgd_offset, SEEK_SET) == -1) { +- ret = -errno; +- goto fail_rgd; +- } +- if (read(p_fd, rgd_buf, gd_size) != gd_size) { +- ret = -errno; +- goto fail_rgd; +- } +- if (lseek(snp_fd, rgd_offset, SEEK_SET) == -1) { +- ret = -errno; +- goto fail_rgd; +- } +- if (write(snp_fd, rgd_buf, gd_size) == -1) { +- ret = -errno; +- goto fail_rgd; +- } +- +- /* write GD */ +- gd_buf = qemu_malloc(gd_size); +- if (lseek(p_fd, gd_offset, SEEK_SET) == -1) { +- ret = -errno; +- goto fail_gd; +- } +- if (read(p_fd, gd_buf, gd_size) != gd_size) { +- ret = -errno; +- goto fail_gd; +- } +- if (lseek(snp_fd, gd_offset, SEEK_SET) == -1) { +- ret = -errno; +- goto fail_gd; +- } +- if (write(snp_fd, gd_buf, gd_size) == -1) { +- ret = -errno; +- goto fail_gd; +- } +- ret = 0; +- +-fail_gd: +- qemu_free(gd_buf); +-fail_rgd: +- qemu_free(rgd_buf); +-fail: +- close(p_fd); +- close(snp_fd); +- return ret; +-} +- + static int vmdk_parent_open(BlockDriverState *bs) + { + char *p_name; +@@ -1058,68 +897,40 @@ static int vmdk_write(BlockDriverState * + return 0; + } + +-static int vmdk_create(const char *filename, QEMUOptionParameter *options) ++ ++static int vmdk_create_extent(const char *filename, int64_t filesize, bool flat) + { +- int fd, i; ++ int ret, i; ++ int fd = 0; + VMDK4Header header; + uint32_t tmp, magic, grains, gd_size, gt_size, gt_count; +- static const char desc_template[] = +- "# Disk DescriptorFile\n" +- "version=1\n" +- "CID=%x\n" +- "parentCID=ffffffff\n" +- "createType=\"monolithicSparse\"\n" +- "\n" +- "# Extent description\n" +- "RW %" PRId64 " SPARSE \"%s\"\n" +- "\n" +- "# The Disk Data Base \n" +- "#DDB\n" +- "\n" +- "ddb.virtualHWVersion = \"%d\"\n" +- "ddb.geometry.cylinders = \"%" PRId64 "\"\n" +- "ddb.geometry.heads = \"16\"\n" +- "ddb.geometry.sectors = \"63\"\n" +- "ddb.adapterType = \"ide\"\n"; +- char desc[1024]; +- const char *real_filename, *temp_str; +- int64_t total_size = 0; +- const char *backing_file = NULL; +- int flags = 0; +- int ret; + +- // Read out options +- while (options && options->name) { +- if (!strcmp(options->name, BLOCK_OPT_SIZE)) { +- total_size = options->value.n / 512; +- } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { +- backing_file = options->value.s; +- } else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) { +- flags |= options->value.n ? BLOCK_FLAG_COMPAT6: 0; +- } +- options++; ++ fd = open( ++ filename, ++ O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, ++ 0644); ++ if (fd < 0) { ++ return -errno; + } +- +- /* XXX: add support for backing file */ +- if (backing_file) { +- return vmdk_snapshot_create(filename, backing_file); ++ if (flat) { ++ ret = ftruncate(fd, filesize); ++ if (ret < 0) { ++ ret = -errno; ++ } ++ goto exit; + } +- +- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, +- 0644); +- if (fd < 0) +- return -errno; + magic = cpu_to_be32(VMDK4_MAGIC); + memset(&header, 0, sizeof(header)); + header.version = 1; + header.flags = 3; /* ?? */ +- header.capacity = total_size; ++ header.capacity = filesize / 512; + header.granularity = 128; + header.num_gtes_per_gte = 512; + +- grains = (total_size + header.granularity - 1) / header.granularity; ++ grains = (filesize / 512 + header.granularity - 1) / header.granularity; + gt_size = ((header.num_gtes_per_gte * sizeof(uint32_t)) + 511) >> 9; +- gt_count = (grains + header.num_gtes_per_gte - 1) / header.num_gtes_per_gte; ++ gt_count = ++ (grains + header.num_gtes_per_gte - 1) / header.num_gtes_per_gte; + gd_size = (gt_count * sizeof(uint32_t) + 511) >> 9; + + header.desc_offset = 1; +@@ -1130,7 +941,6 @@ static int vmdk_create(const char *filen + ((header.gd_offset + gd_size + (gt_size * gt_count) + + header.granularity - 1) / header.granularity) * + header.granularity; +- + /* swap endianness for all header fields */ + header.version = cpu_to_le32(header.version); + header.flags = cpu_to_le32(header.flags); +@@ -1188,27 +998,255 @@ static int vmdk_create(const char *filen + } + } + +- /* compose the descriptor */ +- real_filename = filename; +- if ((temp_str = strrchr(real_filename, '\\')) != NULL) +- real_filename = temp_str + 1; +- if ((temp_str = strrchr(real_filename, '/')) != NULL) +- real_filename = temp_str + 1; +- if ((temp_str = strrchr(real_filename, ':')) != NULL) +- real_filename = temp_str + 1; +- snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL), +- total_size, real_filename, +- (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), +- total_size / (int64_t)(63 * 16)); ++ ret = 0; ++ exit: ++ close(fd); ++ return ret; ++} + +- /* write the descriptor */ +- lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); ++static int filename_decompose(const char *filename, char *path, char *prefix, ++ char *postfix, size_t buf_len) ++{ ++ const char *p, *q; ++ ++ if (filename == NULL || !strlen(filename)) { ++ fprintf(stderr, "Vmdk: no filename provided.\n"); ++ return -1; ++ } ++ p = strrchr(filename, '/'); ++ if (p == NULL) { ++ p = strrchr(filename, '\\'); ++ } ++ if (p == NULL) { ++ p = strrchr(filename, ':'); ++ } ++ if (p != NULL) { ++ p++; ++ if (p - filename >= buf_len) { ++ return -1; ++ } ++ pstrcpy(path, p - filename + 1, filename); ++ } else { ++ p = filename; ++ path[0] = '\0'; ++ } ++ q = strrchr(p, '.'); ++ if (q == NULL) { ++ pstrcpy(prefix, buf_len, p); ++ postfix[0] = '\0'; ++ } else { ++ if (q - p >= buf_len) { ++ return -1; ++ } ++ pstrcpy(prefix, q - p + 1, p); ++ pstrcpy(postfix, buf_len, q); ++ } ++ return 0; ++} ++ ++static int relative_path(char *dest, int dest_size, ++ const char *base, const char *target) ++{ ++ int i = 0; ++ int n = 0; ++ const char *p, *q; ++#ifdef _WIN32 ++ const char *sep = "\\"; ++#else ++ const char *sep = "/"; ++#endif ++ ++ if (!(dest && base && target)) { ++ return -1; ++ } ++ if (path_is_absolute(target)) { ++ dest[dest_size - 1] = '\0'; ++ strncpy(dest, target, dest_size - 1); ++ return 0; ++ } ++ while (base[i] == target[i]) { ++ i++; ++ } ++ p = &base[i]; ++ q = &target[i]; ++ while (*p) { ++ if (*p == *sep) { ++ n++; ++ } ++ p++; ++ } ++ dest[0] = '\0'; ++ for (; n; n--) { ++ pstrcat(dest, dest_size, ".."); ++ pstrcat(dest, dest_size, sep); ++ } ++ pstrcat(dest, dest_size, q); ++ return 0; ++} ++ ++static int vmdk_create(const char *filename, QEMUOptionParameter *options) ++{ ++ int fd, idx = 0; ++ char desc[BUF_SIZE]; ++ int64_t total_size = 0, filesize; ++ const char *backing_file = NULL; ++ const char *fmt = NULL; ++ int flags = 0; ++ int ret = 0; ++ bool flat, split; ++ char ext_desc_lines[BUF_SIZE] = ""; ++ char path[PATH_MAX], prefix[PATH_MAX], postfix[PATH_MAX]; ++ const int64_t split_size = 0x80000000; /* VMDK has constant split size */ ++ const char *desc_extent_line; ++ char parent_desc_line[BUF_SIZE] = ""; ++ uint32_t parent_cid = 0xffffffff; ++ const char desc_template[] = ++ "# Disk DescriptorFile\n" ++ "version=1\n" ++ "CID=%x\n" ++ "parentCID=%x\n" ++ "createType=\"%s\"\n" ++ "%s" ++ "\n" ++ "# Extent description\n" ++ "%s" ++ "\n" ++ "# The Disk Data Base\n" ++ "#DDB\n" ++ "\n" ++ "ddb.virtualHWVersion = \"%d\"\n" ++ "ddb.geometry.cylinders = \"%" PRId64 "\"\n" ++ "ddb.geometry.heads = \"16\"\n" ++ "ddb.geometry.sectors = \"63\"\n" ++ "ddb.adapterType = \"ide\"\n"; ++ ++ if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) { ++ return -EINVAL; ++ } ++ /* Read out options */ ++ while (options && options->name) { ++ if (!strcmp(options->name, BLOCK_OPT_SIZE)) { ++ total_size = options->value.n; ++ } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { ++ backing_file = options->value.s; ++ } else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) { ++ flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0; ++ } else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) { ++ fmt = options->value.s; ++ } ++ options++; ++ } ++ if (!fmt) { ++ /* Default format to monolithicSparse */ ++ fmt = "monolithicSparse"; ++ } else if (strcmp(fmt, "monolithicFlat") && ++ strcmp(fmt, "monolithicSparse") && ++ strcmp(fmt, "twoGbMaxExtentSparse") && ++ strcmp(fmt, "twoGbMaxExtentFlat")) { ++ fprintf(stderr, "VMDK: Unknown subformat: %s\n", fmt); ++ return -EINVAL; ++ } ++ split = !(strcmp(fmt, "twoGbMaxExtentFlat") && ++ strcmp(fmt, "twoGbMaxExtentSparse")); ++ flat = !(strcmp(fmt, "monolithicFlat") && ++ strcmp(fmt, "twoGbMaxExtentFlat")); ++ if (flat) { ++ desc_extent_line = "RW %lld FLAT \"%s\" 0\n"; ++ } else { ++ desc_extent_line = "RW %lld SPARSE \"%s\"\n"; ++ } ++ if (flat && backing_file) { ++ /* not supporting backing file for flat image */ ++ return -ENOTSUP; ++ } ++ if (backing_file) { ++ char parent_filename[PATH_MAX]; ++ BlockDriverState *bs = bdrv_new(""); ++ ret = bdrv_open(bs, backing_file, 0, NULL); ++ if (ret != 0) { ++ bdrv_delete(bs); ++ return ret; ++ } ++ if (strcmp(bs->drv->format_name, "vmdk")) { ++ bdrv_delete(bs); ++ return -EINVAL; ++ } ++ filesize = bdrv_getlength(bs); ++ parent_cid = vmdk_read_cid(bs, 0); ++ bdrv_delete(bs); ++ relative_path(parent_filename, sizeof(parent_filename), ++ filename, backing_file); ++ snprintf(parent_desc_line, sizeof(parent_desc_line), ++ "parentFileNameHint=\"%s\"", parent_filename); ++ } ++ ++ /* Create extents */ ++ filesize = total_size; ++ while (filesize > 0) { ++ char desc_line[BUF_SIZE]; ++ char ext_filename[PATH_MAX]; ++ char desc_filename[PATH_MAX]; ++ int64_t size = filesize; ++ ++ if (split && size > split_size) { ++ size = split_size; ++ } ++ if (split) { ++ snprintf(desc_filename, sizeof(desc_filename), "%s-%c%03d%s", ++ prefix, flat ? 'f' : 's', ++idx, postfix); ++ } else if (flat) { ++ snprintf(desc_filename, sizeof(desc_filename), "%s-flat%s", ++ prefix, postfix); ++ } else { ++ snprintf(desc_filename, sizeof(desc_filename), "%s%s", ++ prefix, postfix); ++ } ++ snprintf(ext_filename, sizeof(ext_filename), "%s%s", ++ path, desc_filename); ++ ++ if (vmdk_create_extent(ext_filename, size, flat)) { ++ return -EINVAL; ++ } ++ filesize -= size; ++ ++ /* Format description line */ ++ snprintf(desc_line, sizeof(desc_line), ++ desc_extent_line, size / 512, desc_filename); ++ pstrcat(ext_desc_lines, sizeof(ext_desc_lines), desc_line); ++ } ++ /* generate descriptor file */ ++ snprintf(desc, sizeof(desc), desc_template, ++ (unsigned int)time(NULL), ++ parent_cid, ++ fmt, ++ parent_desc_line, ++ ext_desc_lines, ++ (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), ++ total_size / (int64_t)(63 * 16 * 512)); ++ if (split || flat) { ++ fd = open( ++ filename, ++ O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, ++ 0644); ++ } else { ++ fd = open( ++ filename, ++ O_WRONLY | O_BINARY | O_LARGEFILE, ++ 0644); ++ } ++ if (fd < 0) { ++ return -errno; ++ } ++ /* the descriptor offset = 0x200 */ ++ if (!split && !flat && 0x200 != lseek(fd, 0x200, SEEK_SET)) { ++ ret = -errno; ++ goto exit; ++ } + ret = qemu_write_full(fd, desc, strlen(desc)); + if (ret != strlen(desc)) { + ret = -errno; + goto exit; + } +- + ret = 0; + exit: + close(fd); +@@ -1252,6 +1290,13 @@ static QEMUOptionParameter vmdk_create_o + .type = OPT_FLAG, + .help = "VMDK version 6 image" + }, ++ { ++ .name = BLOCK_OPT_SUBFMT, ++ .type = OPT_STRING, ++ .help = ++ "VMDK flat extent format, can be one of " ++ "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat} " ++ }, + { NULL } + }; + +--- a/block_int.h ++++ b/block_int.h +@@ -39,6 +39,7 @@ + #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" + #define BLOCK_OPT_TABLE_SIZE "table_size" + #define BLOCK_OPT_PREALLOC "preallocation" ++#define BLOCK_OPT_SUBFMT "subformat" + + typedef struct AIOPool { + void (*cancel)(BlockDriverAIOCB *acb); diff --git a/tools/qemu/patches/0012-vmdk-Allow-selecting-SCSI-adapter-in-image-creation.patch b/tools/qemu/patches/0012-vmdk-Allow-selecting-SCSI-adapter-in-image-creation.patch new file mode 100644 index 0000000000..fc3dee361e --- /dev/null +++ b/tools/qemu/patches/0012-vmdk-Allow-selecting-SCSI-adapter-in-image-creation.patch @@ -0,0 +1,114 @@ +From 5483df4df2729a5d1e4888a48039b1cd90438480 Mon Sep 17 00:00:00 2001 +From: Othmar Pasteka +Date: Wed, 30 Jan 2013 00:26:52 +0100 +Subject: [PATCH 12/12] vmdk: Allow selecting SCSI adapter in image creation + +Introduce a new option "adapter_type" when converting to vmdk images. +It can be one of the following: ide (default), buslogic, lsilogic +or legacyESX (according to the vmdk spec from vmware). + +In case of a non-ide adapter, heads is set to 255 instead of the 16. +The latter is used for "ide". + +Also see LP#545089 + +Signed-off-by: Othmar Pasteka +Signed-off-by: Stefan Hajnoczi +--- + block/vmdk.c | 31 ++++++++++++++++++++++++++++--- + block_int.h | 1 + + 2 files changed, 29 insertions(+), 3 deletions(-) + +--- a/block/vmdk.c ++++ b/block/vmdk.c +@@ -1089,6 +1089,7 @@ static int vmdk_create(const char *filen + int fd, idx = 0; + char desc[BUF_SIZE]; + int64_t total_size = 0, filesize; ++ const char *adapter_type = NULL; + const char *backing_file = NULL; + const char *fmt = NULL; + int flags = 0; +@@ -1100,6 +1101,7 @@ static int vmdk_create(const char *filen + const char *desc_extent_line; + char parent_desc_line[BUF_SIZE] = ""; + uint32_t parent_cid = 0xffffffff; ++ uint32_t number_heads = 16; + const char desc_template[] = + "# Disk DescriptorFile\n" + "version=1\n" +@@ -1116,9 +1118,9 @@ static int vmdk_create(const char *filen + "\n" + "ddb.virtualHWVersion = \"%d\"\n" + "ddb.geometry.cylinders = \"%" PRId64 "\"\n" +- "ddb.geometry.heads = \"16\"\n" ++ "ddb.geometry.heads = \"%d\"\n" + "ddb.geometry.sectors = \"63\"\n" +- "ddb.adapterType = \"ide\"\n"; ++ "ddb.adapterType = \"%s\"\n"; + + if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) { + return -EINVAL; +@@ -1127,6 +1129,8 @@ static int vmdk_create(const char *filen + while (options && options->name) { + if (!strcmp(options->name, BLOCK_OPT_SIZE)) { + total_size = options->value.n; ++ } else if (!strcmp(options->name, BLOCK_OPT_ADAPTER_TYPE)) { ++ adapter_type = options->value.s; + } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { + backing_file = options->value.s; + } else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) { +@@ -1136,6 +1140,20 @@ static int vmdk_create(const char *filen + } + options++; + } ++ if (!adapter_type) { ++ adapter_type = "ide"; ++ } else if (strcmp(adapter_type, "ide") && ++ strcmp(adapter_type, "buslogic") && ++ strcmp(adapter_type, "lsilogic") && ++ strcmp(adapter_type, "legacyESX")) { ++ fprintf(stderr, "VMDK: Unknown adapter type: '%s'.\n", adapter_type); ++ return -EINVAL; ++ } ++ if (strcmp(adapter_type, "ide") != 0) { ++ /* that's the number of heads with which vmware operates when ++ creating, exporting, etc. vmdk files with a non-ide adapter type */ ++ number_heads = 255; ++ } + if (!fmt) { + /* Default format to monolithicSparse */ + fmt = "monolithicSparse"; +@@ -1222,7 +1240,8 @@ static int vmdk_create(const char *filen + parent_desc_line, + ext_desc_lines, + (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), +- total_size / (int64_t)(63 * 16 * 512)); ++ total_size / (int64_t)(63 * number_heads * 512), number_heads, ++ adapter_type); + if (split || flat) { + fd = open( + filename, +@@ -1281,6 +1300,12 @@ static QEMUOptionParameter vmdk_create_o + .help = "Virtual disk size" + }, + { ++ .name = BLOCK_OPT_ADAPTER_TYPE, ++ .type = OPT_STRING, ++ .help = "Virtual adapter type, can be one of " ++ "ide (default), lsilogic, buslogic or legacyESX" ++ }, ++ { + .name = BLOCK_OPT_BACKING_FILE, + .type = OPT_STRING, + .help = "File name of a base image" +--- a/block_int.h ++++ b/block_int.h +@@ -40,6 +40,7 @@ + #define BLOCK_OPT_TABLE_SIZE "table_size" + #define BLOCK_OPT_PREALLOC "preallocation" + #define BLOCK_OPT_SUBFMT "subformat" ++#define BLOCK_OPT_ADAPTER_TYPE "adapter_type" + + typedef struct AIOPool { + void (*cancel)(BlockDriverAIOCB *acb); From 6041eb9547be49edaa6c2ecd5dd77e8a9e067244 Mon Sep 17 00:00:00 2001 From: John Sommerville Date: Fri, 27 Sep 2019 14:09:10 -0600 Subject: [PATCH 095/480] build: build proper VMDK formats for ESXI 6.5 VMWare ESXI 6.5 and above is not compatible with subformat=monolithicSparse (The default qemu-img convert -O VMDK option). Monolithic Sparse vmdk can be imported, but issues occur when running sysupgrade with new images and other tasks that modify the file system (issues like Kernel panics, reboot loops, sometimes crashing the Host ESXI box). This change creates an additional VMDK output file for ESXI that sets the subformat to monlithicFlat, and the adapter_type to the SCSI lsilogic controller. This change existed back on: 25e36d379e73d64d6316fae9dc841c5ef28980f1 But it looks like the change was removed when refactoring occurred with: 5f6a2732f892b6229473576d89cc963ae9c97d5d Signed-off-by: John Sommerville --- target/linux/x86/image/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 4383bcdcb2..eb0db417a3 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -133,6 +133,12 @@ ifneq ($(CONFIG_VMDK_IMAGES),) $(STAGING_DIR_HOST)/bin/qemu-img convert -f raw -O vmdk \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk + #build the ESXI VMDK with + rm $(BIN_DIR)/$(IMG_COMBINED)-$(1)-esxi.vmdk || true + rm $(BIN_DIR)/$(IMG_COMBINED)-$(1)-esxi-flat.vmdk || true + $(STAGING_DIR_HOST)/bin/qemu-img convert -f raw -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat \ + $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ + $(BIN_DIR)/$(IMG_COMBINED)-$(1)-esxi.vmdk endef endif From fd211e1677fc653feeef6b0b8b8e8659ac274b3c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 13 Dec 2019 21:25:03 -0800 Subject: [PATCH 096/480] iperf: Fix compilation with libcxx Avoids redefining bool. Signed-off-by: Rosen Penev --- package/network/utils/iperf/Makefile | 2 +- package/network/utils/iperf/patches/010-libcxx.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 package/network/utils/iperf/patches/010-libcxx.patch diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile index 33d00b43d7..3a235fadc7 100644 --- a/package/network/utils/iperf/Makefile +++ b/package/network/utils/iperf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf PKG_VERSION:=2.0.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad diff --git a/package/network/utils/iperf/patches/010-libcxx.patch b/package/network/utils/iperf/patches/010-libcxx.patch new file mode 100644 index 0000000000..cf0124232f --- /dev/null +++ b/package/network/utils/iperf/patches/010-libcxx.patch @@ -0,0 +1,12 @@ +--- a/config.h.in ++++ b/config.h.in +@@ -360,7 +360,9 @@ + #undef _REENTRANT + + /* */ ++#ifndef __cplusplus + #undef bool ++#endif + + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const From 856ea2bad3b3eac565215c0ac79f37a4ba4cd5b7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 13 Dec 2019 21:07:04 -0800 Subject: [PATCH 097/480] libcxx: Add package Currently in OpenWrt, there are two libc++: libstdcpp and uClibc++. The former is huge and the latter supports only C++98 with some basic support for C++11. Those C++ versions seem to be specific to the compiler version libcxx supports C++11 and above while being much smaller than libstdcpp. On mt7621, these are the sizes of the ipks that I get: libstdcpp: 460786 libcxx: 182881 uClibc++:67720 libcxx is faster than uClibc++ and is under active development as part of the LLVM project while uClibc++ is effectively dead. This PR modifies uclibc++.mk to expose the make menuconfig option. Further cleanup is beyond the scope of this PR. What that means is, this is not used by default. A g++-libcxx wrapper based on the uClibc++ one was added. Works the same way. Compile tested with all packages that use uclibc++.mk in their Makefiles under mipsel_24kc. kismet fails compilation but that package needs to be cleaned up and updated. Runtime tested with gddrescue, gdisk, dcwapd, bonnie++, and aircrack-ng on a TP-Link Archer C7v2. Signed-off-by: Rosen Penev --- config/Config-build.in | 3 ++ include/uclibc++.mk | 12 +++++- package/libs/libcxx/Makefile | 62 ++++++++++++++++++++++++++++ package/libs/libcxx/files/g++-libcxx | 19 +++++++++ 4 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 package/libs/libcxx/Makefile create mode 100755 package/libs/libcxx/files/g++-libcxx diff --git a/config/Config-build.in b/config/Config-build.in index 872e5c12ab..bde5730e76 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -197,6 +197,9 @@ menu "Global build settings" config USE_UCLIBCXX bool "uClibc++" + config USE_LIBCXX + bool "libc++" + config USE_LIBSTDCXX bool "libstdc++" endchoice diff --git a/include/uclibc++.mk b/include/uclibc++.mk index a1a61f26d4..27533279c9 100644 --- a/include/uclibc++.mk +++ b/include/uclibc++.mk @@ -4,8 +4,8 @@ ifndef DUMP endif endif -PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX -CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp +PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX CONFIG_USE_LIBCXX +CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBCXX:libcxx +USE_LIBSTDCXX:libstdcpp ifneq ($(CONFIG_USE_UCLIBCXX),) ifneq ($(CONFIG_CCACHE),) @@ -14,3 +14,11 @@ ifneq ($(CONFIG_USE_UCLIBCXX),) TARGET_CXX=g++-uc endif endif + +ifneq ($(CONFIG_USE_LIBCXX),) + ifneq ($(CONFIG_CCACHE),) + TARGET_CXX_NOCACHE=g++-libcxx + else + TARGET_CXX=g++-libcxx + endif +endif diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile new file mode 100644 index 0000000000..c1fa1d6b07 --- /dev/null +++ b/package/libs/libcxx/Makefile @@ -0,0 +1,62 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libcxx +PKG_VERSION:=9.0.1 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://git.llvm.org/git/libcxx +PKG_SOURCE_VERSION:=2076f539f410805ef88692b9c0ce0a0b882a7680 +PKG_MIRROR_HASH:=6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39 + +PKG_MAINTAINER:=Rosen Penev +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE.txt + +PKG_BUILD_PARALLEL:=1 +CMAKE_BINARY_SUBDIR:=build + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/libcxx + SECTION:=libs + CATEGORY:=Libraries + TITLE:=LLVM libstdc++ + URL:=https://libcxx.llvm.org/ + DEPENDS:=+libatomic +libpthread +endef + +define Package/libcxx/description + LLVM C++ library targeting C++11 and above +endef + +CMAKE_OPTIONS += \ + -DLIBCXX_ENABLE_ASSERTIONS=OFF \ + -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \ + -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ + -DLIBCXX_INCLUDE_DOCS=OFF \ + -DLIBCXX_INCLUDE_TESTS=OFF \ + -DLIBCXX_HAS_MUSL_LIBC=ON \ + -DLIBCXX_STANDALONE_BUILD=ON + +TARGET_CXXFLAGS += -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -Wno-attributes -flto +TARGET_LDFLAGS += -Wl,--as-needed + +define Build/InstallDev + $(call Build/InstallDev/cmake,$(1)) + $(CP) files/g++-libcxx $(TOOLCHAIN_DIR)/bin/ + $(SED) 's,CXX,$(TARGET_CXX),g' $(TOOLCHAIN_DIR)/bin/g++-libcxx +endef + +define Package/libcxx/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libc++.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libcxx)) diff --git a/package/libs/libcxx/files/g++-libcxx b/package/libs/libcxx/files/g++-libcxx new file mode 100755 index 0000000000..81ca46eb0e --- /dev/null +++ b/package/libs/libcxx/files/g++-libcxx @@ -0,0 +1,19 @@ +#!/bin/sh + +WRAPPER_INCLUDEDIR="-I$STAGING_DIR/usr/include/c++/v1" +WRAPPER_LIBDIR="-L$STAGING_DIR/usr/lib" +WRAPPER_LIBS="-lc -lgcc_s -lssp_nonshared" + +WRAPPER_OPTIONS="" +WRAPPER_INCLIB="Y" +for arg +do + case "$arg" in + -c|-E|-S) WRAPPER_INCLIB="N" ;; + -static) [ "$WRAPPER_LIBS" != "-lc -lgcc_s -lssp_nonshared -lgcc_eh" ] && WRAPPER_LIBS="-lc -lgcc_s -lssp_nonshared -lgcc_eh" ;; + esac +done +[ "$WRAPPER_INCLIB" = "Y" ] && WRAPPER_OPTIONS="-nodefaultlibs $WRAPPER_LIBDIR -lc++ -lsupc++ $WRAPPER_LIBS" + +exec CXX -fno-builtin -nostdinc++ -DGCC_HASCLASSVISIBILITY "$WRAPPER_INCLUDEDIR" "$@" $WRAPPER_OPTIONS + From dd299805ad18472a8245b4524a25e4381e166057 Mon Sep 17 00:00:00 2001 From: Maxim Storchak Date: Thu, 12 Dec 2019 12:02:19 +0200 Subject: [PATCH 098/480] ca-certificates: provide ca-certs by both ca-certificates and ca-bundle - both packages provide ca-certs - make ca-bundle the default provider This should allow easy transition between these two forms of CA certificates storage Signed-off-by: Maxim Storchak --- package/system/ca-certificates/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index f449645c77..ea7d253fa2 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates PKG_VERSION:=20190110 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:= PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz @@ -24,6 +24,7 @@ define Package/ca-certificates CATEGORY:=Base system TITLE:=System CA certificates PKGARCH:=all + PROVIDES:=ca-certs endef define Package/ca-bundle @@ -31,6 +32,7 @@ define Package/ca-bundle CATEGORY:=Base system TITLE:=System CA certificates as a bundle PKGARCH:=all + PROVIDES:=ca-certs endef define Build/Install @@ -59,5 +61,5 @@ define Package/ca-bundle/install cat $(PKG_INSTALL_DIR)/usr/share/ca-certificates/*/*.crt >$(1)/etc/ssl/certs/ca-certificates.crt $(LN) /etc/ssl/certs/ca-certificates.crt $(1)/etc/ssl/cert.pem endef -$(eval $(call BuildPackage,ca-certificates)) $(eval $(call BuildPackage,ca-bundle)) +$(eval $(call BuildPackage,ca-certificates)) From d034a1f4577108a465e8347d11a51dc0e5a29298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Tue, 19 Nov 2019 14:37:24 +0100 Subject: [PATCH 099/480] adb: fix for SuperSpeed devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The USB descriptor parsing in adb fails to detect SuperSpeed devices because of the SuperSpeed Endpoint Companion Descriptor. This cherry-picks the upstream fix for the problem. Unfortunately there never were a release with this fix before the conversion to C++, so upgrading to a newer version isn't an option. This makes adb work with SuperSpeed devices like the Sierra Wireless EM7565. Tested and verified. Signed-off-by: Bjørn Mork --- package/utils/adb/Makefile | 2 +- .../adb/patches/001-create_Makefile.patch | 2 +- .../020-cherry-picked-superspeed-fix.patch | 39 +++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 package/utils/adb/patches/020-cherry-picked-superspeed-fix.patch diff --git a/package/utils/adb/Makefile b/package/utils/adb/Makefile index 7be8ee9a1c..0482a40da1 100644 --- a/package/utils/adb/Makefile +++ b/package/utils/adb/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adb PKG_VERSION:=android.5.0.2_r1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://android.googlesource.com/platform/system/core diff --git a/package/utils/adb/patches/001-create_Makefile.patch b/package/utils/adb/patches/001-create_Makefile.patch index be9f5f497a..d7fa00cb4c 100644 --- a/package/utils/adb/patches/001-create_Makefile.patch +++ b/package/utils/adb/patches/001-create_Makefile.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ b/adb/Makefile 2016-10-19 15:28:03.421194137 +0200 ++++ b/adb/Makefile @@ -0,0 +1,42 @@ +SRCS+= adb.c +SRCS+= adb_auth_host.c diff --git a/package/utils/adb/patches/020-cherry-picked-superspeed-fix.patch b/package/utils/adb/patches/020-cherry-picked-superspeed-fix.patch new file mode 100644 index 0000000000..4dbcc58056 --- /dev/null +++ b/package/utils/adb/patches/020-cherry-picked-superspeed-fix.patch @@ -0,0 +1,39 @@ +From 58b01e01875e2f6ae593ded197430bc23713dd0a Mon Sep 17 00:00:00 2001 +From: Ingo Rohloff +Date: Fri, 16 May 2014 21:51:41 +0200 +Subject: [PATCH] ADB on linux: Handle USB SuperSpeed extra Descriptors + +Under Linux, ADB manually parses USB Descriptors to check for +possible ADB USB Interfaces. USB Devices connected with SuperSpeed +will exhibit extra USB SuperSpeed Endpoint Companion Descriptors. +This patch handles these USB SuperSpeed specific USB Descriptors. + +Change-Id: Icd1e5fdde0b324c7df4f933583499f2c52a922f3 +Signed-off-by: Ingo Rohloff +--- + adb/usb_linux.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/adb/usb_linux.c ++++ b/adb/usb_linux.c +@@ -238,8 +238,20 @@ static void find_usb_device(const char * + // looks like ADB... + ep1 = (struct usb_endpoint_descriptor *)bufptr; + bufptr += USB_DT_ENDPOINT_SIZE; ++ // For USB 3.0 SuperSpeed devices, skip potential ++ // USB 3.0 SuperSpeed Endpoint Companion descriptor ++ if (bufptr+2 <= devdesc + desclength && ++ bufptr[0] == USB_DT_SS_EP_COMP_SIZE && ++ bufptr[1] == USB_DT_SS_ENDPOINT_COMP) { ++ bufptr += USB_DT_SS_EP_COMP_SIZE; ++ } + ep2 = (struct usb_endpoint_descriptor *)bufptr; + bufptr += USB_DT_ENDPOINT_SIZE; ++ if (bufptr+2 <= devdesc + desclength && ++ bufptr[0] == USB_DT_SS_EP_COMP_SIZE && ++ bufptr[1] == USB_DT_SS_ENDPOINT_COMP) { ++ bufptr += USB_DT_SS_EP_COMP_SIZE; ++ } + + if (bufptr > devdesc + desclength || + ep1->bLength != USB_DT_ENDPOINT_SIZE || From 383abffb1179a142b4c8f86559baad5b24d391c3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Nov 2019 13:42:04 -0800 Subject: [PATCH 100/480] cmake: Install host packages to lib instead of lib64 Several CMake packages such as log4cplus and protobuf(-c) install to lib64 instead of lib on some hosts. This completely breaks rpath linking. Override it globally to avoid fixing each package individually. Signed-off-by: Rosen Penev Tested-by: Sebastian Kemper --- include/cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/cmake.mk b/include/cmake.mk index b66665d20a..a5ba7d31bf 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -103,6 +103,7 @@ define Host/Configure/Default -DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \ -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \ -DCMAKE_SKIP_RPATH=TRUE \ + -DCMAKE_INSTALL_LIBDIR=lib \ $(CMAKE_HOST_OPTIONS) \ $(HOST_CMAKE_SOURCE_DIR) \ ) From 432ec292ccc8b634facacbd018d08947d204225a Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 7 Nov 2019 14:31:29 +0100 Subject: [PATCH 101/480] rpcd: add respawn param The rpcd service is an important service, but if the service stops working for any reason, no one will ever respawn that service. With this commit, the procd service will monitor if the rpcd service is running. If the rpcd service has crashed, then procd respawns the rpcd service. Signed-off-by: Florian Eckert --- package/system/rpcd/Makefile | 2 +- package/system/rpcd/files/rpcd.init | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 853554b5a0..653c859ba1 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git diff --git a/package/system/rpcd/files/rpcd.init b/package/system/rpcd/files/rpcd.init index 447133c67a..3e9ea5bbf3 100755 --- a/package/system/rpcd/files/rpcd.init +++ b/package/system/rpcd/files/rpcd.init @@ -12,6 +12,7 @@ start_service() { procd_open_instance procd_set_param command "$PROG" ${socket:+-s "$socket"} ${timeout:+-t "$timeout"} + procd_set_param respawn ${respawn_retry:-0} procd_close_instance } From a22b7a60d98836343c4f7b9ec0fcae68d9131522 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Fri, 6 Dec 2019 23:25:48 +0900 Subject: [PATCH 102/480] kernel: fix *-gpio-custom module unloading Unloading and reloading the modules fails, as platform_device_put() does not release resources fully. root@OpenWrt:/# insmod i2c-gpio-custom bus0=0,18,0,5 [ 196.860620] Custom GPIO-based I2C driver version 0.1.1 [ 196.871162] ------------[ cut here ]------------ [ 196.880517] WARNING: CPU: 0 PID: 1365 at fs/sysfs/dir.c:31 0x80112158 [ 196.893431] sysfs: cannot create duplicate filename '/devices/platform/i2c-gpio.0' ... [ 197.513200] kobject_add_internal failed for i2c-gpio.0 with -EEXIST, don't try to register things with the same name in the same directory. This patch fixes it by replacing platform_device_put() to platform_device_unregister(). Fixes: da7740853715 ("i2c-gpio-custom: minor bugfix") Fixes: 3bc81edc70e8 ("package: fix w1-gpio-custom package (closes #6770)") Signed-off-by: Sungbo Eo --- package/kernel/i2c-gpio-custom/Makefile | 2 +- package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c | 4 ++-- package/kernel/w1-gpio-custom/Makefile | 2 +- package/kernel/w1-gpio-custom/src/w1-gpio-custom.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kernel/i2c-gpio-custom/Makefile b/package/kernel/i2c-gpio-custom/Makefile index a0b86cc7ef..4891423d5c 100644 --- a/package/kernel/i2c-gpio-custom/Makefile +++ b/package/kernel/i2c-gpio-custom/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=i2c-gpio-custom -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c b/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c index f9917e52fd..23dfa36d69 100644 --- a/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c +++ b/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c @@ -56,7 +56,7 @@ #define DRV_NAME "i2c-gpio-custom" #define DRV_DESC "Custom GPIO-based I2C driver" -#define DRV_VERSION "0.1.1" +#define DRV_VERSION "0.1.2" #define PFX DRV_NAME ": " @@ -101,7 +101,7 @@ static void i2c_gpio_custom_cleanup(void) for (i = 0; i < nr_devices; i++) if (devices[i]) - platform_device_put(devices[i]); + platform_device_unregister(devices[i]); } static int __init i2c_gpio_custom_add_one(unsigned int id, unsigned int *params) diff --git a/package/kernel/w1-gpio-custom/Makefile b/package/kernel/w1-gpio-custom/Makefile index 662f65f001..021791ff94 100644 --- a/package/kernel/w1-gpio-custom/Makefile +++ b/package/kernel/w1-gpio-custom/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=w1-gpio-custom -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c b/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c index 004c9240ba..6928769975 100644 --- a/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c +++ b/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c @@ -47,7 +47,7 @@ #define DRV_NAME "w1-gpio-custom" #define DRV_DESC "Custom GPIO-based W1 driver" -#define DRV_VERSION "0.1.1" +#define DRV_VERSION "0.1.2" #define PFX DRV_NAME ": " @@ -86,7 +86,7 @@ static void w1_gpio_custom_cleanup(void) for (i = 0; i < nr_devices; i++) if (devices[i]) - platform_device_put(devices[i]); + platform_device_unregister(devices[i]); } static int __init w1_gpio_custom_add_one(unsigned int id, unsigned int *params) From e4ce3109f28712dad3b3db27938a7b853346d9b6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 22 Dec 2019 21:26:01 +0100 Subject: [PATCH 103/480] ramips: simplify state_default/pinctrl0 in device DTS files The node pinctrl0 is already set up in the SOC DTSI files, but defined again as member of pinctrl in most of the device DTS(I) files. This patch removes this redundancy for the entire ramips target. Signed-off-by: Adrian Schmutzler --- .../ramips/dts/mt7620a_aigale_ai-br100.dts | 10 +-- .../dts/mt7620a_alfa-network_ac1200rm.dts | 10 +-- .../dts/mt7620a_alfa-network_r36m-e4g.dts | 10 +-- .../dts/mt7620a_alfa-network_tube-e4g.dts | 10 +-- .../linux/ramips/dts/mt7620a_asus_rp-n53.dts | 10 +-- .../ramips/dts/mt7620a_asus_rt-ac51u.dts | 10 +-- .../ramips/dts/mt7620a_bdcom_wap2100-sk.dts | 10 +-- .../ramips/dts/mt7620a_buffalo_whr-1166d.dts | 10 +-- .../ramips/dts/mt7620a_buffalo_whr-300hp2.dts | 10 +-- .../ramips/dts/mt7620a_buffalo_whr-600d.dts | 10 +-- .../ramips/dts/mt7620a_dlink_dch-m225.dts | 18 ++-- .../ramips/dts/mt7620a_dlink_dir-510l.dts | 10 +-- .../ramips/dts/mt7620a_dlink_dir-810l.dts | 10 +-- .../ramips/dts/mt7620a_dlink_dwr-118-a1.dts | 10 +-- .../ramips/dts/mt7620a_dlink_dwr-118-a2.dts | 10 +-- .../ramips/dts/mt7620a_dovado_tiny-ac.dts | 10 +-- .../dts/mt7620a_edimax_br-6478ac-v2.dts | 10 +-- .../ramips/dts/mt7620a_edimax_ew-7478apc.dts | 10 +-- .../ramips/dts/mt7620a_edimax_ew-747x.dtsi | 14 ++-- .../ramips/dts/mt7620a_engenius_esr600.dts | 13 +-- .../ramips/dts/mt7620a_glinet_gl-mt300a.dts | 10 +-- .../ramips/dts/mt7620a_glinet_gl-mt300n.dts | 10 +-- .../ramips/dts/mt7620a_glinet_gl-mt750.dts | 10 +-- .../dts/mt7620a_head-weblink_hdrm200.dts | 12 ++- .../ramips/dts/mt7620a_hiwifi_hc5x61.dtsi | 10 +-- target/linux/ramips/dts/mt7620a_hnet_c108.dts | 10 +-- .../ramips/dts/mt7620a_iodata_wn-ac1167gr.dts | 10 +-- .../ramips/dts/mt7620a_iodata_wn-ac733gr3.dts | 10 +-- .../ramips/dts/mt7620a_kimax_u25awf-h1.dts | 10 +-- .../ramips/dts/mt7620a_lava_lr-25g001.dts | 10 +-- .../ramips/dts/mt7620a_lenovo_newifi-y1.dtsi | 10 +-- .../ramips/dts/mt7620a_linksys_e1700.dts | 10 +-- .../dts/mt7620a_microduino_microwrt.dts | 10 +-- .../mt7620a_netgear_ex2700_wn3000rp-v3.dtsi | 10 +-- .../dts/mt7620a_netgear_ex3700_ex6130.dtsi | 10 +-- .../ramips/dts/mt7620a_ohyeah_oy-0001.dts | 10 +-- .../linux/ramips/dts/mt7620a_phicomm_k2g.dts | 10 +-- .../ramips/dts/mt7620a_phicomm_psg1208.dts | 10 +-- .../ramips/dts/mt7620a_phicomm_psg1218a.dts | 10 +-- .../ramips/dts/mt7620a_phicomm_psg1218b.dts | 10 +-- .../ramips/dts/mt7620a_planex_cs-qr10.dts | 18 ++-- .../ramips/dts/mt7620a_planex_db-wrt01.dts | 10 +-- .../ramips/dts/mt7620a_planex_mzk-750dhp.dts | 10 +-- .../ramips/dts/mt7620a_planex_mzk-ex300np.dts | 10 +-- .../ramips/dts/mt7620a_planex_mzk-ex750np.dts | 10 +-- .../ramips/dts/mt7620a_ralink_mt7620a-evb.dts | 10 +-- .../dts/mt7620a_ralink_mt7620a-mt7530-evb.dts | 10 +-- .../dts/mt7620a_ralink_mt7620a-v22sg-evb.dts | 10 +-- .../ramips/dts/mt7620a_sanlinking_d240.dts | 36 ++++---- .../ramips/dts/mt7620a_sercomm_na930.dts | 18 ++-- .../dts/mt7620a_tplink_archer-c2-v1.dts | 16 ++-- .../dts/mt7620a_tplink_archer-c20-v1.dts | 10 +-- .../ramips/dts/mt7620a_tplink_archer-c20i.dts | 10 +-- .../dts/mt7620a_tplink_archer-c50-v1.dts | 10 +-- .../dts/mt7620a_tplink_archer-mr200.dts | 10 +-- .../ramips/dts/mt7620a_xiaomi_miwifi-mini.dts | 10 +-- target/linux/ramips/dts/mt7620a_youku_yk1.dts | 10 +-- .../linux/ramips/dts/mt7620a_yukai_bocco.dts | 10 +-- .../dts/mt7620a_zbtlink_zbt-ape522ii.dts | 10 +-- .../dts/mt7620a_zbtlink_zbt-we1026.dtsi | 10 +-- .../dts/mt7620a_zbtlink_zbt-we826-e.dts | 10 +-- .../ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi | 10 +-- target/linux/ramips/dts/mt7620a_zte_q7.dts | 10 +-- .../dts/mt7620a_zyxel_keenetic-viva.dts | 10 +-- .../linux/ramips/dts/mt7620n_asus_rt-n12p.dts | 10 +-- .../linux/ramips/dts/mt7620n_asus_rt-n14u.dts | 10 +-- .../ramips/dts/mt7620n_buffalo_wmr-300.dts | 10 +-- .../ramips/dts/mt7620n_comfast_cf-wr800n.dts | 10 +-- .../ramips/dts/mt7620n_dlink_dwr-116-a1.dts | 10 +-- .../ramips/dts/mt7620n_dlink_dwr-921-c1.dts | 10 +-- .../ramips/dts/mt7620n_dlink_dwr-922-e2.dts | 10 +-- .../ramips/dts/mt7620n_elecom_wrh-300cr.dts | 10 +-- .../linux/ramips/dts/mt7620n_kimax_u35wf.dts | 10 +-- .../ramips/dts/mt7620n_kingston_mlw221.dts | 10 +-- .../ramips/dts/mt7620n_kingston_mlwg2.dts | 10 +-- .../linux/ramips/dts/mt7620n_nexx_wt3020.dtsi | 10 +-- .../ramips/dts/mt7620n_ravpower_wd03.dts | 10 +-- .../ramips/dts/mt7620n_vonets_var11n-300.dts | 10 +-- .../ramips/dts/mt7620n_wrtnode_wrtnode.dts | 10 +-- .../ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts | 10 +-- .../ramips/dts/mt7620n_zbtlink_zbt-wa05.dts | 10 +-- .../ramips/dts/mt7620n_zbtlink_zbt-we2026.dts | 10 +-- .../dts/mt7620n_zbtlink_zbt-wr8305rt.dts | 10 +-- .../dts/mt7620n_zyxel_keenetic-omni-ii.dts | 10 +-- .../dts/mt7620n_zyxel_keenetic-omni.dts | 10 +-- target/linux/ramips/dts/mt7621_adslr_g7.dts | 10 +-- .../ramips/dts/mt7621_afoundry_ew1200.dts | 10 +-- .../dts/mt7621_alfa-network_quad-e4g.dts | 10 +-- .../ramips/dts/mt7621_asiarf_ap7621.dtsi | 10 +-- .../linux/ramips/dts/mt7621_asus_rt-ac57u.dts | 10 +-- .../ramips/dts/mt7621_asus_rt-acx5p.dtsi | 10 +-- .../ramips/dts/mt7621_buffalo_wsr-1166dhp.dts | 10 +-- .../ramips/dts/mt7621_buffalo_wsr-600dhp.dts | 10 +-- .../ramips/dts/mt7621_d-team_newifi-d2.dts | 10 +-- .../linux/ramips/dts/mt7621_d-team_pbr-m1.dts | 10 +-- .../ramips/dts/mt7621_dlink_dir-860l-b1.dts | 10 +-- .../dts/mt7621_elecom_wrc-1167ghbk2-s.dts | 10 +-- .../ramips/dts/mt7621_elecom_wrc-gst.dtsi | 10 +-- .../ramips/dts/mt7621_firefly_firewrt.dts | 10 +-- .../ramips/dts/mt7621_gehua_ghl-r-001.dts | 10 +-- .../linux/ramips/dts/mt7621_gnubee_gb-pc1.dts | 10 +-- .../linux/ramips/dts/mt7621_gnubee_gb-pc2.dts | 10 +-- .../linux/ramips/dts/mt7621_hiwifi_hc5962.dts | 10 +-- .../ramips/dts/mt7621_iodata_wn-ax1167gr.dts | 10 +-- .../ramips/dts/mt7621_iodata_wn-gx300gr.dts | 10 +-- .../ramips/dts/mt7621_iodata_wnpr2600g.dts | 10 +-- .../ramips/dts/mt7621_lenovo_newifi-d1.dts | 10 +-- .../ramips/dts/mt7621_linksys_re6500.dts | 10 +-- .../dts/mt7621_mediatek_ap-mt7621a-v60.dts | 13 +-- .../dts/mt7621_mediatek_mt7621-eval-board.dts | 10 +-- .../ramips/dts/mt7621_mikrotik_rb750gr3.dts | 12 ++- .../ramips/dts/mt7621_mikrotik_rbm11g.dts | 10 +-- .../ramips/dts/mt7621_mikrotik_rbm33g.dts | 10 +-- .../linux/ramips/dts/mt7621_mqmaker_witi.dts | 10 +-- target/linux/ramips/dts/mt7621_mtc_wr1201.dts | 10 +-- .../ramips/dts/mt7621_netgear_ex6150.dts | 10 +-- .../dts/mt7621_netgear_sercomm_ayx.dtsi | 10 +-- .../dts/mt7621_netgear_sercomm_chj.dtsi | 10 +-- .../linux/ramips/dts/mt7621_netis_wf-2881.dts | 10 +-- .../linux/ramips/dts/mt7621_phicomm_k2p.dts | 10 +-- .../linux/ramips/dts/mt7621_planex_vr500.dts | 10 +-- .../dts/mt7621_samknows_whitebox-v8.dts | 10 +-- .../dts/mt7621_storylink_sap-g3200u3.dts | 10 +-- .../dts/mt7621_telco-electronics_x1.dts | 10 +-- .../ramips/dts/mt7621_thunder_timecloud.dts | 10 +-- .../ramips/dts/mt7621_totolink_a7000r.dts | 10 +-- .../ramips/dts/mt7621_tplink_re350-v1.dts | 10 +-- .../ramips/dts/mt7621_tplink_re650-v1.dts | 10 +-- .../dts/mt7621_ubiquiti_edgerouterx.dtsi | 10 +-- .../ramips/dts/mt7621_unielec_u7621-06.dtsi | 10 +-- .../ramips/dts/mt7621_xiaomi_mir3g-v2.dts | 10 +-- .../linux/ramips/dts/mt7621_xiaomi_mir3g.dts | 10 +-- .../linux/ramips/dts/mt7621_xiaomi_mir3p.dts | 10 +-- .../linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts | 10 +-- .../dts/mt7621_xzwifi_creativebox-v1.dts | 10 +-- .../ramips/dts/mt7621_youhua_wr1200js.dts | 10 +-- .../linux/ramips/dts/mt7621_youku_yk-l2.dts | 10 +-- .../ramips/dts/mt7621_zbtlink_zbt-we1326.dts | 10 +-- .../ramips/dts/mt7621_zbtlink_zbt-we3526.dts | 10 +-- .../ramips/dts/mt7621_zbtlink_zbt-wg2626.dts | 10 +-- .../ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi | 10 +-- .../dts/mt7628an_alfa-network_awusfree1.dts | 26 +++--- .../dts/mt7628an_buffalo_wcr-1166ds.dts | 10 +-- .../linux/ramips/dts/mt7628an_cudy_wr1000.dts | 12 ++- .../ramips/dts/mt7628an_d-team_pbr-d1.dts | 42 +++++----- .../linux/ramips/dts/mt7628an_duzun_dm06.dts | 10 +-- .../dts/mt7628an_glinet_gl-mt300n-v2.dts | 10 +-- .../ramips/dts/mt7628an_glinet_vixmini.dts | 10 +-- .../ramips/dts/mt7628an_hilink_hlk-7628n.dts | 10 +-- .../ramips/dts/mt7628an_hiwifi_hc5661a.dts | 10 +-- .../ramips/dts/mt7628an_hiwifi_hc5761a.dts | 10 +-- .../ramips/dts/mt7628an_hiwifi_hc5861b.dts | 10 +-- target/linux/ramips/dts/mt7628an_iptime.dtsi | 10 +-- .../ramips/dts/mt7628an_iptime_a604m.dts | 10 +-- .../mt7628an_mediatek_linkit-smart-7688.dts | 50 ++++++----- .../mt7628an_mediatek_mt7628an-eval-board.dts | 10 +-- .../ramips/dts/mt7628an_netgear_r6120.dts | 14 ++-- .../ramips/dts/mt7628an_onion_omega2.dtsi | 82 +++++++++---------- .../dts/mt7628an_rakwireless_rak633.dts | 10 +-- .../ramips/dts/mt7628an_skylab_skw92a.dts | 10 +-- target/linux/ramips/dts/mt7628an_tama_w06.dts | 10 +-- .../ramips/dts/mt7628an_totolink_lr1200.dts | 10 +-- .../dts/mt7628an_tplink_archer-c20-v4.dts | 10 +-- .../dts/mt7628an_tplink_archer-c50-v3.dts | 12 ++- .../dts/mt7628an_tplink_archer-c50-v4.dts | 12 ++- .../dts/mt7628an_tplink_tl-mr3020-v3.dts | 10 +-- .../dts/mt7628an_tplink_tl-mr3420-v5.dts | 10 +-- .../dts/mt7628an_tplink_tl-wa801nd-v5.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr802n-v4.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr840n-v4.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr840n-v5.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr841n-v13.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr841n-v14.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr842n-v5.dts | 10 +-- .../dts/mt7628an_tplink_tl-wr902ac-v3.dts | 10 +-- .../ramips/dts/mt7628an_unielec_u7628-01.dtsi | 10 +-- .../ramips/dts/mt7628an_vocore_vocore2.dtsi | 10 +-- .../dts/mt7628an_wavlink_wl-wn570ha1.dts | 10 +-- .../dts/mt7628an_wavlink_wl-wn575a3.dts | 10 +-- .../linux/ramips/dts/mt7628an_widora_neo.dtsi | 66 ++++++++------- .../ramips/dts/mt7628an_wiznet_wizfi630s.dts | 42 +++++----- .../ramips/dts/mt7628an_wrtnode_wrtnode2p.dts | 10 +-- .../ramips/dts/mt7628an_wrtnode_wrtnode2r.dts | 12 +-- .../ramips/dts/mt7628an_xiaomi_mir4a-100m.dts | 10 +-- .../dts/mt7628an_zbtlink_zbt-we1226.dts | 10 +-- .../dts/mt7628an_zyxel_keenetic-extra-ii.dts | 10 +-- .../ramips/dts/rt2880_airlink101_ar670w.dts | 10 +-- .../ramips/dts/rt2880_airlink101_ar725w.dts | 10 +-- .../linux/ramips/dts/rt2880_asus_rt-n15.dts | 10 +-- .../ramips/dts/rt2880_belkin_f5d8235-v1.dts | 10 +-- .../dts/rt2880_buffalo_wzr-agl300nh.dts | 10 +-- .../ramips/dts/rt2880_dlink_dap-1522-a1.dts | 10 +-- .../ramips/dts/rt3050_8devices_carambola.dts | 10 +-- .../ramips/dts/rt3050_allnet_all0256n.dtsi | 10 +-- .../dts/rt3050_alphanetworks_asl26555.dtsi | 10 +-- .../dts/rt3050_arcwireless_freestation5.dts | 10 +-- .../ramips/dts/rt3050_asus_rt-g32-b1.dts | 10 +-- .../linux/ramips/dts/rt3050_asus_wl-330n.dts | 10 +-- .../ramips/dts/rt3050_asus_wl-330n3g.dts | 10 +-- .../linux/ramips/dts/rt3050_dlink_dcs-930.dts | 10 +-- .../ramips/dts/rt3050_dlink_dir-300-b1.dts | 10 +-- .../ramips/dts/rt3050_dlink_dir-600-b1.dts | 10 +-- .../ramips/dts/rt3050_dlink_dir-615-d.dts | 10 +-- .../ramips/dts/rt3050_dlink_dir-620-a1.dts | 10 +-- .../ramips/dts/rt3050_edimax_3g-6200n.dts | 10 +-- .../ramips/dts/rt3050_edimax_3g-6200nl.dts | 10 +-- .../linux/ramips/dts/rt3050_huawei_d105.dts | 10 +-- .../linux/ramips/dts/rt3050_jcg_jhr-n805r.dts | 10 +-- .../linux/ramips/dts/rt3050_netcore_nw718.dts | 10 +-- .../ramips/dts/rt3050_sparklan_wcr-150gn.dts | 10 +-- .../ramips/dts/rt3050_teltonika_rut5xx.dts | 10 +-- .../linux/ramips/dts/rt3050_tenda_w150m.dts | 10 +-- .../dts/rt3050_trendnet_tew-638apb-v2.dts | 10 +-- .../linux/ramips/dts/rt3052_accton_wr6202.dts | 10 +-- .../ramips/dts/rt3052_alfa-network_w502u.dts | 10 +-- .../linux/ramips/dts/rt3052_argus_atp-52b.dts | 10 +-- .../ramips/dts/rt3052_asiarf_awapn2403.dts | 10 +-- .../linux/ramips/dts/rt3052_asus_rt-n13u.dts | 10 +-- .../ramips/dts/rt3052_aximcom_mr-102n.dts | 10 +-- .../ramips/dts/rt3052_aztech_hw550-3g.dts | 10 +-- .../ramips/dts/rt3052_belkin_f5d8235-v2.dts | 10 +-- .../ramips/dts/rt3052_buffalo_whr-g300n.dts | 10 +-- .../ramips/dts/rt3052_dlink_dap-1350.dts | 10 +-- .../ramips/dts/rt3052_engenius_esr-9753.dts | 10 +-- .../ramips/dts/rt3052_fon_fonera-20n.dts | 10 +-- .../ramips/dts/rt3052_hauppauge_broadway.dts | 10 +-- .../linux/ramips/dts/rt3052_huawei_hg255d.dts | 10 +-- .../linux/ramips/dts/rt3052_jcg_jhr-n825r.dts | 10 +-- .../linux/ramips/dts/rt3052_jcg_jhr-n926r.dts | 10 +-- .../dts/rt3052_mofinetwork_mofi3500-3gn.dts | 10 +-- .../ramips/dts/rt3052_netgear_wnce2001.dts | 10 +-- .../linux/ramips/dts/rt3052_nexaira_bc2.dts | 10 +-- .../ramips/dts/rt3052_omnima_miniembwifi.dts | 10 +-- .../ramips/dts/rt3052_petatel_psr-680w.dts | 10 +-- .../ramips/dts/rt3052_planex_mzk-w300nh2.dts | 10 +-- .../ramips/dts/rt3052_planex_mzk-wdpr.dts | 10 +-- .../linux/ramips/dts/rt3052_poray_ip2202.dts | 10 +-- .../ramips/dts/rt3052_prolink_pwh2004.dts | 10 +-- .../ramips/dts/rt3052_ralink_v22rw-2x2.dts | 10 +-- .../ramips/dts/rt3052_sitecom_wl-351.dts | 10 +-- .../ramips/dts/rt3052_skyline_sl-r7205.dts | 10 +-- .../linux/ramips/dts/rt3052_tenda_3g300m.dts | 10 +-- .../ramips/dts/rt3052_tenda_w306r-v2.dts | 10 +-- .../dts/rt3052_unbranded_wr512-3gn.dtsi | 10 +-- .../dts/rt3052_unbranded_xdx-rn502j.dts | 10 +-- .../ramips/dts/rt3052_upvel_ur-326n4g.dts | 10 +-- .../ramips/dts/rt3052_upvel_ur-336un.dts | 10 +-- .../ramips/dts/rt3052_zyxel_keenetic.dts | 10 +-- .../ramips/dts/rt3052_zyxel_nbg-419n.dts | 10 +-- .../ramips/dts/rt3352_allnet_all5002.dts | 10 +-- .../ramips/dts/rt3352_dlink_dir-615-h1.dts | 10 +-- .../ramips/dts/rt3352_dlink_dir-620-d1.dts | 10 +-- .../ramips/dts/rt3352_zyxel_nbg-419n-v2.dts | 10 +-- .../linux/ramips/dts/rt3662_asus_rt-n56u.dts | 10 +-- .../linux/ramips/dts/rt3662_dlink_dir-645.dts | 10 +-- .../ramips/dts/rt3662_edimax_br-6475nd.dts | 10 +-- target/linux/ramips/dts/rt3662_omnima_hpm.dts | 10 +-- .../ramips/dts/rt3662_samsung_cy-swr1100.dts | 10 +-- .../ramips/dts/rt3883_belkin_f9k110x.dtsi | 10 +-- .../ramips/dts/rt3883_sitecom_wlr-6000.dts | 10 +-- .../ramips/dts/rt3883_trendnet_tew-691gr.dts | 10 +-- .../ramips/dts/rt3883_trendnet_tew-692gr.dts | 10 +-- .../ramips/dts/rt5350_7links_px-4885.dtsi | 10 +-- .../ramips/dts/rt5350_airlive_air3gii.dts | 10 +-- .../ramips/dts/rt5350_allnet_all5003.dts | 10 +-- .../ramips/dts/rt5350_asiarf_awm002-evb.dtsi | 10 +-- .../linux/ramips/dts/rt5350_belkin_f7c027.dts | 10 +-- .../ramips/dts/rt5350_dlink_dcs-930l-b1.dts | 10 +-- .../ramips/dts/rt5350_dlink_dir-300-b7.dts | 10 +-- .../ramips/dts/rt5350_dlink_dir-320-b1.dts | 10 +-- .../ramips/dts/rt5350_dlink_dir-610-a1.dts | 10 +-- .../ramips/dts/rt5350_dlink_dwr-512-b.dts | 10 +-- .../ramips/dts/rt5350_easyacc_wizard-8800.dts | 10 +-- .../linux/ramips/dts/rt5350_hame_mpr-a1.dts | 10 +-- .../linux/ramips/dts/rt5350_hame_mpr-a2.dts | 10 +-- .../ramips/dts/rt5350_hilink_hlk-rm04.dts | 18 ++-- .../ramips/dts/rt5350_hootoo_ht-tm02.dts | 10 +-- .../ramips/dts/rt5350_intenso_memory2move.dts | 10 +-- .../linux/ramips/dts/rt5350_nexx_wt1520.dtsi | 10 +-- .../linux/ramips/dts/rt5350_nixcore_x1.dtsi | 10 +-- .../dts/rt5350_olimex_rt5350f-olinuxino.dtsi | 18 ++-- .../ramips/dts/rt5350_omnima_miniembplug.dts | 10 +-- .../ramips/dts/rt5350_planex_mzk-dp150n.dts | 10 +-- target/linux/ramips/dts/rt5350_poray_m3.dts | 10 +-- target/linux/ramips/dts/rt5350_poray_m4.dtsi | 10 +-- target/linux/ramips/dts/rt5350_poray_x5.dts | 10 +-- target/linux/ramips/dts/rt5350_poray_x8.dts | 10 +-- .../linux/ramips/dts/rt5350_tenda_3g150b.dts | 10 +-- .../ramips/dts/rt5350_trendnet_tew-714tru.dts | 10 +-- .../ramips/dts/rt5350_unbranded_a5-v11.dts | 10 +-- .../ramips/dts/rt5350_vocore_vocore.dtsi | 10 +-- .../ramips/dts/rt5350_wansview_ncs601w.dts | 10 +-- .../ramips/dts/rt5350_wiznet_wizfi630a.dts | 10 +-- .../ramips/dts/rt5350_zorlik_zl5900v2.dts | 10 +-- .../dts/rt5350_zyxel_keenetic-start.dts | 10 +-- 295 files changed, 1355 insertions(+), 1941 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts index 019fdf92cd..2ffe8431ee 100644 --- a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts +++ b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts @@ -97,12 +97,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts index 0be685844f..fa03d14814 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts @@ -123,12 +123,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "nd_sd", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "nd_sd", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts index ce839f72f1..4ba57dda41 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts @@ -154,12 +154,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "ephy", "pcie", "rgmii1", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "ephy", "pcie", "rgmii1", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts index b02b1629bb..4953c4c906 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts @@ -131,12 +131,10 @@ status = "disabled"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "ephy", "nd_sd", "pcie", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "ephy", "nd_sd", "pcie", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts index c9c440fe82..4f92993064 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts @@ -148,12 +148,10 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "mdio", "rgmii1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "mdio", "rgmii1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts index 6efba7489f..4acab8c032 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts @@ -125,12 +125,10 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wled", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wled", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index 898deee7e5..e77f39843d 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts @@ -142,11 +142,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "spi refclk", "uartf", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "spi refclk", "uartf", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts index 64fbeb0fe5..aed4ce1693 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts @@ -130,12 +130,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "wled", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "wled", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts index 8bdf87501e..eeb4ee67d4 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts @@ -130,12 +130,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts index a99910db8e..0800e3d78b 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts @@ -130,12 +130,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts index b08edfadf7..27056a668b 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts @@ -161,17 +161,15 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii1"; + ralink,function = "gpio"; + }; - gpio_i2s { - ralink,group = "uartf"; - ralink,function = "gpio i2s"; - }; + gpio_i2s { + ralink,group = "uartf"; + ralink,function = "gpio i2s"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts index 56c0f8f890..8a79d9a454 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts @@ -129,11 +129,9 @@ mediatek,port4 = "ephy"; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index 9232d4929a..da8d2238a1 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -117,12 +117,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts index 44ca663694..a69b17d739 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts @@ -129,12 +129,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "uartf", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "uartf", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts index 449f4ff4b6..5134e9e1ca 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts @@ -127,12 +127,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "uartf", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "uartf", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index d0229e4718..88bd514d53 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts @@ -152,12 +152,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf", "nd_sd", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf", "nd_sd", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts index 43698d9fd6..d34bc1b22b 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts @@ -130,12 +130,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index da5b428fa5..e2765b1877 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts @@ -115,12 +115,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 52c0ac0925..3b8ba4ec38 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -98,14 +98,14 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "nd_sd", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "nd_sd", "rgmii2"; + ralink,function = "gpio"; }; +}; +&pinctrl { phy_reset_pins: phy-reset { gpio { ralink,group = "spi refclk"; @@ -115,8 +115,8 @@ }; ðernet { - status = "okay"; + mtd-mac-address = <&factory 0x4>; pinctrl-names = "default"; diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts index 65d71b99af..3213132c43 100644 --- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts +++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts @@ -165,15 +165,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", /* gpio0: 1-2 */ - "uartf", /* gpio0: 7-14 */ - "nd_sd", /* gpio2: 45-59 */ - "wled"; /* gpio3: 72 */ - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "nd_sd", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts index 6b2e2d115b..d66861c9ad 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts @@ -145,11 +145,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wled","ephy","uartf","i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wled","ephy","uartf","i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts index 1c2b296a9c..633253fadd 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts @@ -136,11 +136,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wled","ephy","i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wled","ephy","i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index 08451d8a8c..e6b30449e8 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts @@ -151,11 +151,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wled","ephy","uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wled","ephy","uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts index 8d58d12f02..6395aa37f6 100644 --- a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts +++ b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts @@ -159,13 +159,11 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "pa", "spi refclk", - "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "pa", "spi refclk", + "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi index a7e3bd199a..4f4fc4a725 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi @@ -125,11 +125,9 @@ pinctrl-0 = <&pa_pins>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hnet_c108.dts b/target/linux/ramips/dts/mt7620a_hnet_c108.dts index c122b6dfd5..49fa6b2c8e 100644 --- a/target/linux/ramips/dts/mt7620a_hnet_c108.dts +++ b/target/linux/ramips/dts/mt7620a_hnet_c108.dts @@ -172,12 +172,10 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "spi refclk", "ephy"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "spi refclk", "ephy"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts index 5da91071db..200df6000e 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts @@ -184,12 +184,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts index 12e6e12f00..062ef93ed4 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts @@ -165,12 +165,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts index e1aeb4fa8a..ef4dc233ea 100644 --- a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts +++ b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts @@ -105,11 +105,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "uartf", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "uartf", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts index 3130365b96..e400ebcff0 100644 --- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts +++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts @@ -170,11 +170,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf", "i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf", "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi index a5262ffca6..29832ac42b 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi @@ -99,11 +99,9 @@ pinctrl-0 = <&pa_pins>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf", "wled", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf", "wled", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts index 256b306306..799d660d3c 100644 --- a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts +++ b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts @@ -97,12 +97,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts index 76ab099a16..57f408a648 100644 --- a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts +++ b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts @@ -97,11 +97,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "wled", "i2c", "wdt", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "wled", "i2c", "wdt", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi index 000c7535da..8199147165 100755 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi @@ -54,11 +54,9 @@ mtd-mac-address = <&art 0x6>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "spi refclk"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "spi refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi index d8d74ffc30..ec9b6c587e 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi @@ -105,11 +105,9 @@ ralink,mtd-eeprom = <&factory 0x0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "rgmii2", "spi refclk"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "rgmii2", "spi refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts index 6ef7e84154..98dac3f5b6 100644 --- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts +++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts @@ -93,12 +93,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts index e71211e681..5071aed165 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts @@ -93,12 +93,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts index 310f78ec51..92fcfdf68c 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts @@ -89,12 +89,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts index 4e023ed6b0..1474422a24 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts @@ -34,12 +34,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index f451b43ae3..15fb40fa7d 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts @@ -34,12 +34,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts index c5efb39563..8390d18918 100644 --- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts +++ b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts @@ -116,16 +116,14 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi refclk", "rgmii1"; - ralink,function = "gpio"; - }; - wdt { - ralink,group = "wdt"; - ralink,function = "wdt refclk"; - }; +&state_default { + gpio { + ralink,group = "spi refclk", "rgmii1"; + ralink,function = "gpio"; + }; + wdt { + ralink,group = "wdt"; + ralink,function = "wdt refclk"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts index ecbf91083a..a7c614cc21 100644 --- a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts +++ b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts @@ -80,12 +80,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi refclk", "rgmii1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi refclk", "rgmii1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts index be7a569838..6062a76f76 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts @@ -100,12 +100,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts index ea2a11b82f..3313c6c071 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts @@ -120,12 +120,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi refclk", "rgmii1", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi refclk", "rgmii1", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts index 7fe329f03e..4b64afd228 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts @@ -125,12 +125,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf", "nd_sd", "rgmii2", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf", "nd_sd", "rgmii2", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts index 5b62fd92db..56f427aa8a 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts @@ -66,12 +66,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts index 976e2acca3..e106af402e 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts @@ -47,12 +47,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts index 7b3517c135..74c82341fe 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts +++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts @@ -60,12 +60,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "spi"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "spi"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index c2b94eebb3..35617c0880 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts @@ -177,26 +177,24 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; + ralink,function = "gpio"; + }; - /* - * The sd function of the nd_sd group configures two of the - * groups pins as gpios. The pins are used as PCIe reset/power. - * Due to the driver load order, the pins are configured way to - * late if triggered by the sd-card driver. - * To not introduce another kind of driver load order - * dependency and configure the pins as early as possible, - * means during pinmux driver load. - */ - gpio_sd { - ralink,group = "nd_sd"; - ralink,function = "sd"; - }; + /* + * The sd function of the nd_sd group configures two of the + * groups pins as gpios. The pins are used as PCIe reset/power. + * Due to the driver load order, the pins are configured way to + * late if triggered by the sd-card driver. + * To not introduce another kind of driver load order + * dependency and configure the pins as early as possible, + * means during pinmux driver load. + */ + gpio_sd { + ralink,group = "nd_sd"; + ralink,function = "sd"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts index 76e1eb79bc..952f371ce0 100644 --- a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts +++ b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts @@ -114,17 +114,15 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "rgmii2", "spi", "ephy"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "rgmii2", "spi", "ephy"; + ralink,function = "gpio"; + }; - uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; - }; + uartf_gpio { + ralink,group = "uartf"; + ralink,function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts index 2da35936b1..45752c095d 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts @@ -20,15 +20,6 @@ bootargs = "console=ttyS0,115200"; }; - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk"; - ralink,function = "gpio"; - }; - }; - }; - leds { compatible = "gpio-leds"; @@ -165,6 +156,13 @@ status = "okay"; }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk"; + ralink,function = "gpio"; + }; +}; + &wmac { ralink,mtd-eeprom = <&radio 0>; mtd-mac-address = <&rom 0xf100>; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts index 23719c3f35..59e109c8a2 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts @@ -61,12 +61,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index 975e0af661..707453d2b5 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts @@ -42,11 +42,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts index 77885853ef..ed2b00836e 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts @@ -61,12 +61,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts index 21fc3a1858..bc7825df00 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts @@ -160,12 +160,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts index 8bf6565d2f..d076e10ced 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts +++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts @@ -152,11 +152,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "rgmii1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "rgmii1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index 82be9c4c97..641c05a628 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -110,12 +110,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "rgmii1", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "rgmii1", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts index 7abc34d194..94ac1dd4f9 100644 --- a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts +++ b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts @@ -139,12 +139,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi refclk", "rgmii1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi refclk", "rgmii1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index f7bc4f2001..cf9b91f564 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -133,11 +133,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wled", "i2c", "uartf", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wled", "i2c", "uartf", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi index d5a6d5389d..3d971ba2c6 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi @@ -94,11 +94,9 @@ ralink,mtd-eeprom = <&factory 0x0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts index 2496a16a29..a7779a0071 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts @@ -74,11 +74,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 41c6b07dbd..82d5de4012 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi @@ -82,12 +82,10 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zte_q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts index 50368b8bd5..fc07b57418 100644 --- a/target/linux/ramips/dts/mt7620a_zte_q7.dts +++ b/target/linux/ramips/dts/mt7620a_zte_q7.dts @@ -89,12 +89,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts index 16a606ea1a..563a159ffc 100644 --- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts +++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts @@ -128,12 +128,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index 76c362f593..801f4c50ec 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts @@ -116,11 +116,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts index 960d2acaec..2e7f8ea5f6 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts @@ -129,11 +129,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "wled", "i2c"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "wled", "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts index f7c24ec481..9db47c814c 100644 --- a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts +++ b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts @@ -105,11 +105,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "ephy"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "ephy"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts index b033ef90c4..16eea14bdf 100644 --- a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts +++ b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts @@ -114,11 +114,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "wled", "spi refclk", "i2c"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "wled", "spi refclk", "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts index 14bfc0f30c..cac849c919 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts @@ -97,12 +97,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts index 8214e4a780..27703acc08 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts @@ -141,11 +141,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "spi refclk", "i2c", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "spi refclk", "i2c", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts index ab38ad0577..ebd9171415 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts @@ -143,11 +143,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "spi refclk", "i2c", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "spi refclk", "i2c", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts index b1eceeed8e..a8d5b04b37 100644 --- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts +++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts @@ -126,11 +126,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts index c49cb02bb5..c48560bb94 100644 --- a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts +++ b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts @@ -105,11 +105,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts index 9658f6c4de..6decec798d 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts @@ -121,11 +121,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts index 6d7d2d06b7..75267c68b9 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts @@ -121,11 +121,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "ephy", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi index 2fc3662645..cee1e04e81 100644 --- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi +++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi @@ -51,11 +51,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts index 7dcff46917..ee92860b9f 100644 --- a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts +++ b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts @@ -107,11 +107,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wled", "ephy"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wled", "ephy"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts index 184d947e36..ddcfb1d9b5 100644 --- a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts +++ b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts @@ -89,11 +89,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts index a808818201..1c346856d1 100644 --- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts +++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts @@ -94,11 +94,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts index 3885428345..7a646882f3 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts @@ -117,11 +117,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts index 7949c48383..41029440e8 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts @@ -121,11 +121,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index 0cadbddcb4..725a070fd6 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts @@ -102,11 +102,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts index cdfeaff39f..12b1c5908b 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts @@ -115,11 +115,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + default { + ralink,group = "i2c", "uartf", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts index 98c5609211..c974c9b1d0 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts @@ -124,12 +124,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts index ff9a9ee1a3..6e8a333069 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts @@ -124,12 +124,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts index c086b16f7d..26e66f9a31 100644 --- a/target/linux/ramips/dts/mt7621_adslr_g7.dts +++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts @@ -109,11 +109,9 @@ mtd-mac-address = <&factory 0xe00c>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts index a165c20742..8dab036b17 100644 --- a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts +++ b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts @@ -121,11 +121,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2", "jtag", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts index f3080c29e0..1066536ea6 100644 --- a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts +++ b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts @@ -165,12 +165,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "rgmii2", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "rgmii2", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi index db83f99c3a..d4e5cfbf04 100644 --- a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi +++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi @@ -108,11 +108,9 @@ mediatek,portmap = "llllw"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts index e589461a4d..0a315398ef 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts @@ -138,11 +138,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi index 8eaf55dbc7..2de6d4c761 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi +++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi @@ -147,11 +147,9 @@ status = "disabled"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "uart3", "i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "uart3", "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts index 1b99f8147c..b67e430e5f 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts @@ -158,12 +158,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts index 36bcd15e48..dadc26c12b 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts @@ -153,12 +153,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts index 896d9f6037..f1b4d3d8ab 100644 --- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts +++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts @@ -153,11 +153,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uart2", "uart3"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uart2", "uart3"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts index fd598de4bb..59dd80fc62 100644 --- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts +++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts @@ -168,11 +168,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2", "jtag", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts index f189365bad..65924bb2e6 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts @@ -134,11 +134,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts index 3d0b726526..c43f0ad198 100644 --- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts +++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts @@ -128,12 +128,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart3", "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi index b4aaec46fc..0a4afd964f 100644 --- a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi +++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi @@ -154,12 +154,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "jtag", "wdt", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "jtag", "wdt", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts index 773cf82e36..1df3116d22 100644 --- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts +++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts @@ -114,11 +114,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts index b7ddc51fb6..fea83e5e15 100644 --- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts +++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts @@ -114,11 +114,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts index c7a6105903..25ad9dc131 100644 --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts @@ -108,11 +108,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "rgmii2", "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "rgmii2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts index bd3411b614..9920a1f0ba 100644 --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts @@ -118,11 +118,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "rgmii2", "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "rgmii2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts index 1d0471fd37..0d0e44ca13 100644 --- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts +++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts @@ -141,11 +141,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts index 40e11014d7..d3bdc4acd8 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts @@ -133,12 +133,10 @@ mtd-mac-address = <&iNIC_rf 0x4>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "uart3", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "uart3", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts index 1e692ea3cb..fa8c4aa653 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts @@ -133,12 +133,10 @@ mtd-mac-address = <&factory 0x4>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "uart3", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "uart3", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts index 09bc9a3d56..7fa06b1844 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts @@ -129,12 +129,10 @@ mediatek,portmap = "wllll"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "uart3", "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts index 7403a8760f..0ff5f2e76d 100644 --- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts +++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts @@ -137,11 +137,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_linksys_re6500.dts b/target/linux/ramips/dts/mt7621_linksys_re6500.dts index a7f1fdd262..9c12f0ff80 100644 --- a/target/linux/ramips/dts/mt7621_linksys_re6500.dts +++ b/target/linux/ramips/dts/mt7621_linksys_re6500.dts @@ -91,12 +91,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts index 15a4d71c1b..09063e677f 100644 --- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts +++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts @@ -36,13 +36,14 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "rgmii2"; + ralink,function = "gpio"; }; +}; + +&pinctrl { i2s_pins: i2s { i2s { ralink,group = "uart3"; diff --git a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts index 177154b8d9..5a330a7428 100644 --- a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts +++ b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts @@ -45,11 +45,9 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts index b164ed2c70..da2b571dd4 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts @@ -134,13 +134,11 @@ mtd-mac-address-increment = <1>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - /* via gpio7 (uart3 group) the PoE status can be read */ - ralink,group = "uart2", "uart3", "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + /* via gpio7 (uart3 group) the PoE status can be read */ + ralink,group = "uart2", "uart3", "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts index f13a779600..60b6395c17 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts @@ -143,12 +143,10 @@ mtd-mac-address-increment = <1>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "wdt", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "wdt", "rgmii2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts index 45b2182ded..2500ae29da 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts @@ -167,12 +167,10 @@ mtd-mac-address-increment = <1>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts index 6d13ac1479..d0ea445283 100644 --- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts +++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts @@ -105,11 +105,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2", "jtag", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts index fb3efe6d72..40180068e4 100644 --- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts +++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts @@ -142,11 +142,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "rgmii2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts index fc8a68a135..0d6dac0ca2 100644 --- a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts +++ b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts @@ -232,11 +232,9 @@ mtd-mac-address = <&factory 0x00000004>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "sdhci", "rgmii2", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "sdhci", "rgmii2", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi index 864952f25f..116c412b06 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi @@ -109,11 +109,9 @@ mtd-mac-address = <&factory 0x4>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "uart2", "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi index cf9d1c6077..52af14723e 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi @@ -99,12 +99,10 @@ mtd-mac-address = <&factory 0x4>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "uart2", "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netis_wf-2881.dts b/target/linux/ramips/dts/mt7621_netis_wf-2881.dts index 1f16174cf8..a7e8e06ff2 100644 --- a/target/linux/ramips/dts/mt7621_netis_wf-2881.dts +++ b/target/linux/ramips/dts/mt7621_netis_wf-2881.dts @@ -118,11 +118,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "uart2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "uart2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts index 909df622f4..9e9e2c0df4 100644 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts @@ -111,11 +111,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_planex_vr500.dts b/target/linux/ramips/dts/mt7621_planex_vr500.dts index 3d8d346488..87c638429f 100644 --- a/target/linux/ramips/dts/mt7621_planex_vr500.dts +++ b/target/linux/ramips/dts/mt7621_planex_vr500.dts @@ -84,11 +84,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts index 84cc4541e9..4b5fc7edfd 100644 --- a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts +++ b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts @@ -114,11 +114,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts index 4194154f07..002804bbf1 100644 --- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts +++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts @@ -111,11 +111,9 @@ mtd-mac-address = <&factory 0xe006>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts index 9e8f9f75ed..50df90b695 100644 --- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts +++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts @@ -131,12 +131,10 @@ mediatek,portmap = "llllw"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uart2", "wdt", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uart2", "wdt", "rgmii2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts index 4ff845543d..e1f6835a81 100644 --- a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts +++ b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts @@ -99,11 +99,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts index 68bc8afa19..dd4336367a 100644 --- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts +++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts @@ -108,11 +108,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts index 7859f611ee..76134925b1 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts @@ -155,11 +155,9 @@ mtd-mac-address = <&config 0x10008>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "rgmii2", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "rgmii2", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts index 23b559daa8..8122e11a31 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts @@ -168,11 +168,9 @@ mtd-mac-address = <&config 0x10008>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "rgmii2", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "rgmii2", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi index d03c3256e6..d8b4aa0a07 100644 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi +++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi @@ -71,12 +71,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi index 5bd7f0b92d..209656232b 100644 --- a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi +++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi @@ -109,11 +109,9 @@ mediatek,portmap = "llllw"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uart2", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uart2", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts index 757e487bcb..ec0ee087e8 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts @@ -137,11 +137,9 @@ mediatek,portmap = "lllwl"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uart2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts index 29ac019899..a09cbb6ee4 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts @@ -191,11 +191,9 @@ mediatek,portmap = "lwlll"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uart2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts index 9482889b8a..0a566afffd 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts @@ -176,11 +176,9 @@ mediatek,portmap = "llllw"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uart2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts index 072b2cc455..b544760967 100644 --- a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts +++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts @@ -94,11 +94,9 @@ mtd-mac-address = <&factory 0x4>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts index f33a6fce43..0792b7fb90 100644 --- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts +++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts @@ -156,11 +156,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts index 7f7d5cb276..1a759bf7c3 100644 --- a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts +++ b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts @@ -130,11 +130,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart2", "uart3", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts index 3a9794da02..1673baabc1 100644 --- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts +++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts @@ -141,11 +141,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts index 9d4ab65d3f..7bfb39212e 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts @@ -28,12 +28,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts index 9ee88d9648..15a4472cd8 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts @@ -103,11 +103,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts index d1cf30880a..f3f06dd69b 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts @@ -114,11 +114,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2", "jtag", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi index f1b126ad15..48de87269a 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi @@ -116,11 +116,9 @@ mtd-mac-address = <&factory 0xe000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "rgmii2", "jtag", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "rgmii2", "jtag", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts index 35665172c5..3c38cc7b46 100644 --- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts +++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts @@ -97,22 +97,20 @@ status = "disabled"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p0led_an", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p0led_an", "wdt", "wled_an"; + ralink,function = "gpio"; + }; - ext_lna { - ralink,group = "uart1"; - ralink,function = "sw_r"; - }; + ext_lna { + ralink,group = "uart1"; + ralink,function = "sw_r"; + }; - ext_pa { - ralink,group = "i2s"; - ralink,function = "antenna"; - }; + ext_pa { + ralink,group = "i2s"; + ralink,function = "antenna"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts index 2c878ff8a2..25c3c403d2 100644 --- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts +++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts @@ -109,12 +109,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index aa3f01e68e..2d70e1225b 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -104,13 +104,11 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2s", "refclk", "wdt", "p4led_an", - "p3led_an", "p2led_an", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2s", "refclk", "wdt", "p4led_an", + "p3led_an", "p2led_an", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts index cef92c5bf8..bcc9d00519 100644 --- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts +++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts @@ -60,32 +60,30 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; - i2c { - ralink,group = "i2c"; - ralink,function = "gpio"; - }; + i2c { + ralink,group = "i2c"; + ralink,function = "gpio"; + }; - i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; - }; + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; - spis { - ralink,group = "spis"; - ralink,function = "gpio"; - }; + spis { + ralink,group = "spis"; + ralink,function = "gpio"; + }; - wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; + wdt { + ralink,group = "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts index 20d3bd83b8..83f93e0de5 100644 --- a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts +++ b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts @@ -48,12 +48,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "uart1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "uart1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index 979f5d2bc9..533f3b0dc3 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts @@ -75,12 +75,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts index 46d74b7651..0935ec869b 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts @@ -48,12 +48,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "wled_an", "p1led_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "wled_an", "p1led_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index f31e129e9e..d0df692a3b 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -34,12 +34,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts index 1f93141a36..3b6a92c01d 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts @@ -27,12 +27,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "refclk", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts index a8b9049391..1f7715bb38 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts @@ -34,12 +34,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "refclk", "wdt", "p3led_an", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "refclk", "wdt", "p3led_an", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts index 050c91d120..fbc8d9837a 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts @@ -22,12 +22,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "refclk", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi index bbd8642f2a..8ee865ddff 100644 --- a/target/linux/ramips/dts/mt7628an_iptime.dtsi +++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi @@ -69,12 +69,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart1", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart1", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts index da44eb539a..d9e0f8c593 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts @@ -36,11 +36,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uart1", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uart1", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index d4eadf68ee..e9cb5d1900 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -50,37 +50,35 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; - refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; - }; + refclk { + ralink,group = "refclk"; + ralink,function = "gpio"; + }; - i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; - }; + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; - spis { - ralink,group = "spis"; - ralink,function = "gpio"; - }; + spis { + ralink,group = "spis"; + ralink,function = "gpio"; + }; - wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; - }; + wled_an { + ralink,group = "wled_an"; + ralink,function = "gpio"; + }; - wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; + wdt { + ralink,group = "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts index 6b9c3e4af7..5558892a22 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts @@ -7,12 +7,10 @@ model = "Mediatek MT7628AN evaluation board"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index 12eb638df3..49ca189645 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -74,14 +74,12 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p0led_an", "p1led_an", "p2led_an", - "p3led_an", "p4led_an", "wdt", - "wled_an", "uart1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p0led_an", "p1led_an", "p2led_an", + "p3led_an", "p4led_an", "wdt", + "wled_an", "uart1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index 8b761d7814..89f00a3e67 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -36,57 +36,55 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; - perst { - ralink,group = "perst"; - ralink,function = "gpio"; - }; + perst { + ralink,group = "perst"; + ralink,function = "gpio"; + }; - refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; - }; + refclk { + ralink,group = "refclk"; + ralink,function = "gpio"; + }; - i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; - }; + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; - spis { - ralink,group = "spis"; - ralink,function = "gpio"; - }; + spis { + ralink,group = "spis"; + ralink,function = "gpio"; + }; - wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; - }; + wled_kn { + ralink,group = "wled_kn"; + ralink,function = "gpio"; + }; - wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; - }; + wled_an { + ralink,group = "wled_an"; + ralink,function = "gpio"; + }; - wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; + wdt { + ralink,group = "wdt"; + ralink,function = "gpio"; + }; - pwm0 { - ralink,group = "pwm0"; - ralink,function = "gpio"; - }; + pwm0 { + ralink,group = "pwm0"; + ralink,function = "gpio"; + }; - pwm1 { - ralink,group = "pwm1"; - ralink,function = "gpio"; - }; + pwm1 { + ralink,group = "pwm1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts index 1316a290d7..66e6c94b31 100644 --- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts +++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts @@ -20,12 +20,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + wled_an { + ralink,group = "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index addcabd7f9..0efe14621a 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -44,12 +44,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wdt", "refclk", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wdt", "refclk", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts index 2a906c2669..782e2dcd7f 100644 --- a/target/linux/ramips/dts/mt7628an_tama_w06.dts +++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts @@ -51,12 +51,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart1", "p0led_an", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uart1", "p0led_an", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts index 4a712e917a..1e99ba368a 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts @@ -87,12 +87,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index 91401b5a32..502c271ae2 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -80,12 +80,10 @@ mediatek,portmap = "wllll"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2s", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2s", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index 2f0576f2fd..e0b025d20d 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -72,13 +72,11 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", - "p3led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", + "p3led_an", "p4led_an", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts index 197773db07..f7a559918c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts @@ -73,13 +73,11 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an", - "p3led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an", + "p3led_an", "p4led_an", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index 84fe3224b6..fa69110d45 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -123,12 +123,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index 2bc4fac508..279f9ec69a 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -82,11 +82,9 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index 0336730a4b..b4c004b955 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -51,11 +51,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p0led_an", "perst", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p0led_an", "perst", "refclk", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index 5e97733d0e..fcb483594a 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -37,12 +37,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "refclk", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "refclk", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index 32d4cdf4eb..1fc2316d70 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -56,11 +56,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts index 93869381cf..c0ae199d22 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts @@ -98,11 +98,9 @@ mediatek,portmap = "wllll"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p0led_an", "p2led_an", "perst"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p0led_an", "p2led_an", "perst"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index 5bfabe4bdc..eedce357c7 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -82,11 +82,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index 554300c972..6268bd13cc 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -112,12 +112,10 @@ mediatek,portmap = "wllll"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index 648e64766f..10bfe2d655 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -82,11 +82,9 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts index 33449d9651..f4b50a37ff 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -81,12 +81,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi index 3416714d96..afa7f18efc 100644 --- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi +++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi @@ -128,11 +128,9 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi index 6a312ff0b1..918951c35f 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi @@ -12,12 +12,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "wled_an", "refclk", "wdt"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "wled_an", "refclk", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index fa59a8b105..2c0815fba4 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -58,12 +58,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wled_an", "p0led_an", "wdt", "refclk"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wled_an", "p0led_an", "wdt", "refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index 0aed99c459..13f045f13f 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -53,12 +53,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi index 5457ca85cf..f89342eb8f 100644 --- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi +++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi @@ -46,47 +46,45 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; - perst { - ralink,group = "perst"; - ralink,function = "gpio"; - }; + perst { + ralink,group = "perst"; + ralink,function = "gpio"; + }; - refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; - }; + refclk { + ralink,group = "refclk"; + ralink,function = "gpio"; + }; - i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; - }; + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; - spis { - ralink,group = "spis"; - ralink,function = "gpio"; - }; + spis { + ralink,group = "spis"; + ralink,function = "gpio"; + }; - wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; - }; + wled_kn { + ralink,group = "wled_kn"; + ralink,function = "gpio"; + }; - wled_an { - ralink,group = "wled_an"; - ralink,function = "wled_an"; - }; + wled_an { + ralink,group = "wled_an"; + ralink,function = "wled_an"; + }; - wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; + wdt { + ralink,group = "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index b5da84c9f8..c3a37fad47 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -79,32 +79,30 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; - i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; - }; + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; - wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; - }; + wdt { + ralink,group = "wdt"; + ralink,function = "gpio"; + }; - i2c { - ralink,group = "i2c"; - ralink,function = "gpio"; - }; + i2c { + ralink,group = "i2c"; + ralink,function = "gpio"; + }; - refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; - }; + refclk { + ralink,group = "refclk"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts index fe9cf0dd1a..6ac44ec8ea 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts @@ -23,11 +23,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "gpio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts index 7defe9c033..afd0c93595 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts @@ -26,14 +26,14 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; }; +}; +&pinctrl { led_pins: led { gpio { ralink,group = "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts index 2de28041e4..fcbacf6db8 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts @@ -117,12 +117,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index b89e689508..e537be0a80 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -54,12 +54,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index f4d678e38e..5b44808fc6 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -198,11 +198,9 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts index 96e4a8cbe2..8a472626bd 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts @@ -82,12 +82,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "uartlite"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "uartlite"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts index 5e3782ac28..3e6691287b 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts @@ -92,12 +92,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "uartlite"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "uartlite"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts index 4ed6c1ed45..6830fc5bac 100644 --- a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts +++ b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts @@ -92,12 +92,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartlite", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartlite", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts index 04728c582e..2f0475b33c 100644 --- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts +++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts @@ -193,12 +193,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts index c6a90d426a..ff7660723a 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts @@ -113,12 +113,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartlite", "mdio"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartlite", "mdio"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts index 56e3990bfe..cf5a3cf2c8 100644 --- a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts +++ b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts @@ -117,12 +117,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartlite", "pci"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartlite", "pci"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_8devices_carambola.dts b/target/linux/ramips/dts/rt3050_8devices_carambola.dts index aaaea8fd4e..aa9cf5927f 100644 --- a/target/linux/ramips/dts/rt3050_8devices_carambola.dts +++ b/target/linux/ramips/dts/rt3050_8devices_carambola.dts @@ -57,12 +57,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi index d31547c335..32fbe68f10 100644 --- a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi +++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi @@ -41,12 +41,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi index d1c21f8082..1172c74831 100644 --- a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi +++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi @@ -81,12 +81,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts index b924229a7e..0289e11104 100644 --- a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts +++ b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts @@ -88,12 +88,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts index 8f0544e7ef..a4b1c98015 100644 --- a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts +++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts @@ -67,12 +67,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts index 48a6e3a4cf..3a34449166 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts @@ -88,12 +88,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts index 8453147b6b..23f8457fd5 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts @@ -93,12 +93,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts index 1c44e28fe4..679173c799 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts @@ -90,12 +90,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts index 030796f286..945182e693 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts @@ -100,12 +100,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts index a77bfd717f..864f864517 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts @@ -100,12 +100,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts index c0593dd6e9..a9d0dc985c 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts @@ -110,11 +110,9 @@ ralink,mtd-eeprom = <&devdata 0x4000>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts index 24fdec8ed4..a0f3659128 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts @@ -105,12 +105,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts index 3859812217..edd95a756a 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts @@ -98,12 +98,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts index 7742561e50..31d311f72e 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts @@ -85,12 +85,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_huawei_d105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts index 10732cc5ec..ca30791d8d 100644 --- a/target/linux/ramips/dts/rt3050_huawei_d105.dts +++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts @@ -81,12 +81,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts index 702d779aa2..8709a21abf 100644 --- a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts +++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts @@ -37,12 +37,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_netcore_nw718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts index 61af498fd8..fe13d9ac9b 100644 --- a/target/linux/ramips/dts/rt3050_netcore_nw718.dts +++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts @@ -95,12 +95,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts index a2f763cb8b..66abb4853f 100644 --- a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts +++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts @@ -87,12 +87,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts index 52638f94e6..9532d922f9 100644 --- a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts +++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts @@ -77,12 +77,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts index e6a2c4ab17..6e2ea916ed 100644 --- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts +++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts @@ -105,12 +105,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts index a014b32802..66a6372065 100644 --- a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts +++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts @@ -85,12 +85,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts index 1caec41a4b..bc7a79c977 100644 --- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts +++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts @@ -93,12 +93,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts index 5c1b47bc03..489b85338d 100644 --- a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts +++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts @@ -91,12 +91,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts index 046fe676c5..3170f88d90 100644 --- a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts +++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts @@ -83,12 +83,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts index 38ad539eb9..f3a21fadaa 100644 --- a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts +++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts @@ -77,12 +77,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts index c3a3d2346f..20e287b1cc 100644 --- a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts +++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts @@ -85,12 +85,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts index d8efb425e8..c2bb9bb20f 100644 --- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts +++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts @@ -102,12 +102,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts index 372d18e75e..8eb02f14c2 100644 --- a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts +++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts @@ -103,12 +103,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts index 93725e9336..af2a5bc9b5 100644 --- a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts +++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts @@ -109,12 +109,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts index 3871b55495..90e7ee81c0 100644 --- a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts +++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts @@ -107,12 +107,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts index 06d490cacc..60ef24db25 100644 --- a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts +++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts @@ -112,12 +112,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts index 4b55af0691..82ab9db6f7 100644 --- a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts +++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts @@ -85,12 +85,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts index dfe55a2575..8ff73bdc58 100644 --- a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts +++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts @@ -93,12 +93,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts index 353cfbf415..0d94db8553 100644 --- a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts +++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts @@ -74,12 +74,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts index df8a72c8cb..24eb32005e 100644 --- a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts +++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts @@ -119,12 +119,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts index 4c0640b881..936de03913 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts @@ -72,12 +72,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts index 9414828594..93ed7029d0 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts @@ -118,12 +118,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts index d20f2d2703..7f11bb57fd 100644 --- a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts +++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts @@ -103,12 +103,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts index 3f0d93d8a4..3954ce4e77 100644 --- a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts +++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts @@ -131,12 +131,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts index 324909e82f..80fbfce07c 100644 --- a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts +++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts @@ -69,12 +69,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts index 2f045c7884..ac0e65be6d 100644 --- a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts +++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts @@ -79,12 +79,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts index 260d0a1444..f57522571c 100644 --- a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts +++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts @@ -78,12 +78,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts index ab749fc43d..e21926ce1d 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts @@ -102,12 +102,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts index 17591268b6..00b479b7b6 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts @@ -67,12 +67,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_poray_ip2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts index 31478da694..a754136198 100644 --- a/target/linux/ramips/dts/rt3052_poray_ip2202.dts +++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts @@ -79,12 +79,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts index 3280c93afb..7a8a85b5dd 100644 --- a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts +++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts @@ -79,12 +79,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts index df56c80819..6816305e27 100644 --- a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts +++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts @@ -85,12 +85,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts index 1b31bda736..2b92f6bf12 100644 --- a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts +++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts @@ -96,12 +96,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts index 3d8a9ec464..664bced348 100644 --- a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts +++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts @@ -80,12 +80,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts index a463890dea..8189297494 100644 --- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts +++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts @@ -110,12 +110,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts index 233a6d2e46..a25d2c56b9 100644 --- a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts +++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts @@ -79,12 +79,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi index 5761b8b532..2718946396 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi +++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi @@ -60,12 +60,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts index 2d1b416ce5..d8739d7586 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts +++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts @@ -79,12 +79,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts index d67c2e0ec5..489772940b 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts @@ -100,12 +100,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts index 937278db92..823913cfdb 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts @@ -100,12 +100,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index 1f9928e59a..ad641f47e4 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts @@ -99,12 +99,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts index 625e1616d8..608f21ddfc 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts @@ -85,12 +85,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_allnet_all5002.dts b/target/linux/ramips/dts/rt3352_allnet_all5002.dts index a604ec1511..ea5386c5e4 100644 --- a/target/linux/ramips/dts/rt3352_allnet_all5002.dts +++ b/target/linux/ramips/dts/rt3352_allnet_all5002.dts @@ -89,12 +89,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts index a87fc1e9a2..72145b4e44 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts @@ -105,12 +105,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts index 74fd4af753..c85f72d019 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts @@ -82,12 +82,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts index e150eff9e8..fde9b8198d 100644 --- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts +++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts @@ -100,12 +100,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts index 13f6cdd1dd..4f9bc9843a 100644 --- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts +++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts @@ -105,12 +105,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts index 5effbf9fa2..235bcf8793 100644 --- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -121,12 +121,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts index 9e6d98f95a..233a7d37cc 100644 --- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts +++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts @@ -121,12 +121,10 @@ */ }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts index 5d3f3278a5..7ac16cbf99 100644 --- a/target/linux/ramips/dts/rt3662_omnima_hpm.dts +++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts @@ -126,12 +126,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts index 0d98a43e0b..aaa0985bf8 100644 --- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts +++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts @@ -113,12 +113,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "spi"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "spi"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi index 98ad1b13e2..47e24c66d0 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi +++ b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi @@ -73,12 +73,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts index 2b1f707658..b41bb74214 100644 --- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts +++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts @@ -57,12 +57,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts index aeed7fbb24..6830f736fa 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts @@ -89,12 +89,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts index 03395a92dd..6d234796d8 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts @@ -88,12 +88,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi index cdd3033bed..6ce6c3f4ab 100644 --- a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi +++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi @@ -41,12 +41,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts index 111119eea4..50d08a8fec 100644 --- a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts +++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts @@ -81,12 +81,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_allnet_all5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts index 8a3488a7e0..0571b89fb9 100644 --- a/target/linux/ramips/dts/rt5350_allnet_all5003.dts +++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts @@ -89,12 +89,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi index 384b2efec0..974a902e2d 100644 --- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi +++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi @@ -51,12 +51,10 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts index f3bf00e30a..0869b43158 100644 --- a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts +++ b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts @@ -133,11 +133,9 @@ ralink,mtd-eeprom = <&factory 0>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts index 0fff5e8b5c..c08a76d554 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts @@ -88,12 +88,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf", "led"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts index 2b6af163bc..b5e966cfdd 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts @@ -88,12 +88,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts index 040a223986..c1eb2a8d1e 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts @@ -110,12 +110,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts index 7a0323e219..e791c9a5f2 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts @@ -88,12 +88,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts index a08ea5d03c..c5ccfd0c97 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts @@ -125,12 +125,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts index a69ed4bd09..c3e76cb132 100644 --- a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts +++ b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts @@ -55,12 +55,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts index 328351a550..88aec94711 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts @@ -103,12 +103,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf", "led"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts index fedb5b061e..c55fa68920 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts @@ -99,12 +99,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts index cf586bf598..c6eda2e272 100644 --- a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts +++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts @@ -92,17 +92,15 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag"; + ralink,function = "gpio"; + }; - uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; - }; + uartf_gpio { + ralink,group = "uartf"; + ralink,function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts index 4e73c6988d..7f71e3fa3f 100644 --- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts +++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts @@ -93,12 +93,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts index 763256934d..57a9bec410 100644 --- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts +++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts @@ -92,12 +92,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi index a66b0096a7..10b51d7c5f 100644 --- a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi +++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi @@ -18,12 +18,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi index 1702d74db7..17f1497bfc 100644 --- a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi +++ b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi @@ -125,12 +125,10 @@ reset-names = "gpio uartf"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "led", "spi_cs1"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "led", "spi_cs1"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi index ff30966bf5..8665c7dd73 100644 --- a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi +++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi @@ -53,16 +53,14 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag"; - ralink,function = "gpio"; - }; - uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; - }; +&state_default { + gpio { + ralink,group = "jtag"; + ralink,function = "gpio"; + }; + uartf_gpio { + ralink,group = "uartf"; + ralink,function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts index 5db1ce48a1..4e7b6e267b 100644 --- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts +++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts @@ -55,12 +55,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts index 41fb6e06d8..bddf7adb5f 100644 --- a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts +++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts @@ -89,12 +89,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uartf", "led"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts index 1c894aff12..294cf3367f 100644 --- a/target/linux/ramips/dts/rt5350_poray_m3.dts +++ b/target/linux/ramips/dts/rt5350_poray_m3.dts @@ -84,12 +84,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi index df8db131e9..db39c77050 100644 --- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi +++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi @@ -34,12 +34,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts index 7e3d8b6f03..4a65acc5c6 100644 --- a/target/linux/ramips/dts/rt5350_poray_x5.dts +++ b/target/linux/ramips/dts/rt5350_poray_x5.dts @@ -116,12 +116,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts index 3b6d60478f..b02056379b 100644 --- a/target/linux/ramips/dts/rt5350_poray_x8.dts +++ b/target/linux/ramips/dts/rt5350_poray_x8.dts @@ -77,12 +77,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts index 9d13625516..ece2db036c 100644 --- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts +++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts @@ -99,12 +99,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf", "led"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts index 00e3d2df12..b485e1cefa 100644 --- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts +++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts @@ -98,12 +98,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index f4e4d17b02..8a3485971d 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -104,12 +104,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf", "led"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi index cce444c007..f5642744d8 100644 --- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi +++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi @@ -164,12 +164,10 @@ status = "okay"; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uartf", "led"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts index ff6ccd2247..4d1093d832 100644 --- a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts +++ b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts @@ -47,12 +47,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts index f88d5ae63f..ce747994d3 100644 --- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts +++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts @@ -128,12 +128,10 @@ pinctrl-0 = <&uartf_pins>; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag" ; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag" ; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts index d5d0ca3728..2be3c0b527 100644 --- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts +++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts @@ -82,12 +82,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "jtag", "uartf"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index b8db4fdc7f..f96ad9092a 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts @@ -90,12 +90,10 @@ }; }; -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; +&state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; }; }; From eca05bc4ccbba7d6cc718cdb66cba14c93aff663 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Mon, 23 Dec 2019 01:42:52 +0100 Subject: [PATCH 104/480] ramips: add label MAC address for Mikrotik RB750Gr3 The device label contains: E01: 74:4D:28:xx:xx:30 E05: 74:4D:28:xx:xx:34 The first value corresponds to the address set in hard_config 0x10. That one is taken for the label MAC address. Signed-off-by: Sven Roederer --- target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 5c6b5659cb..a3b9c079a6 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -230,9 +230,7 @@ ramips_setup_macs() mediatek,ap-mt7621a-v60) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x5)" 1) ;; - mikrotik,rb750gr3) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary hard_config 0x10)" 2) - ;; + mikrotik,rb750gr3|\ mikrotik,rbm33g) wan_mac=$(macaddr_add "$(mtd_get_mac_binary hard_config 0x10)" 2) label_mac=$(mtd_get_mac_binary hard_config 0x10) From fb19fb868cf5f1426ada869e4ad5b139a41ba78e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 22 Dec 2019 17:41:15 -0800 Subject: [PATCH 105/480] libcxx: Depenency fixes Don't build with uClibc-ng. It's totally unsupported as several functions are missing. Make the musl libc support conditional. Fix hash with make check FIXUP=1. Apparently I based the Makefile off of libedit and forgot to fix the hash. Signed-off-by: Rosen Penev Fixes: 856ea2bad3b3 ("libcxx: Add package") --- config/Config-build.in | 1 + package/libs/libcxx/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/Config-build.in b/config/Config-build.in index bde5730e76..c0e4d869f8 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -199,6 +199,7 @@ menu "Global build settings" config USE_LIBCXX bool "libc++" + depends on !USE_UCLIBC config USE_LIBSTDCXX bool "libstdc++" diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile index c1fa1d6b07..695b0398fe 100644 --- a/package/libs/libcxx/Makefile +++ b/package/libs/libcxx/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcxx PKG_VERSION:=9.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.llvm.org/git/libcxx PKG_SOURCE_VERSION:=2076f539f410805ef88692b9c0ce0a0b882a7680 -PKG_MIRROR_HASH:=6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39 +PKG_MIRROR_HASH:=d527880a18dec9109575c76717cf5288fb91c11381b9d261cae2e5bebcbdab2e PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=MIT @@ -42,8 +42,8 @@ CMAKE_OPTIONS += \ -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ -DLIBCXX_INCLUDE_DOCS=OFF \ -DLIBCXX_INCLUDE_TESTS=OFF \ - -DLIBCXX_HAS_MUSL_LIBC=ON \ - -DLIBCXX_STANDALONE_BUILD=ON + -DLIBCXX_STANDALONE_BUILD=ON \ + -DLIBCXX_HAS_MUSL_LIBC=$(if $(CONFIG_USE_MUSL),ON,OFF) TARGET_CXXFLAGS += -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -Wno-attributes -flto TARGET_LDFLAGS += -Wl,--as-needed From 2d899a69e71ae9d24146ee88195d1a1d48ff5179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 23 Dec 2019 13:03:20 +0100 Subject: [PATCH 106/480] brcm2708: remove unneeded patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - wireless patches - defconfig patches Signed-off-by: Álvaro Fernández Rojas --- ...n-mainline-source-for-rtl8192cu-wlan.patch | 172633 --------------- ...-brcm-adds-support-for-BCM43341-wifi.patch | 128 - ...rcmfmac-Mute-expected-startup-errors.patch | 24 - .../950-0096-config-Add-default-configs.patch | 2731 - ...uration-and-device-tree-differences..patch | 1304 +- ...c-Re-enable-firmware-roaming-support.patch | 29 - .../950-0138-Add-rpi-poe-fan-driver.patch | 22 - ...-Enable-Raspberry-Pi-voltage-monitor.patch | 34 - ...ld-bcmrpi3_defconfig-to-fix-warnings.patch | 326 - ...able-ARP-offloading-when-promiscuous.patch | 68 - ...onfig-enable-Audio-Graph-Card-module.patch | 31 - .../950-0153-config-Add-IPVLAN-module.patch | 30 - .../950-0154-config-Add-I2C_TINY_USB-m.patch | 35 - ...0156-Add-hd44780-module-to-defconfig.patch | 32 - ...audioinjector.net-ultra-soundcard.-2.patch | 22 - ...0-0166-configs-Add-SENSOR_GPIO_FAN-m.patch | 55 - ...9-configs-Add-CONFIG_HID_BIGBEN_FF-m.patch | 33 - ...50-0178-config-Add-CONFIG_USBIP_VUDC.patch | 31 - ...950-0182-Update-issue-templates-2736.patch | 47 - ...-Add-entry-for-BCM2835-Unicam-driver.patch | 28 - ...-Unicam-driver-and-various-sources-o.patch | 84 - ...2835_defconfig-Enable-bcm2835-camera.patch | 33 - ...m2835_defconfig-Enable-bcm2835-codec.patch | 22 - ...g-Add-bcm2835-codec-to-Pi-defconfigs.patch | 33 - ...PI-support-for-TPM1.2-and-TPM2.0-chi.patch | 104 - ...driver-for-3Dlab-Nano-soundcard-2758.patch | 22 - ...nfigs-Add-CONFIG_SND_AUDIOSENSE_PI-m.patch | 44 - ...50-0302-configs-Add-CONFIG_USB_TMC-m.patch | 70 - ...50-0305-configs-Add-CONFIG_USB_UAS-m.patch | 46 - ...river-for-the-HiFiBerry-DAC-ADC-2694.patch | 22 - ...am-and-subdevices-to-bcmrpi3_defconf.patch | 47 - ...d-VIDEO_BCM2835-to-bcmrpi3_defconfig.patch | 23 - ...L2-codec-driver-to-bcmrpi3_defconfig.patch | 23 - ...d-IPVLAN-module-to-bcmrpi3_defconfig.patch | 22 - ...346-configs-Enable-the-AD193x-codecs.patch | 36 - ...48-configs-Add-CONFIG_LEDS_PCA963X-m.patch | 47 - ...rcmfmac-Mute-expected-startup-errors.patch | 26 - ...63-config-Add-CONFIG_FB_TFT_SH1106-m.patch | 64 - ...50-0377-configs-Enable-MT76-USB-wifi.patch | 45 - ...ble-CONFIG_NETFILTER_XT_MATCH_SOCKET.patch | 47 - ...-configs-Add-CONFIG_BATTERY_MAX17040.patch | 44 - ...s-disable-memory-and-IO-cgroups-2908.patch | 81 - ...50-0394-configs-Add-RTC_DRV_RV3028-m.patch | 44 - ...iophonics-I-Sabre-9038Q2M-DAC-driver.patch | 33 - ...19-configs-Add-TOUCHSCREEN_ILI210X-m.patch | 42 - ...s-disable-memory-and-IO-cgroups-2908.patch | 79 - ...configs-enable-LED-driver-for-PiGlow.patch | 52 - ...77-configs-Enable-netdev-LED-trigger.patch | 42 - ...able-ICS-43432-I2S-microphone-module.patch | 42 - ...-IQaudIO-Pi-Codec-board-support-2969.patch | 33 - .../950-0491-configs-Enable-PIDs-cgroup.patch | 26 - ...ning-driver-for-3Dlab-Nano-soundcard.patch | 22 - ...50-0510-config-Add-NF_TABLES-support.patch | 166 - ...0-0637-configs-Add-bcm2711_defconfig.patch | 1343 - ...0-0638-2711-Add-basic-64-bit-support.patch | 1296 - ...50-0639-config-Add-NF_TABLES-support.patch | 87 - ..._defconfig-add-xhci-platform-support.patch | 20 - ...-bcm2711-to-match-bcm2709-on-extra-m.patch | 300 - ...B_SIMPLE-to-both-bcmrpi-and-bcm2709-.patch | 36 - ...2-camera-and-codec-drivers-from-bcmr.patch | 25 - ...-bcm2711-Remove-CONFIG_VIDEO_BCM2835.patch | 49 - ...e-USB_CONFIGFS-m-in-bcmrpi_defconfig.patch | 22 - ...d-all-the-other-USB_CONFIGFS-options.patch | 40 - ...gs-arm64-bcm2711-Add-MMC_SDHCI_IPROC.patch | 24 - ...rop-V4L2-camera-and-codec-drivers-fr.patch | 26 - ...rm64-bcm2711-Remove-CONFIG_VIDEO_BCM.patch | 49 - ..._SDHCI_BCM2711-from-arm64-bcm2711_de.patch | 23 - ...m2711-Use-CONFIG_BRCMSTB_THERMAL-ins.patch | 29 - ...igs-Enable-iio-driver-for-TI-ADS1015.patch | 42 - ...g-enable-PCI-portbus-support-and-imp.patch | 25 - ...ds-the-Hifiberry-DAC-ADC-PRO-version.patch | 33 - ...-correct-name-for-the-Raspberry-Pi-v.patch | 12 - ...IG_FRAMEBUFFER_CONSOLE_ROTATION-to-P.patch | 47 - ...62-configs-Regenerate-the-defconfigs.patch | 27 - ...e-building-the-DS28E17-driver-module.patch | 66 - ...768-configs-arm64-vcm2711-Enable-V3D.patch | 19 - ...950-0771-configs-Add-TINYDRM-modules.patch | 56 - ...the-Audio-Injector-Ultra-in-64-bit-l.patch | 32 - ...Sony-IMX219-driver-to-RPi-defconfigs.patch | 64 - ...dd-GPIO_PCA953X-LEDS_PCA9532-PCA955X.patch | 116 - ...O_V4L2_SUBDEV_API-y-on-arm64-bcm2711.patch | 22 - ...iberry-DAC-DSP-soundcard-driver-3224.patch | 33 - ...rm64-bcm2711_defconfig-based-on-the-.patch | 483 - 83 files changed, 3 insertions(+), 183652 deletions(-) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0096-config-Add-default-configs.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0135-brcmfmac-Re-enable-firmware-roaming-support.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0145-config-Enable-Raspberry-Pi-voltage-monitor.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0150-configs-Rebuild-bcmrpi3_defconfig-to-fix-warnings.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0151-brcmfmac-Disable-ARP-offloading-when-promiscuous.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0152-config-enable-Audio-Graph-Card-module.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0153-config-Add-IPVLAN-module.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0154-config-Add-I2C_TINY_USB-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0156-Add-hd44780-module-to-defconfig.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0166-configs-Add-SENSOR_GPIO_FAN-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0169-configs-Add-CONFIG_HID_BIGBEN_FF-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0178-config-Add-CONFIG_USBIP_VUDC.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0182-Update-issue-templates-2736.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0199-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0200-defconfig-Enable-Unicam-driver-and-various-sources-o.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0257-ARM-bcm2835_defconfig-Enable-bcm2835-camera.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0279-ARM-bcm2835_defconfig-Enable-bcm2835-codec.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0280-config-Add-bcm2835-codec-to-Pi-defconfigs.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0284-Enable-TPM-TIS-SPI-support-for-TPM1.2-and-TPM2.0-chi.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0301-configs-Add-CONFIG_SND_AUDIOSENSE_PI-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0302-configs-Add-CONFIG_USB_TMC-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0305-configs-Add-CONFIG_USB_UAS-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0342-configs-Add-Unicam-and-subdevices-to-bcmrpi3_defconf.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0343-configs-Add-VIDEO_BCM2835-to-bcmrpi3_defconfig.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0344-configs-Add-V4L2-codec-driver-to-bcmrpi3_defconfig.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0345-config-Add-IPVLAN-module-to-bcmrpi3_defconfig.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0348-configs-Add-CONFIG_LEDS_PCA963X-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0363-config-Add-CONFIG_FB_TFT_SH1106-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0377-configs-Enable-MT76-USB-wifi.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0381-configs-Re-enable-CONFIG_NETFILTER_XT_MATCH_SOCKET.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0387-configs-Add-CONFIG_BATTERY_MAX17040.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0389-defconfigs-disable-memory-and-IO-cgroups-2908.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0394-configs-Add-RTC_DRV_RV3028-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0419-configs-Add-TOUCHSCREEN_ILI210X-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0428-Revert-defconfigs-disable-memory-and-IO-cgroups-2908.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0430-configs-enable-LED-driver-for-PiGlow.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0477-configs-Enable-netdev-LED-trigger.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0484-configs-Enable-ICS-43432-I2S-microphone-module.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0491-configs-Enable-PIDs-cgroup.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0510-config-Add-NF_TABLES-support.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0637-configs-Add-bcm2711_defconfig.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0639-config-Add-NF_TABLES-support.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0640-bcm2711_defconfig-add-xhci-platform-support.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0646-defconfig-Update-bcm2711-to-match-bcm2709-on-extra-m.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0649-defconfigs-Add-FB_SIMPLE-to-both-bcmrpi-and-bcm2709-.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0676-configs-Drop-V4L2-camera-and-codec-drivers-from-bcmr.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0677-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM2835.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0679-configs-Enable-USB_CONFIGFS-m-in-bcmrpi_defconfig.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0680-configs-And-all-the-other-USB_CONFIGFS-options.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0681-configs-arm64-bcm2711-Add-MMC_SDHCI_IPROC.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0685-Revert-configs-Drop-V4L2-camera-and-codec-drivers-fr.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0686-Revert-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0688-configs-Drop-MMC_SDHCI_BCM2711-from-arm64-bcm2711_de.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0703-configs-arm64-bcm2711-Use-CONFIG_BRCMSTB_THERMAL-ins.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0708-configs-Enable-iio-driver-for-TI-ADS1015.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0709-bcm2711_defconfig-enable-PCI-portbus-support-and-imp.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0742-configs-Add-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION-to-P.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0762-configs-Regenerate-the-defconfigs.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0763-configs-Enable-building-the-DS28E17-driver-module.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0771-configs-Add-TINYDRM-modules.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0775-Add-support-for-the-Audio-Injector-Ultra-in-64-bit-l.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0780-defconfigs-Add-Sony-IMX219-driver-to-RPi-defconfigs.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0795-configs-Add-GPIO_PCA953X-LEDS_PCA9532-PCA955X.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0796-configs-Set-VIDEO_V4L2_SUBDEV_API-y-on-arm64-bcm2711.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0805-configs-Update-arm64-bcm2711_defconfig-based-on-the-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch b/target/linux/brcm2708/patches-4.19/950-0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch deleted file mode 100644 index 8b83a66579..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch +++ /dev/null @@ -1,172633 +0,0 @@ -From d8fc657857ace12def25894d0075e7bf1caf467e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 3 Sep 2012 17:10:23 +0100 -Subject: [PATCH 091/806] net: Add non-mainline source for rtl8192cu wlan - -We are now syncing with version from: -https://github.com/pvaret/rtl8192cu-fixes ---- - drivers/net/wireless/realtek/Kconfig | 1 + - drivers/net/wireless/realtek/Makefile | 1 + - .../net/wireless/realtek/rtl8192cu/Kconfig | 9 + - .../net/wireless/realtek/rtl8192cu/Makefile | 616 + - drivers/net/wireless/realtek/rtl8192cu/clean | 5 + - .../realtek/rtl8192cu/core/efuse/rtw_efuse.c | 1147 ++ - .../wireless/realtek/rtl8192cu/core/rtw_ap.c | 2943 ++++ - .../realtek/rtl8192cu/core/rtw_br_ext.c | 1700 ++ - .../wireless/realtek/rtl8192cu/core/rtw_cmd.c | 3035 ++++ - .../realtek/rtl8192cu/core/rtw_debug.c | 1337 ++ - .../realtek/rtl8192cu/core/rtw_eeprom.c | 423 + - .../realtek/rtl8192cu/core/rtw_ieee80211.c | 1916 +++ - .../wireless/realtek/rtl8192cu/core/rtw_io.c | 464 + - .../realtek/rtl8192cu/core/rtw_ioctl_query.c | 196 + - .../realtek/rtl8192cu/core/rtw_ioctl_rtl.c | 1031 ++ - .../realtek/rtl8192cu/core/rtw_ioctl_set.c | 1494 ++ - .../wireless/realtek/rtl8192cu/core/rtw_iol.c | 263 + - .../realtek/rtl8192cu/core/rtw_mlme.c | 3967 +++++ - .../realtek/rtl8192cu/core/rtw_mlme_ext.c | 13600 ++++++++++++++++ - .../wireless/realtek/rtl8192cu/core/rtw_mp.c | 1324 ++ - .../realtek/rtl8192cu/core/rtw_mp_ioctl.c | 2954 ++++ - .../wireless/realtek/rtl8192cu/core/rtw_p2p.c | 5370 ++++++ - .../realtek/rtl8192cu/core/rtw_pwrctrl.c | 1551 ++ - .../realtek/rtl8192cu/core/rtw_recv.c | 4306 +++++ - .../wireless/realtek/rtl8192cu/core/rtw_rf.c | 95 + - .../realtek/rtl8192cu/core/rtw_security.c | 3115 ++++ - .../realtek/rtl8192cu/core/rtw_sreset.c | 352 + - .../realtek/rtl8192cu/core/rtw_sta_mgt.c | 848 + - .../realtek/rtl8192cu/core/rtw_tdls.c | 2941 ++++ - .../realtek/rtl8192cu/core/rtw_wlan_util.c | 2305 +++ - .../realtek/rtl8192cu/core/rtw_xmit.c | 4156 +++++ - .../realtek/rtl8192cu/hal/HalPwrSeqCmd.c | 177 + - .../net/wireless/realtek/rtl8192cu/hal/dm.c | 314 + - .../net/wireless/realtek/rtl8192cu/hal/dm.h | 30 + - .../wireless/realtek/rtl8192cu/hal/hal_com.c | 371 + - .../wireless/realtek/rtl8192cu/hal/hal_intf.c | 546 + - .../rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c | 1159 ++ - .../rtl8192cu/hal/rtl8192c/rtl8192c_dm.c | 5058 ++++++ - .../hal/rtl8192c/rtl8192c_hal_init.c | 3628 +++++ - .../rtl8192cu/hal/rtl8192c/rtl8192c_mp.c | 1207 ++ - .../rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c | 4841 ++++++ - .../rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c | 1031 ++ - .../rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c | 876 + - .../rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c | 94 + - .../rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c | 63 + - .../hal/rtl8192c/usb/Hal8192CUHWImg.c | 8758 ++++++++++ - .../hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c | 2564 +++ - .../hal/rtl8192c/usb/rtl8192cu_led.c | 2680 +++ - .../hal/rtl8192c/usb/rtl8192cu_recv.c | 229 + - .../hal/rtl8192c/usb/rtl8192cu_xmit.c | 1150 ++ - .../rtl8192cu/hal/rtl8192c/usb/usb_halinit.c | 6261 +++++++ - .../rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c | 1207 ++ - .../hal/rtl8192c/usb/usb_ops_linux.c | 1536 ++ - .../rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c | 1265 ++ - .../wireless/realtek/rtl8192cu/ifcfg-wlan0 | 4 + - .../rtl8192cu/include/Hal8192CEHWImg.h | 85 + - .../rtl8192cu/include/Hal8192CPhyCfg.h | 428 + - .../rtl8192cu/include/Hal8192CPhyReg.h | 1123 ++ - .../rtl8192cu/include/Hal8192CUHWImg.h | 105 + - .../rtl8192cu/include/Hal8192CUHWImg_wowlan.h | 34 + - .../rtl8192cu/include/Hal8192DEHWImg.h | 66 + - .../rtl8192cu/include/Hal8192DPhyCfg.h | 528 + - .../rtl8192cu/include/Hal8192DPhyReg.h | 1171 ++ - .../rtl8192cu/include/Hal8192DUHWImg.h | 66 + - .../rtl8192cu/include/Hal8192DUHWImg_wowlan.h | 30 + - .../realtek/rtl8192cu/include/HalPwrSeqCmd.h | 137 + - .../realtek/rtl8192cu/include/autoconf.h | 336 + - .../realtek/rtl8192cu/include/basic_types.h | 321 + - .../rtl8192cu/include/byteorder/big_endian.h | 87 + - .../rtl8192cu/include/byteorder/generic.h | 212 + - .../include/byteorder/little_endian.h | 89 + - .../rtl8192cu/include/byteorder/swab.h | 140 + - .../rtl8192cu/include/byteorder/swabb.h | 156 + - .../realtek/rtl8192cu/include/circ_buf.h | 27 + - .../realtek/rtl8192cu/include/cmd_osdep.h | 36 + - .../realtek/rtl8192cu/include/drv_conf.h | 78 + - .../realtek/rtl8192cu/include/drv_types.h | 662 + - .../realtek/rtl8192cu/include/drv_types_ce.h | 92 + - .../rtl8192cu/include/drv_types_linux.h | 25 + - .../rtl8192cu/include/drv_types_sdio.h | 70 + - .../realtek/rtl8192cu/include/drv_types_xp.h | 95 + - .../realtek/rtl8192cu/include/ethernet.h | 41 + - .../realtek/rtl8192cu/include/h2clbk.h | 35 + - .../realtek/rtl8192cu/include/hal_com.h | 146 + - .../realtek/rtl8192cu/include/hal_intf.h | 432 + - .../realtek/rtl8192cu/include/ieee80211.h | 1580 ++ - .../realtek/rtl8192cu/include/ieee80211_ext.h | 477 + - .../realtek/rtl8192cu/include/if_ether.h | 112 + - .../rtl8192cu/include/ioctl_cfg80211.h | 184 + - .../wireless/realtek/rtl8192cu/include/ip.h | 141 + - .../rtl8192cu/include/linux/wireless.h | 90 + - .../realtek/rtl8192cu/include/mlme_osdep.h | 40 + - .../realtek/rtl8192cu/include/mp_custom_oid.h | 353 + - .../realtek/rtl8192cu/include/nic_spec.h | 47 + - .../rtl8192cu/include/osdep_ce_service.h | 171 + - .../realtek/rtl8192cu/include/osdep_intf.h | 155 + - .../realtek/rtl8192cu/include/osdep_service.h | 1821 +++ - .../realtek/rtl8192cu/include/pci_hal.h | 168 + - .../realtek/rtl8192cu/include/pci_ops.h | 60 + - .../realtek/rtl8192cu/include/pci_osintf.h | 33 + - .../realtek/rtl8192cu/include/recv_osdep.h | 58 + - .../realtek/rtl8192cu/include/rtl8192c_cmd.h | 153 + - .../realtek/rtl8192cu/include/rtl8192c_dm.h | 516 + - .../rtl8192cu/include/rtl8192c_event.h | 28 + - .../realtek/rtl8192cu/include/rtl8192c_hal.h | 937 ++ - .../realtek/rtl8192cu/include/rtl8192c_led.h | 42 + - .../realtek/rtl8192cu/include/rtl8192c_recv.h | 184 + - .../realtek/rtl8192cu/include/rtl8192c_rf.h | 92 + - .../realtek/rtl8192cu/include/rtl8192c_spec.h | 1865 +++ - .../rtl8192cu/include/rtl8192c_sreset.h | 32 + - .../realtek/rtl8192cu/include/rtl8192c_xmit.h | 129 + - .../realtek/rtl8192cu/include/rtl8192d_cmd.h | 142 + - .../realtek/rtl8192cu/include/rtl8192d_dm.h | 420 + - .../realtek/rtl8192cu/include/rtl8192d_hal.h | 1126 ++ - .../realtek/rtl8192cu/include/rtl8192d_led.h | 43 + - .../realtek/rtl8192cu/include/rtl8192d_recv.h | 187 + - .../realtek/rtl8192cu/include/rtl8192d_rf.h | 97 + - .../realtek/rtl8192cu/include/rtl8192d_spec.h | 1841 +++ - .../realtek/rtl8192cu/include/rtl8192d_xmit.h | 145 + - .../realtek/rtl8192cu/include/rtw_android.h | 90 + - .../realtek/rtl8192cu/include/rtw_ap.h | 64 + - .../realtek/rtl8192cu/include/rtw_br_ext.h | 76 + - .../realtek/rtl8192cu/include/rtw_byteorder.h | 40 + - .../realtek/rtl8192cu/include/rtw_cmd.h | 1167 ++ - .../realtek/rtl8192cu/include/rtw_debug.h | 538 + - .../realtek/rtl8192cu/include/rtw_eeprom.h | 152 + - .../realtek/rtl8192cu/include/rtw_efuse.h | 124 + - .../realtek/rtl8192cu/include/rtw_event.h | 154 + - .../realtek/rtl8192cu/include/rtw_ht.h | 50 + - .../realtek/rtl8192cu/include/rtw_io.h | 504 + - .../realtek/rtl8192cu/include/rtw_ioctl.h | 269 + - .../rtl8192cu/include/rtw_ioctl_query.h | 36 + - .../realtek/rtl8192cu/include/rtw_ioctl_rtl.h | 83 + - .../realtek/rtl8192cu/include/rtw_ioctl_set.h | 79 + - .../realtek/rtl8192cu/include/rtw_iol.h | 89 + - .../realtek/rtl8192cu/include/rtw_led.h | 217 + - .../realtek/rtl8192cu/include/rtw_mlme.h | 850 + - .../realtek/rtl8192cu/include/rtw_mlme_ext.h | 963 ++ - .../realtek/rtl8192cu/include/rtw_mp.h | 712 + - .../realtek/rtl8192cu/include/rtw_mp_ioctl.h | 596 + - .../rtl8192cu/include/rtw_mp_phy_regdef.h | 1097 ++ - .../realtek/rtl8192cu/include/rtw_p2p.h | 161 + - .../realtek/rtl8192cu/include/rtw_pwrctrl.h | 362 + - .../realtek/rtl8192cu/include/rtw_qos.h | 40 + - .../realtek/rtl8192cu/include/rtw_recv.h | 731 + - .../realtek/rtl8192cu/include/rtw_rf.h | 152 + - .../realtek/rtl8192cu/include/rtw_security.h | 447 + - .../realtek/rtl8192cu/include/rtw_sreset.h | 74 + - .../realtek/rtl8192cu/include/rtw_tdls.h | 143 + - .../realtek/rtl8192cu/include/rtw_version.h | 1 + - .../realtek/rtl8192cu/include/rtw_xmit.h | 754 + - .../realtek/rtl8192cu/include/sta_info.h | 432 + - .../realtek/rtl8192cu/include/usb_hal.h | 37 + - .../realtek/rtl8192cu/include/usb_ops.h | 110 + - .../realtek/rtl8192cu/include/usb_ops_linux.h | 63 + - .../realtek/rtl8192cu/include/usb_osintf.h | 38 + - .../rtl8192cu/include/usb_vendor_req.h | 59 + - .../wireless/realtek/rtl8192cu/include/wifi.h | 1248 ++ - .../realtek/rtl8192cu/include/wlan_bssdef.h | 703 + - .../realtek/rtl8192cu/include/xmit_osdep.h | 95 + - .../rtl8192cu/os_dep/linux/ioctl_cfg80211.c | 5589 +++++++ - .../rtl8192cu/os_dep/linux/ioctl_linux.c | 11909 ++++++++++++++ - .../rtl8192cu/os_dep/linux/mlme_linux.c | 653 + - .../realtek/rtl8192cu/os_dep/linux/os_intfs.c | 2768 ++++ - .../realtek/rtl8192cu/os_dep/linux/pci_intf.c | 1997 +++ - .../rtl8192cu/os_dep/linux/pci_ops_linux.c | 24 + - .../rtl8192cu/os_dep/linux/recv_linux.c | 461 + - .../rtl8192cu/os_dep/linux/rtw_android.c | 839 + - .../realtek/rtl8192cu/os_dep/linux/usb_intf.c | 1662 ++ - .../rtl8192cu/os_dep/linux/usb_ops_linux.c | 649 + - .../rtl8192cu/os_dep/linux/xmit_linux.c | 421 + - .../realtek/rtl8192cu/os_dep/osdep_service.c | 2300 +++ - drivers/net/wireless/realtek/rtl8192cu/runwpa | 20 + - .../net/wireless/realtek/rtl8192cu/wlan0dhcp | 15 + - 174 files changed, 171743 insertions(+) - create mode 100644 drivers/net/wireless/realtek/rtl8192cu/Kconfig - create mode 100644 drivers/net/wireless/realtek/rtl8192cu/Makefile - create mode 100644 drivers/net/wireless/realtek/rtl8192cu/clean - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/dm.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/dm.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0 - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/ip.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h - create mode 100644 drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/wifi.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/runwpa - create mode 100755 drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp - ---- a/drivers/net/wireless/realtek/Kconfig -+++ b/drivers/net/wireless/realtek/Kconfig -@@ -13,6 +13,7 @@ if WLAN_VENDOR_REALTEK - - source "drivers/net/wireless/realtek/rtl818x/Kconfig" - source "drivers/net/wireless/realtek/rtlwifi/Kconfig" -+source "drivers/net/wireless/realtek/rtl8192cu/Kconfig" - source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig" - - endif # WLAN_VENDOR_REALTEK ---- a/drivers/net/wireless/realtek/Makefile -+++ b/drivers/net/wireless/realtek/Makefile -@@ -5,5 +5,6 @@ - obj-$(CONFIG_RTL8180) += rtl818x/ - obj-$(CONFIG_RTL8187) += rtl818x/ - obj-$(CONFIG_RTLWIFI) += rtlwifi/ -+obj-$(CONFIG_RTL8192CU) += rtl8192cu/ - obj-$(CONFIG_RTL8XXXU) += rtl8xxxu/ - ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/Kconfig -@@ -0,0 +1,9 @@ -+config RTL8192CU -+ tristate "Realtek 8192C USB WiFi" -+ depends on MAC80211 && USB -+ select CFG80211_WEXT -+ select WIRELESS_EXT -+ select WEXT_PRIV -+ ---help--- -+ This option adds the Realtek RTL8192CU USB device such as Edimax EW-7811Un. -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/Makefile -@@ -0,0 +1,616 @@ -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+EXTRA_CFLAGS += -O1 -+#EXTRA_CFLAGS += -O3 -+#EXTRA_CFLAGS += -Wall -+#EXTRA_CFLAGS += -Wextra -+#EXTRA_CFLAGS += -Werror -+#EXTRA_CFLAGS += -pedantic -+#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -+ -+EXTRA_CFLAGS += -Wno-unused-variable -+EXTRA_CFLAGS += -Wno-unused-value -+EXTRA_CFLAGS += -Wno-unused-label -+EXTRA_CFLAGS += -Wno-unused-parameter -+EXTRA_CFLAGS += -Wno-unused-function -+EXTRA_CFLAGS += -Wno-unused -+ -+EXTRA_CFLAGS += -Wno-uninitialized -+ -+EXTRA_CFLAGS += -I$(src)/include -+ -+CONFIG_AUTOCFG_CP = n -+ -+CONFIG_RTL8192C = y -+CONFIG_RTL8192D = n -+CONFIG_RTL8723A = n -+ -+CONFIG_USB_HCI = y -+CONFIG_PCI_HCI = n -+CONFIG_SDIO_HCI = n -+ -+CONFIG_MP_INCLUDED = n -+CONFIG_POWER_SAVING = y -+CONFIG_USB_AUTOSUSPEND = n -+CONFIG_HW_PWRP_DETECTION = n -+CONFIG_WIFI_TEST = n -+CONFIG_BT_COEXISTENCE = n -+CONFIG_RTL8192CU_REDEFINE_1X1 = n -+CONFIG_INTEL_WIDI = n -+CONFIG_WAKE_ON_WLAN = n -+ -+CONFIG_PLATFORM_I386_PC = y -+CONFIG_PLATFORM_TI_AM3517 = n -+CONFIG_PLATFORM_ANDROID_X86 = n -+CONFIG_PLATFORM_JB_X86 = n -+CONFIG_PLATFORM_ARM_S3C2K4 = n -+CONFIG_PLATFORM_ARM_PXA2XX = n -+CONFIG_PLATFORM_ARM_S3C6K4 = n -+CONFIG_PLATFORM_MIPS_RMI = n -+CONFIG_PLATFORM_RTD2880B = n -+CONFIG_PLATFORM_MIPS_AR9132 = n -+CONFIG_PLATFORM_RTK_DMP = n -+CONFIG_PLATFORM_MIPS_PLM = n -+CONFIG_PLATFORM_MSTAR389 = n -+CONFIG_PLATFORM_MT53XX = n -+CONFIG_PLATFORM_ARM_MX51_241H = n -+CONFIG_PLATFORM_FS_MX61 = n -+CONFIG_PLATFORM_ACTIONS_ATJ227X = n -+CONFIG_PLATFORM_TEGRA3_CARDHU = n -+CONFIG_PLATFORM_TEGRA4_DALMORE = n -+CONFIG_PLATFORM_ARM_TCC8900 = n -+CONFIG_PLATFORM_ARM_TCC8920 = n -+CONFIG_PLATFORM_ARM_TCC8920_JB42 = n -+CONFIG_PLATFORM_ARM_RK2818 = n -+CONFIG_PLATFORM_ARM_TI_PANDA = n -+CONFIG_PLATFORM_MIPS_JZ4760 = n -+CONFIG_PLATFORM_DMP_PHILIPS = n -+CONFIG_PLATFORM_TI_DM365 = n -+CONFIG_PLATFORM_MN10300 = n -+CONFIG_PLATFORM_MSTAR_TITANIA12 = n -+CONFIG_PLATFORM_MSTAR_A3 = n -+CONFIG_PLATFORM_ARM_SUNxI = n -+CONFIG_PLATFORM_ARM_SUN6I = n -+ -+CONFIG_DRVEXT_MODULE = n -+ -+export TopDIR ?= $(shell pwd) -+ -+ -+ifeq ($(CONFIG_RTL8192C), y) -+ -+RTL871X = rtl8192c -+ -+ifeq ($(CONFIG_USB_HCI), y) -+MODULE_NAME = 8192cu -+FW_FILES := hal/$(RTL871X)/usb/Hal8192CUHWImg.o -+ifneq ($(CONFIG_WAKE_ON_WLAN), n) -+FW_FILES += hal/$(RTL871X)/usb/Hal8192CUHWImg_wowlan.o -+endif -+endif -+ifeq ($(CONFIG_PCI_HCI), y) -+MODULE_NAME = 8192ce -+FW_FILES := hal/$(RTL871X)/pci/Hal8192CEHWImg.o -+endif -+ -+CHIP_FILES := \ -+ hal/$(RTL871X)/$(RTL871X)_sreset.o \ -+ hal/$(RTL871X)/$(RTL871X)_xmit.o -+CHIP_FILES += $(FW_FILES) -+endif -+ -+ifeq ($(CONFIG_RTL8192D), y) -+ -+RTL871X = rtl8192d -+ -+ifeq ($(CONFIG_USB_HCI), y) -+MODULE_NAME = 8192du -+FW_FILES := hal/$(RTL871X)/usb/Hal8192DUHWImg.o -+ifneq ($(CONFIG_WAKE_ON_WLAN), n) -+FW_FILES += hal/$(RTL871X)/usb/Hal8192DUHWImg_wowlan.o -+endif -+endif -+ifeq ($(CONFIG_PCI_HCI), y) -+MODULE_NAME = 8192de -+FW_FILES := hal/$(RTL871X)/pci/Hal8192DEHWImg.o -+endif -+ -+CHIP_FILES := \ -+ hal/$(RTL871X)/$(RTL871X)_xmit.o -+CHIP_FILES += $(FW_FILES) -+endif -+ -+ifeq ($(CONFIG_RTL8723A), y) -+ -+RTL871X = rtl8723a -+ -+ifeq ($(CONFIG_SDIO_HCI), y) -+MODULE_NAME = 8723as -+FW_FILES := hal/$(RTL871X)/sdio/Hal8723SHWImg.o -+endif -+ -+ifeq ($(CONFIG_USB_HCI), y) -+MODULE_NAME = 8723au -+FW_FILES := hal/$(RTL871X)/usb/Hal8723UHWImg.o -+endif -+ -+ifeq ($(CONFIG_PCI_HCI), y) -+MODULE_NAME = 8723ae -+FW_FILES := hal/$(RTL871X)/pci/Hal8723EHWImg.o -+endif -+ -+PWRSEQ_FILES := hal/HalPwrSeqCmd.o \ -+ hal/$(RTL871X)/Hal8723PwrSeq.o -+ -+CHIP_FILES += $(FW_FILES) $(PWRSEQ_FILES) -+ -+endif -+ -+ifeq ($(CONFIG_SDIO_HCI), y) -+HCI_NAME = sdio -+endif -+ -+ifeq ($(CONFIG_USB_HCI), y) -+HCI_NAME = usb -+endif -+ -+ifeq ($(CONFIG_PCI_HCI), y) -+HCI_NAME = pci -+endif -+ -+ -+_OS_INTFS_FILES := os_dep/osdep_service.o \ -+ os_dep/linux/os_intfs.o \ -+ os_dep/linux/$(HCI_NAME)_intf.o \ -+ os_dep/linux/$(HCI_NAME)_ops_linux.o \ -+ os_dep/linux/ioctl_linux.o \ -+ os_dep/linux/xmit_linux.o \ -+ os_dep/linux/mlme_linux.o \ -+ os_dep/linux/recv_linux.o \ -+ os_dep/linux/ioctl_cfg80211.o \ -+ os_dep/linux/rtw_android.o -+ -+ -+_HAL_INTFS_FILES := hal/hal_intf.o \ -+ hal/hal_com.o \ -+ hal/dm.o \ -+ hal/$(RTL871X)/$(RTL871X)_hal_init.o \ -+ hal/$(RTL871X)/$(RTL871X)_phycfg.o \ -+ hal/$(RTL871X)/$(RTL871X)_rf6052.o \ -+ hal/$(RTL871X)/$(RTL871X)_dm.o \ -+ hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ -+ hal/$(RTL871X)/$(RTL871X)_cmd.o \ -+ hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ -+ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ -+ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ -+ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o -+ -+ifeq ($(CONFIG_SDIO_HCI), y) -+_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -+else -+_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -+endif -+ -+ifeq ($(CONFIG_MP_INCLUDED), y) -+_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_mp.o -+endif -+ -+_HAL_INTFS_FILES += $(CHIP_FILES) -+ -+ -+ifeq ($(CONFIG_AUTOCFG_CP), y) -+$(shell cp $(TopDIR)/autoconf_$(RTL871X)_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -+endif -+ -+ -+ifeq ($(CONFIG_USB_HCI), y) -+ifeq ($(CONFIG_USB_AUTOSUSPEND), y) -+EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND -+endif -+endif -+ -+ifeq ($(CONFIG_POWER_SAVING), y) -+EXTRA_CFLAGS += -DCONFIG_POWER_SAVING -+endif -+ -+ifeq ($(CONFIG_HW_PWRP_DETECTION), y) -+EXTRA_CFLAGS += -DCONFIG_HW_PWRP_DETECTION -+endif -+ -+ifeq ($(CONFIG_WIFI_TEST), y) -+EXTRA_CFLAGS += -DCONFIG_WIFI_TEST -+endif -+ -+ifeq ($(CONFIG_BT_COEXISTENCE), y) -+EXTRA_CFLAGS += -DCONFIG_BT_COEXISTENCE -+endif -+ -+ifeq ($(CONFIG_RTL8192CU_REDEFINE_1X1), y) -+EXTRA_CFLAGS += -DRTL8192C_RECONFIG_TO_1T1R -+endif -+ -+ifeq ($(CONFIG_WAKE_ON_WLAN), y) -+EXTRA_CFLAGS += -DCONFIG_WAKE_ON_WLAN -+endif -+ -+ifeq ($(CONFIG_INTEL_WIDI), y) -+EXTRA_CFLAGS += -DCONFIG_INTEL_WIDI -+endif -+ -+ifeq ($(CONFIG_PLATFORM_I386_PC), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) -+ARCH ?= $(SUBARCH) -+CROSS_COMPILE ?= -+KVER := $(shell uname -r) -+KSRC := /lib/modules/$(KVER)/build -+MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ -+INSTALL_PREFIX := -+endif -+ -+ifeq ($(CONFIG_PLATFORM_TI_AM3517), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE -+CROSS_COMPILE := arm-eabi- -+KSRC := $(shell pwd)/../../../Android/kernel -+ARCH := arm -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MSTAR_TITANIA12), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12 -+ARCH:=mips -+CROSS_COMPILE:= /usr/src/Mstar_kernel/mips-4.3/bin/mips-linux-gnu- -+KVER:= 2.6.28.9 -+KSRC:= /usr/src/Mstar_kernel/2.6.28.9/ -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MSTAR_A3), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_A3 -+ARCH:=arm -+CROSS_COMPILE:= arm-none-linux-gnueabi- -+KVER:= 2.6.35.11 -+KSRC:= /home/gary/PERFORCE/THEALE/RedLion/2.6.35.11/ -+MODULE_NAME = wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ANDROID_X86), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) -+ARCH := $(SUBARCH) -+CROSS_COMPILE := /media/DATA-2/android-x86/ics-x86_20120130/prebuilt/linux-x86/toolchain/i686-unknown-linux-gnu-4.2.1/bin/i686-unknown-linux-gnu- -+KSRC := /media/DATA-2/android-x86/ics-x86_20120130/out/target/product/generic_x86/obj/kernel -+MODULE_NAME :=wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_JB_X86), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -+EXTRA_CFLAGS += -DCONFIG_P2P_IPS -+SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) -+ARCH := $(SUBARCH) -+CROSS_COMPILE := /home/android_sdk/android-x86_JB/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7/bin/i686-linux-android- -+KSRC := /home/android_sdk/android-x86_JB/out/target/product/x86/obj/kernel/ -+MODULE_NAME :=wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_PXA2XX), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH := arm -+CROSS_COMPILE := arm-none-linux-gnueabi- -+KVER := 2.6.34.1 -+KSRC ?= /usr/src/linux-2.6.34.1 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_S3C2K4), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH := arm -+CROSS_COMPILE := arm-linux- -+KVER := 2.6.24.7_$(ARCH) -+KSRC := /usr/src/kernels/linux-$(KVER) -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_S3C6K4), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH := arm -+CROSS_COMPILE := arm-none-linux-gnueabi- -+KVER := 2.6.34.1 -+KSRC ?= /usr/src/linux-2.6.34.1 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_RTD2880B), y) -+EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B -+ARCH:= -+CROSS_COMPILE:= -+KVER:= -+KSRC:= -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MIPS_RMI), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH:=mips -+CROSS_COMPILE:=mipsisa32r2-uclibc- -+KVER:= -+KSRC:= /root/work/kernel_realtek -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MIPS_PLM), y) -+EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -+ARCH:=mips -+CROSS_COMPILE:=mipsisa32r2-uclibc- -+KVER:= -+KSRC:= /root/work/kernel_realtek -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MSTAR389), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389 -+ARCH:=mips -+CROSS_COMPILE:= mips-linux-gnu- -+KVER:= 2.6.28.10 -+KSRC:= /home/mstar/mstar_linux/2.6.28.9/ -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MIPS_AR9132), y) -+EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -+ARCH := mips -+CROSS_COMPILE := mips-openwrt-linux- -+KSRC := /home/alex/test_openwrt/tmp/linux-2.6.30.9 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_DMP_PHILIPS), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -+ARCH := mips -+#CROSS_COMPILE:=/usr/local/msdk-4.3.6-mips-EL-2.6.12.6-0.9.30.3/bin/mipsel-linux- -+CROSS_COMPILE:=/usr/local/toolchain_mipsel/bin/mipsel-linux- -+KSRC ?=/usr/local/Jupiter/linux-2.6.12 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_RTK_DMP), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -+ARCH:=mips -+CROSS_COMPILE:=mipsel-linux- -+KVER:= -+KSRC ?= /usr/src/DMP_Kernel/jupiter/linux-2.6.12 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MT53XX), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX -+ARCH:= arm -+CROSS_COMPILE:= arm11_mtk_le- -+KVER:= 2.6.27 -+KSRC?= /proj/mtk00802/BD_Compare/BDP/Dev/BDP_V301/BDP_Linux/linux-2.6.27 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_MX51_241H), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM -+ARCH := arm -+CROSS_COMPILE := /opt/freescale/usr/local/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi- -+KVER := 2.6.31 -+KSRC ?= /lib/modules/2.6.31-770-g0e46b52/source -+endif -+ -+ifeq ($(CONFIG_PLATFORM_FS_MX61), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH := arm -+CROSS_COMPILE := /home/share/CusEnv/FreeScale/arm-eabi-4.4.3/bin/arm-eabi- -+KSRC ?= /home/share/CusEnv/FreeScale/FS_kernel_env -+endif -+ -+ -+ -+ifeq ($(CONFIG_PLATFORM_ACTIONS_ATJ227X), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X -+ARCH := mips -+CROSS_COMPILE := /home/cnsd4/project/actions/tools-2.6.27/bin/mipsel-linux-gnu- -+KVER := 2.6.27 -+KSRC := /home/cnsd4/project/actions/linux-2.6.27.28 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_TI_DM365), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365 -+ARCH := arm -+CROSS_COMPILE := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/arm/v5t_le/bin/arm_v5t_le- -+KVER := 2.6.18 -+KSRC := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/lsp/ti-davinci/linux-dm365 -+endif -+ -+ifeq ($(CONFIG_PLATFORM_TEGRA3_CARDHU), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+# default setting for Android 4.1, 4.2 -+EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC -+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -+EXTRA_CFLAGS += -DCONFIG_P2P_IPS -+ARCH := arm -+CROSS_COMPILE := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- -+KSRC := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/out/target/product/cardhu/obj/KERNEL -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_TEGRA4_DALMORE), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+# default setting for Android 4.1, 4.2 -+EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC -+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -+EXTRA_CFLAGS += -DCONFIG_P2P_IPS -+ARCH := arm -+CROSS_COMPILE := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- -+KSRC := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/out/target/product/dalmore/obj/KERNEL -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_TCC8900), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH := arm -+CROSS_COMPILE := /home/android_sdk/Telechips/SDK_2304_20110613/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- -+KSRC := /home/android_sdk/Telechips/SDK_2304_20110613/kernel -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_TCC8920), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+ARCH := arm -+CROSS_COMPILE := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- -+KSRC := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/kernel -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_TCC8920_JB42), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+# default setting for Android 4.1, 4.2 -+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -+EXTRA_CFLAGS += -DCONFIG_P2P_IPS -+ARCH := arm -+CROSS_COMPILE := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- -+KSRC := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/kernel -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_RK2818), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS -DCONFIG_MINIMAL_MEMORY_USAGE -+ARCH := arm -+CROSS_COMPILE := /usr/src/release_fae_version/toolchain/arm-eabi-4.4.0/bin/arm-eabi- -+KSRC := /usr/src/release_fae_version/kernel25_A7_281x -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_TI_PANDA), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE -+ARCH := arm -+#CROSS_COMPILE := /media/DATA-1/aosp/ics-aosp_20111227/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- -+#KSRC := /media/DATA-1/aosp/android-omap-panda-3.0_20120104 -+CROSS_COMPILE := /media/DATA-1/android-4.0/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- -+KSRC := /media/DATA-1/android-4.0/panda_kernel/omap -+MODULE_NAME := wlan -+endif -+ -+ifeq ($(CONFIG_PLATFORM_MIPS_JZ4760), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE -+ARCH ?= mips -+CROSS_COMPILE ?= /mnt/sdb5/Ingenic/Umido/mips-4.3/bin/mips-linux-gnu- -+KSRC ?= /mnt/sdb5/Ingenic/Umido/kernel -+endif -+ -+#Add setting for MN10300 -+ifeq ($(CONFIG_PLATFORM_MN10300), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MN10300 -+ARCH := mn10300 -+CROSS_COMPILE := mn10300-linux- -+KVER := 2.6.32.2 -+KSRC := /home/winuser/work/Plat_sLD2T_V3010/usr/src/linux-2.6.32.2 -+INSTALL_PREFIX := -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_SUNxI), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ARM_SUNxI -+ARCH := arm -+CROSS_COMPILE := arm-none-linux-gnueabi- -+KVER := 3.0.8 -+#KSRC:= ../lichee/linux-3.0/ -+endif -+ -+ifeq ($(CONFIG_PLATFORM_ARM_SUN6I), y) -+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -+EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN6I -+EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -+EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT -+# default setting for Android 4.1, 4.2 -+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -+EXTRA_CFLAGS += -DCONFIG_P2P_IPS -+ARCH := arm -+CROSS_COMPILE := arm-none-linux-gnueabi- -+KVER := 3.3.0 -+#KSRC:= ../lichee/linux-3.3/ -+endif -+ -+ifneq ($(USER_MODULE_NAME),) -+MODULE_NAME := $(USER_MODULE_NAME) -+endif -+ -+ifeq ($(CONFIG_MP_INCLUDED), y) -+MODULE_NAME := $(MODULE_NAME)_mp -+EXTRA_CFLAGS += -DCONFIG_MP_INCLUDED -+endif -+ -+ -+ifneq ($(KERNELRELEASE),) -+ -+ -+rtk_core := core/rtw_cmd.o \ -+ core/rtw_security.o \ -+ core/rtw_debug.o \ -+ core/rtw_io.o \ -+ core/rtw_ioctl_query.o \ -+ core/rtw_ioctl_set.o \ -+ core/rtw_ieee80211.o \ -+ core/rtw_mlme.o \ -+ core/rtw_mlme_ext.o \ -+ core/rtw_wlan_util.o \ -+ core/rtw_pwrctrl.o \ -+ core/rtw_rf.o \ -+ core/rtw_recv.o \ -+ core/rtw_sta_mgt.o \ -+ core/rtw_ap.o \ -+ core/rtw_xmit.o \ -+ core/rtw_p2p.o \ -+ core/rtw_tdls.o \ -+ core/rtw_br_ext.o \ -+ core/rtw_iol.o \ -+ core/rtw_sreset.o -+ -+$(MODULE_NAME)-y += $(rtk_core) -+ -+$(MODULE_NAME)-$(CONFIG_INTEL_WIDI) += core/rtw_intel_widi.o -+ -+$(MODULE_NAME)-y += core/efuse/rtw_efuse.o -+ -+$(MODULE_NAME)-y += $(_HAL_INTFS_FILES) -+ -+$(MODULE_NAME)-y += $(_OS_INTFS_FILES) -+ -+$(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o \ -+ core/rtw_mp_ioctl.o -+ -+obj-$(CONFIG_RTL8192CU) := $(MODULE_NAME).o -+ -+else -+ -+export CONFIG_RTL8192CU = m -+ -+all: modules -+ -+modules: -+ $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd) modules -+ -+strip: -+ $(CROSS_COMPILE)strip $(MODULE_NAME).ko --strip-unneeded -+ -+install: -+ install -p -m 644 $(MODULE_NAME).ko $(MODDESTDIR) -+ /sbin/depmod -a ${KVER} -+ -+uninstall: -+ rm -f $(MODDESTDIR)/$(MODULE_NAME).ko -+ /sbin/depmod -a ${KVER} -+ -+ -+config_r: -+ @echo "make config" -+ /bin/bash script/Configure script/config.in -+ -+.PHONY: modules clean -+ -+clean: -+ rm -fr *.mod.c *.mod *.o .*.cmd *.ko *~ -+ rm .tmp_versions -fr ; rm Module.symvers -fr -+ rm -fr Module.markers ; rm -fr modules.order -+ cd core/efuse ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+ cd core ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+ cd hal/$(RTL871X)/$(HCI_NAME) ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+ cd hal/$(RTL871X) ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+ cd hal ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+ cd os_dep/linux ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+ cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko -+endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/clean -@@ -0,0 +1,5 @@ -+#!/bin/bash -+rmmod 8192cu -+rmmod 8192ce -+rmmod 8192du -+rmmod 8192de ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c -@@ -0,0 +1,1147 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_EFUSE_C_ -+ -+#include -+#include -+#include -+ -+#include -+ -+ -+ -+/*------------------------Define local variable------------------------------*/ -+u8 fakeEfuseBank=0; -+u32 fakeEfuseUsedBytes=0; -+u8 fakeEfuseContent[EFUSE_MAX_HW_SIZE]={0}; -+u8 fakeEfuseInitMap[EFUSE_MAX_MAP_LEN]={0}; -+u8 fakeEfuseModifiedMap[EFUSE_MAX_MAP_LEN]={0}; -+ -+u32 BTEfuseUsedBytes=0; -+u8 BTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE]; -+u8 BTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN]={0}; -+u8 BTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0}; -+ -+u32 fakeBTEfuseUsedBytes=0; -+u8 fakeBTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE]; -+u8 fakeBTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN]={0}; -+u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0}; -+/*------------------------Define local variable------------------------------*/ -+ -+//------------------------------------------------------------------------------ -+#define REG_EFUSE_CTRL 0x0030 -+#define EFUSE_CTRL REG_EFUSE_CTRL // E-Fuse Control. -+//------------------------------------------------------------------------------ -+ -+BOOLEAN -+Efuse_Read1ByteFromFakeContent( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN OUT u8 *Value ); -+BOOLEAN -+Efuse_Read1ByteFromFakeContent( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN OUT u8 *Value ) -+{ -+ if(Offset >= EFUSE_MAX_HW_SIZE) -+ { -+ return _FALSE; -+ } -+ //DbgPrint("Read fake content, offset = %d\n", Offset); -+ if(fakeEfuseBank == 0) -+ *Value = fakeEfuseContent[Offset]; -+ else -+ *Value = fakeBTEfuseContent[fakeEfuseBank-1][Offset]; -+ return _TRUE; -+} -+ -+BOOLEAN -+Efuse_Write1ByteToFakeContent( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN u8 Value ); -+BOOLEAN -+Efuse_Write1ByteToFakeContent( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN u8 Value ) -+{ -+ if(Offset >= EFUSE_MAX_HW_SIZE) -+ { -+ return _FALSE; -+ } -+ if(fakeEfuseBank == 0) -+ fakeEfuseContent[Offset] = Value; -+ else -+ { -+ fakeBTEfuseContent[fakeEfuseBank-1][Offset] = Value; -+ } -+ return _TRUE; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: Efuse_PowerSwitch -+ * -+ * Overview: When we want to enable write operation, we should change to -+ * pwr on state. When we stop write, we should switch to 500k mode -+ * and disable LDO 2.5V. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/17/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+Efuse_PowerSwitch( -+ IN PADAPTER pAdapter, -+ IN u8 bWrite, -+ IN u8 PwrState) -+{ -+ pAdapter->HalFunc.EfusePowerSwitch(pAdapter, bWrite, PwrState); -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: efuse_GetCurrentSize -+ * -+ * Overview: Get current efuse size!!! -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/16/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+u16 -+Efuse_GetCurrentSize( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN BOOLEAN bPseudoTest) -+{ -+ u16 ret=0; -+ -+ ret = pAdapter->HalFunc.EfuseGetCurrentSize(pAdapter, efuseType, bPseudoTest); -+ -+ return ret; -+} -+ -+/* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */ -+u8 -+Efuse_CalculateWordCnts(IN u8 word_en) -+{ -+ u8 word_cnts = 0; -+ if(!(word_en & BIT(0))) word_cnts++; // 0 : write enable -+ if(!(word_en & BIT(1))) word_cnts++; -+ if(!(word_en & BIT(2))) word_cnts++; -+ if(!(word_en & BIT(3))) word_cnts++; -+ return word_cnts; -+} -+ -+// -+// Description: -+// Execute E-Fuse read byte operation. -+// Refered from SD1 Richard. -+// -+// Assumption: -+// 1. Boot from E-Fuse and successfully auto-load. -+// 2. PASSIVE_LEVEL (USB interface) -+// -+// Created by Roger, 2008.10.21. -+// -+VOID -+ReadEFuseByte( -+ PADAPTER Adapter, -+ u16 _offset, -+ u8 *pbuf, -+ IN BOOLEAN bPseudoTest) -+{ -+ u32 value32; -+ u8 readbyte; -+ u16 retry; -+ //u32 start=rtw_get_current_time(); -+ -+ if(bPseudoTest) -+ { -+ Efuse_Read1ByteFromFakeContent(Adapter, _offset, pbuf); -+ return; -+ } -+ -+ //Write Address -+ rtw_write8(Adapter, EFUSE_CTRL+1, (_offset & 0xff)); -+ readbyte = rtw_read8(Adapter, EFUSE_CTRL+2); -+ rtw_write8(Adapter, EFUSE_CTRL+2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc)); -+ -+ //Write bit 32 0 -+ readbyte = rtw_read8(Adapter, EFUSE_CTRL+3); -+ rtw_write8(Adapter, EFUSE_CTRL+3, (readbyte & 0x7f)); -+ -+ //Check bit 32 read-ready -+ retry = 0; -+ value32 = rtw_read32(Adapter, EFUSE_CTRL); -+ //while(!(((value32 >> 24) & 0xff) & 0x80) && (retry<10)) -+ while(!(((value32 >> 24) & 0xff) & 0x80) && (retry<10000)) -+ { -+ value32 = rtw_read32(Adapter, EFUSE_CTRL); -+ retry++; -+ } -+ -+ // 20100205 Joseph: Add delay suggested by SD1 Victor. -+ // This fix the problem that Efuse read error in high temperature condition. -+ // Designer says that there shall be some delay after ready bit is set, or the -+ // result will always stay on last data we read. -+ rtw_udelay_os(50); -+ value32 = rtw_read32(Adapter, EFUSE_CTRL); -+ -+ *pbuf = (u8)(value32 & 0xff); -+ //DBG_871X("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,rtw_get_passing_time_ms(start)); -+ -+} -+ -+ -+// -+// Description: -+// 1. Execute E-Fuse read byte operation according as map offset and -+// save to E-Fuse table. -+// 2. Refered from SD1 Richard. -+// -+// Assumption: -+// 1. Boot from E-Fuse and successfully auto-load. -+// 2. PASSIVE_LEVEL (USB interface) -+// -+// Created by Roger, 2008.10.21. -+// -+// 2008/12/12 MH 1. Reorganize code flow and reserve bytes. and add description. -+// 2. Add efuse utilization collect. -+// 2008/12/22 MH Read Efuse must check if we write section 1 data again!!! Sec1 -+// write addr must be after sec5. -+// -+ -+VOID -+efuse_ReadEFuse( -+ PADAPTER Adapter, -+ u8 efuseType, -+ u16 _offset, -+ u16 _size_byte, -+ u8 *pbuf, -+ IN BOOLEAN bPseudoTest -+ ); -+VOID -+efuse_ReadEFuse( -+ PADAPTER Adapter, -+ u8 efuseType, -+ u16 _offset, -+ u16 _size_byte, -+ u8 *pbuf, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); -+} -+ -+VOID -+EFUSE_GetEfuseDefinition( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u8 type, -+ OUT void *pOut, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut, bPseudoTest); -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: EFUSE_Read1Byte -+ * -+ * Overview: Copy from WMAC fot EFUSE read 1 byte. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 09/23/2008 MHC Copy from WMAC. -+ * -+ *---------------------------------------------------------------------------*/ -+u8 -+EFUSE_Read1Byte( -+ IN PADAPTER Adapter, -+ IN u16 Address) -+{ -+ u8 data; -+ u8 Bytetemp = {0x00}; -+ u8 temp = {0x00}; -+ u32 k=0; -+ u16 contentLen=0; -+ -+ EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&contentLen, _FALSE); -+ -+ if (Address < contentLen) //E-fuse 512Byte -+ { -+ //Write E-fuse Register address bit0~7 -+ temp = Address & 0xFF; -+ rtw_write8(Adapter, EFUSE_CTRL+1, temp); -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2); -+ //Write E-fuse Register address bit8~9 -+ temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC); -+ rtw_write8(Adapter, EFUSE_CTRL+2, temp); -+ -+ //Write 0x30[31]=0 -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); -+ temp = Bytetemp & 0x7F; -+ rtw_write8(Adapter, EFUSE_CTRL+3, temp); -+ -+ //Wait Write-ready (0x30[31]=1) -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); -+ while(!(Bytetemp & 0x80)) -+ { -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); -+ k++; -+ if(k==1000) -+ { -+ k=0; -+ break; -+ } -+ } -+ data=rtw_read8(Adapter, EFUSE_CTRL); -+ return data; -+ } -+ else -+ return 0xFF; -+ -+}/* EFUSE_Read1Byte */ -+ -+/*----------------------------------------------------------------------------- -+ * Function: EFUSE_Write1Byte -+ * -+ * Overview: Copy from WMAC fot EFUSE write 1 byte. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 09/23/2008 MHC Copy from WMAC. -+ * -+ *---------------------------------------------------------------------------*/ -+ -+void -+EFUSE_Write1Byte( -+ IN PADAPTER Adapter, -+ IN u16 Address, -+ IN u8 Value); -+void -+EFUSE_Write1Byte( -+ IN PADAPTER Adapter, -+ IN u16 Address, -+ IN u8 Value) -+{ -+ u8 Bytetemp = {0x00}; -+ u8 temp = {0x00}; -+ u32 k=0; -+ u16 contentLen=0; -+ -+ //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr=%x Data =%x\n", Address, Value)); -+ EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&contentLen, _FALSE); -+ -+ if( Address < contentLen) //E-fuse 512Byte -+ { -+ rtw_write8(Adapter, EFUSE_CTRL, Value); -+ -+ //Write E-fuse Register address bit0~7 -+ temp = Address & 0xFF; -+ rtw_write8(Adapter, EFUSE_CTRL+1, temp); -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2); -+ -+ //Write E-fuse Register address bit8~9 -+ temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC); -+ rtw_write8(Adapter, EFUSE_CTRL+2, temp); -+ -+ //Write 0x30[31]=1 -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); -+ temp = Bytetemp | 0x80; -+ rtw_write8(Adapter, EFUSE_CTRL+3, temp); -+ -+ //Wait Write-ready (0x30[31]=0) -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); -+ while(Bytetemp & 0x80) -+ { -+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); -+ k++; -+ if(k==100) -+ { -+ k=0; -+ break; -+ } -+ } -+ } -+}/* EFUSE_Write1Byte */ -+ -+/* 11/16/2008 MH Read one byte from real Efuse. */ -+u8 -+efuse_OneByteRead( -+ IN PADAPTER pAdapter, -+ IN u16 addr, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ u8 tmpidx = 0; -+ u8 bResult; -+ -+ if(bPseudoTest) -+ { -+ bResult = Efuse_Read1ByteFromFakeContent(pAdapter, addr, data); -+ return bResult; -+ } -+ // -----------------e-fuse reg ctrl --------------------------------- -+ //address -+ rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff)); -+ rtw_write8(pAdapter, EFUSE_CTRL+2, ((u8)((addr>>8) &0x03) ) | -+ (rtw_read8(pAdapter, EFUSE_CTRL+2)&0xFC )); -+ -+ rtw_write8(pAdapter, EFUSE_CTRL+3, 0x72);//read cmd -+ -+ while(!(0x80 &rtw_read8(pAdapter, EFUSE_CTRL+3))&&(tmpidx<100)) -+ { -+ tmpidx++; -+ } -+ if(tmpidx<100) -+ { -+ *data=rtw_read8(pAdapter, EFUSE_CTRL); -+ bResult = _TRUE; -+ } -+ else -+ { -+ *data = 0xff; -+ bResult = _FALSE; -+ } -+ return bResult; -+} -+ -+/* 11/16/2008 MH Write one byte to reald Efuse. */ -+u8 -+efuse_OneByteWrite( -+ IN PADAPTER pAdapter, -+ IN u16 addr, -+ IN u8 data, -+ IN BOOLEAN bPseudoTest) -+{ -+ u8 tmpidx = 0; -+ u8 bResult; -+ -+ if(bPseudoTest) -+ { -+ bResult = Efuse_Write1ByteToFakeContent(pAdapter, addr, data); -+ return bResult; -+ } -+ //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr = %x Data=%x\n", addr, data)); -+ -+ //return 0; -+ -+ // -----------------e-fuse reg ctrl --------------------------------- -+ //address -+ rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff)); -+ rtw_write8(pAdapter, EFUSE_CTRL+2, -+ (rtw_read8(pAdapter, EFUSE_CTRL+2)&0xFC )|(u8)((addr>>8)&0x03) ); -+ rtw_write8(pAdapter, EFUSE_CTRL, data);//data -+ -+ rtw_write8(pAdapter, EFUSE_CTRL+3, 0xF2);//write cmd -+ -+ while((0x80 & rtw_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx<100) ){ -+ tmpidx++; -+ } -+ -+ if(tmpidx<100) -+ { -+ bResult = _TRUE; -+ } -+ else -+ { -+ bResult = _FALSE; -+ } -+ -+ return bResult; -+} -+ -+int -+Efuse_PgPacketRead( IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret=0; -+ -+ ret = pAdapter->HalFunc.Efuse_PgPacketRead(pAdapter, offset, data, bPseudoTest); -+ -+ return ret; -+} -+ -+int -+Efuse_PgPacketWrite(IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret; -+ -+ ret = pAdapter->HalFunc.Efuse_PgPacketWrite(pAdapter, offset, word_en, data, bPseudoTest); -+ -+ return ret; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: efuse_WordEnableDataRead -+ * -+ * Overview: Read allowed word in current efuse section data. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/16/2008 MHC Create Version 0. -+ * 11/21/2008 MHC Fix Write bug when we only enable late word. -+ * -+ *---------------------------------------------------------------------------*/ -+void -+efuse_WordEnableDataRead(IN u8 word_en, -+ IN u8 *sourdata, -+ IN u8 *targetdata) -+{ -+ if (!(word_en&BIT(0))) -+ { -+ targetdata[0] = sourdata[0]; -+ targetdata[1] = sourdata[1]; -+ } -+ if (!(word_en&BIT(1))) -+ { -+ targetdata[2] = sourdata[2]; -+ targetdata[3] = sourdata[3]; -+ } -+ if (!(word_en&BIT(2))) -+ { -+ targetdata[4] = sourdata[4]; -+ targetdata[5] = sourdata[5]; -+ } -+ if (!(word_en&BIT(3))) -+ { -+ targetdata[6] = sourdata[6]; -+ targetdata[7] = sourdata[7]; -+ } -+} -+ -+ -+u8 -+Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, -+ IN u16 efuse_addr, -+ IN u8 word_en, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ u8 ret=0; -+ -+ ret = pAdapter->HalFunc.Efuse_WordEnableDataWrite(pAdapter, efuse_addr, word_en, data, bPseudoTest); -+ -+ return ret; -+} -+ -+static u8 efuse_read8(PADAPTER padapter, u16 address, u8 *value) -+{ -+ return efuse_OneByteRead(padapter,address, value, _FALSE); -+} -+ -+static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value) -+{ -+ return efuse_OneByteWrite(padapter,address, *value, _FALSE); -+} -+ -+/* -+ * read/wirte raw efuse data -+ */ -+u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *data) -+{ -+ int i = 0; -+ u16 real_content_len = 0, max_available_size = 0; -+ u8 res = _FAIL ; -+ u8 (*rw8)(PADAPTER, u16, u8*); -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&real_content_len, _FALSE); -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ -+ if (start_addr > real_content_len) -+ return _FAIL; -+ -+ if (_TRUE == bWrite) { -+ if ((start_addr + cnts) > max_available_size) -+ return _FAIL; -+ rw8 = &efuse_write8; -+ } else -+ rw8 = &efuse_read8; -+ -+ Efuse_PowerSwitch(padapter, bWrite, _TRUE); -+ -+ // e-fuse one byte read / write -+ for (i = 0; i < cnts; i++) { -+ if (start_addr >= real_content_len) { -+ res = _FAIL; -+ break; -+ } -+ -+ res = rw8(padapter, start_addr++, data++); -+ if (_FAIL == res) break; -+ } -+ -+ Efuse_PowerSwitch(padapter, bWrite, _FALSE); -+ -+ return res; -+} -+//------------------------------------------------------------------------------ -+u16 efuse_GetMaxSize(PADAPTER padapter) -+{ -+ u16 max_size; -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_size, _FALSE); -+ return max_size; -+} -+//------------------------------------------------------------------------------ -+u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size) -+{ -+ Efuse_PowerSwitch(padapter, _FALSE, _TRUE); -+ *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, _FALSE); -+ Efuse_PowerSwitch(padapter, _FALSE, _FALSE); -+ -+ return _SUCCESS; -+} -+//------------------------------------------------------------------------------ -+u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) -+{ -+ u16 mapLen=0; -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); -+ -+ if ((addr + cnts) > mapLen) -+ return _FAIL; -+ -+ Efuse_PowerSwitch(padapter, _FALSE, _TRUE); -+ -+ efuse_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data, _FALSE); -+ -+ Efuse_PowerSwitch(padapter, _FALSE, _FALSE); -+ -+ return _SUCCESS; -+} -+//------------------------------------------------------------------------------ -+u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) -+{ -+ u8 offset, word_en; -+ u8 *map; -+ u8 newdata[PGPKT_DATA_SIZE]; -+ s32 i, j, idx; -+ u8 ret = _SUCCESS; -+ u16 mapLen=0; -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); -+ -+ if ((addr + cnts) > mapLen) -+ return _FAIL; -+ -+ map = rtw_zmalloc(mapLen); -+ if(map == NULL){ -+ return _FAIL; -+ } -+ -+ ret = rtw_efuse_map_read(padapter, 0, mapLen, map); -+ if (ret == _FAIL) goto exit; -+ -+ Efuse_PowerSwitch(padapter, _TRUE, _TRUE); -+ -+ offset = (addr >> 3); -+ word_en = 0xF; -+ _rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE); -+ i = addr & 0x7; // index of one package -+ j = 0; // index of new package -+ idx = 0; // data index -+ -+ if (i & 0x1) { -+ // odd start -+ if (data[idx] != map[addr+idx]) { -+ word_en &= ~BIT(i >> 1); -+ newdata[i-1] = map[addr+idx-1]; -+ newdata[i] = data[idx]; -+ } -+ i++; -+ idx++; -+ } -+ do { -+ for (; i < PGPKT_DATA_SIZE; i += 2) -+ { -+ if (cnts == idx) break; -+ if ((cnts - idx) == 1) { -+ if (data[idx] != map[addr+idx]) { -+ word_en &= ~BIT(i >> 1); -+ newdata[i] = data[idx]; -+ newdata[i+1] = map[addr+idx+1]; -+ } -+ idx++; -+ break; -+ } else { -+ if ((data[idx] != map[addr+idx]) || -+ (data[idx+1] != map[addr+idx+1])) -+ { -+ word_en &= ~BIT(i >> 1); -+ newdata[i] = data[idx]; -+ newdata[i+1] = data[idx + 1]; -+ } -+ idx += 2; -+ } -+ if (idx == cnts) break; -+ } -+ -+ if (word_en != 0xF) { -+ ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE); -+ DBG_871X("offset=%x \n",offset); -+ DBG_871X("word_en=%x \n",word_en); -+ -+ for(i=0;iefuse_eeprom_data[Offset]; -+ -+} // EFUSE_ShadowRead1Byte -+ -+//---------------Read Two Bytes -+static VOID -+efuse_ShadowRead2Byte( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN OUT u16 *Value) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ -+ *Value = pEEPROM->efuse_eeprom_data[Offset]; -+ *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8; -+ -+} // EFUSE_ShadowRead2Byte -+ -+//---------------Read Four Bytes -+static VOID -+efuse_ShadowRead4Byte( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN OUT u32 *Value) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ -+ *Value = pEEPROM->efuse_eeprom_data[Offset]; -+ *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8; -+ *Value |= pEEPROM->efuse_eeprom_data[Offset+2]<<16; -+ *Value |= pEEPROM->efuse_eeprom_data[Offset+3]<<24; -+ -+} // efuse_ShadowRead4Byte -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: efuse_ShadowWrite1Byte -+ * efuse_ShadowWrite2Byte -+ * efuse_ShadowWrite4Byte -+ * -+ * Overview: Write efuse modify map by one/two/four byte. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/12/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+#ifdef PLATFORM -+static VOID -+efuse_ShadowWrite1Byte( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN u8 Value); -+#endif //PLATFORM -+static VOID -+efuse_ShadowWrite1Byte( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN u8 Value) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ -+ pEEPROM->efuse_eeprom_data[Offset] = Value; -+ -+} // efuse_ShadowWrite1Byte -+ -+//---------------Write Two Bytes -+static VOID -+efuse_ShadowWrite2Byte( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN u16 Value) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ -+ pEEPROM->efuse_eeprom_data[Offset] = Value&0x00FF; -+ pEEPROM->efuse_eeprom_data[Offset+1] = Value>>8; -+ -+} // efuse_ShadowWrite1Byte -+ -+//---------------Write Four Bytes -+static VOID -+efuse_ShadowWrite4Byte( -+ IN PADAPTER pAdapter, -+ IN u16 Offset, -+ IN u32 Value) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ -+ pEEPROM->efuse_eeprom_data[Offset] = (u8)(Value&0x000000FF); -+ pEEPROM->efuse_eeprom_data[Offset+1] = (u8)((Value>>8)&0x0000FF); -+ pEEPROM->efuse_eeprom_data[Offset+2] = (u8)((Value>>16)&0x00FF); -+ pEEPROM->efuse_eeprom_data[Offset+3] = (u8)((Value>>24)&0xFF); -+ -+} // efuse_ShadowWrite1Byte -+ -+/*----------------------------------------------------------------------------- -+ * Function: EFUSE_ShadowMapUpdate -+ * -+ * Overview: Transfer current EFUSE content to shadow init and modify map. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/13/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+void EFUSE_ShadowMapUpdate( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN BOOLEAN bPseudoTest) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ u16 mapLen=0; -+ -+ EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); -+ -+ if (pEEPROM->bautoload_fail_flag == _TRUE) -+ { -+ _rtw_memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen); -+ } -+ else -+ { -+ #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -+ if(_SUCCESS != retriveAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pEEPROM)) { -+ #endif -+ -+ Efuse_ReadAllMap(pAdapter, efuseType, pEEPROM->efuse_eeprom_data, bPseudoTest); -+ -+ #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -+ storeAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pEEPROM); -+ } -+ #endif -+ } -+ -+ //PlatformMoveMemory((PVOID)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], -+ //(PVOID)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); -+}// EFUSE_ShadowMapUpdate -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: EFUSE_ShadowRead -+ * -+ * Overview: Read from efuse init map !!!!! -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/12/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+void -+EFUSE_ShadowRead( -+ IN PADAPTER pAdapter, -+ IN u8 Type, -+ IN u16 Offset, -+ IN OUT u32 *Value ) -+{ -+ if (Type == 1) -+ efuse_ShadowRead1Byte(pAdapter, Offset, (u8 *)Value); -+ else if (Type == 2) -+ efuse_ShadowRead2Byte(pAdapter, Offset, (u16 *)Value); -+ else if (Type == 4) -+ efuse_ShadowRead4Byte(pAdapter, Offset, (u32 *)Value); -+ -+} // EFUSE_ShadowRead -+ -+/*----------------------------------------------------------------------------- -+ * Function: EFUSE_ShadowWrite -+ * -+ * Overview: Write efuse modify map for later update operation to use!!!!! -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/12/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+EFUSE_ShadowWrite( -+ IN PADAPTER pAdapter, -+ IN u8 Type, -+ IN u16 Offset, -+ IN OUT u32 Value); -+VOID -+EFUSE_ShadowWrite( -+ IN PADAPTER pAdapter, -+ IN u8 Type, -+ IN u16 Offset, -+ IN OUT u32 Value) -+{ -+#if (MP_DRIVER == 0) -+ return; -+#endif -+ -+ if (Type == 1) -+ efuse_ShadowWrite1Byte(pAdapter, Offset, (u8)Value); -+ else if (Type == 2) -+ efuse_ShadowWrite2Byte(pAdapter, Offset, (u16)Value); -+ else if (Type == 4) -+ efuse_ShadowWrite4Byte(pAdapter, Offset, (u32)Value); -+ -+} // EFUSE_ShadowWrite -+ -+VOID -+Efuse_InitSomeVar( -+ IN PADAPTER pAdapter -+ ); -+VOID -+Efuse_InitSomeVar( -+ IN PADAPTER pAdapter -+ ) -+{ -+ u8 i; -+ -+ _rtw_memset((PVOID)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE); -+ _rtw_memset((PVOID)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN); -+ _rtw_memset((PVOID)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN); -+ -+ for(i=0; i -+ -+ int isAdaptorInfoFileValid(void) -+{ -+ return _TRUE; -+} -+ -+int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv) -+{ -+ int ret =_SUCCESS; -+ -+ if(path && eeprom_priv) { -+ ret = rtw_store_to_file(path, eeprom_priv->efuse_eeprom_data, EEPROM_MAX_SIZE); -+ if(ret == EEPROM_MAX_SIZE) -+ ret = _SUCCESS; -+ else -+ ret = _FAIL; -+ } else { -+ DBG_871X("%s NULL pointer\n",__FUNCTION__); -+ ret = _FAIL; -+ } -+ return ret; -+} -+ -+int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv) -+{ -+ int ret = _SUCCESS; -+ mm_segment_t oldfs; -+ struct file *fp; -+ -+ if(path && eeprom_priv) { -+ -+ ret = rtw_retrive_from_file(path, eeprom_priv->efuse_eeprom_data, EEPROM_MAX_SIZE); -+ -+ if(ret == EEPROM_MAX_SIZE) -+ ret = _SUCCESS; -+ else -+ ret = _FAIL; -+ -+ #if 0 -+ if(isAdaptorInfoFileValid()) { -+ return 0; -+ } else { -+ return _FAIL; -+ } -+ #endif -+ -+ } else { -+ DBG_871X("%s NULL pointer\n",__FUNCTION__); -+ ret = _FAIL; -+ } -+ return ret; -+} -+#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE -+#endif //PLATFORM_LINUX -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c -@@ -0,0 +1,2943 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_AP_C_ -+ -+#include -+#include -+#include -+#include -+ -+ -+#ifdef CONFIG_AP_MODE -+ -+extern unsigned char RTW_WPA_OUI[]; -+extern unsigned char WMM_OUI[]; -+extern unsigned char WPS_OUI[]; -+extern unsigned char P2P_OUI[]; -+extern unsigned char WFD_OUI[]; -+ -+void init_mlme_ap_info(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ -+ -+ _rtw_spinlock_init(&pmlmepriv->bcn_update_lock); -+ -+ //for ACL -+ _rtw_init_queue(&pacl_list->acl_node_q); -+ -+ //pmlmeext->bstart_bss = _FALSE; -+ -+ start_ap_mode(padapter); -+} -+ -+void free_mlme_ap_info(_adapter *padapter) -+{ -+ _irqL irqL; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //stop_ap_mode(padapter); -+ -+ pmlmepriv->update_bcn = _FALSE; -+ pmlmeext->bstart_bss = _FALSE; -+ -+ rtw_sta_flush(padapter); -+ -+ pmlmeinfo->state = _HW_STATE_NOLINK_; -+ -+ //free_assoc_sta_resources -+ rtw_free_all_stainfo(padapter); -+ -+ //free bc/mc sta_info -+ psta = rtw_get_bcmc_stainfo(padapter); -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(padapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ -+ _rtw_spinlock_free(&pmlmepriv->bcn_update_lock); -+ -+} -+ -+static void update_BCNTIM(_adapter *padapter) -+{ -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network); -+ unsigned char *pie = pnetwork_mlmeext->IEs; -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ //update TIM IE -+ //if(pstapriv->tim_bitmap) -+ if(_TRUE) -+ { -+ u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; -+ u16 tim_bitmap_le; -+ uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen; -+ -+ tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap); -+ -+ p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_); -+ if (p != NULL && tim_ielen>0) -+ { -+ tim_ielen += 2; -+ -+ premainder_ie = p+tim_ielen; -+ -+ tim_ie_offset = (sint)(p -pie); -+ -+ remainder_ielen = pnetwork_mlmeext->IELength - tim_ie_offset - tim_ielen; -+ -+ //append TIM IE from dst_ie offset -+ dst_ie = p; -+ } -+ else -+ { -+ tim_ielen = 0; -+ -+ //calucate head_len -+ offset = _FIXED_IE_LENGTH_; -+ -+ /* get ssid_ie len */ -+ p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SSID_IE_, &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)); -+ if (p != NULL) -+ offset += tmp_len+2; -+ -+ // get supported rates len -+ p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)); -+ if (p != NULL) -+ { -+ offset += tmp_len+2; -+ } -+ -+ //DS Parameter Set IE, len=3 -+ offset += 3; -+ -+ premainder_ie = pie + offset; -+ -+ remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen; -+ -+ //append TIM IE from offset -+ dst_ie = pie + offset; -+ -+ } -+ -+ -+ if(remainder_ielen>0) -+ { -+ pbackup_remainder_ie = rtw_malloc(remainder_ielen); -+ if(pbackup_remainder_ie && premainder_ie) -+ _rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); -+ } -+ -+ *dst_ie++=_TIM_IE_; -+ -+ if((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fc)) -+ tim_ielen = 5; -+ else -+ tim_ielen = 4; -+ -+ *dst_ie++= tim_ielen; -+ -+ *dst_ie++=0;//DTIM count -+ *dst_ie++=1;//DTIM peroid -+ -+ if(pstapriv->tim_bitmap&BIT(0))//for bc/mc frames -+ *dst_ie++ = BIT(0);//bitmap ctrl -+ else -+ *dst_ie++ = 0; -+ -+ if(tim_ielen==4) -+ { -+ *dst_ie++ = *(u8*)&tim_bitmap_le; -+ } -+ else if(tim_ielen==5) -+ { -+ _rtw_memcpy(dst_ie, &tim_bitmap_le, 2); -+ dst_ie+=2; -+ } -+ -+ //copy remainder IE -+ if(pbackup_remainder_ie) -+ { -+ _rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen); -+ -+ rtw_mfree(pbackup_remainder_ie, remainder_ielen); -+ } -+ -+ offset = (uint)(dst_ie - pie); -+ pnetwork_mlmeext->IELength = offset + remainder_ielen; -+ -+ } -+ -+#ifndef CONFIG_INTERRUPT_BASED_TXBCN -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -+ set_tx_beacon_cmd(padapter); -+#endif -+#endif //!CONFIG_INTERRUPT_BASED_TXBCN -+ -+ -+} -+ -+void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) -+{ -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 bmatch = _FALSE; -+ u8 *pie = pnetwork->IEs; -+ u8 *p=NULL, *dst_ie=NULL, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; -+ u32 i, offset, ielen, ie_offset, remainder_ielen = 0; -+ -+ for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i); -+ -+ if (pIE->ElementID > index) -+ { -+ break; -+ } -+ else if(pIE->ElementID == index) // already exist the same IE -+ { -+ p = (u8 *)pIE; -+ ielen = pIE->Length; -+ bmatch = _TRUE; -+ break; -+ } -+ -+ p = (u8 *)pIE; -+ ielen = pIE->Length; -+ i += (pIE->Length + 2); -+ } -+ -+ if (p != NULL && ielen>0) -+ { -+ ielen += 2; -+ -+ premainder_ie = p+ielen; -+ -+ ie_offset = (sint)(p -pie); -+ -+ remainder_ielen = pnetwork->IELength - ie_offset - ielen; -+ -+ if(bmatch) -+ dst_ie = p; -+ else -+ dst_ie = (p+ielen); -+ } -+ -+ if(dst_ie == NULL) -+ return; -+ -+ if(remainder_ielen>0) -+ { -+ pbackup_remainder_ie = rtw_malloc(remainder_ielen); -+ if(pbackup_remainder_ie && premainder_ie) -+ _rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); -+ } -+ -+ *dst_ie++=index; -+ *dst_ie++=len; -+ -+ _rtw_memcpy(dst_ie, data, len); -+ dst_ie+=len; -+ -+ //copy remainder IE -+ if(pbackup_remainder_ie) -+ { -+ _rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen); -+ -+ rtw_mfree(pbackup_remainder_ie, remainder_ielen); -+ } -+ -+ offset = (uint)(dst_ie - pie); -+ pnetwork->IELength = offset + remainder_ielen; -+} -+ -+void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index) -+{ -+ u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; -+ uint offset, ielen, ie_offset, remainder_ielen = 0; -+ u8 *pie = pnetwork->IEs; -+ -+ p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, index, &ielen, pnetwork->IELength - _FIXED_IE_LENGTH_); -+ if (p != NULL && ielen>0) -+ { -+ ielen += 2; -+ -+ premainder_ie = p+ielen; -+ -+ ie_offset = (sint)(p -pie); -+ -+ remainder_ielen = pnetwork->IELength - ie_offset - ielen; -+ -+ dst_ie = p; -+ } -+ else { -+ return; -+ } -+ -+ if(remainder_ielen>0) -+ { -+ pbackup_remainder_ie = rtw_malloc(remainder_ielen); -+ if(pbackup_remainder_ie && premainder_ie) -+ _rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); -+ } -+ -+ //copy remainder IE -+ if(pbackup_remainder_ie) -+ { -+ _rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen); -+ -+ rtw_mfree(pbackup_remainder_ie, remainder_ielen); -+ } -+ -+ offset = (uint)(dst_ie - pie); -+ pnetwork->IELength = offset + remainder_ielen; -+} -+ -+ -+u8 chk_sta_is_alive(struct sta_info *psta); -+u8 chk_sta_is_alive(struct sta_info *psta) -+{ -+ u8 ret = _FALSE; -+ #ifdef DBG_EXPIRATION_CHK -+ DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n" -+ , MAC_ARG(psta->hwaddr) -+ , psta->rssi_stat.UndecoratedSmoothedPWDB -+ //, STA_RX_PKTS_ARG(psta) -+ , STA_RX_PKTS_DIFF_ARG(psta) -+ , psta->expire_to -+ , psta->state&WIFI_SLEEP_STATE?"PS, ":"" -+ , psta->state&WIFI_STA_ALIVE_CHK_STATE?"SAC, ":"" -+ , psta->sleepq_len -+ ); -+ #endif -+ -+ //if(sta_last_rx_pkts(psta) == sta_rx_pkts(psta)) -+ if((psta->sta_stats.last_rx_data_pkts + psta->sta_stats.last_rx_ctrl_pkts) == (psta->sta_stats.rx_data_pkts + psta->sta_stats.rx_ctrl_pkts)) -+ { -+ #if 0 -+ if(psta->state&WIFI_SLEEP_STATE) -+ ret = _TRUE; -+ #endif -+ } -+ else -+ { -+ ret = _TRUE; -+ } -+ -+ sta_update_last_rx_pkts(psta); -+ -+ return ret; -+} -+ -+void expire_timeout_chk(_adapter *padapter) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ u8 updated = _FALSE; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 chk_alive_num = 0; -+ char chk_alive_list[NUM_STA]; -+ int i; -+ -+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ -+ phead = &pstapriv->auth_list; -+ plist = get_next(phead); -+ -+ //check auth_queue -+ #ifdef DBG_EXPIRATION_CHK -+ if (rtw_end_of_queue_search(phead, plist) == _FALSE) { -+ DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n" -+ , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt); -+ } -+ #endif -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, auth_list); -+ plist = get_next(plist); -+ -+ if(psta->expire_to>0) -+ { -+ psta->expire_to--; -+ if (psta->expire_to == 0) -+ { -+ rtw_list_delete(&psta->auth_list); -+ pstapriv->auth_list_cnt--; -+ -+ DBG_871X("auth expire %02X%02X%02X%02X%02X%02X\n", -+ psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]); -+ -+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(padapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ } -+ } -+ -+ } -+ -+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ -+ psta = NULL; -+ -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ //check asoc_queue -+ #ifdef DBG_EXPIRATION_CHK -+ if (rtw_end_of_queue_search(phead, plist) == _FALSE) { -+ DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n" -+ , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt); -+ } -+ #endif -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ plist = get_next(plist); -+ -+ if (chk_sta_is_alive(psta) || !psta->expire_to) { -+ psta->expire_to = pstapriv->expire_to; -+ psta->keep_alive_trycnt = 0; -+ #ifdef CONFIG_TX_MCAST2UNI -+ psta->under_exist_checking = 0; -+ #endif // CONFIG_TX_MCAST2UNI -+ } else { -+ psta->expire_to--; -+ } -+ -+#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+#ifdef CONFIG_TX_MCAST2UNI -+ if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) { -+ // check sta by delba(addba) for 11n STA -+ // ToDo: use CCX report to check for all STAs -+ //DBG_871X("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking); -+ -+ if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) { -+ DBG_871X("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2); -+ psta->under_exist_checking = 0; -+ psta->expire_to = 0; -+ } else if ( psta->expire_to <= (pstapriv->expire_to - 3) && (psta->under_exist_checking==0)) { -+ DBG_871X("asoc check by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2); -+ psta->under_exist_checking = 1; -+ //tear down TX AMPDU -+ send_delba(padapter, 1, psta->hwaddr);// // originator -+ psta->htpriv.agg_enable_bitmap = 0x0;//reset -+ psta->htpriv.candidate_tid_bitmap = 0x0;//reset -+ } -+ } -+#endif // CONFIG_TX_MCAST2UNI -+#endif //CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ -+ if (psta->expire_to <= 0) -+ { -+ #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ if (padapter->registrypriv.wifi_spec == 1) -+ { -+ psta->expire_to = pstapriv->expire_to; -+ continue; -+ } -+ -+ if (psta->state & WIFI_SLEEP_STATE) { -+ if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) { -+ //to check if alive by another methods if staion is at ps mode. -+ psta->expire_to = pstapriv->expire_to; -+ psta->state |= WIFI_STA_ALIVE_CHK_STATE; -+ -+ //DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); -+ -+ //to update bcn with tim_bitmap for this station -+ pstapriv->tim_bitmap |= BIT(psta->aid); -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ -+ if(!pmlmeext->active_keep_alive_check) -+ continue; -+ } -+ } -+ -+ if (pmlmeext->active_keep_alive_check) { -+ int stainfo_offset; -+ -+ stainfo_offset = rtw_stainfo_offset(pstapriv, psta); -+ if (stainfo_offset_valid(stainfo_offset)) { -+ chk_alive_list[chk_alive_num++] = stainfo_offset; -+ } -+ -+ continue; -+ } -+ #endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ -+ -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ -+ DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); -+ updated = ap_free_sta(padapter, psta, _FALSE, WLAN_REASON_DEAUTH_LEAVING); -+ } -+ else -+ { -+ /* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */ -+ if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt) -+ && padapter->xmitpriv.free_xmitframe_cnt < (NR_XMITFRAME/pstapriv->asoc_list_cnt/2) -+ ){ -+ DBG_871X("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__ -+ , MAC_ARG(psta->hwaddr) -+ , psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt); -+ wakeup_sta_to_xmit(padapter, psta); -+ } -+ } -+ } -+ -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+if (chk_alive_num) { -+ -+ u8 backup_oper_channel=0; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ /* switch to correct channel of current network before issue keep-alive frames */ -+ if (rtw_get_oper_ch(padapter) != pmlmeext->cur_channel) { -+ backup_oper_channel = rtw_get_oper_ch(padapter); -+ SelectChannel(padapter, pmlmeext->cur_channel); -+ } -+ -+ /* issue null data to check sta alive*/ -+ for (i = 0; i < chk_alive_num; i++) { -+ -+ int ret = _FAIL; -+ -+ psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); -+ if(!(psta->state &_FW_LINKED)) -+ continue; -+ -+ if (psta->state & WIFI_SLEEP_STATE) -+ ret = issue_nulldata(padapter, psta->hwaddr, 0, 1, 50); -+ else -+ ret = issue_nulldata(padapter, psta->hwaddr, 0, 3, 50); -+ -+ psta->keep_alive_trycnt++; -+ if (ret == _SUCCESS) -+ { -+ DBG_871X("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr)); -+ psta->expire_to = pstapriv->expire_to; -+ psta->keep_alive_trycnt = 0; -+ continue; -+ } -+ else if (psta->keep_alive_trycnt <= 3) -+ { -+ DBG_871X("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt); -+ psta->expire_to = 1; -+ continue; -+ } -+ -+ psta->keep_alive_trycnt = 0; -+ -+ DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if (rtw_is_list_empty(&psta->asoc_list)==_FALSE) { -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ updated = ap_free_sta(padapter, psta, _FALSE, WLAN_REASON_DEAUTH_LEAVING); -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ } -+ -+ if (backup_oper_channel>0) /* back to the original operation channel */ -+ SelectChannel(padapter, backup_oper_channel); -+} -+#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ -+ -+ associated_clients_update(padapter, updated); -+} -+ -+ -+static void add_RATid(_adapter *padapter, struct sta_info *psta) -+{ -+ int i; -+ u8 rf_type; -+ u32 init_rate=0; -+ unsigned char sta_band = 0, raid, shortGIrate = _FALSE; -+ unsigned char limit; -+ unsigned int tx_ra_bitmap=0; -+ struct ht_priv *psta_ht = NULL; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; -+ -+ -+ if(psta) -+ psta_ht = &psta->htpriv; -+ else -+ return; -+ -+ //b/g mode ra_bitmap -+ for (i=0; ibssrateset); i++) -+ { -+ if (psta->bssrateset[i]) -+ tx_ra_bitmap |= rtw_get_bit_value_from_ieee_value(psta->bssrateset[i]&0x7f); -+ } -+ -+ //n mode ra_bitmap -+ if(psta_ht->ht_option) -+ { -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ if(rf_type == RF_2T2R) -+ limit=16;// 2R -+ else -+ limit=8;// 1R -+ -+ for (i=0; iht_cap.supp_mcs_set[i/8] & BIT(i%8)) -+ tx_ra_bitmap |= BIT(i+12); -+ } -+ -+ //max short GI rate -+ shortGIrate = psta_ht->sgi; -+ } -+ -+ -+#if 0//gtest -+ if(get_rf_mimo_mode(padapter) == RTL8712_RF_2T2R) -+ { -+ //is this a 2r STA? -+ if((pstat->tx_ra_bitmap & 0x0ff00000) != 0 && !(priv->pshare->has_2r_sta & BIT(pstat->aid))) -+ { -+ priv->pshare->has_2r_sta |= BIT(pstat->aid); -+ if(rtw_read16(padapter, 0x102501f6) != 0xffff) -+ { -+ rtw_write16(padapter, 0x102501f6, 0xffff); -+ reset_1r_sta_RA(priv, 0xffff); -+ Switch_1SS_Antenna(priv, 3); -+ } -+ } -+ else// bg or 1R STA? -+ { -+ if((priv->pmib->dot11BssType.net_work_type & WIRELESS_11N) && pstat->ht_cap_len && priv->pshare->has_2r_sta == 0) -+ { -+ if(rtw_read16(padapter, 0x102501f6) != 0x7777) -+ { // MCS7 SGI -+ rtw_write16(padapter, 0x102501f6,0x7777); -+ reset_1r_sta_RA(priv, 0x7777); -+ Switch_1SS_Antenna(priv, 2); -+ } -+ } -+ } -+ -+ } -+ -+ if ((pstat->rssi_level < 1) || (pstat->rssi_level > 3)) -+ { -+ if (pstat->rssi >= priv->pshare->rf_ft_var.raGoDownUpper) -+ pstat->rssi_level = 1; -+ else if ((pstat->rssi >= priv->pshare->rf_ft_var.raGoDown20MLower) || -+ ((priv->pshare->is_40m_bw) && (pstat->ht_cap_len) && -+ (pstat->rssi >= priv->pshare->rf_ft_var.raGoDown40MLower) && -+ (pstat->ht_cap_buf.ht_cap_info & cpu_to_le16(_HTCAP_SUPPORT_CH_WDTH_)))) -+ pstat->rssi_level = 2; -+ else -+ pstat->rssi_level = 3; -+ } -+ -+ // rate adaptive by rssi -+ if ((priv->pmib->dot11BssType.net_work_type & WIRELESS_11N) && pstat->ht_cap_len) -+ { -+ if ((get_rf_mimo_mode(priv) == MIMO_1T2R) || (get_rf_mimo_mode(priv) == MIMO_1T1R)) -+ { -+ switch (pstat->rssi_level) { -+ case 1: -+ pstat->tx_ra_bitmap &= 0x100f0000; -+ break; -+ case 2: -+ pstat->tx_ra_bitmap &= 0x100ff000; -+ break; -+ case 3: -+ if (priv->pshare->is_40m_bw) -+ pstat->tx_ra_bitmap &= 0x100ff005; -+ else -+ pstat->tx_ra_bitmap &= 0x100ff001; -+ -+ break; -+ } -+ } -+ else -+ { -+ switch (pstat->rssi_level) { -+ case 1: -+ pstat->tx_ra_bitmap &= 0x1f0f0000; -+ break; -+ case 2: -+ pstat->tx_ra_bitmap &= 0x1f0ff000; -+ break; -+ case 3: -+ if (priv->pshare->is_40m_bw) -+ pstat->tx_ra_bitmap &= 0x000ff005; -+ else -+ pstat->tx_ra_bitmap &= 0x000ff001; -+ -+ break; -+ } -+ -+ // Don't need to mask high rates due to new rate adaptive parameters -+ //if (pstat->is_broadcom_sta) // use MCS12 as the highest rate vs. Broadcom sta -+ // pstat->tx_ra_bitmap &= 0x81ffffff; -+ -+ // NIC driver will report not supporting MCS15 and MCS14 in asoc req -+ //if (pstat->is_rtl8190_sta && !pstat->is_2t_mimo_sta) -+ // pstat->tx_ra_bitmap &= 0x83ffffff; // if Realtek 1x2 sta, don't use MCS15 and MCS14 -+ } -+ } -+ else if ((priv->pmib->dot11BssType.net_work_type & WIRELESS_11G) && isErpSta(pstat)) -+ { -+ switch (pstat->rssi_level) { -+ case 1: -+ pstat->tx_ra_bitmap &= 0x00000f00; -+ break; -+ case 2: -+ pstat->tx_ra_bitmap &= 0x00000ff0; -+ break; -+ case 3: -+ pstat->tx_ra_bitmap &= 0x00000ff5; -+ break; -+ } -+ } -+ else -+ { -+ pstat->tx_ra_bitmap &= 0x0000000d; -+ } -+ -+ // disable tx short GI when station cannot rx MCS15(AP is 2T2R) -+ // disable tx short GI when station cannot rx MCS7 (AP is 1T2R or 1T1R) -+ // if there is only 1r STA and we are 2T2R, DO NOT mask SGI rate -+ if ((!(pstat->tx_ra_bitmap & 0x8000000) && (priv->pshare->has_2r_sta > 0) && (get_rf_mimo_mode(padapter) == RTL8712_RF_2T2R)) || -+ (!(pstat->tx_ra_bitmap & 0x80000) && (get_rf_mimo_mode(padapter) != RTL8712_RF_2T2R))) -+ { -+ pstat->tx_ra_bitmap &= ~BIT(28); -+ } -+#endif -+ -+ if ( pcur_network->Configuration.DSConfig > 14 ) { -+ // 5G band -+ if (tx_ra_bitmap & 0xffff000) -+ sta_band |= WIRELESS_11_5N | WIRELESS_11A; -+ else -+ sta_band |= WIRELESS_11A; -+ } else { -+ if (tx_ra_bitmap & 0xffff000) -+ sta_band |= WIRELESS_11_24N | WIRELESS_11G | WIRELESS_11B; -+ else if (tx_ra_bitmap & 0xff0) -+ sta_band |= WIRELESS_11G |WIRELESS_11B; -+ else -+ sta_band |= WIRELESS_11B; -+ } -+ -+ raid = networktype_to_raid(sta_band); -+ init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f; -+ -+ if (psta->aid < NUM_STA) -+ { -+ u8 arg = 0; -+ -+ arg = psta->mac_id&0x1f; -+ -+ arg |= BIT(7);//support entry 2~31 -+ -+ if (shortGIrate==_TRUE) -+ arg |= BIT(5); -+ -+ tx_ra_bitmap |= ((raid<<28)&0xf0000000); -+ -+ DBG_871X("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n", -+ __FUNCTION__ , psta->mac_id, raid ,tx_ra_bitmap, arg); -+ -+ //bitmap[0:27] = tx_rate_bitmap -+ //bitmap[28:31]= Rate Adaptive id -+ //arg[0:4] = macid -+ //arg[5] = Short GI -+ rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg); -+ -+ if (shortGIrate==_TRUE) -+ init_rate |= BIT(6); -+ -+ //set ra_id, init_rate -+ psta->raid = raid; -+ psta->init_rate = init_rate; -+ -+ } -+ else -+ { -+ DBG_871X("station aid %d exceed the max number\n", psta->aid); -+ } -+ -+} -+ -+static void update_bmc_sta(_adapter *padapter) -+{ -+ _irqL irqL; -+ u32 init_rate=0; -+ unsigned char network_type, raid; -+ int i, supportRateNum = 0; -+ unsigned int tx_ra_bitmap=0; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; -+ struct sta_info *psta = rtw_get_bcmc_stainfo(padapter); -+ -+ if(psta) -+ { -+ psta->aid = 0;//default set to 0 -+ //psta->mac_id = psta->aid+4; -+ psta->mac_id = psta->aid + 1; -+ -+ psta->qos_option = 0; -+ psta->htpriv.ht_option = _FALSE; -+ -+ psta->ieee8021x_blocked = 0; -+ -+ _rtw_memset((void*)&psta->sta_stats, 0, sizeof(struct stainfo_stats)); -+ -+ //psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. -+ -+ -+ -+ //prepare for add_RATid -+ supportRateNum = rtw_get_rateset_len((u8*)&pcur_network->SupportedRates); -+ network_type = rtw_check_network_type((u8*)&pcur_network->SupportedRates, supportRateNum, 1); -+ -+ _rtw_memcpy(psta->bssrateset, &pcur_network->SupportedRates, supportRateNum); -+ psta->bssratelen = supportRateNum; -+ -+ //b/g mode ra_bitmap -+ for (i=0; ibssrateset[i]) -+ tx_ra_bitmap |= rtw_get_bit_value_from_ieee_value(psta->bssrateset[i]&0x7f); -+ } -+ -+ if ( pcur_network->Configuration.DSConfig > 14 ) { -+ //force to A mode. 5G doesn't support CCK rates -+ network_type = WIRELESS_11A; -+ tx_ra_bitmap = 0x150; // 6, 12, 24 Mbps -+ } else { -+ //force to b mode -+ network_type = WIRELESS_11B; -+ tx_ra_bitmap = 0xf; -+ } -+ -+ //tx_ra_bitmap = update_basic_rate(pcur_network->SupportedRates, supportRateNum); -+ -+ raid = networktype_to_raid(network_type); -+ init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f; -+ -+ //DBG_871X("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap); -+ -+ //if(pHalData->fw_ractrl == _TRUE) -+ { -+ u8 arg = 0; -+ -+ arg = psta->mac_id&0x1f; -+ -+ arg |= BIT(7); -+ -+ //if (shortGIrate==_TRUE) -+ // arg |= BIT(5); -+ -+ tx_ra_bitmap |= ((raid<<28)&0xf0000000); -+ -+ DBG_871X("update_bmc_sta, mask=0x%x, arg=0x%x\n", tx_ra_bitmap, arg); -+ -+ //bitmap[0:27] = tx_rate_bitmap -+ //bitmap[28:31]= Rate Adaptive id -+ //arg[0:4] = macid -+ //arg[5] = Short GI -+ rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg); -+ -+ } -+ -+ //set ra_id, init_rate -+ psta->raid = raid; -+ psta->init_rate = init_rate; -+ -+ _enter_critical_bh(&psta->lock, &irqL); -+ psta->state = _FW_LINKED; -+ _exit_critical_bh(&psta->lock, &irqL); -+ -+ } -+ else -+ { -+ DBG_871X("add_RATid_bmc_sta error!\n"); -+ } -+ -+} -+ -+//notes: -+//AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode -+//MAC_ID = AID+1 for sta in ap/adhoc mode -+//MAC_ID = 1 for bc/mc for sta/ap/adhoc -+//MAC_ID = 0 for bssid for sta/ap/adhoc -+//CAM_ID = //0~3 for default key, cmd_id=macid + 3, macid=aid+1; -+ -+void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; -+ struct ht_priv *phtpriv_sta = &psta->htpriv; -+ -+ //set intf_tag to if1 -+ //psta->intf_tag = 0; -+ -+ //psta->mac_id = psta->aid+4; -+ psta->mac_id = psta->aid+1; -+ -+ if(psecuritypriv->dot11AuthAlgrthm==dot11AuthAlgrthm_8021X) -+ psta->ieee8021x_blocked = _TRUE; -+ else -+ psta->ieee8021x_blocked = _FALSE; -+ -+ -+ //update sta's cap -+ -+ //ERP -+ VCS_update(padapter, psta); -+ -+ //HT related cap -+ if(phtpriv_sta->ht_option) -+ { -+ //check if sta supports rx ampdu -+ phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; -+ -+ //check if sta support s Short GI -+ if((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) -+ { -+ phtpriv_sta->sgi = _TRUE; -+ } -+ -+ // bwmode -+ if((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH)) -+ { -+ //phtpriv_sta->bwmode = HT_CHANNEL_WIDTH_40; -+ phtpriv_sta->bwmode = pmlmeext->cur_bwmode; -+ phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset; -+ -+ } -+ -+ psta->qos_option = _TRUE; -+ -+ } -+ else -+ { -+ phtpriv_sta->ampdu_enable = _FALSE; -+ -+ phtpriv_sta->sgi = _FALSE; -+ phtpriv_sta->bwmode = HT_CHANNEL_WIDTH_20; -+ phtpriv_sta->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ } -+ -+ //Rx AMPDU -+ send_delba(padapter, 0, psta->hwaddr);// recipient -+ -+ //TX AMPDU -+ send_delba(padapter, 1, psta->hwaddr);// // originator -+ phtpriv_sta->agg_enable_bitmap = 0x0;//reset -+ phtpriv_sta->candidate_tid_bitmap = 0x0;//reset -+ -+ -+ //todo: init other variables -+ -+ _rtw_memset((void*)&psta->sta_stats, 0, sizeof(struct stainfo_stats)); -+ -+ -+ //add ratid -+ //add_RATid(padapter, psta);//move to ap_sta_info_defer_update() -+ -+ -+ _enter_critical_bh(&psta->lock, &irqL); -+ psta->state |= _FW_LINKED; -+ _exit_critical_bh(&psta->lock, &irqL); -+ -+ -+} -+ -+static void update_hw_ht_param(_adapter *padapter) -+{ -+ unsigned char max_AMPDU_len; -+ unsigned char min_MPDU_spacing; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ -+ //handle A-MPDU parameter field -+ /* -+ AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k -+ AMPDU_para [4:2]:Min MPDU Start Spacing -+ */ -+ max_AMPDU_len = pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x03; -+ -+ min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) >> 2; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing)); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len)); -+ -+ // -+ // Config SM Power Save setting -+ // -+ pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & 0x0C) >> 2; -+ if(pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) -+ { -+ /*u8 i; -+ //update the MCS rates -+ for (i = 0; i < 16; i++) -+ { -+ pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ }*/ -+ DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__); -+ } -+ -+ // -+ // Config current HT Protection mode. -+ // -+ //pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; -+ -+} -+ -+static void start_bss_network(_adapter *padapter, u8 *pbuf) -+{ -+ u8 *p; -+ u8 val8, cur_channel, cur_bwmode, cur_ch_offset; -+ u16 bcn_interval; -+ u32 acparm; -+ int ie_len; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network); -+ struct HT_info_element *pht_info=NULL; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ u8 cbw40_enable=0; -+ u8 change_band = _FALSE; -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod; -+ cur_channel = pnetwork->Configuration.DSConfig; -+ cur_bwmode = HT_CHANNEL_WIDTH_20;; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ -+ //check if there is wps ie, -+ //if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, -+ //and at first time the security ie ( RSN/WPA IE) will not include in beacon. -+ if(NULL == rtw_get_wps_ie(pnetwork->IEs+_FIXED_IE_LENGTH_, pnetwork->IELength-_FIXED_IE_LENGTH_, NULL, NULL)) -+ { -+ pmlmeext->bstart_bss = _TRUE; -+ } -+ -+ //todo: update wmm, ht cap -+ //pmlmeinfo->WMM_enable; -+ //pmlmeinfo->HT_enable; -+ if(pmlmepriv->qospriv.qos_option) -+ pmlmeinfo->WMM_enable = _TRUE; -+ -+ if(pmlmepriv->htpriv.ht_option) -+ { -+ pmlmeinfo->WMM_enable = _TRUE; -+ pmlmeinfo->HT_enable = _TRUE; -+ //pmlmeinfo->HT_info_enable = _TRUE; -+ //pmlmeinfo->HT_caps_enable = _TRUE; -+ -+ update_hw_ht_param(padapter); -+ } -+ -+ -+ if(pmlmepriv->cur_network.join_res != _TRUE) //setting only at first time -+ { -+ //WEP Key will be set before this function, do not clear CAM. -+ if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_)) -+ flush_all_cam_entry(padapter); //clear CAM -+ } -+ -+ //set MSR to AP_Mode -+ Set_MSR(padapter, _HW_STATE_AP_); -+ -+ //Set BSSID REG -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pnetwork->MacAddress); -+ -+ //Set EDCA param reg -+#ifdef CONFIG_CONCURRENT_MODE -+ acparm = 0x005ea42b; -+#else -+ acparm = 0x002F3217; // VO -+#endif -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acparm)); -+ acparm = 0x005E4317; // VI -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acparm)); -+ //acparm = 0x00105320; // BE -+ acparm = 0x005ea42b; -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm)); -+ acparm = 0x0000A444; // BK -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm)); -+ -+ //Set Security -+ val8 = (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)? 0xcc: 0xcf; -+ rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); -+ -+ //Beacon Control related register -+ rtw_hal_set_hwreg(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&bcn_interval)); -+ -+ if(pmlmepriv->cur_network.join_res != _TRUE) //setting only at first time -+ { -+ u32 initialgain; -+ -+ initialgain = 0x1e; -+ -+ -+ //disable dynamic functions, such as high power, DIG -+ //Save_DM_Func_Flag(padapter); -+ //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->adapter_type > PRIMARY_ADAPTER) -+ { -+ if(rtw_buddy_adapter_up(padapter)) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ -+ //turn on dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER -+ Switch_DM_Func(pbuddy_adapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE); -+ -+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); -+ } -+ } -+ else -+#endif -+ { -+ //turn on dynamic functions -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); -+ } -+ -+ } -+ -+ //set channel, bwmode -+ p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if( p && ie_len) -+ { -+ pht_info = (struct HT_info_element *)(p+2); -+ -+ if( pmlmeext->cur_channel > 14 ) -+ { -+ if( pregpriv->cbw40_enable & BIT(1) ) -+ cbw40_enable = 1; -+ } -+ else -+ if( pregpriv->cbw40_enable & BIT(0) ) -+ cbw40_enable = 1; -+ -+ if ((cbw40_enable) && (pht_info->infos[0] & BIT(2))) -+ { -+ //switch to the 40M Hz mode -+ //pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ cur_bwmode = HT_CHANNEL_WIDTH_40; -+ switch (pht_info->infos[0] & 0x3) -+ { -+ case 1: -+ //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ break; -+ -+ case 3: -+ //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ break; -+ -+ default: -+ //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ break; -+ } -+ -+ } -+ -+ } -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_set_ap_channel_bandwidth(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+#else -+ //TODO: need to judge the phy parameters on concurrent mode for single phy -+ //set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+#ifdef CONFIG_CONCURRENT_MODE -+ if(!check_buddy_fwstate(padapter, _FW_LINKED|_FW_UNDER_LINKING|_FW_UNDER_SURVEY)) -+ { -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+ } -+ else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ //To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter -+ DBG_871X("primary iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n"); -+ DBG_871X("primary adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); -+ DBG_871X("second adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); -+ -+ if((cur_channel <= 14 && pbuddy_mlmeext->cur_channel >= 36) || -+ (cur_channel >= 36 && pbuddy_mlmeext->cur_channel <= 14)) -+ change_band = _TRUE; -+ -+ cur_channel = pbuddy_mlmeext->cur_channel; -+ if(cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ if(pht_info) -+ pht_info->infos[0] &= ~(BIT(0)|BIT(1)); -+ -+ if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ -+ //to update cur_ch_offset value in beacon -+ if(pht_info) -+ { -+ switch(cur_ch_offset) -+ { -+ case HAL_PRIME_CHNL_OFFSET_LOWER: -+ pht_info->infos[0] |= 0x1; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_UPPER: -+ pht_info->infos[0] |= 0x3; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_DONT_CARE: -+ default: -+ break; -+ } -+ } -+ -+ } -+ else if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) -+ { -+ cur_bwmode = HT_CHANNEL_WIDTH_20; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ if(cur_channel>0 && cur_channel<5) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= 0x1; -+ -+ cur_bwmode = HT_CHANNEL_WIDTH_40; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ } -+ -+ if(cur_channel>7 && cur_channel<(14+1)) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= 0x3; -+ -+ cur_bwmode = HT_CHANNEL_WIDTH_40; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ } -+ -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+ } -+ -+ } -+ -+ // to update channel value in beacon -+ pnetwork->Configuration.DSConfig = cur_channel; -+ p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _DSSET_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if(p && ie_len>0) -+ *(p + 2) = cur_channel; -+ -+ if(pht_info) -+ pht_info->primary_channel = cur_channel; -+ -+ //set buddy adapter channel, bandwidth, offeset to current adapter -+ pmlmeext->cur_channel = cur_channel; -+ pmlmeext->cur_bwmode = cur_bwmode; -+ pmlmeext->cur_ch_offset = cur_ch_offset; -+ -+ //buddy interface band is different from current interface, update ERP, support rate, ext support rate IE -+ if(change_band == _TRUE) -+ change_band_update_ie(padapter, pnetwork); -+ } -+#else -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ DBG_871X("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); -+ -+ // -+ pmlmeext->cur_channel = cur_channel; -+ pmlmeext->cur_bwmode = cur_bwmode; -+ pmlmeext->cur_ch_offset = cur_ch_offset; -+#endif //CONFIG_DUALMAC_CONCURRENT -+ pmlmeext->cur_wireless_mode = pmlmepriv->cur_network.network_type; -+ -+ //update cur_wireless_mode -+ update_wireless_mode(padapter); -+ -+ //update RRSR after set channel and bandwidth -+ UpdateBrateTbl(padapter, pnetwork->SupportedRates); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates); -+ -+ //udpate capability after cur_wireless_mode updated -+ update_capinfo(padapter, rtw_get_capability((WLAN_BSSID_EX *)pnetwork)); -+ -+ //let pnetwork_mlmeext == pnetwork_mlme. -+ _rtw_memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length); -+ -+#ifdef CONFIG_P2P -+ _rtw_memcpy(pwdinfo->p2p_group_ssid, pnetwork->Ssid.Ssid, pnetwork->Ssid.SsidLength); -+ pwdinfo->p2p_group_ssid_len = pnetwork->Ssid.SsidLength; -+#endif //CONFIG_P2P -+ -+ if(_TRUE == pmlmeext->bstart_bss) -+ { -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ -+#ifndef CONFIG_INTERRUPT_BASED_TXBCN //other case will tx beacon when bcn interrupt coming in. -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -+ //issue beacon frame -+ if(send_beacon(padapter)==_FAIL) -+ { -+ DBG_871X("issue_beacon, fail!\n"); -+ } -+#endif -+#endif //!CONFIG_INTERRUPT_BASED_TXBCN -+ -+ } -+ -+ -+ //update bc/mc sta_info -+ update_bmc_sta(padapter); -+ -+ //pmlmeext->bstart_bss = _TRUE; -+ -+} -+ -+int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) -+{ -+ int ret=_SUCCESS; -+ u8 *p; -+ u8 *pHT_caps_ie=NULL; -+ u8 *pHT_info_ie=NULL; -+ struct sta_info *psta = NULL; -+ u16 cap, ht_cap=_FALSE; -+ uint ie_len = 0; -+ int group_cipher, pairwise_cipher; -+ u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX]; -+ int supportRateNum = 0; -+ u8 OUI1[] = {0x00, 0x50, 0xf2,0x01}; -+ u8 wps_oui[4]={0x0,0x50,0xf2,0x04}; -+ u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *ie = pbss_network->IEs; -+ -+ -+ /* SSID */ -+ /* Supported rates */ -+ /* DS Params */ -+ /* WLAN_EID_COUNTRY */ -+ /* ERP Information element */ -+ /* Extended supported rates */ -+ /* WPA/WPA2 */ -+ /* Wi-Fi Wireless Multimedia Extensions */ -+ /* ht_capab, ht_oper */ -+ /* WPS IE */ -+ -+ DBG_871X("%s, len=%d\n", __FUNCTION__, len); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return _FAIL; -+ -+ -+ if(len>MAX_IE_SZ) -+ return _FAIL; -+ -+ pbss_network->IELength = len; -+ -+ _rtw_memset(ie, 0, MAX_IE_SZ); -+ -+ _rtw_memcpy(ie, pbuf, pbss_network->IELength); -+ -+ -+ if(pbss_network->InfrastructureMode!=Ndis802_11APMode) -+ return _FAIL; -+ -+ pbss_network->Rssi = 0; -+ -+ _rtw_memcpy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ //beacon interval -+ p = rtw_get_beacon_interval_from_ie(ie);//ie + 8; // 8: TimeStamp, 2: Beacon Interval 2:Capability -+ //pbss_network->Configuration.BeaconPeriod = le16_to_cpu(*(unsigned short*)p); -+ pbss_network->Configuration.BeaconPeriod = RTW_GET_LE16(p); -+ -+ //capability -+ //cap = *(unsigned short *)rtw_get_capability_from_ie(ie); -+ //cap = le16_to_cpu(cap); -+ cap = RTW_GET_LE16(ie); -+ -+ //SSID -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength -_BEACON_IE_OFFSET_)); -+ if(p && ie_len>0) -+ { -+ _rtw_memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); -+ _rtw_memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len); -+ pbss_network->Ssid.SsidLength = ie_len; -+ } -+ -+ //chnnel -+ channel = 0; -+ pbss_network->Configuration.Length = 0; -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); -+ if(p && ie_len>0) -+ channel = *(p + 2); -+ -+ pbss_network->Configuration.DSConfig = channel; -+ -+ -+ _rtw_memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX); -+ // get supported rates -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); -+ if (p != NULL) -+ { -+ _rtw_memcpy(supportRate, p+2, ie_len); -+ supportRateNum = ie_len; -+ } -+ -+ //get ext_supported rates -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_); -+ if (p != NULL) -+ { -+ _rtw_memcpy(supportRate+supportRateNum, p+2, ie_len); -+ supportRateNum += ie_len; -+ -+ } -+ -+ network_type = rtw_check_network_type(supportRate, supportRateNum, channel); -+ -+ rtw_set_supported_rate(pbss_network->SupportedRates, network_type); -+ -+ -+ //parsing ERP_IE -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); -+ if(p && ie_len>0) -+ { -+ ERP_IE_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)p); -+ } -+ -+ //update privacy/security -+ if (cap & BIT(4)) -+ pbss_network->Privacy = 1; -+ else -+ pbss_network->Privacy = 0; -+ -+ psecuritypriv->wpa_psk = 0; -+ -+ //wpa2 -+ group_cipher = 0; pairwise_cipher = 0; -+ psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; -+ psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); -+ if(p && ie_len>0) -+ { -+ if(rtw_parse_wpa2_ie(p, ie_len+2, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ psecuritypriv->dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; -+ -+ psecuritypriv->dot8021xalg = 1;//psk, todo:802.1x -+ psecuritypriv->wpa_psk |= BIT(1); -+ -+ psecuritypriv->wpa2_group_cipher = group_cipher; -+ psecuritypriv->wpa2_pairwise_cipher = pairwise_cipher; -+#if 0 -+ switch(group_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; -+ break; -+ case WPA_CIPHER_WEP40: -+ psecuritypriv->wpa2_group_cipher = _WEP40_; -+ break; -+ case WPA_CIPHER_TKIP: -+ psecuritypriv->wpa2_group_cipher = _TKIP_; -+ break; -+ case WPA_CIPHER_CCMP: -+ psecuritypriv->wpa2_group_cipher = _AES_; -+ break; -+ case WPA_CIPHER_WEP104: -+ psecuritypriv->wpa2_group_cipher = _WEP104_; -+ break; -+ } -+ -+ switch(pairwise_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; -+ break; -+ case WPA_CIPHER_WEP40: -+ psecuritypriv->wpa2_pairwise_cipher = _WEP40_; -+ break; -+ case WPA_CIPHER_TKIP: -+ psecuritypriv->wpa2_pairwise_cipher = _TKIP_; -+ break; -+ case WPA_CIPHER_CCMP: -+ psecuritypriv->wpa2_pairwise_cipher = _AES_; -+ break; -+ case WPA_CIPHER_WEP104: -+ psecuritypriv->wpa2_pairwise_cipher = _WEP104_; -+ break; -+ } -+#endif -+ } -+ -+ } -+ -+ //wpa -+ ie_len = 0; -+ group_cipher = 0; pairwise_cipher = 0; -+ psecuritypriv->wpa_group_cipher = _NO_PRIVACY_; -+ psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_; -+ for (p = ie + _BEACON_IE_OFFSET_; ;p += (ie_len + 2)) -+ { -+ p = rtw_get_ie(p, _SSN_IE_1_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2))); -+ if ((p) && (_rtw_memcmp(p+2, OUI1, 4))) -+ { -+ if(rtw_parse_wpa_ie(p, ie_len+2, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ psecuritypriv->dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; -+ -+ psecuritypriv->dot8021xalg = 1;//psk, todo:802.1x -+ -+ psecuritypriv->wpa_psk |= BIT(0); -+ -+ psecuritypriv->wpa_group_cipher = group_cipher; -+ psecuritypriv->wpa_pairwise_cipher = pairwise_cipher; -+ -+#if 0 -+ switch(group_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ psecuritypriv->wpa_group_cipher = _NO_PRIVACY_; -+ break; -+ case WPA_CIPHER_WEP40: -+ psecuritypriv->wpa_group_cipher = _WEP40_; -+ break; -+ case WPA_CIPHER_TKIP: -+ psecuritypriv->wpa_group_cipher = _TKIP_; -+ break; -+ case WPA_CIPHER_CCMP: -+ psecuritypriv->wpa_group_cipher = _AES_; -+ break; -+ case WPA_CIPHER_WEP104: -+ psecuritypriv->wpa_group_cipher = _WEP104_; -+ break; -+ } -+ -+ switch(pairwise_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_; -+ break; -+ case WPA_CIPHER_WEP40: -+ psecuritypriv->wpa_pairwise_cipher = _WEP40_; -+ break; -+ case WPA_CIPHER_TKIP: -+ psecuritypriv->wpa_pairwise_cipher = _TKIP_; -+ break; -+ case WPA_CIPHER_CCMP: -+ psecuritypriv->wpa_pairwise_cipher = _AES_; -+ break; -+ case WPA_CIPHER_WEP104: -+ psecuritypriv->wpa_pairwise_cipher = _WEP104_; -+ break; -+ } -+#endif -+ } -+ -+ break; -+ -+ } -+ -+ if ((p == NULL) || (ie_len == 0)) -+ { -+ break; -+ } -+ -+ } -+ -+ //wmm -+ ie_len = 0; -+ pmlmepriv->qospriv.qos_option = 0; -+ if(pregistrypriv->wmm_enable) -+ { -+ for (p = ie + _BEACON_IE_OFFSET_; ;p += (ie_len + 2)) -+ { -+ p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2))); -+ if((p) && _rtw_memcmp(p+2, WMM_PARA_IE, 6)) -+ { -+ pmlmepriv->qospriv.qos_option = 1; -+ -+ *(p+8) |= BIT(7);//QoS Info, support U-APSD -+ -+ /* disable all ACM bits since the WMM admission control is not supported */ -+ *(p + 10) &= ~BIT(4); /* BE */ -+ *(p + 14) &= ~BIT(4); /* BK */ -+ *(p + 18) &= ~BIT(4); /* VI */ -+ *(p + 22) &= ~BIT(4); /* VO */ -+ -+ break; -+ } -+ -+ if ((p == NULL) || (ie_len == 0)) -+ { -+ break; -+ } -+ } -+ } -+ -+ //parsing HT_CAP_IE -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); -+ if(p && ie_len>0) -+ { -+ u8 rf_type; -+ -+ struct rtw_ieee80211_ht_cap *pht_cap = (struct rtw_ieee80211_ht_cap *)(p+2); -+ -+ pHT_caps_ie=p; -+ -+ -+ ht_cap = _TRUE; -+ network_type |= WIRELESS_11_24N; -+ -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ -+ if((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) || -+ (psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP)) -+ { -+ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2)); -+ } -+ else -+ { -+ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00); -+ } -+ -+ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & 0x03); //set Max Rx AMPDU size to 64K -+ -+ if(rf_type == RF_1T1R) -+ { -+ pht_cap->supp_mcs_set[0] = 0xff; -+ pht_cap->supp_mcs_set[1] = 0x0; -+ } -+ -+ _rtw_memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len); -+ -+ } -+ -+ //parsing HT_INFO_IE -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_)); -+ if(p && ie_len>0) -+ { -+ pHT_info_ie=p; -+ } -+ -+ switch(network_type) -+ { -+ case WIRELESS_11B: -+ pbss_network->NetworkTypeInUse = Ndis802_11DS; -+ break; -+ case WIRELESS_11G: -+ case WIRELESS_11BG: -+ case WIRELESS_11G_24N: -+ case WIRELESS_11BG_24N: -+ pbss_network->NetworkTypeInUse = Ndis802_11OFDM24; -+ break; -+ case WIRELESS_11A: -+ pbss_network->NetworkTypeInUse = Ndis802_11OFDM5; -+ break; -+ default : -+ pbss_network->NetworkTypeInUse = Ndis802_11OFDM24; -+ break; -+ } -+ -+ pmlmepriv->cur_network.network_type = network_type; -+ -+ -+ pmlmepriv->htpriv.ht_option = _FALSE; -+#ifdef CONFIG_80211N_HT -+ if( (psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) || -+ (psecuritypriv->wpa_pairwise_cipher&WPA_CIPHER_TKIP)) -+ { -+ //todo: -+ //ht_cap = _FALSE; -+ } -+ -+ //ht_cap -+ if(pregistrypriv->ht_enable && ht_cap==_TRUE) -+ { -+ pmlmepriv->htpriv.ht_option = _TRUE; -+ pmlmepriv->qospriv.qos_option = 1; -+ -+ if(pregistrypriv->ampdu_enable==1) -+ { -+ pmlmepriv->htpriv.ampdu_enable = _TRUE; -+ } -+ -+ HT_caps_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_caps_ie); -+ -+ HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie); -+ } -+#endif -+ -+ -+ pbss_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX *)pbss_network); -+ -+ //issue beacon to start bss network -+ start_bss_network(padapter, (u8*)pbss_network); -+ -+ -+ //alloc sta_info for ap itself -+ psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->MacAddress); -+ if(!psta) -+ { -+ psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->MacAddress); -+ if (psta == NULL) -+ { -+ return _FAIL; -+ } -+ } -+ psta->state |= WIFI_AP_STATE; //Aries, add,fix bug of flush_cam_entry at STOP AP mode , 0724 -+ rtw_indicate_connect( padapter); -+ -+ pmlmepriv->cur_network.join_res = _TRUE;//for check if already set beacon -+ -+ //update bc/mc sta_info -+ //update_bmc_sta(padapter); -+ -+ return ret; -+ -+} -+ -+void rtw_set_macaddr_acl(_adapter *padapter, int mode) -+{ -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ -+ DBG_871X("%s, mode=%d\n", __func__, mode); -+ -+ pacl_list->mode = mode; -+} -+ -+int rtw_acl_add_sta(_adapter *padapter, u8 *addr) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ u8 added = _FALSE; -+ int i, ret=0; -+ struct rtw_wlan_acl_node *paclnode; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ _queue *pacl_node_q =&pacl_list->acl_node_q; -+ -+ DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); -+ -+ if((NUM_ACL-1) < pacl_list->num) -+ return (-1); -+ -+ -+ _enter_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ phead = get_list_head(pacl_node_q); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); -+ plist = get_next(plist); -+ -+ if(_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) -+ { -+ if(paclnode->valid == _TRUE) -+ { -+ added = _TRUE; -+ DBG_871X("%s, sta has been added\n", __func__); -+ break; -+ } -+ } -+ } -+ -+ _exit_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ -+ if(added == _TRUE) -+ return ret; -+ -+ -+ _enter_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ for(i=0; i< NUM_ACL; i++) -+ { -+ paclnode = &pacl_list->aclnode[i]; -+ -+ if(paclnode->valid == _FALSE) -+ { -+ _rtw_init_listhead(&paclnode->list); -+ -+ _rtw_memcpy(paclnode->addr, addr, ETH_ALEN); -+ -+ paclnode->valid = _TRUE; -+ -+ rtw_list_insert_tail(&paclnode->list, get_list_head(pacl_node_q)); -+ -+ pacl_list->num++; -+ -+ break; -+ } -+ } -+ -+ DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num); -+ -+ _exit_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ return ret; -+} -+ -+int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ int i, ret=0; -+ struct rtw_wlan_acl_node *paclnode; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ _queue *pacl_node_q =&pacl_list->acl_node_q; -+ -+ DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); -+ -+ _enter_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ phead = get_list_head(pacl_node_q); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); -+ plist = get_next(plist); -+ -+ if(_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) -+ { -+ if(paclnode->valid == _TRUE) -+ { -+ paclnode->valid = _FALSE; -+ -+ rtw_list_delete(&paclnode->list); -+ -+ pacl_list->num--; -+ } -+ } -+ } -+ -+ _exit_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num); -+ -+ return ret; -+ -+} -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ -+static void update_bcn_fixed_ie(_adapter *padapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+} -+ -+static void update_bcn_erpinfo_ie(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network); -+ unsigned char *p, *ie = pnetwork->IEs; -+ u32 len = 0; -+ -+ DBG_871X("%s, ERP_enable=%d\n", __FUNCTION__, pmlmeinfo->ERP_enable); -+ -+ if(!pmlmeinfo->ERP_enable) -+ return; -+ -+ //parsing ERP_IE -+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); -+ if(p && len>0) -+ { -+ PNDIS_802_11_VARIABLE_IEs pIE = (PNDIS_802_11_VARIABLE_IEs)p; -+ -+ if (pmlmepriv->num_sta_non_erp == 1) -+ pIE->data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION; -+ else -+ pIE->data[0] &= ~(RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION); -+ -+ if(pmlmepriv->num_sta_no_short_preamble > 0) -+ pIE->data[0] |= RTW_ERP_INFO_BARKER_PREAMBLE_MODE; -+ else -+ pIE->data[0] &= ~(RTW_ERP_INFO_BARKER_PREAMBLE_MODE); -+ -+ ERP_IE_handler(padapter, pIE); -+ } -+ -+} -+ -+static void update_bcn_htcap_ie(_adapter *padapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+} -+ -+static void update_bcn_htinfo_ie(_adapter *padapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+} -+ -+static void update_bcn_rsn_ie(_adapter *padapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+} -+ -+static void update_bcn_wpa_ie(_adapter *padapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+} -+ -+static void update_bcn_wmm_ie(_adapter *padapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+} -+ -+static void update_bcn_wps_ie(_adapter *padapter) -+{ -+ u8 *pwps_ie=NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie=NULL; -+ uint wps_ielen=0, wps_offset, remainder_ielen; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network); -+ unsigned char *ie = pnetwork->IEs; -+ u32 ielen = pnetwork->IELength; -+ -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen); -+ -+ if(pwps_ie==NULL || wps_ielen==0) -+ return; -+ -+ wps_offset = (uint)(pwps_ie-ie); -+ -+ premainder_ie = pwps_ie + wps_ielen; -+ -+ remainder_ielen = ielen - wps_offset - wps_ielen; -+ -+ if(remainder_ielen>0) -+ { -+ pbackup_remainder_ie = rtw_malloc(remainder_ielen); -+ if(pbackup_remainder_ie) -+ _rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); -+ } -+ -+ -+ pwps_ie_src = pmlmepriv->wps_beacon_ie; -+ if(pwps_ie_src == NULL) -+ return; -+ -+ -+ wps_ielen = (uint)pwps_ie_src[1];//to get ie data len -+ if((wps_offset+wps_ielen+2+remainder_ielen)<=MAX_IE_SZ) -+ { -+ _rtw_memcpy(pwps_ie, pwps_ie_src, wps_ielen+2); -+ pwps_ie += (wps_ielen+2); -+ -+ if(pbackup_remainder_ie) -+ _rtw_memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen); -+ -+ //update IELength -+ pnetwork->IELength = wps_offset + (wps_ielen+2) + remainder_ielen; -+ } -+ -+ if(pbackup_remainder_ie) -+ rtw_mfree(pbackup_remainder_ie, remainder_ielen); -+ -+} -+ -+static void update_bcn_p2p_ie(_adapter *padapter) -+{ -+ -+} -+ -+static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if(_rtw_memcmp(RTW_WPA_OUI, oui, 4)) -+ { -+ update_bcn_wpa_ie(padapter); -+ } -+ else if(_rtw_memcmp(WMM_OUI, oui, 4)) -+ { -+ update_bcn_wmm_ie(padapter); -+ } -+ else if(_rtw_memcmp(WPS_OUI, oui, 4)) -+ { -+ update_bcn_wps_ie(padapter); -+ } -+ else if(_rtw_memcmp(P2P_OUI, oui, 4)) -+ { -+ update_bcn_p2p_ie(padapter); -+ } -+ else -+ { -+ DBG_871X("unknown OUI type!\n"); -+ } -+ -+ -+} -+ -+void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv; -+ struct mlme_ext_priv *pmlmeext; -+ //struct mlme_ext_info *pmlmeinfo; -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ if(!padapter) -+ return; -+ -+ pmlmepriv = &(padapter->mlmepriv); -+ pmlmeext = &(padapter->mlmeextpriv); -+ //pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if(_FALSE == pmlmeext->bstart_bss) -+ return; -+ -+ _enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); -+ -+ switch(ie_id) -+ { -+ case 0xFF: -+ -+ update_bcn_fixed_ie(padapter);//8: TimeStamp, 2: Beacon Interval 2:Capability -+ -+ break; -+ -+ case _TIM_IE_: -+ -+ update_BCNTIM(padapter); -+ -+ break; -+ -+ case _ERPINFO_IE_: -+ -+ update_bcn_erpinfo_ie(padapter); -+ -+ break; -+ -+ case _HT_CAPABILITY_IE_: -+ -+ update_bcn_htcap_ie(padapter); -+ -+ break; -+ -+ case _RSN_IE_2_: -+ -+ update_bcn_rsn_ie(padapter); -+ -+ break; -+ -+ case _HT_ADD_INFO_IE_: -+ -+ update_bcn_htinfo_ie(padapter); -+ -+ break; -+ -+ case _VENDOR_SPECIFIC_IE_: -+ -+ update_bcn_vendor_spec_ie(padapter, oui); -+ -+ break; -+ -+ default: -+ break; -+ } -+ -+ pmlmepriv->update_bcn = _TRUE; -+ -+ _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); -+ -+#ifndef CONFIG_INTERRUPT_BASED_TXBCN -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -+ if(tx) -+ { -+ //send_beacon(padapter);//send_beacon must execute on TSR level -+ set_tx_beacon_cmd(padapter); -+ } -+#else -+ { -+ //PCI will issue beacon when BCN interrupt occurs. -+ } -+#endif -+#endif //!CONFIG_INTERRUPT_BASED_TXBCN -+ -+} -+ -+#ifdef CONFIG_80211N_HT -+ -+/* -+op_mode -+Set to 0 (HT pure) under the followign conditions -+ - all STAs in the BSS are 20/40 MHz HT in 20/40 MHz BSS or -+ - all STAs in the BSS are 20 MHz HT in 20 MHz BSS -+Set to 1 (HT non-member protection) if there may be non-HT STAs -+ in both the primary and the secondary channel -+Set to 2 if only HT STAs are associated in BSS, -+ however and at least one 20 MHz HT STA is associated -+Set to 3 (HT mixed mode) when one or more non-HT STAs are associated -+ (currently non-GF HT station is considered as non-HT STA also) -+*/ -+static int rtw_ht_operation_update(_adapter *padapter) -+{ -+ u16 cur_op_mode, new_op_mode; -+ int op_mode_changes = 0; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; -+ -+ if(pmlmepriv->htpriv.ht_option == _TRUE) -+ return 0; -+ -+ //if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) -+ // return 0; -+ -+ DBG_871X("%s current operation mode=0x%X\n", -+ __FUNCTION__, pmlmepriv->ht_op_mode); -+ -+ if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) -+ && pmlmepriv->num_sta_ht_no_gf) { -+ pmlmepriv->ht_op_mode |= -+ HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT; -+ op_mode_changes++; -+ } else if ((pmlmepriv->ht_op_mode & -+ HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) && -+ pmlmepriv->num_sta_ht_no_gf == 0) { -+ pmlmepriv->ht_op_mode &= -+ ~HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT; -+ op_mode_changes++; -+ } -+ -+ if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) && -+ (pmlmepriv->num_sta_no_ht || pmlmepriv->olbc_ht)) { -+ pmlmepriv->ht_op_mode |= HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT; -+ op_mode_changes++; -+ } else if ((pmlmepriv->ht_op_mode & -+ HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) && -+ (pmlmepriv->num_sta_no_ht == 0 && !pmlmepriv->olbc_ht)) { -+ pmlmepriv->ht_op_mode &= -+ ~HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT; -+ op_mode_changes++; -+ } -+ -+ /* Note: currently we switch to the MIXED op mode if HT non-greenfield -+ * station is associated. Probably it's a theoretical case, since -+ * it looks like all known HT STAs support greenfield. -+ */ -+ new_op_mode = 0; -+ if (pmlmepriv->num_sta_no_ht || -+ (pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)) -+ new_op_mode = OP_MODE_MIXED; -+ else if ((phtpriv_ap->ht_cap.cap_info & IEEE80211_HT_CAP_SUP_WIDTH) -+ && pmlmepriv->num_sta_ht_20mhz) -+ new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED; -+ else if (pmlmepriv->olbc_ht) -+ new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS; -+ else -+ new_op_mode = OP_MODE_PURE; -+ -+ cur_op_mode = pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_OP_MODE_MASK; -+ if (cur_op_mode != new_op_mode) { -+ pmlmepriv->ht_op_mode &= ~HT_INFO_OPERATION_MODE_OP_MODE_MASK; -+ pmlmepriv->ht_op_mode |= new_op_mode; -+ op_mode_changes++; -+ } -+ -+ DBG_871X("%s new operation mode=0x%X changes=%d\n", -+ __FUNCTION__, pmlmepriv->ht_op_mode, op_mode_changes); -+ -+ return op_mode_changes; -+ -+} -+ -+#endif /* CONFIG_80211N_HT */ -+ -+void associated_clients_update(_adapter *padapter, u8 updated) -+{ -+ //update associcated stations cap. -+ if(updated == _TRUE) -+ { -+ _irqL irqL; -+ _list *phead, *plist; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ //check asoc_queue -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ -+ plist = get_next(plist); -+ -+ VCS_update(padapter, psta); -+ } -+ -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ } -+ -+} -+ -+/* called > TSR LEVEL for USB or SDIO Interface*/ -+void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) -+{ -+ u8 beacon_updated = _FALSE; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ -+#if 0 -+ if (!(psta->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) && -+ !psta->no_short_preamble_set) { -+ psta->no_short_preamble_set = 1; -+ pmlmepriv->num_sta_no_short_preamble++; -+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && -+ (pmlmepriv->num_sta_no_short_preamble == 1)) -+ ieee802_11_set_beacons(hapd->iface); -+ } -+#endif -+ -+ -+ if(!(psta->flags & WLAN_STA_SHORT_PREAMBLE)) -+ { -+ if(!psta->no_short_preamble_set) -+ { -+ psta->no_short_preamble_set = 1; -+ -+ pmlmepriv->num_sta_no_short_preamble++; -+ -+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && -+ (pmlmepriv->num_sta_no_short_preamble == 1)) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, 0xFF, NULL, _TRUE); -+ } -+ -+ } -+ } -+ else -+ { -+ if(psta->no_short_preamble_set) -+ { -+ psta->no_short_preamble_set = 0; -+ -+ pmlmepriv->num_sta_no_short_preamble--; -+ -+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && -+ (pmlmepriv->num_sta_no_short_preamble == 0)) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, 0xFF, NULL, _TRUE); -+ } -+ -+ } -+ } -+ -+#if 0 -+ if (psta->flags & WLAN_STA_NONERP && !psta->nonerp_set) { -+ psta->nonerp_set = 1; -+ pmlmepriv->num_sta_non_erp++; -+ if (pmlmepriv->num_sta_non_erp == 1) -+ ieee802_11_set_beacons(hapd->iface); -+ } -+#endif -+ -+ if(psta->flags & WLAN_STA_NONERP) -+ { -+ if(!psta->nonerp_set) -+ { -+ psta->nonerp_set = 1; -+ -+ pmlmepriv->num_sta_non_erp++; -+ -+ if (pmlmepriv->num_sta_non_erp == 1) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); -+ } -+ } -+ -+ } -+ else -+ { -+ if(psta->nonerp_set) -+ { -+ psta->nonerp_set = 0; -+ -+ pmlmepriv->num_sta_non_erp--; -+ -+ if (pmlmepriv->num_sta_non_erp == 0) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); -+ } -+ } -+ -+ } -+ -+ -+#if 0 -+ if (!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT) && -+ !psta->no_short_slot_time_set) { -+ psta->no_short_slot_time_set = 1; -+ pmlmepriv->num_sta_no_short_slot_time++; -+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && -+ (pmlmepriv->num_sta_no_short_slot_time == 1)) -+ ieee802_11_set_beacons(hapd->iface); -+ } -+#endif -+ -+ if(!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT)) -+ { -+ if(!psta->no_short_slot_time_set) -+ { -+ psta->no_short_slot_time_set = 1; -+ -+ pmlmepriv->num_sta_no_short_slot_time++; -+ -+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && -+ (pmlmepriv->num_sta_no_short_slot_time == 1)) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, 0xFF, NULL, _TRUE); -+ } -+ -+ } -+ } -+ else -+ { -+ if(psta->no_short_slot_time_set) -+ { -+ psta->no_short_slot_time_set = 0; -+ -+ pmlmepriv->num_sta_no_short_slot_time--; -+ -+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && -+ (pmlmepriv->num_sta_no_short_slot_time == 0)) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, 0xFF, NULL, _TRUE); -+ } -+ } -+ } -+ -+#ifdef CONFIG_80211N_HT -+ -+ if (psta->flags & WLAN_STA_HT) -+ { -+ u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info); -+ -+ DBG_871X("HT: STA " MAC_FMT " HT Capabilities " -+ "Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab); -+ -+ if (psta->no_ht_set) { -+ psta->no_ht_set = 0; -+ pmlmepriv->num_sta_no_ht--; -+ } -+ -+ if ((ht_capab & IEEE80211_HT_CAP_GRN_FLD) == 0) { -+ if (!psta->no_ht_gf_set) { -+ psta->no_ht_gf_set = 1; -+ pmlmepriv->num_sta_ht_no_gf++; -+ } -+ DBG_871X("%s STA " MAC_FMT " - no " -+ "greenfield, num of non-gf stations %d\n", -+ __FUNCTION__, MAC_ARG(psta->hwaddr), -+ pmlmepriv->num_sta_ht_no_gf); -+ } -+ -+ if ((ht_capab & IEEE80211_HT_CAP_SUP_WIDTH) == 0) { -+ if (!psta->ht_20mhz_set) { -+ psta->ht_20mhz_set = 1; -+ pmlmepriv->num_sta_ht_20mhz++; -+ } -+ DBG_871X("%s STA " MAC_FMT " - 20 MHz HT, " -+ "num of 20MHz HT STAs %d\n", -+ __FUNCTION__, MAC_ARG(psta->hwaddr), -+ pmlmepriv->num_sta_ht_20mhz); -+ } -+ -+ } -+ else -+ { -+ if (!psta->no_ht_set) { -+ psta->no_ht_set = 1; -+ pmlmepriv->num_sta_no_ht++; -+ } -+ if(pmlmepriv->htpriv.ht_option == _TRUE) { -+ DBG_871X("%s STA " MAC_FMT -+ " - no HT, num of non-HT stations %d\n", -+ __FUNCTION__, MAC_ARG(psta->hwaddr), -+ pmlmepriv->num_sta_no_ht); -+ } -+ } -+ -+ if (rtw_ht_operation_update(padapter) > 0) -+ { -+ update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE); -+ update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE); -+ } -+ -+#endif /* CONFIG_80211N_HT */ -+ -+ //update associcated stations cap. -+ associated_clients_update(padapter, beacon_updated); -+ -+ DBG_871X("%s, updated=%d\n", __func__, beacon_updated); -+ -+} -+ -+u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta) -+{ -+ u8 beacon_updated = _FALSE; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ if(!psta) -+ return beacon_updated; -+ -+ if (psta->no_short_preamble_set) { -+ psta->no_short_preamble_set = 0; -+ pmlmepriv->num_sta_no_short_preamble--; -+ if (pmlmeext->cur_wireless_mode > WIRELESS_11B -+ && pmlmepriv->num_sta_no_short_preamble == 0) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, 0xFF, NULL, _TRUE); -+ } -+ } -+ -+ if (psta->nonerp_set) { -+ psta->nonerp_set = 0; -+ pmlmepriv->num_sta_non_erp--; -+ if (pmlmepriv->num_sta_non_erp == 0) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE); -+ } -+ } -+ -+ if (psta->no_short_slot_time_set) { -+ psta->no_short_slot_time_set = 0; -+ pmlmepriv->num_sta_no_short_slot_time--; -+ if (pmlmeext->cur_wireless_mode > WIRELESS_11B -+ && pmlmepriv->num_sta_no_short_slot_time == 0) -+ { -+ beacon_updated = _TRUE; -+ update_beacon(padapter, 0xFF, NULL, _TRUE); -+ } -+ } -+ -+#ifdef CONFIG_80211N_HT -+ -+ if (psta->no_ht_gf_set) { -+ psta->no_ht_gf_set = 0; -+ pmlmepriv->num_sta_ht_no_gf--; -+ } -+ -+ if (psta->no_ht_set) { -+ psta->no_ht_set = 0; -+ pmlmepriv->num_sta_no_ht--; -+ } -+ -+ if (psta->ht_20mhz_set) { -+ psta->ht_20mhz_set = 0; -+ pmlmepriv->num_sta_ht_20mhz--; -+ } -+ -+ if (rtw_ht_operation_update(padapter) > 0) -+ { -+ update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE); -+ update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE); -+ } -+ -+#endif /* CONFIG_80211N_HT */ -+ -+ //update associcated stations cap. -+ //associated_clients_update(padapter, beacon_updated); //move it to avoid deadlock -+ -+ DBG_871X("%s, updated=%d\n", __func__, beacon_updated); -+ -+ return beacon_updated; -+ -+} -+ -+u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason) -+{ -+ _irqL irqL; -+ u8 beacon_updated = _FALSE; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ if(!psta) -+ return beacon_updated; -+ -+ if (active == _TRUE) -+ { -+#ifdef CONFIG_80211N_HT -+ //tear down Rx AMPDU -+ send_delba(padapter, 0, psta->hwaddr);// recipient -+ -+ //tear down TX AMPDU -+ send_delba(padapter, 1, psta->hwaddr);// // originator -+ -+#endif //CONFIG_80211N_HT -+ -+ issue_deauth(padapter, psta->hwaddr, reason); -+ } -+ -+ psta->htpriv.agg_enable_bitmap = 0x0;//reset -+ psta->htpriv.candidate_tid_bitmap = 0x0;//reset -+ -+ -+ //report_del_sta_event(padapter, psta->hwaddr, reason); -+ -+ //clear cam entry / key -+ //clear_cam_entry(padapter, (psta->mac_id + 3)); -+ rtw_clearstakey_cmd(padapter, (u8*)psta, (u8)(psta->mac_id + 3), _TRUE); -+ -+ -+ _enter_critical_bh(&psta->lock, &irqL); -+ psta->state &= ~_FW_LINKED; -+ _exit_critical_bh(&psta->lock, &irqL); -+ -+ #ifdef CONFIG_IOCTL_CFG80211 -+ if (1) { -+ #ifdef COMPAT_KERNEL_RELEASE -+ rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason); -+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason); -+ #else //(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ /* will call rtw_cfg80211_indicate_sta_disassoc() in cmd_thread for old API context */ -+ #endif //(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ } else -+ #endif //CONFIG_IOCTL_CFG80211 -+ { -+ rtw_indicate_sta_disassoc_event(padapter, psta); -+ } -+ -+ report_del_sta_event(padapter, psta->hwaddr, reason); -+ -+ beacon_updated = bss_cap_update_on_sta_leave(padapter, psta); -+ -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(padapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ -+ return beacon_updated; -+ -+} -+ -+int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ int ret=0; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; -+ -+ if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) -+ return ret; -+ -+ DBG_871X(FUNC_NDEV_FMT" with ch:%u, offset:%u\n", -+ FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset); -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ /* for each sta in asoc_queue */ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ plist = get_next(plist); -+ -+ issue_action_spct_ch_switch(padapter, psta->hwaddr, new_ch, ch_offset); -+ psta->expire_to = ((pstapriv->expire_to * 2) > 5) ? 5 : (pstapriv->expire_to * 2); -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ issue_action_spct_ch_switch(padapter, bc_addr, new_ch, ch_offset); -+ -+ return ret; -+} -+ -+int rtw_sta_flush(_adapter *padapter) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ int ret=0; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; -+ u8 chk_alive_num = 0; -+ char chk_alive_list[NUM_STA]; -+ int i; -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev)); -+ -+ if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) -+ return ret; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) { -+ int stainfo_offset; -+ -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ plist = get_next(plist); -+ -+ /* Remove sta from asoc_list */ -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ -+ /* Keep sta for ap_free_sta() beyond this asoc_list loop */ -+ stainfo_offset = rtw_stainfo_offset(pstapriv, psta); -+ if (stainfo_offset_valid(stainfo_offset)) { -+ chk_alive_list[chk_alive_num++] = stainfo_offset; -+ } -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ -+ /* For each sta in chk_alive_list, call ap_free_sta */ -+ for (i = 0; i < chk_alive_num; i++) { -+ psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); -+ ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); -+ } -+ -+ issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); -+ -+ associated_clients_update(padapter, _TRUE); -+ -+ return ret; -+ -+} -+ -+/* called > TSR LEVEL for USB or SDIO Interface*/ -+void sta_info_update(_adapter *padapter, struct sta_info *psta) -+{ -+ int flags = psta->flags; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ -+ //update wmm cap. -+ if(WLAN_STA_WME&flags) -+ psta->qos_option = 1; -+ else -+ psta->qos_option = 0; -+ -+ if(pmlmepriv->qospriv.qos_option == 0) -+ psta->qos_option = 0; -+ -+ -+#ifdef CONFIG_80211N_HT -+ //update 802.11n ht cap. -+ if(WLAN_STA_HT&flags) -+ { -+ psta->htpriv.ht_option = _TRUE; -+ psta->qos_option = 1; -+ } -+ else -+ { -+ psta->htpriv.ht_option = _FALSE; -+ } -+ -+ if(pmlmepriv->htpriv.ht_option == _FALSE) -+ psta->htpriv.ht_option = _FALSE; -+#endif -+ -+ -+ update_sta_info_apmode(padapter, psta); -+ -+ -+} -+ -+/* called >= TSR LEVEL for USB or SDIO Interface*/ -+void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta) -+{ -+ if(psta->state & _FW_LINKED) -+ { -+ //add ratid -+ add_RATid(padapter, psta); -+ } -+} -+ -+/* restore hw setting from sw data structures */ -+void rtw_ap_restore_network(_adapter *padapter) -+{ -+ struct mlme_priv *mlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_priv * pstapriv = &padapter->stapriv; -+ struct sta_info *psta; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ _irqL irqL; -+ _list *phead, *plist; -+ u8 chk_alive_num = 0; -+ char chk_alive_list[NUM_STA]; -+ int i; -+ -+ rtw_setopmode_cmd(padapter, Ndis802_11APMode); -+ -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+ start_bss_network(padapter, (u8*)&mlmepriv->cur_network.network); -+ -+ if((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || -+ (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) -+ { -+ /* restore group key, WEP keys is restored in ips_leave() */ -+ rtw_set_key(padapter, psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0); -+ } -+ -+ /* per sta pairwise key and settings */ -+ if((padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_) && -+ (padapter->securitypriv.dot11PrivacyAlgrthm != _AES_)) { -+ return; -+ } -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) { -+ int stainfo_offset; -+ -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ plist = get_next(plist); -+ -+ stainfo_offset = rtw_stainfo_offset(pstapriv, psta); -+ if (stainfo_offset_valid(stainfo_offset)) { -+ chk_alive_list[chk_alive_num++] = stainfo_offset; -+ } -+ } -+ -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ for (i = 0; i < chk_alive_num; i++) { -+ psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); -+ -+ if (psta == NULL) { -+ DBG_871X(FUNC_ADPT_FMT" sta_info is null\n", FUNC_ADPT_ARG(padapter)); -+ } else if (psta->state &_FW_LINKED) { -+ Update_RA_Entry(padapter, psta->mac_id); -+ //pairwise key -+ rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE); -+ } -+ } -+ -+} -+ -+void start_ap_mode(_adapter *padapter) -+{ -+ int i; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ -+ pmlmepriv->update_bcn = _FALSE; -+ -+ //init_mlme_ap_info(padapter); -+ pmlmeext->bstart_bss = _FALSE; -+ -+ pmlmepriv->num_sta_non_erp = 0; -+ -+ pmlmepriv->num_sta_no_short_slot_time = 0; -+ -+ pmlmepriv->num_sta_no_short_preamble = 0; -+ -+ pmlmepriv->num_sta_ht_no_gf = 0; -+ -+ pmlmepriv->num_sta_no_ht = 0; -+ -+ pmlmepriv->num_sta_ht_20mhz = 0; -+ -+ pmlmepriv->olbc = _FALSE; -+ -+ pmlmepriv->olbc_ht = _FALSE; -+ -+#ifdef CONFIG_80211N_HT -+ pmlmepriv->ht_op_mode = 0; -+#endif -+ -+ for(i=0; ista_aid[i] = NULL; -+ -+ pmlmepriv->wps_beacon_ie = NULL; -+ pmlmepriv->wps_probe_resp_ie = NULL; -+ pmlmepriv->wps_assoc_resp_ie = NULL; -+ -+ pmlmepriv->p2p_beacon_ie = NULL; -+ pmlmepriv->p2p_probe_resp_ie = NULL; -+ -+ -+ //for ACL -+ _rtw_init_listhead(&(pacl_list->acl_node_q.queue)); -+ pacl_list->num = 0; -+ pacl_list->mode = 0; -+ for(i = 0; i < NUM_ACL; i++) -+ { -+ _rtw_init_listhead(&pacl_list->aclnode[i].list); -+ pacl_list->aclnode[i].valid = _FALSE; -+ } -+ -+} -+ -+void stop_ap_mode(_adapter *padapter) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ struct rtw_wlan_acl_node *paclnode; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ _queue *pacl_node_q =&pacl_list->acl_node_q; -+ -+ pmlmepriv->update_bcn = _FALSE; -+ pmlmeext->bstart_bss = _FALSE; -+ //_rtw_spinlock_free(&pmlmepriv->bcn_update_lock); -+ -+ //reset and init security priv , this can refine with rtw_reset_securitypriv -+ _rtw_memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; -+ -+ //for ACL -+ _enter_critical_bh(&(pacl_node_q->lock), &irqL); -+ phead = get_list_head(pacl_node_q); -+ plist = get_next(phead); -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); -+ plist = get_next(plist); -+ -+ if(paclnode->valid == _TRUE) -+ { -+ paclnode->valid = _FALSE; -+ -+ rtw_list_delete(&paclnode->list); -+ -+ pacl_list->num--; -+ } -+ } -+ _exit_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ DBG_871X("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num); -+ -+ rtw_sta_flush(padapter); -+ -+ //free_assoc_sta_resources -+ rtw_free_all_stainfo(padapter); -+ -+ psta = rtw_get_bcmc_stainfo(padapter); -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(padapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ rtw_init_bcmc_stainfo(padapter); -+ -+ rtw_free_mlme_priv_ie_data(pmlmepriv); -+ -+} -+ -+#endif //CONFIG_NATIVEAP_MLME -+#endif //CONFIG_AP_MODE -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c -@@ -0,0 +1,1700 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_BR_EXT_C_ -+ -+#ifdef __KERNEL__ -+#include -+#include -+#include -+#include -+#include -+#include -+#endif -+ -+#if 1 // rtw_wifi_driver -+#include -+#include -+#include "rtw_br_ext.h" -+#else // rtw_wifi_driver -+#include "./8192cd_cfg.h" -+ -+#ifndef __KERNEL__ -+#include "./sys-support.h" -+#endif -+ -+#include "./8192cd.h" -+#include "./8192cd_headers.h" -+#include "./8192cd_br_ext.h" -+#include "./8192cd_debug.h" -+#endif // rtw_wifi_driver -+ -+#ifdef CL_IPV6_PASS -+#ifdef __KERNEL__ -+#include -+#include -+#include -+#include -+#include -+#endif -+#endif -+ -+#ifdef CONFIG_BR_EXT -+ -+//#define BR_EXT_DEBUG -+ -+#define NAT25_IPV4 01 -+#define NAT25_IPV6 02 -+#define NAT25_IPX 03 -+#define NAT25_APPLE 04 -+#define NAT25_PPPOE 05 -+ -+#define RTL_RELAY_TAG_LEN (ETH_ALEN) -+#define TAG_HDR_LEN 4 -+ -+#define MAGIC_CODE 0x8186 -+#define MAGIC_CODE_LEN 2 -+#define WAIT_TIME_PPPOE 5 // waiting time for pppoe server in sec -+ -+/*----------------------------------------------------------------- -+ How database records network address: -+ 0 1 2 3 4 5 6 7 8 9 10 -+ |----|----|----|----|----|----|----|----|----|----|----| -+ IPv4 |type| | IP addr | -+ IPX |type| Net addr | Node addr | -+ IPX |type| Net addr |Sckt addr| -+ Apple |type| Network |node| -+ PPPoE |type| SID | AC MAC | -+-----------------------------------------------------------------*/ -+ -+ -+//Find a tag in pppoe frame and return the pointer -+static __inline__ unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsigned short type) -+{ -+ unsigned char *cur_ptr, *start_ptr; -+ unsigned short tagLen, tagType; -+ -+ start_ptr = cur_ptr = (unsigned char *)ph->tag; -+ while((cur_ptr - start_ptr) < ntohs(ph->length)) { -+ // prevent un-alignment access -+ tagType = (unsigned short)((cur_ptr[0] << 8) + cur_ptr[1]); -+ tagLen = (unsigned short)((cur_ptr[2] << 8) + cur_ptr[3]); -+ if(tagType == type) -+ return cur_ptr; -+ cur_ptr = cur_ptr + TAG_HDR_LEN + tagLen; -+ } -+ return 0; -+} -+ -+ -+static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag) -+{ -+ struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); -+ int data_len; -+ -+ data_len = tag->tag_len + TAG_HDR_LEN; -+ if (skb_tailroom(skb) < data_len) { -+ _DEBUG_ERR("skb_tailroom() failed in add SID tag!\n"); -+ return -1; -+ } -+ -+ skb_put(skb, data_len); -+ // have a room for new tag -+ memmove(((unsigned char *)ph->tag + data_len), (unsigned char *)ph->tag, ntohs(ph->length)); -+ ph->length = htons(ntohs(ph->length) + data_len); -+ memcpy((unsigned char *)ph->tag, tag, data_len); -+ return data_len; -+} -+ -+static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len) -+{ -+ int tail_len; -+ unsigned long end, tail; -+ -+ if ((src+len) > skb_tail_pointer(skb) || skb->len < len) -+ return -1; -+ -+ tail = (unsigned long)skb_tail_pointer(skb); -+ end = (unsigned long)src+len; -+ if (tail < end) -+ return -1; -+ -+ tail_len = (int)(tail-end); -+ if (tail_len > 0) -+ memmove(src, src+len, tail_len); -+ -+ skb_trim(skb, skb->len-len); -+ return 0; -+} -+ -+static __inline__ unsigned long __nat25_timeout(_adapter *priv) -+{ -+ unsigned long timeout; -+ -+ timeout = jiffies - NAT25_AGEING_TIME*HZ; -+ -+ return timeout; -+} -+ -+ -+static __inline__ int __nat25_has_expired(_adapter *priv, -+ struct nat25_network_db_entry *fdb) -+{ -+ if(time_before_eq(fdb->ageing_timer, __nat25_timeout(priv))) -+ return 1; -+ -+ return 0; -+} -+ -+ -+static __inline__ void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr, -+ unsigned int *ipAddr) -+{ -+ memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); -+ -+ networkAddr[0] = NAT25_IPV4; -+ memcpy(networkAddr+7, (unsigned char *)ipAddr, 4); -+} -+ -+ -+static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr, -+ unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr) -+{ -+ memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); -+ -+ networkAddr[0] = NAT25_IPX; -+ memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4); -+ memcpy(networkAddr+5, ipxNodeAddr, 6); -+} -+ -+ -+static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr, -+ unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr) -+{ -+ memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); -+ -+ networkAddr[0] = NAT25_IPX; -+ memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4); -+ memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2); -+} -+ -+ -+static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr, -+ unsigned short *network, unsigned char *node) -+{ -+ memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); -+ -+ networkAddr[0] = NAT25_APPLE; -+ memcpy(networkAddr+1, (unsigned char *)network, 2); -+ networkAddr[3] = *node; -+} -+ -+ -+static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, -+ unsigned char *ac_mac, unsigned short *sid) -+{ -+ memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); -+ -+ networkAddr[0] = NAT25_PPPOE; -+ memcpy(networkAddr+1, (unsigned char *)sid, 2); -+ memcpy(networkAddr+3, (unsigned char *)ac_mac, 6); -+} -+ -+ -+#ifdef CL_IPV6_PASS -+static void __nat25_generate_ipv6_network_addr(unsigned char *networkAddr, -+ unsigned int *ipAddr) -+{ -+ memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); -+ -+ networkAddr[0] = NAT25_IPV6; -+ memcpy(networkAddr+1, (unsigned char *)ipAddr, 16); -+} -+ -+ -+static unsigned char *scan_tlv(unsigned char *data, int len, unsigned char tag, unsigned char len8b) -+{ -+ while (len > 0) { -+ if (*data == tag && *(data+1) == len8b && len >= len8b*8) -+ return data+2; -+ -+ len -= (*(data+1))*8; -+ data += (*(data+1))*8; -+ } -+ return NULL; -+} -+ -+ -+static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char *replace_mac) -+{ -+ struct icmp6hdr *icmphdr = (struct icmp6hdr *)data; -+ unsigned char *mac; -+ -+ if (icmphdr->icmp6_type == NDISC_ROUTER_SOLICITATION) { -+ if (len >= 8) { -+ mac = scan_tlv(&data[8], len-8, 1, 1); -+ if (mac) { -+ _DEBUG_INFO("Router Solicitation, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n", -+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5], -+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]); -+ memcpy(mac, replace_mac, 6); -+ return 1; -+ } -+ } -+ } -+ else if (icmphdr->icmp6_type == NDISC_ROUTER_ADVERTISEMENT) { -+ if (len >= 16) { -+ mac = scan_tlv(&data[16], len-16, 1, 1); -+ if (mac) { -+ _DEBUG_INFO("Router Advertisement, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n", -+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5], -+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]); -+ memcpy(mac, replace_mac, 6); -+ return 1; -+ } -+ } -+ } -+ else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) { -+ if (len >= 24) { -+ mac = scan_tlv(&data[24], len-24, 1, 1); -+ if (mac) { -+ _DEBUG_INFO("Neighbor Solicitation, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n", -+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5], -+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]); -+ memcpy(mac, replace_mac, 6); -+ return 1; -+ } -+ } -+ } -+ else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) { -+ if (len >= 24) { -+ mac = scan_tlv(&data[24], len-24, 2, 1); -+ if (mac) { -+ _DEBUG_INFO("Neighbor Advertisement, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n", -+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5], -+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]); -+ memcpy(mac, replace_mac, 6); -+ return 1; -+ } -+ } -+ } -+ else if (icmphdr->icmp6_type == NDISC_REDIRECT) { -+ if (len >= 40) { -+ mac = scan_tlv(&data[40], len-40, 2, 1); -+ if (mac) { -+ _DEBUG_INFO("Redirect, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n", -+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5], -+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]); -+ memcpy(mac, replace_mac, 6); -+ return 1; -+ } -+ } -+ } -+ return 0; -+} -+ -+ -+static void convert_ipv6_mac_to_mc(struct sk_buff *skb) -+{ -+ struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + ETH_HLEN); -+ unsigned char *dst_mac = skb->data; -+ -+ //dst_mac[0] = 0xff; -+ //dst_mac[1] = 0xff; -+ /*modified by qinjunjie,ipv6 multicast address ix 0x33-33-xx-xx-xx-xx*/ -+ dst_mac[0] = 0x33; -+ dst_mac[1] = 0x33; -+ memcpy(&dst_mac[2], &iph->daddr.s6_addr32[3], 4); -+ #if defined(__LINUX_2_6__) -+ /*modified by qinjunjie,warning:should not remove next line*/ -+ skb->pkt_type = PACKET_MULTICAST; -+ #endif -+} -+#endif /* CL_IPV6_PASS */ -+ -+ -+static __inline__ int __nat25_network_hash(unsigned char *networkAddr) -+{ -+ if(networkAddr[0] == NAT25_IPV4) -+ { -+ unsigned long x; -+ -+ x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; -+ -+ return x & (NAT25_HASH_SIZE - 1); -+ } -+ else if(networkAddr[0] == NAT25_IPX) -+ { -+ unsigned long x; -+ -+ x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^ -+ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; -+ -+ return x & (NAT25_HASH_SIZE - 1); -+ } -+ else if(networkAddr[0] == NAT25_APPLE) -+ { -+ unsigned long x; -+ -+ x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3]; -+ -+ return x & (NAT25_HASH_SIZE - 1); -+ } -+ else if(networkAddr[0] == NAT25_PPPOE) -+ { -+ unsigned long x; -+ -+ x = networkAddr[0] ^ networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8]; -+ -+ return x & (NAT25_HASH_SIZE - 1); -+ } -+#ifdef CL_IPV6_PASS -+ else if(networkAddr[0] == NAT25_IPV6) -+ { -+ unsigned long x; -+ -+ x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^ -+ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10] ^ -+ networkAddr[11] ^ networkAddr[12] ^ networkAddr[13] ^ networkAddr[14] ^ networkAddr[15] ^ -+ networkAddr[16]; -+ -+ return x & (NAT25_HASH_SIZE - 1); -+ } -+#endif -+ else -+ { -+ unsigned long x = 0; -+ int i; -+ -+ for (i=0; ibr_ext_lock, &irqL); -+ -+ ent->next_hash = priv->nethash[hash]; -+ if(ent->next_hash != NULL) -+ ent->next_hash->pprev_hash = &ent->next_hash; -+ priv->nethash[hash] = ent; -+ ent->pprev_hash = &priv->nethash[hash]; -+ -+ //_exit_critical_bh(&priv->br_ext_lock, &irqL); -+} -+ -+ -+static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent) -+{ -+ // Caller must _enter_critical_bh already! -+ //_irqL irqL; -+ //_enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ *(ent->pprev_hash) = ent->next_hash; -+ if(ent->next_hash != NULL) -+ ent->next_hash->pprev_hash = ent->pprev_hash; -+ ent->next_hash = NULL; -+ ent->pprev_hash = NULL; -+ -+ //_exit_critical_bh(&priv->br_ext_lock, &irqL); -+} -+ -+ -+static int __nat25_db_network_lookup_and_replace(_adapter *priv, -+ struct sk_buff *skb, unsigned char *networkAddr) -+{ -+ struct nat25_network_db_entry *db; -+ _irqL irqL; -+ _enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ db = priv->nethash[__nat25_network_hash(networkAddr)]; -+ while (db != NULL) -+ { -+ if(!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) -+ { -+ if(!__nat25_has_expired(priv, db)) -+ { -+ // replace the destination mac address -+ memcpy(skb->data, db->macAddr, ETH_ALEN); -+ atomic_inc(&db->use_count); -+ -+#ifdef CL_IPV6_PASS -+ DEBUG_INFO("NAT25: Lookup M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" -+ "%02x%02x%02x%02x%02x%02x\n", -+ db->macAddr[0], -+ db->macAddr[1], -+ db->macAddr[2], -+ db->macAddr[3], -+ db->macAddr[4], -+ db->macAddr[5], -+ db->networkAddr[0], -+ db->networkAddr[1], -+ db->networkAddr[2], -+ db->networkAddr[3], -+ db->networkAddr[4], -+ db->networkAddr[5], -+ db->networkAddr[6], -+ db->networkAddr[7], -+ db->networkAddr[8], -+ db->networkAddr[9], -+ db->networkAddr[10], -+ db->networkAddr[11], -+ db->networkAddr[12], -+ db->networkAddr[13], -+ db->networkAddr[14], -+ db->networkAddr[15], -+ db->networkAddr[16]); -+#else -+ DEBUG_INFO("NAT25: Lookup M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", -+ db->macAddr[0], -+ db->macAddr[1], -+ db->macAddr[2], -+ db->macAddr[3], -+ db->macAddr[4], -+ db->macAddr[5], -+ db->networkAddr[0], -+ db->networkAddr[1], -+ db->networkAddr[2], -+ db->networkAddr[3], -+ db->networkAddr[4], -+ db->networkAddr[5], -+ db->networkAddr[6], -+ db->networkAddr[7], -+ db->networkAddr[8], -+ db->networkAddr[9], -+ db->networkAddr[10]); -+#endif -+ } -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+ return 1; -+ } -+ -+ db = db->next_hash; -+ } -+ -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+ return 0; -+} -+ -+ -+static void __nat25_db_network_insert(_adapter *priv, -+ unsigned char *macAddr, unsigned char *networkAddr) -+{ -+ struct nat25_network_db_entry *db; -+ int hash; -+ _irqL irqL; -+ _enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ hash = __nat25_network_hash(networkAddr); -+ db = priv->nethash[hash]; -+ while (db != NULL) -+ { -+ if(!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) -+ { -+ memcpy(db->macAddr, macAddr, ETH_ALEN); -+ db->ageing_timer = jiffies; -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+ return; -+ } -+ -+ db = db->next_hash; -+ } -+ -+ db = (struct nat25_network_db_entry *) rtw_malloc(sizeof(*db)); -+ if(db == NULL) { -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+ return; -+ } -+ -+ memcpy(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN); -+ memcpy(db->macAddr, macAddr, ETH_ALEN); -+ atomic_set(&db->use_count, 1); -+ db->ageing_timer = jiffies; -+ -+ __network_hash_link(priv, db, hash); -+ -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+} -+ -+ -+static void __nat25_db_print(_adapter *priv) -+{ -+ _irqL irqL; -+ _enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+#ifdef BR_EXT_DEBUG -+ static int counter = 0; -+ int i, j; -+ struct nat25_network_db_entry *db; -+ -+ counter++; -+ if((counter % 16) != 0) -+ return; -+ -+ for(i=0, j=0; inethash[i]; -+ -+ while (db != NULL) -+ { -+#ifdef CL_IPV6_PASS -+ panic_printk("NAT25: DB(%d) H(%02d) C(%d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" -+ "%02x%02x%02x%02x%02x%02x\n", -+ j, -+ i, -+ atomic_read(&db->use_count), -+ db->macAddr[0], -+ db->macAddr[1], -+ db->macAddr[2], -+ db->macAddr[3], -+ db->macAddr[4], -+ db->macAddr[5], -+ db->networkAddr[0], -+ db->networkAddr[1], -+ db->networkAddr[2], -+ db->networkAddr[3], -+ db->networkAddr[4], -+ db->networkAddr[5], -+ db->networkAddr[6], -+ db->networkAddr[7], -+ db->networkAddr[8], -+ db->networkAddr[9], -+ db->networkAddr[10], -+ db->networkAddr[11], -+ db->networkAddr[12], -+ db->networkAddr[13], -+ db->networkAddr[14], -+ db->networkAddr[15], -+ db->networkAddr[16]); -+#else -+ panic_printk("NAT25: DB(%d) H(%02d) C(%d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", -+ j, -+ i, -+ atomic_read(&db->use_count), -+ db->macAddr[0], -+ db->macAddr[1], -+ db->macAddr[2], -+ db->macAddr[3], -+ db->macAddr[4], -+ db->macAddr[5], -+ db->networkAddr[0], -+ db->networkAddr[1], -+ db->networkAddr[2], -+ db->networkAddr[3], -+ db->networkAddr[4], -+ db->networkAddr[5], -+ db->networkAddr[6], -+ db->networkAddr[7], -+ db->networkAddr[8], -+ db->networkAddr[9], -+ db->networkAddr[10]); -+#endif -+ j++; -+ -+ db = db->next_hash; -+ } -+ } -+#endif -+ -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+} -+ -+ -+ -+ -+/* -+ * NAT2.5 interface -+ */ -+ -+void nat25_db_cleanup(_adapter *priv) -+{ -+ int i; -+ _irqL irqL; -+ _enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ for(i=0; inethash[i]; -+ while (f != NULL) { -+ struct nat25_network_db_entry *g; -+ -+ g = f->next_hash; -+ if(priv->scdb_entry == f) -+ { -+ memset(priv->scdb_mac, 0, ETH_ALEN); -+ memset(priv->scdb_ip, 0, 4); -+ priv->scdb_entry = NULL; -+ } -+ __network_hash_unlink(f); -+ rtw_mfree((u8 *) f, sizeof(struct nat25_network_db_entry)); -+ -+ f = g; -+ } -+ } -+ -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+} -+ -+ -+void nat25_db_expire(_adapter *priv) -+{ -+ int i; -+ _irqL irqL; -+ _enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ //if(!priv->ethBrExtInfo.nat25_disable) -+ { -+ for (i=0; inethash[i]; -+ -+ while (f != NULL) -+ { -+ struct nat25_network_db_entry *g; -+ g = f->next_hash; -+ -+ if(__nat25_has_expired(priv, f)) -+ { -+ if(atomic_dec_and_test(&f->use_count)) -+ { -+#ifdef BR_EXT_DEBUG -+#ifdef CL_IPV6_PASS -+ panic_printk("NAT25 Expire H(%02d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" -+ "%02x%02x%02x%02x%02x%02x\n", -+ i, -+ f->macAddr[0], -+ f->macAddr[1], -+ f->macAddr[2], -+ f->macAddr[3], -+ f->macAddr[4], -+ f->macAddr[5], -+ f->networkAddr[0], -+ f->networkAddr[1], -+ f->networkAddr[2], -+ f->networkAddr[3], -+ f->networkAddr[4], -+ f->networkAddr[5], -+ f->networkAddr[6], -+ f->networkAddr[7], -+ f->networkAddr[8], -+ f->networkAddr[9], -+ f->networkAddr[10], -+ f->networkAddr[11], -+ f->networkAddr[12], -+ f->networkAddr[13], -+ f->networkAddr[14], -+ f->networkAddr[15], -+ f->networkAddr[16]); -+#else -+ -+ panic_printk("NAT25 Expire H(%02d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", -+ i, -+ f->macAddr[0], -+ f->macAddr[1], -+ f->macAddr[2], -+ f->macAddr[3], -+ f->macAddr[4], -+ f->macAddr[5], -+ f->networkAddr[0], -+ f->networkAddr[1], -+ f->networkAddr[2], -+ f->networkAddr[3], -+ f->networkAddr[4], -+ f->networkAddr[5], -+ f->networkAddr[6], -+ f->networkAddr[7], -+ f->networkAddr[8], -+ f->networkAddr[9], -+ f->networkAddr[10]); -+#endif -+#endif -+ if(priv->scdb_entry == f) -+ { -+ memset(priv->scdb_mac, 0, ETH_ALEN); -+ memset(priv->scdb_ip, 0, 4); -+ priv->scdb_entry = NULL; -+ } -+ __network_hash_unlink(f); -+ rtw_mfree((u8 *) f, sizeof(struct nat25_network_db_entry)); -+ } -+ } -+ -+ f = g; -+ } -+ } -+ } -+ -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+} -+ -+ -+#ifdef SUPPORT_TX_MCAST2UNI -+static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int *dst_ip) -+{ -+ struct stat_info *pstat; -+ struct list_head *phead, *plist; -+ int i; -+ -+ phead = &priv->asoc_list; -+ plist = phead->next; -+ -+ while (plist != phead) { -+ pstat = list_entry(plist, struct stat_info, asoc_list); -+ plist = plist->next; -+ -+ if (pstat->ipmc_num == 0) -+ continue; -+ -+ for (i=0; iipmc[i].used && !memcmp(&pstat->ipmc[i].mcmac[3], ((unsigned char *)dst_ip)+1, 3)) { -+ memcpy(skb->data, pstat->ipmc[i].mcmac, ETH_ALEN); -+ return 1; -+ } -+ } -+ } -+ return 0; -+} -+#endif -+ -+int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) -+{ -+ unsigned short protocol; -+ unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; -+ -+ if(skb == NULL) -+ return -1; -+ -+ if((method <= NAT25_MIN) || (method >= NAT25_MAX)) -+ return -1; -+ -+ protocol = *((unsigned short *)(skb->data + 2 * ETH_ALEN)); -+ -+ /*---------------------------------------------------*/ -+ /* Handle IP frame */ -+ /*---------------------------------------------------*/ -+ if(protocol == __constant_htons(ETH_P_IP)) -+ { -+ struct iphdr* iph = (struct iphdr *)(skb->data + ETH_HLEN); -+ -+ if(((unsigned char*)(iph) + (iph->ihl<<2)) >= (skb->data + ETH_HLEN + skb->len)) -+ { -+ DEBUG_WARN("NAT25: malformed IP packet !\n"); -+ return -1; -+ } -+ -+ switch(method) -+ { -+ case NAT25_CHECK: -+ return -1; -+ -+ case NAT25_INSERT: -+ { -+ //some muticast with source IP is all zero, maybe other case is illegal -+ //in class A, B, C, host address is all zero or all one is illegal -+ if (iph->saddr == 0) -+ return 0; -+ DEBUG_INFO("NAT25: Insert IP, SA=%08x, DA=%08x\n", iph->saddr, iph->daddr); -+ __nat25_generate_ipv4_network_addr(networkAddr, &iph->saddr); -+ //record source IP address and , source mac address into db -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ -+ __nat25_db_print(priv); -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ { -+ DEBUG_INFO("NAT25: Lookup IP, SA=%08x, DA=%08x\n", iph->saddr, iph->daddr); -+#ifdef SUPPORT_TX_MCAST2UNI -+ if (priv->pshare->rf_ft_var.mc2u_disable || -+ ((((OPMODE & (WIFI_STATION_STATE|WIFI_ASOC_STATE)) -+ == (WIFI_STATION_STATE|WIFI_ASOC_STATE)) && -+ !checkIPMcAndReplace(priv, skb, &iph->daddr)) || -+ (OPMODE & WIFI_ADHOC_STATE))) -+#endif -+ { -+ __nat25_generate_ipv4_network_addr(networkAddr, &iph->daddr); -+ -+ if (!__nat25_db_network_lookup_and_replace(priv, skb, networkAddr)) { -+ if (*((unsigned char *)&iph->daddr + 3) == 0xff) { -+ // L2 is unicast but L3 is broadcast, make L2 bacome broadcast -+ DEBUG_INFO("NAT25: Set DA as boardcast\n"); -+ memset(skb->data, 0xff, ETH_ALEN); -+ } -+ else { -+ // forward unknow IP packet to upper TCP/IP -+ DEBUG_INFO("NAT25: Replace DA with BR's MAC\n"); -+ if ( (*(u32 *)priv->br_mac) == 0 && (*(u16 *)(priv->br_mac+4)) == 0 ) { -+ void netdev_br_init(struct net_device *netdev); -+ printk("Re-init netdev_br_init() due to br_mac==0!\n"); -+ netdev_br_init(priv->pnetdev); -+ } -+ memcpy(skb->data, priv->br_mac, ETH_ALEN); -+ } -+ } -+ } -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /*---------------------------------------------------*/ -+ /* Handle ARP frame */ -+ /*---------------------------------------------------*/ -+ else if(protocol == __constant_htons(ETH_P_ARP)) -+ { -+ struct arphdr *arp = (struct arphdr *)(skb->data + ETH_HLEN); -+ unsigned char *arp_ptr = (unsigned char *)(arp + 1); -+ unsigned int *sender, *target; -+ -+ if(arp->ar_pro != __constant_htons(ETH_P_IP)) -+ { -+ DEBUG_WARN("NAT25: arp protocol unknown (%4x)!\n", htons(arp->ar_pro)); -+ return -1; -+ } -+ -+ switch(method) -+ { -+ case NAT25_CHECK: -+ return 0; // skb_copy for all ARP frame -+ -+ case NAT25_INSERT: -+ { -+ DEBUG_INFO("NAT25: Insert ARP, MAC=%02x%02x%02x%02x%02x%02x\n", arp_ptr[0], -+ arp_ptr[1], arp_ptr[2], arp_ptr[3], arp_ptr[4], arp_ptr[5]); -+ -+ // change to ARP sender mac address to wlan STA address -+ memcpy(arp_ptr, GET_MY_HWADDR(priv), ETH_ALEN); -+ -+ arp_ptr += arp->ar_hln; -+ sender = (unsigned int *)arp_ptr; -+ -+ __nat25_generate_ipv4_network_addr(networkAddr, sender); -+ -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ -+ __nat25_db_print(priv); -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ { -+ DEBUG_INFO("NAT25: Lookup ARP\n"); -+ -+ arp_ptr += arp->ar_hln; -+ sender = (unsigned int *)arp_ptr; -+ arp_ptr += (arp->ar_hln + arp->ar_pln); -+ target = (unsigned int *)arp_ptr; -+ -+ __nat25_generate_ipv4_network_addr(networkAddr, target); -+ -+ __nat25_db_network_lookup_and_replace(priv, skb, networkAddr); -+ -+ // change to ARP target mac address to Lookup result -+ arp_ptr = (unsigned char *)(arp + 1); -+ arp_ptr += (arp->ar_hln + arp->ar_pln); -+ memcpy(arp_ptr, skb->data, ETH_ALEN); -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /*---------------------------------------------------*/ -+ /* Handle IPX and Apple Talk frame */ -+ /*---------------------------------------------------*/ -+ else if((protocol == __constant_htons(ETH_P_IPX)) || -+ (protocol <= __constant_htons(ETH_FRAME_LEN))) -+ { -+ unsigned char ipx_header[2] = {0xFF, 0xFF}; -+ struct ipxhdr *ipx = NULL; -+ struct elapaarp *ea = NULL; -+ struct ddpehdr *ddp = NULL; -+ unsigned char *framePtr = skb->data + ETH_HLEN; -+ -+ if(protocol == __constant_htons(ETH_P_IPX)) -+ { -+ DEBUG_INFO("NAT25: Protocol=IPX (Ethernet II)\n"); -+ ipx = (struct ipxhdr *)framePtr; -+ } -+ else if(protocol <= __constant_htons(ETH_FRAME_LEN)) -+ { -+ if(!memcmp(ipx_header, framePtr, 2)) -+ { -+ DEBUG_INFO("NAT25: Protocol=IPX (Ethernet 802.3)\n"); -+ ipx = (struct ipxhdr *)framePtr; -+ } -+ else -+ { -+ unsigned char ipx_8022_type = 0xE0; -+ unsigned char snap_8022_type = 0xAA; -+ -+ if(*framePtr == snap_8022_type) -+ { -+ unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; // IPX SNAP ID -+ unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; // Apple Talk AARP SNAP ID -+ unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; // Apple Talk DDP SNAP ID -+ -+ framePtr += 3; // eliminate the 802.2 header -+ -+ if(!memcmp(ipx_snap_id, framePtr, 5)) -+ { -+ framePtr += 5; // eliminate the SNAP header -+ -+ DEBUG_INFO("NAT25: Protocol=IPX (Ethernet SNAP)\n"); -+ ipx = (struct ipxhdr *)framePtr; -+ } -+ else if(!memcmp(aarp_snap_id, framePtr, 5)) -+ { -+ framePtr += 5; // eliminate the SNAP header -+ -+ ea = (struct elapaarp *)framePtr; -+ } -+ else if(!memcmp(ddp_snap_id, framePtr, 5)) -+ { -+ framePtr += 5; // eliminate the SNAP header -+ -+ ddp = (struct ddpehdr *)framePtr; -+ } -+ else -+ { -+ DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0], -+ framePtr[1], framePtr[2], framePtr[3], framePtr[4]); -+ return -1; -+ } -+ } -+ else if(*framePtr == ipx_8022_type) -+ { -+ framePtr += 3; // eliminate the 802.2 header -+ -+ if(!memcmp(ipx_header, framePtr, 2)) -+ { -+ DEBUG_INFO("NAT25: Protocol=IPX (Ethernet 802.2)\n"); -+ ipx = (struct ipxhdr *)framePtr; -+ } -+ else -+ return -1; -+ } -+ else -+ return -1; -+ } -+ } -+ else -+ return -1; -+ -+ /* IPX */ -+ if(ipx != NULL) -+ { -+ switch(method) -+ { -+ case NAT25_CHECK: -+ if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) -+ { -+ DEBUG_INFO("NAT25: Check IPX skb_copy\n"); -+ return 0; -+ } -+ return -1; -+ -+ case NAT25_INSERT: -+ { -+ DEBUG_INFO("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n", -+ ipx->ipx_dest.net, -+ ipx->ipx_dest.node[0], -+ ipx->ipx_dest.node[1], -+ ipx->ipx_dest.node[2], -+ ipx->ipx_dest.node[3], -+ ipx->ipx_dest.node[4], -+ ipx->ipx_dest.node[5], -+ ipx->ipx_dest.sock, -+ ipx->ipx_source.net, -+ ipx->ipx_source.node[0], -+ ipx->ipx_source.node[1], -+ ipx->ipx_source.node[2], -+ ipx->ipx_source.node[3], -+ ipx->ipx_source.node[4], -+ ipx->ipx_source.node[5], -+ ipx->ipx_source.sock); -+ -+ if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) -+ { -+ DEBUG_INFO("NAT25: Use IPX Net, and Socket as network addr\n"); -+ -+ __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock); -+ -+ // change IPX source node addr to wlan STA address -+ memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN); -+ } -+ else -+ { -+ __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node); -+ } -+ -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ -+ __nat25_db_print(priv); -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ { -+ if(!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN)) -+ { -+ DEBUG_INFO("NAT25: Lookup IPX, Modify Destination IPX Node addr\n"); -+ -+ __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock); -+ -+ __nat25_db_network_lookup_and_replace(priv, skb, networkAddr); -+ -+ // replace IPX destination node addr with Lookup destination MAC addr -+ memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN); -+ } -+ else -+ { -+ __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node); -+ -+ __nat25_db_network_lookup_and_replace(priv, skb, networkAddr); -+ } -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /* AARP */ -+ else if(ea != NULL) -+ { -+ /* Sanity check fields. */ -+ if(ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) -+ { -+ DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n"); -+ return -1; -+ } -+ -+ switch(method) -+ { -+ case NAT25_CHECK: -+ return 0; -+ -+ case NAT25_INSERT: -+ { -+ // change to AARP source mac address to wlan STA address -+ memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN); -+ -+ DEBUG_INFO("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n", -+ ea->pa_src_net, -+ ea->pa_src_node, -+ ea->pa_dst_net, -+ ea->pa_dst_node); -+ -+ __nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node); -+ -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ -+ __nat25_db_print(priv); -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ { -+ DEBUG_INFO("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n", -+ ea->pa_src_net, -+ ea->pa_src_node, -+ ea->pa_dst_net, -+ ea->pa_dst_node); -+ -+ __nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node); -+ -+ __nat25_db_network_lookup_and_replace(priv, skb, networkAddr); -+ -+ // change to AARP destination mac address to Lookup result -+ memcpy(ea->hw_dst, skb->data, ETH_ALEN); -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /* DDP */ -+ else if(ddp != NULL) -+ { -+ switch(method) -+ { -+ case NAT25_CHECK: -+ return -1; -+ -+ case NAT25_INSERT: -+ { -+ DEBUG_INFO("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n", -+ ddp->deh_snet, -+ ddp->deh_snode, -+ ddp->deh_dnet, -+ ddp->deh_dnode); -+ -+ __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode); -+ -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ -+ __nat25_db_print(priv); -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ { -+ DEBUG_INFO("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n", -+ ddp->deh_snet, -+ ddp->deh_snode, -+ ddp->deh_dnet, -+ ddp->deh_dnode); -+ -+ __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode); -+ -+ __nat25_db_network_lookup_and_replace(priv, skb, networkAddr); -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ return -1; -+ } -+ -+ /*---------------------------------------------------*/ -+ /* Handle PPPoE frame */ -+ /*---------------------------------------------------*/ -+ else if((protocol == __constant_htons(ETH_P_PPP_DISC)) || -+ (protocol == __constant_htons(ETH_P_PPP_SES))) -+ { -+ struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); -+ unsigned short *pMagic; -+ -+ switch(method) -+ { -+ case NAT25_CHECK: -+ if (ph->sid == 0) -+ return 0; -+ return 1; -+ -+ case NAT25_INSERT: -+ if(ph->sid == 0) // Discovery phase according to tag -+ { -+ if(ph->code == PADI_CODE || ph->code == PADR_CODE) -+ { -+ if (priv->ethBrExtInfo.addPPPoETag) { -+ struct pppoe_tag *tag, *pOldTag; -+ unsigned char tag_buf[40]; -+ int old_tag_len=0; -+ -+ tag = (struct pppoe_tag *)tag_buf; -+ pOldTag = (struct pppoe_tag *)__nat25_find_pppoe_tag(ph, ntohs(PTT_RELAY_SID)); -+ if (pOldTag) { // if SID existed, copy old value and delete it -+ old_tag_len = ntohs(pOldTag->tag_len); -+ if (old_tag_len+TAG_HDR_LEN+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN > sizeof(tag_buf)) { -+ DEBUG_ERR("SID tag length too long!\n"); -+ return -1; -+ } -+ -+ memcpy(tag->tag_data+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN, -+ pOldTag->tag_data, old_tag_len); -+ -+ if (skb_pull_and_merge(skb, (unsigned char *)pOldTag, TAG_HDR_LEN+old_tag_len) < 0) { -+ DEBUG_ERR("call skb_pull_and_merge() failed in PADI/R packet!\n"); -+ return -1; -+ } -+ ph->length = htons(ntohs(ph->length)-TAG_HDR_LEN-old_tag_len); -+ } -+ -+ tag->tag_type = PTT_RELAY_SID; -+ tag->tag_len = htons(MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN+old_tag_len); -+ -+ // insert the magic_code+client mac in relay tag -+ pMagic = (unsigned short *)tag->tag_data; -+ *pMagic = htons(MAGIC_CODE); -+ memcpy(tag->tag_data+MAGIC_CODE_LEN, skb->data+ETH_ALEN, ETH_ALEN); -+ -+ //Add relay tag -+ if(__nat25_add_pppoe_tag(skb, tag) < 0) -+ return -1; -+ -+ DEBUG_INFO("NAT25: Insert PPPoE, forward %s packet\n", -+ (ph->code == PADI_CODE ? "PADI" : "PADR")); -+ } -+ else { // not add relay tag -+ if (priv->pppoe_connection_in_progress && -+ memcmp(skb->data+ETH_ALEN, priv->pppoe_addr, ETH_ALEN)) { -+ DEBUG_ERR("Discard PPPoE packet due to another PPPoE connection is in progress!\n"); -+ return -2; -+ } -+ -+ if (priv->pppoe_connection_in_progress == 0) -+ memcpy(priv->pppoe_addr, skb->data+ETH_ALEN, ETH_ALEN); -+ -+ priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE; -+ } -+ } -+ else -+ return -1; -+ } -+ else // session phase -+ { -+ DEBUG_INFO("NAT25: Insert PPPoE, insert session packet to %s\n", skb->dev->name); -+ -+ __nat25_generate_pppoe_network_addr(networkAddr, skb->data, &(ph->sid)); -+ -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ -+ __nat25_db_print(priv); -+ -+ if (!priv->ethBrExtInfo.addPPPoETag && -+ priv->pppoe_connection_in_progress && -+ !memcmp(skb->data+ETH_ALEN, priv->pppoe_addr, ETH_ALEN)) -+ priv->pppoe_connection_in_progress = 0; -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ if(ph->code == PADO_CODE || ph->code == PADS_CODE) -+ { -+ if (priv->ethBrExtInfo.addPPPoETag) { -+ struct pppoe_tag *tag; -+ unsigned char *ptr; -+ unsigned short tagType, tagLen; -+ int offset=0; -+ -+ if((ptr = __nat25_find_pppoe_tag(ph, ntohs(PTT_RELAY_SID))) == 0) { -+ DEBUG_ERR("Fail to find PTT_RELAY_SID in FADO!\n"); -+ return -1; -+ } -+ -+ tag = (struct pppoe_tag *)ptr; -+ tagType = (unsigned short)((ptr[0] << 8) + ptr[1]); -+ tagLen = (unsigned short)((ptr[2] << 8) + ptr[3]); -+ -+ if((tagType != ntohs(PTT_RELAY_SID)) || (tagLen < (MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN))) { -+ DEBUG_ERR("Invalid PTT_RELAY_SID tag length [%d]!\n", tagLen); -+ return -1; -+ } -+ -+ pMagic = (unsigned short *)tag->tag_data; -+ if (ntohs(*pMagic) != MAGIC_CODE) { -+ DEBUG_ERR("Can't find MAGIC_CODE in %s packet!\n", -+ (ph->code == PADO_CODE ? "PADO" : "PADS")); -+ return -1; -+ } -+ -+ memcpy(skb->data, tag->tag_data+MAGIC_CODE_LEN, ETH_ALEN); -+ -+ if (tagLen > MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN) -+ offset = TAG_HDR_LEN; -+ -+ if (skb_pull_and_merge(skb, ptr+offset, TAG_HDR_LEN+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN-offset) < 0) { -+ DEBUG_ERR("call skb_pull_and_merge() failed in PADO packet!\n"); -+ return -1; -+ } -+ ph->length = htons(ntohs(ph->length)-(TAG_HDR_LEN+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN-offset)); -+ if (offset > 0) -+ tag->tag_len = htons(tagLen-MAGIC_CODE_LEN-RTL_RELAY_TAG_LEN); -+ -+ DEBUG_INFO("NAT25: Lookup PPPoE, forward %s Packet from %s\n", -+ (ph->code == PADO_CODE ? "PADO" : "PADS"), skb->dev->name); -+ } -+ else { // not add relay tag -+ if (!priv->pppoe_connection_in_progress) { -+ DEBUG_ERR("Discard PPPoE packet due to no connection in progresss!\n"); -+ return -1; -+ } -+ memcpy(skb->data, priv->pppoe_addr, ETH_ALEN); -+ priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE; -+ } -+ } -+ else { -+ if(ph->sid != 0) -+ { -+ DEBUG_INFO("NAT25: Lookup PPPoE, lookup session packet from %s\n", skb->dev->name); -+ __nat25_generate_pppoe_network_addr(networkAddr, skb->data+ETH_ALEN, &(ph->sid)); -+ -+ __nat25_db_network_lookup_and_replace(priv, skb, networkAddr); -+ -+ __nat25_db_print(priv); -+ } -+ else -+ return -1; -+ -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /*---------------------------------------------------*/ -+ /* Handle EAP frame */ -+ /*---------------------------------------------------*/ -+ else if(protocol == __constant_htons(0x888e)) -+ { -+ switch(method) -+ { -+ case NAT25_CHECK: -+ return -1; -+ -+ case NAT25_INSERT: -+ return 0; -+ -+ case NAT25_LOOKUP: -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /*---------------------------------------------------*/ -+ /* Handle C-Media proprietary frame */ -+ /*---------------------------------------------------*/ -+ else if((protocol == __constant_htons(0xe2ae)) || -+ (protocol == __constant_htons(0xe2af))) -+ { -+ switch(method) -+ { -+ case NAT25_CHECK: -+ return -1; -+ -+ case NAT25_INSERT: -+ return 0; -+ -+ case NAT25_LOOKUP: -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+ -+ /*---------------------------------------------------*/ -+ /* Handle IPV6 frame */ -+ /*---------------------------------------------------*/ -+#ifdef CL_IPV6_PASS -+ else if(protocol == __constant_htons(ETH_P_IPV6)) -+ { -+ struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + ETH_HLEN); -+ -+ if (sizeof(*iph) >= (skb->len - ETH_HLEN)) -+ { -+ DEBUG_WARN("NAT25: malformed IPv6 packet !\n"); -+ return -1; -+ } -+ -+ switch(method) -+ { -+ case NAT25_CHECK: -+ if (skb->data[0] & 1) -+ return 0; -+ return -1; -+ -+ case NAT25_INSERT: -+ { -+ DEBUG_INFO("NAT25: Insert IP, SA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x," -+ " DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n", -+ iph->saddr.s6_addr16[0],iph->saddr.s6_addr16[1],iph->saddr.s6_addr16[2],iph->saddr.s6_addr16[3], -+ iph->saddr.s6_addr16[4],iph->saddr.s6_addr16[5],iph->saddr.s6_addr16[6],iph->saddr.s6_addr16[7], -+ iph->daddr.s6_addr16[0],iph->daddr.s6_addr16[1],iph->daddr.s6_addr16[2],iph->daddr.s6_addr16[3], -+ iph->daddr.s6_addr16[4],iph->daddr.s6_addr16[5],iph->daddr.s6_addr16[6],iph->daddr.s6_addr16[7]); -+ -+ if (memcmp(&iph->saddr, "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", 16)) { -+ __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->saddr); -+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); -+ __nat25_db_print(priv); -+ -+ if (iph->nexthdr == IPPROTO_ICMPV6 && -+ skb->len > (ETH_HLEN + sizeof(*iph) + 4)) { -+ if (update_nd_link_layer_addr(skb->data + ETH_HLEN + sizeof(*iph), -+ skb->len - ETH_HLEN - sizeof(*iph), GET_MY_HWADDR(priv))) { -+ struct icmp6hdr *hdr = (struct icmp6hdr *)(skb->data + ETH_HLEN + sizeof(*iph)); -+ hdr->icmp6_cksum = 0; -+ hdr->icmp6_cksum = csum_ipv6_magic(&iph->saddr, &iph->daddr, -+ iph->payload_len, -+ IPPROTO_ICMPV6, -+ csum_partial((__u8 *)hdr, iph->payload_len, 0)); -+ } -+ } -+ } -+ } -+ return 0; -+ -+ case NAT25_LOOKUP: -+ DEBUG_INFO("NAT25: Lookup IP, SA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x," -+ " DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n", -+ iph->saddr.s6_addr16[0],iph->saddr.s6_addr16[1],iph->saddr.s6_addr16[2],iph->saddr.s6_addr16[3], -+ iph->saddr.s6_addr16[4],iph->saddr.s6_addr16[5],iph->saddr.s6_addr16[6],iph->saddr.s6_addr16[7], -+ iph->daddr.s6_addr16[0],iph->daddr.s6_addr16[1],iph->daddr.s6_addr16[2],iph->daddr.s6_addr16[3], -+ iph->daddr.s6_addr16[4],iph->daddr.s6_addr16[5],iph->daddr.s6_addr16[6],iph->daddr.s6_addr16[7]); -+ -+ -+ __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->daddr); -+ if (!__nat25_db_network_lookup_and_replace(priv, skb, networkAddr)) { -+#ifdef SUPPORT_RX_UNI2MCAST -+ if (iph->daddr.s6_addr[0] == 0xff) -+ convert_ipv6_mac_to_mc(skb); -+#endif -+ } -+ return 0; -+ -+ default: -+ return -1; -+ } -+ } -+#endif // CL_IPV6_PASS -+ -+ return -1; -+} -+ -+ -+int nat25_handle_frame(_adapter *priv, struct sk_buff *skb) -+{ -+#ifdef BR_EXT_DEBUG -+ if((!priv->ethBrExtInfo.nat25_disable) && (!(skb->data[0] & 1))) -+ { -+ panic_printk("NAT25: Input Frame: DA=%02x%02x%02x%02x%02x%02x SA=%02x%02x%02x%02x%02x%02x\n", -+ skb->data[0], -+ skb->data[1], -+ skb->data[2], -+ skb->data[3], -+ skb->data[4], -+ skb->data[5], -+ skb->data[6], -+ skb->data[7], -+ skb->data[8], -+ skb->data[9], -+ skb->data[10], -+ skb->data[11]); -+ } -+#endif -+ -+ if(!(skb->data[0] & 1)) -+ { -+ int is_vlan_tag=0, i, retval=0; -+ unsigned short vlan_hdr=0; -+ -+ if (*((unsigned short *)(skb->data+ETH_ALEN*2)) == __constant_htons(ETH_P_8021Q)) { -+ is_vlan_tag = 1; -+ vlan_hdr = *((unsigned short *)(skb->data+ETH_ALEN*2+2)); -+ for (i=0; i<6; i++) -+ *((unsigned short *)(skb->data+ETH_ALEN*2+2-i*2)) = *((unsigned short *)(skb->data+ETH_ALEN*2-2-i*2)); -+ skb_pull(skb, 4); -+ } -+ -+ if (!priv->ethBrExtInfo.nat25_disable) -+ { -+ _irqL irqL; -+ _enter_critical_bh(&priv->br_ext_lock, &irqL); -+ /* -+ * This function look up the destination network address from -+ * the NAT2.5 database. Return value = -1 means that the -+ * corresponding network protocol is NOT support. -+ */ -+ if (!priv->ethBrExtInfo.nat25sc_disable && -+ (*((unsigned short *)(skb->data+ETH_ALEN*2)) == __constant_htons(ETH_P_IP)) && -+ !memcmp(priv->scdb_ip, skb->data+ETH_HLEN+16, 4)) { -+ memcpy(skb->data, priv->scdb_mac, ETH_ALEN); -+ -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+ } -+ else { -+ _exit_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ retval = nat25_db_handle(priv, skb, NAT25_LOOKUP); -+ } -+ } -+ else { -+ if (((*((unsigned short *)(skb->data+ETH_ALEN*2)) == __constant_htons(ETH_P_IP)) && -+ !memcmp(priv->br_ip, skb->data+ETH_HLEN+16, 4)) || -+ ((*((unsigned short *)(skb->data+ETH_ALEN*2)) == __constant_htons(ETH_P_ARP)) && -+ !memcmp(priv->br_ip, skb->data+ETH_HLEN+24, 4))) { -+ // for traffic to upper TCP/IP -+ retval = nat25_db_handle(priv, skb, NAT25_LOOKUP); -+ } -+ } -+ -+ if (is_vlan_tag) { -+ skb_push(skb, 4); -+ for (i=0; i<6; i++) -+ *((unsigned short *)(skb->data+i*2)) = *((unsigned short *)(skb->data+4+i*2)); -+ *((unsigned short *)(skb->data+ETH_ALEN*2)) = __constant_htons(ETH_P_8021Q); -+ *((unsigned short *)(skb->data+ETH_ALEN*2+2)) = vlan_hdr; -+ } -+ -+ if(retval == -1) { -+ //DEBUG_ERR("NAT25: Lookup fail!\n"); -+ return -1; -+ } -+ } -+ -+ return 0; -+} -+ -+#if 0 -+void mac_clone(_adapter *priv, unsigned char *addr) -+{ -+ struct sockaddr sa; -+ -+ memcpy(sa.sa_data, addr, ETH_ALEN); -+ DEBUG_INFO("MAC Clone: Addr=%02x%02x%02x%02x%02x%02x\n", -+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); -+ rtl8192cd_set_hwaddr(priv->dev, &sa); -+} -+ -+ -+int mac_clone_handle_frame(_adapter *priv, struct sk_buff *skb) -+{ -+ if(priv->ethBrExtInfo.macclone_enable && !priv->macclone_completed) -+ { -+ if(!(skb->data[ETH_ALEN] & 1)) //// check any other particular MAC add -+ { -+ if(memcmp(skb->data+ETH_ALEN, GET_MY_HWADDR(priv), ETH_ALEN) && -+ ((priv->dev->br_port) && -+ memcmp(skb->data+ETH_ALEN, priv->br_mac, ETH_ALEN))) -+ { -+ mac_clone(priv, skb->data+ETH_ALEN); -+ priv->macclone_completed = 1; -+ } -+ } -+ } -+ -+ return 0; -+} -+#endif // 0 -+ -+#define SERVER_PORT 67 -+#define CLIENT_PORT 68 -+#define DHCP_MAGIC 0x63825363 -+#define BROADCAST_FLAG 0x8000 -+ -+struct dhcpMessage { -+ u_int8_t op; -+ u_int8_t htype; -+ u_int8_t hlen; -+ u_int8_t hops; -+ u_int32_t xid; -+ u_int16_t secs; -+ u_int16_t flags; -+ u_int32_t ciaddr; -+ u_int32_t yiaddr; -+ u_int32_t siaddr; -+ u_int32_t giaddr; -+ u_int8_t chaddr[16]; -+ u_int8_t sname[64]; -+ u_int8_t file[128]; -+ u_int32_t cookie; -+ u_int8_t options[308]; /* 312 - cookie */ -+}; -+ -+void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb) -+{ -+ if(skb == NULL) -+ return; -+ -+ if(!priv->ethBrExtInfo.dhcp_bcst_disable) -+ { -+ unsigned short protocol = *((unsigned short *)(skb->data + 2 * ETH_ALEN)); -+ -+ if(protocol == __constant_htons(ETH_P_IP)) // IP -+ { -+ struct iphdr* iph = (struct iphdr *)(skb->data + ETH_HLEN); -+ -+ if(iph->protocol == IPPROTO_UDP) // UDP -+ { -+ struct udphdr *udph = (struct udphdr *)((SIZE_PTR)iph + (iph->ihl << 2)); -+ -+ if((udph->source == __constant_htons(CLIENT_PORT)) -+ && (udph->dest == __constant_htons(SERVER_PORT))) // DHCP request -+ { -+ struct dhcpMessage *dhcph = -+ (struct dhcpMessage *)((SIZE_PTR)udph + sizeof(struct udphdr)); -+ -+ if(dhcph->cookie == __constant_htonl(DHCP_MAGIC)) // match magic word -+ { -+ if(!(dhcph->flags & htons(BROADCAST_FLAG))) // if not broadcast -+ { -+ register int sum = 0; -+ -+ DEBUG_INFO("DHCP: change flag of DHCP request to broadcast.\n"); -+ // or BROADCAST flag -+ dhcph->flags |= htons(BROADCAST_FLAG); -+ // recalculate checksum -+ sum = ~(udph->check) & 0xffff; -+ sum += dhcph->flags; -+ while(sum >> 16) -+ sum = (sum & 0xffff) + (sum >> 16); -+ udph->check = ~sum; -+ } -+ } -+ } -+ } -+ } -+ } -+} -+ -+ -+void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, -+ unsigned char *ipAddr) -+{ -+ unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; -+ struct nat25_network_db_entry *db; -+ int hash; -+ //_irqL irqL; -+ //_enter_critical_bh(&priv->br_ext_lock, &irqL); -+ -+ __nat25_generate_ipv4_network_addr(networkAddr, (unsigned int *)ipAddr); -+ hash = __nat25_network_hash(networkAddr); -+ db = priv->nethash[hash]; -+ while (db != NULL) -+ { -+ if(!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) { -+ //_exit_critical_bh(&priv->br_ext_lock, &irqL); -+ return (void *)db; -+ } -+ -+ db = db->next_hash; -+ } -+ -+ //_exit_critical_bh(&priv->br_ext_lock, &irqL); -+ return NULL; -+} -+ -+#endif // CONFIG_BR_EXT ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c -@@ -0,0 +1,3035 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_CMD_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_BR_EXT -+#include -+#endif //CONFIG_BR_EXT -+/* -+Caller and the rtw_cmd_thread can protect cmd_q by spin_lock. -+No irqsave is necessary. -+*/ -+ -+sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) -+{ -+ sint res=_SUCCESS; -+ -+_func_enter_; -+ -+ _rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0); -+ //_rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); -+ _rtw_init_sema(&(pcmdpriv->terminate_cmdthread_sema), 0); -+ -+ -+ _rtw_init_queue(&(pcmdpriv->cmd_queue)); -+ -+ //allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf -+ -+ pcmdpriv->cmd_seq = 1; -+ -+ pcmdpriv->cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ); -+ -+ if (pcmdpriv->cmd_allocated_buf == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ( (SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1)); -+ -+ pcmdpriv->rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4); -+ -+ if (pcmdpriv->rsp_allocated_buf == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ( (SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3); -+ -+ pcmdpriv->cmd_issued_cnt = pcmdpriv->cmd_done_cnt = pcmdpriv->rsp_cnt = 0; -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+#ifdef CONFIG_C2H_WK -+static void c2h_wk_callback(_workitem *work); -+#endif -+sint _rtw_init_evt_priv(struct evt_priv *pevtpriv) -+{ -+ sint res=_SUCCESS; -+ -+_func_enter_; -+ -+#ifdef CONFIG_H2CLBK -+ _rtw_init_sema(&(pevtpriv->lbkevt_done), 0); -+ pevtpriv->lbkevt_limit = 0; -+ pevtpriv->lbkevt_num = 0; -+ pevtpriv->cmdevt_parm = NULL; -+#endif -+ -+ //allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf -+ ATOMIC_SET(&pevtpriv->event_seq, 0); -+ pevtpriv->evt_done_cnt = 0; -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+ -+ _rtw_init_sema(&(pevtpriv->evt_notify), 0); -+ _rtw_init_sema(&(pevtpriv->terminate_evtthread_sema), 0); -+ -+ pevtpriv->evt_allocated_buf = rtw_zmalloc(MAX_EVTSZ + 4); -+ if (pevtpriv->evt_allocated_buf == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ pevtpriv->evt_buf = pevtpriv->evt_allocated_buf + 4 - ((unsigned int)(pevtpriv->evt_allocated_buf) & 3); -+ -+ -+#ifdef CONFIG_SDIO_HCI -+ pevtpriv->allocated_c2h_mem = rtw_zmalloc(C2H_MEM_SZ +4); -+ -+ if (pevtpriv->allocated_c2h_mem == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pevtpriv->c2h_mem = pevtpriv->allocated_c2h_mem + 4\ -+ - ( (u32)(pevtpriv->allocated_c2h_mem) & 3); -+#ifdef PLATFORM_OS_XP -+ pevtpriv->pc2h_mdl= IoAllocateMdl((u8 *)pevtpriv->c2h_mem, C2H_MEM_SZ , FALSE, FALSE, NULL); -+ -+ if(pevtpriv->pc2h_mdl == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ MmBuildMdlForNonPagedPool(pevtpriv->pc2h_mdl); -+#endif -+#endif //end of CONFIG_SDIO_HCI -+ -+ _rtw_init_queue(&(pevtpriv->evt_queue)); -+ -+exit: -+ -+#endif //end of CONFIG_EVENT_THREAD_MODE -+ -+#ifdef CONFIG_C2H_WK -+ _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL); -+ pevtpriv->c2h_wk_alive = _FALSE; -+ pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1); -+#endif -+ -+_func_exit_; -+ -+ return res; -+} -+ -+void _rtw_free_evt_priv (struct evt_priv *pevtpriv) -+{ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv \n")); -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+ _rtw_free_sema(&(pevtpriv->evt_notify)); -+ _rtw_free_sema(&(pevtpriv->terminate_evtthread_sema)); -+ -+ -+ if (pevtpriv->evt_allocated_buf) -+ rtw_mfree(pevtpriv->evt_allocated_buf, MAX_EVTSZ + 4); -+#endif -+ -+#ifdef CONFIG_C2H_WK -+ _cancel_workitem_sync(&pevtpriv->c2h_wk); -+ while(pevtpriv->c2h_wk_alive) -+ rtw_msleep_os(10); -+ -+ while (!rtw_cbuf_empty(pevtpriv->c2h_queue)) { -+ void *c2h; -+ if ((c2h = rtw_cbuf_pop(pevtpriv->c2h_queue)) != NULL -+ && c2h != (void *)pevtpriv) { -+ rtw_mfree(c2h, 16); -+ } -+ } -+ rtw_cbuf_free(pevtpriv->c2h_queue); -+#endif -+ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv \n")); -+ -+_func_exit_; -+ -+} -+ -+void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) -+{ -+_func_enter_; -+ -+ if(pcmdpriv){ -+ _rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock)); -+ _rtw_free_sema(&(pcmdpriv->cmd_queue_sema)); -+ //_rtw_free_sema(&(pcmdpriv->cmd_done_sema)); -+ _rtw_free_sema(&(pcmdpriv->terminate_cmdthread_sema)); -+ -+ if (pcmdpriv->cmd_allocated_buf) -+ rtw_mfree(pcmdpriv->cmd_allocated_buf, MAX_CMDSZ + CMDBUFF_ALIGN_SZ); -+ -+ if (pcmdpriv->rsp_allocated_buf) -+ rtw_mfree(pcmdpriv->rsp_allocated_buf, MAX_RSPSZ + 4); -+ } -+_func_exit_; -+} -+ -+/* -+Calling Context: -+ -+rtw_enqueue_cmd can only be called between kernel thread, -+since only spin_lock is used. -+ -+ISR/Call-Back functions can't call this sub-function. -+ -+*/ -+ -+sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj) -+{ -+ _irqL irqL; -+ -+_func_enter_; -+ -+ if (obj == NULL) -+ goto exit; -+ -+ //_enter_critical_bh(&queue->lock, &irqL); -+ _enter_critical(&queue->lock, &irqL); -+ -+ rtw_list_insert_tail(&obj->list, &queue->queue); -+ -+ //_exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical(&queue->lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+struct cmd_obj *_rtw_dequeue_cmd(_queue *queue) -+{ -+ _irqL irqL; -+ struct cmd_obj *obj; -+ -+_func_enter_; -+ -+ //_enter_critical_bh(&(queue->lock), &irqL); -+ _enter_critical(&queue->lock, &irqL); -+ if (rtw_is_list_empty(&(queue->queue))) -+ obj = NULL; -+ else -+ { -+ obj = LIST_CONTAINOR(get_next(&(queue->queue)), struct cmd_obj, list); -+ rtw_list_delete(&obj->list); -+ } -+ -+ //_exit_critical_bh(&(queue->lock), &irqL); -+ _exit_critical(&queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return obj; -+} -+ -+u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) -+{ -+ u32 res; -+_func_enter_; -+ res = _rtw_init_cmd_priv (pcmdpriv); -+_func_exit_; -+ return res; -+} -+ -+u32 rtw_init_evt_priv (struct evt_priv *pevtpriv) -+{ -+ int res; -+_func_enter_; -+ res = _rtw_init_evt_priv(pevtpriv); -+_func_exit_; -+ return res; -+} -+ -+void rtw_free_evt_priv (struct evt_priv *pevtpriv) -+{ -+_func_enter_; -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("rtw_free_evt_priv\n")); -+ _rtw_free_evt_priv(pevtpriv); -+_func_exit_; -+} -+ -+void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) -+{ -+_func_enter_; -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("rtw_free_cmd_priv\n")); -+ _rtw_free_cmd_priv(pcmdpriv); -+_func_exit_; -+} -+ -+int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj); -+int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) -+{ -+ u8 bAllow = _FALSE; //set to _TRUE to allow enqueuing cmd when hw_init_completed is _FALSE -+ -+ #ifdef SUPPORT_HW_RFOFF_DETECTED -+ //To decide allow or not -+ if( (pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect) -+ &&(!pcmdpriv->padapter->registrypriv.usbss_enable) -+ ) -+ { -+ if(cmd_obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra) ) -+ { -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf; -+ if(pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID) -+ { -+ //DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n"); -+ bAllow = _TRUE; -+ } -+ } -+ } -+ #endif -+ -+ if(cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan)) -+ bAllow = _TRUE; -+ -+ if( (pcmdpriv->padapter->hw_init_completed ==_FALSE && bAllow == _FALSE) -+ || pcmdpriv->cmdthd_running== _FALSE //com_thread not running -+ ) -+ { -+ //DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __FUNCTION__, -+ // cmd_obj->cmdcode, -+ // pcmdpriv->padapter->hw_init_completed, -+ // pcmdpriv->cmdthd_running -+ //); -+ -+ return _FAIL; -+ } -+ return _SUCCESS; -+} -+ -+ -+ -+u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) -+{ -+ int res = _FAIL; -+ PADAPTER padapter = pcmdpriv->padapter; -+ -+_func_enter_; -+ -+ if (cmd_obj == NULL) { -+ goto exit; -+ } -+ -+ cmd_obj->padapter = padapter; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ //change pcmdpriv to primary's pcmdpriv -+ if (padapter->adapter_type != PRIMARY_ADAPTER && padapter->pbuddy_adapter) -+ pcmdpriv = &(padapter->pbuddy_adapter->cmdpriv); -+#endif -+ -+ if( _FAIL == (res=rtw_cmd_filter(pcmdpriv, cmd_obj)) ) { -+ rtw_free_cmd_obj(cmd_obj); -+ goto exit; -+ } -+ -+ res = _rtw_enqueue_cmd(&pcmdpriv->cmd_queue, cmd_obj); -+ -+ if(res == _SUCCESS) -+ _rtw_up_sema(&pcmdpriv->cmd_queue_sema); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv) -+{ -+ struct cmd_obj *cmd_obj; -+ -+_func_enter_; -+ -+ cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue); -+ -+_func_exit_; -+ return cmd_obj; -+} -+ -+void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv) -+{ -+_func_enter_; -+ pcmdpriv->cmd_done_cnt++; -+ //_rtw_up_sema(&(pcmdpriv->cmd_done_sema)); -+_func_exit_; -+} -+ -+void rtw_free_cmd_obj(struct cmd_obj *pcmd) -+{ -+_func_enter_; -+ -+ if((pcmd->cmdcode!=_JoinBss_CMD_) &&(pcmd->cmdcode!= _CreateBss_CMD_)) -+ { -+ //free parmbuf in cmd_obj -+ rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz); -+ } -+ -+ if(pcmd->rsp!=NULL) -+ { -+ if(pcmd->rspsz!= 0) -+ { -+ //free rsp in cmd_obj -+ rtw_mfree((unsigned char*)pcmd->rsp, pcmd->rspsz); -+ } -+ } -+ -+ //free cmd_obj -+ rtw_mfree((unsigned char*)pcmd, sizeof(struct cmd_obj)); -+ -+_func_exit_; -+} -+ -+void rtw_stop_cmd_thread(_adapter *adapter) -+{ -+ if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == _TRUE -+ && adapter->cmdpriv.stop_req == 0) -+ { -+ adapter->cmdpriv.stop_req = 1; -+ _rtw_up_sema(&adapter->cmdpriv.cmd_queue_sema); -+ _rtw_down_sema(&adapter->cmdpriv.terminate_cmdthread_sema); -+ } -+} -+ -+thread_return rtw_cmd_thread(thread_context context) -+{ -+ u8 ret; -+ struct cmd_obj *pcmd; -+ u8 *pcmdbuf, *prspbuf; -+ u8 (*cmd_hdl)(_adapter *padapter, u8* pbuf); -+ void (*pcmd_callback)(_adapter *dev, struct cmd_obj *pcmd); -+ _adapter *padapter = (_adapter *)context; -+ struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); -+ -+_func_enter_; -+ -+ thread_enter("RTW_CMD_THREAD"); -+ -+ pcmdbuf = pcmdpriv->cmd_buf; -+ prspbuf = pcmdpriv->rsp_buf; -+ -+ pcmdpriv->stop_req = 0; -+ pcmdpriv->cmdthd_running=_TRUE; -+ _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); -+ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("start r871x rtw_cmd_thread !!!!\n")); -+ -+ while(1) -+ { -+ if ((_rtw_down_sema(&(pcmdpriv->cmd_queue_sema))) == _FAIL) { -+ LOG_LEVEL(_drv_err_, FUNC_ADPT_FMT" _rtw_down_sema(&pcmdpriv->cmd_queue_sema) return _FAIL, break\n", FUNC_ADPT_ARG(padapter)); -+ break; -+ } -+ -+ if (pcmdpriv->stop_req) { -+ LOG_LEVEL(_drv_err_, FUNC_ADPT_FMT" stop_req:%u, break\n", FUNC_ADPT_ARG(padapter), pcmdpriv->stop_req); -+ break; -+ } -+ -+#ifdef CONFIG_LPS_LCLK -+ if (rtw_register_cmd_alive(padapter) != _SUCCESS) -+ { -+ continue; -+ } -+#endif -+ -+_next: -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved == _TRUE)) -+ { -+ LOG_LEVEL(_drv_err_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", -+ __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); -+ break; -+ } -+ -+ if(!(pcmd = rtw_dequeue_cmd(pcmdpriv))) { -+#ifdef CONFIG_LPS_LCLK -+ rtw_unregister_cmd_alive(padapter); -+#endif -+ continue; -+ } -+ -+ if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) ) -+ { -+ pcmd->res = H2C_DROPPED; -+ goto post_process; -+ } -+ -+ if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) ) { -+ rtw_free_cmd_obj(pcmd); -+ continue; -+ } -+ -+ pcmdpriv->cmd_issued_cnt++; -+ -+ pcmd->cmdsz = _RND4((pcmd->cmdsz));//_RND4 -+ -+ _rtw_memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz); -+ -+ if(pcmd->cmdcode <= (sizeof(wlancmds) /sizeof(struct cmd_hdl))) -+ { -+ cmd_hdl = wlancmds[pcmd->cmdcode].h2cfuns; -+ -+ if (cmd_hdl) -+ { -+ ret = cmd_hdl(pcmd->padapter, pcmdbuf); -+ pcmd->res = ret; -+ } -+ -+ pcmdpriv->cmd_seq++; -+ } -+ else -+ { -+ pcmd->res = H2C_PARAMETERS_ERROR; -+ } -+ -+ cmd_hdl = NULL; -+ -+post_process: -+ -+ //call callback function for post-processed -+ if(pcmd->cmdcode <= (sizeof(rtw_cmd_callback) /sizeof(struct _cmd_callback))) -+ { -+ pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback; -+ if(pcmd_callback == NULL) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("mlme_cmd_hdl(): pcmd_callback=0x%p, cmdcode=0x%x\n", pcmd_callback, pcmd->cmdcode)); -+ rtw_free_cmd_obj(pcmd); -+ } -+ else -+ { -+ //todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!=NULL) -+ pcmd_callback(pcmd->padapter, pcmd);//need conider that free cmd_obj in rtw_cmd_callback -+ } -+ } -+ -+ flush_signals_thread(); -+ -+ goto _next; -+ -+ } -+ pcmdpriv->cmdthd_running=_FALSE; -+ -+ -+ // free all cmd_obj resources -+ do{ -+ pcmd = rtw_dequeue_cmd(pcmdpriv); -+ if(pcmd==NULL) -+ break; -+ -+ //DBG_871X("%s: leaving... drop cmdcode:%u\n", __FUNCTION__, pcmd->cmdcode); -+ -+ rtw_free_cmd_obj(pcmd); -+ }while(1); -+ -+ _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); -+ -+_func_exit_; -+ -+ thread_exit(); -+ -+} -+ -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+u32 rtw_enqueue_evt(struct evt_priv *pevtpriv, struct evt_obj *obj) -+{ -+ _irqL irqL; -+ int res; -+ _queue *queue = &pevtpriv->evt_queue; -+ -+_func_enter_; -+ -+ res = _SUCCESS; -+ -+ if (obj == NULL) { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ rtw_list_insert_tail(&obj->list, &queue->queue); -+ -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+ //rtw_evt_notify_isr(pevtpriv); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+struct evt_obj *rtw_dequeue_evt(_queue *queue) -+{ -+ _irqL irqL; -+ struct evt_obj *pevtobj; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ if (rtw_is_list_empty(&(queue->queue))) -+ pevtobj = NULL; -+ else -+ { -+ pevtobj = LIST_CONTAINOR(get_next(&(queue->queue)), struct evt_obj, list); -+ rtw_list_delete(&pevtobj->list); -+ } -+ -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return pevtobj; -+} -+ -+void rtw_free_evt_obj(struct evt_obj *pevtobj) -+{ -+_func_enter_; -+ -+ if(pevtobj->parmbuf) -+ rtw_mfree((unsigned char*)pevtobj->parmbuf, pevtobj->evtsz); -+ -+ rtw_mfree((unsigned char*)pevtobj, sizeof(struct evt_obj)); -+ -+_func_exit_; -+} -+ -+void rtw_evt_notify_isr(struct evt_priv *pevtpriv) -+{ -+_func_enter_; -+ pevtpriv->evt_done_cnt++; -+ _rtw_up_sema(&(pevtpriv->evt_notify)); -+_func_exit_; -+} -+#endif -+ -+ -+/* -+u8 rtw_setstandby_cmd(unsigned char *adapter) -+*/ -+u8 rtw_setstandby_cmd(_adapter *padapter, uint action) -+{ -+ struct cmd_obj* ph2c; -+ struct usb_suspend_parm* psetusbsuspend; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ -+ u8 ret = _SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if (ph2c == NULL) { -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ psetusbsuspend = (struct usb_suspend_parm*)rtw_zmalloc(sizeof(struct usb_suspend_parm)); -+ if (psetusbsuspend == NULL) { -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ psetusbsuspend->action = action; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetusbsuspend, GEN_CMD_CODE(_SetUsbSuspend)); -+ -+ ret = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+/* -+rtw_sitesurvey_cmd(~) -+ ### NOTE:#### (!!!!) -+ MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock -+*/ -+u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, -+ struct rtw_ieee80211_channel *ch, int ch_num) -+{ -+ u8 res = _FAIL; -+ struct cmd_obj *ph2c; -+ struct sitesurvey_parm *psurveyPara; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+#ifdef CONFIG_LPS -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE){ -+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1); -+ } -+#endif -+ -+#ifdef CONFIG_P2P_PS -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { -+ p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1); -+ } -+#endif // CONFIG_P2P_PS -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if (ph2c == NULL) -+ return _FAIL; -+ -+ psurveyPara = (struct sitesurvey_parm*)rtw_zmalloc(sizeof(struct sitesurvey_parm)); -+ if (psurveyPara == NULL) { -+ rtw_mfree((unsigned char*) ph2c, sizeof(struct cmd_obj)); -+ return _FAIL; -+ } -+ -+ rtw_free_network_queue(padapter, _FALSE); -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("\nflush network queue\n\n")); -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, GEN_CMD_CODE(_SiteSurvey)); -+ -+ /* psurveyPara->bsslimit = 48; */ -+ psurveyPara->scan_mode = pmlmepriv->scan_mode; -+ -+ /* prepare ssid list */ -+ if (ssid) { -+ int i; -+ for (i=0; issid[i], &ssid[i], sizeof(NDIS_802_11_SSID)); -+ psurveyPara->ssid_num++; -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter), -+ psurveyPara->ssid[i].Ssid, psurveyPara->ssid[i].SsidLength); -+ } -+ } -+ } -+ -+ /* prepare channel list */ -+ if (ch) { -+ int i; -+ for (i=0; ich[i], &ch[i], sizeof(struct rtw_ieee80211_channel)); -+ psurveyPara->ch_num++; -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter), -+ psurveyPara->ch[i].hw_value); -+ } -+ } -+ } -+ -+ set_fwstate(pmlmepriv, _FW_UNDER_SURVEY); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+ if(res == _SUCCESS) { -+ -+ pmlmepriv->scan_start_time = rtw_get_current_time(); -+ -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ if (padapter->pbuddy_adapter == NULL ) -+ goto full_scan_timeout; -+ if((padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state&0x03) == WIFI_FW_AP_STATE) -+ _set_timer(&pmlmepriv->scan_to_timer, -+ SURVEY_TO * ( padapter->mlmeextpriv.max_chan_nums + ( padapter->mlmeextpriv.max_chan_nums / RTW_SCAN_NUM_OF_CH ) * RTW_STAY_AP_CH_MILLISECOND ) + 1000 ); -+ else -+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+full_scan_timeout: -+ _set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT); -+ -+ rtw_led_control(padapter, LED_CTL_SITE_SURVEY); -+ -+ pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec -+ } else { -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); -+ } -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset) -+{ -+ struct cmd_obj* ph2c; -+ struct setdatarate_parm* pbsetdataratepara; -+ struct cmd_priv* pcmdpriv = &padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if (ph2c == NULL) { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pbsetdataratepara = (struct setdatarate_parm*)rtw_zmalloc(sizeof(struct setdatarate_parm)); -+ if (pbsetdataratepara == NULL) { -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res = _FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pbsetdataratepara, GEN_CMD_CODE(_SetDataRate)); -+#ifdef MP_FIRMWARE_OFFLOAD -+ pbsetdataratepara->curr_rateidx = *(u32*)rateset; -+// _rtw_memcpy(pbsetdataratepara, rateset, sizeof(u32)); -+#else -+ pbsetdataratepara->mac_id = 5; -+ _rtw_memcpy(pbsetdataratepara->datarates, rateset, NumRates); -+#endif -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset) -+{ -+ struct cmd_obj* ph2c; -+ struct setbasicrate_parm* pssetbasicratepara; -+ struct cmd_priv* pcmdpriv=&padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if (ph2c == NULL) { -+ res= _FAIL; -+ goto exit; -+ } -+ pssetbasicratepara = (struct setbasicrate_parm*)rtw_zmalloc(sizeof(struct setbasicrate_parm)); -+ -+ if (pssetbasicratepara == NULL) { -+ rtw_mfree((u8*) ph2c, sizeof(struct cmd_obj)); -+ res = _FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pssetbasicratepara, _SetBasicRate_CMD_); -+ -+ _rtw_memcpy(pssetbasicratepara->basicrates, rateset, NumRates); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+ -+/* -+unsigned char rtw_setphy_cmd(unsigned char *adapter) -+ -+1. be called only after rtw_update_registrypriv_dev_network( ~) or mp testing program -+2. for AdHoc/Ap mode or mp mode? -+ -+*/ -+u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch) -+{ -+ struct cmd_obj* ph2c; -+ struct setphy_parm* psetphypara; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+// struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+// struct registry_priv* pregistry_priv = &padapter->registrypriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ psetphypara = (struct setphy_parm*)rtw_zmalloc(sizeof(struct setphy_parm)); -+ -+ if(psetphypara==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetphypara, _SetPhy_CMD_); -+ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("CH=%d, modem=%d", ch, modem)); -+ -+ psetphypara->modem = modem; -+ psetphypara->rfchannel = ch; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+_func_exit_; -+ return res; -+} -+ -+u8 rtw_setbbreg_cmd(_adapter*padapter, u8 offset, u8 val) -+{ -+ struct cmd_obj* ph2c; -+ struct writeBB_parm* pwritebbparm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+_func_enter_; -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ pwritebbparm = (struct writeBB_parm*)rtw_zmalloc(sizeof(struct writeBB_parm)); -+ -+ if(pwritebbparm==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pwritebbparm, GEN_CMD_CODE(_SetBBReg)); -+ -+ pwritebbparm->offset = offset; -+ pwritebbparm->value = val; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+_func_exit_; -+ return res; -+} -+ -+u8 rtw_getbbreg_cmd(_adapter *padapter, u8 offset, u8 *pval) -+{ -+ struct cmd_obj* ph2c; -+ struct readBB_parm* prdbbparm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res=_FAIL; -+ goto exit; -+ } -+ prdbbparm = (struct readBB_parm*)rtw_zmalloc(sizeof(struct readBB_parm)); -+ -+ if(prdbbparm ==NULL){ -+ rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj)); -+ return _FAIL; -+ } -+ -+ _rtw_init_listhead(&ph2c->list); -+ ph2c->cmdcode =GEN_CMD_CODE(_GetBBReg); -+ ph2c->parmbuf = (unsigned char *)prdbbparm; -+ ph2c->cmdsz = sizeof(struct readBB_parm); -+ ph2c->rsp = pval; -+ ph2c->rspsz = sizeof(struct readBB_rsp); -+ -+ prdbbparm ->offset = offset; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+_func_exit_; -+ return res; -+} -+ -+u8 rtw_setrfreg_cmd(_adapter *padapter, u8 offset, u32 val) -+{ -+ struct cmd_obj* ph2c; -+ struct writeRF_parm* pwriterfparm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+_func_enter_; -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ pwriterfparm = (struct writeRF_parm*)rtw_zmalloc(sizeof(struct writeRF_parm)); -+ -+ if(pwriterfparm==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pwriterfparm, GEN_CMD_CODE(_SetRFReg)); -+ -+ pwriterfparm->offset = offset; -+ pwriterfparm->value = val; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+_func_exit_; -+ return res; -+} -+ -+u8 rtw_getrfreg_cmd(_adapter *padapter, u8 offset, u8 *pval) -+{ -+ struct cmd_obj* ph2c; -+ struct readRF_parm* prdrfparm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ prdrfparm = (struct readRF_parm*)rtw_zmalloc(sizeof(struct readRF_parm)); -+ if(prdrfparm ==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_init_listhead(&ph2c->list); -+ ph2c->cmdcode =GEN_CMD_CODE(_GetRFReg); -+ ph2c->parmbuf = (unsigned char *)prdrfparm; -+ ph2c->cmdsz = sizeof(struct readRF_parm); -+ ph2c->rsp = pval; -+ ph2c->rspsz = sizeof(struct readRF_rsp); -+ -+ prdrfparm ->offset = offset; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) -+{ -+ _func_enter_; -+ -+ //rtw_free_cmd_obj(pcmd); -+ rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz); -+ rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj)); -+ -+#ifdef CONFIG_MP_INCLUDED -+ padapter->mppriv.workparam.bcompleted= _TRUE; -+#endif -+_func_exit_; -+} -+ -+void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) -+{ -+ _func_enter_; -+ -+ rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz); -+ rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj)); -+ -+#ifdef CONFIG_MP_INCLUDED -+ padapter->mppriv.workparam.bcompleted= _TRUE; -+#endif -+ -+_func_exit_; -+} -+ -+u8 rtw_createbss_cmd(_adapter *padapter) -+{ -+ struct cmd_obj* pcmd; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ WLAN_BSSID_EX *pdev_network = &padapter->registrypriv.dev_network; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ rtw_led_control(padapter, LED_CTL_START_TO_LINK); -+ -+ if (pmlmepriv->assoc_ssid.SsidLength == 0){ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,(" createbss for Any SSid:%s\n",pmlmepriv->assoc_ssid.Ssid)); -+ } else { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,(" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid)); -+ } -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_init_listhead(&pcmd->list); -+ pcmd->cmdcode = _CreateBss_CMD_; -+ pcmd->parmbuf = (unsigned char *)pdev_network; -+ pcmd->cmdsz = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX*)pdev_network); -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ pdev_network->Length = pcmd->cmdsz; -+ -+#ifdef CONFIG_RTL8712 -+ //notes: translate IELength & Length after assign the Length to cmdsz; -+ pdev_network->Length = cpu_to_le32(pcmd->cmdsz); -+ pdev_network->IELength = cpu_to_le32(pdev_network->IELength); -+ pdev_network->Ssid.SsidLength = cpu_to_le32(pdev_network->Ssid.SsidLength); -+#endif -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz) -+{ -+ struct cmd_obj* pcmd; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_init_listhead(&pcmd->list); -+ pcmd->cmdcode = GEN_CMD_CODE(_CreateBss); -+ pcmd->parmbuf = pbss; -+ pcmd->cmdsz = sz; -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork) -+{ -+ u8 *auth, res = _SUCCESS; -+ uint t_len = 0; -+ WLAN_BSSID_EX *psecnetwork; -+ struct cmd_obj *pcmd; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct qos_priv *pqospriv= &pmlmepriv->qospriv; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+_func_enter_; -+ -+ rtw_led_control(padapter, LED_CTL_START_TO_LINK); -+ -+ if (pmlmepriv->assoc_ssid.SsidLength == 0){ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n")); -+ } else { -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid=[%s]\n", pmlmepriv->assoc_ssid.Ssid)); -+ } -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res=_FAIL; -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n")); -+ goto exit; -+ } -+ /* // for IEs is pointer -+ t_len = sizeof (ULONG) + sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + -+ sizeof (NDIS_802_11_SSID) + sizeof (ULONG) + -+ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) + -+ sizeof (NDIS_802_11_CONFIGURATION) + -+ sizeof (NDIS_802_11_NETWORK_INFRASTRUCTURE) + -+ sizeof (NDIS_802_11_RATES_EX)+ sizeof(WLAN_PHY_INFO)+ sizeof (ULONG) + MAX_IE_SZ; -+ */ -+ //for IEs is fix buf size -+ t_len = sizeof(WLAN_BSSID_EX); -+ -+ -+ //for hidden ap to set fw_state here -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != _TRUE) -+ { -+ switch(ndis_network_mode) -+ { -+ case Ndis802_11IBSS: -+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); -+ break; -+ -+ case Ndis802_11Infrastructure: -+ set_fwstate(pmlmepriv, WIFI_STATION_STATE); -+ break; -+ -+ case Ndis802_11APMode: -+ case Ndis802_11AutoUnknown: -+ case Ndis802_11InfrastructureMax: -+ break; -+ -+ } -+ } -+ -+ psecnetwork=(WLAN_BSSID_EX *)&psecuritypriv->sec_bss; -+ if(psecnetwork==NULL) -+ { -+ if(pcmd !=NULL) -+ rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); -+ -+ res=_FAIL; -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd :psecnetwork==NULL!!!\n")); -+ -+ goto exit; -+ } -+ -+ _rtw_memset(psecnetwork, 0, t_len); -+ -+ _rtw_memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network)); -+ -+ auth=&psecuritypriv->authenticator_ie[0]; -+ psecuritypriv->authenticator_ie[0]=(unsigned char)psecnetwork->IELength; -+ -+ if((psecnetwork->IELength-12) < (256-1)) { -+ _rtw_memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12); -+ } else { -+ _rtw_memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1)); -+ } -+ -+ psecnetwork->IELength = 0; -+ // Added by Albert 2009/02/18 -+ // If the the driver wants to use the bssid to create the connection. -+ // If not, we have to copy the connecting AP's MAC address to it so that -+ // the driver just has the bssid information for PMKIDList searching. -+ -+ if ( pmlmepriv->assoc_by_bssid == _FALSE ) -+ { -+ _rtw_memcpy( &pmlmepriv->assoc_bssid[ 0 ], &pnetwork->network.MacAddress[ 0 ], ETH_ALEN ); -+ } -+ -+ psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength); -+ -+ -+ pqospriv->qos_option = 0; -+ -+ if(pregistrypriv->wmm_enable) -+ { -+ u32 tmp_len; -+ -+ tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength, psecnetwork->IELength); -+ -+ if (psecnetwork->IELength != tmp_len) -+ { -+ psecnetwork->IELength = tmp_len; -+ pqospriv->qos_option = 1; //There is WMM IE in this corresp. beacon -+ } -+ else -+ { -+ pqospriv->qos_option = 0;//There is no WMM IE in this corresp. beacon -+ } -+ } -+ -+#ifdef CONFIG_80211N_HT -+ phtpriv->ht_option = _FALSE; -+ if(pregistrypriv->ht_enable) -+ { -+ // Added by Albert 2010/06/23 -+ // For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. -+ // Especially for Realtek 8192u SoftAP. -+ if ( ( padapter->securitypriv.dot11PrivacyAlgrthm != _WEP40_ ) && -+ ( padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_ ) && -+ ( padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_ )) -+ { -+ //rtw_restructure_ht_ie -+ rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], -+ pnetwork->network.IELength, &psecnetwork->IELength, (u8)psecnetwork->Configuration.DSConfig ); -+ } -+ } -+ -+#endif -+ -+ pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.IEs, pnetwork->network.IELength); -+ -+ #if 0 -+ psecuritypriv->supplicant_ie[0]=(u8)psecnetwork->IELength; -+ -+ if(psecnetwork->IELength < (256-1)) -+ { -+ _rtw_memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0], psecnetwork->IELength); -+ } -+ else -+ { -+ _rtw_memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0], (256-1)); -+ } -+ #endif -+ -+ pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion -+ -+#ifdef CONFIG_RTL8712 -+ //wlan_network endian conversion -+ psecnetwork->Length = cpu_to_le32(psecnetwork->Length); -+ psecnetwork->Ssid.SsidLength= cpu_to_le32(psecnetwork->Ssid.SsidLength); -+ psecnetwork->Privacy = cpu_to_le32(psecnetwork->Privacy); -+ psecnetwork->Rssi = cpu_to_le32(psecnetwork->Rssi); -+ psecnetwork->NetworkTypeInUse = cpu_to_le32(psecnetwork->NetworkTypeInUse); -+ psecnetwork->Configuration.ATIMWindow = cpu_to_le32(psecnetwork->Configuration.ATIMWindow); -+ psecnetwork->Configuration.BeaconPeriod = cpu_to_le32(psecnetwork->Configuration.BeaconPeriod); -+ psecnetwork->Configuration.DSConfig = cpu_to_le32(psecnetwork->Configuration.DSConfig); -+ psecnetwork->Configuration.FHConfig.DwellTime=cpu_to_le32(psecnetwork->Configuration.FHConfig.DwellTime); -+ psecnetwork->Configuration.FHConfig.HopPattern=cpu_to_le32(psecnetwork->Configuration.FHConfig.HopPattern); -+ psecnetwork->Configuration.FHConfig.HopSet=cpu_to_le32(psecnetwork->Configuration.FHConfig.HopSet); -+ psecnetwork->Configuration.FHConfig.Length=cpu_to_le32(psecnetwork->Configuration.FHConfig.Length); -+ psecnetwork->Configuration.Length = cpu_to_le32(psecnetwork->Configuration.Length); -+ psecnetwork->InfrastructureMode = cpu_to_le32(psecnetwork->InfrastructureMode); -+ psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength); -+#endif -+ -+ _rtw_init_listhead(&pcmd->list); -+ pcmd->cmdcode = _JoinBss_CMD_;//GEN_CMD_CODE(_JoinBss) -+ pcmd->parmbuf = (unsigned char *)psecnetwork; -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_disassoc_cmd(_adapter*padapter, u32 deauth_timeout_ms, bool enqueue) /* for sta_mode */ -+{ -+ struct cmd_obj *cmdobj = NULL; -+ struct disconnect_parm *param = NULL; -+ struct cmd_priv *cmdpriv = &padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n")); -+ -+ /* prepare cmd parameter */ -+ param = (struct disconnect_parm *)rtw_zmalloc(sizeof(*param)); -+ if (param == NULL) { -+ res = _FAIL; -+ goto exit; -+ } -+ param->deauth_timeout_ms = deauth_timeout_ms; -+ -+ if (enqueue) { -+ /* need enqueue, prepare cmd_obj and enqueue */ -+ cmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(*cmdobj)); -+ if (cmdobj == NULL) { -+ res = _FAIL; -+ rtw_mfree((u8 *)param, sizeof(*param)); -+ goto exit; -+ } -+ init_h2fwcmd_w_parm_no_rsp(cmdobj, param, _DisConnect_CMD_); -+ res = rtw_enqueue_cmd(cmdpriv, cmdobj); -+ } else { -+ /* no need to enqueue, do the cmd hdl directly and free cmd parameter */ -+ if (H2C_SUCCESS != disconnect_hdl(padapter, (u8 *)param)) -+ res = _FAIL; -+ rtw_mfree((u8 *)param, sizeof(*param)); -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype) -+{ -+ struct cmd_obj* ph2c; -+ struct setopmode_parm* psetop; -+ -+ struct cmd_priv *pcmdpriv= &padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FALSE; -+ goto exit; -+ } -+ psetop = (struct setopmode_parm*)rtw_zmalloc(sizeof(struct setopmode_parm)); -+ -+ if(psetop==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res=_FALSE; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetop, _SetOpMode_CMD_); -+ psetop->mode = (u8)networktype; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key) -+{ -+ struct cmd_obj* ph2c; -+ struct set_stakey_parm *psetstakey_para; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ struct set_stakey_rsp *psetstakey_rsp = NULL; -+ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct sta_info* sta = (struct sta_info* )psta; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if ( ph2c == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm)); -+ if(psetstakey_para==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp)); -+ if(psetstakey_rsp == NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_); -+ ph2c->rsp = (u8 *) psetstakey_rsp; -+ ph2c->rspsz = sizeof(struct set_stakey_rsp); -+ -+ _rtw_memcpy(psetstakey_para->addr, sta->hwaddr,ETH_ALEN); -+ -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE)){ -+#ifdef CONFIG_TDLS -+ if(sta->tdls_sta_state&TDLS_LINKED_STATE) -+ psetstakey_para->algorithm=(u8)sta->dot118021XPrivacy; -+ else -+#endif //CONFIG_TDLS -+ psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm; -+ }else{ -+ GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, _FALSE); -+ } -+ -+ if (unicast_key == _TRUE) { -+#ifdef CONFIG_TDLS -+ if(sta->tdls_sta_state&TDLS_LINKED_STATE) -+ _rtw_memcpy(&psetstakey_para->key, sta->tpk.tk, 16); -+ else -+#endif //CONFIG_TDLS -+ _rtw_memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16); -+ } else { -+ _rtw_memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16); -+ } -+ -+ //jeff: set this becasue at least sw key is ready -+ padapter->securitypriv.busetkipkey=_TRUE; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue) -+{ -+ struct cmd_obj* ph2c; -+ struct set_stakey_parm *psetstakey_para; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ struct set_stakey_rsp *psetstakey_rsp = NULL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct sta_info* sta = (struct sta_info* )psta; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ if(!enqueue) -+ { -+ clear_cam_entry(padapter, entry); -+ } -+ else -+ { -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if ( ph2c == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm)); -+ if(psetstakey_para==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp)); -+ if(psetstakey_rsp == NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_); -+ ph2c->rsp = (u8 *) psetstakey_rsp; -+ ph2c->rspsz = sizeof(struct set_stakey_rsp); -+ -+ _rtw_memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN); -+ -+ psetstakey_para->algorithm = _NO_PRIVACY_; -+ -+ psetstakey_para->id = entry; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table) -+{ -+ struct cmd_obj* ph2c; -+ struct setratable_parm * psetrttblparm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ psetrttblparm = (struct setratable_parm*)rtw_zmalloc(sizeof(struct setratable_parm)); -+ -+ if(psetrttblparm==NULL){ -+ rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); -+ -+ _rtw_memcpy(psetrttblparm,prate_table,sizeof(struct setratable_parm)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+_func_exit_; -+ return res; -+ -+} -+ -+u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval) -+{ -+ struct cmd_obj* ph2c; -+ struct getratable_parm * pgetrttblparm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ pgetrttblparm = (struct getratable_parm*)rtw_zmalloc(sizeof(struct getratable_parm)); -+ -+ if(pgetrttblparm==NULL){ -+ rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+// init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); -+ -+ _rtw_init_listhead(&ph2c->list); -+ ph2c->cmdcode =GEN_CMD_CODE(_GetRaTable); -+ ph2c->parmbuf = (unsigned char *)pgetrttblparm; -+ ph2c->cmdsz = sizeof(struct getratable_parm); -+ ph2c->rsp = (u8*)pval; -+ ph2c->rspsz = sizeof(struct getratable_rsp); -+ -+ pgetrttblparm ->rsvd = 0x0; -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+exit: -+_func_exit_; -+ return res; -+ -+} -+ -+u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr) -+{ -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ struct cmd_obj* ph2c; -+ struct set_assocsta_parm *psetassocsta_para; -+ struct set_stakey_rsp *psetassocsta_rsp = NULL; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ psetassocsta_para = (struct set_assocsta_parm*)rtw_zmalloc(sizeof(struct set_assocsta_parm)); -+ if(psetassocsta_para==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ psetassocsta_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_assocsta_rsp)); -+ if(psetassocsta_rsp==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ rtw_mfree((u8 *) psetassocsta_para, sizeof(struct set_assocsta_parm)); -+ return _FAIL; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetassocsta_para, _SetAssocSta_CMD_); -+ ph2c->rsp = (u8 *) psetassocsta_rsp; -+ ph2c->rspsz = sizeof(struct set_assocsta_rsp); -+ -+ _rtw_memcpy(psetassocsta_para->addr, mac_addr,ETH_ALEN); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ } -+ -+u8 rtw_addbareq_cmd(_adapter*padapter, u8 tid, u8 *addr) -+{ -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ struct cmd_obj* ph2c; -+ struct addBaReq_parm *paddbareq_parm; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ paddbareq_parm = (struct addBaReq_parm*)rtw_zmalloc(sizeof(struct addBaReq_parm)); -+ if(paddbareq_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ paddbareq_parm->tid = tid; -+ _rtw_memcpy(paddbareq_parm->addr, addr, ETH_ALEN); -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq)); -+ -+ //DBG_871X("rtw_addbareq_cmd, tid=%d\n", tid); -+ -+ //rtw_enqueue_cmd(pcmdpriv, ph2c); -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+//add for CONFIG_IEEE80211W, none 11w can use it -+u8 rtw_reset_securitypriv_cmd(_adapter*padapter) -+{ -+ struct cmd_obj* ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = RESET_SECURITYPRIV; -+ pdrvextra_cmd_parm->type_size = 0; -+ pdrvextra_cmd_parm->pbuf = (u8 *)padapter; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ -+ //rtw_enqueue_cmd(pcmdpriv, ph2c); -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+u8 rtw_free_assoc_resources_cmd(_adapter*padapter) -+{ -+ struct cmd_obj* ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = FREE_ASSOC_RESOURCES; -+ pdrvextra_cmd_parm->type_size = 0; -+ pdrvextra_cmd_parm->pbuf = (u8 *)padapter; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ -+ //rtw_enqueue_cmd(pcmdpriv, ph2c); -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+ -+u8 rtw_dynamic_chk_wk_cmd(_adapter*padapter) -+{ -+ struct cmd_obj* ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) -+ goto exit; -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->adapter_type != PRIMARY_ADAPTER && padapter->pbuddy_adapter) -+ pcmdpriv = &(padapter->pbuddy_adapter->cmdpriv); -+#endif -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = DYNAMIC_CHK_WK_CID; -+ pdrvextra_cmd_parm->type_size = 0; -+ pdrvextra_cmd_parm->pbuf = (u8 *)padapter; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ -+ //rtw_enqueue_cmd(pcmdpriv, ph2c); -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue) -+{ -+ struct cmd_obj *pcmdobj; -+ struct set_ch_parm *set_ch_parm; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ DBG_871X(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n", -+ FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset); -+ -+ /* check input parameter */ -+ -+ /* prepare cmd parameter */ -+ set_ch_parm = (struct set_ch_parm *)rtw_zmalloc(sizeof(*set_ch_parm)); -+ if (set_ch_parm == NULL) { -+ res= _FAIL; -+ goto exit; -+ } -+ set_ch_parm->ch = ch; -+ set_ch_parm->bw = bw; -+ set_ch_parm->ch_offset = ch_offset; -+ -+ if (enqueue) { -+ /* need enqueue, prepare cmd_obj and enqueue */ -+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmdobj == NULL){ -+ rtw_mfree((u8 *)set_ch_parm, sizeof(*set_ch_parm)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, set_ch_parm, GEN_CMD_CODE(_SetChannel)); -+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); -+ } else { -+ /* no need to enqueue, do the cmd hdl directly and free cmd parameter */ -+ if( H2C_SUCCESS !=set_ch_hdl(padapter, (u8 *)set_ch_parm) ) -+ res = _FAIL; -+ -+ rtw_mfree((u8 *)set_ch_parm, sizeof(*set_ch_parm)); -+ } -+ -+ /* do something based on res... */ -+ -+exit: -+ -+ DBG_871X(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res); -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue) -+{ -+ struct cmd_obj* pcmdobj; -+ struct SetChannelPlan_param *setChannelPlan_param; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n")); -+ -+ //check input parameter -+ if(!rtw_is_channel_plan_valid(chplan)) { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ //prepare cmd parameter -+ setChannelPlan_param = (struct SetChannelPlan_param *)rtw_zmalloc(sizeof(struct SetChannelPlan_param)); -+ if(setChannelPlan_param == NULL) { -+ res= _FAIL; -+ goto exit; -+ } -+ setChannelPlan_param->channel_plan=chplan; -+ -+ if(enqueue) -+ { -+ //need enqueue, prepare cmd_obj and enqueue -+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmdobj == NULL){ -+ rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelPlan_param, GEN_CMD_CODE(_SetChannelPlan)); -+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); -+ } -+ else -+ { -+ //no need to enqueue, do the cmd hdl directly and free cmd parameter -+ if( H2C_SUCCESS !=set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param) ) -+ res = _FAIL; -+ -+ rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param)); -+ } -+ -+ //do something based on res... -+ if(res == _SUCCESS) -+ padapter->mlmepriv.ChannelPlan = chplan; -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_led_blink_cmd(_adapter*padapter, PLED_871x pLed) -+{ -+ struct cmd_obj* pcmdobj; -+ struct LedBlink_param *ledBlink_param; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n")); -+ -+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmdobj == NULL){ -+ res=_FAIL; -+ goto exit; -+ } -+ -+ ledBlink_param = (struct LedBlink_param *)rtw_zmalloc(sizeof(struct LedBlink_param)); -+ if(ledBlink_param == NULL) { -+ rtw_mfree((u8 *)pcmdobj, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ ledBlink_param->pLed=pLed; -+ -+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, ledBlink_param, GEN_CMD_CODE(_LedBlink)); -+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no) -+{ -+ struct cmd_obj* pcmdobj; -+ struct SetChannelSwitch_param*setChannelSwitch_param; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n")); -+ -+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmdobj == NULL){ -+ res=_FAIL; -+ goto exit; -+ } -+ -+ setChannelSwitch_param = (struct SetChannelSwitch_param *)rtw_zmalloc(sizeof(struct SetChannelSwitch_param)); -+ if(setChannelSwitch_param == NULL) { -+ rtw_mfree((u8 *)pcmdobj, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ setChannelSwitch_param->new_ch_no=new_ch_no; -+ -+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelSwitch_param, GEN_CMD_CODE(_SetChannelSwitch)); -+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option) -+{ -+ struct cmd_obj* pcmdobj; -+ struct TDLSoption_param *TDLSoption; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+#ifdef CONFIG_TDLS -+ -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_tdls_cmd\n")); -+ -+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmdobj == NULL){ -+ res=_FAIL; -+ goto exit; -+ } -+ -+ TDLSoption= (struct TDLSoption_param *)rtw_zmalloc(sizeof(struct TDLSoption_param)); -+ if(TDLSoption == NULL) { -+ rtw_mfree((u8 *)pcmdobj, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_spinlock(&(padapter->tdlsinfo.cmd_lock)); -+ _rtw_memcpy(TDLSoption->addr, addr, 6); -+ TDLSoption->option = option; -+ _rtw_spinunlock(&(padapter->tdlsinfo.cmd_lock)); -+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, TDLSoption, GEN_CMD_CODE(_TDLS)); -+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); -+ -+#endif //CONFIG_TDLS -+ -+exit: -+ -+ -+_func_exit_; -+ -+ return res; -+} -+ -+static void traffic_status_watchdog(_adapter *padapter) -+{ -+#ifdef CONFIG_LPS -+ u8 bEnterPS; -+#endif -+ u16 BusyThreshold = 100; -+ u8 bBusyTraffic = _FALSE, bTxBusyTraffic = _FALSE, bRxBusyTraffic = _FALSE; -+ u8 bHigherBusyTraffic = _FALSE, bHigherBusyRxTraffic = _FALSE, bHigherBusyTxTraffic = _FALSE; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &(padapter->tdlsinfo); -+#endif //CONFIG_TDLS -+ -+ RT_LINK_DETECT_T * link_detect = &pmlmepriv->LinkDetectInfo; -+ -+ // -+ // Determine if our traffic is busy now -+ // -+ if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ /*&& !MgntInitAdapterInProgress(pMgntInfo)*/) -+ { -+ -+ // if we raise bBusyTraffic in last watchdog, using lower threshold. -+ if (pmlmepriv->LinkDetectInfo.bBusyTraffic) -+ BusyThreshold = 75; -+ if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || -+ pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold ) -+ { -+ bBusyTraffic = _TRUE; -+ -+ if(pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold) -+ bRxBusyTraffic = _TRUE; -+ -+ if(pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) -+ bTxBusyTraffic = _TRUE; -+ } -+ -+ // Higher Tx/Rx data. -+ if( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || -+ pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000 ) -+ { -+ bHigherBusyTraffic = _TRUE; -+ -+ // Extremely high Rx data. -+ if(pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 5000) -+ bHigherBusyRxTraffic = _TRUE; -+ -+ // Extremely high Tx data. -+ if(pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 5000) -+ bHigherBusyTxTraffic = _TRUE; -+ } -+ -+#ifdef CONFIG_TRAFFIC_PROTECT -+#define TX_ACTIVE_TH 2 -+#define RX_ACTIVE_TH 1 -+#define TRAFFIC_PROTECT_PERIOD_MS 4500 -+ -+ if (link_detect->NumTxOkInPeriod > TX_ACTIVE_TH -+ || link_detect->NumRxUnicastOkInPeriod > RX_ACTIVE_TH) { -+ -+ LOG_LEVEL(_drv_info_, FUNC_ADPT_FMT" acqiure wake_lock for %u ms(tx:%d,rx_unicast:%d)\n", -+ FUNC_ADPT_ARG(padapter), -+ TRAFFIC_PROTECT_PERIOD_MS, -+ link_detect->NumTxOkInPeriod, -+ link_detect->NumRxUnicastOkInPeriod); -+ -+ rtw_lock_suspend_timeout(TRAFFIC_PROTECT_PERIOD_MS); -+ } -+#endif -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_TDLS_AUTOSETUP -+ if( ( ptdlsinfo->watchdog_count % TDLS_WATCHDOG_PERIOD ) == 0 ) //TDLS_WATCHDOG_PERIOD * 2sec, periodically sending -+ issue_tdls_dis_req( padapter, NULL ); -+ ptdlsinfo->watchdog_count++; -+#endif //CONFIG_TDLS_AUTOSETUP -+#endif //CONFIG_TDLS -+ -+#ifdef CONFIG_LPS -+ // check traffic for powersaving. -+ if( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) || -+ (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) -+ { -+ //DBG_871X("Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); -+ bEnterPS= _FALSE; -+ } -+ else -+ { -+ bEnterPS= _TRUE; -+ } -+ -+ // LeisurePS only work in infra mode. -+ if(bEnterPS) -+ { -+ LPS_Enter(padapter); -+ } -+ else -+ { -+ LPS_Leave(padapter); -+ } -+#endif -+ } -+ else -+ { -+#ifdef CONFIG_LPS -+ LPS_Leave(padapter); -+#endif -+ } -+ -+ pmlmepriv->LinkDetectInfo.NumRxOkInPeriod = 0; -+ pmlmepriv->LinkDetectInfo.NumTxOkInPeriod = 0; -+ pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod = 0; -+ pmlmepriv->LinkDetectInfo.bBusyTraffic = bBusyTraffic; -+ pmlmepriv->LinkDetectInfo.bTxBusyTraffic = bTxBusyTraffic; -+ pmlmepriv->LinkDetectInfo.bRxBusyTraffic = bRxBusyTraffic; -+ pmlmepriv->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic; -+ pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic; -+ pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic; -+ -+} -+ -+void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz); -+void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) -+{ -+ struct mlme_priv *pmlmepriv; -+ -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) -+ return; -+ -+ if((void*)padapter != (void*)pbuf && padapter->pbuddy_adapter == NULL) -+ return; -+ -+ padapter = (_adapter *)pbuf; -+ -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) -+ return; -+ -+ pmlmepriv = &(padapter->mlmepriv); -+ -+#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+#ifdef CONFIG_AP_MODE -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ expire_timeout_chk(padapter); -+ } -+#endif -+#endif //CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ rtw_hal_sreset_xmit_status_check(padapter); -+ #endif -+ -+ //if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==_FALSE) -+ { -+ linked_status_chk(padapter); -+ traffic_status_watchdog(padapter); -+ } -+ -+ rtw_hal_dm_watchdog(padapter); -+ -+ //check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); -+ -+} -+ -+#ifdef CONFIG_LPS -+ -+void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type); -+void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 mstatus; -+ -+_func_enter_; -+ -+ if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ || (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) -+ { -+ return; -+ } -+ -+ switch(lps_ctrl_type) -+ { -+ case LPS_CTRL_SCAN: -+ //DBG_871X("LPS_CTRL_SCAN \n"); -+ LeaveAllPowerSaveMode(padapter); -+ break; -+ case LPS_CTRL_JOINBSS: -+ //DBG_871X("LPS_CTRL_JOINBSS \n"); -+ LPS_Leave(padapter); -+ break; -+ case LPS_CTRL_CONNECT: -+ //DBG_871X("LPS_CTRL_CONNECT \n"); -+ mstatus = 1; -+ // Reset LPS Setting -+ padapter->pwrctrlpriv.LpsIdleCount = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); -+ break; -+ case LPS_CTRL_DISCONNECT: -+ //DBG_871X("LPS_CTRL_DISCONNECT \n"); -+ mstatus = 0; -+ LPS_Leave(padapter); -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); -+ break; -+ case LPS_CTRL_SPECIAL_PACKET: -+ //DBG_871X("LPS_CTRL_SPECIAL_PACKET \n"); -+ pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time(); -+ LPS_Leave(padapter); -+ break; -+ -+ default: -+ break; -+ } -+ -+_func_exit_; -+} -+ -+u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue) -+{ -+ struct cmd_obj *ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ //struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ -+ //if(!pwrctrlpriv->bLeisurePs) -+ // return res; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->iface_type != IFACE_PORT0) -+ return res; -+#endif -+ -+ if(enqueue) -+ { -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = LPS_CTRL_WK_CID; -+ pdrvextra_cmd_parm->type_size = lps_ctrl_type; -+ pdrvextra_cmd_parm->pbuf = NULL; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ } -+ else -+ { -+ lps_ctrl_wk_hdl(padapter, lps_ctrl_type); -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+#endif -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ -+void antenna_select_wk_hdl(_adapter *padapter, u8 antenna) -+{ -+ rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna)); -+} -+ -+u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue) -+{ -+ struct cmd_obj *ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ u8 bSupportAntDiv = _FALSE; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv)); -+ if(_FALSE == bSupportAntDiv ) return res; -+ -+ if(_TRUE == enqueue) -+ { -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = ANT_SELECT_WK_CID; -+ pdrvextra_cmd_parm->type_size = antenna; -+ pdrvextra_cmd_parm->pbuf = NULL; -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ } -+ else{ -+ antenna_select_wk_hdl(padapter,antenna ); -+ } -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+#endif -+ -+void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz); -+void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) -+{ -+ rtw_ps_processor(padapter); -+} -+ -+//add for CONFIG_IEEE80211W, none 11w can use it -+void reset_securitypriv_hdl(_adapter *padapter) -+{ -+ rtw_reset_securitypriv(padapter); -+} -+ -+void free_assoc_resources_hdl(_adapter *padapter) -+{ -+ rtw_free_assoc_resources(padapter, 1); -+} -+ -+#ifdef CONFIG_P2P -+u8 p2p_protocol_wk_cmd(_adapter*padapter, int intCmdType ) -+{ -+ struct cmd_obj *ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ return res; -+ } -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = P2P_PROTO_WK_CID; -+ pdrvextra_cmd_parm->type_size = intCmdType; // As the command tppe. -+ pdrvextra_cmd_parm->pbuf = NULL; // Must be NULL here -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+#endif //CONFIG_P2P -+ -+u8 rtw_ps_cmd(_adapter*padapter) -+{ -+ struct cmd_obj *ppscmd; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ u8 res = _SUCCESS; -+_func_enter_; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->adapter_type != PRIMARY_ADAPTER) -+ goto exit; -+#endif -+ -+ ppscmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ppscmd==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ppscmd, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = POWER_SAVING_CTRL_WK_CID; -+ pdrvextra_cmd_parm->pbuf = NULL; -+ init_h2fwcmd_w_parm_no_rsp(ppscmd, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ppscmd); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+#ifdef CONFIG_AP_MODE -+ -+static void rtw_chk_hi_queue_hdl(_adapter *padapter) -+{ -+ int cnt=0; -+ struct sta_info *psta_bmc; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ psta_bmc = rtw_get_bcmc_stainfo(padapter); -+ if(!psta_bmc) -+ return; -+ -+ -+ if(psta_bmc->sleepq_len==0) -+ { -+ while((rtw_read32(padapter, 0x414)&0x00ffff00)!=0) -+ { -+ rtw_msleep_os(100); -+ -+ cnt++; -+ -+ if(cnt>10) -+ break; -+ } -+ -+ if(cnt<=10) -+ { -+ pstapriv->tim_bitmap &= ~BIT(0); -+ pstapriv->sta_dz_bitmap &= ~BIT(0); -+ -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ } -+ } -+ -+} -+ -+u8 rtw_chk_hi_queue_cmd(_adapter*padapter) -+{ -+ struct cmd_obj *ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = CHECK_HIQ_WK_CID; -+ pdrvextra_cmd_parm->type_size = 0; -+ pdrvextra_cmd_parm->pbuf = NULL; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+ return res; -+ -+} -+#endif -+ -+u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *c2h_evt) -+{ -+ struct cmd_obj *ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if (ph2c == NULL) { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if (pdrvextra_cmd_parm == NULL) { -+ rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj)); -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = C2H_WK_CID; -+ pdrvextra_cmd_parm->type_size = c2h_evt?16:0; -+ pdrvextra_cmd_parm->pbuf = c2h_evt; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+ return res; -+} -+ -+s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter) -+{ -+ s32 ret = _FAIL; -+ u8 buf[16]; -+ -+ if (!c2h_evt) { -+ /* No c2h event in cmd_obj, read c2h event before handling*/ -+ if (c2h_evt_read(adapter, buf) == _SUCCESS) { -+ c2h_evt = (struct c2h_evt_hdr *)buf; -+ -+ if (filter && filter(c2h_evt->id) == _FALSE) -+ goto exit; -+ -+ ret = rtw_hal_c2h_handler(adapter, c2h_evt); -+ } -+ } else { -+ -+ if (filter && filter(c2h_evt->id) == _FALSE) -+ goto exit; -+ -+ ret = rtw_hal_c2h_handler(adapter, c2h_evt); -+ } -+exit: -+ return ret; -+} -+ -+#ifdef CONFIG_C2H_WK -+static void c2h_wk_callback(_workitem *work) -+{ -+ struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk); -+ _adapter *adapter = container_of(evtpriv, _adapter, evtpriv); -+ struct c2h_evt_hdr *c2h_evt; -+ c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); -+ -+ evtpriv->c2h_wk_alive = _TRUE; -+ -+ while (!rtw_cbuf_empty(evtpriv->c2h_queue)) { -+ if ((c2h_evt = (struct c2h_evt_hdr *)rtw_cbuf_pop(evtpriv->c2h_queue)) != NULL) { -+ /* This C2H event is read, clear it */ -+ c2h_evt_clear(adapter); -+ } else if ((c2h_evt = (struct c2h_evt_hdr *)rtw_malloc(16)) != NULL) { -+ /* This C2H event is not read, read & clear now */ -+ if (c2h_evt_read(adapter, (u8*)c2h_evt) != _SUCCESS) -+ continue; -+ } -+ -+ /* Special pointer to trigger c2h_evt_clear only */ -+ if ((void *)c2h_evt == (void *)evtpriv) -+ continue; -+ -+ if (!c2h_evt_exist(c2h_evt)) { -+ rtw_mfree((u8*)c2h_evt, 16); -+ continue; -+ } -+ -+ if (ccx_id_filter(c2h_evt->id) == _TRUE) { -+ /* Handle CCX report here */ -+ rtw_hal_c2h_handler(adapter, c2h_evt); -+ rtw_mfree((u8*)c2h_evt, 16); -+ } else { -+ /* Enqueue into cmd_thread for others */ -+ rtw_c2h_wk_cmd(adapter, (u8 *)c2h_evt); -+ } -+ } -+ -+ evtpriv->c2h_wk_alive = _FALSE; -+} -+#endif -+ -+u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ struct drvextra_cmd_parm *pdrvextra_cmd; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ pdrvextra_cmd = (struct drvextra_cmd_parm*)pbuf; -+ -+ switch(pdrvextra_cmd->ec_id) -+ { -+ case DYNAMIC_CHK_WK_CID: -+ dynamic_chk_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); -+ break; -+ case POWER_SAVING_CTRL_WK_CID: -+ power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); -+ break; -+#ifdef CONFIG_LPS -+ case LPS_CTRL_WK_CID: -+ lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size); -+ break; -+#endif -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ case ANT_SELECT_WK_CID: -+ antenna_select_wk_hdl(padapter, pdrvextra_cmd->type_size); -+ break; -+#endif -+#ifdef CONFIG_P2P_PS -+ case P2P_PS_WK_CID: -+ p2p_ps_wk_hdl(padapter, pdrvextra_cmd->type_size); -+ break; -+#endif // CONFIG_P2P_PS -+ case P2P_PROTO_WK_CID: -+ // Commented by Albert 2011/07/01 -+ // I used the type_size as the type command -+ p2p_protocol_wk_hdl( padapter, pdrvextra_cmd->type_size ); -+ break; -+#ifdef CONFIG_AP_MODE -+ case CHECK_HIQ_WK_CID: -+ rtw_chk_hi_queue_hdl(padapter); -+ break; -+#endif //CONFIG_AP_MODE -+#ifdef CONFIG_INTEL_WIDI -+ case INTEl_WIDI_WK_CID: -+ intel_widi_wk_hdl(padapter, pdrvextra_cmd->type_size, pdrvextra_cmd->pbuf); -+ break; -+#endif //CONFIG_INTEL_WIDI -+ //add for CONFIG_IEEE80211W, none 11w can use it -+ case RESET_SECURITYPRIV: -+ reset_securitypriv_hdl(padapter); -+ break; -+ case FREE_ASSOC_RESOURCES: -+ free_assoc_resources_hdl(padapter); -+ break; -+ case C2H_WK_CID: -+ c2h_evt_hdl(padapter, (struct c2h_evt_hdr *)pdrvextra_cmd->pbuf, NULL); -+ break; -+ -+ default: -+ break; -+ } -+ -+ -+ if(pdrvextra_cmd->pbuf && pdrvextra_cmd->type_size>0) -+ { -+ rtw_mfree(pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); -+ } -+ -+ -+ return H2C_SUCCESS; -+ -+} -+ -+void rtw_survey_cmd_callback(_adapter* padapter , struct cmd_obj *pcmd) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ if(pcmd->res == H2C_DROPPED) -+ { -+ //TODO: cancel timer and do timeout handler directly... -+ //need to make timeout handlerOS independent -+ _set_timer(&pmlmepriv->scan_to_timer, 1); -+ } -+ else if (pcmd->res != H2C_SUCCESS) { -+ _set_timer(&pmlmepriv->scan_to_timer, 1); -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n.")); -+ } -+ -+ // free cmd -+ rtw_free_cmd_obj(pcmd); -+ -+_func_exit_; -+} -+void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ if (pcmd->res != H2C_SUCCESS) -+ { -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ set_fwstate(pmlmepriv, _FW_LINKED); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ***Error: disconnect_cmd_callback Fail ***\n.")); -+ -+ goto exit; -+ } -+#ifdef CONFIG_BR_EXT -+ else //clear bridge database -+ nat25_db_cleanup(padapter); -+#endif //CONFIG_BR_EXT -+ -+ // free cmd -+ rtw_free_cmd_obj(pcmd); -+ -+exit: -+ -+_func_exit_; -+} -+ -+ -+void rtw_joinbss_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ if(pcmd->res == H2C_DROPPED) -+ { -+ //TODO: cancel timer and do timeout handler directly... -+ //need to make timeout handlerOS independent -+ _set_timer(&pmlmepriv->assoc_timer, 1); -+ } -+ else if(pcmd->res != H2C_SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("********Error:rtw_select_and_join_from_scanned_queue Wait Sema Fail ************\n")); -+ _set_timer(&pmlmepriv->assoc_timer, 1); -+ } -+ -+ rtw_free_cmd_obj(pcmd); -+ -+_func_exit_; -+} -+ -+void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd) -+{ -+ _irqL irqL; -+ u8 timer_cancelled; -+ struct sta_info *psta = NULL; -+ struct wlan_network *pwlan = NULL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)pcmd->parmbuf; -+ struct wlan_network *tgt_network = &(pmlmepriv->cur_network); -+ -+_func_enter_; -+ -+ if((pcmd->res != H2C_SUCCESS)) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n.")); -+ _set_timer(&pmlmepriv->assoc_timer, 1 ); -+ } -+ -+ _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); -+ -+#ifdef CONFIG_FW_MLMLE -+ //endian_convert -+ pnetwork->Length = le32_to_cpu(pnetwork->Length); -+ pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength); -+ pnetwork->Privacy =le32_to_cpu(pnetwork->Privacy); -+ pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi); -+ pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse); -+ pnetwork->Configuration.ATIMWindow = le32_to_cpu(pnetwork->Configuration.ATIMWindow); -+ //pnetwork->Configuration.BeaconPeriod = le32_to_cpu(pnetwork->Configuration.BeaconPeriod); -+ pnetwork->Configuration.DSConfig =le32_to_cpu(pnetwork->Configuration.DSConfig); -+ pnetwork->Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->Configuration.FHConfig.DwellTime); -+ pnetwork->Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->Configuration.FHConfig.HopPattern); -+ pnetwork->Configuration.FHConfig.HopSet=le32_to_cpu(pnetwork->Configuration.FHConfig.HopSet); -+ pnetwork->Configuration.FHConfig.Length=le32_to_cpu(pnetwork->Configuration.FHConfig.Length); -+ pnetwork->Configuration.Length = le32_to_cpu(pnetwork->Configuration.Length); -+ pnetwork->InfrastructureMode = le32_to_cpu(pnetwork->InfrastructureMode); -+ pnetwork->IELength = le32_to_cpu(pnetwork->IELength); -+#endif -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) ) -+ { -+ psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->MacAddress); -+ if(!psta) -+ { -+ psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress); -+ if (psta == NULL) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nCan't alloc sta_info when createbss_cmd_callback\n")); -+ goto createbss_cmd_fail ; -+ } -+ } -+ -+ rtw_indicate_connect( padapter); -+ } -+ else -+ { -+ _irqL irqL; -+ -+ pwlan = _rtw_alloc_network(pmlmepriv); -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ if ( pwlan == NULL) -+ { -+ pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); -+ if( pwlan == NULL) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n Error: can't get pwlan in rtw_joinbss_event_callback \n")); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto createbss_cmd_fail; -+ } -+ pwlan->last_scanned = rtw_get_current_time(); -+ } -+ else -+ { -+ rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); -+ } -+ -+ pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork); -+ _rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length); -+ //pwlan->fixed = _TRUE; -+ -+ //rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); -+ -+ // copy pdev_network information to pmlmepriv->cur_network -+ _rtw_memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork))); -+ -+ // reset DSConfig -+ //tgt_network->network.Configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->Configuration.DSConfig); -+ -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ -+#if 0 -+ if((pmlmepriv->fw_state) & WIFI_AP_STATE) -+ { -+ psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress); -+ -+ if (psta == NULL) { // for AP Mode & Adhoc Master Mode -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nCan't alloc sta_info when createbss_cmd_callback\n")); -+ goto createbss_cmd_fail ; -+ } -+ -+ rtw_indicate_connect( padapter); -+ } -+ else { -+ -+ //rtw_indicate_disconnect(dev); -+ } -+#endif -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ // we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) -+ -+ } -+ -+createbss_cmd_fail: -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ rtw_free_cmd_obj(pcmd); -+ -+_func_exit_; -+ -+} -+ -+ -+ -+void rtw_setstaKey_cmdrsp_callback(_adapter* padapter , struct cmd_obj *pcmd) -+{ -+ -+ struct sta_priv * pstapriv = &padapter->stapriv; -+ struct set_stakey_rsp* psetstakey_rsp = (struct set_stakey_rsp*) (pcmd->rsp); -+ struct sta_info* psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr); -+ -+_func_enter_; -+ -+ if(psta==NULL) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info \n\n")); -+ goto exit; -+ } -+ -+ //psta->aid = psta->mac_id = psetstakey_rsp->keyid; //CAM_ID(CAM_ENTRY) -+ -+exit: -+ -+ rtw_free_cmd_obj(pcmd); -+ -+_func_exit_; -+ -+} -+void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) -+{ -+ _irqL irqL; -+ struct sta_priv * pstapriv = &padapter->stapriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct set_assocsta_parm* passocsta_parm = (struct set_assocsta_parm*)(pcmd->parmbuf); -+ struct set_assocsta_rsp* passocsta_rsp = (struct set_assocsta_rsp*) (pcmd->rsp); -+ struct sta_info* psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr); -+ -+_func_enter_; -+ -+ if(psta==NULL) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info \n\n")); -+ goto exit; -+ } -+ -+ psta->aid = psta->mac_id = passocsta_rsp->cam_id; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE)) -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ -+ set_fwstate(pmlmepriv, _FW_LINKED); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+exit: -+ rtw_free_cmd_obj(pcmd); -+ -+_func_exit_; -+} -+ -+void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd); -+void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) -+{ -+_func_enter_; -+ -+ rtw_free_cmd_obj(pcmd); -+#ifdef CONFIG_MP_INCLUDED -+ padapter->mppriv.workparam.bcompleted=_TRUE; -+#endif -+ -+_func_exit_; -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c -@@ -0,0 +1,1337 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_DEBUG_C_ -+ -+ -+#include -+#include <../hal/dm.h> -+ -+//#ifdef CONFIG_DEBUG_RTL871X -+ -+ u32 GlobalDebugLevel = _drv_err_; -+ -+ u64 GlobalDebugComponents = \ -+ _module_rtl871x_xmit_c_ | -+ _module_xmit_osdep_c_ | -+ _module_rtl871x_recv_c_ | -+ _module_recv_osdep_c_ | -+ _module_rtl871x_mlme_c_ | -+ _module_mlme_osdep_c_ | -+ _module_rtl871x_sta_mgt_c_ | -+ _module_rtl871x_cmd_c_ | -+ _module_cmd_osdep_c_ | -+ _module_rtl871x_io_c_ | -+ _module_io_osdep_c_ | -+ _module_os_intfs_c_| -+ _module_rtl871x_security_c_| -+ _module_rtl871x_eeprom_c_| -+ _module_hal_init_c_| -+ _module_hci_hal_init_c_| -+ _module_rtl871x_ioctl_c_| -+ _module_rtl871x_ioctl_set_c_| -+ _module_rtl871x_ioctl_query_c_| -+ _module_rtl871x_pwrctrl_c_| -+ _module_hci_intfs_c_| -+ _module_hci_ops_c_| -+ _module_hci_ops_os_c_| -+ _module_rtl871x_ioctl_os_c| -+ _module_rtl8712_cmd_c_| -+ _module_hal_xmit_c_| -+ _module_rtl8712_recv_c_ | -+ _module_mp_ | -+ _module_efuse_; -+ -+//#endif -+ -+#ifdef CONFIG_PROC_DEBUG -+#include -+ -+int proc_get_drv_version(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "%s\n", DRIVERVERSION); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_log_level(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, -+ "log_level:%d\n", -+ GlobalDebugLevel -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_log_level(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ char tmp[32]; -+ u32 is_signal_dbg; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%d ", &is_signal_dbg); -+ -+ if( is_signal_dbg >= 0 && is_signal_dbg < 10 ) -+ { -+ GlobalDebugLevel= is_signal_dbg; -+ printk("%d\n", GlobalDebugLevel); -+ } -+ } -+ -+ return count; -+ -+} -+ -+#ifdef DBG_MEM_ALLOC -+int proc_get_mstat(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ int len = 0; -+ -+ len += _rtw_mstat_dump(page+len, count-len); -+ *eof = 1; -+ -+ return len; -+} -+#endif /* DBG_MEM_ALLOC */ -+ -+int proc_get_write_reg(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ *eof = 1; -+ return 0; -+} -+ -+int proc_set_write_reg(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ char tmp[32]; -+ u32 addr, val, len; -+ -+ if (count < 3) -+ { -+ DBG_871X("argument size is less than 3\n"); -+ return -EFAULT; -+ } -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%x %x %x", &addr, &val, &len); -+ -+ if (num != 3) { -+ DBG_871X("invalid write_reg parameter!\n"); -+ return count; -+ } -+ -+ switch(len) -+ { -+ case 1: -+ rtw_write8(padapter, addr, (u8)val); -+ break; -+ case 2: -+ rtw_write16(padapter, addr, (u16)val); -+ break; -+ case 4: -+ rtw_write32(padapter, addr, val); -+ break; -+ default: -+ DBG_871X("error write length=%d", len); -+ break; -+ } -+ -+ } -+ -+ return count; -+ -+} -+ -+static u32 proc_get_read_addr=0xeeeeeeee; -+static u32 proc_get_read_len=0x4; -+ -+int proc_get_read_reg(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ int len = 0; -+ -+ if(proc_get_read_addr==0xeeeeeeee) -+ { -+ *eof = 1; -+ return len; -+ } -+ -+ switch(proc_get_read_len) -+ { -+ case 1: -+ len += snprintf(page + len, count - len, "rtw_read8(0x%x)=0x%x\n", proc_get_read_addr, rtw_read8(padapter, proc_get_read_addr)); -+ break; -+ case 2: -+ len += snprintf(page + len, count - len, "rtw_read16(0x%x)=0x%x\n", proc_get_read_addr, rtw_read16(padapter, proc_get_read_addr)); -+ break; -+ case 4: -+ len += snprintf(page + len, count - len, "rtw_read32(0x%x)=0x%x\n", proc_get_read_addr, rtw_read32(padapter, proc_get_read_addr)); -+ break; -+ default: -+ len += snprintf(page + len, count - len, "error read length=%d\n", proc_get_read_len); -+ break; -+ } -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_set_read_reg(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ char tmp[16]; -+ u32 addr, len; -+ -+ if (count < 2) -+ { -+ DBG_871X("argument size is less than 2\n"); -+ return -EFAULT; -+ } -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%x %x", &addr, &len); -+ -+ if (num != 2) { -+ DBG_871X("invalid read_reg parameter!\n"); -+ return count; -+ } -+ -+ proc_get_read_addr = addr; -+ -+ proc_get_read_len = len; -+ } -+ -+ return count; -+ -+} -+ -+int proc_get_fwstate(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "fwstate=0x%x\n", get_fwstate(pmlmepriv)); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_sec_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n", -+ psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm, -+ psecuritypriv->ndisauthtype, psecuritypriv->ndisencryptstatus); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_mlmext_state(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "pmlmeinfo->state=0x%x\n", pmlmeinfo->state); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_qos_option(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "qos_option=%d\n", pmlmepriv->qospriv.qos_option); -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_get_ht_option(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "ht_option=%d\n", pmlmepriv->htpriv.ht_option); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_rf_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "cur_ch=%d, cur_bw=%d, cur_ch_offet=%d\n" -+ "oper_ch=%d, oper_bw=%d, oper_ch_offet=%d\n", -+ pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset, -+ rtw_get_oper_ch(padapter), rtw_get_oper_bw(padapter), rtw_get_oper_choffset(padapter)); -+ *eof = 1; -+ -+ return len; -+} -+ -+int proc_get_ap_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct sta_info *psta; -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ int len = 0; -+ -+ psta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress); -+ if(psta) -+ { -+ int i; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ -+ len += snprintf(page + len, count - len, "SSID=%s\n", cur_network->network.Ssid.Ssid); -+ len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); -+ len += snprintf(page + len, count - len, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); -+ len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); -+ len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate); -+ len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); -+ len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi); -+ len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable); -+ len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap); -+ -+ for(i=0;i<16;i++) -+ { -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ if(preorder_ctrl->enable) -+ { -+ len += snprintf(page + len, count - len, "tid=%d, indicate_seq=%d\n", i, preorder_ctrl->indicate_seq); -+ } -+ } -+ -+ } -+ else -+ { -+ len += snprintf(page + len, count - len, "can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress)); -+ } -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_get_adapter_state(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n", -+ padapter->bSurpriseRemoved, padapter->bDriverStopped); -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_get_trx_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ int i; -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); -+ struct hw_xmit *phwxmit; -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "free_xmitbuf_cnt=%d, free_xmitframe_cnt=%d" -+ ", free_ext_xmitbuf_cnt=%d, free_xframe_ext_cnt=%d" -+ ", free_recvframe_cnt=%d\n", -+ pxmitpriv->free_xmitbuf_cnt, pxmitpriv->free_xmitframe_cnt, -+ pxmitpriv->free_xmit_extbuf_cnt, pxmitpriv->free_xframe_ext_cnt, -+ precvpriv->free_recvframe_cnt); -+#ifdef CONFIG_USB_HCI -+ len += snprintf(page + len, count - len, "rx_urb_pending_cnt=%d\n", precvpriv->rx_pending_cnt); -+#endif -+ -+ len += snprintf(page + len, count - len, "recvbuf_skb_alloc_fail_cnt=%d\n", precvpriv->recvbuf_skb_alloc_fail_cnt); -+ len += snprintf(page + len, count - len, "recvbuf_null_cnt=%d\n", precvpriv->recvbuf_null_cnt); -+ len += snprintf(page + len, count - len, "read_port_complete_EINPROGRESS_cnt=%d\n", precvpriv->read_port_complete_EINPROGRESS_cnt); -+ len += snprintf(page + len, count - len, "read_port_complete_other_urb_err_cnt=%d\n", precvpriv->read_port_complete_other_urb_err_cnt); -+ len += snprintf(page + len, count - len, "hw_init_completed=%d\n", padapter->hw_init_completed); -+#ifdef CONFIG_USB_HCI -+ len += snprintf(page + len, count - len, "continual_urb_error=%d\n", atomic_read(&pdvobj->continual_urb_error)); -+#endif -+ -+ for(i = 0; i < 4; i++) -+ { -+ phwxmit = pxmitpriv->hwxmits + i; -+ len += snprintf(page + len, count - len, "%d, hwq.accnt=%d\n", i, phwxmit->accnt); -+ } -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+ -+ -+int proc_get_mac_reg_dump1(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1; -+ -+ len += snprintf(page + len, count - len, "\n======= MAC REG =======\n"); -+ -+ for(i=0x0;i<0x300;i+=4) -+ { -+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); -+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); -+ } -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_get_mac_reg_dump2(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1; -+ -+ len += snprintf(page + len, count - len, "\n======= MAC REG =======\n"); -+ memset(page, 0, count); -+ for(i=0x300;i<0x600;i+=4) -+ { -+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); -+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); -+ } -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_get_mac_reg_dump3(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1; -+ -+ len += snprintf(page + len, count - len, "\n======= MAC REG =======\n"); -+ -+ for(i=0x600;i<0x800;i+=4) -+ { -+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); -+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); -+ } -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_get_bb_reg_dump1(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1; -+ -+ len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); -+ for(i=0x800;i<0xB00;i+=4) -+ { -+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); -+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); -+ } -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_bb_reg_dump2(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1; -+ -+ len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); -+ for(i=0xB00;i<0xE00;i+=4) -+ { -+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); -+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); -+ } -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_bb_reg_dump3(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1; -+ -+ len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); -+ for(i=0xE00;i<0x1000;i+=4) -+ { -+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i); -+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n"); -+ } -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_rf_reg_dump1(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1,path; -+ u32 value; -+ -+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); -+ path = 1; -+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path); -+ for(i=0;i<0xC0;i++) -+ { -+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord); -+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff); -+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i); -+ len += snprintf(page + len, count - len, " 0x%08x ",value); -+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n"); -+ } -+ -+ *eof = 1; -+ return len; -+} -+ -+ -+int proc_get_rf_reg_dump2(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1,path; -+ u32 value; -+ -+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); -+ path = 1; -+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path); -+ for(i=0xC0;i<0x100;i++) -+ { -+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord); -+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff); -+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i); -+ len += snprintf(page + len, count - len, " 0x%08x ",value); -+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n"); -+ } -+ *eof = 1; -+ return len; -+} -+ -+ -+int proc_get_rf_reg_dump3(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1,path; -+ u32 value; -+ -+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); -+ path = 2; -+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path); -+ for(i=0;i<0xC0;i++) -+ { -+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord); -+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff); -+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i); -+ len += snprintf(page + len, count - len, " 0x%08x ",value); -+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n"); -+ } -+ -+ *eof = 1; -+ return len; -+} -+ -+ -+int proc_get_rf_reg_dump4(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ int i,j=1,path; -+ u32 value; -+ -+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); -+ path = 2; -+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path); -+ for(i=0xC0;i<0x100;i++) -+ { -+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord); -+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff); -+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i); -+ len += snprintf(page + len, count - len, " 0x%08x ",value); -+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n"); -+ } -+ *eof = 1; -+ return len; -+} -+ -+ -+ -+int proc_get_rx_signal(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, -+ "rssi:%d\n" -+ "rxpwdb:%d\n" -+ "signal_strength:%u\n" -+ "signal_qual:%u\n" -+ "noise:%u\n", -+ padapter->recvpriv.rssi, -+ padapter->recvpriv.rxpwdb, -+ padapter->recvpriv.signal_strength, -+ padapter->recvpriv.signal_qual, -+ padapter->recvpriv.noise -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_rx_signal(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ char tmp[32]; -+ u32 is_signal_dbg, signal_strength; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%u %u", &is_signal_dbg, &signal_strength); -+ -+ is_signal_dbg = is_signal_dbg==0?0:1; -+ -+ if(is_signal_dbg && num!=2) -+ return count; -+ -+ signal_strength = signal_strength>100?100:signal_strength; -+ signal_strength = signal_strength<0?0:signal_strength; -+ -+ padapter->recvpriv.is_signal_dbg = is_signal_dbg; -+ padapter->recvpriv.signal_strength_dbg=signal_strength; -+ -+ if(is_signal_dbg) -+ DBG_871X("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength); -+ else -+ DBG_871X("set %s\n", "HW_SIGNAL_STRENGTH"); -+ -+ } -+ -+ return count; -+ -+} -+ -+int proc_get_ht_enable(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ -+ int len = 0; -+ -+ if(pregpriv) -+ len += snprintf(page + len, count - len, -+ "%d\n", -+ pregpriv->ht_enable -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_ht_enable(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ char tmp[32]; -+ u32 mode; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%d ", &mode); -+ -+ if( pregpriv && mode >= 0 && mode < 2 ) -+ { -+ pregpriv->ht_enable= mode; -+ printk("ht_enable=%d\n", pregpriv->ht_enable); -+ } -+ } -+ -+ return count; -+ -+} -+ -+ -+int proc_get_cbw40_enable(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ -+ int len = 0; -+ -+ if(pregpriv) -+ len += snprintf(page + len, count - len, -+ "%d\n", -+ pregpriv->cbw40_enable -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_cbw40_enable(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ char tmp[32]; -+ u32 mode; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%d ", &mode); -+ -+ if( pregpriv && mode >= 0 && mode < 2 ) -+ { -+ pregpriv->cbw40_enable= mode; -+ printk("cbw40_enable=%d\n", mode); -+ } -+ } -+ -+ return count; -+ -+} -+ -+int proc_get_ampdu_enable(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ -+ int len = 0; -+ -+ if(pregpriv) -+ len += snprintf(page + len, count - len, -+ "%d\n", -+ pregpriv->ampdu_enable -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_ampdu_enable(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ char tmp[32]; -+ u32 mode; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%d ", &mode); -+ -+ if( pregpriv && mode >= 0 && mode < 3 ) -+ { -+ pregpriv->ampdu_enable= mode; -+ printk("ampdu_enable=%d\n", mode); -+ } -+ } -+ -+ return count; -+ -+} -+ -+ -+int proc_get_two_path_rssi(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ int len = 0; -+ -+ if(padapter) -+ len += snprintf(page + len, count - len, -+ "%d %d\n", -+ padapter->recvpriv.RxRssi[0], -+ padapter->recvpriv.RxRssi[1] -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_rx_stbc(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ -+ int len = 0; -+ -+ if(pregpriv) -+ len += snprintf(page + len, count - len, -+ "%d\n", -+ pregpriv->rx_stbc -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_rx_stbc(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ char tmp[32]; -+ u32 mode; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%d ", &mode); -+ -+ if( pregpriv && (mode == 0 || mode == 1|| mode == 2|| mode == 3)) -+ { -+ pregpriv->rx_stbc= mode; -+ printk("rx_stbc=%d\n", mode); -+ } -+ } -+ -+ return count; -+ -+} -+ -+int proc_get_vid(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u16 VID=0; -+ int len = 0; -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_VID, (u8 *)&VID); -+ len += snprintf(page + len, count - len, -+ "%04x\n", -+ VID -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_pid(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u16 PID=0; -+ int len = 0; -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_PID, (u8 *)&PID); -+ len += snprintf(page + len, count - len, -+ "%04x\n", -+ PID -+ ); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_get_rssi_disp(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ *eof = 1; -+ return 0; -+} -+ -+int proc_set_rssi_disp(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ char tmp[32]; -+ u32 enable=0; -+ -+ if (count < 1) -+ { -+ DBG_8192C("argument size is less than 1\n"); -+ return -EFAULT; -+ } -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%x", &enable); -+ -+ if (num != 1) { -+ DBG_8192C("invalid set_rssi_disp parameter!\n"); -+ return count; -+ } -+ -+ if(enable) -+ { -+ DBG_8192C("Turn On Rx RSSI Display Function\n"); -+ padapter->bRxRSSIDisplay = enable ; -+ } -+ else -+ { -+ DBG_8192C("Turn Off Rx RSSI Display Function\n"); -+ padapter->bRxRSSIDisplay = 0 ; -+ } -+ -+ } -+ -+ return count; -+ -+} -+ -+ -+#ifdef CONFIG_AP_MODE -+ -+int proc_get_all_sta_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ _irqL irqL; -+ struct sta_info *psta; -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ int i, j; -+ _list *plist, *phead; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ int len = 0; -+ -+ -+ len += snprintf(page + len, count - len, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap); -+ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(i=0; i< NUM_STA; i++) -+ { -+ phead = &(pstapriv->sta_hash[i]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); -+ -+ plist = get_next(plist); -+ -+ //if(extra_arg == psta->aid) -+ { -+ len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); -+ len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); -+ len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate); -+ len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); -+ len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi); -+ len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable); -+ len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap); -+ len += snprintf(page + len, count - len, "sleepq_len=%d\n", psta->sleepq_len); -+ len += snprintf(page + len, count - len, "capability=0x%x\n", psta->capability); -+ len += snprintf(page + len, count - len, "flags=0x%x\n", psta->flags); -+ len += snprintf(page + len, count - len, "wpa_psk=0x%x\n", psta->wpa_psk); -+ len += snprintf(page + len, count - len, "wpa2_group_cipher=0x%x\n", psta->wpa2_group_cipher); -+ len += snprintf(page + len, count - len, "wpa2_pairwise_cipher=0x%x\n", psta->wpa2_pairwise_cipher); -+ len += snprintf(page + len, count - len, "qos_info=0x%x\n", psta->qos_info); -+ len += snprintf(page + len, count - len, "dot118021XPrivacy=0x%x\n", psta->dot118021XPrivacy); -+ -+ for(j=0;j<16;j++) -+ { -+ preorder_ctrl = &psta->recvreorder_ctrl[j]; -+ if(preorder_ctrl->enable) -+ { -+ len += snprintf(page + len, count - len, "tid=%d, indicate_seq=%d\n", j, preorder_ctrl->indicate_seq); -+ } -+ } -+ -+ } -+ -+ } -+ -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+#include -+extern atomic_t _malloc_cnt;; -+extern atomic_t _malloc_size;; -+ -+int proc_get_malloc_cnt(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ -+ int len = 0; -+ -+ len += snprintf(page + len, count - len, "_malloc_cnt=%d\n", atomic_read(&_malloc_cnt)); -+ len += snprintf(page + len, count - len, "_malloc_size=%d\n", atomic_read(&_malloc_size)); -+ -+ *eof = 1; -+ return len; -+} -+#endif /* DBG_MEMORY_LEAK */ -+ -+#ifdef CONFIG_FIND_BEST_CHANNEL -+int proc_get_best_channel(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ int len = 0; -+ u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0; -+ -+ for (i=0; pmlmeext->channel_set[i].ChannelNum !=0; i++) { -+ if ( pmlmeext->channel_set[i].ChannelNum == 1) -+ index_24G = i; -+ if ( pmlmeext->channel_set[i].ChannelNum == 36) -+ index_5G = i; -+ } -+ -+ for (i=0; pmlmeext->channel_set[i].ChannelNum !=0; i++) { -+ // 2.4G -+ if ( pmlmeext->channel_set[i].ChannelNum == 6 ) { -+ if ( pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_24G].rx_count ) { -+ index_24G = i; -+ best_channel_24G = pmlmeext->channel_set[i].ChannelNum; -+ } -+ } -+ -+ // 5G -+ if ( pmlmeext->channel_set[i].ChannelNum >= 36 -+ && pmlmeext->channel_set[i].ChannelNum < 140 ) { -+ // Find primary channel -+ if ( (( pmlmeext->channel_set[i].ChannelNum - 36) % 8 == 0) -+ && (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count) ) { -+ index_5G = i; -+ best_channel_5G = pmlmeext->channel_set[i].ChannelNum; -+ } -+ } -+ -+ if ( pmlmeext->channel_set[i].ChannelNum >= 149 -+ && pmlmeext->channel_set[i].ChannelNum < 165) { -+ // find primary channel -+ if ( (( pmlmeext->channel_set[i].ChannelNum - 149) % 8 == 0) -+ && (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_5G].rx_count) ) { -+ index_5G = i; -+ best_channel_5G = pmlmeext->channel_set[i].ChannelNum; -+ } -+ } -+#if 1 // debug -+ len += snprintf(page + len, count - len, "The rx cnt of channel %3d = %d\n", -+ pmlmeext->channel_set[i].ChannelNum, pmlmeext->channel_set[i].rx_count); -+#endif -+ } -+ -+ len += snprintf(page + len, count - len, "best_channel_5G = %d\n", best_channel_5G); -+ len += snprintf(page + len, count - len, "best_channel_24G = %d\n", best_channel_24G); -+ -+ *eof = 1; -+ return len; -+ -+} -+ -+int proc_set_best_channel(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ char tmp[32]; -+ -+ if(count < 1) -+ return -EFAULT; -+ -+ if(buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) -+ { -+ int i; -+ for(i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) -+ { -+ pmlmeext->channel_set[i].rx_count = 0; -+ } -+ -+ DBG_871X("set %s\n", "Clean Best Channel Count"); -+ } -+ -+ return count; -+} -+#endif /* CONFIG_FIND_BEST_CHANNEL */ -+ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+#include -+int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ int len = 0; -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_sreset(struct file *file, const char *buffer, unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ char tmp[32]; -+ s32 trigger_point; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%d", &trigger_point); -+ -+ if (trigger_point == SRESET_TGP_NULL) -+ rtw_hal_sreset_reset(padapter); -+ else -+ sreset_set_trigger_point(padapter, trigger_point); -+ } -+ -+ return count; -+ -+} -+#endif /* DBG_CONFIG_ERROR_DETECT */ -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+int proc_get_dm_adaptivity(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data) -+{ -+ struct net_device *dev = data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ int len = 0; -+ -+ len += dm_adaptivity_get_parm_str(padapter, page, count); -+ -+ *eof = 1; -+ return len; -+} -+ -+int proc_set_dm_adaptivity(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct net_device *dev = (struct net_device *)data; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ char tmp[32]; -+ u32 TH_L2H_ini; -+ s8 TH_EDCCA_HL_diff; -+ u32 IGI_Base; -+ int ForceEDCCA; -+ u8 AdapEn_RSSI; -+ u8 IGI_LowerBound; -+ -+ if (count < 1) -+ return -EFAULT; -+ -+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { -+ -+ int num = sscanf(tmp, "%x %hhd %x %d %hhu %hhu", -+ &TH_L2H_ini, &TH_EDCCA_HL_diff, &IGI_Base, &ForceEDCCA, &AdapEn_RSSI, &IGI_LowerBound); -+ -+ if (num != 6) -+ return count; -+ -+ dm_adaptivity_set_parm(padapter, (s8)TH_L2H_ini, TH_EDCCA_HL_diff, (s8)IGI_Base, (bool)ForceEDCCA, AdapEn_RSSI, IGI_LowerBound); -+ } -+ -+ return count; -+} -+#endif /* CONFIG_DM_ADAPTIVITY */ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c -@@ -0,0 +1,423 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_EEPROM_C_ -+ -+#include -+#include -+#include -+ -+void up_clk(_adapter* padapter, u16 *x) -+{ -+_func_enter_; -+ *x = *x | _EESK; -+ rtw_write8(padapter, EE_9346CR, (u8)*x); -+ rtw_udelay_os(CLOCK_RATE); -+ -+_func_exit_; -+ -+} -+ -+void down_clk(_adapter * padapter, u16 *x ) -+{ -+_func_enter_; -+ *x = *x & ~_EESK; -+ rtw_write8(padapter, EE_9346CR, (u8)*x); -+ rtw_udelay_os(CLOCK_RATE); -+_func_exit_; -+} -+ -+void shift_out_bits(_adapter * padapter, u16 data, u16 count) -+{ -+ u16 x,mask; -+_func_enter_; -+ -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ mask = 0x01 << (count - 1); -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ x &= ~(_EEDO | _EEDI); -+ -+ do -+ { -+ x &= ~_EEDI; -+ if(data & mask) -+ x |= _EEDI; -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ rtw_write8(padapter, EE_9346CR, (u8)x); -+ rtw_udelay_os(CLOCK_RATE); -+ up_clk(padapter, &x); -+ down_clk(padapter, &x); -+ mask = mask >> 1; -+ } while(mask); -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ x &= ~_EEDI; -+ rtw_write8(padapter, EE_9346CR, (u8)x); -+out: -+_func_exit_; -+} -+ -+u16 shift_in_bits (_adapter * padapter) -+{ -+ u16 x,d=0,i; -+_func_enter_; -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ x &= ~( _EEDO | _EEDI); -+ d = 0; -+ -+ for(i=0; i<16; i++) -+ { -+ d = d << 1; -+ up_clk(padapter, &x); -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ x &= ~(_EEDI); -+ if(x & _EEDO) -+ d |= 1; -+ -+ down_clk(padapter, &x); -+ } -+out: -+_func_exit_; -+ -+ return d; -+} -+ -+void standby(_adapter * padapter ) -+{ -+ u8 x; -+_func_enter_; -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ x &= ~(_EECS | _EESK); -+ rtw_write8(padapter, EE_9346CR,x); -+ -+ rtw_udelay_os(CLOCK_RATE); -+ x |= _EECS; -+ rtw_write8(padapter, EE_9346CR, x); -+ rtw_udelay_os(CLOCK_RATE); -+_func_exit_; -+} -+ -+u16 wait_eeprom_cmd_done(_adapter* padapter) -+{ -+ u8 x; -+ u16 i,res=_FALSE; -+_func_enter_; -+ standby(padapter ); -+ for (i=0; i<200; i++) -+ { -+ x = rtw_read8(padapter, EE_9346CR); -+ if (x & _EEDO){ -+ res=_TRUE; -+ goto exit; -+ } -+ rtw_udelay_os(CLOCK_RATE); -+ } -+exit: -+_func_exit_; -+ return res; -+} -+ -+void eeprom_clean(_adapter * padapter) -+{ -+ u16 x; -+_func_enter_; -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ x = rtw_read8(padapter, EE_9346CR); -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ x &= ~(_EECS | _EEDI); -+ rtw_write8(padapter, EE_9346CR, (u8)x); -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ up_clk(padapter, &x); -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ down_clk(padapter, &x); -+out: -+_func_exit_; -+} -+ -+void eeprom_write16(_adapter * padapter, u16 reg, u16 data) -+{ -+ u8 x; -+#ifdef CONFIG_RTL8712 -+ u8 tmp8_ori,tmp8_new,tmp8_clk_ori,tmp8_clk_new; -+ tmp8_ori=rtw_read8(padapter, 0x102502f1); -+ tmp8_new=tmp8_ori & 0xf7; -+ if(tmp8_ori != tmp8_new){ -+ rtw_write8(padapter, 0x102502f1, tmp8_new); -+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n")); -+ } -+ tmp8_clk_ori=rtw_read8(padapter,0x10250003); -+ tmp8_clk_new=tmp8_clk_ori|0x20; -+ if(tmp8_clk_new!=tmp8_clk_ori){ -+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n")); -+ rtw_write8(padapter, 0x10250003, tmp8_clk_new); -+ } -+#endif -+_func_enter_; -+ -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ x &= ~(_EEDI | _EEDO | _EESK | _EEM0); -+ x |= _EEM1 | _EECS; -+ rtw_write8(padapter, EE_9346CR, x); -+ -+ shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5); -+ -+ if(padapter->EepromAddressSize==8) //CF+ and SDIO -+ shift_out_bits(padapter, 0, 6); -+ else //USB -+ shift_out_bits(padapter, 0, 4); -+ -+ standby( padapter); -+ -+// Commented out by rcnjko, 2004.0 -+// // Erase this particular word. Write the erase opcode and register -+// // number in that order. The opcode is 3bits in length; reg is 6 bits long. -+// shift_out_bits(Adapter, EEPROM_ERASE_OPCODE, 3); -+// shift_out_bits(Adapter, reg, Adapter->EepromAddressSize); -+// -+// if (wait_eeprom_cmd_done(Adapter ) == FALSE) -+// { -+// return; -+// } -+ -+ -+ standby(padapter ); -+ -+ // write the new word to the EEPROM -+ -+ // send the write opcode the EEPORM -+ shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3); -+ -+ // select which word in the EEPROM that we are writing to. -+ shift_out_bits(padapter, reg, padapter->EepromAddressSize); -+ -+ // write the data to the selected EEPROM word. -+ shift_out_bits(padapter, data, 16); -+ -+ if (wait_eeprom_cmd_done(padapter ) == _FALSE) -+ { -+ -+ goto exit; -+ } -+ -+ standby(padapter ); -+ -+ shift_out_bits(padapter, EEPROM_EWDS_OPCODE, 5); -+ shift_out_bits(padapter, reg, 4); -+ -+ eeprom_clean(padapter ); -+exit: -+#ifdef CONFIG_RTL8712 -+ if(tmp8_clk_new!=tmp8_clk_ori) -+ rtw_write8(padapter, 0x10250003, tmp8_clk_ori); -+ if(tmp8_new!=tmp8_ori) -+ rtw_write8(padapter, 0x102502f1, tmp8_ori); -+ -+#endif -+_func_exit_; -+ return; -+} -+ -+u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom -+{ -+ -+ u16 x; -+ u16 data=0; -+#ifdef CONFIG_RTL8712 -+ u8 tmp8_ori,tmp8_new,tmp8_clk_ori,tmp8_clk_new; -+ tmp8_ori= rtw_read8(padapter, 0x102502f1); -+ tmp8_new = tmp8_ori & 0xf7; -+ if(tmp8_ori != tmp8_new){ -+ rtw_write8(padapter, 0x102502f1, tmp8_new); -+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n")); -+ } -+ tmp8_clk_ori=rtw_read8(padapter,0x10250003); -+ tmp8_clk_new=tmp8_clk_ori|0x20; -+ if(tmp8_clk_new!=tmp8_clk_ori){ -+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n")); -+ rtw_write8(padapter, 0x10250003, tmp8_clk_new); -+ } -+#endif -+_func_enter_; -+ -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ // select EEPROM, reset bits, set _EECS -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ -+ x &= ~(_EEDI | _EEDO | _EESK | _EEM0); -+ x |= _EEM1 | _EECS; -+ rtw_write8(padapter, EE_9346CR, (unsigned char)x); -+ -+ // write the read opcode and register number in that order -+ // The opcode is 3bits in length, reg is 6 bits long -+ shift_out_bits(padapter, EEPROM_READ_OPCODE, 3); -+ shift_out_bits(padapter, reg, padapter->EepromAddressSize); -+ -+ // Now read the data (16 bits) in from the selected EEPROM word -+ data = shift_in_bits(padapter); -+ -+ eeprom_clean(padapter); -+out: -+#ifdef CONFIG_RTL8712 -+ if(tmp8_clk_new!=tmp8_clk_ori) -+ rtw_write8(padapter, 0x10250003, tmp8_clk_ori); -+ if(tmp8_new!=tmp8_ori) -+ rtw_write8(padapter, 0x102502f1, tmp8_ori); -+ -+#endif -+_func_exit_; -+ return data; -+ -+ -+} -+ -+ -+ -+ -+//From even offset -+void eeprom_read_sz(_adapter * padapter, u16 reg, u8* data, u32 sz) -+{ -+ -+ u16 x, data16; -+ u32 i; -+_func_enter_; -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ // select EEPROM, reset bits, set _EECS -+ x = rtw_read8(padapter, EE_9346CR); -+ -+ if(padapter->bSurpriseRemoved==_TRUE){ -+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE")); -+ goto out; -+ } -+ -+ x &= ~(_EEDI | _EEDO | _EESK | _EEM0); -+ x |= _EEM1 | _EECS; -+ rtw_write8(padapter, EE_9346CR, (unsigned char)x); -+ -+ // write the read opcode and register number in that order -+ // The opcode is 3bits in length, reg is 6 bits long -+ shift_out_bits(padapter, EEPROM_READ_OPCODE, 3); -+ shift_out_bits(padapter, reg, padapter->EepromAddressSize); -+ -+ -+ for(i=0; i>8; -+ } -+ -+ eeprom_clean(padapter); -+out: -+_func_exit_; -+ -+ -+ -+} -+ -+ -+//addr_off : address offset of the entry in eeprom (not the tuple number of eeprom (reg); that is addr_off !=reg) -+u8 eeprom_read(_adapter * padapter, u32 addr_off, u8 sz, u8* rbuf) -+{ -+ u8 quotient, remainder, addr_2align_odd; -+ u16 reg, stmp , i=0, idx = 0; -+_func_enter_; -+ reg = (u16)(addr_off >> 1); -+ addr_2align_odd = (u8)(addr_off & 0x1); -+ -+ if(addr_2align_odd) //read that start at high part: e.g 1,3,5,7,9,... -+ { -+ stmp = eeprom_read16(padapter, reg); -+ rbuf[idx++] = (u8) ((stmp>>8)&0xff); //return hogh-part of the short -+ reg++; sz--; -+ } -+ -+ quotient = sz >> 1; -+ remainder = sz & 0x1; -+ -+ for( i=0 ; i < quotient; i++) -+ { -+ stmp = eeprom_read16(padapter, reg+i); -+ rbuf[idx++] = (u8) (stmp&0xff); -+ rbuf[idx++] = (u8) ((stmp>>8)&0xff); -+ } -+ -+ reg = reg+i; -+ if(remainder){ //end of read at lower part of short : 0,2,4,6,... -+ stmp = eeprom_read16(padapter, reg); -+ rbuf[idx] = (u8)(stmp & 0xff); -+ } -+_func_exit_; -+ return _TRUE; -+} -+ -+ -+ -+VOID read_eeprom_content(_adapter * padapter) -+{ -+ -+_func_enter_; -+ -+ -+_func_exit_; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c -@@ -0,0 +1,1916 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _IEEE80211_C -+ -+#include -+#include -+#include -+#include -+#include -+ -+u8 RTW_WPA_OUI_TYPE[] = { 0x00, 0x50, 0xf2, 1 }; -+u16 RTW_WPA_VERSION = 1; -+u8 WPA_AUTH_KEY_MGMT_NONE[] = { 0x00, 0x50, 0xf2, 0 }; -+u8 WPA_AUTH_KEY_MGMT_UNSPEC_802_1X[] = { 0x00, 0x50, 0xf2, 1 }; -+u8 WPA_AUTH_KEY_MGMT_PSK_OVER_802_1X[] = { 0x00, 0x50, 0xf2, 2 }; -+u8 WPA_CIPHER_SUITE_NONE[] = { 0x00, 0x50, 0xf2, 0 }; -+u8 WPA_CIPHER_SUITE_WEP40[] = { 0x00, 0x50, 0xf2, 1 }; -+u8 WPA_CIPHER_SUITE_TKIP[] = { 0x00, 0x50, 0xf2, 2 }; -+u8 WPA_CIPHER_SUITE_WRAP[] = { 0x00, 0x50, 0xf2, 3 }; -+u8 WPA_CIPHER_SUITE_CCMP[] = { 0x00, 0x50, 0xf2, 4 }; -+u8 WPA_CIPHER_SUITE_WEP104[] = { 0x00, 0x50, 0xf2, 5 }; -+ -+u16 RSN_VERSION_BSD = 1; -+u8 RSN_AUTH_KEY_MGMT_UNSPEC_802_1X[] = { 0x00, 0x0f, 0xac, 1 }; -+u8 RSN_AUTH_KEY_MGMT_PSK_OVER_802_1X[] = { 0x00, 0x0f, 0xac, 2 }; -+u8 RSN_CIPHER_SUITE_NONE[] = { 0x00, 0x0f, 0xac, 0 }; -+u8 RSN_CIPHER_SUITE_WEP40[] = { 0x00, 0x0f, 0xac, 1 }; -+u8 RSN_CIPHER_SUITE_TKIP[] = { 0x00, 0x0f, 0xac, 2 }; -+u8 RSN_CIPHER_SUITE_WRAP[] = { 0x00, 0x0f, 0xac, 3 }; -+u8 RSN_CIPHER_SUITE_CCMP[] = { 0x00, 0x0f, 0xac, 4 }; -+u8 RSN_CIPHER_SUITE_WEP104[] = { 0x00, 0x0f, 0xac, 5 }; -+//----------------------------------------------------------- -+// for adhoc-master to generate ie and provide supported-rate to fw -+//----------------------------------------------------------- -+ -+static u8 WIFI_CCKRATES[] = -+{(IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK), -+ (IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK), -+ (IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK), -+ (IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK)}; -+ -+static u8 WIFI_OFDMRATES[] = -+{(IEEE80211_OFDM_RATE_6MB), -+ (IEEE80211_OFDM_RATE_9MB), -+ (IEEE80211_OFDM_RATE_12MB), -+ (IEEE80211_OFDM_RATE_18MB), -+ (IEEE80211_OFDM_RATE_24MB), -+ IEEE80211_OFDM_RATE_36MB, -+ IEEE80211_OFDM_RATE_48MB, -+ IEEE80211_OFDM_RATE_54MB}; -+ -+ -+int rtw_get_bit_value_from_ieee_value(u8 val) -+{ -+ unsigned char dot11_rate_table[]={2,4,11,22,12,18,24,36,48,72,96,108,0}; // last element must be zero!! -+ -+ int i=0; -+ while(dot11_rate_table[i] != 0) { -+ if (dot11_rate_table[i] == val) -+ return BIT(i); -+ i++; -+ } -+ return 0; -+} -+ -+uint rtw_is_cckrates_included(u8 *rate) -+{ -+ u32 i = 0; -+ -+ while(rate[i]!=0) -+ { -+ if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || -+ (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) -+ return _TRUE; -+ i++; -+ } -+ -+ return _FALSE; -+} -+ -+uint rtw_is_cckratesonly_included(u8 *rate) -+{ -+ u32 i = 0; -+ -+ -+ while(rate[i]!=0) -+ { -+ if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) && -+ (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) -+ -+ return _FALSE; -+ -+ i++; -+ } -+ -+ return _TRUE; -+ -+} -+ -+int rtw_check_network_type(unsigned char *rate, int ratelen, int channel) -+{ -+ if (channel > 14) -+ { -+ if ((rtw_is_cckrates_included(rate)) == _TRUE) -+ return WIRELESS_INVALID; -+ else -+ return WIRELESS_11A; -+ } -+ else // could be pure B, pure G, or B/G -+ { -+ if ((rtw_is_cckratesonly_included(rate)) == _TRUE) -+ return WIRELESS_11B; -+ else if((rtw_is_cckrates_included(rate)) == _TRUE) -+ return WIRELESS_11BG; -+ else -+ return WIRELESS_11G; -+ } -+ -+} -+ -+u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source, -+ unsigned int *frlen) -+{ -+ _rtw_memcpy((void *)pbuf, (void *)source, len); -+ *frlen = *frlen + len; -+ return (pbuf + len); -+} -+ -+// rtw_set_ie will update frame length -+u8 *rtw_set_ie -+( -+ u8 *pbuf, -+ sint index, -+ uint len, -+ u8 *source, -+ uint *frlen //frame length -+) -+{ -+_func_enter_; -+ *pbuf = (u8)index; -+ -+ *(pbuf + 1) = (u8)len; -+ -+ if (len > 0) -+ _rtw_memcpy((void *)(pbuf + 2), (void *)source, len); -+ -+ *frlen = *frlen + (len + 2); -+ -+ return (pbuf + len + 2); -+_func_exit_; -+} -+ -+inline u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode, -+ u8 new_ch, u8 ch_switch_cnt) -+{ -+ u8 ie_data[3]; -+ -+ ie_data[0] = ch_switch_mode; -+ ie_data[1] = new_ch; -+ ie_data[2] = ch_switch_cnt; -+ return rtw_set_ie(buf, WLAN_EID_CHANNEL_SWITCH, 3, ie_data, buf_len); -+} -+ -+inline u8 secondary_ch_offset_to_hal_ch_offset(u8 ch_offset) -+{ -+ if (ch_offset == SCN) -+ return HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ else if(ch_offset == SCA) -+ return HAL_PRIME_CHNL_OFFSET_UPPER; -+ else if(ch_offset == SCB) -+ return HAL_PRIME_CHNL_OFFSET_LOWER; -+ -+ return HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+} -+ -+inline u8 hal_ch_offset_to_secondary_ch_offset(u8 ch_offset) -+{ -+ if (ch_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE) -+ return SCN; -+ else if(ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER) -+ return SCB; -+ else if(ch_offset == HAL_PRIME_CHNL_OFFSET_UPPER) -+ return SCA; -+ -+ return SCN; -+} -+ -+inline u8 *rtw_set_ie_secondary_ch_offset(u8 *buf, u32 *buf_len, u8 secondary_ch_offset) -+{ -+ return rtw_set_ie(buf, WLAN_EID_SECONDARY_CHANNEL_OFFSET, 1, &secondary_ch_offset, buf_len); -+} -+ -+inline u8 *rtw_set_ie_mesh_ch_switch_parm(u8 *buf, u32 *buf_len, u8 ttl, -+ u8 flags, u16 reason, u16 precedence) -+{ -+ u8 ie_data[6]; -+ -+ ie_data[0] = ttl; -+ ie_data[1] = flags; -+ RTW_PUT_LE16((u8*)&ie_data[2], reason); -+ RTW_PUT_LE16((u8*)&ie_data[4], precedence); -+ -+ return rtw_set_ie(buf, 0x118, 6, ie_data, buf_len); -+} -+ -+/*---------------------------------------------------------------------------- -+index: the information element id index, limit is the limit for search -+-----------------------------------------------------------------------------*/ -+u8 *rtw_get_ie(u8 *pbuf, sint index, sint *len, sint limit) -+{ -+ sint tmp,i; -+ u8 *p; -+_func_enter_; -+ if (limit < 1){ -+ _func_exit_; -+ return NULL; -+ } -+ -+ p = pbuf; -+ i = 0; -+ *len = 0; -+ while(1) -+ { -+ if (*p == index) -+ { -+ *len = *(p + 1); -+ return (p); -+ } -+ else -+ { -+ tmp = *(p + 1); -+ p += (tmp + 2); -+ i += (tmp + 2); -+ } -+ if (i >= limit) -+ break; -+ } -+_func_exit_; -+ return NULL; -+} -+ -+/** -+ * rtw_get_ie_ex - Search specific IE from a series of IEs -+ * @in_ie: Address of IEs to search -+ * @in_len: Length limit from in_ie -+ * @eid: Element ID to match -+ * @oui: OUI to match -+ * @oui_len: OUI length -+ * @ie: If not NULL and the specific IE is found, the IE will be copied to the buf starting from the specific IE -+ * @ielen: If not NULL and the specific IE is found, will set to the length of the entire IE -+ * -+ * Returns: The address of the specific IE found, or NULL -+ */ -+u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, uint *ielen) -+{ -+ uint cnt; -+ u8 *target_ie = NULL; -+ -+ -+ if(ielen) -+ *ielen = 0; -+ -+ if(!in_ie || in_len<=0) -+ return target_ie; -+ -+ cnt = 0; -+ -+ while(cnt 12) -+ break; -+ -+ i++; -+ } -+_func_exit_; -+ return i; -+} -+ -+int rtw_generate_ie(struct registry_priv *pregistrypriv) -+{ -+ u8 wireless_mode; -+ int sz = 0, rateLen; -+ WLAN_BSSID_EX* pdev_network = &pregistrypriv->dev_network; -+ u8* ie = pdev_network->IEs; -+ -+_func_enter_; -+ -+ //timestamp will be inserted by hardware -+ sz += 8; -+ ie += sz; -+ -+ //beacon interval : 2bytes -+ *(u16*)ie = cpu_to_le16((u16)pdev_network->Configuration.BeaconPeriod);//BCN_INTERVAL; -+ sz += 2; -+ ie += 2; -+ -+ //capability info -+ *(u16*)ie = 0; -+ -+ *(u16*)ie |= cpu_to_le16(cap_IBSS); -+ -+ if(pregistrypriv->preamble == PREAMBLE_SHORT) -+ *(u16*)ie |= cpu_to_le16(cap_ShortPremble); -+ -+ if (pdev_network->Privacy) -+ *(u16*)ie |= cpu_to_le16(cap_Privacy); -+ -+ sz += 2; -+ ie += 2; -+ -+ //SSID -+ ie = rtw_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz); -+ -+ //supported rates -+ if(pregistrypriv->wireless_mode == WIRELESS_11ABGN) -+ { -+ if(pdev_network->Configuration.DSConfig > 14) -+ wireless_mode = WIRELESS_11A_5N; -+ else -+ wireless_mode = WIRELESS_11BG_24N; -+ } -+ else -+ { -+ wireless_mode = pregistrypriv->wireless_mode; -+ } -+ -+ rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode) ; -+ -+ rateLen = rtw_get_rateset_len(pdev_network->SupportedRates); -+ -+ if (rateLen > 8) -+ { -+ ie = rtw_set_ie(ie, _SUPPORTEDRATES_IE_, 8, pdev_network->SupportedRates, &sz); -+ //ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); -+ } -+ else -+ { -+ ie = rtw_set_ie(ie, _SUPPORTEDRATES_IE_, rateLen, pdev_network->SupportedRates, &sz); -+ } -+ -+ //DS parameter set -+ ie = rtw_set_ie(ie, _DSSET_IE_, 1, (u8 *)&(pdev_network->Configuration.DSConfig), &sz); -+ -+ -+ //IBSS Parameter Set -+ -+ ie = rtw_set_ie(ie, _IBSS_PARA_IE_, 2, (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz); -+ -+ if (rateLen > 8) -+ { -+ ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); -+ } -+ -+ -+ //HT Cap. -+ if(((pregistrypriv->wireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N)) -+ && (pregistrypriv->ht_enable==_TRUE)) -+ { -+ //todo: -+ } -+ -+ //pdev_network->IELength = sz; //update IELength -+ -+_func_exit_; -+ -+ //return _SUCCESS; -+ -+ return sz; -+ -+} -+ -+unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit) -+{ -+ int len; -+ u16 val16; -+ unsigned char wpa_oui_type[] = {0x00, 0x50, 0xf2, 0x01}; -+ u8 *pbuf = pie; -+ -+ while(1) -+ { -+ pbuf = rtw_get_ie(pbuf, _WPA_IE_ID_, &len, limit); -+ -+ if (pbuf) { -+ -+ //check if oui matches... -+ if (_rtw_memcmp((pbuf + 2), wpa_oui_type, sizeof (wpa_oui_type)) == _FALSE) { -+ -+ goto check_next_ie; -+ } -+ -+ //check version... -+ _rtw_memcpy((u8 *)&val16, (pbuf + 6), sizeof(val16)); -+ -+ val16 = le16_to_cpu(val16); -+ if (val16 != 0x0001) -+ goto check_next_ie; -+ -+ *wpa_ie_len = *(pbuf + 1); -+ -+ return pbuf; -+ } -+ else { -+ -+ *wpa_ie_len = 0; -+ return NULL; -+ } -+ -+check_next_ie: -+ -+ limit -= (2 + len); -+ -+ if (limit <= 0) -+ break; -+ -+ pbuf += (2 + len); -+ } -+ -+ *wpa_ie_len = 0; -+ -+ return NULL; -+} -+ -+unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit) -+{ -+ -+ return rtw_get_ie(pie, _WPA2_IE_ID_,rsn_ie_len, limit); -+ -+} -+ -+int rtw_get_wpa_cipher_suite(u8 *s) -+{ -+ if (_rtw_memcmp(s, WPA_CIPHER_SUITE_NONE, WPA_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_NONE; -+ if (_rtw_memcmp(s, WPA_CIPHER_SUITE_WEP40, WPA_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_WEP40; -+ if (_rtw_memcmp(s, WPA_CIPHER_SUITE_TKIP, WPA_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_TKIP; -+ if (_rtw_memcmp(s, WPA_CIPHER_SUITE_CCMP, WPA_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_CCMP; -+ if (_rtw_memcmp(s, WPA_CIPHER_SUITE_WEP104, WPA_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_WEP104; -+ -+ return 0; -+} -+ -+int rtw_get_wpa2_cipher_suite(u8 *s) -+{ -+ if (_rtw_memcmp(s, RSN_CIPHER_SUITE_NONE, RSN_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_NONE; -+ if (_rtw_memcmp(s, RSN_CIPHER_SUITE_WEP40, RSN_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_WEP40; -+ if (_rtw_memcmp(s, RSN_CIPHER_SUITE_TKIP, RSN_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_TKIP; -+ if (_rtw_memcmp(s, RSN_CIPHER_SUITE_CCMP, RSN_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_CCMP; -+ if (_rtw_memcmp(s, RSN_CIPHER_SUITE_WEP104, RSN_SELECTOR_LEN) == _TRUE) -+ return WPA_CIPHER_WEP104; -+ -+ return 0; -+} -+ -+ -+int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher) -+{ -+ int i, ret=_SUCCESS; -+ int left, count; -+ u8 *pos; -+ -+ if (wpa_ie_len <= 0) { -+ /* No WPA IE - fail silently */ -+ return _FAIL; -+ } -+ -+ -+ if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) || -+ (_rtw_memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN) != _TRUE) ) -+ { -+ return _FAIL; -+ } -+ -+ pos = wpa_ie; -+ -+ pos += 8; -+ left = wpa_ie_len - 8; -+ -+ -+ //group_cipher -+ if (left >= WPA_SELECTOR_LEN) { -+ -+ *group_cipher = rtw_get_wpa_cipher_suite(pos); -+ -+ pos += WPA_SELECTOR_LEN; -+ left -= WPA_SELECTOR_LEN; -+ -+ } -+ else if (left > 0) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __FUNCTION__, left)); -+ -+ return _FAIL; -+ } -+ -+ -+ //pairwise_cipher -+ if (left >= 2) -+ { -+ //count = le16_to_cpu(*(u16*)pos); -+ count = RTW_GET_LE16(pos); -+ pos += 2; -+ left -= 2; -+ -+ if (count == 0 || left < count * WPA_SELECTOR_LEN) { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), " -+ "count %u left %u", __FUNCTION__, count, left)); -+ return _FAIL; -+ } -+ -+ for (i = 0; i < count; i++) -+ { -+ *pairwise_cipher |= rtw_get_wpa_cipher_suite(pos); -+ -+ pos += WPA_SELECTOR_LEN; -+ left -= WPA_SELECTOR_LEN; -+ } -+ -+ } -+ else if (left == 1) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __FUNCTION__)); -+ return _FAIL; -+ } -+ -+ -+ return ret; -+ -+} -+ -+int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwise_cipher) -+{ -+ int i, ret=_SUCCESS; -+ int left, count; -+ u8 *pos; -+ -+ if (rsn_ie_len <= 0) { -+ /* No RSN IE - fail silently */ -+ return _FAIL; -+ } -+ -+ -+ if ((*rsn_ie!= _WPA2_IE_ID_) || (*(rsn_ie+1) != (u8)(rsn_ie_len - 2))) -+ { -+ return _FAIL; -+ } -+ -+ pos = rsn_ie; -+ pos += 4; -+ left = rsn_ie_len - 4; -+ -+ //group_cipher -+ if (left >= RSN_SELECTOR_LEN) { -+ -+ *group_cipher = rtw_get_wpa2_cipher_suite(pos); -+ -+ pos += RSN_SELECTOR_LEN; -+ left -= RSN_SELECTOR_LEN; -+ -+ } else if (left > 0) { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __FUNCTION__, left)); -+ return _FAIL; -+ } -+ -+ //pairwise_cipher -+ if (left >= 2) -+ { -+ //count = le16_to_cpu(*(u16*)pos); -+ count = RTW_GET_LE16(pos); -+ pos += 2; -+ left -= 2; -+ -+ if (count == 0 || left < count * RSN_SELECTOR_LEN) { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), " -+ "count %u left %u", __FUNCTION__, count, left)); -+ return _FAIL; -+ } -+ -+ for (i = 0; i < count; i++) -+ { -+ *pairwise_cipher |= rtw_get_wpa2_cipher_suite(pos); -+ -+ pos += RSN_SELECTOR_LEN; -+ left -= RSN_SELECTOR_LEN; -+ } -+ -+ } -+ else if (left == 1) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __FUNCTION__)); -+ -+ return _FAIL; -+ } -+ -+ -+ return ret; -+ -+} -+ -+int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len) -+{ -+ u8 authmode, sec_idx, i; -+ u8 wpa_oui[4]={0x0,0x50,0xf2,0x01}; -+ uint cnt; -+ -+_func_enter_; -+ -+ //Search required WPA or WPA2 IE and copy to sec_ie[ ] -+ -+ cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); -+ -+ sec_idx=0; -+ -+ while(cnt found WPS_IE.....\n"); -+ *wps_ielen = ie_ptr[1]+2; -+ match=_TRUE; -+ } -+ return match; -+} -+ -+/** -+ * rtw_get_wps_ie - Search WPS IE from a series of IEs -+ * @in_ie: Address of IEs to search -+ * @in_len: Length limit from in_ie -+ * @wps_ie: If not NULL and WPS IE is found, WPS IE will be copied to the buf starting from wps_ie -+ * @wps_ielen: If not NULL and WPS IE is found, will set to the length of the entire WPS IE -+ * -+ * Returns: The address of the WPS IE found, or NULL -+ */ -+u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) -+{ -+ uint cnt; -+ u8 *wpsie_ptr=NULL; -+ u8 eid, wps_oui[4]={0x0,0x50,0xf2,0x04}; -+ -+ if(wps_ielen) -+ *wps_ielen = 0; -+ -+ if(!in_ie || in_len<=0) -+ return wpsie_ptr; -+ -+ cnt = 0; -+ -+ while(cntwpa_ie = pos; -+ elems->wpa_ie_len = elen; -+ break; -+ case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */ -+ if (elen < 5) { -+ DBG_871X("short WME " -+ "information element ignored " -+ "(len=%lu)\n", -+ (unsigned long) elen); -+ return -1; -+ } -+ switch (pos[4]) { -+ case WME_OUI_SUBTYPE_INFORMATION_ELEMENT: -+ case WME_OUI_SUBTYPE_PARAMETER_ELEMENT: -+ elems->wme = pos; -+ elems->wme_len = elen; -+ break; -+ case WME_OUI_SUBTYPE_TSPEC_ELEMENT: -+ elems->wme_tspec = pos; -+ elems->wme_tspec_len = elen; -+ break; -+ default: -+ DBG_871X("unknown WME " -+ "information element ignored " -+ "(subtype=%d len=%lu)\n", -+ pos[4], (unsigned long) elen); -+ return -1; -+ } -+ break; -+ case 4: -+ /* Wi-Fi Protected Setup (WPS) IE */ -+ elems->wps_ie = pos; -+ elems->wps_ie_len = elen; -+ break; -+ default: -+ DBG_871X("Unknown Microsoft " -+ "information element ignored " -+ "(type=%d len=%lu)\n", -+ pos[3], (unsigned long) elen); -+ return -1; -+ } -+ break; -+ -+ case OUI_BROADCOM: -+ switch (pos[3]) { -+ case VENDOR_HT_CAPAB_OUI_TYPE: -+ elems->vendor_ht_cap = pos; -+ elems->vendor_ht_cap_len = elen; -+ break; -+ default: -+ DBG_871X("Unknown Broadcom " -+ "information element ignored " -+ "(type=%d len=%lu)\n", -+ pos[3], (unsigned long) elen); -+ return -1; -+ } -+ break; -+ -+ default: -+ DBG_871X("unknown vendor specific information " -+ "element ignored (vendor OUI %02x:%02x:%02x " -+ "len=%lu)\n", -+ pos[0], pos[1], pos[2], (unsigned long) elen); -+ return -1; -+ } -+ -+ return 0; -+ -+} -+ -+/** -+ * ieee802_11_parse_elems - Parse information elements in management frames -+ * @start: Pointer to the start of IEs -+ * @len: Length of IE buffer in octets -+ * @elems: Data structure for parsed elements -+ * @show_errors: Whether to show parsing errors in debug log -+ * Returns: Parsing result -+ */ -+ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, -+ struct rtw_ieee802_11_elems *elems, -+ int show_errors) -+{ -+ uint left = len; -+ u8 *pos = start; -+ int unknown = 0; -+ -+ _rtw_memset(elems, 0, sizeof(*elems)); -+ -+ while (left >= 2) { -+ u8 id, elen; -+ -+ id = *pos++; -+ elen = *pos++; -+ left -= 2; -+ -+ if (elen > left) { -+ if (show_errors) { -+ DBG_871X("IEEE 802.11 element " -+ "parse failed (id=%d elen=%d " -+ "left=%lu)\n", -+ id, elen, (unsigned long) left); -+ } -+ return ParseFailed; -+ } -+ -+ switch (id) { -+ case WLAN_EID_SSID: -+ elems->ssid = pos; -+ elems->ssid_len = elen; -+ break; -+ case WLAN_EID_SUPP_RATES: -+ elems->supp_rates = pos; -+ elems->supp_rates_len = elen; -+ break; -+ case WLAN_EID_FH_PARAMS: -+ elems->fh_params = pos; -+ elems->fh_params_len = elen; -+ break; -+ case WLAN_EID_DS_PARAMS: -+ elems->ds_params = pos; -+ elems->ds_params_len = elen; -+ break; -+ case WLAN_EID_CF_PARAMS: -+ elems->cf_params = pos; -+ elems->cf_params_len = elen; -+ break; -+ case WLAN_EID_TIM: -+ elems->tim = pos; -+ elems->tim_len = elen; -+ break; -+ case WLAN_EID_IBSS_PARAMS: -+ elems->ibss_params = pos; -+ elems->ibss_params_len = elen; -+ break; -+ case WLAN_EID_CHALLENGE: -+ elems->challenge = pos; -+ elems->challenge_len = elen; -+ break; -+ case WLAN_EID_ERP_INFO: -+ elems->erp_info = pos; -+ elems->erp_info_len = elen; -+ break; -+ case WLAN_EID_EXT_SUPP_RATES: -+ elems->ext_supp_rates = pos; -+ elems->ext_supp_rates_len = elen; -+ break; -+ case WLAN_EID_VENDOR_SPECIFIC: -+ if (rtw_ieee802_11_parse_vendor_specific(pos, elen, -+ elems, -+ show_errors)) -+ unknown++; -+ break; -+ case WLAN_EID_RSN: -+ elems->rsn_ie = pos; -+ elems->rsn_ie_len = elen; -+ break; -+ case WLAN_EID_PWR_CAPABILITY: -+ elems->power_cap = pos; -+ elems->power_cap_len = elen; -+ break; -+ case WLAN_EID_SUPPORTED_CHANNELS: -+ elems->supp_channels = pos; -+ elems->supp_channels_len = elen; -+ break; -+ case WLAN_EID_MOBILITY_DOMAIN: -+ elems->mdie = pos; -+ elems->mdie_len = elen; -+ break; -+ case WLAN_EID_FAST_BSS_TRANSITION: -+ elems->ftie = pos; -+ elems->ftie_len = elen; -+ break; -+ case WLAN_EID_TIMEOUT_INTERVAL: -+ elems->timeout_int = pos; -+ elems->timeout_int_len = elen; -+ break; -+ case WLAN_EID_HT_CAP: -+ elems->ht_capabilities = pos; -+ elems->ht_capabilities_len = elen; -+ break; -+ case WLAN_EID_HT_OPERATION: -+ elems->ht_operation = pos; -+ elems->ht_operation_len = elen; -+ break; -+ default: -+ unknown++; -+ if (!show_errors) -+ break; -+ DBG_871X("IEEE 802.11 element parse " -+ "ignored unknown element (id=%d elen=%d)\n", -+ id, elen); -+ break; -+ } -+ -+ left -= elen; -+ pos += elen; -+ } -+ -+ if (left) -+ return ParseFailed; -+ -+ return unknown ? ParseUnknown : ParseOK; -+ -+} -+ -+static u8 key_char2num(u8 ch); -+static u8 key_char2num(u8 ch) -+{ -+ if((ch>='0')&&(ch<='9')) -+ return ch - '0'; -+ else if ((ch>='a')&&(ch<='f')) -+ return ch - 'a' + 10; -+ else if ((ch>='A')&&(ch<='F')) -+ return ch - 'A' + 10; -+ else -+ return 0xff; -+} -+ -+u8 str_2char2num(u8 hch, u8 lch); -+u8 str_2char2num(u8 hch, u8 lch) -+{ -+ return ((key_char2num(hch) * 10 ) + key_char2num(lch)); -+} -+ -+u8 key_2char2num(u8 hch, u8 lch); -+u8 key_2char2num(u8 hch, u8 lch) -+{ -+ return ((key_char2num(hch) << 4) | key_char2num(lch)); -+} -+ -+u8 convert_ip_addr(u8 hch, u8 mch, u8 lch) -+{ -+ return ((key_char2num(hch) * 100) + (key_char2num(mch) * 10 ) + key_char2num(lch)); -+} -+ -+extern char* rtw_initmac; -+void rtw_macaddr_cfg(u8 *mac_addr) -+{ -+ u8 mac[ETH_ALEN]; -+ if(mac_addr == NULL) return; -+ -+ if ( rtw_initmac ) -+ { // Users specify the mac address -+ int jj,kk; -+ -+ for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ mac[jj] = key_2char2num(rtw_initmac[kk], rtw_initmac[kk+ 1]); -+ } -+ _rtw_memcpy(mac_addr, mac, ETH_ALEN); -+ } -+ else -+ { // Use the mac address stored in the Efuse -+ _rtw_memcpy(mac, mac_addr, ETH_ALEN); -+ } -+ -+ if (((mac[0]==0xff) &&(mac[1]==0xff) && (mac[2]==0xff) && -+ (mac[3]==0xff) && (mac[4]==0xff) &&(mac[5]==0xff)) || -+ ((mac[0]==0x0) && (mac[1]==0x0) && (mac[2]==0x0) && -+ (mac[3]==0x0) && (mac[4]==0x0) &&(mac[5]==0x0))) -+ { -+ mac[0] = 0x00; -+ mac[1] = 0xe0; -+ mac[2] = 0x4c; -+ mac[3] = 0x87; -+ mac[4] = 0x00; -+ mac[5] = 0x00; -+ // use default mac addresss -+ _rtw_memcpy(mac_addr, mac, ETH_ALEN); -+ DBG_871X("MAC Address from efuse error, assign default one !!!\n"); -+ } -+ -+ DBG_871X("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr)); -+} -+ -+void dump_ies(u8 *buf, u32 buf_len) { -+ u8* pos = (u8*)buf; -+ u8 id, len; -+ -+ while(pos-buf<=buf_len){ -+ id = *pos; -+ len = *(pos+1); -+ -+ DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len); -+ #ifdef CONFIG_P2P -+ dump_p2p_ie(pos, len); -+ #endif -+ dump_wps_ie(pos, len); -+ -+ pos+=(2+len); -+ } -+} -+ -+void dump_wps_ie(u8 *ie, u32 ie_len) { -+ u8* pos = (u8*)ie; -+ u16 id; -+ u16 len; -+ -+ u8 *wps_ie; -+ uint wps_ielen; -+ -+ wps_ie = rtw_get_wps_ie(ie, ie_len, NULL, &wps_ielen); -+ if(wps_ie != ie || wps_ielen == 0) -+ return; -+ -+ pos+=6; -+ while(pos-ie < ie_len){ -+ id = RTW_GET_BE16(pos); -+ len = RTW_GET_BE16(pos + 2); -+ -+ DBG_871X("%s ID:0x%04x, LEN:%u\n", __FUNCTION__, id, len); -+ -+ pos+=(4+len); -+ } -+} -+ -+#ifdef CONFIG_P2P -+/** -+ * rtw_get_p2p_merged_len - Get merged ie length from muitiple p2p ies. -+ * @in_ie: Pointer of the first p2p ie -+ * @in_len: Total len of muiltiple p2p ies -+ * Returns: Length of merged p2p ie length -+ */ -+u32 rtw_get_p2p_merged_ies_len(u8 *in_ie, u32 in_len) -+{ -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 OUI[4] = { 0x50, 0x6f, 0x9a, 0x09 }; -+ int i=0; -+ int j=0, len=0; -+ -+ while( i < in_len) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(in_ie+ i); -+ -+ if( pIE->ElementID == _VENDOR_SPECIFIC_IE_ && _rtw_memcmp(pIE->data, OUI, 4) ) -+ { -+ len += pIE->Length-4; // 4 is P2P OUI length, don't count it in this loop -+ } -+ -+ i += (pIE->Length + 2); -+ } -+ -+ return len + 4; // Append P2P OUI length at last. -+} -+ -+/** -+ * rtw_p2p_merge_ies - Merge muitiple p2p ies into one -+ * @in_ie: Pointer of the first p2p ie -+ * @in_len: Total len of muiltiple p2p ies -+ * @merge_ie: Pointer of merged ie -+ * Returns: Length of merged p2p ie -+ */ -+int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie) -+{ -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 len = 0; -+ u8 OUI[4] = { 0x50, 0x6f, 0x9a, 0x09 }; -+ u8 ELOUI[6] = { 0xDD, 0x00, 0x50, 0x6f, 0x9a, 0x09 }; //EID;Len;OUI, Len would copy at the end of function -+ int i=0; -+ -+ if( merge_ie != NULL) -+ { -+ //Set first P2P OUI -+ _rtw_memcpy(merge_ie, ELOUI, 6); -+ merge_ie += 6; -+ -+ while( i < in_len) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(in_ie+ i); -+ -+ // Take out the rest of P2P OUIs -+ if( pIE->ElementID == _VENDOR_SPECIFIC_IE_ && _rtw_memcmp(pIE->data, OUI, 4) ) -+ { -+ _rtw_memcpy( merge_ie, pIE->data +4, pIE->Length -4); -+ len += pIE->Length-4; -+ merge_ie += pIE->Length-4; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+ -+ return len + 4; // 4 is for P2P OUI -+ -+ } -+ -+ return 0; -+} -+ -+void dump_p2p_ie(u8 *ie, u32 ie_len) { -+ u8* pos = (u8*)ie; -+ u8 id; -+ u16 len; -+ -+ u8 *p2p_ie; -+ uint p2p_ielen; -+ -+ p2p_ie = rtw_get_p2p_ie(ie, ie_len, NULL, &p2p_ielen); -+ if(p2p_ie != ie || p2p_ielen == 0) -+ return; -+ -+ pos+=6; -+ while(pos-ie < ie_len){ -+ id = *pos; -+ len = RTW_GET_LE16(pos+1); -+ -+ DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len); -+ -+ pos+=(3+len); -+ } -+} -+ -+/** -+ * rtw_get_p2p_ie - Search P2P IE from a series of IEs -+ * @in_ie: Address of IEs to search -+ * @in_len: Length limit from in_ie -+ * @p2p_ie: If not NULL and P2P IE is found, P2P IE will be copied to the buf starting from p2p_ie -+ * @p2p_ielen: If not NULL and P2P IE is found, will set to the length of the entire P2P IE -+ * -+ * Returns: The address of the P2P IE found, or NULL -+ */ -+u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen) -+{ -+ uint cnt = 0; -+ u8 *p2p_ie_ptr; -+ u8 eid, p2p_oui[4]={0x50,0x6F,0x9A,0x09}; -+ -+ if ( p2p_ielen != NULL ) -+ *p2p_ielen = 0; -+ -+ while(cnt MAX_IE_SZ)) { -+#ifdef PLATFORM_LINUX -+ dump_stack(); -+#endif -+ return NULL; -+ } -+ if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], p2p_oui, 4) == _TRUE ) ) -+ { -+ p2p_ie_ptr = in_ie + cnt; -+ -+ if ( p2p_ie != NULL ) -+ { -+ _rtw_memcpy( p2p_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 ); -+ } -+ -+ if ( p2p_ielen != NULL ) -+ { -+ *p2p_ielen = in_ie[ cnt + 1 ] + 2; -+ } -+ -+ return p2p_ie_ptr; -+ -+ break; -+ } -+ else -+ { -+ cnt += in_ie[ cnt + 1 ] +2; //goto next -+ } -+ -+ } -+ -+ return NULL; -+ -+} -+ -+/** -+ * rtw_get_p2p_attr - Search a specific P2P attribute from a given P2P IE -+ * @p2p_ie: Address of P2P IE to search -+ * @p2p_ielen: Length limit from p2p_ie -+ * @target_attr_id: The attribute ID of P2P attribute to search -+ * @buf_attr: If not NULL and the P2P attribute is found, P2P attribute will be copied to the buf starting from buf_attr -+ * @len_attr: If not NULL and the P2P attribute is found, will set to the length of the entire P2P attribute -+ * -+ * Returns: the address of the specific WPS attribute found, or NULL -+ */ -+u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr, u32 *len_attr) -+{ -+ u8 *attr_ptr = NULL; -+ u8 *target_attr_ptr = NULL; -+ u8 p2p_oui[4]={0x50,0x6F,0x9A,0x09}; -+ -+ if(len_attr) -+ *len_attr = 0; -+ -+ if ( !p2p_ie || ( p2p_ie[0] != _VENDOR_SPECIFIC_IE_ ) || -+ ( _rtw_memcmp( p2p_ie + 2, p2p_oui , 4 ) != _TRUE ) ) -+ { -+ return attr_ptr; -+ } -+ -+ // 6 = 1(Element ID) + 1(Length) + 3 (OUI) + 1(OUI Type) -+ attr_ptr = p2p_ie + 6; //goto first attr -+ -+ while(attr_ptr - p2p_ie < p2p_ielen) -+ { -+ // 3 = 1(Attribute ID) + 2(Length) -+ u8 attr_id = *attr_ptr; -+ u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1); -+ u16 attr_len = attr_data_len + 3; -+ -+ //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); -+ if( attr_id == target_attr_id ) -+ { -+ target_attr_ptr = attr_ptr; -+ -+ if(buf_attr) -+ _rtw_memcpy(buf_attr, attr_ptr, attr_len); -+ -+ if(len_attr) -+ *len_attr = attr_len; -+ -+ break; -+ } -+ else -+ { -+ attr_ptr += attr_len; //goto next -+ } -+ -+ } -+ -+ return target_attr_ptr; -+} -+ -+/** -+ * rtw_get_p2p_attr_content - Search a specific P2P attribute content from a given P2P IE -+ * @p2p_ie: Address of P2P IE to search -+ * @p2p_ielen: Length limit from p2p_ie -+ * @target_attr_id: The attribute ID of P2P attribute to search -+ * @buf_content: If not NULL and the P2P attribute is found, P2P attribute content will be copied to the buf starting from buf_content -+ * @len_content: If not NULL and the P2P attribute is found, will set to the length of the P2P attribute content -+ * -+ * Returns: the address of the specific P2P attribute content found, or NULL -+ */ -+u8 *rtw_get_p2p_attr_content(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_content, uint *len_content) -+{ -+ u8 *attr_ptr; -+ u32 attr_len; -+ -+ if(len_content) -+ *len_content = 0; -+ -+ attr_ptr = rtw_get_p2p_attr(p2p_ie, p2p_ielen, target_attr_id, NULL, &attr_len); -+ -+ if(attr_ptr && attr_len) -+ { -+ if(buf_content) -+ _rtw_memcpy(buf_content, attr_ptr+3, attr_len-3); -+ -+ if(len_content) -+ *len_content = attr_len-3; -+ -+ return attr_ptr+3; -+ } -+ -+ return NULL; -+} -+ -+u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr) -+{ -+ u32 a_len; -+ -+ *pbuf = attr_id; -+ -+ //*(u16*)(pbuf + 1) = cpu_to_le16(attr_len); -+ RTW_PUT_LE16(pbuf + 1, attr_len); -+ -+ if(pdata_attr) -+ _rtw_memcpy(pbuf + 3, pdata_attr, attr_len); -+ -+ a_len = attr_len + 3; -+ -+ return a_len; -+} -+ -+static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id) -+{ -+ u8 *target_attr; -+ u32 target_attr_len; -+ uint ielen = ielen_ori; -+ int index=0; -+ -+ while(1) { -+ target_attr=rtw_get_p2p_attr(ie, ielen, attr_id, NULL, &target_attr_len); -+ if(target_attr && target_attr_len) -+ { -+ u8 *next_attr = target_attr+target_attr_len; -+ uint remain_len = ielen-(next_attr-ie); -+ //dump_ies(ie, ielen); -+ #if 0 -+ DBG_871X("[%d] ie:%p, ielen:%u\n" -+ "target_attr:%p, target_attr_len:%u\n" -+ "next_attr:%p, remain_len:%u\n" -+ , index++ -+ , ie, ielen -+ , target_attr, target_attr_len -+ , next_attr, remain_len -+ ); -+ #endif -+ -+ _rtw_memset(target_attr, 0, target_attr_len); -+ _rtw_memcpy(target_attr, next_attr, remain_len); -+ _rtw_memset(target_attr+remain_len, 0, target_attr_len); -+ *(ie+1) -= target_attr_len; -+ ielen-=target_attr_len; -+ } -+ else -+ { -+ //if(index>0) -+ // dump_ies(ie, ielen); -+ break; -+ } -+ } -+ -+ return ielen; -+} -+ -+void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id) -+{ -+ u8 *p2p_ie; -+ uint p2p_ielen, p2p_ielen_ori; -+ int cnt; -+ -+ if( (p2p_ie=rtw_get_p2p_ie(bss_ex->IEs+_FIXED_IE_LENGTH_, bss_ex->IELength-_FIXED_IE_LENGTH_, NULL, &p2p_ielen_ori)) ) -+ { -+ #if 0 -+ if(rtw_get_p2p_attr(p2p_ie, p2p_ielen_ori, attr_id, NULL, NULL)) { -+ DBG_871X("rtw_get_p2p_attr: GOT P2P_ATTR:%u!!!!!!!!\n", attr_id); -+ dump_ies(bss_ex->IEs+_FIXED_IE_LENGTH_, bss_ex->IELength-_FIXED_IE_LENGTH_); -+ } -+ #endif -+ -+ p2p_ielen=rtw_p2p_attr_remove(p2p_ie, p2p_ielen_ori, attr_id); -+ if(p2p_ielen != p2p_ielen_ori) { -+ -+ u8 *next_ie_ori = p2p_ie+p2p_ielen_ori; -+ u8 *next_ie = p2p_ie+p2p_ielen; -+ uint remain_len = bss_ex->IELength-(next_ie_ori-bss_ex->IEs); -+ -+ _rtw_memcpy(next_ie, next_ie_ori, remain_len); -+ _rtw_memset(next_ie+remain_len, 0, p2p_ielen_ori-p2p_ielen); -+ bss_ex->IELength -= p2p_ielen_ori-p2p_ielen; -+ -+ #if 0 -+ DBG_871X("remove P2P_ATTR:%u!\n", attr_id); -+ dump_ies(bss_ex->IEs+_FIXED_IE_LENGTH_, bss_ex->IELength-_FIXED_IE_LENGTH_); -+ #endif -+ } -+ } -+} -+ -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_WFD -+int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen) -+{ -+ int match; -+ uint cnt = 0; -+ u8 eid, wfd_oui[4]={0x50,0x6F,0x9A,0x0A}; -+ -+ -+ match=_FALSE; -+ -+ if ( in_len < 0 ) -+ { -+ return match; -+ } -+ -+ while(cnt 1 byte for attribute ID field, 2 bytes for length field -+ if(attr_content) -+ _rtw_memcpy( attr_content, &wfd_ie[ cnt + 3 ], attrlen ); -+ -+ if(attr_contentlen) -+ *attr_contentlen = attrlen; -+ -+ cnt += attrlen + 3; -+ -+ match = _TRUE; -+ break; -+ } -+ else -+ { -+ cnt += attrlen + 3; //goto next -+ } -+ -+ } -+ -+ return match; -+ -+} -+#endif // CONFIG_WFD -+ -+//Baron adds to avoid FreeBSD warning -+int ieee80211_is_empty_essid(const char *essid, int essid_len) -+{ -+ /* Single white space is for Linksys APs */ -+ if (essid_len == 1 && essid[0] == ' ') -+ return 1; -+ -+ /* Otherwise, if the entire essid is 0, we assume it is hidden */ -+ while (essid_len) { -+ essid_len--; -+ if (essid[essid_len] != '\0') -+ return 0; -+ } -+ -+ return 1; -+} -+ -+int ieee80211_get_hdrlen(u16 fc) -+{ -+ int hdrlen = 24; -+ -+ switch (WLAN_FC_GET_TYPE(fc)) { -+ case RTW_IEEE80211_FTYPE_DATA: -+ if (fc & RTW_IEEE80211_STYPE_QOS_DATA) -+ hdrlen += 2; -+ if ((fc & RTW_IEEE80211_FCTL_FROMDS) && (fc & RTW_IEEE80211_FCTL_TODS)) -+ hdrlen += 6; /* Addr4 */ -+ break; -+ case RTW_IEEE80211_FTYPE_CTL: -+ switch (WLAN_FC_GET_STYPE(fc)) { -+ case RTW_IEEE80211_STYPE_CTS: -+ case RTW_IEEE80211_STYPE_ACK: -+ hdrlen = 10; -+ break; -+ default: -+ hdrlen = 16; -+ break; -+ } -+ break; -+ } -+ -+ return hdrlen; -+} -+ -+//show MCS rate, unit: 100Kbps -+u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40, unsigned char * MCS_rate) -+{ -+ u16 max_rate = 0; -+ -+ if(rf_type == RF_1T1R) -+ { -+ if(MCS_rate[0] & BIT(7)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350):((short_GI_20)?722:650); -+ else if(MCS_rate[0] & BIT(6)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1350:1215):((short_GI_20)?650:585); -+ else if(MCS_rate[0] & BIT(5)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080):((short_GI_20)?578:520); -+ else if(MCS_rate[0] & BIT(4)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?900:810):((short_GI_20)?433:390); -+ else if(MCS_rate[0] & BIT(3)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?600:540):((short_GI_20)?289:260); -+ else if(MCS_rate[0] & BIT(2)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?450:405):((short_GI_20)?217:195); -+ else if(MCS_rate[0] & BIT(1)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?300:270):((short_GI_20)?144:130); -+ else if(MCS_rate[0] & BIT(0)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?150:135):((short_GI_20)?72:65); -+ } -+ else -+ { -+ if(MCS_rate[1]) -+ { -+ if(MCS_rate[1] & BIT(7)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?3000:2700):((short_GI_20)?1444:1300); -+ else if(MCS_rate[1] & BIT(6)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?2700:2430):((short_GI_20)?1300:1170); -+ else if(MCS_rate[1] & BIT(5)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?2400:2160):((short_GI_20)?1156:1040); -+ else if(MCS_rate[1] & BIT(4)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1800:1620):((short_GI_20)?867:780); -+ else if(MCS_rate[1] & BIT(3)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080):((short_GI_20)?578:520); -+ else if(MCS_rate[1] & BIT(2)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?900:810):((short_GI_20)?433:390); -+ else if(MCS_rate[1] & BIT(1)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?600:540):((short_GI_20)?289:260); -+ else if(MCS_rate[1] & BIT(0)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?300:270):((short_GI_20)?144:130); -+ } -+ else -+ { -+ if(MCS_rate[0] & BIT(7)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350):((short_GI_20)?722:650); -+ else if(MCS_rate[0] & BIT(6)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1350:1215):((short_GI_20)?650:585); -+ else if(MCS_rate[0] & BIT(5)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080):((short_GI_20)?578:520); -+ else if(MCS_rate[0] & BIT(4)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?900:810):((short_GI_20)?433:390); -+ else if(MCS_rate[0] & BIT(3)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?600:540):((short_GI_20)?289:260); -+ else if(MCS_rate[0] & BIT(2)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?450:405):((short_GI_20)?217:195); -+ else if(MCS_rate[0] & BIT(1)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?300:270):((short_GI_20)?144:130); -+ else if(MCS_rate[0] & BIT(0)) -+ max_rate = (bw_40MHz) ? ((short_GI_40)?150:135):((short_GI_20)?72:65); -+ } -+ } -+ return max_rate; -+} -+ -+int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8* category, u8 *action) -+{ -+ const u8 *frame_body = frame + sizeof(struct rtw_ieee80211_hdr_3addr); -+ u16 fc; -+ u8 c; -+ u8 a = ACT_PUBLIC_MAX; -+ -+ fc = le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)frame)->frame_ctl); -+ -+ if ((fc & (RTW_IEEE80211_FCTL_FTYPE|RTW_IEEE80211_FCTL_STYPE)) -+ != (RTW_IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION) -+ ) -+ { -+ return _FALSE; -+ } -+ -+ c = frame_body[0]; -+ -+ switch(c) { -+ case RTW_WLAN_CATEGORY_P2P: /* vendor-specific */ -+ break; -+ default: -+ a = frame_body[1]; -+ } -+ -+ if (category) -+ *category = c; -+ if (action) -+ *action = a; -+ -+ return _TRUE; -+} -+ -+static const char *_action_public_str[] = { -+ "ACT_PUB_BSSCOEXIST", -+ "ACT_PUB_DSE_ENABLE", -+ "ACT_PUB_DSE_DEENABLE", -+ "ACT_PUB_DSE_REG_LOCATION", -+ "ACT_PUB_EXT_CHL_SWITCH", -+ "ACT_PUB_DSE_MSR_REQ", -+ "ACT_PUB_DSE_MSR_RPRT", -+ "ACT_PUB_MP", -+ "ACT_PUB_DSE_PWR_CONSTRAINT", -+ "ACT_PUB_VENDOR", -+ "ACT_PUB_GAS_INITIAL_REQ", -+ "ACT_PUB_GAS_INITIAL_RSP", -+ "ACT_PUB_GAS_COMEBACK_REQ", -+ "ACT_PUB_GAS_COMEBACK_RSP", -+ "ACT_PUB_TDLS_DISCOVERY_RSP", -+ "ACT_PUB_LOCATION_TRACK", -+ "ACT_PUB_RSVD", -+}; -+ -+const char *action_public_str(u8 action) -+{ -+ action = (action >= ACT_PUBLIC_MAX) ? ACT_PUBLIC_MAX : action; -+ return _action_public_str[action]; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c -@@ -0,0 +1,464 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/* -+ -+The purpose of rtw_io.c -+ -+a. provides the API -+ -+b. provides the protocol engine -+ -+c. provides the software interface between caller and the hardware interface -+ -+ -+Compiler Flag Option: -+ -+1. CONFIG_SDIO_HCI: -+ a. USE_SYNC_IRP: Only sync operations are provided. -+ b. USE_ASYNC_IRP:Both sync/async operations are provided. -+ -+2. CONFIG_USB_HCI: -+ a. USE_ASYNC_IRP: Both sync/async operations are provided. -+ -+3. CONFIG_CFIO_HCI: -+ b. USE_SYNC_IRP: Only sync operations are provided. -+ -+ -+Only sync read/rtw_write_mem operations are provided. -+ -+jackson@realtek.com.tw -+ -+*/ -+ -+#define _RTW_IO_C_ -+#include -+#include -+#include -+#include -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+#error "Shall be Linux or Windows, but not both!\n" -+#endif -+ -+#ifdef CONFIG_SDIO_HCI -+#include -+#endif -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+#include -+#endif -+ -+ -+u8 _rtw_read8(_adapter *adapter, u32 addr) -+{ -+ u8 r_val; -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr); -+ _func_enter_; -+ _read8 = pintfhdl->io_ops._read8; -+ -+ r_val = _read8(pintfhdl, addr); -+ _func_exit_; -+ return r_val; -+} -+ -+u16 _rtw_read16(_adapter *adapter, u32 addr) -+{ -+ u16 r_val; -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr); -+ _func_enter_; -+ _read16 = pintfhdl->io_ops._read16; -+ -+ r_val = _read16(pintfhdl, addr); -+ _func_exit_; -+ return r_val; -+} -+ -+u32 _rtw_read32(_adapter *adapter, u32 addr) -+{ -+ u32 r_val; -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr); -+ _func_enter_; -+ _read32 = pintfhdl->io_ops._read32; -+ -+ r_val = _read32(pintfhdl, addr); -+ _func_exit_; -+ return r_val; -+ -+} -+ -+int _rtw_write8(_adapter *adapter, u32 addr, u8 val) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val); -+ int ret; -+ _func_enter_; -+ _write8 = pintfhdl->io_ops._write8; -+ -+ ret = _write8(pintfhdl, addr, val); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+int _rtw_write16(_adapter *adapter, u32 addr, u16 val) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val); -+ int ret; -+ _func_enter_; -+ _write16 = pintfhdl->io_ops._write16; -+ -+ ret = _write16(pintfhdl, addr, val); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+int _rtw_write32(_adapter *adapter, u32 addr, u32 val) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val); -+ int ret; -+ _func_enter_; -+ _write32 = pintfhdl->io_ops._write32; -+ -+ ret = _write32(pintfhdl, addr, val); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+ -+int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = (struct intf_hdl*)(&(pio_priv->intf)); -+ int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr,u32 length, u8 *pdata); -+ int ret; -+ _func_enter_; -+ _writeN = pintfhdl->io_ops._writeN; -+ -+ ret = _writeN(pintfhdl, addr,length,pdata); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val); -+ int ret; -+ _func_enter_; -+ _write8_async = pintfhdl->io_ops._write8_async; -+ -+ ret = _write8_async(pintfhdl, addr, val); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val); -+ int ret; -+ _func_enter_; -+ _write16_async = pintfhdl->io_ops._write16_async; -+ -+ ret = _write16_async(pintfhdl, addr, val); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val) -+{ -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val); -+ int ret; -+ _func_enter_; -+ _write32_async = pintfhdl->io_ops._write32_async; -+ -+ ret = _write32_async(pintfhdl, addr, val); -+ _func_exit_; -+ -+ return RTW_STATUS_CODE(ret); -+} -+void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) -+{ -+ void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ -+ _func_enter_; -+ -+ if( (adapter->bDriverStopped ==_TRUE) || (adapter->bSurpriseRemoved == _TRUE)) -+ { -+ RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved)); -+ return; -+ } -+ -+ _read_mem = pintfhdl->io_ops._read_mem; -+ -+ _read_mem(pintfhdl, addr, cnt, pmem); -+ -+ _func_exit_; -+ -+} -+ -+void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) -+{ -+ void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ -+ _func_enter_; -+ -+ _write_mem = pintfhdl->io_ops._write_mem; -+ -+ _write_mem(pintfhdl, addr, cnt, pmem); -+ -+ _func_exit_; -+ -+} -+ -+void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) -+{ -+ u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ -+ _func_enter_; -+ -+ if( (adapter->bDriverStopped ==_TRUE) || (adapter->bSurpriseRemoved == _TRUE)) -+ { -+ RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved)); -+ return; -+ } -+ -+ _read_port = pintfhdl->io_ops._read_port; -+ -+ _read_port(pintfhdl, addr, cnt, pmem); -+ -+ _func_exit_; -+ -+} -+ -+void _rtw_read_port_cancel(_adapter *adapter) -+{ -+ void (*_read_port_cancel)(struct intf_hdl *pintfhdl); -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ -+ _read_port_cancel = pintfhdl->io_ops._read_port_cancel; -+ -+ if(_read_port_cancel) -+ _read_port_cancel(pintfhdl); -+ -+} -+ -+u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) -+{ -+ u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ u32 ret = _SUCCESS; -+ -+ _func_enter_; -+ -+ _write_port = pintfhdl->io_ops._write_port; -+ -+ ret = _write_port(pintfhdl, addr, cnt, pmem); -+ -+ _func_exit_; -+ -+ return ret; -+} -+ -+u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms) -+{ -+ int ret = _SUCCESS; -+ struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem; -+ struct submit_ctx sctx; -+ -+ rtw_sctx_init(&sctx, timeout_ms); -+ pxmitbuf->sctx = &sctx; -+ -+ ret = _rtw_write_port(adapter, addr, cnt, pmem); -+ -+ if (ret == _SUCCESS) -+ ret = rtw_sctx_wait(&sctx); -+ -+ return ret; -+} -+ -+void _rtw_write_port_cancel(_adapter *adapter) -+{ -+ void (*_write_port_cancel)(struct intf_hdl *pintfhdl); -+ struct io_priv *pio_priv = &adapter->iopriv; -+ struct intf_hdl *pintfhdl = &(pio_priv->intf); -+ -+ _write_port_cancel = pintfhdl->io_ops._write_port_cancel; -+ -+ if(_write_port_cancel) -+ _write_port_cancel(pintfhdl); -+ -+} -+ -+int rtw_init_io_priv(_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)) -+{ -+ struct io_priv *piopriv = &padapter->iopriv; -+ struct intf_hdl *pintf = &piopriv->intf; -+ -+ if (set_intf_ops == NULL) -+ return _FAIL; -+ -+ piopriv->padapter = padapter; -+ pintf->padapter = padapter; -+ pintf->pintf_dev = adapter_to_dvobj(padapter); -+ -+ set_intf_ops(&pintf->io_ops); -+ -+ return _SUCCESS; -+} -+ -+#ifdef DBG_IO -+ -+u16 read_sniff_ranges[][2] = { -+ //{0x550, 0x551}, -+}; -+ -+u16 write_sniff_ranges[][2] = { -+ //{0x550, 0x551}, -+ //{0x4c, 0x4c}, -+}; -+ -+int read_sniff_num = sizeof(read_sniff_ranges)/sizeof(u16)/2; -+int write_sniff_num = sizeof(write_sniff_ranges)/sizeof(u16)/2; -+ -+bool match_read_sniff_ranges(u16 addr, u16 len) -+{ -+ int i; -+ for (i = 0; i read_sniff_ranges[i][0] && addr <= read_sniff_ranges[i][1]) -+ return _TRUE; -+ } -+ -+ return _FALSE; -+} -+ -+bool match_write_sniff_ranges(u16 addr, u16 len) -+{ -+ int i; -+ for (i = 0; i write_sniff_ranges[i][0] && addr <= write_sniff_ranges[i][1]) -+ return _TRUE; -+ } -+ -+ return _FALSE; -+} -+ -+u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line) -+{ -+ u8 val = _rtw_read8(adapter, addr); -+ -+ if (match_read_sniff_ranges(addr, 1)) -+ DBG_871X("DBG_IO %s:%d rtw_read8(0x%04x) return 0x%02x\n", caller, line, addr, val); -+ -+ return val; -+} -+ -+u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line) -+{ -+ u16 val = _rtw_read16(adapter, addr); -+ -+ if (match_read_sniff_ranges(addr, 2)) -+ DBG_871X("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x\n", caller, line, addr, val); -+ -+ return val; -+} -+ -+u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line) -+{ -+ u32 val = _rtw_read32(adapter, addr); -+ -+ if (match_read_sniff_ranges(addr, 4)) -+ DBG_871X("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x\n", caller, line, addr, val); -+ -+ return val; -+} -+ -+int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, 1)) -+ DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val); -+ -+ return _rtw_write8(adapter, addr, val); -+} -+int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, 2)) -+ DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val); -+ -+ return _rtw_write16(adapter, addr, val); -+} -+int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, 4)) -+ DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val); -+ -+ return _rtw_write32(adapter, addr, val); -+} -+int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, length)) -+ DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length); -+ -+ return _rtw_writeN(adapter, addr, length, data); -+} -+#endif -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c -@@ -0,0 +1,196 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_IOCTL_QUERY_C_ -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+#ifdef PLATFORM_WINDOWS -+// -+// Added for WPA2-PSK, by Annie, 2005-09-20. -+// -+u8 -+query_802_11_capability( -+ _adapter* Adapter, -+ u8* pucBuf, -+ u32 * pulOutLen -+) -+{ -+ static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] = -+ { -+ {Ndis802_11AuthModeOpen, Ndis802_11EncryptionDisabled}, -+ {Ndis802_11AuthModeOpen, Ndis802_11Encryption1Enabled}, -+ {Ndis802_11AuthModeShared, Ndis802_11EncryptionDisabled}, -+ {Ndis802_11AuthModeShared, Ndis802_11Encryption1Enabled}, -+ {Ndis802_11AuthModeWPA, Ndis802_11Encryption2Enabled}, -+ {Ndis802_11AuthModeWPA, Ndis802_11Encryption3Enabled}, -+ {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption2Enabled}, -+ {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption3Enabled}, -+ {Ndis802_11AuthModeWPANone, Ndis802_11Encryption2Enabled}, -+ {Ndis802_11AuthModeWPANone, Ndis802_11Encryption3Enabled}, -+ {Ndis802_11AuthModeWPA2, Ndis802_11Encryption2Enabled}, -+ {Ndis802_11AuthModeWPA2, Ndis802_11Encryption3Enabled}, -+ {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption2Enabled}, -+ {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption3Enabled} -+ }; -+ static ULONG ulNumOfPairSupported = sizeof(szAuthEnc)/sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION); -+ NDIS_802_11_CAPABILITY * pCap = (NDIS_802_11_CAPABILITY *)pucBuf; -+ u8* pucAuthEncryptionSupported = (u8*) pCap->AuthenticationEncryptionSupported; -+ -+ -+ pCap->Length = sizeof(NDIS_802_11_CAPABILITY); -+ if(ulNumOfPairSupported > 1 ) -+ pCap->Length += (ulNumOfPairSupported-1) * sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION); -+ -+ pCap->Version = 2; -+ pCap->NoOfPMKIDs = NUM_PMKID_CACHE; -+ pCap->NoOfAuthEncryptPairsSupported = ulNumOfPairSupported; -+ -+ if( sizeof (szAuthEnc) <= 240 ) // 240 = 256 - 4*4 // SecurityInfo.szCapability: only 256 bytes in size. -+ { -+ _rtw_memcpy( pucAuthEncryptionSupported, (u8*)szAuthEnc, sizeof (szAuthEnc) ); -+ *pulOutLen = pCap->Length; -+ return _TRUE; -+ } -+ else -+ { -+ *pulOutLen = 0; -+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("_query_802_11_capability(): szAuthEnc size is too large.\n")); -+ return _FALSE; -+ } -+} -+ -+u8 query_802_11_association_information( _adapter *padapter,PNDIS_802_11_ASSOCIATION_INFORMATION pAssocInfo) -+{ -+ struct wlan_network *tgt_network; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct security_priv *psecuritypriv=&(padapter->securitypriv); -+ WLAN_BSSID_EX *psecnetwork=(WLAN_BSSID_EX*)&(psecuritypriv->sec_bss); -+ u8 * pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); -+ unsigned char i,*auth_ie,*supp_ie; -+ -+ //NdisZeroMemory(pAssocInfo, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)); -+ _rtw_memset(pAssocInfo, 0, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)); -+ //pAssocInfo->Length = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); -+ -+ //------------------------------------------------------ -+ // Association Request related information -+ //------------------------------------------------------ -+ // Req_1. AvailableRequestFixedIEs -+ if(psecnetwork!=NULL){ -+ -+ pAssocInfo->AvailableRequestFixedIEs |= NDIS_802_11_AI_REQFI_CAPABILITIES|NDIS_802_11_AI_REQFI_CURRENTAPADDRESS; -+ pAssocInfo->RequestFixedIEs.Capabilities = (unsigned short)* & psecnetwork->IEs[10]; -+ _rtw_memcpy(pAssocInfo->RequestFixedIEs.CurrentAPAddress, -+ & psecnetwork->MacAddress, 6); -+ -+ pAssocInfo->OffsetRequestIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); -+ -+ if(check_fwstate( pmlmepriv, _FW_UNDER_LINKING|_FW_LINKED)==_TRUE) -+ { -+ -+ if(psecuritypriv->ndisauthtype>=Ndis802_11AuthModeWPA2) -+ pDest[0] =48; //RSN Information Element -+ else -+ pDest[0] =221; //WPA(SSN) Information Element -+ -+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n Adapter->ndisauthtype==Ndis802_11AuthModeWPA)?0xdd:0x30 [%d]",pDest[0])); -+ supp_ie=&psecuritypriv->supplicant_ie[0]; -+ for(i=0;inetwork.IELength=%d\n\n", i,(int)psecnetwork->IELength)); -+ while((iRequestIELength += (2 + supp_ie[1+i]);// (2 + psecnetwork->IEs[1+i]+4); -+ -+ } -+ -+ -+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n psecnetwork != NULL,fwstate==_FW_UNDER_LINKING \n")); -+ -+ } -+ -+ -+ //------------------------------------------------------ -+ // Association Response related information -+ //------------------------------------------------------ -+ -+ if(check_fwstate( pmlmepriv, _FW_LINKED)==_TRUE) -+ { -+ tgt_network =&(pmlmepriv->cur_network); -+ if(tgt_network!=NULL){ -+ pAssocInfo->AvailableResponseFixedIEs = -+ NDIS_802_11_AI_RESFI_CAPABILITIES -+ |NDIS_802_11_AI_RESFI_ASSOCIATIONID -+ ; -+ -+ pAssocInfo->ResponseFixedIEs.Capabilities =(unsigned short)* & tgt_network->network.IEs[10]; -+ pAssocInfo->ResponseFixedIEs.StatusCode = 0; -+ pAssocInfo->ResponseFixedIEs.AssociationId =(unsigned short) tgt_network->aid; -+ -+ pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)+pAssocInfo->RequestIELength; -+ auth_ie=&psecuritypriv->authenticator_ie[0]; -+ -+ for(i=0;i0){ -+ _rtw_memcpy((u8 *)&pDest[0],&auth_ie[1],i); -+ pAssocInfo->ResponseIELength =i; -+ } -+ -+ -+ pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength; -+ -+ -+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n tgt_network != NULL,fwstate==_FW_LINKED \n")); -+ } -+ } -+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n exit query_802_11_association_information \n")); -+_func_exit_; -+ -+ return _TRUE; -+} -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c -@@ -0,0 +1,1031 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_IOCTL_RTL_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef CONFIG_MP_INCLUDED -+#include -+#include -+#endif -+ -+struct oid_obj_priv oid_rtl_seg_01_01[] = -+{ -+ {1, &oid_null_function}, //0x80 -+ {1, &oid_null_function}, //0x81 -+ {1, &oid_null_function}, //0x82 -+ {1, &oid_null_function}, //0x83//OID_RT_SET_SNIFFER_MODE -+ {1, &oid_rt_get_signal_quality_hdl}, //0x84 -+ {1, &oid_rt_get_small_packet_crc_hdl}, //0x85 -+ {1, &oid_rt_get_middle_packet_crc_hdl}, //0x86 -+ {1, &oid_rt_get_large_packet_crc_hdl}, //0x87 -+ {1, &oid_rt_get_tx_retry_hdl}, //0x88 -+ {1, &oid_rt_get_rx_retry_hdl}, //0x89 -+ {1, &oid_rt_pro_set_fw_dig_state_hdl}, //0x8A -+ {1, &oid_rt_pro_set_fw_ra_state_hdl} , //0x8B -+ {1, &oid_null_function}, //0x8C -+ {1, &oid_null_function}, //0x8D -+ {1, &oid_null_function}, //0x8E -+ {1, &oid_null_function}, //0x8F -+ {1, &oid_rt_get_rx_total_packet_hdl}, //0x90 -+ {1, &oid_rt_get_tx_beacon_ok_hdl}, //0x91 -+ {1, &oid_rt_get_tx_beacon_err_hdl}, //0x92 -+ {1, &oid_rt_get_rx_icv_err_hdl}, //0x93 -+ {1, &oid_rt_set_encryption_algorithm_hdl}, //0x94 -+ {1, &oid_null_function}, //0x95 -+ {1, &oid_rt_get_preamble_mode_hdl}, //0x96 -+ {1, &oid_null_function}, //0x97 -+ {1, &oid_rt_get_ap_ip_hdl}, //0x98 -+ {1, &oid_rt_get_channelplan_hdl}, //0x99 -+ {1, &oid_rt_set_preamble_mode_hdl}, //0x9A -+ {1, &oid_rt_set_bcn_intvl_hdl}, //0x9B -+ {1, &oid_null_function}, //0x9C -+ {1, &oid_rt_dedicate_probe_hdl}, //0x9D -+ {1, &oid_null_function}, //0x9E -+ {1, &oid_null_function}, //0x9F -+ {1, &oid_null_function}, //0xA0 -+ {1, &oid_null_function}, //0xA1 -+ {1, &oid_null_function}, //0xA2 -+ {1, &oid_null_function}, //0xA3 -+ {1, &oid_null_function}, //0xA4 -+ {1, &oid_null_function}, //0xA5 -+ {1, &oid_null_function}, //0xA6 -+ {1, &oid_rt_get_total_tx_bytes_hdl}, //0xA7 -+ {1, &oid_rt_get_total_rx_bytes_hdl}, //0xA8 -+ {1, &oid_rt_current_tx_power_level_hdl}, //0xA9 -+ {1, &oid_rt_get_enc_key_mismatch_count_hdl}, //0xAA -+ {1, &oid_rt_get_enc_key_match_count_hdl}, //0xAB -+ {1, &oid_rt_get_channel_hdl}, //0xAC -+ {1, &oid_rt_set_channelplan_hdl}, //0xAD -+ {1, &oid_rt_get_hardware_radio_off_hdl}, //0xAE -+ {1, &oid_null_function}, //0xAF -+ {1, &oid_null_function}, //0xB0 -+ {1, &oid_null_function}, //0xB1 -+ {1, &oid_null_function}, //0xB2 -+ {1, &oid_null_function}, //0xB3 -+ {1, &oid_rt_get_key_mismatch_hdl}, //0xB4 -+ {1, &oid_null_function}, //0xB5 -+ {1, &oid_null_function}, //0xB6 -+ {1, &oid_null_function}, //0xB7 -+ {1, &oid_null_function}, //0xB8 -+ {1, &oid_null_function}, //0xB9 -+ {1, &oid_null_function}, //0xBA -+ {1, &oid_rt_supported_wireless_mode_hdl}, //0xBB -+ {1, &oid_rt_get_channel_list_hdl}, //0xBC -+ {1, &oid_rt_get_scan_in_progress_hdl}, //0xBD -+ {1, &oid_null_function}, //0xBE -+ {1, &oid_null_function}, //0xBF -+ {1, &oid_null_function}, //0xC0 -+ {1, &oid_rt_forced_data_rate_hdl}, //0xC1 -+ {1, &oid_rt_wireless_mode_for_scan_list_hdl}, //0xC2 -+ {1, &oid_rt_get_bss_wireless_mode_hdl}, //0xC3 -+ {1, &oid_rt_scan_with_magic_packet_hdl}, //0xC4 -+ {1, &oid_null_function}, //0xC5 -+ {1, &oid_null_function}, //0xC6 -+ {1, &oid_null_function}, //0xC7 -+ {1, &oid_null_function}, //0xC8 -+ {1, &oid_null_function}, //0xC9 -+ {1, &oid_null_function}, //0xCA -+ {1, &oid_null_function}, //0xCB -+ {1, &oid_null_function}, //0xCC -+ {1, &oid_null_function}, //0xCD -+ {1, &oid_null_function}, //0xCE -+ {1, &oid_null_function}, //0xCF -+ -+}; -+ -+struct oid_obj_priv oid_rtl_seg_01_03[] = -+{ -+ {1, &oid_rt_ap_get_associated_station_list_hdl}, //0x00 -+ {1, &oid_null_function}, //0x01 -+ {1, &oid_rt_ap_switch_into_ap_mode_hdl}, //0x02 -+ {1, &oid_null_function}, //0x03 -+ {1, &oid_rt_ap_supported_hdl}, //0x04 -+ {1, &oid_rt_ap_set_passphrase_hdl}, //0x05 -+ -+}; -+ -+struct oid_obj_priv oid_rtl_seg_01_11[] = -+{ -+ {1, &oid_null_function}, //0xC0 OID_RT_PRO_RX_FILTER -+ {1, &oid_null_function}, //0xC1 OID_CE_USB_WRITE_REGISTRY -+ {1, &oid_null_function}, //0xC2 OID_CE_USB_READ_REGISTRY -+ {1, &oid_null_function}, //0xC3 OID_RT_PRO_SET_INITIAL_GAIN -+ {1, &oid_null_function}, //0xC4 OID_RT_PRO_SET_BB_RF_STANDBY_MODE -+ {1, &oid_null_function}, //0xC5 OID_RT_PRO_SET_BB_RF_SHUTDOWN_MODE -+ {1, &oid_null_function}, //0xC6 OID_RT_PRO_SET_TX_CHARGE_PUMP -+ {1, &oid_null_function}, //0xC7 OID_RT_PRO_SET_RX_CHARGE_PUMP -+ {1, &oid_rt_pro_rf_write_registry_hdl}, //0xC8 -+ {1, &oid_rt_pro_rf_read_registry_hdl}, //0xC9 -+ {1, &oid_null_function} //0xCA OID_RT_PRO_QUERY_RF_TYPE -+ -+}; -+ -+struct oid_obj_priv oid_rtl_seg_03_00[] = -+{ -+ {1, &oid_null_function}, //0x00 -+ {1, &oid_rt_get_connect_state_hdl}, //0x01 -+ {1, &oid_null_function}, //0x02 -+ {1, &oid_null_function}, //0x03 -+ {1, &oid_rt_set_default_key_id_hdl}, //0x04 -+ -+ -+}; -+ -+ -+//************** oid_rtl_seg_01_01 section start ************** -+ -+NDIS_STATUS oid_rt_pro_set_fw_dig_state_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ _irqL oldirql; -+ -+ _func_enter_; -+ -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ _irqlevel_changed_(&oldirql,LOWER); -+ if(poid_par_priv->information_buf_len >= sizeof(struct setdig_parm)) -+ { -+ //DEBUG_ERR(("===> oid_rt_pro_set_fw_dig_state_hdl. type:0x%02x.\n",*((unsigned char*)poid_par_priv->information_buf ))); -+ if(!rtw_setfwdig_cmd(Adapter,*((unsigned char*)poid_par_priv->information_buf ))) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ -+ } -+ else{ -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ _irqlevel_changed_(&oldirql,RAISE); -+ _func_exit_; -+#endif -+ return status; -+} -+//----------------------------------------------------------------------------- -+NDIS_STATUS oid_rt_pro_set_fw_ra_state_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ _irqL oldirql; -+ -+ _func_enter_; -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ -+ _irqlevel_changed_(&oldirql,LOWER); -+ -+ if(poid_par_priv->information_buf_len >= sizeof(struct setra_parm)) -+ { -+ //DEBUG_ERR(("===> oid_rt_pro_set_fw_ra_state_hdl. type:0x%02x.\n",*((unsigned char*)poid_par_priv->information_buf ))); -+ if(!rtw_setfwra_cmd(Adapter,*((unsigned char*)poid_par_priv->information_buf ))) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ -+ } -+ else{ -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ _irqlevel_changed_(&oldirql,RAISE); -+ _func_exit_; -+#endif -+ return status; -+} -+//----------------------------------------------------------------------------- -+NDIS_STATUS oid_rt_get_signal_quality_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ //DEBUG_ERR(("<**********************oid_rt_get_signal_quality_hdl \n")); -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+#if 0 -+ if(pMgntInfo->mAssoc || pMgntInfo->mIbss) -+ { -+ ulInfo = pAdapter->RxStats.SignalQuality; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ ulInfo = 0xffffffff; // It stands for -1 in 4-byte integer. -+ } -+ break; -+#endif -+ -+ return status; -+} -+ -+//------------------------------------------------------------------------------ -+ -+NDIS_STATUS oid_rt_get_small_packet_crc_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) ) -+ { -+ *(ULONG *)poid_par_priv->information_buf = padapter->recvpriv.rx_smallpacket_crcerr; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) ) -+ { -+ *(ULONG *)poid_par_priv->information_buf = padapter->recvpriv.rx_middlepacket_crcerr; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_large_packet_crc_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) ) -+ { -+ *(ULONG *)poid_par_priv->information_buf = padapter->recvpriv.rx_largepacket_crcerr; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+ -+ return status; -+} -+ -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_tx_retry_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_rx_retry_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_rx_total_packet_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) ) -+ { -+ *(u64 *)poid_par_priv->information_buf = padapter->recvpriv.rx_pkts + padapter->recvpriv.rx_drop; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_rx_icv_err_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if(poid_par_priv->information_buf_len>= sizeof(u32)) -+ { -+ //_rtw_memcpy(*(uint *)poid_par_priv->information_buf,padapter->recvpriv.rx_icv_err,sizeof(u32)); -+ *(uint *)poid_par_priv->information_buf = padapter->recvpriv.rx_icv_err; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH ; -+ } -+ -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_preamble_mode_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ ULONG preamblemode = 0 ; -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if(poid_par_priv->information_buf_len>= sizeof(ULONG)) -+ { -+ if(padapter->registrypriv.preamble == PREAMBLE_LONG) -+ preamblemode = 0; -+ else if (padapter->registrypriv.preamble == PREAMBLE_AUTO) -+ preamblemode = 1; -+ else if (padapter->registrypriv.preamble == PREAMBLE_SHORT) -+ preamblemode = 2; -+ -+ -+ *(ULONG *)poid_par_priv->information_buf = preamblemode ; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH ; -+ } -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_ap_ip_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_get_channelplan_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ struct eeprom_priv* peeprompriv = &padapter->eeprompriv; -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ *(u16 *)poid_par_priv->information_buf = peeprompriv->channel_plan ; -+ -+ return status; -+} -+NDIS_STATUS oid_rt_set_channelplan_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ struct eeprom_priv* peeprompriv = &padapter->eeprompriv; -+ -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ peeprompriv->channel_plan = *(u16 *)poid_par_priv->information_buf ; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_set_preamble_mode_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ ULONG preamblemode = 0; -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if(poid_par_priv->information_buf_len>= sizeof(ULONG)) -+ { -+ preamblemode = *(ULONG *)poid_par_priv->information_buf ; -+ if( preamblemode == 0) -+ padapter->registrypriv.preamble = PREAMBLE_LONG; -+ else if (preamblemode==1 ) -+ padapter->registrypriv.preamble = PREAMBLE_AUTO; -+ else if ( preamblemode==2 ) -+ padapter->registrypriv.preamble = PREAMBLE_SHORT; -+ -+ *(ULONG *)poid_par_priv->information_buf = preamblemode ; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH ; -+ } -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_set_bcn_intvl_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_dedicate_probe_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if(poid_par_priv->information_buf_len>= sizeof(ULONG)) -+ { -+ *(u64 *)poid_par_priv->information_buf = padapter->xmitpriv.tx_bytes; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH ; -+ } -+ -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if(poid_par_priv->information_buf_len>= sizeof(ULONG)) -+ { -+ //_rtw_memcpy(*(uint *)poid_par_priv->information_buf,padapter->recvpriv.rx_icv_err,sizeof(u32)); -+ *(u64 *)poid_par_priv->information_buf = padapter->recvpriv.rx_bytes; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else -+ { -+ status = NDIS_STATUS_INVALID_LENGTH ; -+ } -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_current_tx_power_level_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ NDIS_802_11_CONFIGURATION *pnic_Config; -+ -+ ULONG channelnum; -+ -+ _func_enter_; -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) -+ pnic_Config = &pmlmepriv->cur_network.network.Configuration; -+ else -+ pnic_Config = &padapter->registrypriv.dev_network.Configuration; -+ -+ channelnum = pnic_Config->DSConfig; -+ *(ULONG *)poid_par_priv->information_buf = channelnum; -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ _func_exit_; -+ -+ -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_key_mismatch_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_supported_wireless_mode_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ ULONG ulInfo = 0 ; -+ //DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl \n")); -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if(poid_par_priv->information_buf_len >= sizeof(ULONG)){ -+ ulInfo |= 0x0100; //WIRELESS_MODE_B -+ ulInfo |= 0x0200; //WIRELESS_MODE_G -+ ulInfo |= 0x0400; //WIRELESS_MODE_A -+ -+ *(ULONG *) poid_par_priv->information_buf = ulInfo; -+ //DEBUG_ERR(("<===oid_rt_supported_wireless_mode %x\n",ulInfo)); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } -+ else{ -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_channel_list_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_scan_in_progress_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+ -+ -+NDIS_STATUS oid_rt_forced_data_rate_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+NDIS_STATUS oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+NDIS_STATUS oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+//************** oid_rtl_seg_01_01 section end ************** -+ -+//************** oid_rtl_seg_01_03 section start ************** -+NDIS_STATUS oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+NDIS_STATUS oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+NDIS_STATUS oid_rt_ap_supported_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ return status; -+} -+NDIS_STATUS oid_rt_ap_set_passphrase_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+ -+//************** oid_rtl_seg_01_03 section end ************** -+ -+//**************** oid_rtl_seg_01_11 section start **************** -+NDIS_STATUS oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ _irqL oldirql; -+ _func_enter_; -+ //DEBUG_ERR(("<**********************oid_rt_pro_rf_write_registry_hdl \n")); -+ if(poid_par_priv->type_of_oid != SET_OID) //QUERY_OID -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ _irqlevel_changed_(&oldirql,LOWER); -+ if(poid_par_priv->information_buf_len== (sizeof(unsigned long)*3)) -+ { -+ //RegOffsetValue - The offset of RF register to write. -+ //RegDataWidth - The data width of RF register to write. -+ //RegDataValue - The value to write. -+ //RegOffsetValue = *((unsigned long*)InformationBuffer); -+ //RegDataWidth = *((unsigned long*)InformationBuffer+1); -+ //RegDataValue = *((unsigned long*)InformationBuffer+2); -+ if(!rtw_setrfreg_cmd(Adapter, -+ *(unsigned char*)poid_par_priv->information_buf, -+ (unsigned long)(*((unsigned long*)poid_par_priv->information_buf+2)))) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ -+ } -+ else{ -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ _irqlevel_changed_(&oldirql,RAISE); -+ _func_exit_; -+ -+ return status; -+} -+ -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ _irqL oldirql; -+ _func_enter_; -+ -+ //DEBUG_ERR(("<**********************oid_rt_pro_rf_read_registry_hdl \n")); -+ if(poid_par_priv->type_of_oid != SET_OID) //QUERY_OID -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ _irqlevel_changed_(&oldirql,LOWER); -+ if(poid_par_priv->information_buf_len== (sizeof(unsigned long)*3)) -+ { -+ if(Adapter->mppriv.act_in_progress == _TRUE) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ else -+ { -+ //init workparam -+ Adapter->mppriv.act_in_progress = _TRUE; -+ Adapter->mppriv.workparam.bcompleted= _FALSE; -+ Adapter->mppriv.workparam.act_type = MPT_READ_RF; -+ Adapter->mppriv.workparam.io_offset = *(unsigned long*)poid_par_priv->information_buf; -+ Adapter->mppriv.workparam.io_value = 0xcccccccc; -+ -+ //RegOffsetValue - The offset of RF register to read. -+ //RegDataWidth - The data width of RF register to read. -+ //RegDataValue - The value to read. -+ //RegOffsetValue = *((unsigned long*)InformationBuffer); -+ //RegDataWidth = *((unsigned long*)InformationBuffer+1); -+ //RegDataValue = *((unsigned long*)InformationBuffer+2); -+ if(!rtw_getrfreg_cmd(Adapter, -+ *(unsigned char*)poid_par_priv->information_buf, -+ (unsigned char*)&Adapter->mppriv.workparam.io_value)) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ } -+ -+ -+ } -+ else { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ _irqlevel_changed_(&oldirql,RAISE); -+ _func_exit_; -+#endif -+ return status; -+} -+ -+//**************** oid_rtl_seg_01_11 section end**************** -+ -+ -+//************** oid_rtl_seg_03_00 section start ************** -+enum _CONNECT_STATE_{ -+ CHECKINGSTATUS, -+ ASSOCIATED, -+ ADHOCMODE, -+ NOTASSOCIATED -+}; -+ -+NDIS_STATUS oid_rt_get_connect_state_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ ULONG ulInfo; -+ -+ if(poid_par_priv->type_of_oid != QUERY_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ // nStatus==0 CheckingStatus -+ // nStatus==1 Associated -+ // nStatus==2 AdHocMode -+ // nStatus==3 NotAssociated -+ -+ if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) -+ ulInfo = CHECKINGSTATUS; -+ else if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ ulInfo = ASSOCIATED; -+ else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)== _TRUE) -+ ulInfo = ADHOCMODE; -+ else -+ ulInfo = NOTASSOCIATED ; -+ -+ *(ULONG *)poid_par_priv->information_buf = ulInfo; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+#if 0 -+ // Rearrange the order to let the UI still shows connection when scan is in progress -+ RT_TRACE(COMP_OID_QUERY, DBG_LOUD, ("===> Query OID_RT_GET_CONNECT_STATE.\n")); -+ if(pMgntInfo->mAssoc) -+ ulInfo = 1; -+ else if(pMgntInfo->mIbss) -+ ulInfo = 2; -+ else if(pMgntInfo->bScanInProgress) -+ ulInfo = 0; -+ else -+ ulInfo = 3; -+ ulInfoLen = sizeof(ULONG); -+ RT_TRACE(COMP_OID_QUERY, DBG_LOUD, ("<=== Query OID_RT_GET_CONNECT_STATE: %d\n", ulInfo)); -+#endif -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_set_default_key_id_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ if(poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ return status; -+} -+//************** oid_rtl_seg_03_00 section end ************** ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c -@@ -0,0 +1,1494 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_IOCTL_SET_C_ -+ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_USB_HCI -+#include -+#include -+#endif -+#ifdef CONFIG_SDIO_HCI -+#include -+#endif -+ -+extern void indicate_wx_scan_complete_event(_adapter *padapter); -+ -+#define IS_MAC_ADDRESS_BROADCAST(addr) \ -+( \ -+ ( (addr[0] == 0xff) && (addr[1] == 0xff) && \ -+ (addr[2] == 0xff) && (addr[3] == 0xff) && \ -+ (addr[4] == 0xff) && (addr[5] == 0xff) ) ? _TRUE : _FALSE \ -+) -+ -+u8 rtw_validate_bssid(const u8 *bssid) -+{ -+ u8 ret = _TRUE; -+ -+ if (is_zero_mac_addr(bssid) -+ || is_broadcast_mac_addr(bssid) -+ || is_multicast_mac_addr(bssid) -+ ) { -+ ret = _FALSE; -+ } -+ -+ return ret; -+} -+ -+u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid) -+{ -+ u8 i; -+ u8 ret=_TRUE; -+ -+_func_enter_; -+ -+ if (ssid->SsidLength > 32) { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n")); -+ ret= _FALSE; -+ goto exit; -+ } -+ -+#ifdef CONFIG_VALIDATE_SSID -+ for(i = 0; i < ssid->SsidLength; i++) -+ { -+ //wifi, printable ascii code must be supported -+ if(!( (ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e) )){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n")); -+ ret= _FALSE; -+ break; -+ } -+ } -+#endif /* CONFIG_VALIDATE_SSID */ -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+u8 rtw_do_join(_adapter * padapter); -+u8 rtw_do_join(_adapter * padapter) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ u8* pibss = NULL; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ u8 ret=_SUCCESS; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("\n rtw_do_join: phead = %p; plist = %p \n\n\n", phead, plist)); -+ -+ pmlmepriv->cur_network.join_res = -2; -+ -+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING); -+ -+ pmlmepriv->pscanned = plist; -+ -+ pmlmepriv->to_join = _TRUE; -+ -+ if(_rtw_queue_empty(queue)== _TRUE) -+ { -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ -+ //when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty -+ //we try to issue sitesurvey firstly -+ -+ if (pmlmepriv->LinkDetectInfo.bBusyTraffic ==_FALSE -+ || rtw_to_roaming(padapter) > 0 -+ ) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_do_join(): site survey if scanned_queue is empty\n.")); -+ // submit site_survey_cmd -+ if(_SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ) { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_do_join(): site survey return error\n.")); -+ } -+ } -+ -+ goto exit; -+ } -+ else -+ { -+ int select_ret; -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ if((select_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))==_SUCCESS) -+ { -+ pmlmepriv->to_join = _FALSE; -+ _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); -+ } -+ else if(ret == 2)//there is no need to wait for join -+ { -+ ret = _SUCCESS; -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ rtw_indicate_connect(padapter); -+ } -+ else -+ { -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE) -+ { -+ // submit createbss_cmd to change to a ADHOC_MASTER -+ -+ //pmlmepriv->lock has been acquired by caller... -+ WLAN_BSSID_EX *pdev_network = &(padapter->registrypriv.dev_network); -+ -+ pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; -+ -+ pibss = padapter->registrypriv.dev_network.MacAddress; -+ -+ _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); -+ _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); -+ -+ rtw_update_registrypriv_dev_network(padapter); -+ -+ rtw_generate_random_ibss(pibss); -+ -+ if(rtw_createbss_cmd(padapter)!=_SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n ")); -+ ret = _FALSE; -+ goto exit; -+ } -+ -+ pmlmepriv->to_join = _FALSE; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n ")); -+ -+ } -+ else -+ { -+ // can't associate ; reset under-linking -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ -+#if 0 -+ if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)) -+ { -+ if(_rtw_memcmp(pmlmepriv->cur_network.network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) -+ { -+ // for funk to do roaming -+ // funk will reconnect, but funk will not sitesurvey before reconnect -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("for funk to do roaming")); -+ if(pmlmepriv->sitesurveyctrl.traffic_busy==_FALSE) -+ rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0); -+ } -+ -+ } -+#endif -+ -+ //when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue -+ //we try to issue sitesurvey firstly -+ if(pmlmepriv->LinkDetectInfo.bBusyTraffic==_FALSE -+ || rtw_to_roaming(padapter) > 0 -+ ) -+ { -+ //DBG_871X("rtw_do_join() when no desired bss in scanning queue \n"); -+ if( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n.")); -+ } -+ } -+ -+ -+ } -+ -+ } -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+#ifdef PLATFORM_WINDOWS -+u8 rtw_pnp_set_power_wakeup(_adapter* padapter) -+{ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("==>rtw_pnp_set_power_wakeup!!!\n")); -+ -+ res = rtw_setstandby_cmd(padapter, 0); -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("<==rtw_pnp_set_power_wakeup!!!\n")); -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_pnp_set_power_sleep(_adapter* padapter) -+{ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("==>rtw_pnp_set_power_sleep!!!\n")); -+ //DbgPrint("+rtw_pnp_set_power_sleep\n"); -+ -+ res = rtw_setstandby_cmd(padapter, 1); -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("<==rtw_pnp_set_power_sleep!!!\n")); -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_set_802_11_reload_defaults(_adapter * padapter, NDIS_802_11_RELOAD_DEFAULTS reloadDefaults) -+{ -+_func_enter_; -+ -+ switch( reloadDefaults) -+ { -+ case Ndis802_11ReloadWEPKeys: -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("SetInfo OID_802_11_RELOAD_DEFAULTS : Ndis802_11ReloadWEPKeys\n")); -+ break; -+ } -+ -+ // SecClearAllKeys(Adapter); -+ // 8711 CAM was not for En/Decrypt only -+ // so, we can't clear all keys. -+ // should we disable WPAcfg (ox0088) bit 1-2, instead of clear all CAM -+ -+ //TO DO... -+ -+_func_exit_; -+ -+ return _TRUE; -+} -+ -+u8 set_802_11_test(_adapter* padapter, NDIS_802_11_TEST *test) -+{ -+ u8 ret=_TRUE; -+ -+_func_enter_; -+ -+ switch(test->Type) -+ { -+ case 1: -+ NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->AuthenticationEvent, test->Length - 8); -+ NdisMIndicateStatusComplete(padapter->hndis_adapter); -+ break; -+ -+ case 2: -+ NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->RssiTrigger, sizeof(NDIS_802_11_RSSI)); -+ NdisMIndicateStatusComplete(padapter->hndis_adapter); -+ break; -+ -+ default: -+ ret=_FALSE; -+ break; -+ } -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+u8 rtw_set_802_11_pmkid(_adapter* padapter, NDIS_802_11_PMKID *pmkid) -+{ -+ u8 ret=_SUCCESS; -+ -+ return ret; -+} -+ -+#endif -+ -+u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid) -+{ -+ _irqL irqL; -+ u8 status=_SUCCESS; -+ u32 cur_time = 0; -+ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_, -+ ("+rtw_set_802_11_bssid: bssid="MAC_FMT"\n", MAC_ARG(bssid) )); -+ -+ if ((bssid[0]==0x00 && bssid[1]==0x00 && bssid[2]==0x00 && bssid[3]==0x00 && bssid[4]==0x00 &&bssid[5]==0x00) || -+ (bssid[0]==0xFF && bssid[1]==0xFF && bssid[2]==0xFF && bssid[3]==0xFF && bssid[4]==0xFF &&bssid[5]==0xFF)) -+ { -+ status = _FAIL; -+ goto exit; -+ } -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ -+ DBG_871X("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ goto handle_tkip_countermeasure; -+ } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { -+ goto release_mlme_lock; -+ } -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n")); -+ -+ if (_rtw_memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN) == _TRUE) -+ { -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _FALSE) -+ goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. -+ } else { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set BSSID not the same bssid\n")); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_bssid="MAC_FMT"\n", MAC_ARG(bssid) )); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("cur_bssid="MAC_FMT"\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress) )); -+ -+ rtw_disassoc_cmd(padapter, 0, _TRUE); -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ rtw_indicate_disconnect(padapter); -+ -+ rtw_free_assoc_resources(padapter, 1); -+ -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { -+ _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); -+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); -+ } -+ } -+ } -+ -+handle_tkip_countermeasure: -+ if (rtw_handle_tkip_countermeasure(padapter, __func__) == _FAIL) { -+ status = _FAIL; -+ goto release_mlme_lock; -+ } -+ -+ _rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); -+ pmlmepriv->assoc_by_bssid=_TRUE; -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ pmlmepriv->to_join = _TRUE; -+ } -+ else { -+ status = rtw_do_join(padapter); -+ } -+ -+release_mlme_lock: -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+exit: -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, -+ ("rtw_set_802_11_bssid: status=%d\n", status)); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid) -+{ -+ _irqL irqL; -+ u8 status = _SUCCESS; -+ u32 cur_time = 0; -+ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wlan_network *pnetwork = &pmlmepriv->cur_network; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_, -+ ("+rtw_set_802_11_ssid: ssid=[%s] fw_state=0x%08x\n", -+ ssid->Ssid, get_fwstate(pmlmepriv))); -+ -+ if(padapter->hw_init_completed==_FALSE){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, -+ ("set_ssid: hw_init_completed==_FALSE=>exit!!!\n")); -+ status = _FAIL; -+ goto exit; -+ } -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ goto handle_tkip_countermeasure; -+ } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { -+ goto release_mlme_lock; -+ } -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, -+ ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n")); -+ -+ if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && -+ (_rtw_memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength) == _TRUE)) -+ { -+ if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _FALSE)) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, -+ ("Set SSID is the same ssid, fw_state=0x%08x\n", -+ get_fwstate(pmlmepriv))); -+ -+ if(rtw_is_same_ibss(padapter, pnetwork) == _FALSE) -+ { -+ //if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again -+ rtw_disassoc_cmd(padapter, 0, _TRUE); -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ rtw_indicate_disconnect(padapter); -+ -+ rtw_free_assoc_resources(padapter, 1); -+ -+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) { -+ _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); -+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); -+ } -+ } -+ else -+ { -+ goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. -+ } -+ } -+#ifdef CONFIG_LPS -+ else { -+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_JOINBSS, 1); -+ } -+#endif -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set SSID not the same ssid\n")); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_ssid=[%s] len=0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength)); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("assoc_ssid=[%s] len=0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength)); -+ -+ rtw_disassoc_cmd(padapter, 0, _TRUE); -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ rtw_indicate_disconnect(padapter); -+ -+ rtw_free_assoc_resources(padapter, 1); -+ -+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) { -+ _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE); -+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); -+ } -+ } -+ } -+ -+handle_tkip_countermeasure: -+ if (rtw_handle_tkip_countermeasure(padapter, __func__) == _FAIL) { -+ status = _FAIL; -+ goto release_mlme_lock; -+ } -+ -+ if (rtw_validate_ssid(ssid) == _FALSE) { -+ status = _FAIL; -+ goto release_mlme_lock; -+ } -+ -+ _rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID)); -+ pmlmepriv->assoc_by_bssid=_FALSE; -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ pmlmepriv->to_join = _TRUE; -+ } -+ else { -+ status = rtw_do_join(padapter); -+ } -+ -+release_mlme_lock: -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+exit: -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, -+ ("-rtw_set_802_11_ssid: status=%d\n", status)); -+ -+_func_exit_; -+ -+ return status; -+ -+} -+ -+u8 rtw_set_802_11_connect(_adapter *padapter, const u8 *bssid, NDIS_802_11_SSID *ssid) -+{ -+ _irqL irqL; -+ u8 status = _SUCCESS; -+ u32 cur_time = 0; -+ bool bssid_valid = _TRUE; -+ bool ssid_valid = _TRUE; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ if (!ssid || rtw_validate_ssid(ssid) == _FALSE) -+ ssid_valid = _FALSE; -+ -+ if (!bssid || rtw_validate_bssid(bssid) == _FALSE) -+ bssid_valid = _FALSE; -+ -+ if (ssid_valid == _FALSE && bssid_valid == _FALSE) { -+ DBG_871X(FUNC_ADPT_FMT" ssid:%p, ssid_valid:%d, bssid:%p, bssid_valid:%d\n", -+ FUNC_ADPT_ARG(padapter), ssid, ssid_valid, bssid, bssid_valid); -+ status = _FAIL; -+ goto exit; -+ } -+ -+ if(padapter->hw_init_completed==_FALSE){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, -+ ("set_ssid: hw_init_completed==_FALSE=>exit!!!\n")); -+ status = _FAIL; -+ goto exit; -+ } -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ LOG_LEVEL(_drv_info_, FUNC_ADPT_FMT" fw_state=0x%08x\n", -+ FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ goto handle_tkip_countermeasure; -+ } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { -+ goto release_mlme_lock; -+ } -+ -+handle_tkip_countermeasure: -+ if (rtw_handle_tkip_countermeasure(padapter, __func__) == _FAIL) { -+ status = _FAIL; -+ goto release_mlme_lock; -+ } -+ -+ if (ssid && ssid_valid) -+ _rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID)); -+ -+ if (bssid && bssid_valid) { -+ _rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); -+ pmlmepriv->assoc_by_bssid = _TRUE; -+ } -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ pmlmepriv->to_join = _TRUE; -+ } -+ else { -+ status = rtw_do_join(padapter); -+ } -+ -+release_mlme_lock: -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+ return status; -+} -+ -+/* -+rtw_set_802_11_infrastructure_mode(~) -+ ### NOTE:#### (!!!!) -+ MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock and scanned_queue->lock in sequence -+*/ -+u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter, -+ NDIS_802_11_NETWORK_INFRASTRUCTURE networktype) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wlan_network *cur_network = &pmlmepriv->cur_network; -+ NDIS_802_11_NETWORK_INFRASTRUCTURE* pold_state = &(cur_network->network.InfrastructureMode); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_notice_, -+ ("+rtw_set_802_11_infrastructure_mode: old=%d new=%d fw_state=0x%08x\n", -+ *pold_state, networktype, get_fwstate(pmlmepriv))); -+ -+ if(*pold_state != networktype) -+ { -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,(" change mode!")); -+ //DBG_871X("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv)); -+ -+ if(*pold_state==Ndis802_11APMode) -+ { -+ //change to other mode from Ndis802_11APMode -+ cur_network->join_res = -1; -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ stop_ap_mode(padapter); -+#endif -+ } -+ -+ if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) ||(*pold_state==Ndis802_11IBSS)) -+ rtw_disassoc_cmd(padapter, 0, _TRUE); -+ -+ if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)== _TRUE) ) -+ rtw_free_assoc_resources(padapter, 0); -+ -+ if((*pold_state == Ndis802_11Infrastructure) ||(*pold_state == Ndis802_11IBSS)) -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ rtw_indicate_disconnect(padapter); //will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not -+ } -+ } -+ -+ *pold_state = networktype; -+ -+ _clr_fwstate_(pmlmepriv, ~WIFI_NULL_STATE); -+ -+ switch(networktype) -+ { -+ case Ndis802_11IBSS: -+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); -+ break; -+ -+ case Ndis802_11Infrastructure: -+ set_fwstate(pmlmepriv, WIFI_STATION_STATE); -+ break; -+ -+ case Ndis802_11APMode: -+ set_fwstate(pmlmepriv, WIFI_AP_STATE); -+#ifdef CONFIG_NATIVEAP_MLME -+ start_ap_mode(padapter); -+ //rtw_indicate_connect(padapter); -+#endif -+ -+ break; -+ -+ case Ndis802_11AutoUnknown: -+ case Ndis802_11InfrastructureMax: -+ break; -+ } -+ -+ //SecClearAllKeys(adapter); -+ -+ //RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: fw_state:%x after changing mode\n", -+ // get_fwstate(pmlmepriv) )); -+ -+ } -+ -+_func_exit_; -+ -+ return _TRUE; -+} -+ -+ -+u8 rtw_set_802_11_disassociate(_adapter *padapter) -+{ -+ _irqL irqL; -+ struct mlme_priv * pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_disassociate: rtw_indicate_disconnect\n")); -+ -+ rtw_disassoc_cmd(padapter, 0, _TRUE); -+ rtw_indicate_disconnect(padapter); -+ //modify for CONFIG_IEEE80211W, none 11w can use it -+ rtw_free_assoc_resources_cmd(padapter); -+ } -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+_func_exit_; -+ -+ return _TRUE; -+} -+ -+u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv= &padapter->mlmepriv; -+ u8 res=_TRUE; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("+rtw_set_802_11_bssid_list_scan(), fw_state=%x\n", get_fwstate(pmlmepriv))); -+ -+ if (padapter == NULL) { -+ res=_FALSE; -+ goto exit; -+ } -+ if (padapter->hw_init_completed==_FALSE){ -+ res = _FALSE; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n===rtw_set_802_11_bssid_list_scan:hw_init_completed==_FALSE===\n")); -+ goto exit; -+ } -+ -+ if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || -+ (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE)) -+ { -+ // Scan or linking is in progress, do nothing. -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_bssid_list_scan fail since fw_state = %x\n", get_fwstate(pmlmepriv))); -+ res = _TRUE; -+ -+ if(check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))== _TRUE){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n")); -+ } else { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###pmlmepriv->sitesurveyctrl.traffic_busy==_TRUE\n\n")); -+ } -+ } else { -+ if (rtw_is_scan_deny(padapter)) { -+ DBG_871X(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter)); -+ indicate_wx_scan_complete_event(padapter); -+ return _SUCCESS; -+ } -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ res = rtw_sitesurvey_cmd(padapter, pssid, ssid_max_num, NULL, 0); -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ } -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode) -+{ -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ int res; -+ u8 ret; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_802_11_auth.mode(): mode=%x\n", authmode)); -+ -+ psecuritypriv->ndisauthtype=authmode; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_authentication_mode:psecuritypriv->ndisauthtype=%d", psecuritypriv->ndisauthtype)); -+ -+ if(psecuritypriv->ndisauthtype>3) -+ psecuritypriv->dot11AuthAlgrthm=dot11AuthAlgrthm_8021X; -+ -+ res=rtw_set_auth(padapter,psecuritypriv); -+ -+ if(res==_SUCCESS) -+ ret=_TRUE; -+ else -+ ret=_FALSE; -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){ -+ -+ u8 bdefaultkey; -+ u8 btransmitkey; -+ sint keyid,res; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ u8 ret=_SUCCESS; -+ -+_func_enter_; -+ -+ bdefaultkey=(wep->KeyIndex & 0x40000000) > 0 ? _FALSE : _TRUE; //for ??? -+ btransmitkey= (wep->KeyIndex & 0x80000000) > 0 ? _TRUE : _FALSE; //for ??? -+ keyid=wep->KeyIndex & 0x3fffffff; -+ -+ if(keyid>4) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MgntActrtw_set_802_11_add_wep:keyid>4=>fail\n")); -+ ret=_FALSE; -+ goto exit; -+ } -+ -+ switch(wep->KeyLength) -+ { -+ case 5: -+ psecuritypriv->dot11PrivacyAlgrthm=_WEP40_; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength=5\n")); -+ break; -+ case 13: -+ psecuritypriv->dot11PrivacyAlgrthm=_WEP104_; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength=13\n")); -+ break; -+ default: -+ psecuritypriv->dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength!=5 or 13\n")); -+ break; -+ } -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:befor memcpy, wep->KeyLength=0x%x wep->KeyIndex=0x%x keyid =%x\n",wep->KeyLength,wep->KeyIndex,keyid)); -+ -+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]),&(wep->KeyMaterial),wep->KeyLength); -+ -+ psecuritypriv->dot11DefKeylen[keyid]=wep->KeyLength; -+ -+ psecuritypriv->dot11PrivacyKeyIndex=keyid; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x \n", -+ psecuritypriv->dot11DefKey[keyid].skey[0],psecuritypriv->dot11DefKey[keyid].skey[1],psecuritypriv->dot11DefKey[keyid].skey[2], -+ psecuritypriv->dot11DefKey[keyid].skey[3],psecuritypriv->dot11DefKey[keyid].skey[4],psecuritypriv->dot11DefKey[keyid].skey[5], -+ psecuritypriv->dot11DefKey[keyid].skey[6],psecuritypriv->dot11DefKey[keyid].skey[7],psecuritypriv->dot11DefKey[keyid].skey[8], -+ psecuritypriv->dot11DefKey[keyid].skey[9],psecuritypriv->dot11DefKey[keyid].skey[10],psecuritypriv->dot11DefKey[keyid].skey[11], -+ psecuritypriv->dot11DefKey[keyid].skey[12])); -+ -+ res=rtw_set_key(padapter,psecuritypriv, keyid, 1); -+ -+ if(res==_FAIL) -+ ret= _FALSE; -+exit: -+ -+_func_exit_; -+ -+ return ret; -+ -+} -+ -+u8 rtw_set_802_11_remove_wep(_adapter* padapter, u32 keyindex){ -+ -+ u8 ret=_SUCCESS; -+ -+_func_enter_; -+ -+ if (keyindex >= 0x80000000 || padapter == NULL){ -+ -+ ret=_FALSE; -+ goto exit; -+ -+ } -+ else -+ { -+ int res; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ if( keyindex < 4 ){ -+ -+ _rtw_memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16); -+ -+ res=rtw_set_key(padapter,psecuritypriv,keyindex, 0); -+ -+ psecuritypriv->dot11DefKeylen[keyindex]=0; -+ -+ if(res==_FAIL) -+ ret=_FAIL; -+ -+ } -+ else -+ { -+ ret=_FAIL; -+ } -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+ -+} -+ -+u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){ -+ -+ uint encryptionalgo; -+ u8 * pbssid; -+ struct sta_info *stainfo; -+ u8 bgroup = _FALSE; -+ u8 bgrouptkey = _FALSE;//can be remove later -+ u8 ret=_SUCCESS; -+ -+_func_enter_; -+ -+ if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)){ -+ -+ // It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, -+ // it must fail the request and return NDIS_STATUS_INVALID_DATA. -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d] ",(int)(key->KeyIndex & 0x80000000) == 0)); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]" , (int)(key->KeyIndex & 0x40000000) > 0)); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: key->KeyIndex=%d \n" ,(int)key->KeyIndex)); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ if(key->KeyIndex & 0x40000000) -+ { -+ // Pairwise key -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ Pairwise key +++++\n")); -+ -+ pbssid=get_bssid(&padapter->mlmepriv); -+ stainfo=rtw_get_stainfo(&padapter->stapriv, pbssid); -+ -+ if((stainfo!=NULL)&&(padapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:( stainfo!=NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)\n")); -+ encryptionalgo=stainfo->dot118021XPrivacy; -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: stainfo==NULL)||(Adapter->securitypriv.dot11AuthAlgrthm!=dot11AuthAlgrthm_8021X)\n")); -+ encryptionalgo=padapter->securitypriv.dot11PrivacyAlgrthm; -+ } -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (encryptionalgo ==%d)!\n",encryptionalgo )); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11PrivacyAlgrthm ==%d)!\n",padapter->securitypriv.dot11PrivacyAlgrthm)); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11AuthAlgrthm ==%d)!\n",padapter->securitypriv.dot11AuthAlgrthm)); -+ -+ if((stainfo!=NULL)){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy ==%d)!\n", stainfo->dot118021XPrivacy)); -+ } -+ -+ if(key->KeyIndex & 0x000000FF){ -+ // The key index is specified in the lower 8 bits by values of zero to 255. -+ // The key index should be set to zero for a Pairwise key, and the driver should fail with -+ // NDIS_STATUS_INVALID_DATA if the lower 8 bits is not zero -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" key->KeyIndex & 0x000000FF.\n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ // check BSSID -+ if (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == _TRUE){ -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MacAddr_isBcst(key->BSSID)\n")); -+ ret= _FALSE; -+ goto exit; -+ } -+ -+ // Check key length for TKIP. -+ //if(encryptionAlgorithm == RT_ENC_TKIP_ENCRYPTION && key->KeyLength != 32) -+ if((encryptionalgo== _TKIP_)&& (key->KeyLength != 32)){ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("TKIP KeyLength:0x%x != 32\n", key->KeyLength)); -+ ret=_FAIL; -+ goto exit; -+ -+ } -+ -+ // Check key length for AES. -+ if((encryptionalgo== _AES_)&& (key->KeyLength != 16)) { -+ // For our supplicant, EAPPkt9x.vxd, cannot differentiate TKIP and AES case. -+ if(key->KeyLength == 32) { -+ key->KeyLength = 16; -+ } else { -+ ret= _FAIL; -+ goto exit; -+ } -+ } -+ -+ // Check key length for WEP. For NDTEST, 2005.01.27, by rcnjko. -+ if( (encryptionalgo== _WEP40_|| encryptionalgo== _WEP104_) && (key->KeyLength != 5 || key->KeyLength != 13)) { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("WEP KeyLength:0x%x != 5 or 13\n", key->KeyLength)); -+ ret=_FAIL; -+ goto exit; -+ } -+ -+ bgroup = _FALSE; -+ -+ // Check the pairwise key. Added by Annie, 2005-07-06. -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Pairwise Key set]\n")); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key index: 0x%8x(0x%8x)\n", key->KeyIndex,(key->KeyIndex&0x3))); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key Length: %d\n", key->KeyLength)); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")); -+ -+ } -+ else -+ { -+ // Group key - KeyIndex(BIT30==0) -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ Group key +++++\n")); -+ -+ -+ // when add wep key through add key and didn't assigned encryption type before -+ if((padapter->securitypriv.ndisauthtype<=3)&&(padapter->securitypriv.dot118021XGrpPrivacy==0)) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("keylen=%d( Adapter->securitypriv.dot11PrivacyAlgrthm=%x )padapter->securitypriv.dot118021XGrpPrivacy(%x)\n", key->KeyLength,padapter->securitypriv.dot11PrivacyAlgrthm,padapter->securitypriv.dot118021XGrpPrivacy)); -+ -+ switch(key->KeyLength) -+ { -+ case 5: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u\n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength)); -+ break; -+ case 13: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u\n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength)); -+ break; -+ default: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u \n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength)); -+ break; -+ } -+ -+ encryptionalgo=padapter->securitypriv.dot11PrivacyAlgrthm; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" Adapter->securitypriv.dot11PrivacyAlgrthm=%x\n", padapter->securitypriv.dot11PrivacyAlgrthm)); -+ -+ } -+ else -+ { -+ encryptionalgo=padapter->securitypriv.dot118021XGrpPrivacy; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("( Adapter->securitypriv.dot11PrivacyAlgrthm=%x )encryptionalgo(%x)=padapter->securitypriv.dot118021XGrpPrivacy(%x)keylen=%d\n", padapter->securitypriv.dot11PrivacyAlgrthm,encryptionalgo,padapter->securitypriv.dot118021XGrpPrivacy,key->KeyLength)); -+ -+ } -+ -+ if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==_TRUE) && (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == _FALSE)) { -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" IBSS but BSSID is not Broadcast Address.\n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ // Check key length for TKIP -+ if((encryptionalgo== _TKIP_) && (key->KeyLength != 32)) { -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" TKIP GTK KeyLength:%u != 32\n", key->KeyLength)); -+ ret= _FAIL; -+ goto exit; -+ -+ } else if(encryptionalgo== _AES_ && (key->KeyLength != 16 && key->KeyLength != 32) ) { -+ -+ // Check key length for AES -+ // For NDTEST, we allow keylen=32 in this case. 2005.01.27, by rcnjko. -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("<=== SetInfo, OID_802_11_ADD_KEY: AES GTK KeyLength:%u != 16 or 32\n", key->KeyLength)); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ // Change the key length for EAPPkt9x.vxd. Added by Annie, 2005-11-03. -+ if((encryptionalgo== _AES_) && (key->KeyLength == 32) ) { -+ key->KeyLength = 16; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("AES key length changed: %u\n", key->KeyLength) ); -+ } -+ -+ if(key->KeyIndex & 0x8000000) {//error ??? 0x8000_0000 -+ bgrouptkey = _TRUE; -+ } -+ -+ if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==_TRUE)&&(check_fwstate(&padapter->mlmepriv, _FW_LINKED)==_TRUE)) -+ { -+ bgrouptkey = _TRUE; -+ } -+ -+ bgroup = _TRUE; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n") ); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Group Key set]\n") ); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")) ; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key index: 0x%8x(0x%8x)\n", key->KeyIndex,(key->KeyIndex&0x3))); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key Length: %d\n", key->KeyLength)) ; -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")); -+ -+ } -+ -+ // If WEP encryption algorithm, just call rtw_set_802_11_add_wep(). -+ if((padapter->securitypriv.dot11AuthAlgrthm !=dot11AuthAlgrthm_8021X)&&(encryptionalgo== _WEP40_ || encryptionalgo== _WEP104_)) -+ { -+ u8 ret; -+ u32 keyindex; -+ u32 len = FIELD_OFFSET(NDIS_802_11_KEY, KeyMaterial) + key->KeyLength; -+ NDIS_802_11_WEP *wep = &padapter->securitypriv.ndiswep; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ WEP key +++++\n")); -+ -+ wep->Length = len; -+ keyindex = key->KeyIndex&0x7fffffff; -+ wep->KeyIndex = keyindex ; -+ wep->KeyLength = key->KeyLength; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy \n")); -+ -+ _rtw_memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength); -+ _rtw_memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength); -+ -+ padapter->securitypriv.dot11DefKeylen[keyindex]=key->KeyLength; -+ padapter->securitypriv.dot11PrivacyKeyIndex=keyindex; -+ -+ ret = rtw_set_802_11_add_wep(padapter, wep); -+ -+ goto exit; -+ -+ } -+ -+ if(key->KeyIndex & 0x20000000){ -+ // SetRSC -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n")); -+ if(bgroup == _TRUE) -+ { -+ NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL; -+ _rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8); -+ } -+ else -+ { -+ NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL; -+ _rtw_memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8); -+ } -+ -+ } -+ -+ // Indicate this key idx is used for TX -+ // Save the key in KeyMaterial -+ if(bgroup == _TRUE) // Group transmit key -+ { -+ int res; -+ -+ if(bgrouptkey == _TRUE) -+ { -+ padapter->securitypriv.dot118021XGrpKeyid=(u8)key->KeyIndex; -+ } -+ -+ if((key->KeyIndex&0x3) == 0){ -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memset(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], 0, 16); -+ _rtw_memset(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16); -+ _rtw_memset(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16); -+ -+ if((key->KeyIndex & 0x10000000)) -+ { -+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8); -+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8); -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1], -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3], -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5], -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7])); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n")); -+ -+ } -+ else -+ { -+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8); -+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8); -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1], -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3], -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5], -+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7])); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n")); -+ -+ } -+ -+ //set group key by index -+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial, key->KeyLength); -+ -+ key->KeyIndex=key->KeyIndex & 0x03; -+ -+ padapter->securitypriv.binstallGrpkey=_TRUE; -+ -+ padapter->securitypriv.bcheck_grpkey=_FALSE; -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("reset group key")); -+ -+ res=rtw_set_key(padapter,&padapter->securitypriv, key->KeyIndex, 1); -+ -+ if(res==_FAIL) -+ ret= _FAIL; -+ -+ goto exit; -+ -+ } -+ else // Pairwise Key -+ { -+ u8 res; -+ -+ pbssid=get_bssid(&padapter->mlmepriv); -+ stainfo=rtw_get_stainfo(&padapter->stapriv , pbssid ); -+ -+ if(stainfo!=NULL) -+ { -+ _rtw_memset( &stainfo->dot118021x_UncstKey, 0, 16);// clear keybuffer -+ -+ _rtw_memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16); -+ -+ if(encryptionalgo== _TKIP_) -+ { -+ padapter->securitypriv.busetkipkey=_FALSE; -+ -+ //_set_timer(&padapter->securitypriv.tkip_timer, 50); -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n ==========_set_timer\n")); -+ -+ // if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255] -+ if((key->KeyIndex & 0x10000000)){ -+ _rtw_memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 16, 8); -+ _rtw_memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 24, 8); -+ -+ } else { -+ _rtw_memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 24, 8); -+ _rtw_memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 16, 8); -+ -+ } -+ -+ } -+ else if(encryptionalgo == _AES_) -+ { -+ -+ } -+ -+ -+ //Set key to CAM through H2C command -+ if(bgrouptkey)//never go to here -+ { -+ res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, _FALSE); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n")); -+ } -+ else{ -+ res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, _TRUE); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n")); -+ } -+ -+ if(res ==_FALSE) -+ ret= _FAIL; -+ -+ } -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){ -+ -+ uint encryptionalgo; -+ u8 * pbssid; -+ struct sta_info *stainfo; -+ u8 bgroup = (key->KeyIndex & 0x4000000) > 0 ? _FALSE: _TRUE; -+ u8 keyIndex = (u8)key->KeyIndex & 0x03; -+ u8 ret=_SUCCESS; -+ -+_func_enter_; -+ -+ if ((key->KeyIndex & 0xbffffffc) > 0) { -+ ret=_FAIL; -+ goto exit; -+ } -+ -+ if (bgroup == _TRUE) { -+ encryptionalgo= padapter->securitypriv.dot118021XGrpPrivacy; -+ // clear group key by index -+ //NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN); -+ //Adapter->MgntInfo.SecurityInfo.KeyLen[keyIndex] = 0; -+ -+ _rtw_memset(&padapter->securitypriv.dot118021XGrpKey[keyIndex], 0, 16); -+ -+ //! \todo Send a H2C Command to Firmware for removing this Key in CAM Entry. -+ -+ } else { -+ -+ pbssid=get_bssid(&padapter->mlmepriv); -+ stainfo=rtw_get_stainfo(&padapter->stapriv , pbssid ); -+ if(stainfo !=NULL){ -+ encryptionalgo=stainfo->dot118021XPrivacy; -+ -+ // clear key by BSSID -+ _rtw_memset(&stainfo->dot118021x_UncstKey, 0, 16); -+ -+ //! \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. -+ -+ } -+ else{ -+ ret= _FAIL; -+ goto exit; -+ } -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return _TRUE; -+ -+} -+ -+/* -+* rtw_get_cur_max_rate - -+* @adapter: pointer to _adapter structure -+* -+* Return 0 or 100Kbps -+*/ -+u16 rtw_get_cur_max_rate(_adapter *adapter) -+{ -+ int i = 0; -+ u8 *p; -+ u16 rate = 0, max_rate = 0; -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct registry_priv *pregistrypriv = &adapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; -+#ifdef CONFIG_80211N_HT -+ struct rtw_ieee80211_ht_cap *pht_capie; -+ u8 rf_type = 0; -+ u8 bw_40MHz=0, short_GI_20=0, short_GI_40=0; -+ u16 mcs_rate=0; -+ u32 ht_ielen = 0; -+#endif -+ -+#ifdef CONFIG_MP_INCLUDED -+ if (adapter->registrypriv.mp_mode == 1) -+ { -+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ return 0; -+ } -+#endif -+ -+ if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) -+ && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE)) -+ return 0; -+ -+#ifdef CONFIG_80211N_HT -+ if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N|WIRELESS_11_5N)) { -+ p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12); -+ if(p && ht_ielen>0) -+ { -+ pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2); -+ -+ _rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2); -+ -+ //bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0; -+ //cur_bwmod is updated by beacon, pmlmeinfo is updated by association response -+ bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0])) ? 1:0; -+ -+ //short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1:0; -+ short_GI_20 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_20) ? 1:0; -+ short_GI_40 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_40) ? 1:0; -+ -+ rtw_hal_get_hwreg(adapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ max_rate = rtw_mcs_rate( -+ rf_type, -+ bw_40MHz & (pregistrypriv->cbw40_enable), -+ short_GI_20, -+ short_GI_40, -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate -+ ); -+ } -+ } -+ else -+#endif //CONFIG_80211N_HT -+ { -+ while( (pcur_bss->SupportedRates[i]!=0) && (pcur_bss->SupportedRates[i]!=0xFF)) -+ { -+ rate = pcur_bss->SupportedRates[i]&0x7F; -+ if(rate>max_rate) -+ max_rate = rate; -+ i++; -+ } -+ -+ max_rate = max_rate*10/2; -+ } -+ -+ return max_rate; -+} -+ -+/* -+* rtw_set_scan_mode - -+* @adapter: pointer to _adapter structure -+* @scan_mode: -+* -+* Return _SUCCESS or _FAIL -+*/ -+int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode) -+{ -+ if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE) -+ return _FAIL; -+ -+ adapter->mlmepriv.scan_mode = scan_mode; -+ -+ return _SUCCESS; -+} -+ -+/* -+* rtw_set_channel_plan - -+* @adapter: pointer to _adapter structure -+* @channel_plan: -+* -+* Return _SUCCESS or _FAIL -+*/ -+int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan) -+{ -+ struct registry_priv *pregistrypriv = &adapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ -+ //handle by cmd_thread to sync with scan operation -+ return rtw_set_chplan_cmd(adapter, channel_plan, 1); -+} -+ -+/* -+* rtw_set_country - -+* @adapter: pointer to _adapter structure -+* @country_code: string of country code -+* -+* Return _SUCCESS or _FAIL -+*/ -+int rtw_set_country(_adapter *adapter, const char *country_code) -+{ -+ int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G; -+ -+ DBG_871X("%s country_code:%s\n", __func__, country_code); -+ -+ //TODO: should have a table to match country code and RT_CHANNEL_DOMAIN -+ //TODO: should consider 2-character and 3-character country code -+ if(0 == strcmp(country_code, "US")) -+ channel_plan = RT_CHANNEL_DOMAIN_FCC; -+ else if(0 == strcmp(country_code, "EU")) -+ channel_plan = RT_CHANNEL_DOMAIN_ETSI; -+ else if(0 == strcmp(country_code, "JP")) -+ channel_plan = RT_CHANNEL_DOMAIN_MKK; -+ else if(0 == strcmp(country_code, "CN")) -+ channel_plan = RT_CHANNEL_DOMAIN_CHINA; -+ else -+ DBG_871X("%s unknown country_code:%s\n", __FUNCTION__, country_code); -+ -+ return rtw_set_channel_plan(adapter, channel_plan); -+} -+ -+/* -+* rtw_set_band - -+* @adapter: pointer to _adapter structure -+* @band: band to set -+* -+* Return _SUCCESS or _FAIL -+*/ -+int rtw_set_band(_adapter *adapter, enum _BAND band) -+{ -+ if (rtw_band_valid(band)) { -+ DBG_871X(FUNC_ADPT_FMT" band:%d\n", FUNC_ADPT_ARG(adapter), band); -+ adapter->setband = band; -+ return _SUCCESS; -+ } -+ -+ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" band:%d fail\n", FUNC_ADPT_ARG(adapter), band); -+ return _FAIL; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c -@@ -0,0 +1,263 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#include -+ -+#ifdef CONFIG_IOL -+struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter) -+{ -+ struct xmit_frame *xmit_frame; -+ struct xmit_buf *xmitbuf; -+ struct pkt_attrib *pattrib; -+ struct xmit_priv *pxmitpriv = &(adapter->xmitpriv); -+ -+#if 1 -+ if ((xmit_frame = rtw_alloc_xmitframe(pxmitpriv)) == NULL) -+ { -+ DBG_871X("%s rtw_alloc_xmitframe return null\n", __FUNCTION__); -+ goto exit; -+ } -+ -+ if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL) -+ { -+ DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__); -+ rtw_free_xmitframe(pxmitpriv, xmit_frame); -+ xmit_frame=NULL; -+ goto exit; -+ } -+ -+ xmit_frame->frame_tag = MGNT_FRAMETAG; -+ xmit_frame->pxmitbuf = xmitbuf; -+ xmit_frame->buf_addr = xmitbuf->pbuf; -+ xmitbuf->priv_data = xmit_frame; -+ -+ pattrib = &xmit_frame->attrib; -+ update_mgntframe_attrib(adapter, pattrib); -+ pattrib->qsel = 0x10; -+ pattrib->pktlen = pattrib->last_txcmdsz = 0; -+ -+#else -+ if ((xmit_frame = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ DBG_871X("%s alloc_mgtxmitframe return null\n", __FUNCTION__); -+ } -+ else { -+ pattrib = &xmit_frame->attrib; -+ update_mgntframe_attrib(adapter, pattrib); -+ pattrib->qsel = 0x10; -+ pattrib->pktlen = pattrib->last_txcmdsz = 0; -+ } -+#endif -+ -+exit: -+ return xmit_frame; -+} -+ -+ -+int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len) -+{ -+ struct pkt_attrib *pattrib = &xmit_frame->attrib; -+ u16 buf_offset; -+ u32 ori_len; -+ -+//Todo: bulkout without this offset -+#ifdef CONFIG_USB_HCI -+ buf_offset = TXDESC_OFFSET; -+#else -+ buf_offset = 0; -+#endif -+ -+ ori_len = buf_offset+pattrib->pktlen; -+ -+ //check if the io_buf can accommodate new cmds -+ if(ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) { -+ DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__ -+ , ori_len + cmd_len + 8, MAX_XMITBUF_SZ); -+ return _FAIL; -+ } -+ -+ _rtw_memcpy(xmit_frame->buf_addr + buf_offset + pattrib->pktlen, IOL_cmds, cmd_len); -+ pattrib->pktlen += cmd_len; -+ pattrib->last_txcmdsz += cmd_len; -+ -+ //DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen); -+ -+ return _SUCCESS; -+} -+ -+int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary) -+{ -+ IOL_CMD cmd = {0x0, IOL_CMD_LLT, 0x0, 0x0}; -+ -+ RTW_PUT_BE32((u8*)&cmd.value, (u32)page_boundary); -+ -+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); -+} -+ -+int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value) -+{ -+ IOL_CMD cmd = {0x0, IOL_CMD_WB_REG, 0x0, 0x0}; -+ -+ RTW_PUT_BE16((u8*)&cmd.address, (u16)addr); -+ RTW_PUT_BE32((u8*)&cmd.value, (u32)value); -+ -+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); -+} -+ -+int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value) -+{ -+ IOL_CMD cmd = {0x0, IOL_CMD_WW_REG, 0x0, 0x0}; -+ -+ RTW_PUT_BE16((u8*)&cmd.address, (u16)addr); -+ RTW_PUT_BE32((u8*)&cmd.value, (u32)value); -+ -+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); -+} -+ -+int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value) -+{ -+ IOL_CMD cmd = {0x0, IOL_CMD_WD_REG, 0x0, 0x0}; -+ u8* pos = (u8 *)&cmd; -+ -+ RTW_PUT_BE16((u8*)&cmd.address, (u16)addr); -+ RTW_PUT_BE32((u8*)&cmd.value, (u32)value); -+ -+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); -+} -+ -+#ifdef DBG_IO -+int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, 1)) -+ DBG_871X("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value); -+ -+ return _rtw_IOL_append_WB_cmd(xmit_frame, addr, value); -+} -+ -+int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, 2)) -+ DBG_871X("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value); -+ -+ return _rtw_IOL_append_WW_cmd(xmit_frame, addr, value); -+} -+ -+int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line) -+{ -+ if (match_write_sniff_ranges(addr, 4)) -+ DBG_871X("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value); -+ -+ return _rtw_IOL_append_WD_cmd(xmit_frame, addr, value); -+} -+#endif -+ -+int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us) -+{ -+ IOL_CMD cmd = {0x0, IOL_CMD_DELAY_US, 0x0, 0x0}; -+ -+ RTW_PUT_BE32((u8*)&cmd.value, (u32)us); -+ -+ //DBG_871X("%s %u\n", __FUNCTION__, us); -+ -+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); -+} -+ -+int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms) -+{ -+ IOL_CMD cmd = {0x0, IOL_CMD_DELAY_MS, 0x0, 0x0}; -+ -+ RTW_PUT_BE32((u8*)&cmd.value, (u32)ms); -+ -+ //DBG_871X("%s %u\n", __FUNCTION__, ms); -+ -+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); -+} -+ -+int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) -+{ -+ struct pkt_attrib *pattrib = &xmit_frame->attrib; -+ u16 buf_offset; -+ u32 ori_len; -+ IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0}; -+ -+//Todo: bulkout without this offset -+#ifdef CONFIG_USB_HCI -+ buf_offset = TXDESC_OFFSET; -+#else -+ buf_offset = 0; -+#endif -+ -+ ori_len = buf_offset+pattrib->pktlen; -+ -+ //check if the io_buf can accommodate new cmds -+ if(ori_len + 8 > MAX_XMITBUF_SZ) { -+ DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate end cmd\n", __FUNCTION__ -+ , ori_len + 8, MAX_XMITBUF_SZ); -+ return _FAIL; -+ } -+ -+ _rtw_memcpy(xmit_frame->buf_addr + buf_offset + pattrib->pktlen, (u8*)&end_cmd, 8); -+ pattrib->pktlen += 8; -+ pattrib->last_txcmdsz += 8; -+ -+ //DBG_871X("%s ori:%u + 8 = %u\n", __FUNCTION__ , ori_len, buf_offset+pattrib->pktlen); -+ -+ return _SUCCESS; -+} -+ -+int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms) -+{ -+ return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms); -+} -+ -+int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms) -+{ -+ struct xmit_frame *xmit_frame; -+ -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(adapter)) == NULL) -+ return _FAIL; -+ -+ if(rtw_IOL_append_cmds(xmit_frame, IOL_cmds, cmd_num<<3) == _FAIL) -+ return _FAIL; -+ -+ return rtw_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms); -+} -+ -+int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms) -+{ -+ IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0}; -+ return rtw_IOL_exec_cmd_array_sync(adapter, (u8*)&end_cmd, 1, max_wating_ms); -+} -+ -+bool rtw_IOL_applied(ADAPTER *adapter) -+{ -+ if(adapter->registrypriv.force_iol) -+ return _TRUE; -+ -+#ifdef CONFIG_USB_HCI -+ if(!adapter_to_dvobj(adapter)->ishighspeed) -+ return _TRUE; -+#endif -+ -+ return _FALSE; -+} -+ -+#endif //CONFIG_IOL -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c -@@ -0,0 +1,3967 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_MLME_C_ -+ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern void indicate_wx_scan_complete_event(_adapter *padapter); -+extern u8 rtw_do_join(_adapter * padapter); -+ -+#ifdef CONFIG_DISABLE_MCS13TO15 -+extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16]; -+extern unsigned char MCS_rate_2R[16]; -+#else //CONFIG_DISABLE_MCS13TO15 -+extern unsigned char MCS_rate_2R[16]; -+#endif //CONFIG_DISABLE_MCS13TO15 -+extern unsigned char MCS_rate_1R[16]; -+ -+sint _rtw_init_mlme_priv (_adapter* padapter) -+{ -+ sint i; -+ u8 *pbuf; -+ struct wlan_network *pnetwork; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ sint res = _SUCCESS; -+ -+_func_enter_; -+ -+ // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). -+ //_rtw_memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv)); -+ -+ pmlmepriv->nic_hdl = (u8 *)padapter; -+ -+ pmlmepriv->pscanned = NULL; -+ pmlmepriv->fw_state = 0; -+ pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; -+ pmlmepriv->scan_mode=SCAN_ACTIVE;// 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) -+ -+ _rtw_spinlock_init(&(pmlmepriv->lock)); -+ _rtw_init_queue(&(pmlmepriv->free_bss_pool)); -+ _rtw_init_queue(&(pmlmepriv->scanned_queue)); -+ -+ set_scanned_network_val(pmlmepriv, 0); -+ -+ _rtw_memset(&pmlmepriv->assoc_ssid,0,sizeof(NDIS_802_11_SSID)); -+ -+ pbuf = rtw_zvmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network))); -+ -+ if (pbuf == NULL){ -+ res=_FAIL; -+ goto exit; -+ } -+ pmlmepriv->free_bss_buf = pbuf; -+ -+ pnetwork = (struct wlan_network *)pbuf; -+ -+ for(i = 0; i < MAX_BSS_CNT; i++) -+ { -+ _rtw_init_listhead(&(pnetwork->list)); -+ -+ rtw_list_insert_tail(&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); -+ -+ pnetwork++; -+ } -+ -+ //allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf -+ -+ rtw_clear_scan_deny(padapter); -+ -+ rtw_init_mlme_timer(padapter); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv); -+void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv) -+{ -+ _rtw_spinlock_free(&pmlmepriv->lock); -+ _rtw_spinlock_free(&(pmlmepriv->free_bss_pool.lock)); -+ _rtw_spinlock_free(&(pmlmepriv->scanned_queue.lock)); -+} -+ -+static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen) -+{ -+ if(*ppie) -+ { -+ rtw_mfree(*ppie, *plen); -+ *plen = 0; -+ *ppie=NULL; -+ } -+} -+ -+void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv) -+{ -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len); -+ rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wps_beacon_ie, &pmlmepriv->wps_beacon_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie, &pmlmepriv->wps_probe_req_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_resp_ie, &pmlmepriv->wps_probe_resp_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wps_assoc_resp_ie, &pmlmepriv->wps_assoc_resp_ie_len); -+ -+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_go_probe_resp_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len); -+#endif -+ -+#if defined(CONFIG_WFD) && defined(CONFIG_IOCTL_CFG80211) -+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_beacon_ie, &pmlmepriv->wfd_beacon_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_probe_req_ie, &pmlmepriv->wfd_probe_req_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_probe_resp_ie, &pmlmepriv->wfd_probe_resp_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_go_probe_resp_ie, &pmlmepriv->wfd_go_probe_resp_ie_len); -+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_assoc_req_ie, &pmlmepriv->wfd_assoc_req_ie_len); -+#endif -+ -+} -+ -+void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) -+{ -+_func_enter_; -+ -+ rtw_free_mlme_priv_ie_data(pmlmepriv); -+ -+ if(pmlmepriv){ -+ rtw_mfree_mlme_priv_lock (pmlmepriv); -+ -+ if (pmlmepriv->free_bss_buf) { -+ rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network)); -+ } -+ } -+_func_exit_; -+} -+ -+sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork) -+{ -+ _irqL irqL; -+ -+_func_enter_; -+ -+ if (pnetwork == NULL) -+ goto exit; -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ rtw_list_insert_tail(&pnetwork->list, &queue->queue); -+ -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+struct wlan_network *_rtw_dequeue_network(_queue *queue) -+{ -+ _irqL irqL; -+ -+ struct wlan_network *pnetwork; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ if (_rtw_queue_empty(queue) == _TRUE) -+ -+ pnetwork = NULL; -+ -+ else -+ { -+ pnetwork = LIST_CONTAINOR(get_next(&queue->queue), struct wlan_network, list); -+ -+ rtw_list_delete(&(pnetwork->list)); -+ } -+ -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return pnetwork; -+} -+ -+struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )//(_queue *free_queue) -+{ -+ _irqL irqL; -+ struct wlan_network *pnetwork; -+ _queue *free_queue = &pmlmepriv->free_bss_pool; -+ _list* plist = NULL; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&free_queue->lock, &irqL); -+ -+ if (_rtw_queue_empty(free_queue) == _TRUE) { -+ pnetwork=NULL; -+ goto exit; -+ } -+ plist = get_next(&(free_queue->queue)); -+ -+ pnetwork = LIST_CONTAINOR(plist , struct wlan_network, list); -+ -+ rtw_list_delete(&pnetwork->list); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n", plist)); -+ pnetwork->network_type = 0; -+ pnetwork->fixed = _FALSE; -+ pnetwork->last_scanned = rtw_get_current_time(); -+ pnetwork->aid=0; -+ pnetwork->join_res=0; -+ -+ pmlmepriv->num_of_scanned ++; -+ -+exit: -+ _exit_critical_bh(&free_queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return pnetwork; -+} -+ -+void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwork, u8 isfreeall) -+{ -+ u32 curr_time, delta_time; -+ u32 lifetime = SCANQUEUE_LIFETIME; -+ _irqL irqL; -+ _queue *free_queue = &(pmlmepriv->free_bss_pool); -+ -+_func_enter_; -+ -+ if (pnetwork == NULL) -+ goto exit; -+ -+ if (pnetwork->fixed == _TRUE) -+ goto exit; -+ -+ curr_time = rtw_get_current_time(); -+ -+ if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) -+ lifetime = 1; -+ -+ if(!isfreeall) -+ { -+#ifdef PLATFORM_WINDOWS -+ -+ delta_time = (curr_time -pnetwork->last_scanned)/10; -+ -+ if(delta_time < lifetime*1000000)// unit:usec -+ { -+ goto exit; -+ } -+ -+#endif -+ -+#ifdef PLATFORM_LINUX -+ -+ delta_time = (curr_time -pnetwork->last_scanned)/HZ; -+ -+ if(delta_time < lifetime)// unit:sec -+ { -+ goto exit; -+ } -+ -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+ //i think needs to check again -+ delta_time = (curr_time -pnetwork->last_scanned)/hz; -+ -+ if(delta_time < lifetime)// unit:sec -+ { -+ goto exit; -+ } -+ -+#endif -+ } -+ -+ _enter_critical_bh(&free_queue->lock, &irqL); -+ -+ rtw_list_delete(&(pnetwork->list)); -+ -+ rtw_list_insert_tail(&(pnetwork->list),&(free_queue->queue)); -+ -+ pmlmepriv->num_of_scanned --; -+ -+ -+ //DBG_871X("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid); -+ -+ _exit_critical_bh(&free_queue->lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+} -+ -+void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork) -+{ -+ -+ _queue *free_queue = &(pmlmepriv->free_bss_pool); -+ -+_func_enter_; -+ -+ if (pnetwork == NULL) -+ goto exit; -+ -+ if (pnetwork->fixed == _TRUE) -+ goto exit; -+ -+ //_enter_critical(&free_queue->lock, &irqL); -+ -+ rtw_list_delete(&(pnetwork->list)); -+ -+ rtw_list_insert_tail(&(pnetwork->list), get_list_head(free_queue)); -+ -+ pmlmepriv->num_of_scanned --; -+ -+ //_exit_critical(&free_queue->lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+} -+ -+ -+/* -+ return the wlan_network with the matching addr -+ -+ Shall be calle under atomic context... to avoid possible racing condition... -+*/ -+struct wlan_network *_rtw_find_network(_queue *scanned_queue, u8 *addr) -+{ -+ -+ //_irqL irqL; -+ _list *phead, *plist; -+ struct wlan_network *pnetwork = NULL; -+ u8 zero_addr[ETH_ALEN] = {0,0,0,0,0,0}; -+ -+_func_enter_; -+ -+ if(_rtw_memcmp(zero_addr, addr, ETH_ALEN)){ -+ pnetwork=NULL; -+ goto exit; -+ } -+ -+ //_enter_critical_bh(&scanned_queue->lock, &irqL); -+ -+ phead = get_list_head(scanned_queue); -+ plist = get_next(phead); -+ -+ while (plist != phead) -+ { -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network ,list); -+ -+ if (_rtw_memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN) == _TRUE) -+ break; -+ -+ plist = get_next(plist); -+ } -+ -+ if(plist == phead) -+ pnetwork = NULL; -+ -+ //_exit_critical_bh(&scanned_queue->lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+ return pnetwork; -+ -+} -+ -+ -+void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ struct wlan_network *pnetwork; -+ struct mlme_priv* pmlmepriv = &padapter->mlmepriv; -+ _queue *scanned_queue = &pmlmepriv->scanned_queue; -+ -+_func_enter_; -+ -+ -+ _enter_critical_bh(&scanned_queue->lock, &irqL); -+ -+ phead = get_list_head(scanned_queue); -+ plist = get_next(phead); -+ -+ while (rtw_end_of_queue_search(phead, plist) == _FALSE) -+ { -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ plist = get_next(plist); -+ -+ _rtw_free_network(pmlmepriv,pnetwork, isfreeall); -+ -+ } -+ -+ _exit_critical_bh(&scanned_queue->lock, &irqL); -+ -+_func_exit_; -+ -+} -+ -+ -+ -+ -+sint rtw_if_up(_adapter *padapter) { -+ -+ sint res; -+_func_enter_; -+ -+ if( padapter->bDriverStopped || padapter->bSurpriseRemoved || -+ (check_fwstate(&padapter->mlmepriv, _FW_LINKED)== _FALSE)){ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_if_up:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ res=_FALSE; -+ } -+ else -+ res= _TRUE; -+ -+_func_exit_; -+ return res; -+} -+ -+ -+void rtw_generate_random_ibss(u8* pibss) -+{ -+ u32 curtime = rtw_get_current_time(); -+ -+_func_enter_; -+ pibss[0] = 0x02; //in ad-hoc mode bit1 must set to 1 -+ pibss[1] = 0x11; -+ pibss[2] = 0x87; -+ pibss[3] = (u8)(curtime & 0xff) ;//p[0]; -+ pibss[4] = (u8)((curtime>>8) & 0xff) ;//p[1]; -+ pibss[5] = (u8)((curtime>>16) & 0xff) ;//p[2]; -+_func_exit_; -+ return; -+} -+ -+u8 *rtw_get_capability_from_ie(u8 *ie) -+{ -+ return (ie + 8 + 2); -+} -+ -+ -+u16 rtw_get_capability(WLAN_BSSID_EX *bss) -+{ -+ u16 val; -+_func_enter_; -+ -+ _rtw_memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2); -+ -+_func_exit_; -+ return le16_to_cpu(val); -+} -+ -+u8 *rtw_get_timestampe_from_ie(u8 *ie) -+{ -+ return (ie + 0); -+} -+ -+u8 *rtw_get_beacon_interval_from_ie(u8 *ie) -+{ -+ return (ie + 8); -+} -+ -+ -+int rtw_init_mlme_priv (_adapter *padapter)//(struct mlme_priv *pmlmepriv) -+{ -+ int res; -+_func_enter_; -+ res = _rtw_init_mlme_priv(padapter);// (pmlmepriv); -+_func_exit_; -+ return res; -+} -+ -+void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) -+{ -+_func_enter_; -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_mlme_priv\n")); -+ _rtw_free_mlme_priv (pmlmepriv); -+_func_exit_; -+} -+ -+int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork); -+int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork) -+{ -+ int res; -+_func_enter_; -+ res = _rtw_enqueue_network(queue, pnetwork); -+_func_exit_; -+ return res; -+} -+ -+ -+#ifndef PLATFORM_FREEBSD //Baron -+static struct wlan_network *rtw_dequeue_network(_queue *queue) -+{ -+ struct wlan_network *pnetwork; -+_func_enter_; -+ pnetwork = _rtw_dequeue_network(queue); -+_func_exit_; -+ return pnetwork; -+} -+#endif //PLATFORM_FREEBSD -+ -+struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv ); -+struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv )//(_queue *free_queue) -+{ -+ struct wlan_network *pnetwork; -+_func_enter_; -+ pnetwork = _rtw_alloc_network(pmlmepriv); -+_func_exit_; -+ return pnetwork; -+} -+ -+void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall); -+void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)//(struct wlan_network *pnetwork, _queue *free_queue) -+{ -+_func_enter_; -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); -+ _rtw_free_network(pmlmepriv, pnetwork, is_freeall); -+_func_exit_; -+} -+ -+void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork ); -+void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork ) -+{ -+_func_enter_; -+ //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); -+ _rtw_free_network_nolock(pmlmepriv, pnetwork); -+_func_exit_; -+} -+ -+ -+void rtw_free_network_queue(_adapter* dev, u8 isfreeall) -+{ -+_func_enter_; -+ _rtw_free_network_queue(dev, isfreeall); -+_func_exit_; -+} -+ -+/* -+ return the wlan_network with the matching addr -+ -+ Shall be calle under atomic context... to avoid possible racing condition... -+*/ -+struct wlan_network *rtw_find_network(_queue *scanned_queue, u8 *addr) -+{ -+ struct wlan_network *pnetwork = _rtw_find_network(scanned_queue, addr); -+ -+ return pnetwork; -+} -+ -+int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork) -+{ -+ int ret=_TRUE; -+ struct security_priv *psecuritypriv = &adapter->securitypriv; -+ -+ if ( (psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_ ) && -+ ( pnetwork->network.Privacy == 0 ) ) -+ { -+ ret=_FALSE; -+ } -+ else if((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_ ) && -+ ( pnetwork->network.Privacy == 1 ) ) -+ { -+ ret=_FALSE; -+ } -+ else -+ { -+ ret=_TRUE; -+ } -+ -+ return ret; -+ -+} -+ -+inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b); -+inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b) -+{ -+ //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("(%s,%d)(%s,%d)\n", -+ // a->Ssid.Ssid,a->Ssid.SsidLength,b->Ssid.Ssid,b->Ssid.SsidLength)); -+ return (a->Ssid.SsidLength == b->Ssid.SsidLength) -+ && _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==_TRUE; -+} -+ -+int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst) -+{ -+ u16 s_cap, d_cap; -+ -+_func_enter_; -+ -+#ifdef PLATFORM_OS_XP -+ if ( ((uint)dst) <= 0x7fffffff || -+ ((uint)src) <= 0x7fffffff || -+ ((uint)&s_cap) <= 0x7fffffff || -+ ((uint)&d_cap) <= 0x7fffffff) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n@@@@ error address of dst\n")); -+ -+ KeBugCheckEx(0x87110000, (ULONG_PTR)dst, (ULONG_PTR)src,(ULONG_PTR)&s_cap, (ULONG_PTR)&d_cap); -+ -+ return _FALSE; -+ } -+#endif -+ -+ -+ _rtw_memcpy((u8 *)&s_cap, rtw_get_capability_from_ie(src->IEs), 2); -+ _rtw_memcpy((u8 *)&d_cap, rtw_get_capability_from_ie(dst->IEs), 2); -+ -+ -+ s_cap = le16_to_cpu(s_cap); -+ d_cap = le16_to_cpu(d_cap); -+ -+_func_exit_; -+ -+ return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && -+ // (src->Configuration.DSConfig == dst->Configuration.DSConfig) && -+ ( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == _TRUE) && -+ ( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == _TRUE) && -+ ((s_cap & WLAN_CAPABILITY_IBSS) == -+ (d_cap & WLAN_CAPABILITY_IBSS)) && -+ ((s_cap & WLAN_CAPABILITY_BSS) == -+ (d_cap & WLAN_CAPABILITY_BSS))); -+ -+} -+ -+struct wlan_network * rtw_get_oldest_wlan_network(_queue *scanned_queue) -+{ -+ _list *plist, *phead; -+ -+ -+ struct wlan_network *pwlan = NULL; -+ struct wlan_network *oldest = NULL; -+_func_enter_; -+ phead = get_list_head(scanned_queue); -+ -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pwlan= LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ if(pwlan->fixed!=_TRUE) -+ { -+ if (oldest == NULL ||time_after(oldest->last_scanned, pwlan->last_scanned)) -+ oldest = pwlan; -+ } -+ -+ plist = get_next(plist); -+ } -+_func_exit_; -+ return oldest; -+ -+} -+ -+static void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, -+ _adapter * padapter, bool update_ie) -+{ -+ u8 ss_ori = dst->PhyInfo.SignalStrength; -+ u8 sq_ori = dst->PhyInfo.SignalQuality; -+ long rssi_ori = dst->Rssi; -+ -+ u8 ss_smp = src->PhyInfo.SignalStrength; -+ u8 sq_smp = src->PhyInfo.SignalQuality; -+ long rssi_smp = src->Rssi; -+ -+ u8 ss_final; -+ u8 sq_final; -+ long rssi_final; -+ -+_func_enter_; -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ rtw_hal_antdiv_rssi_compared(padapter, dst, src); //this will update src.Rssi, need consider again -+#endif -+ -+ #if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1 -+ if(strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { -+ DBG_871X(FUNC_ADPT_FMT" %s("MAC_FMT", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" -+ , FUNC_ADPT_ARG(padapter) -+ , src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig -+ ,ss_ori, sq_ori, rssi_ori -+ ,ss_smp, sq_smp, rssi_smp -+ ); -+ } -+ #endif -+ -+ /* The rule below is 1/5 for sample value, 4/5 for history value */ -+ if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&(padapter->mlmepriv.cur_network.network), src)) { -+ /* Take the recvpriv's value for the connected AP*/ -+ ss_final = padapter->recvpriv.signal_strength; -+ sq_final = padapter->recvpriv.signal_qual; -+ /* the rssi value here is undecorated, and will be used for antenna diversity */ -+ if(sq_smp != 101) /* from the right channel */ -+ rssi_final = (src->Rssi+dst->Rssi*4)/5; -+ else -+ rssi_final = rssi_ori; -+ } -+ else { -+ if(sq_smp != 101) { /* from the right channel */ -+ ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5; -+ sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5; -+ rssi_final = (src->Rssi+dst->Rssi*4)/5; -+ } else { -+ /* bss info not receving from the right channel, use the original RX signal infos */ -+ ss_final = dst->PhyInfo.SignalStrength; -+ sq_final = dst->PhyInfo.SignalQuality; -+ rssi_final = dst->Rssi; -+ } -+ -+ } -+ -+ if (update_ie) -+ _rtw_memcpy((u8 *)dst, (u8 *)src, get_WLAN_BSSID_EX_sz(src)); -+ -+ dst->PhyInfo.SignalStrength = ss_final; -+ dst->PhyInfo.SignalQuality = sq_final; -+ dst->Rssi = rssi_final; -+ -+ #if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1 -+ if(strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { -+ DBG_871X(FUNC_ADPT_FMT" %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n" -+ , FUNC_ADPT_ARG(padapter) -+ , dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi); -+ } -+ #endif -+ -+#if 0 // old codes, may be useful one day... -+// DBG_871X("update_network: rssi=0x%lx dst->Rssi=%d ,dst->Rssi=0x%lx , src->Rssi=0x%lx",(dst->Rssi+src->Rssi)/2,dst->Rssi,dst->Rssi,src->Rssi); -+ if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&(padapter->mlmepriv.cur_network.network), src)) -+ { -+ -+ //DBG_871X("b:ssid=%s update_network: src->rssi=0x%d padapter->recvpriv.ui_rssi=%d\n",src->Ssid.Ssid,src->Rssi,padapter->recvpriv.signal); -+ if(padapter->recvpriv.signal_qual_data.total_num++ >= PHY_LINKQUALITY_SLID_WIN_MAX) -+ { -+ padapter->recvpriv.signal_qual_data.total_num = PHY_LINKQUALITY_SLID_WIN_MAX; -+ last_evm = padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index]; -+ padapter->recvpriv.signal_qual_data.total_val -= last_evm; -+ } -+ padapter->recvpriv.signal_qual_data.total_val += query_rx_pwr_percentage(src->Rssi); -+ -+ padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index++] = query_rx_pwr_percentage(src->Rssi); -+ if(padapter->recvpriv.signal_qual_data.index >= PHY_LINKQUALITY_SLID_WIN_MAX) -+ padapter->recvpriv.signal_qual_data.index = 0; -+ -+ //DBG_871X("Total SQ=%d pattrib->signal_qual= %d\n", padapter->recvpriv.signal_qual_data.total_val, src->Rssi); -+ -+ // <1> Showed on UI for user,in percentage. -+ tmpVal = padapter->recvpriv.signal_qual_data.total_val/padapter->recvpriv.signal_qual_data.total_num; -+ padapter->recvpriv.signal=(u8)tmpVal;//Link quality -+ -+ src->Rssi= translate_percentage_to_dbm(padapter->recvpriv.signal) ; -+ } -+ else{ -+// DBG_871X("ELSE:ssid=%s update_network: src->rssi=0x%d dst->rssi=%d\n",src->Ssid.Ssid,src->Rssi,dst->Rssi); -+ src->Rssi=(src->Rssi +dst->Rssi)/2;//dBM -+ } -+ -+// DBG_871X("a:update_network: src->rssi=0x%d padapter->recvpriv.ui_rssi=%d\n",src->Rssi,padapter->recvpriv.signal); -+ -+#endif -+ -+_func_exit_; -+} -+ -+static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) -+{ -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ -+_func_enter_; -+ -+#ifdef PLATFORM_OS_XP -+ if ((unsigned long)(&(pmlmepriv->cur_network.network)) < 0x7ffffff) -+ { -+ KeBugCheckEx(0x87111c1c, (ULONG_PTR)(&(pmlmepriv->cur_network.network)), 0, 0,0); -+ } -+#endif -+ -+ if ( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) -+ { -+ //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"Same Network\n"); -+ -+ //if(pmlmepriv->cur_network.network.IELength<= pnetwork->IELength) -+ { -+ update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, _TRUE); -+ rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (NDIS_802_11_FIXED_IEs), -+ pmlmepriv->cur_network.network.IELength); -+ } -+ } -+ -+_func_exit_; -+ -+} -+ -+ -+/* -+ -+Caller must hold pmlmepriv->lock first. -+ -+ -+*/ -+void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ ULONG bssid_ex_sz; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ struct wlan_network *oldest = NULL; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ if ((unsigned long)(pnetwork) < 0x7ffffff) -+ { -+#ifdef PLATFORM_OS_XP -+ KeBugCheckEx(0x87111c1c, (ULONG_PTR)pnetwork, 0, 0,0); -+#endif -+ } -+ -+ if (is_same_network(&(pnetwork->network), target)) -+ break; -+ -+ if ((oldest == ((struct wlan_network *)0)) || -+ time_after(oldest->last_scanned, pnetwork->last_scanned)) -+ oldest = pnetwork; -+ -+ plist = get_next(plist); -+ -+ } -+ -+ -+ /* If we didn't find a match, then get a new network slot to initialize -+ * with this beacon's information */ -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) { -+ -+ if (_rtw_queue_empty(&(pmlmepriv->free_bss_pool)) == _TRUE) { -+ /* If there are no more slots, expire the oldest */ -+ //list_del_init(&oldest->list); -+ pnetwork = oldest; -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ //target->PhyInfo.Optimum_antenna = pHalData->CurAntenna;//optimum_antenna=>For antenna diversity -+ rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna)); -+#endif -+ _rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target)); -+ //pnetwork->last_scanned = rtw_get_current_time(); -+ // variable initialize -+ pnetwork->fixed = _FALSE; -+ pnetwork->last_scanned = rtw_get_current_time(); -+ -+ pnetwork->network_type = 0; -+ pnetwork->aid=0; -+ pnetwork->join_res=0; -+ -+ /* bss info not receving from the right channel */ -+ if (pnetwork->network.PhyInfo.SignalQuality == 101) -+ pnetwork->network.PhyInfo.SignalQuality = 0; -+ } -+ else { -+ /* Otherwise just pull from the free list */ -+ -+ pnetwork = rtw_alloc_network(pmlmepriv); // will update scan_time -+ -+ if(pnetwork==NULL){ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n\n\nsomething wrong here\n\n\n")); -+ goto exit; -+ } -+ -+ bssid_ex_sz = get_WLAN_BSSID_EX_sz(target); -+ target->Length = bssid_ex_sz; -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ //target->PhyInfo.Optimum_antenna = pHalData->CurAntenna; -+ rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna)); -+#endif -+ _rtw_memcpy(&(pnetwork->network), target, bssid_ex_sz ); -+ -+ pnetwork->last_scanned = rtw_get_current_time(); -+ -+ /* bss info not receving from the right channel */ -+ if (pnetwork->network.PhyInfo.SignalQuality == 101) -+ pnetwork->network.PhyInfo.SignalQuality = 0; -+ -+ rtw_list_insert_tail(&(pnetwork->list),&(queue->queue)); -+ -+ } -+ } -+ else { -+ /* we have an entry and we are going to update it. But this entry may -+ * be already expired. In this case we do the same as we found a new -+ * net and call the new_net handler -+ */ -+ bool update_ie = _TRUE; -+ -+ pnetwork->last_scanned = rtw_get_current_time(); -+ -+ //target.Reserved[0]==1, means that scaned network is a bcn frame. -+ if((pnetwork->network.IELength>target->IELength) && (target->Reserved[0]==1)) -+ update_ie = _FALSE; -+ -+ update_network(&(pnetwork->network), target,adapter, update_ie); -+ } -+ -+exit: -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+_func_exit_; -+} -+ -+void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork); -+void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); -+ //_queue *queue = &(pmlmepriv->scanned_queue); -+ -+_func_enter_; -+ -+ //_enter_critical_bh(&queue->lock, &irqL); -+ -+ #if defined(CONFIG_P2P) && defined(CONFIG_P2P_REMOVE_GROUP_INFO) -+ rtw_WLAN_BSSID_EX_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO); -+ #endif -+ -+ update_current_network(adapter, pnetwork); -+ -+ rtw_update_scanned_network(adapter, pnetwork); -+ -+ //_exit_critical_bh(&queue->lock, &irqL); -+ -+_func_exit_; -+} -+ -+//select the desired network based on the capability of the (i)bss. -+// check items: (1) security -+// (2) network_type -+// (3) WMM -+// (4) HT -+// (5) others -+int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork); -+int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork) -+{ -+ struct security_priv *psecuritypriv = &adapter->securitypriv; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ u32 desired_encmode; -+ u32 privacy; -+ -+ //u8 wps_ie[512]; -+ uint wps_ielen; -+ -+ int bselected = _TRUE; -+ -+ desired_encmode = psecuritypriv->ndisencryptstatus; -+ privacy = pnetwork->network.Privacy; -+ -+ if(check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) -+ { -+ if(rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen)!=NULL) -+ { -+ return _TRUE; -+ } -+ else -+ { -+ return _FALSE; -+ } -+ } -+ if (adapter->registrypriv.wifi_spec == 1) //for correct flow of 8021X to do.... -+ { -+ u8 *p=NULL; -+ uint ie_len=0; -+ -+ if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0)) -+ bselected = _FALSE; -+ -+ if ( psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { -+ p = rtw_get_ie(pnetwork->network.IEs + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pnetwork->network.IELength - _BEACON_IE_OFFSET_)); -+ if (p && ie_len>0) { -+ bselected = _TRUE; -+ } else { -+ bselected = _FALSE; -+ } -+ } -+ } -+ -+ -+ if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) { -+ DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy); -+ bselected = _FALSE; -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) -+ { -+ if(pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode) -+ bselected = _FALSE; -+ } -+ -+ -+ return bselected; -+} -+ -+/* TODO: Perry : For Power Management */ -+void rtw_atimdone_event_callback(_adapter *adapter , u8 *pbuf) -+{ -+ -+_func_enter_; -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("receive atimdone_evet\n")); -+_func_exit_; -+ return; -+} -+ -+ -+void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf) -+{ -+ _irqL irqL; -+ u32 len; -+ WLAN_BSSID_EX *pnetwork; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ -+_func_enter_; -+ -+ pnetwork = (WLAN_BSSID_EX *)pbuf; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_survey_event_callback, ssid=%s\n", pnetwork->Ssid.Ssid)); -+ -+#ifdef CONFIG_RTL8712 -+ //endian_convert -+ pnetwork->Length = le32_to_cpu(pnetwork->Length); -+ pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength); -+ pnetwork->Privacy =le32_to_cpu( pnetwork->Privacy); -+ pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi); -+ pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse); -+ pnetwork->Configuration.ATIMWindow = le32_to_cpu(pnetwork->Configuration.ATIMWindow); -+ pnetwork->Configuration.BeaconPeriod = le32_to_cpu(pnetwork->Configuration.BeaconPeriod); -+ pnetwork->Configuration.DSConfig =le32_to_cpu(pnetwork->Configuration.DSConfig); -+ pnetwork->Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->Configuration.FHConfig.DwellTime); -+ pnetwork->Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->Configuration.FHConfig.HopPattern); -+ pnetwork->Configuration.FHConfig.HopSet=le32_to_cpu(pnetwork->Configuration.FHConfig.HopSet); -+ pnetwork->Configuration.FHConfig.Length=le32_to_cpu(pnetwork->Configuration.FHConfig.Length); -+ pnetwork->Configuration.Length = le32_to_cpu(pnetwork->Configuration.Length); -+ pnetwork->InfrastructureMode = le32_to_cpu(pnetwork->InfrastructureMode); -+ pnetwork->IELength = le32_to_cpu(pnetwork->IELength); -+#endif -+ -+ len = get_WLAN_BSSID_EX_sz(pnetwork); -+ if(len > (sizeof(WLAN_BSSID_EX))) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n ****rtw_survey_event_callback: return a wrong bss ***\n")); -+ return; -+ } -+ -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ // update IBSS_network 's timestamp -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) -+ { -+ //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE \n\n"); -+ if(_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN)) -+ { -+ struct wlan_network* ibss_wlan = NULL; -+ _irqL irqL; -+ -+ _rtw_memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8); -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->MacAddress); -+ if(ibss_wlan) -+ { -+ _rtw_memcpy(ibss_wlan->network.IEs , pnetwork->IEs, 8); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto exit; -+ } -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ } -+ } -+ -+ // lock pmlmepriv->lock when you accessing network_q -+ if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _FALSE) -+ { -+ if( pnetwork->Ssid.Ssid[0] == 0 ) -+ { -+ pnetwork->Ssid.SsidLength = 0; -+ } -+ rtw_add_network(adapter, pnetwork); -+ } -+ -+exit: -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+_func_exit_; -+ -+ return; -+} -+ -+ -+ -+void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) -+{ -+ _irqL irqL; -+ u8 timer_cancelled = _FALSE; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ -+#ifdef CONFIG_MLME_EXT -+ -+ mlmeext_surveydone_event_callback(adapter); -+ -+#endif -+ -+_func_enter_; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ if(pmlmepriv->wps_probe_req_ie) -+ { -+ u32 free_len = pmlmepriv->wps_probe_req_ie_len; -+ pmlmepriv->wps_probe_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->wps_probe_req_ie, free_len); -+ pmlmepriv->wps_probe_req_ie = NULL; -+ } -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_surveydone_event_callback: fw_state:%x\n\n", get_fwstate(pmlmepriv))); -+ -+ if (check_fwstate(pmlmepriv,_FW_UNDER_SURVEY)) -+ { -+ //u8 timer_cancelled; -+ -+ timer_cancelled = _TRUE; -+ //_cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled); -+ -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); -+ } -+ else { -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("nic status =%x, survey done event comes too late!\n", get_fwstate(pmlmepriv))); -+ } -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if(timer_cancelled) -+ _cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled); -+ -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ rtw_set_signal_stat_timer(&adapter->recvpriv); -+ #endif -+ -+ if(pmlmepriv->to_join == _TRUE) -+ { -+ if((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE) ) -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED)==_FALSE) -+ { -+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING); -+ -+ if(rtw_select_and_join_from_scanned_queue(pmlmepriv)==_SUCCESS) -+ { -+ _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT ); -+ } -+ else -+ { -+ WLAN_BSSID_EX *pdev_network = &(adapter->registrypriv.dev_network); -+ u8 *pibss = adapter->registrypriv.dev_network.MacAddress; -+ -+ //pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;//because don't set assoc_timer -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("switching to adhoc master\n")); -+ -+ _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); -+ _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); -+ -+ rtw_update_registrypriv_dev_network(adapter); -+ rtw_generate_random_ibss(pibss); -+ -+ pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; -+ -+ if(rtw_createbss_cmd(adapter)!=_SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error=>rtw_createbss_cmd status FAIL\n")); -+ } -+ -+ pmlmepriv->to_join = _FALSE; -+ } -+ } -+ } -+ else -+ { -+ int s_ret; -+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING); -+ pmlmepriv->to_join = _FALSE; -+ if(_SUCCESS == (s_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))) -+ { -+ _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); -+ } -+ else if(s_ret == 2)//there is no need to wait for join -+ { -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ rtw_indicate_connect(adapter); -+ } -+ else -+ { -+ DBG_871X("try_to_join, but select scanning queue fail, to_roaming:%d\n", rtw_to_roaming(adapter)); -+ #ifdef CONFIG_LAYER2_ROAMING -+ if (rtw_to_roaming(adapter) != 0) { -+ if( --pmlmepriv->to_roaming == 0 -+ || _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0) -+ ) { -+ rtw_set_roaming(adapter, 0); -+#ifdef CONFIG_INTEL_WIDI -+ if(adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) -+ { -+ _rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); -+ intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL); -+ DBG_871X("change to widi listen\n"); -+ } -+#endif // CONFIG_INTEL_WIDI -+ rtw_free_assoc_resources(adapter, 1); -+ rtw_indicate_disconnect(adapter); -+ } else { -+ pmlmepriv->to_join = _TRUE; -+ } -+ } -+ #endif -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ } -+ } -+ } -+ -+ indicate_wx_scan_complete_event(adapter); -+ //DBG_871X("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time)); -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+#ifdef CONFIG_P2P_PS -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { -+ p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0); -+ } -+#endif // CONFIG_P2P_PS -+ -+ rtw_os_xmit_schedule(adapter); -+#ifdef CONFIG_CONCURRENT_MODE -+ rtw_os_xmit_schedule(adapter->pbuddy_adapter); -+#endif -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_resume_xmit(adapter); -+#endif -+ -+#ifdef CONFIG_DRVEXT_MODULE_WSC -+ drvext_surveydone_callback(&adapter->drvextpriv); -+#endif -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+#ifdef CONFIG_INTEL_WIDI -+ if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_NONE) -+#endif -+ { -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ if(pmlmeext->sitesurvey_res.bss_cnt == 0){ -+ rtw_hal_sreset_reset(adapter); -+ } -+ } -+#endif -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_surveydone_event_callback(adapter); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+_func_exit_; -+ -+} -+ -+void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf) -+{ -+ -+} -+ -+void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf) -+{ -+ -+} -+ -+static void free_scanqueue(struct mlme_priv *pmlmepriv) -+{ -+ _irqL irqL, irqL0; -+ _queue *free_queue = &pmlmepriv->free_bss_pool; -+ _queue *scan_queue = &pmlmepriv->scanned_queue; -+ _list *plist, *phead, *ptemp; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n")); -+ _enter_critical_bh(&scan_queue->lock, &irqL0); -+ _enter_critical_bh(&free_queue->lock, &irqL); -+ -+ phead = get_list_head(scan_queue); -+ plist = get_next(phead); -+ -+ while (plist != phead) -+ { -+ ptemp = get_next(plist); -+ rtw_list_delete(plist); -+ rtw_list_insert_tail(plist, &free_queue->queue); -+ plist =ptemp; -+ pmlmepriv->num_of_scanned --; -+ } -+ -+ _exit_critical_bh(&free_queue->lock, &irqL); -+ _exit_critical_bh(&scan_queue->lock, &irqL0); -+ -+_func_exit_; -+} -+ -+/* -+*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock -+*/ -+void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue) -+{ -+ _irqL irqL; -+ struct wlan_network* pwlan = NULL; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct wlan_network *tgt_network = &pmlmepriv->cur_network; -+ -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+#endif //CONFIG_TDLS -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n")); -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress="MAC_FMT" ssid=%s\n", -+ MAC_ARG(tgt_network->network.MacAddress), tgt_network->network.Ssid.Ssid)); -+ -+ if(check_fwstate( pmlmepriv, WIFI_STATION_STATE|WIFI_AP_STATE)) -+ { -+ struct sta_info* psta; -+ -+ psta = rtw_get_stainfo(&adapter->stapriv, tgt_network->network.MacAddress); -+ -+#ifdef CONFIG_TDLS -+ if(ptdlsinfo->setup_state != TDLS_STATE_NONE) -+ { -+ rtw_tdls_cmd(adapter, myid(&(adapter->eeprompriv)), TDLS_RS_RCR); -+ rtw_reset_tdls_info(adapter); -+ rtw_free_all_stainfo(adapter); -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ } -+ else -+#endif //CONFIG_TDLS -+ { -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(adapter, psta); -+ } -+ -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ } -+ -+ if(check_fwstate( pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) -+ { -+ struct sta_info* psta; -+ -+ rtw_free_all_stainfo(adapter); -+ -+ psta = rtw_get_bcmc_stainfo(adapter); -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(adapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ rtw_init_bcmc_stainfo(adapter); -+ } -+ -+ if(lock_scanned_queue) -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); -+ if(pwlan) -+ { -+ pwlan->fixed = _FALSE; -+#ifdef CONFIG_P2P -+ if(!rtw_p2p_chk_state(&adapter->wdinfo, P2P_STATE_NONE)) -+ { -+ u32 p2p_ielen=0; -+ u8 *p2p_ie; -+ //u16 capability; -+ u8 *pcap = NULL; -+ u32 capability_len=0; -+ -+ //DBG_871X("free disconnecting network\n"); -+ //rtw_free_network_nolock(pmlmepriv, pwlan); -+ -+ if((p2p_ie=rtw_get_p2p_ie(pwlan->network.IEs+_FIXED_IE_LENGTH_, pwlan->network.IELength-_FIXED_IE_LENGTH_, NULL, &p2p_ielen))) -+ { -+ pcap = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, NULL, &capability_len); -+ if(pcap && capability_len==2) -+ { -+ u16 cap = *(u16*)pcap ; -+ *(u16*)pcap = cap&0x00ff;//clear group capability when free this network -+ } -+ } -+ -+ rtw_set_scan_deny(adapter, 2000); -+ //rtw_clear_scan_deny(adapter); -+ } -+#endif //CONFIG_P2P -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_assoc_resources : pwlan== NULL \n\n")); -+ } -+ -+ -+ if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) && (adapter->stapriv.asoc_sta_count== 1)) -+ /*||check_fwstate(pmlmepriv, WIFI_STATION_STATE)*/) -+ { -+ rtw_free_network_nolock(pmlmepriv, pwlan); -+ } -+ -+ if(lock_scanned_queue) -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ adapter->securitypriv.key_mask = 0; -+ -+_func_exit_; -+ -+} -+ -+/* -+*rtw_indicate_connect: the caller has to lock pmlmepriv->lock -+*/ -+void rtw_indicate_connect(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n")); -+ -+ pmlmepriv->to_join = _FALSE; -+ -+ if(!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) -+ { -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_LINK, 0); -+#endif -+ set_fwstate(pmlmepriv, _FW_LINKED); -+ -+ rtw_led_control(padapter, LED_CTL_LINK); -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ if(padapter->drvextpriv.enable_wpa) -+ { -+ indicate_l2_connect(padapter); -+ } -+ else -+#endif -+ { -+ rtw_os_indicate_connect(padapter); -+ } -+ -+ } -+ -+ rtw_set_roaming(padapter, 0); -+ -+#ifdef CONFIG_INTEL_WIDI -+ if(padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) -+ { -+ _rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); -+ intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL); -+ DBG_871X("change to widi listen\n"); -+ } -+#endif // CONFIG_INTEL_WIDI -+ -+ rtw_set_scan_deny(padapter, 3000); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state=0x%08x\n", get_fwstate(pmlmepriv))); -+ -+_func_exit_; -+ -+} -+ -+ -+/* -+*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock -+*/ -+void rtw_indicate_disconnect( _adapter *padapter ) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n")); -+ -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS); -+ -+ if(rtw_to_roaming(padapter) > 0) -+ _clr_fwstate_(pmlmepriv, _FW_LINKED); -+ -+ if(check_fwstate(&padapter->mlmepriv, _FW_LINKED) -+ || (rtw_to_roaming(padapter) <= 0) -+ ) -+ { -+ rtw_os_indicate_disconnect(padapter); -+ -+ //set ips_deny_time to avoid enter IPS before LPS leave -+ padapter->pwrctrlpriv.ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(3000); -+ -+ _clr_fwstate_(pmlmepriv, _FW_LINKED); -+ -+ rtw_led_control(padapter, LED_CTL_NO_LINK); -+ -+ rtw_clear_scan_deny(padapter); -+ -+ } -+ -+#ifdef CONFIG_P2P_PS -+ p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); -+#endif // CONFIG_P2P_PS -+ -+#ifdef CONFIG_LPS -+#ifdef CONFIG_WOWLAN -+ if(padapter->pwrctrlpriv.wowlan_mode==_FALSE) -+#endif //CONFIG_WOWLAN -+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); -+ -+#endif -+ -+_func_exit_; -+} -+ -+inline void rtw_indicate_scan_done( _adapter *padapter, bool aborted) -+{ -+ rtw_os_indicate_scan_done(padapter, aborted); -+} -+ -+void rtw_scan_abort(_adapter *adapter) -+{ -+ u32 cnt=0; -+ u32 start; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); -+ -+ start = rtw_get_current_time(); -+ pmlmeext->scan_abort = _TRUE; -+ while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) -+ && rtw_get_passing_time_ms(start) <= 200) { -+ -+ if (adapter->bDriverStopped || adapter->bSurpriseRemoved) -+ break; -+ -+ DBG_871X(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev)); -+ rtw_msleep_os(20); -+ } -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { -+ if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved) -+ DBG_871X(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev)); -+ #ifdef CONFIG_PLATFORM_MSTAR -+ //_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); -+ set_survey_timer(pmlmeext, 0); -+ _set_timer(&pmlmepriv->scan_to_timer, 50); -+ #endif -+ rtw_indicate_scan_done(adapter, _TRUE); -+ } -+ pmlmeext->scan_abort = _FALSE; -+} -+ -+static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wlan_network *pnetwork) -+{ -+ int i; -+ struct sta_info *bmc_sta, *psta=NULL; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ psta = rtw_get_stainfo(pstapriv, pnetwork->network.MacAddress); -+ if(psta==NULL) { -+ psta = rtw_alloc_stainfo(pstapriv, pnetwork->network.MacAddress); -+ } -+ -+ if(psta) //update ptarget_sta -+ { -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ psta->aid = pnetwork->join_res; -+#ifdef CONFIG_CONCURRENT_MODE -+ -+ if(PRIMARY_ADAPTER == padapter->adapter_type) -+ psta->mac_id=0; -+ else -+ psta->mac_id=2; -+#else -+ psta->mac_id=0; -+#endif -+ -+ psta->raid = networktype_to_raid(pmlmeext->cur_wireless_mode); -+ -+ //security related -+ if(padapter->securitypriv.dot11AuthAlgrthm== dot11AuthAlgrthm_8021X) -+ { -+ padapter->securitypriv.binstallGrpkey=_FALSE; -+ padapter->securitypriv.busetkipkey=_FALSE; -+ padapter->securitypriv.bgrpkey_handshake=_FALSE; -+ -+ psta->ieee8021x_blocked=_TRUE; -+ psta->dot118021XPrivacy=padapter->securitypriv.dot11PrivacyAlgrthm; -+ -+ _rtw_memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof (union Keytype)); -+ -+ _rtw_memset((u8 *)&psta->dot11tkiprxmickey, 0, sizeof (union Keytype)); -+ _rtw_memset((u8 *)&psta->dot11tkiptxmickey, 0, sizeof (union Keytype)); -+ -+ _rtw_memset((u8 *)&psta->dot11txpn, 0, sizeof (union pn48)); -+#ifdef CONFIG_IEEE80211W -+ _rtw_memset((u8 *)&psta->dot11wtxpn, 0, sizeof (union pn48)); -+#endif //CONFIG_IEEE80211W -+ _rtw_memset((u8 *)&psta->dot11rxpn, 0, sizeof (union pn48)); -+ } -+ -+ // Commented by Albert 2012/07/21 -+ // When doing the WPS, the wps_ie_len won't equal to 0 -+ // And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. -+ if ( padapter->securitypriv.wps_ie_len != 0 ) -+ { -+ psta->ieee8021x_blocked=_TRUE; -+ padapter->securitypriv.wps_ie_len = 0; -+ } -+ -+ -+ //for A-MPDU Rx reordering buffer control for bmc_sta & sta_info -+ //if A-MPDU Rx is enabled, reseting rx_ordering_ctrl wstart_b(indicate_seq) to default value=0xffff -+ //todo: check if AP can send A-MPDU packets -+ for(i=0; i < 16 ; i++) -+ { -+ //preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ preorder_ctrl->enable = _FALSE; -+ preorder_ctrl->indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq); -+ #endif -+ preorder_ctrl->wend_b= 0xffff; -+ preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32 -+ } -+ -+ -+ bmc_sta = rtw_get_bcmc_stainfo(padapter); -+ if(bmc_sta) -+ { -+ for(i=0; i < 16 ; i++) -+ { -+ //preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; -+ preorder_ctrl = &bmc_sta->recvreorder_ctrl[i]; -+ preorder_ctrl->enable = _FALSE; -+ preorder_ctrl->indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq); -+ #endif -+ preorder_ctrl->wend_b= 0xffff; -+ preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32 -+ } -+ } -+ -+ -+ //misc. -+ update_sta_info(padapter, psta); -+ -+ } -+ -+ return psta; -+ -+} -+ -+//pnetwork : returns from rtw_joinbss_event_callback -+//ptarget_wlan: found from scanned_queue -+static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork) -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:"MAC_FMT"\n" -+ ,get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress))); -+ -+ -+ // why not use ptarget_wlan?? -+ _rtw_memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length); -+ -+ cur_network->aid = pnetwork->join_res; -+ -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ rtw_set_signal_stat_timer(&padapter->recvpriv); -+#endif -+ padapter->recvpriv.signal_strength = ptarget_wlan->network.PhyInfo.SignalStrength; -+ padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality; -+ //the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled) -+ padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength); -+ #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 -+ DBG_871X(FUNC_ADPT_FMT" signal_strength:%3u, rssi:%3d, signal_qual:%3u" -+ "\n" -+ , FUNC_ADPT_ARG(padapter) -+ , padapter->recvpriv.signal_strength -+ , padapter->recvpriv.rssi -+ , padapter->recvpriv.signal_qual -+ ); -+ #endif -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ rtw_set_signal_stat_timer(&padapter->recvpriv); -+#endif -+ -+ //update fw_state //will clr _FW_UNDER_LINKING here indirectly -+ switch(pnetwork->network.InfrastructureMode) -+ { -+ case Ndis802_11Infrastructure: -+ -+ if(pmlmepriv->fw_state&WIFI_UNDER_WPS) -+ pmlmepriv->fw_state = WIFI_STATION_STATE|WIFI_UNDER_WPS; -+ else -+ pmlmepriv->fw_state = WIFI_STATION_STATE; -+ -+ break; -+ case Ndis802_11IBSS: -+ pmlmepriv->fw_state = WIFI_ADHOC_STATE; -+ break; -+ default: -+ pmlmepriv->fw_state = WIFI_NULL_STATE; -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Invalid network_mode\n")); -+ break; -+ } -+ -+ rtw_update_protection(padapter, (cur_network->network.IEs) + sizeof (NDIS_802_11_FIXED_IEs), -+ (cur_network->network.IELength)); -+ -+#ifdef CONFIG_80211N_HT -+ rtw_update_ht_cap(padapter, cur_network->network.IEs, cur_network->network.IELength, (u8) cur_network->network.Configuration.DSConfig); -+#endif -+ -+ -+} -+ -+//Notes: the fucntion could be > passive_level (the same context as Rx tasklet) -+//pnetwork : returns from rtw_joinbss_event_callback -+//ptarget_wlan: found from scanned_queue -+//if join_res > 0, for (fw_state==WIFI_STATION_STATE), we check if "ptarget_sta" & "ptarget_wlan" exist. -+//if join_res > 0, for (fw_state==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. -+//if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). -+// -+//#define REJOIN -+void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf) -+{ -+ _irqL irqL,irqL2; -+ static u8 retry=0; -+ u8 timer_cancelled; -+ struct sta_info *ptarget_sta= NULL, *pcur_sta = NULL; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ struct wlan_network *pnetwork = (struct wlan_network *)pbuf; -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; -+ unsigned int the_same_macaddr = _FALSE; -+ -+_func_enter_; -+ -+#ifdef CONFIG_RTL8712 -+ //endian_convert -+ pnetwork->join_res = le32_to_cpu(pnetwork->join_res); -+ pnetwork->network_type = le32_to_cpu(pnetwork->network_type); -+ pnetwork->network.Length = le32_to_cpu(pnetwork->network.Length); -+ pnetwork->network.Ssid.SsidLength = le32_to_cpu(pnetwork->network.Ssid.SsidLength); -+ pnetwork->network.Privacy =le32_to_cpu( pnetwork->network.Privacy); -+ pnetwork->network.Rssi = le32_to_cpu(pnetwork->network.Rssi); -+ pnetwork->network.NetworkTypeInUse =le32_to_cpu(pnetwork->network.NetworkTypeInUse) ; -+ pnetwork->network.Configuration.ATIMWindow = le32_to_cpu(pnetwork->network.Configuration.ATIMWindow); -+ pnetwork->network.Configuration.BeaconPeriod = le32_to_cpu(pnetwork->network.Configuration.BeaconPeriod); -+ pnetwork->network.Configuration.DSConfig = le32_to_cpu(pnetwork->network.Configuration.DSConfig); -+ pnetwork->network.Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->network.Configuration.FHConfig.DwellTime); -+ pnetwork->network.Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopPattern); -+ pnetwork->network.Configuration.FHConfig.HopSet=le32_to_cpu(pnetwork->network.Configuration.FHConfig.HopSet); -+ pnetwork->network.Configuration.FHConfig.Length=le32_to_cpu(pnetwork->network.Configuration.FHConfig.Length); -+ pnetwork->network.Configuration.Length = le32_to_cpu(pnetwork->network.Configuration.Length); -+ pnetwork->network.InfrastructureMode = le32_to_cpu(pnetwork->network.InfrastructureMode); -+ pnetwork->network.IELength = le32_to_cpu(pnetwork->network.IELength ); -+#endif -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("joinbss event call back received with res=%d\n", pnetwork->join_res)); -+ -+ rtw_get_encrypt_decrypt_from_registrypriv(adapter); -+ -+ -+ if (pmlmepriv->assoc_ssid.SsidLength == 0) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("@@@@@ joinbss event call back for Any SSid\n")); -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("@@@@@ rtw_joinbss_event_callback for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid)); -+ } -+ -+ the_same_macaddr = _rtw_memcmp(pnetwork->network.MacAddress, cur_network->network.MacAddress, ETH_ALEN); -+ -+ pnetwork->network.Length = get_WLAN_BSSID_EX_sz(&pnetwork->network); -+ if(pnetwork->network.Length > sizeof(WLAN_BSSID_EX)) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n\n ***joinbss_evt_callback return a wrong bss ***\n\n")); -+ goto ignore_joinbss_callback; -+ } -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_joinbss_event_callback !! _enter_critical \n")); -+ -+ if(pnetwork->join_res > 0) -+ { -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ retry = 0; -+ if (check_fwstate(pmlmepriv,_FW_UNDER_LINKING) ) -+ { -+ //s1. find ptarget_wlan -+ if(check_fwstate(pmlmepriv, _FW_LINKED) ) -+ { -+ if(the_same_macaddr == _TRUE) -+ { -+ ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); -+ } -+ else -+ { -+ pcur_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); -+ if(pcur_wlan) pcur_wlan->fixed = _FALSE; -+ -+ pcur_sta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress); -+ if(pcur_sta){ -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ rtw_free_stainfo(adapter, pcur_sta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ } -+ -+ ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){ -+ if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; -+ } -+ } -+ -+ } -+ else -+ { -+ ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE){ -+ if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; -+ } -+ } -+ -+ //s2. update cur_network -+ if(ptarget_wlan) -+ { -+ rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork); -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Can't find ptarget_wlan when joinbss_event callback\n")); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ignore_joinbss_callback; -+ } -+ -+ -+ //s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork); -+ if(ptarget_sta==NULL) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Can't update stainfo when joinbss_event callback\n")); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ignore_joinbss_callback; -+ } -+ } -+ -+ //s4. indicate connect -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ rtw_indicate_connect(adapter); -+ } -+ else -+ { -+ //adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("adhoc mode, fw_state:%x", get_fwstate(pmlmepriv))); -+ } -+ -+ -+ //s5. Cancle assoc_timer -+ _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("Cancle assoc_timer\n")); -+ -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_joinbss_event_callback err: fw_state:%x", get_fwstate(pmlmepriv))); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ignore_joinbss_callback; -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ } -+ else if(pnetwork->join_res == -4) -+ { -+ rtw_reset_securitypriv(adapter); -+ _set_timer(&pmlmepriv->assoc_timer, 1); -+ -+ //rtw_free_assoc_resources(adapter, 1); -+ -+ if((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n", get_fwstate(pmlmepriv))); -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ } -+ -+ } -+ else //if join_res < 0 (join fails), then try again -+ { -+ -+ #ifdef REJOIN -+ res = _FAIL; -+ if(retry < 2) { -+ res = rtw_select_and_join_from_scanned_queue(pmlmepriv); -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_select_and_join_from_scanned_queue again! res:%d\n",res)); -+ } -+ -+ if(res == _SUCCESS) -+ { -+ //extend time of assoc_timer -+ _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); -+ retry++; -+ } -+ else if(res == 2)//there is no need to wait for join -+ { -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ rtw_indicate_connect(adapter); -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Set Assoc_Timer = 1; can't find match ssid in scanned_q \n")); -+ #endif -+ -+ _set_timer(&pmlmepriv->assoc_timer, 1); -+ //rtw_free_assoc_resources(adapter, 1); -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ -+ #ifdef REJOIN -+ retry = 0; -+ } -+ #endif -+ } -+ -+ignore_joinbss_callback: -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ _func_exit_; -+} -+ -+void rtw_joinbss_event_callback(_adapter *adapter, u8 *pbuf) -+{ -+ struct wlan_network *pnetwork = (struct wlan_network *)pbuf; -+ -+_func_enter_; -+ -+ mlmeext_joinbss_event_callback(adapter, pnetwork->join_res); -+ -+ rtw_os_xmit_schedule(adapter); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ rtw_os_xmit_schedule(adapter->pbuddy_adapter); -+#endif -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_resume_xmit(adapter); -+#endif -+ -+_func_exit_; -+} -+ -+void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf) -+{ -+ _irqL irqL; -+ struct sta_info *psta; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ struct stassoc_event *pstassoc = (struct stassoc_event*)pbuf; -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ struct wlan_network *ptarget_wlan = NULL; -+ -+_func_enter_; -+ -+ if(rtw_access_ctrl(adapter, pstassoc->macaddr) == _FALSE) -+ return; -+ -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) -+ { -+ psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); -+ if(psta) -+ { -+#ifdef CONFIG_IOCTL_CFG80211 -+#ifdef COMPAT_KERNEL_RELEASE -+ -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ u8 *passoc_req = NULL; -+ u32 assoc_req_len; -+ -+ _enter_critical_bh(&psta->lock, &irqL); -+ if(psta->passoc_req && psta->assoc_req_len>0) -+ { -+ passoc_req = rtw_zmalloc(psta->assoc_req_len); -+ if(passoc_req) -+ { -+ assoc_req_len = psta->assoc_req_len; -+ _rtw_memcpy(passoc_req, psta->passoc_req, assoc_req_len); -+ -+ rtw_mfree(psta->passoc_req , psta->assoc_req_len); -+ psta->passoc_req = NULL; -+ psta->assoc_req_len = 0; -+ } -+ } -+ _exit_critical_bh(&psta->lock, &irqL); -+ -+ if(passoc_req && assoc_req_len>0) -+ { -+ rtw_cfg80211_indicate_sta_assoc(adapter, passoc_req, assoc_req_len); -+ -+ rtw_mfree(passoc_req, assoc_req_len); -+ } -+#endif //(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ //bss_cap_update_on_sta_join(adapter, psta); -+ //sta_info_update(adapter, psta); -+ ap_sta_info_defer_update(adapter, psta); -+ } -+ -+ goto exit; -+ } -+#endif -+ -+ psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); -+ if( psta != NULL) -+ { -+ //the sta have been in sta_info_queue => do nothing -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue \n")); -+ -+ goto exit; //(between drv has received this event before and fw have not yet to set key to CAM_ENTRY) -+ } -+ -+ psta = rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr); -+ if (psta == NULL) { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Can't alloc sta_info when rtw_stassoc_event_callback\n")); -+ goto exit; -+ } -+ -+ //to do : init sta_info variable -+ psta->qos_option = 0; -+ psta->mac_id = (uint)pstassoc->cam_id; -+ //psta->aid = (uint)pstassoc->cam_id; -+ -+ if(adapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X) -+ psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; -+ -+ psta->ieee8021x_blocked = _FALSE; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) ) -+ { -+ if(adapter->stapriv.asoc_sta_count== 2) -+ { -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress); -+ if(ptarget_wlan) ptarget_wlan->fixed = _TRUE; -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ // a sta + bc/mc_stainfo (not Ibss_stainfo) -+ rtw_indicate_connect(adapter); -+ } -+ } -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ -+ mlmeext_sta_add_event_callback(adapter, psta); -+ -+#ifdef CONFIG_RTL8711 -+ //submit SetStaKey_cmd to tell fw, fw will allocate an CAM entry for this sta -+ rtw_setstakey_cmd(adapter, (unsigned char*)psta, _FALSE); -+#endif -+ -+exit: -+ -+_func_exit_; -+ -+} -+ -+void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf) -+{ -+ _irqL irqL,irqL2; -+ struct sta_info *psta; -+ struct wlan_network* pwlan = NULL; -+ WLAN_BSSID_EX *pdev_network=NULL; -+ u8* pibss = NULL; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ struct stadel_event *pstadel = (struct stadel_event*)pbuf; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct wlan_network *tgt_network = &(pmlmepriv->cur_network); -+ -+_func_enter_; -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) -+ { -+#ifdef CONFIG_IOCTL_CFG80211 -+#ifdef COMPAT_KERNEL_RELEASE -+ -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ rtw_cfg80211_indicate_sta_disassoc(adapter, pstadel->macaddr, *(u16*)pstadel->rsvd); -+#endif //(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ return; -+ } -+ -+ -+ mlmeext_sta_del_event_callback(adapter); -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL2); -+ -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) ) -+ { -+ #ifdef CONFIG_LAYER2_ROAMING -+ if (rtw_to_roaming(adapter) > 0) -+ pmlmepriv->to_roaming--; /* this stadel_event is caused by roaming, decrease to_roaming */ -+ else if (rtw_to_roaming(adapter) == 0) -+ rtw_set_roaming(adapter, adapter->registrypriv.max_roaming_times); -+#ifdef CONFIG_INTEL_WIDI -+ if(adapter->mlmepriv.widi_state != INTEL_WIDI_STATE_CONNECTED) -+#endif // CONFIG_INTEL_WIDI -+ if(*((unsigned short *)(pstadel->rsvd)) != WLAN_REASON_EXPIRATION_CHK) -+ rtw_set_roaming(adapter, 0); /* don't roam */ -+ #endif -+ -+ rtw_free_uc_swdec_pending_queue(adapter); -+ -+ rtw_free_assoc_resources(adapter, 1); -+ rtw_indicate_disconnect(adapter); -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ // remove the network entry in scanned_queue -+ pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); -+ if (pwlan) { -+ pwlan->fixed = _FALSE; -+ rtw_free_network_nolock(pmlmepriv, pwlan); -+ } -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ _rtw_roaming(adapter, tgt_network); -+ -+#ifdef CONFIG_INTEL_WIDI -+ if (!rtw_to_roaming(adapter)) -+ process_intel_widi_disconnect(adapter, 1); -+#endif // CONFIG_INTEL_WIDI -+ } -+ -+ if ( check_fwstate(pmlmepriv,WIFI_ADHOC_MASTER_STATE) || -+ check_fwstate(pmlmepriv,WIFI_ADHOC_STATE)) -+ { -+ psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr); -+ -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(adapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ if(adapter->stapriv.asoc_sta_count== 1) //a sta + bc/mc_stainfo (not Ibss_stainfo) -+ { -+ //rtw_indicate_disconnect(adapter);//removed@20091105 -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ //free old ibss network -+ //pwlan = rtw_find_network(&pmlmepriv->scanned_queue, pstadel->macaddr); -+ pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress); -+ if(pwlan) -+ { -+ pwlan->fixed = _FALSE; -+ rtw_free_network_nolock(pmlmepriv, pwlan); -+ } -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ //re-create ibss -+ pdev_network = &(adapter->registrypriv.dev_network); -+ pibss = adapter->registrypriv.dev_network.MacAddress; -+ -+ _rtw_memcpy(pdev_network, &tgt_network->network, get_WLAN_BSSID_EX_sz(&tgt_network->network)); -+ -+ _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); -+ _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); -+ -+ rtw_update_registrypriv_dev_network(adapter); -+ -+ rtw_generate_random_ibss(pibss); -+ -+ if(check_fwstate(pmlmepriv,WIFI_ADHOC_STATE)) -+ { -+ set_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE); -+ _clr_fwstate_(pmlmepriv, WIFI_ADHOC_STATE); -+ } -+ -+ if(rtw_createbss_cmd(adapter)!=_SUCCESS) -+ { -+ -+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>stadel_event_callback: rtw_createbss_cmd status FAIL*** \n ")); -+ -+ } -+ -+ -+ } -+ -+ } -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL2); -+ -+_func_exit_; -+ -+} -+ -+ -+void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf) -+{ -+#ifdef CONFIG_LPS_LCLK -+ struct reportpwrstate_parm *preportpwrstate; -+#endif -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_cpwm_event_callback !!!\n")); -+#ifdef CONFIG_LPS_LCLK -+ preportpwrstate = (struct reportpwrstate_parm*)pbuf; -+ preportpwrstate->state |= (u8)(padapter->pwrctrlpriv.cpwm_tog + 0x80); -+ cpwm_int_hdl(padapter, preportpwrstate); -+#endif -+ -+_func_exit_; -+ -+} -+ -+/* -+* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss -+* @adapter: pointer to _adapter structure -+*/ -+void _rtw_join_timeout_handler (_adapter *adapter) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+#ifdef CONFIG_LAYER2_ROAMING -+ int do_join_r; -+#endif //CONFIG_LAYER2_ROAMING -+ -+#if 0 -+ if (adapter->bDriverStopped == _TRUE){ -+ _rtw_up_sema(&pmlmepriv->assoc_terminate); -+ return; -+ } -+#endif -+ -+_func_enter_; -+#ifdef PLATFORM_FREEBSD -+ rtw_mtx_lock(NULL); -+ if (callout_pending(&adapter->mlmepriv.assoc_timer.callout)) { -+ /* callout was reset */ -+ //mtx_unlock(&sc->sc_mtx); -+ rtw_mtx_unlock(NULL); -+ return; -+ } -+ if (!callout_active(&adapter->mlmepriv.assoc_timer.callout)) { -+ /* callout was stopped */ -+ //mtx_unlock(&sc->sc_mtx); -+ rtw_mtx_unlock(NULL); -+ return; -+ } -+ callout_deactivate(&adapter->mlmepriv.assoc_timer.callout); -+ -+ -+#endif -+ -+ DBG_871X("%s, fw_state=%x\n", __FUNCTION__, get_fwstate(pmlmepriv)); -+ -+ if(adapter->bDriverStopped ||adapter->bSurpriseRemoved) -+ return; -+ -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ #ifdef CONFIG_LAYER2_ROAMING -+ if (rtw_to_roaming(adapter) > 0) { /* join timeout caused by roaming */ -+ while(1) { -+ pmlmepriv->to_roaming--; -+ if (rtw_to_roaming(adapter) != 0) { /* try another */ -+ DBG_871X("%s try another roaming\n", __FUNCTION__); -+ if( _SUCCESS!=(do_join_r=rtw_do_join(adapter)) ) { -+ DBG_871X("%s roaming do_join return %d\n", __FUNCTION__ ,do_join_r); -+ continue; -+ } -+ break; -+ } else { -+#ifdef CONFIG_INTEL_WIDI -+ if(adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) -+ { -+ _rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); -+ intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL); -+ DBG_871X("change to widi listen\n"); -+ } -+#endif // CONFIG_INTEL_WIDI -+ DBG_871X("%s We've try roaming but fail\n", __FUNCTION__); -+ rtw_indicate_disconnect(adapter); -+ break; -+ } -+ } -+ -+ } else -+ #endif -+ { -+ rtw_indicate_disconnect(adapter); -+ free_scanqueue(pmlmepriv);//??? -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ //indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED -+ rtw_cfg80211_indicate_disconnect(adapter); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ } -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ -+#ifdef CONFIG_DRVEXT_MODULE_WSC -+ drvext_assoc_fail_indicate(&adapter->drvextpriv); -+#endif -+#ifdef PLATFORM_FREEBSD -+ rtw_mtx_unlock(NULL); -+#endif -+ -+_func_exit_; -+ -+} -+ -+/* -+* rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey -+* @adapter: pointer to _adapter structure -+*/ -+void rtw_scan_timeout_handler (_adapter *adapter) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ -+ DBG_871X(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv)); -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ rtw_indicate_scan_done(adapter, _TRUE); -+ -+} -+ -+static void rtw_auto_scan_handler(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ -+ //auto site survey per 60sec -+ if(pmlmepriv->scan_interval >0) -+ { -+ pmlmepriv->scan_interval--; -+ if(pmlmepriv->scan_interval==0) -+ { -+/* -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING -> \n", __FUNCTION__); -+ return; -+ } -+ -+ if(pmlmepriv->sitesurveyctrl.traffic_busy == _TRUE) -+ { -+ DBG_871X("%s exit cause traffic_busy(%x)\n",__FUNCTION__, pmlmepriv->sitesurveyctrl.traffic_busy); -+ return; -+ } -+*/ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (rtw_buddy_adapter_up(padapter)) -+ { -+ if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || -+ (padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE)) -+ { -+ DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __FUNCTION__); -+ return; -+ } -+ } -+#endif -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); -+ -+ pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec -+ -+ } -+ -+ } -+ -+} -+ -+void rtw_dynamic_check_timer_handlder(_adapter *adapter) -+{ -+#ifdef CONFIG_AP_MODE -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+#endif //CONFIG_AP_MODE -+ struct registry_priv *pregistrypriv = &adapter->registrypriv; -+#ifdef CONFIG_CONCURRENT_MODE -+ PADAPTER pbuddy_adapter = adapter->pbuddy_adapter; -+#endif -+ -+ if(!adapter) -+ return; -+ -+ if(adapter->hw_init_completed == _FALSE) -+ return; -+ -+ if ((adapter->bDriverStopped == _TRUE)||(adapter->bSurpriseRemoved== _TRUE)) -+ return; -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pbuddy_adapter) -+ { -+ if(adapter->net_closed == _TRUE && pbuddy_adapter->net_closed == _TRUE) -+ { -+ return; -+ } -+ } -+ else -+#endif //CONFIG_CONCURRENT_MODE -+ if(adapter->net_closed == _TRUE) -+ { -+ return; -+ } -+ -+ rtw_dynamic_chk_wk_cmd(adapter); -+ -+ if(pregistrypriv->wifi_spec==1) -+ { -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+#endif -+ { -+ //auto site survey -+ rtw_auto_scan_handler(adapter); -+ } -+ } -+ -+#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+#ifdef CONFIG_AP_MODE -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ expire_timeout_chk(adapter); -+ } -+#endif -+#endif //!CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ -+#ifdef CONFIG_BR_EXT -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ rcu_read_lock(); -+#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ if( adapter->pnetdev->br_port -+#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ if( rcu_dereference(adapter->pnetdev->rx_handler_data) -+#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) -+ { -+ // expire NAT2.5 entry -+ void nat25_db_expire(_adapter *priv); -+ nat25_db_expire(adapter); -+ -+ if (adapter->pppoe_connection_in_progress > 0) { -+ adapter->pppoe_connection_in_progress--; -+ } -+ -+ // due to rtw_dynamic_check_timer_handlder() is called every 2 seconds -+ if (adapter->pppoe_connection_in_progress > 0) { -+ adapter->pppoe_connection_in_progress--; -+ } -+ } -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ rcu_read_unlock(); -+#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ -+#endif // CONFIG_BR_EXT -+ -+} -+ -+ -+#ifdef CONFIG_SET_SCAN_DENY_TIMER -+inline bool rtw_is_scan_deny(_adapter *adapter) -+{ -+ struct mlme_priv *mlmepriv = &adapter->mlmepriv; -+ return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE; -+} -+ -+inline void rtw_clear_scan_deny(_adapter *adapter) -+{ -+ struct mlme_priv *mlmepriv = &adapter->mlmepriv; -+ ATOMIC_SET(&mlmepriv->set_scan_deny, 0); -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); -+} -+ -+void rtw_set_scan_deny_timer_hdl(_adapter *adapter) -+{ -+ rtw_clear_scan_deny(adapter); -+} -+ -+void rtw_set_scan_deny(_adapter *adapter, u32 ms) -+{ -+ struct mlme_priv *mlmepriv = &adapter->mlmepriv; -+#ifdef CONFIG_CONCURRENT_MODE -+ struct mlme_priv *b_mlmepriv; -+#endif -+ -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); -+ ATOMIC_SET(&mlmepriv->set_scan_deny, 1); -+ _set_timer(&mlmepriv->set_scan_deny_timer, ms); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (!adapter->pbuddy_adapter) -+ return; -+ -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter)); -+ b_mlmepriv = &adapter->pbuddy_adapter->mlmepriv; -+ ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1); -+ _set_timer(&b_mlmepriv->set_scan_deny_timer, ms); -+#endif -+ -+} -+#endif -+ -+#if defined(IEEE80211_SCAN_RESULT_EXPIRE) -+#define RTW_SCAN_RESULT_EXPIRE IEEE80211_SCAN_RESULT_EXPIRE/HZ*1000 -1000 //3000 -1000 -+#else -+#define RTW_SCAN_RESULT_EXPIRE 2000 -+#endif -+ -+#ifndef PLATFORM_FREEBSD -+/* -+* Select a new join candidate from the original @param candidate and @param competitor -+* @return _TRUE: candidate is updated -+* @return _FALSE: candidate is not updated -+*/ -+static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv -+ , struct wlan_network **candidate, struct wlan_network *competitor) -+{ -+ int updated = _FALSE; -+ _adapter *adapter = container_of(pmlmepriv, _adapter, mlmepriv); -+ -+ -+ //check bssid, if needed -+ if(pmlmepriv->assoc_by_bssid==_TRUE) { -+ if(_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==_FALSE) -+ goto exit; -+ } -+ -+ //check ssid, if needed -+ if(pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) { -+ if( competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength -+ || _rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == _FALSE -+ ) -+ goto exit; -+ } -+ -+ if(rtw_is_desired_network(adapter, competitor) == _FALSE) -+ goto exit; -+ -+#ifdef CONFIG_LAYER2_ROAMING -+ if(rtw_to_roaming(adapter) > 0) { -+ if( rtw_get_passing_time_ms((u32)competitor->last_scanned) >= RTW_SCAN_RESULT_EXPIRE -+ || is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) == _FALSE -+ ) -+ goto exit; -+ } -+#endif -+ -+ if(*candidate == NULL ||(*candidate)->network.Rssinetwork.Rssi ) -+ { -+ *candidate = competitor; -+ updated = _TRUE; -+ } -+ -+#if 0 -+ if(pmlmepriv->assoc_by_bssid==_TRUE) { // associate with bssid -+ if( (*candidate == NULL ||(*candidate)->network.Rssinetwork.Rssi ) -+ && _rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)==_TRUE -+ ) { -+ *candidate = competitor; -+ updated = _TRUE; -+ } -+ } else if (pmlmepriv->assoc_ssid.SsidLength == 0 ) { // associate with ssid, but ssidlength is 0 -+ if( (*candidate == NULL ||(*candidate)->network.Rssinetwork.Rssi ) ) { -+ *candidate = competitor; -+ updated = _TRUE; -+ } -+ } else -+#ifdef CONFIG_LAYER2_ROAMING -+ if(rtw_to_roaming(adapter)) { // roaming -+ if( (*candidate == NULL ||(*candidate)->network.Rssinetwork.Rssi ) -+ && is_same_ess(&competitor->network, &pmlmepriv->cur_network.network) -+ //&&(!is_same_network(&competitor->network, &pmlmepriv->cur_network.network)) -+ && rtw_get_passing_time_ms((u32)competitor->last_scanned) < RTW_SCAN_RESULT_EXPIRE -+ && rtw_is_desired_network(adapter, competitor) -+ ) { -+ *candidate = competitor; -+ updated = _TRUE; -+ } -+ -+ } else -+#endif -+ { // associate with ssid -+ if( (*candidate == NULL ||(*candidate)->network.Rssinetwork.Rssi ) -+ && (competitor->network.Ssid.SsidLength==pmlmepriv->assoc_ssid.SsidLength) -+ &&((_rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) == _TRUE) -+ && rtw_is_desired_network(adapter, competitor) -+ ) { -+ *candidate = competitor; -+ updated = _TRUE; -+ } -+ } -+#endif -+ -+ if(updated){ -+ DBG_871X("[by_bssid:%u][assoc_ssid:%s]" -+ #ifdef CONFIG_LAYER2_ROAMING -+ "[to_roaming:%u] " -+ #endif -+ "new candidate: %s("MAC_FMT", ch%u) rssi:%d\n", -+ pmlmepriv->assoc_by_bssid, -+ pmlmepriv->assoc_ssid.Ssid, -+ #ifdef CONFIG_LAYER2_ROAMING -+ rtw_to_roaming(adapter), -+ #endif -+ (*candidate)->network.Ssid.Ssid, -+ MAC_ARG((*candidate)->network.MacAddress), -+ (*candidate)->network.Configuration.DSConfig, -+ (int)(*candidate)->network.Rssi -+ ); -+ } -+ -+exit: -+ return updated; -+} -+ -+/* -+Calling context: -+The caller of the sub-routine will be in critical section... -+ -+The caller must hold the following spinlock -+ -+pmlmepriv->lock -+ -+ -+*/ -+ -+int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv ) -+{ -+ _irqL irqL; -+ int ret; -+ _list *phead; -+ _adapter *adapter; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ struct wlan_network *candidate = NULL; -+ u8 bSupportAntDiv = _FALSE; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ phead = get_list_head(queue); -+ adapter = (_adapter *)pmlmepriv->nic_hdl; -+ -+ pmlmepriv->pscanned = get_next( phead ); -+ -+ while (!rtw_end_of_queue_search(phead, pmlmepriv->pscanned)) { -+ -+ pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); -+ if(pnetwork==NULL){ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s return _FAIL:(pnetwork==NULL)\n", __FUNCTION__)); -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ pmlmepriv->pscanned = get_next(pmlmepriv->pscanned); -+ -+ #if 0 -+ DBG_871X("MacAddress:"MAC_FMT" ssid:%s\n", MAC_ARG(pnetwork->network.MacAddress), pnetwork->network.Ssid.Ssid); -+ #endif -+ -+ rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork); -+ -+ } -+ -+ if(candidate == NULL) { -+ DBG_871X("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__); -+ ret = _FAIL; -+ goto exit; -+ } else { -+ DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __FUNCTION__, -+ candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress), -+ candidate->network.Configuration.DSConfig); -+ } -+ -+ -+ // check for situation of _FW_LINKED -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ DBG_871X("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__); -+ -+ #if 0 // for WPA/WPA2 authentication, wpa_supplicant will expect authentication from AP, it is needed to reconnect AP... -+ if(is_same_network(&pmlmepriv->cur_network.network, &candidate->network)) -+ { -+ DBG_871X("%s: _FW_LINKED and is same network, it needn't join again\n", __FUNCTION__); -+ -+ rtw_indicate_connect(adapter);//rtw_indicate_connect again -+ -+ ret = 2; -+ goto exit; -+ } -+ else -+ #endif -+ { -+ rtw_disassoc_cmd(adapter, 0, _TRUE); -+ rtw_indicate_disconnect(adapter); -+ rtw_free_assoc_resources(adapter, 0); -+ } -+ } -+ -+ #ifdef CONFIG_ANTENNA_DIVERSITY -+ rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(bSupportAntDiv)); -+ if(_TRUE == bSupportAntDiv) -+ { -+ u8 CurrentAntenna; -+ rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna)); -+ DBG_871X("#### Opt_Ant_(%s) , cur_Ant(%s)\n", -+ (2==candidate->network.PhyInfo.Optimum_antenna)?"A":"B", -+ (2==CurrentAntenna)?"A":"B" -+ ); -+ } -+ #endif -+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING); -+ ret = rtw_joinbss_cmd(adapter, candidate); -+ -+exit: -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+_func_exit_; -+ -+ return ret; -+} -+#else -+int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv ) -+{ -+ _irqL irqL; -+ _list *phead; -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ u8 CurrentAntenna; -+#endif -+ unsigned char *dst_ssid, *src_ssid; -+ _adapter *adapter; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ struct wlan_network *pnetwork_max_rssi = NULL; -+ #ifdef CONFIG_LAYER2_ROAMING -+ struct wlan_network * roaming_candidate=NULL; -+ u32 cur_time=rtw_get_current_time(); -+ #endif -+ -+_func_enter_; -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ phead = get_list_head(queue); -+ adapter = (_adapter *)pmlmepriv->nic_hdl; -+ -+ pmlmepriv->pscanned = get_next( phead ); -+ -+ while (!rtw_end_of_queue_search(phead, pmlmepriv->pscanned)) { -+ -+ pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); -+ if(pnetwork==NULL){ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("(2)rtw_select_and_join_from_scanned_queue return _FAIL:(pnetwork==NULL)\n")); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ return _FAIL; -+ } -+ -+ dst_ssid = pnetwork->network.Ssid.Ssid; -+ src_ssid = pmlmepriv->assoc_ssid.Ssid; -+ -+ pmlmepriv->pscanned = get_next(pmlmepriv->pscanned); -+ -+ #if 0 -+ DBG_871X("MacAddress:"MAC_FMT" ssid:%s\n", MAC_ARG(pnetwork->network.MacAddress), pnetwork->network.Ssid.Ssid); -+ #endif -+ -+ if(pmlmepriv->assoc_by_bssid==_TRUE) -+ { -+ if(_rtw_memcmp(pnetwork->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)==_TRUE) -+ { -+ //remove the condition @ 20081125 -+ //if((pmlmepriv->cur_network.network.InfrastructureMode==Ndis802_11AutoUnknown)|| -+ // pmlmepriv->cur_network.network.InfrastructureMode == pnetwork->network.InfrastructureMode) -+ // goto ask_for_joinbss; -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ if(is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network)) -+ { -+ //DBG_871X("select_and_join(1): _FW_LINKED and is same network, it needn't join again\n"); -+ -+ rtw_indicate_connect(adapter);//rtw_indicate_connect again -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ return 2; -+ } -+ else -+ { -+ rtw_disassoc_cmd(adapter, 0, _TRUE); -+ rtw_indicate_disconnect(adapter); -+ rtw_free_assoc_resources(adapter, 0); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ask_for_joinbss; -+ -+ } -+ } -+ else -+ { -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ask_for_joinbss; -+ } -+ -+ } -+ -+ } else if (pmlmepriv->assoc_ssid.SsidLength == 0) { -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ask_for_joinbss;//anyway, join first selected(dequeued) pnetwork if ssid_len=0 -+ -+ #ifdef CONFIG_LAYER2_ROAMING -+ } else if (rtw_to_roaming(adapter) > 0) { -+ -+ if( (roaming_candidate == NULL ||roaming_candidate->network.Rssinetwork.Rssi ) -+ && is_same_ess(&pnetwork->network, &pmlmepriv->cur_network.network) -+ //&&(!is_same_network(&pnetwork->network, &pmlmepriv->cur_network.network)) -+ && rtw_get_time_interval_ms((u32)pnetwork->last_scanned,cur_time) < 5000 -+ ) { -+ roaming_candidate = pnetwork; -+ //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_, -+ DBG_871X -+ ("roaming_candidate???: %s("MAC_FMT")\n", -+ roaming_candidate->network.Ssid.Ssid, MAC_ARG(roaming_candidate->network.MacAddress) ) -+ //) -+ ; -+ } -+ continue; -+ #endif -+ -+ } else if ( (pnetwork->network.Ssid.SsidLength==pmlmepriv->assoc_ssid.SsidLength) -+ &&((_rtw_memcmp(dst_ssid, src_ssid, pmlmepriv->assoc_ssid.SsidLength)) == _TRUE) -+ ) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s \n", dst_ssid, src_ssid)); -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna)); -+ DBG_871X("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid, -+ (2==pnetwork->network.PhyInfo.Optimum_antenna)?"A":"B", -+ (2==CurrentAntenna)?"A":"B"); -+#endif -+ //remove the condition @ 20081125 -+ //if((pmlmepriv->cur_network.network.InfrastructureMode==Ndis802_11AutoUnknown)|| -+ // pmlmepriv->cur_network.network.InfrastructureMode == pnetwork->network.InfrastructureMode) -+ //{ -+ // _rtw_memcpy(pmlmepriv->assoc_bssid, pnetwork->network.MacAddress, ETH_ALEN); -+ // goto ask_for_joinbss; -+ //} -+ -+ if(pmlmepriv->assoc_by_rssi==_TRUE)//if the ssid is the same, select the bss which has the max rssi -+ { -+ if( NULL==pnetwork_max_rssi|| pnetwork->network.Rssi > pnetwork_max_rssi->network.Rssi) -+ pnetwork_max_rssi = pnetwork; -+ } -+ else if(rtw_is_desired_network(adapter, pnetwork) == _TRUE) -+ { -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+#if 0 -+ if(is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network)) -+ { -+ DBG_871X("select_and_join(2): _FW_LINKED and is same network, it needn't join again\n"); -+ -+ rtw_indicate_connect(adapter);//rtw_indicate_connect again -+ -+ return 2; -+ } -+ else -+#endif -+ { -+ rtw_disassoc_cmd(adapter, 0, _TRUE); -+ //rtw_indicate_disconnect(adapter);// -+ rtw_free_assoc_resources(adapter, 0); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ask_for_joinbss; -+ } -+ } -+ else -+ { -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ goto ask_for_joinbss; -+ } -+ -+ } -+ -+ -+ } -+ -+ } -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ #ifdef CONFIG_LAYER2_ROAMING -+ if(rtw_to_roaming(adapter) > 0 && roaming_candidate ){ -+ pnetwork=roaming_candidate; -+ DBG_871X("select_and_join_from_scanned_queue: roaming_candidate: %s("MAC_FMT")\n", -+ pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress)); -+ goto ask_for_joinbss; -+ } -+ #endif -+ -+ if((pmlmepriv->assoc_by_rssi==_TRUE) && (pnetwork_max_rssi!=NULL)) -+ { -+ pnetwork = pnetwork_max_rssi; -+ DBG_871X("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n", -+ pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress)); -+ goto ask_for_joinbss; -+ } -+ -+ DBG_871X("(1)rtw_select_and_join_from_scanned_queue return _FAIL\n"); -+ -+_func_exit_; -+ -+ return _FAIL; -+ -+ask_for_joinbss: -+ -+_func_exit_; -+ -+ return rtw_joinbss_cmd(adapter, pnetwork); -+ -+} -+#endif //PLATFORM_FREEBSD -+ -+ -+sint rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv) -+{ -+ struct cmd_obj* pcmd; -+ struct setauth_parm *psetauthparm; -+ struct cmd_priv *pcmdpriv=&(adapter->cmdpriv); -+ sint res=_SUCCESS; -+ -+_func_enter_; -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res= _FAIL; //try again -+ goto exit; -+ } -+ -+ psetauthparm=(struct setauth_parm*)rtw_zmalloc(sizeof(struct setauth_parm)); -+ if(psetauthparm==NULL){ -+ rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memset(psetauthparm, 0, sizeof(struct setauth_parm)); -+ psetauthparm->mode=(unsigned char)psecuritypriv->dot11AuthAlgrthm; -+ -+ pcmd->cmdcode = _SetAuth_CMD_; -+ pcmd->parmbuf = (unsigned char *)psetauthparm; -+ pcmd->cmdsz = (sizeof(struct setauth_parm)); -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ -+ _rtw_init_listhead(&pcmd->list); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("after enqueue set_auth_cmd, auth_mode=%x\n", psecuritypriv->dot11AuthAlgrthm)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+ -+sint rtw_set_key(_adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx) -+{ -+ u8 keylen; -+ struct cmd_obj *pcmd; -+ struct setkey_parm *psetkeyparm; -+ struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ sint res=_SUCCESS; -+ -+_func_enter_; -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res= _FAIL; //try again -+ goto exit; -+ } -+ psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm)); -+ if(psetkeyparm==NULL){ -+ rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memset(psetkeyparm, 0, sizeof(struct setkey_parm)); -+ -+ if(psecuritypriv->dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X){ -+ psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy; -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d \n", psetkeyparm->algorithm)); -+ } -+ else{ -+ psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm; -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d \n", psetkeyparm->algorithm)); -+ -+ } -+ psetkeyparm->keyid = (u8)keyid;//0~3 -+ psetkeyparm->set_tx = set_tx; -+ if (is_wep_enc(psetkeyparm->algorithm)) -+ psecuritypriv->key_mask |= BIT(psetkeyparm->keyid); -+ -+ DBG_871X("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid, psecuritypriv->key_mask); -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d \n",psetkeyparm->algorithm, keyid)); -+ -+ switch(psetkeyparm->algorithm){ -+ -+ case _WEP40_: -+ keylen=5; -+ _rtw_memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[0]), keylen); -+ break; -+ case _WEP104_: -+ keylen=13; -+ _rtw_memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[0]), keylen); -+ break; -+ case _TKIP_: -+ keylen=16; -+ _rtw_memcpy(&psetkeyparm->key, &psecuritypriv->dot118021XGrpKey[keyid], keylen); -+ psetkeyparm->grpkey=1; -+ break; -+ case _AES_: -+ keylen=16; -+ _rtw_memcpy(&psetkeyparm->key, &psecuritypriv->dot118021XGrpKey[keyid], keylen); -+ psetkeyparm->grpkey=1; -+ break; -+ default: -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key:psecuritypriv->dot11PrivacyAlgrthm = %x (must be 1 or 2 or 4 or 5)\n",psecuritypriv->dot11PrivacyAlgrthm)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ -+ pcmd->cmdcode = _SetKey_CMD_; -+ pcmd->parmbuf = (u8 *)psetkeyparm; -+ pcmd->cmdsz = (sizeof(struct setkey_parm)); -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ -+ _rtw_init_listhead(&pcmd->list); -+ -+ //_rtw_init_sema(&(pcmd->cmd_sem), 0); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+_func_exit_; -+ return res; -+ -+} -+ -+ -+//adjust IEs for rtw_joinbss_cmd in WMM -+int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len) -+{ -+ unsigned int ielength=0; -+ unsigned int i, j; -+ -+ i = 12; //after the fixed IE -+ while(i=0 :if there is pre-auth key, and return the entry id -+// -+// -+ -+static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid) -+{ -+ struct security_priv *psecuritypriv=&Adapter->securitypriv; -+ int i=0; -+ -+ do -+ { -+ if( ( psecuritypriv->PMKIDList[i].bUsed ) && -+ ( _rtw_memcmp( psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN ) == _TRUE ) ) -+ { -+ break; -+ } -+ else -+ { -+ i++; -+ //continue; -+ } -+ -+ }while(isecuritypriv; -+ -+ if(ie[13]<=20){ -+ // The RSN IE didn't include the PMK ID, append the PMK information -+ ie[ie_len]=1; -+ ie_len++; -+ ie[ie_len]=0; //PMKID count = 0x0100 -+ ie_len++; -+ _rtw_memcpy( &ie[ie_len], &psecuritypriv->PMKIDList[iEntry].PMKID, 16); -+ -+ ie_len+=16; -+ ie[13]+=18;//PMKID length = 2+16 -+ -+ } -+ return (ie_len); -+ -+} -+sint rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len) -+{ -+ u8 authmode, securitytype, match; -+ u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; -+ u8 wpa_oui[4]={0x0, 0x50, 0xf2, 0x01}; -+ uint ielength, cnt, remove_cnt; -+ int iEntry; -+ -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ struct security_priv *psecuritypriv=&adapter->securitypriv; -+ uint ndisauthmode=psecuritypriv->ndisauthtype; -+ uint ndissecuritytype = psecuritypriv->ndisencryptstatus; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, -+ ("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n", -+ ndisauthmode, ndissecuritytype)); -+ -+ //copy fixed ie only -+ _rtw_memcpy(out_ie, in_ie,12); -+ ielength=12; -+ if((ndisauthmode==Ndis802_11AuthModeWPA)||(ndisauthmode==Ndis802_11AuthModeWPAPSK)) -+ authmode=_WPA_IE_ID_; -+ if((ndisauthmode==Ndis802_11AuthModeWPA2)||(ndisauthmode==Ndis802_11AuthModeWPA2PSK)) -+ authmode=_WPA2_IE_ID_; -+ -+ if(check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) -+ { -+ _rtw_memcpy(out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len); -+ -+ ielength += psecuritypriv->wps_ie_len; -+ } -+ else if((authmode==_WPA_IE_ID_)||(authmode==_WPA2_IE_ID_)) -+ { -+ //copy RSN or SSN -+ _rtw_memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2); -+ /* debug for CONFIG_IEEE80211W -+ { -+ int jj; -+ printk("supplicant_ie_length=%d &&&&&&&&&&&&&&&&&&&\n", psecuritypriv->supplicant_ie[1]+2); -+ for(jj=0; jj < psecuritypriv->supplicant_ie[1]+2; jj++) -+ printk(" %02x ", psecuritypriv->supplicant_ie[jj]); -+ printk("\n"); -+ }*/ -+ ielength+=psecuritypriv->supplicant_ie[1]+2; -+ rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ drvext_report_sec_ie(&adapter->drvextpriv, authmode, sec_ie); -+#endif -+ } -+ -+ iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid); -+ if(iEntry<0) -+ { -+ return ielength; -+ } -+ else -+ { -+ if(authmode == _WPA2_IE_ID_) -+ { -+ ielength=rtw_append_pmkid(adapter, iEntry, out_ie, ielength); -+ } -+ } -+ -+_func_exit_; -+ -+ return ielength; -+} -+ -+void rtw_init_registrypriv_dev_network( _adapter* adapter) -+{ -+ struct registry_priv* pregistrypriv = &adapter->registrypriv; -+ struct eeprom_priv* peepriv = &adapter->eeprompriv; -+ WLAN_BSSID_EX *pdev_network = &pregistrypriv->dev_network; -+ u8 *myhwaddr = myid(peepriv); -+ -+_func_enter_; -+ -+ _rtw_memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN); -+ -+ _rtw_memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(NDIS_802_11_SSID)); -+ -+ pdev_network->Configuration.Length=sizeof(NDIS_802_11_CONFIGURATION); -+ pdev_network->Configuration.BeaconPeriod = 100; -+ pdev_network->Configuration.FHConfig.Length = 0; -+ pdev_network->Configuration.FHConfig.HopPattern = 0; -+ pdev_network->Configuration.FHConfig.HopSet = 0; -+ pdev_network->Configuration.FHConfig.DwellTime = 0; -+ -+ -+_func_exit_; -+ -+} -+ -+void rtw_update_registrypriv_dev_network(_adapter* adapter) -+{ -+ int sz=0; -+ struct registry_priv* pregistrypriv = &adapter->registrypriv; -+ WLAN_BSSID_EX *pdev_network = &pregistrypriv->dev_network; -+ struct security_priv* psecuritypriv = &adapter->securitypriv; -+ struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; -+ //struct xmit_priv *pxmitpriv = &adapter->xmitpriv; -+ -+_func_enter_; -+ -+#if 0 -+ pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense; -+ pxmitpriv->vcs = pregistrypriv->vcs_type; -+ pxmitpriv->vcs_type = pregistrypriv->vcs_type; -+ //pxmitpriv->rts_thresh = pregistrypriv->rts_thresh; -+ pxmitpriv->frag_len = pregistrypriv->frag_thresh; -+ -+ adapter->qospriv.qos_option = pregistrypriv->wmm_enable; -+#endif -+ -+ pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; // adhoc no 802.1x -+ -+ pdev_network->Rssi = 0; -+ -+ switch(pregistrypriv->wireless_mode) -+ { -+ case WIRELESS_11B: -+ pdev_network->NetworkTypeInUse = (Ndis802_11DS); -+ break; -+ case WIRELESS_11G: -+ case WIRELESS_11BG: -+ case WIRELESS_11_24N: -+ case WIRELESS_11G_24N: -+ case WIRELESS_11BG_24N: -+ pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24); -+ break; -+ case WIRELESS_11A: -+ case WIRELESS_11A_5N: -+ pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5); -+ break; -+ case WIRELESS_11ABGN: -+ if(pregistrypriv->channel > 14) -+ pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5); -+ else -+ pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24); -+ break; -+ default : -+ // TODO -+ break; -+ } -+ -+ pdev_network->Configuration.DSConfig = (pregistrypriv->channel); -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("pregistrypriv->channel=%d, pdev_network->Configuration.DSConfig=0x%x\n", pregistrypriv->channel, pdev_network->Configuration.DSConfig)); -+ -+ if(cur_network->network.InfrastructureMode == Ndis802_11IBSS) -+ pdev_network->Configuration.ATIMWindow = (0); -+ -+ pdev_network->InfrastructureMode = (cur_network->network.InfrastructureMode); -+ -+ // 1. Supported rates -+ // 2. IE -+ -+ //rtw_set_supported_rate(pdev_network->SupportedRates, pregistrypriv->wireless_mode) ; // will be called in rtw_generate_ie -+ sz = rtw_generate_ie(pregistrypriv); -+ -+ pdev_network->IELength = sz; -+ -+ pdev_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX *)pdev_network); -+ -+ //notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); -+ //pdev_network->IELength = cpu_to_le32(sz); -+ -+_func_exit_; -+ -+} -+ -+void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter) -+{ -+_func_enter_; -+ -+ -+_func_exit_; -+ -+} -+ -+//the fucntion is at passive_level -+void rtw_joinbss_reset(_adapter *padapter) -+{ -+ u8 threshold; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+#ifdef CONFIG_80211N_HT -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+#endif -+ -+ //todo: if you want to do something io/reg/hw setting before join_bss, please add code here -+ -+ -+ -+ -+#ifdef CONFIG_80211N_HT -+ -+ pmlmepriv->num_FortyMHzIntolerant = 0; -+ -+ pmlmepriv->num_sta_no_ht = 0; -+ -+ phtpriv->ampdu_enable = _FALSE;//reset to disabled -+ -+#ifdef CONFIG_USB_HCI -+ // TH=1 => means that invalidate usb rx aggregation -+ // TH=0 => means that validate usb rx aggregation, use init value. -+ if(phtpriv->ht_option) -+ { -+ if(padapter->registrypriv.wifi_spec==1) -+ threshold = 1; -+ else -+ threshold = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); -+ } -+ else -+ { -+ threshold = 1; -+ rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); -+ } -+#endif -+ -+#endif -+ -+} -+ -+ -+#ifdef CONFIG_80211N_HT -+ -+//the fucntion is >= passive_level -+unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len, u8 channel) -+{ -+ u32 ielen, out_len; -+ unsigned char *p, *pframe; -+ struct rtw_ieee80211_ht_cap ht_capie; -+ unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00}; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct qos_priv *pqospriv= &pmlmepriv->qospriv; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ u8 cbw40_enable = 0; -+ -+ phtpriv->ht_option = _FALSE; -+ -+ p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12); -+ -+ if(p && ielen>0) -+ { -+ if(pqospriv->qos_option == 0) -+ { -+ out_len = *pout_len; -+ pframe = rtw_set_ie(out_ie+out_len, _VENDOR_SPECIFIC_IE_, -+ _WMM_IE_Length_, WMM_IE, pout_len); -+ -+ pqospriv->qos_option = 1; -+ } -+ -+ out_len = *pout_len; -+ -+ _rtw_memset(&ht_capie, 0, sizeof(struct rtw_ieee80211_ht_cap)); -+ -+ ht_capie.cap_info = IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_TX_STBC | -+ IEEE80211_HT_CAP_DSSSCCK40; -+ //if insert module set only support 20MHZ, don't add the 40MHZ and SGI_40 -+ if( channel > 14 ) -+ { -+ if( pregpriv->cbw40_enable & BIT(1) ) -+ cbw40_enable = 1; -+ } -+ else -+ if( pregpriv->cbw40_enable & BIT(0) ) -+ cbw40_enable = 1; -+ -+ if ( cbw40_enable != 0 ) -+ ht_capie.cap_info |= IEEE80211_HT_CAP_SUP_WIDTH | IEEE80211_HT_CAP_SGI_40; -+ -+ -+ -+ { -+ u32 rx_packet_offset, max_recvbuf_sz; -+ rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); -+ rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); -+ //if(max_recvbuf_sz-rx_packet_offset>(8191-256)) { -+ // DBG_871X("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __FUNCTION__); -+ // ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU; -+ //} -+ } -+ -+ ht_capie.ampdu_params_info = (IEEE80211_HT_CAP_AMPDU_FACTOR&0x03); -+ -+ if(padapter->securitypriv.dot11PrivacyAlgrthm == _AES_ ) -+ ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2)); -+ else -+ ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00); -+ -+ -+ pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_, -+ sizeof(struct rtw_ieee80211_ht_cap), (unsigned char*)&ht_capie, pout_len); -+ -+ -+ //_rtw_memcpy(out_ie+out_len, p, ielen+2);//gtest -+ //*pout_len = *pout_len + (ielen+2); -+ -+ -+ phtpriv->ht_option = _TRUE; -+ -+ p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12); -+ if(p && (ielen==sizeof(struct ieee80211_ht_addt_info))) -+ { -+ out_len = *pout_len; -+ pframe = rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2 , pout_len); -+ } -+ -+ } -+ -+ return (phtpriv->ht_option); -+ -+} -+ -+//the fucntion is > passive_level (in critical_section) -+void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len, u8 channel) -+{ -+ u8 *p, max_ampdu_sz; -+ int len; -+ //struct sta_info *bmc_sta, *psta; -+ struct rtw_ieee80211_ht_cap *pht_capie; -+ struct ieee80211_ht_addt_info *pht_addtinfo; -+ //struct recv_reorder_ctrl *preorder_ctrl; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ //struct recv_priv *precvpriv = &padapter->recvpriv; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ //struct wlan_network *pcur_network = &(pmlmepriv->cur_network);; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 cbw40_enable=0; -+ -+ if(!phtpriv->ht_option) -+ return; -+ -+ if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable)) -+ return; -+ -+ DBG_871X("+rtw_update_ht_cap()\n"); -+ -+ //maybe needs check if ap supports rx ampdu. -+ if((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1)) -+ { -+ //In the wifi cert. test, the test Lab should turn off the AP's RX AMPDU. client doen't need to close the TX AMPDU -+ /*if(pregistrypriv->wifi_spec==1) -+ { -+ phtpriv->ampdu_enable = _FALSE; -+ } -+ else*/ -+ { -+ phtpriv->ampdu_enable = _TRUE; -+ } -+ } -+ else if(pregistrypriv->ampdu_enable==2) -+ { -+ phtpriv->ampdu_enable = _TRUE; -+ } -+ -+ -+ //check Max Rx A-MPDU Size -+ len = 0; -+ p = rtw_get_ie(pie+sizeof (NDIS_802_11_FIXED_IEs), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (NDIS_802_11_FIXED_IEs)); -+ if(p && len>0) -+ { -+ pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2); -+ max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR); -+ max_ampdu_sz = 1 << (max_ampdu_sz+3); // max_ampdu_sz (kbytes); -+ -+ //DBG_871X("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz); -+ phtpriv->rx_ampdu_maxlen = max_ampdu_sz; -+ -+ } -+ -+ -+ len=0; -+ p = rtw_get_ie(pie+sizeof (NDIS_802_11_FIXED_IEs), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (NDIS_802_11_FIXED_IEs)); -+ if(p && len>0) -+ { -+ pht_addtinfo = (struct ieee80211_ht_addt_info *)(p+2); -+ //todo: -+ } -+ -+ if( channel > 14 ) -+ { -+ if( pregistrypriv->cbw40_enable & BIT(1) ) -+ cbw40_enable = 1; -+ } -+ else -+ if( pregistrypriv->cbw40_enable & BIT(0) ) -+ cbw40_enable = 1; -+ -+ -+ //update cur_bwmode & cur_ch_offset -+ if ((cbw40_enable) && -+ (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & BIT(1)) && -+ (pmlmeinfo->HT_info.infos[0] & BIT(2))) -+ { -+ int i; -+ u8 rf_type; -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ -+ //update the MCS rates -+ for (i = 0; i < 16; i++) -+ { -+ if((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ } -+ else -+ { -+ #ifdef CONFIG_DISABLE_MCS13TO15 -+ if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && pregistrypriv->wifi_spec != 1 ) -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R_MCS13TO15_OFF[i]; -+ } -+ else -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; -+ #else -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; -+ #endif //CONFIG_DISABLE_MCS13TO15 -+ } -+ #ifdef RTL8192C_RECONFIG_TO_1T1R -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ } -+ #endif -+ -+ if(pregistrypriv->special_rf_path) -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ -+ } -+ //switch to the 40M Hz mode accoring to the AP -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ switch ((pmlmeinfo->HT_info.infos[0] & 0x3)) -+ { -+ case HT_EXTCHNL_OFFSET_UPPER: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ break; -+ -+ case HT_EXTCHNL_OFFSET_LOWER: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ break; -+ -+ default: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ break; -+ } -+ } -+ -+ // -+ // Config SM Power Save setting -+ // -+ pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & 0x0C) >> 2; -+ if(pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) -+ { -+ /*u8 i; -+ //update the MCS rates -+ for (i = 0; i < 16; i++) -+ { -+ pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ }*/ -+ DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__); -+ } -+ -+ // -+ // Config current HT Protection mode. -+ // -+ pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; -+ -+ -+ -+#if 0 //move to rtw_update_sta_info_client() -+ //for A-MPDU Rx reordering buffer control for bmc_sta & sta_info -+ //if A-MPDU Rx is enabled, reseting rx_ordering_ctrl wstart_b(indicate_seq) to default value=0xffff -+ //todo: check if AP can send A-MPDU packets -+ bmc_sta = rtw_get_bcmc_stainfo(padapter); -+ if(bmc_sta) -+ { -+ for(i=0; i < 16 ; i++) -+ { -+ //preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; -+ preorder_ctrl = &bmc_sta->recvreorder_ctrl[i]; -+ preorder_ctrl->enable = _FALSE; -+ preorder_ctrl->indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq); -+ #endif -+ preorder_ctrl->wend_b= 0xffff; -+ preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32 -+ } -+ } -+ -+ psta = rtw_get_stainfo(&padapter->stapriv, pcur_network->network.MacAddress); -+ if(psta) -+ { -+ for(i=0; i < 16 ; i++) -+ { -+ //preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ preorder_ctrl->enable = _FALSE; -+ preorder_ctrl->indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq); -+ #endif -+ preorder_ctrl->wend_b= 0xffff; -+ preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32 -+ } -+ } -+#endif -+ -+} -+ -+void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ u8 issued; -+ int priority; -+ struct sta_info *psta=NULL; -+ struct ht_priv *phtpriv; -+ struct pkt_attrib *pattrib =&pxmitframe->attrib; -+ s32 bmcst = IS_MCAST(pattrib->ra); -+ -+ if(bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic == _FALSE)) -+ return; -+ -+ priority = pattrib->priority; -+ -+ if (pattrib->psta) -+ psta = pattrib->psta; -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); -+ } -+ -+ if(psta==NULL) -+ { -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return; -+ } -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return; -+ } -+ -+ -+ phtpriv = &psta->htpriv; -+ -+ if((phtpriv->ht_option==_TRUE) && (phtpriv->ampdu_enable==_TRUE)) -+ { -+ issued = (phtpriv->agg_enable_bitmap>>priority)&0x1; -+ issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1; -+ -+ if(0==issued) -+ { -+ DBG_871X("rtw_issue_addbareq_cmd, p=%d\n", priority); -+ psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority); -+ rtw_addbareq_cmd(padapter,(u8) priority, pattrib->ra); -+ } -+ } -+ -+} -+ -+#endif -+ -+#ifdef CONFIG_LAYER2_ROAMING -+inline void rtw_set_roaming(_adapter *adapter, u8 to_roaming) -+{ -+ if (to_roaming == 0) -+ adapter->mlmepriv.to_join = _FALSE; -+ adapter->mlmepriv.to_roaming = to_roaming; -+} -+ -+inline u8 rtw_to_roaming(_adapter *adapter) -+{ -+ return adapter->mlmepriv.to_roaming; -+} -+ -+void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) -+{ -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _rtw_roaming(padapter, tgt_network); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ int do_join_r; -+ -+ struct wlan_network *pnetwork; -+ -+ if(tgt_network != NULL) -+ pnetwork = tgt_network; -+ else -+ pnetwork = &pmlmepriv->cur_network; -+ -+ if(0 < rtw_to_roaming(padapter)) { -+ DBG_871X("roaming from %s("MAC_FMT"), length:%d\n", -+ pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress), -+ pnetwork->network.Ssid.SsidLength); -+ _rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID)); -+ -+ pmlmepriv->assoc_by_bssid = _FALSE; -+ -+ while(1) { -+ if( _SUCCESS==(do_join_r=rtw_do_join(padapter)) ) { -+ break; -+ } else { -+ DBG_871X("roaming do_join return %d\n", do_join_r); -+ pmlmepriv->to_roaming--; -+ -+ if(0< rtw_to_roaming(padapter)) { -+ continue; -+ } else { -+ DBG_871X("%s(%d) -to roaming fail, indicate_disconnect\n", __FUNCTION__,__LINE__); -+ rtw_indicate_disconnect(padapter); -+ break; -+ } -+ } -+ } -+ } -+ -+} -+#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+sint rtw_buddy_adapter_up(_adapter *padapter) -+{ -+ sint res = _FALSE; -+ -+ if(padapter == NULL) -+ return res; -+ -+ -+ if(padapter->pbuddy_adapter == NULL) -+ { -+ res = _FALSE; -+ } -+ else if( (padapter->pbuddy_adapter->bDriverStopped) || (padapter->pbuddy_adapter->bSurpriseRemoved) || -+ (padapter->pbuddy_adapter->bup == _FALSE) || (padapter->pbuddy_adapter->hw_init_completed == _FALSE)) -+ { -+ res = _FALSE; -+ } -+ else -+ { -+ res = _TRUE; -+ } -+ -+ return res; -+ -+} -+ -+sint check_buddy_fwstate(_adapter *padapter, sint state) -+{ -+ if(padapter == NULL) -+ return _FALSE; -+ -+ if(padapter->pbuddy_adapter == NULL) -+ return _FALSE; -+ -+ if ((state == WIFI_FW_NULL_STATE) && -+ (padapter->pbuddy_adapter->mlmepriv.fw_state == WIFI_FW_NULL_STATE)) -+ return _TRUE; -+ -+ if (padapter->pbuddy_adapter->mlmepriv.fw_state & state) -+ return _TRUE; -+ -+ return _FALSE; -+} -+#endif //CONFIG_CONCURRENT_MODE -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c -@@ -0,0 +1,13600 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_MLME_EXT_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+struct mlme_handler mlme_sta_tbl[]={ -+ {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, -+ {WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp}, -+ {WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq}, -+ {WIFI_REASSOCRSP, "OnReAssocRsp", &OnAssocRsp}, -+ {WIFI_PROBEREQ, "OnProbeReq", &OnProbeReq}, -+ {WIFI_PROBERSP, "OnProbeRsp", &OnProbeRsp}, -+ -+ /*---------------------------------------------------------- -+ below 2 are reserved -+ -----------------------------------------------------------*/ -+ {0, "DoReserved", &DoReserved}, -+ {0, "DoReserved", &DoReserved}, -+ {WIFI_BEACON, "OnBeacon", &OnBeacon}, -+ {WIFI_ATIM, "OnATIM", &OnAtim}, -+ {WIFI_DISASSOC, "OnDisassoc", &OnDisassoc}, -+ {WIFI_AUTH, "OnAuth", &OnAuthClient}, -+ {WIFI_DEAUTH, "OnDeAuth", &OnDeAuth}, -+ {WIFI_ACTION, "OnAction", &OnAction}, -+}; -+ -+#ifdef _CONFIG_NATIVEAP_MLME_ -+struct mlme_handler mlme_ap_tbl[]={ -+ {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, -+ {WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp}, -+ {WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq}, -+ {WIFI_REASSOCRSP, "OnReAssocRsp", &OnAssocRsp}, -+ {WIFI_PROBEREQ, "OnProbeReq", &OnProbeReq}, -+ {WIFI_PROBERSP, "OnProbeRsp", &OnProbeRsp}, -+ -+ /*---------------------------------------------------------- -+ below 2 are reserved -+ -----------------------------------------------------------*/ -+ {0, "DoReserved", &DoReserved}, -+ {0, "DoReserved", &DoReserved}, -+ {WIFI_BEACON, "OnBeacon", &OnBeacon}, -+ {WIFI_ATIM, "OnATIM", &OnAtim}, -+ {WIFI_DISASSOC, "OnDisassoc", &OnDisassoc}, -+ {WIFI_AUTH, "OnAuth", &OnAuth}, -+ {WIFI_DEAUTH, "OnDeAuth", &OnDeAuth}, -+ {WIFI_ACTION, "OnAction", &OnAction}, -+}; -+#endif -+ -+struct action_handler OnAction_tbl[]={ -+ {RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct}, -+ {RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos}, -+ {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls}, -+ {RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back}, -+ {RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public}, -+ {RTW_WLAN_CATEGORY_RADIO_MEASUREMENT, "ACTION_RADIO_MEASUREMENT", &DoReserved}, -+ {RTW_WLAN_CATEGORY_FT, "ACTION_FT", &DoReserved}, -+ {RTW_WLAN_CATEGORY_HT, "ACTION_HT", &OnAction_ht}, -+#ifdef CONFIG_IEEE80211W -+ {RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &OnAction_sa_query}, -+#else -+ {RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &DoReserved}, -+#endif //CONFIG_IEEE80211W -+ //add for CONFIG_IEEE80211W -+ {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved}, -+ {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved}, -+ {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &OnAction_wmm}, -+ {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p}, -+}; -+ -+ -+u8 null_addr[ETH_ALEN]= {0,0,0,0,0,0}; -+ -+/************************************************** -+OUI definitions for the vendor specific IE -+***************************************************/ -+unsigned char RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01}; -+unsigned char WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02}; -+unsigned char WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04}; -+unsigned char P2P_OUI[] = {0x50,0x6F,0x9A,0x09}; -+unsigned char WFD_OUI[] = {0x50,0x6F,0x9A,0x0A}; -+ -+unsigned char WMM_INFO_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01}; -+unsigned char WMM_PARA_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; -+ -+unsigned char WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02}; -+unsigned char RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02}; -+ -+extern unsigned char REALTEK_96B_IE[]; -+ -+/******************************************************** -+MCS rate definitions -+*********************************************************/ -+#ifdef CONFIG_DISABLE_MCS13TO15 -+unsigned char MCS_rate_2R_MCS13TO15_OFF[16] = {0xff, 0x1f, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; -+unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; -+#else //CONFIG_DISABLE_MCS13TO15 -+unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; -+#endif //CONFIG_DISABLE_MCS13TO15 -+unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; -+ -+/******************************************************** -+ChannelPlan definitions -+*********************************************************/ -+/*static RT_CHANNEL_PLAN DefaultChannelPlan[RT_CHANNEL_DOMAIN_MAX] = { -+ {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,52,56,60,64,100,104,108,112,116,132,136,140,149,153,157,161,165},32}, // 0x00, RT_CHANNEL_DOMAIN_FCC -+ {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,52,56,60,64,100,104,108,112,116,136,140,149,153,157,161,165},31}, // 0x01, RT_CHANNEL_DOMAIN_IC -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140},32}, // 0x02, RT_CHANNEL_DOMAIN_ETSI -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x03, RT_CHANNEL_DOMAIN_SPAIN -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x04, RT_CHANNEL_DOMAIN_FRANCE -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x05, RT_CHANNEL_DOMAIN_MKK -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x06, RT_CHANNEL_DOMAIN_MKK1 -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,36,40,44,48,52,56,60,64},21}, // 0x07, RT_CHANNEL_DOMAIN_ISRAEL -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,14,36,40,44,48,52,56,60,64},22}, // 0x08, RT_CHANNEL_DOMAIN_TELEC -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,14},14}, // 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 -+ {{1,2,3,4,5,6,7,8,9,10,11,56,60,64,100,104,108,112,116,136,140,149,153,157,161,165},26}, // 0x0B, RT_CHANNEL_DOMAIN_TAIWAN -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,149,153,157,161,165},18}, // 0x0C, RT_CHANNEL_DOMAIN_CHINA -+ {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,52,56,60,64,149,153,157,161,165},24}, // 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO -+ {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,149,153,157,161,165},31}, // 0x0E, RT_CHANNEL_DOMAIN_KOREA -+ {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,52,56,60,64},19}, // 0x0F, RT_CHANNEL_DOMAIN_TURKEY -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140},32}, // 0x10, RT_CHANNEL_DOMAIN_JAPAN -+ {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,149,153,157,161,165},20}, // 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,36,40,44,48},17}, // 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,165},37}, // 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G -+ {{1,2,3,4,5,6,7,8,9,10,11,56,60,64,149,153,157,161,165},19}, // 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS -+};*/ -+ -+static RT_CHANNEL_PLAN_2G RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = { -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x00, RT_CHANNEL_DOMAIN_2G_WORLD , Passive scan CH 12, 13 -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, // 0x01, RT_CHANNEL_DOMAIN_2G_ETSI1 -+ {{1,2,3,4,5,6,7,8,9,10,11},11}, // 0x02, RT_CHANNEL_DOMAIN_2G_FCC1 -+ {{1,2,3,4,5,6,7,8,9,10,11,12,13,14},14}, // 0x03, RT_CHANNEL_DOMAIN_2G_MIKK1 -+ {{10,11,12,13},4}, // 0x04, RT_CHANNEL_DOMAIN_2G_ETSI2 -+ {{},0}, // 0x05, RT_CHANNEL_DOMAIN_2G_NULL -+}; -+ -+static RT_CHANNEL_PLAN_5G RTW_ChannelPlan5G[RT_CHANNEL_DOMAIN_5G_MAX] = { -+ {{},0}, // 0x00, RT_CHANNEL_DOMAIN_5G_NULL -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140},19}, // 0x01, RT_CHANNEL_DOMAIN_5G_ETSI1 -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,165},24}, // 0x02, RT_CHANNEL_DOMAIN_5G_ETSI2 -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,149,153,157,161,165},22}, // 0x03, RT_CHANNEL_DOMAIN_5G_ETSI3 -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,165},24}, // 0x04, RT_CHANNEL_DOMAIN_5G_FCC1 -+ {{36,40,44,48,149,153,157,161,165},9}, // 0x05, RT_CHANNEL_DOMAIN_5G_FCC2 -+ {{36,40,44,48,52,56,60,64,149,153,157,161,165},13}, // 0x06, RT_CHANNEL_DOMAIN_5G_FCC3 -+ {{36,40,44,48,52,56,60,64,149,153,157,161},12}, // 0x07, RT_CHANNEL_DOMAIN_5G_FCC4 -+ {{149,153,157,161,165},5}, // 0x08, RT_CHANNEL_DOMAIN_5G_FCC5 -+ {{36,40,44,48,52,56,60,64},8}, // 0x09, RT_CHANNEL_DOMAIN_5G_FCC6 -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,136,140,149,153,157,161,165},20}, // 0x0A, RT_CHANNEL_DOMAIN_5G_FCC7_IC1 -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,149,153,157,161,165},20}, // 0x0B, RT_CHANNEL_DOMAIN_5G_KCC1 -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140},19}, // 0x0C, RT_CHANNEL_DOMAIN_5G_MKK1 -+ {{36,40,44,48,52,56,60,64},8}, // 0x0D, RT_CHANNEL_DOMAIN_5G_MKK2 -+ {{100,104,108,112,116,120,124,128,132,136,140},11}, // 0x0E, RT_CHANNEL_DOMAIN_5G_MKK3 -+ {{56,60,64,100,104,108,112,116,136,140,149,153,157,161,165},15}, // 0x0F, RT_CHANNEL_DOMAIN_5G_NCC1 -+ {{56,60,64,149,153,157,161,165},8}, // 0x10, RT_CHANNEL_DOMAIN_5G_NCC2 -+ -+ //===== Driver self defined for old channel plan Compatible ,Remember to modify if have new channel plan definition ===== -+ {{36,40,44,48,52,56,60,64,100,104,108,112,116,132,136,140,149,153,157,161,165},21}, // 0x11, RT_CHANNEL_DOMAIN_5G_FCC -+ {{36,40,44,48},4}, // 0x12, RT_CHANNEL_DOMAIN_5G_JAPAN_NO_DFS -+ {{36,40,44,48,149,153,157,161},8}, // 0x13, RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS -+}; -+ -+static RT_CHANNEL_PLAN_MAP RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { -+ //===== 0x00 ~ 0x1F , Old Define ===== -+ {0x02,0x11}, //0x00, RT_CHANNEL_DOMAIN_FCC -+ {0x02,0x0A}, //0x01, RT_CHANNEL_DOMAIN_IC -+ {0x01,0x01}, //0x02, RT_CHANNEL_DOMAIN_ETSI -+ {0x01,0x00}, //0x03, RT_CHANNEL_DOMAIN_SPAIN -+ {0x01,0x00}, //0x04, RT_CHANNEL_DOMAIN_FRANCE -+ {0x03,0x00}, //0x05, RT_CHANNEL_DOMAIN_MKK -+ {0x03,0x00}, //0x06, RT_CHANNEL_DOMAIN_MKK1 -+ {0x01,0x09}, //0x07, RT_CHANNEL_DOMAIN_ISRAEL -+ {0x03,0x09}, //0x08, RT_CHANNEL_DOMAIN_TELEC -+ {0x03,0x00}, //0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN -+ {0x00,0x00}, //0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 -+ {0x02,0x0F}, //0x0B, RT_CHANNEL_DOMAIN_TAIWAN -+ {0x01,0x08}, //0x0C, RT_CHANNEL_DOMAIN_CHINA -+ {0x02,0x06}, //0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO -+ {0x02,0x0B}, //0x0E, RT_CHANNEL_DOMAIN_KOREA -+ {0x02,0x09}, //0x0F, RT_CHANNEL_DOMAIN_TURKEY -+ {0x01,0x01}, //0x10, RT_CHANNEL_DOMAIN_JAPAN -+ {0x02,0x05}, //0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS -+ {0x01,0x12}, //0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS -+ {0x00,0x04}, //0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G -+ {0x02,0x10}, //0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS -+ {0x00,0x12}, //0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS -+ {0x00,0x13}, //0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS -+ {0x03,0x12}, //0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS -+ {0x05,0x08}, //0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS -+ {0x02,0x08}, //0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS -+ {0x00,0x00}, //0x1A, -+ {0x00,0x00}, //0x1B, -+ {0x00,0x00}, //0x1C, -+ {0x00,0x00}, //0x1D, -+ {0x00,0x00}, //0x1E, -+ {0x05,0x04}, //0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G -+ //===== 0x20 ~ 0x7F ,New Define ===== -+ {0x00,0x00}, //0x20, RT_CHANNEL_DOMAIN_WORLD_NULL -+ {0x01,0x00}, //0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL -+ {0x02,0x00}, //0x22, RT_CHANNEL_DOMAIN_FCC1_NULL -+ {0x03,0x00}, //0x23, RT_CHANNEL_DOMAIN_MKK1_NULL -+ {0x04,0x00}, //0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL -+ {0x02,0x04}, //0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 -+ {0x00,0x01}, //0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 -+ {0x03,0x0C}, //0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 -+ {0x00,0x0B}, //0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 -+ {0x00,0x05}, //0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 -+ {0x00,0x00}, //0x2A, -+ {0x00,0x00}, //0x2B, -+ {0x00,0x00}, //0x2C, -+ {0x00,0x00}, //0x2D, -+ {0x00,0x00}, //0x2E, -+ {0x00,0x00}, //0x2F, -+ {0x00,0x06}, //0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 -+ {0x00,0x07}, //0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 -+ {0x00,0x08}, //0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 -+ {0x00,0x09}, //0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 -+ {0x02,0x0A}, //0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 -+ {0x00,0x02}, //0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 -+ {0x00,0x03}, //0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 -+ {0x03,0x0D}, //0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 -+ {0x03,0x0E}, //0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 -+ {0x02,0x0F}, //0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 -+ {0x00,0x00}, //0x3A, -+ {0x00,0x00}, //0x3B, -+ {0x00,0x00}, //0x3C, -+ {0x00,0x00}, //0x3D, -+ {0x00,0x00}, //0x3E, -+ {0x00,0x00}, //0x3F, -+ {0x02,0x10}, //0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 -+}; -+ -+static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03,0x02}; //use the conbination for max channel numbers -+ -+/* -+ * Search the @param ch in given @param ch_set -+ * @ch_set: the given channel set -+ * @ch: the given channel number -+ * -+ * return the index of channel_num in channel_set, -1 if not found -+ */ -+int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch) -+{ -+ int i; -+ for(i=0;ch_set[i].ChannelNum!=0;i++){ -+ if(ch == ch_set[i].ChannelNum) -+ break; -+ } -+ -+ if(i >= ch_set[i].ChannelNum) -+ return -1; -+ return i; -+} -+ -+/* -+ * Check the @param ch is fit with setband setting of @param adapter -+ * @adapter: the given adapter -+ * @ch: the given channel number -+ * -+ * return _TRUE when check valid, _FALSE not valid -+ */ -+bool rtw_mlme_band_check(_adapter *adapter, const u32 ch) -+{ -+ if (adapter->setband == GHZ24_50 /* 2.4G and 5G */ -+ || (adapter->setband == GHZ_24 && ch < 35) /* 2.4G only */ -+ || (adapter->setband == GHZ_50 && ch > 35) /* 5G only */ -+ ) { -+ return _TRUE; -+ } -+ return _FALSE; -+} -+ -+/**************************************************************************** -+ -+Following are the initialization functions for WiFi MLME -+ -+*****************************************************************************/ -+ -+int init_hw_mlme_ext(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ //set_opmode_cmd(padapter, infra_client_with_mlme);//removed -+ -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+ return _SUCCESS; -+} -+ -+static void init_mlme_ext_priv_value(_adapter* padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //unsigned char default_channel_set[MAX_CHANNEL_NUM] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0}; -+ unsigned char mixed_datarate[NumRates] = {_1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_,_9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, _48M_RATE_, _54M_RATE_, 0xff}; -+ unsigned char mixed_basicrate[NumRates] ={_1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _12M_RATE_, _24M_RATE_, 0xff,}; -+ -+ ATOMIC_SET(&pmlmeext->event_seq, 0); -+ pmlmeext->mgnt_seq = 0;//reset to zero when disconnect at client mode -+#ifdef CONFIG_IEEE80211W -+ pmlmeext->sa_query_seq = 0; -+ pmlmeext->mgnt_80211w_IPN=0; -+ pmlmeext->mgnt_80211w_IPN_rx=0; -+#endif //CONFIG_IEEE80211W -+ pmlmeext->cur_channel = padapter->registrypriv.channel; -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ pmlmeext->retry = 0; -+ -+ pmlmeext->cur_wireless_mode = padapter->registrypriv.wireless_mode; -+ -+ //_rtw_memcpy(pmlmeext->channel_set, DefaultChannelPlan[padapter->mlmepriv.ChannelPlan].Channel, DefaultChannelPlan[padapter->mlmepriv.ChannelPlan].Len); -+ //_rtw_memcpy(pmlmeext->channel_set, default_channel_set, MAX_CHANNEL_NUM); -+ _rtw_memcpy(pmlmeext->datarate, mixed_datarate, NumRates); -+ _rtw_memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); -+ -+ if(pmlmeext->cur_channel > 14) -+ pmlmeext->tx_rate = IEEE80211_OFDM_RATE_6MB; -+ else -+ pmlmeext->tx_rate = IEEE80211_CCK_RATE_1MB; -+ -+ pmlmeext->sitesurvey_res.state = SCAN_DISABLE; -+ pmlmeext->sitesurvey_res.channel_idx = 0; -+ pmlmeext->sitesurvey_res.bss_cnt = 0; -+ pmlmeext->scan_abort = _FALSE; -+ -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ pmlmeinfo->reauth_count = 0; -+ pmlmeinfo->reassoc_count = 0; -+ pmlmeinfo->link_count = 0; -+ pmlmeinfo->auth_seq = 0; -+ pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; -+ pmlmeinfo->key_index = 0; -+ pmlmeinfo->iv = 0; -+ -+ pmlmeinfo->enc_algo = _NO_PRIVACY_; -+ pmlmeinfo->authModeToggle = 0; -+ -+ _rtw_memset(pmlmeinfo->chg_txt, 0, 128); -+ -+ pmlmeinfo->slotTime = SHORT_SLOT_TIME; -+ pmlmeinfo->preamble_mode = PREAMBLE_AUTO; -+ -+ pmlmeinfo->dialogToken = 0; -+ -+ pmlmeext->action_public_rxseq = 0xffff; -+ pmlmeext->action_public_dialog_token = 0xff; -+} -+ -+static int has_channel(RT_CHANNEL_INFO *channel_set, -+ u8 chanset_size, -+ u8 chan) { -+ int i; -+ -+ for (i = 0; i < chanset_size; i++) { -+ if (channel_set[i].ChannelNum == chan) { -+ return 1; -+ } -+ } -+ -+ return 0; -+} -+ -+static void init_channel_list(_adapter *padapter, RT_CHANNEL_INFO *channel_set, -+ u8 chanset_size, -+ struct p2p_channels *channel_list) { -+ -+ struct p2p_oper_class_map op_class[] = { -+ { IEEE80211G, 81, 1, 13, 1, BW20 }, -+ { IEEE80211G, 82, 14, 14, 1, BW20 }, -+#if 0 /* Do not enable HT40 on 2 GHz */ -+ { IEEE80211G, 83, 1, 9, 1, BW40PLUS }, -+ { IEEE80211G, 84, 5, 13, 1, BW40MINUS }, -+#endif -+ { IEEE80211A, 115, 36, 48, 4, BW20 }, -+ { IEEE80211A, 116, 36, 44, 8, BW40PLUS }, -+ { IEEE80211A, 117, 40, 48, 8, BW40MINUS }, -+ { IEEE80211A, 124, 149, 161, 4, BW20 }, -+ { IEEE80211A, 125, 149, 169, 4, BW20 }, -+ { IEEE80211A, 126, 149, 157, 8, BW40PLUS }, -+ { IEEE80211A, 127, 153, 161, 8, BW40MINUS }, -+ { -1, 0, 0, 0, 0, BW20 } -+ }; -+ -+ int cla, op; -+ -+ cla = 0; -+ -+ for (op = 0; op_class[op].op_class; op++) { -+ u8 ch; -+ struct p2p_oper_class_map *o = &op_class[op]; -+ struct p2p_reg_class *reg = NULL; -+ -+ for (ch = o->min_chan; ch <= o->max_chan; ch += o->inc) { -+ if (!has_channel(channel_set, chanset_size, ch)) { -+ continue; -+ } -+ -+ if ((0 == padapter->registrypriv.ht_enable) && (8 == o->inc)) -+ continue; -+ -+ if ((0 == (padapter->registrypriv.cbw40_enable & BIT(1))) && -+ ((BW40MINUS == o->bw) || (BW40PLUS == o->bw))) -+ continue; -+ -+ if (reg == NULL) { -+ reg = &channel_list->reg_class[cla]; -+ cla++; -+ reg->reg_class = o->op_class; -+ reg->channels = 0; -+ } -+ reg->channel[reg->channels] = ch; -+ reg->channels++; -+ } -+ } -+ channel_list->reg_classes = cla; -+ -+} -+ -+static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *channel_set) -+{ -+ u8 index,chanset_size = 0; -+ u8 b5GBand = _FALSE, b2_4GBand = _FALSE; -+ u8 Index2G = 0, Index5G=0; -+ -+ _rtw_memset(channel_set, 0, sizeof(RT_CHANNEL_INFO)*MAX_CHANNEL_NUM); -+ -+ if(ChannelPlan >= RT_CHANNEL_DOMAIN_MAX && ChannelPlan != RT_CHANNEL_DOMAIN_REALTEK_DEFINE) -+ { -+ DBG_871X("ChannelPlan ID %x error !!!!!\n",ChannelPlan); -+ return chanset_size; -+ } -+ -+ if(padapter->registrypriv.wireless_mode & WIRELESS_11G) -+ { -+ b2_4GBand = _TRUE; -+ if(RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan) -+ Index2G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index2G; -+ else -+ Index2G = RTW_ChannelPlanMap[ChannelPlan].Index2G; -+ } -+ -+ if(padapter->registrypriv.wireless_mode & WIRELESS_11A) -+ { -+ b5GBand = _TRUE; -+ if(RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan) -+ Index5G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index5G; -+ else -+ Index5G = RTW_ChannelPlanMap[ChannelPlan].Index5G; -+ } -+ -+ if(b2_4GBand) -+ { -+ for(index=0;index= 1 && channel_set[chanset_size].ChannelNum <= 11) -+ channel_set[chanset_size].ScanType = SCAN_ACTIVE; -+ else if((channel_set[chanset_size].ChannelNum >= 12 && channel_set[chanset_size].ChannelNum <= 14)) -+ channel_set[chanset_size].ScanType = SCAN_PASSIVE; -+ } -+ else if(RT_CHANNEL_DOMAIN_WORLD_WIDE_13 == ChannelPlan || -+ RT_CHANNEL_DOMAIN_WORLD_WIDE_5G == ChannelPlan || -+ RT_CHANNEL_DOMAIN_2G_WORLD == Index2G)// channel 12~13, passive scan -+ { -+ if(channel_set[chanset_size].ChannelNum <= 11) -+ channel_set[chanset_size].ScanType = SCAN_ACTIVE; -+ else -+ channel_set[chanset_size].ScanType = SCAN_PASSIVE; -+ } -+ else -+ { -+ channel_set[chanset_size].ScanType = SCAN_ACTIVE; -+ } -+ -+ chanset_size++; -+ } -+ } -+ -+ if(b5GBand) -+ { -+ for(index=0;index= 149 ) -+ { -+ if(RT_CHANNEL_DOMAIN_WORLD_WIDE_5G == ChannelPlan)//passive scan for all 5G channels -+ channel_set[chanset_size].ScanType = SCAN_PASSIVE; -+ else -+ channel_set[chanset_size].ScanType = SCAN_ACTIVE; -+ } -+ else -+ { -+ channel_set[chanset_size].ScanType = SCAN_PASSIVE; -+ } -+ chanset_size++; -+#else /* CONFIG_DFS */ -+ if ( RTW_ChannelPlan5G[Index5G].Channel[index] <= 48 -+ || RTW_ChannelPlan5G[Index5G].Channel[index] >= 149 ) { -+ channel_set[chanset_size].ChannelNum = RTW_ChannelPlan5G[Index5G].Channel[index]; -+ if(RT_CHANNEL_DOMAIN_WORLD_WIDE_5G == ChannelPlan)//passive scan for all 5G channels -+ channel_set[chanset_size].ScanType = SCAN_PASSIVE; -+ else -+ channel_set[chanset_size].ScanType = SCAN_ACTIVE; -+ DBG_871X("%s(): channel_set[%d].ChannelNum = %d\n", __FUNCTION__, chanset_size, channel_set[chanset_size].ChannelNum); -+ chanset_size++; -+ } -+#endif /* CONFIG_DFS */ -+ } -+ } -+ -+ return chanset_size; -+} -+ -+int init_mlme_ext_priv(_adapter* padapter) -+{ -+ int res = _SUCCESS; -+ struct registry_priv* pregistrypriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). -+ //_rtw_memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); -+ -+ pmlmeext->padapter = padapter; -+ -+ //fill_fwpriv(padapter, &(pmlmeext->fwpriv)); -+ -+ init_mlme_ext_priv_value(padapter); -+ pmlmeinfo->bAcceptAddbaReq = pregistrypriv->bAcceptAddbaReq; -+ -+ init_mlme_ext_timer(padapter); -+ -+#ifdef CONFIG_AP_MODE -+ init_mlme_ap_info(padapter); -+#endif -+ -+ pmlmeext->max_chan_nums = init_channel_set(padapter, pmlmepriv->ChannelPlan,pmlmeext->channel_set); -+ init_channel_list(padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list); -+ -+ pmlmeext->chan_scan_time = SURVEY_TO; -+ pmlmeext->mlmeext_init = _TRUE; -+ -+ -+#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ pmlmeext->active_keep_alive_check = _TRUE; -+#endif -+ -+ return res; -+ -+} -+ -+void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) -+{ -+ _adapter *padapter = pmlmeext->padapter; -+ -+ if (!padapter) -+ return; -+ -+ if (padapter->bDriverStopped == _TRUE) -+ { -+ _cancel_timer_ex(&pmlmeext->survey_timer); -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ //_cancel_timer_ex(&pmlmeext->ADDBA_timer); -+ } -+} -+ -+static u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len) -+{ // if the channel is same, return 0. else return channel differential -+ uint len; -+ u8 channel; -+ u8 *p; -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _BEACON_IE_OFFSET_, _DSSET_IE_, &len, packet_len - _BEACON_IE_OFFSET_); -+ if (p) -+ { -+ channel = *(p + 2); -+ if(padapter->mlmeextpriv.cur_channel >= channel) -+ { -+ return (padapter->mlmeextpriv.cur_channel - channel); -+ } -+ else -+ { -+ return (channel-padapter->mlmeextpriv.cur_channel); -+ } -+ } -+ else -+ { -+ return 0; -+ } -+} -+ -+static void _mgt_dispatcher(_adapter *padapter, struct mlme_handler *ptable, union recv_frame *precv_frame) -+{ -+ u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ -+ if(ptable->func) -+ { -+ //receive the frames that ra(a1) is my address or ra(a1) is bc address. -+ if (!_rtw_memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) && -+ !_rtw_memcmp(GetAddr1Ptr(pframe), bc_addr, ETH_ALEN)) -+ { -+ return; -+ } -+ -+ ptable->func(padapter, precv_frame); -+ } -+ -+} -+ -+void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ int index; -+ struct mlme_handler *ptable; -+#ifdef CONFIG_AP_MODE -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+#endif //CONFIG_AP_MODE -+ u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe)); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, -+ ("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n", -+ GetFrameType(pframe), GetFrameSubType(pframe))); -+ -+#if 0 -+ { -+ u8 *pbuf; -+ pbuf = GetAddr1Ptr(pframe); -+ DBG_871X("A1-%x:%x:%x:%x:%x:%x\n", *pbuf, *(pbuf+1), *(pbuf+2), *(pbuf+3), *(pbuf+4), *(pbuf+5)); -+ pbuf = GetAddr2Ptr(pframe); -+ DBG_871X("A2-%x:%x:%x:%x:%x:%x\n", *pbuf, *(pbuf+1), *(pbuf+2), *(pbuf+3), *(pbuf+4), *(pbuf+5)); -+ pbuf = GetAddr3Ptr(pframe); -+ DBG_871X("A3-%x:%x:%x:%x:%x:%x\n", *pbuf, *(pbuf+1), *(pbuf+2), *(pbuf+3), *(pbuf+4), *(pbuf+5)); -+ } -+#endif -+ -+ if (GetFrameType(pframe) != WIFI_MGT_TYPE) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher: type(0x%x) error!\n", GetFrameType(pframe))); -+ return; -+ } -+ -+ //receive the frames that ra(a1) is my address or ra(a1) is bc address. -+ if (!_rtw_memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) && -+ !_rtw_memcmp(GetAddr1Ptr(pframe), bc_addr, ETH_ALEN)) -+ { -+ return; -+ } -+ -+ ptable = mlme_sta_tbl; -+ -+ index = GetFrameSubType(pframe) >> 4; -+ -+#ifdef CONFIG_TDLS -+ if((index << 4)==WIFI_ACTION){ -+ //category==RTW_WLAN_CATEGORY_PUBLIC, action==TDLS_DISCOVERY_RESPONSE -+ if(*(pframe + IEEE80211_MGMT_HDR_LEN ) == RTW_WLAN_CATEGORY_PUBLIC -+ && *(pframe + IEEE80211_MGMT_HDR_LEN + 1) == TDLS_DISCOVERY_RESPONSE ) -+ { -+ DBG_871X("recv tdls discovery response frame\n"); -+ On_TDLS_Dis_Rsp(padapter, precv_frame); -+ } -+ } -+#endif //CONFIG_TDLS -+ -+ if (index > 13) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Currently we do not support reserved sub-fr-type=%d\n", index)); -+ return; -+ } -+ ptable += index; -+ -+#if 1 -+ if (psta != NULL) -+ { -+ if (GetRetry(pframe)) -+ { -+ if (precv_frame->u.hdr.attrib.seq_num == psta->RxMgmtFrameSeqNum) -+ { -+ /* drop the duplicate management frame */ -+ DBG_871X("Drop duplicate management frame with seq_num = %d.\n", precv_frame->u.hdr.attrib.seq_num); -+ return; -+ } -+ } -+ psta->RxMgmtFrameSeqNum = precv_frame->u.hdr.attrib.seq_num; -+ } -+#else -+ -+ if(GetRetry(pframe)) -+ { -+ //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("drop due to decache!\n")); -+ //return; -+ } -+#endif -+ -+#ifdef CONFIG_AP_MODE -+ switch (GetFrameSubType(pframe)) -+ { -+ case WIFI_AUTH: -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ ptable->func = &OnAuth; -+ else -+ ptable->func = &OnAuthClient; -+ //pass through -+ case WIFI_ASSOCREQ: -+ case WIFI_REASSOCREQ: -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+#ifdef CONFIG_HOSTAPD_MLME -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ rtw_hostapd_mlme_rx(padapter, precv_frame); -+#endif -+ break; -+ case WIFI_PROBEREQ: -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+#ifdef CONFIG_HOSTAPD_MLME -+ rtw_hostapd_mlme_rx(padapter, precv_frame); -+#else -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+#endif -+ } -+ else -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+ break; -+ case WIFI_BEACON: -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+ break; -+ case WIFI_ACTION: -+ //if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+ break; -+ default: -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ rtw_hostapd_mlme_rx(padapter, precv_frame); -+ break; -+ } -+#else -+ -+ _mgt_dispatcher(padapter, ptable, precv_frame); -+ -+#endif -+ -+} -+ -+#ifdef CONFIG_P2P -+u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da) -+{ -+ bool response = _TRUE; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ { -+ if (wdev_to_priv(padapter->rtw_wdev)->p2p_enabled == _FALSE -+ || padapter->mlmepriv.wps_probe_resp_ie == NULL -+ || padapter->mlmepriv.p2p_probe_resp_ie == NULL -+ ) -+ { -+ DBG_871X("DON'T issue_probersp_p2p: p2p_enabled:%d, wps_probe_resp_ie:%p, p2p_probe_resp_ie:%p\n", -+ wdev_to_priv(padapter->rtw_wdev)->p2p_enabled, -+ padapter->mlmepriv.wps_probe_resp_ie, -+ padapter->mlmepriv.p2p_probe_resp_ie); -+ response = _FALSE; -+ } -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ if( padapter->wdinfo.driver_interface == DRIVER_WEXT ) -+ { -+ // do nothing if the device name is empty -+ if ( !padapter->wdinfo.device_name_len ) -+ { -+ response = _FALSE; -+ } -+ } -+ -+ if (response == _TRUE) -+ issue_probersp_p2p( padapter, da); -+ -+ return _SUCCESS; -+} -+#endif //CONFIG_P2P -+ -+ -+/**************************************************************************** -+ -+Following are the callback functions for each subtype of the management frames -+ -+*****************************************************************************/ -+ -+unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ unsigned int ielen; -+ unsigned char *p; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur = &(pmlmeinfo->network); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint len = precv_frame->u.hdr.len; -+ u8 is_valid_p2p_probereq = _FALSE; -+ -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+ u8 wifi_test_chk_rate = 1; -+ -+ if ( !rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) && -+ !rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE) && -+ !rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) && -+ !rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH) && -+ !rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) -+ ) -+ { -+ // Commented by Albert 2011/03/17 -+ // mcs_rate = 0 -> CCK 1M rate -+ // mcs_rate = 1 -> CCK 2M rate -+ // mcs_rate = 2 -> CCK 5.5M rate -+ // mcs_rate = 3 -> CCK 11M rate -+ // In the P2P mode, the driver should not support the CCK rate -+ -+ // Commented by Kurt 2012/10/16 -+ // IOT issue: Google Nexus7 use 1M rate to send p2p_probe_req after GO nego completed and Nexus7 is client -+#ifdef CONFIG_WIFI_TEST -+ if ( pattrib->mcs_rate <= 3 ) -+ { -+ wifi_test_chk_rate = 0; -+ } -+#endif //CONFIG_WIFI_TEST -+ -+ if( wifi_test_chk_rate == 1 ) -+ { -+ if((is_valid_p2p_probereq = process_probe_req_p2p_ie(pwdinfo, pframe, len)) == _TRUE) -+ { -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE)) -+ { -+ p2p_listen_state_process( padapter, get_sa(pframe)); -+ -+ return _SUCCESS; -+ } -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ goto _continue; -+ } -+ } -+ } -+ } -+ -+_continue: -+#endif //CONFIG_P2P -+ -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE)) -+ { -+ return _SUCCESS; -+ } -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE && -+ check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)==_FALSE) -+ { -+ return _SUCCESS; -+ } -+ -+ -+ //DBG_871X("+OnProbeReq\n"); -+ -+#ifdef CONFIG_AUTO_AP_MODE -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE && -+ pmlmepriv->cur_network.join_res == _TRUE) -+ { -+ _irqL irqL; -+ struct sta_info *psta; -+ u8 *mac_addr, *peer_addr; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 RC_OUI[4]={0x00,0xE0,0x4C,0x0A}; -+ //EID[1] + EID_LEN[1] + RC_OUI[4] + MAC[6] + PairingID[2] + ChannelNum[2] -+ -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, (int *)&ielen, -+ len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); -+ -+ if(!p || ielen !=14) -+ goto _non_rc_device; -+ -+ if(!_rtw_memcmp(p+2, RC_OUI, sizeof(RC_OUI))) -+ goto _non_rc_device; -+ -+ if(!_rtw_memcmp(p+6, get_sa(pframe), ETH_ALEN)) -+ { -+ DBG_871X("%s, do rc pairing ("MAC_FMT"), but mac addr mismatch!("MAC_FMT")\n", __FUNCTION__, -+ MAC_ARG(get_sa(pframe)), MAC_ARG(p+6)); -+ -+ goto _non_rc_device; -+ } -+ -+ DBG_871X("%s, got the pairing device("MAC_FMT")\n", __FUNCTION__, MAC_ARG(get_sa(pframe))); -+ -+ //new a station -+ psta = rtw_get_stainfo(pstapriv, get_sa(pframe)); -+ if (psta == NULL) -+ { -+ // allocate a new one -+ DBG_871X("going to alloc stainfo for rc="MAC_FMT"\n", MAC_ARG(get_sa(pframe))); -+ psta = rtw_alloc_stainfo(pstapriv, get_sa(pframe)); -+ if (psta == NULL) -+ { -+ //TODO: -+ DBG_871X(" Exceed the upper limit of supported clients...\n"); -+ return _SUCCESS; -+ } -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if (rtw_is_list_empty(&psta->asoc_list)) -+ { -+ psta->expire_to = pstapriv->expire_to; -+ rtw_list_insert_tail(&psta->asoc_list, &pstapriv->asoc_list); -+ pstapriv->asoc_list_cnt++; -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ //generate pairing ID -+ mac_addr = myid(&(padapter->eeprompriv)); -+ peer_addr = psta->hwaddr; -+ psta->pid = (u16)(((mac_addr[4]<<8) + mac_addr[5]) + ((peer_addr[4]<<8) + peer_addr[5])); -+ -+ //update peer stainfo -+ psta->isrc = _TRUE; -+ //psta->aid = 0; -+ //psta->mac_id = 2; -+ -+ /* get a unique AID */ -+ if (psta->aid > 0) { -+ DBG_871X("old AID %d\n", psta->aid); -+ } else { -+ for (psta->aid = 1; psta->aid <= NUM_STA; psta->aid++) -+ if (pstapriv->sta_aid[psta->aid - 1] == NULL) -+ break; -+ -+ if (psta->aid > pstapriv->max_num_sta) { -+ psta->aid = 0; -+ DBG_871X("no room for more AIDs\n"); -+ return _SUCCESS; -+ } else { -+ pstapriv->sta_aid[psta->aid - 1] = psta; -+ DBG_871X("allocate new AID = (%d)\n", psta->aid); -+ } -+ } -+ -+ psta->qos_option = 1; -+ psta->htpriv.ht_option = _TRUE; -+ psta->ieee8021x_blocked = _FALSE; -+ psta->htpriv.ampdu_enable = _FALSE; -+ psta->htpriv.sgi = _FALSE; -+ psta->htpriv.bwmode = HT_CHANNEL_WIDTH_20; -+ psta->htpriv.ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ //rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _TRUE); -+ -+ psta->htpriv.agg_enable_bitmap = 0x0;//reset -+ psta->htpriv.candidate_tid_bitmap = 0x0;//reset -+ -+ _rtw_memset((void*)&psta->sta_stats, 0, sizeof(struct stainfo_stats)); -+ -+ _enter_critical_bh(&psta->lock, &irqL); -+ psta->state |= _FW_LINKED; -+ _exit_critical_bh(&psta->lock, &irqL); -+ -+ report_add_sta_event(padapter, psta->hwaddr, psta->aid); -+ -+ } -+ -+ issue_probersp(padapter, get_sa(pframe), _FALSE); -+ -+ return _SUCCESS; -+ -+ } -+ -+_non_rc_device: -+ -+ return _SUCCESS; -+#endif //CONFIG_AUTO_AP_MODE -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(padapter, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)) -+ { -+ //don't process probe req -+ return _SUCCESS; -+ } -+#endif -+ -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen, -+ len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); -+ -+ -+ //check (wildcard) SSID -+ if (p != NULL) -+ { -+ if(is_valid_p2p_probereq == _TRUE) -+ { -+ goto _issue_probersp; -+ } -+ -+ if ( (ielen != 0 && _FALSE ==_rtw_memcmp((void *)(p+2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength)) -+ || (ielen == 0 && pmlmeinfo->hidden_ssid_mode) -+ ) -+ { -+ return _SUCCESS; -+ } -+ -+_issue_probersp: -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE && -+ pmlmepriv->cur_network.join_res == _TRUE) -+ { -+ //DBG_871X("+issue_probersp during ap mode\n"); -+ issue_probersp(padapter, get_sa(pframe), is_valid_p2p_probereq); -+ } -+ -+ } -+ -+ return _SUCCESS; -+ -+} -+ -+unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ struct sta_info *psta; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+#endif -+ -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) -+ { -+ if ( _TRUE == pwdinfo->tx_prov_disc_info.benable ) -+ { -+ if( _rtw_memcmp( pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) -+ { -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT)) -+ { -+ pwdinfo->tx_prov_disc_info.benable = _FALSE; -+ issue_p2p_provision_request( padapter, -+ pwdinfo->tx_prov_disc_info.ssid.Ssid, -+ pwdinfo->tx_prov_disc_info.ssid.SsidLength, -+ pwdinfo->tx_prov_disc_info.peerDevAddr ); -+ } -+ else if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) ) -+ { -+ pwdinfo->tx_prov_disc_info.benable = _FALSE; -+ issue_p2p_provision_request( padapter, -+ NULL, -+ 0, -+ pwdinfo->tx_prov_disc_info.peerDevAddr ); -+ } -+ } -+ } -+ return _SUCCESS; -+ } -+ else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) -+ { -+ if ( _TRUE == pwdinfo->nego_req_info.benable ) -+ { -+ DBG_871X( "[%s] P2P State is GONEGO ING!\n", __FUNCTION__ ); -+ if( _rtw_memcmp( pwdinfo->nego_req_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) -+ { -+ pwdinfo->nego_req_info.benable = _FALSE; -+ issue_p2p_GO_request( padapter, pwdinfo->nego_req_info.peerDevAddr); -+ } -+ } -+ } -+ else if( rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) ) -+ { -+ if ( _TRUE == pwdinfo->invitereq_info.benable ) -+ { -+ DBG_871X( "[%s] P2P_STATE_TX_INVITE_REQ!\n", __FUNCTION__ ); -+ if( _rtw_memcmp( pwdinfo->invitereq_info.peer_macaddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) -+ { -+ pwdinfo->invitereq_info.benable = _FALSE; -+ issue_p2p_invitation_request( padapter, pwdinfo->invitereq_info.peer_macaddr ); -+ } -+ } -+ } -+#endif -+ -+ -+ if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) -+ { -+ report_survey_event(padapter, precv_frame); -+#ifdef CONFIG_CONCURRENT_MODE -+ report_survey_event(padapter->pbuddy_adapter, precv_frame); -+#endif -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_report_survey_event(padapter, precv_frame); -+#endif -+ return _SUCCESS; -+ } -+ -+ #if 0 //move to validate_recv_mgnt_frame -+ if (_rtw_memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) -+ { -+ if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) -+ { -+ if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL) -+ { -+ psta->sta_stats.rx_mgnt_pkts++; -+ } -+ } -+ } -+ #endif -+ -+ return _SUCCESS; -+ -+} -+ -+unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ int cam_idx; -+ struct sta_info *psta; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint len = precv_frame->u.hdr.len; -+ u8 *p = NULL; -+ u32 ielen = 0; -+ -+#ifdef CONFIG_ATTEMPT_TO_FIX_AP_BEACON_ERROR -+ p = rtw_get_ie(pframe + sizeof(struct rtw_ieee80211_hdr_3addr) + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ielen, precv_frame->u.hdr.len -sizeof(struct rtw_ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_); -+ if ((p != NULL) && (ielen > 0)) -+ { -+ if ((*(p + 1 + ielen) == 0x2D) && (*(p + 2 + ielen) != 0x2D)) -+ { -+ /* Invalid value 0x2D is detected in Extended Supported Rates (ESR) IE. Try to fix the IE length to avoid failed Beacon parsing. */ -+ DBG_871X("[WIFIDBG] Error in ESR IE is detected in Beacon of BSSID:"MAC_FMT". Fix the length of ESR IE to avoid failed Beacon parsing.\n", MAC_ARG(GetAddr3Ptr(pframe))); -+ *(p + 1) = ielen - 1; -+ } -+ } -+#endif -+ -+ if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) -+ { -+ report_survey_event(padapter, precv_frame); -+#ifdef CONFIG_CONCURRENT_MODE -+ report_survey_event(padapter->pbuddy_adapter, precv_frame); -+#endif -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_report_survey_event(padapter, precv_frame); -+#endif -+ -+ return _SUCCESS; -+ } -+ -+ if (_rtw_memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) -+ { -+ if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) -+ { -+ //check the vendor of the assoc AP -+ pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pframe+sizeof(struct rtw_ieee80211_hdr_3addr), len-sizeof(struct rtw_ieee80211_hdr_3addr)); -+#ifdef CONFIG_P2P_PS -+ // do P2P PS Before link ? , ToDo -+ //process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN)); -+#endif // CONFIG_P2P_PS -+ -+ //update TSF Value -+ update_TSF(pmlmeext, pframe, len); -+ -+ //start auth -+ start_clnt_auth(padapter); -+ -+ return _SUCCESS; -+ } -+ -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) -+ { -+ if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL) -+ { -+ #ifdef CONFIG_PATCH_JOIN_WRONG_CHANNEL -+ //Merge from 8712 FW code -+ if (cmp_pkt_chnl_diff(padapter,pframe,len) != 0) -+ { // join wrong channel, deauth and reconnect -+ issue_deauth(padapter, (&(pmlmeinfo->network))->MacAddress, WLAN_REASON_DEAUTH_LEAVING); -+ -+ report_del_sta_event(padapter,(&(pmlmeinfo->network))->MacAddress, WLAN_REASON_JOIN_WRONG_CHANNEL); -+ pmlmeinfo->state &= (~WIFI_FW_ASSOC_SUCCESS); -+ return _SUCCESS; -+ } -+ #endif //CONFIG_PATCH_JOIN_WRONG_CHANNEL -+ -+ //update WMM, ERP in the beacon -+ //todo: the timer is used instead of the number of the beacon received -+ if ((sta_rx_pkts(psta) & 0xf) == 0) -+ { -+ //DBG_871X("update_bcn_info\n"); -+ update_beacon_info(padapter, pframe, len, psta); -+ } -+ -+#ifdef CONFIG_DFS -+ process_csa_ie(padapter, pframe, len); //channel switch announcement -+#endif //CONFIG_DFS -+ -+#ifdef CONFIG_P2P_PS -+ //if(psta->ieee8021x_blocked == _FALSE) // do not allow P2P PS during EAPOL handshake ? -+ process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN)); -+#endif //CONFIG_P2P_PS -+ -+ #if 0 //move to validate_recv_mgnt_frame -+ psta->sta_stats.rx_mgnt_pkts++; -+ #endif -+ } -+ } -+ else if((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) -+ { -+ if ((psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe))) != NULL) -+ { -+ //update WMM, ERP in the beacon -+ //todo: the timer is used instead of the number of the beacon received -+ if ((sta_rx_pkts(psta) & 0xf) == 0) -+ { -+ //DBG_871X("update_bcn_info\n"); -+ update_beacon_info(padapter, pframe, len, psta); -+ } -+ -+ #if 0 //move to validate_recv_mgnt_frame -+ psta->sta_stats.rx_mgnt_pkts++; -+ #endif -+ } -+ else -+ { -+ //allocate a new CAM entry for IBSS station -+ if ((cam_idx = allocate_fw_sta_entry(padapter)) == NUM_STA) -+ { -+ goto _END_ONBEACON_; -+ } -+ -+ //get supported rate -+ if (update_sta_support_rate(padapter, (pframe + WLAN_HDR_A3_LEN + _BEACON_IE_OFFSET_), (len - WLAN_HDR_A3_LEN - _BEACON_IE_OFFSET_), cam_idx) == _FAIL) -+ { -+ pmlmeinfo->FW_sta_info[cam_idx].status = 0; -+ goto _END_ONBEACON_; -+ } -+ -+ //update TSF Value -+ update_TSF(pmlmeext, pframe, len); -+ -+ //report sta add event -+ report_add_sta_event(padapter, GetAddr2Ptr(pframe), cam_idx); -+ } -+ } -+ } -+ -+_END_ONBEACON_: -+ -+ return _SUCCESS; -+ -+} -+ -+unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_AP_MODE -+ _irqL irqL; -+ unsigned int auth_mode, seq, ie_len; -+ unsigned char *sa, *p; -+ u16 algorithm; -+ int status; -+ static struct sta_info stat; -+ struct sta_info *pstat=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint len = precv_frame->u.hdr.len; -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(padapter, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)) -+ { -+ //don't process auth request; -+ return _SUCCESS; -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) -+ return _FAIL; -+ -+ DBG_871X("+OnAuth\n"); -+ -+ sa = GetAddr2Ptr(pframe); -+ -+ auth_mode = psecuritypriv->dot11AuthAlgrthm; -+ seq = cpu_to_le16(*(u16*)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + 2)); -+ algorithm = cpu_to_le16(*(u16*)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN)); -+ -+ if (GetPrivacy(pframe)) -+ { -+#if 0 //TODO: SW rtw_wep_decrypt -+ if (SWCRYPTO) -+ { -+ status = rtw_wep_decrypt(priv, pframe, pfrinfo->pktlen, -+ priv->pmib->dot1180211AuthEntry.dot11PrivacyAlgrthm); -+ if (status == FALSE) -+ { -+ SAVE_INT_AND_CLI(flags); -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"wep-decrypt a Auth frame error!\n"); -+ status = _STATS_CHALLENGE_FAIL_; -+ goto auth_fail; -+ } -+ } -+ -+ seq = cpu_to_le16(*(unsigned short *)((unsigned int)pframe + WLAN_HDR_A3_LEN + 4 + 2)); -+ algorithm = cpu_to_le16(*(unsigned short *)((unsigned int)pframe + WLAN_HDR_A3_LEN + 4)); -+#endif -+ } -+ -+ -+ DBG_871X("auth alg=%x, seq=%X\n", algorithm, seq); -+ -+ if (auth_mode == 2 && -+ psecuritypriv->dot11PrivacyAlgrthm != _WEP40_ && -+ psecuritypriv->dot11PrivacyAlgrthm != _WEP104_) -+ auth_mode = 0; -+ -+ if ((algorithm > 0 && auth_mode == 0) || // rx a shared-key auth but shared not enabled -+ (algorithm == 0 && auth_mode == 1) ) // rx a open-system auth but shared-key is enabled -+ { -+ DBG_871X("auth rejected due to bad alg [alg=%d, auth_mib=%d] %02X%02X%02X%02X%02X%02X\n", -+ algorithm, auth_mode, sa[0], sa[1], sa[2], sa[3], sa[4], sa[5]); -+ -+ status = _STATS_NO_SUPP_ALG_; -+ -+ goto auth_fail; -+ } -+ -+#if 0 //ACL control -+ phead = &priv->wlan_acl_list; -+ plist = phead->next; -+ //check sa -+ if (acl_mode == 1) // 1: positive check, only those on acl_list can be connected. -+ res = FAIL; -+ else -+ res = SUCCESS; -+ -+ while(plist != phead) -+ { -+ paclnode = list_entry(plist, struct rtw_wlan_acl_node, list); -+ plist = plist->next; -+ if (!memcmp((void *)sa, paclnode->addr, 6)) { -+ if (paclnode->mode & 2) { // deny -+ res = FAIL; -+ break; -+ } -+ else { -+ res = SUCCESS; -+ break; -+ } -+ } -+ } -+ -+ if (res != SUCCESS) { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"auth abort because ACL!\n"); -+ return FAIL; -+ } -+#else -+ if(rtw_access_ctrl(padapter, sa) == _FALSE) -+ { -+ status = _STATS_UNABLE_HANDLE_STA_; -+ goto auth_fail; -+ } -+#endif -+ -+ pstat = rtw_get_stainfo(pstapriv, sa); -+ if (pstat == NULL) -+ { -+ // allocate a new one -+ DBG_871X("going to alloc stainfo for sa="MAC_FMT"\n", MAC_ARG(sa)); -+ pstat = rtw_alloc_stainfo(pstapriv, sa); -+ if (pstat == NULL) -+ { -+ DBG_871X(" Exceed the upper limit of supported clients...\n"); -+ status = _STATS_UNABLE_HANDLE_STA_; -+ goto auth_fail; -+ } -+ -+ pstat->state = WIFI_FW_AUTH_NULL; -+ pstat->auth_seq = 0; -+ -+ //pstat->flags = 0; -+ //pstat->capability = 0; -+ } -+ else -+ { -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if(rtw_is_list_empty(&pstat->asoc_list)==_FALSE) -+ { -+ rtw_list_delete(&pstat->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ if (pstat->expire_to > 0) -+ { -+ //TODO: STA re_auth within expire_to -+ } -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ if (seq==1) { -+ //TODO: STA re_auth and auth timeout -+ } -+ } -+ -+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ if (rtw_is_list_empty(&pstat->auth_list)) -+ { -+ rtw_list_insert_tail(&pstat->auth_list, &pstapriv->auth_list); -+ pstapriv->auth_list_cnt++; -+ } -+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ -+ if (pstat->auth_seq == 0) -+ pstat->expire_to = pstapriv->auth_to; -+ -+ if ((pstat->auth_seq + 1) != seq) -+ { -+ DBG_871X("(1)auth rejected because out of seq [rx_seq=%d, exp_seq=%d]!\n", -+ seq, pstat->auth_seq+1); -+ status = _STATS_OUT_OF_AUTH_SEQ_; -+ goto auth_fail; -+ } -+ -+ if (algorithm==0 && (auth_mode == 0 || auth_mode == 2)) -+ { -+ if (seq == 1) -+ { -+ pstat->state &= ~WIFI_FW_AUTH_NULL; -+ pstat->state |= WIFI_FW_AUTH_SUCCESS; -+ pstat->expire_to = pstapriv->assoc_to; -+ pstat->authalg = algorithm; -+ } -+ else -+ { -+ DBG_871X("(2)auth rejected because out of seq [rx_seq=%d, exp_seq=%d]!\n", -+ seq, pstat->auth_seq+1); -+ status = _STATS_OUT_OF_AUTH_SEQ_; -+ goto auth_fail; -+ } -+ } -+ else // shared system or auto authentication -+ { -+ if (seq == 1) -+ { -+ //prepare for the challenging txt... -+ -+ //get_random_bytes((void *)pstat->chg_txt, 128);//TODO: -+ -+ pstat->state &= ~WIFI_FW_AUTH_NULL; -+ pstat->state |= WIFI_FW_AUTH_STATE; -+ pstat->authalg = algorithm; -+ pstat->auth_seq = 2; -+ } -+ else if (seq == 3) -+ { -+ //checking for challenging txt... -+ DBG_871X("checking for challenging txt...\n"); -+ -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_ , _CHLGETXT_IE_, (int *)&ie_len, -+ len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4); -+ -+ if((p==NULL) || (ie_len<=0)) -+ { -+ DBG_871X("auth rejected because challenge failure!(1)\n"); -+ status = _STATS_CHALLENGE_FAIL_; -+ goto auth_fail; -+ } -+ -+ if (_rtw_memcmp((void *)(p + 2), pstat->chg_txt, 128)) -+ { -+ pstat->state &= (~WIFI_FW_AUTH_STATE); -+ pstat->state |= WIFI_FW_AUTH_SUCCESS; -+ // challenging txt is correct... -+ pstat->expire_to = pstapriv->assoc_to; -+ } -+ else -+ { -+ DBG_871X("auth rejected because challenge failure!\n"); -+ status = _STATS_CHALLENGE_FAIL_; -+ goto auth_fail; -+ } -+ } -+ else -+ { -+ DBG_871X("(3)auth rejected because out of seq [rx_seq=%d, exp_seq=%d]!\n", -+ seq, pstat->auth_seq+1); -+ status = _STATS_OUT_OF_AUTH_SEQ_; -+ goto auth_fail; -+ } -+ } -+ -+ -+ // Now, we are going to issue_auth... -+ pstat->auth_seq = seq + 1; -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ issue_auth(padapter, pstat, (unsigned short)(_STATS_SUCCESSFUL_)); -+#endif -+ -+ if (pstat->state & WIFI_FW_AUTH_SUCCESS) -+ pstat->auth_seq = 0; -+ -+ -+ return _SUCCESS; -+ -+auth_fail: -+ -+ if(pstat) -+ rtw_free_stainfo(padapter , pstat); -+ -+ pstat = &stat; -+ _rtw_memset((char *)pstat, '\0', sizeof(stat)); -+ pstat->auth_seq = 2; -+ _rtw_memcpy(pstat->hwaddr, sa, 6); -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ issue_auth(padapter, pstat, (unsigned short)status); -+#endif -+ -+#endif -+ return _FAIL; -+ -+} -+ -+unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ unsigned int seq, len, status, algthm, offset; -+ unsigned char *p; -+ unsigned int go2asoc = 0; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint pkt_len = precv_frame->u.hdr.len; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ //check A1 matches or not -+ if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), get_da(pframe), ETH_ALEN)) -+ return _SUCCESS; -+ -+ if (!(pmlmeinfo->state & WIFI_FW_AUTH_STATE)) -+ return _SUCCESS; -+ -+ offset = (GetPrivacy(pframe))? 4: 0; -+ -+ algthm = le16_to_cpu(*(unsigned short *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset)); -+ seq = le16_to_cpu(*(unsigned short *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 2)); -+ status = le16_to_cpu(*(unsigned short *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 4)); -+ -+ if (status != 0) -+ { -+ DBG_871X("clnt auth fail, status: %d\n", status); -+ if(status == 13)//&& pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) -+ { -+ if(pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) -+ pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open; -+ else -+ pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared; -+ //pmlmeinfo->reauth_count = 0; -+ } -+ -+ set_link_timer(pmlmeext, 1); -+ goto authclnt_fail; -+ } -+ -+ if (seq == 2) -+ { -+ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) -+ { -+ // legendary shared system -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&len, -+ pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_); -+ -+ if (p == NULL) -+ { -+ //DBG_871X("marc: no challenge text?\n"); -+ goto authclnt_fail; -+ } -+ -+ _rtw_memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len); -+ pmlmeinfo->auth_seq = 3; -+ issue_auth(padapter, NULL, 0); -+ set_link_timer(pmlmeext, REAUTH_TO); -+ -+ return _SUCCESS; -+ } -+ else -+ { -+ // open system -+ go2asoc = 1; -+ } -+ } -+ else if (seq == 4) -+ { -+ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) -+ { -+ go2asoc = 1; -+ } -+ else -+ { -+ goto authclnt_fail; -+ } -+ } -+ else -+ { -+ // this is also illegal -+ //DBG_871X("marc: clnt auth failed due to illegal seq=%x\n", seq); -+ goto authclnt_fail; -+ } -+ -+ if (go2asoc) -+ { -+ start_clnt_assoc(padapter); -+ return _SUCCESS; -+ } -+ -+authclnt_fail: -+ -+ //pmlmeinfo->state &= ~(WIFI_FW_AUTH_STATE); -+ -+ return _FAIL; -+ -+} -+ -+unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_AP_MODE -+ _irqL irqL; -+ u16 capab_info, listen_interval; -+ struct rtw_ieee802_11_elems elems; -+ struct sta_info *pstat; -+ unsigned char reassoc, *p, *pos, *wpa_ie; -+ unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01}; -+ int i, ie_len, wpa_ie_len, left; -+ unsigned char supportRate[16]; -+ int supportRateNum; -+ unsigned short status = _STATS_SUCCESSFUL_; -+ unsigned short frame_type, ie_offset=0; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur = &(pmlmeinfo->network); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint pkt_len = precv_frame->u.hdr.len; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ u8 p2p_status_code = P2P_STATUS_SUCCESS; -+ u8 *p2pie; -+ u32 p2pielen = 0; -+#ifdef CONFIG_WFD -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ u32 wfd_ielen = 0; -+#endif // CONFIG_WFD -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(padapter, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)) -+ { -+ //don't process assoc request; -+ return _SUCCESS; -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) -+ return _FAIL; -+ -+ frame_type = GetFrameSubType(pframe); -+ if (frame_type == WIFI_ASSOCREQ) -+ { -+ reassoc = 0; -+ ie_offset = _ASOCREQ_IE_OFFSET_; -+ } -+ else // WIFI_REASSOCREQ -+ { -+ reassoc = 1; -+ ie_offset = _REASOCREQ_IE_OFFSET_; -+ } -+ -+ -+ if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset) { -+ DBG_871X("handle_assoc(reassoc=%d) - too short payload (len=%lu)" -+ "\n", reassoc, (unsigned long)pkt_len); -+ return _FAIL; -+ } -+ -+ pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); -+ if (pstat == (struct sta_info *)NULL) -+ { -+ status = _RSON_CLS2_; -+ goto asoc_class2_error; -+ } -+ -+ capab_info = RTW_GET_LE16(pframe + WLAN_HDR_A3_LEN); -+ //capab_info = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN)); -+ //listen_interval = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN+2)); -+ listen_interval = RTW_GET_LE16(pframe + WLAN_HDR_A3_LEN+2); -+ -+ left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset); -+ pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset); -+ -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ // check if this stat has been successfully authenticated/assocated -+ if (!((pstat->state) & WIFI_FW_AUTH_SUCCESS)) -+ { -+ if (!((pstat->state) & WIFI_FW_ASSOC_SUCCESS)) -+ { -+ status = _RSON_CLS2_; -+ goto asoc_class2_error; -+ } -+ else -+ { -+ pstat->state &= (~WIFI_FW_ASSOC_SUCCESS); -+ pstat->state |= WIFI_FW_ASSOC_STATE; -+ } -+ } -+ else -+ { -+ pstat->state &= (~WIFI_FW_AUTH_SUCCESS); -+ pstat->state |= WIFI_FW_ASSOC_STATE; -+ } -+ -+ -+#if 0// todo:tkip_countermeasures -+ if (hapd->tkip_countermeasures) { -+ resp = WLAN_REASON_MICHAEL_MIC_FAILURE; -+ goto fail; -+ } -+#endif -+ -+ pstat->capability = capab_info; -+ -+#if 0//todo: -+ //check listen_interval -+ if (listen_interval > hapd->conf->max_listen_interval) { -+ hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211, -+ HOSTAPD_LEVEL_DEBUG, -+ "Too large Listen Interval (%d)", -+ listen_interval); -+ resp = WLAN_STATUS_ASSOC_DENIED_LISTEN_INT_TOO_LARGE; -+ goto fail; -+ } -+ -+ pstat->listen_interval = listen_interval; -+#endif -+ -+ //now parse all ieee802_11 ie to point to elems -+ if (rtw_ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed || -+ !elems.ssid) { -+ DBG_871X("STA " MAC_FMT " sent invalid association request\n", -+ MAC_ARG(pstat->hwaddr)); -+ status = _STATS_FAILURE_; -+ goto OnAssocReqFail; -+ } -+ -+ -+ // now we should check all the fields... -+ // checking SSID -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len, -+ pkt_len - WLAN_HDR_A3_LEN - ie_offset); -+ if (p == NULL) -+ { -+ status = _STATS_FAILURE_; -+ } -+ -+ if (ie_len == 0) // broadcast ssid, however it is not allowed in assocreq -+ status = _STATS_FAILURE_; -+ else -+ { -+ // check if ssid match -+ if (!_rtw_memcmp((void *)(p+2), cur->Ssid.Ssid, cur->Ssid.SsidLength)) -+ status = _STATS_FAILURE_; -+ -+ if (ie_len != cur->Ssid.SsidLength) -+ status = _STATS_FAILURE_; -+ } -+ -+ if(_STATS_SUCCESSFUL_ != status) -+ goto OnAssocReqFail; -+ -+ // check if the supported rate is ok -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SUPPORTEDRATES_IE_, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset); -+ if (p == NULL) { -+ DBG_871X("Rx a sta assoc-req which supported rate is empty!\n"); -+ // use our own rate set as statoin used -+ //_rtw_memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); -+ //supportRateNum = AP_BSSRATE_LEN; -+ -+ status = _STATS_FAILURE_; -+ goto OnAssocReqFail; -+ } -+ else { -+ _rtw_memcpy(supportRate, p+2, ie_len); -+ supportRateNum = ie_len; -+ -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_ , &ie_len, -+ pkt_len - WLAN_HDR_A3_LEN - ie_offset); -+ if (p != NULL) { -+ -+ if(supportRateNum<=sizeof(supportRate)) -+ { -+ _rtw_memcpy(supportRate+supportRateNum, p+2, ie_len); -+ supportRateNum += ie_len; -+ } -+ } -+ } -+ -+ //todo: mask supportRate between AP & STA -> move to update raid -+ //get_matched_rate(pmlmeext, supportRate, &supportRateNum, 0); -+ -+ //update station supportRate -+ pstat->bssratelen = supportRateNum; -+ _rtw_memcpy(pstat->bssrateset, supportRate, supportRateNum); -+ -+ -+ //check RSN/WPA/WPS -+ pstat->dot8021xalg = 0; -+ pstat->wpa_psk = 0; -+ pstat->wpa_group_cipher = 0; -+ pstat->wpa2_group_cipher = 0; -+ pstat->wpa_pairwise_cipher = 0; -+ pstat->wpa2_pairwise_cipher = 0; -+ _rtw_memset(pstat->wpa_ie, 0, sizeof(pstat->wpa_ie)); -+ if((psecuritypriv->wpa_psk & BIT(1)) && elems.rsn_ie) { -+ -+ int group_cipher=0, pairwise_cipher=0; -+ -+ wpa_ie = elems.rsn_ie; -+ wpa_ie_len = elems.rsn_ie_len; -+ -+ if(rtw_parse_wpa2_ie(wpa_ie-2, wpa_ie_len+2, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ pstat->dot8021xalg = 1;//psk, todo:802.1x -+ pstat->wpa_psk |= BIT(1); -+ -+ pstat->wpa2_group_cipher = group_cipher&psecuritypriv->wpa2_group_cipher; -+ pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher; -+ -+ if(!pstat->wpa2_group_cipher) -+ status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID; -+ -+ if(!pstat->wpa2_pairwise_cipher) -+ status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID; -+ } -+ else -+ { -+ status = WLAN_STATUS_INVALID_IE; -+ } -+ -+ } else if ((psecuritypriv->wpa_psk & BIT(0)) && elems.wpa_ie) { -+ -+ int group_cipher=0, pairwise_cipher=0; -+ -+ wpa_ie = elems.wpa_ie; -+ wpa_ie_len = elems.wpa_ie_len; -+ -+ if(rtw_parse_wpa_ie(wpa_ie-2, wpa_ie_len+2, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ pstat->dot8021xalg = 1;//psk, todo:802.1x -+ pstat->wpa_psk |= BIT(0); -+ -+ pstat->wpa_group_cipher = group_cipher&psecuritypriv->wpa_group_cipher; -+ pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher; -+ -+ if(!pstat->wpa_group_cipher) -+ status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID; -+ -+ if(!pstat->wpa_pairwise_cipher) -+ status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID; -+ -+ } -+ else -+ { -+ status = WLAN_STATUS_INVALID_IE; -+ } -+ -+ } else { -+ wpa_ie = NULL; -+ wpa_ie_len = 0; -+ } -+ -+ if(_STATS_SUCCESSFUL_ != status) -+ goto OnAssocReqFail; -+ -+ pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS); -+ //if (hapd->conf->wps_state && wpa_ie == NULL) { //todo: to check ap if supporting WPS -+ if(wpa_ie == NULL) { -+ if (elems.wps_ie) { -+ DBG_871X("STA included WPS IE in " -+ "(Re)Association Request - assume WPS is " -+ "used\n"); -+ pstat->flags |= WLAN_STA_WPS; -+ //wpabuf_free(sta->wps_ie); -+ //sta->wps_ie = wpabuf_alloc_copy(elems.wps_ie + 4, -+ // elems.wps_ie_len - 4); -+ } else { -+ DBG_871X("STA did not include WPA/RSN IE " -+ "in (Re)Association Request - possible WPS " -+ "use\n"); -+ pstat->flags |= WLAN_STA_MAYBE_WPS; -+ } -+ -+ -+ // AP support WPA/RSN, and sta is going to do WPS, but AP is not ready -+ // that the selected registrar of AP is _FLASE -+ if((psecuritypriv->wpa_psk >0) -+ && (pstat->flags & (WLAN_STA_WPS|WLAN_STA_MAYBE_WPS))) -+ { -+ if(pmlmepriv->wps_beacon_ie) -+ { -+ u8 selected_registrar = 0; -+ -+ rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR , &selected_registrar, NULL); -+ -+ if(!selected_registrar) -+ { -+ DBG_871X("selected_registrar is _FALSE , or AP is not ready to do WPS\n"); -+ -+ status = _STATS_UNABLE_HANDLE_STA_; -+ -+ goto OnAssocReqFail; -+ } -+ } -+ } -+ -+ } -+ else -+ { -+ int copy_len; -+ -+ if(psecuritypriv->wpa_psk == 0) -+ { -+ DBG_871X("STA " MAC_FMT ": WPA/RSN IE in association " -+ "request, but AP don't support WPA/RSN\n", MAC_ARG(pstat->hwaddr)); -+ -+ status = WLAN_STATUS_INVALID_IE; -+ -+ goto OnAssocReqFail; -+ -+ } -+ -+ if (elems.wps_ie) { -+ DBG_871X("STA included WPS IE in " -+ "(Re)Association Request - WPS is " -+ "used\n"); -+ pstat->flags |= WLAN_STA_WPS; -+ copy_len=0; -+ } -+ else -+ { -+ copy_len = ((wpa_ie_len+2) > sizeof(pstat->wpa_ie)) ? (sizeof(pstat->wpa_ie)):(wpa_ie_len+2); -+ } -+ -+ -+ if(copy_len>0) -+ _rtw_memcpy(pstat->wpa_ie, wpa_ie-2, copy_len); -+ -+ } -+ -+ -+ // check if there is WMM IE & support WWM-PS -+ pstat->flags &= ~WLAN_STA_WME; -+ pstat->qos_option = 0; -+ pstat->qos_info = 0; -+ pstat->has_legacy_ac = _TRUE; -+ pstat->uapsd_vo = 0; -+ pstat->uapsd_vi = 0; -+ pstat->uapsd_be = 0; -+ pstat->uapsd_bk = 0; -+ if (pmlmepriv->qospriv.qos_option) -+ { -+ p = pframe + WLAN_HDR_A3_LEN + ie_offset; ie_len = 0; -+ for (;;) -+ { -+ p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset); -+ if (p != NULL) { -+ if (_rtw_memcmp(p+2, WMM_IE, 6)) { -+ -+ pstat->flags |= WLAN_STA_WME; -+ -+ pstat->qos_option = 1; -+ pstat->qos_info = *(p+8); -+ -+ pstat->max_sp_len = (pstat->qos_info>>5)&0x3; -+ -+ if((pstat->qos_info&0xf) !=0xf) -+ pstat->has_legacy_ac = _TRUE; -+ else -+ pstat->has_legacy_ac = _FALSE; -+ -+ if(pstat->qos_info&0xf) -+ { -+ if(pstat->qos_info&BIT(0)) -+ pstat->uapsd_vo = BIT(0)|BIT(1); -+ else -+ pstat->uapsd_vo = 0; -+ -+ if(pstat->qos_info&BIT(1)) -+ pstat->uapsd_vi = BIT(0)|BIT(1); -+ else -+ pstat->uapsd_vi = 0; -+ -+ if(pstat->qos_info&BIT(2)) -+ pstat->uapsd_bk = BIT(0)|BIT(1); -+ else -+ pstat->uapsd_bk = 0; -+ -+ if(pstat->qos_info&BIT(3)) -+ pstat->uapsd_be = BIT(0)|BIT(1); -+ else -+ pstat->uapsd_be = 0; -+ -+ } -+ -+ break; -+ } -+ } -+ else { -+ break; -+ } -+ p = p + ie_len + 2; -+ } -+ } -+ -+ -+#ifdef CONFIG_80211N_HT -+ /* save HT capabilities in the sta object */ -+ _rtw_memset(&pstat->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap)); -+ if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct rtw_ieee80211_ht_cap)) -+ { -+ pstat->flags |= WLAN_STA_HT; -+ -+ pstat->flags |= WLAN_STA_WME; -+ -+ _rtw_memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct rtw_ieee80211_ht_cap)); -+ -+ } else -+ pstat->flags &= ~WLAN_STA_HT; -+ -+ -+ if((pmlmepriv->htpriv.ht_option == _FALSE) && (pstat->flags&WLAN_STA_HT)) -+ { -+ status = _STATS_FAILURE_; -+ goto OnAssocReqFail; -+ } -+ -+ -+ if ((pstat->flags & WLAN_STA_HT) && -+ ((pstat->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) || -+ (pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP))) -+ { -+ DBG_871X("HT: " MAC_FMT " tried to " -+ "use TKIP with HT association\n", MAC_ARG(pstat->hwaddr)); -+ -+ //status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY; -+ //goto OnAssocReqFail; -+ } -+#endif /* CONFIG_80211N_HT */ -+ -+ // -+ //if (hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G)//? -+ pstat->flags |= WLAN_STA_NONERP; -+ for (i = 0; i < pstat->bssratelen; i++) { -+ if ((pstat->bssrateset[i] & 0x7f) > 22) { -+ pstat->flags &= ~WLAN_STA_NONERP; -+ break; -+ } -+ } -+ -+ if (pstat->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) -+ pstat->flags |= WLAN_STA_SHORT_PREAMBLE; -+ else -+ pstat->flags &= ~WLAN_STA_SHORT_PREAMBLE; -+ -+ -+ -+ if (status != _STATS_SUCCESSFUL_) -+ goto OnAssocReqFail; -+ -+#ifdef CONFIG_P2P -+ pstat->is_p2p_device = _FALSE; -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ if( (p2pie=rtw_get_p2p_ie(pframe + WLAN_HDR_A3_LEN + ie_offset , pkt_len - WLAN_HDR_A3_LEN - ie_offset , NULL, &p2pielen))) -+ { -+ pstat->is_p2p_device = _TRUE; -+ if((p2p_status_code=(u8)process_assoc_req_p2p_ie(pwdinfo, pframe, pkt_len, pstat))>0) -+ { -+ pstat->p2p_status_code = p2p_status_code; -+ status = _STATS_CAP_FAIL_; -+ goto OnAssocReqFail; -+ } -+ } -+#ifdef CONFIG_WFD -+ if(rtw_get_wfd_ie(pframe + WLAN_HDR_A3_LEN + ie_offset , pkt_len - WLAN_HDR_A3_LEN - ie_offset , wfd_ie, &wfd_ielen )) -+ { -+ u8 attr_content[ 10 ] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ -+ DBG_8192C( "[%s] WFD IE Found!!\n", __FUNCTION__ ); -+ rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); -+ DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); -+ } -+ } -+#endif -+ } -+ pstat->p2p_status_code = p2p_status_code; -+#endif //CONFIG_P2P -+ -+ //TODO: identify_proprietary_vendor_ie(); -+ // Realtek proprietary IE -+ // identify if this is Broadcom sta -+ // identify if this is ralink sta -+ // Customer proprietary IE -+ -+ -+ -+ /* get a unique AID */ -+ if (pstat->aid > 0) { -+ DBG_871X(" old AID %d\n", pstat->aid); -+ } else { -+ for (pstat->aid = 1; pstat->aid <= NUM_STA; pstat->aid++) -+ if (pstapriv->sta_aid[pstat->aid - 1] == NULL) -+ break; -+ -+ //if (pstat->aid > NUM_STA) { -+ if (pstat->aid > pstapriv->max_num_sta) { -+ -+ pstat->aid = 0; -+ -+ DBG_871X(" no room for more AIDs\n"); -+ -+ status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA; -+ -+ goto OnAssocReqFail; -+ -+ -+ } else { -+ pstapriv->sta_aid[pstat->aid - 1] = pstat; -+ DBG_871X("allocate new AID = (%d)\n", pstat->aid); -+ } -+ } -+ -+ -+ pstat->state &= (~WIFI_FW_ASSOC_STATE); -+ pstat->state |= WIFI_FW_ASSOC_SUCCESS; -+ -+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ if (!rtw_is_list_empty(&pstat->auth_list)) -+ { -+ rtw_list_delete(&pstat->auth_list); -+ pstapriv->auth_list_cnt--; -+ } -+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL); -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if (rtw_is_list_empty(&pstat->asoc_list)) -+ { -+ pstat->expire_to = pstapriv->expire_to; -+ rtw_list_insert_tail(&pstat->asoc_list, &pstapriv->asoc_list); -+ pstapriv->asoc_list_cnt++; -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ // now the station is qualified to join our BSS... -+ if(pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (_STATS_SUCCESSFUL_==status)) -+ { -+#ifdef CONFIG_NATIVEAP_MLME -+ //.1 bss_cap_update & sta_info_update -+ bss_cap_update_on_sta_join(padapter, pstat); -+ sta_info_update(padapter, pstat); -+ -+ //issue assoc rsp before notify station join event. -+ if (frame_type == WIFI_ASSOCREQ) -+ issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP); -+ else -+ issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP); -+ -+ //.2 - report to upper layer -+ DBG_871X("indicate_sta_join_event to upper layer - hostapd\n"); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ #ifdef COMPAT_KERNEL_RELEASE -+ rtw_cfg80211_indicate_sta_assoc(padapter, pframe, pkt_len); -+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ rtw_cfg80211_indicate_sta_assoc(padapter, pframe, pkt_len); -+ #else //(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ _enter_critical_bh(&pstat->lock, &irqL); -+ if(pstat->passoc_req) -+ { -+ rtw_mfree(pstat->passoc_req, pstat->assoc_req_len); -+ pstat->passoc_req = NULL; -+ pstat->assoc_req_len = 0; -+ } -+ -+ pstat->passoc_req = rtw_zmalloc(pkt_len); -+ if(pstat->passoc_req) -+ { -+ _rtw_memcpy(pstat->passoc_req, pframe, pkt_len); -+ pstat->assoc_req_len = pkt_len; -+ } -+ _exit_critical_bh(&pstat->lock, &irqL); -+ #endif //(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+#else -+ rtw_indicate_sta_assoc_event(padapter, pstat); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ //.3-(1) report sta add event -+ report_add_sta_event(padapter, pstat->hwaddr, pstat->aid); -+ -+/* -+ //issue assoc rsp before notify station join event. -+ if (frame_type == WIFI_ASSOCREQ) -+ issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP); -+ else -+ issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP); -+*/ -+ -+#endif -+ } -+ -+ return _SUCCESS; -+ -+asoc_class2_error: -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ issue_deauth(padapter, (void *)GetAddr2Ptr(pframe), status); -+#endif -+ -+ return _FAIL; -+ -+OnAssocReqFail: -+ -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ pstat->aid = 0; -+ if (frame_type == WIFI_ASSOCREQ) -+ issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP); -+ else -+ issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP); -+#endif -+ -+ -+#endif /* CONFIG_AP_MODE */ -+ -+ return _FAIL; -+ -+} -+ -+unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ uint i; -+ int res; -+ unsigned short status; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint pkt_len = precv_frame->u.hdr.len; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ //check A1 matches or not -+ if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), get_da(pframe), ETH_ALEN)) -+ return _SUCCESS; -+ -+ if (!(pmlmeinfo->state & (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE))) -+ return _SUCCESS; -+ -+ if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) -+ return _SUCCESS; -+ -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ //status -+ if ((status = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN + 2))) > 0) -+ { -+ DBG_871X("assoc reject, status code: %d\n", status); -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ res = -4; -+ goto report_assoc_result; -+ } -+ -+ //get capabilities -+ pmlmeinfo->capability = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN)); -+ -+ //set slot time -+ pmlmeinfo->slotTime = (pmlmeinfo->capability & BIT(10))? 9: 20; -+ -+ //AID -+ res = pmlmeinfo->aid = (int)(le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN + 4))&0x3fff); -+ -+ //following are moved to join event callback function -+ //to handle HT, WMM, rate adaptive, update MAC reg -+ //for not to handle the synchronous IO in the tasklet -+ for (i = (6 + WLAN_HDR_A3_LEN); i < pkt_len;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + i); -+ -+ switch (pIE->ElementID) -+ { -+ case _VENDOR_SPECIFIC_IE_: -+ if (_rtw_memcmp(pIE->data, WMM_PARA_OUI, 6)) //WMM -+ { -+ WMM_param_handler(padapter, pIE); -+ } -+#if defined(CONFIG_P2P) && defined(CONFIG_WFD) -+ else if ( _rtw_memcmp(pIE->data, WFD_OUI, 4)) //WFD -+ { -+ DBG_871X( "[%s] Found WFD IE\n", __FUNCTION__ ); -+ WFD_info_handler( padapter, pIE ); -+ } -+#endif -+ break; -+ -+ case _HT_CAPABILITY_IE_: //HT caps -+ HT_caps_handler(padapter, pIE); -+ break; -+ -+ case _HT_EXTRA_INFO_IE_: //HT info -+ HT_info_handler(padapter, pIE); -+ break; -+ -+ case _ERPINFO_IE_: -+ ERP_IE_handler(padapter, pIE); -+ -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+ -+ pmlmeinfo->state &= (~WIFI_FW_ASSOC_STATE); -+ pmlmeinfo->state |= WIFI_FW_ASSOC_SUCCESS; -+ -+ //Update Basic Rate Table for spec, 2010-12-28 , by thomas -+ UpdateBrateTbl(padapter, pmlmeinfo->network.SupportedRates); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if (!rtw_cfg80211_check_bss(padapter)) { -+ DBG_871X("rtw_cfg80211_check_bss() : BSS not found !!\n"); -+ res = -2; -+ goto report_assoc_result; -+ } -+#endif -+ -+report_assoc_result: -+ if (res > 0) { -+ rtw_buf_update(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len, pframe, pkt_len); -+ } else { -+ rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len); -+ } -+ -+ report_join_res(padapter, res); -+ return _SUCCESS; -+} -+ -+unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ unsigned short reason; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ -+ //check A3 -+ if (!(_rtw_memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN))) -+ return _SUCCESS; -+ -+#ifdef CONFIG_P2P -+ if ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) -+ { -+ _cancel_timer_ex( &pwdinfo->reset_ch_sitesurvey ); -+ _set_timer( &pwdinfo->reset_ch_sitesurvey, 10 ); -+ } -+#endif //CONFIG_P2P -+ -+ reason = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN)); -+ -+ DBG_871X("%s Reason code(%d)\n", __FUNCTION__,reason); -+ -+#ifdef CONFIG_AP_MODE -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ _irqL irqL; -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ //_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ //rtw_free_stainfo(padapter, psta); -+ //_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ DBG_871X("%s, STA:" MAC_FMT "\n", __FUNCTION__, MAC_ARG(GetAddr2Ptr(pframe))); -+ -+ psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); -+ if(psta) -+ { -+ u8 updated = _FALSE; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) -+ { -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ updated = ap_free_sta(padapter, psta, _FALSE, reason); -+ -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ associated_clients_update(padapter, updated); -+ } -+ -+ -+ return _SUCCESS; -+ } -+ else -+#endif -+ { -+ int ignore_received_deauth = 0; -+ -+ // Commented by Albert 20130604 -+ // Before sending the auth frame to start the STA/GC mode connection with AP/GO, -+ // we will send the deauth first. -+ // However, the Win8.1 with BRCM Wi-Fi will send the deauth with reason code 6 to us after receieving our deauth. -+ // Added the following code to avoid this case. -+ if ( ( pmlmeinfo->state & WIFI_FW_AUTH_STATE ) || -+ ( pmlmeinfo->state & WIFI_FW_ASSOC_STATE ) ) -+ { -+ if ( reason == WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA ) -+ { -+ ignore_received_deauth = 1; -+ } else if (WLAN_REASON_PREV_AUTH_NOT_VALID == reason) { -+ // TODO: 802.11r -+ ignore_received_deauth = 1; -+ } -+ } -+ -+ DBG_871X("%s, STA:" MAC_FMT ", ignore = %d\n", __FUNCTION__, MAC_ARG(GetAddr3Ptr(pframe)), ignore_received_deauth); -+ if ( 0 == ignore_received_deauth ) -+ { -+ receive_disconnect(padapter, GetAddr3Ptr(pframe) ,reason); -+ } -+ } -+ pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; -+ return _SUCCESS; -+ -+} -+ -+unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ unsigned short reason; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ -+ //check A3 -+ if (!(_rtw_memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN))) -+ return _SUCCESS; -+ -+#ifdef CONFIG_P2P -+ if ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) -+ { -+ _cancel_timer_ex( &pwdinfo->reset_ch_sitesurvey ); -+ _set_timer( &pwdinfo->reset_ch_sitesurvey, 10 ); -+ } -+#endif //CONFIG_P2P -+ -+ reason = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN)); -+ -+ DBG_871X("%s Reason code(%d)\n", __FUNCTION__,reason); -+ -+#ifdef CONFIG_AP_MODE -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ _irqL irqL; -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ //_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ //rtw_free_stainfo(padapter, psta); -+ //_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ DBG_871X("%s, STA:" MAC_FMT "\n", __FUNCTION__, MAC_ARG(GetAddr2Ptr(pframe))); -+ -+ psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); -+ if(psta) -+ { -+ u8 updated = _FALSE; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) -+ { -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ updated = ap_free_sta(padapter, psta, _FALSE, reason); -+ -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ associated_clients_update(padapter, updated); -+ } -+ -+ return _SUCCESS; -+ } -+ else -+#endif -+ { -+ DBG_871X("%s, STA:" MAC_FMT "\n", __FUNCTION__, MAC_ARG(GetAddr3Ptr(pframe))); -+ -+ receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); -+ } -+ pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; -+ return _SUCCESS; -+ -+} -+ -+unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ return _SUCCESS; -+} -+ -+unsigned int on_action_spct_ch_switch(_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len) -+{ -+ unsigned int ret = _FAIL; -+ struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(mlmeext->mlmext_info); -+ -+ if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) { -+ ret = _SUCCESS; -+ goto exit; -+ } -+ -+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) { -+ -+ int ch_switch_mode = -1, ch = -1, ch_switch_cnt = -1; -+ int ch_offset = -1; -+ u8 bwmode; -+ struct ieee80211_info_element *ie; -+ -+ DBG_871X(FUNC_NDEV_FMT" from "MAC_FMT"\n", -+ FUNC_NDEV_ARG(padapter->pnetdev), MAC_ARG(psta->hwaddr)); -+ -+ for_each_ie(ie, ies, ies_len) { -+ if (ie->id == WLAN_EID_CHANNEL_SWITCH) { -+ ch_switch_mode = ie->data[0]; -+ ch = ie->data[1]; -+ ch_switch_cnt = ie->data[2]; -+ DBG_871X("ch_switch_mode:%d, ch:%d, ch_switch_cnt:%d\n", -+ ch_switch_mode, ch, ch_switch_cnt); -+ } -+ else if (ie->id == WLAN_EID_SECONDARY_CHANNEL_OFFSET) { -+ ch_offset = secondary_ch_offset_to_hal_ch_offset(ie->data[0]); -+ DBG_871X("ch_offset:%d\n", ch_offset); -+ } -+ } -+ -+ if (ch == -1) -+ return _SUCCESS; -+ -+ if (ch_offset == -1) -+ bwmode = mlmeext->cur_bwmode; -+ else -+ bwmode = (ch_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE) ? -+ HT_CHANNEL_WIDTH_20 : HT_CHANNEL_WIDTH_40; -+ -+ ch_offset = (ch_offset == -1) ? mlmeext->cur_ch_offset : ch_offset; -+ -+ /* todo: -+ * 1. the decision of channel switching -+ * 2. things after channel switching -+ */ -+ -+ ret = rtw_set_ch_cmd(padapter, ch, bwmode, ch_offset, _TRUE); -+ } -+ -+exit: -+ return ret; -+} -+ -+unsigned int on_action_spct(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ unsigned int ret = _FAIL; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint frame_len = precv_frame->u.hdr.len; -+ u8 *frame_body = (u8 *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ u8 category; -+ u8 action; -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev)); -+ -+ psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); -+ -+ if (!psta) -+ goto exit; -+ -+ category = frame_body[0]; -+ if(category != RTW_WLAN_CATEGORY_SPECTRUM_MGMT) -+ goto exit; -+ -+ action = frame_body[1]; -+ switch (action) { -+ case RTW_WLAN_ACTION_SPCT_MSR_REQ: -+ case RTW_WLAN_ACTION_SPCT_MSR_RPRT: -+ case RTW_WLAN_ACTION_SPCT_TPC_REQ: -+ case RTW_WLAN_ACTION_SPCT_TPC_RPRT: -+ break; -+ case RTW_WLAN_ACTION_SPCT_CHL_SWITCH: -+ #ifdef CONFIG_SPCT_CH_SWITCH -+ ret = on_action_spct_ch_switch(padapter, psta, &frame_body[2], -+ frame_len-(frame_body-pframe)-2); -+ #endif -+ break; -+ default: -+ break; -+ } -+ -+exit: -+ return ret; -+} -+ -+unsigned int OnAction_qos(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ return _SUCCESS; -+} -+ -+unsigned int OnAction_dls(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ return _SUCCESS; -+} -+ -+unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ u8 *addr; -+ struct sta_info *psta=NULL; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ unsigned char *frame_body; -+ unsigned char category, action; -+ unsigned short tid, status, reason_code = 0; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ //check RA matches or not -+ if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe), ETH_ALEN))//for if1, sta/ap mode -+ return _SUCCESS; -+ -+/* -+ //check A1 matches or not -+ if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), get_da(pframe), ETH_ALEN)) -+ return _SUCCESS; -+*/ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) -+ if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) -+ return _SUCCESS; -+ -+ addr = GetAddr2Ptr(pframe); -+ psta = rtw_get_stainfo(pstapriv, addr); -+ -+ if(psta==NULL) -+ return _SUCCESS; -+ -+ frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ category = frame_body[0]; -+ if (category == RTW_WLAN_CATEGORY_BACK)// representing Block Ack -+ { -+#ifdef CONFIG_TDLS -+ if((psta->tdls_sta_state & TDLS_LINKED_STATE) && -+ (psta->htpriv.ht_option==_TRUE) && -+ (psta->htpriv.ampdu_enable==_TRUE) ) -+ { -+ //do nothing; just don't want to return _SUCCESS; -+ } -+ else -+#endif //CONFIG_TDLS -+ if (!pmlmeinfo->HT_enable) -+ { -+ return _SUCCESS; -+ } -+ -+ action = frame_body[1]; -+ DBG_871X("%s, action=%d\n", __FUNCTION__, action); -+ switch (action) -+ { -+ case RTW_WLAN_ACTION_ADDBA_REQ: //ADDBA request -+ -+ _rtw_memcpy(&(pmlmeinfo->ADDBA_req), &(frame_body[2]), sizeof(struct ADDBA_request)); -+ //process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); -+ process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), addr); -+ -+ if(pmlmeinfo->bAcceptAddbaReq == _TRUE) -+ { -+ issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 0); -+ } -+ else -+ { -+ issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 37);//reject ADDBA Req -+ } -+ -+ break; -+ -+ case RTW_WLAN_ACTION_ADDBA_RESP: //ADDBA response -+ -+ //status = frame_body[3] | (frame_body[4] << 8); //endian issue -+ status = RTW_GET_LE16(&frame_body[3]); -+ tid = ((frame_body[5] >> 2) & 0x7); -+ -+ if (status == 0) -+ { //successful -+ DBG_871X("agg_enable for TID=%d\n", tid); -+ psta->htpriv.agg_enable_bitmap |= 1 << tid; -+ psta->htpriv.candidate_tid_bitmap &= ~BIT(tid); -+ } -+ else -+ { -+ psta->htpriv.agg_enable_bitmap &= ~BIT(tid); -+ } -+ -+ //DBG_871X("marc: ADDBA RSP: %x\n", pmlmeinfo->agg_enable_bitmap); -+ break; -+ -+ case RTW_WLAN_ACTION_DELBA: //DELBA -+ if ((frame_body[3] & BIT(3)) == 0) -+ { -+ psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); -+ psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); -+ -+ //reason_code = frame_body[4] | (frame_body[5] << 8); -+ reason_code = RTW_GET_LE16(&frame_body[4]); -+ } -+ else if((frame_body[3] & BIT(3)) == BIT(3)) -+ { -+ tid = (frame_body[3] >> 4) & 0x0F; -+ -+ preorder_ctrl = &psta->recvreorder_ctrl[tid]; -+ preorder_ctrl->enable = _FALSE; -+ preorder_ctrl->indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq); -+ #endif -+ } -+ -+ DBG_871X("%s(): DELBA: %x(%x)\n", __FUNCTION__,pmlmeinfo->agg_enable_bitmap, reason_code); -+ //todo: how to notify the host while receiving DELETE BA -+ break; -+ -+ default: -+ break; -+ } -+ } -+ -+ return _SUCCESS; -+} -+ -+#ifdef CONFIG_P2P -+ -+static int get_reg_classes_full_count(struct p2p_channels channel_list) { -+ int cnt = 0; -+ int i; -+ -+ for (i = 0; i < channel_list.reg_classes; i++) { -+ cnt += channel_list.reg_class[i].channels; -+ } -+ -+ return cnt; -+} -+ -+static void get_channel_cnt_24g_5gl_5gh( struct mlme_ext_priv *pmlmeext, u8* p24g_cnt, u8* p5gl_cnt, u8* p5gh_cnt ) -+{ -+ int i = 0; -+ -+ *p24g_cnt = 0; -+ *p5gl_cnt = 0; -+ *p5gh_cnt = 0; -+ -+ for( i = 0; i < pmlmeext->max_chan_nums; i++ ) -+ { -+ if ( pmlmeext->channel_set[ i ].ChannelNum <= 14 ) -+ { -+ (*p24g_cnt)++; -+ } -+ else if ( ( pmlmeext->channel_set[ i ].ChannelNum > 14 ) && ( pmlmeext->channel_set[ i ].ChannelNum <= 48 ) ) -+ { -+ // Just include the channel 36, 40, 44, 48 channels for 5G low -+ (*p5gl_cnt)++; -+ } -+ else if ( ( pmlmeext->channel_set[ i ].ChannelNum >= 149 ) && ( pmlmeext->channel_set[ i ].ChannelNum <= 161 ) ) -+ { -+ // Just include the channel 149, 153, 157, 161 channels for 5G high -+ (*p5gh_cnt)++; -+ } -+ } -+} -+ -+void issue_p2p_GO_request(_adapter *padapter, u8* raddr) -+{ -+ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_GO_NEGO_REQ; -+ u8 wpsie[ 255 ] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; -+ u8 wpsielen = 0, p2pielen = 0, i; -+ u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; -+ u16 len_channellist_attr = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo); -+ -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ DBG_871X( "[%s] In\n", __FUNCTION__ ); -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pwdinfo->negotiation_dialog_token = 1; // Initialize the dialog value -+ pframe = rtw_set_fixed_ie(pframe, 1, &pwdinfo->negotiation_dialog_token, &(pattrib->pktlen)); -+ -+ -+ -+ // WPS Section -+ wpsielen = 0; -+ // WPS OUI -+ *(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+ -+ // Device Password ID -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_DEVICE_PWID ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ -+ if ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_PEER_DISPLAY_PIN ) -+ { -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_USER_SPEC ); -+ } -+ else if ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_SELF_DISPLAY_PIN ) -+ { -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_REGISTRAR_SPEC ); -+ } -+ else if ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_PBC ) -+ { -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_PBC ); -+ } -+ -+ wpsielen += 2; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+ -+ // P2P IE Section. -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20110306 -+ // According to the P2P Specification, the group negoitation request frame should contain 9 P2P attributes -+ // 1. P2P Capability -+ // 2. Group Owner Intent -+ // 3. Configuration Timeout -+ // 4. Listen Channel -+ // 5. Extended Listen Timing -+ // 6. Intended P2P Interface Address -+ // 7. Channel List -+ // 8. P2P Device Info -+ // 9. Operating Channel -+ -+ -+ // P2P Capability -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ { -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_CROSS_CONN | P2P_GRPCAP_PERSISTENT_GROUP; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_CROSS_CONN; -+ } -+ -+ -+ // Group Owner Intent -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GO_INTENT; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0001 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Todo the tie breaker bit. -+ p2pie[ p2pielen++ ] = ( ( pwdinfo->intent << 1 ) | BIT(0) ); -+ -+ // Configuration Timeout -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CONF_TIMEOUT; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P GO -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P Client -+ -+ -+ // Listen Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_LISTEN_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; // Copy from SD7 -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->listen_channel; // listening channel number -+ -+ -+ // Extended Listen Timing ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_EX_LISTEN_TIMING; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0004 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Availability Period -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ p2pielen += 2; -+ -+ // Availability Interval -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ p2pielen += 2; -+ -+ -+ // Intended P2P Interface Address -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_INTENTED_IF_ADDR; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ -+ // Channel List -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CH_LIST; -+ -+ // Length: -+ // Country String(3) -+ // + ( Operating Class (1) + Number of Channels(1) ) * Operation Classes (?) -+ // + number of channels in all classes -+ len_channellist_attr = 3 -+ + (1 + 1) * (u16)(pmlmeext->channel_list.reg_classes) -+ + get_reg_classes_full_count(pmlmeext->channel_list); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 5 + 1 ); -+ } -+ else -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ } -+#else -+ -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ -+#endif -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Channel Entry List -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ // Operating Class -+ if ( pbuddy_mlmeext->cur_channel > 14 ) -+ { -+ if ( pbuddy_mlmeext->cur_channel >= 149 ) -+ { -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ -+ // Number of Channels -+ // Just support 1 channel and this channel is AP's channel -+ p2pie[ p2pielen++ ] = 1; -+ -+ // Channel List -+ p2pie[ p2pielen++ ] = pbuddy_mlmeext->cur_channel; -+ } -+ else -+ { -+ int i,j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#else // CONFIG_CONCURRENT_MODE -+ { -+ int i,j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ // Device Info -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Config Method -+ // This field should be big endian. Noted by P2P specification. -+ -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->supported_wps_cm ); -+ -+ p2pielen += 2; -+ -+ // Primary Device Type -+ // Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ p2pielen += 2; -+ -+ // OUI -+ *(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ p2pielen += 2; -+ -+ // Number of Secondary Device Types -+ p2pie[ p2pielen++ ] = 0x00; // No Secondary Device Type List -+ -+ // Device Name -+ // Type: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ p2pielen += 2; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name , pwdinfo->device_name_len ); -+ p2pielen += pwdinfo->device_name_len; -+ -+ -+ // Operating Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_OPERATING_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ if ( pwdinfo->operating_channel <= 14 ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ else if ( ( pwdinfo->operating_channel >= 36 ) && ( pwdinfo->operating_channel <= 48 ) ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ else -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->operating_channel; // operating channel number -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_nego_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+ -+void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result) -+{ -+ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_GO_NEGO_RESP; -+ u8 wpsie[ 255 ] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; -+ u8 p2pielen = 0, i; -+ uint wpsielen = 0; -+ u16 wps_devicepassword_id = 0x0000; -+ uint wps_devicepassword_id_len = 0; -+ u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh; -+ u16 len_channellist_attr = 0; -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo); -+ -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ DBG_871X( "[%s] In, result = %d\n", __FUNCTION__, result ); -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pwdinfo->negotiation_dialog_token = frame_body[7]; // The Dialog Token of provisioning discovery request frame. -+ pframe = rtw_set_fixed_ie(pframe, 1, &(pwdinfo->negotiation_dialog_token), &(pattrib->pktlen)); -+ -+ // Commented by Albert 20110328 -+ // Try to get the device password ID from the WPS IE of group negotiation request frame -+ // WiFi Direct test plan 5.1.15 -+ rtw_get_wps_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, wpsie, &wpsielen); -+ rtw_get_wps_attr_content( wpsie, wpsielen, WPS_ATTR_DEVICE_PWID, (u8*) &wps_devicepassword_id, &wps_devicepassword_id_len); -+ wps_devicepassword_id = be16_to_cpu( wps_devicepassword_id ); -+ -+ _rtw_memset( wpsie, 0x00, 255 ); -+ wpsielen = 0; -+ -+ // WPS Section -+ wpsielen = 0; -+ // WPS OUI -+ *(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+ -+ // Device Password ID -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_DEVICE_PWID ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ if ( wps_devicepassword_id == WPS_DPID_USER_SPEC ) -+ { -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_REGISTRAR_SPEC ); -+ } -+ else if ( wps_devicepassword_id == WPS_DPID_REGISTRAR_SPEC ) -+ { -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_USER_SPEC ); -+ } -+ else -+ { -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_PBC ); -+ } -+ wpsielen += 2; -+ -+ // Commented by Kurt 20120113 -+ // If some device wants to do p2p handshake without sending prov_disc_req -+ // We have to get peer_req_cm from here. -+ if(_rtw_memcmp( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "000", 3) ) -+ { -+ if ( wps_devicepassword_id == WPS_DPID_USER_SPEC ) -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 ); -+ } -+ else if ( wps_devicepassword_id == WPS_DPID_REGISTRAR_SPEC ) -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 ); -+ } -+ else -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 ); -+ } -+ } -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+ -+ // P2P IE Section. -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20100908 -+ // According to the P2P Specification, the group negoitation response frame should contain 9 P2P attributes -+ // 1. Status -+ // 2. P2P Capability -+ // 3. Group Owner Intent -+ // 4. Configuration Timeout -+ // 5. Operating Channel -+ // 6. Intended P2P Interface Address -+ // 7. Channel List -+ // 8. Device Info -+ // 9. Group ID ( Only GO ) -+ -+ -+ // ToDo: -+ -+ // P2P Status -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_STATUS; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0001 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = result; -+ -+ // P2P Capability -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ -+ if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) ) -+ { -+ // Commented by Albert 2011/03/08 -+ // According to the P2P specification -+ // if the sending device will be client, the P2P Capability should be reserved of group negotation response frame -+ p2pie[ p2pielen++ ] = 0; -+ } -+ else -+ { -+ // Be group owner or meet the error case -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ } -+ -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ { -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_CROSS_CONN | P2P_GRPCAP_PERSISTENT_GROUP; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_CROSS_CONN; -+ } -+ -+ // Group Owner Intent -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GO_INTENT; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0001 ); -+ p2pielen += 2; -+ -+ // Value: -+ if ( pwdinfo->peer_intent & 0x01 ) -+ { -+ // Peer's tie breaker bit is 1, our tie breaker bit should be 0 -+ p2pie[ p2pielen++ ] = ( pwdinfo->intent << 1 ); -+ } -+ else -+ { -+ // Peer's tie breaker bit is 0, our tie breaker bit should be 1 -+ p2pie[ p2pielen++ ] = ( ( pwdinfo->intent << 1 ) | BIT(0) ); -+ } -+ -+ -+ // Configuration Timeout -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CONF_TIMEOUT; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P GO -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P Client -+ -+ // Operating Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_OPERATING_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ if ( pwdinfo->operating_channel <= 14 ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ else if ( ( pwdinfo->operating_channel >= 36 ) && ( pwdinfo->operating_channel <= 48 ) ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ else -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->operating_channel; // operating channel number -+ -+ // Intended P2P Interface Address -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_INTENTED_IF_ADDR; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Channel List -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CH_LIST; -+ -+ // Country String(3) -+ // + ( Operating Class (1) + Number of Channels(1) ) * Operation Classes (?) -+ // + number of channels in all classes -+ len_channellist_attr = 3 -+ + (1 + 1) * (u16)pmlmeext->channel_list.reg_classes -+ + get_reg_classes_full_count(pmlmeext->channel_list); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 5 + 1 ); -+ } -+ else -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ } -+#else -+ -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ -+ #endif -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Channel Entry List -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ // Operating Class -+ if ( pbuddy_mlmeext->cur_channel > 14 ) -+ { -+ if ( pbuddy_mlmeext->cur_channel >= 149 ) -+ { -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ -+ // Number of Channels -+ // Just support 1 channel and this channel is AP's channel -+ p2pie[ p2pielen++ ] = 1; -+ -+ // Channel List -+ p2pie[ p2pielen++ ] = pbuddy_mlmeext->cur_channel; -+ } -+ else -+ { -+ int i, j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#else // CONFIG_CONCURRENT_MODE -+ { -+ int i, j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ // Device Info -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Config Method -+ // This field should be big endian. Noted by P2P specification. -+ -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->supported_wps_cm ); -+ -+ p2pielen += 2; -+ -+ // Primary Device Type -+ // Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ p2pielen += 2; -+ -+ // OUI -+ *(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ p2pielen += 2; -+ -+ // Number of Secondary Device Types -+ p2pie[ p2pielen++ ] = 0x00; // No Secondary Device Type List -+ -+ // Device Name -+ // Type: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ p2pielen += 2; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name , pwdinfo->device_name_len ); -+ p2pielen += pwdinfo->device_name_len; -+ -+ if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) ) -+ { -+ // Group ID Attribute -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GROUP_ID; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN + pwdinfo->nego_ssidlen ); -+ p2pielen += 2; -+ -+ // Value: -+ // p2P Device Address -+ _rtw_memcpy( p2pie + p2pielen , pwdinfo->device_addr, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // SSID -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); -+ p2pielen += pwdinfo->nego_ssidlen; -+ -+ } -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_nego_resp_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) -+{ -+ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_GO_NEGO_CONF; -+ u8 wpsie[ 255 ] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; -+ u8 wpsielen = 0, p2pielen = 0; -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo); -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ DBG_871X( "[%s] In\n", __FUNCTION__ ); -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(pwdinfo->negotiation_dialog_token), &(pattrib->pktlen)); -+ -+ -+ -+ // P2P IE Section. -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20110306 -+ // According to the P2P Specification, the group negoitation request frame should contain 5 P2P attributes -+ // 1. Status -+ // 2. P2P Capability -+ // 3. Operating Channel -+ // 4. Channel List -+ // 5. Group ID ( if this WiFi is GO ) -+ -+ // P2P Status -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_STATUS; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0001 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = result; -+ -+ // P2P Capability -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ { -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_CROSS_CONN | P2P_GRPCAP_PERSISTENT_GROUP; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_CROSS_CONN; -+ } -+ -+ -+ // Operating Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_OPERATING_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ -+ if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) ) -+ { -+ if ( pwdinfo->peer_operating_ch <= 14 ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ else if ( ( pwdinfo->peer_operating_ch >= 36 ) && ( pwdinfo->peer_operating_ch <= 48 ) ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ else -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ -+ p2pie[ p2pielen++ ] = pwdinfo->peer_operating_ch; -+ } -+ else -+ { -+ if ( pwdinfo->operating_channel <= 14 ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ else if ( ( pwdinfo->operating_channel >= 36 ) && ( pwdinfo->operating_channel <= 48 ) ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ else -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->operating_channel; // Use the listen channel as the operating channel -+ } -+ -+ -+ // Channel List -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CH_LIST; -+ -+ *(u16*) ( p2pie + p2pielen ) = 6; -+ p2pielen += 2; -+ -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Value: -+ if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) ) -+ { -+ if ( pwdinfo->peer_operating_ch <= 14 ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ else if ( ( pwdinfo->peer_operating_ch >= 36 ) && ( pwdinfo->peer_operating_ch <= 48 ) ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ else -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ p2pie[ p2pielen++ ] = 1; -+ p2pie[ p2pielen++ ] = pwdinfo->peer_operating_ch; -+ } -+ else -+ { -+ if ( pwdinfo->operating_channel <= 14 ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ else if ( ( pwdinfo->operating_channel >= 36 ) && ( pwdinfo->operating_channel <= 48 ) ) -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ else -+ { -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = 1; -+ p2pie[ p2pielen++ ] = pwdinfo->operating_channel; // Use the listen channel as the operating channel -+ } -+ -+ if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) ) -+ { -+ // Group ID Attribute -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GROUP_ID; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN + pwdinfo->nego_ssidlen ); -+ p2pielen += 2; -+ -+ // Value: -+ // p2P Device Address -+ _rtw_memcpy( p2pie + p2pielen , pwdinfo->device_addr, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // SSID -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); -+ p2pielen += pwdinfo->nego_ssidlen; -+ } -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_nego_confirm_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) -+{ -+ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_INVIT_REQ; -+ u8 p2pie[ 255 ] = { 0x00 }; -+ u8 p2pielen = 0, i; -+ u8 dialogToken = 3; -+ u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; -+ u16 len_channellist_attr = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo); -+ -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, raddr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ // P2P IE Section. -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20101011 -+ // According to the P2P Specification, the P2P Invitation request frame should contain 7 P2P attributes -+ // 1. Configuration Timeout -+ // 2. Invitation Flags -+ // 3. Operating Channel ( Only GO ) -+ // 4. P2P Group BSSID ( Should be included if I am the GO ) -+ // 5. Channel List -+ // 6. P2P Group ID -+ // 7. P2P Device Info -+ -+ // Configuration Timeout -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CONF_TIMEOUT; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P GO -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P Client -+ -+ // Invitation Flags -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_INVITATION_FLAGS; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0001 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = P2P_INVITATION_FLAGS_PERSISTENT; -+ -+ -+ // Operating Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_OPERATING_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ if ( pwdinfo->invitereq_info.operating_ch <= 14 ) -+ p2pie[ p2pielen++ ] = 0x51; -+ else if ( ( pwdinfo->invitereq_info.operating_ch >= 36 ) && ( pwdinfo->invitereq_info.operating_ch <= 48 ) ) -+ p2pie[ p2pielen++ ] = 0x73; -+ else -+ p2pie[ p2pielen++ ] = 0x7c; -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->invitereq_info.operating_ch; // operating channel number -+ -+ if ( _rtw_memcmp( myid( &padapter->eeprompriv ), pwdinfo->invitereq_info.go_bssid, ETH_ALEN ) ) -+ { -+ // P2P Group BSSID -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GROUP_BSSID; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address for GO -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_bssid, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ } -+ -+ // Channel List -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CH_LIST; -+ -+ -+ // Length: -+ // Country String(3) -+ // + ( Operating Class (1) + Number of Channels(1) ) * Operation Classes (?) -+ // + number of channels in all classes -+ len_channellist_attr = 3 -+ + (1 + 1) * (u16)pmlmeext->channel_list.reg_classes -+ + get_reg_classes_full_count(pmlmeext->channel_list); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 5 + 1 ); -+ } -+ else -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ } -+#else -+ -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ -+ #endif -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Channel Entry List -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ // Operating Class -+ if ( pbuddy_mlmeext->cur_channel > 14 ) -+ { -+ if ( pbuddy_mlmeext->cur_channel >= 149 ) -+ { -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ -+ // Number of Channels -+ // Just support 1 channel and this channel is AP's channel -+ p2pie[ p2pielen++ ] = 1; -+ -+ // Channel List -+ p2pie[ p2pielen++ ] = pbuddy_mlmeext->cur_channel; -+ } -+ else -+ { -+ int i, j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#else // CONFIG_CONCURRENT_MODE -+ { -+ int i, j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ -+ // P2P Group ID -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GROUP_ID; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 6 + pwdinfo->invitereq_info.ssidlen ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address for GO -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_bssid, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // SSID -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_ssid, pwdinfo->invitereq_info.ssidlen ); -+ p2pielen += pwdinfo->invitereq_info.ssidlen; -+ -+ -+ // Device Info -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Config Method -+ // This field should be big endian. Noted by P2P specification. -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_CONFIG_METHOD_DISPLAY ); -+ p2pielen += 2; -+ -+ // Primary Device Type -+ // Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ p2pielen += 2; -+ -+ // OUI -+ *(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ p2pielen += 2; -+ -+ // Number of Secondary Device Types -+ p2pie[ p2pielen++ ] = 0x00; // No Secondary Device Type List -+ -+ // Device Name -+ // Type: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ p2pielen += 2; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len ); -+ p2pielen += pwdinfo->device_name_len; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_invitation_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken, u8 status_code) -+{ -+ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_INVIT_RESP; -+ u8 p2pie[ 255 ] = { 0x00 }; -+ u8 p2pielen = 0, i; -+ u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; -+ u16 len_channellist_attr = 0; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo); -+ -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, raddr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ // P2P IE Section. -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20101005 -+ // According to the P2P Specification, the P2P Invitation response frame should contain 5 P2P attributes -+ // 1. Status -+ // 2. Configuration Timeout -+ // 3. Operating Channel ( Only GO ) -+ // 4. P2P Group BSSID ( Only GO ) -+ // 5. Channel List -+ -+ // P2P Status -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_STATUS; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0001 ); -+ p2pielen += 2; -+ -+ // Value: -+ // When status code is P2P_STATUS_FAIL_INFO_UNAVAILABLE. -+ // Sent the event receiving the P2P Invitation Req frame to DMP UI. -+ // DMP had to compare the MAC address to find out the profile. -+ // So, the WiFi driver will send the P2P_STATUS_FAIL_INFO_UNAVAILABLE to NB. -+ // If the UI found the corresponding profile, the WiFi driver sends the P2P Invitation Req -+ // to NB to rebuild the persistent group. -+ p2pie[ p2pielen++ ] = status_code; -+ -+ // Configuration Timeout -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CONF_TIMEOUT; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P GO -+ p2pie[ p2pielen++ ] = 200; // 2 seconds needed to be the P2P Client -+ -+ if( status_code == P2P_STATUS_SUCCESS ) -+ { -+ if( rtw_p2p_chk_role( pwdinfo, P2P_ROLE_GO ) ) -+ { -+ // The P2P Invitation request frame asks this Wi-Fi device to be the P2P GO -+ // In this case, the P2P Invitation response frame should carry the two more P2P attributes. -+ // First one is operating channel attribute. -+ // Second one is P2P Group BSSID attribute. -+ -+ // Operating Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_OPERATING_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; // Copy from SD7 -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->operating_channel; // operating channel number -+ -+ -+ // P2P Group BSSID -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GROUP_BSSID; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address for GO -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ } -+ -+ // Channel List -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CH_LIST; -+ -+ // Length: -+ // Country String(3) -+ // + ( Operating Class (1) + Number of Channels(1) ) * Operation Classes (?) -+ // + number of channels in all classes -+ len_channellist_attr = 3 -+ + (1 + 1) * (u16)pmlmeext->channel_list.reg_classes -+ + get_reg_classes_full_count(pmlmeext->channel_list); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 5 + 1 ); -+ } -+ else -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ } -+#else -+ -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( len_channellist_attr ); -+ -+#endif -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Channel Entry List -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ // Operating Class -+ if ( pbuddy_mlmeext->cur_channel > 14 ) -+ { -+ if ( pbuddy_mlmeext->cur_channel >= 149 ) -+ { -+ p2pie[ p2pielen++ ] = 0x7c; -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x73; -+ } -+ } -+ else -+ { -+ p2pie[ p2pielen++ ] = 0x51; -+ } -+ -+ // Number of Channels -+ // Just support 1 channel and this channel is AP's channel -+ p2pie[ p2pielen++ ] = 1; -+ -+ // Channel List -+ p2pie[ p2pielen++ ] = pbuddy_mlmeext->cur_channel; -+ } -+ else -+ { -+ int i, j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#else // CONFIG_CONCURRENT_MODE -+ { -+ int i, j; -+ for (j = 0; j < pmlmeext->channel_list.reg_classes; j++) { -+ // Operating Class -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].reg_class; -+ -+ // Number of Channels -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channels; -+ -+ // Channel List -+ for (i = 0; i < pmlmeext->channel_list.reg_class[j].channels; i++) { -+ p2pie[p2pielen++] = pmlmeext->channel_list.reg_class[j].channel[i]; -+ } -+ } -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ } -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_invitation_resp_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+void issue_p2p_provision_request(_adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr ) -+{ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u8 dialogToken = 1; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_PROVISION_DISC_REQ; -+ u8 wpsie[ 100 ] = { 0x00 }; -+ u8 wpsielen = 0; -+ u32 p2pielen = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ DBG_871X( "[%s] In\n", __FUNCTION__ ); -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, pdev_raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pdev_raddr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ p2pielen = build_prov_disc_request_p2p_ie( pwdinfo, pframe, pssid, ussidlen, pdev_raddr ); -+ -+ pframe += p2pielen; -+ pattrib->pktlen += p2pielen; -+ -+ wpsielen = 0; -+ // WPS OUI -+ *(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+ -+ // Config Method -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_CONF_METHOD ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( pwdinfo->tx_prov_disc_info.wps_config_method_request ); -+ wpsielen += 2; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_provdisc_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+ -+u8 is_matched_in_profilelist( u8* peermacaddr, struct profile_info* profileinfo ) -+{ -+ u8 i, match_result = 0; -+ -+ DBG_871X( "[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, -+ peermacaddr[0], peermacaddr[1],peermacaddr[2],peermacaddr[3],peermacaddr[4],peermacaddr[5]); -+ -+ for( i = 0; i < P2P_MAX_PERSISTENT_GROUP_NUM; i++, profileinfo++ ) -+ { -+ DBG_871X( "[%s] profileinfo_mac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, -+ profileinfo->peermac[0], profileinfo->peermac[1],profileinfo->peermac[2],profileinfo->peermac[3],profileinfo->peermac[4],profileinfo->peermac[5]); -+ if ( _rtw_memcmp( peermacaddr, profileinfo->peermac, ETH_ALEN ) ) -+ { -+ match_result = 1; -+ DBG_871X( "[%s] Match!\n", __FUNCTION__ ); -+ break; -+ } -+ } -+ -+ return (match_result ); -+} -+ -+void issue_probersp_p2p(_adapter *padapter, unsigned char *da) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned char *mac; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ u16 beacon_interval = 100; -+ u16 capInfo = 0; -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ u8 wpsie[255] = { 0x00 }; -+ u32 wpsielen = 0, p2pielen = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+#ifdef CONFIG_INTEL_WIDI -+ u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; -+#endif //CONFIG_INTEL_WIDI -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ mac = myid(&(padapter->eeprompriv)); -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); -+ -+ // Use the device address for BSSID field. -+ _rtw_memcpy(pwlanhdr->addr3, mac, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(fctrl, WIFI_PROBERSP); -+ -+ pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = pattrib->hdrlen; -+ pframe += pattrib->hdrlen; -+ -+ //timestamp will be inserted by hardware -+ pframe += 8; -+ pattrib->pktlen += 8; -+ -+ // beacon interval: 2 bytes -+ _rtw_memcpy(pframe, (unsigned char *) &beacon_interval, 2); -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ // capability info: 2 bytes -+ // ESS and IBSS bits must be 0 (defined in the 3.1.2.1.1 of WiFi Direct Spec) -+ capInfo |= cap_ShortPremble; -+ capInfo |= cap_ShortSlot; -+ -+ _rtw_memcpy(pframe, (unsigned char *) &capInfo, 2); -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ -+ // SSID -+ pframe = rtw_set_ie(pframe, _SSID_IE_, 7, pwdinfo->p2p_wildcard_ssid, &pattrib->pktlen); -+ -+ // supported rates... -+ // Use the OFDM rate in the P2P probe response frame. ( 6(B), 9(B), 12, 18, 24, 36, 48, 54 ) -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, pwdinfo->support_rate, &pattrib->pktlen); -+ -+ // DS parameter set -+ pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&pwdinfo->listen_channel, &pattrib->pktlen); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if( pmlmepriv->wps_probe_resp_ie != NULL && pmlmepriv->p2p_probe_resp_ie != NULL ) -+ { -+ //WPS IE -+ _rtw_memcpy(pframe, pmlmepriv->wps_probe_resp_ie, pmlmepriv->wps_probe_resp_ie_len); -+ pattrib->pktlen += pmlmepriv->wps_probe_resp_ie_len; -+ pframe += pmlmepriv->wps_probe_resp_ie_len; -+ -+ //P2P IE -+ _rtw_memcpy(pframe, pmlmepriv->p2p_probe_resp_ie, pmlmepriv->p2p_probe_resp_ie_len); -+ pattrib->pktlen += pmlmepriv->p2p_probe_resp_ie_len; -+ pframe += pmlmepriv->p2p_probe_resp_ie_len; -+ } -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ -+ // Todo: WPS IE -+ // Noted by Albert 20100907 -+ // According to the WPS specification, all the WPS attribute is presented by Big Endian. -+ -+ wpsielen = 0; -+ // WPS OUI -+ *(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+ -+#ifdef CONFIG_INTEL_WIDI -+ // Commented by Kurt -+ // Appended WiDi info. only if we did issued_probereq_widi(), and then we saved ven. ext. in pmlmepriv->sa_ext. -+ if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE -+ || pmlmepriv->num_p2p_sdt != 0 ) -+ { -+ //Sec dev type -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SEC_DEV_TYPE_LIST ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0008 ); -+ wpsielen += 2; -+ -+ // Value: -+ // Category ID -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_CID_DISPLAYS ); -+ wpsielen += 2; -+ -+ // OUI -+ *(u32*) ( wpsie + wpsielen ) = cpu_to_be32( INTEL_DEV_TYPE_OUI ); -+ wpsielen += 4; -+ -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_SCID_WIDI_CONSUMER_SINK ); -+ wpsielen += 2; -+ -+ if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE ) -+ { -+ // Vendor Extension -+ _rtw_memcpy( wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN ); -+ wpsielen += L2SDTA_SERVICE_VE_LEN; -+ } -+ } -+#endif //CONFIG_INTEL_WIDI -+ -+ // WiFi Simple Config State -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SIMPLE_CONF_STATE ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_WSC_STATE_NOT_CONFIG; // Not Configured. -+ -+ // Response Type -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_RESP_TYPE ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_RESPONSE_TYPE_8021X; -+ -+ // UUID-E -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_UUID_E ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0010 ); -+ wpsielen += 2; -+ -+ // Value: -+ if (pwdinfo->external_uuid == 0) { -+ _rtw_memset( wpsie + wpsielen, 0x0, 16 ); -+ _rtw_memcpy( wpsie + wpsielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ } else { -+ _rtw_memcpy( wpsie + wpsielen, pwdinfo->uuid, 0x10 ); -+ } -+ wpsielen += 0x10; -+ -+ // Manufacturer -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_MANUFACTURER ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0007 ); -+ wpsielen += 2; -+ -+ // Value: -+ _rtw_memcpy( wpsie + wpsielen, "Realtek", 7 ); -+ wpsielen += 7; -+ -+ // Model Name -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_MODEL_NAME ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0006 ); -+ wpsielen += 2; -+ -+ // Value: -+ _rtw_memcpy( wpsie + wpsielen, "8192CU", 6 ); -+ wpsielen += 6; -+ -+ // Model Number -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_MODEL_NUMBER ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[ wpsielen++ ] = 0x31; // character 1 -+ -+ // Serial Number -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SERIAL_NUMBER ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( ETH_ALEN ); -+ wpsielen += 2; -+ -+ // Value: -+ _rtw_memcpy( wpsie + wpsielen, "123456" , ETH_ALEN ); -+ wpsielen += ETH_ALEN; -+ -+ // Primary Device Type -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_PRIMARY_DEV_TYPE ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0008 ); -+ wpsielen += 2; -+ -+ // Value: -+ // Category ID -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_CID_RTK_WIDI ); -+ wpsielen += 2; -+ -+ // OUI -+ *(u32*) ( wpsie + wpsielen ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // Sub Category ID -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_SCID_RTK_DMP ); -+ wpsielen += 2; -+ -+ // Device Name -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ wpsielen += 2; -+ -+ // Value: -+ _rtw_memcpy( wpsie + wpsielen, pwdinfo->device_name, pwdinfo->device_name_len ); -+ wpsielen += pwdinfo->device_name_len; -+ -+ // Config Method -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_CONF_METHOD ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( pwdinfo->supported_wps_cm ); -+ wpsielen += 2; -+ -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+ -+ p2pielen = build_probe_resp_p2p_ie(pwdinfo, pframe); -+ pframe += p2pielen; -+ pattrib->pktlen += p2pielen; -+ } -+ -+#ifdef CONFIG_WFD -+#ifdef CONFIG_IOCTL_CFG80211 -+ if ( _TRUE == pwdinfo->wfd_info->wfd_enable ) -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ wfdielen = build_probe_resp_wfd_ie(pwdinfo, pframe, 0); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+#ifdef CONFIG_IOCTL_CFG80211 -+ else if (pmlmepriv->wfd_probe_resp_ie != NULL && pmlmepriv->wfd_probe_resp_ie_len>0) -+ { -+ //WFD IE -+ _rtw_memcpy(pframe, pmlmepriv->wfd_probe_resp_ie, pmlmepriv->wfd_probe_resp_ie_len); -+ pattrib->pktlen += pmlmepriv->wfd_probe_resp_ie_len; -+ pframe += pmlmepriv->wfd_probe_resp_ie_len; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack) -+{ -+ int ret = _FAIL; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned char *mac; -+ unsigned char bssrate[NumRates]; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ int bssrate_len = 0; -+ u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ u8 wpsie[255] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; -+ u16 wpsielen = 0, p2pielen = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ goto exit; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ mac = myid(&(padapter->eeprompriv)); -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ if (da) { -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, da, ETH_ALEN); -+ } else { -+ if ( ( pwdinfo->p2p_info.scan_op_ch_only ) || ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) ) -+ { -+ // This two flags will be set when this is only the P2P client mode. -+ _rtw_memcpy(pwlanhdr->addr1, pwdinfo->p2p_peer_interface_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pwdinfo->p2p_peer_interface_addr, ETH_ALEN); -+ } -+ else -+ { -+ // broadcast probe request frame -+ _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN); -+ } -+ } -+ _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_PROBEREQ); -+ -+ pframe += sizeof (struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) -+ { -+ pframe = rtw_set_ie(pframe, _SSID_IE_, pwdinfo->tx_prov_disc_info.ssid.SsidLength, pwdinfo->tx_prov_disc_info.ssid.Ssid, &(pattrib->pktlen)); -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SSID_IE_, P2P_WILDCARD_SSID_LEN, pwdinfo->p2p_wildcard_ssid, &(pattrib->pktlen)); -+ } -+ // Use the OFDM rate in the P2P probe request frame. ( 6(B), 9(B), 12(B), 24(B), 36, 48, 54 ) -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, pwdinfo->support_rate, &pattrib->pktlen); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if( pmlmepriv->wps_probe_req_ie != NULL && pmlmepriv->p2p_probe_req_ie != NULL ) -+ { -+ //WPS IE -+ _rtw_memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); -+ pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; -+ pframe += pmlmepriv->wps_probe_req_ie_len; -+ -+ //P2P IE -+ _rtw_memcpy(pframe, pmlmepriv->p2p_probe_req_ie, pmlmepriv->p2p_probe_req_ie_len); -+ pattrib->pktlen += pmlmepriv->p2p_probe_req_ie_len; -+ pframe += pmlmepriv->p2p_probe_req_ie_len; -+ } -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ -+ // WPS IE -+ // Noted by Albert 20110221 -+ // According to the WPS specification, all the WPS attribute is presented by Big Endian. -+ -+ wpsielen = 0; -+ // WPS OUI -+ *(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+ -+ if( pmlmepriv->wps_probe_req_ie == NULL ) -+ { -+ // UUID-E -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_UUID_E ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0010 ); -+ wpsielen += 2; -+ -+ // Value: -+ if (pwdinfo->external_uuid == 0) { -+ _rtw_memset( wpsie + wpsielen, 0x0, 16 ); -+ _rtw_memcpy( wpsie + wpsielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ } else { -+ _rtw_memcpy( wpsie + wpsielen, pwdinfo->uuid, 0x10 ); -+ } -+ wpsielen += 0x10; -+ -+ // Config Method -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_CONF_METHOD ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( pwdinfo->supported_wps_cm ); -+ wpsielen += 2; -+ } -+ -+ // Device Name -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ wpsielen += 2; -+ -+ // Value: -+ _rtw_memcpy( wpsie + wpsielen, pwdinfo->device_name, pwdinfo->device_name_len ); -+ wpsielen += pwdinfo->device_name_len; -+ -+ // Primary Device Type -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_PRIMARY_DEV_TYPE ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0008 ); -+ wpsielen += 2; -+ -+ // Value: -+ // Category ID -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ wpsielen += 2; -+ -+ // OUI -+ *(u32*) ( wpsie + wpsielen ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // Sub Category ID -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ wpsielen += 2; -+ -+ // Device Password ID -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_DEVICE_PWID ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_DPID_REGISTRAR_SPEC ); // Registrar-specified -+ wpsielen += 2; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20110221 -+ // According to the P2P Specification, the probe request frame should contain 5 P2P attributes -+ // 1. P2P Capability -+ // 2. P2P Device ID if this probe request wants to find the specific P2P device -+ // 3. Listen Channel -+ // 4. Extended Listen Timing -+ // 5. Operating Channel if this WiFi is working as the group owner now -+ -+ // P2P Capability -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_PERSISTENT_GROUP | DMP_P2P_GRPCAP_SUPPORT; -+ else -+ p2pie[ p2pielen++ ] = DMP_P2P_GRPCAP_SUPPORT; -+ -+ // Listen Channel -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_LISTEN_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; // Copy from SD7 -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->listen_channel; // listen channel -+ -+ -+ // Extended Listen Timing -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_EX_LISTEN_TIMING; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0004 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Availability Period -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ p2pielen += 2; -+ -+ // Availability Interval -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ p2pielen += 2; -+ -+ if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) ) -+ { -+ // Operating Channel (if this WiFi is working as the group owner now) -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_OPERATING_CH; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0005 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Country String -+ p2pie[ p2pielen++ ] = 'X'; -+ p2pie[ p2pielen++ ] = 'X'; -+ -+ // The third byte should be set to 0x04. -+ // Described in the "Operating Channel Attribute" section. -+ p2pie[ p2pielen++ ] = 0x04; -+ -+ // Operating Class -+ p2pie[ p2pielen++ ] = 0x51; // Copy from SD7 -+ -+ // Channel Number -+ p2pie[ p2pielen++ ] = pwdinfo->operating_channel; // operating channel number -+ -+ } -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+ if( pmlmepriv->wps_probe_req_ie != NULL ) -+ { -+ //WPS IE -+ _rtw_memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); -+ pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; -+ pframe += pmlmepriv->wps_probe_req_ie_len; -+ } -+ } -+ -+#ifdef CONFIG_WFD -+#ifdef CONFIG_IOCTL_CFG80211 -+ if ( _TRUE == pwdinfo->wfd_info->wfd_enable ) -+#endif -+ { -+ wfdielen = build_probe_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+#ifdef CONFIG_IOCTL_CFG80211 -+ else if (pmlmepriv->wfd_probe_req_ie != NULL && pmlmepriv->wfd_probe_req_ie_len>0) -+ { -+ //WFD IE -+ _rtw_memcpy(pframe, pmlmepriv->wfd_probe_req_ie, pmlmepriv->wfd_probe_req_ie_len); -+ pattrib->pktlen += pmlmepriv->wfd_probe_req_ie_len; -+ pframe += pmlmepriv->wfd_probe_req_ie_len; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("issuing probe_req, tx_len=%d\n", pattrib->last_txcmdsz)); -+ -+ if (wait_ack) { -+ ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); -+ } else { -+ dump_mgntframe(padapter, pmgntframe); -+ ret = _SUCCESS; -+ } -+ -+exit: -+ return ret; -+} -+ -+inline void issue_probereq_p2p(_adapter *adapter, u8 *da) -+{ -+ _issue_probereq_p2p(adapter, da, _FALSE); -+} -+ -+int issue_probereq_p2p_ex(_adapter *adapter, u8 *da, int try_cnt, int wait_ms) -+{ -+ int ret; -+ int i = 0; -+ u32 start = rtw_get_current_time(); -+ -+ do -+ { -+ ret = _issue_probereq_p2p(adapter, da, wait_ms>0?_TRUE:_FALSE); -+ -+ i++; -+ -+ if (adapter->bDriverStopped || adapter->bSurpriseRemoved) -+ break; -+ -+ if(i < try_cnt && wait_ms > 0 && ret==_FAIL) -+ rtw_msleep_os(wait_ms); -+ -+ }while((iu.hdr.adapter; -+ struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv); -+ u8 *frame = recv_frame->u.hdr.rx_data; -+ u16 seq_ctrl = ( (recv_frame->u.hdr.attrib.seq_num&0xffff) << 4) | -+ (recv_frame->u.hdr.attrib.frag_num & 0xf); -+ -+ if (GetRetry(frame)) { -+ if (token >= 0) { -+ if ((seq_ctrl == mlmeext->action_public_rxseq) -+ && (token == mlmeext->action_public_dialog_token)) -+ { -+ DBG_871X(FUNC_ADPT_FMT" seq_ctrl=0x%x, rxseq=0x%x, token:%d\n", -+ FUNC_ADPT_ARG(adapter), seq_ctrl, mlmeext->action_public_rxseq, token); -+ return _FAIL; -+ } -+ } else { -+ if (seq_ctrl == mlmeext->action_public_rxseq) { -+ DBG_871X(FUNC_ADPT_FMT" seq_ctrl=0x%x, rxseq=0x%x\n", -+ FUNC_ADPT_ARG(adapter), seq_ctrl, mlmeext->action_public_rxseq); -+ return _FAIL; -+ } -+ } -+ } -+ -+ mlmeext->action_public_rxseq = seq_ctrl; -+ -+ if (token >= 0) -+ mlmeext->action_public_dialog_token = token; -+ -+ return _SUCCESS; -+} -+ -+unsigned int on_action_public_p2p(union recv_frame *precv_frame) -+{ -+ _adapter *padapter = precv_frame->u.hdr.adapter; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint len = precv_frame->u.hdr.len; -+ u8 *frame_body; -+ u8 dialogToken=0; -+#ifdef CONFIG_P2P -+ u8 *p2p_ie; -+ u32 p2p_ielen, wps_ielen; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ u8 result = P2P_STATUS_SUCCESS; -+ u8 empty_addr[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -+ u8 *merged_p2pie = NULL; -+ u32 merged_p2p_ielen = 0; -+#endif //CONFIG_P2P -+ -+ frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ dialogToken = frame_body[7]; -+ -+ if (rtw_action_public_decache(precv_frame, dialogToken) == _FAIL) -+ return _FAIL; -+ -+#ifdef CONFIG_P2P -+ _cancel_timer_ex( &pwdinfo->reset_ch_sitesurvey ); -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211) -+ { -+ rtw_cfg80211_rx_p2p_action_public(padapter, pframe, len); -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ // Do nothing if the driver doesn't enable the P2P function. -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) -+ return _SUCCESS; -+ -+ len -= sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ switch( frame_body[ 6 ] )//OUI Subtype -+ { -+ case P2P_GO_NEGO_REQ: -+ { -+ DBG_871X( "[%s] Got GO Nego Req Frame\n", __FUNCTION__); -+ _rtw_memset( &pwdinfo->groupid_info, 0x00, sizeof( struct group_id_info ) ); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) -+ { -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ } -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) -+ { -+ // Commented by Albert 20110526 -+ // In this case, this means the previous nego fail doesn't be reset yet. -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ // Restore the previous p2p state -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ DBG_871X( "[%s] Restore the previous p2p state to %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); -+ } -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer ); -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ // Commented by Kurt 20110902 -+ //Add if statement to avoid receiving duplicate prov disc req. such that pre_p2p_state would be covered. -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ -+ // Commented by Kurt 20120113 -+ // Get peer_dev_addr here if peer doesn't issue prov_disc frame. -+ if( _rtw_memcmp(pwdinfo->rx_prov_disc_info.peerDevAddr, empty_addr, ETH_ALEN) ) -+ _rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); -+ -+ result = process_p2p_group_negotation_req( pwdinfo, frame_body, len ); -+ issue_p2p_GO_response( padapter, GetAddr2Ptr(pframe), frame_body, len, result ); -+#ifdef CONFIG_INTEL_WIDI -+ if( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) ) -+ { -+ padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION; -+ _cancel_timer_ex(&(padapter->mlmepriv.listen_timer)); -+ intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL); -+ } -+#endif //CONFIG_INTEL_WIDI -+ -+ // Commented by Albert 20110718 -+ // No matter negotiating or negotiation failure, the driver should set up the restore P2P state timer. -+#ifdef CONFIG_CONCURRENT_MODE -+ // Commented by Albert 20120107 -+ _set_timer( &pwdinfo->restore_p2p_state_timer, 3000 ); -+#else // CONFIG_CONCURRENT_MODE -+ _set_timer( &pwdinfo->restore_p2p_state_timer, 5000 ); -+#endif // CONFIG_CONCURRENT_MODE -+ break; -+ } -+ case P2P_GO_NEGO_RESP: -+ { -+ DBG_871X( "[%s] Got GO Nego Resp Frame\n", __FUNCTION__); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) -+ { -+ // Commented by Albert 20110425 -+ // The restore timer is enabled when issuing the nego request frame of rtw_p2p_connect function. -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ pwdinfo->nego_req_info.benable = _FALSE; -+ result = process_p2p_group_negotation_resp( pwdinfo, frame_body, len); -+ issue_p2p_GO_confirm( pwdinfo->padapter, GetAddr2Ptr(pframe), result); -+ if ( P2P_STATUS_SUCCESS == result ) -+ { -+ if ( rtw_p2p_role(pwdinfo) == P2P_ROLE_CLIENT ) -+ { -+ pwdinfo->p2p_info.operation_ch[ 0 ] = pwdinfo->peer_operating_ch; -+ #ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.operation_ch[ 1 ] = 1; //Check whether GO is operating in channel 1; -+ pwdinfo->p2p_info.operation_ch[ 2 ] = 6; //Check whether GO is operating in channel 6; -+ pwdinfo->p2p_info.operation_ch[ 3 ] = 11; //Check whether GO is operating in channel 11; -+ #endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.scan_op_ch_only = 1; -+ _set_timer( &pwdinfo->reset_ch_sitesurvey2, P2P_RESET_SCAN_CH ); -+ } -+ } -+ -+ // Reset the dialog token for group negotiation frames. -+ pwdinfo->negotiation_dialog_token = 1; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, 5000 ); -+ } -+ } -+ else -+ { -+ DBG_871X( "[%s] Skipped GO Nego Resp Frame (p2p_state != P2P_STATE_GONEGO_ING)\n", __FUNCTION__); -+ } -+ -+ break; -+ } -+ case P2P_GO_NEGO_CONF: -+ { -+ DBG_871X( "[%s] Got GO Nego Confirm Frame\n", __FUNCTION__); -+ result = process_p2p_group_negotation_confirm( pwdinfo, frame_body, len); -+ if ( P2P_STATUS_SUCCESS == result ) -+ { -+ if ( rtw_p2p_role(pwdinfo) == P2P_ROLE_CLIENT ) -+ { -+ pwdinfo->p2p_info.operation_ch[ 0 ] = pwdinfo->peer_operating_ch; -+ #ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.operation_ch[ 1 ] = 1; //Check whether GO is operating in channel 1; -+ pwdinfo->p2p_info.operation_ch[ 2 ] = 6; //Check whether GO is operating in channel 6; -+ pwdinfo->p2p_info.operation_ch[ 3 ] = 11; //Check whether GO is operating in channel 11; -+ #endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.scan_op_ch_only = 1; -+ _set_timer( &pwdinfo->reset_ch_sitesurvey2, P2P_RESET_SCAN_CH ); -+ } -+ } -+ break; -+ } -+ case P2P_INVIT_REQ: -+ { -+ // Added by Albert 2010/10/05 -+ // Received the P2P Invite Request frame. -+ -+ DBG_871X( "[%s] Got invite request frame!\n", __FUNCTION__ ); -+ if ( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)) ) -+ { -+ // Parse the necessary information from the P2P Invitation Request frame. -+ // For example: The MAC address of sending this P2P Invitation Request frame. -+ u32 attr_contentlen = 0; -+ u8 status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ struct group_id_info group_id; -+ u8 invitation_flag = 0; -+ -+ merged_p2p_ielen = rtw_get_p2p_merged_ies_len(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_); -+ -+ merged_p2pie = rtw_malloc(merged_p2p_ielen); -+ if (merged_p2pie == NULL) -+ { -+ DBG_871X( "[%s] Malloc p2p ie fail\n", __FUNCTION__); -+ goto exit; -+ } -+ _rtw_memset(merged_p2pie, 0x00, merged_p2p_ielen); -+ -+ merged_p2p_ielen = rtw_p2p_merge_ies(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, merged_p2pie); -+ -+ rtw_get_p2p_attr_content( merged_p2pie, merged_p2p_ielen, P2P_ATTR_INVITATION_FLAGS, &invitation_flag, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ -+ rtw_get_p2p_attr_content( merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_BSSID, pwdinfo->p2p_peer_interface_addr, &attr_contentlen); -+ // Commented by Albert 20120510 -+ // Copy to the pwdinfo->p2p_peer_interface_addr. -+ // So that the WFD UI ( or Sigma ) can get the peer interface address by using the following command. -+ // #> iwpriv wlan0 p2p_get peer_ifa -+ // After having the peer interface address, the sigma can find the correct conf file for wpa_supplicant. -+ -+ if ( attr_contentlen ) -+ { -+ DBG_871X( "[%s] GO's BSSID = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, -+ pwdinfo->p2p_peer_interface_addr[0], pwdinfo->p2p_peer_interface_addr[1], -+ pwdinfo->p2p_peer_interface_addr[2], pwdinfo->p2p_peer_interface_addr[3], -+ pwdinfo->p2p_peer_interface_addr[4], pwdinfo->p2p_peer_interface_addr[5] ); -+ } -+ -+ if ( invitation_flag & P2P_INVITATION_FLAGS_PERSISTENT ) -+ { -+ // Re-invoke the persistent group. -+ -+ _rtw_memset( &group_id, 0x00, sizeof( struct group_id_info ) ); -+ rtw_get_p2p_attr_content( merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_ID, ( u8* ) &group_id, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ if ( _rtw_memcmp( group_id.go_device_addr, myid( &padapter->eeprompriv ), ETH_ALEN ) ) -+ { -+ // The p2p device sending this p2p invitation request wants this Wi-Fi device to be the persistent GO. -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_GO ); -+ rtw_p2p_set_role( pwdinfo, P2P_ROLE_GO ); -+ status_code = P2P_STATUS_SUCCESS; -+ } -+ else -+ { -+ // The p2p device sending this p2p invitation request wants to be the persistent GO. -+ if ( is_matched_in_profilelist( pwdinfo->p2p_peer_interface_addr, &pwdinfo->profileinfo[ 0 ] ) ) -+ { -+ u8 operatingch_info[5] = { 0x00 }; -+ -+ if ( rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) -+ { -+ if( rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, (u32)operatingch_info[4] ) >= 0 ) -+ { -+ // The operating channel is acceptable for this device. -+ pwdinfo->rx_invitereq_info.operation_ch[0]= operatingch_info[4]; -+ #ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->rx_invitereq_info.operation_ch[1]= 1; //Check whether GO is operating in channel 1; -+ pwdinfo->rx_invitereq_info.operation_ch[2]= 6; //Check whether GO is operating in channel 6; -+ pwdinfo->rx_invitereq_info.operation_ch[3]= 11; //Check whether GO is operating in channel 11; -+ #endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->rx_invitereq_info.scan_op_ch_only = 1; -+ _set_timer( &pwdinfo->reset_ch_sitesurvey, P2P_RESET_SCAN_CH ); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_MATCH ); -+ rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); -+ status_code = P2P_STATUS_SUCCESS; -+ } -+ else -+ { -+ // The operating channel isn't supported by this device. -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_DISMATCH ); -+ rtw_p2p_set_role( pwdinfo, P2P_ROLE_DEVICE ); -+ status_code = P2P_STATUS_FAIL_NO_COMMON_CH; -+ _set_timer( &pwdinfo->restore_p2p_state_timer, 3000 ); -+ } -+ } -+ else -+ { -+ // Commented by Albert 20121130 -+ // Intel will use the different P2P IE to store the operating channel information -+ // Workaround for Intel WiDi 3.5 -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_MATCH ); -+ rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); -+ status_code = P2P_STATUS_SUCCESS; -+ } -+ } -+ else -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_DISMATCH ); -+ #ifdef CONFIG_INTEL_WIDI -+ _rtw_memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); -+ rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); -+ #endif //CONFIG_INTEL_WIDI -+ -+ status_code = P2P_STATUS_FAIL_UNKNOWN_P2PGROUP; -+ } -+ } -+ } -+ else -+ { -+ DBG_871X( "[%s] P2P Group ID Attribute NOT FOUND!\n", __FUNCTION__ ); -+ status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ } -+ } -+ else -+ { -+ // Received the invitation to join a P2P group. -+ -+ _rtw_memset( &group_id, 0x00, sizeof( struct group_id_info ) ); -+ rtw_get_p2p_attr_content( merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_ID, ( u8* ) &group_id, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ if ( _rtw_memcmp( group_id.go_device_addr, myid( &padapter->eeprompriv ), ETH_ALEN ) ) -+ { -+ // In this case, the GO can't be myself. -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_DISMATCH ); -+ status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ } -+ else -+ { -+ // The p2p device sending this p2p invitation request wants to join an existing P2P group -+ // Commented by Albert 2012/06/28 -+ // In this case, this Wi-Fi device should use the iwpriv command to get the peer device address. -+ // The peer device address should be the destination address for the provisioning discovery request. -+ // Then, this Wi-Fi device should use the iwpriv command to get the peer interface address. -+ // The peer interface address should be the address for WPS mac address -+ _rtw_memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); -+ rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_JOIN ); -+ status_code = P2P_STATUS_SUCCESS; -+ } -+ } -+ else -+ { -+ DBG_871X( "[%s] P2P Group ID Attribute NOT FOUND!\n", __FUNCTION__ ); -+ status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ } -+ } -+ } -+ else -+ { -+ DBG_871X( "[%s] P2P Invitation Flags Attribute NOT FOUND!\n", __FUNCTION__ ); -+ status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ } -+ -+ DBG_871X( "[%s] status_code = %d\n", __FUNCTION__, status_code ); -+ -+ pwdinfo->inviteresp_info.token = frame_body[ 7 ]; -+ issue_p2p_invitation_response( padapter, GetAddr2Ptr(pframe), pwdinfo->inviteresp_info.token, status_code ); -+ _set_timer( &pwdinfo->restore_p2p_state_timer, 3000 ); -+ } -+#ifdef CONFIG_INTEL_WIDI -+ if( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) ) -+ { -+ padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION; -+ _cancel_timer_ex(&(padapter->mlmepriv.listen_timer)); -+ intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL); -+ } -+#endif //CONFIG_INTEL_WIDI -+ break; -+ } -+ case P2P_INVIT_RESP: -+ { -+ u8 attr_content = 0x00; -+ u32 attr_contentlen = 0; -+ -+ DBG_871X( "[%s] Got invite response frame!\n", __FUNCTION__ ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ if ( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)) ) -+ { -+ rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); -+ -+ if ( attr_contentlen == 1 ) -+ { -+ DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); -+ pwdinfo->invitereq_info.benable = _FALSE; -+ -+ if ( attr_content == P2P_STATUS_SUCCESS ) -+ { -+ if ( _rtw_memcmp( pwdinfo->invitereq_info.go_bssid, myid( &padapter->eeprompriv ), ETH_ALEN )) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO ); -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ rtw_p2p_set_state( pwdinfo, P2P_STATE_RX_INVITE_RESP_OK ); -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ rtw_p2p_set_state( pwdinfo, P2P_STATE_RX_INVITE_RESP_FAIL ); -+ } -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ rtw_p2p_set_state( pwdinfo, P2P_STATE_RX_INVITE_RESP_FAIL ); -+ } -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ rtw_p2p_set_state( pwdinfo, P2P_STATE_RX_INVITE_RESP_FAIL ); -+ } -+ -+ if ( rtw_p2p_chk_state( pwdinfo, P2P_STATE_RX_INVITE_RESP_FAIL ) ) -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, 5000 ); -+ } -+ break; -+ } -+ case P2P_DEVDISC_REQ: -+ -+ process_p2p_devdisc_req(pwdinfo, pframe, len); -+ -+ break; -+ -+ case P2P_DEVDISC_RESP: -+ -+ process_p2p_devdisc_resp(pwdinfo, pframe, len); -+ -+ break; -+ -+ case P2P_PROVISION_DISC_REQ: -+ DBG_871X( "[%s] Got Provisioning Discovery Request Frame\n", __FUNCTION__ ); -+ process_p2p_provdisc_req(pwdinfo, pframe, len); -+ _rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); -+ -+ //20110902 Kurt -+ //Add the following statement to avoid receiving duplicate prov disc req. such that pre_p2p_state would be covered. -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ); -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT ); -+#ifdef CONFIG_INTEL_WIDI -+ if( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) ) -+ { -+ padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION; -+ _cancel_timer_ex(&(padapter->mlmepriv.listen_timer)); -+ intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL); -+ } -+#endif //CONFIG_INTEL_WIDI -+ break; -+ -+ case P2P_PROVISION_DISC_RESP: -+ // Commented by Albert 20110707 -+ // Should we check the pwdinfo->tx_prov_disc_info.bsent flag here?? -+ DBG_871X( "[%s] Got Provisioning Discovery Response Frame\n", __FUNCTION__ ); -+ // Commented by Albert 20110426 -+ // The restore timer is enabled when issuing the provisioing request frame in rtw_p2p_prov_disc function. -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP); -+ process_p2p_provdisc_resp(pwdinfo, pframe); -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT ); -+ break; -+ -+ } -+ } -+#endif //CONFIG_P2P -+ -+exit: -+ -+ if(merged_p2pie) -+ { -+ rtw_mfree(merged_p2pie, merged_p2p_ielen); -+ } -+ -+ return _SUCCESS; -+} -+ -+unsigned int on_action_public_vendor(union recv_frame *precv_frame) -+{ -+ unsigned int ret = _FAIL; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint frame_len = precv_frame->u.hdr.len; -+ u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ if (_rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE) { -+ ret = on_action_public_p2p(precv_frame); -+ } -+ -+ return ret; -+} -+ -+unsigned int on_action_public_default(union recv_frame *precv_frame, u8 action) -+{ -+ unsigned int ret = _FAIL; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint frame_len = precv_frame->u.hdr.len; -+ u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); -+ u8 token; -+ _adapter *adapter = precv_frame->u.hdr.adapter; -+ int cnt = 0; -+ char msg[64]; -+ -+ token = frame_body[2]; -+ -+ if (rtw_action_public_decache(precv_frame, token) == _FAIL) -+ goto exit; -+ -+ #ifdef CONFIG_IOCTL_CFG80211 -+ cnt += sprintf((msg+cnt), "%s(token:%u)", action_public_str(action), token); -+ rtw_cfg80211_rx_action(adapter, pframe, frame_len, msg); -+ #endif -+ -+ ret = _SUCCESS; -+ -+exit: -+ return ret; -+} -+ -+unsigned int on_action_public(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ unsigned int ret = _FAIL; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint frame_len = precv_frame->u.hdr.len; -+ u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); -+ u8 category, action; -+ -+ /* check RA matches or not */ -+ if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe), ETH_ALEN)) -+ goto exit; -+ -+ category = frame_body[0]; -+ if(category != RTW_WLAN_CATEGORY_PUBLIC) -+ goto exit; -+ -+ action = frame_body[1]; -+ switch (action) { -+ case ACT_PUBLIC_VENDOR: -+ ret = on_action_public_vendor(precv_frame); -+ break; -+ default: -+ ret = on_action_public_default(precv_frame, action); -+ break; -+ } -+ -+exit: -+ return ret; -+} -+ -+unsigned int OnAction_ht(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ return _SUCCESS; -+} -+ -+#ifdef CONFIG_IEEE80211W -+unsigned int OnAction_sa_query(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ unsigned short tid; -+ //Baron -+ -+ DBG_871X("OnAction_sa_query\n"); -+ -+ switch (pframe[WLAN_HDR_A3_LEN+1]) -+ { -+ case 0: //SA Query req -+ _rtw_memcpy(&tid, &pframe[WLAN_HDR_A3_LEN+2], sizeof(unsigned short)); -+ DBG_871X("OnAction_sa_query request,action=%d, tid=%04x\n", pframe[WLAN_HDR_A3_LEN+1], tid); -+ issue_action_SA_Query(padapter, GetAddr2Ptr(pframe), 1, tid); -+ break; -+ -+ case 1: //SA Query rsp -+ _cancel_timer_ex(&pmlmeext->sa_query_timer); -+ DBG_871X("OnAction_sa_query response,action=%d, tid=%04x, cancel timer\n", pframe[WLAN_HDR_A3_LEN+1], pframe[WLAN_HDR_A3_LEN+2]); -+ break; -+ default: -+ break; -+ } -+ if(0) -+ { -+ int pp; -+ printk("pattrib->pktlen = %d =>", pattrib->pkt_len); -+ for(pp=0;pp< pattrib->pkt_len; pp++) -+ printk(" %02x ", pframe[pp]); -+ printk("\n"); -+ } -+ -+ return _SUCCESS; -+} -+#endif //CONFIG_IEEE80211W -+ -+unsigned int OnAction_wmm(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ return _SUCCESS; -+} -+ -+unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_P2P -+ u8 *frame_body; -+ u8 category, OUI_Subtype, dialogToken=0; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ uint len = precv_frame->u.hdr.len; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ //check RA matches or not -+ if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe), ETH_ALEN))//for if1, sta/ap mode -+ return _SUCCESS; -+ -+ frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ category = frame_body[0]; -+ if(category != RTW_WLAN_CATEGORY_P2P) -+ return _SUCCESS; -+ -+ if ( cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ) != P2POUI ) -+ return _SUCCESS; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ rtw_cfg80211_rx_action_p2p(padapter, pframe, len); -+ return _SUCCESS; -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ len -= sizeof(struct rtw_ieee80211_hdr_3addr); -+ OUI_Subtype = frame_body[5]; -+ dialogToken = frame_body[6]; -+ -+ switch(OUI_Subtype) -+ { -+ case P2P_NOTICE_OF_ABSENCE: -+ -+ break; -+ -+ case P2P_PRESENCE_REQUEST: -+ -+ process_p2p_presence_req(pwdinfo, pframe, len); -+ -+ break; -+ -+ case P2P_PRESENCE_RESPONSE: -+ -+ break; -+ -+ case P2P_GO_DISC_REQUEST: -+ -+ break; -+ -+ default: -+ break; -+ -+ } -+ } -+#endif //CONFIG_P2P -+ -+ return _SUCCESS; -+ -+} -+ -+unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ int i; -+ unsigned char category; -+ struct action_handler *ptable; -+ unsigned char *frame_body; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ -+ frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ category = frame_body[0]; -+ -+ for(i = 0; i < sizeof(OnAction_tbl)/sizeof(struct action_handler); i++) -+ { -+ ptable = &OnAction_tbl[i]; -+ -+ if(category == ptable->num) -+ ptable->func(padapter, precv_frame); -+ -+ } -+ -+ return _SUCCESS; -+ -+} -+ -+unsigned int DoReserved(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ -+ //DBG_871X("rcvd mgt frame(%x, %x)\n", (GetFrameSubType(pframe) >> 4), *(unsigned int *)GetAddr1Ptr(pframe)); -+ return _SUCCESS; -+} -+ -+struct xmit_frame *_alloc_mgtxmitframe(struct xmit_priv *pxmitpriv, bool once) -+{ -+ struct xmit_frame *pmgntframe; -+ struct xmit_buf *pxmitbuf; -+ -+ if (once) -+ pmgntframe = rtw_alloc_xmitframe_once(pxmitpriv); -+ else -+ pmgntframe = rtw_alloc_xmitframe_ext(pxmitpriv); -+ -+ if (pmgntframe == NULL) { -+ DBG_871X(FUNC_ADPT_FMT" alloc xmitframe fail, once:%d\n", FUNC_ADPT_ARG(pxmitpriv->adapter), once); -+ goto exit; -+ } -+ -+ if ((pxmitbuf = rtw_alloc_xmitbuf_ext(pxmitpriv)) == NULL) { -+ DBG_871X(FUNC_ADPT_FMT" alloc xmitbuf fail\n", FUNC_ADPT_ARG(pxmitpriv->adapter)); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ pmgntframe = NULL; -+ goto exit; -+ } -+ -+ pmgntframe->frame_tag = MGNT_FRAMETAG; -+ pmgntframe->pxmitbuf = pxmitbuf; -+ pmgntframe->buf_addr = pxmitbuf->pbuf; -+ pxmitbuf->priv_data = pmgntframe; -+ -+exit: -+ return pmgntframe; -+ -+} -+ -+inline struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) -+{ -+ return _alloc_mgtxmitframe(pxmitpriv, _FALSE); -+} -+ -+inline struct xmit_frame *alloc_mgtxmitframe_once(struct xmit_priv *pxmitpriv) -+{ -+ return _alloc_mgtxmitframe(pxmitpriv, _TRUE); -+} -+ -+ -+/**************************************************************************** -+ -+Following are some TX fuctions for WiFi MLME -+ -+*****************************************************************************/ -+ -+void update_mgnt_tx_rate(_adapter *padapter, u8 rate) -+{ -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ pmlmeext->tx_rate = rate; -+ -+ //DBG_871X("%s(): rate = %x\n",__FUNCTION__, rate); -+} -+ -+void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib) -+{ -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ _rtw_memset((u8 *)(pattrib), 0, sizeof(struct pkt_attrib)); -+ -+ pattrib->hdrlen = 24; -+ pattrib->nr_frags = 1; -+ pattrib->priority = 7; -+ pattrib->mac_id = 0; -+ pattrib->qsel = 0x12; -+ -+ pattrib->pktlen = 0; -+ -+ if(pmlmeext->cur_wireless_mode & WIRELESS_11B) -+ pattrib->raid = 6;//b mode -+ else -+ pattrib->raid = 5;//a/g mode -+ -+ pattrib->encrypt = _NO_PRIVACY_; -+ pattrib->bswenc = _FALSE; -+ -+ pattrib->qos_en = _FALSE; -+ pattrib->ht_en = _FALSE; -+ pattrib->bwmode = HT_CHANNEL_WIDTH_20; -+ pattrib->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ pattrib->sgi = _FALSE; -+ -+ pattrib->seqnum = pmlmeext->mgnt_seq; -+ -+ pattrib->retry_ctrl = _TRUE; -+ -+} -+ -+void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe) -+{ -+ if(padapter->bSurpriseRemoved == _TRUE || -+ padapter->bDriverStopped == _TRUE) -+ { -+ rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); -+ return; -+ } -+ -+ rtw_hal_mgnt_xmit(padapter, pmgntframe); -+} -+ -+s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms) -+{ -+ s32 ret = _FAIL; -+ _irqL irqL; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf; -+ struct submit_ctx sctx; -+ -+ if(padapter->bSurpriseRemoved == _TRUE || -+ padapter->bDriverStopped == _TRUE) -+ { -+ rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); -+ return ret; -+ } -+ -+ rtw_sctx_init(&sctx, timeout_ms); -+ pxmitbuf->sctx = &sctx; -+ -+ ret = rtw_hal_mgnt_xmit(padapter, pmgntframe); -+ -+ if (ret == _SUCCESS) -+ ret = rtw_sctx_wait(&sctx); -+ -+ _enter_critical(&pxmitpriv->lock_sctx, &irqL); -+ pxmitbuf->sctx = NULL; -+ _exit_critical(&pxmitpriv->lock_sctx, &irqL); -+ -+ return ret; -+} -+ -+s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe) -+{ -+#ifdef CONFIG_XMIT_ACK -+ s32 ret = _FAIL; -+ u32 timeout_ms = 500;// 500ms -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ #ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->pbuddy_adapter && !padapter->isprimary) -+ pxmitpriv = &(padapter->pbuddy_adapter->xmitpriv); -+ #endif -+ -+ if(padapter->bSurpriseRemoved == _TRUE || -+ padapter->bDriverStopped == _TRUE) -+ { -+ rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe); -+ return -1; -+ } -+ -+ _enter_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); -+ pxmitpriv->ack_tx = _TRUE; -+ -+ pmgntframe->ack_report = 1; -+ if (rtw_hal_mgnt_xmit(padapter, pmgntframe) == _SUCCESS) { -+ ret = rtw_ack_tx_wait(pxmitpriv, timeout_ms); -+ } -+ -+ pxmitpriv->ack_tx = _FALSE; -+ _exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); -+ -+ return ret; -+#else //!CONFIG_XMIT_ACK -+ dump_mgntframe(padapter, pmgntframe); -+ rtw_msleep_os(50); -+ return _SUCCESS; -+#endif //!CONFIG_XMIT_ACK -+} -+ -+int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) -+{ -+ u8 *ssid_ie; -+ sint ssid_len_ori; -+ int len_diff = 0; -+ -+ ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len); -+ -+ //DBG_871X("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __FUNCTION__, hidden_ssid_mode, ssid_ie, ssid_len_ori); -+ -+ if(ssid_ie && ssid_len_ori>0) -+ { -+ switch(hidden_ssid_mode) -+ { -+ case 1: -+ { -+ u8 *next_ie = ssid_ie + 2 + ssid_len_ori; -+ u32 remain_len = 0; -+ -+ remain_len = ies_len -(next_ie-ies); -+ -+ ssid_ie[1] = 0; -+ _rtw_memcpy(ssid_ie+2, next_ie, remain_len); -+ len_diff -= ssid_len_ori; -+ -+ break; -+ } -+ case 2: -+ _rtw_memset(&ssid_ie[2], 0, ssid_len_ori); -+ break; -+ default: -+ break; -+ } -+ } -+ -+ return len_diff; -+} -+ -+void issue_beacon(_adapter *padapter) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned int rate_len; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ DBG_871X("%s, alloc mgnt frame fail\n", __FUNCTION__); -+ return; -+ } -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ _enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); -+#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ pattrib->qsel = 0x10; -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/); -+ //pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_BEACON); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr); -+ -+ if( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) -+ { -+ //DBG_871X("ie len=%d\n", cur_network->IELength); -+#ifdef CONFIG_P2P -+ // for P2P : Primary Device Type & Device Name -+ u32 wpsielen=0, insert_len=0; -+ u8 *wpsie=NULL; -+ wpsie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wpsielen); -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) && wpsie && wpsielen>0) -+ { -+ uint wps_offset, remainder_ielen; -+ u8 *premainder_ie, *pframe_wscie; -+ -+ wps_offset = (uint)(wpsie - cur_network->IEs); -+ -+ premainder_ie = wpsie + wpsielen; -+ -+ remainder_ielen = cur_network->IELength - wps_offset - wpsielen; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(pmlmepriv->wps_beacon_ie && pmlmepriv->wps_beacon_ie_len>0) -+ { -+ _rtw_memcpy(pframe, cur_network->IEs, wps_offset); -+ pframe += wps_offset; -+ pattrib->pktlen += wps_offset; -+ -+ _rtw_memcpy(pframe, pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len); -+ pframe += pmlmepriv->wps_beacon_ie_len; -+ pattrib->pktlen += pmlmepriv->wps_beacon_ie_len; -+ -+ //copy remainder_ie to pframe -+ _rtw_memcpy(pframe, premainder_ie, remainder_ielen); -+ pframe += remainder_ielen; -+ pattrib->pktlen += remainder_ielen; -+ } -+ else -+ { -+ _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); -+ pframe += cur_network->IELength; -+ pattrib->pktlen += cur_network->IELength; -+ } -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ pframe_wscie = pframe + wps_offset; -+ _rtw_memcpy(pframe, cur_network->IEs, wps_offset+wpsielen); -+ pframe += (wps_offset + wpsielen); -+ pattrib->pktlen += (wps_offset + wpsielen); -+ -+ //now pframe is end of wsc ie, insert Primary Device Type & Device Name -+ // Primary Device Type -+ // Type: -+ *(u16*) ( pframe + insert_len) = cpu_to_be16( WPS_ATTR_PRIMARY_DEV_TYPE ); -+ insert_len += 2; -+ -+ // Length: -+ *(u16*) ( pframe + insert_len ) = cpu_to_be16( 0x0008 ); -+ insert_len += 2; -+ -+ // Value: -+ // Category ID -+ *(u16*) ( pframe + insert_len ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ insert_len += 2; -+ -+ // OUI -+ *(u32*) ( pframe + insert_len ) = cpu_to_be32( WPSOUI ); -+ insert_len += 4; -+ -+ // Sub Category ID -+ *(u16*) ( pframe + insert_len ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ insert_len += 2; -+ -+ -+ // Device Name -+ // Type: -+ *(u16*) ( pframe + insert_len ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ insert_len += 2; -+ -+ // Length: -+ *(u16*) ( pframe + insert_len ) = cpu_to_be16( pwdinfo->device_name_len ); -+ insert_len += 2; -+ -+ // Value: -+ _rtw_memcpy( pframe + insert_len, pwdinfo->device_name, pwdinfo->device_name_len ); -+ insert_len += pwdinfo->device_name_len; -+ -+ -+ //update wsc ie length -+ *(pframe_wscie+1) = (wpsielen -2) + insert_len; -+ -+ //pframe move to end -+ pframe+=insert_len; -+ pattrib->pktlen += insert_len; -+ -+ //copy remainder_ie to pframe -+ _rtw_memcpy(pframe, premainder_ie, remainder_ielen); -+ pframe += remainder_ielen; -+ pattrib->pktlen += remainder_ielen; -+ } -+ } -+ else -+#endif //CONFIG_P2P -+ { -+ int len_diff; -+ _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); -+ len_diff = update_hidden_ssid( -+ pframe+_BEACON_IE_OFFSET_ -+ , cur_network->IELength-_BEACON_IE_OFFSET_ -+ , pmlmeinfo->hidden_ssid_mode -+ ); -+ pframe += (cur_network->IELength+len_diff); -+ pattrib->pktlen += (cur_network->IELength+len_diff); -+ } -+ -+ { -+ u8 *wps_ie; -+ uint wps_ielen; -+ u8 sr = 0; -+ wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof (struct rtw_ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_, -+ pattrib->pktlen-sizeof (struct rtw_ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen); -+ if (wps_ie && wps_ielen>0) { -+ rtw_get_wps_attr_content(wps_ie, wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8*)(&sr), NULL); -+ } -+ if (sr != 0) -+ set_fwstate(pmlmepriv, WIFI_UNDER_WPS); -+ else -+ _clr_fwstate_(pmlmepriv, WIFI_UNDER_WPS); -+ } -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ u32 len; -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ len = pmlmepriv->p2p_beacon_ie_len; -+ if(pmlmepriv->p2p_beacon_ie && len>0) -+ _rtw_memcpy(pframe, pmlmepriv->p2p_beacon_ie, len); -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ len = build_beacon_p2p_ie(pwdinfo, pframe); -+ } -+ -+ pframe += len; -+ pattrib->pktlen += len; -+#ifdef CONFIG_WFD -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(_TRUE == pwdinfo->wfd_info->wfd_enable) -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ len = build_beacon_wfd_ie( pwdinfo, pframe ); -+ } -+#ifdef CONFIG_IOCTL_CFG80211 -+ else -+ { -+ len = 0; -+ if(pmlmepriv->wfd_beacon_ie && pmlmepriv->wfd_beacon_ie_len>0) -+ { -+ len = pmlmepriv->wfd_beacon_ie_len; -+ _rtw_memcpy(pframe, pmlmepriv->wfd_beacon_ie, len); -+ } -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+ pframe += len; -+ pattrib->pktlen += len; -+#endif //CONFIG_WFD -+ } -+#endif //CONFIG_P2P -+ -+ goto _issue_bcn; -+ -+ } -+ -+ //below for ad-hoc mode -+ -+ //timestamp will be inserted by hardware -+ pframe += 8; -+ pattrib->pktlen += 8; -+ -+ // beacon interval: 2 bytes -+ -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ // capability info: 2 bytes -+ -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ // SSID -+ pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen); -+ -+ // supported rates... -+ rate_len = rtw_get_rateset_len(cur_network->SupportedRates); -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8)? 8: rate_len), cur_network->SupportedRates, &pattrib->pktlen); -+ -+ // DS parameter set -+ pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); -+ -+ //if( (pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) -+ { -+ u8 erpinfo=0; -+ u32 ATIMWindow; -+ // IBSS Parameter Set... -+ //ATIMWindow = cur->Configuration.ATIMWindow; -+ ATIMWindow = 0; -+ pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen); -+ -+ //ERP IE -+ pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen); -+ } -+ -+ -+ // EXTERNDED SUPPORTED RATE -+ if (rate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pattrib->pktlen); -+ } -+ -+ -+ //todo:HT for adhoc -+ -+_issue_bcn: -+ -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ pmlmepriv->update_bcn = _FALSE; -+ -+ _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); -+#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ -+ if ((pattrib->pktlen + TXDESC_SIZE) > 512) -+ { -+ DBG_871X("beacon frame too large\n"); -+ return; -+ } -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ //DBG_871X("issue bcn_sz=%d\n", pattrib->last_txcmdsz); -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+} -+ -+void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned char *mac, *bssid; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ u8 *pwps_ie; -+ uint wps_ielen; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ unsigned int rate_len; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+#endif //CONFIG_P2P -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ DBG_871X("%s, alloc mgnt frame fail\n", __FUNCTION__); -+ return; -+ } -+ -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ mac = myid(&(padapter->eeprompriv)); -+ bssid = cur_network->MacAddress; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, bssid, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(fctrl, WIFI_PROBERSP); -+ -+ pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = pattrib->hdrlen; -+ pframe += pattrib->hdrlen; -+ -+ -+ if(cur_network->IELength>MAX_IE_SZ) -+ return; -+ -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ if( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) -+ { -+ pwps_ie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen); -+ -+ //inerset & update wps_probe_resp_ie -+ if((pmlmepriv->wps_probe_resp_ie!=NULL) && pwps_ie && (wps_ielen>0)) -+ { -+ uint wps_offset, remainder_ielen; -+ u8 *premainder_ie; -+ -+ wps_offset = (uint)(pwps_ie - cur_network->IEs); -+ -+ premainder_ie = pwps_ie + wps_ielen; -+ -+ remainder_ielen = cur_network->IELength - wps_offset - wps_ielen; -+ -+ _rtw_memcpy(pframe, cur_network->IEs, wps_offset); -+ pframe += wps_offset; -+ pattrib->pktlen += wps_offset; -+ -+ wps_ielen = (uint)pmlmepriv->wps_probe_resp_ie[1];//to get ie data len -+ if((wps_offset+wps_ielen+2)<=MAX_IE_SZ) -+ { -+ _rtw_memcpy(pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen+2); -+ pframe += wps_ielen+2; -+ pattrib->pktlen += wps_ielen+2; -+ } -+ -+ if((wps_offset+wps_ielen+2+remainder_ielen)<=MAX_IE_SZ) -+ { -+ _rtw_memcpy(pframe, premainder_ie, remainder_ielen); -+ pframe += remainder_ielen; -+ pattrib->pktlen += remainder_ielen; -+ } -+ } -+ else -+ { -+ _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); -+ pframe += cur_network->IELength; -+ pattrib->pktlen += cur_network->IELength; -+ } -+ -+ /* retrieve SSID IE from cur_network->Ssid */ -+ { -+ u8 *ssid_ie; -+ sint ssid_ielen; -+ sint ssid_ielen_diff; -+ u8 buf[MAX_IE_SZ]; -+ u8 *ies = pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, _SSID_IE_, &ssid_ielen, -+ (pframe-ies)-_FIXED_IE_LENGTH_); -+ -+ ssid_ielen_diff = cur_network->Ssid.SsidLength - ssid_ielen; -+ -+ if (ssid_ie && cur_network->Ssid.SsidLength) { -+ uint remainder_ielen; -+ u8 *remainder_ie; -+ remainder_ie = ssid_ie+2; -+ remainder_ielen = (pframe-remainder_ie); -+ -+ LOG_LEVEL(_drv_warning_, FUNC_ADPT_FMT" remainder_ielen > MAX_IE_SZ\n", FUNC_ADPT_ARG(padapter)); -+ if (remainder_ielen > MAX_IE_SZ) { -+ remainder_ielen = MAX_IE_SZ; -+ } -+ -+ _rtw_memcpy(buf, remainder_ie, remainder_ielen); -+ _rtw_memcpy(remainder_ie+ssid_ielen_diff, buf, remainder_ielen); -+ *(ssid_ie+1) = cur_network->Ssid.SsidLength; -+ _rtw_memcpy(ssid_ie+2, cur_network->Ssid.Ssid, cur_network->Ssid.SsidLength); -+ -+ pframe += ssid_ielen_diff; -+ pattrib->pktlen += ssid_ielen_diff; -+ } -+ } -+ } -+ else -+#endif -+ { -+ -+ //timestamp will be inserted by hardware -+ pframe += 8; -+ pattrib->pktlen += 8; -+ -+ // beacon interval: 2 bytes -+ -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ // capability info: 2 bytes -+ -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ //below for ad-hoc mode -+ -+ // SSID -+ pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen); -+ -+ // supported rates... -+ rate_len = rtw_get_rateset_len(cur_network->SupportedRates); -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8)? 8: rate_len), cur_network->SupportedRates, &pattrib->pktlen); -+ -+ // DS parameter set -+ pframe =rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); -+ -+ if( (pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) -+ { -+ u8 erpinfo=0; -+ u32 ATIMWindow; -+ // IBSS Parameter Set... -+ //ATIMWindow = cur->Configuration.ATIMWindow; -+ ATIMWindow = 0; -+ pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen); -+ -+ //ERP IE -+ pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen); -+ } -+ -+ -+ // EXTERNDED SUPPORTED RATE -+ if (rate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pattrib->pktlen); -+ } -+ -+ -+ //todo:HT for adhoc -+ -+ } -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) /*&& is_valid_p2p_probereq*/) -+ { -+ u32 len; -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ //if pwdinfo->role == P2P_ROLE_DEVICE will call issue_probersp_p2p() -+ len = pmlmepriv->p2p_go_probe_resp_ie_len; -+ if(pmlmepriv->p2p_go_probe_resp_ie && len>0) -+ _rtw_memcpy(pframe, pmlmepriv->p2p_go_probe_resp_ie, len); -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ len = build_probe_resp_p2p_ie(pwdinfo, pframe); -+ } -+ -+ pframe += len; -+ pattrib->pktlen += len; -+ -+#ifdef CONFIG_WFD -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(_TRUE == pwdinfo->wfd_info->wfd_enable) -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ len = build_probe_resp_wfd_ie(pwdinfo, pframe, 0); -+ } -+#ifdef CONFIG_IOCTL_CFG80211 -+ else -+ { -+ len = 0; -+ if(pmlmepriv->wfd_probe_resp_ie && pmlmepriv->wfd_probe_resp_ie_len>0) -+ { -+ len = pmlmepriv->wfd_probe_resp_ie_len; -+ _rtw_memcpy(pframe, pmlmepriv->wfd_probe_resp_ie, len); -+ } -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+ pframe += len; -+ pattrib->pktlen += len; -+#endif //CONFIG_WFD -+ -+ } -+#endif //CONFIG_P2P -+ -+ -+#ifdef CONFIG_AUTO_AP_MODE -+{ -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("(%s)\n", __FUNCTION__); -+ -+ //check rc station -+ psta = rtw_get_stainfo(pstapriv, da); -+ if (psta && psta->isrc && psta->pid>0) -+ { -+ u8 RC_OUI[4]={0x00,0xE0,0x4C,0x0A}; -+ u8 RC_INFO[14] = {0}; -+ //EID[1] + EID_LEN[1] + RC_OUI[4] + MAC[6] + PairingID[2] + ChannelNum[2] -+ u16 cu_ch = (u16)cur_network->Configuration.DSConfig; -+ -+ DBG_871X("%s, reply rc(pid=0x%x) device "MAC_FMT" in ch=%d\n", __FUNCTION__, -+ psta->pid, MAC_ARG(psta->hwaddr), cu_ch); -+ -+ //append vendor specific ie -+ _rtw_memcpy(RC_INFO, RC_OUI, sizeof(RC_OUI)); -+ _rtw_memcpy(&RC_INFO[4], mac, ETH_ALEN); -+ _rtw_memcpy(&RC_INFO[10], (u8*)&psta->pid, 2); -+ _rtw_memcpy(&RC_INFO[12], (u8*)&cu_ch, 2); -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, sizeof(RC_INFO), RC_INFO, &pattrib->pktlen); -+ } -+} -+#endif //CONFIG_AUTO_AP_MODE -+ -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+int _issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int wait_ack) -+{ -+ int ret = _FAIL; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned char *mac; -+ unsigned char bssrate[NumRates]; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ int bssrate_len = 0; -+ u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_notice_,("+issue_probereq\n")); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ goto exit; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ mac = myid(&(padapter->eeprompriv)); -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ if (da) -+ { -+ // unicast probe request frame -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, da, ETH_ALEN); -+ } -+ else -+ { -+ // broadcast probe request frame -+ _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN); -+ } -+ -+ _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_PROBEREQ); -+ -+ pframe += sizeof (struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr); -+ -+ if(pssid) -+ pframe = rtw_set_ie(pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen)); -+ else -+ pframe = rtw_set_ie(pframe, _SSID_IE_, 0, NULL, &(pattrib->pktlen)); -+ -+ get_rate_set(padapter, bssrate, &bssrate_len); -+ -+ if (bssrate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen)); -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen)); -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen)); -+ } -+ -+#if 0 -+ //add wps_ie for wps2.0 -+ if(pmlmepriv->probereq_wpsie_len>0 && pmlmepriv->probereq_wpsie_lenprobereq_wpsie, pmlmepriv->probereq_wpsie_len); -+ pframe += pmlmepriv->probereq_wpsie_len; -+ pattrib->pktlen += pmlmepriv->probereq_wpsie_len; -+ //pmlmepriv->probereq_wpsie_len = 0 ;//reset to zero -+ } -+#else -+ //add wps_ie for wps2.0 -+ if(pmlmepriv->wps_probe_req_ie_len>0 && pmlmepriv->wps_probe_req_ie) -+ { -+ _rtw_memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); -+ pframe += pmlmepriv->wps_probe_req_ie_len; -+ pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; -+ //pmlmepriv->wps_probe_req_ie_len = 0 ;//reset to zero -+ } -+#endif -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_notice_,("issuing probe_req, tx_len=%d\n", pattrib->last_txcmdsz)); -+ -+ if (wait_ack) { -+ ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); -+ } else { -+ dump_mgntframe(padapter, pmgntframe); -+ ret = _SUCCESS; -+ } -+ -+exit: -+ return ret; -+} -+ -+inline void issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da) -+{ -+ _issue_probereq(padapter, pssid, da, _FALSE); -+} -+ -+int issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, -+ int try_cnt, int wait_ms) -+{ -+ int ret; -+ int i = 0; -+ u32 start = rtw_get_current_time(); -+ -+ do -+ { -+ ret = _issue_probereq(padapter, pssid, da, wait_ms>0?_TRUE:_FALSE); -+ -+ i++; -+ -+ if (padapter->bDriverStopped || padapter->bSurpriseRemoved) -+ break; -+ -+ if(i < try_cnt && wait_ms > 0 && ret==_FAIL) -+ rtw_msleep_os(wait_ms); -+ -+ }while((ixmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_AUTH); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ -+ if(psta)// for AP mode -+ { -+#ifdef CONFIG_NATIVEAP_MLME -+ -+ _rtw_memcpy(pwlanhdr->addr1, psta->hwaddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ -+ // setting auth algo number -+ val16 = (u16)psta->authalg; -+ -+ if(status != _STATS_SUCCESSFUL_) -+ val16 = 0; -+ -+ if (val16) { -+ val16 = cpu_to_le16(val16); -+ use_shared_key = 1; -+ } -+ -+ pframe = rtw_set_fixed_ie(pframe, _AUTH_ALGM_NUM_, (unsigned char *)&val16, &(pattrib->pktlen)); -+ -+ // setting auth seq number -+ val16 =(u16)psta->auth_seq; -+ val16 = cpu_to_le16(val16); -+ pframe = rtw_set_fixed_ie(pframe, _AUTH_SEQ_NUM_, (unsigned char *)&val16, &(pattrib->pktlen)); -+ -+ // setting status code... -+ val16 = status; -+ val16 = cpu_to_le16(val16); -+ pframe = rtw_set_fixed_ie(pframe, _STATUS_CODE_, (unsigned char *)&val16, &(pattrib->pktlen)); -+ -+ // added challenging text... -+ if ((psta->auth_seq == 2) && (psta->state & WIFI_FW_AUTH_STATE) && (use_shared_key==1)) -+ { -+ pframe = rtw_set_ie(pframe, _CHLGETXT_IE_, 128, psta->chg_txt, &(pattrib->pktlen)); -+ } -+#endif -+ } -+ else -+ { -+ _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&pmlmeinfo->network), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&pmlmeinfo->network), ETH_ALEN); -+ -+ // setting auth algo number -+ val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared)? 1: 0;// 0:OPEN System, 1:Shared key -+ if (val16) { -+ val16 = cpu_to_le16(val16); -+ use_shared_key = 1; -+ } -+ //DBG_871X("%s auth_algo= %s auth_seq=%d\n",__FUNCTION__,(pmlmeinfo->auth_algo==0)?"OPEN":"SHARED",pmlmeinfo->auth_seq); -+ -+ //setting IV for auth seq #3 -+ if ((pmlmeinfo->auth_seq == 3) && (pmlmeinfo->state & WIFI_FW_AUTH_STATE) && (use_shared_key==1)) -+ { -+ //DBG_871X("==> iv(%d),key_index(%d)\n",pmlmeinfo->iv,pmlmeinfo->key_index); -+ val32 = ((pmlmeinfo->iv++) | (pmlmeinfo->key_index << 30)); -+ val32 = cpu_to_le32(val32); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&val32, &(pattrib->pktlen)); -+ -+ pattrib->iv_len = 4; -+ } -+ -+ pframe = rtw_set_fixed_ie(pframe, _AUTH_ALGM_NUM_, (unsigned char *)&val16, &(pattrib->pktlen)); -+ -+ // setting auth seq number -+ val16 = pmlmeinfo->auth_seq; -+ val16 = cpu_to_le16(val16); -+ pframe = rtw_set_fixed_ie(pframe, _AUTH_SEQ_NUM_, (unsigned char *)&val16, &(pattrib->pktlen)); -+ -+ -+ // setting status code... -+ val16 = status; -+ val16 = cpu_to_le16(val16); -+ pframe = rtw_set_fixed_ie(pframe, _STATUS_CODE_, (unsigned char *)&val16, &(pattrib->pktlen)); -+ -+ // then checking to see if sending challenging text... -+ if ((pmlmeinfo->auth_seq == 3) && (pmlmeinfo->state & WIFI_FW_AUTH_STATE) && (use_shared_key==1)) -+ { -+ pframe = rtw_set_ie(pframe, _CHLGETXT_IE_, 128, pmlmeinfo->chg_txt, &(pattrib->pktlen)); -+ -+ SetPrivacy(fctrl); -+ -+ pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pattrib->encrypt = _WEP40_; -+ -+ pattrib->icv_len = 4; -+ -+ pattrib->pktlen += pattrib->icv_len; -+ -+ } -+ -+ } -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ rtw_wep_encrypt(padapter, (u8 *)pmgntframe); -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+} -+ -+ -+void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type) -+{ -+#ifdef CONFIG_AP_MODE -+ struct xmit_frame *pmgntframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ struct pkt_attrib *pattrib; -+ unsigned char *pbuf, *pframe; -+ unsigned short val; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network); -+ u8 *ie = pnetwork->IEs; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+#endif //CONFIG_P2P -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy((void *)GetAddr1Ptr(pwlanhdr), pstat->hwaddr, ETH_ALEN); -+ _rtw_memcpy((void *)GetAddr2Ptr(pwlanhdr), myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy((void *)GetAddr3Ptr(pwlanhdr), get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ if ((pkt_type == WIFI_ASSOCRSP) || (pkt_type == WIFI_REASSOCRSP)) -+ SetFrameSubType(pwlanhdr, pkt_type); -+ else -+ return; -+ -+ pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen += pattrib->hdrlen; -+ pframe += pattrib->hdrlen; -+ -+ //capability -+ val = *(unsigned short *)rtw_get_capability_from_ie(ie); -+ -+ pframe = rtw_set_fixed_ie(pframe, _CAPABILITY_ , (unsigned char *)&val, &(pattrib->pktlen)); -+ -+ status = cpu_to_le16(status); -+ pframe = rtw_set_fixed_ie(pframe , _STATUS_CODE_ , (unsigned char *)&status, &(pattrib->pktlen)); -+ -+ val = cpu_to_le16(pstat->aid | BIT(14) | BIT(15)); -+ pframe = rtw_set_fixed_ie(pframe, _ASOC_ID_ , (unsigned char *)&val, &(pattrib->pktlen)); -+ -+ if (pstat->bssratelen <= 8) -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, pstat->bssrateset, &(pattrib->pktlen)); -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8), pstat->bssrateset+8, &(pattrib->pktlen)); -+ } -+ -+#ifdef CONFIG_80211N_HT -+ if ((pstat->flags & WLAN_STA_HT) && (pmlmepriv->htpriv.ht_option)) -+ { -+ uint ie_len=0; -+ -+ //FILL HT CAP INFO IE -+ //p = hostapd_eid_ht_capabilities_info(hapd, p); -+ pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); -+ if(pbuf && ie_len>0) -+ { -+ _rtw_memcpy(pframe, pbuf, ie_len+2); -+ pframe += (ie_len+2); -+ pattrib->pktlen +=(ie_len+2); -+ } -+ -+ //FILL HT ADD INFO IE -+ //p = hostapd_eid_ht_operation(hapd, p); -+ pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); -+ if(pbuf && ie_len>0) -+ { -+ _rtw_memcpy(pframe, pbuf, ie_len+2); -+ pframe += (ie_len+2); -+ pattrib->pktlen +=(ie_len+2); -+ } -+ -+ } -+#endif -+ -+ //FILL WMM IE -+ if ((pstat->flags & WLAN_STA_WME) && (pmlmepriv->qospriv.qos_option)) -+ { -+ uint ie_len=0; -+ unsigned char WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; -+ -+ for (pbuf = ie + _BEACON_IE_OFFSET_; ;pbuf+= (ie_len + 2)) -+ { -+ pbuf = rtw_get_ie(pbuf, _VENDOR_SPECIFIC_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2))); -+ if(pbuf && _rtw_memcmp(pbuf+2, WMM_PARA_IE, 6)) -+ { -+ _rtw_memcpy(pframe, pbuf, ie_len+2); -+ pframe += (ie_len+2); -+ pattrib->pktlen +=(ie_len+2); -+ -+ break; -+ } -+ -+ if ((pbuf == NULL) || (ie_len == 0)) -+ { -+ break; -+ } -+ } -+ -+ } -+ -+ -+ if (pmlmeinfo->assoc_AP_vendor == realtekAP) -+ { -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen)); -+ } -+ -+ //add WPS IE ie for wps 2.0 -+ if(pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len>0) -+ { -+ _rtw_memcpy(pframe, pmlmepriv->wps_assoc_resp_ie, pmlmepriv->wps_assoc_resp_ie_len); -+ -+ pframe += pmlmepriv->wps_assoc_resp_ie_len; -+ pattrib->pktlen += pmlmepriv->wps_assoc_resp_ie_len; -+ } -+ -+#ifdef CONFIG_P2P -+ if( padapter->wdinfo.driver_interface == DRIVER_WEXT ) -+ { -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) && (pstat->is_p2p_device == _TRUE)) -+ { -+ u32 len; -+ -+ len = build_assoc_resp_p2p_ie(pwdinfo, pframe, pstat->p2p_status_code); -+ -+ pframe += len; -+ pattrib->pktlen += len; -+ } -+ } -+#ifdef CONFIG_WFD -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) -+#ifdef CONFIG_IOCTL_CFG80211 -+ && (_TRUE == pwdinfo->wfd_info->wfd_enable) -+#endif //CONFIG_IOCTL_CFG80211 -+ ) -+ { -+ wfdielen = build_assoc_resp_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+#endif //CONFIG_WFD -+#endif //CONFIG_P2P -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+#endif -+} -+ -+void issue_assocreq(_adapter *padapter) -+{ -+ int ret = _FAIL; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe, *p; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned short val16; -+ unsigned int i, j, ie_len, index=0; -+ unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates]; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ int bssrate_len = 0, sta_bssrate_len = 0; -+ u8 cbw40_enable = 0; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ u8 p2pie[ 255 ] = { 0x00 }; -+ u16 p2pielen = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_DFS -+ u16 cap; -+ u8 pow_cap_ele[2] = { 0x00 }; -+ u8 sup_ch[ 30 * 2 ] = {0x00 }, sup_ch_idx = 0, idx_5g = 2; //For supported channel -+#endif //CONFIG_DFS -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ goto exit; -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ASSOCREQ); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ //caps -+ -+#ifdef CONFIG_DFS -+ _rtw_memcpy(&cap, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); -+ if(pmlmeext->cur_channel > 14) -+ cap |= BIT(8); //Spectrum Mgmt. Enabled -+ _rtw_memcpy(pframe, &cap, 2); -+#else -+ _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); -+#endif //CONFIG_DFS -+ -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ //listen interval -+ //todo: listen interval for power saving -+ val16 = cpu_to_le16(3); -+ _rtw_memcpy(pframe ,(unsigned char *)&val16, 2); -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ //SSID -+ pframe = rtw_set_ie(pframe, _SSID_IE_, pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen)); -+ -+ //supported rate & extended supported rate -+ -+#if 1 // Check if the AP's supported rates are also supported by STA. -+ get_rate_set(padapter, sta_bssrate, &sta_bssrate_len); -+ //DBG_871X("sta_bssrate_len=%d\n", sta_bssrate_len); -+ -+ if(pmlmeext->cur_channel == 14)// for JAPAN, channel 14 can only uses B Mode(CCK) -+ { -+ sta_bssrate_len = 4; -+ } -+ -+ -+ //for (i = 0; i < sta_bssrate_len; i++) { -+ // DBG_871X("sta_bssrate[%d]=%02X\n", i, sta_bssrate[i]); -+ //} -+ -+ for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) { -+ if (pmlmeinfo->network.SupportedRates[i] == 0) break; -+ DBG_871X("network.SupportedRates[%d]=%02X\n", i, pmlmeinfo->network.SupportedRates[i]); -+ } -+ -+ -+ for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) { -+ if (pmlmeinfo->network.SupportedRates[i] == 0) break; -+ -+ -+ // Check if the AP's supported rates are also supported by STA. -+ for (j=0; j < sta_bssrate_len; j++) { -+ // Avoid the proprietary data rate (22Mbps) of Handlink WSG-4000 AP -+ if ( (pmlmeinfo->network.SupportedRates[i]|IEEE80211_BASIC_RATE_MASK) -+ == (sta_bssrate[j]|IEEE80211_BASIC_RATE_MASK)) { -+ //DBG_871X("match i = %d, j=%d\n", i, j); -+ break; -+ } else { -+ //DBG_871X("not match: %02X != %02X\n", (pmlmeinfo->network.SupportedRates[i]|IEEE80211_BASIC_RATE_MASK), (sta_bssrate[j]|IEEE80211_BASIC_RATE_MASK)); -+ } -+ } -+ -+ if (j == sta_bssrate_len) { -+ // the rate is not supported by STA -+ DBG_871X("%s(): the rate[%d]=%02X is not supported by STA!\n",__FUNCTION__, i, pmlmeinfo->network.SupportedRates[i]); -+ } else { -+ // the rate is supported by STA -+ bssrate[index++] = pmlmeinfo->network.SupportedRates[i]; -+ } -+ } -+ -+ bssrate_len = index; -+ DBG_871X("bssrate_len = %d\n", bssrate_len); -+ -+#else // Check if the AP's supported rates are also supported by STA. -+#if 0 -+ get_rate_set(padapter, bssrate, &bssrate_len); -+#else -+ for (bssrate_len = 0; bssrate_len < NumRates; bssrate_len++) { -+ if (pmlmeinfo->network.SupportedRates[bssrate_len] == 0) break; -+ -+ if (pmlmeinfo->network.SupportedRates[bssrate_len] == 0x2C) // Avoid the proprietary data rate (22Mbps) of Handlink WSG-4000 AP -+ break; -+ -+ bssrate[bssrate_len] = pmlmeinfo->network.SupportedRates[bssrate_len]; -+ } -+#endif -+#endif // Check if the AP's supported rates are also supported by STA. -+ -+ if (bssrate_len == 0) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; //don't connect to AP if no joint supported rate -+ } -+ -+ -+ if (bssrate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen)); -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen)); -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen)); -+ } -+ -+#ifdef CONFIG_DFS -+ if(pmlmeext->cur_channel > 14) -+ { -+ pow_cap_ele[0] = 13; // Minimum transmit power capability -+ pow_cap_ele[1] = 21; // Maximum transmit power capability -+ pframe = rtw_set_ie(pframe, _POW_CAP_IE_, 2, pow_cap_ele, &(pattrib->pktlen)); -+ -+ //supported channels -+ do{ -+ if( pmlmeext->channel_set[sup_ch_idx].ChannelNum <= 14 ) -+ { -+ sup_ch[0] = 1; //First channel number -+ sup_ch[1] = pmlmeext->channel_set[sup_ch_idx].ChannelNum; //Number of channel -+ } -+ else -+ { -+ sup_ch[idx_5g++] = pmlmeext->channel_set[sup_ch_idx].ChannelNum; -+ sup_ch[idx_5g++] = 1; -+ } -+ sup_ch_idx++; -+ } -+ while( pmlmeext->channel_set[sup_ch_idx].ChannelNum != 0 ); -+ pframe = rtw_set_ie(pframe, _SUPPORTED_CH_IE_, idx_5g, sup_ch, &(pattrib->pktlen)); -+ } -+#endif //CONFIG_DFS -+ -+ //RSN -+ p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if (p != NULL) -+ { -+ pframe = rtw_set_ie(pframe, _RSN_IE_2_, ie_len, (p + 2), &(pattrib->pktlen)); -+ } -+ -+#ifdef CONFIG_80211N_HT -+ //HT caps -+ if(padapter->mlmepriv.htpriv.ht_option==_TRUE) -+ { -+ p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if ((p != NULL) && (!(is_ap_in_tkip(padapter)))) -+ { -+ _rtw_memcpy(&(pmlmeinfo->HT_caps), (p + 2), sizeof(struct HT_caps_element)); -+ -+ //to disable 40M Hz support while gd_bw_40MHz_en = 0 -+ if( pmlmeext->cur_channel > 14) -+ { -+ if(pregpriv->cbw40_enable & BIT(1) ) -+ cbw40_enable=1; -+ } -+ else -+ if(pregpriv->cbw40_enable & BIT(0) ) -+ cbw40_enable=1; -+ -+ if (cbw40_enable == 0) -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info &= (~(BIT(6) | BIT(1))); -+ } -+ else -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= BIT(1); -+ } -+ -+ //todo: disable SM power save mode -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= 0x000c; -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ //switch (pregpriv->rf_config) -+ switch(rf_type) -+ { -+ case RF_1T1R: -+ -+ if(pregpriv->rx_stbc) -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0100);//RX STBC One spatial stream -+ -+ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); -+ break; -+ -+ case RF_2T2R: -+ case RF_1T2R: -+ default: -+ -+ -+ if(pregpriv->special_rf_path) -+ { -+ if(pregpriv->rx_stbc) -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0100);//RX STBC One spatial stream -+ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); -+ break; -+ } -+ -+ if((pregpriv->rx_stbc == 0x3) ||//enable for 2.4/5 GHz -+ ((pmlmeext->cur_wireless_mode & WIRELESS_11_24N) && (pregpriv->rx_stbc == 0x1)) || //enable for 2.4GHz -+ ((pmlmeext->cur_wireless_mode & WIRELESS_11_5N) && (pregpriv->rx_stbc == 0x2)) || //enable for 5GHz -+ (pregpriv->wifi_spec==1)) -+ { -+ DBG_871X("declare supporting RX STBC\n"); -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0200);//RX STBC two spatial stream -+ } -+ #ifdef CONFIG_DISABLE_MCS13TO15 -+ if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregpriv->wifi_spec!=1)) -+ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R_MCS13TO15_OFF, 16); -+ else -+ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); -+ #else //CONFIG_DISABLE_MCS13TO15 -+ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); -+ #endif //CONFIG_DISABLE_MCS13TO15 -+ break; -+ } -+#ifdef RTL8192C_RECONFIG_TO_1T1R -+ { -+ if(pregpriv->rx_stbc) -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0100);//RX STBC One spatial stream -+ -+ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); -+ } -+#endif -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info = cpu_to_le16(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info); -+ pframe = rtw_set_ie(pframe, _HT_CAPABILITY_IE_, ie_len , (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); -+ -+ } -+ } -+#endif -+ -+ //vendor specific IE, such as WPA, WMM, WPS -+ for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i); -+ -+ switch (pIE->ElementID) -+ { -+ case _VENDOR_SPECIFIC_IE_: -+ if ((_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) || -+ (_rtw_memcmp(pIE->data, WMM_OUI, 4)) || -+ (_rtw_memcmp(pIE->data, WPS_OUI, 4))) -+ { -+ if(!padapter->registrypriv.wifi_spec) -+ { -+ //Commented by Kurt 20110629 -+ //In some older APs, WPS handshake -+ //would be fail if we append vender extensions informations to AP -+ if(_rtw_memcmp(pIE->data, WPS_OUI, 4)){ -+ pIE->Length=14; -+ } -+ } -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, pIE->Length, pIE->data, &(pattrib->pktlen)); -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+ -+ if (pmlmeinfo->assoc_AP_vendor == realtekAP) -+ { -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen)); -+ } -+ -+#ifdef CONFIG_P2P -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(pmlmepriv->p2p_assoc_req_ie && pmlmepriv->p2p_assoc_req_ie_len>0) -+ { -+ _rtw_memcpy(pframe, pmlmepriv->p2p_assoc_req_ie, pmlmepriv->p2p_assoc_req_ie_len); -+ pframe += pmlmepriv->p2p_assoc_req_ie_len; -+ pattrib->pktlen += pmlmepriv->p2p_assoc_req_ie_len; -+ } -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) && !rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) -+ { -+ // Should add the P2P IE in the association request frame. -+ // P2P OUI -+ -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20101109 -+ // According to the P2P Specification, the association request frame should contain 3 P2P attributes -+ // 1. P2P Capability -+ // 2. Extended Listen Timing -+ // 3. Device Info -+ // Commented by Albert 20110516 -+ // 4. P2P Interface -+ -+ // P2P Capability -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_PERSISTENT_GROUP | DMP_P2P_GRPCAP_SUPPORT; -+ else -+ p2pie[ p2pielen++ ] = DMP_P2P_GRPCAP_SUPPORT; -+ -+ // Extended Listen Timing -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_EX_LISTEN_TIMING; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0004 ); -+ p2pielen += 2; -+ -+ // Value: -+ // Availability Period -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ p2pielen += 2; -+ -+ // Availability Interval -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ p2pielen += 2; -+ -+ // Device Info -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address -+ _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Config Method -+ // This field should be big endian. Noted by P2P specification. -+ if ( ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_PEER_DISPLAY_PIN ) || -+ ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_SELF_DISPLAY_PIN ) ) -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_CONFIG_METHOD_DISPLAY ); -+ } -+ else -+ { -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_CONFIG_METHOD_PBC ); -+ } -+ -+ p2pielen += 2; -+ -+ // Primary Device Type -+ // Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ p2pielen += 2; -+ -+ // OUI -+ *(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ p2pielen += 2; -+ -+ // Number of Secondary Device Types -+ p2pie[ p2pielen++ ] = 0x00; // No Secondary Device Type List -+ -+ // Device Name -+ // Type: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ p2pielen += 2; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len ); -+ p2pielen += pwdinfo->device_name_len; -+ -+ // P2P Interface -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_INTERFACE; -+ -+ // Length: -+ *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x000D ); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); // P2P Device Address -+ p2pielen += ETH_ALEN; -+ -+ p2pie[ p2pielen++ ] = 1; // P2P Interface Address Count -+ -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); // P2P Interface Address List -+ p2pielen += ETH_ALEN; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ //wfdielen = build_assoc_req_wfd_ie(pwdinfo, pframe); -+ //pframe += wfdielen; -+ //pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ } -+ } -+ -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_WFD -+#ifdef CONFIG_IOCTL_CFG80211 -+ if ( _TRUE == pwdinfo->wfd_info->wfd_enable ) -+#endif //CONFIG_IOCTL_CFG80211 -+ { -+ wfdielen = build_assoc_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+#ifdef CONFIG_IOCTL_CFG80211 -+ else if (pmlmepriv->wfd_assoc_req_ie != NULL && pmlmepriv->wfd_assoc_req_ie_len>0) -+ { -+ //WFD IE -+ _rtw_memcpy(pframe, pmlmepriv->wfd_assoc_req_ie, pmlmepriv->wfd_assoc_req_ie_len); -+ pattrib->pktlen += pmlmepriv->wfd_assoc_req_ie_len; -+ pframe += pmlmepriv->wfd_assoc_req_ie_len; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ dump_mgntframe(padapter, pmgntframe); -+ -+ ret = _SUCCESS; -+ -+exit: -+ if (ret == _SUCCESS) -+ rtw_buf_update(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len, (u8 *)pwlanhdr, pattrib->pktlen); -+ else -+ rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len); -+ -+ return; -+} -+ -+//when wait_ack is ture, this function shoule be called at process context -+static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack) -+{ -+ int ret = _FAIL; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv; -+ struct mlme_ext_priv *pmlmeext; -+ struct mlme_ext_info *pmlmeinfo; -+ -+ //DBG_871X("%s:%d\n", __FUNCTION__, power_mode); -+ -+ if(!padapter) -+ goto exit; -+ -+ pxmitpriv = &(padapter->xmitpriv); -+ pmlmeext = &(padapter->mlmeextpriv); -+ pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ goto exit; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ pattrib->retry_ctrl = _FALSE; -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) -+ { -+ SetFrDs(fctrl); -+ } -+ else if((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) -+ { -+ SetToDs(fctrl); -+ } -+ -+ if (power_mode) -+ { -+ SetPwrMgt(fctrl); -+ } -+ -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_DATA_NULL); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ if(wait_ack) -+ { -+ ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); -+ } -+ else -+ { -+ dump_mgntframe(padapter, pmgntframe); -+ ret = _SUCCESS; -+ } -+ -+exit: -+ return ret; -+} -+ -+ -+//when wait_ms >0 , this function shoule be called at process context -+//da == NULL for station mode -+int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms) -+{ -+ int ret; -+ int i = 0; -+ u32 start = rtw_get_current_time(); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ /* da == NULL, assum it's null data for sta to ap*/ -+ if (da == NULL) -+ da = get_my_bssid(&(pmlmeinfo->network)); -+ -+ do -+ { -+ ret = _issue_nulldata(padapter, da, power_mode, wait_ms>0?_TRUE:_FALSE); -+ -+ i++; -+ -+ if (padapter->bDriverStopped || padapter->bSurpriseRemoved) -+ break; -+ -+ if(i < try_cnt && wait_ms > 0 && ret==_FAIL) -+ rtw_msleep_os(wait_ms); -+ -+ }while((ixmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ goto exit; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ pattrib->hdrlen +=2; -+ pattrib->qos_en = _TRUE; -+ pattrib->eosp = 1; -+ pattrib->ack_policy = 0; -+ pattrib->mdata = 0; -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) -+ { -+ SetFrDs(fctrl); -+ } -+ else if((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) -+ { -+ SetToDs(fctrl); -+ } -+ -+ if(pattrib->mdata) -+ SetMData(fctrl); -+ -+ qc = (unsigned short *)(pframe + pattrib->hdrlen - 2); -+ -+ SetPriority(qc, tid); -+ -+ SetEOSP(qc, pattrib->eosp); -+ -+ SetAckpolicy(qc, pattrib->ack_policy); -+ -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_QOS_DATA_NULL); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr_qos); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos); -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ if(wait_ack) -+ { -+ ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); -+ } -+ else -+ { -+ dump_mgntframe(padapter, pmgntframe); -+ ret = _SUCCESS; -+ } -+ -+exit: -+ return ret; -+} -+ -+//when wait_ms >0 , this function shoule be called at process context -+//da == NULL for station mode -+int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms) -+{ -+ int ret; -+ int i = 0; -+ u32 start = rtw_get_current_time(); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ /* da == NULL, assum it's null data for sta to ap*/ -+ if (da == NULL) -+ da = get_my_bssid(&(pmlmeinfo->network)); -+ -+ do -+ { -+ ret = _issue_qos_nulldata(padapter, da, tid, wait_ms>0?_TRUE:_FALSE); -+ -+ i++; -+ -+ if (padapter->bDriverStopped || padapter->bSurpriseRemoved) -+ break; -+ -+ if(i < try_cnt && wait_ms > 0 && ret==_FAIL) -+ rtw_msleep_os(wait_ms); -+ -+ }while((ixmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ int ret = _FAIL; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ -+ //DBG_871X("%s to "MAC_FMT"\n", __func__, MAC_ARG(da)); -+ -+#ifdef CONFIG_P2P -+ if ( !( rtw_p2p_chk_state( pwdinfo, P2P_STATE_NONE ) ) && ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) ) -+ { -+ _cancel_timer_ex( &pwdinfo->reset_ch_sitesurvey ); -+ _set_timer( &pwdinfo->reset_ch_sitesurvey, 10 ); -+ } -+#endif //CONFIG_P2P -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ goto exit; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ pattrib->retry_ctrl = _FALSE; -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_DEAUTH); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ reason = cpu_to_le16(reason); -+ pframe = rtw_set_fixed_ie(pframe, _RSON_CODE_ , (unsigned char *)&reason, &(pattrib->pktlen)); -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ -+ if(wait_ack) -+ { -+ ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); -+ } -+ else -+ { -+ dump_mgntframe(padapter, pmgntframe); -+ ret = _SUCCESS; -+ } -+ -+exit: -+ return ret; -+} -+ -+int issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason) -+{ -+ DBG_871X("%s to "MAC_FMT"\n", __func__, MAC_ARG(da)); -+ return _issue_deauth(padapter, da, reason, _FALSE); -+} -+ -+int issue_deauth_ex(_adapter *padapter, u8 *da, unsigned short reason, int try_cnt, -+ int wait_ms) -+{ -+ int ret; -+ int i = 0; -+ u32 start = rtw_get_current_time(); -+ -+ do -+ { -+ ret = _issue_deauth(padapter, da, reason, wait_ms>0?_TRUE:_FALSE); -+ -+ i++; -+ -+ if (padapter->bDriverStopped || padapter->bSurpriseRemoved) -+ break; -+ -+ if(i < try_cnt && wait_ms > 0 && ret==_FAIL) -+ rtw_msleep_os(wait_ms); -+ -+ }while((ixmitpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ -+ DBG_871X(FUNC_NDEV_FMT" ra="MAC_FMT", ch:%u, offset:%u\n", -+ FUNC_NDEV_ARG(padapter->pnetdev), MAC_ARG(ra), new_ch, ch_offset); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ return; -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, ra, ETH_ALEN); /* RA */ -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); /* TA */ -+ _rtw_memcpy(pwlanhdr->addr3, ra, ETH_ALEN); /* DA = RA */ -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ /* category, action */ -+ { -+ u8 category, action; -+ category = RTW_WLAN_CATEGORY_SPECTRUM_MGMT; -+ action = RTW_WLAN_ACTION_SPCT_CHL_SWITCH; -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ } -+ -+ pframe = rtw_set_ie_ch_switch(pframe, &(pattrib->pktlen), 0, new_ch, 0); -+ pframe = rtw_set_ie_secondary_ch_offset(pframe, &(pattrib->pktlen), -+ hal_ch_offset_to_secondary_ch_offset(ch_offset)); -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+} -+ -+#ifdef CONFIG_IEEE80211W -+void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid) -+{ -+ u8 category = RTW_WLAN_CATEGORY_SA_QUERY; -+ u16 reason_code; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ u8 *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u16 *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ DBG_871X("%s: alloc_mgtxmitframe fail\n", __FUNCTION__); -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ if(raddr) -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ else -+ _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen); -+ pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen); -+ -+ switch (action) -+ { -+ case 0: //SA Query req -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)&pmlmeext->sa_query_seq, &pattrib->pktlen); -+ pmlmeext->sa_query_seq++; -+ //send sa query request to AP, AP should reply sa query response in 1 second -+ set_sa_query_timer(pmlmeext, 1000); -+ break; -+ -+ case 1: //SA Query rsp -+ tid = cpu_to_le16(tid); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)&tid, &pattrib->pktlen); -+ break; -+ default: -+ break; -+ } -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+} -+#endif //CONFIG_IEEE80211W -+ -+void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status) -+{ -+ u8 category = RTW_WLAN_CATEGORY_BACK; -+ u16 start_seq; -+ u16 BA_para_set; -+ u16 reason_code; -+ u16 BA_timeout_value; -+ u16 BA_starting_seqctrl; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ u8 *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u16 *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ -+ -+ DBG_871X("%s, category=%d, action=%d, status=%d\n", __FUNCTION__, category, action, status); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ //_rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ -+ status = cpu_to_le16(status); -+ -+ -+ if (category == 3) -+ { -+ switch (action) -+ { -+ case 0: //ADDBA req -+ do { -+ pmlmeinfo->dialogToken++; -+ } while (pmlmeinfo->dialogToken == 0); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->dialogToken), &(pattrib->pktlen)); -+ -+ BA_para_set = (0x1002 | ((status & 0xf) << 2)); //immediate ack & 64 buffer size -+ //sys_mib.BA_para_set = 0x0802; //immediate ack & 32 buffer size -+ BA_para_set = cpu_to_le16(BA_para_set); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_para_set)), &(pattrib->pktlen)); -+ -+ //BA_timeout_value = 0xffff;//max: 65535 TUs(~ 65 ms) -+ BA_timeout_value = 5000;//~ 5ms -+ BA_timeout_value = cpu_to_le16(BA_timeout_value); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_timeout_value)), &(pattrib->pktlen)); -+ -+ //if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) -+ if ((psta = rtw_get_stainfo(pstapriv, raddr)) != NULL) -+ { -+ start_seq = (psta->sta_xmitpriv.txseq_tid[status & 0x07]&0xfff) + 1; -+ -+ DBG_871X("BA_starting_seqctrl = %d for TID=%d\n", start_seq, status & 0x07); -+ -+ psta->BA_starting_seqctrl[status & 0x07] = start_seq; -+ -+ BA_starting_seqctrl = start_seq << 4; -+ } -+ -+ BA_starting_seqctrl = cpu_to_le16(BA_starting_seqctrl); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_starting_seqctrl)), &(pattrib->pktlen)); -+ break; -+ -+ case 1: //ADDBA rsp -+ pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->ADDBA_req.dialog_token), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&status), &(pattrib->pktlen)); -+ -+ //BA_para_set = cpu_to_le16((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); //64 buffer size -+ BA_para_set = ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); //64 buffer size -+ -+ if(pregpriv->ampdu_amsdu==0)//disabled -+ BA_para_set = cpu_to_le16(BA_para_set & ~BIT(0)); -+ else if(pregpriv->ampdu_amsdu==1)//enabled -+ BA_para_set = cpu_to_le16(BA_para_set | BIT(0)); -+ else //auto -+ BA_para_set = cpu_to_le16(BA_para_set); -+ -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_para_set)), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(pmlmeinfo->ADDBA_req.BA_timeout_value)), &(pattrib->pktlen)); -+ break; -+ case 2://DELBA -+ BA_para_set = (status & 0x1F) << 3; -+ BA_para_set = cpu_to_le16(BA_para_set); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_para_set)), &(pattrib->pktlen)); -+ -+ reason_code = 37;//Requested from peer STA as it does not want to use the mechanism -+ reason_code = cpu_to_le16(reason_code); -+ pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(reason_code)), &(pattrib->pktlen)); -+ break; -+ default: -+ break; -+ } -+ } -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+} -+ -+static void issue_action_BSSCoexistPacket(_adapter *padapter) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ unsigned char category, action; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct wlan_network *pnetwork = NULL; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ u8 InfoContent[16] = {0}; -+ u8 ICS[8][15]; -+ -+ if((pmlmepriv->num_FortyMHzIntolerant==0) || (pmlmepriv->num_sta_no_ht==0)) -+ return; -+ -+ if(_TRUE == pmlmeinfo->bwmode_updated) -+ return; -+ -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ -+ category = RTW_WLAN_CATEGORY_PUBLIC; -+ action = ACT_PUBLIC_BSSCOEXIST; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ -+ -+ // -+ if(pmlmepriv->num_FortyMHzIntolerant>0) -+ { -+ u8 iedata=0; -+ -+ iedata |= BIT(2);//20 MHz BSS Width Request -+ -+ pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen)); -+ -+ } -+ -+ -+ // -+ _rtw_memset(ICS, 0, sizeof(ICS)); -+ if(pmlmepriv->num_sta_no_ht>0) -+ { -+ int i; -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ int len; -+ u8 *p; -+ WLAN_BSSID_EX *pbss_network; -+ -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ plist = get_next(plist); -+ -+ pbss_network = (WLAN_BSSID_EX *)&pnetwork->network; -+ -+ p = rtw_get_ie(pbss_network->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pbss_network->IELength - _FIXED_IE_LENGTH_); -+ if((p==NULL) || (len==0))//non-HT -+ { -+ if((pbss_network->Configuration.DSConfig<=0) || (pbss_network->Configuration.DSConfig>14)) -+ continue; -+ -+ ICS[0][pbss_network->Configuration.DSConfig]=1; -+ -+ if(ICS[0][0] == 0) -+ ICS[0][0] = 1; -+ } -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ -+ for(i= 0;i<8;i++) -+ { -+ if(ICS[i][0] == 1) -+ { -+ int j, k = 0; -+ -+ InfoContent[k] = i; -+ //SET_BSS_INTOLERANT_ELE_REG_CLASS(InfoContent,i); -+ k++; -+ -+ for(j=1;j<=14;j++) -+ { -+ if(ICS[i][j]==1) -+ { -+ if(k<16) -+ { -+ InfoContent[k] = j; //channel number -+ //SET_BSS_INTOLERANT_ELE_CHANNEL(InfoContent+k, j); -+ k++; -+ } -+ } -+ } -+ -+ pframe = rtw_set_ie(pframe, EID_BSSIntolerantChlReport, k, InfoContent, &(pattrib->pktlen)); -+ -+ } -+ -+ } -+ -+ -+ } -+ -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+} -+ -+unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr) -+{ -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta = NULL; -+ //struct recv_reorder_ctrl *preorder_ctrl; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u16 tid; -+ -+ if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) -+ if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) -+ return _SUCCESS; -+ -+ psta = rtw_get_stainfo(pstapriv, addr); -+ if(psta==NULL) -+ return _SUCCESS; -+ -+ //DBG_871X("%s:%s\n", __FUNCTION__, (initiator==0)?"RX_DIR":"TX_DIR"); -+ -+ if(initiator==0) // recipient -+ { -+ for(tid = 0;tidrecvreorder_ctrl[tid].enable == _TRUE) -+ { -+ DBG_871X("rx agg disable tid(%d)\n",tid); -+ issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid <<1) |initiator)&0x1F)); -+ psta->recvreorder_ctrl[tid].enable = _FALSE; -+ psta->recvreorder_ctrl[tid].indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, -+ psta->recvreorder_ctrl[tid].indicate_seq); -+ #endif -+ } -+ } -+ } -+ else if(initiator == 1)// originator -+ { -+ //DBG_871X("tx agg_enable_bitmap(0x%08x)\n", psta->htpriv.agg_enable_bitmap); -+ for(tid = 0;tidhtpriv.agg_enable_bitmap & BIT(tid)) -+ { -+ DBG_871X("tx agg disable tid(%d)\n",tid); -+ issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid <<1) |initiator)&0x1F) ); -+ psta->htpriv.agg_enable_bitmap &= ~BIT(tid); -+ psta->htpriv.candidate_tid_bitmap &= ~BIT(tid); -+ -+ } -+ } -+ } -+ -+ return _SUCCESS; -+ -+} -+ -+unsigned int send_beacon(_adapter *padapter) -+{ -+ u8 bxmitok = _FALSE; -+ int issue=0; -+ int poll = 0; -+//#ifdef CONFIG_CONCURRENT_MODE -+ //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ //_adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ //struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+//#endif -+ -+#ifdef CONFIG_PCI_HCI -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ issue_beacon(padapter); -+ -+ return _SUCCESS; -+ -+#endif -+ -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -+ u32 start = rtw_get_current_time(); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL); -+ do{ -+ issue_beacon(padapter); -+ issue++; -+ do { -+ rtw_yield_os(); -+ rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok)); -+ poll++; -+ }while((poll%10)!=0 && _FALSE == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); -+ -+ }while(_FALSE == bxmitok && issue<100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); -+ -+ if(padapter->bSurpriseRemoved || padapter->bDriverStopped) -+ { -+ return _FAIL; -+ } -+ if(_FALSE == bxmitok) -+ { -+ DBG_871X("%s fail! %u ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); -+ return _FAIL; -+ } -+ else -+ { -+ u32 passing_time = rtw_get_passing_time_ms(start); -+ -+ if(passing_time > 100 || issue > 3) -+ DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __FUNCTION__, issue, poll, rtw_get_passing_time_ms(start)); -+ //else -+ // DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __FUNCTION__, issue, poll, rtw_get_passing_time_ms(start)); -+ -+ return _SUCCESS; -+ } -+ -+#endif -+ -+} -+ -+/**************************************************************************** -+ -+Following are some utitity fuctions for WiFi MLME -+ -+*****************************************************************************/ -+ -+BOOLEAN IsLegal5GChannel( -+ IN PADAPTER Adapter, -+ IN u8 channel) -+{ -+ -+ int i=0; -+ u8 Channel_5G[45] = {36,38,40,42,44,46,48,50,52,54,56,58, -+ 60,62,64,100,102,104,106,108,110,112,114,116,118,120,122, -+ 124,126,128,130,132,134,136,138,140,149,151,153,155,157,159, -+ 161,163,165}; -+ for(i=0;imlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u32 initialgain = 0; -+ u8 restore_initial_gain = 1; -+ -+#ifdef CONFIG_P2P -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ u8 stay_buddy_ch = 0; -+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+#endif //CONFIG_CONCURRENT_MODE -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ static unsigned char prev_survey_channel = 0; -+ static unsigned int p2p_scan_count = 0; -+ -+ -+ if ( ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) || ( pwdinfo->p2p_info.scan_op_ch_only ) ) -+ { -+ if ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) -+ { -+ survey_channel = pwdinfo->rx_invitereq_info.operation_ch[pmlmeext->sitesurvey_res.channel_idx]; -+ } -+ else -+ { -+ survey_channel = pwdinfo->p2p_info.operation_ch[pmlmeext->sitesurvey_res.channel_idx]; -+ } -+ ScanType = SCAN_ACTIVE; -+ } -+ else if(rtw_p2p_findphase_ex_is_social(pwdinfo)) -+ { -+ // Commented by Albert 2011/06/03 -+ // The driver is in the find phase, it should go through the social channel. -+ int ch_set_idx; -+ survey_channel = pwdinfo->social_chan[pmlmeext->sitesurvey_res.channel_idx]; -+ ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, survey_channel); -+ if (ch_set_idx >= 0) -+ ScanType = pmlmeext->channel_set[ch_set_idx].ScanType; -+ else -+ ScanType = SCAN_ACTIVE; -+ } -+ else -+#endif //CONFIG_P2P -+ { -+ struct rtw_ieee80211_channel *ch; -+ if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) { -+ ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx]; -+ survey_channel = ch->hw_value; -+ ScanType = (ch->flags & RTW_IEEE80211_CHAN_PASSIVE_SCAN) ? SCAN_PASSIVE : SCAN_ACTIVE; -+ } -+ } -+ -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" ch:%u(cnt:%u,idx:%d) at %dms, %c%c%c\n" -+ , FUNC_ADPT_ARG(padapter) -+ , survey_channel -+ , pwdinfo->find_phase_state_exchange_cnt, pmlmeext->sitesurvey_res.channel_idx -+ , rtw_get_passing_time_ms(padapter->mlmepriv.scan_start_time) -+ , ScanType?'A':'P', pmlmeext->sitesurvey_res.scan_mode?'A':'P' -+ , pmlmeext->sitesurvey_res.ssid[0].SsidLength?'S':' ' -+ ); -+ -+ if(survey_channel != 0) -+ { -+ //PAUSE 4-AC Queue when site_survey -+ //rtw_hal_get_hwreg(padapter, HW_VAR_TXPAUSE, (u8 *)(&val8)); -+ //val8 |= 0x0f; -+ //rtw_hal_set_hwreg(padapter, HW_VAR_TXPAUSE, (u8 *)(&val8)); -+#ifdef CONFIG_CONCURRENT_MODE -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ if((padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state&0x03) == WIFI_FW_AP_STATE) -+ { -+ if( pmlmeinfo->scan_cnt == RTW_SCAN_NUM_OF_CH ) -+ { -+ pmlmeinfo->scan_cnt = 0; -+ survey_channel = pbuddy_mlmeext->cur_channel; -+ stay_buddy_ch = 1; -+ } -+ else -+ { -+ if( pmlmeinfo->scan_cnt == 0 ) -+ stay_buddy_ch = 2; -+ pmlmeinfo->scan_cnt++; -+ } -+ } -+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+#endif //CONFIG_CONCURRENT_MODE -+ if(pmlmeext->sitesurvey_res.channel_idx == 0) -+ { -+ set_channel_bwmode(padapter, survey_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ else -+ { -+ SelectChannel(padapter, survey_channel); -+ } -+ -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ if( stay_buddy_ch == 1 ) -+ { -+ val8 = 0; //survey done -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ -+ if(check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(padapter, _FW_LINKED)) -+ { -+ update_beacon(padapter->pbuddy_adapter, 0, NULL, _TRUE); -+ } -+ } -+ else if( stay_buddy_ch == 2 ) -+ { -+ val8 = 1; //under site survey -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ } -+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ -+ if(ScanType == SCAN_ACTIVE) //obey the channel plan setting... -+ { -+ #ifdef CONFIG_P2P -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) || -+ rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH) -+ ) -+ { -+ issue_probereq_p2p(padapter, NULL); -+ issue_probereq_p2p(padapter, NULL); -+ issue_probereq_p2p(padapter, NULL); -+ } -+ else -+ #endif //CONFIG_P2P -+ { -+ int i; -+ for(i=0;isitesurvey_res.ssid[i].SsidLength) { -+ //todo: to issue two probe req??? -+ issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); -+ //rtw_msleep_os(SURVEY_TO>>1); -+ issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); -+ } else { -+ break; -+ } -+ } -+ -+ if(pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) { -+ //todo: to issue two probe req??? -+ issue_probereq(padapter, NULL, NULL); -+ //rtw_msleep_os(SURVEY_TO>>1); -+ issue_probereq(padapter, NULL, NULL); -+ } -+ } -+ } -+ -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ if( stay_buddy_ch == 1 ) -+ set_survey_timer(pmlmeext, pmlmeext->chan_scan_time * RTW_STAY_AP_CH_MILLISECOND ); -+ else -+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ set_survey_timer(pmlmeext, pmlmeext->chan_scan_time); -+ -+ } -+ else -+ { -+ -+ // channel number is 0 or this channel is not valid. -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ u8 cur_channel; -+ u8 cur_bwmode; -+ u8 cur_ch_offset; -+ -+ if (rtw_get_ch_setting_union(padapter, &cur_channel, &cur_bwmode, &cur_ch_offset) != 0) -+ { -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" back to linked union - ch:%u, bw:%u, offset:%u\n", -+ FUNC_ADPT_ARG(padapter), cur_channel, cur_bwmode, cur_ch_offset); -+ } -+ #ifdef CONFIG_IOCTL_CFG80211 -+ else if(padapter->pbuddy_adapter -+ && pbuddy_adapter->wdinfo.driver_interface == DRIVER_CFG80211 -+ && wdev_to_priv(pbuddy_adapter->rtw_wdev)->p2p_enabled -+ && rtw_p2p_chk_state(&pbuddy_adapter->wdinfo, P2P_STATE_LISTEN) -+ ) -+ { -+ cur_channel = pbuddy_adapter->wdinfo.listen_channel; -+ cur_bwmode = pbuddy_mlmeext->cur_bwmode; -+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ } -+ #endif -+ else -+ { -+ cur_channel = pmlmeext->cur_channel; -+ cur_bwmode = pmlmeext->cur_bwmode; -+ cur_ch_offset = pmlmeext->cur_ch_offset; -+ } -+#endif -+ -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH)) -+ { -+ if( ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) || ( pwdinfo->p2p_info.scan_op_ch_only ) ) -+ { -+ // Set the find_phase_state_exchange_cnt to P2P_FINDPHASE_EX_CNT. -+ // This will let the following flow to run the scanning end. -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_MAX); -+ } -+ #ifdef CONFIG_DBG_P2P -+ DBG_871X( "[%s] find phase exchange cnt = %d\n", __FUNCTION__, pwdinfo->find_phase_state_exchange_cnt ); -+ #endif -+ } -+ -+ if(rtw_p2p_findphase_ex_is_needed(pwdinfo)) -+ { -+ // Set the P2P State to the listen state of find phase and set the current channel to the listen channel -+ set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_LISTEN); -+ pmlmeext->sitesurvey_res.state = SCAN_DISABLE; -+ -+ //turn on dynamic functions -+ Restore_DM_Func_Flag(padapter); -+ //Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE); -+ -+ _set_timer( &pwdinfo->find_phase_timer, ( u32 ) ( ( u32 ) ( pwdinfo->listen_dwell ) * 100 ) ); -+ } -+ else -+#endif //CONFIG_P2P -+ { -+ -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ pmlmeinfo->scan_cnt = 0; -+#endif //CONFIG_DMP_STA_NODE_SCAN_UNDER_AP_MODE -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ // 20100721:Interrupt scan operation here. -+ // For SW antenna diversity before link, it needs to switch to another antenna and scan again. -+ // It compares the scan result and select beter one to do connection. -+ if(rtw_hal_antdiv_before_linked(padapter)) -+ { -+ pmlmeext->sitesurvey_res.bss_cnt = 0; -+ pmlmeext->sitesurvey_res.channel_idx = -1; -+ pmlmeext->chan_scan_time = SURVEY_TO /2; -+ set_survey_timer(pmlmeext, pmlmeext->chan_scan_time); -+ return; -+ } -+#endif -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH)) -+ { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if( pwdinfo->driver_interface == DRIVER_WEXT ) -+ { -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _set_timer( &pwdinfo->ap_p2p_switch_timer, 500 ); -+ } -+ } -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ #else -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ #endif -+ } -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); -+#endif //CONFIG_P2P -+ -+ pmlmeext->sitesurvey_res.state = SCAN_COMPLETE; -+ -+ //switch back to the original channel -+ //SelectChannel(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset); -+ -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+#else -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_set_channel_bwmode_survey_done(padapter); -+#else -+ if( pwdinfo->driver_interface == DRIVER_WEXT ) -+ { -+ if( rtw_p2p_chk_state(pwdinfo, P2P_STATE_LISTEN) ) -+ { -+ set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ else -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+ else if( pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+#endif //CONFIG_DUALMAC_CONCURRENT -+#endif //CONFIG_CONCURRENT_MODE -+ } -+ -+ //flush 4-AC Queue after site_survey -+ //val8 = 0; -+ //rtw_hal_set_hwreg(padapter, HW_VAR_TXPAUSE, (u8 *)(&val8)); -+ -+ val8 = 0; //survey done -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ -+ //config MSR -+ Set_MSR(padapter, (pmlmeinfo->state & 0x3)); -+ -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if((wdev_to_priv(padapter->rtw_wdev))->p2p_enabled == _TRUE) -+ { -+ restore_initial_gain = 0; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ if(restore_initial_gain == 1) -+ { -+ initialgain = 0xff; //restore RX GAIN -+ rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); -+ } -+ -+ //turn on dynamic functions -+ Restore_DM_Func_Flag(padapter); -+ //Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE); -+ -+ if (is_client_associated_to_ap(padapter) == _TRUE) -+ { -+ issue_nulldata(padapter, NULL, 0, 3, 500); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) -+ { -+ DBG_871X("adapter is surveydone(buddy_adapter is linked), issue nulldata(pwrbit=0)\n"); -+ -+ issue_nulldata(padapter->pbuddy_adapter, NULL, 0, 3, 500); -+ } -+#endif -+ } -+#ifdef CONFIG_CONCURRENT_MODE -+ else if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) -+ { -+ issue_nulldata(padapter->pbuddy_adapter, NULL, 0, 3, 500); -+ } -+#endif -+ -+ report_surveydone_event(padapter); -+ -+ pmlmeext->chan_scan_time = SURVEY_TO; -+ pmlmeext->sitesurvey_res.state = SCAN_DISABLE; -+ -+ issue_action_BSSCoexistPacket(padapter); -+ issue_action_BSSCoexistPacket(padapter); -+ issue_action_BSSCoexistPacket(padapter); -+ -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(padapter, _FW_LINKED)) -+ { -+ -+ DBG_871X("survey done, current CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); -+ -+ DBG_871X("restart pbuddy_adapter's beacon\n"); -+ -+ update_beacon(padapter->pbuddy_adapter, 0, NULL, _TRUE); -+ } -+#endif -+ -+ } -+ -+ return; -+ -+} -+ -+//collect bss info from Beacon and Probe response frames. -+u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid) -+{ -+ int i; -+ u32 len; -+ u8 *p; -+ u16 val16, subtype; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ u32 packet_len = precv_frame->u.hdr.len; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ if (len > MAX_IE_SZ) -+ { -+ //DBG_871X("IE too long for survey event\n"); -+ return _FAIL; -+ } -+ -+ _rtw_memset(bssid, 0, sizeof(WLAN_BSSID_EX)); -+ -+ subtype = GetFrameSubType(pframe); -+ -+ if(subtype==WIFI_BEACON) -+ bssid->Reserved[0] = 1; -+ else -+ bssid->Reserved[0] = 0; -+ -+ bssid->Length = sizeof(WLAN_BSSID_EX) - MAX_IE_SZ + len; -+ -+ //below is to copy the information element -+ bssid->IELength = len; -+ _rtw_memcpy(bssid->IEs, (pframe + sizeof(struct rtw_ieee80211_hdr_3addr)), bssid->IELength); -+ -+ //get the signal strength -+ bssid->PhyInfo.SignalQuality = precv_frame->u.hdr.attrib.signal_qual;//in percentage -+ bssid->PhyInfo.SignalStrength = precv_frame->u.hdr.attrib.signal_strength;//in percentage -+ bssid->Rssi = precv_frame->u.hdr.attrib.RecvSignalPower; // in dBM.raw data -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ //rtw_hal_get_hwreg(padapter, HW_VAR_CURRENT_ANTENNA, (u8 *)(&bssid->PhyInfo.Optimum_antenna)); -+ rtw_hal_get_def_var(padapter, HAL_DEF_CURRENT_ANTENNA, &bssid->PhyInfo.Optimum_antenna); -+#endif -+ -+ // checking SSID -+ if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) -+ { -+ DBG_871X("marc: cannot find SSID for survey event\n"); -+ return _FAIL; -+ } -+ -+ if (*(p + 1)) -+ { -+ if (len > NDIS_802_11_LENGTH_SSID) -+ { -+ DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); -+ return _FAIL; -+ } -+ _rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1)); -+ bssid->Ssid.SsidLength = *(p + 1); -+ } -+ else -+ { -+ bssid->Ssid.SsidLength = 0; -+ } -+ -+ _rtw_memset(bssid->SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX); -+ -+ //checking rate info... -+ i = 0; -+ p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SUPPORTEDRATES_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); -+ if (p != NULL) -+ { -+ if (len > NDIS_802_11_LENGTH_RATES_EX) -+ { -+ DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); -+ return _FAIL; -+ } -+ _rtw_memcpy(bssid->SupportedRates, (p + 2), len); -+ i = len; -+ } -+ -+ p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _EXT_SUPPORTEDRATES_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); -+ if (p != NULL) -+ { -+ if (len > (NDIS_802_11_LENGTH_RATES_EX-i)) -+ { -+ DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); -+ return _FAIL; -+ } -+ _rtw_memcpy(bssid->SupportedRates + i, (p + 2), len); -+ } -+ -+ //todo: -+#if 0 -+ if (judge_network_type(bssid->SupportedRates, (len + i)) == WIRELESS_11B) -+ { -+ bssid->NetworkTypeInUse = Ndis802_11DS; -+ } -+ else -+#endif -+ { -+ bssid->NetworkTypeInUse = Ndis802_11OFDM24; -+ } -+ -+ if (bssid->IELength < 12) -+ return _FAIL; -+ -+ // Checking for DSConfig -+ p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _DSSET_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); -+ -+ bssid->Configuration.DSConfig = 0; -+ bssid->Configuration.Length = 0; -+ -+ if (p) -+ { -+ bssid->Configuration.DSConfig = *(p + 2); -+ } -+ else -+ {// In 5G, some ap do not have DSSET IE -+ // checking HT info for channel -+ p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); -+ if(p) -+ { -+ struct HT_info_element *HT_info = (struct HT_info_element *)(p + 2); -+ bssid->Configuration.DSConfig = HT_info->primary_channel; -+ } -+ else -+ { // use current channel -+ bssid->Configuration.DSConfig = rtw_get_oper_ch(padapter); -+ } -+ } -+ -+ _rtw_memcpy(&bssid->Configuration.BeaconPeriod, rtw_get_beacon_interval_from_ie(bssid->IEs), 2); -+ bssid->Configuration.BeaconPeriod = le32_to_cpu(bssid->Configuration.BeaconPeriod); -+ -+ val16 = rtw_get_capability((WLAN_BSSID_EX *)bssid); -+ -+ if (val16 & BIT(0)) -+ { -+ bssid->InfrastructureMode = Ndis802_11Infrastructure; -+ _rtw_memcpy(bssid->MacAddress, GetAddr2Ptr(pframe), ETH_ALEN); -+ } -+ else -+ { -+ bssid->InfrastructureMode = Ndis802_11IBSS; -+ _rtw_memcpy(bssid->MacAddress, GetAddr3Ptr(pframe), ETH_ALEN); -+ } -+ -+ if (val16 & BIT(4)) -+ bssid->Privacy = 1; -+ else -+ bssid->Privacy = 0; -+ -+ bssid->Configuration.ATIMWindow = 0; -+ -+ //20/40 BSS Coexistence check -+ if((pregistrypriv->wifi_spec==1) && (_FALSE == pmlmeinfo->bwmode_updated)) -+ { -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); -+ if(p && len>0) -+ { -+ struct HT_caps_element *pHT_caps; -+ pHT_caps = (struct HT_caps_element *)(p + 2); -+ -+ if(pHT_caps->u.HT_cap_element.HT_caps_info&BIT(14)) -+ { -+ pmlmepriv->num_FortyMHzIntolerant++; -+ } -+ } -+ else -+ { -+ pmlmepriv->num_sta_no_ht++; -+ } -+ -+ } -+ -+#ifdef CONFIG_INTEL_WIDI -+ //process_intel_widi_query_or_tigger(padapter, bssid); -+ if(process_intel_widi_query_or_tigger(padapter, bssid)) -+ { -+ return _FAIL; -+ } -+#endif // CONFIG_INTEL_WIDI -+ -+ #if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) & 1 -+ if(strcmp(bssid->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { -+ DBG_871X("Receiving %s("MAC_FMT", DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n" -+ , bssid->Ssid.Ssid, MAC_ARG(bssid->MacAddress), bssid->Configuration.DSConfig -+ , rtw_get_oper_ch(padapter) -+ , bssid->PhyInfo.SignalStrength, bssid->PhyInfo.SignalQuality, bssid->Rssi -+ ); -+ } -+ #endif -+ -+ // mark bss info receving from nearby channel as SignalQuality 101 -+ if(bssid->Configuration.DSConfig != rtw_get_oper_ch(padapter)) -+ { -+ bssid->PhyInfo.SignalQuality= 101; -+ } -+ -+ return _SUCCESS; -+} -+ -+void start_create_ibss(_adapter* padapter) -+{ -+ unsigned short caps; -+ u8 val8; -+ u8 join_type; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); -+ pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig; -+ pmlmeinfo->bcn_interval = get_beacon_interval(pnetwork); -+ -+ //update wireless mode -+ update_wireless_mode(padapter); -+ -+ //udpate capability -+ caps = rtw_get_capability((WLAN_BSSID_EX *)pnetwork); -+ update_capinfo(padapter, caps); -+ if(caps&cap_IBSS)//adhoc master -+ { -+ //set_opmode_cmd(padapter, adhoc);//removed -+ -+ val8 = 0xcf; -+ rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); -+ -+ //switch channel -+ //SelectChannel(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE); -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ -+ beacon_timing_control(padapter); -+ -+ //set msr to WIFI_FW_ADHOC_STATE -+ pmlmeinfo->state = WIFI_FW_ADHOC_STATE; -+ Set_MSR(padapter, (pmlmeinfo->state & 0x3)); -+ -+ //issue beacon -+ if(send_beacon(padapter)==_FAIL) -+ { -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("issuing beacon frame fail....\n")); -+ -+ report_join_res(padapter, -1); -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ } -+ else -+ { -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, padapter->registrypriv.dev_network.MacAddress); -+ join_type = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); -+ -+ report_join_res(padapter, 1); -+ pmlmeinfo->state |= WIFI_FW_ASSOC_SUCCESS; -+ } -+ } -+ else -+ { -+ DBG_871X("start_create_ibss, invalid cap:%x\n", caps); -+ return; -+ } -+ -+} -+ -+void start_clnt_join(_adapter* padapter) -+{ -+ unsigned short caps; -+ u8 val8; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); -+ -+ //update wireless mode -+ update_wireless_mode(padapter); -+ -+ //udpate capability -+ caps = rtw_get_capability((WLAN_BSSID_EX *)pnetwork); -+ update_capinfo(padapter, caps); -+ if (caps&cap_ESS) -+ { -+ Set_MSR(padapter, WIFI_FW_STATION_STATE); -+ -+ val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X)? 0xcc: 0xcf; -+ rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); -+ -+ #ifdef CONFIG_DEAUTH_BEFORE_CONNECT -+ // Because of AP's not receiving deauth before -+ // AP may: 1)not response auth or 2)deauth us after link is complete -+ // issue deauth before issuing auth to deal with the situation -+ -+ // Commented by Albert 2012/07/21 -+ // For the Win8 P2P connection, it will be hard to have a successful connection if this Wi-Fi doesn't connect to it. -+ { -+ #ifdef CONFIG_P2P -+ _queue *queue = &(padapter->mlmepriv.scanned_queue); -+ _list *head = get_list_head(queue); -+ _list *pos = get_next(head); -+ struct wlan_network *scanned = NULL; -+ u8 ie_offset = 0; -+ _irqL irqL; -+ bool has_p2p_ie = _FALSE; -+ -+ _enter_critical_bh(&(padapter->mlmepriv.scanned_queue.lock), &irqL); -+ -+ for (pos = get_next(head);!rtw_end_of_queue_search(head, pos); pos = get_next(pos)) { -+ -+ scanned = LIST_CONTAINOR(pos, struct wlan_network, list); -+ if(scanned==NULL) -+ rtw_warn_on(1); -+ -+ if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == _TRUE -+ && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == _TRUE -+ ) { -+ ie_offset = (scanned->network.Reserved[0] == 2? 0:12); -+ if (rtw_get_p2p_ie(scanned->network.IEs+ie_offset, scanned->network.IELength-ie_offset, NULL, NULL)) -+ has_p2p_ie = _TRUE; -+ break; -+ } -+ } -+ -+ _exit_critical_bh(&(padapter->mlmepriv.scanned_queue.lock), &irqL); -+ -+ if (scanned == NULL || rtw_end_of_queue_search(head, pos) || has_p2p_ie == _FALSE) -+ #endif /* CONFIG_P2P */ -+ issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, 5, 100); -+ } -+ #endif /* CONFIG_DEAUTH_BEFORE_CONNECT */ -+ -+ //here wait for receiving the beacon to start auth -+ //and enable a timer -+ set_link_timer(pmlmeext, decide_wait_for_beacon_timeout(pmlmeinfo->bcn_interval)); -+ -+ pmlmeinfo->state = WIFI_FW_AUTH_NULL | WIFI_FW_STATION_STATE; -+ } -+ else if (caps&cap_IBSS) //adhoc client -+ { -+ Set_MSR(padapter, WIFI_FW_ADHOC_STATE); -+ -+ val8 = 0xcf; -+ rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); -+ -+ //switch channel -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+ beacon_timing_control(padapter); -+ -+ pmlmeinfo->state = WIFI_FW_ADHOC_STATE; -+ -+ report_join_res(padapter, 1); -+ } -+ else -+ { -+ //DBG_871X("marc: invalid cap:%x\n", caps); -+ return; -+ } -+ -+} -+ -+void start_clnt_auth(_adapter* padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ pmlmeinfo->state &= (~WIFI_FW_AUTH_NULL); -+ pmlmeinfo->state |= WIFI_FW_AUTH_STATE; -+ -+ pmlmeinfo->auth_seq = 1; -+ pmlmeinfo->reauth_count = 0; -+ pmlmeinfo->reassoc_count = 0; -+ pmlmeinfo->link_count = 0; -+ pmlmeext->retry = 0; -+ -+ -+ issue_auth(padapter, NULL, 0); -+ -+ set_link_timer(pmlmeext, REAUTH_TO); -+ -+} -+ -+ -+void start_clnt_assoc(_adapter* padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ pmlmeinfo->state &= (~(WIFI_FW_AUTH_NULL | WIFI_FW_AUTH_STATE)); -+ pmlmeinfo->state |= (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE); -+ -+ issue_assocreq(padapter); -+ -+ set_link_timer(pmlmeext, REASSOC_TO); -+} -+ -+unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsigned short reason) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //check A3 -+ if (!(_rtw_memcmp(MacAddr, get_my_bssid(&pmlmeinfo->network), ETH_ALEN))) -+ return _SUCCESS; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) -+ { -+ if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) -+ { -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ report_del_sta_event(padapter, MacAddr, reason); -+ -+ } -+ else if (pmlmeinfo->state & WIFI_FW_LINKING_STATE) -+ { -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ report_join_res(padapter, -2); -+ } -+ } -+ -+ return _SUCCESS; -+} -+ -+#ifdef CONFIG_80211D -+static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) -+{ -+ struct registry_priv *pregistrypriv; -+ struct mlme_ext_priv *pmlmeext; -+ RT_CHANNEL_INFO *chplan_new; -+ u8 channel; -+ u8 i; -+ -+ -+ pregistrypriv = &padapter->registrypriv; -+ pmlmeext = &padapter->mlmeextpriv; -+ -+ // Adjust channel plan by AP Country IE -+ if (pregistrypriv->enable80211d && -+ (!pmlmeext->update_channel_plan_by_ap_done)) -+ { -+ u8 *ie, *p; -+ u32 len; -+ RT_CHANNEL_PLAN chplan_ap; -+ RT_CHANNEL_INFO chplan_sta[MAX_CHANNEL_NUM]; -+ u8 country[4]; -+ u8 fcn; // first channel number -+ u8 noc; // number of channel -+ u8 j, k; -+ -+ ie = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _COUNTRY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_); -+ if (!ie) return; -+ if (len < 6) return; -+ -+ ie += 2; -+ p = ie; -+ ie += len; -+ -+ _rtw_memset(country, 0, 4); -+ _rtw_memcpy(country, p, 3); -+ p += 3; -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, -+ ("%s: 802.11d country=%s\n", __FUNCTION__, country)); -+ -+ i = 0; -+ while ((ie - p) >= 3) -+ { -+ fcn = *(p++); -+ noc = *(p++); -+ p++; -+ -+ for (j = 0; j < noc; j++) -+ { -+ if (fcn <= 14) channel = fcn + j; // 2.4 GHz -+ else channel = fcn + j*4; // 5 GHz -+ -+ chplan_ap.Channel[i++] = channel; -+ } -+ } -+ chplan_ap.Len = i; -+ -+#ifdef CONFIG_DEBUG_RTL871X -+#ifdef PLATFORM_LINUX -+ i = 0; -+ printk("%s: AP[%s] channel plan {", __func__, bssid->Ssid.Ssid); -+ while ((i < chplan_ap.Len) && (chplan_ap.Channel[i] != 0)) -+ { -+ printk("%02d,", chplan_ap.Channel[i]); -+ i++; -+ } -+ printk("}\n"); -+#endif -+#endif -+ -+ _rtw_memcpy(chplan_sta, pmlmeext->channel_set, sizeof(chplan_sta)); -+#ifdef CONFIG_DEBUG_RTL871X -+#ifdef PLATFORM_LINUX -+ i = 0; -+ printk("%s: STA channel plan {", __func__); -+ while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) -+ { -+ printk("%02d(%c),", chplan_sta[i].ChannelNum, chplan_sta[i].ScanType==SCAN_PASSIVE?'p':'a'); -+ i++; -+ } -+ printk("}\n"); -+#endif -+#endif -+ -+ _rtw_memset(pmlmeext->channel_set, 0, sizeof(pmlmeext->channel_set)); -+ chplan_new = pmlmeext->channel_set; -+ -+ i = j = k = 0; -+ if (pregistrypriv->wireless_mode & WIRELESS_11G) -+ { -+ do { -+ if ((i == MAX_CHANNEL_NUM) || -+ (chplan_sta[i].ChannelNum == 0) || -+ (chplan_sta[i].ChannelNum > 14)) -+ break; -+ -+ if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] > 14)) -+ break; -+ -+ if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) -+ { -+ chplan_new[k].ChannelNum = chplan_ap.Channel[j]; -+ chplan_new[k].ScanType = SCAN_ACTIVE; -+ i++; -+ j++; -+ k++; -+ } -+ else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) -+ { -+ chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; -+// chplan_new[k].ScanType = chplan_sta[i].ScanType; -+ chplan_new[k].ScanType = SCAN_PASSIVE; -+ i++; -+ k++; -+ } -+ else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) -+ { -+ chplan_new[k].ChannelNum = chplan_ap.Channel[j]; -+ chplan_new[k].ScanType = SCAN_ACTIVE; -+ j++; -+ k++; -+ } -+ } while (1); -+ -+ // change AP not support channel to Passive scan -+ while ((i < MAX_CHANNEL_NUM) && -+ (chplan_sta[i].ChannelNum != 0) && -+ (chplan_sta[i].ChannelNum <= 14)) -+ { -+ chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; -+// chplan_new[k].ScanType = chplan_sta[i].ScanType; -+ chplan_new[k].ScanType = SCAN_PASSIVE; -+ i++; -+ k++; -+ } -+ -+ // add channel AP supported -+ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <= 14)) -+ { -+ chplan_new[k].ChannelNum = chplan_ap.Channel[j]; -+ chplan_new[k].ScanType = SCAN_ACTIVE; -+ j++; -+ k++; -+ } -+ } -+ else -+ { -+ // keep original STA 2.4G channel plan -+ while ((i < MAX_CHANNEL_NUM) && -+ (chplan_sta[i].ChannelNum != 0) && -+ (chplan_sta[i].ChannelNum <= 14)) -+ { -+ chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; -+ chplan_new[k].ScanType = chplan_sta[i].ScanType; -+ i++; -+ k++; -+ } -+ -+ // skip AP 2.4G channel plan -+ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <= 14)) -+ { -+ j++; -+ } -+ } -+ -+ if (pregistrypriv->wireless_mode & WIRELESS_11A) -+ { -+ do { -+ if ((i == MAX_CHANNEL_NUM) || -+ (chplan_sta[i].ChannelNum == 0)) -+ break; -+ -+ if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] == 0)) -+ break; -+ -+ if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) -+ { -+ chplan_new[k].ChannelNum = chplan_ap.Channel[j]; -+ chplan_new[k].ScanType = SCAN_ACTIVE; -+ i++; -+ j++; -+ k++; -+ } -+ else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) -+ { -+ chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; -+// chplan_new[k].ScanType = chplan_sta[i].ScanType; -+ chplan_new[k].ScanType = SCAN_PASSIVE; -+ i++; -+ k++; -+ } -+ else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) -+ { -+ chplan_new[k].ChannelNum = chplan_ap.Channel[j]; -+ chplan_new[k].ScanType = SCAN_ACTIVE; -+ j++; -+ k++; -+ } -+ } while (1); -+ -+ // change AP not support channel to Passive scan -+ while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) -+ { -+ chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; -+// chplan_new[k].ScanType = chplan_sta[i].ScanType; -+ chplan_new[k].ScanType = SCAN_PASSIVE; -+ i++; -+ k++; -+ } -+ -+ // add channel AP supported -+ while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] != 0)) -+ { -+ chplan_new[k].ChannelNum = chplan_ap.Channel[j]; -+ chplan_new[k].ScanType = SCAN_ACTIVE; -+ j++; -+ k++; -+ } -+ } -+ else -+ { -+ // keep original STA 5G channel plan -+ while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) -+ { -+ chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum; -+ chplan_new[k].ScanType = chplan_sta[i].ScanType; -+ i++; -+ k++; -+ } -+ } -+ -+ pmlmeext->update_channel_plan_by_ap_done = 1; -+ -+#ifdef CONFIG_DEBUG_RTL871X -+#ifdef PLATFORM_LINUX -+ k = 0; -+ printk("%s: new STA channel plan {", __func__); -+ while ((k < MAX_CHANNEL_NUM) && (chplan_new[k].ChannelNum != 0)) -+ { -+ printk("%02d(%c),", chplan_new[k].ChannelNum, chplan_new[k].ScanType==SCAN_PASSIVE?'p':'c'); -+ k++; -+ } -+ printk("}\n"); -+#endif -+#endif -+ -+#if 0 -+ // recover the right channel index -+ channel = chplan_sta[pmlmeext->sitesurvey_res.channel_idx].ChannelNum; -+ k = 0; -+ while ((k < MAX_CHANNEL_NUM) && (chplan_new[k].ChannelNum != 0)) -+ { -+ if (chplan_new[k].ChannelNum == channel) { -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, -+ ("%s: change mlme_ext sitesurvey channel index from %d to %d\n", -+ __FUNCTION__, pmlmeext->sitesurvey_res.channel_idx, k)); -+ pmlmeext->sitesurvey_res.channel_idx = k; -+ break; -+ } -+ k++; -+ } -+#endif -+ } -+ -+ // If channel is used by AP, set channel scan type to active -+ channel = bssid->Configuration.DSConfig; -+ chplan_new = pmlmeext->channel_set; -+ i = 0; -+ while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].ChannelNum != 0)) -+ { -+ if (chplan_new[i].ChannelNum == channel) -+ { -+ if (chplan_new[i].ScanType == SCAN_PASSIVE) -+ { -+ //5G Bnad 2, 3 (DFS) doesn't change to active scan -+ if(channel >= 52 && channel <= 144) -+ break; -+ -+ chplan_new[i].ScanType = SCAN_ACTIVE; -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, -+ ("%s: change channel %d scan type from passive to active\n", -+ __FUNCTION__, channel)); -+ } -+ break; -+ } -+ i++; -+ } -+} -+#endif -+ -+/**************************************************************************** -+ -+Following are the functions to report events -+ -+*****************************************************************************/ -+ -+void report_survey_event(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ struct cmd_obj *pcmd_obj; -+ u8 *pevtcmd; -+ u32 cmdsz; -+ struct survey_event *psurvey_evt; -+ struct C2HEvent_Header *pc2h_evt_hdr; -+ struct mlme_ext_priv *pmlmeext; -+ struct cmd_priv *pcmdpriv; -+ //u8 *pframe = precv_frame->u.hdr.rx_data; -+ //uint len = precv_frame->u.hdr.len; -+ -+ if(!padapter) -+ return; -+ -+ pmlmeext = &padapter->mlmeextpriv; -+ pcmdpriv = &padapter->cmdpriv; -+ -+ -+ if ((pcmd_obj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ return; -+ } -+ -+ cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header)); -+ if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL) -+ { -+ rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj)); -+ return; -+ } -+ -+ _rtw_init_listhead(&pcmd_obj->list); -+ -+ pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); -+ pcmd_obj->cmdsz = cmdsz; -+ pcmd_obj->parmbuf = pevtcmd; -+ -+ pcmd_obj->rsp = NULL; -+ pcmd_obj->rspsz = 0; -+ -+ pc2h_evt_hdr = (struct C2HEvent_Header*)(pevtcmd); -+ pc2h_evt_hdr->len = sizeof(struct survey_event); -+ pc2h_evt_hdr->ID = GEN_EVT_CODE(_Survey); -+ pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); -+ -+ psurvey_evt = (struct survey_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); -+ -+ if (collect_bss_info(padapter, precv_frame, (WLAN_BSSID_EX *)&psurvey_evt->bss) == _FAIL) -+ { -+ rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj)); -+ rtw_mfree((u8 *)pevtcmd, cmdsz); -+ return; -+ } -+ -+#ifdef CONFIG_80211D -+ process_80211d(padapter, &psurvey_evt->bss); -+#endif -+ -+ rtw_enqueue_cmd(pcmdpriv, pcmd_obj); -+ -+ pmlmeext->sitesurvey_res.bss_cnt++; -+ -+ return; -+ -+} -+ -+void report_surveydone_event(_adapter *padapter) -+{ -+ struct cmd_obj *pcmd_obj; -+ u8 *pevtcmd; -+ u32 cmdsz; -+ struct surveydone_event *psurveydone_evt; -+ struct C2HEvent_Header *pc2h_evt_hdr; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ if ((pcmd_obj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ return; -+ } -+ -+ cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header)); -+ if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL) -+ { -+ rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj)); -+ return; -+ } -+ -+ _rtw_init_listhead(&pcmd_obj->list); -+ -+ pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); -+ pcmd_obj->cmdsz = cmdsz; -+ pcmd_obj->parmbuf = pevtcmd; -+ -+ pcmd_obj->rsp = NULL; -+ pcmd_obj->rspsz = 0; -+ -+ pc2h_evt_hdr = (struct C2HEvent_Header*)(pevtcmd); -+ pc2h_evt_hdr->len = sizeof(struct surveydone_event); -+ pc2h_evt_hdr->ID = GEN_EVT_CODE(_SurveyDone); -+ pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); -+ -+ psurveydone_evt = (struct surveydone_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); -+ psurveydone_evt->bss_cnt = pmlmeext->sitesurvey_res.bss_cnt; -+ -+ DBG_871X("survey done event(%x) band:%d for "ADPT_FMT"\n", psurveydone_evt->bss_cnt, padapter->setband, ADPT_ARG(padapter)); -+ -+ rtw_enqueue_cmd(pcmdpriv, pcmd_obj); -+ -+ return; -+ -+} -+ -+void report_join_res(_adapter *padapter, int res) -+{ -+ struct cmd_obj *pcmd_obj; -+ u8 *pevtcmd; -+ u32 cmdsz; -+ struct joinbss_event *pjoinbss_evt; -+ struct C2HEvent_Header *pc2h_evt_hdr; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ if ((pcmd_obj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ return; -+ } -+ -+ cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header)); -+ if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL) -+ { -+ rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj)); -+ return; -+ } -+ -+ _rtw_init_listhead(&pcmd_obj->list); -+ -+ pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); -+ pcmd_obj->cmdsz = cmdsz; -+ pcmd_obj->parmbuf = pevtcmd; -+ -+ pcmd_obj->rsp = NULL; -+ pcmd_obj->rspsz = 0; -+ -+ pc2h_evt_hdr = (struct C2HEvent_Header*)(pevtcmd); -+ pc2h_evt_hdr->len = sizeof(struct joinbss_event); -+ pc2h_evt_hdr->ID = GEN_EVT_CODE(_JoinBss); -+ pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); -+ -+ pjoinbss_evt = (struct joinbss_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); -+ _rtw_memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); -+ pjoinbss_evt->network.join_res = pjoinbss_evt->network.aid = res; -+ -+ DBG_871X("report_join_res(%d)\n", res); -+ -+ -+ rtw_joinbss_event_prehandle(padapter, (u8 *)&pjoinbss_evt->network); -+ -+ -+ rtw_enqueue_cmd(pcmdpriv, pcmd_obj); -+ -+ return; -+ -+} -+ -+void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned short reason) -+{ -+ struct cmd_obj *pcmd_obj; -+ u8 *pevtcmd; -+ u32 cmdsz; -+ struct sta_info *psta; -+ int mac_id; -+ struct stadel_event *pdel_sta_evt; -+ struct C2HEvent_Header *pc2h_evt_hdr; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ if ((pcmd_obj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ return; -+ } -+ -+ cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header)); -+ if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL) -+ { -+ rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj)); -+ return; -+ } -+ -+ _rtw_init_listhead(&pcmd_obj->list); -+ -+ pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); -+ pcmd_obj->cmdsz = cmdsz; -+ pcmd_obj->parmbuf = pevtcmd; -+ -+ pcmd_obj->rsp = NULL; -+ pcmd_obj->rspsz = 0; -+ -+ pc2h_evt_hdr = (struct C2HEvent_Header*)(pevtcmd); -+ pc2h_evt_hdr->len = sizeof(struct stadel_event); -+ pc2h_evt_hdr->ID = GEN_EVT_CODE(_DelSTA); -+ pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); -+ -+ pdel_sta_evt = (struct stadel_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); -+ _rtw_memcpy((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr, ETH_ALEN); -+ _rtw_memcpy((unsigned char *)(pdel_sta_evt->rsvd),(unsigned char *)(&reason),2); -+ -+ -+ psta = rtw_get_stainfo(&padapter->stapriv, MacAddr); -+ if(psta) -+ mac_id = (int)psta->mac_id; -+ else -+ mac_id = (-1); -+ -+ pdel_sta_evt->mac_id = mac_id; -+ -+ DBG_871X("report_del_sta_event: delete STA, mac_id=%d\n", mac_id); -+ -+ rtw_enqueue_cmd(pcmdpriv, pcmd_obj); -+ -+ return; -+} -+ -+void report_add_sta_event(_adapter *padapter, unsigned char* MacAddr, int cam_idx) -+{ -+ struct cmd_obj *pcmd_obj; -+ u8 *pevtcmd; -+ u32 cmdsz; -+ struct stassoc_event *padd_sta_evt; -+ struct C2HEvent_Header *pc2h_evt_hdr; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ -+ if ((pcmd_obj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ return; -+ } -+ -+ cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header)); -+ if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL) -+ { -+ rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj)); -+ return; -+ } -+ -+ _rtw_init_listhead(&pcmd_obj->list); -+ -+ pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); -+ pcmd_obj->cmdsz = cmdsz; -+ pcmd_obj->parmbuf = pevtcmd; -+ -+ pcmd_obj->rsp = NULL; -+ pcmd_obj->rspsz = 0; -+ -+ pc2h_evt_hdr = (struct C2HEvent_Header*)(pevtcmd); -+ pc2h_evt_hdr->len = sizeof(struct stassoc_event); -+ pc2h_evt_hdr->ID = GEN_EVT_CODE(_AddSTA); -+ pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); -+ -+ padd_sta_evt = (struct stassoc_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); -+ _rtw_memcpy((unsigned char *)(&(padd_sta_evt->macaddr)), MacAddr, ETH_ALEN); -+ padd_sta_evt->cam_id = cam_idx; -+ -+ DBG_871X("report_add_sta_event: add STA\n"); -+ -+ rtw_enqueue_cmd(pcmdpriv, pcmd_obj); -+ -+ return; -+} -+ -+ -+/**************************************************************************** -+ -+Following are the event callback functions -+ -+*****************************************************************************/ -+ -+//for sta/adhoc mode -+void update_sta_info(_adapter *padapter, struct sta_info *psta) -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //ERP -+ VCS_update(padapter, psta); -+ -+ -+ //HT -+ if(pmlmepriv->htpriv.ht_option) -+ { -+ psta->htpriv.ht_option = _TRUE; -+ -+ psta->htpriv.ampdu_enable = pmlmepriv->htpriv.ampdu_enable; -+ -+ if (support_short_GI(padapter, &(pmlmeinfo->HT_caps))) -+ psta->htpriv.sgi = _TRUE; -+ -+ psta->qos_option = _TRUE; -+ -+ } -+ else -+ { -+ psta->htpriv.ht_option = _FALSE; -+ -+ psta->htpriv.ampdu_enable = _FALSE; -+ -+ psta->htpriv.sgi = _FALSE; -+ -+ psta->qos_option = _FALSE; -+ -+ } -+ -+ psta->htpriv.bwmode = pmlmeext->cur_bwmode; -+ psta->htpriv.ch_offset = pmlmeext->cur_ch_offset; -+ -+ psta->htpriv.agg_enable_bitmap = 0x0;//reset -+ psta->htpriv.candidate_tid_bitmap = 0x0;//reset -+ -+ -+ //QoS -+ if(pmlmepriv->qospriv.qos_option) -+ psta->qos_option = _TRUE; -+ -+ -+ psta->state = _FW_LINKED; -+ -+} -+ -+void mlmeext_joinbss_event_callback(_adapter *padapter, int join_res) -+{ -+ struct sta_info *psta, *psta_bmc; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 join_type; -+ -+ if(join_res < 0) -+ { -+ join_type = 1; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, null_addr); -+ -+ //restore to initial setting. -+ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); -+#if 0 //temply remove -+#ifdef CONFIG_INTEL_WIDI -+#ifdef DBG_CONFIG_ERROR_DETECT -+ DBG_871X("%s(): do silentreset\n",__FUNCTION__); -+ rtw_hal_sreset_reset(padapter); -+#endif -+#endif -+#endif -+ goto exit_mlmeext_joinbss_event_callback; -+ } -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) -+ { -+ //for bc/mc -+ psta_bmc = rtw_get_bcmc_stainfo(padapter); -+ if(psta_bmc) -+ { -+ pmlmeinfo->FW_sta_info[psta_bmc->mac_id].psta = psta_bmc; -+ update_bmc_sta_support_rate(padapter, psta_bmc->mac_id); -+ Update_RA_Entry(padapter, psta_bmc->mac_id); -+ } -+ } -+ -+ -+ //turn on dynamic functions -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE); -+ -+ // update IOT-releated issue -+ update_IOT_info(padapter); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, cur_network->SupportedRates); -+ -+ //BCN interval -+ rtw_hal_set_hwreg(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&pmlmeinfo->bcn_interval)); -+ -+ //udpate capability -+ update_capinfo(padapter, pmlmeinfo->capability); -+ -+ //WMM, Update EDCA param -+ WMMOnAssocRsp(padapter); -+ -+ //HT -+ HTOnAssocRsp(padapter); -+ -+#ifndef CONFIG_CONCURRENT_MODE -+ // Call set_channel_bwmode when the CONFIG_CONCURRENT_MODE doesn't be defined. -+ //Set cur_channel&cur_bwmode&cur_ch_offset -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+#endif -+ -+ psta = rtw_get_stainfo(pstapriv, cur_network->MacAddress); -+ if (psta) //only for infra. mode -+ { -+ pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta; -+ -+ //DBG_871X("set_sta_rate\n"); -+ -+ //set per sta rate after updating HT cap. -+ set_sta_rate(padapter, psta); -+ } -+ -+ join_type = 2; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) -+ { -+ // correcting TSF -+ correct_TSF(padapter, pmlmeext); -+ -+ //set_link_timer(pmlmeext, DISCONNECT_TO); -+ } -+ -+#ifdef CONFIG_LPS -+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0); -+#endif -+ -+exit_mlmeext_joinbss_event_callback: -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_handle_join_done(padapter, join_res); -+#endif -+#ifdef CONFIG_CONCURRENT_MODE -+ concurrent_chk_joinbss_done(padapter, join_res); -+#endif -+ -+ DBG_871X("=>%s\n", __FUNCTION__); -+ -+} -+ -+void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta) -+{ -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 join_type; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) -+ { -+ if(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)//adhoc master or sta_count>1 -+ { -+ //nothing to do -+ } -+ else//adhoc client -+ { -+ //update TSF Value -+ //update_TSF(pmlmeext, pframe, len); -+ -+ // correcting TSF -+ correct_TSF(padapter, pmlmeext); -+ -+ //start beacon -+ if(send_beacon(padapter)==_FAIL) -+ { -+ pmlmeinfo->FW_sta_info[psta->mac_id].status = 0; -+ -+ pmlmeinfo->state ^= WIFI_FW_ADHOC_STATE; -+ -+ return; -+ } -+ -+ pmlmeinfo->state |= WIFI_FW_ASSOC_SUCCESS; -+ -+ } -+ -+ join_type = 2; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); -+ } -+ -+ pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta; -+ -+ //rate radaptive -+ Update_RA_Entry(padapter, psta->mac_id); -+ -+ //update adhoc sta_info -+ update_sta_info(padapter, psta); -+ -+} -+ -+void mlmeext_sta_del_event_callback(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if (is_client_associated_to_ap(padapter) || is_IBSS_empty(padapter)) -+ { -+ //set_opmode_cmd(padapter, infra_client_with_mlme); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, 0); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, null_addr); -+ -+ //restore to initial setting. -+ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_set_channel_bwmode_disconnect(padapter); -+#else -+#ifdef CONFIG_CONCURRENT_MODE -+ if((check_buddy_fwstate(padapter, _FW_LINKED)) != _TRUE) -+ { -+#endif //CONFIG_CONCURRENT_MODE -+ -+ //switch to the 20M Hz mode after disconnect -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ //SelectChannel(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset); -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ } -+#endif //CONFIG_CONCURRENT_MODE -+#endif //CONFIG_DUALMAC_CONCURRENT -+ -+ flush_all_cam_entry(padapter); -+ -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ -+ //set MSR to no link state -> infra. mode -+ Set_MSR(padapter, _HW_STATE_STATION_); -+ -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ } -+ -+} -+ -+/**************************************************************************** -+ -+Following are the functions for the timer handlers -+ -+*****************************************************************************/ -+void _linked_rx_signal_strehgth_display(_adapter *padapter); -+void _linked_rx_signal_strehgth_display(_adapter *padapter) -+{ -+ int UndecoratedSmoothedPWDB; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ DBG_871X("============ pbuddy_adapter linked status check ===================\n"); -+ DBG_871X("buddy_adapter_type=%d\n", pbuddy_adapter->adapter_type); -+ DBG_871X("pbuddy_adapter pathA Rx SNRdb:%d\n",pbuddy_adapter->recvpriv.RxSNRdB[0]); -+ DBG_871X("pbuddy_adapter pathA Rx PWDB:%d\n",pbuddy_adapter->recvpriv.rxpwdb); -+ DBG_871X("pbuddy_adapter pathA Rx RSSI:%d,pathB Rx RSSI:%d\n" -+ ,pbuddy_adapter->recvpriv.RxRssi[0],pbuddy_adapter->recvpriv.RxRssi[1]); -+ rtw_hal_get_def_var(pbuddy_adapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB); -+ DBG_871X("pbuddy_adapter UndecoratedSmoothedPWDB:%d\n",UndecoratedSmoothedPWDB); -+ DBG_871X("Rx RSSI:%d\n",pbuddy_adapter->recvpriv.rssi); -+ DBG_871X("Rx Signal_strength:%d\n",pbuddy_adapter->recvpriv.signal_strength); -+ DBG_871X("Rx Signal_qual:%d \n",pbuddy_adapter->recvpriv.signal_qual); -+ DBG_871X("============ linked status check ===================\n"); -+ DBG_871X("adapter_type=%d\n", padapter->adapter_type); -+#else //CONFIG_CONCURRENT_MODE -+ DBG_871X("============ linked status check ===================\n"); -+#endif //CONFIG_CONCURRENT_MODE -+ DBG_871X("pathA Rx SNRdb:%d, pathB Rx SNRdb:%d\n",padapter->recvpriv.RxSNRdB[0], padapter->recvpriv.RxSNRdB[1]); -+ DBG_871X("pathA Rx PWDB:%d\n",padapter->recvpriv.rxpwdb); -+ DBG_871X("pathA Rx RSSI:%d,pathB Rx RSSI:%d\n",padapter->recvpriv.RxRssi[0],padapter->recvpriv.RxRssi[1]); -+ rtw_hal_get_def_var(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB); -+ DBG_871X("UndecoratedSmoothedPWDB:%d\n",UndecoratedSmoothedPWDB); -+ DBG_871X("Rx RSSI:%d\n",padapter->recvpriv.rssi); -+ DBG_871X("Rx Signal_strength:%d\n",padapter->recvpriv.signal_strength); -+ DBG_871X("Rx Signal_qual:%d \n",padapter->recvpriv.signal_qual); -+ if ( check_fwstate( &padapter->mlmepriv, _FW_LINKED )) -+ { -+ DBG_871X("bw mode: %d, channel: %d\n", padapter->mlmeextpriv.cur_bwmode, padapter->mlmeextpriv.cur_channel ); -+ DBG_871X("received bytes = %d\n", (u32) (padapter->recvpriv.rx_bytes - padapter->recvpriv.last_rx_bytes ) ); -+ } -+ DBG_871X("============ linked status check ===================\n"); -+ DBG_871X(" DIG PATH-A(0x%02x), PATH-B(0x%02x)\n",rtw_read8(padapter,0xc50),rtw_read8(padapter,0xc58)); -+ DBG_871X(" OFDM -Alarm DA2(0x%04x),DA4(0x%04x),DA6(0x%04x),DA8(0x%04x)\n", -+ rtw_read16(padapter,0xDA2),rtw_read16(padapter,0xDA4),rtw_read16(padapter,0xDA6),rtw_read16(padapter,0xDA8)); -+ -+ DBG_871X(" CCK -Alarm A5B(0x%02x),A5C(0x%02x)\n",rtw_read8(padapter,0xA5B),rtw_read8(padapter,0xA5C)); -+ DBG_871X(" FalseAlmCnt_all(%d)\n",padapter->recvpriv.FalseAlmCnt_all); -+ -+} -+ -+u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta) -+{ -+ u8 ret = _FALSE; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ #ifdef DBG_EXPIRATION_CHK -+ DBG_871X(FUNC_ADPT_FMT" rx:"STA_PKTS_FMT", beacon:%llu, probersp_to_self:%llu" -+ /*", probersp_bm:%llu, probersp_uo:%llu, probereq:%llu, BI:%u"*/ -+ ", retry:%u\n" -+ , FUNC_ADPT_ARG(padapter) -+ , STA_RX_PKTS_DIFF_ARG(psta) -+ , psta->sta_stats.rx_beacon_pkts - psta->sta_stats.last_rx_beacon_pkts -+ , psta->sta_stats.rx_probersp_pkts - psta->sta_stats.last_rx_probersp_pkts -+ /*, psta->sta_stats.rx_probersp_bm_pkts - psta->sta_stats.last_rx_probersp_bm_pkts -+ , psta->sta_stats.rx_probersp_uo_pkts - psta->sta_stats.last_rx_probersp_uo_pkts -+ , psta->sta_stats.rx_probereq_pkts - psta->sta_stats.last_rx_probereq_pkts -+ , pmlmeinfo->bcn_interval*/ -+ , pmlmeext->retry -+ ); -+ -+ DBG_871X(FUNC_ADPT_FMT" tx_pkts:%llu, link_count:%u\n", FUNC_ADPT_ARG(padapter) -+ , padapter->xmitpriv.tx_pkts -+ , pmlmeinfo->link_count -+ ); -+ #endif -+ -+ if((sta_rx_data_pkts(psta) == sta_last_rx_data_pkts(psta)) -+ && sta_rx_beacon_pkts(psta) == sta_last_rx_beacon_pkts(psta) -+ && sta_rx_probersp_pkts(psta) == sta_last_rx_probersp_pkts(psta) -+ ) -+ { -+ ret = _FALSE; -+ } -+ else -+ { -+ ret = _TRUE; -+ } -+ -+ sta_update_last_rx_pkts(psta); -+ -+ return ret; -+} -+ -+void linked_status_chk(_adapter *padapter) -+{ -+ u32 i; -+ struct sta_info *psta; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ if(padapter->bRxRSSIDisplay) -+ _linked_rx_signal_strehgth_display(padapter); -+ -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ rtw_hal_sreset_linked_status_check(padapter); -+ #endif -+ -+ if (is_client_associated_to_ap(padapter)) -+ { -+ //linked infrastructure client mode -+ -+ int tx_chk = _SUCCESS, rx_chk = _SUCCESS; -+ int rx_chk_limit; -+ -+ #if defined(DBG_ROAMING_TEST) -+ rx_chk_limit = 1; -+ #elif defined(CONFIG_ACTIVE_KEEP_ALIVE_CHECK) -+ rx_chk_limit = 4; -+ #else -+ rx_chk_limit = 8; -+ #endif -+ -+ // Marked by Kurt 20130715 -+ // For WiDi 3.5 and later on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. -+ // todo: To check why rx_chk would be _FALSE under miracast session. -+ //#ifdef CONFIG_INTEL_WIDI -+ //if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) -+ // rx_chk_limit = 1; -+ //#endif -+ -+ if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) -+ { -+ bool is_p2p_enable = _FALSE; -+ #ifdef CONFIG_P2P -+ is_p2p_enable = !rtw_p2p_chk_state(&padapter->wdinfo, P2P_STATE_NONE); -+ #endif -+ -+ if (chk_ap_is_alive(padapter, psta) == _FALSE) -+ rx_chk = _FAIL; -+ -+ if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts) -+ tx_chk = _FAIL; -+ -+ #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ if (pmlmeext->active_keep_alive_check && (rx_chk == _FAIL || tx_chk == _FAIL)) { -+ u8 backup_oper_channel=0; -+ -+ /* switch to correct channel of current network before issue keep-alive frames */ -+ if (rtw_get_oper_ch(padapter) != pmlmeext->cur_channel) { -+ backup_oper_channel = rtw_get_oper_ch(padapter); -+ SelectChannel(padapter, pmlmeext->cur_channel); -+ } -+ -+ if (rx_chk != _SUCCESS) -+ issue_probereq_ex(padapter, &pmlmeinfo->network.Ssid, psta->hwaddr, 3, 1); -+ -+ if ((tx_chk != _SUCCESS && pmlmeinfo->link_count++ == 0xf) || rx_chk != _SUCCESS) { -+ tx_chk = issue_nulldata(padapter, psta->hwaddr, 0, 3, 1); -+ /* if tx acked and p2p disabled, set rx_chk _SUCCESS to reset retry count */ -+ if (tx_chk == _SUCCESS && !is_p2p_enable) -+ rx_chk = _SUCCESS; -+ } -+ -+ /* back to the original operation channel */ -+ if(backup_oper_channel>0) -+ SelectChannel(padapter, backup_oper_channel); -+ -+ } -+ else -+ #endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ -+ { -+ if (rx_chk != _SUCCESS) { -+ if (pmlmeext->retry == 0) { -+ #ifdef DBG_EXPIRATION_CHK -+ DBG_871X("issue_probereq to trigger probersp, retry=%d\n", pmlmeext->retry); -+ #endif -+ issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress); -+ issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress); -+ issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress); -+ } -+ } -+ -+ if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == 0xf) { -+ #ifdef DBG_EXPIRATION_CHK -+ DBG_871X("%s issue_nulldata 0\n", __FUNCTION__); -+ #endif -+ tx_chk = issue_nulldata(padapter, NULL, 0, 1, 0); -+ } -+ } -+ -+ if (rx_chk == _FAIL) { -+ pmlmeext->retry++; -+ if (pmlmeext->retry > rx_chk_limit) { -+ DBG_871X(FUNC_ADPT_FMT" disconnect or roaming\n", -+ FUNC_ADPT_ARG(padapter)); -+ receive_disconnect(padapter, pmlmeinfo->network.MacAddress -+ , WLAN_REASON_EXPIRATION_CHK); -+ return; -+ } -+ } else { -+ pmlmeext->retry = 0; -+ } -+ -+ if (tx_chk == _FAIL) { -+ pmlmeinfo->link_count &= 0xf; -+ } else { -+ pxmitpriv->last_tx_pkts = pxmitpriv->tx_pkts; -+ pmlmeinfo->link_count = 0; -+ } -+ -+ } //end of if ((psta = rtw_get_stainfo(pstapriv, passoc_res->network.MacAddress)) != NULL) -+ } -+ else if (is_client_associated_to_ibss(padapter)) -+ { -+ //linked IBSS mode -+ //for each assoc list entry to check the rx pkt counter -+ for (i = IBSS_START_MAC_ID; i < NUM_STA; i++) -+ { -+ if (pmlmeinfo->FW_sta_info[i].status == 1) -+ { -+ psta = pmlmeinfo->FW_sta_info[i].psta; -+ -+ if(NULL==psta) continue; -+ -+ if (pmlmeinfo->FW_sta_info[i].rx_pkt == sta_rx_pkts(psta)) -+ { -+ -+ if(pmlmeinfo->FW_sta_info[i].retry<3) -+ { -+ pmlmeinfo->FW_sta_info[i].retry++; -+ } -+ else -+ { -+ pmlmeinfo->FW_sta_info[i].retry = 0; -+ pmlmeinfo->FW_sta_info[i].status = 0; -+ report_del_sta_event(padapter, psta->hwaddr -+ , 65535// indicate disconnect caused by no rx -+ ); -+ } -+ } -+ else -+ { -+ pmlmeinfo->FW_sta_info[i].retry = 0; -+ pmlmeinfo->FW_sta_info[i].rx_pkt = (u32)sta_rx_pkts(psta); -+ } -+ } -+ } -+ -+ //set_link_timer(pmlmeext, DISCONNECT_TO); -+ -+ } -+ -+} -+ -+void survey_timer_hdl(_adapter *padapter) -+{ -+ struct cmd_obj *ph2c; -+ struct sitesurvey_parm *psurveyPara; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif -+ -+ //DBG_871X("marc: survey timer\n"); -+#ifdef PLATFORM_FREEBSD -+ rtw_mtx_lock(NULL); -+ if (callout_pending(&padapter->mlmeextpriv.survey_timer.callout)) { -+ /* callout was reset */ -+ //mtx_unlock(&sc->sc_mtx); -+ rtw_mtx_unlock(NULL); -+ return; -+ } -+ if (!callout_active(&padapter->mlmeextpriv.survey_timer.callout)) { -+ /* callout was stopped */ -+ //mtx_unlock(&sc->sc_mtx); -+ rtw_mtx_unlock(NULL); -+ return; -+ } -+ callout_deactivate(&padapter->mlmeextpriv.survey_timer.callout); -+ -+ -+#endif -+ -+ //issue rtw_sitesurvey_cmd -+ if (pmlmeext->sitesurvey_res.state > SCAN_START) -+ { -+ if(pmlmeext->sitesurvey_res.state == SCAN_PROCESS) -+ { -+#ifdef CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ if( padapter->mlmeextpriv.mlmext_info.scan_cnt != RTW_SCAN_NUM_OF_CH ) -+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ pmlmeext->sitesurvey_res.channel_idx++; -+ } -+ -+ if(pmlmeext->scan_abort == _TRUE) -+ { -+ #ifdef CONFIG_P2P -+ if(!rtw_p2p_chk_state(&padapter->wdinfo, P2P_STATE_NONE)) -+ { -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_MAX); -+ pmlmeext->sitesurvey_res.channel_idx = 3; -+ DBG_871X("%s idx:%d, cnt:%u\n", __FUNCTION__ -+ , pmlmeext->sitesurvey_res.channel_idx -+ , pwdinfo->find_phase_state_exchange_cnt -+ ); -+ } -+ else -+ #endif -+ { -+ pmlmeext->sitesurvey_res.channel_idx = pmlmeext->sitesurvey_res.ch_num; -+ DBG_871X("%s idx:%d\n", __FUNCTION__ -+ , pmlmeext->sitesurvey_res.channel_idx -+ ); -+ } -+ -+ pmlmeext->scan_abort = _FALSE;//reset -+ } -+ -+ if ((ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ goto exit_survey_timer_hdl; -+ } -+ -+ if ((psurveyPara = (struct sitesurvey_parm*)rtw_zmalloc(sizeof(struct sitesurvey_parm))) == NULL) -+ { -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ goto exit_survey_timer_hdl; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, GEN_CMD_CODE(_SiteSurvey)); -+ rtw_enqueue_cmd(pcmdpriv, ph2c); -+ } -+ -+ -+exit_survey_timer_hdl: -+#ifdef PLATFORM_FREEBSD -+ rtw_mtx_unlock(NULL); -+#endif -+ -+ return; -+} -+ -+void link_timer_hdl(_adapter *padapter) -+{ -+ //static unsigned int rx_pkt = 0; -+ //static u64 tx_cnt = 0; -+ //struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ //struct sta_priv *pstapriv = &padapter->stapriv; -+ -+#ifdef PLATFORM_FREEBSD -+ rtw_mtx_lock(NULL); -+ if (callout_pending(&padapter->mlmeextpriv.survey_timer.callout)) { -+ /* callout was reset */ -+ //mtx_unlock(&sc->sc_mtx); -+ rtw_mtx_unlock(NULL); -+ return; -+ } -+ if (!callout_active(&padapter->mlmeextpriv.survey_timer.callout)) { -+ /* callout was stopped */ -+ //mtx_unlock(&sc->sc_mtx); -+ rtw_mtx_unlock(NULL); -+ return; -+ } -+ callout_deactivate(&padapter->mlmeextpriv.survey_timer.callout); -+ -+ -+#endif -+ -+ if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) -+ { -+ DBG_871X("link_timer_hdl:no beacon while connecting\n"); -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ report_join_res(padapter, -3); -+ } -+ else if (pmlmeinfo->state & WIFI_FW_AUTH_STATE) -+ { -+ //re-auth timer -+ if (++pmlmeinfo->reauth_count > REAUTH_LIMIT) -+ { -+ //if (pmlmeinfo->auth_algo != dot11AuthAlgrthm_Auto) -+ //{ -+ pmlmeinfo->state = 0; -+ report_join_res(padapter, -1); -+ return; -+ //} -+ //else -+ //{ -+ // pmlmeinfo->auth_algo = dot11AuthAlgrthm_Shared; -+ // pmlmeinfo->reauth_count = 0; -+ //} -+ } -+ -+ DBG_871X("link_timer_hdl: auth timeout and try again\n"); -+ pmlmeinfo->auth_seq = 1; -+ issue_auth(padapter, NULL, 0); -+ set_link_timer(pmlmeext, REAUTH_TO); -+ } -+ else if (pmlmeinfo->state & WIFI_FW_ASSOC_STATE) -+ { -+ //re-assoc timer -+ if (++pmlmeinfo->reassoc_count > REASSOC_LIMIT) -+ { -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ report_join_res(padapter, -2); -+ return; -+ } -+ -+ DBG_871X("link_timer_hdl: assoc timeout and try again\n"); -+ issue_assocreq(padapter); -+ set_link_timer(pmlmeext, REASSOC_TO); -+ } -+#if 0 -+ else if (is_client_associated_to_ap(padapter)) -+ { -+ //linked infrastructure client mode -+ if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) -+ { -+ /*to monitor whether the AP is alive or not*/ -+ if (rx_pkt == psta->sta_stats.rx_pkts) -+ { -+ receive_disconnect(padapter, pmlmeinfo->network.MacAddress); -+ return; -+ } -+ else -+ { -+ rx_pkt = psta->sta_stats.rx_pkts; -+ set_link_timer(pmlmeext, DISCONNECT_TO); -+ } -+ -+ //update the EDCA paramter according to the Tx/RX mode -+ update_EDCA_param(padapter); -+ -+ /*to send the AP a nulldata if no frame is xmitted in order to keep alive*/ -+ if (pmlmeinfo->link_count++ == 0) -+ { -+ tx_cnt = pxmitpriv->tx_pkts; -+ } -+ else if ((pmlmeinfo->link_count & 0xf) == 0) -+ { -+ if (tx_cnt == pxmitpriv->tx_pkts) -+ { -+ issue_nulldata(padapter, NULL, 0, 0, 0); -+ } -+ -+ tx_cnt = pxmitpriv->tx_pkts; -+ } -+ } //end of if ((psta = rtw_get_stainfo(pstapriv, passoc_res->network.MacAddress)) != NULL) -+ } -+ else if (is_client_associated_to_ibss(padapter)) -+ { -+ //linked IBSS mode -+ //for each assoc list entry to check the rx pkt counter -+ for (i = IBSS_START_MAC_ID; i < NUM_STA; i++) -+ { -+ if (pmlmeinfo->FW_sta_info[i].status == 1) -+ { -+ psta = pmlmeinfo->FW_sta_info[i].psta; -+ -+ if (pmlmeinfo->FW_sta_info[i].rx_pkt == psta->sta_stats.rx_pkts) -+ { -+ pmlmeinfo->FW_sta_info[i].status = 0; -+ report_del_sta_event(padapter, psta->hwaddr); -+ } -+ else -+ { -+ pmlmeinfo->FW_sta_info[i].rx_pkt = psta->sta_stats.rx_pkts; -+ } -+ } -+ } -+ -+ set_link_timer(pmlmeext, DISCONNECT_TO); -+ } -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+ rtw_mtx_unlock(NULL); -+#endif -+ -+ return; -+} -+ -+void addba_timer_hdl(struct sta_info *psta) -+{ -+ struct ht_priv *phtpriv; -+ -+ if(!psta) -+ return; -+ -+ phtpriv = &psta->htpriv; -+ -+ if((phtpriv->ht_option==_TRUE) && (phtpriv->ampdu_enable==_TRUE)) -+ { -+ if(phtpriv->candidate_tid_bitmap) -+ phtpriv->candidate_tid_bitmap=0x0; -+ -+ } -+} -+ -+#ifdef CONFIG_IEEE80211W -+void sa_query_timer_hdl(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_priv * pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ //disconnect -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ rtw_disassoc_cmd(padapter, 0, _TRUE); -+ rtw_indicate_disconnect(padapter); -+ rtw_free_assoc_resources(padapter, 1); -+ } -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ DBG_871X("SA query timeout disconnect\n"); -+} -+#endif //CONFIG_IEEE80211W -+ -+u8 NULL_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ return H2C_SUCCESS; -+} -+ -+#ifdef CONFIG_AUTO_AP_MODE -+void rtw_start_auto_ap(_adapter *adapter) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ rtw_set_802_11_infrastructure_mode(adapter, Ndis802_11APMode); -+ -+ rtw_setopmode_cmd(adapter, Ndis802_11APMode); -+} -+ -+static int rtw_auto_ap_start_beacon(_adapter *adapter) -+{ -+ int ret=0; -+ u8 *pbuf = NULL; -+ uint len; -+ u8 supportRate[16]; -+ int sz = 0, rateLen; -+ u8 * ie; -+ u8 wireless_mode, oper_channel; -+ u8 ssid[3] = {0}; //hidden ssid -+ u32 ssid_len = sizeof(ssid); -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ -+ len = 128; -+ pbuf = rtw_zmalloc(len); -+ if(!pbuf) -+ return -ENOMEM; -+ -+ -+ //generate beacon -+ ie = pbuf; -+ -+ //timestamp will be inserted by hardware -+ sz += 8; -+ ie += sz; -+ -+ //beacon interval : 2bytes -+ *(u16*)ie = cpu_to_le16((u16)100);//BCN_INTERVAL=100; -+ sz += 2; -+ ie += 2; -+ -+ //capability info -+ *(u16*)ie = 0; -+ *(u16*)ie |= cpu_to_le16(cap_ESS); -+ *(u16*)ie |= cpu_to_le16(cap_ShortPremble); -+ //*(u16*)ie |= cpu_to_le16(cap_Privacy); -+ sz += 2; -+ ie += 2; -+ -+ //SSID -+ ie = rtw_set_ie(ie, _SSID_IE_, ssid_len, ssid, &sz); -+ -+ //supported rates -+ wireless_mode = WIRELESS_11BG_24N; -+ rtw_set_supported_rate(supportRate, wireless_mode) ; -+ rateLen = rtw_get_rateset_len(supportRate); -+ if (rateLen > 8) -+ { -+ ie = rtw_set_ie(ie, _SUPPORTEDRATES_IE_, 8, supportRate, &sz); -+ } -+ else -+ { -+ ie = rtw_set_ie(ie, _SUPPORTEDRATES_IE_, rateLen, supportRate, &sz); -+ } -+ -+ -+ //DS parameter set -+ if(check_buddy_fwstate(adapter, _FW_LINKED) && -+ check_buddy_fwstate(adapter, WIFI_STATION_STATE)) -+ { -+ PADAPTER pbuddy_adapter = adapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ oper_channel = pbuddy_mlmeext->cur_channel; -+ } -+ else -+ { -+ oper_channel = adapter_to_dvobj(adapter)->oper_channel; -+ } -+ ie = rtw_set_ie(ie, _DSSET_IE_, 1, &oper_channel, &sz); -+ -+ //ext supported rates -+ if (rateLen > 8) -+ { -+ ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (supportRate + 8), &sz); -+ } -+ -+ DBG_871X("%s, start auto ap beacon sz=%d\n", __FUNCTION__, sz); -+ -+ //lunch ap mode & start to issue beacon -+ if(rtw_check_beacon_data(adapter, pbuf, sz) == _SUCCESS) -+ { -+ -+ } -+ else -+ { -+ ret = -EINVAL; -+ } -+ -+ -+ rtw_mfree(pbuf, len); -+ -+ return ret; -+ -+} -+#endif//CONFIG_AUTO_AP_MODE -+ -+u8 setopmode_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ u8 type; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct setopmode_parm *psetop = (struct setopmode_parm *)pbuf; -+ -+ if(psetop->mode == Ndis802_11APMode) -+ { -+ pmlmeinfo->state = WIFI_FW_AP_STATE; -+ type = _HW_STATE_AP_; -+#ifdef CONFIG_NATIVEAP_MLME -+ //start_ap_mode(padapter); -+#endif -+ } -+ else if(psetop->mode == Ndis802_11Infrastructure) -+ { -+ pmlmeinfo->state &= ~(BIT(0)|BIT(1));// clear state -+ pmlmeinfo->state |= WIFI_FW_STATION_STATE;//set to STATION_STATE -+ type = _HW_STATE_STATION_; -+ } -+ else if(psetop->mode == Ndis802_11IBSS) -+ { -+ type = _HW_STATE_ADHOC_; -+ } -+ else -+ { -+ type = _HW_STATE_NOLINK_; -+ } -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_SET_OPMODE, (u8 *)(&type)); -+ //Set_NETYPE0_MSR(padapter, type); -+ -+#ifdef CONFIG_AUTO_AP_MODE -+ if(psetop->mode == Ndis802_11APMode) -+ rtw_auto_ap_start_beacon(padapter); -+#endif -+ -+ return H2C_SUCCESS; -+ -+} -+ -+u8 createbss_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); -+ struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf; -+ u32 initialgain; -+ -+ -+ if(pparm->network.InfrastructureMode == Ndis802_11APMode) -+ { -+#ifdef CONFIG_AP_MODE -+ -+ if(pmlmeinfo->state == WIFI_FW_AP_STATE) -+ { -+ //todo: -+ return H2C_SUCCESS; -+ } -+#endif -+ } -+ -+ //below is for ad-hoc master -+ if(pparm->network.InfrastructureMode == Ndis802_11IBSS) -+ { -+ rtw_joinbss_reset(padapter); -+ -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset= HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ pmlmeinfo->ERP_enable = 0; -+ pmlmeinfo->WMM_enable = 0; -+ pmlmeinfo->HT_enable = 0; -+ pmlmeinfo->HT_caps_enable = 0; -+ pmlmeinfo->HT_info_enable = 0; -+ pmlmeinfo->agg_enable_bitmap = 0; -+ pmlmeinfo->candidate_tid_bitmap = 0; -+ -+ //disable dynamic functions, such as high power, DIG -+ Save_DM_Func_Flag(padapter); -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+ //config the initial gain under linking, need to write the BB registers -+ initialgain = 0x1E; -+ rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); -+ -+ //cancel link timer -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ //clear CAM -+ flush_all_cam_entry(padapter); -+ -+ _rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); -+ pnetwork->IELength = ((WLAN_BSSID_EX *)pbuf)->IELength; -+ -+ if(pnetwork->IELength>MAX_IE_SZ)//Check pbuf->IELength -+ return H2C_PARAMETERS_ERROR; -+ -+ _rtw_memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength); -+ -+ start_create_ibss(padapter); -+ -+ } -+ -+ return H2C_SUCCESS; -+ -+} -+ -+u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ u8 join_type; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf; -+#endif //CONFIG_ANTENNA_DIVERSITY -+ u32 initialgain, i; -+ u8 cbw40_enable=0; -+ //u32 acparm; -+ -+ //check already connecting to AP or not -+ if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) -+ { -+ if (pmlmeinfo->state & WIFI_FW_STATION_STATE) -+ { -+ issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, 5, 100); -+ } -+ -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ -+ //clear CAM -+ flush_all_cam_entry(padapter); -+ -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ //set MSR to nolink -> infra. mode -+ //Set_MSR(padapter, _HW_STATE_NOLINK_); -+ Set_MSR(padapter, _HW_STATE_STATION_); -+ -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, 0); -+ } -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, _FALSE); -+#endif -+ -+ rtw_joinbss_reset(padapter); -+ -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset= HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ pmlmeinfo->ERP_enable = 0; -+ pmlmeinfo->WMM_enable = 0; -+ pmlmeinfo->HT_enable = 0; -+ pmlmeinfo->HT_caps_enable = 0; -+ pmlmeinfo->HT_info_enable = 0; -+ pmlmeinfo->agg_enable_bitmap = 0; -+ pmlmeinfo->candidate_tid_bitmap = 0; -+ pmlmeinfo->bwmode_updated = _FALSE; -+ //pmlmeinfo->assoc_AP_vendor = maxAP; -+ -+ _rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); -+ pnetwork->IELength = ((WLAN_BSSID_EX *)pbuf)->IELength; -+ -+ if(pnetwork->IELength>MAX_IE_SZ)//Check pbuf->IELength -+ return H2C_PARAMETERS_ERROR; -+ -+ _rtw_memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength); -+ -+ pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig; -+ pmlmeinfo->bcn_interval = get_beacon_interval(pnetwork); -+ -+ //Check AP vendor to move rtw_joinbss_cmd() -+ //pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->IEs, pnetwork->IELength); -+ -+ for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i); -+ -+ switch (pIE->ElementID) -+ { -+ case _VENDOR_SPECIFIC_IE_://Get WMM IE. -+ if ( _rtw_memcmp(pIE->data, WMM_OUI, 4) ) -+ { -+ pmlmeinfo->WMM_enable = 1; -+ } -+ break; -+ -+ case _HT_CAPABILITY_IE_: //Get HT Cap IE. -+ pmlmeinfo->HT_caps_enable = 1; -+ break; -+ -+ case _HT_EXTRA_INFO_IE_: //Get HT Info IE. -+ pmlmeinfo->HT_info_enable = 1; -+ -+ //spec case only for cisco's ap because cisco's ap issue assoc rsp using mcs rate @40MHz or @20MHz -+//#if !defined(CONFIG_CONCURRENT_MODE) && !defined(CONFIG_DUALMAC_CONCURRENT) -+// if(pmlmeinfo->assoc_AP_vendor == ciscoAP) -+//#endif -+ { -+ struct HT_info_element *pht_info = (struct HT_info_element *)(pIE->data); -+ -+ if( pnetwork->Configuration.DSConfig > 14 ) -+ { -+ if( pregpriv->cbw40_enable & BIT(1) ) -+ cbw40_enable = 1; -+ } -+ else -+ if( pregpriv->cbw40_enable & BIT(0) ) -+ cbw40_enable = 1; -+ -+ if ((cbw40_enable) && (pht_info->infos[0] & BIT(2))) -+ { -+ //switch to the 40M Hz mode according to the AP -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ switch (pht_info->infos[0] & 0x3) -+ { -+ case 1: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ break; -+ -+ case 3: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ break; -+ -+ default: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ break; -+ } -+ -+ DBG_871X("set ch/bw before connected\n"); -+ } -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+#if 0 -+ if (padapter->registrypriv.wifi_spec) { -+ // for WiFi test, follow WMM test plan spec -+ acparm = 0x002F431C; // VO -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acparm)); -+ acparm = 0x005E541C; // VI -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acparm)); -+ acparm = 0x0000A525; // BE -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm)); -+ acparm = 0x0000A549; // BK -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm)); -+ -+ // for WiFi test, mixed mode with intel STA under bg mode throughput issue -+ if (padapter->mlmepriv.htpriv.ht_option == _FALSE){ -+ acparm = 0x00004320; -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm)); -+ } -+ } -+ else { -+ acparm = 0x002F3217; // VO -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acparm)); -+ acparm = 0x005E4317; // VI -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acparm)); -+ acparm = 0x00105320; // BE -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm)); -+ acparm = 0x0000A444; // BK -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm)); -+ } -+#endif -+ -+ /* check channel, bandwidth, offset and switch */ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ if(dc_handle_join_request(padapter) == _FAIL) { -+ DBG_871X("dc_handle_join_request fail !!!\n"); -+ return H2C_SUCCESS; -+ } -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+#else //NON CONFIG_DUALMAC_CONCURRENT -+ if(rtw_chk_start_clnt_join(padapter) == _FAIL) { -+ report_join_res(padapter, (-4)); -+ return H2C_SUCCESS; -+ } -+#endif -+ -+ //disable dynamic functions, such as high power, DIG -+ //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+ //config the initial gain under linking, need to write the BB registers -+ -+ initialgain = 0x1E; -+ rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); -+ -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pmlmeinfo->network.MacAddress); -+ join_type = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); -+ -+ //cancel link timer -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ start_clnt_join(padapter); -+ -+ return H2C_SUCCESS; -+ -+} -+ -+u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ struct disconnect_parm *param = (struct disconnect_parm *)pbuf; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); -+ u8 val8; -+ -+ if (is_client_associated_to_ap(padapter)) -+ { -+ issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, param->deauth_timeout_ms/100, 100); -+ } -+ -+ //set_opmode_cmd(padapter, infra_client_with_mlme); -+ -+ //pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, 0); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, null_addr); -+ -+ //restore to initial setting. -+ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); -+ -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) -+ { -+ //Stop BCN -+ val8 = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8)); -+ } -+ -+ -+ //set MSR to no link state -> infra. mode -+ Set_MSR(padapter, _HW_STATE_STATION_); -+ -+ pmlmeinfo->state = WIFI_FW_NULL_STATE; -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ dc_set_channel_bwmode_disconnect(padapter); -+#else -+#ifdef CONFIG_CONCURRENT_MODE -+ if((check_buddy_fwstate(padapter, _FW_LINKED)) != _TRUE) -+ { -+#endif //CONFIG_CONCURRENT_MODE -+ //switch to the 20M Hz mode after disconnect -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+#ifdef CONFIG_CONCURRENT_MODE -+ } -+#endif //CONFIG_CONCURRENT_MODE -+#endif //CONFIG_DUALMAC_CONCURRENT -+ -+ flush_all_cam_entry(padapter); -+ -+ _cancel_timer_ex(&pmlmeext->link_timer); -+ -+ rtw_free_uc_swdec_pending_queue(padapter); -+ -+ return H2C_SUCCESS; -+} -+ -+int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel *out, -+ u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num) -+{ -+ int i, j; -+ int scan_ch_num = 0; -+ int set_idx; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ /* clear first */ -+ _rtw_memset(out, 0, sizeof(struct rtw_ieee80211_channel)*out_num); -+ -+ /* acquire channels from in */ -+ j = 0; -+ for (i=0;ichannel_set, in[i].hw_value)) >=0 -+ && rtw_mlme_band_check(padapter, in[i].hw_value) == _TRUE -+ ) -+ { -+ if (j >= out_num) { -+ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" out_num:%u not enough\n", -+ FUNC_ADPT_ARG(padapter), out_num); -+ break; -+ } -+ -+ _rtw_memcpy(&out[j], &in[i], sizeof(struct rtw_ieee80211_channel)); -+ -+ if(pmlmeext->channel_set[set_idx].ScanType == SCAN_PASSIVE) -+ out[j].flags &= RTW_IEEE80211_CHAN_PASSIVE_SCAN; -+ -+ j++; -+ } -+ if(j>=out_num) -+ break; -+ } -+ -+ /* if out is empty, use channel_set as default */ -+ if(j == 0) { -+ for (i=0;imax_chan_nums;i++) { -+ -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter), pmlmeext->channel_set[i].ChannelNum); -+ -+ if (rtw_mlme_band_check(padapter, pmlmeext->channel_set[i].ChannelNum) == _TRUE) { -+ -+ if (j >= out_num) { -+ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" out_num:%u not enough\n", -+ FUNC_ADPT_ARG(padapter), out_num); -+ break; -+ } -+ -+ out[j].hw_value = pmlmeext->channel_set[i].ChannelNum; -+ -+ if(pmlmeext->channel_set[i].ScanType == SCAN_PASSIVE) -+ out[j].flags &= RTW_IEEE80211_CHAN_PASSIVE_SCAN; -+ -+ j++; -+ } -+ } -+ } -+ -+ return j; -+} -+ -+u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf; -+ u8 bdelayscan = _FALSE; -+ u8 val8; -+ u32 initialgain; -+ u32 i; -+ u8 write_initial_gain = 1; -+ -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif -+ -+ if (pmlmeext->sitesurvey_res.state == SCAN_DISABLE) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ //for first time sitesurvey_cmd -+ rtw_hal_set_hwreg(padapter, HW_VAR_CHECK_TXBUF, 0); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ pmlmeext->sitesurvey_res.state = SCAN_START; -+ pmlmeext->sitesurvey_res.bss_cnt = 0; -+ pmlmeext->sitesurvey_res.channel_idx = 0; -+ -+ for(i=0;issid[i].SsidLength) { -+ _rtw_memcpy(pmlmeext->sitesurvey_res.ssid[i].Ssid, pparm->ssid[i].Ssid, IW_ESSID_MAX_SIZE); -+ pmlmeext->sitesurvey_res.ssid[i].SsidLength= pparm->ssid[i].SsidLength; -+ } else { -+ pmlmeext->sitesurvey_res.ssid[i].SsidLength= 0; -+ } -+ } -+ -+ pmlmeext->sitesurvey_res.ch_num = rtw_scan_ch_decision(padapter -+ , pmlmeext->sitesurvey_res.ch, RTW_CHANNEL_SCAN_AMOUNT -+ , pparm->ch, pparm->ch_num -+ ); -+ -+ pmlmeext->sitesurvey_res.scan_mode = pparm->scan_mode; -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ bdelayscan = dc_handle_site_survey(padapter); -+#endif -+ -+ //issue null data if associating to the AP -+ if (is_client_associated_to_ap(padapter) == _TRUE) -+ { -+ pmlmeext->sitesurvey_res.state = SCAN_TXNULL; -+ -+ issue_nulldata(padapter, NULL, 1, 3, 500); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) -+ { -+ DBG_871X("adapter is scanning(buddy_adapter is linked), issue nulldata(pwrbit=1)\n"); -+ -+ issue_nulldata(padapter->pbuddy_adapter, NULL, 1, 3, 500); -+ } -+#endif -+ bdelayscan = _TRUE; -+ } -+#ifdef CONFIG_CONCURRENT_MODE -+ else if(is_client_associated_to_ap(padapter->pbuddy_adapter) == _TRUE) -+ { -+ #ifdef CONFIG_TDLS -+ if(padapter->pbuddy_adapter->wdinfo.wfd_tdls_enable == 1) -+ { -+ issue_tunneled_probe_req(padapter->pbuddy_adapter); -+ } -+ #endif //CONFIG_TDLS -+ -+ pmlmeext->sitesurvey_res.state = SCAN_TXNULL; -+ -+ issue_nulldata(padapter->pbuddy_adapter, NULL, 1, 3, 500); -+ -+ bdelayscan = _TRUE; -+ } -+#endif -+ if(bdelayscan) -+ { -+ //delay 50ms to protect nulldata(1). -+ set_survey_timer(pmlmeext, 50); -+ return H2C_SUCCESS; -+ } -+ } -+ -+ if ((pmlmeext->sitesurvey_res.state == SCAN_START) || (pmlmeext->sitesurvey_res.state == SCAN_TXNULL)) -+ { -+#ifdef CONFIG_FIND_BEST_CHANNEL -+#if 0 -+ for (i=0; pmlmeext->channel_set[i].ChannelNum !=0; i++) { -+ pmlmeext->channel_set[i].rx_count = 0; -+ } -+#endif -+#endif /* CONFIG_FIND_BEST_CHANNEL */ -+ -+ //disable dynamic functions, such as high power, DIG -+ Save_DM_Func_Flag(padapter); -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+ //config the initial gain under scaning, need to write the BB registers -+ -+#ifdef CONFIG_P2P -+#ifdef CONFIG_IOCTL_CFG80211 -+ if((wdev_to_priv(padapter->rtw_wdev))->p2p_enabled == _TRUE && pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ write_initial_gain = 0; -+ } -+ else -+#endif //CONFIG_IOCTL_CFG80211 -+ if ( !rtw_p2p_chk_state( pwdinfo, P2P_STATE_NONE ) ) -+ initialgain = 0x28; -+ else -+#endif //CONFIG_P2P -+ initialgain = 0x17; -+ -+ if(write_initial_gain == 1) -+ rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); -+ -+ //set MSR to no link state -+ Set_MSR(padapter, _HW_STATE_NOLINK_); -+ -+ val8 = 1; //under site survey -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ -+ pmlmeext->sitesurvey_res.state = SCAN_PROCESS; -+ } -+ -+ site_survey(padapter); -+ -+ return H2C_SUCCESS; -+ -+} -+ -+u8 setauth_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ struct setauth_parm *pparm = (struct setauth_parm *)pbuf; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if (pparm->mode < 4) -+ { -+ pmlmeinfo->auth_algo = pparm->mode; -+ } -+ -+ return H2C_SUCCESS; -+} -+ -+u8 setkey_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ unsigned short ctrl; -+ struct setkey_parm *pparm = (struct setkey_parm *)pbuf; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+ -+ //main tx key for wep. -+ if(pparm->set_tx) -+ pmlmeinfo->key_index = pparm->keyid; -+ -+ //write cam -+ ctrl = BIT(15) | ((pparm->algorithm) << 2) | pparm->keyid; -+ -+ write_cam(padapter, pparm->keyid, ctrl, null_sta, pparm->key); -+ -+ //allow multicast packets to driver -+ rtw_hal_set_hwreg(padapter, HW_VAR_ON_RCR_AM, null_addr); -+ -+ return H2C_SUCCESS; -+} -+ -+u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ u16 ctrl=0; -+ u8 cam_id=0;//cam_entry -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct set_stakey_parm *pparm = (struct set_stakey_parm *)pbuf; -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta; -+#endif //CONFIG_TDLS -+ -+ //cam_entry: -+ //0~3 for default key -+ -+ //for concurrent mode (ap+sta): -+ //default key is disable, using sw encrypt/decrypt -+ //cam_entry = 4 //for sta mode (macid=0) -+ //cam_entry(macid+3) = 5 ~ N//for ap mode (aid=1~N, macid=2 ~N) -+ -+ //for concurrent mode (sta+sta): -+ //default key is disable, using sw encrypt/decrypt -+ //cam_entry = 4 //mapping to macid=0 -+ //cam_entry = 5 //mapping to macid=2 -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) -+ { -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta; -+ -+ psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress); -+ -+ if(psta && psta->mac_id==2) -+ { -+ cam_id = 5; -+ } -+ else -+ { -+ cam_id = 4; -+ } -+/* -+ if(padapter->iface_type > PRIMARY_IFACE) -+ { -+ cam_id = 5; -+ } -+ else -+ { -+ cam_id = 4; -+ } -+*/ -+ } -+#else -+ cam_id = 4; -+#endif -+ -+ -+ if((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) -+ { -+ -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ if(pparm->algorithm == _NO_PRIVACY_) // clear cam entry -+ { -+ clear_cam_entry(padapter, pparm->id); -+ return H2C_SUCCESS_RSP; -+ } -+ -+ psta = rtw_get_stainfo(pstapriv, pparm->addr); -+ if(psta) -+ { -+ ctrl = (BIT(15) | ((pparm->algorithm) << 2)); -+ -+ DBG_871X("r871x_set_stakey_hdl(): enc_algorithm=%d\n", pparm->algorithm); -+ -+ if((psta->mac_id<1) || (psta->mac_id>(NUM_STA-4))) -+ { -+ DBG_871X("r871x_set_stakey_hdl():set_stakey failed, mac_id(aid)=%d\n", psta->mac_id); -+ return H2C_REJECTED; -+ } -+ -+ cam_id = (psta->mac_id + 3);//0~3 for default key, cmd_id=macid + 3, macid=aid+1; -+ -+ DBG_871X("Write CAM, mac_addr=%x:%x:%x:%x:%x:%x, cam_entry=%d\n", pparm->addr[0], -+ pparm->addr[1], pparm->addr[2], pparm->addr[3], pparm->addr[4], -+ pparm->addr[5], cam_id); -+ -+ write_cam(padapter, cam_id, ctrl, pparm->addr, pparm->key); -+ -+ return H2C_SUCCESS_RSP; -+ -+ } -+ else -+ { -+ DBG_871X("r871x_set_stakey_hdl(): sta has been free\n"); -+ return H2C_REJECTED; -+ } -+ -+ } -+ -+ //below for sta mode -+ -+ if(pparm->algorithm == _NO_PRIVACY_) // clear cam entry -+ { -+ clear_cam_entry(padapter, pparm->id); -+ return H2C_SUCCESS; -+ } -+ -+ ctrl = BIT(15) | ((pparm->algorithm) << 2); -+ -+#ifdef CONFIG_TDLS -+ if(ptdlsinfo->clear_cam!=0){ -+ clear_cam_entry(padapter, ptdlsinfo->clear_cam); -+ ptdlsinfo->clear_cam=0; -+ -+ return H2C_SUCCESS; -+ } -+ -+ psta = rtw_get_stainfo(pstapriv, pparm->addr);//Get TDLS Peer STA -+ if( psta->tdls_sta_state&TDLS_LINKED_STATE ){ -+ write_cam(padapter, psta->mac_id, ctrl, pparm->addr, pparm->key); -+ } -+ else -+#endif //CONFIG_TDLS -+ write_cam(padapter, cam_id, ctrl, pparm->addr, pparm->key); -+ -+ pmlmeinfo->enc_algo = pparm->algorithm; -+ -+ return H2C_SUCCESS; -+} -+ -+u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, pparm->addr); -+ -+ if(!psta) -+ return H2C_SUCCESS; -+ -+ -+ if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) || -+ ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) -+ { -+ //pmlmeinfo->ADDBA_retry_count = 0; -+ //pmlmeinfo->candidate_tid_bitmap |= (0x1 << pparm->tid); -+ //psta->htpriv.candidate_tid_bitmap |= BIT(pparm->tid); -+ issue_action_BA(padapter, pparm->addr, RTW_WLAN_ACTION_ADDBA_REQ, (u16)pparm->tid); -+ //_set_timer(&pmlmeext->ADDBA_timer, ADDBA_TO); -+ _set_timer(&psta->addba_retry_timer, ADDBA_TO); -+ } -+#ifdef CONFIG_TDLS -+ else if((psta->tdls_sta_state & TDLS_LINKED_STATE)&& -+ (psta->htpriv.ht_option==_TRUE) && -+ (psta->htpriv.ampdu_enable==_TRUE) ) -+ { -+ issue_action_BA(padapter, pparm->addr, RTW_WLAN_ACTION_ADDBA_REQ, (u16)pparm->tid); -+ //_set_timer(&pmlmeext->ADDBA_timer, ADDBA_TO); -+ _set_timer(&psta->addba_retry_timer, ADDBA_TO); -+ } -+#endif //CONFIG -+ else -+ { -+ psta->htpriv.candidate_tid_bitmap &= ~BIT(pparm->tid); -+ } -+ -+ return H2C_SUCCESS; -+} -+ -+u8 set_tx_beacon_cmd(_adapter* padapter) -+{ -+ struct cmd_obj *ph2c; -+ struct Tx_Beacon_param *ptxBeacon_parm; -+ struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 res = _SUCCESS; -+ int len_diff = 0; -+ -+_func_enter_; -+ -+ if ((ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ res= _FAIL; -+ goto exit; -+ } -+ -+ if ((ptxBeacon_parm = (struct Tx_Beacon_param *)rtw_zmalloc(sizeof(struct Tx_Beacon_param))) == NULL) -+ { -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); -+ -+ len_diff = update_hidden_ssid( -+ ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_ -+ , ptxBeacon_parm->network.IELength-_BEACON_IE_OFFSET_ -+ , pmlmeinfo->hidden_ssid_mode -+ ); -+ ptxBeacon_parm->network.IELength += len_diff; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, ptxBeacon_parm, GEN_CMD_CODE(_TX_Beacon)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+ -+u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ u8 evt_code, evt_seq; -+ u16 evt_sz; -+ uint *peventbuf; -+ void (*event_callback)(_adapter *dev, u8 *pbuf); -+ struct evt_priv *pevt_priv = &(padapter->evtpriv); -+ -+ peventbuf = (uint*)pbuf; -+ evt_sz = (u16)(*peventbuf&0xffff); -+ evt_seq = (u8)((*peventbuf>>24)&0x7f); -+ evt_code = (u8)((*peventbuf>>16)&0xff); -+ -+ -+ #ifdef CHECK_EVENT_SEQ -+ // checking event sequence... -+ if (evt_seq != (ATOMIC_READ(&pevt_priv->event_seq) & 0x7f) ) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("Evetn Seq Error! %d vs %d\n", (evt_seq & 0x7f), (ATOMIC_READ(&pevt_priv->event_seq) & 0x7f))); -+ -+ pevt_priv->event_seq = (evt_seq+1)&0x7f; -+ -+ goto _abort_event_; -+ } -+ #endif -+ -+ // checking if event code is valid -+ if (evt_code >= MAX_C2HEVT) -+ { -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nEvent Code(%d) mismatch!\n", evt_code)); -+ goto _abort_event_; -+ } -+ -+ // checking if event size match the event parm size -+ if ((wlanevents[evt_code].parmsize != 0) && -+ (wlanevents[evt_code].parmsize != evt_sz)) -+ { -+ -+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nEvent(%d) Parm Size mismatch (%d vs %d)!\n", -+ evt_code, wlanevents[evt_code].parmsize, evt_sz)); -+ goto _abort_event_; -+ -+ } -+ -+ ATOMIC_INC(&pevt_priv->event_seq); -+ -+ peventbuf += 2; -+ -+ if(peventbuf) -+ { -+ event_callback = wlanevents[evt_code].event_callback; -+ event_callback(padapter, (u8*)peventbuf); -+ -+ pevt_priv->evt_done_cnt++; -+ } -+ -+ -+_abort_event_: -+ -+ -+ return H2C_SUCCESS; -+ -+} -+ -+u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ return H2C_SUCCESS; -+} -+ -+u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ if(send_beacon(padapter)==_FAIL) -+ { -+ DBG_871X("issue_beacon, fail!\n"); -+ return H2C_PARAMETERS_ERROR; -+ } -+#ifdef CONFIG_AP_MODE -+ else //tx bc/mc frames after update TIM -+ { -+ _irqL irqL; -+ struct sta_info *psta_bmc; -+ _list *xmitframe_plist, *xmitframe_phead; -+ struct xmit_frame *pxmitframe=NULL; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ //for BC/MC Frames -+ psta_bmc = rtw_get_bcmc_stainfo(padapter); -+ if(!psta_bmc) -+ return H2C_SUCCESS; -+ -+ if((pstapriv->tim_bitmap&BIT(0)) && (psta_bmc->sleepq_len>0)) -+ { -+#ifndef CONFIG_PCI_HCI -+ rtw_msleep_os(10);// 10ms, ATIM(HIQ) Windows -+#endif -+ //_enter_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ xmitframe_phead = get_list_head(&psta_bmc->sleep_q); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+ rtw_list_delete(&pxmitframe->list); -+ -+ psta_bmc->sleepq_len--; -+ if(psta_bmc->sleepq_len>0) -+ pxmitframe->attrib.mdata = 1; -+ else -+ pxmitframe->attrib.mdata = 0; -+ -+ pxmitframe->attrib.triggered=1; -+ -+ pxmitframe->attrib.qsel = 0x11;//HIQ -+ -+#if 0 -+ _exit_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) -+ { -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ } -+ _enter_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ -+#endif -+ rtw_hal_xmitframe_enqueue(padapter, pxmitframe); -+ -+ //pstapriv->tim_bitmap &= ~BIT(0); -+ -+ } -+ -+ //_exit_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ } -+ -+ } -+#endif -+ -+ return H2C_SUCCESS; -+ -+} -+ -+void change_band_update_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork) -+{ -+ u8 network_type,rate_len, total_rate_len,remainder_rate_len; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 erpinfo=0x4; -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ if(pmlmeext->cur_channel >= 36) -+ { -+ network_type = WIRELESS_11A; -+ total_rate_len = IEEE80211_NUM_OFDM_RATESLEN; -+ DBG_871X("%s(): change to 5G Band\n",__FUNCTION__); -+ rtw_remove_bcn_ie(padapter, pnetwork, _ERPINFO_IE_); -+ } -+ else -+ { -+ network_type = WIRELESS_11BG; -+ total_rate_len = IEEE80211_CCK_RATE_LEN+IEEE80211_NUM_OFDM_RATESLEN; -+ DBG_871X("%s(): change to 2.4G Band\n",__FUNCTION__); -+ rtw_add_bcn_ie(padapter, pnetwork, _ERPINFO_IE_, &erpinfo, 1); -+ } -+ -+ rtw_set_supported_rate(pnetwork->SupportedRates, network_type); -+ -+ UpdateBrateTbl(padapter, pnetwork->SupportedRates); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates); -+ -+ if(total_rate_len > 8) -+ { -+ rate_len = 8; -+ remainder_rate_len = total_rate_len - 8; -+ } -+ else -+ { -+ rate_len = total_rate_len; -+ remainder_rate_len = 0; -+ } -+ -+ rtw_add_bcn_ie(padapter, pnetwork, _SUPPORTEDRATES_IE_, pnetwork->SupportedRates, rate_len); -+ -+ if(remainder_rate_len) -+ { -+ rtw_add_bcn_ie(padapter, pnetwork, _EXT_SUPPORTEDRATES_IE_, (pnetwork->SupportedRates+8), remainder_rate_len); -+ } -+ else -+ { -+ rtw_remove_bcn_ie(padapter, pnetwork, _EXT_SUPPORTEDRATES_IE_); -+ } -+} -+ -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+void dc_SelectChannel(_adapter *padapter, unsigned char channel) -+{ -+ PADAPTER ptarget_adapter; -+ -+ if( (padapter->pbuddy_adapter != NULL) && -+ (padapter->DualMacConcurrent == _TRUE) && -+ (padapter->adapter_type == SECONDARY_ADAPTER)) -+ { -+ // only mac0 could control BB&RF -+ ptarget_adapter = padapter->pbuddy_adapter; -+ } -+ else -+ { -+ ptarget_adapter = padapter; -+ } -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(ptarget_adapter)->setch_mutex), NULL); -+ -+ rtw_hal_set_chan(ptarget_adapter, channel); -+ -+ _exit_critical_mutex(&(adapter_to_dvobj(ptarget_adapter)->setch_mutex), NULL); -+} -+ -+void dc_SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset) -+{ -+ PADAPTER ptarget_adapter; -+ -+ if( (padapter->pbuddy_adapter != NULL) && -+ (padapter->DualMacConcurrent == _TRUE) && -+ (padapter->adapter_type == SECONDARY_ADAPTER)) -+ { -+ // only mac0 could control BB&RF -+ ptarget_adapter = padapter->pbuddy_adapter; -+ } -+ else -+ { -+ ptarget_adapter = padapter; -+ } -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(ptarget_adapter)->setbw_mutex), NULL); -+ -+ rtw_hal_set_bwmode(ptarget_adapter, (HT_CHANNEL_WIDTH)bwmode, channel_offset); -+ -+ _exit_critical_mutex(&(adapter_to_dvobj(ptarget_adapter)->setbw_mutex), NULL); -+} -+ -+void dc_set_channel_bwmode_disconnect(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ if((check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) != _TRUE) -+ { -+ //switch to the 20M Hz mode after disconnect -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+ } -+ else -+ { -+ //switch to the 20M Hz mode after disconnect -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+} -+ -+u8 dc_handle_join_request(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = NULL; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ u8 ret = _SUCCESS; -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ -+ if(pmlmeext->cur_channel != pbuddy_mlmeext->cur_channel || -+ pmlmeext->cur_bwmode != pbuddy_mlmeext->cur_bwmode || -+ pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset) -+ { -+ if((check_fwstate(pbuddy_mlmepriv, WIFI_AP_STATE)) == _TRUE) -+ { -+ //issue deauth to all stas if if2 is at ap mode -+ rtw_sta_flush(pbuddy_adapter); -+ -+ //rtw_hal_set_hwreg(padapter, HW_VAR_CHECK_TXBUF, 0); -+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_CHECK_TXBUF, 0); -+ } -+ else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED) == _TRUE) -+ { -+ if(pmlmeext->cur_channel == pbuddy_mlmeext->cur_channel) -+ { -+ // HT_CHANNEL_WIDTH_40 or HT_CHANNEL_WIDTH_20 but channel offset is different -+ if((pmlmeext->cur_bwmode == pbuddy_mlmeext->cur_bwmode) && -+ (pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset) ) -+ { -+ report_join_res(padapter, -4); -+ ret = _FAIL; -+ } -+ } -+ else -+ { -+ report_join_res(padapter, -4); -+ ret = _FAIL; -+ } -+ } -+ } -+ else if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) -+ { -+ issue_nulldata(pbuddy_adapter, NULL, 1, 0, 0); -+ } -+ } -+ -+ return ret; -+} -+ -+void dc_handle_join_done(_adapter *padapter, u8 join_res) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ struct mlme_ext_priv *pbuddy_mlmeext = NULL; -+ struct mlme_ext_info *pbuddy_mlmeinfo = NULL; -+ WLAN_BSSID_EX *pbuddy_network_mlmeext = NULL; -+ u8 change_band = _FALSE; -+ -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ pbuddy_mlmeinfo = &(pbuddy_mlmeext->mlmext_info); -+ pbuddy_network_mlmeext = &(pbuddy_mlmeinfo->network); -+ -+ if(((pbuddy_mlmeinfo->state&0x03) == WIFI_FW_AP_STATE) && -+ check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) -+ { -+ //restart and update beacon -+ DBG_871X("after join, current adapter, CH=%d, BW=%d, offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); -+ -+ if(join_res >= 0) -+ { -+ u8 *p; -+ int ie_len; -+ struct HT_info_element *pht_info=NULL; -+ -+ if((pbuddy_mlmeext->cur_channel <= 14 && pmlmeext->cur_channel >= 36) || -+ (pbuddy_mlmeext->cur_channel >= 36 && pmlmeext->cur_channel <= 14)) -+ { -+ change_band = _TRUE; -+ } -+ -+ //sync channel/bwmode/ch_offset with another adapter -+ pbuddy_mlmeext->cur_channel = pmlmeext->cur_channel; -+ -+ if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ p = rtw_get_ie((pbuddy_network_mlmeext->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pbuddy_network_mlmeext->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if( p && ie_len) -+ { -+ pht_info = (struct HT_info_element *)(p+2); -+ pht_info->infos[0] &= ~(BIT(0)|BIT(1)); //no secondary channel is present -+ } -+ -+ if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ pbuddy_mlmeext->cur_ch_offset = pmlmeext->cur_ch_offset; -+ -+ //to update cur_ch_offset value in beacon -+ if( pht_info ) -+ { -+ switch(pmlmeext->cur_ch_offset) -+ { -+ case HAL_PRIME_CHNL_OFFSET_LOWER: -+ pht_info->infos[0] |= 0x1; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_UPPER: -+ pht_info->infos[0] |= 0x3; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_DONT_CARE: -+ default: -+ break; -+ } -+ } -+ } -+ else if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) -+ { -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ if(pmlmeext->cur_channel>0 && pmlmeext->cur_channel<5) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= 0x1; -+ -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ } -+ -+ if(pmlmeext->cur_channel>7 && pmlmeext->cur_channel<(14+1)) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= 0x3; -+ -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ } -+ -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ } -+ } -+ -+ // to update channel value in beacon -+ pbuddy_network_mlmeext->Configuration.DSConfig = pmlmeext->cur_channel; -+ p = rtw_get_ie((pbuddy_network_mlmeext->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _DSSET_IE_, &ie_len, (pbuddy_network_mlmeext->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if(p && ie_len>0) -+ *(p + 2) = pmlmeext->cur_channel; -+ -+ p = rtw_get_ie((pbuddy_network_mlmeext->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pbuddy_network_mlmeext->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if( p && ie_len) -+ { -+ pht_info = (struct HT_info_element *)(p+2); -+ pht_info->primary_channel = pmlmeext->cur_channel; -+ } -+ -+ // update mlmepriv's cur_network -+ _rtw_memcpy(&pbuddy_mlmepriv->cur_network.network, pbuddy_network_mlmeext, pbuddy_network_mlmeext->Length); -+ } -+ else -+ { -+ // switch back to original channel/bwmode/ch_offset; -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ } -+ -+ DBG_871X("after join, another adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); -+ -+ if(change_band == _TRUE) -+ change_band_update_ie(pbuddy_adapter, pbuddy_network_mlmeext); -+ -+ DBG_871X("update pbuddy_adapter's beacon\n"); -+ -+ update_beacon(pbuddy_adapter, 0, NULL, _TRUE); -+ } -+ else if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) -+ { -+ if((pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && -+ (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20)) -+ { -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ } -+ -+ issue_nulldata(pbuddy_adapter, NULL, 0, 0, 0); -+ } -+ } -+} -+ -+sint dc_check_fwstate(_adapter *padapter, sint fw_state) -+{ -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ -+ if(padapter->pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ -+ { -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ -+ return check_fwstate(pbuddy_mlmepriv, fw_state); -+ } -+ -+ return _FALSE; -+} -+ -+u8 dc_handle_site_survey(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ -+ // only mac0 can do scan request, help issue nulldata(1) for mac1 -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) -+ { -+ pmlmeext->sitesurvey_res.state = SCAN_TXNULL; -+ -+ issue_nulldata(pbuddy_adapter, NULL, 1, 2, 0); -+ -+ return _TRUE; -+ } -+ } -+ -+ return _FALSE; -+} -+ -+void dc_report_survey_event(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ if(padapter->pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ report_survey_event(padapter->pbuddy_adapter, precv_frame); -+ } -+} -+ -+void dc_set_channel_bwmode_survey_done(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ struct mlme_ext_priv *pbuddy_mlmeext = NULL; -+ struct mlme_ext_info *pbuddy_mlmeinfo = NULL; -+ u8 cur_channel; -+ u8 cur_bwmode; -+ u8 cur_ch_offset; -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ pbuddy_mlmeinfo = &(pbuddy_mlmeext->mlmext_info); -+ -+ if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED) && -+ (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40)) -+ { -+ cur_channel = pmlmeext->cur_channel; -+ cur_bwmode = pmlmeext->cur_bwmode; -+ cur_ch_offset = pmlmeext->cur_ch_offset; -+ } -+ else -+ { -+ cur_channel = pbuddy_mlmeext->cur_channel; -+ cur_bwmode = pbuddy_mlmeext->cur_bwmode; -+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ } -+ } -+ else -+ { -+ cur_channel = pmlmeext->cur_channel; -+ cur_bwmode = pmlmeext->cur_bwmode; -+ cur_ch_offset = pmlmeext->cur_ch_offset; -+ } -+ -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+ -+ if (is_client_associated_to_ap(pbuddy_adapter) == _TRUE) -+ { -+ //issue null data -+ issue_nulldata(pbuddy_adapter, NULL, 0, 0, 0); -+ } -+ -+ if(((pbuddy_mlmeinfo->state&0x03) == WIFI_FW_AP_STATE) && -+ check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) -+ { -+ -+ DBG_871X("survey done, current CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); -+ -+ DBG_871X("restart pbuddy_adapter's beacon\n"); -+ -+ update_beacon(pbuddy_adapter, 0, NULL, _TRUE); -+ } -+ } -+ else -+ { -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+} -+ -+void dc_set_ap_channel_bandwidth(_adapter *padapter, u8 channel, u8 channel_offset, u8 bwmode) -+{ -+ u8 *p; -+ u8 val8, cur_channel, cur_bwmode, cur_ch_offset, change_band; -+ int ie_len; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct HT_info_element *pht_info=NULL; -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ struct mlme_ext_priv *pbuddy_mlmeext = NULL; -+ -+ DBG_871X("dualmac_concurrent_ap_set_channel_bwmode ==>\n"); -+ -+ cur_channel = channel; -+ cur_bwmode = bwmode; -+ cur_ch_offset = channel_offset; -+ change_band = _FALSE; -+ -+ p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if( p && ie_len) -+ { -+ pht_info = (struct HT_info_element *)(p+2); -+ } -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ if(!check_fwstate(pbuddy_mlmepriv, _FW_LINKED|_FW_UNDER_LINKING|_FW_UNDER_SURVEY)) -+ { -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+ } -+ else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED)==_TRUE) -+ { -+ //To sync cur_channel/cur_bwmode/cur_ch_offset with another adapter -+ DBG_871X("Another iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n"); -+ DBG_871X("Another adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); -+ DBG_871X("Current adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); -+ -+ cur_channel = pbuddy_mlmeext->cur_channel; -+ if(cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ if(pht_info) -+ pht_info->infos[0] &= ~(BIT(0)|BIT(1)); -+ -+ if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ -+ //to update cur_ch_offset value in beacon -+ if(pht_info) -+ { -+ switch(cur_ch_offset) -+ { -+ case HAL_PRIME_CHNL_OFFSET_LOWER: -+ pht_info->infos[0] |= 0x1; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_UPPER: -+ pht_info->infos[0] |= 0x3; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_DONT_CARE: -+ default: -+ break; -+ } -+ } -+ } -+ else if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) -+ { -+ cur_bwmode = HT_CHANNEL_WIDTH_20; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ if(cur_channel>0 && cur_channel<5) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= 0x1; -+ -+ cur_bwmode = HT_CHANNEL_WIDTH_40; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ } -+ -+ if(cur_channel>7 && cur_channel<(14+1)) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= 0x3; -+ -+ cur_bwmode = HT_CHANNEL_WIDTH_40; -+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ } -+ -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+ } -+ } -+ -+ // to update channel value in beacon -+ pnetwork->Configuration.DSConfig = cur_channel; -+ p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _DSSET_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if(p && ie_len>0) -+ *(p + 2) = cur_channel; -+ -+ if(pht_info) -+ pht_info->primary_channel = cur_channel; -+ } -+ } -+ else -+ { -+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); -+ } -+ -+ DBG_871X("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); -+ -+ if((channel <= 14 && cur_channel >= 36) || -+ (channel >= 36 && cur_channel <= 14)) -+ { -+ change_band = _TRUE; -+ } -+ -+ pmlmeext->cur_channel = cur_channel; -+ pmlmeext->cur_bwmode = cur_bwmode; -+ pmlmeext->cur_ch_offset = cur_ch_offset; -+ -+ if(change_band == _TRUE) -+ change_band_update_ie(padapter, pnetwork); -+ -+ DBG_871X("dualmac_concurrent_ap_set_channel_bwmode <==\n"); -+} -+ -+void dc_resume_xmit(_adapter *padapter) -+{ -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ DBG_871X("dc_resume_xmit, resume pbuddy_adapter Tx\n"); -+ rtw_os_xmit_schedule(pbuddy_adapter); -+ } -+} -+ -+u8 dc_check_xmit(_adapter *padapter) -+{ -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ -+ if(pbuddy_adapter != NULL && -+ padapter->DualMacConcurrent == _TRUE) -+ { -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ if (check_fwstate(pbuddy_mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ DBG_871X("dc_check_xmit pbuddy_adapter is under survey or under linking\n"); -+ return _FALSE; -+ } -+ } -+ -+ return _TRUE; -+} -+#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+sint check_buddy_mlmeinfo_state(_adapter *padapter, u32 state) -+{ -+ PADAPTER pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext; -+ struct mlme_ext_info *pbuddy_mlmeinfo; -+ -+ if(padapter == NULL) -+ return _FALSE; -+ -+ pbuddy_adapter = padapter->pbuddy_adapter; -+ -+ if(pbuddy_adapter == NULL) -+ return _FALSE; -+ -+ -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ pbuddy_mlmeinfo = &(pbuddy_mlmeext->mlmext_info); -+ -+ if((pbuddy_mlmeinfo->state&0x03) == state) -+ return _TRUE; -+ -+ return _FALSE; -+ -+} -+ -+void concurrent_chk_joinbss_done(_adapter *padapter, int join_res) -+{ -+ struct mlme_ext_priv *pmlmeext; -+ struct mlme_ext_info *pmlmeinfo; -+ PADAPTER pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext; -+ struct mlme_ext_info *pbuddy_mlmeinfo; -+ WLAN_BSSID_EX *pbuddy_network_mlmeext; -+ -+ pmlmeext = &padapter->mlmeextpriv; -+ pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ -+ if(!rtw_buddy_adapter_up(padapter)) -+ { -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ return; -+ } -+ -+ pbuddy_adapter = padapter->pbuddy_adapter; -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ pbuddy_mlmeinfo = &(pbuddy_mlmeext->mlmext_info); -+ pbuddy_network_mlmeext = &(pbuddy_mlmeinfo->network); -+ -+ if(((pbuddy_mlmeinfo->state&0x03) == WIFI_FW_AP_STATE) && -+ check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) -+ { -+ //restart and update beacon -+ -+ DBG_871X("after join,primary adapter, CH=%d, BW=%d, offset=%d\n" -+ , pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); -+ -+ -+ if(join_res >= 0) -+ { -+ u8 *p; -+ int ie_len; -+ u8 change_band = _FALSE; -+ struct HT_info_element *pht_info=NULL; -+ -+ if((pmlmeext->cur_channel <= 14 && pbuddy_mlmeext->cur_channel >= 36) || -+ (pmlmeext->cur_channel >= 36 && pbuddy_mlmeext->cur_channel <= 14)) -+ change_band = _TRUE; -+ -+ //sync channel/bwmode/ch_offset with primary adapter -+ pbuddy_mlmeext->cur_channel = pmlmeext->cur_channel; -+ if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ p = rtw_get_ie((pbuddy_network_mlmeext->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pbuddy_network_mlmeext->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if( p && ie_len) -+ { -+ pht_info = (struct HT_info_element *)(p+2); -+ pht_info->infos[0] &= ~(BIT(0)|BIT(1)); //no secondary channel is present -+ } -+ -+ if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ { -+ pbuddy_mlmeext->cur_ch_offset = pmlmeext->cur_ch_offset; -+ -+ //to update cur_ch_offset value in beacon -+ if( pht_info ) -+ { -+ switch(pmlmeext->cur_ch_offset) -+ { -+ case HAL_PRIME_CHNL_OFFSET_LOWER: -+ pht_info->infos[0] |= 0x1; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_UPPER: -+ pht_info->infos[0] |= 0x3; -+ break; -+ case HAL_PRIME_CHNL_OFFSET_DONT_CARE: -+ default: -+ break; -+ } -+ -+ } -+ -+ } -+ else if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) -+ { -+ if(pmlmeext->cur_channel>=1 && pmlmeext->cur_channel<=4) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE; -+ -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ } -+ else if(pmlmeext->cur_channel>=5 && pmlmeext->cur_channel<=14) -+ { -+ if(pht_info) -+ pht_info->infos[0] |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW; -+ -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ } -+ else -+ { -+ switch(pmlmeext->cur_channel) -+ { -+ case 36: -+ case 44: -+ case 52: -+ case 60: -+ case 100: -+ case 108: -+ case 116: -+ case 124: -+ case 132: -+ case 149: -+ case 157: -+ { -+ if(pht_info) -+ pht_info->infos[0] |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE; -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ break; -+ } -+ case 40: -+ case 48: -+ case 56: -+ case 64: -+ case 104: -+ case 112: -+ case 120: -+ case 128: -+ case 136: -+ case 153: -+ case 161: -+ { -+ if(pht_info) -+ pht_info->infos[0] |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW; -+ -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ break; -+ } -+ default: -+ if(pht_info) -+ pht_info->infos[0] &= ~HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW; -+ pbuddy_mlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20; -+ pbuddy_mlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ break; -+ -+ } -+ -+ } -+ -+ } -+ -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ -+ } -+ else -+ { -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+ -+ -+ // to update channel value in beacon -+ pbuddy_network_mlmeext->Configuration.DSConfig = pmlmeext->cur_channel; -+ p = rtw_get_ie((pbuddy_network_mlmeext->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _DSSET_IE_, &ie_len, (pbuddy_network_mlmeext->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if(p && ie_len>0) -+ *(p + 2) = pmlmeext->cur_channel; -+ -+ p = rtw_get_ie((pbuddy_network_mlmeext->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pbuddy_network_mlmeext->IELength - sizeof(NDIS_802_11_FIXED_IEs))); -+ if( p && ie_len) -+ { -+ pht_info = (struct HT_info_element *)(p+2); -+ pht_info->primary_channel = pmlmeext->cur_channel; -+ } -+ -+ //buddy interface band is different from current interface, update ERP, support rate, ext support rate IE -+ if(change_band == _TRUE) -+ change_band_update_ie(pbuddy_adapter, pbuddy_network_mlmeext); -+ } -+ else -+ { -+ // switch back to original channel/bwmode/ch_offset; -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ } -+ -+ DBG_871X("after join, second adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); -+ -+ DBG_871X("update pbuddy_adapter's beacon\n"); -+ -+ update_beacon(pbuddy_adapter, 0, NULL, _TRUE); -+ -+ } -+ else if(((pbuddy_mlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && -+ check_fwstate(pbuddy_mlmepriv, _FW_LINKED)) -+ { -+ if(join_res >= 0) -+ { -+ pbuddy_mlmeext->cur_channel = pmlmeext->cur_channel; -+ if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ else if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ else -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ else -+ { -+ // switch back to original channel/bwmode/ch_offset; -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ } -+ } -+ else -+ { -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ } -+ -+} -+#endif //CONFIG_CONCURRENT_MODE -+ -+int rtw_chk_start_clnt_join(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ unsigned char cur_ch = pmlmeext->cur_channel; -+ unsigned char cur_bw = pmlmeext->cur_bwmode; -+ unsigned char cur_ch_offset = pmlmeext->cur_ch_offset; -+ bool chbw_allow = _TRUE; -+ bool connect_allow = _TRUE; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ PADAPTER pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext; -+ struct mlme_ext_info *pbuddy_pmlmeinfo; -+ struct mlme_priv *pbuddy_mlmepriv; -+ -+ if (!rtw_buddy_adapter_up(padapter)) { -+ goto start_join_set_ch_bw; -+ } -+ -+ pbuddy_adapter = padapter->pbuddy_adapter; -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ pbuddy_pmlmeinfo = &(pbuddy_mlmeext->mlmext_info); -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ -+ if((pbuddy_pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)//for AP MODE -+ { -+ DBG_871X("start_clnt_join: "ADPT_FMT"(ch=%d, bw=%d, ch_offset=%d)" -+ ", "ADPT_FMT" AP mode(ch=%d, bw=%d, ch_offset=%d)\n", -+ ADPT_ARG(padapter), pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset, -+ ADPT_ARG(pbuddy_adapter), pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); -+ -+ if(pmlmeext->cur_channel != pbuddy_mlmeext->cur_channel) -+ { -+ chbw_allow = _FALSE; -+ } -+ else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && -+ (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && -+ (pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset)) -+ { -+ chbw_allow = _FALSE; -+ } -+ else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) && -+ (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40)) -+ { -+ cur_ch = pmlmeext->cur_channel; -+ cur_bw = pbuddy_mlmeext->cur_bwmode; -+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ } -+ -+ DBG_871X("start_clnt_join: connect_allow:%d, chbw_allow:%d\n", connect_allow, chbw_allow); -+ if (chbw_allow == _FALSE) { -+ #ifdef CONFIG_SPCT_CH_SWITCH -+ if (1) { -+ rtw_ap_inform_ch_switch(pbuddy_adapter, pmlmeext->cur_channel , pmlmeext->cur_ch_offset); -+ } else -+ #endif -+ { -+ //issue deauth to all stas if if2 is at ap mode -+ rtw_sta_flush(pbuddy_adapter); -+ } -+ rtw_hal_set_hwreg(padapter, HW_VAR_CHECK_TXBUF, 0); -+ } -+ } -+ else if(check_fwstate(pbuddy_mlmepriv, _FW_LINKED) == _TRUE && -+ check_fwstate(pbuddy_mlmepriv, WIFI_STATION_STATE) == _TRUE) //for Client Mode/p2p client -+ { -+ DBG_871X("start_clnt_join: "ADPT_FMT"(ch=%d, bw=%d, ch_offset=%d)" -+ ", "ADPT_FMT" STA mode(ch=%d, bw=%d, ch_offset=%d)\n", -+ ADPT_ARG(padapter), pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset, -+ ADPT_ARG(pbuddy_adapter), pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); -+ -+ if(pmlmeext->cur_channel != pbuddy_mlmeext->cur_channel) -+ { -+ chbw_allow = _FALSE; -+ } -+ else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20) && -+ (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40)) -+ { -+ cur_bw = HT_CHANNEL_WIDTH_40; -+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ } -+ else if((pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && -+ (pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40) && -+ (pmlmeext->cur_ch_offset != pbuddy_mlmeext->cur_ch_offset)) -+ { -+ chbw_allow = _FALSE; -+ } -+ -+ connect_allow = chbw_allow; -+ -+ #if defined(CONFIG_P2P) && defined(CONFIG_IOCTL_CFG80211) -+ /* wlan0-sta mode has higher priority than p2p0-p2p client */ -+ if (!rtw_p2p_chk_state(&(pbuddy_adapter->wdinfo), P2P_STATE_NONE) -+ && pbuddy_adapter->wdinfo.driver_interface == DRIVER_CFG80211) -+ { -+ connect_allow = _TRUE; -+ } -+ #endif /* CONFIG_P2P && CONFIG_IOCTL_CFG80211 */ -+ -+ DBG_871X("start_clnt_join: connect_allow:%d, chbw_allow:%d\n", connect_allow, chbw_allow); -+ if (connect_allow == _TRUE && chbw_allow == _FALSE) { -+ /* disconnect buddy's connection */ -+ rtw_disassoc_cmd(pbuddy_adapter, 500, _FALSE); -+ rtw_indicate_disconnect(pbuddy_adapter); -+ rtw_free_assoc_resources(pbuddy_adapter, 1); -+ } -+ } -+ -+start_join_set_ch_bw: -+#endif /* CONFIG_CONCURRENT_MODE */ -+ -+ if (connect_allow == _TRUE) { -+ DBG_871X("start_join_set_ch_bw: ch=%d, bwmode=%d, ch_offset=%d\n", cur_ch, cur_bw, cur_ch_offset); -+ set_channel_bwmode(padapter, cur_ch, cur_ch_offset, cur_bw); -+ } -+ -+ return connect_allow == _TRUE ? _SUCCESS : _FAIL; -+} -+ -+/* Find union about ch, bw, ch_offset of all linked interfaces */ -+int rtw_get_ch_setting_union(_adapter *adapter, u8 *ch, u8 *bw, u8 *offset) -+{ -+ struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); -+ _adapter *iface; -+ struct mlme_ext_priv *mlmeext; -+ int i; -+ u8 ch_ret = 0; -+ u8 bw_ret = HT_CHANNEL_WIDTH_20; -+ u8 offset_ret = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ int num = 0; -+ -+ if (ch) *ch = 0; -+ if (bw) *bw = HT_CHANNEL_WIDTH_20; -+ if (offset) *offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ for (i = 0; iiface_nums; i++) { -+ iface = dvobj->padapters[i]; -+ mlmeext = &iface->mlmeextpriv; -+ -+ if (!check_fwstate(&iface->mlmepriv, _FW_LINKED)) -+ continue; -+ -+ if (num == 0) { -+ ch_ret = mlmeext->cur_channel; -+ bw_ret = mlmeext->cur_bwmode; -+ offset_ret = mlmeext->cur_ch_offset; -+ num++; -+ continue; -+ } -+ -+ if (ch_ret != mlmeext->cur_channel) { -+ num = 0; -+ break; -+ } -+ -+ if (bw_ret < mlmeext->cur_bwmode) { -+ bw_ret = mlmeext->cur_bwmode; -+ offset_ret = mlmeext->cur_ch_offset; -+ } else if (bw_ret == mlmeext->cur_bwmode && offset_ret != mlmeext->cur_ch_offset) { -+ num = 0; -+ break; -+ } -+ -+ num++; -+ } -+ -+ if (num) { -+ if (ch) *ch = ch_ret; -+ if (bw) *bw = bw_ret; -+ if (offset) *offset = offset_ret; -+ } -+ -+ return num; -+} -+ -+u8 set_ch_hdl(_adapter *padapter, u8 *pbuf) -+{ -+ struct set_ch_parm *set_ch_parm; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ set_ch_parm = (struct set_ch_parm *)pbuf; -+ -+ DBG_871X(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n", -+ FUNC_NDEV_ARG(padapter->pnetdev), -+ set_ch_parm->ch, set_ch_parm->bw, set_ch_parm->ch_offset); -+ -+ pmlmeext->cur_channel = set_ch_parm->ch; -+ pmlmeext->cur_ch_offset = set_ch_parm->ch_offset; -+ pmlmeext->cur_bwmode = set_ch_parm->bw; -+ -+ set_channel_bwmode(padapter, set_ch_parm->ch, set_ch_parm->ch_offset, set_ch_parm->bw); -+ -+ return H2C_SUCCESS; -+} -+ -+u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ struct SetChannelPlan_param *setChannelPlan_param; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ setChannelPlan_param = (struct SetChannelPlan_param *)pbuf; -+ -+ pmlmeext->max_chan_nums = init_channel_set(padapter, setChannelPlan_param->channel_plan, pmlmeext->channel_set); -+ init_channel_list(padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list); -+ -+ return H2C_SUCCESS; -+} -+ -+u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ struct LedBlink_param *ledBlink_param; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ ledBlink_param = (struct LedBlink_param *)pbuf; -+ -+ #ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD -+ BlinkHandler(ledBlink_param->pLed); -+ #endif -+ -+ return H2C_SUCCESS; -+} -+ -+u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+#ifdef CONFIG_DFS -+ struct SetChannelSwitch_param *setChannelSwitch_param; -+ struct SetChannelPlan_param *setChannelPlan_param; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -+ u8 new_ch_no; -+ u8 gval8 = 0x00, sval8 = 0xff; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ setChannelSwitch_param = (struct SetChannelSwitch_param *)pbuf; -+ new_ch_no = setChannelSwitch_param->new_ch_no; -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_TXPAUSE, &gval8); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_TXPAUSE, &sval8); -+ -+ DBG_871X("DFS detected! Swiching channel to %d!\n", new_ch_no); -+ SelectChannel(padapter, new_ch_no); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_TXPAUSE, &gval8); -+ -+ rtw_free_network_queue(padapter, _TRUE); -+ rtw_indicate_disconnect(padapter); -+ -+ if ( ((new_ch_no >= 52) && (new_ch_no <= 64)) ||((new_ch_no >= 100) && (new_ch_no <= 140)) ) { -+ DBG_871X("Switched to DFS band (ch %02x) again!!\n", new_ch_no); -+ } -+ -+ return H2C_SUCCESS; -+#else -+ return H2C_REJECTED; -+#endif //CONFIG_DFS -+ -+} -+ -+// TDLS_WRCR : write RCR DATA BIT -+// TDLS_SD_PTI : issue peer traffic indication -+// TDLS_CS_OFF : go back to the channel linked with AP, terminating channel switch procedure -+// TDLS_INIT_CH_SEN : init channel sensing, receive all data and mgnt frame -+// TDLS_DONE_CH_SEN: channel sensing and report candidate channel -+// TDLS_OFF_CH : first time set channel to off channel -+// TDLS_BASE_CH : go back tp the channel linked with AP when set base channel as target channel -+// TDLS_P_OFF_CH : periodically go to off channel -+// TDLS_P_BASE_CH : periodically go back to base channel -+// TDLS_RS_RCR : restore RCR -+// TDLS_CKALV_PH1 : check alive timer phase1 -+// TDLS_CKALV_PH2 : check alive timer phase2 -+// TDLS_FREE_STA : free tdls sta -+u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+#ifdef CONFIG_TDLS -+ _irqL irqL; -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct TDLSoption_param *TDLSoption; -+ struct sta_info *ptdls_sta; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -+ u8 survey_channel, i, min, option; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ TDLSoption = (struct TDLSoption_param *)pbuf; -+ -+ ptdls_sta = rtw_get_stainfo( &(padapter->stapriv), TDLSoption->addr ); -+ option = TDLSoption->option; -+ -+ if( ptdls_sta == NULL ) -+ { -+ if( option != TDLS_RS_RCR ) -+ return H2C_REJECTED; -+ } -+ -+ //_enter_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); -+ DBG_871X("[%s] option:%d\n", __FUNCTION__, option); -+ -+ switch(option){ -+ case TDLS_WRCR: -+ //As long as TDLS handshake success, we should set RCR_CBSSID_DATA bit to 0 -+ //such we can receive all kinds of data frames. -+ rtw_hal_set_hwreg(padapter, HW_VAR_TDLS_WRCR, 0); -+ DBG_871X("TDLS with "MAC_FMT"\n", MAC_ARG(ptdls_sta->hwaddr)); -+ -+ pmlmeinfo->FW_sta_info[ptdls_sta->mac_id].psta = ptdls_sta; -+ //set TDLS sta rate. -+ set_sta_rate(padapter, ptdls_sta); -+ break; -+ case TDLS_SD_PTI: -+ issue_tdls_peer_traffic_indication(padapter, ptdls_sta); -+ break; -+ case TDLS_CS_OFF: -+ _cancel_timer_ex(&ptdls_sta->base_ch_timer); -+ _cancel_timer_ex(&ptdls_sta->off_ch_timer); -+ SelectChannel(padapter, pmlmeext->cur_channel); -+ ptdls_sta->tdls_sta_state &= ~(TDLS_CH_SWITCH_ON_STATE | -+ TDLS_PEER_AT_OFF_STATE | -+ TDLS_AT_OFF_CH_STATE); -+ DBG_871X("go back to base channel\n "); -+ issue_nulldata(padapter, NULL, 0, 0, 0); -+ break; -+ case TDLS_INIT_CH_SEN: -+ rtw_hal_set_hwreg(padapter, HW_VAR_TDLS_INIT_CH_SEN, 0); -+ pmlmeext->sitesurvey_res.channel_idx = 0; -+ ptdls_sta->option = TDLS_DONE_CH_SEN; -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_DONE_CH_SEN); -+ break; -+ case TDLS_DONE_CH_SEN: -+ survey_channel = pmlmeext->channel_set[pmlmeext->sitesurvey_res.channel_idx].ChannelNum; -+ if(survey_channel){ -+ SelectChannel(padapter, survey_channel); -+ ptdlsinfo->cur_channel = survey_channel; -+ pmlmeext->sitesurvey_res.channel_idx++; -+ _set_timer(&ptdls_sta->option_timer, SURVEY_TO); -+ }else{ -+ SelectChannel(padapter, pmlmeext->cur_channel); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_TDLS_DONE_CH_SEN, 0); -+ -+ if(ptdlsinfo->ch_sensing==1){ -+ ptdlsinfo->ch_sensing=0; -+ ptdlsinfo->cur_channel=1; -+ min=ptdlsinfo->collect_pkt_num[0]; -+ for(i=1; i ptdlsinfo->collect_pkt_num[i]){ -+ ptdlsinfo->cur_channel=i+1; -+ min=ptdlsinfo->collect_pkt_num[i]; -+ } -+ ptdlsinfo->collect_pkt_num[i]=0; -+ } -+ ptdlsinfo->collect_pkt_num[0]=0; -+ ptdlsinfo->candidate_ch=ptdlsinfo->cur_channel; -+ DBG_871X("TDLS channel sensing done, candidate channel: %02x\n", ptdlsinfo->candidate_ch); -+ ptdlsinfo->cur_channel=0; -+ -+ } -+ -+ if(ptdls_sta->tdls_sta_state & TDLS_PEER_SLEEP_STATE){ -+ ptdls_sta->tdls_sta_state |= TDLS_APSD_CHSW_STATE; -+ }else{ -+ //send null data with pwrbit==1 before send ch_switching_req to peer STA. -+ issue_nulldata(padapter, NULL, 1, 0, 0); -+ -+ ptdls_sta->tdls_sta_state |= TDLS_CH_SW_INITIATOR_STATE; -+ -+ issue_tdls_ch_switch_req(padapter, ptdls_sta->hwaddr); -+ DBG_871X("issue tdls ch switch req\n"); -+ } -+ } -+ break; -+ case TDLS_OFF_CH: -+ issue_nulldata(padapter, NULL, 1, 0, 0); -+ SelectChannel(padapter, ptdls_sta->off_ch); -+ -+ DBG_871X("change channel to tar ch:%02x\n", ptdls_sta->off_ch); -+ ptdls_sta->tdls_sta_state |= TDLS_AT_OFF_CH_STATE; -+ ptdls_sta->tdls_sta_state &= ~(TDLS_PEER_AT_OFF_STATE); -+ _set_timer(&ptdls_sta->option_timer, (u32)ptdls_sta->ch_switch_time); -+ break; -+ case TDLS_BASE_CH: -+ _cancel_timer_ex(&ptdls_sta->base_ch_timer); -+ _cancel_timer_ex(&ptdls_sta->off_ch_timer); -+ SelectChannel(padapter, pmlmeext->cur_channel); -+ ptdls_sta->tdls_sta_state &= ~(TDLS_CH_SWITCH_ON_STATE | -+ TDLS_PEER_AT_OFF_STATE | -+ TDLS_AT_OFF_CH_STATE); -+ DBG_871X("go back to base channel\n "); -+ issue_nulldata(padapter, NULL, 0, 0, 0); -+ _set_timer(&ptdls_sta->option_timer, (u32)ptdls_sta->ch_switch_time); -+ break; -+ case TDLS_P_OFF_CH: -+ SelectChannel(padapter, pmlmeext->cur_channel); -+ issue_nulldata(padapter, NULL, 0, 0, 0); -+ DBG_871X("change channel to base ch:%02x\n", pmlmeext->cur_channel); -+ ptdls_sta->tdls_sta_state &= ~(TDLS_PEER_AT_OFF_STATE| TDLS_AT_OFF_CH_STATE); -+ _set_timer(&ptdls_sta->off_ch_timer, TDLS_STAY_TIME); -+ break; -+ case TDLS_P_BASE_CH: -+ issue_nulldata(ptdls_sta->padapter, NULL, 1, 0, 0); -+ SelectChannel(padapter, ptdls_sta->off_ch); -+ DBG_871X("change channel to off ch:%02x\n", ptdls_sta->off_ch); -+ ptdls_sta->tdls_sta_state |= TDLS_AT_OFF_CH_STATE; -+ if((ptdls_sta->tdls_sta_state & TDLS_PEER_AT_OFF_STATE) != TDLS_PEER_AT_OFF_STATE){ -+ issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 0); -+ } -+ _set_timer(&ptdls_sta->base_ch_timer, TDLS_STAY_TIME); -+ break; -+ case TDLS_RS_RCR: -+ rtw_hal_set_hwreg(padapter, HW_VAR_TDLS_RS_RCR, 0); -+ DBG_871X("wirte REG_RCR, set bit6 on\n"); -+ break; -+ case TDLS_CKALV_PH1: -+ _set_timer(&ptdls_sta->alive_timer2, TDLS_ALIVE_TIMER_PH2); -+ break; -+ case TDLS_CKALV_PH2: -+ _set_timer(&ptdls_sta->alive_timer1, TDLS_ALIVE_TIMER_PH1); -+ break; -+ case TDLS_FREE_STA: -+ free_tdls_sta(padapter, ptdls_sta); -+ break; -+ -+ } -+ -+ //_exit_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); -+ -+ return H2C_SUCCESS; -+#else -+ return H2C_REJECTED; -+#endif //CONFIG_TDLS -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c -@@ -0,0 +1,1324 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_MP_C_ -+ -+#include -+ -+#ifdef PLATFORM_FREEBSD -+#include /* for RFHIGHPID */ -+#endif -+ -+#ifdef CONFIG_RTL8712 -+#include -+#endif -+#ifdef CONFIG_RTL8192C -+#include -+#endif -+#ifdef CONFIG_RTL8192D -+#include -+#endif -+#ifdef CONFIG_RTL8723A -+#include -+#endif -+ -+ -+#ifdef CONFIG_MP_INCLUDED -+ -+u32 read_macreg(_adapter *padapter, u32 addr, u32 sz) -+{ -+ u32 val = 0; -+ -+ switch(sz) -+ { -+ case 1: -+ val = rtw_read8(padapter, addr); -+ break; -+ case 2: -+ val = rtw_read16(padapter, addr); -+ break; -+ case 4: -+ val = rtw_read32(padapter, addr); -+ break; -+ default: -+ val = 0xffffffff; -+ break; -+ } -+ -+ return val; -+ -+} -+ -+void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz) -+{ -+ switch(sz) -+ { -+ case 1: -+ rtw_write8(padapter, addr, (u8)val); -+ break; -+ case 2: -+ rtw_write16(padapter, addr, (u16)val); -+ break; -+ case 4: -+ rtw_write32(padapter, addr, val); -+ break; -+ default: -+ break; -+ } -+ -+} -+ -+u32 read_bbreg(_adapter *padapter, u32 addr, u32 bitmask) -+{ -+ return rtw_hal_read_bbreg(padapter, addr, bitmask); -+} -+ -+void write_bbreg(_adapter *padapter, u32 addr, u32 bitmask, u32 val) -+{ -+ rtw_hal_write_bbreg(padapter, addr, bitmask, val); -+} -+ -+u32 _read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask) -+{ -+ return rtw_hal_read_rfreg(padapter, (RF_RADIO_PATH_E)rfpath, addr, bitmask); -+} -+ -+void _write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val) -+{ -+ rtw_hal_write_rfreg(padapter, (RF_RADIO_PATH_E)rfpath, addr, bitmask, val); -+} -+ -+u32 read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr) -+{ -+ return _read_rfreg(padapter, (RF_RADIO_PATH_E)rfpath, addr, bRFRegOffsetMask); -+} -+ -+void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val) -+{ -+ _write_rfreg(padapter, (RF_RADIO_PATH_E)rfpath, addr, bRFRegOffsetMask, val); -+} -+ -+static void _init_mp_priv_(struct mp_priv *pmp_priv) -+{ -+ WLAN_BSSID_EX *pnetwork; -+ -+ _rtw_memset(pmp_priv, 0, sizeof(struct mp_priv)); -+ -+ pmp_priv->mode = MP_OFF; -+ -+ pmp_priv->channel = 1; -+ pmp_priv->bandwidth = HT_CHANNEL_WIDTH_20; -+ pmp_priv->prime_channel_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ pmp_priv->rateidx = MPT_RATE_1M; -+ pmp_priv->txpoweridx = 0x2A; -+ -+ pmp_priv->antenna_tx = ANTENNA_A; -+ pmp_priv->antenna_rx = ANTENNA_AB; -+ -+ pmp_priv->check_mp_pkt = 0; -+ -+ pmp_priv->tx_pktcount = 0; -+ -+ pmp_priv->rx_pktcount = 0; -+ pmp_priv->rx_crcerrpktcount = 0; -+ -+ pmp_priv->network_macaddr[0] = 0x00; -+ pmp_priv->network_macaddr[1] = 0xE0; -+ pmp_priv->network_macaddr[2] = 0x4C; -+ pmp_priv->network_macaddr[3] = 0x87; -+ pmp_priv->network_macaddr[4] = 0x66; -+ pmp_priv->network_macaddr[5] = 0x55; -+ -+ pnetwork = &pmp_priv->mp_network.network; -+ _rtw_memcpy(pnetwork->MacAddress, pmp_priv->network_macaddr, ETH_ALEN); -+ -+ pnetwork->Ssid.SsidLength = 8; -+ _rtw_memcpy(pnetwork->Ssid.Ssid, "mp_871x", pnetwork->Ssid.SsidLength); -+} -+ -+#ifdef PLATFORM_WINDOWS -+/* -+void mp_wi_callback( -+ IN NDIS_WORK_ITEM* pwk_item, -+ IN PVOID cntx -+ ) -+{ -+ _adapter* padapter =(_adapter *)cntx; -+ struct mp_priv *pmppriv=&padapter->mppriv; -+ struct mp_wi_cntx *pmp_wi_cntx=&pmppriv->wi_cntx; -+ -+ // Execute specified action. -+ if(pmp_wi_cntx->curractfunc != NULL) -+ { -+ LARGE_INTEGER cur_time; -+ ULONGLONG start_time, end_time; -+ NdisGetCurrentSystemTime(&cur_time); // driver version -+ start_time = cur_time.QuadPart/10; // The return value is in microsecond -+ -+ pmp_wi_cntx->curractfunc(padapter); -+ -+ NdisGetCurrentSystemTime(&cur_time); // driver version -+ end_time = cur_time.QuadPart/10; // The return value is in microsecond -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("WorkItemActType: %d, time spent: %I64d us\n", -+ pmp_wi_cntx->param.act_type, (end_time-start_time))); -+ } -+ -+ NdisAcquireSpinLock(&(pmp_wi_cntx->mp_wi_lock)); -+ pmp_wi_cntx->bmp_wi_progress= _FALSE; -+ NdisReleaseSpinLock(&(pmp_wi_cntx->mp_wi_lock)); -+ -+ if (pmp_wi_cntx->bmpdrv_unload) -+ { -+ NdisSetEvent(&(pmp_wi_cntx->mp_wi_evt)); -+ } -+ -+} -+*/ -+ -+static int init_mp_priv_by_os(struct mp_priv *pmp_priv) -+{ -+ struct mp_wi_cntx *pmp_wi_cntx; -+ -+ if (pmp_priv == NULL) return _FAIL; -+ -+ pmp_priv->rx_testcnt = 0; -+ pmp_priv->rx_testcnt1 = 0; -+ pmp_priv->rx_testcnt2 = 0; -+ -+ pmp_priv->tx_testcnt = 0; -+ pmp_priv->tx_testcnt1 = 0; -+ -+ pmp_wi_cntx = &pmp_priv->wi_cntx -+ pmp_wi_cntx->bmpdrv_unload = _FALSE; -+ pmp_wi_cntx->bmp_wi_progress = _FALSE; -+ pmp_wi_cntx->curractfunc = NULL; -+ -+ return _SUCCESS; -+} -+#endif -+ -+#ifdef PLATFORM_LINUX -+static int init_mp_priv_by_os(struct mp_priv *pmp_priv) -+{ -+ int i, res; -+ struct mp_xmit_frame *pmp_xmitframe; -+ -+ if (pmp_priv == NULL) return _FAIL; -+ -+ _rtw_init_queue(&pmp_priv->free_mp_xmitqueue); -+ -+ pmp_priv->pallocated_mp_xmitframe_buf = NULL; -+ pmp_priv->pallocated_mp_xmitframe_buf = rtw_zmalloc(NR_MP_XMITFRAME * sizeof(struct mp_xmit_frame) + 4); -+ if (pmp_priv->pallocated_mp_xmitframe_buf == NULL) { -+ res = _FAIL; -+ goto _exit_init_mp_priv; -+ } -+ -+ pmp_priv->pmp_xmtframe_buf = pmp_priv->pallocated_mp_xmitframe_buf + 4 - ((uint) (pmp_priv->pallocated_mp_xmitframe_buf) & 3); -+ -+ pmp_xmitframe = (struct mp_xmit_frame*)pmp_priv->pmp_xmtframe_buf; -+ -+ for (i = 0; i < NR_MP_XMITFRAME; i++) -+ { -+ _rtw_init_listhead(&pmp_xmitframe->list); -+ rtw_list_insert_tail(&pmp_xmitframe->list, &pmp_priv->free_mp_xmitqueue.queue); -+ -+ pmp_xmitframe->pkt = NULL; -+ pmp_xmitframe->frame_tag = MP_FRAMETAG; -+ pmp_xmitframe->padapter = pmp_priv->papdater; -+ -+ pmp_xmitframe++; -+ } -+ -+ pmp_priv->free_mp_xmitframe_cnt = NR_MP_XMITFRAME; -+ -+ res = _SUCCESS; -+ -+_exit_init_mp_priv: -+ -+ return res; -+} -+#endif -+ -+static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter) -+{ -+ struct pkt_attrib *pattrib; -+ struct tx_desc *desc; -+ -+ // init xmitframe attribute -+ pattrib = &pmptx->attrib; -+ _rtw_memset(pattrib, 0, sizeof(struct pkt_attrib)); -+ desc = &pmptx->desc; -+ _rtw_memset(desc, 0, TXDESC_SIZE); -+ -+ pattrib->ether_type = 0x8712; -+ //_rtw_memcpy(pattrib->src, padapter->eeprompriv.mac_addr, ETH_ALEN); -+// _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN); -+// pattrib->pctrl = 0; -+// pattrib->dhcp_pkt = 0; -+// pattrib->pktlen = 0; -+ pattrib->ack_policy = 0; -+// pattrib->pkt_hdrlen = ETH_HLEN; -+ pattrib->hdrlen = WLAN_HDR_A3_LEN; -+ pattrib->subtype = WIFI_DATA; -+ pattrib->priority = 0; -+ pattrib->qsel = pattrib->priority; -+// do_queue_select(padapter, pattrib); -+ pattrib->nr_frags = 1; -+ pattrib->encrypt = 0; -+ pattrib->bswenc = _FALSE; -+ pattrib->qos_en = _FALSE; -+} -+ -+s32 init_mp_priv(PADAPTER padapter) -+{ -+ struct mp_priv *pmppriv = &padapter->mppriv; -+ -+ _init_mp_priv_(pmppriv); -+ pmppriv->papdater = padapter; -+ -+ pmppriv->tx.stop = 1; -+ mp_init_xmit_attrib(&pmppriv->tx, padapter); -+ -+ switch (padapter->registrypriv.rf_config) { -+ case RF_1T1R: -+ pmppriv->antenna_tx = ANTENNA_A; -+ pmppriv->antenna_rx = ANTENNA_A; -+ break; -+ case RF_1T2R: -+ default: -+ pmppriv->antenna_tx = ANTENNA_A; -+ pmppriv->antenna_rx = ANTENNA_AB; -+ break; -+ case RF_2T2R: -+ case RF_2T2R_GREEN: -+ pmppriv->antenna_tx = ANTENNA_AB; -+ pmppriv->antenna_rx = ANTENNA_AB; -+ break; -+ case RF_2T4R: -+ pmppriv->antenna_tx = ANTENNA_AB; -+ pmppriv->antenna_rx = ANTENNA_ABCD; -+ break; -+ } -+ -+ return _SUCCESS; -+} -+ -+void free_mp_priv(struct mp_priv *pmp_priv) -+{ -+ if (pmp_priv->pallocated_mp_xmitframe_buf) { -+ rtw_mfree(pmp_priv->pallocated_mp_xmitframe_buf, 0); -+ pmp_priv->pallocated_mp_xmitframe_buf = NULL; -+ } -+ pmp_priv->pmp_xmtframe_buf = NULL; -+} -+ -+#ifdef CONFIG_RTL8192C -+#define PHY_IQCalibrate(a,b) rtl8192c_PHY_IQCalibrate(a,b) -+#define PHY_LCCalibrate(a) rtl8192c_PHY_LCCalibrate(a) -+#define dm_CheckTXPowerTracking(a) rtl8192c_dm_CheckTXPowerTracking(a) -+#define PHY_SetRFPathSwitch(a,b) rtl8192c_PHY_SetRFPathSwitch(a,b) -+#endif -+ -+#ifdef CONFIG_RTL8192D -+#define PHY_IQCalibrate(a) rtl8192d_PHY_IQCalibrate(a) -+#define PHY_LCCalibrate(a) rtl8192d_PHY_LCCalibrate(a) -+#define dm_CheckTXPowerTracking(a) rtl8192d_dm_CheckTXPowerTracking(a) -+#define PHY_SetRFPathSwitch(a,b) rtl8192d_PHY_SetRFPathSwitch(a,b) -+#endif -+ -+s32 -+MPT_InitializeAdapter( -+ IN PADAPTER pAdapter, -+ IN u8 Channel -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ s32 rtStatus = _SUCCESS; -+ PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; -+ u32 ledsetting; -+ -+ //------------------------------------------------------------------------- -+ // HW Initialization for 8190 MPT. -+ //------------------------------------------------------------------------- -+ //------------------------------------------------------------------------- -+ // SW Initialization for 8190 MP. -+ //------------------------------------------------------------------------- -+ pMptCtx->bMptDrvUnload = _FALSE; -+ pMptCtx->bMassProdTest = _FALSE; -+ pMptCtx->bMptIndexEven = _TRUE; //default gain index is -6.0db -+ -+ /* Init mpt event. */ -+#if 0 // for Windows -+ NdisInitializeEvent( &(pMptCtx->MptWorkItemEvent) ); -+ NdisAllocateSpinLock( &(pMptCtx->MptWorkItemSpinLock) ); -+ -+ PlatformInitializeWorkItem( -+ Adapter, -+ &(pMptCtx->MptWorkItem), -+ (RT_WORKITEM_CALL_BACK)MPT_WorkItemCallback, -+ (PVOID)Adapter, -+ "MptWorkItem"); -+#endif -+ pMptCtx->bMptWorkItemInProgress = _FALSE; -+ pMptCtx->CurrMptAct = NULL; -+ //------------------------------------------------------------------------- -+ -+#if 1 -+ // Don't accept any packets -+ rtw_write32(pAdapter, REG_RCR, 0); -+#else -+ // Accept CRC error and destination address -+ pHalData->ReceiveConfig |= (RCR_ACRC32|RCR_AAP); -+ rtw_write32(pAdapter, REG_RCR, pHalData->ReceiveConfig); -+#endif -+ -+#if 0 -+ // If EEPROM or EFUSE is empty,we assign as RF 2T2R for MP. -+ if (pHalData->AutoloadFailFlag == TRUE) -+ { -+ pHalData->RF_Type = RF_2T2R; -+ } -+#endif -+ ledsetting = rtw_read32(pAdapter, REG_LEDCFG0); -+ rtw_write32(pAdapter, REG_LEDCFG0, ledsetting & ~LED0DIS); -+ -+#ifdef CONFIG_RTL8192C -+ PHY_IQCalibrate(pAdapter, _FALSE); -+ dm_CheckTXPowerTracking(pAdapter); //trigger thermal meter -+ PHY_LCCalibrate(pAdapter); -+#endif -+ -+#ifdef CONFIG_RTL8192D -+ PHY_IQCalibrate(pAdapter); -+ dm_CheckTXPowerTracking(pAdapter); //trigger thermal meter -+ PHY_LCCalibrate(pAdapter); -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ PHY_SetRFPathSwitch(pAdapter, 1/*pHalData->bDefaultAntenna*/); //Wifi default use Main -+#else -+ -+#ifdef CONFIG_RTL8192C -+#if 1 -+ if (pHalData->BoardType == BOARD_MINICARD) -+ PHY_SetRFPathSwitch(pAdapter, 1/*pHalData->bDefaultAntenna*/); //default use Main -+#else -+ if(pAdapter->HalFunc.GetInterfaceSelectionHandler(pAdapter) == INTF_SEL2_MINICARD ) -+ PHY_SetRFPathSwitch(Adapter, pAdapter->MgntInfo.bDefaultAntenna); //default use Main -+#endif -+ -+#endif -+ -+#endif -+ -+ pMptCtx->backup0xc50 = (u1Byte)PHY_QueryBBReg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0); -+ pMptCtx->backup0xc58 = (u1Byte)PHY_QueryBBReg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0); -+ pMptCtx->backup0xc30 = (u1Byte)PHY_QueryBBReg(pAdapter, rOFDM0_RxDetector1, bMaskByte0); -+ -+ return rtStatus; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: MPT_DeInitAdapter() -+ * -+ * Overview: Extra DeInitialization for Mass Production Test. -+ * -+ * Input: PADAPTER pAdapter -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 05/08/2007 MHC Create Version 0. -+ * 05/18/2007 MHC Add normal driver MPHalt code. -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+MPT_DeInitAdapter( -+ IN PADAPTER pAdapter -+ ) -+{ -+ PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; -+ -+ pMptCtx->bMptDrvUnload = _TRUE; -+#if 0 // for Windows -+ PlatformFreeWorkItem( &(pMptCtx->MptWorkItem) ); -+ -+ while(pMptCtx->bMptWorkItemInProgress) -+ { -+ if(NdisWaitEvent(&(pMptCtx->MptWorkItemEvent), 50)) -+ { -+ break; -+ } -+ } -+ NdisFreeSpinLock( &(pMptCtx->MptWorkItemSpinLock) ); -+#endif -+} -+ -+static u8 mpt_ProStartTest(PADAPTER padapter) -+{ -+ PMPT_CONTEXT pMptCtx = &padapter->mppriv.MptCtx; -+ -+ pMptCtx->bMassProdTest = _TRUE; -+ pMptCtx->bStartContTx = _FALSE; -+ pMptCtx->bCckContTx = _FALSE; -+ pMptCtx->bOfdmContTx = _FALSE; -+ pMptCtx->bSingleCarrier = _FALSE; -+ pMptCtx->bCarrierSuppression = _FALSE; -+ pMptCtx->bSingleTone = _FALSE; -+ -+ return _SUCCESS; -+} -+ -+/* -+ * General use -+ */ -+s32 SetPowerTracking(PADAPTER padapter, u8 enable) -+{ -+ -+ Hal_SetPowerTracking( padapter, enable ); -+ return 0; -+} -+ -+void GetPowerTracking(PADAPTER padapter, u8 *enable) -+{ -+ Hal_GetPowerTracking( padapter, enable ); -+} -+ -+static void disable_dm(PADAPTER padapter) -+{ -+#ifndef CONFIG_RTL8723A -+ u8 v8; -+#endif -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ -+ //3 1. disable firmware dynamic mechanism -+ // disable Power Training, Rate Adaptive -+#ifdef CONFIG_RTL8723A -+ SetBcnCtrlReg(padapter, 0, EN_BCN_FUNCTION); -+#else -+ v8 = rtw_read8(padapter, REG_BCN_CTRL); -+ v8 &= ~EN_BCN_FUNCTION; -+ rtw_write8(padapter, REG_BCN_CTRL, v8); -+#endif -+ -+ //3 2. disable driver dynamic mechanism -+ // disable Dynamic Initial Gain -+ // disable High Power -+ // disable Power Tracking -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+ // enable APK, LCK and IQK but disable power tracking -+ pdmpriv->TxPowerTrackControl = _FALSE; -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_SS, _TRUE); -+} -+ -+//This function initializes the DUT to the MP test mode -+s32 mp_start_test(PADAPTER padapter) -+{ -+ WLAN_BSSID_EX bssid; -+ struct sta_info *psta; -+ u32 length; -+ u8 val8; -+ -+ _irqL irqL; -+ s32 res = _SUCCESS; -+ -+ struct mp_priv *pmppriv = &padapter->mppriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wlan_network *tgt_network = &pmlmepriv->cur_network; -+ -+ -+ //3 disable dynamic mechanism -+ disable_dm(padapter); -+ -+ //3 0. update mp_priv -+#if defined (CONFIG_RTL8192C) || defined (CONFIG_RTL8192D) -+ if (padapter->registrypriv.rf_config == RF_819X_MAX_TYPE) { -+// HAL_DATA_TYPE *phal = GET_HAL_DATA(padapter); -+// switch (phal->rf_type) { -+ switch (GET_RF_TYPE(padapter)) { -+ case RF_1T1R: -+ pmppriv->antenna_tx = ANTENNA_A; -+ pmppriv->antenna_rx = ANTENNA_A; -+ break; -+ case RF_1T2R: -+ default: -+ pmppriv->antenna_tx = ANTENNA_A; -+ pmppriv->antenna_rx = ANTENNA_AB; -+ break; -+ case RF_2T2R: -+ case RF_2T2R_GREEN: -+ pmppriv->antenna_tx = ANTENNA_AB; -+ pmppriv->antenna_rx = ANTENNA_AB; -+ break; -+ case RF_2T4R: -+ pmppriv->antenna_tx = ANTENNA_AB; -+ pmppriv->antenna_rx = ANTENNA_ABCD; -+ break; -+ } -+ } -+#endif -+ mpt_ProStartTest(padapter); -+ -+ //3 1. initialize a new WLAN_BSSID_EX -+// _rtw_memset(&bssid, 0, sizeof(WLAN_BSSID_EX)); -+ _rtw_memcpy(bssid.MacAddress, pmppriv->network_macaddr, ETH_ALEN); -+ bssid.Ssid.SsidLength = strlen("mp_pseudo_adhoc"); -+ _rtw_memcpy(bssid.Ssid.Ssid, (u8*)"mp_pseudo_adhoc", bssid.Ssid.SsidLength); -+ bssid.InfrastructureMode = Ndis802_11IBSS; -+ bssid.NetworkTypeInUse = Ndis802_11DS; -+ bssid.IELength = 0; -+ -+ length = get_WLAN_BSSID_EX_sz(&bssid); -+ if (length % 4) -+ bssid.Length = ((length >> 2) + 1) << 2; //round up to multiple of 4 bytes. -+ else -+ bssid.Length = length; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ goto end_of_mp_start_test; -+ -+ //init mp_start_test status -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { -+ rtw_disassoc_cmd(padapter, 500, _TRUE); -+ rtw_indicate_disconnect(padapter); -+ rtw_free_assoc_resources(padapter, 1); -+ } -+ pmppriv->prev_fw_state = get_fwstate(pmlmepriv); -+ pmlmepriv->fw_state = WIFI_MP_STATE; -+#if 0 -+ if (pmppriv->mode == _LOOPBOOK_MODE_) { -+ set_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE); //append txdesc -+ RT_TRACE(_module_mp_, _drv_notice_, ("+start mp in Lookback mode\n")); -+ } else { -+ RT_TRACE(_module_mp_, _drv_notice_, ("+start mp in normal mode\n")); -+ } -+#endif -+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING); -+ -+ //3 2. create a new psta for mp driver -+ //clear psta in the cur_network, if any -+ psta = rtw_get_stainfo(&padapter->stapriv, tgt_network->network.MacAddress); -+ if (psta) rtw_free_stainfo(padapter, psta); -+ -+ psta = rtw_alloc_stainfo(&padapter->stapriv, bssid.MacAddress); -+ if (psta == NULL) { -+ RT_TRACE(_module_mp_, _drv_err_, ("mp_start_test: Can't alloc sta_info!\n")); -+ pmlmepriv->fw_state = pmppriv->prev_fw_state; -+ res = _FAIL; -+ goto end_of_mp_start_test; -+ } -+ -+ //3 3. join psudo AdHoc -+ tgt_network->join_res = 1; -+ tgt_network->aid = psta->aid = 1; -+ _rtw_memcpy(&tgt_network->network, &bssid, length); -+ -+ rtw_indicate_connect(padapter); -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); -+ -+end_of_mp_start_test: -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if (res == _SUCCESS) -+ { -+ // set MSR to WIFI_FW_ADHOC_STATE -+#if defined (CONFIG_RTL8192C) || defined (CONFIG_RTL8192D) -+ val8 = rtw_read8(padapter, MSR) & 0xFC; // 0x0102 -+ val8 |= WIFI_FW_ADHOC_STATE; -+ rtw_write8(padapter, MSR, val8); // Link in ad hoc network -+#endif -+ -+#if !defined (CONFIG_RTL8192C) && !defined (CONFIG_RTL8192D) -+ rtw_write8(padapter, MSR, 1); // Link in ad hoc network -+ rtw_write8(padapter, RCR, 0); // RCR : disable all pkt, 0x10250048 -+ rtw_write8(padapter, RCR+2, 0x57); // RCR disable Check BSSID, 0x1025004a -+ -+ // disable RX filter map , mgt frames will put in RX FIFO 0 -+ rtw_write16(padapter, RXFLTMAP0, 0x0); // 0x10250116 -+ -+ val8 = rtw_read8(padapter, EE_9346CR); // 0x1025000A -+ if (!(val8 & _9356SEL))//boot from EFUSE -+ efuse_change_max_size(padapter); -+#endif -+ } -+ -+ return res; -+} -+//------------------------------------------------------------------------------ -+//This function change the DUT from the MP test mode into normal mode -+void mp_stop_test(PADAPTER padapter) -+{ -+ struct mp_priv *pmppriv = &padapter->mppriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wlan_network *tgt_network = &pmlmepriv->cur_network; -+ struct sta_info *psta; -+ -+ _irqL irqL; -+ -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _FALSE) -+ goto end_of_mp_stop_test; -+ -+ //3 1. disconnect psudo AdHoc -+ rtw_indicate_disconnect(padapter); -+ -+ //3 2. clear psta used in mp test mode. -+// rtw_free_assoc_resources(padapter, 1); -+ psta = rtw_get_stainfo(&padapter->stapriv, tgt_network->network.MacAddress); -+ if (psta) rtw_free_stainfo(padapter, psta); -+ -+ //3 3. return to normal state (default:station mode) -+ pmlmepriv->fw_state = pmppriv->prev_fw_state; // WIFI_STATION_STATE; -+ -+ //flush the cur_network -+ _rtw_memset(tgt_network, 0, sizeof(struct wlan_network)); -+ -+ _clr_fwstate_(pmlmepriv, WIFI_MP_STATE); -+ -+end_of_mp_stop_test: -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+/*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ -+#if 0 -+//#ifdef CONFIG_USB_HCI -+static VOID mpt_AdjustRFRegByRateByChan92CU(PADAPTER pAdapter, u8 RateIdx, u8 Channel, u8 BandWidthID) -+{ -+ u8 eRFPath; -+ u32 rfReg0x26; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ -+ if (RateIdx < MPT_RATE_6M) { // CCK rate,for 88cu -+ rfReg0x26 = 0xf400; -+ } -+ else if ((RateIdx >= MPT_RATE_6M) && (RateIdx <= MPT_RATE_54M)) {// OFDM rate,for 88cu -+ if ((4 == Channel) || (8 == Channel) || (12 == Channel)) -+ rfReg0x26 = 0xf000; -+ else if ((5 == Channel) || (7 == Channel) || (13 == Channel) || (14 == Channel)) -+ rfReg0x26 = 0xf400; -+ else -+ rfReg0x26 = 0x4f200; -+ } -+ else if ((RateIdx >= MPT_RATE_MCS0) && (RateIdx <= MPT_RATE_MCS15)) {// MCS 20M ,for 88cu // MCS40M rate,for 88cu -+ -+ if (HT_CHANNEL_WIDTH_20 == BandWidthID) { -+ if ((4 == Channel) || (8 == Channel)) -+ rfReg0x26 = 0xf000; -+ else if ((5 == Channel) || (7 == Channel) || (13 == Channel) || (14 == Channel)) -+ rfReg0x26 = 0xf400; -+ else -+ rfReg0x26 = 0x4f200; -+ } -+ else{ -+ if ((4 == Channel) || (8 == Channel)) -+ rfReg0x26 = 0xf000; -+ else if ((5 == Channel) || (7 == Channel)) -+ rfReg0x26 = 0xf400; -+ else -+ rfReg0x26 = 0x4f200; -+ } -+ } -+ -+// RT_TRACE(COMP_CMD, DBG_LOUD, ("\n mpt_AdjustRFRegByRateByChan92CU():Chan:%d Rate=%d rfReg0x26:0x%08x\n",Channel, RateIdx,rfReg0x26)); -+ for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) { -+ write_rfreg(pAdapter, eRFPath, RF_SYN_G2, rfReg0x26); -+ } -+} -+#endif -+/*----------------------------------------------------------------------------- -+ * Function: mpt_SwitchRfSetting -+ * -+ * Overview: Change RF Setting when we siwthc channel/rate/BW for MP. -+ * -+ * Input: IN PADAPTER pAdapter -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 01/08/2009 MHC Suggestion from SD3 Willis for 92S series. -+ * 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3. -+ * -+ *---------------------------------------------------------------------------*/ -+static void mpt_SwitchRfSetting(PADAPTER pAdapter) -+{ -+ Hal_mpt_SwitchRfSetting(pAdapter); -+ } -+ -+/*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ -+/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ -+static void MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) -+{ -+ Hal_MPT_CCKTxPowerAdjust(Adapter,bInCH14); -+} -+ -+static void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven) -+{ -+ Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter,beven); -+ } -+ -+/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ -+ -+/* -+ * SetChannel -+ * Description -+ * Use H2C command to change channel, -+ * not only modify rf register, but also other setting need to be done. -+ */ -+void SetChannel(PADAPTER pAdapter) -+{ -+ Hal_SetChannel(pAdapter); -+ -+} -+ -+/* -+ * Notice -+ * Switch bandwitdth may change center frequency(channel) -+ */ -+void SetBandwidth(PADAPTER pAdapter) -+{ -+ Hal_SetBandwidth(pAdapter); -+ -+} -+ -+static void SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower) -+{ -+ Hal_SetCCKTxPower(pAdapter,TxPower); -+} -+ -+static void SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) -+{ -+ Hal_SetOFDMTxPower(pAdapter,TxPower); -+ } -+ -+ -+void SetAntenna(PADAPTER pAdapter) -+ { -+ Hal_SetAntenna(pAdapter); -+} -+ -+void SetAntennaPathPower(PADAPTER pAdapter) -+{ -+ Hal_SetAntennaPathPower(pAdapter); -+} -+ -+void SetTxPower(PADAPTER pAdapter) -+{ -+ Hal_SetTxPower(pAdapter); -+ } -+ -+void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset) -+{ -+ u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC; -+ -+ TxAGCOffset_B = (ulTxAGCOffset&0x000000ff); -+ TxAGCOffset_C = ((ulTxAGCOffset&0x0000ff00)>>8); -+ TxAGCOffset_D = ((ulTxAGCOffset&0x00ff0000)>>16); -+ -+ tmpAGC = (TxAGCOffset_D<<8 | TxAGCOffset_C<<4 | TxAGCOffset_B); -+ write_bbreg(pAdapter, rFPGA0_TxGainStage, -+ (bXBTxAGC|bXCTxAGC|bXDTxAGC), tmpAGC); -+} -+ -+void SetDataRate(PADAPTER pAdapter) -+{ -+ Hal_SetDataRate(pAdapter); -+} -+ -+#if !defined (CONFIG_RTL8192C) && !defined (CONFIG_RTL8192D) -+/*------------------------------Define structure----------------------------*/ -+typedef struct _R_ANTENNA_SELECT_OFDM { -+ u32 r_tx_antenna:4; -+ u32 r_ant_l:4; -+ u32 r_ant_non_ht:4; -+ u32 r_ant_ht1:4; -+ u32 r_ant_ht2:4; -+ u32 r_ant_ht_s1:4; -+ u32 r_ant_non_ht_s1:4; -+ u32 OFDM_TXSC:2; -+ u32 Reserved:2; -+}R_ANTENNA_SELECT_OFDM; -+ -+typedef struct _R_ANTENNA_SELECT_CCK { -+ u8 r_cckrx_enable_2:2; -+ u8 r_cckrx_enable:2; -+ u8 r_ccktx_enable:4; -+}R_ANTENNA_SELECT_CCK; -+#endif -+ -+s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther) -+{ -+ return Hal_SetThermalMeter( pAdapter, target_ther); -+} -+ -+static void TriggerRFThermalMeter(PADAPTER pAdapter) -+{ -+ Hal_TriggerRFThermalMeter(pAdapter); -+} -+ -+static u8 ReadRFThermalMeter(PADAPTER pAdapter) -+{ -+ return Hal_ReadRFThermalMeter(pAdapter); -+} -+ -+void GetThermalMeter(PADAPTER pAdapter, u8 *value) -+{ -+ Hal_GetThermalMeter(pAdapter,value); -+} -+ -+void SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart) -+{ -+ Hal_SetSingleCarrierTx(pAdapter,bStart); -+} -+ -+void SetSingleToneTx(PADAPTER pAdapter, u8 bStart) -+{ -+ Hal_SetSingleToneTx(pAdapter,bStart); -+} -+ -+void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart) -+{ -+ Hal_SetCarrierSuppressionTx(pAdapter, bStart); -+} -+ -+void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) -+ { -+ Hal_SetCCKContinuousTx(pAdapter,bStart); -+ } -+ -+void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) -+ { -+ Hal_SetOFDMContinuousTx( pAdapter, bStart); -+}/* mpt_StartOfdmContTx */ -+ -+void SetContinuousTx(PADAPTER pAdapter, u8 bStart) -+{ -+ Hal_SetContinuousTx(pAdapter,bStart); -+} -+ -+//------------------------------------------------------------------------------ -+static void dump_mpframe(PADAPTER padapter, struct xmit_frame *pmpframe) -+{ -+ rtw_hal_mgnt_xmit(padapter, pmpframe); -+} -+ -+static struct xmit_frame *alloc_mp_xmitframe(struct xmit_priv *pxmitpriv) -+{ -+ struct xmit_frame *pmpframe; -+ struct xmit_buf *pxmitbuf; -+ -+ if ((pmpframe = rtw_alloc_xmitframe(pxmitpriv)) == NULL) -+ { -+ return NULL; -+ } -+ -+ if ((pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL) -+ { -+ rtw_free_xmitframe(pxmitpriv, pmpframe); -+ return NULL; -+ } -+ -+ pmpframe->frame_tag = MP_FRAMETAG; -+ -+ pmpframe->pxmitbuf = pxmitbuf; -+ -+ pmpframe->buf_addr = pxmitbuf->pbuf; -+ -+ pxmitbuf->priv_data = pmpframe; -+ -+ return pmpframe; -+ -+} -+ -+static thread_return mp_xmit_packet_thread(thread_context context) -+{ -+ struct xmit_frame *pxmitframe; -+ struct mp_tx *pmptx; -+ struct mp_priv *pmp_priv; -+ struct xmit_priv *pxmitpriv; -+ PADAPTER padapter; -+ -+ pmp_priv = (struct mp_priv *)context; -+ pmptx = &pmp_priv->tx; -+ padapter = pmp_priv->papdater; -+ pxmitpriv = &(padapter->xmitpriv); -+ -+ thread_enter("RTW_MP_THREAD"); -+ -+ DBG_871X("%s:pkTx Start\n", __func__); -+ while (1) { -+ pxmitframe = alloc_mp_xmitframe(pxmitpriv); -+ if (pxmitframe == NULL) { -+ if (pmptx->stop || -+ padapter->bSurpriseRemoved || -+ padapter->bDriverStopped) { -+ goto exit; -+ } -+ else { -+ rtw_msleep_os(1); -+ continue; -+ } -+ } -+ -+ _rtw_memcpy((u8 *)(pxmitframe->buf_addr+TXDESC_OFFSET), pmptx->buf, pmptx->write_size); -+ _rtw_memcpy(&(pxmitframe->attrib), &(pmptx->attrib), sizeof(struct pkt_attrib)); -+ -+ dump_mpframe(padapter, pxmitframe); -+ -+ pmptx->sended++; -+ pmp_priv->tx_pktcount++; -+ -+ if (pmptx->stop || -+ padapter->bSurpriseRemoved || -+ padapter->bDriverStopped) -+ goto exit; -+ if ((pmptx->count != 0) && -+ (pmptx->count == pmptx->sended)) -+ goto exit; -+ -+ flush_signals_thread(); -+ } -+ -+exit: -+ //DBG_871X("%s:pkTx Exit\n", __func__); -+ rtw_mfree(pmptx->pallocated_buf, pmptx->buf_size); -+ pmptx->pallocated_buf = NULL; -+ pmptx->stop = 1; -+ -+ thread_exit(); -+} -+ -+void fill_txdesc_for_mp(PADAPTER padapter, struct tx_desc *ptxdesc) -+{ -+ struct mp_priv *pmp_priv = &padapter->mppriv; -+ _rtw_memcpy(ptxdesc, &(pmp_priv->tx.desc), TXDESC_SIZE); -+} -+ -+void SetPacketTx(PADAPTER padapter) -+{ -+ u8 *ptr, *pkt_start, *pkt_end; -+ u32 pkt_size; -+ struct tx_desc *desc; -+ struct rtw_ieee80211_hdr *hdr; -+ u8 payload; -+ s32 bmcast; -+ struct pkt_attrib *pattrib; -+ struct mp_priv *pmp_priv; -+ -+ -+ pmp_priv = &padapter->mppriv; -+ if (pmp_priv->tx.stop) return; -+ pmp_priv->tx.sended = 0; -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx_pktcount = 0; -+ -+ //3 1. update_attrib() -+ pattrib = &pmp_priv->tx.attrib; -+ _rtw_memcpy(pattrib->src, padapter->eeprompriv.mac_addr, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); -+ bmcast = IS_MCAST(pattrib->ra); -+ if (bmcast) { -+ pattrib->mac_id = 1; -+ pattrib->psta = rtw_get_bcmc_stainfo(padapter); -+ } else { -+ pattrib->mac_id = 0; -+ pattrib->psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv)); -+ } -+ -+ pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->pktlen; -+ -+ //3 2. allocate xmit buffer -+ pkt_size = pattrib->last_txcmdsz; -+ -+ if (pmp_priv->tx.pallocated_buf) -+ rtw_mfree(pmp_priv->tx.pallocated_buf, pmp_priv->tx.buf_size); -+ pmp_priv->tx.write_size = pkt_size; -+ pmp_priv->tx.buf_size = pkt_size + XMITBUF_ALIGN_SZ; -+ pmp_priv->tx.pallocated_buf = rtw_zmalloc(pmp_priv->tx.buf_size); -+ if (pmp_priv->tx.pallocated_buf == NULL) { -+ DBG_871X("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size); -+ return; -+ } -+ pmp_priv->tx.buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pmp_priv->tx.pallocated_buf), XMITBUF_ALIGN_SZ); -+ ptr = pmp_priv->tx.buf; -+ -+ desc = &(pmp_priv->tx.desc); -+ _rtw_memset(desc, 0, TXDESC_SIZE); -+ pkt_start = ptr; -+ pkt_end = pkt_start + pkt_size; -+ -+ //3 3. init TX descriptor -+ // offset 0 -+ //desc->txdw0 |= cpu_to_le32(pkt_size & 0x0000FFFF); // packet size -+ //desc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); -+ //desc->txdw0 |= cpu_to_le32(((TXDESC_SIZE + OFFSET_SZ) << OFFSET_SHT) & 0x00FF0000); //32 bytes for TX Desc -+ //if (bmcast) desc->txdw0 |= cpu_to_le32(BMC); // broadcast packet -+ -+ // offset 4 -+ desc->txdw1 |= cpu_to_le32(BK); // don't aggregate(AMPDU) -+ desc->txdw1 |= cpu_to_le32((pattrib->mac_id) & 0x1F); //CAM_ID(MAC_ID) -+ desc->txdw1 |= cpu_to_le32((pattrib->qsel << QSEL_SHT) & 0x00001F00); // Queue Select, TID -+ desc->txdw1 |= cpu_to_le32((pattrib->raid << Rate_ID_SHT) & 0x000F0000); // Rate Adaptive ID -+ -+ // offset 8 -+ // offset 12 -+ //desc->txdw3 |= cpu_to_le32((pattrib->seqnum << SEQ_SHT) & 0xffff0000); -+ -+ // offset 16 -+ //desc->txdw4 |= cpu_to_le32(QoS); -+ desc->txdw4 |= cpu_to_le32(HW_SEQ_EN); -+ desc->txdw4 |= cpu_to_le32(USERATE); -+ desc->txdw4 |= cpu_to_le32(DISDATAFB); -+ -+ if( pmp_priv->preamble ){ -+ if (pmp_priv->rateidx <= MPT_RATE_54M) -+ desc->txdw4 |= cpu_to_le32(DATA_SHORT); // CCK Short Preamble -+ } -+ if (pmp_priv->bandwidth == HT_CHANNEL_WIDTH_40) -+ desc->txdw4 |= cpu_to_le32(DATA_BW); -+ -+ // offset 20 -+ desc->txdw5 |= cpu_to_le32(pmp_priv->rateidx & 0x0000001F); -+ -+ if( pmp_priv->preamble ){ -+ if (pmp_priv->rateidx > MPT_RATE_54M) -+ desc->txdw5 |= cpu_to_le32(SGI); // MCS Short Guard Interval -+ } -+ desc->txdw5 |= cpu_to_le32(0x0001FF00); // DATA/RTS Rate Fallback Limit -+ -+ //3 4. make wlan header, make_wlanhdr() -+ hdr = (struct rtw_ieee80211_hdr *)pkt_start; -+ SetFrameSubType(&hdr->frame_ctl, pattrib->subtype); -+ _rtw_memcpy(hdr->addr1, pattrib->dst, ETH_ALEN); // DA -+ _rtw_memcpy(hdr->addr2, pattrib->src, ETH_ALEN); // SA -+ _rtw_memcpy(hdr->addr3, get_bssid(&padapter->mlmepriv), ETH_ALEN); // RA, BSSID -+ -+ //3 5. make payload -+ ptr = pkt_start + pattrib->hdrlen; -+ -+ switch (pmp_priv->tx.payload) { -+ case 0: -+ payload = 0x00; -+ break; -+ case 1: -+ payload = 0x5a; -+ break; -+ case 2: -+ payload = 0xa5; -+ break; -+ case 3: -+ payload = 0xff; -+ break; -+ default: -+ payload = 0x00; -+ break; -+ } -+ -+ _rtw_memset(ptr, payload, pkt_end - ptr); -+ -+ //3 6. start thread -+#ifdef PLATFORM_LINUX -+ pmp_priv->tx.PktTxThread = kthread_run(mp_xmit_packet_thread, pmp_priv, "RTW_MP_THREAD"); -+ if (IS_ERR(pmp_priv->tx.PktTxThread)) -+ DBG_871X("Create PktTx Thread Fail !!!!!\n"); -+#endif -+#ifdef PLATFORM_FREEBSD -+{ -+ struct proc *p; -+ struct thread *td; -+ pmp_priv->tx.PktTxThread = kproc_kthread_add(mp_xmit_packet_thread, pmp_priv, -+ &p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread"); -+ -+ if (pmp_priv->tx.PktTxThread < 0) -+ DBG_871X("Create PktTx Thread Fail !!!!!\n"); -+} -+#endif -+} -+ -+void SetPacketRx(PADAPTER pAdapter, u8 bStartRx) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ if(bStartRx) -+ { -+ pHalData->ReceiveConfig = AAP | APM | AM | AB | APP_ICV | ADF | AMF | HTC_LOC_CTRL | APP_MIC | APP_PHYSTS; -+ -+ pHalData->ReceiveConfig |= ACRC32; -+ -+ rtw_write32(pAdapter, REG_RCR, pHalData->ReceiveConfig); -+ -+ // Accept all data frames -+ rtw_write16(pAdapter, REG_RXFLTMAP2, 0xFFFF); -+ } -+ else -+ { -+ rtw_write32(pAdapter, REG_RCR, 0); -+ } -+} -+ -+void ResetPhyRxPktCount(PADAPTER pAdapter) -+{ -+ u32 i, phyrx_set = 0; -+ -+ for (i = 0; i <= 0xF; i++) { -+ phyrx_set = 0; -+ phyrx_set |= _RXERR_RPT_SEL(i); //select -+ phyrx_set |= RXERR_RPT_RST; // set counter to zero -+ rtw_write32(pAdapter, REG_RXERR_RPT, phyrx_set); -+ } -+} -+ -+static u32 GetPhyRxPktCounts(PADAPTER pAdapter, u32 selbit) -+{ -+ //selection -+ u32 phyrx_set = 0, count = 0; -+ -+ phyrx_set = _RXERR_RPT_SEL(selbit & 0xF); -+ rtw_write32(pAdapter, REG_RXERR_RPT, phyrx_set); -+ -+ //Read packet count -+ count = rtw_read32(pAdapter, REG_RXERR_RPT) & RXERR_COUNTER_MASK; -+ -+ return count; -+} -+ -+u32 GetPhyRxPktReceived(PADAPTER pAdapter) -+{ -+ u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0; -+ -+ OFDM_cnt = GetPhyRxPktCounts(pAdapter, RXERR_TYPE_OFDM_MPDU_OK); -+ CCK_cnt = GetPhyRxPktCounts(pAdapter, RXERR_TYPE_CCK_MPDU_OK); -+ HT_cnt = GetPhyRxPktCounts(pAdapter, RXERR_TYPE_HT_MPDU_OK); -+ -+ return OFDM_cnt + CCK_cnt + HT_cnt; -+} -+ -+u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter) -+{ -+ u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0; -+ -+ OFDM_cnt = GetPhyRxPktCounts(pAdapter, RXERR_TYPE_OFDM_MPDU_FAIL); -+ CCK_cnt = GetPhyRxPktCounts(pAdapter, RXERR_TYPE_CCK_MPDU_FAIL); -+ HT_cnt = GetPhyRxPktCounts(pAdapter, RXERR_TYPE_HT_MPDU_FAIL); -+ -+ return OFDM_cnt + CCK_cnt + HT_cnt; -+} -+ -+//reg 0x808[9:0]: FFT data x -+//reg 0x808[22]: 0 --> 1 to get 1 FFT data y -+//reg 0x8B4[15:0]: FFT data y report -+static u32 GetPSDData(PADAPTER pAdapter, u32 point) -+{ -+ int psd_val; -+ -+ -+ psd_val = rtw_read32(pAdapter, 0x808); -+ psd_val &= 0xFFBFFC00; -+ psd_val |= point; -+ -+ rtw_write32(pAdapter, 0x808, psd_val); -+ rtw_mdelay_os(1); -+ psd_val |= 0x00400000; -+ -+ rtw_write32(pAdapter, 0x808, psd_val); -+ rtw_mdelay_os(1); -+ psd_val = rtw_read32(pAdapter, 0x8B4); -+ -+ psd_val &= 0x0000FFFF; -+ -+ return psd_val; -+} -+ -+/* -+ * pts start_point_min stop_point_max -+ * 128 64 64 + 128 = 192 -+ * 256 128 128 + 256 = 384 -+ * 512 256 256 + 512 = 768 -+ * 1024 512 512 + 1024 = 1536 -+ * -+ */ -+u32 mp_query_psd(PADAPTER pAdapter, u8 *data) -+{ -+ u32 i, psd_pts=0, psd_start=0, psd_stop=0; -+ u32 psd_data=0; -+ -+#ifdef PLATFORM_LINUX -+ if (!netif_running(pAdapter->pnetdev)) { -+ RT_TRACE(_module_mp_, _drv_warning_, ("mp_query_psd: Fail! interface not opened!\n")); -+ return 0; -+ } -+#endif -+ -+ if (check_fwstate(&pAdapter->mlmepriv, WIFI_MP_STATE) == _FALSE) { -+ RT_TRACE(_module_mp_, _drv_warning_, ("mp_query_psd: Fail! not in MP mode!\n")); -+ return 0; -+ } -+ -+ if (strlen(data) == 0) { //default value -+ psd_pts = 128; -+ psd_start = 64; -+ psd_stop = 128; -+ } else { -+ sscanf(data, "pts=%d,start=%d,stop=%d", &psd_pts, &psd_start, &psd_stop); -+ } -+ -+ _rtw_memset(data, '\0', sizeof(data)); -+ -+ i = psd_start; -+ while (i < psd_stop) -+ { -+ if (i >= psd_pts) { -+ psd_data = GetPSDData(pAdapter, i-psd_pts); -+ } else { -+ psd_data = GetPSDData(pAdapter, i); -+ } -+ sprintf(data, "%s%x ", data, psd_data); -+ i++; -+ } -+ -+ #ifdef CONFIG_LONG_DELAY_ISSUE -+ rtw_msleep_os(100); -+ #else -+ rtw_mdelay_os(100); -+ #endif -+ -+ return strlen(data)+1; -+} -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c -@@ -0,0 +1,2954 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_MP_IOCTL_C_ -+ -+#include -+#include -+#include -+#include -+ -+//#include -+#include -+ -+ -+//**************** oid_rtl_seg_81_85 section start **************** -+NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u8)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ if (poid_par_priv->type_of_oid == SET_OID) { -+ Adapter->registrypriv.wireless_mode = *(u8*)poid_par_priv->information_buf; -+ } else if (poid_par_priv->type_of_oid == QUERY_OID) { -+ *(u8*)poid_par_priv->information_buf = Adapter->registrypriv.wireless_mode; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ RT_TRACE(_module_mp_, _drv_info_, ("-query Wireless Mode=%d\n", Adapter->registrypriv.wireless_mode)); -+ } else { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+//**************** oid_rtl_seg_81_87_80 section start **************** -+NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ struct bb_reg_param *pbbreg; -+ u16 offset; -+ u32 value; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_write_bb_reg_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(struct bb_reg_param)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pbbreg = (struct bb_reg_param *)(poid_par_priv->information_buf); -+ -+ offset = (u16)(pbbreg->offset) & 0xFFF; //0ffset :0x800~0xfff -+ if (offset < BB_REG_BASE_ADDR) offset |= BB_REG_BASE_ADDR; -+ -+ value = pbbreg->value; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_write_bb_reg_hdl: offset=0x%03X value=0x%08X\n", -+ offset, value)); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ write_bbreg(Adapter, offset, 0xFFFFFFFF, value); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ struct bb_reg_param *pbbreg; -+ u16 offset; -+ u32 value; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_read_bb_reg_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(struct bb_reg_param)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pbbreg = (struct bb_reg_param *)(poid_par_priv->information_buf); -+ -+ offset = (u16)(pbbreg->offset) & 0xFFF; //0ffset :0x800~0xfff -+ if (offset < BB_REG_BASE_ADDR) offset |= BB_REG_BASE_ADDR; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ value = read_bbreg(Adapter, offset, 0xFFFFFFFF); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ pbbreg->value = value; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-oid_rt_pro_read_bb_reg_hdl: offset=0x%03X value:0x%08X\n", -+ offset, value)); -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ struct rf_reg_param *pbbreg; -+ u8 path; -+ u8 offset; -+ u32 value; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_write_rf_reg_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(struct rf_reg_param)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pbbreg = (struct rf_reg_param *)(poid_par_priv->information_buf); -+ -+ if (pbbreg->path >= MAX_RF_PATH_NUMS) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ if (pbbreg->offset > 0xFF) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ if (pbbreg->value > 0xFFFFF) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ path = (u8)pbbreg->path; -+ offset = (u8)pbbreg->offset; -+ value = pbbreg->value; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_write_rf_reg_hdl: path=%d offset=0x%02X value=0x%05X\n", -+ path, offset, value)); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ write_rfreg(Adapter, path, offset, value); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ struct rf_reg_param *pbbreg; -+ u8 path; -+ u8 offset; -+ u32 value; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_read_rf_reg_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(struct rf_reg_param)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pbbreg = (struct rf_reg_param *)(poid_par_priv->information_buf); -+ -+ if (pbbreg->path >= MAX_RF_PATH_NUMS) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ if (pbbreg->offset > 0xFF) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ path = (u8)pbbreg->path; -+ offset = (u8)pbbreg->offset; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ value = read_rfreg(Adapter, path, offset); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ pbbreg->value = value; -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-oid_rt_pro_read_rf_reg_hdl: path=%d offset=0x%02X value=0x%05X\n", -+ path, offset, value)); -+ -+_func_exit_; -+ -+ return status; -+} -+//**************** oid_rtl_seg_81_87_00 section end**************** -+//------------------------------------------------------------------------------ -+ -+//**************** oid_rtl_seg_81_80_00 section start **************** -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 ratevalue;//4 -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("+oid_rt_pro_set_data_rate_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len != sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ ratevalue = *((u32*)poid_par_priv->information_buf);//4 -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_set_data_rate_hdl: data rate idx=%d\n", ratevalue)); -+ if (ratevalue >= MPT_RATE_LAST) -+ return NDIS_STATUS_INVALID_DATA; -+ -+ Adapter->mppriv.rateidx = ratevalue; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetDataRate(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 mode; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_start_test_hdl\n")); -+ -+ if (Adapter->registrypriv.mp_mode == 0) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ //IQCalibrateBcut(Adapter); -+ -+ mode = *((u32*)poid_par_priv->information_buf); -+ Adapter->mppriv.mode = mode;// 1 for loopback -+ -+ if (mp_start_test(Adapter) == _FAIL) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ goto exit; -+ } -+ -+exit: -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("-oid_rt_pro_start_test_hdl: mp_mode=%d\n", Adapter->mppriv.mode)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_STOP_TEST\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ mp_stop_test(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("-Set OID_RT_PRO_STOP_TEST\n")); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 Channel; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_set_channel_direct_call_hdl\n")); -+ -+ if (poid_par_priv->information_buf_len != sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ if (poid_par_priv->type_of_oid == QUERY_OID) { -+ *((u32*)poid_par_priv->information_buf) = Adapter->mppriv.channel; -+ return NDIS_STATUS_SUCCESS; -+ } -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ Channel = *((u32*)poid_par_priv->information_buf); -+ RT_TRACE(_module_mp_, _drv_notice_, ("oid_rt_pro_set_channel_direct_call_hdl: Channel=%d\n", Channel)); -+ if (Channel > 14) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ Adapter->mppriv.channel = Channel; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetChannel(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u16 bandwidth; -+ u16 channel_offset; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("+oid_rt_set_bandwidth_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ bandwidth = *((u32*)poid_par_priv->information_buf);//4 -+ channel_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ -+ if (bandwidth != HT_CHANNEL_WIDTH_40) -+ bandwidth = HT_CHANNEL_WIDTH_20; -+ padapter->mppriv.bandwidth = (u8)bandwidth; -+ padapter->mppriv.prime_channel_offset = (u8)channel_offset; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetBandwidth(padapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-oid_rt_set_bandwidth_hdl: bandwidth=%d channel_offset=%d\n", -+ bandwidth, channel_offset)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 antenna; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_set_antenna_bb_hdl\n")); -+ -+ if (poid_par_priv->information_buf_len != sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ if (poid_par_priv->type_of_oid == SET_OID) -+ { -+ antenna = *(u32*)poid_par_priv->information_buf; -+ -+ Adapter->mppriv.antenna_tx = (u16)((antenna & 0xFFFF0000) >> 16); -+ Adapter->mppriv.antenna_rx = (u16)(antenna & 0x0000FFFF); -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_set_antenna_bb_hdl: tx_ant=0x%04x rx_ant=0x%04x\n", -+ Adapter->mppriv.antenna_tx, Adapter->mppriv.antenna_rx)); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetAntenna(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ } else { -+ antenna = (Adapter->mppriv.antenna_tx << 16)|Adapter->mppriv.antenna_rx; -+ *(u32*)poid_par_priv->information_buf = antenna; -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 tx_pwr_idx; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+oid_rt_pro_set_tx_power_control_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len != sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ tx_pwr_idx = *((u32*)poid_par_priv->information_buf); -+ if (tx_pwr_idx > MAX_TX_PWR_INDEX_N_MODE) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ Adapter->mppriv.txpoweridx = (u8)tx_pwr_idx; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_set_tx_power_control_hdl: idx=0x%2x\n", -+ Adapter->mppriv.txpoweridx)); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetTxPower(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+//------------------------------------------------------------------------------ -+//**************** oid_rtl_seg_81_80_20 section start **************** -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid !=QUERY_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if (poid_par_priv->information_buf_len == sizeof(ULONG)) { -+ *(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.tx_pktcount; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } else { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ RT_TRACE(_module_mp_, _drv_alert_, ("===> oid_rt_pro_query_rx_packet_received_hdl.\n")); -+ if (poid_par_priv->information_buf_len == sizeof(ULONG)) { -+ *(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.rx_pktcount; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ RT_TRACE(_module_mp_, _drv_alert_, ("recv_ok:%d \n",Adapter->mppriv.rx_pktcount)); -+ } else { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ RT_TRACE(_module_mp_, _drv_alert_, ("===> oid_rt_pro_query_rx_packet_crc32_error_hdl.\n")); -+ if (poid_par_priv->information_buf_len == sizeof(ULONG)) { -+ *(ULONG*)poid_par_priv->information_buf = Adapter->mppriv.rx_crcerrpktcount; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ RT_TRACE(_module_mp_, _drv_alert_, ("recv_err:%d \n",Adapter->mppriv.rx_crcerrpktcount)); -+ } else { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+ -+NDIS_STATUS oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ RT_TRACE(_module_mp_, _drv_alert_, ("===> oid_rt_pro_reset_tx_packet_sent_hdl.\n")); -+ Adapter->mppriv.tx_pktcount = 0; -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ if (poid_par_priv->information_buf_len == sizeof(ULONG)) { -+ Adapter->mppriv.rx_pktcount = 0; -+ Adapter->mppriv.rx_crcerrpktcount = 0; -+ } else { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ ResetPhyRxPktCount(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+oid_rt_get_phy_rx_packet_received_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len != sizeof(ULONG)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ *(ULONG*)poid_par_priv->information_buf = GetPhyRxPktReceived(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("-oid_rt_get_phy_rx_packet_received_hdl: recv_ok=%d\n", *(ULONG*)poid_par_priv->information_buf)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+oid_rt_get_phy_rx_packet_crc32_error_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ -+ if (poid_par_priv->information_buf_len != sizeof(ULONG)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ *(ULONG*)poid_par_priv->information_buf = GetPhyRxPktCRC32Error(Adapter); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("-oid_rt_get_phy_rx_packet_crc32_error_hdl: recv_err=%d\n", *(ULONG*)poid_par_priv->information_buf)); -+ -+_func_exit_; -+ -+ return status; -+} -+//**************** oid_rtl_seg_81_80_20 section end **************** -+NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 bStartTest; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_set_continuous_tx_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ bStartTest = *((u32*)poid_par_priv->information_buf); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetContinuousTx(Adapter,(u8)bStartTest); -+ if (bStartTest) { -+ struct mp_priv *pmp_priv = &Adapter->mppriv; -+ if (pmp_priv->tx.stop == 0) { -+ pmp_priv->tx.stop = 1; -+ DBG_871X("%s: pkt tx is running...\n", __func__); -+ rtw_msleep_os(5); -+ } -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx.count = 1; -+ SetPacketTx(Adapter); -+ } -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 bStartTest; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_alert_, ("+oid_rt_pro_set_single_carrier_tx_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ bStartTest = *((u32*)poid_par_priv->information_buf); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetSingleCarrierTx(Adapter, (u8)bStartTest); -+ if (bStartTest) { -+ struct mp_priv *pmp_priv = &Adapter->mppriv; -+ if (pmp_priv->tx.stop == 0) { -+ pmp_priv->tx.stop = 1; -+ DBG_871X("%s: pkt tx is running...\n", __func__); -+ rtw_msleep_os(5); -+ } -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx.count = 1; -+ SetPacketTx(Adapter); -+ } -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 bStartTest; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_set_carrier_suppression_tx_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ bStartTest = *((u32*)poid_par_priv->information_buf); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetCarrierSuppressionTx(Adapter, (u8)bStartTest); -+ if (bStartTest) { -+ struct mp_priv *pmp_priv = &Adapter->mppriv; -+ if (pmp_priv->tx.stop == 0) { -+ pmp_priv->tx.stop = 1; -+ DBG_871X("%s: pkt tx is running...\n", __func__); -+ rtw_msleep_os(5); -+ } -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx.count = 1; -+ SetPacketTx(Adapter); -+ } -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 bStartTest; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_alert_, ("+oid_rt_pro_set_single_tone_tx_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ bStartTest = *((u32*)poid_par_priv->information_buf); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetSingleToneTx(Adapter,(u8)bStartTest); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_pro_set_modulation_hdl(struct oid_par_priv* poid_par_priv) -+{ -+ return 0; -+} -+ -+NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, 0); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//**************** oid_rtl_seg_81_80_00 section end **************** -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ PNDIS_802_11_SSID pssid; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ *poid_par_priv->bytes_needed = (u32)sizeof(NDIS_802_11_SSID); -+ *poid_par_priv->bytes_rw = 0; -+ if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pssid = (PNDIS_802_11_SSID)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (mp_start_joinbss(Adapter, pssid) == _FAIL) -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = sizeof(NDIS_802_11_SSID); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ pRW_Reg RegRWStruct; -+ u32 offset, width; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("+oid_rt_pro_read_register_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ RegRWStruct = (pRW_Reg)poid_par_priv->information_buf; -+ offset = RegRWStruct->offset; -+ width = RegRWStruct->width; -+ -+ if (offset > 0xFFF) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ switch (width) { -+ case 1: -+ RegRWStruct->value = rtw_read8(Adapter, offset); -+ break; -+ case 2: -+ RegRWStruct->value = rtw_read16(Adapter, offset); -+ break; -+ default: -+ width = 4; -+ RegRWStruct->value = rtw_read32(Adapter, offset); -+ break; -+ } -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_read_register_hdl: offset:0x%04X value:0x%X\n", -+ offset, RegRWStruct->value)); -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = width; -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ pRW_Reg RegRWStruct; -+ u32 offset, width, value; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("+oid_rt_pro_write_register_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ RegRWStruct = (pRW_Reg)poid_par_priv->information_buf; -+ offset = RegRWStruct->offset; -+ width = RegRWStruct->width; -+ value = RegRWStruct->value; -+ -+ if (offset > 0xFFF) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ switch (RegRWStruct->width) -+ { -+ case 1: -+ if (value > 0xFF) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ break; -+ } -+ rtw_write8(padapter, offset, (u8)value); -+ break; -+ case 2: -+ if (value > 0xFFFF) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ break; -+ } -+ rtw_write16(padapter, offset, (u16)value); -+ break; -+ case 4: -+ rtw_write32(padapter, offset, value); -+ break; -+ default: -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ break; -+ } -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("-oid_rt_pro_write_register_hdl: offset=0x%08X width=%d value=0x%X\n", -+ offset, width, value)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ pBurst_RW_Reg pBstRwReg; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_burst_read_register_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ pBstRwReg = (pBurst_RW_Reg)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ rtw_read_mem(padapter, pBstRwReg->offset, (u32)pBstRwReg->len, pBstRwReg->Data); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("-oid_rt_pro_burst_read_register_hdl\n")); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_burst_write_register_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ pBurst_RW_Reg pBstRwReg; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_burst_write_register_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ pBstRwReg = (pBurst_RW_Reg)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ rtw_write_mem(padapter, pBstRwReg->offset, (u32)pBstRwReg->len, pBstRwReg->Data); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("-oid_rt_pro_burst_write_register_hdl\n")); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ PADAPTER Adapter = (PADAPTER)( poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ -+ TX_CMD_Desc *TxCmd_Info; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+Set OID_RT_PRO_WRITE_TXCMD\n")); -+ -+ TxCmd_Info=(TX_CMD_Desc*)poid_par_priv->information_buf; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:Addr=%.8X\n", TxCmd_Info->offset)); -+ RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:1.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[0])); -+ RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:2.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[1])); -+ RT_TRACE(_module_mp_, _drv_info_, (("WRITE_TXCMD:3.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[2])); -+ RT_TRACE(_module_mp_, _drv_info_, ("WRITE_TXCMD:4.)%.8X\n", (ULONG)TxCmd_Info->TxCMD.value[3])); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ rtw_write32(Adapter, TxCmd_Info->offset + 0, (unsigned int)TxCmd_Info->TxCMD.value[0]); -+ rtw_write32(Adapter, TxCmd_Info->offset + 4, (unsigned int)TxCmd_Info->TxCMD.value[1]); -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-Set OID_RT_PRO_WRITE_TXCMD: status=0x%08X\n", status)); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+ -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ pEEPROM_RWParam pEEPROM; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+Query OID_RT_PRO_READ16_EEPROM\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ pEEPROM = (pEEPROM_RWParam)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ pEEPROM->value = eeprom_read16(padapter, (u16)(pEEPROM->offset >> 1)); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-Query OID_RT_PRO_READ16_EEPROM: offset=0x%x value=0x%x\n", -+ pEEPROM->offset, pEEPROM->value)); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+ -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_write16_eeprom_hdl (struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ pEEPROM_RWParam pEEPROM; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_WRITE16_EEPROM\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ pEEPROM = (pEEPROM_RWParam)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ eeprom_write16(padapter, (u16)(pEEPROM->offset >> 1), pEEPROM->value); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro8711_wi_poll_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)( poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ struct mp_wiparam *pwi_param; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(struct mp_wiparam)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ if (Adapter->mppriv.workparam.bcompleted == _FALSE) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ pwi_param = (struct mp_wiparam *)poid_par_priv->information_buf; -+ -+ _rtw_memcpy(pwi_param, &Adapter->mppriv.workparam, sizeof(struct mp_wiparam)); -+ Adapter->mppriv.act_in_progress = _FALSE; -+// RT_TRACE(_module_mp_, _drv_info_, ("rf:%x\n", pwiparam->IoValue)); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro8711_pkt_loss_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)( poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro8711_pkt_loss_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(uint)*2) { -+ RT_TRACE(_module_mp_, _drv_err_, ("-oid_rt_pro8711_pkt_loss_hdl: buf_len=%d\n", (int)poid_par_priv->information_buf_len)); -+ return NDIS_STATUS_INVALID_LENGTH; -+ } -+ -+ if (*(uint*)poid_par_priv->information_buf == 1)//init==1 -+ Adapter->mppriv.rx_pktloss = 0; -+ -+ *((uint*)poid_par_priv->information_buf+1) = Adapter->mppriv.rx_pktloss; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_rd_attrib_mem_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)( poid_par_priv->adapter_context); -+ struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue; -+ struct intf_hdl *pintfhdl = &pio_queue->intf; -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+#ifdef CONFIG_SDIO_HCI -+ void (*_attrib_read)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+#endif -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+Query OID_RT_RD_ATTRIB_MEM\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+#ifdef CONFIG_SDIO_HCI -+ _irqlevel_changed_(&oldirql, LOWER); -+{ -+ u32 *plmem = (u32*)poid_par_priv->information_buf+2; -+ _attrib_read = pintfhdl->io_ops._attrib_read; -+ _attrib_read(pintfhdl, *((u32*)poid_par_priv->information_buf), -+ *((u32*)poid_par_priv->information_buf+1), (u8*)plmem); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+} -+ _irqlevel_changed_(&oldirql, RAISE); -+#endif -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_wr_attrib_mem_hdl (struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue; -+ struct intf_hdl *pintfhdl = &pio_queue->intf; -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+#ifdef CONFIG_SDIO_HCI -+ void (*_attrib_write)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+#endif -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+#ifdef CONFIG_SDIO_HCI -+ _irqlevel_changed_(&oldirql, LOWER); -+{ -+ u32 *plmem = (u32*)poid_par_priv->information_buf + 2; -+ _attrib_write = pintfhdl->io_ops._attrib_write; -+ _attrib_write(pintfhdl, *(u32*)poid_par_priv->information_buf, -+ *((u32*)poid_par_priv->information_buf+1), (u8*)plmem); -+} -+ _irqlevel_changed_(&oldirql, RAISE); -+#endif -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_rf_intfs_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+OID_RT_PRO_SET_RF_INTFS\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (rtw_setrfintfs_cmd(Adapter, *(unsigned char*)poid_par_priv->information_buf) == _FAIL) -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_poll_rx_status_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _rtw_memcpy(poid_par_priv->information_buf, (unsigned char*)&Adapter->mppriv.rxstat, sizeof(struct recv_stat)); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_cfg_debug_message_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ PCFG_DBG_MSG_STRUCT pdbg_msg; -+ -+_func_enter_; -+ -+// RT_TRACE(0xffffffffff,_drv_alert_,("===> oid_rt_pro_cfg_debug_message_hdl.\n")); -+ -+#if 0//#ifdef CONFIG_DEBUG_RTL871X -+ -+ pdbg_msg = (PCFG_DBG_MSG_STRUCT)(poid_par_priv->information_buf); -+ -+ if (poid_par_priv->type_of_oid == SET_OID) { -+ RT_TRACE(0xffffffffff, _drv_alert_, -+ ("===>Set level :0x%08x, H32:0x%08x L32:0x%08x\n", -+ pdbg_msg->DebugLevel, pdbg_msg->DebugComponent_H32, pdbg_msg->DebugComponent_L32)); -+ -+ GlobalDebugLevel = pdbg_msg->DebugLevel; -+ GlobalDebugComponents = (pdbg_msg->DebugComponent_H32 << 32) | pdbg_msg->DebugComponent_L32; -+ RT_TRACE(0xffffffffff, _drv_alert_, -+ ("===> Set level :0x%08x, component:0x%016x\n", -+ GlobalDebugLevel, (u32)GlobalDebugComponents)); -+ } else { -+ pdbg_msg->DebugLevel = GlobalDebugLevel; -+ pdbg_msg->DebugComponent_H32 = (u32)(GlobalDebugComponents >> 32); -+ pdbg_msg->DebugComponent_L32 = (u32)GlobalDebugComponents; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(0xffffffffff, _drv_alert_, -+ ("===>Query level:0x%08x H32:0x%08x L32:0x%08x\n", -+ (u32)pdbg_msg->DebugLevel, (u32)pdbg_msg->DebugComponent_H32, (u32)pdbg_msg->DebugComponent_L32)); -+ } -+ -+#endif -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+OID_RT_PRO_SET_DATA_RATE_EX\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (rtw_setdatarate_cmd(Adapter, poid_par_priv->information_buf) !=_SUCCESS) -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//----------------------------------------------------------------------------- -+NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ u8 thermal = 0; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_get_thermal_meter_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ GetThermalMeter(Adapter, &thermal); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *(u32*)poid_par_priv->information_buf = (u32)thermal; -+ *poid_par_priv->bytes_rw = sizeof(u32); -+ -+_func_exit_; -+ -+ return status; -+} -+//----------------------------------------------------------------------------- -+NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_read_tssi_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (Adapter->mppriv.act_in_progress == _TRUE) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u8)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ //init workparam -+ Adapter->mppriv.act_in_progress = _TRUE; -+ Adapter->mppriv.workparam.bcompleted = _FALSE; -+ Adapter->mppriv.workparam.act_type = MPT_READ_TSSI; -+ Adapter->mppriv.workparam.io_offset = 0; -+ Adapter->mppriv.workparam.io_value = 0xFFFFFFFF; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (!rtw_gettssi_cmd(Adapter,0, (u8*)&Adapter->mppriv.workparam.io_value)) -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ -+_func_enter_; -+ -+// if (poid_par_priv->type_of_oid != SET_OID) -+// return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u8)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ if (poid_par_priv->type_of_oid == SET_OID) { -+ u8 enable; -+ -+ enable = *(u8*)poid_par_priv->information_buf; -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("+oid_rt_pro_set_power_tracking_hdl: enable=%d\n", enable)); -+ -+ SetPowerTracking(Adapter, enable); -+ } else { -+ GetPowerTracking(Adapter, (u8*)poid_par_priv->information_buf); -+ } -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//----------------------------------------------------------------------------- -+NDIS_STATUS oid_rt_pro_set_basic_rate_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u32 ratevalue; -+ u8 datarates[NumRates]; -+ int i; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+OID_RT_PRO_SET_BASIC_RATE\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+#if 0 -+ ratevalue = *((u32*)poid_par_priv->information_buf); -+ -+ for (i = 0; i < NumRates; i++) { -+ if (ratevalue == mpdatarate[i]) -+ datarates[i] = mpdatarate[i]; -+ else -+ datarates[i] = 0xff; -+ RT_TRACE(_module_rtl871x_ioctl_c_, _drv_info_, ("basicrate_inx=%d\n", datarates[i])); -+ } -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (rtw_setbasicrate_cmd(padapter, datarates) != _SUCCESS) -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+#endif -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-OID_RT_PRO_SET_BASIC_RATE: status=0x%08X\n", status)); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_qry_pwrstate_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < 8) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ *poid_par_priv->bytes_rw = 8; -+ _rtw_memcpy(poid_par_priv->information_buf, &(Adapter->pwrctrlpriv.pwr_mode), 8); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-oid_rt_pro_qry_pwrstate_hdl: pwr_mode=%d smart_ps=%d\n", -+ Adapter->pwrctrlpriv.pwr_mode, Adapter->pwrctrlpriv.smart_ps)); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_set_pwrstate_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ uint pwr_mode, smart_ps; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_SET_PWRSTATE\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ *poid_par_priv->bytes_rw = 0; -+ *poid_par_priv->bytes_needed = 8; -+ -+ if (poid_par_priv->information_buf_len < 8) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pwr_mode = *(uint *)(poid_par_priv->information_buf); -+ smart_ps = *(uint *)((int)poid_par_priv->information_buf + 4); -+ -+ *poid_par_priv->bytes_rw = 8; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_h2c_set_rate_table_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ struct setratable_parm *prate_table; -+ u8 res; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ *poid_par_priv->bytes_needed = sizeof(struct setratable_parm); -+ if (poid_par_priv->information_buf_len < sizeof(struct setratable_parm)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ prate_table = (struct setratable_parm*)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ res = rtw_setrttbl_cmd(Adapter, prate_table); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ if (res == _FAIL) -+ status = NDIS_STATUS_FAILURE; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_h2c_get_rate_table_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ #if 0 -+ struct mp_wi_cntx *pmp_wi_cntx=&(Adapter->mppriv.wi_cntx); -+ u8 res=_SUCCESS; -+ DEBUG_INFO(("===> Set OID_RT_PRO_H2C_GET_RATE_TABLE.\n")); -+ -+ if(pmp_wi_cntx->bmp_wi_progress ==_TRUE){ -+ DEBUG_ERR(("\n mp workitem is progressing, not allow to set another workitem right now!!!\n")); -+ Status = NDIS_STATUS_NOT_ACCEPTED; -+ break; -+ } -+ else{ -+ pmp_wi_cntx->bmp_wi_progress=_TRUE; -+ pmp_wi_cntx->param.bcompleted=_FALSE; -+ pmp_wi_cntx->param.act_type=MPT_GET_RATE_TABLE; -+ pmp_wi_cntx->param.io_offset=0x0; -+ pmp_wi_cntx->param.bytes_cnt=sizeof(struct getratable_rsp); -+ pmp_wi_cntx->param.io_value=0xffffffff; -+ -+ res=rtw_getrttbl_cmd(Adapter,(struct getratable_rsp *)pmp_wi_cntx->param.data); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ if(res != _SUCCESS) -+ { -+ Status = NDIS_STATUS_NOT_ACCEPTED; -+ } -+ } -+ DEBUG_INFO(("\n <=== Set OID_RT_PRO_H2C_GET_RATE_TABLE.\n")); -+ #endif -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+ -+//**************** oid_rtl_seg_87_12_00 section start **************** -+NDIS_STATUS oid_rt_pro_encryption_ctrl_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ struct security_priv *psecuritypriv = &Adapter->securitypriv; -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ ENCRY_CTRL_STATE encry_mode; -+ -+ -+ *poid_par_priv->bytes_needed = sizeof(u8); -+ if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ if (poid_par_priv->type_of_oid == SET_OID) -+ { -+ encry_mode = *((u8*)poid_par_priv->information_buf); -+ switch (encry_mode) -+ { -+ case HW_CONTROL: -+ #if 0 -+ Adapter->registrypriv.software_decrypt=_FALSE; -+ Adapter->registrypriv.software_encrypt=_FALSE; -+ #else -+ psecuritypriv->sw_decrypt = _FALSE; -+ psecuritypriv->sw_encrypt = _FALSE; -+ #endif -+ break; -+ case SW_CONTROL: -+ #if 0 -+ Adapter->registrypriv.software_decrypt=_TRUE; -+ Adapter->registrypriv.software_encrypt=_TRUE; -+ #else -+ psecuritypriv->sw_decrypt = _TRUE; -+ psecuritypriv->sw_encrypt = _TRUE; -+ #endif -+ break; -+ case HW_ENCRY_SW_DECRY: -+ #if 0 -+ Adapter->registrypriv.software_decrypt=_TRUE; -+ Adapter->registrypriv.software_encrypt=_FALSE; -+ #else -+ psecuritypriv->sw_decrypt = _TRUE; -+ psecuritypriv->sw_encrypt = _FALSE; -+ #endif -+ break; -+ case SW_ENCRY_HW_DECRY: -+ #if 0 -+ Adapter->registrypriv.software_decrypt=_FALSE; -+ Adapter->registrypriv.software_encrypt=_TRUE; -+ #else -+ psecuritypriv->sw_decrypt = _FALSE; -+ psecuritypriv->sw_encrypt = _TRUE; -+ #endif -+ break; -+ } -+ -+ RT_TRACE(_module_rtl871x_ioctl_c_, _drv_notice_, -+ ("-oid_rt_pro_encryption_ctrl_hdl: SET encry_mode=0x%x sw_encrypt=0x%x sw_decrypt=0x%x\n", -+ encry_mode, psecuritypriv->sw_encrypt, psecuritypriv->sw_decrypt)); -+ } -+ else { -+ #if 0 -+ if (Adapter->registrypriv.software_encrypt == _FALSE) { -+ if (Adapter->registrypriv.software_decrypt == _FALSE) -+ encry_mode = HW_CONTROL; -+ else -+ encry_mode = HW_ENCRY_SW_DECRY; -+ } -+ else { -+ if (Adapter->registrypriv.software_decrypt == _FALSE) -+ encry_mode = SW_ENCRY_HW_DECRY; -+ else -+ encry_mode = SW_CONTROL; -+ } -+ #else -+ -+ if ((psecuritypriv->sw_encrypt == _FALSE) && (psecuritypriv->sw_decrypt == _FALSE)) -+ encry_mode = HW_CONTROL; -+ else if ((psecuritypriv->sw_encrypt == _FALSE) && (psecuritypriv->sw_decrypt == _TRUE)) -+ encry_mode = HW_ENCRY_SW_DECRY; -+ else if ((psecuritypriv->sw_encrypt == _TRUE) && (psecuritypriv->sw_decrypt == _FALSE)) -+ encry_mode = SW_ENCRY_HW_DECRY; -+ else if ((psecuritypriv->sw_encrypt == _TRUE) && (psecuritypriv->sw_decrypt == _TRUE)) -+ encry_mode = SW_CONTROL; -+ -+ #endif -+ -+ *(u8*)poid_par_priv->information_buf = encry_mode; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-oid_rt_pro_encryption_ctrl_hdl: QUERY encry_mode=0x%x\n", -+ encry_mode)); -+ } -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ struct sta_info *psta = NULL; -+ UCHAR *macaddr; -+ -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ *poid_par_priv->bytes_needed = ETH_ALEN; -+ if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ macaddr = (UCHAR *) poid_par_priv->information_buf ; -+ -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_notice_, -+ ("OID_RT_PRO_ADD_STA_INFO: addr="MAC_FMT"\n", MAC_ARG(macaddr) )); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ psta = rtw_get_stainfo(&Adapter->stapriv, macaddr); -+ -+ if (psta == NULL) { // the sta have been in sta_info_queue => do nothing -+ psta = rtw_alloc_stainfo(&Adapter->stapriv, macaddr); -+ -+ if (psta == NULL) { -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_,("Can't alloc sta_info when OID_RT_PRO_ADD_STA_INFO\n")); -+ status = NDIS_STATUS_FAILURE; -+ } -+ } else { //(between drv has received this event before and fw have not yet to set key to CAM_ENTRY) -+ RT_TRACE(_module_rtl871x_ioctl_c_, _drv_err_, -+ ("Error: OID_RT_PRO_ADD_STA_INFO: sta has been in sta_hash_queue \n")); -+ } -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_dele_sta_info_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ struct sta_info *psta = NULL; -+ UCHAR *macaddr; -+ -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ *poid_par_priv->bytes_needed = ETH_ALEN; -+ if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ macaddr = (UCHAR *) poid_par_priv->information_buf ; -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_notice_, -+ ("+OID_RT_PRO_ADD_STA_INFO: addr="MAC_FMT"\n", MAC_ARG(macaddr) )); -+ -+ psta = rtw_get_stainfo(&Adapter->stapriv, macaddr); -+ if (psta != NULL) { -+ _enter_critical(&(Adapter->stapriv.sta_hash_lock), &irqL); -+ rtw_free_stainfo(Adapter, psta); -+ _exit_critical(&(Adapter->stapriv.sta_hash_lock), &irqL); -+ } -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+#if 0 -+#include -+static u32 mp_query_drv_var(_adapter *padapter, u8 offset, u32 var) -+{ -+#ifdef CONFIG_SDIO_HCI -+ -+ if (offset == 1) { -+ u16 tmp_blk_num; -+ tmp_blk_num = rtw_read16(padapter, SDIO_RX0_RDYBLK_NUM); -+ RT_TRACE(_module_mp_, _drv_err_, ("Query Information, mp_query_drv_var SDIO_RX0_RDYBLK_NUM=0x%x adapter_to_dvobj(padapter)->rxblknum=0x%x\n", tmp_blk_num, adapter_to_dvobj(padapter)->rxblknum)); -+ if (adapter_to_dvobj(padapter)->rxblknum != tmp_blk_num) { -+ RT_TRACE(_module_mp_,_drv_err_, ("Query Information, mp_query_drv_var call recv rx\n")); -+ // sd_recv_rxfifo(padapter); -+ } -+ } -+ -+#if 0 -+ if(offset <=100){ //For setting data rate and query data rate -+ if(offset==100){ //For query data rate -+ RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d): query rate=0x%.2x \n",offset,padapter->registrypriv.tx_rate)); -+ var=padapter->registrypriv.tx_rate; -+ -+ } -+ else if(offset<0x1d){ //For setting data rate -+ padapter->registrypriv.tx_rate=offset; -+ var=padapter->registrypriv.tx_rate; -+ padapter->registrypriv.use_rate=_TRUE; -+ RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d): set rate=0x%.2x \n",offset,padapter->registrypriv.tx_rate)); -+ } -+ else{ //not use the data rate -+ padapter->registrypriv.use_rate=_FALSE; -+ RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d) out of rate range\n",offset)); -+ } -+ } -+ else if (offset<=110){ //for setting debug level -+ RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d) for set debug level\n",offset)); -+ if(offset==110){ //For query data rate -+ RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d): query dbg level=0x%.2x \n",offset,padapter->registrypriv.dbg_level)); -+ padapter->registrypriv.dbg_level=GlobalDebugLevel; -+ var=padapter->registrypriv.dbg_level; -+ } -+ else if(offset<110 && offset>100){ -+ RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var: offset(%d): set dbg level=0x%.2x \n",offset,offset-100)); -+ padapter->registrypriv.dbg_level=GlobalDebugLevel=offset-100; -+ var=padapter->registrypriv.dbg_level; -+ RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var(_drv_emerg_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_alert_, (" mp_query_drv_var(_drv_alert_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_crit_, (" mp_query_drv_var(_drv_crit_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_err_, (" mp_query_drv_var(_drv_err_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_warning_, (" mp_query_drv_var(_drv_warning_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_notice_, (" mp_query_drv_var(_drv_notice_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_info_, (" mp_query_drv_var(_drv_info_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ RT_TRACE(_module_mp_, _drv_debug_, (" mp_query_drv_var(_drv_debug_): offset(%d): set dbg level=0x%.2x \n",offset,GlobalDebugLevel)); -+ -+ } -+ } -+ else if(offset >110 &&offset <116){ -+ if(115==offset){ -+ RT_TRACE(_module_mp_, _drv_emerg_, (" mp_query_drv_var(_drv_emerg_): offset(%d): query TRX access type: [tx_block_mode=%x,rx_block_mode=%x]\n",\ -+ offset, adapter_to_dvobj(padapter)->tx_block_mode, adapter_to_dvobj(padapter)->rx_block_mode)); -+ } -+ else { -+ switch(offset){ -+ case 111: -+ adapter_to_dvobj(padapter)->tx_block_mode=1; -+ adapter_to_dvobj(padapter)->rx_block_mode=1; -+ RT_TRACE(_module_mp_, _drv_emerg_, \ -+ (" mp_query_drv_var(_drv_emerg_): offset(%d): SET TRX access type:(TX block/RX block) [tx_block_mode=%x,rx_block_mode=%x]\n",\ -+ offset, adapter_to_dvobj(padapter)->tx_block_mode, adapter_to_dvobj(padapter)->rx_block_mode)); -+ break; -+ case 112: -+ adapter_to_dvobj(padapter)->tx_block_mode=1; -+ adapter_to_dvobj(padapter)->rx_block_mode=0; -+ RT_TRACE(_module_mp_, _drv_emerg_, \ -+ (" mp_query_drv_var(_drv_emerg_): offset(%d): SET TRX access type:(TX block/RX byte) [tx_block_mode=%x,rx_block_mode=%x]\n",\ -+ offset, adapter_to_dvobj(padapter)->tx_block_mode, adapter_to_dvobj(padapter)->rx_block_mode)); -+ break; -+ case 113: -+ adapter_to_dvobj(padapter)->tx_block_mode=0; -+ adapter_to_dvobj(padapter)->rx_block_mode=1; -+ RT_TRACE(_module_mp_, _drv_emerg_, \ -+ (" mp_query_drv_var(_drv_emerg_): offset(%d): SET TRX access type:(TX byte/RX block) [tx_block_mode=%x,rx_block_mode=%x]\n",\ -+ offset, adapter_to_dvobj(padapter)->tx_block_mode, adapter_to_dvobj(padapter)->rx_block_mode)); -+ break; -+ case 114: -+ adapter_to_dvobj(padapter)->tx_block_mode=0; -+ adapter_to_dvobj(padapter)->rx_block_mode=0; -+ RT_TRACE(_module_mp_, _drv_emerg_, \ -+ (" mp_query_drv_var(_drv_emerg_): offset(%d): SET TRX access type:(TX byte/RX byte) [tx_block_mode=%x,rx_block_mode=%x]\n",\ -+ offset, adapter_to_dvobj(padapter)->tx_block_mode, adapter_to_dvobj(padapter)->rx_block_mode)); -+ break; -+ default : -+ break; -+ -+ } -+ -+ } -+ -+ } -+ else if(offset>=127){ -+ u64 prnt_dbg_comp; -+ u8 chg_idx; -+ u64 tmp_dbg_comp; -+ chg_idx=offset-0x80; -+ tmp_dbg_comp=BIT(chg_idx); -+ prnt_dbg_comp=padapter->registrypriv.dbg_component= GlobalDebugComponents; -+ RT_TRACE(_module_mp_, _drv_emerg_, (" 1: mp_query_drv_var: offset(%d;0x%x):for dbg conpoment prnt_dbg_comp=0x%.16x GlobalDebugComponents=0x%.16x padapter->registrypriv.dbg_component=0x%.16x\n",offset,offset,prnt_dbg_comp,GlobalDebugComponents,padapter->registrypriv.dbg_component)); -+ if(offset==127){ -+ // prnt_dbg_comp=padapter->registrypriv.dbg_component= GlobalDebugComponents; -+ var=(u32)(padapter->registrypriv.dbg_component); -+ RT_TRACE(0xffffffff, _drv_emerg_, ("2: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h) \n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp)); -+ prnt_dbg_comp=GlobalDebugComponents; -+ RT_TRACE(0xffffffff, _drv_emerg_, ("2-1: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h)\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp)); -+ prnt_dbg_comp=GlobalDebugComponents=padapter->registrypriv.dbg_component; -+ RT_TRACE(0xffffffff, _drv_emerg_, ("2-2: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h)\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp)); -+ -+ } -+ else{ -+ RT_TRACE(0xffffffff, _drv_emerg_, ("3: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h) chg_idx=%d\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp,chg_idx)); -+ prnt_dbg_comp=GlobalDebugComponents; -+ RT_TRACE(0xffffffff, _drv_emerg_,("3-1: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h) chg_idx=%d\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp,chg_idx));// ("3-1: mp_query_drv_var: offset(%d;0x%x):before set dbg conpoment=0x%x chg_idx=%d or0x%x BIT(chg_idx[%d]=0x%x)\n",offset,offset,prnt_dbg_comp,chg_idx,chg_idx,(chg_idx),tmp_dbg_comp) -+ prnt_dbg_comp=GlobalDebugComponents=padapter->registrypriv.dbg_component; -+ RT_TRACE(0xffffffff, _drv_emerg_, ("3-2: mp_query_drv_var: offset(%d;0x%x):for query dbg conpoment=0x%x(l) 0x%x(h) GlobalDebugComponents=0x%x(l) 0x%x(h)\n",offset,offset,padapter->registrypriv.dbg_component,prnt_dbg_comp)); -+ -+ if(GlobalDebugComponents&tmp_dbg_comp){ -+ //this bit is already set, now clear it -+ GlobalDebugComponents=GlobalDebugComponents&(~tmp_dbg_comp); -+ } -+ else{ -+ //this bit is not set, now set it. -+ GlobalDebugComponents =GlobalDebugComponents|tmp_dbg_comp; -+ } -+ RT_TRACE(0xffffffff, _drv_emerg_, ("4: mp_query_drv_var: offset(%d;0x%x):before set dbg conpoment tmp_dbg_comp=0x%x GlobalDebugComponents=0x%x(l) 0x%x(h)",offset,offset,tmp_dbg_comp,prnt_dbg_comp)); -+ prnt_dbg_comp=GlobalDebugComponents; -+ RT_TRACE(0xffffffff, _drv_emerg_, ("4-1: mp_query_drv_var: offset(%d;0x%x):before set dbg conpoment tmp_dbg_comp=0x%x GlobalDebugComponents=0x%x(l) 0x%x(h)",offset,offset,tmp_dbg_comp,prnt_dbg_comp)); -+ -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_emerg_, ("0: mp_query_drv_var(_module_rtl871x_xmit_c_:0): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,prnt_dbg_comp)); -+ RT_TRACE(_module_xmit_osdep_c_, _drv_emerg_, ("1: mp_query_drv_var(_module_xmit_osdep_c_:1): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_emerg_, ("2: mp_query_drv_var(_module_rtl871x_recv_c_:2): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_recv_osdep_c_, _drv_emerg_, ("3: mp_query_drv_var(_module_recv_osdep_c_:3): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_emerg_, ("4: mp_query_drv_var(_module_rtl871x_mlme_c_:4): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_mlme_osdep_c_, _drv_emerg_, (" 5:mp_query_drv_var(_module_mlme_osdep_c_:5): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_emerg_, ("6: mp_query_drv_var(_module_rtl871x_sta_mgt_c_:6): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_emerg_, ("7: mp_query_drv_var(_module_rtl871x_cmd_c_:7): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_cmd_osdep_c_, _drv_emerg_, ("8: mp_query_drv_var(_module_cmd_osdep_c_:8): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_io_c_, _drv_emerg_, ("9: mp_query_drv_var(_module_rtl871x_io_c_:9): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_io_osdep_c_, _drv_emerg_, ("10: mp_query_drv_var(_module_io_osdep_c_:10): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_os_intfs_c_, _drv_emerg_, ("11: mp_query_drv_var(_module_os_intfs_c_:11): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_security_c_, _drv_emerg_, ("12: mp_query_drv_var(_module_rtl871x_security_c_:12): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_eeprom_c_, _drv_emerg_, ("13: mp_query_drv_var(_module_rtl871x_eeprom_c_:13): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_hal_init_c_, _drv_emerg_, ("14: mp_query_drv_var(_module_hal_init_c_:14): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_hci_hal_init_c_, _drv_emerg_, ("15: mp_query_drv_var(_module_hci_hal_init_c_:15): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_ioctl_c_, _drv_emerg_, ("16: mp_query_drv_var(_module_rtl871x_ioctl_c_:16): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_emerg_, ("17: mp_query_drv_var(_module_rtl871x_ioctl_set_c_:17): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_ioctl_query_c_, _drv_emerg_, ("18: mp_query_drv_var(_module_rtl871x_ioctl_query_c_:18): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_emerg_, ("19: mp_query_drv_var(_module_rtl871x_pwrctrl_c_:19): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_hci_intfs_c_, _drv_emerg_, ("20: mp_query_drv_var(_module_hci_intfs_c_:20): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_hci_ops_c_, _drv_emerg_, ("21: mp_query_drv_var(_module_hci_ops_c_:21): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_osdep_service_c_, _drv_emerg_, ("22: mp_query_drv_var(_module_osdep_service_c_:22): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_mp_, _drv_emerg_, ("23: mp_query_drv_var(_module_mp_:23): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ RT_TRACE(_module_hci_ops_os_c_, _drv_emerg_, ("24: mp_query_drv_var(_module_hci_ops_os_c_:24): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ var=(u32)(GlobalDebugComponents); -+ //GlobalDebugComponents=padapter->registrypriv.dbg_component; -+ RT_TRACE(0xffffffff, _drv_emerg_, (" ==mp_query_drv_var(_module_mp_): offset(%d;0x%x):before set dbg conpoment=0x%x(l) 0x%x(h)\n",offset,offset,GlobalDebugComponents)); -+ -+ } -+ } -+ else{ -+ RT_TRACE(_module_mp_, _drv_emerg_, ("\n mp_query_drv_var: offset(%d) >110\n",offset)); -+ } -+#endif -+#endif -+ -+ return var; -+} -+#endif -+ -+NDIS_STATUS oid_rt_pro_query_dr_variable_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ DR_VARIABLE_STRUCT *pdrv_var; -+ -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ *poid_par_priv->bytes_needed = sizeof(DR_VARIABLE_STRUCT); -+ if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+Query Information, OID_RT_PRO_QUERY_DR_VARIABLE\n")); -+ -+ pdrv_var = (struct _DR_VARIABLE_STRUCT_ *)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ pdrv_var->variable = mp_query_drv_var(Adapter, pdrv_var->offset, pdrv_var->variable); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-oid_rt_pro_query_dr_variable_hdl: offset=0x%x valule=0x%x\n", -+ pdrv_var->offset, pdrv_var->variable)); -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ RT_TRACE(_module_mp_, _drv_err_, ("oid_rt_pro_rx_packet_type_hdl...................\n")); -+ -+ if (poid_par_priv->information_buf_len < sizeof (UCHAR)) { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ *poid_par_priv->bytes_needed = sizeof(UCHAR); -+ return status; -+ } -+ -+ if (poid_par_priv->type_of_oid == SET_OID) { -+ Adapter->mppriv.rx_with_status = *(UCHAR *) poid_par_priv->information_buf; -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_, ("Query Information, OID_RT_PRO_RX_PACKET_TYPE:%d \n",\ -+ Adapter->mppriv.rx_with_status)); -+ -+ //*(u32 *)&Adapter->eeprompriv.mac_addr[0]=rtw_read32(Adapter, 0x10250050); -+ //*(u16 *)&Adapter->eeprompriv.mac_addr[4]=rtw_read16(Adapter, 0x10250054); -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_,("MAC addr=0x%x:0x%x:0x%x:0x%x:0x%x:0x%x \n", -+ Adapter->eeprompriv.mac_addr[0],Adapter->eeprompriv.mac_addr[1],Adapter->eeprompriv.mac_addr[2],\ -+ Adapter->eeprompriv.mac_addr[3],Adapter->eeprompriv.mac_addr[4],Adapter->eeprompriv.mac_addr[5])); -+ -+ } -+ else { -+ *(UCHAR *) poid_par_priv->information_buf = Adapter->mppriv.rx_with_status; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_, ("Query Information, OID_RT_PRO_RX_PACKET_TYPE:%d \n", \ -+ Adapter->mppriv.rx_with_status)); -+ -+ //*(u32 *)&Adapter->eeprompriv.mac_addr[0]=rtw_read32(Adapter, 0x10250050); -+ //*(u16 *)&Adapter->eeprompriv.mac_addr[4]=rtw_read16(Adapter, 0x10250054); -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_err_,("MAC addr=0x%x:0x%x:0x%x:0x%x:0x%x:0x%x \n", -+ Adapter->eeprompriv.mac_addr[0],Adapter->eeprompriv.mac_addr[1],Adapter->eeprompriv.mac_addr[2],\ -+ Adapter->eeprompriv.mac_addr[3],Adapter->eeprompriv.mac_addr[4],Adapter->eeprompriv.mac_addr[5])); -+ } -+#endif -+ -+ return NDIS_STATUS_SUCCESS; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ PEFUSE_ACCESS_STRUCT pefuse; -+ u8 *data; -+ u16 addr = 0, cnts = 0, max_available_size = 0; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(EFUSE_ACCESS_STRUCT)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ pefuse = (PEFUSE_ACCESS_STRUCT)poid_par_priv->information_buf; -+ addr = pefuse->start_addr; -+ cnts = pefuse->cnts; -+ data = pefuse->data; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("+oid_rt_pro_read_efuse_hd: buf_len=%ld addr=%d cnts=%d\n", -+ poid_par_priv->information_buf_len, addr, cnts)); -+ -+ EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ -+ if ((addr + cnts) > max_available_size) { -+ RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: parameter error!\n")); -+ return NDIS_STATUS_NOT_ACCEPTED; -+ } -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ if (rtw_efuse_access(Adapter, _FALSE, addr, cnts, data) == _FAIL) { -+ RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: rtw_efuse_access FAIL!\n")); -+ status = NDIS_STATUS_FAILURE; -+ } else -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ PEFUSE_ACCESS_STRUCT pefuse; -+ u8 *data; -+ u16 addr = 0, cnts = 0, max_available_size = 0; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ pefuse = (PEFUSE_ACCESS_STRUCT)poid_par_priv->information_buf; -+ addr = pefuse->start_addr; -+ cnts = pefuse->cnts; -+ data = pefuse->data; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("+oid_rt_pro_write_efuse_hdl: buf_len=%ld addr=0x%04x cnts=%d\n", -+ poid_par_priv->information_buf_len, addr, cnts)); -+ -+ EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ -+ if ((addr + cnts) > max_available_size) { -+ RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_write_efuse_hdl: parameter error")); -+ return NDIS_STATUS_NOT_ACCEPTED; -+ } -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ if (rtw_efuse_access(Adapter, _TRUE, addr, cnts, data) == _FAIL) -+ status = NDIS_STATUS_FAILURE; -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ PPGPKT_STRUCT ppgpkt; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+// RT_TRACE(_module_mp_, _drv_info_, ("+oid_rt_pro_rw_efuse_pgpkt_hdl\n")); -+ -+ *poid_par_priv->bytes_rw = 0; -+ -+ if (poid_par_priv->information_buf_len < sizeof(PGPKT_STRUCT)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ ppgpkt = (PPGPKT_STRUCT)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (poid_par_priv->type_of_oid == QUERY_OID) -+ { -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_rw_efuse_pgpkt_hdl: Read offset=0x%x\n",\ -+ ppgpkt->offset)); -+ -+ Efuse_PowerSwitch(Adapter, _FALSE, _TRUE); -+ if (Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, _FALSE) == _TRUE) -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ else -+ status = NDIS_STATUS_FAILURE; -+ Efuse_PowerSwitch(Adapter, _FALSE, _FALSE); -+ } else { -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("oid_rt_pro_rw_efuse_pgpkt_hdl: Write offset=0x%x word_en=0x%x\n",\ -+ ppgpkt->offset, ppgpkt->word_en)); -+ -+ Efuse_PowerSwitch(Adapter, _TRUE, _TRUE); -+ if (Efuse_PgPacketWrite(Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, _FALSE) == _TRUE) -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ else -+ status = NDIS_STATUS_FAILURE; -+ Efuse_PowerSwitch(Adapter, _TRUE, _FALSE); -+ } -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("-oid_rt_pro_rw_efuse_pgpkt_hdl: status=0x%08X\n", status)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u16 size; -+ u8 ret; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len information_buf = size; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ } else -+ status = NDIS_STATUS_FAILURE; -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ *(u32*)poid_par_priv->information_buf = efuse_GetMaxSize(Adapter); -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("-oid_rt_get_efuse_max_size_hdl: size=%d status=0x%08X\n", -+ *(int*)poid_par_priv->information_buf, status)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("+oid_rt_pro_efuse_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid == QUERY_OID) -+ status = oid_rt_pro_read_efuse_hdl(poid_par_priv); -+ else -+ status = oid_rt_pro_write_efuse_hdl(poid_par_priv); -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("-oid_rt_pro_efuse_hdl: status=0x%08X\n", status)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u8 *data; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ u16 mapLen=0; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_efuse_map_hdl\n")); -+ -+ EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); -+ -+ *poid_par_priv->bytes_rw = 0; -+ -+ if (poid_par_priv->information_buf_len < mapLen) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ data = (u8*)poid_par_priv->information_buf; -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ if (poid_par_priv->type_of_oid == QUERY_OID) -+ { -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("oid_rt_pro_efuse_map_hdl: READ\n")); -+ -+ if (rtw_efuse_map_read(Adapter, 0, mapLen, data) == _SUCCESS) -+ *poid_par_priv->bytes_rw = mapLen; -+ else { -+ RT_TRACE(_module_mp_, _drv_err_, -+ ("oid_rt_pro_efuse_map_hdl: READ fail\n")); -+ status = NDIS_STATUS_FAILURE; -+ } -+ } else { -+ // SET_OID -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("oid_rt_pro_efuse_map_hdl: WRITE\n")); -+ -+ if (rtw_efuse_map_write(Adapter, 0, mapLen, data) == _SUCCESS) -+ *poid_par_priv->bytes_rw = mapLen; -+ else { -+ RT_TRACE(_module_mp_, _drv_err_, -+ ("oid_rt_pro_efuse_map_hdl: WRITE fail\n")); -+ status = NDIS_STATUS_FAILURE; -+ } -+ } -+ -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("-oid_rt_pro_efuse_map_hdl: status=0x%08X\n", status)); -+ -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ -+ u32 crystal_cap = 0; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len information_buf);//4 -+ if (crystal_cap > 0xf) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ Adapter->mppriv.curr_crystalcap = crystal_cap; -+ -+ _irqlevel_changed_(&oldirql,LOWER); -+ SetCrystalCap(Adapter); -+ _irqlevel_changed_(&oldirql,RAISE); -+ -+_func_exit_; -+ -+#endif -+ return status; -+} -+ -+NDIS_STATUS oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u8 rx_pkt_type; -+// u32 rcr_val32; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+// PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_set_rx_packet_type_hdl\n")); -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u8)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ rx_pkt_type = *((u8*)poid_par_priv->information_buf);//4 -+ -+ RT_TRACE(_module_mp_, _drv_info_, ("rx_pkt_type: %x\n",rx_pkt_type )); -+#if 0 -+ _irqlevel_changed_(&oldirql, LOWER); -+#if 0 -+ rcr_val8 = rtw_read8(Adapter, 0x10250048);//RCR -+ rcr_val8 &= ~(RCR_AB|RCR_AM|RCR_APM|RCR_AAP); -+ -+ if(rx_pkt_type == RX_PKT_BROADCAST){ -+ rcr_val8 |= (RCR_AB | RCR_ACRC32 ); -+ } -+ else if(rx_pkt_type == RX_PKT_DEST_ADDR){ -+ rcr_val8 |= (RCR_AAP| RCR_AM |RCR_ACRC32); -+ } -+ else if(rx_pkt_type == RX_PKT_PHY_MATCH){ -+ rcr_val8 |= (RCR_APM|RCR_ACRC32); -+ } -+ else{ -+ rcr_val8 &= ~(RCR_AAP|RCR_APM|RCR_AM|RCR_AB|RCR_ACRC32); -+ } -+ rtw_write8(padapter, 0x10250048,rcr_val8); -+#else -+ rcr_val32 = rtw_read32(padapter, RCR);//RCR = 0x10250048 -+ rcr_val32 &= ~(RCR_CBSSID|RCR_AB|RCR_AM|RCR_APM|RCR_AAP); -+#if 0 -+ if(rx_pkt_type == RX_PKT_BROADCAST){ -+ rcr_val32 |= (RCR_AB|RCR_AM|RCR_APM|RCR_AAP|RCR_ACRC32); -+ } -+ else if(rx_pkt_type == RX_PKT_DEST_ADDR){ -+ //rcr_val32 |= (RCR_CBSSID|RCR_AAP|RCR_AM|RCR_ACRC32); -+ rcr_val32 |= (RCR_CBSSID|RCR_APM|RCR_ACRC32); -+ } -+ else if(rx_pkt_type == RX_PKT_PHY_MATCH){ -+ rcr_val32 |= (RCR_APM|RCR_ACRC32); -+ //rcr_val32 |= (RCR_AAP|RCR_ACRC32); -+ } -+ else{ -+ rcr_val32 &= ~(RCR_AAP|RCR_APM|RCR_AM|RCR_AB|RCR_ACRC32); -+ } -+#else -+ switch (rx_pkt_type) -+ { -+ case RX_PKT_BROADCAST : -+ rcr_val32 |= (RCR_AB|RCR_AM|RCR_APM|RCR_AAP|RCR_ACRC32); -+ break; -+ case RX_PKT_DEST_ADDR : -+ rcr_val32 |= (RCR_AB|RCR_AM|RCR_APM|RCR_AAP|RCR_ACRC32); -+ break; -+ case RX_PKT_PHY_MATCH: -+ rcr_val32 |= (RCR_APM|RCR_ACRC32); -+ break; -+ default: -+ rcr_val32 &= ~(RCR_AAP|RCR_APM|RCR_AM|RCR_AB|RCR_ACRC32); -+ break; -+ } -+ -+ if (rx_pkt_type == RX_PKT_DEST_ADDR) { -+ padapter->mppriv.check_mp_pkt = 1; -+ } else { -+ padapter->mppriv.check_mp_pkt = 0; -+ } -+#endif -+ rtw_write32(padapter, RCR, rcr_val32); -+ -+#endif -+ _irqlevel_changed_(&oldirql, RAISE); -+#endif -+_func_exit_; -+ -+ return status; -+} -+ -+NDIS_STATUS oid_rt_pro_set_tx_agc_offset_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ u32 txagc; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len < sizeof(u32)) -+ return NDIS_STATUS_INVALID_LENGTH; -+ -+ txagc = *(u32*)poid_par_priv->information_buf; -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("oid_rt_pro_set_tx_agc_offset_hdl: 0x%08x\n", txagc)); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ SetTxAGCOffset(Adapter, txagc); -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+ -+NDIS_STATUS oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+ -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ struct mp_priv *pmppriv = &Adapter->mppriv; -+ u32 type; -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) -+ return NDIS_STATUS_NOT_ACCEPTED; -+ -+ if (poid_par_priv->information_buf_len information_buf; -+ -+ if (_LOOPBOOK_MODE_ == type) { -+ pmppriv->mode = type; -+ set_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE); //append txdesc -+ RT_TRACE(_module_mp_, _drv_info_, ("test mode change to loopback mode:0x%08x.\n", get_fwstate(pmlmepriv))); -+ } else if (_2MAC_MODE_ == type){ -+ pmppriv->mode = type; -+ _clr_fwstate_(pmlmepriv, WIFI_MP_LPBK_STATE); -+ RT_TRACE(_module_mp_, _drv_info_, ("test mode change to 2mac mode:0x%08x.\n", get_fwstate(pmlmepriv))); -+ } else -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+ -+unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ PMP_XMIT_PARM pparm; -+ PADAPTER padapter; -+ struct mp_priv *pmp_priv; -+ struct pkt_attrib *pattrib; -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("+%s\n", __func__)); -+ -+ pparm = (PMP_XMIT_PARM)poid_par_priv->information_buf; -+ padapter = (PADAPTER)poid_par_priv->adapter_context; -+ pmp_priv = &padapter->mppriv; -+ -+ if (poid_par_priv->type_of_oid == QUERY_OID) { -+ pparm->enable = !pmp_priv->tx.stop; -+ pparm->count = pmp_priv->tx.sended; -+ } else { -+ if (pparm->enable == 0) { -+ pmp_priv->tx.stop = 1; -+ } else if (pmp_priv->tx.stop == 1) { -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx.count = pparm->count; -+ pmp_priv->tx.payload = pparm->payload_type; -+ pattrib = &pmp_priv->tx.attrib; -+ pattrib->pktlen = pparm->length; -+ _rtw_memcpy(pattrib->dst, pparm->da, ETH_ALEN); -+ SetPacketTx(padapter); -+ } else -+ return NDIS_STATUS_FAILURE; -+ } -+ -+ return NDIS_STATUS_SUCCESS; -+} -+ -+#if 0 -+unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv) -+{ -+ unsigned char *pframe, *pmp_pkt; -+ struct ethhdr *pethhdr; -+ struct pkt_attrib *pattrib; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ int llc_sz, payload_len; -+ struct mp_xmit_frame *pxframe= NULL; -+ struct mp_xmit_packet *pmp_xmitpkt = (struct mp_xmit_packet*)param; -+ u8 addr3[] = {0x02, 0xE0, 0x4C, 0x87, 0x66, 0x55}; -+ -+// DBG_871X("+mp_ioctl_xmit_packet_hdl\n"); -+ -+ pxframe = alloc_mp_xmitframe(&padapter->mppriv); -+ if (pxframe == NULL) -+ { -+ DEBUG_ERR(("Can't alloc pmpframe %d:%s\n", __LINE__, __FILE__)); -+ return -1; -+ } -+ -+ //mp_xmit_pkt -+ payload_len = pmp_xmitpkt->len - 14; -+ pmp_pkt = (unsigned char*)pmp_xmitpkt->mem; -+ pethhdr = (struct ethhdr *)pmp_pkt; -+ -+ //DBG_871X("payload_len=%d, pkt_mem=0x%x\n", pmp_xmitpkt->len, (void*)pmp_xmitpkt->mem); -+ -+ //DBG_871X("pxframe=0x%x\n", (void*)pxframe); -+ //DBG_871X("pxframe->mem=0x%x\n", (void*)pxframe->mem); -+ -+ //update attribute -+ pattrib = &pxframe->attrib; -+ memset((u8 *)(pattrib), 0, sizeof (struct pkt_attrib)); -+ pattrib->pktlen = pmp_xmitpkt->len; -+ pattrib->ether_type = ntohs(pethhdr->h_proto); -+ pattrib->hdrlen = 24; -+ pattrib->nr_frags = 1; -+ pattrib->priority = 0; -+#ifndef CONFIG_MP_LINUX -+ if(IS_MCAST(pethhdr->h_dest)) -+ pattrib->mac_id = 4; -+ else -+ pattrib->mac_id = 5; -+#else -+ pattrib->mac_id = 5; -+#endif -+ -+ // -+ memset(pxframe->mem, 0 , WLANHDR_OFFSET); -+ pframe = (u8 *)(pxframe->mem) + WLANHDR_OFFSET; -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ SetFrameSubType(pframe, WIFI_DATA); -+ -+ _rtw_memcpy(pwlanhdr->addr1, pethhdr->h_dest, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pethhdr->h_source, ETH_ALEN); -+ -+ _rtw_memcpy(pwlanhdr->addr3, addr3, ETH_ALEN); -+ -+ pwlanhdr->seq_ctl = 0; -+ pframe += pattrib->hdrlen; -+ -+ llc_sz= rtw_put_snap(pframe, pattrib->ether_type); -+ pframe += llc_sz; -+ -+ _rtw_memcpy(pframe, (void*)(pmp_pkt+14), payload_len); -+ -+ pattrib->last_txcmdsz = pattrib->hdrlen + llc_sz + payload_len; -+ -+ DEBUG_INFO(("issuing mp_xmit_frame, tx_len=%d, ether_type=0x%x\n", pattrib->last_txcmdsz, pattrib->ether_type)); -+ xmit_mp_frame(padapter, pxframe); -+ -+ return _SUCCESS; -+} -+#endif -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#ifdef PLATFORM_OS_XP -+ _irqL oldirql; -+#endif -+ u8 bpwrup; -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+#ifdef PLATFORM_LINUX -+#ifdef CONFIG_SDIO_HCI -+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); -+#endif -+#endif -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != SET_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("\n ===> Setoid_rt_set_power_down_hdl.\n")); -+ -+ _irqlevel_changed_(&oldirql, LOWER); -+ -+ bpwrup = *(u8 *)poid_par_priv->information_buf; -+ //CALL the power_down function -+#ifdef PLATFORM_LINUX -+#ifdef CONFIG_SDIO_HCI -+ dev_power_down(padapter,bpwrup); -+#endif -+#endif -+ _irqlevel_changed_(&oldirql, RAISE); -+ -+ //DEBUG_ERR(("\n <=== Query OID_RT_PRO_READ_REGISTER. -+ // Add:0x%08x Width:%d Value:0x%08x\n",RegRWStruct->offset,RegRWStruct->width,RegRWStruct->value)); -+ -+_func_exit_; -+ -+ return status; -+} -+//------------------------------------------------------------------------------ -+NDIS_STATUS oid_rt_get_power_mode_hdl(struct oid_par_priv *poid_par_priv) -+{ -+#if 0 -+ NDIS_STATUS status = NDIS_STATUS_SUCCESS; -+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); -+//#ifdef PLATFORM_OS_XP -+// _irqL oldirql; -+//#endif -+ -+_func_enter_; -+ -+ if (poid_par_priv->type_of_oid != QUERY_OID) { -+ status = NDIS_STATUS_NOT_ACCEPTED; -+ return status; -+ } -+ if (poid_par_priv->information_buf_len < sizeof(u32)) { -+ status = NDIS_STATUS_INVALID_LENGTH; -+ return status; -+ } -+ -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("\n ===> oid_rt_get_power_mode_hdl.\n")); -+ -+// _irqlevel_changed_(&oldirql, LOWER); -+ *(int*)poid_par_priv->information_buf = Adapter->registrypriv.low_power ? POWER_LOW : POWER_NORMAL; -+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; -+// _irqlevel_changed_(&oldirql, RAISE); -+ -+_func_exit_; -+ -+ return status; -+#else -+ return 0; -+#endif -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c -@@ -0,0 +1,5370 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_P2P_C_ -+ -+#include -+#include -+#include -+ -+#ifdef CONFIG_P2P -+ -+int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt ) -+{ -+ int found = 0, i = 0; -+ -+ for( i = 0; i < ch_cnt; i++ ) -+ { -+ if ( ch_list[ i ] == desired_ch ) -+ { -+ found = 1; -+ break; -+ } -+ } -+ return( found ); -+} -+ -+int is_any_client_associated(_adapter *padapter) -+{ -+ return padapter->stapriv.asoc_list_cnt ? _TRUE : _FALSE; -+} -+ -+static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ u32 len=0; -+ u16 attr_len = 0; -+ u8 tmplen, *pdata_attr, *pstart, *pcur; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = pwdinfo->padapter; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN); -+ -+ pstart = pdata_attr; -+ pcur = pdata_attr; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ //look up sta asoc_queue -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ -+ plist = get_next(plist); -+ -+ -+ if(psta->is_p2p_device) -+ { -+ tmplen = 0; -+ -+ pcur++; -+ -+ //P2P device address -+ _rtw_memcpy(pcur, psta->dev_addr, ETH_ALEN); -+ pcur += ETH_ALEN; -+ -+ //P2P interface address -+ _rtw_memcpy(pcur, psta->hwaddr, ETH_ALEN); -+ pcur += ETH_ALEN; -+ -+ *pcur = psta->dev_cap; -+ pcur++; -+ -+ //*(u16*)(pcur) = cpu_to_be16(psta->config_methods); -+ RTW_PUT_BE16(pcur, psta->config_methods); -+ pcur += 2; -+ -+ _rtw_memcpy(pcur, psta->primary_dev_type, 8); -+ pcur += 8; -+ -+ *pcur = psta->num_of_secdev_type; -+ pcur++; -+ -+ _rtw_memcpy(pcur, psta->secdev_types_list, psta->num_of_secdev_type*8); -+ pcur += psta->num_of_secdev_type*8; -+ -+ if(psta->dev_name_len>0) -+ { -+ //*(u16*)(pcur) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ RTW_PUT_BE16(pcur, WPS_ATTR_DEVICE_NAME); -+ pcur += 2; -+ -+ //*(u16*)(pcur) = cpu_to_be16( psta->dev_name_len ); -+ RTW_PUT_BE16(pcur, psta->dev_name_len); -+ pcur += 2; -+ -+ _rtw_memcpy(pcur, psta->dev_name, psta->dev_name_len); -+ pcur += psta->dev_name_len; -+ } -+ -+ -+ tmplen = (u8)(pcur-pstart); -+ -+ *pstart = (tmplen-1); -+ -+ attr_len += tmplen; -+ -+ //pstart += tmplen; -+ pstart = pcur; -+ -+ } -+ -+ -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ if(attr_len>0) -+ { -+ len = rtw_set_p2p_attr_content(pbuf, P2P_ATTR_GROUP_INFO, attr_len, pdata_attr); -+ } -+ -+ rtw_mfree(pdata_attr, MAX_P2P_IE_LEN); -+ -+ return len; -+ -+} -+ -+static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ _adapter *padapter = pwdinfo->padapter; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ unsigned char category = RTW_WLAN_CATEGORY_P2P;//P2P action frame -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_GO_DISC_REQUEST; -+ u8 dialogToken=0; -+ -+ DBG_871X("[%s]\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pwdinfo->interface_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pwdinfo->interface_addr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ //Build P2P action frame header -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ //there is no IE in this P2P action frame -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+} -+ -+static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 status, u8 dialogToken) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ _adapter *padapter = pwdinfo->padapter; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_DEVDISC_RESP; -+ u8 p2pie[8] = { 0x00 }; -+ u32 p2pielen = 0; -+ -+ DBG_871X("[%s]\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pwdinfo->device_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pwdinfo->device_addr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ //Build P2P public action frame header -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ -+ //Build P2P IE -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // P2P_ATTR_STATUS -+ p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_STATUS, 1, &status); -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &pattrib->pktlen); -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+} -+ -+static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8* raddr, u8* frame_body, u16 config_method) -+{ -+ _adapter *padapter = pwdinfo->padapter; -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u8 dialogToken = frame_body[7]; // The Dialog Token of provisioning discovery request frame. -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_PROVISION_DISC_RESP; -+ u8 wpsie[ 100 ] = { 0x00 }; -+ u8 wpsielen = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ wpsielen = 0; -+ // WPS OUI -+ //*(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ RTW_PUT_BE32(wpsie, WPSOUI); -+ wpsielen += 4; -+ -+#if 0 -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+#endif -+ -+ // Config Method -+ // Type: -+ //*(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_CONF_METHOD ); -+ RTW_PUT_BE16(wpsie + wpsielen, WPS_ATTR_CONF_METHOD); -+ wpsielen += 2; -+ -+ // Length: -+ //*(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ RTW_PUT_BE16(wpsie + wpsielen, 0x0002); -+ wpsielen += 2; -+ -+ // Value: -+ //*(u16*) ( wpsie + wpsielen ) = cpu_to_be16( config_method ); -+ RTW_PUT_BE16(wpsie + wpsielen, config_method); -+ wpsielen += 2; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_provdisc_resp_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+ -+} -+ -+static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 status, u8 dialogToken) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ _adapter *padapter = pwdinfo->padapter; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ unsigned char category = RTW_WLAN_CATEGORY_P2P;//P2P action frame -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_PRESENCE_RESPONSE; -+ u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 }; -+ u8 noa_attr_content[32] = { 0x00 }; -+ u32 p2pielen = 0; -+ -+ DBG_871X("[%s]\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pwdinfo->interface_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pwdinfo->interface_addr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ //Build P2P action frame header -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ -+ //Add P2P IE header -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ //Add Status attribute in P2P IE -+ p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_STATUS, 1, &status); -+ -+ //Add NoA attribute in P2P IE -+ noa_attr_content[0] = 0x1;//index -+ noa_attr_content[1] = 0x0;//CTWindow and OppPS Parameters -+ -+ //todo: Notice of Absence Descriptor(s) -+ -+ p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_NOA, 2, noa_attr_content); -+ -+ -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &(pattrib->pktlen)); -+ -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+} -+ -+u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 }; -+ u16 capability=0; -+ u32 len=0, p2pielen = 0; -+ -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ -+ // According to the P2P Specification, the beacon frame should contain 3 P2P attributes -+ // 1. P2P Capability -+ // 2. P2P Device ID -+ // 3. Notice of Absence ( NOA ) -+ -+ // P2P Capability ATTR -+ // Type: -+ // Length: -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ // Be able to participate in additional P2P Groups and -+ // support the P2P Invitation Procedure -+ // Group Capability Bitmap, 1 byte -+ capability = P2P_DEVCAP_INVITATION_PROC|P2P_DEVCAP_CLIENT_DISCOVERABILITY; -+ capability |= ((P2P_GRPCAP_GO | P2P_GRPCAP_INTRABSS) << 8); -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING)) -+ capability |= (P2P_GRPCAP_GROUP_FORMATION<<8); -+ -+ capability = cpu_to_le16(capability); -+ -+ p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_CAPABILITY, 2, (u8*)&capability); -+ -+ -+ // P2P Device ID ATTR -+ p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_DEVICE_ID, ETH_ALEN, pwdinfo->device_addr); -+ -+ -+ // Notice of Absence ATTR -+ // Type: -+ // Length: -+ // Value: -+ -+ //go_add_noa_attr(pwdinfo); -+ -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len); -+ -+ -+ return len; -+ -+} -+ -+#ifdef CONFIG_WFD -+u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110812 -+ // According to the WFD Specification, the beacon frame should contain 4 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID -+ // 3. Coupled Sink Information -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ -+ if ( P2P_ROLE_GO == pwdinfo->role ) -+ { -+ if ( is_any_client_associated( pwdinfo->padapter ) ) -+ { -+ // WFD primary sink + WiFi Direct mode + WSD (WFD Service Discovery) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD ); -+ } -+ else -+ { -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD (WFD Service Discovery) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ } -+ -+ } -+ else -+ { -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ } -+ -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110812 -+ // According to the WFD Specification, the probe request frame should contain 4 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID -+ // 3. Coupled Sink Information -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ -+ if ( 1 == pwdinfo->wfd_tdls_enable ) -+ { -+ // WFD primary sink + available for WFD session + WiFi TDLS mode + WSC ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | -+ WFD_DEVINFO_SESSION_AVAIL | -+ WFD_DEVINFO_WSD | -+ WFD_DEVINFO_PC_TDLS ); -+ } -+ else -+ { -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSC ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | -+ WFD_DEVINFO_SESSION_AVAIL | -+ WFD_DEVINFO_WSD ); -+ } -+ -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunneled) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110812 -+ // According to the WFD Specification, the probe response frame should contain 4 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID -+ // 3. Coupled Sink Information -+ // 4. WFD Session Information -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode -+ -+ if ( _TRUE == pwdinfo->session_available ) -+ { -+ if ( P2P_ROLE_GO == pwdinfo->role ) -+ { -+ if ( is_any_client_associated( pwdinfo->padapter ) ) -+ { -+ if ( pwdinfo->wfd_tdls_enable ) -+ { -+ // TDLS mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD | WFD_DEVINFO_PC_TDLS | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ else -+ { -+ // WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ } -+ else -+ { -+ if ( pwdinfo->wfd_tdls_enable ) -+ { -+ // available for WFD session + TDLS mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD | WFD_DEVINFO_PC_TDLS | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ else -+ { -+ // available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ } -+ } -+ else -+ { -+ if ( pwdinfo->wfd_tdls_enable ) -+ { -+ // available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD | WFD_DEVINFO_PC_TDLS | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ else -+ { -+ -+ // available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ } -+ } -+ else -+ { -+ if ( pwdinfo->wfd_tdls_enable ) -+ { -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD |WFD_DEVINFO_PC_TDLS | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ else -+ { -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD | WFD_DEVINFO_HDCP_SUPPORT); -+ } -+ -+ } -+ -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ if ( P2P_ROLE_GO == pwdinfo->role ) -+ { -+ // WFD Session Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_SESSION_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0000); -+ wfdielen += 2; -+ -+ // Todo: to add the list of WFD device info descriptor in WFD group. -+ -+ } -+#ifdef CONFIG_CONCURRENT_MODE -+#ifdef CONFIG_TDLS -+ if ( ( tunneled == 0 ) && ( padapter->pbuddy_adapter->wdinfo.wfd_tdls_enable == 1 ) ) -+ { -+ // Alternative MAC Address ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ALTER_MAC; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, ETH_ALEN ); -+ wfdielen += 2; -+ -+ // Value: -+ // Alternative MAC Address -+ _rtw_memcpy( wfdie + wfdielen, &padapter->pbuddy_adapter->eeprompriv.mac_addr[ 0 ], ETH_ALEN ); -+ // This mac address is used to make the WFD session when TDLS is enable. -+ -+ wfdielen += ETH_ALEN; -+ } -+#endif // CONFIG_TDLS -+#endif // CONFIG_CONCURRENT_MODE -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = NULL; -+ struct mlme_priv *pmlmepriv = NULL; -+ struct wifi_display_info *pwfd_info = NULL; -+ -+ // WFD OUI -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) -+ { -+ return 0; -+ } -+ -+ padapter = pwdinfo->padapter; -+ pmlmepriv = &padapter->mlmepriv; -+ pwfd_info = padapter->wdinfo.wfd_info; -+ -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110812 -+ // According to the WFD Specification, the probe request frame should contain 4 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID -+ // 3. Coupled Sink Information -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110812 -+ // According to the WFD Specification, the probe request frame should contain 4 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID -+ // 3. Coupled Sink Information -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the negotiation request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + WiFi Direct mode + WSD ( WFD Service Discovery ) + WFD Session Available -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD | WFD_DEVINFO_SESSION_AVAIL); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the negotiation request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + WiFi Direct mode + WSD ( WFD Service Discovery ) + WFD Session Available -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD | WFD_DEVINFO_SESSION_AVAIL); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the negotiation request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + WiFi Direct mode + WSD ( WFD Service Discovery ) + WFD Session Available -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_WSD | WFD_DEVINFO_SESSION_AVAIL); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the provision discovery request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ if ( P2P_ROLE_GO == pwdinfo->role ) -+ { -+ // WFD Session Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_SESSION_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0000); -+ wfdielen += 2; -+ -+ // Todo: to add the list of WFD device info descriptor in WFD group. -+ -+ } -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the provision discovery request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ if ( P2P_ROLE_GO == pwdinfo->role ) -+ { -+ // WFD Session Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_SESSION_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0000); -+ wfdielen += 2; -+ -+ // Todo: to add the list of WFD device info descriptor in WFD group. -+ -+ } -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the provision discovery request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 len=0, wfdielen = 0; -+ _adapter *padapter = pwdinfo->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the provision discovery response frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // WFD primary sink + available for WFD session + WiFi Direct mode + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL | WFD_DEVINFO_WSD ); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ wfdielen += ETH_ALEN; -+ -+ // Coupled Sink Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_COUPLED_SINK_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0007); -+ wfdielen += 2; -+ -+ // Value: -+ // Coupled Sink Status bitmap -+ // Not coupled/available for Coupling -+ wfdie[ wfdielen++ ] = 0; -+ // MAC Addr. -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ wfdie[ wfdielen++ ] = 0; -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len); -+ -+ return len; -+ -+} -+ -+#endif //CONFIG_WFD -+ -+u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 }; -+ u32 len=0, p2pielen = 0; -+#ifdef CONFIG_INTEL_WIDI -+ struct mlme_priv *pmlmepriv = &(pwdinfo->padapter->mlmepriv); -+ u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; -+ u8 widi_version = 0, i = 0; -+ -+ if( _rtw_memcmp( pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == _FALSE ) -+ { -+ widi_version = 35; -+ } -+ else if( pmlmepriv->num_p2p_sdt != 0 ) -+ { -+ widi_version = 40; -+ } -+#endif //CONFIG_INTEL_WIDI -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20100907 -+ // According to the P2P Specification, the probe response frame should contain 5 P2P attributes -+ // 1. P2P Capability -+ // 2. Extended Listen Timing -+ // 3. Notice of Absence ( NOA ) ( Only GO needs this ) -+ // 4. Device Info -+ // 5. Group Info ( Only GO need this ) -+ -+ // P2P Capability ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ RTW_PUT_LE16(p2pie + p2pielen, 0x0002); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ -+ // Group Capability Bitmap, 1 byte -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ p2pie[ p2pielen ] = (P2P_GRPCAP_GO | P2P_GRPCAP_INTRABSS); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING)) -+ p2pie[ p2pielen ] |= P2P_GRPCAP_GROUP_FORMATION; -+ -+ p2pielen++; -+ } -+ else if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) ) -+ { -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_PERSISTENT_GROUP | DMP_P2P_GRPCAP_SUPPORT; -+ else -+ p2pie[ p2pielen++ ] = DMP_P2P_GRPCAP_SUPPORT; -+ -+ } -+ -+ // Extended Listen Timing ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_EX_LISTEN_TIMING; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0004 ); -+ RTW_PUT_LE16(p2pie + p2pielen, 0x0004); -+ p2pielen += 2; -+ -+ // Value: -+ // Availability Period -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ RTW_PUT_LE16(p2pie + p2pielen, 0xFFFF); -+ p2pielen += 2; -+ -+ // Availability Interval -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0xFFFF ); -+ RTW_PUT_LE16(p2pie + p2pielen, 0xFFFF); -+ p2pielen += 2; -+ -+ -+ // Notice of Absence ATTR -+ // Type: -+ // Length: -+ // Value: -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ //go_add_noa_attr(pwdinfo); -+ } -+ -+ // Device Info ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+#ifdef CONFIG_INTEL_WIDI -+ if( widi_version == 35 ) -+ { -+ RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 + pwdinfo->device_name_len); -+ } -+ else if( widi_version == 40 ) -+ { -+ RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 * pmlmepriv->num_p2p_sdt + pwdinfo->device_name_len); -+ } -+ else -+#endif //CONFIG_INTEL_WIDI -+ RTW_PUT_LE16(p2pie + p2pielen, 21 + pwdinfo->device_name_len); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Config Method -+ // This field should be big endian. Noted by P2P specification. -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->supported_wps_cm ); -+ RTW_PUT_BE16(p2pie + p2pielen, pwdinfo->supported_wps_cm); -+ p2pielen += 2; -+ -+#ifdef CONFIG_INTEL_WIDI -+ if( widi_version == 40 ) -+ { -+ // Primary Device Type -+ // Category ID -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_pdt_cid ); -+ p2pielen += 2; -+ -+ // OUI -+ //*(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ RTW_PUT_BE32(p2pie + p2pielen, WPSOUI); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_pdt_scid); -+ p2pielen += 2; -+ } -+ else -+#endif //CONFIG_INTEL_WIDI -+ { -+ // Primary Device Type -+ // Category ID -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_MULIT_MEDIA); -+ p2pielen += 2; -+ -+ // OUI -+ //*(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ RTW_PUT_BE32(p2pie + p2pielen, WPSOUI); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_SCID_MEDIA_SERVER); -+ p2pielen += 2; -+ } -+ -+ // Number of Secondary Device Types -+#ifdef CONFIG_INTEL_WIDI -+ if( widi_version == 35 ) -+ { -+ p2pie[ p2pielen++ ] = 0x01; -+ -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_DISPLAYS); -+ p2pielen += 2; -+ -+ RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI); -+ p2pielen += 4; -+ -+ RTW_PUT_BE16(p2pie + p2pielen, P2P_SCID_WIDI_CONSUMER_SINK); -+ p2pielen += 2; -+ } -+ else if( widi_version == 40 ) -+ { -+ p2pie[ p2pielen++ ] = pmlmepriv->num_p2p_sdt; -+ for( ; i < pmlmepriv->num_p2p_sdt; i++ ) -+ { -+ RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_cid[i]); -+ p2pielen += 2; -+ -+ RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI); -+ p2pielen += 4; -+ -+ RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_scid[i]); -+ p2pielen += 2; -+ } -+ } -+ else -+#endif //CONFIG_INTEL_WIDI -+ p2pie[ p2pielen++ ] = 0x00; // No Secondary Device Type List -+ -+ // Device Name -+ // Type: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_ATTR_DEVICE_NAME); -+ p2pielen += 2; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ RTW_PUT_BE16(p2pie + p2pielen, pwdinfo->device_name_len); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len ); -+ p2pielen += pwdinfo->device_name_len; -+ -+ // Group Info ATTR -+ // Type: -+ // Length: -+ // Value: -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ p2pielen += go_add_group_info_attr(pwdinfo, p2pie + p2pielen); -+ } -+ -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len); -+ -+ -+ return len; -+ -+} -+ -+u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8* pssid, u8 ussidlen, u8* pdev_raddr ) -+{ -+ u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 }; -+ u32 len=0, p2pielen = 0; -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20110301 -+ // According to the P2P Specification, the provision discovery request frame should contain 3 P2P attributes -+ // 1. P2P Capability -+ // 2. Device Info -+ // 3. Group ID ( When joining an operating P2P Group ) -+ -+ // P2P Capability ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ RTW_PUT_LE16(p2pie + p2pielen, 0x0002); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT; -+ -+ // Group Capability Bitmap, 1 byte -+ if ( pwdinfo->persistent_supported ) -+ p2pie[ p2pielen++ ] = P2P_GRPCAP_PERSISTENT_GROUP | DMP_P2P_GRPCAP_SUPPORT; -+ else -+ p2pie[ p2pielen++ ] = DMP_P2P_GRPCAP_SUPPORT; -+ -+ -+ // Device Info ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+ RTW_PUT_LE16(p2pie + p2pielen, 21 + pwdinfo->device_name_len); -+ p2pielen += 2; -+ -+ // Value: -+ // P2P Device Address -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ // Config Method -+ // This field should be big endian. Noted by P2P specification. -+ if ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_PBC ) -+ { -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_CONFIG_METHOD_PBC ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_CONFIG_METHOD_PBC); -+ } -+ else -+ { -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_CONFIG_METHOD_DISPLAY ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_CONFIG_METHOD_DISPLAY); -+ } -+ -+ p2pielen += 2; -+ -+ // Primary Device Type -+ // Category ID -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_MULIT_MEDIA); -+ p2pielen += 2; -+ -+ // OUI -+ //*(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); -+ RTW_PUT_BE32(p2pie + p2pielen, WPSOUI); -+ p2pielen += 4; -+ -+ // Sub Category ID -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_SCID_MEDIA_SERVER); -+ p2pielen += 2; -+ -+ // Number of Secondary Device Types -+ p2pie[ p2pielen++ ] = 0x00; // No Secondary Device Type List -+ -+ // Device Name -+ // Type: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); -+ RTW_PUT_BE16(p2pie + p2pielen, WPS_ATTR_DEVICE_NAME); -+ p2pielen += 2; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_be16( pwdinfo->device_name_len ); -+ RTW_PUT_BE16(p2pie + p2pielen, pwdinfo->device_name_len); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len ); -+ p2pielen += pwdinfo->device_name_len; -+ -+ if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) ) -+ { -+ // Added by Albert 2011/05/19 -+ // In this case, the pdev_raddr is the device address of the group owner. -+ -+ // P2P Group ID ATTR -+ // Type: -+ p2pie[ p2pielen++ ] = P2P_ATTR_GROUP_ID; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( ETH_ALEN + ussidlen ); -+ RTW_PUT_LE16(p2pie + p2pielen, ETH_ALEN + ussidlen); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy( p2pie + p2pielen, pdev_raddr, ETH_ALEN ); -+ p2pielen += ETH_ALEN; -+ -+ _rtw_memcpy( p2pie + p2pielen, pssid, ussidlen ); -+ p2pielen += ussidlen; -+ -+ } -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len); -+ -+ -+ return len; -+ -+} -+ -+ -+u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status_code) -+{ -+ u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 }; -+ u32 len=0, p2pielen = 0; -+ -+ // P2P OUI -+ p2pielen = 0; -+ p2pie[ p2pielen++ ] = 0x50; -+ p2pie[ p2pielen++ ] = 0x6F; -+ p2pie[ p2pielen++ ] = 0x9A; -+ p2pie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // According to the P2P Specification, the Association response frame should contain 2 P2P attributes -+ // 1. Status -+ // 2. Extended Listen Timing (optional) -+ -+ -+ // Status ATTR -+ p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_STATUS, 1, &status_code); -+ -+ -+ // Extended Listen Timing ATTR -+ // Type: -+ // Length: -+ // Value: -+ -+ -+ pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len); -+ -+ return len; -+ -+} -+ -+u32 build_deauth_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) -+{ -+ u32 len=0; -+ -+ return len; -+} -+ -+u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len) -+{ -+ u8 *p; -+ u32 ret=_FALSE; -+ u8 *p2pie; -+ u32 p2pielen = 0; -+ int ssid_len=0, rate_cnt = 0; -+ -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SUPPORTEDRATES_IE_, (int *)&rate_cnt, -+ len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); -+ -+ if ( rate_cnt <= 4 ) -+ { -+ int i, g_rate =0; -+ -+ for( i = 0; i < rate_cnt; i++ ) -+ { -+ if ( ( ( *( p + 2 + i ) & 0xff ) != 0x02 ) && -+ ( ( *( p + 2 + i ) & 0xff ) != 0x04 ) && -+ ( ( *( p + 2 + i ) & 0xff ) != 0x0B ) && -+ ( ( *( p + 2 + i ) & 0xff ) != 0x16 ) ) -+ { -+ g_rate = 1; -+ } -+ } -+ -+ if ( g_rate == 0 ) -+ { -+ // There is no OFDM rate included in SupportedRates IE of this probe request frame -+ // The driver should response this probe request. -+ return ret; -+ } -+ } -+ else -+ { -+ // rate_cnt > 4 means the SupportRates IE contains the OFDM rate because the count of CCK rates are 4. -+ // We should proceed the following check for this probe request. -+ } -+ -+ // Added comments by Albert 20100906 -+ // There are several items we should check here. -+ // 1. This probe request frame must contain the P2P IE. (Done) -+ // 2. This probe request frame must contain the wildcard SSID. (Done) -+ // 3. Wildcard BSSID. (Todo) -+ // 4. Destination Address. ( Done in mgt_dispatcher function ) -+ // 5. Requested Device Type in WSC IE. (Todo) -+ // 6. Device ID attribute in P2P IE. (Todo) -+ -+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ssid_len, -+ len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); -+ -+ ssid_len &= 0xff; // Just last 1 byte is valid for ssid len of the probe request -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ if((p2pie=rtw_get_p2p_ie( pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_ , len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_ , NULL, &p2pielen))) -+ { -+ if ( (p != NULL) && _rtw_memcmp( ( void * ) ( p+2 ), ( void * ) pwdinfo->p2p_wildcard_ssid , 7 )) -+ { -+ //todo: -+ //Check Requested Device Type attributes in WSC IE. -+ //Check Device ID attribute in P2P IE -+ -+ ret = _TRUE; -+ } -+ else if ( (p != NULL) && ( ssid_len == 0 ) ) -+ { -+ ret = _TRUE; -+ } -+ } -+ else -+ { -+ //non -p2p device -+ } -+ -+ } -+ -+ -+ return ret; -+ -+} -+ -+u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len, struct sta_info *psta) -+{ -+ u8 status_code = P2P_STATUS_SUCCESS; -+ u8 *pbuf, *pattr_content=NULL; -+ u32 attr_contentlen = 0; -+ u16 cap_attr=0; -+ unsigned short frame_type, ie_offset=0; -+ u8 * ies; -+ u32 ies_len; -+ u8 * p2p_ie; -+ u32 p2p_ielen = 0; -+ -+ if(!rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ return P2P_STATUS_FAIL_REQUEST_UNABLE; -+ -+ frame_type = GetFrameSubType(pframe); -+ if (frame_type == WIFI_ASSOCREQ) -+ { -+ ie_offset = _ASOCREQ_IE_OFFSET_; -+ } -+ else // WIFI_REASSOCREQ -+ { -+ ie_offset = _REASOCREQ_IE_OFFSET_; -+ } -+ -+ ies = pframe + WLAN_HDR_A3_LEN + ie_offset; -+ ies_len = len - WLAN_HDR_A3_LEN - ie_offset; -+ -+ p2p_ie = rtw_get_p2p_ie(ies , ies_len , NULL, &p2p_ielen); -+ -+ if ( !p2p_ie ) -+ { -+ DBG_8192C( "[%s] P2P IE not Found!!\n", __FUNCTION__ ); -+ status_code = P2P_STATUS_FAIL_INVALID_PARAM; -+ } -+ else -+ { -+ DBG_8192C( "[%s] P2P IE Found!!\n", __FUNCTION__ ); -+ } -+ -+ while ( p2p_ie ) -+ { -+ //Check P2P Capability ATTR -+ if( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) ) -+ { -+ DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ ); -+ cap_attr = le16_to_cpu(cap_attr); -+ psta->dev_cap = cap_attr&0xff; -+ } -+ -+ //Check Extended Listen Timing ATTR -+ -+ -+ //Check P2P Device Info ATTR -+ if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen)) -+ { -+ DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __FUNCTION__ ); -+ pattr_content = pbuf = rtw_zmalloc(attr_contentlen); -+ if(pattr_content) -+ { -+ u8 num_of_secdev_type; -+ u16 dev_name_len; -+ -+ -+ rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO , pattr_content, (uint*)&attr_contentlen); -+ -+ _rtw_memcpy(psta->dev_addr, pattr_content, ETH_ALEN);//P2P Device Address -+ -+ pattr_content += ETH_ALEN; -+ -+ _rtw_memcpy(&psta->config_methods, pattr_content, 2);//Config Methods -+ psta->config_methods = be16_to_cpu(psta->config_methods); -+ -+ pattr_content += 2; -+ -+ _rtw_memcpy(psta->primary_dev_type, pattr_content, 8); -+ -+ pattr_content += 8; -+ -+ num_of_secdev_type = *pattr_content; -+ pattr_content += 1; -+ -+ if(num_of_secdev_type==0) -+ { -+ psta->num_of_secdev_type = 0; -+ } -+ else -+ { -+ u32 len; -+ -+ psta->num_of_secdev_type = num_of_secdev_type; -+ -+ len = (sizeof(psta->secdev_types_list)<(num_of_secdev_type*8)) ? (sizeof(psta->secdev_types_list)) : (num_of_secdev_type*8); -+ -+ _rtw_memcpy(psta->secdev_types_list, pattr_content, len); -+ -+ pattr_content += (num_of_secdev_type*8); -+ } -+ -+ -+ //dev_name_len = attr_contentlen - ETH_ALEN - 2 - 8 - 1 - (num_of_secdev_type*8); -+ psta->dev_name_len=0; -+ if(WPS_ATTR_DEVICE_NAME == be16_to_cpu(*(u16*)pattr_content)) -+ { -+ dev_name_len = be16_to_cpu(*(u16*)(pattr_content+2)); -+ -+ psta->dev_name_len = (sizeof(psta->dev_name)dev_name):dev_name_len; -+ -+ _rtw_memcpy(psta->dev_name, pattr_content+4, psta->dev_name_len); -+ } -+ -+ rtw_mfree(pbuf, attr_contentlen); -+ -+ } -+ -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ -+ } -+ -+ return status_code; -+ -+} -+ -+u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len) -+{ -+ u8 *frame_body; -+ u8 status, dialogToken; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = pwdinfo->padapter; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *p2p_ie; -+ u32 p2p_ielen = 0; -+ -+ frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ dialogToken = frame_body[7]; -+ status = P2P_STATUS_FAIL_UNKNOWN_P2PGROUP; -+ -+ if ( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)) ) -+ { -+ u8 groupid[ 38 ] = { 0x00 }; -+ u8 dev_addr[ETH_ALEN] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ -+ if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen)) -+ { -+ if(_rtw_memcmp(pwdinfo->device_addr, groupid, ETH_ALEN) && -+ _rtw_memcmp(pwdinfo->p2p_group_ssid, groupid+ETH_ALEN, pwdinfo->p2p_group_ssid_len)) -+ { -+ attr_contentlen=0; -+ if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen)) -+ { -+ _irqL irqL; -+ _list *phead, *plist; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ //look up sta asoc_queue -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ -+ plist = get_next(plist); -+ -+ if(psta->is_p2p_device && (psta->dev_cap&P2P_DEVCAP_CLIENT_DISCOVERABILITY) && -+ _rtw_memcmp(psta->dev_addr, dev_addr, ETH_ALEN)) -+ { -+ -+ //_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ //issue GO Discoverability Request -+ issue_group_disc_req(pwdinfo, psta->hwaddr); -+ //_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ status = P2P_STATUS_SUCCESS; -+ -+ break; -+ } -+ else -+ { -+ status = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ } -+ -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ } -+ else -+ { -+ status = P2P_STATUS_FAIL_INVALID_PARAM; -+ } -+ -+ } -+ else -+ { -+ status = P2P_STATUS_FAIL_INVALID_PARAM; -+ } -+ -+ } -+ -+ } -+ -+ -+ //issue Device Discoverability Response -+ issue_p2p_devdisc_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken); -+ -+ -+ return (status==P2P_STATUS_SUCCESS) ? _TRUE:_FALSE; -+ -+} -+ -+u32 process_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe, uint len) -+{ -+ return _TRUE; -+} -+ -+u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) -+{ -+ u8 *frame_body; -+ u8 *wpsie; -+ uint wps_ielen = 0, attr_contentlen = 0; -+ u16 uconfig_method = 0; -+ -+ -+ frame_body = (pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ if ( (wpsie=rtw_get_wps_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &wps_ielen)) ) -+ { -+ if ( rtw_get_wps_attr_content( wpsie, wps_ielen, WPS_ATTR_CONF_METHOD , ( u8* ) &uconfig_method, &attr_contentlen) ) -+ { -+ uconfig_method = be16_to_cpu( uconfig_method ); -+ switch( uconfig_method ) -+ { -+ case WPS_CM_DISPLYA: -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 ); -+ break; -+ } -+ case WPS_CM_LABEL: -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "lab", 3 ); -+ break; -+ } -+ case WPS_CM_PUSH_BUTTON: -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 ); -+ break; -+ } -+ case WPS_CM_KEYPAD: -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 ); -+ break; -+ } -+ } -+ issue_p2p_provision_resp( pwdinfo, GetAddr2Ptr(pframe), frame_body, uconfig_method); -+ } -+ } -+ DBG_871X( "[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); -+ return _TRUE; -+ -+} -+ -+u8 process_p2p_provdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe) -+{ -+ -+ return _TRUE; -+} -+ -+u8 rtw_p2p_get_peer_ch_list(struct wifidirect_info *pwdinfo, u8 *ch_content, u8 ch_cnt, u8 *peer_ch_list) -+{ -+ u8 i = 0, j = 0; -+ u8 temp = 0; -+ u8 ch_no = 0; -+ ch_content += 3; -+ ch_cnt -= 3; -+ -+ while( ch_cnt > 0) -+ { -+ ch_content += 1; -+ ch_cnt -= 1; -+ temp = *ch_content; -+ for( i = 0 ; i < temp ; i++, j++ ) -+ { -+ peer_ch_list[j] = *( ch_content + 1 + i ); -+ } -+ ch_content += (temp + 1); -+ ch_cnt -= (temp + 1); -+ ch_no += temp ; -+ } -+ -+ return ch_no; -+} -+ -+u8 rtw_p2p_check_peer_oper_ch(struct mlme_ext_priv *pmlmeext, u8 ch) -+{ -+ u8 i = 0; -+ -+ for( i = 0; i < pmlmeext->max_chan_nums; i++ ) -+ { -+ if ( pmlmeext->channel_set[ i ].ChannelNum == ch ) -+ { -+ return _SUCCESS; -+ } -+ } -+ -+ return _FAIL; -+} -+ -+u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list, u8 peer_ch_num, u8 *ch_list_inclusioned) -+{ -+ int i = 0, j = 0, temp = 0; -+ u8 ch_no = 0; -+ -+ for( i = 0; i < peer_ch_num; i++ ) -+ { -+ for( j = temp; j < pmlmeext->max_chan_nums; j++ ) -+ { -+ if( *( peer_ch_list + i ) == pmlmeext->channel_set[ j ].ChannelNum ) -+ { -+ ch_list_inclusioned[ ch_no++ ] = *( peer_ch_list + i ); -+ temp = j; -+ break; -+ } -+ } -+ } -+ -+ return ch_no; -+} -+ -+u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) -+{ -+ _adapter *padapter = pwdinfo->padapter; -+ u8 result = P2P_STATUS_SUCCESS; -+ u32 p2p_ielen = 0, wps_ielen = 0; -+ u8 * ies; -+ u32 ies_len; -+ u8 *p2p_ie; -+ u8 *wpsie; -+ u16 wps_devicepassword_id = 0x0000; -+ uint wps_devicepassword_id_len = 0; -+#ifdef CONFIG_WFD -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ u32 wfd_ielen = 0; -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+#endif // CONFIG_TDLS -+#endif // CONFIG_WFD -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter; -+ struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif -+ -+ if ( (wpsie=rtw_get_wps_ie( pframe + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &wps_ielen)) ) -+ { -+ // Commented by Kurt 20120113 -+ // If some device wants to do p2p handshake without sending prov_disc_req -+ // We have to get peer_req_cm from here. -+ if(_rtw_memcmp( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "000", 3) ) -+ { -+ rtw_get_wps_attr_content( wpsie, wps_ielen, WPS_ATTR_DEVICE_PWID, (u8*) &wps_devicepassword_id, &wps_devicepassword_id_len); -+ wps_devicepassword_id = be16_to_cpu( wps_devicepassword_id ); -+ -+ if ( wps_devicepassword_id == WPS_DPID_USER_SPEC ) -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 ); -+ } -+ else if ( wps_devicepassword_id == WPS_DPID_REGISTRAR_SPEC ) -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 ); -+ } -+ else -+ { -+ _rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 ); -+ } -+ } -+ } -+ else -+ { -+ DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ return( result ); -+ } -+ -+ if ( pwdinfo->ui_got_wps_info == P2P_NO_WPSINFO ) -+ { -+ result = P2P_STATUS_FAIL_INFO_UNAVAILABLE; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_INFOR_NOREADY); -+ return( result ); -+ } -+ -+ ies = pframe + _PUBLIC_ACTION_IE_OFFSET_; -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ -+ if ( !p2p_ie ) -+ { -+ DBG_871X( "[%s] P2P IE not Found!!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ } -+ -+ while ( p2p_ie ) -+ { -+ u8 attr_content = 0x00; -+ u32 attr_contentlen = 0; -+ u8 ch_content[100] = { 0x00 }; -+ uint ch_cnt = 0; -+ u8 peer_ch_list[100] = { 0x00 }; -+ u8 peer_ch_num = 0; -+ u8 ch_list_inclusioned[100] = { 0x00 }; -+ u8 ch_num_inclusioned = 0; -+ u16 cap_attr; -+ -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_ING); -+ -+ //Check P2P Capability ATTR -+ if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*)&attr_contentlen) ) -+ { -+ cap_attr = le16_to_cpu(cap_attr); -+ -+#if defined(CONFIG_WFD) && defined(CONFIG_TDLS) -+ if(!(cap_attr & P2P_GRPCAP_INTRABSS) ) -+ ptdlsinfo->ap_prohibited = _TRUE; -+#endif //defined(CONFIG_WFD) && defined(CONFIG_TDLS) -+ } -+ -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) ) -+ { -+ DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 ); -+ pwdinfo->peer_intent = attr_content; // include both intent and tie breaker values. -+ -+ if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) -+ { -+ // Try to match the tie breaker value -+ if ( pwdinfo->intent == P2P_MAX_INTENT ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ result = P2P_STATUS_FAIL_BOTH_GOINTENT_15; -+ } -+ else -+ { -+ if ( attr_content & 0x01 ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ } -+ } -+ else if ( pwdinfo->intent > ( pwdinfo->peer_intent >> 1 ) ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ // Store the group id information. -+ _rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN ); -+ _rtw_memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); -+ } -+ } -+ -+ -+ attr_contentlen = 0; -+ if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_INTENTED_IF_ADDR, pwdinfo->p2p_peer_interface_addr, &attr_contentlen ) ) -+ { -+ if ( attr_contentlen != ETH_ALEN ) -+ { -+ _rtw_memset( pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN ); -+ } -+ } -+ -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, ch_content, &ch_cnt) ) -+ { -+ peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, ch_content, ch_cnt, peer_ch_list); -+ ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); -+ -+ if( ch_num_inclusioned == 0) -+ { -+ DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_NO_COMMON_CH; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ break; -+ } -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ if ( !rtw_p2p_is_channel_list_ok( pwdinfo->operating_channel, -+ ch_list_inclusioned, ch_num_inclusioned) ) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ DBG_871X( "[%s] desired channel NOT Found!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_NO_COMMON_CH; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ break; -+ } -+ else -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ u8 operatingch_info[5] = { 0x00 }, peer_operating_ch = 0; -+ attr_contentlen = 0; -+ -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) -+ { -+ peer_operating_ch = operatingch_info[4]; -+ } -+ -+ if ( rtw_p2p_is_channel_list_ok( peer_operating_ch, -+ ch_list_inclusioned, ch_num_inclusioned) ) -+ { -+ /** -+ * Change our operating channel as peer's for compatibility. -+ */ -+ pwdinfo->operating_channel = peer_operating_ch; -+ DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel); -+ } -+ else -+ { -+ // Take first channel of ch_list_inclusioned as operating channel -+ pwdinfo->operating_channel = ch_list_inclusioned[0]; -+ DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel); -+ } -+ } -+ -+ } -+ } -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ } -+ -+#ifdef CONFIG_WFD -+ // Added by Albert 20110823 -+ // Try to get the TCP port information when receiving the negotiation request. -+ if ( rtw_get_wfd_ie( pframe + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 attr_content[ 10 ] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ -+ DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ ); -+ rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); -+ DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); -+ } -+ } -+#endif // CONFIG_WFD -+ -+ return( result ); -+} -+ -+u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) -+{ -+ _adapter *padapter = pwdinfo->padapter; -+ u8 result = P2P_STATUS_SUCCESS; -+ u32 p2p_ielen, wps_ielen; -+ u8 * ies; -+ u32 ies_len; -+ u8 * p2p_ie; -+#ifdef CONFIG_WFD -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ u32 wfd_ielen = 0; -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+#endif // CONFIG_TDLS -+#endif // CONFIG_WFD -+ -+ ies = pframe + _PUBLIC_ACTION_IE_OFFSET_; -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ // Be able to know which one is the P2P GO and which one is P2P client. -+ -+ if ( rtw_get_wps_ie( ies, ies_len, NULL, &wps_ielen) ) -+ { -+ -+ } -+ else -+ { -+ DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ } -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ if ( !p2p_ie ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; -+ } -+ else -+ { -+ -+ u8 attr_content = 0x00; -+ u32 attr_contentlen = 0; -+ u8 operatingch_info[5] = { 0x00 }; -+ uint ch_cnt = 0; -+ u8 ch_content[100] = { 0x00 }; -+ u8 groupid[ 38 ]; -+ u16 cap_attr; -+ u8 peer_ch_list[100] = { 0x00 }; -+ u8 peer_ch_num = 0; -+ u8 ch_list_inclusioned[100] = { 0x00 }; -+ u8 ch_num_inclusioned = 0; -+ -+ while ( p2p_ie ) // Found the P2P IE. -+ { -+ -+ //Check P2P Capability ATTR -+ if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*)&attr_contentlen) ) -+ { -+ cap_attr = le16_to_cpu(cap_attr); -+#if defined(CONFIG_WFD) && defined(CONFIG_TDLS) -+ if(!(cap_attr & P2P_GRPCAP_INTRABSS) ) -+ ptdlsinfo->ap_prohibited = _TRUE; -+#endif //defined(CONFIG_WFD) && defined(CONFIG_TDLS) -+ } -+ -+ rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); -+ if ( attr_contentlen == 1 ) -+ { -+ DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); -+ if ( attr_content == P2P_STATUS_SUCCESS ) -+ { -+ // Do nothing. -+ } -+ else -+ { -+ if ( P2P_STATUS_FAIL_INFO_UNAVAILABLE == attr_content ) { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_INFOR_NOREADY); -+ } else { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ } -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ result = attr_content; -+ break; -+ } -+ } -+ -+ // Try to get the peer's interface address -+ attr_contentlen = 0; -+ if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_INTENTED_IF_ADDR, pwdinfo->p2p_peer_interface_addr, &attr_contentlen ) ) -+ { -+ if ( attr_contentlen != ETH_ALEN ) -+ { -+ _rtw_memset( pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN ); -+ } -+ } -+ -+ // Try to get the peer's intent and tie breaker value. -+ attr_content = 0x00; -+ attr_contentlen = 0; -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) ) -+ { -+ DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 ); -+ pwdinfo->peer_intent = attr_content; // include both intent and tie breaker values. -+ -+ if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) -+ { -+ // Try to match the tie breaker value -+ if ( pwdinfo->intent == P2P_MAX_INTENT ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ result = P2P_STATUS_FAIL_BOTH_GOINTENT_15; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ } -+ else -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ if ( attr_content & 0x01 ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ } -+ } -+ else if ( pwdinfo->intent > ( pwdinfo->peer_intent >> 1 ) ) -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ else -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ // Store the group id information. -+ _rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN ); -+ _rtw_memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); -+ -+ } -+ } -+ -+ // Try to get the operation channel information -+ -+ attr_contentlen = 0; -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) -+ { -+ DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] ); -+ pwdinfo->peer_operating_ch = operatingch_info[4]; -+ } -+ -+ // Try to get the channel list information -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) ) -+ { -+ DBG_871X( "[%s] channel list attribute found, len = %d\n", __FUNCTION__, pwdinfo->channel_list_attr_len ); -+ -+ peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list); -+ ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); -+ -+ if( ch_num_inclusioned == 0) -+ { -+ DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_NO_COMMON_CH; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ break; -+ } -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ if ( !rtw_p2p_is_channel_list_ok( pwdinfo->operating_channel, -+ ch_list_inclusioned, ch_num_inclusioned) ) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ DBG_871X( "[%s] desired channel NOT Found!\n", __FUNCTION__ ); -+ result = P2P_STATUS_FAIL_NO_COMMON_CH; -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ break; -+ } -+ else -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ u8 operatingch_info[5] = { 0x00 }, peer_operating_ch = 0; -+ attr_contentlen = 0; -+ -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) -+ { -+ peer_operating_ch = operatingch_info[4]; -+ } -+ -+ if ( rtw_p2p_is_channel_list_ok( peer_operating_ch, -+ ch_list_inclusioned, ch_num_inclusioned) ) -+ { -+ /** -+ * Change our operating channel as peer's for compatibility. -+ */ -+ pwdinfo->operating_channel = peer_operating_ch; -+ DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel); -+ } -+ else -+ { -+ // Take first channel of ch_list_inclusioned as operating channel -+ pwdinfo->operating_channel = ch_list_inclusioned[0]; -+ DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel); -+ } -+ } -+ -+ } -+ } -+ -+ } -+ else -+ { -+ DBG_871X( "[%s] channel list attribute not found!\n", __FUNCTION__); -+ } -+ -+ // Try to get the group id information if peer is GO -+ attr_contentlen = 0; -+ _rtw_memset( groupid, 0x00, 38 ); -+ if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) ) -+ { -+ _rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN ); -+ _rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN ); -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ } -+ -+ } -+ -+#ifdef CONFIG_WFD -+ // Added by Albert 20111122 -+ // Try to get the TCP port information when receiving the negotiation response. -+ if ( rtw_get_wfd_ie( pframe + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 attr_content[ 10 ] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ -+ DBG_8192C( "[%s] WFD IE Found!!\n", __FUNCTION__ ); -+ rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); -+ DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); -+ } -+ } -+#endif // CONFIG_WFD -+ -+ return( result ); -+ -+} -+ -+u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) -+{ -+ u8 * ies; -+ u32 ies_len; -+ u8 * p2p_ie; -+ u32 p2p_ielen = 0; -+ u8 result = P2P_STATUS_SUCCESS; -+ ies = pframe + _PUBLIC_ACTION_IE_OFFSET_; -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ while ( p2p_ie ) // Found the P2P IE. -+ { -+ u8 attr_content = 0x00, operatingch_info[5] = { 0x00 }; -+ u8 groupid[ 38 ] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ -+ pwdinfo->negotiation_dialog_token = 1; -+ rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); -+ if ( attr_contentlen == 1 ) -+ { -+ DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); -+ result = attr_content; -+ -+ if ( attr_content == P2P_STATUS_SUCCESS ) -+ { -+ u8 bcancelled = 0; -+ -+ _cancel_timer( &pwdinfo->restore_p2p_state_timer, &bcancelled ); -+ -+ // Commented by Albert 20100911 -+ // Todo: Need to handle the case which both Intents are the same. -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ if ( ( pwdinfo->intent ) > ( pwdinfo->peer_intent >> 1 ) ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ else if ( ( pwdinfo->intent ) < ( pwdinfo->peer_intent >> 1 ) ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ else -+ { -+ // Have to compare the Tie Breaker -+ if ( pwdinfo->peer_intent & 0x01 ) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(pwdinfo->padapter , _FW_LINKED ) ) -+ { -+ // Switch back to the AP channel soon. -+ _set_timer( &pwdinfo->ap_p2p_switch_timer, 100 ); -+ } -+#endif -+ } -+ else -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); -+ break; -+ } -+ } -+ -+ // Try to get the group id information -+ attr_contentlen = 0; -+ _rtw_memset( groupid, 0x00, 38 ); -+ if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) ) -+ { -+ DBG_871X( "[%s] Ssid = %s, ssidlen = %d\n", __FUNCTION__, &groupid[ETH_ALEN], (u32)strlen(&groupid[ETH_ALEN]) ); -+ _rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN ); -+ _rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN ); -+ } -+ -+ attr_contentlen = 0; -+ if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) -+ { -+ DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] ); -+ pwdinfo->peer_operating_ch = operatingch_info[4]; -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ -+ } -+ -+ return( result ); -+} -+ -+u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len) -+{ -+ u8 *frame_body; -+ u8 dialogToken=0; -+ u8 status = P2P_STATUS_SUCCESS; -+ -+ frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ -+ dialogToken = frame_body[6]; -+ -+ //todo: check NoA attribute -+ -+ issue_p2p_presence_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken); -+ -+ return _TRUE; -+} -+ -+void find_phase_handler( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ NDIS_802_11_SSID ssid; -+ _irqL irqL; -+ u8 _status = 0; -+ -+_func_enter_; -+ -+ _rtw_memset((unsigned char*)&ssid, 0, sizeof(NDIS_802_11_SSID)); -+ _rtw_memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN ); -+ ssid.SsidLength = P2P_WILDCARD_SSID_LEN; -+ -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _status = rtw_sitesurvey_cmd(padapter, &ssid, 1, NULL, 0); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ -+_func_exit_; -+} -+ -+void p2p_concurrent_handler( _adapter* padapter ); -+ -+void restore_p2p_state_handler( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+_func_enter_; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP)) -+ { -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ -+ issue_nulldata(pbuddy_adapter, NULL, 0, 3, 500); -+ } -+ } -+#endif -+ -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE)) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ p2p_concurrent_handler( padapter ); -+#else -+ // In the P2P client mode, the driver should not switch back to its listen channel -+ // because this P2P client should stay at the operating channel of P2P GO. -+ set_channel_bwmode( padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+#endif -+ } -+_func_exit_; -+} -+ -+void pre_tx_invitereq_handler( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ u8 val8 = 1; -+_func_enter_; -+ -+ set_channel_bwmode(padapter, pwdinfo->invitereq_info.peer_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ issue_probereq_p2p(padapter, NULL); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ -+_func_exit_; -+} -+ -+void pre_tx_provdisc_handler( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ u8 val8 = 1; -+_func_enter_; -+ -+ set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ issue_probereq_p2p(padapter, NULL); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ -+_func_exit_; -+} -+ -+void pre_tx_negoreq_handler( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ u8 val8 = 1; -+_func_enter_; -+ -+ set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ issue_probereq_p2p(padapter, NULL); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ -+_func_exit_; -+} -+ -+#ifdef CONFIG_CONCURRENT_MODE -+void p2p_concurrent_handler( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ //_adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ //struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ //struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ //struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ u8 val8; -+_func_enter_; -+ -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel; -+ -+ if( pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ DBG_871X("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel); -+ -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ -+ issue_nulldata(pbuddy_adapter, NULL, 0, 3, 500); -+ } -+ else if( pwdinfo->driver_interface == DRIVER_WEXT ) -+ { -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) -+ { -+ // Now, the driver stays on the AP's channel. -+ // If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel. -+ if ( pwdinfo->ext_listen_period > 0 ) -+ { -+ DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __FUNCTION__, pwdinfo->ext_listen_period ); -+ -+ if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel ) -+ { -+ // Will switch to listen channel so that need to send the NULL data with PW bit to AP. -+ issue_nulldata(pbuddy_adapter, NULL, 1, 3, 500); -+ set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN); -+ val8 = 1; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ -+ // Todo: To check the value of pwdinfo->ext_listen_period is equal to 0 or not. -+ _set_timer( &pwdinfo->ap_p2p_switch_timer, pwdinfo->ext_listen_period ); -+ } -+ } -+ else if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_LISTEN) || -+ rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL) || -+ ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _FALSE ) || -+ rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) ) -+ { -+ // Now, the driver is in the listen state of P2P mode. -+ DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __FUNCTION__, pwdinfo->ext_listen_interval ); -+ -+ // Commented by Albert 2012/11/01 -+ // If the AP's channel is the same as the listen channel, we should still be in the listen state -+ // Other P2P device is still able to find this device out even this device is in the AP's channel. -+ // So, configure this device to be able to receive the probe request frame and set it to listen state. -+ if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel ) -+ { -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ val8 = 0; -+ padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_IDLE); -+ issue_nulldata(pbuddy_adapter, NULL, 0, 3, 500); -+ } -+ -+ // Todo: To check the value of pwdinfo->ext_listen_interval is equal to 0 or not. -+ _set_timer( &pwdinfo->ap_p2p_switch_timer, pwdinfo->ext_listen_interval ); -+ } -+ else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_OK)) -+ { -+ // The driver had finished the P2P handshake successfully. -+ val8 = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ issue_nulldata(pbuddy_adapter, NULL, 0, 3, 500); -+ } -+ else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) -+ { -+ val8 = 1; -+ set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ issue_probereq_p2p(padapter, NULL); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ } -+ else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _TRUE) -+ { -+ val8 = 1; -+ set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ issue_probereq_p2p(padapter, NULL); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ } -+ else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) && pwdinfo->invitereq_info.benable == _TRUE) -+ { -+ /* -+ val8 = 1; -+ set_channel_bwmode(padapter, , HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); -+ issue_probereq_p2p(padapter, NULL); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ */ -+ } -+ } -+ } -+ else -+ { -+ set_channel_bwmode( padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ -+_func_exit_; -+} -+#endif -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+static void ro_ch_handler(_adapter *padapter) -+{ -+ struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ u8 ch, bw, offset; -+_func_enter_; -+ -+ if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) { -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" back to linked union - ch:%u, bw:%u, offset:%u\n", -+ FUNC_ADPT_ARG(padapter), ch, bw, offset); -+ } -+ else if (wdev_to_priv(padapter->rtw_wdev)->p2p_enabled && pwdinfo->listen_channel) { -+ ch = pwdinfo->listen_channel; -+ bw = HT_CHANNEL_WIDTH_20; -+ offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" back to listen ch - ch:%u, bw:%u, offset:%u\n", -+ FUNC_ADPT_ARG(padapter), ch, bw, offset); -+ } -+ else { -+ ch = pcfg80211_wdinfo->restore_channel; -+ bw = HT_CHANNEL_WIDTH_20; -+ offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ if (0) -+ DBG_871X(FUNC_ADPT_FMT" back to restore ch - ch:%u, bw:%u, offset:%u\n", -+ FUNC_ADPT_ARG(padapter), ch, bw, offset); -+ } -+ -+ set_channel_bwmode(padapter, ch, offset, bw); -+ -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); -+#endif -+ -+ pcfg80211_wdinfo->is_ro_ch = _FALSE; -+ -+ DBG_871X("cfg80211_remain_on_channel_expired\n"); -+ -+ rtw_cfg80211_remain_on_channel_expired(padapter, -+ pcfg80211_wdinfo->remain_on_ch_cookie, -+ &pcfg80211_wdinfo->remain_on_ch_channel, -+ pcfg80211_wdinfo->remain_on_ch_type, GFP_KERNEL); -+ -+_func_exit_; -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void ro_ch_timer_process (void *FunctionContext) -+#else -+static void ro_ch_timer_process(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, cfg80211_wdinfo.remain_on_ch_timer); -+#endif -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); -+ -+ //printk("%s \n", __FUNCTION__); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ ATOMIC_SET(&pwdev_priv->ro_ch_to, 1); -+#endif -+ -+ p2p_protocol_wk_cmd( adapter, P2P_RO_CH_WK); -+} -+ -+static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) -+{ -+ u8 *ies, *p2p_ie; -+ u32 ies_len, p2p_ielen; -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ -+ while ( p2p_ie ) { -+ u32 attr_contentlen = 0; -+ u8 *pattr = NULL; -+ -+ //Check P2P_ATTR_OPERATING_CH -+ attr_contentlen = 0; -+ pattr = NULL; -+ if((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL) -+ { -+ *(pattr+4) = ch; -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ } -+} -+ -+static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) -+{ -+ u8 *ies, *p2p_ie; -+ u32 ies_len, p2p_ielen; -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ -+ while (p2p_ie) { -+ u32 attr_contentlen = 0; -+ u8 *pattr = NULL; -+ -+ //Check P2P_ATTR_CH_LIST -+ if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!=NULL) { -+ int i; -+ u32 num_of_ch; -+ u8 *pattr_temp = pattr + 3 ; -+ -+ attr_contentlen -= 3; -+ -+ while (attr_contentlen>0) { -+ num_of_ch = *(pattr_temp+1); -+ -+ for(i=0; ipbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ u8 buddy_ch = pbuddy_mlmeext->cur_channel; -+ -+ ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ -+ while (p2p_ie) { -+ u32 attr_contentlen = 0; -+ u8 *pattr = NULL; -+ -+ //Check P2P_ATTR_CH_LIST -+ if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!=NULL) { -+ int i; -+ u32 num_of_ch; -+ u8 *pattr_temp = pattr + 3 ; -+ -+ attr_contentlen -= 3; -+ -+ while (attr_contentlen>0) { -+ num_of_ch = *(pattr_temp+1); -+ -+ for(i=0; ipbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ u8 buddy_ch = pbuddy_mlmeext->cur_channel; -+ -+ ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ -+ while (p2p_ie) { -+ u32 attr_contentlen = 0; -+ u8 *pattr = NULL; -+ -+ //Check P2P_ATTR_OPERATING_CH -+ attr_contentlen = 0; -+ pattr = NULL; -+ if((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL) { -+ if (*(pattr+4) == buddy_ch) { -+ DBG_871X(FUNC_ADPT_FMT" op_ch fit buddy_ch:%u\n", FUNC_ADPT_ARG(padapter), buddy_ch); -+ fit = _TRUE; -+ break; -+ } -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ } -+#endif -+ return fit; -+} -+ -+static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *frame_body, u32 len) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ u8 *ies, *p2p_ie; -+ u32 ies_len, p2p_ielen; -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); -+ ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen ); -+ -+ while ( p2p_ie ) -+ { -+ u32 attr_contentlen = 0; -+ u8 *pattr = NULL; -+ -+ //Check P2P_ATTR_CH_LIST -+ if((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!=NULL) -+ { -+ int i; -+ u32 num_of_ch; -+ u8 *pattr_temp = pattr + 3 ; -+ -+ attr_contentlen -= 3; -+ -+ while(attr_contentlen>0) -+ { -+ num_of_ch = *(pattr_temp+1); -+ -+ for(i=0; icur_channel;//forcing to the same channel -+ -+ pattr_temp += (2+num_of_ch); -+ attr_contentlen -= (2+num_of_ch); -+ } -+ } -+ -+ //Check P2P_ATTR_OPERATING_CH -+ attr_contentlen = 0; -+ pattr = NULL; -+ if((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL) -+ { -+ *(pattr+4) = pbuddy_mlmeext->cur_channel;//forcing to the same channel -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ -+ } -+ -+#endif -+} -+ -+#ifdef CONFIG_WFD -+void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len) -+{ -+ unsigned char *frame_body; -+ u8 category, action, OUI_Subtype, dialogToken=0; -+ u32 wfdielen = 0; -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ -+ frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ category = frame_body[0]; -+ -+ if(category == RTW_WLAN_CATEGORY_PUBLIC) -+ { -+ action = frame_body[1]; -+ if (action == ACT_PUBLIC_VENDOR -+ && _rtw_memcmp(frame_body+2, P2P_OUI, 4) == _TRUE -+ ) -+ { -+ OUI_Subtype = frame_body[6]; -+ dialogToken = frame_body[7]; -+ switch( OUI_Subtype )//OUI Subtype -+ { -+ case P2P_GO_NEGO_REQ: -+ { -+ wfdielen = build_nego_req_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ case P2P_GO_NEGO_RESP: -+ { -+ wfdielen = build_nego_resp_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ case P2P_GO_NEGO_CONF: -+ { -+ wfdielen = build_nego_confirm_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ case P2P_INVIT_REQ: -+ { -+ wfdielen = build_invitation_req_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ case P2P_INVIT_RESP: -+ { -+ wfdielen = build_invitation_resp_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ case P2P_DEVDISC_REQ: -+ break; -+ case P2P_DEVDISC_RESP: -+ -+ break; -+ case P2P_PROVISION_DISC_REQ: -+ { -+ wfdielen = build_provdisc_req_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ case P2P_PROVISION_DISC_RESP: -+ { -+ wfdielen = build_provdisc_resp_wfd_ie( &padapter->wdinfo, buf + ( *len ) ); -+ (*len) += wfdielen; -+ break; -+ } -+ default: -+ -+ break; -+ } -+ -+ } -+ -+ } -+ else if(category == RTW_WLAN_CATEGORY_P2P) -+ { -+ OUI_Subtype = frame_body[5]; -+ dialogToken = frame_body[6]; -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n", -+ cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken); -+#endif -+ -+ switch(OUI_Subtype) -+ { -+ case P2P_NOTICE_OF_ABSENCE: -+ -+ break; -+ case P2P_PRESENCE_REQUEST: -+ -+ break; -+ case P2P_PRESENCE_RESPONSE: -+ -+ break; -+ case P2P_GO_DISC_REQUEST: -+ -+ break; -+ default: -+ -+ break; -+ } -+ -+ } -+ else -+ { -+ DBG_871X("%s, action frame category=%d\n", __func__, category); -+ //is_p2p_frame = (-1); -+ } -+ -+ return; -+} -+#endif -+ -+u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_len) -+{ -+ uint attr_contentlen = 0; -+ u8 *pattr = NULL; -+ int w_sz = 0; -+ u8 ch_cnt = 0; -+ u8 ch_list[40]; -+ bool continuous = _FALSE; -+ -+ if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, &attr_contentlen))!=NULL) { -+ int i, j; -+ u32 num_of_ch; -+ u8 *pattr_temp = pattr + 3 ; -+ -+ attr_contentlen -= 3; -+ -+ _rtw_memset(ch_list, 0, 40); -+ -+ while (attr_contentlen>0) { -+ num_of_ch = *(pattr_temp+1); -+ -+ for(i=0; i=ch_cnt) -+ ch_list[ch_cnt++] = *(pattr_temp+2+i); -+ -+ } -+ -+ pattr_temp += (2+num_of_ch); -+ attr_contentlen -= (2+num_of_ch); -+ } -+ -+ for (j=0;j>1 == resp >>1) -+ return req&0x01 ? _TRUE : _FALSE; -+ else if (req>>1 > resp>>1) -+ return _TRUE; -+ else -+ return _FALSE; -+} -+ -+int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx) -+{ -+ int is_p2p_frame = (-1); -+ unsigned char *frame_body; -+ u8 category, action, OUI_Subtype, dialogToken=0; -+ u8 *p2p_ie = NULL; -+ uint p2p_ielen = 0; -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ int status = -1; -+ u8 ch_list_buf[128] = {'\0'}; -+ int op_ch = -1; -+ int listen_ch = -1; -+ u8 intent = 0; -+ -+ frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ category = frame_body[0]; -+ //just for check -+ if(category == RTW_WLAN_CATEGORY_PUBLIC) -+ { -+ action = frame_body[1]; -+ if (action == ACT_PUBLIC_VENDOR -+ && _rtw_memcmp(frame_body+2, P2P_OUI, 4) == _TRUE -+ ) -+ { -+ OUI_Subtype = frame_body[6]; -+ dialogToken = frame_body[7]; -+ is_p2p_frame = OUI_Subtype; -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("ACTION_CATEGORY_PUBLIC: ACT_PUBLIC_VENDOR, OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n", -+ cpu_to_be32( *( ( u32* ) ( frame_body + 2 ) ) ), OUI_Subtype, dialogToken); -+ #endif -+ -+ p2p_ie = rtw_get_p2p_ie( -+ (u8 *)buf+sizeof(struct rtw_ieee80211_hdr_3addr)+_PUBLIC_ACTION_IE_OFFSET_, -+ len-sizeof(struct rtw_ieee80211_hdr_3addr)-_PUBLIC_ACTION_IE_OFFSET_, -+ NULL, &p2p_ielen); -+ -+ switch( OUI_Subtype )//OUI Subtype -+ { -+ u8 *cont; -+ uint cont_len; -+ case P2P_GO_NEGO_REQ: -+ { -+ struct rtw_wdev_nego_info* nego_info = &pwdev_priv->nego_info; -+ -+ if (tx) { -+ #ifdef CONFIG_DRV_ISSUE_PROV_REQ // IOT FOR S2 -+ if(pwdev_priv->provdisc_req_issued == _FALSE) { -+ rtw_cfg80211_issue_p2p_provision_request(padapter, buf, len); -+ pwdev_priv->provdisc_req_issued = _TRUE; -+ rtw_msleep_os(200); -+ } -+ #endif //CONFIG_DRV_ISSUE_PROV_REQ -+ -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED)) -+ rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)); -+ #endif -+ } -+ -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, &cont_len))) -+ op_ch = *(cont+4); -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_LISTEN_CH, NULL, &cont_len))) -+ listen_ch = *(cont+4); -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT, NULL, &cont_len))) -+ intent = *cont; -+ -+ if (nego_info->token != dialogToken) -+ rtw_wdev_nego_info_init(nego_info); -+ -+ _rtw_memcpy(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN); -+ nego_info->active = tx ? 1 : 0; -+ nego_info->token = dialogToken; -+ nego_info->req_op_ch = op_ch; -+ nego_info->req_listen_ch = listen_ch; -+ nego_info->req_intent = intent; -+ nego_info->state = 0; -+ -+ dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); -+ DBG_871X("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d, intent:%u%s, listen_ch:%d, op_ch:%d, ch_list:%s\n", -+ (tx==_TRUE)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", listen_ch, op_ch, ch_list_buf); -+ -+ if (!tx) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED) -+ && rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) -+ { -+ DBG_871X(FUNC_ADPT_FMT" ch_list has no intersect with buddy\n", FUNC_ADPT_ARG(padapter)); -+ rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); -+ } -+ #endif -+ } -+ -+ break; -+ } -+ case P2P_GO_NEGO_RESP: -+ { -+ struct rtw_wdev_nego_info* nego_info = &pwdev_priv->nego_info; -+ -+ if (tx) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED)) -+ rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)); -+ #endif -+ } -+ -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, &cont_len))) -+ op_ch = *(cont+4); -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT, NULL, &cont_len))) -+ intent = *cont; -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len))) -+ status = *cont; -+ -+ if (nego_info->token == dialogToken && nego_info->state == 0 -+ && _rtw_memcmp(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == _TRUE -+ ) { -+ nego_info->status = (status==-1) ? 0xff : status; -+ nego_info->rsp_op_ch= op_ch; -+ nego_info->rsp_intent = intent; -+ nego_info->state = 1; -+ if (status != 0) -+ nego_info->token = 0; /* init */ -+ } -+ -+ dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); -+ DBG_871X("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, intent:%u%s, status:%d, op_ch:%d, ch_list:%s\n", -+ (tx==_TRUE)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", status, op_ch, ch_list_buf); -+ -+ if (!tx) { -+ pwdev_priv->provdisc_req_issued = _FALSE; -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED) -+ && rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) -+ { -+ DBG_871X(FUNC_ADPT_FMT" ch_list has no intersect with buddy\n", FUNC_ADPT_ARG(padapter)); -+ rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); -+ } -+ #endif -+ } -+ -+ break; -+ } -+ case P2P_GO_NEGO_CONF: -+ { -+ struct rtw_wdev_nego_info* nego_info = &pwdev_priv->nego_info; -+ bool is_go = _FALSE; -+ -+ if (tx) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED)) -+ rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)); -+ #endif -+ } -+ -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, &cont_len))) -+ op_ch = *(cont+4); -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len))) -+ status = *cont; -+ -+ if (nego_info->token == dialogToken && nego_info->state == 1 -+ && _rtw_memcmp(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == _TRUE -+ ) { -+ nego_info->status = (status==-1) ? 0xff : status; -+ nego_info->conf_op_ch = (op_ch==-1) ? 0 : op_ch; -+ nego_info->state = 2; -+ -+ if (status == 0) { -+ if (rtw_p2p_nego_intent_compare(nego_info->req_intent, nego_info->rsp_intent) && tx) -+ is_go = _TRUE; -+ } -+ -+ nego_info->token = 0; /* init */ -+ } -+ -+ dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); -+ DBG_871X("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d, op_ch:%d, ch_list:%s\n", -+ (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf); -+ -+ if (!tx) { -+ } -+ -+ break; -+ } -+ case P2P_INVIT_REQ: -+ { -+ struct rtw_wdev_invit_info* invit_info = &pwdev_priv->invit_info; -+ int flags = -1; -+ -+ if (tx) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED)) -+ rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)); -+ #endif -+ } -+ -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_INVITATION_FLAGS, NULL, &cont_len))) -+ flags = *cont; -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, &cont_len))) -+ op_ch = *(cont+4); -+ -+ if (invit_info->token != dialogToken) -+ rtw_wdev_invit_info_init(invit_info); -+ -+ _rtw_memcpy(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN); -+ invit_info->active = tx ? 1 : 0; -+ invit_info->token = dialogToken; -+ invit_info->flags = (flags==-1) ? 0x0 : flags; -+ invit_info->req_op_ch= op_ch; -+ invit_info->state = 0; -+ -+ dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); -+ DBG_871X("RTW_%s:P2P_INVIT_REQ, dialogToken=%d, flags:0x%02x, op_ch:%d, ch_list:%s\n", -+ (tx==_TRUE)?"Tx":"Rx", dialogToken, flags, op_ch, ch_list_buf); -+ -+ if (!tx) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED)) { -+ if (op_ch != -1 && rtw_chk_p2pie_op_ch_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) { -+ DBG_871X(FUNC_ADPT_FMT" op_ch:%u has no intersect with buddy\n", FUNC_ADPT_ARG(padapter), op_ch); -+ rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); -+ } else if (rtw_chk_p2pie_ch_list_with_buddy(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)) == _FALSE) { -+ DBG_871X(FUNC_ADPT_FMT" ch_list has no intersect with buddy\n", FUNC_ADPT_ARG(padapter)); -+ rtw_change_p2pie_ch_list(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr), 0); -+ } -+ } -+ #endif -+ } -+ -+ break; -+ } -+ case P2P_INVIT_RESP: -+ { -+ struct rtw_wdev_invit_info* invit_info = &pwdev_priv->invit_info; -+ -+ if (tx) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED)) -+ rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr)); -+ #endif -+ } -+ -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len))) -+ { -+#ifdef CONFIG_P2P_INVITE_IOT -+ if(tx && *cont==7) -+ { -+ DBG_871X("TX_P2P_INVITE_RESP, status is no common channel, change to unknown group\n"); -+ *cont = 8; //unknow group status -+ } -+#endif //CONFIG_P2P_INVITE_IOT -+ status = *cont; -+ } -+ if ((cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, &cont_len))) -+ op_ch = *(cont+4); -+ -+ if (invit_info->token == dialogToken && invit_info->state == 0 -+ && _rtw_memcmp(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN) == _TRUE -+ ) { -+ invit_info->status = (status==-1) ? 0xff : status; -+ invit_info->rsp_op_ch= op_ch; -+ invit_info->state = 1; -+ invit_info->token = 0; /* init */ -+ } -+ -+ dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); -+ DBG_871X("RTW_%s:P2P_INVIT_RESP, dialogToken=%d, status:%d, op_ch:%d, ch_list:%s\n", -+ (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf); -+ -+ if (!tx) { -+ } -+ -+ break; -+ } -+ case P2P_DEVDISC_REQ: -+ DBG_871X("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); -+ break; -+ case P2P_DEVDISC_RESP: -+ cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); -+ DBG_871X("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1); -+ break; -+ case P2P_PROVISION_DISC_REQ: -+ { -+ size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr); -+ u8 *p2p_ie; -+ uint p2p_ielen = 0; -+ uint contentlen = 0; -+ -+ DBG_871X("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); -+ -+ //if(tx) -+ { -+ pwdev_priv->provdisc_req_issued = _FALSE; -+ -+ if( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, frame_body_len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen))) -+ { -+ -+ if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, NULL, &contentlen)) -+ { -+ pwdev_priv->provdisc_req_issued = _FALSE;//case: p2p_client join p2p GO -+ } -+ else -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("provdisc_req_issued is _TRUE\n"); -+ #endif //CONFIG_DEBUG_CFG80211 -+ pwdev_priv->provdisc_req_issued = _TRUE;//case: p2p_devices connection before Nego req. -+ } -+ -+ } -+ } -+ } -+ break; -+ case P2P_PROVISION_DISC_RESP: -+ DBG_871X("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); -+ break; -+ default: -+ DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", OUI_Subtype, dialogToken); -+ break; -+ } -+ -+ } -+ -+ } -+ else if(category == RTW_WLAN_CATEGORY_P2P) -+ { -+ OUI_Subtype = frame_body[5]; -+ dialogToken = frame_body[6]; -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n", -+ cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken); -+ #endif -+ -+ is_p2p_frame = OUI_Subtype; -+ -+ switch(OUI_Subtype) -+ { -+ case P2P_NOTICE_OF_ABSENCE: -+ DBG_871X("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); -+ break; -+ case P2P_PRESENCE_REQUEST: -+ DBG_871X("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); -+ break; -+ case P2P_PRESENCE_RESPONSE: -+ DBG_871X("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); -+ break; -+ case P2P_GO_DISC_REQUEST: -+ DBG_871X("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); -+ break; -+ default: -+ DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", OUI_Subtype, dialogToken); -+ break; -+ } -+ -+ } -+ else -+ { -+ DBG_871X("RTW_%s:action frame category=%d\n", (tx==_TRUE)?"TX":"RX", category); -+ } -+ -+ return is_p2p_frame; -+} -+ -+void rtw_init_cfg80211_wifidirect_info( _adapter* padapter) -+{ -+ struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; -+ -+ _rtw_memset(pcfg80211_wdinfo, 0x00, sizeof(struct cfg80211_wifidirect_info) ); -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer( &pcfg80211_wdinfo->remain_on_ch_timer, padapter->pnetdev, ro_ch_timer_process, padapter ); -+#else -+ timer_setup(&pcfg80211_wdinfo->remain_on_ch_timer, ro_ch_timer_process, 0); -+#endif -+} -+#endif //CONFIG_IOCTL_CFG80211 -+ -+void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType) -+{ -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+_func_enter_; -+ -+ switch(intCmdType) -+ { -+ case P2P_FIND_PHASE_WK: -+ { -+ find_phase_handler( padapter ); -+ break; -+ } -+ case P2P_RESTORE_STATE_WK: -+ { -+ restore_p2p_state_handler( padapter ); -+ break; -+ } -+ case P2P_PRE_TX_PROVDISC_PROCESS_WK: -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ p2p_concurrent_handler( padapter ); -+ } -+ else -+ { -+ pre_tx_provdisc_handler( padapter ); -+ } -+#else -+ pre_tx_provdisc_handler( padapter ); -+#endif -+ break; -+ } -+ case P2P_PRE_TX_INVITEREQ_PROCESS_WK: -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ p2p_concurrent_handler( padapter ); -+ } -+ else -+ { -+ pre_tx_invitereq_handler( padapter ); -+ } -+#else -+ pre_tx_invitereq_handler( padapter ); -+#endif -+ break; -+ } -+ case P2P_PRE_TX_NEGOREQ_PROCESS_WK: -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ p2p_concurrent_handler( padapter ); -+ } -+ else -+ { -+ pre_tx_negoreq_handler( padapter ); -+ } -+#else -+ pre_tx_negoreq_handler( padapter ); -+#endif -+ break; -+ } -+#ifdef CONFIG_P2P -+#ifdef CONFIG_CONCURRENT_MODE -+ case P2P_AP_P2P_CH_SWITCH_PROCESS_WK: -+ { -+ p2p_concurrent_handler( padapter ); -+ break; -+ } -+#endif -+#endif -+#ifdef CONFIG_IOCTL_CFG80211 -+ case P2P_RO_CH_WK: -+ { -+ ro_ch_handler( padapter ); -+ break; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ } -+ -+_func_exit_; -+} -+ -+#ifdef CONFIG_P2P_PS -+void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength) -+{ -+ u8 * ies; -+ u32 ies_len; -+ u8 * p2p_ie; -+ u32 p2p_ielen = 0; -+ u8 noa_attr[MAX_P2P_IE_LEN] = { 0x00 };// NoA length should be n*(13) + 2 -+ u32 attr_contentlen = 0; -+ -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ u8 find_p2p = _FALSE, find_p2p_ps = _FALSE; -+ u8 noa_offset, noa_num, noa_index; -+ -+_func_enter_; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ return; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->iface_type != IFACE_PORT0) -+ return; -+#endif -+ if(IELength <= _BEACON_IE_OFFSET_) -+ return; -+ -+ ies = IEs + _BEACON_IE_OFFSET_; -+ ies_len = IELength - _BEACON_IE_OFFSET_; -+ -+ p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen); -+ -+ while(p2p_ie) -+ { -+ find_p2p = _TRUE; -+ // Get Notice of Absence IE. -+ if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_NOA, noa_attr, &attr_contentlen)) -+ { -+ find_p2p_ps = _TRUE; -+ noa_index = noa_attr[0]; -+ -+ if( (pwdinfo->p2p_ps_mode == P2P_PS_NONE) || -+ (noa_index != pwdinfo->noa_index) )// if index change, driver should reconfigure related setting. -+ { -+ pwdinfo->noa_index = noa_index; -+ pwdinfo->opp_ps = noa_attr[1] >> 7; -+ pwdinfo->ctwindow = noa_attr[1] & 0x7F; -+ -+ noa_offset = 2; -+ noa_num = 0; -+ // NoA length should be n*(13) + 2 -+ if(attr_contentlen > 2) -+ { -+ while(noa_offset < attr_contentlen) -+ { -+ //_rtw_memcpy(&wifidirect_info->noa_count[noa_num], &noa_attr[noa_offset], 1); -+ pwdinfo->noa_count[noa_num] = noa_attr[noa_offset]; -+ noa_offset += 1; -+ -+ _rtw_memcpy(&pwdinfo->noa_duration[noa_num], &noa_attr[noa_offset], 4); -+ noa_offset += 4; -+ -+ _rtw_memcpy(&pwdinfo->noa_interval[noa_num], &noa_attr[noa_offset], 4); -+ noa_offset += 4; -+ -+ _rtw_memcpy(&pwdinfo->noa_start_time[noa_num], &noa_attr[noa_offset], 4); -+ noa_offset += 4; -+ -+ noa_num++; -+ } -+ } -+ pwdinfo->noa_num = noa_num; -+ -+ if( pwdinfo->opp_ps == 1 ) -+ { -+ pwdinfo->p2p_ps_mode = P2P_PS_CTWINDOW; -+ // driver should wait LPS for entering CTWindow -+ if(padapter->pwrctrlpriv.bFwCurrentInPSMode == _TRUE) -+ { -+ p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 1); -+ } -+ } -+ else if( pwdinfo->noa_num > 0 ) -+ { -+ pwdinfo->p2p_ps_mode = P2P_PS_NOA; -+ p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 1); -+ } -+ else if( pwdinfo->p2p_ps_mode > P2P_PS_NONE) -+ { -+ p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); -+ } -+ } -+ -+ break; // find target, just break. -+ } -+ -+ //Get the next P2P IE -+ p2p_ie = rtw_get_p2p_ie(p2p_ie+p2p_ielen, ies_len -(p2p_ie -ies + p2p_ielen), NULL, &p2p_ielen); -+ -+ } -+ -+ if(find_p2p == _TRUE) -+ { -+ if( (pwdinfo->p2p_ps_mode > P2P_PS_NONE) && (find_p2p_ps == _FALSE) ) -+ { -+ p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); -+ } -+ } -+ -+_func_exit_; -+} -+ -+void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+_func_enter_; -+ -+ switch(p2p_ps_state) -+ { -+ case P2P_PS_DISABLE: -+ pwdinfo->p2p_ps_state = p2p_ps_state; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state)); -+ -+ pwdinfo->noa_index = 0; -+ pwdinfo->ctwindow = 0; -+ pwdinfo->opp_ps = 0; -+ pwdinfo->noa_num = 0; -+ pwdinfo->p2p_ps_mode = P2P_PS_NONE; -+ if(padapter->pwrctrlpriv.bFwCurrentInPSMode == _TRUE) -+ { -+ if(pwrpriv->smart_ps == 0) -+ { -+ pwrpriv->smart_ps = 2; -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode))); -+ } -+ } -+ break; -+ case P2P_PS_ENABLE: -+ if (pwdinfo->p2p_ps_mode > P2P_PS_NONE) { -+ pwdinfo->p2p_ps_state = p2p_ps_state; -+ -+ if( pwdinfo->ctwindow > 0 ) -+ { -+ if(pwrpriv->smart_ps != 0) -+ { -+ pwrpriv->smart_ps = 0; -+ DBG_871X("%s(): Enter CTW, change SmartPS\n", __FUNCTION__); -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode))); -+ } -+ } -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state)); -+ } -+ break; -+ case P2P_PS_SCAN: -+ case P2P_PS_SCAN_DONE: -+ case P2P_PS_ALLSTASLEEP: -+ if (pwdinfo->p2p_ps_mode > P2P_PS_NONE) { -+ pwdinfo->p2p_ps_state = p2p_ps_state; -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_state)); -+ } -+ break; -+ default: -+ break; -+ } -+ -+_func_exit_; -+} -+ -+u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue) -+{ -+ struct cmd_obj *ph2c; -+ struct drvextra_cmd_parm *pdrvextra_cmd_parm; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -+ u8 res = _SUCCESS; -+ -+_func_enter_; -+ -+ if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) -+#ifdef CONFIG_CONCURRENT_MODE -+ || (padapter->iface_type != IFACE_PORT0) -+#endif -+ ) -+ { -+ return res; -+ } -+ -+ if(enqueue) -+ { -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(ph2c==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); -+ if(pdrvextra_cmd_parm==NULL){ -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pdrvextra_cmd_parm->ec_id = P2P_PS_WK_CID; -+ pdrvextra_cmd_parm->type_size = p2p_ps_state; -+ pdrvextra_cmd_parm->pbuf = NULL; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ } -+ else -+ { -+ p2p_ps_wk_hdl(padapter, p2p_ps_state); -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+#endif // CONFIG_P2P_PS -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void reset_ch_sitesurvey_timer_process (void *FunctionContext) -+#else -+static void reset_ch_sitesurvey_timer_process(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, wdinfo.reset_ch_sitesurvey); -+#endif -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+ -+ DBG_871X( "[%s] In\n", __FUNCTION__ ); -+ // Reset the operation channel information -+ pwdinfo->rx_invitereq_info.operation_ch[0] = 0; -+#ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->rx_invitereq_info.operation_ch[1] = 0; -+ pwdinfo->rx_invitereq_info.operation_ch[2] = 0; -+ pwdinfo->rx_invitereq_info.operation_ch[3] = 0; -+#endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->rx_invitereq_info.scan_op_ch_only = 0; -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void reset_ch_sitesurvey_timer_process2(void *FunctionContext) -+#else -+static void reset_ch_sitesurvey_timer_process2(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, wdinfo.reset_ch_sitesurvey2); -+#endif -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+ -+ DBG_871X( "[%s] In\n", __FUNCTION__ ); -+ // Reset the operation channel information -+ pwdinfo->p2p_info.operation_ch[0] = 0; -+#ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.operation_ch[1] = 0; -+ pwdinfo->p2p_info.operation_ch[2] = 0; -+ pwdinfo->p2p_info.operation_ch[3] = 0; -+#endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.scan_op_ch_only = 0; -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void restore_p2p_state_timer_process (void *FunctionContext) -+#else -+static void restore_p2p_state_timer_process(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, wdinfo.restore_p2p_state_timer); -+#endif -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+ -+ p2p_protocol_wk_cmd( adapter, P2P_RESTORE_STATE_WK ); -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void pre_tx_scan_timer_process (void *FunctionContext) -+#else -+static void pre_tx_scan_timer_process(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *) FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, wdinfo.pre_tx_scan_timer); -+#endif -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ u8 _status = 0; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ // Commented by Albert 20110805 -+ // Todo: Use the issuing probe request directly instead of using the rtw_sitesurvey_cmd!! -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) -+ { -+ if ( _TRUE == pwdinfo->tx_prov_disc_info.benable ) // the provision discovery request frame is trigger to send or not -+ { -+ p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_PROVDISC_PROCESS_WK ); -+ //issue_probereq_p2p(adapter, NULL); -+ //_set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ } -+ } -+ else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) -+ { -+ if ( _TRUE == pwdinfo->nego_req_info.benable ) -+ { -+ p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_NEGOREQ_PROCESS_WK ); -+ //issue_probereq_p2p(adapter, NULL); -+ //_set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ } -+ } -+ else if ( rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) ) -+ { -+ if ( _TRUE == pwdinfo->invitereq_info.benable ) -+ { -+ p2p_protocol_wk_cmd( adapter, P2P_PRE_TX_INVITEREQ_PROCESS_WK ); -+ } -+ } -+ else -+ { -+ DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); -+ } -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void find_phase_timer_process (void *FunctionContext) -+#else -+static void find_phase_timer_process(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, wdinfo.find_phase_timer); -+#endif -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+ -+ adapter->wdinfo.find_phase_state_exchange_cnt++; -+ -+ p2p_protocol_wk_cmd( adapter, P2P_FIND_PHASE_WK ); -+} -+ -+#ifdef CONFIG_CONCURRENT_MODE -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void ap_p2p_switch_timer_process (void *FunctionContext) -+#else -+void ap_p2p_switch_timer_process(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, wdinfo.ap_p2p_switch_timer); -+#endif -+ struct wifidirect_info *pwdinfo = &adapter->wdinfo; -+#ifdef CONFIG_IOCTL_CFG80211 -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); -+#endif -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ ATOMIC_SET(&pwdev_priv->switch_ch_to, 1); -+#endif -+ -+ p2p_protocol_wk_cmd( adapter, P2P_AP_P2P_CH_SWITCH_PROCESS_WK ); -+} -+#endif -+ -+void reset_global_wifidirect_info( _adapter* padapter ) -+{ -+ struct wifidirect_info *pwdinfo; -+ -+ pwdinfo = &padapter->wdinfo; -+ pwdinfo->persistent_supported = 0; -+ pwdinfo->session_available = _TRUE; -+ pwdinfo->wfd_tdls_enable = 0; -+ pwdinfo->wfd_tdls_weaksec = 0; -+} -+ -+#ifdef CONFIG_WFD -+int rtw_init_wifi_display_info(_adapter* padapter) -+{ -+ int res = _SUCCESS; -+ struct wifi_display_info *pwfd_info = &padapter->wfd_info; -+ -+ // Used in P2P and TDLS -+ pwfd_info->rtsp_ctrlport = 554; -+ pwfd_info->peer_rtsp_ctrlport = 0; // Reset to 0 -+ pwfd_info->wfd_enable = _FALSE; -+ pwfd_info->wfd_device_type = WFD_DEVINFO_PSINK; -+ pwfd_info->scan_result_type = SCAN_RESULT_P2P_ONLY; -+ -+ // Used in P2P -+ pwfd_info->peer_session_avail = _TRUE; -+ pwfd_info->wfd_pc = _FALSE; -+ -+ // Used in TDLS -+ _rtw_memset( pwfd_info->ip_address, 0x00, 4 ); -+ _rtw_memset( pwfd_info->peer_ip_address, 0x00, 4 ); -+ return res; -+ -+} -+#endif //CONFIG_WFD -+ -+void rtw_init_wifidirect_timers(_adapter* padapter) -+{ -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer( &pwdinfo->find_phase_timer, padapter->pnetdev, find_phase_timer_process, padapter ); -+ _init_timer( &pwdinfo->restore_p2p_state_timer, padapter->pnetdev, restore_p2p_state_timer_process, padapter ); -+ _init_timer( &pwdinfo->pre_tx_scan_timer, padapter->pnetdev, pre_tx_scan_timer_process, padapter ); -+ _init_timer( &pwdinfo->reset_ch_sitesurvey, padapter->pnetdev, reset_ch_sitesurvey_timer_process, padapter ); -+ _init_timer( &pwdinfo->reset_ch_sitesurvey2, padapter->pnetdev, reset_ch_sitesurvey_timer_process2, padapter ); -+#ifdef CONFIG_CONCURRENT_MODE -+ _init_timer( &pwdinfo->ap_p2p_switch_timer, padapter->pnetdev, ap_p2p_switch_timer_process, padapter ); -+#endif -+#else -+ timer_setup(&pwdinfo->find_phase_timer, find_phase_timer_process, 0); -+ timer_setup(&pwdinfo->restore_p2p_state_timer, restore_p2p_state_timer_process, 0); -+ timer_setup(&pwdinfo->pre_tx_scan_timer, pre_tx_scan_timer_process, 0); -+ timer_setup(&pwdinfo->reset_ch_sitesurvey, reset_ch_sitesurvey_timer_process, 0); -+ timer_setup(&pwdinfo->reset_ch_sitesurvey2, reset_ch_sitesurvey_timer_process2, 0); -+#ifdef CONFIG_CONCURRENT_MODE -+ timer_setup(&pwdinfo->ap_p2p_switch_timer, ap_p2p_switch_timer_process, 0); -+#endif -+#endif -+} -+ -+void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr) -+{ -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ -+ /*init device&interface address */ -+ if (dev_addr) { -+ _rtw_memcpy(pwdinfo->device_addr, dev_addr, ETH_ALEN); -+ } -+ if (iface_addr) { -+ _rtw_memcpy(pwdinfo->interface_addr, iface_addr, ETH_ALEN); -+ } -+#endif -+} -+ -+void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role) -+{ -+ struct wifidirect_info *pwdinfo; -+#ifdef CONFIG_WFD -+ struct wifi_display_info *pwfd_info = &padapter->wfd_info; -+#endif -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct wifidirect_info *pbuddy_wdinfo = NULL; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+ struct mlme_ext_priv *pbuddy_mlmeext = NULL; -+#endif -+ -+ pwdinfo = &padapter->wdinfo; -+ -+ pwdinfo->padapter = padapter; -+ -+ // 1, 6, 11 are the social channel defined in the WiFi Direct specification. -+ pwdinfo->social_chan[0] = 1; -+ pwdinfo->social_chan[1] = 6; -+ pwdinfo->social_chan[2] = 11; -+ pwdinfo->social_chan[3] = 0; // channel 0 for scanning ending in site survey function. -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (pbuddy_adapter) { -+ pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ } -+ -+ if ( ( check_buddy_fwstate(padapter, _FW_LINKED ) == _TRUE ) && -+ ( ( pbuddy_mlmeext->cur_channel == 1) || ( pbuddy_mlmeext->cur_channel == 6 ) || ( pbuddy_mlmeext->cur_channel == 11 ) ) -+ ) -+ { -+ // Use the AP's channel as the listen channel -+ // This will avoid the channel switch between AP's channel and listen channel. -+ pwdinfo->listen_channel = pbuddy_mlmeext->cur_channel; -+ } -+ else -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ // Use the channel 11 as the listen channel -+ pwdinfo->listen_channel = 11; -+ } -+ -+ if (role == P2P_ROLE_DEVICE) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ #ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) == _TRUE ) -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_IDLE); -+ } -+ else -+ #endif -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN); -+ } -+ pwdinfo->intent = 1; -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_LISTEN); -+ } -+ else if (role == P2P_ROLE_CLIENT) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ pwdinfo->intent = 1; -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ } -+ else if (role == P2P_ROLE_GO) -+ { -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ pwdinfo->intent = 15; -+ rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ } -+ -+// Use the OFDM rate in the P2P probe response frame. ( 6(B), 9(B), 12, 18, 24, 36, 48, 54 ) -+ pwdinfo->support_rate[0] = 0x8c; // 6(B) -+ pwdinfo->support_rate[1] = 0x92; // 9(B) -+ pwdinfo->support_rate[2] = 0x18; // 12 -+ pwdinfo->support_rate[3] = 0x24; // 18 -+ pwdinfo->support_rate[4] = 0x30; // 24 -+ pwdinfo->support_rate[5] = 0x48; // 36 -+ pwdinfo->support_rate[6] = 0x60; // 48 -+ pwdinfo->support_rate[7] = 0x6c; // 54 -+ -+ _rtw_memcpy( ( void* ) pwdinfo->p2p_wildcard_ssid, "DIRECT-", 7 ); -+ -+ _rtw_memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN ); -+ pwdinfo->device_name_len = 0; -+ -+ _rtw_memset( &pwdinfo->invitereq_info, 0x00, sizeof( struct tx_invite_req_info ) ); -+ pwdinfo->invitereq_info.token = 3; // Token used for P2P invitation request frame. -+ -+ _rtw_memset( &pwdinfo->inviteresp_info, 0x00, sizeof( struct tx_invite_resp_info ) ); -+ pwdinfo->inviteresp_info.token = 0; -+ -+ pwdinfo->profileindex = 0; -+ _rtw_memset( &pwdinfo->profileinfo[ 0 ], 0x00, sizeof( struct profile_info ) * P2P_MAX_PERSISTENT_GROUP_NUM ); -+ -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); -+ -+ pwdinfo->listen_dwell = ( u8 ) (( rtw_get_current_time() % 3 ) + 1); -+ //DBG_8192C( "[%s] listen_dwell time is %d00ms\n", __FUNCTION__, pwdinfo->listen_dwell ); -+ -+ _rtw_memset( &pwdinfo->tx_prov_disc_info, 0x00, sizeof( struct tx_provdisc_req_info ) ); -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE; -+ -+ _rtw_memset( &pwdinfo->nego_req_info, 0x00, sizeof( struct tx_nego_req_info ) ); -+ -+ pwdinfo->device_password_id_for_nego = WPS_DPID_PBC; -+ pwdinfo->negotiation_dialog_token = 1; -+ -+ _rtw_memset( pwdinfo->nego_ssid, 0x00, WLAN_SSID_MAXLEN ); -+ pwdinfo->nego_ssidlen = 0; -+ -+ pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO; -+#ifdef CONFIG_WFD -+ pwdinfo->supported_wps_cm = WPS_CONFIG_METHOD_DISPLAY | WPS_CONFIG_METHOD_PBC; -+ pwdinfo->wfd_info = pwfd_info; -+#else -+ pwdinfo->supported_wps_cm = WPS_CONFIG_METHOD_DISPLAY | WPS_CONFIG_METHOD_PBC | WPS_CONFIG_METHOD_KEYPAD; -+#endif //CONFIG_WFD -+ pwdinfo->channel_list_attr_len = 0; -+ _rtw_memset( pwdinfo->channel_list_attr, 0x00, 100 ); -+ -+ _rtw_memset( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, 0x00, 4 ); -+ _rtw_memset( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, '0', 3 ); -+ _rtw_memset( &pwdinfo->groupid_info, 0x00, sizeof( struct group_id_info ) ); -+#ifdef CONFIG_CONCURRENT_MODE -+#ifdef CONFIG_IOCTL_CFG80211 -+ pwdinfo->ext_listen_interval = 1000; //The interval to be available with legacy AP during p2p0-find/scan -+ pwdinfo->ext_listen_period = 3000; //The time period to be available for P2P during nego -+#else //!CONFIG_IOCTL_CFG80211 -+ //pwdinfo->ext_listen_interval = 3000; -+ //pwdinfo->ext_listen_period = 400; -+ pwdinfo->ext_listen_interval = 1000; -+ pwdinfo->ext_listen_period = 1000; -+#endif //!CONFIG_IOCTL_CFG80211 -+#endif -+ -+// Commented by Kurt 20130319 -+// For WiDi purpose: Use CFG80211 interface but controled WFD/RDS frame by driver itself. -+#ifdef CONFIG_IOCTL_CFG80211 -+ pwdinfo->driver_interface = DRIVER_CFG80211; -+#else -+ pwdinfo->driver_interface = DRIVER_WEXT; -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ pwdinfo->wfd_tdls_enable = 0; -+ _rtw_memset( pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN ); -+ _rtw_memset( pwdinfo->p2p_peer_device_addr, 0x00, ETH_ALEN ); -+ -+ pwdinfo->rx_invitereq_info.operation_ch[0] = 0; -+ pwdinfo->rx_invitereq_info.operation_ch[1] = 0; // Used to indicate the scan end in site survey function -+#ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->rx_invitereq_info.operation_ch[2] = 0; -+ pwdinfo->rx_invitereq_info.operation_ch[3] = 0; -+ pwdinfo->rx_invitereq_info.operation_ch[4] = 0; -+#endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->rx_invitereq_info.scan_op_ch_only = 0; -+ pwdinfo->p2p_info.operation_ch[0] = 0; -+ pwdinfo->p2p_info.operation_ch[1] = 0; // Used to indicate the scan end in site survey function -+#ifdef P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.operation_ch[2] = 0; -+ pwdinfo->p2p_info.operation_ch[3] = 0; -+ pwdinfo->p2p_info.operation_ch[4] = 0; -+#endif //P2P_OP_CHECK_SOCIAL_CH -+ pwdinfo->p2p_info.scan_op_ch_only = 0; -+} -+ -+#ifdef CONFIG_DBG_P2P -+ -+/** -+ * rtw_p2p_role_txt - Get the p2p role name as a text string -+ * @role: P2P role -+ * Returns: The state name as a printable text string -+ */ -+const char * rtw_p2p_role_txt(enum P2P_ROLE role) -+{ -+ switch (role) { -+ case P2P_ROLE_DISABLE: -+ return "P2P_ROLE_DISABLE"; -+ case P2P_ROLE_DEVICE: -+ return "P2P_ROLE_DEVICE"; -+ case P2P_ROLE_CLIENT: -+ return "P2P_ROLE_CLIENT"; -+ case P2P_ROLE_GO: -+ return "P2P_ROLE_GO"; -+ default: -+ return "UNKNOWN"; -+ } -+} -+ -+/** -+ * rtw_p2p_state_txt - Get the p2p state name as a text string -+ * @state: P2P state -+ * Returns: The state name as a printable text string -+ */ -+const char * rtw_p2p_state_txt(enum P2P_STATE state) -+{ -+ switch (state) { -+ case P2P_STATE_NONE: -+ return "P2P_STATE_NONE"; -+ case P2P_STATE_IDLE: -+ return "P2P_STATE_IDLE"; -+ case P2P_STATE_LISTEN: -+ return "P2P_STATE_LISTEN"; -+ case P2P_STATE_SCAN: -+ return "P2P_STATE_SCAN"; -+ case P2P_STATE_FIND_PHASE_LISTEN: -+ return "P2P_STATE_FIND_PHASE_LISTEN"; -+ case P2P_STATE_FIND_PHASE_SEARCH: -+ return "P2P_STATE_FIND_PHASE_SEARCH"; -+ case P2P_STATE_TX_PROVISION_DIS_REQ: -+ return "P2P_STATE_TX_PROVISION_DIS_REQ"; -+ case P2P_STATE_RX_PROVISION_DIS_RSP: -+ return "P2P_STATE_RX_PROVISION_DIS_RSP"; -+ case P2P_STATE_RX_PROVISION_DIS_REQ: -+ return "P2P_STATE_RX_PROVISION_DIS_REQ"; -+ case P2P_STATE_GONEGO_ING: -+ return "P2P_STATE_GONEGO_ING"; -+ case P2P_STATE_GONEGO_OK: -+ return "P2P_STATE_GONEGO_OK"; -+ case P2P_STATE_GONEGO_FAIL: -+ return "P2P_STATE_GONEGO_FAIL"; -+ case P2P_STATE_RECV_INVITE_REQ_MATCH: -+ return "P2P_STATE_RECV_INVITE_REQ_MATCH"; -+ case P2P_STATE_PROVISIONING_ING: -+ return "P2P_STATE_PROVISIONING_ING"; -+ case P2P_STATE_PROVISIONING_DONE: -+ return "P2P_STATE_PROVISIONING_DONE"; -+ case P2P_STATE_TX_INVITE_REQ: -+ return "P2P_STATE_TX_INVITE_REQ"; -+ case P2P_STATE_RX_INVITE_RESP_OK: -+ return "P2P_STATE_RX_INVITE_RESP_OK"; -+ case P2P_STATE_RECV_INVITE_REQ_DISMATCH: -+ return "P2P_STATE_RECV_INVITE_REQ_DISMATCH"; -+ case P2P_STATE_RECV_INVITE_REQ_GO: -+ return "P2P_STATE_RECV_INVITE_REQ_GO"; -+ case P2P_STATE_RECV_INVITE_REQ_JOIN: -+ return "P2P_STATE_RECV_INVITE_REQ_JOIN"; -+ case P2P_STATE_RX_INVITE_RESP_FAIL: -+ return "P2P_STATE_RX_INVITE_RESP_FAIL"; -+ case P2P_STATE_RX_INFOR_NOREADY: -+ return "P2P_STATE_RX_INFOR_NOREADY"; -+ case P2P_STATE_TX_INFOR_NOREADY: -+ return "P2P_STATE_TX_INFOR_NOREADY"; -+ default: -+ return "UNKNOWN"; -+ } -+} -+ -+void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line) -+{ -+ if(!_rtw_p2p_chk_state(wdinfo, state)) { -+ enum P2P_STATE old_state = _rtw_p2p_state(wdinfo); -+ _rtw_p2p_set_state(wdinfo, state); -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state from %s to %s\n", caller, line -+ , rtw_p2p_state_txt(old_state), rtw_p2p_state_txt(_rtw_p2p_state(wdinfo)) -+ ); -+ } else { -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state to same state %s\n", caller, line -+ , rtw_p2p_state_txt(_rtw_p2p_state(wdinfo)) -+ ); -+ } -+} -+void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line) -+{ -+ if(_rtw_p2p_pre_state(wdinfo) != state) { -+ enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo); -+ _rtw_p2p_set_pre_state(wdinfo, state); -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state from %s to %s\n", caller, line -+ , rtw_p2p_state_txt(old_state), rtw_p2p_state_txt(_rtw_p2p_pre_state(wdinfo)) -+ ); -+ } else { -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state to same state %s\n", caller, line -+ , rtw_p2p_state_txt(_rtw_p2p_pre_state(wdinfo)) -+ ); -+ } -+} -+#if 0 -+void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *caller, int line) -+{ -+ if(wdinfo->pre_p2p_state != -1) { -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d restore from %s to %s\n", caller, line -+ , p2p_state_str[wdinfo->p2p_state], p2p_state_str[wdinfo->pre_p2p_state] -+ ); -+ _rtw_p2p_restore_state(wdinfo); -+ } else { -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d restore no pre state, cur state %s\n", caller, line -+ , p2p_state_str[wdinfo->p2p_state] -+ ); -+ } -+} -+#endif -+void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, const char *caller, int line) -+{ -+ if(wdinfo->role != role) { -+ enum P2P_ROLE old_role = wdinfo->role; -+ _rtw_p2p_set_role(wdinfo, role); -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role from %s to %s\n", caller, line -+ , rtw_p2p_role_txt(old_role), rtw_p2p_role_txt(wdinfo->role) -+ ); -+ } else { -+ DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role to same role %s\n", caller, line -+ , rtw_p2p_role_txt(wdinfo->role) -+ ); -+ } -+} -+#endif //CONFIG_DBG_P2P -+ -+ -+int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) -+{ -+ int ret = _SUCCESS; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+ if (role == P2P_ROLE_DEVICE || role == P2P_ROLE_CLIENT|| role == P2P_ROLE_GO) -+ { -+ u8 channel, ch_offset; -+ u16 bwmode; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ // Commented by Albert 2011/12/30 -+ // The driver just supports 1 P2P group operation. -+ // So, this function will do nothing if the buddy adapter had enabled the P2P function. -+ if(!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE)) -+ { -+ // The buddy adapter had enabled the P2P function. -+ return ret; -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ //leave IPS/Autosuspend -+ if (_FAIL == rtw_pwr_wakeup(padapter)) { -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ -+ // Added by Albert 2011/03/22 -+ // In the P2P mode, the driver should not support the b mode. -+ // So, the Tx packet shouldn't use the CCK rate -+ update_tx_basic_rate(padapter, WIRELESS_11AGN); -+ -+ //Enable P2P function -+ init_wifidirect_info(padapter, role); -+ } -+ else if (role == P2P_ROLE_DISABLE) -+ { -+#ifdef CONFIG_INTEL_WIDI -+ if( padapter->mlmepriv.p2p_reject_disable == _TRUE ) -+ return ret; -+#endif //CONFIG_INTEL_WIDI -+ -+ if (_FAIL == rtw_pwr_wakeup(padapter)) { -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ //Disable P2P function -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ _cancel_timer_ex( &pwdinfo->find_phase_timer ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ _cancel_timer_ex( &pwdinfo->pre_tx_scan_timer); -+ _cancel_timer_ex( &pwdinfo->reset_ch_sitesurvey); -+ _cancel_timer_ex( &pwdinfo->reset_ch_sitesurvey2); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ reset_ch_sitesurvey_timer_process( padapter ); -+ reset_ch_sitesurvey_timer_process2( padapter ); -+#else -+ reset_ch_sitesurvey_timer_process(&padapter->wdinfo.reset_ch_sitesurvey); -+ reset_ch_sitesurvey_timer_process(&padapter->wdinfo.reset_ch_sitesurvey2); -+#endif -+ #ifdef CONFIG_CONCURRENT_MODE -+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer); -+ #endif -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DISABLE); -+ _rtw_memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req_info)); -+ } -+ -+ //Restore to initial setting. -+ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); -+ -+#ifdef CONFIG_INTEL_WIDI -+ rtw_reset_widi_info(padapter); -+#endif //CONFIG_INTEL_WIDI -+ -+ //For WiDi purpose. -+#ifdef CONFIG_IOCTL_CFG80211 -+ pwdinfo->driver_interface = DRIVER_CFG80211; -+#else -+ pwdinfo->driver_interface = DRIVER_WEXT; -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ } -+ -+exit: -+ return ret; -+} -+ -+#endif //CONFIG_P2P -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c -@@ -0,0 +1,1551 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_PWRCTRL_C_ -+ -+#include -+#include -+#include -+#include -+ -+ -+#ifdef CONFIG_IPS -+void _ips_enter(_adapter * padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+ pwrpriv->bips_processing = _TRUE; -+ -+ // syn ips_mode with request -+ pwrpriv->ips_mode = pwrpriv->ips_mode_req; -+ -+ pwrpriv->ips_enter_cnts++; -+ DBG_871X("==>ips_enter cnts:%d\n",pwrpriv->ips_enter_cnts); -+ -+ if(rf_off == pwrpriv->change_rfpwrstate) -+ { -+ if(pwrpriv->ips_mode == IPS_LEVEL_2) -+ pwrpriv->bkeepfwalive = _TRUE; -+ -+ rtw_ips_pwr_down(padapter); -+ pwrpriv->rf_pwrstate = rf_off; -+ } -+ pwrpriv->bips_processing = _FALSE; -+ -+} -+ -+void ips_enter(_adapter * padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrpriv->lock); -+ _ips_enter(padapter); -+ _exit_pwrlock(&pwrpriv->lock); -+} -+ -+int _ips_leave(_adapter * padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ int result = _SUCCESS; -+ -+ if((pwrpriv->rf_pwrstate == rf_off) &&(!pwrpriv->bips_processing)) -+ { -+ pwrpriv->bips_processing = _TRUE; -+ pwrpriv->change_rfpwrstate = rf_on; -+ pwrpriv->ips_leave_cnts++; -+ DBG_871X("==>ips_leave cnts:%d\n",pwrpriv->ips_leave_cnts); -+ -+ if ((result = rtw_ips_pwr_up(padapter)) == _SUCCESS) { -+ pwrpriv->rf_pwrstate = rf_on; -+ } -+ -+ DBG_871X("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c)); -+ pwrpriv->bips_processing = _FALSE; -+ -+ pwrpriv->bkeepfwalive = _FALSE; -+ } -+ -+ return result; -+} -+ -+int ips_leave(_adapter * padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ int ret; -+ -+ _enter_pwrlock(&pwrpriv->lock); -+ ret = _ips_leave(padapter); -+ _exit_pwrlock(&pwrpriv->lock); -+ -+ return ret; -+} -+#endif /* CONFIG_IPS */ -+ -+#ifdef CONFIG_AUTOSUSPEND -+extern void autosuspend_enter(_adapter* padapter); -+extern int autoresume_enter(_adapter* padapter); -+#endif -+ -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+int rtw_hw_suspend(_adapter *padapter ); -+int rtw_hw_resume(_adapter *padapter); -+#endif -+ -+bool rtw_pwr_unassociated_idle(_adapter *adapter) -+{ -+ _adapter *buddy = adapter->pbuddy_adapter; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &(adapter->wdinfo); -+#ifdef CONFIG_IOCTL_CFG80211 -+ struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &adapter->cfg80211_wdinfo; -+#endif -+#endif -+ -+ bool ret = _FALSE; -+ -+ if (adapter->pwrctrlpriv.ips_deny_time >= rtw_get_current_time()) { -+ //DBG_871X("%s ips_deny_time\n", __func__); -+ goto exit; -+ } -+ -+ if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) -+ || check_fwstate(pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) -+ || check_fwstate(pmlmepriv, WIFI_AP_STATE) -+ || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) -+ #if defined(CONFIG_P2P) && defined(CONFIG_IOCTL_CFG80211) && defined(CONFIG_P2P_IPS) -+ || pcfg80211_wdinfo->is_ro_ch -+ #elif defined(CONFIG_P2P) -+ || !rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) -+ #endif -+ ) { -+ goto exit; -+ } -+ -+ /* consider buddy, if exist */ -+ if (buddy) { -+ struct mlme_priv *b_pmlmepriv = &(buddy->mlmepriv); -+ #ifdef CONFIG_P2P -+ struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo); -+ #ifdef CONFIG_IOCTL_CFG80211 -+ struct cfg80211_wifidirect_info *b_pcfg80211_wdinfo = &buddy->cfg80211_wdinfo; -+ #endif -+ #endif -+ -+ if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) -+ || check_fwstate(b_pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) -+ || check_fwstate(b_pmlmepriv, WIFI_AP_STATE) -+ || check_fwstate(b_pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) -+ #if defined(CONFIG_P2P) && defined(CONFIG_IOCTL_CFG80211) && defined(CONFIG_P2P_IPS) -+ || b_pcfg80211_wdinfo->is_ro_ch -+ #elif defined(CONFIG_P2P) -+ || !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE) -+ #endif -+ ) { -+ goto exit; -+ } -+ } -+ -+#ifdef CONFIG_INTEL_PROXIM -+ if(adapter->proximity.proxim_on==_TRUE){ -+ return; -+ } -+#endif -+ -+ ret = _TRUE; -+ -+exit: -+ return ret; -+} -+ -+#if defined (PLATFORM_LINUX)||defined (PLATFORM_FREEBSD) -+void rtw_ps_processor(_adapter*padapter) -+{ -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+#endif //CONFIG_P2P -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+ rt_rf_power_state rfpwrstate; -+#endif //SUPPORT_HW_RFOFF_DETECTED -+ -+ pwrpriv->ps_processing = _TRUE; -+ -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+ if(pwrpriv->bips_processing == _TRUE) -+ goto exit; -+ -+ //DBG_871X("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca)); -+ if(padapter->pwrctrlpriv.bHWPwrPindetect) -+ { -+ #ifdef CONFIG_AUTOSUSPEND -+ if(padapter->registrypriv.usbss_enable) -+ { -+ if(pwrpriv->rf_pwrstate == rf_on) -+ { -+ if(padapter->net_closed == _TRUE) -+ pwrpriv->ps_flag = _TRUE; -+ -+ rfpwrstate = RfOnOffDetect(padapter); -+ DBG_871X("@@@@- #1 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); -+ if(rfpwrstate!= pwrpriv->rf_pwrstate) -+ { -+ if(rfpwrstate == rf_off) -+ { -+ pwrpriv->change_rfpwrstate = rf_off; -+ -+ pwrpriv->bkeepfwalive = _TRUE; -+ pwrpriv->brfoffbyhw = _TRUE; -+ -+ autosuspend_enter(padapter); -+ } -+ } -+ } -+ } -+ else -+ #endif //CONFIG_AUTOSUSPEND -+ { -+ rfpwrstate = RfOnOffDetect(padapter); -+ DBG_871X("@@@@- #2 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); -+ -+ if(rfpwrstate!= pwrpriv->rf_pwrstate) -+ { -+ if(rfpwrstate == rf_off) -+ { -+ pwrpriv->change_rfpwrstate = rf_off; -+ pwrpriv->brfoffbyhw = _TRUE; -+ padapter->bCardDisableWOHSM = _TRUE; -+ rtw_hw_suspend(padapter ); -+ } -+ else -+ { -+ pwrpriv->change_rfpwrstate = rf_on; -+ rtw_hw_resume(padapter ); -+ } -+ DBG_871X("current rf_pwrstate(%s)\n",(pwrpriv->rf_pwrstate == rf_off)?"rf_off":"rf_on"); -+ } -+ } -+ pwrpriv->pwr_state_check_cnts ++; -+ } -+#endif //SUPPORT_HW_RFOFF_DETECTED -+ -+ if (pwrpriv->ips_mode_req == IPS_NONE -+ #ifdef CONFIG_CONCURRENT_MODE -+ || padapter->pbuddy_adapter->pwrctrlpriv.ips_mode_req == IPS_NONE -+ #endif -+ ) -+ goto exit; -+ -+ if (rtw_pwr_unassociated_idle(padapter) == _FALSE) -+ goto exit; -+ -+ if((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0)) -+ { -+ DBG_871X("==>%s .fw_state(%x)\n",__FUNCTION__,get_fwstate(pmlmepriv)); -+ pwrpriv->change_rfpwrstate = rf_off; -+ -+ #ifdef CONFIG_AUTOSUSPEND -+ if(padapter->registrypriv.usbss_enable) -+ { -+ if(pwrpriv->bHWPwrPindetect) -+ pwrpriv->bkeepfwalive = _TRUE; -+ -+ if(padapter->net_closed == _TRUE) -+ pwrpriv->ps_flag = _TRUE; -+ -+ padapter->bCardDisableWOHSM = _TRUE; -+ autosuspend_enter(padapter); -+ } -+ else if(pwrpriv->bHWPwrPindetect) -+ { -+ } -+ else -+ #endif //CONFIG_AUTOSUSPEND -+ { -+ #ifdef CONFIG_IPS -+ ips_enter(padapter); -+ #endif -+ } -+ } -+exit: -+ rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv); -+ pwrpriv->ps_processing = _FALSE; -+ return; -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void pwr_state_check_handler(RTW_TIMER_HDL_ARGS) -+#else -+void pwr_state_check_handler(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *padapter = (_adapter *)FunctionContext; -+#else -+ _adapter *padapter = from_timer(padapter, t, pwrctrlpriv.pwr_state_check_timer); -+#endif -+ rtw_ps_cmd(padapter); -+} -+#endif -+ -+ -+#ifdef CONFIG_LPS -+/* -+ * -+ * Parameters -+ * padapter -+ * pslv power state level, only could be PS_STATE_S0 ~ PS_STATE_S4 -+ * -+ */ -+void rtw_set_rpwm(PADAPTER padapter, u8 pslv) -+{ -+ u8 rpwm; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+_func_enter_; -+ -+ pslv = PS_STATE(pslv); -+ -+ if (pwrpriv->rpwm == pslv) { -+ RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_, -+ ("%s: Already set rpwm[0x%02x]!\n", __FUNCTION__, pslv)); -+ return; -+ } -+ -+ if ((padapter->bDriverStopped == _TRUE) || -+ (padapter->bSurpriseRemoved == _TRUE)) { -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, -+ ("%s: bDriverStopped(%d) bSurpriseRemoved(%d)\n", -+ __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ return; -+ } -+ -+ rpwm = pslv | pwrpriv->tog; -+#ifdef CONFIG_LPS_LCLK -+ if ((pwrpriv->cpwm < PS_STATE_S2) && (pslv >= PS_STATE_S2)) -+ rpwm |= PS_ACK; -+#endif -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_set_rpwm: rpwm=0x%02x cpwm=0x%02x\n", rpwm, pwrpriv->cpwm)); -+ -+ pwrpriv->rpwm = pslv; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_SET_RPWM, (u8 *)(&rpwm)); -+ -+ pwrpriv->tog += 0x80; -+ -+ if (!(rpwm & PS_ACK)) pwrpriv->cpwm = pslv; -+ -+_func_exit_; -+} -+ -+u8 PS_RDY_CHECK(_adapter * padapter); -+u8 PS_RDY_CHECK(_adapter * padapter) -+{ -+ u32 curr_time, delta_time; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ curr_time = rtw_get_current_time(); -+ -+ delta_time = curr_time -pwrpriv->DelayLPSLastTimeStamp; -+ -+ if(delta_time < LPS_DELAY_TIME) -+ { -+ return _FALSE; -+ } -+ -+ if ((check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) || -+ (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_UNDER_WPS) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) ) -+ return _FALSE; -+ -+ if(_TRUE == pwrpriv->bInSuspend ) -+ return _FALSE; -+ -+ if( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) ) -+ { -+ DBG_871X("Group handshake still in progress !!!\n"); -+ return _FALSE; -+ } -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if (!rtw_cfg80211_pwr_mgmt(padapter)) -+ return _FALSE; -+#endif -+ -+ return _TRUE; -+} -+ -+void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+#endif //CONFIG_P2P -+#ifdef CONFIG_TDLS -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ _irqL irqL; -+ int i, j; -+ _list *plist, *phead; -+ struct sta_info *ptdls_sta; -+#endif //CONFIG_TDLS -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("%s: PowerMode=%d Smart_PS=%d\n", -+ __FUNCTION__, ps_mode, smart_ps)); -+ -+ if(ps_mode > PM_Card_Disable) { -+ RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_,("ps_mode:%d error\n", ps_mode)); -+ return; -+ } -+ -+ if((pwrpriv->pwr_mode == ps_mode) && -+ (pwrpriv->smart_ps == smart_ps)){ -+ return; -+ } -+ -+ //if(pwrpriv->pwr_mode == PS_MODE_ACTIVE) -+ if(ps_mode == PS_MODE_ACTIVE) -+ { -+#ifdef CONFIG_P2P_PS -+ if(pwdinfo->opp_ps == 0) -+#endif // CONFIG_P2P_PS -+ { -+#ifdef CONFIG_LPS_LCLK -+ _enter_pwrlock(&pwrpriv->lock); -+#endif -+ DBG_871X("rtw_set_ps_mode(): Busy Traffic , Leave 802.11 power save..\n"); -+ -+#ifdef CONFIG_TDLS -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(i=0; i< NUM_STA; i++) -+ { -+ phead = &(pstapriv->sta_hash[i]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list); -+ -+ if( ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE ) -+ issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 0); -+ plist = get_next(plist); -+ } -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+#endif //CONFIG_TDLS -+ -+ pwrpriv->smart_ps = smart_ps; -+ pwrpriv->pwr_mode = ps_mode; -+ -+ rtw_set_rpwm(padapter, PS_STATE_S4); -+#ifdef CONFIG_LPS_LCLK -+{ -+ u32 n = 0; -+ while (pwrpriv->cpwm != PS_STATE_S4) { -+ n++; -+ if (n == 10000) break; -+ if (padapter->bSurpriseRemoved == _TRUE) break; -+ rtw_msleep_os(1); -+ } -+ if (n == 10000) -+ printk(KERN_ERR "%s: wait CPWM to S4 too long! cpwm=0x%02x\n", __func__, pwrpriv->cpwm); -+} -+#endif -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); -+ pwrpriv->bFwCurrentInPSMode = _FALSE; -+#ifdef CONFIG_LPS_LCLK -+ _exit_pwrlock(&pwrpriv->lock); -+#endif -+ } -+ } -+ else -+ { -+ if(PS_RDY_CHECK(padapter)) -+ { -+#ifdef CONFIG_LPS_LCLK -+ _enter_pwrlock(&pwrpriv->lock); -+#endif -+ DBG_871X("rtw_set_ps_mode(): Enter 802.11 power save mode...\n"); -+ -+#ifdef CONFIG_TDLS -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(i=0; i< NUM_STA; i++) -+ { -+ phead = &(pstapriv->sta_hash[i]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ ptdls_sta = LIST_CONTAINOR(plist, struct sta_info, hash_list); -+ -+ if( ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE ) -+ issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 1); -+ plist = get_next(plist); -+ } -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+#endif //CONFIG_TDLS -+ -+ pwrpriv->smart_ps = smart_ps; -+ pwrpriv->pwr_mode = ps_mode; -+ pwrpriv->bFwCurrentInPSMode = _TRUE; -+ rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); -+#ifdef CONFIG_P2P_PS -+ // Set CTWindow after LPS -+ if(pwdinfo->opp_ps == 1) -+ p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 0); -+#endif // CONFIG_P2P_PS -+#ifdef CONFIG_LPS_LCLK -+ if (pwrpriv->alives == 0) -+ rtw_set_rpwm(padapter, PS_STATE_S0); -+#else -+ rtw_set_rpwm(padapter, PS_STATE_S2); -+#endif -+#ifdef CONFIG_LPS_LCLK -+ _exit_pwrlock(&pwrpriv->lock); -+#endif -+ } -+ //else -+ //{ -+ // pwrpriv->pwr_mode = PS_MODE_ACTIVE; -+ //} -+ } -+ -+_func_exit_; -+} -+ -+ -+// -+// Description: -+// Enter the leisure power save mode. -+// -+void LPS_Enter(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ _adapter *buddy = padapter->pbuddy_adapter; -+ -+_func_enter_; -+ -+// DBG_871X("+LeisurePSEnter\n"); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->iface_type != IFACE_PORT0) -+ return; /* Skip power saving for concurrent mode port 1*/ -+ -+ /* consider buddy, if exist */ -+ if (buddy) { -+ struct mlme_priv *b_pmlmepriv = &(buddy->mlmepriv); -+ #ifdef CONFIG_P2P -+ struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo); -+ #ifdef CONFIG_IOCTL_CFG80211 -+ struct cfg80211_wifidirect_info *b_pcfg80211_wdinfo = &buddy->cfg80211_wdinfo; -+ #endif -+ #endif -+ -+ if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) -+ || check_fwstate(b_pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) -+ || check_fwstate(b_pmlmepriv, WIFI_AP_STATE) -+ || check_fwstate(b_pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) -+ #if defined(CONFIG_P2P) && defined(CONFIG_IOCTL_CFG80211) && defined(CONFIG_P2P_IPS) -+ || b_pcfg80211_wdinfo->is_ro_ch -+ #elif defined(CONFIG_P2P) -+ || !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE) -+ #endif -+ || rtw_is_scan_deny(buddy) -+ ) { -+ return; -+ } -+ } -+#endif -+ -+#ifdef CONFIG_INTEL_PROXIM -+ if(padapter->proximity.proxim_on==_TRUE){ -+ return; -+ } -+#endif -+ if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) || -+ (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) ) -+ return; -+ -+ if(_TRUE == pwrpriv->bInSuspend ) -+ return ; -+ -+ if (pwrpriv->bLeisurePs) -+ { -+ // Idle for a while if we connect to AP a while ago. -+ if(pwrpriv->LpsIdleCount >= 2) // 4 Sec -+ { -+ if(pwrpriv->pwr_mode == PS_MODE_ACTIVE) -+ { -+ rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, 2); -+ } -+ } -+ else -+ pwrpriv->LpsIdleCount++; -+ } -+ -+// DBG_871X("-LeisurePSEnter\n"); -+ -+_func_exit_; -+} -+ -+ -+// -+// Description: -+// Leave the leisure power save mode. -+// -+void LPS_Leave(PADAPTER padapter) -+{ -+#define LPS_LEAVE_TIMEOUT_MS 100 -+ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ u32 start_time; -+ BOOLEAN bAwake = _FALSE; -+ -+_func_enter_; -+ -+// DBG_871X("+LeisurePSLeave\n"); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->iface_type != IFACE_PORT0) -+ return; /* Skip power saving for concurrent mode port 1*/ -+#endif -+ -+ if (pwrpriv->bLeisurePs) -+ { -+ if(pwrpriv->pwr_mode != PS_MODE_ACTIVE) -+ { -+ rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0); -+ -+ if(pwrpriv->pwr_mode == PS_MODE_ACTIVE) -+ { -+ start_time = rtw_get_current_time(); -+ while(1) -+ { -+ rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bAwake)); -+ -+ if(bAwake || padapter->bSurpriseRemoved) -+ break; -+ -+ if(rtw_get_passing_time_ms(start_time)>LPS_LEAVE_TIMEOUT_MS) -+ { -+ DBG_871X("Wait for FW LPS leave more than %u ms!!!\n", LPS_LEAVE_TIMEOUT_MS); -+ break; -+ } -+ rtw_usleep_os(100); -+ } -+ } -+ } -+ } -+ -+ -+// DBG_871X("-LeisurePSLeave\n"); -+ -+_func_exit_; -+} -+ -+#endif -+ -+// -+// Description: Leave all power save mode: LPS, FwLPS, IPS if needed. -+// Move code to function by tynli. 2010.03.26. -+// -+void LeaveAllPowerSaveMode(IN PADAPTER Adapter) -+{ -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ -+_func_enter_; -+ -+ //DBG_871X("%s.....\n",__FUNCTION__); -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { //connect -+#ifdef CONFIG_P2P_PS -+ p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, 0); -+#endif // CONFIG_P2P_PS -+#ifdef CONFIG_LPS -+ //DBG_871X("==> leave LPS.......\n"); -+ LPS_Leave(Adapter); -+#endif -+ } -+ else -+ { -+ if(Adapter->pwrctrlpriv.rf_pwrstate== rf_off) -+ { -+ #ifdef CONFIG_AUTOSUSPEND -+ if(Adapter->registrypriv.usbss_enable) -+ { -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ usb_disable_autosuspend(adapter_to_dvobj(Adapter)->pusbdev); -+ #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,34)) -+ adapter_to_dvobj(Adapter)->pusbdev->autosuspend_disabled = Adapter->bDisableAutosuspend;//autosuspend disabled by the user -+ #endif -+ } -+ else -+ #endif -+ { -+ /* -+ #ifdef CONFIG_IPS -+ if(_FALSE == ips_leave(Adapter)) -+ { -+ DBG_871X("======> ips_leave fail.............\n"); -+ } -+ #endif -+ */ -+ } -+ } -+ } -+ -+_func_exit_; -+} -+ -+#ifdef CONFIG_LPS_LCLK -+/* -+ * Caller:ISR handler... -+ * -+ * This will be called when CPWM interrupt is up. -+ * -+ * using to update cpwn of drv; and drv willl make a decision to up or down pwr level -+ */ -+void cpwm_int_hdl( -+ PADAPTER padapter, -+ struct reportpwrstate_parm *preportpwrstate) -+{ -+ struct pwrctrl_priv *pwrpriv; -+ -+ -+_func_enter_; -+ -+ pwrpriv = &padapter->pwrctrlpriv; -+#if 0 -+ if (pwrpriv->cpwm_tog == (preportpwrstate->state & PS_TOGGLE)) { -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, -+ ("cpwm_int_hdl: tog(old)=0x%02x cpwm(new)=0x%02x toggle bit didn't change!?\n", -+ pwrpriv->cpwm_tog, preportpwrstate->state)); -+ goto exit; -+ } -+#endif -+// _enter_pwrlock(&pwrpriv->lock); -+ -+ pwrpriv->cpwm = PS_STATE(preportpwrstate->state); -+ pwrpriv->cpwm_tog = preportpwrstate->state & PS_TOGGLE; -+ -+ if (pwrpriv->cpwm >= PS_STATE_S2) { -+ if (pwrpriv->alives & CMD_ALIVE) -+ _rtw_up_sema(&padapter->cmdpriv.cmd_queue_sema); -+ -+ if (pwrpriv->alives & XMIT_ALIVE) -+ _rtw_up_sema(&padapter->xmitpriv.xmit_sema); -+ } -+ -+// _exit_pwrlock(&pwrpriv->lock); -+ -+exit: -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("cpwm_int_hdl: cpwm=0x%02x\n", pwrpriv->cpwm)); -+ -+_func_exit_; -+} -+ -+__inline static void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) -+{ -+ pwrctrl->alives |= tag; -+} -+ -+__inline static void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) -+{ -+ pwrctrl->alives &= ~tag; -+} -+ -+/* -+ * Caller: rtw_xmit_thread -+ * -+ * Check if the fw_pwrstate is okay for xmit. -+ * If not (cpwm is less than S3), then the sub-routine -+ * will raise the cpwm to be greater than or equal to S3. -+ * -+ * Calling Context: Passive -+ * -+ * Return Value: -+ * _SUCCESS rtw_xmit_thread can write fifo/txcmd afterwards. -+ * _FAIL rtw_xmit_thread can not do anything. -+ */ -+s32 rtw_register_tx_alive(PADAPTER padapter) -+{ -+ s32 res; -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ res = _SUCCESS; -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ register_task_alive(pwrctrl, XMIT_ALIVE); -+ -+ if (pwrctrl->bFwCurrentInPSMode == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, -+ ("rtw_register_tx_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ -+ if (pwrctrl->cpwm < PS_STATE_S2) { -+ if (pwrctrl->rpwm < PS_STATE_S2) -+ rtw_set_rpwm(padapter, PS_STATE_S2); -+ res = _FAIL; -+ } -+ } -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+ -+ return res; -+} -+ -+/* -+ * Caller: rtw_cmd_thread -+ * -+ * Check if the fw_pwrstate is okay for issuing cmd. -+ * If not (cpwm should be is less than S2), then the sub-routine -+ * will raise the cpwm to be greater than or equal to S2. -+ * -+ * Calling Context: Passive -+ * -+ * Return Value: -+ * _SUCCESS rtw_cmd_thread can issue cmds to firmware afterwards. -+ * _FAIL rtw_cmd_thread can not do anything. -+ */ -+s32 rtw_register_cmd_alive(PADAPTER padapter) -+{ -+ s32 res; -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ res = _SUCCESS; -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ register_task_alive(pwrctrl, CMD_ALIVE); -+ -+ if (pwrctrl->bFwCurrentInPSMode == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_register_cmd_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ -+ if (pwrctrl->cpwm < PS_STATE_S2) { -+ if (pwrctrl->rpwm < PS_STATE_S2) -+ rtw_set_rpwm(padapter, PS_STATE_S2); -+ res = _FAIL; -+ } -+ } -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+ -+ return res; -+} -+ -+/* -+ * Caller: rx_isr -+ * -+ * Calling Context: Dispatch/ISR -+ * -+ * Return Value: -+ * _SUCCESS -+ * _FAIL -+ */ -+s32 rtw_register_rx_alive(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ register_task_alive(pwrctrl, RECV_ALIVE); -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_register_rx_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+/* -+ * Caller: evt_isr or evt_thread -+ * -+ * Calling Context: Dispatch/ISR or Passive -+ * -+ * Return Value: -+ * _SUCCESS -+ * _FAIL -+ */ -+s32 rtw_register_evt_alive(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ register_task_alive(pwrctrl, EVT_ALIVE); -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_register_evt_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+/* -+ * Caller: ISR -+ * -+ * If ISR's txdone, -+ * No more pkts for TX, -+ * Then driver shall call this fun. to power down firmware again. -+ */ -+void rtw_unregister_tx_alive(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ unregister_task_alive(pwrctrl, XMIT_ALIVE); -+ -+ if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && -+ (pwrctrl->bFwCurrentInPSMode == _TRUE)) -+ { -+ if ((pwrctrl->alives == 0) && -+ (pwrctrl->cpwm > PS_STATE_S0)) -+ { -+ rtw_set_rpwm(padapter, PS_STATE_S0); -+ } -+ -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_unregister_tx_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ } -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+} -+ -+/* -+ * Caller: ISR -+ * -+ * If all commands have been done, -+ * and no more command to do, -+ * then driver shall call this fun. to power down firmware again. -+ */ -+void rtw_unregister_cmd_alive(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ unregister_task_alive(pwrctrl, CMD_ALIVE); -+ -+ if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && -+ (pwrctrl->bFwCurrentInPSMode == _TRUE)) -+ { -+ if ((pwrctrl->alives == 0) && -+ (pwrctrl->cpwm > PS_STATE_S0)) -+ { -+ rtw_set_rpwm(padapter, PS_STATE_S0); -+ } -+ -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_unregister_cmd_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ } -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+} -+ -+/* -+ * Caller: ISR -+ */ -+void rtw_unregister_rx_alive(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ _enter_pwrlock(&pwrctrl->lock); -+ -+ unregister_task_alive(pwrctrl, RECV_ALIVE); -+ -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_unregister_rx_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+} -+ -+void rtw_unregister_evt_alive(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrl; -+ -+_func_enter_; -+ -+ pwrctrl = &padapter->pwrctrlpriv; -+ -+ unregister_task_alive(pwrctrl, EVT_ALIVE); -+ -+ RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, -+ ("rtw_unregister_evt_alive: cpwm=0x%02x alives=0x%08x\n", -+ pwrctrl->cpwm, pwrctrl->alives)); -+ -+ _exit_pwrlock(&pwrctrl->lock); -+ -+_func_exit_; -+} -+#endif /* CONFIG_LPS_LCLK */ -+ -+#ifdef CONFIG_RESUME_IN_WORKQUEUE -+static void resume_workitem_callback(struct work_struct *work); -+#endif //CONFIG_RESUME_IN_WORKQUEUE -+ -+void rtw_init_pwrctrl_priv(PADAPTER padapter) -+{ -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ -+_func_enter_; -+ -+#ifdef PLATFORM_WINDOWS -+ pwrctrlpriv->pnp_current_pwr_state=NdisDeviceStateD0; -+#endif -+ -+ _init_pwrlock(&pwrctrlpriv->lock); -+ pwrctrlpriv->rf_pwrstate = rf_on; -+ pwrctrlpriv->ips_enter_cnts=0; -+ pwrctrlpriv->ips_leave_cnts=0; -+ -+ pwrctrlpriv->ips_mode = padapter->registrypriv.ips_mode; -+ pwrctrlpriv->ips_mode_req = padapter->registrypriv.ips_mode; -+ -+ pwrctrlpriv->pwr_state_check_interval = RTW_PWR_STATE_CHK_INTERVAL; -+ pwrctrlpriv->pwr_state_check_cnts = 0; -+ pwrctrlpriv->bInternalAutoSuspend = _FALSE; -+ pwrctrlpriv->bInSuspend = _FALSE; -+ pwrctrlpriv->bkeepfwalive = _FALSE; -+ -+#ifdef CONFIG_AUTOSUSPEND -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+ pwrctrlpriv->pwr_state_check_interval = (pwrctrlpriv->bHWPwrPindetect) ?1000:2000; -+#endif -+#endif -+ -+ pwrctrlpriv->LpsIdleCount = 0; -+ //pwrctrlpriv->FWCtrlPSMode =padapter->registrypriv.power_mgnt;// PS_MODE_MIN; -+ pwrctrlpriv->power_mgnt =padapter->registrypriv.power_mgnt;// PS_MODE_MIN; -+ pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?_TRUE:_FALSE; -+ -+ pwrctrlpriv->bFwCurrentInPSMode = _FALSE; -+ -+ pwrctrlpriv->cpwm = PS_STATE_S4; -+ -+ pwrctrlpriv->pwr_mode = PS_MODE_ACTIVE; -+ -+ -+ pwrctrlpriv->smart_ps = 0; -+ -+ pwrctrlpriv->tog = 0x80; -+ -+#ifdef PLATFORM_LINUX -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&(pwrctrlpriv->pwr_state_check_timer), padapter->pnetdev, pwr_state_check_handler, (u8 *)padapter); -+#else -+ timer_setup(&pwrctrlpriv->pwr_state_check_timer, pwr_state_check_handler, 0); -+#endif -+#endif -+ -+ #ifdef CONFIG_RESUME_IN_WORKQUEUE -+ _init_workitem(&pwrctrlpriv->resume_work, resume_workitem_callback, NULL); -+ pwrctrlpriv->rtw_workqueue = create_singlethread_workqueue("rtw_workqueue"); -+ #endif //CONFIG_RESUME_IN_WORKQUEUE -+ -+ #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) -+ pwrctrlpriv->early_suspend.suspend = NULL; -+ rtw_register_early_suspend(pwrctrlpriv); -+ #endif //CONFIG_HAS_EARLYSUSPEND || CONFIG_ANDROID_POWER -+ -+ -+_func_exit_; -+ -+} -+ -+ -+void rtw_free_pwrctrl_priv(PADAPTER adapter) -+{ -+ struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv; -+ -+_func_enter_; -+ -+ //_rtw_memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct pwrctrl_priv)); -+ -+ -+ #ifdef CONFIG_RESUME_IN_WORKQUEUE -+ if (pwrctrlpriv->rtw_workqueue) { -+ flush_workqueue(pwrctrlpriv->rtw_workqueue); -+ destroy_workqueue(pwrctrlpriv->rtw_workqueue); -+ } -+ #endif -+ -+ -+ #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) -+ rtw_unregister_early_suspend(pwrctrlpriv); -+ #endif //CONFIG_HAS_EARLYSUSPEND || CONFIG_ANDROID_POWER -+ -+ _free_pwrlock(&pwrctrlpriv->lock); -+ -+_func_exit_; -+} -+ -+#ifdef CONFIG_RESUME_IN_WORKQUEUE -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+extern int rtw_resume_process(_adapter *padapter); -+#endif -+static void resume_workitem_callback(struct work_struct *work) -+{ -+ struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work); -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+ DBG_871X("%s\n",__FUNCTION__); -+ -+ #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+ rtw_resume_process(adapter); -+ #endif -+ -+} -+ -+void rtw_resume_in_workqueue(struct pwrctrl_priv *pwrpriv) -+{ -+ // accquire system's suspend lock preventing from falliing asleep while resume in workqueue -+ rtw_lock_suspend(); -+ -+ #if 1 -+ queue_work(pwrpriv->rtw_workqueue, &pwrpriv->resume_work); -+ #else -+ _set_workitem(&pwrpriv->resume_work); -+ #endif -+} -+#endif //CONFIG_RESUME_IN_WORKQUEUE -+ -+#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) -+inline bool rtw_is_earlysuspend_registered(struct pwrctrl_priv *pwrpriv) -+{ -+ return (pwrpriv->early_suspend.suspend) ? _TRUE : _FALSE; -+} -+ -+inline bool rtw_is_do_late_resume(struct pwrctrl_priv *pwrpriv) -+{ -+ return (pwrpriv->do_late_resume) ? _TRUE : _FALSE; -+} -+ -+inline void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable) -+{ -+ pwrpriv->do_late_resume = enable; -+} -+#endif -+ -+#ifdef CONFIG_HAS_EARLYSUSPEND -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+extern int rtw_resume_process(_adapter *padapter); -+#endif -+static void rtw_early_suspend(struct early_suspend *h) -+{ -+ struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); -+ DBG_871X("%s\n",__FUNCTION__); -+ -+ rtw_set_do_late_resume(pwrpriv, _FALSE); -+} -+ -+static void rtw_late_resume(struct early_suspend *h) -+{ -+ struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+ DBG_871X("%s\n",__FUNCTION__); -+ if(pwrpriv->do_late_resume) { -+ #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+ rtw_set_do_late_resume(pwrpriv, _FALSE); -+ rtw_resume_process(adapter); -+ #endif -+ } -+} -+ -+void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) -+{ -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+#if defined(CONFIG_CONCURRENT_MODE) -+ if (adapter->adapter_type != PRIMARY_ADAPTER) -+ return; -+#endif -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ //jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit -+ pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; -+ pwrpriv->early_suspend.suspend = rtw_early_suspend; -+ pwrpriv->early_suspend.resume = rtw_late_resume; -+ register_early_suspend(&pwrpriv->early_suspend); -+ -+ -+} -+ -+void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) -+{ -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+#if defined(CONFIG_CONCURRENT_MODE) -+ if (adapter->adapter_type != PRIMARY_ADAPTER) -+ return; -+#endif -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ rtw_set_do_late_resume(pwrpriv, _FALSE); -+ -+ if (pwrpriv->early_suspend.suspend) -+ unregister_early_suspend(&pwrpriv->early_suspend); -+ -+ pwrpriv->early_suspend.suspend = NULL; -+ pwrpriv->early_suspend.resume = NULL; -+} -+#endif //CONFIG_HAS_EARLYSUSPEND -+ -+#ifdef CONFIG_ANDROID_POWER -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+extern int rtw_resume_process(PADAPTER padapter); -+#endif -+static void rtw_early_suspend(android_early_suspend_t *h) -+{ -+ struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); -+ DBG_871X("%s\n",__FUNCTION__); -+ -+ rtw_set_do_late_resume(pwrpriv, _FALSE); -+} -+ -+static void rtw_late_resume(android_early_suspend_t *h) -+{ -+ struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+ DBG_871X("%s\n",__FUNCTION__); -+ if(pwrpriv->do_late_resume) { -+ #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+ rtw_set_do_late_resume(pwrpriv, _FALSE); -+ rtw_resume_process(adapter); -+ #endif -+ } -+} -+ -+void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) -+{ -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+#if defined(CONFIG_CONCURRENT_MODE) -+ if (adapter->adapter_type != PRIMARY_ADAPTER) -+ return; -+#endif -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ //jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit -+ pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; -+ pwrpriv->early_suspend.suspend = rtw_early_suspend; -+ pwrpriv->early_suspend.resume = rtw_late_resume; -+ android_register_early_suspend(&pwrpriv->early_suspend); -+} -+ -+void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) -+{ -+ _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); -+ -+#if defined(CONFIG_CONCURRENT_MODE) -+ if (adapter->adapter_type != PRIMARY_ADAPTER) -+ return; -+#endif -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ rtw_set_do_late_resume(pwrpriv, _FALSE); -+ -+ if (pwrpriv->early_suspend.suspend) -+ android_unregister_early_suspend(&pwrpriv->early_suspend); -+ -+ pwrpriv->early_suspend.suspend = NULL; -+ pwrpriv->early_suspend.resume = NULL; -+} -+#endif //CONFIG_ANDROID_POWER -+ -+u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) -+{ -+ u8 bResult = _TRUE; -+ -+ rtw_hal_intf_ps_func(padapter,efunc_id,val); -+ -+ return bResult; -+} -+ -+ -+inline void rtw_set_ips_deny(_adapter *padapter, u32 ms) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms); -+} -+ -+/* -+* rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend -+* @adapter: pointer to _adapter structure -+* @ips_deffer_ms: the ms wiil prevent from falling into IPS after wakeup -+* Return _SUCCESS or _FAIL -+*/ -+int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ int ret = _SUCCESS; -+ u32 start = rtw_get_current_time(); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->pbuddy_adapter) -+ LeaveAllPowerSaveMode(padapter->pbuddy_adapter); -+ -+ if ((padapter->isprimary == _FALSE) && padapter->pbuddy_adapter){ -+ padapter = padapter->pbuddy_adapter; -+ pwrpriv = &padapter->pwrctrlpriv; -+ pmlmepriv = &padapter->mlmepriv; -+ } -+#endif -+ -+ if (pwrpriv->ips_deny_time < rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms)) -+ pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms); -+ -+ if (pwrpriv->ps_processing) { -+ DBG_871X("%s wait ps_processing...\n", __func__); -+ while (pwrpriv->ps_processing && rtw_get_passing_time_ms(start) <= 3000) -+ rtw_msleep_os(10); -+ if (pwrpriv->ps_processing) -+ DBG_871X("%s wait ps_processing timeout\n", __func__); -+ else -+ DBG_871X("%s wait ps_processing done\n", __func__); -+ } -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+ if (rtw_hal_sreset_inprogress(padapter)) { -+ DBG_871X("%s wait sreset_inprogress...\n", __func__); -+ while (rtw_hal_sreset_inprogress(padapter) && rtw_get_passing_time_ms(start) <= 4000) -+ rtw_msleep_os(10); -+ if (rtw_hal_sreset_inprogress(padapter)) -+ DBG_871X("%s wait sreset_inprogress timeout\n", __func__); -+ else -+ DBG_871X("%s wait sreset_inprogress done\n", __func__); -+ } -+#endif -+ -+ if (pwrpriv->bInternalAutoSuspend == _FALSE && pwrpriv->bInSuspend) { -+ DBG_871X("%s wait bInSuspend...\n", __func__); -+ while (pwrpriv->bInSuspend -+ && ((rtw_get_passing_time_ms(start) <= 3000 && !rtw_is_do_late_resume(pwrpriv)) -+ || (rtw_get_passing_time_ms(start) <= 500 && rtw_is_do_late_resume(pwrpriv))) -+ ) { -+ rtw_msleep_os(10); -+ } -+ if (pwrpriv->bInSuspend) -+ DBG_871X("%s wait bInSuspend timeout\n", __func__); -+ else -+ DBG_871X("%s wait bInSuspend done\n", __func__); -+ } -+ -+ //System suspend is not allowed to wakeup -+ if((pwrpriv->bInternalAutoSuspend == _FALSE) && (_TRUE == pwrpriv->bInSuspend )){ -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ //block??? -+ if((pwrpriv->bInternalAutoSuspend == _TRUE) && (padapter->net_closed == _TRUE)) { -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ //I think this should be check in IPS, LPS, autosuspend functions... -+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ ret = _SUCCESS; -+ goto exit; -+ } -+ -+ if(rf_off == pwrpriv->rf_pwrstate ) -+ { -+#ifdef CONFIG_USB_HCI -+#ifdef CONFIG_AUTOSUSPEND -+ if(pwrpriv->brfoffbyhw==_TRUE) -+ { -+ DBG_8192C("hw still in rf_off state ...........\n"); -+ ret = _FAIL; -+ goto exit; -+ } -+ else if(padapter->registrypriv.usbss_enable) -+ { -+ DBG_8192C("%s call autoresume_enter....\n",__FUNCTION__); -+ if(_FAIL == autoresume_enter(padapter)) -+ { -+ DBG_8192C("======> autoresume fail.............\n"); -+ ret = _FAIL; -+ goto exit; -+ } -+ } -+ else -+#endif -+#endif -+ { -+#ifdef CONFIG_IPS -+ DBG_8192C("%s call ips_leave....\n",__FUNCTION__); -+ if(_FAIL == ips_leave(padapter)) -+ { -+ DBG_8192C("======> ips_leave fail.............\n"); -+ ret = _FAIL; -+ goto exit; -+ } -+#endif -+ } -+ } -+ -+ //TODO: the following checking need to be merged... -+ if(padapter->bDriverStopped -+ || !padapter->bup -+ || !padapter->hw_init_completed -+ ){ -+ DBG_8192C("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n" -+ , caller -+ , padapter->bDriverStopped -+ , padapter->bup -+ , padapter->hw_init_completed); -+ ret= _FALSE; -+ goto exit; -+ } -+ -+exit: -+ if (pwrpriv->ips_deny_time < rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms)) -+ pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms); -+ return ret; -+ -+} -+ -+int rtw_pm_set_lps(_adapter *padapter, u8 mode) -+{ -+ int ret = 0; -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ -+ if ( mode < PS_MODE_NUM ) -+ { -+ if(pwrctrlpriv->power_mgnt !=mode) -+ { -+ if(PS_MODE_ACTIVE == mode) -+ { -+ LeaveAllPowerSaveMode(padapter); -+ } -+ else -+ { -+ pwrctrlpriv->LpsIdleCount = 2; -+ } -+ pwrctrlpriv->power_mgnt = mode; -+ pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?_TRUE:_FALSE; -+ } -+ } -+ else -+ { -+ ret = -EINVAL; -+ } -+ -+ return ret; -+} -+ -+int rtw_pm_set_ips(_adapter *padapter, u8 mode) -+{ -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ -+ if( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) { -+ rtw_ips_mode_req(pwrctrlpriv, mode); -+ DBG_871X("%s %s\n", __FUNCTION__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2"); -+ return 0; -+ } -+ else if(mode ==IPS_NONE){ -+ rtw_ips_mode_req(pwrctrlpriv, mode); -+ DBG_871X("%s %s\n", __FUNCTION__, "IPS_NONE"); -+ if((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) ) -+ return -EFAULT; -+ } -+ else { -+ return -EINVAL; -+ } -+ return 0; -+} -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c -@@ -0,0 +1,4306 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_RECV_C_ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#include -+#include -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS); -+#else -+void rtw_signal_stat_timer_hdl(struct timer_list *t); -+#endif -+ -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+ -+void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) -+{ -+ -+ -+_func_enter_; -+ -+ _rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv)); -+ -+ _rtw_spinlock_init(&psta_recvpriv->lock); -+ -+ //for(i=0; iblk_strms[i]); -+ -+ _rtw_init_queue(&psta_recvpriv->defrag_q); -+ -+_func_exit_; -+ -+} -+ -+sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter) -+{ -+ sint i; -+ -+ union recv_frame *precvframe; -+ -+ sint res=_SUCCESS; -+ -+_func_enter_; -+ -+ // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). -+ //_rtw_memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); -+ -+ _rtw_spinlock_init(&precvpriv->lock); -+ -+ _rtw_init_queue(&precvpriv->free_recv_queue); -+ _rtw_init_queue(&precvpriv->recv_pending_queue); -+ _rtw_init_queue(&precvpriv->uc_swdec_pending_queue); -+ -+ precvpriv->adapter = padapter; -+ -+ precvpriv->free_recvframe_cnt = NR_RECVFRAME; -+ -+ rtw_os_recv_resource_init(precvpriv, padapter); -+ -+ precvpriv->pallocated_frame_buf = rtw_zvmalloc(NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); -+ -+ if(precvpriv->pallocated_frame_buf==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ //_rtw_memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); -+ -+ precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ); -+ //precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ - -+ // ((SIZE_PTR) (precvpriv->pallocated_frame_buf) &(RXFRAME_ALIGN_SZ-1)); -+ -+ precvframe = (union recv_frame*) precvpriv->precv_frame_buf; -+ -+ -+ for(i=0; i < NR_RECVFRAME ; i++) -+ { -+ _rtw_init_listhead(&(precvframe->u.list)); -+ -+ rtw_list_insert_tail(&(precvframe->u.list), &(precvpriv->free_recv_queue.queue)); -+ -+ res = rtw_os_recv_resource_alloc(padapter, precvframe); -+ -+ precvframe->u.hdr.adapter =padapter; -+ precvframe++; -+ -+ } -+ -+#ifdef CONFIG_USB_HCI -+ -+ precvpriv->rx_pending_cnt=1; -+ -+ _rtw_init_sema(&precvpriv->allrxreturnevt, 0); -+ -+#endif -+ -+ res = rtw_hal_init_recv_priv(padapter); -+ -+ precvpriv->recvbuf_skb_alloc_fail_cnt = 0; -+ precvpriv->recvbuf_null_cnt = 0; -+ precvpriv->read_port_complete_EINPROGRESS_cnt = 0; -+ precvpriv->read_port_complete_other_urb_err_cnt = 0; -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ #ifdef PLATFORM_LINUX -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&precvpriv->signal_stat_timer, padapter->pnetdev, RTW_TIMER_HDL_NAME(signal_stat), padapter); -+ #else -+ timer_setup(&precvpriv->signal_stat_timer, RTW_TIMER_HDL_NAME(signal_stat), 0); -+ #endif -+ #elif defined(PLATFORM_OS_CE) || defined(PLATFORM_WINDOWS) -+ _init_timer(&precvpriv->signal_stat_timer, padapter->hndis_adapter, RTW_TIMER_HDL_NAME(signal_stat), padapter); -+ #endif -+ -+ precvpriv->signal_stat_sampling_interval = 1000; //ms -+ //precvpriv->signal_stat_converging_constant = 5000; //ms -+ -+ rtw_set_signal_stat_timer(precvpriv); -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv); -+void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv) -+{ -+ _rtw_spinlock_free(&precvpriv->lock); -+#ifdef CONFIG_RECV_THREAD_MODE -+ _rtw_free_sema(&precvpriv->recv_sema); -+ _rtw_free_sema(&precvpriv->terminate_recvthread_sema); -+#endif -+ -+ _rtw_spinlock_free(&precvpriv->free_recv_queue.lock); -+ _rtw_spinlock_free(&precvpriv->recv_pending_queue.lock); -+ -+ _rtw_spinlock_free(&precvpriv->free_recv_buf_queue.lock); -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -+ _rtw_spinlock_free(&precvpriv->recv_buf_pending_queue.lock); -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_RX -+} -+ -+void _rtw_free_recv_priv (struct recv_priv *precvpriv) -+{ -+ _adapter *padapter = precvpriv->adapter; -+ -+_func_enter_; -+ -+ rtw_free_uc_swdec_pending_queue(padapter); -+ -+ rtw_mfree_recv_priv_lock(precvpriv); -+ -+ rtw_os_recv_resource_free(precvpriv); -+ -+ if(precvpriv->pallocated_frame_buf) { -+ rtw_vmfree(precvpriv->pallocated_frame_buf, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); -+ } -+ -+ rtw_hal_free_recv_priv(padapter); -+ -+_func_exit_; -+ -+} -+ -+union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue) -+{ -+ -+ union recv_frame *precvframe; -+ _list *plist, *phead; -+ _adapter *padapter; -+ struct recv_priv *precvpriv; -+_func_enter_; -+ -+ if(_rtw_queue_empty(pfree_recv_queue) == _TRUE) -+ { -+ precvframe = NULL; -+ } -+ else -+ { -+ phead = get_list_head(pfree_recv_queue); -+ -+ plist = get_next(phead); -+ -+ precvframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ -+ rtw_list_delete(&precvframe->u.hdr.list); -+ padapter=precvframe->u.hdr.adapter; -+ if(padapter !=NULL){ -+ precvpriv=&padapter->recvpriv; -+ if(pfree_recv_queue == &precvpriv->free_recv_queue) -+ precvpriv->free_recvframe_cnt--; -+ } -+ } -+ -+_func_exit_; -+ -+ return precvframe; -+ -+} -+ -+union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue) -+{ -+ _irqL irqL; -+ union recv_frame *precvframe; -+ -+ _enter_critical_bh(&pfree_recv_queue->lock, &irqL); -+ -+ precvframe = _rtw_alloc_recvframe(pfree_recv_queue); -+ -+ _exit_critical_bh(&pfree_recv_queue->lock, &irqL); -+ -+ return precvframe; -+} -+ -+void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpriv) -+{ -+ /* Perry: This can be removed */ -+ _rtw_init_listhead(&precvframe->u.hdr.list); -+ -+ precvframe->u.hdr.len=0; -+} -+ -+int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue) -+{ -+ _irqL irqL; -+ _adapter *padapter=precvframe->u.hdr.adapter; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+_func_enter_; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->adapter_type > PRIMARY_ADAPTER) -+ { -+ padapter = padapter->pbuddy_adapter;//get primary_padapter -+ precvpriv = &padapter->recvpriv; -+ pfree_recv_queue = &precvpriv->free_recv_queue; -+ precvframe->u.hdr.adapter = padapter; -+ } -+#endif -+ -+ -+#ifdef PLATFORM_WINDOWS -+ rtw_os_read_port(padapter, precvframe->u.hdr.precvbuf); -+#endif -+ -+#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) -+ -+ if(precvframe->u.hdr.pkt) -+ { -+#ifdef CONFIG_BSD_RX_USE_MBUF -+ m_freem(precvframe->u.hdr.pkt); -+#else // CONFIG_BSD_RX_USE_MBUF -+ rtw_skb_free(precvframe->u.hdr.pkt);//free skb by driver -+#endif // CONFIG_BSD_RX_USE_MBUF -+ precvframe->u.hdr.pkt = NULL; -+ } -+ -+#endif //defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) -+ -+ _enter_critical_bh(&pfree_recv_queue->lock, &irqL); -+ -+ rtw_list_delete(&(precvframe->u.hdr.list)); -+ -+ rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(pfree_recv_queue)); -+ -+ if(padapter !=NULL){ -+ if(pfree_recv_queue == &precvpriv->free_recv_queue) -+ precvpriv->free_recvframe_cnt++; -+ } -+ -+ _exit_critical_bh(&pfree_recv_queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+ -+ -+ -+sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue) -+{ -+ -+ _adapter *padapter=precvframe->u.hdr.adapter; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+_func_enter_; -+ -+ //_rtw_init_listhead(&(precvframe->u.hdr.list)); -+ rtw_list_delete(&(precvframe->u.hdr.list)); -+ -+ -+ rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(queue)); -+ -+ if (padapter != NULL) { -+ if (queue == &precvpriv->free_recv_queue) -+ precvpriv->free_recvframe_cnt++; -+ } -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue) -+{ -+ sint ret; -+ _irqL irqL; -+ -+ //_spinlock(&pfree_recv_queue->lock); -+ _enter_critical_bh(&queue->lock, &irqL); -+ ret = _rtw_enqueue_recvframe(precvframe, queue); -+ //_rtw_spinunlock(&pfree_recv_queue->lock); -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+ return ret; -+} -+ -+/* -+sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue) -+{ -+ return rtw_free_recvframe(precvframe, queue); -+} -+*/ -+ -+ -+ -+ -+/* -+caller : defrag ; recvframe_chk_defrag in recv_thread (passive) -+pframequeue: defrag_queue : will be accessed in recv_thread (passive) -+ -+using spinlock to protect -+ -+*/ -+ -+void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue) -+{ -+ union recv_frame *precvframe; -+ _list *plist, *phead; -+ -+_func_enter_; -+ _rtw_spinlock(&pframequeue->lock); -+ -+ phead = get_list_head(pframequeue); -+ plist = get_next(phead); -+ -+ while(rtw_end_of_queue_search(phead, plist) == _FALSE) -+ { -+ precvframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ -+ plist = get_next(plist); -+ -+ //rtw_list_delete(&precvframe->u.hdr.list); // will do this in rtw_free_recvframe() -+ -+ rtw_free_recvframe(precvframe, pfree_recv_queue); -+ } -+ -+ _rtw_spinunlock(&pframequeue->lock); -+ -+_func_exit_; -+ -+} -+ -+u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter) -+{ -+ u32 cnt = 0; -+ union recv_frame *pending_frame; -+ while((pending_frame=rtw_alloc_recvframe(&adapter->recvpriv.uc_swdec_pending_queue))) { -+ rtw_free_recvframe(pending_frame, &adapter->recvpriv.free_recv_queue); -+ DBG_871X("%s: dequeue uc_swdec_pending_queue\n", __func__); -+ cnt++; -+ } -+ -+ return cnt; -+} -+ -+ -+sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue) -+{ -+ _irqL irqL; -+ -+ _enter_critical(&queue->lock, &irqL); -+ -+ rtw_list_delete(&precvbuf->list); -+ rtw_list_insert_head(&precvbuf->list, get_list_head(queue)); -+ -+ _exit_critical(&queue->lock, &irqL); -+ -+ return _SUCCESS; -+} -+ -+sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue) -+{ -+ _irqL irqL; -+ -+ _enter_critical(&queue->lock, &irqL); -+ -+ rtw_list_delete(&precvbuf->list); -+ -+ rtw_list_insert_tail(&precvbuf->list, get_list_head(queue)); -+ -+ _exit_critical(&queue->lock, &irqL); -+ -+ -+ return _SUCCESS; -+ -+} -+ -+struct recv_buf *rtw_dequeue_recvbuf (_queue *queue) -+{ -+ _irqL irqL; -+ struct recv_buf *precvbuf; -+ _list *plist, *phead; -+ -+ _enter_critical(&queue->lock, &irqL); -+ -+ if(_rtw_queue_empty(queue) == _TRUE) -+ { -+ precvbuf = NULL; -+ } -+ else -+ { -+ phead = get_list_head(queue); -+ -+ plist = get_next(phead); -+ -+ precvbuf = LIST_CONTAINOR(plist, struct recv_buf, list); -+ -+ rtw_list_delete(&precvbuf->list); -+ -+ } -+ -+ _exit_critical(&queue->lock, &irqL); -+ -+ -+ return precvbuf; -+ -+} -+ -+sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe); -+sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe){ -+ -+ sint i,res=_SUCCESS; -+ u32 datalen; -+ u8 miccode[8]; -+ u8 bmic_err=_FALSE,brpt_micerror = _TRUE; -+ u8 *pframe, *payload,*pframemic; -+ u8 *mickey; -+ //u8 *iv,rxdata_key_idx=0; -+ struct sta_info *stainfo; -+ struct rx_pkt_attrib *prxattrib=&precvframe->u.hdr.attrib; -+ struct security_priv *psecuritypriv=&adapter->securitypriv; -+ -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+_func_enter_; -+ -+ stainfo=rtw_get_stainfo(&adapter->stapriv ,&prxattrib->ta[0]); -+ -+ if(prxattrib->encrypt ==_TKIP_) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic:prxattrib->encrypt ==_TKIP_\n")); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic:da=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", -+ prxattrib->ra[0],prxattrib->ra[1],prxattrib->ra[2],prxattrib->ra[3],prxattrib->ra[4],prxattrib->ra[5])); -+ -+ //calculate mic code -+ if(stainfo!= NULL) -+ { -+ if(IS_MCAST(prxattrib->ra)) -+ { -+ //mickey=&psecuritypriv->dot118021XGrprxmickey.skey[0]; -+ //iv = precvframe->u.hdr.rx_data+prxattrib->hdrlen; -+ //rxdata_key_idx =( ((iv[3])>>6)&0x3) ; -+ mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0]; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key \n")); -+ //DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n", -+ // psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx); -+ -+ if(psecuritypriv->binstallGrpkey==_FALSE) -+ { -+ res=_FAIL; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n")); -+ DBG_871X("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"); -+ goto exit; -+ } -+ } -+ else{ -+ mickey=&stainfo->dot11tkiprxmickey.skey[0]; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic: unicast key \n")); -+ } -+ -+ datalen=precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;//icv_len included the mic code -+ pframe=precvframe->u.hdr.rx_data; -+ payload=pframe+prxattrib->hdrlen+prxattrib->iv_len; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n prxattrib->iv_len=%d prxattrib->icv_len=%d\n",prxattrib->iv_len,prxattrib->icv_len)); -+ -+ //rtw_seccalctkipmic(&stainfo->dot11tkiprxmickey.skey[0],pframe,payload, datalen ,&miccode[0],(unsigned char)prxattrib->priority); //care the length of the data -+ -+ rtw_seccalctkipmic(mickey,pframe,payload, datalen ,&miccode[0],(unsigned char)prxattrib->priority); //care the length of the data -+ -+ pframemic=payload+datalen; -+ -+ bmic_err=_FALSE; -+ -+ for(i=0;i<8;i++){ -+ if(miccode[i] != *(pframemic+i)){ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x) ",i,miccode[i],i,*(pframemic+i))); -+ bmic_err=_TRUE; -+ } -+ } -+ -+ -+ if(bmic_err==_TRUE){ -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n *(pframemic-8)-*(pframemic-1)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", -+ *(pframemic-8),*(pframemic-7),*(pframemic-6),*(pframemic-5),*(pframemic-4),*(pframemic-3),*(pframemic-2),*(pframemic-1))); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n *(pframemic-16)-*(pframemic-9)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n", -+ *(pframemic-16),*(pframemic-15),*(pframemic-14),*(pframemic-13),*(pframemic-12),*(pframemic-11),*(pframemic-10),*(pframemic-9))); -+ -+ { -+ uint i; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet (len=%d)======\n",precvframe->u.hdr.len)); -+ for(i=0;iu.hdr.len;i=i+8){ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x", -+ *(precvframe->u.hdr.rx_data+i),*(precvframe->u.hdr.rx_data+i+1), -+ *(precvframe->u.hdr.rx_data+i+2),*(precvframe->u.hdr.rx_data+i+3), -+ *(precvframe->u.hdr.rx_data+i+4),*(precvframe->u.hdr.rx_data+i+5), -+ *(precvframe->u.hdr.rx_data+i+6),*(precvframe->u.hdr.rx_data+i+7))); -+ } -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet end [len=%d]======\n",precvframe->u.hdr.len)); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n hrdlen=%d, \n",prxattrib->hdrlen)); -+ } -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ra=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey=%d ", -+ prxattrib->ra[0],prxattrib->ra[1],prxattrib->ra[2], -+ prxattrib->ra[3],prxattrib->ra[4],prxattrib->ra[5],psecuritypriv->binstallGrpkey)); -+ -+ // double check key_index for some timing issue , -+ // cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue -+ if((IS_MCAST(prxattrib->ra)==_TRUE) && (prxattrib->key_index != pmlmeinfo->key_index )) -+ brpt_micerror = _FALSE; -+ -+ if(brpt_micerror == _TRUE) -+ { -+ rtw_handle_tkip_mic_err(adapter,(u8)IS_MCAST(prxattrib->ra)); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d \n", brpt_micerror)); -+ DBG_871X(" mic error :brpt_micerror=%d\n", brpt_micerror); -+ } -+ -+ res=_FAIL; -+ -+ } -+ else{ -+ //mic checked ok -+ if((psecuritypriv->bcheck_grpkey ==_FALSE)&&(IS_MCAST(prxattrib->ra)==_TRUE)){ -+ psecuritypriv->bcheck_grpkey =_TRUE; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("psecuritypriv->bcheck_grpkey =_TRUE")); -+ } -+ } -+ -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic: rtw_get_stainfo==NULL!!!\n")); -+ } -+ -+ recvframe_pull_tail(precvframe, 8); -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+//decrypt and set the ivlen,icvlen of the recv_frame -+union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame); -+union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame) -+{ -+ -+ struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ union recv_frame *return_packet=precv_frame; -+ u32 res=_SUCCESS; -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("prxstat->decrypted=%x prxattrib->encrypt = 0x%03x\n",prxattrib->bdecrypted,prxattrib->encrypt)); -+ -+ if(prxattrib->encrypt>0) -+ { -+ u8 *iv = precv_frame->u.hdr.rx_data+prxattrib->hdrlen; -+ prxattrib->key_index = ( ((iv[3])>>6)&0x3) ; -+ -+ if(prxattrib->key_index > WEP_KEYS) -+ { -+ DBG_871X("prxattrib->key_index(%d) > WEP_KEYS \n", prxattrib->key_index); -+ -+ switch(prxattrib->encrypt){ -+ case _WEP40_: -+ case _WEP104_: -+ prxattrib->key_index = psecuritypriv->dot11PrivacyKeyIndex; -+ break; -+ case _TKIP_: -+ case _AES_: -+ default: -+ prxattrib->key_index = psecuritypriv->dot118021XGrpKeyid; -+ break; -+ } -+ } -+ } -+ -+ if((prxattrib->encrypt>0) && ((prxattrib->bdecrypted==0) ||(psecuritypriv->sw_decrypt==_TRUE))) -+ { -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(!IS_MCAST(prxattrib->ra))//bc/mc packets use sw decryption for concurrent mode -+#endif -+ psecuritypriv->hw_decrypted=_FALSE; -+ -+ #ifdef DBG_RX_DECRYPTOR -+ DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" -+ , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); -+ #endif -+ -+ switch(prxattrib->encrypt){ -+ case _WEP40_: -+ case _WEP104_: -+ rtw_wep_decrypt(padapter, (u8 *)precv_frame); -+ break; -+ case _TKIP_: -+ res = rtw_tkip_decrypt(padapter, (u8 *)precv_frame); -+ break; -+ case _AES_: -+ res = rtw_aes_decrypt(padapter, (u8 * )precv_frame); -+ break; -+ default: -+ break; -+ } -+ } -+ else if(prxattrib->bdecrypted==1 -+ && prxattrib->encrypt >0 -+ && (psecuritypriv->busetkipkey==1 || prxattrib->encrypt !=_TKIP_ ) -+ ) -+ { -+#if 0 -+ if((prxstat->icv==1)&&(prxattrib->encrypt!=_AES_)) -+ { -+ psecuritypriv->hw_decrypted=_FALSE; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("psecuritypriv->hw_decrypted=_FALSE")); -+ -+ rtw_free_recvframe(precv_frame, &padapter->recvpriv.free_recv_queue); -+ -+ return_packet=NULL; -+ -+ } -+ else -+#endif -+ { -+ psecuritypriv->hw_decrypted=_TRUE; -+ #ifdef DBG_RX_DECRYPTOR -+ DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" -+ , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); -+ #endif -+ -+ } -+ } -+ else { -+ #ifdef DBG_RX_DECRYPTOR -+ DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, psecuritypriv->hw_decrypted:%d\n" -+ , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); -+ #endif -+ } -+ -+ if(res == _FAIL) -+ { -+ rtw_free_recvframe(return_packet,&padapter->recvpriv.free_recv_queue); -+ return_packet = NULL; -+ -+ } -+ //recvframe_chkmic(adapter, precv_frame); //move to recvframme_defrag function -+ -+_func_exit_; -+ -+ return return_packet; -+ -+} -+//###set the security information in the recv_frame -+union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame); -+union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame) -+{ -+ u8 *psta_addr,*ptr; -+ uint auth_alg; -+ struct recv_frame_hdr *pfhdr; -+ struct sta_info * psta; -+ struct sta_priv *pstapriv ; -+ union recv_frame * prtnframe; -+ u16 ether_type=0; -+ u16 eapol_type = 0x888e;//for Funia BD's WPA issue -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ -+_func_enter_; -+ -+ pstapriv = &adapter->stapriv; -+ ptr = get_recvframe_data(precv_frame); -+ pfhdr = &precv_frame->u.hdr; -+ psta_addr = pfhdr->attrib.ta; -+ psta = rtw_get_stainfo(pstapriv, psta_addr); -+ -+ auth_alg = adapter->securitypriv.dot11AuthAlgrthm; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:adapter->securitypriv.dot11AuthAlgrthm= 0x%d\n",adapter->securitypriv.dot11AuthAlgrthm)); -+ -+ if(auth_alg==2) -+ { -+ if ((psta!=NULL) && (psta->ieee8021x_blocked)) -+ { -+ //blocked -+ //only accept EAPOL frame -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:psta->ieee8021x_blocked==1\n")); -+ -+ prtnframe=precv_frame; -+ -+ //get ether_type -+ ptr=ptr+pfhdr->attrib.hdrlen+pfhdr->attrib.iv_len+LLC_HEADER_SIZE; -+ _rtw_memcpy(ðer_type,ptr, 2); -+ ether_type= ntohs((unsigned short )ether_type); -+ -+ if (ether_type == eapol_type) { -+ prtnframe=precv_frame; -+ } -+ else { -+ //free this frame -+ rtw_free_recvframe(precv_frame, &adapter->recvpriv.free_recv_queue); -+ prtnframe=NULL; -+ } -+ } -+ else -+ { -+ //allowed -+ //check decryption status, and decrypt the frame if needed -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:psta->ieee8021x_blocked==0\n")); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("portctrl:precv_frame->hdr.attrib.privacy=%x\n",precv_frame->u.hdr.attrib.privacy)); -+ -+ if(pattrib->bdecrypted==0) -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("portctrl:prxstat->decrypted=%x\n", pattrib->bdecrypted)); -+ -+ prtnframe=precv_frame; -+ //check is the EAPOL frame or not (Rekey) -+ if(ether_type == eapol_type){ -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("########portctrl:ether_type == 0x888e\n")); -+ //check Rekey -+ -+ prtnframe=precv_frame; -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("########portctrl:ether_type = 0x%.4x\n",ether_type)); -+ } -+ } -+ } -+ else -+ { -+ prtnframe=precv_frame; -+ } -+ -+_func_exit_; -+ -+ return prtnframe; -+ -+} -+ -+sint recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo_rxcache *prxcache); -+sint recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo_rxcache *prxcache) -+{ -+ sint tid = precv_frame->u.hdr.attrib.priority; -+ -+ u16 seq_ctrl = ( (precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) | -+ (precv_frame->u.hdr.attrib.frag_num & 0xf); -+ -+_func_enter_; -+ -+ if(tid>15) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl=0x%x, tid=0x%x\n", seq_ctrl, tid)); -+ -+ return _FAIL; -+ } -+ -+ if(1)//if(bretry) -+ { -+ if(seq_ctrl == prxcache->tid_rxseq[tid]) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, seq_ctrl=0x%x, tid=0x%x, tid_rxseq=0x%x\n", seq_ctrl, tid, prxcache->tid_rxseq[tid])); -+ -+ return _FAIL; -+ } -+ } -+ -+ prxcache->tid_rxseq[tid] = seq_ctrl; -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame); -+void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_AP_MODE -+ unsigned char pwrbit; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta=NULL; -+ -+ psta = rtw_get_stainfo(pstapriv, pattrib->src); -+ -+ pwrbit = GetPwrMgt(ptr); -+ -+ if(psta) -+ { -+ if(pwrbit) -+ { -+ if(!(psta->state & WIFI_SLEEP_STATE)) -+ { -+ //psta->state |= WIFI_SLEEP_STATE; -+ //pstapriv->sta_dz_bitmap |= BIT(psta->aid); -+ -+ stop_sta_xmit(padapter, psta); -+ -+ //DBG_871X("to sleep, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap); -+ } -+ } -+ else -+ { -+ if(psta->state & WIFI_SLEEP_STATE) -+ { -+ //psta->state ^= WIFI_SLEEP_STATE; -+ //pstapriv->sta_dz_bitmap &= ~BIT(psta->aid); -+ -+ wakeup_sta_to_xmit(padapter, psta); -+ -+ //DBG_871X("to wakeup, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap); -+ } -+ } -+ -+ } -+ -+#endif -+} -+ -+void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame); -+void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_AP_MODE -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta=NULL; -+ -+ psta = rtw_get_stainfo(pstapriv, pattrib->src); -+ -+ if(!psta) return; -+ -+#ifdef CONFIG_TDLS -+ if( !(psta->tdls_sta_state & TDLS_LINKED_STATE ) ) -+ { -+#endif //CONFIG_TDLS -+ -+ if(!psta->qos_option) -+ return; -+ -+ if(!(psta->qos_info&0xf)) -+ return; -+ -+#ifdef CONFIG_TDLS -+ } -+#endif //CONFIG_TDLS -+ -+ if(psta->state&WIFI_SLEEP_STATE) -+ { -+ u8 wmmps_ac=0; -+ -+ switch(pattrib->priority) -+ { -+ case 1: -+ case 2: -+ wmmps_ac = psta->uapsd_bk&BIT(1); -+ break; -+ case 4: -+ case 5: -+ wmmps_ac = psta->uapsd_vi&BIT(1); -+ break; -+ case 6: -+ case 7: -+ wmmps_ac = psta->uapsd_vo&BIT(1); -+ break; -+ case 0: -+ case 3: -+ default: -+ wmmps_ac = psta->uapsd_be&BIT(1); -+ break; -+ } -+ -+ if(wmmps_ac) -+ { -+ if(psta->sleepq_ac_len>0) -+ { -+ //process received triggered frame -+ xmit_delivery_enabled_frames(padapter, psta); -+ } -+ else -+ { -+ //issue one qos null frame with More data bit = 0 and the EOSP bit set (=1) -+ issue_qos_nulldata(padapter, psta->hwaddr, (u16)pattrib->priority, 0, 0); -+ } -+ } -+ -+ } -+ -+ -+#endif -+ -+} -+ -+#ifdef CONFIG_TDLS -+sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ sint ret = _SUCCESS; -+ u8 *paction = get_recvframe_data(precv_frame); -+ u8 category_field = 1; -+#ifdef CONFIG_WFD -+ u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a }; -+#endif //CONFIG_WFD -+ struct tdls_info *ptdlsinfo = &(adapter->tdlsinfo); -+ -+ //point to action field -+ paction+=pattrib->hdrlen -+ + pattrib->iv_len -+ + SNAP_SIZE -+ + ETH_TYPE_LEN -+ + PAYLOAD_TYPE_LEN -+ + category_field; -+ -+ if(ptdlsinfo->enable == 0) -+ { -+ DBG_871X("recv tdls frame, " -+ "but tdls haven't enabled\n"); -+ ret = _FAIL; -+ return ret; -+ } -+ -+ switch(*paction){ -+ case TDLS_SETUP_REQUEST: -+ DBG_871X("recv tdls setup request frame\n"); -+ ret=On_TDLS_Setup_Req(adapter, precv_frame); -+ break; -+ case TDLS_SETUP_RESPONSE: -+ DBG_871X("recv tdls setup response frame\n"); -+ ret=On_TDLS_Setup_Rsp(adapter, precv_frame); -+ break; -+ case TDLS_SETUP_CONFIRM: -+ DBG_871X("recv tdls setup confirm frame\n"); -+ ret=On_TDLS_Setup_Cfm(adapter, precv_frame); -+ break; -+ case TDLS_TEARDOWN: -+ DBG_871X("recv tdls teardown, free sta_info\n"); -+ ret=On_TDLS_Teardown(adapter, precv_frame); -+ break; -+ case TDLS_DISCOVERY_REQUEST: -+ DBG_871X("recv tdls discovery request frame\n"); -+ ret=On_TDLS_Dis_Req(adapter, precv_frame); -+ break; -+ case TDLS_PEER_TRAFFIC_RESPONSE: -+ DBG_871X("recv tdls peer traffic response frame\n"); -+ ret=On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame); -+ break; -+ case TDLS_CHANNEL_SWITCH_REQUEST: -+ DBG_871X("recv tdls channel switch request frame\n"); -+ ret=On_TDLS_Ch_Switch_Req(adapter, precv_frame); -+ break; -+ case TDLS_CHANNEL_SWITCH_RESPONSE: -+ DBG_871X("recv tdls channel switch response frame\n"); -+ ret=On_TDLS_Ch_Switch_Rsp(adapter, precv_frame); -+ break; -+#ifdef CONFIG_WFD -+ case 0x50: //First byte of WFA OUI -+ if( _rtw_memcmp(WFA_OUI, (paction), 3) ) -+ { -+ if( *(paction + 3) == 0x04) //Probe request frame -+ { -+ //WFDTDLS: for sigma test, do not setup direct link automatically -+ ptdlsinfo->dev_discovered = 1; -+ DBG_871X("recv tunneled probe request frame\n"); -+ issue_tunneled_probe_rsp(adapter, precv_frame); -+ } -+ if( *(paction + 3) == 0x05) //Probe response frame -+ { -+ //WFDTDLS: for sigma test, do not setup direct link automatically -+ ptdlsinfo->dev_discovered = 1; -+ DBG_871X("recv tunneled probe response frame\n"); -+ } -+ } -+ break; -+#endif //CONFIG_WFD -+ default: -+ DBG_871X("receive TDLS frame but not supported\n"); -+ ret=_FAIL; -+ break; -+ } -+ -+exit: -+ return ret; -+ -+} -+#endif //CONFIG_TDLS -+ -+void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta); -+void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta) -+{ -+ int sz; -+ struct sta_info *psta = NULL; -+ struct stainfo_stats *pstats = NULL; -+ struct rx_pkt_attrib *pattrib = & prframe->u.hdr.attrib; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ sz = get_recvframe_len(prframe); -+ precvpriv->rx_bytes += sz; -+ -+ padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++; -+ -+ if( (!MacAddr_isBcst(pattrib->dst)) && (!IS_MCAST(pattrib->dst))){ -+ padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++; -+ } -+ -+ if(sta) -+ psta = sta; -+ else -+ psta = prframe->u.hdr.psta; -+ -+ if(psta) -+ { -+ pstats = &psta->sta_stats; -+ -+ pstats->rx_data_pkts++; -+ pstats->rx_bytes += sz; -+ } -+ -+} -+ -+sint sta2sta_data_frame( -+ _adapter *adapter, -+ union recv_frame *precv_frame, -+ struct sta_info**psta -+); -+sint sta2sta_data_frame( -+ _adapter *adapter, -+ union recv_frame *precv_frame, -+ struct sta_info**psta -+) -+{ -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ sint ret = _SUCCESS; -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ u8 *mybssid = get_bssid(pmlmepriv); -+ u8 *myhwaddr = myid(&adapter->eeprompriv); -+ u8 * sta_addr = NULL; -+ sint bmcast = IS_MCAST(pattrib->dst); -+ -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+ struct sta_info *ptdls_sta=NULL; -+ u8 *psnap_type=ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; -+ u8 *pframe_body = psnap_type + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN; -+#endif //CONFIG_TDLS -+ -+_func_enter_; -+ -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) -+ { -+ -+ // filter packets that SA is myself or multicast or broadcast -+ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ if( (!_rtw_memcmp(myhwaddr, pattrib->dst, ETH_ALEN)) && (!bmcast) ){ -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ if( _rtw_memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || -+ _rtw_memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || -+ (!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) ) { -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ sta_addr = pattrib->src; -+ -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+#ifdef CONFIG_TDLS -+ //direct link data transfer -+ if(ptdlsinfo->setup_state == TDLS_LINKED_STATE){ -+ ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->src); -+ if(ptdls_sta==NULL) -+ { -+ ret=_FAIL; -+ goto exit; -+ } -+ else if(ptdls_sta->tdls_sta_state&TDLS_LINKED_STATE) -+ { -+ //drop QoS-SubType Data, including QoS NULL, excluding QoS-Data -+ if( (GetFrameSubType(ptr) & WIFI_QOS_DATA_TYPE )== WIFI_QOS_DATA_TYPE) -+ { -+ if(GetFrameSubType(ptr)&(BIT(4)|BIT(5)|BIT(6))) -+ { -+ DBG_871X("drop QoS-Sybtype Data\n"); -+ ret= _FAIL; -+ goto exit; -+ } -+ } -+ // filter packets that SA is myself or multicast or broadcast -+ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ -+ ret= _FAIL; -+ goto exit; -+ } -+ // da should be for me -+ if((!_rtw_memcmp(myhwaddr, pattrib->dst, ETH_ALEN))&& (!bmcast)) -+ { -+ ret= _FAIL; -+ goto exit; -+ } -+ // check BSSID -+ if( _rtw_memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || -+ _rtw_memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || -+ (!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) ) -+ { -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ //process UAPSD tdls sta -+ process_pwrbit_data(adapter, precv_frame); -+ -+ // if NULL-frame, check pwrbit -+ if ((GetFrameSubType(ptr)) == WIFI_DATA_NULL) -+ { -+ //NULL-frame with pwrbit=1, buffer_STA should buffer frames for sleep_STA -+ if(GetPwrMgt(ptr)) -+ { -+ DBG_871X("TDLS: recv peer null frame with pwr bit 1\n"); -+ ptdls_sta->tdls_sta_state|=TDLS_PEER_SLEEP_STATE; -+ } -+ // it would be triggered when we are off channel and receiving NULL DATA -+ // we can confirm that peer STA is at off channel -+ else if(ptdls_sta->tdls_sta_state&TDLS_CH_SWITCH_ON_STATE) -+ { -+ if((ptdls_sta->tdls_sta_state & TDLS_PEER_AT_OFF_STATE) != TDLS_PEER_AT_OFF_STATE) -+ { -+ issue_nulldata_to_TDLS_peer_STA(adapter, ptdls_sta, 0); -+ ptdls_sta->tdls_sta_state |= TDLS_PEER_AT_OFF_STATE; -+ On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame); -+ } -+ } -+ -+ ret= _FAIL; -+ goto exit; -+ } -+ //receive some of all TDLS management frames, process it at ON_TDLS -+ if((_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_TDLS, 2))){ -+ ret= OnTDLS(adapter, precv_frame); -+ goto exit; -+ } -+ -+ } -+ -+ sta_addr = pattrib->src; -+ -+ } -+ else -+#endif //CONFIG_TDLS -+ { -+ // For Station mode, sa and bssid should always be BSSID, and DA is my mac-address -+ if(!_rtw_memcmp(pattrib->bssid, pattrib->src, ETH_ALEN) ) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("bssid != TA under STATION_MODE; drop pkt\n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ sta_addr = pattrib->bssid; -+ } -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ if (bmcast) -+ { -+ // For AP mode, if DA == MCAST, then BSSID should be also MCAST -+ if (!IS_MCAST(pattrib->bssid)){ -+ ret= _FAIL; -+ goto exit; -+ } -+ } -+ else // not mc-frame -+ { -+ // For AP mode, if DA is non-MCAST, then it must be BSSID, and bssid == BSSID -+ if(!_rtw_memcmp(pattrib->bssid, pattrib->dst, ETH_ALEN)) { -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ sta_addr = pattrib->src; -+ } -+ -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ { -+ _rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ sta_addr = mybssid; -+ } -+ else -+ { -+ ret = _FAIL; -+ } -+ -+ -+ -+ if(bmcast) -+ *psta = rtw_get_bcmc_stainfo(adapter); -+ else -+ *psta = rtw_get_stainfo(pstapriv, sta_addr); // get ap_info -+ -+#ifdef CONFIG_TDLS -+ if(ptdls_sta != NULL) -+ *psta = ptdls_sta; -+#endif //CONFIG_TDLS -+ -+ -+ if (*psta == NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under sta2sta_data_frame ; drop pkt\n")); -+#ifdef CONFIG_MP_INCLUDED -+ if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ adapter->mppriv.rx_pktloss++; -+#endif -+ ret= _FAIL; -+ goto exit; -+ } -+ -+exit: -+_func_exit_; -+ return ret; -+ -+} -+ -+sint ap2sta_data_frame( -+ _adapter *adapter, -+ union recv_frame *precv_frame, -+ struct sta_info**psta ); -+sint ap2sta_data_frame( -+ _adapter *adapter, -+ union recv_frame *precv_frame, -+ struct sta_info**psta ) -+{ -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ sint ret = _SUCCESS; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ u8 *mybssid = get_bssid(pmlmepriv); -+ u8 *myhwaddr = myid(&adapter->eeprompriv); -+ sint bmcast = IS_MCAST(pattrib->dst); -+ -+_func_enter_; -+ -+ if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ && (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE -+ || check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE ) -+ ) -+ { -+ -+ // filter packets that SA is myself or multicast or broadcast -+ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s SA=%x:%x:%x:%x:%x:%x, myhwaddr= %x:%x:%x:%x:%x:%x\n", __FUNCTION__, -+ pattrib->src[0], pattrib->src[1], pattrib->src[2], -+ pattrib->src[3], pattrib->src[4], pattrib->src[5], -+ *(myhwaddr), *(myhwaddr+1), *(myhwaddr+2), -+ *(myhwaddr+3), *(myhwaddr+4), *(myhwaddr+5)); -+ #endif -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ // da should be for me -+ if((!_rtw_memcmp(myhwaddr, pattrib->dst, ETH_ALEN))&& (!bmcast)) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_, -+ (" ap2sta_data_frame: compare DA fail; DA="MAC_FMT"\n", MAC_ARG(pattrib->dst))); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst)); -+ #endif -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ -+ // check BSSID -+ if( _rtw_memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || -+ _rtw_memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || -+ (!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) ) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_, -+ (" ap2sta_data_frame: compare BSSID fail ; BSSID="MAC_FMT"\n", MAC_ARG(pattrib->bssid))); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid="MAC_FMT"\n", MAC_ARG(mybssid))); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n", -+ __FUNCTION__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid)); -+ DBG_871X( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type ); -+ #endif -+ -+ if(!bmcast) -+ { -+ DBG_871X("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid)); -+ issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); -+ } -+ -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ if(bmcast) -+ *psta = rtw_get_bcmc_stainfo(adapter); -+ else -+ *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get ap_info -+ -+ if (*psta == NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ap2sta: can't get psta under STATION_MODE ; drop pkt\n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__); -+ #endif -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ if ((GetFrameSubType(ptr) & WIFI_QOS_DATA_TYPE) == WIFI_QOS_DATA_TYPE) { -+ } -+ -+ if (GetFrameSubType(ptr) & BIT(6)) { -+ /* No data, will not indicate to upper layer, temporily count it here */ -+ count_rx_stats(adapter, precv_frame, *psta); -+ ret = RTW_RX_HANDLED; -+ goto exit; -+ } -+ -+ } -+ else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && -+ (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) ) -+ { -+ _rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ // -+ _rtw_memcpy(pattrib->bssid, mybssid, ETH_ALEN); -+ -+ -+ *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info -+ if (*psta == NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under MP_MODE ; drop pkt\n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__); -+ #endif -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ -+ } -+ else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ /* Special case */ -+ ret = RTW_RX_HANDLED; -+ goto exit; -+ } -+ else -+ { -+ if(_rtw_memcmp(myhwaddr, pattrib->dst, ETH_ALEN)&& (!bmcast)) -+ { -+ *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info -+ if (*psta == NULL) -+ { -+ DBG_871X("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid)); -+ -+ issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); -+ } -+ } -+ -+ ret = _FAIL; -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv)); -+ #endif -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+ -+} -+ -+sint sta2ap_data_frame( -+ _adapter *adapter, -+ union recv_frame *precv_frame, -+ struct sta_info**psta ); -+sint sta2ap_data_frame( -+ _adapter *adapter, -+ union recv_frame *precv_frame, -+ struct sta_info**psta ) -+{ -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ unsigned char *mybssid = get_bssid(pmlmepriv); -+ sint ret=_SUCCESS; -+ -+_func_enter_; -+ -+ if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ //For AP mode, RA=BSSID, TX=STA(SRC_ADDR), A3=DST_ADDR -+ if(!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) -+ { -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ *psta = rtw_get_stainfo(pstapriv, pattrib->src); -+ if (*psta == NULL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under AP_MODE; drop pkt\n")); -+ DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src)); -+ -+ issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); -+ -+ ret = RTW_RX_HANDLED; -+ goto exit; -+ } -+ -+ process_pwrbit_data(adapter, precv_frame); -+ -+ if ((GetFrameSubType(ptr) & WIFI_QOS_DATA_TYPE) == WIFI_QOS_DATA_TYPE) { -+ process_wmmps_data(adapter, precv_frame); -+ } -+ -+ if (GetFrameSubType(ptr) & BIT(6)) { -+ /* No data, will not indicate to upper layer, temporily count it here */ -+ count_rx_stats(adapter, precv_frame, *psta); -+ ret = RTW_RX_HANDLED; -+ goto exit; -+ } -+ } -+ else { -+ u8 *myhwaddr = myid(&adapter->eeprompriv); -+ if (!_rtw_memcmp(pattrib->ra, myhwaddr, ETH_ALEN)) { -+ ret = RTW_RX_HANDLED; -+ goto exit; -+ } -+ DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src)); -+ issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); -+ ret = RTW_RX_HANDLED; -+ goto exit; -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+ -+} -+ -+sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame); -+sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_AP_MODE -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 *pframe = precv_frame->u.hdr.rx_data; -+ //uint len = precv_frame->u.hdr.len; -+ -+ //DBG_871X("+validate_recv_ctrl_frame\n"); -+ -+ if (GetFrameType(pframe) != WIFI_CTRL_TYPE) -+ { -+ return _FAIL; -+ } -+ -+ //receive the frames that ra(a1) is my address -+ if (!_rtw_memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN)) -+ { -+ return _FAIL; -+ } -+ -+ //only handle ps-poll -+ if(GetFrameSubType(pframe) == WIFI_PSPOLL) -+ { -+ u16 aid; -+ u8 wmmps_ac=0; -+ struct sta_info *psta=NULL; -+ -+ aid = GetAid(pframe); -+ psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); -+ -+ if((psta==NULL) || (psta->aid!=aid)) -+ { -+ return _FAIL; -+ } -+ -+ //for rx pkt statistics -+ psta->sta_stats.rx_ctrl_pkts++; -+ -+ switch(pattrib->priority) -+ { -+ case 1: -+ case 2: -+ wmmps_ac = psta->uapsd_bk&BIT(0); -+ break; -+ case 4: -+ case 5: -+ wmmps_ac = psta->uapsd_vi&BIT(0); -+ break; -+ case 6: -+ case 7: -+ wmmps_ac = psta->uapsd_vo&BIT(0); -+ break; -+ case 0: -+ case 3: -+ default: -+ wmmps_ac = psta->uapsd_be&BIT(0); -+ break; -+ } -+ -+ if(wmmps_ac) -+ return _FAIL; -+ -+ if(psta->state & WIFI_STA_ALIVE_CHK_STATE) -+ { -+ DBG_871X("%s alive check-rx ps-poll\n", __func__); -+ psta->expire_to = pstapriv->expire_to; -+ psta->state ^= WIFI_STA_ALIVE_CHK_STATE; -+ } -+ -+ if((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid))) -+ { -+ _irqL irqL; -+ _list *xmitframe_plist, *xmitframe_phead; -+ struct xmit_frame *pxmitframe=NULL; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ //_enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ xmitframe_phead = get_list_head(&psta->sleep_q); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ if ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+ rtw_list_delete(&pxmitframe->list); -+ -+ psta->sleepq_len--; -+ -+ if(psta->sleepq_len>0) -+ pxmitframe->attrib.mdata = 1; -+ else -+ pxmitframe->attrib.mdata = 0; -+ -+ pxmitframe->attrib.triggered = 1; -+ -+ //DBG_871X("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); -+ -+#if 0 -+ _exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) -+ { -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ } -+ _enter_critical_bh(&psta->sleep_q.lock, &irqL); -+#endif -+ rtw_hal_xmitframe_enqueue(padapter, pxmitframe); -+ -+ if(psta->sleepq_len==0) -+ { -+ pstapriv->tim_bitmap &= ~BIT(psta->aid); -+ -+ //DBG_871X("after handling ps-poll, tim=%x\n", pstapriv->tim_bitmap); -+ -+ //upate BCN for TIM IE -+ //update_BCNTIM(padapter); -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ } -+ -+ //_exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ } -+ else -+ { -+ //_exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ //DBG_871X("no buffered packets to xmit\n"); -+ if(pstapriv->tim_bitmap&BIT(psta->aid)) -+ { -+ if(psta->sleepq_len==0) -+ { -+ DBG_871X("no buffered packets to xmit\n"); -+ -+ //issue nulldata with More data bit = 0 to indicate we have no buffered packets -+ issue_nulldata(padapter, psta->hwaddr, 0, 0, 0); -+ } -+ else -+ { -+ DBG_871X("error!psta->sleepq_len=%d\n", psta->sleepq_len); -+ psta->sleepq_len=0; -+ } -+ -+ pstapriv->tim_bitmap &= ~BIT(psta->aid); -+ -+ //upate BCN for TIM IE -+ //update_BCNTIM(padapter); -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ } -+ -+ } -+ -+ } -+ -+ } -+ -+#endif -+ -+ return _FAIL; -+ -+} -+ -+union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame); -+sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame); -+sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame) -+{ -+ //struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("+validate_recv_mgnt_frame\n")); -+ -+#if 0 -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+#ifdef CONFIG_NATIVEAP_MLME -+ mgt_dispatcher(padapter, precv_frame); -+#else -+ rtw_hostapd_mlme_rx(padapter, precv_frame); -+#endif -+ } -+ else -+ { -+ mgt_dispatcher(padapter, precv_frame); -+ } -+#endif -+ -+ precv_frame = recvframe_chk_defrag(padapter, precv_frame); -+ if (precv_frame == NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,("%s: fragment packet\n",__FUNCTION__)); -+ return _SUCCESS; -+ } -+ -+ { -+ //for rx pkt statistics -+ struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(precv_frame->u.hdr.rx_data)); -+ if (psta) { -+ psta->sta_stats.rx_mgnt_pkts++; -+ if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_BEACON) -+ psta->sta_stats.rx_beacon_pkts++; -+ else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBEREQ) -+ psta->sta_stats.rx_probereq_pkts++; -+ else if (GetFrameSubType(precv_frame->u.hdr.rx_data) == WIFI_PROBERSP) { -+ if (_rtw_memcmp(padapter->eeprompriv.mac_addr, GetAddr1Ptr(precv_frame->u.hdr.rx_data), ETH_ALEN) == _TRUE) -+ psta->sta_stats.rx_probersp_pkts++; -+ else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) -+ || is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) -+ psta->sta_stats.rx_probersp_bm_pkts++; -+ else -+ psta->sta_stats.rx_probersp_uo_pkts++; -+ } -+ } -+ } -+ -+#ifdef CONFIG_INTEL_PROXIM -+ if(padapter->proximity.proxim_on==_TRUE) -+ { -+ struct rx_pkt_attrib * pattrib=&precv_frame->u.hdr.attrib; -+ struct recv_stat* prxstat=( struct recv_stat * ) precv_frame->u.hdr.rx_head ; -+ u8 * pda,*psa,*pbssid,*ptr; -+ ptr=precv_frame->u.hdr.rx_data; -+ pda = get_da(ptr); -+ psa = get_sa(ptr); -+ pbssid = get_hdr_bssid(ptr); -+ -+ -+ _rtw_memcpy(pattrib->dst, pda, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, psa, ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->bssid, pbssid, ETH_ALEN); -+ -+ switch(pattrib->to_fr_ds) -+ { -+ case 0: -+ _rtw_memcpy(pattrib->ra, pda, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, psa, ETH_ALEN); -+ break; -+ -+ case 1: -+ _rtw_memcpy(pattrib->ra, pda, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pbssid, ETH_ALEN); -+ break; -+ -+ case 2: -+ _rtw_memcpy(pattrib->ra, pbssid, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, psa, ETH_ALEN); -+ break; -+ -+ case 3: -+ _rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" case 3\n")); -+ break; -+ -+ default: -+ break; -+ -+ } -+ pattrib->priority=0; -+ pattrib->hdrlen = pattrib->to_fr_ds==3 ? 30 : 24; -+ -+ padapter->proximity.proxim_rx(padapter,precv_frame); -+ } -+#endif -+ mgt_dispatcher(padapter, precv_frame); -+ -+ return _SUCCESS; -+ -+} -+ -+sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame); -+sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ u8 bretry; -+ u8 *psa, *pda, *pbssid; -+ struct sta_info *psta = NULL; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ struct security_priv *psecuritypriv = &adapter->securitypriv; -+ sint ret = _SUCCESS; -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+#endif //CONFIG_TDLS -+ -+_func_enter_; -+ -+ bretry = GetRetry(ptr); -+ pda = get_da(ptr); -+ psa = get_sa(ptr); -+ pbssid = get_hdr_bssid(ptr); -+ -+ if(pbssid == NULL){ -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memcpy(pattrib->dst, pda, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, psa, ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->bssid, pbssid, ETH_ALEN); -+ -+ switch(pattrib->to_fr_ds) -+ { -+ case 0: -+ _rtw_memcpy(pattrib->ra, pda, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, psa, ETH_ALEN); -+ ret = sta2sta_data_frame(adapter, precv_frame, &psta); -+ break; -+ -+ case 1: -+ _rtw_memcpy(pattrib->ra, pda, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pbssid, ETH_ALEN); -+ ret = ap2sta_data_frame(adapter, precv_frame, &psta); -+ break; -+ -+ case 2: -+ _rtw_memcpy(pattrib->ra, pbssid, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, psa, ETH_ALEN); -+ ret = sta2ap_data_frame(adapter, precv_frame, &psta); -+ break; -+ -+ case 3: -+ _rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN); -+ ret =_FAIL; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" case 3\n")); -+ break; -+ -+ default: -+ ret =_FAIL; -+ break; -+ -+ } -+ -+ if(ret ==_FAIL){ -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, ret); -+ #endif -+ goto exit; -+ } else if (ret == RTW_RX_HANDLED) { -+ goto exit; -+ } -+ -+ -+ if(psta==NULL){ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL \n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ //psta->rssi = prxcmd->rssi; -+ //psta->signal_quality= prxcmd->sq; -+ precv_frame->u.hdr.psta = psta; -+ -+ -+ pattrib->amsdu=0; -+ pattrib->ack_policy = 0; -+ //parsing QC field -+ if(pattrib->qos == 1) -+ { -+ pattrib->priority = GetPriority((ptr + 24)); -+ pattrib->ack_policy = GetAckpolicy((ptr + 24)); -+ pattrib->amsdu = GetAMsdu((ptr + 24)); -+ pattrib->hdrlen = pattrib->to_fr_ds==3 ? 32 : 26; -+ -+ if(pattrib->priority!=0 && pattrib->priority!=3) -+ { -+ adapter->recvpriv.bIsAnyNonBEPkts = _TRUE; -+ } -+ } -+ else -+ { -+ pattrib->priority=0; -+ pattrib->hdrlen = pattrib->to_fr_ds==3 ? 30 : 24; -+ } -+ -+ -+ if(pattrib->order)//HT-CTRL 11n -+ { -+ pattrib->hdrlen += 4; -+ } -+ -+ precv_frame->u.hdr.preorder_ctrl = &psta->recvreorder_ctrl[pattrib->priority]; -+ -+ // decache, drop duplicate recv packets -+ if(recv_decache(precv_frame, bretry, &psta->sta_recvpriv.rxcache) == _FAIL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decache : drop pkt\n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+#if 0 -+ if(psta->tdls_sta_state & TDLS_LINKED_STATE ) -+ { -+ if(psta->dot118021XPrivacy==_AES_) -+ pattrib->encrypt=psta->dot118021XPrivacy; -+ } -+#endif //CONFIG_TDLS -+ -+ if(pattrib->privacy){ -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("validate_recv_data_frame:pattrib->privacy=%x\n", pattrib->privacy)); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n ^^^^^^^^^^^IS_MCAST(pattrib->ra(0x%02x))=%d^^^^^^^^^^^^^^^6\n", pattrib->ra[0],IS_MCAST(pattrib->ra))); -+ -+#ifdef CONFIG_TDLS -+ if((psta->tdls_sta_state & TDLS_LINKED_STATE) && (psta->dot118021XPrivacy==_AES_)) -+ { -+ pattrib->encrypt=psta->dot118021XPrivacy; -+ } -+ else -+#endif //CONFIG_TDLS -+ GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, IS_MCAST(pattrib->ra)); -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n pattrib->encrypt=%d\n",pattrib->encrypt)); -+ -+ SET_ICE_IV_LEN(pattrib->iv_len, pattrib->icv_len, pattrib->encrypt); -+ } -+ else -+ { -+ pattrib->encrypt = 0; -+ pattrib->iv_len = pattrib->icv_len = 0; -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+#ifdef CONFIG_IEEE80211W -+static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ u8 type; -+ u8 subtype; -+ -+ type = GetFrameType(ptr); -+ subtype = GetFrameSubType(ptr); //bit(7)~bit(2) -+ -+ //only support station mode -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) -+ && adapter->securitypriv.binstallBIPkey == _TRUE) -+ { -+ //unicast management frame decrypt -+ if(pattrib->privacy && !(IS_MCAST(GetAddr1Ptr(ptr))) && -+ (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC || subtype == WIFI_ACTION)) -+ { -+ u8 *ppp, *mgmt_DATA; -+ u32 data_len=0; -+ ppp = GetAddr2Ptr(ptr); -+ -+ pattrib->bdecrypted = 0; -+ pattrib->encrypt = _AES_; -+ pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ //set iv and icv length -+ SET_ICE_IV_LEN(pattrib->iv_len, pattrib->icv_len, pattrib->encrypt); -+ _rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN); -+ //actual management data frame body -+ data_len = pattrib->pkt_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len; -+ mgmt_DATA = rtw_zmalloc(data_len); -+ if(mgmt_DATA == NULL) -+ { -+ DBG_871X("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__); -+ goto validate_80211w_fail; -+ } -+ /*//dump the packet content before decrypt -+ { -+ int pp; -+ printk("pattrib->pktlen = %d =>", pattrib->pkt_len); -+ for(pp=0;pp< pattrib->pkt_len; pp++) -+ printk(" %02x ", ptr[pp]); -+ printk("\n"); -+ }*/ -+ -+ precv_frame = decryptor(adapter, precv_frame); -+ //save actual management data frame body -+ _rtw_memcpy(mgmt_DATA, ptr+pattrib->hdrlen+pattrib->iv_len, data_len); -+ //overwrite the iv field -+ _rtw_memcpy(ptr+pattrib->hdrlen, mgmt_DATA, data_len); -+ //remove the iv and icv length -+ pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len; -+ rtw_mfree(mgmt_DATA, data_len); -+ /*//print packet content after decryption -+ { -+ int pp; -+ printk("after decryption pattrib->pktlen = %d @@=>", pattrib->pkt_len); -+ for(pp=0;pp< pattrib->pkt_len; pp++) -+ printk(" %02x ", ptr[pp]); -+ printk("\n"); -+ }*/ -+ if(!precv_frame) -+ { -+ DBG_871X("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__); -+ goto validate_80211w_fail; -+ } -+ } -+ else if(IS_MCAST(GetAddr1Ptr(ptr)) && -+ (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC)) -+ { -+ sint BIP_ret = _SUCCESS; -+ //verify BIP MME IE of broadcast/multicast de-auth/disassoc packet -+ BIP_ret = rtw_BIP_verify(adapter, (u8 * )precv_frame); -+ if(BIP_ret == _FAIL) -+ { -+ //DBG_871X("802.11w BIP verify fail\n"); -+ goto validate_80211w_fail; -+ } -+ else if(BIP_ret == RTW_RX_HANDLED) -+ { -+ //DBG_871X("802.11w recv none protected packet\n"); -+ //issue sa query request -+ issue_action_SA_Query(adapter, NULL, 0, 0); -+ goto validate_80211w_fail; -+ } -+ }//802.11w protect -+ else -+ { -+ if(subtype == WIFI_ACTION) -+ { -+ //according 802.11-2012 standard, these five types are not robust types -+ if( ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_PUBLIC && -+ ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_HT && -+ ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_UNPROTECTED_WNM && -+ ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_SELF_PROTECTED && -+ ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_P2P) -+ { -+ DBG_871X("action frame category=%d should robust\n", ptr[WLAN_HDR_A3_LEN]); -+ goto validate_80211w_fail; -+ } -+ } -+ else if(subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC) -+ { -+ DBG_871X("802.11w recv none protected packet\n"); -+ //issue sa query request -+ issue_action_SA_Query(adapter, NULL, 0, 0); -+ goto validate_80211w_fail; -+ } -+ } -+ } -+ return _SUCCESS; -+ -+validate_80211w_fail: -+ return _FAIL; -+ -+} -+#endif //CONFIG_IEEE80211W -+ -+sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame); -+sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ //shall check frame subtype, to / from ds, da, bssid -+ -+ //then call check if rx seq/frag. duplicated. -+ -+ u8 type; -+ u8 subtype; -+ sint retval = _SUCCESS; -+ -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ u8 ver =(unsigned char) (*ptr)&0x3 ; -+#ifdef CONFIG_FIND_BEST_CHANNEL -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+#endif -+ -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+#endif //CONFIG_TDLS -+ -+_func_enter_; -+ -+ -+#ifdef CONFIG_FIND_BEST_CHANNEL -+ if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { -+ int ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, rtw_get_oper_ch(adapter)); -+ if (ch_set_idx >= 0) -+ pmlmeext->channel_set[ch_set_idx].rx_count++; -+ } -+#endif -+ -+#ifdef CONFIG_TDLS -+ if(ptdlsinfo->ch_sensing==1 && ptdlsinfo->cur_channel !=0){ -+ ptdlsinfo->collect_pkt_num[ptdlsinfo->cur_channel-1]++; -+ } -+#endif //CONFIG_TDLS -+ -+#ifdef RTK_DMP_PLATFORM -+ if ( 0 ) -+ { -+ DBG_871X("++\n"); -+ { -+ int i; -+ for(i=0; i<64;i=i+8) -+ DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr+i), -+ *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); -+ -+ } -+ DBG_871X("--\n"); -+ } -+#endif //RTK_DMP_PLATFORM -+ -+ //add version chk -+ if(ver!=0){ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! (ver!=0)\n")); -+ retval= _FAIL; -+ goto exit; -+ } -+ -+ type = GetFrameType(ptr); -+ subtype = GetFrameSubType(ptr); //bit(7)~bit(2) -+ -+ pattrib->to_fr_ds = get_tofr_ds(ptr); -+ -+ pattrib->frag_num = GetFragNum(ptr); -+ pattrib->seq_num = GetSequence(ptr); -+ -+ pattrib->pw_save = GetPwrMgt(ptr); -+ pattrib->mfrag = GetMFrag(ptr); -+ pattrib->mdata = GetMData(ptr); -+ pattrib->privacy = GetPrivacy(ptr); -+ pattrib->order = GetOrder(ptr); -+#if 0 //for debug -+ -+if(pHalData->bDumpRxPkt ==1){ -+ int i; -+ DBG_871X("############################# \n"); -+ -+ for(i=0; i<64;i=i+8) -+ DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), -+ *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); -+ DBG_871X("############################# \n"); -+} -+else if(pHalData->bDumpRxPkt ==2){ -+ if(type== WIFI_MGT_TYPE){ -+ int i; -+ DBG_871X("############################# \n"); -+ -+ for(i=0; i<64;i=i+8) -+ DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), -+ *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); -+ DBG_871X("############################# \n"); -+ } -+} -+else if(pHalData->bDumpRxPkt ==3){ -+ if(type== WIFI_DATA_TYPE){ -+ int i; -+ DBG_871X("############################# \n"); -+ -+ for(i=0; i<64;i=i+8) -+ DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), -+ *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); -+ DBG_871X("############################# \n"); -+ } -+} -+ -+#endif -+ switch (type) -+ { -+ case WIFI_MGT_TYPE: //mgnt -+#ifdef CONFIG_IEEE80211W -+ if(validate_80211w_mgmt(adapter, precv_frame) == _FAIL) -+ { -+ retval = _FAIL; -+ break; -+ } -+#endif //CONFIG_IEEE80211W -+ -+ retval = validate_recv_mgnt_frame(adapter, precv_frame); -+ if (retval == _FAIL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_mgnt_frame fail\n")); -+ } -+ retval = _FAIL; // only data frame return _SUCCESS -+ break; -+ case WIFI_CTRL_TYPE: //ctrl -+ retval = validate_recv_ctrl_frame(adapter, precv_frame); -+ if (retval == _FAIL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_ctrl_frame fail\n")); -+ } -+ retval = _FAIL; // only data frame return _SUCCESS -+ break; -+ case WIFI_DATA_TYPE: //data -+ rtw_led_control(adapter, LED_CTL_RX); -+ pattrib->qos = (subtype & BIT(7))? 1:0; -+ retval = validate_recv_data_frame(adapter, precv_frame); -+ if (retval == _FAIL) -+ { -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail\n")); -+ precvpriv->rx_drop++; -+ } -+ break; -+ default: -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! type=0x%x\n", type)); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n", type); -+ #endif -+ retval = _FAIL; -+ break; -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return retval; -+} -+ -+ -+//remove the wlanhdr and add the eth_hdr -+#if 1 -+ -+sint wlanhdr_to_ethhdr ( union recv_frame *precvframe); -+sint wlanhdr_to_ethhdr ( union recv_frame *precvframe) -+{ -+ sint rmv_len; -+ u16 eth_type, len; -+ u8 bsnaphdr; -+ u8 *psnap_type; -+ struct ieee80211_snap_hdr *psnap; -+ -+ sint ret=_SUCCESS; -+ _adapter *adapter =precvframe->u.hdr.adapter; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ -+ u8 *ptr = get_recvframe_data(precvframe) ; // point to frame_ctrl field -+ struct rx_pkt_attrib *pattrib = & precvframe->u.hdr.attrib; -+ -+_func_enter_; -+ -+ if(pattrib->encrypt){ -+ recvframe_pull_tail(precvframe, pattrib->icv_len); -+ } -+ -+ psnap=(struct ieee80211_snap_hdr *)(ptr+pattrib->hdrlen + pattrib->iv_len); -+ psnap_type=ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; -+ /* convert hdr + possible LLC headers into Ethernet header */ -+ //eth_type = (psnap_type[0] << 8) | psnap_type[1]; -+ if((_rtw_memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && -+ (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) == _FALSE) && -+ (_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)==_FALSE) )|| -+ //eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || -+ _rtw_memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)){ -+ /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ -+ bsnaphdr = _TRUE; -+ } -+ else { -+ /* Leave Ethernet header part of hdr and full payload */ -+ bsnaphdr = _FALSE; -+ } -+ -+ rmv_len = pattrib->hdrlen + pattrib->iv_len +(bsnaphdr?SNAP_SIZE:0); -+ len = precvframe->u.hdr.len - rmv_len; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n===pattrib->hdrlen: %x, pattrib->iv_len:%x ===\n\n", pattrib->hdrlen, pattrib->iv_len)); -+ -+ _rtw_memcpy(ð_type, ptr+rmv_len, 2); -+ eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type -+ pattrib->eth_type = eth_type; -+ -+ if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)) -+ { -+ ptr += rmv_len ; -+ *ptr = 0x87; -+ *(ptr+1) = 0x12; -+ -+ eth_type = 0x8712; -+ // append rx status for mp test packets -+ ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2)-24); -+ _rtw_memcpy(ptr, get_rxmem(precvframe), 24); -+ ptr+=24; -+ } -+ else { -+ ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+ (bsnaphdr?2:0))); -+ } -+ -+ _rtw_memcpy(ptr, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN); -+ -+ if(!bsnaphdr) { -+ len = htons(len); -+ _rtw_memcpy(ptr+12, &len, 2); -+ } -+ -+_func_exit_; -+ return ret; -+ -+} -+ -+#else -+ -+sint wlanhdr_to_ethhdr ( union recv_frame *precvframe) -+{ -+ sint rmv_len; -+ u16 eth_type; -+ u8 bsnaphdr; -+ u8 *psnap_type; -+ struct ieee80211_snap_hdr *psnap; -+ -+ sint ret=_SUCCESS; -+ _adapter *adapter =precvframe->u.hdr.adapter; -+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -+ -+ u8* ptr = get_recvframe_data(precvframe) ; // point to frame_ctrl field -+ struct rx_pkt_attrib *pattrib = & precvframe->u.hdr.attrib; -+ struct _vlan *pvlan = NULL; -+ -+_func_enter_; -+ -+ psnap=(struct ieee80211_snap_hdr *)(ptr+pattrib->hdrlen + pattrib->iv_len); -+ psnap_type=ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; -+ if (psnap->dsap==0xaa && psnap->ssap==0xaa && psnap->ctrl==0x03) -+ { -+ if (_rtw_memcmp(psnap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)) -+ bsnaphdr=_TRUE;//wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_RFC1042; -+ else if (_rtw_memcmp(psnap->oui, SNAP_HDR_APPLETALK_DDP, WLAN_IEEE_OUI_LEN) && -+ _rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_DDP, 2) ) -+ bsnaphdr=_TRUE; //wlan_pkt_format = WLAN_PKT_FORMAT_APPLETALK; -+ else if (_rtw_memcmp( psnap->oui, oui_8021h, WLAN_IEEE_OUI_LEN)) -+ bsnaphdr=_TRUE; //wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_TUNNEL; -+ else { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("drop pkt due to invalid frame format!\n")); -+ ret= _FAIL; -+ goto exit; -+ } -+ -+ } else -+ bsnaphdr=_FALSE;//wlan_pkt_format = WLAN_PKT_FORMAT_OTHERS; -+ -+ rmv_len = pattrib->hdrlen + pattrib->iv_len +(bsnaphdr?SNAP_SIZE:0); -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("===pattrib->hdrlen: %x, pattrib->iv_len:%x ===\n", pattrib->hdrlen, pattrib->iv_len)); -+ -+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ { -+ ptr += rmv_len ; -+ *ptr = 0x87; -+ *(ptr+1) = 0x12; -+ -+ //back to original pointer -+ ptr -= rmv_len; -+ } -+ -+ ptr += rmv_len ; -+ -+ _rtw_memcpy(ð_type, ptr, 2); -+ eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type -+ ptr +=2; -+ -+ if(pattrib->encrypt){ -+ recvframe_pull_tail(precvframe, pattrib->icv_len); -+ } -+ -+ if(eth_type == 0x8100) //vlan -+ { -+ pvlan = (struct _vlan *) ptr; -+ -+ //eth_type = get_vlan_encap_proto(pvlan); -+ //eth_type = pvlan->h_vlan_encapsulated_proto;//? -+ rmv_len += 4; -+ ptr+=4; -+ } -+ -+ if(eth_type==0x0800)//ip -+ { -+ //struct iphdr* piphdr = (struct iphdr*) ptr; -+ //__u8 tos = (unsigned char)(pattrib->priority & 0xff); -+ -+ //piphdr->tos = tos; -+ -+ //if (piphdr->protocol == 0x06) -+ //{ -+ // RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("@@@===recv tcp len:%d @@@===\n", precvframe->u.hdr.len)); -+ //} -+ } -+ else if(eth_type==0x8712)// append rx status for mp test packets -+ { -+ //ptr -= 16; -+ //_rtw_memcpy(ptr, get_rxmem(precvframe), 16); -+ } -+ else -+ { -+#ifdef PLATFORM_OS_XP -+ NDIS_PACKET_8021Q_INFO VlanPriInfo; -+ UINT32 UserPriority = precvframe->u.hdr.attrib.priority; -+ UINT32 VlanID = (pvlan!=NULL ? get_vlan_id(pvlan) : 0 ); -+ -+ VlanPriInfo.Value = // Get current value. -+ NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo); -+ -+ VlanPriInfo.TagHeader.UserPriority = UserPriority; -+ VlanPriInfo.TagHeader.VlanId = VlanID ; -+ -+ VlanPriInfo.TagHeader.CanonicalFormatId = 0; // Should be zero. -+ VlanPriInfo.TagHeader.Reserved = 0; // Should be zero. -+ NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo) = VlanPriInfo.Value; -+#endif -+ } -+ -+ if(eth_type==0x8712)// append rx status for mp test packets -+ { -+ ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2)-24); -+ _rtw_memcpy(ptr, get_rxmem(precvframe), 24); -+ ptr+=24; -+ } -+ else -+ ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2)); -+ -+ _rtw_memcpy(ptr, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN); -+ -+ eth_type = htons((unsigned short)eth_type) ; -+ _rtw_memcpy(ptr+12, ð_type, 2); -+ -+exit: -+ -+_func_exit_; -+ -+ return ret; -+} -+#endif -+ -+ -+#ifdef CONFIG_SDIO_HCI -+#ifdef PLATFORM_LINUX -+static void recvframe_expand_pkt( -+ PADAPTER padapter, -+ union recv_frame *prframe) -+{ -+ struct recv_frame_hdr *pfhdr; -+ _pkt *ppkt; -+ u8 shift_sz; -+ u32 alloc_sz; -+ -+ -+ pfhdr = &prframe->u.hdr; -+ -+ // 6 is for IP header 8 bytes alignment in QoS packet case. -+ if (pfhdr->attrib.qos) -+ shift_sz = 6; -+ else -+ shift_sz = 0; -+ -+ // for first fragment packet, need to allocate -+ // (1536 + RXDESC_SIZE + drvinfo_sz) to reassemble packet -+ // 8 is for skb->data 8 bytes alignment. -+// alloc_sz = _RND(1536 + RXDESC_SIZE + pfhdr->attrib.drvinfosize + shift_sz + 8, 128); -+ alloc_sz = 1664; // round (1536 + 24 + 32 + shift_sz + 8) to 128 bytes alignment -+ -+ //3 1. alloc new skb -+ // prepare extra space for 4 bytes alignment -+ ppkt = rtw_skb_alloc(alloc_sz); -+ -+ if (!ppkt) return; // no way to expand -+ -+ //3 2. Prepare new skb to replace & release old skb -+ // force ppkt->data at 8-byte alignment address -+ skb_reserve(ppkt, 8 - ((SIZE_PTR)ppkt->data & 7)); -+ // force ip_hdr at 8-byte alignment address according to shift_sz -+ skb_reserve(ppkt, shift_sz); -+ -+ // copy data to new pkt -+ _rtw_memcpy(skb_put(ppkt, pfhdr->len), pfhdr->rx_data, pfhdr->len); -+ -+ rtw_skb_free(pfhdr->pkt); -+ -+ // attach new pkt to recvframe -+ pfhdr->pkt = ppkt; -+ pfhdr->rx_head = ppkt->head; -+ pfhdr->rx_data = ppkt->data; -+ pfhdr->rx_tail = skb_tail_pointer(ppkt); -+ pfhdr->rx_end = skb_end_pointer(ppkt); -+} -+#else -+#warning "recvframe_expand_pkt not implement, defrag may crash system" -+#endif -+#endif -+ -+//perform defrag -+union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q); -+union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q) -+{ -+ _list *plist, *phead; -+ u8 *data,wlanhdr_offset; -+ u8 curfragnum; -+ struct recv_frame_hdr *pfhdr,*pnfhdr; -+ union recv_frame* prframe, *pnextrframe; -+ _queue *pfree_recv_queue; -+ -+_func_enter_; -+ -+ curfragnum=0; -+ pfree_recv_queue=&adapter->recvpriv.free_recv_queue; -+ -+ phead = get_list_head(defrag_q); -+ plist = get_next(phead); -+ prframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ pfhdr=&prframe->u.hdr; -+ rtw_list_delete(&(prframe->u.list)); -+ -+ if(curfragnum!=pfhdr->attrib.frag_num) -+ { -+ //the first fragment number must be 0 -+ //free the whole queue -+ rtw_free_recvframe(prframe, pfree_recv_queue); -+ rtw_free_recvframe_queue(defrag_q, pfree_recv_queue); -+ -+ return NULL; -+ } -+ -+#ifdef CONFIG_SDIO_HCI -+ recvframe_expand_pkt(adapter, prframe); -+#endif -+ -+ curfragnum++; -+ -+ plist= get_list_head(defrag_q); -+ -+ plist = get_next(plist); -+ -+ data=get_recvframe_data(prframe); -+ -+ while(rtw_end_of_queue_search(phead, plist) == _FALSE) -+ { -+ pnextrframe = LIST_CONTAINOR(plist, union recv_frame , u); -+ pnfhdr=&pnextrframe->u.hdr; -+ -+ -+ //check the fragment sequence (2nd ~n fragment frame) -+ -+ if(curfragnum!=pnfhdr->attrib.frag_num) -+ { -+ //the fragment number must be increasing (after decache) -+ //release the defrag_q & prframe -+ rtw_free_recvframe(prframe, pfree_recv_queue); -+ rtw_free_recvframe_queue(defrag_q, pfree_recv_queue); -+ return NULL; -+ } -+ -+ curfragnum++; -+ -+ //copy the 2nd~n fragment frame's payload to the first fragment -+ //get the 2nd~last fragment frame's payload -+ -+ wlanhdr_offset = pnfhdr->attrib.hdrlen + pnfhdr->attrib.iv_len; -+ -+ recvframe_pull(pnextrframe, wlanhdr_offset); -+ -+ //append to first fragment frame's tail (if privacy frame, pull the ICV) -+ recvframe_pull_tail(prframe, pfhdr->attrib.icv_len); -+ -+ //memcpy -+ _rtw_memcpy(pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len); -+ -+ recvframe_put(prframe, pnfhdr->len); -+ -+ pfhdr->attrib.icv_len=pnfhdr->attrib.icv_len; -+ plist = get_next(plist); -+ -+ }; -+ -+ //free the defrag_q queue and return the prframe -+ rtw_free_recvframe_queue(defrag_q, pfree_recv_queue); -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("Performance defrag!!!!!\n")); -+ -+_func_exit_; -+ -+ return prframe; -+} -+ -+//check if need to defrag, if needed queue the frame to defrag_q -+union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame) -+{ -+ u8 ismfrag; -+ u8 fragnum; -+ u8 *psta_addr; -+ struct recv_frame_hdr *pfhdr; -+ struct sta_info *psta; -+ struct sta_priv *pstapriv; -+ _list *phead; -+ union recv_frame *prtnframe = NULL; -+ _queue *pfree_recv_queue, *pdefrag_q; -+ -+_func_enter_; -+ -+ pstapriv = &padapter->stapriv; -+ -+ pfhdr = &precv_frame->u.hdr; -+ -+ pfree_recv_queue = &padapter->recvpriv.free_recv_queue; -+ -+ //need to define struct of wlan header frame ctrl -+ ismfrag = pfhdr->attrib.mfrag; -+ fragnum = pfhdr->attrib.frag_num; -+ -+ psta_addr = pfhdr->attrib.ta; -+ psta = rtw_get_stainfo(pstapriv, psta_addr); -+ if (psta == NULL) -+ { -+ u8 type = GetFrameType(pfhdr->rx_data); -+ if (type != WIFI_DATA_TYPE) { -+ psta = rtw_get_bcmc_stainfo(padapter); -+ pdefrag_q = &psta->sta_recvpriv.defrag_q; -+ } else -+ pdefrag_q = NULL; -+ } -+ else -+ pdefrag_q = &psta->sta_recvpriv.defrag_q; -+ -+ if ((ismfrag==0) && (fragnum==0)) -+ { -+ prtnframe = precv_frame;//isn't a fragment frame -+ } -+ -+ if (ismfrag==1) -+ { -+ //0~(n-1) fragment frame -+ //enqueue to defraf_g -+ if(pdefrag_q != NULL) -+ { -+ if(fragnum==0) -+ { -+ //the first fragment -+ if(_rtw_queue_empty(pdefrag_q) == _FALSE) -+ { -+ //free current defrag_q -+ rtw_free_recvframe_queue(pdefrag_q, pfree_recv_queue); -+ } -+ } -+ -+ -+ //Then enqueue the 0~(n-1) fragment into the defrag_q -+ -+ //_rtw_spinlock(&pdefrag_q->lock); -+ phead = get_list_head(pdefrag_q); -+ rtw_list_insert_tail(&pfhdr->list, phead); -+ //_rtw_spinunlock(&pdefrag_q->lock); -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("Enqueuq: ismfrag = %d, fragnum= %d\n", ismfrag,fragnum)); -+ -+ prtnframe=NULL; -+ -+ } -+ else -+ { -+ //can't find this ta's defrag_queue, so free this recv_frame -+ rtw_free_recvframe(precv_frame, pfree_recv_queue); -+ prtnframe=NULL; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("Free because pdefrag_q ==NULL: ismfrag = %d, fragnum= %d\n", ismfrag, fragnum)); -+ } -+ -+ } -+ -+ if((ismfrag==0)&&(fragnum!=0)) -+ { -+ //the last fragment frame -+ //enqueue the last fragment -+ if(pdefrag_q != NULL) -+ { -+ //_rtw_spinlock(&pdefrag_q->lock); -+ phead = get_list_head(pdefrag_q); -+ rtw_list_insert_tail(&pfhdr->list,phead); -+ //_rtw_spinunlock(&pdefrag_q->lock); -+ -+ //call recvframe_defrag to defrag -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("defrag: ismfrag = %d, fragnum= %d\n", ismfrag, fragnum)); -+ precv_frame = recvframe_defrag(padapter, pdefrag_q); -+ prtnframe=precv_frame; -+ -+ } -+ else -+ { -+ //can't find this ta's defrag_queue, so free this recv_frame -+ rtw_free_recvframe(precv_frame, pfree_recv_queue); -+ prtnframe=NULL; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("Free because pdefrag_q ==NULL: ismfrag = %d, fragnum= %d\n", ismfrag,fragnum)); -+ } -+ -+ } -+ -+ -+ if((prtnframe!=NULL)&&(prtnframe->u.hdr.attrib.privacy)) -+ { -+ //after defrag we must check tkip mic code -+ if(recvframe_chkmic(padapter, prtnframe)==_FAIL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic(padapter, prtnframe)==_FAIL\n")); -+ rtw_free_recvframe(prtnframe,pfree_recv_queue); -+ prtnframe=NULL; -+ } -+ } -+ -+_func_exit_; -+ -+ return prtnframe; -+ -+} -+ -+#define ENDIAN_FREE 1 -+ -+int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe); -+int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe) -+{ -+#if defined (PLATFORM_LINUX) || defined (PLATFORM_FREEBSD) //for amsdu TP improvement,Creator: Thomas -+ int a_len, padding_len; -+ u16 eth_type, nSubframe_Length; -+ u8 nr_subframes, i; -+ unsigned char *pdata; -+ struct rx_pkt_attrib *pattrib; -+#ifndef PLATFORM_FREEBSD -+ unsigned char *data_ptr; -+ _pkt *sub_skb,*subframes[MAX_SUBFRAME_COUNT]; -+#endif //PLATFORM_FREEBSD -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *pfree_recv_queue = &(precvpriv->free_recv_queue); -+ int ret = _SUCCESS; -+#ifdef PLATFORM_FREEBSD -+ struct mbuf *sub_m=NULL, *subframes[MAX_SUBFRAME_COUNT]; -+ u8 *ptr,offset; -+#endif //PLATFORM_FREEBSD -+ nr_subframes = 0; -+ -+ pattrib = &prframe->u.hdr.attrib; -+ -+ recvframe_pull(prframe, prframe->u.hdr.attrib.hdrlen); -+ -+ if(prframe->u.hdr.attrib.iv_len >0) -+ { -+ recvframe_pull(prframe, prframe->u.hdr.attrib.iv_len); -+ } -+ -+ a_len = prframe->u.hdr.len; -+ -+ pdata = prframe->u.hdr.rx_data; -+ -+ while(a_len > ETH_HLEN) { -+ -+ /* Offset 12 denote 2 mac address */ -+#ifdef ENDIAN_FREE -+ //nSubframe_Length = ntohs(*((u16*)(pdata + 12))); -+ nSubframe_Length = RTW_GET_BE16(pdata + 12); -+#else // ENDIAN_FREE -+ nSubframe_Length = *((u16*)(pdata + 12)); -+ //==m==>change the length order -+ nSubframe_Length = (nSubframe_Length>>8) + (nSubframe_Length<<8); -+ //ntohs(nSubframe_Length); -+#endif // ENDIAN_FREE -+ -+ if( a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length) ) { -+ DBG_871X("nRemain_Length is %d and nSubframe_Length is : %d\n",a_len,nSubframe_Length); -+ goto exit; -+ } -+ -+#ifndef PLATFORM_FREEBSD -+ /* move the data point to data content */ -+ pdata += ETH_HLEN; -+ a_len -= ETH_HLEN; -+ -+ /* Allocate new skb for releasing to upper layer */ -+#ifdef CONFIG_SKB_COPY -+ sub_skb = rtw_skb_alloc(nSubframe_Length + 12); -+ if(sub_skb) -+ { -+ skb_reserve(sub_skb, 12); -+ data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length); -+ _rtw_memcpy(data_ptr, pdata, nSubframe_Length); -+ } -+ else -+#endif // CONFIG_SKB_COPY -+ { -+ sub_skb = rtw_skb_clone(prframe->u.hdr.pkt); -+ if(sub_skb) -+ { -+ sub_skb->data = pdata; -+ sub_skb->len = nSubframe_Length; -+ skb_set_tail_pointer(sub_skb, nSubframe_Length); -+ } -+ else -+ { -+ DBG_871X("rtw_skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes); -+ break; -+ } -+ } -+ -+#else // PLATFORM_FREEBSD -+ -+ //PLATFORM_FREEBSD -+ //Allocate a mbuff, -+ //sub_m =m_devget(pdata, nSubframe_Length+12, 12, padapter->pifp,NULL); -+ sub_m =m_devget(pdata, nSubframe_Length+ETH_HLEN, ETHER_ALIGN, padapter->pifp,NULL); -+ -+ pdata += ETH_HLEN; -+ a_len -= ETH_HLEN; -+#endif // PLATFORM_FREEBSD -+ -+#ifndef PLATFORM_FREEBSD -+ //sub_skb->dev = padapter->pnetdev; -+ subframes[nr_subframes++] = sub_skb; -+#else //PLATFORM_FREEBSD -+ //PLATFORM_FREEBSD -+ subframes[nr_subframes++] = sub_m; -+#endif //PLATFORM_FREEBSD -+ -+ if(nr_subframes >= MAX_SUBFRAME_COUNT) { -+ DBG_871X("ParseSubframe(): Too many Subframes! Packets dropped!\n"); -+ break; -+ } -+ -+ pdata += nSubframe_Length; -+ a_len -= nSubframe_Length; -+ if(a_len != 0) { -+ padding_len = 4 - ((nSubframe_Length + ETH_HLEN) & (4-1)); -+ if(padding_len == 4) { -+ padding_len = 0; -+ } -+ -+ if(a_len < padding_len) { -+ goto exit; -+ } -+ pdata += padding_len; -+ a_len -= padding_len; -+ } -+ } -+ -+ for(i=0; idata[6]); -+ eth_type = RTW_GET_BE16(&sub_skb->data[6]); -+#else // ENDIAN_FREE -+ eth_type = (sub_skb->data[6] << 8) | sub_skb->data[7]; -+#endif // ENDIAN_FREE -+ if (sub_skb->len >= 8 && -+ ((_rtw_memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) && -+ eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || -+ _rtw_memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE) )) { -+ /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ -+ skb_pull(sub_skb, SNAP_SIZE); -+ _rtw_memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN); -+ _rtw_memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN); -+ } else { -+ u16 len; -+ /* Leave Ethernet header part of hdr and full payload */ -+ len = htons(sub_skb->len); -+ _rtw_memcpy(skb_push(sub_skb, 2), &len, 2); -+ _rtw_memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN); -+ _rtw_memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN); -+ } -+ -+ /* Indicat the packets to upper layer */ -+ if (sub_skb) { -+ //memset(sub_skb->cb, 0, sizeof(sub_skb->cb)); -+ -+#ifdef CONFIG_BR_EXT -+ // Insert NAT2.5 RX here! -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ void *br_port = NULL; -+ -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ br_port = padapter->pnetdev->br_port; -+#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ rcu_read_lock(); -+ br_port = rcu_dereference(padapter->pnetdev->rx_handler_data); -+ rcu_read_unlock(); -+#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ -+ -+ if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) -+ { -+ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb); -+ if (nat25_handle_frame(padapter, sub_skb) == -1) { -+ //priv->ext_stats.rx_data_drops++; -+ //DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n"); -+ //return FAIL; -+ -+#if 1 -+ // bypass this frame to upper layer!! -+#else -+ rtw_skb_free(sub_skb); -+ continue; -+#endif -+ } -+ } -+#endif // CONFIG_BR_EXT -+ -+ sub_skb->protocol = eth_type_trans(sub_skb, padapter->pnetdev); -+ sub_skb->dev = padapter->pnetdev; -+ -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX -+ if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) { -+ sub_skb->ip_summed = CHECKSUM_UNNECESSARY; -+ } else { -+ sub_skb->ip_summed = CHECKSUM_NONE; -+ } -+#else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */ -+ sub_skb->ip_summed = CHECKSUM_NONE; -+#endif //CONFIG_TCP_CSUM_OFFLOAD_RX -+ -+ rtw_netif_rx(padapter->pnetdev, sub_skb); -+ } -+#else //PLATFORM_FREEBSD -+ -+ //PLATFORM_FREEBSD -+ sub_m = subframes[i]; -+ ptr=mtod(sub_m, u8 *); -+ offset=ETH_HLEN; -+ /* convert hdr + possible LLC headers into Ethernet header */ -+#ifdef ENDIAN_FREE -+ eth_type = ntohs(*(u16*)&ptr[offset+6]); -+#else // ENDIAN_FREE -+ eth_type = ( ptr[offset+6] << 8) | ptr[offset+7]; -+#endif // ENDIAN_FREE -+ if (sub_m->m_pkthdr.len >= ETH_HLEN+8 && -+ ((_rtw_memcmp(ptr+ETH_HLEN, rtw_rfc1042_header, SNAP_SIZE) && -+ eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || -+ _rtw_memcmp(ptr+ETH_HLEN, rtw_bridge_tunnel_header, SNAP_SIZE) )) { -+ /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ -+ offset+=SNAP_SIZE; -+ _rtw_memcpy(&ptr[offset-ETH_ALEN], pattrib->src, ETH_ALEN); -+ offset-=ETH_ALEN; -+ _rtw_memcpy(&ptr[offset-ETH_ALEN], pattrib->dst, ETH_ALEN); -+ offset-=ETH_ALEN; -+ } else { -+ u16 len; -+ /* Leave Ethernet header part of hdr and full payload */ -+ len = htons(sub_m->m_pkthdr.len-offset); -+ _rtw_memcpy(&ptr[offset- 2], &len, 2); -+ offset-=2; -+ _rtw_memcpy(&ptr[offset-ETH_ALEN], pattrib->src, ETH_ALEN); -+ offset-=ETH_ALEN; -+ _rtw_memcpy(&ptr[offset-ETH_ALEN], pattrib->dst, ETH_ALEN); -+ offset-=ETH_ALEN; -+ } -+ -+ m_adj(sub_m,offset); -+ -+ /* Indicat the packets to upper layer */ -+ if (sub_m) { -+ -+#if 0 -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX -+ if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) { -+ sub_skb->ip_summed = CHECKSUM_UNNECESSARY; -+ } else { -+ sub_skb->ip_summed = CHECKSUM_NONE; -+ } -+#else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */ -+ sub_skb->ip_summed = CHECKSUM_NONE; -+#endif //CONFIG_TCP_CSUM_OFFLOAD_RX -+#endif //0 -+ -+ if ( ((u32)(mtod(sub_m, caddr_t) + 14) % 4) != 0) -+ printf("%s()-%d: mtod(sub_m) = %p\n", __FUNCTION__, __LINE__, mtod(sub_m, caddr_t)); -+#ifdef CONFIG_RX_INDICATE_QUEUE -+ IF_ENQUEUE(&precvpriv->rx_indicate_queue, sub_m); -+ if (_IF_QLEN(&precvpriv->rx_indicate_queue) <= 1) { -+ taskqueue_enqueue(taskqueue_thread, &precvpriv->rx_indicate_tasklet); -+ } -+#else // CONFIG_RX_INDICATE_QUEUE -+ (*padapter->pifp->if_input)(padapter->pifp, sub_m); -+#endif // CONFIG_RX_INDICATE_QUEUE -+ } -+ -+#endif //PLATFORM_FREEBSD -+ } -+ -+exit: -+ -+ prframe->u.hdr.len=0; -+ rtw_free_recvframe(prframe, pfree_recv_queue);//free this recv_frame -+ -+ return ret; -+#else // || defined (PLATFORM_LINUX) || defined (PLATFORM_FREEBSD) -+#ifdef PLATFORM_WINDOWS -+ _irqL irql; -+#endif //PLATFORM_WINDOWS -+ unsigned char *ptr, *pdata, *pbuf, *psnap_type; -+ union recv_frame *pnrframe, *pnrframe_new; -+ int a_len, mv_len, padding_len; -+ u16 eth_type, type_len; -+ u8 bsnaphdr; -+ struct ieee80211_snap_hdr *psnap; -+ struct _vlan *pvlan; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *pfree_recv_queue = &(precvpriv->free_recv_queue); -+ int ret = _SUCCESS; -+#ifdef PLATFORM_WINDOWS -+ struct recv_buf *precvbuf = prframe->u.hdr.precvbuf; -+#endif //PLATFORM_WINDOWS -+ a_len = prframe->u.hdr.len - prframe->u.hdr.attrib.hdrlen; -+ -+ recvframe_pull(prframe, prframe->u.hdr.attrib.hdrlen); -+ -+ if(prframe->u.hdr.attrib.iv_len >0) -+ { -+ recvframe_pull(prframe, prframe->u.hdr.attrib.iv_len); -+ } -+ -+ pdata = prframe->u.hdr.rx_data; -+ -+ prframe->u.hdr.len=0; -+ -+ pnrframe = prframe; -+ -+ -+ do{ -+ -+ mv_len=0; -+ pnrframe->u.hdr.rx_data = pnrframe->u.hdr.rx_tail = pdata; -+ ptr = pdata; -+ -+ -+ _rtw_memcpy(pnrframe->u.hdr.attrib.dst, ptr, ETH_ALEN); -+ ptr+=ETH_ALEN; -+ _rtw_memcpy(pnrframe->u.hdr.attrib.src, ptr, ETH_ALEN); -+ ptr+=ETH_ALEN; -+ -+ _rtw_memcpy(&type_len, ptr, 2); -+ type_len= ntohs((unsigned short )type_len); -+ ptr +=2; -+ mv_len += ETH_HLEN; -+ -+ recvframe_put(pnrframe, type_len+ETH_HLEN);//update tail; -+ -+ if(pnrframe->u.hdr.rx_data >= pnrframe->u.hdr.rx_tail || type_len<8) -+ { -+ //panic("pnrframe->u.hdr.rx_data >= pnrframe->u.hdr.rx_tail || type_len<8\n"); -+ -+ rtw_free_recvframe(pnrframe, pfree_recv_queue); -+ -+ goto exit; -+ } -+ -+ psnap=(struct ieee80211_snap_hdr *)(ptr); -+ psnap_type=ptr+SNAP_SIZE; -+ if (psnap->dsap==0xaa && psnap->ssap==0xaa && psnap->ctrl==0x03) -+ { -+ if ( _rtw_memcmp(psnap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN)) -+ { -+ bsnaphdr=_TRUE;//wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_RFC1042; -+ } -+ else if (_rtw_memcmp(psnap->oui, SNAP_HDR_APPLETALK_DDP, WLAN_IEEE_OUI_LEN) && -+ _rtw_memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_DDP, 2) ) -+ { -+ bsnaphdr=_TRUE; //wlan_pkt_format = WLAN_PKT_FORMAT_APPLETALK; -+ } -+ else if (_rtw_memcmp( psnap->oui, oui_8021h, WLAN_IEEE_OUI_LEN)) -+ { -+ bsnaphdr=_TRUE; //wlan_pkt_format = WLAN_PKT_FORMAT_SNAP_TUNNEL; -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("drop pkt due to invalid frame format!\n")); -+ -+ //KeBugCheckEx(0x87123333, 0xe0, 0x4c, 0x87, 0xdd); -+ -+ //panic("0x87123333, 0xe0, 0x4c, 0x87, 0xdd\n"); -+ -+ rtw_free_recvframe(pnrframe, pfree_recv_queue); -+ -+ goto exit; -+ } -+ -+ } -+ else -+ { -+ bsnaphdr=_FALSE;//wlan_pkt_format = WLAN_PKT_FORMAT_OTHERS; -+ } -+ -+ ptr += (bsnaphdr?SNAP_SIZE:0); -+ _rtw_memcpy(ð_type, ptr, 2); -+ eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type -+ -+ mv_len+= 2+(bsnaphdr?SNAP_SIZE:0); -+ ptr += 2;//now move to iphdr; -+ -+ pvlan = NULL; -+ if(eth_type == 0x8100) //vlan -+ { -+ pvlan = (struct _vlan *)ptr; -+ ptr+=4; -+ mv_len+=4; -+ } -+ -+ if(eth_type==0x0800)//ip -+ { -+ struct iphdr* piphdr = (struct iphdr*)ptr; -+ -+ -+ if (piphdr->protocol == 0x06) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("@@@===recv tcp len:%d @@@===\n", pnrframe->u.hdr.len)); -+ } -+ } -+#ifdef PLATFORM_OS_XP -+ else -+ { -+ NDIS_PACKET_8021Q_INFO VlanPriInfo; -+ UINT32 UserPriority = pnrframe->u.hdr.attrib.priority; -+ UINT32 VlanID = (pvlan!=NULL ? get_vlan_id(pvlan) : 0 ); -+ -+ VlanPriInfo.Value = // Get current value. -+ NDIS_PER_PACKET_INFO_FROM_PACKET(pnrframe->u.hdr.pkt, Ieee8021QInfo); -+ -+ VlanPriInfo.TagHeader.UserPriority = UserPriority; -+ VlanPriInfo.TagHeader.VlanId = VlanID; -+ -+ VlanPriInfo.TagHeader.CanonicalFormatId = 0; // Should be zero. -+ VlanPriInfo.TagHeader.Reserved = 0; // Should be zero. -+ NDIS_PER_PACKET_INFO_FROM_PACKET(pnrframe->u.hdr.pkt, Ieee8021QInfo) = VlanPriInfo.Value; -+ -+ } -+#endif //PLATFORM_OS_XP -+ -+ pbuf = recvframe_pull(pnrframe, (mv_len-sizeof(struct ethhdr))); -+ -+ _rtw_memcpy(pbuf, pnrframe->u.hdr.attrib.dst, ETH_ALEN); -+ _rtw_memcpy(pbuf+ETH_ALEN, pnrframe->u.hdr.attrib.src, ETH_ALEN); -+ -+ eth_type = htons((unsigned short)eth_type) ; -+ _rtw_memcpy(pbuf+12, ð_type, 2); -+ -+ padding_len = (4) - ((type_len + ETH_HLEN)&(4-1)); -+ -+ a_len -= (type_len + ETH_HLEN + padding_len) ; -+ -+ -+#if 0 -+ -+ if(a_len > ETH_HLEN) -+ { -+ pnrframe_new = rtw_alloc_recvframe(pfree_recv_queue); -+ if(pnrframe_new) -+ { -+ _pkt *pskb_copy; -+ unsigned int copy_len = pnrframe->u.hdr.len; -+ -+ _rtw_init_listhead(&pnrframe_new->u.hdr.list); -+ -+ pskb_copy = rtw_skb_alloc(copy_len+64); -+ -+ if(pskb_copy==NULL) -+ { -+ DBG_871X("amsdu_to_msdu:can not all(ocate memory for skb copy\n"); -+ } -+ -+ pnrframe_new->u.hdr.pkt = pskb_copy; -+ -+ _rtw_memcpy(pskb_copy->data, pnrframe->u.hdr.rx_data, copy_len); -+ -+ pnrframe_new->u.hdr.rx_data = pnrframe->u.hdr.rx_data; -+ pnrframe_new->u.hdr.rx_tail = pnrframe->u.hdr.rx_data + copy_len; -+ -+ -+ if ((padapter->bDriverStopped ==_FALSE)&&( padapter->bSurpriseRemoved==_FALSE)) -+ { -+ rtw_recv_indicatepkt(padapter, pnrframe_new);//indicate this recv_frame -+ } -+ else -+ { -+ rtw_free_recvframe(pnrframe_new, pfree_recv_queue);//free this recv_frame -+ } -+ -+ } -+ else -+ { -+ DBG_871X("amsdu_to_msdu:can not allocate memory for pnrframe_new\n"); -+ } -+ -+ } -+ else -+ { -+ if ((padapter->bDriverStopped ==_FALSE)&&( padapter->bSurpriseRemoved==_FALSE)) -+ { -+ rtw_recv_indicatepkt(padapter, pnrframe);//indicate this recv_frame -+ } -+ else -+ { -+ rtw_free_recvframe(pnrframe, pfree_recv_queue);//free this recv_frame -+ } -+ -+ pnrframe = NULL; -+ -+ } -+ -+#else // 0 -+ -+ //padding_len = (4) - ((type_len + ETH_HLEN)&(4-1)); -+ -+ //a_len -= (type_len + ETH_HLEN + padding_len) ; -+ -+ pnrframe_new = NULL; -+ -+ -+ if(a_len > ETH_HLEN) -+ { -+ pnrframe_new = rtw_alloc_recvframe(pfree_recv_queue); -+ -+ if(pnrframe_new) -+ { -+ -+ -+ //pnrframe_new->u.hdr.precvbuf = precvbuf;//precvbuf is assigned before call rtw_init_recvframe() -+ //rtw_init_recvframe(pnrframe_new, precvpriv); -+ { -+#ifdef PLATFORM_LINUX -+ _pkt *pskb = pnrframe->u.hdr.pkt; -+#endif //PLATFORM_LINUX -+ _rtw_init_listhead(&pnrframe_new->u.hdr.list); -+ -+ pnrframe_new->u.hdr.len=0; -+ -+#ifdef PLATFORM_LINUX -+ if(pskb) -+ { -+ pnrframe_new->u.hdr.pkt = rtw_skb_clone(pskb); -+ } -+#endif //PLATFORM_LINUX -+ -+ } -+ -+ pdata += (type_len + ETH_HLEN + padding_len); -+ pnrframe_new->u.hdr.rx_head = pnrframe_new->u.hdr.rx_data = pnrframe_new->u.hdr.rx_tail = pdata; -+ pnrframe_new->u.hdr.rx_end = pdata + a_len + padding_len;// -+ -+#ifdef PLATFORM_WINDOWS -+ pnrframe_new->u.hdr.precvbuf=precvbuf; -+ _enter_critical_bh(&precvbuf->recvbuf_lock, &irql); -+ precvbuf->ref_cnt++; -+ _exit_critical_bh(&precvbuf->recvbuf_lock, &irql); -+#endif //PLATFORM_WINDOWS -+ -+ } -+ else -+ { -+ //panic("pnrframe_new=%x\n", pnrframe_new); -+ } -+ } -+ -+ -+ if ((padapter->bDriverStopped ==_FALSE)&&( padapter->bSurpriseRemoved==_FALSE) ) -+ { -+ rtw_recv_indicatepkt(padapter, pnrframe);//indicate this recv_frame -+ } -+ else -+ { -+ rtw_free_recvframe(pnrframe, pfree_recv_queue);//free this recv_frame -+ } -+ -+ -+ pnrframe = NULL; -+ if(pnrframe_new) -+ { -+ pnrframe = pnrframe_new; -+ } -+ -+ -+#endif // end defined (PLATFORM_LINUX) || defined (PLATFORM_FREEBSD) -+ -+ }while(pnrframe); -+ -+exit: -+ -+ return ret; -+#endif -+} -+ -+int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num); -+int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) -+{ -+ u8 wsize = preorder_ctrl->wsize_b; -+ u16 wend = (preorder_ctrl->indicate_seq + wsize -1) & 0xFFF;//% 4096; -+ -+ // Rx Reorder initialize condition. -+ if (preorder_ctrl->indicate_seq == 0xFFFF) -+ { -+ preorder_ctrl->indicate_seq = seq_num; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, seq_num); -+ #endif -+ -+ //DbgPrint("check_indicate_seq, 1st->indicate_seq=%d\n", precvpriv->indicate_seq); -+ } -+ -+ //DbgPrint("enter->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); -+ -+ // Drop out the packet which SeqNum is smaller than WinStart -+ if( SN_LESS(seq_num, preorder_ctrl->indicate_seq) ) -+ { -+ //RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum)); -+ //DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); -+ -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__, -+ preorder_ctrl->indicate_seq, seq_num); -+ #endif -+ -+ -+ return _FALSE; -+ } -+ -+ // -+ // Sliding window manipulation. Conditions includes: -+ // 1. Incoming SeqNum is equal to WinStart =>Window shift 1 -+ // 2. Incoming SeqNum is larger than the WinEnd => Window shift N -+ // -+ if( SN_EQUAL(seq_num, preorder_ctrl->indicate_seq) ) -+ { -+ preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, seq_num); -+ #endif -+ } -+ else if(SN_LESS(wend, seq_num)) -+ { -+ //RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum)); -+ //DbgPrint("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); -+ -+ // boundary situation, when seq_num cross 0xFFF -+ if(seq_num >= (wsize - 1)) -+ preorder_ctrl->indicate_seq = seq_num + 1 -wsize; -+ else -+ preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1; -+ -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, seq_num); -+ #endif -+ } -+ -+ //DbgPrint("exit->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); -+ -+ return _TRUE; -+} -+ -+int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe); -+int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe) -+{ -+ struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; -+ _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; -+ _list *phead, *plist; -+ union recv_frame *pnextrframe; -+ struct rx_pkt_attrib *pnextattrib; -+ -+ //DbgPrint("+enqueue_reorder_recvframe()\n"); -+ -+ //_enter_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ //_rtw_spinlock_ex(&ppending_recvframe_queue->lock); -+ -+ -+ phead = get_list_head(ppending_recvframe_queue); -+ plist = get_next(phead); -+ -+ while(rtw_end_of_queue_search(phead, plist) == _FALSE) -+ { -+ pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ pnextattrib = &pnextrframe->u.hdr.attrib; -+ -+ if(SN_LESS(pnextattrib->seq_num, pattrib->seq_num)) -+ { -+ plist = get_next(plist); -+ } -+ else if( SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num)) -+ { -+ //Duplicate entry is found!! Do not insert current entry. -+ //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); -+ -+ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ -+ return _FALSE; -+ } -+ else -+ { -+ break; -+ } -+ -+ //DbgPrint("enqueue_reorder_recvframe():while\n"); -+ -+ } -+ -+ -+ //_enter_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ //_rtw_spinlock_ex(&ppending_recvframe_queue->lock); -+ -+ rtw_list_delete(&(prframe->u.hdr.list)); -+ -+ rtw_list_insert_tail(&(prframe->u.hdr.list), plist); -+ -+ //_rtw_spinunlock_ex(&ppending_recvframe_queue->lock); -+ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ -+ -+ //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); -+ return _TRUE; -+ -+} -+ -+int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced); -+int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced) -+{ -+ //_irqL irql; -+ //u8 bcancelled; -+ _list *phead, *plist; -+ union recv_frame *prframe; -+ struct rx_pkt_attrib *pattrib; -+ //u8 index = 0; -+ int bPktInBuf = _FALSE; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; -+ -+ //DbgPrint("+recv_indicatepkts_in_order\n"); -+ -+ //_enter_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ //_rtw_spinlock_ex(&ppending_recvframe_queue->lock); -+ -+ phead = get_list_head(ppending_recvframe_queue); -+ plist = get_next(phead); -+ -+#if 0 -+ // Check if there is any other indication thread running. -+ if(pTS->RxIndicateState == RXTS_INDICATE_PROCESSING) -+ return; -+#endif -+ -+ // Handling some condition for forced indicate case. -+ if(bforced==_TRUE) -+ { -+ if(rtw_is_list_empty(phead)) -+ { -+ // _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ //_rtw_spinunlock_ex(&ppending_recvframe_queue->lock); -+ return _TRUE; -+ } -+ -+ prframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ pattrib = &prframe->u.hdr.attrib; -+ preorder_ctrl->indicate_seq = pattrib->seq_num; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, pattrib->seq_num); -+ #endif -+ } -+ -+ // Prepare indication list and indication. -+ // Check if there is any packet need indicate. -+ while(!rtw_is_list_empty(phead)) -+ { -+ -+ prframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ pattrib = &prframe->u.hdr.attrib; -+ -+ if(!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, -+ ("recv_indicatepkts_in_order: indicate=%d seq=%d amsdu=%d\n", -+ preorder_ctrl->indicate_seq, pattrib->seq_num, pattrib->amsdu)); -+ -+#if 0 -+ // This protect buffer from overflow. -+ if(index >= REORDER_WIN_SIZE) -+ { -+ RT_ASSERT(FALSE, ("IndicateRxReorderList(): Buffer overflow!! \n")); -+ bPktInBuf = TRUE; -+ break; -+ } -+#endif -+ -+ plist = get_next(plist); -+ rtw_list_delete(&(prframe->u.hdr.list)); -+ -+ if(SN_EQUAL(preorder_ctrl->indicate_seq, pattrib->seq_num)) -+ { -+ preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, pattrib->seq_num); -+ #endif -+ } -+ -+#if 0 -+ index++; -+ if(index==1) -+ { -+ //Cancel previous pending timer. -+ //PlatformCancelTimer(Adapter, &pTS->RxPktPendingTimer); -+ if(bforced!=_TRUE) -+ { -+ //DBG_871X("_cancel_timer(&preorder_ctrl->reordering_ctrl_timer, &bcancelled);\n"); -+ _cancel_timer(&preorder_ctrl->reordering_ctrl_timer, &bcancelled); -+ } -+ } -+#endif -+ -+ //Set this as a lock to make sure that only one thread is indicating packet. -+ //pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; -+ -+ // Indicate packets -+ //RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!! \n")); -+ -+ -+ //indicate this recv_frame -+ //DbgPrint("recv_indicatepkts_in_order, indicate_seq=%d, seq_num=%d\n", precvpriv->indicate_seq, pattrib->seq_num); -+ if(!pattrib->amsdu) -+ { -+ //DBG_871X("recv_indicatepkts_in_order, amsdu!=1, indicate_seq=%d, seq_num=%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); -+ -+ if ((padapter->bDriverStopped == _FALSE) && -+ (padapter->bSurpriseRemoved == _FALSE)) -+ { -+ -+ rtw_recv_indicatepkt(padapter, prframe);//indicate this recv_frame -+ -+ } -+ } -+ else if(pattrib->amsdu==1) -+ { -+ if(amsdu_to_msdu(padapter, prframe)!=_SUCCESS) -+ { -+ rtw_free_recvframe(prframe, &precvpriv->free_recv_queue); -+ } -+ } -+ else -+ { -+ //error condition; -+ } -+ -+ -+ //Update local variables. -+ bPktInBuf = _FALSE; -+ -+ } -+ else -+ { -+ bPktInBuf = _TRUE; -+ break; -+ } -+ -+ //DbgPrint("recv_indicatepkts_in_order():while\n"); -+ -+ } -+ -+ //_rtw_spinunlock_ex(&ppending_recvframe_queue->lock); -+ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ -+/* -+ //Release the indication lock and set to new indication step. -+ if(bPktInBuf) -+ { -+ // Set new pending timer. -+ //pTS->RxIndicateState = RXTS_INDICATE_REORDER; -+ //PlatformSetTimer(Adapter, &pTS->RxPktPendingTimer, pHTInfo->RxReorderPendingTime); -+ //DBG_871X("_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME)\n"); -+ _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); -+ } -+ else -+ { -+ //pTS->RxIndicateState = RXTS_INDICATE_IDLE; -+ } -+*/ -+ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ -+ //return _TRUE; -+ return bPktInBuf; -+ -+} -+ -+int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe); -+int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) -+{ -+ _irqL irql; -+ int retval = _SUCCESS; -+ struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; -+ struct recv_reorder_ctrl *preorder_ctrl = prframe->u.hdr.preorder_ctrl; -+ _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; -+ -+ if(!pattrib->amsdu) -+ { -+ //s1. -+ wlanhdr_to_ethhdr(prframe); -+ -+ //if ((pattrib->qos!=1) /*|| pattrib->priority!=0 || IS_MCAST(pattrib->ra)*/ -+ // || (pattrib->eth_type==0x0806) || (pattrib->ack_policy!=0)) -+ if (pattrib->qos!=1) -+ { -+ if ((padapter->bDriverStopped == _FALSE) && -+ (padapter->bSurpriseRemoved == _FALSE)) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_indicatepkt_reorder -recv_func recv_indicatepkt\n" )); -+ -+ rtw_recv_indicatepkt(padapter, prframe); -+ return _SUCCESS; -+ -+ } -+ -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__); -+ #endif -+ -+ return _FAIL; -+ -+ } -+ -+ if (preorder_ctrl->enable == _FALSE) -+ { -+ //indicate this recv_frame -+ preorder_ctrl->indicate_seq = pattrib->seq_num; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, pattrib->seq_num); -+ #endif -+ -+ rtw_recv_indicatepkt(padapter, prframe); -+ -+ preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, pattrib->seq_num); -+ #endif -+ -+ return _SUCCESS; -+ } -+ -+#ifndef CONFIG_RECV_REORDERING_CTRL -+ //indicate this recv_frame -+ rtw_recv_indicatepkt(padapter, prframe); -+ return _SUCCESS; -+#endif -+ -+ } -+ else if(pattrib->amsdu==1) //temp filter -> means didn't support A-MSDUs in a A-MPDU -+ { -+ if (preorder_ctrl->enable == _FALSE) -+ { -+ preorder_ctrl->indicate_seq = pattrib->seq_num; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, pattrib->seq_num); -+ #endif -+ -+ retval = amsdu_to_msdu(padapter, prframe); -+ -+ preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, pattrib->seq_num); -+ #endif -+ -+ if(retval != _SUCCESS){ -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__); -+ #endif -+ } -+ -+ return retval; -+ } -+ } -+ else -+ { -+ -+ } -+ -+ _enter_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, -+ ("recv_indicatepkt_reorder: indicate=%d seq=%d\n", -+ preorder_ctrl->indicate_seq, pattrib->seq_num)); -+ -+ //s2. check if winstart_b(indicate_seq) needs to been updated -+ if(!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) -+ { -+ //pHTInfo->RxReorderDropCounter++; -+ //ReturnRFDList(Adapter, pRfd); -+ //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("RxReorderIndicatePacket() ==> Packet Drop!!\n")); -+ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ //return _FAIL; -+ -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__); -+ #endif -+#if 0 -+ rtw_recv_indicatepkt(padapter, prframe); -+ -+ _exit_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ -+ goto _success_exit; -+#else -+ goto _err_exit; -+#endif -+ } -+ -+ -+ //s3. Insert all packet into Reorder Queue to maintain its ordering. -+ if(!enqueue_reorder_recvframe(preorder_ctrl, prframe)) -+ { -+ //DbgPrint("recv_indicatepkt_reorder, enqueue_reorder_recvframe fail!\n"); -+ //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); -+ //return _FAIL; -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__); -+ #endif -+ goto _err_exit; -+ } -+ -+ -+ //s4. -+ // Indication process. -+ // After Packet dropping and Sliding Window shifting as above, we can now just indicate the packets -+ // with the SeqNum smaller than latest WinStart and buffer other packets. -+ // -+ // For Rx Reorder condition: -+ // 1. All packets with SeqNum smaller than WinStart => Indicate -+ // 2. All packets with SeqNum larger than or equal to WinStart => Buffer it. -+ // -+ -+ //recv_indicatepkts_in_order(padapter, preorder_ctrl, _TRUE); -+ if(recv_indicatepkts_in_order(padapter, preorder_ctrl, _FALSE)==_TRUE) -+ { -+ _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); -+ _exit_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ } -+ else -+ { -+ _exit_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); -+ } -+ -+ -+_success_exit: -+ -+ return _SUCCESS; -+ -+_err_exit: -+ -+ _exit_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ -+ return _FAIL; -+} -+ -+ -+void rtw_reordering_ctrl_timeout_handler(void *pcontext) -+{ -+ _irqL irql; -+ struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext; -+ _adapter *padapter = preorder_ctrl->padapter; -+ _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; -+ -+ -+ if(padapter->bDriverStopped ||padapter->bSurpriseRemoved) -+ { -+ return; -+ } -+ -+ //DBG_871X("+rtw_reordering_ctrl_timeout_handler()=>\n"); -+ -+ _enter_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ -+ if(recv_indicatepkts_in_order(padapter, preorder_ctrl, _TRUE)==_TRUE) -+ { -+ _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); -+ } -+ -+ _exit_critical_bh(&ppending_recvframe_queue->lock, &irql); -+ -+} -+ -+int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe); -+int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe) -+{ -+ int retval = _SUCCESS; -+ //struct recv_priv *precvpriv = &padapter->recvpriv; -+ //struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+#ifdef CONFIG_TDLS -+ struct sta_info *psta = prframe->u.hdr.psta; -+#endif //CONFIG_TDLS -+ -+#ifdef CONFIG_80211N_HT -+ -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ -+#ifdef CONFIG_TDLS -+ if( (phtpriv->ht_option==_TRUE) || -+ ((psta->tdls_sta_state & TDLS_LINKED_STATE) && -+ (psta->htpriv.ht_option==_TRUE) && -+ (psta->htpriv.ampdu_enable==_TRUE))) //B/G/N Mode -+#else -+ if(phtpriv->ht_option==_TRUE) //B/G/N Mode -+#endif //CONFIG_TDLS -+ { -+ //prframe->u.hdr.preorder_ctrl = &precvpriv->recvreorder_ctrl[pattrib->priority]; -+ -+ if(recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)// including perform A-MPDU Rx Ordering Buffer Control -+ { -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__); -+ #endif -+ -+ if ((padapter->bDriverStopped == _FALSE) && -+ (padapter->bSurpriseRemoved == _FALSE)) -+ { -+ retval = _FAIL; -+ return retval; -+ } -+ } -+ } -+ else //B/G mode -+#endif -+ { -+ retval=wlanhdr_to_ethhdr (prframe); -+ if(retval != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__); -+ #endif -+ return retval; -+ } -+ -+ if ((padapter->bDriverStopped ==_FALSE)&&( padapter->bSurpriseRemoved==_FALSE)) -+ { -+ //indicate this recv_frame -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n" )); -+ rtw_recv_indicatepkt(padapter, prframe); -+ -+ -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func free_indicatepkt\n" )); -+ -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ retval = _FAIL; -+ return retval; -+ } -+ -+ } -+ -+ return retval; -+ -+} -+ -+static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe) -+{ -+ int ret = _SUCCESS; -+ struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; -+ -+#ifdef CONFIG_MP_INCLUDED -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+#endif //CONFIG_MP_INCLUDED -+ -+#ifdef CONFIG_MP_INCLUDED -+ if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE))//&&(padapter->mppriv.check_mp_pkt == 0)) -+ { -+ if (pattrib->crc_err == 1) -+ padapter->mppriv.rx_crcerrpktcount++; -+ else -+ padapter->mppriv.rx_pktcount++; -+ -+ if (check_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE) == _FALSE) { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("MP - Not in loopback mode , drop pkt \n")); -+ ret = _FAIL; -+ rtw_free_recvframe(rframe, pfree_recv_queue);//free this recv_frame -+ goto exit; -+ } -+ } -+#endif -+ -+ //check the frame crtl field and decache -+ ret = validate_recv_frame(padapter, rframe); -+ if (ret != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n")); -+ rtw_free_recvframe(rframe, pfree_recv_queue);//free this recv_frame -+ goto exit; -+ } -+ -+exit: -+ return ret; -+} -+ -+static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) -+{ -+ int ret = _SUCCESS; -+ union recv_frame *orig_prframe = prframe; -+ struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; -+ -+#ifdef CONFIG_MP_INCLUDED -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+#endif //CONFIG_MP_INCLUDED -+ -+#ifdef CONFIG_TDLS -+ u8 *psnap_type, *pcategory; -+ struct sta_info *ptdls_sta = NULL; -+#endif //CONFIG_TDLS -+ -+ -+ // DATA FRAME -+ rtw_led_control(padapter, LED_CTL_RX); -+ -+ prframe = decryptor(padapter, prframe); -+ if (prframe == NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decryptor: drop pkt\n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__); -+ #endif -+ ret = _FAIL; -+ goto _recv_data_drop; -+ } -+ -+#if 0 -+ if ( padapter->adapter_type == PRIMARY_ADAPTER ) -+ { -+ DBG_871X("+++\n"); -+ { -+ int i; -+ u8 *ptr = get_recvframe_data(prframe); -+ for(i=0; i<140;i=i+8) -+ DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr+i), -+ *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); -+ -+ } -+ DBG_871X("---\n"); -+ } -+#endif //RTK_DMP_PLATFORM -+ -+#ifdef CONFIG_TDLS -+ //check TDLS frame -+ psnap_type = get_recvframe_data(orig_prframe); -+ psnap_type+=pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE; -+ pcategory = psnap_type + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN; -+ -+ if((_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_TDLS, ETH_TYPE_LEN)) && -+ ((*pcategory==RTW_WLAN_CATEGORY_TDLS) || (*pcategory==RTW_WLAN_CATEGORY_P2P))){ -+ ret = OnTDLS(padapter, prframe); //all of functions will return _FAIL -+ goto _exit_recv_func; -+ } -+#endif //CONFIG_TDLS -+ -+ prframe = recvframe_chk_defrag(padapter, prframe); -+ if(prframe==NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chk_defrag: drop pkt\n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__); -+ #endif -+ goto _recv_data_drop; -+ } -+ -+ prframe=portctrl(padapter, prframe); -+ if (prframe == NULL) { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt \n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__); -+ #endif -+ ret = _FAIL; -+ goto _recv_data_drop; -+ } -+ -+#ifdef CONFIG_TDLS -+ if(padapter->tdlsinfo.setup_state == TDLS_LINKED_STATE) -+ ptdls_sta = rtw_get_stainfo(&padapter->stapriv, pattrib->src); -+ count_rx_stats(padapter, prframe, ptdls_sta); -+#else -+ count_rx_stats(padapter, prframe, NULL); -+#endif //CONFIG_TDLS -+ -+#ifdef CONFIG_80211N_HT -+ -+ ret = process_recv_indicatepkts(padapter, prframe); -+ if (ret != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail! \n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s recv_func: process_recv_indicatepkts fail!\n", __FUNCTION__); -+ #endif -+ rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame -+ goto _recv_data_drop; -+ } -+ -+#else // CONFIG_80211N_HT -+ -+ if (!pattrib->amsdu) -+ { -+ ret = wlanhdr_to_ethhdr (prframe); -+ if (ret != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n")); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__); -+ #endif -+ rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame -+ goto _recv_data_drop; -+ } -+ -+ if ((padapter->bDriverStopped == _FALSE) && (padapter->bSurpriseRemoved == _FALSE)) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: recv_func rtw_recv_indicatepkt\n" )); -+ //indicate this recv_frame -+ ret = rtw_recv_indicatepkt(padapter, prframe); -+ if (ret != _SUCCESS) -+ { -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __FUNCTION__); -+ #endif -+ goto _recv_data_drop; -+ } -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: rtw_free_recvframe\n" )); -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __FUNCTION__, -+ padapter->bDriverStopped, padapter->bSurpriseRemoved); -+ #endif -+ ret = _FAIL; -+ rtw_free_recvframe(orig_prframe, pfree_recv_queue); //free this recv_frame -+ } -+ -+ } -+ else if(pattrib->amsdu==1) -+ { -+ -+ ret = amsdu_to_msdu(padapter, prframe); -+ if(ret != _SUCCESS) -+ { -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__); -+ #endif -+ rtw_free_recvframe(orig_prframe, pfree_recv_queue); -+ goto _recv_data_drop; -+ } -+ } -+ else -+ { -+ #ifdef DBG_RX_DROP_FRAME -+ DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __FUNCTION__); -+ #endif -+ goto _recv_data_drop; -+ } -+#endif // CONFIG_80211N_HT -+ -+_exit_recv_func: -+ return ret; -+ -+_recv_data_drop: -+ precvpriv->rx_drop++; -+ return ret; -+} -+ -+ -+static int recv_func(_adapter *padapter, union recv_frame *rframe) -+{ -+ int ret; -+ struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib; -+ struct recv_priv *recvpriv = &padapter->recvpriv; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ struct mlme_priv *mlmepriv = &padapter->mlmepriv; -+ -+ /* check if need to handle uc_swdec_pending_queue*/ -+ if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey) -+ { -+ union recv_frame *pending_frame; -+ _irqL irqL; -+ -+ while((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) { -+ if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS) -+ DBG_871X("%s: dequeue uc_swdec_pending_queue\n", __func__); -+ } -+ } -+ -+ ret = recv_func_prehandle(padapter, rframe); -+ -+ if(ret == _SUCCESS) { -+ -+ /* check if need to enqueue into uc_swdec_pending_queue*/ -+ if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && -+ !IS_MCAST(prxattrib->ra) && prxattrib->encrypt>0 && -+ (prxattrib->bdecrypted == 0 ||psecuritypriv->sw_decrypt == _TRUE) && -+ !is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) && -+ !psecuritypriv->busetkipkey) { -+ rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue); -+ DBG_871X("%s: no key, enqueue uc_swdec_pending_queue\n", __func__); -+ goto exit; -+ } -+ -+ ret = recv_func_posthandle(padapter, rframe); -+ } -+ -+exit: -+ return ret; -+} -+ -+ -+s32 rtw_recv_entry(union recv_frame *precvframe) -+{ -+ _adapter *padapter; -+ struct recv_priv *precvpriv; -+ s32 ret=_SUCCESS; -+ -+_func_enter_; -+ -+// RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("+rtw_recv_entry\n")); -+ -+ padapter = precvframe->u.hdr.adapter; -+ -+ precvpriv = &padapter->recvpriv; -+ -+ -+ if ((ret = recv_func(padapter, precvframe)) == _FAIL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("rtw_recv_entry: recv_func return fail!!!\n")); -+ goto _recv_entry_drop; -+ } -+ -+ -+ precvpriv->rx_pkts++; -+ -+_func_exit_; -+ -+ return ret; -+ -+_recv_entry_drop: -+ -+#ifdef CONFIG_MP_INCLUDED -+ padapter->mppriv.rx_pktloss = precvpriv->rx_drop; -+#endif -+ -+ //RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("_recv_entry_drop\n")); -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS) -+#else -+void rtw_signal_stat_timer_hdl(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, recvpriv.signal_stat_timer); -+#endif -+ struct recv_priv *recvpriv = &adapter->recvpriv; -+ -+ u32 tmp_s, tmp_q; -+ u8 avg_signal_strength = 0; -+ u8 avg_signal_qual = 0; -+ u32 num_signal_strength = 0; -+ u32 num_signal_qual = 0; -+ u8 _alpha = 3; // this value is based on converging_constant = 5000 and sampling_interval = 1000 -+ -+ if(adapter->recvpriv.is_signal_dbg) { -+ //update the user specific value, signal_strength_dbg, to signal_strength, rssi -+ adapter->recvpriv.signal_strength= adapter->recvpriv.signal_strength_dbg; -+ adapter->recvpriv.rssi=(s8)translate_percentage_to_dbm((u8)adapter->recvpriv.signal_strength_dbg); -+ } else { -+ -+ if(recvpriv->signal_strength_data.update_req == 0) {// update_req is clear, means we got rx -+ avg_signal_strength = recvpriv->signal_strength_data.avg_val; -+ num_signal_strength = recvpriv->signal_strength_data.total_num; -+ // after avg_vals are accquired, we can re-stat the signal values -+ recvpriv->signal_strength_data.update_req = 1; -+ } -+ -+ if(recvpriv->signal_qual_data.update_req == 0) {// update_req is clear, means we got rx -+ avg_signal_qual = recvpriv->signal_qual_data.avg_val; -+ num_signal_qual = recvpriv->signal_qual_data.total_num; -+ // after avg_vals are accquired, we can re-stat the signal values -+ recvpriv->signal_qual_data.update_req = 1; -+ } -+ -+ if (num_signal_strength == 0) { -+ if (rtw_get_on_cur_ch_time(adapter) == 0 -+ || rtw_get_passing_time_ms(rtw_get_on_cur_ch_time(adapter)) < 2 * adapter->mlmeextpriv.mlmext_info.bcn_interval -+ ) { -+ goto set_timer; -+ } -+ } -+ -+ if(check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE -+ || check_fwstate(&adapter->mlmepriv, _FW_LINKED) == _FALSE -+ ) { -+ goto set_timer; -+ } -+ -+ #ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(adapter, _FW_UNDER_SURVEY) == _TRUE) -+ goto set_timer; -+ #endif -+ -+ //update value of signal_strength, rssi, signal_qual -+ tmp_s = (avg_signal_strength+(_alpha-1)*recvpriv->signal_strength); -+ if(tmp_s %_alpha) -+ tmp_s = tmp_s/_alpha + 1; -+ else -+ tmp_s = tmp_s/_alpha; -+ if(tmp_s>100) -+ tmp_s = 100; -+ -+ tmp_q = (avg_signal_qual+(_alpha-1)*recvpriv->signal_qual); -+ if(tmp_q %_alpha) -+ tmp_q = tmp_q/_alpha + 1; -+ else -+ tmp_q = tmp_q/_alpha; -+ if(tmp_q>100) -+ tmp_q = 100; -+ -+ recvpriv->signal_strength = tmp_s; -+ recvpriv->rssi = (s8)translate_percentage_to_dbm(tmp_s); -+ recvpriv->signal_qual = tmp_q; -+ -+ #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 -+ DBG_871X(FUNC_ADPT_FMT" signal_strength:%3u, rssi:%3d, signal_qual:%3u" -+ ", num_signal_strength:%u, num_signal_qual:%u" -+ ", on_cur_ch_ms:%d" -+ "\n" -+ , FUNC_ADPT_ARG(adapter) -+ , recvpriv->signal_strength -+ , recvpriv->rssi -+ , recvpriv->signal_qual -+ , num_signal_strength, num_signal_qual -+ , rtw_get_on_cur_ch_time(adapter) ? rtw_get_passing_time_ms(rtw_get_on_cur_ch_time(adapter)) : 0 -+ ); -+ #endif -+ } -+ -+set_timer: -+ rtw_set_signal_stat_timer(recvpriv); -+ -+} -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c -@@ -0,0 +1,95 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_RF_C_ -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+struct ch_freq { -+ u32 channel; -+ u32 frequency; -+}; -+ -+struct ch_freq ch_freq_map[] = { -+ {1, 2412},{2, 2417},{3, 2422},{4, 2427},{5, 2432}, -+ {6, 2437},{7, 2442},{8, 2447},{9, 2452},{10, 2457}, -+ {11, 2462},{12, 2467},{13, 2472},{14, 2484}, -+ /* UNII */ -+ {36, 5180},{40, 5200},{44, 5220},{48, 5240},{52, 5260}, -+ {56, 5280},{60, 5300},{64, 5320},{149, 5745},{153, 5765}, -+ {157, 5785},{161, 5805},{165, 5825},{167, 5835},{169, 5845}, -+ {171, 5855},{173, 5865}, -+ /* HiperLAN2 */ -+ {100, 5500},{104, 5520},{108, 5540},{112, 5560},{116, 5580}, -+ {120, 5600},{124, 5620},{128, 5640},{132, 5660},{136, 5680}, -+ {140, 5700}, -+ /* Japan MMAC */ -+ {34, 5170},{38, 5190},{42, 5210},{46, 5230}, -+ /* Japan */ -+ {184, 4920},{188, 4940},{192, 4960},{196, 4980}, -+ {208, 5040},/* Japan, means J08 */ -+ {212, 5060},/* Japan, means J12 */ -+ {216, 5080},/* Japan, means J16 */ -+}; -+ -+int ch_freq_map_num = (sizeof(ch_freq_map) / sizeof(struct ch_freq)); -+ -+u32 rtw_ch2freq(u32 channel) -+{ -+ u8 i; -+ u32 freq = 0; -+ -+ for (i = 0; i < ch_freq_map_num; i++) -+ { -+ if (channel == ch_freq_map[i].channel) -+ { -+ freq = ch_freq_map[i].frequency; -+ break; -+ } -+ } -+ if (i == ch_freq_map_num) -+ freq = 2412; -+ -+ return freq; -+} -+ -+u32 rtw_freq2ch(u32 freq) -+{ -+ u8 i; -+ u32 ch = 0; -+ -+ for (i = 0; i < ch_freq_map_num; i++) -+ { -+ if (freq == ch_freq_map[i].frequency) -+ { -+ ch = ch_freq_map[i].channel; -+ break; -+ } -+ } -+ if (i == ch_freq_map_num) -+ ch = 1; -+ -+ return ch; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c -@@ -0,0 +1,3115 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_SECURITY_C_ -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+//=====WEP related===== -+ -+#define CRC32_POLY 0x04c11db7 -+ -+struct arc4context -+{ -+ u32 x; -+ u32 y; -+ u8 state[256]; -+}; -+ -+ -+static void arcfour_init(struct arc4context *parc4ctx, u8 * key,u32 key_len) -+{ -+ u32 t, u; -+ u32 keyindex; -+ u32 stateindex; -+ u8 * state; -+ u32 counter; -+_func_enter_; -+ state = parc4ctx->state; -+ parc4ctx->x = 0; -+ parc4ctx->y = 0; -+ for (counter = 0; counter < 256; counter++) -+ state[counter] = (u8)counter; -+ keyindex = 0; -+ stateindex = 0; -+ for (counter = 0; counter < 256; counter++) -+ { -+ t = state[counter]; -+ stateindex = (stateindex + key[keyindex] + t) & 0xff; -+ u = state[stateindex]; -+ state[stateindex] = (u8)t; -+ state[counter] = (u8)u; -+ if (++keyindex >= key_len) -+ keyindex = 0; -+ } -+_func_exit_; -+} -+static u32 arcfour_byte( struct arc4context *parc4ctx) -+{ -+ u32 x; -+ u32 y; -+ u32 sx, sy; -+ u8 * state; -+_func_enter_; -+ state = parc4ctx->state; -+ x = (parc4ctx->x + 1) & 0xff; -+ sx = state[x]; -+ y = (sx + parc4ctx->y) & 0xff; -+ sy = state[y]; -+ parc4ctx->x = x; -+ parc4ctx->y = y; -+ state[y] = (u8)sx; -+ state[x] = (u8)sy; -+_func_exit_; -+ return state[(sx + sy) & 0xff]; -+} -+ -+ -+static void arcfour_encrypt( struct arc4context *parc4ctx, -+ u8 * dest, -+ u8 * src, -+ u32 len) -+{ -+ u32 i; -+_func_enter_; -+ for (i = 0; i < len; i++) -+ dest[i] = src[i] ^ (unsigned char)arcfour_byte(parc4ctx); -+_func_exit_; -+} -+ -+static sint bcrc32initialized = 0; -+static u32 crc32_table[256]; -+ -+ -+static u8 crc32_reverseBit( u8 data) -+{ -+ return( (u8)((data<<7)&0x80) | ((data<<5)&0x40) | ((data<<3)&0x20) | ((data<<1)&0x10) | ((data>>1)&0x08) | ((data>>3)&0x04) | ((data>>5)&0x02) | ((data>>7)&0x01) ); -+} -+ -+static void crc32_init(void) -+{ -+_func_enter_; -+ if (bcrc32initialized == 1) -+ goto exit; -+ else{ -+ sint i, j; -+ u32 c; -+ u8 *p=(u8 *)&c, *p1; -+ u8 k; -+ -+ c = 0x12340000; -+ -+ for (i = 0; i < 256; ++i) -+ { -+ k = crc32_reverseBit((u8)i); -+ for (c = ((u32)k) << 24, j = 8; j > 0; --j){ -+ c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY : (c << 1); -+ } -+ p1 = (u8 *)&crc32_table[i]; -+ -+ p1[0] = crc32_reverseBit(p[3]); -+ p1[1] = crc32_reverseBit(p[2]); -+ p1[2] = crc32_reverseBit(p[1]); -+ p1[3] = crc32_reverseBit(p[0]); -+ } -+ bcrc32initialized= 1; -+ } -+exit: -+_func_exit_; -+} -+ -+static u32 getcrc32(u8 *buf, sint len) -+{ -+ u8 *p; -+ u32 crc; -+_func_enter_; -+ if (bcrc32initialized == 0) crc32_init(); -+ -+ crc = 0xffffffff; /* preload shift register, per CRC-32 spec */ -+ -+ for (p = buf; len > 0; ++p, --len) -+ { -+ crc = crc32_table[ (crc ^ *p) & 0xff] ^ (crc >> 8); -+ } -+_func_exit_; -+ return ~crc; /* transmit complement, per CRC-32 spec */ -+} -+ -+ -+/* -+ Need to consider the fragment situation -+*/ -+void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe) -+{ // exclude ICV -+ -+ unsigned char crc[4]; -+ struct arc4context mycontext; -+ -+ sint curfragnum,length; -+ u32 keylength; -+ -+ u8 *pframe, *payload,*iv; //,*wepkey -+ u8 wepkey[16]; -+ struct pkt_attrib *pattrib = &((struct xmit_frame*)pxmitframe)->attrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ struct xmit_priv *pxmitpriv=&padapter->xmitpriv; -+ -+_func_enter_; -+ -+ -+ if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL) -+ return; -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + TXDESC_SIZE + -+ (((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ); -+#else -+ pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + TXDESC_OFFSET; -+#endif -+ -+ //start to encrypt each fragment -+ if((pattrib->encrypt==_WEP40_)||(pattrib->encrypt==_WEP104_)) -+ { -+ keylength=psecuritypriv->dot11DefKeylen[psecuritypriv->dot11PrivacyKeyIndex]; -+ -+ for(curfragnum=0;curfragnumnr_frags;curfragnum++) -+ { -+ iv=pframe+pattrib->hdrlen; -+ _rtw_memcpy(&wepkey[0], iv, 3); -+ _rtw_memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0],keylength); -+ payload=pframe+pattrib->iv_len+pattrib->hdrlen; -+ -+ if((curfragnum+1)==pattrib->nr_frags) -+ { //the last fragment -+ -+ length=pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len- pattrib->icv_len; -+ -+ *((u32 *)crc)=cpu_to_le32(getcrc32(payload,length)); -+ -+ arcfour_init(&mycontext, wepkey,3+keylength); -+ arcfour_encrypt(&mycontext, payload, payload, length); -+ arcfour_encrypt(&mycontext, payload+length, crc, 4); -+ -+ } -+ else -+ { -+ length=pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ; -+ *((u32 *)crc)=cpu_to_le32(getcrc32(payload,length)); -+ arcfour_init(&mycontext, wepkey,3+keylength); -+ arcfour_encrypt(&mycontext, payload, payload, length); -+ arcfour_encrypt(&mycontext, payload+length, crc, 4); -+ -+ pframe+=pxmitpriv->frag_len; -+ pframe=(u8 *)RND4((SIZE_PTR)(pframe)); -+ -+ } -+ -+ } -+ -+ } -+ -+_func_exit_; -+ -+} -+ -+void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe) -+{ -+ // exclude ICV -+ u8 crc[4]; -+ struct arc4context mycontext; -+ sint length; -+ u32 keylength; -+ u8 *pframe, *payload,*iv,wepkey[16]; -+ u8 keyindex; -+ struct rx_pkt_attrib *prxattrib = &(((union recv_frame*)precvframe)->u.hdr.attrib); -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ -+_func_enter_; -+ -+ pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; -+ -+ //start to decrypt recvframe -+ if((prxattrib->encrypt==_WEP40_)||(prxattrib->encrypt==_WEP104_)) -+ { -+ iv=pframe+prxattrib->hdrlen; -+ //keyindex=(iv[3]&0x3); -+ keyindex = prxattrib->key_index; -+ keylength=psecuritypriv->dot11DefKeylen[keyindex]; -+ _rtw_memcpy(&wepkey[0], iv, 3); -+ //_rtw_memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0],keylength); -+ _rtw_memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[keyindex].skey[0],keylength); -+ length= ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len; -+ -+ payload=pframe+prxattrib->iv_len+prxattrib->hdrlen; -+ -+ //decrypt payload include icv -+ arcfour_init(&mycontext, wepkey,3+keylength); -+ arcfour_encrypt(&mycontext, payload, payload, length); -+ -+ //calculate icv and compare the icv -+ *((u32 *)crc)=le32_to_cpu(getcrc32(payload,length-4)); -+ -+ if(crc[3]!=payload[length-1] || crc[2]!=payload[length-2] || crc[1]!=payload[length-3] || crc[0]!=payload[length-4]) -+ { -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_wep_decrypt:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n", -+ crc[3],payload[length-1],crc[2],payload[length-2],crc[1],payload[length-3],crc[0],payload[length-4])); -+ } -+ -+ } -+ -+_func_exit_; -+ -+ return; -+ -+} -+ -+//3 =====TKIP related===== -+ -+static u32 secmicgetuint32( u8 * p ) -+// Convert from Byte[] to Us4Byte32 in a portable way -+{ -+ s32 i; -+ u32 res = 0; -+_func_enter_; -+ for( i=0; i<4; i++ ) -+ { -+ res |= ((u32)(*p++)) << (8*i); -+ } -+_func_exit_; -+ return res; -+} -+ -+static void secmicputuint32( u8 * p, u32 val ) -+// Convert from Us4Byte32 to Byte[] in a portable way -+{ -+ long i; -+_func_enter_; -+ for( i=0; i<4; i++ ) -+ { -+ *p++ = (u8) (val & 0xff); -+ val >>= 8; -+ } -+_func_exit_; -+} -+ -+static void secmicclear(struct mic_data *pmicdata) -+{ -+// Reset the state to the empty message. -+_func_enter_; -+ pmicdata->L = pmicdata->K0; -+ pmicdata->R = pmicdata->K1; -+ pmicdata->nBytesInM = 0; -+ pmicdata->M = 0; -+_func_exit_; -+} -+ -+void rtw_secmicsetkey(struct mic_data *pmicdata, u8 * key ) -+{ -+ // Set the key -+_func_enter_; -+ pmicdata->K0 = secmicgetuint32( key ); -+ pmicdata->K1 = secmicgetuint32( key + 4 ); -+ // and reset the message -+ secmicclear(pmicdata); -+_func_exit_; -+} -+ -+void rtw_secmicappendbyte(struct mic_data *pmicdata, u8 b ) -+{ -+_func_enter_; -+ // Append the byte to our word-sized buffer -+ pmicdata->M |= ((unsigned long)b) << (8*pmicdata->nBytesInM); -+ pmicdata->nBytesInM++; -+ // Process the word if it is full. -+ if( pmicdata->nBytesInM >= 4 ) -+ { -+ pmicdata->L ^= pmicdata->M; -+ pmicdata->R ^= ROL32( pmicdata->L, 17 ); -+ pmicdata->L += pmicdata->R; -+ pmicdata->R ^= ((pmicdata->L & 0xff00ff00) >> 8) | ((pmicdata->L & 0x00ff00ff) << 8); -+ pmicdata->L += pmicdata->R; -+ pmicdata->R ^= ROL32( pmicdata->L, 3 ); -+ pmicdata->L += pmicdata->R; -+ pmicdata->R ^= ROR32( pmicdata->L, 2 ); -+ pmicdata->L += pmicdata->R; -+ // Clear the buffer -+ pmicdata->M = 0; -+ pmicdata->nBytesInM = 0; -+ } -+_func_exit_; -+} -+ -+void rtw_secmicappend(struct mic_data *pmicdata, u8 * src, u32 nbytes ) -+{ -+_func_enter_; -+ // This is simple -+ while( nbytes > 0 ) -+ { -+ rtw_secmicappendbyte(pmicdata, *src++ ); -+ nbytes--; -+ } -+_func_exit_; -+} -+ -+void rtw_secgetmic(struct mic_data *pmicdata, u8 * dst ) -+{ -+_func_enter_; -+ // Append the minimum padding -+ rtw_secmicappendbyte(pmicdata, 0x5a ); -+ rtw_secmicappendbyte(pmicdata, 0 ); -+ rtw_secmicappendbyte(pmicdata, 0 ); -+ rtw_secmicappendbyte(pmicdata, 0 ); -+ rtw_secmicappendbyte(pmicdata, 0 ); -+ // and then zeroes until the length is a multiple of 4 -+ while( pmicdata->nBytesInM != 0 ) -+ { -+ rtw_secmicappendbyte(pmicdata, 0 ); -+ } -+ // The appendByte function has already computed the result. -+ secmicputuint32( dst, pmicdata->L ); -+ secmicputuint32( dst+4, pmicdata->R ); -+ // Reset to the empty message. -+ secmicclear(pmicdata); -+_func_exit_; -+} -+ -+ -+void rtw_seccalctkipmic(u8 * key,u8 *header,u8 *data,u32 data_len,u8 *mic_code, u8 pri) -+{ -+ -+ struct mic_data micdata; -+ u8 priority[4]={0x0,0x0,0x0,0x0}; -+_func_enter_; -+ rtw_secmicsetkey(&micdata, key); -+ priority[0]=pri; -+ -+ /* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */ -+ if(header[1]&1){ //ToDS==1 -+ rtw_secmicappend(&micdata, &header[16], 6); //DA -+ if(header[1]&2) //From Ds==1 -+ rtw_secmicappend(&micdata, &header[24], 6); -+ else -+ rtw_secmicappend(&micdata, &header[10], 6); -+ } -+ else{ //ToDS==0 -+ rtw_secmicappend(&micdata, &header[4], 6); //DA -+ if(header[1]&2) //From Ds==1 -+ rtw_secmicappend(&micdata, &header[16], 6); -+ else -+ rtw_secmicappend(&micdata, &header[10], 6); -+ -+ } -+ rtw_secmicappend(&micdata, &priority[0], 4); -+ -+ -+ rtw_secmicappend(&micdata, data, data_len); -+ -+ rtw_secgetmic(&micdata,mic_code); -+_func_exit_; -+} -+ -+ -+ -+ -+/* macros for extraction/creation of unsigned char/unsigned short values */ -+#define RotR1(v16) ((((v16) >> 1) & 0x7FFF) ^ (((v16) & 1) << 15)) -+#define Lo8(v16) ((u8)( (v16) & 0x00FF)) -+#define Hi8(v16) ((u8)(((v16) >> 8) & 0x00FF)) -+#define Lo16(v32) ((u16)( (v32) & 0xFFFF)) -+#define Hi16(v32) ((u16)(((v32) >>16) & 0xFFFF)) -+#define Mk16(hi,lo) ((lo) ^ (((u16)(hi)) << 8)) -+ -+/* select the Nth 16-bit word of the temporal key unsigned char array TK[] */ -+#define TK16(N) Mk16(tk[2*(N)+1],tk[2*(N)]) -+ -+/* S-box lookup: 16 bits --> 16 bits */ -+#define _S_(v16) (Sbox1[0][Lo8(v16)] ^ Sbox1[1][Hi8(v16)]) -+ -+/* fixed algorithm "parameters" */ -+#define PHASE1_LOOP_CNT 8 /* this needs to be "big enough" */ -+#define TA_SIZE 6 /* 48-bit transmitter address */ -+#define TK_SIZE 16 /* 128-bit temporal key */ -+#define P1K_SIZE 10 /* 80-bit Phase1 key */ -+#define RC4_KEY_SIZE 16 /* 128-bit RC4KEY (104 bits unknown) */ -+ -+ -+/* 2-unsigned char by 2-unsigned char subset of the full AES S-box table */ -+static const unsigned short Sbox1[2][256]= /* Sbox for hash (can be in ROM) */ -+{ { -+ 0xC6A5,0xF884,0xEE99,0xF68D,0xFF0D,0xD6BD,0xDEB1,0x9154, -+ 0x6050,0x0203,0xCEA9,0x567D,0xE719,0xB562,0x4DE6,0xEC9A, -+ 0x8F45,0x1F9D,0x8940,0xFA87,0xEF15,0xB2EB,0x8EC9,0xFB0B, -+ 0x41EC,0xB367,0x5FFD,0x45EA,0x23BF,0x53F7,0xE496,0x9B5B, -+ 0x75C2,0xE11C,0x3DAE,0x4C6A,0x6C5A,0x7E41,0xF502,0x834F, -+ 0x685C,0x51F4,0xD134,0xF908,0xE293,0xAB73,0x6253,0x2A3F, -+ 0x080C,0x9552,0x4665,0x9D5E,0x3028,0x37A1,0x0A0F,0x2FB5, -+ 0x0E09,0x2436,0x1B9B,0xDF3D,0xCD26,0x4E69,0x7FCD,0xEA9F, -+ 0x121B,0x1D9E,0x5874,0x342E,0x362D,0xDCB2,0xB4EE,0x5BFB, -+ 0xA4F6,0x764D,0xB761,0x7DCE,0x527B,0xDD3E,0x5E71,0x1397, -+ 0xA6F5,0xB968,0x0000,0xC12C,0x4060,0xE31F,0x79C8,0xB6ED, -+ 0xD4BE,0x8D46,0x67D9,0x724B,0x94DE,0x98D4,0xB0E8,0x854A, -+ 0xBB6B,0xC52A,0x4FE5,0xED16,0x86C5,0x9AD7,0x6655,0x1194, -+ 0x8ACF,0xE910,0x0406,0xFE81,0xA0F0,0x7844,0x25BA,0x4BE3, -+ 0xA2F3,0x5DFE,0x80C0,0x058A,0x3FAD,0x21BC,0x7048,0xF104, -+ 0x63DF,0x77C1,0xAF75,0x4263,0x2030,0xE51A,0xFD0E,0xBF6D, -+ 0x814C,0x1814,0x2635,0xC32F,0xBEE1,0x35A2,0x88CC,0x2E39, -+ 0x9357,0x55F2,0xFC82,0x7A47,0xC8AC,0xBAE7,0x322B,0xE695, -+ 0xC0A0,0x1998,0x9ED1,0xA37F,0x4466,0x547E,0x3BAB,0x0B83, -+ 0x8CCA,0xC729,0x6BD3,0x283C,0xA779,0xBCE2,0x161D,0xAD76, -+ 0xDB3B,0x6456,0x744E,0x141E,0x92DB,0x0C0A,0x486C,0xB8E4, -+ 0x9F5D,0xBD6E,0x43EF,0xC4A6,0x39A8,0x31A4,0xD337,0xF28B, -+ 0xD532,0x8B43,0x6E59,0xDAB7,0x018C,0xB164,0x9CD2,0x49E0, -+ 0xD8B4,0xACFA,0xF307,0xCF25,0xCAAF,0xF48E,0x47E9,0x1018, -+ 0x6FD5,0xF088,0x4A6F,0x5C72,0x3824,0x57F1,0x73C7,0x9751, -+ 0xCB23,0xA17C,0xE89C,0x3E21,0x96DD,0x61DC,0x0D86,0x0F85, -+ 0xE090,0x7C42,0x71C4,0xCCAA,0x90D8,0x0605,0xF701,0x1C12, -+ 0xC2A3,0x6A5F,0xAEF9,0x69D0,0x1791,0x9958,0x3A27,0x27B9, -+ 0xD938,0xEB13,0x2BB3,0x2233,0xD2BB,0xA970,0x0789,0x33A7, -+ 0x2DB6,0x3C22,0x1592,0xC920,0x8749,0xAAFF,0x5078,0xA57A, -+ 0x038F,0x59F8,0x0980,0x1A17,0x65DA,0xD731,0x84C6,0xD0B8, -+ 0x82C3,0x29B0,0x5A77,0x1E11,0x7BCB,0xA8FC,0x6DD6,0x2C3A, -+ }, -+ -+ -+ { /* second half of table is unsigned char-reversed version of first! */ -+ 0xA5C6,0x84F8,0x99EE,0x8DF6,0x0DFF,0xBDD6,0xB1DE,0x5491, -+ 0x5060,0x0302,0xA9CE,0x7D56,0x19E7,0x62B5,0xE64D,0x9AEC, -+ 0x458F,0x9D1F,0x4089,0x87FA,0x15EF,0xEBB2,0xC98E,0x0BFB, -+ 0xEC41,0x67B3,0xFD5F,0xEA45,0xBF23,0xF753,0x96E4,0x5B9B, -+ 0xC275,0x1CE1,0xAE3D,0x6A4C,0x5A6C,0x417E,0x02F5,0x4F83, -+ 0x5C68,0xF451,0x34D1,0x08F9,0x93E2,0x73AB,0x5362,0x3F2A, -+ 0x0C08,0x5295,0x6546,0x5E9D,0x2830,0xA137,0x0F0A,0xB52F, -+ 0x090E,0x3624,0x9B1B,0x3DDF,0x26CD,0x694E,0xCD7F,0x9FEA, -+ 0x1B12,0x9E1D,0x7458,0x2E34,0x2D36,0xB2DC,0xEEB4,0xFB5B, -+ 0xF6A4,0x4D76,0x61B7,0xCE7D,0x7B52,0x3EDD,0x715E,0x9713, -+ 0xF5A6,0x68B9,0x0000,0x2CC1,0x6040,0x1FE3,0xC879,0xEDB6, -+ 0xBED4,0x468D,0xD967,0x4B72,0xDE94,0xD498,0xE8B0,0x4A85, -+ 0x6BBB,0x2AC5,0xE54F,0x16ED,0xC586,0xD79A,0x5566,0x9411, -+ 0xCF8A,0x10E9,0x0604,0x81FE,0xF0A0,0x4478,0xBA25,0xE34B, -+ 0xF3A2,0xFE5D,0xC080,0x8A05,0xAD3F,0xBC21,0x4870,0x04F1, -+ 0xDF63,0xC177,0x75AF,0x6342,0x3020,0x1AE5,0x0EFD,0x6DBF, -+ 0x4C81,0x1418,0x3526,0x2FC3,0xE1BE,0xA235,0xCC88,0x392E, -+ 0x5793,0xF255,0x82FC,0x477A,0xACC8,0xE7BA,0x2B32,0x95E6, -+ 0xA0C0,0x9819,0xD19E,0x7FA3,0x6644,0x7E54,0xAB3B,0x830B, -+ 0xCA8C,0x29C7,0xD36B,0x3C28,0x79A7,0xE2BC,0x1D16,0x76AD, -+ 0x3BDB,0x5664,0x4E74,0x1E14,0xDB92,0x0A0C,0x6C48,0xE4B8, -+ 0x5D9F,0x6EBD,0xEF43,0xA6C4,0xA839,0xA431,0x37D3,0x8BF2, -+ 0x32D5,0x438B,0x596E,0xB7DA,0x8C01,0x64B1,0xD29C,0xE049, -+ 0xB4D8,0xFAAC,0x07F3,0x25CF,0xAFCA,0x8EF4,0xE947,0x1810, -+ 0xD56F,0x88F0,0x6F4A,0x725C,0x2438,0xF157,0xC773,0x5197, -+ 0x23CB,0x7CA1,0x9CE8,0x213E,0xDD96,0xDC61,0x860D,0x850F, -+ 0x90E0,0x427C,0xC471,0xAACC,0xD890,0x0506,0x01F7,0x121C, -+ 0xA3C2,0x5F6A,0xF9AE,0xD069,0x9117,0x5899,0x273A,0xB927, -+ 0x38D9,0x13EB,0xB32B,0x3322,0xBBD2,0x70A9,0x8907,0xA733, -+ 0xB62D,0x223C,0x9215,0x20C9,0x4987,0xFFAA,0x7850,0x7AA5, -+ 0x8F03,0xF859,0x8009,0x171A,0xDA65,0x31D7,0xC684,0xB8D0, -+ 0xC382,0xB029,0x775A,0x111E,0xCB7B,0xFCA8,0xD66D,0x3A2C, -+ } -+}; -+ -+ /* -+********************************************************************** -+* Routine: Phase 1 -- generate P1K, given TA, TK, IV32 -+* -+* Inputs: -+* tk[] = temporal key [128 bits] -+* ta[] = transmitter's MAC address [ 48 bits] -+* iv32 = upper 32 bits of IV [ 32 bits] -+* Output: -+* p1k[] = Phase 1 key [ 80 bits] -+* -+* Note: -+* This function only needs to be called every 2**16 packets, -+* although in theory it could be called every packet. -+* -+********************************************************************** -+*/ -+static void phase1(u16 *p1k,const u8 *tk,const u8 *ta,u32 iv32) -+{ -+ sint i; -+_func_enter_; -+ /* Initialize the 80 bits of P1K[] from IV32 and TA[0..5] */ -+ p1k[0] = Lo16(iv32); -+ p1k[1] = Hi16(iv32); -+ p1k[2] = Mk16(ta[1],ta[0]); /* use TA[] as little-endian */ -+ p1k[3] = Mk16(ta[3],ta[2]); -+ p1k[4] = Mk16(ta[5],ta[4]); -+ -+ /* Now compute an unbalanced Feistel cipher with 80-bit block */ -+ /* size on the 80-bit block P1K[], using the 128-bit key TK[] */ -+ for (i=0; i < PHASE1_LOOP_CNT ;i++) -+ { /* Each add operation here is mod 2**16 */ -+ p1k[0] += _S_(p1k[4] ^ TK16((i&1)+0)); -+ p1k[1] += _S_(p1k[0] ^ TK16((i&1)+2)); -+ p1k[2] += _S_(p1k[1] ^ TK16((i&1)+4)); -+ p1k[3] += _S_(p1k[2] ^ TK16((i&1)+6)); -+ p1k[4] += _S_(p1k[3] ^ TK16((i&1)+0)); -+ p1k[4] += (unsigned short)i; /* avoid "slide attacks" */ -+ } -+_func_exit_; -+} -+ -+ -+/* -+********************************************************************** -+* Routine: Phase 2 -- generate RC4KEY, given TK, P1K, IV16 -+* -+* Inputs: -+* tk[] = Temporal key [128 bits] -+* p1k[] = Phase 1 output key [ 80 bits] -+* iv16 = low 16 bits of IV counter [ 16 bits] -+* Output: -+* rc4key[] = the key used to encrypt the packet [128 bits] -+* -+* Note: -+* The value {TA,IV32,IV16} for Phase1/Phase2 must be unique -+* across all packets using the same key TK value. Then, for a -+* given value of TK[], this TKIP48 construction guarantees that -+* the final RC4KEY value is unique across all packets. -+* -+* Suggested implementation optimization: if PPK[] is "overlaid" -+* appropriately on RC4KEY[], there is no need for the final -+* for loop below that copies the PPK[] result into RC4KEY[]. -+* -+********************************************************************** -+*/ -+static void phase2(u8 *rc4key,const u8 *tk,const u16 *p1k,u16 iv16) -+{ -+ sint i; -+ u16 PPK[6]; /* temporary key for mixing */ -+_func_enter_; -+ /* Note: all adds in the PPK[] equations below are mod 2**16 */ -+ for (i=0;i<5;i++) PPK[i]=p1k[i]; /* first, copy P1K to PPK */ -+ PPK[5] = p1k[4] +iv16; /* next, add in IV16 */ -+ -+ /* Bijective non-linear mixing of the 96 bits of PPK[0..5] */ -+ PPK[0] += _S_(PPK[5] ^ TK16(0)); /* Mix key in each "round" */ -+ PPK[1] += _S_(PPK[0] ^ TK16(1)); -+ PPK[2] += _S_(PPK[1] ^ TK16(2)); -+ PPK[3] += _S_(PPK[2] ^ TK16(3)); -+ PPK[4] += _S_(PPK[3] ^ TK16(4)); -+ PPK[5] += _S_(PPK[4] ^ TK16(5)); /* Total # S-box lookups == 6 */ -+ -+ /* Final sweep: bijective, "linear". Rotates kill LSB correlations */ -+ PPK[0] += RotR1(PPK[5] ^ TK16(6)); -+ PPK[1] += RotR1(PPK[0] ^ TK16(7)); /* Use all of TK[] in Phase2 */ -+ PPK[2] += RotR1(PPK[1]); -+ PPK[3] += RotR1(PPK[2]); -+ PPK[4] += RotR1(PPK[3]); -+ PPK[5] += RotR1(PPK[4]); -+ /* Note: At this point, for a given key TK[0..15], the 96-bit output */ -+ /* value PPK[0..5] is guaranteed to be unique, as a function */ -+ /* of the 96-bit "input" value {TA,IV32,IV16}. That is, P1K */ -+ /* is now a keyed permutation of {TA,IV32,IV16}. */ -+ -+ /* Set RC4KEY[0..3], which includes "cleartext" portion of RC4 key */ -+ rc4key[0] = Hi8(iv16); /* RC4KEY[0..2] is the WEP IV */ -+ rc4key[1] =(Hi8(iv16) | 0x20) & 0x7F; /* Help avoid weak (FMS) keys */ -+ rc4key[2] = Lo8(iv16); -+ rc4key[3] = Lo8((PPK[5] ^ TK16(0)) >> 1); -+ -+ -+ /* Copy 96 bits of PPK[0..5] to RC4KEY[4..15] (little-endian) */ -+ for (i=0;i<6;i++) -+ { -+ rc4key[4+2*i] = Lo8(PPK[i]); -+ rc4key[5+2*i] = Hi8(PPK[i]); -+ } -+_func_exit_; -+} -+ -+ -+//The hlen isn't include the IV -+u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe) -+{ // exclude ICV -+ u16 pnl; -+ u32 pnh; -+ u8 rc4key[16]; -+ u8 ttkey[16]; -+ u8 crc[4]; -+ struct arc4context mycontext; -+ sint curfragnum,length; -+ u32 prwskeylen; -+ -+ u8 *pframe, *payload,*iv,*prwskey; -+ union pn48 dot11txpn; -+ struct sta_info *stainfo; -+ struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ struct xmit_priv *pxmitpriv=&padapter->xmitpriv; -+ u32 res=_SUCCESS; -+_func_enter_; -+ -+ if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL) -+ return _FAIL; -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + TXDESC_SIZE + -+ (((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ); -+#else -+ pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + TXDESC_OFFSET; -+#endif -+ -+ //4 start to encrypt each fragment -+ if(pattrib->encrypt==_TKIP_){ -+ -+ if(pattrib->psta) -+ { -+ stainfo = pattrib->psta; -+ } -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ stainfo=rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] ); -+ } -+ -+ if (stainfo!=NULL){ -+ -+ if(!(stainfo->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state); -+ return _FAIL; -+ } -+ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_tkip_encrypt: stainfo!=NULL!!!\n")); -+ -+ if(IS_MCAST(pattrib->ra)) -+ { -+ prwskey=psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; -+ } -+ else -+ { -+ prwskey=&stainfo->dot118021x_UncstKey.skey[0]; -+ } -+ -+ prwskeylen=16; -+ -+ for(curfragnum=0;curfragnumnr_frags;curfragnum++){ -+ iv=pframe+pattrib->hdrlen; -+ payload=pframe+pattrib->iv_len+pattrib->hdrlen; -+ -+ GET_TKIP_PN(iv, dot11txpn); -+ -+ pnl=(u16)(dot11txpn.val); -+ pnh=(u32)(dot11txpn.val>>16); -+ -+ phase1((u16 *)&ttkey[0],prwskey,&pattrib->ta[0],pnh); -+ -+ phase2(&rc4key[0],prwskey,(u16 *)&ttkey[0],pnl); -+ -+ if((curfragnum+1)==pattrib->nr_frags){ //4 the last fragment -+ length=pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len- pattrib->icv_len; -+ RT_TRACE(_module_rtl871x_security_c_,_drv_info_,("pattrib->iv_len =%x, pattrib->icv_len =%x\n", pattrib->iv_len,pattrib->icv_len)); -+ *((u32 *)crc)=cpu_to_le32(getcrc32(payload,length));/* modified by Amy*/ -+ -+ arcfour_init(&mycontext, rc4key,16); -+ arcfour_encrypt(&mycontext, payload, payload, length); -+ arcfour_encrypt(&mycontext, payload+length, crc, 4); -+ -+ } -+ else{ -+ length=pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ; -+ *((u32 *)crc)=cpu_to_le32(getcrc32(payload,length));/* modified by Amy*/ -+ arcfour_init(&mycontext,rc4key,16); -+ arcfour_encrypt(&mycontext, payload, payload, length); -+ arcfour_encrypt(&mycontext, payload+length, crc, 4); -+ -+ pframe+=pxmitpriv->frag_len; -+ pframe=(u8 *)RND4((SIZE_PTR)(pframe)); -+ -+ } -+ } -+ -+ -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_tkip_encrypt: stainfo==NULL!!!\n")); -+ DBG_871X("%s, psta==NUL\n", __func__); -+ res=_FAIL; -+ } -+ -+ } -+_func_exit_; -+ return res; -+ -+} -+ -+ -+//The hlen isn't include the IV -+u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe) -+{ // exclude ICV -+ u16 pnl; -+ u32 pnh; -+ u8 rc4key[16]; -+ u8 ttkey[16]; -+ u8 crc[4]; -+ struct arc4context mycontext; -+ sint length; -+ u32 prwskeylen; -+ -+ u8 *pframe, *payload,*iv,*prwskey; -+ union pn48 dot11txpn; -+ struct sta_info *stainfo; -+ struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+// struct recv_priv *precvpriv=&padapter->recvpriv; -+ u32 res=_SUCCESS; -+ -+_func_enter_; -+ -+ pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; -+ -+ //4 start to decrypt recvframe -+ if(prxattrib->encrypt==_TKIP_){ -+ -+ stainfo=rtw_get_stainfo(&padapter->stapriv ,&prxattrib->ta[0] ); -+ if (stainfo!=NULL){ -+ -+ if(IS_MCAST(prxattrib->ra)) -+ { -+ static u32 start = 0; -+ static u32 no_gkey_bc_cnt = 0; -+ static u32 no_gkey_mc_cnt = 0; -+ -+ if(psecuritypriv->binstallGrpkey==_FALSE) -+ { -+ res=_FAIL; -+ -+ if (start == 0) -+ start = rtw_get_current_time(); -+ -+ if (is_broadcast_mac_addr(prxattrib->ra)) -+ no_gkey_bc_cnt++; -+ else -+ no_gkey_mc_cnt++; -+ -+ if (rtw_get_passing_time_ms(start) > 1000) { -+ if (no_gkey_bc_cnt || no_gkey_mc_cnt) { -+ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", -+ FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt); -+ } -+ start = rtw_get_current_time(); -+ no_gkey_bc_cnt = 0; -+ no_gkey_mc_cnt = 0; -+ } -+ goto exit; -+ } -+ -+ if (no_gkey_bc_cnt || no_gkey_mc_cnt) { -+ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", -+ FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt); -+ } -+ start = 0; -+ no_gkey_bc_cnt = 0; -+ no_gkey_mc_cnt = 0; -+ -+ //DBG_871X("rx bc/mc packets, to perform sw rtw_tkip_decrypt\n"); -+ //prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; -+ prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; -+ prwskeylen=16; -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_tkip_decrypt: stainfo!=NULL!!!\n")); -+ prwskey=&stainfo->dot118021x_UncstKey.skey[0]; -+ prwskeylen=16; -+ } -+ -+ iv=pframe+prxattrib->hdrlen; -+ payload=pframe+prxattrib->iv_len+prxattrib->hdrlen; -+ length= ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len; -+ -+ GET_TKIP_PN(iv, dot11txpn); -+ -+ pnl=(u16)(dot11txpn.val); -+ pnh=(u32)(dot11txpn.val>>16); -+ -+ phase1((u16 *)&ttkey[0],prwskey,&prxattrib->ta[0],pnh); -+ phase2(&rc4key[0],prwskey,(unsigned short *)&ttkey[0],pnl); -+ -+ //4 decrypt payload include icv -+ -+ arcfour_init(&mycontext, rc4key,16); -+ arcfour_encrypt(&mycontext, payload, payload, length); -+ -+ *((u32 *)crc)=le32_to_cpu(getcrc32(payload,length-4)); -+ -+ if(crc[3]!=payload[length-1] || crc[2]!=payload[length-2] || crc[1]!=payload[length-3] || crc[0]!=payload[length-4]) -+ { -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_wep_decrypt:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n", -+ crc[3],payload[length-1],crc[2],payload[length-2],crc[1],payload[length-3],crc[0],payload[length-4])); -+ res=_FAIL; -+ } -+ -+ -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_tkip_decrypt: stainfo==NULL!!!\n")); -+ res=_FAIL; -+ } -+ -+ } -+_func_exit_; -+exit: -+ return res; -+ -+} -+ -+ -+//3 =====AES related===== -+ -+ -+ -+#define MAX_MSG_SIZE 2048 -+/*****************************/ -+/******** SBOX Table *********/ -+/*****************************/ -+ -+ static u8 sbox_table[256] = -+ { -+ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, -+ 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, -+ 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, -+ 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, -+ 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, -+ 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, -+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, -+ 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, -+ 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, -+ 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, -+ 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, -+ 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, -+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, -+ 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, -+ 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, -+ 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, -+ 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, -+ 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, -+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, -+ 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, -+ 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, -+ 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, -+ 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, -+ 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, -+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, -+ 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, -+ 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, -+ 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, -+ 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, -+ 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, -+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, -+ 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 -+ }; -+ -+/*****************************/ -+/**** Function Prototypes ****/ -+/*****************************/ -+ -+static void bitwise_xor(u8 *ina, u8 *inb, u8 *out); -+static void construct_mic_iv( -+ u8 *mic_header1, -+ sint qc_exists, -+ sint a4_exists, -+ u8 *mpdu, -+ uint payload_length, -+ u8 * pn_vector, -+ uint frtype);// add for CONFIG_IEEE80211W, none 11w also can use -+static void construct_mic_header1( -+ u8 *mic_header1, -+ sint header_length, -+ u8 *mpdu, -+ uint frtype);// add for CONFIG_IEEE80211W, none 11w also can use -+static void construct_mic_header2( -+ u8 *mic_header2, -+ u8 *mpdu, -+ sint a4_exists, -+ sint qc_exists); -+static void construct_ctr_preload( -+ u8 *ctr_preload, -+ sint a4_exists, -+ sint qc_exists, -+ u8 *mpdu, -+ u8 *pn_vector, -+ sint c, -+ uint frtype);// add for CONFIG_IEEE80211W, none 11w also can use -+static void xor_128(u8 *a, u8 *b, u8 *out); -+static void xor_32(u8 *a, u8 *b, u8 *out); -+static u8 sbox(u8 a); -+static void next_key(u8 *key, sint round); -+static void byte_sub(u8 *in, u8 *out); -+static void shift_row(u8 *in, u8 *out); -+static void mix_column(u8 *in, u8 *out); -+#ifndef PLATFORM_FREEBSD -+static void add_round_key( u8 *shiftrow_in, -+ u8 *mcol_in, -+ u8 *block_in, -+ sint round, -+ u8 *out); -+#endif //PLATFORM_FREEBSD -+static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext); -+ -+ -+/****************************************/ -+/* aes128k128d() */ -+/* Performs a 128 bit AES encrypt with */ -+/* 128 bit data. */ -+/****************************************/ -+static void xor_128(u8 *a, u8 *b, u8 *out) -+{ -+ sint i; -+_func_enter_; -+ for (i=0;i<16; i++) -+ { -+ out[i] = a[i] ^ b[i]; -+ } -+_func_exit_; -+} -+ -+ -+static void xor_32(u8 *a, u8 *b, u8 *out) -+{ -+ sint i; -+_func_enter_; -+ for (i=0;i<4; i++) -+ { -+ out[i] = a[i] ^ b[i]; -+ } -+_func_exit_; -+} -+ -+ -+static u8 sbox(u8 a) -+{ -+ return sbox_table[(sint)a]; -+} -+ -+ -+static void next_key(u8 *key, sint round) -+{ -+ u8 rcon; -+ u8 sbox_key[4]; -+ u8 rcon_table[12] = -+ { -+ 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, -+ 0x1b, 0x36, 0x36, 0x36 -+ }; -+_func_enter_; -+ sbox_key[0] = sbox(key[13]); -+ sbox_key[1] = sbox(key[14]); -+ sbox_key[2] = sbox(key[15]); -+ sbox_key[3] = sbox(key[12]); -+ -+ rcon = rcon_table[round]; -+ -+ xor_32(&key[0], sbox_key, &key[0]); -+ key[0] = key[0] ^ rcon; -+ -+ xor_32(&key[4], &key[0], &key[4]); -+ xor_32(&key[8], &key[4], &key[8]); -+ xor_32(&key[12], &key[8], &key[12]); -+_func_exit_; -+} -+ -+ -+static void byte_sub(u8 *in, u8 *out) -+{ -+ sint i; -+_func_enter_; -+ for (i=0; i< 16; i++) -+ { -+ out[i] = sbox(in[i]); -+ } -+_func_exit_; -+} -+ -+ -+static void shift_row(u8 *in, u8 *out) -+{ -+_func_enter_; -+ out[0] = in[0]; -+ out[1] = in[5]; -+ out[2] = in[10]; -+ out[3] = in[15]; -+ out[4] = in[4]; -+ out[5] = in[9]; -+ out[6] = in[14]; -+ out[7] = in[3]; -+ out[8] = in[8]; -+ out[9] = in[13]; -+ out[10] = in[2]; -+ out[11] = in[7]; -+ out[12] = in[12]; -+ out[13] = in[1]; -+ out[14] = in[6]; -+ out[15] = in[11]; -+_func_exit_; -+} -+ -+ -+static void mix_column(u8 *in, u8 *out) -+{ -+ sint i; -+ u8 add1b[4]; -+ u8 add1bf7[4]; -+ u8 rotl[4]; -+ u8 swap_halfs[4]; -+ u8 andf7[4]; -+ u8 rotr[4]; -+ u8 temp[4]; -+ u8 tempb[4]; -+_func_enter_; -+ for (i=0 ; i<4; i++) -+ { -+ if ((in[i] & 0x80)== 0x80) -+ add1b[i] = 0x1b; -+ else -+ add1b[i] = 0x00; -+ } -+ -+ swap_halfs[0] = in[2]; /* Swap halfs */ -+ swap_halfs[1] = in[3]; -+ swap_halfs[2] = in[0]; -+ swap_halfs[3] = in[1]; -+ -+ rotl[0] = in[3]; /* Rotate left 8 bits */ -+ rotl[1] = in[0]; -+ rotl[2] = in[1]; -+ rotl[3] = in[2]; -+ -+ andf7[0] = in[0] & 0x7f; -+ andf7[1] = in[1] & 0x7f; -+ andf7[2] = in[2] & 0x7f; -+ andf7[3] = in[3] & 0x7f; -+ -+ for (i = 3; i>0; i--) /* logical shift left 1 bit */ -+ { -+ andf7[i] = andf7[i] << 1; -+ if ((andf7[i-1] & 0x80) == 0x80) -+ { -+ andf7[i] = (andf7[i] | 0x01); -+ } -+ } -+ andf7[0] = andf7[0] << 1; -+ andf7[0] = andf7[0] & 0xfe; -+ -+ xor_32(add1b, andf7, add1bf7); -+ -+ xor_32(in, add1bf7, rotr); -+ -+ temp[0] = rotr[0]; /* Rotate right 8 bits */ -+ rotr[0] = rotr[1]; -+ rotr[1] = rotr[2]; -+ rotr[2] = rotr[3]; -+ rotr[3] = temp[0]; -+ -+ xor_32(add1bf7, rotr, temp); -+ xor_32(swap_halfs, rotl,tempb); -+ xor_32(temp, tempb, out); -+_func_exit_; -+} -+ -+ -+static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext) -+{ -+ sint round; -+ sint i; -+ u8 intermediatea[16]; -+ u8 intermediateb[16]; -+ u8 round_key[16]; -+_func_enter_; -+ for(i=0; i<16; i++) round_key[i] = key[i]; -+ -+ for (round = 0; round < 11; round++) -+ { -+ if (round == 0) -+ { -+ xor_128(round_key, data, ciphertext); -+ next_key(round_key, round); -+ } -+ else if (round == 10) -+ { -+ byte_sub(ciphertext, intermediatea); -+ shift_row(intermediatea, intermediateb); -+ xor_128(intermediateb, round_key, ciphertext); -+ } -+ else /* 1 - 9 */ -+ { -+ byte_sub(ciphertext, intermediatea); -+ shift_row(intermediatea, intermediateb); -+ mix_column(&intermediateb[0], &intermediatea[0]); -+ mix_column(&intermediateb[4], &intermediatea[4]); -+ mix_column(&intermediateb[8], &intermediatea[8]); -+ mix_column(&intermediateb[12], &intermediatea[12]); -+ xor_128(intermediatea, round_key, ciphertext); -+ next_key(round_key, round); -+ } -+ } -+_func_exit_; -+} -+ -+ -+/************************************************/ -+/* construct_mic_iv() */ -+/* Builds the MIC IV from header fields and PN */ -+/* Baron think the function is construct CCM */ -+/* nonce */ -+/************************************************/ -+static void construct_mic_iv( -+ u8 *mic_iv, -+ sint qc_exists, -+ sint a4_exists, -+ u8 *mpdu, -+ uint payload_length, -+ u8 *pn_vector, -+ uint frtype// add for CONFIG_IEEE80211W, none 11w also can use -+ ) -+{ -+ sint i; -+_func_enter_; -+ mic_iv[0] = 0x59; -+ if (qc_exists && a4_exists) mic_iv[1] = mpdu[30] & 0x0f; /* QoS_TC */ -+ if (qc_exists && !a4_exists) mic_iv[1] = mpdu[24] & 0x0f; /* mute bits 7-4 */ -+ if (!qc_exists) mic_iv[1] = 0x00; -+#ifdef CONFIG_IEEE80211W -+ //802.11w management frame should set management bit(4) -+ if(frtype == WIFI_MGT_TYPE) -+ mic_iv[1] |= BIT(4); -+#endif //CONFIG_IEEE80211W -+ for (i = 2; i < 8; i++) -+ mic_iv[i] = mpdu[i + 8]; /* mic_iv[2:7] = A2[0:5] = mpdu[10:15] */ -+ #ifdef CONSISTENT_PN_ORDER -+ for (i = 8; i < 14; i++) -+ mic_iv[i] = pn_vector[i - 8]; /* mic_iv[8:13] = PN[0:5] */ -+ #else -+ for (i = 8; i < 14; i++) -+ mic_iv[i] = pn_vector[13 - i]; /* mic_iv[8:13] = PN[5:0] */ -+ #endif -+ mic_iv[14] = (unsigned char) (payload_length / 256); -+ mic_iv[15] = (unsigned char) (payload_length % 256); -+_func_exit_; -+} -+ -+ -+/************************************************/ -+/* construct_mic_header1() */ -+/* Builds the first MIC header block from */ -+/* header fields. */ -+/* Build AAD SC,A1,A2 */ -+/************************************************/ -+static void construct_mic_header1( -+ u8 *mic_header1, -+ sint header_length, -+ u8 *mpdu, -+ uint frtype// add for CONFIG_IEEE80211W, none 11w also can use -+ ) -+{ -+_func_enter_; -+ mic_header1[0] = (u8)((header_length - 2) / 256); -+ mic_header1[1] = (u8)((header_length - 2) % 256); -+#ifdef CONFIG_IEEE80211W -+ //802.11w management frame don't AND subtype bits 4,5,6 of frame control field -+ if(frtype == WIFI_MGT_TYPE) -+ mic_header1[2] = mpdu[0]; -+ else -+#endif //CONFIG_IEEE80211W -+ mic_header1[2] = mpdu[0] & 0xcf; /* Mute CF poll & CF ack bits */ -+ -+ mic_header1[3] = mpdu[1] & 0xc7; /* Mute retry, more data and pwr mgt bits */ -+ mic_header1[4] = mpdu[4]; /* A1 */ -+ mic_header1[5] = mpdu[5]; -+ mic_header1[6] = mpdu[6]; -+ mic_header1[7] = mpdu[7]; -+ mic_header1[8] = mpdu[8]; -+ mic_header1[9] = mpdu[9]; -+ mic_header1[10] = mpdu[10]; /* A2 */ -+ mic_header1[11] = mpdu[11]; -+ mic_header1[12] = mpdu[12]; -+ mic_header1[13] = mpdu[13]; -+ mic_header1[14] = mpdu[14]; -+ mic_header1[15] = mpdu[15]; -+_func_exit_; -+} -+ -+ -+/************************************************/ -+/* construct_mic_header2() */ -+/* Builds the last MIC header block from */ -+/* header fields. */ -+/************************************************/ -+static void construct_mic_header2( -+ u8 *mic_header2, -+ u8 *mpdu, -+ sint a4_exists, -+ sint qc_exists -+ ) -+{ -+ sint i; -+_func_enter_; -+ for (i = 0; i<16; i++) mic_header2[i]=0x00; -+ -+ mic_header2[0] = mpdu[16]; /* A3 */ -+ mic_header2[1] = mpdu[17]; -+ mic_header2[2] = mpdu[18]; -+ mic_header2[3] = mpdu[19]; -+ mic_header2[4] = mpdu[20]; -+ mic_header2[5] = mpdu[21]; -+ -+ //mic_header2[6] = mpdu[22] & 0xf0; /* SC */ -+ mic_header2[6] = 0x00; -+ mic_header2[7] = 0x00; /* mpdu[23]; */ -+ -+ -+ if (!qc_exists && a4_exists) -+ { -+ for (i=0;i<6;i++) mic_header2[8+i] = mpdu[24+i]; /* A4 */ -+ -+ } -+ -+ if (qc_exists && !a4_exists) -+ { -+ mic_header2[8] = mpdu[24] & 0x0f; /* mute bits 15 - 4 */ -+ mic_header2[9] = mpdu[25] & 0x00; -+ } -+ -+ if (qc_exists && a4_exists) -+ { -+ for (i=0;i<6;i++) mic_header2[8+i] = mpdu[24+i]; /* A4 */ -+ -+ mic_header2[14] = mpdu[30] & 0x0f; -+ mic_header2[15] = mpdu[31] & 0x00; -+ } -+ -+_func_exit_; -+} -+ -+ -+/************************************************/ -+/* construct_mic_header2() */ -+/* Builds the last MIC header block from */ -+/* header fields. */ -+/* Baron think the function is construct CCM */ -+/* nonce */ -+/************************************************/ -+static void construct_ctr_preload( -+ u8 *ctr_preload, -+ sint a4_exists, -+ sint qc_exists, -+ u8 *mpdu, -+ u8 *pn_vector, -+ sint c, -+ uint frtype // add for CONFIG_IEEE80211W, none 11w also can use -+ ) -+{ -+ sint i = 0; -+_func_enter_; -+ for (i=0; i<16; i++) ctr_preload[i] = 0x00; -+ i = 0; -+ -+ ctr_preload[0] = 0x01; /* flag */ -+ if (qc_exists && a4_exists) -+ ctr_preload[1] = mpdu[30] & 0x0f; /* QoC_Control */ -+ if (qc_exists && !a4_exists) -+ ctr_preload[1] = mpdu[24] & 0x0f; -+#ifdef CONFIG_IEEE80211W -+ //802.11w management frame should set management bit(4) -+ if(frtype == WIFI_MGT_TYPE) -+ ctr_preload[1] |= BIT(4); -+#endif //CONFIG_IEEE80211W -+ for (i = 2; i < 8; i++) -+ ctr_preload[i] = mpdu[i + 8]; /* ctr_preload[2:7] = A2[0:5] = mpdu[10:15] */ -+ #ifdef CONSISTENT_PN_ORDER -+ for (i = 8; i < 14; i++) -+ ctr_preload[i] = pn_vector[i - 8]; /* ctr_preload[8:13] = PN[0:5] */ -+ #else -+ for (i = 8; i < 14; i++) -+ ctr_preload[i] = pn_vector[13 - i]; /* ctr_preload[8:13] = PN[5:0] */ -+ #endif -+ ctr_preload[14] = (unsigned char) (c / 256); /* Ctr */ -+ ctr_preload[15] = (unsigned char) (c % 256); -+_func_exit_; -+} -+ -+ -+/************************************/ -+/* bitwise_xor() */ -+/* A 128 bit, bitwise exclusive or */ -+/************************************/ -+static void bitwise_xor(u8 *ina, u8 *inb, u8 *out) -+{ -+ sint i; -+_func_enter_; -+ for (i=0; i<16; i++) -+ { -+ out[i] = ina[i] ^ inb[i]; -+ } -+_func_exit_; -+} -+ -+ -+static sint aes_cipher(u8 *key, uint hdrlen, -+ u8 *pframe, uint plen) -+{ -+// /*static*/ unsigned char message[MAX_MSG_SIZE]; -+ uint qc_exists, a4_exists, i, j, payload_remainder, -+ num_blocks, payload_index; -+ -+ u8 pn_vector[6]; -+ u8 mic_iv[16]; -+ u8 mic_header1[16]; -+ u8 mic_header2[16]; -+ u8 ctr_preload[16]; -+ -+ /* Intermediate Buffers */ -+ u8 chain_buffer[16]; -+ u8 aes_out[16]; -+ u8 padded_buffer[16]; -+ u8 mic[8]; -+// uint offset = 0; -+ uint frtype = GetFrameType(pframe); -+ uint frsubtype = GetFrameSubType(pframe); -+ -+_func_enter_; -+ frsubtype=frsubtype>>4; -+ -+ -+ _rtw_memset((void *)mic_iv, 0, 16); -+ _rtw_memset((void *)mic_header1, 0, 16); -+ _rtw_memset((void *)mic_header2, 0, 16); -+ _rtw_memset((void *)ctr_preload, 0, 16); -+ _rtw_memset((void *)chain_buffer, 0, 16); -+ _rtw_memset((void *)aes_out, 0, 16); -+ _rtw_memset((void *)padded_buffer, 0, 16); -+ -+ if ((hdrlen == WLAN_HDR_A3_LEN )||(hdrlen == WLAN_HDR_A3_QOS_LEN)) -+ a4_exists = 0; -+ else -+ a4_exists = 1; -+ -+ if ( -+ ((frtype|frsubtype) == WIFI_DATA_CFACK) || -+ ((frtype|frsubtype) == WIFI_DATA_CFPOLL)|| -+ ((frtype|frsubtype) == WIFI_DATA_CFACKPOLL)) -+ { -+ qc_exists = 1; -+ if(hdrlen != WLAN_HDR_A3_QOS_LEN){ -+ -+ hdrlen += 2; -+ } -+ } -+ // add for CONFIG_IEEE80211W, none 11w also can use -+ else if ((frtype == WIFI_DATA) && -+ ((frsubtype == 0x08) || -+ (frsubtype == 0x09)|| -+ (frsubtype == 0x0a)|| -+ (frsubtype == 0x0b))) -+ { -+ if(hdrlen != WLAN_HDR_A3_QOS_LEN){ -+ -+ hdrlen += 2; -+ } -+ qc_exists = 1; -+ } -+ else -+ qc_exists = 0; -+ -+ pn_vector[0]=pframe[hdrlen]; -+ pn_vector[1]=pframe[hdrlen+1]; -+ pn_vector[2]=pframe[hdrlen+4]; -+ pn_vector[3]=pframe[hdrlen+5]; -+ pn_vector[4]=pframe[hdrlen+6]; -+ pn_vector[5]=pframe[hdrlen+7]; -+ -+ construct_mic_iv( -+ mic_iv, -+ qc_exists, -+ a4_exists, -+ pframe, //message, -+ plen, -+ pn_vector, -+ frtype // add for CONFIG_IEEE80211W, none 11w also can use -+ ); -+ -+ construct_mic_header1( -+ mic_header1, -+ hdrlen, -+ pframe, //message -+ frtype // add for CONFIG_IEEE80211W, none 11w also can use -+ ); -+ construct_mic_header2( -+ mic_header2, -+ pframe, //message, -+ a4_exists, -+ qc_exists -+ ); -+ -+ -+ payload_remainder = plen % 16; -+ num_blocks = plen / 16; -+ -+ /* Find start of payload */ -+ payload_index = (hdrlen + 8); -+ -+ /* Calculate MIC */ -+ aes128k128d(key, mic_iv, aes_out); -+ bitwise_xor(aes_out, mic_header1, chain_buffer); -+ aes128k128d(key, chain_buffer, aes_out); -+ bitwise_xor(aes_out, mic_header2, chain_buffer); -+ aes128k128d(key, chain_buffer, aes_out); -+ -+ for (i = 0; i < num_blocks; i++) -+ { -+ bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);//bitwise_xor(aes_out, &message[payload_index], chain_buffer); -+ -+ payload_index += 16; -+ aes128k128d(key, chain_buffer, aes_out); -+ } -+ -+ /* Add on the final payload block if it needs padding */ -+ if (payload_remainder > 0) -+ { -+ for (j = 0; j < 16; j++) padded_buffer[j] = 0x00; -+ for (j = 0; j < payload_remainder; j++) -+ { -+ padded_buffer[j] = pframe[payload_index++];//padded_buffer[j] = message[payload_index++]; -+ } -+ bitwise_xor(aes_out, padded_buffer, chain_buffer); -+ aes128k128d(key, chain_buffer, aes_out); -+ -+ } -+ -+ for (j = 0 ; j < 8; j++) mic[j] = aes_out[j]; -+ -+ /* Insert MIC into payload */ -+ for (j = 0; j < 8; j++) -+ pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j]; -+ -+ payload_index = hdrlen + 8; -+ for (i=0; i< num_blocks; i++) -+ { -+ construct_ctr_preload( -+ ctr_preload, -+ a4_exists, -+ qc_exists, -+ pframe, //message, -+ pn_vector, -+ i+1, -+ frtype); // add for CONFIG_IEEE80211W, none 11w also can use -+ aes128k128d(key, ctr_preload, aes_out); -+ bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);//bitwise_xor(aes_out, &message[payload_index], chain_buffer); -+ for (j=0; j<16;j++) pframe[payload_index++] = chain_buffer[j];//for (j=0; j<16;j++) message[payload_index++] = chain_buffer[j]; -+ } -+ -+ if (payload_remainder > 0) /* If there is a short final block, then pad it,*/ -+ { /* encrypt it and copy the unpadded part back */ -+ construct_ctr_preload( -+ ctr_preload, -+ a4_exists, -+ qc_exists, -+ pframe, //message, -+ pn_vector, -+ num_blocks+1, -+ frtype); // add for CONFIG_IEEE80211W, none 11w also can use -+ -+ for (j = 0; j < 16; j++) padded_buffer[j] = 0x00; -+ for (j = 0; j < payload_remainder; j++) -+ { -+ padded_buffer[j] = pframe[payload_index+j];//padded_buffer[j] = message[payload_index+j]; -+ } -+ aes128k128d(key, ctr_preload, aes_out); -+ bitwise_xor(aes_out, padded_buffer, chain_buffer); -+ for (j=0; jattrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ struct xmit_priv *pxmitpriv=&padapter->xmitpriv; -+ -+// uint offset = 0; -+ u32 res=_SUCCESS; -+_func_enter_; -+ -+ if(((struct xmit_frame*)pxmitframe)->buf_addr==NULL) -+ return _FAIL; -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + TXDESC_SIZE + -+ (((struct xmit_frame*)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ); -+#else -+ pframe = ((struct xmit_frame*)pxmitframe)->buf_addr + TXDESC_OFFSET; -+#endif -+ -+ //4 start to encrypt each fragment -+ if((pattrib->encrypt==_AES_)){ -+ -+ if(pattrib->psta) -+ { -+ stainfo = pattrib->psta; -+ } -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ stainfo=rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] ); -+ } -+ -+ if (stainfo!=NULL){ -+ -+ if(!(stainfo->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state); -+ return _FAIL; -+ } -+ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_aes_encrypt: stainfo!=NULL!!!\n")); -+ -+ if(IS_MCAST(pattrib->ra)) -+ { -+ prwskey=psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; -+ } -+ else -+ { -+ prwskey=&stainfo->dot118021x_UncstKey.skey[0]; -+ } -+ -+#ifdef CONFIG_TDLS //swencryption -+ { -+ struct sta_info *ptdls_sta; -+ ptdls_sta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->dst[0] ); -+ if((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) ) -+ { -+ DBG_871X("[%s] for tdls link\n", __FUNCTION__); -+ prwskey=&ptdls_sta->tpk.tk[0]; -+ } -+ } -+#endif //CONFIG_TDLS -+ -+ prwskeylen=16; -+ -+ for(curfragnum=0;curfragnumnr_frags;curfragnum++){ -+ -+ if((curfragnum+1)==pattrib->nr_frags){ //4 the last fragment -+ length=pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len- pattrib->icv_len; -+ -+ aes_cipher(prwskey,pattrib->hdrlen,pframe, length); -+ } -+ else{ -+ length=pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ; -+ -+ aes_cipher(prwskey,pattrib->hdrlen,pframe, length); -+ pframe+=pxmitpriv->frag_len; -+ pframe=(u8*)RND4((SIZE_PTR)(pframe)); -+ -+ } -+ } -+ -+ -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_aes_encrypt: stainfo==NULL!!!\n")); -+ DBG_871X("%s, psta==NUL\n", __func__); -+ res=_FAIL; -+ } -+ -+ } -+ -+ -+ -+_func_exit_; -+ return res; -+} -+ -+static sint aes_decipher(u8 *key, uint hdrlen, -+ u8 *pframe, uint plen) -+{ -+ static u8 message[MAX_MSG_SIZE]; -+ uint qc_exists, a4_exists, i, j, payload_remainder, -+ num_blocks, payload_index; -+ sint res = _SUCCESS; -+ u8 pn_vector[6]; -+ u8 mic_iv[16]; -+ u8 mic_header1[16]; -+ u8 mic_header2[16]; -+ u8 ctr_preload[16]; -+ -+ /* Intermediate Buffers */ -+ u8 chain_buffer[16]; -+ u8 aes_out[16]; -+ u8 padded_buffer[16]; -+ u8 mic[8]; -+ -+ -+// uint offset = 0; -+ uint frtype = GetFrameType(pframe); -+ uint frsubtype = GetFrameSubType(pframe); -+_func_enter_; -+ frsubtype=frsubtype>>4; -+ -+ -+ _rtw_memset((void *)mic_iv, 0, 16); -+ _rtw_memset((void *)mic_header1, 0, 16); -+ _rtw_memset((void *)mic_header2, 0, 16); -+ _rtw_memset((void *)ctr_preload, 0, 16); -+ _rtw_memset((void *)chain_buffer, 0, 16); -+ _rtw_memset((void *)aes_out, 0, 16); -+ _rtw_memset((void *)padded_buffer, 0, 16); -+ -+ //start to decrypt the payload -+ -+ num_blocks = (plen-8) / 16; //(plen including LLC, payload_length and mic ) -+ -+ payload_remainder = (plen-8) % 16; -+ -+ pn_vector[0] = pframe[hdrlen]; -+ pn_vector[1] = pframe[hdrlen+1]; -+ pn_vector[2] = pframe[hdrlen+4]; -+ pn_vector[3] = pframe[hdrlen+5]; -+ pn_vector[4] = pframe[hdrlen+6]; -+ pn_vector[5] = pframe[hdrlen+7]; -+ -+ if ((hdrlen == WLAN_HDR_A3_LEN )||(hdrlen == WLAN_HDR_A3_QOS_LEN)) -+ a4_exists = 0; -+ else -+ a4_exists = 1; -+ -+ if ( -+ ((frtype|frsubtype) == WIFI_DATA_CFACK) || -+ ((frtype|frsubtype) == WIFI_DATA_CFPOLL)|| -+ ((frtype|frsubtype) == WIFI_DATA_CFACKPOLL)) -+ { -+ qc_exists = 1; -+ if(hdrlen != WLAN_HDR_A3_QOS_LEN){ -+ -+ hdrlen += 2; -+ } -+ }//only for data packet . add for CONFIG_IEEE80211W, none 11w also can use -+ else if ((frtype == WIFI_DATA) && -+ ((frsubtype == 0x08) || -+ (frsubtype == 0x09)|| -+ (frsubtype == 0x0a)|| -+ (frsubtype == 0x0b))) -+ { -+ if(hdrlen != WLAN_HDR_A3_QOS_LEN){ -+ -+ hdrlen += 2; -+ } -+ qc_exists = 1; -+ } -+ else -+ qc_exists = 0; -+ -+ -+ // now, decrypt pframe with hdrlen offset and plen long -+ -+ payload_index = hdrlen + 8; // 8 is for extiv -+ -+ for (i=0; i< num_blocks; i++) -+ { -+ construct_ctr_preload( -+ ctr_preload, -+ a4_exists, -+ qc_exists, -+ pframe, -+ pn_vector, -+ i+1, -+ frtype // add for CONFIG_IEEE80211W, none 11w also can use -+ ); -+ -+ aes128k128d(key, ctr_preload, aes_out); -+ bitwise_xor(aes_out, &pframe[payload_index], chain_buffer); -+ -+ for (j=0; j<16;j++) pframe[payload_index++] = chain_buffer[j]; -+ } -+ -+ if (payload_remainder > 0) /* If there is a short final block, then pad it,*/ -+ { /* encrypt it and copy the unpadded part back */ -+ construct_ctr_preload( -+ ctr_preload, -+ a4_exists, -+ qc_exists, -+ pframe, -+ pn_vector, -+ num_blocks+1, -+ frtype // add for CONFIG_IEEE80211W, none 11w also can use -+ ); -+ -+ for (j = 0; j < 16; j++) padded_buffer[j] = 0x00; -+ for (j = 0; j < payload_remainder; j++) -+ { -+ padded_buffer[j] = pframe[payload_index+j]; -+ } -+ aes128k128d(key, ctr_preload, aes_out); -+ bitwise_xor(aes_out, padded_buffer, chain_buffer); -+ for (j=0; j 0) -+ { -+ for (j = 0; j < 16; j++) padded_buffer[j] = 0x00; -+ for (j = 0; j < payload_remainder; j++) -+ { -+ padded_buffer[j] = message[payload_index++]; -+ } -+ bitwise_xor(aes_out, padded_buffer, chain_buffer); -+ aes128k128d(key, chain_buffer, aes_out); -+ -+ } -+ -+ for (j = 0 ; j < 8; j++) mic[j] = aes_out[j]; -+ -+ /* Insert MIC into payload */ -+ for (j = 0; j < 8; j++) -+ message[payload_index+j] = mic[j]; -+ -+ payload_index = hdrlen + 8; -+ for (i=0; i< num_blocks; i++) -+ { -+ construct_ctr_preload( -+ ctr_preload, -+ a4_exists, -+ qc_exists, -+ message, -+ pn_vector, -+ i+1, -+ frtype); // add for CONFIG_IEEE80211W, none 11w also can use -+ aes128k128d(key, ctr_preload, aes_out); -+ bitwise_xor(aes_out, &message[payload_index], chain_buffer); -+ for (j=0; j<16;j++) message[payload_index++] = chain_buffer[j]; -+ } -+ -+ if (payload_remainder > 0) /* If there is a short final block, then pad it,*/ -+ { /* encrypt it and copy the unpadded part back */ -+ construct_ctr_preload( -+ ctr_preload, -+ a4_exists, -+ qc_exists, -+ message, -+ pn_vector, -+ num_blocks+1, -+ frtype); // add for CONFIG_IEEE80211W, none 11w also can use -+ -+ for (j = 0; j < 16; j++) padded_buffer[j] = 0x00; -+ for (j = 0; j < payload_remainder; j++) -+ { -+ padded_buffer[j] = message[payload_index+j]; -+ } -+ aes128k128d(key, ctr_preload, aes_out); -+ bitwise_xor(aes_out, padded_buffer, chain_buffer); -+ for (j=0; ju.hdr.attrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+// struct recv_priv *precvpriv=&padapter->recvpriv; -+ u32 res=_SUCCESS; -+_func_enter_; -+ pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; -+ //4 start to encrypt each fragment -+ if((prxattrib->encrypt==_AES_)){ -+ -+ stainfo=rtw_get_stainfo(&padapter->stapriv ,&prxattrib->ta[0] ); -+ if (stainfo!=NULL){ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_aes_decrypt: stainfo!=NULL!!!\n")); -+ -+ if(IS_MCAST(prxattrib->ra)) -+ { -+ //in concurrent we should use sw descrypt in group key, so we remove this message -+ //DBG_871X("rx bc/mc packets, to perform sw rtw_aes_decrypt\n"); -+ //prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; -+ if(psecuritypriv->binstallGrpkey==_FALSE) -+ { -+ res=_FAIL; -+ DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__FUNCTION__); -+ goto exit; -+ } -+ prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; -+ -+ if(psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) -+ { -+ DBG_871X("not match packet_index=%d, install_index=%d \n" -+ , prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid); -+ res=_FAIL; -+ goto exit; -+ } -+ } -+ else -+ { -+ prwskey=&stainfo->dot118021x_UncstKey.skey[0]; -+ } -+ -+ length= ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len; -+ /*// add for CONFIG_IEEE80211W, debug -+ if(0) -+ printk("@@@@@@@@@@@@@@@@@@ length=%d, prxattrib->hdrlen=%d, prxattrib->pkt_len=%d \n" -+ , length, prxattrib->hdrlen, prxattrib->pkt_len); -+ if(0) -+ { -+ int no; -+ //test print PSK -+ printk("PSK key below:\n"); -+ for(no=0;no<16;no++) -+ printk(" %02x ", prwskey[no]); -+ printk("\n"); -+ } -+ if(0) -+ { -+ int no; -+ //test print PSK -+ printk("frame:\n"); -+ for(no=0;nopkt_len;no++) -+ printk(" %02x ", pframe[no]); -+ printk("\n"); -+ }*/ -+ -+ res= aes_decipher(prwskey,prxattrib->hdrlen,pframe, length); -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("rtw_aes_encrypt: stainfo==NULL!!!\n")); -+ res=_FAIL; -+ } -+ -+ } -+_func_exit_; -+exit: -+ return res; -+} -+ -+#ifdef CONFIG_IEEE80211W -+u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe) -+{ -+ struct rx_pkt_attrib *pattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; -+ u8 *pframe; -+ u8 *BIP_AAD, *p; -+ u32 res=_FAIL; -+ uint len, ori_len; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u8 mic[16]; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ ori_len = pattrib->pkt_len-WLAN_HDR_A3_LEN+BIP_AAD_SIZE; -+ BIP_AAD = rtw_zmalloc(ori_len); -+ -+ if(BIP_AAD == NULL) -+ { -+ DBG_871X("BIP AAD allocate fail\n"); -+ return _FAIL; -+ } -+ //PKT start -+ pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; -+ //mapping to wlan header -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ //save the frame body + MME -+ _rtw_memcpy(BIP_AAD+BIP_AAD_SIZE, pframe+WLAN_HDR_A3_LEN, pattrib->pkt_len-WLAN_HDR_A3_LEN); -+ //find MME IE pointer -+ p = rtw_get_ie(BIP_AAD+BIP_AAD_SIZE, _MME_IE_, &len, pattrib->pkt_len-WLAN_HDR_A3_LEN); -+ //Baron -+ if(p) -+ { -+ u16 keyid=0; -+ u64 temp_ipn=0; -+ //save packet number -+ _rtw_memcpy(&temp_ipn, p+4, 6); -+ temp_ipn = le64_to_cpu(temp_ipn); -+ //BIP packet number should bigger than previous BIP packet -+ if(temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx) -+ { -+ DBG_871X("replay BIP packet\n"); -+ goto BIP_exit; -+ } -+ //copy key index -+ _rtw_memcpy(&keyid, p+2, 2); -+ keyid = le16_to_cpu(keyid); -+ if(keyid != padapter->securitypriv.dot11wBIPKeyid) -+ { -+ DBG_871X("BIP key index error!\n"); -+ goto BIP_exit; -+ } -+ //clear the MIC field of MME to zero -+ _rtw_memset(p+2+len-8, 0, 8); -+ -+ //conscruct AAD, copy frame control field -+ _rtw_memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2); -+ ClearRetry(BIP_AAD); -+ ClearPwrMgt(BIP_AAD); -+ ClearMData(BIP_AAD); -+ //conscruct AAD, copy address 1 to address 3 -+ _rtw_memcpy(BIP_AAD+2, pwlanhdr->addr1, 18); -+ -+ if(omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyid].skey -+ , BIP_AAD, ori_len, mic)) -+ goto BIP_exit; -+ -+ /*//management packet content -+ { -+ int pp; -+ DBG_871X("pkt: "); -+ for(pp=0;pp< pattrib->pkt_len; pp++) -+ printk(" %02x ", pframe[pp]); -+ DBG_871X("\n"); -+ //BIP AAD + management frame body + MME(MIC is zero) -+ DBG_871X("AAD+PKT: "); -+ for(pp=0;pp< ori_len; pp++) -+ DBG_871X(" %02x ", BIP_AAD[pp]); -+ DBG_871X("\n"); -+ //show the MIC result -+ DBG_871X("mic: "); -+ for(pp=0;pp<16; pp++) -+ DBG_871X(" %02x ", mic[pp]); -+ DBG_871X("\n"); -+ } -+ */ -+ //MIC field should be last 8 bytes of packet (packet without FCS) -+ if(_rtw_memcmp(mic, pframe+pattrib->pkt_len-8, 8)) -+ { -+ pmlmeext->mgnt_80211w_IPN_rx = temp_ipn; -+ res=_SUCCESS; -+ } -+ else -+ DBG_871X("BIP MIC error!\n"); -+ -+ } -+ else -+ res = RTW_RX_HANDLED; -+BIP_exit: -+ -+ rtw_mfree(BIP_AAD, ori_len); -+ return res; -+} -+#endif //CONFIG_IEEE80211W -+ -+#ifndef PLATFORM_FREEBSD -+/* compress 512-bits */ -+static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+{ -+ u32 S[8], W[64], t0, t1; -+ u32 t; -+ int i; -+ -+ /* copy state into S */ -+ for (i = 0; i < 8; i++) { -+ S[i] = md->state[i]; -+ } -+ -+ /* copy the state into 512-bits into W[0..15] */ -+ for (i = 0; i < 16; i++) -+ W[i] = WPA_GET_BE32(buf + (4 * i)); -+ -+ /* fill W[16..63] */ -+ for (i = 16; i < 64; i++) { -+ W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + -+ W[i - 16]; -+ } -+ -+ /* Compress */ -+#define RND(a,b,c,d,e,f,g,h,i) \ -+ t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \ -+ t1 = Sigma0(a) + Maj(a, b, c); \ -+ d += t0; \ -+ h = t0 + t1; -+ -+ for (i = 0; i < 64; ++i) { -+ RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i); -+ t = S[7]; S[7] = S[6]; S[6] = S[5]; S[5] = S[4]; -+ S[4] = S[3]; S[3] = S[2]; S[2] = S[1]; S[1] = S[0]; S[0] = t; -+ } -+ -+ /* feedback */ -+ for (i = 0; i < 8; i++) { -+ md->state[i] = md->state[i] + S[i]; -+ } -+ return 0; -+} -+ -+/* Initialize the hash state */ -+static void sha256_init(struct sha256_state *md) -+{ -+ md->curlen = 0; -+ md->length = 0; -+ md->state[0] = 0x6A09E667UL; -+ md->state[1] = 0xBB67AE85UL; -+ md->state[2] = 0x3C6EF372UL; -+ md->state[3] = 0xA54FF53AUL; -+ md->state[4] = 0x510E527FUL; -+ md->state[5] = 0x9B05688CUL; -+ md->state[6] = 0x1F83D9ABUL; -+ md->state[7] = 0x5BE0CD19UL; -+} -+ -+/** -+ Process a block of memory though the hash -+ @param md The hash state -+ @param in The data to hash -+ @param inlen The length of the data (octets) -+ @return CRYPT_OK if successful -+*/ -+static int sha256_process(struct sha256_state *md, unsigned char *in, -+ unsigned long inlen) -+{ -+ unsigned long n; -+#define block_size 64 -+ -+ if (md->curlen > sizeof(md->buf)) -+ return -1; -+ -+ while (inlen > 0) { -+ if (md->curlen == 0 && inlen >= block_size) { -+ if (sha256_compress(md, (unsigned char *) in) < 0) -+ return -1; -+ md->length += block_size * 8; -+ in += block_size; -+ inlen -= block_size; -+ } else { -+ n = MIN(inlen, (block_size - md->curlen)); -+ _rtw_memcpy(md->buf + md->curlen, in, n); -+ md->curlen += n; -+ in += n; -+ inlen -= n; -+ if (md->curlen == block_size) { -+ if (sha256_compress(md, md->buf) < 0) -+ return -1; -+ md->length += 8 * block_size; -+ md->curlen = 0; -+ } -+ } -+ } -+ -+ return 0; -+} -+ -+ -+/** -+ Terminate the hash to get the digest -+ @param md The hash state -+ @param out [out] The destination of the hash (32 bytes) -+ @return CRYPT_OK if successful -+*/ -+static int sha256_done(struct sha256_state *md, unsigned char *out) -+{ -+ int i; -+ -+ if (md->curlen >= sizeof(md->buf)) -+ return -1; -+ -+ /* increase the length of the message */ -+ md->length += md->curlen * 8; -+ -+ /* append the '1' bit */ -+ md->buf[md->curlen++] = (unsigned char) 0x80; -+ -+ /* if the length is currently above 56 bytes we append zeros -+ * then compress. Then we can fall back to padding zeros and length -+ * encoding like normal. -+ */ -+ if (md->curlen > 56) { -+ while (md->curlen < 64) { -+ md->buf[md->curlen++] = (unsigned char) 0; -+ } -+ sha256_compress(md, md->buf); -+ md->curlen = 0; -+ } -+ -+ /* pad upto 56 bytes of zeroes */ -+ while (md->curlen < 56) { -+ md->buf[md->curlen++] = (unsigned char) 0; -+ } -+ -+ /* store length */ -+ WPA_PUT_BE64(md->buf + 56, md->length); -+ sha256_compress(md, md->buf); -+ -+ /* copy output */ -+ for (i = 0; i < 8; i++) -+ WPA_PUT_BE32(out + (4 * i), md->state[i]); -+ -+ return 0; -+} -+ -+/** -+ * sha256_vector - SHA256 hash for data vector -+ * @num_elem: Number of elements in the data vector -+ * @addr: Pointers to the data areas -+ * @len: Lengths of the data blocks -+ * @mac: Buffer for the hash -+ * Returns: 0 on success, -1 of failure -+ */ -+static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, -+ u8 *mac) -+{ -+ struct sha256_state ctx; -+ size_t i; -+ -+ sha256_init(&ctx); -+ for (i = 0; i < num_elem; i++) -+ if (sha256_process(&ctx, addr[i], len[i])) -+ return -1; -+ if (sha256_done(&ctx, mac)) -+ return -1; -+ return 0; -+} -+ -+static u8 os_strlen(const char *s) -+{ -+ const char *p = s; -+ while (*p) -+ p++; -+ return p - s; -+} -+ -+static int os_memcmp(void *s1, void *s2, u8 n) -+{ -+ unsigned char *p1 = s1, *p2 = s2; -+ -+ if (n == 0) -+ return 0; -+ -+ while (*p1 == *p2) { -+ p1++; -+ p2++; -+ n--; -+ if (n == 0) -+ return 0; -+ } -+ -+ return *p1 - *p2; -+} -+ -+/** -+ * hmac_sha256_vector - HMAC-SHA256 over data vector (RFC 2104) -+ * @key: Key for HMAC operations -+ * @key_len: Length of the key in bytes -+ * @num_elem: Number of elements in the data vector -+ * @addr: Pointers to the data areas -+ * @len: Lengths of the data blocks -+ * @mac: Buffer for the hash (32 bytes) -+ */ -+static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, -+ u8 *addr[], size_t *len, u8 *mac) -+{ -+ unsigned char k_pad[64]; /* padding - key XORd with ipad/opad */ -+ unsigned char tk[32]; -+ u8 *_addr[6]; -+ size_t _len[6], i; -+ -+ if (num_elem > 5) { -+ /* -+ * Fixed limit on the number of fragments to avoid having to -+ * allocate memory (which could fail). -+ */ -+ return; -+ } -+ -+ /* if key is longer than 64 bytes reset it to key = SHA256(key) */ -+ if (key_len > 64) { -+ sha256_vector(1, &key, &key_len, tk); -+ key = tk; -+ key_len = 32; -+ } -+ -+ /* the HMAC_SHA256 transform looks like: -+ * -+ * SHA256(K XOR opad, SHA256(K XOR ipad, text)) -+ * -+ * where K is an n byte key -+ * ipad is the byte 0x36 repeated 64 times -+ * opad is the byte 0x5c repeated 64 times -+ * and text is the data being protected */ -+ -+ /* start out by storing key in ipad */ -+ _rtw_memset(k_pad, 0, sizeof(k_pad)); -+ _rtw_memcpy(k_pad, key, key_len); -+ /* XOR key with ipad values */ -+ for (i = 0; i < 64; i++) -+ k_pad[i] ^= 0x36; -+ -+ /* perform inner SHA256 */ -+ _addr[0] = k_pad; -+ _len[0] = 64; -+ for (i = 0; i < num_elem; i++) { -+ _addr[i + 1] = addr[i]; -+ _len[i + 1] = len[i]; -+ } -+ sha256_vector(1 + num_elem, _addr, _len, mac); -+ -+ _rtw_memset(k_pad, 0, sizeof(k_pad)); -+ _rtw_memcpy(k_pad, key, key_len); -+ /* XOR key with opad values */ -+ for (i = 0; i < 64; i++) -+ k_pad[i] ^= 0x5c; -+ -+ /* perform outer SHA256 */ -+ _addr[0] = k_pad; -+ _len[0] = 64; -+ _addr[1] = mac; -+ _len[1] = 32; -+ sha256_vector(2, _addr, _len, mac); -+} -+#endif //PLATFORM_FREEBSD -+/** -+ * sha256_prf - SHA256-based Pseudo-Random Function (IEEE 802.11r, 8.5.1.5.2) -+ * @key: Key for PRF -+ * @key_len: Length of the key in bytes -+ * @label: A unique label for each purpose of the PRF -+ * @data: Extra data to bind into the key -+ * @data_len: Length of the data -+ * @buf: Buffer for the generated pseudo-random key -+ * @buf_len: Number of bytes of key to generate -+ * -+ * This function is used to derive new, cryptographically separate keys from a -+ * given key. -+ */ -+#ifndef PLATFORM_FREEBSD //Baron -+static void sha256_prf(u8 *key, size_t key_len, char *label, -+ u8 *data, size_t data_len, u8 *buf, size_t buf_len) -+{ -+ u16 counter = 1; -+ size_t pos, plen; -+ u8 hash[SHA256_MAC_LEN]; -+ u8 *addr[4]; -+ size_t len[4]; -+ u8 counter_le[2], length_le[2]; -+ -+ addr[0] = counter_le; -+ len[0] = 2; -+ addr[1] = (u8 *) label; -+ len[1] = os_strlen(label); -+ addr[2] = data; -+ len[2] = data_len; -+ addr[3] = length_le; -+ len[3] = sizeof(length_le); -+ -+ WPA_PUT_LE16(length_le, buf_len * 8); -+ pos = 0; -+ while (pos < buf_len) { -+ plen = buf_len - pos; -+ WPA_PUT_LE16(counter_le, counter); -+ if (plen >= SHA256_MAC_LEN) { -+ hmac_sha256_vector(key, key_len, 4, addr, len, -+ &buf[pos]); -+ pos += SHA256_MAC_LEN; -+ } else { -+ hmac_sha256_vector(key, key_len, 4, addr, len, hash); -+ _rtw_memcpy(&buf[pos], hash, plen); -+ break; -+ } -+ counter++; -+ } -+} -+#endif //PLATFORM_FREEBSD Baron -+ -+/* AES tables*/ -+const u32 Te0[256] = { -+ 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU, -+ 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U, -+ 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU, -+ 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU, -+ 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U, -+ 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU, -+ 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU, -+ 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU, -+ 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU, -+ 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU, -+ 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U, -+ 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU, -+ 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU, -+ 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U, -+ 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU, -+ 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU, -+ 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU, -+ 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU, -+ 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU, -+ 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U, -+ 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU, -+ 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU, -+ 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU, -+ 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU, -+ 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U, -+ 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U, -+ 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U, -+ 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U, -+ 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU, -+ 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U, -+ 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U, -+ 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU, -+ 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU, -+ 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U, -+ 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U, -+ 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U, -+ 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU, -+ 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U, -+ 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU, -+ 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U, -+ 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU, -+ 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U, -+ 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U, -+ 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU, -+ 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U, -+ 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U, -+ 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U, -+ 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U, -+ 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U, -+ 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U, -+ 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U, -+ 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U, -+ 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU, -+ 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U, -+ 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U, -+ 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U, -+ 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U, -+ 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U, -+ 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U, -+ 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU, -+ 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U, -+ 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U, -+ 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U, -+ 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU, -+}; -+const u32 Td0[256] = { -+ 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, -+ 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, -+ 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U, -+ 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU, -+ 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U, -+ 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U, -+ 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU, -+ 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U, -+ 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU, -+ 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U, -+ 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U, -+ 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U, -+ 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U, -+ 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU, -+ 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U, -+ 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU, -+ 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U, -+ 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU, -+ 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U, -+ 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U, -+ 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U, -+ 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU, -+ 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U, -+ 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU, -+ 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U, -+ 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU, -+ 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U, -+ 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU, -+ 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU, -+ 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U, -+ 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU, -+ 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U, -+ 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU, -+ 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U, -+ 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U, -+ 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U, -+ 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU, -+ 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U, -+ 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U, -+ 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU, -+ 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U, -+ 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U, -+ 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U, -+ 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U, -+ 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U, -+ 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU, -+ 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U, -+ 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U, -+ 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U, -+ 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U, -+ 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U, -+ 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU, -+ 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU, -+ 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU, -+ 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU, -+ 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U, -+ 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U, -+ 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU, -+ 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU, -+ 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U, -+ 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU, -+ 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U, -+ 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U, -+ 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U, -+}; -+const u8 Td4s[256] = { -+ 0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U, -+ 0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU, -+ 0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U, -+ 0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU, -+ 0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU, -+ 0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU, -+ 0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U, -+ 0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U, -+ 0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U, -+ 0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U, -+ 0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU, -+ 0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U, -+ 0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU, -+ 0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U, -+ 0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U, -+ 0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU, -+ 0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU, -+ 0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U, -+ 0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U, -+ 0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU, -+ 0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U, -+ 0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU, -+ 0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U, -+ 0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U, -+ 0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U, -+ 0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU, -+ 0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU, -+ 0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU, -+ 0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U, -+ 0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U, -+ 0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U, -+ 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU, -+}; -+const u8 rcons[] = { -+ 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36 -+ /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ -+}; -+ -+/** -+ * Expand the cipher key into the encryption key schedule. -+ * -+ * @return the number of rounds for the given cipher key size. -+ */ -+#ifndef PLATFORM_FREEBSD //Baron -+static void rijndaelKeySetupEnc(u32 rk[/*44*/], const u8 cipherKey[]) -+{ -+ int i; -+ u32 temp; -+ -+ rk[0] = GETU32(cipherKey ); -+ rk[1] = GETU32(cipherKey + 4); -+ rk[2] = GETU32(cipherKey + 8); -+ rk[3] = GETU32(cipherKey + 12); -+ for (i = 0; i < 10; i++) { -+ temp = rk[3]; -+ rk[4] = rk[0] ^ -+ TE421(temp) ^ TE432(temp) ^ TE443(temp) ^ TE414(temp) ^ -+ RCON(i); -+ rk[5] = rk[1] ^ rk[4]; -+ rk[6] = rk[2] ^ rk[5]; -+ rk[7] = rk[3] ^ rk[6]; -+ rk += 4; -+ } -+} -+ -+static void rijndaelEncrypt(u32 rk[/*44*/], u8 pt[16], u8 ct[16]) -+{ -+ u32 s0, s1, s2, s3, t0, t1, t2, t3; -+ int Nr = 10; -+#ifndef FULL_UNROLL -+ int r; -+#endif /* ?FULL_UNROLL */ -+ -+ /* -+ * map byte array block to cipher state -+ * and add initial round key: -+ */ -+ s0 = GETU32(pt ) ^ rk[0]; -+ s1 = GETU32(pt + 4) ^ rk[1]; -+ s2 = GETU32(pt + 8) ^ rk[2]; -+ s3 = GETU32(pt + 12) ^ rk[3]; -+ -+#define ROUND(i,d,s) \ -+d##0 = TE0(s##0) ^ TE1(s##1) ^ TE2(s##2) ^ TE3(s##3) ^ rk[4 * i]; \ -+d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \ -+d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \ -+d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3] -+ -+#ifdef FULL_UNROLL -+ -+ ROUND(1,t,s); -+ ROUND(2,s,t); -+ ROUND(3,t,s); -+ ROUND(4,s,t); -+ ROUND(5,t,s); -+ ROUND(6,s,t); -+ ROUND(7,t,s); -+ ROUND(8,s,t); -+ ROUND(9,t,s); -+ -+ rk += Nr << 2; -+ -+#else /* !FULL_UNROLL */ -+ -+ /* Nr - 1 full rounds: */ -+ r = Nr >> 1; -+ for (;;) { -+ ROUND(1,t,s); -+ rk += 8; -+ if (--r == 0) -+ break; -+ ROUND(0,s,t); -+ } -+ -+#endif /* ?FULL_UNROLL */ -+ -+#undef ROUND -+ -+ /* -+ * apply last round and -+ * map cipher state to byte array block: -+ */ -+ s0 = TE41(t0) ^ TE42(t1) ^ TE43(t2) ^ TE44(t3) ^ rk[0]; -+ PUTU32(ct , s0); -+ s1 = TE41(t1) ^ TE42(t2) ^ TE43(t3) ^ TE44(t0) ^ rk[1]; -+ PUTU32(ct + 4, s1); -+ s2 = TE41(t2) ^ TE42(t3) ^ TE43(t0) ^ TE44(t1) ^ rk[2]; -+ PUTU32(ct + 8, s2); -+ s3 = TE41(t3) ^ TE42(t0) ^ TE43(t1) ^ TE44(t2) ^ rk[3]; -+ PUTU32(ct + 12, s3); -+} -+ -+static void * aes_encrypt_init(u8 *key, size_t len) -+{ -+ u32 *rk; -+ if (len != 16) -+ return NULL; -+ rk = (u32*)rtw_malloc(AES_PRIV_SIZE); -+ if (rk == NULL) -+ return NULL; -+ rijndaelKeySetupEnc(rk, key); -+ return rk; -+} -+ -+static void aes_128_encrypt(void *ctx, u8 *plain, u8 *crypt) -+{ -+ rijndaelEncrypt(ctx, plain, crypt); -+} -+ -+ -+static void gf_mulx(u8 *pad) -+{ -+ int i, carry; -+ -+ carry = pad[0] & 0x80; -+ for (i = 0; i < AES_BLOCK_SIZE - 1; i++) -+ pad[i] = (pad[i] << 1) | (pad[i + 1] >> 7); -+ pad[AES_BLOCK_SIZE - 1] <<= 1; -+ if (carry) -+ pad[AES_BLOCK_SIZE - 1] ^= 0x87; -+} -+ -+static void aes_encrypt_deinit(void *ctx) -+{ -+ _rtw_memset(ctx, 0, AES_PRIV_SIZE); -+ rtw_mfree(ctx, AES_PRIV_SIZE); -+} -+ -+ -+/** -+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128 -+ * @key: 128-bit key for the hash operation -+ * @num_elem: Number of elements in the data vector -+ * @addr: Pointers to the data areas -+ * @len: Lengths of the data blocks -+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) -+ * Returns: 0 on success, -1 on failure -+ * -+ * This is a mode for using block cipher (AES in this case) for authentication. -+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication -+ * (SP) 800-38B. -+ */ -+static int omac1_aes_128_vector(u8 *key, size_t num_elem, -+ u8 *addr[], size_t *len, u8 *mac) -+{ -+ void *ctx; -+ u8 cbc[AES_BLOCK_SIZE], pad[AES_BLOCK_SIZE]; -+ u8 *pos, *end; -+ size_t i, e, left, total_len; -+ -+ ctx = aes_encrypt_init(key, 16); -+ if (ctx == NULL) -+ return -1; -+ _rtw_memset(cbc, 0, AES_BLOCK_SIZE); -+ -+ total_len = 0; -+ for (e = 0; e < num_elem; e++) -+ total_len += len[e]; -+ left = total_len; -+ -+ e = 0; -+ pos = addr[0]; -+ end = pos + len[0]; -+ -+ while (left >= AES_BLOCK_SIZE) { -+ for (i = 0; i < AES_BLOCK_SIZE; i++) { -+ cbc[i] ^= *pos++; -+ if (pos >= end) { -+ e++; -+ pos = addr[e]; -+ end = pos + len[e]; -+ } -+ } -+ if (left > AES_BLOCK_SIZE) -+ aes_128_encrypt(ctx, cbc, cbc); -+ left -= AES_BLOCK_SIZE; -+ } -+ -+ _rtw_memset(pad, 0, AES_BLOCK_SIZE); -+ aes_128_encrypt(ctx, pad, pad); -+ gf_mulx(pad); -+ -+ if (left || total_len == 0) { -+ for (i = 0; i < left; i++) { -+ cbc[i] ^= *pos++; -+ if (pos >= end) { -+ e++; -+ pos = addr[e]; -+ end = pos + len[e]; -+ } -+ } -+ cbc[left] ^= 0x80; -+ gf_mulx(pad); -+ } -+ -+ for (i = 0; i < AES_BLOCK_SIZE; i++) -+ pad[i] ^= cbc[i]; -+ aes_128_encrypt(ctx, pad, mac); -+ aes_encrypt_deinit(ctx); -+ return 0; -+} -+ -+ -+/** -+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) -+ * @key: 128-bit key for the hash operation -+ * @data: Data buffer for which a MAC is determined -+ * @data_len: Length of data buffer in bytes -+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) -+ * Returns: 0 on success, -1 on failure -+ * -+ * This is a mode for using block cipher (AES in this case) for authentication. -+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication -+ * (SP) 800-38B. -+ */ //modify for CONFIG_IEEE80211W -+int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac) -+{ -+ return omac1_aes_128_vector(key, 1, &data, &data_len, mac); -+} -+#endif //PLATFORM_FREEBSD Baron -+ -+#ifdef CONFIG_TDLS -+void wpa_tdls_generate_tpk(_adapter *padapter, struct sta_info *psta) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ u8 *SNonce = psta->SNonce; -+ u8 *ANonce = psta->ANonce; -+ -+ u8 key_input[SHA256_MAC_LEN]; -+ u8 *nonce[2]; -+ size_t len[2]; -+ u8 data[3 * ETH_ALEN]; -+ -+ /* IEEE Std 802.11z-2010 8.5.9.1: -+ * TPK-Key-Input = SHA-256(min(SNonce, ANonce) || max(SNonce, ANonce)) -+ */ -+ len[0] = 32; -+ len[1] = 32; -+ if (os_memcmp(SNonce, ANonce, 32) < 0) { -+ nonce[0] = SNonce; -+ nonce[1] = ANonce; -+ } else { -+ nonce[0] = ANonce; -+ nonce[1] = SNonce; -+ } -+ -+ sha256_vector(2, nonce, len, key_input); -+ -+ /* -+ * TPK-Key-Data = KDF-N_KEY(TPK-Key-Input, "TDLS PMK", -+ * min(MAC_I, MAC_R) || max(MAC_I, MAC_R) || BSSID || N_KEY) -+ * TODO: is N_KEY really included in KDF Context and if so, in which -+ * presentation format (little endian 16-bit?) is it used? It gets -+ * added by the KDF anyway.. -+ */ -+ -+ if (os_memcmp(myid(&(padapter->eeprompriv)), psta->hwaddr, ETH_ALEN) < 0) { -+ _rtw_memcpy(data, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(data + ETH_ALEN, psta->hwaddr, ETH_ALEN); -+ } else { -+ _rtw_memcpy(data, psta->hwaddr, ETH_ALEN); -+ _rtw_memcpy(data + ETH_ALEN, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ } -+ _rtw_memcpy(data + 2 * ETH_ALEN, get_bssid(pmlmepriv), ETH_ALEN); -+ -+ sha256_prf(key_input, SHA256_MAC_LEN, "TDLS PMK", data, sizeof(data), (u8 *) &psta->tpk, sizeof(psta->tpk)); -+ -+ -+} -+ -+/** -+ * wpa_tdls_ftie_mic - Calculate TDLS FTIE MIC -+ * @kck: TPK-KCK -+ * @lnkid: Pointer to the beginning of Link Identifier IE -+ * @rsnie: Pointer to the beginning of RSN IE used for handshake -+ * @timeoutie: Pointer to the beginning of Timeout IE used for handshake -+ * @ftie: Pointer to the beginning of FT IE -+ * @mic: Pointer for writing MIC -+ * -+ * Calculate MIC for TDLS frame. -+ */ -+int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq, -+ u8 *lnkid, u8 *rsnie, u8 *timeoutie, u8 *ftie, -+ u8 *mic) -+{ -+ u8 *buf, *pos; -+ struct wpa_tdls_ftie *_ftie; -+ struct wpa_tdls_lnkid *_lnkid; -+ int ret; -+ int len = 2 * ETH_ALEN + 1 + 2 + lnkid[1] + 2 + rsnie[1] + -+ 2 + timeoutie[1] + 2 + ftie[1]; -+ buf = rtw_zmalloc(len); -+ if (!buf) { -+ DBG_871X("TDLS: No memory for MIC calculation\n"); -+ return -1; -+ } -+ -+ pos = buf; -+ _lnkid = (struct wpa_tdls_lnkid *) lnkid; -+ /* 1) TDLS initiator STA MAC address */ -+ _rtw_memcpy(pos, _lnkid->init_sta, ETH_ALEN); -+ pos += ETH_ALEN; -+ /* 2) TDLS responder STA MAC address */ -+ _rtw_memcpy(pos, _lnkid->resp_sta, ETH_ALEN); -+ pos += ETH_ALEN; -+ /* 3) Transaction Sequence number */ -+ *pos++ = trans_seq; -+ /* 4) Link Identifier IE */ -+ _rtw_memcpy(pos, lnkid, 2 + lnkid[1]); -+ pos += 2 + lnkid[1]; -+ /* 5) RSN IE */ -+ _rtw_memcpy(pos, rsnie, 2 + rsnie[1]); -+ pos += 2 + rsnie[1]; -+ /* 6) Timeout Interval IE */ -+ _rtw_memcpy(pos, timeoutie, 2 + timeoutie[1]); -+ pos += 2 + timeoutie[1]; -+ /* 7) FTIE, with the MIC field of the FTIE set to 0 */ -+ _rtw_memcpy(pos, ftie, 2 + ftie[1]); -+ _ftie = (struct wpa_tdls_ftie *) pos; -+ _rtw_memset(_ftie->mic, 0, TDLS_MIC_LEN); -+ pos += 2 + ftie[1]; -+ -+ ret = omac1_aes_128(kck, buf, pos - buf, mic); -+ rtw_mfree(buf, len); -+ return ret; -+ -+} -+ -+int tdls_verify_mic(u8 *kck, u8 trans_seq, -+ u8 *lnkid, u8 *rsnie, u8 *timeoutie, u8 *ftie) -+{ -+ u8 *buf, *pos; -+ int len; -+ u8 mic[16]; -+ int ret; -+ u8 *rx_ftie, *tmp_ftie; -+ -+ if (lnkid == NULL || rsnie == NULL || -+ timeoutie == NULL || ftie == NULL){ -+ return 0; -+ } -+ -+ len = 2 * ETH_ALEN + 1 + 2 + 18 + 2 + *(rsnie+1) + 2 + *(timeoutie+1) + 2 + *(ftie+1); -+ -+ buf = rtw_zmalloc(len); -+ if (buf == NULL) -+ return 0; -+ -+ pos = buf; -+ /* 1) TDLS initiator STA MAC address */ -+ _rtw_memcpy(pos, lnkid + ETH_ALEN + 2, ETH_ALEN); -+ pos += ETH_ALEN; -+ /* 2) TDLS responder STA MAC address */ -+ _rtw_memcpy(pos, lnkid + 2 * ETH_ALEN + 2, ETH_ALEN); -+ pos += ETH_ALEN; -+ /* 3) Transaction Sequence number */ -+ *pos++ = trans_seq; -+ /* 4) Link Identifier IE */ -+ _rtw_memcpy(pos, lnkid, 2 + 18); -+ pos += 2 + 18; -+ /* 5) RSN IE */ -+ _rtw_memcpy(pos, rsnie, 2 + *(rsnie+1)); -+ pos += 2 + *(rsnie+1); -+ /* 6) Timeout Interval IE */ -+ _rtw_memcpy(pos, timeoutie, 2 + *(timeoutie+1)); -+ pos += 2 + *(timeoutie+1); -+ /* 7) FTIE, with the MIC field of the FTIE set to 0 */ -+ _rtw_memcpy(pos, ftie, 2 + *(ftie+1)); -+ pos += 2; -+ tmp_ftie = (u8 *) (pos+2); -+ _rtw_memset(tmp_ftie, 0, 16); -+ pos += *(ftie+1); -+ -+ ret = omac1_aes_128(kck, buf, pos - buf, mic); -+ rtw_mfree(buf, len); -+ if (ret) -+ return 0; -+ rx_ftie = ftie+4; -+ -+ if (os_memcmp(mic, rx_ftie, 16) == 0) { -+ //Valid MIC -+ return 1; -+ } -+ -+ //Invalid MIC -+ DBG_871X( "[%s] Invalid MIC\n", __FUNCTION__); -+ return 0; -+ -+} -+#endif //CONFIG_TDLS -+ -+#ifdef PLATFORM_WINDOWS -+void rtw_use_tkipkey_handler ( -+ IN PVOID SystemSpecific1, -+ IN PVOID FunctionContext, -+ IN PVOID SystemSpecific2, -+ IN PVOID SystemSpecific3 -+ ) -+#endif -+#ifdef PLATFORM_LINUX -+void rtw_use_tkipkey_handler(void *FunctionContext) -+#endif -+#ifdef PLATFORM_FREEBSD -+void rtw_use_tkipkey_handler(void *FunctionContext) -+#endif -+{ -+ _adapter *padapter = (_adapter *)FunctionContext; -+ -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("^^^rtw_use_tkipkey_handler ^^^\n")); -+ -+/* -+ if(padapter->bDriverStopped ||padapter->bSurpriseRemoved){ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("^^^rtw_use_tkipkey_handler (padapter->bDriverStopped %d)(padapter->bSurpriseRemoved %d)^^^\n",padapter->bDriverStopped,padapter->bSurpriseRemoved)); -+ -+ return; -+ } -+ */ -+ -+ padapter->securitypriv.busetkipkey=_TRUE; -+ -+ RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n",padapter->securitypriv.busetkipkey)); -+ -+_func_exit_; -+ -+} -+ -+/* Restore HW wep key setting according to key_mask */ -+void rtw_sec_restore_wep_key(_adapter *adapter) -+{ -+ struct security_priv* securitypriv=&(adapter->securitypriv); -+ sint keyid; -+ -+ if((_WEP40_ == securitypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == securitypriv->dot11PrivacyAlgrthm)) { -+ for(keyid=0;keyid<4;keyid++){ -+ if(securitypriv->key_mask & BIT(keyid)){ -+ if(keyid == securitypriv->dot11PrivacyKeyIndex) -+ rtw_set_key(adapter,securitypriv, keyid, 1); -+ else -+ rtw_set_key(adapter,securitypriv, keyid, 0); -+ } -+ } -+ } -+} -+ -+u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller) -+{ -+ struct security_priv* securitypriv=&(adapter->securitypriv); -+ u8 status = _SUCCESS; -+ -+ if (securitypriv->btkip_countermeasure == _TRUE) { -+ u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time); -+ if (passing_ms > 60*1000) { -+ LOG_LEVEL(_drv_info_, "%s("ADPT_FMT") countermeasure time:%ds > 60s \n", -+ caller, ADPT_ARG(adapter), passing_ms/1000); -+ securitypriv->btkip_countermeasure = _FALSE; -+ securitypriv->btkip_countermeasure_time = 0; -+ } else { -+ LOG_LEVEL(_drv_warning_, "%s("ADPT_FMT") countermeasure time:%ds < 60s \n", -+ caller, ADPT_ARG(adapter), passing_ms/1000); -+ status = _FAIL; -+ } -+ } -+ -+ return status; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c -@@ -0,0 +1,352 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#include -+ -+void sreset_init_value(_adapter *padapter) -+{ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct sreset_priv *psrtpriv = &pHalData->srestpriv; -+ -+ _rtw_mutex_init(&psrtpriv->silentreset_mutex); -+ psrtpriv->silent_reset_inprogress = _FALSE; -+ psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; -+ psrtpriv->last_tx_time =0; -+ psrtpriv->last_tx_complete_time =0; -+#endif -+} -+void sreset_reset_value(_adapter *padapter) -+{ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct sreset_priv *psrtpriv = &pHalData->srestpriv; -+ -+ psrtpriv->silent_reset_inprogress = _FALSE; -+ psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; -+ psrtpriv->last_tx_time =0; -+ psrtpriv->last_tx_complete_time =0; -+#endif -+} -+ -+u8 sreset_get_wifi_status(_adapter *padapter) -+{ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct sreset_priv *psrtpriv = &pHalData->srestpriv; -+ -+ u8 status = WIFI_STATUS_SUCCESS; -+ u32 val32 = 0; -+ _irqL irqL; -+ if(psrtpriv->silent_reset_inprogress == _TRUE) -+ { -+ return status; -+ } -+ val32 =rtw_read32(padapter,REG_TXDMA_STATUS); -+ if(val32==0xeaeaeaea){ -+ psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST; -+ } -+ else if(val32!=0){ -+ DBG_8192C("txdmastatu(%x)\n",val32); -+ psrtpriv->Wifi_Error_Status = WIFI_MAC_TXDMA_ERROR; -+ } -+ -+ if(WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status) -+ { -+ DBG_8192C("==>%s error_status(0x%x) \n",__FUNCTION__,psrtpriv->Wifi_Error_Status); -+ status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL))); -+ } -+ DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status); -+ -+ //status restore -+ psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; -+ -+ return status; -+#else -+ return WIFI_STATUS_SUCCESS; -+#endif -+} -+ -+void sreset_set_wifi_error_status(_adapter *padapter, u32 status) -+{ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.Wifi_Error_Status = status; -+#endif -+} -+ -+void sreset_set_trigger_point(_adapter *padapter, s32 tgp) -+{ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.dbg_trigger_point = tgp; -+#endif -+} -+ -+bool sreset_inprogress(_adapter *padapter) -+{ -+#if defined(DBG_CONFIG_ERROR_RESET) -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ return pHalData->srestpriv.silent_reset_inprogress; -+#else -+ return _FALSE; -+#endif -+} -+ -+void sreset_restore_security_station(_adapter *padapter) -+{ -+ u8 EntryId = 0; -+ struct mlme_priv *mlmepriv = &padapter->mlmepriv; -+ struct sta_priv * pstapriv = &padapter->stapriv; -+ struct sta_info *psta; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ struct mlme_ext_info *pmlmeinfo = &padapter->mlmeextpriv.mlmext_info; -+ -+ { -+ u8 val8; -+ -+ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) { -+ val8 = 0xcc; -+ #ifdef CONFIG_WAPI_SUPPORT -+ } else if (padapter->wapiInfo.bWapiEnable && pmlmeinfo->auth_algo == dot11AuthAlgrthm_WAPI) { -+ //Disable TxUseDefaultKey, RxUseDefaultKey, RxBroadcastUseDefaultKey. -+ val8 = 0x4c; -+ #endif -+ } else { -+ val8 = 0xcf; -+ } -+ rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); -+ } -+ -+ #if 0 -+ if ( ( padapter->securitypriv.dot11PrivacyAlgrthm == _WEP40_ ) || -+ ( padapter->securitypriv.dot11PrivacyAlgrthm == _WEP104_ )) -+ { -+ -+ for(EntryId=0; EntryId<4; EntryId++) -+ { -+ if(EntryId == psecuritypriv->dot11PrivacyKeyIndex) -+ rtw_set_key(padapter,&padapter->securitypriv, EntryId, 1); -+ else -+ rtw_set_key(padapter,&padapter->securitypriv, EntryId, 0); -+ } -+ -+ } -+ else -+ #endif -+ if((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || -+ (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) -+ { -+ psta = rtw_get_stainfo(pstapriv, get_bssid(mlmepriv)); -+ if (psta == NULL) { -+ //DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); -+ } -+ else -+ { -+ //pairwise key -+ rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE); -+ //group key -+ rtw_set_key(padapter,&padapter->securitypriv,padapter->securitypriv.dot118021XGrpKeyid, 0); -+ } -+ } -+} -+ -+void sreset_restore_network_station(_adapter *padapter) -+{ -+ struct mlme_priv *mlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ #if 0 -+ { -+ //======================================================= -+ // reset related register of Beacon control -+ -+ //set MSR to nolink -+ Set_MSR(padapter, _HW_STATE_NOLINK_); -+ // reject all data frame -+ rtw_write16(padapter, REG_RXFLTMAP2,0x00); -+ //reset TSF -+ rtw_write8(padapter, REG_DUAL_TSF_RST, (BIT(0)|BIT(1))); -+ -+ // disable update TSF -+ SetBcnCtrlReg(padapter, BIT(4), 0); -+ -+ //======================================================= -+ } -+ #endif -+ -+ rtw_setopmode_cmd(padapter, Ndis802_11Infrastructure); -+ -+ { -+ u8 threshold; -+ #ifdef CONFIG_USB_HCI -+ // TH=1 => means that invalidate usb rx aggregation -+ // TH=0 => means that validate usb rx aggregation, use init value. -+ if(mlmepriv->htpriv.ht_option) { -+ if(padapter->registrypriv.wifi_spec==1) -+ threshold = 1; -+ else -+ threshold = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); -+ } else { -+ threshold = 1; -+ rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); -+ } -+ #endif -+ } -+ -+ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+ //disable dynamic functions, such as high power, DIG -+ //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pmlmeinfo->network.MacAddress); -+ -+ { -+ u8 join_type = 0; -+ rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); -+ } -+ -+ Set_MSR(padapter, (pmlmeinfo->state & 0x3)); -+ -+ mlmeext_joinbss_event_callback(padapter, 1); -+ //restore Sequence No. -+ rtw_write8(padapter,0x4dc,padapter->xmitpriv.nqos_ssn); -+ -+ sreset_restore_security_station(padapter); -+} -+ -+void sreset_restore_network_status(_adapter *padapter) -+{ -+ struct mlme_priv *mlmepriv = &padapter->mlmepriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) { -+ DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); -+ sreset_restore_network_station(padapter); -+ } else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) { -+ DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); -+ rtw_ap_restore_network(padapter); -+ } else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) { -+ DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); -+ } else { -+ DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); -+ } -+} -+ -+void sreset_stop_adapter(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ if (padapter == NULL) -+ return; -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ -+ if (!rtw_netif_queue_stopped(padapter->pnetdev)) -+ rtw_netif_stop_queue(padapter->pnetdev); -+ -+ rtw_cancel_all_timer(padapter); -+ -+ /* TODO: OS and HCI independent */ -+ #if defined(PLATFORM_LINUX) && defined(CONFIG_USB_HCI) -+ tasklet_kill(&pxmitpriv->xmit_tasklet); -+ #endif -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) -+ rtw_scan_abort(padapter); -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) -+ _rtw_join_timeout_handler(padapter); -+ -+} -+ -+void sreset_start_adapter(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ if (padapter == NULL) -+ return; -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED)) { -+ sreset_restore_network_status(padapter); -+ } -+ -+ /* TODO: OS and HCI independent */ -+ #if defined(PLATFORM_LINUX) && defined(CONFIG_USB_HCI) -+ tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); -+ #endif -+ -+ _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); -+ -+ if (rtw_netif_queue_stopped(padapter->pnetdev)) -+ rtw_netif_wake_queue(padapter->pnetdev); -+ -+} -+ -+void sreset_reset(_adapter *padapter) -+{ -+#ifdef DBG_CONFIG_ERROR_RESET -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct sreset_priv *psrtpriv = &pHalData->srestpriv; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ _irqL irqL; -+ u32 start = rtw_get_current_time(); -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; -+ -+ _enter_pwrlock(&pwrpriv->lock); -+ -+ psrtpriv->silent_reset_inprogress = _TRUE; -+ pwrpriv->change_rfpwrstate = rf_off; -+ -+ sreset_stop_adapter(padapter); -+ #ifdef CONFIG_CONCURRENT_MODE -+ sreset_stop_adapter(padapter->pbuddy_adapter); -+ #endif -+ -+ #ifdef CONFIG_IPS -+ _ips_enter(padapter); -+ _ips_leave(padapter); -+ #endif -+ -+ sreset_start_adapter(padapter); -+ #ifdef CONFIG_CONCURRENT_MODE -+ sreset_start_adapter(padapter->pbuddy_adapter); -+ #endif -+ -+ psrtpriv->silent_reset_inprogress = _FALSE; -+ -+ _exit_pwrlock(&pwrpriv->lock); -+ -+ DBG_871X("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); -+#endif -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c -@@ -0,0 +1,848 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_STA_MGT_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#include -+ -+void _rtw_init_stainfo(struct sta_info *psta); -+void _rtw_init_stainfo(struct sta_info *psta) -+{ -+ -+_func_enter_; -+ -+ _rtw_memset((u8 *)psta, 0, sizeof (struct sta_info)); -+ -+ _rtw_spinlock_init(&psta->lock); -+ _rtw_init_listhead(&psta->list); -+ _rtw_init_listhead(&psta->hash_list); -+ //_rtw_init_listhead(&psta->asoc_list); -+ //_rtw_init_listhead(&psta->sleep_list); -+ //_rtw_init_listhead(&psta->wakeup_list); -+ -+ _rtw_init_queue(&psta->sleep_q); -+ psta->sleepq_len = 0; -+ -+ _rtw_init_sta_xmit_priv(&psta->sta_xmitpriv); -+ _rtw_init_sta_recv_priv(&psta->sta_recvpriv); -+ -+#ifdef CONFIG_AP_MODE -+ -+ _rtw_init_listhead(&psta->asoc_list); -+ -+ _rtw_init_listhead(&psta->auth_list); -+ -+ psta->expire_to = 0; -+ -+ psta->flags = 0; -+ -+ psta->capability = 0; -+ -+ psta->bpairwise_key_installed = _FALSE; -+ -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ psta->nonerp_set = 0; -+ psta->no_short_slot_time_set = 0; -+ psta->no_short_preamble_set = 0; -+ psta->no_ht_gf_set = 0; -+ psta->no_ht_set = 0; -+ psta->ht_20mhz_set = 0; -+#endif -+ -+#ifdef CONFIG_TX_MCAST2UNI -+ psta->under_exist_checking = 0; -+#endif // CONFIG_TX_MCAST2UNI -+ -+ psta->keep_alive_trycnt = 0; -+ -+#endif // CONFIG_AP_MODE -+ -+_func_exit_; -+ -+} -+ -+u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) -+{ -+ struct sta_info *psta; -+ s32 i; -+ -+_func_enter_; -+ -+ pstapriv->pallocated_stainfo_buf = rtw_zvmalloc (sizeof(struct sta_info) * NUM_STA+ 4); -+ -+ if(!pstapriv->pallocated_stainfo_buf) -+ return _FAIL; -+ -+ pstapriv->pstainfo_buf = pstapriv->pallocated_stainfo_buf + 4 - -+ ((SIZE_PTR)(pstapriv->pallocated_stainfo_buf ) & 3); -+ -+ _rtw_init_queue(&pstapriv->free_sta_queue); -+ -+ _rtw_spinlock_init(&pstapriv->sta_hash_lock); -+ -+ //_rtw_init_queue(&pstapriv->asoc_q); -+ pstapriv->asoc_sta_count = 0; -+ _rtw_init_queue(&pstapriv->sleep_q); -+ _rtw_init_queue(&pstapriv->wakeup_q); -+ -+ psta = (struct sta_info *)(pstapriv->pstainfo_buf); -+ -+ -+ for(i = 0; i < NUM_STA; i++) -+ { -+ _rtw_init_stainfo(psta); -+ -+ _rtw_init_listhead(&(pstapriv->sta_hash[i])); -+ -+ rtw_list_insert_tail(&psta->list, get_list_head(&pstapriv->free_sta_queue)); -+ -+ psta++; -+ } -+ -+ -+ -+#ifdef CONFIG_AP_MODE -+ -+ pstapriv->sta_dz_bitmap = 0; -+ pstapriv->tim_bitmap = 0; -+ -+ _rtw_init_listhead(&pstapriv->asoc_list); -+ _rtw_init_listhead(&pstapriv->auth_list); -+ _rtw_spinlock_init(&pstapriv->asoc_list_lock); -+ _rtw_spinlock_init(&pstapriv->auth_list_lock); -+ pstapriv->asoc_list_cnt = 0; -+ pstapriv->auth_list_cnt = 0; -+ -+ pstapriv->auth_to = 3; // 3*2 = 6 sec -+ pstapriv->assoc_to = 3; -+ //pstapriv->expire_to = 900;// 900*2 = 1800 sec = 30 min, expire after no any traffic. -+ //pstapriv->expire_to = 30;// 30*2 = 60 sec = 1 min, expire after no any traffic. -+#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+ pstapriv->expire_to = 3; // 3*2 = 6 sec -+#else -+ pstapriv->expire_to = 60;// 60*2 = 120 sec = 2 min, expire after no any traffic. -+#endif -+ pstapriv->max_num_sta = NUM_STA; -+ -+#endif -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta) -+{ -+ int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof(struct sta_info); -+ -+ if (!stainfo_offset_valid(offset)) -+ DBG_871X("%s invalid offset(%d), out of range!!!", __func__, offset); -+ -+ return offset; -+} -+ -+inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset) -+{ -+ if (!stainfo_offset_valid(offset)) -+ DBG_871X("%s invalid offset(%d), out of range!!!", __func__, offset); -+ -+ return (struct sta_info *)(stapriv->pstainfo_buf + offset * sizeof(struct sta_info)); -+} -+ -+void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv); -+void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv) -+{ -+_func_enter_; -+ -+ _rtw_spinlock_free(&psta_xmitpriv->lock); -+ -+ _rtw_spinlock_free(&(psta_xmitpriv->be_q.sta_pending.lock)); -+ _rtw_spinlock_free(&(psta_xmitpriv->bk_q.sta_pending.lock)); -+ _rtw_spinlock_free(&(psta_xmitpriv->vi_q.sta_pending.lock)); -+ _rtw_spinlock_free(&(psta_xmitpriv->vo_q.sta_pending.lock)); -+_func_exit_; -+} -+ -+static void _rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv) -+{ -+_func_enter_; -+ -+ _rtw_spinlock_free(&psta_recvpriv->lock); -+ -+ _rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock)); -+ -+_func_exit_; -+ -+} -+ -+void rtw_mfree_stainfo(struct sta_info *psta); -+void rtw_mfree_stainfo(struct sta_info *psta) -+{ -+_func_enter_; -+ -+ if(&psta->lock != NULL) -+ _rtw_spinlock_free(&psta->lock); -+ -+ _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv); -+ _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv); -+ -+_func_exit_; -+} -+ -+ -+// this function is used to free the memory of lock || sema for all stainfos -+void rtw_mfree_all_stainfo(struct sta_priv *pstapriv ); -+void rtw_mfree_all_stainfo(struct sta_priv *pstapriv ) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ struct sta_info *psta = NULL; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ phead = get_list_head(&pstapriv->free_sta_queue); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info ,list); -+ plist = get_next(plist); -+ -+ rtw_mfree_stainfo(psta); -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+_func_exit_; -+ -+} -+ -+void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv); -+void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv) -+{ -+#ifdef CONFIG_AP_MODE -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+#endif -+ -+ rtw_mfree_all_stainfo(pstapriv); //be done before free sta_hash_lock -+ -+ _rtw_spinlock_free(&pstapriv->free_sta_queue.lock); -+ -+ _rtw_spinlock_free(&pstapriv->sta_hash_lock); -+ _rtw_spinlock_free(&pstapriv->wakeup_q.lock); -+ _rtw_spinlock_free(&pstapriv->sleep_q.lock); -+ -+#ifdef CONFIG_AP_MODE -+ _rtw_spinlock_free(&pstapriv->asoc_list_lock); -+ _rtw_spinlock_free(&pstapriv->auth_list_lock); -+ _rtw_spinlock_free(&pacl_list->acl_node_q.lock); -+#endif -+ -+} -+ -+u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) -+{ -+ _irqL irqL; -+ _list *phead, *plist; -+ struct sta_info *psta = NULL; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ int index; -+ -+_func_enter_; -+ if(pstapriv){ -+ -+ /* delete all reordering_ctrl_timer */ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ for(index = 0; index < NUM_STA; index++) -+ { -+ phead = &(pstapriv->sta_hash[index]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ int i; -+ psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); -+ plist = get_next(plist); -+ -+ for(i=0; i < 16 ; i++) -+ { -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); -+ } -+ } -+ } -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ /*===============================*/ -+ -+ rtw_mfree_sta_priv_lock(pstapriv); -+ -+ if(pstapriv->pallocated_stainfo_buf) { -+ rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info)*NUM_STA+4); -+ } -+ } -+ -+_func_exit_; -+ return _SUCCESS; -+} -+ -+ -+//struct sta_info *rtw_alloc_stainfo(_queue *pfree_sta_queue, unsigned char *hwaddr) -+struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) -+{ -+ _irqL irqL, irqL2; -+ uint tmp_aid; -+ s32 index; -+ _list *phash_list; -+ struct sta_info *psta; -+ _queue *pfree_sta_queue; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ int i = 0; -+ u16 wRxSeqInitialValue = 0xffff; -+ -+_func_enter_; -+ -+ pfree_sta_queue = &pstapriv->free_sta_queue; -+ -+ //_enter_critical_bh(&(pfree_sta_queue->lock), &irqL); -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ -+ if (_rtw_queue_empty(pfree_sta_queue) == _TRUE) -+ { -+ //_exit_critical_bh(&(pfree_sta_queue->lock), &irqL); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ psta = NULL; -+ } -+ else -+ { -+ psta = LIST_CONTAINOR(get_next(&pfree_sta_queue->queue), struct sta_info, list); -+ -+ rtw_list_delete(&(psta->list)); -+ -+ //_exit_critical_bh(&(pfree_sta_queue->lock), &irqL); -+ -+ tmp_aid = psta->aid; -+ -+ _rtw_init_stainfo(psta); -+ -+ _rtw_memcpy(psta->hwaddr, hwaddr, ETH_ALEN); -+ -+ index = wifi_mac_hash(hwaddr); -+ -+ RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_info_,("rtw_alloc_stainfo: index = %x", index)); -+ -+ if(index >= NUM_STA){ -+ RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_err_,("ERROR=> rtw_alloc_stainfo: index >= NUM_STA")); -+ psta= NULL; -+ goto exit; -+ } -+ phash_list = &(pstapriv->sta_hash[index]); -+ -+ //_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ -+ rtw_list_insert_tail(&psta->hash_list, phash_list); -+ -+ pstapriv->asoc_sta_count ++ ; -+ -+ //_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ -+// Commented by Albert 2009/08/13 -+// For the SMC router, the sequence number of first packet of WPS handshake will be 0. -+// In this case, this packet will be dropped by recv_decache function if we use the 0x00 as the default value for tid_rxseq variable. -+// So, we initialize the tid_rxseq variable as the 0xffff. -+ -+ for( i = 0; i < 16; i++ ) -+ { -+ _rtw_memcpy( &psta->sta_recvpriv.rxcache.tid_rxseq[ i ], &wRxSeqInitialValue, 2 ); -+ } -+ -+ RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_info_,("alloc number_%d stainfo with hwaddr = %x %x %x %x %x %x \n", -+ pstapriv->asoc_sta_count , hwaddr[0], hwaddr[1], hwaddr[2],hwaddr[3],hwaddr[4],hwaddr[5])); -+ -+ init_addba_retry_timer(pstapriv->padapter, psta); -+ -+#ifdef CONFIG_TDLS -+ psta->padapter = pstapriv->padapter; -+ init_TPK_timer(pstapriv->padapter, psta); -+ init_ch_switch_timer(pstapriv->padapter, psta); -+ init_base_ch_timer(pstapriv->padapter, psta); -+ init_off_ch_timer(pstapriv->padapter, psta); -+ init_handshake_timer(pstapriv->padapter, psta); -+ init_tdls_alive_timer(pstapriv->padapter, psta); -+#endif //CONFIG_TDLS -+ -+ //for A-MPDU Rx reordering buffer control -+ for(i=0; i < 16 ; i++) -+ { -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ -+ preorder_ctrl->padapter = pstapriv->padapter; -+ -+ preorder_ctrl->enable = _FALSE; -+ -+ preorder_ctrl->indicate_seq = 0xffff; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq); -+ #endif -+ preorder_ctrl->wend_b= 0xffff; -+ //preorder_ctrl->wsize_b = (NR_RECVBUFF-2); -+ preorder_ctrl->wsize_b = 64;//64; -+ -+ _rtw_init_queue(&preorder_ctrl->pending_recvframe_queue); -+ -+ rtw_init_recv_timer(preorder_ctrl); -+ } -+ -+ -+ //init for DM -+ psta->rssi_stat.UndecoratedSmoothedPWDB = 0; -+ psta->rssi_stat.UndecoratedSmoothedCCK = (-1); -+ -+ /* init for the sequence number of received management frame */ -+ psta->RxMgmtFrameSeqNum = 0xffff; -+ } -+ -+exit: -+ -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); -+ -+_func_exit_; -+ -+ return psta; -+ -+ -+} -+ -+ -+// using pstapriv->sta_hash_lock to protect -+u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta) -+{ -+ int i; -+ _irqL irqL0; -+ _queue *pfree_sta_queue; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ struct sta_xmit_priv *pstaxmitpriv; -+ struct xmit_priv *pxmitpriv= &padapter->xmitpriv; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct hw_xmit *phwxmit; -+ -+ -+_func_enter_; -+ -+ if (psta == NULL) -+ goto exit; -+ -+ -+ _enter_critical_bh(&psta->lock, &irqL0); -+ psta->state &= ~_FW_LINKED; -+ _exit_critical_bh(&psta->lock, &irqL0); -+ -+ pfree_sta_queue = &pstapriv->free_sta_queue; -+ -+ -+ pstaxmitpriv = &psta->sta_xmitpriv; -+ -+ //rtw_list_delete(&psta->sleep_list); -+ -+ //rtw_list_delete(&psta->wakeup_list); -+ -+ _enter_critical_bh(&pxmitpriv->lock, &irqL0); -+ -+ rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q); -+ psta->sleepq_len = 0; -+ -+ //vo -+ //_enter_critical_bh(&(pxmitpriv->vo_pending.lock), &irqL0); -+ rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vo_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->vo_q.tx_pending)); -+ phwxmit = pxmitpriv->hwxmits; -+ phwxmit->accnt -= pstaxmitpriv->vo_q.qcnt; -+ pstaxmitpriv->vo_q.qcnt = 0; -+ //_exit_critical_bh(&(pxmitpriv->vo_pending.lock), &irqL0); -+ -+ //vi -+ //_enter_critical_bh(&(pxmitpriv->vi_pending.lock), &irqL0); -+ rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vi_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->vi_q.tx_pending)); -+ phwxmit = pxmitpriv->hwxmits+1; -+ phwxmit->accnt -= pstaxmitpriv->vi_q.qcnt; -+ pstaxmitpriv->vi_q.qcnt = 0; -+ //_exit_critical_bh(&(pxmitpriv->vi_pending.lock), &irqL0); -+ -+ //be -+ //_enter_critical_bh(&(pxmitpriv->be_pending.lock), &irqL0); -+ rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->be_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->be_q.tx_pending)); -+ phwxmit = pxmitpriv->hwxmits+2; -+ phwxmit->accnt -= pstaxmitpriv->be_q.qcnt; -+ pstaxmitpriv->be_q.qcnt = 0; -+ //_exit_critical_bh(&(pxmitpriv->be_pending.lock), &irqL0); -+ -+ //bk -+ //_enter_critical_bh(&(pxmitpriv->bk_pending.lock), &irqL0); -+ rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->bk_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->bk_q.tx_pending)); -+ phwxmit = pxmitpriv->hwxmits+3; -+ phwxmit->accnt -= pstaxmitpriv->bk_q.qcnt; -+ pstaxmitpriv->bk_q.qcnt = 0; -+ //_exit_critical_bh(&(pxmitpriv->bk_pending.lock), &irqL0); -+ -+ _exit_critical_bh(&pxmitpriv->lock, &irqL0); -+ -+ rtw_list_delete(&psta->hash_list); -+ RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_err_,("\n free number_%d stainfo with hwaddr = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x \n",pstapriv->asoc_sta_count , psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5])); -+ pstapriv->asoc_sta_count --; -+ -+ -+ // re-init sta_info; 20061114 // will be init in alloc_stainfo -+ //_rtw_init_sta_xmit_priv(&psta->sta_xmitpriv); -+ //_rtw_init_sta_recv_priv(&psta->sta_recvpriv); -+ -+ _cancel_timer_ex(&psta->addba_retry_timer); -+ -+#ifdef CONFIG_TDLS -+ _cancel_timer_ex(&psta->TPK_timer); -+ _cancel_timer_ex(&psta->option_timer); -+ _cancel_timer_ex(&psta->base_ch_timer); -+ _cancel_timer_ex(&psta->off_ch_timer); -+ _cancel_timer_ex(&psta->alive_timer1); -+ _cancel_timer_ex(&psta->alive_timer2); -+#endif //CONFIG_TDLS -+ -+ //for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer -+ for(i=0; i < 16 ; i++) -+ { -+ _irqL irqL; -+ _list *phead, *plist; -+ union recv_frame *prframe; -+ _queue *ppending_recvframe_queue; -+ _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; -+ -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ -+ _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); -+ -+ -+ ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; -+ -+ _enter_critical_bh(&ppending_recvframe_queue->lock, &irqL); -+ -+ phead = get_list_head(ppending_recvframe_queue); -+ plist = get_next(phead); -+ -+ while(!rtw_is_list_empty(phead)) -+ { -+ prframe = LIST_CONTAINOR(plist, union recv_frame, u); -+ -+ plist = get_next(plist); -+ -+ rtw_list_delete(&(prframe->u.hdr.list)); -+ -+ rtw_free_recvframe(prframe, pfree_recv_queue); -+ } -+ -+ _exit_critical_bh(&ppending_recvframe_queue->lock, &irqL); -+ -+ } -+ -+ -+#ifdef CONFIG_AP_MODE -+ -+/* -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL0); -+ rtw_list_delete(&psta->asoc_list); -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL0); -+*/ -+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL0); -+ if (!rtw_is_list_empty(&psta->auth_list)) { -+ rtw_list_delete(&psta->auth_list); -+ pstapriv->auth_list_cnt--; -+ } -+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL0); -+ -+ psta->expire_to = 0; -+ -+ psta->sleepq_ac_len = 0; -+ psta->qos_info = 0; -+ -+ psta->max_sp_len = 0; -+ psta->uapsd_bk = 0; -+ psta->uapsd_be = 0; -+ psta->uapsd_vi = 0; -+ psta->uapsd_vo = 0; -+ -+ psta->has_legacy_ac = 0; -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ -+ pstapriv->sta_dz_bitmap &=~BIT(psta->aid); -+ pstapriv->tim_bitmap &=~BIT(psta->aid); -+ -+ //rtw_indicate_sta_disassoc_event(padapter, psta); -+ -+ if ((psta->aid >0)&&(pstapriv->sta_aid[psta->aid - 1] == psta)) -+ { -+ pstapriv->sta_aid[psta->aid - 1] = NULL; -+ psta->aid = 0; -+ } -+ -+#endif // CONFIG_NATIVEAP_MLME -+ -+#ifdef CONFIG_TX_MCAST2UNI -+ psta->under_exist_checking = 0; -+#endif // CONFIG_TX_MCAST2UNI -+ -+#endif // CONFIG_AP_MODE -+ -+ _rtw_spinlock_free(&psta->lock); -+ -+ //_enter_critical_bh(&(pfree_sta_queue->lock), &irqL0); -+ rtw_list_insert_tail(&psta->list, get_list_head(pfree_sta_queue)); -+ //_exit_critical_bh(&(pfree_sta_queue->lock), &irqL0); -+ -+exit: -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+// free all stainfo which in sta_hash[all] -+void rtw_free_all_stainfo(_adapter *padapter) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ s32 index; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info* pbcmc_stainfo =rtw_get_bcmc_stainfo( padapter); -+ -+_func_enter_; -+ -+ if(pstapriv->asoc_sta_count==1) -+ goto exit; -+ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(index=0; index< NUM_STA; index++) -+ { -+ phead = &(pstapriv->sta_hash[index]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); -+ -+ plist = get_next(plist); -+ -+ if(pbcmc_stainfo!=psta) -+ rtw_free_stainfo(padapter , psta); -+ -+ } -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+exit: -+ -+_func_exit_; -+ -+} -+ -+/* any station allocated can be searched by hash list */ -+struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, const u8 *hwaddr) -+{ -+ -+ _irqL irqL; -+ -+ _list *plist, *phead; -+ -+ struct sta_info *psta = NULL; -+ -+ u32 index; -+ -+ const u8 *addr; -+ -+ u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; -+ -+_func_enter_; -+ -+ if(hwaddr==NULL) -+ return NULL; -+ -+ if(IS_MCAST(hwaddr)) -+ { -+ addr = bc_addr; -+ } -+ else -+ { -+ addr = hwaddr; -+ } -+ -+ index = wifi_mac_hash(addr); -+ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ phead = &(pstapriv->sta_hash[index]); -+ plist = get_next(phead); -+ -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ -+ psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); -+ -+ if ((_rtw_memcmp(psta->hwaddr, addr, ETH_ALEN))== _TRUE) -+ { // if found the matched address -+ break; -+ } -+ psta=NULL; -+ plist = get_next(plist); -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+_func_exit_; -+ return psta; -+ -+} -+ -+u32 rtw_init_bcmc_stainfo(_adapter* padapter) -+{ -+ -+ struct sta_info *psta; -+ struct tx_servq *ptxservq; -+ u32 res=_SUCCESS; -+ NDIS_802_11_MAC_ADDRESS bcast_addr= {0xff,0xff,0xff,0xff,0xff,0xff}; -+ -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ //_queue *pstapending = &padapter->xmitpriv.bm_pending; -+ -+_func_enter_; -+ -+ psta = rtw_alloc_stainfo(pstapriv, bcast_addr); -+ -+ if(psta==NULL){ -+ res=_FAIL; -+ RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_err_,("rtw_alloc_stainfo fail")); -+ goto exit; -+ } -+ -+ // default broadcast & multicast use macid 1 -+ psta->mac_id = 1; -+ -+ ptxservq= &(psta->sta_xmitpriv.be_q); -+ -+/* -+ _enter_critical(&pstapending->lock, &irqL0); -+ -+ if (rtw_is_list_empty(&ptxservq->tx_pending)) -+ rtw_list_insert_tail(&ptxservq->tx_pending, get_list_head(pstapending)); -+ -+ _exit_critical(&pstapending->lock, &irqL0); -+*/ -+ -+exit: -+_func_exit_; -+ return _SUCCESS; -+ -+} -+ -+ -+struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter) -+{ -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; -+_func_enter_; -+ psta = rtw_get_stainfo(pstapriv, bc_addr); -+_func_exit_; -+ return psta; -+ -+} -+ -+u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr) -+{ -+ u8 res = _TRUE; -+#ifdef CONFIG_AP_MODE -+ _irqL irqL; -+ _list *plist, *phead; -+ struct rtw_wlan_acl_node *paclnode; -+ u8 match = _FALSE; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; -+ _queue *pacl_node_q =&pacl_list->acl_node_q; -+ -+ _enter_critical_bh(&(pacl_node_q->lock), &irqL); -+ phead = get_list_head(pacl_node_q); -+ plist = get_next(phead); -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); -+ plist = get_next(plist); -+ -+ if(_rtw_memcmp(paclnode->addr, mac_addr, ETH_ALEN)) -+ { -+ if(paclnode->valid == _TRUE) -+ { -+ match = _TRUE; -+ break; -+ } -+ } -+ } -+ _exit_critical_bh(&(pacl_node_q->lock), &irqL); -+ -+ -+ if(pacl_list->mode == 1)//accept unless in deny list -+ { -+ res = (match == _TRUE) ? _FALSE:_TRUE; -+ } -+ else if(pacl_list->mode == 2)//deny unless in accept list -+ { -+ res = (match == _TRUE) ? _TRUE:_FALSE; -+ } -+ else -+ { -+ res = _TRUE; -+ } -+ -+#endif -+ -+ return res; -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c -@@ -0,0 +1,2941 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_TDLS_C_ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_TDLS -+extern unsigned char MCS_rate_2R[16]; -+extern unsigned char MCS_rate_1R[16]; -+extern void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame); -+extern s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+void rtw_reset_tdls_info(_adapter* padapter) -+{ -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ -+ ptdlsinfo->ap_prohibited = _FALSE; -+ ptdlsinfo->setup_state = TDLS_STATE_NONE; -+ ptdlsinfo->sta_cnt = 0; -+ ptdlsinfo->sta_maximum = _FALSE; -+ ptdlsinfo->macid_index= 6; -+ ptdlsinfo->clear_cam= 0; -+ ptdlsinfo->ch_sensing = 0; -+ ptdlsinfo->cur_channel = 0; -+ ptdlsinfo->candidate_ch = 1; //when inplement channel switching, default candidate channel is 1 -+ ptdlsinfo->watchdog_count = 0; -+ ptdlsinfo->dev_discovered = 0; -+ -+#ifdef CONFIG_WFD -+ ptdlsinfo->wfd_info = &padapter->wfd_info; -+#endif //CONFIG_WFD -+} -+ -+int rtw_init_tdls_info(_adapter* padapter) -+{ -+ int res = _SUCCESS; -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ -+ ptdlsinfo->enable = 1; -+ rtw_reset_tdls_info(padapter); -+ -+ _rtw_spinlock_init(&ptdlsinfo->cmd_lock); -+ _rtw_spinlock_init(&ptdlsinfo->hdl_lock); -+ -+ return res; -+ -+} -+ -+void rtw_free_tdls_info(struct tdls_info *ptdlsinfo) -+{ -+ _rtw_spinlock_free(&ptdlsinfo->cmd_lock); -+ _rtw_spinlock_free(&ptdlsinfo->hdl_lock); -+ -+ _rtw_memset(ptdlsinfo, 0, sizeof(struct tdls_info) ); -+ -+} -+ -+void issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, struct sta_info *ptdls_sta, unsigned int power_mode) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+// SetToDs(fctrl); -+ if (power_mode) -+ { -+ SetPwrMgt(fctrl); -+ } -+ -+ _rtw_memcpy(pwlanhdr->addr1, ptdls_sta->hwaddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority]++; -+ ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF; -+ pattrib->seqnum = ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority]; -+ SetSeqNum(pwlanhdr, pattrib->seqnum); -+ -+ SetFrameSubType(pframe, WIFI_DATA_NULL); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+} -+ -+s32 update_tdls_attrib(_adapter *padapter, struct pkt_attrib *pattrib) -+{ -+ -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct qos_priv *pqospriv= &pmlmepriv->qospriv; -+ -+ s32 res=_SUCCESS; -+ sint bmcast; -+ -+ bmcast = IS_MCAST(pattrib->ra); -+ -+ psta = rtw_get_stainfo(pstapriv, pattrib->ra); -+ if (psta == NULL) { -+ res =_FAIL; -+ goto exit; -+ } -+ -+ pattrib->mac_id = psta->mac_id; -+ -+ pattrib->psta = psta; -+ -+ pattrib->ack_policy = 0; -+ // get ether_hdr_len -+ pattrib->pkt_hdrlen = ETH_HLEN;//(pattrib->ether_type == 0x8100) ? (14 + 4 ): 14; //vlan tag -+ -+ if (pqospriv->qos_option && psta->qos_option) { -+ pattrib->priority = 1; //tdls management frame should be AC_BK -+ pattrib->hdrlen = WLAN_HDR_A3_QOS_LEN; -+ pattrib->subtype = WIFI_QOS_DATA_TYPE; -+ } else { -+ pattrib->hdrlen = WLAN_HDR_A3_LEN; -+ pattrib->subtype = WIFI_DATA_TYPE; -+ pattrib->priority = 0; -+ } -+ -+ if (psta->ieee8021x_blocked == _TRUE) -+ { -+ pattrib->encrypt = 0; -+ } -+ else -+ { -+ GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, bmcast); -+ -+ switch(psecuritypriv->dot11AuthAlgrthm) -+ { -+ case dot11AuthAlgrthm_Open: -+ case dot11AuthAlgrthm_Shared: -+ case dot11AuthAlgrthm_Auto: -+ pattrib->key_idx = (u8)psecuritypriv->dot11PrivacyKeyIndex; -+ break; -+ case dot11AuthAlgrthm_8021X: -+ pattrib->key_idx = 0; -+ break; -+ default: -+ pattrib->key_idx = 0; -+ break; -+ } -+ } -+ -+ switch (pattrib->encrypt) -+ { -+ case _WEP40_: -+ case _WEP104_: -+ pattrib->iv_len = 4; -+ pattrib->icv_len = 4; -+ break; -+ case _TKIP_: -+ pattrib->iv_len = 8; -+ pattrib->icv_len = 4; -+ if(padapter->securitypriv.busetkipkey==_FAIL) -+ { -+ res =_FAIL; -+ goto exit; -+ } -+ break; -+ case _AES_: -+ pattrib->iv_len = 8; -+ pattrib->icv_len = 8; -+ break; -+ default: -+ pattrib->iv_len = 0; -+ pattrib->icv_len = 0; -+ break; -+ } -+ -+ if (pattrib->encrypt && -+ ((padapter->securitypriv.sw_encrypt == _TRUE) || (psecuritypriv->hw_decrypted == _FALSE))) -+ { -+ pattrib->bswenc = _TRUE; -+ } else { -+ pattrib->bswenc = _FALSE; -+ } -+ -+ //qos_en, ht_en, init rate, ,bw, ch_offset, sgi -+ pattrib->qos_en = psta->qos_option; -+ pattrib->ht_en = psta->htpriv.ht_option; -+ pattrib->raid = psta->raid; -+ pattrib->bwmode = psta->htpriv.bwmode; -+ pattrib->ch_offset = psta->htpriv.ch_offset; -+ pattrib->sgi= psta->htpriv.sgi; -+ pattrib->ampdu_en = _FALSE; -+ -+ //if(pattrib->ht_en && psta->htpriv.ampdu_enable) -+ //{ -+ // if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) -+ // pattrib->ampdu_en = _TRUE; -+ //} -+ -+exit: -+ -+ return res; -+} -+ -+void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta) -+{ -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ _irqL irqL; -+ -+ //free peer sta_info -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ if(ptdlsinfo->sta_cnt != 0) -+ ptdlsinfo->sta_cnt--; -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ if( ptdlsinfo->sta_cnt < (NUM_STA - 2) ) // -2: AP + BC/MC sta -+ { -+ ptdlsinfo->sta_maximum = _FALSE; -+ _rtw_memset( &ptdlsinfo->ss_record, 0x00, sizeof(struct tdls_ss_record) ); -+ } -+ //ready to clear cam -+ if(ptdls_sta->mac_id!=0){ -+ ptdlsinfo->clear_cam=ptdls_sta->mac_id; -+ rtw_setstakey_cmd(padapter, (u8 *)ptdls_sta, _TRUE); -+ } -+ -+ if(ptdlsinfo->sta_cnt==0){ -+ rtw_tdls_cmd(padapter, myid(&(padapter->eeprompriv)), TDLS_RS_RCR); -+ ptdlsinfo->setup_state=TDLS_STATE_NONE; -+ } -+ else -+ DBG_871X("Remain tdls sta:%02x\n", ptdlsinfo->sta_cnt); -+ -+ rtw_free_stainfo(padapter, ptdls_sta); -+ -+} -+ -+// cam entry will be the same as mac_id -+void rtw_tdls_set_mac_id(struct tdls_info *ptdlsinfo, struct sta_info *ptdls_sta) -+{ -+ if(ptdls_sta->mac_id==0) -+ { -+ ptdls_sta->mac_id = ptdlsinfo->macid_index; -+ if( (++ptdlsinfo->macid_index) > (NUM_STA -2) ) -+ ptdlsinfo->macid_index= TDLS_INI_MACID_ENTRY; -+ } -+} -+ -+//TDLS encryption(if needed) will always be CCMP -+void rtw_tdls_set_key(_adapter *adapter, struct rx_pkt_attrib *prx_pkt_attrib, struct sta_info *ptdls_sta) -+{ -+ if(prx_pkt_attrib->encrypt) -+ { -+ ptdls_sta->dot118021XPrivacy=_AES_; -+ rtw_setstakey_cmd(adapter, (u8*)ptdls_sta, _TRUE); -+ } -+} -+ -+void rtw_tdls_process_ht_cap(_adapter *adapter, struct sta_info *ptdls_sta, u8 *data, u8 Length) -+{ -+ /* save HT capabilities in the sta object */ -+ _rtw_memset(&ptdls_sta->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap)); -+ if (data && Length >= sizeof(struct rtw_ieee80211_ht_cap) ) -+ { -+ ptdls_sta->flags |= WLAN_STA_HT; -+ -+ ptdls_sta->flags |= WLAN_STA_WME; -+ -+ _rtw_memcpy(&ptdls_sta->htpriv.ht_cap, data, sizeof(struct rtw_ieee80211_ht_cap)); -+ -+ } else -+ ptdls_sta->flags &= ~WLAN_STA_HT; -+ -+ if(ptdls_sta->flags & WLAN_STA_HT) -+ { -+ if(adapter->registrypriv.ht_enable == _TRUE) -+ { -+ ptdls_sta->htpriv.ht_option = _TRUE; -+ } -+ else -+ { -+ ptdls_sta->htpriv.ht_option = _FALSE; -+ ptdls_sta->stat_code = _STATS_FAILURE_; -+ } -+ } -+ -+ //HT related cap -+ if(ptdls_sta->htpriv.ht_option) -+ { -+ //check if sta supports rx ampdu -+ if(adapter->registrypriv.ampdu_enable==1) -+ ptdls_sta->htpriv.ampdu_enable = _TRUE; -+ -+ //check if sta support s Short GI -+ if(ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) -+ { -+ ptdls_sta->htpriv.sgi = _TRUE; -+ } -+ -+ // bwmode would still followed AP's setting -+ if(ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH)) -+ { -+ ptdls_sta->htpriv.bwmode = adapter->mlmeextpriv.cur_bwmode; -+ ptdls_sta->htpriv.ch_offset = adapter->mlmeextpriv.cur_ch_offset; -+ } -+ } -+} -+ -+u8 *rtw_tdls_set_ht_cap(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib) -+{ -+ struct rtw_ieee80211_ht_cap ht_capie; -+ u8 rf_type; -+ -+ //HT capabilities -+ _rtw_memset(&ht_capie, 0, sizeof(struct rtw_ieee80211_ht_cap)); -+ -+ ht_capie.cap_info = IEEE80211_HT_CAP_SUP_WIDTH |IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_SM_PS | -+ IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_TX_STBC |IEEE80211_HT_CAP_DSSSCCK40; -+ -+ { -+ u32 rx_packet_offset, max_recvbuf_sz; -+ rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); -+ rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); -+ if(max_recvbuf_sz-rx_packet_offset>(8191-256)) -+ ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU; -+ } -+ -+ ht_capie.ampdu_params_info = (IEEE80211_HT_CAP_AMPDU_FACTOR&0x03); -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ switch(rf_type) -+ { -+ case RF_1T1R: -+ ht_capie.cap_info |= 0x0100;//RX STBC One spatial stream -+ _rtw_memcpy(ht_capie.supp_mcs_set, MCS_rate_1R, 16); -+ break; -+ -+ case RF_2T2R: -+ case RF_1T2R: -+ default: -+ ht_capie.cap_info|= 0x0200;//RX STBC two spatial stream -+ _rtw_memcpy(ht_capie.supp_mcs_set, MCS_rate_2R, 16); -+ break; -+ } -+ -+ return(rtw_set_ie(pframe, _HT_CAPABILITY_IE_, -+ sizeof(struct rtw_ieee80211_ht_cap), (unsigned char*)&ht_capie, &(pattrib->pktlen))); -+} -+ -+u8 *rtw_tdls_set_sup_ch(struct mlme_ext_priv *pmlmeext, u8 *pframe, struct pkt_attrib *pattrib) -+{ -+ u8 sup_ch[ 30 * 2 ] = { 0x00 }, sup_ch_idx = 0, idx_5g = 2; //For supported channel -+ do{ -+ if( pmlmeext->channel_set[sup_ch_idx].ChannelNum <= 14 ) -+ { -+ sup_ch[0] = 1; //First channel number -+ sup_ch[1] = pmlmeext->channel_set[sup_ch_idx].ChannelNum; //Number of channel -+ } -+ else -+ { -+ sup_ch[idx_5g++] = pmlmeext->channel_set[sup_ch_idx].ChannelNum; -+ sup_ch[idx_5g++] = 1; -+ } -+ -+ sup_ch_idx++; -+ } -+ while( pmlmeext->channel_set[sup_ch_idx].ChannelNum != 0 ); -+ return(rtw_set_ie(pframe, _SUPPORTED_CH_IE_, idx_5g, sup_ch, &(pattrib->pktlen))); -+} -+ -+#ifdef CONFIG_WFD -+void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length) -+{ -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ u32 wfd_ielen = 0; -+ u32 wfd_offset = 0; -+ // Try to get the TCP port information when receiving the negotiation response. -+ // -+ -+ wfd_offset = 0; -+ wfd_offset = rtw_get_wfd_ie( ptr + wfd_offset, length - wfd_offset, wfd_ie, &wfd_ielen ); -+ while( wfd_offset ) -+ { -+ u8 attr_content[ 10 ] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ int i; -+ -+ DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ ); -+ rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); -+ DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport ); -+ } -+ -+ _rtw_memset( attr_content, 0x00, 10); -+ attr_contentlen = 0; -+ rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_LOCAL_IP_ADDR, attr_content, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ _rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4); -+ DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u \n", __FUNCTION__, -+ ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1], -+ ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3] -+ ); -+ } -+ wfd_offset = rtw_get_wfd_ie( ptr + wfd_offset, length - wfd_offset, wfd_ie, &wfd_ielen ); -+ } -+} -+ -+void issue_tunneled_probe_req(_adapter *padapter) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ u8 baddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ -+ DBG_871X("[%s]\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, baddr, ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TUNNELED_PROBE_REQ) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+} -+ -+void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct rx_pkt_attrib *rx_pkt_pattrib = &precv_frame->u.hdr.attrib; -+ -+ DBG_871X("[%s]\n", __FUNCTION__); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TUNNELED_PROBE_RSP) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+} -+#endif //CONFIG_WFD -+ -+void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr) -+{ -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *ptdls_sta= NULL; -+ _irqL irqL; -+ static u8 dialogtoken = 0; -+ u32 timeout_interval= TPK_RESEND_COUNT * 1000; //retry timer should set at least 301 sec, using TPK_count counting 301 times. -+ -+ if(ptdlsinfo->ap_prohibited == _TRUE) -+ goto exit; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ -+ //init peer sta_info -+ ptdls_sta = rtw_get_stainfo(pstapriv, mac_addr); -+ if(ptdls_sta==NULL) -+ { -+ ptdls_sta = rtw_alloc_stainfo(pstapriv, mac_addr); -+ if(ptdls_sta) -+ { -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ if(!(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)) -+ ptdlsinfo->sta_cnt++; -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta -+ { -+ ptdlsinfo->sta_maximum = _TRUE; -+ } -+ } -+ else -+ { -+ rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ } -+ -+ if(ptdls_sta){ -+ ptdls_sta->tdls_sta_state |= TDLS_RESPONDER_STATE; -+ //for tdls; ptdls_sta->aid is used to fill dialogtoken -+ ptdls_sta->dialog = dialogtoken; -+ dialogtoken = (dialogtoken+1)%256; -+ ptdls_sta->TDLS_PeerKey_Lifetime = timeout_interval; -+ _set_timer( &ptdls_sta->handshake_timer, TDLS_HANDSHAKE_TIME ); -+ } -+ -+ pattrib->qsel=pattrib->priority; -+ if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_SETUP_REQUEST) !=_SUCCESS ){ -+ rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+} -+ -+void issue_tdls_teardown(_adapter *padapter, u8 *mac_addr) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *ptdls_sta=NULL; -+ _irqL irqL; -+ -+ ptdls_sta = rtw_get_stainfo(pstapriv, mac_addr); -+ if(ptdls_sta==NULL){ -+ DBG_871X("issue tdls teardown unsuccessful\n"); -+ return; -+ }else{ -+ ptdls_sta->tdls_sta_state=TDLS_STATE_NONE; -+ } -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_TEARDOWN) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+ if(ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE){ -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CS_OFF); -+ } -+ -+ if( ptdls_sta->timer_flag == 1 ) -+ { -+ _enter_critical_bh(&(padapter->tdlsinfo.hdl_lock), &irqL); -+ ptdls_sta->timer_flag = 2; -+ _exit_critical_bh(&(padapter->tdlsinfo.hdl_lock), &irqL); -+ } -+ else -+ rtw_tdls_cmd(padapter, mac_addr, TDLS_FREE_STA ); -+ -+ -+exit: -+ -+ return; -+} -+ -+void issue_tdls_dis_req(_adapter *padapter, u8 *mac_addr) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ u8 baddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ if(mac_addr == NULL) -+ _rtw_memcpy(pattrib->dst, baddr, ETH_ALEN); -+ else -+ _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_DISCOVERY_REQUEST) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ DBG_871X("issue tdls dis req\n"); -+ -+exit: -+ -+ return; -+} -+ -+void issue_tdls_setup_rsp(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct rx_pkt_attrib *rx_pkt_pattrib = &precv_frame->u.hdr.attrib; -+ _irqL irqL; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, rx_pkt_pattrib->bssid, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_SETUP_RESPONSE) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+ -+} -+ -+void issue_tdls_setup_cfm(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct sta_info *ptdls_sta=NULL; -+ _irqL irqL; -+ -+ struct rx_pkt_attrib *rx_pkt_pattrib = & precv_frame->u.hdr.attrib; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, rx_pkt_pattrib->bssid, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_SETUP_CONFIRM) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+ -+} -+ -+//TDLS Discovery Response frame is a management action frame -+void issue_tdls_dis_rsp(_adapter *padapter, union recv_frame *precv_frame, u8 dialog) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ struct rx_pkt_attrib *rx_pkt_pattrib = &precv_frame->u.hdr.attrib; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ // unicast probe request frame -+ _rtw_memcpy(pwlanhdr->addr1, rx_pkt_pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pattrib->dst, pwlanhdr->addr1, ETH_ALEN); -+ -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pattrib->src, pwlanhdr->addr2, ETH_ALEN); -+ -+ _rtw_memcpy(pwlanhdr->addr3, rx_pkt_pattrib->bssid, ETH_ALEN); -+ _rtw_memcpy(pattrib->ra, pwlanhdr->addr3, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof (struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr); -+ -+ rtw_build_tdls_dis_rsp_ies(padapter, pmgntframe, pframe, dialog); -+ -+ pattrib->nr_frags = 1; -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ return; -+} -+ -+void issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *ptdls_sta) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ -+ static u8 dialogtoken=0; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, ptdls_sta->hwaddr, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ //for tdls; pattrib->nr_frags is used to fill dialogtoken -+ ptdls_sta->dialog = dialogtoken; -+ dialogtoken = (dialogtoken+1)%256; -+ //PTI frame's priority should be AC_VO -+ pattrib->priority = 7; -+ -+ update_tdls_attrib(padapter, pattrib); -+ pattrib->qsel=pattrib->priority; -+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_PEER_TRAFFIC_INDICATION) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+} -+ -+void issue_tdls_ch_switch_req(_adapter *padapter, u8 *mac_addr) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ -+ pattrib->qsel=pattrib->priority; -+ if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_CHANNEL_SWITCH_REQUEST) !=_SUCCESS ){ -+ rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+} -+ -+void issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ -+ _irqL irqL; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ -+ pmgntframe->frame_tag = DATA_FRAMETAG; -+ pattrib->ether_type = 0x890d; -+ pattrib->pctrl =0; -+ -+ _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ -+ update_tdls_attrib(padapter, pattrib); -+ -+ pattrib->qsel=pattrib->priority; -+/* -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ if(xmitframe_enqueue_for_tdls_sleeping_sta(padapter, pmgntframe)==_TRUE){ -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ return _FALSE; -+ } -+*/ -+ if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, TDLS_CHANNEL_SWITCH_RESPONSE) !=_SUCCESS ){ -+ rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pmgntframe); -+ goto exit; -+ } -+ rtw_dump_xframe(padapter, pmgntframe); -+ -+exit: -+ -+ return; -+} -+ -+sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct sta_info *ptdls_sta = NULL, *psta = rtw_get_stainfo(&(adapter->stapriv), get_bssid(&(adapter->mlmepriv))); -+ struct recv_priv *precvpriv = &(adapter->recvpriv); -+ u8 *ptr = precv_frame->u.hdr.rx_data, *psa; -+ struct rx_pkt_attrib *pattrib = &(precv_frame->u.hdr.attrib); -+ struct tdls_info *ptdlsinfo = &(adapter->tdlsinfo); -+ u8 empty_addr[ETH_ALEN] = { 0x00 }; -+ int UndecoratedSmoothedPWDB; -+ -+ -+ //WFDTDLS: for sigma test, not to setup direct link automatically -+ ptdlsinfo->dev_discovered = 1; -+ -+#ifdef CONFIG_TDLS_AUTOSETUP -+ psa = get_sa(ptr); -+ ptdls_sta = rtw_get_stainfo(&(adapter->stapriv), psa); -+ -+ if(ptdls_sta != NULL) -+ { -+ ptdls_sta->tdls_sta_state |= TDLS_ALIVE_STATE; -+ -+ //Record the tdls sta with lowest signal strength -+ if( (ptdlsinfo->sta_maximum == _TRUE) && (ptdls_sta->alive_count >= 1) ) -+ { -+ if( _rtw_memcmp(ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN) ) -+ { -+ _rtw_memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN); -+ ptdlsinfo->ss_record.RxPWDBAll = pattrib->RxPWDBAll; -+ } -+ else -+ { -+ if( ptdlsinfo->ss_record.RxPWDBAll < pattrib->RxPWDBAll ) -+ { -+ _rtw_memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN); -+ ptdlsinfo->ss_record.RxPWDBAll = pattrib->RxPWDBAll; -+ } -+ } -+ } -+ -+ } -+ else -+ { -+ if( ptdlsinfo->sta_maximum == _TRUE) -+ { -+ if( _rtw_memcmp( ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN ) ) -+ { -+ //All traffics are busy, do not set up another direct link. -+ return _FAIL; -+ } -+ else -+ { -+ if( pattrib->RxPWDBAll > ptdlsinfo->ss_record.RxPWDBAll ) -+ { -+ issue_tdls_teardown(adapter, ptdlsinfo->ss_record.macaddr); -+ } -+ else -+ { -+ return _FAIL; -+ } -+ } -+ } -+ -+ rtw_hal_get_def_var(adapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB); -+ -+ if( pattrib->RxPWDBAll + TDLS_SIGNAL_THRESH >= UndecoratedSmoothedPWDB); -+ { -+ DBG_871X("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->RxPWDBAll, UndecoratedSmoothedPWDB); -+ issue_tdls_setup_req(adapter, psa); -+ } -+ } -+#endif //CONFIG_TDLS_AUTOSETUP -+ -+ return _SUCCESS; -+} -+ -+sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+ u8 *psa, *pmyid; -+ struct sta_info *ptdls_sta= NULL; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ struct security_priv *psecuritypriv = &adapter->securitypriv; -+ _irqL irqL; -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ u8 *prsnie, *ppairwise_cipher; -+ u8 i, k, pairwise_count; -+ u8 ccmp_have=0, rsnie_have=0; -+ u16 j; -+ u8 SNonce[32]; -+ u32 *timeout_interval; -+ sint parsing_length; //frame body length, without icv_len -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 FIXED_IE = 5; -+ unsigned char supportRate[16]; -+ int supportRateNum = 0; -+ -+ psa = get_sa(ptr); -+ ptdls_sta = rtw_get_stainfo(pstapriv, psa); -+ -+ pmyid=myid(&(adapter->eeprompriv)); -+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1; -+ parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len -+ -prx_pkt_attrib->hdrlen -+ -prx_pkt_attrib->iv_len -+ -prx_pkt_attrib->icv_len -+ -LLC_HEADER_SIZE -+ -ETH_TYPE_LEN -+ -PAYLOAD_TYPE_LEN -+ -FIXED_IE; -+ -+ if(ptdlsinfo->ap_prohibited == _TRUE) -+ { -+ goto exit; -+ } -+ -+ if(ptdls_sta==NULL){ -+ ptdls_sta = rtw_alloc_stainfo(pstapriv, psa); -+ }else{ -+ if(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){ -+ //If the direct link is already set up -+ //Process as re-setup after tear down -+ DBG_871X("re-setup a direct link\n"); -+ } -+ //already receiving TDLS setup request -+ else if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ -+ DBG_871X("receive duplicated TDLS setup request frame in handshaking\n"); -+ goto exit; -+ } -+ //When receiving and sending setup_req to the same link at the same time, STA with higher MAC_addr would be initiator -+ //following is to check out MAC_addr -+ else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){ -+ DBG_871X("receive setup_req after sending setup_req\n"); -+ for (i=0;i<6;i++){ -+ if(*(pmyid+i)==*(psa+i)){ -+ } -+ else if(*(pmyid+i)>*(psa+i)){ -+ goto exit; -+ }else if(*(pmyid+i)<*(psa+i)){ -+ ptdls_sta->tdls_sta_state=TDLS_INITIATOR_STATE; -+ break; -+ } -+ } -+ } -+ } -+ -+ if(ptdls_sta) -+ { -+ ptdls_sta->dialog = *(ptr+2); //copy dialog token -+ ptdls_sta->stat_code = 0; -+ -+ //parsing information element -+ for(j=FIXED_IE; jElementID) -+ { -+ case _SUPPORTEDRATES_IE_: -+ _rtw_memcpy(supportRate, pIE->data, pIE->Length); -+ supportRateNum = pIE->Length; -+ break; -+ case _COUNTRY_IE_: -+ break; -+ case _EXT_SUPPORTEDRATES_IE_: -+ if(supportRateNum<=sizeof(supportRate)) -+ { -+ _rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length); -+ supportRateNum += pIE->Length; -+ } -+ break; -+ case _SUPPORTED_CH_IE_: -+ break; -+ case _RSN_IE_2_: -+ rsnie_have=1; -+ if(prx_pkt_attrib->encrypt){ -+ prsnie=(u8*)pIE; -+ //check whether initiator STA has CCMP pairwise_cipher. -+ ppairwise_cipher=prsnie+10; -+ _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 1); -+ for(k=0;kstat_code=72; -+ } -+ } -+ break; -+ case _EXT_CAP_IE_: -+ break; -+ case _VENDOR_SPECIFIC_IE_: -+ break; -+ case _FTIE_: -+ if(prx_pkt_attrib->encrypt) -+ _rtw_memcpy(SNonce, (ptr+j+52), 32); -+ break; -+ case _TIMEOUT_ITVL_IE_: -+ if(prx_pkt_attrib->encrypt) -+ timeout_interval = (u32 *)(ptr+j+3); -+ break; -+ case _RIC_Descriptor_IE_: -+ break; -+ case _HT_CAPABILITY_IE_: -+ rtw_tdls_process_ht_cap(adapter, ptdls_sta, pIE->data, pIE->Length); -+ break; -+ case EID_BSSCoexistence: -+ break; -+ case _LINK_ID_IE_: -+ if(_rtw_memcmp(get_bssid(pmlmepriv), pIE->data, 6) == _FALSE) -+ { -+ //not in the same BSS -+ ptdls_sta->stat_code=7; -+ } -+ break; -+ default: -+ break; -+ } -+ -+ j += (pIE->Length + 2); -+ -+ } -+ -+ //update station supportRate -+ ptdls_sta->bssratelen = supportRateNum; -+ _rtw_memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum); -+ -+ //check status code -+ //if responder STA has/hasn't security on AP, but request hasn't/has RSNIE, it should reject -+ if(ptdls_sta->stat_code == 0 ) -+ { -+ if(rsnie_have && (prx_pkt_attrib->encrypt==0)){ -+ //security disabled -+ ptdls_sta->stat_code = 5; -+ }else if(rsnie_have==0 && (prx_pkt_attrib->encrypt)){ -+ //request haven't RSNIE -+ ptdls_sta->stat_code = 38; -+ } -+ -+#ifdef CONFIG_WFD -+ //WFD test plan version 0.18.2 test item 5.1.5 -+ //SoUT does not use TDLS if AP uses weak security -+ if ( adapter->wdinfo.wfd_tdls_enable ) -+ { -+ if(rsnie_have && (prx_pkt_attrib->encrypt != _AES_)) -+ { -+ ptdls_sta->stat_code = 5; -+ } -+ } -+#endif //CONFIG_WFD -+ } -+ -+ ptdls_sta->tdls_sta_state|= TDLS_INITIATOR_STATE; -+ if(prx_pkt_attrib->encrypt){ -+ _rtw_memcpy(ptdls_sta->SNonce, SNonce, 32); -+ _rtw_memcpy(&(ptdls_sta->TDLS_PeerKey_Lifetime), timeout_interval, 4); -+ } -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ if(!(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)) -+ ptdlsinfo->sta_cnt++; -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ if( ptdlsinfo->sta_cnt == (NUM_STA - 2) ) // -2: AP + BC/MC sta -+ { -+ ptdlsinfo->sta_maximum = _TRUE; -+ } -+ -+#ifdef CONFIG_WFD -+ rtw_tdls_process_wfd_ie(ptdlsinfo, ptr + FIXED_IE, parsing_length - FIXED_IE); -+#endif // CONFIG_WFD -+ -+ } -+ else -+ { -+ goto exit; -+ } -+ -+ issue_tdls_setup_rsp(adapter, precv_frame); -+ -+ if(ptdls_sta->stat_code==0) -+ { -+ _set_timer( &ptdls_sta->handshake_timer, TDLS_HANDSHAKE_TIME); -+ } -+ else //status code!=0 ; setup unsuccess -+ { -+ free_tdls_sta(adapter, ptdls_sta); -+ } -+ -+exit: -+ -+ return _FAIL; -+} -+ -+sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+ struct sta_info *ptdls_sta= NULL; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ _irqL irqL; -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ u8 *psa; -+ u16 stat_code; -+ sint parsing_length; //frame body length, without icv_len -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 FIXED_IE =7; -+ u8 *pftie, *ptimeout_ie, *plinkid_ie, *prsnie, *pftie_mic, *ppairwise_cipher; -+ u16 pairwise_count, j, k; -+ u8 verify_ccmp=0; -+ unsigned char supportRate[16]; -+ int supportRateNum = 0; -+ -+ psa = get_sa(ptr); -+ ptdls_sta = rtw_get_stainfo(pstapriv, psa); -+ -+ if ( NULL == ptdls_sta ) -+ { -+ return _FAIL; -+ } -+ -+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1; -+ parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len -+ -prx_pkt_attrib->hdrlen -+ -prx_pkt_attrib->iv_len -+ -prx_pkt_attrib->icv_len -+ -LLC_HEADER_SIZE -+ -TYPE_LENGTH_FIELD_SIZE -+ -1 -+ -FIXED_IE; -+ -+ _rtw_memcpy(&stat_code, ptr+2, 2); -+ -+ if(stat_code!=0) -+ { -+ DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __FUNCTION__, stat_code ); -+ free_tdls_sta(adapter, ptdls_sta); -+ return _FAIL; -+ } -+ -+ stat_code = 0; -+ -+ //parsing information element -+ for(j=FIXED_IE; jElementID) -+ { -+ case _SUPPORTEDRATES_IE_: -+ _rtw_memcpy(supportRate, pIE->data, pIE->Length); -+ supportRateNum = pIE->Length; -+ break; -+ case _COUNTRY_IE_: -+ break; -+ case _EXT_SUPPORTEDRATES_IE_: -+ if(supportRateNum<=sizeof(supportRate)) -+ { -+ _rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length); -+ supportRateNum += pIE->Length; -+ } -+ break; -+ case _SUPPORTED_CH_IE_: -+ break; -+ case _RSN_IE_2_: -+ prsnie=(u8*)pIE; -+ //check whether responder STA has CCMP pairwise_cipher. -+ ppairwise_cipher=prsnie+10; -+ _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2); -+ for(k=0;kANonce, (ptr+j+20), 32); -+ break; -+ case _TIMEOUT_ITVL_IE_: -+ ptimeout_ie=(u8*)pIE; -+ break; -+ case _RIC_Descriptor_IE_: -+ break; -+ case _HT_CAPABILITY_IE_: -+ rtw_tdls_process_ht_cap(adapter, ptdls_sta, pIE->data, pIE->Length); -+ break; -+ case EID_BSSCoexistence: -+ break; -+ case _LINK_ID_IE_: -+ plinkid_ie=(u8*)pIE; -+ break; -+ default: -+ break; -+ } -+ -+ j += (pIE->Length + 2); -+ -+ } -+ -+ //update station supportRate -+ ptdls_sta->bssratelen = supportRateNum; -+ _rtw_memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum); -+ -+#ifdef CONFIG_WFD -+ rtw_tdls_process_wfd_ie(ptdlsinfo, ptr + FIXED_IE, parsing_length - FIXED_IE); -+#endif // CONFIG_WFD -+ -+ if(stat_code != 0) -+ { -+ ptdls_sta->stat_code = stat_code; -+ } -+ else -+ { -+ if(prx_pkt_attrib->encrypt) -+ { -+ if(verify_ccmp==1) -+ { -+ wpa_tdls_generate_tpk(adapter, ptdls_sta); -+ ptdls_sta->stat_code=0; -+ if(tdls_verify_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie)==0) //0: Invalid, 1: valid -+ { -+ free_tdls_sta(adapter, ptdls_sta); -+ return _FAIL; -+ } -+ } -+ else -+ { -+ ptdls_sta->stat_code=72; //invalide contents of RSNIE -+ } -+ -+ }else{ -+ ptdls_sta->stat_code=0; -+ } -+ } -+ -+ DBG_871X("issue_tdls_setup_cfm\n"); -+ issue_tdls_setup_cfm(adapter, precv_frame); -+ -+ if(ptdls_sta->stat_code==0) -+ { -+ ptdlsinfo->setup_state = TDLS_LINKED_STATE; -+ -+ if( ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE ) -+ { -+ ptdls_sta->tdls_sta_state |= TDLS_LINKED_STATE; -+ _cancel_timer_ex( &ptdls_sta->handshake_timer); -+#ifdef CONFIG_TDLS_AUTOCHECKALIVE -+ _set_timer( &ptdls_sta->alive_timer1, TDLS_ALIVE_TIMER_PH1); -+#endif //CONFIG_TDLS_AUTOSETUP -+ } -+ -+ rtw_tdls_set_mac_id(ptdlsinfo, ptdls_sta); -+ rtw_tdls_set_key(adapter, prx_pkt_attrib, ptdls_sta); -+ -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_WRCR); -+ -+ } -+ else //status code!=0 ; setup unsuccessful -+ { -+ free_tdls_sta(adapter, ptdls_sta); -+ } -+ -+ return _FAIL; -+ -+} -+ -+sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+ struct sta_info *ptdls_sta= NULL; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ _irqL irqL; -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ u8 *psa; -+ u16 stat_code; -+ sint parsing_length; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 FIXED_IE =5; -+ u8 *pftie, *ptimeout_ie, *plinkid_ie, *prsnie, *pftie_mic, *ppairwise_cipher; -+ u16 j, pairwise_count; -+ -+ psa = get_sa(ptr); -+ ptdls_sta = rtw_get_stainfo(pstapriv, psa); -+ -+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1; -+ parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len -+ -prx_pkt_attrib->hdrlen -+ -prx_pkt_attrib->iv_len -+ -prx_pkt_attrib->icv_len -+ -LLC_HEADER_SIZE -+ -ETH_TYPE_LEN -+ -PAYLOAD_TYPE_LEN -+ -FIXED_IE; -+ _rtw_memcpy(&stat_code, ptr+2, 2); -+ -+ if(stat_code!=0){ -+ DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __FUNCTION__, stat_code ); -+ free_tdls_sta(adapter, ptdls_sta); -+ return _FAIL; -+ } -+ -+ if(prx_pkt_attrib->encrypt){ -+ //parsing information element -+ for(j=FIXED_IE; jElementID) -+ { -+ case _RSN_IE_2_: -+ prsnie=(u8*)pIE; -+ break; -+ case _VENDOR_SPECIFIC_IE_: -+ break; -+ case _FTIE_: -+ pftie=(u8*)pIE; -+ break; -+ case _TIMEOUT_ITVL_IE_: -+ ptimeout_ie=(u8*)pIE; -+ break; -+ case _HT_EXTRA_INFO_IE_: -+ break; -+ case _LINK_ID_IE_: -+ plinkid_ie=(u8*)pIE; -+ break; -+ default: -+ break; -+ } -+ -+ j += (pIE->Length + 2); -+ -+ } -+ -+ //verify mic in FTIE MIC field -+ if(tdls_verify_mic(ptdls_sta->tpk.kck, 3, plinkid_ie, prsnie, ptimeout_ie, pftie)==0){ //0: Invalid, 1: Valid -+ free_tdls_sta(adapter, ptdls_sta); -+ return _FAIL; -+ } -+ -+ } -+ -+ ptdlsinfo->setup_state = TDLS_LINKED_STATE; -+ if( ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE ) -+ { -+ ptdls_sta->tdls_sta_state|=TDLS_LINKED_STATE; -+ _cancel_timer_ex( &ptdls_sta->handshake_timer); -+#ifdef CONFIG_TDLS_AUTOCHECKALIVE -+ _set_timer( &ptdls_sta->alive_timer1, TDLS_ALIVE_TIMER_PH1); -+#endif //CONFIG_TDLS_AUTOCHECKALIVE -+ } -+ -+ rtw_tdls_set_mac_id(ptdlsinfo, ptdls_sta); -+ rtw_tdls_set_key(adapter, prx_pkt_attrib, ptdls_sta); -+ -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_WRCR); -+ -+ return _FAIL; -+ -+} -+ -+sint On_TDLS_Dis_Req(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct sta_info *psta_ap; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ sint parsing_length; //frame body length, without icv_len -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 FIXED_IE = 3, *dst, *pdialog = NULL; -+ u16 j; -+ -+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE + 1; -+ pdialog=ptr+2; -+ -+ parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len -+ -prx_pkt_attrib->hdrlen -+ -prx_pkt_attrib->iv_len -+ -prx_pkt_attrib->icv_len -+ -LLC_HEADER_SIZE -+ -TYPE_LENGTH_FIELD_SIZE -+ -1 -+ -FIXED_IE; -+ -+ //parsing information element -+ for(j=FIXED_IE; jElementID) -+ { -+ case _LINK_ID_IE_: -+ psta_ap = rtw_get_stainfo(pstapriv, pIE->data); -+ if(psta_ap == NULL) -+ { -+ goto exit; -+ } -+ dst = pIE->data + 12; -+ if( (MacAddr_isBcst(dst) == _FALSE) && (_rtw_memcmp(myid(&(adapter->eeprompriv)), dst, 6) == _FALSE) ) -+ { -+ goto exit; -+ } -+ break; -+ default: -+ break; -+ } -+ -+ j += (pIE->Length + 2); -+ -+ } -+ -+ //check frame contents -+ -+ issue_tdls_dis_rsp(adapter, precv_frame, *(pdialog) ); -+ -+exit: -+ -+ return _FAIL; -+ -+} -+ -+sint On_TDLS_Teardown(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ u8 *psa; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ struct sta_info *ptdls_sta= NULL; -+ _irqL irqL; -+ -+ psa = get_sa(ptr); -+ -+ ptdls_sta = rtw_get_stainfo(pstapriv, psa); -+ if(ptdls_sta!=NULL){ -+ if(ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE){ -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF); -+ } -+ free_tdls_sta(adapter, ptdls_sta); -+ } -+ -+ return _FAIL; -+ -+} -+ -+u8 TDLS_check_ch_state(uint state){ -+ if( (state & TDLS_CH_SWITCH_ON_STATE) && -+ (state & TDLS_AT_OFF_CH_STATE) && -+ (state & TDLS_PEER_AT_OFF_STATE) ){ -+ -+ if(state & TDLS_PEER_SLEEP_STATE) -+ return 2; //U-APSD + ch. switch -+ else -+ return 1; //ch. switch -+ }else -+ return 0; -+} -+ -+//we process buffered data for 1. U-APSD, 2. ch. switch, 3. U-APSD + ch. switch here -+sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct tdls_info *ptdlsinfo = &adapter->tdlsinfo; -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ //get peer sta infomation -+ struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->src); -+ u8 wmmps_ac=0, state=TDLS_check_ch_state(ptdls_sta->tdls_sta_state); -+ int i; -+ -+ ptdls_sta->sta_stats.rx_data_pkts++; -+ -+ //receive peer traffic response frame, sleeping STA wakes up -+ //ptdls_sta->tdls_sta_state &= ~(TDLS_PEER_SLEEP_STATE); -+ process_wmmps_data( adapter, precv_frame); -+ -+ // if noticed peer STA wakes up by receiving peer traffic response -+ // and we want to do channel swtiching, then we will transmit channel switch request first -+ if(ptdls_sta->tdls_sta_state & TDLS_APSD_CHSW_STATE){ -+ issue_tdls_ch_switch_req(adapter, pattrib->src); -+ ptdls_sta->tdls_sta_state &= ~(TDLS_APSD_CHSW_STATE); -+ return _FAIL; -+ } -+ -+ //check 4-AC queue bit -+ if(ptdls_sta->uapsd_vo || ptdls_sta->uapsd_vi || ptdls_sta->uapsd_be || ptdls_sta->uapsd_bk) -+ wmmps_ac=1; -+ -+ //if it's a direct link and have buffered frame -+ if(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){ -+ if(wmmps_ac && state) -+ { -+ _irqL irqL; -+ _list *xmitframe_plist, *xmitframe_phead; -+ struct xmit_frame *pxmitframe=NULL; -+ -+ _enter_critical_bh(&ptdls_sta->sleep_q.lock, &irqL); -+ -+ xmitframe_phead = get_list_head(&ptdls_sta->sleep_q); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ //transmit buffered frames -+ while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ xmitframe_plist = get_next(xmitframe_plist); -+ rtw_list_delete(&pxmitframe->list); -+ -+ ptdls_sta->sleepq_len--; -+ if(ptdls_sta->sleepq_len>0){ -+ pxmitframe->attrib.mdata = 1; -+ pxmitframe->attrib.eosp = 0; -+ }else{ -+ pxmitframe->attrib.mdata = 0; -+ pxmitframe->attrib.eosp = 1; -+ } -+ //pxmitframe->attrib.triggered = 1; //maybe doesn't need in TDLS -+ if(rtw_hal_xmit(adapter, pxmitframe) == _TRUE) -+ { -+ rtw_os_xmit_complete(adapter, pxmitframe); -+ } -+ -+ } -+ -+ if(ptdls_sta->sleepq_len==0) -+ { -+ DBG_871X("no buffered packets for tdls to xmit\n"); -+ //on U-APSD + CH. switch state, when there is no buffered date to xmit, -+ // we should go back to base channel -+ if(state==2){ -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF); -+ }else if(ptdls_sta->tdls_sta_state&TDLS_SW_OFF_STATE){ -+ ptdls_sta->tdls_sta_state &= ~(TDLS_SW_OFF_STATE); -+ ptdlsinfo->candidate_ch= pmlmeext->cur_channel; -+ issue_tdls_ch_switch_req(adapter, pattrib->src); -+ DBG_871X("issue tdls ch switch req back to base channel\n"); -+ } -+ -+ } -+ else -+ { -+ DBG_871X("error!psta->sleepq_len=%d\n", ptdls_sta->sleepq_len); -+ ptdls_sta->sleepq_len=0; -+ } -+ -+ _exit_critical_bh(&ptdls_sta->sleep_q.lock, &irqL); -+ -+ } -+ -+ } -+ -+ return _FAIL; -+} -+ -+sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct sta_info *ptdls_sta= NULL; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ u8 *psa; -+ sint parsing_length; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 FIXED_IE =3; -+ u16 j; -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ -+ psa = get_sa(ptr); -+ ptdls_sta = rtw_get_stainfo(pstapriv, psa); -+ -+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1; -+ parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len -+ -prx_pkt_attrib->hdrlen -+ -prx_pkt_attrib->iv_len -+ -prx_pkt_attrib->icv_len -+ -LLC_HEADER_SIZE -+ -ETH_TYPE_LEN -+ -PAYLOAD_TYPE_LEN -+ -FIXED_IE; -+ -+ ptdls_sta->off_ch = *(ptr+2); -+ -+ //parsing information element -+ for(j=FIXED_IE; jElementID) -+ { -+ case _COUNTRY_IE_: -+ break; -+ case _CH_SWTICH_ANNOUNCE_: -+ break; -+ case _LINK_ID_IE_: -+ break; -+ case _CH_SWITCH_TIMING_: -+ _rtw_memcpy(&ptdls_sta->ch_switch_time, pIE->data, 2); -+ _rtw_memcpy(&ptdls_sta->ch_switch_timeout, pIE->data+2, 2); -+ default: -+ break; -+ } -+ -+ j += (pIE->Length + 2); -+ -+ } -+ -+ //todo: check status -+ ptdls_sta->stat_code=0; -+ ptdls_sta->tdls_sta_state |= TDLS_CH_SWITCH_ON_STATE; -+ -+ issue_nulldata(adapter, NULL, 1, 0, 0); -+ -+ issue_tdls_ch_switch_rsp(adapter, psa); -+ -+ DBG_871X("issue tdls channel switch response\n"); -+ -+ if((ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE) && ptdls_sta->off_ch==pmlmeext->cur_channel){ -+ DBG_871X("back to base channel %x\n", pmlmeext->cur_channel); -+ ptdls_sta->option=7; -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_BASE_CH); -+ }else{ -+ ptdls_sta->option=6; -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH); -+ } -+ return _FAIL; -+} -+ -+sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame) -+{ -+ struct sta_info *ptdls_sta= NULL; -+ struct sta_priv *pstapriv = &adapter->stapriv; -+ u8 *ptr = precv_frame->u.hdr.rx_data; -+ struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; -+ u8 *psa; -+ sint parsing_length; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 FIXED_IE =4; -+ u16 stat_code, j, switch_time, switch_timeout; -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ -+ psa = get_sa(ptr); -+ ptdls_sta = rtw_get_stainfo(pstapriv, psa); -+ -+ //if channel switch is running and receiving Unsolicited TDLS Channel Switch Response, -+ //it will go back to base channel and terminate this channel switch procedure -+ if(ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE ){ -+ if(pmlmeext->cur_channel==ptdls_sta->off_ch){ -+ DBG_871X("back to base channel %x\n", pmlmeext->cur_channel); -+ ptdls_sta->option=7; -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH); -+ }else{ -+ DBG_871X("receive unsolicited channel switch response \n"); -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF); -+ } -+ return _FAIL; -+ } -+ -+ //avoiding duplicated or unconditional ch. switch. rsp -+ if((ptdls_sta->tdls_sta_state & TDLS_CH_SW_INITIATOR_STATE) != TDLS_CH_SW_INITIATOR_STATE) -+ return _FAIL; -+ -+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1; -+ parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len -+ -prx_pkt_attrib->hdrlen -+ -prx_pkt_attrib->iv_len -+ -prx_pkt_attrib->icv_len -+ -LLC_HEADER_SIZE -+ -ETH_TYPE_LEN -+ -PAYLOAD_TYPE_LEN -+ -FIXED_IE; -+ -+ _rtw_memcpy(&stat_code, ptr+2, 2); -+ -+ if(stat_code!=0){ -+ return _FAIL; -+ } -+ -+ //parsing information element -+ for(j=FIXED_IE; jElementID) -+ { -+ case _LINK_ID_IE_: -+ break; -+ case _CH_SWITCH_TIMING_: -+ _rtw_memcpy(&switch_time, pIE->data, 2); -+ if(switch_time > ptdls_sta->ch_switch_time) -+ _rtw_memcpy(&ptdls_sta->ch_switch_time, &switch_time, 2); -+ -+ _rtw_memcpy(&switch_timeout, pIE->data+2, 2); -+ if(switch_timeout > ptdls_sta->ch_switch_timeout) -+ _rtw_memcpy(&ptdls_sta->ch_switch_timeout, &switch_timeout, 2); -+ -+ default: -+ break; -+ } -+ -+ j += (pIE->Length + 2); -+ -+ } -+ -+ ptdls_sta->tdls_sta_state &= ~(TDLS_CH_SW_INITIATOR_STATE); -+ ptdls_sta->tdls_sta_state |=TDLS_CH_SWITCH_ON_STATE; -+ -+ //goto set_channel_workitem_callback() -+ ptdls_sta->option=6; -+ rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH); -+ -+ return _FAIL; -+} -+ -+#ifdef CONFIG_WFD -+void wfd_ie_tdls(_adapter * padapter, u8 *pframe, u32 *pktlen ) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wifi_display_info *pwfd_info = padapter->tdlsinfo.wfd_info; -+ u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; -+ u32 wfdielen = 0; -+ -+ // WFD OUI -+ wfdielen = 0; -+ wfdie[ wfdielen++ ] = 0x50; -+ wfdie[ wfdielen++ ] = 0x6F; -+ wfdie[ wfdielen++ ] = 0x9A; -+ wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0 -+ -+ // Commented by Albert 20110825 -+ // According to the WFD Specification, the negotiation request frame should contain 3 WFD attributes -+ // 1. WFD Device Information -+ // 2. Associated BSSID ( Optional ) -+ // 3. Local IP Adress ( Optional ) -+ -+ // WFD Device Information ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value1: -+ // WFD device information -+ // available for WFD session + Preferred TDLS + WSD ( WFD Service Discovery ) -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL -+ | WFD_DEVINFO_PC_TDLS | WFD_DEVINFO_WSD); -+ wfdielen += 2; -+ -+ // Value2: -+ // Session Management Control Port -+ // Default TCP port for RTSP messages is 554 -+ RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport ); -+ wfdielen += 2; -+ -+ // Value3: -+ // WFD Device Maximum Throughput -+ // 300Mbps is the maximum throughput -+ RTW_PUT_BE16(wfdie + wfdielen, 300); -+ wfdielen += 2; -+ -+ // Associated BSSID ATTR -+ // Type: -+ wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0006); -+ wfdielen += 2; -+ -+ // Value: -+ // Associated BSSID -+ if ( check_fwstate( pmlmepriv, _FW_LINKED) == _TRUE ) -+ { -+ _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ } -+ else -+ { -+ _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN ); -+ } -+ -+ // Local IP Address ATTR -+ wfdie[ wfdielen++ ] = WFD_ATTR_LOCAL_IP_ADDR; -+ -+ // Length: -+ // Note: In the WFD specification, the size of length field is 2. -+ RTW_PUT_BE16(wfdie + wfdielen, 0x0005); -+ wfdielen += 2; -+ -+ // Version: -+ // 0x01: Version1;IPv4 -+ wfdie[ wfdielen++ ] = 0x01; -+ -+ // IPv4 Address -+ _rtw_memcpy( wfdie + wfdielen, pwfd_info->ip_address, 4 ); -+ wfdielen += 4; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, pktlen); -+ -+} -+#endif //CONFIG_WFD -+ -+void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ struct sta_info *ptdls_sta=rtw_get_stainfo( (&padapter->stapriv) , pattrib->dst); -+ -+ u8 payload_type = 0x02; -+ u8 category = RTW_WLAN_CATEGORY_TDLS; -+ u8 action = TDLS_SETUP_REQUEST; -+ u8 bssrate[NDIS_802_11_LENGTH_RATES_EX]; //Use NDIS_802_11_LENGTH_RATES_EX in order to call func.rtw_set_supported_rate -+ int bssrate_len = 0, i = 0 ; -+ u8 more_supportedrates = 0; -+ unsigned int ie_len; -+ u8 *p; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ u8 link_id_addr[18] = {0}; -+ u8 iedata=0; -+ u8 sup_ch[ 30 * 2 ] = {0x00 }, sup_ch_idx = 0, idx_5g = 2; //For supported channel -+ u8 timeout_itvl[5]; //set timeout interval to maximum value -+ u32 time; -+ -+ //SNonce -+ if(pattrib->encrypt){ -+ for(i=0;i<8;i++){ -+ time=rtw_get_current_time(); -+ _rtw_memcpy(&ptdls_sta->SNonce[4*i], (u8 *)&time, 4); -+ } -+ } -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, dialog token -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen)); -+ -+ //capability -+ _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); -+ -+ if(pattrib->encrypt) -+ *pframe =*pframe | BIT(4); -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ //supported rates -+ rtw_set_supported_rate(bssrate, WIRELESS_11BG_24N); -+ bssrate_len = IEEE80211_CCK_RATE_LEN + IEEE80211_NUM_OFDM_RATESLEN; -+ -+ if (bssrate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen)); -+ more_supportedrates = 1; -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen)); -+ } -+ -+ //country(optional) -+ //extended supported rates -+ if(more_supportedrates==1){ -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen)); -+ } -+ -+ //supported channels -+ pframe = rtw_tdls_set_sup_ch(pmlmeext, pframe, pattrib); -+ -+ // SRC IE -+ pframe = rtw_set_ie( pframe, _SRC_IE_, 16, TDLS_SRC, &(pattrib->pktlen)); -+ -+ //RSNIE -+ if(pattrib->encrypt) -+ pframe = rtw_set_ie(pframe, _RSN_IE_2_, 20, TDLS_RSNIE, &(pattrib->pktlen)); -+ -+ //extended capabilities -+ pframe = rtw_set_ie(pframe, _EXT_CAP_IE_ , 5, TDLS_EXT_CAPIE, &(pattrib->pktlen)); -+ -+ //QoS capability(WMM_IE) -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 7, TDLS_WMMIE, &(pattrib->pktlen)); -+ -+ -+ if(pattrib->encrypt){ -+ //FTIE -+ _rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0 -+ _rtw_memset(pframe, _FTIE_, 1); //version -+ _rtw_memset((pframe+1), 82, 1); //length -+ _rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32); -+ pframe += 84; -+ pattrib->pktlen += 84; -+ -+ //Timeout interval -+ timeout_itvl[0]=0x02; -+ _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4); -+ pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen)); -+ } -+ -+ //Sup_reg_classes(optional) -+ //HT capabilities -+ pframe = rtw_tdls_set_ht_cap(padapter, pframe, pattrib); -+ -+ //20/40 BSS coexistence -+ if(pmlmepriv->num_FortyMHzIntolerant>0) -+ iedata |= BIT(2);//20 MHz BSS Width Request -+ pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen)); -+ -+ //Link identifier -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+#ifdef CONFIG_WFD -+ wfd_ie_tdls( padapter, pframe, &(pattrib->pktlen) ); -+#endif //CONFIG_WFD -+ -+} -+ -+void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct sta_info *ptdls_sta; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ -+ u8 payload_type = 0x02; -+ unsigned char category = RTW_WLAN_CATEGORY_TDLS; -+ unsigned char action = TDLS_SETUP_RESPONSE; -+ unsigned char bssrate[NDIS_802_11_LENGTH_RATES_EX]; -+ int bssrate_len = 0; -+ u8 more_supportedrates = 0; -+ unsigned int ie_len; -+ unsigned char *p; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ u8 link_id_addr[18] = {0}; -+ u8 iedata=0; -+ u8 timeout_itvl[5]; //setup response timeout interval will copy from request -+ u8 ANonce[32]; //maybe it can put in ontdls_req -+ u8 k; //for random ANonce -+ u8 *pftie, *ptimeout_ie, *plinkid_ie, *prsnie, *pftie_mic; -+ u32 time; -+ -+ ptdls_sta = rtw_get_stainfo( &(padapter->stapriv) , pattrib->dst); -+ -+ if(ptdls_sta == NULL ) -+ { -+ DBG_871X("[%s] %d\n", __FUNCTION__, __LINE__); -+ return; -+ } -+ -+ if(pattrib->encrypt){ -+ for(k=0;k<8;k++){ -+ time=rtw_get_current_time(); -+ _rtw_memcpy(&ptdls_sta->ANonce[4*k], (u8*)&time, 4); -+ } -+ } -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, status code -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen)); -+ -+ if(ptdls_sta->stat_code!=0) //invalid setup request -+ { -+ DBG_871X("ptdls_sta->stat_code:%04x \n", ptdls_sta->stat_code); -+ return; -+ } -+ -+ //dialog token -+ pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen)); -+ -+ //capability -+ _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); -+ -+ if(pattrib->encrypt ) -+ *pframe =*pframe | BIT(4); -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ //supported rates -+ rtw_set_supported_rate(bssrate, WIRELESS_11BG_24N); -+ bssrate_len = IEEE80211_CCK_RATE_LEN + IEEE80211_NUM_OFDM_RATESLEN; -+ -+ if (bssrate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen)); -+ more_supportedrates = 1; -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen)); -+ } -+ -+ //country(optional) -+ //extended supported rates -+ if(more_supportedrates==1){ -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen)); -+ } -+ -+ //supported channels -+ pframe = rtw_tdls_set_sup_ch(pmlmeext, pframe, pattrib); -+ -+ // SRC IE -+ pframe = rtw_set_ie(pframe, _SRC_IE_ , 16, TDLS_SRC, &(pattrib->pktlen)); -+ -+ //RSNIE -+ if(pattrib->encrypt){ -+ prsnie = pframe; -+ pframe = rtw_set_ie(pframe, _RSN_IE_2_, 20, TDLS_RSNIE, &(pattrib->pktlen)); -+ } -+ -+ //extended capabilities -+ pframe = rtw_set_ie(pframe, _EXT_CAP_IE_ , 5, TDLS_EXT_CAPIE, &(pattrib->pktlen)); -+ -+ //QoS capability(WMM_IE) -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 7, TDLS_WMMIE, &(pattrib->pktlen)); -+ -+ if(pattrib->encrypt){ -+ wpa_tdls_generate_tpk(padapter, ptdls_sta); -+ -+ //FTIE -+ pftie = pframe; -+ pftie_mic = pframe+4; -+ _rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0 -+ _rtw_memset(pframe, _FTIE_, 1); //version -+ _rtw_memset((pframe+1), 82, 1); //length -+ _rtw_memcpy((pframe+20), ptdls_sta->ANonce, 32); -+ _rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32); -+ pframe += 84; -+ pattrib->pktlen += 84; -+ -+ //Timeout interval -+ ptimeout_ie = pframe; -+ timeout_itvl[0]=0x02; -+ _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4); -+ pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen)); -+ } -+ -+ //Sup_reg_classes(optional) -+ //HT capabilities -+ pframe = rtw_tdls_set_ht_cap(padapter, pframe, pattrib); -+ -+ //20/40 BSS coexistence -+ if(pmlmepriv->num_FortyMHzIntolerant>0) -+ iedata |= BIT(2);//20 MHz BSS Width Request -+ pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen)); -+ -+ //Link identifier -+ plinkid_ie = pframe; -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->dst, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->src, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+ //fill FTIE mic -+ if(pattrib->encrypt) -+ wpa_tdls_ftie_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie, pftie_mic); -+ -+#ifdef CONFIG_WFD -+ wfd_ie_tdls( padapter, pframe, &(pattrib->pktlen) ); -+#endif //CONFIG_WFD -+ -+} -+ -+void rtw_build_tdls_setup_cfm_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct sta_info *ptdls_sta=rtw_get_stainfo( (&padapter->stapriv) , pattrib->dst); -+ -+ u8 payload_type = 0x02; -+ unsigned char category = RTW_WLAN_CATEGORY_TDLS; -+ unsigned char action = TDLS_SETUP_CONFIRM; -+ u8 more_supportedrates = 0; -+ unsigned int ie_len; -+ unsigned char *p; -+ u8 timeout_itvl[5]; //set timeout interval to maximum value -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ u8 link_id_addr[18] = {0}; -+ u8 *pftie, *ptimeout_ie, *plinkid_ie, *prsnie, *pftie_mic; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, status code, dialog token -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen)); -+ -+ if(ptdls_sta->stat_code!=0) //invalid setup request -+ return; -+ -+ //RSNIE -+ if(pattrib->encrypt){ -+ prsnie = pframe; -+ pframe = rtw_set_ie(pframe, _RSN_IE_2_, 20, TDLS_RSNIE, &(pattrib->pktlen)); -+ } -+ -+ //EDCA param set; WMM param ele. -+ if(pattrib->encrypt){ -+ //FTIE -+ pftie = pframe; -+ pftie_mic = pframe+4; -+ _rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0 -+ _rtw_memset(pframe, _FTIE_, 1); //version -+ _rtw_memset((pframe+1), 82, 1); //length -+ _rtw_memcpy((pframe+20), ptdls_sta->ANonce, 32); -+ _rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32); -+ pframe += 84; -+ pattrib->pktlen += 84; -+ -+ //Timeout interval -+ ptimeout_ie = pframe; -+ timeout_itvl[0]=0x02; -+ _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4); -+ ptdls_sta->TPK_count=0; -+ _set_timer(&ptdls_sta->TPK_timer, ptdls_sta->TDLS_PeerKey_Lifetime/TPK_RESEND_COUNT); -+ pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen)); -+ } -+ -+ //HT operation; todo -+ //Link identifier -+ plinkid_ie = pframe; -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+ //fill FTIE mic -+ if(pattrib->encrypt) -+ wpa_tdls_ftie_mic(ptdls_sta->tpk.kck, 3, plinkid_ie, prsnie, ptimeout_ie, pftie, pftie_mic); -+ -+} -+ -+void rtw_build_tdls_teardown_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ u8 payload_type = 0x02; -+ unsigned char category = RTW_WLAN_CATEGORY_TDLS; -+ unsigned char action = TDLS_TEARDOWN; -+ u8 link_id_addr[18] = {0}; -+ -+ struct sta_info *ptdls_sta = rtw_get_stainfo( &(padapter->stapriv) , pattrib->dst); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, reason code -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen)); -+ -+ //Link identifier -+ if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ }else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){ -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->dst, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->src, 6); -+ } -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+} -+ -+void rtw_build_tdls_dis_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ u8 payload_type = 0x02; -+ u8 category = RTW_WLAN_CATEGORY_TDLS; -+ u8 action = TDLS_DISCOVERY_REQUEST; -+ u8 link_id_addr[18] = {0}; -+ static u8 dialogtoken=0; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, reason code -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogtoken), &(pattrib->pktlen)); -+ dialogtoken = (dialogtoken+1)%256; -+ -+ //Link identifier -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+} -+ -+void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 dialog) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ -+ u8 category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = TDLS_DISCOVERY_RESPONSE; -+ u8 bssrate[NDIS_802_11_LENGTH_RATES_EX]; -+ int bssrate_len = 0; -+ u8 more_supportedrates = 0; -+ u8 *p; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ u8 link_id_addr[18] = {0}; -+ u8 iedata=0; -+ u8 timeout_itvl[5]; //set timeout interval to maximum value -+ u32 timeout_interval= TPK_RESEND_COUNT * 1000; -+ -+ //category, action, dialog token -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialog), &(pattrib->pktlen)); -+ -+ //capability -+ _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); -+ -+ if(pattrib->encrypt) -+ *pframe =*pframe | BIT(4); -+ pframe += 2; -+ pattrib->pktlen += 2; -+ -+ //supported rates -+ rtw_set_supported_rate(bssrate, WIRELESS_11BG_24N); -+ bssrate_len = IEEE80211_CCK_RATE_LEN + IEEE80211_NUM_OFDM_RATESLEN; -+ -+ if (bssrate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen)); -+ more_supportedrates = 1; -+ } -+ else -+ { -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen)); -+ } -+ -+ //extended supported rates -+ if(more_supportedrates==1){ -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen)); -+ } -+ -+ //supported channels -+ pframe = rtw_tdls_set_sup_ch(pmlmeext, pframe, pattrib); -+ -+ //RSNIE -+ if(pattrib->encrypt) -+ pframe = rtw_set_ie(pframe, _RSN_IE_2_, 20, TDLS_RSNIE, &(pattrib->pktlen)); -+ -+ //extended capability -+ pframe = rtw_set_ie(pframe, _EXT_CAP_IE_ , 5, TDLS_EXT_CAPIE, &(pattrib->pktlen)); -+ -+ if(pattrib->encrypt){ -+ //FTIE -+ _rtw_memset(pframe, 0, 84); //All fields shall be set to 0 -+ _rtw_memset(pframe, _FTIE_, 1); //version -+ _rtw_memset((pframe+1), 82, 1); //length -+ pframe += 84; -+ pattrib->pktlen += 84; -+ -+ //Timeout interval -+ timeout_itvl[0]=0x02; -+ _rtw_memcpy(timeout_itvl+1, &timeout_interval, 4); -+ pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen)); -+ } -+ -+ //Sup_reg_classes(optional) -+ //HT capabilities -+ pframe = rtw_tdls_set_ht_cap(padapter, pframe, pattrib); -+ -+ //20/40 BSS coexistence -+ if(pmlmepriv->num_FortyMHzIntolerant>0) -+ iedata |= BIT(2);//20 MHz BSS Width Request -+ pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen)); -+ -+ //Link identifier -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->dst, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->src, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+} -+ -+void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ u8 payload_type = 0x02; -+ unsigned char category = RTW_WLAN_CATEGORY_TDLS; -+ unsigned char action = TDLS_PEER_TRAFFIC_INDICATION; -+ -+ u8 link_id_addr[18] = {0}; -+ u8 AC_queue=0; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, reason code -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen)); -+ -+ //Link identifier -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+ //PTI control -+ //PU buffer status -+ if(ptdls_sta->uapsd_bk&BIT(1)) -+ AC_queue=BIT(0); -+ if(ptdls_sta->uapsd_be&BIT(1)) -+ AC_queue=BIT(1); -+ if(ptdls_sta->uapsd_vi&BIT(1)) -+ AC_queue=BIT(2); -+ if(ptdls_sta->uapsd_vo&BIT(1)) -+ AC_queue=BIT(3); -+ pframe = rtw_set_ie(pframe, _PTI_BUFFER_STATUS_, 1, &AC_queue, &(pattrib->pktlen)); -+ -+} -+ -+void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ u8 payload_type = 0x02; -+ unsigned char category = RTW_WLAN_CATEGORY_TDLS; -+ unsigned char action = TDLS_CHANNEL_SWITCH_REQUEST; -+ u8 link_id_addr[18] = {0}; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); -+ u8 ch_switch_timing[4] = {0}; -+ u16 switch_time= CH_SWITCH_TIME, switch_timeout=CH_SWITCH_TIMEOUT; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, target_ch -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(ptdlsinfo->candidate_ch), &(pattrib->pktlen)); -+ -+ //Link identifier -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+ //ch switch timing -+ _rtw_memcpy(ch_switch_timing, &switch_time, 2); -+ _rtw_memcpy(ch_switch_timing+2, &switch_timeout, 2); -+ pframe = rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen)); -+ -+ //update ch switch attrib to sta_info -+ ptdls_sta->off_ch=ptdlsinfo->candidate_ch; -+ ptdls_sta->ch_switch_time=switch_time; -+ ptdls_sta->ch_switch_timeout=switch_timeout; -+ -+} -+ -+void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ u8 payload_type = 0x02; -+ unsigned char category = RTW_WLAN_CATEGORY_TDLS; -+ unsigned char action = TDLS_CHANNEL_SWITCH_RESPONSE; -+ u8 link_id_addr[18] = {0}; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -+ u8 ch_switch_timing[4] = {0}; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, action, status_code -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen)); -+ -+ //Link identifier -+ _rtw_memcpy(link_id_addr, pattrib->ra, 6); -+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6); -+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6); -+ pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen)); -+ -+ //ch switch timing -+ _rtw_memcpy(ch_switch_timing, &ptdls_sta->ch_switch_time, 2); -+ _rtw_memcpy(ch_switch_timing+2, &ptdls_sta->ch_switch_timeout, 2); -+ pframe = rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen)); -+ -+} -+ -+#ifdef CONFIG_WFD -+void rtw_build_tunneled_probe_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct wifidirect_info *pbuddy_wdinfo = &padapter->pbuddy_adapter->wdinfo; -+ u8 payload_type = 0x02; -+ u8 category = RTW_WLAN_CATEGORY_P2P; -+ u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a}; -+ u8 probe_req = 4; -+ u8 wfdielen = 0; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, OUI, frame_body_type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 3, WFA_OUI, &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(probe_req), &(pattrib->pktlen)); -+ -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ wfdielen = build_probe_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+ else if(!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE)) -+ { -+ wfdielen = build_probe_req_wfd_ie(pbuddy_wdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+ -+} -+ -+void rtw_build_tunneled_probe_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe) -+{ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct wifidirect_info *pbuddy_wdinfo = &padapter->pbuddy_adapter->wdinfo; -+ u8 payload_type = 0x02; -+ u8 category = RTW_WLAN_CATEGORY_P2P; -+ u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a}; -+ u8 probe_rsp = 5; -+ u8 wfdielen = 0; -+ -+ //payload type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); -+ //category, OUI, frame_body_type -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 3, WFA_OUI, &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(probe_rsp), &(pattrib->pktlen)); -+ -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ wfdielen = build_probe_resp_wfd_ie(pwdinfo, pframe, 1); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+ else if(!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE)) -+ { -+ wfdielen = build_probe_resp_wfd_ie(pbuddy_wdinfo, pframe, 1); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+ } -+ -+} -+#endif //CONFIG_WFD -+ -+void _TPK_timer_hdl(void *FunctionContext) -+{ -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ -+ ptdls_sta->TPK_count++; -+ //TPK_timer set 1000 as default -+ //retry timer should set at least 301 sec. -+ if(ptdls_sta->TPK_count==TPK_RESEND_COUNT){ -+ ptdls_sta->TPK_count=0; -+ issue_tdls_setup_req(ptdls_sta->padapter, ptdls_sta->hwaddr); -+ } -+ -+ _set_timer(&ptdls_sta->TPK_timer, ptdls_sta->TDLS_PeerKey_Lifetime/TPK_RESEND_COUNT); -+} -+ -+void init_TPK_timer(_adapter *padapter, struct sta_info *psta) -+{ -+ psta->padapter=padapter; -+ -+ _init_timer(&psta->TPK_timer, padapter->pnetdev, _TPK_timer_hdl, psta); -+} -+ -+// TDLS_DONE_CH_SEN: channel sensing and report candidate channel -+// TDLS_OFF_CH: first time set channel to off channel -+// TDLS_BASE_CH: when go back to the channel linked with AP, send null data to peer STA as an indication -+void _ch_switch_timer_hdl(void *FunctionContext) -+{ -+ -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ _adapter *padapter = ptdls_sta->padapter; -+ -+ if( ptdls_sta->option == TDLS_DONE_CH_SEN ){ -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_DONE_CH_SEN); -+ }else if( ptdls_sta->option == TDLS_OFF_CH ){ -+ issue_nulldata_to_TDLS_peer_STA(ptdls_sta->padapter, ptdls_sta, 0); -+ _set_timer(&ptdls_sta->base_ch_timer, 500); -+ }else if( ptdls_sta->option == TDLS_BASE_CH){ -+ issue_nulldata_to_TDLS_peer_STA(ptdls_sta->padapter, ptdls_sta, 0); -+ } -+} -+ -+void init_ch_switch_timer(_adapter *padapter, struct sta_info *psta) -+{ -+ psta->padapter=padapter; -+ _init_timer(&psta->option_timer, padapter->pnetdev, _ch_switch_timer_hdl, psta); -+} -+ -+void _base_ch_timer_hdl(void *FunctionContext) -+{ -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ rtw_tdls_cmd(ptdls_sta->padapter, ptdls_sta->hwaddr, TDLS_P_OFF_CH); -+} -+ -+void init_base_ch_timer(_adapter *padapter, struct sta_info *psta) -+{ -+ psta->padapter=padapter; -+ _init_timer(&psta->base_ch_timer, padapter->pnetdev, _base_ch_timer_hdl, psta); -+} -+ -+void _off_ch_timer_hdl(void *FunctionContext) -+{ -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ rtw_tdls_cmd(ptdls_sta->padapter, ptdls_sta->hwaddr, TDLS_P_BASE_CH ); -+} -+ -+void init_off_ch_timer(_adapter *padapter, struct sta_info *psta) -+{ -+ psta->padapter=padapter; -+ _init_timer(&psta->off_ch_timer, padapter->pnetdev, _off_ch_timer_hdl, psta); -+} -+ -+void _tdls_handshake_timer_hdl(void *FunctionContext) -+{ -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ -+ if(ptdls_sta != NULL) -+ { -+ if( !(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) ) -+ { -+ DBG_871X("tdls handshake time out\n"); -+ free_tdls_sta(ptdls_sta->padapter, ptdls_sta); -+ } -+ } -+} -+ -+void init_handshake_timer(_adapter *padapter, struct sta_info *psta) -+{ -+ psta->padapter=padapter; -+ _init_timer(&psta->handshake_timer, padapter->pnetdev, _tdls_handshake_timer_hdl, psta); -+} -+ -+//Check tdls peer sta alive. -+void _tdls_alive_timer_phase1_hdl(void *FunctionContext) -+{ -+ _irqL irqL; -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ _adapter *padapter = ptdls_sta->padapter; -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ -+ _enter_critical_bh(&ptdlsinfo->hdl_lock, &irqL); -+ ptdls_sta->timer_flag = 1; -+ _exit_critical_bh(&ptdlsinfo->hdl_lock, &irqL); -+ -+ ptdls_sta->tdls_sta_state &= (~TDLS_ALIVE_STATE); -+ -+ DBG_871X("issue_tdls_dis_req to check alive\n"); -+ issue_tdls_dis_req( padapter, ptdls_sta->hwaddr); -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CKALV_PH1); -+ sta_update_last_rx_pkts(ptdls_sta); -+ -+ if ( ptdls_sta->timer_flag == 2 ) -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_FREE_STA); -+ else -+ { -+ _enter_critical_bh(&ptdlsinfo->hdl_lock, &irqL); -+ ptdls_sta->timer_flag = 0; -+ _exit_critical_bh(&ptdlsinfo->hdl_lock, &irqL); -+ } -+ -+} -+ -+void _tdls_alive_timer_phase2_hdl(void *FunctionContext) -+{ -+ _irqL irqL; -+ struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; -+ _adapter *padapter = ptdls_sta->padapter; -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ -+ _enter_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); -+ ptdls_sta->timer_flag = 1; -+ _exit_critical_bh(&ptdlsinfo->hdl_lock, &irqL); -+ -+ if( (ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) && -+ (sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta)) ) -+ { -+ DBG_871X("TDLS STA ALIVE, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n", -+ sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta)); -+ -+ ptdls_sta->alive_count = 0; -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CKALV_PH2); -+ } -+ else -+ { -+ if( !(ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) ) -+ DBG_871X("TDLS STA TOO FAR\n"); -+ if( !(sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta))) -+ DBG_871X("TDLS LINK WITH LOW TRAFFIC, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n", -+ sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta)); -+ -+ ptdls_sta->alive_count++; -+ if( ptdls_sta->alive_count == TDLS_ALIVE_COUNT ) -+ { -+ ptdls_sta->stat_code = _RSON_TDLS_TEAR_TOOFAR_; -+ issue_tdls_teardown(padapter, ptdls_sta->hwaddr); -+ } -+ else -+ { -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CKALV_PH2); -+ } -+ } -+ -+ if ( ptdls_sta->timer_flag == 2 ) -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_FREE_STA); -+ else -+ { -+ _enter_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); -+ ptdls_sta->timer_flag = 0; -+ _exit_critical_bh(&ptdlsinfo->hdl_lock, &irqL); -+} -+ -+} -+ -+void init_tdls_alive_timer(_adapter *padapter, struct sta_info *psta) -+{ -+ psta->padapter=padapter; -+ _init_timer(&psta->alive_timer1, padapter->pnetdev, _tdls_alive_timer_phase1_hdl, psta); -+ _init_timer(&psta->alive_timer2, padapter->pnetdev, _tdls_alive_timer_phase2_hdl, psta); -+} -+ -+int update_sgi_tdls(_adapter *padapter, struct sta_info *psta) -+{ -+ struct ht_priv *psta_ht = NULL; -+ psta_ht = &psta->htpriv; -+ -+ if(psta_ht->ht_option) -+ { -+ return psta_ht->sgi; -+ } -+ else -+ return _FALSE; -+} -+ -+u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta) -+{ -+ int i; -+ u8 rf_type, id; -+ unsigned char sta_band = 0; -+ unsigned char limit; -+ unsigned int tx_ra_bitmap=0; -+ struct ht_priv *psta_ht = NULL; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; -+ -+ psta_ht = &psta->htpriv; -+ //b/g mode ra_bitmap -+ for (i=0; ibssrateset); i++) -+ { -+ if (psta->bssrateset[i]) -+ tx_ra_bitmap |= rtw_get_bit_value_from_ieee_value(psta->bssrateset[i]&0x7f); -+ } -+ -+ //n mode ra_bitmap -+ if(psta_ht->ht_option) -+ { -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ if(rf_type == RF_2T2R) -+ limit=16;// 2R -+ else -+ limit=8;// 1R -+ -+ for (i=0; iht_cap.supp_mcs_set[i/8] & BIT(i%8)) -+ tx_ra_bitmap |= BIT(i+12); -+ } -+ } -+ -+ if ( pcur_network->Configuration.DSConfig > 14 ) { -+ // 5G band -+ if (tx_ra_bitmap & 0xffff000) -+ sta_band |= WIRELESS_11_5N | WIRELESS_11A; -+ else -+ sta_band |= WIRELESS_11A; -+ } else { -+ if (tx_ra_bitmap & 0xffff000) -+ sta_band |= WIRELESS_11_24N | WIRELESS_11G | WIRELESS_11B; -+ else if (tx_ra_bitmap & 0xff0) -+ sta_band |= WIRELESS_11G |WIRELESS_11B; -+ else -+ sta_band |= WIRELESS_11B; -+ } -+ -+ id = networktype_to_raid(sta_band); -+ tx_ra_bitmap |= ((id<<28)&0xf0000000); -+ return tx_ra_bitmap; -+} -+ -+#endif //CONFIG_TDLS -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c -@@ -0,0 +1,2305 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_WLAN_UTIL_C_ -+ -+#include -+#include -+#include -+#include -+ -+ -+unsigned char ARTHEROS_OUI1[] = {0x00, 0x03, 0x7f}; -+unsigned char ARTHEROS_OUI2[] = {0x00, 0x13, 0x74}; -+ -+unsigned char BROADCOM_OUI1[] = {0x00, 0x10, 0x18}; -+unsigned char BROADCOM_OUI2[] = {0x00, 0x0a, 0xf7}; -+unsigned char BROADCOM_OUI3[] = {0x00, 0x05, 0xb5}; -+ -+unsigned char CISCO_OUI[] = {0x00, 0x40, 0x96}; -+unsigned char MARVELL_OUI[] = {0x00, 0x50, 0x43}; -+unsigned char RALINK_OUI[] = {0x00, 0x0c, 0x43}; -+unsigned char REALTEK_OUI[] = {0x00, 0xe0, 0x4c}; -+unsigned char AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5}; -+ -+unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20}; -+ -+extern unsigned char MCS_rate_2R[16]; -+#ifdef CONFIG_DISABLE_MCS13TO15 -+extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16]; -+#endif //CONFIG_DISABLE_MCS13TO15 -+extern unsigned char MCS_rate_1R[16]; -+extern unsigned char RTW_WPA_OUI[]; -+extern unsigned char WPA_TKIP_CIPHER[4]; -+extern unsigned char RSN_TKIP_CIPHER[4]; -+ -+#define R2T_PHY_DELAY (0) -+ -+//#define WAIT_FOR_BCN_TO_MIN (3000) -+#define WAIT_FOR_BCN_TO_MIN (6000) -+#define WAIT_FOR_BCN_TO_MAX (20000) -+ -+static u8 rtw_basic_rate_cck[4] = { -+ IEEE80211_CCK_RATE_1MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB|IEEE80211_BASIC_RATE_MASK, -+ IEEE80211_CCK_RATE_5MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_11MB|IEEE80211_BASIC_RATE_MASK -+}; -+ -+static u8 rtw_basic_rate_ofdm[3] = { -+ IEEE80211_OFDM_RATE_6MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB|IEEE80211_BASIC_RATE_MASK, -+ IEEE80211_OFDM_RATE_24MB|IEEE80211_BASIC_RATE_MASK -+}; -+ -+static u8 rtw_basic_rate_mix[7] = { -+ IEEE80211_CCK_RATE_1MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB|IEEE80211_BASIC_RATE_MASK, -+ IEEE80211_CCK_RATE_5MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_11MB|IEEE80211_BASIC_RATE_MASK, -+ IEEE80211_OFDM_RATE_6MB|IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB|IEEE80211_BASIC_RATE_MASK, -+ IEEE80211_OFDM_RATE_24MB|IEEE80211_BASIC_RATE_MASK -+}; -+ -+ -+int cckrates_included(unsigned char *rate, int ratelen) -+{ -+ int i; -+ -+ for(i = 0; i < ratelen; i++) -+ { -+ if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || -+ (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) -+ return _TRUE; -+ } -+ -+ return _FALSE; -+ -+} -+ -+int cckratesonly_included(unsigned char *rate, int ratelen) -+{ -+ int i; -+ -+ for(i = 0; i < ratelen; i++) -+ { -+ if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) && -+ (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) -+ return _FALSE; -+ } -+ -+ return _TRUE; -+} -+ -+unsigned char networktype_to_raid(unsigned char network_type) -+{ -+ unsigned char raid; -+ -+ switch(network_type) -+ { -+ case WIRELESS_11B: -+ raid = 6; -+ break; -+ case WIRELESS_11A: -+ case WIRELESS_11G: -+ raid = 5; -+ break; -+ case WIRELESS_11BG: -+ raid = 4; -+ break; -+ case WIRELESS_11_24N: -+ case WIRELESS_11_5N: -+ raid = 3; -+ break; -+ case WIRELESS_11A_5N: -+ case WIRELESS_11G_24N: -+ raid = 1; -+ break; -+ case WIRELESS_11BG_24N: -+ raid = 0; -+ break; -+ default: -+ raid = 4; -+ break; -+ -+ } -+ -+ return raid; -+ -+} -+ -+int judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen) -+{ -+ int network_type = 0; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ -+ if(pmlmeext->cur_channel > 14) -+ { -+ if (pmlmeinfo->HT_enable) -+ { -+ network_type = WIRELESS_11_5N; -+ } -+ -+ network_type |= WIRELESS_11A; -+ } -+ else -+ { -+ if (pmlmeinfo->HT_enable) -+ { -+ network_type = WIRELESS_11_24N; -+ } -+ -+ if ((cckratesonly_included(rate, ratelen)) == _TRUE) -+ { -+ network_type |= WIRELESS_11B; -+ } -+ else if((cckrates_included(rate, ratelen)) == _TRUE) -+ { -+ network_type |= WIRELESS_11BG; -+ } -+ else -+ { -+ network_type |= WIRELESS_11G; -+ } -+ } -+ -+ return network_type; -+} -+ -+unsigned char ratetbl_val_2wifirate(unsigned char rate); -+unsigned char ratetbl_val_2wifirate(unsigned char rate) -+{ -+ unsigned char val = 0; -+ -+ switch (rate & 0x7f) -+ { -+ case 0: -+ val = IEEE80211_CCK_RATE_1MB; -+ break; -+ -+ case 1: -+ val = IEEE80211_CCK_RATE_2MB; -+ break; -+ -+ case 2: -+ val = IEEE80211_CCK_RATE_5MB; -+ break; -+ -+ case 3: -+ val = IEEE80211_CCK_RATE_11MB; -+ break; -+ -+ case 4: -+ val = IEEE80211_OFDM_RATE_6MB; -+ break; -+ -+ case 5: -+ val = IEEE80211_OFDM_RATE_9MB; -+ break; -+ -+ case 6: -+ val = IEEE80211_OFDM_RATE_12MB; -+ break; -+ -+ case 7: -+ val = IEEE80211_OFDM_RATE_18MB; -+ break; -+ -+ case 8: -+ val = IEEE80211_OFDM_RATE_24MB; -+ break; -+ -+ case 9: -+ val = IEEE80211_OFDM_RATE_36MB; -+ break; -+ -+ case 10: -+ val = IEEE80211_OFDM_RATE_48MB; -+ break; -+ -+ case 11: -+ val = IEEE80211_OFDM_RATE_54MB; -+ break; -+ -+ } -+ -+ return val; -+ -+} -+ -+int is_basicrate(_adapter *padapter, unsigned char rate); -+int is_basicrate(_adapter *padapter, unsigned char rate) -+{ -+ int i; -+ unsigned char val; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ for(i = 0; i < NumRates; i++) -+ { -+ val = pmlmeext->basicrate[i]; -+ -+ if ((val != 0xff) && (val != 0xfe)) -+ { -+ if (rate == ratetbl_val_2wifirate(val)) -+ { -+ return _TRUE; -+ } -+ } -+ } -+ -+ return _FALSE; -+} -+ -+unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset); -+unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset) -+{ -+ int i; -+ unsigned char rate; -+ unsigned int len = 0; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ for (i = 0; i < NumRates; i++) -+ { -+ rate = pmlmeext->datarate[i]; -+ -+ switch (rate) -+ { -+ case 0xff: -+ return len; -+ -+ case 0xfe: -+ continue; -+ -+ default: -+ rate = ratetbl_val_2wifirate(rate); -+ -+ if (is_basicrate(padapter, rate) == _TRUE) -+ { -+ rate |= IEEE80211_BASIC_RATE_MASK; -+ } -+ -+ rateset[len] = rate; -+ len++; -+ break; -+ } -+ } -+ return len; -+} -+ -+ -+void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len) -+{ -+ unsigned char supportedrates[NumRates]; -+ -+ _rtw_memset(supportedrates, 0, NumRates); -+ *bssrate_len = ratetbl2rateset(padapter, supportedrates); -+ _rtw_memcpy(pbssrate, supportedrates, *bssrate_len); -+} -+ -+void UpdateBrateTbl( -+ IN PADAPTER Adapter, -+ IN u8 *mBratesOS -+) -+{ -+ u8 i; -+ u8 rate; -+ -+ // 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. -+ for(i=0;ipbuddy_adapter; -+ if(pbuddy_adapter) -+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); -+#endif -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); -+ -+} -+ -+void Restore_DM_Func_Flag(_adapter *padapter) -+{ -+ u8 bSaveFlag = _FALSE; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ if(pbuddy_adapter) -+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); -+#endif -+ rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); -+} -+ -+void Switch_DM_Func(_adapter *padapter, u8 mode, u8 enable) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+#endif -+ -+ if(enable == _TRUE) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pbuddy_adapter) -+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode)); -+#endif -+ rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode)); -+ } -+ else -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pbuddy_adapter) -+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); -+#endif -+ rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); -+ } -+ -+#if 0 -+ u8 val8; -+ -+ val8 = rtw_read8(padapter, FW_DYNAMIC_FUN_SWITCH); -+ -+ if(enable == _TRUE) -+ { -+ rtw_write8(padapter, FW_DYNAMIC_FUN_SWITCH, (val8 | mode)); -+ } -+ else -+ { -+ rtw_write8(padapter, FW_DYNAMIC_FUN_SWITCH, (val8 & mode)); -+ } -+#endif -+ -+} -+ -+static void Set_NETYPE1_MSR(_adapter *padapter, u8 type) -+{ -+ rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS1, (u8 *)(&type)); -+} -+ -+static void Set_NETYPE0_MSR(_adapter *padapter, u8 type) -+{ -+ rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type)); -+} -+ -+void Set_MSR(_adapter *padapter, u8 type) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->iface_type == IFACE_PORT1) -+ { -+ Set_NETYPE1_MSR(padapter, type); -+ } -+ else -+#endif -+ { -+ Set_NETYPE0_MSR(padapter, type); -+ } -+} -+ -+inline u8 rtw_get_oper_ch(_adapter *adapter) -+{ -+ return adapter_to_dvobj(adapter)->oper_channel; -+} -+ -+inline void rtw_set_oper_ch(_adapter *adapter, u8 ch) -+{ -+ if (adapter_to_dvobj(adapter)->oper_channel != ch) -+ adapter_to_dvobj(adapter)->on_oper_ch_time = rtw_get_current_time(); -+ -+ adapter_to_dvobj(adapter)->oper_channel = ch; -+} -+ -+inline u8 rtw_get_oper_bw(_adapter *adapter) -+{ -+ return adapter_to_dvobj(adapter)->oper_bwmode; -+} -+ -+inline void rtw_set_oper_bw(_adapter *adapter, u8 bw) -+{ -+ adapter_to_dvobj(adapter)->oper_bwmode = bw; -+} -+ -+inline u8 rtw_get_oper_choffset(_adapter *adapter) -+{ -+ return adapter_to_dvobj(adapter)->oper_ch_offset; -+} -+ -+inline void rtw_set_oper_choffset(_adapter *adapter, u8 offset) -+{ -+ adapter_to_dvobj(adapter)->oper_ch_offset = offset; -+} -+ -+inline u32 rtw_get_on_oper_ch_time(_adapter *adapter) -+{ -+ return adapter_to_dvobj(adapter)->on_oper_ch_time; -+} -+ -+inline u32 rtw_get_on_cur_ch_time(_adapter *adapter) -+{ -+ if (adapter->mlmeextpriv.cur_channel == adapter_to_dvobj(adapter)->oper_channel) -+ return adapter_to_dvobj(adapter)->on_oper_ch_time; -+ else -+ return 0; -+} -+ -+void SelectChannel(_adapter *padapter, unsigned char channel) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ //saved channel info -+ rtw_set_oper_ch(padapter, channel); -+ dc_SelectChannel(padapter, channel); -+#else //CONFIG_DUALMAC_CONCURRENT -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->setch_mutex), NULL); -+ -+ //saved channel info -+ rtw_set_oper_ch(padapter, channel); -+ -+ rtw_hal_set_chan(padapter, channel); -+ -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->setch_mutex), NULL); -+ -+#endif // CONFIG_DUALMAC_CONCURRENT -+} -+ -+void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ //saved bw info -+ rtw_set_oper_bw(padapter, bwmode); -+ rtw_set_oper_choffset(padapter, channel_offset); -+ dc_SetBWMode(padapter, bwmode, channel_offset); -+#else //CONFIG_DUALMAC_CONCURRENT -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->setbw_mutex), NULL); -+ -+ //saved bw info -+ rtw_set_oper_bw(padapter, bwmode); -+ rtw_set_oper_choffset(padapter, channel_offset); -+ -+ rtw_hal_set_bwmode(padapter, (HT_CHANNEL_WIDTH)bwmode, channel_offset); -+ -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->setbw_mutex), NULL); -+ -+#endif // CONFIG_DUALMAC_CONCURRENT -+} -+ -+void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode) -+{ -+ u8 center_ch; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ if ( padapter->bNotifyChannelChange ) -+ { -+ DBG_871X( "[%s] ch = %d, offset = %d, bwmode = %d\n", __FUNCTION__, channel, channel_offset, bwmode ); -+ } -+ -+ if((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE)) -+ { -+ //SelectChannel(padapter, channel); -+ center_ch = channel; -+ } -+ else -+ { -+ //switch to the proper channel -+ if (channel_offset == HAL_PRIME_CHNL_OFFSET_LOWER) -+ { -+ //SelectChannel(padapter, channel + 2); -+ center_ch = channel + 2; -+ } -+ else -+ { -+ //SelectChannel(padapter, channel - 2); -+ center_ch = channel - 2; -+ } -+ } -+ -+ //set Channel , must be independant for correct co_ch value/ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ //saved channel/bw info -+ rtw_set_oper_ch(padapter, channel); -+ rtw_set_oper_bw(padapter, bwmode); -+ rtw_set_oper_choffset(padapter, channel_offset); -+ dc_SelectChannel(padapter, center_ch);// set center channel -+#else //CONFIG_DUALMAC_CONCURRENT -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->setch_mutex), NULL); -+ -+ //saved channel/bw info -+ rtw_set_oper_ch(padapter, channel); -+ rtw_set_oper_bw(padapter, bwmode); -+ rtw_set_oper_choffset(padapter, channel_offset); -+ -+ rtw_hal_set_chan(padapter, center_ch); -+ -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->setch_mutex), NULL); -+ -+#endif // CONFIG_DUALMAC_CONCURRENT -+ -+ -+ //set BandWidth -+ SetBWMode(padapter, bwmode, channel_offset); -+ -+} -+ -+int get_bsstype(unsigned short capability) -+{ -+ if (capability & BIT(0)) -+ { -+ return WIFI_FW_AP_STATE; -+ } -+ else if (capability & BIT(1)) -+ { -+ return WIFI_FW_ADHOC_STATE; -+ } -+ else -+ { -+ return 0; -+ } -+} -+ -+__inline u8 *get_my_bssid(WLAN_BSSID_EX *pnetwork) -+{ -+ return (pnetwork->MacAddress); -+} -+ -+u16 get_beacon_interval(WLAN_BSSID_EX *bss) -+{ -+ unsigned short val; -+ _rtw_memcpy((unsigned char *)&val, rtw_get_beacon_interval_from_ie(bss->IEs), 2); -+ -+ return le16_to_cpu(val); -+ -+} -+ -+int is_client_associated_to_ap(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext; -+ struct mlme_ext_info *pmlmeinfo; -+ -+ if(!padapter) -+ return _FAIL; -+ -+ pmlmeext = &padapter->mlmeextpriv; -+ pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)) -+ { -+ return _TRUE; -+ } -+ else -+ { -+ return _FAIL; -+ } -+} -+ -+int is_client_associated_to_ibss(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if ((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE)) -+ { -+ return _TRUE; -+ } -+ else -+ { -+ return _FAIL; -+ } -+} -+ -+int is_IBSS_empty(_adapter *padapter) -+{ -+ unsigned int i; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ for (i = IBSS_START_MAC_ID; i < NUM_STA; i++) -+ { -+ if (pmlmeinfo->FW_sta_info[i].status == 1) -+ { -+ return _FAIL; -+ } -+ } -+ -+ return _TRUE; -+ -+} -+ -+unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval) -+{ -+ if ((bcn_interval << 2) < WAIT_FOR_BCN_TO_MIN) -+ { -+ return WAIT_FOR_BCN_TO_MIN; -+ } -+ else if ((bcn_interval << 2) > WAIT_FOR_BCN_TO_MAX) -+ { -+ return WAIT_FOR_BCN_TO_MAX; -+ } -+ else -+ { -+ return ((bcn_interval << 2)); -+ } -+} -+ -+void CAM_empty_entry( -+ PADAPTER Adapter, -+ u8 ucIndex -+) -+{ -+ rtw_hal_set_hwreg(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex)); -+} -+ -+void invalidate_cam_all(_adapter *padapter) -+{ -+ rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, 0); -+} -+#if 0 -+static u32 _ReadCAM(_adapter *padapter ,u32 addr) -+{ -+ u32 count = 0, cmd; -+ cmd = CAM_POLLINIG |addr ; -+ rtw_write32(padapter, RWCAM, cmd); -+ -+ do{ -+ if(0 == (rtw_read32(padapter,REG_CAMCMD) & CAM_POLLINIG)){ -+ break; -+ } -+ }while(count++ < 100); -+ -+ return rtw_read32(padapter,REG_CAMREAD); -+} -+void read_cam(_adapter *padapter ,u8 entry) -+{ -+ u32 j,count = 0, addr, cmd; -+ addr = entry << 3; -+ -+ printk("********* DUMP CAM Entry_#%02d***************\n",entry); -+ for (j = 0; j < 6; j++) -+ { -+ cmd = _ReadCAM(padapter ,addr+j); -+ printk("offset:0x%02x => 0x%08x \n",addr+j,cmd); -+ } -+ printk("*********************************\n"); -+} -+#endif -+ -+void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) -+{ -+ unsigned int i, val, addr; -+ //unsigned int cmd; -+ int j; -+ u32 cam_val[2]; -+ -+ addr = entry << 3; -+ -+ for (j = 5; j >= 0; j--) -+ { -+ switch (j) -+ { -+ case 0: -+ val = (ctrl | (mac[0] << 16) | (mac[1] << 24) ); -+ break; -+ -+ case 1: -+ val = (mac[2] | ( mac[3] << 8) | (mac[4] << 16) | (mac[5] << 24)); -+ break; -+ -+ default: -+ i = (j - 2) << 2; -+ val = (key[i] | (key[i+1] << 8) | (key[i+2] << 16) | (key[i+3] << 24)); -+ break; -+ -+ } -+ -+ cam_val[0] = val; -+ cam_val[1] = addr + (unsigned int)j; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_CAM_WRITE, (u8 *)cam_val); -+ -+ //rtw_write32(padapter, WCAMI, val); -+ -+ //cmd = CAM_POLLINIG | CAM_WRITE | (addr + j); -+ //rtw_write32(padapter, RWCAM, cmd); -+ -+ //DBG_871X("%s=> cam write: %x, %x\n",__FUNCTION__, cmd, val); -+ -+ } -+ -+} -+ -+void clear_cam_entry(_adapter *padapter, u8 entry) -+{ -+#if 0 -+ u32 addr, val=0; -+ u32 cam_val[2]; -+ -+ addr = entry << 3; -+ -+ -+ cam_val[0] = val; -+ cam_val[1] = addr + (unsigned int)0; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_CAM_WRITE, (u8 *)cam_val); -+ -+ -+ -+ cam_val[0] = val; -+ cam_val[1] = addr + (unsigned int)1; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_CAM_WRITE, (u8 *)cam_val); -+#else -+ -+ unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+ -+ unsigned char null_key[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00}; -+ -+ write_cam(padapter, entry, 0, null_sta, null_key); -+ -+#endif -+} -+ -+int allocate_fw_sta_entry(_adapter *padapter) -+{ -+ unsigned int mac_id; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ for (mac_id = IBSS_START_MAC_ID; mac_id < NUM_STA; mac_id++) -+ { -+ if (pmlmeinfo->FW_sta_info[mac_id].status == 0) -+ { -+ pmlmeinfo->FW_sta_info[mac_id].status = 1; -+ pmlmeinfo->FW_sta_info[mac_id].retry = 0; -+ break; -+ } -+ } -+ -+ return mac_id; -+} -+ -+void flush_all_cam_entry(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ //if(check_buddy_mlmeinfo_state(padapter, _HW_STATE_NOLINK_)) -+ if(check_buddy_fwstate(padapter, _FW_LINKED) == _FALSE) -+ { -+ rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, 0); -+ } -+ else -+ { -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE)) -+ { -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta; -+ u8 cam_id=0;//cam_entry -+ -+ psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress); -+ if(psta) { -+ if(psta->state & WIFI_AP_STATE) -+ {} //clear cam when ap free per sta_info -+ else { -+ if(psta->mac_id==2) -+ cam_id = 5; -+ else -+ cam_id = 4; -+ } -+ //clear_cam_entry(padapter, cam_id); -+ rtw_clearstakey_cmd(padapter, (u8*)psta, cam_id, _FALSE); -+ } -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ //clear cam when ap free per sta_info -+ } -+ } -+#else //CONFIG_CONCURRENT_MODE -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, 0); -+ -+#endif //CONFIG_CONCURRENT_MODE -+ -+ _rtw_memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info)); -+ -+} -+ -+#if defined(CONFIG_P2P) && defined(CONFIG_WFD) -+int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) -+{ -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct wifidirect_info *pwdinfo; -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ u32 wfd_ielen = 0; -+ -+ -+ pwdinfo = &padapter->wdinfo; -+ if ( rtw_get_wfd_ie( ( u8* ) pIE, pIE->Length, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 attr_content[ 10 ] = { 0x00 }; -+ u32 attr_contentlen = 0; -+ -+ printk( "[%s] Found WFD IE\n", __FUNCTION__ ); -+ rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); -+ if ( attr_contentlen ) -+ { -+ pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); -+ DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); -+ return( _TRUE ); -+ } -+ } -+ else -+ { -+ printk( "[%s] NO WFD IE\n", __FUNCTION__ ); -+ -+ } -+ return( _FAIL ); -+} -+#endif -+ -+int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) -+{ -+ //struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if(pmlmepriv->qospriv.qos_option==0) -+ { -+ pmlmeinfo->WMM_enable = 0; -+ return _FAIL; -+ } -+ -+ pmlmeinfo->WMM_enable = 1; -+ _rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)); -+ return _TRUE; -+ -+ /*if (pregpriv->wifi_spec == 1) -+ { -+ if (pmlmeinfo->WMM_enable == 1) -+ { -+ //todo: compare the parameter set count & decide wheher to update or not -+ return _FAIL; -+ } -+ else -+ { -+ pmlmeinfo->WMM_enable = 1; -+ _rtw_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)); -+ return _TRUE; -+ } -+ } -+ else -+ { -+ pmlmeinfo->WMM_enable = 0; -+ return _FAIL; -+ }*/ -+ -+} -+ -+void WMMOnAssocRsp(_adapter *padapter) -+{ -+ u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; -+ u8 acm_mask; -+ u16 TXOP; -+ u32 acParm, i; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if (pmlmeinfo->WMM_enable == 0) -+ { -+ padapter->mlmepriv.acm_mask = 0; -+ return; -+ } -+ -+ acm_mask = 0; -+ -+ if( pmlmeext->cur_wireless_mode == WIRELESS_11B) -+ aSifsTime = 10; -+ else -+ aSifsTime = 16; -+ -+ for (i = 0; i < 4; i++) -+ { -+ ACI = (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN >> 5) & 0x03; -+ ACM = (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN >> 4) & 0x01; -+ -+ //AIFS = AIFSN * slot time + SIFS - r2t phy delay -+ AIFS = (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN & 0x0f) * pmlmeinfo->slotTime + aSifsTime; -+ -+ ECWMin = (pmlmeinfo->WMM_param.ac_param[i].CW & 0x0f); -+ ECWMax = (pmlmeinfo->WMM_param.ac_param[i].CW & 0xf0) >> 4; -+ TXOP = le16_to_cpu(pmlmeinfo->WMM_param.ac_param[i].TXOP_limit); -+ -+ acParm = AIFS | (ECWMin << 8) | (ECWMax << 12) | (TXOP << 16); -+ -+ switch (ACI) -+ { -+ case 0x0: -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acParm)); -+ acm_mask |= (ACM? BIT(1):0); -+ break; -+ -+ case 0x1: -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acParm)); -+ //acm_mask |= (ACM? BIT(0):0); -+ break; -+ -+ case 0x2: -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acParm)); -+ acm_mask |= (ACM? BIT(2):0); -+ break; -+ -+ case 0x3: -+ rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acParm)); -+ acm_mask |= (ACM? BIT(3):0); -+ break; -+ } -+ -+ DBG_871X("WMM(%x): %x, %x\n", ACI, ACM, acParm); -+ } -+ -+ if(padapter->registrypriv.acm_method == 1) -+ rtw_hal_set_hwreg(padapter, HW_VAR_ACM_CTRL, (u8 *)(&acm_mask)); -+ else -+ padapter->mlmepriv.acm_mask = acm_mask; -+ -+ return; -+} -+ -+static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) -+{ -+ unsigned char new_bwmode; -+ unsigned char new_ch_offset; -+ struct HT_info_element *pHT_info; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ u8 cbw40_enable=0; -+ -+ if(!pIE) -+ return; -+ -+ if(phtpriv->ht_option == _FALSE) return; -+ -+ if(pIE->Length > sizeof(struct HT_info_element)) -+ return; -+ -+ pHT_info = (struct HT_info_element *)pIE->data; -+ -+ if (pmlmeext->cur_channel > 14) { -+ if (pregistrypriv->cbw40_enable & BIT(1)) -+ cbw40_enable = 1; -+ } else { -+ if (pregistrypriv->cbw40_enable & BIT(0)) -+ cbw40_enable = 1; -+ } -+ -+ if((pHT_info->infos[0] & BIT(2)) && cbw40_enable ) -+ { -+ new_bwmode = HT_CHANNEL_WIDTH_40; -+ -+ switch (pHT_info->infos[0] & 0x3) -+ { -+ case 1: -+ new_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ break; -+ -+ case 3: -+ new_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ break; -+ -+ default: -+ new_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ break; -+ } -+ } -+ else -+ { -+ new_bwmode = HT_CHANNEL_WIDTH_20; -+ new_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ } -+ -+ -+ if((new_bwmode!= pmlmeext->cur_bwmode) || (new_ch_offset!=pmlmeext->cur_ch_offset)) -+ { -+ pmlmeinfo->bwmode_updated = _TRUE; -+ -+ pmlmeext->cur_bwmode = new_bwmode; -+ pmlmeext->cur_ch_offset = new_ch_offset; -+ -+ //update HT info also -+ HT_info_handler(padapter, pIE); -+ } -+ else -+ { -+ pmlmeinfo->bwmode_updated = _FALSE; -+ } -+ -+ -+ if(_TRUE == pmlmeinfo->bwmode_updated) -+ { -+ struct sta_info *psta; -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ //set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+ -+ //update ap's stainfo -+ psta = rtw_get_stainfo(pstapriv, cur_network->MacAddress); -+ if(psta) -+ { -+ struct ht_priv *phtpriv_sta = &psta->htpriv; -+ -+ if(phtpriv_sta->ht_option) -+ { -+ // bwmode -+ phtpriv_sta->bwmode = pmlmeext->cur_bwmode; -+ phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset; -+ } -+ else -+ { -+ phtpriv_sta->bwmode = HT_CHANNEL_WIDTH_20; -+ phtpriv_sta->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ } -+ -+ } -+ -+ //pmlmeinfo->bwmode_updated = _FALSE;//bwmode_updated done, reset it! -+ -+ } -+ -+} -+ -+void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) -+{ -+ unsigned int i; -+ u8 rf_type; -+ u8 max_AMPDU_len, min_MPDU_spacing; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ -+ if(pIE==NULL) return; -+ -+ if(phtpriv->ht_option == _FALSE) return; -+ -+ pmlmeinfo->HT_caps_enable = 1; -+ -+ for (i = 0; i < (pIE->Length); i++) -+ { -+ if (i != 2) -+ { -+ // Commented by Albert 2010/07/12 -+ // Got the endian issue here. -+ pmlmeinfo->HT_caps.u.HT_cap[i] &= (pIE->data[i]); -+ } -+ else -+ { -+ //modify from fw by Thomas 2010/11/17 -+ if ((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3) > (pIE->data[i] & 0x3)) -+ { -+ max_AMPDU_len = (pIE->data[i] & 0x3); -+ } -+ else -+ { -+ max_AMPDU_len = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3); -+ } -+ -+ if ((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) > (pIE->data[i] & 0x1c)) -+ { -+ min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c); -+ } -+ else -+ { -+ min_MPDU_spacing = (pIE->data[i] & 0x1c); -+ } -+ -+ pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para = max_AMPDU_len | min_MPDU_spacing; -+ } -+ } -+ -+ // Commented by Albert 2010/07/12 -+ // Have to handle the endian issue after copying. -+ // HT_ext_caps didn't be used yet. -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info = le16_to_cpu( pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info ); -+ pmlmeinfo->HT_caps.u.HT_cap_element.HT_ext_caps = le16_to_cpu( pmlmeinfo->HT_caps.u.HT_cap_element.HT_ext_caps ); -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ -+ //update the MCS rates -+ for (i = 0; i < 16; i++) -+ { -+ if((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ } -+ else -+ { -+ #ifdef CONFIG_DISABLE_MCS13TO15 -+ if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregistrypriv->wifi_spec!=1)) -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R_MCS13TO15_OFF[i]; -+ else -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; -+ #else -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; -+ #endif //CONFIG_DISABLE_MCS13TO15 -+ } -+ #ifdef RTL8192C_RECONFIG_TO_1T1R -+ { -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ } -+ #endif -+ -+ if(pregistrypriv->special_rf_path) -+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ -+ } -+ -+ return; -+} -+ -+void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ -+ if(pIE==NULL) return; -+ -+ if(phtpriv->ht_option == _FALSE) return; -+ -+ -+ if(pIE->Length > sizeof(struct HT_info_element)) -+ return; -+ -+ pmlmeinfo->HT_info_enable = 1; -+ _rtw_memcpy(&(pmlmeinfo->HT_info), pIE->data, pIE->Length); -+ -+ return; -+} -+ -+void HTOnAssocRsp(_adapter *padapter) -+{ -+ unsigned char max_AMPDU_len; -+ unsigned char min_MPDU_spacing; -+ //struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) -+ { -+ pmlmeinfo->HT_enable = 1; -+ } -+ else -+ { -+ pmlmeinfo->HT_enable = 0; -+ //set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ return; -+ } -+ -+ //handle A-MPDU parameter field -+ /* -+ AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k -+ AMPDU_para [4:2]:Min MPDU Start Spacing -+ */ -+ max_AMPDU_len = pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x03; -+ -+ min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) >> 2; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing)); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len)); -+ -+#if 0 //move to rtw_update_ht_cap() -+ if ((pregpriv->cbw40_enable) && -+ (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & BIT(1)) && -+ (pmlmeinfo->HT_info.infos[0] & BIT(2))) -+ { -+ //switch to the 40M Hz mode accoring to the AP -+ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; -+ switch ((pmlmeinfo->HT_info.infos[0] & 0x3)) -+ { -+ case HT_EXTCHNL_OFFSET_UPPER: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; -+ break; -+ -+ case HT_EXTCHNL_OFFSET_LOWER: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; -+ break; -+ -+ default: -+ pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ break; -+ } -+ -+ //SelectChannel(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset); -+ } -+#endif -+ -+ //set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); -+ -+#if 0 //move to rtw_update_ht_cap() -+ // -+ // Config SM Power Save setting -+ // -+ pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & 0x0C) >> 2; -+ if(pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) -+ { -+ /*u8 i; -+ //update the MCS rates -+ for (i = 0; i < 16; i++) -+ { -+ pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -+ }*/ -+ DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__); -+ } -+ -+ // -+ // Config current HT Protection mode. -+ // -+ pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; -+#endif -+ -+} -+ -+void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if(pIE->Length>1) -+ return; -+ -+ pmlmeinfo->ERP_enable = 1; -+ _rtw_memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length); -+} -+ -+void VCS_update(_adapter *padapter, struct sta_info *psta) -+{ -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ switch (pregpriv->vrtl_carrier_sense)/* 0:off 1:on 2:auto */ -+ { -+ case 0: //off -+ psta->rtsen = 0; -+ psta->cts2self = 0; -+ break; -+ -+ case 1: //on -+ if (pregpriv->vcs_type == 1) /* 1:RTS/CTS 2:CTS to self */ -+ { -+ psta->rtsen = 1; -+ psta->cts2self = 0; -+ } -+ else -+ { -+ psta->rtsen = 0; -+ psta->cts2self = 1; -+ } -+ break; -+ -+ case 2: //auto -+ default: -+ if ((pmlmeinfo->ERP_enable) && (pmlmeinfo->ERP_IE & BIT(1))) -+ { -+ if (pregpriv->vcs_type == 1) -+ { -+ psta->rtsen = 1; -+ psta->cts2self = 0; -+ } -+ else -+ { -+ psta->rtsen = 0; -+ psta->cts2self = 1; -+ } -+ } -+ else -+ { -+ psta->rtsen = 0; -+ psta->cts2self = 0; -+ } -+ break; -+ } -+} -+ -+#ifdef CONFIG_TDLS -+int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len) -+{ -+ u8 tdls_prohibited_bit = 0x40; //bit(38); TDLS_prohibited -+ -+ if(pkt_len < 5) -+ { -+ return _FALSE; -+ } -+ -+ pframe += 4; -+ if( (*pframe) & tdls_prohibited_bit ) -+ return _TRUE; -+ -+ return _FALSE; -+} -+#endif //CONFIG_TDLS -+ -+void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta_info *psta) -+{ -+ unsigned int i; -+ unsigned int len; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ u8 tdls_prohibited[] = { 0x00, 0x00, 0x00, 0x00, 0x10 }; //bit(38): TDLS_prohibited -+#endif //CONFIG_TDLS -+ -+ len = pkt_len - (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN); -+ -+ for (i = 0; i < len;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i); -+ -+ switch (pIE->ElementID) -+ { -+#if 0 -+ case _VENDOR_SPECIFIC_IE_: -+ //todo: to update WMM paramter set while receiving beacon -+ if (_rtw_memcmp(pIE->data, WMM_PARA_OUI, 6)) //WMM -+ { -+ (WMM_param_handler(padapter, pIE))? WMMOnAssocRsp(padapter): 0; -+ } -+ break; -+#endif -+ -+ case _HT_EXTRA_INFO_IE_: //HT info -+ //HT_info_handler(padapter, pIE); -+ bwmode_update_check(padapter, pIE); -+ break; -+ -+ case _ERPINFO_IE_: -+ ERP_IE_handler(padapter, pIE); -+ VCS_update(padapter, psta); -+ break; -+ -+#ifdef CONFIG_TDLS -+ case _EXT_CAP_IE_: -+ if( check_ap_tdls_prohibited(pIE->data, pIE->Length) == _TRUE ) -+ ptdlsinfo->ap_prohibited = _TRUE; -+ break; -+#endif //CONFIG_TDLS -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+} -+ -+#ifdef CONFIG_DFS -+void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len) -+{ -+ unsigned int i; -+ unsigned int len; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ u8 new_ch_no = 0; -+ -+ len = pkt_len - (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN); -+ -+ for (i = 0; i < len;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i); -+ -+ switch (pIE->ElementID) -+ { -+ case _CH_SWTICH_ANNOUNCE_: -+ _rtw_memcpy(&new_ch_no, pIE->data+1, 1); -+ rtw_set_csa_cmd(padapter, new_ch_no); -+ break; -+ -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+} -+#endif //CONFIG_DFS -+ -+unsigned int is_ap_in_tkip(_adapter *padapter) -+{ -+ u32 i; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ -+ if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY) -+ { -+ for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i); -+ -+ switch (pIE->ElementID) -+ { -+ case _VENDOR_SPECIFIC_IE_: -+ if ((_rtw_memcmp(pIE->data, RTW_WPA_OUI, 4)) && (_rtw_memcmp((pIE->data + 12), WPA_TKIP_CIPHER, 4))) -+ { -+ return _TRUE; -+ } -+ break; -+ -+ case _RSN_IE_2_: -+ if (_rtw_memcmp((pIE->data + 8), RSN_TKIP_CIPHER, 4)) -+ { -+ return _TRUE; -+ } -+ -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+ -+ return _FALSE; -+ } -+ else -+ { -+ return _FALSE; -+ } -+ -+} -+ -+int wifirate2_ratetbl_inx(unsigned char rate); -+int wifirate2_ratetbl_inx(unsigned char rate) -+{ -+ int inx = 0; -+ rate = rate & 0x7f; -+ -+ switch (rate) -+ { -+ case 54*2: -+ inx = 11; -+ break; -+ -+ case 48*2: -+ inx = 10; -+ break; -+ -+ case 36*2: -+ inx = 9; -+ break; -+ -+ case 24*2: -+ inx = 8; -+ break; -+ -+ case 18*2: -+ inx = 7; -+ break; -+ -+ case 12*2: -+ inx = 6; -+ break; -+ -+ case 9*2: -+ inx = 5; -+ break; -+ -+ case 6*2: -+ inx = 4; -+ break; -+ -+ case 11*2: -+ inx = 3; -+ break; -+ case 11: -+ inx = 2; -+ break; -+ -+ case 2*2: -+ inx = 1; -+ break; -+ -+ case 1*2: -+ inx = 0; -+ break; -+ -+ } -+ return inx; -+} -+ -+unsigned int update_basic_rate(unsigned char *ptn, unsigned int ptn_sz) -+{ -+ unsigned int i, num_of_rate; -+ unsigned int mask = 0; -+ -+ num_of_rate = (ptn_sz > NumRates)? NumRates: ptn_sz; -+ -+ for (i = 0; i < num_of_rate; i++) -+ { -+ if ((*(ptn + i)) & 0x80) -+ { -+ mask |= 0x1 << wifirate2_ratetbl_inx(*(ptn + i)); -+ } -+ } -+ return mask; -+} -+ -+unsigned int update_supported_rate(unsigned char *ptn, unsigned int ptn_sz) -+{ -+ unsigned int i, num_of_rate; -+ unsigned int mask = 0; -+ -+ num_of_rate = (ptn_sz > NumRates)? NumRates: ptn_sz; -+ -+ for (i = 0; i < num_of_rate; i++) -+ { -+ mask |= 0x1 << wifirate2_ratetbl_inx(*(ptn + i)); -+ } -+ -+ return mask; -+} -+ -+unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps) -+{ -+ unsigned int mask = 0; -+ -+ mask = ((pHT_caps->u.HT_cap_element.MCS_rate[0] << 12) | (pHT_caps->u.HT_cap_element.MCS_rate[1] << 20)); -+ -+ return mask; -+} -+ -+int support_short_GI(_adapter *padapter, struct HT_caps_element *pHT_caps) -+{ -+ unsigned char bit_offset; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if (!(pmlmeinfo->HT_enable)) -+ return _FAIL; -+ -+ if ((pmlmeinfo->assoc_AP_vendor == ralinkAP)) -+ return _FAIL; -+ -+ bit_offset = (pmlmeext->cur_bwmode & HT_CHANNEL_WIDTH_40)? 6: 5; -+ -+ if (pHT_caps->u.HT_cap_element.HT_caps_info & (0x1 << bit_offset)) -+ { -+ return _SUCCESS; -+ } -+ else -+ { -+ return _FAIL; -+ } -+} -+ -+unsigned char get_highest_rate_idx(u32 mask) -+{ -+ int i; -+ unsigned char rate_idx=0; -+ -+ for(i=27; i>=0; i--) -+ { -+ if(mask & BIT(i)) -+ { -+ rate_idx = i; -+ break; -+ } -+ } -+ -+ return rate_idx; -+} -+ -+unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps); -+unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps) -+{ -+ int i, mcs_rate; -+ -+ mcs_rate = (pHT_caps->u.HT_cap_element.MCS_rate[0] | (pHT_caps->u.HT_cap_element.MCS_rate[1] << 8)); -+ -+ for (i = 15; i >= 0; i--) -+ { -+ if (mcs_rate & (0x1 << i)) -+ { -+ break; -+ } -+ } -+ -+ return i; -+} -+ -+void Update_RA_Entry(_adapter *padapter, u32 mac_id) -+{ -+ rtw_hal_update_ra_mask(padapter, mac_id); -+} -+ -+void enable_rate_adaptive(_adapter *padapter, u32 mac_id); -+void enable_rate_adaptive(_adapter *padapter, u32 mac_id) -+{ -+ Update_RA_Entry(padapter, mac_id); -+} -+ -+void set_sta_rate(_adapter *padapter, struct sta_info *psta) -+{ -+ //rate adaptive -+ enable_rate_adaptive(padapter, psta->mac_id); -+} -+ -+// Update RRSR and Rate for USERATE -+void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode) -+{ -+ NDIS_802_11_RATES_EX supported_rates; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+ -+ // Added by Albert 2011/03/22 -+ // In the P2P mode, the driver should not support the b mode. -+ // So, the Tx packet shouldn't use the CCK rate -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ return; -+#endif //CONFIG_P2P -+#ifdef CONFIG_INTEL_WIDI -+ if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) -+ return; -+#endif //CONFIG_INTEL_WIDI -+ -+ _rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX); -+ -+ //clear B mod if current channel is in 5G band, avoid tx cck rate in 5G band. -+ if(pmlmeext->cur_channel > 14) -+ wirelessmode &= ~(WIRELESS_11B); -+ -+ if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B)) { -+ _rtw_memcpy(supported_rates, rtw_basic_rate_cck, 4); -+ } else if (wirelessmode & WIRELESS_11B) { -+ _rtw_memcpy(supported_rates, rtw_basic_rate_mix, 7); -+ } else { -+ _rtw_memcpy(supported_rates, rtw_basic_rate_ofdm, 3); -+ } -+ -+ if (wirelessmode & WIRELESS_11B) -+ update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB); -+ else -+ update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, supported_rates); -+} -+ -+unsigned char check_assoc_AP(u8 *pframe, uint len) -+{ -+ unsigned int i; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ -+ for (i = sizeof(NDIS_802_11_FIXED_IEs); i < len;) -+ { -+ pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + i); -+ -+ switch (pIE->ElementID) -+ { -+ case _VENDOR_SPECIFIC_IE_: -+ if ((_rtw_memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (_rtw_memcmp(pIE->data, ARTHEROS_OUI2, 3))) -+ { -+ DBG_871X("link to Artheros AP\n"); -+ return atherosAP; -+ } -+ else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3)) -+ || (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3)) -+ || (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3))) -+ { -+ DBG_871X("link to Broadcom AP\n"); -+ return broadcomAP; -+ } -+ else if (_rtw_memcmp(pIE->data, MARVELL_OUI, 3)) -+ { -+ DBG_871X("link to Marvell AP\n"); -+ return marvellAP; -+ } -+ else if (_rtw_memcmp(pIE->data, RALINK_OUI, 3)) -+ { -+ DBG_871X("link to Ralink AP\n"); -+ return ralinkAP; -+ } -+ else if (_rtw_memcmp(pIE->data, CISCO_OUI, 3)) -+ { -+ DBG_871X("link to Cisco AP\n"); -+ return ciscoAP; -+ } -+ else if (_rtw_memcmp(pIE->data, REALTEK_OUI, 3)) -+ { -+ DBG_871X("link to Realtek 96B\n"); -+ return realtekAP; -+ } -+ else if (_rtw_memcmp(pIE->data, AIRGOCAP_OUI,3)) -+ { -+ DBG_871X("link to Airgo Cap\n"); -+ return airgocapAP; -+ } -+ else -+ { -+ break; -+ } -+ -+ default: -+ break; -+ } -+ -+ i += (pIE->Length + 2); -+ } -+ -+ DBG_871X("link to new AP\n"); -+ return unknownAP; -+} -+ -+void update_IOT_info(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ switch (pmlmeinfo->assoc_AP_vendor) -+ { -+ case marvellAP: -+ pmlmeinfo->turboMode_cts2self = 1; -+ pmlmeinfo->turboMode_rtsen = 0; -+ break; -+ -+ case ralinkAP: -+ pmlmeinfo->turboMode_cts2self = 0; -+ pmlmeinfo->turboMode_rtsen = 1; -+ //disable high power -+ Switch_DM_Func(padapter, (~DYNAMIC_FUNC_HP), _FALSE); -+ break; -+ case realtekAP: -+ //rtw_write16(padapter, 0x4cc, 0xffff); -+ //rtw_write16(padapter, 0x546, 0x01c0); -+ //disable high power -+ Switch_DM_Func(padapter, (~DYNAMIC_FUNC_HP), _FALSE); -+ break; -+ default: -+ pmlmeinfo->turboMode_cts2self = 0; -+ pmlmeinfo->turboMode_rtsen = 1; -+ break; -+ } -+ -+} -+ -+void update_capinfo(PADAPTER Adapter, u16 updateCap) -+{ -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ BOOLEAN ShortPreamble; -+ -+ // Check preamble mode, 2005.01.06, by rcnjko. -+ // Mark to update preamble value forever, 2008.03.18 by lanhsin -+ //if( pMgntInfo->RegPreambleMode == PREAMBLE_AUTO ) -+ { -+ -+ if(updateCap & cShortPreamble) -+ { // Short Preamble -+ if(pmlmeinfo->preamble_mode != PREAMBLE_SHORT) // PREAMBLE_LONG or PREAMBLE_AUTO -+ { -+ ShortPreamble = _TRUE; -+ pmlmeinfo->preamble_mode = PREAMBLE_SHORT; -+ rtw_hal_set_hwreg( Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble ); -+ } -+ } -+ else -+ { // Long Preamble -+ if(pmlmeinfo->preamble_mode != PREAMBLE_LONG) // PREAMBLE_SHORT or PREAMBLE_AUTO -+ { -+ ShortPreamble = _FALSE; -+ pmlmeinfo->preamble_mode = PREAMBLE_LONG; -+ rtw_hal_set_hwreg( Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble ); -+ } -+ } -+ } -+ -+ if ( updateCap & cIBSS ) { -+ //Filen: See 802.11-2007 p.91 -+ pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME; -+ } -+ else -+ { -+ //Filen: See 802.11-2007 p.90 -+ if( pmlmeext->cur_wireless_mode & (WIRELESS_11G | WIRELESS_11_24N)) -+ { -+ if( (updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */) -+ { // Short Slot Time -+ if(pmlmeinfo->slotTime != SHORT_SLOT_TIME) -+ { -+ pmlmeinfo->slotTime = SHORT_SLOT_TIME; -+ } -+ } -+ else -+ { // Long Slot Time -+ if(pmlmeinfo->slotTime != NON_SHORT_SLOT_TIME) -+ { -+ pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME; -+ } -+ } -+ } -+ else if( pmlmeext->cur_wireless_mode & (WIRELESS_11A | WIRELESS_11_5N)) -+ { -+ pmlmeinfo->slotTime = SHORT_SLOT_TIME; -+ } -+ else -+ { -+ //B Mode -+ pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME; -+ } -+ } -+ -+ rtw_hal_set_hwreg( Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime ); -+ -+} -+ -+void update_wireless_mode(_adapter *padapter) -+{ -+ u8 init_rate=0; -+ int ratelen, network_type = 0; -+ u32 SIFS_Timer, mask; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ unsigned char *rate = cur_network->SupportedRates; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+#endif //CONFIG_CONCURRENT_MODE -+ -+ ratelen = rtw_get_rateset_len(cur_network->SupportedRates); -+ -+ if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) -+ { -+ pmlmeinfo->HT_enable = 1; -+ } -+ -+ if(pmlmeext->cur_channel > 14) -+ { -+ if (pmlmeinfo->HT_enable) -+ { -+ network_type = WIRELESS_11_5N; -+ } -+ -+ network_type |= WIRELESS_11A; -+ } -+ else -+ { -+ if (pmlmeinfo->HT_enable) -+ { -+ network_type = WIRELESS_11_24N; -+ } -+ -+ if ((cckratesonly_included(rate, ratelen)) == _TRUE) -+ { -+ network_type |= WIRELESS_11B; -+ } -+ else if((cckrates_included(rate, ratelen)) == _TRUE) -+ { -+ network_type |= WIRELESS_11BG; -+ } -+ else -+ { -+ network_type |= WIRELESS_11G; -+ } -+ } -+ -+ pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode; -+ -+ //For STA mode, driver need to modify initial data rate, or MAC will use wrong tx rate. -+ //Modified by Thomas 2012-12-3 -+ mask = update_supported_rate(cur_network->SupportedRates, ratelen); -+ init_rate = get_highest_rate_idx(mask)&0x3f; -+ rtw_hal_set_hwreg( padapter, HW_VAR_INIT_DATA_RATE, (u8 *)&init_rate); -+ -+/* -+ if((pmlmeext->cur_wireless_mode==WIRELESS_11G) || -+ (pmlmeext->cur_wireless_mode==WIRELESS_11BG))//WIRELESS_MODE_G) -+ SIFS_Timer = 0x0a0a;//CCK -+ else -+ SIFS_Timer = 0x0e0e;//pHalData->SifsTime; //OFDM -+*/ -+ -+ SIFS_Timer = 0x0a0a0808; //0x0808 -> for CCK, 0x0a0a -> for OFDM -+ //change this value if having IOT issues. -+ -+ rtw_hal_set_hwreg( padapter, HW_VAR_RESP_SIFS, (u8 *)&SIFS_Timer); -+ -+ if (pmlmeext->cur_wireless_mode & WIRELESS_11B) -+ update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB); -+ else -+ { -+ update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB); -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pbuddy_adapter && (pmlmeext->cur_wireless_mode & WIRELESS_11A)) -+ update_mgnt_tx_rate(pbuddy_adapter, IEEE80211_OFDM_RATE_6MB); -+#endif //CONFIG_CONCURRENT_MODE -+ } -+} -+ -+void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value); -+void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value) -+{ -+#if 0 -+ struct cmd_obj *ph2c; -+ struct reg_rw_parm *pwriteMacPara; -+ struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); -+ -+ if ((ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL) -+ { -+ return; -+ } -+ -+ if ((pwriteMacPara = (struct reg_rw_parm*)rtw_malloc(sizeof(struct reg_rw_parm))) == NULL) -+ { -+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); -+ return; -+ } -+ -+ pwriteMacPara->rw = 1; -+ pwriteMacPara->addr = addr; -+ pwriteMacPara->value = value; -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, pwriteMacPara, GEN_CMD_CODE(_Write_MACREG)); -+ rtw_enqueue_cmd(pcmdpriv, ph2c); -+#endif -+} -+ -+void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id) -+{ -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if(pmlmeext->cur_wireless_mode & WIRELESS_11B) -+ { -+ // Only B, B/G, and B/G/N AP could use CCK rate -+ _rtw_memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_cck, 4); -+ } -+ else -+ { -+ _rtw_memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_ofdm, 3); -+ } -+} -+ -+int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx) -+{ -+ unsigned int ie_len; -+ PNDIS_802_11_VARIABLE_IEs pIE; -+ int supportRateNum = 0; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ pIE = (PNDIS_802_11_VARIABLE_IEs)rtw_get_ie(pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len); -+ if (pIE == NULL) -+ { -+ return _FAIL; -+ } -+ -+ _rtw_memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); -+ supportRateNum = ie_len; -+ -+ pIE = (PNDIS_802_11_VARIABLE_IEs)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len); -+ if (pIE) -+ { -+ _rtw_memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len); -+ } -+ -+ return _SUCCESS; -+ -+} -+ -+void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr) -+{ -+ struct sta_info *psta; -+ u16 tid, start_seq, param; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct ADDBA_request *preq = (struct ADDBA_request*)paddba_req; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ psta = rtw_get_stainfo(pstapriv, addr); -+ -+ if(psta) -+ { -+ start_seq = le16_to_cpu(preq->BA_starting_seqctrl) >> 4; -+ -+ param = le16_to_cpu(preq->BA_para_set); -+ tid = (param>>2)&0x0f; -+ -+ preorder_ctrl = &psta->recvreorder_ctrl[tid]; -+ -+ #ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ -+ preorder_ctrl->indicate_seq = start_seq; -+ #ifdef DBG_RX_SEQ -+ DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __FUNCTION__, __LINE__, -+ preorder_ctrl->indicate_seq, start_seq); -+ #endif -+ #else -+ preorder_ctrl->indicate_seq = 0xffff; -+ #endif -+ -+ preorder_ctrl->enable =(pmlmeinfo->bAcceptAddbaReq == _TRUE)? _TRUE :_FALSE; -+ } -+ -+} -+ -+void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) -+{ -+ u8* pIE; -+ u32 *pbuf; -+ -+ pIE = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); -+ pbuf = (u32*)pIE; -+ -+ pmlmeext->TSFValue = le32_to_cpu(*(pbuf+1)); -+ -+ pmlmeext->TSFValue = pmlmeext->TSFValue << 32; -+ -+ pmlmeext->TSFValue |= le32_to_cpu(*pbuf); -+} -+ -+void correct_TSF(_adapter *padapter, struct mlme_ext_priv *pmlmeext) -+{ -+ rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, 0); -+} -+ -+void beacon_timing_control(_adapter *padapter) -+{ -+ rtw_hal_bcn_related_reg_setting(padapter); -+} -+ -+#if 0 -+unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame) -+{ -+ unsigned short ATIMWindow; -+ unsigned char *pframe; -+ struct tx_desc *ptxdesc; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ unsigned int rate_len, len = 0; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ -+ _rtw_memset(beacon_frame, 0, 256); -+ -+ pframe = beacon_frame + TXDESC_SIZE; -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); -+ -+ SetFrameSubType(pframe, WIFI_BEACON); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ len = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ //timestamp will be inserted by hardware -+ pframe += 8; -+ len += 8; -+ -+ // beacon interval: 2 bytes -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ len += 2; -+ -+ // capability info: 2 bytes -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ len += 2; -+ -+ // SSID -+ pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &len); -+ -+ // supported rates... -+ rate_len = rtw_get_rateset_len(cur_network->SupportedRates); -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8)? 8: rate_len), cur_network->SupportedRates, &len); -+ -+ // DS parameter set -+ pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &len); -+ -+ // IBSS Parameter Set... -+ //ATIMWindow = cur->Configuration.ATIMWindow; -+ ATIMWindow = 0; -+ pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &len); -+ -+ //todo: ERP IE -+ -+ // EXTERNDED SUPPORTED RATE -+ if (rate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &len); -+ } -+ -+ if ((len + TXDESC_SIZE) > 256) -+ { -+ //DBG_871X("marc: beacon frame too large\n"); -+ return 0; -+ } -+ -+ //fill the tx descriptor -+ ptxdesc = (struct tx_desc *)beacon_frame; -+ -+ //offset 0 -+ ptxdesc->txdw0 |= cpu_to_le32(len & 0x0000ffff); -+ ptxdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE + OFFSET_SZ) << OFFSET_SHT) & 0x00ff0000); //default = 32 bytes for TX Desc -+ -+ //offset 4 -+ ptxdesc->txdw1 |= cpu_to_le32((0x10 << QSEL_SHT) & 0x00001f00); -+ -+ //offset 8 -+ ptxdesc->txdw2 |= cpu_to_le32(BMC); -+ ptxdesc->txdw2 |= cpu_to_le32(BK); -+ -+ //offset 16 -+ ptxdesc->txdw4 = 0x80000000; -+ -+ //offset 20 -+ ptxdesc->txdw5 = 0x00000000; //1M -+ -+ return (len + TXDESC_SIZE); -+} -+#endif -+ -+static _adapter *pbuddy_padapter = NULL; -+ -+int rtw_handle_dualmac(_adapter *adapter, bool init) -+{ -+ int status = _SUCCESS; -+ struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); -+ -+ if (!IS_HARDWARE_TYPE_8192D(adapter)) -+ goto exit; -+ -+ if (init) { -+ rtw_hal_get_def_var(adapter, HAL_DEF_DUAL_MAC_MODE, &dvobj->DualMacMode); -+ if (dvobj->DualMacMode == _TRUE) { -+ // temply disable IPS For 92D-VC -+ adapter->registrypriv.ips_mode = IPS_NONE; -+ } -+ -+ /* For SMSP on 92DU-VC, driver do not probe another Interface. */ -+ if ((dvobj->DualMacMode != _TRUE) && (dvobj->InterfaceNumber != 0)) { -+ DBG_871X("%s(): Do not init another Interface because SMSP\n",__FUNCTION__); -+ status = _FAIL; -+ goto exit; -+ } -+ -+#ifndef CONFIG_CONCURRENT_MODE -+ if (dvobj->DualMacMode == _TRUE) { -+ if (pbuddy_padapter == NULL) { -+ pbuddy_padapter = adapter; -+ DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__FUNCTION__); -+ } else { -+ adapter->pbuddy_adapter = pbuddy_padapter; -+ pbuddy_padapter->pbuddy_adapter = adapter; -+ // clear global value -+ pbuddy_padapter = NULL; -+ DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n",__FUNCTION__); -+ } -+ } -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ if (dvobj->InterfaceNumber == 0) { -+ //set adapter_type/iface type -+ adapter->isprimary = _TRUE; -+ adapter->adapter_type = PRIMARY_ADAPTER; -+ adapter->iface_type = IFACE_PORT0; -+ DBG_871X("%s(): PRIMARY_ADAPTER\n",__FUNCTION__); -+ } else { -+ //set adapter_type/iface type -+ adapter->isprimary = _FALSE; -+ adapter->adapter_type = SECONDARY_ADAPTER; -+ adapter->iface_type = IFACE_PORT1; -+ DBG_871X("%s(): SECONDARY_ADAPTER\n",__FUNCTION__); -+ } -+#endif -+#endif -+ }else { -+ pbuddy_padapter = NULL; -+ } -+exit: -+ return status; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c -@@ -0,0 +1,4156 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTW_XMIT_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+#error "Shall be Linux or Windows, but not both!\n" -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+#include -+#endif -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+ -+static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 }; -+static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 }; -+ -+static void _init_txservq(struct tx_servq *ptxservq) -+{ -+_func_enter_; -+ _rtw_init_listhead(&ptxservq->tx_pending); -+ _rtw_init_queue(&ptxservq->sta_pending); -+ ptxservq->qcnt = 0; -+_func_exit_; -+} -+ -+ -+void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv) -+{ -+ -+_func_enter_; -+ -+ _rtw_memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv)); -+ -+ _rtw_spinlock_init(&psta_xmitpriv->lock); -+ -+ //for(i = 0 ; i < MAX_NUMBLKS; i++) -+ // _init_txservq(&(psta_xmitpriv->blk_q[i])); -+ -+ _init_txservq(&psta_xmitpriv->be_q); -+ _init_txservq(&psta_xmitpriv->bk_q); -+ _init_txservq(&psta_xmitpriv->vi_q); -+ _init_txservq(&psta_xmitpriv->vo_q); -+ _rtw_init_listhead(&psta_xmitpriv->legacy_dz); -+ _rtw_init_listhead(&psta_xmitpriv->apsd); -+ -+_func_exit_; -+ -+} -+ -+s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter) -+{ -+ int i; -+ struct xmit_buf *pxmitbuf; -+ struct xmit_frame *pxframe; -+ sint res=_SUCCESS; -+ -+_func_enter_; -+ -+ // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). -+ //_rtw_memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); -+ -+ _rtw_spinlock_init(&pxmitpriv->lock); -+ _rtw_spinlock_init(&pxmitpriv->lock_sctx); -+ _rtw_init_sema(&pxmitpriv->xmit_sema, 0); -+ _rtw_init_sema(&pxmitpriv->terminate_xmitthread_sema, 0); -+ -+ /* -+ Please insert all the queue initializaiton using _rtw_init_queue below -+ */ -+ -+ pxmitpriv->adapter = padapter; -+ -+ //for(i = 0 ; i < MAX_NUMBLKS; i++) -+ // _rtw_init_queue(&pxmitpriv->blk_strms[i]); -+ -+ _rtw_init_queue(&pxmitpriv->be_pending); -+ _rtw_init_queue(&pxmitpriv->bk_pending); -+ _rtw_init_queue(&pxmitpriv->vi_pending); -+ _rtw_init_queue(&pxmitpriv->vo_pending); -+ _rtw_init_queue(&pxmitpriv->bm_pending); -+ -+ //_rtw_init_queue(&pxmitpriv->legacy_dz_queue); -+ //_rtw_init_queue(&pxmitpriv->apsd_queue); -+ -+ _rtw_init_queue(&pxmitpriv->free_xmit_queue); -+ -+ /* -+ Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME, -+ and initialize free_xmit_frame below. -+ Please also apply free_txobj to link_up all the xmit_frames... -+ */ -+ -+ pxmitpriv->pallocated_frame_buf = rtw_zvmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4); -+ -+ if (pxmitpriv->pallocated_frame_buf == NULL){ -+ pxmitpriv->pxmit_frame_buf =NULL; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("alloc xmit_frame fail!\n")); -+ res= _FAIL; -+ goto exit; -+ } -+ pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_frame_buf), 4); -+ //pxmitpriv->pxmit_frame_buf = pxmitpriv->pallocated_frame_buf + 4 - -+ // ((SIZE_PTR) (pxmitpriv->pallocated_frame_buf) &3); -+ -+ pxframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf; -+ -+ for (i = 0; i < NR_XMITFRAME; i++) -+ { -+ _rtw_init_listhead(&(pxframe->list)); -+ -+ pxframe->padapter = padapter; -+ pxframe->frame_tag = NULL_FRAMETAG; -+ -+ pxframe->pkt = NULL; -+ -+ pxframe->buf_addr = NULL; -+ pxframe->pxmitbuf = NULL; -+ -+ rtw_list_insert_tail(&(pxframe->list), &(pxmitpriv->free_xmit_queue.queue)); -+ -+ pxframe++; -+ } -+ -+ pxmitpriv->free_xmitframe_cnt = NR_XMITFRAME; -+ -+ pxmitpriv->frag_len = MAX_FRAG_THRESHOLD; -+ -+ -+ //init xmit_buf -+ _rtw_init_queue(&pxmitpriv->free_xmitbuf_queue); -+ _rtw_init_queue(&pxmitpriv->pending_xmitbuf_queue); -+ -+ pxmitpriv->pallocated_xmitbuf = rtw_zvmalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4); -+ -+ if (pxmitpriv->pallocated_xmitbuf == NULL){ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("alloc xmit_buf fail!\n")); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pxmitpriv->pxmitbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_xmitbuf), 4); -+ //pxmitpriv->pxmitbuf = pxmitpriv->pallocated_xmitbuf + 4 - -+ // ((SIZE_PTR) (pxmitpriv->pallocated_xmitbuf) &3); -+ -+ pxmitbuf = (struct xmit_buf*)pxmitpriv->pxmitbuf; -+ -+ for (i = 0; i < NR_XMITBUFF; i++) -+ { -+ _rtw_init_listhead(&pxmitbuf->list); -+ -+ pxmitbuf->priv_data = NULL; -+ pxmitbuf->padapter = padapter; -+ pxmitbuf->ext_tag = _FALSE; -+ -+/* -+ pxmitbuf->pallocated_buf = rtw_zmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ); -+ if (pxmitbuf->pallocated_buf == NULL) -+ { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ); -+ //pxmitbuf->pbuf = pxmitbuf->pallocated_buf + XMITBUF_ALIGN_SZ -((SIZE_PTR) (pxmitbuf->pallocated_buf) &(XMITBUF_ALIGN_SZ-1)); -+*/ -+ -+ if((res=rtw_os_xmit_resource_alloc(padapter, pxmitbuf,(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ))) == _FAIL) { -+ res= _FAIL; -+ goto exit; -+ } -+ -+#ifdef CONFIG_SDIO_HCI -+ pxmitbuf->phead = pxmitbuf->pbuf; -+ pxmitbuf->pend = pxmitbuf->pbuf + MAX_XMITBUF_SZ; -+ pxmitbuf->len = 0; -+ pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; -+#endif -+ -+ pxmitbuf->flags = XMIT_VO_QUEUE; -+ -+ rtw_list_insert_tail(&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue)); -+ #ifdef DBG_XMIT_BUF -+ pxmitbuf->no=i; -+ #endif -+ -+ pxmitbuf++; -+ -+ } -+ -+ pxmitpriv->free_xmitbuf_cnt = NR_XMITBUFF; -+ -+ /* init xframe_ext queue, the same count as extbuf */ -+ _rtw_init_queue(&pxmitpriv->free_xframe_ext_queue); -+ -+ pxmitpriv->xframe_ext_alloc_addr = rtw_zvmalloc(NR_XMIT_EXTBUFF * sizeof(struct xmit_frame) + 4); -+ -+ if (pxmitpriv->xframe_ext_alloc_addr == NULL){ -+ pxmitpriv->xframe_ext = NULL; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("alloc xframe_ext fail!\n")); -+ res= _FAIL; -+ goto exit; -+ } -+ pxmitpriv->xframe_ext = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->xframe_ext_alloc_addr), 4); -+ pxframe = (struct xmit_frame*)pxmitpriv->xframe_ext; -+ -+ for (i = 0; i < NR_XMIT_EXTBUFF; i++) { -+ _rtw_init_listhead(&(pxframe->list)); -+ -+ pxframe->padapter = padapter; -+ pxframe->frame_tag = NULL_FRAMETAG; -+ -+ pxframe->pkt = NULL; -+ -+ pxframe->buf_addr = NULL; -+ pxframe->pxmitbuf = NULL; -+ -+ pxframe->ext_tag = 1; -+ -+ rtw_list_insert_tail(&(pxframe->list), &(pxmitpriv->free_xframe_ext_queue.queue)); -+ -+ pxframe++; -+ } -+ pxmitpriv->free_xframe_ext_cnt = NR_XMIT_EXTBUFF; -+ -+ // Init xmit extension buff -+ _rtw_init_queue(&pxmitpriv->free_xmit_extbuf_queue); -+ -+ pxmitpriv->pallocated_xmit_extbuf = rtw_zvmalloc(NR_XMIT_EXTBUFF * sizeof(struct xmit_buf) + 4); -+ -+ if (pxmitpriv->pallocated_xmit_extbuf == NULL){ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("alloc xmit_extbuf fail!\n")); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ pxmitpriv->pxmit_extbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_xmit_extbuf), 4); -+ -+ pxmitbuf = (struct xmit_buf*)pxmitpriv->pxmit_extbuf; -+ -+ for (i = 0; i < NR_XMIT_EXTBUFF; i++) -+ { -+ _rtw_init_listhead(&pxmitbuf->list); -+ -+ pxmitbuf->priv_data = NULL; -+ pxmitbuf->padapter = padapter; -+ pxmitbuf->ext_tag = _TRUE; -+ -+/* -+ pxmitbuf->pallocated_buf = rtw_zmalloc(MAX_XMIT_EXTBUF_SZ); -+ if (pxmitbuf->pallocated_buf == NULL) -+ { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated_buf), 4); -+*/ -+ -+ if((res=rtw_os_xmit_resource_alloc(padapter, pxmitbuf,MAX_XMIT_EXTBUF_SZ + XMITBUF_ALIGN_SZ)) == _FAIL) { -+ res= _FAIL; -+ goto exit; -+ } -+ -+#ifdef CONFIG_SDIO_HCI -+ pxmitbuf->phead = pxmitbuf->pbuf; -+ pxmitbuf->pend = pxmitbuf->pbuf + MAX_XMIT_EXTBUF_SZ; -+ pxmitbuf->len = 0; -+ pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; -+#endif -+ -+ rtw_list_insert_tail(&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); -+ #ifdef DBG_XMIT_BUF -+ pxmitbuf->no=i; -+ #endif -+ pxmitbuf++; -+ -+ } -+ -+ pxmitpriv->free_xmit_extbuf_cnt = NR_XMIT_EXTBUFF; -+ -+ rtw_alloc_hwxmits(padapter); -+ rtw_init_hwxmits(pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); -+ -+#ifdef CONFIG_USB_HCI -+ pxmitpriv->txirp_cnt=1; -+ -+ _rtw_init_sema(&(pxmitpriv->tx_retevt), 0); -+ -+ //per AC pending irp -+ pxmitpriv->beq_cnt = 0; -+ pxmitpriv->bkq_cnt = 0; -+ pxmitpriv->viq_cnt = 0; -+ pxmitpriv->voq_cnt = 0; -+#endif -+ -+ -+#ifdef CONFIG_XMIT_ACK -+ pxmitpriv->ack_tx = _FALSE; -+ _rtw_mutex_init(&pxmitpriv->ack_tx_mutex); -+ rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); -+#endif -+ -+ rtw_hal_init_xmit_priv(padapter); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv); -+void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv) -+{ -+ _rtw_spinlock_free(&pxmitpriv->lock); -+ _rtw_free_sema(&pxmitpriv->xmit_sema); -+ _rtw_free_sema(&pxmitpriv->terminate_xmitthread_sema); -+ -+ _rtw_spinlock_free(&pxmitpriv->be_pending.lock); -+ _rtw_spinlock_free(&pxmitpriv->bk_pending.lock); -+ _rtw_spinlock_free(&pxmitpriv->vi_pending.lock); -+ _rtw_spinlock_free(&pxmitpriv->vo_pending.lock); -+ _rtw_spinlock_free(&pxmitpriv->bm_pending.lock); -+ -+ //_rtw_spinlock_free(&pxmitpriv->legacy_dz_queue.lock); -+ //_rtw_spinlock_free(&pxmitpriv->apsd_queue.lock); -+ -+ _rtw_spinlock_free(&pxmitpriv->free_xmit_queue.lock); -+ _rtw_spinlock_free(&pxmitpriv->free_xmitbuf_queue.lock); -+ _rtw_spinlock_free(&pxmitpriv->pending_xmitbuf_queue.lock); -+} -+ -+ -+void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) -+{ -+ int i; -+ _adapter *padapter = pxmitpriv->adapter; -+ struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf; -+ struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; -+ -+ _func_enter_; -+ -+ rtw_hal_free_xmit_priv(padapter); -+ -+ rtw_mfree_xmit_priv_lock(pxmitpriv); -+ -+ if(pxmitpriv->pxmit_frame_buf==NULL) -+ goto out; -+ -+ for(i=0; ipallocated_buf) -+ // rtw_mfree(pxmitbuf->pallocated_buf, MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ); -+ -+ pxmitbuf++; -+ } -+ -+ if(pxmitpriv->pallocated_frame_buf) { -+ rtw_vmfree(pxmitpriv->pallocated_frame_buf, NR_XMITFRAME * sizeof(struct xmit_frame) + 4); -+ } -+ -+ -+ if(pxmitpriv->pallocated_xmitbuf) { -+ rtw_vmfree(pxmitpriv->pallocated_xmitbuf, NR_XMITBUFF * sizeof(struct xmit_buf) + 4); -+ } -+ -+ /* free xframe_ext queue, the same count as extbuf */ -+ if ((pxmitframe = (struct xmit_frame*)pxmitpriv->xframe_ext)) { -+ for (i=0; ixframe_ext_alloc_addr) -+ rtw_vmfree(pxmitpriv->xframe_ext_alloc_addr, NR_XMIT_EXTBUFF * sizeof(struct xmit_frame) + 4); -+ _rtw_spinlock_free(&pxmitpriv->free_xframe_ext_queue.lock); -+ -+ // free xmit extension buff -+ _rtw_spinlock_free(&pxmitpriv->free_xmit_extbuf_queue.lock); -+ -+ pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf; -+ for(i=0; ipallocated_buf) -+ // rtw_mfree(pxmitbuf->pallocated_buf, MAX_XMIT_EXTBUF_SZ); -+ -+ pxmitbuf++; -+ } -+ -+ if(pxmitpriv->pallocated_xmit_extbuf) { -+ rtw_vmfree(pxmitpriv->pallocated_xmit_extbuf, NR_XMIT_EXTBUFF * sizeof(struct xmit_buf) + 4); -+ } -+ -+ rtw_free_hwxmits(padapter); -+ -+#ifdef CONFIG_XMIT_ACK -+ _rtw_mutex_free(&pxmitpriv->ack_tx_mutex); -+#endif -+ -+out: -+ -+_func_exit_; -+ -+} -+ -+static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ u32 sz; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct sta_info *psta = pattrib->psta; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ if(pattrib->psta) -+ { -+ psta = pattrib->psta; -+ } -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ psta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] ); -+ } -+ -+ if(psta==NULL) -+ { -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return; -+ } -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return; -+ } -+ -+ if (pattrib->nr_frags != 1) -+ { -+ sz = padapter->xmitpriv.frag_len; -+ } -+ else //no frag -+ { -+ sz = pattrib->last_txcmdsz; -+ } -+ -+ // (1) RTS_Threshold is compared to the MPDU, not MSDU. -+ // (2) If there are more than one frag in this MSDU, only the first frag uses protection frame. -+ // Other fragments are protected by previous fragment. -+ // So we only need to check the length of first fragment. -+ if(pmlmeext->cur_wireless_mode < WIRELESS_11_24N || padapter->registrypriv.wifi_spec) -+ { -+ if(sz > padapter->registrypriv.rts_thresh) -+ { -+ pattrib->vcs_mode = RTS_CTS; -+ } -+ else -+ { -+ if(psta->rtsen) -+ pattrib->vcs_mode = RTS_CTS; -+ else if(psta->cts2self) -+ pattrib->vcs_mode = CTS_TO_SELF; -+ else -+ pattrib->vcs_mode = NONE_VCS; -+ } -+ } -+ else -+ { -+ while (_TRUE) -+ { -+#if 0 //Todo -+ //check IOT action -+ if(pHTInfo->IOTAction & HT_IOT_ACT_FORCED_CTS2SELF) -+ { -+ pattrib->vcs_mode = CTS_TO_SELF; -+ pattrib->rts_rate = MGN_24M; -+ break; -+ } -+ else if(pHTInfo->IOTAction & (HT_IOT_ACT_FORCED_RTS|HT_IOT_ACT_PURE_N_MODE)) -+ { -+ pattrib->vcs_mode = RTS_CTS; -+ pattrib->rts_rate = MGN_24M; -+ break; -+ } -+#endif -+ -+ //IOT action -+ if((pmlmeinfo->assoc_AP_vendor == atherosAP) && (pattrib->ampdu_en==_TRUE) && -+ (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_ )) -+ { -+ pattrib->vcs_mode = CTS_TO_SELF; -+ break; -+ } -+ -+ -+ //check ERP protection -+ if(psta->rtsen || psta->cts2self) -+ { -+ if(psta->rtsen) -+ pattrib->vcs_mode = RTS_CTS; -+ else if(psta->cts2self) -+ pattrib->vcs_mode = CTS_TO_SELF; -+ -+ break; -+ } -+ -+ //check HT op mode -+ if(pattrib->ht_en) -+ { -+ u8 HTOpMode = pmlmeinfo->HT_protection; -+ if((pmlmeext->cur_bwmode && (HTOpMode == 2 || HTOpMode == 3)) || -+ (!pmlmeext->cur_bwmode && HTOpMode == 3) ) -+ { -+ pattrib->vcs_mode = RTS_CTS; -+ break; -+ } -+ } -+ -+ //check rts -+ if(sz > padapter->registrypriv.rts_thresh) -+ { -+ pattrib->vcs_mode = RTS_CTS; -+ break; -+ } -+ -+ //to do list: check MIMO power save condition. -+ -+ //check AMPDU aggregation for TXOP -+ if(pattrib->ampdu_en==_TRUE) -+ { -+ pattrib->vcs_mode = RTS_CTS; -+ break; -+ } -+ -+ pattrib->vcs_mode = NONE_VCS; -+ break; -+ } -+ } -+} -+ -+static void update_attrib_phy_info(struct pkt_attrib *pattrib, struct sta_info *psta) -+{ -+ /*if(psta->rtsen) -+ pattrib->vcs_mode = RTS_CTS; -+ else if(psta->cts2self) -+ pattrib->vcs_mode = CTS_TO_SELF; -+ else -+ pattrib->vcs_mode = NONE_VCS;*/ -+ -+ pattrib->mdata = 0; -+ pattrib->eosp = 0; -+ pattrib->triggered=0; -+ -+ //qos_en, ht_en, init rate, ,bw, ch_offset, sgi -+ pattrib->qos_en = psta->qos_option; -+ pattrib->ht_en = psta->htpriv.ht_option; -+ pattrib->raid = psta->raid; -+ pattrib->bwmode = psta->htpriv.bwmode; -+ pattrib->ch_offset = psta->htpriv.ch_offset; -+ pattrib->sgi= psta->htpriv.sgi; -+ pattrib->ampdu_en = _FALSE; -+ -+ //if(pattrib->ht_en && psta->htpriv.ampdu_enable) -+ //{ -+ // if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) -+ // pattrib->ampdu_en = _TRUE; -+ //} -+ -+ -+ pattrib->retry_ctrl = _FALSE; -+ -+} -+ -+u8 qos_acm(u8 acm_mask, u8 priority) -+{ -+ u8 change_priority = priority; -+ -+ switch (priority) -+ { -+ case 0: -+ case 3: -+ if(acm_mask & BIT(1)) -+ change_priority = 1; -+ break; -+ case 1: -+ case 2: -+ break; -+ case 4: -+ case 5: -+ if(acm_mask & BIT(2)) -+ change_priority = 0; -+ break; -+ case 6: -+ case 7: -+ if(acm_mask & BIT(3)) -+ change_priority = 5; -+ break; -+ default: -+ DBG_871X("qos_acm(): invalid pattrib->priority: %d!!!\n", priority); -+ break; -+ } -+ -+ return change_priority; -+} -+ -+static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) -+{ -+ struct ethhdr etherhdr; -+ struct iphdr ip_hdr; -+ s32 UserPriority = 0; -+ -+ -+ _rtw_open_pktfile(ppktfile->pkt, ppktfile); -+ _rtw_pktfile_read(ppktfile, (unsigned char*)ðerhdr, ETH_HLEN); -+ -+ // get UserPriority from IP hdr -+ if (pattrib->ether_type == 0x0800) { -+ _rtw_pktfile_read(ppktfile, (u8*)&ip_hdr, sizeof(ip_hdr)); -+// UserPriority = (ntohs(ip_hdr.tos) >> 5) & 0x3; -+ UserPriority = ip_hdr.tos >> 5; -+ } else if (pattrib->ether_type == 0x888e) { -+ // "When priority processing of data frames is supported, -+ // a STA's SME should send EAPOL-Key frames at the highest priority." -+ UserPriority = 7; -+ } -+ -+ pattrib->priority = UserPriority; -+ pattrib->hdrlen = WLAN_HDR_A3_QOS_LEN; -+ pattrib->subtype = WIFI_QOS_DATA_TYPE; -+} -+ -+static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib) -+{ -+ uint i; -+ struct pkt_file pktfile; -+ struct sta_info *psta = NULL; -+ struct ethhdr etherhdr; -+ -+ sint bmcast; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct qos_priv *pqospriv= &pmlmepriv->qospriv; -+ sint res = _SUCCESS; -+ -+ _func_enter_; -+ -+ _rtw_open_pktfile(pkt, &pktfile); -+ i = _rtw_pktfile_read(&pktfile, (u8*)ðerhdr, ETH_HLEN); -+ -+ pattrib->ether_type = ntohs(etherhdr.h_proto); -+ -+ -+ _rtw_memcpy(pattrib->dst, ðerhdr.h_dest, ETH_ALEN); -+ _rtw_memcpy(pattrib->src, ðerhdr.h_source, ETH_ALEN); -+ -+ pattrib->pctrl = 0; -+ -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { -+ _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ } -+ else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { -+ _rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ } -+ else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { -+ _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN); -+ } -+ -+ pattrib->pktlen = pktfile.pkt_len; -+ -+ if (ETH_P_IP == pattrib->ether_type) -+ { -+ // The following is for DHCP and ARP packet, we use cck1M to tx these packets and let LPS awake some time -+ // to prevent DHCP protocol fail -+ u8 tmp[24]; -+ _rtw_pktfile_read(&pktfile, &tmp[0], 24); -+ pattrib->dhcp_pkt = 0; -+ if (pktfile.pkt_len > 282) {//MINIMUM_DHCP_PACKET_SIZE) { -+ if (ETH_P_IP == pattrib->ether_type) {// IP header -+ if (((tmp[21] == 68) && (tmp[23] == 67)) || -+ ((tmp[21] == 67) && (tmp[23] == 68))) { -+ // 68 : UDP BOOTP client -+ // 67 : UDP BOOTP server -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("======================update_attrib: get DHCP Packet \n")); -+ // Use low rate to send DHCP packet. -+ //if(pMgntInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) -+ //{ -+ // tcb_desc->DataRate = MgntQuery_TxRateExcludeCCKRates(ieee);//0xc;//ofdm 6m -+ // tcb_desc->bTxDisableRateFallBack = false; -+ //} -+ //else -+ // pTcb->DataRate = Adapter->MgntInfo.LowestBasicRate; -+ //RTPRINT(FDM, WA_IOT, ("DHCP TranslateHeader(), pTcb->DataRate = 0x%x\n", pTcb->DataRate)); -+ pattrib->dhcp_pkt = 1; -+ } -+ } -+ } -+ } -+ -+ if ( (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) ) -+ { -+ rtw_set_scan_deny(padapter, 3000); -+ } -+ -+#ifdef CONFIG_LPS -+ // If EAPOL , ARP , OR DHCP packet, driver must be in active mode. -+ if ( (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) ) -+ { -+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1); -+ } -+#endif -+ -+ bmcast = IS_MCAST(pattrib->ra); -+ -+ // get sta_info -+ if (bmcast) { -+ psta = rtw_get_bcmc_stainfo(padapter); -+ } else { -+ psta = rtw_get_stainfo(pstapriv, pattrib->ra); -+ if (psta == NULL) { // if we cannot get psta => drrp the pkt -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra))); -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra)); -+ #endif -+ res =_FAIL; -+ goto exit; -+ } -+ else if((check_fwstate(pmlmepriv, WIFI_AP_STATE)==_TRUE)&&(!(psta->state & _FW_LINKED))) -+ { -+ res =_FAIL; -+ goto exit; -+ } -+ } -+ -+ if (psta) -+ { -+ pattrib->mac_id = psta->mac_id; -+ pattrib->psta = psta; -+ } -+ else -+ { -+ // if we cannot get psta => drop the pkt -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra))); -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra)); -+ #endif -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pattrib->ack_policy = 0; -+ // get ether_hdr_len -+ pattrib->pkt_hdrlen = ETH_HLEN;//(pattrib->ether_type == 0x8100) ? (14 + 4 ): 14; //vlan tag -+ -+ pattrib->hdrlen = WLAN_HDR_A3_LEN; -+ pattrib->subtype = WIFI_DATA_TYPE; -+ pattrib->priority = 0; -+ -+ if (check_fwstate(pmlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE)) -+ { -+ if(psta->qos_option) -+ set_qos(&pktfile, pattrib); -+ } -+ else -+ { -+ if(pqospriv->qos_option) -+ { -+ set_qos(&pktfile, pattrib); -+ -+ if(pmlmepriv->acm_mask != 0) -+ { -+ pattrib->priority = qos_acm(pmlmepriv->acm_mask, pattrib->priority); -+ } -+ } -+ } -+ -+ //pattrib->priority = 5; //force to used VI queue, for testing -+ -+ if (psta->ieee8021x_blocked == _TRUE) -+ { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == _TRUE \n")); -+ -+ pattrib->encrypt = 0; -+ -+ if((pattrib->ether_type != 0x888e) && (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _FALSE)) -+ { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type)); -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%.4x) != 0x888e\n", __FUNCTION__,pattrib->ether_type); -+ #endif -+ res = _FAIL; -+ goto exit; -+ } -+ } -+ else -+ { -+ GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, bmcast); -+ -+ switch(psecuritypriv->dot11AuthAlgrthm) -+ { -+ case dot11AuthAlgrthm_Open: -+ case dot11AuthAlgrthm_Shared: -+ case dot11AuthAlgrthm_Auto: -+ pattrib->key_idx = (u8)psecuritypriv->dot11PrivacyKeyIndex; -+ break; -+ case dot11AuthAlgrthm_8021X: -+ if(bmcast) -+ pattrib->key_idx = (u8)psecuritypriv->dot118021XGrpKeyid; -+ else -+ pattrib->key_idx = 0; -+ break; -+ default: -+ pattrib->key_idx = 0; -+ break; -+ } -+ -+ -+ } -+ -+ switch (pattrib->encrypt) -+ { -+ case _WEP40_: -+ case _WEP104_: -+ pattrib->iv_len = 4; -+ pattrib->icv_len = 4; -+ break; -+ -+ case _TKIP_: -+ pattrib->iv_len = 8; -+ pattrib->icv_len = 4; -+ -+ if(padapter->securitypriv.busetkipkey==_FAIL) -+ { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npadapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", padapter->securitypriv.busetkipkey)); -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __FUNCTION__, padapter->securitypriv.busetkipkey); -+ #endif -+ res =_FAIL; -+ goto exit; -+ } -+ -+ break; -+ case _AES_: -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n pattrib->encrypt=%d (_AES_)\n",pattrib->encrypt)); -+ pattrib->iv_len = 8; -+ pattrib->icv_len = 8; -+ break; -+ -+ default: -+ pattrib->iv_len = 0; -+ pattrib->icv_len = 0; -+ break; -+ } -+ -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, -+ ("update_attrib: encrypt=%d securitypriv.sw_encrypt=%d\n", -+ pattrib->encrypt, padapter->securitypriv.sw_encrypt)); -+ -+ if (pattrib->encrypt && -+ ((padapter->securitypriv.sw_encrypt == _TRUE) || (psecuritypriv->hw_decrypted == _FALSE))) -+ { -+ pattrib->bswenc = _TRUE; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_, -+ ("update_attrib: encrypt=%d securitypriv.hw_decrypted=%d bswenc=_TRUE\n", -+ pattrib->encrypt, padapter->securitypriv.sw_encrypt)); -+ } else { -+ pattrib->bswenc = _FALSE; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("update_attrib: bswenc=_FALSE\n")); -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if((pattrib->encrypt && bmcast) || (pattrib->encrypt ==_WEP40_) || (pattrib->encrypt ==_WEP104_)) -+ { -+ pattrib->bswenc = _TRUE;//force using sw enc. -+ } -+#endif -+ -+ rtw_set_tx_chksum_offload(pkt, pattrib); -+ -+ update_attrib_phy_info(pattrib, psta); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+static s32 xmitframe_addmic(_adapter *padapter, struct xmit_frame *pxmitframe){ -+ sint curfragnum,length; -+ u8 *pframe, *payload,mic[8]; -+ struct mic_data micdata; -+ struct sta_info *stainfo; -+ struct qos_priv *pqospriv= &(padapter->mlmepriv.qospriv); -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct security_priv *psecuritypriv=&padapter->securitypriv; -+ struct xmit_priv *pxmitpriv=&padapter->xmitpriv; -+ u8 priority[4]={0x0,0x0,0x0,0x0}; -+ sint bmcst = IS_MCAST(pattrib->ra); -+ -+ if(pattrib->psta) -+ { -+ stainfo = pattrib->psta; -+ } -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ stainfo=rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0]); -+ } -+ -+ if(stainfo==NULL) -+ { -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return _FAIL; -+ } -+ -+ if(!(stainfo->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state); -+ return _FAIL; -+ } -+ -+_func_enter_; -+ -+ if(pattrib->encrypt ==_TKIP_)//if(psecuritypriv->dot11PrivacyAlgrthm==_TKIP_PRIVACY_) -+ { -+ //encode mic code -+ if(stainfo!= NULL){ -+ u8 null_key[16]={0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}; -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pframe = pxmitframe->buf_addr + TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ); -+#else -+ pframe = pxmitframe->buf_addr + TXDESC_OFFSET; -+#endif -+ -+ if(bmcst) -+ { -+ if(_rtw_memcmp(psecuritypriv->dot118021XGrptxmickey[psecuritypriv->dot118021XGrpKeyid].skey, null_key, 16)==_TRUE){ -+ //DbgPrint("\nxmitframe_addmic:stainfo->dot11tkiptxmickey==0\n"); -+ //rtw_msleep_os(10); -+ return _FAIL; -+ } -+ //start to calculate the mic code -+ rtw_secmicsetkey(&micdata, psecuritypriv->dot118021XGrptxmickey[psecuritypriv->dot118021XGrpKeyid].skey); -+ } -+ else -+ { -+ if(_rtw_memcmp(&stainfo->dot11tkiptxmickey.skey[0],null_key, 16)==_TRUE){ -+ //DbgPrint("\nxmitframe_addmic:stainfo->dot11tkiptxmickey==0\n"); -+ //rtw_msleep_os(10); -+ return _FAIL; -+ } -+ //start to calculate the mic code -+ rtw_secmicsetkey(&micdata, &stainfo->dot11tkiptxmickey.skey[0]); -+ } -+ -+ if(pframe[1]&1){ //ToDS==1 -+ rtw_secmicappend(&micdata, &pframe[16], 6); //DA -+ if(pframe[1]&2) //From Ds==1 -+ rtw_secmicappend(&micdata, &pframe[24], 6); -+ else -+ rtw_secmicappend(&micdata, &pframe[10], 6); -+ } -+ else{ //ToDS==0 -+ rtw_secmicappend(&micdata, &pframe[4], 6); //DA -+ if(pframe[1]&2) //From Ds==1 -+ rtw_secmicappend(&micdata, &pframe[16], 6); -+ else -+ rtw_secmicappend(&micdata, &pframe[10], 6); -+ -+ } -+ -+ //if(pqospriv->qos_option==1) -+ if(pattrib->qos_en) -+ priority[0]=(u8)pxmitframe->attrib.priority; -+ -+ -+ rtw_secmicappend(&micdata, &priority[0], 4); -+ -+ payload=pframe; -+ -+ for(curfragnum=0;curfragnumnr_frags;curfragnum++){ -+ payload=(u8 *)RND4((SIZE_PTR)(payload)); -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("===curfragnum=%d, pframe= 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n", -+ curfragnum,*payload, *(payload+1),*(payload+2),*(payload+3),*(payload+4),*(payload+5),*(payload+6),*(payload+7))); -+ -+ payload=payload+pattrib->hdrlen+pattrib->iv_len; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("curfragnum=%d pattrib->hdrlen=%d pattrib->iv_len=%d",curfragnum,pattrib->hdrlen,pattrib->iv_len)); -+ if((curfragnum+1)==pattrib->nr_frags){ -+ length=pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-( (pattrib->bswenc) ? pattrib->icv_len : 0); -+ rtw_secmicappend(&micdata, payload,length); -+ payload=payload+length; -+ } -+ else{ -+ length=pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-( (pattrib->bswenc) ? pattrib->icv_len : 0); -+ rtw_secmicappend(&micdata, payload, length); -+ payload=payload+length+pattrib->icv_len; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("curfragnum=%d length=%d pattrib->icv_len=%d",curfragnum,length,pattrib->icv_len)); -+ } -+ } -+ rtw_secgetmic(&micdata,&(mic[0])); -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: before add mic code!!!\n")); -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: pattrib->last_txcmdsz=%d!!!\n",pattrib->last_txcmdsz)); -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: mic[0]=0x%.2x ,mic[1]=0x%.2x ,mic[2]=0x%.2x ,mic[3]=0x%.2x \n\ -+ mic[4]=0x%.2x ,mic[5]=0x%.2x ,mic[6]=0x%.2x ,mic[7]=0x%.2x !!!!\n", -+ mic[0],mic[1],mic[2],mic[3],mic[4],mic[5],mic[6],mic[7])); -+ //add mic code and add the mic code length in last_txcmdsz -+ -+ _rtw_memcpy(payload, &(mic[0]),8); -+ pattrib->last_txcmdsz+=8; -+ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("\n ========last pkt========\n")); -+ payload=payload-pattrib->last_txcmdsz+8; -+ for(curfragnum=0;curfragnumlast_txcmdsz;curfragnum=curfragnum+8) -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,(" %.2x, %.2x, %.2x, %.2x, %.2x, %.2x, %.2x, %.2x ", -+ *(payload+curfragnum), *(payload+curfragnum+1), *(payload+curfragnum+2),*(payload+curfragnum+3), -+ *(payload+curfragnum+4),*(payload+curfragnum+5),*(payload+curfragnum+6),*(payload+curfragnum+7))); -+ } -+ else{ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: rtw_get_stainfo==NULL!!!\n")); -+ } -+ } -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+static s32 xmitframe_swencrypt(_adapter *padapter, struct xmit_frame *pxmitframe){ -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ //struct security_priv *psecuritypriv=&padapter->securitypriv; -+ -+_func_enter_; -+ -+ //if((psecuritypriv->sw_encrypt)||(pattrib->bswenc)) -+ if(pattrib->bswenc) -+ { -+ //DBG_871X("start xmitframe_swencrypt\n"); -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_alert_,("### xmitframe_swencrypt\n")); -+ switch(pattrib->encrypt){ -+ case _WEP40_: -+ case _WEP104_: -+ rtw_wep_encrypt(padapter, (u8 *)pxmitframe); -+ break; -+ case _TKIP_: -+ rtw_tkip_encrypt(padapter, (u8 *)pxmitframe); -+ break; -+ case _AES_: -+ rtw_aes_encrypt(padapter, (u8 * )pxmitframe); -+ break; -+ default: -+ break; -+ } -+ -+ } else { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_notice_,("### xmitframe_hwencrypt\n")); -+ } -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+s32 rtw_make_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib) -+{ -+ u16 *qc; -+ -+ struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct qos_priv *pqospriv = &pmlmepriv->qospriv; -+ u8 qos_option = _FALSE; -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *ptdls_sta=NULL, *psta_backup=NULL; -+ u8 direct_link=0; -+#endif //CONFIG_TDLS -+ -+ sint res = _SUCCESS; -+ u16 *fctrl = &pwlanhdr->frame_ctl; -+ -+ struct sta_info *psta; -+ -+ sint bmcst = IS_MCAST(pattrib->ra); -+ -+_func_enter_; -+ -+ if (pattrib->psta) { -+ psta = pattrib->psta; -+ } else { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ if(bmcst) { -+ psta = rtw_get_bcmc_stainfo(padapter); -+ } else { -+ psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); -+ } -+ } -+ -+ if(psta==NULL) -+ { -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return _FAIL; -+ } -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return _FAIL; -+ } -+ -+ _rtw_memset(hdr, 0, WLANHDR_OFFSET); -+ -+ SetFrameSubType(fctrl, pattrib->subtype); -+ -+ if (pattrib->subtype & WIFI_DATA_TYPE) -+ { -+ if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)) { -+ //to_ds = 1, fr_ds = 0; -+#ifdef CONFIG_TDLS -+ if((ptdlsinfo->setup_state == TDLS_LINKED_STATE)){ -+ ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst); -+ if((ptdls_sta!=NULL)&&(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)&&(pattrib->ether_type!=0x0806)){ -+ //TDLS data transfer, ToDS=0, FrDs=0 -+ _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); -+ direct_link=1; -+ }else{ -+ // 1.Data transfer to AP -+ // 2.Arp pkt will relayed by AP -+ SetToDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN); -+ } -+ }else -+#endif //CONFIG_TDLS -+ { -+ //Data transfer to AP -+ SetToDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN); -+ } -+ -+ if (pqospriv->qos_option) -+ qos_option = _TRUE; -+ -+ } -+ else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) ) { -+ //to_ds = 0, fr_ds = 1; -+ SetFrDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN); -+ -+ if(psta->qos_option) -+ qos_option = _TRUE; -+ } -+ else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { -+ _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); -+ -+ if(psta->qos_option) -+ qos_option = _TRUE; -+ } -+ else { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv))); -+ res = _FAIL; -+ goto exit; -+ } -+ -+ if(pattrib->mdata) -+ SetMData(fctrl); -+ -+ if (pattrib->encrypt) -+ SetPrivacy(fctrl); -+ -+ if (qos_option) -+ { -+ qc = (unsigned short *)(hdr + pattrib->hdrlen - 2); -+ -+ if (pattrib->priority) -+ SetPriority(qc, pattrib->priority); -+ -+ SetEOSP(qc, pattrib->eosp); -+ -+ SetAckpolicy(qc, pattrib->ack_policy); -+ } -+ -+ //TODO: fill HT Control Field -+ -+ //Update Seq Num will be handled by f/w -+ { -+ if(psta){ -+#ifdef CONFIG_TDLS -+ if(direct_link==1) -+ { -+ psta_backup = psta; -+ psta = ptdls_sta; -+ } -+#endif //CONFIG_TDLS -+ -+ psta->sta_xmitpriv.txseq_tid[pattrib->priority]++; -+ psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF; -+ -+ pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority]; -+ -+ SetSeqNum(hdr, pattrib->seqnum); -+ -+ -+ //check if enable ampdu -+ if(pattrib->ht_en && psta->htpriv.ampdu_enable) -+ { -+ if(psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority)) -+ pattrib->ampdu_en = _TRUE; -+ } -+ -+ //re-check if enable ampdu by BA_starting_seqctrl -+ if(pattrib->ampdu_en == _TRUE) -+ { -+ u16 tx_seq; -+ -+ tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f]; -+ -+ //check BA_starting_seqctrl -+ if(SN_LESS(pattrib->seqnum, tx_seq)) -+ { -+ //DBG_871X("tx ampdu seqnum(%d) < tx_seq(%d)\n", pattrib->seqnum, tx_seq); -+ pattrib->ampdu_en = _FALSE;//AGG BK -+ } -+ else if(SN_EQUAL(pattrib->seqnum, tx_seq)) -+ { -+ psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq+1)&0xfff; -+ -+ pattrib->ampdu_en = _TRUE;//AGG EN -+ } -+ else -+ { -+ //DBG_871X("tx ampdu over run\n"); -+ psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff; -+ pattrib->ampdu_en = _TRUE;//AGG EN -+ } -+ -+ } -+ -+#ifdef CONFIG_TDLS -+ if(direct_link==1) -+ { -+ if (pattrib->encrypt){ -+ pattrib->encrypt= _AES_; -+ pattrib->iv_len=8; -+ pattrib->icv_len=8; -+ } -+ -+ //qos_en, ht_en, init rate, ,bw, ch_offset, sgi -+ //pattrib->qos_en = ptdls_sta->qos_option; -+ pattrib->ht_en = ptdls_sta->htpriv.ht_option; -+ pattrib->raid = ptdls_sta->raid; -+ pattrib->bwmode = ptdls_sta->htpriv.bwmode; -+ pattrib->ch_offset = ptdls_sta->htpriv.ch_offset; -+ pattrib->sgi= ptdls_sta->htpriv.sgi; -+ -+ pattrib->mac_id = ptdls_sta->mac_id; -+ -+ psta = psta_backup; -+ } -+#endif //CONFIG_TDLS -+ -+ } -+ } -+ -+ } -+ else -+ { -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+s32 rtw_txframes_pending(_adapter *padapter) -+{ -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ return ((_rtw_queue_empty(&pxmitpriv->be_pending) == _FALSE) || -+ (_rtw_queue_empty(&pxmitpriv->bk_pending) == _FALSE) || -+ (_rtw_queue_empty(&pxmitpriv->vi_pending) == _FALSE) || -+ (_rtw_queue_empty(&pxmitpriv->vo_pending) == _FALSE)); -+} -+ -+s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib) -+{ -+ struct sta_info *psta; -+ struct tx_servq *ptxservq; -+ int priority = pattrib->priority; -+ -+ if(pattrib->psta) -+ { -+ psta = pattrib->psta; -+ } -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ psta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0]); -+ } -+ -+ if(psta==NULL) -+ { -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return 0; -+ } -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return 0; -+ } -+ -+ switch(priority) -+ { -+ case 1: -+ case 2: -+ ptxservq = &(psta->sta_xmitpriv.bk_q); -+ break; -+ case 4: -+ case 5: -+ ptxservq = &(psta->sta_xmitpriv.vi_q); -+ break; -+ case 6: -+ case 7: -+ ptxservq = &(psta->sta_xmitpriv.vo_q); -+ break; -+ case 0: -+ case 3: -+ default: -+ ptxservq = &(psta->sta_xmitpriv.be_q); -+ break; -+ -+ } -+ -+ return ptxservq->qcnt; -+} -+ -+#ifdef CONFIG_TDLS -+ -+int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action) -+{ -+ int res=_SUCCESS; -+ -+ switch(action){ -+ case TDLS_SETUP_REQUEST: -+ rtw_build_tdls_setup_req_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_SETUP_RESPONSE: -+ rtw_build_tdls_setup_rsp_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_SETUP_CONFIRM: -+ rtw_build_tdls_setup_cfm_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_TEARDOWN: -+ rtw_build_tdls_teardown_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_DISCOVERY_REQUEST: -+ rtw_build_tdls_dis_req_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_PEER_TRAFFIC_INDICATION: -+ rtw_build_tdls_peer_traffic_indication_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_CHANNEL_SWITCH_REQUEST: -+ rtw_build_tdls_ch_switch_req_ies(padapter, pxmitframe, pframe); -+ break; -+ case TDLS_CHANNEL_SWITCH_RESPONSE: -+ rtw_build_tdls_ch_switch_rsp_ies(padapter, pxmitframe, pframe); -+ break; -+#ifdef CONFIG_WFD -+ case TUNNELED_PROBE_REQ: -+ rtw_build_tunneled_probe_req_ies(padapter, pxmitframe, pframe); -+ break; -+ case TUNNELED_PROBE_RSP: -+ rtw_build_tunneled_probe_rsp_ies(padapter, pxmitframe, pframe); -+ break; -+#endif //CONFIG_WFD -+ default: -+ res=_FAIL; -+ break; -+ } -+ -+ return res; -+} -+ -+s32 rtw_make_tdls_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action) -+{ -+ u16 *qc; -+ struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct qos_priv *pqospriv = &pmlmepriv->qospriv; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct sta_info *psta=NULL, *ptdls_sta=NULL; -+ u8 tdls_seq=0, baddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -+ -+ sint res = _SUCCESS; -+ u16 *fctrl = &pwlanhdr->frame_ctl; -+ -+_func_enter_; -+ -+ _rtw_memset(hdr, 0, WLANHDR_OFFSET); -+ -+ SetFrameSubType(fctrl, pattrib->subtype); -+ -+ switch(action){ -+ case TDLS_SETUP_REQUEST: -+ case TDLS_SETUP_RESPONSE: -+ case TDLS_SETUP_CONFIRM: -+ case TDLS_TEARDOWN: //directly to peer STA or via AP -+ case TDLS_PEER_TRAFFIC_INDICATION: -+ case TDLS_PEER_PSM_REQUEST: //directly to peer STA or via AP -+ case TUNNELED_PROBE_REQ: -+ case TUNNELED_PROBE_RSP: -+ SetToDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN); -+ break; -+ case TDLS_CHANNEL_SWITCH_REQUEST: -+ case TDLS_CHANNEL_SWITCH_RESPONSE: -+ case TDLS_PEER_PSM_RESPONSE: -+ case TDLS_PEER_TRAFFIC_RESPONSE: -+ _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); -+ tdls_seq=1; -+ break; -+ case TDLS_DISCOVERY_REQUEST: //unicast: directly to peer sta, Bcast: via AP -+ if(_rtw_memcmp(pattrib->dst, baddr, ETH_ALEN) ) -+ { -+ SetToDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN); -+ } -+ else -+ { -+ _rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); -+ tdls_seq=1; -+ } -+ break; -+ } -+ -+ if (pattrib->encrypt) -+ SetPrivacy(fctrl); -+ -+ if (pqospriv->qos_option) -+ { -+ qc = (unsigned short *)(hdr + pattrib->hdrlen - 2); -+ if (pattrib->priority) -+ SetPriority(qc, pattrib->priority); -+ SetAckpolicy(qc, pattrib->ack_policy); -+ } -+ -+ psta = pattrib->psta; -+ -+ // 1. update seq_num per link by sta_info -+ // 2. rewrite encrypt to _AES_, also rewrite iv_len, icv_len -+ if(tdls_seq==1){ -+ ptdls_sta=rtw_get_stainfo(pstapriv, pattrib->dst); -+ if(ptdls_sta){ -+ ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority]++; -+ ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF; -+ pattrib->seqnum = ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority]; -+ SetSeqNum(hdr, pattrib->seqnum); -+ -+ if (pattrib->encrypt){ -+ pattrib->encrypt= _AES_; -+ pattrib->iv_len=8; -+ pattrib->icv_len=8; -+ } -+ }else{ -+ res=_FAIL; -+ goto exit; -+ } -+ }else if(psta){ -+ psta->sta_xmitpriv.txseq_tid[pattrib->priority]++; -+ psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF; -+ pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority]; -+ SetSeqNum(hdr, pattrib->seqnum); -+ } -+ -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+s32 rtw_xmit_tdls_coalesce(_adapter * padapter, struct xmit_frame * pxmitframe, u8 action) -+{ -+ s32 llc_sz; -+ -+ u8 *pframe, *mem_start; -+ -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ u8 *pbuf_start; -+ s32 bmcst = IS_MCAST(pattrib->ra); -+ s32 res = _SUCCESS; -+ -+_func_enter_; -+ -+ if (pattrib->psta) { -+ psta = pattrib->psta; -+ } else { -+ if(bmcst) { -+ psta = rtw_get_bcmc_stainfo(padapter); -+ } else { -+ psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); -+ } -+ } -+ -+ if(psta==NULL) -+ return _FAIL; -+ -+ if (pxmitframe->buf_addr == NULL) -+ return _FAIL; -+ -+ pbuf_start = pxmitframe->buf_addr; -+ mem_start = pbuf_start + TXDESC_OFFSET; -+ -+ if (rtw_make_tdls_wlanhdr(padapter, mem_start, pattrib, action) == _FAIL) { -+ res = _FAIL; -+ goto exit; -+ } -+ -+ pframe = mem_start; -+ pframe += pattrib->hdrlen; -+ -+ //adding icv, if necessary... -+ if (pattrib->iv_len) -+ { -+ if (psta != NULL) -+ { -+ switch(pattrib->encrypt) -+ { -+ case _WEP40_: -+ case _WEP104_: -+ WEP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); -+ break; -+ case _TKIP_: -+ if(bmcst) -+ TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); -+ else -+ TKIP_IV(pattrib->iv, psta->dot11txpn, 0); -+ break; -+ case _AES_: -+ if(bmcst) -+ AES_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); -+ else -+ AES_IV(pattrib->iv, psta->dot11txpn, 0); -+ break; -+ } -+ } -+ -+ _rtw_memcpy(pframe, pattrib->iv, pattrib->iv_len); -+ pframe += pattrib->iv_len; -+ -+ } -+ -+ llc_sz = rtw_put_snap(pframe, pattrib->ether_type); -+ pframe += llc_sz; -+ -+ //pattrib->pktlen will be counted in rtw_build_tdls_ies -+ pattrib->pktlen = 0; -+ -+ rtw_build_tdls_ies(padapter, pxmitframe, pframe, action); -+ -+ if ((pattrib->icv_len >0 )&& (pattrib->bswenc)) { -+ pframe += pattrib->pktlen; -+ _rtw_memcpy(pframe, pattrib->icv, pattrib->icv_len); -+ pframe += pattrib->icv_len; -+ } -+ -+ pattrib->nr_frags = 1; -+ pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + llc_sz + -+ ((pattrib->bswenc) ? pattrib->icv_len : 0) + pattrib->pktlen; -+ -+ if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) -+ { -+ goto exit; -+ } -+ -+ xmitframe_swencrypt(padapter, pxmitframe); -+ -+ update_attrib_vcs_info(padapter, pxmitframe); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+#endif //CONFIG_TDLS -+ -+/* -+ * Calculate wlan 802.11 packet MAX size from pkt_attrib -+ * This function doesn't consider fragment case -+ */ -+u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib) -+{ -+ u32 len = 0; -+ -+ len = pattrib->hdrlen + pattrib->iv_len; // WLAN Header and IV -+ len += SNAP_SIZE + sizeof(u16); // LLC -+ len += pattrib->pktlen; -+ if (pattrib->encrypt == _TKIP_) len += 8; // MIC -+ len += pattrib->icv_len; // ICV -+ -+ return len; -+} -+ -+/* -+ -+This sub-routine will perform all the following: -+ -+1. remove 802.3 header. -+2. create wlan_header, based on the info in pxmitframe -+3. append sta's iv/ext-iv -+4. append LLC -+5. move frag chunk from pframe to pxmitframe->mem -+6. apply sw-encrypt, if necessary. -+ -+*/ -+s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) -+{ -+ struct pkt_file pktfile; -+ -+ s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz; -+ -+ SIZE_PTR addr; -+ -+ u8 *pframe, *mem_start; -+ -+ struct sta_info *psta; -+ //struct sta_priv *pstapriv = &padapter->stapriv; -+ //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ -+ u8 *pbuf_start; -+ -+ s32 bmcst = IS_MCAST(pattrib->ra); -+ s32 res = _SUCCESS; -+ -+_func_enter_; -+ -+ if (pattrib->psta) -+ { -+ psta = pattrib->psta; -+ } else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); -+ } -+ -+ if(psta==NULL) -+ { -+ -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return _FAIL; -+ } -+ -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return _FAIL; -+ } -+ -+ if (pxmitframe->buf_addr == NULL){ -+ DBG_8192C("==> %s buf_addr==NULL \n",__FUNCTION__); -+ return _FAIL; -+ } -+ -+ pbuf_start = pxmitframe->buf_addr; -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ mem_start = pbuf_start + TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ); -+#else -+ mem_start = pbuf_start + TXDESC_OFFSET; -+#endif -+ -+ if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) { -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n")); -+ res = _FAIL; -+ goto exit; -+ } -+ -+ _rtw_open_pktfile(pkt, &pktfile); -+ _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); -+ -+ frg_inx = 0; -+ frg_len = pxmitpriv->frag_len - 4;//2346-4 = 2342 -+ -+ while (1) -+ { -+ llc_sz = 0; -+ -+ mpdu_len = frg_len; -+ -+ pframe = mem_start; -+ -+ SetMFrag(mem_start); -+ -+ pframe += pattrib->hdrlen; -+ mpdu_len -= pattrib->hdrlen; -+ -+ //adding icv, if necessary... -+ if (pattrib->iv_len) -+ { -+ //if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) -+ // psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); -+ //else -+ // psta = rtw_get_stainfo(pstapriv, pattrib->ra); -+ -+ if (psta != NULL) -+ { -+ switch(pattrib->encrypt) -+ { -+ case _WEP40_: -+ case _WEP104_: -+ WEP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); -+ break; -+ case _TKIP_: -+ if(bmcst) -+ TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); -+ else -+ TKIP_IV(pattrib->iv, psta->dot11txpn, 0); -+ break; -+ case _AES_: -+ if(bmcst) -+ AES_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); -+ else -+ AES_IV(pattrib->iv, psta->dot11txpn, 0); -+ break; -+ } -+ } -+ -+ _rtw_memcpy(pframe, pattrib->iv, pattrib->iv_len); -+ -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, -+ ("rtw_xmitframe_coalesce: keyid=%d pattrib->iv[3]=%.2x pframe=%.2x %.2x %.2x %.2x\n", -+ padapter->securitypriv.dot11PrivacyKeyIndex, pattrib->iv[3], *pframe, *(pframe+1), *(pframe+2), *(pframe+3))); -+ -+ pframe += pattrib->iv_len; -+ -+ mpdu_len -= pattrib->iv_len; -+ } -+ -+ if (frg_inx == 0) { -+ llc_sz = rtw_put_snap(pframe, pattrib->ether_type); -+ pframe += llc_sz; -+ mpdu_len -= llc_sz; -+ } -+ -+ if ((pattrib->icv_len >0) && (pattrib->bswenc)) { -+ mpdu_len -= pattrib->icv_len; -+ } -+ -+ -+ if (bmcst) { -+ // don't do fragment to broadcat/multicast packets -+ mem_sz = _rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen); -+ } else { -+ mem_sz = _rtw_pktfile_read(&pktfile, pframe, mpdu_len); -+ } -+ -+ pframe += mem_sz; -+ -+ if ((pattrib->icv_len >0 )&& (pattrib->bswenc)) { -+ _rtw_memcpy(pframe, pattrib->icv, pattrib->icv_len); -+ pframe += pattrib->icv_len; -+ } -+ -+ frg_inx++; -+ -+ if (bmcst || (rtw_endofpktfile(&pktfile) == _TRUE)) -+ { -+ pattrib->nr_frags = frg_inx; -+ -+ pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags==1)? llc_sz:0) + -+ ((pattrib->bswenc) ? pattrib->icv_len : 0) + mem_sz; -+ -+ ClearMFrag(mem_start); -+ -+ break; -+ } else { -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __FUNCTION__)); -+ } -+ -+ addr = (SIZE_PTR)(pframe); -+ -+ mem_start = (unsigned char *)RND4(addr) + TXDESC_OFFSET; -+ _rtw_memcpy(mem_start, pbuf_start + TXDESC_OFFSET, pattrib->hdrlen); -+ } -+ -+ if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) -+ { -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n")); -+ res = _FAIL; -+ goto exit; -+ } -+ -+ xmitframe_swencrypt(padapter, pxmitframe); -+ -+ if(bmcst == _FALSE) -+ update_attrib_vcs_info(padapter, pxmitframe); -+ else -+ pattrib->vcs_mode = NONE_VCS; -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+#ifdef CONFIG_IEEE80211W -+//broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption -+s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) -+{ -+ struct pkt_file pktfile; -+ s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz; -+ SIZE_PTR addr; -+ u8 *pframe, *mem_start = NULL, *tmp_buf=NULL; -+ u8 hw_hdr_offset, subtype ; -+ struct sta_info *psta = NULL; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ u8 *pbuf_start; -+ s32 bmcst = IS_MCAST(pattrib->ra); -+ s32 res = _FAIL; -+ u8 *BIP_AAD=NULL; -+ u8 *MGMT_body=NULL; -+ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u8 MME[_MME_IE_LENGTH_]; -+ -+ _irqL irqL; -+ u32 ori_len; -+ mem_start = pframe = (u8 *)(pxmitframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+_func_enter_; -+ ori_len = BIP_AAD_SIZE+pattrib->pktlen; -+ tmp_buf = BIP_AAD = rtw_zmalloc(ori_len); -+ subtype = GetFrameSubType(pframe); //bit(7)~bit(2) -+ -+ if(BIP_AAD == NULL) -+ return _FAIL; -+ -+ _enter_critical_bh(&padapter->security_key_mutex, &irqL); -+ -+ //only support station mode -+ if(!check_fwstate(pmlmepriv, WIFI_STATION_STATE) || !check_fwstate(pmlmepriv, _FW_LINKED)) -+ goto xmitframe_coalesce_success; -+ -+ //IGTK key is not install, it may not support 802.11w -+ if(padapter->securitypriv.binstallBIPkey != _TRUE) -+ { -+ DBG_871X("no instll BIP key\n"); -+ goto xmitframe_coalesce_success; -+ } -+ //station mode doesn't need TX BIP, just ready the code -+ if(bmcst) -+ { -+ int frame_body_len; -+ u8 mic[16]; -+ -+ _rtw_memset(MME, 0, 18); -+ -+ //other types doesn't need the BIP -+ if(GetFrameSubType(pframe) != WIFI_DEAUTH && GetFrameSubType(pframe) != WIFI_DISASSOC) -+ goto xmitframe_coalesce_fail; -+ -+ MGMT_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); -+ pframe += pattrib->pktlen; -+ -+ //octent 0 and 1 is key index ,BIP keyid is 4 or 5, LSB only need octent 0 -+ MME[0]=padapter->securitypriv.dot11wBIPKeyid; -+ //copy packet number -+ _rtw_memcpy(&MME[2], &pmlmeext->mgnt_80211w_IPN, 6); -+ //increase the packet number -+ pmlmeext->mgnt_80211w_IPN++; -+ -+ //add MME IE with MIC all zero, MME string doesn't include element id and length -+ pframe = rtw_set_ie(pframe, _MME_IE_ , 16 , MME, &(pattrib->pktlen)); -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ // total frame length - header length -+ frame_body_len = pattrib->pktlen - sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ //conscruct AAD, copy frame control field -+ _rtw_memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2); -+ ClearRetry(BIP_AAD); -+ ClearPwrMgt(BIP_AAD); -+ ClearMData(BIP_AAD); -+ //conscruct AAD, copy address 1 to address 3 -+ _rtw_memcpy(BIP_AAD+2, pwlanhdr->addr1, 18); -+ //copy management fram body -+ _rtw_memcpy(BIP_AAD+BIP_AAD_SIZE, MGMT_body, frame_body_len); -+ /*//dump total packet include MME with zero MIC -+ { -+ int i; -+ printk("Total packet: "); -+ for(i=0; i < BIP_AAD_SIZE+frame_body_len; i++) -+ printk(" %02x ", BIP_AAD[i]); -+ printk("\n"); -+ }*/ -+ //calculate mic -+ if(omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyid].skey -+ , BIP_AAD, BIP_AAD_SIZE+frame_body_len, mic)) -+ goto xmitframe_coalesce_fail; -+ -+ /*//dump calculated mic result -+ { -+ int i; -+ printk("Calculated mic result: "); -+ for(i=0; i<16; i++) -+ printk(" %02x ", mic[i]); -+ printk("\n"); -+ }*/ -+ //copy right BIP mic value, total is 128bits, we use the 0~63 bits -+ _rtw_memcpy(pframe-8, mic, 8); -+ /*/dump all packet after mic ok -+ { -+ int pp; -+ printk("pattrib->pktlen = %d \n", pattrib->pktlen); -+ for(pp=0;pp< pattrib->pktlen; pp++) -+ printk(" %02x ", mem_start[pp]); -+ printk("\n"); -+ }*/ -+ } -+ else //unicast mgmt frame TX -+ { -+ //start to encrypt mgmt frame -+ if(subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC || -+ subtype == WIFI_REASSOCREQ || subtype == WIFI_ACTION) -+ { -+ if (pattrib->psta) -+ psta = pattrib->psta; -+ else -+ { -+ psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); -+ } -+ -+ if(psta==NULL) -+ { -+ -+ DBG_871X("%s, psta==NUL\n", __func__); -+ goto xmitframe_coalesce_fail; -+ } -+ -+ if(!(psta->state & _FW_LINKED) || pxmitframe->buf_addr==NULL) -+ { -+ DBG_871X("%s, not _FW_LINKED or addr null\n", __func__); -+ goto xmitframe_coalesce_fail; -+ } -+ -+ //DBG_871X("%s, action frame category=%d \n", __func__, pframe[WLAN_HDR_A3_LEN]); -+ //according 802.11-2012 standard, these five types are not robust types -+ if(subtype == WIFI_ACTION && -+ (pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_PUBLIC || -+ pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_HT || -+ pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_UNPROTECTED_WNM || -+ pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_SELF_PROTECTED || -+ pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_P2P)) -+ goto xmitframe_coalesce_fail; -+ //before encrypt dump the management packet content -+ /*{ -+ int i; -+ printk("Management pkt: "); -+ for(i=0; ipktlen; i++) -+ printk(" %02x ", pframe[i]); -+ printk("=======\n"); -+ }*/ -+ if(pattrib->encrypt>0) -+ _rtw_memcpy(pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey, 16); -+ //bakeup original management packet -+ _rtw_memcpy(tmp_buf, pframe, pattrib->pktlen); -+ //move to data portion -+ pframe += pattrib->hdrlen; -+ -+ //802.11w unicast management packet must be _AES_ -+ pattrib->iv_len = 8; -+ //it's MIC of AES -+ pattrib->icv_len = 8; -+ -+ switch(pattrib->encrypt) -+ { -+ case _AES_: -+ //set AES IV header -+ AES_IV(pattrib->iv, psta->dot11wtxpn, 0); -+ break; -+ default: -+ goto xmitframe_coalesce_fail; -+ } -+ //insert iv header into management frame -+ _rtw_memcpy(pframe, pattrib->iv, pattrib->iv_len); -+ pframe += pattrib->iv_len; -+ //copy mgmt data portion after CCMP header -+ _rtw_memcpy(pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen); -+ //move pframe to end of mgmt pkt -+ pframe += pattrib->pktlen-pattrib->hdrlen; -+ //add 8 bytes CCMP IV header to length -+ pattrib->pktlen += pattrib->iv_len; -+ /*//dump management packet include AES IV header -+ { -+ int i; -+ printk("Management pkt + IV: "); -+ //for(i=0; ipktlen; i++) -+ //printk(" %02x ", mem_start[i]); -+ printk("@@@@@@@@@@@@@\n"); -+ }*/ -+ -+ if ((pattrib->icv_len >0 )&& (pattrib->bswenc)) { -+ _rtw_memcpy(pframe, pattrib->icv, pattrib->icv_len); -+ pframe += pattrib->icv_len; -+ } -+ //add 8 bytes MIC -+ pattrib->pktlen += pattrib->icv_len; -+ //set final tx command size -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ //set protected bit must be beofre SW encrypt -+ SetPrivacy(mem_start); -+ /*//dump management packet include AES header -+ { -+ int i; -+ printk("prepare to enc Management pkt + IV: "); -+ for(i=0; ipktlen; i++) -+ printk(" %02x ", mem_start[i]); -+ printk("@@@@@@@@@@@@@\n"); -+ }*/ -+ //software encrypt -+ xmitframe_swencrypt(padapter, pxmitframe); -+ } -+ } -+ -+xmitframe_coalesce_success: -+ _exit_critical_bh(&padapter->security_key_mutex, &irqL); -+ rtw_mfree(BIP_AAD, ori_len); -+_func_exit_; -+ return _SUCCESS; -+ -+xmitframe_coalesce_fail: -+ _exit_critical_bh(&padapter->security_key_mutex, &irqL); -+ rtw_mfree(BIP_AAD, ori_len); -+_func_exit_; -+ -+ return _FAIL; -+} -+#endif //CONFIG_IEEE80211W -+ -+/* Logical Link Control(LLC) SubNetwork Attachment Point(SNAP) header -+ * IEEE LLC/SNAP header contains 8 octets -+ * First 3 octets comprise the LLC portion -+ * SNAP portion, 5 octets, is divided into two fields: -+ * Organizationally Unique Identifier(OUI), 3 octets, -+ * type, defined by that organization, 2 octets. -+ */ -+s32 rtw_put_snap(u8 *data, u16 h_proto) -+{ -+ struct ieee80211_snap_hdr *snap; -+ u8 *oui; -+ -+_func_enter_; -+ -+ snap = (struct ieee80211_snap_hdr *)data; -+ snap->dsap = 0xaa; -+ snap->ssap = 0xaa; -+ snap->ctrl = 0x03; -+ -+ if (h_proto == 0x8137 || h_proto == 0x80f3) -+ oui = P802_1H_OUI; -+ else -+ oui = RFC1042_OUI; -+ -+ snap->oui[0] = oui[0]; -+ snap->oui[1] = oui[1]; -+ snap->oui[2] = oui[2]; -+ -+ *(u16 *)(data + SNAP_SIZE) = htons(h_proto); -+ -+_func_exit_; -+ -+ return SNAP_SIZE + sizeof(u16); -+} -+ -+void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len) -+{ -+ -+ uint protection; -+ u8 *perp; -+ sint erp_len; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ -+_func_enter_; -+ -+ switch(pxmitpriv->vcs_setting) -+ { -+ case DISABLE_VCS: -+ pxmitpriv->vcs = NONE_VCS; -+ break; -+ -+ case ENABLE_VCS: -+ break; -+ -+ case AUTO_VCS: -+ default: -+ perp = rtw_get_ie(ie, _ERPINFO_IE_, &erp_len, ie_len); -+ if(perp == NULL) -+ { -+ pxmitpriv->vcs = NONE_VCS; -+ } -+ else -+ { -+ protection = (*(perp + 2)) & BIT(1); -+ if (protection) -+ { -+ if(pregistrypriv->vcs_type == RTS_CTS) -+ pxmitpriv->vcs = RTS_CTS; -+ else -+ pxmitpriv->vcs = CTS_TO_SELF; -+ } -+ else -+ pxmitpriv->vcs = NONE_VCS; -+ } -+ -+ break; -+ -+ } -+ -+_func_exit_; -+ -+} -+ -+void rtw_count_tx_stats(_adapter *padapter, struct xmit_frame *pxmitframe, int sz) -+{ -+ struct sta_info *psta = NULL; -+ struct stainfo_stats *pstats = NULL; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) -+ { -+ pxmitpriv->tx_bytes += sz; -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pxmitframe->agg_num; -+#else -+ pmlmepriv->LinkDetectInfo.NumTxOkInPeriod++; -+#endif -+ -+ psta = pxmitframe->attrib.psta; -+ -+ if(psta) -+ { -+ pstats = &psta->sta_stats; -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pstats->tx_pkts += pxmitframe->agg_num; -+#else -+ pstats->tx_pkts++; -+#endif -+ pstats->tx_bytes += sz; -+ } -+ } -+ -+} -+ -+struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) -+{ -+ _irqL irqL; -+ struct xmit_buf *pxmitbuf = NULL; -+ _list *plist, *phead; -+ _queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; -+ -+_func_enter_; -+ -+ _enter_critical(&pfree_queue->lock, &irqL); -+ -+ if(_rtw_queue_empty(pfree_queue) == _TRUE) { -+ pxmitbuf = NULL; -+ } else { -+ -+ phead = get_list_head(pfree_queue); -+ -+ plist = get_next(phead); -+ -+ pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); -+ -+ rtw_list_delete(&(pxmitbuf->list)); -+ } -+ -+ if (pxmitbuf != NULL) -+ { -+ pxmitpriv->free_xmit_extbuf_cnt--; -+ #ifdef DBG_XMIT_BUF -+ DBG_871X("DBG_XMIT_BUF ALLOC no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt); -+ #endif -+ -+ -+ pxmitbuf->priv_data = NULL; -+ -+#ifdef CONFIG_SDIO_HCI -+ pxmitbuf->len = 0; -+ pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; -+#endif -+#ifdef CONFIG_PCI_HCI -+ pxmitbuf->len = 0; -+#endif -+ -+ if (pxmitbuf->sctx) { -+ DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); -+ rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); -+ } -+ -+ } -+ -+ _exit_critical(&pfree_queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return pxmitbuf; -+} -+ -+s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) -+{ -+ _irqL irqL; -+ _queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; -+ -+_func_enter_; -+ -+ if(pxmitbuf==NULL) -+ { -+ return _FAIL; -+ } -+ -+ _enter_critical(&pfree_queue->lock, &irqL); -+ -+ rtw_list_delete(&pxmitbuf->list); -+ -+ rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue)); -+ pxmitpriv->free_xmit_extbuf_cnt++; -+ #ifdef DBG_XMIT_BUF -+ DBG_871X("DBG_XMIT_BUF FREE no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmit_extbuf_cnt); -+ #endif -+ -+ _exit_critical(&pfree_queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) -+{ -+ _irqL irqL; -+ struct xmit_buf *pxmitbuf = NULL; -+ _list *plist, *phead; -+ _queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; -+ -+_func_enter_; -+ -+ //DBG_871X("+rtw_alloc_xmitbuf\n"); -+ -+ _enter_critical(&pfree_xmitbuf_queue->lock, &irqL); -+ -+ if(_rtw_queue_empty(pfree_xmitbuf_queue) == _TRUE) { -+ pxmitbuf = NULL; -+ } else { -+ -+ phead = get_list_head(pfree_xmitbuf_queue); -+ -+ plist = get_next(phead); -+ -+ pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list); -+ -+ rtw_list_delete(&(pxmitbuf->list)); -+ } -+ -+ if (pxmitbuf != NULL) -+ { -+ pxmitpriv->free_xmitbuf_cnt--; -+ #ifdef DBG_XMIT_BUF -+ DBG_871X("DBG_XMIT_BUF ALLOC no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmitbuf_cnt); -+ #endif -+ //DBG_871X("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); -+ -+ pxmitbuf->priv_data = NULL; -+ -+#ifdef CONFIG_SDIO_HCI -+ pxmitbuf->len = 0; -+ pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead; -+#endif -+#ifdef CONFIG_PCI_HCI -+ pxmitbuf->len = 0; -+#endif -+ -+ if (pxmitbuf->sctx) { -+ DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); -+ rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); -+ } -+ } -+ #ifdef DBG_XMIT_BUF -+ else -+ { -+ DBG_871X("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n"); -+ } -+ #endif -+ -+ _exit_critical(&pfree_xmitbuf_queue->lock, &irqL); -+ -+_func_exit_; -+ -+ return pxmitbuf; -+} -+ -+s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) -+{ -+ _irqL irqL; -+ _queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; -+ -+_func_enter_; -+ -+ //DBG_871X("+rtw_free_xmitbuf\n"); -+ -+ if(pxmitbuf==NULL) -+ { -+ return _FAIL; -+ } -+ -+ if (pxmitbuf->sctx) { -+ DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); -+ rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_FREE); -+ } -+ -+ if(pxmitbuf->ext_tag) -+ { -+ rtw_free_xmitbuf_ext(pxmitpriv, pxmitbuf); -+ } -+ else -+ { -+ _enter_critical(&pfree_xmitbuf_queue->lock, &irqL); -+ -+ rtw_list_delete(&pxmitbuf->list); -+ -+ rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue)); -+ -+ pxmitpriv->free_xmitbuf_cnt++; -+ //DBG_871X("FREE, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); -+ #ifdef DBG_XMIT_BUF -+ DBG_871X("DBG_XMIT_BUF FREE no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmitbuf_cnt); -+ #endif -+ _exit_critical(&pfree_xmitbuf_queue->lock, &irqL); -+ } -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+void rtw_init_xmitframe(struct xmit_frame *pxframe) -+{ -+ if (pxframe != NULL)//default value setting -+ { -+ pxframe->buf_addr = NULL; -+ pxframe->pxmitbuf = NULL; -+ -+ _rtw_memset(&pxframe->attrib, 0, sizeof(struct pkt_attrib)); -+ //pxframe->attrib.psta = NULL; -+ -+ pxframe->frame_tag = DATA_FRAMETAG; -+ -+#ifdef CONFIG_USB_HCI -+ pxframe->pkt = NULL; -+ pxframe->pkt_offset = 1;//default use pkt_offset to fill tx desc -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pxframe->agg_num = 1; -+#endif -+ -+#endif //#ifdef CONFIG_USB_HCI -+ -+#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -+ pxframe->pg_num = 1; -+ pxframe->agg_num = 1; -+#endif -+ -+#ifdef CONFIG_XMIT_ACK -+ pxframe->ack_report = 0; -+#endif -+ -+ } -+} -+ -+/* -+Calling context: -+1. OS_TXENTRY -+2. RXENTRY (rx_thread or RX_ISR/RX_CallBack) -+ -+If we turn on USE_RXTHREAD, then, no need for critical section. -+Otherwise, we must use _enter/_exit critical to protect free_xmit_queue... -+ -+Must be very very cautious... -+ -+*/ -+struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)//(_queue *pfree_xmit_queue) -+{ -+ /* -+ Please remember to use all the osdep_service api, -+ and lock/unlock or _enter/_exit critical to protect -+ pfree_xmit_queue -+ */ -+ -+ _irqL irqL; -+ struct xmit_frame *pxframe = NULL; -+ _list *plist, *phead; -+ _queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; -+#ifdef PLATFORM_LINUX -+ _adapter *padapter = pxmitpriv->adapter; -+#endif //PLATFORM_LINUX -+ -+_func_enter_; -+ -+ _enter_critical_bh(&pfree_xmit_queue->lock, &irqL); -+ -+ if (_rtw_queue_empty(pfree_xmit_queue) == _TRUE) { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_alloc_xmitframe:%d\n", pxmitpriv->free_xmitframe_cnt)); -+ pxframe = NULL; -+ } else { -+ phead = get_list_head(pfree_xmit_queue); -+ -+ plist = get_next(phead); -+ -+ pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list); -+ -+ rtw_list_delete(&(pxframe->list)); -+ pxmitpriv->free_xmitframe_cnt--; -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe():free_xmitframe_cnt=%d\n", pxmitpriv->free_xmitframe_cnt)); -+ } -+ -+#ifdef PLATFORM_LINUX -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) -+ if(pxmitpriv->free_xmitframe_cnt==1) -+ { -+ if (!rtw_netif_queue_stopped(padapter->pnetdev)) -+ rtw_netif_stop_queue(padapter->pnetdev); -+ } -+#endif -+#endif -+ -+ _exit_critical_bh(&pfree_xmit_queue->lock, &irqL); -+ -+ rtw_init_xmitframe(pxframe); -+ -+_func_exit_; -+ -+ return pxframe; -+} -+ -+struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv) -+{ -+ _irqL irqL; -+ struct xmit_frame *pxframe = NULL; -+ _list *plist, *phead; -+ _queue *queue = &pxmitpriv->free_xframe_ext_queue; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ if (_rtw_queue_empty(queue) == _TRUE) { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_alloc_xmitframe_ext:%d\n", pxmitpriv->free_xframe_ext_cnt)); -+ pxframe = NULL; -+ } else { -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list); -+ -+ rtw_list_delete(&(pxframe->list)); -+ pxmitpriv->free_xframe_ext_cnt--; -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe_ext():free_xmitframe_cnt=%d\n", pxmitpriv->free_xframe_ext_cnt)); -+ } -+ -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+ rtw_init_xmitframe(pxframe); -+ -+_func_exit_; -+ -+ return pxframe; -+} -+ -+struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv) -+{ -+ struct xmit_frame *pxframe = NULL; -+ u8 *alloc_addr; -+ -+ alloc_addr = rtw_zmalloc(sizeof(struct xmit_frame) + 4); -+ -+ if (alloc_addr == NULL) -+ goto exit; -+ -+ pxframe = (struct xmit_frame *)N_BYTE_ALIGMENT((SIZE_PTR)(alloc_addr), 4); -+ pxframe->alloc_addr = alloc_addr; -+ -+ pxframe->padapter = pxmitpriv->adapter; -+ pxframe->frame_tag = NULL_FRAMETAG; -+ -+ pxframe->pkt = NULL; -+ -+ pxframe->buf_addr = NULL; -+ pxframe->pxmitbuf = NULL; -+ -+ rtw_init_xmitframe(pxframe); -+ -+ DBG_871X("################## %s ##################\n", __func__); -+ -+exit: -+ return pxframe; -+} -+ -+s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe) -+{ -+ _irqL irqL; -+ _queue *queue = NULL; -+ _adapter *padapter = pxmitpriv->adapter; -+ _pkt *pndis_pkt = NULL; -+ -+_func_enter_; -+ -+ if (pxmitframe == NULL) { -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("======rtw_free_xmitframe():pxmitframe==NULL!!!!!!!!!!\n")); -+ goto exit; -+ } -+ -+ if (pxmitframe->pkt){ -+ pndis_pkt = pxmitframe->pkt; -+ pxmitframe->pkt = NULL; -+ } -+ -+ if (pxmitframe->alloc_addr) { -+ DBG_871X("################## %s with alloc_addr ##################\n", __func__); -+ rtw_mfree(pxmitframe->alloc_addr, sizeof(struct xmit_frame) + 4); -+ goto check_pkt_complete; -+ } -+ -+ if (pxmitframe->ext_tag == 0) -+ queue = &pxmitpriv->free_xmit_queue; -+ else if(pxmitframe->ext_tag == 1) -+ queue = &pxmitpriv->free_xframe_ext_queue; -+ else -+ {} -+ -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ rtw_list_delete(&pxmitframe->list); -+ rtw_list_insert_tail(&pxmitframe->list, get_list_head(queue)); -+ if (pxmitframe->ext_tag == 0) { -+ pxmitpriv->free_xmitframe_cnt++; -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe():free_xmitframe_cnt=%d\n", pxmitpriv->free_xmitframe_cnt)); -+ } else if(pxmitframe->ext_tag == 1) { -+ pxmitpriv->free_xframe_ext_cnt++; -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe():free_xframe_ext_cnt=%d\n", pxmitpriv->free_xframe_ext_cnt)); -+ } else { -+ } -+ -+ _exit_critical_bh(&queue->lock, &irqL); -+ -+check_pkt_complete: -+ -+ if(pndis_pkt) -+ rtw_os_pkt_complete(padapter, pndis_pkt); -+ -+exit: -+ -+_func_exit_; -+ -+ return _SUCCESS; -+} -+ -+void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ struct xmit_frame *pxmitframe; -+ -+_func_enter_; -+ -+ _enter_critical_bh(&(pframequeue->lock), &irqL); -+ -+ phead = get_list_head(pframequeue); -+ plist = get_next(phead); -+ -+ while (rtw_end_of_queue_search(phead, plist) == _FALSE) -+ { -+ -+ pxmitframe = LIST_CONTAINOR(plist, struct xmit_frame, list); -+ -+ plist = get_next(plist); -+ -+ rtw_free_xmitframe(pxmitpriv,pxmitframe); -+ -+ } -+ _exit_critical_bh(&(pframequeue->lock), &irqL); -+ -+_func_exit_; -+} -+ -+s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ if (rtw_xmit_classifier(padapter, pxmitframe) == _FAIL) -+ { -+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, -+ ("rtw_xmitframe_enqueue: drop xmit pkt for classifier fail\n")); -+// pxmitframe->pkt = NULL; -+ return _FAIL; -+ } -+ -+ return _SUCCESS; -+} -+ -+static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, _queue *pframe_queue) -+{ -+ _list *xmitframe_plist, *xmitframe_phead; -+ struct xmit_frame *pxmitframe=NULL; -+ -+ xmitframe_phead = get_list_head(pframe_queue); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+/*#ifdef RTK_DMP_PLATFORM -+#ifdef CONFIG_USB_TX_AGGREGATION -+ if((ptxservq->qcnt>0) && (ptxservq->qcnt<=2)) -+ { -+ pxmitframe = NULL; -+ -+ tasklet_schedule(&pxmitpriv->xmit_tasklet); -+ -+ break; -+ } -+#endif -+#endif*/ -+ rtw_list_delete(&pxmitframe->list); -+ -+ ptxservq->qcnt--; -+ -+ break; -+ -+ pxmitframe = NULL; -+ -+ } -+ -+ return pxmitframe; -+} -+ -+struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry) -+{ -+ _irqL irqL0; -+ _list *sta_plist, *sta_phead; -+ struct hw_xmit *phwxmit; -+ struct tx_servq *ptxservq = NULL; -+ _queue *pframe_queue = NULL; -+ struct xmit_frame *pxmitframe = NULL; -+ _adapter *padapter = pxmitpriv->adapter; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ int i, inx[4]; -+#ifdef CONFIG_USB_HCI -+// int j, tmp, acirp_cnt[4]; -+#endif -+ -+_func_enter_; -+ -+ inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3; -+ -+ if(pregpriv->wifi_spec==1) -+ { -+ int j, tmp, acirp_cnt[4]; -+#if 0 -+ if(flagsvo, 1->vi, 2->be, 3->bk. -+ acirp_cnt[0] = pxmitpriv->voq_cnt; -+ acirp_cnt[1] = pxmitpriv->viq_cnt; -+ acirp_cnt[2] = pxmitpriv->beq_cnt; -+ acirp_cnt[3] = pxmitpriv->bkq_cnt; -+ -+ for(i=0; i<4; i++) -+ { -+ for(j=i+1; j<4; j++) -+ { -+ if(acirp_cnt[j]lock, &irqL0); -+ -+ for(i = 0; i < entry; i++) -+ { -+ phwxmit = phwxmit_i + inx[i]; -+ -+ //_enter_critical_ex(&phwxmit->sta_queue->lock, &irqL0); -+ -+ sta_phead = get_list_head(phwxmit->sta_queue); -+ sta_plist = get_next(sta_phead); -+ -+ while ((rtw_end_of_queue_search(sta_phead, sta_plist)) == _FALSE) -+ { -+ -+ ptxservq= LIST_CONTAINOR(sta_plist, struct tx_servq, tx_pending); -+ -+ pframe_queue = &ptxservq->sta_pending; -+ -+ pxmitframe = dequeue_one_xmitframe(pxmitpriv, phwxmit, ptxservq, pframe_queue); -+ -+ if(pxmitframe) -+ { -+ phwxmit->accnt--; -+ -+ //Remove sta node when there is no pending packets. -+ if(_rtw_queue_empty(pframe_queue)) //must be done after get_next and before break -+ rtw_list_delete(&ptxservq->tx_pending); -+ -+ //_exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); -+ -+ goto exit; -+ } -+ -+ sta_plist = get_next(sta_plist); -+ -+ } -+ -+ //_exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); -+ -+ } -+ -+exit: -+ -+ _exit_critical_bh(&pxmitpriv->lock, &irqL0); -+ -+_func_exit_; -+ -+ return pxmitframe; -+} -+ -+#if 1 -+struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac) -+{ -+ struct tx_servq *ptxservq=NULL; -+ -+_func_enter_; -+ -+ switch (up) -+ { -+ case 1: -+ case 2: -+ ptxservq = &(psta->sta_xmitpriv.bk_q); -+ *(ac) = 3; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK \n")); -+ break; -+ -+ case 4: -+ case 5: -+ ptxservq = &(psta->sta_xmitpriv.vi_q); -+ *(ac) = 1; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VI\n")); -+ break; -+ -+ case 6: -+ case 7: -+ ptxservq = &(psta->sta_xmitpriv.vo_q); -+ *(ac) = 0; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO \n")); -+ break; -+ -+ case 0: -+ case 3: -+ default: -+ ptxservq = &(psta->sta_xmitpriv.be_q); -+ *(ac) = 2; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE \n")); -+ break; -+ -+ } -+ -+_func_exit_; -+ -+ return ptxservq; -+} -+#else -+__inline static struct tx_servq *rtw_get_sta_pending -+ (_adapter *padapter, _queue **ppstapending, struct sta_info *psta, sint up) -+{ -+ struct tx_servq *ptxservq; -+ struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; -+ -+_func_enter_; -+ -+#ifdef CONFIG_RTL8711 -+ -+ if(IS_MCAST(psta->hwaddr)) -+ { -+ ptxservq = &(psta->sta_xmitpriv.be_q); // we will use be_q to queue bc/mc frames in BCMC_stainfo -+ *ppstapending = &padapter->xmitpriv.bm_pending; -+ } -+ else -+#endif -+ { -+ switch (up) -+ { -+ case 1: -+ case 2: -+ ptxservq = &(psta->sta_xmitpriv.bk_q); -+ *ppstapending = &padapter->xmitpriv.bk_pending; -+ (phwxmits+3)->accnt++; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK \n")); -+ break; -+ -+ case 4: -+ case 5: -+ ptxservq = &(psta->sta_xmitpriv.vi_q); -+ *ppstapending = &padapter->xmitpriv.vi_pending; -+ (phwxmits+1)->accnt++; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VI\n")); -+ break; -+ -+ case 6: -+ case 7: -+ ptxservq = &(psta->sta_xmitpriv.vo_q); -+ *ppstapending = &padapter->xmitpriv.vo_pending; -+ (phwxmits+0)->accnt++; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO \n")); -+ break; -+ -+ case 0: -+ case 3: -+ default: -+ ptxservq = &(psta->sta_xmitpriv.be_q); -+ *ppstapending = &padapter->xmitpriv.be_pending; -+ (phwxmits+2)->accnt++; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE \n")); -+ break; -+ -+ } -+ -+ } -+ -+_func_exit_; -+ -+ return ptxservq; -+} -+#endif -+ -+/* -+ * Will enqueue pxmitframe to the proper queue, -+ * and indicate it to xx_pending list..... -+ */ -+s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ //_irqL irqL0; -+ u8 ac_index; -+ struct sta_info *psta; -+ struct tx_servq *ptxservq; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; -+ sint res = _SUCCESS; -+ -+_func_enter_; -+ -+ if (pattrib->psta) { -+ psta = pattrib->psta; -+ } else { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ psta = rtw_get_stainfo(pstapriv, pattrib->ra); -+ } -+ -+ if (psta == NULL) { -+ res = _FAIL; -+ DBG_8192C("rtw_xmit_classifier: psta == NULL\n"); -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("rtw_xmit_classifier: psta == NULL\n")); -+ goto exit; -+ } -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return _FAIL; -+ } -+ -+ ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index)); -+ -+ //_enter_critical(&pstapending->lock, &irqL0); -+ -+ if (rtw_is_list_empty(&ptxservq->tx_pending)) { -+ rtw_list_insert_tail(&ptxservq->tx_pending, get_list_head(phwxmits[ac_index].sta_queue)); -+ } -+ -+ //_enter_critical(&ptxservq->sta_pending.lock, &irqL1); -+ -+ rtw_list_insert_tail(&pxmitframe->list, get_list_head(&ptxservq->sta_pending)); -+ ptxservq->qcnt++; -+ phwxmits[ac_index].accnt++; -+ -+ //_exit_critical(&ptxservq->sta_pending.lock, &irqL1); -+ -+ //_exit_critical(&pstapending->lock, &irqL0); -+ -+exit: -+ -+_func_exit_; -+ -+ return res; -+} -+ -+void rtw_alloc_hwxmits(_adapter *padapter) -+{ -+ struct hw_xmit *hwxmits; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ pxmitpriv->hwxmit_entry = HWXMIT_ENTRY; -+ -+ pxmitpriv->hwxmits = (struct hw_xmit *)rtw_zmalloc(sizeof (struct hw_xmit) * pxmitpriv->hwxmit_entry); -+ -+ hwxmits = pxmitpriv->hwxmits; -+ -+ if(pxmitpriv->hwxmit_entry == 5) -+ { -+ //pxmitpriv->bmc_txqueue.head = 0; -+ //hwxmits[0] .phwtxqueue = &pxmitpriv->bmc_txqueue; -+ hwxmits[0] .sta_queue = &pxmitpriv->bm_pending; -+ -+ //pxmitpriv->vo_txqueue.head = 0; -+ //hwxmits[1] .phwtxqueue = &pxmitpriv->vo_txqueue; -+ hwxmits[1] .sta_queue = &pxmitpriv->vo_pending; -+ -+ //pxmitpriv->vi_txqueue.head = 0; -+ //hwxmits[2] .phwtxqueue = &pxmitpriv->vi_txqueue; -+ hwxmits[2] .sta_queue = &pxmitpriv->vi_pending; -+ -+ //pxmitpriv->bk_txqueue.head = 0; -+ //hwxmits[3] .phwtxqueue = &pxmitpriv->bk_txqueue; -+ hwxmits[3] .sta_queue = &pxmitpriv->bk_pending; -+ -+ //pxmitpriv->be_txqueue.head = 0; -+ //hwxmits[4] .phwtxqueue = &pxmitpriv->be_txqueue; -+ hwxmits[4] .sta_queue = &pxmitpriv->be_pending; -+ -+ } -+ else if(pxmitpriv->hwxmit_entry == 4) -+ { -+ -+ //pxmitpriv->vo_txqueue.head = 0; -+ //hwxmits[0] .phwtxqueue = &pxmitpriv->vo_txqueue; -+ hwxmits[0] .sta_queue = &pxmitpriv->vo_pending; -+ -+ //pxmitpriv->vi_txqueue.head = 0; -+ //hwxmits[1] .phwtxqueue = &pxmitpriv->vi_txqueue; -+ hwxmits[1] .sta_queue = &pxmitpriv->vi_pending; -+ -+ //pxmitpriv->be_txqueue.head = 0; -+ //hwxmits[2] .phwtxqueue = &pxmitpriv->be_txqueue; -+ hwxmits[2] .sta_queue = &pxmitpriv->be_pending; -+ -+ //pxmitpriv->bk_txqueue.head = 0; -+ //hwxmits[3] .phwtxqueue = &pxmitpriv->bk_txqueue; -+ hwxmits[3] .sta_queue = &pxmitpriv->bk_pending; -+ } -+ else -+ { -+ -+ -+ } -+ -+ -+} -+ -+void rtw_free_hwxmits(_adapter *padapter) -+{ -+ struct hw_xmit *hwxmits; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ hwxmits = pxmitpriv->hwxmits; -+ if(hwxmits) -+ rtw_mfree((u8 *)hwxmits, (sizeof (struct hw_xmit) * pxmitpriv->hwxmit_entry)); -+} -+ -+void rtw_init_hwxmits(struct hw_xmit *phwxmit, sint entry) -+{ -+ sint i; -+_func_enter_; -+ for(i = 0; i < entry; i++, phwxmit++) -+ { -+ //_rtw_spinlock_init(&phwxmit->xmit_lock); -+ //_rtw_init_listhead(&phwxmit->pending); -+ //phwxmit->txcmdcnt = 0; -+ phwxmit->accnt = 0; -+ } -+_func_exit_; -+} -+ -+#ifdef CONFIG_BR_EXT -+int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) -+{ -+ struct sk_buff *skb = *pskb; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ _irqL irqL; -+ //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) -+ { -+ void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb); -+ int res, is_vlan_tag=0, i, do_nat25=1; -+ unsigned short vlan_hdr=0; -+ void *br_port = NULL; -+ -+ //mac_clone_handle_frame(priv, skb); -+ -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ br_port = padapter->pnetdev->br_port; -+#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ rcu_read_lock(); -+ br_port = rcu_dereference(padapter->pnetdev->rx_handler_data); -+ rcu_read_unlock(); -+#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ _enter_critical_bh(&padapter->br_ext_lock, &irqL); -+ if ( !(skb->data[0] & 1) && -+ br_port && -+ memcmp(skb->data+MACADDRLEN, padapter->br_mac, MACADDRLEN) && -+ *((unsigned short *)(skb->data+MACADDRLEN*2)) != __constant_htons(ETH_P_8021Q) && -+ *((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP) && -+ !memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN) && padapter->scdb_entry) { -+ memcpy(skb->data+MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN); -+ padapter->scdb_entry->ageing_timer = jiffies; -+ _exit_critical_bh(&padapter->br_ext_lock, &irqL); -+ } -+ else -+ //if (!priv->pmib->ethBrExtInfo.nat25_disable) -+ { -+// if (priv->dev->br_port && -+// !memcmp(skb->data+MACADDRLEN, priv->br_mac, MACADDRLEN)) { -+#if 1 -+ if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_8021Q)) { -+ is_vlan_tag = 1; -+ vlan_hdr = *((unsigned short *)(skb->data+MACADDRLEN*2+2)); -+ for (i=0; i<6; i++) -+ *((unsigned short *)(skb->data+MACADDRLEN*2+2-i*2)) = *((unsigned short *)(skb->data+MACADDRLEN*2-2-i*2)); -+ skb_pull(skb, 4); -+ } -+ //if SA == br_mac && skb== IP => copy SIP to br_ip ?? why -+ if (!memcmp(skb->data+MACADDRLEN, padapter->br_mac, MACADDRLEN) && -+ (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP))) -+ memcpy(padapter->br_ip, skb->data+WLAN_ETHHDR_LEN+12, 4); -+ -+ if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP)) { -+ if (memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN)) { -+ void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, unsigned char *ipAddr); -+ -+ if ((padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter, -+ skb->data+MACADDRLEN, skb->data+WLAN_ETHHDR_LEN+12)) != NULL) { -+ memcpy(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN); -+ memcpy(padapter->scdb_ip, skb->data+WLAN_ETHHDR_LEN+12, 4); -+ padapter->scdb_entry->ageing_timer = jiffies; -+ do_nat25 = 0; -+ } -+ } -+ else { -+ if (padapter->scdb_entry) { -+ padapter->scdb_entry->ageing_timer = jiffies; -+ do_nat25 = 0; -+ } -+ else { -+ memset(padapter->scdb_mac, 0, MACADDRLEN); -+ memset(padapter->scdb_ip, 0, 4); -+ } -+ } -+ } -+ _exit_critical_bh(&padapter->br_ext_lock, &irqL); -+#endif // 1 -+ if (do_nat25) -+ { -+ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method); -+ if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) { -+ struct sk_buff *newskb; -+ -+ if (is_vlan_tag) { -+ skb_push(skb, 4); -+ for (i=0; i<6; i++) -+ *((unsigned short *)(skb->data+i*2)) = *((unsigned short *)(skb->data+4+i*2)); -+ *((unsigned short *)(skb->data+MACADDRLEN*2)) = __constant_htons(ETH_P_8021Q); -+ *((unsigned short *)(skb->data+MACADDRLEN*2+2)) = vlan_hdr; -+ } -+ -+ newskb = rtw_skb_copy(skb); -+ if (newskb == NULL) { -+ //priv->ext_stats.tx_drops++; -+ DEBUG_ERR("TX DROP: rtw_skb_copy fail!\n"); -+ //goto stop_proc; -+ return -1; -+ } -+ rtw_skb_free(skb); -+ -+ *pskb = skb = newskb; -+ if (is_vlan_tag) { -+ vlan_hdr = *((unsigned short *)(skb->data+MACADDRLEN*2+2)); -+ for (i=0; i<6; i++) -+ *((unsigned short *)(skb->data+MACADDRLEN*2+2-i*2)) = *((unsigned short *)(skb->data+MACADDRLEN*2-2-i*2)); -+ skb_pull(skb, 4); -+ } -+ } -+ -+ if (skb_is_nonlinear(skb)) -+ DEBUG_ERR("%s(): skb_is_nonlinear!!\n", __FUNCTION__); -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) -+ res = skb_linearize(skb, GFP_ATOMIC); -+#else // (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) -+ res = skb_linearize(skb); -+#endif // (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) -+ if (res < 0) { -+ DEBUG_ERR("TX DROP: skb_linearize fail!\n"); -+ //goto free_and_stop; -+ return -1; -+ } -+ -+ res = nat25_db_handle(padapter, skb, NAT25_INSERT); -+ if (res < 0) { -+ if (res == -2) { -+ //priv->ext_stats.tx_drops++; -+ DEBUG_ERR("TX DROP: nat25_db_handle fail!\n"); -+ //goto free_and_stop; -+ return -1; -+ -+ } -+ // we just print warning message and let it go -+ //DEBUG_WARN("%s()-%d: nat25_db_handle INSERT Warning!\n", __FUNCTION__, __LINE__); -+ //return -1; // return -1 will cause system crash on 2011/08/30! -+ return 0; -+ } -+ } -+ -+ memcpy(skb->data+MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN); -+ -+ dhcp_flag_bcast(padapter, skb); -+ -+ if (is_vlan_tag) { -+ skb_push(skb, 4); -+ for (i=0; i<6; i++) -+ *((unsigned short *)(skb->data+i*2)) = *((unsigned short *)(skb->data+4+i*2)); -+ *((unsigned short *)(skb->data+MACADDRLEN*2)) = __constant_htons(ETH_P_8021Q); -+ *((unsigned short *)(skb->data+MACADDRLEN*2+2)) = vlan_hdr; -+ } -+ } -+#if 0 -+ else{ -+ if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_8021Q)) { -+ is_vlan_tag = 1; -+ } -+ -+ if(is_vlan_tag){ -+ if(ICMPV6_MCAST_MAC(skb->data) && ICMPV6_PROTO1A_VALN(skb->data)){ -+ memcpy(skb->data+MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN); -+ } -+ }else -+ { -+ if(ICMPV6_MCAST_MAC(skb->data) && ICMPV6_PROTO1A(skb->data)){ -+ memcpy(skb->data+MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN); -+ } -+ } -+ } -+#endif // 0 -+ -+ // check if SA is equal to our MAC -+ if (memcmp(skb->data+MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN)) { -+ //priv->ext_stats.tx_drops++; -+ DEBUG_ERR("TX DROP: untransformed frame SA:%02X%02X%02X%02X%02X%02X!\n", -+ skb->data[6],skb->data[7],skb->data[8],skb->data[9],skb->data[10],skb->data[11]); -+ //goto free_and_stop; -+ return -1; -+ } -+ } -+ return 0; -+} -+#endif // CONFIG_BR_EXT -+ -+static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib) -+{ -+ u8 qsel; -+ -+ qsel = pattrib->priority; -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("### do_queue_select priority=%d ,qsel = %d\n",pattrib->priority ,qsel)); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+// if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) -+// qsel = 7;// -+#endif -+ -+ pattrib->qsel = qsel; -+} -+ -+/* -+ * The main transmit(tx) entry -+ * -+ * Return -+ * 1 enqueue -+ * 0 success, hardware will handle this xmit frame(packet) -+ * <0 fail -+ */ -+s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) -+{ -+ static u32 start = 0; -+ static u32 drop_cnt = 0; -+#ifdef CONFIG_AP_MODE -+ _irqL irqL0; -+#endif -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct xmit_frame *pxmitframe = NULL; -+#ifdef CONFIG_BR_EXT -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ void *br_port = NULL; -+#endif // CONFIG_BR_EXT -+ -+ s32 res; -+ -+ if (start == 0) -+ start = rtw_get_current_time(); -+ -+ pxmitframe = rtw_alloc_xmitframe(pxmitpriv); -+ -+ if (rtw_get_passing_time_ms(start) > 2000) { -+ if (drop_cnt) -+ DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe, drop_cnt:%u\n", __FUNCTION__, drop_cnt); -+ start = rtw_get_current_time(); -+ drop_cnt = 0; -+ } -+ -+ if (pxmitframe == NULL) { -+ drop_cnt ++; -+ RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: no more pxmitframe\n")); -+ return -1; -+ } -+ -+#ifdef CONFIG_BR_EXT -+ -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ br_port = padapter->pnetdev->br_port; -+#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ rcu_read_lock(); -+ br_port = rcu_dereference(padapter->pnetdev->rx_handler_data); -+ rcu_read_unlock(); -+#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ -+ if( br_port && check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) -+ { -+ res = rtw_br_client_tx(padapter, ppkt); -+ if (res == -1) -+ { -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ return -1; -+ } -+ } -+ -+#endif // CONFIG_BR_EXT -+ -+ res = update_attrib(padapter, *ppkt, &pxmitframe->attrib); -+ if (res == _FAIL) { -+ RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n")); -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __FUNCTION__); -+ #endif -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ return -1; -+ } -+ pxmitframe->pkt = *ppkt; -+ -+ rtw_led_control(padapter, LED_CTL_TX); -+ -+ do_queue_select(padapter, &pxmitframe->attrib); -+ -+#if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS) -+ _enter_critical_bh(&pxmitpriv->lock, &irqL0); -+ if(xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe) == _TRUE) -+ { -+ _exit_critical_bh(&pxmitpriv->lock, &irqL0); -+ return 1; -+ } -+ _exit_critical_bh(&pxmitpriv->lock, &irqL0); -+#endif -+ -+ if (rtw_hal_xmit(padapter, pxmitframe) == _FALSE) -+ return 1; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_TDLS -+sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ sint ret=_FALSE; -+ -+ _irqL irqL; -+ struct sta_info *ptdls_sta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ int i; -+ -+ ptdls_sta=rtw_get_stainfo(pstapriv, pattrib->dst); -+ if(ptdls_sta==NULL){ -+ return ret; -+ }else if(ptdls_sta->tdls_sta_state&TDLS_LINKED_STATE){ -+ -+ if(pattrib->triggered==1) -+ { -+ ret = _TRUE; -+ return ret; -+ } -+ -+ _enter_critical_bh(&ptdls_sta->sleep_q.lock, &irqL); -+ -+ if(ptdls_sta->state&WIFI_SLEEP_STATE) -+ { -+ rtw_list_delete(&pxmitframe->list); -+ -+ //_enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ rtw_list_insert_tail(&pxmitframe->list, get_list_head(&ptdls_sta->sleep_q)); -+ -+ ptdls_sta->sleepq_len++; -+ ptdls_sta->sleepq_ac_len++; -+ -+ //indicate 4-AC queue bit in TDLS peer traffic indication -+ switch(pattrib->priority) -+ { -+ case 1: -+ case 2: -+ ptdls_sta->uapsd_bk = ptdls_sta->uapsd_bk | BIT(1); -+ break; -+ case 4: -+ case 5: -+ ptdls_sta->uapsd_vi = ptdls_sta->uapsd_vi | BIT(1); -+ break; -+ case 6: -+ case 7: -+ ptdls_sta->uapsd_vo = ptdls_sta->uapsd_vo | BIT(1); -+ break; -+ case 0: -+ case 3: -+ default: -+ ptdls_sta->uapsd_be = ptdls_sta->uapsd_be | BIT(1); -+ break; -+ } -+ -+ if(ptdls_sta->sleepq_len==1) -+ { -+ //transmit TDLS PTI via AP -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_SD_PTI); -+ } -+ ret = _TRUE; -+ -+ } -+ -+ _exit_critical_bh(&ptdls_sta->sleep_q.lock, &irqL); -+ } -+ -+ return ret; -+ -+} -+#endif //CONFIG_TDLS -+ -+#if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS) -+ -+sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ _irqL irqL; -+ sint ret=_FALSE; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ sint bmcst = IS_MCAST(pattrib->ra); -+#ifdef CONFIG_TDLS -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ -+ if( ptdlsinfo->setup_state == TDLS_LINKED_STATE ) -+ { -+ ret = xmitframe_enqueue_for_tdls_sleeping_sta(padapter, pxmitframe); -+ return ret; -+ } -+#endif //CONFIG_TDLS -+ -+ if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _FALSE) -+ return ret; -+ -+ if(pattrib->psta) -+ { -+ psta = pattrib->psta; -+ } -+ else -+ { -+ DBG_871X("%s, call rtw_get_stainfo()\n", __func__); -+ psta=rtw_get_stainfo(pstapriv, pattrib->ra); -+ } -+ -+ if(psta==NULL) -+ { -+ DBG_871X("%s, psta==NUL\n", __func__); -+ return _FALSE; -+ } -+ -+ if(!(psta->state &_FW_LINKED)) -+ { -+ DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state); -+ return _FALSE; -+ } -+ -+ if(pattrib->triggered==1) -+ { -+ //DBG_871X("directly xmit pspoll_triggered packet\n"); -+ -+ //pattrib->triggered=0; -+ -+ if(bmcst) -+ pattrib->qsel = 0x11;//HIQ -+ -+ -+ return ret; -+ } -+ -+ -+ if(bmcst) -+ { -+ _enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ if(pstapriv->sta_dz_bitmap)//if anyone sta is in ps mode -+ { -+ //pattrib->qsel = 0x11;//HIQ -+ -+ rtw_list_delete(&pxmitframe->list); -+ -+ //_enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ rtw_list_insert_tail(&pxmitframe->list, get_list_head(&psta->sleep_q)); -+ -+ psta->sleepq_len++; -+ -+ pstapriv->tim_bitmap |= BIT(0);// -+ pstapriv->sta_dz_bitmap |= BIT(0); -+ -+ //DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); -+ -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE);//tx bc/mc packets after upate bcn -+ -+ //_exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ ret = _TRUE; -+ -+ } -+ -+ _exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ return ret; -+ -+ } -+ -+ -+ _enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ if(psta->state&WIFI_SLEEP_STATE) -+ { -+ u8 wmmps_ac=0; -+ -+ if(pstapriv->sta_dz_bitmap&BIT(psta->aid)) -+ { -+ rtw_list_delete(&pxmitframe->list); -+ -+ //_enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ rtw_list_insert_tail(&pxmitframe->list, get_list_head(&psta->sleep_q)); -+ -+ psta->sleepq_len++; -+ -+ switch(pattrib->priority) -+ { -+ case 1: -+ case 2: -+ wmmps_ac = psta->uapsd_bk&BIT(0); -+ break; -+ case 4: -+ case 5: -+ wmmps_ac = psta->uapsd_vi&BIT(0); -+ break; -+ case 6: -+ case 7: -+ wmmps_ac = psta->uapsd_vo&BIT(0); -+ break; -+ case 0: -+ case 3: -+ default: -+ wmmps_ac = psta->uapsd_be&BIT(0); -+ break; -+ } -+ -+ if(wmmps_ac) -+ psta->sleepq_ac_len++; -+ -+ if(((psta->has_legacy_ac) && (!wmmps_ac)) ||((!psta->has_legacy_ac)&&(wmmps_ac))) -+ { -+ pstapriv->tim_bitmap |= BIT(psta->aid); -+ -+ //DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); -+ -+ if(psta->sleepq_len==1) -+ { -+ //DBG_871X("sleepq_len==1, update BCNTIM\n"); -+ //upate BCN for TIM IE -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ } -+ } -+ -+ //_exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ //if(psta->sleepq_len > (NR_XMITFRAME>>3)) -+ //{ -+ // wakeup_sta_to_xmit(padapter, psta); -+ //} -+ -+ ret = _TRUE; -+ -+ } -+ -+ } -+ -+ _exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ -+ return ret; -+ -+} -+ -+static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, _queue *pframequeue) -+{ -+ sint ret; -+ _list *plist, *phead; -+ u8 ac_index; -+ struct tx_servq *ptxservq; -+ struct pkt_attrib *pattrib; -+ struct xmit_frame *pxmitframe; -+ struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; -+ -+ phead = get_list_head(pframequeue); -+ plist = get_next(phead); -+ -+ while (rtw_end_of_queue_search(phead, plist) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(plist, struct xmit_frame, list); -+ -+ plist = get_next(plist); -+ -+ ret = xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); -+ -+ if(_TRUE == ret) -+ { -+ pattrib = &pxmitframe->attrib; -+ -+ ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index)); -+ -+ ptxservq->qcnt--; -+ phwxmits[ac_index].accnt--; -+ } -+ else -+ { -+ //DBG_871X("xmitframe_enqueue_for_sleeping_sta return _FALSE\n"); -+ } -+ -+ } -+ -+} -+ -+void stop_sta_xmit(_adapter *padapter, struct sta_info *psta) -+{ -+ _irqL irqL0; -+ struct sta_info *psta_bmc; -+ struct sta_xmit_priv *pstaxmitpriv; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ pstaxmitpriv = &psta->sta_xmitpriv; -+ -+ //for BC/MC Frames -+ psta_bmc = rtw_get_bcmc_stainfo(padapter); -+ -+ -+ _enter_critical_bh(&pxmitpriv->lock, &irqL0); -+ -+ psta->state |= WIFI_SLEEP_STATE; -+ -+#ifdef CONFIG_TDLS -+ if( !(psta->tdls_sta_state & TDLS_LINKED_STATE) ) -+#endif //CONFIG_TDLS -+ pstapriv->sta_dz_bitmap |= BIT(psta->aid); -+ -+ -+ -+ dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vo_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->vo_q.tx_pending)); -+ -+ -+ dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->vi_q.tx_pending)); -+ -+ -+ dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->be_q.tx_pending)); -+ -+ -+ dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->bk_q.tx_pending)); -+ -+#ifdef CONFIG_TDLS -+ if( !(psta->tdls_sta_state & TDLS_LINKED_STATE) ) -+ { -+ if( psta_bmc != NULL ) -+ { -+#endif //CONFIG_TDLS -+ -+ -+ //for BC/MC Frames -+ pstaxmitpriv = &psta_bmc->sta_xmitpriv; -+ dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, &pstaxmitpriv->be_q.sta_pending); -+ rtw_list_delete(&(pstaxmitpriv->be_q.tx_pending)); -+ -+ -+#ifdef CONFIG_TDLS -+ } -+ } -+#endif //CONFIG_TDLS -+ _exit_critical_bh(&pxmitpriv->lock, &irqL0); -+ -+ -+} -+ -+void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta) -+{ -+ _irqL irqL; -+ u8 update_mask=0, wmmps_ac=0; -+ struct sta_info *psta_bmc; -+ _list *xmitframe_plist, *xmitframe_phead; -+ struct xmit_frame *pxmitframe=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ psta_bmc = rtw_get_bcmc_stainfo(padapter); -+ -+ -+ //_enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ xmitframe_phead = get_list_head(&psta->sleep_q); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+ rtw_list_delete(&pxmitframe->list); -+ -+ switch(pxmitframe->attrib.priority) -+ { -+ case 1: -+ case 2: -+ wmmps_ac = psta->uapsd_bk&BIT(1); -+ break; -+ case 4: -+ case 5: -+ wmmps_ac = psta->uapsd_vi&BIT(1); -+ break; -+ case 6: -+ case 7: -+ wmmps_ac = psta->uapsd_vo&BIT(1); -+ break; -+ case 0: -+ case 3: -+ default: -+ wmmps_ac = psta->uapsd_be&BIT(1); -+ break; -+ } -+ -+ psta->sleepq_len--; -+ if(psta->sleepq_len>0) -+ pxmitframe->attrib.mdata = 1; -+ else -+ pxmitframe->attrib.mdata = 0; -+ -+ if(wmmps_ac) -+ { -+ psta->sleepq_ac_len--; -+ if(psta->sleepq_ac_len>0) -+ { -+ pxmitframe->attrib.mdata = 1; -+ pxmitframe->attrib.eosp = 0; -+ } -+ else -+ { -+ pxmitframe->attrib.mdata = 0; -+ pxmitframe->attrib.eosp = 1; -+ } -+ } -+ -+ pxmitframe->attrib.triggered = 1; -+ -+/* -+ _exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) -+ { -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ } -+ _enter_critical_bh(&psta->sleep_q.lock, &irqL); -+*/ -+ rtw_hal_xmitframe_enqueue(padapter, pxmitframe); -+ -+ -+ } -+ -+ //for BC/MC Frames -+ if(!psta_bmc) -+ goto _exit; -+ -+ if((pstapriv->sta_dz_bitmap&0xfffe) == 0x0)//no any sta in ps mode -+ { -+ xmitframe_phead = get_list_head(&psta_bmc->sleep_q); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+ rtw_list_delete(&pxmitframe->list); -+ -+ psta_bmc->sleepq_len--; -+ if(psta_bmc->sleepq_len>0) -+ pxmitframe->attrib.mdata = 1; -+ else -+ pxmitframe->attrib.mdata = 0; -+ -+ -+ pxmitframe->attrib.triggered = 1; -+/* -+ _exit_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) -+ { -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ } -+ _enter_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ -+*/ -+ rtw_hal_xmitframe_enqueue(padapter, pxmitframe); -+ -+ } -+ -+ if(psta_bmc->sleepq_len==0) -+ { -+ pstapriv->tim_bitmap &= ~BIT(0); -+ pstapriv->sta_dz_bitmap &= ~BIT(0); -+ -+ //DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); -+ //upate BCN for TIM IE -+ //update_BCNTIM(padapter); -+ update_mask |= BIT(1); -+ } -+ -+ } -+ -+ if(psta->sleepq_len==0) -+ { -+#ifdef CONFIG_TDLS -+ if( psta->tdls_sta_state & TDLS_LINKED_STATE ) -+ { -+ if(psta->state&WIFI_SLEEP_STATE) -+ psta->state ^= WIFI_SLEEP_STATE; -+ -+ goto _exit; -+ } -+#endif //CONFIG_TDLS -+ pstapriv->tim_bitmap &= ~BIT(psta->aid); -+ -+ //DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); -+ //upate BCN for TIM IE -+ //update_BCNTIM(padapter); -+ update_mask = BIT(0); -+ -+ if(psta->state&WIFI_SLEEP_STATE) -+ psta->state ^= WIFI_SLEEP_STATE; -+ -+ if(psta->state & WIFI_STA_ALIVE_CHK_STATE) -+ { -+ psta->expire_to = pstapriv->expire_to; -+ psta->state ^= WIFI_STA_ALIVE_CHK_STATE; -+ } -+ -+ pstapriv->sta_dz_bitmap &= ~BIT(psta->aid); -+ } -+ -+_exit: -+ -+ //_exit_critical_bh(&psta_bmc->sleep_q.lock, &irqL); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ if(update_mask) -+ { -+ //update_BCNTIM(padapter); -+ //printk("%s => call update_beacon\n",__FUNCTION__); -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ } -+ -+} -+ -+void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta) -+{ -+ _irqL irqL; -+ u8 wmmps_ac=0; -+ _list *xmitframe_plist, *xmitframe_phead; -+ struct xmit_frame *pxmitframe=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ -+ //_enter_critical_bh(&psta->sleep_q.lock, &irqL); -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ xmitframe_phead = get_list_head(&psta->sleep_q); -+ xmitframe_plist = get_next(xmitframe_phead); -+ -+ while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+ switch(pxmitframe->attrib.priority) -+ { -+ case 1: -+ case 2: -+ wmmps_ac = psta->uapsd_bk&BIT(1); -+ break; -+ case 4: -+ case 5: -+ wmmps_ac = psta->uapsd_vi&BIT(1); -+ break; -+ case 6: -+ case 7: -+ wmmps_ac = psta->uapsd_vo&BIT(1); -+ break; -+ case 0: -+ case 3: -+ default: -+ wmmps_ac = psta->uapsd_be&BIT(1); -+ break; -+ } -+ -+ if(!wmmps_ac) -+ continue; -+ -+ rtw_list_delete(&pxmitframe->list); -+ -+ psta->sleepq_len--; -+ psta->sleepq_ac_len--; -+ -+ if(psta->sleepq_ac_len>0) -+ { -+ pxmitframe->attrib.mdata = 1; -+ pxmitframe->attrib.eosp = 0; -+ } -+ else -+ { -+ pxmitframe->attrib.mdata = 0; -+ pxmitframe->attrib.eosp = 1; -+ } -+ -+ pxmitframe->attrib.triggered = 1; -+ -+/* -+ if(rtw_hal_xmit(padapter, pxmitframe) == _TRUE) -+ { -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ } -+*/ -+ rtw_hal_xmitframe_enqueue(padapter, pxmitframe); -+ -+ if((psta->sleepq_ac_len==0) && (!psta->has_legacy_ac) && (wmmps_ac)) -+ { -+#ifdef CONFIG_TDLS -+ if(psta->tdls_sta_state & TDLS_LINKED_STATE ) -+ { -+ //_exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ return; -+ } -+#endif //CONFIG_TDLS -+ pstapriv->tim_bitmap &= ~BIT(psta->aid); -+ -+ //DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); -+ //upate BCN for TIM IE -+ //update_BCNTIM(padapter); -+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE); -+ //update_mask = BIT(0); -+ } -+ -+ } -+ -+ //_exit_critical_bh(&psta->sleep_q.lock, &irqL); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+} -+ -+#endif -+ -+void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms) -+{ -+ sctx->timeout_ms = timeout_ms; -+ sctx->submit_time= rtw_get_current_time(); -+#ifdef PLATFORM_LINUX /* TODO: add condition wating interface for other os */ -+ init_completion(&sctx->done); -+#endif -+ sctx->status = RTW_SCTX_SUBMITTED; -+} -+ -+int rtw_sctx_wait(struct submit_ctx *sctx) -+{ -+ int ret = _FAIL; -+ unsigned long expire; -+ int status = 0; -+ -+#ifdef PLATFORM_LINUX -+ expire= sctx->timeout_ms ? msecs_to_jiffies(sctx->timeout_ms) : MAX_SCHEDULE_TIMEOUT; -+ if (!wait_for_completion_timeout(&sctx->done, expire)) { -+ /* timeout, do something?? */ -+ status = RTW_SCTX_DONE_TIMEOUT; -+ DBG_871X("%s timeout\n", __func__); -+ } else { -+ status = sctx->status; -+ } -+#endif -+ -+ if (status == RTW_SCTX_DONE_SUCCESS) { -+ ret = _SUCCESS; -+ } -+ -+ return ret; -+} -+ -+bool rtw_sctx_chk_waring_status(int status) -+{ -+ switch(status) { -+ case RTW_SCTX_DONE_UNKNOWN: -+ case RTW_SCTX_DONE_BUF_ALLOC: -+ case RTW_SCTX_DONE_BUF_FREE: -+ -+ case RTW_SCTX_DONE_DRV_STOP: -+ case RTW_SCTX_DONE_DEV_REMOVE: -+ return _TRUE; -+ default: -+ return _FALSE; -+ } -+} -+ -+void rtw_sctx_done_err(struct submit_ctx **sctx, int status) -+{ -+ if (*sctx) { -+ if (rtw_sctx_chk_waring_status(status)) -+ DBG_871X("%s status:%d\n", __func__, status); -+ (*sctx)->status = status; -+ #ifdef PLATFORM_LINUX -+ complete(&((*sctx)->done)); -+ #endif -+ *sctx = NULL; -+ } -+} -+ -+void rtw_sctx_done(struct submit_ctx **sctx) -+{ -+ rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS); -+} -+ -+#ifdef CONFIG_XMIT_ACK -+ -+#ifdef CONFIG_XMIT_ACK_POLLING -+s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); -+ -+/** -+ * rtw_ack_tx_polling - -+ * @pxmitpriv: xmit_priv to address ack_tx_ops -+ * @timeout_ms: timeout msec -+ * -+ * Init ack_tx_ops and then do c2h_evt_hdl() and polling ack_tx_ops repeatedly -+ * till tx report or timeout -+ * Returns: _SUCCESS if TX report ok, _FAIL for others -+ */ -+int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms) -+{ -+ int ret = _FAIL; -+ struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; -+ _adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv); -+ -+ pack_tx_ops->submit_time = rtw_get_current_time(); -+ pack_tx_ops->timeout_ms = timeout_ms; -+ pack_tx_ops->status = RTW_SCTX_SUBMITTED; -+ -+ do { -+ c2h_evt_hdl(adapter, NULL, rtw_hal_c2h_id_filter_ccx(adapter)); -+ if (pack_tx_ops->status != RTW_SCTX_SUBMITTED) -+ break; -+ -+ if (adapter->bDriverStopped) { -+ pack_tx_ops->status = RTW_SCTX_DONE_DRV_STOP; -+ break; -+ } -+ if (adapter->bSurpriseRemoved) { -+ pack_tx_ops->status = RTW_SCTX_DONE_DEV_REMOVE; -+ break; -+ } -+ -+ rtw_msleep_os(10); -+ } while (rtw_get_passing_time_ms(pack_tx_ops->submit_time) < timeout_ms); -+ -+ if (pack_tx_ops->status == RTW_SCTX_SUBMITTED) { -+ pack_tx_ops->status = RTW_SCTX_DONE_TIMEOUT; -+ DBG_871X("%s timeout\n", __func__); -+ } -+ -+ if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS) -+ ret = _SUCCESS; -+ -+ return ret; -+} -+#endif -+ -+int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) -+{ -+#ifdef CONFIG_XMIT_ACK_POLLING -+ return rtw_ack_tx_polling(pxmitpriv, timeout_ms); -+#else -+ struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; -+ -+ pack_tx_ops->submit_time = rtw_get_current_time(); -+ pack_tx_ops->timeout_ms = timeout_ms; -+ pack_tx_ops->status = RTW_SCTX_SUBMITTED; -+ -+ return rtw_sctx_wait(pack_tx_ops); -+#endif -+} -+ -+void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status) -+{ -+ struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; -+ -+ if (pxmitpriv->ack_tx) { -+ rtw_sctx_done_err(&pack_tx_ops, status); -+ } else { -+ DBG_871X("%s ack_tx not set\n", __func__); -+ } -+} -+#endif //CONFIG_XMIT_ACK -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c -@@ -0,0 +1,177 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/*++ -+Copyright (c) Realtek Semiconductor Corp. All rights reserved. -+ -+Module Name: -+ HalPwrSeqCmd.c -+ -+Abstract: -+ Implement HW Power sequence configuration CMD handling routine for Realtek devices. -+ -+Major Change History: -+ When Who What -+ ---------- --------------- ------------------------------- -+ 2011-10-26 Lucas Modify to be compatible with SD4-CE driver. -+ 2011-07-07 Roger Create. -+ -+--*/ -+#include -+#include -+ -+ -+// -+// Description: -+// This routine deal with the Power Configuration CMDs parsing for RTL8723/RTL8188E Series IC. -+// -+// Assumption: -+// We should follow specific format which was released from HW SD. -+// -+// 2011.07.07, added by Roger. -+// -+u8 HalPwrSeqCmdParsing( -+ PADAPTER padapter, -+ u8 CutVersion, -+ u8 FabVersion, -+ u8 InterfaceType, -+ WLAN_PWR_CFG PwrSeqCmd[]) -+{ -+ WLAN_PWR_CFG PwrCfgCmd = {0}; -+ u8 bPollingBit = _FALSE; -+ u32 AryIdx = 0; -+ u8 value = 0; -+ u32 offset = 0; -+ u32 pollingCount = 0; // polling autoload done. -+ u32 maxPollingCnt = 5000; -+ -+ do { -+ PwrCfgCmd = PwrSeqCmd[AryIdx]; -+ -+ RT_TRACE(_module_hal_init_c_ , _drv_info_, -+ ("HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n", -+ GET_PWR_CFG_OFFSET(PwrCfgCmd), -+ GET_PWR_CFG_CUT_MASK(PwrCfgCmd), -+ GET_PWR_CFG_FAB_MASK(PwrCfgCmd), -+ GET_PWR_CFG_INTF_MASK(PwrCfgCmd), -+ GET_PWR_CFG_BASE(PwrCfgCmd), -+ GET_PWR_CFG_CMD(PwrCfgCmd), -+ GET_PWR_CFG_MASK(PwrCfgCmd), -+ GET_PWR_CFG_VALUE(PwrCfgCmd))); -+ -+ //2 Only Handle the command whose FAB, CUT, and Interface are matched -+ if ((GET_PWR_CFG_FAB_MASK(PwrCfgCmd) & FabVersion) && -+ (GET_PWR_CFG_CUT_MASK(PwrCfgCmd) & CutVersion) && -+ (GET_PWR_CFG_INTF_MASK(PwrCfgCmd) & InterfaceType)) -+ { -+ switch (GET_PWR_CFG_CMD(PwrCfgCmd)) -+ { -+ case PWR_CMD_READ: -+ RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_READ\n")); -+ break; -+ -+ case PWR_CMD_WRITE: -+ RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n")); -+ offset = GET_PWR_CFG_OFFSET(PwrCfgCmd); -+ -+#ifdef CONFIG_SDIO_HCI -+ // -+ // We should deal with interface specific address mapping for some interfaces, e.g., SDIO interface -+ // 2011.07.07. -+ // -+ if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO) -+ { -+ // Read Back SDIO Local value -+ value = SdioLocalCmd52Read1Byte(padapter, offset); -+ -+ value &= ~(GET_PWR_CFG_MASK(PwrCfgCmd)); -+ value |= (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd)); -+ -+ // Write Back SDIO Local value -+ SdioLocalCmd52Write1Byte(padapter, offset, value); -+ } -+ else -+#endif -+ { -+ // Read the value from system register -+ value = rtw_read8(padapter, offset); -+ -+ value &= ~(GET_PWR_CFG_MASK(PwrCfgCmd)); -+ value |= (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd)); -+ -+ // Write the value back to sytem register -+ rtw_write8(padapter, offset, value); -+ } -+ break; -+ -+ case PWR_CMD_POLLING: -+ RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n")); -+ -+ bPollingBit = _FALSE; -+ offset = GET_PWR_CFG_OFFSET(PwrCfgCmd); -+ -+ do { -+#ifdef CONFIG_SDIO_HCI -+ if (GET_PWR_CFG_BASE(PwrCfgCmd) == PWR_BASEADDR_SDIO) -+ value = SdioLocalCmd52Read1Byte(padapter, offset); -+ else -+#endif -+ value = rtw_read8(padapter, offset); -+ -+ value &= GET_PWR_CFG_MASK(PwrCfgCmd); -+ if (value == (GET_PWR_CFG_VALUE(PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd))) -+ bPollingBit = _TRUE; -+ else -+ rtw_udelay_os(10); -+ -+ if (pollingCount++ > maxPollingCnt) { -+ RT_TRACE(_module_hal_init_c_ , _drv_err_, ("Fail to polling Offset[%#x]\n", offset)); -+ return _FALSE; -+ } -+ } while (!bPollingBit); -+ -+ break; -+ -+ case PWR_CMD_DELAY: -+ RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n")); -+ if (GET_PWR_CFG_VALUE(PwrCfgCmd) == PWRSEQ_DELAY_US) -+ rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd)); -+ else -+ rtw_udelay_os(GET_PWR_CFG_OFFSET(PwrCfgCmd)*1000); -+ break; -+ -+ case PWR_CMD_END: -+ // When this command is parsed, end the process -+ RT_TRACE(_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_END\n")); -+ return _TRUE; -+ break; -+ -+ default: -+ RT_TRACE(_module_hal_init_c_ , _drv_err_, ("HalPwrSeqCmdParsing: Unknown CMD!!\n")); -+ break; -+ } -+ } -+ -+ AryIdx++;//Add Array Index -+ }while(1); -+ -+ return _TRUE; -+} -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c -@@ -0,0 +1,314 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2013 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#include -+#include -+#include -+ -+#ifdef CONFIG_RTL8192C -+#include -+#endif -+ -+#ifdef CONFIG_RTL8192D -+#include -+#endif -+ -+bool rtw_adapter_linked(_adapter *adapter) -+{ -+ bool linked = _FALSE; -+ struct mlme_priv *mlmepriv = &adapter->mlmepriv; -+ -+ if( (check_fwstate(mlmepriv, WIFI_AP_STATE) == _TRUE) || -+ (check_fwstate(mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE)) -+ { -+ if(adapter->stapriv.asoc_sta_count > 2) -+ linked = _TRUE; -+ } -+ else{//Station mode -+ if(check_fwstate(mlmepriv, _FW_LINKED)== _TRUE) -+ linked = _TRUE; -+ } -+ -+ return linked; -+} -+ -+bool dm_linked(_adapter *adapter) -+{ -+ bool linked; -+ -+ if ((linked = rtw_adapter_linked(adapter))) -+ goto exit; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ((adapter = adapter->pbuddy_adapter) == NULL) -+ goto exit; -+ linked = rtw_adapter_linked(adapter); -+#endif -+ -+exit: -+ return linked; -+} -+ -+#if 0 -+void dm_enable_EDCCA(_adapter *adapter) -+{ -+ // Enable EDCCA. The value is suggested by SD3 Wilson. -+ -+ // -+ // Revised for ASUS 11b/g performance issues, suggested by BB Neil, 2012.04.13. -+ // -+ /*if((pDM_Odm->SupportICType == ODM_RTL8723A)&&(IS_WIRELESS_MODE_G(pAdapter))) -+ { -+ rtw_write8(adapter,rOFDM0_ECCAThreshold,0x00); -+ rtw_write8(adapter,rOFDM0_ECCAThreshold+2,0xFD); -+ -+ } -+ else*/ -+ { -+ rtw_write8(adapter,rOFDM0_ECCAThreshold,0x03); -+ rtw_write8(adapter,rOFDM0_ECCAThreshold+2,0x00); -+ } -+} -+ -+void dm_disable_EDCCA(_adapter *adapter) -+{ -+ // Disable EDCCA.. -+ rtw_write8(adapter, rOFDM0_ECCAThreshold, 0x7f); -+ rtw_write8(adapter, rOFDM0_ECCAThreshold+2, 0x7f); -+} -+ -+// -+// Description: According to initial gain value to determine to enable or disable EDCCA. -+// -+// Suggested by SD3 Wilson. Added by tynli. 2011.11.25. -+// -+void dm_dynamic_EDCCA(_adapter *pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *dmpriv = &pHalData->dmpriv; -+ u8 RegC50, RegC58; -+ -+ RegC50 = (u8)PHY_QueryBBReg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0); -+ RegC58 = (u8)PHY_QueryBBReg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0); -+ -+ -+ if((RegC50 > 0x28 && RegC58 > 0x28) -+ /*|| ((pDM_Odm->SupportICType == ODM_RTL8723A && IS_WIRELESS_MODE_G(pAdapter) && RegC50>0x26)) -+ || (pDM_Odm->SupportICType == ODM_RTL8188E && RegC50 > 0x28)*/ -+ ) -+ { -+ if(!dmpriv->bPreEdccaEnable) -+ { -+ dm_enable_EDCCA(pAdapter); -+ dmpriv->bPreEdccaEnable = _TRUE; -+ } -+ -+ } -+ else if((RegC50 < 0x25 && RegC58 < 0x25) -+ /*|| (pDM_Odm->SupportICType == ODM_RTL8188E && RegC50 < 0x25)*/ -+ ) -+ { -+ if(dmpriv->bPreEdccaEnable) -+ { -+ dm_disable_EDCCA(pAdapter); -+ dmpriv->bPreEdccaEnable = _FALSE; -+ } -+ } -+} -+#endif -+ -+#define DM_ADAPTIVITY_VER "ADAPTIVITY_V001" -+ -+int dm_adaptivity_get_parm_str(_adapter *pAdapter, char *buf, int len) -+{ -+#ifdef CONFIG_DM_ADAPTIVITY -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *dmpriv = &pHalData->dmpriv; -+ -+ return snprintf(buf, len, DM_ADAPTIVITY_VER"\n" -+ "TH_L2H_ini\tTH_EDCCA_HL_diff\tIGI_Base\tForceEDCCA\tAdapEn_RSSI\tIGI_LowerBound\n" -+ "0x%02x\t%d\t0x%02x\t%d\t%u\t%u\n", -+ (u8)dmpriv->TH_L2H_ini, -+ dmpriv->TH_EDCCA_HL_diff, -+ dmpriv->IGI_Base, -+ dmpriv->ForceEDCCA, -+ dmpriv->AdapEn_RSSI, -+ dmpriv->IGI_LowerBound -+ ); -+#endif /* CONFIG_DM_ADAPTIVITY */ -+ return 0; -+} -+ -+void dm_adaptivity_set_parm(_adapter *pAdapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, -+ s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound) -+{ -+#ifdef CONFIG_DM_ADAPTIVITY -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *dmpriv = &pHalData->dmpriv; -+ -+ dmpriv->TH_L2H_ini = TH_L2H_ini; -+ dmpriv->TH_EDCCA_HL_diff = TH_EDCCA_HL_diff; -+ dmpriv->IGI_Base = IGI_Base; -+ dmpriv->ForceEDCCA = ForceEDCCA; -+ dmpriv->AdapEn_RSSI = AdapEn_RSSI; -+ dmpriv->IGI_LowerBound = IGI_LowerBound; -+ -+#endif /* CONFIG_DM_ADAPTIVITY */ -+} -+ -+void dm_adaptivity_init(_adapter *pAdapter) -+{ -+#ifdef CONFIG_DM_ADAPTIVITY -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *dmpriv = &pHalData->dmpriv; -+ -+ /* -+ if(pDM_Odm->SupportICType == ODM_RTL8723B) -+ { -+ pDM_Odm->TH_L2H_ini = 0xf8; // -8 -+ } -+ if((pDM_Odm->SupportICType == ODM_RTL8192E)&&(pDM_Odm->SupportInterface == ODM_ITRF_PCIE)) -+ { -+ pDM_Odm->TH_L2H_ini = 0xf0; // -16 -+ } -+ else */ -+ { -+ dmpriv->TH_L2H_ini = 0xf9; // -7 -+ } -+ -+ dmpriv->TH_EDCCA_HL_diff = 7; -+ dmpriv->IGI_Base = 0x32; -+ dmpriv->IGI_target = 0x1c; -+ dmpriv->ForceEDCCA = 0; -+ dmpriv->AdapEn_RSSI = 20; -+ dmpriv->IGI_LowerBound = 0; -+ -+ //Reg524[11]=0 is easily to transmit packets during adaptivity test -+ PHY_SetBBReg(pAdapter, 0x524, BIT11, 1); // stop counting if EDCCA is asserted -+ -+#endif /* CONFIG_DM_ADAPTIVITY */ -+} -+ -+void dm_adaptivity(_adapter *pAdapter) -+{ -+#ifdef CONFIG_DM_ADAPTIVITY -+ s8 TH_L2H_dmc, TH_H2L_dmc; -+ s8 TH_L2H, TH_H2L, Diff, IGI_target; -+ u32 value32; -+ BOOLEAN EDCCA_State; -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *dmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &dmpriv->DM_DigTable; -+ u8 IGI = pDigTable->CurIGValue; -+ u8 RSSI_Min = pDigTable->Rssi_val_min; -+ HT_CHANNEL_WIDTH BandWidth = pHalData->CurrentChannelBW; -+ -+ if (!(dmpriv->DMFlag & DYNAMIC_FUNC_ADAPTIVITY)) -+ { -+ LOG_LEVEL(_drv_info_, "Go to odm_DynamicEDCCA() \n"); -+ // Add by Neil Chen to enable edcca to MP Platform -+ // Adjust EDCCA. -+ /*if(pDM_Odm->SupportICType & ODM_IC_11N_SERIES) -+ dm_dynamic_EDCCA(pAdapter); -+ */ -+ return; -+ } -+ LOG_LEVEL(_drv_info_, "odm_Adaptivity() =====> \n"); -+ -+ LOG_LEVEL(_drv_info_, "ForceEDCCA=%d, IGI_Base=0x%x, TH_L2H_ini = %d, TH_EDCCA_HL_diff = %d, AdapEn_RSSI = %d\n", -+ dmpriv->ForceEDCCA, dmpriv->IGI_Base, dmpriv->TH_L2H_ini, dmpriv->TH_EDCCA_HL_diff, dmpriv->AdapEn_RSSI); -+ -+ /*if(pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) -+ PHY_SetBBReg(0x800, BIT10, 0); //ADC_mask enable -+ */ -+ -+ if(!dm_linked(pAdapter) || pHalData->CurrentChannel > 149) /* Band4 doesn't need adaptivity */ -+ { -+ /*if(pDM_Odm->SupportICType & ODM_IC_11N_SERIES)*/ -+ { -+ PHY_SetBBReg(pAdapter,rOFDM0_ECCAThreshold, bMaskByte0, 0x7f); -+ PHY_SetBBReg(pAdapter,rOFDM0_ECCAThreshold, bMaskByte2, 0x7f); -+ } -+ /*else -+ { -+ ODM_SetBBReg(pDM_Odm, rFPGA0_XB_LSSIReadBack, 0xFFFF, (0x7f<<8) | 0x7f); -+ }*/ -+ return; -+ } -+ -+ if(!dmpriv->ForceEDCCA) -+ { -+ if(RSSI_Min > dmpriv->AdapEn_RSSI) -+ EDCCA_State = 1; -+ else if(RSSI_Min < (dmpriv->AdapEn_RSSI - 5)) -+ EDCCA_State = 0; -+ } -+ else -+ EDCCA_State = 1; -+ //if((pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) && (*pDM_Odm->pBandType == BAND_ON_5G)) -+ //IGI_target = pDM_Odm->IGI_Base; -+ //else -+ { -+ -+ if(BandWidth == HT_CHANNEL_WIDTH_20) //CHANNEL_WIDTH_20 -+ IGI_target = dmpriv->IGI_Base; -+ else if(BandWidth == HT_CHANNEL_WIDTH_40) -+ IGI_target = dmpriv->IGI_Base + 2; -+ /*else if(*pDM_Odm->pBandWidth == ODM_BW80M) -+ IGI_target = pDM_Odm->IGI_Base + 6;*/ -+ else -+ IGI_target = dmpriv->IGI_Base; -+ } -+ -+ dmpriv->IGI_target = (u8)IGI_target; -+ -+ LOG_LEVEL(_drv_info_, "BandWidth=%s, IGI_target=0x%x, EDCCA_State=%d\n", -+ (BandWidth==HT_CHANNEL_WIDTH_40)?"40M":"20M", IGI_target, EDCCA_State); -+ -+ if(EDCCA_State == 1) -+ { -+ Diff = IGI_target -(s8)IGI; -+ TH_L2H_dmc = dmpriv->TH_L2H_ini + Diff; -+ if(TH_L2H_dmc > 10) TH_L2H_dmc = 10; -+ TH_H2L_dmc = TH_L2H_dmc - dmpriv->TH_EDCCA_HL_diff; -+ } -+ else -+ { -+ TH_L2H_dmc = 0x7f; -+ TH_H2L_dmc = 0x7f; -+ } -+ -+ LOG_LEVEL(_drv_info_, "IGI=0x%x, TH_L2H_dmc = %d, TH_H2L_dmc = %d\n", -+ IGI, TH_L2H_dmc, TH_H2L_dmc); -+ -+ /*if(pDM_Odm->SupportICType & ODM_IC_11N_SERIES)*/ -+ { -+ PHY_SetBBReg(pAdapter,rOFDM0_ECCAThreshold, bMaskByte0, (u8)TH_L2H_dmc); -+ PHY_SetBBReg(pAdapter,rOFDM0_ECCAThreshold, bMaskByte2, (u8)TH_H2L_dmc); -+ } -+ /*else -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_LSSIReadBack, 0xFFFF, ((u8)TH_H2L_dmc<<8) | (u8)TH_L2H_dmc);*/ -+ -+skip_dm: -+ return; -+#endif /* CONFIG_DM_ADAPTIVITY */ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h -@@ -0,0 +1,30 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2013 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+ #ifndef __DM_H__ -+#define __DM_H__ -+ -+int dm_adaptivity_get_parm_str(_adapter *pAdapter, char *buf, int len); -+void dm_adaptivity_set_parm(_adapter *pAdapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, -+ s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound); -+void dm_adaptivity_init(_adapter *pAdapter); -+void dm_adaptivity(_adapter *pAdapter); -+ -+#endif /* __DM_H__ */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c -@@ -0,0 +1,371 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#ifdef CONFIG_RTL8192C -+#include -+#endif -+#ifdef CONFIG_RTL8192D -+#include -+#endif -+ -+#define _HAL_COM_C_ -+ -+//============================================================ -+// Global var -+//============================================================ -+u32 OFDMSwingTable[OFDM_TABLE_SIZE_92D] = { -+ 0x7f8001fe, // 0, +6.0dB -+ 0x788001e2, // 1, +5.5dB -+ 0x71c001c7, // 2, +5.0dB -+ 0x6b8001ae, // 3, +4.5dB -+ 0x65400195, // 4, +4.0dB -+ 0x5fc0017f, // 5, +3.5dB -+ 0x5a400169, // 6, +3.0dB -+ 0x55400155, // 7, +2.5dB -+ 0x50800142, // 8, +2.0dB -+ 0x4c000130, // 9, +1.5dB -+ 0x47c0011f, // 10, +1.0dB -+ 0x43c0010f, // 11, +0.5dB -+ 0x40000100, // 12, +0dB -+ 0x3c8000f2, // 13, -0.5dB -+ 0x390000e4, // 14, -1.0dB -+ 0x35c000d7, // 15, -1.5dB -+ 0x32c000cb, // 16, -2.0dB -+ 0x300000c0, // 17, -2.5dB -+ 0x2d4000b5, // 18, -3.0dB -+ 0x2ac000ab, // 19, -3.5dB -+ 0x288000a2, // 20, -4.0dB -+ 0x26000098, // 21, -4.5dB -+ 0x24000090, // 22, -5.0dB -+ 0x22000088, // 23, -5.5dB -+ 0x20000080, // 24, -6.0dB -+ 0x1e400079, // 25, -6.5dB -+ 0x1c800072, // 26, -7.0dB -+ 0x1b00006c, // 27. -7.5dB -+ 0x19800066, // 28, -8.0dB -+ 0x18000060, // 29, -8.5dB -+ 0x16c0005b, // 30, -9.0dB -+ 0x15800056, // 31, -9.5dB -+ 0x14400051, // 32, -10.0dB -+ 0x1300004c, // 33, -10.5dB -+ 0x12000048, // 34, -11.0dB -+ 0x11000044, // 35, -11.5dB -+ 0x10000040, // 36, -12.0dB -+ 0x0f00003c,// 37, -12.5dB -+ 0x0e400039,// 38, -13.0dB -+ 0x0d800036,// 39, -13.5dB -+ 0x0cc00033,// 40, -14.0dB -+ 0x0c000030,// 41, -14.5dB -+ 0x0b40002d,// 42, -15.0dB -+}; -+ -+ -+u8 CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8] = { -+ {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04}, // 0, +0dB -+ {0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04}, // 1, -0.5dB -+ {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, // 2, -1.0dB -+ {0x2d, 0x2d, 0x27, 0x1f, 0x18, 0x0f, 0x08, 0x03}, // 3, -1.5dB -+ {0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03}, // 4, -2.0dB -+ {0x28, 0x28, 0x22, 0x1c, 0x15, 0x0d, 0x07, 0x03}, // 5, -2.5dB -+ {0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03}, // 6, -3.0dB -+ {0x24, 0x23, 0x1f, 0x19, 0x13, 0x0c, 0x06, 0x03}, // 7, -3.5dB -+ {0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02}, // 8, -4.0dB -+ {0x20, 0x20, 0x1b, 0x16, 0x11, 0x08, 0x05, 0x02}, // 9, -4.5dB -+ {0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02}, // 10, -5.0dB -+ {0x1d, 0x1c, 0x18, 0x14, 0x0f, 0x0a, 0x05, 0x02}, // 11, -5.5dB -+ {0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02}, // 12, -6.0dB -+ {0x1a, 0x19, 0x16, 0x12, 0x0d, 0x09, 0x04, 0x02}, // 13, -6.5dB -+ {0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02}, // 14, -7.0dB -+ {0x17, 0x16, 0x13, 0x10, 0x0c, 0x08, 0x04, 0x02}, // 15, -7.5dB -+ {0x16, 0x15, 0x12, 0x0f, 0x0b, 0x07, 0x04, 0x01}, // 16, -8.0dB -+ {0x14, 0x14, 0x11, 0x0e, 0x0b, 0x07, 0x03, 0x02}, // 17, -8.5dB -+ {0x13, 0x13, 0x10, 0x0d, 0x0a, 0x06, 0x03, 0x01}, // 18, -9.0dB -+ {0x12, 0x12, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, // 19, -9.5dB -+ {0x11, 0x11, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, // 20, -10.0dB -+ {0x10, 0x10, 0x0e, 0x0b, 0x08, 0x05, 0x03, 0x01}, // 21, -10.5dB -+ {0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01}, // 22, -11.0dB -+ {0x0e, 0x0e, 0x0c, 0x0a, 0x08, 0x05, 0x02, 0x01}, // 23, -11.5dB -+ {0x0d, 0x0d, 0x0c, 0x0a, 0x07, 0x05, 0x02, 0x01}, // 24, -12.0dB -+ {0x0d, 0x0c, 0x0b, 0x09, 0x07, 0x04, 0x02, 0x01}, // 25, -12.5dB -+ {0x0c, 0x0c, 0x0a, 0x09, 0x06, 0x04, 0x02, 0x01}, // 26, -13.0dB -+ {0x0b, 0x0b, 0x0a, 0x08, 0x06, 0x04, 0x02, 0x01}, // 27, -13.5dB -+ {0x0b, 0x0a, 0x09, 0x08, 0x06, 0x04, 0x02, 0x01}, // 28, -14.0dB -+ {0x0a, 0x0a, 0x09, 0x07, 0x05, 0x03, 0x02, 0x01}, // 29, -14.5dB -+ {0x0a, 0x09, 0x08, 0x07, 0x05, 0x03, 0x02, 0x01}, // 30, -15.0dB -+ {0x09, 0x09, 0x08, 0x06, 0x05, 0x03, 0x01, 0x01}, // 31, -15.5dB -+ {0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01} // 32, -16.0dB -+}; -+ -+ -+u8 CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8]= { -+ {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00}, // 0, +0dB -+ {0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00}, // 1, -0.5dB -+ {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00}, // 2, -1.0dB -+ {0x2d, 0x2d, 0x17, 0x17, 0x00, 0x00, 0x00, 0x00}, // 3, -1.5dB -+ {0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00}, // 4, -2.0dB -+ {0x28, 0x28, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00}, // 5, -2.5dB -+ {0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00}, // 6, -3.0dB -+ {0x24, 0x23, 0x1f, 0x12, 0x00, 0x00, 0x00, 0x00}, // 7, -3.5dB -+ {0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00}, // 8, -4.0dB -+ {0x20, 0x20, 0x1b, 0x10, 0x00, 0x00, 0x00, 0x00}, // 9, -4.5dB -+ {0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00}, // 10, -5.0dB -+ {0x1d, 0x1c, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00}, // 11, -5.5dB -+ {0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00}, // 12, -6.0dB -+ {0x1a, 0x19, 0x16, 0x0d, 0x00, 0x00, 0x00, 0x00}, // 13, -6.5dB -+ {0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00}, // 14, -7.0dB -+ {0x17, 0x16, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x00}, // 15, -7.5dB -+ {0x16, 0x15, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00}, // 16, -8.0dB -+ {0x14, 0x14, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x00}, // 17, -8.5dB -+ {0x13, 0x13, 0x10, 0x0a, 0x00, 0x00, 0x00, 0x00}, // 18, -9.0dB -+ {0x12, 0x12, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, // 19, -9.5dB -+ {0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, // 20, -10.0dB -+ {0x10, 0x10, 0x0e, 0x08, 0x00, 0x00, 0x00, 0x00}, // 21, -10.5dB -+ {0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00}, // 22, -11.0dB -+ {0x0e, 0x0e, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, // 23, -11.5dB -+ {0x0d, 0x0d, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, // 24, -12.0dB -+ {0x0d, 0x0c, 0x0b, 0x06, 0x00, 0x00, 0x00, 0x00}, // 25, -12.5dB -+ {0x0c, 0x0c, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, // 26, -13.0dB -+ {0x0b, 0x0b, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, // 27, -13.5dB -+ {0x0b, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, // 28, -14.0dB -+ {0x0a, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, // 29, -14.5dB -+ {0x0a, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, // 30, -15.0dB -+ {0x09, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, // 31, -15.5dB -+ {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00} // 32, -16.0dB -+}; -+ -+ -+#ifdef CONFIG_CHIP_VER_INTEGRATION -+void dump_chip_info(HAL_VERSION ChipVersion) -+{ -+ if(IS_81XXC(ChipVersion)){ -+ DBG_871X("Chip Version Info: %s_",IS_92C_SERIAL(ChipVersion)?"CHIP_8192C":"CHIP_8188C"); -+ } -+ else if(IS_92D(ChipVersion)){ -+ DBG_871X("Chip Version Info: CHIP_8192D_"); -+ } -+ else if(IS_8723_SERIES(ChipVersion)){ -+ DBG_871X("Chip Version Info: CHIP_8723A_"); -+ } -+ else if(IS_8188E(ChipVersion)){ -+ DBG_871X("Chip Version Info: CHIP_8188E_"); -+ } -+ -+ DBG_871X("%s_",IS_NORMAL_CHIP(ChipVersion)?"Normal_Chip":"Test_Chip"); -+ DBG_871X("%s_",IS_CHIP_VENDOR_TSMC(ChipVersion)?"TSMC":"UMC"); -+ if(IS_A_CUT(ChipVersion)) DBG_871X("A_CUT_"); -+ else if(IS_B_CUT(ChipVersion)) DBG_871X("B_CUT_"); -+ else if(IS_C_CUT(ChipVersion)) DBG_871X("C_CUT_"); -+ else if(IS_D_CUT(ChipVersion)) DBG_871X("D_CUT_"); -+ else if(IS_E_CUT(ChipVersion)) DBG_871X("E_CUT_"); -+ else DBG_871X("UNKNOWN_CUT(%d)_",ChipVersion.CUTVersion); -+ -+ if(IS_1T1R(ChipVersion)) DBG_871X("1T1R_"); -+ else if(IS_1T2R(ChipVersion)) DBG_871X("1T2R_"); -+ else if(IS_2T2R(ChipVersion)) DBG_871X("2T2R_"); -+ else DBG_871X("UNKNOWN_RFTYPE(%d)_",ChipVersion.RFType); -+ -+ -+ DBG_871X("RomVer(%d)\n",ChipVersion.ROMVer); -+} -+ -+#endif -+ -+#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 -+ -+u8 //return the final channel plan decision -+hal_com_get_channel_plan( -+ IN PADAPTER padapter, -+ IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) -+ IN u8 sw_channel_plan, //channel plan from SW (registry/module param) -+ IN u8 def_channel_plan, //channel plan used when the former two is invalid -+ IN BOOLEAN AutoLoadFail -+ ) -+{ -+ u8 swConfig; -+ u8 chnlPlan; -+ -+ swConfig = _TRUE; -+ if (!AutoLoadFail) -+ { -+ if (!rtw_is_channel_plan_valid(sw_channel_plan)) -+ swConfig = _FALSE; -+ if (hw_channel_plan & EEPROM_CHANNEL_PLAN_BY_HW_MASK) -+ swConfig = _FALSE; -+ } -+ -+ if (swConfig == _TRUE) -+ chnlPlan = sw_channel_plan; -+ else -+ chnlPlan = hw_channel_plan & (~EEPROM_CHANNEL_PLAN_BY_HW_MASK); -+ -+ if (!rtw_is_channel_plan_valid(chnlPlan)) -+ chnlPlan = def_channel_plan; -+ -+ return chnlPlan; -+} -+ -+u8 MRateToHwRate(u8 rate) -+{ -+ u8 ret = DESC_RATE1M; -+ -+ switch(rate) -+ { -+ // CCK and OFDM non-HT rates -+ case IEEE80211_CCK_RATE_1MB: ret = DESC_RATE1M; break; -+ case IEEE80211_CCK_RATE_2MB: ret = DESC_RATE2M; break; -+ case IEEE80211_CCK_RATE_5MB: ret = DESC_RATE5_5M; break; -+ case IEEE80211_CCK_RATE_11MB: ret = DESC_RATE11M; break; -+ case IEEE80211_OFDM_RATE_6MB: ret = DESC_RATE6M; break; -+ case IEEE80211_OFDM_RATE_9MB: ret = DESC_RATE9M; break; -+ case IEEE80211_OFDM_RATE_12MB: ret = DESC_RATE12M; break; -+ case IEEE80211_OFDM_RATE_18MB: ret = DESC_RATE18M; break; -+ case IEEE80211_OFDM_RATE_24MB: ret = DESC_RATE24M; break; -+ case IEEE80211_OFDM_RATE_36MB: ret = DESC_RATE36M; break; -+ case IEEE80211_OFDM_RATE_48MB: ret = DESC_RATE48M; break; -+ case IEEE80211_OFDM_RATE_54MB: ret = DESC_RATE54M; break; -+ -+ // HT rates since here -+ //case MGN_MCS0: ret = DESC_RATEMCS0; break; -+ //case MGN_MCS1: ret = DESC_RATEMCS1; break; -+ //case MGN_MCS2: ret = DESC_RATEMCS2; break; -+ //case MGN_MCS3: ret = DESC_RATEMCS3; break; -+ //case MGN_MCS4: ret = DESC_RATEMCS4; break; -+ //case MGN_MCS5: ret = DESC_RATEMCS5; break; -+ //case MGN_MCS6: ret = DESC_RATEMCS6; break; -+ //case MGN_MCS7: ret = DESC_RATEMCS7; break; -+ -+ default: break; -+ } -+ -+ return ret; -+} -+ -+void HalSetBrateCfg( -+ IN PADAPTER Adapter, -+ IN u8 *mBratesOS, -+ OUT u16 *pBrateCfg) -+{ -+ u8 i, is_brate, brate; -+ -+ for(i=0;ieeprompriv.mac_addr); -+#ifdef CONFIG_CONCURRENT_MODE -+ if (adapter->pbuddy_adapter) -+ rtw_hal_set_hwreg(adapter->pbuddy_adapter, HW_VAR_MAC_ADDR, adapter->pbuddy_adapter->eeprompriv.mac_addr); -+#endif -+} -+ -+/* -+* C2H event format: -+* Field TRIGGER CONTENT CMD_SEQ CMD_LEN CMD_ID -+* BITS [127:120] [119:16] [15:8] [7:4] [3:0] -+*/ -+ -+void c2h_evt_clear(_adapter *adapter) -+{ -+ rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); -+} -+ -+s32 c2h_evt_read(_adapter *adapter, u8 *buf) -+{ -+ s32 ret = _FAIL; -+ struct c2h_evt_hdr *c2h_evt; -+ int i; -+ u8 trigger; -+ -+ if (buf == NULL) -+ goto exit; -+ -+ trigger = rtw_read8(adapter, REG_C2HEVT_CLEAR); -+ -+ if (trigger == C2H_EVT_HOST_CLOSE) { -+ goto exit; /* Not ready */ -+ } else if (trigger != C2H_EVT_FW_CLOSE) { -+ goto clear_evt; /* Not a valid value */ -+ } -+ -+ c2h_evt = (struct c2h_evt_hdr *)buf; -+ -+ _rtw_memset(c2h_evt, 0, 16); -+ -+ *buf = rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL); -+ *(buf+1) = rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL + 1); -+ -+ RT_PRINT_DATA(_module_hal_init_c_, _drv_info_, "c2h_evt_read(): ", -+ &c2h_evt , sizeof(c2h_evt)); -+ -+ if (0) { -+ DBG_871X("%s id:%u, len:%u, seq:%u, trigger:0x%02x\n", __func__ -+ , c2h_evt->id, c2h_evt->plen, c2h_evt->seq, trigger); -+ } -+ -+ /* Read the content */ -+ for (i = 0; i < c2h_evt->plen; i++) -+ c2h_evt->payload[i] = rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL + sizeof(*c2h_evt) + i); -+ -+ RT_PRINT_DATA(_module_hal_init_c_, _drv_info_, "c2h_evt_read(): Command Content:\n", -+ c2h_evt->payload, c2h_evt->plen); -+ -+ ret = _SUCCESS; -+ -+clear_evt: -+ /* -+ * Clear event to notify FW we have read the command. -+ * If this field isn't clear, the FW won't update the next command message. -+ */ -+ c2h_evt_clear(adapter); -+exit: -+ return ret; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c -@@ -0,0 +1,546 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#define _HAL_INTF_C_ -+#include -+#include -+#include -+#include -+ -+#include -+ -+#ifdef CONFIG_SDIO_HCI -+ #include -+#elif defined(CONFIG_USB_HCI) -+ #include -+#elif defined(CONFIG_GSPI_HCI) -+ #include -+#endif -+ -+void rtw_hal_chip_configure(_adapter *padapter) -+{ -+ if(padapter->HalFunc.intf_chip_configure) -+ padapter->HalFunc.intf_chip_configure(padapter); -+} -+ -+void rtw_hal_read_chip_info(_adapter *padapter) -+{ -+ if(padapter->HalFunc.read_adapter_info) -+ padapter->HalFunc.read_adapter_info(padapter); -+} -+ -+void rtw_hal_read_chip_version(_adapter *padapter) -+{ -+ if(padapter->HalFunc.read_chip_version) -+ padapter->HalFunc.read_chip_version(padapter); -+} -+ -+void rtw_hal_def_value_init(_adapter *padapter) -+{ -+ if(padapter->HalFunc.init_default_value) -+ padapter->HalFunc.init_default_value(padapter); -+} -+ -+void rtw_hal_free_data(_adapter *padapter) -+{ -+ if(padapter->HalFunc.free_hal_data) -+ padapter->HalFunc.free_hal_data(padapter); -+} -+ -+void rtw_hal_dm_init(_adapter *padapter) -+{ -+ if(padapter->HalFunc.dm_init) -+ padapter->HalFunc.dm_init(padapter); -+} -+ -+void rtw_hal_dm_deinit(_adapter *padapter) -+{ -+ // cancel dm timer -+ if(padapter->HalFunc.dm_deinit) -+ padapter->HalFunc.dm_deinit(padapter); -+} -+ -+void rtw_hal_sw_led_init(_adapter *padapter) -+{ -+ if(padapter->HalFunc.InitSwLeds) -+ padapter->HalFunc.InitSwLeds(padapter); -+} -+ -+void rtw_hal_sw_led_deinit(_adapter *padapter) -+{ -+ if(padapter->HalFunc.DeInitSwLeds) -+ padapter->HalFunc.DeInitSwLeds(padapter); -+} -+ -+uint rtw_hal_init(_adapter *padapter) -+{ -+ uint status = _SUCCESS; -+ -+ if(padapter->hw_init_completed == _TRUE) -+ { -+ DBG_871X("rtw_hal_init: hw_init_completed == _TRUE\n"); -+ goto success; -+ } -+#ifdef CONFIG_DEINIT_BEFORE_INIT -+ status = padapter->HalFunc.hal_deinit(padapter); -+ if(status != _SUCCESS){ -+ DBG_871X("rtw_hal_init: hal_deinit before hal_init FAIL !!\n"); -+ goto fail; -+ } -+#endif -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ // before init mac0, driver must init mac1 first to avoid usb rx error. -+ if((padapter->pbuddy_adapter != NULL) && (padapter->DualMacConcurrent == _TRUE) -+ && (padapter->adapter_type == PRIMARY_ADAPTER)) -+ { -+ if(padapter->pbuddy_adapter->hw_init_completed == _TRUE) -+ { -+ DBG_871X("rtw_hal_init: pbuddy_adapter hw_init_completed == _TRUE\n"); -+ } -+ else -+ { -+#ifdef CONFIG_DEINIT_BEFORE_INIT -+ status = padapter->HalFunc.hal_deinit(padapter->pbuddy_adapter); -+ if(status != _SUCCESS){ -+ DBG_871X("rtw_hal_init: hal_deinit before hal_init FAIL !!(pbuddy_adapter)\n"); -+ goto fail; -+ } -+#endif -+ status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter); -+ if(status == _SUCCESS){ -+ padapter->pbuddy_adapter->hw_init_completed = _TRUE; -+ } -+ else{ -+ padapter->pbuddy_adapter->hw_init_completed = _FALSE; -+ RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n")); -+ goto fail; -+ } -+ } -+ } -+#else -+ if(adapter_to_dvobj(padapter)->DualMacMode == _TRUE) -+ { -+ if(padapter->pbuddy_adapter != NULL) { -+ if(padapter->pbuddy_adapter->hw_init_completed == _FALSE) -+ { -+#ifdef CONFIG_DEINIT_BEFORE_INIT -+ status = padapter->HalFunc.hal_deinit(padapter->pbuddy_adapter); -+ if(status != _SUCCESS){ -+ DBG_871X("rtw_hal_init: hal_deinit before hal_init FAIL !!(pbuddy_adapter)\n"); -+ goto fail; -+ } -+#endif -+ status = padapter->HalFunc.hal_init(padapter->pbuddy_adapter); -+ if(status == _SUCCESS){ -+ padapter->pbuddy_adapter->hw_init_completed = _TRUE; -+ } -+ else{ -+ padapter->pbuddy_adapter->hw_init_completed = _FALSE; -+ RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail for another interface\n")); -+ } -+ } -+ } -+ } -+#endif -+ -+ padapter->hw_init_completed=_FALSE; -+ -+ status = padapter->HalFunc.hal_init(padapter); -+ -+ if(status == _SUCCESS){ -+ padapter->hw_init_completed = _TRUE; -+ } -+ else{ -+ padapter->hw_init_completed = _FALSE; -+ RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail\n")); -+ goto fail; -+ } -+ -+success: -+ -+ if (padapter->registrypriv.notch_filter == 1) -+ rtw_hal_notch_filter(padapter, 1); -+ -+ rtw_hal_reset_security_engine(padapter); -+ -+ rtw_sec_restore_wep_key(padapter); -+ -+ init_hw_mlme_ext(padapter); -+ -+fail: -+ -+ RT_TRACE(_module_hal_init_c_,_drv_err_,("-rtl871x_hal_init:status=0x%x\n",status)); -+ -+ return status; -+} -+ -+uint rtw_hal_deinit(_adapter *padapter) -+{ -+ uint status = _SUCCESS; -+ -+_func_enter_; -+ -+ status = padapter->HalFunc.hal_deinit(padapter); -+ -+ if(status == _SUCCESS){ -+ padapter->hw_init_completed = _FALSE; -+ } -+ else -+ { -+ RT_TRACE(_module_hal_init_c_,_drv_err_,("\n rtw_hal_deinit: hal_init fail\n")); -+ } -+ -+_func_exit_; -+ -+ return status; -+} -+ -+void rtw_hal_set_hwreg(_adapter *padapter, u8 variable, u8 *val) -+{ -+ if (padapter->HalFunc.SetHwRegHandler) -+ padapter->HalFunc.SetHwRegHandler(padapter, variable, val); -+} -+ -+void rtw_hal_get_hwreg(_adapter *padapter, u8 variable, u8 *val) -+{ -+ if (padapter->HalFunc.GetHwRegHandler) -+ padapter->HalFunc.GetHwRegHandler(padapter, variable, val); -+} -+ -+u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) -+{ -+ if(padapter->HalFunc.SetHalDefVarHandler) -+ return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue); -+ return _FAIL; -+} -+ -+u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) -+{ -+ if(padapter->HalFunc.GetHalDefVarHandler) -+ return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue); -+ return _FAIL; -+} -+ -+void rtw_hal_enable_interrupt(_adapter *padapter) -+{ -+ if (padapter->HalFunc.enable_interrupt) -+ padapter->HalFunc.enable_interrupt(padapter); -+ else -+ DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__); -+ -+} -+void rtw_hal_disable_interrupt(_adapter *padapter) -+{ -+ if (padapter->HalFunc.disable_interrupt) -+ padapter->HalFunc.disable_interrupt(padapter); -+ else -+ DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __FUNCTION__); -+ -+} -+ -+u32 rtw_hal_inirp_init(_adapter *padapter) -+{ -+ u32 rst = _FAIL; -+ if(padapter->HalFunc.inirp_init) -+ rst = padapter->HalFunc.inirp_init(padapter); -+ else -+ DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__); -+ return rst; -+} -+ -+u32 rtw_hal_inirp_deinit(_adapter *padapter) -+{ -+ -+ if(padapter->HalFunc.inirp_deinit) -+ return padapter->HalFunc.inirp_deinit(padapter); -+ -+ return _FAIL; -+ -+} -+ -+u8 rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val) -+{ -+ if(padapter->HalFunc.interface_ps_func) -+ return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val); -+ return _FAIL; -+} -+ -+s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ if(padapter->HalFunc.hal_xmitframe_enqueue) -+ return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe); -+ -+ return _FALSE; -+} -+ -+s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ if(padapter->HalFunc.hal_xmit) -+ return padapter->HalFunc.hal_xmit(padapter, pxmitframe); -+ -+ return _FALSE; -+} -+ -+s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe) -+{ -+ s32 ret = _FAIL; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ _rtw_memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); -+ -+#ifdef CONFIG_IEEE80211W -+ if(padapter->securitypriv.binstallBIPkey == _TRUE) -+ { -+ if(IS_MCAST(pmgntframe->attrib.ra)) -+ { -+ pmgntframe->attrib.encrypt = _BIP_; -+ //pmgntframe->attrib.bswenc = _TRUE; -+ } -+ else -+ { -+ pmgntframe->attrib.encrypt = _AES_; -+ pmgntframe->attrib.bswenc = _TRUE; -+ } -+ rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe); -+ } -+#endif //CONFIG_IEEE80211W -+ -+ if(padapter->HalFunc.mgnt_xmit) -+ ret = padapter->HalFunc.mgnt_xmit(padapter, pmgntframe); -+ return ret; -+} -+ -+s32 rtw_hal_init_xmit_priv(_adapter *padapter) -+{ -+ if(padapter->HalFunc.init_xmit_priv != NULL) -+ return padapter->HalFunc.init_xmit_priv(padapter); -+ return _FAIL; -+} -+ -+void rtw_hal_free_xmit_priv(_adapter *padapter) -+{ -+ if(padapter->HalFunc.free_xmit_priv != NULL) -+ padapter->HalFunc.free_xmit_priv(padapter); -+} -+ -+s32 rtw_hal_init_recv_priv(_adapter *padapter) -+{ -+ if(padapter->HalFunc.init_recv_priv) -+ return padapter->HalFunc.init_recv_priv(padapter); -+ -+ return _FAIL; -+} -+ -+void rtw_hal_free_recv_priv(_adapter *padapter) -+{ -+ if(padapter->HalFunc.free_recv_priv) -+ padapter->HalFunc.free_recv_priv(padapter); -+} -+ -+void rtw_hal_update_ra_mask(_adapter *padapter, u32 mac_id) -+{ -+ if(padapter->HalFunc.UpdateRAMaskHandler) -+ padapter->HalFunc.UpdateRAMaskHandler(padapter,mac_id); -+} -+ -+void rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8 arg) -+{ -+ if(padapter->HalFunc.Add_RateATid) -+ padapter->HalFunc.Add_RateATid(padapter, bitmap, arg); -+} -+ -+u32 rtw_hal_read_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask) -+{ -+ u32 data = 0; -+ if (padapter->HalFunc.read_bbreg) -+ data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask); -+ return data; -+} -+ -+void rtw_hal_write_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data) -+{ -+ if (padapter->HalFunc.write_bbreg) -+ padapter->HalFunc.write_bbreg(padapter, RegAddr, BitMask, Data); -+} -+ -+u32 rtw_hal_read_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask) -+{ -+ u32 data = 0; -+ if (padapter->HalFunc.read_rfreg) -+ data = padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMask); -+ return data; -+} -+ -+void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data) -+{ -+ if (padapter->HalFunc.write_rfreg) -+ padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data); -+} -+ -+s32 rtw_hal_interrupt_handler(_adapter *padapter) -+{ -+ if(padapter->HalFunc.interrupt_handler) -+ return padapter->HalFunc.interrupt_handler(padapter); -+ return _FAIL; -+} -+ -+void rtw_hal_set_bwmode(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset) -+{ -+ if(padapter->HalFunc.set_bwmode_handler) -+ padapter->HalFunc.set_bwmode_handler(padapter, Bandwidth, Offset); -+} -+ -+void rtw_hal_set_chan(_adapter *padapter, u8 channel) -+{ -+ if(padapter->HalFunc.set_channel_handler) -+ padapter->HalFunc.set_channel_handler(padapter, channel); -+} -+ -+void rtw_hal_dm_watchdog(_adapter *padapter) -+{ -+ if(padapter->HalFunc.hal_dm_watchdog) -+ padapter->HalFunc.hal_dm_watchdog(padapter); -+} -+ -+void rtw_hal_bcn_related_reg_setting(_adapter *padapter) -+{ -+ if(padapter->HalFunc.SetBeaconRelatedRegistersHandler) -+ padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter); -+} -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+u8 rtw_hal_antdiv_before_linked(_adapter *padapter) -+{ -+ if (padapter->HalFunc.AntDivBeforeLinkHandler) -+ return padapter->HalFunc.AntDivBeforeLinkHandler(padapter); -+ return _FALSE; -+} -+ -+void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) -+{ -+ if (padapter->HalFunc.AntDivCompareHandler) -+ padapter->HalFunc.AntDivCompareHandler(padapter, dst, src); -+} -+#endif -+ -+#ifdef CONFIG_HOSTAPD_MLME -+s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) -+{ -+ if (padapter->HalFunc.hostap_mgnt_xmit_entry) -+ return padapter->HalFunc.hostap_mgnt_xmit_entry(padapter, pkt); -+ return _FAIL; -+} -+#endif //CONFIG_HOSTAPD_MLME -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+void rtw_hal_sreset_init(_adapter *padapter) -+{ -+ if(padapter->HalFunc.sreset_init_value) -+ padapter->HalFunc.sreset_init_value(padapter); -+} -+ -+void rtw_hal_sreset_reset(_adapter *padapter) -+{ -+ padapter = GET_PRIMARY_ADAPTER(padapter); -+ -+ if(padapter->HalFunc.silentreset) -+ padapter->HalFunc.silentreset(padapter); -+} -+ -+void rtw_hal_sreset_reset_value(_adapter *padapter) -+{ -+ if(padapter->HalFunc.sreset_reset_value) -+ padapter->HalFunc.sreset_reset_value(padapter); -+} -+ -+void rtw_hal_sreset_xmit_status_check(_adapter *padapter) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->adapter_type != PRIMARY_ADAPTER) -+ return; -+#endif -+ if(padapter->HalFunc.sreset_xmit_status_check) -+ padapter->HalFunc.sreset_xmit_status_check(padapter); -+} -+ -+void rtw_hal_sreset_linked_status_check(_adapter *padapter) -+{ -+ if(padapter->HalFunc.sreset_linked_status_check) -+ padapter->HalFunc.sreset_linked_status_check(padapter); -+} -+ -+u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter) -+{ -+ u8 status = 0; -+ if(padapter->HalFunc.sreset_get_wifi_status) -+ status = padapter->HalFunc.sreset_get_wifi_status(padapter); -+ return status; -+} -+ -+bool rtw_hal_sreset_inprogress(_adapter *padapter) -+{ -+ bool inprogress = _FALSE; -+ -+ padapter = GET_PRIMARY_ADAPTER(padapter); -+ -+ if(padapter->HalFunc.sreset_inprogress) -+ inprogress = padapter->HalFunc.sreset_inprogress(padapter); -+ return inprogress; -+} -+#endif //DBG_CONFIG_ERROR_DETECT -+ -+#ifdef CONFIG_IOL -+int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms) -+{ -+ if (adapter->HalFunc.IOL_exec_cmds_sync) -+ return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms); -+ return _FAIL; -+} -+#endif -+ -+void rtw_hal_notch_filter(_adapter *adapter, bool enable) -+{ -+ if(adapter->HalFunc.hal_notch_filter) -+ adapter->HalFunc.hal_notch_filter(adapter,enable); -+} -+ -+void rtw_hal_reset_security_engine(_adapter * adapter) -+{ -+ if(adapter->HalFunc.hal_reset_security_engine) -+ adapter->HalFunc.hal_reset_security_engine(adapter); -+} -+ -+s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt) -+{ -+ s32 ret = _FAIL; -+ if (adapter->HalFunc.c2h_handler) -+ ret = adapter->HalFunc.c2h_handler(adapter, c2h_evt); -+ return ret; -+} -+ -+c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter) -+{ -+ return adapter->HalFunc.c2h_id_filter_ccx; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c -@@ -0,0 +1,1159 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTL8192C_CMD_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+ -+#define RTL92C_MAX_H2C_BOX_NUMS 4 -+#define RTL92C_MAX_CMD_LEN 5 -+#define MESSAGE_BOX_SIZE 4 -+#define EX_MESSAGE_BOX_SIZE 2 -+ -+static u8 _is_fw_read_cmd_down(_adapter* padapter, u8 msgbox_num) -+{ -+ u8 read_down = _FALSE; -+ int retry_cnts = 100; -+ -+ u8 valid; -+ -+// DBG_8192C(" _is_fw_read_cmd_down ,isnormal_chip(%x),reg_1cc(%x),msg_box(%d)...\n",isvern,rtw_read8(padapter,REG_HMETFR),msgbox_num); -+ -+ do{ -+ valid = rtw_read8(padapter,REG_HMETFR) & BIT(msgbox_num); -+ if(0 == valid ){ -+ read_down = _TRUE; -+ } -+ }while( (!read_down) && (retry_cnts--)); -+ -+ return read_down; -+ -+} -+ -+ -+/***************************************** -+* H2C Msg format : -+*| 31 - 8 |7 | 6 - 0 | -+*| h2c_msg |Ext_bit |CMD_ID | -+* -+******************************************/ -+int rtl8192c_FillH2CCmd(_adapter* padapter, u8 ElementID, u32 CmdLen, u8* pCmdBuffer) -+{ -+ u8 bcmd_down = _FALSE; -+ int retry_cnts = 100; -+ u8 h2c_box_num; -+ u32 msgbox_addr; -+ u32 msgbox_ex_addr; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ u32 h2c_cmd = 0; -+ u16 h2c_cmd_ex = 0; -+ int ret = _FAIL; -+ -+_func_enter_; -+ -+ padapter = GET_PRIMARY_ADAPTER(padapter); -+ pHalData = GET_HAL_DATA(padapter); -+ -+ if(padapter->bFWReady == _FALSE) -+ { -+ DBG_8192C("FillH2CCmd(): return H2C cmd because fw is not ready\n"); -+ return ret; -+ } -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->h2c_fwcmd_mutex), NULL); -+ -+ if(!pCmdBuffer){ -+ goto exit; -+ } -+ if(CmdLen > RTL92C_MAX_CMD_LEN){ -+ goto exit; -+ } -+ //pay attention to if race condition happened in H2C cmd setting. -+ do{ -+ h2c_box_num = pHalData->LastHMEBoxNum; -+ -+ if(!_is_fw_read_cmd_down(padapter, h2c_box_num)){ -+ DBG_8192C(" fw read cmd failed...\n"); -+ goto exit; -+ } -+ -+ if(CmdLen<=3) -+ { -+ _rtw_memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer, CmdLen ); -+ } -+ else{ -+ _rtw_memcpy((u8*)(&h2c_cmd_ex), pCmdBuffer, EX_MESSAGE_BOX_SIZE); -+ _rtw_memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer+2,( CmdLen-EX_MESSAGE_BOX_SIZE)); -+ *(u8*)(&h2c_cmd) |= BIT(7); -+ } -+ -+ *(u8*)(&h2c_cmd) |= ElementID; -+ -+ if(h2c_cmd & BIT(7)){ -+ msgbox_ex_addr = REG_HMEBOX_EXT_0 + (h2c_box_num *EX_MESSAGE_BOX_SIZE); -+ h2c_cmd_ex = cpu_to_le16( h2c_cmd_ex ); -+ rtw_write16(padapter, msgbox_ex_addr, h2c_cmd_ex); -+ } -+ msgbox_addr =REG_HMEBOX_0 + (h2c_box_num *MESSAGE_BOX_SIZE); -+ h2c_cmd = cpu_to_le32( h2c_cmd ); -+ rtw_write32(padapter,msgbox_addr, h2c_cmd); -+ -+ bcmd_down = _TRUE; -+ -+ // DBG_8192C("MSG_BOX:%d,CmdLen(%d), reg:0x%x =>h2c_cmd:0x%x, reg:0x%x =>h2c_cmd_ex:0x%x ..\n" -+ // ,pHalData->LastHMEBoxNum ,CmdLen,msgbox_addr,h2c_cmd,msgbox_ex_addr,h2c_cmd_ex); -+ -+ pHalData->LastHMEBoxNum = (h2c_box_num+1) % RTL92C_MAX_H2C_BOX_NUMS ; -+ -+ }while((!bcmd_down) && (retry_cnts--)); -+/* -+ if(bcmd_down) -+ DBG_8192C("H2C Cmd exe down. \n" ); -+ else -+ DBG_8192C("H2C Cmd exe failed. \n" ); -+*/ -+ ret = _SUCCESS; -+ -+exit: -+ -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->h2c_fwcmd_mutex), NULL); -+ -+_func_exit_; -+ -+ return ret; -+ -+} -+ -+u8 rtl8192c_h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) -+{ -+ u8 ElementID, CmdLen; -+ u8 *pCmdBuffer; -+ struct cmd_msg_parm *pcmdmsg; -+ -+ if(!pbuf) -+ return H2C_PARAMETERS_ERROR; -+ -+ pcmdmsg = (struct cmd_msg_parm*)pbuf; -+ ElementID = pcmdmsg->eid; -+ CmdLen = pcmdmsg->sz; -+ pCmdBuffer = pcmdmsg->buf; -+ -+ rtl8192c_FillH2CCmd(padapter, ElementID, CmdLen, pCmdBuffer); -+ -+ return H2C_SUCCESS; -+} -+ -+#if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) -+u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period) -+{ -+ u8 res=_SUCCESS; -+ struct H2C_SS_RFOFF_PARAM param; -+ DBG_8192C("==>%s bfwpoll(%x)\n",__FUNCTION__,bfwpoll); -+ param.gpio_period = period;//Polling GPIO_11 period time -+ param.ROFOn = (_TRUE == bfwpoll)?1:0; -+ rtl8192c_FillH2CCmd(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(¶m)); -+ return res; -+} -+#endif //CONFIG_AUTOSUSPEND && SUPPORT_HW_RFOFF_DETECTED -+ -+u8 rtl8192c_set_rssi_cmd(_adapter*padapter, u8 *param) -+{ -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ *((u32*) param ) = cpu_to_le32( *((u32*) param ) ); -+ -+ rtl8192c_FillH2CCmd(padapter, RSSI_SETTING_EID, 3, param); -+ -+_func_exit_; -+ -+ return res; -+} -+ -+u8 rtl8192c_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg) -+{ -+ u8 buf[5]; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ _rtw_memset(buf, 0, 5); -+ mask = cpu_to_le32( mask ); -+ _rtw_memcpy(buf, &mask, 4); -+ buf[4] = arg; -+ -+ rtl8192c_FillH2CCmd(padapter, MACID_CONFIG_EID, 5, buf); -+ -+_func_exit_; -+ -+ return res; -+ -+} -+ -+//bitmap[0:27] = tx_rate_bitmap -+//bitmap[28:31]= Rate Adaptive id -+//arg[0:4] = macid -+//arg[5] = Short GI -+void rtl8192c_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg) -+{ -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ if(pHalData->fw_ractrl == _TRUE) -+ { -+ rtl8192c_set_raid_cmd(pAdapter, bitmap, arg); -+ } -+ else -+ { -+ u8 macid, init_rate, shortGIrate=_FALSE; -+ -+ init_rate = get_highest_rate_idx(bitmap&0x0fffffff)&0x3f; -+ -+ macid = arg&0x1f; -+ -+ shortGIrate = (arg&BIT(5)) ? _TRUE:_FALSE; -+ -+ if (shortGIrate==_TRUE) -+ init_rate |= BIT(6); -+ -+ rtw_write8(pAdapter, (REG_INIDATA_RATE_SEL+macid), (u8)init_rate); -+ } -+ -+} -+ -+void rtl8192c_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode) -+{ -+ SETPWRMODE_PARM H2CSetPwrMode; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+_func_enter_; -+ -+ DBG_871X("%s(): Mode = %d, SmartPS = %d\n", __FUNCTION__,Mode,pwrpriv->smart_ps); -+ -+ H2CSetPwrMode.Mode = Mode; -+ -+ H2CSetPwrMode.SmartPS = pwrpriv->smart_ps; -+ -+ H2CSetPwrMode.BcnPassTime = 1;//pPSC->RegMaxLPSAwakeIntvl; -+ -+ rtl8192c_FillH2CCmd(padapter, SET_PWRMODE_EID, sizeof(H2CSetPwrMode), (u8 *)&H2CSetPwrMode); -+ -+_func_exit_; -+} -+ -+void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength) -+{ -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u16 *fctrl; -+ u32 rate_len, pktlen; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/); -+ //pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_BEACON); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pktlen = sizeof (struct rtw_ieee80211_hdr_3addr); -+ -+ //timestamp will be inserted by hardware -+ pframe += 8; -+ pktlen += 8; -+ -+ // beacon interval: 2 bytes -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ pktlen += 2; -+ -+ // capability info: 2 bytes -+ _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); -+ -+ pframe += 2; -+ pktlen += 2; -+ -+ if( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) -+ { -+ //DBG_871X("ie len=%d\n", cur_network->IELength); -+ pktlen += cur_network->IELength - sizeof(NDIS_802_11_FIXED_IEs); -+ _rtw_memcpy(pframe, cur_network->IEs+sizeof(NDIS_802_11_FIXED_IEs), pktlen); -+ -+ goto _ConstructBeacon; -+ } -+ -+ //below for ad-hoc mode -+ -+ // SSID -+ pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pktlen); -+ -+ // supported rates... -+ rate_len = rtw_get_rateset_len(cur_network->SupportedRates); -+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8)? 8: rate_len), cur_network->SupportedRates, &pktlen); -+ -+ // DS parameter set -+ pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen); -+ -+ if( (pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) -+ { -+ u32 ATIMWindow; -+ // IBSS Parameter Set... -+ //ATIMWindow = cur->Configuration.ATIMWindow; -+ ATIMWindow = 0; -+ pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pktlen); -+ } -+ -+ -+ //todo: ERP IE -+ -+ -+ // EXTERNDED SUPPORTED RATE -+ if (rate_len > 8) -+ { -+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pktlen); -+ } -+ -+ -+ //todo:HT for adhoc -+ -+_ConstructBeacon: -+ -+ if ((pktlen + TXDESC_SIZE) > 512) -+ { -+ DBG_871X("beacon frame too large\n"); -+ return; -+ } -+ -+ *pLength = pktlen; -+ -+ //DBG_871X("%s bcn_sz=%d\n", __FUNCTION__, pktlen); -+ -+} -+ -+void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) -+{ -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u16 *fctrl; -+ u32 pktlen; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ // Frame control. -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ SetPwrMgt(fctrl); -+ SetFrameSubType(pframe, WIFI_PSPOLL); -+ -+ // AID. -+ SetDuration(pframe, (pmlmeinfo->aid | 0xc000)); -+ -+ // BSSID. -+ _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ // TA. -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ -+ *pLength = 16; -+} -+ -+void ConstructNullFunctionData(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, BOOLEAN bForcePowerSave) -+{ -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u16 *fctrl; -+ u32 pktlen; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wlan_network *cur_network = &pmlmepriv->cur_network; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //DBG_871X("%s:%d\n", __FUNCTION__, bForcePowerSave); -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ if (bForcePowerSave) -+ { -+ SetPwrMgt(fctrl); -+ } -+ -+ switch(cur_network->network.InfrastructureMode) -+ { -+ case Ndis802_11Infrastructure: -+ SetToDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, StaAddr, ETH_ALEN); -+ break; -+ case Ndis802_11APMode: -+ SetFrDs(fctrl); -+ _rtw_memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ break; -+ case Ndis802_11IBSS: -+ default: -+ _rtw_memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ break; -+ } -+ -+ SetSeqNum(pwlanhdr, 0); -+ -+ SetFrameSubType(pframe, WIFI_DATA_NULL); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ *pLength = pktlen; -+} -+ -+void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, BOOLEAN bHideSSID) -+{ -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ u16 *fctrl; -+ u8 *mac, *bssid; -+ u32 pktlen; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+ -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ mac = myid(&(padapter->eeprompriv)); -+ bssid = cur_network->MacAddress; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ _rtw_memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, bssid, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, 0); -+ SetFrameSubType(fctrl, WIFI_PROBERSP); -+ -+ pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ pframe += pktlen; -+ -+ if(cur_network->IELength>MAX_IE_SZ) -+ return; -+ -+ _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); -+ pframe += cur_network->IELength; -+ pktlen += cur_network->IELength; -+ -+ *pLength = pktlen; -+} -+ -+// -+// Description: In normal chip, we should send some packet to Hw which will be used by Fw -+// in FW LPS mode. The function is to fill the Tx descriptor of this packets, then -+// Fw can tell Hw to send these packet derectly. -+// Added by tynli. 2009.10.15. -+// -+static VOID -+FillFakeTxDescriptor92C( -+ IN PADAPTER Adapter, -+ IN u8* pDesc, -+ IN u32 BufferLen, -+ IN BOOLEAN IsPsPoll -+) -+{ -+ struct tx_desc *ptxdesc = (struct tx_desc *)pDesc; -+ -+ // Clear all status -+ _rtw_memset(pDesc, 0, 32); -+ -+ //offset 0 -+ ptxdesc->txdw0 |= cpu_to_le32( OWN | FSG | LSG); //own, bFirstSeg, bLastSeg; -+ -+ ptxdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE+OFFSET_SZ)<txdw0 |= cpu_to_le32(BufferLen&0x0000ffff); // Buffer size + command header -+ -+ //offset 4 -+ ptxdesc->txdw1 |= cpu_to_le32((QSLT_MGNT<txdw1 |= cpu_to_le32(NAVUSEHDR); -+ } -+ else -+ { -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(7)); // Hw set sequence number -+ ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29. -+ } -+ -+ //offset 16 -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(8));//driver uses rate -+ -+#ifdef CONFIG_USB_HCI -+ // USB interface drop packet if the checksum of descriptor isn't correct. -+ // Using this checksum can let hardware recovery from packet bulk out error (e.g. Cancel URC, Bulk out error.). -+ rtl8192cu_cal_txdesc_chksum(ptxdesc); -+#endif -+ -+ //RT_PRINT_DATA(COMP_CMD, DBG_TRACE, "TxFillCmdDesc8192C(): H2C Tx Cmd Content ----->\n", pDesc, TX_DESC_SIZE); -+} -+ -+// To check if reserved page content is destroyed by beacon beacuse beacon is too large. -+// 2010.06.23. Added by tynli. -+VOID -+CheckFwRsvdPageContent( -+ IN PADAPTER Adapter -+) -+{ -+ HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); -+ u32 MaxBcnPageNum; -+ -+ if(pHalData->FwRsvdPageStartOffset != 0) -+ { -+ /*MaxBcnPageNum = PageNum_128(pMgntInfo->MaxBeaconSize); -+ RT_ASSERT((MaxBcnPageNum <= pHalData->FwRsvdPageStartOffset), -+ ("CheckFwRsvdPageContent(): The reserved page content has been"\ -+ "destroyed by beacon!!! MaxBcnPageNum(%d) FwRsvdPageStartOffset(%d)\n!", -+ MaxBcnPageNum, pHalData->FwRsvdPageStartOffset));*/ -+ } -+} -+ -+// -+// Description: Fill the reserved packets that FW will use to RSVD page. -+// Now we just send 4 types packet to rsvd page. -+// (1)Beacon, (2)Ps-poll, (3)Null data, (4)ProbeRsp. -+// Input: -+// bDLFinished - FALSE: At the first time we will send all the packets as a large packet to Hw, -+// so we need to set the packet length to total lengh. -+// TRUE: At the second time, we should send the first packet (default:beacon) -+// to Hw again and set the lengh in descriptor to the real beacon lengh. -+// 2009.10.15 by tynli. -+static void SetFwRsvdPagePkt(PADAPTER Adapter, BOOLEAN bDLFinished) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(Adapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u32 BeaconLength, ProbeRspLength, PSPollLength, NullFunctionDataLength; -+ u8 *ReservedPagePacket; -+ u8 PageNum=0, U1bTmp, TxDescLen=0, TxDescOffset=0; -+ u16 BufIndex=0; -+ u32 TotalPacketLen; -+ RSVDPAGE_LOC RsvdPageLoc; -+ BOOLEAN bDLOK = _FALSE; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ ReservedPagePacket = (u8*)rtw_malloc(1000); -+ if(ReservedPagePacket == NULL){ -+ DBG_871X("%s(): alloc ReservedPagePacket fail !!!\n", __FUNCTION__); -+ return; -+ } -+ -+ _rtw_memset(ReservedPagePacket, 0, 1000); -+ -+ TxDescLen = 32;//TX_DESC_SIZE; -+ -+#ifdef CONFIG_USB_HCI -+ BufIndex = TXDESC_OFFSET; -+ TxDescOffset = TxDescLen+8; //Shift index for 8 bytes because the dummy bytes in the first descipstor. -+#else -+ BufIndex = 0; -+ TxDescOffset = 0; -+#endif -+ -+ //(1) beacon -+ ConstructBeacon(Adapter,&ReservedPagePacket[BufIndex],&BeaconLength); -+ -+ //DBG_8192C("SetFwRsvdPagePkt(): HW_VAR_SET_TX_CMD: BCN\n", &ReservedPagePacket[BufIndex], (BeaconLength+BufIndex)); -+ -+//-------------------------------------------------------------------- -+ -+ // When we count the first page size, we need to reserve description size for the RSVD -+ // packet, it will be filled in front of the packet in TXPKTBUF. -+ U1bTmp = (u8)PageNum_128(BeaconLength+TxDescLen); -+ PageNum += U1bTmp; -+ // To reserved 2 pages for beacon buffer. 2010.06.24. -+ if(PageNum == 1) -+ PageNum+=1; -+ pHalData->FwRsvdPageStartOffset = PageNum; -+ -+ BufIndex = (PageNum*128) + TxDescOffset; -+ -+ //(2) ps-poll -+ ConstructPSPoll(Adapter, &ReservedPagePacket[BufIndex],&PSPollLength); -+ -+ FillFakeTxDescriptor92C(Adapter, &ReservedPagePacket[BufIndex-TxDescLen], PSPollLength, _TRUE); -+ -+ //DBG_8192C("SetFwRsvdPagePkt(): HW_VAR_SET_TX_CMD: PS-POLL\n", &ReservedPagePacket[BufIndex-TxDescLen], (PSPollLength+TxDescLen)); -+ -+ RsvdPageLoc.LocPsPoll = PageNum; -+ -+//------------------------------------------------------------------ -+ -+ U1bTmp = (u8)PageNum_128(PSPollLength+TxDescLen); -+ PageNum += U1bTmp; -+ -+ BufIndex = (PageNum*128) + TxDescOffset; -+ -+ //(3) null data -+ ConstructNullFunctionData( -+ Adapter, -+ &ReservedPagePacket[BufIndex], -+ &NullFunctionDataLength, -+ get_my_bssid(&(pmlmeinfo->network)), -+ _FALSE); -+ -+ FillFakeTxDescriptor92C(Adapter, &ReservedPagePacket[BufIndex-TxDescLen], NullFunctionDataLength, _FALSE); -+ -+ RsvdPageLoc.LocNullData = PageNum; -+ -+ //DBG_8192C("SetFwRsvdPagePkt(): HW_VAR_SET_TX_CMD: NULL DATA \n", &ReservedPagePacket[BufIndex-TxDescLen], (NullFunctionDataLength+TxDescLen)); -+//------------------------------------------------------------------ -+ -+ U1bTmp = (u8)PageNum_128(NullFunctionDataLength+TxDescLen); -+ PageNum += U1bTmp; -+ -+ BufIndex = (PageNum*128) + TxDescOffset; -+ -+ //(4) probe response -+ ConstructProbeRsp( -+ Adapter, -+ &ReservedPagePacket[BufIndex], -+ &ProbeRspLength, -+ get_my_bssid(&(pmlmeinfo->network)), -+ _FALSE); -+ -+ FillFakeTxDescriptor92C(Adapter, &ReservedPagePacket[BufIndex-TxDescLen], ProbeRspLength, _FALSE); -+ -+ RsvdPageLoc.LocProbeRsp = PageNum; -+ -+ //DBG_8192C("SetFwRsvdPagePkt(): HW_VAR_SET_TX_CMD: PROBE RSP \n", &ReservedPagePacket[BufIndex-TxDescLen], (ProbeRspLength-TxDescLen)); -+ -+//------------------------------------------------------------------ -+ -+ U1bTmp = (u8)PageNum_128(ProbeRspLength+TxDescLen); -+ -+ PageNum += U1bTmp; -+ -+ TotalPacketLen = (PageNum*128); -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(Adapter, pattrib); -+ pattrib->qsel = 0x10; -+ pattrib->pktlen = pattrib->last_txcmdsz = TotalPacketLen - TxDescLen; -+ _rtw_memcpy(pmgntframe->buf_addr, ReservedPagePacket, TotalPacketLen); -+ -+ rtw_hal_mgnt_xmit(Adapter, pmgntframe); -+ -+ bDLOK = _TRUE; -+ -+ if(bDLOK) -+ { -+ DBG_871X("Set RSVD page location to Fw.\n"); -+ rtl8192c_FillH2CCmd(Adapter, RSVD_PAGE_EID, sizeof(RsvdPageLoc), (u8 *)&RsvdPageLoc); -+ } -+ -+ rtw_mfree(ReservedPagePacket,1000); -+ -+} -+ -+void rtl8192c_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus) -+{ -+ JOINBSSRPT_PARM JoinBssRptParm; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+_func_enter_; -+ -+ DBG_871X("%s mstatus(%x)\n", __FUNCTION__,mstatus); -+ -+ if(mstatus == 1) -+ { -+ BOOLEAN bRecover = _FALSE; -+ -+ // We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. -+ // Suggested by filen. Added by tynli. -+ rtw_write16(padapter, REG_BCN_PSR_RPT, (0xC000|pmlmeinfo->aid)); -+ // Do not set TSF again here or vWiFi beacon DMA INT will not work. -+ //correct_TSF(padapter, pmlmeext); -+ // Hw sequende enable by dedault. 2010.06.23. by tynli. -+ //rtw_write16(padapter, REG_NQOS_SEQ, ((pmlmeext->mgnt_seq+100)&0xFFF)); -+ //rtw_write8(padapter, REG_HWSEQ_CTRL, 0xFF); -+ -+ //set REG_CR bit 8 -+ //U1bTmp = rtw_read8(padapter, REG_CR+1); -+ rtw_write8(padapter, REG_CR+1, 0x03); -+ -+ // Disable Hw protection for a time which revserd for Hw sending beacon. -+ // Fix download reserved page packet fail that access collision with the protection time. -+ // 2010.05.11. Added by tynli. -+ //SetBcnCtrlReg(padapter, 0, BIT3); -+ //SetBcnCtrlReg(padapter, BIT4, 0); -+ rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&(~BIT(3))); -+ rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)|BIT(4)); -+ -+ // Set FWHW_TXQ_CTRL 0x422[6]=0 to tell Hw the packet is not a real beacon frame. -+ if(pHalData->RegFwHwTxQCtrl&BIT6) -+ bRecover = _TRUE; -+ -+ // To tell Hw the packet is not a real beacon frame. -+ //U1bTmp = rtw_read8(padapter, REG_FWHW_TXQ_CTRL+2); -+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl&(~BIT6))); -+ pHalData->RegFwHwTxQCtrl &= (~BIT6); -+ SetFwRsvdPagePkt(padapter, 0); -+ -+ // 2010.05.11. Added by tynli. -+ //SetBcnCtrlReg(padapter, BIT3, 0); -+ //SetBcnCtrlReg(padapter, 0, BIT4); -+ rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)|BIT(3)); -+ rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&(~BIT(4))); -+ -+ // To make sure that if there exists an adapter which would like to send beacon. -+ // If exists, the origianl value of 0x422[6] will be 1, we should check this to -+ // prevent from setting 0x422[6] to 0 after download reserved page, or it will cause -+ // the beacon cannot be sent by HW. -+ // 2010.06.23. Added by tynli. -+ if(bRecover) -+ { -+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl|BIT6)); -+ pHalData->RegFwHwTxQCtrl |= BIT6; -+ } -+ -+ // Clear CR[8] or beacon packet will not be send to TxBuf anymore. -+ rtw_write8(padapter, REG_CR+1, 0x02); -+ } -+ -+ JoinBssRptParm.OpMode = mstatus; -+ -+ rtl8192c_FillH2CCmd(padapter, JOINBSS_RPT_EID, sizeof(JoinBssRptParm), (u8 *)&JoinBssRptParm); -+ -+_func_exit_; -+} -+ -+#ifdef CONFIG_P2P_PS -+void rtl8192c_set_p2p_ctw_period_cmd(_adapter* padapter, u8 ctwindow) -+{ -+ struct P2P_PS_CTWPeriod_t p2p_ps_ctw; -+ -+ p2p_ps_ctw.CTWPeriod = ctwindow; -+ -+ rtl8192c_FillH2CCmd(padapter, P2P_PS_CTW_CMD_EID, 1, (u8 *)(&p2p_ps_ctw)); -+ -+} -+ -+void rtl8192c_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ struct P2P_PS_Offload_t *p2p_ps_offload = &pHalData->p2p_ps_offload; -+ u8 i; -+ u16 ctwindow; -+ u32 start_time, tsf_low; -+ -+_func_enter_; -+ -+ switch(p2p_ps_state) -+ { -+ case P2P_PS_DISABLE: -+ DBG_8192C("P2P_PS_DISABLE \n"); -+ _rtw_memset(p2p_ps_offload, 0 ,1); -+ break; -+ case P2P_PS_ENABLE: -+ DBG_8192C("P2P_PS_ENABLE \n"); -+ // update CTWindow value. -+ if( pwdinfo->ctwindow > 0 ) -+ { -+ p2p_ps_offload->CTWindow_En = 1; -+ ctwindow = pwdinfo->ctwindow; -+ if(IS_HARDWARE_TYPE_8723A(padapter)) -+ { -+ //rtw_write16(padapter, REG_ATIMWND, ctwindow); -+ } -+ else -+ { -+ rtl8192c_set_p2p_ctw_period_cmd(padapter, ctwindow); -+ } -+ } -+ -+ // hw only support 2 set of NoA -+ for( i=0 ; inoa_num ; i++) -+ { -+ // To control the register setting for which NOA -+ rtw_write8(padapter, 0x5CF, (i << 4)); -+ if(i == 0) -+ p2p_ps_offload->NoA0_En = 1; -+ else -+ p2p_ps_offload->NoA1_En = 1; -+ -+ // config P2P NoA Descriptor Register -+ rtw_write32(padapter, 0x5E0, pwdinfo->noa_duration[i]); -+ -+ rtw_write32(padapter, 0x5E4, pwdinfo->noa_interval[i]); -+ -+ //Get Current TSF value -+ tsf_low = rtw_read32(padapter, REG_TSFTR); -+ -+ start_time = pwdinfo->noa_start_time[i]; -+ if(pwdinfo->noa_count[i] != 1) -+ { -+ while( start_time <= (tsf_low+(50*1024) ) ) -+ { -+ start_time += pwdinfo->noa_interval[i]; -+ if(pwdinfo->noa_count[i] != 255) -+ pwdinfo->noa_count[i]--; -+ } -+ } -+ //DBG_8192C("%s(): start_time = %x\n",__FUNCTION__,start_time); -+ rtw_write32(padapter, 0x5E8, start_time); -+ -+ rtw_write8(padapter, 0x5EC, pwdinfo->noa_count[i]); -+ } -+ -+ if( (pwdinfo->opp_ps == 1) || (pwdinfo->noa_num > 0) ) -+ { -+ // rst p2p circuit -+ rtw_write8(padapter, REG_DUAL_TSF_RST, BIT(4)); -+ -+ p2p_ps_offload->Offload_En = 1; -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ p2p_ps_offload->role= 1; -+ p2p_ps_offload->AllStaSleep = 0; -+ } -+ else -+ { -+ p2p_ps_offload->role= 0; -+ } -+ -+ p2p_ps_offload->discovery = 0; -+ } -+ break; -+ case P2P_PS_SCAN: -+ DBG_8192C("P2P_PS_SCAN \n"); -+ p2p_ps_offload->discovery = 1; -+ break; -+ case P2P_PS_SCAN_DONE: -+ DBG_8192C("P2P_PS_SCAN_DONE \n"); -+ p2p_ps_offload->discovery = 0; -+ pwdinfo->p2p_ps_state = P2P_PS_ENABLE; -+ break; -+ default: -+ break; -+ } -+ -+ rtl8192c_FillH2CCmd(padapter, P2P_PS_OFFLOAD_EID, 1, (u8 *)p2p_ps_offload); -+ -+_func_exit_; -+ -+} -+#endif // CONFIG_P2P_PS -+ -+#ifdef CONFIG_IOL -+#include -+int rtl8192c_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms) -+{ -+ IO_OFFLOAD_LOC IoOffloadLoc; -+ u32 start_time = rtw_get_current_time(); -+ u32 passing_time_ms; -+ u8 polling_ret; -+ int ret = _FAIL; -+ -+ if (rtw_IOL_append_END_cmd(xmit_frame) != _SUCCESS) -+ goto exit; -+ -+ dump_mgntframe_and_wait(adapter, xmit_frame, max_wating_ms); -+ -+ IoOffloadLoc.LocCmd = 0; -+ if(_SUCCESS != rtl8192c_FillH2CCmd(adapter, H2C_92C_IO_OFFLOAD, sizeof(IO_OFFLOAD_LOC), (u8 *)&IoOffloadLoc)) -+ goto exit; -+ -+ //polling if the IO offloading is done -+ while( (passing_time_ms=rtw_get_passing_time_ms(start_time)) <= max_wating_ms) { -+ #if 0 //C2H -+ if(0xff == rtw_read8(adapter, REG_C2HEVT_CLEAR)) -+ break; -+ #else// 0x1c3 -+ if(0x00 != (polling_ret=rtw_read8(adapter, 0x1c3))) -+ break; -+ #endif -+ rtw_msleep_os(5); -+ } -+ #if 0 //debug -+ DBG_871X("IOL %s, polling_ret:0x%02x, 0x1c0=0x%08x, 0x1c4=0x%08x, 0x1cc=0x%08x, 0x1e8=0x%08x, 0x130=0x%08x, 0x134=0x%08x\n" -+ , polling_ret==0xff?"success":"error" -+ , polling_ret -+ , rtw_read32(adapter, 0x1c0) -+ , rtw_read32(adapter, 0x1c4) -+ , rtw_read32(adapter, 0x1cc) -+ , rtw_read32(adapter, 0x1e8) -+ , rtw_read32(adapter, 0x130) -+ , rtw_read32(adapter, 0x134) -+ ); -+ rtw_write32(adapter, 0x1c0, 0x0); -+ #endif -+ -+ if(polling_ret == 0xff) -+ ret =_SUCCESS; -+ else { -+ DBG_871X("IOL %s, polling_ret:0x%02x\n" -+ //", 0x1c0=0x%08x, 0x1c4=0x%08x, 0x1cc=0x%08x, 0x1e8=0x%08x, 0x130=0x%08x, 0x134=0x%08x\n" -+ , polling_ret==0xff?"success":"error" -+ , polling_ret -+ //, rtw_read32(adapter, 0x1c0) -+ //, rtw_read32(adapter, 0x1c4) -+ //, rtw_read32(adapter, 0x1cc) -+ //, rtw_read32(adapter, 0x1e8) -+ //, rtw_read32(adapter, 0x130) -+ //, rtw_read32(adapter, 0x134) -+ ); -+ #if 0 //debug -+ rtw_write16(adapter, 0x1c4, 0x0000); -+ rtw_msleep_os(10); -+ DBG_871X("after reset, 0x1c4=0x%08x\n", rtw_read32(adapter, 0x1c4)); -+ #endif -+ -+ } -+ -+ { -+ #if 0 //C2H -+ u32 c2h_evt; -+ int i; -+ c2h_evt = rtw_read32(adapter, REG_C2HEVT_MSG_NORMAL); -+ DBG_871X("%s io-offloading complete, in %ums: 0x%08x\n", __FUNCTION__, passing_time_ms, c2h_evt); -+ rtw_write8(adapter, REG_C2HEVT_CLEAR, 0x0); -+ #else// 0x1c3 -+ DBG_871X("IOL %s complete in %ums\n", __FUNCTION__, passing_time_ms); -+ rtw_write8(adapter, 0x1c3, 0x0); -+ #endif -+ } -+ -+exit: -+ return ret; -+ -+} -+#endif //CONFIG_IOL -+ -+ -+#ifdef CONFIG_BEACON_DISABLE_OFFLOAD -+/* -+ rtl8192c_dis_beacon_fun_cmd() -+ This function shall only be called by PORT1. -+ PORT0's beacon function can't be disabled, because it's used by RA function in FW/HW. -+ -+ // Still has the REG_BCN_CTRL_1 modified by unknowned party issue in case of Primary Interface + PORT1 combination. -+*/ -+u8 rtl8192c_dis_beacon_fun_cmd(_adapter* padapter) -+{ -+ u8 buf[2]; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ -+ _rtw_memset(buf, 0, sizeof(buf)); -+ -+ if (padapter->iface_type == IFACE_PORT0) { -+ //buf[0] = 0x1; -+ DBG_871X("%s(): ERROR! padapter->iface_type = %d\n", __FUNCTION__, padapter->iface_type); -+ return _FAIL; -+ } else -+ buf[1] = 0x1; -+ -+ rtl8192c_FillH2CCmd(padapter, H2C_92C_DISABLE_BCN_FUNC, 2, buf); -+ -+_func_exit_; -+ -+ return res; -+ -+} -+#endif // CONFIG_BEACON_DISABLE_OFFLOAD -+ -+ -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+/* -+ ask FW to Reset sync register at Beacon early interrupt -+*/ -+u8 rtl8192c_reset_tsf(_adapter *padapter, u8 reset_port ) -+{ -+ u8 buf[2]; -+ u8 res=_SUCCESS; -+ -+_func_enter_; -+ if (IFACE_PORT0==reset_port) { -+ buf[0] = 0x1; buf[1] = 0; -+ -+ } else{ -+ buf[0] = 0x0; buf[1] = 0x1; -+ } -+ rtl8192c_FillH2CCmd(padapter, H2C_92C_RESET_TSF, 2, buf); -+_func_exit_; -+ -+ return res; -+} -+ -+int reset_tsf(PADAPTER Adapter, u8 reset_port ) -+{ -+ u8 reset_cnt_before = 0, reset_cnt_after = 0, loop_cnt = 0; -+ u32 reg_reset_tsf_cnt = (IFACE_PORT0==reset_port) ? -+ REG_FW_RESET_TSF_CNT_0:REG_FW_RESET_TSF_CNT_1; -+ -+ rtw_scan_abort(Adapter->pbuddy_adapter); /* site survey will cause reset_tsf fail */ -+ reset_cnt_after = reset_cnt_before = rtw_read8(Adapter,reg_reset_tsf_cnt); -+ rtl8192c_reset_tsf(Adapter, reset_port); -+ -+ while ((reset_cnt_after == reset_cnt_before ) && (loop_cnt < 10)) { -+ rtw_msleep_os(100); -+ loop_cnt++; -+ reset_cnt_after = rtw_read8(Adapter, reg_reset_tsf_cnt); -+ } -+ -+ return(loop_cnt >= 10) ? _FAIL : _TRUE; -+} -+ -+ -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ -+#ifdef CONFIG_WOWLAN -+ -+void rtl8192c_set_wowlan_cmd(_adapter* padapter) -+{ -+ u8 res=_SUCCESS; -+ SETWOWLAN_PARM pwowlan_parm; -+ struct pwrctrl_priv *pwrpriv=&padapter->pwrctrlpriv; -+ -+_func_enter_; -+ -+ pwowlan_parm.mode =0; -+ pwowlan_parm.gpio_index=0; -+ pwowlan_parm.gpio_duration=0; -+ pwowlan_parm.second_mode =0; -+ pwowlan_parm.reserve=0; -+ -+ if(pwrpriv->wowlan_mode ==_TRUE){ -+ pwowlan_parm.mode |=FW_WOWLAN_FUN_EN; -+ //printk("\n %s 1.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); -+ if(pwrpriv->wowlan_pattern ==_TRUE){ -+ pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH; -+ //printk("\n %s 2.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); -+ } -+ if(pwrpriv->wowlan_magic ==_TRUE){ -+ pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT; -+ //printk("\n %s 3.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); -+ } -+ if(pwrpriv->wowlan_unicast ==_TRUE){ -+ pwowlan_parm.mode |=FW_WOWLAN_UNICAST; -+ //printk("\n %s 4.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); -+ } -+ //WOWLAN_GPIO_ACTIVE means GPIO high active -+ //pwowlan_parm.mode |=FW_WOWLAN_GPIO_ACTIVE; -+ pwowlan_parm.mode |=FW_WOWLAN_REKEY_WAKEUP; -+ pwowlan_parm.mode |=FW_WOWLAN_DEAUTH_WAKEUP; -+ -+ rtl8192c_set_FwJoinBssReport_cmd( padapter, 1); -+ -+ //GPIO3 -+ pwowlan_parm.gpio_index=3; -+ -+ //duration unit is 64us -+ pwowlan_parm.gpio_duration=0xff; -+ // -+ pwowlan_parm.second_mode|=FW_WOWLAN_GPIO_WAKEUP_EN; -+ //printk("\n %s 5.pwowlan_parm.mode=0x%x \n",__FUNCTION__,pwowlan_parm.mode ); -+ { u8 *ptr=(u8 *)&pwowlan_parm; -+ printk("\n %s H2C_WO_WLAN=%x %02x:%02x:%02x:%02x:%02x \n",__FUNCTION__,H2C_WO_WLAN_CMD,ptr[0],ptr[1],ptr[2],ptr[3],ptr[4] ); -+ } -+ rtl8192c_FillH2CCmd(padapter, H2C_WO_WLAN_CMD, 4, (u8 *)&pwowlan_parm); -+ -+ //keep alive period = 3 * 10 BCN interval -+ pwowlan_parm.mode =3; -+ pwowlan_parm.gpio_index=3; -+ rtl8192c_FillH2CCmd(padapter, KEEP_ALIVE_CONTROL_CMD, 2, (u8 *)&pwowlan_parm); -+ printk("%s after KEEP_ALIVE_CONTROL_CMD register 0x81=%x \n",__FUNCTION__,rtw_read8(padapter, 0x81)); -+ -+ pwowlan_parm.mode =1; -+ pwowlan_parm.gpio_index=0; -+ pwowlan_parm.gpio_duration=0; -+ rtl8192c_FillH2CCmd(padapter, DISCONNECT_DECISION_CTRL_CMD, 3, (u8 *)&pwowlan_parm); -+ printk("%s after DISCONNECT_DECISION_CTRL_CMD register 0x81=%x \n",__FUNCTION__,rtw_read8(padapter, 0x81)); -+ -+ //enable GPIO wakeup -+ pwowlan_parm.mode =1; -+ pwowlan_parm.gpio_index=0; -+ pwowlan_parm.gpio_duration=0; -+ rtl8192c_FillH2CCmd(padapter, REMOTE_WAKE_CTRL_CMD, 3, (u8 *)&pwowlan_parm); -+ } -+ else -+ rtl8192c_FillH2CCmd(padapter, H2C_WO_WLAN_CMD, 3, (u8 *)&pwowlan_parm); -+ -+ -+_func_exit_; -+ -+ return ; -+ -+} -+ -+#endif //CONFIG_WOWLAN -+ -+ -+ -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c -@@ -0,0 +1,5058 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+//============================================================ -+// Description: -+// -+// This file is for 92CE/92CU dynamic mechanism only -+// -+// -+//============================================================ -+ -+//============================================================ -+// include files -+//============================================================ -+#include -+#include -+#include -+#include -+ -+#include -+#include "../dm.h" -+#ifdef CONFIG_INTEL_PROXIM -+#include "../proxim/intel_proxim.h" -+#endif -+//============================================================ -+// Global var -+//============================================================ -+static u32 EDCAParam[maxAP][3] = -+{ // UL DL -+ {0x5ea322, 0x00a630, 0x00a44f}, //atheros AP -+ {0x5ea32b, 0x5ea42b, 0x5e4322}, //broadcom AP -+ {0x3ea430, 0x00a630, 0x3ea44f}, //cisco AP -+ {0x5ea44f, 0x00a44f, 0x5ea42b}, //marvell AP -+ {0x5ea422, 0x00a44f, 0x00a44f}, //ralink AP -+ //{0x5ea44f, 0x5ea44f, 0x5ea44f}, //realtek AP -+ {0xa44f, 0x5ea44f, 0x5e431c}, //realtek AP -+ {0x5ea42b, 0xa630, 0x5e431c}, //airgocap AP -+ {0x5ea42b, 0x5ea42b, 0x5ea42b}, //unknown AP -+// {0x5e4322, 0x00a44f, 0x5ea44f}, //unknown AP -+}; -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: dm_DIGInit() -+ * -+ * Overview: Set DIG scheme init value. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * -+ *---------------------------------------------------------------------------*/ -+static void dm_DIGInit( -+ IN PADAPTER pAdapter -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+ -+ pDigTable->Dig_Enable_Flag = _TRUE; -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX; -+ -+ pDigTable->CurIGValue = 0x20; -+ pDigTable->PreIGValue = 0x0; -+ -+ pDigTable->CurSTAConnectState = pDigTable->PreSTAConnectState = DIG_STA_DISCONNECT; -+ pDigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT; -+ -+ pDigTable->RssiLowThresh = DM_DIG_THRESH_LOW; -+ pDigTable->RssiHighThresh = DM_DIG_THRESH_HIGH; -+ -+ pDigTable->FALowThresh = DM_FALSEALARM_THRESH_LOW; -+ pDigTable->FAHighThresh = DM_FALSEALARM_THRESH_HIGH; -+ -+ -+ pDigTable->rx_gain_range_max = DM_DIG_MAX; -+ pDigTable->rx_gain_range_min = DM_DIG_MIN; -+ pDigTable->rx_gain_range_min_nolink = 0; -+ -+ pDigTable->BackoffVal = DM_DIG_BACKOFF_DEFAULT; -+ pDigTable->BackoffVal_range_max = DM_DIG_BACKOFF_MAX; -+ pDigTable->BackoffVal_range_min = DM_DIG_BACKOFF_MIN; -+ -+ pDigTable->PreCCKPDState = CCK_PD_STAGE_MAX; -+ pDigTable->CurCCKPDState = CCK_PD_STAGE_LowRssi; -+ -+ pDigTable->ForbiddenIGI = DM_DIG_MIN; -+ pDigTable->LargeFAHit = 0; -+ pDigTable->Recover_cnt = 0; -+ pdmpriv->DIG_Dynamic_MIN = 0x25; //for FUNAI_TV -+} -+ -+ -+static u8 dm_initial_gain_MinPWDB( -+ IN PADAPTER pAdapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ int Rssi_val_min = 0; -+ -+ if((pDigTable->CurMultiSTAConnectState == DIG_MultiSTA_CONNECT) && -+ (pDigTable->CurSTAConnectState == DIG_STA_CONNECT) ) -+ { -+ if(pdmpriv->EntryMinUndecoratedSmoothedPWDB != 0) -+#ifdef CONFIG_CONCURRENT_MODE -+ Rssi_val_min = (pdmpriv->UndecoratedSmoothedPWDB+pdmpriv->EntryMinUndecoratedSmoothedPWDB)/2; -+#else -+ Rssi_val_min = (pdmpriv->EntryMinUndecoratedSmoothedPWDB > pdmpriv->UndecoratedSmoothedPWDB)? -+ pdmpriv->UndecoratedSmoothedPWDB:pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+#endif //CONFIG_CONCURRENT_MODE -+ else -+ Rssi_val_min = pdmpriv->UndecoratedSmoothedPWDB; -+ } -+ else if(pDigTable->CurSTAConnectState == DIG_STA_CONNECT || -+ pDigTable->CurSTAConnectState == DIG_STA_BEFORE_CONNECT) -+ Rssi_val_min = pdmpriv->UndecoratedSmoothedPWDB; -+ else if(pDigTable->CurMultiSTAConnectState == DIG_MultiSTA_CONNECT) -+ Rssi_val_min = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ -+ //printk("%s CurMultiSTAConnectState(0x%02x) UndecoratedSmoothedPWDB(%d),EntryMinUndecoratedSmoothedPWDB(%d)\n" -+ //,__FUNCTION__,pDigTable->CurSTAConnectState, -+ //pdmpriv->UndecoratedSmoothedPWDB,pdmpriv->EntryMinUndecoratedSmoothedPWDB); -+ -+ return (u8)Rssi_val_min; -+} -+ -+ -+static VOID -+dm_FalseAlarmCounterStatistics( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 ret_value; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pdmpriv->FalseAlmCnt); -+#ifdef CONFIG_CONCURRENT_MODE -+ PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; -+#endif //CONFIG_CONCURRENT_MODE -+ -+ ret_value = PHY_QueryBBReg(Adapter, rOFDM_PHYCounter1, bMaskDWord); -+ FalseAlmCnt->Cnt_Parity_Fail = ((ret_value&0xffff0000)>>16); -+ -+ ret_value = PHY_QueryBBReg(Adapter, rOFDM_PHYCounter2, bMaskDWord); -+ FalseAlmCnt->Cnt_Rate_Illegal = (ret_value&0xffff); -+ FalseAlmCnt->Cnt_Crc8_fail = ((ret_value&0xffff0000)>>16); -+ ret_value = PHY_QueryBBReg(Adapter, rOFDM_PHYCounter3, bMaskDWord); -+ FalseAlmCnt->Cnt_Mcs_fail = (ret_value&0xffff); -+ ret_value = PHY_QueryBBReg(Adapter, rOFDM0_FrameSync, bMaskDWord); -+ FalseAlmCnt->Cnt_Fast_Fsync = (ret_value&0xffff); -+ FalseAlmCnt->Cnt_SB_Search_fail = ((ret_value&0xffff0000)>>16); -+ -+ FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal + -+ FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail+ -+ FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail; -+ -+ -+ //hold cck counter -+ PHY_SetBBReg(Adapter, rCCK0_FalseAlarmReport, BIT(14), 1); -+ -+ ret_value = PHY_QueryBBReg(Adapter, rCCK0_FACounterLower, bMaskByte0); -+ FalseAlmCnt->Cnt_Cck_fail = ret_value; -+ -+ ret_value = PHY_QueryBBReg(Adapter, rCCK0_FACounterUpper, bMaskByte3); -+ FalseAlmCnt->Cnt_Cck_fail += (ret_value& 0xff)<<8; -+ -+ FalseAlmCnt->Cnt_all = ( FalseAlmCnt->Cnt_Parity_Fail + -+ FalseAlmCnt->Cnt_Rate_Illegal + -+ FalseAlmCnt->Cnt_Crc8_fail + -+ FalseAlmCnt->Cnt_Mcs_fail + -+ FalseAlmCnt->Cnt_Cck_fail); -+ -+ Adapter->recvpriv.FalseAlmCnt_all = FalseAlmCnt->Cnt_all; -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pbuddy_adapter) -+ pbuddy_adapter->recvpriv.FalseAlmCnt_all = FalseAlmCnt->Cnt_all; -+#endif //CONFIG_CONCURRENT_MODE -+ -+ //reset false alarm counter registers -+ PHY_SetBBReg(Adapter, rOFDM1_LSTF, 0x08000000, 1); -+ PHY_SetBBReg(Adapter, rOFDM1_LSTF, 0x08000000, 0); -+ //reset cck counter -+ PHY_SetBBReg(Adapter, rCCK0_FalseAlarmReport, 0x0000c000, 0); -+ //enable cck counter -+ PHY_SetBBReg(Adapter, rCCK0_FalseAlarmReport, 0x0000c000, 2); -+ -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("Cnt_Parity_Fail = %ld, Cnt_Rate_Illegal = %ld, Cnt_Crc8_fail = %ld, Cnt_Mcs_fail = %ld\n", -+ // FalseAlmCnt->Cnt_Parity_Fail, FalseAlmCnt->Cnt_Rate_Illegal, FalseAlmCnt->Cnt_Crc8_fail, FalseAlmCnt->Cnt_Mcs_fail) ); -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("Cnt_Ofdm_fail = %ld, Cnt_Cck_fail = %ld, Cnt_all = %ld\n", -+ // FalseAlmCnt->Cnt_Ofdm_fail, FalseAlmCnt->Cnt_Cck_fail, FalseAlmCnt->Cnt_all) ); -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("Cnt_Ofdm_fail = %ld, Cnt_Cck_fail = %ld, Cnt_all = %ld\n", -+ // FalseAlmCnt->Cnt_Ofdm_fail, FalseAlmCnt->Cnt_Cck_fail, FalseAlmCnt->Cnt_all) ); -+} -+ -+ -+static VOID -+DM_Write_DIG( -+ IN PADAPTER pAdapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(rtw_buddy_adapter_up(pAdapter)) -+ { -+ PADAPTER pbuddy_adapter = pAdapter->pbuddy_adapter; -+ PHAL_DATA_TYPE pbuddy_HalData = GET_HAL_DATA(pbuddy_adapter); -+ struct dm_priv *pbuddy_dmpriv = &pbuddy_HalData->dmpriv; -+ DIG_T *pbuddy_DigTable = &pbuddy_dmpriv->DM_DigTable; -+ -+ //sync IGValue -+ pbuddy_DigTable->PreIGValue = pDigTable->PreIGValue; -+ pbuddy_DigTable->CurIGValue = pDigTable->CurIGValue; -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("CurIGValue = 0x%lx, PreIGValue = 0x%lx, BackoffVal = %d\n", -+ // DM_DigTable.CurIGValue, DM_DigTable.PreIGValue, DM_DigTable.BackoffVal)); -+ -+ if (pDigTable->Dig_Enable_Flag == _FALSE) -+ { -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("DIG is disabled\n")); -+ pDigTable->PreIGValue = 0x17; -+ return; -+ } -+ -+ if( (pDigTable->PreIGValue != pDigTable->CurIGValue) || ( pAdapter->bForceWriteInitGain ) ) -+ { -+ // Set initial gain. -+ //PHY_SetBBReg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0, pDigTable->CurIGValue); -+ //PHY_SetBBReg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0, pDigTable->CurIGValue); -+ //printk("%s DIG(0x%02x)\n",__FUNCTION__,pDigTable->CurIGValue); -+ -+#if defined CONFIG_WIDI_DIG_3E && defined CONFIG_INTEL_WIDI -+ if( pAdapter->mlmepriv.widi_enable == _TRUE ) -+ { -+ PHY_SetBBReg(pAdapter, rOFDM0_XAAGCCore1, 0x7f, 0x3e); -+ PHY_SetBBReg(pAdapter, rOFDM0_XBAGCCore1, 0x7f, 0x3e); -+ } -+ else -+#endif //defined CONFIG_WIDI_DIG_3E && defined CONFIG_INTEL_WIDI -+ { -+ PHY_SetBBReg(pAdapter, rOFDM0_XAAGCCore1, 0x7f, pDigTable->CurIGValue); -+ PHY_SetBBReg(pAdapter, rOFDM0_XBAGCCore1, 0x7f, pDigTable->CurIGValue); -+ } -+ pDigTable->PreIGValue = pDigTable->CurIGValue; -+ } -+} -+ -+ -+static VOID -+dm_CtrlInitGainByFA( -+ IN PADAPTER pAdapter -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pdmpriv->FalseAlmCnt); -+ -+ u8 value_IGI = pDigTable->CurIGValue; -+ -+ if(FalseAlmCnt->Cnt_all < DM_DIG_FA_TH0) -+ value_IGI --; -+ else if(FalseAlmCnt->Cnt_all < DM_DIG_FA_TH1) -+ value_IGI += 0; -+ else if(FalseAlmCnt->Cnt_all < DM_DIG_FA_TH2) -+ value_IGI ++; -+ else if(FalseAlmCnt->Cnt_all >= DM_DIG_FA_TH2) -+ value_IGI +=2; -+ -+ if(value_IGI > DM_DIG_FA_UPPER) -+ value_IGI = DM_DIG_FA_UPPER; -+ if(value_IGI < DM_DIG_FA_LOWER) -+ value_IGI = DM_DIG_FA_LOWER; -+ -+ if(FalseAlmCnt->Cnt_all > 10000) -+ value_IGI = DM_DIG_FA_UPPER; -+ -+ pDigTable->CurIGValue = value_IGI; -+ -+ DM_Write_DIG(pAdapter); -+ -+} -+ -+#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV -+VOID dm_CtrlInitGainByRssi( IN PADAPTER pAdapter) -+{ -+ -+ u32 isBT; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pdmpriv->FalseAlmCnt); -+#ifdef CONFIG_DM_ADAPTIVITY -+ u8 Adap_IGI_Upper = pdmpriv->IGI_target + 30 + (u8) pdmpriv->TH_L2H_ini -(u8) pdmpriv->TH_EDCCA_HL_diff; -+#endif -+ -+ //modify DIG upper bound -+ if((pDigTable->Rssi_val_min + 20) > DM_DIG_MAX ) -+ pDigTable->rx_gain_range_max = DM_DIG_MAX; -+ else -+ pDigTable->rx_gain_range_max = pDigTable->Rssi_val_min + 20; -+ -+ //modify DIG lower bound -+ if((FalseAlmCnt->Cnt_all > 500)&&(pdmpriv->DIG_Dynamic_MIN < 0x25)) -+ pdmpriv->DIG_Dynamic_MIN++; -+ if((FalseAlmCnt->Cnt_all < 500)&&(pdmpriv->DIG_Dynamic_MIN > DM_DIG_MIN)) -+ pdmpriv->DIG_Dynamic_MIN--; -+ if((pDigTable->Rssi_val_min < 8) && (pdmpriv->DIG_Dynamic_MIN > DM_DIG_MIN)) -+ pdmpriv->DIG_Dynamic_MIN--; -+ -+ //modify DIG lower bound, deal with abnorally large false alarm -+ if(FalseAlmCnt->Cnt_all > 10000) -+ { -+ //RT_TRACE(COMP_DIG, DBG_LOUD, ("dm_DIG(): Abnornally false alarm case. \n")); -+ pDigTable->LargeFAHit++; -+ if(pDigTable->ForbiddenIGI < pDigTable->CurIGValue) -+ { -+ pDigTable->ForbiddenIGI = pDigTable->CurIGValue; -+ pDigTable->LargeFAHit = 1; -+ } -+ if(pDigTable->LargeFAHit >= 3) -+ { -+ if((pDigTable->ForbiddenIGI+1) >pDigTable->rx_gain_range_max) -+ pDigTable->rx_gain_range_min = pDigTable->rx_gain_range_max; -+ else -+ pDigTable->rx_gain_range_min = (pDigTable->ForbiddenIGI + 1); -+ pDigTable->Recover_cnt = 3600; //3600=2hr -+ } -+ } -+ else -+ { -+ //Recovery mechanism for IGI lower bound -+ if(pDigTable->Recover_cnt != 0){ -+ pDigTable->Recover_cnt --; -+ } -+ else -+ { -+ if(pDigTable->LargeFAHit == 0 ) -+ { -+ if((pDigTable->ForbiddenIGI -1) < pdmpriv->DIG_Dynamic_MIN) //DM_DIG_MIN) -+ { -+ pDigTable->ForbiddenIGI = pdmpriv->DIG_Dynamic_MIN; //DM_DIG_MIN; -+ pDigTable->rx_gain_range_min = pdmpriv->DIG_Dynamic_MIN; //DM_DIG_MIN; -+ } -+ else -+ { -+ pDigTable->ForbiddenIGI --; -+ pDigTable->rx_gain_range_min = (pDigTable->ForbiddenIGI + 1); -+ } -+ } -+ else if(pDigTable->LargeFAHit == 3 ) -+ { -+ pDigTable->LargeFAHit = 0; -+ } -+ } -+ } -+ #ifdef CONFIG_USB_HCI -+ if(FalseAlmCnt->Cnt_all < 250) -+ { -+#endif -+ //DBG_8192C("===> dm_CtrlInitGainByRssi, Enter DIG by SS mode\n"); -+ -+ isBT = rtw_read8(pAdapter, 0x4fd) & 0x01; -+ -+ if(!isBT){ -+ -+ if(FalseAlmCnt->Cnt_all > pDigTable->FAHighThresh) -+ { -+ if((pDigTable->BackoffVal -2) < pDigTable->BackoffVal_range_min) -+ pDigTable->BackoffVal = pDigTable->BackoffVal_range_min; -+ else -+ pDigTable->BackoffVal -= 2; -+ } -+ else if(FalseAlmCnt->Cnt_all < pDigTable->FALowThresh) -+ { -+ if((pDigTable->BackoffVal+2) > pDigTable->BackoffVal_range_max) -+ pDigTable->BackoffVal = pDigTable->BackoffVal_range_max; -+ else -+ pDigTable->BackoffVal +=2; -+ } -+ } -+ else -+ pDigTable->BackoffVal = DM_DIG_BACKOFF_DEFAULT; -+ -+ pDigTable->CurIGValue = pDigTable->Rssi_val_min+10-pDigTable->BackoffVal; -+ -+ //DBG_8192C("Rssi_val_min = %x BackoffVal %x\n",pDigTable->Rssi_val_min, pDigTable->BackoffVal); -+#ifdef CONFIG_USB_HCI -+ } -+ else -+ { -+ //DBG_8192C("===> dm_CtrlInitGainByRssi, Enter DIG by FA mode\n"); -+ //DBG_8192C("RSSI = 0x%x", pDigTable->Rssi_val_min); -+ -+ //Adjust initial gain by false alarm -+ if(FalseAlmCnt->Cnt_all > 1000) -+ pDigTable->CurIGValue = pDigTable ->PreIGValue+2; -+ else if (FalseAlmCnt->Cnt_all > 750) -+ pDigTable->CurIGValue = pDigTable->PreIGValue+1; -+ else if(FalseAlmCnt->Cnt_all < 500) -+ pDigTable->CurIGValue = pDigTable->PreIGValue-1; -+ } -+#endif -+ -+ //Check initial gain by upper/lower bound -+ if(pDigTable->CurIGValue >pDigTable->rx_gain_range_max) -+ pDigTable->CurIGValue = pDigTable->rx_gain_range_max; -+ -+ if(pDigTable->CurIGValue < pDigTable->rx_gain_range_min) -+ pDigTable->CurIGValue = pDigTable->rx_gain_range_min; -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ if(pdmpriv->DMFlag & DYNAMIC_FUNC_ADAPTIVITY) -+ { -+ if(pDigTable->CurIGValue > Adap_IGI_Upper) -+ pDigTable->CurIGValue = Adap_IGI_Upper; -+ -+ if(pdmpriv->IGI_LowerBound != 0) -+ { -+ if(pDigTable->CurIGValue < pdmpriv->IGI_LowerBound) -+ pDigTable->CurIGValue = pdmpriv->IGI_LowerBound; -+ } -+ LOG_LEVEL(_drv_info_, FUNC_ADPT_FMT": pdmpriv->IGI_LowerBound = %d\n", -+ FUNC_ADPT_ARG(pAdapter), pdmpriv->IGI_LowerBound); -+ } -+#endif /* CONFIG_DM_ADAPTIVITY */ -+ -+ //printk("%s => rx_gain_range_max(0x%02x) rx_gain_range_min(0x%02x)\n",__FUNCTION__, -+ // pDigTable->rx_gain_range_max,pDigTable->rx_gain_range_min); -+ //printk("%s CurIGValue(0x%02x) <====\n",__FUNCTION__,pDigTable->CurIGValue ); -+ -+ DM_Write_DIG(pAdapter); -+ -+} -+#else -+static VOID dm_CtrlInitGainByRssi(IN PADAPTER pAdapter) -+{ -+ u32 isBT; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pdmpriv->FalseAlmCnt); -+ u8 RSSI_tmp = dm_initial_gain_MinPWDB(pAdapter); -+#ifdef CONFIG_DM_ADAPTIVITY -+ u8 Adap_IGI_Upper = pdmpriv->IGI_target + 30 + (u8) pdmpriv->TH_L2H_ini -(u8) pdmpriv->TH_EDCCA_HL_diff; -+#endif -+ -+ //modify DIG upper bound -+ if((pDigTable->Rssi_val_min + 20) > DM_DIG_MAX ) -+ pDigTable->rx_gain_range_max = DM_DIG_MAX; -+ else -+ pDigTable->rx_gain_range_max = pDigTable->Rssi_val_min + 20; -+ //printk("%s Rssi_val_min(0x%02x),rx_gain_range_max(0x%02x)\n",__FUNCTION__,pDigTable->Rssi_val_min,pDigTable->rx_gain_range_max); -+ //modify DIG lower bound, deal with abnorally large false alarm -+ if(FalseAlmCnt->Cnt_all > 10000) -+ { -+ //RT_TRACE(COMP_DIG, DBG_LOUD, ("dm_DIG(): Abnornally false alarm case. \n")); -+ -+ pDigTable->LargeFAHit++; -+ if(pDigTable->ForbiddenIGI < pDigTable->CurIGValue) -+ { -+ pDigTable->ForbiddenIGI = pDigTable->CurIGValue; -+ pDigTable->LargeFAHit = 1; -+ } -+ -+ if(pDigTable->LargeFAHit >= 3) -+ { -+ if((pDigTable->ForbiddenIGI+1) > pDigTable->rx_gain_range_max) -+ pDigTable->rx_gain_range_min = pDigTable->rx_gain_range_max; -+ else -+ pDigTable->rx_gain_range_min = (pDigTable->ForbiddenIGI + 1); -+ pDigTable->Recover_cnt = 3600; //3600=2hr -+ } -+ } -+ else -+ { -+ //Recovery mechanism for IGI lower bound -+ if(pDigTable->Recover_cnt != 0) -+ pDigTable->Recover_cnt --; -+ else -+ { -+ if(pDigTable->LargeFAHit == 0 ) -+ { -+ if((pDigTable->ForbiddenIGI -1) < DM_DIG_MIN) -+ { -+ pDigTable->ForbiddenIGI = DM_DIG_MIN; -+ pDigTable->rx_gain_range_min = DM_DIG_MIN; -+ } -+ else -+ { -+ pDigTable->ForbiddenIGI --; -+ pDigTable->rx_gain_range_min = (pDigTable->ForbiddenIGI + 1); -+ } -+ } -+ else if(pDigTable->LargeFAHit == 3 ) -+ { -+ pDigTable->LargeFAHit = 0; -+ } -+ } -+ } -+ -+ //RT_TRACE(COMP_DIG, DBG_LOUD, ("DM_DigTable.ForbiddenIGI = 0x%x, DM_DigTable.LargeFAHit = 0x%x\n",pDigTable->ForbiddenIGI, pDigTable->LargeFAHit)); -+ //RT_TRACE(COMP_DIG, DBG_LOUD, ("DM_DigTable.rx_gain_range_max = 0x%x, DM_DigTable.rx_gain_range_min = 0x%x\n",pDigTable->rx_gain_range_max, pDigTable->rx_gain_range_min)); -+ -+#ifdef CONFIG_USB_HCI -+ if(FalseAlmCnt->Cnt_all < 250) -+ { -+#endif -+ //DBG_8192C("===> dm_CtrlInitGainByRssi, Enter DIG by SS mode\n"); -+ -+ isBT = rtw_read8(pAdapter, 0x4fd) & 0x01; -+ -+ if(!isBT){ -+ -+ if(FalseAlmCnt->Cnt_all > pDigTable->FAHighThresh) -+ { -+ if((pDigTable->BackoffVal -2) < pDigTable->BackoffVal_range_min) -+ pDigTable->BackoffVal = pDigTable->BackoffVal_range_min; -+ else -+ pDigTable->BackoffVal -= 2; -+ } -+ else if(FalseAlmCnt->Cnt_all < pDigTable->FALowThresh) -+ { -+ if((pDigTable->BackoffVal+2) > pDigTable->BackoffVal_range_max) -+ pDigTable->BackoffVal = pDigTable->BackoffVal_range_max; -+ else -+ pDigTable->BackoffVal +=2; -+ } -+ } -+ else -+ pDigTable->BackoffVal = DM_DIG_BACKOFF_DEFAULT; -+ -+ pDigTable->CurIGValue = pDigTable->Rssi_val_min+10-pDigTable->BackoffVal; -+ -+ //DBG_8192C("Rssi_val_min = %x BackoffVal %x\n",pDigTable->Rssi_val_min, pDigTable->BackoffVal); -+#ifdef CONFIG_USB_HCI -+ } -+ else -+ { -+ //DBG_8192C("===> dm_CtrlInitGainByRssi, Enter DIG by FA mode\n"); -+ //DBG_8192C("RSSI = 0x%x", pDigTable->Rssi_val_min); -+ -+ //Adjust initial gain by false alarm -+ if(FalseAlmCnt->Cnt_all > 1000) -+ pDigTable->CurIGValue = pDigTable ->PreIGValue+2; -+ else if (FalseAlmCnt->Cnt_all > 750) -+ pDigTable->CurIGValue = pDigTable->PreIGValue+1; -+ else if(FalseAlmCnt->Cnt_all < 500) -+ pDigTable->CurIGValue = pDigTable->PreIGValue-1; -+ } -+#endif -+ -+ if(RSSI_tmp <= DM_DIG_MIN) -+ pDigTable->rx_gain_range_min = DM_DIG_MIN; -+ else if(RSSI_tmp >= DM_DIG_MAX) -+ pDigTable->rx_gain_range_min = DM_DIG_MAX; -+ else -+ pDigTable->rx_gain_range_min = RSSI_tmp; -+ -+ -+ //Check initial gain by upper/lower bound -+ if(pDigTable->CurIGValue >pDigTable->rx_gain_range_max) -+ pDigTable->CurIGValue = pDigTable->rx_gain_range_max; -+ -+ if(pDigTable->CurIGValue < pDigTable->rx_gain_range_min) -+ pDigTable->CurIGValue = pDigTable->rx_gain_range_min; -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ if(pdmpriv->DMFlag & DYNAMIC_FUNC_ADAPTIVITY) -+ { -+ if(pDigTable->CurIGValue > Adap_IGI_Upper) -+ pDigTable->CurIGValue = Adap_IGI_Upper; -+ -+ if(pdmpriv->IGI_LowerBound != 0) -+ { -+ if(pDigTable->CurIGValue < pdmpriv->IGI_LowerBound) -+ pDigTable->CurIGValue = pdmpriv->IGI_LowerBound; -+ } -+ LOG_LEVEL(_drv_info_, FUNC_ADPT_FMT": pdmpriv->IGI_LowerBound = %d\n", -+ FUNC_ADPT_ARG(pAdapter), pdmpriv->IGI_LowerBound); -+ } -+#endif /* CONFIG_DM_ADAPTIVITY */ -+ -+ //printk("%s => rx_gain_range_max(0x%02x) rx_gain_range_min(0x%02x)\n",__FUNCTION__, -+ // pDigTable->rx_gain_range_max,pDigTable->rx_gain_range_min); -+ //printk("%s CurIGValue(0x%02x) <====\n",__FUNCTION__,pDigTable->CurIGValue ); -+ -+ DM_Write_DIG(pAdapter); -+ -+} -+#endif -+ -+static VOID -+dm_initial_gain_Multi_STA( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_priv *pmlmepriv = &(pAdapter->mlmepriv); -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ int rssi_strength = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ BOOLEAN bMulti_STA = _FALSE; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ //AP Mode -+ if(check_buddy_fwstate(pAdapter, WIFI_AP_STATE) == _TRUE && (rssi_strength !=0)) -+ { -+ bMulti_STA = _TRUE; -+ } -+ else if(pDigTable->CurMultiSTAConnectState == DIG_MultiSTA_CONNECT && rssi_strength==0) //STA+STA MODE -+ { -+ bMulti_STA = _TRUE; -+ rssi_strength = pdmpriv->UndecoratedSmoothedPWDB; -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ -+ //ADHOC and AP Mode -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ bMulti_STA = _TRUE; -+ } -+ -+ -+ if((bMulti_STA == _FALSE) -+ || (pDigTable->CurSTAConnectState == DIG_STA_DISCONNECT)) -+ { -+ pdmpriv->binitialized = _FALSE; -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX; -+ return; -+ } -+ else if(pdmpriv->binitialized == _FALSE) -+ { -+ pdmpriv->binitialized = _TRUE; -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_0; -+ pDigTable->CurIGValue = 0x20; -+ DM_Write_DIG(pAdapter); -+ } -+ -+ // Initial gain control by ap mode -+ if(pDigTable->CurMultiSTAConnectState == DIG_MultiSTA_CONNECT) -+ { -+ if ( (rssi_strength < pDigTable->RssiLowThresh) && -+ (pDigTable->Dig_Ext_Port_Stage != DIG_EXT_PORT_STAGE_1)) -+ { -+ // Set to dig value to 0x20 for Luke's opinion after disable dig -+ if(pDigTable->Dig_Ext_Port_Stage == DIG_EXT_PORT_STAGE_2) -+ { -+ pDigTable->CurIGValue = 0x20; -+ DM_Write_DIG(pAdapter); -+ } -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_1; -+ } -+ else if (rssi_strength > pDigTable->RssiHighThresh) -+ { -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_2; -+ dm_CtrlInitGainByFA(pAdapter); -+ } -+ } -+ else if(pDigTable->Dig_Ext_Port_Stage != DIG_EXT_PORT_STAGE_0) -+ { -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_0; -+ pDigTable->CurIGValue = 0x20; -+ DM_Write_DIG(pAdapter); -+ } -+ -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("CurMultiSTAConnectState = %x Dig_Ext_Port_Stage %x\n", -+ // DM_DigTable.CurMultiSTAConnectState, DM_DigTable.Dig_Ext_Port_Stage)); -+} -+ -+static VOID -+dm_initial_gain_STA_beforelinked( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ PFALSE_ALARM_STATISTICS pFalseAlmCnt = &(pdmpriv->FalseAlmCnt); -+ -+ //CurrentIGI = pDM_DigTable->rx_gain_range_min;//pDM_DigTable->CurIGValue = pDM_DigTable->rx_gain_range_min -+ //ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG BeforeLink\n")); -+ //2012.03.30 LukeLee: enable DIG before link but with very high thresholds -+ // Updated by Albert 2012/09/27 -+ // Copy the same rule from 8192du code. -+ if( pFalseAlmCnt->Cnt_all > 2000 ) -+ pDigTable->CurIGValue += 2; -+ else if ( ( pFalseAlmCnt->Cnt_all > 1000 ) && ( pFalseAlmCnt->Cnt_all <= 1000 ) ) -+ pDigTable->CurIGValue += 1; -+ else if(pFalseAlmCnt->Cnt_all < 500) -+ pDigTable->CurIGValue -= 1; -+ -+ //Check initial gain by upper/lower bound -+ if(pDigTable->CurIGValue >pDigTable->rx_gain_range_max) -+ pDigTable->CurIGValue = pDigTable->rx_gain_range_max; -+ -+ if(pDigTable->CurIGValue < pDigTable->rx_gain_range_min) -+ pDigTable->CurIGValue = pDigTable->rx_gain_range_min; -+ -+ printk("%s ==> FalseAlmCnt->Cnt_all:%d CurIGValue:0x%02x \n",__FUNCTION__,pFalseAlmCnt->Cnt_all ,pDigTable->CurIGValue); -+} -+ -+static VOID -+dm_initial_gain_STA( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("PreSTAConnectState = %x, CurSTAConnectState = %x\n", -+ // DM_DigTable.PreSTAConnectState, DM_DigTable.CurSTAConnectState)); -+ -+ -+ if(pDigTable->PreSTAConnectState == pDigTable->CurSTAConnectState|| -+ pDigTable->CurSTAConnectState == DIG_STA_BEFORE_CONNECT || -+ pDigTable->CurSTAConnectState == DIG_STA_CONNECT) -+ { -+ // beforeconnect -> beforeconnect or connect -> connect -+ // (dis)connect -> beforeconnect -+ // disconnect -> connecct or beforeconnect -> connect -+ if(pDigTable->CurSTAConnectState != DIG_STA_DISCONNECT) -+ { -+ pDigTable->Rssi_val_min = dm_initial_gain_MinPWDB(pAdapter); -+ dm_CtrlInitGainByRssi(pAdapter); -+ } -+#if 0 -+ else if((wdev_to_priv(pAdapter->rtw_wdev))->p2p_enabled == _TRUE -+ && pAdapter->wdinfo.driver_interface == DRIVER_CFG80211) -+ { -+ //pDigTable->CurIGValue = 0x30; -+ DM_Write_DIG(pAdapter); -+ } -+#endif -+ else{ // pDigTable->CurSTAConnectState == DIG_STA_DISCONNECT -+ #ifdef CONFIG_BEFORE_LINKED_DIG -+ //printk("%s==> ##1 CurIGI(0x%02x),PreIGValue(0x%02x) \n",__FUNCTION__,pDigTable->CurIGValue,pDigTable->PreIGValue ); -+ dm_initial_gain_STA_beforelinked(pAdapter); -+ DM_Write_DIG(pAdapter); -+ #endif //CONFIG_BEFORE_LINKED_DIG -+ } -+ } -+ else -+ { -+ // connect -> disconnect or beforeconnect -> disconnect -+ pDigTable->Rssi_val_min = 0; -+ pDigTable->Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX; -+ pDigTable->BackoffVal = DM_DIG_BACKOFF_DEFAULT; -+ pDigTable->CurIGValue = 0x20; -+ pDigTable->PreIGValue = 0; -+ #ifdef CONFIG_BEFORE_LINKED_DIG -+ //printk("%s==> ##2 CurIGI(0x%02x),PreIGValue(0x%02x) \n",__FUNCTION__,pDigTable->CurIGValue,pDigTable->PreIGValue ); -+ dm_initial_gain_STA_beforelinked(pAdapter); -+ #endif //CONFIG_BEFORE_LINKED_DIG -+ -+ -+ DM_Write_DIG(pAdapter); -+ } -+ -+} -+ -+ -+static void dm_CCK_PacketDetectionThresh( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pdmpriv->FalseAlmCnt); -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+ if(pDigTable->CurSTAConnectState == DIG_STA_CONNECT) -+ { -+ pDigTable->Rssi_val_min = dm_initial_gain_MinPWDB(pAdapter); -+ if(pDigTable->PreCCKPDState == CCK_PD_STAGE_LowRssi) -+ { -+ if(pDigTable->Rssi_val_min <= 25) -+ pDigTable->CurCCKPDState = CCK_PD_STAGE_LowRssi; -+ else -+ pDigTable->CurCCKPDState = CCK_PD_STAGE_HighRssi; -+ } -+ else{ -+ if(pDigTable->Rssi_val_min <= 20) -+ pDigTable->CurCCKPDState = CCK_PD_STAGE_LowRssi; -+ else -+ pDigTable->CurCCKPDState = CCK_PD_STAGE_HighRssi; -+ } -+ } -+ else -+ pDigTable->CurCCKPDState=CCK_PD_STAGE_MAX; -+ -+ if(pDigTable->PreCCKPDState != pDigTable->CurCCKPDState) -+ { -+ if((pDigTable->CurCCKPDState == CCK_PD_STAGE_LowRssi)|| -+ (pDigTable->CurCCKPDState == CCK_PD_STAGE_MAX)) -+ { -+ PHY_SetBBReg(pAdapter, rCCK0_CCA, bMaskByte2, 0x83); -+ -+ //PHY_SetBBReg(pAdapter, rCCK0_System, bMaskByte1, 0x40); -+ //if(IS_92C_SERIAL(pHalData->VersionID)) -+ //PHY_SetBBReg(pAdapter, rCCK0_FalseAlarmReport , bMaskByte2, 0xd7); -+ } -+ else -+ { -+ PHY_SetBBReg(pAdapter, rCCK0_CCA, bMaskByte2, 0xcd); -+ //PHY_SetBBReg(pAdapter,rCCK0_System, bMaskByte1, 0x47); -+ //if(IS_92C_SERIAL(pHalData->VersionID)) -+ //PHY_SetBBReg(pAdapter, rCCK0_FalseAlarmReport , bMaskByte2, 0xd3); -+ } -+ -+ pDigTable->PreCCKPDState = pDigTable->CurCCKPDState; -+ } -+ -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("CCKPDStage=%x\n",pDigTable->CurCCKPDState)); -+ //RT_TRACE( COMP_DIG, DBG_LOUD, ("is92C=%x\n",IS_92C_SERIAL(pHalData->VersionID))); -+ -+} -+ -+ -+static void -+dm_CtrlInitGainByTwoPort( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_priv *pmlmepriv = &(pAdapter->mlmepriv); -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) -+ { -+#ifdef CONFIG_IOCTL_CFG80211 -+ if((wdev_to_priv(pAdapter->rtw_wdev))->p2p_enabled == _TRUE) -+ { -+ } -+ else -+#endif -+ return; -+ } -+ -+ // Decide the current status and if modify initial gain or not -+ if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) -+ { -+ pDigTable->CurSTAConnectState = DIG_STA_BEFORE_CONNECT; -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ pDigTable->CurSTAConnectState = DIG_STA_CONNECT; -+ } -+ else -+ { -+ pDigTable->CurSTAConnectState = DIG_STA_DISCONNECT; -+ } -+ -+ -+ pDigTable->CurMultiSTAConnectState = DIG_MultiSTA_DISCONNECT; -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ if((is_IBSS_empty(pAdapter)==_FAIL) && (pAdapter->stapriv.asoc_sta_count > 2)) -+ pDigTable->CurMultiSTAConnectState = DIG_MultiSTA_CONNECT; -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ if(pAdapter->stapriv.asoc_sta_count > 2) -+ pDigTable->CurMultiSTAConnectState = DIG_MultiSTA_CONNECT; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(pAdapter, WIFI_AP_STATE) == _TRUE) -+ { -+ PADAPTER pbuddy_adapter = pAdapter->pbuddy_adapter; -+ -+ if(pbuddy_adapter->stapriv.asoc_sta_count > 2) -+ { -+ pDigTable->CurSTAConnectState = DIG_STA_CONNECT; -+ pDigTable->CurMultiSTAConnectState = DIG_MultiSTA_CONNECT; -+ } -+ } -+ else if(check_buddy_fwstate(pAdapter, WIFI_STATION_STATE) == _TRUE && -+ check_buddy_fwstate(pAdapter, _FW_LINKED) == _TRUE) -+ { -+ pDigTable->CurSTAConnectState = DIG_STA_CONNECT; -+ -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ -+ dm_initial_gain_STA(pAdapter); -+ dm_initial_gain_Multi_STA(pAdapter); -+ //Baron temp DIG solution for DMP -+ //dm_CtrlInitGainByFA(pAdapter); -+ -+ dm_CCK_PacketDetectionThresh(pAdapter); -+ -+ pDigTable->PreSTAConnectState = pDigTable->CurSTAConnectState; -+ -+} -+ -+ -+static void dm_DIG( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+ //Read 0x0c50; Initial gain -+ pDigTable->PreIGValue = (u8)PHY_QueryBBReg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0); -+ -+ //RTPRINT(FDM, DM_Monitor, ("dm_DIG() ==>\n")); -+ -+ if(pdmpriv->bDMInitialGainEnable == _FALSE) -+ return; -+ -+ //if(pDigTable->Dig_Enable_Flag == _FALSE) -+ // return; -+ -+ if(!(pdmpriv->DMFlag & DYNAMIC_FUNC_DIG)) -+ return; -+ -+ //RTPRINT(FDM, DM_Monitor, ("dm_DIG() progress \n")); -+ -+ dm_CtrlInitGainByTwoPort(pAdapter); -+ -+ //RTPRINT(FDM, DM_Monitor, ("dm_DIG() <==\n")); -+} -+ -+static void dm_SavePowerIndex(IN PADAPTER Adapter) -+{ -+ u8 index; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u32 Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; -+ -+ for(index = 0; index< 6; index++) -+ pdmpriv->PowerIndex_backup[index] = rtw_read8(Adapter, Power_Index_REG[index]); -+} -+ -+static void dm_RestorePowerIndex(IN PADAPTER Adapter) -+{ -+ u8 index; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u32 Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; -+ -+ for(index = 0; index< 6; index++) -+ rtw_write8(Adapter, Power_Index_REG[index], pdmpriv->PowerIndex_backup[index]); -+} -+ -+static void dm_WritePowerIndex( -+ IN PADAPTER Adapter, -+ IN u8 Value) -+{ -+ u8 index; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; -+ -+ for(index = 0; index< 6; index++) -+ rtw_write8(Adapter, Power_Index_REG[index], Value); -+} -+ -+static void dm_InitDynamicTxPower(IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+#ifdef CONFIG_USB_HCI -+#ifdef CONFIG_INTEL_PROXIM -+ if((pHalData->BoardType == BOARD_USB_High_PA)||(Adapter->proximity.proxim_support==_TRUE)) -+#else -+ if(pHalData->BoardType == BOARD_USB_High_PA) -+#endif -+ { -+ dm_SavePowerIndex(Adapter); -+ pdmpriv->bDynamicTxPowerEnable = _TRUE; -+ } -+ else -+#else -+ pdmpriv->bDynamicTxPowerEnable = _FALSE; -+#endif -+ -+ pdmpriv->LastDTPLvl = TxHighPwrLevel_Normal; -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; -+} -+ -+ -+static void dm_DynamicTxPower(IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ int UndecoratedSmoothedPWDB; -+ -+ if(!pdmpriv->bDynamicTxPowerEnable) -+ return; -+ -+ // If dynamic high power is disabled. -+ if(!(pdmpriv->DMFlag & DYNAMIC_FUNC_HP) ) -+ { -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; -+ return; -+ } -+ -+ // STA not connected and AP not connected -+ if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && -+ (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) -+ { -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("Not connected to any \n")); -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; -+ -+ //the LastDTPlvl should reset when disconnect, -+ //otherwise the tx power level wouldn't change when disconnect and connect again. -+ // Maddest 20091220. -+ pdmpriv->LastDTPLvl=TxHighPwrLevel_Normal; -+ return; -+ } -+#ifdef CONFIG_INTEL_PROXIM -+ if(Adapter->proximity.proxim_on== _TRUE){ -+ struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv; -+ // Intel set fixed tx power -+ printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d \n",__FUNCTION__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output); -+ if(prox_priv!=NULL){ -+ if(prox_priv->proxim_modeinfo->power_output> 0) -+ -+ { -+ switch(prox_priv->proxim_modeinfo->power_output){ -+ case 1: -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_100; -+ printk("TxHighPwrLevel_100\n"); -+ break; -+ case 2: -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_70; -+ printk("TxHighPwrLevel_70\n"); -+ break; -+ case 3: -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_50; -+ printk("TxHighPwrLevel_50\n"); -+ break; -+ case 4: -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_35; -+ printk("TxHighPwrLevel_35\n"); -+ break; -+ case 5: -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_15; -+ printk("TxHighPwrLevel_15\n"); -+ break; -+ default: -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_100; -+ printk("TxHighPwrLevel_100\n"); -+ break; -+ } -+ } -+ } -+ } -+ else -+#endif -+{ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port -+ { -+ //todo: AP Mode -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) -+ { -+ UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("AP Client PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); -+ } -+ else -+ { -+ UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB; -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("STA Default Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); -+ } -+ } -+ else // associated entry pwdb -+ { -+ UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("AP Ext Port PWDB = 0x%x \n", UndecoratedSmoothedPWDB)); -+ } -+ -+ if(UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2) -+ { -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level2; -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("TxHighPwrLevel_Level1 (TxPwr=0x0)\n")); -+ } -+ else if((UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL2-3)) && -+ (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL1) ) -+ { -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level1; -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("TxHighPwrLevel_Level1 (TxPwr=0x10)\n")); -+ } -+ else if(UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL1-5)) -+ { -+ pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; -+ //RT_TRACE(COMP_HIPWR, DBG_LOUD, ("TxHighPwrLevel_Normal\n")); -+ } -+} -+ if( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) ) -+ { -+ PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel); -+ if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Normal) // HP1 -> Normal or HP2 -> Normal -+ dm_RestorePowerIndex(Adapter); -+ else if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) -+ dm_WritePowerIndex(Adapter, 0x14); -+ else if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) -+ dm_WritePowerIndex(Adapter, 0x10); -+ } -+ pdmpriv->LastDTPLvl = pdmpriv->DynamicTxHighPowerLvl; -+ -+} -+ -+ -+static VOID -+DM_ChangeDynamicInitGainThresh( -+ IN PADAPTER pAdapter, -+ IN u32 DM_Type, -+ IN u32 DM_Value) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ -+ if (DM_Type == DIG_TYPE_THRESH_HIGH) -+ { -+ pDigTable->RssiHighThresh = DM_Value; -+ } -+ else if (DM_Type == DIG_TYPE_THRESH_LOW) -+ { -+ pDigTable->RssiLowThresh = DM_Value; -+ } -+ else if (DM_Type == DIG_TYPE_ENABLE) -+ { -+ pDigTable->Dig_Enable_Flag = _TRUE; -+ } -+ else if (DM_Type == DIG_TYPE_DISABLE) -+ { -+ pDigTable->Dig_Enable_Flag = _FALSE; -+ } -+ else if (DM_Type == DIG_TYPE_BACKOFF) -+ { -+ if(DM_Value > 30) -+ DM_Value = 30; -+ pDigTable->BackoffVal = (u8)DM_Value; -+ } -+ else if(DM_Type == DIG_TYPE_RX_GAIN_MIN) -+ { -+ if(DM_Value == 0) -+ DM_Value = 0x1; -+ pDigTable->rx_gain_range_min = (u8)DM_Value; -+ } -+ else if(DM_Type == DIG_TYPE_RX_GAIN_MAX) -+ { -+ if(DM_Value > 0x50) -+ DM_Value = 0x50; -+ pDigTable->rx_gain_range_max = (u8)DM_Value; -+ } -+} /* DM_ChangeDynamicInitGainThresh */ -+ -+ -+static VOID PWDB_Monitor( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ int i; -+ int tmpEntryMaxPWDB=0, tmpEntryMinPWDB=0xff; -+ u8 sta_cnt=0; -+ u32 PWDB_rssi[NUM_STA]={0};//[0~15]:MACID, [16~31]:PWDB_rssi -+ -+ if(check_fwstate(&Adapter->mlmepriv, _FW_LINKED) != _TRUE) -+ return; -+ -+ -+ if(check_fwstate(&Adapter->mlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ _irqL irqL; -+ _list *plist, *phead; -+ struct sta_info *psta; -+ struct sta_priv *pstapriv = &Adapter->stapriv; -+ u8 bcast_addr[ETH_ALEN]= {0xff,0xff,0xff,0xff,0xff,0xff}; -+ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(i=0; i< NUM_STA; i++) -+ { -+ phead = &(pstapriv->sta_hash[i]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); -+ -+ plist = get_next(plist); -+ -+ if(_rtw_memcmp(psta ->hwaddr, bcast_addr, ETH_ALEN) || -+ _rtw_memcmp(psta->hwaddr, myid(&Adapter->eeprompriv), ETH_ALEN)) -+ continue; -+ -+ if(psta->state & WIFI_ASOC_STATE) -+ { -+ -+ if(psta->rssi_stat.UndecoratedSmoothedPWDB < tmpEntryMinPWDB) -+ tmpEntryMinPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; -+ -+ if(psta->rssi_stat.UndecoratedSmoothedPWDB > tmpEntryMaxPWDB) -+ tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; -+ -+ PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16)); -+ } -+ -+ } -+ -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ -+ -+ if(pHalData->fw_ractrl == _TRUE) -+ { -+ // Report every sta's RSSI to FW -+ for(i=0; i< sta_cnt; i++) -+ { -+ rtl8192c_set_rssi_cmd(Adapter, (u8*)&PWDB_rssi[i]); -+ } -+ } -+ -+ } -+ -+ -+ -+ if(tmpEntryMaxPWDB != 0) // If associated entry is found -+ { -+ pdmpriv->EntryMaxUndecoratedSmoothedPWDB = tmpEntryMaxPWDB; -+ } -+ else -+ { -+ pdmpriv->EntryMaxUndecoratedSmoothedPWDB = 0; -+ } -+ -+ if(tmpEntryMinPWDB != 0xff) // If associated entry is found -+ { -+ pdmpriv->EntryMinUndecoratedSmoothedPWDB = tmpEntryMinPWDB; -+ } -+ else -+ { -+ pdmpriv->EntryMinUndecoratedSmoothedPWDB = 0; -+ } -+ -+ -+ if(check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ -+ if(pHalData->fw_ractrl == _TRUE) -+ { -+ u32 param = (u32)(pdmpriv->UndecoratedSmoothedPWDB<<16); -+ -+ param |= 0;//macid=0 for sta mode; -+ -+ rtl8192c_set_rssi_cmd(Adapter, (u8*)¶m); -+ } -+ } -+ -+} -+ -+ -+static void -+DM_InitEdcaTurbo( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ pHalData->bCurrentTurboEDCA = _FALSE; -+ Adapter->recvpriv.bIsAnyNonBEPkts = _FALSE; -+ -+} -+ -+ -+static void -+dm_CheckEdcaTurbo( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 trafficIndex; -+ u32 edca_param; -+ u64 cur_tx_bytes = 0; -+ u64 cur_rx_bytes = 0; -+ u8 bbtchange = _FALSE; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv); -+ struct recv_priv *precvpriv = &(Adapter->recvpriv); -+ struct registry_priv *pregpriv = &Adapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &(Adapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+#endif -+ -+ -+ if ((pregpriv->wifi_spec == 1) || (pmlmeinfo->HT_enable == 0)) -+ { -+ goto dm_CheckEdcaTurbo_EXIT; -+ } -+ -+ if (pmlmeinfo->assoc_AP_vendor >= maxAP) -+ { -+ goto dm_CheckEdcaTurbo_EXIT; -+ } -+ -+#ifdef CONFIG_BT_COEXIST -+ if(pbtpriv->BT_Coexist) -+ { -+ if( (pbtpriv->BT_EDCA[UP_LINK]!=0) || (pbtpriv->BT_EDCA[DOWN_LINK]!=0)) -+ { -+ bbtchange = _TRUE; -+ } -+ } -+#endif -+ -+ // Check if the status needs to be changed. -+ if((bbtchange) || (!precvpriv->bIsAnyNonBEPkts) ) -+ { -+ cur_tx_bytes = pxmitpriv->tx_bytes - pxmitpriv->last_tx_bytes; -+ cur_rx_bytes = precvpriv->rx_bytes - precvpriv->last_rx_bytes; -+ -+ //traffic, TX or RX -+ if((pmlmeinfo->assoc_AP_vendor == ralinkAP)||(pmlmeinfo->assoc_AP_vendor == atherosAP)) -+ { -+ if (cur_tx_bytes > (cur_rx_bytes << 2)) -+ { // Uplink TP is present. -+ trafficIndex = UP_LINK; -+ } -+ else -+ { // Balance TP is present. -+ trafficIndex = DOWN_LINK; -+ } -+ } -+ else -+ { -+ if (cur_rx_bytes > (cur_tx_bytes << 2)) -+ { // Downlink TP is present. -+ trafficIndex = DOWN_LINK; -+ } -+ else -+ { // Balance TP is present. -+ trafficIndex = UP_LINK; -+ } -+ } -+ -+ if ((pdmpriv->prv_traffic_idx != trafficIndex) || (!pHalData->bCurrentTurboEDCA)) -+ { -+#ifdef CONFIG_BT_COEXIST -+ if(_TRUE == bbtchange) -+ { -+ edca_param = pbtpriv->BT_EDCA[trafficIndex]; -+ } -+ else -+#endif -+ { -+#if 0 -+ //adjust EDCA parameter for BE queue -+ edca_param = EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex]; -+#else -+ -+ if((pmlmeinfo->assoc_AP_vendor == ciscoAP) && (pmlmeext->cur_wireless_mode & WIRELESS_11_24N)) -+ { -+ edca_param = EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex]; -+ } -+ else -+ { -+ edca_param = EDCAParam[unknownAP][trafficIndex]; -+ } -+#endif -+ } -+ -+#ifdef CONFIG_PCI_HCI -+ if(IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ edca_param = 0x60a42b; -+ } -+ else -+ { -+ edca_param = 0x6ea42b; -+ } -+#endif -+ rtw_write32(Adapter, REG_EDCA_BE_PARAM, edca_param); -+ -+ pdmpriv->prv_traffic_idx = trafficIndex; -+ } -+ -+ pHalData->bCurrentTurboEDCA = _TRUE; -+ } -+ else -+ { -+ // -+ // Turn Off EDCA turbo here. -+ // Restore original EDCA according to the declaration of AP. -+ // -+ if(pHalData->bCurrentTurboEDCA) -+ { -+ rtw_write32(Adapter, REG_EDCA_BE_PARAM, pHalData->AcParam_BE); -+ pHalData->bCurrentTurboEDCA = _FALSE; -+ } -+ } -+ -+dm_CheckEdcaTurbo_EXIT: -+ // Set variables for next time. -+ precvpriv->bIsAnyNonBEPkts = _FALSE; -+ pxmitpriv->last_tx_bytes = pxmitpriv->tx_bytes; -+ precvpriv->last_rx_bytes = precvpriv->rx_bytes; -+ -+} -+ -+#define DPK_DELTA_MAPPING_NUM 13 -+#define index_mapping_HP_NUM 15 -+ -+static VOID -+dm_TXPowerTrackingCallback_ThermalMeter_92C( -+ IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u8 ThermalValue = 0, delta, delta_LCK, delta_IQK, delta_HP, TimeOut = 100; -+ int ele_A, ele_D, TempCCk, X, value32; -+ int Y, ele_C; -+ s8 OFDM_index[2], CCK_index = 0, OFDM_index_old[2], CCK_index_old = 0; -+ int i = 0; -+ BOOLEAN is2T = IS_92C_SERIAL(pHalData->VersionID); -+ -+#if MP_DRIVER == 1 -+ PMPT_CONTEXT pMptCtx = &(Adapter->mppriv.MptCtx); -+ u8 *TxPwrLevel = pMptCtx->TxPwrLevel; -+#endif -+ u8 OFDM_min_index = 6, rf; //OFDM BB Swing should be less than +3.0dB, which is required by Arthur -+#if 0 -+ u32 DPK_delta_mapping[2][DPK_DELTA_MAPPING_NUM] = { -+ {0x1c, 0x1c, 0x1d, 0x1d, 0x1e, -+ 0x1f, 0x00, 0x00, 0x01, 0x01, -+ 0x02, 0x02, 0x03}, -+ {0x1c, 0x1d, 0x1e, 0x1e, 0x1e, -+ 0x1f, 0x00, 0x00, 0x01, 0x02, -+ 0x02, 0x03, 0x03}}; -+#endif -+#ifdef CONFIG_USB_HCI -+ u8 ThermalValue_HP_count = 0; -+ u32 ThermalValue_HP = 0; -+ s32 index_mapping_HP[index_mapping_HP_NUM] = { -+ 0, 1, 3, 4, 6, -+ 7, 9, 10, 12, 13, -+ 15, 16, 18, 19, 21 -+ }; -+ -+ s8 index_HP; -+#endif -+ -+ pdmpriv->TXPowerTrackingCallbackCnt++; //cosa add for debug -+ pdmpriv->bTXPowerTrackingInit = _TRUE; -+ -+ if(pHalData->CurrentChannel == 14 && !pdmpriv->bCCKinCH14) -+ pdmpriv->bCCKinCH14 = _TRUE; -+ else if(pHalData->CurrentChannel != 14 && pdmpriv->bCCKinCH14) -+ pdmpriv->bCCKinCH14 = _FALSE; -+ -+ //DBG_8192C("===>dm_TXPowerTrackingCallback_ThermalMeter_92C\n"); -+ -+ ThermalValue = (u8)PHY_QueryRFReg(Adapter, RF_PATH_A, RF_T_METER, 0x1f); // 0x24: RF Reg[4:0] -+ -+ //DBG_8192C("\n\nReadback Thermal Meter = 0x%x pre thermal meter 0x%x EEPROMthermalmeter 0x%x\n",ThermalValue,pdmpriv->ThermalValue, pHalData->EEPROMThermalMeter); -+ -+ rtl8192c_PHY_APCalibrate(Adapter, (ThermalValue - pHalData->EEPROMThermalMeter)); -+ -+ if(is2T) -+ rf = 2; -+ else -+ rf = 1; -+ -+ if(ThermalValue) -+ { -+// if(!pHalData->ThermalValue) -+ { -+ //Query OFDM path A default setting -+ ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance, bMaskDWord)&bMaskOFDM_D; -+ for(i=0; ibCCKinCH14) -+ { -+ if(_rtw_memcmp((void*)&TempCCk, (void*)&CCKSwingTable_Ch14[i][2], 4)==_TRUE) -+ { -+ CCK_index_old =(u8)i; -+ //DBG_8192C("Initial reg0x%x = 0x%x, CCK_index=0x%x, ch 14 %d\n", rCCK0_TxFilter2, TempCCk, CCK_index_old, pdmpriv->bCCKinCH14); -+ break; -+ } -+ } -+ else -+ { -+ if(_rtw_memcmp((void*)&TempCCk, (void*)&CCKSwingTable_Ch1_Ch13[i][2], 4)==_TRUE) -+ { -+ CCK_index_old =(u8)i; -+ //DBG_8192C("Initial reg0x%x = 0x%x, CCK_index=0x%x, ch14 %d\n", rCCK0_TxFilter2, TempCCk, CCK_index_old, pdmpriv->bCCKinCH14); -+ break; -+ } -+ } -+ } -+ -+ if(!pdmpriv->ThermalValue) -+ { -+ pdmpriv->ThermalValue = pHalData->EEPROMThermalMeter; -+ pdmpriv->ThermalValue_LCK = ThermalValue; -+ pdmpriv->ThermalValue_IQK = ThermalValue; -+ pdmpriv->ThermalValue_DPK = pHalData->EEPROMThermalMeter; -+ -+#ifdef CONFIG_USB_HCI -+ for(i = 0; i < rf; i++) -+ pdmpriv->OFDM_index_HP[i] = pdmpriv->OFDM_index[i] = OFDM_index_old[i]; -+ pdmpriv->CCK_index_HP = pdmpriv->CCK_index = CCK_index_old; -+#else -+ for(i = 0; i < rf; i++) -+ pdmpriv->OFDM_index[i] = OFDM_index_old[i]; -+ pdmpriv->CCK_index = CCK_index_old; -+#endif -+ } -+ -+#ifdef CONFIG_USB_HCI -+ if(pHalData->BoardType == BOARD_USB_High_PA) -+ { -+ pdmpriv->ThermalValue_HP[pdmpriv->ThermalValue_HP_index] = ThermalValue; -+ pdmpriv->ThermalValue_HP_index++; -+ if(pdmpriv->ThermalValue_HP_index == HP_THERMAL_NUM) -+ pdmpriv->ThermalValue_HP_index = 0; -+ -+ for(i = 0; i < HP_THERMAL_NUM; i++) -+ { -+ if(pdmpriv->ThermalValue_HP[i]) -+ { -+ ThermalValue_HP += pdmpriv->ThermalValue_HP[i]; -+ ThermalValue_HP_count++; -+ } -+ } -+ -+ if(ThermalValue_HP_count) -+ ThermalValue = (u8)(ThermalValue_HP / ThermalValue_HP_count); -+ } -+#endif -+ } -+ -+ delta = (ThermalValue > pdmpriv->ThermalValue)?(ThermalValue - pdmpriv->ThermalValue):(pdmpriv->ThermalValue - ThermalValue); -+#ifdef CONFIG_USB_HCI -+ if(pHalData->BoardType == BOARD_USB_High_PA) -+ { -+ if(pdmpriv->bDoneTxpower) -+ delta_HP = (ThermalValue > pdmpriv->ThermalValue)?(ThermalValue - pdmpriv->ThermalValue):(pdmpriv->ThermalValue - ThermalValue); -+ else -+ delta_HP = ThermalValue > pHalData->EEPROMThermalMeter?(ThermalValue - pHalData->EEPROMThermalMeter):(pHalData->EEPROMThermalMeter - ThermalValue); -+ } -+ else -+#endif -+ { -+ delta_HP = 0; -+ } -+ delta_LCK = (ThermalValue > pdmpriv->ThermalValue_LCK)?(ThermalValue - pdmpriv->ThermalValue_LCK):(pdmpriv->ThermalValue_LCK - ThermalValue); -+ delta_IQK = (ThermalValue > pdmpriv->ThermalValue_IQK)?(ThermalValue - pdmpriv->ThermalValue_IQK):(pdmpriv->ThermalValue_IQK - ThermalValue); -+ -+ //DBG_8192C("Readback Thermal Meter = 0x%lx pre thermal meter 0x%lx EEPROMthermalmeter 0x%lx delta 0x%lx delta_LCK 0x%lx delta_IQK 0x%lx\n", ThermalValue, pHalData->ThermalValue, pHalData->EEPROMThermalMeter, delta, delta_LCK, delta_IQK); -+ -+ if(delta_LCK > 1) -+ { -+ pdmpriv->ThermalValue_LCK = ThermalValue; -+ rtl8192c_PHY_LCCalibrate(Adapter); -+ } -+ -+ if((delta > 0 || delta_HP > 0) && pdmpriv->TxPowerTrackControl) -+ { -+#ifdef CONFIG_USB_HCI -+ if(pHalData->BoardType == BOARD_USB_High_PA) -+ { -+ pdmpriv->bDoneTxpower = _TRUE; -+ delta_HP = ThermalValue > pHalData->EEPROMThermalMeter?(ThermalValue - pHalData->EEPROMThermalMeter):(pHalData->EEPROMThermalMeter - ThermalValue); -+ -+ if(delta_HP > index_mapping_HP_NUM-1) -+ index_HP = index_mapping_HP[index_mapping_HP_NUM-1]; -+ else -+ index_HP = index_mapping_HP[delta_HP]; -+ -+ if(ThermalValue > pHalData->EEPROMThermalMeter) //set larger Tx power -+ { -+ for(i = 0; i < rf; i++) -+ OFDM_index[i] = pdmpriv->OFDM_index_HP[i] - index_HP; -+ CCK_index = pdmpriv->CCK_index_HP -index_HP; -+ } -+ else -+ { -+ for(i = 0; i < rf; i++) -+ OFDM_index[i] = pdmpriv->OFDM_index_HP[i] + index_HP; -+ CCK_index = pdmpriv->CCK_index_HP + index_HP; -+ } -+ -+ delta_HP = (ThermalValue > pdmpriv->ThermalValue)?(ThermalValue - pdmpriv->ThermalValue):(pdmpriv->ThermalValue - ThermalValue); -+ -+ } -+ else -+#endif -+ { -+ if(ThermalValue > pdmpriv->ThermalValue) -+ { -+ for(i = 0; i < rf; i++) -+ pdmpriv->OFDM_index[i] -= delta; -+ pdmpriv->CCK_index -= delta; -+ } -+ else -+ { -+ for(i = 0; i < rf; i++) -+ pdmpriv->OFDM_index[i] += delta; -+ pdmpriv->CCK_index += delta; -+ } -+ } -+ -+ /*if(is2T) -+ { -+ DBG_8192C("temp OFDM_A_index=0x%x, OFDM_B_index=0x%x, CCK_index=0x%x\n", -+ pdmpriv->OFDM_index[0], pdmpriv->OFDM_index[1], pdmpriv->CCK_index); -+ } -+ else -+ { -+ DBG_8192C("temp OFDM_A_index=0x%x, CCK_index=0x%x\n", -+ pdmpriv->OFDM_index[0], pdmpriv->CCK_index); -+ }*/ -+ -+ //no adjust -+#ifdef CONFIG_USB_HCI -+ if(pHalData->BoardType != BOARD_USB_High_PA) -+#endif -+ { -+ if(ThermalValue > pHalData->EEPROMThermalMeter) -+ { -+ for(i = 0; i < rf; i++) -+ OFDM_index[i] = pdmpriv->OFDM_index[i]+1; -+ CCK_index = pdmpriv->CCK_index+1; -+ } -+ else -+ { -+ for(i = 0; i < rf; i++) -+ OFDM_index[i] = pdmpriv->OFDM_index[i]; -+ CCK_index = pdmpriv->CCK_index; -+ } -+ -+#if MP_DRIVER == 1 -+ for(i = 0; i < rf; i++) -+ { -+ if(TxPwrLevel[i] >=0 && TxPwrLevel[i] <=26) -+ { -+ if(ThermalValue > pHalData->EEPROMThermalMeter) -+ { -+ if (delta < 5) -+ OFDM_index[i] -= 1; -+ else -+ OFDM_index[i] -= 2; -+ } -+ else if(delta > 5 && ThermalValue < pHalData->EEPROMThermalMeter) -+ { -+ OFDM_index[i] += 1; -+ } -+ } -+ else if (TxPwrLevel[i] >= 27 && TxPwrLevel[i] <= 32 && ThermalValue > pHalData->EEPROMThermalMeter) -+ { -+ if (delta < 5) -+ OFDM_index[i] -= 1; -+ else -+ OFDM_index[i] -= 2; -+ } -+ else if (TxPwrLevel[i] >= 32 && TxPwrLevel[i] <= 38 && ThermalValue > pHalData->EEPROMThermalMeter && delta > 5) -+ { -+ OFDM_index[i] -= 1; -+ } -+ } -+ -+ { -+ if(TxPwrLevel[i] >=0 && TxPwrLevel[i] <=26) -+ { -+ if(ThermalValue > pHalData->EEPROMThermalMeter) -+ { -+ if (delta < 5) -+ CCK_index -= 1; -+ else -+ CCK_index -= 2; -+ } -+ else if(delta > 5 && ThermalValue < pHalData->EEPROMThermalMeter) -+ { -+ CCK_index += 1; -+ } -+ } -+ else if (TxPwrLevel[i] >= 27 && TxPwrLevel[i] <= 32 && ThermalValue > pHalData->EEPROMThermalMeter) -+ { -+ if (delta < 5) -+ CCK_index -= 1; -+ else -+ CCK_index -= 2; -+ } -+ else if (TxPwrLevel[i] >= 32 && TxPwrLevel[i] <= 38 && ThermalValue > pHalData->EEPROMThermalMeter && delta > 5) -+ { -+ CCK_index -= 1; -+ } -+ } -+#endif -+ } -+ -+ for(i = 0; i < rf; i++) -+ { -+ if(OFDM_index[i] > (OFDM_TABLE_SIZE_92C-1)) -+ OFDM_index[i] = (OFDM_TABLE_SIZE_92C-1); -+ else if (OFDM_index[i] < OFDM_min_index) -+ OFDM_index[i] = OFDM_min_index; -+ } -+ -+ if(CCK_index > (CCK_TABLE_SIZE-1)) -+ CCK_index = (CCK_TABLE_SIZE-1); -+ else if (CCK_index < 0) -+ CCK_index = 0; -+ -+ /*if(is2T) -+ { -+ DBG_8192C("new OFDM_A_index=0x%x, OFDM_B_index=0x%x, CCK_index=0x%x\n", -+ OFDM_index[0], OFDM_index[1], CCK_index); -+ } -+ else -+ { -+ DBG_8192C("new OFDM_A_index=0x%x, CCK_index=0x%x\n", -+ OFDM_index[0], CCK_index); -+ }*/ -+ } -+ -+ if(pdmpriv->TxPowerTrackControl && (delta != 0 || delta_HP != 0)) -+ { -+ //Adujst OFDM Ant_A according to IQK result -+ ele_D = (OFDMSwingTable[OFDM_index[0]] & 0xFFC00000)>>22; -+ X = pdmpriv->RegE94; -+ Y = pdmpriv->RegE9C; -+ -+ if(X != 0) -+ { -+ if ((X & 0x00000200) != 0) -+ X = X | 0xFFFFFC00; -+ ele_A = ((X * ele_D)>>8)&0x000003FF; -+ -+ //new element C = element D x Y -+ if ((Y & 0x00000200) != 0) -+ Y = Y | 0xFFFFFC00; -+ ele_C = ((Y * ele_D)>>8)&0x000003FF; -+ -+ //wirte new elements A, C, D to regC80 and regC94, element B is always 0 -+ value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A; -+ PHY_SetBBReg(Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, value32); -+ -+ value32 = (ele_C&0x000003C0)>>6; -+ PHY_SetBBReg(Adapter, rOFDM0_XCTxAFE, bMaskH4Bits, value32); -+ -+ value32 = ((X * ele_D)>>7)&0x01; -+ PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, BIT31, value32); -+ -+ value32 = ((Y * ele_D)>>7)&0x01; -+ PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, BIT29, value32); -+ -+ } -+ else -+ { -+ PHY_SetBBReg(Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, OFDMSwingTable[OFDM_index[0]]); -+ PHY_SetBBReg(Adapter, rOFDM0_XCTxAFE, bMaskH4Bits, 0x00); -+ PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, BIT31|BIT29, 0x00); -+ } -+ -+ //RTPRINT(FINIT, INIT_IQK, ("TxPwrTracking path A: X = 0x%x, Y = 0x%x ele_A = 0x%x ele_C = 0x%x ele_D = 0x%x\n", X, Y, ele_A, ele_C, ele_D)); -+ -+ //Adjust CCK according to IQK result -+ if(!pdmpriv->bCCKinCH14){ -+ rtw_write8(Adapter, 0xa22, CCKSwingTable_Ch1_Ch13[CCK_index][0]); -+ rtw_write8(Adapter, 0xa23, CCKSwingTable_Ch1_Ch13[CCK_index][1]); -+ rtw_write8(Adapter, 0xa24, CCKSwingTable_Ch1_Ch13[CCK_index][2]); -+ rtw_write8(Adapter, 0xa25, CCKSwingTable_Ch1_Ch13[CCK_index][3]); -+ rtw_write8(Adapter, 0xa26, CCKSwingTable_Ch1_Ch13[CCK_index][4]); -+ rtw_write8(Adapter, 0xa27, CCKSwingTable_Ch1_Ch13[CCK_index][5]); -+ rtw_write8(Adapter, 0xa28, CCKSwingTable_Ch1_Ch13[CCK_index][6]); -+ rtw_write8(Adapter, 0xa29, CCKSwingTable_Ch1_Ch13[CCK_index][7]); -+ } -+ else{ -+ rtw_write8(Adapter, 0xa22, CCKSwingTable_Ch14[CCK_index][0]); -+ rtw_write8(Adapter, 0xa23, CCKSwingTable_Ch14[CCK_index][1]); -+ rtw_write8(Adapter, 0xa24, CCKSwingTable_Ch14[CCK_index][2]); -+ rtw_write8(Adapter, 0xa25, CCKSwingTable_Ch14[CCK_index][3]); -+ rtw_write8(Adapter, 0xa26, CCKSwingTable_Ch14[CCK_index][4]); -+ rtw_write8(Adapter, 0xa27, CCKSwingTable_Ch14[CCK_index][5]); -+ rtw_write8(Adapter, 0xa28, CCKSwingTable_Ch14[CCK_index][6]); -+ rtw_write8(Adapter, 0xa29, CCKSwingTable_Ch14[CCK_index][7]); -+ } -+ -+ if(is2T) -+ { -+ ele_D = (OFDMSwingTable[(u8)OFDM_index[1]] & 0xFFC00000)>>22; -+ -+ //new element A = element D x X -+ X = pdmpriv->RegEB4; -+ Y = pdmpriv->RegEBC; -+ -+ if(X != 0){ -+ if ((X & 0x00000200) != 0) //consider minus -+ X = X | 0xFFFFFC00; -+ ele_A = ((X * ele_D)>>8)&0x000003FF; -+ -+ //new element C = element D x Y -+ if ((Y & 0x00000200) != 0) -+ Y = Y | 0xFFFFFC00; -+ ele_C = ((Y * ele_D)>>8)&0x00003FF; -+ -+ //wirte new elements A, C, D to regC88 and regC9C, element B is always 0 -+ value32=(ele_D<<22)|((ele_C&0x3F)<<16) |ele_A; -+ PHY_SetBBReg(Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, value32); -+ -+ value32 = (ele_C&0x000003C0)>>6; -+ PHY_SetBBReg(Adapter, rOFDM0_XDTxAFE, bMaskH4Bits, value32); -+ -+ value32 = ((X * ele_D)>>7)&0x01; -+ PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, BIT27, value32); -+ -+ value32 = ((Y * ele_D)>>7)&0x01; -+ PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, BIT25, value32); -+ -+ } -+ else{ -+ PHY_SetBBReg(Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, OFDMSwingTable[OFDM_index[1]]); -+ PHY_SetBBReg(Adapter, rOFDM0_XDTxAFE, bMaskH4Bits, 0x00); -+ PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, BIT27|BIT25, 0x00); -+ } -+ -+ //DBG_8192C("TxPwrTracking path B: X = 0x%x, Y = 0x%x ele_A = 0x%x ele_C = 0x%x ele_D = 0x%x\n", X, Y, ele_A, ele_C, ele_D); -+ } -+ -+ /* -+ DBG_8192C("TxPwrTracking 0xc80 = 0x%x, 0xc94 = 0x%x RF 0x24 = 0x%x\n", \ -+ PHY_QueryBBReg(Adapter, 0xc80, bMaskDWord),\ -+ PHY_QueryBBReg(Adapter, 0xc94, bMaskDWord), \ -+ PHY_QueryRFReg(Adapter, RF_PATH_A, 0x24, bMaskDWord)); -+ */ -+ } -+ -+#if MP_DRIVER == 1 -+ if(delta_IQK > 1) -+#else -+ if(delta_IQK > 3) -+#endif -+ { -+ pdmpriv->ThermalValue_IQK = ThermalValue; -+ rtl8192c_PHY_IQCalibrate(Adapter,_FALSE); -+ } -+ -+ //update thermal meter value -+ if(pdmpriv->TxPowerTrackControl) -+ pdmpriv->ThermalValue = ThermalValue; -+ -+ } -+ -+ //DBG_8192C("<===dm_TXPowerTrackingCallback_ThermalMeter_92C\n"); -+ -+ pdmpriv->TXPowercount = 0; -+ -+} -+ -+ -+static VOID -+dm_InitializeTXPowerTracking_ThermalMeter( -+ IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ //pMgntInfo->bTXPowerTracking = _TRUE; -+ pdmpriv->TXPowercount = 0; -+ pdmpriv->bTXPowerTrackingInit = _FALSE; -+ pdmpriv->ThermalValue = 0; -+ -+#if (MP_DRIVER != 1) //for mp driver, turn off txpwrtracking as default -+ pdmpriv->TxPowerTrackControl = _TRUE; -+#endif -+ -+ MSG_8192C("pdmpriv->TxPowerTrackControl = %d\n", pdmpriv->TxPowerTrackControl); -+} -+ -+ -+static VOID -+DM_InitializeTXPowerTracking( -+ IN PADAPTER Adapter) -+{ -+ dm_InitializeTXPowerTracking_ThermalMeter(Adapter); -+} -+ -+// -+// Description: -+// - Dispatch TxPower Tracking direct call ONLY for 92s. -+// - We shall NOT schedule Workitem within PASSIVE LEVEL, which will cause system resource -+// leakage under some platform. -+// -+// Assumption: -+// PASSIVE_LEVEL when this routine is called. -+// -+// Added by Roger, 2009.06.18. -+// -+static VOID -+DM_TXPowerTracking92CDirectCall( -+ IN PADAPTER Adapter) -+{ -+ dm_TXPowerTrackingCallback_ThermalMeter_92C(Adapter); -+} -+ -+static VOID -+dm_CheckTXPowerTracking_ThermalMeter( -+ IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ //u1Byte TxPowerCheckCnt = 5; //10 sec -+ -+ //if(!pMgntInfo->bTXPowerTracking /*|| (!pdmpriv->TxPowerTrackControl && pdmpriv->bAPKdone)*/) -+ if(!(pdmpriv->DMFlag & DYNAMIC_FUNC_SS)) -+ { -+ return; -+ } -+ -+ if(!pdmpriv->TM_Trigger) //at least delay 1 sec -+ { -+ //pHalData->TxPowerCheckCnt++; //cosa add for debug -+ PHY_SetRFReg(Adapter, RF_PATH_A, RF_T_METER, bRFRegOffsetMask, 0x60); -+ //DBG_8192C("Trigger 92C Thermal Meter!!\n"); -+ -+ pdmpriv->TM_Trigger = 1; -+ return; -+ -+ } -+ else -+ { -+ //DBG_8192C("Schedule TxPowerTracking direct call!!\n"); -+ DM_TXPowerTracking92CDirectCall(Adapter); //Using direct call is instead, added by Roger, 2009.06.18. -+ pdmpriv->TM_Trigger = 0; -+ } -+ -+} -+ -+ -+VOID -+rtl8192c_dm_CheckTXPowerTracking( -+ IN PADAPTER Adapter) -+{ -+ dm_CheckTXPowerTracking_ThermalMeter(Adapter); -+} -+ -+#ifdef CONFIG_BT_COEXIST -+static BOOLEAN BT_BTStateChange(PADAPTER Adapter) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ struct registry_priv *registry_par = &Adapter->registrypriv; -+ -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ -+ u32 Polling, Ratio_Tx, Ratio_PRI; -+ u32 BT_Tx, BT_PRI; -+ u8 BT_State; -+ static u8 ServiceTypeCnt = 0; -+ u8 CurServiceType; -+ static u8 LastServiceType = BT_Idle; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) -+ return _FALSE; -+ -+ BT_State = rtw_read8(Adapter, 0x4fd); -+/* -+ temp = PlatformEFIORead4Byte(Adapter, 0x488); -+ BT_Tx = (u2Byte)(((temp<<8)&0xff00)+((temp>>8)&0xff)); -+ BT_PRI = (u2Byte)(((temp>>8)&0xff00)+((temp>>24)&0xff)); -+ -+ temp = PlatformEFIORead4Byte(Adapter, 0x48c); -+ Polling = ((temp<<8)&0xff000000) + ((temp>>8)&0x00ff0000) + -+ ((temp<<8)&0x0000ff00) + ((temp>>8)&0x000000ff); -+ -+*/ -+ BT_Tx = rtw_read32(Adapter, 0x488); -+ -+ DBG_8192C("Ratio 0x488 =%x\n", BT_Tx); -+ BT_Tx =BT_Tx & 0x00ffffff; -+ //RTPRINT(FBT, BT_TRACE, ("Ratio BT_Tx =%x\n", BT_Tx)); -+ -+ BT_PRI = rtw_read32(Adapter, 0x48c); -+ -+ DBG_8192C("Ratio 0x48c =%x\n", BT_PRI); -+ BT_PRI =BT_PRI & 0x00ffffff; -+ //RTPRINT(FBT, BT_TRACE, ("Ratio BT_PRI =%x\n", BT_PRI)); -+ -+ -+ Polling = rtw_read32(Adapter, 0x490); -+ //RTPRINT(FBT, BT_TRACE, ("Ratio 0x490 =%x\n", Polling)); -+ -+ -+ if(BT_Tx==0xffffffff && BT_PRI==0xffffffff && Polling==0xffffffff && BT_State==0xff) -+ return _FALSE; -+ -+ BT_State &= BIT0; -+ -+ if(BT_State != pbtpriv->BT_CUR_State) -+ { -+ pbtpriv->BT_CUR_State = BT_State; -+ -+ if(registry_par->bt_sco == 3) -+ { -+ ServiceTypeCnt = 0; -+ -+ pbtpriv->BT_Service = BT_Idle; -+ -+ DBG_8192C("BT_%s\n", BT_State?"ON":"OFF"); -+ -+ BT_State = BT_State | -+ ((pbtpriv->BT_Ant_isolation==1)?0:BIT1) |BIT2; -+ -+ rtw_write8(Adapter, 0x4fd, BT_State); -+ DBG_8192C("BT set 0x4fd to %x\n", BT_State); -+ } -+ -+ return _TRUE; -+ } -+ DBG_8192C("bRegBT_Sco = %d\n",registry_par->bt_sco); -+ -+ Ratio_Tx = BT_Tx*1000/Polling; -+ Ratio_PRI = BT_PRI*1000/Polling; -+ -+ pbtpriv->Ratio_Tx=Ratio_Tx; -+ pbtpriv->Ratio_PRI=Ratio_PRI; -+ -+ DBG_8192C("Ratio_Tx=%d\n", Ratio_Tx); -+ DBG_8192C("Ratio_PRI=%d\n", Ratio_PRI); -+ -+ -+ if(BT_State && registry_par->bt_sco==3) -+ { -+ DBG_8192C("bt_sco ==3 Follow Counter\n"); -+// if(BT_Tx==0xffff && BT_PRI==0xffff && Polling==0xffffffff) -+// { -+// ServiceTypeCnt = 0; -+// return FALSE; -+// } -+// else -+ { -+ /* -+ Ratio_Tx = BT_Tx*1000/Polling; -+ Ratio_PRI = BT_PRI*1000/Polling; -+ -+ pHalData->bt_coexist.Ratio_Tx=Ratio_Tx; -+ pHalData->bt_coexist.Ratio_PRI=Ratio_PRI; -+ -+ RTPRINT(FBT, BT_TRACE, ("Ratio_Tx=%d\n", Ratio_Tx)); -+ RTPRINT(FBT, BT_TRACE, ("Ratio_PRI=%d\n", Ratio_PRI)); -+ -+ */ -+ if((Ratio_Tx < 30) && (Ratio_PRI < 30)) -+ CurServiceType = BT_Idle; -+ else if((Ratio_PRI > 110) && (Ratio_PRI < 250)) -+ CurServiceType = BT_SCO; -+ else if((Ratio_Tx >= 200)&&(Ratio_PRI >= 200)) -+ CurServiceType = BT_Busy; -+ else if((Ratio_Tx >=350) && (Ratio_Tx < 500)) -+ CurServiceType = BT_OtherBusy; -+ else if(Ratio_Tx >=500) -+ CurServiceType = BT_PAN; -+ else -+ CurServiceType=BT_OtherAction; -+ } -+ -+/* if(pHalData->bt_coexist.bStopCount) -+ { -+ ServiceTypeCnt=0; -+ pHalData->bt_coexist.bStopCount=FALSE; -+ } -+*/ -+// if(CurServiceType == BT_OtherBusy) -+ { -+ ServiceTypeCnt=2; -+ LastServiceType=CurServiceType; -+ } -+#if 0 -+ else if(CurServiceType == LastServiceType) -+ { -+ if(ServiceTypeCnt<3) -+ ServiceTypeCnt++; -+ } -+ else -+ { -+ ServiceTypeCnt = 0; -+ LastServiceType = CurServiceType; -+ } -+#endif -+ -+ if(ServiceTypeCnt==2) -+ { -+ pbtpriv->BT_Service = LastServiceType; -+ BT_State = BT_State | -+ ((pbtpriv->BT_Ant_isolation==1)?0:BIT1) | -+ //((pbtpriv->BT_Service==BT_SCO)?0:BIT2); -+ ((pbtpriv->BT_Service!=BT_Idle)?0:BIT2); -+ -+ //if(pbtpriv->BT_Service==BT_Busy) -+ // BT_State&= ~(BIT2); -+ -+ if(pbtpriv->BT_Service==BT_SCO) -+ { -+ DBG_8192C("BT TYPE Set to ==> BT_SCO\n"); -+ } -+ else if(pbtpriv->BT_Service==BT_Idle) -+ { -+ DBG_8192C("BT TYPE Set to ==> BT_Idle\n"); -+ } -+ else if(pbtpriv->BT_Service==BT_OtherAction) -+ { -+ DBG_8192C("BT TYPE Set to ==> BT_OtherAction\n"); -+ } -+ else if(pbtpriv->BT_Service==BT_Busy) -+ { -+ DBG_8192C("BT TYPE Set to ==> BT_Busy\n"); -+ } -+ else if(pbtpriv->BT_Service==BT_PAN) -+ { -+ DBG_8192C("BT TYPE Set to ==> BT_PAN\n"); -+ } -+ else -+ { -+ DBG_8192C("BT TYPE Set to ==> BT_OtherBusy\n"); -+ } -+ -+ //Add interrupt migration when bt is not in idel state (no traffic). -+ //suggestion by Victor. -+ if(pbtpriv->BT_Service!=BT_Idle)//EDCA_VI_PARAM modify -+ { -+ -+ rtw_write16(Adapter, 0x504, 0x0ccc); -+ rtw_write8(Adapter, 0x506, 0x54); -+ rtw_write8(Adapter, 0x507, 0x54); -+ -+ } -+ else -+ { -+ rtw_write8(Adapter, 0x506, 0x00); -+ rtw_write8(Adapter, 0x507, 0x00); -+ } -+ -+ rtw_write8(Adapter, 0x4fd, BT_State); -+ DBG_8192C("BT_SCO set 0x4fd to %x\n", BT_State); -+ return _TRUE; -+ } -+ } -+ -+ return _FALSE; -+ -+} -+ -+static BOOLEAN -+BT_WifiConnectChange( -+ IN PADAPTER Adapter -+ ) -+{ -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+// PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ static BOOLEAN bMediaConnect = _FALSE; -+ -+ //if(!pMgntInfo->bMediaConnect || MgntRoamingInProgress(pMgntInfo)) -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) -+ { -+ bMediaConnect = _FALSE; -+ } -+ else -+ { -+ if(!bMediaConnect) -+ { -+ bMediaConnect = _TRUE; -+ return _TRUE; -+ } -+ bMediaConnect = _TRUE; -+ } -+ -+ return _FALSE; -+} -+ -+#define BT_RSSI_STATE_NORMAL_POWER BIT0 -+#define BT_RSSI_STATE_AMDPU_OFF BIT1 -+#define BT_RSSI_STATE_SPECIAL_LOW BIT2 -+#define BT_RSSI_STATE_BG_EDCA_LOW BIT3 -+ -+static s32 GET_UNDECORATED_AVERAGE_RSSI(PADAPTER Adapter) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ s32 average_rssi; -+ -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) -+ { -+ average_rssi = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ } -+ else -+ { -+ average_rssi = pdmpriv->UndecoratedSmoothedPWDB; -+ } -+ return average_rssi; -+} -+ -+static u8 BT_RssiStateChange( -+ IN PADAPTER Adapter -+ ) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ //PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ s32 UndecoratedSmoothedPWDB; -+ u8 CurrBtRssiState = 0x00; -+ -+ -+ -+ -+ //if(pMgntInfo->bMediaConnect) // Default port -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ UndecoratedSmoothedPWDB = GET_UNDECORATED_AVERAGE_RSSI(Adapter); -+ } -+ else // associated entry pwdb -+ { -+ if(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0) -+ UndecoratedSmoothedPWDB = 100; // No any RSSI information. Assume to be MAX. -+ else -+ UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ } -+ -+ // Check RSSI to determine HighPower/NormalPower state for BT coexistence. -+ if(UndecoratedSmoothedPWDB >= 67) -+ CurrBtRssiState &= (~BT_RSSI_STATE_NORMAL_POWER); -+ else if(UndecoratedSmoothedPWDB < 62) -+ CurrBtRssiState |= BT_RSSI_STATE_NORMAL_POWER; -+ -+ // Check RSSI to determine AMPDU setting for BT coexistence. -+ if(UndecoratedSmoothedPWDB >= 40) -+ CurrBtRssiState &= (~BT_RSSI_STATE_AMDPU_OFF); -+ else if(UndecoratedSmoothedPWDB <= 32) -+ CurrBtRssiState |= BT_RSSI_STATE_AMDPU_OFF; -+ -+ // Marked RSSI state. It will be used to determine BT coexistence setting later. -+ if(UndecoratedSmoothedPWDB < 35) -+ CurrBtRssiState |= BT_RSSI_STATE_SPECIAL_LOW; -+ else -+ CurrBtRssiState &= (~BT_RSSI_STATE_SPECIAL_LOW); -+ -+ // Check BT state related to BT_Idle in B/G mode. -+ if(UndecoratedSmoothedPWDB < 15) -+ CurrBtRssiState |= BT_RSSI_STATE_BG_EDCA_LOW; -+ else -+ CurrBtRssiState &= (~BT_RSSI_STATE_BG_EDCA_LOW); -+ -+ if(CurrBtRssiState != pbtpriv->BtRssiState) -+ { -+ pbtpriv->BtRssiState = CurrBtRssiState; -+ return _TRUE; -+ } -+ else -+ { -+ return _FALSE; -+ } -+} -+ -+static void dm_BTCoexist(PADAPTER Adapter ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ struct mlme_ext_info *pmlmeinfo = &Adapter->mlmeextpriv.mlmext_info; -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ //PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ //PRT_HIGH_THROUGHPUT pHTInfo = GET_HT_INFO(pMgntInfo); -+ -+ //PRX_TS_RECORD pRxTs = NULL; -+ u8 BT_gpio_mux; -+ -+ BOOLEAN bWifiConnectChange, bBtStateChange,bRssiStateChange; -+ -+ if(pbtpriv->bCOBT == _FALSE) return; -+ -+ if(!( pdmpriv->DMFlag & DYNAMIC_FUNC_BT)) return; -+ -+ if( (pbtpriv->BT_Coexist) &&(pbtpriv->BT_CoexistType == BT_CSR_BC4) && (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _FALSE) ) -+ { -+ bWifiConnectChange = BT_WifiConnectChange(Adapter); -+ bBtStateChange = BT_BTStateChange(Adapter); -+ bRssiStateChange = BT_RssiStateChange(Adapter); -+ -+ DBG_8192C("bWifiConnectChange %d, bBtStateChange %d,bRssiStateChange %d\n", -+ bWifiConnectChange,bBtStateChange,bRssiStateChange); -+ -+ // add by hpfan for debug message -+ BT_gpio_mux = rtw_read8(Adapter, REG_GPIO_MUXCFG); -+ DBG_8192C("BTCoexit Reg_0x40 (%2x)\n", BT_gpio_mux); -+ -+ if( bWifiConnectChange ||bBtStateChange ||bRssiStateChange ) -+ { -+ if(pbtpriv->BT_CUR_State) -+ { -+ -+ // Do not allow receiving A-MPDU aggregation. -+ if(pbtpriv->BT_Ampdu)// 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. -+ { -+ -+ if(pmlmeinfo->assoc_AP_vendor == ciscoAP) -+ { -+ if(pbtpriv->BT_Service!=BT_Idle) -+ { -+ if(pmlmeinfo->bAcceptAddbaReq) -+ { -+ DBG_8192C("BT_Disallow AMPDU \n"); -+ pmlmeinfo->bAcceptAddbaReq = _FALSE; -+ send_delba(Adapter,0, get_my_bssid(&(pmlmeinfo->network))); -+ } -+ } -+ else -+ { -+ if(!pmlmeinfo->bAcceptAddbaReq) -+ { -+ DBG_8192C("BT_Allow AMPDU RSSI >=40\n"); -+ pmlmeinfo->bAcceptAddbaReq = _TRUE; -+ } -+ } -+ } -+ else -+ { -+ if(!pmlmeinfo->bAcceptAddbaReq) -+ { -+ DBG_8192C("BT_Allow AMPDU BT Idle\n"); -+ pmlmeinfo->bAcceptAddbaReq = _TRUE; -+ } -+ } -+ } -+ -+#if 0 -+ else if((pHalData->bt_coexist.BT_Service==BT_SCO) || (pHalData->bt_coexist.BT_Service==BT_Busy)) -+ { -+ if(pHalData->bt_coexist.BtRssiState & BT_RSSI_STATE_AMDPU_OFF) -+ { -+ if(pMgntInfo->bBT_Ampdu && pHTInfo->bAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Disallow AMPDU RSSI <=32\n")); -+ pHTInfo->bAcceptAddbaReq = FALSE; -+ if(GetTs(Adapter, (PTS_COMMON_INFO*)(&pRxTs), pMgntInfo->Bssid, 0, RX_DIR, FALSE)) -+ TsInitDelBA(Adapter, (PTS_COMMON_INFO)pRxTs, RX_DIR); -+ } -+ } -+ else -+ { -+ if(pMgntInfo->bBT_Ampdu && !pHTInfo->bAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU RSSI >=40\n")); -+ pHTInfo->bAcceptAddbaReq = TRUE; -+ } -+ } -+ } -+ else -+ { -+ if(pMgntInfo->bBT_Ampdu && !pHTInfo->bAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU BT not in SCO or BUSY\n")); -+ pHTInfo->bAcceptAddbaReq = TRUE; -+ } -+ } -+#endif -+ -+ if(pbtpriv->BT_Ant_isolation) -+ { -+ DBG_8192C("BT_IsolationLow\n"); -+ -+// 20100427 Joseph: Do not adjust Rate adaptive for BT coexist suggested by SD3. -+#if 0 -+ RTPRINT(FBT, BT_TRACE, ("BT_Update Rate table\n")); -+ if(pMgntInfo->bUseRAMask) -+ { -+ // 20100407 Joseph: Fix rate adaptive modification for BT coexist. -+ // This fix is not complete yet. It shall also consider VWifi and Adhoc case, -+ // which connect with multiple STAs. -+ Adapter->HalFunc.UpdateHalRAMaskHandler( -+ Adapter, -+ FALSE, -+ 0, -+ NULL, -+ NULL, -+ pMgntInfo->RateAdaptive.RATRState, -+ RAMask_Normal); -+ } -+ else -+ { -+ Adapter->HalFunc.UpdateHalRATRTableHandler( -+ Adapter, -+ &pMgntInfo->dot11OperationalRateSet, -+ pMgntInfo->dot11HTOperationalRateSet,NULL); -+ } -+#endif -+ -+ // 20100415 Joseph: Modify BT coexist mechanism suggested by Yaying. -+ // Now we only enable HW BT coexist when BT in "Busy" state. -+ if(1)//pMgntInfo->LinkDetectInfo.NumRecvDataInPeriod >= 20) -+ { -+ if((pmlmeinfo->assoc_AP_vendor == ciscoAP) && -+ pbtpriv->BT_Service==BT_OtherAction) -+ { -+ DBG_8192C("BT_Turn ON Coexist\n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0xa0); -+ } -+ else -+ { -+ if((pbtpriv->BT_Service==BT_Busy) && -+ (pbtpriv->BtRssiState & BT_RSSI_STATE_NORMAL_POWER)) -+ { -+ DBG_8192C("BT_Turn ON Coexist\n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0xa0); -+ } -+ else if((pbtpriv->BT_Service==BT_OtherAction) && -+ (pbtpriv->BtRssiState & BT_RSSI_STATE_SPECIAL_LOW)) -+ { -+ DBG_8192C("BT_Turn ON Coexist\n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0xa0); -+ } -+ else if(pbtpriv->BT_Service==BT_PAN) -+ { -+ DBG_8192C("BT_Turn ON Coexist\n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0x00); -+ } -+ else -+ { -+ DBG_8192C("BT_Turn OFF Coexist\n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0x00); -+ } -+ } -+ } -+ else -+ { -+ DBG_8192C("BT: There is no Wifi traffic!! Turn off Coexist\n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0x00); -+ } -+ -+ if(1)//pMgntInfo->LinkDetectInfo.NumRecvDataInPeriod >= 20) -+ { -+ if(pbtpriv->BT_Service==BT_PAN) -+ { -+ DBG_8192C("BT_Turn ON Coexist(Reg0x44 = 0x10100)\n"); -+ rtw_write32(Adapter, REG_GPIO_PIN_CTRL, 0x10100); -+ } -+ else -+ { -+ DBG_8192C("BT_Turn OFF Coexist(Reg0x44 = 0x0)\n"); -+ rtw_write32(Adapter, REG_GPIO_PIN_CTRL, 0x0); -+ } -+ } -+ else -+ { -+ DBG_8192C("BT: There is no Wifi traffic!! Turn off Coexist(Reg0x44 = 0x0)\n"); -+ rtw_write32(Adapter, REG_GPIO_PIN_CTRL, 0x0); -+ } -+ -+ // 20100430 Joseph: Integrate the BT coexistence EDCA tuning here. -+ if(pbtpriv->BtRssiState & BT_RSSI_STATE_NORMAL_POWER) -+ { -+ if(pbtpriv->BT_Service==BT_OtherBusy) -+ { -+ //pbtpriv->BtEdcaUL = 0x5ea72b; -+ //pbtpriv->BtEdcaDL = 0x5ea72b; -+ pbtpriv->BT_EDCA[UP_LINK] = 0x5ea72b; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0x5ea72b; -+ -+ DBG_8192C("BT in BT_OtherBusy state Tx (%d) >350 parameter(0x%x) = 0x%x\n", pbtpriv->Ratio_Tx ,REG_EDCA_BE_PARAM, 0x5ea72b); -+ } -+ else if(pbtpriv->BT_Service==BT_Busy) -+ { -+ //pbtpriv->BtEdcaUL = 0x5eb82f; -+ //pbtpriv->BtEdcaDL = 0x5eb82f; -+ -+ pbtpriv->BT_EDCA[UP_LINK] = 0x5eb82f; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0x5eb82f; -+ -+ DBG_8192C("BT in BT_Busy state parameter(0x%x) = 0x%x\n", REG_EDCA_BE_PARAM, 0x5eb82f); -+ } -+ else if(pbtpriv->BT_Service==BT_SCO) -+ { -+ if(pbtpriv->Ratio_Tx>160) -+ { -+ //pbtpriv->BtEdcaUL = 0x5ea72f; -+ //pbtpriv->BtEdcaDL = 0x5ea72f; -+ pbtpriv->BT_EDCA[UP_LINK] = 0x5ea72f; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0x5ea72f; -+ DBG_8192C("BT in BT_SCO state Tx (%d) >160 parameter(0x%x) = 0x%x\n",pbtpriv->Ratio_Tx, REG_EDCA_BE_PARAM, 0x5ea72f); -+ } -+ else -+ { -+ //pbtpriv->BtEdcaUL = 0x5ea32b; -+ //pbtpriv->BtEdcaDL = 0x5ea42b; -+ -+ pbtpriv->BT_EDCA[UP_LINK] = 0x5ea32b; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0x5ea42b; -+ -+ DBG_8192C("BT in BT_SCO state Tx (%d) <160 parameter(0x%x) = 0x%x\n", pbtpriv->Ratio_Tx,REG_EDCA_BE_PARAM, 0x5ea32f); -+ } -+ } -+ else -+ { -+ // BT coexistence mechanism does not control EDCA parameter. -+ //pbtpriv->BtEdcaUL = 0; -+ //pbtpriv->BtEdcaDL = 0; -+ -+ pbtpriv->BT_EDCA[UP_LINK] = 0; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0; -+ DBG_8192C("BT in State %d and parameter(0x%x) use original setting.\n",pbtpriv->BT_Service, REG_EDCA_BE_PARAM); -+ } -+ -+ if((pbtpriv->BT_Service!=BT_Idle) && -+ (pmlmeext->cur_wireless_mode == WIRELESS_MODE_G) && -+ (pbtpriv->BtRssiState & BT_RSSI_STATE_BG_EDCA_LOW)) -+ { -+ //pbtpriv->BtEdcaUL = 0x5eb82b; -+ //pbtpriv->BtEdcaDL = 0x5eb82b; -+ -+ pbtpriv->BT_EDCA[UP_LINK] = 0x5eb82b; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0x5eb82b; -+ -+ DBG_8192C("BT set parameter(0x%x) = 0x%x\n", REG_EDCA_BE_PARAM, 0x5eb82b); -+ } -+ } -+ else -+ { -+ // BT coexistence mechanism does not control EDCA parameter. -+ //pbtpriv->BtEdcaUL = 0; -+ //pbtpriv->BtEdcaDL = 0; -+ -+ pbtpriv->BT_EDCA[UP_LINK] = 0; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0; -+ } -+ -+ // 20100415 Joseph: Set RF register 0x1E and 0x1F for BT coexist suggested by Yaying. -+ if(pbtpriv->BT_Service!=BT_Idle) -+ { -+ DBG_8192C("BT Set RfReg0x1E[7:4] = 0x%x \n", 0xf); -+ PHY_SetRFReg(Adapter, PathA, 0x1e, 0xf0, 0xf); -+ //RTPRINT(FBT, BT_TRACE, ("BT Set RfReg0x1E[7:4] = 0x%x \n", 0xf)); -+ //PHY_SetRFReg(Adapter, PathA, 0x1f, 0xf0, 0xf); -+ } -+ else -+ { -+ DBG_8192C("BT Set RfReg0x1E[7:4] = 0x%x \n",pbtpriv->BtRfRegOrigin1E); -+ PHY_SetRFReg(Adapter, PathA, 0x1e, 0xf0, pbtpriv->BtRfRegOrigin1E); -+ //RTPRINT(FBT, BT_TRACE, ("BT Set RfReg0x1F[7:4] = 0x%x \n", pHalData->bt_coexist.BtRfRegOrigin1F)); -+ //PHY_SetRFReg(Adapter, PathA, 0x1f, 0xf0, pHalData->bt_coexist.BtRfRegOrigin1F); -+ } -+ } -+ else -+ { -+ DBG_8192C("BT_IsolationHigh\n"); -+ // Do nothing. -+ } -+ } -+ else -+ { -+ -+ if(pbtpriv->BT_Ampdu && !pmlmeinfo->bAcceptAddbaReq) -+ { -+ DBG_8192C("BT_Allow AMPDU bt is off\n"); -+ pmlmeinfo->bAcceptAddbaReq = _TRUE; -+ } -+ -+ DBG_8192C("BT_Turn OFF Coexist bt is off \n"); -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, 0x00); -+ -+ DBG_8192C("BT Set RfReg0x1E[7:4] = 0x%x \n", pbtpriv->BtRfRegOrigin1E); -+ PHY_SetRFReg(Adapter, PathA, 0x1e, 0xf0, pbtpriv->BtRfRegOrigin1E); -+ //RTPRINT(FBT, BT_TRACE, ("BT Set RfReg0x1F[7:4] = 0x%x \n", pHalData->bt_coexist.BtRfRegOrigin1F)); -+ //PHY_SetRFReg(Adapter, PathA, 0x1f, 0xf0, pHalData->bt_coexist.BtRfRegOrigin1F); -+ -+ // BT coexistence mechanism does not control EDCA parameter since BT is disabled. -+ //pbtpriv->BtEdcaUL = 0; -+ //pbtpriv->BtEdcaDL = 0; -+ pbtpriv->BT_EDCA[UP_LINK] = 0; -+ pbtpriv->BT_EDCA[DOWN_LINK] = 0; -+ -+ -+// 20100427 Joseph: Do not adjust Rate adaptive for BT coexist suggested by SD3. -+#if 0 -+ RTPRINT(FBT, BT_TRACE, ("BT_Update Rate table\n")); -+ if(pMgntInfo->bUseRAMask) -+ { -+ // 20100407 Joseph: Fix rate adaptive modification for BT coexist. -+ // This fix is not complete yet. It shall also consider VWifi and Adhoc case, -+ // which connect with multiple STAs. -+ Adapter->HalFunc.UpdateHalRAMaskHandler( -+ Adapter, -+ FALSE, -+ 0, -+ NULL, -+ NULL, -+ pMgntInfo->RateAdaptive.RATRState, -+ RAMask_Normal); -+ } -+ else -+ { -+ Adapter->HalFunc.UpdateHalRATRTableHandler( -+ Adapter, -+ &pMgntInfo->dot11OperationalRateSet, -+ pMgntInfo->dot11HTOperationalRateSet,NULL); -+ } -+#endif -+ } -+ } -+ } -+} -+ -+static void dm_InitBtCoexistDM( PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ -+ if( !pbtpriv->BT_Coexist ) return; -+ -+ pbtpriv->BtRfRegOrigin1E = (u8)PHY_QueryRFReg(Adapter, PathA, 0x1e, 0xf0); -+ pbtpriv->BtRfRegOrigin1F = (u8)PHY_QueryRFReg(Adapter, PathA, 0x1f, 0xf0); -+} -+ -+void rtl8192c_set_dm_bt_coexist(_adapter *padapter, u8 bStart) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ -+ pbtpriv->bCOBT = bStart; -+ send_delba(padapter,0, get_my_bssid(&(pmlmeinfo->network))); -+ send_delba(padapter,1, get_my_bssid(&(pmlmeinfo->network))); -+ -+} -+ -+void rtl8192c_issue_delete_ba(_adapter *padapter, u8 dir) -+{ -+ struct mlme_ext_info *pmlmeinfo = &padapter->mlmeextpriv.mlmext_info; -+ DBG_8192C("issue_delete_ba : %s...\n",(dir==0)?"RX_DIR":"TX_DIR"); -+ send_delba(padapter,dir, get_my_bssid(&(pmlmeinfo->network))); -+} -+ -+#endif -+ -+#if 0//def CONFIG_PCI_HCI -+ -+BOOLEAN -+BT_BTStateChange( -+ IN PADAPTER Adapter -+ ) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ -+ u4Byte temp, Polling, Ratio_Tx, Ratio_PRI; -+ u4Byte BT_Tx, BT_PRI; -+ u1Byte BT_State; -+ static u1Byte ServiceTypeCnt = 0; -+ u1Byte CurServiceType; -+ static u1Byte LastServiceType = BT_Idle; -+ -+ if(!pMgntInfo->bMediaConnect) -+ return FALSE; -+ -+ BT_State = PlatformEFIORead1Byte(Adapter, 0x4fd); -+/* -+ temp = PlatformEFIORead4Byte(Adapter, 0x488); -+ BT_Tx = (u2Byte)(((temp<<8)&0xff00)+((temp>>8)&0xff)); -+ BT_PRI = (u2Byte)(((temp>>8)&0xff00)+((temp>>24)&0xff)); -+ -+ temp = PlatformEFIORead4Byte(Adapter, 0x48c); -+ Polling = ((temp<<8)&0xff000000) + ((temp>>8)&0x00ff0000) + -+ ((temp<<8)&0x0000ff00) + ((temp>>8)&0x000000ff); -+ -+*/ -+ BT_Tx = PlatformEFIORead4Byte(Adapter, 0x488); -+ -+ RTPRINT(FBT, BT_TRACE, ("Ratio 0x488 =%x\n", BT_Tx)); -+ BT_Tx =BT_Tx & 0x00ffffff; -+ //RTPRINT(FBT, BT_TRACE, ("Ratio BT_Tx =%x\n", BT_Tx)); -+ -+ BT_PRI = PlatformEFIORead4Byte(Adapter, 0x48c); -+ -+ RTPRINT(FBT, BT_TRACE, ("Ratio Ratio 0x48c =%x\n", BT_PRI)); -+ BT_PRI =BT_PRI & 0x00ffffff; -+ //RTPRINT(FBT, BT_TRACE, ("Ratio BT_PRI =%x\n", BT_PRI)); -+ -+ -+ Polling = PlatformEFIORead4Byte(Adapter, 0x490); -+ //RTPRINT(FBT, BT_TRACE, ("Ratio 0x490 =%x\n", Polling)); -+ -+ -+ if(BT_Tx==0xffffffff && BT_PRI==0xffffffff && Polling==0xffffffffff && BT_State==0xff) -+ return FALSE; -+ -+ BT_State &= BIT0; -+ -+ if(BT_State != pHalData->bt_coexist.BT_CUR_State) -+ { -+ pHalData->bt_coexist.BT_CUR_State = BT_State; -+ -+ if(pMgntInfo->bRegBT_Sco == 3) -+ { -+ ServiceTypeCnt = 0; -+ -+ pHalData->bt_coexist.BT_Service = BT_Idle; -+ -+ RTPRINT(FBT, BT_TRACE, ("BT_%s\n", BT_State?"ON":"OFF")); -+ -+ BT_State = BT_State | -+ ((pHalData->bt_coexist.BT_Ant_isolation==1)?0:BIT1) |BIT2; -+ -+ PlatformEFIOWrite1Byte(Adapter, 0x4fd, BT_State); -+ RTPRINT(FBT, BT_TRACE, ("BT set 0x4fd to %x\n", BT_State)); -+ } -+ -+ return TRUE; -+ } -+ RTPRINT(FBT, BT_TRACE, ("bRegBT_Sco %d\n", pMgntInfo->bRegBT_Sco)); -+ -+ Ratio_Tx = BT_Tx*1000/Polling; -+ Ratio_PRI = BT_PRI*1000/Polling; -+ -+ pHalData->bt_coexist.Ratio_Tx=Ratio_Tx; -+ pHalData->bt_coexist.Ratio_PRI=Ratio_PRI; -+ -+ RTPRINT(FBT, BT_TRACE, ("Ratio_Tx=%d\n", Ratio_Tx)); -+ RTPRINT(FBT, BT_TRACE, ("Ratio_PRI=%d\n", Ratio_PRI)); -+ -+ -+ if(BT_State && pMgntInfo->bRegBT_Sco==3) -+ { -+ RTPRINT(FBT, BT_TRACE, ("bRegBT_Sco ==3 Follow Counter\n")); -+// if(BT_Tx==0xffff && BT_PRI==0xffff && Polling==0xffffffff) -+// { -+// ServiceTypeCnt = 0; -+// return FALSE; -+// } -+// else -+ { -+ /* -+ Ratio_Tx = BT_Tx*1000/Polling; -+ Ratio_PRI = BT_PRI*1000/Polling; -+ -+ pHalData->bt_coexist.Ratio_Tx=Ratio_Tx; -+ pHalData->bt_coexist.Ratio_PRI=Ratio_PRI; -+ -+ RTPRINT(FBT, BT_TRACE, ("Ratio_Tx=%d\n", Ratio_Tx)); -+ RTPRINT(FBT, BT_TRACE, ("Ratio_PRI=%d\n", Ratio_PRI)); -+ -+ */ -+ if((Ratio_Tx <= 50) && (Ratio_PRI <= 50)) -+ CurServiceType = BT_Idle; -+ else if((Ratio_PRI > 150) && (Ratio_PRI < 200)) -+ CurServiceType = BT_SCO; -+ else if((Ratio_Tx >= 200)&&(Ratio_PRI >= 200)) -+ CurServiceType = BT_Busy; -+ else if(Ratio_Tx >= 350) -+ CurServiceType = BT_OtherBusy; -+ else -+ CurServiceType=BT_OtherAction; -+ -+ } -+/* if(pHalData->bt_coexist.bStopCount) -+ { -+ ServiceTypeCnt=0; -+ pHalData->bt_coexist.bStopCount=FALSE; -+ } -+*/ -+ if(CurServiceType == BT_OtherBusy) -+ { -+ ServiceTypeCnt=2; -+ LastServiceType=CurServiceType; -+ } -+ else if(CurServiceType == LastServiceType) -+ { -+ if(ServiceTypeCnt<3) -+ ServiceTypeCnt++; -+ } -+ else -+ { -+ ServiceTypeCnt = 0; -+ LastServiceType = CurServiceType; -+ } -+ -+ if(ServiceTypeCnt==2) -+ { -+ pHalData->bt_coexist.BT_Service = LastServiceType; -+ BT_State = BT_State | -+ ((pHalData->bt_coexist.BT_Ant_isolation==1)?0:BIT1) | -+ ((pHalData->bt_coexist.BT_Service==BT_SCO)?0:BIT2); -+ -+ if(pHalData->bt_coexist.BT_Service==BT_Busy) -+ BT_State&= ~(BIT2); -+ -+ if(pHalData->bt_coexist.BT_Service==BT_SCO) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT TYPE Set to ==> BT_SCO\n")); -+ } -+ else if(pHalData->bt_coexist.BT_Service==BT_Idle) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT TYPE Set to ==> BT_Idle\n")); -+ } -+ else if(pHalData->bt_coexist.BT_Service==BT_OtherAction) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT TYPE Set to ==> BT_OtherAction\n")); -+ } -+ else if(pHalData->bt_coexist.BT_Service==BT_Busy) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT TYPE Set to ==> BT_Busy\n")); -+ } -+ else -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT TYPE Set to ==> BT_OtherBusy\n")); -+ } -+ -+ //Add interrupt migration when bt is not in idel state (no traffic). -+ //suggestion by Victor. -+ if(pHalData->bt_coexist.BT_Service!=BT_Idle) -+ { -+ -+ PlatformEFIOWrite2Byte(Adapter, 0x504, 0x0ccc); -+ PlatformEFIOWrite1Byte(Adapter, 0x506, 0x54); -+ PlatformEFIOWrite1Byte(Adapter, 0x507, 0x54); -+ -+ } -+ else -+ { -+ PlatformEFIOWrite1Byte(Adapter, 0x506, 0x00); -+ PlatformEFIOWrite1Byte(Adapter, 0x507, 0x00); -+ } -+ -+ PlatformEFIOWrite1Byte(Adapter, 0x4fd, BT_State); -+ RTPRINT(FBT, BT_TRACE, ("BT_SCO set 0x4fd to %x\n", BT_State)); -+ return TRUE; -+ } -+ } -+ -+ return FALSE; -+ -+} -+ -+BOOLEAN -+BT_WifiConnectChange( -+ IN PADAPTER Adapter -+ ) -+{ -+ PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ static BOOLEAN bMediaConnect = FALSE; -+ -+ if(!pMgntInfo->bMediaConnect || MgntRoamingInProgress(pMgntInfo)) -+ { -+ bMediaConnect = FALSE; -+ } -+ else -+ { -+ if(!bMediaConnect) -+ { -+ bMediaConnect = TRUE; -+ return TRUE; -+ } -+ bMediaConnect = TRUE; -+ } -+ -+ return FALSE; -+} -+ -+BOOLEAN -+BT_RSSIChangeWithAMPDU( -+ IN PADAPTER Adapter -+ ) -+{ -+ PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(!Adapter->pNdisCommon->bRegBT_Ampdu || !Adapter->pNdisCommon->bRegAcceptAddbaReq) -+ return FALSE; -+ -+ RTPRINT(FBT, BT_TRACE, ("RSSI is %d\n",pHalData->UndecoratedSmoothedPWDB)); -+ -+ if((pHalData->UndecoratedSmoothedPWDB<=32) && pMgntInfo->pHTInfo->bAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Disallow AMPDU RSSI <=32 Need change\n")); -+ return TRUE; -+ -+ } -+ else if((pHalData->UndecoratedSmoothedPWDB>=40) && !pMgntInfo->pHTInfo->bAcceptAddbaReq ) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU RSSI >=40, Need change\n")); -+ return TRUE; -+ } -+ else -+ return FALSE; -+ -+} -+ -+ -+VOID -+dm_BTCoexist( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; -+ static u1Byte LastTxPowerLvl = 0xff; -+ PRX_TS_RECORD pRxTs = NULL; -+ -+ BOOLEAN bWifiConnectChange, bBtStateChange,bRSSIChangeWithAMPDU; -+ -+ if( (pHalData->bt_coexist.BluetoothCoexist) && -+ (pHalData->bt_coexist.BT_CoexistType == BT_CSR_BC4) && -+ (!ACTING_AS_AP(Adapter)) ) -+ { -+ bWifiConnectChange = BT_WifiConnectChange(Adapter); -+ bBtStateChange = BT_BTStateChange(Adapter); -+ bRSSIChangeWithAMPDU = BT_RSSIChangeWithAMPDU(Adapter); -+ RTPRINT(FBT, BT_TRACE, ("bWifiConnectChange %d, bBtStateChange %d,LastTxPowerLvl %x, DynamicTxHighPowerLvl %x\n", -+ bWifiConnectChange,bBtStateChange,LastTxPowerLvl,pHalData->DynamicTxHighPowerLvl)); -+ if( bWifiConnectChange ||bBtStateChange || -+ (LastTxPowerLvl != pHalData->DynamicTxHighPowerLvl) ||bRSSIChangeWithAMPDU) -+ { -+ LastTxPowerLvl = pHalData->DynamicTxHighPowerLvl; -+ -+ if(pHalData->bt_coexist.BT_CUR_State) -+ { -+ // Do not allow receiving A-MPDU aggregation. -+ if((pHalData->bt_coexist.BT_Service==BT_SCO) || (pHalData->bt_coexist.BT_Service==BT_Busy)) -+ { -+ if(pHalData->UndecoratedSmoothedPWDB<=32) -+ { -+ if(Adapter->pNdisCommon->bRegBT_Ampdu && Adapter->pNdisCommon->bRegAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Disallow AMPDU RSSI <=32\n")); -+ pMgntInfo->pHTInfo->bAcceptAddbaReq = FALSE; -+ if(GetTs(Adapter, (PTS_COMMON_INFO*)(&pRxTs), pMgntInfo->Bssid, 0, RX_DIR, FALSE)) -+ TsInitDelBA(Adapter, (PTS_COMMON_INFO)pRxTs, RX_DIR); -+ } -+ } -+ else if(pHalData->UndecoratedSmoothedPWDB>=40) -+ { -+ if(Adapter->pNdisCommon->bRegBT_Ampdu && Adapter->pNdisCommon->bRegAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU RSSI >=40\n")); -+ pMgntInfo->pHTInfo->bAcceptAddbaReq = TRUE; -+ } -+ } -+ } -+ else -+ { -+ if(Adapter->pNdisCommon->bRegBT_Ampdu && Adapter->pNdisCommon->bRegAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU BT not in SCO or BUSY\n")); -+ pMgntInfo->pHTInfo->bAcceptAddbaReq = TRUE; -+ } -+ } -+ -+ if(pHalData->bt_coexist.BT_Ant_isolation) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_IsolationLow\n")); -+ RTPRINT(FBT, BT_TRACE, ("BT_Update Rate table\n")); -+ Adapter->HalFunc.UpdateHalRATRTableHandler( -+ Adapter, -+ &pMgntInfo->dot11OperationalRateSet, -+ pMgntInfo->dot11HTOperationalRateSet,NULL); -+ -+ if(pHalData->bt_coexist.BT_Service==BT_SCO) -+ { -+ -+ RTPRINT(FBT, BT_TRACE, ("BT_Turn OFF Coexist with SCO \n")); -+ PlatformEFIOWrite1Byte(Adapter, REG_GPIO_MUXCFG, 0x14); -+ } -+ else if(pHalData->DynamicTxHighPowerLvl == TxHighPwrLevel_Normal) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Turn ON Coexist\n")); -+ PlatformEFIOWrite1Byte(Adapter, REG_GPIO_MUXCFG, 0xb4); -+ } -+ else -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Turn OFF Coexist\n")); -+ PlatformEFIOWrite1Byte(Adapter, REG_GPIO_MUXCFG, 0x14); -+ } -+ } -+ else -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_IsolationHigh\n")); -+ // Do nothing. -+ } -+ } -+ else -+ { -+ if(Adapter->pNdisCommon->bRegBT_Ampdu && Adapter->pNdisCommon->bRegAcceptAddbaReq) -+ { -+ RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU bt is off\n")); -+ pMgntInfo->pHTInfo->bAcceptAddbaReq = TRUE; -+ } -+ -+ RTPRINT(FBT, BT_TRACE, ("BT_Turn OFF Coexist bt is off \n")); -+ PlatformEFIOWrite1Byte(Adapter, REG_GPIO_MUXCFG, 0x14); -+ -+ RTPRINT(FBT, BT_TRACE, ("BT_Update Rate table\n")); -+ Adapter->HalFunc.UpdateHalRATRTableHandler( -+ Adapter, -+ &pMgntInfo->dot11OperationalRateSet, -+ pMgntInfo->dot11HTOperationalRateSet,NULL); -+ } -+ } -+ } -+} -+#endif -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: dm_CheckRfCtrlGPIO() -+ * -+ * Overview: Copy 8187B template for 9xseries. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 01/10/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+static VOID -+dm_CheckRfCtrlGPIO( -+ IN PADAPTER Adapter -+ ) -+{ -+#if 0 -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+#if defined (CONFIG_USB_HCI) || defined (CONFIG_SDIO_HCI) -+ #ifdef CONFIG_USB_HCI -+ // 2010/08/12 MH Add for CU selective suspend. -+ PRT_USB_DEVICE pDevice = GET_RT_USB_DEVICE(Adapter); -+ #else -+ PRT_SDIO_DEVICE pDevice = GET_RT_SDIO_DEVICE(Adapter); -+ #endif -+#endif -+ -+ if(!Adapter->MgntInfo.PowerSaveControl.bGpioRfSw) -+ return; -+ -+ RTPRINT(FPWR, PWRHW, ("dm_CheckRfCtrlGPIO \n")); -+ -+#if defined (CONFIG_USB_HCI) || defined (CONFIG_SDIO_HCI) -+ // Walk around for DTM test, we will not enable HW - radio on/off because r/w -+ // page 1 register before Lextra bus is enabled cause system fails when resuming -+ // from S4. 20080218, Emily -+ if(Adapter->bInHctTest) -+ return; -+ -+//#if ((HAL_CODE_BASE == RTL8192_S) ) -+ //Adapter->HalFunc.GPIOChangeRFHandler(Adapter, GPIORF_POLLING); -+//#else -+ // 2010/07/27 MH Only Minicard and support selective suspend, we can not turn off all MAC power to -+ // stop 8051. For dongle and minicard, we both support selective suspend mode. -+ //if(pDevice->RegUsbSS && Adapter->HalFunc.GetInterfaceSelectionHandler(Adapter) == INTF_SEL2_MINICARD) -+ -+ // -+ // 2010/08/12 MH We support severl power consumption combination as below. -+ // -+ // Power consumption combination -+ // SS Enable: (LPS disable + IPS + SW/HW radio off) -+ // 1. Dongle + PDN (support HW radio off) -+ // 2. Dongle + Normal (No HW radio off) -+ // 3. MiniCard + PDN (support HW radio off) -+ // 4. MiniCard + Normal (support HW radio off) -+ // -+ // SS Disable: (LPS + IPS + SW/HW radio off) -+ // 1. Dongle + PDN (support HW radio off) -+ // 2. Dongle + Normal (No HW radio off) -+ // 3. MiniCard + PDN (support HW radio off) -+ // 4. MiniCard + Normal (support HW radio off) -+ // -+ // For Power down module detection. We need to read power register no matter -+ // dongle or minicard, we will add the item is the detection method. -+ // -+ // -+ //vivi add du case -+ if ((IS_HARDWARE_TYPE_8192CU(Adapter)||IS_HARDWARE_TYPE_8192DU(Adapter)) -+ && pDevice->RegUsbSS) -+ { -+ RT_TRACE(COMP_RF, DBG_LOUD, ("USB SS Enabled\n")); -+ if (SUPPORT_HW_RADIO_DETECT(Adapter)) -+ { // Support HW radio detection -+ RT_TRACE(COMP_RF, DBG_LOUD, ("USB Card Type 2/3/4 support GPIO Detect\n")); -+ GpioDetectTimerStart(Adapter); -+ } -+ else -+ { // Dongle does not support HW radio detection.?? In the fufure?? -+ RT_TRACE(COMP_RF, DBG_LOUD, ("USB DONGLE Non-GPIO-Detect\n")); -+ } -+ } -+ else if (IS_HARDWARE_TYPE_8192CU(Adapter) || -+ IS_HARDWARE_TYPE_8723AU(Adapter)|| -+ IS_HARDWARE_TYPE_8192DU(Adapter) || -+ IS_HARDWARE_TYPE_8723AS(Adapter)) -+ { // Not support Selective suspend -+ RT_TRACE(COMP_RF, DBG_LOUD, ("USB SS Disable\n")); -+ if (SUPPORT_HW_RADIO_DETECT(Adapter)) -+ { -+ RT_TRACE(COMP_RF, DBG_LOUD, ("USB Card Type 2/3/4 support GPIO Detect\n")); -+ PlatformScheduleWorkItem( &(pHalData->GPIOChangeRFWorkItem) ); -+ } -+ else -+ { -+ RT_TRACE(COMP_RF, DBG_LOUD, ("USB DONGLE Non-GPIO-Detect\n")); -+ } -+ } -+ else -+ { // CE only support noemal HW radio detection now. Support timers GPIO detection in SE/CU. -+ PlatformScheduleWorkItem( &(pHalData->GPIOChangeRFWorkItem) ); -+ } -+//#endif -+#else if defined CONFIG_PCI_HCI -+ if(Adapter->bInHctTest) -+ return; -+ -+ // CE only support noemal HW radio detection now. We support timers GPIO detection in SE. -+ PlatformScheduleWorkItem( &(pHalData->GPIOChangeRFWorkItem) ); -+#endif -+#endif -+} /* dm_CheckRfCtrlGPIO */ -+ -+static VOID -+dm_InitRateAdaptiveMask( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PRATE_ADAPTIVE pRA = (PRATE_ADAPTIVE)&pdmpriv->RateAdaptive; -+ -+ pRA->RATRState = DM_RATR_STA_INIT; -+ pRA->PreRATRState = DM_RATR_STA_INIT; -+ -+ if (pdmpriv->DM_Type == DM_Type_ByDriver) -+ pdmpriv->bUseRAMask = _TRUE; -+ else -+ pdmpriv->bUseRAMask = _FALSE; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: dm_RefreshRateAdaptiveMask() -+ * -+ * Overview: Update rate table mask according to rssi -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 05/27/2009 hpfan Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+static VOID -+dm_RefreshRateAdaptiveMask( IN PADAPTER pAdapter) -+{ -+#if 0 -+ PADAPTER pTargetAdapter; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ PMGNT_INFO pMgntInfo = &(ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, TRUE)->MgntInfo); -+ PRATE_ADAPTIVE pRA = (PRATE_ADAPTIVE)&pMgntInfo->RateAdaptive; -+ u4Byte LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0; -+ -+ if(pAdapter->bDriverStopped) -+ { -+ RT_TRACE(COMP_RATR, DBG_TRACE, ("<---- dm_RefreshRateAdaptiveMask(): driver is going to unload\n")); -+ return; -+ } -+ -+ if(!pMgntInfo->bUseRAMask) -+ { -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("<---- dm_RefreshRateAdaptiveMask(): driver does not control rate adaptive mask\n")); -+ return; -+ } -+ -+ // if default port is connected, update RA table for default port (infrastructure mode only) -+ if(pAdapter->MgntInfo.mAssoc && (!ACTING_AS_AP(pAdapter))) -+ { -+ -+ // decide rastate according to rssi -+ switch (pRA->PreRATRState) -+ { -+ case DM_RATR_STA_HIGH: -+ HighRSSIThreshForRA = 50; -+ LowRSSIThreshForRA = 20; -+ break; -+ -+ case DM_RATR_STA_MIDDLE: -+ HighRSSIThreshForRA = 55; -+ LowRSSIThreshForRA = 20; -+ break; -+ -+ case DM_RATR_STA_LOW: -+ HighRSSIThreshForRA = 50; -+ LowRSSIThreshForRA = 25; -+ break; -+ -+ default: -+ HighRSSIThreshForRA = 50; -+ LowRSSIThreshForRA = 20; -+ break; -+ } -+ -+ if(pHalData->UndecoratedSmoothedPWDB > (s4Byte)HighRSSIThreshForRA) -+ pRA->RATRState = DM_RATR_STA_HIGH; -+ else if(pHalData->UndecoratedSmoothedPWDB > (s4Byte)LowRSSIThreshForRA) -+ pRA->RATRState = DM_RATR_STA_MIDDLE; -+ else -+ pRA->RATRState = DM_RATR_STA_LOW; -+ -+ if(pRA->PreRATRState != pRA->RATRState) -+ { -+ RT_PRINT_ADDR(COMP_RATR, DBG_LOUD, ("Target AP addr : "), pMgntInfo->Bssid); -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("RSSI = %d\n", pHalData->UndecoratedSmoothedPWDB)); -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("RSSI_LEVEL = %d\n", pRA->RATRState)); -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("PreState = %d, CurState = %d\n", pRA->PreRATRState, pRA->RATRState)); -+ pAdapter->HalFunc.UpdateHalRAMaskHandler( -+ pAdapter, -+ FALSE, -+ 0, -+ NULL, -+ NULL, -+ pRA->RATRState); -+ pRA->PreRATRState = pRA->RATRState; -+ } -+ } -+ -+ // -+ // The following part configure AP/VWifi/IBSS rate adaptive mask. -+ // -+ if(ACTING_AS_AP(pAdapter) || ACTING_AS_IBSS(pAdapter)) -+ { -+ pTargetAdapter = pAdapter; -+ } -+ else -+ { -+ pTargetAdapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, FALSE); -+ if(!ACTING_AS_AP(pTargetAdapter)) -+ pTargetAdapter = NULL; -+ } -+ -+ // if extension port (softap) is started, updaet RA table for more than one clients associate -+ if(pTargetAdapter != NULL) -+ { -+ int i; -+ PRT_WLAN_STA pEntry; -+ PRATE_ADAPTIVE pEntryRA; -+ -+ for(i = 0; i < ASSOCIATE_ENTRY_NUM; i++) -+ { -+ if( pTargetAdapter->MgntInfo.AsocEntry[i].bUsed && pTargetAdapter->MgntInfo.AsocEntry[i].bAssociated) -+ { -+ pEntry = pTargetAdapter->MgntInfo.AsocEntry+i; -+ pEntryRA = &pEntry->RateAdaptive; -+ -+ switch (pEntryRA->PreRATRState) -+ { -+ case DM_RATR_STA_HIGH: -+ { -+ HighRSSIThreshForRA = 50; -+ LowRSSIThreshForRA = 20; -+ } -+ break; -+ -+ case DM_RATR_STA_MIDDLE: -+ { -+ HighRSSIThreshForRA = 55; -+ LowRSSIThreshForRA = 20; -+ } -+ break; -+ -+ case DM_RATR_STA_LOW: -+ { -+ HighRSSIThreshForRA = 50; -+ LowRSSIThreshForRA = 25; -+ } -+ break; -+ -+ default: -+ { -+ HighRSSIThreshForRA = 50; -+ LowRSSIThreshForRA = 20; -+ } -+ } -+ -+ if(pEntry->rssi_stat.UndecoratedSmoothedPWDB > (s4Byte)HighRSSIThreshForRA) -+ pEntryRA->RATRState = DM_RATR_STA_HIGH; -+ else if(pEntry->rssi_stat.UndecoratedSmoothedPWDB > (s4Byte)LowRSSIThreshForRA) -+ pEntryRA->RATRState = DM_RATR_STA_MIDDLE; -+ else -+ pEntryRA->RATRState = DM_RATR_STA_LOW; -+ -+ if(pEntryRA->PreRATRState != pEntryRA->RATRState) -+ { -+ RT_PRINT_ADDR(COMP_RATR, DBG_LOUD, ("AsocEntry addr : "), pEntry->MacAddr); -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("RSSI = %d\n", pEntry->rssi_stat.UndecoratedSmoothedPWDB)); -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("RSSI_LEVEL = %d\n", pEntryRA->RATRState)); -+ RT_TRACE(COMP_RATR, DBG_LOUD, ("PreState = %d, CurState = %d\n", pEntryRA->PreRATRState, pEntryRA->RATRState)); -+ pAdapter->HalFunc.UpdateHalRAMaskHandler( -+ pTargetAdapter, -+ FALSE, -+ pEntry->AID+1, -+ pEntry->MacAddr, -+ pEntry, -+ pEntryRA->RATRState); -+ pEntryRA->PreRATRState = pEntryRA->RATRState; -+ } -+ -+ } -+ } -+ } -+#endif -+} -+ -+static VOID -+dm_CheckProtection( -+ IN PADAPTER Adapter -+ ) -+{ -+#if 0 -+ PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); -+ u1Byte CurRate, RateThreshold; -+ -+ if(pMgntInfo->pHTInfo->bCurBW40MHz) -+ RateThreshold = MGN_MCS1; -+ else -+ RateThreshold = MGN_MCS3; -+ -+ if(Adapter->TxStats.CurrentInitTxRate <= RateThreshold) -+ { -+ pMgntInfo->bDmDisableProtect = TRUE; -+ DbgPrint("Forced disable protect: %x\n", Adapter->TxStats.CurrentInitTxRate); -+ } -+ else -+ { -+ pMgntInfo->bDmDisableProtect = FALSE; -+ DbgPrint("Enable protect: %x\n", Adapter->TxStats.CurrentInitTxRate); -+ } -+#endif -+} -+ -+static VOID -+dm_CheckStatistics( -+ IN PADAPTER Adapter -+ ) -+{ -+#if 0 -+ if(!Adapter->MgntInfo.bMediaConnect) -+ return; -+ -+ //2008.12.10 tynli Add for getting Current_Tx_Rate_Reg flexibly. -+ rtw_hal_get_hwreg( Adapter, HW_VAR_INIT_TX_RATE, (pu1Byte)(&Adapter->TxStats.CurrentInitTxRate) ); -+ -+ // Calculate current Tx Rate(Successful transmited!!) -+ -+ // Calculate current Rx Rate(Successful received!!) -+ -+ //for tx tx retry count -+ rtw_hal_get_hwreg( Adapter, HW_VAR_RETRY_COUNT, (pu1Byte)(&Adapter->TxStats.NumTxRetryCount) ); -+#endif -+} -+ -+static void dm_CheckPbcGPIO(_adapter *padapter) -+{ -+ u8 tmp1byte; -+ u8 bPbcPressed = _FALSE; -+ int i=0; -+ -+ if(!padapter->registrypriv.hw_wps_pbc) -+ return; -+ -+ do -+ { -+ i++; -+#ifdef CONFIG_USB_HCI -+ tmp1byte = rtw_read8(padapter, GPIO_IO_SEL); -+ tmp1byte |= (HAL_8192C_HW_GPIO_WPS_BIT); -+ rtw_write8(padapter, GPIO_IO_SEL, tmp1byte); //enable GPIO[2] as output mode -+ -+ tmp1byte &= ~(HAL_8192C_HW_GPIO_WPS_BIT); -+ rtw_write8(padapter, GPIO_IN, tmp1byte); //reset the floating voltage level -+ -+ tmp1byte = rtw_read8(padapter, GPIO_IO_SEL); -+ tmp1byte &= ~(HAL_8192C_HW_GPIO_WPS_BIT); -+ rtw_write8(padapter, GPIO_IO_SEL, tmp1byte); //enable GPIO[2] as input mode -+ -+ tmp1byte =rtw_read8(padapter, GPIO_IN); -+ -+ if (tmp1byte == 0xff) -+ { -+ bPbcPressed = _FALSE; -+ break ; -+ } -+ -+ if (tmp1byte&HAL_8192C_HW_GPIO_WPS_BIT) -+ { -+ bPbcPressed = _TRUE; -+ -+ if(i<=3) -+ rtw_msleep_os(50); -+ } -+#else -+ tmp1byte = rtw_read8(padapter, GPIO_IN); -+ //RT_TRACE(COMP_IO, DBG_TRACE, ("dm_CheckPbcGPIO - %x\n", tmp1byte)); -+ -+ if (tmp1byte == 0xff || padapter->init_adpt_in_progress) -+ { -+ bPbcPressed = _FALSE; -+ break ; -+ } -+ -+ if((tmp1byte&HAL_8192C_HW_GPIO_WPS_BIT)==0) -+ { -+ bPbcPressed = _TRUE; -+ -+ if(i<=3) -+ rtw_msleep_os(50); -+ } -+#endif -+ -+ }while(i<=3 && bPbcPressed == _TRUE); -+ -+ if( _TRUE == bPbcPressed) -+ { -+ // Here we only set bPbcPressed to true -+ // After trigger PBC, the variable will be set to false -+ DBG_8192C("CheckPbcGPIO - PBC is pressed, try_cnt=%d\n", i-1); -+ -+#ifdef RTK_DMP_PLATFORM -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) -+ kobject_uevent(&padapter->pnetdev->dev.kobj, KOBJ_NET_PBC); -+#else -+ kobject_hotplug(&padapter->pnetdev->class_dev.kobj, KOBJ_NET_PBC); -+#endif -+#else -+ -+ if ( padapter->pid[0] == 0 ) -+ { // 0 is the default value and it means the application monitors the HW PBC doesn't privde its pid to driver. -+ return; -+ } -+ -+#ifdef PLATFORM_LINUX -+ rtw_signal_process(padapter->pid[0], SIGUSR1); -+#endif -+#endif -+ } -+} -+ -+#ifdef CONFIG_PCI_HCI -+// -+// Description: -+// Perform interrupt migration dynamically to reduce CPU utilization. -+// -+// Assumption: -+// 1. Do not enable migration under WIFI test. -+// -+// Created by Roger, 2010.03.05. -+// -+VOID -+dm_InterruptMigration( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ BOOLEAN bCurrentIntMt, bCurrentACIntDisable; -+ BOOLEAN IntMtToSet = _FALSE; -+ BOOLEAN ACIntToSet = _FALSE; -+ -+ -+ // Retrieve current interrupt migration and Tx four ACs IMR settings first. -+ bCurrentIntMt = pHalData->bInterruptMigration; -+ bCurrentACIntDisable = pHalData->bDisableTxInt; -+ -+ // -+ // Currently we use busy traffic for reference instead of RxIntOK counts to prevent non-linear Rx statistics -+ // when interrupt migration is set before. 2010.03.05. -+ // -+ if(!Adapter->registrypriv.wifi_spec && -+ (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && -+ pmlmepriv->LinkDetectInfo.bHigherBusyTraffic) -+ { -+ IntMtToSet = _TRUE; -+ -+ // To check whether we should disable Tx interrupt or not. -+ if(pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic ) -+ ACIntToSet = _TRUE; -+ } -+ -+ //Update current settings. -+ if( bCurrentIntMt != IntMtToSet ){ -+ DBG_8192C("%s(): Update interrrupt migration(%d)\n",__FUNCTION__,IntMtToSet); -+ if(IntMtToSet) -+ { -+ // -+ // Set interrrupt migration timer and corresponging Tx/Rx counter. -+ // timer 25ns*0xfa0=100us for 0xf packets. -+ // 2010.03.05. -+ // -+ rtw_write32(Adapter, REG_INT_MIG, 0xff000fa0);// 0x306:Rx, 0x307:Tx -+ pHalData->bInterruptMigration = IntMtToSet; -+ } -+ else -+ { -+ // Reset all interrupt migration settings. -+ rtw_write32(Adapter, REG_INT_MIG, 0); -+ pHalData->bInterruptMigration = IntMtToSet; -+ } -+ } -+ -+ /*if( bCurrentACIntDisable != ACIntToSet ){ -+ DBG_8192C("%s(): Update AC interrrupt(%d)\n",__FUNCTION__,ACIntToSet); -+ if(ACIntToSet) // Disable four ACs interrupts. -+ { -+ // -+ // Disable VO, VI, BE and BK four AC interrupts to gain more efficient CPU utilization. -+ // When extremely highly Rx OK occurs, we will disable Tx interrupts. -+ // 2010.03.05. -+ // -+ UpdateInterruptMask8192CE( Adapter, 0, RT_AC_INT_MASKS ); -+ pHalData->bDisableTxInt = ACIntToSet; -+ } -+ else// Enable four ACs interrupts. -+ { -+ UpdateInterruptMask8192CE( Adapter, RT_AC_INT_MASKS, 0 ); -+ pHalData->bDisableTxInt = ACIntToSet; -+ } -+ }*/ -+ -+} -+ -+#endif -+ -+// -+// Initialize GPIO setting registers -+// -+static void -+dm_InitGPIOSetting( -+ IN PADAPTER Adapter -+ ) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ -+ u8 tmp1byte; -+ -+ tmp1byte = rtw_read8(Adapter, REG_GPIO_MUXCFG); -+ tmp1byte &= (GPIOSEL_GPIO | ~GPIOSEL_ENBT); -+ -+#ifdef CONFIG_BT_COEXIST -+ // UMB-B cut bug. We need to support the modification. -+ if (IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID) && -+ pHalData->bt_coexist.BT_Coexist) -+ { -+ tmp1byte |= (BIT5); -+ } -+#endif -+ rtw_write8(Adapter, REG_GPIO_MUXCFG, tmp1byte); -+ -+} -+ -+static void update_EDCA_param(_adapter *padapter) -+{ -+ u32 trafficIndex; -+ u32 edca_param; -+ u64 cur_tx_bytes = 0; -+ u64 cur_rx_bytes = 0; -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct recv_priv *precvpriv = &(padapter->recvpriv); -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ u8 bbtchange = _FALSE; -+#endif -+ -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ //associated AP -+ if ((pregpriv->wifi_spec == 1) || (pmlmeinfo->HT_enable == 0)) -+ { -+ return; -+ } -+ -+ if (pmlmeinfo->assoc_AP_vendor >= maxAP) -+ { -+ return; -+ } -+ -+ cur_tx_bytes = pxmitpriv->tx_bytes - pxmitpriv->last_tx_bytes; -+ cur_rx_bytes = precvpriv->rx_bytes - precvpriv->last_rx_bytes; -+ -+ //traffic, TX or RX -+ if((pmlmeinfo->assoc_AP_vendor == ralinkAP)||(pmlmeinfo->assoc_AP_vendor == atherosAP)) -+ { -+ if (cur_tx_bytes > (cur_rx_bytes << 2)) -+ { // Uplink TP is present. -+ trafficIndex = UP_LINK; -+ } -+ else -+ { // Balance TP is present. -+ trafficIndex = DOWN_LINK; -+ } -+ } -+ else -+ { -+ if (cur_rx_bytes > (cur_tx_bytes << 2)) -+ { // Downlink TP is present. -+ trafficIndex = DOWN_LINK; -+ } -+ else -+ { // Balance TP is present. -+ trafficIndex = UP_LINK; -+ } -+ } -+ -+#ifdef CONFIG_BT_COEXIST -+ if(pbtpriv->BT_Coexist) -+ { -+ if( (pbtpriv->BT_EDCA[UP_LINK]!=0) || (pbtpriv->BT_EDCA[DOWN_LINK]!=0)) -+ { -+ bbtchange = _TRUE; -+ } -+ } -+#endif -+ -+ if (pdmpriv->prv_traffic_idx != trafficIndex) -+ { -+#if 0 -+#ifdef CONFIG_BT_COEXIST -+ if(_TRUE == bbtchange) -+ rtw_write32(padapter, REG_EDCA_BE_PARAM, pbtpriv->BT_EDCA[trafficIndex]); -+ else -+#endif -+ //adjust EDCA parameter for BE queue -+ //fire_write_MAC_cmd(padapter, EDCA_BE_PARAM, EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex]); -+ rtw_write32(padapter, REG_EDCA_BE_PARAM, EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex]); -+ -+#else -+ if((pmlmeinfo->assoc_AP_vendor == ciscoAP) && (pmlmeext->cur_wireless_mode & WIRELESS_11_24N)) -+ { -+ edca_param = EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex]; -+ } -+ else if((pmlmeinfo->assoc_AP_vendor == airgocapAP) && -+ ((pmlmeext->cur_wireless_mode == WIRELESS_11G) ||(pmlmeext->cur_wireless_mode == WIRELESS_11BG))) -+ { -+ edca_param = EDCAParam[pmlmeinfo->assoc_AP_vendor][trafficIndex]; -+ } -+ else -+ { -+ edca_param = EDCAParam[unknownAP][trafficIndex]; -+ } -+ -+#ifdef CONFIG_BT_COEXIST -+ if(_TRUE == bbtchange) -+ edca_param = pbtpriv->BT_EDCA[trafficIndex]; -+#endif -+ -+ rtw_write32(padapter, REG_EDCA_BE_PARAM, edca_param); -+#endif -+ pdmpriv->prv_traffic_idx = trafficIndex; -+ } -+ -+//exit_update_EDCA_param: -+ -+ pxmitpriv->last_tx_bytes = pxmitpriv->tx_bytes; -+ precvpriv->last_rx_bytes = precvpriv->rx_bytes; -+ -+ return; -+} -+ -+static void dm_InitDynamicBBPowerSaving( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PS_T *pPSTable = &pdmpriv->DM_PSTable; -+ -+ pPSTable->PreCCAState = CCA_MAX; -+ pPSTable->CurCCAState = CCA_MAX; -+ pPSTable->PreRFState = RF_MAX; -+ pPSTable->CurRFState = RF_MAX; -+ pPSTable->Rssi_val_min = 0; -+} -+ -+static void dm_1R_CCA( -+ IN PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PS_T *pPSTable = &pdmpriv->DM_PSTable; -+ -+ if(pPSTable->Rssi_val_min != 0) -+ { -+ if(pPSTable->PreCCAState == CCA_2R) -+ { -+ if(pPSTable->Rssi_val_min >= 35) -+ pPSTable->CurCCAState = CCA_1R; -+ else -+ pPSTable->CurCCAState = CCA_2R; -+ } -+ else{ -+ if(pPSTable->Rssi_val_min <= 30) -+ pPSTable->CurCCAState = CCA_2R; -+ else -+ pPSTable->CurCCAState = CCA_1R; -+ } -+ } -+ else -+ pPSTable->CurCCAState=CCA_MAX; -+ -+ if(pPSTable->PreCCAState != pPSTable->CurCCAState) -+ { -+ if(pPSTable->CurCCAState == CCA_1R) -+ { -+ if(pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetBBReg(pAdapter, rOFDM0_TRxPathEnable , bMaskByte0, 0x13); -+ PHY_SetBBReg(pAdapter, 0xe70, bMaskByte3, 0x20); -+ } -+ else -+ { -+ PHY_SetBBReg(pAdapter, rOFDM0_TRxPathEnable , bMaskByte0, 0x23); -+ PHY_SetBBReg(pAdapter, 0xe70, 0x7fc00000, 0x10c); // Set RegE70[30:22] = 9b'100001100 -+ } -+ } -+ else -+ { -+ PHY_SetBBReg(pAdapter, rOFDM0_TRxPathEnable, bMaskByte0, 0x33); -+ PHY_SetBBReg(pAdapter,0xe70, bMaskByte3, 0x63); -+ } -+ pPSTable->PreCCAState = pPSTable->CurCCAState; -+ } -+ //DBG_8192C("dm_1R_CCA(): CCAStage=%x\n", pPSTable->CurCCAState); -+} -+ -+void -+rtl8192c_dm_RF_Saving( -+ IN PADAPTER pAdapter, -+ IN u8 bForceInNormal -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PS_T *pPSTable = &pdmpriv->DM_PSTable; -+ -+ if(pdmpriv->initialize == 0){ -+ pdmpriv->rf_saving_Reg874 = (PHY_QueryBBReg(pAdapter, rFPGA0_XCD_RFInterfaceSW, bMaskDWord)&0x1CC000)>>14; -+ pdmpriv->rf_saving_RegC70 = (PHY_QueryBBReg(pAdapter, rOFDM0_AGCParameter1, bMaskDWord)&BIT3)>>3; -+ pdmpriv->rf_saving_Reg85C = (PHY_QueryBBReg(pAdapter, rFPGA0_XCD_SwitchControl, bMaskDWord)&0xFF000000)>>24; -+ pdmpriv->rf_saving_RegA74 = (PHY_QueryBBReg(pAdapter, 0xa74, bMaskDWord)&0xF000)>>12; -+ //Reg818 = PHY_QueryBBReg(pAdapter, 0x818, bMaskDWord); -+ pdmpriv->initialize = 1; -+ } -+ -+ if(!bForceInNormal) -+ { -+ if(pPSTable->Rssi_val_min != 0) -+ { -+ -+ if(pPSTable->PreRFState == RF_Normal) -+ { -+ #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV -+ if(pPSTable->Rssi_val_min >= 50) -+ #else -+ if(pPSTable->Rssi_val_min >= 30) -+ #endif -+ pPSTable->CurRFState = RF_Save; -+ else -+ pPSTable->CurRFState = RF_Normal; -+ } -+ else{ -+ #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV -+ if(pPSTable->Rssi_val_min <= 45) -+ #else -+ if(pPSTable->Rssi_val_min <= 25) -+ #endif -+ pPSTable->CurRFState = RF_Normal; -+ else -+ pPSTable->CurRFState = RF_Save; -+ } -+ } -+ else -+ pPSTable->CurRFState=RF_MAX; -+ } -+ else -+ { -+ pPSTable->CurRFState = RF_Normal; -+ } -+ -+ if(pPSTable->PreRFState != pPSTable->CurRFState) -+ { -+ if(pPSTable->CurRFState == RF_Save) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XCD_RFInterfaceSW , 0x1C0000, 0x2); //Reg874[20:18]=3'b010 -+ PHY_SetBBReg(pAdapter, rOFDM0_AGCParameter1, BIT3, 0); //RegC70[3]=1'b0 -+ PHY_SetBBReg(pAdapter, rFPGA0_XCD_SwitchControl, 0xFF000000, 0x63); //Reg85C[31:24]=0x63 -+ PHY_SetBBReg(pAdapter, rFPGA0_XCD_RFInterfaceSW, 0xC000, 0x2); //Reg874[15:14]=2'b10 -+ PHY_SetBBReg(pAdapter, 0xa74, 0xF000, 0x3); //RegA75[7:4]=0x3 -+ PHY_SetBBReg(pAdapter, 0x818, BIT28, 0x0); //Reg818[28]=1'b0 -+ PHY_SetBBReg(pAdapter, 0x818, BIT28, 0x1); //Reg818[28]=1'b1 -+ DBG_8192C("%s(): RF_Save\n", __FUNCTION__); -+ } -+ else -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XCD_RFInterfaceSW , 0x1CC000, pdmpriv->rf_saving_Reg874); -+ PHY_SetBBReg(pAdapter, rOFDM0_AGCParameter1, BIT3, pdmpriv->rf_saving_RegC70); -+ PHY_SetBBReg(pAdapter, rFPGA0_XCD_SwitchControl, 0xFF000000, pdmpriv->rf_saving_Reg85C); -+ PHY_SetBBReg(pAdapter, 0xa74, 0xF000, pdmpriv->rf_saving_RegA74); -+ PHY_SetBBReg(pAdapter, 0x818, BIT28, 0x0); -+ DBG_8192C("%s(): RF_Normal\n", __FUNCTION__); -+ } -+ pPSTable->PreRFState = pPSTable->CurRFState; -+ } -+} -+ -+static void -+dm_DynamicBBPowerSaving( -+IN PADAPTER pAdapter -+ ) -+{ -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct mlme_priv *pmlmepriv = &pAdapter->mlmepriv; -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PS_T *pPSTable = &pdmpriv->DM_PSTable; -+ -+ //1 1.Determine the minimum RSSI -+ if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) && -+ (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) -+ { -+ pPSTable->Rssi_val_min = 0; -+ //RT_TRACE(COMP_BB_POWERSAVING, DBG_LOUD, ("Not connected to any \n")); -+ } -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) // Default port -+ { -+ //if(ACTING_AS_AP(pAdapter) || pMgntInfo->mIbss) -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) //todo: AP Mode -+ { -+ pPSTable->Rssi_val_min = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ //RT_TRACE(COMP_BB_POWERSAVING, DBG_LOUD, ("AP Client PWDB = 0x%lx \n", pPSTable->Rssi_val_min)); -+ } -+ else -+ { -+ pPSTable->Rssi_val_min = pdmpriv->UndecoratedSmoothedPWDB; -+ //RT_TRACE(COMP_BB_POWERSAVING, DBG_LOUD, ("STA Default Port PWDB = 0x%lx \n", pPSTable->Rssi_val_min)); -+ } -+ } -+ else // associated entry pwdb -+ { -+ pPSTable->Rssi_val_min = pdmpriv->EntryMinUndecoratedSmoothedPWDB; -+ //RT_TRACE(COMP_BB_POWERSAVING, DBG_LOUD, ("AP Ext Port PWDB = 0x%lx \n", pPSTable->Rssi_val_min)); -+ } -+ -+ //1 2.Power Saving for 92C -+ if(IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ //dm_1R_CCA(pAdapter); -+ } -+ -+ // 20100628 Joseph: Turn off BB power save for 88CE because it makesthroughput unstable. -+ // 20100831 Joseph: Turn ON BB power save again after modifying AGC delay from 900ns to 600ns. -+ //1 3.Power Saving for 88C -+ else -+ { -+ rtl8192c_dm_RF_Saving(pAdapter, _FALSE); -+ } -+} -+ -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+// Add new function to reset the state of antenna diversity before link. -+// -+void SwAntDivResetBeforeLink8192C(IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ SWAT_T *pDM_SWAT_Table = &pdmpriv->DM_SWAT_Table; -+ -+ pDM_SWAT_Table->SWAS_NoLink_State = 0; -+} -+ -+// Compare RSSI for deciding antenna -+void SwAntDivCompare8192C(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if((0 != pHalData->AntDivCfg) && (!IS_92C_SERIAL(pHalData->VersionID)) ) -+ { -+ //DBG_8192C("update_network=> orgRSSI(%d)(%d),newRSSI(%d)(%d)\n",dst->Rssi,query_rx_pwr_percentage(dst->Rssi), -+ // src->Rssi,query_rx_pwr_percentage(src->Rssi)); -+ //select optimum_antenna for before linked =>For antenna diversity -+ if(dst->Rssi >= src->Rssi )//keep org parameter -+ { -+ src->Rssi = dst->Rssi; -+ src->PhyInfo.Optimum_antenna = dst->PhyInfo.Optimum_antenna; -+ } -+ } -+} -+ -+// Add new function to reset the state of antenna diversity before link. -+u8 SwAntDivBeforeLink8192C(IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ SWAT_T *pDM_SWAT_Table = &pdmpriv->DM_SWAT_Table; -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ -+ // Condition that does not need to use antenna diversity. -+ if(IS_92C_SERIAL(pHalData->VersionID) ||(pHalData->AntDivCfg==0)) -+ { -+ //DBG_8192C("SwAntDivBeforeLink8192C(): No AntDiv Mechanism.\n"); -+ return _FALSE; -+ } -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ pDM_SWAT_Table->SWAS_NoLink_State = 0; -+ return _FALSE; -+ } -+ // Since driver is going to set BB register, it shall check if there is another thread controlling BB/RF. -+/* -+ if(pHalData->eRFPowerState!=eRfOn || pMgntInfo->RFChangeInProgress || pMgntInfo->bMediaConnect) -+ { -+ -+ -+ RT_TRACE(COMP_SWAS, DBG_LOUD, -+ ("SwAntDivCheckBeforeLink8192C(): RFChangeInProgress(%x), eRFPowerState(%x)\n", -+ pMgntInfo->RFChangeInProgress, -+ pHalData->eRFPowerState)); -+ -+ pDM_SWAT_Table->SWAS_NoLink_State = 0; -+ -+ return FALSE; -+ } -+*/ -+ -+ if(pDM_SWAT_Table->SWAS_NoLink_State == 0){ -+ //switch channel -+ pDM_SWAT_Table->SWAS_NoLink_State = 1; -+ pDM_SWAT_Table->CurAntenna = (pDM_SWAT_Table->CurAntenna==Antenna_A)?Antenna_B:Antenna_A; -+ -+ //PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, pDM_SWAT_Table->CurAntenna); -+ rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, _FALSE); -+ //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__FUNCTION__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B"); -+ return _TRUE; -+ } -+ else -+ { -+ pDM_SWAT_Table->SWAS_NoLink_State = 0; -+ return _FALSE; -+ } -+ -+ -+ -+} -+#endif -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+// -+// 20100514 Luke/Joseph: -+// Add new function to reset antenna diversity state after link. -+// -+void -+SwAntDivRestAfterLink8192C( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ SWAT_T *pDM_SWAT_Table = &pdmpriv->DM_SWAT_Table; -+ -+ if(IS_92C_SERIAL(pHalData->VersionID) ||(pHalData->AntDivCfg==0)) -+ return; -+ -+ //DBG_8192C("======> SwAntDivRestAfterLink <========== \n"); -+ pHalData->RSSI_cnt_A= 0; -+ pHalData->RSSI_cnt_B= 0; -+ pHalData->RSSI_test = _FALSE; -+ -+ pDM_SWAT_Table->try_flag = 0xff; -+ pDM_SWAT_Table->RSSI_Trying = 0; -+ pDM_SWAT_Table->SelectAntennaMap=0xAA; -+ pDM_SWAT_Table->CurAntenna = pHalData->CurAntenna; -+ pDM_SWAT_Table->PreAntenna = pHalData->CurAntenna; -+ -+ pdmpriv->lastTxOkCnt=0; -+ pdmpriv->lastRxOkCnt=0; -+ -+ pdmpriv->TXByteCnt_A=0; -+ pdmpriv->TXByteCnt_B=0; -+ pdmpriv->RXByteCnt_A=0; -+ pdmpriv->RXByteCnt_B=0; -+ pdmpriv->DoubleComfirm=0; -+ pdmpriv->TrafficLoad = TRAFFIC_LOW; -+ -+} -+ -+ -+// -+// 20100514 Luke/Joseph: -+// Add new function for antenna diversity after link. -+// This is the main function of antenna diversity after link. -+// This function is called in HalDmWatchDog() and dm_SW_AntennaSwitchCallback(). -+// HalDmWatchDog() calls this function with SWAW_STEP_PEAK to initialize the antenna test. -+// In SWAW_STEP_PEAK, another antenna and a 500ms timer will be set for testing. -+// After 500ms, dm_SW_AntennaSwitchCallback() calls this function to compare the signal just -+// listened on the air with the RSSI of original antenna. -+// It chooses the antenna with better RSSI. -+// There is also a aged policy for error trying. Each error trying will cost more 5 seconds waiting -+// penalty to get next try. -+// -+static VOID -+dm_SW_AntennaSwitch( -+ PADAPTER Adapter, -+ u8 Step -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ SWAT_T *pDM_SWAT_Table = &pdmpriv->DM_SWAT_Table; -+ s32 curRSSI=100, RSSI_A, RSSI_B; -+ u64 curTxOkCnt, curRxOkCnt; -+ u64 CurByteCnt = 0, PreByteCnt = 0; -+ u8 nextAntenna = 0; -+ u8 Score_A=0, Score_B=0; -+ u8 i; -+ -+ // Condition that does not need to use antenna diversity. -+ if(IS_92C_SERIAL(pHalData->VersionID) ||(pHalData->AntDivCfg==0)) -+ { -+ //RT_TRACE(COMP_SWAS, DBG_LOUD, ("dm_SW_AntennaSwitch(): No AntDiv Mechanism.\n")); -+ return; -+ } -+ // If dynamic ant_div is disabled. -+ if(!(pdmpriv->DMFlag & DYNAMIC_FUNC_ANT_DIV) ) -+ { -+ return; -+ } -+ -+ if (check_fwstate(&Adapter->mlmepriv, _FW_LINKED) ==_FALSE) -+ return; -+#if 0 //to do -+ // Radio off: Status reset to default and return. -+ if(pHalData->eRFPowerState==eRfOff) -+ { -+ SwAntDivRestAfterLink(Adapter); -+ return; -+ } -+#endif -+ //DBG_8192C("\n............................ %s.........................\n",__FUNCTION__); -+ // Handling step mismatch condition. -+ // Peak step is not finished at last time. Recover the variable and check again. -+ if( Step != pDM_SWAT_Table->try_flag ) -+ { -+ SwAntDivRestAfterLink8192C(Adapter); -+ } -+ -+ -+ if(pDM_SWAT_Table->try_flag == 0xff) -+ { -+#if 0 -+ // Select RSSI checking target -+ if(pMgntInfo->mAssoc && !ACTING_AS_AP(Adapter)) -+ { -+ // Target: Infrastructure mode AP. -+ pHalData->RSSI_target = NULL; -+ RT_TRACE(COMP_SWAS, DBG_LOUD, ("dm_SW_AntennaSwitch(): RSSI_target is DEF AP!\n")); -+ } -+ else -+ { -+ u8 index = 0; -+ PRT_WLAN_STA pEntry = NULL; -+ PADAPTER pTargetAdapter = NULL; -+ -+ if( pMgntInfo->mIbss || ACTING_AS_AP(Adapter) ) -+ { -+ // Target: AP/IBSS peer. -+ pTargetAdapter = Adapter; -+ } -+ else if(ACTING_AS_AP(ADJUST_TO_ADAPTIVE_ADAPTER(Adapter, FALSE))) -+ { -+ // Target: VWIFI peer. -+ pTargetAdapter = ADJUST_TO_ADAPTIVE_ADAPTER(Adapter, FALSE); -+ } -+ -+ if(pTargetAdapter != NULL) -+ { -+ for(index=0; indexbAssociated) -+ break; -+ } -+ } -+ } -+ -+ if(pEntry == NULL) -+ { -+ SwAntDivRestAfterLink(Adapter); -+ RT_TRACE(COMP_SWAS, DBG_LOUD, ("dm_SW_AntennaSwitch(): No Link.\n")); -+ return; -+ } -+ else -+ { -+ pHalData->RSSI_target = pEntry; -+ RT_TRACE(COMP_SWAS, DBG_LOUD, ("dm_SW_AntennaSwitch(): RSSI_target is PEER STA\n")); -+ } -+ } -+ -+ -+#endif -+ -+ pHalData->RSSI_cnt_A= 0; -+ pHalData->RSSI_cnt_B= 0; -+ pDM_SWAT_Table->try_flag = 0; -+ // DBG_8192C("dm_SW_AntennaSwitch(): Set try_flag to 0 prepare for peak!\n"); -+ return; -+ } -+ else -+ { -+ curTxOkCnt = Adapter->xmitpriv.tx_bytes - pdmpriv->lastTxOkCnt; -+ curRxOkCnt = Adapter->recvpriv.rx_bytes - pdmpriv->lastRxOkCnt; -+ -+ pdmpriv->lastTxOkCnt = Adapter->xmitpriv.tx_bytes ; -+ pdmpriv->lastRxOkCnt = Adapter->recvpriv.rx_bytes ; -+ -+ if(pDM_SWAT_Table->try_flag == 1) -+ { -+ if(pDM_SWAT_Table->CurAntenna == Antenna_A) -+ { -+ pdmpriv->TXByteCnt_A += curTxOkCnt; -+ pdmpriv->RXByteCnt_A += curRxOkCnt; -+ //DBG_8192C("##### TXByteCnt_A(%lld) , RXByteCnt_A(%lld) ####\n",pdmpriv->TXByteCnt_A,pdmpriv->RXByteCnt_A); -+ } -+ else -+ { -+ pdmpriv->TXByteCnt_B += curTxOkCnt; -+ pdmpriv->RXByteCnt_B += curRxOkCnt; -+ //DBG_8192C("##### TXByteCnt_B(%lld) , RXByteCnt_B(%lld) ####\n",pdmpriv->TXByteCnt_B,pdmpriv->RXByteCnt_B); -+ } -+ -+ nextAntenna = (pDM_SWAT_Table->CurAntenna == Antenna_A)? Antenna_B : Antenna_A; -+ pDM_SWAT_Table->RSSI_Trying--; -+ //DBG_8192C("RSSI_Trying = %d\n",pDM_SWAT_Table->RSSI_Trying); -+ -+ if(pDM_SWAT_Table->RSSI_Trying == 0) -+ { -+ CurByteCnt = (pDM_SWAT_Table->CurAntenna == Antenna_A)? (pdmpriv->TXByteCnt_A+pdmpriv->RXByteCnt_A) : (pdmpriv->TXByteCnt_B+pdmpriv->RXByteCnt_B); -+ PreByteCnt = (pDM_SWAT_Table->CurAntenna == Antenna_A)? (pdmpriv->TXByteCnt_B+pdmpriv->RXByteCnt_B) : (pdmpriv->TXByteCnt_A+pdmpriv->RXByteCnt_A); -+ -+ //DBG_8192C("CurByteCnt = %lld\n", CurByteCnt); -+ //DBG_8192C("PreByteCnt = %lld\n",PreByteCnt); -+ -+ if(pdmpriv->TrafficLoad == TRAFFIC_HIGH) -+ { -+ PreByteCnt = PreByteCnt*9; //normalize:Cur=90ms:Pre=10ms -+ } -+ else if(pdmpriv->TrafficLoad == TRAFFIC_LOW) -+ { -+ //CurByteCnt = CurByteCnt/2; -+ CurByteCnt = CurByteCnt>>1;//normalize:100ms:50ms -+ } -+ -+ -+ //DBG_8192C("After DIV=>CurByteCnt = %lld\n", CurByteCnt); -+ //DBG_8192C("PreByteCnt = %lld\n",PreByteCnt); -+ -+ if(pHalData->RSSI_cnt_A > 0) -+ RSSI_A = pHalData->RSSI_sum_A/pHalData->RSSI_cnt_A; -+ else -+ RSSI_A = 0; -+ if(pHalData->RSSI_cnt_B > 0) -+ RSSI_B = pHalData->RSSI_sum_B/pHalData->RSSI_cnt_B; -+ else -+ RSSI_B = 0; -+ -+ curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B; -+ pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_B : RSSI_A; -+ //DBG_8192C("Luke:PreRSSI = %d, CurRSSI = %d\n",pDM_SWAT_Table->PreRSSI, curRSSI); -+ //DBG_8192C("SWAS: preAntenna= %s, curAntenna= %s \n", -+ //(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")); -+ //DBG_8192C("Luke:RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n", -+ //RSSI_A, pHalData->RSSI_cnt_A, RSSI_B, pHalData->RSSI_cnt_B); -+ } -+ -+ } -+ else -+ { -+ -+ if(pHalData->RSSI_cnt_A > 0) -+ RSSI_A = pHalData->RSSI_sum_A/pHalData->RSSI_cnt_A; -+ else -+ RSSI_A = 0; -+ if(pHalData->RSSI_cnt_B > 0) -+ RSSI_B = pHalData->RSSI_sum_B/pHalData->RSSI_cnt_B; -+ else -+ RSSI_B = 0; -+ curRSSI = (pDM_SWAT_Table->CurAntenna == Antenna_A)? RSSI_A : RSSI_B; -+ pDM_SWAT_Table->PreRSSI = (pDM_SWAT_Table->PreAntenna == Antenna_A)? RSSI_A : RSSI_B; -+ //DBG_8192C("Ekul:PreRSSI = %d, CurRSSI = %d\n", pDM_SWAT_Table->PreRSSI, curRSSI); -+ //DBG_8192C("SWAS: preAntenna= %s, curAntenna= %s \n", -+ //(pDM_SWAT_Table->PreAntenna == Antenna_A?"A":"B"), (pDM_SWAT_Table->CurAntenna == Antenna_A?"A":"B")); -+ -+ //DBG_8192C("Ekul:RSSI_A= %d, RSSI_cnt_A = %d, RSSI_B= %d, RSSI_cnt_B = %d\n", -+ // RSSI_A, pHalData->RSSI_cnt_A, RSSI_B, pHalData->RSSI_cnt_B); -+ //RT_TRACE(COMP_SWAS, DBG_LOUD, ("Ekul:curTxOkCnt = %d\n", curTxOkCnt)); -+ //RT_TRACE(COMP_SWAS, DBG_LOUD, ("Ekul:curRxOkCnt = %d\n", curRxOkCnt)); -+ } -+ -+ //1 Trying State -+ if((pDM_SWAT_Table->try_flag == 1)&&(pDM_SWAT_Table->RSSI_Trying == 0)) -+ { -+ -+ if(pDM_SWAT_Table->TestMode == TP_MODE) -+ { -+ //DBG_8192C("SWAS: TestMode = TP_MODE\n"); -+ //DBG_8192C("TRY:CurByteCnt = %lld\n", CurByteCnt); -+ //DBG_8192C("TRY:PreByteCnt = %lld\n",PreByteCnt); -+ if(CurByteCnt < PreByteCnt) -+ { -+ if(pDM_SWAT_Table->CurAntenna == Antenna_A) -+ pDM_SWAT_Table->SelectAntennaMap=pDM_SWAT_Table->SelectAntennaMap<<1; -+ else -+ pDM_SWAT_Table->SelectAntennaMap=(pDM_SWAT_Table->SelectAntennaMap<<1)+1; -+ } -+ else -+ { -+ if(pDM_SWAT_Table->CurAntenna == Antenna_A) -+ pDM_SWAT_Table->SelectAntennaMap=(pDM_SWAT_Table->SelectAntennaMap<<1)+1; -+ else -+ pDM_SWAT_Table->SelectAntennaMap=pDM_SWAT_Table->SelectAntennaMap<<1; -+ } -+ for (i= 0; i<8; i++) -+ { -+ if(((pDM_SWAT_Table->SelectAntennaMap>>i)&BIT0) == 1) -+ Score_A++; -+ else -+ Score_B++; -+ } -+ //DBG_8192C("SelectAntennaMap=%x\n ",pDM_SWAT_Table->SelectAntennaMap); -+ //DBG_8192C("Score_A=%d, Score_B=%d\n", Score_A, Score_B); -+ -+ if(pDM_SWAT_Table->CurAntenna == Antenna_A) -+ { -+ nextAntenna = (Score_A > Score_B)?Antenna_A:Antenna_B; -+ } -+ else -+ { -+ nextAntenna = (Score_B > Score_A)?Antenna_B:Antenna_A; -+ } -+ //RT_TRACE(COMP_SWAS, DBG_LOUD, ("nextAntenna=%s\n",(nextAntenna==Antenna_A)?"A":"B")); -+ //RT_TRACE(COMP_SWAS, DBG_LOUD, ("preAntenna= %s, curAntenna= %s \n", -+ //(DM_SWAT_Table.PreAntenna == Antenna_A?"A":"B"), (DM_SWAT_Table.CurAntenna == Antenna_A?"A":"B"))); -+ -+ if(nextAntenna != pDM_SWAT_Table->CurAntenna) -+ { -+ //DBG_8192C("SWAS: Switch back to another antenna\n"); -+ } -+ else -+ { -+ //DBG_8192C("SWAS: current anntena is good\n"); -+ } -+ } -+ -+ if(pDM_SWAT_Table->TestMode == RSSI_MODE) -+ { -+ //DBG_8192C("SWAS: TestMode = RSSI_MODE\n"); -+ pDM_SWAT_Table->SelectAntennaMap=0xAA; -+ if(curRSSI < pDM_SWAT_Table->PreRSSI) //Current antenna is worse than previous antenna -+ { -+ //DBG_8192C("SWAS: Switch back to another antenna\n"); -+ nextAntenna = (pDM_SWAT_Table->CurAntenna == Antenna_A)? Antenna_B : Antenna_A; -+ } -+ else // current anntena is good -+ { -+ nextAntenna = pDM_SWAT_Table->CurAntenna; -+ //DBG_8192C("SWAS: current anntena is good\n"); -+ } -+ } -+ pDM_SWAT_Table->try_flag = 0; -+ pHalData->RSSI_test = _FALSE; -+ pHalData->RSSI_sum_A = 0; -+ pHalData->RSSI_cnt_A = 0; -+ pHalData->RSSI_sum_B = 0; -+ pHalData->RSSI_cnt_B = 0; -+ pdmpriv->TXByteCnt_A = 0; -+ pdmpriv->TXByteCnt_B = 0; -+ pdmpriv->RXByteCnt_A = 0; -+ pdmpriv->RXByteCnt_B = 0; -+ -+ } -+ -+ //1 Normal State -+ else if(pDM_SWAT_Table->try_flag == 0) -+ { -+ if(pdmpriv->TrafficLoad == TRAFFIC_HIGH) -+ { -+ if(((curTxOkCnt+curRxOkCnt)>>1) > 1875000) -+ pdmpriv->TrafficLoad = TRAFFIC_HIGH; -+ else -+ pdmpriv->TrafficLoad = TRAFFIC_LOW; -+ } -+ else if(pdmpriv->TrafficLoad == TRAFFIC_LOW) -+ { -+ if(((curTxOkCnt+curRxOkCnt)>>1) > 1875000) -+ pdmpriv->TrafficLoad = TRAFFIC_HIGH; -+ else -+ pdmpriv->TrafficLoad = TRAFFIC_LOW; -+ } -+ if(pdmpriv->TrafficLoad == TRAFFIC_HIGH) -+ pDM_SWAT_Table->bTriggerAntennaSwitch = 0; -+ //DBG_8192C("Normal:TrafficLoad = %lld\n", curTxOkCnt+curRxOkCnt); -+ -+ //Prepare To Try Antenna -+ nextAntenna = (pDM_SWAT_Table->CurAntenna == Antenna_A)? Antenna_B : Antenna_A; -+ pDM_SWAT_Table->try_flag = 1; -+ pHalData->RSSI_test = _TRUE; -+ if((curRxOkCnt+curTxOkCnt) > 1000) -+ { -+ pDM_SWAT_Table->RSSI_Trying = 4; -+ pDM_SWAT_Table->TestMode = TP_MODE; -+ } -+ else -+ { -+ pDM_SWAT_Table->RSSI_Trying = 2; -+ pDM_SWAT_Table->TestMode = RSSI_MODE; -+ -+ } -+ //DBG_8192C("SWAS: Normal State -> Begin Trying! TestMode=%s\n",(pDM_SWAT_Table->TestMode == TP_MODE)?"TP":"RSSI"); -+ -+ -+ pHalData->RSSI_sum_A = 0; -+ pHalData->RSSI_cnt_A = 0; -+ pHalData->RSSI_sum_B = 0; -+ pHalData->RSSI_cnt_B = 0; -+ } -+ } -+ -+ //1 4.Change TRX antenna -+ if(nextAntenna != pDM_SWAT_Table->CurAntenna) -+ { -+ //DBG_8192C("@@@@@@@@ SWAS: Change TX Antenna!\n "); -+ rtw_antenna_select_cmd(Adapter, nextAntenna, 1); -+ } -+ -+ //1 5.Reset Statistics -+ pDM_SWAT_Table->PreAntenna = pDM_SWAT_Table->CurAntenna; -+ pDM_SWAT_Table->CurAntenna = nextAntenna; -+ pDM_SWAT_Table->PreRSSI = curRSSI; -+ -+ -+ //1 6.Set next timer -+ -+ if(pDM_SWAT_Table->RSSI_Trying == 0) -+ return; -+ -+ if(pDM_SWAT_Table->RSSI_Trying%2 == 0) -+ { -+ if(pDM_SWAT_Table->TestMode == TP_MODE) -+ { -+ if(pdmpriv->TrafficLoad == TRAFFIC_HIGH) -+ { -+ _set_timer(&pdmpriv->SwAntennaSwitchTimer,10 ); //ms -+ //DBG_8192C("dm_SW_AntennaSwitch(): Test another antenna for 10 ms\n"); -+ } -+ else if(pdmpriv->TrafficLoad == TRAFFIC_LOW) -+ { -+ _set_timer(&pdmpriv->SwAntennaSwitchTimer, 50 ); //ms -+ //DBG_8192C("dm_SW_AntennaSwitch(): Test another antenna for 50 ms\n"); -+ } -+ } -+ else -+ { -+ _set_timer(&pdmpriv->SwAntennaSwitchTimer, 500 ); //ms -+ //DBG_8192C("dm_SW_AntennaSwitch(): Test another antenna for 500 ms\n"); -+ } -+ } -+ else -+ { -+ if(pDM_SWAT_Table->TestMode == TP_MODE) -+ { -+ if(pdmpriv->TrafficLoad == TRAFFIC_HIGH) -+ _set_timer(&pdmpriv->SwAntennaSwitchTimer,90 ); //ms -+ else if(pdmpriv->TrafficLoad == TRAFFIC_LOW) -+ _set_timer(&pdmpriv->SwAntennaSwitchTimer,100 ); //ms -+ } -+ else -+ { -+ _set_timer(&pdmpriv->SwAntennaSwitchTimer,500 ); //ms -+ //DBG_8192C("dm_SW_AntennaSwitch(): Test another antenna for 500 ms\n"); -+ } -+ } -+ -+// RT_TRACE(COMP_SWAS, DBG_LOUD, ("SWAS: -----The End-----\n ")); -+ -+} -+ -+// -+// 20100514 Luke/Joseph: -+// Callback function for 500ms antenna test trying. -+// -+static void dm_SW_AntennaSwitchCallback(void *FunctionContext) -+{ -+ _adapter *padapter = (_adapter *)FunctionContext; -+ -+ if(padapter->net_closed == _TRUE) -+ return; -+ // Only -+ dm_SW_AntennaSwitch(padapter, SWAW_STEP_DETERMINE); -+} -+ -+ -+// -+// 20100722 -+// This function is used to gather the RSSI information for antenna testing. -+// It selects the RSSI of the peer STA that we want to know. -+// -+void SwAntDivRSSICheck8192C(_adapter *padapter ,u32 RxPWDBAll) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ SWAT_T *pDM_SWAT_Table = &pdmpriv->DM_SWAT_Table; -+ -+ if(IS_92C_SERIAL(pHalData->VersionID) ||pHalData->AntDivCfg==0) -+ return; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ if(pDM_SWAT_Table->CurAntenna == Antenna_A) -+ { -+ pHalData->RSSI_sum_A += RxPWDBAll; -+ pHalData->RSSI_cnt_A++; -+ } -+ else -+ { -+ pHalData->RSSI_sum_B+= RxPWDBAll; -+ pHalData->RSSI_cnt_B++; -+ -+ } -+ //DBG_8192C("%s Ant_(%s),RSSI_sum(%d),RSSI_cnt(%d)\n",__FUNCTION__,(2==pHalData->CurAntenna)?"A":"B",pHalData->RSSI_sum,pHalData->RSSI_cnt); -+ } -+ -+} -+ -+ -+ -+static VOID -+dm_SW_AntennaSwitchInit( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ SWAT_T *pDM_SWAT_Table = &pdmpriv->DM_SWAT_Table; -+ -+ pHalData->RSSI_sum_A = 0; -+ pHalData->RSSI_sum_B = 0; -+ pHalData->RSSI_cnt_A = 0; -+ pHalData->RSSI_cnt_B = 0; -+ -+ pDM_SWAT_Table->CurAntenna = pHalData->CurAntenna; -+ pDM_SWAT_Table->PreAntenna = pHalData->CurAntenna; -+ pDM_SWAT_Table->try_flag = 0xff; -+ pDM_SWAT_Table->PreRSSI = 0; -+ pDM_SWAT_Table->bTriggerAntennaSwitch = 0; -+ pDM_SWAT_Table->SelectAntennaMap=0xAA; -+ -+ // Move the timer initialization to InitializeVariables function. -+ //PlatformInitializeTimer(Adapter, &pMgntInfo->SwAntennaSwitchTimer, (RT_TIMER_CALL_BACK)dm_SW_AntennaSwitchCallback, NULL, "SwAntennaSwitchTimer"); -+} -+ -+#endif -+ -+//#define RSSI_CCK 0 -+//#define RSSI_OFDM 1 -+static void dm_RSSIMonitorInit( -+ IN PADAPTER Adapter -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ pdmpriv->OFDM_Pkt_Cnt = 0; -+ pdmpriv->RSSI_Select = RSSI_DEFAULT; -+} -+ -+static void dm_RSSIMonitorCheck( -+ IN PADAPTER Adapter -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _FALSE) -+ return; -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE |WIFI_ADHOC_STATE) == _TRUE ) -+ { -+ if(Adapter->stapriv.asoc_sta_count < 2) -+ return; -+ } -+ -+ if(pdmpriv->OFDM_Pkt_Cnt == 0) -+ pdmpriv->RSSI_Select = RSSI_CCK; -+ else -+ pdmpriv->RSSI_Select = RSSI_OFDM; -+ -+ pdmpriv->OFDM_Pkt_Cnt = 0; -+ //DBG_8192C("RSSI_Select=%s OFDM_Pkt_Cnt(%d)\n", -+ //(pdmpriv->RSSI_Select == RSSI_OFDM)?"RSSI_OFDM":"RSSI_CCK", -+ //pdmpriv->OFDM_Pkt_Cnt); -+} -+ -+//============================================================ -+// functions -+//============================================================ -+void rtl8192c_init_dm_priv(IN PADAPTER Adapter) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ //_rtw_memset(pdmpriv, 0, sizeof(struct dm_priv)); -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&(pdmpriv->SwAntennaSwitchTimer), Adapter->pnetdev , dm_SW_AntennaSwitchCallback, Adapter); -+#endif -+#endif -+} -+ -+void rtl8192c_deinit_dm_priv(IN PADAPTER Adapter) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ _cancel_timer_ex(&pdmpriv->SwAntennaSwitchTimer); -+#endif -+} -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+void dm_InitHybridAntDiv(IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(IS_92C_SERIAL(pHalData->VersionID) ||pHalData->AntDivCfg==0) -+ return; -+ -+ //Set OFDM HW RX Antenna Diversity -+ PHY_SetBBReg(Adapter,0xc50, BIT7, 1); //Enable Hardware antenna switch -+ PHY_SetBBReg(Adapter,0x870, BIT9|BIT8, 0); //Enable hardware control of "ANT_SEL" & "ANT_SELB" -+ PHY_SetBBReg(Adapter,0xCA4, BIT11, 0); //Switch to another antenna by checking pwdb threshold -+ PHY_SetBBReg(Adapter,0xCA4, 0x7FF, 0x080); //Pwdb threshold=8dB -+ PHY_SetBBReg(Adapter,0xC54, BIT23, 1); //Decide final antenna by comparing 2 antennas' pwdb -+ PHY_SetBBReg(Adapter,0x874, BIT23, 0); //No update ANTSEL during GNT_BT=1 -+ PHY_SetBBReg(Adapter,0x80C, BIT21, 1); //TX atenna selection from tx_info -+ //Set CCK HW RX Antenna Diversity -+ PHY_SetBBReg(Adapter,0xA00, BIT15, 1);//Enable antenna diversity -+ PHY_SetBBReg(Adapter,0xA0C, BIT4, 0); //Antenna diversity decision period = 32 sample -+ PHY_SetBBReg(Adapter,0xA0C, 0xf, 0xf); //Threshold for antenna diversity. Check another antenna power if input power < ANT_lim*4 -+ PHY_SetBBReg(Adapter,0xA10, BIT13, 1); //polarity ana_A=1 and ana_B=0 -+ PHY_SetBBReg(Adapter,0xA14, 0x1f, 0x8); //default antenna power = inpwr*(0.5 + r_ant_step/16) -+ -+ pHalData->CCK_Ant1_Cnt = 0; -+ pHalData->CCK_Ant2_Cnt = 0; -+ pHalData->OFDM_Ant1_Cnt = 0; -+ pHalData->OFDM_Ant2_Cnt = 0; -+} -+ -+ -+#define RxDefaultAnt1 0x65a9 -+#define RxDefaultAnt2 0x569a -+ -+void dm_SelectRXDefault(IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(IS_92C_SERIAL(pHalData->VersionID) ||pHalData->AntDivCfg==0) -+ return; -+ -+ //DbgPrint(" Ant1_Cnt=%d, Ant2_Cnt=%d\n", pHalData->Ant1_Cnt, pHalData->Ant2_Cnt); -+ //DBG_8192C(" CCK_Ant1_Cnt = %d, CCK_Ant2_Cnt = %d\n", pHalData->CCK_Ant1_Cnt, pHalData->CCK_Ant2_Cnt); -+ //DBG_8192C(" OFDM_Ant1_Cnt = %d, OFDM_Ant2_Cnt = %d\n", pHalData->OFDM_Ant1_Cnt, pHalData->OFDM_Ant2_Cnt); -+ if((pHalData->OFDM_Ant1_Cnt == 0) && (pHalData->OFDM_Ant2_Cnt == 0)) -+ { -+ if((pHalData->CCK_Ant1_Cnt + pHalData->CCK_Ant2_Cnt) >=10 ) -+ { -+ if(pHalData->CCK_Ant1_Cnt > (5*pHalData->CCK_Ant2_Cnt)) -+ { -+ DBG_8192C(" RX Default = Ant1\n"); -+ PHY_SetBBReg(Adapter, 0x858, 0xFFFF, RxDefaultAnt1); -+ } -+ else if(pHalData->CCK_Ant2_Cnt > (5*pHalData->CCK_Ant1_Cnt)) -+ { -+ DBG_8192C(" RX Default = Ant2\n"); -+ PHY_SetBBReg(Adapter, 0x858, 0xFFFF, RxDefaultAnt2); -+ } -+ else if(pHalData->CCK_Ant1_Cnt > pHalData->CCK_Ant2_Cnt) -+ { -+ DBG_8192C(" RX Default = Ant2\n"); -+ PHY_SetBBReg(Adapter, 0x858, 0xFFFF, RxDefaultAnt2); -+ } -+ else -+ { -+ DBG_8192C(" RX Default = Ant1\n"); -+ PHY_SetBBReg(Adapter, 0x858, 0xFFFF, RxDefaultAnt1); -+ } -+ pHalData->CCK_Ant1_Cnt = 0; -+ pHalData->CCK_Ant2_Cnt = 0; -+ pHalData->OFDM_Ant1_Cnt = 0; -+ pHalData->OFDM_Ant2_Cnt = 0; -+ } -+ } -+ else -+ { -+ if(pHalData->OFDM_Ant1_Cnt > pHalData->OFDM_Ant2_Cnt) -+ { -+ DBG_8192C(" RX Default = Ant1\n"); -+ PHY_SetBBReg(Adapter, 0x858, 0xFFFF, RxDefaultAnt1); -+ } -+ else -+ { -+ DBG_8192C(" RX Default = Ant2\n"); -+ PHY_SetBBReg(Adapter, 0x858, 0xFFFF, RxDefaultAnt2); -+ } -+ pHalData->CCK_Ant1_Cnt = 0; -+ pHalData->CCK_Ant2_Cnt = 0; -+ pHalData->OFDM_Ant1_Cnt = 0; -+ pHalData->OFDM_Ant2_Cnt = 0; -+ } -+ -+ -+} -+ -+#endif -+ -+void -+rtl8192c_InitHalDm( -+ IN PADAPTER Adapter -+ ) -+{ -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u8 i; -+ -+#ifdef CONFIG_USB_HCI -+ dm_InitGPIOSetting(Adapter); -+#endif -+ -+ pdmpriv->DM_Type = DM_Type_ByDriver; -+ pdmpriv->DMFlag = DYNAMIC_FUNC_DISABLE; -+ pdmpriv->UndecoratedSmoothedPWDB = (-1); -+ pdmpriv->UndecoratedSmoothedCCK = (-1); -+ -+ -+ //.1 DIG INIT -+ pdmpriv->bDMInitialGainEnable = _TRUE; -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_DIG; -+ dm_DIGInit(Adapter); -+ -+ //.2 DynamicTxPower INIT -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_HP; -+ dm_InitDynamicTxPower(Adapter); -+ -+ //.3 -+ DM_InitEdcaTurbo(Adapter); -+ -+ //.4 RateAdaptive INIT -+ dm_InitRateAdaptiveMask(Adapter); -+ -+ //.5 Tx Power Tracking Init. -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_SS; -+ DM_InitializeTXPowerTracking(Adapter); -+ -+#ifdef CONFIG_BT_COEXIST -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_BT; -+ dm_InitBtCoexistDM(Adapter); -+#endif -+ -+ dm_InitDynamicBBPowerSaving(Adapter); -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_ANT_DIV; -+ dm_SW_AntennaSwitchInit(Adapter); -+#endif -+ -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_ANT_DIV; -+ dm_InitHybridAntDiv(Adapter); -+#endif -+ -+ dm_RSSIMonitorInit(Adapter); -+ -+ pdmpriv->DMFlag_tmp = pdmpriv->DMFlag; -+ -+ // Save REG_INIDATA_RATE_SEL value for TXDESC. -+ for(i = 0 ; i<32 ; i++) -+ { -+ pdmpriv->INIDATA_RATE[i] = rtw_read8(Adapter, REG_INIDATA_RATE_SEL+i) & 0x3f; -+ } -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ pdmpriv->DMFlag |= DYNAMIC_FUNC_ADAPTIVITY; -+ dm_adaptivity_init(Adapter); -+#endif -+ -+} -+ -+#ifdef CONFIG_CONCURRENT_MODE -+static void FindMinimumRSSI(PADAPTER Adapter) -+{ -+ PHAL_DATA_TYPE pbuddy_HalData; -+ struct dm_priv *pbuddy_dmpriv; -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ -+ if(!rtw_buddy_adapter_up(Adapter)) -+ return; -+ -+ pbuddy_HalData = GET_HAL_DATA(pbuddy_adapter); -+ pbuddy_dmpriv = &pbuddy_HalData->dmpriv; -+ -+ //get min. [PWDB] when both interfaces are connected -+ if((check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE -+ && Adapter->stapriv.asoc_sta_count > 2 -+ && check_buddy_fwstate(Adapter, _FW_LINKED)) || -+ (check_buddy_fwstate(Adapter, WIFI_AP_STATE) == _TRUE -+ && pbuddy_adapter->stapriv.asoc_sta_count > 2 -+ && check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_STATION_STATE) -+ && check_fwstate(pmlmepriv, _FW_LINKED) -+ && check_buddy_fwstate(Adapter,WIFI_STATION_STATE) -+ && check_buddy_fwstate(Adapter,_FW_LINKED))) -+ { -+ if(pdmpriv->UndecoratedSmoothedPWDB > pbuddy_dmpriv->UndecoratedSmoothedPWDB) -+ pdmpriv->UndecoratedSmoothedPWDB = pbuddy_dmpriv->UndecoratedSmoothedPWDB; -+ }//primary interface is not connected -+ else if((check_buddy_fwstate(Adapter, WIFI_AP_STATE) == _TRUE -+ && pbuddy_adapter->stapriv.asoc_sta_count > 2) || -+ (check_buddy_fwstate(Adapter,WIFI_STATION_STATE) -+ && check_buddy_fwstate(Adapter,_FW_LINKED))) -+ { -+ pdmpriv->UndecoratedSmoothedPWDB = pbuddy_dmpriv->UndecoratedSmoothedPWDB; -+ } -+ //secondary is not connected -+ else if((check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE -+ && Adapter->stapriv.asoc_sta_count > 2) || -+ (check_fwstate(pmlmepriv, WIFI_STATION_STATE) -+ && check_fwstate(pmlmepriv, _FW_LINKED))) -+ { -+ pbuddy_dmpriv->UndecoratedSmoothedPWDB = 0; -+ } -+ //both interfaces are not connected -+ else -+ { -+ pdmpriv->UndecoratedSmoothedPWDB = 0; -+ pbuddy_dmpriv->UndecoratedSmoothedPWDB = 0; -+ } -+ -+ //primary interface is ap mode -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE && Adapter->stapriv.asoc_sta_count > 2) -+ { -+ pbuddy_dmpriv->EntryMinUndecoratedSmoothedPWDB = 0; -+ }//secondary interface is ap mode -+ else if(check_buddy_fwstate(Adapter, WIFI_AP_STATE) == _TRUE && pbuddy_adapter->stapriv.asoc_sta_count > 2) -+ { -+ pdmpriv->EntryMinUndecoratedSmoothedPWDB = pbuddy_dmpriv->EntryMinUndecoratedSmoothedPWDB; -+ } -+ else //both interfaces are not ap mode -+ { -+ pdmpriv->EntryMinUndecoratedSmoothedPWDB = pbuddy_dmpriv->EntryMinUndecoratedSmoothedPWDB = 0; -+ } -+ -+} -+ -+#endif //CONFIG_CONCURRENT_MODE -+ -+VOID -+rtl8192c_HalDmWatchDog( -+ IN PADAPTER Adapter -+ ) -+{ -+ BOOLEAN bFwCurrentInPSMode = _FALSE; -+ BOOLEAN bFwPSAwake = _TRUE; -+ u8 hw_init_completed = _FALSE; -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+#ifdef CONFIG_CONCURRENT_MODE -+ PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; -+#endif //CONFIG_CONCURRENT_MODE -+ -+ #if defined(CONFIG_CONCURRENT_MODE) -+ if (Adapter->isprimary == _FALSE && pbuddy_adapter) { -+ hw_init_completed = pbuddy_adapter->hw_init_completed; -+ } else -+ #endif -+ { -+ hw_init_completed = Adapter->hw_init_completed; -+ } -+ -+ if (hw_init_completed == _FALSE) -+ goto skip_dm; -+ -+#ifdef CONFIG_LPS -+ #if defined(CONFIG_CONCURRENT_MODE) -+ if (Adapter->iface_type != IFACE_PORT0 && pbuddy_adapter) { -+ bFwCurrentInPSMode = pbuddy_adapter->pwrctrlpriv.bFwCurrentInPSMode; -+ rtw_hal_get_hwreg(pbuddy_adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake)); -+ } else -+ #endif -+ { -+ bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode; -+ rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake)); -+ } -+#endif -+ -+#ifdef CONFIG_P2P_PS -+ // Fw is under p2p powersaving mode, driver should stop dynamic mechanism. -+ // modifed by thomas. 2011.06.11. -+ if(Adapter->wdinfo.p2p_ps_mode) -+ bFwPSAwake = _FALSE; -+#endif // CONFIG_P2P_PS -+ -+ // Stop dynamic mechanism when: -+ // 1. RF is OFF. (No need to do DM.) -+ // 2. Fw is under power saving mode for FwLPS. (Prevent from SW/FW I/O racing.) -+ // 3. IPS workitem is scheduled. (Prevent from IPS sequence to be swapped with DM. -+ // Sometimes DM execution time is longer than 100ms such that the assertion -+ // in MgntActSet_RF_State() called by InactivePsWorkItem will be triggered by -+ // wating to long for RFChangeInProgress.) -+ // 4. RFChangeInProgress is TRUE. (Prevent from broken by IPS/HW/SW Rf off.) -+ // Noted by tynli. 2010.06.01. -+ //if(rfState == eRfOn) -+ if( (hw_init_completed == _TRUE) -+ && ((!bFwCurrentInPSMode) && bFwPSAwake)) -+ { -+ // -+ // Calculate Tx/Rx statistics. -+ // -+ dm_CheckStatistics(Adapter); -+ -+ // -+ // For PWDB monitor and record some value for later use. -+ // -+ PWDB_Monitor(Adapter); -+ -+ dm_RSSIMonitorCheck(Adapter); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->adapter_type > PRIMARY_ADAPTER) -+ goto _record_initrate; -+ -+ FindMinimumRSSI(Adapter); -+#endif -+ -+ // -+ // Dynamic Initial Gain mechanism. -+ // -+ dm_FalseAlarmCounterStatistics(Adapter); -+ dm_DIG(Adapter); -+ dm_adaptivity(Adapter); -+ -+ // -+ //Dynamic BB Power Saving Mechanism -+ // -+ dm_DynamicBBPowerSaving(Adapter); -+ -+ // -+ // Dynamic Tx Power mechanism. -+ // -+ dm_DynamicTxPower(Adapter); -+ -+ // -+ // Tx Power Tracking. -+ // -+#if MP_DRIVER == 0 -+#ifdef CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK -+ if(pmlmepriv->LinkDetectInfo.bBusyTraffic == _FALSE) -+#endif //CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK -+#endif -+ rtl8192c_dm_CheckTXPowerTracking(Adapter); -+ -+ // -+ // Rate Adaptive by Rx Signal Strength mechanism. -+ // -+ dm_RefreshRateAdaptiveMask(Adapter); -+ -+#ifdef CONFIG_BT_COEXIST -+ //BT-Coexist -+ dm_BTCoexist(Adapter); -+#endif -+ -+ // EDCA turbo -+ //update the EDCA paramter according to the Tx/RX mode -+ //update_EDCA_param(Adapter); -+ dm_CheckEdcaTurbo(Adapter); -+ -+ // -+ // Dynamically switch RTS/CTS protection. -+ // -+ //dm_CheckProtection(Adapter); -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ // -+ // Software Antenna diversity -+ // -+ dm_SW_AntennaSwitch(Adapter, SWAW_STEP_PEAK); -+#endif -+ -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ //Hybrid Antenna Diversity -+ dm_SelectRXDefault(Adapter); -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ // 20100630 Joseph: Disable Interrupt Migration mechanism temporarily because it degrades Rx throughput. -+ // Tx Migration settings. -+ //dm_InterruptMigration(Adapter); -+ -+ //if(Adapter->HalFunc.TxCheckStuckHandler(Adapter)) -+ // PlatformScheduleWorkItem(&(GET_HAL_DATA(Adapter)->HalResetWorkItem)); -+#endif -+ -+ -+_record_initrate: -+ -+ // Read REG_INIDATA_RATE_SEL value for TXDESC. -+ if(check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ pdmpriv->INIDATA_RATE[0] = rtw_read8(Adapter, REG_INIDATA_RATE_SEL) & 0x3f; -+ -+#ifdef CONFIG_TDLS -+ if(Adapter->tdlsinfo.setup_state == TDLS_LINKED_STATE) -+ { -+ u8 i=1; -+ for(; i < (Adapter->tdlsinfo.macid_index) ; i++) -+ { -+ pdmpriv->INIDATA_RATE[i] = rtw_read8(Adapter, (REG_INIDATA_RATE_SEL+i)) & 0x3f; -+ } -+ } -+#endif //CONFIG_TDLS -+ -+ } -+ else -+ { -+ u8 i; -+ for(i=1 ; i < (Adapter->stapriv.asoc_sta_count + 1); i++) -+ { -+ pdmpriv->INIDATA_RATE[i] = rtw_read8(Adapter, (REG_INIDATA_RATE_SEL+i)) & 0x3f; -+ } -+ } -+ } -+ -+skip_dm: -+ -+ // Check GPIO to determine current RF on/off and Pbc status. -+ // Check Hardware Radio ON/OFF or not -+ //if(Adapter->MgntInfo.PowerSaveControl.bGpioRfSw) -+ //{ -+ //RTPRINT(FPWR, PWRHW, ("dm_CheckRfCtrlGPIO \n")); -+ // dm_CheckRfCtrlGPIO(Adapter); -+ //} -+ -+#ifdef CONFIG_PCI_HCI -+ if(pHalData->bGpioHwWpsPbc) -+#endif -+ { -+ dm_CheckPbcGPIO(Adapter); // Add by hpfan 2008-03-11 -+ } -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c -@@ -0,0 +1,3628 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#define _RTL8192C_HAL_INIT_C_ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+#include -+#endif -+ -+static BOOLEAN -+hal_EfusePgPacketWrite2ByteHeader( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest); -+static BOOLEAN -+hal_EfusePgPacketWrite1ByteHeader( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest); -+static BOOLEAN -+hal_EfusePgPacketWriteData( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest); -+static BOOLEAN -+hal_EfusePgPacketWrite_BT( -+ IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *pData, -+ IN BOOLEAN bPseudoTest); -+ -+static VOID -+_FWDownloadEnable( -+ IN PADAPTER Adapter, -+ IN BOOLEAN enable -+ ) -+{ -+ u8 tmp; -+ -+ if(enable) -+ { -+ #ifdef DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE -+ { -+ u8 val; -+ if( (val=rtw_read8(Adapter, REG_MCUFWDL))) -+ DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __FUNCTION__, __LINE__, val); -+ } -+ #endif -+ -+ // 8051 enable -+ tmp = rtw_read8(Adapter, REG_SYS_FUNC_EN+1); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN+1, tmp|0x04); -+ -+ // MCU firmware download enable. -+ tmp = rtw_read8(Adapter, REG_MCUFWDL); -+ rtw_write8(Adapter, REG_MCUFWDL, tmp|0x01); -+ -+ // 8051 reset -+ tmp = rtw_read8(Adapter, REG_MCUFWDL+2); -+ rtw_write8(Adapter, REG_MCUFWDL+2, tmp&0xf7); -+ } -+ else -+ { -+ // MCU firmware download enable. -+ tmp = rtw_read8(Adapter, REG_MCUFWDL); -+ rtw_write8(Adapter, REG_MCUFWDL, tmp&0xfe); -+ -+ // Reserved for fw extension. -+ rtw_write8(Adapter, REG_MCUFWDL+1, 0x00); -+ } -+} -+ -+ -+#define MAX_REG_BOLCK_SIZE 196 -+#define MIN_REG_BOLCK_SIZE 8 -+ -+static int -+_BlockWrite( -+ IN PADAPTER Adapter, -+ IN PVOID buffer, -+ IN u32 size -+ ) -+{ -+ int ret = _SUCCESS; -+ -+#ifdef CONFIG_PCI_HCI -+ u32 blockSize = sizeof(u32); // Use 4-byte write to download FW -+ u8 *bufferPtr = (u8 *)buffer; -+ u32 *pu4BytePtr = (u32 *)buffer; -+ u32 i, offset, blockCount, remainSize; -+ u8 remainFW[4] = {0, 0, 0, 0}; -+ u8 *p = NULL; -+ -+ blockCount = size / blockSize; -+ remainSize = size % blockSize; -+ -+ for(i = 0 ; i < blockCount ; i++){ -+ offset = i * blockSize; -+ rtw_write32(Adapter, (FW_8192C_START_ADDRESS + offset), cpu_to_le32(*(pu4BytePtr + i))); -+ } -+ -+ p = (u8*)((u32*)(bufferPtr + blockCount * blockSize)); -+ if(remainSize){ -+ switch (remainSize) { -+ case 0: -+ break; -+ case 3: -+ remainFW[2]=*(p+2); -+ case 2: -+ remainFW[1]=*(p+1); -+ case 1: -+ remainFW[0]=*(p); -+ ret = rtw_write32(Adapter, (FW_8192C_START_ADDRESS + blockCount * blockSize), -+ le32_to_cpu(*(u32*)remainFW)); -+ } -+ return ret; -+ } -+#else -+ -+#ifdef SUPPORTED_BLOCK_IO -+ u32 blockSize = MAX_REG_BOLCK_SIZE; // Use 196-byte write to download FW -+ u32 blockSize2 = MIN_REG_BOLCK_SIZE; -+#else -+ u32 blockSize = sizeof(u32); // Use 4-byte write to download FW -+ u32* pu4BytePtr = (u32*)buffer; -+ u32 blockSize2 = sizeof(u8); -+#endif -+ u8* bufferPtr = (u8*)buffer; -+ u32 i, offset = 0, offset2, blockCount, remainSize, remainSize2; -+ -+ blockCount = size / blockSize; -+ remainSize = size % blockSize; -+ -+ for(i = 0 ; i < blockCount ; i++){ -+ offset = i * blockSize; -+ #ifdef SUPPORTED_BLOCK_IO -+ ret = rtw_writeN(Adapter, (FW_8192C_START_ADDRESS + offset), blockSize, (bufferPtr + offset)); -+ #else -+ ret = rtw_write32(Adapter, (FW_8192C_START_ADDRESS + offset), le32_to_cpu(*(pu4BytePtr + i))); -+ #endif -+ -+ if(ret == _FAIL) -+ goto exit; -+ } -+ -+ if(remainSize){ -+ #if defined(SUPPORTED_BLOCK_IO) && defined(DBG_BLOCK_WRITE_ISSUE) //Can this be enabled? -+ offset = blockCount * blockSize; -+ ret = rtw_writeN(Adapter, (FW_8192C_START_ADDRESS + offset), remainSize, (bufferPtr + offset)); -+ goto exit; -+ #endif -+ offset2 = blockCount * blockSize; -+ blockCount = remainSize / blockSize2; -+ remainSize2 = remainSize % blockSize2; -+ -+ for(i = 0 ; i < blockCount ; i++){ -+ offset = offset2 + i * blockSize2; -+ #ifdef SUPPORTED_BLOCK_IO -+ ret = rtw_writeN(Adapter, (FW_8192C_START_ADDRESS + offset), blockSize2, (bufferPtr + offset)); -+ #else -+ ret = rtw_write8(Adapter, (FW_8192C_START_ADDRESS + offset ), *(bufferPtr + offset)); -+ #endif -+ -+ if(ret == _FAIL) -+ goto exit; -+ } -+ -+ if(remainSize2) -+ { -+ offset += blockSize2; -+ bufferPtr += offset; -+ -+ for(i = 0 ; i < remainSize2 ; i++){ -+ ret = rtw_write8(Adapter, (FW_8192C_START_ADDRESS + offset + i), *(bufferPtr + i)); -+ -+ if(ret == _FAIL) -+ goto exit; -+ } -+ } -+ } -+#endif -+ -+exit: -+ return ret; -+} -+ -+static int -+_PageWrite( -+ IN PADAPTER Adapter, -+ IN u32 page, -+ IN PVOID buffer, -+ IN u32 size -+ ) -+{ -+ u8 value8; -+ u8 u8Page = (u8) (page & 0x07) ; -+ -+ value8 = (rtw_read8(Adapter, REG_MCUFWDL+2)& 0xF8 ) | u8Page ; -+ rtw_write8(Adapter, REG_MCUFWDL+2,value8); -+ return _BlockWrite(Adapter,buffer,size); -+} -+ -+static VOID -+_FillDummy( -+ u8* pFwBuf, -+ u32* pFwLen -+ ) -+{ -+ u32 FwLen = *pFwLen; -+ u8 remain = (u8)(FwLen%4); -+ remain = (remain==0)?0:(4-remain); -+ -+ while(remain>0) -+ { -+ pFwBuf[FwLen] = 0; -+ FwLen++; -+ remain--; -+ } -+ -+ *pFwLen = FwLen; -+} -+ -+static int -+_WriteFW( -+ IN PADAPTER Adapter, -+ IN PVOID buffer, -+ IN u32 size -+ ) -+{ -+ // Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. -+ // We can remove _ReadChipVersion from ReadAdapterInfo8192C later. -+ -+ int ret = _SUCCESS; -+ u32 pageNums,remainSize ; -+ u32 page,offset; -+ u8* bufferPtr = (u8*)buffer; -+ -+#ifdef CONFIG_PCI_HCI -+ // 20100120 Joseph: Add for 88CE normal chip. -+ // Fill in zero to make firmware image to dword alignment. -+// _FillDummy(bufferPtr, &size); -+#endif -+ -+ pageNums = size / MAX_PAGE_SIZE ; -+ //RT_ASSERT((pageNums <= 4), ("Page numbers should not greater then 4 \n")); -+ remainSize = size % MAX_PAGE_SIZE; -+ -+ for(page = 0; page < pageNums; page++){ -+ offset = page *MAX_PAGE_SIZE; -+ ret = _PageWrite(Adapter,page, (bufferPtr+offset),MAX_PAGE_SIZE); -+ -+ if(ret == _FAIL) -+ goto exit; -+ } -+ if(remainSize){ -+ offset = pageNums *MAX_PAGE_SIZE; -+ page = pageNums; -+ ret = _PageWrite(Adapter,page, (bufferPtr+offset),remainSize); -+ -+ if(ret == _FAIL) -+ goto exit; -+ } -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("_WriteFW Done- for Normal chip.\n")); -+ -+exit: -+ return ret; -+} -+ -+static int _FWFreeToGo( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 counter = 0; -+ u32 value32; -+ u32 restarted = _FALSE; -+ -+ // polling CheckSum report -+ do{ -+ value32 = rtw_read32(Adapter, REG_MCUFWDL); -+ }while((counter ++ < POLLING_READY_TIMEOUT_COUNT) && (!(value32 & FWDL_ChkSum_rpt))); -+ -+ if(counter >= POLLING_READY_TIMEOUT_COUNT){ -+ DBG_8192C("chksum report faill ! REG_MCUFWDL:0x%08x\n",value32); -+ return _FAIL; -+ } else { -+ //DBG_8192C("chksum report success ! REG_MCUFWDL:0x%08x, counter:%u\n",value32, counter); -+ } -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Checksum report OK ! REG_MCUFWDL:0x%08x .\n",value32)); -+ -+ -+ value32 = rtw_read32(Adapter, REG_MCUFWDL); -+ value32 |= MCUFWDL_RDY; -+ value32 &= ~WINTINI_RDY; -+ rtw_write32(Adapter, REG_MCUFWDL, value32); -+ -+ -+POLLING_FW_READY: -+ // polling for FW ready -+ counter = 0; -+ do -+ { -+ if(rtw_read32(Adapter, REG_MCUFWDL) & WINTINI_RDY){ -+ //RT_TRACE(COMP_INIT, DBG_SERIOUS, ("Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",PlatformIORead4Byte(Adapter, REG_MCUFWDL)) ); -+ return _SUCCESS; -+ } -+ rtw_udelay_os(5); -+ }while(counter++ < POLLING_READY_TIMEOUT_COUNT); -+ -+ DBG_8192C("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", rtw_read32(Adapter, REG_MCUFWDL)); -+ -+ if(restarted == _FALSE) { -+ u8 tmp = rtw_read8(Adapter, REG_SYS_FUNC_EN+1); -+ DBG_8192C("Reset 51 write8 REG_SYS_FUNC_EN:0x%04x\n", tmp & ~BIT2); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN+1, tmp & ~BIT2); -+ DBG_8192C("Reset 51 write8 REG_SYS_FUNC_EN:0x%04x\n", tmp|BIT2); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN+1, tmp|BIT2); -+ restarted = _TRUE; -+ goto POLLING_FW_READY; -+ } -+ -+ -+ return _FAIL; -+ -+} -+ -+ -+VOID -+rtl8192c_FirmwareSelfReset( -+ IN PADAPTER Adapter -+) -+{ -+ u8 u1bTmp; -+ u8 Delay = 100; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if((pHalData->FirmwareVersion > 0x21) || -+ (pHalData->FirmwareVersion == 0x21 && -+ pHalData->FirmwareSubVersion >= 0x01)) // after 88C Fw v33.1 -+ { -+ //0x1cf=0x20. Inform 8051 to reset. 2009.12.25. tynli_test -+ rtw_write8(Adapter, REG_HMETFR+3, 0x20); -+ -+ u1bTmp = rtw_read8(Adapter, REG_SYS_FUNC_EN+1); -+ while(u1bTmp&BIT2) -+ { -+ Delay--; -+ if(Delay == 0) -+ break; -+ rtw_udelay_os(50); -+ u1bTmp = rtw_read8(Adapter, REG_SYS_FUNC_EN+1); -+ } -+ -+ if((u1bTmp&BIT2) && (Delay == 0)) -+ { -+ DBG_8192C("FirmwareDownload92C():fw reset by itself Fail!!!!!! 0x03 = %x\n", u1bTmp); -+ //RT_ASSERT(FALSE, ("PowerOffAdapter8192CE(): 0x03 = %x\n", u1bTmp)); -+ #ifdef DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE -+ { -+ u8 val; -+ if( (val=rtw_read8(Adapter, REG_MCUFWDL))) -+ DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __FUNCTION__, __LINE__, val); -+ } -+ #endif -+ rtw_write8(Adapter,REG_SYS_FUNC_EN+1,(rtw_read8(Adapter, REG_SYS_FUNC_EN+1)&~BIT2)); -+ } -+ -+ DBG_8192C("%s =====> 8051 reset success (%d) .\n", __FUNCTION__ ,Delay); -+ } -+} -+ -+#ifdef CONFIG_FILE_FWIMG -+extern char *rtw_fw_file_path; -+u8 FwBuffer8192C[FW_8192C_SIZE]; -+#endif //CONFIG_FILE_FWIMG -+// -+// Description: -+// Download 8192C firmware code. -+// -+// -+int FirmwareDownload92C( -+ IN PADAPTER Adapter, -+ IN BOOLEAN bUsedWoWLANFw -+) -+{ -+ int rtStatus = _SUCCESS; -+ u8 writeFW_retry = 0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ s8 R92CFwImageFileName_TSMC[] ={RTL8192C_FW_TSMC_IMG}; -+ s8 R92CFwImageFileName_UMC[] ={RTL8192C_FW_UMC_IMG}; -+ s8 R92CFwImageFileName_UMC_B[] ={RTL8192C_FW_UMC_B_IMG}; -+#ifdef CONFIG_WOWLAN -+ s8 R92CFwImageFileName_TSMC_WW[] ={RTL8192C_FW_TSMC_WW_IMG}; -+ s8 R92CFwImageFileName_UMC_WW[] ={RTL8192C_FW_UMC_WW_IMG}; -+ s8 R92CFwImageFileName_UMC_B_WW[] ={RTL8192C_FW_UMC_B_WW_IMG}; -+#endif //CONFIG_WOWLAN -+ -+ //s8 R8723FwImageFileName_UMC[] ={RTL8723_FW_UMC_IMG}; -+ u8* FwImage = NULL; -+ u32 FwImageLen = 0; -+ char* pFwImageFileName; -+#ifdef CONFIG_WOWLAN -+ u8* FwImageWoWLAN; -+ u32 FwImageWoWLANLen; -+ char* pFwImageFileName_WoWLAN; -+#endif //CONFIG_WOWLAN -+ u8* pucMappedFile = NULL; -+ //vivi, merge 92c and 92s into one driver, 20090817 -+ //vivi modify this temply, consider it later!!!!!!!! -+ //PRT_FIRMWARE pFirmware = GET_FIRMWARE_819X(Adapter); -+ //PRT_FIRMWARE_92C pFirmware = GET_FIRMWARE_8192C(Adapter); -+ PRT_FIRMWARE_92C pFirmware = NULL; -+ PRT_8192C_FIRMWARE_HDR pFwHdr = NULL; -+ u8 *pFirmwareBuf; -+ u32 FirmwareLen; -+ -+ pFirmware = (PRT_FIRMWARE_92C)rtw_zvmalloc(sizeof(RT_FIRMWARE_92C)); -+ -+ if(!pFirmware) -+ { -+ rtStatus = _FAIL; -+ goto Exit; -+ } -+ -+ if(IS_VENDOR_UMC_A_CUT(pHalData->VersionID) && !IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ pFwImageFileName = R92CFwImageFileName_UMC; -+ FwImage = Rtl819XFwUMCACutImageArray; -+ FwImageLen = UMCACutImgArrayLength; -+#ifdef CONFIG_WOWLAN -+ pFwImageFileName_WoWLAN = R92CFwImageFileName_UMC_WW; -+ FwImageWoWLAN= Rtl8192C_FwUMCWWImageArray; -+ FwImageWoWLANLen =UMCACutWWImgArrayLength ; -+#endif //CONFIG_WOWLAN -+ DBG_8192C(" ===> FirmwareDownload91C() fw:Rtl819XFwImageArray_UMC\n"); -+ } -+ else if(IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)) -+ { -+ // The ROM code of UMC B-cut Fw is the same as TSMC. by tynli. 2011.01.14. -+ pFwImageFileName = R92CFwImageFileName_UMC_B; -+ FwImage = Rtl819XFwUMCBCutImageArray; -+ FwImageLen = UMCBCutImgArrayLength; -+#ifdef CONFIG_WOWLAN -+ pFwImageFileName_WoWLAN = R92CFwImageFileName_UMC_B_WW; -+ FwImageWoWLAN= Rtl8192C_FwUMCBCutWWImageArray; -+ FwImageWoWLANLen =UMCBCutWWImgArrayLength ; -+#endif //CONFIG_WOWLAN -+ -+ DBG_8192C(" ===> FirmwareDownload91C() fw:Rtl819XFwImageArray_UMC_B\n"); -+ } -+ else -+ { -+ pFwImageFileName = R92CFwImageFileName_TSMC; -+ FwImage = Rtl819XFwTSMCImageArray; -+ FwImageLen = TSMCImgArrayLength; -+#ifdef CONFIG_WOWLAN -+ pFwImageFileName_WoWLAN = R92CFwImageFileName_TSMC_WW; -+ FwImageWoWLAN= Rtl8192C_FwTSMCWWImageArray; -+ FwImageWoWLANLen =TSMCWWImgArrayLength ; -+#endif //CONFIG_WOWLAN -+ DBG_8192C(" ===> FirmwareDownload91C() fw:Rtl819XFwImageArray_TSMC\n"); -+ } -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, (" ===> FirmwareDownload91C() fw:%s\n", pFwImageFileName)); -+ -+ #ifdef CONFIG_FILE_FWIMG -+ if(rtw_is_file_readable(rtw_fw_file_path) == _TRUE) -+ { -+ DBG_871X("%s accquire FW from file:%s\n", __FUNCTION__, rtw_fw_file_path); -+ pFirmware->eFWSource = FW_SOURCE_IMG_FILE; // We should decided by Reg. -+ } -+ else -+ #endif //CONFIG_FILE_FWIMG -+ { -+ DBG_871X("%s accquire FW from embedded image\n", __FUNCTION__); -+ pFirmware->eFWSource = FW_SOURCE_HEADER_FILE; -+ } -+ -+ -+ switch(pFirmware->eFWSource) -+ { -+ case FW_SOURCE_IMG_FILE: -+ -+ #ifdef CONFIG_FILE_FWIMG -+ rtStatus = rtw_retrive_from_file(rtw_fw_file_path, FwBuffer8192C, FW_8192C_SIZE); -+ pFirmware->ulFwLength = rtStatus>=0?rtStatus:0; -+ pFirmware->szFwBuffer = FwBuffer8192C; -+ #endif //CONFIG_FILE_FWIMG -+ -+ if(pFirmware->ulFwLength <= 0) -+ { -+ rtStatus = _FAIL; -+ goto Exit; -+ } -+ break; -+ case FW_SOURCE_HEADER_FILE: -+ if(FwImageLen > FW_8192C_SIZE){ -+ rtStatus = _FAIL; -+ //RT_TRACE(COMP_INIT, DBG_SERIOUS, ("Firmware size exceed 0x%X. Check it.\n", FW_8192C_SIZE) ); -+ DBG_871X("Firmware size exceed 0x%X. Check it.\n", FW_8192C_SIZE); -+ goto Exit; -+ } -+ -+ pFirmware->szFwBuffer = FwImage; -+ pFirmware->ulFwLength = FwImageLen; -+#ifdef CONFIG_WOWLAN -+ { -+ pFirmware->szWoWLANFwBuffer=FwImageWoWLAN; -+ pFirmware->ulWoWLANFwLength = FwImageWoWLANLen; -+ } -+#endif //CONFIG_WOWLAN -+ -+ break; -+ } -+ -+#ifdef CONFIG_WOWLAN -+ if(bUsedWoWLANFw) { -+ pFirmwareBuf = pFirmware->szWoWLANFwBuffer; -+ FirmwareLen = pFirmware->ulWoWLANFwLength; -+ pFwHdr = (PRT_8192C_FIRMWARE_HDR)pFirmware->szWoWLANFwBuffer; -+ } -+ else -+#endif //CONFIG_WOWLAN -+ { -+ #ifdef DBG_FW_STORE_FILE_PATH //used to store firmware to file... -+ if(pFirmware->ulFwLength > 0) -+ { -+ rtw_store_to_file(DBG_FW_STORE_FILE_PATH, pFirmware->szFwBuffer, pFirmware->ulFwLength); -+ } -+ #endif -+ -+ pFirmwareBuf = pFirmware->szFwBuffer; -+ FirmwareLen = pFirmware->ulFwLength; -+ -+ // To Check Fw header. Added by tynli. 2009.12.04. -+ pFwHdr = (PRT_8192C_FIRMWARE_HDR)pFirmware->szFwBuffer; -+ } -+ pHalData->FirmwareVersion = le16_to_cpu(pFwHdr->Version); -+ pHalData->FirmwareSubVersion = le16_to_cpu(pFwHdr->Subversion); -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, (" FirmwareVersion(%#x), Signature(%#x)\n", -+ // Adapter->MgntInfo.FirmwareVersion, pFwHdr->Signature)); -+ -+ DBG_8192C("fw_ver=v%d, fw_subver=%d, sig=0x%x\n", -+ pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, le16_to_cpu(pFwHdr->Signature)&0xFFF0); -+ -+ if(IS_FW_HEADER_EXIST(pFwHdr)) -+ { -+ //RT_TRACE(COMP_INIT, DBG_LOUD,("Shift 32 bytes for FW header!!\n")); -+ pFirmwareBuf = pFirmwareBuf + 32; -+ FirmwareLen = FirmwareLen -32; -+ } -+ -+ // Suggested by Filen. If 8051 is running in RAM code, driver should inform Fw to reset by itself, -+ // or it will cause download Fw fail. 2010.02.01. by tynli. -+ if(rtw_read8(Adapter, REG_MCUFWDL)&BIT7) //8051 RAM code -+ { -+ rtl8192c_FirmwareSelfReset(Adapter); -+ rtw_write8(Adapter, REG_MCUFWDL, 0x00); -+ } -+ -+ -+ _FWDownloadEnable(Adapter, _TRUE); -+ while(1) { -+ u8 tmp8; -+ tmp8 = rtw_read8(Adapter, REG_MCUFWDL); -+ -+ //reset the FWDL chksum -+ rtw_write8(Adapter, REG_MCUFWDL, tmp8|FWDL_ChkSum_rpt); -+ -+ //tmp8 = rtw_read8(Adapter, REG_MCUFWDL); -+ //DBG_8192C("Before _WriteFW, REG_MCUFWDL:0x%02x, writeFW_retry:%u\n", tmp8, writeFW_retry); -+ -+ rtStatus = _WriteFW(Adapter, pFirmwareBuf, FirmwareLen); -+ -+ //tmp8 = rtw_read8(Adapter, REG_MCUFWDL); -+ //DBG_8192C("After _WriteFW, REG_MCUFWDL:0x%02x, rtStatus:%d\n", tmp8, rtStatus); -+ -+ if(rtStatus == _SUCCESS || ++writeFW_retry>3) -+ break; -+ } -+ _FWDownloadEnable(Adapter, _FALSE); -+ -+ if(_SUCCESS != rtStatus){ -+ DBG_8192C("DL Firmware failed!\n"); -+ goto Exit; -+ } -+ -+ rtStatus = _FWFreeToGo(Adapter); -+ if(_SUCCESS != rtStatus){ -+ DBG_8192C("DL Firmware failed!\n"); -+ goto Exit; -+ } -+ //RT_TRACE(COMP_INIT, DBG_LOUD, (" Firmware is ready to run!\n")); -+ -+Exit: -+ -+ if(pFirmware) { -+ rtw_vmfree((u8*)pFirmware, sizeof(RT_FIRMWARE_92C)); -+ } -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, (" <=== FirmwareDownload91C()\n")); -+ return rtStatus; -+ -+} -+ -+VOID -+InitializeFirmwareVars92C( -+ IN PADAPTER Adapter -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ // Init Fw LPS related. -+ Adapter->pwrctrlpriv.bFwCurrentInPSMode = _FALSE; -+ -+ //Init H2C counter. by tynli. 2009.12.09. -+ pHalData->LastHMEBoxNum = 0; -+} -+ -+#ifdef CONFIG_WOWLAN -+//=========================================== -+ -+// -+// Description: Prepare some information to Fw for WoWLAN. -+// (1) Download wowlan Fw. -+// (2) Download RSVD page packets. -+// (3) Enable AP offload if needed. -+// -+// 2011.04.12 by tynli. -+// -+VOID -+SetFwRelatedForWoWLAN8192CU( -+ IN PADAPTER padapter, -+ IN u8 bHostIsGoingtoSleep -+) -+{ -+ int status=_FAIL; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ u8 bRecover = _FALSE; -+ -+ if(bHostIsGoingtoSleep) -+ { -+ // -+ // 1. Before WoWLAN we need to re-download WoWLAN Fw. -+ // -+ status = FirmwareDownload92C(padapter, bHostIsGoingtoSleep); -+ if(status != _SUCCESS) -+ { -+ DBG_8192C("ConfigFwRelatedForWoWLAN8192CU(): Re-Download Firmware failed!!\n"); -+ return; -+ } -+ else -+ { -+ DBG_8192C("ConfigFwRelatedForWoWLAN8192CU(): Re-Download Firmware Success !!\n"); -+ } -+ -+ // -+ // 2. Re-Init the variables about Fw related setting. -+ // -+ InitializeFirmwareVars92C(padapter); -+ -+ -+ } -+} -+#endif // CONFIG_WOWLAN -+ -+#ifdef CONFIG_BT_COEXIST -+static void _update_bt_param(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ struct registry_priv *registry_par = &padapter->registrypriv; -+ -+ if(2 != registry_par->bt_iso) -+ pbtpriv->BT_Ant_isolation = registry_par->bt_iso;// 0:Low, 1:High, 2:From Efuse -+ -+ if(registry_par->bt_sco == 1) // 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter, 4.Busy, 5.OtherBusy -+ pbtpriv->BT_Service = BT_OtherAction; -+ else if(registry_par->bt_sco==2) -+ pbtpriv->BT_Service = BT_SCO; -+ else if(registry_par->bt_sco==4) -+ pbtpriv->BT_Service = BT_Busy; -+ else if(registry_par->bt_sco==5) -+ pbtpriv->BT_Service = BT_OtherBusy; -+ else -+ pbtpriv->BT_Service = BT_Idle; -+ -+ pbtpriv->BT_Ampdu = registry_par->bt_ampdu; -+ pbtpriv->bCOBT = _TRUE; -+#if 1 -+ DBG_8192C("BT Coexistance = %s\n", (pbtpriv->BT_Coexist==_TRUE)?"enable":"disable"); -+ if(pbtpriv->BT_Coexist) -+ { -+ if(pbtpriv->BT_Ant_Num == Ant_x2) -+ { -+ DBG_8192C("BlueTooth BT_Ant_Num = Antx2\n"); -+ } -+ else if(pbtpriv->BT_Ant_Num == Ant_x1) -+ { -+ DBG_8192C("BlueTooth BT_Ant_Num = Antx1\n"); -+ } -+ switch(pbtpriv->BT_CoexistType) -+ { -+ case BT_2Wire: -+ DBG_8192C("BlueTooth BT_CoexistType = BT_2Wire\n"); -+ break; -+ case BT_ISSC_3Wire: -+ DBG_8192C("BlueTooth BT_CoexistType = BT_ISSC_3Wire\n"); -+ break; -+ case BT_Accel: -+ DBG_8192C("BlueTooth BT_CoexistType = BT_Accel\n"); -+ break; -+ case BT_CSR_BC4: -+ DBG_8192C("BlueTooth BT_CoexistType = BT_CSR_BC4\n"); -+ break; -+ case BT_RTL8756: -+ DBG_8192C("BlueTooth BT_CoexistType = BT_RTL8756\n"); -+ break; -+ default: -+ DBG_8192C("BlueTooth BT_CoexistType = Unknown\n"); -+ break; -+ } -+ DBG_8192C("BlueTooth BT_Ant_isolation = %d\n", pbtpriv->BT_Ant_isolation); -+ -+ -+ switch(pbtpriv->BT_Service) -+ { -+ case BT_OtherAction: -+ DBG_8192C("BlueTooth BT_Service = BT_OtherAction\n"); -+ break; -+ case BT_SCO: -+ DBG_8192C("BlueTooth BT_Service = BT_SCO\n"); -+ break; -+ case BT_Busy: -+ DBG_8192C("BlueTooth BT_Service = BT_Busy\n"); -+ break; -+ case BT_OtherBusy: -+ DBG_8192C("BlueTooth BT_Service = BT_OtherBusy\n"); -+ break; -+ default: -+ DBG_8192C("BlueTooth BT_Service = BT_Idle\n"); -+ break; -+ } -+ -+ DBG_8192C("BT_RadioSharedType = 0x%x\n", pbtpriv->BT_RadioSharedType); -+ } -+#endif -+ -+} -+ -+ -+#define GET_BT_COEXIST(priv) (&priv->bt_coexist) -+ -+void rtl8192c_ReadBluetoothCoexistInfo( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ u8 rf_opt4; -+ -+ if(AutoloadFail){ -+ pbtpriv->BT_Coexist = _FALSE; -+ pbtpriv->BT_CoexistType= BT_2Wire; -+ pbtpriv->BT_Ant_Num = Ant_x2; -+ pbtpriv->BT_Ant_isolation= 0; -+ pbtpriv->BT_RadioSharedType = BT_Radio_Shared; -+ return; -+ } -+ -+ pbtpriv->BT_Coexist = (((PROMContent[EEPROM_RF_OPT1]&BOARD_TYPE_NORMAL_MASK)>>5) == BOARD_USB_COMBO)?_TRUE:_FALSE; // bit [7:5] -+ rf_opt4 = PROMContent[EEPROM_RF_OPT4]; -+ pbtpriv->BT_CoexistType = ((rf_opt4&0xe)>>1); // bit [3:1] -+ pbtpriv->BT_Ant_Num = (rf_opt4&0x1); // bit [0] -+ pbtpriv->BT_Ant_isolation = ((rf_opt4&0x10)>>4); // bit [4] -+ pbtpriv->BT_RadioSharedType = ((rf_opt4&0x20)>>5); // bit [5] -+ -+ _update_bt_param(Adapter); -+ -+} -+#endif -+ -+VERSION_8192C -+rtl8192c_ReadChipVersion( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ //VERSION_8192C version; -+ u32 ChipVersion=0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ value32 = rtw_read32(Adapter, REG_SYS_CFG); -+ -+ if (value32 & TRP_VAUX_EN) -+ { -+#if 0 -+ // Test chip. -+ if(IS_HARDWARE_TYPE_8723A(Adapter)) { -+ ChipVersion |= ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0); -+ ChipVersion |= ((value32 & BT_FUNC) ? CHIP_8723: 0); // RTL8723 with BT function. -+ } -+ else { -+ version = (value32 & TYPE_ID) ?VERSION_TEST_CHIP_92C :VERSION_TEST_CHIP_88C; -+ } -+#else -+ // tynli_test. 2011.01.10. -+ if(IS_HARDWARE_TYPE_8192C(Adapter)) -+ { -+ ChipVersion = (value32 & TYPE_ID) ? VERSION_TEST_CHIP_92C : VERSION_TEST_CHIP_88C; -+ } -+ else -+ { -+ ChipVersion |= ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0); -+ ChipVersion |= ((value32 & BT_FUNC) ? CHIP_8723: 0); // RTL8723 with BT function. -+ } -+#endif -+ } -+ else -+ { -+#if 0 -+ // Normal mass production chip. -+ ChipVersion = NORMAL_CHIP; -+#if !RTL8723_FPGA_TRUE_PHY_VERIFICATION -+ ChipVersion |= ((value32 & TYPE_ID) ? CHIP_92C : 0); -+#endif -+ ChipVersion |= ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0); -+ ChipVersion |= ((value32 & BT_FUNC) ? CHIP_8723: 0); // RTL8723 with BT function. -+ if(IS_8723_SERIES(ChipVersion)) -+ { -+ if(IS_VENDOR_UMC(ChipVersion)) -+ ChipVersion |= ((value32 & CHIP_VER_RTL_MASK) ? CHIP_VENDOR_UMC_B_CUT : 0); -+ } -+ else -+ { -+ // Mark out by tynli. UMC B-cut IC will not set the SYS_CFG[19] to UMC -+ // because we do not want the custmor to know. 2011.01.11. -+ //if(IS_VENDOR_UMC(ChipVersion)) -+ { -+ // To check the value of B-cut. by tynli. 2011.01.11. -+ u1bTmp = (u1Byte)((value32 & CHIP_VER_RTL_MASK)>>12); -+ if(u1bTmp == 1) -+ { // B-cut -+ ChipVersion |= CHIP_VENDOR_UMC_B_CUT; -+ } -+ } -+ } -+#else -+ // Normal mass production chip. -+ ChipVersion = NORMAL_CHIP; -+//#if !RTL8723_FPGA_TRUE_PHY_VERIFICATION -+ ChipVersion |= ((value32 & TYPE_ID) ? RF_TYPE_2T2R : 0); //92c -+//#endif -+ ChipVersion |= ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0); -+ ChipVersion |= ((value32 & BT_FUNC) ? CHIP_8723: 0); // RTL8723 with BT function. -+ if(IS_HARDWARE_TYPE_8192C(Adapter)) -+ { -+ // 88/92C UMC B-cut IC will not set the SYS_CFG[19] to UMC -+ // because we do not want the custmor to know. by tynli. 2011.01.17. -+ //MSG_8192C("mask result = 0x%x is_UMC %d chipversion 0x%x\n", (value32 & CHIP_VER_RTL_MASK), IS_CHIP_VENDOR_UMC(ChipVersion), ChipVersion); -+ if((!IS_CHIP_VENDOR_UMC(ChipVersion) )&& (value32 & CHIP_VER_RTL_MASK)) -+ { -+ //MSG_8192C("chip mask result = 0x%x\n", ((value32 & CHIP_VER_RTL_MASK) | CHIP_VENDOR_UMC)); -+ ChipVersion |= ((value32 & CHIP_VER_RTL_MASK) | CHIP_VENDOR_UMC); // IC version (CUT) -+ //MSG_8192C("chip version = 0x%x\n", ChipVersion); -+ } -+ } -+ else -+ { -+ if(IS_CHIP_VENDOR_UMC(ChipVersion)) -+ ChipVersion |= ((value32 & CHIP_VER_RTL_MASK)); // IC version (CUT) -+ } -+ -+ if(IS_92C_SERIAL(ChipVersion)) -+ { -+ value32 = rtw_read32(Adapter, REG_HPON_FSM); -+ ChipVersion |= ((CHIP_BONDING_IDENTIFIER(value32) == CHIP_BONDING_92C_1T2R) ? RF_TYPE_1T2R : 0); -+ } -+ else if(IS_8723_SERIES(ChipVersion)) -+ { -+ //RT_ASSERT(IS_HARDWARE_TYPE_8723A(Adapter), ("Incorrect chip version!!\n")); -+ value32 = rtw_read32(Adapter, REG_GPIO_OUTSTS); -+ ChipVersion |= ((value32 & RF_RL_ID)>>20); //ROM code version. -+ } -+#endif -+ -+ } -+ -+ //version = (VERSION_8192C)ChipVersion; -+ -+ // For multi-function consideration. Added by Roger, 2010.10.06. -+ if(IS_8723_SERIES(ChipVersion)) -+ { -+ pHalData->MultiFunc = RT_MULTI_FUNC_NONE; -+ value32 = rtw_read32(Adapter, REG_MULTI_FUNC_CTRL); -+ pHalData->MultiFunc =(RT_MULTI_FUNC) (pHalData->MultiFunc| ((value32 & WL_FUNC_EN) ? RT_MULTI_FUNC_WIFI : 0) ); -+ pHalData->MultiFunc =(RT_MULTI_FUNC) (pHalData->MultiFunc| ((value32 & BT_FUNC_EN) ? RT_MULTI_FUNC_BT : 0) ); -+ pHalData->MultiFunc =(RT_MULTI_FUNC) (pHalData->MultiFunc| ((value32 & GPS_FUNC_EN) ? RT_MULTI_FUNC_GPS : 0) ); -+ pHalData->PolarityCtl = ((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT : RT_POLARITY_LOW_ACT); -+ //MSG_8192C("ReadChipVersion(): MultiFunc(%x), PolarityCtl(%x) \n", pHalData->MultiFunc, pHalData->PolarityCtl); -+ -+ //For regulator mode. by tynli. 2011.01.14 -+ pHalData->RegulatorMode = ((value32 & TRP_BT_EN) ? RT_LDO_REGULATOR : RT_SWITCHING_REGULATOR); -+ //MSG_8192C("ReadChipVersion(): RegulatorMode(%x) \n", pHalData->RegulatorMode); -+ } -+ -+//#if DBG -+#if 1 -+ switch(ChipVersion) -+ { -+ case VERSION_NORMAL_TSMC_CHIP_92C_1T2R: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_92C_1T2R.\n"); -+ break; -+ case VERSION_NORMAL_TSMC_CHIP_92C: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_92C.\n"); -+ break; -+ case VERSION_NORMAL_TSMC_CHIP_88C: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_88C.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_92C_A_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_A_CUT.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_88C_A_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_UMC_CHIP_88C_A_CUT.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_92C_B_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_B_CUT.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_88C_B_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMAL_UMC_CHIP_88C_B_CUT.\n"); -+ break; -+ case VERSION_TEST_CHIP_92C: -+ MSG_8192C("Chip Version ID: VERSION_TEST_CHIP_92C.\n"); -+ break; -+ case VERSION_TEST_CHIP_88C: -+ MSG_8192C("Chip Version ID: VERSION_TEST_CHIP_88C.\n"); -+ break; -+ case VERSION_TEST_UMC_CHIP_8723: -+ MSG_8192C("Chip Version ID: VERSION_TEST_UMC_CHIP_8723.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT.\n"); -+ break; -+ case VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT: -+ MSG_8192C("Chip Version ID: VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT.\n"); -+ break; -+ default: -+ MSG_8192C("Chip Version ID: ???????????????.\n"); -+ break; -+ } -+#endif -+ -+ pHalData->VersionID = ChipVersion; -+ -+ if(IS_1T2R(ChipVersion)) -+ pHalData->rf_type = RF_1T2R; -+ else if(IS_2T2R(ChipVersion)) -+ pHalData->rf_type = RF_2T2R; -+ else if(IS_8723_SERIES(ChipVersion)) -+ pHalData->rf_type = RF_1T1R; -+ else -+ pHalData->rf_type = RF_1T1R; -+ -+ MSG_8192C("RF_Type is %x!!\n", pHalData->rf_type); -+ -+ return ChipVersion; -+} -+ -+void -+rtl8192c_EfuseParseChnlPlan( -+ IN PADAPTER padapter, -+ IN u8* hwinfo, -+ IN BOOLEAN AutoLoadFail -+ ) -+{ -+ padapter->mlmepriv.ChannelPlan = hal_com_get_channel_plan( -+ padapter -+ , hwinfo?hwinfo[EEPROM_CHANNEL_PLAN]:0xFF -+ , padapter->registrypriv.channel_plan -+ , RT_CHANNEL_DOMAIN_WORLD_WIDE_13 -+ , AutoLoadFail -+ ); -+ -+ DBG_871X("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan); -+} -+ -+u8 GetEEPROMSize8192C(PADAPTER Adapter) -+{ -+ u8 size = 0; -+ u32 curRCR; -+ -+ curRCR = rtw_read16(Adapter, REG_9346CR); -+ size = (curRCR & BOOT_FROM_EEPROM) ? 6 : 4; // 6: EEPROM used is 93C46, 4: boot from E-Fuse. -+ -+ MSG_8192C("EEPROM type is %s\n", size==4 ? "E-FUSE" : "93C46"); -+ -+ return size; -+} -+ -+void rtl8192c_free_hal_data(_adapter * padapter) -+{ -+_func_enter_; -+ -+ DBG_8192C("=====> rtl8192c_free_hal_data =====\n"); -+ -+ if(padapter->HalData) -+ rtw_mfree(padapter->HalData, sizeof(HAL_DATA_TYPE)); -+ DBG_8192C("<===== rtl8192c_free_hal_data =====\n"); -+ -+_func_exit_; -+} -+ -+//=========================================================== -+// Efuse related code -+//=========================================================== -+enum{ -+ VOLTAGE_V25 = 0x03, -+ LDOE25_SHIFT = 28 , -+ }; -+ -+static VOID -+hal_EfusePowerSwitch_RTL8192C( -+ IN PADAPTER pAdapter, -+ IN u8 bWrite, -+ IN u8 PwrState) -+{ -+ u8 tempval; -+ u16 tmpV16; -+ -+ if (PwrState == _TRUE) -+ { -+ // 1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid -+ tmpV16 = rtw_read16(pAdapter,REG_SYS_ISO_CTRL); -+ if( ! (tmpV16 & PWC_EV12V ) ){ -+ tmpV16 |= PWC_EV12V ; -+ rtw_write16(pAdapter,REG_SYS_ISO_CTRL,tmpV16); -+ } -+ // Reset: 0x0000h[28], default valid -+ tmpV16 = rtw_read16(pAdapter,REG_SYS_FUNC_EN); -+ if( !(tmpV16 & FEN_ELDR) ){ -+ tmpV16 |= FEN_ELDR ; -+ rtw_write16(pAdapter,REG_SYS_FUNC_EN,tmpV16); -+ } -+ -+ // Clock: Gated(0x0008h[5]) 8M(0x0008h[1]) clock from ANA, default valid -+ tmpV16 = rtw_read16(pAdapter,REG_SYS_CLKR); -+ if( (!(tmpV16 & LOADER_CLK_EN) ) ||(!(tmpV16 & ANA8M) ) ){ -+ tmpV16 |= (LOADER_CLK_EN |ANA8M ) ; -+ rtw_write16(pAdapter,REG_SYS_CLKR,tmpV16); -+ } -+ -+ if(bWrite == _TRUE) -+ { -+ // Enable LDO 2.5V before read/write action -+ tempval = rtw_read8(pAdapter, EFUSE_TEST+3); -+ tempval &= 0x0F; -+ tempval |= (VOLTAGE_V25 << 4); -+ rtw_write8(pAdapter, EFUSE_TEST+3, (tempval | 0x80)); -+ } -+ } -+ else -+ { -+ if(bWrite == _TRUE){ -+ // Disable LDO 2.5V after read/write action -+ tempval = rtw_read8(pAdapter, EFUSE_TEST+3); -+ rtw_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F)); -+ } -+ } -+} -+ -+static VOID -+hal_EfusePowerSwitch_RTL8723( -+ IN PADAPTER pAdapter, -+ IN u8 bWrite, -+ IN u8 PwrState) -+{ -+ u8 tempval; -+ u16 tmpV16; -+ -+ if (PwrState == _TRUE) -+ { -+ rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON); -+ -+ // 1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid -+ tmpV16 = rtw_read16(pAdapter,REG_SYS_ISO_CTRL); -+ if( ! (tmpV16 & PWC_EV12V ) ){ -+ tmpV16 |= PWC_EV12V ; -+ rtw_write16(pAdapter,REG_SYS_ISO_CTRL,tmpV16); -+ } -+ // Reset: 0x0000h[28], default valid -+ tmpV16 = rtw_read16(pAdapter,REG_SYS_FUNC_EN); -+ if( !(tmpV16 & FEN_ELDR) ){ -+ tmpV16 |= FEN_ELDR ; -+ rtw_write16(pAdapter,REG_SYS_FUNC_EN,tmpV16); -+ } -+ -+ // Clock: Gated(0x0008h[5]) 8M(0x0008h[1]) clock from ANA, default valid -+ tmpV16 = rtw_read16(pAdapter,REG_SYS_CLKR); -+ if( (!(tmpV16 & LOADER_CLK_EN) ) ||(!(tmpV16 & ANA8M) ) ){ -+ tmpV16 |= (LOADER_CLK_EN |ANA8M ) ; -+ rtw_write16(pAdapter,REG_SYS_CLKR,tmpV16); -+ } -+ -+ if(bWrite == _TRUE) -+ { -+ // Enable LDO 2.5V before read/write action -+ tempval = rtw_read8(pAdapter, EFUSE_TEST+3); -+ tempval &= 0x0F; -+ tempval |= (VOLTAGE_V25 << 4); -+ rtw_write8(pAdapter, EFUSE_TEST+3, (tempval | 0x80)); -+ } -+ } -+ else -+ { -+ rtw_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF); -+ -+ if(bWrite == _TRUE){ -+ // Disable LDO 2.5V after read/write action -+ tempval = rtw_read8(pAdapter, EFUSE_TEST+3); -+ rtw_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F)); -+ } -+ } -+} -+ -+static VOID -+rtl8192c_EfusePowerSwitch( -+ IN PADAPTER pAdapter, -+ IN u8 bWrite, -+ IN u8 PwrState) -+{ -+ if(IS_HARDWARE_TYPE_8192C(pAdapter)) -+ { -+ hal_EfusePowerSwitch_RTL8192C(pAdapter, bWrite, PwrState); -+ } -+ else if(IS_HARDWARE_TYPE_8723A(pAdapter)) -+ { -+ hal_EfusePowerSwitch_RTL8723(pAdapter, bWrite, PwrState); -+ } -+} -+ -+static VOID -+ReadEFuse_RTL8192C( -+ PADAPTER Adapter, -+ u16 _offset, -+ u16 _size_byte, -+ u8 *pbuf, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ u8 efuseTbl[EFUSE_MAP_LEN]; -+ u8 rtemp8[1]; -+ u16 eFuse_Addr = 0; -+ u8 offset, wren; -+ u16 i, j; -+ u16 eFuseWord[EFUSE_MAX_SECTION][EFUSE_MAX_WORD_UNIT]; -+ u16 efuse_utilized = 0; -+ u8 efuse_usage = 0; -+ -+ // -+ // Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. -+ // -+ if((_offset + _size_byte)>EFUSE_MAP_LEN) -+ {// total E-Fuse table is 128bytes -+ //DBG_8192C("ReadEFuse_RTL8192C(): Invalid offset(%#x) with read bytes(%#x)!!\n",_offset, _size_byte); -+ return; -+ } -+ -+ // 0. Refresh efuse init map as all oxFF. -+ for (i = 0; i < EFUSE_MAX_SECTION; i++) -+ for (j = 0; j < EFUSE_MAX_WORD_UNIT; j++) -+ eFuseWord[i][j] = 0xFFFF; -+ -+ -+ // -+ // 1. Read the first byte to check if efuse is empty!!! -+ // -+ // -+ ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); -+ if(*rtemp8 != 0xFF) -+ { -+ efuse_utilized++; -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr)); -+ eFuse_Addr++; -+ } -+ -+ // -+ // 2. Read real efuse content. Filter PG header and every section data. -+ // -+ while((*rtemp8 != 0xFF) && (eFuse_Addr < EFUSE_REAL_CONTENT_LEN)) -+ { -+ // Check PG header for section num. -+ offset = ((*rtemp8 >> 4) & 0x0f); -+ -+ if(offset < EFUSE_MAX_SECTION) -+ { -+ // Get word enable value from PG header -+ wren = (*rtemp8 & 0x0f); -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Offset-%d Worden=%x\n", offset, wren)); -+ -+ for(i=0; i= EFUSE_REAL_CONTENT_LEN) -+ break; -+ -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr)); -+ ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); eFuse_Addr++; -+ efuse_utilized++; -+ eFuseWord[offset][i] |= (((u16)*rtemp8 << 8) & 0xff00); -+ -+ if(eFuse_Addr >= EFUSE_REAL_CONTENT_LEN) -+ break; -+ } -+ -+ wren >>= 1; -+ -+ } -+ } -+ -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr)); -+ // Read next PG header -+ ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); -+ if(*rtemp8 != 0xFF && (eFuse_Addr < 512)) -+ { -+ efuse_utilized++; -+ eFuse_Addr++; -+ } -+ } -+ -+ // -+ // 3. Collect 16 sections and 4 word unit into Efuse map. -+ // -+ for(i=0; i> 8) & 0xff); -+ } -+ } -+ -+ // -+ // 4. Copy from Efuse map to output pointer memory!!! -+ // -+ for(i=0; i<_size_byte; i++) -+ { -+ pbuf[i] = efuseTbl[_offset+i]; -+ } -+ -+ // -+ // 5. Calculate Efuse utilization. -+ // -+ efuse_usage = (u8)((efuse_utilized*100)/EFUSE_REAL_CONTENT_LEN); -+ rtw_hal_set_hwreg(Adapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_utilized); -+ //rtw_hal_set_hwreg(Adapter, HW_VAR_EFUSE_USAGE, (pu1Byte)&efuse_usage); -+} -+ -+static VOID -+ReadEFuse_RTL8723( -+ PADAPTER Adapter, -+ u16 _offset, -+ u16 _size_byte, -+ u8 *pbuf, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ u8 efuseTbl[EFUSE_MAP_LEN_8723]; -+ u16 eFuse_Addr = 0; -+ u8 offset = 0, wden = 0; -+ u16 i, j; -+ u16 eFuseWord[EFUSE_MAX_SECTION_8723][EFUSE_MAX_WORD_UNIT]; -+ u16 efuse_utilized = 0; -+ u8 efuse_usage = 0; -+ u8 offset_2_0=0; -+ u8 efuseHeader=0, efuseExtHdr=0, efuseData=0; -+ // -+ // Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. -+ // -+ if((_offset + _size_byte)>EFUSE_MAP_LEN_8723) -+ { -+ //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("ReadEFuse_RTL8723(): Invalid offset(%#x) with read bytes(%#x)!!\n",_offset, _size_byte)); -+ return; -+ } -+ -+ // 0. Refresh efuse init map as all oxFF. -+ for (i = 0; i < EFUSE_MAX_SECTION_8723; i++) -+ for (j = 0; j < EFUSE_MAX_WORD_UNIT; j++) -+ eFuseWord[i][j] = 0xFFFF; -+ -+ // -+ // 1. Read the first byte to check if efuse is empty!!! -+ // -+ // -+ ReadEFuseByte(Adapter, eFuse_Addr++, &efuseHeader, bPseudoTest); -+ -+ if(efuseHeader != 0xFF) -+ { -+ efuse_utilized++; -+ } -+ else -+ { -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("EFUSE is empty\n")); -+ return; -+ } -+ -+ -+ // -+ // 2. Read real efuse content. Filter PG header and every section data. -+ // -+ while((efuseHeader != 0xFF) && AVAILABLE_EFUSE_ADDR(eFuse_Addr)) -+ { -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("efuse[%d]=%x\n", eFuse_Addr-1, efuseHeader)); -+ -+ // Check PG header for section num. -+ if(EXT_HEADER(efuseHeader)) //extended header -+ { -+ offset_2_0 = GET_HDR_OFFSET_2_0(efuseHeader); -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header offset_2_0=%x\n", offset_2_0)); -+ -+ ReadEFuseByte(Adapter, eFuse_Addr++, &efuseExtHdr, bPseudoTest); -+ -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("efuse[%d]=%x\n", eFuse_Addr-1, efuseExtHdr)); -+ -+ if(efuseExtHdr != 0xff) -+ { -+ efuse_utilized++; -+ if(ALL_WORDS_DISABLED(efuseExtHdr)) -+ { -+ ReadEFuseByte(Adapter, eFuse_Addr++, &efuseHeader, bPseudoTest); -+ if(efuseHeader != 0xff) -+ { -+ efuse_utilized++; -+ } -+ continue; -+ } -+ else -+ { -+ offset = ((efuseExtHdr & 0xF0) >> 1) | offset_2_0; -+ wden = (efuseExtHdr & 0x0F); -+ } -+ } -+ else -+ { -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Error condition, extended = 0xff\n")); -+ // We should handle this condition. -+ } -+ } -+ else -+ { -+ offset = ((efuseHeader >> 4) & 0x0f); -+ wden = (efuseHeader & 0x0f); -+ } -+ -+ if(offset < EFUSE_MAX_SECTION_8723) -+ { -+ // Get word enable value from PG header -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Offset-%d Worden=%x\n", offset, wden)); -+ -+ for(i=0; i> 8) & 0xff); -+ } -+ } -+ -+ // -+ // 4. Copy from Efuse map to output pointer memory!!! -+ // -+ for(i=0; i<_size_byte; i++) -+ { -+ pbuf[i] = efuseTbl[_offset+i]; -+ } -+ -+ // -+ // 5. Calculate Efuse utilization. -+ // -+ efuse_usage = (u8)((efuse_utilized*100)/EFUSE_REAL_CONTENT_LEN); -+ rtw_hal_set_hwreg(Adapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_utilized); -+ //rtw_hal_set_hwreg(Adapter, HW_VAR_EFUSE_USAGE, (pu1Byte)&efuse_usage); -+} -+ -+static BOOLEAN -+Hal_EfuseSwitchToBank( -+ IN PADAPTER pAdapter, -+ IN u8 bank, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ BOOLEAN bRet = _FALSE; -+ u32 value32=0; -+ -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Efuse switch bank to %d\n", bank)); -+ if(bPseudoTest) -+ { -+ fakeEfuseBank = bank; -+ bRet = _TRUE; -+ } -+ else -+ { -+ if(IS_HARDWARE_TYPE_8723A(pAdapter) && -+ INCLUDE_MULTI_FUNC_BT(pAdapter)) -+ { -+ value32 = rtw_read32(pAdapter, EFUSE_TEST); -+ bRet = _TRUE; -+ switch(bank) -+ { -+ case 0: -+ value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0); -+ break; -+ case 1: -+ value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_0); -+ break; -+ case 2: -+ value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_1); -+ break; -+ case 3: -+ value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_BT_SEL_2); -+ break; -+ default: -+ value32 = (value32 & ~EFUSE_SEL_MASK) | EFUSE_SEL(EFUSE_WIFI_SEL_0); -+ bRet = _FALSE; -+ break; -+ } -+ rtw_write32(pAdapter, EFUSE_TEST, value32); -+ } -+ else -+ bRet = _TRUE; -+ } -+ return bRet; -+} -+ -+static VOID -+ReadEFuse_BT( -+ PADAPTER Adapter, -+ u16 _offset, -+ u16 _size_byte, -+ u8 *pbuf, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ u8 *efuseTbl; -+ u16 eFuse_Addr = 0; -+ u8 offset = 0, wden = 0; -+ u16 i, j; -+ u16 **eFuseWord; -+ u16 efuse_utilized = 0; -+ u8 efuse_usage = 0; -+ u8 offset_2_0=0; -+ u8 efuseHeader=0, efuseExtHdr=0, efuseData=0; -+ u8 bank=0; -+ BOOLEAN bCheckNextBank=_FALSE; -+ -+ efuseTbl = rtw_malloc(EFUSE_BT_MAP_LEN); -+ if(efuseTbl == NULL){ -+ DBG_8192C("efuseTbl malloc fail !\n"); -+ return; -+ } -+ -+ eFuseWord = (u16 **)rtw_zmalloc(sizeof(u16 *)*EFUSE_BT_MAX_SECTION); -+ if(eFuseWord == NULL){ -+ DBG_8192C("eFuseWord malloc fail !\n"); -+ return; -+ } -+ else{ -+ for(i=0;iEFUSE_BT_MAP_LEN) -+ { -+ //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("ReadEFuse_BT(): Invalid offset(%#x) with read bytes(%#x)!!\n",_offset, _size_byte)); -+ return; -+ } -+ -+ // 0. Refresh efuse init map as all oxFF. -+ for (i = 0; i < EFUSE_BT_MAX_SECTION; i++) -+ for (j = 0; j < EFUSE_MAX_WORD_UNIT; j++) -+ eFuseWord[i][j] = 0xFFFF; -+ -+ for(bank=1; bank> 1) | offset_2_0; -+ wden = (efuseExtHdr & 0x0F); -+ } -+ } -+ else -+ { -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Error condition, extended = 0xff\n")); -+ // We should handle this condition. -+ } -+ } -+ else -+ { -+ offset = ((efuseHeader >> 4) & 0x0f); -+ wden = (efuseHeader & 0x0f); -+ } -+ -+ if(offset < EFUSE_BT_MAX_SECTION) -+ { -+ // Get word enable value from PG header -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Offset-%d Worden=%x\n", offset, wden)); -+ -+ for(i=0; i= EFUSE_REAL_CONTENT_LEN) -+ bCheckNextBank = _TRUE; -+ else -+ bCheckNextBank = _FALSE; -+ } -+ } -+ if(!bCheckNextBank) -+ { -+ //RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Stop to check next bank\n")); -+ break; -+ } -+ } -+ -+ // switch bank back to bank 0 for later BT and wifi use. -+ Hal_EfuseSwitchToBank(Adapter, 0, bPseudoTest); -+ -+ // -+ // 3. Collect 16 sections and 4 word unit into Efuse map. -+ // -+ for(i=0; i> 8) & 0xff); -+ } -+ } -+ -+ // -+ // 4. Copy from Efuse map to output pointer memory!!! -+ // -+ for(i=0; i<_size_byte; i++) -+ { -+ pbuf[i] = efuseTbl[_offset+i]; -+ } -+ -+ // -+ // 5. Calculate Efuse utilization. -+ // -+ efuse_usage = (u8)((efuse_utilized*100)/EFUSE_BT_REAL_CONTENT_LEN); -+ if(bPseudoTest) -+ { -+ fakeBTEfuseUsedBytes = (EFUSE_REAL_CONTENT_LEN*(bank-1))+eFuse_Addr-1; -+ } -+ else -+ { -+ BTEfuseUsedBytes = (EFUSE_REAL_CONTENT_LEN*(bank-1))+eFuse_Addr-1; -+ } -+ -+ for(i=0;i>4) & 0x0F; -+ hworden = efuse_data & 0x0F; -+ word_cnts = Efuse_CalculateWordCnts(hworden); -+ //read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ } -+ else -+ { -+ bContinual = _FALSE ; -+ } -+ } -+ -+ return efuse_addr; -+} -+ -+static u16 -+Hal_EfuseGetCurrentSize_BT(IN PADAPTER pAdapter, -+ IN BOOLEAN bPseudoTest) -+{ -+ int bContinual = _TRUE; -+ u16 efuse_addr = 0; -+ u8 hoffset=0,hworden=0; -+ u8 efuse_data,word_cnts=0; -+ u8 bank=0, startBank=0; -+ u16 retU2=0; -+ u32 total_efuse_used=0; -+ -+ if(bPseudoTest) -+ { -+ efuse_addr = (u16)((fakeBTEfuseUsedBytes%EFUSE_REAL_CONTENT_LEN)); -+ startBank = (u8)(1+(fakeBTEfuseUsedBytes/EFUSE_REAL_CONTENT_LEN)); -+ } -+ else -+ { -+ efuse_addr = (u16)((BTEfuseUsedBytes%EFUSE_REAL_CONTENT_LEN)); -+ startBank = (u8)(1+(BTEfuseUsedBytes/EFUSE_REAL_CONTENT_LEN)); -+ } -+ -+ if((startBank < 1) || (startBank >= EFUSE_MAX_BANK)) -+ DBG_8192C("Error, bank error, bank=%d\n", bank); -+ -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Hal_EfuseGetCurrentSize_BT(), start bank=%d, start_efuse_addr = %d\n", startBank, efuse_addr)); -+ -+ for(bank=startBank; bank> 5) | ((efuse_data & 0xF0) >> 1); -+ hworden = efuse_data & 0x0F; -+ } -+ } -+ else -+ { -+ hoffset = (efuse_data>>4) & 0x0F; -+ hworden = efuse_data & 0x0F; -+ } -+ word_cnts = Efuse_CalculateWordCnts(hworden); -+ //read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ } -+ else -+ { -+ bContinual = _FALSE ; -+ } -+ } -+ -+ // Check if we need to check next bank efuse -+ if(efuse_addr < (EFUSE_REAL_CONTENT_LEN-EFUSE_PROTECT_BYTES_BANK)) -+ { -+ break;// don't need to check next bank. -+ } -+ } -+ -+ retU2 = ((bank-1)*EFUSE_REAL_CONTENT_LEN)+efuse_addr; -+ if(bPseudoTest) -+ { -+ fakeBTEfuseUsedBytes = retU2; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Hal_EfuseGetCurrentSize_BT(), return %d\n", fakeBTEfuseUsedBytes)); -+ } -+ else -+ { -+ BTEfuseUsedBytes = retU2; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Hal_EfuseGetCurrentSize_BT(), return %d\n", BTEfuseUsedBytes)); -+ } -+ -+ return retU2; -+} -+ -+ -+static u16 -+hal_EfuseGetCurrentSize_8723(IN PADAPTER pAdapter, -+ IN BOOLEAN bPseudoTest) -+{ -+ int bContinual = _TRUE; -+ -+ u16 efuse_addr = 0; -+ u8 hoffset=0,hworden=0; -+ u8 efuse_data,word_cnts=0; -+ -+ if(bPseudoTest) -+ { -+ efuse_addr = (u16)(fakeEfuseUsedBytes); -+ } -+ else -+ { -+ rtw_hal_get_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr); -+ } -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfuseGetCurrentSize_8723(), start_efuse_addr = %d\n", efuse_addr)); -+ -+ while ( bContinual && -+ efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest) && -+ AVAILABLE_EFUSE_ADDR(efuse_addr)) -+ { -+ if(efuse_data!=0xFF) -+ { -+ if((efuse_data&0x1F) == 0x0F) //extended header -+ { -+ hoffset = efuse_data; -+ efuse_addr++; -+ efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest); -+ if((efuse_data & 0x0F) == 0x0F) -+ { -+ efuse_addr++; -+ continue; -+ } -+ else -+ { -+ hoffset = ((hoffset & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1); -+ hworden = efuse_data & 0x0F; -+ } -+ } -+ else -+ { -+ hoffset = (efuse_data>>4) & 0x0F; -+ hworden = efuse_data & 0x0F; -+ } -+ word_cnts = Efuse_CalculateWordCnts(hworden); -+ //read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ } -+ else -+ { -+ bContinual = _FALSE ; -+ } -+ } -+ -+ if(bPseudoTest) -+ { -+ fakeEfuseUsedBytes = efuse_addr; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfuseGetCurrentSize_8723(), return %d\n", fakeEfuseUsedBytes)); -+ } -+ else -+ { -+ rtw_hal_set_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&efuse_addr); -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfuseGetCurrentSize_8723(), return %d\n", efuse_addr)); -+ } -+ -+ return efuse_addr; -+} -+ -+static u16 -+Hal_EfuseGetCurrentSize_Pseudo(IN PADAPTER pAdapter, -+ IN BOOLEAN bPseudoTest) -+{ -+ u16 ret=0; -+ -+ ret = hal_EfuseGetCurrentSize_8723(pAdapter, bPseudoTest); -+ -+ return ret; -+} -+ -+static u16 -+rtl8192c_EfuseGetCurrentSize( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN BOOLEAN bPseudoTest) -+{ -+ u16 ret=0; -+ -+ if(efuseType == EFUSE_WIFI) -+ { -+ if(bPseudoTest) -+ { -+ ret = Hal_EfuseGetCurrentSize_Pseudo(pAdapter, bPseudoTest); -+ } -+ else -+ { -+ if(IS_HARDWARE_TYPE_8192C(pAdapter)) -+ { -+ ret = hal_EfuseGetCurrentSize_8192C(pAdapter, bPseudoTest); -+ } -+ else if(IS_HARDWARE_TYPE_8723A(pAdapter)) -+ { -+ ret = hal_EfuseGetCurrentSize_8723(pAdapter, bPseudoTest); -+ } -+ } -+ } -+ else -+ { -+ ret = Hal_EfuseGetCurrentSize_BT(pAdapter, bPseudoTest); -+ } -+ -+ return ret; -+} -+ -+static int -+hal_EfusePgPacketRead_8192C( IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ u8 ReadState = PG_STATE_HEADER; -+ -+ int bContinual = _TRUE; -+ int bDataEmpty = _TRUE ; -+ -+ u8 efuse_data,word_cnts=0; -+ u16 efuse_addr = 0; -+ u8 hoffset=0,hworden=0; -+ u8 tmpidx=0; -+ u8 tmpdata[8]; -+ -+ if(data==NULL) return _FALSE; -+ if(offset>15) return _FALSE; -+ -+ -+ _rtw_memset((PVOID)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); -+ _rtw_memset((PVOID)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); -+ -+ // -+ // Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. -+ // Skip dummy parts to prevent unexpected data read from Efuse. -+ // By pass right now. 2009.02.19. -+ // -+ while(bContinual && (efuse_addr < EFUSE_REAL_CONTENT_LEN) ) -+ { -+ //------- Header Read ------------- -+ if(ReadState & PG_STATE_HEADER) -+ { -+ if(efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest)&&(efuse_data!=0xFF)){ -+ hoffset = (efuse_data>>4) & 0x0F; -+ hworden = efuse_data & 0x0F; -+ word_cnts = Efuse_CalculateWordCnts(hworden); -+ bDataEmpty = _TRUE ; -+ -+ if(hoffset==offset){ -+ for(tmpidx = 0;tmpidx< word_cnts*2 ;tmpidx++){ -+ if(efuse_OneByteRead(pAdapter, efuse_addr+1+tmpidx ,&efuse_data, bPseudoTest) ){ -+ tmpdata[tmpidx] = efuse_data; -+ if(efuse_data!=0xff){ -+ bDataEmpty = _FALSE; -+ } -+ } -+ } -+ if(bDataEmpty==_FALSE){ -+ ReadState = PG_STATE_DATA; -+ }else{//read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ ReadState = PG_STATE_HEADER; -+ } -+ } -+ else{//read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ ReadState = PG_STATE_HEADER; -+ } -+ -+ } -+ else{ -+ bContinual = _FALSE ; -+ } -+ } -+ //------- Data section Read ------------- -+ else if(ReadState & PG_STATE_DATA) -+ { -+ efuse_WordEnableDataRead(hworden,tmpdata,data); -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ ReadState = PG_STATE_HEADER; -+ } -+ -+ } -+ -+ if( (data[0]==0xff) &&(data[1]==0xff) && (data[2]==0xff) && (data[3]==0xff) && -+ (data[4]==0xff) &&(data[5]==0xff) && (data[6]==0xff) && (data[7]==0xff)) -+ return _FALSE; -+ else -+ return _TRUE; -+ -+} -+ -+static int -+hal_EfusePgPacketRead_8723( IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ u8 ReadState = PG_STATE_HEADER; -+ -+ int bContinual = _TRUE; -+ int bDataEmpty = _TRUE ; -+ -+ u8 efuse_data,word_cnts=0; -+ u16 efuse_addr = 0; -+ u8 hoffset=0,hworden=0; -+ u8 tmpidx=0; -+ u8 tmpdata[8]; -+ u8 max_section=0; -+ u8 tmp_header = 0; -+ -+ EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (PVOID)&max_section, bPseudoTest); -+ -+ if(data==NULL) -+ return _FALSE; -+ if(offset>max_section) -+ return _FALSE; -+ -+ _rtw_memset((PVOID)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); -+ _rtw_memset((PVOID)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); -+ -+ -+ // -+ // Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. -+ // Skip dummy parts to prevent unexpected data read from Efuse. -+ // By pass right now. 2009.02.19. -+ // -+ while(bContinual && AVAILABLE_EFUSE_ADDR(efuse_addr) ) -+ { -+ //------- Header Read ------------- -+ if(ReadState & PG_STATE_HEADER) -+ { -+ if(efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest)&&(efuse_data!=0xFF)) -+ { -+ if(EXT_HEADER(efuse_data)) -+ { -+ tmp_header = efuse_data; -+ efuse_addr++; -+ efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest); -+ if(!ALL_WORDS_DISABLED(efuse_data)) -+ { -+ hoffset = ((tmp_header & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1); -+ hworden = efuse_data & 0x0F; -+ } -+ else -+ { -+ DBG_8192C("Error, All words disabled\n"); -+ efuse_addr++; -+ continue; -+ } -+ } -+ else -+ { -+ hoffset = (efuse_data>>4) & 0x0F; -+ hworden = efuse_data & 0x0F; -+ } -+ word_cnts = Efuse_CalculateWordCnts(hworden); -+ bDataEmpty = _TRUE ; -+ -+ if(hoffset==offset) -+ { -+ for(tmpidx = 0;tmpidx< word_cnts*2 ;tmpidx++) -+ { -+ if(efuse_OneByteRead(pAdapter, efuse_addr+1+tmpidx ,&efuse_data, bPseudoTest) ) -+ { -+ tmpdata[tmpidx] = efuse_data; -+ if(efuse_data!=0xff) -+ { -+ bDataEmpty = _FALSE; -+ } -+ } -+ } -+ if(bDataEmpty==_FALSE){ -+ ReadState = PG_STATE_DATA; -+ }else{//read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ ReadState = PG_STATE_HEADER; -+ } -+ } -+ else{//read next header -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ ReadState = PG_STATE_HEADER; -+ } -+ -+ } -+ else{ -+ bContinual = _FALSE ; -+ } -+ } -+ //------- Data section Read ------------- -+ else if(ReadState & PG_STATE_DATA) -+ { -+ efuse_WordEnableDataRead(hworden,tmpdata,data); -+ efuse_addr = efuse_addr + (word_cnts*2)+1; -+ ReadState = PG_STATE_HEADER; -+ } -+ -+ } -+ -+ if( (data[0]==0xff) &&(data[1]==0xff) && (data[2]==0xff) && (data[3]==0xff) && -+ (data[4]==0xff) &&(data[5]==0xff) && (data[6]==0xff) && (data[7]==0xff)) -+ return _FALSE; -+ else -+ return _TRUE; -+ -+} -+ -+static int -+Hal_EfusePgPacketRead( IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret=0; -+ -+ if(IS_HARDWARE_TYPE_8192C(pAdapter)) -+ { -+ ret = hal_EfusePgPacketRead_8192C(pAdapter, offset, data, bPseudoTest); -+ } -+ else if(IS_HARDWARE_TYPE_8723A(pAdapter)) -+ { -+ ret = hal_EfusePgPacketRead_8723(pAdapter, offset, data, bPseudoTest); -+ } -+ -+ return ret; -+} -+ -+static int -+Hal_EfusePgPacketRead_Pseudo( IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret=0; -+ -+ ret = hal_EfusePgPacketRead_8723(pAdapter, offset, data, bPseudoTest); -+ -+ return ret; -+} -+ -+static int -+rtl8192c_Efuse_PgPacketRead( IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret=0; -+ -+ if(bPseudoTest) -+ { -+ ret = Hal_EfusePgPacketRead_Pseudo(pAdapter, offset, data, bPseudoTest); -+ } -+ else -+ { -+ ret = Hal_EfusePgPacketRead(pAdapter, offset, data, bPseudoTest); -+ } -+ -+ return ret; -+} -+ -+static BOOLEAN -+hal_EfuseFixHeaderProcess( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN PPGPKT_STRUCT pFixPkt, -+ IN u16 *pAddr, -+ IN BOOLEAN bPseudoTest -+) -+{ -+ u8 originaldata[8], badworden=0; -+ u16 efuse_addr=*pAddr; -+ u32 PgWriteSuccess=0; -+ -+ _rtw_memset((PVOID)originaldata, 0xff, 8); -+ -+ if(Efuse_PgPacketRead(pAdapter, pFixPkt->offset, originaldata, bPseudoTest)) -+ { //check if data exist -+ badworden = Efuse_WordEnableDataWrite(pAdapter, efuse_addr+1, pFixPkt->word_en, originaldata, bPseudoTest); -+ -+ if(badworden != 0xf) // write fail -+ { -+ if(efuseType == EFUSE_WIFI) -+ PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest); -+ else -+ PgWriteSuccess = hal_EfusePgPacketWrite_BT(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest); -+ if(!PgWriteSuccess) -+ return _FALSE; -+ else -+ efuse_addr = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest); -+ } -+ else -+ { -+ efuse_addr = efuse_addr + (pFixPkt->word_cnts*2) +1; -+ } -+ } -+ else -+ { -+ efuse_addr = efuse_addr + (pFixPkt->word_cnts*2) +1; -+ } -+ *pAddr = efuse_addr; -+ return _TRUE; -+} -+ -+static BOOLEAN -+hal_EfusePgPacketWrite2ByteHeader( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest) -+{ -+ BOOLEAN bRet=_FALSE, bContinual=_TRUE; -+ u16 efuse_addr=*pAddr, efuse_max_available_len=0; -+ u8 pg_header=0, tmp_header=0, pg_header_temp=0; -+ u8 repeatcnt=0; -+ -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Wirte 2byte header\n")); -+ EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (PVOID)&efuse_max_available_len, bPseudoTest); -+ -+ while(efuse_addr < efuse_max_available_len) -+ { -+ pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("pg_header = 0x%x\n", pg_header)); -+ efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter, efuse_addr, &tmp_header, bPseudoTest); -+ -+ while(tmp_header == 0xFF) -+ { -+ if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for pg_header!!\n")); -+ return _FALSE; -+ } -+ -+ efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter, efuse_addr, &tmp_header, bPseudoTest); -+ } -+ -+ //to write ext_header -+ if(tmp_header == pg_header) -+ { -+ efuse_addr++; -+ pg_header_temp = pg_header; -+ pg_header = ((pTargetPkt->offset & 0x78) << 1) | pTargetPkt->word_en; -+ -+ efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter, efuse_addr, &tmp_header, bPseudoTest); -+ -+ while(tmp_header == 0xFF) -+ { -+ if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for ext_header!!\n")); -+ return _FALSE; -+ } -+ -+ efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter, efuse_addr, &tmp_header, bPseudoTest); -+ } -+ -+ if((tmp_header & 0x0F) == 0x0F) //word_en PG fail -+ { -+ if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Repeat over limit for word_en!!\n")); -+ return _FALSE; -+ } -+ else -+ { -+ efuse_addr++; -+ continue; -+ } -+ } -+ else if(pg_header != tmp_header) //offset PG fail -+ { -+ PGPKT_STRUCT fixPkt; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Error condition for offset PG fail, need to cover the existed data\n")); -+ fixPkt.offset = ((pg_header_temp & 0xE0) >> 5) | ((tmp_header & 0xF0) >> 1); -+ fixPkt.word_en = tmp_header & 0x0F; -+ fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en); -+ if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest)) -+ return _FALSE; -+ } -+ else -+ { -+ bRet = _TRUE; -+ break; -+ } -+ } -+ else if ((tmp_header & 0x1F) == 0x0F) //wrong extended header -+ { -+ efuse_addr+=2; -+ continue; -+ } -+ } -+ -+ *pAddr = efuse_addr; -+ return bRet; -+} -+ -+static BOOLEAN -+hal_EfusePgPacketWrite1ByteHeader( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest) -+{ -+ BOOLEAN bRet=_FALSE; -+ u8 pg_header=0, tmp_header=0; -+ u16 efuse_addr=*pAddr; -+ u8 repeatcnt=0; -+ -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Wirte 1byte header\n")); -+ pg_header = ((pTargetPkt->offset << 4) & 0xf0) |pTargetPkt->word_en; -+ -+ efuse_OneByteWrite(pAdapter, efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter, efuse_addr, &tmp_header, bPseudoTest); -+ -+ while(tmp_header == 0xFF) -+ { -+ if(repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) -+ { -+ return _FALSE; -+ } -+ efuse_OneByteWrite(pAdapter,efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter,efuse_addr, &tmp_header, bPseudoTest); -+ } -+ -+ if(pg_header == tmp_header) -+ { -+ bRet = _TRUE; -+ } -+ else -+ { -+ PGPKT_STRUCT fixPkt; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Error condition for fixed PG packet, need to cover the existed data\n")); -+ fixPkt.offset = (tmp_header>>4) & 0x0F; -+ fixPkt.word_en = tmp_header & 0x0F; -+ fixPkt.word_cnts = Efuse_CalculateWordCnts(fixPkt.word_en); -+ if(!hal_EfuseFixHeaderProcess(pAdapter, efuseType, &fixPkt, &efuse_addr, bPseudoTest)) -+ return _FALSE; -+ } -+ -+ *pAddr = efuse_addr; -+ return bRet; -+} -+ -+static BOOLEAN -+hal_EfusePgPacketWriteData( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest) -+{ -+ BOOLEAN bRet=_FALSE; -+ u16 efuse_addr=*pAddr; -+ u8 badworden=0; -+ u32 PgWriteSuccess=0; -+ -+ badworden = 0x0f; -+ badworden = Efuse_WordEnableDataWrite(pAdapter, efuse_addr+1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest); -+ if(badworden == 0x0F) -+ { -+ // write ok -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgPacketWriteData ok!!\n")); -+ return _TRUE; -+ } -+ else -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgPacketWriteData Fail!!\n")); -+ //reorganize other pg packet -+ if(efuseType == EFUSE_WIFI) -+ PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); -+ else -+ PgWriteSuccess = hal_EfusePgPacketWrite_BT(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); -+ if(!PgWriteSuccess) -+ return _FALSE; -+ else -+ return _TRUE; -+ } -+ -+ return bRet; -+} -+ -+static BOOLEAN -+hal_EfusePgPacketWriteHeader( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest) -+{ -+ BOOLEAN bRet=_FALSE; -+ -+ if(pTargetPkt->offset >= EFUSE_MAX_SECTION_BASE) -+ { -+ bRet = hal_EfusePgPacketWrite2ByteHeader(pAdapter, efuseType, pAddr, pTargetPkt, bPseudoTest); -+ } -+ else -+ { -+ bRet = hal_EfusePgPacketWrite1ByteHeader(pAdapter, efuseType, pAddr, pTargetPkt, bPseudoTest); -+ } -+ -+ return bRet; -+} -+ -+static BOOLEAN -+hal_EfusePgCheckAvailableAddr( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ u16 efuse_max_available_len=0; -+ -+ EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&efuse_max_available_len, bPseudoTest); -+ //RTPRINT(FEEPROM, EFUSE_PG, ("efuse_max_available_len = %d\n", efuse_max_available_len)); -+ -+ if(Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest) >= efuse_max_available_len) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgCheckAvailableAddr error!!\n")); -+ return _FALSE; -+ } -+ return _TRUE; -+} -+ -+static VOID -+hal_EfuseConstructPGPkt( -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *pData, -+ IN PPGPKT_STRUCT pTargetPkt -+ -+) -+{ -+ _rtw_memset((PVOID)pTargetPkt->data, 0xFF, sizeof(u8)*8); -+ pTargetPkt->offset = offset; -+ pTargetPkt->word_en= word_en; -+ efuse_WordEnableDataRead(word_en, pData, pTargetPkt->data); -+ pTargetPkt->word_cnts = Efuse_CalculateWordCnts(pTargetPkt->word_en); -+ -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfuseConstructPGPkt(), targetPkt, offset=%d, word_en=0x%x, word_cnts=%d\n", pTargetPkt->offset, pTargetPkt->word_en, pTargetPkt->word_cnts)); -+} -+ -+static BOOLEAN -+hal_EfuseCheckIfDatafollowed( -+ IN PADAPTER pAdapter, -+ IN u8 word_cnts, -+ IN u16 startAddr, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ BOOLEAN bRet=_FALSE; -+ u8 i, efuse_data; -+ -+ for(i=0; i<(word_cnts*2) ; i++) -+ { -+ if(efuse_OneByteRead(pAdapter, (startAddr+i) ,&efuse_data, bPseudoTest)&&(efuse_data != 0xFF)) -+ bRet = _TRUE; -+ } -+ -+ return bRet; -+} -+ -+static BOOLEAN -+wordEnMatched( -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN PPGPKT_STRUCT pCurPkt, -+ IN u8 *pWden -+) -+{ -+ u8 match_word_en = 0x0F; // default all words are disabled -+ u8 i; -+ -+ // check if the same words are enabled both target and current PG packet -+ if( ((pTargetPkt->word_en & BIT0) == 0) && -+ ((pCurPkt->word_en & BIT0) == 0) ) -+ { -+ match_word_en &= ~BIT0; // enable word 0 -+ } -+ if( ((pTargetPkt->word_en & BIT1) == 0) && -+ ((pCurPkt->word_en & BIT1) == 0) ) -+ { -+ match_word_en &= ~BIT1; // enable word 1 -+ } -+ if( ((pTargetPkt->word_en & BIT2) == 0) && -+ ((pCurPkt->word_en & BIT2) == 0) ) -+ { -+ match_word_en &= ~BIT2; // enable word 2 -+ } -+ if( ((pTargetPkt->word_en & BIT3) == 0) && -+ ((pCurPkt->word_en & BIT3) == 0) ) -+ { -+ match_word_en &= ~BIT3; // enable word 3 -+ } -+ -+ *pWden = match_word_en; -+ -+ if(match_word_en != 0xf) -+ return _TRUE; -+ else -+ return _FALSE; -+} -+ -+static BOOLEAN -+hal_EfusePartialWriteCheck( -+ IN PADAPTER pAdapter, -+ IN u8 efuseType, -+ IN u16 *pAddr, -+ IN PPGPKT_STRUCT pTargetPkt, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ BOOLEAN bRet=_FALSE; -+ u8 i, efuse_data=0, cur_header=0; -+ u8 new_wden=0, matched_wden=0, badworden=0; -+ u16 startAddr=0, efuse_max_available_len=0, efuse_max=0; -+ PGPKT_STRUCT curPkt; -+ -+ EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (PVOID)&efuse_max_available_len, bPseudoTest); -+ EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&efuse_max, bPseudoTest); -+ -+ if(efuseType == EFUSE_WIFI) -+ { -+ if(bPseudoTest) -+ { -+ startAddr = (u16)(fakeEfuseUsedBytes%EFUSE_REAL_CONTENT_LEN); -+ } -+ else -+ { -+ rtw_hal_get_hwreg(pAdapter, HW_VAR_EFUSE_BYTES, (u8 *)&startAddr); -+ startAddr%=EFUSE_REAL_CONTENT_LEN; -+ } -+ } -+ else -+ { -+ if(bPseudoTest) -+ { -+ startAddr = (u16)(fakeBTEfuseUsedBytes%EFUSE_REAL_CONTENT_LEN); -+ } -+ else -+ { -+ startAddr = (u16)(BTEfuseUsedBytes%EFUSE_REAL_CONTENT_LEN); -+ } -+ } -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePartialWriteCheck(), startAddr=%d\n", startAddr)); -+ -+ while(1) -+ { -+ if(startAddr >= efuse_max_available_len) -+ { -+ bRet = _FALSE; -+ break; -+ } -+ -+ if(efuse_OneByteRead(pAdapter, startAddr, &efuse_data, bPseudoTest) && (efuse_data!=0xFF)) -+ { -+ if(EXT_HEADER(efuse_data)) -+ { -+ cur_header = efuse_data; -+ startAddr++; -+ efuse_OneByteRead(pAdapter, startAddr, &efuse_data, bPseudoTest); -+ if(ALL_WORDS_DISABLED(efuse_data)) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Error condition, all words disabled")); -+ bRet = _FALSE; -+ break; -+ } -+ else -+ { -+ curPkt.offset = ((cur_header & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1); -+ curPkt.word_en = efuse_data & 0x0F; -+ } -+ } -+ else -+ { -+ cur_header = efuse_data; -+ curPkt.offset = (cur_header>>4) & 0x0F; -+ curPkt.word_en = cur_header & 0x0F; -+ } -+ -+ curPkt.word_cnts = Efuse_CalculateWordCnts(curPkt.word_en); -+ // if same header is found but no data followed -+ // write some part of data followed by the header. -+ if( (curPkt.offset == pTargetPkt->offset) && -+ (!hal_EfuseCheckIfDatafollowed(pAdapter, curPkt.word_cnts, startAddr+1, bPseudoTest)) && -+ wordEnMatched(pTargetPkt, &curPkt, &matched_wden) ) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Need to partial write data by the previous wrote header\n")); -+ // Here to write partial data -+ badworden = Efuse_WordEnableDataWrite(pAdapter, startAddr+1, matched_wden, pTargetPkt->data, bPseudoTest); -+ if(badworden != 0x0F) -+ { -+ u32 PgWriteSuccess=0; -+ // if write fail on some words, write these bad words again -+ if(efuseType == EFUSE_WIFI) -+ PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); -+ else -+ PgWriteSuccess = hal_EfusePgPacketWrite_BT(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); -+ -+ if(!PgWriteSuccess) -+ { -+ bRet = _FALSE; // write fail, return -+ break; -+ } -+ } -+ // partial write ok, update the target packet for later use -+ for(i=0; i<4; i++) -+ { -+ if((matched_wden & (0x1<word_en |= (0x1<word_cnts = Efuse_CalculateWordCnts(pTargetPkt->word_en); -+ } -+ // read from next header -+ startAddr = startAddr + (curPkt.word_cnts*2) +1; -+ } -+ else -+ { -+ // not used header, 0xff -+ *pAddr = startAddr; -+ //RTPRINT(FEEPROM, EFUSE_PG, ("Started from unused header offset=%d\n", startAddr)); -+ bRet = _TRUE; -+ break; -+ } -+ } -+ return bRet; -+} -+ -+static BOOLEAN -+hal_EfusePgPacketWrite_BT( -+ IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *pData, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ PGPKT_STRUCT targetPkt; -+ u16 startAddr=0; -+ u8 efuseType=EFUSE_BT; -+ -+ if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest)) -+ return _FALSE; -+ -+ hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt); -+ -+ if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -+ return _FALSE; -+ -+ if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -+ return _FALSE; -+ -+ if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -+ return _FALSE; -+ -+ return _TRUE; -+} -+ -+static BOOLEAN -+hal_EfusePgPacketWrite_8723( -+ IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *pData, -+ IN BOOLEAN bPseudoTest -+ ) -+{ -+ PGPKT_STRUCT targetPkt; -+ u16 startAddr=0; -+ u8 efuseType=EFUSE_WIFI; -+ -+ if(!hal_EfusePgCheckAvailableAddr(pAdapter, efuseType, bPseudoTest)) -+ return _FALSE; -+ -+ hal_EfuseConstructPGPkt(offset, word_en, pData, &targetPkt); -+ -+ if(!hal_EfusePartialWriteCheck(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -+ return _FALSE; -+ -+ if(!hal_EfusePgPacketWriteHeader(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -+ return _FALSE; -+ -+ if(!hal_EfusePgPacketWriteData(pAdapter, efuseType, &startAddr, &targetPkt, bPseudoTest)) -+ return _FALSE; -+ -+ return _TRUE; -+} -+ -+static int -+hal_EfusePgPacketWrite_8192C(IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ u8 WriteState = PG_STATE_HEADER; -+ -+ int bContinual = _TRUE,bDataEmpty=_TRUE, bResult = _TRUE; -+ u16 efuse_addr = 0; -+ u8 efuse_data; -+ -+ u8 pg_header = 0; -+ -+ u8 tmp_word_cnts=0,target_word_cnts=0; -+ u8 tmp_header,match_word_en,tmp_word_en; -+ -+ PGPKT_STRUCT target_pkt; -+ PGPKT_STRUCT tmp_pkt; -+ -+ u8 originaldata[sizeof(u8)*8]; -+ u8 tmpindex = 0,badworden = 0x0F; -+ -+ static int repeat_times = 0; -+ u8 efuseType=EFUSE_WIFI; -+ -+ // -+ // Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. -+ // So we have to prevent unexpected data string connection, which will cause -+ // incorrect data auto-load from HW. The total size is equal or smaller than 498bytes -+ // (i.e., offset 0~497, and dummy 1bytes) expected after CP test. -+ // 2009.02.19. -+ // -+ if( Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest) >= (EFUSE_REAL_CONTENT_LEN-EFUSE_OOB_PROTECT_BYTES)) -+ { -+ //RTPRINT(FEEPROM, EFUSE_PG, ("hal_EfusePgPacketWrite_8192C(), over size\n")); -+ return _FALSE; -+ } -+ -+ // Init the 8 bytes content as 0xff -+ target_pkt.offset = offset; -+ target_pkt.word_en= word_en; -+ -+ _rtw_memset((PVOID)target_pkt.data, 0xFF, sizeof(u8)*8); -+ -+ efuse_WordEnableDataRead(word_en,data,target_pkt.data); -+ target_word_cnts = Efuse_CalculateWordCnts(target_pkt.word_en); -+ -+ //efuse_reg_ctrl(pAdapter,_TRUE);//power on -+ //RTPRINT(FEEPROM, EFUSE_PG, ("EFUSE Power ON\n")); -+ -+ // -+ // Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. -+ // So we have to prevent unexpected data string connection, which will cause -+ // incorrect data auto-load from HW. Dummy 1bytes is additional. -+ // 2009.02.19. -+ // -+ while( bContinual && (efuse_addr < (EFUSE_REAL_CONTENT_LEN-EFUSE_OOB_PROTECT_BYTES)) ) -+ { -+ -+ if(WriteState==PG_STATE_HEADER) -+ { -+ bDataEmpty=_TRUE; -+ badworden = 0x0F; -+ //************ so ******************* -+ //RTPRINT(FEEPROM, EFUSE_PG, ("EFUSE PG_STATE_HEADER\n")); -+ if ( efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest) && -+ (efuse_data!=0xFF)) -+ { -+ tmp_header = efuse_data; -+ -+ tmp_pkt.offset = (tmp_header>>4) & 0x0F; -+ tmp_pkt.word_en = tmp_header & 0x0F; -+ tmp_word_cnts = Efuse_CalculateWordCnts(tmp_pkt.word_en); -+ -+ //************ so-1 ******************* -+ if(tmp_pkt.offset != target_pkt.offset) -+ { -+ efuse_addr = efuse_addr + (tmp_word_cnts*2) +1; //Next pg_packet -+ #if (EFUSE_ERROE_HANDLE == 1) -+ WriteState = PG_STATE_HEADER; -+ #endif -+ } -+ else -+ { -+ //************ so-2 ******************* -+ for(tmpindex=0 ; tmpindex<(tmp_word_cnts*2) ; tmpindex++) -+ { -+ if(efuse_OneByteRead(pAdapter, (efuse_addr+1+tmpindex) ,&efuse_data, bPseudoTest)&&(efuse_data != 0xFF)){ -+ bDataEmpty = _FALSE; -+ } -+ } -+ //************ so-2-1 ******************* -+ if(bDataEmpty == _FALSE) -+ { -+ efuse_addr = efuse_addr + (tmp_word_cnts*2) +1; //Next pg_packet -+ #if (EFUSE_ERROE_HANDLE == 1) -+ WriteState=PG_STATE_HEADER; -+ #endif -+ } -+ else -+ {//************ so-2-2 ******************* -+ match_word_en = 0x0F; -+ if( !( (target_pkt.word_en&BIT0)|(tmp_pkt.word_en&BIT0) )) -+ { -+ match_word_en &= (~BIT0); -+ } -+ if( !( (target_pkt.word_en&BIT1)|(tmp_pkt.word_en&BIT1) )) -+ { -+ match_word_en &= (~BIT1); -+ } -+ if( !( (target_pkt.word_en&BIT2)|(tmp_pkt.word_en&BIT2) )) -+ { -+ match_word_en &= (~BIT2); -+ } -+ if( !( (target_pkt.word_en&BIT3)|(tmp_pkt.word_en&BIT3) )) -+ { -+ match_word_en &= (~BIT3); -+ } -+ -+ //************ so-2-2-A ******************* -+ if((match_word_en&0x0F)!=0x0F) -+ { -+ badworden = Efuse_WordEnableDataWrite(pAdapter,efuse_addr+1, tmp_pkt.word_en ,target_pkt.data, bPseudoTest); -+ -+ //************ so-2-2-A-1 ******************* -+ //############################ -+ if(0x0F != (badworden&0x0F)) -+ { -+ u8 reorg_offset = offset; -+ u8 reorg_worden=badworden; -+ Efuse_PgPacketWrite(pAdapter,reorg_offset,reorg_worden,originaldata, bPseudoTest); -+ } -+ //############################ -+ -+ tmp_word_en = 0x0F; -+ if( (target_pkt.word_en&BIT0)^(match_word_en&BIT0) ) -+ { -+ tmp_word_en &= (~BIT0); -+ } -+ if( (target_pkt.word_en&BIT1)^(match_word_en&BIT1) ) -+ { -+ tmp_word_en &= (~BIT1); -+ } -+ if( (target_pkt.word_en&BIT2)^(match_word_en&BIT2) ) -+ { -+ tmp_word_en &= (~BIT2); -+ } -+ if( (target_pkt.word_en&BIT3)^(match_word_en&BIT3) ) -+ { -+ tmp_word_en &=(~BIT3); -+ } -+ -+ //************ so-2-2-A-2 ******************* -+ if((tmp_word_en&0x0F)!=0x0F){ -+ //reorganize other pg packet -+ //efuse_addr = efuse_addr + (2*tmp_word_cnts) +1;//next pg packet addr -+ efuse_addr = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest); -+ //=========================== -+ target_pkt.offset = offset; -+ target_pkt.word_en= tmp_word_en; -+ //=========================== -+ }else{ -+ bContinual = _FALSE; -+ } -+ #if (EFUSE_ERROE_HANDLE == 1) -+ WriteState=PG_STATE_HEADER; -+ repeat_times++; -+ if(repeat_times>EFUSE_REPEAT_THRESHOLD_){ -+ bContinual = _FALSE; -+ bResult = _FALSE; -+ } -+ #endif -+ } -+ else{//************ so-2-2-B ******************* -+ //reorganize other pg packet -+ efuse_addr = efuse_addr + (2*tmp_word_cnts) +1;//next pg packet addr -+ //=========================== -+ target_pkt.offset = offset; -+ target_pkt.word_en= target_pkt.word_en; -+ //=========================== -+ #if (EFUSE_ERROE_HANDLE == 1) -+ WriteState=PG_STATE_HEADER; -+ #endif -+ } -+ } -+ } -+ //RTPRINT(FEEPROM, EFUSE_PG, ("EFUSE PG_STATE_HEADER-1\n")); -+ } -+ else //************ s1: header == oxff ******************* -+ { -+ pg_header = ((target_pkt.offset << 4)&0xf0) |target_pkt.word_en; -+ -+ efuse_OneByteWrite(pAdapter,efuse_addr, pg_header, bPseudoTest); -+ efuse_OneByteRead(pAdapter,efuse_addr, &tmp_header, bPseudoTest); -+ -+ if(tmp_header == pg_header) -+ { //************ s1-1******************* -+ WriteState = PG_STATE_DATA; -+ } -+ #if (EFUSE_ERROE_HANDLE == 1) -+ else if(tmp_header == 0xFF){//************ s1-3: if Write or read func doesn't work ******************* -+ //efuse_addr doesn't change -+ WriteState = PG_STATE_HEADER; -+ repeat_times++; -+ if(repeat_times>EFUSE_REPEAT_THRESHOLD_){ -+ bContinual = _FALSE; -+ bResult = _FALSE; -+ } -+ } -+ #endif -+ else -+ {//************ s1-2 : fixed the header procedure ******************* -+ tmp_pkt.offset = (tmp_header>>4) & 0x0F; -+ tmp_pkt.word_en= tmp_header & 0x0F; -+ tmp_word_cnts = Efuse_CalculateWordCnts(tmp_pkt.word_en); -+ -+ //************ s1-2-A :cover the exist data ******************* -+ //memset(originaldata,0xff,sizeof(UINT8)*8); -+ _rtw_memset((PVOID)originaldata, 0xff, sizeof(u8)*8); -+ -+ if(Efuse_PgPacketRead( pAdapter, tmp_pkt.offset,originaldata, bPseudoTest)) -+ { //check if data exist -+ //efuse_reg_ctrl(pAdapter,_TRUE);//power on -+ badworden = Efuse_WordEnableDataWrite(pAdapter,efuse_addr+1,tmp_pkt.word_en,originaldata, bPseudoTest); -+ //############################ -+ if(0x0F != (badworden&0x0F)) -+ { -+ u8 reorg_offset = tmp_pkt.offset; -+ u8 reorg_worden=badworden; -+ Efuse_PgPacketWrite(pAdapter,reorg_offset,reorg_worden,originaldata, bPseudoTest); -+ efuse_addr = Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest); -+ } -+ //############################ -+ else{ -+ efuse_addr = efuse_addr + (tmp_word_cnts*2) +1; //Next pg_packet -+ } -+ } -+ //************ s1-2-B: wrong address******************* -+ else -+ { -+ efuse_addr = efuse_addr + (tmp_word_cnts*2) +1; //Next pg_packet -+ } -+ -+ #if (EFUSE_ERROE_HANDLE == 1) -+ WriteState=PG_STATE_HEADER; -+ repeat_times++; -+ if(repeat_times>EFUSE_REPEAT_THRESHOLD_){ -+ bContinual = _FALSE; -+ bResult = _FALSE; -+ } -+ #endif -+ -+ //RTPRINT(FEEPROM, EFUSE_PG, ("EFUSE PG_STATE_HEADER-2\n")); -+ } -+ -+ } -+ -+ } -+ //write data state -+ else if(WriteState==PG_STATE_DATA) -+ { //************ s1-1 ******************* -+ //RTPRINT(FEEPROM, EFUSE_PG, ("EFUSE PG_STATE_DATA\n")); -+ badworden = 0x0f; -+ badworden = Efuse_WordEnableDataWrite(pAdapter,efuse_addr+1,target_pkt.word_en,target_pkt.data, bPseudoTest); -+ if((badworden&0x0F)==0x0F) -+ { //************ s1-1-A ******************* -+ bContinual = _FALSE; -+ } -+ else -+ {//reorganize other pg packet //************ s1-1-B ******************* -+ efuse_addr = efuse_addr + (2*target_word_cnts) +1;//next pg packet addr -+ -+ //=========================== -+ target_pkt.offset = offset; -+ target_pkt.word_en= badworden; -+ target_word_cnts = Efuse_CalculateWordCnts(target_pkt.word_en); -+ //=========================== -+ #if (EFUSE_ERROE_HANDLE == 1) -+ WriteState=PG_STATE_HEADER; -+ repeat_times++; -+ if(repeat_times>EFUSE_REPEAT_THRESHOLD_){ -+ bContinual = _FALSE; -+ bResult = _FALSE; -+ } -+ #endif -+ //RTPRINT(FEEPROM, EFUSE_PG, ("EFUSE PG_STATE_HEADER-3\n")); -+ } -+ } -+ } -+ -+ if(efuse_addr >= (EFUSE_REAL_CONTENT_LEN-EFUSE_OOB_PROTECT_BYTES)) -+ { -+ //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("hal_EfusePgPacketWrite_8192C(): efuse_addr(%#x) Out of size!!\n", efuse_addr)); -+ } -+ //efuse_reg_ctrl(pAdapter,_FALSE);//power off -+ -+ return _TRUE; -+} -+ -+static int -+Hal_EfusePgPacketWrite_Pseudo(IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret; -+ -+ ret = hal_EfusePgPacketWrite_8723(pAdapter, offset, word_en, data, bPseudoTest); -+ -+ return ret; -+} -+ -+static int -+Hal_EfusePgPacketWrite(IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret=0; -+ -+ if(IS_HARDWARE_TYPE_8192C(pAdapter)) -+ { -+ ret = hal_EfusePgPacketWrite_8192C(pAdapter, offset, word_en, data, bPseudoTest); -+ } -+ else if(IS_HARDWARE_TYPE_8723A(pAdapter)) -+ { -+ ret = hal_EfusePgPacketWrite_8723(pAdapter, offset, word_en, data, bPseudoTest); -+ } -+ -+ return ret; -+} -+ -+static int -+rtl8192c_Efuse_PgPacketWrite(IN PADAPTER pAdapter, -+ IN u8 offset, -+ IN u8 word_en, -+ IN u8 *data, -+ IN BOOLEAN bPseudoTest) -+{ -+ int ret; -+ -+ if(bPseudoTest) -+ { -+ ret = Hal_EfusePgPacketWrite_Pseudo(pAdapter, offset, word_en, data, bPseudoTest); -+ } -+ else -+ { -+ ret = Hal_EfusePgPacketWrite(pAdapter, offset, word_en, data, bPseudoTest); -+ } -+ return ret; -+} -+ -+VOID -+rtl8192c_EfuseParseIDCode( -+ IN PADAPTER pAdapter, -+ IN u8 *hwinfo -+ ) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ u16 i,EEPROMId; -+ -+ // Checl 0x8129 again for making sure autoload status!! -+ EEPROMId = *((u16 *)&hwinfo[0]); -+ if( le16_to_cpu(EEPROMId) != RTL_EEPROM_ID) -+ { -+ DBG_8192C("EEPROM ID(%#x) is invalid!!\n", EEPROMId); -+ pEEPROM->bautoload_fail_flag = _TRUE; -+ } -+ else -+ { -+ pEEPROM->bautoload_fail_flag = _FALSE; -+ } -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("EEPROM ID = 0x%4x\n", EEPROMId)); -+} -+ -+void rtl8192c_read_chip_version(PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ pHalData->VersionID = rtl8192c_ReadChipVersion(pAdapter); -+} -+ -+void hal_notch_filter_8192c(_adapter *adapter, bool enable) -+{ -+ if (enable) { -+ DBG_871X("Enable notch filter\n"); -+ rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) | BIT1); -+ } else { -+ DBG_871X("Disable notch filter\n"); -+ rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) & ~BIT1); -+ } -+} -+ -+void hal_reset_security_engine_8192c(_adapter * adapter) -+{ -+ rtw_write8(adapter, 0x522, 0xFF); -+ rtw_write8(adapter, 0x21, 0x35); -+ rtw_usleep_os(300); -+ rtw_write8(adapter, 0x101, rtw_read8(adapter,0x101)&~0x02); -+ rtw_write8(adapter, 0x101, rtw_read8(adapter,0x101)|0x02); -+ rtw_write8(adapter, 0x21, 0x55); -+ rtw_write8(adapter, 0x522, 0x00); -+} -+ -+s32 c2h_id_filter_ccx_8192c(u8 id) -+{ -+ s32 ret = _FALSE; -+ if (id == C2H_CCX_TX_RPT) -+ ret = _TRUE; -+ -+ return ret; -+} -+ -+static s32 c2h_handler_8192c(_adapter *padapter, struct c2h_evt_hdr *c2h_evt) -+{ -+ s32 ret = _SUCCESS; -+ u8 i = 0; -+ -+ if (c2h_evt == NULL) { -+ DBG_8192C("%s c2h_evt is NULL\n",__FUNCTION__); -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ switch (c2h_evt->id) { -+ case C2H_CCX_TX_RPT: -+ handle_txrpt_ccx_8192c(padapter, c2h_evt->payload); -+ break; -+ default: -+ ret = _FAIL; -+ break; -+ } -+ -+exit: -+ return ret; -+} -+ -+void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc) -+{ -+ pHalFunc->free_hal_data = &rtl8192c_free_hal_data; -+ -+ pHalFunc->dm_init = &rtl8192c_init_dm_priv; -+ pHalFunc->dm_deinit = &rtl8192c_deinit_dm_priv; -+ pHalFunc->read_chip_version = &rtl8192c_read_chip_version; -+ -+ pHalFunc->set_bwmode_handler = &PHY_SetBWMode8192C; -+ pHalFunc->set_channel_handler = &PHY_SwChnl8192C; -+ -+ pHalFunc->hal_dm_watchdog = &rtl8192c_HalDmWatchDog; -+ -+ pHalFunc->Add_RateATid = &rtl8192c_Add_RateATid; -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ pHalFunc->AntDivBeforeLinkHandler = &SwAntDivBeforeLink8192C; -+ pHalFunc->AntDivCompareHandler = &SwAntDivCompare8192C; -+#endif -+ -+ pHalFunc->read_bbreg = &rtl8192c_PHY_QueryBBReg; -+ pHalFunc->write_bbreg = &rtl8192c_PHY_SetBBReg; -+ pHalFunc->read_rfreg = &rtl8192c_PHY_QueryRFReg; -+ pHalFunc->write_rfreg = &rtl8192c_PHY_SetRFReg; -+ -+ //Efuse related function -+ pHalFunc->EfusePowerSwitch = &rtl8192c_EfusePowerSwitch; -+ pHalFunc->ReadEFuse = &rtl8192c_ReadEFuse; -+ pHalFunc->EFUSEGetEfuseDefinition = &rtl8192c_EFUSE_GetEfuseDefinition; -+ pHalFunc->EfuseGetCurrentSize = &rtl8192c_EfuseGetCurrentSize; -+ pHalFunc->Efuse_PgPacketRead = &rtl8192c_Efuse_PgPacketRead; -+ pHalFunc->Efuse_PgPacketWrite = &rtl8192c_Efuse_PgPacketWrite; -+ pHalFunc->Efuse_WordEnableDataWrite = &rtl8192c_Efuse_WordEnableDataWrite; -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+ pHalFunc->sreset_init_value = &sreset_init_value; -+ pHalFunc->sreset_reset_value = &sreset_reset_value; -+ pHalFunc->silentreset = &sreset_reset; -+ pHalFunc->sreset_xmit_status_check = &rtl8192c_sreset_xmit_status_check; -+ pHalFunc->sreset_linked_status_check = &rtl8192c_sreset_linked_status_check; -+ pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status; -+ pHalFunc->sreset_inprogress= &sreset_inprogress; -+#endif -+ -+#ifdef CONFIG_IOL -+ pHalFunc->IOL_exec_cmds_sync = &rtl8192c_IOL_exec_cmds_sync; -+#endif -+ pHalFunc->hal_notch_filter = &hal_notch_filter_8192c; -+ pHalFunc->hal_reset_security_engine = hal_reset_security_engine_8192c; -+ -+ pHalFunc->c2h_handler = c2h_handler_8192c; -+ pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8192c; -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c -@@ -0,0 +1,1207 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTL8192C_MP_C_ -+#ifdef CONFIG_MP_INCLUDED -+ -+#include -+#include -+ -+#ifdef CONFIG_RTL8192C -+#include -+#endif -+ -+ -+ -+s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ -+ if (!netif_running(padapter->pnetdev)) { -+ RT_TRACE(_module_mp_, _drv_warning_, ("SetPowerTracking! Fail: interface not opened!\n")); -+ return _FAIL; -+ } -+ -+ if (check_fwstate(&padapter->mlmepriv, WIFI_MP_STATE) == _FALSE) { -+ RT_TRACE(_module_mp_, _drv_warning_, ("SetPowerTracking! Fail: not in MP mode!\n")); -+ return _FAIL; -+ } -+ -+ if (enable) -+ pdmpriv->TxPowerTrackControl = _TRUE; -+ else -+ pdmpriv->TxPowerTrackControl = _FALSE; -+ -+ return _SUCCESS; -+} -+ -+void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ -+ *enable = pdmpriv->TxPowerTrackControl; -+} -+ -+static void Hal_disable_dm(PADAPTER padapter) -+{ -+ u8 v8; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ -+ //3 1. disable firmware dynamic mechanism -+ // disable Power Training, Rate Adaptive -+ v8 = rtw_read8(padapter, REG_BCN_CTRL); -+ v8 &= ~EN_BCN_FUNCTION; -+ rtw_write8(padapter, REG_BCN_CTRL, v8); -+ -+ //3 2. disable driver dynamic mechanism -+ // disable Dynamic Initial Gain -+ // disable High Power -+ // disable Power Tracking -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE); -+ -+ // enable APK, LCK and IQK but disable power tracking -+ pdmpriv->TxPowerTrackControl = _FALSE; -+ Switch_DM_Func(padapter, DYNAMIC_FUNC_SS, _TRUE); -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: mpt_SwitchRfSetting -+ * -+ * Overview: Change RF Setting when we siwthc channel/rate/BW for MP. -+ * -+ * Input: IN PADAPTER pAdapter -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 01/08/2009 MHC Suggestion from SD3 Willis for 92S series. -+ * 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3. -+ * -+ *---------------------------------------------------------------------------*/ -+void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct mp_priv *pmp = &pAdapter->mppriv; -+ u8 ChannelToSw = pmp->channel, eRFPath = RF_PATH_A; -+ u8 ulRateIdx = pmp->rateidx; -+ u8 ulbandwidth = pmp->bandwidth; -+ PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); -+ BOOLEAN bInteralPA = _FALSE; -+ u32 value = 0; -+ -+#ifdef CONFIG_USB_HCI -+ if (IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ //92CE-VAU (92cu mCard) -+ if( BOARD_MINICARD == pHalData->BoardType) -+ { -+ if (ulRateIdx < MPT_RATE_6M) // CCK rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x0F400); -+ } -+ else //OFDM~MCS rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F000); -+ } -+ } -+ else //92CU dongle -+ { -+ if (ulRateIdx < MPT_RATE_6M) // CCK rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x0F400); -+ } -+ else if (ChannelToSw & BIT0) // OFDM rate, odd number channel -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F200); -+ } -+ else if (ChannelToSw == 4) // OFDM rate, even number channel -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x28200); -+ write_rfreg(pAdapter, 0, RF_SYN_G6, 0xe0004); -+ write_rfreg(pAdapter, 0, RF_SYN_G7, 0x709); -+ rtw_msleep_os(1); -+ write_rfreg(pAdapter, 0, RF_SYN_G7, 0x4B333); -+ } -+ else if(ChannelToSw == 10) // OFDM rate, even number channel -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x28000); -+ write_rfreg(pAdapter, 0, RF_SYN_G6, 0xe000A); -+ write_rfreg(pAdapter, 0, RF_SYN_G7, 0x709); -+ rtw_msleep_os(1); -+ write_rfreg(pAdapter, 0, RF_SYN_G7, 0x7B333); -+ } -+ else if(ChannelToSw == 12) // OFDM rate, even number channel -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x28200); -+ write_rfreg(pAdapter, 0, RF_SYN_G6, 0xe000C); -+ write_rfreg(pAdapter, 0, RF_SYN_G7, 0x50B); -+ rtw_msleep_os(1); -+ write_rfreg(pAdapter, 0, RF_SYN_G7, 0x4B333); -+ } -+ else -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F200); -+ } -+ } -+ } -+ else //88cu -+ { -+ -+ //mcard interface -+ -+ if( BOARD_MINICARD == pHalData->BoardType) -+ { -+ if (ulRateIdx < MPT_RATE_6M) // CCK rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x0F400); -+ } -+ else //OFDM~MCS rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F200); -+ } -+ -+ if(ChannelToSw == 6 || ChannelToSw == 8) -+ { -+ write_bbreg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0, 0x22); -+ write_bbreg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0, 0x22); -+ write_bbreg(pAdapter, rOFDM0_RxDetector1, bMaskByte0, 0x4F); -+ } -+ else -+ { -+ write_bbreg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0, 0x20); -+ write_bbreg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0, 0x20); -+ write_bbreg(pAdapter, rOFDM0_RxDetector1, bMaskByte0, pMptCtx->backup0xc30); -+ } -+ } -+ else -+ { -+ if (ulRateIdx < MPT_RATE_6M) // CCK rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x0F400); -+ } -+ else if (ChannelToSw & BIT0) // OFDM rate, odd number channel -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F200); -+ } -+ else -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F000); -+ } -+ } -+ } -+ -+#else //PCI_INTERFACE -+ -+ if (ulRateIdx < MPT_RATE_6M) // CCK rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x0F400); -+ } -+ else //OFDM~MCS rate -+ { -+ write_rfreg(pAdapter, 0, RF_SYN_G2, 0x4F000); -+ } -+ //88CE -+ if(!IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ if(ChannelToSw == 6 || ChannelToSw == 8) -+ { -+ write_bbreg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0, 0x22); -+ write_bbreg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0, 0x22); -+ write_bbreg(pAdapter, rOFDM0_RxDetector1, bMaskByte0, 0x4F); -+ } -+ else -+ { -+ write_bbreg(pAdapter, rOFDM0_XAAGCCore1, bMaskByte0, pMptCtx->backup0xc50); -+ write_bbreg(pAdapter, rOFDM0_XBAGCCore1, bMaskByte0, pMptCtx->backup0xc58); -+ write_bbreg(pAdapter, rOFDM0_RxDetector1, bMaskByte0, pMptCtx->backup0xc30); -+ } -+ } -+ -+#endif //CONFIG_USB_HCI -+ -+ -+} -+/*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ -+ -+/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ -+void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) -+{ -+ u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0; -+ u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12; -+ u8 i; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ -+ // get current cck swing value and check 0xa22 & 0xa23 later to match the table. -+ CurrCCKSwingVal = read_bbreg(Adapter, rCCK0_TxFilter1, bMaskHWord); -+ -+ if (!bInCH14) -+ { -+ // Readback the current bb cck swing value and compare with the table to -+ // get the current swing index -+ for (i = 0; i < CCK_TABLE_SIZE; i++) -+ { -+ if (((CurrCCKSwingVal&0xff) == (u32)CCKSwingTable_Ch1_Ch13[i][0]) && -+ (((CurrCCKSwingVal&0xff00)>>8) == (u32)CCKSwingTable_Ch1_Ch13[i][1])) -+ { -+ CCKSwingIndex = i; -+// RT_TRACE(COMP_INIT, DBG_LOUD,("Ch1~13, Current reg0x%x = 0x%lx, CCKSwingIndex=0x%x\n", -+// (rCCK0_TxFilter1+2), CurrCCKSwingVal, CCKSwingIndex)); -+ break; -+ } -+ } -+ -+ //Write 0xa22 0xa23 -+ TempVal = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][0] + -+ (CCKSwingTable_Ch1_Ch13[CCKSwingIndex][1]<<8) ; -+ -+ -+ //Write 0xa24 ~ 0xa27 -+ TempVal2 = 0; -+ TempVal2 = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][2] + -+ (CCKSwingTable_Ch1_Ch13[CCKSwingIndex][3]<<8) + -+ (CCKSwingTable_Ch1_Ch13[CCKSwingIndex][4]<<16 )+ -+ (CCKSwingTable_Ch1_Ch13[CCKSwingIndex][5]<<24); -+ -+ //Write 0xa28 0xa29 -+ TempVal3 = 0; -+ TempVal3 = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][6] + -+ (CCKSwingTable_Ch1_Ch13[CCKSwingIndex][7]<<8) ; -+ } -+ else -+ { -+ for (i = 0; i < CCK_TABLE_SIZE; i++) -+ { -+ if (((CurrCCKSwingVal&0xff) == (u32)CCKSwingTable_Ch14[i][0]) && -+ (((CurrCCKSwingVal&0xff00)>>8) == (u32)CCKSwingTable_Ch14[i][1])) -+ { -+ CCKSwingIndex = i; -+// RT_TRACE(COMP_INIT, DBG_LOUD,("Ch14, Current reg0x%x = 0x%lx, CCKSwingIndex=0x%x\n", -+// (rCCK0_TxFilter1+2), CurrCCKSwingVal, CCKSwingIndex)); -+ break; -+ } -+ } -+ -+ //Write 0xa22 0xa23 -+ TempVal = CCKSwingTable_Ch14[CCKSwingIndex][0] + -+ (CCKSwingTable_Ch14[CCKSwingIndex][1]<<8) ; -+ -+ //Write 0xa24 ~ 0xa27 -+ TempVal2 = 0; -+ TempVal2 = CCKSwingTable_Ch14[CCKSwingIndex][2] + -+ (CCKSwingTable_Ch14[CCKSwingIndex][3]<<8) + -+ (CCKSwingTable_Ch14[CCKSwingIndex][4]<<16 )+ -+ (CCKSwingTable_Ch14[CCKSwingIndex][5]<<24); -+ -+ //Write 0xa28 0xa29 -+ TempVal3 = 0; -+ TempVal3 = CCKSwingTable_Ch14[CCKSwingIndex][6] + -+ (CCKSwingTable_Ch14[CCKSwingIndex][7]<<8) ; -+ } -+ -+ write_bbreg(Adapter, rCCK0_TxFilter1, bMaskHWord, TempVal); -+ write_bbreg(Adapter, rCCK0_TxFilter2, bMaskDWord, TempVal2); -+ write_bbreg(Adapter, rCCK0_DebugPort, bMaskLWord, TempVal3); -+} -+ -+void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven) -+{ -+ s32 TempCCk; -+ u8 CCK_index, CCK_index_old; -+ u8 Action = 0; //0: no action, 1: even->odd, 2:odd->even -+ u8 TimeOut = 100; -+ s32 i = 0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; -+ -+ -+ if (!IS_92C_SERIAL(pHalData->VersionID)) -+ return; -+#if 0 -+ while(PlatformAtomicExchange(&Adapter->IntrCCKRefCount, TRUE) == TRUE) -+ { -+ PlatformSleepUs(100); -+ TimeOut--; -+ if(TimeOut <= 0) -+ { -+ RTPRINT(FINIT, INIT_TxPower, -+ ("!!!MPT_CCKTxPowerAdjustbyIndex Wait for check CCK gain index too long!!!\n" )); -+ break; -+ } -+ } -+#endif -+ if (beven && !pMptCtx->bMptIndexEven) //odd->even -+ { -+ Action = 2; -+ pMptCtx->bMptIndexEven = _TRUE; -+ } -+ else if (!beven && pMptCtx->bMptIndexEven) //even->odd -+ { -+ Action = 1; -+ pMptCtx->bMptIndexEven = _FALSE; -+ } -+ -+ if (Action != 0) -+ { -+ //Query CCK default setting From 0xa24 -+ TempCCk = read_bbreg(pAdapter, rCCK0_TxFilter2, bMaskDWord) & bMaskCCK; -+ for (i = 0; i < CCK_TABLE_SIZE; i++) -+ { -+ if (pHalData->dmpriv.bCCKinCH14) -+ { -+ if (_rtw_memcmp((void*)&TempCCk, (void*)&CCKSwingTable_Ch14[i][2], 4) == _TRUE) -+ { -+ CCK_index_old = (u8) i; -+// RTPRINT(FINIT, INIT_TxPower,("MPT_CCKTxPowerAdjustbyIndex: Initial reg0x%x = 0x%lx, CCK_index=0x%x, ch 14 %d\n", -+// rCCK0_TxFilter2, TempCCk, CCK_index_old, pHalData->bCCKinCH14)); -+ break; -+ } -+ } -+ else -+ { -+ if (_rtw_memcmp((void*)&TempCCk, (void*)&CCKSwingTable_Ch1_Ch13[i][2], 4) == _TRUE) -+ { -+ CCK_index_old = (u8) i; -+// RTPRINT(FINIT, INIT_TxPower,("MPT_CCKTxPowerAdjustbyIndex: Initial reg0x%x = 0x%lx, CCK_index=0x%x, ch14 %d\n", -+// rCCK0_TxFilter2, TempCCk, CCK_index_old, pHalData->bCCKinCH14)); -+ break; -+ } -+ } -+ } -+ -+ if (Action == 1) -+ CCK_index = CCK_index_old - 1; -+ else -+ CCK_index = CCK_index_old + 1; -+ -+// RTPRINT(FINIT, INIT_TxPower,("MPT_CCKTxPowerAdjustbyIndex: new CCK_index=0x%x\n", -+// CCK_index)); -+ -+ //Adjust CCK according to gain index -+ if (!pHalData->dmpriv.bCCKinCH14) { -+ rtw_write8(pAdapter, 0xa22, CCKSwingTable_Ch1_Ch13[CCK_index][0]); -+ rtw_write8(pAdapter, 0xa23, CCKSwingTable_Ch1_Ch13[CCK_index][1]); -+ rtw_write8(pAdapter, 0xa24, CCKSwingTable_Ch1_Ch13[CCK_index][2]); -+ rtw_write8(pAdapter, 0xa25, CCKSwingTable_Ch1_Ch13[CCK_index][3]); -+ rtw_write8(pAdapter, 0xa26, CCKSwingTable_Ch1_Ch13[CCK_index][4]); -+ rtw_write8(pAdapter, 0xa27, CCKSwingTable_Ch1_Ch13[CCK_index][5]); -+ rtw_write8(pAdapter, 0xa28, CCKSwingTable_Ch1_Ch13[CCK_index][6]); -+ rtw_write8(pAdapter, 0xa29, CCKSwingTable_Ch1_Ch13[CCK_index][7]); -+ } else { -+ rtw_write8(pAdapter, 0xa22, CCKSwingTable_Ch14[CCK_index][0]); -+ rtw_write8(pAdapter, 0xa23, CCKSwingTable_Ch14[CCK_index][1]); -+ rtw_write8(pAdapter, 0xa24, CCKSwingTable_Ch14[CCK_index][2]); -+ rtw_write8(pAdapter, 0xa25, CCKSwingTable_Ch14[CCK_index][3]); -+ rtw_write8(pAdapter, 0xa26, CCKSwingTable_Ch14[CCK_index][4]); -+ rtw_write8(pAdapter, 0xa27, CCKSwingTable_Ch14[CCK_index][5]); -+ rtw_write8(pAdapter, 0xa28, CCKSwingTable_Ch14[CCK_index][6]); -+ rtw_write8(pAdapter, 0xa29, CCKSwingTable_Ch14[CCK_index][7]); -+ } -+ } -+#if 0 -+ RTPRINT(FINIT, INIT_TxPower, -+ ("MPT_CCKTxPowerAdjustbyIndex 0xa20=%x\n", PlatformEFIORead4Byte(Adapter, 0xa20))); -+ -+ PlatformAtomicExchange(&Adapter->IntrCCKRefCount, FALSE); -+#endif -+} -+/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ -+ -+/* -+ * SetChannel -+ * Description -+ * Use H2C command to change channel, -+ * not only modify rf register, but also other setting need to be done. -+ */ -+void Hal_SetChannel(PADAPTER pAdapter) -+{ -+#if 0 -+ struct mp_priv *pmp = &pAdapter->mppriv; -+ -+// SelectChannel(pAdapter, pmp->channel); -+ set_channel_bwmode(pAdapter, pmp->channel, pmp->channel_offset, pmp->bandwidth); -+#else -+ u8 eRFPath; -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct mp_priv *pmp = &pAdapter->mppriv; -+ u8 channel = pmp->channel; -+ u8 bandwidth = pmp->bandwidth; -+ u8 rate = pmp->rateidx; -+ -+ -+ // set RF channel register -+ for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) -+ { -+ if(IS_HARDWARE_TYPE_8192D(pAdapter)) -+ _write_rfreg(pAdapter, (RF_RADIO_PATH_E)eRFPath, rRfChannel, 0xFF, channel); -+ else -+ _write_rfreg(pAdapter, eRFPath, rRfChannel, 0x3FF, channel); -+ } -+ Hal_mpt_SwitchRfSetting(pAdapter); -+ -+ SelectChannel(pAdapter, channel); -+ -+ if (pHalData->CurrentChannel == 14 && !pHalData->dmpriv.bCCKinCH14) { -+ pHalData->dmpriv.bCCKinCH14 = _TRUE; -+ Hal_MPT_CCKTxPowerAdjust(pAdapter, pHalData->dmpriv.bCCKinCH14); -+ } -+ else if (pHalData->CurrentChannel != 14 && pHalData->dmpriv.bCCKinCH14) { -+ pHalData->dmpriv.bCCKinCH14 = _FALSE; -+ Hal_MPT_CCKTxPowerAdjust(pAdapter, pHalData->dmpriv.bCCKinCH14); -+ } -+ -+#endif -+} -+ -+/* -+ * Notice -+ * Switch bandwitdth may change center frequency(channel) -+ */ -+void Hal_SetBandwidth(PADAPTER pAdapter) -+{ -+ struct mp_priv *pmp = &pAdapter->mppriv; -+ -+ -+ SetBWMode(pAdapter, pmp->bandwidth, pmp->prime_channel_offset); -+ Hal_mpt_SwitchRfSetting(pAdapter); -+} -+ -+void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower) -+{ -+ u32 tmpval = 0; -+ -+ -+ // rf-A cck tx power -+ write_bbreg(pAdapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, TxPower[RF_PATH_A]); -+ tmpval = (TxPower[RF_PATH_A]<<16) | (TxPower[RF_PATH_A]<<8) | TxPower[RF_PATH_A]; -+ write_bbreg(pAdapter, rTxAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval); -+ -+ // rf-B cck tx power -+ write_bbreg(pAdapter, rTxAGC_B_CCK11_A_CCK2_11, bMaskByte0, TxPower[RF_PATH_B]); -+ tmpval = (TxPower[RF_PATH_B]<<16) | (TxPower[RF_PATH_B]<<8) | TxPower[RF_PATH_B]; -+ write_bbreg(pAdapter, rTxAGC_B_CCK1_55_Mcs32, 0xffffff00, tmpval); -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-SetCCKTxPower: A[0x%02x] B[0x%02x]\n", -+ TxPower[RF_PATH_A], TxPower[RF_PATH_B])); -+} -+ -+void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) -+{ -+ u32 TxAGC = 0; -+ u8 tmpval = 0; -+ PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ -+ // HT Tx-rf(A) -+ tmpval = TxPower[RF_PATH_A]; -+ TxAGC = (tmpval<<24) | (tmpval<<16) | (tmpval<<8) | tmpval; -+ -+ write_bbreg(pAdapter, rTxAGC_A_Rate18_06, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_A_Rate54_24, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_A_Mcs03_Mcs00, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_A_Mcs07_Mcs04, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_A_Mcs11_Mcs08, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_A_Mcs15_Mcs12, bMaskDWord, TxAGC); -+ -+ // HT Tx-rf(B) -+ tmpval = TxPower[RF_PATH_B]; -+ TxAGC = (tmpval<<24) | (tmpval<<16) | (tmpval<<8) | tmpval; -+ -+ write_bbreg(pAdapter, rTxAGC_B_Rate18_06, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_B_Rate54_24, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_B_Mcs03_Mcs00, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_B_Mcs07_Mcs04, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_B_Mcs11_Mcs08, bMaskDWord, TxAGC); -+ write_bbreg(pAdapter, rTxAGC_B_Mcs15_Mcs12, bMaskDWord, TxAGC); -+ -+ RT_TRACE(_module_mp_, _drv_notice_, -+ ("-SetOFDMTxPower: A[0x%02x] B[0x%02x]\n", -+ TxPower[RF_PATH_A], TxPower[RF_PATH_B])); -+} -+ -+void Hal_SetAntennaPathPower(PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ u8 TxPowerLevel[MAX_RF_PATH_NUMS]; -+ u8 rfPath; -+ -+ TxPowerLevel[RF_PATH_A] = pAdapter->mppriv.txpoweridx; -+ TxPowerLevel[RF_PATH_B] = pAdapter->mppriv.txpoweridx_b; -+ -+ switch (pAdapter->mppriv.antenna_tx) -+ { -+ case ANTENNA_A: -+ default: -+ rfPath = RF_PATH_A; -+ break; -+ case ANTENNA_B: -+ rfPath = RF_PATH_B; -+ break; -+ case ANTENNA_C: -+ rfPath = RF_PATH_C; -+ break; -+ } -+ -+ switch (pHalData->rf_chip) -+ { -+ case RF_8225: -+ case RF_8256: -+ case RF_6052: -+ Hal_SetCCKTxPower(pAdapter, TxPowerLevel); -+ if (pAdapter->mppriv.rateidx < MPT_RATE_6M) // CCK rate -+ Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter, TxPowerLevel[rfPath]%2 == 0); -+ Hal_SetOFDMTxPower(pAdapter, TxPowerLevel); -+ break; -+ -+ default: -+ break; -+ } -+} -+ -+void Hal_SetTxPower(PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ u8 TxPower = pAdapter->mppriv.txpoweridx; -+ u8 TxPowerLevel[MAX_RF_PATH_NUMS]; -+ u8 rf, rfPath; -+ -+ for (rf = 0; rf < MAX_RF_PATH_NUMS; rf++) { -+ TxPowerLevel[rf] = TxPower; -+ } -+ -+ switch (pAdapter->mppriv.antenna_tx) -+ { -+ case ANTENNA_A: -+ default: -+ rfPath = RF_PATH_A; -+ break; -+ case ANTENNA_B: -+ rfPath = RF_PATH_B; -+ break; -+ case ANTENNA_C: -+ rfPath = RF_PATH_C; -+ break; -+ } -+ -+ switch (pHalData->rf_chip) -+ { -+ // 2008/09/12 MH Test only !! We enable the TX power tracking for MP!!!!! -+ // We should call normal driver API later!! -+ case RF_8225: -+ case RF_8256: -+ case RF_6052: -+ Hal_SetCCKTxPower(pAdapter, TxPowerLevel); -+ if (pAdapter->mppriv.rateidx < MPT_RATE_6M) // CCK rate -+ Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter, TxPowerLevel[rfPath]%2 == 0); -+ Hal_SetOFDMTxPower(pAdapter, TxPowerLevel); -+ break; -+ -+ default: -+ break; -+ } -+ -+// SetCCKTxPower(pAdapter, TxPower); -+// SetOFDMTxPower(pAdapter, TxPower); -+} -+ -+void Hal_SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset) -+{ -+ u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC; -+ -+ TxAGCOffset_B = (ulTxAGCOffset&0x000000ff); -+ TxAGCOffset_C = ((ulTxAGCOffset&0x0000ff00)>>8); -+ TxAGCOffset_D = ((ulTxAGCOffset&0x00ff0000)>>16); -+ -+ tmpAGC = (TxAGCOffset_D<<8 | TxAGCOffset_C<<4 | TxAGCOffset_B); -+ write_bbreg(pAdapter, rFPGA0_TxGainStage, -+ (bXBTxAGC|bXCTxAGC|bXDTxAGC), tmpAGC); -+} -+ -+void Hal_SetDataRate(PADAPTER pAdapter) -+{ -+ Hal_mpt_SwitchRfSetting(pAdapter); -+} -+ -+#if !defined (CONFIG_RTL8192C) && !defined (CONFIG_RTL8192D) -+/*------------------------------Define structure----------------------------*/ -+typedef struct _R_ANTENNA_SELECT_OFDM { -+ u32 r_tx_antenna:4; -+ u32 r_ant_l:4; -+ u32 r_ant_non_ht:4; -+ u32 r_ant_ht1:4; -+ u32 r_ant_ht2:4; -+ u32 r_ant_ht_s1:4; -+ u32 r_ant_non_ht_s1:4; -+ u32 OFDM_TXSC:2; -+ u32 Reserved:2; -+}R_ANTENNA_SELECT_OFDM; -+ -+typedef struct _R_ANTENNA_SELECT_CCK { -+ u8 r_cckrx_enable_2:2; -+ u8 r_cckrx_enable:2; -+ u8 r_ccktx_enable:4; -+}R_ANTENNA_SELECT_CCK; -+#endif -+ -+void Hal_SetAntenna(PADAPTER pAdapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ R_ANTENNA_SELECT_OFDM *p_ofdm_tx; /* OFDM Tx register */ -+ R_ANTENNA_SELECT_CCK *p_cck_txrx; -+ -+ u8 r_rx_antenna_ofdm = 0, r_ant_select_cck_val = 0; -+ u8 chgTx = 0, chgRx = 0; -+ u32 r_ant_sel_cck_val = 0, r_ant_select_ofdm_val = 0, r_ofdm_tx_en_val = 0; -+ -+ -+ p_ofdm_tx = (R_ANTENNA_SELECT_OFDM *)&r_ant_select_ofdm_val; -+ p_cck_txrx = (R_ANTENNA_SELECT_CCK *)&r_ant_select_cck_val; -+ -+ p_ofdm_tx->r_ant_ht1 = 0x1; -+ p_ofdm_tx->r_ant_ht2 = 0x2; // Second TX RF path is A -+ p_ofdm_tx->r_ant_non_ht = 0x3; // 0x1+0x2=0x3 -+ -+ switch (pAdapter->mppriv.antenna_tx) -+ { -+ case ANTENNA_A: -+ p_ofdm_tx->r_tx_antenna = 0x1; -+ r_ofdm_tx_en_val = 0x1; -+ p_ofdm_tx->r_ant_l = 0x1; -+ p_ofdm_tx->r_ant_ht_s1 = 0x1; -+ p_ofdm_tx->r_ant_non_ht_s1 = 0x1; -+ p_cck_txrx->r_ccktx_enable = 0x8; -+ chgTx = 1; -+ -+ // From SD3 Willis suggestion !!! Set RF A=TX and B as standby -+// if (IS_HARDWARE_TYPE_8192S(pAdapter)) -+ { -+ write_bbreg(pAdapter, rFPGA0_XA_HSSIParameter2, 0xe, 2); -+ write_bbreg(pAdapter, rFPGA0_XB_HSSIParameter2, 0xe, 1); -+ r_ofdm_tx_en_val = 0x3; -+ -+ // Power save -+ //cosa r_ant_select_ofdm_val = 0x11111111; -+ -+ // We need to close RFB by SW control -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT10, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT26, 1); -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT10, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT1, 1); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT17, 0); -+ } -+ } -+ break; -+ -+ case ANTENNA_B: -+ p_ofdm_tx->r_tx_antenna = 0x2; -+ r_ofdm_tx_en_val = 0x2; -+ p_ofdm_tx->r_ant_l = 0x2; -+ p_ofdm_tx->r_ant_ht_s1 = 0x2; -+ p_ofdm_tx->r_ant_non_ht_s1 = 0x2; -+ p_cck_txrx->r_ccktx_enable = 0x4; -+ chgTx = 1; -+ -+ // From SD3 Willis suggestion !!! Set RF A as standby -+ //if (IS_HARDWARE_TYPE_8192S(pAdapter)) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_HSSIParameter2, 0xe, 1); -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_HSSIParameter2, 0xe, 2); -+// r_ofdm_tx_en_val = 0x3; -+ -+ // Power save -+ //cosa r_ant_select_ofdm_val = 0x22222222; -+ -+ // 2008/10/31 MH From SD3 Willi's suggestion. We must read RF 1T table. -+ // 2009/01/08 MH From Sd3 Willis. We need to close RFA by SW control -+ if (pHalData->rf_type == RF_2T2R || pHalData->rf_type == RF_1T2R) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT10, 1); -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, BIT10, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT26, 0); -+// PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT10, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT1, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT17, 1); -+ } -+ } -+ break; -+ -+ case ANTENNA_AB: // For 8192S -+ p_ofdm_tx->r_tx_antenna = 0x3; -+ r_ofdm_tx_en_val = 0x3; -+ p_ofdm_tx->r_ant_l = 0x3; -+ p_ofdm_tx->r_ant_ht_s1 = 0x3; -+ p_ofdm_tx->r_ant_non_ht_s1 = 0x3; -+ p_cck_txrx->r_ccktx_enable = 0xC; -+ chgTx = 1; -+ -+ // From SD3 Willis suggestion !!! Set RF B as standby -+ //if (IS_HARDWARE_TYPE_8192S(pAdapter)) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_HSSIParameter2, 0xe, 2); -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_HSSIParameter2, 0xe, 2); -+ -+ // Disable Power save -+ //cosa r_ant_select_ofdm_val = 0x3321333; -+#if 0 -+ // 2008/10/31 MH From SD3 Willi's suggestion. We must read RFA 2T table. -+ if ((pHalData->VersionID == VERSION_8192S_ACUT)) // For RTL8192SU A-Cut only, by Roger, 2008.11.07. -+ { -+ mpt_RFConfigFromPreParaArrary(pAdapter, 1, RF_PATH_A); -+ } -+#endif -+ // 2009/01/08 MH From Sd3 Willis. We need to enable RFA/B by SW control -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT10, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT26, 0); -+// PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT10, 0); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT1, 1); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT17, 1); -+ } -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+ // -+ // r_rx_antenna_ofdm, bit0=A, bit1=B, bit2=C, bit3=D -+ // r_cckrx_enable : CCK default, 0=A, 1=B, 2=C, 3=D -+ // r_cckrx_enable_2 : CCK option, 0=A, 1=B, 2=C, 3=D -+ // -+ switch (pAdapter->mppriv.antenna_rx) -+ { -+ case ANTENNA_A: -+ r_rx_antenna_ofdm = 0x1; // A -+ p_cck_txrx->r_cckrx_enable = 0x0; // default: A -+ p_cck_txrx->r_cckrx_enable_2 = 0x0; // option: A -+ chgRx = 1; -+ break; -+ -+ case ANTENNA_B: -+ r_rx_antenna_ofdm = 0x2; // B -+ p_cck_txrx->r_cckrx_enable = 0x1; // default: B -+ p_cck_txrx->r_cckrx_enable_2 = 0x1; // option: B -+ chgRx = 1; -+ break; -+ -+ case ANTENNA_AB: -+ r_rx_antenna_ofdm = 0x3; // AB -+ p_cck_txrx->r_cckrx_enable = 0x0; // default:A -+ p_cck_txrx->r_cckrx_enable_2 = 0x1; // option:B -+ chgRx = 1; -+ break; -+ -+ default: -+ break; -+ } -+ -+ if (chgTx && chgRx) -+ { -+ switch(pHalData->rf_chip) -+ { -+ case RF_8225: -+ case RF_8256: -+ case RF_6052: -+ //r_ant_sel_cck_val = r_ant_select_cck_val; -+ PHY_SetBBReg(pAdapter, rFPGA1_TxInfo, 0x7fffffff, r_ant_select_ofdm_val); //OFDM Tx -+ PHY_SetBBReg(pAdapter, rFPGA0_TxInfo, 0x0000000f, r_ofdm_tx_en_val); //OFDM Tx -+ PHY_SetBBReg(pAdapter, rOFDM0_TRxPathEnable, 0x0000000f, r_rx_antenna_ofdm); //OFDM Rx -+ PHY_SetBBReg(pAdapter, rOFDM1_TRxPathEnable, 0x0000000f, r_rx_antenna_ofdm); //OFDM Rx -+ PHY_SetBBReg(pAdapter, rCCK0_AFESetting, bMaskByte3, r_ant_select_cck_val);//r_ant_sel_cck_val); //CCK TxRx -+ -+ break; -+ -+ default: -+ break; -+ } -+ } -+ -+ RT_TRACE(_module_mp_, _drv_notice_, ("-SwitchAntenna: finished\n")); -+} -+ -+s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ -+ if (!netif_running(pAdapter->pnetdev)) { -+ RT_TRACE(_module_mp_, _drv_warning_, ("SetThermalMeter! Fail: interface not opened!\n")); -+ return _FAIL; -+ } -+ -+ if (check_fwstate(&pAdapter->mlmepriv, WIFI_MP_STATE) == _FALSE) { -+ RT_TRACE(_module_mp_, _drv_warning_, ("SetThermalMeter: Fail! not in MP mode!\n")); -+ return _FAIL; -+ } -+ -+ target_ther &= 0xff; -+ if (target_ther < 0x07) -+ target_ther = 0x07; -+ else if (target_ther > 0x1d) -+ target_ther = 0x1d; -+ -+ pHalData->EEPROMThermalMeter = target_ther; -+ -+ return _SUCCESS; -+} -+ -+void Hal_TriggerRFThermalMeter(PADAPTER pAdapter) -+{ -+ -+ write_rfreg(pAdapter, RF_PATH_A, RF_T_METER, 0x60); // 0x24: RF Reg[6:5] -+ -+// RT_TRACE(_module_mp_,_drv_alert_, ("TriggerRFThermalMeter() finished.\n" )); -+} -+ -+u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter) -+{ -+ u32 ThermalValue = 0; -+ -+ ThermalValue = _read_rfreg(pAdapter, RF_PATH_A, RF_T_METER, 0x1F); // 0x24: RF Reg[4:0] -+// RT_TRACE(_module_mp_, _drv_alert_, ("ThermalValue = 0x%x\n", ThermalValue)); -+ return (u8)ThermalValue; -+} -+ -+void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value) -+{ -+#if 0 -+ fw_cmd(pAdapter, IOCMD_GET_THERMAL_METER); -+ rtw_msleep_os(1000); -+ fw_cmd_data(pAdapter, value, 1); -+ *value &= 0xFF; -+#else -+ -+ Hal_TriggerRFThermalMeter(pAdapter); -+ rtw_msleep_os(1000); -+ *value = Hal_ReadRFThermalMeter(pAdapter); -+#endif -+} -+ -+void Hal_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ pAdapter->mppriv.MptCtx.bSingleCarrier = bStart; -+ if (bStart)// Start Single Carrier. -+ { -+ RT_TRACE(_module_mp_,_drv_alert_, ("SetSingleCarrierTx: test start\n")); -+ // 1. if OFDM block on? -+ if(!read_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn)) -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, bEnable);//set OFDM block on -+ -+ { -+ // 2. set CCK test mode off, set to CCK normal mode -+ write_bbreg(pAdapter, rCCK0_System, bCCKBBMode, bDisable); -+ // 3. turn on scramble setting -+ write_bbreg(pAdapter, rCCK0_System, bCCKScramble, bEnable); -+ } -+ // 4. Turn On Single Carrier Tx and turn off the other test modes. -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMContinueTx, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleCarrier, bEnable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleTone, bDisable); -+#ifdef CONFIG_RTL8192C -+ // 5. Disable TX power saving at STF & LLTF -+ write_bbreg(pAdapter, rOFDM1_LSTF, BIT22, 1); -+#endif -+ } -+ else// Stop Single Carrier. -+ { -+ RT_TRACE(_module_mp_,_drv_alert_, ("SetSingleCarrierTx: test stop\n")); -+ -+ // Turn off all test modes. -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMContinueTx, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleCarrier, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleTone, bDisable); -+#ifdef CONFIG_RTL8192C -+ // Cancel disable TX power saving at STF&LLTF -+ write_bbreg(pAdapter, rOFDM1_LSTF, BIT22, 0); -+#endif -+ //Delay 10 ms //delay_ms(10); -+ rtw_msleep_os(10); -+ -+ //BB Reset -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x0); -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x1); -+ } -+} -+ -+ -+void Hal_SetSingleToneTx(PADAPTER pAdapter, u8 bStart) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ BOOLEAN is92C = IS_92C_SERIAL(pHalData->VersionID); -+ -+ u8 rfPath; -+ -+ switch (pAdapter->mppriv.antenna_tx) -+ { -+ case ANTENNA_A: -+ default: -+ rfPath = RF_PATH_A; -+ break; -+ case ANTENNA_B: -+ rfPath = RF_PATH_B; -+ break; -+ case ANTENNA_C: -+ rfPath = RF_PATH_C; -+ break; -+ } -+ -+ pAdapter->mppriv.MptCtx.bSingleTone = bStart; -+ if (bStart)// Start Single Tone. -+ { -+ RT_TRACE(_module_mp_,_drv_alert_, ("SetSingleToneTx: test start\n")); -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x0); -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x0); -+ -+ if (is92C) -+ { -+ _write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x01); -+ rtw_usleep_os(100); -+ if (rfPath == RF_PATH_A) -+ write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x10000); // PAD all on. -+ else if (rfPath == RF_PATH_B) -+ write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x10000); // PAD all on. -+ } else { -+ write_rfreg(pAdapter, rfPath, 0x21, 0xd4000); -+ rtw_usleep_os(100); -+ } -+ -+ write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); // PAD all on. -+ rtw_usleep_os(100); -+ } -+ else// Stop Single Tone. -+ { -+ RT_TRACE(_module_mp_,_drv_alert_, ("SetSingleToneTx: test stop\n")); -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x1); -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1); -+ -+ if (is92C) { -+ _write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x00); -+ rtw_usleep_os(100); -+ write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x32d75); // PAD all on. -+ write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x32d75); // PAD all on. -+ rtw_usleep_os(100); -+ } else { -+ write_rfreg(pAdapter, rfPath, 0x21, 0x54000); -+ rtw_usleep_os(100); -+ -+ write_rfreg(pAdapter, rfPath, 0x00, 0x30000); // PAD all on. -+ rtw_usleep_os(100); -+ } -+ } -+ -+} -+ -+ -+void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart) -+{ -+ pAdapter->mppriv.MptCtx.bCarrierSuppression = bStart; -+ if (bStart) // Start Carrier Suppression. -+ { -+ RT_TRACE(_module_mp_,_drv_alert_, ("SetCarrierSuppressionTx: test start\n")); -+ //if(pMgntInfo->dot11CurrentWirelessMode == WIRELESS_MODE_B) -+ if (pAdapter->mppriv.rateidx <= MPT_RATE_11M) -+ { -+ // 1. if CCK block on? -+ if(!read_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn)) -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, bEnable);//set CCK block on -+ -+ //Turn Off All Test Mode -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMContinueTx, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleCarrier, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleTone, bDisable); -+ -+ write_bbreg(pAdapter, rCCK0_System, bCCKBBMode, 0x2); //transmit mode -+ write_bbreg(pAdapter, rCCK0_System, bCCKScramble, 0x0); //turn off scramble setting -+ -+ //Set CCK Tx Test Rate -+ //PHY_SetBBReg(pAdapter, rCCK0_System, bCCKTxRate, pMgntInfo->ForcedDataRate); -+ write_bbreg(pAdapter, rCCK0_System, bCCKTxRate, 0x0); //Set FTxRate to 1Mbps -+ } -+ } -+ else// Stop Carrier Suppression. -+ { -+ RT_TRACE(_module_mp_,_drv_alert_, ("SetCarrierSuppressionTx: test stop\n")); -+ //if(pMgntInfo->dot11CurrentWirelessMode == WIRELESS_MODE_B) -+ if (pAdapter->mppriv.rateidx <= MPT_RATE_11M ) { -+ write_bbreg(pAdapter, rCCK0_System, bCCKBBMode, 0x0); //normal mode -+ write_bbreg(pAdapter, rCCK0_System, bCCKScramble, 0x1); //turn on scramble setting -+ -+ //BB Reset -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x0); -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x1); -+ } -+ } -+ //DbgPrint("\n MPT_ProSetCarrierSupp() is finished. \n"); -+} -+ -+void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) -+{ -+ u32 cckrate; -+ -+ if (bStart) -+ { -+ RT_TRACE(_module_mp_, _drv_alert_, -+ ("SetCCKContinuousTx: test start\n")); -+ -+ // 1. if CCK block on? -+ if(!read_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn)) -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, bEnable);//set CCK block on -+ -+ //Turn Off All Test Mode -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMContinueTx, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleCarrier, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleTone, bDisable); -+ //Set CCK Tx Test Rate -+ #if 0 -+ switch(pAdapter->mppriv.rateidx) -+ { -+ case 2: -+ cckrate = 0; -+ break; -+ case 4: -+ cckrate = 1; -+ break; -+ case 11: -+ cckrate = 2; -+ break; -+ case 22: -+ cckrate = 3; -+ break; -+ default: -+ cckrate = 0; -+ break; -+ } -+ #else -+ cckrate = pAdapter->mppriv.rateidx; -+ #endif -+ write_bbreg(pAdapter, rCCK0_System, bCCKTxRate, cckrate); -+ write_bbreg(pAdapter, rCCK0_System, bCCKBBMode, 0x2); //transmit mode -+ write_bbreg(pAdapter, rCCK0_System, bCCKScramble, bEnable); //turn on scramble setting -+ -+#ifdef CONFIG_RTL8192C -+ // Patch for CCK 11M waveform -+ if (cckrate == MPT_RATE_1M) -+ write_bbreg(pAdapter, 0xA71, BIT(6), bDisable); -+ else -+ write_bbreg(pAdapter, 0xA71, BIT(6), bEnable); -+#endif -+ -+ } -+ else { -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("SetCCKContinuousTx: test stop\n")); -+ -+ write_bbreg(pAdapter, rCCK0_System, bCCKBBMode, 0x0); //normal mode -+ write_bbreg(pAdapter, rCCK0_System, bCCKScramble, bEnable); //turn on scramble setting -+ -+ //BB Reset -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x0); -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x1); -+ } -+ -+ pAdapter->mppriv.MptCtx.bCckContTx = bStart; -+ pAdapter->mppriv.MptCtx.bOfdmContTx = _FALSE; -+}/* mpt_StartCckContTx */ -+ -+void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ if (bStart) { -+ RT_TRACE(_module_mp_, _drv_info_, ("SetOFDMContinuousTx: test start\n")); -+ // 1. if OFDM block on? -+ if(!read_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn)) -+ write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, bEnable);//set OFDM block on -+ { -+ -+ // 2. set CCK test mode off, set to CCK normal mode -+ write_bbreg(pAdapter, rCCK0_System, bCCKBBMode, bDisable); -+ -+ // 3. turn on scramble setting -+ write_bbreg(pAdapter, rCCK0_System, bCCKScramble, bEnable); -+ } -+ // 4. Turn On Continue Tx and turn off the other test modes. -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMContinueTx, bEnable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleCarrier, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleTone, bDisable); -+ } else { -+ RT_TRACE(_module_mp_,_drv_info_, ("SetOFDMContinuousTx: test stop\n")); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMContinueTx, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleCarrier, bDisable); -+ write_bbreg(pAdapter, rOFDM1_LSTF, bOFDMSingleTone, bDisable); -+ //Delay 10 ms -+ rtw_msleep_os(10); -+ //BB Reset -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x0); -+ write_bbreg(pAdapter, rPMAC_Reset, bBBResetB, 0x1); -+ } -+ -+ pAdapter->mppriv.MptCtx.bCckContTx = _FALSE; -+ pAdapter->mppriv.MptCtx.bOfdmContTx = bStart; -+}/* mpt_StartOfdmContTx */ -+ -+void Hal_SetContinuousTx(PADAPTER pAdapter, u8 bStart) -+{ -+#if 0 -+ // ADC turn off [bit24-21] adc port0 ~ port1 -+ if (bStart) { -+ write_bbreg(pAdapter, rRx_Wait_CCCA, read_bbreg(pAdapter, rRx_Wait_CCCA) & 0xFE1FFFFF); -+ rtw_usleep_os(100); -+ } -+#endif -+ RT_TRACE(_module_mp_, _drv_info_, -+ ("SetContinuousTx: rate:%d\n", pAdapter->mppriv.rateidx)); -+ -+ pAdapter->mppriv.MptCtx.bStartContTx = bStart; -+ if (pAdapter->mppriv.rateidx <= MPT_RATE_11M) -+ { -+ Hal_SetCCKContinuousTx(pAdapter, bStart); -+ } -+ else if ((pAdapter->mppriv.rateidx >= MPT_RATE_6M) && -+ (pAdapter->mppriv.rateidx <= MPT_RATE_MCS15)) -+ { -+ Hal_SetOFDMContinuousTx(pAdapter, bStart); -+ } -+#if 0 -+ // ADC turn on [bit24-21] adc port0 ~ port1 -+ if (!bStart) { -+ write_bbreg(pAdapter, rRx_Wait_CCCA, read_bbreg(pAdapter, rRx_Wait_CCCA) | 0x01E00000); -+ } -+#endif -+} -+ -+#endif // CONFIG_MP_INCLUDE ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c -@@ -0,0 +1,4841 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/****************************************************************************** -+ -+ Module: rtl8192c_phycfg.c -+ -+ Note: Merge 92SE/SU PHY config as below -+ 1. BB register R/W API -+ 2. RF register R/W API -+ 3. Initial BB/RF/MAC config by reading BB/MAC/RF txt. -+ 3. Power setting API -+ 4. Channel switch API -+ 5. Initial gain switch API. -+ 6. Other BB/MAC/RF API. -+ -+ Function: PHY: Extern function, phy: local function -+ -+ Export: PHY_FunctionName -+ -+ Abbrev: NONE -+ -+ History: -+ Data Who Remark -+ 08/08/2008 MHC 1. Port from 9x series phycfg.c -+ 2. Reorganize code arch and ad description. -+ 3. Collect similar function. -+ 4. Seperate extern/local API. -+ 08/12/2008 MHC We must merge or move USB PHY relative function later. -+ 10/07/2008 MHC Add IQ calibration for PHY.(Only 1T2R mode now!!!) -+ 11/06/2008 MHC Add TX Power index PG file to config in 0xExx register -+ area to map with EEPROM/EFUSE tx pwr index. -+ -+******************************************************************************/ -+#define _HAL_8192C_PHYCFG_C_ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_IOL -+#include -+#endif -+ -+#include -+ -+ -+/*---------------------------Define Local Constant---------------------------*/ -+/* Channel switch:The size of command tables for switch channel*/ -+#define MAX_PRECMD_CNT 16 -+#define MAX_RFDEPENDCMD_CNT 16 -+#define MAX_POSTCMD_CNT 16 -+ -+#define MAX_DOZE_WAITING_TIMES_9x 64 -+ -+/*---------------------------Define Local Constant---------------------------*/ -+ -+ -+/*------------------------Define global variable-----------------------------*/ -+ -+/*------------------------Define local variable------------------------------*/ -+ -+ -+/*--------------------Define export function prototype-----------------------*/ -+// Please refer to header file -+/*--------------------Define export function prototype-----------------------*/ -+ -+/*----------------------------Function Body----------------------------------*/ -+// -+// 1. BB register R/W API -+// -+ -+/** -+* Function: phy_CalculateBitShift -+* -+* OverView: Get shifted position of the BitMask -+* -+* Input: -+* u4Byte BitMask, -+* -+* Output: none -+* Return: u4Byte Return the shift bit bit position of the mask -+*/ -+static u32 -+phy_CalculateBitShift( -+ u32 BitMask -+ ) -+{ -+ u32 i; -+ -+ for(i=0; i<=31; i++) -+ { -+ if ( ((BitMask>>i) & 0x1 ) == 1) -+ break; -+ } -+ -+ return (i); -+} -+ -+ -+/** -+* Function: PHY_QueryBBReg -+* -+* OverView: Read "sepcific bits" from BB register -+* -+* Input: -+* PADAPTER Adapter, -+* u4Byte RegAddr, //The target address to be readback -+* u4Byte BitMask //The target bit position in the target address -+* //to be readback -+* Output: None -+* Return: u4Byte Data //The readback register value -+* Note: This function is equal to "GetRegSetting" in PHY programming guide -+*/ -+u32 -+rtl8192c_PHY_QueryBBReg( -+ IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask -+ ) -+{ -+ u32 ReturnValue = 0, OriginalValue, BitShift; -+ u16 BBWaitCounter = 0; -+ -+#if (DISABLE_BB_RF == 1) -+ return 0; -+#endif -+ -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_QueryBBReg(): RegAddr(%#lx), BitMask(%#lx)\n", RegAddr, BitMask)); -+ -+ OriginalValue = rtw_read32(Adapter, RegAddr); -+ BitShift = phy_CalculateBitShift(BitMask); -+ ReturnValue = (OriginalValue & BitMask) >> BitShift; -+ -+ //RTPRINT(FPHY, PHY_BBR, ("BBR MASK=0x%lx Addr[0x%lx]=0x%lx\n", BitMask, RegAddr, OriginalValue)); -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("<---PHY_QueryBBReg(): RegAddr(%#lx), BitMask(%#lx), OriginalValue(%#lx)\n", RegAddr, BitMask, OriginalValue)); -+ -+ return (ReturnValue); -+ -+} -+ -+ -+/** -+* Function: PHY_SetBBReg -+* -+* OverView: Write "Specific bits" to BB register (page 8~) -+* -+* Input: -+* PADAPTER Adapter, -+* u4Byte RegAddr, //The target address to be modified -+* u4Byte BitMask //The target bit position in the target address -+* //to be modified -+* u4Byte Data //The new register value in the target bit position -+* //of the target address -+* -+* Output: None -+* Return: None -+* Note: This function is equal to "PutRegSetting" in PHY programming guide -+*/ -+ -+VOID -+rtl8192c_PHY_SetBBReg( -+ IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ //u16 BBWaitCounter = 0; -+ u32 OriginalValue, BitShift; -+ -+#if (DISABLE_BB_RF == 1) -+ return; -+#endif -+ -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_SetBBReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx)\n", RegAddr, BitMask, Data)); -+ -+ if(BitMask!= bMaskDWord){//if not "double word" write -+ OriginalValue = rtw_read32(Adapter, RegAddr); -+ BitShift = phy_CalculateBitShift(BitMask); -+ Data = ((OriginalValue & (~BitMask)) | ((Data << BitShift) & BitMask)); -+ } -+ -+ rtw_write32(Adapter, RegAddr, Data); -+ -+ //RTPRINT(FPHY, PHY_BBW, ("BBW MASK=0x%lx Addr[0x%lx]=0x%lx\n", BitMask, RegAddr, Data)); -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("<---PHY_SetBBReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx)\n", RegAddr, BitMask, Data)); -+ -+} -+ -+ -+// -+// 2. RF register R/W API -+// -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_FwRFSerialRead() -+ * -+ * Overview: We support firmware to execute RF-R/W. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 01/21/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+static u32 -+phy_FwRFSerialRead( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset ) -+{ -+ u32 retValue = 0; -+ //RT_ASSERT(FALSE,("deprecate!\n")); -+ return (retValue); -+ -+} /* phy_FwRFSerialRead */ -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_FwRFSerialWrite() -+ * -+ * Overview: We support firmware to execute RF-R/W. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 01/21/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+static VOID -+phy_FwRFSerialWrite( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset, -+ IN u32 Data ) -+{ -+ //RT_ASSERT(FALSE,("deprecate!\n")); -+} -+ -+ -+/** -+* Function: phy_RFSerialRead -+* -+* OverView: Read regster from RF chips -+* -+* Input: -+* PADAPTER Adapter, -+* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D -+* u4Byte Offset, //The target address to be read -+* -+* Output: None -+* Return: u4Byte reback value -+* Note: Threre are three types of serial operations: -+* 1. Software serial write -+* 2. Hardware LSSI-Low Speed Serial Interface -+* 3. Hardware HSSI-High speed -+* serial write. Driver need to implement (1) and (2). -+* This function is equal to the combination of RF_ReadReg() and RFLSSIRead() -+*/ -+static u32 -+phy_RFSerialRead( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset -+ ) -+{ -+ u32 retValue = 0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath]; -+ u32 NewOffset; -+ u32 tmplong,tmplong2; -+ u8 RfPiEnable=0; -+#if 0 -+ if(pHalData->RFChipID == RF_8225 && Offset > 0x24) //36 valid regs -+ return retValue; -+ if(pHalData->RFChipID == RF_8256 && Offset > 0x2D) //45 valid regs -+ return retValue; -+#endif -+ // -+ // Make sure RF register offset is correct -+ // -+ Offset &= 0x3f; -+ -+ // -+ // Switch page for 8256 RF IC -+ // -+ NewOffset = Offset; -+ -+ // 2009/06/17 MH We can not execute IO for power save or other accident mode. -+ //if(RT_CANNOT_IO(Adapter)) -+ //{ -+ // RTPRINT(FPHY, PHY_RFR, ("phy_RFSerialRead return all one\n")); -+ // return 0xFFFFFFFF; -+ //} -+ -+ // For 92S LSSI Read RFLSSIRead -+ // For RF A/B write 0x824/82c(does not work in the future) -+ // We must use 0x824 for RF A and B to execute read trigger -+ tmplong = PHY_QueryBBReg(Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord); -+ if(eRFPath == RF_PATH_A) -+ tmplong2 = tmplong; -+ else -+ tmplong2 = PHY_QueryBBReg(Adapter, pPhyReg->rfHSSIPara2, bMaskDWord); -+ -+ tmplong2 = (tmplong2 & (~bLSSIReadAddress)) | (NewOffset<<23) | bLSSIReadEdge; //T65 RF -+ -+ PHY_SetBBReg(Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord, tmplong&(~bLSSIReadEdge)); -+ rtw_udelay_os(10);// PlatformStallExecution(10); -+ -+ PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, bMaskDWord, tmplong2); -+ rtw_udelay_os(100);//PlatformStallExecution(100); -+ -+ PHY_SetBBReg(Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord, tmplong|bLSSIReadEdge); -+ rtw_udelay_os(10);//PlatformStallExecution(10); -+ -+ if(eRFPath == RF_PATH_A) -+ RfPiEnable = (u8)PHY_QueryBBReg(Adapter, rFPGA0_XA_HSSIParameter1, BIT8); -+ else if(eRFPath == RF_PATH_B) -+ RfPiEnable = (u8)PHY_QueryBBReg(Adapter, rFPGA0_XB_HSSIParameter1, BIT8); -+ -+ if(RfPiEnable) -+ { // Read from BBreg8b8, 12 bits for 8190, 20bits for T65 RF -+ retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBackPi, bLSSIReadBackData); -+ //DBG_8192C("Readback from RF-PI : 0x%x\n", retValue); -+ } -+ else -+ { //Read from BBreg8a0, 12 bits for 8190, 20 bits for T65 RF -+ retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); -+ //DBG_8192C("Readback from RF-SI : 0x%x\n", retValue); -+ } -+ //DBG_8192C("RFR-%d Addr[0x%x]=0x%x\n", eRFPath, pPhyReg->rfLSSIReadBack, retValue); -+ -+ return retValue; -+ -+} -+ -+ -+ -+/** -+* Function: phy_RFSerialWrite -+* -+* OverView: Write data to RF register (page 8~) -+* -+* Input: -+* PADAPTER Adapter, -+* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D -+* u4Byte Offset, //The target address to be read -+* u4Byte Data //The new register Data in the target bit position -+* //of the target to be read -+* -+* Output: None -+* Return: None -+* Note: Threre are three types of serial operations: -+* 1. Software serial write -+* 2. Hardware LSSI-Low Speed Serial Interface -+* 3. Hardware HSSI-High speed -+* serial write. Driver need to implement (1) and (2). -+* This function is equal to the combination of RF_ReadReg() and RFLSSIRead() -+ * -+ * Note: For RF8256 only -+ * The total count of RTL8256(Zebra4) register is around 36 bit it only employs -+ * 4-bit RF address. RTL8256 uses "register mode control bit" (Reg00[12], Reg00[10]) -+ * to access register address bigger than 0xf. See "Appendix-4 in PHY Configuration -+ * programming guide" for more details. -+ * Thus, we define a sub-finction for RTL8526 register address conversion -+ * =========================================================== -+ * Register Mode RegCTL[1] RegCTL[0] Note -+ * (Reg00[12]) (Reg00[10]) -+ * =========================================================== -+ * Reg_Mode0 0 x Reg 0 ~15(0x0 ~ 0xf) -+ * ------------------------------------------------------------------ -+ * Reg_Mode1 1 0 Reg 16 ~30(0x1 ~ 0xf) -+ * ------------------------------------------------------------------ -+ * Reg_Mode2 1 1 Reg 31 ~ 45(0x1 ~ 0xf) -+ * ------------------------------------------------------------------ -+ * -+ * 2008/09/02 MH Add 92S RF definition -+ * -+ * -+ * -+*/ -+static VOID -+phy_RFSerialWrite( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset, -+ IN u32 Data -+ ) -+{ -+ u32 DataAndAddr = 0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath]; -+ u32 NewOffset; -+ -+#if 0 -+ // We should check valid regs for RF_6052 case. -+ if(pHalData->RFChipID == RF_8225 && Offset > 0x24) //36 valid regs -+ return; -+ if(pHalData->RFChipID == RF_8256 && Offset > 0x2D) //45 valid regs -+ return; -+#endif -+ -+ // 2009/06/17 MH We can not execute IO for power save or other accident mode. -+ //if(RT_CANNOT_IO(Adapter)) -+ //{ -+ // RTPRINT(FPHY, PHY_RFW, ("phy_RFSerialWrite stop\n")); -+ // return; -+ //} -+ -+ Offset &= 0x3f; -+ -+ // -+ // Shadow Update -+ // -+ //PHY_RFShadowWrite(Adapter, eRFPath, Offset, Data); -+ -+ // -+ // Switch page for 8256 RF IC -+ // -+ NewOffset = Offset; -+ -+ // -+ // Put write addr in [5:0] and write data in [31:16] -+ // -+ //DataAndAddr = (Data<<16) | (NewOffset&0x3f); -+ DataAndAddr = ((NewOffset<<20) | (Data&0x000fffff)) & 0x0fffffff; // T65 RF -+ -+ // -+ // Write Operation -+ // -+ PHY_SetBBReg(Adapter, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr); -+ //RTPRINT(FPHY, PHY_RFW, ("RFW-%d Addr[0x%lx]=0x%lx\n", eRFPath, pPhyReg->rf3wireOffset, DataAndAddr)); -+ -+} -+ -+ -+/** -+* Function: PHY_QueryRFReg -+* -+* OverView: Query "Specific bits" to RF register (page 8~) -+* -+* Input: -+* PADAPTER Adapter, -+* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D -+* u4Byte RegAddr, //The target address to be read -+* u4Byte BitMask //The target bit position in the target address -+* //to be read -+* -+* Output: None -+* Return: u4Byte Readback value -+* Note: This function is equal to "GetRFRegSetting" in PHY programming guide -+*/ -+u32 -+rtl8192c_PHY_QueryRFReg( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 RegAddr, -+ IN u32 BitMask -+ ) -+{ -+ u32 Original_Value, Readback_Value, BitShift; -+ //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ //u8 RFWaitCounter = 0; -+ //_irqL irqL; -+ -+#if (DISABLE_BB_RF == 1) -+ return 0; -+#endif -+ -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_QueryRFReg(): RegAddr(%#lx), eRFPath(%#x), BitMask(%#lx)\n", RegAddr, eRFPath,BitMask)); -+ -+#ifdef CONFIG_USB_HCI -+ //PlatformAcquireMutex(&pHalData->mxRFOperate); -+#else -+ //_enter_critical(&pHalData->rf_lock, &irqL); -+#endif -+ -+ -+ Original_Value = phy_RFSerialRead(Adapter, eRFPath, RegAddr); -+ -+ BitShift = phy_CalculateBitShift(BitMask); -+ Readback_Value = (Original_Value & BitMask) >> BitShift; -+ -+#ifdef CONFIG_USB_HCI -+ //PlatformReleaseMutex(&pHalData->mxRFOperate); -+#else -+ //_exit_critical(&pHalData->rf_lock, &irqL); -+#endif -+ -+ -+ //RTPRINT(FPHY, PHY_RFR, ("RFR-%d MASK=0x%lx Addr[0x%lx]=0x%lx\n", eRFPath, BitMask, RegAddr, Original_Value));//BitMask(%#lx),BitMask, -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("<---PHY_QueryRFReg(): RegAddr(%#lx), eRFPath(%#x), Original_Value(%#lx)\n", -+ // RegAddr, eRFPath, Original_Value)); -+ -+ return (Readback_Value); -+} -+ -+/** -+* Function: PHY_SetRFReg -+* -+* OverView: Write "Specific bits" to RF register (page 8~) -+* -+* Input: -+* PADAPTER Adapter, -+* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D -+* u4Byte RegAddr, //The target address to be modified -+* u4Byte BitMask //The target bit position in the target address -+* //to be modified -+* u4Byte Data //The new register Data in the target bit position -+* //of the target address -+* -+* Output: None -+* Return: None -+* Note: This function is equal to "PutRFRegSetting" in PHY programming guide -+*/ -+VOID -+rtl8192c_PHY_SetRFReg( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data -+ ) -+{ -+ -+ //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ //u1Byte RFWaitCounter = 0; -+ u32 Original_Value, BitShift; -+ //_irqL irqL; -+ -+#if (DISABLE_BB_RF == 1) -+ return; -+#endif -+ -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("--->PHY_SetRFReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx), eRFPath(%#x)\n", -+ // RegAddr, BitMask, Data, eRFPath)); -+ //RTPRINT(FINIT, INIT_RF, ("PHY_SetRFReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx), eRFPath(%#x)\n", -+ // RegAddr, BitMask, Data, eRFPath)); -+ -+ -+#ifdef CONFIG_USB_HCI -+ //PlatformAcquireMutex(&pHalData->mxRFOperate); -+#else -+ //_enter_critical(&pHalData->rf_lock, &irqL); -+#endif -+ -+ -+ // RF data is 12 bits only -+ if (BitMask != bRFRegOffsetMask) -+ { -+ Original_Value = phy_RFSerialRead(Adapter, eRFPath, RegAddr); -+ BitShift = phy_CalculateBitShift(BitMask); -+ Data = ((Original_Value & (~BitMask)) | (Data<< BitShift)); -+ } -+ -+ phy_RFSerialWrite(Adapter, eRFPath, RegAddr, Data); -+ -+ -+ -+#ifdef CONFIG_USB_HCI -+ //PlatformReleaseMutex(&pHalData->mxRFOperate); -+#else -+ //_exit_critical(&pHalData->rf_lock, &irqL); -+#endif -+ -+ //PHY_QueryRFReg(Adapter,eRFPath,RegAddr,BitMask); -+ //RT_TRACE(COMP_RF, DBG_TRACE, ("<---PHY_SetRFReg(): RegAddr(%#lx), BitMask(%#lx), Data(%#lx), eRFPath(%#x)\n", -+ // RegAddr, BitMask, Data, eRFPath)); -+ -+} -+ -+ -+// -+// 3. Initial MAC/BB/RF config by reading MAC/BB/RF txt. -+// -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigMACWithParaFile() -+ * -+ * Overview: This function read BB parameters from general file format, and do register -+ * Read/Write -+ * -+ * Input: PADAPTER Adapter -+ * ps1Byte pFileName -+ * -+ * Output: NONE -+ * -+ * Return: RT_STATUS_SUCCESS: configuration file exist -+ * -+ * Note: The format of MACPHY_REG.txt is different from PHY and RF. -+ * [Register][Mask][Value] -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigMACWithParaFile( -+ IN PADAPTER Adapter, -+ IN u8* pFileName -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ int rtStatus = _SUCCESS; -+ -+ return rtStatus; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigMACWithHeaderFile() -+ * -+ * Overview: This function read BB parameters from Header file we gen, and do register -+ * Read/Write -+ * -+ * Input: PADAPTER Adapter -+ * ps1Byte pFileName -+ * -+ * Output: NONE -+ * -+ * Return: RT_STATUS_SUCCESS: configuration file exist -+ * -+ * Note: The format of MACPHY_REG.txt is different from PHY and RF. -+ * [Register][Mask][Value] -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigMACWithHeaderFile( -+ IN PADAPTER Adapter -+) -+{ -+ u32 i = 0; -+ u32 ArrayLength = 0; -+ u32* ptrArray; -+ //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ //2008.11.06 Modified by tynli. -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Read Rtl819XMACPHY_Array\n")); -+ ArrayLength = MAC_2T_ArrayLength; -+ ptrArray = Rtl819XMAC_Array; -+ -+#ifdef CONFIG_IOL_MAC -+ if(rtw_IOL_applied(Adapter)) -+ { -+ struct xmit_frame *xmit_frame; -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) -+ return _FAIL; -+ -+ for(i = 0 ;i < ArrayLength;i=i+2){ // Add by tynli for 2 column -+ rtw_IOL_append_WB_cmd(xmit_frame, ptrArray[i], (u8)ptrArray[i+1]); -+ } -+ -+ return rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000); -+ } -+ else -+#endif -+ { -+ for(i = 0 ;i < ArrayLength;i=i+2){ // Add by tynli for 2 column -+ rtw_write8(Adapter, ptrArray[i], (u8)ptrArray[i+1]); -+ } -+ } -+ -+ return _SUCCESS; -+ -+} -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: PHY_MACConfig8192C -+ * -+ * Overview: Condig MAC by header file or parameter file. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 08/12/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+int -+PHY_MACConfig8192C( -+ IN PADAPTER Adapter -+ ) -+{ -+ int rtStatus = _SUCCESS; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ s8 *pszMACRegFile; -+ s8 sz88CMACRegFile[] = RTL8188C_PHY_MACREG; -+ s8 sz92CMACRegFile[] = RTL8192C_PHY_MACREG; -+ BOOLEAN is92C = IS_92C_SERIAL(pHalData->VersionID); -+ -+ if(is92C) -+ pszMACRegFile = sz92CMACRegFile; -+ else -+ pszMACRegFile = sz88CMACRegFile; -+ -+ // -+ // Config MAC -+ // -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus = phy_ConfigMACWithHeaderFile(Adapter); -+#else -+ -+ // Not make sure EEPROM, add later -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Read MACREG.txt\n")); -+ rtStatus = phy_ConfigMACWithParaFile(Adapter, pszMACRegFile); -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ //this switching setting cause some 8192cu hw have redownload fw fail issue -+ //improve 2-stream TX EVM by Jenyu -+ if(is92C) -+ rtw_write8(Adapter, REG_SPS0_CTRL+3,0x71); -+#endif -+ -+ -+ // 2010.07.13 AMPDU aggregation number 9 -+ //rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); -+ rtw_write8(Adapter, REG_MAX_AGGR_NUM, 0x0A); //By tynli. 2010.11.18. -+#ifdef CONFIG_USB_HCI -+ if(is92C && (BOARD_USB_DONGLE == pHalData->BoardType)) -+ rtw_write8(Adapter, 0x40,0x04); -+#endif -+ -+ return rtStatus; -+ -+} -+ -+ -+/** -+* Function: phy_InitBBRFRegisterDefinition -+* -+* OverView: Initialize Register definition offset for Radio Path A/B/C/D -+* -+* Input: -+* PADAPTER Adapter, -+* -+* Output: None -+* Return: None -+* Note: The initialization value is constant and it should never be changes -+*/ -+static VOID -+phy_InitBBRFRegisterDefinition( -+ IN PADAPTER Adapter -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ // RF Interface Sowrtware Control -+ pHalData->PHYRegDef[RF_PATH_A].rfintfs = rFPGA0_XAB_RFInterfaceSW; // 16 LSBs if read 32-bit from 0x870 -+ pHalData->PHYRegDef[RF_PATH_B].rfintfs = rFPGA0_XAB_RFInterfaceSW; // 16 MSBs if read 32-bit from 0x870 (16-bit for 0x872) -+ pHalData->PHYRegDef[RF_PATH_C].rfintfs = rFPGA0_XCD_RFInterfaceSW;// 16 LSBs if read 32-bit from 0x874 -+ pHalData->PHYRegDef[RF_PATH_D].rfintfs = rFPGA0_XCD_RFInterfaceSW;// 16 MSBs if read 32-bit from 0x874 (16-bit for 0x876) -+ -+ // RF Interface Readback Value -+ pHalData->PHYRegDef[RF_PATH_A].rfintfi = rFPGA0_XAB_RFInterfaceRB; // 16 LSBs if read 32-bit from 0x8E0 -+ pHalData->PHYRegDef[RF_PATH_B].rfintfi = rFPGA0_XAB_RFInterfaceRB;// 16 MSBs if read 32-bit from 0x8E0 (16-bit for 0x8E2) -+ pHalData->PHYRegDef[RF_PATH_C].rfintfi = rFPGA0_XCD_RFInterfaceRB;// 16 LSBs if read 32-bit from 0x8E4 -+ pHalData->PHYRegDef[RF_PATH_D].rfintfi = rFPGA0_XCD_RFInterfaceRB;// 16 MSBs if read 32-bit from 0x8E4 (16-bit for 0x8E6) -+ -+ // RF Interface Output (and Enable) -+ pHalData->PHYRegDef[RF_PATH_A].rfintfo = rFPGA0_XA_RFInterfaceOE; // 16 LSBs if read 32-bit from 0x860 -+ pHalData->PHYRegDef[RF_PATH_B].rfintfo = rFPGA0_XB_RFInterfaceOE; // 16 LSBs if read 32-bit from 0x864 -+ -+ // RF Interface (Output and) Enable -+ pHalData->PHYRegDef[RF_PATH_A].rfintfe = rFPGA0_XA_RFInterfaceOE; // 16 MSBs if read 32-bit from 0x860 (16-bit for 0x862) -+ pHalData->PHYRegDef[RF_PATH_B].rfintfe = rFPGA0_XB_RFInterfaceOE; // 16 MSBs if read 32-bit from 0x864 (16-bit for 0x866) -+ -+ //Addr of LSSI. Wirte RF register by driver -+ pHalData->PHYRegDef[RF_PATH_A].rf3wireOffset = rFPGA0_XA_LSSIParameter; //LSSI Parameter -+ pHalData->PHYRegDef[RF_PATH_B].rf3wireOffset = rFPGA0_XB_LSSIParameter; -+ -+ // RF parameter -+ pHalData->PHYRegDef[RF_PATH_A].rfLSSI_Select = rFPGA0_XAB_RFParameter; //BB Band Select -+ pHalData->PHYRegDef[RF_PATH_B].rfLSSI_Select = rFPGA0_XAB_RFParameter; -+ pHalData->PHYRegDef[RF_PATH_C].rfLSSI_Select = rFPGA0_XCD_RFParameter; -+ pHalData->PHYRegDef[RF_PATH_D].rfLSSI_Select = rFPGA0_XCD_RFParameter; -+ -+ // Tx AGC Gain Stage (same for all path. Should we remove this?) -+ pHalData->PHYRegDef[RF_PATH_A].rfTxGainStage = rFPGA0_TxGainStage; //Tx gain stage -+ pHalData->PHYRegDef[RF_PATH_B].rfTxGainStage = rFPGA0_TxGainStage; //Tx gain stage -+ pHalData->PHYRegDef[RF_PATH_C].rfTxGainStage = rFPGA0_TxGainStage; //Tx gain stage -+ pHalData->PHYRegDef[RF_PATH_D].rfTxGainStage = rFPGA0_TxGainStage; //Tx gain stage -+ -+ // Tranceiver A~D HSSI Parameter-1 -+ pHalData->PHYRegDef[RF_PATH_A].rfHSSIPara1 = rFPGA0_XA_HSSIParameter1; //wire control parameter1 -+ pHalData->PHYRegDef[RF_PATH_B].rfHSSIPara1 = rFPGA0_XB_HSSIParameter1; //wire control parameter1 -+ -+ // Tranceiver A~D HSSI Parameter-2 -+ pHalData->PHYRegDef[RF_PATH_A].rfHSSIPara2 = rFPGA0_XA_HSSIParameter2; //wire control parameter2 -+ pHalData->PHYRegDef[RF_PATH_B].rfHSSIPara2 = rFPGA0_XB_HSSIParameter2; //wire control parameter2 -+ -+ // RF switch Control -+ pHalData->PHYRegDef[RF_PATH_A].rfSwitchControl = rFPGA0_XAB_SwitchControl; //TR/Ant switch control -+ pHalData->PHYRegDef[RF_PATH_B].rfSwitchControl = rFPGA0_XAB_SwitchControl; -+ pHalData->PHYRegDef[RF_PATH_C].rfSwitchControl = rFPGA0_XCD_SwitchControl; -+ pHalData->PHYRegDef[RF_PATH_D].rfSwitchControl = rFPGA0_XCD_SwitchControl; -+ -+ // AGC control 1 -+ pHalData->PHYRegDef[RF_PATH_A].rfAGCControl1 = rOFDM0_XAAGCCore1; -+ pHalData->PHYRegDef[RF_PATH_B].rfAGCControl1 = rOFDM0_XBAGCCore1; -+ pHalData->PHYRegDef[RF_PATH_C].rfAGCControl1 = rOFDM0_XCAGCCore1; -+ pHalData->PHYRegDef[RF_PATH_D].rfAGCControl1 = rOFDM0_XDAGCCore1; -+ -+ // AGC control 2 -+ pHalData->PHYRegDef[RF_PATH_A].rfAGCControl2 = rOFDM0_XAAGCCore2; -+ pHalData->PHYRegDef[RF_PATH_B].rfAGCControl2 = rOFDM0_XBAGCCore2; -+ pHalData->PHYRegDef[RF_PATH_C].rfAGCControl2 = rOFDM0_XCAGCCore2; -+ pHalData->PHYRegDef[RF_PATH_D].rfAGCControl2 = rOFDM0_XDAGCCore2; -+ -+ // RX AFE control 1 -+ pHalData->PHYRegDef[RF_PATH_A].rfRxIQImbalance = rOFDM0_XARxIQImbalance; -+ pHalData->PHYRegDef[RF_PATH_B].rfRxIQImbalance = rOFDM0_XBRxIQImbalance; -+ pHalData->PHYRegDef[RF_PATH_C].rfRxIQImbalance = rOFDM0_XCRxIQImbalance; -+ pHalData->PHYRegDef[RF_PATH_D].rfRxIQImbalance = rOFDM0_XDRxIQImbalance; -+ -+ // RX AFE control 1 -+ pHalData->PHYRegDef[RF_PATH_A].rfRxAFE = rOFDM0_XARxAFE; -+ pHalData->PHYRegDef[RF_PATH_B].rfRxAFE = rOFDM0_XBRxAFE; -+ pHalData->PHYRegDef[RF_PATH_C].rfRxAFE = rOFDM0_XCRxAFE; -+ pHalData->PHYRegDef[RF_PATH_D].rfRxAFE = rOFDM0_XDRxAFE; -+ -+ // Tx AFE control 1 -+ pHalData->PHYRegDef[RF_PATH_A].rfTxIQImbalance = rOFDM0_XATxIQImbalance; -+ pHalData->PHYRegDef[RF_PATH_B].rfTxIQImbalance = rOFDM0_XBTxIQImbalance; -+ pHalData->PHYRegDef[RF_PATH_C].rfTxIQImbalance = rOFDM0_XCTxIQImbalance; -+ pHalData->PHYRegDef[RF_PATH_D].rfTxIQImbalance = rOFDM0_XDTxIQImbalance; -+ -+ // Tx AFE control 2 -+ pHalData->PHYRegDef[RF_PATH_A].rfTxAFE = rOFDM0_XATxAFE; -+ pHalData->PHYRegDef[RF_PATH_B].rfTxAFE = rOFDM0_XBTxAFE; -+ pHalData->PHYRegDef[RF_PATH_C].rfTxAFE = rOFDM0_XCTxAFE; -+ pHalData->PHYRegDef[RF_PATH_D].rfTxAFE = rOFDM0_XDTxAFE; -+ -+ // Tranceiver LSSI Readback SI mode -+ pHalData->PHYRegDef[RF_PATH_A].rfLSSIReadBack = rFPGA0_XA_LSSIReadBack; -+ pHalData->PHYRegDef[RF_PATH_B].rfLSSIReadBack = rFPGA0_XB_LSSIReadBack; -+ pHalData->PHYRegDef[RF_PATH_C].rfLSSIReadBack = rFPGA0_XC_LSSIReadBack; -+ pHalData->PHYRegDef[RF_PATH_D].rfLSSIReadBack = rFPGA0_XD_LSSIReadBack; -+ -+ // Tranceiver LSSI Readback PI mode -+ pHalData->PHYRegDef[RF_PATH_A].rfLSSIReadBackPi = TransceiverA_HSPI_Readback; -+ pHalData->PHYRegDef[RF_PATH_B].rfLSSIReadBackPi = TransceiverB_HSPI_Readback; -+ //pHalData->PHYRegDef[RF_PATH_C].rfLSSIReadBackPi = rFPGA0_XC_LSSIReadBack; -+ //pHalData->PHYRegDef[RF_PATH_D].rfLSSIReadBackPi = rFPGA0_XD_LSSIReadBack; -+ -+} -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigBBWithParaFile() -+ * -+ * Overview: This function read BB parameters from general file format, and do register -+ * Read/Write -+ * -+ * Input: PADAPTER Adapter -+ * ps1Byte pFileName -+ * -+ * Output: NONE -+ * -+ * Return: RT_STATUS_SUCCESS: configuration file exist -+ * 2008/11/06 MH For 92S we do not support silent reset now. Disable -+ * parameter file compare!!!!!!?? -+ * -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigBBWithParaFile( -+ IN PADAPTER Adapter, -+ IN u8* pFileName -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ int rtStatus = _SUCCESS; -+ -+ return rtStatus; -+} -+ -+ -+ -+//**************************************** -+// The following is for High Power PA -+//**************************************** -+VOID -+phy_ConfigBBExternalPA( -+ IN PADAPTER Adapter -+) -+{ -+#ifdef CONFIG_USB_HCI -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u16 i=0; -+ u32 temp=0; -+ -+ if(!pHalData->ExternalPA) -+ { -+ return; -+ } -+ -+ // 2010/10/19 MH According to Jenyu/EEChou 's opinion, we need not to execute the -+ // same code as SU. It is already updated in PHY_REG_1T_HP.txt. -+#if 0 -+ PHY_SetBBReg(Adapter, 0xee8, BIT28, 1); -+ temp = PHY_QueryBBReg(Adapter, 0x860, bMaskDWord); -+ temp |= (BIT26|BIT21|BIT10|BIT5); -+ PHY_SetBBReg(Adapter, 0x860, bMaskDWord, temp); -+ PHY_SetBBReg(Adapter, 0x870, BIT10, 0); -+ PHY_SetBBReg(Adapter, 0xc80, bMaskDWord, 0x20000080); -+ PHY_SetBBReg(Adapter, 0xc88, bMaskDWord, 0x40000100); -+#endif -+ -+#endif -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigBBWithHeaderFile() -+ * -+ * Overview: This function read BB parameters from general file format, and do register -+ * Read/Write -+ * -+ * Input: PADAPTER Adapter -+ * u1Byte ConfigType 0 => PHY_CONFIG -+ * 1 =>AGC_TAB -+ * -+ * Output: NONE -+ * -+ * Return: RT_STATUS_SUCCESS: configuration file exist -+ * -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigBBWithHeaderFile( -+ IN PADAPTER Adapter, -+ IN u8 ConfigType -+) -+{ -+ int i; -+ u32* Rtl819XPHY_REGArray_Table; -+ u32* Rtl819XAGCTAB_Array_Table; -+ u16 PHY_REGArrayLen, AGCTAB_ArrayLen; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ int ret = _SUCCESS; -+ -+ // -+ // 2009.11.24. Modified by tynli. -+ // -+ if(IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ AGCTAB_ArrayLen = AGCTAB_2TArrayLength; -+ Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_2TArray; -+ PHY_REGArrayLen = PHY_REG_2TArrayLength; -+ Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_2TArray; -+#ifdef CONFIG_USB_HCI -+ if(pHalData->BoardType == BOARD_MINICARD ) -+ { -+ PHY_REGArrayLen = PHY_REG_2T_mCardArrayLength; -+ Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_2T_mCardArray; -+ } -+#endif -+ } -+ else -+ { -+ AGCTAB_ArrayLen = AGCTAB_1TArrayLength; -+ Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_1TArray; -+ PHY_REGArrayLen = PHY_REG_1TArrayLength; -+ Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1TArray; -+#ifdef CONFIG_USB_HCI -+ if(pHalData->BoardType == BOARD_MINICARD ) -+ { -+ PHY_REGArrayLen = PHY_REG_1T_mCardArrayLength; -+ Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T_mCardArray; -+ } -+ else if(pHalData->BoardType == BOARD_USB_High_PA) -+ { -+ AGCTAB_ArrayLen = AGCTAB_1T_HPArrayLength; -+ Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_1T_HPArray; -+ PHY_REGArrayLen = PHY_REG_1T_HPArrayLength; -+ Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T_HPArray; -+ } -+#endif -+ } -+ -+ if(ConfigType == BaseBand_Config_PHY_REG) -+ { -+ #ifdef CONFIG_IOL_BB_PHY_REG -+ if(rtw_IOL_applied(Adapter)) -+ { -+ struct xmit_frame *xmit_frame; -+ u32 tmp_value; -+ -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) { -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ for(i=0;iMCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][0] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][0] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][0])); -+ } -+ if(RegAddr == rTxAGC_A_Rate54_24) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][1] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][1] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][1])); -+ } -+ if(RegAddr == rTxAGC_A_CCK1_Mcs32) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][6] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][6] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][6])); -+ } -+ if(RegAddr == rTxAGC_B_CCK11_A_CCK2_11 && BitMask == 0xffffff00) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][7] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][7] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][7])); -+ } -+ if(RegAddr == rTxAGC_A_Mcs03_Mcs00) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][2] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][2] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][2])); -+ } -+ if(RegAddr == rTxAGC_A_Mcs07_Mcs04) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][3] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][3] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][3])); -+ } -+ if(RegAddr == rTxAGC_A_Mcs11_Mcs08) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][4] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4])); -+ } -+ if(RegAddr == rTxAGC_A_Mcs15_Mcs12) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][5] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5])); -+ } -+ if(RegAddr == rTxAGC_B_Rate18_06) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][8] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8])); -+ } -+ if(RegAddr == rTxAGC_B_Rate54_24) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][9] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][9] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][9])); -+ } -+ if(RegAddr == rTxAGC_B_CCK1_55_Mcs32) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][14] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][14] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][14])); -+ } -+ if(RegAddr == rTxAGC_B_CCK11_A_CCK2_11 && BitMask == 0x000000ff) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][15] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][15] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][15])); -+ } -+ if(RegAddr == rTxAGC_B_Mcs03_Mcs00) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][10] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][10] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][10])); -+ } -+ if(RegAddr == rTxAGC_B_Mcs07_Mcs04) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][11] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11])); -+ } -+ if(RegAddr == rTxAGC_B_Mcs11_Mcs08) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][12] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12])); -+ } -+ if(RegAddr == rTxAGC_B_Mcs15_Mcs12) -+ { -+ pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13] = Data; -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("MCSTxPowerLevelOriginalOffset[%d][13] = 0x%lx\n", pHalData->pwrGroupCnt, -+ // pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13])); -+ pHalData->pwrGroupCnt++; -+ } -+} -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigBBWithPgParaFile -+ * -+ * Overview: -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/06/2008 MHC Create Version 0. -+ * 2009/07/29 tynli (porting from 92SE branch)2009/03/11 Add copy parameter file to buffer for silent reset -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigBBWithPgParaFile( -+ IN PADAPTER Adapter, -+ IN u8* pFileName) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ int rtStatus = _SUCCESS; -+ -+ -+ return rtStatus; -+ -+} /* phy_ConfigBBWithPgParaFile */ -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigBBWithPgHeaderFile -+ * -+ * Overview: Config PHY_REG_PG array -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/06/2008 MHC Add later!!!!!!.. Please modify for new files!!!! -+ * 11/10/2008 tynli Modify to mew files. -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigBBWithPgHeaderFile( -+ IN PADAPTER Adapter, -+ IN u8 ConfigType) -+{ -+ int i; -+ u32* Rtl819XPHY_REGArray_Table_PG; -+ u16 PHY_REGArrayPGLen; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ // Default: pHalData->RF_Type = RF_2T2R. -+ PHY_REGArrayPGLen = PHY_REG_Array_PGLength; -+ Rtl819XPHY_REGArray_Table_PG = Rtl819XPHY_REG_Array_PG; -+ -+#ifdef CONFIG_USB_HCI -+// 2010/10/19 Chiyoko According to Alex/Willson opinion, VAU/dongle can share the same PHY_REG_PG.txt -+/* -+ if(pHalData->BoardType == BOARD_MINICARD ) -+ { -+ PHY_REGArrayPGLen = PHY_REG_Array_PG_mCardLength; -+ Rtl819XPHY_REGArray_Table_PG = Rtl819XPHY_REG_Array_PG_mCard; -+ } -+ else */if(pHalData->BoardType ==BOARD_USB_High_PA ) -+ { -+ PHY_REGArrayPGLen = PHY_REG_Array_PG_HPLength; -+ Rtl819XPHY_REGArray_Table_PG = Rtl819XPHY_REG_Array_PG_HP; -+ } -+#endif -+ -+ if(ConfigType == BaseBand_Config_PHY_REG) -+ { -+ for(i=0;iBufOfLines), -+ MAX_LINES_HWCONFIG_TXT, -+ MAX_BYTES_LINE_HWCONFIG_TXT, -+ &nLinesRead -+ ); -+ if(rtStatus == RT_STATUS_SUCCESS) -+ { -+ PlatformMoveMemory(pHalData->BufOfLines6, pHalData->BufOfLines, nLinesRead*MAX_BYTES_LINE_HWCONFIG_TXT); -+ pHalData->nLinesRead6 = nLinesRead; -+ } -+ else -+ { -+ // Temporarily skip PHY_REG_MP.txt if file does not exist. -+ pHalData->nLinesRead6 = 0; -+ RT_TRACE(COMP_INIT, DBG_LOUD, ("No matched file \r\n")); -+ return RT_STATUS_SUCCESS; -+ } -+ } -+ else -+ { -+ PlatformMoveMemory(pHalData->BufOfLines, pHalData->BufOfLines6, MAX_LINES_HWCONFIG_TXT*MAX_BYTES_LINE_HWCONFIG_TXT); -+ nLinesRead = pHalData->nLinesRead6; -+ rtStatus = RT_STATUS_SUCCESS; -+ } -+ -+ -+ if(rtStatus == RT_STATUS_SUCCESS) -+ { -+ RT_TRACE(COMP_INIT, DBG_LOUD, ("phy_ConfigBBWithMpParaFile(): read %s ok\n", pFileName)); -+ -+ for(ithLine = 0; ithLine < nLinesRead; ithLine++) -+ { -+ szLine = pHalData->BufOfLines[ithLine]; -+ -+ if(!IsCommentString(szLine)) -+ { -+ // Get 1st hex value as register offset. -+ if(GetHexValueFromString(szLine, &u4bRegOffset, &u4bMove)) -+ { -+ if(u4bRegOffset == 0xff) -+ { // Ending. -+ break; -+ } -+ else if (u4bRegOffset == 0xfe) -+ delay_ms(50); -+ else if (u4bRegOffset == 0xfd) -+ delay_ms(5); -+ else if (u4bRegOffset == 0xfc) -+ delay_ms(1); -+ else if (u4bRegOffset == 0xfb) -+ PlatformStallExecution(50); -+ else if (u4bRegOffset == 0xfa) -+ PlatformStallExecution(5); -+ else if (u4bRegOffset == 0xf9) -+ PlatformStallExecution(1); -+ -+ // Get 2nd hex value as register value. -+ szLine += u4bMove; -+ if(GetHexValueFromString(szLine, &u4bRegValue, &u4bMove)) -+ { -+ RT_TRACE(COMP_FPGA, DBG_TRACE, ("[ADDR]%03lX=%08lX\n", u4bRegOffset, u4bRegValue)); -+ PHY_SetBBReg(Adapter, u4bRegOffset, bMaskDWord, u4bRegValue); -+ -+ // Add 1us delay between BB/RF register setting. -+ PlatformStallExecution(1); -+ } -+ } -+ } -+ } -+ } -+ else -+ { -+ RT_TRACE(COMP_INIT, DBG_LOUD, ("phy_ConfigBBWithMpParaFile(): Failed%s\n", pFileName)); -+ } -+#endif -+ -+ return rtStatus; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: phy_ConfigBBWithMpHeaderFile -+ * -+ * Overview: Config PHY_REG_MP array -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 02/04/2010 chiyokolin Modify to new files. -+ *---------------------------------------------------------------------------*/ -+static int -+phy_ConfigBBWithMpHeaderFile( -+ IN PADAPTER Adapter, -+ IN u1Byte ConfigType) -+{ -+ int i; -+ u32* Rtl8192CPHY_REGArray_Table_MP; -+ u16 PHY_REGArrayMPLen; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ PHY_REGArrayMPLen = PHY_REG_Array_MPLength; -+ Rtl8192CPHY_REGArray_Table_MP = Rtl819XPHY_REG_Array_MP; -+ -+ if(ConfigType == BaseBand_Config_PHY_REG) -+ { -+ for(i=0;iphy_BB8192S_Config_ParaFile\n")); -+ -+ if(IS_92C_SERIAL(pHalData->VersionID)){ -+ pszBBRegFile=(u8*)&sz92CBBRegFile ; -+ pszAGCTableFile =(u8*)&sz92CAGCTableFile; -+ } -+ else{ -+ pszBBRegFile=(u8*)&sz88CBBRegFile ; -+ pszAGCTableFile =(u8*)&sz88CAGCTableFile; -+ } -+ -+ // -+ // 1. Read PHY_REG.TXT BB INIT!! -+ // We will seperate as 88C / 92C according to chip version -+ // -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus = phy_ConfigBBWithHeaderFile(Adapter, BaseBand_Config_PHY_REG); -+#else -+ // No matter what kind of CHIP we always read PHY_REG.txt. We must copy different -+ // type of parameter files to phy_reg.txt at first. -+ rtStatus = phy_ConfigBBWithParaFile(Adapter,pszBBRegFile); -+#endif -+ -+ if(rtStatus != _SUCCESS){ -+ //RT_TRACE(COMP_INIT, DBG_SERIOUS, ("phy_BB8192S_Config_ParaFile():Write BB Reg Fail!!")); -+ goto phy_BB8190_Config_ParaFile_Fail; -+ } -+ -+#if MP_DRIVER == 1 -+ // -+ // 1.1 Read PHY_REG_MP.TXT BB INIT!! -+ // We will seperate as 88C / 92C according to chip version -+ // -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus = phy_ConfigBBWithMpHeaderFile(Adapter, BaseBand_Config_PHY_REG); -+#else -+ // No matter what kind of CHIP we always read PHY_REG.txt. We must copy different -+ // type of parameter files to phy_reg.txt at first. -+ rtStatus = phy_ConfigBBWithMpParaFile(Adapter, pszBBRegMpFile); -+#endif -+ -+ if(rtStatus != _SUCCESS){ -+// RT_TRACE(COMP_INIT, DBG_SERIOUS, ("phy_BB8192S_Config_ParaFile():Write BB Reg MP Fail!!")); -+ goto phy_BB8190_Config_ParaFile_Fail; -+ } -+#endif // #if (MP_DRIVER == 1) -+ -+ // -+ // 20100318 Joseph: Config 2T2R to 1T2R if necessary. -+ // -+ if(pHalData->rf_type == RF_1T2R) -+ { -+ phy_BB8192C_Config_1T(Adapter); -+ DBG_8192C("phy_BB8192C_Config_ParaFile():Config to 1T!!\n"); -+ } -+ -+ // -+ // 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt -+ // -+ if (pEEPROM->bautoload_fail_flag == _FALSE) -+ { -+ pHalData->pwrGroupCnt = 0; -+ -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus = phy_ConfigBBWithPgHeaderFile(Adapter, BaseBand_Config_PHY_REG); -+#else -+ rtStatus = phy_ConfigBBWithPgParaFile(Adapter, (u8*)&szBBRegPgFile); -+#endif -+ } -+ -+ if(rtStatus != _SUCCESS){ -+ //RT_TRACE(COMP_INIT, DBG_SERIOUS, ("phy_BB8192S_Config_ParaFile():BB_PG Reg Fail!!")); -+ goto phy_BB8190_Config_ParaFile_Fail; -+ } -+ -+ // -+ // 3. BB AGC table Initialization -+ // -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus = phy_ConfigBBWithHeaderFile(Adapter, BaseBand_Config_AGC_TAB); -+#else -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("phy_BB8192S_Config_ParaFile AGC_TAB.txt\n")); -+ rtStatus = phy_ConfigBBWithParaFile(Adapter, pszAGCTableFile); -+#endif -+ -+ if(rtStatus != _SUCCESS){ -+ //RT_TRACE(COMP_FPGA, DBG_SERIOUS, ("phy_BB8192S_Config_ParaFile():AGC Table Fail\n")); -+ goto phy_BB8190_Config_ParaFile_Fail; -+ } -+ -+ // Check if the CCK HighPower is turned ON. -+ // This is used to calculate PWDB. -+ pHalData->bCckHighPower = (BOOLEAN)(PHY_QueryBBReg(Adapter, rFPGA0_XA_HSSIParameter2, 0x200)); -+ -+phy_BB8190_Config_ParaFile_Fail: -+ -+ return rtStatus; -+} -+ -+ -+int -+PHY_BBConfig8192C( -+ IN PADAPTER Adapter -+ ) -+{ -+ int rtStatus = _SUCCESS; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 RegVal; -+ u8 TmpU1B=0; -+ u8 value8; -+ -+ phy_InitBBRFRegisterDefinition(Adapter); -+ -+ if(IS_HARDWARE_TYPE_8723A(Adapter)) -+ { -+ // Suggested by Scott. tynli_test. 2010.12.30. -+ //1. 0x28[1] = 1 -+ TmpU1B = rtw_read8(Adapter, REG_AFE_PLL_CTRL); -+ rtw_udelay_os(2); -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL, (TmpU1B|BIT1)); -+ rtw_udelay_os(2); -+ -+ //2. 0x29[7:0] = 0xFF -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL+1, 0xff); -+ rtw_udelay_os(2); -+ -+ //3. 0x02[1:0] = 2b'11 -+ TmpU1B = rtw_read8(Adapter, REG_SYS_FUNC_EN); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN, (TmpU1B|FEN_BB_GLB_RSTn|FEN_BBRSTB)); -+ -+ //undo clock gated -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)&(~BIT31)); -+ -+ //4. 0x25[6] = 0 -+ TmpU1B = rtw_read8(Adapter, REG_AFE_XTAL_CTRL+1); -+ rtw_write8(Adapter, REG_AFE_XTAL_CTRL+1, (TmpU1B&(~BIT6))); -+ -+ //5. 0x24[20] = 0 //Advised by SD3 Alex Wang. 2011.02.09. -+ TmpU1B = rtw_read8(Adapter, REG_AFE_XTAL_CTRL+2); -+ rtw_write8(Adapter, REG_AFE_XTAL_CTRL+2, (TmpU1B&(~BIT4))); -+ -+ //6. 0x1f[7:0] = 0x07 -+ rtw_write8(Adapter, REG_RF_CTRL, 0x07); -+ } -+ else -+ { -+ // Enable BB and RF -+ RegVal = rtw_read16(Adapter, REG_SYS_FUNC_EN); -+ rtw_write16(Adapter, REG_SYS_FUNC_EN, (u16)(RegVal|BIT13|BIT0|BIT1)); -+ -+ // 20090923 Joseph: Advised by Steven and Jenyu. Power sequence before init RF. -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL, 0x83); -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL+1, 0xdb); -+ -+ rtw_write8(Adapter, REG_RF_CTRL, RF_EN|RF_RSTB|RF_SDMRSTB); -+ -+#ifdef CONFIG_USB_HCI -+ rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | FEN_BB_GLB_RSTn | FEN_BBRSTB); -+#else -+ rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_PPLL|FEN_PCIEA|FEN_DIO_PCIE|FEN_BB_GLB_RSTn|FEN_BBRSTB); -+#endif -+ -+ //undo clock gated -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)&(~BIT31)); -+ -+ // 2009/10/21 by SD1 Jong. Modified by tynli. Not in Documented in V8.1. -+#ifdef CONFIG_USB_HCI -+ //To Fix MAC loopback mode fail. Suggested by SD4 Johnny. 2010.03.23. -+ rtw_write8(Adapter, REG_LDOHCI12_CTRL, 0x0f); -+ rtw_write8(Adapter, 0x15, 0xe9); -+#endif -+ -+ rtw_write8(Adapter, REG_AFE_XTAL_CTRL+1, 0x80); -+ -+#ifdef CONFIG_PCI_HCI -+ // Force use left antenna by default for 88C. -+ // if(!IS_92C_SERIAL(pHalData->VersionID) || IS_92C_1T2R(pHalData->VersionID)) -+ if(Adapter->ledpriv.LedStrategy != SW_LED_MODE10) -+ { -+ RegVal = rtw_read32(Adapter, REG_LEDCFG0); -+ rtw_write32(Adapter, REG_LEDCFG0, RegVal|BIT23); -+ } -+#endif -+ } -+ -+ // -+ // Config BB and AGC -+ // -+ rtStatus = phy_BB8192C_Config_ParaFile(Adapter); -+#if 0 -+ switch(Adapter->MgntInfo.bRegHwParaFile) -+ { -+ case 0: -+ phy_BB8190_Config_HardCode(Adapter); -+ break; -+ -+ case 1: -+ rtStatus = phy_BB8192C_Config_ParaFile(Adapter); -+ break; -+ -+ case 2: -+ // Partial Modify. -+ phy_BB8190_Config_HardCode(Adapter); -+ phy_BB8192C_Config_ParaFile(Adapter); -+ break; -+ -+ default: -+ phy_BB8190_Config_HardCode(Adapter); -+ break; -+ } -+#endif -+#ifdef CONFIG_USB_HCI -+ if(IS_HARDWARE_TYPE_8192CU(Adapter)&&IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID) -+ &&(pHalData->BoardType == BOARD_USB_High_PA)) -+ rtw_write8(Adapter, 0xc72, 0x50); -+#endif -+ -+ return rtStatus; -+} -+ -+ -+int -+PHY_RFConfig8192C( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ int rtStatus = _SUCCESS; -+ -+ // -+ // RF config -+ // -+ rtStatus = PHY_RF6052_Config8192C(Adapter); -+#if 0 -+ switch(pHalData->rf_chip) -+ { -+ case RF_6052: -+ rtStatus = PHY_RF6052_Config(Adapter); -+ break; -+ case RF_8225: -+ rtStatus = PHY_RF8225_Config(Adapter); -+ break; -+ case RF_8256: -+ rtStatus = PHY_RF8256_Config(Adapter); -+ break; -+ case RF_8258: -+ break; -+ case RF_PSEUDO_11N: -+ rtStatus = PHY_RF8225_Config(Adapter); -+ break; -+ default: //for MacOs Warning: "RF_TYPE_MIN" not handled in switch -+ break; -+ } -+#endif -+ return rtStatus; -+} -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: PHY_ConfigRFWithParaFile() -+ * -+ * Overview: This function read RF parameters from general file format, and do RF 3-wire -+ * -+ * Input: PADAPTER Adapter -+ * ps1Byte pFileName -+ * RF_RADIO_PATH_E eRFPath -+ * -+ * Output: NONE -+ * -+ * Return: RT_STATUS_SUCCESS: configuration file exist -+ * -+ * Note: Delay may be required for RF configuration -+ *---------------------------------------------------------------------------*/ -+int -+rtl8192c_PHY_ConfigRFWithParaFile( -+ IN PADAPTER Adapter, -+ IN u8* pFileName, -+ RF_RADIO_PATH_E eRFPath -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ int rtStatus = _SUCCESS; -+ -+ -+ return rtStatus; -+ -+} -+ -+//**************************************** -+// The following is for High Power PA -+//**************************************** -+#define HighPowerRadioAArrayLen 22 -+//This is for High power PA -+u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = { -+0x013,0x00029ea4, -+0x013,0x00025e74, -+0x013,0x00020ea4, -+0x013,0x0001ced0, -+0x013,0x00019f40, -+0x013,0x00014e70, -+0x013,0x000106a0, -+0x013,0x0000c670, -+0x013,0x000082a0, -+0x013,0x00004270, -+0x013,0x00000240, -+}; -+ -+int -+PHY_ConfigRFExternalPA( -+ IN PADAPTER Adapter, -+ RF_RADIO_PATH_E eRFPath -+) -+{ -+ int rtStatus = _SUCCESS; -+#ifdef CONFIG_USB_HCI -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u16 i=0; -+ -+ if(!pHalData->ExternalPA) -+ { -+ return rtStatus; -+ } -+ -+ // 2010/10/19 MH According to Jenyu/EEChou 's opinion, we need not to execute the -+ // same code as SU. It is already updated in radio_a_1T_HP.txt. -+#if 0 -+ //add for SU High Power PA -+ for(i = 0;iVersionID)) -+ { -+ RadioA_ArrayLen = RadioA_2TArrayLength; -+ Rtl819XRadioA_Array_Table = Rtl819XRadioA_2TArray; -+ RadioB_ArrayLen = RadioB_2TArrayLength; -+ Rtl819XRadioB_Array_Table = Rtl819XRadioB_2TArray; -+ } -+ else -+ { -+ RadioA_ArrayLen = RadioA_1TArrayLength; -+ Rtl819XRadioA_Array_Table = Rtl819XRadioA_1TArray; -+ RadioB_ArrayLen = RadioB_1TArrayLength; -+ Rtl819XRadioB_Array_Table = Rtl819XRadioB_1TArray; -+#ifdef CONFIG_USB_HCI -+ if( BOARD_MINICARD == pHalData->BoardType ) -+ { -+ RadioA_ArrayLen = RadioA_1T_mCardArrayLength; -+ Rtl819XRadioA_Array_Table = Rtl819XRadioA_1T_mCardArray; -+ RadioB_ArrayLen = RadioB_1T_mCardArrayLength; -+ Rtl819XRadioB_Array_Table = Rtl819XRadioB_1T_mCardArray; -+ } -+ else if( BOARD_USB_High_PA == pHalData->BoardType ) -+ { -+ RadioA_ArrayLen = RadioA_1T_HPArrayLength; -+ Rtl819XRadioA_Array_Table = Rtl819XRadioA_1T_HPArray; -+ } -+#endif -+ } -+ -+ switch(eRFPath){ -+ case RF_PATH_A: -+ #ifdef CONFIG_IOL_RF_RF90_PATH_A -+ if(rtw_IOL_applied(Adapter)) -+ { -+ struct xmit_frame *xmit_frame; -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) { -+ rtStatus = _FAIL; -+ goto exit; -+ } -+ -+ for(i = 0;iPHYRegDef[eRFPath]; -+ u32 NewOffset = 0; -+ u32 DataAndAddr = 0; -+ -+ NewOffset = Rtl819XRadioA_Array_Table[i] & 0x3f; -+ DataAndAddr = ((NewOffset<<20) | (Rtl819XRadioA_Array_Table[i+1]&0x000fffff)) & 0x0fffffff; // T65 RF -+ rtw_IOL_append_WD_cmd(xmit_frame, pPhyReg->rf3wireOffset, DataAndAddr); -+ } -+ } -+ rtStatus = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000); -+ } -+ else -+ #endif -+ { -+ for(i = 0;iPHYRegDef[eRFPath]; -+ u32 NewOffset = 0; -+ u32 DataAndAddr = 0; -+ -+ NewOffset = Rtl819XRadioB_Array_Table[i] & 0x3f; -+ DataAndAddr = ((NewOffset<<20) | (Rtl819XRadioB_Array_Table[i+1]&0x000fffff)) & 0x0fffffff; // T65 RF -+ rtw_IOL_append_WD_cmd(xmit_frame, pPhyReg->rf3wireOffset, DataAndAddr); -+ } -+ } -+ rtStatus = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000); -+ } -+ else -+ #endif -+ { -+ for(i = 0;i actually we call PlatformStallExecution()) to do NdisStallExecution() -+ // [busy wait] instead of NdisMSleep(). So we acquire RT_INITIAL_SPINLOCK -+ // to run at Dispatch level to achive it. -+ //cosa PlatformAcquireSpinLock(Adapter, RT_INITIAL_SPINLOCK); -+ WriteData[i] &= 0xfff; -+ PHY_SetRFReg(Adapter, eRFPath, WriteAddr[HW90_BLOCK_RF], bRFRegOffsetMask, WriteData[i]); -+ // TODO: we should not delay for such a long time. Ask SD3 -+ rtw_mdelay_os(10); -+ ulRegRead = PHY_QueryRFReg(Adapter, eRFPath, WriteAddr[HW90_BLOCK_RF], bMaskDWord); -+ rtw_mdelay_os(10); -+ //cosa PlatformReleaseSpinLock(Adapter, RT_INITIAL_SPINLOCK); -+ break; -+ -+ default: -+ rtStatus = _FAIL; -+ break; -+ } -+ -+ -+ // -+ // Check whether readback data is correct -+ // -+ if(ulRegRead != WriteData[i]) -+ { -+ //RT_TRACE(COMP_FPGA, DBG_LOUD, ("ulRegRead: %lx, WriteData: %lx \n", ulRegRead, WriteData[i])); -+ rtStatus = _FAIL; -+ break; -+ } -+ } -+ -+ return rtStatus; -+} -+ -+ -+VOID -+rtl8192c_PHY_GetHWRegOriginalValue( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ // read rx initial gain -+ pHalData->DefaultInitialGain[0] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XAAGCCore1, bMaskByte0); -+ pHalData->DefaultInitialGain[1] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XBAGCCore1, bMaskByte0); -+ pHalData->DefaultInitialGain[2] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XCAGCCore1, bMaskByte0); -+ pHalData->DefaultInitialGain[3] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XDAGCCore1, bMaskByte0); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, -+ //("Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x) \n", -+ //pHalData->DefaultInitialGain[0], pHalData->DefaultInitialGain[1], -+ //pHalData->DefaultInitialGain[2], pHalData->DefaultInitialGain[3])); -+ -+ // read framesync -+ pHalData->framesync = (u8)PHY_QueryBBReg(Adapter, rOFDM0_RxDetector3, bMaskByte0); -+ pHalData->framesyncC34 = PHY_QueryBBReg(Adapter, rOFDM0_RxDetector2, bMaskDWord); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Default framesync (0x%x) = 0x%x \n", -+ // rOFDM0_RxDetector3, pHalData->framesync)); -+} -+ -+ -+// -+// Description: -+// Map dBm into Tx power index according to -+// current HW model, for example, RF and PA, and -+// current wireless mode. -+// By Bruce, 2008-01-29. -+// -+static u8 -+phy_DbmToTxPwrIdx( -+ IN PADAPTER Adapter, -+ IN WIRELESS_MODE WirelessMode, -+ IN int PowerInDbm -+ ) -+{ -+ u8 TxPwrIdx = 0; -+ int Offset = 0; -+ -+ -+ // -+ // Tested by MP, we found that CCK Index 0 equals to 8dbm, OFDM legacy equals to -+ // 3dbm, and OFDM HT equals to 0dbm repectively. -+ // Note: -+ // The mapping may be different by different NICs. Do not use this formula for what needs accurate result. -+ // By Bruce, 2008-01-29. -+ // -+ switch(WirelessMode) -+ { -+ case WIRELESS_MODE_B: -+ Offset = -7; -+ break; -+ -+ case WIRELESS_MODE_G: -+ case WIRELESS_MODE_N_24G: -+ Offset = -8; -+ break; -+ default: -+ Offset = -8; -+ break; -+ } -+ -+ if((PowerInDbm - Offset) > 0) -+ { -+ TxPwrIdx = (u8)((PowerInDbm - Offset) * 2); -+ } -+ else -+ { -+ TxPwrIdx = 0; -+ } -+ -+ // Tx Power Index is too large. -+ if(TxPwrIdx > MAX_TXPWR_IDX_NMODE_92S) -+ TxPwrIdx = MAX_TXPWR_IDX_NMODE_92S; -+ -+ return TxPwrIdx; -+} -+ -+// -+// Description: -+// Map Tx power index into dBm according to -+// current HW model, for example, RF and PA, and -+// current wireless mode. -+// By Bruce, 2008-01-29. -+// -+int -+phy_TxPwrIdxToDbm( -+ IN PADAPTER Adapter, -+ IN WIRELESS_MODE WirelessMode, -+ IN u8 TxPwrIdx -+ ) -+{ -+ int Offset = 0; -+ int PwrOutDbm = 0; -+ -+ // -+ // Tested by MP, we found that CCK Index 0 equals to -7dbm, OFDM legacy equals to -8dbm. -+ // Note: -+ // The mapping may be different by different NICs. Do not use this formula for what needs accurate result. -+ // By Bruce, 2008-01-29. -+ // -+ switch(WirelessMode) -+ { -+ case WIRELESS_MODE_B: -+ Offset = -7; -+ break; -+ -+ case WIRELESS_MODE_G: -+ case WIRELESS_MODE_N_24G: -+ Offset = -8; -+ default: -+ Offset = -8; -+ break; -+ } -+ -+ PwrOutDbm = TxPwrIdx / 2 + Offset; // Discard the decimal part. -+ -+ return PwrOutDbm; -+} -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: GetTxPowerLevel8190() -+ * -+ * Overview: This function is export to "common" moudule -+ * -+ * Input: PADAPTER Adapter -+ * psByte Power Level -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+PHY_GetTxPowerLevel8192C( -+ IN PADAPTER Adapter, -+ OUT u32* powerlevel -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 TxPwrLevel = 0; -+ int TxPwrDbm; -+ -+ // -+ // Because the Tx power indexes are different, we report the maximum of them to -+ // meet the CCX TPC request. By Bruce, 2008-01-31. -+ // -+ -+ // CCK -+ TxPwrLevel = pHalData->CurrentCckTxPwrIdx; -+ TxPwrDbm = phy_TxPwrIdxToDbm(Adapter, WIRELESS_MODE_B, TxPwrLevel); -+ -+ // Legacy OFDM -+ TxPwrLevel = pHalData->CurrentOfdm24GTxPwrIdx + pHalData->LegacyHTTxPowerDiff; -+ -+ // Compare with Legacy OFDM Tx power. -+ if(phy_TxPwrIdxToDbm(Adapter, WIRELESS_MODE_G, TxPwrLevel) > TxPwrDbm) -+ TxPwrDbm = phy_TxPwrIdxToDbm(Adapter, WIRELESS_MODE_G, TxPwrLevel); -+ -+ // HT OFDM -+ TxPwrLevel = pHalData->CurrentOfdm24GTxPwrIdx; -+ -+ // Compare with HT OFDM Tx power. -+ if(phy_TxPwrIdxToDbm(Adapter, WIRELESS_MODE_N_24G, TxPwrLevel) > TxPwrDbm) -+ TxPwrDbm = phy_TxPwrIdxToDbm(Adapter, WIRELESS_MODE_N_24G, TxPwrLevel); -+ -+ *powerlevel = TxPwrDbm; -+} -+ -+ -+static void getTxPowerIndex( -+ IN PADAPTER Adapter, -+ IN u8 channel, -+ IN OUT u8* cckPowerLevel, -+ IN OUT u8* ofdmPowerLevel -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 index = (channel -1); -+ // 1. CCK -+ cckPowerLevel[RF_PATH_A] = pHalData->TxPwrLevelCck[RF_PATH_A][index]; //RF-A -+ cckPowerLevel[RF_PATH_B] = pHalData->TxPwrLevelCck[RF_PATH_B][index]; //RF-B -+ -+ // 2. OFDM for 1S or 2S -+ if (GET_RF_TYPE(Adapter) == RF_1T2R || GET_RF_TYPE(Adapter) == RF_1T1R) -+ { -+ // Read HT 40 OFDM TX power -+ ofdmPowerLevel[RF_PATH_A] = pHalData->TxPwrLevelHT40_1S[RF_PATH_A][index]; -+ ofdmPowerLevel[RF_PATH_B] = pHalData->TxPwrLevelHT40_1S[RF_PATH_B][index]; -+ } -+ else if (GET_RF_TYPE(Adapter) == RF_2T2R) -+ { -+ // Read HT 40 OFDM TX power -+ ofdmPowerLevel[RF_PATH_A] = pHalData->TxPwrLevelHT40_2S[RF_PATH_A][index]; -+ ofdmPowerLevel[RF_PATH_B] = pHalData->TxPwrLevelHT40_2S[RF_PATH_B][index]; -+ } -+ //RTPRINT(FPHY, PHY_TXPWR, ("Channel-%d, set tx power index !!\n", channel)); -+} -+ -+static void ccxPowerIndexCheck( -+ IN PADAPTER Adapter, -+ IN u8 channel, -+ IN OUT u8* cckPowerLevel, -+ IN OUT u8* ofdmPowerLevel -+ ) -+{ -+#if 0 -+ PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ PRT_CCX_INFO pCcxInfo = GET_CCX_INFO(pMgntInfo); -+ -+ // -+ // CCX 2 S31, AP control of client transmit power: -+ // 1. We shall not exceed Cell Power Limit as possible as we can. -+ // 2. Tolerance is +/- 5dB. -+ // 3. 802.11h Power Contraint takes higher precedence over CCX Cell Power Limit. -+ // -+ // TODO: -+ // 1. 802.11h power contraint -+ // -+ // 071011, by rcnjko. -+ // -+ if( pMgntInfo->OpMode == RT_OP_MODE_INFRASTRUCTURE && -+ pMgntInfo->mAssoc && -+ pCcxInfo->bUpdateCcxPwr && -+ pCcxInfo->bWithCcxCellPwr && -+ channel == pMgntInfo->dot11CurrentChannelNumber) -+ { -+ u1Byte CckCellPwrIdx = phy_DbmToTxPwrIdx(Adapter, WIRELESS_MODE_B, pCcxInfo->CcxCellPwr); -+ u1Byte LegacyOfdmCellPwrIdx = phy_DbmToTxPwrIdx(Adapter, WIRELESS_MODE_G, pCcxInfo->CcxCellPwr); -+ u1Byte OfdmCellPwrIdx = phy_DbmToTxPwrIdx(Adapter, WIRELESS_MODE_N_24G, pCcxInfo->CcxCellPwr); -+ -+ RT_TRACE(COMP_TXAGC, DBG_LOUD, -+ ("CCX Cell Limit: %d dbm => CCK Tx power index : %d, Legacy OFDM Tx power index : %d, OFDM Tx power index: %d\n", -+ pCcxInfo->CcxCellPwr, CckCellPwrIdx, LegacyOfdmCellPwrIdx, OfdmCellPwrIdx)); -+ RT_TRACE(COMP_TXAGC, DBG_LOUD, -+ ("EEPROM channel(%d) => CCK Tx power index: %d, Legacy OFDM Tx power index : %d, OFDM Tx power index: %d\n", -+ channel, cckPowerLevel[0], ofdmPowerLevel[0] + pHalData->LegacyHTTxPowerDiff, ofdmPowerLevel[0])); -+ -+ // CCK -+ if(cckPowerLevel[0] > CckCellPwrIdx) -+ cckPowerLevel[0] = CckCellPwrIdx; -+ // Legacy OFDM, HT OFDM -+ if(ofdmPowerLevel[0] + pHalData->LegacyHTTxPowerDiff > LegacyOfdmCellPwrIdx) -+ { -+ if((OfdmCellPwrIdx - pHalData->LegacyHTTxPowerDiff) > 0) -+ { -+ ofdmPowerLevel[0] = OfdmCellPwrIdx - pHalData->LegacyHTTxPowerDiff; -+ } -+ else -+ { -+ ofdmPowerLevel[0] = 0; -+ } -+ } -+ -+ RT_TRACE(COMP_TXAGC, DBG_LOUD, -+ ("Altered CCK Tx power index : %d, Legacy OFDM Tx power index: %d, OFDM Tx power index: %d\n", -+ cckPowerLevel[0], ofdmPowerLevel[0] + pHalData->LegacyHTTxPowerDiff, ofdmPowerLevel[0])); -+ } -+ -+ pHalData->CurrentCckTxPwrIdx = cckPowerLevel[0]; -+ pHalData->CurrentOfdm24GTxPwrIdx = ofdmPowerLevel[0]; -+ -+ RT_TRACE(COMP_TXAGC, DBG_LOUD, -+ ("PHY_SetTxPowerLevel8192S(): CCK Tx power index : %d, Legacy OFDM Tx power index: %d, OFDM Tx power index: %d\n", -+ cckPowerLevel[0], ofdmPowerLevel[0] + pHalData->LegacyHTTxPowerDiff, ofdmPowerLevel[0])); -+#endif -+} -+/*----------------------------------------------------------------------------- -+ * Function: SetTxPowerLevel8190() -+ * -+ * Overview: This function is export to "HalCommon" moudule -+ * We must consider RF path later!!!!!!! -+ * -+ * Input: PADAPTER Adapter -+ * u1Byte channel -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * 2008/11/04 MHC We remove EEPROM_93C56. -+ * We need to move CCX relative code to independet file. -+ * 2009/01/21 MHC Support new EEPROM format from SD3 requirement. -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+PHY_SetTxPowerLevel8192C( -+ IN PADAPTER Adapter, -+ IN u8 channel -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 cckPowerLevel[2], ofdmPowerLevel[2]; // [0]:RF-A, [1]:RF-B -+ -+#if(MP_DRIVER == 1) -+ return; -+#endif -+ -+ if(pHalData->bTXPowerDataReadFromEEPORM == _FALSE) -+ return; -+ -+ getTxPowerIndex(Adapter, channel, &cckPowerLevel[0], &ofdmPowerLevel[0]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("Channel-%d, cckPowerLevel (A / B) = 0x%x / 0x%x, ofdmPowerLevel (A / B) = 0x%x / 0x%x\n", -+ // channel, cckPowerLevel[0], cckPowerLevel[1], ofdmPowerLevel[0], ofdmPowerLevel[1])); -+ -+ ccxPowerIndexCheck(Adapter, channel, &cckPowerLevel[0], &ofdmPowerLevel[0]); -+ -+ rtl8192c_PHY_RF6052SetCckTxPower(Adapter, &cckPowerLevel[0]); -+ rtl8192c_PHY_RF6052SetOFDMTxPower(Adapter, &ofdmPowerLevel[0], channel); -+ -+#if 0 -+ switch(pHalData->rf_chip) -+ { -+ case RF_8225: -+ PHY_SetRF8225CckTxPower(Adapter, cckPowerLevel[0]); -+ PHY_SetRF8225OfdmTxPower(Adapter, ofdmPowerLevel[0]); -+ break; -+ -+ case RF_8256: -+ PHY_SetRF8256CCKTxPower(Adapter, cckPowerLevel[0]); -+ PHY_SetRF8256OFDMTxPower(Adapter, ofdmPowerLevel[0]); -+ break; -+ -+ case RF_6052: -+ PHY_RF6052SetCckTxPower(Adapter, &cckPowerLevel[0]); -+ PHY_RF6052SetOFDMTxPower(Adapter, &ofdmPowerLevel[0], channel); -+ break; -+ -+ case RF_8258: -+ break; -+ } -+#endif -+ -+} -+ -+ -+// -+// Description: -+// Update transmit power level of all channel supported. -+// -+// TODO: -+// A mode. -+// By Bruce, 2008-02-04. -+// -+BOOLEAN -+PHY_UpdateTxPowerDbm8192C( -+ IN PADAPTER Adapter, -+ IN int powerInDbm -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 idx; -+ u8 rf_path; -+ -+ // TODO: A mode Tx power. -+ u8 CckTxPwrIdx = phy_DbmToTxPwrIdx(Adapter, WIRELESS_MODE_B, powerInDbm); -+ u8 OfdmTxPwrIdx = phy_DbmToTxPwrIdx(Adapter, WIRELESS_MODE_N_24G, powerInDbm); -+ -+ if(OfdmTxPwrIdx - pHalData->LegacyHTTxPowerDiff > 0) -+ OfdmTxPwrIdx -= pHalData->LegacyHTTxPowerDiff; -+ else -+ OfdmTxPwrIdx = 0; -+ -+ //RT_TRACE(COMP_TXAGC, DBG_LOUD, ("PHY_UpdateTxPowerDbm8192S(): %ld dBm , CckTxPwrIdx = %d, OfdmTxPwrIdx = %d\n", powerInDbm, CckTxPwrIdx, OfdmTxPwrIdx)); -+ -+ for(idx = 0; idx < 14; idx++) -+ { -+ for (rf_path = 0; rf_path < 2; rf_path++) -+ { -+ pHalData->TxPwrLevelCck[rf_path][idx] = CckTxPwrIdx; -+ pHalData->TxPwrLevelHT40_1S[rf_path][idx] = -+ pHalData->TxPwrLevelHT40_2S[rf_path][idx] = OfdmTxPwrIdx; -+ } -+ } -+ -+ //Adapter->HalFunc.SetTxPowerLevelHandler(Adapter, pHalData->CurrentChannel);//gtest:todo -+ -+ return _TRUE; -+} -+ -+ -+/* -+ Description: -+ When beacon interval is changed, the values of the -+ hw registers should be modified. -+ By tynli, 2008.10.24. -+ -+*/ -+ -+ -+void -+rtl8192c_PHY_SetBeaconHwReg( -+ IN PADAPTER Adapter, -+ IN u16 BeaconInterval -+ ) -+{ -+ -+} -+ -+ -+VOID -+PHY_ScanOperationBackup8192C( -+ IN PADAPTER Adapter, -+ IN u8 Operation -+ ) -+{ -+#if 0 -+ IO_TYPE IoType; -+ -+ if(!Adapter->bDriverStopped) -+ { -+ switch(Operation) -+ { -+ case SCAN_OPT_BACKUP: -+ IoType = IO_CMD_PAUSE_DM_BY_SCAN; -+ rtw_hal_set_hwreg(Adapter,HW_VAR_IO_CMD, (pu1Byte)&IoType); -+ -+ break; -+ -+ case SCAN_OPT_RESTORE: -+ IoType = IO_CMD_RESUME_DM_BY_SCAN; -+ rtw_hal_set_hwreg(Adapter,HW_VAR_IO_CMD, (pu1Byte)&IoType); -+ break; -+ -+ default: -+ RT_TRACE(COMP_SCAN, DBG_LOUD, ("Unknown Scan Backup Operation. \n")); -+ break; -+ } -+ } -+#endif -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: PHY_SetBWModeCallback8192C() -+ * -+ * Overview: Timer callback function for SetSetBWMode -+ * -+ * Input: PRT_TIMER pTimer -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Note: (1) We do not take j mode into consideration now -+ * (2) Will two workitem of "switch channel" and "switch channel bandwidth" run -+ * concurrently? -+ *---------------------------------------------------------------------------*/ -+static VOID -+_PHY_SetBWMode92C( -+ IN PADAPTER Adapter -+) -+{ -+// PADAPTER Adapter = (PADAPTER)pTimer->Adapter; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 regBwOpMode; -+ u8 regRRSR_RSC; -+ -+ //return; -+ -+ // Added it for 20/40 mhz switch time evaluation by guangan 070531 -+ //u4Byte NowL, NowH; -+ //u8Byte BeginTime, EndTime; -+ -+ /*RT_TRACE(COMP_SCAN, DBG_LOUD, ("==>PHY_SetBWModeCallback8192C() Switch to %s bandwidth\n", \ -+ pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz"))*/ -+ -+ if(pHalData->rf_chip == RF_PSEUDO_11N) -+ { -+ //pHalData->SetBWModeInProgress= _FALSE; -+ return; -+ } -+ -+ // There is no 40MHz mode in RF_8225. -+ if(pHalData->rf_chip==RF_8225) -+ return; -+ -+ if(Adapter->bDriverStopped) -+ return; -+ -+ // Added it for 20/40 mhz switch time evaluation by guangan 070531 -+ //NowL = PlatformEFIORead4Byte(Adapter, TSFR); -+ //NowH = PlatformEFIORead4Byte(Adapter, TSFR+4); -+ //BeginTime = ((u8Byte)NowH << 32) + NowL; -+ -+ //3// -+ //3//<1>Set MAC register -+ //3// -+ //Adapter->HalFunc.SetBWModeHandler(); -+ -+ regBwOpMode = rtw_read8(Adapter, REG_BWOPMODE); -+ regRRSR_RSC = rtw_read8(Adapter, REG_RRSR+2); -+ //regBwOpMode = rtw_hal_get_hwreg(Adapter,HW_VAR_BWMODE,(pu1Byte)®BwOpMode); -+ -+ switch(pHalData->CurrentChannelBW) -+ { -+ case HT_CHANNEL_WIDTH_20: -+ regBwOpMode |= BW_OPMODE_20MHZ; -+ // 2007/02/07 Mark by Emily becasue we have not verify whether this register works -+ rtw_write8(Adapter, REG_BWOPMODE, regBwOpMode); -+ break; -+ -+ case HT_CHANNEL_WIDTH_40: -+ regBwOpMode &= ~BW_OPMODE_20MHZ; -+ // 2007/02/07 Mark by Emily becasue we have not verify whether this register works -+ rtw_write8(Adapter, REG_BWOPMODE, regBwOpMode); -+ -+ regRRSR_RSC = (regRRSR_RSC&0x90) |(pHalData->nCur40MhzPrimeSC<<5); -+ rtw_write8(Adapter, REG_RRSR+2, regRRSR_RSC); -+ break; -+ -+ default: -+ /*RT_TRACE(COMP_DBG, DBG_LOUD, ("PHY_SetBWModeCallback8192C(): -+ unknown Bandwidth: %#X\n",pHalData->CurrentChannelBW));*/ -+ break; -+ } -+ -+ //3// -+ //3//<2>Set PHY related register -+ //3// -+ switch(pHalData->CurrentChannelBW) -+ { -+ /* 20 MHz channel*/ -+ case HT_CHANNEL_WIDTH_20: -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bRFMOD, 0x0); -+ PHY_SetBBReg(Adapter, rFPGA1_RFMOD, bRFMOD, 0x0); -+ PHY_SetBBReg(Adapter, rFPGA0_AnalogParameter2, BIT10, 1); -+ -+ break; -+ -+ -+ /* 40 MHz channel*/ -+ case HT_CHANNEL_WIDTH_40: -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bRFMOD, 0x1); -+ PHY_SetBBReg(Adapter, rFPGA1_RFMOD, bRFMOD, 0x1); -+ -+ // Set Control channel to upper or lower. These settings are required only for 40MHz -+ PHY_SetBBReg(Adapter, rCCK0_System, bCCKSideBand, (pHalData->nCur40MhzPrimeSC>>1)); -+ PHY_SetBBReg(Adapter, rOFDM1_LSTF, 0xC00, pHalData->nCur40MhzPrimeSC); -+ PHY_SetBBReg(Adapter, rFPGA0_AnalogParameter2, BIT10, 0); -+ -+ PHY_SetBBReg(Adapter, 0x818, (BIT26|BIT27), (pHalData->nCur40MhzPrimeSC==HAL_PRIME_CHNL_OFFSET_LOWER)?2:1); -+ -+ break; -+ -+ -+ -+ default: -+ /*RT_TRACE(COMP_DBG, DBG_LOUD, ("PHY_SetBWModeCallback8192C(): unknown Bandwidth: %#X\n"\ -+ ,pHalData->CurrentChannelBW));*/ -+ break; -+ -+ } -+ //Skip over setting of J-mode in BB register here. Default value is "None J mode". Emily 20070315 -+ -+ // Added it for 20/40 mhz switch time evaluation by guangan 070531 -+ //NowL = PlatformEFIORead4Byte(Adapter, TSFR); -+ //NowH = PlatformEFIORead4Byte(Adapter, TSFR+4); -+ //EndTime = ((u8Byte)NowH << 32) + NowL; -+ //RT_TRACE(COMP_SCAN, DBG_LOUD, ("SetBWModeCallback8190Pci: time of SetBWMode = %I64d us!\n", (EndTime - BeginTime))); -+ -+ //3<3>Set RF related register -+ switch(pHalData->rf_chip) -+ { -+ case RF_8225: -+ //PHY_SetRF8225Bandwidth(Adapter, pHalData->CurrentChannelBW); -+ break; -+ -+ case RF_8256: -+ // Please implement this function in Hal8190PciPhy8256.c -+ //PHY_SetRF8256Bandwidth(Adapter, pHalData->CurrentChannelBW); -+ break; -+ -+ case RF_8258: -+ // Please implement this function in Hal8190PciPhy8258.c -+ // PHY_SetRF8258Bandwidth(); -+ break; -+ -+ case RF_PSEUDO_11N: -+ // Do Nothing -+ break; -+ -+ case RF_6052: -+ rtl8192c_PHY_RF6052SetBandwidth(Adapter, pHalData->CurrentChannelBW); -+ break; -+ -+ default: -+ //RT_ASSERT(FALSE, ("Unknown RFChipID: %d\n", pHalData->RFChipID)); -+ break; -+ } -+ -+ //pHalData->SetBWModeInProgress= FALSE; -+ -+ //RT_TRACE(COMP_SCAN, DBG_LOUD, ("<==PHY_SetBWModeCallback8192C() \n" )); -+} -+ -+ -+ /*----------------------------------------------------------------------------- -+ * Function: SetBWMode8190Pci() -+ * -+ * Overview: This function is export to "HalCommon" moudule -+ * -+ * Input: PADAPTER Adapter -+ * HT_CHANNEL_WIDTH Bandwidth //20M or 40M -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Note: We do not take j mode into consideration now -+ *---------------------------------------------------------------------------*/ -+VOID -+PHY_SetBWMode8192C( -+ IN PADAPTER Adapter, -+ IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M -+ IN unsigned char Offset // Upper, Lower, or Don't care -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ HT_CHANNEL_WIDTH tmpBW= pHalData->CurrentChannelBW; -+ // Modified it for 20/40 mhz switch by guangan 070531 -+ //PMGNT_INFO pMgntInfo=&Adapter->MgntInfo; -+ -+ //return; -+ -+ //if(pHalData->SwChnlInProgress) -+// if(pMgntInfo->bScanInProgress) -+// { -+// RT_TRACE(COMP_SCAN, DBG_LOUD, ("PHY_SetBWMode8192C() %s Exit because bScanInProgress!\n", -+// Bandwidth == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz")); -+// return; -+// } -+ -+// if(pHalData->SetBWModeInProgress) -+// { -+// // Modified it for 20/40 mhz switch by guangan 070531 -+// RT_TRACE(COMP_SCAN, DBG_LOUD, ("PHY_SetBWMode8192C() %s cancel last timer because SetBWModeInProgress!\n", -+// Bandwidth == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz")); -+// PlatformCancelTimer(Adapter, &pHalData->SetBWModeTimer); -+// //return; -+// } -+ -+ //if(pHalData->SetBWModeInProgress) -+ // return; -+ -+ //pHalData->SetBWModeInProgress= TRUE; -+ -+ pHalData->CurrentChannelBW = Bandwidth; -+ -+#if 0 -+ if(Offset==HT_EXTCHNL_OFFSET_LOWER) -+ pHalData->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_UPPER; -+ else if(Offset==HT_EXTCHNL_OFFSET_UPPER) -+ pHalData->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_LOWER; -+ else -+ pHalData->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+#else -+ pHalData->nCur40MhzPrimeSC = Offset; -+#endif -+ -+ if((!Adapter->bDriverStopped) && (!Adapter->bSurpriseRemoved)) -+ { -+#ifdef USE_WORKITEM -+ //PlatformScheduleWorkItem(&(pHalData->SetBWModeWorkItem)); -+#else -+ #if 0 -+ //PlatformSetTimer(Adapter, &(pHalData->SetBWModeTimer), 0); -+ #else -+ _PHY_SetBWMode92C(Adapter); -+ #endif -+#endif -+ } -+ else -+ { -+ //RT_TRACE(COMP_SCAN, DBG_LOUD, ("PHY_SetBWMode8192C() SetBWModeInProgress FALSE driver sleep or unload\n")); -+ //pHalData->SetBWModeInProgress= FALSE; -+ pHalData->CurrentChannelBW = tmpBW; -+ } -+ -+} -+ -+ -+static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) -+{ -+ u8 eRFPath; -+ u32 param1, param2; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if ( Adapter->bNotifyChannelChange ) -+ { -+ DBG_871X( "[%s] ch = %d\n", __FUNCTION__, channel ); -+ } -+ -+ //s1. pre common command - CmdID_SetTxPowerLevel -+ PHY_SetTxPowerLevel8192C(Adapter, channel); -+ -+ //s2. RF dependent command - CmdID_RF_WriteReg, param1=RF_CHNLBW, param2=channel -+ param1 = RF_CHNLBW; -+ param2 = channel; -+ for(eRFPath = 0; eRFPath NumTotalRFPath; eRFPath++) -+ { -+ pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | param2); -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); -+ } -+ -+ -+ //s3. post common command - CmdID_End, None -+ -+} -+ -+VOID -+PHY_SwChnl8192C( // Call after initialization -+ IN PADAPTER Adapter, -+ IN u8 channel -+ ) -+{ -+ //PADAPTER Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 tmpchannel = pHalData->CurrentChannel; -+ BOOLEAN bResult = _TRUE; -+ -+ if(pHalData->rf_chip == RF_PSEUDO_11N) -+ { -+ //pHalData->SwChnlInProgress=FALSE; -+ return; //return immediately if it is peudo-phy -+ } -+ -+ //if(pHalData->SwChnlInProgress) -+ // return; -+ -+ //if(pHalData->SetBWModeInProgress) -+ // return; -+ -+ //-------------------------------------------- -+ switch(pHalData->CurrentWirelessMode) -+ { -+ case WIRELESS_MODE_A: -+ case WIRELESS_MODE_N_5G: -+ //RT_ASSERT((channel>14), ("WIRELESS_MODE_A but channel<=14")); -+ break; -+ -+ case WIRELESS_MODE_B: -+ //RT_ASSERT((channel<=14), ("WIRELESS_MODE_B but channel>14")); -+ break; -+ -+ case WIRELESS_MODE_G: -+ case WIRELESS_MODE_N_24G: -+ //RT_ASSERT((channel<=14), ("WIRELESS_MODE_G but channel>14")); -+ break; -+ -+ default: -+ //RT_ASSERT(FALSE, ("Invalid WirelessMode(%#x)!!\n", pHalData->CurrentWirelessMode)); -+ break; -+ } -+ //-------------------------------------------- -+ -+ //pHalData->SwChnlInProgress = TRUE; -+ if(channel == 0) -+ channel = 1; -+ -+ pHalData->CurrentChannel=channel; -+ -+ //pHalData->SwChnlStage=0; -+ //pHalData->SwChnlStep=0; -+ -+ if((!Adapter->bDriverStopped) && (!Adapter->bSurpriseRemoved)) -+ { -+#ifdef USE_WORKITEM -+ //bResult = PlatformScheduleWorkItem(&(pHalData->SwChnlWorkItem)); -+#else -+ #if 0 -+ //PlatformSetTimer(Adapter, &(pHalData->SwChnlTimer), 0); -+ #else -+ _PHY_SwChnl8192C(Adapter, channel); -+ #endif -+#endif -+ if(bResult) -+ { -+ //RT_TRACE(COMP_SCAN, DBG_LOUD, ("PHY_SwChnl8192C SwChnlInProgress TRUE schdule workitem done\n")); -+ } -+ else -+ { -+ //RT_TRACE(COMP_SCAN, DBG_LOUD, ("PHY_SwChnl8192C SwChnlInProgress FALSE schdule workitem error\n")); -+ //if(IS_HARDWARE_TYPE_8192SU(Adapter)) -+ //{ -+ // pHalData->SwChnlInProgress = FALSE; -+ pHalData->CurrentChannel = tmpchannel; -+ //} -+ } -+ -+ } -+ else -+ { -+ //RT_TRACE(COMP_SCAN, DBG_LOUD, ("PHY_SwChnl8192C SwChnlInProgress FALSE driver sleep or unload\n")); -+ //if(IS_HARDWARE_TYPE_8192SU(Adapter)) -+ //{ -+ // pHalData->SwChnlInProgress = FALSE; -+ pHalData->CurrentChannel = tmpchannel; -+ //} -+ } -+} -+ -+ -+static BOOLEAN -+phy_SwChnlStepByStep( -+ IN PADAPTER Adapter, -+ IN u8 channel, -+ IN u8 *stage, -+ IN u8 *step, -+ OUT u32 *delay -+ ) -+{ -+#if 0 -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ PCHANNEL_ACCESS_SETTING pChnlAccessSetting; -+ SwChnlCmd PreCommonCmd[MAX_PRECMD_CNT]; -+ u4Byte PreCommonCmdCnt; -+ SwChnlCmd PostCommonCmd[MAX_POSTCMD_CNT]; -+ u4Byte PostCommonCmdCnt; -+ SwChnlCmd RfDependCmd[MAX_RFDEPENDCMD_CNT]; -+ u4Byte RfDependCmdCnt; -+ SwChnlCmd *CurrentCmd; -+ u1Byte eRFPath; -+ u4Byte RfTXPowerCtrl; -+ BOOLEAN bAdjRfTXPowerCtrl = _FALSE; -+ -+ -+ RT_ASSERT((Adapter != NULL), ("Adapter should not be NULL\n")); -+#if(MP_DRIVER != 1) -+ RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); -+#endif -+ RT_ASSERT((pHalData != NULL), ("pHalData should not be NULL\n")); -+ -+ pChnlAccessSetting = &Adapter->MgntInfo.Info8185.ChannelAccessSetting; -+ RT_ASSERT((pChnlAccessSetting != NULL), ("pChnlAccessSetting should not be NULL\n")); -+ -+ //for(eRFPath = RF_PATH_A; eRFPath NumTotalRFPath; eRFPath++) -+ //for(eRFPath = 0; eRFPath NumTotalRFPath; eRFPath++) -+ //{ -+ // <1> Fill up pre common command. -+ PreCommonCmdCnt = 0; -+ phy_SetSwChnlCmdArray(PreCommonCmd, PreCommonCmdCnt++, MAX_PRECMD_CNT, -+ CmdID_SetTxPowerLevel, 0, 0, 0); -+ phy_SetSwChnlCmdArray(PreCommonCmd, PreCommonCmdCnt++, MAX_PRECMD_CNT, -+ CmdID_End, 0, 0, 0); -+ -+ // <2> Fill up post common command. -+ PostCommonCmdCnt = 0; -+ -+ phy_SetSwChnlCmdArray(PostCommonCmd, PostCommonCmdCnt++, MAX_POSTCMD_CNT, -+ CmdID_End, 0, 0, 0); -+ -+ // <3> Fill up RF dependent command. -+ RfDependCmdCnt = 0; -+ switch( pHalData->RFChipID ) -+ { -+ case RF_8225: -+ RT_ASSERT((channel >= 1 && channel <= 14), ("illegal channel for Zebra: %d\n", channel)); -+ // 2008/09/04 MH Change channel. -+ if(channel==14) channel++; -+ phy_SetSwChnlCmdArray(RfDependCmd, RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, -+ CmdID_RF_WriteReg, rZebra1_Channel, (0x10+channel-1), 10); -+ phy_SetSwChnlCmdArray(RfDependCmd, RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, -+ CmdID_End, 0, 0, 0); -+ break; -+ -+ case RF_8256: -+ // TEST!! This is not the table for 8256!! -+ RT_ASSERT((channel >= 1 && channel <= 14), ("illegal channel for Zebra: %d\n", channel)); -+ phy_SetSwChnlCmdArray(RfDependCmd, RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, -+ CmdID_RF_WriteReg, rRfChannel, channel, 10); -+ phy_SetSwChnlCmdArray(RfDependCmd, RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, -+ CmdID_End, 0, 0, 0); -+ break; -+ -+ case RF_6052: -+ RT_ASSERT((channel >= 1 && channel <= 14), ("illegal channel for Zebra: %d\n", channel)); -+ phy_SetSwChnlCmdArray(RfDependCmd, RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, -+ CmdID_RF_WriteReg, RF_CHNLBW, channel, 10); -+ phy_SetSwChnlCmdArray(RfDependCmd, RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, -+ CmdID_End, 0, 0, 0); -+ -+ break; -+ -+ case RF_8258: -+ break; -+ -+ // For FPGA two MAC verification -+ case RF_PSEUDO_11N: -+ return TRUE; -+ default: -+ RT_ASSERT(FALSE, ("Unknown RFChipID: %d\n", pHalData->RFChipID)); -+ return FALSE; -+ break; -+ } -+ -+ -+ do{ -+ switch(*stage) -+ { -+ case 0: -+ CurrentCmd=&PreCommonCmd[*step]; -+ break; -+ case 1: -+ CurrentCmd=&RfDependCmd[*step]; -+ break; -+ case 2: -+ CurrentCmd=&PostCommonCmd[*step]; -+ break; -+ } -+ -+ if(CurrentCmd->CmdID==CmdID_End) -+ { -+ if((*stage)==2) -+ { -+ return TRUE; -+ } -+ else -+ { -+ (*stage)++; -+ (*step)=0; -+ continue; -+ } -+ } -+ -+ switch(CurrentCmd->CmdID) -+ { -+ case CmdID_SetTxPowerLevel: -+ PHY_SetTxPowerLevel8192C(Adapter,channel); -+ break; -+ case CmdID_WritePortUlong: -+ PlatformEFIOWrite4Byte(Adapter, CurrentCmd->Para1, CurrentCmd->Para2); -+ break; -+ case CmdID_WritePortUshort: -+ PlatformEFIOWrite2Byte(Adapter, CurrentCmd->Para1, (u2Byte)CurrentCmd->Para2); -+ break; -+ case CmdID_WritePortUchar: -+ PlatformEFIOWrite1Byte(Adapter, CurrentCmd->Para1, (u1Byte)CurrentCmd->Para2); -+ break; -+ case CmdID_RF_WriteReg: // Only modify channel for the register now !!!!! -+ for(eRFPath = 0; eRFPath NumTotalRFPath; eRFPath++) -+ { -+#if 1 -+ pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | CurrentCmd->Para2); -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, CurrentCmd->Para1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); -+#else -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, CurrentCmd->Para1, bRFRegOffsetMask, (CurrentCmd->Para2)); -+#endif -+ } -+ break; -+ } -+ -+ break; -+ }while(TRUE); -+ //cosa }/*for(Number of RF paths)*/ -+ -+ (*delay)=CurrentCmd->msDelay; -+ (*step)++; -+ return FALSE; -+#endif -+ return _TRUE; -+} -+ -+ -+static BOOLEAN -+phy_SetSwChnlCmdArray( -+ SwChnlCmd* CmdTable, -+ u32 CmdTableIdx, -+ u32 CmdTableSz, -+ SwChnlCmdID CmdID, -+ u32 Para1, -+ u32 Para2, -+ u32 msDelay -+ ) -+{ -+ SwChnlCmd* pCmd; -+ -+ if(CmdTable == NULL) -+ { -+ //RT_ASSERT(FALSE, ("phy_SetSwChnlCmdArray(): CmdTable cannot be NULL.\n")); -+ return _FALSE; -+ } -+ if(CmdTableIdx >= CmdTableSz) -+ { -+ //RT_ASSERT(FALSE, -+ // ("phy_SetSwChnlCmdArray(): Access invalid index, please check size of the table, CmdTableIdx:%ld, CmdTableSz:%ld\n", -+ // CmdTableIdx, CmdTableSz)); -+ return _FALSE; -+ } -+ -+ pCmd = CmdTable + CmdTableIdx; -+ pCmd->CmdID = CmdID; -+ pCmd->Para1 = Para1; -+ pCmd->Para2 = Para2; -+ pCmd->msDelay = msDelay; -+ -+ return _TRUE; -+} -+ -+ -+static void -+phy_FinishSwChnlNow( // We should not call this function directly -+ IN PADAPTER Adapter, -+ IN u8 channel -+ ) -+{ -+#if 0 -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 delay; -+ -+ while(!phy_SwChnlStepByStep(Adapter,channel,&pHalData->SwChnlStage,&pHalData->SwChnlStep,&delay)) -+ { -+ if(delay>0) -+ rtw_mdelay_os(delay); -+ } -+#endif -+} -+ -+ -+ -+// -+// Description: -+// Switch channel synchronously. Called by SwChnlByDelayHandler. -+// -+// Implemented by Bruce, 2008-02-14. -+// The following procedure is operted according to SwChanlCallback8190Pci(). -+// However, this procedure is performed synchronously which should be running under -+// passive level. -+// -+VOID -+PHY_SwChnlPhy8192C( // Only called during initialize -+ IN PADAPTER Adapter, -+ IN u8 channel -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ //RT_TRACE(COMP_SCAN | COMP_RM, DBG_LOUD, ("==>PHY_SwChnlPhy8192S(), switch from channel %d to channel %d.\n", pHalData->CurrentChannel, channel)); -+ -+ // Cannot IO. -+ //if(RT_CANNOT_IO(Adapter)) -+ // return; -+ -+ // Channel Switching is in progress. -+ //if(pHalData->SwChnlInProgress) -+ // return; -+ -+ //return immediately if it is peudo-phy -+ if(pHalData->rf_chip == RF_PSEUDO_11N) -+ { -+ //pHalData->SwChnlInProgress=FALSE; -+ return; -+ } -+ -+ //pHalData->SwChnlInProgress = TRUE; -+ if( channel == 0) -+ channel = 1; -+ -+ pHalData->CurrentChannel=channel; -+ -+ //pHalData->SwChnlStage = 0; -+ //pHalData->SwChnlStep = 0; -+ -+ phy_FinishSwChnlNow(Adapter,channel); -+ -+ //pHalData->SwChnlInProgress = FALSE; -+} -+ -+ -+// -+// Description: -+// Configure H/W functionality to enable/disable Monitor mode. -+// Note, because we possibly need to configure BB and RF in this function, -+// so caller should in PASSIVE_LEVEL. 080118, by rcnjko. -+// -+VOID -+PHY_SetMonitorMode8192C( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN bEnableMonitorMode -+ ) -+{ -+#if 0 -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ BOOLEAN bFilterOutNonAssociatedBSSID = FALSE; -+ -+ //2 Note: we may need to stop antenna diversity. -+ if(bEnableMonitorMode) -+ { -+ bFilterOutNonAssociatedBSSID = FALSE; -+ RT_TRACE(COMP_RM, DBG_LOUD, ("PHY_SetMonitorMode8192S(): enable monitor mode\n")); -+ -+ pHalData->bInMonitorMode = TRUE; -+ pAdapter->HalFunc.AllowAllDestAddrHandler(pAdapter, TRUE, TRUE); -+ rtw_hal_set_hwreg(pAdapter, HW_VAR_CHECK_BSSID, (pu1Byte)&bFilterOutNonAssociatedBSSID); -+ } -+ else -+ { -+ bFilterOutNonAssociatedBSSID = TRUE; -+ RT_TRACE(COMP_RM, DBG_LOUD, ("PHY_SetMonitorMode8192S(): disable monitor mode\n")); -+ -+ pAdapter->HalFunc.AllowAllDestAddrHandler(pAdapter, FALSE, TRUE); -+ pHalData->bInMonitorMode = FALSE; -+ rtw_hal_set_hwreg(pAdapter, HW_VAR_CHECK_BSSID, (pu1Byte)&bFilterOutNonAssociatedBSSID); -+ } -+#endif -+} -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: PHYCheckIsLegalRfPath8190Pci() -+ * -+ * Overview: Check different RF type to execute legal judgement. If RF Path is illegal -+ * We will return false. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/15/2007 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+BOOLEAN -+PHY_CheckIsLegalRfPath8192C( -+ IN PADAPTER pAdapter, -+ IN u32 eRFPath) -+{ -+// HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ BOOLEAN rtValue = _TRUE; -+ -+ // NOt check RF Path now.! -+#if 0 -+ if (pHalData->RF_Type == RF_1T2R && eRFPath != RF_PATH_A) -+ { -+ rtValue = FALSE; -+ } -+ if (pHalData->RF_Type == RF_1T2R && eRFPath != RF_PATH_A) -+ { -+ -+ } -+#endif -+ return rtValue; -+ -+} /* PHY_CheckIsLegalRfPath8192C */ -+ -+//------------------------------------------------------------------------- -+// -+// IQK -+// -+//------------------------------------------------------------------------- -+#define MAX_TOLERANCE 5 -+#define IQK_DELAY_TIME 1 //ms -+ -+static u8 //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK -+_PHY_PathA_IQK( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN configPathB -+ ) -+{ -+ u32 regEAC, regE94, regE9C, regEA4; -+ u8 result = 0x00; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ //RTPRINT(FINIT, INIT_IQK, ("Path A IQK!\n")); -+ -+ //path-A IQK setting -+ //RTPRINT(FINIT, INIT_IQK, ("Path-A IQK setting!\n")); -+ PHY_SetBBReg(pAdapter, rTx_IQK_Tone_A, bMaskDWord, 0x10008c1f); -+ PHY_SetBBReg(pAdapter, rRx_IQK_Tone_A, bMaskDWord, 0x10008c1f); -+ PHY_SetBBReg(pAdapter, rTx_IQK_PI_A, bMaskDWord, 0x82140102); -+ -+ PHY_SetBBReg(pAdapter, rRx_IQK_PI_A, bMaskDWord, configPathB ? 0x28160202 : -+ IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)?0x28160202:0x28160502); -+ -+ //path-B IQK setting -+ if(configPathB) -+ { -+ PHY_SetBBReg(pAdapter, rTx_IQK_Tone_B, bMaskDWord, 0x10008c22); -+ PHY_SetBBReg(pAdapter, rRx_IQK_Tone_B, bMaskDWord, 0x10008c22); -+ PHY_SetBBReg(pAdapter, rTx_IQK_PI_B, bMaskDWord, 0x82140102); -+ PHY_SetBBReg(pAdapter, rRx_IQK_PI_B, bMaskDWord, 0x28160202); -+ } -+ -+ //LO calibration setting -+ //RTPRINT(FINIT, INIT_IQK, ("LO calibration setting!\n")); -+ PHY_SetBBReg(pAdapter, rIQK_AGC_Rsp, bMaskDWord, 0x001028d1); -+ -+ //One shot, path A LOK & IQK -+ //RTPRINT(FINIT, INIT_IQK, ("One shot, path A LOK & IQK!\n")); -+ PHY_SetBBReg(pAdapter, rIQK_AGC_Pts, bMaskDWord, 0xf9000000); -+ PHY_SetBBReg(pAdapter, rIQK_AGC_Pts, bMaskDWord, 0xf8000000); -+ -+ // delay x ms -+ //RTPRINT(FINIT, INIT_IQK, ("Delay %d ms for One shot, path A LOK & IQK.\n", IQK_DELAY_TIME)); -+ rtw_udelay_os(IQK_DELAY_TIME*1000);//PlatformStallExecution(IQK_DELAY_TIME*1000); -+ -+ // Check failed -+ regEAC = PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_A_2, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xeac = 0x%x\n", regEAC)); -+ regE94 = PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_A, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xe94 = 0x%x\n", regE94)); -+ regE9C= PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_A, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xe9c = 0x%x\n", regE9C)); -+ regEA4= PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_A_2, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xea4 = 0x%x\n", regEA4)); -+ -+ if(!(regEAC & BIT28) && -+ (((regE94 & 0x03FF0000)>>16) != 0x142) && -+ (((regE9C & 0x03FF0000)>>16) != 0x42) ) -+ result |= 0x01; -+ else //if Tx not OK, ignore Rx -+ return result; -+ -+ if(!(regEAC & BIT27) && //if Tx is OK, check whether Rx is OK -+ (((regEA4 & 0x03FF0000)>>16) != 0x132) && -+ (((regEAC & 0x03FF0000)>>16) != 0x36)) -+ result |= 0x02; -+ else -+ DBG_8192C("Path A Rx IQK fail!!\n"); -+ -+ return result; -+ -+ -+} -+ -+static u8 //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK -+_PHY_PathB_IQK( -+ IN PADAPTER pAdapter -+ ) -+{ -+ u32 regEAC, regEB4, regEBC, regEC4, regECC; -+ u8 result = 0x00; -+ //RTPRINT(FINIT, INIT_IQK, ("Path B IQK!\n")); -+ -+ //One shot, path B LOK & IQK -+ //RTPRINT(FINIT, INIT_IQK, ("One shot, path A LOK & IQK!\n")); -+ PHY_SetBBReg(pAdapter, rIQK_AGC_Cont, bMaskDWord, 0x00000002); -+ PHY_SetBBReg(pAdapter, rIQK_AGC_Cont, bMaskDWord, 0x00000000); -+ -+ // delay x ms -+ //RTPRINT(FINIT, INIT_IQK, ("Delay %d ms for One shot, path B LOK & IQK.\n", IQK_DELAY_TIME)); -+ rtw_udelay_os(IQK_DELAY_TIME*1000);//PlatformStallExecution(IQK_DELAY_TIME*1000); -+ -+ // Check failed -+ regEAC = PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_A_2, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xeac = 0x%x\n", regEAC)); -+ regEB4 = PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_B, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xeb4 = 0x%x\n", regEB4)); -+ regEBC= PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_B, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xebc = 0x%x\n", regEBC)); -+ regEC4= PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_B_2, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xec4 = 0x%x\n", regEC4)); -+ regECC= PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_B_2, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("0xecc = 0x%x\n", regECC)); -+ -+ if(!(regEAC & BIT31) && -+ (((regEB4 & 0x03FF0000)>>16) != 0x142) && -+ (((regEBC & 0x03FF0000)>>16) != 0x42)) -+ result |= 0x01; -+ else -+ return result; -+ -+ if(!(regEAC & BIT30) && -+ (((regEC4 & 0x03FF0000)>>16) != 0x132) && -+ (((regECC & 0x03FF0000)>>16) != 0x36)) -+ result |= 0x02; -+ else -+ DBG_8192C("Path B Rx IQK fail!!\n"); -+ -+ -+ return result; -+ -+} -+ -+static VOID -+_PHY_PathAFillIQKMatrix( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN bIQKOK, -+ IN int result[][8], -+ IN u8 final_candidate, -+ IN BOOLEAN bTxOnly -+ ) -+{ -+ u32 Oldval_0, X, TX0_A, reg; -+ s32 Y, TX0_C; -+ -+ DBG_8192C("Path A IQ Calibration %s !\n",(bIQKOK)?"Success":"Failed"); -+ -+ if(final_candidate == 0xFF) -+ return; -+ else if(bIQKOK) -+ { -+ Oldval_0 = (PHY_QueryBBReg(pAdapter, rOFDM0_XATxIQImbalance, bMaskDWord) >> 22) & 0x3FF; -+ -+ X = result[final_candidate][0]; -+ if ((X & 0x00000200) != 0) -+ X = X | 0xFFFFFC00; -+ TX0_A = (X * Oldval_0) >> 8; -+ //RTPRINT(FINIT, INIT_IQK, ("X = 0x%lx, TX0_A = 0x%lx, Oldval_0 0x%lx\n", X, TX0_A, Oldval_0)); -+ PHY_SetBBReg(pAdapter, rOFDM0_XATxIQImbalance, 0x3FF, TX0_A); -+ PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(31), ((X* Oldval_0>>7) & 0x1)); -+ -+ Y = result[final_candidate][1]; -+ if ((Y & 0x00000200) != 0) -+ Y = Y | 0xFFFFFC00; -+ TX0_C = (Y * Oldval_0) >> 8; -+ //RTPRINT(FINIT, INIT_IQK, ("Y = 0x%lx, TX = 0x%lx\n", Y, TX0_C)); -+ PHY_SetBBReg(pAdapter, rOFDM0_XCTxAFE, 0xF0000000, ((TX0_C&0x3C0)>>6)); -+ PHY_SetBBReg(pAdapter, rOFDM0_XATxIQImbalance, 0x003F0000, (TX0_C&0x3F)); -+ PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(29), ((Y* Oldval_0>>7) & 0x1)); -+ -+ if(bTxOnly) -+ { -+ DBG_8192C("_PHY_PathAFillIQKMatrix only Tx OK\n"); -+ return; -+ } -+ -+ reg = result[final_candidate][2]; -+ PHY_SetBBReg(pAdapter, rOFDM0_XARxIQImbalance, 0x3FF, reg); -+ -+ reg = result[final_candidate][3] & 0x3F; -+ PHY_SetBBReg(pAdapter, rOFDM0_XARxIQImbalance, 0xFC00, reg); -+ -+ reg = (result[final_candidate][3] >> 6) & 0xF; -+ PHY_SetBBReg(pAdapter, rOFDM0_RxIQExtAnta, 0xF0000000, reg); -+ } -+} -+ -+static VOID -+_PHY_PathBFillIQKMatrix( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN bIQKOK, -+ IN int result[][8], -+ IN u8 final_candidate, -+ IN BOOLEAN bTxOnly //do Tx only -+ ) -+{ -+ u32 Oldval_1, X, TX1_A, reg; -+ s32 Y, TX1_C; -+ -+ DBG_8192C("Path B IQ Calibration %s !\n",(bIQKOK)?"Success":"Failed"); -+ -+ if(final_candidate == 0xFF) -+ return; -+ else if(bIQKOK) -+ { -+ Oldval_1 = (PHY_QueryBBReg(pAdapter, rOFDM0_XBTxIQImbalance, bMaskDWord) >> 22) & 0x3FF; -+ -+ X = result[final_candidate][4]; -+ if ((X & 0x00000200) != 0) -+ X = X | 0xFFFFFC00; -+ TX1_A = (X * Oldval_1) >> 8; -+ //RTPRINT(FINIT, INIT_IQK, ("X = 0x%lx, TX1_A = 0x%lx\n", X, TX1_A)); -+ PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x3FF, TX1_A); -+ PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(27), ((X* Oldval_1>>7) & 0x1)); -+ -+ Y = result[final_candidate][5]; -+ if ((Y & 0x00000200) != 0) -+ Y = Y | 0xFFFFFC00; -+ TX1_C = (Y * Oldval_1) >> 8; -+ //RTPRINT(FINIT, INIT_IQK, ("Y = 0x%lx, TX1_C = 0x%lx\n", Y, TX1_C)); -+ PHY_SetBBReg(pAdapter, rOFDM0_XDTxAFE, 0xF0000000, ((TX1_C&0x3C0)>>6)); -+ PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x003F0000, (TX1_C&0x3F)); -+ PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(25), ((Y* Oldval_1>>7) & 0x1)); -+ -+ if(bTxOnly) -+ return; -+ -+ reg = result[final_candidate][6]; -+ PHY_SetBBReg(pAdapter, rOFDM0_XBRxIQImbalance, 0x3FF, reg); -+ -+ reg = result[final_candidate][7] & 0x3F; -+ PHY_SetBBReg(pAdapter, rOFDM0_XBRxIQImbalance, 0xFC00, reg); -+ -+ reg = (result[final_candidate][7] >> 6) & 0xF; -+ PHY_SetBBReg(pAdapter, rOFDM0_AGCRSSITable, 0x0000F000, reg); -+ } -+} -+ -+static VOID -+_PHY_SaveADDARegisters( -+ IN PADAPTER pAdapter, -+ IN u32* ADDAReg, -+ IN u32* ADDABackup, -+ IN u32 RegisterNum -+ ) -+{ -+ u32 i; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("Save ADDA parameters.\n")); -+ for( i = 0 ; i < RegisterNum ; i++){ -+ ADDABackup[i] = PHY_QueryBBReg(pAdapter, ADDAReg[i], bMaskDWord); -+ } -+} -+ -+static VOID -+_PHY_SaveMACRegisters( -+ IN PADAPTER pAdapter, -+ IN u32* MACReg, -+ IN u32* MACBackup -+ ) -+{ -+ u32 i; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("Save MAC parameters.\n")); -+ for( i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++){ -+ MACBackup[i] =rtw_read8(pAdapter, MACReg[i]); -+ } -+ MACBackup[i] = rtw_read32(pAdapter, MACReg[i]); -+ -+} -+ -+static VOID -+_PHY_ReloadADDARegisters( -+ IN PADAPTER pAdapter, -+ IN u32* ADDAReg, -+ IN u32* ADDABackup, -+ IN u32 RegiesterNum -+ ) -+{ -+ u32 i; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("Reload ADDA power saving parameters !\n")); -+ for(i = 0 ; i < RegiesterNum ; i++){ -+ PHY_SetBBReg(pAdapter, ADDAReg[i], bMaskDWord, ADDABackup[i]); -+ } -+} -+ -+static VOID -+_PHY_ReloadMACRegisters( -+ IN PADAPTER pAdapter, -+ IN u32* MACReg, -+ IN u32* MACBackup -+ ) -+{ -+ u32 i; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("Reload MAC parameters !\n")); -+ for(i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++){ -+ rtw_write8(pAdapter, MACReg[i], (u8)MACBackup[i]); -+ } -+ rtw_write32(pAdapter, MACReg[i], MACBackup[i]); -+} -+ -+static VOID -+_PHY_PathADDAOn( -+ IN PADAPTER pAdapter, -+ IN u32* ADDAReg, -+ IN BOOLEAN isPathAOn, -+ IN BOOLEAN is2T -+ ) -+{ -+ u32 pathOn; -+ u32 i; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("ADDA ON.\n")); -+ -+ pathOn = isPathAOn ? 0x04db25a4 : 0x0b1b25a4; -+ if(_FALSE == is2T){ -+ pathOn = 0x0bdb25a0; -+ PHY_SetBBReg(pAdapter, ADDAReg[0], bMaskDWord, 0x0b1b25a0); -+ } -+ else{ -+ PHY_SetBBReg(pAdapter, ADDAReg[0], bMaskDWord, pathOn); -+ } -+ -+ for( i = 1 ; i < IQK_ADDA_REG_NUM ; i++){ -+ PHY_SetBBReg(pAdapter, ADDAReg[i], bMaskDWord, pathOn); -+ } -+ -+} -+ -+static VOID -+_PHY_MACSettingCalibration( -+ IN PADAPTER pAdapter, -+ IN u32* MACReg, -+ IN u32* MACBackup -+ ) -+{ -+ u32 i = 0; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("MAC settings for Calibration.\n")); -+ -+ rtw_write8(pAdapter, MACReg[i], 0x3F); -+ -+ for(i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++){ -+ rtw_write8(pAdapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3))); -+ } -+ rtw_write8(pAdapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5))); -+ -+} -+ -+static VOID -+_PHY_PathAStandBy( -+ IN PADAPTER pAdapter -+ ) -+{ -+ //RTPRINT(FINIT, INIT_IQK, ("Path-A standby mode!\n")); -+ -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x0); -+ PHY_SetBBReg(pAdapter, 0x840, bMaskDWord, 0x00010000); -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x80800000); -+} -+ -+static VOID -+_PHY_PIModeSwitch( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN PIMode -+ ) -+{ -+ u32 mode; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("BB Switch to %s mode!\n", (PIMode ? "PI" : "SI"))); -+ -+ mode = PIMode ? 0x01000100 : 0x01000000; -+ PHY_SetBBReg(pAdapter, 0x820, bMaskDWord, mode); -+ PHY_SetBBReg(pAdapter, 0x828, bMaskDWord, mode); -+} -+ -+/* -+return _FALSE => do IQK again -+*/ -+static BOOLEAN -+_PHY_SimularityCompare( -+ IN PADAPTER pAdapter, -+ IN int result[][8], -+ IN u8 c1, -+ IN u8 c2 -+ ) -+{ -+ u32 i, j, diff, SimularityBitMap, bound = 0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ u8 final_candidate[2] = {0xFF, 0xFF}; //for path A and path B -+ BOOLEAN bResult = _TRUE, is2T = IS_92C_SERIAL( pHalData->VersionID); -+ -+ if(is2T) -+ bound = 8; -+ else -+ bound = 4; -+ -+ SimularityBitMap = 0; -+ -+ for( i = 0; i < bound; i++ ) -+ { -+ diff = (result[c1][i] > result[c2][i]) ? (result[c1][i] - result[c2][i]) : (result[c2][i] - result[c1][i]); -+ if (diff > MAX_TOLERANCE) -+ { -+ if((i == 2 || i == 6) && !SimularityBitMap) -+ { -+ if(result[c1][i]+result[c1][i+1] == 0) -+ final_candidate[(i/4)] = c2; -+ else if (result[c2][i]+result[c2][i+1] == 0) -+ final_candidate[(i/4)] = c1; -+ else -+ SimularityBitMap = SimularityBitMap|(1<dmpriv; -+ u32 i; -+ u8 PathAOK, PathBOK; -+ u32 ADDA_REG[IQK_ADDA_REG_NUM] = { -+ rFPGA0_XCD_SwitchControl, rBlue_Tooth, -+ rRx_Wait_CCA, rTx_CCK_RFON, -+ rTx_CCK_BBON, rTx_OFDM_RFON, -+ rTx_OFDM_BBON, rTx_To_Rx, -+ rTx_To_Tx, rRx_CCK, -+ rRx_OFDM, rRx_Wait_RIFS, -+ rRx_TO_Rx, rStandby, -+ rSleep, rPMPD_ANAEN }; -+ -+ u32 IQK_MAC_REG[IQK_MAC_REG_NUM] = { -+ REG_TXPAUSE, REG_BCN_CTRL, -+ REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; -+ -+ u32 IQK_BB_REG_92C[IQK_BB_REG_NUM] = { -+ rOFDM0_TRxPathEnable, rOFDM0_TRMuxPar, -+ rFPGA0_XCD_RFInterfaceSW, rConfig_AntA, rConfig_AntB, -+ rFPGA0_XAB_RFInterfaceSW, rFPGA0_XA_RFInterfaceOE, -+ rFPGA0_XB_RFInterfaceOE, rFPGA0_RFMOD -+ }; -+ -+#if MP_DRIVER -+ const u32 retryCount = 9; -+#else -+ const u32 retryCount = 2; -+#endif -+ -+ // Note: IQ calibration must be performed after loading -+ // PHY_REG.txt , and radio_a, radio_b.txt -+ -+ u32 bbvalue; -+ -+ if(t==0) -+ { -+ bbvalue = PHY_QueryBBReg(pAdapter, rFPGA0_RFMOD, bMaskDWord); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_IQCalibrate()==>0x%08lx\n",bbvalue)); -+ -+ //RTPRINT(FINIT, INIT_IQK, ("IQ Calibration for %s\n", (is2T ? "2T2R" : "1T1R"))); -+ -+ // Save ADDA parameters, turn Path A ADDA on -+ _PHY_SaveADDARegisters(pAdapter, ADDA_REG, pdmpriv->ADDA_backup,IQK_ADDA_REG_NUM); -+ _PHY_SaveMACRegisters(pAdapter, IQK_MAC_REG, pdmpriv->IQK_MAC_backup); -+ _PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup, IQK_BB_REG_NUM); -+ } -+ _PHY_PathADDAOn(pAdapter, ADDA_REG, _TRUE, is2T); -+ -+ if(t==0) -+ { -+ pdmpriv->bRfPiEnable = (u8)PHY_QueryBBReg(pAdapter, rFPGA0_XA_HSSIParameter1, BIT(8)); -+ } -+ -+ if(!pdmpriv->bRfPiEnable){ -+ // Switch BB to PI mode to do IQ Calibration. -+ _PHY_PIModeSwitch(pAdapter, _TRUE); -+ } -+ -+ PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, BIT24, 0x00); -+ PHY_SetBBReg(pAdapter, rOFDM0_TRxPathEnable, bMaskDWord, 0x03a05600); -+ PHY_SetBBReg(pAdapter, rOFDM0_TRMuxPar, bMaskDWord, 0x000800e4); -+ PHY_SetBBReg(pAdapter, rFPGA0_XCD_RFInterfaceSW, bMaskDWord, 0x22204000); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT10, 0x01); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT26, 0x01); -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, BIT10, 0x00); -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT10, 0x00); -+ -+ if(is2T) -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_LSSIParameter, bMaskDWord, 0x00010000); -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_LSSIParameter, bMaskDWord, 0x00010000); -+ } -+ -+ //MAC settings -+ _PHY_MACSettingCalibration(pAdapter, IQK_MAC_REG, pdmpriv->IQK_MAC_backup); -+ -+ //Page B init -+ PHY_SetBBReg(pAdapter, rConfig_AntA, bMaskDWord, 0x00080000); -+ -+ if(is2T) -+ { -+ PHY_SetBBReg(pAdapter, rConfig_AntB, bMaskDWord, 0x00080000); -+ } -+ -+ // IQ calibration setting -+ //RTPRINT(FINIT, INIT_IQK, ("IQK setting!\n")); -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x80800000); -+ PHY_SetBBReg(pAdapter, rTx_IQK, bMaskDWord, 0x01007c00); -+ PHY_SetBBReg(pAdapter, rRx_IQK, bMaskDWord, 0x01004800); -+ -+ for(i = 0 ; i < retryCount ; i++){ -+ PathAOK = _PHY_PathA_IQK(pAdapter, is2T); -+ if(PathAOK == 0x03){ -+ DBG_8192C("Path A IQK Success!!\n"); -+ result[t][0] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; -+ result[t][1] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; -+ result[t][2] = (PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_A_2, bMaskDWord)&0x3FF0000)>>16; -+ result[t][3] = (PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_A_2, bMaskDWord)&0x3FF0000)>>16; -+ break; -+ } -+ else if (i == (retryCount-1) && PathAOK == 0x01) //Tx IQK OK -+ { -+ DBG_8192C("Path A IQK Only Tx Success!!\n"); -+ -+ result[t][0] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; -+ result[t][1] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; -+ } -+ } -+ -+ if(0x00 == PathAOK){ -+ DBG_8192C("Path A IQK failed!!\n"); -+ } -+ -+ if(is2T){ -+ _PHY_PathAStandBy(pAdapter); -+ -+ // Turn Path B ADDA on -+ _PHY_PathADDAOn(pAdapter, ADDA_REG, _FALSE, is2T); -+ -+ for(i = 0 ; i < retryCount ; i++){ -+ PathBOK = _PHY_PathB_IQK(pAdapter); -+ if(PathBOK == 0x03){ -+ DBG_8192C("Path B IQK Success!!\n"); -+ result[t][4] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_B, bMaskDWord)&0x3FF0000)>>16; -+ result[t][5] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_B, bMaskDWord)&0x3FF0000)>>16; -+ result[t][6] = (PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_B_2, bMaskDWord)&0x3FF0000)>>16; -+ result[t][7] = (PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_B_2, bMaskDWord)&0x3FF0000)>>16; -+ break; -+ } -+ else if (i == (retryCount - 1) && PathBOK == 0x01) //Tx IQK OK -+ { -+ DBG_8192C("Path B Only Tx IQK Success!!\n"); -+ result[t][4] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_B, bMaskDWord)&0x3FF0000)>>16; -+ result[t][5] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_B, bMaskDWord)&0x3FF0000)>>16; -+ } -+ } -+ -+ if(0x00 == PathBOK){ -+ DBG_8192C("Path B IQK failed!!\n"); -+ } -+ } -+ -+ //Back to BB mode, load original value -+ //RTPRINT(FINIT, INIT_IQK, ("IQK:Back to BB mode, load original value!\n")); -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0); -+ -+ if(t!=0) -+ { -+ if(!pdmpriv->bRfPiEnable){ -+ // Switch back BB to SI mode after finish IQ Calibration. -+ _PHY_PIModeSwitch(pAdapter, _FALSE); -+ } -+ -+ // Reload ADDA power saving parameters -+ _PHY_ReloadADDARegisters(pAdapter, ADDA_REG, pdmpriv->ADDA_backup, IQK_ADDA_REG_NUM); -+ -+ // Reload MAC parameters -+ _PHY_ReloadMACRegisters(pAdapter, IQK_MAC_REG, pdmpriv->IQK_MAC_backup); -+ -+ // Reload BB parameters -+ _PHY_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup, IQK_BB_REG_NUM); -+ -+ // Restore RX initial gain -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_LSSIParameter, bMaskDWord, 0x00032ed3); -+ if(is2T){ -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_LSSIParameter, bMaskDWord, 0x00032ed3); -+ } -+ -+ //load 0xe30 IQC default value -+ PHY_SetBBReg(pAdapter, rTx_IQK_Tone_A, bMaskDWord, 0x01008c00); -+ PHY_SetBBReg(pAdapter, rRx_IQK_Tone_A, bMaskDWord, 0x01008c00); -+ -+ } -+ //RTPRINT(FINIT, INIT_IQK, ("_PHY_IQCalibrate() <==\n")); -+ -+} -+ -+ -+static VOID -+_PHY_LCCalibrate( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN is2T -+ ) -+{ -+ u8 tmpReg; -+ u32 RF_Amode = 0, RF_Bmode = 0, LC_Cal; -+ -+ //Check continuous TX and Packet TX -+ tmpReg = rtw_read8(pAdapter, 0xd03); -+ -+ if((tmpReg&0x70) != 0) //Deal with contisuous TX case -+ rtw_write8(pAdapter, 0xd03, tmpReg&0x8F); //disable all continuous TX -+ else // Deal with Packet TX case -+ rtw_write8(pAdapter, REG_TXPAUSE, 0xFF); // block all queues -+ -+ if((tmpReg&0x70) != 0) -+ { -+ //1. Read original RF mode -+ //Path-A -+ RF_Amode = PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_AC, bMask12Bits); -+ -+ //Path-B -+ if(is2T) -+ RF_Bmode = PHY_QueryRFReg(pAdapter, RF_PATH_B, RF_AC, bMask12Bits); -+ -+ //2. Set RF mode = standby mode -+ //Path-A -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_AC, bMask12Bits, (RF_Amode&0x8FFFF)|0x10000); -+ -+ //Path-B -+ if(is2T) -+ PHY_SetRFReg(pAdapter, RF_PATH_B, RF_AC, bMask12Bits, (RF_Bmode&0x8FFFF)|0x10000); -+ } -+ -+ //3. Read RF reg18 -+ LC_Cal = PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_CHNLBW, bMask12Bits); -+ -+ //4. Set LC calibration begin -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal|0x08000); -+ -+ #ifdef CONFIG_LONG_DELAY_ISSUE -+ rtw_msleep_os(100); -+ #else -+ rtw_mdelay_os(100); -+ #endif -+ -+ //Restore original situation -+ if((tmpReg&0x70) != 0) //Deal with contisuous TX case -+ { -+ //Path-A -+ rtw_write8(pAdapter, 0xd03, tmpReg); -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_AC, bMask12Bits, RF_Amode); -+ -+ //Path-B -+ if(is2T) -+ PHY_SetRFReg(pAdapter, RF_PATH_B, RF_AC, bMask12Bits, RF_Bmode); -+ } -+ else // Deal with Packet TX case -+ { -+ rtw_write8(pAdapter, REG_TXPAUSE, 0x00); -+ } -+ -+} -+ -+ -+//Analog Pre-distortion calibration -+#define APK_BB_REG_NUM 8 -+#define APK_CURVE_REG_NUM 4 -+#define PATH_NUM 2 -+ -+static VOID -+_PHY_APCalibrate( -+ IN PADAPTER pAdapter, -+ IN char delta, -+ IN BOOLEAN is2T -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ u32 regD[PATH_NUM]; -+ u32 tmpReg, index, offset, i, apkbound; -+ u8 path, pathbound = PATH_NUM; -+ u32 BB_backup[APK_BB_REG_NUM]; -+ u32 BB_REG[APK_BB_REG_NUM] = { -+ rFPGA1_TxBlock, rOFDM0_TRxPathEnable, -+ rFPGA0_RFMOD, rOFDM0_TRMuxPar, -+ rFPGA0_XCD_RFInterfaceSW, rFPGA0_XAB_RFInterfaceSW, -+ rFPGA0_XA_RFInterfaceOE, rFPGA0_XB_RFInterfaceOE }; -+ u32 BB_AP_MODE[APK_BB_REG_NUM] = { -+ 0x00000020, 0x00a05430, 0x02040000, -+ 0x000800e4, 0x00204000 }; -+ u32 BB_normal_AP_MODE[APK_BB_REG_NUM] = { -+ 0x00000020, 0x00a05430, 0x02040000, -+ 0x000800e4, 0x22204000 }; -+ -+ u32 AFE_backup[IQK_ADDA_REG_NUM]; -+ u32 AFE_REG[IQK_ADDA_REG_NUM] = { -+ rFPGA0_XCD_SwitchControl, rBlue_Tooth, -+ rRx_Wait_CCA, rTx_CCK_RFON, -+ rTx_CCK_BBON, rTx_OFDM_RFON, -+ rTx_OFDM_BBON, rTx_To_Rx, -+ rTx_To_Tx, rRx_CCK, -+ rRx_OFDM, rRx_Wait_RIFS, -+ rRx_TO_Rx, rStandby, -+ rSleep, rPMPD_ANAEN }; -+ -+ u32 MAC_backup[IQK_MAC_REG_NUM]; -+ u32 MAC_REG[IQK_MAC_REG_NUM] = { -+ REG_TXPAUSE, REG_BCN_CTRL, -+ REG_BCN_CTRL_1, REG_GPIO_MUXCFG}; -+ -+ u32 APK_RF_init_value[PATH_NUM][APK_BB_REG_NUM] = { -+ {0x0852c, 0x1852c, 0x5852c, 0x1852c, 0x5852c}, -+ {0x2852e, 0x0852e, 0x3852e, 0x0852e, 0x0852e} -+ }; -+ -+ u32 APK_normal_RF_init_value[PATH_NUM][APK_BB_REG_NUM] = { -+ {0x0852c, 0x0a52c, 0x3a52c, 0x5a52c, 0x5a52c}, //path settings equal to path b settings -+ {0x0852c, 0x0a52c, 0x5a52c, 0x5a52c, 0x5a52c} -+ }; -+ -+ u32 APK_RF_value_0[PATH_NUM][APK_BB_REG_NUM] = { -+ {0x52019, 0x52014, 0x52013, 0x5200f, 0x5208d}, -+ {0x5201a, 0x52019, 0x52016, 0x52033, 0x52050} -+ }; -+ -+ u32 APK_normal_RF_value_0[PATH_NUM][APK_BB_REG_NUM] = { -+ {0x52019, 0x52017, 0x52010, 0x5200d, 0x5206a}, //path settings equal to path b settings -+ {0x52019, 0x52017, 0x52010, 0x5200d, 0x5206a} -+ }; -+#if 0 -+ u32 APK_RF_value_A[PATH_NUM][APK_BB_REG_NUM] = { -+ {0x1adb0, 0x1adb0, 0x1ada0, 0x1ad90, 0x1ad80}, -+ {0x00fb0, 0x00fb0, 0x00fa0, 0x00f90, 0x00f80} -+ }; -+#endif -+ u32 AFE_on_off[PATH_NUM] = { -+ 0x04db25a4, 0x0b1b25a4}; //path A on path B off / path A off path B on -+ -+ u32 APK_offset[PATH_NUM] = { -+ rConfig_AntA, rConfig_AntB}; -+ -+ u32 APK_normal_offset[PATH_NUM] = { -+ rConfig_Pmpd_AntA, rConfig_Pmpd_AntB}; -+ -+ u32 APK_value[PATH_NUM] = { -+ 0x92fc0000, 0x12fc0000}; -+ -+ u32 APK_normal_value[PATH_NUM] = { -+ 0x92680000, 0x12680000}; -+ -+ char APK_delta_mapping[APK_BB_REG_NUM][13] = { -+ {-4, -3, -2, -2, -1, -1, 0, 1, 2, 3, 4, 5, 6}, -+ {-4, -3, -2, -2, -1, -1, 0, 1, 2, 3, 4, 5, 6}, -+ {-6, -4, -2, -2, -1, -1, 0, 1, 2, 3, 4, 5, 6}, -+ {-1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6}, -+ {-11, -9, -7, -5, -3, -1, 0, 0, 0, 0, 0, 0, 0} -+ }; -+ -+ u32 APK_normal_setting_value_1[13] = { -+ 0x01017018, 0xf7ed8f84, 0x1b1a1816, 0x2522201e, 0x322e2b28, -+ 0x433f3a36, 0x5b544e49, 0x7b726a62, 0xa69a8f84, 0xdfcfc0b3, -+ 0x12680000, 0x00880000, 0x00880000 -+ }; -+ -+ u32 APK_normal_setting_value_2[16] = { -+ 0x01c7021d, 0x01670183, 0x01000123, 0x00bf00e2, 0x008d00a3, -+ 0x0068007b, 0x004d0059, 0x003a0042, 0x002b0031, 0x001f0025, -+ 0x0017001b, 0x00110014, 0x000c000f, 0x0009000b, 0x00070008, -+ 0x00050006 -+ }; -+ -+ u32 APK_result[PATH_NUM][APK_BB_REG_NUM]; //val_1_1a, val_1_2a, val_2a, val_3a, val_4a -+ //u32 AP_curve[PATH_NUM][APK_CURVE_REG_NUM]; -+ -+ int BB_offset, delta_V, delta_offset; -+ -+#if (MP_DRIVER == 1) -+ PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; -+ -+ pMptCtx->APK_bound[0] = 45; -+ pMptCtx->APK_bound[1] = 52; -+#endif -+ -+ //RTPRINT(FINIT, INIT_IQK, ("==>PHY_APCalibrate() delta %d\n", delta)); -+ -+ //RTPRINT(FINIT, INIT_IQK, ("AP Calibration for %s %s\n", (is2T ? "2T2R" : "1T1R"), (isNormal ? "Normal chip" : "Test chip"))); -+ -+ if(!is2T) -+ pathbound = 1; -+ -+ //2 FOR NORMAL CHIP SETTINGS -+ -+// Temporarily do not allow normal driver to do the following settings because these offset -+// and value will cause RF internal PA to be unpredictably disabled by HW, such that RF Tx signal -+// will disappear after disable/enable card many times on 88CU. RF SD and DD have not find the -+// root cause, so we remove these actions temporarily. Added by tynli and SD3 Allen. 2010.05.31. -+#if (MP_DRIVER != 1) -+ return; -+#endif -+ -+ //settings adjust for normal chip -+ for(index = 0; index < PATH_NUM; index ++) -+ { -+ APK_offset[index] = APK_normal_offset[index]; -+ APK_value[index] = APK_normal_value[index]; -+ AFE_on_off[index] = 0x6fdb25a4; -+ } -+ -+ for(index = 0; index < APK_BB_REG_NUM; index ++) -+ { -+ for(path = 0; path < pathbound; path++) -+ { -+ APK_RF_init_value[path][index] = APK_normal_RF_init_value[path][index]; -+ APK_RF_value_0[path][index] = APK_normal_RF_value_0[path][index]; -+ } -+ BB_AP_MODE[index] = BB_normal_AP_MODE[index]; -+ } -+ -+ apkbound = 6; -+ -+ //save BB default value -+ for(index = 0; index < APK_BB_REG_NUM ; index++) -+ { -+ if(index == 0) //skip -+ continue; -+ BB_backup[index] = PHY_QueryBBReg(pAdapter, BB_REG[index], bMaskDWord); -+ } -+ -+ //save MAC default value -+ _PHY_SaveMACRegisters(pAdapter, MAC_REG, MAC_backup); -+ -+ //save AFE default value -+ _PHY_SaveADDARegisters(pAdapter, AFE_REG, AFE_backup, IQK_ADDA_REG_NUM); -+ -+ for(path = 0; path < pathbound; path++) -+ { -+ if(path == RF_PATH_A) -+ { -+ //path A APK -+ //load APK setting -+ //path-A -+ offset = rPdp_AntA; -+ for(index = 0; index < 11; index ++) -+ { -+ PHY_SetBBReg(pAdapter, offset, bMaskDWord, APK_normal_setting_value_1[index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", offset, PHY_QueryBBReg(pAdapter, offset, bMaskDWord))); -+ -+ offset += 0x04; -+ } -+ -+ PHY_SetBBReg(pAdapter, rConfig_Pmpd_AntB, bMaskDWord, 0x12680000); -+ -+ offset = rConfig_AntA; -+ for(; index < 13; index ++) -+ { -+ PHY_SetBBReg(pAdapter, offset, bMaskDWord, APK_normal_setting_value_1[index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", offset, PHY_QueryBBReg(pAdapter, offset, bMaskDWord))); -+ -+ offset += 0x04; -+ } -+ -+ //page-B1 -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x40000000); -+ -+ //path A -+ offset = rPdp_AntA; -+ for(index = 0; index < 16; index++) -+ { -+ PHY_SetBBReg(pAdapter, offset, bMaskDWord, APK_normal_setting_value_2[index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", offset, PHY_QueryBBReg(pAdapter, offset, bMaskDWord))); -+ -+ offset += 0x04; -+ } -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x00000000); -+ } -+ else if(path == RF_PATH_B) -+ { -+ //path B APK -+ //load APK setting -+ //path-B -+ offset = rPdp_AntB; -+ for(index = 0; index < 10; index ++) -+ { -+ PHY_SetBBReg(pAdapter, offset, bMaskDWord, APK_normal_setting_value_1[index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", offset, PHY_QueryBBReg(pAdapter, offset, bMaskDWord))); -+ -+ offset += 0x04; -+ } -+ PHY_SetBBReg(pAdapter, rConfig_Pmpd_AntA, bMaskDWord, 0x12680000); -+ -+ PHY_SetBBReg(pAdapter, rConfig_Pmpd_AntB, bMaskDWord, 0x12680000); -+ -+ offset = rConfig_AntA; -+ index = 11; -+ for(; index < 13; index ++) //offset 0xb68, 0xb6c -+ { -+ PHY_SetBBReg(pAdapter, offset, bMaskDWord, APK_normal_setting_value_1[index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", offset, PHY_QueryBBReg(pAdapter, offset, bMaskDWord))); -+ -+ offset += 0x04; -+ } -+ -+ //page-B1 -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x40000000); -+ -+ //path B -+ offset = 0xb60; -+ for(index = 0; index < 16; index++) -+ { -+ PHY_SetBBReg(pAdapter, offset, bMaskDWord, APK_normal_setting_value_2[index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", offset, PHY_QueryBBReg(pAdapter, offset, bMaskDWord))); -+ -+ offset += 0x04; -+ } -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x00000000); -+ } -+ -+ //save RF default value -+ regD[path] = PHY_QueryRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_TXBIAS_A, bRFRegOffsetMask); -+ -+ //Path A AFE all on, path B AFE All off or vise versa -+ for(index = 0; index < IQK_ADDA_REG_NUM ; index++) -+ PHY_SetBBReg(pAdapter, AFE_REG[index], bMaskDWord, AFE_on_off[path]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0xe70 %x\n", PHY_QueryBBReg(pAdapter, 0xe70, bMaskDWord))); -+ -+ //BB to AP mode -+ if(path == 0) -+ { -+ for(index = 0; index < APK_BB_REG_NUM ; index++) -+ { -+ if(index == 0) //skip -+ continue; -+ else if (index < 5) -+ PHY_SetBBReg(pAdapter, BB_REG[index], bMaskDWord, BB_AP_MODE[index]); -+ else if (BB_REG[index] == 0x870) -+ PHY_SetBBReg(pAdapter, BB_REG[index], bMaskDWord, BB_backup[index]|BIT10|BIT26); -+ else -+ PHY_SetBBReg(pAdapter, BB_REG[index], BIT10, 0x0); -+ } -+ PHY_SetBBReg(pAdapter, rTx_IQK_Tone_A, bMaskDWord, 0x01008c00); -+ PHY_SetBBReg(pAdapter, rRx_IQK_Tone_A, bMaskDWord, 0x01008c00); -+ } -+ else //path B -+ { -+ PHY_SetBBReg(pAdapter, rTx_IQK_Tone_B, bMaskDWord, 0x01008c00); -+ PHY_SetBBReg(pAdapter, rRx_IQK_Tone_B, bMaskDWord, 0x01008c00); -+ } -+ -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x800 %x\n", PHY_QueryBBReg(pAdapter, 0x800, bMaskDWord))); -+ -+ //MAC settings -+ _PHY_MACSettingCalibration(pAdapter, MAC_REG, MAC_backup); -+ -+ if(path == RF_PATH_A) //Path B to standby mode -+ { -+ PHY_SetRFReg(pAdapter, RF_PATH_B, RF_AC, bRFRegOffsetMask, 0x10000); -+ } -+ else //Path A to standby mode -+ { -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_AC, bRFRegOffsetMask, 0x10000); -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_MODE1, bRFRegOffsetMask, 0x1000f); -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_MODE2, bRFRegOffsetMask, 0x20103); -+ } -+ -+ delta_offset = ((delta+14)/2); -+ if(delta_offset < 0) -+ delta_offset = 0; -+ else if (delta_offset > 12) -+ delta_offset = 12; -+ -+ //AP calibration -+ for(index = 0; index < APK_BB_REG_NUM; index++) -+ { -+ if(index != 1) //only DO PA11+PAD01001, AP RF setting -+ continue; -+ -+ tmpReg = APK_RF_init_value[path][index]; -+#if 1 -+ if(!pdmpriv->bAPKThermalMeterIgnore) -+ { -+ BB_offset = (tmpReg & 0xF0000) >> 16; -+ -+ if(!(tmpReg & BIT15)) //sign bit 0 -+ { -+ BB_offset = -BB_offset; -+ } -+ -+ delta_V = APK_delta_mapping[index][delta_offset]; -+ -+ BB_offset += delta_V; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() APK num %d delta_V %d delta_offset %d\n", index, delta_V, delta_offset)); -+ -+ if(BB_offset < 0) -+ { -+ tmpReg = tmpReg & (~BIT15); -+ BB_offset = -BB_offset; -+ } -+ else -+ { -+ tmpReg = tmpReg | BIT15; -+ } -+ tmpReg = (tmpReg & 0xFFF0FFFF) | (BB_offset << 16); -+ } -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ if(IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)) -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_IPA_A, bRFRegOffsetMask, 0x894ae); -+ else -+#endif -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_IPA_A, bRFRegOffsetMask, 0x8992e); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0xc %x\n", PHY_QueryRFReg(pAdapter, (RF_RADIO_PATH_E)path, 0xc, bMaskDWord))); -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_AC, bRFRegOffsetMask, APK_RF_value_0[path][index]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x0 %x\n", PHY_QueryRFReg(pAdapter, (RF_RADIO_PATH_E)path, 0x0, bMaskDWord))); -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_TXBIAS_A, bRFRegOffsetMask, tmpReg); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0xd %x\n", PHY_QueryRFReg(pAdapter, (RF_RADIO_PATH_E)path, 0xd, bMaskDWord))); -+ -+ // PA11+PAD01111, one shot -+ i = 0; -+ do -+ { -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x80000000); -+ { -+ PHY_SetBBReg(pAdapter, APK_offset[path], bMaskDWord, APK_value[0]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", APK_offset[path], PHY_QueryBBReg(pAdapter, APK_offset[path], bMaskDWord))); -+ rtw_mdelay_os(3); -+ PHY_SetBBReg(pAdapter, APK_offset[path], bMaskDWord, APK_value[1]); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0x%x value 0x%x\n", APK_offset[path], PHY_QueryBBReg(pAdapter, APK_offset[path], bMaskDWord))); -+ #ifdef CONFIG_LONG_DELAY_ISSUE -+ rtw_msleep_os(20); -+ #else -+ rtw_mdelay_os(20); -+ #endif -+ } -+ PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x00000000); -+ -+ if(path == RF_PATH_A) -+ tmpReg = PHY_QueryBBReg(pAdapter, rAPK, 0x03E00000); -+ else -+ tmpReg = PHY_QueryBBReg(pAdapter, rAPK, 0xF8000000); -+ //RTPRINT(FINIT, INIT_IQK, ("PHY_APCalibrate() offset 0xbd8[25:21] %x\n", tmpReg)); -+ -+ i++; -+ } -+ while(tmpReg > apkbound && i < 4); -+ -+ APK_result[path][index] = tmpReg; -+ } -+ } -+ -+ //reload MAC default value -+ _PHY_ReloadMACRegisters(pAdapter, MAC_REG, MAC_backup); -+ -+ //reload BB default value -+ for(index = 0; index < APK_BB_REG_NUM ; index++) -+ { -+ if(index == 0) //skip -+ continue; -+ PHY_SetBBReg(pAdapter, BB_REG[index], bMaskDWord, BB_backup[index]); -+ } -+ -+ //reload AFE default value -+ _PHY_ReloadADDARegisters(pAdapter, AFE_REG, AFE_backup, IQK_ADDA_REG_NUM); -+ -+ //reload RF path default value -+ for(path = 0; path < pathbound; path++) -+ { -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_TXBIAS_A, bRFRegOffsetMask, regD[path]); -+ if(path == RF_PATH_B) -+ { -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_MODE1, bRFRegOffsetMask, 0x1000f); -+ PHY_SetRFReg(pAdapter, RF_PATH_A, RF_MODE2, bRFRegOffsetMask, 0x20101); -+ } -+ -+ //note no index == 0 -+ if (APK_result[path][1] > 6) -+ APK_result[path][1] = 6; -+ //RTPRINT(FINIT, INIT_IQK, ("apk path %d result %d 0x%x \t", path, 1, APK_result[path][1])); -+ } -+ -+ //RTPRINT(FINIT, INIT_IQK, ("\n")); -+ -+ -+ for(path = 0; path < pathbound; path++) -+ { -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_BS_PA_APSET_G1_G4, bRFRegOffsetMask, -+ ((APK_result[path][1] << 15) | (APK_result[path][1] << 10) | (APK_result[path][1] << 5) | APK_result[path][1])); -+ if(path == RF_PATH_A) -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_BS_PA_APSET_G5_G8, bRFRegOffsetMask, -+ ((APK_result[path][1] << 15) | (APK_result[path][1] << 10) | (0x00 << 5) | 0x05)); -+ else -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_BS_PA_APSET_G5_G8, bRFRegOffsetMask, -+ ((APK_result[path][1] << 15) | (APK_result[path][1] << 10) | (0x02 << 5) | 0x05)); -+ PHY_SetRFReg(pAdapter, (RF_RADIO_PATH_E)path, RF_BS_PA_APSET_G9_G11, bRFRegOffsetMask, -+ ((0x08 << 15) | (0x08 << 10) | (0x08 << 5) | 0x08)); -+ } -+ -+ pdmpriv->bAPKdone = _TRUE; -+ -+ //RTPRINT(FINIT, INIT_IQK, ("<==PHY_APCalibrate()\n")); -+} -+ -+static VOID _PHY_SetRFPathSwitch( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN bMain, -+ IN BOOLEAN is2T -+ ) -+{ -+ u8 u1bTmp; -+ -+ if(!pAdapter->hw_init_completed) -+ { -+ u1bTmp = rtw_read8(pAdapter, REG_LEDCFG2) | BIT7; -+ rtw_write8(pAdapter, REG_LEDCFG2, u1bTmp); -+ //PHY_SetBBReg(pAdapter, REG_LEDCFG0, BIT23, 0x01); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT13, 0x01); -+ } -+ -+ if(is2T) -+ { -+ if(bMain) -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT5|BIT6, 0x1); //92C_Path_A -+ else -+ PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT5|BIT6, 0x2); //BT -+ } -+ else -+ { -+ -+ if(bMain) -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, 0x300, 0x2); //Main -+ else -+ PHY_SetBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, 0x300, 0x1); //Aux -+ } -+ -+} -+ -+//return value TRUE => Main; FALSE => Aux -+ -+static BOOLEAN _PHY_QueryRFPathSwitch( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN is2T -+ ) -+{ -+// if(is2T) -+// return _TRUE; -+ -+ if(!pAdapter->hw_init_completed) -+ { -+ PHY_SetBBReg(pAdapter, REG_LEDCFG0, BIT23, 0x01); -+ PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFParameter, BIT13, 0x01); -+ } -+ -+ if(is2T) -+ { -+ if(PHY_QueryBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT5|BIT6) == 0x01) -+ return _TRUE; -+ else -+ return _FALSE; -+ } -+ else -+ { -+ if(PHY_QueryBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, 0x300) == 0x02) -+ return _TRUE; -+ else -+ return _FALSE; -+ } -+} -+ -+VOID -+rtl8192c_PHY_IQCalibrate( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN bReCovery -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ s32 result[4][8]; //last is final result -+ u8 i, final_candidate; -+ BOOLEAN bPathAOK, bPathBOK; -+ s32 RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0; -+ BOOLEAN is12simular, is13simular, is23simular; -+ BOOLEAN bStartContTx = _FALSE, bSingleTone = _FALSE, bCarrierSuppression = _FALSE; -+ u32 IQK_BB_REG_92C[IQK_BB_REG_NUM] = { -+ rOFDM0_XARxIQImbalance, rOFDM0_XBRxIQImbalance, -+ rOFDM0_ECCAThreshold, rOFDM0_AGCRSSITable, -+ rOFDM0_XATxIQImbalance, rOFDM0_XBTxIQImbalance, -+ rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, -+ rOFDM0_RxIQExtAnta}; -+ -+ -+#if MP_DRIVER == 1 -+ bStartContTx = pAdapter->mppriv.MptCtx.bStartContTx; -+ bSingleTone = pAdapter->mppriv.MptCtx.bSingleTone; -+ bCarrierSuppression = pAdapter->mppriv.MptCtx.bCarrierSuppression; -+#endif -+ -+ //ignore IQK when continuous Tx -+ if(bStartContTx || bSingleTone || bCarrierSuppression) -+ return; -+ -+#if DISABLE_BB_RF -+ return; -+#endif -+ -+ if(bReCovery) -+ { -+ _PHY_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup_recover, 9); -+ return; -+ } -+ DBG_8192C("IQK:Start!!!\n"); -+ -+ for(i = 0; i < 8; i++) -+ { -+ result[0][i] = 0; -+ result[1][i] = 0; -+ result[2][i] = 0; -+ result[3][i] = 0; -+ } -+ final_candidate = 0xff; -+ bPathAOK = _FALSE; -+ bPathBOK = _FALSE; -+ is12simular = _FALSE; -+ is23simular = _FALSE; -+ is13simular = _FALSE; -+ -+ for (i=0; i<3; i++) -+ { -+ if(IS_92C_SERIAL( pHalData->VersionID)){ -+ _PHY_IQCalibrate(pAdapter, result, i, _TRUE); -+ } -+ else{ -+ // For 88C 1T1R -+ _PHY_IQCalibrate(pAdapter, result, i, _FALSE); -+ } -+ -+ if(i == 1) -+ { -+ is12simular = _PHY_SimularityCompare(pAdapter, result, 0, 1); -+ if(is12simular) -+ { -+ final_candidate = 0; -+ break; -+ } -+ } -+ -+ if(i == 2) -+ { -+ is13simular = _PHY_SimularityCompare(pAdapter, result, 0, 2); -+ if(is13simular) -+ { -+ final_candidate = 0; -+ break; -+ } -+ -+ is23simular = _PHY_SimularityCompare(pAdapter, result, 1, 2); -+ if(is23simular) -+ final_candidate = 1; -+ else -+ { -+ for(i = 0; i < 8; i++) -+ RegTmp += result[3][i]; -+ -+ if(RegTmp != 0) -+ final_candidate = 3; -+ else -+ final_candidate = 0xFF; -+ } -+ } -+ } -+ -+ for (i=0; i<4; i++) -+ { -+ RegE94 = result[i][0]; -+ RegE9C = result[i][1]; -+ RegEA4 = result[i][2]; -+ RegEAC = result[i][3]; -+ RegEB4 = result[i][4]; -+ RegEBC = result[i][5]; -+ RegEC4 = result[i][6]; -+ RegECC = result[i][7]; -+ //RTPRINT(FINIT, INIT_IQK, ("IQK: RegE94=%lx RegE9C=%lx RegEA4=%lx RegEAC=%lx RegEB4=%lx RegEBC=%lx RegEC4=%lx RegECC=%lx\n ", RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC)); -+ } -+ -+ if(final_candidate != 0xff) -+ { -+ pdmpriv->RegE94 = RegE94 = result[final_candidate][0]; -+ pdmpriv->RegE9C = RegE9C = result[final_candidate][1]; -+ RegEA4 = result[final_candidate][2]; -+ RegEAC = result[final_candidate][3]; -+ pdmpriv->RegEB4 = RegEB4 = result[final_candidate][4]; -+ pdmpriv->RegEBC = RegEBC = result[final_candidate][5]; -+ RegEC4 = result[final_candidate][6]; -+ RegECC = result[final_candidate][7]; -+ DBG_8192C("IQK: final_candidate is %x\n", final_candidate); -+ DBG_8192C("IQK: RegE94=%x RegE9C=%x RegEA4=%x RegEAC=%x RegEB4=%x RegEBC=%x RegEC4=%x RegECC=%x\n ", RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC); -+ bPathAOK = bPathBOK = _TRUE; -+ } -+ else -+ { -+ RegE94 = RegEB4 = pdmpriv->RegE94 = pdmpriv->RegEB4 = 0x100; //X default value -+ RegE9C = RegEBC = pdmpriv->RegE9C = pdmpriv->RegEBC = 0x0; //Y default value -+ } -+ -+ if((RegE94 != 0)/*&&(RegEA4 != 0)*/) -+ _PHY_PathAFillIQKMatrix(pAdapter, bPathAOK, result, final_candidate, (RegEA4 == 0)); -+ -+ if(IS_92C_SERIAL( pHalData->VersionID)){ -+ if((RegEB4 != 0)/*&&(RegEC4 != 0)*/) -+ _PHY_PathBFillIQKMatrix(pAdapter, bPathBOK, result, final_candidate, (RegEC4 == 0)); -+ } -+ -+ _PHY_SaveADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup_recover, 9); -+ -+} -+ -+ -+VOID -+rtl8192c_PHY_LCCalibrate( -+ IN PADAPTER pAdapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct mlme_ext_priv *pmlmeext = &pAdapter->mlmeextpriv; -+ BOOLEAN bStartContTx = _FALSE, bSingleTone = _FALSE, bCarrierSuppression = _FALSE; -+ -+#if MP_DRIVER == 1 -+ bStartContTx = pAdapter->mppriv.MptCtx.bStartContTx; -+ bSingleTone = pAdapter->mppriv.MptCtx.bSingleTone; -+ bCarrierSuppression = pAdapter->mppriv.MptCtx.bCarrierSuppression; -+#endif -+ -+#if DISABLE_BB_RF -+ return; -+#endif -+ -+ //ignore IQK when continuous Tx -+ if(bStartContTx || bSingleTone || bCarrierSuppression) -+ return; -+ -+ if(pmlmeext->sitesurvey_res.state == SCAN_PROCESS) -+ return; -+ -+ if(IS_92C_SERIAL( pHalData->VersionID)){ -+ _PHY_LCCalibrate(pAdapter, _TRUE); -+ } -+ else{ -+ // For 88C 1T1R -+ _PHY_LCCalibrate(pAdapter, _FALSE); -+ } -+} -+ -+VOID -+rtl8192c_PHY_APCalibrate( -+ IN PADAPTER pAdapter, -+ IN char delta -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ //default disable APK, because Tx NG issue, suggest by Jenyu, 2011.11.25 -+ return; -+ -+#if DISABLE_BB_RF -+ return; -+#endif -+ -+ if(pdmpriv->bAPKdone) -+ return; -+ -+ if(IS_92C_SERIAL( pHalData->VersionID)){ -+ _PHY_APCalibrate(pAdapter, delta, _TRUE); -+ } -+ else{ -+ // For 88C 1T1R -+ _PHY_APCalibrate(pAdapter, delta, _FALSE); -+ } -+} -+ -+VOID rtl8192c_PHY_SetRFPathSwitch( -+ IN PADAPTER pAdapter, -+ IN BOOLEAN bMain -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+#if DISABLE_BB_RF -+ return; -+#endif -+ -+ if(IS_92C_SERIAL( pHalData->VersionID)){ -+ _PHY_SetRFPathSwitch(pAdapter, bMain, _TRUE); -+ } -+ else{ -+ // For 88C 1T1R -+ _PHY_SetRFPathSwitch(pAdapter, bMain, _FALSE); -+ } -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c -@@ -0,0 +1,1031 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/****************************************************************************** -+ * -+ * -+ * Module: rtl8192c_rf6052.c ( Source C File) -+ * -+ * Note: Provide RF 6052 series relative API. -+ * -+ * Function: -+ * -+ * Export: -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * -+ * 09/25/2008 MHC Create initial version. -+ * 11/05/2008 MHC Add API for tw power setting. -+ * -+ * -+******************************************************************************/ -+ -+#define _RTL8192C_RF6052_C_ -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+/*---------------------------Define Local Constant---------------------------*/ -+// Define local structure for debug!!!!! -+typedef struct RF_Shadow_Compare_Map { -+ // Shadow register value -+ u32 Value; -+ // Compare or not flag -+ u8 Compare; -+ // Record If it had ever modified unpredicted -+ u8 ErrorOrNot; -+ // Recorver Flag -+ u8 Recorver; -+ // -+ u8 Driver_Write; -+}RF_SHADOW_T; -+/*---------------------------Define Local Constant---------------------------*/ -+ -+ -+/*------------------------Define global variable-----------------------------*/ -+/*------------------------Define global variable-----------------------------*/ -+ -+ -+/*------------------------Define local variable------------------------------*/ -+// 2008/11/20 MH For Debug only, RF -+//static RF_SHADOW_T RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG] = {0}; -+static RF_SHADOW_T RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG]; -+/*------------------------Define local variable------------------------------*/ -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: RF_ChangeTxPath -+ * -+ * Overview: For RL6052, we must change some RF settign for 1T or 2T. -+ * -+ * Input: u2Byte DataRate // 0x80-8f, 0x90-9f -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 09/25/2008 MHC Create Version 0. -+ * Firmwaer support the utility later. -+ * -+ *---------------------------------------------------------------------------*/ -+void rtl8192c_RF_ChangeTxPath( IN PADAPTER Adapter, -+ IN u16 DataRate) -+{ -+// We do not support gain table change inACUT now !!!! Delete later !!! -+#if 0//(RTL92SE_FPGA_VERIFY == 0) -+ static u1Byte RF_Path_Type = 2; // 1 = 1T 2= 2T -+ static u4Byte tx_gain_tbl1[6] -+ = {0x17f50, 0x11f40, 0x0cf30, 0x08720, 0x04310, 0x00100}; -+ static u4Byte tx_gain_tbl2[6] -+ = {0x15ea0, 0x10e90, 0x0c680, 0x08250, 0x04040, 0x00030}; -+ u1Byte i; -+ -+ if (RF_Path_Type == 2 && (DataRate&0xF) <= 0x7) -+ { -+ // Set TX SYNC power G2G3 loop filter -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TXPA_G2, bRFRegOffsetMask, 0x0f000); -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TXPA_G3, bRFRegOffsetMask, 0xeacf1); -+ -+ // Change TX AGC gain table -+ for (i = 0; i < 6; i++) -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TX_AGC, bRFRegOffsetMask, tx_gain_tbl1[i]); -+ -+ // Set PA to high value -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TXPA_G2, bRFRegOffsetMask, 0x01e39); -+ } -+ else if (RF_Path_Type == 1 && (DataRate&0xF) >= 0x8) -+ { -+ // Set TX SYNC power G2G3 loop filter -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TXPA_G2, bRFRegOffsetMask, 0x04440); -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TXPA_G3, bRFRegOffsetMask, 0xea4f1); -+ -+ // Change TX AGC gain table -+ for (i = 0; i < 6; i++) -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TX_AGC, bRFRegOffsetMask, tx_gain_tbl2[i]); -+ -+ // Set PA low gain -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)RF_PATH_A, -+ RF_TXPA_G2, bRFRegOffsetMask, 0x01e19); -+ } -+#endif -+ -+} /* RF_ChangeTxPath */ -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: PHY_RF6052SetBandwidth() -+ * -+ * Overview: This function is called by SetBWModeCallback8190Pci() only -+ * -+ * Input: PADAPTER Adapter -+ * WIRELESS_BANDWIDTH_E Bandwidth //20M or 40M -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Note: For RF type 0222D -+ *---------------------------------------------------------------------------*/ -+VOID -+rtl8192c_PHY_RF6052SetBandwidth( -+ IN PADAPTER Adapter, -+ IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ switch(Bandwidth) -+ { -+ case HT_CHANNEL_WIDTH_20: -+ pHalData->RfRegChnlVal[0] = ((pHalData->RfRegChnlVal[0] & 0xfffff3ff) | 0x0400); -+ PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, pHalData->RfRegChnlVal[0]); -+ break; -+ -+ case HT_CHANNEL_WIDTH_40: -+ pHalData->RfRegChnlVal[0] = ((pHalData->RfRegChnlVal[0] & 0xfffff3ff)); -+ PHY_SetRFReg(Adapter, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, pHalData->RfRegChnlVal[0]); -+ break; -+ -+ default: -+ //RT_TRACE(COMP_DBG, DBG_LOUD, ("PHY_SetRF8225Bandwidth(): unknown Bandwidth: %#X\n",Bandwidth )); -+ break; -+ } -+ -+} -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: PHY_RF6052SetCckTxPower -+ * -+ * Overview: -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/05/2008 MHC Simulate 8192series.. -+ * -+ *---------------------------------------------------------------------------*/ -+ -+VOID -+rtl8192c_PHY_RF6052SetCckTxPower( -+ IN PADAPTER Adapter, -+ IN u8* pPowerlevel) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ //PMGNT_INFO pMgntInfo=&Adapter->MgntInfo; -+ u32 TxAGC[2]={0, 0}, tmpval=0; -+ BOOLEAN TurboScanOff = _FALSE; -+ u8 idx1, idx2; -+ u8* ptr; -+ -+ // 2010/10/18 MH Accorsing to SD3 eechou's suggestion, we need to disable turbo scan for RU. -+ // Otherwise, external PA will be broken if power index > 0x20. -+#ifdef CONFIG_USB_HCI -+ if (pHalData->EEPROMRegulatory != 0 || pHalData->ExternalPA) -+#else -+ if (pHalData->EEPROMRegulatory != 0) -+#endif -+ { -+ //DbgPrint("TurboScanOff=1 EEPROMRegulatory=%d ExternalPA=%d\n", pHalData->EEPROMRegulatory, pHalData->ExternalPA); -+ TurboScanOff = _TRUE; -+ } -+ -+ if(pmlmeext->sitesurvey_res.state == SCAN_PROCESS) -+ { -+ TxAGC[RF_PATH_A] = 0x3f3f3f3f; -+ TxAGC[RF_PATH_B] = 0x3f3f3f3f; -+ -+ TurboScanOff = _TRUE;//disable turbo scan -+ -+ if(TurboScanOff) -+ { -+ for(idx1=RF_PATH_A; idx1<=RF_PATH_B; idx1++) -+ { -+ TxAGC[idx1] = -+ pPowerlevel[idx1] | (pPowerlevel[idx1]<<8) | -+ (pPowerlevel[idx1]<<16) | (pPowerlevel[idx1]<<24); -+#ifdef CONFIG_USB_HCI -+ // 2010/10/18 MH For external PA module. We need to limit power index to be less than 0x20. -+ if (TxAGC[idx1] > 0x20 && pHalData->ExternalPA) -+ TxAGC[idx1] = 0x20; -+#endif -+ } -+ } -+ } -+ else -+ { -+// 20100427 Joseph: Driver dynamic Tx power shall not affect Tx power. It shall be determined by power training mechanism. -+// Currently, we cannot fully disable driver dynamic tx power mechanism because it is referenced by BT coexist mechanism. -+// In the future, two mechanism shall be separated from each other and maintained independantly. Thanks for Lanhsin's reminder. -+ if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) -+ { -+ TxAGC[RF_PATH_A] = 0x10101010; -+ TxAGC[RF_PATH_B] = 0x10101010; -+ } -+ else if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) -+ { -+ TxAGC[RF_PATH_A] = 0x00000000; -+ TxAGC[RF_PATH_B] = 0x00000000; -+ } -+ else -+ { -+ for(idx1=RF_PATH_A; idx1<=RF_PATH_B; idx1++) -+ { -+ TxAGC[idx1] = -+ pPowerlevel[idx1] | (pPowerlevel[idx1]<<8) | -+ (pPowerlevel[idx1]<<16) | (pPowerlevel[idx1]<<24); -+ } -+ -+ if(pHalData->EEPROMRegulatory==0) -+ { -+ tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][6]) + -+ (pHalData->MCSTxPowerLevelOriginalOffset[0][7]<<8); -+ TxAGC[RF_PATH_A] += tmpval; -+ -+ tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][14]) + -+ (pHalData->MCSTxPowerLevelOriginalOffset[0][15]<<24); -+ TxAGC[RF_PATH_B] += tmpval; -+ } -+ } -+ } -+ -+ for(idx1=RF_PATH_A; idx1<=RF_PATH_B; idx1++) -+ { -+ ptr = (u8*)(&(TxAGC[idx1])); -+ for(idx2=0; idx2<4; idx2++) -+ { -+ if(*ptr > RF6052_MAX_TX_PWR) -+ *ptr = RF6052_MAX_TX_PWR; -+ ptr++; -+ } -+ } -+ -+ // rf-A cck tx power -+ tmpval = TxAGC[RF_PATH_A]&0xff; -+ PHY_SetBBReg(Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, tmpval); -+ //RTPRINT(FPHY, PHY_TXPWR, ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, rTxAGC_A_CCK1_Mcs32)); -+ tmpval = TxAGC[RF_PATH_A]>>8; -+ PHY_SetBBReg(Adapter, rTxAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval); -+ //RTPRINT(FPHY, PHY_TXPWR, ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, rTxAGC_B_CCK11_A_CCK2_11)); -+ -+ // rf-B cck tx power -+ tmpval = TxAGC[RF_PATH_B]>>24; -+ PHY_SetBBReg(Adapter, rTxAGC_B_CCK11_A_CCK2_11, bMaskByte0, tmpval); -+ //RTPRINT(FPHY, PHY_TXPWR, ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, rTxAGC_B_CCK11_A_CCK2_11)); -+ tmpval = TxAGC[RF_PATH_B]&0x00ffffff; -+ PHY_SetBBReg(Adapter, rTxAGC_B_CCK1_55_Mcs32, 0xffffff00, tmpval); -+ //RTPRINT(FPHY, PHY_TXPWR, ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", -+ // tmpval, rTxAGC_B_CCK1_55_Mcs32)); -+ -+} /* PHY_RF6052SetCckTxPower */ -+ -+// -+// powerbase0 for OFDM rates -+// powerbase1 for HT MCS rates -+// -+static void getPowerBase( -+ IN PADAPTER Adapter, -+ IN u8* pPowerLevel, -+ IN u8 Channel, -+ IN OUT u32* OfdmBase, -+ IN OUT u32* MCSBase -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 powerBase0, powerBase1; -+ u8 Legacy_pwrdiff=0; -+ s8 HT20_pwrdiff=0; -+ u8 i, powerlevel[2]; -+ -+ for(i=0; i<2; i++) -+ { -+ powerlevel[i] = pPowerLevel[i]; -+ Legacy_pwrdiff = pHalData->TxPwrLegacyHtDiff[i][Channel-1]; -+ powerBase0 = powerlevel[i] + Legacy_pwrdiff; -+ -+ powerBase0 = (powerBase0<<24) | (powerBase0<<16) |(powerBase0<<8) |powerBase0; -+ *(OfdmBase+i) = powerBase0; -+ //RTPRINT(FPHY, PHY_TXPWR, (" [OFDM power base index rf(%c) = 0x%x]\n", ((i==0)?'A':'B'), *(OfdmBase+i))); -+ } -+ -+ for(i=0; i<2; i++) -+ { -+ //Check HT20 to HT40 diff -+ if(pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20) -+ { -+ HT20_pwrdiff = pHalData->TxPwrHt20Diff[i][Channel-1]; -+ powerlevel[i] += HT20_pwrdiff; -+ } -+ powerBase1 = powerlevel[i]; -+ powerBase1 = (powerBase1<<24) | (powerBase1<<16) |(powerBase1<<8) |powerBase1; -+ *(MCSBase+i) = powerBase1; -+ //RTPRINT(FPHY, PHY_TXPWR, (" [MCS power base index rf(%c) = 0x%x]\n", ((i==0)?'A':'B'), *(MCSBase+i))); -+ } -+} -+ -+static void getTxPowerWriteValByRegulatory( -+ IN PADAPTER Adapter, -+ IN u8 Channel, -+ IN u8 index, -+ IN u32* powerBase0, -+ IN u32* powerBase1, -+ OUT u32* pOutWriteVal -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u8 i, chnlGroup = 0, pwr_diff_limit[4]; -+ u32 writeVal, customer_limit, rf; -+ -+ // -+ // Index 0 & 1= legacy OFDM, 2-5=HT_MCS rate -+ // -+ for(rf=0; rf<2; rf++) -+ { -+ switch(pHalData->EEPROMRegulatory) -+ { -+ case 0: // Realtek better performance -+ // increase power diff defined by Realtek for large power -+ chnlGroup = 0; -+ //RTPRINT(FPHY, PHY_TXPWR, ("MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n", -+ // chnlGroup, index, pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)])); -+ writeVal = pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)] + -+ ((index<2)?powerBase0[rf]:powerBase1[rf]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("RTK better performance, writeVal(%c) = 0x%x\n", ((rf==0)?'A':'B'), writeVal)); -+ break; -+ case 1: // Realtek regulatory -+ // increase power diff defined by Realtek for regulatory -+ { -+ if(pHalData->pwrGroupCnt == 1) -+ chnlGroup = 0; -+ if(pHalData->pwrGroupCnt >= 3) -+ { -+ if(Channel <= 3) -+ chnlGroup = 0; -+ else if(Channel >= 4 && Channel <= 9) -+ chnlGroup = 1; -+ else if(Channel > 9) -+ chnlGroup = 2; -+ -+ if(pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20) -+ chnlGroup++; -+ else -+ chnlGroup+=4; -+ } -+ //RTPRINT(FPHY, PHY_TXPWR, ("MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n", -+ //chnlGroup, index, pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)])); -+ writeVal = pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)] + -+ ((index<2)?powerBase0[rf]:powerBase1[rf]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n", ((rf==0)?'A':'B'), writeVal)); -+ } -+ break; -+ case 2: // Better regulatory -+ // don't increase any power diff -+ writeVal = ((index<2)?powerBase0[rf]:powerBase1[rf]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("Better regulatory, writeVal(%c) = 0x%x\n", ((rf==0)?'A':'B'), writeVal)); -+ break; -+ case 3: // Customer defined power diff. -+ // increase power diff defined by customer. -+ chnlGroup = 0; -+ //RTPRINT(FPHY, PHY_TXPWR, ("MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n", -+ // chnlGroup, index, pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)])); -+ -+ if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_40) -+ { -+ //RTPRINT(FPHY, PHY_TXPWR, ("customer's limit, 40MHz rf(%c) = 0x%x\n", -+ // ((rf==0)?'A':'B'), pHalData->PwrGroupHT40[rf][Channel-1])); -+ } -+ else -+ { -+ //RTPRINT(FPHY, PHY_TXPWR, ("customer's limit, 20MHz rf(%c) = 0x%x\n", -+ // ((rf==0)?'A':'B'), pHalData->PwrGroupHT20[rf][Channel-1])); -+ } -+ for (i=0; i<4; i++) -+ { -+ pwr_diff_limit[i] = (u8)((pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)]&(0x7f<<(i*8)))>>(i*8)); -+ if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_40) -+ { -+ if(pwr_diff_limit[i] > pHalData->PwrGroupHT40[rf][Channel-1]) -+ pwr_diff_limit[i] = pHalData->PwrGroupHT40[rf][Channel-1]; -+ } -+ else -+ { -+ if(pwr_diff_limit[i] > pHalData->PwrGroupHT20[rf][Channel-1]) -+ pwr_diff_limit[i] = pHalData->PwrGroupHT20[rf][Channel-1]; -+ } -+ } -+ customer_limit = (pwr_diff_limit[3]<<24) | (pwr_diff_limit[2]<<16) | -+ (pwr_diff_limit[1]<<8) | (pwr_diff_limit[0]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("Customer's limit rf(%c) = 0x%x\n", ((rf==0)?'A':'B'), customer_limit)); -+ -+ writeVal = customer_limit + ((index<2)?powerBase0[rf]:powerBase1[rf]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("Customer, writeVal rf(%c)= 0x%x\n", ((rf==0)?'A':'B'), writeVal)); -+ break; -+ default: -+ chnlGroup = 0; -+ writeVal = pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)] + -+ ((index<2)?powerBase0[rf]:powerBase1[rf]); -+ //RTPRINT(FPHY, PHY_TXPWR, ("RTK better performance, writeVal rf(%c) = 0x%x\n", ((rf==0)?'A':'B'), writeVal)); -+ break; -+ } -+ -+// 20100427 Joseph: Driver dynamic Tx power shall not affect Tx power. It shall be determined by power training mechanism. -+// Currently, we cannot fully disable driver dynamic tx power mechanism because it is referenced by BT coexist mechanism. -+// In the future, two mechanism shall be separated from each other and maintained independantly. Thanks for Lanhsin's reminder. -+ -+ if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) -+ writeVal = 0x14141414; -+ else if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) -+ writeVal = 0x00000000; -+ -+ -+ // 20100628 Joseph: High power mode for BT-Coexist mechanism. -+ // This mechanism is only applied when Driver-Highpower-Mechanism is OFF. -+ if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_BT1) -+ { -+ //RTPRINT(FBT, BT_TRACE, ("Tx Power (-6)\n")); -+ writeVal = writeVal - 0x06060606; -+ } -+ else if(pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_BT2) -+ { -+ //RTPRINT(FBT, BT_TRACE, ("Tx Power (-0)\n")); -+ writeVal = writeVal; -+ } -+ *(pOutWriteVal+rf) = writeVal; -+ } -+} -+ -+static void writeOFDMPowerReg( -+ IN PADAPTER Adapter, -+ IN u8 index, -+ IN u32* pValue -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u16 RegOffset_A[6] = { rTxAGC_A_Rate18_06, rTxAGC_A_Rate54_24, -+ rTxAGC_A_Mcs03_Mcs00, rTxAGC_A_Mcs07_Mcs04, -+ rTxAGC_A_Mcs11_Mcs08, rTxAGC_A_Mcs15_Mcs12}; -+ u16 RegOffset_B[6] = { rTxAGC_B_Rate18_06, rTxAGC_B_Rate54_24, -+ rTxAGC_B_Mcs03_Mcs00, rTxAGC_B_Mcs07_Mcs04, -+ rTxAGC_B_Mcs11_Mcs08, rTxAGC_B_Mcs15_Mcs12}; -+ u8 i, rf, pwr_val[4]; -+ u32 writeVal; -+ u16 RegOffset; -+ -+ for(rf=0; rf<2; rf++) -+ { -+ writeVal = pValue[rf]; -+ for(i=0; i<4; i++) -+ { -+ pwr_val[i] = (u8)((writeVal & (0x7f<<(i*8)))>>(i*8)); -+ if (pwr_val[i] > RF6052_MAX_TX_PWR) -+ pwr_val[i] = RF6052_MAX_TX_PWR; -+ } -+ writeVal = (pwr_val[3]<<24) | (pwr_val[2]<<16) |(pwr_val[1]<<8) |pwr_val[0]; -+ -+ if(rf == 0) -+ RegOffset = RegOffset_A[index]; -+ else -+ RegOffset = RegOffset_B[index]; -+ -+ PHY_SetBBReg(Adapter, RegOffset, bMaskDWord, writeVal); -+ //RTPRINT(FPHY, PHY_TXPWR, ("Set 0x%x = %08x\n", RegOffset, writeVal)); -+ -+ // 201005115 Joseph: Set Tx Power diff for Tx power training mechanism. -+ if(((pHalData->rf_type == RF_2T2R) && -+ (RegOffset == rTxAGC_A_Mcs15_Mcs12 || RegOffset == rTxAGC_B_Mcs15_Mcs12))|| -+ ((pHalData->rf_type != RF_2T2R) && -+ (RegOffset == rTxAGC_A_Mcs07_Mcs04 || RegOffset == rTxAGC_B_Mcs07_Mcs04)) ) -+ { -+ writeVal = pwr_val[3]; -+ if(RegOffset == rTxAGC_A_Mcs15_Mcs12 || RegOffset == rTxAGC_A_Mcs07_Mcs04) -+ RegOffset = 0xc90; -+ if(RegOffset == rTxAGC_B_Mcs15_Mcs12 || RegOffset == rTxAGC_B_Mcs07_Mcs04) -+ RegOffset = 0xc98; -+ for(i=0; i<3; i++) -+ { -+ if(i!=2) -+ writeVal = (writeVal>8)?(writeVal-8):0; -+ else -+ writeVal = (writeVal>6)?(writeVal-6):0; -+ rtw_write8(Adapter, (u32)(RegOffset+i), (u8)writeVal); -+ } -+ } -+ } -+} -+/*----------------------------------------------------------------------------- -+ * Function: PHY_RF6052SetOFDMTxPower -+ * -+ * Overview: For legacy and HY OFDM, we must read EEPROM TX power index for -+ * different channel and read original value in TX power register area from -+ * 0xe00. We increase offset and original value to be correct tx pwr. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/05/2008 MHC Simulate 8192 series method. -+ * 01/06/2009 MHC 1. Prevent Path B tx power overflow or underflow dure to -+ * A/B pwr difference or legacy/HT pwr diff. -+ * 2. We concern with path B legacy/HT OFDM difference. -+ * 01/22/2009 MHC Support new EPRO format from SD3. -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+rtl8192c_PHY_RF6052SetOFDMTxPower( -+ IN PADAPTER Adapter, -+ IN u8* pPowerLevel, -+ IN u8 Channel) -+{ -+ //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 writeVal[2], powerBase0[2], powerBase1[2]; -+ u8 index = 0; -+ -+ getPowerBase(Adapter, pPowerLevel, Channel, &powerBase0[0], &powerBase1[0]); -+ -+ for(index=0; index<6; index++) -+ { -+ getTxPowerWriteValByRegulatory(Adapter, Channel, index, -+ &powerBase0[0], &powerBase1[0], &writeVal[0]); -+ -+ writeOFDMPowerReg(Adapter, index, &writeVal[0]); -+ } -+ -+} -+ -+ -+static VOID -+phy_RF6052_Config_HardCode( -+ IN PADAPTER Adapter -+ ) -+{ -+ -+ // Set Default Bandwidth to 20M -+ //Adapter->HalFunc .SetBWModeHandler(Adapter, HT_CHANNEL_WIDTH_20); -+ -+ // TODO: Set Default Channel to channel one for RTL8225 -+ -+} -+ -+static int -+phy_RF6052_Config_ParaFile( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 u4RegValue=0; -+ u8 eRFPath; -+ BB_REGISTER_DEFINITION_T *pPhyReg; -+ -+ int rtStatus = _SUCCESS; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ static char sz88CRadioAFile[] = RTL8188C_PHY_RADIO_A; -+ static char sz88CRadioBFile[] = RTL8188C_PHY_RADIO_B; -+#ifdef CONFIG_USB_HCI -+ static char sz88CRadioAFile_mCard[] = RTL8188C_PHY_RADIO_A_mCard; -+ static char sz88CRadioBFile_mCard[] = RTL8188C_PHY_RADIO_B_mCard; -+ static char sz88CRadioAFile_HP[] = RTL8188C_PHY_RADIO_A_HP; -+#endif -+ static char sz92CRadioAFile[] = RTL8192C_PHY_RADIO_A; -+ static char sz92CRadioBFile[] = RTL8192C_PHY_RADIO_B; -+ static char sz8723RadioAFile[] = RTL8723_PHY_RADIO_A; -+ static char sz8723RadioBFile[] = RTL8723_PHY_RADIO_B; -+ char *pszRadioAFile, *pszRadioBFile; -+ -+ -+ if(IS_HARDWARE_TYPE_8192C(Adapter)) -+ { -+ if(IS_92C_SERIAL( pHalData->VersionID))// 88c's IPA is different from 92c's -+ { -+ pszRadioAFile = sz92CRadioAFile; -+ pszRadioBFile = sz92CRadioBFile; -+ } -+ else -+ { -+ pszRadioAFile = sz88CRadioAFile; -+ pszRadioBFile = sz88CRadioBFile; -+#ifdef CONFIG_USB_HCI -+ if( BOARD_MINICARD == pHalData->BoardType) -+ { -+ pszRadioAFile = sz88CRadioAFile_mCard; -+ pszRadioBFile = sz88CRadioBFile_mCard; -+ } -+ else if( BOARD_USB_High_PA == pHalData->BoardType) -+ { -+ pszRadioAFile = sz88CRadioAFile_HP; -+ } -+#endif -+ } -+ } -+ else if(IS_HARDWARE_TYPE_8723A(Adapter)) -+ { -+ pszRadioAFile = sz8723RadioAFile; -+ pszRadioBFile = sz8723RadioBFile; -+ } -+ -+ //3//----------------------------------------------------------------- -+ //3// <2> Initialize RF -+ //3//----------------------------------------------------------------- -+ //for(eRFPath = RF_PATH_A; eRFPath NumTotalRFPath; eRFPath++) -+ for(eRFPath = 0; eRFPath NumTotalRFPath; eRFPath++) -+ { -+ -+ pPhyReg = &pHalData->PHYRegDef[eRFPath]; -+ -+ /*----Store original RFENV control type----*/ -+ switch(eRFPath) -+ { -+ case RF_PATH_A: -+ case RF_PATH_C: -+ u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV); -+ break; -+ case RF_PATH_B : -+ case RF_PATH_D: -+ u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV<<16); -+ break; -+ } -+ -+ /*----Set RF_ENV enable----*/ -+ PHY_SetBBReg(Adapter, pPhyReg->rfintfe, bRFSI_RFENV<<16, 0x1); -+ rtw_udelay_os(1);//PlatformStallExecution(1); -+ -+ /*----Set RF_ENV output high----*/ -+ PHY_SetBBReg(Adapter, pPhyReg->rfintfo, bRFSI_RFENV, 0x1); -+ rtw_udelay_os(1);//PlatformStallExecution(1); -+ -+ /* Set bit number of Address and Data for RF register */ -+ PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); // Set 1 to 4 bits for 8255 -+ rtw_udelay_os(1);//PlatformStallExecution(1); -+ -+ PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); // Set 0 to 12 bits for 8255 -+ rtw_udelay_os(1);//PlatformStallExecution(1); -+ -+ /*----Initialize RF fom connfiguration file----*/ -+ switch(eRFPath) -+ { -+ case RF_PATH_A: -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus= rtl8192c_PHY_ConfigRFWithHeaderFile(Adapter,(RF_RADIO_PATH_E)eRFPath); -+#else -+ rtStatus = rtl8192c_PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile, (RF_RADIO_PATH_E)eRFPath); -+#endif -+ break; -+ case RF_PATH_B: -+#ifdef CONFIG_EMBEDDED_FWIMG -+ rtStatus = rtl8192c_PHY_ConfigRFWithHeaderFile(Adapter,(RF_RADIO_PATH_E)eRFPath); -+#else -+ rtStatus = rtl8192c_PHY_ConfigRFWithParaFile(Adapter, pszRadioBFile, (RF_RADIO_PATH_E)eRFPath); -+#endif -+ break; -+ case RF_PATH_C: -+ break; -+ case RF_PATH_D: -+ break; -+ } -+ -+ /*----Restore RFENV control type----*/; -+ switch(eRFPath) -+ { -+ case RF_PATH_A: -+ case RF_PATH_C: -+ PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); -+ break; -+ case RF_PATH_B : -+ case RF_PATH_D: -+ PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV<<16, u4RegValue); -+ break; -+ } -+ -+ if(rtStatus != _SUCCESS){ -+ //RT_TRACE(COMP_FPGA, DBG_LOUD, ("phy_RF6052_Config_ParaFile():Radio[%d] Fail!!", eRFPath)); -+ goto phy_RF6052_Config_ParaFile_Fail; -+ } -+ -+ } -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("<---phy_RF6052_Config_ParaFile()\n")); -+ return rtStatus; -+ -+phy_RF6052_Config_ParaFile_Fail: -+ return rtStatus; -+} -+ -+ -+int -+PHY_RF6052_Config8192C( -+ IN PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ int rtStatus = _SUCCESS; -+ -+ // -+ // Initialize general global value -+ // -+ // TODO: Extend RF_PATH_C and RF_PATH_D in the future -+ if(pHalData->rf_type == RF_1T1R) -+ pHalData->NumTotalRFPath = 1; -+ else -+ pHalData->NumTotalRFPath = 2; -+ -+ // -+ // Config BB and RF -+ // -+ rtStatus = phy_RF6052_Config_ParaFile(Adapter); -+#if 0 -+ switch( Adapter->MgntInfo.bRegHwParaFile ) -+ { -+ case 0: -+ phy_RF6052_Config_HardCode(Adapter); -+ break; -+ -+ case 1: -+ rtStatus = phy_RF6052_Config_ParaFile(Adapter); -+ break; -+ -+ case 2: -+ // Partial Modify. -+ phy_RF6052_Config_HardCode(Adapter); -+ phy_RF6052_Config_ParaFile(Adapter); -+ break; -+ -+ default: -+ phy_RF6052_Config_HardCode(Adapter); -+ break; -+ } -+#endif -+ return rtStatus; -+ -+} -+ -+ -+// -+// ==> RF shadow Operation API Code Section!!! -+// -+/*----------------------------------------------------------------------------- -+ * Function: PHY_RFShadowRead -+ * PHY_RFShadowWrite -+ * PHY_RFShadowCompare -+ * PHY_RFShadowRecorver -+ * PHY_RFShadowCompareAll -+ * PHY_RFShadowRecorverAll -+ * PHY_RFShadowCompareFlagSet -+ * PHY_RFShadowRecorverFlagSet -+ * -+ * Overview: When we set RF register, we must write shadow at first. -+ * When we are running, we must compare shadow abd locate error addr. -+ * Decide to recorver or not. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 11/20/2008 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+u32 -+PHY_RFShadowRead( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset) -+{ -+ return RF_Shadow[eRFPath][Offset].Value; -+ -+} /* PHY_RFShadowRead */ -+ -+ -+VOID -+PHY_RFShadowWrite( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset, -+ IN u32 Data) -+{ -+ RF_Shadow[eRFPath][Offset].Value = (Data & bRFRegOffsetMask); -+ RF_Shadow[eRFPath][Offset].Driver_Write = _TRUE; -+ -+} /* PHY_RFShadowWrite */ -+ -+ -+BOOLEAN -+PHY_RFShadowCompare( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset) -+{ -+ u32 reg; -+ // Check if we need to check the register -+ if (RF_Shadow[eRFPath][Offset].Compare == _TRUE) -+ { -+ reg = PHY_QueryRFReg(Adapter, eRFPath, Offset, bRFRegOffsetMask); -+ // Compare shadow and real rf register for 20bits!! -+ if (RF_Shadow[eRFPath][Offset].Value != reg) -+ { -+ // Locate error position. -+ RF_Shadow[eRFPath][Offset].ErrorOrNot = _TRUE; -+ //RT_TRACE(COMP_INIT, DBG_LOUD, -+ //("PHY_RFShadowCompare RF-%d Addr%02lx Err = %05lx\n", -+ //eRFPath, Offset, reg)); -+ } -+ return RF_Shadow[eRFPath][Offset].ErrorOrNot ; -+ } -+ return _FALSE; -+} /* PHY_RFShadowCompare */ -+ -+ -+VOID -+PHY_RFShadowRecorver( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset) -+{ -+ // Check if the address is error -+ if (RF_Shadow[eRFPath][Offset].ErrorOrNot == _TRUE) -+ { -+ // Check if we need to recorver the register. -+ if (RF_Shadow[eRFPath][Offset].Recorver == _TRUE) -+ { -+ PHY_SetRFReg(Adapter, eRFPath, Offset, bRFRegOffsetMask, -+ RF_Shadow[eRFPath][Offset].Value); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, -+ //("PHY_RFShadowRecorver RF-%d Addr%02lx=%05lx", -+ //eRFPath, Offset, RF_Shadow[eRFPath][Offset].Value)); -+ } -+ } -+ -+} /* PHY_RFShadowRecorver */ -+ -+ -+VOID -+PHY_RFShadowCompareAll( -+ IN PADAPTER Adapter) -+{ -+ u32 eRFPath; -+ u32 Offset; -+ -+ for (eRFPath = 0; eRFPath < RF6052_MAX_PATH; eRFPath++) -+ { -+ for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) -+ { -+ PHY_RFShadowCompare(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset); -+ } -+ } -+ -+} /* PHY_RFShadowCompareAll */ -+ -+ -+VOID -+PHY_RFShadowRecorverAll( -+ IN PADAPTER Adapter) -+{ -+ u32 eRFPath; -+ u32 Offset; -+ -+ for (eRFPath = 0; eRFPath < RF6052_MAX_PATH; eRFPath++) -+ { -+ for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) -+ { -+ PHY_RFShadowRecorver(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset); -+ } -+ } -+ -+} /* PHY_RFShadowRecorverAll */ -+ -+ -+VOID -+PHY_RFShadowCompareFlagSet( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset, -+ IN u8 Type) -+{ -+ // Set True or False!!! -+ RF_Shadow[eRFPath][Offset].Compare = Type; -+ -+} /* PHY_RFShadowCompareFlagSet */ -+ -+ -+VOID -+PHY_RFShadowRecorverFlagSet( -+ IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 Offset, -+ IN u8 Type) -+{ -+ // Set True or False!!! -+ RF_Shadow[eRFPath][Offset].Recorver= Type; -+ -+} /* PHY_RFShadowRecorverFlagSet */ -+ -+ -+VOID -+PHY_RFShadowCompareFlagSetAll( -+ IN PADAPTER Adapter) -+{ -+ u32 eRFPath; -+ u32 Offset; -+ -+ for (eRFPath = 0; eRFPath < RF6052_MAX_PATH; eRFPath++) -+ { -+ for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) -+ { -+ // 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! -+ if (Offset != 0x26 && Offset != 0x27) -+ PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _FALSE); -+ else -+ PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _TRUE); -+ } -+ } -+ -+} /* PHY_RFShadowCompareFlagSetAll */ -+ -+ -+VOID -+PHY_RFShadowRecorverFlagSetAll( -+ IN PADAPTER Adapter) -+{ -+ u32 eRFPath; -+ u32 Offset; -+ -+ for (eRFPath = 0; eRFPath < RF6052_MAX_PATH; eRFPath++) -+ { -+ for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) -+ { -+ // 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! -+ if (Offset != 0x26 && Offset != 0x27) -+ PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _FALSE); -+ else -+ PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, _TRUE); -+ } -+ } -+ -+} /* PHY_RFShadowCompareFlagSetAll */ -+ -+VOID -+PHY_RFShadowRefresh( -+ IN PADAPTER Adapter) -+{ -+ u32 eRFPath; -+ u32 Offset; -+ -+ for (eRFPath = 0; eRFPath < RF6052_MAX_PATH; eRFPath++) -+ { -+ for (Offset = 0; Offset < RF6052_MAX_REG; Offset++) -+ { -+ RF_Shadow[eRFPath][Offset].Value = 0; -+ RF_Shadow[eRFPath][Offset].Compare = _FALSE; -+ RF_Shadow[eRFPath][Offset].Recorver = _FALSE; -+ RF_Shadow[eRFPath][Offset].ErrorOrNot = _FALSE; -+ RF_Shadow[eRFPath][Offset].Driver_Write = _FALSE; -+ } -+ } -+ -+} /* PHY_RFShadowRead */ -+ -+/* End of HalRf6052.c */ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c -@@ -0,0 +1,876 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTL8192C_REDESC_C_ -+#include -+#include -+#include -+#include -+ -+static u8 evm_db2percentage(s8 value) -+{ -+ // -+ // -33dB~0dB to 0%~99% -+ // -+ s8 ret_val; -+ -+ ret_val = value; -+ //ret_val /= 2; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("EVMdbToPercentage92S Value=%d / %x \n", ret_val, ret_val)); -+ -+ if(ret_val >= 0) -+ ret_val = 0; -+ if(ret_val <= -33) -+ ret_val = -33; -+ -+ ret_val = 0 - ret_val; -+ ret_val*=3; -+ -+ if(ret_val == 99) -+ ret_val = 100; -+ -+ return(ret_val); -+} -+ -+ -+static s32 signal_scale_mapping(_adapter *padapter, s32 cur_sig ) -+{ -+ s32 ret_sig; -+ -+#ifdef CONFIG_USB_HCI -+ if(cur_sig >= 51 && cur_sig <= 100) -+ { -+ ret_sig = 100; -+ } -+ else if(cur_sig >= 41 && cur_sig <= 50) -+ { -+ ret_sig = 80 + ((cur_sig - 40)*2); -+ } -+ else if(cur_sig >= 31 && cur_sig <= 40) -+ { -+ ret_sig = 66 + (cur_sig - 30); -+ } -+ else if(cur_sig >= 21 && cur_sig <= 30) -+ { -+ ret_sig = 54 + (cur_sig - 20); -+ } -+ else if(cur_sig >= 10 && cur_sig <= 20) -+ { -+ ret_sig = 42 + (((cur_sig - 10) * 2) / 3); -+ } -+ else if(cur_sig >= 5 && cur_sig <= 9) -+ { -+ ret_sig = 22 + (((cur_sig - 5) * 3) / 2); -+ } -+ else if(cur_sig >= 1 && cur_sig <= 4) -+ { -+ ret_sig = 6 + (((cur_sig - 1) * 3) / 2); -+ } -+ else -+ { -+ ret_sig = cur_sig; -+ } -+#else -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ -+ if(pHalData->CustomerID == RT_CID_819x_Lenovo) -+ { -+ // Step 1. Scale mapping. -+ // 20100611 Joseph: Re-tunning RSSI presentation for Lenovo. -+ // 20100426 Joseph: Modify Signal strength mapping. -+ // This modification makes the RSSI indication similar to Intel solution. -+ // 20100414 Joseph: Tunning RSSI for Lenovo according to RTL8191SE. -+ if(cur_sig >= 54 && cur_sig <= 100) -+ { -+ ret_sig = 100; -+ } -+ else if(cur_sig>=42 && cur_sig <= 53 ) -+ { -+ ret_sig = 95; -+ } -+ else if(cur_sig>=36 && cur_sig <= 41 ) -+ { -+ ret_sig = 74 + ((cur_sig - 36) *20)/6; -+ } -+ else if(cur_sig>=33 && cur_sig <= 35 ) -+ { -+ ret_sig = 65 + ((cur_sig - 33) *8)/2; -+ } -+ else if(cur_sig>=18 && cur_sig <= 32 ) -+ { -+ ret_sig = 62 + ((cur_sig - 18) *2)/15; -+ } -+ else if(cur_sig>=15 && cur_sig <= 17 ) -+ { -+ ret_sig = 33 + ((cur_sig - 15) *28)/2; -+ } -+ else if(cur_sig>=10 && cur_sig <= 14 ) -+ { -+ ret_sig = 39; -+ } -+ else if(cur_sig>=8 && cur_sig <= 9 ) -+ { -+ ret_sig = 33; -+ } -+ else if(cur_sig <= 8 ) -+ { -+ ret_sig = 19; -+ } -+ } -+ else -+ { -+ // Step 1. Scale mapping. -+ if(cur_sig >= 61 && cur_sig <= 100) -+ { -+ ret_sig = 90 + ((cur_sig - 60) / 4); -+ } -+ else if(cur_sig >= 41 && cur_sig <= 60) -+ { -+ ret_sig = 78 + ((cur_sig - 40) / 2); -+ } -+ else if(cur_sig >= 31 && cur_sig <= 40) -+ { -+ ret_sig = 66 + (cur_sig - 30); -+ } -+ else if(cur_sig >= 21 && cur_sig <= 30) -+ { -+ ret_sig = 54 + (cur_sig - 20); -+ } -+ else if(cur_sig >= 5 && cur_sig <= 20) -+ { -+ ret_sig = 42 + (((cur_sig - 5) * 2) / 3); -+ } -+ else if(cur_sig == 4) -+ { -+ ret_sig = 36; -+ } -+ else if(cur_sig == 3) -+ { -+ ret_sig = 27; -+ } -+ else if(cur_sig == 2) -+ { -+ ret_sig = 18; -+ } -+ else if(cur_sig == 1) -+ { -+ ret_sig = 9; -+ } -+ else -+ { -+ ret_sig = cur_sig; -+ } -+ } -+#endif -+ -+ return ret_sig; -+} -+ -+ -+static s32 translate2dbm(u8 signal_strength_idx) -+{ -+ s32 signal_power; // in dBm. -+ -+ -+ // Translate to dBm (x=0.5y-95). -+ signal_power = (s32)((signal_strength_idx + 1) >> 1); -+ signal_power -= 95; -+ -+ return signal_power; -+} -+ -+static void query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat) -+{ -+ PHY_STS_OFDM_8192CD_T *pOfdm_buf; -+ PHY_STS_CCK_8192CD_T *pCck_buf; -+ u8 i, max_spatial_stream, evm; -+ s8 rx_pwr[4], rx_pwr_all = 0; -+ u8 pwdb_all; -+ u32 rssi,total_rssi=0; -+ u8 bcck_rate=0, rf_rx_num = 0, cck_highpwr = 0; -+ _adapter *padapter = prframe->u.hdr.adapter; -+ struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u8 tmp_rxsnr; -+ s8 rx_snrX; -+ -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ PHY_RX_DRIVER_INFO_8192CD *pDrvInfo = ((PHY_RX_DRIVER_INFO_8192CD *)pphy_stat); -+ u8 bant1_sel = (pDrvInfo->ANTSEL == 1)?_TRUE:_FALSE; -+#endif -+ -+ // Record it for next packet processing -+ bcck_rate=(pattrib->mcs_rate<=3? 1:0); -+ -+ if(bcck_rate) //CCK -+ { -+ u8 report; -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ if(bant1_sel == _TRUE) -+ pHalData->CCK_Ant1_Cnt++; -+ else -+ pHalData->CCK_Ant2_Cnt++; -+#endif -+ -+ // CCK Driver info Structure is not the same as OFDM packet. -+ pCck_buf = (PHY_STS_CCK_8192CD_T *)pphy_stat; -+ //Adapter->RxStats.NumQryPhyStatusCCK++; -+ -+ // -+ // (1)Hardware does not provide RSSI for CCK -+ // (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) -+ // -+ -+ if(padapter->pwrctrlpriv.rf_pwrstate == rf_on) -+ cck_highpwr = (u8)pHalData->bCckHighPower; -+ else -+ cck_highpwr = _FALSE; -+ -+ if(!cck_highpwr) -+ { -+ report = pCck_buf->cck_agc_rpt&0xc0; -+ report = report>>6; -+ switch(report) -+ { -+ // 03312009 modified by cosa -+ // Modify the RF RNA gain value to -40, -20, -2, 14 by Jenyu's suggestion -+ // Note: different RF with the different RNA gain. -+ case 0x3: -+ rx_pwr_all = (-46) - (pCck_buf->cck_agc_rpt & 0x3e); -+ break; -+ case 0x2: -+ rx_pwr_all = (-26) - (pCck_buf->cck_agc_rpt & 0x3e); -+ break; -+ case 0x1: -+ rx_pwr_all = (-12) - (pCck_buf->cck_agc_rpt & 0x3e); -+ break; -+ case 0x0: -+ rx_pwr_all = (16) - (pCck_buf->cck_agc_rpt & 0x3e); -+ break; -+ } -+ } -+ else -+ { -+ report = pCck_buf->cck_agc_rpt & 0x60; -+ report = report>>5; -+ switch(report) -+ { -+ case 0x3: -+ rx_pwr_all = (-46) - ((pCck_buf->cck_agc_rpt & 0x1f)<<1) ; -+ break; -+ case 0x2: -+ rx_pwr_all = (-26)- ((pCck_buf->cck_agc_rpt & 0x1f)<<1); -+ break; -+ case 0x1: -+ rx_pwr_all = (-12) - ((pCck_buf->cck_agc_rpt & 0x1f)<<1) ; -+ break; -+ case 0x0: -+ rx_pwr_all = (16) - ((pCck_buf->cck_agc_rpt & 0x1f)<<1) ; -+ break; -+ } -+ } -+ -+ pwdb_all= query_rx_pwr_percentage(rx_pwr_all); -+ if(pHalData->CustomerID == RT_CID_819x_Lenovo) -+ { -+ // CCK gain is smaller than OFDM/MCS gain, -+ // so we add gain diff by experiences, the val is 6 -+ pwdb_all+=6; -+ if(pwdb_all > 100) -+ pwdb_all = 100; -+ // modify the offset to make the same gain index with OFDM. -+ if(pwdb_all > 34 && pwdb_all <= 42) -+ pwdb_all -= 2; -+ else if(pwdb_all > 26 && pwdb_all <= 34) -+ pwdb_all -= 6; -+ else if(pwdb_all > 14 && pwdb_all <= 26) -+ pwdb_all -= 8; -+ else if(pwdb_all > 4 && pwdb_all <= 14) -+ pwdb_all -= 4; -+ } -+ -+ pattrib->RxPWDBAll = pwdb_all; //for DIG/rate adaptive -+ pattrib->RecvSignalPower = rx_pwr_all; //dBM -+ padapter->recvpriv.rxpwdb = rx_pwr_all; -+ // -+ // (3) Get Signal Quality (EVM) -+ // -+ //if(bPacketMatchBSSID) -+ { -+ u8 sq; -+ -+ if(pHalData->CustomerID == RT_CID_819x_Lenovo) -+ { -+ // mapping to 5 bars for vista signal strength -+ // signal quality in driver will be displayed to signal strength -+ // in vista. -+ if(pwdb_all >= 50) -+ sq = 100; -+ else if(pwdb_all >= 35 && pwdb_all < 50) -+ sq = 80; -+ else if(pwdb_all >= 22 && pwdb_all < 35) -+ sq = 60; -+ else if(pwdb_all >= 18 && pwdb_all < 22) -+ sq = 40; -+ else -+ sq = 20; -+ } -+ else -+ { -+ if(pwdb_all> 40) -+ { -+ sq = 100; -+ } -+ else -+ { -+ sq = pCck_buf->SQ_rpt; -+ -+ if(pCck_buf->SQ_rpt > 64) -+ sq = 0; -+ else if (pCck_buf->SQ_rpt < 20) -+ sq= 100; -+ else -+ sq = ((64-sq) * 100) / 44; -+ -+ } -+ } -+ -+ pattrib->signal_qual=sq; -+ pattrib->rx_mimo_signal_qual[0]=sq; -+ pattrib->rx_mimo_signal_qual[1]=(-1); -+ } -+ -+ } -+ else //OFDM/HT -+ { -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ if(bant1_sel == _TRUE) -+ pHalData->OFDM_Ant1_Cnt++; -+ else -+ pHalData->OFDM_Ant2_Cnt++; -+#endif -+ pdmpriv->OFDM_Pkt_Cnt++; -+ -+ pOfdm_buf = (PHY_STS_OFDM_8192CD_T *)pphy_stat; -+ -+ // -+ // (1)Get RSSI per-path -+ // -+ for(i=0; iNumTotalRFPath; i++) -+ { -+ // 2008/01/30 MH we will judge RF RX path now. -+ if (pHalData->bRFPathRxEnable[i]) -+ rf_rx_num++; -+ //else -+ //continue; -+ -+ rx_pwr[i] = ((pOfdm_buf->trsw_gain_X[i]&0x3F)*2) - 110; -+ padapter->recvpriv.RxRssi[i] = rx_pwr[i]; -+ /* Translate DBM to percentage. */ -+ pattrib->rx_rssi[i] = rssi = query_rx_pwr_percentage(rx_pwr[i]); -+ total_rssi += rssi; -+ -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("RF-%d RXPWR=%x RSSI=%d\n", i, rx_pwr[i], rssi)); -+ -+ //Get Rx snr value in DB -+ tmp_rxsnr = pOfdm_buf->rxsnr_X[i]; -+ rx_snrX = (s8)(tmp_rxsnr); -+ rx_snrX >>= 1; -+ padapter->recvpriv.RxSNRdB[i] = (int)rx_snrX; -+ pattrib->rx_snr[i]=pOfdm_buf->rxsnr_X[i]; -+ /* Record Signal Strength for next packet */ -+ //if(bPacketMatchBSSID) -+ { -+ //pRfd->Status.RxMIMOSignalStrength[i] =(u1Byte) RSSI; -+ -+ //The following is for lenovo signal strength in vista -+ if(pHalData->CustomerID == RT_CID_819x_Lenovo) -+ { -+ u8 sq; -+ -+ if(i == 0) -+ { -+ // mapping to 5 bars for vista signal strength -+ // signal quality in driver will be displayed to signal strength -+ // in vista. -+ if(rssi >= 50) -+ sq = 100; -+ else if(rssi >= 35 && rssi < 50) -+ sq = 80; -+ else if(rssi >= 22 && rssi < 35) -+ sq = 60; -+ else if(rssi >= 18 && rssi < 22) -+ sq = 40; -+ else -+ sq = 20; -+ //DbgPrint("ofdm/mcs RSSI=%d\n", RSSI); -+ //pRfd->Status.SignalQuality = SQ; -+ //DbgPrint("ofdm/mcs SQ = %d\n", pRfd->Status.SignalQuality); -+ } -+ } -+ } -+ } -+ -+ -+ // -+ // (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive),average -+ // -+ rx_pwr_all = (((pOfdm_buf->pwdb_all ) >> 1 )& 0x7f) -110;//for OFDM Average RSSI -+ pwdb_all = query_rx_pwr_percentage(rx_pwr_all); -+ -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("PWDB_ALL=%d\n", pwdb_all)); -+ -+ pattrib->RxPWDBAll = pwdb_all; //for DIG/rate adaptive -+ pattrib->RecvSignalPower = rx_pwr_all;//dBM -+ padapter->recvpriv.rxpwdb = rx_pwr_all; -+ // -+ // (3)EVM of HT rate -+ // -+ if(pHalData->CustomerID != RT_CID_819x_Lenovo) -+ { -+ if(pattrib->rxht && pattrib->mcs_rate >=20 && pattrib->mcs_rate<=27) -+ max_spatial_stream = 2; //both spatial stream make sense -+ else -+ max_spatial_stream = 1; //only spatial stream 1 makes sense -+ -+ for(i=0; i>= 1" because the compilor of free build environment -+ // fill most significant bit to "zero" when doing shifting operation which may change a negative -+ // value to positive one, then the dbm value (which is supposed to be negative) is not correct anymore. -+ evm = evm_db2percentage( (pOfdm_buf->rxevm_X[i]/*/ 2*/));//dbm -+ -+ RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("RXRATE=%x RXEVM=%x EVM=%s%d\n", -+ pattrib->mcs_rate, pOfdm_buf->rxevm_X[i], "%",evm)); -+ -+ //if(bPacketMatchBSSID) -+ { -+ if(i==0) // Fill value in RFD, Get the first spatial stream only -+ { -+ pattrib->signal_qual = (u8)(evm & 0xff); -+ } -+ pattrib->rx_mimo_signal_qual[i] = (u8)(evm & 0xff); -+ } -+ } -+ -+ } -+ -+ // -+ // 4. Record rx statistics for debug -+ // -+ -+ } -+ -+ -+ //UI BSS List signal strength(in percentage), make it good looking, from 0~100. -+ //It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). -+ if(bcck_rate) -+ { -+ pattrib->signal_strength=(u8)signal_scale_mapping(padapter, pwdb_all); -+ } -+ else -+ { -+ if (rf_rx_num != 0) -+ { -+ pattrib->signal_strength= (u8)(signal_scale_mapping(padapter, total_rssi/=rf_rx_num)); -+ } -+ } -+ //DBG_8192C("%s,rx_pwr_all(%d),RxPWDBAll(%d)\n",__FUNCTION__,rx_pwr_all,pattrib->RxPWDBAll); -+ -+} -+ -+ -+static void process_rssi(_adapter *padapter,union recv_frame *prframe) -+{ -+ u32 last_rssi, tmp_val; -+ struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ struct signal_stat * signal_stat = &padapter->recvpriv.signal_strength_data; -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+ //DBG_8192C("process_rssi=> pattrib->rssil(%d) signal_strength(%d)\n ",pattrib->RecvSignalPower,pattrib->signal_strength); -+ //if(pRfd->Status.bPacketToSelf || pRfd->Status.bPacketBeacon) -+ { -+ -+ #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ if(signal_stat->update_req) { -+ signal_stat->total_num = 0; -+ signal_stat->total_val = 0; -+ signal_stat->update_req = 0; -+ } -+ -+ signal_stat->total_num++; -+ signal_stat->total_val += pattrib->signal_strength; -+ signal_stat->avg_val = signal_stat->total_val / signal_stat->total_num; -+ #else //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+ //Adapter->RxStats.RssiCalculateCnt++; //For antenna Test -+ if(padapter->recvpriv.signal_strength_data.total_num++ >= PHY_RSSI_SLID_WIN_MAX) -+ { -+ padapter->recvpriv.signal_strength_data.total_num = PHY_RSSI_SLID_WIN_MAX; -+ last_rssi = padapter->recvpriv.signal_strength_data.elements[padapter->recvpriv.signal_strength_data.index]; -+ padapter->recvpriv.signal_strength_data.total_val -= last_rssi; -+ } -+ padapter->recvpriv.signal_strength_data.total_val +=pattrib->signal_strength; -+ -+ padapter->recvpriv.signal_strength_data.elements[padapter->recvpriv.signal_strength_data.index++] = pattrib->signal_strength; -+ if(padapter->recvpriv.signal_strength_data.index >= PHY_RSSI_SLID_WIN_MAX) -+ padapter->recvpriv.signal_strength_data.index = 0; -+ -+ -+ tmp_val = padapter->recvpriv.signal_strength_data.total_val/padapter->recvpriv.signal_strength_data.total_num; -+ -+ if(padapter->recvpriv.is_signal_dbg) { -+ padapter->recvpriv.signal_strength= padapter->recvpriv.signal_strength_dbg; -+ padapter->recvpriv.rssi=(s8)translate2dbm((u8)padapter->recvpriv.signal_strength_dbg); -+ } else { -+ padapter->recvpriv.signal_strength= tmp_val; -+ padapter->recvpriv.rssi=(s8)translate2dbm((u8)tmp_val); -+ } -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("UI RSSI = %d, ui_rssi.TotalVal = %d, ui_rssi.TotalNum = %d\n", tmp_val, padapter->recvpriv.signal_strength_data.total_val,padapter->recvpriv.signal_strength_data.total_num)); -+ #endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ } -+ -+}// Process_UI_RSSI_8192C -+ -+ -+static void process_PWDB(_adapter *padapter, union recv_frame *prframe) -+{ -+ int UndecoratedSmoothedPWDB; -+ int UndecoratedSmoothedCCK; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct rx_pkt_attrib *pattrib= &prframe->u.hdr.attrib; -+ struct sta_info *psta = prframe->u.hdr.psta; -+ u8 isCCKrate=(pattrib->mcs_rate<=3? 1:0); -+ -+ -+ if(psta) -+ { -+ UndecoratedSmoothedPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; -+ UndecoratedSmoothedCCK = psta->rssi_stat.UndecoratedSmoothedCCK; -+ } -+ else -+ { -+ UndecoratedSmoothedPWDB = pdmpriv->UndecoratedSmoothedPWDB; -+ UndecoratedSmoothedCCK = pdmpriv->UndecoratedSmoothedCCK; -+ } -+ -+ //if(pRfd->Status.bPacketToSelf || pRfd->Status.bPacketBeacon) -+ -+ if(!isCCKrate) -+ { -+ // Process OFDM RSSI -+ if(UndecoratedSmoothedPWDB < 0) // initialize -+ { -+ UndecoratedSmoothedPWDB = pattrib->RxPWDBAll; -+ } -+ -+ if(pattrib->RxPWDBAll > (u32)UndecoratedSmoothedPWDB) -+ { -+ UndecoratedSmoothedPWDB = -+ ( ((UndecoratedSmoothedPWDB)*(Rx_Smooth_Factor-1)) + -+ (pattrib->RxPWDBAll)) /(Rx_Smooth_Factor); -+ -+ UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB + 1; -+ } -+ else -+ { -+ UndecoratedSmoothedPWDB = -+ ( ((UndecoratedSmoothedPWDB)*(Rx_Smooth_Factor-1)) + -+ (pattrib->RxPWDBAll)) /(Rx_Smooth_Factor); -+ } -+ } -+ else -+ { -+ // Process CCK RSSI -+ if(UndecoratedSmoothedCCK < 0) // initialize -+ { -+ UndecoratedSmoothedCCK = pattrib->RxPWDBAll; -+ } -+ -+ if(pattrib->RxPWDBAll > (u32)UndecoratedSmoothedCCK) -+ { -+ UndecoratedSmoothedCCK = -+ ( ((UndecoratedSmoothedCCK)*(Rx_Smooth_Factor-1)) + -+ (pattrib->RxPWDBAll)) /(Rx_Smooth_Factor); -+ -+ UndecoratedSmoothedCCK = UndecoratedSmoothedCCK + 1; -+ } -+ else -+ { -+ UndecoratedSmoothedCCK = -+ ( ((UndecoratedSmoothedCCK)*(Rx_Smooth_Factor-1)) + -+ (pattrib->RxPWDBAll)) /(Rx_Smooth_Factor); -+ } -+ } -+ -+ -+ if(psta) -+ { -+ //psta->UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB;//todo: -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; -+ -+ if(pdmpriv->RSSI_Select == RSSI_OFDM){ -+ psta->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; -+ } -+ else if(pdmpriv->RSSI_Select == RSSI_CCK){ -+ psta->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedCCK; -+ } -+ else{ -+ if(UndecoratedSmoothedPWDB <0 ) -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedCCK; -+ else -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; -+ } -+ psta->rssi_stat.UndecoratedSmoothedCCK = UndecoratedSmoothedCCK; -+ } -+ else -+ { -+ //pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; -+ -+ if(pdmpriv->RSSI_Select == RSSI_OFDM){ -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; -+ } -+ else if(pdmpriv->RSSI_Select == RSSI_CCK){ -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedCCK; -+ } -+ else { -+ if(UndecoratedSmoothedPWDB <0 ) -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedCCK; -+ else -+ pdmpriv->UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; -+ -+ } -+ pdmpriv->UndecoratedSmoothedCCK = UndecoratedSmoothedCCK; -+ } -+ -+ //UpdateRxSignalStatistics8192C(padapter, prframe); -+ -+} -+ -+ -+static void process_link_qual(_adapter *padapter,union recv_frame *prframe) -+{ -+ u32 last_evm=0, tmpVal; -+ struct rx_pkt_attrib *pattrib; -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ struct signal_stat * signal_stat; -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+ if(prframe == NULL || padapter==NULL){ -+ return; -+ } -+ -+ pattrib = &prframe->u.hdr.attrib; -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ signal_stat = &padapter->recvpriv.signal_qual_data; -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+ //DBG_8192C("process_link_qual=> pattrib->signal_qual(%d)\n ",pattrib->signal_qual); -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ if(signal_stat->update_req) { -+ signal_stat->total_num = 0; -+ signal_stat->total_val = 0; -+ signal_stat->update_req = 0; -+ } -+ -+ signal_stat->total_num++; -+ signal_stat->total_val += pattrib->signal_qual; -+ signal_stat->avg_val = signal_stat->total_val / signal_stat->total_num; -+ -+#else //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ if(pattrib->signal_qual != 0) -+ { -+ // -+ // 1. Record the general EVM to the sliding window. -+ // -+ if(padapter->recvpriv.signal_qual_data.total_num++ >= PHY_LINKQUALITY_SLID_WIN_MAX) -+ { -+ padapter->recvpriv.signal_qual_data.total_num = PHY_LINKQUALITY_SLID_WIN_MAX; -+ last_evm = padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index]; -+ padapter->recvpriv.signal_qual_data.total_val -= last_evm; -+ } -+ padapter->recvpriv.signal_qual_data.total_val += pattrib->signal_qual; -+ -+ padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index++] = pattrib->signal_qual; -+ if(padapter->recvpriv.signal_qual_data.index >= PHY_LINKQUALITY_SLID_WIN_MAX) -+ padapter->recvpriv.signal_qual_data.index = 0; -+ -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("Total SQ=%d pattrib->signal_qual= %d\n", padapter->recvpriv.signal_qual_data.total_val, pattrib->signal_qual)); -+ -+ // <1> Showed on UI for user, in percentage. -+ tmpVal = padapter->recvpriv.signal_qual_data.total_val/padapter->recvpriv.signal_qual_data.total_num; -+ padapter->recvpriv.signal_qual=(u8)tmpVal; -+ -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" pattrib->signal_qual =%d\n", pattrib->signal_qual)); -+ } -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+}// Process_UiLinkQuality8192S -+ -+ -+static void process_phy_info(_adapter *padapter, union recv_frame *prframe) -+{ -+ union recv_frame *precvframe = (union recv_frame *)prframe; -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ // If we switch to the antenna for testing, the signal strength -+ // of the packets in this time shall not be counted into total receiving power. -+ // This prevents error counting Rx signal strength and affecting other dynamic mechanism. -+ -+ // Select the packets to do RSSI checking for antenna switching. -+ SwAntDivRSSICheck8192C(padapter, precvframe->u.hdr.attrib.RxPWDBAll); -+ -+ if(GET_HAL_DATA(padapter)->RSSI_test == _TRUE) -+ return; -+#endif -+ // -+ // Check RSSI -+ // -+ process_rssi(padapter, precvframe); -+ // -+ // Check PWDB. -+ // -+ process_PWDB(padapter, precvframe); -+ // -+ // Check EVM -+ // -+ process_link_qual(padapter, precvframe); -+ -+} -+ -+ -+void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_info) -+{ -+ struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; -+ _adapter *padapter = precvframe->u.hdr.adapter; -+ u8 bPacketMatchBSSID =_FALSE; -+ u8 bPacketToSelf = _FALSE; -+ u8 bPacketBeacon = _FALSE; -+ -+ if((pattrib->physt) && (pphy_info != NULL)) -+ { -+ bPacketMatchBSSID = ((!IsFrameTypeCtrl(precvframe->u.hdr.rx_data)) && !(pattrib->icv_err) && !(pattrib->crc_err) && -+ _rtw_memcmp(get_hdr_bssid(precvframe->u.hdr.rx_data), get_my_bssid(&padapter->mlmeextpriv.mlmext_info.network), ETH_ALEN)); -+ -+ -+ bPacketToSelf = bPacketMatchBSSID && (_rtw_memcmp(get_da(precvframe->u.hdr.rx_data), myid(&padapter->eeprompriv), ETH_ALEN)); -+ -+ bPacketBeacon =bPacketMatchBSSID && (GetFrameSubType(precvframe->u.hdr.rx_data) == WIFI_BEACON); -+ -+ query_rx_phy_status(precvframe, pphy_info); -+ -+ precvframe->u.hdr.psta = NULL; -+ if(bPacketMatchBSSID && check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ u8 *sa; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ sa = get_sa(precvframe->u.hdr.rx_data); -+ -+ psta = rtw_get_stainfo(pstapriv, sa); -+ if(psta) -+ { -+ precvframe->u.hdr.psta = psta; -+ process_phy_info(padapter, precvframe); -+ } -+ } -+ else if(bPacketToSelf || bPacketBeacon) -+ { -+ if(check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ u8 *sa; -+ struct sta_info *psta=NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ sa = get_sa(precvframe->u.hdr.rx_data); -+ -+ psta = rtw_get_stainfo(pstapriv, sa); -+ if(psta) -+ { -+ precvframe->u.hdr.psta = psta; -+ } -+ } -+ -+ process_phy_info(padapter, precvframe); -+ } -+ } -+} -+ -+void rtl8192c_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc) -+{ -+ struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; -+ -+ //Offset 0 -+ pattrib->physt = (u8)((le32_to_cpu(pdesc->rxdw0) >> 26) & 0x1); -+ pattrib->pkt_len = (u16)(le32_to_cpu(pdesc->rxdw0)&0x00003fff); -+ pattrib->drvinfo_sz = (u8)((le32_to_cpu(pdesc->rxdw0) >> 16) & 0xf) * 8;//uint 2^3 = 8 bytes -+ -+ pattrib->shift_sz = (u8)((le32_to_cpu(pdesc->rxdw0) >> 24) & 0x3); -+ -+ pattrib->crc_err = (u8)((le32_to_cpu(pdesc->rxdw0) >> 14) & 0x1); -+ pattrib->icv_err = (u8)((le32_to_cpu(pdesc->rxdw0) >> 15) & 0x1); -+ pattrib->qos = (u8)(( le32_to_cpu( pdesc->rxdw0 ) >> 23) & 0x1);// Qos data, wireless lan header length is 26 -+ pattrib->bdecrypted = (le32_to_cpu(pdesc->rxdw0) & BIT(27))? 0:1; -+ -+ //Offset 4 -+ pattrib->mfrag = (u8)((le32_to_cpu(pdesc->rxdw1) >> 27) & 0x1);//more fragment bit -+ -+ //Offset 8 -+ pattrib->frag_num = (u8)((le32_to_cpu(pdesc->rxdw2) >> 12) & 0xf);//fragmentation number -+ -+ //Offset 12 -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX -+ if ( le32_to_cpu(pdesc->rxdw3) & BIT(13)){ -+ pattrib->tcpchk_valid = 1; // valid -+ if ( le32_to_cpu(pdesc->rxdw3) & BIT(11) ) { -+ pattrib->tcp_chkrpt = 1; // correct -+ //DBG_8192C("tcp csum ok\n"); -+ } -+ else -+ pattrib->tcp_chkrpt = 0; // incorrect -+ -+ if ( le32_to_cpu(pdesc->rxdw3) & BIT(12) ) -+ pattrib->ip_chkrpt = 1; // correct -+ else -+ pattrib->ip_chkrpt = 0; // incorrect -+ } -+ else { -+ pattrib->tcpchk_valid = 0; // invalid -+ } -+#endif -+ -+ pattrib->mcs_rate=(u8)((le32_to_cpu(pdesc->rxdw3))&0x3f); -+ pattrib->rxht=(u8)((le32_to_cpu(pdesc->rxdw3) >>6)&0x1); -+ pattrib->sgi=(u8)((le32_to_cpu(pdesc->rxdw3) >>8)&0x1); -+ //Offset 16 -+ //Offset 20 -+ -+} -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c -@@ -0,0 +1,94 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#include -+#include -+#ifdef DBG_CONFIG_ERROR_DETECT -+void rtl8192c_sreset_xmit_status_check(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct sreset_priv *psrtpriv = &pHalData->srestpriv; -+ -+ unsigned long current_time; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ unsigned int diff_time; -+ u32 txdma_status; -+ if( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00){ -+ DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status); -+ rtw_hal_sreset_reset(padapter); -+ } -+ -+ //total xmit irp = 4 -+ //DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__FUNCTION__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); -+ //if(pxmitpriv->txirp_cnt == NR_XMITBUFF+1) -+ current_time = rtw_get_current_time(); -+ -+ if(0 == pxmitpriv->free_xmitbuf_cnt || 0 == pxmitpriv->free_xmit_extbuf_cnt) { -+ -+ diff_time = rtw_get_passing_time_ms(psrtpriv->last_tx_time); -+ -+ if (diff_time > 2000) { -+ if (psrtpriv->last_tx_complete_time == 0) { -+ psrtpriv->last_tx_complete_time = current_time; -+ } -+ else{ -+ diff_time = rtw_get_passing_time_ms(psrtpriv->last_tx_complete_time); -+ if (diff_time > 4000) { -+ //padapter->Wifi_Error_Status = WIFI_TX_HANG; -+ DBG_871X("%s tx hang\n", __FUNCTION__); -+ rtw_hal_sreset_reset(padapter); -+ } -+ } -+ } -+ } -+ -+ if (psrtpriv->dbg_trigger_point == SRESET_TGP_XMIT_STATUS) { -+ psrtpriv->dbg_trigger_point = SRESET_TGP_NULL; -+ rtw_hal_sreset_reset(padapter); -+ return; -+ } -+} -+void rtl8192c_sreset_linked_status_check(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct sreset_priv *psrtpriv = &pHalData->srestpriv; -+ -+ u32 regc50,regc58,reg824,reg800; -+ regc50 = rtw_read32(padapter,0xc50); -+ regc58 = rtw_read32(padapter,0xc58); -+ reg824 = rtw_read32(padapter,0x824); -+ reg800 = rtw_read32(padapter,0x800); -+ if( ((regc50&0xFFFFFF00)!= 0x69543400)|| -+ ((regc58&0xFFFFFF00)!= 0x69543400)|| -+ (((reg824&0xFFFFFF00)!= 0x00390000)&&(((reg824&0xFFFFFF00)!= 0x80390000)))|| -+ ( ((reg800&0xFFFFFF00)!= 0x03040000)&&((reg800&0xFFFFFF00)!= 0x83040000))) -+ { -+ DBG_8192C("%s regc50:0x%08x, regc58:0x%08x, reg824:0x%08x, reg800:0x%08x,\n", __FUNCTION__, -+ regc50, regc58, reg824, reg800); -+ rtw_hal_sreset_reset(padapter); -+ } -+ -+ if (psrtpriv->dbg_trigger_point == SRESET_TGP_LINK_STATUS) { -+ psrtpriv->dbg_trigger_point = SRESET_TGP_NULL; -+ rtw_hal_sreset_reset(padapter); -+ return; -+ } -+} -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c -@@ -0,0 +1,63 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTL8192C_XMIT_C_ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_XMIT_ACK -+void dump_txrpt_ccx_8192c(void *buf) -+{ -+ struct txrpt_ccx_8192c *txrpt_ccx = buf; -+ -+ DBG_871X("%s:\n" -+ "retry_cnt:%u, rsvd_0:%u, rts_retry_cnt:%u, rsvd_1:%u\n" -+ "ccx_qtime:%u, missed_pkt_num:%u, rsvd_4:%u\n" -+ "mac_id:%u, des1_fragssn:%u\n" -+ "rpt_pkt_num:%u, pkt_drop:%u, lifetime_over:%u, retry_over:%u\n" -+ "edca_tx_queue:%u, rsvd_7:%u, bmc:%u, pkt_ok:%u, init_ccx:%u\n" -+ , __func__ -+ , txrpt_ccx->retry_cnt, txrpt_ccx->rsvd_0, txrpt_ccx->rts_retry_cnt, txrpt_ccx->rsvd_1 -+ , txrpt_ccx_qtime_8192c(txrpt_ccx), txrpt_ccx->missed_pkt_num, txrpt_ccx->rsvd_4 -+ , txrpt_ccx->mac_id, txrpt_ccx->des1_fragssn -+ , txrpt_ccx->rpt_pkt_num, txrpt_ccx->pkt_drop, txrpt_ccx->lifetime_over, txrpt_ccx->retry_over -+ , txrpt_ccx->edca_tx_queue, txrpt_ccx->rsvd_7, txrpt_ccx->bmc, txrpt_ccx->pkt_ok, txrpt_ccx->int_ccx -+ ); -+} -+ -+void handle_txrpt_ccx_8192c(_adapter *adapter, void *buf) -+{ -+ struct txrpt_ccx_8192c *txrpt_ccx = buf; -+ -+ #ifdef DBG_CCX -+ dump_txrpt_ccx_8192c(buf); -+ #endif -+ -+ if (txrpt_ccx->int_ccx) { -+ if (txrpt_ccx->pkt_ok) -+ rtw_ack_tx_done(&adapter->xmitpriv, RTW_SCTX_DONE_SUCCESS); -+ else -+ rtw_ack_tx_done(&adapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); -+ } -+} -+#endif //CONFIG_XMIT_ACK -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c -@@ -0,0 +1,8758 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+/*Created on 2011/ 6/15, 5:45*/ -+ -+#include -+#include "Hal8192CUHWImg.h" -+ -+#ifdef CONFIG_BT_COEXISTENCE -+// =================== v84 TSMC COMMON 2012-04-13 ======================= -+u8 Rtl8192CUFwTSMCImgArray[TSMCImgArrayLength] = { -+0xc1,0x88,0x02,0x00,0x54,0x00,0x01,0x00,0x04,0x13,0x11,0x07,0x3a,0x3d,0x00,0x00, -+0x58,0x97,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x02,0x43,0xba,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x50,0xa1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x57,0x91,0x00,0x00,0x00,0x00,0x00,0xa1,0xe8,0x00,0x00,0x00, -+0x05,0x04,0x03,0x02,0x00,0x03,0x06,0x05,0x04,0x03,0x00,0x04,0x06,0x05,0x04,0x02, -+0x00,0x04,0x08,0x07,0x06,0x04,0x00,0x06,0x0a,0x09,0x08,0x06,0x00,0x08,0x0a,0x09, -+0x08,0x04,0x00,0x08,0x0a,0x09,0x08,0x02,0x00,0x08,0x0a,0x09,0x08,0x00,0x00,0x08, -+0x12,0x11,0x10,0x08,0x00,0x10,0x1a,0x19,0x18,0x10,0x00,0x18,0x22,0x21,0x20,0x18, -+0x00,0x20,0x22,0x21,0x20,0x10,0x00,0x20,0x22,0x21,0x20,0x08,0x00,0x20,0x22,0x21, -+0x1c,0x08,0x00,0x20,0x22,0x21,0x14,0x08,0x00,0x20,0x22,0x20,0x18,0x08,0x00,0x20, -+0x31,0x30,0x20,0x10,0x00,0x30,0x31,0x30,0x18,0x00,0x00,0x30,0x31,0x2f,0x10,0x10, -+0x00,0x30,0x31,0x2c,0x10,0x10,0x00,0x30,0x31,0x28,0x10,0x00,0x00,0x30,0x31,0x20, -+0x10,0x00,0x00,0x30,0x31,0x10,0x10,0x00,0x00,0x30,0x04,0x04,0x04,0x05,0x04,0x04, -+0x04,0x05,0x05,0x05,0x06,0x06,0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x06,0x04,0x04, -+0x05,0x05,0x05,0x05,0x06,0x06,0x04,0x04,0x05,0x05,0x05,0x05,0x06,0x07,0x0a,0x0b, -+0x0d,0x10,0x04,0x05,0x05,0x06,0x06,0x09,0x0c,0x11,0x08,0x08,0x09,0x09,0x0a,0x0c, -+0x10,0x11,0x04,0x04,0x04,0x05,0x04,0x04,0x05,0x07,0x07,0x07,0x08,0x0a,0x04,0x04, -+0x04,0x04,0x06,0x0a,0x0b,0x0d,0x05,0x05,0x07,0x07,0x08,0x0b,0x0d,0x0f,0x04,0x04, -+0x04,0x05,0x07,0x07,0x09,0x09,0x0c,0x0e,0x10,0x12,0x04,0x04,0x05,0x05,0x06,0x0a, -+0x11,0x13,0x09,0x09,0x09,0x09,0x0c,0x0e,0x11,0x13,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x24,0x26,0x2a,0x18,0x1a,0x1d,0x1f,0x21,0x27,0x29,0x2a,0x00,0x00, -+0x00,0x1f,0x23,0x28,0x2a,0x2c,0x00,0x04,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x18, -+0x00,0x24,0x00,0x30,0x00,0x48,0x00,0x60,0x00,0x90,0x00,0xc0,0x00,0xd8,0x00,0x50, -+0x00,0x78,0x00,0xa0,0x00,0xc8,0x01,0x40,0x01,0x90,0x01,0xe0,0x02,0x30,0x01,0x2c, -+0x01,0x40,0x01,0xe0,0x02,0xd0,0x03,0xe8,0x04,0xb0,0x06,0x40,0x07,0xd0,0x00,0x02, -+0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x0c,0x00,0x12,0x00,0x18,0x00,0x24,0x00,0x30, -+0x00,0x48,0x00,0x60,0x00,0x6c,0x00,0x28,0x00,0x3c,0x00,0x50,0x00,0x64,0x00,0xa0, -+0x00,0xc8,0x00,0xf0,0x01,0x18,0x00,0x64,0x00,0xa0,0x00,0xf0,0x01,0x68,0x01,0xf4, -+0x02,0x58,0x03,0x20,0x03,0xe8,0x02,0x02,0x02,0x02,0x02,0x02,0x03,0x03,0x04,0x04, -+0x05,0x07,0x04,0x04,0x07,0x0a,0x0a,0x0c,0x0c,0x12,0x05,0x07,0x07,0x08,0x0b,0x12, -+0x24,0x3c,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x01,0x02, -+0x03,0x04,0x05,0x06,0x07,0x08,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x20,0x1e, -+0x1c,0x18,0x10,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0xbb,0x01,0x0c,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0,0x22,0x50, -+0x06,0xe9,0x25,0x82,0xf8,0xe6,0x22,0xbb,0xfe,0x06,0xe9,0x25,0x82,0xf8,0xe2,0x22, -+0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe4,0x93,0x22,0xbb,0x01,0x06, -+0x89,0x82,0x8a,0x83,0xf0,0x22,0x50,0x02,0xf7,0x22,0xbb,0xfe,0x01,0xf3,0x22,0xf8, -+0xbb,0x01,0x0d,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0x22, -+0x50,0x06,0xe9,0x25,0x82,0xc8,0xf6,0x22,0xbb,0xfe,0x05,0xe9,0x25,0x82,0xc8,0xf2, -+0x22,0xc5,0xf0,0xf8,0xa3,0xe0,0x28,0xf0,0xc5,0xf0,0xf8,0xe5,0x82,0x15,0x82,0x70, -+0x02,0x15,0x83,0xe0,0x38,0xf0,0x22,0xbb,0x01,0x0a,0x89,0x82,0x8a,0x83,0xe0,0xf5, -+0xf0,0xa3,0xe0,0x22,0x50,0x06,0x87,0xf0,0x09,0xe7,0x19,0x22,0xbb,0xfe,0x07,0xe3, -+0xf5,0xf0,0x09,0xe3,0x19,0x22,0x89,0x82,0x8a,0x83,0xe4,0x93,0xf5,0xf0,0x74,0x01, -+0x93,0x22,0xbb,0x01,0x10,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0, -+0xf5,0xf0,0xa3,0xe0,0x22,0x50,0x09,0xe9,0x25,0x82,0xf8,0x86,0xf0,0x08,0xe6,0x22, -+0xbb,0xfe,0x0a,0xe9,0x25,0x82,0xf8,0xe2,0xf5,0xf0,0x08,0xe2,0x22,0xe5,0x83,0x2a, -+0xf5,0x83,0xe9,0x93,0xf5,0xf0,0xa3,0xe9,0x93,0x22,0xbb,0x01,0x0a,0x89,0x82,0x8a, -+0x83,0xf0,0xe5,0xf0,0xa3,0xf0,0x22,0x50,0x06,0xf7,0x09,0xa7,0xf0,0x19,0x22,0xbb, -+0xfe,0x06,0xf3,0xe5,0xf0,0x09,0xf3,0x19,0x22,0xf8,0xbb,0x01,0x11,0xe5,0x82,0x29, -+0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0xe5,0xf0,0xa3,0xf0,0x22,0x50,0x09, -+0xe9,0x25,0x82,0xc8,0xf6,0x08,0xa6,0xf0,0x22,0xbb,0xfe,0x09,0xe9,0x25,0x82,0xc8, -+0xf2,0xe5,0xf0,0x08,0xf2,0x22,0xef,0x4b,0xff,0xee,0x4a,0xfe,0xed,0x49,0xfd,0xec, -+0x48,0xfc,0x22,0xe0,0xfc,0xa3,0xe0,0xfd,0xa3,0xe0,0xfe,0xa3,0xe0,0xff,0x22,0xa4, -+0x25,0x82,0xf5,0x82,0xe5,0xf0,0x35,0x83,0xf5,0x83,0x22,0xe0,0xfb,0xa3,0xe0,0xfa, -+0xa3,0xe0,0xf9,0x22,0xf8,0xe0,0xfb,0xa3,0xa3,0xe0,0xf9,0x25,0xf0,0xf0,0xe5,0x82, -+0x15,0x82,0x70,0x02,0x15,0x83,0xe0,0xfa,0x38,0xf0,0x22,0xeb,0xf0,0xa3,0xea,0xf0, -+0xa3,0xe9,0xf0,0x22,0xd0,0x83,0xd0,0x82,0xf8,0xe4,0x93,0x70,0x12,0x74,0x01,0x93, -+0x70,0x0d,0xa3,0xa3,0x93,0xf8,0x74,0x01,0x93,0xf5,0x82,0x88,0x83,0xe4,0x73,0x74, -+0x02,0x93,0x68,0x60,0xef,0xa3,0xa3,0xa3,0x80,0xdf,0x02,0x43,0xf8,0x02,0x48,0x29, -+0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0x40,0x03,0xf6,0x80,0x01,0xf2,0x08,0xdf,0xf4, -+0x80,0x29,0xe4,0x93,0xa3,0xf8,0x54,0x07,0x24,0x0c,0xc8,0xc3,0x33,0xc4,0x54,0x0f, -+0x44,0x20,0xc8,0x83,0x40,0x04,0xf4,0x56,0x80,0x01,0x46,0xf6,0xdf,0xe4,0x80,0x0b, -+0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x90,0x44,0x3d,0xe4,0x7e,0x01,0x93,0x60, -+0xbc,0xa3,0xff,0x54,0x3f,0x30,0xe5,0x09,0x54,0x1f,0xfe,0xe4,0x93,0xa3,0x60,0x01, -+0x0e,0xcf,0x54,0xc0,0x25,0xe0,0x60,0xa8,0x40,0xb8,0xe4,0x93,0xa3,0xfa,0xe4,0x93, -+0xa3,0xf8,0xe4,0x93,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xf0,0xa3,0xc8, -+0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xdf,0xe9,0xde,0xe7,0x80,0xbe,0x41,0x9e,0x77, -+0x00,0x41,0x9e,0xae,0x00,0x41,0x9e,0x54,0x80,0x41,0x9e,0xb0,0x00,0x00,0xf0,0x90, -+0x9e,0x5d,0xe0,0x90,0x9e,0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x54,0x7e,0x01,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x85,0xe0,0xfb,0xa3,0xe0,0xf5,0x44,0xe4,0xf5, -+0x45,0x12,0x35,0xab,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x01,0x5f,0xe4,0xf0,0x90,0x01, -+0x3c,0x74,0x08,0xf0,0xe4,0x90,0x9e,0x85,0xf0,0x90,0x9e,0x5b,0xe0,0x90,0x9e,0x86, -+0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x5e,0x90,0x01,0x5f,0x74,0x05,0xf0, -+0x90,0x06,0x92,0x74,0x02,0xf0,0x90,0x9e,0x63,0x14,0xf0,0xe5,0x61,0x54,0x0f,0xc3, -+0x94,0x0c,0x50,0x03,0x12,0x54,0xe3,0x22,0x8f,0x82,0x8e,0x83,0xa3,0xa3,0xa3,0xe4, -+0xf0,0x22,0xe4,0xf5,0x65,0x7f,0x60,0x7e,0x01,0x80,0xed,0x7d,0x01,0xaf,0x62,0x02, -+0x54,0xe7,0xb1,0xb0,0xbf,0x01,0x12,0x90,0x9e,0x79,0xe0,0xff,0xe4,0xfd,0xf1,0x79, -+0x12,0x5f,0xf7,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0xb1,0xb0,0xbf,0x01,0x0f,0x90, -+0x02,0x09,0xe0,0xff,0x7d,0x01,0xf1,0x79,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x22, -+0x22,0x22,0x00,0x02,0x45,0x03,0x02,0x45,0x06,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x8b,0x20,0x8a,0x21,0x89,0x22,0x90,0x9e,0x87,0x71,0x8b,0xab,0x23,0xaa,0x24,0xa9, -+0x25,0x90,0x9e,0x8a,0x71,0x8b,0xaf,0x26,0x15,0x26,0xef,0x60,0x1b,0x90,0x9e,0x8a, -+0xe4,0x75,0xf0,0x01,0x71,0x74,0x12,0x29,0xd9,0xff,0x90,0x9e,0x87,0xe4,0x75,0xf0, -+0x01,0x71,0x74,0xef,0x51,0x4d,0x80,0xde,0xab,0x20,0xaa,0x21,0xa9,0x22,0xd0,0xd0, -+0x92,0xaf,0x22,0x90,0x9e,0x11,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0x90,0x06,0xa9, -+0xe0,0x90,0x9e,0x10,0xf0,0xe0,0x54,0xc0,0x70,0x08,0x53,0x64,0xfe,0x53,0x64,0xfd, -+0x91,0xcb,0x90,0x9e,0x10,0xe0,0x30,0xe6,0x13,0x43,0x64,0x01,0x90,0x9e,0x66,0xe0, -+0x64,0x02,0x60,0x04,0x91,0xd2,0x80,0x07,0x91,0x79,0x80,0x03,0x53,0x64,0xfe,0x90, -+0x9e,0x10,0xe0,0x30,0xe7,0x16,0x43,0x64,0x02,0xe4,0x90,0x9e,0x85,0x91,0x4e,0x90, -+0x01,0x57,0x74,0x05,0xf0,0x90,0x9e,0x67,0x74,0x01,0xf0,0x22,0x53,0x64,0xfd,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x01,0xc4,0x74,0xb0,0xf0,0x74,0x45,0xa3, -+0xf0,0x90,0x04,0x1d,0xe0,0x60,0x1a,0x90,0x05,0x22,0xe0,0x54,0x90,0x60,0x07,0x90, -+0x01,0xc6,0xe0,0x44,0x40,0xf0,0x90,0x01,0xc7,0xe0,0x30,0xe1,0xe4,0x7f,0x00,0x80, -+0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82, -+0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0, -+0x05,0xc0,0x06,0xc0,0x07,0x75,0x13,0x00,0x90,0x01,0xc4,0x74,0xe8,0xf0,0x74,0x45, -+0xa3,0xf0,0x53,0x91,0xdf,0x90,0x01,0x3c,0xe0,0x55,0x30,0xf5,0x34,0xa3,0xe0,0x55, -+0x31,0xf5,0x35,0xa3,0xe0,0x55,0x32,0xf5,0x36,0xa3,0xe0,0x55,0x33,0xf5,0x37,0xe5, -+0x34,0x30,0xe0,0x06,0x90,0x01,0x3c,0x74,0x01,0xf0,0xe5,0x34,0x30,0xe1,0x09,0x90, -+0x01,0x3c,0x74,0x02,0xf0,0x12,0x61,0xc9,0xe5,0x34,0x30,0xe2,0x38,0x90,0x01,0x3c, -+0x74,0x04,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe0,0x24,0x90,0x9e,0x85,0xe4,0xf0,0x90, -+0x9e,0x5b,0xe0,0x90,0x9e,0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x91,0x5e, -+0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x80,0x07,0x90,0x9e, -+0x64,0xe4,0xf0,0x91,0xcb,0xe5,0x34,0x30,0xe3,0x38,0x90,0x01,0x3c,0x74,0x08,0xf0, -+0x90,0x06,0x92,0xe0,0x30,0xe1,0x24,0x90,0x9e,0x85,0xe4,0xf0,0x90,0x9e,0x5b,0xe0, -+0x90,0x9e,0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x5e,0x90,0x01,0x5f, -+0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x80,0x07,0x90,0x9e,0x63,0xe4,0xf0, -+0x91,0xcb,0xe5,0x34,0x30,0xe4,0x09,0x90,0x01,0x3c,0x74,0x10,0xf0,0x12,0x4b,0xfb, -+0xe5,0x34,0x30,0xe5,0x09,0x90,0x01,0x3c,0x74,0x20,0xf0,0x12,0x4c,0x3d,0xe5,0x35, -+0x30,0xe0,0x44,0x90,0x01,0x3d,0x74,0x01,0xf0,0x90,0x01,0x2f,0xe0,0x44,0x7f,0xf0, -+0x90,0x00,0x83,0xe0,0x54,0x0f,0xf5,0x13,0xb4,0x01,0x02,0x80,0x1c,0xe5,0x13,0xb4, -+0x02,0x05,0x90,0x00,0x83,0x80,0x12,0xe5,0x13,0xb4,0x04,0x05,0x90,0x00,0x83,0x80, -+0x08,0xe5,0x13,0xb4,0x0c,0x06,0x90,0x00,0x83,0xe0,0xf5,0x62,0x90,0x01,0xbb,0xe5, -+0x62,0xf0,0x12,0x60,0xc0,0x91,0xcb,0xe5,0x35,0x30,0xe2,0x06,0x90,0x01,0x3d,0x74, -+0x04,0xf0,0xe5,0x35,0x30,0xe4,0x06,0x90,0x01,0x3d,0x74,0x10,0xf0,0xe5,0x36,0x30, -+0xe0,0x06,0x90,0x01,0x3e,0x74,0x01,0xf0,0xe5,0x36,0x30,0xe1,0x06,0x90,0x01,0x3e, -+0x74,0x02,0xf0,0x74,0xe8,0x04,0x90,0x01,0xc4,0xf0,0x74,0x45,0xa3,0xf0,0xd0,0x07, -+0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0, -+0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0x90,0x9e,0x98,0xef,0xf0,0xa3,0xed, -+0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xe5,0x63,0x60,0x05,0xe4,0xff,0x12,0x54,0x97,0x90, -+0x9e,0x98,0xe0,0x30,0xe0,0x09,0x90,0x9e,0x9a,0xe4,0xf0,0xa3,0x74,0x80,0xf0,0x90, -+0x9e,0x98,0xe0,0xff,0xc3,0x13,0x90,0xfd,0x10,0xf0,0x90,0x04,0x25,0xef,0xf0,0x90, -+0x9e,0x99,0xe0,0x60,0x1f,0xa3,0xa3,0xe0,0xff,0x24,0x0f,0xf5,0x82,0xe4,0x34,0xfc, -+0xf5,0x83,0xe0,0x44,0x80,0xf0,0x74,0x10,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xe0,0x44,0x80,0xf0,0x90,0x9e,0x9a,0xa3,0xe0,0xff,0xfd,0x24,0x08,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe4,0xf0,0x74,0x09,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xe0,0x54,0xf0,0xf0,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54, -+0xf7,0xf0,0x90,0x9e,0x9a,0xe0,0xfe,0xa3,0xe0,0xff,0x22,0x75,0x28,0x33,0xe4,0xf5, -+0x29,0x75,0x2a,0x07,0xf5,0x2b,0x90,0x01,0x30,0xe5,0x28,0xf0,0xa3,0xe5,0x29,0xf0, -+0xa3,0xe5,0x2a,0xf0,0xa3,0xe5,0x2b,0xf0,0x22,0xe4,0x90,0x9e,0x16,0xf0,0xa3,0xf0, -+0x75,0x8e,0x02,0xf1,0xa1,0xf1,0xe9,0x90,0x9e,0x7e,0xef,0xf0,0xf1,0xdd,0x90,0x9e, -+0x80,0xef,0xf0,0xf1,0xf6,0x90,0x9e,0x75,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xf5,0x57, -+0x12,0x6e,0x77,0xf1,0xd4,0x12,0x60,0x4b,0x12,0x32,0x3d,0xf1,0xc9,0x11,0x0b,0x12, -+0x50,0x0e,0xf1,0xcd,0xf1,0xb1,0x12,0x44,0xff,0xf1,0x45,0x90,0x9e,0x18,0xe5,0xd9, -+0xf0,0x11,0xd0,0xc2,0xaf,0x90,0x00,0x80,0xe0,0x44,0x40,0xf0,0xb1,0x45,0x75,0xe8, -+0x03,0x43,0xa8,0x85,0xd2,0xaf,0x90,0x9e,0x16,0xe0,0x64,0x01,0xf0,0x24,0x29,0x90, -+0x01,0xc4,0xf0,0x74,0x48,0xa3,0xf0,0xe5,0x57,0x30,0xe4,0x0a,0xc2,0xaf,0x53,0x57, -+0xef,0xd2,0xaf,0x12,0x58,0x74,0xe5,0x57,0x30,0xe6,0x17,0xc2,0xaf,0x53,0x57,0xbf, -+0xd2,0xaf,0x12,0x67,0xa1,0x90,0x9e,0x43,0xe0,0xff,0x60,0x03,0xb4,0x01,0x03,0x12, -+0x7b,0x5c,0x90,0x9e,0x43,0xe0,0x70,0x03,0x12,0x7c,0x5f,0x12,0x73,0x85,0x80,0xb6, -+0x90,0x01,0x3c,0x74,0xff,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x01,0x34,0xf0,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x54,0x31,0x05,0x7d,0xff,0x7f,0x55,0x31,0x05,0x7d, -+0xff,0x7f,0x56,0x31,0x05,0x7d,0xff,0x7f,0x57,0x80,0x0a,0xf0,0x90,0x00,0x45,0xe0, -+0x54,0xfe,0xfd,0x7f,0x45,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x8f,0x82,0x75,0x83, -+0x00,0xed,0xf0,0xb1,0x45,0xd0,0xd0,0x92,0xaf,0x22,0xef,0x14,0x60,0x30,0x14,0x60, -+0x66,0x24,0x02,0x60,0x02,0x21,0xc1,0x90,0x9e,0x3f,0x74,0x02,0xf0,0x90,0x00,0x48, -+0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x31,0x05,0x90,0x00,0x47,0xe0,0x44,0x08,0xfd,0x7f, -+0x47,0x31,0x05,0x90,0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0x80,0x71,0xe4,0x90, -+0x9e,0x3f,0xf0,0x90,0x9e,0x3b,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x00,0x45,0xe0,0x44,0xef,0xfd,0x7f,0x45,0x31, -+0x05,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f,0x45,0x31,0x05,0x90,0x00,0x46,0xe0, -+0x44,0x10,0xfd,0x7f,0x46,0x80,0x38,0x90,0x9e,0x3f,0x74,0x01,0xf0,0x90,0x9e,0x45, -+0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9, -+0x90,0x00,0x45,0xe0,0x44,0x20,0xfd,0x7f,0x45,0x31,0x05,0x90,0x00,0x45,0xe0,0x44, -+0x10,0xfd,0x7f,0x45,0x31,0x05,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x31, -+0x05,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x9e,0x41,0xf0,0x90,0x00,0x01,0x12, -+0x42,0x20,0x25,0xe0,0x25,0xe0,0x90,0x9e,0x40,0xf0,0x12,0x29,0xd9,0x25,0xe0,0x25, -+0xe0,0x90,0x9e,0x44,0xf0,0x90,0x05,0x60,0xe0,0x90,0x9e,0x4f,0xf0,0x90,0x05,0x61, -+0xe0,0x90,0x9e,0x50,0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x51,0xf0,0x90,0x05,0x63, -+0xe0,0x90,0x9e,0x52,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf,0x90, -+0x9e,0x40,0xe0,0xff,0x91,0xf0,0x90,0x9e,0x24,0xe0,0x24,0xff,0x92,0xaf,0x90,0x9e, -+0x41,0xe0,0x70,0x02,0x41,0xc8,0x90,0x9e,0x40,0xe0,0x70,0x02,0x41,0xc8,0x90,0x9e, -+0x44,0xe0,0x70,0x02,0x41,0xc8,0xa2,0xaf,0xe4,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf, -+0x90,0x9e,0x53,0x74,0x01,0xf0,0x90,0x9e,0x24,0xe0,0x24,0xff,0x92,0xaf,0x11,0xfc, -+0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46,0x31,0x05,0x90,0x9e,0x39,0xe0,0x60, -+0x15,0x90,0x9e,0x45,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e, -+0x08,0x12,0x2f,0xd9,0x80,0x06,0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x00,0x45,0xe0, -+0x54,0xef,0xfd,0x7f,0x45,0x31,0x05,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x9e, -+0x4f,0xe0,0x90,0x05,0x84,0xf0,0x90,0x9e,0x50,0xe0,0x90,0x05,0x85,0xf0,0x90,0x9e, -+0x51,0xe0,0x90,0x05,0x86,0xf0,0x90,0x9e,0x52,0xe0,0x90,0x05,0x87,0xf0,0xa2,0xaf, -+0xe4,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf,0x90,0x01,0x3c,0xe0,0x44,0x20,0xf0,0x7d, -+0x20,0xe4,0xff,0x12,0x37,0x00,0x80,0x2b,0x90,0x9e,0x41,0xe0,0x70,0x2d,0x90,0x9e, -+0x53,0x11,0xfb,0x90,0x00,0x46,0xe0,0x54,0xfe,0xfd,0x7f,0x46,0x31,0x05,0x90,0x05, -+0x22,0xe4,0xf0,0xa2,0xaf,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf,0x7d,0x20,0xe4,0xff, -+0x12,0x36,0x92,0x90,0x9e,0x24,0xe0,0x24,0xff,0x92,0xaf,0x22,0x8b,0x14,0x8a,0x15, -+0x89,0x16,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x9e,0x42,0xf0,0xe0,0x30,0xe0,0x4b, -+0x90,0x9e,0x39,0x74,0x01,0xf0,0x7f,0x80,0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0x3b, -+0x12,0x2a,0x7f,0xab,0x14,0xaa,0x15,0xa9,0x16,0x90,0x00,0x01,0x12,0x42,0x20,0xff, -+0xe4,0xfc,0xfd,0xfe,0x78,0x1a,0x12,0x2a,0x6c,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab, -+0x07,0x90,0x9e,0x3b,0x12,0x43,0x53,0xec,0x54,0x03,0xfc,0x12,0x43,0x46,0x90,0x9e, -+0x45,0x12,0x2a,0x7f,0x90,0x05,0x22,0xe4,0xf0,0x80,0x2d,0xe4,0x90,0x9e,0x39,0xf0, -+0x7f,0x80,0x7e,0x08,0x12,0x27,0xde,0xec,0x54,0x03,0xfc,0xec,0x44,0xc0,0xfc,0x90, -+0x9e,0x3b,0x12,0x2a,0x7f,0x90,0x9e,0x3b,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x42,0xe0,0x30,0xe1,0x19,0x7d, -+0x0c,0x7f,0x47,0x31,0x05,0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x31,0x05, -+0x90,0x00,0x46,0xe0,0x44,0x10,0x80,0x1c,0x90,0x00,0x47,0xe0,0x54,0xf3,0xfd,0x7f, -+0x47,0x31,0x05,0x90,0x00,0x48,0xe0,0x54,0xf3,0xfd,0x7f,0x48,0x31,0x05,0x90,0x00, -+0x46,0xe0,0x54,0xef,0xfd,0x7f,0x46,0x31,0x05,0xe4,0x90,0x9e,0x3f,0xf0,0x22,0x90, -+0x01,0x30,0xe4,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x01,0x38,0xf0,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x50,0x31,0x05,0xe4,0xfd,0x7f,0x51,0x31,0x05,0xe4, -+0xfd,0x7f,0x52,0x31,0x05,0xe4,0xfd,0x7f,0x53,0x21,0x05,0xe5,0x65,0x64,0x01,0x70, -+0x3b,0xd1,0x85,0xbf,0x01,0x04,0x7f,0x01,0xd1,0x79,0x90,0x00,0x46,0xe0,0x44,0x04, -+0xfd,0x7f,0x46,0x31,0x05,0x90,0x00,0x44,0xe0,0x54,0xfb,0xfd,0x7f,0x44,0x31,0x05, -+0x90,0x00,0x46,0xe0,0x54,0xfb,0xfd,0x7f,0x46,0x31,0x05,0x7f,0x02,0xd1,0xa1,0x8f, -+0x69,0x90,0x01,0xc9,0xe5,0x69,0xf0,0xb4,0x01,0x02,0xd1,0x19,0x22,0x90,0x9e,0x41, -+0xe0,0x64,0x01,0x60,0x02,0x81,0xef,0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46, -+0x31,0x05,0x90,0x9e,0x53,0xe0,0x70,0x31,0x90,0x9e,0x39,0xe0,0x60,0x15,0x90,0x9e, -+0x45,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f, -+0xd9,0x80,0x06,0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x9e,0x40,0xe0,0xff,0x91,0xf0, -+0x90,0x9e,0x53,0x74,0x01,0x11,0xfb,0x80,0x3f,0x90,0x9e,0x53,0xe0,0x64,0x01,0x70, -+0x37,0x90,0x9e,0x44,0xe0,0xff,0x91,0xf0,0xe4,0x90,0x9e,0x53,0xf0,0x90,0x00,0x45, -+0xe0,0x44,0x01,0xfd,0x7f,0x45,0x31,0x05,0x90,0x9e,0x39,0xe0,0x60,0x15,0x90,0x9e, -+0x3b,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f, -+0xd9,0x80,0x05,0x90,0x05,0x22,0xe4,0xf0,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90, -+0x9e,0x4f,0xe0,0x90,0x05,0x84,0xf0,0x90,0x9e,0x50,0xe0,0x90,0x05,0x85,0xf0,0x90, -+0x9e,0x51,0xe0,0x90,0x05,0x86,0xf0,0x90,0x9e,0x52,0xe0,0x90,0x05,0x87,0xf0,0x22, -+0x90,0x05,0x60,0xe0,0x90,0x9e,0x4f,0xf0,0x90,0x05,0x61,0xe0,0x90,0x9e,0x50,0xf0, -+0x90,0x05,0x62,0xe0,0x90,0x9e,0x51,0xf0,0x90,0x05,0x63,0xe0,0x90,0x9e,0x52,0xf0, -+0xc3,0x74,0xff,0x9f,0xfe,0x90,0x9e,0x50,0xe0,0xd3,0x9e,0x40,0x1e,0xe0,0x2f,0xf0, -+0xa3,0xe0,0xb4,0xff,0x0f,0xe4,0xf0,0xa3,0xe0,0xb4,0xff,0x03,0xe4,0xf0,0x22,0x90, -+0x9e,0x52,0x80,0x03,0x90,0x9e,0x51,0xe0,0x04,0xf0,0x22,0x90,0x9e,0x50,0xe0,0x2f, -+0xf0,0x22,0xe0,0x5f,0xf0,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x7f,0x10,0xdf,0xfe, -+0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x2a,0xed, -+0xf0,0x90,0x9e,0x29,0xef,0xf0,0xd3,0x94,0x07,0x50,0x4e,0xa3,0xe0,0x70,0x1a,0x90, -+0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4, -+0xff,0x90,0x00,0x47,0xe0,0x5f,0xf0,0x80,0x17,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01, -+0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x47,0xe0,0x4f,0xf0, -+0xb1,0x45,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0x80,0x59,0x90,0x9e,0x29,0xe0,0x24,0xf8,0xf0, -+0xa3,0xe0,0x70,0x1d,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02, -+0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0x80, -+0x1a,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8, -+0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0xb1,0x45,0x90,0x9e,0x29, -+0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90, -+0x00,0x43,0xb1,0x42,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x49,0xe0,0x90,0x9e,0xb1, -+0xf0,0xe0,0x54,0x0f,0xf0,0x44,0xf0,0xfd,0x7f,0x49,0x31,0x05,0x90,0x9e,0xb1,0xe0, -+0x44,0xb0,0xfd,0x7f,0x49,0x21,0x05,0x90,0x9e,0x27,0xee,0xf0,0xa3,0xef,0xf0,0x75, -+0x65,0x01,0x8e,0x66,0xf5,0x67,0xe4,0xfd,0x7f,0x0b,0xb1,0x55,0xe4,0xfd,0x7f,0x02, -+0xb1,0x55,0xd1,0x85,0xe4,0xff,0xd1,0x79,0xe4,0xf5,0x69,0x90,0x01,0xc9,0xe5,0x69, -+0xf0,0x90,0x9e,0x27,0xe0,0xfc,0xa3,0xe0,0xfd,0xec,0xfb,0x8d,0x44,0xe4,0xf5,0x45, -+0x7d,0x01,0x7f,0x60,0x7e,0x01,0x02,0x35,0xab,0x90,0x01,0xca,0xe5,0x68,0xf0,0xef, -+0x60,0x02,0xd1,0x19,0x22,0x7f,0x0b,0xd1,0xa1,0xef,0x65,0x68,0x60,0x10,0xe5,0x68, -+0xb4,0x01,0x05,0xe4,0xf5,0x68,0x80,0x03,0x75,0x68,0x01,0x7f,0x01,0x22,0x7f,0x00, -+0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0xb2,0xef,0xf0,0xd3,0x94,0x07, -+0x50,0x43,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4, -+0xff,0x90,0x00,0x46,0xb1,0x42,0x90,0x9e,0xb2,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8, -+0x05,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x44,0xe0, -+0xfb,0xe4,0xfe,0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13, -+0xd8,0xf8,0xff,0x80,0x4b,0x90,0x9e,0xb2,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01, -+0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f, -+0xf0,0xb1,0x45,0x90,0x9e,0xb2,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8,0x05,0x08,0x80, -+0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x42,0xe0,0xfb,0xe4,0xfe, -+0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13,0xd8,0xf8,0xff, -+0xd0,0xd0,0x92,0xaf,0x22,0xe4,0xfd,0x7f,0x45,0x31,0x05,0x90,0x04,0xfd,0xe4,0xf0, -+0xa3,0xf0,0x90,0x9e,0x43,0xf0,0x90,0x9e,0x49,0xf0,0x90,0x9e,0x4c,0xf0,0x90,0x9e, -+0x4a,0xf0,0x90,0x9e,0x4d,0xf0,0x90,0x9e,0x4b,0xf0,0x90,0x9e,0x4e,0xf0,0x90,0x9e, -+0x35,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x9e,0x3a,0xf0,0x90,0x9e, -+0x3f,0xf0,0x90,0x9e,0x41,0xf0,0x90,0x9e,0x53,0xf0,0x90,0x9e,0x44,0xf0,0x90,0x9e, -+0x40,0xf0,0x90,0x9e,0x39,0xf0,0x90,0x00,0x51,0xe0,0x44,0xc0,0xfd,0x7f,0x51,0x21, -+0x05,0xe4,0x90,0x9e,0x7d,0xf0,0x90,0x00,0x80,0xe0,0x44,0x80,0xfd,0x7f,0x80,0x21, -+0x05,0x75,0x30,0x1f,0x75,0x31,0x01,0xe4,0xf5,0x32,0x90,0x01,0x38,0xe5,0x30,0xf0, -+0xa3,0xe5,0x31,0xf0,0xa3,0xe5,0x32,0xf0,0x22,0xe4,0xf5,0x68,0x22,0x90,0x01,0x64, -+0x74,0xa0,0xf0,0x22,0x90,0x9e,0x80,0xe0,0x90,0x9e,0x0f,0xf0,0x22,0x90,0x00,0xf3, -+0xe0,0x7f,0x00,0x30,0xe3,0x02,0x7f,0x01,0x22,0x90,0x00,0x02,0xe0,0x54,0xe0,0x7f, -+0x01,0x60,0x02,0x7f,0x00,0x22,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x0c,0x90,0x00,0xf2, -+0xe0,0x30,0xe7,0x05,0x7e,0xfd,0x7f,0x33,0x22,0x7e,0xfd,0x7f,0x2f,0x22,0x90,0x00, -+0xf3,0xe0,0x30,0xe2,0x0d,0x90,0x05,0x41,0x74,0x10,0xf0,0x90,0x05,0x5a,0xf0,0xa3, -+0xe4,0xf0,0x22,0x90,0x01,0x02,0xe0,0x54,0x03,0xff,0xe0,0x54,0x0c,0x13,0x13,0x54, -+0x3f,0xfe,0xef,0x64,0x01,0x60,0x04,0xef,0xb4,0x03,0x10,0x90,0x9e,0x10,0x74,0x01, -+0xf0,0xa3,0x74,0x37,0xf0,0xa3,0x74,0x01,0xf0,0x80,0x1a,0xee,0x64,0x01,0x60,0x07, -+0xaf,0x06,0xee,0x64,0x03,0x70,0x49,0x90,0x9e,0x10,0x74,0x01,0xf0,0xa3,0x74,0x3d, -+0xf0,0xa3,0x74,0x40,0xf0,0x90,0x9e,0x10,0xe0,0xfe,0xa3,0xe0,0xff,0xf5,0x82,0x8e, -+0x83,0xe0,0xfd,0x90,0x9e,0x12,0xe0,0xfc,0xed,0x5c,0x60,0x0c,0x8f,0x82,0x8e,0x83, -+0xec,0xf0,0xe4,0x90,0x9e,0x77,0xf0,0x22,0x90,0x9e,0x77,0xe0,0x04,0xf0,0xe0,0xc3, -+0x94,0x0a,0x40,0x0c,0xe4,0xf0,0x90,0x04,0x19,0xe0,0x30,0xe0,0x03,0x12,0x44,0xea, -+0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00, -+0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01, -+0xc4,0x74,0xa1,0xf0,0x74,0x50,0xa3,0xf0,0x90,0x01,0x34,0xe0,0x55,0x28,0xf5,0x2c, -+0xa3,0xe0,0x55,0x29,0xf5,0x2d,0xa3,0xe0,0x55,0x2a,0xf5,0x2e,0xa3,0xe0,0x55,0x2b, -+0xf5,0x2f,0xe5,0x2c,0x20,0xe0,0x02,0x41,0x46,0x90,0x01,0x34,0x74,0x01,0xf0,0x85, -+0xd1,0x4d,0x85,0xd2,0x4e,0x85,0xd3,0x4f,0x85,0xd4,0x50,0x85,0xd5,0x51,0x85,0xd6, -+0x52,0x85,0xd7,0x53,0x85,0xd9,0x54,0xe5,0x54,0x54,0x40,0xc3,0x13,0xff,0xe5,0x53, -+0x54,0x20,0x6f,0x70,0x02,0x21,0xf5,0xe5,0x54,0x30,0xe5,0x02,0x21,0xf5,0xe5,0x52, -+0x54,0x3f,0xf5,0x08,0xe5,0x4d,0x54,0x3f,0xf5,0x09,0xe5,0x51,0x54,0x1f,0xff,0xe5, -+0x08,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0x8f,0xf0,0x12, -+0x42,0x81,0xe5,0x53,0x54,0x1f,0xff,0xe5,0x08,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4, -+0x34,0x93,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x09,0xd3,0x94,0x04,0x40, -+0x03,0x75,0x09,0x04,0x75,0xf0,0x0a,0xe5,0x08,0x90,0x90,0x00,0x12,0x43,0x5f,0x75, -+0xf0,0x02,0xe5,0x09,0x12,0x43,0x5f,0xe0,0xfe,0xa3,0xe0,0xff,0xe5,0x53,0x54,0x1f, -+0x2f,0xff,0xe4,0x3e,0xfe,0x75,0xf0,0x0a,0xe5,0x08,0x90,0x90,0x00,0x12,0x43,0x5f, -+0x75,0xf0,0x02,0xe5,0x09,0x12,0x43,0x5f,0xee,0xf0,0xa3,0xef,0xf0,0xe5,0x54,0x20, -+0xe6,0x24,0xe5,0x53,0x54,0x1f,0xff,0xe5,0x08,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4, -+0x34,0x98,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x4f,0x30,0xe7,0x36,0xaf, -+0x08,0x12,0x63,0x51,0x80,0x2f,0xe5,0x53,0x54,0x1f,0xff,0xe5,0x08,0x25,0xe0,0x24, -+0x44,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x4f, -+0x30,0xe7,0x12,0xe5,0x4f,0x54,0x7f,0xfd,0xe5,0x53,0x54,0x1f,0xf5,0x0d,0xab,0x09, -+0xaf,0x08,0x12,0x62,0xee,0xe5,0x63,0x14,0x24,0xfd,0x50,0x02,0x80,0x48,0x90,0x9e, -+0x66,0xe0,0x60,0x3a,0x90,0x01,0x5b,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x04,0xf0,0x71, -+0xc3,0xef,0x64,0x01,0x70,0x30,0x90,0x9e,0x85,0xf0,0x90,0x9e,0x5b,0xe0,0x90,0x9e, -+0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44,0x5e,0x90,0x01,0x5b,0x74, -+0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x90,0x9e,0x64,0xf0,0x80,0x08,0x71,0xc3, -+0xbf,0x01,0x03,0x12,0x44,0xcb,0xe5,0x2c,0x30,0xe1,0x20,0x90,0x01,0x34,0x74,0x02, -+0xf0,0x85,0xd1,0x58,0x85,0xd2,0x59,0x85,0xd3,0x5a,0x85,0xd4,0x5b,0x85,0xd5,0x5c, -+0x85,0xd6,0x5d,0x85,0xd7,0x5e,0x85,0xd9,0x5f,0x71,0xd2,0xe5,0x2c,0x30,0xe3,0x06, -+0x90,0x01,0x34,0x74,0x08,0xf0,0xe5,0x2c,0x30,0xe4,0x09,0x90,0x01,0x34,0x74,0x10, -+0xf0,0x43,0x57,0x10,0xe5,0x2c,0x30,0xe5,0x26,0x90,0x01,0xcf,0xe0,0x30,0xe5,0x1f, -+0xe0,0x54,0xdf,0xf0,0x90,0x01,0x34,0x74,0x20,0xf0,0x75,0xa8,0x00,0x75,0xe8,0x00, -+0x12,0x4b,0xcf,0x90,0x00,0x03,0xe0,0x54,0xfb,0xf0,0x12,0x4d,0x45,0x80,0xfe,0xe5, -+0x2c,0x30,0xe6,0x06,0x90,0x01,0x34,0x74,0x40,0xf0,0xe5,0x2e,0x30,0xe0,0x12,0x90, -+0x9e,0x7f,0x74,0x01,0xf0,0x90,0x01,0x36,0xf0,0x12,0x61,0x4e,0x90,0x9e,0x7f,0xe4, -+0xf0,0xe5,0x2e,0x30,0xe1,0x0b,0x90,0x01,0x36,0x74,0x02,0xf0,0x43,0x57,0x40,0x11, -+0x23,0xe5,0x2e,0x30,0xe2,0x09,0x90,0x01,0x36,0x74,0x04,0xf0,0x12,0x60,0xdf,0xe5, -+0x2e,0x30,0xe3,0x28,0x90,0x01,0x36,0x74,0x08,0xf0,0xe5,0x60,0x64,0x01,0x70,0x1c, -+0xe5,0x63,0x60,0x18,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90, -+0x9e,0x85,0xe4,0x12,0x44,0x4e,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x2e,0x30,0xe4, -+0x2b,0x90,0x01,0x36,0x74,0x10,0xf0,0xe5,0x60,0xb4,0x01,0x20,0xe5,0x63,0x60,0x1c, -+0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x9e,0x67,0xe4,0xf0, -+0x53,0x64,0xfd,0xe5,0x64,0x54,0x07,0x70,0x03,0x12,0x44,0xcb,0xe5,0x2e,0x30,0xe5, -+0x1f,0x90,0x01,0x36,0x74,0x20,0xf0,0xe5,0x60,0xb4,0x01,0x14,0xe5,0x63,0x60,0x10, -+0x90,0x9e,0x66,0xe0,0x64,0x02,0x60,0x05,0x12,0x44,0xd2,0x80,0x03,0x12,0x44,0x79, -+0xe5,0x2e,0x30,0xe6,0x1b,0x90,0x01,0x36,0x74,0x40,0xf0,0xe5,0x60,0xb4,0x01,0x10, -+0xe5,0x63,0x60,0x0c,0x53,0x64,0xfe,0xe5,0x64,0x54,0x07,0x70,0x03,0x12,0x44,0xcb, -+0xe5,0x2f,0x30,0xe1,0x08,0x90,0x01,0x37,0x74,0x02,0xf0,0x91,0x64,0x74,0xa1,0x04, -+0x90,0x01,0xc4,0xf0,0x74,0x50,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0,0x04, -+0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0,0xf0, -+0xd0,0xe0,0x32,0x90,0x04,0x1b,0xe0,0x54,0x7f,0x64,0x7f,0x7f,0x01,0x60,0x02,0x7f, -+0x00,0x22,0x90,0x9e,0x10,0xe0,0x54,0xf0,0x44,0x03,0xf0,0x54,0x0f,0x44,0x80,0xf0, -+0x7b,0x00,0x7a,0x00,0x79,0x58,0x90,0x9e,0x90,0x12,0x43,0x8b,0x0b,0x7a,0x9e,0x79, -+0x10,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x8d,0x12,0x43,0x8b,0x90,0x9e, -+0xb0,0xe0,0xff,0x04,0xf0,0x90,0x00,0x01,0xef,0x12,0x42,0x5f,0x7f,0xaf,0x7e,0x01, -+0x12,0x71,0x7a,0xef,0x60,0x49,0x90,0x9e,0x8d,0x12,0x43,0x6b,0x8b,0x23,0x8a,0x24, -+0x89,0x25,0x75,0x26,0x02,0x7b,0x01,0x7a,0x01,0x79,0xa0,0x12,0x45,0x09,0x90,0x9e, -+0x90,0x12,0x43,0x6b,0x8b,0x23,0x8a,0x24,0x89,0x25,0x90,0x9e,0x8d,0x12,0x43,0x6b, -+0x12,0x29,0xd9,0xff,0xc4,0x54,0x0f,0xf5,0x26,0x7b,0x01,0x7a,0x01,0x79,0xa2,0x12, -+0x45,0x09,0x90,0x01,0xaf,0x74,0xff,0xf0,0x90,0x01,0xcb,0xe0,0x64,0x80,0xf0,0xd0, -+0xd0,0x92,0xaf,0x22,0x90,0x9e,0xa0,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x63, -+0x14,0x24,0xfd,0x50,0x02,0x80,0x1f,0x90,0x9e,0x66,0xe0,0x60,0x06,0x7d,0x01,0x7f, -+0x0c,0x80,0x0d,0xe5,0x61,0x54,0x0f,0xc3,0x94,0x04,0x50,0x06,0x7d,0x01,0x7f,0x04, -+0x91,0xe7,0xe4,0xff,0x91,0x97,0x22,0xef,0x60,0x0b,0x90,0x9e,0x80,0xe0,0xb4,0x01, -+0x10,0xe4,0xff,0x80,0x09,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x05,0x7f,0x01,0x12,0x75, -+0xa5,0x22,0x90,0x01,0x37,0x74,0x02,0xf0,0x90,0x05,0x22,0x74,0xff,0xf0,0x12,0x74, -+0x12,0xef,0x70,0x06,0x90,0x01,0xc8,0x74,0xfd,0xf0,0x7d,0x02,0x7f,0x03,0x12,0x36, -+0xe6,0xe5,0x63,0x60,0x04,0x7f,0x01,0x91,0x97,0x12,0x74,0xd2,0x53,0x61,0xf0,0x43, -+0x61,0x02,0x22,0x7d,0x01,0x7f,0x0c,0x8f,0x6a,0x8d,0x6b,0xe5,0x6a,0x54,0x0f,0xff, -+0xe5,0x61,0x54,0x0f,0x6f,0x60,0x65,0xe5,0x6a,0x30,0xe2,0x28,0xe5,0x61,0x20,0xe2, -+0x04,0x7f,0x01,0xd1,0xc2,0xe5,0x61,0x30,0xe3,0x0c,0xe5,0x6a,0x20,0xe3,0x07,0xb1, -+0x5d,0xef,0x60,0x48,0xa1,0xa5,0xe5,0x61,0x20,0xe3,0x41,0xe5,0x6a,0x30,0xe3,0x3c, -+0xaf,0x6b,0xc1,0xdc,0xe5,0x61,0x54,0x0f,0xff,0xbf,0x0c,0x0c,0xe5,0x6a,0x20,0xe3, -+0x07,0xb1,0x5d,0xef,0x60,0x26,0xb1,0xa5,0xe5,0x61,0x54,0x0f,0xff,0xbf,0x04,0x0c, -+0xe5,0x6a,0x20,0xe2,0x07,0xf1,0x21,0xef,0x60,0x12,0x91,0xb2,0xe5,0x61,0x54,0x0f, -+0xff,0xbf,0x02,0x08,0x12,0x60,0xbd,0xef,0x60,0x02,0xd1,0xaf,0x22,0x71,0xc3,0xef, -+0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x30,0x90,0x9e,0x64,0xe0, -+0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x22,0x90,0x9e,0x63,0xe0,0x60,0x08, -+0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x14,0xe5,0x62,0x54,0x0f,0xd3,0x94,0x04,0x40, -+0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74, -+0x08,0xf0,0x7f,0x00,0x22,0x90,0x06,0x04,0xe0,0x44,0x40,0xf0,0xe5,0x60,0xb4,0x01, -+0x04,0x7f,0x01,0xd1,0xf6,0x53,0x61,0xf0,0x43,0x61,0x04,0x22,0xef,0x64,0x01,0x70, -+0x2e,0x7d,0x78,0x7f,0x02,0x12,0x36,0x75,0x7d,0x02,0x7f,0x03,0x12,0x36,0x75,0x90, -+0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x91,0xe3,0xe4,0xff,0x91,0x97, -+0x90,0x06,0x04,0xe0,0x54,0x7f,0xf0,0x90,0x06,0x0a,0xe0,0x54,0xf8,0xf0,0x22,0x90, -+0x01,0x36,0x74,0x7b,0xf0,0xa3,0x74,0x02,0xf0,0x7d,0x7b,0xff,0x12,0x36,0xe6,0x7d, -+0x02,0x7f,0x03,0x12,0x36,0xe6,0x90,0x06,0x04,0xe0,0x44,0x80,0xf0,0x90,0x06,0x0a, -+0xe0,0x44,0x07,0xf0,0x12,0x62,0x4c,0xe5,0x60,0x20,0xe0,0x05,0xe4,0x90,0x9e,0x58, -+0xf0,0x22,0x8b,0x14,0x8a,0x15,0x89,0x16,0x12,0x60,0xb1,0xab,0x14,0xaa,0x15,0xa9, -+0x16,0x12,0x29,0xd9,0xf5,0x63,0x14,0x60,0x0e,0x14,0x60,0x1e,0x14,0x60,0x2f,0x24, -+0x03,0x70,0x40,0x7f,0x01,0x80,0x3a,0xab,0x14,0xaa,0x15,0xa9,0x16,0x90,0x00,0x02, -+0x12,0x42,0x20,0xfd,0xe4,0xff,0xd1,0x84,0x80,0x27,0xab,0x14,0xaa,0x15,0xa9,0x16, -+0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x01,0xd1,0x84,0x1f,0x80,0x13,0xab,0x14, -+0xaa,0x15,0xa9,0x16,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x02,0xd1,0x84,0xe4, -+0xff,0xb1,0xbc,0x22,0xef,0x24,0xfe,0x60,0x0b,0x04,0x70,0x22,0x90,0x9e,0x65,0x74, -+0x01,0xf0,0x80,0x16,0xed,0x70,0x0a,0x90,0x9e,0x62,0xe0,0x90,0x9e,0x65,0xf0,0x80, -+0x05,0x90,0x9e,0x65,0xed,0xf0,0x90,0x9e,0x65,0xe0,0x90,0x9e,0x56,0xf0,0x22,0x53, -+0x61,0xf0,0x43,0x61,0x01,0x12,0x45,0x00,0x12,0x45,0x01,0x53,0x61,0xf0,0x43,0x61, -+0x02,0x22,0x90,0x9e,0xaf,0xef,0xf0,0x12,0x74,0x53,0x90,0x9e,0xaf,0xe0,0x60,0x05, -+0x90,0x05,0x22,0xe4,0xf0,0x53,0x61,0xf0,0x43,0x61,0x04,0x22,0x90,0x06,0x04,0xe0, -+0x54,0xbf,0xf0,0xef,0x60,0x09,0xe5,0x60,0xb4,0x01,0x04,0xe4,0xff,0xd1,0xf6,0x53, -+0x61,0xf0,0x43,0x61,0x0c,0x22,0x8f,0x27,0x12,0x45,0xb0,0xbf,0x01,0x22,0x90,0x9e, -+0x7a,0xe0,0xff,0x7d,0x01,0x12,0x47,0x79,0xab,0x07,0xaa,0x06,0xad,0x03,0xac,0x02, -+0xaf,0x27,0x12,0x60,0x2a,0xaf,0x03,0x12,0x5f,0xf7,0x90,0x04,0x1f,0x74,0x20,0xf0, -+0x22,0x71,0xc3,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x58, -+0xe5,0x64,0x54,0x03,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x4a,0xe5,0x62, -+0x54,0x0f,0xd3,0x94,0x02,0x40,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x39,0xe5, -+0x64,0x30,0xe2,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x2c,0xe5,0x64,0x30,0xe4, -+0x08,0x90,0x01,0xb9,0x74,0x10,0xf0,0x80,0x1f,0x90,0x9e,0x58,0xe0,0x60,0x08,0x90, -+0x01,0xb9,0x74,0x20,0xf0,0x80,0x11,0x90,0x9e,0x5e,0xe0,0x60,0x08,0x90,0x01,0xb9, -+0x74,0x80,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74,0x04,0xf0,0x7f,0x00, -+0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00, -+0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01, -+0xc4,0x74,0x91,0xf0,0x74,0x57,0xa3,0xf0,0x53,0x91,0xef,0x90,0x00,0x51,0xe0,0xff, -+0x90,0x00,0x55,0xe0,0x5f,0xf5,0x3d,0x90,0x00,0x52,0xe0,0xff,0x90,0x00,0x56,0xe0, -+0x5f,0xf5,0x3e,0xe5,0x3d,0x30,0xe4,0x06,0x90,0x00,0x55,0x74,0x10,0xf0,0xe5,0x3d, -+0x30,0xe5,0x06,0x90,0x00,0x55,0x74,0x20,0xf0,0xe5,0x3d,0x30,0xe6,0x1b,0x90,0x00, -+0x55,0x74,0x40,0xf0,0x90,0x9e,0x42,0xe0,0x54,0x03,0xff,0xbf,0x03,0x0b,0x90,0x9e, -+0x3f,0xe0,0x60,0x05,0x7f,0x01,0x12,0x49,0x1a,0xe5,0x3d,0x30,0xe7,0x15,0x90,0x00, -+0x55,0x74,0x80,0xf0,0x90,0x9e,0x42,0xe0,0x54,0x03,0xff,0xbf,0x03,0x05,0x7f,0x02, -+0x12,0x49,0x1a,0xe5,0x3e,0x30,0xe0,0x06,0x90,0x00,0x56,0x74,0x01,0xf0,0xe5,0x3e, -+0x30,0xe1,0x06,0x90,0x00,0x56,0x74,0x02,0xf0,0xe5,0x3e,0x30,0xe2,0x06,0x90,0x00, -+0x56,0x74,0x04,0xf0,0xe5,0x3e,0x30,0xe3,0x06,0x90,0x00,0x56,0x74,0x08,0xf0,0x90, -+0x01,0xc4,0x74,0x91,0xf0,0x74,0x57,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0, -+0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0, -+0xf0,0xd0,0xe0,0x32,0x90,0x01,0xcc,0xe0,0x54,0x0f,0x90,0x9e,0x19,0xf0,0x90,0x9e, -+0x19,0xe0,0xfd,0x70,0x02,0x21,0xb5,0x90,0x9e,0xae,0xe0,0xff,0x74,0x01,0x7e,0x00, -+0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xef,0x5d,0x70, -+0x02,0x21,0xae,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd0,0x12,0x43,0x5f, -+0xe0,0x90,0x9e,0x1a,0xf0,0x75,0x23,0x01,0x75,0x24,0x9e,0x75,0x25,0x1a,0x75,0x26, -+0x01,0x7b,0x01,0x7a,0x9e,0x79,0x1b,0x12,0x45,0x09,0x90,0x9e,0x1b,0xe0,0xff,0xc4, -+0x13,0x13,0x13,0x54,0x01,0x90,0x9e,0xae,0x30,0xe0,0x59,0xe0,0x75,0xf0,0x02,0x90, -+0x00,0x88,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1c,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0, -+0x02,0x90,0x00,0x89,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1d,0xf0,0x90,0x9e,0xae,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd1,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1e,0xf0,0x90,0x9e, -+0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1f,0xf0, -+0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x5f,0xe0,0x90,0x9e, -+0x20,0xf0,0x80,0x33,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd1,0x12,0x43,0x5f,0xe0,0x90, -+0x9e,0x1c,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x5f, -+0xe0,0x90,0x9e,0x1d,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12, -+0x43,0x5f,0xe0,0x90,0x9e,0x1e,0xf0,0xef,0x54,0x7f,0xff,0x7b,0x01,0x7a,0x9e,0x79, -+0x1c,0x31,0xb6,0x90,0x9e,0x19,0xe0,0xff,0x90,0x9e,0xae,0xe0,0xfe,0x74,0x01,0xa8, -+0x06,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0x5f,0x90,0x9e,0x19,0xf0,0x90,0x9e, -+0xae,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0x90,0x01, -+0xcc,0xf0,0x90,0x9e,0xae,0xe0,0x04,0xf0,0xe0,0x54,0x03,0xf0,0x01,0x7e,0x90,0x01, -+0xc6,0xe0,0x44,0x02,0xf0,0x22,0x90,0x9e,0x21,0x12,0x43,0x8b,0xef,0x12,0x43,0x94, -+0x59,0xfc,0x01,0x59,0xf4,0x02,0x5a,0x20,0x03,0x5a,0x29,0x05,0x5a,0x32,0x06,0x5a, -+0x7e,0x07,0x5a,0x3a,0x09,0x5a,0x43,0x0b,0x5a,0x4c,0x0c,0x5a,0x55,0x0d,0x5a,0x5e, -+0x0e,0x5a,0x67,0x1b,0x5a,0x6f,0x1c,0x5a,0x05,0x2d,0x5a,0x0e,0x2e,0x5a,0x17,0x3b, -+0x00,0x00,0x5a,0x77,0x90,0x9e,0x21,0x12,0x43,0x6b,0xe1,0xe9,0x90,0x9e,0x21,0x12, -+0x43,0x6b,0x02,0x71,0xd0,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x72,0x0b,0x90,0x9e, -+0x21,0x12,0x43,0x6b,0x02,0x72,0x53,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x72,0x8c, -+0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x72,0xb6,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02, -+0x70,0x4a,0x90,0x9e,0x21,0x12,0x43,0x6b,0x80,0x45,0x90,0x9e,0x21,0x12,0x43,0x6b, -+0x02,0x72,0xfe,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x70,0xa2,0x90,0x9e,0x21,0x12, -+0x43,0x6b,0x02,0x49,0xc2,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x7b,0x29,0x90,0x9e, -+0x21,0x12,0x43,0x6b,0x02,0x4a,0xfc,0x90,0x9e,0x21,0x12,0x43,0x6b,0xe1,0xef,0x90, -+0x9e,0x21,0x12,0x43,0x6b,0xe1,0xd1,0x90,0x01,0xc6,0xe0,0x44,0x01,0xf0,0x22,0x90, -+0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x1f,0xfe,0xef,0x54,0x20,0xc4,0x13,0x54,0x07, -+0xfd,0xaf,0x06,0x90,0x9e,0x24,0xef,0xf0,0xa3,0xed,0xf0,0xa3,0x12,0x43,0x8b,0x90, -+0x9e,0x26,0x12,0x43,0x6b,0x90,0x00,0x03,0x12,0x42,0x20,0x54,0xf0,0xc4,0x54,0x0f, -+0x90,0x9e,0x29,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0x54,0x40,0xc4,0x13,0x13,0x54, -+0x03,0x90,0x9e,0x2a,0xf0,0x90,0x9e,0x24,0xe0,0xff,0x75,0xf0,0x09,0x90,0x96,0x46, -+0x12,0x43,0x5f,0xad,0x82,0xac,0x83,0x90,0x9e,0x2b,0xec,0xf0,0xa3,0xed,0xf0,0xef, -+0x75,0xf0,0x09,0xa4,0x24,0x44,0xf9,0x74,0x96,0x35,0xf0,0xfa,0x7b,0x01,0xa3,0x12, -+0x43,0x8b,0x90,0x9e,0x26,0x12,0x43,0x6b,0x90,0x00,0x03,0x12,0x42,0x20,0x54,0x0f, -+0xff,0x90,0x9e,0x2d,0x12,0x43,0x6b,0xef,0x12,0x42,0x4d,0x90,0x9e,0x26,0x12,0x43, -+0x6b,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x90,0x9e,0x2d,0x12,0x43,0x6b,0x90,0x00, -+0x01,0xef,0x12,0x42,0x5f,0x90,0x9e,0x26,0x12,0x43,0x6b,0x90,0x00,0x01,0x12,0x42, -+0x20,0xff,0x90,0x9e,0x2b,0xe0,0xfc,0xa3,0xe0,0xfd,0xf5,0x82,0x8c,0x83,0xef,0xf0, -+0x12,0x29,0xd9,0x8d,0x82,0x8c,0x83,0xa3,0xf0,0x90,0x9e,0x29,0xe0,0xfe,0x90,0x9e, -+0x24,0xe0,0xff,0x24,0x82,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0x90,0x9e, -+0x25,0xe0,0xfe,0x75,0xf0,0x09,0xef,0x90,0x96,0x4a,0x12,0x43,0x5f,0xee,0xf0,0x75, -+0xf0,0x09,0xef,0x90,0x96,0x4b,0x12,0x43,0x5f,0x74,0x01,0xf0,0x90,0x9e,0x2a,0xe0, -+0xfe,0x75,0xf0,0x09,0xef,0x90,0x96,0x4c,0x12,0x43,0x5f,0xee,0xf0,0x8f,0x14,0xef, -+0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xaf,0x82,0xf5,0x16,0x8f,0x17,0xe5, -+0x14,0x75,0xf0,0x02,0xa4,0x24,0x02,0xf9,0x74,0x95,0x35,0xf0,0x75,0x18,0x01,0xf5, -+0x19,0x89,0x1a,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x46,0x12,0x43,0x5f,0xaf,0x82, -+0x85,0x83,0x1b,0x8f,0x1c,0xe5,0x14,0x75,0xf0,0x09,0xa4,0x24,0x44,0xf9,0x74,0x96, -+0x35,0xf0,0x75,0x1d,0x01,0xf5,0x1e,0x89,0x1f,0x74,0x82,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xe0,0x12,0x43,0x94,0x5c,0x0d,0x00,0x5c,0x22,0x01,0x5c,0x37, -+0x02,0x5c,0x4c,0x03,0x5c,0x75,0x04,0x5c,0x8a,0x05,0x5c,0x9f,0x06,0x5c,0xc5,0x0c, -+0x5c,0xf2,0x0d,0x5d,0x1f,0x0e,0x5d,0x4c,0x0f,0x00,0x00,0x5d,0x80,0xe5,0x14,0x25, -+0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0x74,0x15, -+0x80,0x3c,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74, -+0xf0,0xf0,0xa3,0x74,0x10,0x80,0x27,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4, -+0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0x74,0x05,0x80,0x12,0xe5,0x14,0x25,0xe0, -+0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0xe4,0xf0,0xe5, -+0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0x74,0x0f,0xf0,0xa3, -+0x74,0x8f,0xf0,0xa1,0x80,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b, -+0xf5,0x83,0x74,0x0f,0xf0,0xa3,0x74,0xf5,0x80,0x27,0xe5,0x14,0x25,0xe0,0x24,0xc6, -+0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0x0f,0xf0,0xa3,0x74,0xf0,0x80,0x12,0xe5, -+0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0,0xa3,0x74, -+0x0d,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe4, -+0xf0,0xa3,0xf0,0xa1,0x80,0x90,0x04,0x47,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12, -+0x42,0x4d,0x90,0x04,0x46,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x01,0x12, -+0x42,0x5f,0x90,0x04,0x45,0xe0,0x85,0x17,0x82,0x85,0x16,0x83,0xf0,0x90,0x04,0x44, -+0xa1,0x77,0x90,0x04,0x4b,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12,0x42,0x4d,0x90, -+0x04,0x4a,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x01,0x12,0x42,0x5f,0x90, -+0x04,0x49,0xe0,0x85,0x17,0x82,0x85,0x16,0x83,0xf0,0x90,0x04,0x48,0x80,0x58,0x90, -+0x04,0x4f,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12,0x42,0x4d,0x90,0x04,0x4e,0xe0, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x01,0x12,0x42,0x5f,0x90,0x04,0x4d,0xe0, -+0x85,0x17,0x82,0x85,0x16,0x83,0xf0,0x90,0x04,0x4c,0x80,0x2b,0x90,0x04,0x53,0xe0, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12,0x42,0x4d,0x90,0x04,0x52,0xe0,0xab,0x18,0xaa, -+0x19,0xa9,0x1a,0x90,0x00,0x01,0x12,0x42,0x5f,0x90,0x04,0x51,0xe0,0x85,0x17,0x82, -+0x85,0x16,0x83,0xf0,0x90,0x04,0x50,0xe0,0x85,0x17,0x82,0x85,0x16,0x83,0xa3,0xf0, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0xc0,0x03,0xc0,0x02,0xc0,0x01,0x12,0x29,0xd9,0xff, -+0xab,0x1d,0xaa,0x1e,0xa9,0x1f,0x12,0x29,0xd9,0x5f,0xd0,0x01,0xd0,0x02,0xd0,0x03, -+0x12,0x42,0x4d,0xab,0x18,0xe5,0x1a,0x24,0x01,0xf9,0xe4,0x35,0x19,0xfa,0xc0,0x03, -+0xc0,0x02,0xc0,0x01,0x12,0x29,0xd9,0xff,0xab,0x1d,0xaa,0x1e,0xa9,0x1f,0x90,0x00, -+0x01,0x12,0x42,0x20,0x5f,0xd0,0x01,0xd0,0x02,0xd0,0x03,0x12,0x42,0x4d,0x85,0x17, -+0x82,0x85,0x16,0x83,0xc0,0x83,0xc0,0x82,0xe0,0xff,0x85,0x1c,0x82,0x85,0x1b,0x83, -+0xe0,0xfe,0xef,0x5e,0xd0,0x82,0xd0,0x83,0xf0,0x85,0x17,0x82,0x85,0x16,0x83,0xa3, -+0xc0,0x83,0xc0,0x82,0xe0,0xff,0x85,0x1c,0x82,0x85,0x1b,0x83,0xa3,0xe0,0xfe,0xef, -+0x5e,0xd0,0x82,0xd0,0x83,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34, -+0x95,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3b,0x75,0x15,0x0b,0x74,0x01,0x7e, -+0x00,0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xe5,0x14, -+0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x60,0x06,0xe5,0x15,0x24,0x10,0x80,0x5d,0x15,0x15,0xe5,0x15,0xc3,0x94, -+0x00,0x50,0xca,0x80,0x56,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b, -+0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3d,0x75,0x15,0x0f,0x74,0x01,0x7e,0x00, -+0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xe5,0x14,0x25, -+0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f, -+0x4e,0x60,0x08,0x90,0x9e,0x30,0xe5,0x15,0xf0,0x80,0x10,0x15,0x15,0xe5,0x15,0xc3, -+0x94,0x00,0x50,0xc8,0x80,0x05,0xe4,0x90,0x9e,0x30,0xf0,0xe5,0x14,0x25,0xe0,0x24, -+0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3b,0xe4, -+0xf5,0x15,0x74,0x01,0x7e,0x00,0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce, -+0xd8,0xf9,0xff,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83, -+0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x08,0x90,0x9e,0x31,0xe5,0x15,0xf0,0x80, -+0x5b,0x05,0x15,0xe5,0x15,0xb4,0x10,0xca,0x80,0x52,0xe5,0x14,0x25,0xe0,0x24,0x02, -+0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x39,0xe4,0xf5, -+0x15,0x74,0x01,0x7e,0x00,0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8, -+0xf9,0xff,0xe5,0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0, -+0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x06,0xe5,0x15,0x24,0x10,0x80,0x0a,0x05,0x15, -+0xe5,0x15,0xb4,0x0c,0xcc,0x80,0x05,0xe4,0x90,0x9e,0x31,0xf0,0x90,0x9e,0x30,0xe0, -+0xff,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x48,0x12,0x43,0x5f,0xef,0xf0,0x90,0x9e, -+0x31,0xe0,0xfe,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x49,0x12,0x43,0x5f,0xee,0xf0, -+0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0xd3,0x9f,0x40,0x06, -+0x90,0x9e,0x30,0x12,0x62,0x94,0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x04,0xf5, -+0x83,0xe0,0xff,0x90,0x9e,0x31,0xe0,0xfe,0xef,0xc3,0x9e,0x50,0x03,0x12,0x62,0x94, -+0x90,0x9e,0x30,0xe0,0xff,0xd3,0x94,0x13,0x40,0x07,0x90,0x96,0x43,0x74,0x03,0xf0, -+0x22,0xef,0xd3,0x94,0x0b,0x40,0x07,0x90,0x96,0x43,0x74,0x02,0xf0,0x22,0xef,0xd3, -+0x94,0x03,0x40,0x07,0x90,0x96,0x43,0x74,0x01,0xf0,0x22,0xe4,0x90,0x96,0x43,0xf0, -+0x22,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x3f,0xfe,0xef,0x54,0x80,0xc4,0x13, -+0x13,0x13,0x54,0x01,0xfd,0xaf,0x06,0x41,0x93,0x12,0x29,0xd9,0xf5,0x60,0x22,0x12, -+0x29,0xd9,0x90,0x95,0x01,0xf0,0x22,0xad,0x07,0x74,0x11,0x2d,0xf5,0x82,0xe4,0x34, -+0xfc,0xf5,0x83,0xe0,0x44,0x01,0xf0,0x90,0x04,0x80,0xe0,0x54,0x0f,0xfc,0x74,0x14, -+0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xc0,0x4c,0xfd,0x74,0x14,0x2f, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xed,0xf0,0x22,0xef,0x60,0x0f,0x74,0x21,0x2d, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x22,0x74,0x21,0x2d,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xef,0xf0,0x22,0xe4,0xf5,0x60,0xf5,0x64, -+0xf5,0x63,0x75,0x62,0x0c,0x75,0x61,0x0c,0x90,0x9e,0x66,0xf0,0x90,0x9e,0x64,0xf0, -+0x90,0x9e,0x63,0xf0,0x90,0x9e,0x65,0x04,0xf0,0x90,0x9e,0x56,0xf0,0xe4,0x90,0x9e, -+0x67,0xf0,0x90,0x9e,0x58,0xf0,0x90,0x9e,0x61,0x74,0x07,0xf0,0xe4,0x90,0x9e,0x57, -+0xf0,0x90,0x9e,0x5f,0xf0,0xa3,0x74,0x03,0xf0,0x90,0x9e,0x5c,0x74,0x0a,0xf0,0xa3, -+0x74,0x05,0xf0,0x90,0x9e,0x5b,0x74,0x14,0xf0,0x90,0x9e,0x62,0x74,0x05,0xf0,0xe4, -+0x90,0x9e,0x5a,0xf0,0x90,0x9e,0x55,0xf0,0x90,0x9e,0x7f,0xf0,0x90,0x9e,0x5e,0xf0, -+0x22,0xe4,0x90,0x9e,0x67,0xf0,0x90,0x9e,0x57,0xf0,0xf5,0x64,0x22,0x7f,0x00,0x22, -+0xe5,0x62,0x30,0xe6,0x19,0xe5,0x62,0x54,0x0f,0xff,0x90,0x9e,0x54,0xe0,0xfe,0x4f, -+0x90,0x01,0x2f,0xf0,0xee,0x64,0x80,0x90,0x9e,0x54,0xf0,0x53,0x62,0xbf,0x22,0xe5, -+0x60,0x64,0x01,0x70,0x68,0xe5,0x63,0x60,0x64,0xe5,0x63,0x64,0x02,0x60,0x06,0xe5, -+0x63,0x64,0x05,0x70,0x27,0x90,0x06,0xab,0xe0,0x90,0x9e,0x56,0xf0,0x90,0x06,0xaa, -+0xe0,0x90,0x9e,0x65,0xf0,0x90,0x9e,0x56,0xe0,0x70,0x07,0x90,0x9e,0x65,0xe0,0xff, -+0x80,0x05,0x90,0x9e,0x56,0xe0,0xff,0x90,0x9e,0x56,0xef,0xf0,0x90,0x9e,0x58,0xe0, -+0x60,0x03,0xe0,0x14,0xf0,0xe4,0x90,0x9e,0x57,0xf0,0x90,0x05,0x58,0x74,0x03,0xf0, -+0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x53,0x64,0xfd,0x53,0x64, -+0xef,0xe5,0x63,0x14,0x24,0xfd,0x50,0x02,0x80,0x03,0x12,0x45,0x53,0x22,0xe4,0xfb, -+0x90,0x9e,0x9c,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x63,0x60,0x6a,0xe5,0x60, -+0x64,0x01,0x70,0x64,0xe5,0x63,0x14,0x60,0x2b,0x24,0xfd,0x60,0x27,0x24,0x02,0x24, -+0xfb,0x50,0x02,0x80,0x21,0x90,0x9e,0x56,0xe0,0x14,0xf0,0xe0,0x60,0x04,0xa3,0xe0, -+0x60,0x14,0x90,0x9e,0x56,0xe0,0x70,0x08,0x90,0x9e,0x65,0xe0,0x90,0x9e,0x56,0xf0, -+0x7b,0x01,0x80,0x02,0x7b,0x01,0xeb,0x60,0x2f,0x43,0x64,0x10,0xe4,0x90,0x9e,0x85, -+0xf0,0x90,0x9e,0x57,0xe0,0x75,0xf0,0x03,0xa4,0xff,0x90,0x9e,0x61,0xe0,0x2f,0x12, -+0x44,0x53,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x61,0x54,0x0f,0xc3,0x94,0x04,0x50, -+0x07,0x7d,0x01,0x7f,0x04,0x12,0x54,0xe7,0x22,0xe4,0x90,0x9e,0x15,0xf0,0xe5,0x63, -+0x60,0x79,0x90,0x9e,0x67,0xe0,0x60,0x0d,0xe4,0xf0,0x53,0x64,0xfd,0xe5,0x64,0x54, -+0x07,0x70,0x68,0x80,0x63,0x90,0x9e,0x57,0xe0,0x04,0xf0,0x53,0x64,0xef,0x90,0x9e, -+0x15,0xe0,0xf9,0xff,0x7e,0x00,0x24,0x01,0xfd,0xee,0x33,0xfc,0x90,0x9e,0x57,0xe0, -+0xb5,0x05,0x06,0xe4,0xb5,0x04,0x02,0x80,0x12,0xef,0x24,0x02,0xff,0xe4,0x3e,0xfe, -+0x90,0x9e,0x57,0xe0,0xb5,0x07,0x0a,0xe4,0xb5,0x06,0x06,0x90,0x05,0x58,0xe0,0x04, -+0xf0,0xe9,0xff,0x90,0x9e,0x5c,0xe0,0x2f,0xff,0xe4,0x33,0xfe,0x90,0x9e,0x57,0xe0, -+0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x40,0x0d,0xe5,0x60,0xb4,0x01,0x0b, -+0xa3,0xe0,0x70,0x07,0xe0,0x04,0xf0,0x22,0x12,0x44,0xcb,0x22,0x90,0x9e,0x5f,0xe0, -+0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e, -+0x93,0x12,0x43,0x8b,0x90,0x9e,0x96,0xe0,0x54,0xf0,0x44,0x06,0xff,0xf0,0xed,0x54, -+0x0f,0xc4,0x54,0xf0,0xfe,0xef,0x54,0x0f,0x4e,0xf0,0x90,0x9e,0x93,0x12,0x43,0x6b, -+0x90,0x9e,0x90,0x12,0x43,0x8b,0x7b,0x01,0x7a,0x9e,0x79,0x96,0x12,0x53,0xf1,0xd0, -+0xd0,0x92,0xaf,0x22,0xe0,0xfd,0x74,0x26,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9d,0xf5, -+0x83,0xed,0xf0,0xaf,0x14,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xef,0xc3,0x94,0x20, -+0x50,0x0e,0x74,0x84,0x2f,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xed,0xf0,0x80,0x29, -+0x74,0xa6,0x2f,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xed,0xf0,0x90,0x9e,0x68,0xef, -+0xf0,0x24,0xa6,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x90,0x9e,0x69,0xf0,0x7b, -+0x01,0x7a,0x9e,0x79,0x68,0x7d,0x02,0x51,0x57,0xd0,0xd0,0x92,0xaf,0x22,0x8f,0x0a, -+0x8d,0x0b,0xe5,0x0b,0x54,0x1f,0xf5,0x10,0x74,0x01,0x2f,0xf5,0x82,0xe4,0x34,0x94, -+0xf5,0x83,0xe0,0xf5,0x0e,0x90,0x04,0xfd,0xe0,0xb4,0x01,0x05,0x75,0x11,0x03,0x80, -+0x03,0x75,0x11,0x01,0xeb,0xc3,0x95,0x11,0x40,0x04,0xaf,0x0a,0x80,0x33,0xe5,0x0e, -+0x25,0x0d,0xf5,0x0f,0xe5,0x10,0x90,0x41,0xd6,0x93,0xff,0xe5,0x0f,0xd3,0x9f,0x74, -+0x01,0x40,0x11,0x25,0x0a,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe4,0xf0,0xad,0x0b, -+0xaf,0x0a,0x41,0xa5,0x25,0x0a,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe5,0x0f,0xf0, -+0x22,0xad,0x07,0x75,0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0xe0,0xff,0x74, -+0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xe0,0x54,0x1f,0xf5,0x12,0xd3,0x9f, -+0x40,0x02,0x8f,0x12,0xe5,0x12,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5, -+0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xe5,0x12,0x25,0xe0,0x24,0x66,0xf5,0x82, -+0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe, -+0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee, -+0xf0,0xa3,0xef,0xf0,0xaf,0x05,0xad,0x12,0x51,0xa5,0xaf,0x12,0x22,0xac,0x07,0xec, -+0xc3,0x94,0x20,0x50,0x0d,0x74,0x84,0x2c,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0, -+0x80,0x0b,0x74,0xa6,0x2c,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x54,0x7f,0xf5, -+0x1f,0xe5,0x1f,0x54,0x1f,0xff,0x90,0x9e,0x25,0xf0,0x75,0xf0,0x09,0xec,0x90,0x96, -+0x49,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x27,0xf0,0x75,0xf0,0x09,0xec,0x90,0x96,0x48, -+0x12,0x43,0x5f,0xe0,0xfe,0x90,0x9e,0x28,0xf0,0xec,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x29,0xcb,0xf0,0xa3,0xeb, -+0xf0,0xec,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xfb,0xa3, -+0xe0,0x90,0x9e,0x2b,0xcb,0xf0,0xa3,0xeb,0xf0,0xef,0xd3,0x9e,0x40,0x0a,0x90,0x9e, -+0x28,0xe0,0x90,0x9e,0x25,0xf0,0xf5,0x1f,0xed,0x70,0x02,0xa1,0x13,0x90,0x9e,0x26, -+0xed,0xf0,0xe5,0x1f,0x30,0xe6,0x0a,0x90,0x9e,0x25,0xe0,0xf5,0x1f,0xa3,0xe0,0x14, -+0xf0,0x90,0x9e,0x26,0xe0,0x70,0x02,0xa1,0x13,0x90,0x9e,0x25,0xe0,0xff,0xd3,0x94, -+0x00,0x50,0x02,0xa1,0x13,0xe4,0x90,0x9e,0x24,0xf0,0xef,0x14,0x90,0x9e,0x23,0xf0, -+0x90,0x9e,0x27,0xe0,0xfd,0x90,0x9e,0x23,0xe0,0xff,0xd3,0x9d,0x40,0x6b,0xef,0x94, -+0x10,0x40,0x21,0xef,0x24,0xf0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x2b,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x70,0x27,0x90,0x9e,0x23,0xe0,0xff,0xc3,0x94,0x10,0x50,0x33,0x74,0x01, -+0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90, -+0x9e,0x29,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x16,0x90,0x9e,0x23,0xe0,0xf5, -+0x1f,0xa3,0xe0,0x04,0xf0,0x90,0x9e,0x26,0xe0,0xff,0x90,0x9e,0x24,0xe0,0x6f,0x60, -+0x08,0x90,0x9e,0x23,0xe0,0x14,0xf0,0x80,0x87,0x90,0x9e,0x26,0xe0,0xff,0x90,0x9e, -+0x24,0xe0,0xc3,0x9f,0x50,0x0d,0x90,0x9e,0x23,0xe0,0xb5,0x05,0x06,0x90,0x9e,0x27, -+0xe0,0xf5,0x1f,0xe5,0x1f,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83, -+0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xe5,0x1f,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4, -+0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef, -+0x13,0xff,0xec,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0, -+0xa3,0xef,0xf0,0xaf,0x04,0xad,0x1f,0x51,0xa5,0xaf,0x1f,0x22,0xad,0x07,0xed,0xc3, -+0x94,0x20,0x50,0x0d,0x74,0x84,0x2d,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x80, -+0x0b,0x74,0xa6,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x54,0x7f,0xf5,0x1f, -+0xe5,0x1f,0x54,0x1f,0xfc,0x75,0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0xe0, -+0xff,0x90,0x9e,0x23,0xf0,0xed,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5, -+0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x24,0xcb,0xf0,0xa3,0xeb,0xf0,0xed,0x25,0xe0, -+0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x26, -+0xcb,0xf0,0xa3,0xeb,0xf0,0xec,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5, -+0x83,0xe4,0x93,0xfa,0x74,0x01,0x93,0xfb,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xea,0xf0,0xa3,0xeb,0xf0,0xec,0xc3,0x9f,0x40,0x02,0xc1,0x7a, -+0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xec,0xf0,0x04,0xfb,0x90,0x9e, -+0x23,0xe0,0xff,0xeb,0xd3,0x9f,0x40,0x02,0xc1,0xab,0xeb,0xc3,0x94,0x10,0x40,0x21, -+0xeb,0x24,0xf0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce, -+0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x24,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x70, -+0x23,0xeb,0xc3,0x94,0x10,0x50,0x40,0x74,0x01,0x7e,0x00,0xa8,0x03,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x26,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x60,0x23,0xbb,0x11,0x09,0x90,0x9e,0x25,0xe0,0x30,0xe7,0x02,0x7b,0x17, -+0xeb,0x64,0x13,0x60,0x03,0xbb,0x12,0x09,0x90,0x9e,0x24,0xe0,0x30,0xe0,0x02,0x7b, -+0x18,0xac,0x03,0x8c,0x1f,0x80,0x34,0x0b,0x80,0x84,0x90,0x9e,0x23,0xe0,0xfb,0x6c, -+0x70,0x69,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xec,0xf0,0x75,0xf0, -+0x09,0xed,0x90,0x96,0x4a,0x12,0x43,0x5f,0xe0,0xb4,0x01,0x0c,0xe5,0x1f,0x20,0xe6, -+0x07,0xec,0x44,0x40,0xf5,0x1f,0x80,0x03,0xaf,0x1f,0x22,0xec,0x25,0xe0,0x24,0x9e, -+0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xec,0x25, -+0xe0,0x24,0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4, -+0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0x80,0x5b,0xec,0xd3,0x9b,0x40,0x56, -+0x90,0x9e,0x23,0xe0,0xff,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xef, -+0xf0,0xac,0x07,0x8f,0x1f,0xec,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5, -+0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xec,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4, -+0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef, -+0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0, -+0xa3,0xef,0xf0,0xaf,0x1f,0x22,0x74,0x01,0x2d,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83, -+0xe4,0xf0,0xaf,0x05,0xe5,0x1f,0x44,0x80,0xfd,0x51,0xa5,0xe5,0x1f,0x44,0x80,0xff, -+0x22,0xef,0xc3,0x94,0x20,0x50,0x39,0xef,0x30,0xe0,0x17,0xed,0xc4,0x54,0xf0,0xfd, -+0xef,0xc3,0x13,0xfe,0x24,0xa4,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x54,0x0f, -+0x80,0x10,0xef,0xc3,0x13,0xfe,0x24,0xa4,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0, -+0x54,0xf0,0xf0,0x74,0xa4,0x2e,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x4d,0xf0, -+0x22,0xe4,0xf5,0x14,0xe5,0x14,0xb4,0x20,0x14,0x90,0x9a,0xc5,0xe0,0x04,0xf0,0x90, -+0x95,0x01,0xe0,0xff,0x90,0x9a,0xc5,0xe0,0xb5,0x07,0x02,0xe4,0xf0,0x75,0xf0,0x09, -+0xe5,0x14,0x90,0x96,0x4b,0x12,0x43,0x5f,0xe0,0x64,0x01,0x60,0x03,0x02,0x6e,0x6a, -+0xe5,0x14,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe0,0xfe,0xa3, -+0xe0,0xd3,0x94,0x00,0xee,0x94,0x00,0x50,0x03,0x02,0x6e,0x6a,0xe5,0x14,0x94,0x20, -+0x40,0x09,0x90,0x9a,0xc5,0xe0,0x60,0x03,0x02,0x6e,0x76,0xe5,0x14,0x75,0xf0,0x0a, -+0xa4,0x24,0x00,0xf9,0x74,0x90,0x35,0xf0,0x75,0x18,0x01,0xf5,0x19,0x89,0x1a,0xe5, -+0x14,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe0,0xff,0xa3,0xe0, -+0x90,0x9e,0x1b,0xcf,0xf0,0xa3,0xef,0xf0,0xe5,0x14,0x25,0xe0,0x24,0xc4,0xf5,0x82, -+0xe4,0x34,0x98,0xf5,0x83,0xe0,0xff,0xa3,0xe0,0x90,0x9e,0x1d,0xcf,0xf0,0xa3,0xef, -+0xf0,0xe5,0x14,0xc3,0x94,0x20,0x50,0x14,0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34, -+0x04,0xf5,0x83,0xe0,0x54,0x3f,0x90,0x9e,0x19,0xf0,0x80,0x12,0x74,0xa6,0x25,0x14, -+0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x54,0x3f,0x90,0x9e,0x19,0xf0,0x90,0x9e, -+0x19,0xe0,0xfe,0x54,0x1f,0xa3,0xf0,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x48,0x12, -+0x43,0x5f,0xe0,0x90,0x9e,0x20,0xf0,0x74,0xe6,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c, -+0xf5,0x83,0xe0,0xc3,0x94,0x05,0x40,0x02,0x41,0x9f,0x90,0x9e,0x20,0xe0,0xff,0x90, -+0x9e,0x1a,0xe0,0x9f,0x40,0x13,0x90,0x9e,0x20,0xe0,0x90,0x9e,0x1a,0xf0,0xee,0x54, -+0x40,0xfe,0x90,0x9e,0x19,0xf0,0xef,0x4e,0xf0,0x90,0x04,0xfd,0xe0,0x54,0x05,0x64, -+0x01,0x70,0x29,0x90,0x9e,0x1a,0xe0,0xff,0x90,0x41,0x4a,0x93,0xfe,0x74,0x44,0x25, -+0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xc3,0x9e,0x40,0x06,0xef,0x90,0x40, -+0xda,0x80,0x30,0x90,0x9e,0x1a,0xe0,0x90,0x40,0xf6,0x80,0x27,0x90,0x9e,0x1a,0xe0, -+0xff,0x90,0x41,0x4a,0x93,0xfe,0x74,0x44,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5, -+0x83,0xe0,0xc3,0x9e,0x40,0x06,0xef,0x90,0x41,0x12,0x80,0x07,0x90,0x9e,0x1a,0xe0, -+0x90,0x41,0x2e,0x93,0x90,0x9e,0x1f,0xf0,0x90,0x9e,0x1f,0xe0,0x75,0xf0,0x06,0xa4, -+0x24,0x50,0xf9,0x74,0x40,0x35,0xf0,0xfa,0x7b,0xff,0x8b,0x15,0xf5,0x16,0x89,0x17, -+0xe5,0x14,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xf5,0x1b, -+0xa3,0xe0,0xf5,0x1c,0x12,0x29,0xd9,0xff,0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a, -+0x12,0x42,0x97,0xfd,0xac,0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35, -+0x1b,0xf5,0x1b,0xab,0x15,0xaa,0x16,0xa9,0x17,0x90,0x00,0x01,0x12,0x42,0x20,0xff, -+0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x02,0x12,0x42,0xc2,0xfd,0xac, -+0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xab,0x15, -+0xaa,0x16,0xa9,0x17,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x7e,0x00,0xab,0x18,0xaa, -+0x19,0xa9,0x1a,0x90,0x00,0x04,0x12,0x42,0xc2,0xfd,0xac,0xf0,0x12,0x29,0xf2,0xef, -+0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xab,0x15,0xaa,0x16,0xa9,0x17,0x90, -+0x00,0x03,0x12,0x42,0x20,0xff,0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00, -+0x06,0x12,0x42,0xc2,0xfd,0xac,0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee, -+0x35,0x1b,0xf5,0x1b,0xab,0x15,0xaa,0x16,0xa9,0x17,0x90,0x00,0x04,0x12,0x42,0x20, -+0xff,0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x08,0x12,0x42,0xc2,0xfd, -+0xac,0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xab, -+0x15,0xaa,0x16,0xa9,0x17,0x90,0x00,0x05,0x12,0x42,0x20,0xff,0x7e,0x00,0x90,0x9e, -+0x1b,0xe0,0xfc,0xa3,0xe0,0xfd,0x12,0x29,0xf2,0xd3,0xe5,0x1c,0x9f,0xe5,0x1b,0x9e, -+0x40,0x0c,0xe5,0x1c,0x9f,0xf5,0x1c,0xe5,0x1b,0x9e,0xf5,0x1b,0x80,0x05,0xe4,0xf5, -+0x1b,0xf5,0x1c,0xe5,0x14,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83, -+0xe5,0x1b,0xf0,0xa3,0xe5,0x1c,0xf0,0x90,0x9e,0x19,0xe0,0x25,0xe0,0x24,0x66,0xf5, -+0x82,0xe4,0x34,0x41,0xf5,0x83,0xc3,0x74,0x01,0x93,0x95,0x1c,0xe4,0x93,0x95,0x1b, -+0x50,0x07,0xaf,0x14,0x12,0x65,0x5c,0xa1,0x31,0x90,0x9e,0x19,0xe0,0x25,0xe0,0x24, -+0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xd3,0x74,0x01,0x93,0x95,0x1c,0xe4,0x93, -+0x95,0x1b,0x50,0x02,0xa1,0x31,0x7d,0x01,0xaf,0x14,0x12,0x63,0xbd,0xa1,0x31,0x74, -+0xe6,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0xfc,0x64,0x05,0x60,0x02, -+0x81,0x3a,0x90,0x96,0x43,0xe0,0xff,0xb4,0x03,0x0b,0x90,0x9e,0x1a,0xe0,0xc3,0x94, -+0x19,0x40,0x3d,0x80,0x2e,0xef,0xb4,0x02,0x0b,0x90,0x9e,0x1a,0xe0,0xc3,0x94,0x11, -+0x40,0x2e,0x80,0x1f,0x90,0x96,0x43,0xe0,0xff,0xb4,0x01,0x0b,0x90,0x9e,0x1a,0xe0, -+0xc3,0x94,0x0a,0x40,0x1b,0x80,0x0c,0xef,0x70,0x11,0x90,0x9e,0x1a,0xe0,0xc3,0x94, -+0x03,0x40,0x0d,0x90,0x9a,0x84,0x74,0x01,0xf0,0x80,0x05,0xe4,0x90,0x9a,0x84,0xf0, -+0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe0,0xf5,0x1e,0x74,0x44, -+0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xff,0xc3,0x94,0x30,0x50,0x02, -+0x61,0xe7,0x90,0x9a,0x84,0xe0,0x64,0x01,0x60,0x02,0x61,0xe7,0x74,0x85,0x25,0x14, -+0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0x64,0x0a,0x60,0x51,0xef,0x24,0x05,0xff, -+0xe4,0x33,0xfe,0x74,0x41,0x25,0x14,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe0,0xfd, -+0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x50,0x32,0xed,0x24,0x05,0xff,0xe4, -+0x33,0xfe,0x74,0x44,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xd3,0x9f, -+0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x50,0x14,0x74,0x26,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x9d,0xf5,0x83,0xe0,0xff,0x90,0x9e,0x1a,0xe0,0x6f,0x60,0x3d,0x74,0x44,0x25, -+0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xff,0xd3,0x94,0x42,0x40,0x05,0x75, -+0x1e,0x05,0x80,0x0e,0xef,0xd3,0x94,0x39,0x40,0x05,0x75,0x1e,0x03,0x80,0x03,0x75, -+0x1e,0x01,0x74,0x41,0x25,0x14,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xef,0xf0,0x74, -+0x85,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0x80,0x29,0x74,0xe6,0x25,0x14,0xf5,0x82, -+0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0x85,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a, -+0xf5,0x83,0xe0,0x04,0xf0,0x80,0x10,0xe4,0xf5,0x1e,0x74,0xe6,0x25,0x14,0xf5,0x82, -+0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x90,0x9e,0x1a,0xe0,0xff,0x74,0x26,0x25,0x14, -+0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xef,0xf0,0x74,0x84,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x98,0xf5,0x83,0xe5,0x1e,0xf0,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x4c,0x12, -+0x43,0x5f,0xe0,0xb4,0x01,0x10,0xe4,0xf5,0x1e,0x74,0xe6,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x9c,0xf5,0x83,0xe4,0xf0,0xad,0x1e,0xa1,0x2c,0xec,0x64,0x06,0x60,0x02,0xa1, -+0x31,0xf5,0x1b,0xf5,0x1c,0x90,0x42,0x13,0x93,0xff,0x7e,0x00,0x90,0x9e,0x1b,0xe0, -+0xfc,0xa3,0xe0,0xfd,0x12,0x29,0xf2,0x90,0x9e,0x21,0xee,0xf0,0xa3,0xef,0xf0,0x74, -+0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe0,0xf5,0x1e,0xe4,0xf5,0x1d, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0x75,0xf0,0x02,0xe5,0x1d,0xa4,0xf5,0x82,0x85,0xf0, -+0x83,0x12,0x42,0xc2,0xfd,0xac,0xf0,0xe5,0x1d,0x90,0x42,0x0e,0x93,0xff,0x7e,0x00, -+0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xc3,0x90,0x9e, -+0x22,0xe0,0x95,0x1c,0x90,0x9e,0x21,0xe0,0x95,0x1b,0x40,0x07,0x05,0x1d,0xe5,0x1d, -+0xb4,0x05,0xbd,0xe5,0x1d,0xc3,0x13,0xf5,0x1d,0xe5,0x1e,0xb4,0x01,0x06,0xe5,0x1d, -+0x70,0x46,0x80,0x13,0xe5,0x1e,0xb4,0x03,0x15,0xe5,0x1d,0x70,0x05,0x75,0x1e,0x03, -+0x80,0x39,0xe5,0x1d,0xb4,0x01,0x05,0x75,0x1e,0x01,0x80,0x2f,0x80,0x2a,0xe5,0x1e, -+0xb4,0x05,0x28,0xe5,0x1d,0x70,0x05,0x75,0x1e,0x05,0x80,0x0d,0xe5,0x1d,0xb4,0x01, -+0x05,0x75,0x1e,0x03,0x80,0x03,0x75,0x1e,0x01,0xd3,0x90,0x9e,0x1e,0xe0,0x94,0x03, -+0x90,0x9e,0x1d,0xe0,0x94,0x00,0x40,0x03,0xe4,0xf5,0x1e,0xd3,0x90,0x9e,0x1e,0xe0, -+0x94,0x03,0x90,0x9e,0x1d,0xe0,0x94,0x00,0x40,0x03,0xe4,0xf5,0x1e,0x74,0x84,0x25, -+0x14,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe5,0x1e,0xf0,0xfd,0xaf,0x14,0x12,0x67, -+0x61,0x74,0xe6,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0xd3,0x94,0x05, -+0x74,0xe6,0x50,0x0e,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x04,0xf0, -+0x80,0x0b,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x90,0x9e,0x1d, -+0xe0,0xfe,0xa3,0xe0,0xff,0xc3,0x74,0xff,0x9f,0xfd,0x74,0xff,0x9e,0xfc,0xe5,0x14, -+0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xd3, -+0x9d,0xea,0x9c,0xe5,0x14,0x50,0x13,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a, -+0xf5,0x83,0xee,0x8f,0xf0,0x12,0x42,0x81,0x80,0x10,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9a,0xf5,0x83,0x74,0xff,0xf0,0xa3,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x44, -+0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0xff,0xc3,0x74,0xff,0x9f, -+0xfd,0x74,0xff,0x9e,0xfc,0xe5,0x14,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b, -+0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xd3,0x9d,0xea,0x9c,0xe5,0x14,0x50,0x13,0x25,0xe0, -+0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xee,0x8f,0xf0,0x12,0x42,0x81,0x80, -+0x10,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xff,0xf0,0xa3, -+0xf0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0xe4,0xf5,0xf0,0x12,0x42,0xfa,0xab,0x18,0xaa, -+0x19,0xa9,0x1a,0x90,0x00,0x02,0xe4,0xf5,0xf0,0x12,0x43,0x19,0x90,0x00,0x04,0xe4, -+0xf5,0xf0,0x12,0x43,0x19,0x90,0x00,0x06,0xe4,0xf5,0xf0,0x12,0x43,0x19,0x90,0x00, -+0x08,0xe4,0xf5,0xf0,0x12,0x43,0x19,0xe5,0x14,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4, -+0x34,0x93,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xe5,0x14,0x25,0xe0,0x24,0xc4,0xf5,0x82, -+0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x44,0xf5, -+0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0x05,0x14,0xe5,0x14,0xc3,0x94, -+0x40,0x50,0x03,0x02,0x67,0xa4,0x22,0x90,0x04,0x44,0x74,0x11,0xf0,0xa3,0x74,0xf0, -+0xf0,0xa3,0x74,0x0f,0xf0,0xa3,0xe4,0xf0,0xfd,0x74,0xa4,0x2d,0xf5,0x82,0xe4,0x34, -+0x04,0xf5,0x83,0xe4,0xf0,0x0d,0xbd,0x10,0xf0,0xe4,0x90,0x9a,0xc5,0xf0,0x90,0x95, -+0x01,0x04,0xf0,0xe4,0xfd,0x75,0xf0,0x0a,0xed,0x90,0x90,0x00,0x12,0x43,0x5f,0xe4, -+0xf0,0xa3,0xf0,0x75,0xf0,0x0a,0xed,0x90,0x90,0x02,0x12,0x43,0x5f,0xe4,0xf0,0xa3, -+0xf0,0x75,0xf0,0x0a,0xed,0x90,0x90,0x04,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75, -+0xf0,0x0a,0xed,0x90,0x90,0x06,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75,0xf0,0x0a, -+0xed,0x90,0x90,0x08,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x74,0x26,0x2d,0xf5,0x82, -+0xe4,0x34,0x9d,0xf5,0x83,0x74,0x13,0xf0,0x74,0x85,0x2d,0xf5,0x82,0xe4,0x34,0x9a, -+0xf5,0x83,0xe4,0xf0,0x74,0x84,0x2d,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0, -+0xed,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0x44,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0x74,0x86,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0x46,0x2d,0xf5, -+0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0xe6,0x2d,0xf5,0x82,0xe4,0x34,0x9c, -+0xf5,0x83,0xe4,0xf0,0x90,0x41,0xc4,0x93,0xfe,0x74,0x01,0x93,0xff,0x90,0x41,0x8c, -+0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25, -+0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0x75, -+0xf0,0x09,0xed,0x90,0x96,0x4b,0x12,0x43,0x5f,0x74,0x01,0xf0,0x75,0xf0,0x09,0xed, -+0x90,0x96,0x4a,0x12,0x43,0x5f,0x74,0x01,0xf0,0x74,0x82,0x2d,0xf5,0x82,0xe4,0x34, -+0x95,0xf5,0x83,0x74,0x0c,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x46,0x12,0x43,0x5f, -+0x74,0xff,0xf0,0xa3,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x44,0x12,0x43,0x5f,0xe4, -+0xf0,0xa3,0x74,0x0f,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0x74, -+0x13,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x49,0x12,0x43,0x5f,0xe4,0xf0,0xed,0xc3, -+0x94,0x20,0x50,0x0f,0x74,0x84,0x2d,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0x74,0x13, -+0xf0,0x80,0x0d,0x74,0xa6,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0x74,0x13,0xf0, -+0x0d,0xed,0x64,0x40,0x60,0x03,0x02,0x6e,0xa5,0x22,0x12,0x29,0xd9,0xf5,0x14,0xc3, -+0x94,0x40,0x50,0x15,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x74,0x44,0x25,0x14,0xf5, -+0x82,0xe4,0x34,0x9a,0xf5,0x83,0xef,0xf0,0x22,0xe5,0x14,0xb4,0x40,0x0a,0x90,0x00, -+0x02,0x12,0x42,0x20,0x90,0x96,0x42,0xf0,0x22,0x90,0x9e,0x30,0x12,0x43,0x8b,0x90, -+0x9e,0x33,0xe0,0x54,0xf0,0x44,0x02,0xf0,0x54,0x0f,0x44,0xc0,0xf0,0x90,0x9e,0x30, -+0x12,0x43,0x6b,0x90,0x9e,0x90,0x12,0x43,0x8b,0x7b,0x01,0x7a,0x9e,0x79,0x33,0x02, -+0x53,0xf1,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x90,0x00,0x01,0x12,0x42,0x20,0xfc, -+0xed,0xc3,0x94,0x40,0x40,0x02,0xe4,0xfd,0xec,0xc3,0x94,0x40,0x40,0x02,0xe4,0xfc, -+0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xfa,0xa3,0xe0, -+0xfb,0xea,0x90,0x9e,0x24,0xf0,0xeb,0xa3,0xf0,0xed,0x25,0xe0,0x24,0x46,0xf5,0x82, -+0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xfb,0xea,0x90,0x9e,0x26,0xf0,0xeb, -+0xa3,0xf0,0xa3,0xed,0xf0,0xa3,0x74,0xff,0xf0,0xec,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xfb,0xea,0x90,0x9e,0x2a,0xf0,0xeb, -+0xa3,0xf0,0xec,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfa, -+0xa3,0xe0,0xfb,0xea,0x90,0x9e,0x2c,0xf0,0xeb,0xa3,0xf0,0xa3,0xec,0xf0,0xa3,0x74, -+0xff,0xf0,0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0xed,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0xec,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0xec,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0x7b,0x01,0x7a,0x9e,0x79,0x24,0x01,0x79,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0x90,0x9e,0xa4,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0x90,0x9e, -+0xa4,0xe0,0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x2d,0xc3,0x90,0x9e,0xa7, -+0xe0,0x94,0xe8,0x90,0x9e,0xa6,0xe0,0x94,0x03,0x40,0x0b,0x90,0x01,0xc6,0xe0,0x44, -+0x10,0xf0,0x7f,0x00,0x80,0x15,0x90,0x9e,0xa6,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81, -+0x7f,0x0a,0x7e,0x00,0x12,0x37,0x54,0x80,0xc5,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x24,0x12,0x2a,0x8b,0x00,0x00,0x00, -+0x00,0x90,0x00,0x01,0x12,0x42,0x20,0x90,0x9e,0x66,0xf0,0x90,0x00,0x03,0x12,0x42, -+0x20,0x90,0x9e,0x55,0xf0,0x12,0x56,0x22,0x90,0x01,0xe5,0xe5,0x63,0xf0,0x90,0x9e, -+0x66,0xe0,0x90,0x01,0xe6,0xf0,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x02,0x12,0x42, -+0x20,0xff,0x30,0xe0,0x25,0x12,0x29,0xd9,0x90,0x9e,0x5c,0xf0,0x90,0x00,0x01,0x12, -+0x42,0x20,0x90,0x9e,0x5d,0xf0,0xef,0xc3,0x13,0x54,0x7f,0x90,0x9e,0x5b,0xf0,0x90, -+0x00,0x03,0x12,0x42,0x20,0x90,0x9e,0x62,0xf0,0x22,0x90,0x9e,0x5c,0x74,0x0a,0xf0, -+0x90,0x9e,0x5d,0x74,0x05,0xf0,0x90,0x9e,0x5b,0x74,0x14,0xf0,0x90,0x9e,0x62,0x74, -+0x05,0xf0,0x22,0x12,0x29,0xd9,0x30,0xe0,0x19,0xc3,0x13,0x54,0x7f,0x90,0x9e,0x61, -+0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x90,0x9e,0x5f,0xe4,0xf0,0xa3,0xef,0xf0, -+0x80,0x0f,0x90,0x9e,0x61,0x74,0x07,0xf0,0x90,0x9e,0x5f,0xe4,0xf0,0xa3,0x74,0x03, -+0xf0,0x90,0x9e,0x5f,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0x90,0x9e,0x24,0x12, -+0x2a,0x8b,0x00,0x00,0x00,0x00,0x12,0x29,0xd9,0x60,0x0d,0x90,0x9e,0x5e,0xf0,0xe4, -+0xfd,0x7f,0x04,0x12,0x54,0xe7,0x80,0x05,0xe4,0x90,0x9e,0x5e,0xf0,0x90,0x9e,0x5e, -+0xe0,0x90,0x01,0xe7,0xf0,0x22,0x90,0x02,0x09,0xe0,0xfd,0x12,0x29,0xd9,0xfe,0xaf, -+0x05,0xed,0x2e,0x90,0x9e,0x78,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xed,0x2f, -+0x90,0x9e,0x79,0xf0,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x9e,0x7a, -+0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x9e,0x7b,0xf0,0x90,0x00, -+0x04,0x12,0x42,0x20,0xff,0xae,0x05,0xed,0x2f,0x90,0x9e,0x7c,0xf0,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x24,0x12,0x43,0x8b,0x90,0x9e,0x24,0x12,0x43, -+0x6b,0x90,0x00,0x01,0x12,0x42,0xc2,0xfa,0xe5,0xf0,0x24,0x00,0xff,0xe4,0x3a,0xfe, -+0x90,0x9e,0x24,0x12,0x43,0x6b,0x90,0x00,0x01,0xee,0x8f,0xf0,0x12,0x43,0x19,0x12, -+0x29,0xd9,0xff,0x60,0x2d,0xb5,0x65,0x16,0x90,0x9e,0x24,0x12,0x43,0x6b,0x90,0x00, -+0x01,0x12,0x42,0xc2,0x65,0x67,0x70,0x04,0xe5,0x66,0x65,0xf0,0x60,0x24,0x90,0x9e, -+0x24,0x12,0x43,0x6b,0x90,0x00,0x01,0x12,0x42,0xc2,0xff,0xae,0xf0,0x12,0x4e,0x37, -+0x80,0x10,0x90,0x9e,0x24,0x12,0x43,0x6b,0x12,0x29,0xd9,0x65,0x65,0x60,0x03,0x12, -+0x44,0xc2,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x06,0x34,0x74,0xff,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0x22,0x90,0x06,0x34,0xe0,0x60,0x24,0x14,0x70,0x1a,0x7b,0x01, -+0x7a,0x06,0x79,0x35,0x7f,0xf9,0x7e,0x01,0x71,0xb0,0xbf,0x01,0x09,0x90,0x06,0x35, -+0xe0,0x54,0x0f,0xf0,0x80,0x04,0x80,0x00,0x80,0xcd,0xe4,0x90,0x06,0x34,0xf0,0x22, -+0x8e,0x14,0x8f,0x15,0x8b,0x16,0x8a,0x17,0x89,0x18,0xe4,0x90,0x9e,0x19,0xf0,0xef, -+0x90,0x00,0x31,0xf0,0x12,0x4d,0x45,0xe5,0x14,0x54,0x03,0xff,0x90,0x00,0x32,0xe0, -+0x54,0xfc,0x4f,0xf0,0x12,0x4d,0x45,0x90,0x00,0x33,0xe0,0x54,0x7f,0xf0,0x12,0x4d, -+0x45,0x90,0x00,0x33,0xe0,0x20,0xe7,0x0e,0x90,0x9e,0x19,0xe0,0xc3,0x94,0x64,0x50, -+0x05,0xe0,0x04,0xf0,0x80,0xeb,0x90,0x9e,0x19,0xe0,0xc3,0x94,0x64,0x50,0x10,0x90, -+0x00,0x30,0xe0,0xab,0x16,0xaa,0x17,0xa9,0x18,0x12,0x42,0x4d,0x7f,0x01,0x22,0x7f, -+0x00,0x22,0xe4,0x90,0x9e,0xac,0xf0,0xa3,0xf0,0x90,0x05,0xf8,0xe0,0x70,0x0f,0xa3, -+0xe0,0x70,0x0b,0xa3,0xe0,0x70,0x07,0xa3,0xe0,0x70,0x03,0x7f,0x01,0x22,0xd3,0x90, -+0x9e,0xad,0xe0,0x94,0xe8,0x90,0x9e,0xac,0xe0,0x94,0x03,0x40,0x03,0x7f,0x00,0x22, -+0x7f,0x32,0x7e,0x00,0x12,0x37,0x54,0x90,0x9e,0xac,0xe4,0x75,0xf0,0x01,0x12,0x42, -+0x81,0x80,0xc6,0x90,0x00,0x11,0xe0,0x44,0x09,0xf0,0x12,0x4d,0x45,0x90,0x9d,0xff, -+0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x08,0x12,0x2f,0xd9, -+0x90,0x9e,0x03,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c, -+0x12,0x2f,0xd9,0x90,0x9e,0x07,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x0b,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00, -+0x03,0x2d,0x95,0xe4,0xfd,0xff,0x12,0x34,0x81,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x11, -+0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x03,0x2d,0x95,0xe4,0xfd,0x7f,0x01,0x12,0x34, -+0x81,0x22,0x7f,0x78,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xff,0x12,0x2a,0x7f,0x7f, -+0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x9e,0x03,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08, -+0x12,0x27,0xde,0x90,0x9e,0x07,0x12,0x2a,0x7f,0x90,0x9e,0x80,0xe0,0x90,0x9d,0xff, -+0xb4,0x01,0x0d,0x12,0x43,0x53,0xef,0x54,0xc7,0xff,0xed,0x54,0xc7,0xfd,0x80,0x07, -+0x12,0x43,0x53,0xef,0x54,0xc7,0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x78, -+0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x03,0x12,0x43,0x53,0xef,0x54,0x0f,0xff,0xec, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x9e,0x07, -+0x12,0x43,0x53,0xef,0x44,0x02,0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x00, -+0x7e,0x08,0x12,0x2f,0xd9,0x7f,0x70,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9e,0x0b,0x12, -+0x2a,0x7f,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa0,0x7f,0x70,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe4,0xfd,0xff, -+0x12,0x34,0x81,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x11,0x90,0x80,0x59,0x12,0x2a,0x8b, -+0x00,0x00,0x00,0x00,0xe4,0xfd,0x7f,0x01,0x12,0x34,0x81,0x90,0x00,0x11,0xe0,0x54, -+0xf6,0xf0,0x02,0x4d,0x45,0xef,0x70,0x02,0xe1,0x5c,0x90,0x9e,0x0f,0xe0,0x60,0x03, -+0x02,0x7b,0x28,0x90,0x9d,0xfb,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x8c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9d,0xa7,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9d,0xab,0x12,0x43,0x53,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9d,0xaf,0x12, -+0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x9d,0xb3,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x9d,0xb7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x74, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xbb,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xbf,0x12,0x43,0x53,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xc3,0x12,0x43, -+0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d, -+0xc7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x9d,0xcb,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x88,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xcf,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x8c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xd3,0x12,0x43,0x53,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0xd0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xd7,0x12,0x43,0x53, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd4,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xdb, -+0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd8,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x9d,0xdf,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xdc,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x9d,0xe3,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0xe0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xe7,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xeb,0x12,0x43,0x53,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x9d,0xef,0x12, -+0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9,0x90, -+0x9d,0xf3,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12, -+0x2f,0xd9,0x90,0x9d,0xf7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04, -+0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x0f,0x74,0x01,0xf0,0x22,0x90,0x9e,0x0f,0xe0, -+0x64,0x01,0x60,0x03,0x02,0x7b,0x28,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d, -+0xfb,0x12,0x2a,0x7f,0x7f,0x44,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xa7,0x12,0x2a, -+0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xab,0x12,0x2a,0x7f,0x7f,0x6c, -+0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xaf,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12, -+0x27,0xde,0x90,0x9d,0xb3,0x12,0x2a,0x7f,0x7f,0x74,0x7e,0x0e,0x12,0x27,0xde,0x90, -+0x9d,0xb7,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xbb,0x12, -+0x2a,0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xbf,0x12,0x2a,0x7f,0x7f, -+0x80,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xc3,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e, -+0x12,0x27,0xde,0x90,0x9d,0xc7,0x12,0x2a,0x7f,0x7f,0x88,0x7e,0x0e,0x12,0x27,0xde, -+0x90,0x9d,0xcb,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xcf, -+0x12,0x2a,0x7f,0x7f,0xd0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xd3,0x12,0x2a,0x7f, -+0x7f,0xd4,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xd7,0x12,0x2a,0x7f,0x7f,0xd8,0x7e, -+0x0e,0x12,0x27,0xde,0x90,0x9d,0xdb,0x12,0x2a,0x7f,0x7f,0xdc,0x7e,0x0e,0x12,0x27, -+0xde,0x90,0x9d,0xdf,0x12,0x2a,0x7f,0x7f,0xe0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d, -+0xe3,0x12,0x2a,0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xe7,0x12,0x2a, -+0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x9d,0xeb,0x12,0x2a,0x7f,0x7f,0x04, -+0x7e,0x0d,0x12,0x27,0xde,0x90,0x9d,0xef,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12, -+0x27,0xde,0x90,0x9d,0xf3,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90, -+0x9d,0xf7,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0xa8,0x12, -+0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xed,0x44,0xc0,0xfd,0xec,0x90,0x9e,0xa8, -+0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x8c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x01,0x00,0x00, -+0x7f,0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0xdb,0x25, -+0xa4,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb, -+0x25,0xa4,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20, -+0xdb,0x25,0xa4,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b, -+0x04,0x1b,0x25,0xa4,0x7f,0x74,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a, -+0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12, -+0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85, -+0x12,0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80, -+0x85,0x12,0x2a,0x8b,0x63,0xdb,0x25,0xa4,0x7f,0x84,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x80,0x85,0x12,0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x88,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0x8c,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd0,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd4,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd8,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f,0xdc, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f, -+0xe0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x24,0xdb,0x25,0xa4, -+0x7f,0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x9e, -+0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xe4,0xff,0xec,0x90,0x9e,0xa8, -+0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x11,0xff,0xec,0x90,0x9e, -+0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0d,0x12,0x27,0xde,0x90,0x9e, -+0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x54,0xf0,0xff,0xec,0x90, -+0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x01,0xff,0xec, -+0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde, -+0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xe4,0xff,0xec,0x90, -+0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x11,0xff,0xec, -+0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde, -+0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xed,0x54,0x0f,0xfd, -+0xec,0x54,0xf0,0xfc,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53, -+0xed,0x44,0x10,0xfd,0xec,0x44,0x01,0xfc,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e, -+0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f, -+0xd9,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e, -+0xa8,0x12,0x43,0x53,0xef,0x54,0xf0,0xff,0xec,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90, -+0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x01,0xff,0xec,0x90,0x9e,0xa8,0x12,0x2a,0x7f, -+0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08, -+0x12,0x2f,0xd9,0xe4,0x90,0x9e,0x0f,0xf0,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90, -+0x9e,0x43,0xf0,0xe0,0x60,0x04,0xe0,0xf4,0x70,0x21,0xa2,0xaf,0xe4,0x33,0xf5,0x14, -+0xc2,0xaf,0x90,0x00,0x47,0xe0,0x54,0xfb,0xfd,0x7f,0x47,0x12,0x49,0x05,0x7d,0x40, -+0x7f,0x01,0x12,0x36,0xaf,0xe5,0x14,0x24,0xff,0x92,0xaf,0x22,0x90,0x9e,0x3a,0xe0, -+0xc3,0x94,0x14,0x50,0x05,0xe0,0x04,0xf0,0x81,0x14,0x90,0x9e,0x3a,0xe0,0x64,0x14, -+0x60,0x02,0x81,0x14,0x90,0x9e,0x49,0xe0,0x70,0x25,0x90,0x9e,0x4c,0xe0,0x70,0x1f, -+0x90,0x9e,0x4a,0xe0,0x70,0x19,0x90,0x9e,0x4d,0xe0,0x70,0x13,0x90,0x9e,0x4b,0xe0, -+0x70,0x0d,0x90,0x9e,0x4e,0xe0,0x70,0x07,0x90,0x04,0xfd,0xe0,0x54,0xfe,0xf0,0x90, -+0x9e,0x49,0xe0,0x90,0x04,0x44,0xf0,0x90,0x9e,0x4a,0xe0,0x90,0x04,0x45,0xf0,0x90, -+0x9e,0x4b,0xe0,0x90,0x04,0x46,0xf0,0xa3,0xe4,0xf0,0x90,0x9e,0x4c,0xe0,0x90,0x04, -+0x48,0xf0,0x90,0x9e,0x4d,0xe0,0x90,0x04,0x49,0xf0,0x90,0x9e,0x4e,0xe0,0x90,0x04, -+0x4a,0xf0,0xa3,0xe4,0xf0,0x90,0x9e,0x35,0xe0,0x90,0x04,0x4c,0xf0,0x90,0x9e,0x36, -+0xe0,0x90,0x04,0x4d,0xf0,0x90,0x9e,0x37,0xe0,0x90,0x04,0x4e,0xf0,0x90,0x9e,0x38, -+0xe0,0x90,0x04,0x4f,0xf0,0xe4,0x90,0x9e,0x3a,0xf0,0x90,0x9e,0x35,0x04,0xf0,0xe4, -+0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x9e,0x49,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0x90,0x05,0x60,0xe0,0x90,0x9e,0x19,0xf0,0x90,0x05,0x61,0xe0, -+0x90,0x9e,0x1a,0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x1b,0xf0,0x90,0x05,0x63,0xe0, -+0x90,0x9e,0x1c,0xf0,0x90,0x9e,0x52,0xe0,0xff,0x90,0x9e,0x1c,0xe0,0xfe,0xd3,0x9f, -+0x50,0x0b,0x90,0x9e,0x52,0xe0,0xc3,0x9e,0xd3,0x94,0x01,0x40,0x11,0x90,0x9e,0x40, -+0xe0,0xb4,0x01,0x02,0x80,0x03,0x90,0x9e,0x44,0xe0,0xff,0x12,0x4c,0xf0,0x22,0x90, -+0x9e,0x53,0xe0,0x64,0x01,0x60,0x08,0x90,0x9e,0x41,0xe0,0x60,0x02,0xa1,0x36,0x90, -+0x9e,0x35,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x3b,0x90,0x9e,0x36, -+0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x28,0x90,0x9e,0x37,0xe0, -+0xc3,0x94,0xff,0x50,0x0a,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x36,0xf0,0x80,0x15,0x90, -+0x9e,0x38,0xe0,0xc3,0x94,0xff,0x50,0x10,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x37,0xf0, -+0x90,0x9e,0x36,0xf0,0x90,0x9e,0x35,0xf0,0x90,0x00,0x44,0xe0,0x54,0x0c,0x60,0x76, -+0xe0,0x30,0xe2,0x32,0x90,0x9e,0x49,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0, -+0x80,0x24,0x90,0x9e,0x4a,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80, -+0x11,0x90,0x9e,0x4b,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x9e, -+0x4a,0xf0,0x90,0x9e,0x49,0xf0,0x90,0x00,0x44,0xe0,0x30,0xe3,0x32,0x90,0x9e,0x4c, -+0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90,0x9e,0x4d,0xe0,0xc3, -+0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x9e,0x4e,0xe0,0xc3,0x94, -+0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x4d,0xf0,0x90,0x9e,0x4c,0xf0,0x90, -+0x04,0xfd,0xe0,0x44,0x01,0xf0,0x22,0x00,0x37,0xda,}; -+ -+// =================== v79 UMC A Cut COMMON 2011-10-06 ===================== -+u8 Rtl8192CUFwUMCACutImgArray[UMCACutImgArrayLength] = { -+0xc1,0x88,0x02,0x00,0x4f,0x00,0x00,0x00,0x0a,0x06,0x18,0x09,0x58,0x3f,0x01,0x00, -+0x61,0x80,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x02,0x43,0xba,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x5a,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x5f,0xfb,0x00,0x00,0x00,0x00,0x00,0xa1,0xdf,0x00,0x00,0x00, -+0x05,0x04,0x03,0x02,0x00,0x03,0x06,0x05,0x04,0x03,0x00,0x04,0x06,0x05,0x04,0x02, -+0x00,0x04,0x08,0x07,0x06,0x04,0x00,0x06,0x0a,0x09,0x08,0x06,0x00,0x08,0x0a,0x09, -+0x08,0x04,0x00,0x08,0x0a,0x09,0x08,0x02,0x00,0x08,0x0a,0x09,0x08,0x00,0x00,0x08, -+0x12,0x11,0x10,0x08,0x00,0x10,0x1a,0x19,0x18,0x10,0x00,0x18,0x22,0x21,0x20,0x18, -+0x00,0x20,0x22,0x21,0x20,0x10,0x00,0x20,0x22,0x21,0x20,0x08,0x00,0x20,0x22,0x21, -+0x1c,0x08,0x00,0x20,0x22,0x21,0x14,0x08,0x00,0x20,0x22,0x20,0x18,0x08,0x00,0x20, -+0x31,0x30,0x20,0x10,0x00,0x30,0x31,0x30,0x18,0x00,0x00,0x30,0x31,0x2f,0x10,0x10, -+0x00,0x30,0x31,0x2c,0x10,0x10,0x00,0x30,0x31,0x28,0x10,0x00,0x00,0x30,0x31,0x20, -+0x10,0x00,0x00,0x30,0x31,0x10,0x10,0x00,0x00,0x30,0x04,0x04,0x04,0x05,0x04,0x04, -+0x04,0x05,0x05,0x05,0x06,0x06,0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x06,0x04,0x04, -+0x05,0x05,0x05,0x05,0x06,0x06,0x04,0x04,0x05,0x05,0x05,0x05,0x06,0x07,0x0a,0x0b, -+0x0d,0x10,0x04,0x05,0x05,0x06,0x06,0x09,0x0c,0x11,0x08,0x08,0x09,0x09,0x0a,0x0c, -+0x10,0x11,0x04,0x04,0x04,0x05,0x04,0x04,0x05,0x07,0x07,0x07,0x08,0x0a,0x04,0x04, -+0x04,0x04,0x06,0x0a,0x0b,0x0d,0x05,0x05,0x07,0x07,0x08,0x0b,0x0d,0x0f,0x04,0x04, -+0x04,0x05,0x07,0x07,0x09,0x09,0x0c,0x0e,0x10,0x12,0x04,0x04,0x05,0x05,0x06,0x0a, -+0x11,0x13,0x09,0x09,0x09,0x09,0x0c,0x0e,0x11,0x13,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x24,0x26,0x2a,0x18,0x1a,0x1d,0x1f,0x21,0x27,0x29,0x2a,0x00,0x00, -+0x00,0x1f,0x23,0x28,0x2a,0x2c,0x00,0x04,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x18, -+0x00,0x24,0x00,0x30,0x00,0x48,0x00,0x60,0x00,0x90,0x00,0xc0,0x00,0xd8,0x00,0x50, -+0x00,0x78,0x00,0xa0,0x00,0xc8,0x01,0x40,0x01,0x90,0x01,0xe0,0x02,0x30,0x01,0x2c, -+0x01,0x40,0x01,0xe0,0x02,0xd0,0x03,0xe8,0x04,0xb0,0x06,0x40,0x07,0xd0,0x00,0x02, -+0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x0c,0x00,0x12,0x00,0x18,0x00,0x24,0x00,0x30, -+0x00,0x48,0x00,0x60,0x00,0x6c,0x00,0x28,0x00,0x3c,0x00,0x50,0x00,0x64,0x00,0xa0, -+0x00,0xc8,0x00,0xf0,0x01,0x18,0x00,0x64,0x00,0xa0,0x00,0xf0,0x01,0x68,0x01,0xf4, -+0x02,0x58,0x03,0x20,0x03,0xe8,0x02,0x02,0x02,0x02,0x02,0x02,0x03,0x03,0x04,0x04, -+0x05,0x07,0x04,0x04,0x07,0x0a,0x0a,0x0c,0x0c,0x12,0x05,0x07,0x07,0x08,0x0b,0x12, -+0x24,0x3c,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x01,0x02, -+0x03,0x04,0x05,0x06,0x07,0x08,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x20,0x1e, -+0x1c,0x18,0x10,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0xbb,0x01,0x0c,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0,0x22,0x50, -+0x06,0xe9,0x25,0x82,0xf8,0xe6,0x22,0xbb,0xfe,0x06,0xe9,0x25,0x82,0xf8,0xe2,0x22, -+0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe4,0x93,0x22,0xbb,0x01,0x06, -+0x89,0x82,0x8a,0x83,0xf0,0x22,0x50,0x02,0xf7,0x22,0xbb,0xfe,0x01,0xf3,0x22,0xf8, -+0xbb,0x01,0x0d,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0x22, -+0x50,0x06,0xe9,0x25,0x82,0xc8,0xf6,0x22,0xbb,0xfe,0x05,0xe9,0x25,0x82,0xc8,0xf2, -+0x22,0xc5,0xf0,0xf8,0xa3,0xe0,0x28,0xf0,0xc5,0xf0,0xf8,0xe5,0x82,0x15,0x82,0x70, -+0x02,0x15,0x83,0xe0,0x38,0xf0,0x22,0xbb,0x01,0x0a,0x89,0x82,0x8a,0x83,0xe0,0xf5, -+0xf0,0xa3,0xe0,0x22,0x50,0x06,0x87,0xf0,0x09,0xe7,0x19,0x22,0xbb,0xfe,0x07,0xe3, -+0xf5,0xf0,0x09,0xe3,0x19,0x22,0x89,0x82,0x8a,0x83,0xe4,0x93,0xf5,0xf0,0x74,0x01, -+0x93,0x22,0xbb,0x01,0x10,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0, -+0xf5,0xf0,0xa3,0xe0,0x22,0x50,0x09,0xe9,0x25,0x82,0xf8,0x86,0xf0,0x08,0xe6,0x22, -+0xbb,0xfe,0x0a,0xe9,0x25,0x82,0xf8,0xe2,0xf5,0xf0,0x08,0xe2,0x22,0xe5,0x83,0x2a, -+0xf5,0x83,0xe9,0x93,0xf5,0xf0,0xa3,0xe9,0x93,0x22,0xbb,0x01,0x0a,0x89,0x82,0x8a, -+0x83,0xf0,0xe5,0xf0,0xa3,0xf0,0x22,0x50,0x06,0xf7,0x09,0xa7,0xf0,0x19,0x22,0xbb, -+0xfe,0x06,0xf3,0xe5,0xf0,0x09,0xf3,0x19,0x22,0xf8,0xbb,0x01,0x11,0xe5,0x82,0x29, -+0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0xe5,0xf0,0xa3,0xf0,0x22,0x50,0x09, -+0xe9,0x25,0x82,0xc8,0xf6,0x08,0xa6,0xf0,0x22,0xbb,0xfe,0x09,0xe9,0x25,0x82,0xc8, -+0xf2,0xe5,0xf0,0x08,0xf2,0x22,0xef,0x4b,0xff,0xee,0x4a,0xfe,0xed,0x49,0xfd,0xec, -+0x48,0xfc,0x22,0xe0,0xfc,0xa3,0xe0,0xfd,0xa3,0xe0,0xfe,0xa3,0xe0,0xff,0x22,0xa4, -+0x25,0x82,0xf5,0x82,0xe5,0xf0,0x35,0x83,0xf5,0x83,0x22,0xe0,0xfb,0xa3,0xe0,0xfa, -+0xa3,0xe0,0xf9,0x22,0xf8,0xe0,0xfb,0xa3,0xa3,0xe0,0xf9,0x25,0xf0,0xf0,0xe5,0x82, -+0x15,0x82,0x70,0x02,0x15,0x83,0xe0,0xfa,0x38,0xf0,0x22,0xeb,0xf0,0xa3,0xea,0xf0, -+0xa3,0xe9,0xf0,0x22,0xd0,0x83,0xd0,0x82,0xf8,0xe4,0x93,0x70,0x12,0x74,0x01,0x93, -+0x70,0x0d,0xa3,0xa3,0x93,0xf8,0x74,0x01,0x93,0xf5,0x82,0x88,0x83,0xe4,0x73,0x74, -+0x02,0x93,0x68,0x60,0xef,0xa3,0xa3,0xa3,0x80,0xdf,0x02,0x43,0xf8,0x02,0x50,0xa9, -+0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0x40,0x03,0xf6,0x80,0x01,0xf2,0x08,0xdf,0xf4, -+0x80,0x29,0xe4,0x93,0xa3,0xf8,0x54,0x07,0x24,0x0c,0xc8,0xc3,0x33,0xc4,0x54,0x0f, -+0x44,0x20,0xc8,0x83,0x40,0x04,0xf4,0x56,0x80,0x01,0x46,0xf6,0xdf,0xe4,0x80,0x0b, -+0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x90,0x44,0x3d,0xe4,0x7e,0x01,0x93,0x60, -+0xbc,0xa3,0xff,0x54,0x3f,0x30,0xe5,0x09,0x54,0x1f,0xfe,0xe4,0x93,0xa3,0x60,0x01, -+0x0e,0xcf,0x54,0xc0,0x25,0xe0,0x60,0xa8,0x40,0xb8,0xe4,0x93,0xa3,0xfa,0xe4,0x93, -+0xa3,0xf8,0xe4,0x93,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xf0,0xa3,0xc8, -+0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xdf,0xe9,0xde,0xe7,0x80,0xbe,0x41,0x9e,0x66, -+0x00,0x41,0x9e,0xae,0x00,0x41,0x9e,0x4d,0x80,0x41,0x9e,0x4e,0x80,0x41,0x9e,0xb0, -+0x00,0x00,0xf0,0x90,0x9e,0x57,0xe0,0x90,0x9e,0x8a,0xf0,0xe4,0xfb,0xfd,0x7f,0x54, -+0x7e,0x01,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x88,0xeb,0xf0,0xa3,0xe0, -+0xfb,0xa3,0xe0,0xf5,0x44,0xe4,0xf5,0x45,0x12,0x30,0x62,0xd0,0xd0,0x92,0xaf,0x22, -+0x90,0x01,0x5f,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x08,0xf0,0xe4,0x90,0x9e,0x89,0xf0, -+0x90,0x9e,0x55,0xe0,0x90,0x9e,0x8a,0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91, -+0x62,0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x90,0x9e,0x5c, -+0x14,0xf0,0x90,0x9e,0x5e,0xe0,0x54,0x0f,0xc3,0x94,0x0c,0x50,0x02,0xf1,0x16,0x22, -+0x8f,0x82,0x8e,0x83,0xa3,0xa3,0xa3,0xe4,0xf0,0x22,0xe4,0xf5,0x22,0x7f,0x60,0x7e, -+0x01,0x80,0xed,0x90,0x9e,0x60,0xe0,0xff,0x7d,0x01,0xe1,0x1a,0xb1,0xb1,0xbf,0x01, -+0x0f,0x90,0x9e,0x68,0xe0,0xff,0xe4,0xfd,0xf1,0xfe,0x90,0x04,0x1f,0x74,0x20,0xf0, -+0x22,0x90,0x01,0xca,0xe5,0x25,0xf0,0xef,0x60,0x03,0x12,0x4f,0x2a,0x22,0x22,0x22, -+0x22,0x22,0x00,0x02,0x60,0x8d,0x02,0x60,0x94,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x8b,0x1b,0x8a,0x1c,0x89,0x1d,0x90,0x9e,0x8b,0x71,0x8b,0xab,0x1e,0xaa,0x1f,0xa9, -+0x20,0x90,0x9e,0x8e,0x71,0x8b,0xaf,0x21,0x15,0x21,0xef,0x60,0x1b,0x90,0x9e,0x8e, -+0xe4,0x75,0xf0,0x01,0x71,0x74,0x12,0x24,0x62,0xff,0x90,0x9e,0x8b,0xe4,0x75,0xf0, -+0x01,0x71,0x74,0xef,0x51,0x4d,0x80,0xde,0xab,0x1b,0xaa,0x1c,0xa9,0x1d,0xd0,0xd0, -+0x92,0xaf,0x22,0x90,0x06,0xa9,0xe0,0xf5,0x50,0x54,0xc0,0x70,0x0d,0x90,0x9e,0x63, -+0xe0,0x54,0xfe,0xf0,0xe0,0x54,0xfd,0xf0,0x91,0xd3,0xe5,0x50,0x30,0xe6,0x17,0x90, -+0x9e,0x63,0xe0,0x44,0x01,0xf0,0x90,0x9e,0x61,0xe0,0x64,0x02,0x60,0x04,0x91,0xdc, -+0x80,0x0b,0x91,0x80,0x80,0x07,0x90,0x9e,0x63,0xe0,0x54,0xfe,0xf0,0xe5,0x50,0x90, -+0x9e,0x63,0x30,0xe7,0x17,0xe0,0x44,0x02,0xf0,0xe4,0x90,0x9e,0x89,0x91,0x52,0x90, -+0x01,0x57,0x74,0x05,0xf0,0x90,0x9e,0x62,0x74,0x01,0xf0,0x22,0xe0,0x54,0xfd,0xf0, -+0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x04,0x1d,0xe0,0x60,0x1a,0x90,0x05, -+0x22,0xe0,0x54,0x90,0x60,0x07,0x90,0x01,0xc6,0xe0,0x44,0x40,0xf0,0x90,0x01,0xc7, -+0xe0,0x30,0xe1,0xe4,0x7f,0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xc0, -+0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01, -+0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01,0xc4,0x74, -+0xdf,0xf0,0x74,0x45,0xa3,0xf0,0x53,0x91,0xdf,0x90,0x01,0x3c,0xe0,0x55,0x30,0xf5, -+0x34,0xa3,0xe0,0x55,0x31,0xf5,0x35,0xa3,0xe0,0x55,0x32,0xf5,0x36,0xa3,0xe0,0x55, -+0x33,0xf5,0x37,0xe5,0x34,0x30,0xe0,0x06,0x90,0x01,0x3c,0x74,0x01,0xf0,0xe5,0x34, -+0x30,0xe1,0x08,0x90,0x01,0x3c,0x74,0x02,0xf0,0xf1,0xbc,0xe5,0x34,0x30,0xe2,0x38, -+0x90,0x01,0x3c,0x74,0x04,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe0,0x24,0x90,0x9e,0x89, -+0xe4,0xf0,0x90,0x9e,0x55,0xe0,0x90,0x9e,0x8a,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e, -+0x01,0x91,0x62,0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x80, -+0x07,0x90,0x9e,0x5d,0xe4,0xf0,0x91,0xd3,0xe5,0x34,0x30,0xe3,0x38,0x90,0x01,0x3c, -+0x74,0x08,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe1,0x24,0x90,0x9e,0x89,0xe4,0xf0,0x90, -+0x9e,0x55,0xe0,0x90,0x9e,0x8a,0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x62, -+0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x80,0x07,0x90,0x9e, -+0x5c,0xe4,0xf0,0x91,0xd3,0xe5,0x34,0x30,0xe4,0x09,0x90,0x01,0x3c,0x74,0x10,0xf0, -+0x12,0x4d,0xe2,0xe5,0x34,0x30,0xe5,0x09,0x90,0x01,0x3c,0x74,0x20,0xf0,0x12,0x4e, -+0x25,0xe5,0x35,0x30,0xe0,0x1a,0x90,0x01,0x3d,0x74,0x01,0xf0,0x90,0x01,0x2f,0xe0, -+0x44,0x7f,0xf0,0x90,0x00,0x83,0xe0,0x90,0x9e,0x60,0xf0,0x12,0x64,0xa1,0x91,0xd3, -+0x74,0xdf,0x04,0x90,0x01,0xc4,0xf0,0x74,0x45,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0, -+0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0, -+0x83,0xd0,0xf0,0xd0,0xe0,0x32,0x7d,0x01,0x7f,0x0c,0x8f,0x71,0x8d,0x72,0xe5,0x71, -+0x54,0x0f,0xff,0x90,0x9e,0x5e,0xe0,0x54,0x0f,0x6f,0x60,0x72,0xe5,0x71,0x30,0xe2, -+0x2b,0x90,0x9e,0x5e,0xe0,0x20,0xe2,0x05,0x7f,0x01,0x12,0x63,0x92,0x90,0x9e,0x5e, -+0xe0,0x30,0xe3,0x07,0xe5,0x71,0x20,0xe3,0x02,0x80,0x54,0x90,0x9e,0x5e,0xe0,0x20, -+0xe3,0x4c,0xe5,0x71,0x30,0xe3,0x47,0xaf,0x72,0x02,0x63,0x2e,0x90,0x9e,0x5e,0xe0, -+0x54,0x0f,0xff,0xbf,0x0c,0x0d,0xe5,0x71,0x20,0xe3,0x08,0x12,0x5e,0xf1,0xef,0x60, -+0x2d,0xf1,0x9f,0x90,0x9e,0x5e,0xe0,0x54,0x0f,0xff,0xbf,0x04,0x0e,0xe5,0x71,0x20, -+0xe2,0x09,0x12,0x62,0x50,0xef,0x60,0x16,0x12,0x48,0xaa,0x90,0x9e,0x5e,0xe0,0x54, -+0x0f,0xff,0xbf,0x02,0x09,0x12,0x62,0xbb,0xef,0x60,0x03,0x12,0x64,0x87,0x22,0x90, -+0x06,0x04,0xe0,0x44,0x40,0xf0,0xe5,0x73,0xb4,0x01,0x05,0x7f,0x01,0x12,0x63,0x4d, -+0x90,0x9e,0x5e,0xe0,0x54,0xf0,0xf0,0xe0,0x44,0x04,0xf0,0x22,0x90,0x9e,0x62,0xe0, -+0x60,0x0e,0xe4,0xf0,0xa3,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0x07,0x70,0x2b,0x80,0x27, -+0x90,0x9e,0x51,0xe0,0x04,0xf0,0x90,0x9e,0x63,0xe0,0x54,0xef,0xf0,0x90,0x9e,0x56, -+0xe0,0xff,0x90,0x9e,0x51,0xe0,0xd3,0x9f,0x40,0x0d,0xe5,0x73,0xb4,0x01,0x0a,0xa3, -+0xe0,0x70,0x06,0xe0,0x04,0xf0,0x22,0x91,0xd3,0x22,0xe0,0xff,0x7d,0x01,0x90,0x9e, -+0x9c,0xef,0xf0,0xa3,0xed,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xe5,0x74,0x60,0x04,0xe4, -+0xff,0x11,0x8f,0x90,0x9e,0x9c,0xe0,0x30,0xe0,0x09,0x90,0x9e,0x9e,0xe4,0xf0,0xa3, -+0x74,0x80,0xf0,0x90,0x9e,0x9c,0xe0,0xff,0xc3,0x13,0x90,0xfd,0x10,0xf0,0x90,0x04, -+0x25,0xef,0xf0,0x90,0x9e,0x9d,0xe0,0x60,0x1f,0xa3,0xa3,0xe0,0xff,0x24,0x0f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x74,0x10,0x2f,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x90,0x9e,0x9e,0xa3,0xe0,0xff,0xfd,0x24, -+0x08,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe4,0xf0,0x74,0x09,0x2d,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf0,0xf0,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34,0xfc, -+0xf5,0x83,0xe0,0x54,0xf7,0xf0,0x90,0x9e,0x9e,0xe0,0xfe,0xa3,0xe0,0xff,0x22,0xef, -+0x60,0x0b,0x90,0x9e,0x77,0xe0,0xb4,0x01,0x10,0xe4,0xff,0x80,0x09,0x90,0x9e,0x77, -+0xe0,0xb4,0x01,0x05,0x7f,0x01,0x12,0x77,0x66,0x22,0x90,0x01,0x37,0x74,0x02,0xf0, -+0x90,0x05,0x22,0x74,0xff,0xf0,0x12,0x77,0x1c,0xef,0x70,0x06,0x90,0x01,0xc8,0x74, -+0xfd,0xf0,0x7d,0x02,0x7f,0x03,0x12,0x31,0x9d,0xe5,0x74,0x60,0x04,0x7f,0x01,0x11, -+0x8f,0x11,0xdf,0x90,0x9e,0x5e,0xe0,0x54,0xf0,0xf0,0xe0,0x44,0x02,0xf0,0x22,0x7f, -+0x78,0x7e,0x08,0x12,0x22,0x65,0x90,0x9d,0xff,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c, -+0x12,0x22,0x65,0x90,0x9e,0x03,0x12,0x25,0x08,0x7f,0x00,0x7e,0x08,0x12,0x22,0x65, -+0x90,0x9e,0x07,0x12,0x25,0x08,0x90,0x9e,0x77,0xe0,0x90,0x9d,0xff,0xb4,0x01,0x0d, -+0x12,0x43,0x53,0xef,0x54,0xc7,0xff,0xed,0x54,0xc7,0xfd,0x80,0x07,0x12,0x43,0x53, -+0xef,0x54,0xc7,0xff,0xec,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x78,0x7e,0x08,0x12, -+0x2b,0x08,0x90,0x9e,0x03,0x12,0x43,0x53,0xef,0x54,0x0f,0xff,0xec,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x90,0x9e,0x07,0x12,0x43,0x53, -+0xef,0x44,0x02,0xff,0xec,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x00,0x7e,0x08,0x12, -+0x2b,0x08,0x7f,0x70,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9e,0x0b,0x12,0x25,0x08,0x90, -+0x80,0x96,0x12,0x25,0x14,0x00,0x1b,0x25,0xa0,0x7f,0x70,0x7e,0x0e,0x12,0x2b,0x08, -+0x90,0x80,0x68,0x12,0x25,0x14,0x00,0x00,0x00,0x00,0xe4,0xfd,0xff,0x12,0x30,0x2c, -+0x90,0x9e,0x77,0xe0,0xb4,0x01,0x11,0x90,0x80,0x68,0x12,0x25,0x14,0x00,0x00,0x00, -+0x00,0xe4,0xfd,0x7f,0x01,0x12,0x30,0x2c,0x90,0x00,0x11,0xe0,0x54,0xf6,0xf0,0x80, -+0x08,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x7f,0x10,0xdf,0xfe,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x9e,0xad,0xed,0xf0,0x90,0x9e,0xac,0xef,0xf0,0xd3,0x94,0x07,0x50,0x63,0xe0, -+0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00, -+0x47,0xe0,0x5f,0xf0,0x31,0xb9,0x90,0x9e,0xac,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08, -+0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x46,0xe0,0x4f,0xf0,0x31,0xb9,0x90, -+0x9e,0xad,0xe0,0x60,0x16,0x90,0x9e,0xac,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x45,0x80,0x66,0x90,0x9e,0xac,0xe0,0xff, -+0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x45, -+0x80,0x6b,0x90,0x9e,0xac,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08, -+0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0x31,0xb1,0x90,0x9e,0xac,0xe0,0xff, -+0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x43,0xe0, -+0x4f,0xf0,0x31,0xb9,0x90,0x9e,0xad,0xe0,0x60,0x1b,0x90,0x9e,0xac,0xe0,0xff,0x74, -+0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00, -+0x42,0xe0,0x4f,0x80,0x1a,0x90,0x9e,0xac,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x42,0xe0,0x5f,0xf0, -+0x31,0xb9,0xd0,0xd0,0x92,0xaf,0x22,0xf0,0x90,0x00,0x45,0xe0,0x54,0xfe,0xfd,0x7f, -+0x45,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x8f,0x82,0x75,0x83,0x00,0xed,0xf0,0x31, -+0xb9,0xd0,0xd0,0x92,0xaf,0x22,0xef,0x14,0x60,0x30,0x14,0x60,0x66,0x24,0x02,0x60, -+0x02,0x61,0x7d,0x90,0x9e,0x1a,0x74,0x02,0xf0,0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd, -+0x7f,0x48,0x51,0xc1,0x90,0x00,0x47,0xe0,0x44,0x08,0xfd,0x7f,0x47,0x51,0xc1,0x90, -+0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0x80,0x71,0xe4,0x90,0x9e,0x1a,0xf0,0x90, -+0x9e,0x16,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12, -+0x2b,0x08,0x90,0x00,0x45,0xe0,0x44,0xef,0xfd,0x7f,0x45,0x51,0xc1,0x90,0x00,0x45, -+0xe0,0x54,0xef,0xfd,0x7f,0x45,0x51,0xc1,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f, -+0x46,0x80,0x38,0x90,0x9e,0x1a,0x74,0x01,0xf0,0x90,0x9e,0x20,0x12,0x43,0x53,0x90, -+0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x90,0x00,0x45,0xe0, -+0x44,0x20,0xfd,0x7f,0x45,0x51,0xc1,0x90,0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45, -+0x51,0xc1,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x51,0xc1,0x22,0x90,0x00, -+0x02,0x12,0x42,0x20,0x90,0x9e,0x1c,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0x25,0xe0, -+0x25,0xe0,0x90,0x9e,0x1b,0xf0,0x12,0x24,0x62,0x25,0xe0,0x25,0xe0,0x90,0x9e,0x1f, -+0xf0,0x90,0x05,0x60,0xe0,0x90,0x9e,0x2a,0xf0,0x90,0x05,0x61,0xe0,0x90,0x9e,0x2b, -+0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x2c,0xf0,0x90,0x05,0x63,0xe0,0x90,0x9e,0x2d, -+0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x9e,0x3f,0xf0,0xc2,0xaf,0x90,0x9e,0x1b,0xe0,0xff, -+0xd1,0xd8,0x90,0x9e,0x3f,0xe0,0x24,0xff,0x92,0xaf,0x90,0x9e,0x1c,0xe0,0x70,0x02, -+0x81,0x84,0x90,0x9e,0x1b,0xe0,0x70,0x02,0x81,0x84,0x90,0x9e,0x1f,0xe0,0x70,0x02, -+0x81,0x84,0xa2,0xaf,0xe4,0x33,0x90,0x9e,0x3f,0xf0,0xc2,0xaf,0x90,0x9e,0x2e,0x74, -+0x01,0xf0,0x90,0x9e,0x3f,0xe0,0x24,0xff,0x92,0xaf,0x51,0xb8,0x90,0x00,0x46,0xe0, -+0x44,0x01,0xfd,0x7f,0x46,0x51,0xc1,0x90,0x9e,0x14,0xe0,0x60,0x15,0x90,0x9e,0x20, -+0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08, -+0x80,0x06,0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f, -+0x45,0x51,0xc1,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x9e,0x2a,0xe0,0x90,0x05, -+0x84,0xf0,0x90,0x9e,0x2b,0xe0,0x90,0x05,0x85,0xf0,0x90,0x9e,0x2c,0xe0,0x90,0x05, -+0x86,0xf0,0x90,0x9e,0x2d,0xe0,0x90,0x05,0x87,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x9e, -+0x3f,0xf0,0xc2,0xaf,0x90,0x01,0x3c,0xe0,0x44,0x20,0xf0,0x7d,0x20,0xe4,0xff,0x12, -+0x31,0xb7,0x80,0x2b,0x90,0x9e,0x1c,0xe0,0x70,0x2d,0x90,0x9e,0x2e,0x51,0xb7,0x90, -+0x00,0x46,0xe0,0x54,0xfe,0xfd,0x7f,0x46,0x51,0xc1,0x90,0x05,0x22,0xe4,0xf0,0xa2, -+0xaf,0x33,0x90,0x9e,0x3f,0xf0,0xc2,0xaf,0x7d,0x20,0xe4,0xff,0x12,0x31,0x49,0x90, -+0x9e,0x3f,0xe0,0x24,0xff,0x92,0xaf,0x22,0x8b,0x59,0x8a,0x5a,0x89,0x5b,0x90,0x00, -+0x02,0x12,0x42,0x20,0x90,0x9e,0x1d,0xf0,0xe0,0x30,0xe0,0x4b,0x90,0x9e,0x14,0x74, -+0x01,0xf0,0x7f,0x80,0x7e,0x08,0x12,0x22,0x65,0x90,0x9e,0x16,0x12,0x25,0x08,0xab, -+0x59,0xaa,0x5a,0xa9,0x5b,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xe4,0xfc,0xfd,0xfe, -+0x78,0x1a,0x12,0x24,0xf5,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab,0x07,0x90,0x9e,0x16, -+0x12,0x43,0x53,0xec,0x54,0x03,0xfc,0x12,0x43,0x46,0x90,0x9e,0x20,0x12,0x25,0x08, -+0x90,0x05,0x22,0xe4,0xf0,0x80,0x2d,0xe4,0x90,0x9e,0x14,0xf0,0x7f,0x80,0x7e,0x08, -+0x12,0x22,0x65,0xec,0x54,0x03,0xfc,0xec,0x44,0xc0,0xfc,0x90,0x9e,0x16,0x12,0x25, -+0x08,0x90,0x9e,0x16,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e, -+0x08,0x12,0x2b,0x08,0x90,0x9e,0x1d,0xe0,0x30,0xe1,0x19,0x7d,0x0c,0x7f,0x47,0x51, -+0xc1,0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x51,0xc1,0x90,0x00,0x46,0xe0, -+0x44,0x10,0x80,0x1c,0x90,0x00,0x47,0xe0,0x54,0xf3,0xfd,0x7f,0x47,0x51,0xc1,0x90, -+0x00,0x48,0xe0,0x54,0xf3,0xfd,0x7f,0x48,0x51,0xc1,0x90,0x00,0x46,0xe0,0x54,0xef, -+0xfd,0x7f,0x46,0x51,0xc1,0xe4,0x90,0x9e,0x1a,0xf0,0x22,0x90,0x01,0x3c,0x74,0xff, -+0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x01,0x34,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd, -+0x7f,0x54,0x51,0xc1,0x7d,0xff,0x7f,0x55,0x51,0xc1,0x7d,0xff,0x7f,0x56,0x51,0xc1, -+0x7d,0xff,0x7f,0x57,0x41,0xc1,0x90,0x01,0x30,0xe4,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3, -+0xf0,0x90,0x01,0x38,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x50,0x51,0xc1, -+0xe4,0xfd,0x7f,0x51,0x51,0xc1,0xe4,0xfd,0x7f,0x52,0x51,0xc1,0xe4,0xfd,0x7f,0x53, -+0x41,0xc1,0xe5,0x22,0x64,0x01,0x70,0x3c,0xf1,0xbe,0xbf,0x01,0x05,0x7f,0x01,0x12, -+0x44,0xf1,0x90,0x00,0x46,0xe0,0x44,0x04,0xfd,0x7f,0x46,0x51,0xc1,0x90,0x00,0x44, -+0xe0,0x54,0xfb,0xfd,0x7f,0x44,0x51,0xc1,0x90,0x00,0x46,0xe0,0x54,0xfb,0xfd,0x7f, -+0x46,0x51,0xc1,0x7f,0x02,0xf1,0xea,0x8f,0x26,0x90,0x01,0xc9,0xe5,0x26,0xf0,0xb4, -+0x01,0x02,0xf1,0x2a,0x22,0x90,0x9e,0x1c,0xe0,0x64,0x01,0x60,0x02,0xc1,0xd7,0x90, -+0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46,0x51,0xc1,0x90,0x9e,0x2e,0xe0,0x70,0x31, -+0x90,0x9e,0x14,0xe0,0x60,0x15,0x90,0x9e,0x20,0x12,0x43,0x53,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x80,0x06,0x90,0x05,0x22,0x74,0x7f, -+0xf0,0x90,0x9e,0x1b,0xe0,0xff,0xd1,0xd8,0x90,0x9e,0x2e,0x74,0x01,0x51,0xb7,0x80, -+0x3f,0x90,0x9e,0x2e,0xe0,0x64,0x01,0x70,0x37,0x90,0x9e,0x1f,0xe0,0xff,0xd1,0xd8, -+0xe4,0x90,0x9e,0x2e,0xf0,0x90,0x00,0x45,0xe0,0x44,0x01,0xfd,0x7f,0x45,0x51,0xc1, -+0x90,0x9e,0x14,0xe0,0x60,0x15,0x90,0x9e,0x16,0x12,0x43,0x53,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x80,0x05,0x90,0x05,0x22,0xe4,0xf0, -+0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x9e,0x2a,0xe0,0x90,0x05,0x84,0xf0,0x90, -+0x9e,0x2b,0xe0,0x90,0x05,0x85,0xf0,0x90,0x9e,0x2c,0xe0,0x90,0x05,0x86,0xf0,0x90, -+0x9e,0x2d,0xe0,0x90,0x05,0x87,0xf0,0x22,0x90,0x05,0x60,0xe0,0x90,0x9e,0x2a,0xf0, -+0x90,0x05,0x61,0xe0,0x90,0x9e,0x2b,0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x2c,0xf0, -+0x90,0x05,0x63,0xe0,0x90,0x9e,0x2d,0xf0,0xc3,0x74,0xff,0x9f,0xfe,0x90,0x9e,0x2b, -+0xe0,0xd3,0x9e,0x40,0x1e,0xe0,0x2f,0xf0,0xa3,0xe0,0xb4,0xff,0x0f,0xe4,0xf0,0xa3, -+0xe0,0xb4,0xff,0x03,0xe4,0xf0,0x22,0x90,0x9e,0x2d,0x80,0x03,0x90,0x9e,0x2c,0xe0, -+0x04,0xf0,0x22,0x90,0x9e,0x2b,0xe0,0x2f,0xf0,0x22,0x90,0x00,0x49,0xe0,0x90,0x9e, -+0xb1,0xf0,0xe0,0x54,0x0f,0xf0,0x44,0xf0,0xfd,0x7f,0x49,0x51,0xc1,0x90,0x9e,0xb1, -+0xe0,0x44,0xb0,0xfd,0x7f,0x49,0x41,0xc1,0x8e,0x59,0x8f,0x5a,0x8b,0x5b,0x8a,0x5c, -+0x89,0x5d,0xe4,0x90,0x9e,0x34,0xf0,0xef,0x90,0x00,0x31,0xf0,0x31,0xb9,0xe5,0x59, -+0x54,0x03,0xff,0x90,0x00,0x32,0xe0,0x54,0xfc,0x4f,0xf0,0x31,0xb9,0x90,0x00,0x33, -+0xe0,0x54,0x7f,0xf0,0x31,0xb9,0x90,0x00,0x33,0xe0,0x20,0xe7,0x0e,0x90,0x9e,0x34, -+0xe0,0xc3,0x94,0x64,0x50,0x05,0xe0,0x04,0xf0,0x80,0xeb,0x90,0x9e,0x34,0xe0,0xc3, -+0x94,0x64,0x50,0x10,0x90,0x00,0x30,0xe0,0xab,0x5b,0xaa,0x5c,0xa9,0x5d,0x12,0x42, -+0x4d,0x7f,0x01,0x22,0x7f,0x00,0x22,0x12,0x45,0xb1,0xbf,0x01,0x10,0x90,0x02,0x09, -+0xe0,0xff,0x7d,0x01,0x12,0x47,0xfe,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x7f,0x0b, -+0xf1,0xea,0xef,0x65,0x25,0x60,0x10,0xe5,0x25,0xb4,0x01,0x05,0xe4,0xf5,0x25,0x80, -+0x03,0x75,0x25,0x01,0x7f,0x01,0x22,0x7f,0x00,0x22,0xe4,0x90,0x9e,0x74,0xf0,0x90, -+0x00,0x80,0xe0,0x44,0x80,0xfd,0x7f,0x80,0x41,0xc1,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0x90,0x9e,0xb2,0xef,0xf0,0xd3,0x94,0x07,0x50,0x47,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0xe0,0x5f,0xf0, -+0x12,0x49,0xb9,0x90,0x9e,0xb2,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8,0x05,0x08,0x80, -+0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x44,0xe0,0xfb,0xe4,0xfe, -+0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13,0xd8,0xf8,0xff, -+0x80,0x44,0x90,0x9e,0xb2,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08, -+0x80,0x02,0xc3,0x33,0xd8,0xfc,0x12,0x49,0xb1,0x90,0x9e,0xb2,0xe0,0xfd,0x74,0x01, -+0x7e,0x00,0xa8,0x05,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90, -+0x00,0x42,0xe0,0xfb,0xe4,0xfe,0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7, -+0x13,0xce,0x13,0xd8,0xf8,0xff,0xd0,0xd0,0x92,0xaf,0x22,0x75,0x28,0x33,0xe4,0xf5, -+0x29,0x75,0x2a,0x03,0xf5,0x2b,0x90,0x01,0x30,0xe5,0x28,0xf0,0xa3,0xe5,0x29,0xf0, -+0xa3,0xe5,0x2a,0xf0,0xa3,0xe5,0x2b,0xf0,0x22,0xe4,0x90,0x9e,0x31,0xf0,0xa3,0xf0, -+0x75,0x8e,0x02,0x12,0x4f,0xda,0x12,0x5f,0xa9,0x12,0x5f,0xbc,0xe4,0xf5,0x12,0x12, -+0x6f,0xa1,0x12,0x77,0x5d,0x12,0x60,0x9b,0x12,0x2e,0x01,0x12,0x77,0x18,0x11,0x8b, -+0x90,0x00,0xf3,0xe0,0x30,0xe2,0x0d,0x90,0x05,0x41,0x74,0x10,0xf0,0x90,0x05,0x5a, -+0xf0,0xa3,0xe4,0xf0,0x12,0x5f,0xf4,0x12,0x5f,0x91,0x12,0x44,0xfe,0x12,0x7d,0x1d, -+0x90,0x9e,0x33,0xe5,0xd9,0xf0,0x12,0x4d,0x8b,0xc2,0xaf,0x90,0x00,0x80,0xe0,0x44, -+0x40,0xf0,0x12,0x49,0xb9,0x75,0xe8,0x03,0x43,0xa8,0x85,0xd2,0xaf,0x90,0x01,0xbe, -+0xe0,0x04,0xf0,0x90,0x01,0xc0,0xe0,0x04,0xf0,0x90,0x9e,0x31,0xe0,0x64,0x01,0xf0, -+0x24,0xa9,0x90,0x01,0xc4,0xf0,0x74,0x50,0xa3,0xf0,0xe5,0x12,0x30,0xe4,0x09,0xc2, -+0xaf,0x53,0x12,0xef,0xd2,0xaf,0x31,0x8e,0xe5,0x12,0x30,0xe6,0x17,0xc2,0xaf,0x53, -+0x12,0xbf,0xd2,0xaf,0x12,0x69,0x51,0x90,0x9e,0x1e,0xe0,0xff,0x60,0x03,0xb4,0x01, -+0x03,0x12,0x7d,0x7b,0x90,0x9e,0x1e,0xe0,0x70,0x03,0x12,0x7e,0x7e,0x31,0x61,0x80, -+0xb8,0x90,0x06,0x34,0xe0,0x60,0x26,0x14,0x70,0x1b,0x7b,0x01,0x7a,0x06,0x79,0x35, -+0x7f,0xf9,0x7e,0x01,0x12,0x4f,0x48,0xbf,0x01,0x09,0x90,0x06,0x35,0xe0,0x54,0x0f, -+0xf0,0x80,0x05,0x80,0x00,0x02,0x77,0x0a,0xe4,0x90,0x06,0x34,0xf0,0x22,0x90,0x01, -+0xcc,0xe0,0x54,0x0f,0x90,0x9e,0x34,0xf0,0x90,0x9e,0x34,0xe0,0xfd,0x70,0x02,0x41, -+0xcf,0x90,0x9e,0xae,0xe0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3, -+0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xef,0x5d,0x70,0x02,0x41,0xc8,0x90,0x9e,0xae, -+0xe0,0x75,0xf0,0x04,0x90,0x01,0xd0,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x35,0xf0,0x75, -+0x1e,0x01,0x75,0x1f,0x9e,0x75,0x20,0x35,0x75,0x21,0x01,0x7b,0x01,0x7a,0x9e,0x79, -+0x36,0x12,0x45,0x09,0x90,0x9e,0x36,0xe0,0xff,0xc4,0x13,0x13,0x13,0x54,0x01,0x90, -+0x9e,0xae,0x30,0xe0,0x59,0xe0,0x75,0xf0,0x02,0x90,0x00,0x88,0x12,0x43,0x5f,0xe0, -+0x90,0x9e,0x37,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x02,0x90,0x00,0x89,0x12,0x43, -+0x5f,0xe0,0x90,0x9e,0x38,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd1, -+0x12,0x43,0x5f,0xe0,0x90,0x9e,0x39,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90, -+0x01,0xd2,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x3a,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0, -+0x04,0x90,0x01,0xd3,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x3b,0xf0,0x80,0x33,0xe0,0x75, -+0xf0,0x04,0x90,0x01,0xd1,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x37,0xf0,0x90,0x9e,0xae, -+0xe0,0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x38,0xf0,0x90, -+0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x39, -+0xf0,0xef,0x54,0x7f,0xff,0x7b,0x01,0x7a,0x9e,0x79,0x37,0x51,0xd0,0x90,0x9e,0x34, -+0xe0,0xff,0x90,0x9e,0xae,0xe0,0xfe,0x74,0x01,0xa8,0x06,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0x5f,0x90,0x9e,0x34,0xf0,0x90,0x9e,0xae,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0x90,0x01,0xcc,0xf0,0x90,0x9e,0xae,0xe0, -+0x04,0xf0,0xe0,0x54,0x03,0xf0,0x21,0x98,0x90,0x01,0xc6,0xe0,0x44,0x02,0xf0,0x22, -+0x90,0x9e,0x3c,0x12,0x43,0x8b,0xef,0x12,0x43,0x94,0x53,0x0b,0x01,0x53,0x14,0x02, -+0x53,0x2f,0x03,0x53,0x38,0x05,0x53,0x41,0x06,0x53,0x8f,0x07,0x53,0x49,0x09,0x53, -+0x52,0x0c,0x53,0x5b,0x0d,0x53,0x64,0x0e,0x53,0x6d,0x1b,0x53,0x76,0x1c,0x53,0x7f, -+0x2c,0x53,0x1d,0x2d,0x53,0x26,0x2e,0x00,0x00,0x53,0x88,0x90,0x9e,0x3c,0x12,0x43, -+0x6b,0x02,0x61,0x9d,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02,0x71,0xc4,0x90,0x9e,0x3c, -+0x12,0x43,0x6b,0x02,0x71,0xca,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02,0x72,0x12,0x90, -+0x9e,0x3c,0x12,0x43,0x6b,0x02,0x72,0x40,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02,0x71, -+0x74,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x80,0x47,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02, -+0x72,0x88,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02,0x4b,0x7e,0x90,0x9e,0x3c,0x12,0x43, -+0x6b,0x02,0x7c,0xea,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02,0x4c,0xb8,0x90,0x9e,0x3c, -+0x12,0x43,0x6b,0x02,0x71,0xbc,0x90,0x9e,0x3c,0x12,0x43,0x6b,0x02,0x71,0xa3,0x90, -+0x9e,0x3c,0x12,0x43,0x6b,0x02,0x75,0xea,0x90,0x01,0xc6,0xe0,0x44,0x01,0xf0,0x22, -+0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x1f,0xfe,0xef,0x54,0x20,0xc4,0x13,0x54, -+0x07,0xfd,0xaf,0x06,0x90,0x9e,0x3f,0xef,0xf0,0xa3,0xed,0xf0,0xa3,0x12,0x43,0x8b, -+0x90,0x9e,0x41,0x12,0x43,0x6b,0x90,0x00,0x03,0x12,0x42,0x20,0x54,0xf0,0xc4,0x54, -+0x0f,0x90,0x9e,0x44,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0x54,0x40,0xc4,0x13,0x13, -+0x54,0x03,0x90,0x9e,0x45,0xf0,0x90,0x9e,0x3f,0xe0,0xff,0x75,0xf0,0x09,0x90,0x96, -+0x46,0x12,0x43,0x5f,0xad,0x82,0xac,0x83,0x90,0x9e,0x46,0xec,0xf0,0xa3,0xed,0xf0, -+0xef,0x75,0xf0,0x09,0xa4,0x24,0x44,0xf9,0x74,0x96,0x35,0xf0,0xfa,0x7b,0x01,0xa3, -+0x12,0x43,0x8b,0x90,0x9e,0x41,0x12,0x43,0x6b,0x90,0x00,0x03,0x12,0x42,0x20,0x54, -+0x0f,0xff,0x90,0x9e,0x48,0x12,0x43,0x6b,0xef,0x12,0x42,0x4d,0x90,0x9e,0x41,0x12, -+0x43,0x6b,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x90,0x9e,0x48,0x12,0x43,0x6b,0x90, -+0x00,0x01,0xef,0x12,0x42,0x5f,0x90,0x9e,0x41,0x12,0x43,0x6b,0x90,0x00,0x01,0x12, -+0x42,0x20,0xff,0x90,0x9e,0x46,0xe0,0xfc,0xa3,0xe0,0xfd,0xf5,0x82,0x8c,0x83,0xef, -+0xf0,0x12,0x24,0x62,0x8d,0x82,0x8c,0x83,0xa3,0xf0,0x90,0x9e,0x44,0xe0,0xfe,0x90, -+0x9e,0x3f,0xe0,0xff,0x24,0x82,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0x90, -+0x9e,0x40,0xe0,0xfe,0x75,0xf0,0x09,0xef,0x90,0x96,0x4a,0x12,0x43,0x5f,0xee,0xf0, -+0x75,0xf0,0x09,0xef,0x90,0x96,0x4b,0x12,0x43,0x5f,0x74,0x01,0xf0,0x90,0x9e,0x45, -+0xe0,0xfe,0x75,0xf0,0x09,0xef,0x90,0x96,0x4c,0x12,0x43,0x5f,0xee,0xf0,0x8f,0x59, -+0xef,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xaf,0x82,0xf5,0x5b,0x8f,0x5c, -+0xe5,0x59,0x75,0xf0,0x02,0xa4,0x24,0x02,0xf9,0x74,0x95,0x35,0xf0,0x75,0x5d,0x01, -+0xf5,0x5e,0x89,0x5f,0x75,0xf0,0x09,0xe5,0x59,0x90,0x96,0x46,0x12,0x43,0x5f,0xaf, -+0x82,0x85,0x83,0x60,0x8f,0x61,0xe5,0x59,0x75,0xf0,0x09,0xa4,0x24,0x44,0xf9,0x74, -+0x96,0x35,0xf0,0x75,0x62,0x01,0xf5,0x63,0x89,0x64,0x74,0x82,0x25,0x59,0xf5,0x82, -+0xe4,0x34,0x95,0xf5,0x83,0xe0,0x12,0x43,0x94,0x55,0x1e,0x00,0x55,0x33,0x01,0x55, -+0x48,0x02,0x55,0x5d,0x03,0x55,0x86,0x04,0x55,0x9b,0x05,0x55,0xb0,0x06,0x55,0xd6, -+0x0c,0x56,0x03,0x0d,0x56,0x30,0x0e,0x56,0x5d,0x0f,0x00,0x00,0x56,0x91,0xe5,0x59, -+0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0x74, -+0x15,0x80,0x3c,0xe5,0x59,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83, -+0x74,0xf0,0xf0,0xa3,0x74,0x10,0x80,0x27,0xe5,0x59,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0x74,0x05,0x80,0x12,0xe5,0x59,0x25, -+0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0xe4,0xf0, -+0xe5,0x59,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0x74,0x0f,0xf0, -+0xa3,0x74,0x8f,0xf0,0xc1,0x91,0xe5,0x59,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34, -+0x9b,0xf5,0x83,0x74,0x0f,0xf0,0xa3,0x74,0xf5,0x80,0x27,0xe5,0x59,0x25,0xe0,0x24, -+0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0x0f,0xf0,0xa3,0x74,0xf0,0x80,0x12, -+0xe5,0x59,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0,0xa3, -+0x74,0x0d,0xf0,0xe5,0x59,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83, -+0xe4,0xf0,0xa3,0xf0,0xc1,0x91,0x90,0x04,0x47,0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f, -+0x12,0x42,0x4d,0x90,0x04,0x46,0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0x90,0x00,0x01, -+0x12,0x42,0x5f,0x90,0x04,0x45,0xe0,0x85,0x5c,0x82,0x85,0x5b,0x83,0xf0,0x90,0x04, -+0x44,0xc1,0x88,0x90,0x04,0x4b,0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0x12,0x42,0x4d, -+0x90,0x04,0x4a,0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0x90,0x00,0x01,0x12,0x42,0x5f, -+0x90,0x04,0x49,0xe0,0x85,0x5c,0x82,0x85,0x5b,0x83,0xf0,0x90,0x04,0x48,0x80,0x58, -+0x90,0x04,0x4f,0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0x12,0x42,0x4d,0x90,0x04,0x4e, -+0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0x90,0x00,0x01,0x12,0x42,0x5f,0x90,0x04,0x4d, -+0xe0,0x85,0x5c,0x82,0x85,0x5b,0x83,0xf0,0x90,0x04,0x4c,0x80,0x2b,0x90,0x04,0x53, -+0xe0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0x12,0x42,0x4d,0x90,0x04,0x52,0xe0,0xab,0x5d, -+0xaa,0x5e,0xa9,0x5f,0x90,0x00,0x01,0x12,0x42,0x5f,0x90,0x04,0x51,0xe0,0x85,0x5c, -+0x82,0x85,0x5b,0x83,0xf0,0x90,0x04,0x50,0xe0,0x85,0x5c,0x82,0x85,0x5b,0x83,0xa3, -+0xf0,0xab,0x5d,0xaa,0x5e,0xa9,0x5f,0xc0,0x03,0xc0,0x02,0xc0,0x01,0x12,0x24,0x62, -+0xff,0xab,0x62,0xaa,0x63,0xa9,0x64,0x12,0x24,0x62,0x5f,0xd0,0x01,0xd0,0x02,0xd0, -+0x03,0x12,0x42,0x4d,0xab,0x5d,0xe5,0x5f,0x24,0x01,0xf9,0xe4,0x35,0x5e,0xfa,0xc0, -+0x03,0xc0,0x02,0xc0,0x01,0x12,0x24,0x62,0xff,0xab,0x62,0xaa,0x63,0xa9,0x64,0x90, -+0x00,0x01,0x12,0x42,0x20,0x5f,0xd0,0x01,0xd0,0x02,0xd0,0x03,0x12,0x42,0x4d,0x85, -+0x5c,0x82,0x85,0x5b,0x83,0xc0,0x83,0xc0,0x82,0xe0,0xff,0x85,0x61,0x82,0x85,0x60, -+0x83,0xe0,0xfe,0xef,0x5e,0xd0,0x82,0xd0,0x83,0xf0,0x85,0x5c,0x82,0x85,0x5b,0x83, -+0xa3,0xc0,0x83,0xc0,0x82,0xe0,0xff,0x85,0x61,0x82,0x85,0x60,0x83,0xa3,0xe0,0xfe, -+0xef,0x5e,0xd0,0x82,0xd0,0x83,0xf0,0xe5,0x59,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3b,0x75,0x5a,0x0b,0x74,0x01, -+0x7e,0x00,0xa8,0x5a,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xe5, -+0x59,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0x5e,0xfe,0xa3, -+0xe0,0x5f,0x4e,0x60,0x06,0xe5,0x5a,0x24,0x10,0x80,0x5d,0x15,0x5a,0xe5,0x5a,0xc3, -+0x94,0x00,0x50,0xca,0x80,0x56,0xe5,0x59,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34, -+0x9b,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3d,0x75,0x5a,0x0f,0x74,0x01,0x7e, -+0x00,0xa8,0x5a,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xe5,0x59, -+0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x60,0x08,0x90,0x9e,0x4b,0xe5,0x5a,0xf0,0x80,0x10,0x15,0x5a,0xe5,0x5a, -+0xc3,0x94,0x00,0x50,0xc8,0x80,0x05,0xe4,0x90,0x9e,0x4b,0xf0,0xe5,0x59,0x25,0xe0, -+0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3b, -+0xe4,0xf5,0x5a,0x74,0x01,0x7e,0x00,0xa8,0x5a,0x08,0x80,0x05,0xc3,0x33,0xce,0x33, -+0xce,0xd8,0xf9,0xff,0xe5,0x59,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5, -+0x83,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x08,0x90,0x9e,0x4c,0xe5,0x5a,0xf0, -+0x80,0x5b,0x05,0x5a,0xe5,0x5a,0xb4,0x10,0xca,0x80,0x52,0xe5,0x59,0x25,0xe0,0x24, -+0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x39,0xe4, -+0xf5,0x5a,0x74,0x01,0x7e,0x00,0xa8,0x5a,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce, -+0xd8,0xf9,0xff,0xe5,0x59,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83, -+0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x06,0xe5,0x5a,0x24,0x10,0x80,0x0a,0x05, -+0x5a,0xe5,0x5a,0xb4,0x0c,0xcc,0x80,0x05,0xe4,0x90,0x9e,0x4c,0xf0,0x90,0x9e,0x4b, -+0xe0,0xff,0x75,0xf0,0x09,0xe5,0x59,0x90,0x96,0x48,0x12,0x43,0x5f,0xef,0xf0,0x90, -+0x9e,0x4c,0xe0,0xfe,0x75,0xf0,0x09,0xe5,0x59,0x90,0x96,0x49,0x12,0x43,0x5f,0xee, -+0xf0,0x74,0x84,0x25,0x59,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0xd3,0x9f,0x40, -+0x05,0x90,0x9e,0x4b,0x11,0xe0,0x74,0x84,0x25,0x59,0xf5,0x82,0xe4,0x34,0x04,0xf5, -+0x83,0xe0,0xff,0x90,0x9e,0x4c,0xe0,0xfe,0xef,0xc3,0x9e,0x50,0x02,0x11,0xe0,0x90, -+0x9e,0x4b,0xe0,0xff,0xd3,0x94,0x13,0x40,0x07,0x90,0x96,0x43,0x74,0x03,0xf0,0x22, -+0xef,0xd3,0x94,0x0b,0x40,0x07,0x90,0x96,0x43,0x74,0x02,0xf0,0x22,0xef,0xd3,0x94, -+0x03,0x40,0x07,0x90,0x96,0x43,0x74,0x01,0xf0,0x22,0xe4,0x90,0x96,0x43,0xf0,0x22, -+0xe0,0xfd,0x74,0x26,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xed,0xf0,0xaf, -+0x59,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xef,0xc3,0x94,0x20,0x50,0x0e,0x74,0x84, -+0x2f,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xed,0xf0,0x80,0x29,0x74,0xa6,0x2f,0xf5, -+0x82,0xe4,0x34,0x9c,0xf5,0x83,0xed,0xf0,0x90,0x9e,0x78,0xef,0xf0,0x24,0xa6,0xf5, -+0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x90,0x9e,0x79,0xf0,0x7b,0x01,0x7a,0x9e,0x79, -+0x78,0x7d,0x02,0x31,0x3a,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0x90,0x9e,0x97,0x12,0x43,0x8b,0x90,0x9e,0x9a,0xe0,0x54,0xf0,0x44,0x06,0xff, -+0xf0,0xed,0x54,0x0f,0xc4,0x54,0xf0,0xfe,0xef,0x54,0x0f,0x4e,0xf0,0x90,0x9e,0x97, -+0x12,0x43,0x6b,0x90,0x9e,0x94,0x12,0x43,0x8b,0x7b,0x01,0x7a,0x9e,0x79,0x9a,0xd1, -+0x14,0xd0,0xd0,0x92,0xaf,0x22,0x8f,0x50,0x8d,0x51,0xe5,0x51,0x54,0x1f,0xf5,0x56, -+0x74,0x01,0x2f,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe0,0xf5,0x54,0x90,0x04,0xfd, -+0xe0,0xb4,0x01,0x05,0x75,0x57,0x03,0x80,0x03,0x75,0x57,0x01,0xeb,0xc3,0x95,0x57, -+0x40,0x04,0xaf,0x50,0x80,0x33,0xe5,0x54,0x25,0x53,0xf5,0x55,0xe5,0x56,0x90,0x41, -+0xd6,0x93,0xff,0xe5,0x55,0xd3,0x9f,0x74,0x01,0x40,0x11,0x25,0x50,0xf5,0x82,0xe4, -+0x34,0x94,0xf5,0x83,0xe4,0xf0,0xad,0x51,0xaf,0x50,0x01,0xf1,0x25,0x50,0xf5,0x82, -+0xe4,0x34,0x94,0xf5,0x83,0xe5,0x55,0xf0,0x22,0xad,0x07,0x75,0xf0,0x09,0xed,0x90, -+0x96,0x48,0x12,0x43,0x5f,0xe0,0xff,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5, -+0x83,0xe0,0x54,0x1f,0xf5,0x58,0xd3,0x9f,0x40,0x02,0x8f,0x58,0xe5,0x58,0x25,0xe0, -+0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff, -+0xe5,0x58,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93, -+0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2, -+0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0xaf,0x05,0xad,0x58, -+0x11,0xf1,0xaf,0x58,0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75, -+0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06, -+0xc0,0x07,0x90,0x01,0xc4,0x74,0x45,0xf0,0x74,0x5a,0xa3,0xf0,0x90,0x01,0x34,0xe0, -+0x55,0x28,0xf5,0x2c,0x90,0x01,0x36,0xe0,0x55,0x2a,0xf5,0x2e,0xa3,0xe0,0x55,0x2b, -+0xf5,0x2f,0xe5,0x2c,0x20,0xe0,0x02,0x61,0xe1,0x90,0x01,0x34,0x74,0x01,0xf0,0x85, -+0xd1,0x08,0x85,0xd2,0x09,0x85,0xd3,0x0a,0x85,0xd4,0x0b,0x85,0xd5,0x0c,0x85,0xd6, -+0x0d,0x85,0xd7,0x0e,0x85,0xd9,0x0f,0xe5,0x0f,0x54,0x40,0xc3,0x13,0xff,0xe5,0x0e, -+0x54,0x20,0x6f,0x70,0x02,0x61,0x93,0xe5,0x0f,0x30,0xe5,0x02,0x61,0x93,0xe5,0x0d, -+0x54,0x3f,0xf5,0x4d,0xe5,0x08,0x54,0x3f,0xf5,0x4e,0xe5,0x0c,0x54,0x1f,0xff,0xe5, -+0x4d,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0x8f,0xf0,0x12, -+0x42,0x81,0xe5,0x0e,0x54,0x1f,0xff,0xe5,0x4d,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4, -+0x34,0x93,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x4e,0xd3,0x94,0x04,0x40, -+0x03,0x75,0x4e,0x04,0x75,0xf0,0x0a,0xe5,0x4d,0x90,0x90,0x00,0x12,0x43,0x5f,0x75, -+0xf0,0x02,0xe5,0x4e,0x12,0x43,0x5f,0xe0,0xfe,0xa3,0xe0,0xff,0xe5,0x0e,0x54,0x1f, -+0x2f,0xff,0xe4,0x3e,0xfe,0x75,0xf0,0x0a,0xe5,0x4d,0x90,0x90,0x00,0x12,0x43,0x5f, -+0x75,0xf0,0x02,0xe5,0x4e,0x12,0x43,0x5f,0xee,0xf0,0xa3,0xef,0xf0,0xe5,0x0f,0x20, -+0xe6,0x23,0xe5,0x0e,0x54,0x1f,0xff,0xe5,0x4d,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4, -+0x34,0x98,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x0a,0x30,0xe7,0x34,0xaf, -+0x4d,0x31,0xd9,0x80,0x2e,0xe5,0x0e,0x54,0x1f,0xff,0xe5,0x4d,0x25,0xe0,0x24,0x44, -+0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x0a,0x30, -+0xe7,0x11,0xe5,0x0a,0x54,0x7f,0xfd,0xe5,0x0e,0x54,0x1f,0xf5,0x53,0xab,0x4e,0xaf, -+0x4d,0x31,0x76,0xe5,0x74,0x14,0x24,0xfd,0x50,0x02,0x80,0x45,0x90,0x9e,0x61,0xe0, -+0x60,0x37,0x90,0x01,0x5b,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x04,0xf0,0xd1,0x05,0xef, -+0x64,0x01,0x70,0x2d,0x90,0x9e,0x55,0xe0,0xf5,0x44,0x75,0x45,0x00,0xe4,0xfb,0xfd, -+0x7f,0x58,0x7e,0x01,0x12,0x30,0x62,0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92, -+0x74,0x01,0xf0,0x90,0x9e,0x5d,0xf0,0x80,0x08,0xd1,0x05,0xbf,0x01,0x03,0x12,0x44, -+0xd3,0xe5,0x2c,0x30,0xe1,0x20,0x90,0x01,0x34,0x74,0x02,0xf0,0x85,0xd1,0x13,0x85, -+0xd2,0x14,0x85,0xd3,0x15,0x85,0xd4,0x16,0x85,0xd5,0x17,0x85,0xd6,0x18,0x85,0xd7, -+0x19,0x85,0xd9,0x1a,0xd1,0x9c,0xe5,0x2c,0x30,0xe3,0x06,0x90,0x01,0x34,0x74,0x08, -+0xf0,0xe5,0x2c,0x30,0xe4,0x09,0x90,0x01,0x34,0x74,0x10,0xf0,0x43,0x12,0x10,0xe5, -+0x2c,0x30,0xe5,0x26,0x90,0x01,0xcf,0xe0,0x30,0xe5,0x1f,0xe0,0x54,0xdf,0xf0,0x90, -+0x01,0x34,0x74,0x20,0xf0,0x75,0xa8,0x00,0x75,0xe8,0x00,0x12,0x4d,0xb6,0x90,0x00, -+0x03,0xe0,0x54,0xfb,0xf0,0x12,0x49,0xb9,0x80,0xfe,0xe5,0x2c,0x30,0xe6,0x06,0x90, -+0x01,0x34,0x74,0x40,0xf0,0xe5,0x2e,0x30,0xe1,0x3c,0x90,0x01,0x36,0x74,0x02,0xf0, -+0x43,0x12,0x40,0x90,0x01,0x02,0xe0,0x54,0x03,0x64,0x01,0x70,0x29,0x90,0x01,0x37, -+0xe0,0x30,0xe0,0x0a,0x74,0x01,0xf0,0x90,0x9e,0x66,0xe4,0xf0,0x80,0x18,0x90,0x9e, -+0x66,0xe0,0x04,0xf0,0xe0,0xc3,0x94,0x0a,0x40,0x0c,0xe4,0xf0,0x90,0x04,0x19,0xe0, -+0x30,0xe0,0x03,0x12,0x4f,0xa7,0xe5,0x2e,0x30,0xe0,0x12,0x90,0x9e,0x76,0x74,0x01, -+0xf0,0x90,0x01,0x36,0xf0,0x12,0x64,0xfe,0x90,0x9e,0x76,0xe4,0xf0,0xe5,0x2e,0x30, -+0xe2,0x78,0x90,0x01,0x36,0x74,0x04,0xf0,0x90,0x01,0xbd,0xe0,0x04,0xf0,0xe5,0x73, -+0x64,0x01,0x70,0x66,0xe5,0x74,0x60,0x62,0xe5,0x74,0x64,0x02,0x60,0x06,0xe5,0x74, -+0x64,0x05,0x70,0x27,0x90,0x06,0xab,0xe0,0x90,0x9e,0x50,0xf0,0x90,0x06,0xaa,0xe0, -+0x90,0x9e,0x5f,0xf0,0x90,0x9e,0x50,0xe0,0x70,0x07,0x90,0x9e,0x5f,0xe0,0xff,0x80, -+0x05,0x90,0x9e,0x50,0xe0,0xff,0x90,0x9e,0x50,0xef,0xf0,0x90,0x9e,0x52,0xe0,0x60, -+0x03,0xe0,0x14,0xf0,0x90,0x9e,0x51,0xe4,0xf0,0x90,0x01,0x57,0xf0,0x90,0x01,0x3c, -+0x74,0x02,0xf0,0x90,0x9e,0x63,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xef,0xf0,0xe5,0x74, -+0x14,0x24,0xfd,0x50,0x02,0x80,0x03,0x12,0x45,0x53,0xe5,0x2e,0x30,0xe3,0x28,0x90, -+0x01,0x36,0x74,0x08,0xf0,0xe5,0x73,0x64,0x01,0x70,0x1c,0xe5,0x74,0x60,0x18,0x90, -+0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x9e,0x89,0xe4,0x12,0x44, -+0x52,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x2e,0x30,0xe4,0x2f,0x90,0x01,0x36,0x74, -+0x10,0xf0,0xe5,0x73,0x64,0x01,0x70,0x23,0xe5,0x74,0x60,0x1f,0x90,0x01,0x57,0xe4, -+0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x9e,0x62,0xe4,0xf0,0x90,0x9e,0x63,0xe0, -+0x54,0xfd,0xf0,0xe0,0x54,0x07,0x70,0x03,0x12,0x44,0xd3,0xe5,0x2e,0x30,0xe5,0x1f, -+0x90,0x01,0x36,0x74,0x20,0xf0,0xe5,0x73,0xb4,0x01,0x14,0xe5,0x74,0x60,0x10,0x90, -+0x9e,0x61,0xe0,0x64,0x02,0x60,0x05,0x12,0x44,0xdc,0x80,0x03,0x12,0x44,0x80,0xe5, -+0x2e,0x30,0xe6,0x1e,0x90,0x01,0x36,0x74,0x40,0xf0,0xe5,0x73,0xb4,0x01,0x13,0xe5, -+0x74,0x60,0x0f,0x90,0x9e,0x63,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0x07,0x70,0x03,0x12, -+0x44,0xd3,0xe5,0x2f,0x30,0xe1,0x08,0x90,0x01,0x37,0x74,0x02,0xf0,0xd1,0xbd,0x74, -+0x45,0x04,0x90,0x01,0xc4,0xf0,0x74,0x5a,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05, -+0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83, -+0xd0,0xf0,0xd0,0xe0,0x32,0x90,0x04,0x1b,0xe0,0x54,0x7f,0x64,0x7f,0x7f,0x01,0x60, -+0x02,0x7f,0x00,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x91,0x12,0x43, -+0x8b,0x90,0x9e,0x75,0xe0,0x64,0x02,0x60,0x6e,0x90,0x9e,0x75,0xe0,0x64,0x01,0x70, -+0x66,0x90,0x9e,0xb0,0xe0,0xff,0x04,0xf0,0x90,0x9e,0x91,0x12,0x43,0x6b,0x90,0x00, -+0x01,0xef,0x12,0x42,0x5f,0x7f,0xaf,0x7e,0x01,0xf1,0x3b,0xef,0x60,0x49,0x90,0x9e, -+0x91,0x12,0x43,0x6b,0x8b,0x1e,0x8a,0x1f,0x89,0x20,0x75,0x21,0x02,0x7b,0x01,0x7a, -+0x01,0x79,0xa0,0x12,0x45,0x09,0x90,0x9e,0x94,0x12,0x43,0x6b,0x8b,0x1e,0x8a,0x1f, -+0x89,0x20,0x90,0x9e,0x91,0x12,0x43,0x6b,0x12,0x24,0x62,0xff,0xc4,0x54,0x0f,0xf5, -+0x21,0x7b,0x01,0x7a,0x01,0x79,0xa2,0x12,0x45,0x09,0x90,0x01,0xaf,0x74,0xff,0xf0, -+0x90,0x01,0xcb,0xe0,0x64,0x80,0xf0,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x9e,0x2f,0xe0, -+0x54,0xf0,0x44,0x03,0xf0,0x54,0x0f,0x44,0x80,0xf0,0x7b,0x00,0x7a,0x00,0x79,0x13, -+0x90,0x9e,0x94,0x12,0x43,0x8b,0x0b,0x7a,0x9e,0x79,0x2f,0xc1,0x14,0x7d,0x02,0x7f, -+0x03,0x12,0x31,0x2c,0xe5,0x74,0x14,0x24,0xfd,0x50,0x02,0x80,0x23,0x90,0x9e,0x61, -+0xe0,0x60,0x06,0x7d,0x01,0x7f,0x0c,0x80,0x0f,0x90,0x9e,0x5e,0xe0,0x54,0x0f,0xc3, -+0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x1a,0xe4,0xff,0x12,0x48,0x8f, -+0x22,0xd1,0x05,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x32, -+0x90,0x9e,0x5d,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x24,0x90,0x9e, -+0x5c,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x16,0x90,0x9e,0x60,0xe0, -+0x54,0x0f,0xd3,0x94,0x04,0x40,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x03,0x7f, -+0x01,0x22,0x90,0x01,0xb8,0x74,0x08,0xf0,0x7f,0x00,0x22,0xd3,0x10,0xaf,0x01,0xc3, -+0xc0,0xd0,0x90,0x9e,0xa0,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0x90, -+0x9e,0xa0,0xe0,0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x2d,0xc3,0x90,0x9e, -+0xa3,0xe0,0x94,0xe8,0x90,0x9e,0xa2,0xe0,0x94,0x03,0x40,0x0b,0x90,0x01,0xc6,0xe0, -+0x44,0x10,0xf0,0x7f,0x00,0x80,0x15,0x90,0x9e,0xa2,0xe4,0x75,0xf0,0x01,0x12,0x42, -+0x81,0x7f,0x0a,0x7e,0x00,0x12,0x32,0x15,0x80,0xc5,0x7f,0x01,0xd0,0xd0,0x92,0xaf, -+0x22,0x75,0x30,0x1f,0x75,0x31,0x01,0xe4,0xf5,0x32,0x90,0x01,0x38,0xe5,0x30,0xf0, -+0xa3,0xe5,0x31,0xf0,0xa3,0xe5,0x32,0xf0,0x22,0x90,0x00,0x02,0xe0,0x54,0xe0,0x90, -+0x9e,0x75,0x60,0x04,0x74,0x01,0xf0,0x22,0x74,0x02,0xf0,0x22,0x90,0x00,0xf3,0xe0, -+0x30,0xe3,0x08,0x90,0x9e,0x77,0x74,0x01,0xf0,0x80,0x05,0xe4,0x90,0x9e,0x77,0xf0, -+0x90,0x9e,0x77,0xe0,0xb4,0x01,0x12,0x90,0x00,0xf2,0xe0,0x30,0xe7,0x0b,0x90,0x9e, -+0x64,0x74,0xfd,0xf0,0xa3,0x74,0x33,0xf0,0x22,0x90,0x9e,0x64,0x74,0xfd,0xf0,0xa3, -+0x74,0x2f,0xf0,0x22,0x90,0x01,0x64,0x74,0xa0,0xf0,0x22,0xc0,0xe0,0xc0,0xf0,0xc0, -+0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03, -+0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01,0xc4,0x74,0xfb,0xf0,0x74,0x5f, -+0xa3,0xf0,0x53,0x91,0xef,0x90,0x00,0x51,0xe0,0xff,0x90,0x00,0x55,0xe0,0x5f,0xf5, -+0x3d,0xe5,0x3d,0x30,0xe6,0x18,0x74,0x40,0xf0,0x90,0x9e,0x1d,0xe0,0x54,0x03,0xff, -+0xbf,0x03,0x0b,0x90,0x9e,0x1a,0xe0,0x60,0x05,0x7f,0x01,0x12,0x4a,0xd6,0xe5,0x3d, -+0x30,0xe7,0x15,0x90,0x00,0x55,0x74,0x80,0xf0,0x90,0x9e,0x1d,0xe0,0x54,0x03,0xff, -+0xbf,0x03,0x05,0x7f,0x02,0x12,0x4a,0xd6,0x90,0x01,0xc4,0x74,0xfb,0xf0,0x74,0x5f, -+0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01, -+0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0x8f,0x6b,0x8c, -+0x6c,0x8d,0x6d,0x22,0x8f,0x6e,0x8c,0x6f,0x8d,0x70,0x22,0xe4,0xf5,0x73,0x90,0x9e, -+0x63,0xf0,0xf5,0x74,0x90,0x9e,0x60,0x74,0x0c,0xf0,0x90,0x9e,0x5e,0xf0,0xe4,0x90, -+0x9e,0x61,0xf0,0x90,0x9e,0x5d,0xf0,0x90,0x9e,0x5c,0xf0,0x90,0x9e,0x5f,0x04,0xf0, -+0x90,0x9e,0x50,0xf0,0xe4,0x90,0x9e,0x62,0xf0,0x90,0x9e,0x52,0xf0,0x90,0x9e,0x5a, -+0x74,0x07,0xf0,0xe4,0x90,0x9e,0x51,0xf0,0x90,0x9e,0x58,0xf0,0xa3,0x74,0x02,0xf0, -+0x90,0x9e,0x56,0x14,0xf0,0xa3,0x74,0x03,0xf0,0x90,0x9e,0x55,0x74,0x14,0xf0,0x90, -+0x9e,0x5b,0x74,0x05,0xf0,0xe4,0x90,0x9e,0x54,0xf0,0x90,0x9e,0x4f,0xf0,0x90,0x9e, -+0x76,0xf0,0x22,0xe4,0x90,0x9e,0x62,0xf0,0x90,0x9e,0x51,0xf0,0x90,0x9e,0x63,0xf0, -+0x22,0x8b,0x59,0x8a,0x5a,0x89,0x5b,0x31,0x03,0xab,0x59,0xaa,0x5a,0xa9,0x5b,0x12, -+0x24,0x62,0xf5,0x74,0x14,0x60,0x0e,0x14,0x60,0x1e,0x14,0x60,0x2f,0x24,0x03,0x70, -+0x40,0x7f,0x01,0x80,0x3a,0xab,0x59,0xaa,0x5a,0xa9,0x5b,0x90,0x00,0x02,0x12,0x42, -+0x20,0xfd,0xe4,0xff,0x31,0x72,0x80,0x27,0xab,0x59,0xaa,0x5a,0xa9,0x5b,0x90,0x00, -+0x02,0x12,0x42,0x20,0xfd,0x7f,0x01,0x31,0x72,0x1f,0x80,0x13,0xab,0x59,0xaa,0x5a, -+0xa9,0x5b,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x02,0x31,0x72,0xe4,0xff,0x31, -+0xc6,0x22,0xef,0x24,0xfe,0x60,0x0b,0x04,0x70,0x22,0x90,0x9e,0x5f,0x74,0x01,0xf0, -+0x80,0x16,0xed,0x70,0x0a,0x90,0x9e,0x5b,0xe0,0x90,0x9e,0x5f,0xf0,0x80,0x05,0x90, -+0x9e,0x5f,0xed,0xf0,0x90,0x9e,0x5f,0xe0,0x90,0x9e,0x50,0xf0,0x22,0xd3,0x10,0xaf, -+0x01,0xc3,0xc0,0xd0,0x90,0x00,0x01,0x12,0x42,0x20,0x90,0x9e,0x61,0xf0,0x90,0x00, -+0x03,0x12,0x42,0x20,0x90,0x9e,0x4f,0xf0,0x12,0x24,0x62,0x65,0x74,0x60,0x02,0x31, -+0x11,0xd0,0xd0,0x92,0xaf,0x22,0xef,0x64,0x01,0x70,0x30,0x7d,0x7c,0x7f,0x02,0x12, -+0x31,0x2c,0x7d,0x02,0x7f,0x03,0x12,0x31,0x2c,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01, -+0x3c,0x74,0x02,0xf0,0x12,0x47,0x16,0xe4,0xff,0x12,0x48,0x8f,0x90,0x06,0x04,0xe0, -+0x54,0x7f,0xf0,0x90,0x06,0x0a,0xe0,0x54,0xf8,0xf0,0x22,0x90,0x01,0x36,0x74,0x7c, -+0xf0,0xa3,0x74,0x02,0xf0,0x7d,0x7c,0xff,0x12,0x31,0x9d,0x7d,0x02,0x7f,0x03,0x12, -+0x31,0x9d,0x90,0x06,0x04,0xe0,0x44,0x80,0xf0,0x90,0x06,0x0a,0xe0,0x44,0x07,0xf0, -+0x90,0x9e,0x58,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0xe5,0x73,0x30,0xe0,0x1b,0x90, -+0x9e,0x52,0xe0,0x70,0x1a,0xe0,0x04,0xf0,0x90,0x9e,0x5e,0xe0,0x54,0x0f,0xc3,0x94, -+0x04,0x50,0x0c,0x7d,0x01,0x7f,0x04,0x02,0x47,0x1a,0xe4,0x90,0x9e,0x52,0xf0,0x22, -+0x12,0x5e,0x05,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x52, -+0x90,0x9e,0x63,0xe0,0x54,0x03,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x42, -+0x90,0x9e,0x60,0xe0,0x54,0x0f,0xd3,0x94,0x02,0x40,0x08,0x90,0x01,0xb9,0x74,0x04, -+0xf0,0x80,0x2f,0x90,0x9e,0x63,0xe0,0x30,0xe2,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0, -+0x80,0x20,0x90,0x9e,0x63,0xe0,0x30,0xe4,0x08,0x90,0x01,0xb9,0x74,0x10,0xf0,0x80, -+0x11,0x90,0x9e,0x52,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x20,0xf0,0x80,0x03,0x7f, -+0x01,0x22,0x90,0x01,0xb8,0x74,0x04,0xf0,0x7f,0x00,0x22,0xe5,0x12,0x60,0x08,0x90, -+0x01,0xb9,0x74,0x01,0xf0,0x80,0x5e,0x90,0x9e,0x60,0xe0,0x54,0x0f,0xd3,0x94,0x01, -+0x40,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x4b,0x90,0x02,0x87,0xe0,0x60,0x08, -+0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x3d,0x90,0x9e,0x75,0xe0,0xb4,0x02,0x10,0x90, -+0x9e,0x64,0xe0,0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x17,0x80,0x26,0x90, -+0x9e,0x75,0xe0,0xb4,0x01,0x0e,0x90,0x01,0xaf,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74, -+0x08,0xf0,0x80,0x11,0x90,0x9e,0x54,0xe0,0x70,0x08,0x90,0x01,0xb9,0x74,0x10,0xf0, -+0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74,0x02,0xf0,0x7f,0x00,0x22,0x90,0x06, -+0x04,0xe0,0x54,0xbf,0xf0,0xef,0x60,0x09,0xe5,0x73,0xb4,0x01,0x04,0xe4,0xff,0x71, -+0x4d,0x90,0x9e,0x5e,0xe0,0x54,0xf0,0xf0,0xe0,0x44,0x0c,0xf0,0x22,0x8f,0x76,0x90, -+0x9e,0x5e,0xe0,0x90,0x01,0xc1,0xf0,0xa3,0xe5,0x12,0xf0,0x12,0x45,0xb1,0xef,0x64, -+0x01,0x70,0x2e,0x90,0x9e,0x69,0x12,0x47,0xfa,0xe5,0x76,0x60,0x10,0x74,0x21,0x2f, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x80,0x0e,0x74,0x21,0x2f, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xef,0xf0,0x90,0x04,0x1f,0x74,0x20, -+0xf0,0x22,0x90,0x9e,0xaf,0xef,0xf0,0x71,0xb0,0x90,0x9e,0xaf,0xe0,0x60,0x05,0x90, -+0x05,0x22,0xe4,0xf0,0x90,0x9e,0x5e,0xe0,0x54,0xf0,0xf0,0xe0,0x44,0x04,0xf0,0x22, -+0x90,0x00,0x11,0xe0,0x44,0x09,0xf0,0x12,0x49,0xb9,0x90,0x9d,0xff,0x12,0x43,0x53, -+0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x78,0x7e,0x08,0x12,0x2b,0x08,0x90,0x9e,0x03, -+0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08, -+0x90,0x9e,0x07,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x00,0x7e,0x08, -+0x12,0x2b,0x08,0x90,0x9e,0x0b,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f, -+0x70,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x68,0x12,0x25,0x14,0x00,0x03,0x2d,0x95, -+0xe4,0xfd,0xff,0x12,0x30,0x2c,0x90,0x9e,0x77,0xe0,0xb4,0x01,0x11,0x90,0x80,0x68, -+0x12,0x25,0x14,0x00,0x03,0x2d,0x95,0xe4,0xfd,0x7f,0x01,0x12,0x30,0x2c,0x22,0x8f, -+0x27,0xe4,0x90,0x9e,0xa8,0xf0,0xa3,0xf0,0x90,0x01,0x09,0xe0,0x7f,0x00,0x30,0xe7, -+0x02,0x7f,0x01,0xef,0x65,0x27,0x60,0x3e,0xc3,0x90,0x9e,0xa9,0xe0,0x94,0x88,0x90, -+0x9e,0xa8,0xe0,0x94,0x13,0x40,0x08,0x90,0x01,0xc6,0xe0,0x44,0x80,0xf0,0x22,0x90, -+0x9e,0xa8,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x7f,0x14,0x7e,0x00,0x12,0x32,0x15, -+0xd3,0x90,0x9e,0xa9,0xe0,0x94,0x32,0x90,0x9e,0xa8,0xe0,0x94,0x00,0x40,0xb9,0x90, -+0x01,0xc7,0xe0,0x30,0xe0,0xb2,0x22,0x90,0x9e,0x5e,0xe0,0x54,0xf0,0xf0,0xe0,0x44, -+0x01,0xf0,0x12,0x44,0xff,0x12,0x45,0x00,0xe0,0x54,0xf0,0xf0,0xe0,0x44,0x02,0xf0, -+0x22,0x90,0x9e,0x60,0xe0,0x30,0xe6,0x1c,0xe0,0x54,0x0f,0xff,0x90,0x9e,0x4e,0xe0, -+0xfe,0x4f,0x90,0x01,0x2f,0xf0,0xee,0x64,0x80,0x90,0x9e,0x4e,0xf0,0x90,0x9e,0x60, -+0xe0,0x54,0xbf,0xf0,0x22,0x8f,0x75,0x12,0x45,0xb1,0xef,0x64,0x01,0x70,0x2e,0x90, -+0x9e,0x6a,0x12,0x47,0xfa,0xe5,0x75,0x60,0x10,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34, -+0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x80,0x0e,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34, -+0xfc,0xf5,0x83,0xe0,0x54,0xef,0xf0,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0xe4,0x90, -+0x9e,0x2f,0xf0,0xe5,0x74,0x60,0x6a,0xe5,0x73,0x64,0x01,0x70,0x64,0xe5,0x74,0x14, -+0x60,0x29,0x24,0xfd,0x60,0x25,0x24,0x02,0x24,0xfb,0x50,0x02,0x80,0x23,0x90,0x9e, -+0x50,0xe0,0x14,0xf0,0xe0,0x60,0x04,0xa3,0xe0,0x60,0x16,0x90,0x9e,0x50,0xe0,0x70, -+0x0a,0x90,0x9e,0x5f,0xe0,0x90,0x9e,0x50,0xf0,0x80,0x00,0x90,0x9e,0x2f,0x74,0x01, -+0xf0,0x90,0x9e,0x2f,0xe0,0x60,0x2a,0x90,0x9e,0x63,0xe0,0x44,0x10,0xf0,0xe4,0x90, -+0x9e,0x89,0xf0,0x90,0x9e,0x5a,0x12,0x44,0x56,0x90,0x01,0x57,0x74,0x05,0xf0,0x90, -+0x9e,0x5e,0xe0,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47, -+0x1a,0x22,0xef,0xc3,0x94,0x20,0x50,0x39,0xef,0x30,0xe0,0x17,0xed,0xc4,0x54,0xf0, -+0xfd,0xef,0xc3,0x13,0xfe,0x24,0xa4,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x54, -+0x0f,0x80,0x10,0xef,0xc3,0x13,0xfe,0x24,0xa4,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83, -+0xe0,0x54,0xf0,0xf0,0x74,0xa4,0x2e,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x4d, -+0xf0,0x22,0xad,0x07,0xed,0xc3,0x94,0x20,0x50,0x0d,0x74,0x84,0x2d,0xf5,0x82,0xe4, -+0x34,0x04,0xf5,0x83,0xe0,0x80,0x0b,0x74,0xa6,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5, -+0x83,0xe0,0x54,0x7f,0xf5,0x64,0xe5,0x64,0x54,0x1f,0xfc,0x75,0xf0,0x09,0xed,0x90, -+0x96,0x48,0x12,0x43,0x5f,0xe0,0xff,0x90,0x9e,0x3e,0xf0,0xed,0x25,0xe0,0x24,0x02, -+0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x3f,0xcb,0xf0, -+0xa3,0xeb,0xf0,0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0, -+0xfb,0xa3,0xe0,0x90,0x9e,0x41,0xcb,0xf0,0xa3,0xeb,0xf0,0xec,0x25,0xe0,0x24,0x66, -+0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xe4,0x93,0xfa,0x74,0x01,0x93,0xfb,0xed,0x25, -+0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xea,0xf0,0xa3,0xeb,0xf0,0xec, -+0xc3,0x9f,0x40,0x02,0xc1,0xc9,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83, -+0xec,0xf0,0x04,0xfb,0x90,0x9e,0x3e,0xe0,0xff,0xeb,0xd3,0x9f,0x40,0x02,0xc1,0xfa, -+0xeb,0xc3,0x94,0x10,0x40,0x21,0xeb,0x24,0xf0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07, -+0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x3f,0xe0,0x5e, -+0xfe,0xa3,0xe0,0x5f,0x4e,0x70,0x23,0xeb,0xc3,0x94,0x10,0x50,0x39,0x74,0x01,0x7e, -+0x00,0xa8,0x03,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e, -+0x41,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x1c,0xeb,0x64,0x13,0x60,0x08,0xeb, -+0x64,0x12,0x60,0x03,0xbb,0x11,0x09,0x90,0x9e,0x3f,0xe0,0x30,0xe0,0x02,0x7b,0x18, -+0xac,0x03,0x8c,0x64,0x80,0x34,0x0b,0x80,0x8b,0x90,0x9e,0x3e,0xe0,0xfb,0x6c,0x70, -+0x69,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xec,0xf0,0x75,0xf0,0x09, -+0xed,0x90,0x96,0x4a,0x12,0x43,0x5f,0xe0,0xb4,0x01,0x0c,0xe5,0x64,0x20,0xe6,0x07, -+0xec,0x44,0x40,0xf5,0x64,0x80,0x03,0xaf,0x64,0x22,0xec,0x25,0xe0,0x24,0x9e,0xf5, -+0x82,0xe4,0x34,0x41,0xf5,0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xec,0x25,0xe0, -+0x24,0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93, -+0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34, -+0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0x80,0x5b,0xec,0xd3,0x9b,0x40,0x56,0x90, -+0x9e,0x3e,0xe0,0xff,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xef,0xf0, -+0xac,0x07,0x8f,0x64,0xec,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83, -+0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xec,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4,0x34, -+0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13, -+0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3, -+0xef,0xf0,0xaf,0x64,0x22,0x74,0x01,0x2d,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe4, -+0xf0,0xaf,0x05,0xe5,0x64,0x44,0x80,0xfd,0x12,0x58,0xf1,0xe5,0x64,0x44,0x80,0xff, -+0x22,0xac,0x07,0xec,0xc3,0x94,0x20,0x50,0x0d,0x74,0x84,0x2c,0xf5,0x82,0xe4,0x34, -+0x04,0xf5,0x83,0xe0,0x80,0x0b,0x74,0xa6,0x2c,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83, -+0xe0,0x54,0x7f,0xf5,0x64,0xe5,0x64,0x54,0x1f,0xff,0x90,0x9e,0x40,0xf0,0x75,0xf0, -+0x09,0xec,0x90,0x96,0x49,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x42,0xf0,0x75,0xf0,0x09, -+0xec,0x90,0x96,0x48,0x12,0x43,0x5f,0xe0,0xfe,0x90,0x9e,0x43,0xf0,0xec,0x25,0xe0, -+0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x44, -+0xcb,0xf0,0xa3,0xeb,0xf0,0xec,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5, -+0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x46,0xcb,0xf0,0xa3,0xeb,0xf0,0xef,0xd3,0x9e, -+0x40,0x0a,0x90,0x9e,0x43,0xe0,0x90,0x9e,0x40,0xf0,0xf5,0x64,0xed,0x70,0x02,0x21, -+0x07,0x90,0x9e,0x41,0xed,0xf0,0xe5,0x64,0x30,0xe6,0x0a,0x90,0x9e,0x40,0xe0,0xf5, -+0x64,0xa3,0xe0,0x14,0xf0,0x90,0x9e,0x41,0xe0,0x70,0x02,0x21,0x07,0x90,0x9e,0x40, -+0xe0,0xff,0xd3,0x94,0x00,0x50,0x02,0x21,0x07,0xe4,0x90,0x9e,0x3f,0xf0,0xef,0x14, -+0x90,0x9e,0x3e,0xf0,0x90,0x9e,0x42,0xe0,0xfd,0x90,0x9e,0x3e,0xe0,0xff,0xd3,0x9d, -+0x40,0x6b,0xef,0x94,0x10,0x40,0x21,0xef,0x24,0xf0,0xff,0x74,0x01,0x7e,0x00,0xa8, -+0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x46,0xe0, -+0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x70,0x27,0x90,0x9e,0x3e,0xe0,0xff,0xc3,0x94,0x10, -+0x50,0x33,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce, -+0xd8,0xf9,0xff,0x90,0x9e,0x44,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x16,0x90, -+0x9e,0x3e,0xe0,0xf5,0x64,0xa3,0xe0,0x04,0xf0,0x90,0x9e,0x41,0xe0,0xff,0x90,0x9e, -+0x3f,0xe0,0x6f,0x60,0x08,0x90,0x9e,0x3e,0xe0,0x14,0xf0,0x80,0x87,0x90,0x9e,0x41, -+0xe0,0xff,0x90,0x9e,0x3f,0xe0,0xc3,0x9f,0x50,0x0d,0x90,0x9e,0x3e,0xe0,0xb5,0x05, -+0x06,0x90,0x9e,0x42,0xe0,0xf5,0x64,0xe5,0x64,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4, -+0x34,0x41,0xf5,0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xe5,0x64,0x25,0xe0,0x24, -+0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e, -+0xc3,0x13,0xfe,0xef,0x13,0xff,0xec,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95, -+0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0xaf,0x04,0xad,0x64,0x12,0x58,0xf1,0xaf,0x64, -+0x22,0xe4,0xf5,0x59,0xe5,0x59,0xb4,0x20,0x14,0x90,0x9a,0xc5,0xe0,0x04,0xf0,0x90, -+0x95,0x01,0xe0,0xff,0x90,0x9a,0xc5,0xe0,0xb5,0x07,0x02,0xe4,0xf0,0x75,0xf0,0x09, -+0xe5,0x59,0x90,0x96,0x4b,0x12,0x43,0x5f,0xe0,0x64,0x01,0x60,0x02,0xe1,0x95,0xe5, -+0x59,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe0,0xfe,0xa3,0xe0, -+0xd3,0x94,0x00,0xee,0x94,0x00,0x50,0x02,0xe1,0x95,0xe5,0x59,0x94,0x20,0x40,0x08, -+0x90,0x9a,0xc5,0xe0,0x60,0x02,0xe1,0xa0,0xe5,0x59,0x75,0xf0,0x0a,0xa4,0x24,0x00, -+0xf9,0x74,0x90,0x35,0xf0,0x75,0x5e,0x01,0xf5,0x5f,0x89,0x60,0xe5,0x59,0x25,0xe0, -+0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe0,0xff,0xa3,0xe0,0x90,0x9e,0x38, -+0xcf,0xf0,0xa3,0xef,0xf0,0xe5,0x59,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x98, -+0xf5,0x83,0xe0,0xff,0xa3,0xe0,0x90,0x9e,0x3a,0xcf,0xf0,0xa3,0xef,0xf0,0xe5,0x59, -+0xc3,0x94,0x20,0x50,0x14,0x74,0x84,0x25,0x59,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83, -+0xe0,0x54,0x3f,0x90,0x9e,0x34,0xf0,0x80,0x12,0x74,0xa6,0x25,0x59,0xf5,0x82,0xe4, -+0x34,0x9c,0xf5,0x83,0xe0,0x54,0x3f,0x90,0x9e,0x34,0xf0,0x90,0x9e,0x34,0xe0,0xfe, -+0x54,0x1f,0xa3,0xf0,0x75,0xf0,0x09,0xe5,0x59,0x90,0x96,0x48,0x12,0x43,0x5f,0xe0, -+0x90,0x9e,0x3d,0xf0,0x74,0xe6,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0, -+0xc3,0x94,0x05,0x40,0x02,0x81,0x6e,0x90,0x9e,0x3d,0xe0,0xff,0x90,0x9e,0x35,0xe0, -+0x9f,0x40,0x13,0x90,0x9e,0x3d,0xe0,0x90,0x9e,0x35,0xf0,0xee,0x54,0x40,0xfe,0x90, -+0x9e,0x34,0xf0,0xef,0x4e,0xf0,0x90,0x04,0xfd,0xe0,0x64,0x01,0x70,0x29,0x90,0x9e, -+0x35,0xe0,0xff,0x90,0x41,0x4a,0x93,0xfe,0x74,0x44,0x25,0x59,0xf5,0x82,0xe4,0x34, -+0x9a,0xf5,0x83,0xe0,0xc3,0x9e,0x40,0x06,0xef,0x90,0x40,0xda,0x80,0x30,0x90,0x9e, -+0x35,0xe0,0x90,0x40,0xf6,0x80,0x27,0x90,0x9e,0x35,0xe0,0xff,0x90,0x41,0x4a,0x93, -+0xfe,0x74,0x44,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xc3,0x9e,0x40, -+0x06,0xef,0x90,0x41,0x12,0x80,0x07,0x90,0x9e,0x35,0xe0,0x90,0x41,0x2e,0x93,0x90, -+0x9e,0x3c,0xf0,0x90,0x9e,0x3c,0xe0,0x75,0xf0,0x06,0xa4,0x24,0x50,0xf9,0x74,0x40, -+0x35,0xf0,0x75,0x5b,0xff,0xf5,0x5c,0x89,0x5d,0x90,0x9e,0x34,0xe0,0x90,0x41,0xf2, -+0x93,0xff,0xd3,0x90,0x9e,0x3b,0xe0,0x9f,0x90,0x9e,0x3a,0xe0,0x94,0x00,0x40,0x09, -+0xe4,0xfd,0xaf,0x59,0x12,0x67,0xb1,0xe1,0x2c,0xe5,0x59,0x25,0xe0,0x24,0xc2,0xf5, -+0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xf5,0x61,0xa3,0xe0,0xf5,0x62,0xab,0x5b,0xaa, -+0x5c,0xa9,0x5d,0x12,0x24,0x62,0xff,0x7e,0x00,0xab,0x5e,0xaa,0x5f,0xa9,0x60,0x12, -+0x42,0x97,0xfd,0xac,0xf0,0x12,0x24,0x7b,0xef,0x25,0x62,0xf5,0x62,0xee,0x35,0x61, -+0xf5,0x61,0xab,0x5b,0xaa,0x5c,0xa9,0x5d,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x7e, -+0x00,0xab,0x5e,0xaa,0x5f,0xa9,0x60,0x90,0x00,0x02,0x12,0x42,0xc2,0xfd,0xac,0xf0, -+0x12,0x24,0x7b,0xef,0x25,0x62,0xf5,0x62,0xee,0x35,0x61,0xf5,0x61,0xab,0x5b,0xaa, -+0x5c,0xa9,0x5d,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x7e,0x00,0xab,0x5e,0xaa,0x5f, -+0xa9,0x60,0x90,0x00,0x04,0x12,0x42,0xc2,0xfd,0xac,0xf0,0x12,0x24,0x7b,0xef,0x25, -+0x62,0xf5,0x62,0xee,0x35,0x61,0xf5,0x61,0xab,0x5b,0xaa,0x5c,0xa9,0x5d,0x90,0x00, -+0x03,0x12,0x42,0x20,0xff,0x7e,0x00,0xab,0x5e,0xaa,0x5f,0xa9,0x60,0x90,0x00,0x06, -+0x12,0x42,0xc2,0xfd,0xac,0xf0,0x12,0x24,0x7b,0xef,0x25,0x62,0xf5,0x62,0xee,0x35, -+0x61,0xf5,0x61,0xab,0x5b,0xaa,0x5c,0xa9,0x5d,0x90,0x00,0x04,0x12,0x42,0x20,0xff, -+0x7e,0x00,0xab,0x5e,0xaa,0x5f,0xa9,0x60,0x90,0x00,0x08,0x12,0x42,0xc2,0xfd,0xac, -+0xf0,0x12,0x24,0x7b,0xef,0x25,0x62,0xf5,0x62,0xee,0x35,0x61,0xf5,0x61,0xab,0x5b, -+0xaa,0x5c,0xa9,0x5d,0x90,0x00,0x05,0x12,0x42,0x20,0xff,0x7e,0x00,0x90,0x9e,0x38, -+0xe0,0xfc,0xa3,0xe0,0xfd,0x12,0x24,0x7b,0xd3,0xe5,0x62,0x9f,0xe5,0x61,0x9e,0x40, -+0x0c,0xe5,0x62,0x9f,0xf5,0x62,0xe5,0x61,0x9e,0xf5,0x61,0x80,0x05,0xe4,0xf5,0x61, -+0xf5,0x62,0xe5,0x59,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe5, -+0x61,0xf0,0xa3,0xe5,0x62,0xf0,0x90,0x9e,0x34,0xe0,0x25,0xe0,0x24,0x66,0xf5,0x82, -+0xe4,0x34,0x41,0xf5,0x83,0xc3,0x74,0x01,0x93,0x95,0x62,0xe4,0x93,0x95,0x61,0x50, -+0x07,0xaf,0x59,0x12,0x65,0xb2,0xe1,0x00,0x90,0x9e,0x34,0xe0,0x25,0xe0,0x24,0x9e, -+0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xd3,0x74,0x01,0x93,0x95,0x62,0xe4,0x93,0x95, -+0x61,0x50,0x02,0xe1,0x00,0x7d,0x01,0xaf,0x59,0x12,0x67,0xb1,0xe1,0x00,0x74,0xe6, -+0x25,0x59,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0xfc,0x64,0x05,0x60,0x02,0xc1, -+0x09,0x90,0x96,0x43,0xe0,0xff,0xb4,0x03,0x0b,0x90,0x9e,0x35,0xe0,0xc3,0x94,0x19, -+0x40,0x3d,0x80,0x2e,0xef,0xb4,0x02,0x0b,0x90,0x9e,0x35,0xe0,0xc3,0x94,0x11,0x40, -+0x2e,0x80,0x1f,0x90,0x96,0x43,0xe0,0xff,0xb4,0x01,0x0b,0x90,0x9e,0x35,0xe0,0xc3, -+0x94,0x0a,0x40,0x1b,0x80,0x0c,0xef,0x70,0x11,0x90,0x9e,0x35,0xe0,0xc3,0x94,0x03, -+0x40,0x0d,0x90,0x9a,0x84,0x74,0x01,0xf0,0x80,0x05,0xe4,0x90,0x9a,0x84,0xf0,0x74, -+0x84,0x25,0x59,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe0,0xf5,0x63,0x74,0x44,0x25, -+0x59,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xff,0xc3,0x94,0x30,0x50,0x02,0xa1, -+0xb6,0x90,0x9a,0x84,0xe0,0x64,0x01,0x60,0x02,0xa1,0xb6,0x74,0x85,0x25,0x59,0xf5, -+0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0x64,0x0a,0x60,0x51,0xef,0x24,0x05,0xff,0xe4, -+0x33,0xfe,0x74,0x41,0x25,0x59,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe0,0xfd,0xd3, -+0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x50,0x32,0xed,0x24,0x05,0xff,0xe4,0x33, -+0xfe,0x74,0x44,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xd3,0x9f,0xee, -+0x64,0x80,0xf8,0x74,0x80,0x98,0x50,0x14,0x74,0x26,0x25,0x59,0xf5,0x82,0xe4,0x34, -+0x9d,0xf5,0x83,0xe0,0xff,0x90,0x9e,0x35,0xe0,0x6f,0x60,0x3d,0x74,0x44,0x25,0x59, -+0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xff,0xd3,0x94,0x42,0x40,0x05,0x75,0x63, -+0x05,0x80,0x0e,0xef,0xd3,0x94,0x39,0x40,0x05,0x75,0x63,0x03,0x80,0x03,0x75,0x63, -+0x01,0x74,0x41,0x25,0x59,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xef,0xf0,0x74,0x85, -+0x25,0x59,0xf5,0x82,0xe4,0x34,0x9a,0x80,0x29,0x74,0xe6,0x25,0x59,0xf5,0x82,0xe4, -+0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0x85,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9a,0xf5, -+0x83,0xe0,0x04,0xf0,0x80,0x10,0xe4,0xf5,0x63,0x74,0xe6,0x25,0x59,0xf5,0x82,0xe4, -+0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x90,0x9e,0x35,0xe0,0xff,0x74,0x26,0x25,0x59,0xf5, -+0x82,0xe4,0x34,0x9d,0xf5,0x83,0xef,0xf0,0x74,0x84,0x25,0x59,0xf5,0x82,0xe4,0x34, -+0x98,0xf5,0x83,0xe5,0x63,0xf0,0x75,0xf0,0x09,0xe5,0x59,0x90,0x96,0x4c,0x12,0x43, -+0x5f,0xe0,0xb4,0x01,0x10,0xe4,0xf5,0x63,0x74,0xe6,0x25,0x59,0xf5,0x82,0xe4,0x34, -+0x9c,0xf5,0x83,0xe4,0xf0,0xad,0x63,0xc1,0xfb,0xec,0x64,0x06,0x60,0x02,0xe1,0x00, -+0xf5,0x61,0xf5,0x62,0x90,0x42,0x13,0x93,0xff,0x7e,0x00,0x90,0x9e,0x38,0xe0,0xfc, -+0xa3,0xe0,0xfd,0x12,0x24,0x7b,0x90,0x9e,0x36,0xee,0xf0,0xa3,0xef,0xf0,0x74,0x84, -+0x25,0x59,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe0,0xf5,0x63,0xe4,0xf5,0x5a,0xab, -+0x5e,0xaa,0x5f,0xa9,0x60,0x75,0xf0,0x02,0xe5,0x5a,0xa4,0xf5,0x82,0x85,0xf0,0x83, -+0x12,0x42,0xc2,0xfd,0xac,0xf0,0xe5,0x5a,0x90,0x42,0x0e,0x93,0xff,0x7e,0x00,0x12, -+0x24,0x7b,0xef,0x25,0x62,0xf5,0x62,0xee,0x35,0x61,0xf5,0x61,0xc3,0x90,0x9e,0x37, -+0xe0,0x95,0x62,0x90,0x9e,0x36,0xe0,0x95,0x61,0x40,0x07,0x05,0x5a,0xe5,0x5a,0xb4, -+0x05,0xbd,0xe5,0x5a,0xc3,0x13,0xf5,0x5a,0xe5,0x63,0xb4,0x01,0x06,0xe5,0x5a,0x70, -+0x46,0x80,0x13,0xe5,0x63,0xb4,0x03,0x15,0xe5,0x5a,0x70,0x05,0x75,0x63,0x03,0x80, -+0x39,0xe5,0x5a,0xb4,0x01,0x05,0x75,0x63,0x01,0x80,0x2f,0x80,0x2a,0xe5,0x63,0xb4, -+0x05,0x28,0xe5,0x5a,0x70,0x05,0x75,0x63,0x05,0x80,0x0d,0xe5,0x5a,0xb4,0x01,0x05, -+0x75,0x63,0x03,0x80,0x03,0x75,0x63,0x01,0xd3,0x90,0x9e,0x3b,0xe0,0x94,0x03,0x90, -+0x9e,0x3a,0xe0,0x94,0x00,0x40,0x03,0xe4,0xf5,0x63,0xd3,0x90,0x9e,0x3b,0xe0,0x94, -+0x03,0x90,0x9e,0x3a,0xe0,0x94,0x00,0x40,0x03,0xe4,0xf5,0x63,0x74,0x84,0x25,0x59, -+0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe5,0x63,0xf0,0xfd,0xaf,0x59,0x12,0x65,0x72, -+0x74,0xe6,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0xd3,0x94,0x05,0x74, -+0xe6,0x50,0x0e,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x04,0xf0,0x80, -+0x0b,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0xab,0x5e,0xaa,0x5f, -+0xa9,0x60,0xe4,0xf5,0xf0,0x12,0x42,0xfa,0xab,0x5e,0xaa,0x5f,0xa9,0x60,0x90,0x00, -+0x02,0xe4,0xf5,0xf0,0x12,0x43,0x19,0x90,0x00,0x04,0xe4,0xf5,0xf0,0x12,0x43,0x19, -+0x90,0x00,0x06,0xe4,0xf5,0xf0,0x12,0x43,0x19,0x90,0x00,0x08,0xe4,0xf5,0xf0,0x12, -+0x43,0x19,0xe5,0x59,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe4, -+0xf0,0xa3,0xf0,0xe5,0x59,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83, -+0xe4,0xf0,0xa3,0xf0,0xe5,0x59,0x25,0xe0,0x24,0x44,0xf5,0x82,0xe4,0x34,0x99,0xf5, -+0x83,0xe4,0xf0,0xa3,0xf0,0x05,0x59,0xe5,0x59,0xc3,0x94,0x40,0x50,0x02,0x21,0x54, -+0x22,0x90,0x04,0x44,0x74,0x11,0xf0,0xa3,0x74,0xf0,0xf0,0xa3,0x74,0x0f,0xf0,0xa3, -+0xe4,0xf0,0xfd,0x74,0xa4,0x2d,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe4,0xf0,0x0d, -+0xbd,0x10,0xf0,0xe4,0x90,0x9a,0xc5,0xf0,0x90,0x95,0x01,0x04,0xf0,0xe4,0xfd,0x75, -+0xf0,0x0a,0xed,0x90,0x90,0x00,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75,0xf0,0x0a, -+0xed,0x90,0x90,0x02,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75,0xf0,0x0a,0xed,0x90, -+0x90,0x04,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75,0xf0,0x0a,0xed,0x90,0x90,0x06, -+0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75,0xf0,0x0a,0xed,0x90,0x90,0x08,0x12,0x43, -+0x5f,0xe4,0xf0,0xa3,0xf0,0x74,0x26,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0x74, -+0x13,0xf0,0x74,0x85,0x2d,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0,0x74,0x84, -+0x2d,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0,0xed,0x25,0xe0,0x24,0x80,0xf5, -+0x82,0xe4,0x34,0x93,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xed,0x25,0xe0,0x24,0xc4,0xf5, -+0x82,0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xed,0x25,0xe0,0x24,0xc4,0xf5, -+0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xed,0x25,0xe0,0x24,0x44,0xf5, -+0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xed,0x25,0xe0,0x24,0xc6,0xf5, -+0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xed,0x25,0xe0,0x24,0x46,0xf5, -+0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0x74,0x86,0x2d,0xf5,0x82,0xe4, -+0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0x46,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83, -+0xe4,0xf0,0x74,0xe6,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x90,0x41, -+0xc4,0x93,0xfe,0x74,0x01,0x93,0xff,0x90,0x41,0x8c,0x74,0x01,0x93,0x2f,0xff,0xe4, -+0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x4b, -+0x12,0x43,0x5f,0x74,0x01,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x4a,0x12,0x43,0x5f, -+0x74,0x01,0xf0,0x74,0x82,0x2d,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0x74,0x0c,0xf0, -+0x75,0xf0,0x09,0xed,0x90,0x96,0x46,0x12,0x43,0x5f,0x74,0xff,0xf0,0xa3,0xf0,0x75, -+0xf0,0x09,0xed,0x90,0x96,0x44,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0x74,0x0f,0xf0,0x75, -+0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0x74,0x13,0xf0,0x75,0xf0,0x09,0xed, -+0x90,0x96,0x49,0x12,0x43,0x5f,0xe4,0xf0,0xed,0xc3,0x94,0x20,0x50,0x0f,0x74,0x84, -+0x2d,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0x74,0x13,0xf0,0x80,0x0d,0x74,0xa6,0x2d, -+0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0x74,0x13,0xf0,0x0d,0xed,0x64,0x40,0x60,0x03, -+0x02,0x6f,0xcf,0x22,0x12,0x24,0x62,0xf5,0x59,0xc3,0x94,0x40,0x50,0x15,0x90,0x00, -+0x02,0x12,0x42,0x20,0xff,0x74,0x44,0x25,0x59,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83, -+0xef,0xf0,0x22,0xe5,0x59,0xb4,0x40,0x0a,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x96, -+0x42,0xf0,0x22,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x3f,0xfe,0xef,0x54,0x80, -+0xc4,0x13,0x13,0x13,0x54,0x01,0xfd,0xaf,0x06,0x02,0x53,0xa4,0x12,0x24,0x62,0x90, -+0x95,0x01,0xf0,0x22,0x12,0x24,0x62,0xf5,0x73,0x22,0x90,0x00,0x02,0x12,0x42,0x20, -+0xff,0x30,0xe0,0x25,0x12,0x24,0x62,0x90,0x9e,0x56,0xf0,0x90,0x00,0x01,0x12,0x42, -+0x20,0x90,0x9e,0x57,0xf0,0xef,0xc3,0x13,0x54,0x7f,0x90,0x9e,0x55,0xf0,0x90,0x00, -+0x03,0x12,0x42,0x20,0x90,0x9e,0x5b,0xf0,0x22,0x90,0x9e,0x56,0x74,0x01,0xf0,0x90, -+0x9e,0x57,0x74,0x03,0xf0,0x90,0x9e,0x55,0x74,0x14,0xf0,0x90,0x9e,0x5b,0x74,0x05, -+0xf0,0x22,0x12,0x24,0x62,0x30,0xe0,0x18,0xc3,0x13,0x54,0x7f,0x90,0x9e,0x5a,0xf0, -+0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x90,0x9e,0x58,0xe4,0xf0,0xa3,0xef,0xf0,0x22, -+0x90,0x9e,0x5a,0x74,0x07,0xf0,0x90,0x9e,0x58,0xe4,0xf0,0xa3,0x74,0x02,0xf0,0x22, -+0x90,0x02,0x09,0xe0,0xfd,0x12,0x24,0x62,0xfe,0xaf,0x05,0xed,0x2e,0x90,0x9e,0x67, -+0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x9e,0x68,0xf0,0x90,0x00, -+0x02,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x9e,0x69,0xf0,0x90,0x00,0x03,0x12,0x42, -+0x20,0xff,0xed,0x2f,0x90,0x9e,0x6a,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0xae, -+0x05,0xed,0x2f,0x90,0x9e,0x6b,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90, -+0x9e,0x3f,0x12,0x43,0x8b,0x90,0x9e,0x3f,0x12,0x43,0x6b,0x90,0x00,0x01,0x12,0x42, -+0xc2,0xfa,0xe5,0xf0,0x24,0x00,0xff,0xe4,0x3a,0xfe,0x90,0x9e,0x3f,0x12,0x43,0x6b, -+0x90,0x00,0x01,0xee,0x8f,0xf0,0x12,0x43,0x19,0x12,0x24,0x62,0xff,0x60,0x2c,0xb5, -+0x22,0x16,0x90,0x9e,0x3f,0x12,0x43,0x6b,0x90,0x00,0x01,0x12,0x42,0xc2,0x65,0x24, -+0x70,0x04,0xe5,0x23,0x65,0xf0,0x60,0x23,0x90,0x9e,0x3f,0x12,0x43,0x6b,0x90,0x00, -+0x01,0x12,0x42,0xc2,0xff,0xae,0xf0,0x71,0x00,0x80,0x10,0x90,0x9e,0x3f,0x12,0x43, -+0x6b,0x12,0x24,0x62,0x65,0x22,0x60,0x03,0x12,0x44,0xca,0xd0,0xd0,0x92,0xaf,0x22, -+0x90,0x9e,0x42,0xee,0xf0,0xa3,0xef,0xf0,0x75,0x22,0x01,0x8e,0x23,0xf5,0x24,0xe4, -+0xfd,0x7f,0x0b,0x71,0x44,0xe4,0xfd,0x7f,0x02,0x71,0x44,0x12,0x4f,0xbe,0xe4,0xff, -+0x12,0x44,0xf1,0xe4,0xf5,0x26,0x90,0x01,0xc9,0xe5,0x26,0xf0,0x90,0x9e,0x42,0xe0, -+0xfc,0xa3,0xe0,0xfd,0xec,0xfb,0x8d,0x44,0xe4,0xf5,0x45,0x7d,0x01,0x7f,0x60,0x7e, -+0x01,0x02,0x30,0x62,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x45,0xed,0xf0, -+0x90,0x9e,0x44,0xef,0xf0,0xd3,0x94,0x07,0x50,0x4f,0xa3,0xe0,0x70,0x1a,0x90,0x9e, -+0x44,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff, -+0x90,0x00,0x47,0xe0,0x5f,0xf0,0x80,0x17,0x90,0x9e,0x44,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x47,0xe0,0x4f,0xf0,0x12, -+0x49,0xb9,0x90,0x9e,0x44,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0x80,0x5a,0x90,0x9e,0x44,0xe0,0x24,0xf8,0xf0, -+0xa3,0xe0,0x70,0x1d,0x90,0x9e,0x44,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02, -+0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0x80, -+0x1a,0x90,0x9e,0x44,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8, -+0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0x12,0x49,0xb9,0x90,0x9e, -+0x44,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff, -+0x90,0x00,0x43,0xe0,0x5f,0xf0,0x12,0x49,0xb9,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x6d,0xe0,0x90,0x9e,0x40,0xf0,0x90,0x9e,0x6e, -+0xe0,0xf5,0x64,0xa3,0xe0,0xf5,0x65,0xe4,0xf5,0x61,0x74,0x70,0x25,0x61,0xf5,0x82, -+0xe4,0x34,0x9e,0xf5,0x83,0xe0,0xff,0x74,0x66,0x25,0x61,0xf8,0xa6,0x07,0x05,0x61, -+0xe5,0x61,0xb4,0x04,0xe5,0x90,0x9e,0x40,0xe0,0x12,0x43,0x94,0x74,0x6b,0x00,0x75, -+0x93,0x01,0x74,0x71,0x02,0x74,0x71,0x03,0x74,0x71,0x04,0x75,0x93,0x05,0x75,0x63, -+0x80,0x75,0x79,0x81,0x75,0x93,0x82,0x00,0x00,0x75,0x8f,0xaf,0x69,0xb1,0x9a,0xa1, -+0x93,0x90,0x9e,0x40,0xe0,0xff,0xb4,0x02,0x08,0x90,0x9e,0x3f,0x74,0x01,0xf0,0x80, -+0x0f,0xef,0x90,0x9e,0x3f,0xb4,0x03,0x05,0x74,0x02,0xf0,0x80,0x03,0x74,0x04,0xf0, -+0xc3,0xe5,0x64,0x94,0x08,0x50,0x49,0xe4,0xf5,0x61,0x90,0x9e,0x3f,0xe0,0xff,0xe5, -+0x61,0xc3,0x9f,0x40,0x02,0xa1,0x93,0xc3,0xe5,0x64,0x94,0x01,0x50,0x14,0xe5,0x61, -+0x25,0x65,0xff,0xc3,0x74,0x03,0x95,0x61,0x24,0x66,0xf8,0xe6,0xfd,0x12,0x4a,0xc1, -+0x80,0x1a,0xc3,0x74,0x03,0x95,0x61,0x24,0x66,0xf8,0xe6,0xff,0xe5,0x61,0x7c,0x00, -+0x25,0x65,0xfd,0xec,0x35,0x64,0x8d,0x82,0xf5,0x83,0xef,0xf0,0x05,0x61,0x80,0xba, -+0xc3,0xe5,0x64,0x94,0x10,0x40,0x02,0xa1,0x93,0x90,0x9e,0x40,0xe0,0x64,0x04,0x60, -+0x02,0xa1,0x93,0xaf,0x67,0xfc,0xfd,0xfe,0x78,0x10,0x12,0x24,0xf5,0xc0,0x04,0xc0, -+0x05,0xc0,0x06,0xc0,0x07,0xaf,0x66,0xe4,0xfc,0xfd,0xfe,0x78,0x18,0x12,0x24,0xf5, -+0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0x12,0x43,0x46,0xc0,0x04,0xc0,0x05,0xc0, -+0x06,0xc0,0x07,0xaf,0x68,0xe4,0xfc,0xfd,0xfe,0x78,0x08,0x12,0x24,0xf5,0xd0,0x03, -+0xd0,0x02,0xd0,0x01,0xd0,0x00,0x12,0x43,0x46,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab, -+0x07,0xaf,0x69,0xe4,0xfc,0xfd,0xfe,0x12,0x43,0x46,0xa3,0x12,0x25,0x08,0x90,0x9e, -+0x41,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0xaf,0x65,0xae,0x64,0x12,0x2b, -+0x08,0x80,0x30,0xe5,0x68,0x7f,0x00,0xfe,0xef,0x25,0x69,0xf5,0x63,0xe4,0x3e,0xf5, -+0x62,0xaf,0x63,0xfe,0x12,0x32,0x15,0x80,0x1a,0xe5,0x68,0x7f,0x00,0xfe,0xef,0x25, -+0x69,0xf5,0x63,0xe4,0x3e,0xf5,0x62,0xaf,0x63,0xfe,0x12,0x31,0x82,0x80,0x04,0x7f, -+0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0x8f,0x6a,0xe4,0x90,0x9e,0x45, -+0xf0,0xe5,0x6a,0x14,0xfe,0x90,0x9e,0x45,0xe0,0xff,0xc3,0x9e,0x50,0x0e,0xef,0x04, -+0xfd,0x12,0x2d,0x4d,0x90,0x9e,0x45,0xe0,0x04,0xf0,0x80,0xe5,0xe5,0x6a,0x14,0xff, -+0x7d,0xff,0x12,0x2d,0x4d,0x90,0x9e,0x45,0xe5,0x6a,0xf0,0x90,0x9e,0x45,0xe0,0xc3, -+0x94,0xff,0x50,0x0f,0xe0,0xff,0x04,0xfd,0x12,0x2d,0x4d,0x90,0x9e,0x45,0xe0,0x04, -+0xf0,0x80,0xe8,0xad,0x6a,0x7f,0xff,0x02,0x2d,0x4d,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0xe4,0xf5,0x5b,0x75,0x5c,0x04,0xf5,0x5d,0xf5,0x5f,0xf5,0x60,0x90,0x02,0x09, -+0xe0,0xff,0x12,0x24,0x62,0xfe,0xef,0x2e,0xf5,0x5e,0x30,0xe0,0x08,0x75,0x59,0x00, -+0x75,0x5a,0x80,0x80,0x05,0xe4,0xf5,0x59,0xf5,0x5a,0xe5,0x5e,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x74,0x20,0x25,0x5b,0xf5,0x5b,0xad,0x5a,0xe5,0x5b,0x2d,0xff,0x24,0x01, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x90,0x9e,0x6d,0xf0,0x74,0x02,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0xfe,0xe5,0x5b,0x2d,0x24,0x03,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe0,0x24,0x00,0xff,0xe4,0x3e,0x90,0x9e,0x6e,0xf0,0xa3,0xef, -+0xf0,0x7f,0x04,0xe5,0x5b,0x25,0x5a,0x2f,0x24,0x00,0xf5,0x82,0xe4,0x34,0xfc,0xf5, -+0x83,0xe0,0xfe,0x74,0x6c,0x2f,0xf5,0x82,0xe4,0x34,0x9e,0xf5,0x83,0xee,0xf0,0x0f, -+0xbf,0x08,0xe0,0x91,0x0e,0xef,0x70,0x3f,0x90,0x01,0xc3,0xe0,0x60,0x25,0xc3,0xe5, -+0x60,0x94,0xe8,0xe5,0x5f,0x94,0x03,0x40,0x09,0x90,0x01,0xc6,0xe0,0x44,0x10,0xf0, -+0x80,0x63,0x05,0x60,0xe5,0x60,0x70,0x02,0x05,0x5f,0x7f,0x0a,0x7e,0x00,0x12,0x32, -+0x15,0x80,0xd5,0x90,0x01,0xc6,0xe0,0x90,0x01,0xc3,0x30,0xe2,0x05,0x74,0xfe,0xf0, -+0x80,0x43,0x74,0xff,0xf0,0x80,0x3e,0xe5,0x5b,0xb4,0x78,0x23,0xe4,0xf5,0x5b,0x05, -+0x5e,0xe5,0x5a,0x64,0x80,0x45,0x59,0x70,0x06,0xf5,0x59,0xf5,0x5a,0x80,0x06,0x75, -+0x59,0x00,0x75,0x5a,0x80,0xe5,0x5e,0xc3,0x13,0x90,0xfd,0x10,0xf0,0x80,0x06,0x74, -+0x08,0x25,0x5b,0xf5,0x5b,0xe5,0x5d,0x15,0x5d,0x70,0x02,0x15,0x5c,0xe5,0x5d,0x45, -+0x5c,0x60,0x02,0xc1,0x28,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x06,0x34,0x74,0xff,0xf0, -+0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x22,0xe4,0xf5,0x25,0x22,0xe4,0x90,0x9e,0xaa, -+0xf0,0xa3,0xf0,0x90,0x05,0xf8,0xe0,0x70,0x0f,0xa3,0xe0,0x70,0x0b,0xa3,0xe0,0x70, -+0x07,0xa3,0xe0,0x70,0x03,0x7f,0x01,0x22,0xd3,0x90,0x9e,0xab,0xe0,0x94,0xe8,0x90, -+0x9e,0xaa,0xe0,0x94,0x03,0x40,0x03,0x7f,0x00,0x22,0x7f,0x32,0x7e,0x00,0x12,0x32, -+0x15,0x90,0x9e,0xaa,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x80,0xc6,0x90,0x9e,0x77, -+0xe0,0x90,0x9e,0x0f,0xf0,0x22,0xef,0x70,0x03,0x02,0x79,0x1e,0x90,0x9e,0x0f,0xe0, -+0x60,0x03,0x02,0x7c,0xe9,0x90,0x9d,0xfb,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25, -+0x08,0x7f,0x8c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x9d,0xa7,0x12,0x43,0x53,0x90,0x80, -+0x96,0x12,0x25,0x08,0x7f,0x44,0x7e,0x08,0x12,0x2b,0x08,0x90,0x9d,0xab,0x12,0x43, -+0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x5c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x9d, -+0xaf,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x6c,0x7e,0x0e,0x12,0x2b, -+0x08,0x90,0x9d,0xb3,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x70,0x7e, -+0x0e,0x12,0x2b,0x08,0x90,0x9d,0xb7,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0x74,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xbb,0x12,0x43,0x53,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0x78,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xbf,0x12,0x43,0x53, -+0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x7c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xc3, -+0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x0e,0x12,0x2b,0x08, -+0x90,0x9d,0xc7,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x84,0x7e,0x0e, -+0x12,0x2b,0x08,0x90,0x9d,0xcb,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f, -+0x88,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xcf,0x12,0x43,0x53,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x8c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xd3,0x12,0x43,0x53,0x90, -+0x80,0x96,0x12,0x25,0x08,0x7f,0xd0,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xd7,0x12, -+0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0xd4,0x7e,0x0e,0x12,0x2b,0x08,0x90, -+0x9d,0xdb,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0xd8,0x7e,0x0e,0x12, -+0x2b,0x08,0x90,0x9d,0xdf,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0xdc, -+0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xe3,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25, -+0x08,0x7f,0xe0,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xe7,0x12,0x43,0x53,0x90,0x80, -+0x96,0x12,0x25,0x08,0x7f,0xec,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x9d,0xeb,0x12,0x43, -+0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x90,0x9d, -+0xef,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0d,0x12,0x2b, -+0x08,0x90,0x9d,0xf3,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x0c,0x7e, -+0x09,0x12,0x2b,0x08,0x90,0x9d,0xf7,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0x04,0x7e,0x08,0x12,0x2b,0x08,0x90,0x9e,0x0f,0x74,0x01,0xf0,0x22,0x90,0x9e, -+0x0f,0xe0,0x64,0x01,0x60,0x02,0x81,0xe9,0x7f,0x8c,0x7e,0x08,0x12,0x22,0x65,0x90, -+0x9d,0xfb,0x12,0x25,0x08,0x7f,0x44,0x7e,0x08,0x12,0x22,0x65,0x90,0x9d,0xa7,0x12, -+0x25,0x08,0x7f,0x5c,0x7e,0x08,0x12,0x22,0x65,0x90,0x9d,0xab,0x12,0x25,0x08,0x7f, -+0x6c,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xaf,0x12,0x25,0x08,0x7f,0x70,0x7e,0x0e, -+0x12,0x22,0x65,0x90,0x9d,0xb3,0x12,0x25,0x08,0x7f,0x74,0x7e,0x0e,0x12,0x22,0x65, -+0x90,0x9d,0xb7,0x12,0x25,0x08,0x7f,0x78,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xbb, -+0x12,0x25,0x08,0x7f,0x7c,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xbf,0x12,0x25,0x08, -+0x7f,0x80,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xc3,0x12,0x25,0x08,0x7f,0x84,0x7e, -+0x0e,0x12,0x22,0x65,0x90,0x9d,0xc7,0x12,0x25,0x08,0x7f,0x88,0x7e,0x0e,0x12,0x22, -+0x65,0x90,0x9d,0xcb,0x12,0x25,0x08,0x7f,0x8c,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d, -+0xcf,0x12,0x25,0x08,0x7f,0xd0,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xd3,0x12,0x25, -+0x08,0x7f,0xd4,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xd7,0x12,0x25,0x08,0x7f,0xd8, -+0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xdb,0x12,0x25,0x08,0x7f,0xdc,0x7e,0x0e,0x12, -+0x22,0x65,0x90,0x9d,0xdf,0x12,0x25,0x08,0x7f,0xe0,0x7e,0x0e,0x12,0x22,0x65,0x90, -+0x9d,0xe3,0x12,0x25,0x08,0x7f,0xec,0x7e,0x0e,0x12,0x22,0x65,0x90,0x9d,0xe7,0x12, -+0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x22,0x65,0x90,0x9d,0xeb,0x12,0x25,0x08,0x7f, -+0x04,0x7e,0x0d,0x12,0x22,0x65,0x90,0x9d,0xef,0x12,0x25,0x08,0x7f,0x0c,0x7e,0x09, -+0x12,0x22,0x65,0x90,0x9d,0xf3,0x12,0x25,0x08,0x7f,0x04,0x7e,0x08,0x12,0x22,0x65, -+0x90,0x9d,0xf7,0x12,0x25,0x08,0x7f,0x8c,0x7e,0x08,0x12,0x22,0x65,0x90,0x9e,0xa4, -+0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xed,0x44,0xc0,0xfd,0xec,0x90,0x9e, -+0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0x8c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0x01,0x00, -+0x00,0x7f,0x44,0x7e,0x08,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0xdb, -+0x25,0xa4,0x7f,0x5c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20, -+0xdb,0x25,0xa4,0x7f,0x6c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14, -+0x20,0xdb,0x25,0xa4,0x7f,0x70,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25, -+0x14,0x04,0x1b,0x25,0xa4,0x7f,0x74,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12, -+0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x78,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96, -+0x12,0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x7c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80, -+0x96,0x12,0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x80,0x7e,0x0e,0x12,0x2b,0x08,0x90, -+0x80,0x96,0x12,0x25,0x14,0x63,0xdb,0x25,0xa4,0x7f,0x84,0x7e,0x0e,0x12,0x2b,0x08, -+0x90,0x80,0x96,0x12,0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x88,0x7e,0x0e,0x12,0x2b, -+0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0x8c,0x7e,0x0e,0x12, -+0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0xd0,0x7e,0x0e, -+0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0xd4,0x7e, -+0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0xd8, -+0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0x1b,0x25,0xa4,0x7f, -+0xdc,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0x1b,0x25,0xa4, -+0x7f,0xe0,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x24,0xdb,0x25, -+0xa4,0x7f,0xec,0x7e,0x0e,0x12,0x2b,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x22,0x65,0x90, -+0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xe4,0xff,0xec,0x90,0x9e, -+0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xef,0x44,0x11,0xff,0xec,0x90, -+0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25, -+0x08,0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x7f,0x04,0x7e,0x0d,0x12,0x22,0x65,0x90, -+0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xef,0x54,0xf0,0xff,0xec, -+0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xef,0x44,0x01,0xff, -+0xec,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0x04,0x7e,0x0d,0x12,0x2b,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x22, -+0x65,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xe4,0xff,0xec, -+0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xef,0x44,0x11,0xff, -+0xec,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x2b,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x22, -+0x65,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0xed,0x54,0x0f, -+0xfd,0xec,0x54,0xf0,0xfc,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90,0x9e,0xa4,0x12,0x43, -+0x53,0xed,0x44,0x10,0xfd,0xec,0x44,0x01,0xfc,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90, -+0x9e,0xa4,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x0c,0x7e,0x09,0x12, -+0x2b,0x08,0x7f,0x04,0x7e,0x08,0x12,0x22,0x65,0x90,0x9e,0xa4,0x12,0x25,0x08,0x90, -+0x9e,0xa4,0x12,0x43,0x53,0xef,0x54,0xf0,0xff,0xec,0x90,0x9e,0xa4,0x12,0x25,0x08, -+0x90,0x9e,0xa4,0x12,0x43,0x53,0xef,0x44,0x01,0xff,0xec,0x90,0x9e,0xa4,0x12,0x25, -+0x08,0x90,0x9e,0xa4,0x12,0x43,0x53,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e, -+0x08,0x12,0x2b,0x08,0xe4,0x90,0x9e,0x0f,0xf0,0x22,0x90,0x00,0x02,0x12,0x42,0x20, -+0x90,0x9e,0x1e,0xf0,0xe0,0x60,0x04,0xe0,0xf4,0x70,0x21,0xa2,0xaf,0xe4,0x33,0xf5, -+0x59,0xc2,0xaf,0x90,0x00,0x47,0xe0,0x54,0xfb,0xfd,0x7f,0x47,0x12,0x4a,0xc1,0x7d, -+0x40,0x7f,0x01,0x12,0x31,0x66,0xe5,0x59,0x24,0xff,0x92,0xaf,0x22,0xe4,0xfd,0x7f, -+0x45,0x12,0x4a,0xc1,0x90,0x04,0xfd,0xe4,0xf0,0xa3,0xf0,0x90,0x9e,0x1e,0xf0,0x90, -+0x9e,0x24,0xf0,0x90,0x9e,0x27,0xf0,0x90,0x9e,0x25,0xf0,0x90,0x9e,0x28,0xf0,0x90, -+0x9e,0x26,0xf0,0x90,0x9e,0x29,0xf0,0x90,0x9e,0x10,0x04,0xf0,0xe4,0xa3,0xf0,0xa3, -+0xf0,0xa3,0xf0,0x90,0x9e,0x15,0xf0,0x90,0x9e,0x1a,0xf0,0x90,0x9e,0x1c,0xf0,0x90, -+0x9e,0x2e,0xf0,0x90,0x9e,0x1f,0xf0,0x90,0x9e,0x1b,0xf0,0x90,0x9e,0x14,0xf0,0x90, -+0x00,0x51,0xe0,0x44,0xc0,0xfd,0x7f,0x51,0x02,0x4a,0xc1,0x90,0x9e,0x15,0xe0,0xc3, -+0x94,0x14,0x50,0x05,0xe0,0x04,0xf0,0xc1,0x33,0x90,0x9e,0x15,0xe0,0x64,0x14,0x60, -+0x02,0xc1,0x33,0x90,0x9e,0x24,0xe0,0x70,0x25,0x90,0x9e,0x27,0xe0,0x70,0x1f,0x90, -+0x9e,0x25,0xe0,0x70,0x19,0x90,0x9e,0x28,0xe0,0x70,0x13,0x90,0x9e,0x26,0xe0,0x70, -+0x0d,0x90,0x9e,0x29,0xe0,0x70,0x07,0x90,0x04,0xfd,0xe0,0x54,0xfe,0xf0,0x90,0x9e, -+0x24,0xe0,0x90,0x04,0x44,0xf0,0x90,0x9e,0x25,0xe0,0x90,0x04,0x45,0xf0,0x90,0x9e, -+0x26,0xe0,0x90,0x04,0x46,0xf0,0xa3,0xe4,0xf0,0x90,0x9e,0x27,0xe0,0x90,0x04,0x48, -+0xf0,0x90,0x9e,0x28,0xe0,0x90,0x04,0x49,0xf0,0x90,0x9e,0x29,0xe0,0x90,0x04,0x4a, -+0xf0,0xa3,0xe4,0xf0,0x90,0x9e,0x10,0xe0,0x90,0x04,0x4c,0xf0,0x90,0x9e,0x11,0xe0, -+0x90,0x04,0x4d,0xf0,0x90,0x9e,0x12,0xe0,0x90,0x04,0x4e,0xf0,0x90,0x9e,0x13,0xe0, -+0x90,0x04,0x4f,0xf0,0xe4,0x90,0x9e,0x15,0xf0,0x90,0x9e,0x10,0x04,0xf0,0xe4,0xa3, -+0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x9e,0x24,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3, -+0xf0,0xa3,0xf0,0x90,0x05,0x60,0xe0,0x90,0x9e,0x34,0xf0,0x90,0x05,0x61,0xe0,0x90, -+0x9e,0x35,0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x36,0xf0,0x90,0x05,0x63,0xe0,0x90, -+0x9e,0x37,0xf0,0x90,0x9e,0x2d,0xe0,0xff,0x90,0x9e,0x37,0xe0,0xfe,0xd3,0x9f,0x50, -+0x0b,0x90,0x9e,0x2d,0xe0,0xc3,0x9e,0xd3,0x94,0x01,0x40,0x11,0x90,0x9e,0x1b,0xe0, -+0xb4,0x01,0x02,0x80,0x03,0x90,0x9e,0x1f,0xe0,0xff,0x12,0x4e,0xd8,0x22,0x90,0x9e, -+0x2e,0xe0,0x64,0x01,0x60,0x08,0x90,0x9e,0x1c,0xe0,0x60,0x02,0xe1,0x55,0x90,0x9e, -+0x10,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x3b,0x90,0x9e,0x11,0xe0, -+0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x28,0x90,0x9e,0x12,0xe0,0xc3, -+0x94,0xff,0x50,0x0a,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x11,0xf0,0x80,0x15,0x90,0x9e, -+0x13,0xe0,0xc3,0x94,0xff,0x50,0x10,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x12,0xf0,0x90, -+0x9e,0x11,0xf0,0x90,0x9e,0x10,0xf0,0x90,0x00,0x44,0xe0,0x54,0x0c,0x60,0x76,0xe0, -+0x30,0xe2,0x32,0x90,0x9e,0x24,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80, -+0x24,0x90,0x9e,0x25,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11, -+0x90,0x9e,0x26,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x25, -+0xf0,0x90,0x9e,0x24,0xf0,0x90,0x00,0x44,0xe0,0x30,0xe3,0x32,0x90,0x9e,0x27,0xe0, -+0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90,0x9e,0x28,0xe0,0xc3,0x94, -+0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x9e,0x29,0xe0,0xc3,0x94,0xff, -+0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x28,0xf0,0x90,0x9e,0x27,0xf0,0x90,0x04, -+0xfd,0xe0,0x44,0x01,0xf0,0x22,0xf5,0x67,}; -+ -+// =================== v84 UMC B Cut COMMON 2012-04-13 ===================== -+u8 Rtl8192CUFwUMCBCutImgArray[UMCBCutImgArrayLength] = { -+0xc2,0x88,0x02,0x00,0x54,0x00,0x01,0x00,0x04,0x13,0x11,0x08,0x26,0x3d,0x01,0x00, -+0x58,0x97,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x02,0x43,0xba,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x50,0xa1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x57,0x91,0x00,0x00,0x00,0x00,0x00,0xa1,0xe8,0x00,0x00,0x00, -+0x05,0x04,0x03,0x02,0x00,0x03,0x06,0x05,0x04,0x03,0x00,0x04,0x06,0x05,0x04,0x02, -+0x00,0x04,0x08,0x07,0x06,0x04,0x00,0x06,0x0a,0x09,0x08,0x06,0x00,0x08,0x0a,0x09, -+0x08,0x04,0x00,0x08,0x0a,0x09,0x08,0x02,0x00,0x08,0x0a,0x09,0x08,0x00,0x00,0x08, -+0x12,0x11,0x10,0x08,0x00,0x10,0x1a,0x19,0x18,0x10,0x00,0x18,0x22,0x21,0x20,0x18, -+0x00,0x20,0x22,0x21,0x20,0x10,0x00,0x20,0x22,0x21,0x20,0x08,0x00,0x20,0x22,0x21, -+0x1c,0x08,0x00,0x20,0x22,0x21,0x14,0x08,0x00,0x20,0x22,0x20,0x18,0x08,0x00,0x20, -+0x31,0x30,0x20,0x10,0x00,0x30,0x31,0x30,0x18,0x00,0x00,0x30,0x31,0x2f,0x10,0x10, -+0x00,0x30,0x31,0x2c,0x10,0x10,0x00,0x30,0x31,0x28,0x10,0x00,0x00,0x30,0x31,0x20, -+0x10,0x00,0x00,0x30,0x31,0x10,0x10,0x00,0x00,0x30,0x04,0x04,0x04,0x05,0x04,0x04, -+0x04,0x05,0x05,0x05,0x06,0x06,0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x06,0x04,0x04, -+0x05,0x05,0x05,0x05,0x06,0x06,0x04,0x04,0x05,0x05,0x05,0x05,0x06,0x07,0x0a,0x0b, -+0x0d,0x10,0x04,0x05,0x05,0x06,0x06,0x09,0x0c,0x11,0x08,0x08,0x09,0x09,0x0a,0x0c, -+0x10,0x11,0x04,0x04,0x04,0x05,0x04,0x04,0x05,0x07,0x07,0x07,0x08,0x0a,0x04,0x04, -+0x04,0x04,0x06,0x0a,0x0b,0x0d,0x05,0x05,0x07,0x07,0x08,0x0b,0x0d,0x0f,0x04,0x04, -+0x04,0x05,0x07,0x07,0x09,0x09,0x0c,0x0e,0x10,0x12,0x04,0x04,0x05,0x05,0x06,0x0a, -+0x11,0x13,0x09,0x09,0x09,0x09,0x0c,0x0e,0x11,0x13,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x24,0x26,0x2a,0x18,0x1a,0x1d,0x1f,0x21,0x27,0x29,0x2a,0x00,0x00, -+0x00,0x1f,0x23,0x28,0x2a,0x2c,0x00,0x04,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x18, -+0x00,0x24,0x00,0x30,0x00,0x48,0x00,0x60,0x00,0x90,0x00,0xc0,0x00,0xd8,0x00,0x50, -+0x00,0x78,0x00,0xa0,0x00,0xc8,0x01,0x40,0x01,0x90,0x01,0xe0,0x02,0x30,0x01,0x2c, -+0x01,0x40,0x01,0xe0,0x02,0xd0,0x03,0xe8,0x04,0xb0,0x06,0x40,0x07,0xd0,0x00,0x02, -+0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x0c,0x00,0x12,0x00,0x18,0x00,0x24,0x00,0x30, -+0x00,0x48,0x00,0x60,0x00,0x6c,0x00,0x28,0x00,0x3c,0x00,0x50,0x00,0x64,0x00,0xa0, -+0x00,0xc8,0x00,0xf0,0x01,0x18,0x00,0x64,0x00,0xa0,0x00,0xf0,0x01,0x68,0x01,0xf4, -+0x02,0x58,0x03,0x20,0x03,0xe8,0x02,0x02,0x02,0x02,0x02,0x02,0x03,0x03,0x04,0x04, -+0x05,0x07,0x04,0x04,0x07,0x0a,0x0a,0x0c,0x0c,0x12,0x05,0x07,0x07,0x08,0x0b,0x12, -+0x24,0x3c,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x01,0x02, -+0x03,0x04,0x05,0x06,0x07,0x08,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x20,0x1e, -+0x1c,0x18,0x10,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0xbb,0x01,0x0c,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0,0x22,0x50, -+0x06,0xe9,0x25,0x82,0xf8,0xe6,0x22,0xbb,0xfe,0x06,0xe9,0x25,0x82,0xf8,0xe2,0x22, -+0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe4,0x93,0x22,0xbb,0x01,0x06, -+0x89,0x82,0x8a,0x83,0xf0,0x22,0x50,0x02,0xf7,0x22,0xbb,0xfe,0x01,0xf3,0x22,0xf8, -+0xbb,0x01,0x0d,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0x22, -+0x50,0x06,0xe9,0x25,0x82,0xc8,0xf6,0x22,0xbb,0xfe,0x05,0xe9,0x25,0x82,0xc8,0xf2, -+0x22,0xc5,0xf0,0xf8,0xa3,0xe0,0x28,0xf0,0xc5,0xf0,0xf8,0xe5,0x82,0x15,0x82,0x70, -+0x02,0x15,0x83,0xe0,0x38,0xf0,0x22,0xbb,0x01,0x0a,0x89,0x82,0x8a,0x83,0xe0,0xf5, -+0xf0,0xa3,0xe0,0x22,0x50,0x06,0x87,0xf0,0x09,0xe7,0x19,0x22,0xbb,0xfe,0x07,0xe3, -+0xf5,0xf0,0x09,0xe3,0x19,0x22,0x89,0x82,0x8a,0x83,0xe4,0x93,0xf5,0xf0,0x74,0x01, -+0x93,0x22,0xbb,0x01,0x10,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0, -+0xf5,0xf0,0xa3,0xe0,0x22,0x50,0x09,0xe9,0x25,0x82,0xf8,0x86,0xf0,0x08,0xe6,0x22, -+0xbb,0xfe,0x0a,0xe9,0x25,0x82,0xf8,0xe2,0xf5,0xf0,0x08,0xe2,0x22,0xe5,0x83,0x2a, -+0xf5,0x83,0xe9,0x93,0xf5,0xf0,0xa3,0xe9,0x93,0x22,0xbb,0x01,0x0a,0x89,0x82,0x8a, -+0x83,0xf0,0xe5,0xf0,0xa3,0xf0,0x22,0x50,0x06,0xf7,0x09,0xa7,0xf0,0x19,0x22,0xbb, -+0xfe,0x06,0xf3,0xe5,0xf0,0x09,0xf3,0x19,0x22,0xf8,0xbb,0x01,0x11,0xe5,0x82,0x29, -+0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0xe5,0xf0,0xa3,0xf0,0x22,0x50,0x09, -+0xe9,0x25,0x82,0xc8,0xf6,0x08,0xa6,0xf0,0x22,0xbb,0xfe,0x09,0xe9,0x25,0x82,0xc8, -+0xf2,0xe5,0xf0,0x08,0xf2,0x22,0xef,0x4b,0xff,0xee,0x4a,0xfe,0xed,0x49,0xfd,0xec, -+0x48,0xfc,0x22,0xe0,0xfc,0xa3,0xe0,0xfd,0xa3,0xe0,0xfe,0xa3,0xe0,0xff,0x22,0xa4, -+0x25,0x82,0xf5,0x82,0xe5,0xf0,0x35,0x83,0xf5,0x83,0x22,0xe0,0xfb,0xa3,0xe0,0xfa, -+0xa3,0xe0,0xf9,0x22,0xf8,0xe0,0xfb,0xa3,0xa3,0xe0,0xf9,0x25,0xf0,0xf0,0xe5,0x82, -+0x15,0x82,0x70,0x02,0x15,0x83,0xe0,0xfa,0x38,0xf0,0x22,0xeb,0xf0,0xa3,0xea,0xf0, -+0xa3,0xe9,0xf0,0x22,0xd0,0x83,0xd0,0x82,0xf8,0xe4,0x93,0x70,0x12,0x74,0x01,0x93, -+0x70,0x0d,0xa3,0xa3,0x93,0xf8,0x74,0x01,0x93,0xf5,0x82,0x88,0x83,0xe4,0x73,0x74, -+0x02,0x93,0x68,0x60,0xef,0xa3,0xa3,0xa3,0x80,0xdf,0x02,0x43,0xf8,0x02,0x48,0x29, -+0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0x40,0x03,0xf6,0x80,0x01,0xf2,0x08,0xdf,0xf4, -+0x80,0x29,0xe4,0x93,0xa3,0xf8,0x54,0x07,0x24,0x0c,0xc8,0xc3,0x33,0xc4,0x54,0x0f, -+0x44,0x20,0xc8,0x83,0x40,0x04,0xf4,0x56,0x80,0x01,0x46,0xf6,0xdf,0xe4,0x80,0x0b, -+0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x90,0x44,0x3d,0xe4,0x7e,0x01,0x93,0x60, -+0xbc,0xa3,0xff,0x54,0x3f,0x30,0xe5,0x09,0x54,0x1f,0xfe,0xe4,0x93,0xa3,0x60,0x01, -+0x0e,0xcf,0x54,0xc0,0x25,0xe0,0x60,0xa8,0x40,0xb8,0xe4,0x93,0xa3,0xfa,0xe4,0x93, -+0xa3,0xf8,0xe4,0x93,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xf0,0xa3,0xc8, -+0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xdf,0xe9,0xde,0xe7,0x80,0xbe,0x41,0x9e,0x77, -+0x00,0x41,0x9e,0xae,0x00,0x41,0x9e,0x54,0x80,0x41,0x9e,0xb0,0x00,0x00,0xf0,0x90, -+0x9e,0x5d,0xe0,0x90,0x9e,0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x54,0x7e,0x01,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x85,0xe0,0xfb,0xa3,0xe0,0xf5,0x44,0xe4,0xf5, -+0x45,0x12,0x35,0xab,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x01,0x5f,0xe4,0xf0,0x90,0x01, -+0x3c,0x74,0x08,0xf0,0xe4,0x90,0x9e,0x85,0xf0,0x90,0x9e,0x5b,0xe0,0x90,0x9e,0x86, -+0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x5e,0x90,0x01,0x5f,0x74,0x05,0xf0, -+0x90,0x06,0x92,0x74,0x02,0xf0,0x90,0x9e,0x63,0x14,0xf0,0xe5,0x61,0x54,0x0f,0xc3, -+0x94,0x0c,0x50,0x03,0x12,0x54,0xe3,0x22,0x8f,0x82,0x8e,0x83,0xa3,0xa3,0xa3,0xe4, -+0xf0,0x22,0xe4,0xf5,0x65,0x7f,0x60,0x7e,0x01,0x80,0xed,0x7d,0x01,0xaf,0x62,0x02, -+0x54,0xe7,0xb1,0xb0,0xbf,0x01,0x12,0x90,0x9e,0x79,0xe0,0xff,0xe4,0xfd,0xf1,0x79, -+0x12,0x5f,0xf7,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0xb1,0xb0,0xbf,0x01,0x0f,0x90, -+0x02,0x09,0xe0,0xff,0x7d,0x01,0xf1,0x79,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x22, -+0x22,0x22,0x00,0x02,0x45,0x03,0x02,0x45,0x06,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x8b,0x20,0x8a,0x21,0x89,0x22,0x90,0x9e,0x87,0x71,0x8b,0xab,0x23,0xaa,0x24,0xa9, -+0x25,0x90,0x9e,0x8a,0x71,0x8b,0xaf,0x26,0x15,0x26,0xef,0x60,0x1b,0x90,0x9e,0x8a, -+0xe4,0x75,0xf0,0x01,0x71,0x74,0x12,0x29,0xd9,0xff,0x90,0x9e,0x87,0xe4,0x75,0xf0, -+0x01,0x71,0x74,0xef,0x51,0x4d,0x80,0xde,0xab,0x20,0xaa,0x21,0xa9,0x22,0xd0,0xd0, -+0x92,0xaf,0x22,0x90,0x9e,0x11,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0x90,0x06,0xa9, -+0xe0,0x90,0x9e,0x10,0xf0,0xe0,0x54,0xc0,0x70,0x08,0x53,0x64,0xfe,0x53,0x64,0xfd, -+0x91,0xcb,0x90,0x9e,0x10,0xe0,0x30,0xe6,0x13,0x43,0x64,0x01,0x90,0x9e,0x66,0xe0, -+0x64,0x02,0x60,0x04,0x91,0xd2,0x80,0x07,0x91,0x79,0x80,0x03,0x53,0x64,0xfe,0x90, -+0x9e,0x10,0xe0,0x30,0xe7,0x16,0x43,0x64,0x02,0xe4,0x90,0x9e,0x85,0x91,0x4e,0x90, -+0x01,0x57,0x74,0x05,0xf0,0x90,0x9e,0x67,0x74,0x01,0xf0,0x22,0x53,0x64,0xfd,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x01,0xc4,0x74,0xb0,0xf0,0x74,0x45,0xa3, -+0xf0,0x90,0x04,0x1d,0xe0,0x60,0x1a,0x90,0x05,0x22,0xe0,0x54,0x90,0x60,0x07,0x90, -+0x01,0xc6,0xe0,0x44,0x40,0xf0,0x90,0x01,0xc7,0xe0,0x30,0xe1,0xe4,0x7f,0x00,0x80, -+0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82, -+0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0, -+0x05,0xc0,0x06,0xc0,0x07,0x75,0x13,0x00,0x90,0x01,0xc4,0x74,0xe8,0xf0,0x74,0x45, -+0xa3,0xf0,0x53,0x91,0xdf,0x90,0x01,0x3c,0xe0,0x55,0x30,0xf5,0x34,0xa3,0xe0,0x55, -+0x31,0xf5,0x35,0xa3,0xe0,0x55,0x32,0xf5,0x36,0xa3,0xe0,0x55,0x33,0xf5,0x37,0xe5, -+0x34,0x30,0xe0,0x06,0x90,0x01,0x3c,0x74,0x01,0xf0,0xe5,0x34,0x30,0xe1,0x09,0x90, -+0x01,0x3c,0x74,0x02,0xf0,0x12,0x61,0xc9,0xe5,0x34,0x30,0xe2,0x38,0x90,0x01,0x3c, -+0x74,0x04,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe0,0x24,0x90,0x9e,0x85,0xe4,0xf0,0x90, -+0x9e,0x5b,0xe0,0x90,0x9e,0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x91,0x5e, -+0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x80,0x07,0x90,0x9e, -+0x64,0xe4,0xf0,0x91,0xcb,0xe5,0x34,0x30,0xe3,0x38,0x90,0x01,0x3c,0x74,0x08,0xf0, -+0x90,0x06,0x92,0xe0,0x30,0xe1,0x24,0x90,0x9e,0x85,0xe4,0xf0,0x90,0x9e,0x5b,0xe0, -+0x90,0x9e,0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x5e,0x90,0x01,0x5f, -+0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x80,0x07,0x90,0x9e,0x63,0xe4,0xf0, -+0x91,0xcb,0xe5,0x34,0x30,0xe4,0x09,0x90,0x01,0x3c,0x74,0x10,0xf0,0x12,0x4b,0xfb, -+0xe5,0x34,0x30,0xe5,0x09,0x90,0x01,0x3c,0x74,0x20,0xf0,0x12,0x4c,0x3d,0xe5,0x35, -+0x30,0xe0,0x44,0x90,0x01,0x3d,0x74,0x01,0xf0,0x90,0x01,0x2f,0xe0,0x44,0x7f,0xf0, -+0x90,0x00,0x83,0xe0,0x54,0x0f,0xf5,0x13,0xb4,0x01,0x02,0x80,0x1c,0xe5,0x13,0xb4, -+0x02,0x05,0x90,0x00,0x83,0x80,0x12,0xe5,0x13,0xb4,0x04,0x05,0x90,0x00,0x83,0x80, -+0x08,0xe5,0x13,0xb4,0x0c,0x06,0x90,0x00,0x83,0xe0,0xf5,0x62,0x90,0x01,0xbb,0xe5, -+0x62,0xf0,0x12,0x60,0xc0,0x91,0xcb,0xe5,0x35,0x30,0xe2,0x06,0x90,0x01,0x3d,0x74, -+0x04,0xf0,0xe5,0x35,0x30,0xe4,0x06,0x90,0x01,0x3d,0x74,0x10,0xf0,0xe5,0x36,0x30, -+0xe0,0x06,0x90,0x01,0x3e,0x74,0x01,0xf0,0xe5,0x36,0x30,0xe1,0x06,0x90,0x01,0x3e, -+0x74,0x02,0xf0,0x74,0xe8,0x04,0x90,0x01,0xc4,0xf0,0x74,0x45,0xa3,0xf0,0xd0,0x07, -+0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0, -+0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0x90,0x9e,0x98,0xef,0xf0,0xa3,0xed, -+0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xe5,0x63,0x60,0x05,0xe4,0xff,0x12,0x54,0x97,0x90, -+0x9e,0x98,0xe0,0x30,0xe0,0x09,0x90,0x9e,0x9a,0xe4,0xf0,0xa3,0x74,0x80,0xf0,0x90, -+0x9e,0x98,0xe0,0xff,0xc3,0x13,0x90,0xfd,0x10,0xf0,0x90,0x04,0x25,0xef,0xf0,0x90, -+0x9e,0x99,0xe0,0x60,0x1f,0xa3,0xa3,0xe0,0xff,0x24,0x0f,0xf5,0x82,0xe4,0x34,0xfc, -+0xf5,0x83,0xe0,0x44,0x80,0xf0,0x74,0x10,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xe0,0x44,0x80,0xf0,0x90,0x9e,0x9a,0xa3,0xe0,0xff,0xfd,0x24,0x08,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe4,0xf0,0x74,0x09,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xe0,0x54,0xf0,0xf0,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54, -+0xf7,0xf0,0x90,0x9e,0x9a,0xe0,0xfe,0xa3,0xe0,0xff,0x22,0x75,0x28,0x33,0xe4,0xf5, -+0x29,0x75,0x2a,0x07,0xf5,0x2b,0x90,0x01,0x30,0xe5,0x28,0xf0,0xa3,0xe5,0x29,0xf0, -+0xa3,0xe5,0x2a,0xf0,0xa3,0xe5,0x2b,0xf0,0x22,0xe4,0x90,0x9e,0x16,0xf0,0xa3,0xf0, -+0x75,0x8e,0x02,0xf1,0xa1,0xf1,0xe9,0x90,0x9e,0x7e,0xef,0xf0,0xf1,0xdd,0x90,0x9e, -+0x80,0xef,0xf0,0xf1,0xf6,0x90,0x9e,0x75,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xf5,0x57, -+0x12,0x6e,0x77,0xf1,0xd4,0x12,0x60,0x4b,0x12,0x32,0x3d,0xf1,0xc9,0x11,0x0b,0x12, -+0x50,0x0e,0xf1,0xcd,0xf1,0xb1,0x12,0x44,0xff,0xf1,0x45,0x90,0x9e,0x18,0xe5,0xd9, -+0xf0,0x11,0xd0,0xc2,0xaf,0x90,0x00,0x80,0xe0,0x44,0x40,0xf0,0xb1,0x45,0x75,0xe8, -+0x03,0x43,0xa8,0x85,0xd2,0xaf,0x90,0x9e,0x16,0xe0,0x64,0x01,0xf0,0x24,0x29,0x90, -+0x01,0xc4,0xf0,0x74,0x48,0xa3,0xf0,0xe5,0x57,0x30,0xe4,0x0a,0xc2,0xaf,0x53,0x57, -+0xef,0xd2,0xaf,0x12,0x58,0x74,0xe5,0x57,0x30,0xe6,0x17,0xc2,0xaf,0x53,0x57,0xbf, -+0xd2,0xaf,0x12,0x67,0xa1,0x90,0x9e,0x43,0xe0,0xff,0x60,0x03,0xb4,0x01,0x03,0x12, -+0x7b,0x49,0x90,0x9e,0x43,0xe0,0x70,0x03,0x12,0x7c,0x4c,0x12,0x73,0x85,0x80,0xb6, -+0x90,0x01,0x3c,0x74,0xff,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x01,0x34,0xf0,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x54,0x31,0x05,0x7d,0xff,0x7f,0x55,0x31,0x05,0x7d, -+0xff,0x7f,0x56,0x31,0x05,0x7d,0xff,0x7f,0x57,0x80,0x0a,0xf0,0x90,0x00,0x45,0xe0, -+0x54,0xfe,0xfd,0x7f,0x45,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x8f,0x82,0x75,0x83, -+0x00,0xed,0xf0,0xb1,0x45,0xd0,0xd0,0x92,0xaf,0x22,0xef,0x14,0x60,0x30,0x14,0x60, -+0x66,0x24,0x02,0x60,0x02,0x21,0xc1,0x90,0x9e,0x3f,0x74,0x02,0xf0,0x90,0x00,0x48, -+0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x31,0x05,0x90,0x00,0x47,0xe0,0x44,0x08,0xfd,0x7f, -+0x47,0x31,0x05,0x90,0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0x80,0x71,0xe4,0x90, -+0x9e,0x3f,0xf0,0x90,0x9e,0x3b,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x00,0x45,0xe0,0x44,0xef,0xfd,0x7f,0x45,0x31, -+0x05,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f,0x45,0x31,0x05,0x90,0x00,0x46,0xe0, -+0x44,0x10,0xfd,0x7f,0x46,0x80,0x38,0x90,0x9e,0x3f,0x74,0x01,0xf0,0x90,0x9e,0x45, -+0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9, -+0x90,0x00,0x45,0xe0,0x44,0x20,0xfd,0x7f,0x45,0x31,0x05,0x90,0x00,0x45,0xe0,0x44, -+0x10,0xfd,0x7f,0x45,0x31,0x05,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x31, -+0x05,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x9e,0x41,0xf0,0x90,0x00,0x01,0x12, -+0x42,0x20,0x25,0xe0,0x25,0xe0,0x90,0x9e,0x40,0xf0,0x12,0x29,0xd9,0x25,0xe0,0x25, -+0xe0,0x90,0x9e,0x44,0xf0,0x90,0x05,0x60,0xe0,0x90,0x9e,0x4f,0xf0,0x90,0x05,0x61, -+0xe0,0x90,0x9e,0x50,0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x51,0xf0,0x90,0x05,0x63, -+0xe0,0x90,0x9e,0x52,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf,0x90, -+0x9e,0x40,0xe0,0xff,0x91,0xf0,0x90,0x9e,0x24,0xe0,0x24,0xff,0x92,0xaf,0x90,0x9e, -+0x41,0xe0,0x70,0x02,0x41,0xc8,0x90,0x9e,0x40,0xe0,0x70,0x02,0x41,0xc8,0x90,0x9e, -+0x44,0xe0,0x70,0x02,0x41,0xc8,0xa2,0xaf,0xe4,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf, -+0x90,0x9e,0x53,0x74,0x01,0xf0,0x90,0x9e,0x24,0xe0,0x24,0xff,0x92,0xaf,0x11,0xfc, -+0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46,0x31,0x05,0x90,0x9e,0x39,0xe0,0x60, -+0x15,0x90,0x9e,0x45,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e, -+0x08,0x12,0x2f,0xd9,0x80,0x06,0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x00,0x45,0xe0, -+0x54,0xef,0xfd,0x7f,0x45,0x31,0x05,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x9e, -+0x4f,0xe0,0x90,0x05,0x84,0xf0,0x90,0x9e,0x50,0xe0,0x90,0x05,0x85,0xf0,0x90,0x9e, -+0x51,0xe0,0x90,0x05,0x86,0xf0,0x90,0x9e,0x52,0xe0,0x90,0x05,0x87,0xf0,0xa2,0xaf, -+0xe4,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf,0x90,0x01,0x3c,0xe0,0x44,0x20,0xf0,0x7d, -+0x20,0xe4,0xff,0x12,0x37,0x00,0x80,0x2b,0x90,0x9e,0x41,0xe0,0x70,0x2d,0x90,0x9e, -+0x53,0x11,0xfb,0x90,0x00,0x46,0xe0,0x54,0xfe,0xfd,0x7f,0x46,0x31,0x05,0x90,0x05, -+0x22,0xe4,0xf0,0xa2,0xaf,0x33,0x90,0x9e,0x24,0xf0,0xc2,0xaf,0x7d,0x20,0xe4,0xff, -+0x12,0x36,0x92,0x90,0x9e,0x24,0xe0,0x24,0xff,0x92,0xaf,0x22,0x8b,0x14,0x8a,0x15, -+0x89,0x16,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x9e,0x42,0xf0,0xe0,0x30,0xe0,0x4b, -+0x90,0x9e,0x39,0x74,0x01,0xf0,0x7f,0x80,0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0x3b, -+0x12,0x2a,0x7f,0xab,0x14,0xaa,0x15,0xa9,0x16,0x90,0x00,0x01,0x12,0x42,0x20,0xff, -+0xe4,0xfc,0xfd,0xfe,0x78,0x1a,0x12,0x2a,0x6c,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab, -+0x07,0x90,0x9e,0x3b,0x12,0x43,0x53,0xec,0x54,0x03,0xfc,0x12,0x43,0x46,0x90,0x9e, -+0x45,0x12,0x2a,0x7f,0x90,0x05,0x22,0xe4,0xf0,0x80,0x2d,0xe4,0x90,0x9e,0x39,0xf0, -+0x7f,0x80,0x7e,0x08,0x12,0x27,0xde,0xec,0x54,0x03,0xfc,0xec,0x44,0xc0,0xfc,0x90, -+0x9e,0x3b,0x12,0x2a,0x7f,0x90,0x9e,0x3b,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x42,0xe0,0x30,0xe1,0x19,0x7d, -+0x0c,0x7f,0x47,0x31,0x05,0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x31,0x05, -+0x90,0x00,0x46,0xe0,0x44,0x10,0x80,0x1c,0x90,0x00,0x47,0xe0,0x54,0xf3,0xfd,0x7f, -+0x47,0x31,0x05,0x90,0x00,0x48,0xe0,0x54,0xf3,0xfd,0x7f,0x48,0x31,0x05,0x90,0x00, -+0x46,0xe0,0x54,0xef,0xfd,0x7f,0x46,0x31,0x05,0xe4,0x90,0x9e,0x3f,0xf0,0x22,0x90, -+0x01,0x30,0xe4,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x01,0x38,0xf0,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x50,0x31,0x05,0xe4,0xfd,0x7f,0x51,0x31,0x05,0xe4, -+0xfd,0x7f,0x52,0x31,0x05,0xe4,0xfd,0x7f,0x53,0x21,0x05,0xe5,0x65,0x64,0x01,0x70, -+0x3b,0xd1,0x85,0xbf,0x01,0x04,0x7f,0x01,0xd1,0x79,0x90,0x00,0x46,0xe0,0x44,0x04, -+0xfd,0x7f,0x46,0x31,0x05,0x90,0x00,0x44,0xe0,0x54,0xfb,0xfd,0x7f,0x44,0x31,0x05, -+0x90,0x00,0x46,0xe0,0x54,0xfb,0xfd,0x7f,0x46,0x31,0x05,0x7f,0x02,0xd1,0xa1,0x8f, -+0x69,0x90,0x01,0xc9,0xe5,0x69,0xf0,0xb4,0x01,0x02,0xd1,0x19,0x22,0x90,0x9e,0x41, -+0xe0,0x64,0x01,0x60,0x02,0x81,0xef,0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46, -+0x31,0x05,0x90,0x9e,0x53,0xe0,0x70,0x31,0x90,0x9e,0x39,0xe0,0x60,0x15,0x90,0x9e, -+0x45,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f, -+0xd9,0x80,0x06,0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x9e,0x40,0xe0,0xff,0x91,0xf0, -+0x90,0x9e,0x53,0x74,0x01,0x11,0xfb,0x80,0x3f,0x90,0x9e,0x53,0xe0,0x64,0x01,0x70, -+0x37,0x90,0x9e,0x44,0xe0,0xff,0x91,0xf0,0xe4,0x90,0x9e,0x53,0xf0,0x90,0x00,0x45, -+0xe0,0x44,0x01,0xfd,0x7f,0x45,0x31,0x05,0x90,0x9e,0x39,0xe0,0x60,0x15,0x90,0x9e, -+0x3b,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f, -+0xd9,0x80,0x05,0x90,0x05,0x22,0xe4,0xf0,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90, -+0x9e,0x4f,0xe0,0x90,0x05,0x84,0xf0,0x90,0x9e,0x50,0xe0,0x90,0x05,0x85,0xf0,0x90, -+0x9e,0x51,0xe0,0x90,0x05,0x86,0xf0,0x90,0x9e,0x52,0xe0,0x90,0x05,0x87,0xf0,0x22, -+0x90,0x05,0x60,0xe0,0x90,0x9e,0x4f,0xf0,0x90,0x05,0x61,0xe0,0x90,0x9e,0x50,0xf0, -+0x90,0x05,0x62,0xe0,0x90,0x9e,0x51,0xf0,0x90,0x05,0x63,0xe0,0x90,0x9e,0x52,0xf0, -+0xc3,0x74,0xff,0x9f,0xfe,0x90,0x9e,0x50,0xe0,0xd3,0x9e,0x40,0x1e,0xe0,0x2f,0xf0, -+0xa3,0xe0,0xb4,0xff,0x0f,0xe4,0xf0,0xa3,0xe0,0xb4,0xff,0x03,0xe4,0xf0,0x22,0x90, -+0x9e,0x52,0x80,0x03,0x90,0x9e,0x51,0xe0,0x04,0xf0,0x22,0x90,0x9e,0x50,0xe0,0x2f, -+0xf0,0x22,0xe0,0x5f,0xf0,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x7f,0x10,0xdf,0xfe, -+0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x2a,0xed, -+0xf0,0x90,0x9e,0x29,0xef,0xf0,0xd3,0x94,0x07,0x50,0x4e,0xa3,0xe0,0x70,0x1a,0x90, -+0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4, -+0xff,0x90,0x00,0x47,0xe0,0x5f,0xf0,0x80,0x17,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01, -+0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x47,0xe0,0x4f,0xf0, -+0xb1,0x45,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0x80,0x59,0x90,0x9e,0x29,0xe0,0x24,0xf8,0xf0, -+0xa3,0xe0,0x70,0x1d,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02, -+0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0x80, -+0x1a,0x90,0x9e,0x29,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8, -+0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0xb1,0x45,0x90,0x9e,0x29, -+0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90, -+0x00,0x43,0xb1,0x42,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x49,0xe0,0x90,0x9e,0xb1, -+0xf0,0xe0,0x54,0x0f,0xf0,0x44,0xf0,0xfd,0x7f,0x49,0x31,0x05,0x90,0x9e,0xb1,0xe0, -+0x44,0xb0,0xfd,0x7f,0x49,0x21,0x05,0x90,0x9e,0x27,0xee,0xf0,0xa3,0xef,0xf0,0x75, -+0x65,0x01,0x8e,0x66,0xf5,0x67,0xe4,0xfd,0x7f,0x0b,0xb1,0x55,0xe4,0xfd,0x7f,0x02, -+0xb1,0x55,0xd1,0x85,0xe4,0xff,0xd1,0x79,0xe4,0xf5,0x69,0x90,0x01,0xc9,0xe5,0x69, -+0xf0,0x90,0x9e,0x27,0xe0,0xfc,0xa3,0xe0,0xfd,0xec,0xfb,0x8d,0x44,0xe4,0xf5,0x45, -+0x7d,0x01,0x7f,0x60,0x7e,0x01,0x02,0x35,0xab,0x90,0x01,0xca,0xe5,0x68,0xf0,0xef, -+0x60,0x02,0xd1,0x19,0x22,0x7f,0x0b,0xd1,0xa1,0xef,0x65,0x68,0x60,0x10,0xe5,0x68, -+0xb4,0x01,0x05,0xe4,0xf5,0x68,0x80,0x03,0x75,0x68,0x01,0x7f,0x01,0x22,0x7f,0x00, -+0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0xb2,0xef,0xf0,0xd3,0x94,0x07, -+0x50,0x43,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4, -+0xff,0x90,0x00,0x46,0xb1,0x42,0x90,0x9e,0xb2,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8, -+0x05,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x44,0xe0, -+0xfb,0xe4,0xfe,0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13, -+0xd8,0xf8,0xff,0x80,0x4b,0x90,0x9e,0xb2,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01, -+0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f, -+0xf0,0xb1,0x45,0x90,0x9e,0xb2,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8,0x05,0x08,0x80, -+0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x42,0xe0,0xfb,0xe4,0xfe, -+0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13,0xd8,0xf8,0xff, -+0xd0,0xd0,0x92,0xaf,0x22,0xe4,0xfd,0x7f,0x45,0x31,0x05,0x90,0x04,0xfd,0xe4,0xf0, -+0xa3,0xf0,0x90,0x9e,0x43,0xf0,0x90,0x9e,0x49,0xf0,0x90,0x9e,0x4c,0xf0,0x90,0x9e, -+0x4a,0xf0,0x90,0x9e,0x4d,0xf0,0x90,0x9e,0x4b,0xf0,0x90,0x9e,0x4e,0xf0,0x90,0x9e, -+0x35,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x9e,0x3a,0xf0,0x90,0x9e, -+0x3f,0xf0,0x90,0x9e,0x41,0xf0,0x90,0x9e,0x53,0xf0,0x90,0x9e,0x44,0xf0,0x90,0x9e, -+0x40,0xf0,0x90,0x9e,0x39,0xf0,0x90,0x00,0x51,0xe0,0x44,0xc0,0xfd,0x7f,0x51,0x21, -+0x05,0xe4,0x90,0x9e,0x7d,0xf0,0x90,0x00,0x80,0xe0,0x44,0x80,0xfd,0x7f,0x80,0x21, -+0x05,0x75,0x30,0x1f,0x75,0x31,0x01,0xe4,0xf5,0x32,0x90,0x01,0x38,0xe5,0x30,0xf0, -+0xa3,0xe5,0x31,0xf0,0xa3,0xe5,0x32,0xf0,0x22,0xe4,0xf5,0x68,0x22,0x90,0x01,0x64, -+0x74,0xa0,0xf0,0x22,0x90,0x9e,0x80,0xe0,0x90,0x9e,0x0f,0xf0,0x22,0x90,0x00,0xf3, -+0xe0,0x7f,0x00,0x30,0xe3,0x02,0x7f,0x01,0x22,0x90,0x00,0x02,0xe0,0x54,0xe0,0x7f, -+0x01,0x60,0x02,0x7f,0x00,0x22,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x0c,0x90,0x00,0xf2, -+0xe0,0x30,0xe7,0x05,0x7e,0xfd,0x7f,0x33,0x22,0x7e,0xfd,0x7f,0x2f,0x22,0x90,0x00, -+0xf3,0xe0,0x30,0xe2,0x0d,0x90,0x05,0x41,0x74,0x10,0xf0,0x90,0x05,0x5a,0xf0,0xa3, -+0xe4,0xf0,0x22,0x90,0x01,0x02,0xe0,0x54,0x03,0xff,0xe0,0x54,0x0c,0x13,0x13,0x54, -+0x3f,0xfe,0xef,0x64,0x01,0x60,0x04,0xef,0xb4,0x03,0x10,0x90,0x9e,0x10,0x74,0x01, -+0xf0,0xa3,0x74,0x37,0xf0,0xa3,0x74,0x01,0xf0,0x80,0x1a,0xee,0x64,0x01,0x60,0x07, -+0xaf,0x06,0xee,0x64,0x03,0x70,0x49,0x90,0x9e,0x10,0x74,0x01,0xf0,0xa3,0x74,0x3d, -+0xf0,0xa3,0x74,0x40,0xf0,0x90,0x9e,0x10,0xe0,0xfe,0xa3,0xe0,0xff,0xf5,0x82,0x8e, -+0x83,0xe0,0xfd,0x90,0x9e,0x12,0xe0,0xfc,0xed,0x5c,0x60,0x0c,0x8f,0x82,0x8e,0x83, -+0xec,0xf0,0xe4,0x90,0x9e,0x77,0xf0,0x22,0x90,0x9e,0x77,0xe0,0x04,0xf0,0xe0,0xc3, -+0x94,0x0a,0x40,0x0c,0xe4,0xf0,0x90,0x04,0x19,0xe0,0x30,0xe0,0x03,0x12,0x44,0xea, -+0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00, -+0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01, -+0xc4,0x74,0xa1,0xf0,0x74,0x50,0xa3,0xf0,0x90,0x01,0x34,0xe0,0x55,0x28,0xf5,0x2c, -+0xa3,0xe0,0x55,0x29,0xf5,0x2d,0xa3,0xe0,0x55,0x2a,0xf5,0x2e,0xa3,0xe0,0x55,0x2b, -+0xf5,0x2f,0xe5,0x2c,0x20,0xe0,0x02,0x41,0x46,0x90,0x01,0x34,0x74,0x01,0xf0,0x85, -+0xd1,0x4d,0x85,0xd2,0x4e,0x85,0xd3,0x4f,0x85,0xd4,0x50,0x85,0xd5,0x51,0x85,0xd6, -+0x52,0x85,0xd7,0x53,0x85,0xd9,0x54,0xe5,0x54,0x54,0x40,0xc3,0x13,0xff,0xe5,0x53, -+0x54,0x20,0x6f,0x70,0x02,0x21,0xf5,0xe5,0x54,0x30,0xe5,0x02,0x21,0xf5,0xe5,0x52, -+0x54,0x3f,0xf5,0x08,0xe5,0x4d,0x54,0x3f,0xf5,0x09,0xe5,0x51,0x54,0x1f,0xff,0xe5, -+0x08,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0x8f,0xf0,0x12, -+0x42,0x81,0xe5,0x53,0x54,0x1f,0xff,0xe5,0x08,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4, -+0x34,0x93,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x09,0xd3,0x94,0x04,0x40, -+0x03,0x75,0x09,0x04,0x75,0xf0,0x0a,0xe5,0x08,0x90,0x90,0x00,0x12,0x43,0x5f,0x75, -+0xf0,0x02,0xe5,0x09,0x12,0x43,0x5f,0xe0,0xfe,0xa3,0xe0,0xff,0xe5,0x53,0x54,0x1f, -+0x2f,0xff,0xe4,0x3e,0xfe,0x75,0xf0,0x0a,0xe5,0x08,0x90,0x90,0x00,0x12,0x43,0x5f, -+0x75,0xf0,0x02,0xe5,0x09,0x12,0x43,0x5f,0xee,0xf0,0xa3,0xef,0xf0,0xe5,0x54,0x20, -+0xe6,0x24,0xe5,0x53,0x54,0x1f,0xff,0xe5,0x08,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4, -+0x34,0x98,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x4f,0x30,0xe7,0x36,0xaf, -+0x08,0x12,0x63,0x51,0x80,0x2f,0xe5,0x53,0x54,0x1f,0xff,0xe5,0x08,0x25,0xe0,0x24, -+0x44,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0x8f,0xf0,0x12,0x42,0x81,0xe5,0x4f, -+0x30,0xe7,0x12,0xe5,0x4f,0x54,0x7f,0xfd,0xe5,0x53,0x54,0x1f,0xf5,0x0d,0xab,0x09, -+0xaf,0x08,0x12,0x62,0xee,0xe5,0x63,0x14,0x24,0xfd,0x50,0x02,0x80,0x48,0x90,0x9e, -+0x66,0xe0,0x60,0x3a,0x90,0x01,0x5b,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x04,0xf0,0x71, -+0xc3,0xef,0x64,0x01,0x70,0x30,0x90,0x9e,0x85,0xf0,0x90,0x9e,0x5b,0xe0,0x90,0x9e, -+0x86,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44,0x5e,0x90,0x01,0x5b,0x74, -+0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x90,0x9e,0x64,0xf0,0x80,0x08,0x71,0xc3, -+0xbf,0x01,0x03,0x12,0x44,0xcb,0xe5,0x2c,0x30,0xe1,0x20,0x90,0x01,0x34,0x74,0x02, -+0xf0,0x85,0xd1,0x58,0x85,0xd2,0x59,0x85,0xd3,0x5a,0x85,0xd4,0x5b,0x85,0xd5,0x5c, -+0x85,0xd6,0x5d,0x85,0xd7,0x5e,0x85,0xd9,0x5f,0x71,0xd2,0xe5,0x2c,0x30,0xe3,0x06, -+0x90,0x01,0x34,0x74,0x08,0xf0,0xe5,0x2c,0x30,0xe4,0x09,0x90,0x01,0x34,0x74,0x10, -+0xf0,0x43,0x57,0x10,0xe5,0x2c,0x30,0xe5,0x26,0x90,0x01,0xcf,0xe0,0x30,0xe5,0x1f, -+0xe0,0x54,0xdf,0xf0,0x90,0x01,0x34,0x74,0x20,0xf0,0x75,0xa8,0x00,0x75,0xe8,0x00, -+0x12,0x4b,0xcf,0x90,0x00,0x03,0xe0,0x54,0xfb,0xf0,0x12,0x4d,0x45,0x80,0xfe,0xe5, -+0x2c,0x30,0xe6,0x06,0x90,0x01,0x34,0x74,0x40,0xf0,0xe5,0x2e,0x30,0xe0,0x12,0x90, -+0x9e,0x7f,0x74,0x01,0xf0,0x90,0x01,0x36,0xf0,0x12,0x61,0x4e,0x90,0x9e,0x7f,0xe4, -+0xf0,0xe5,0x2e,0x30,0xe1,0x0b,0x90,0x01,0x36,0x74,0x02,0xf0,0x43,0x57,0x40,0x11, -+0x23,0xe5,0x2e,0x30,0xe2,0x09,0x90,0x01,0x36,0x74,0x04,0xf0,0x12,0x60,0xdf,0xe5, -+0x2e,0x30,0xe3,0x28,0x90,0x01,0x36,0x74,0x08,0xf0,0xe5,0x60,0x64,0x01,0x70,0x1c, -+0xe5,0x63,0x60,0x18,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90, -+0x9e,0x85,0xe4,0x12,0x44,0x4e,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x2e,0x30,0xe4, -+0x2b,0x90,0x01,0x36,0x74,0x10,0xf0,0xe5,0x60,0xb4,0x01,0x20,0xe5,0x63,0x60,0x1c, -+0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x9e,0x67,0xe4,0xf0, -+0x53,0x64,0xfd,0xe5,0x64,0x54,0x07,0x70,0x03,0x12,0x44,0xcb,0xe5,0x2e,0x30,0xe5, -+0x1f,0x90,0x01,0x36,0x74,0x20,0xf0,0xe5,0x60,0xb4,0x01,0x14,0xe5,0x63,0x60,0x10, -+0x90,0x9e,0x66,0xe0,0x64,0x02,0x60,0x05,0x12,0x44,0xd2,0x80,0x03,0x12,0x44,0x79, -+0xe5,0x2e,0x30,0xe6,0x1b,0x90,0x01,0x36,0x74,0x40,0xf0,0xe5,0x60,0xb4,0x01,0x10, -+0xe5,0x63,0x60,0x0c,0x53,0x64,0xfe,0xe5,0x64,0x54,0x07,0x70,0x03,0x12,0x44,0xcb, -+0xe5,0x2f,0x30,0xe1,0x08,0x90,0x01,0x37,0x74,0x02,0xf0,0x91,0x64,0x74,0xa1,0x04, -+0x90,0x01,0xc4,0xf0,0x74,0x50,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0,0x04, -+0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0,0xf0, -+0xd0,0xe0,0x32,0x90,0x04,0x1b,0xe0,0x54,0x7f,0x64,0x7f,0x7f,0x01,0x60,0x02,0x7f, -+0x00,0x22,0x90,0x9e,0x10,0xe0,0x54,0xf0,0x44,0x03,0xf0,0x54,0x0f,0x44,0x80,0xf0, -+0x7b,0x00,0x7a,0x00,0x79,0x58,0x90,0x9e,0x90,0x12,0x43,0x8b,0x0b,0x7a,0x9e,0x79, -+0x10,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x8d,0x12,0x43,0x8b,0x90,0x9e, -+0xb0,0xe0,0xff,0x04,0xf0,0x90,0x00,0x01,0xef,0x12,0x42,0x5f,0x7f,0xaf,0x7e,0x01, -+0x12,0x71,0x7a,0xef,0x60,0x49,0x90,0x9e,0x8d,0x12,0x43,0x6b,0x8b,0x23,0x8a,0x24, -+0x89,0x25,0x75,0x26,0x02,0x7b,0x01,0x7a,0x01,0x79,0xa0,0x12,0x45,0x09,0x90,0x9e, -+0x90,0x12,0x43,0x6b,0x8b,0x23,0x8a,0x24,0x89,0x25,0x90,0x9e,0x8d,0x12,0x43,0x6b, -+0x12,0x29,0xd9,0xff,0xc4,0x54,0x0f,0xf5,0x26,0x7b,0x01,0x7a,0x01,0x79,0xa2,0x12, -+0x45,0x09,0x90,0x01,0xaf,0x74,0xff,0xf0,0x90,0x01,0xcb,0xe0,0x64,0x80,0xf0,0xd0, -+0xd0,0x92,0xaf,0x22,0x90,0x9e,0xa0,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x63, -+0x14,0x24,0xfd,0x50,0x02,0x80,0x1f,0x90,0x9e,0x66,0xe0,0x60,0x06,0x7d,0x01,0x7f, -+0x0c,0x80,0x0d,0xe5,0x61,0x54,0x0f,0xc3,0x94,0x04,0x50,0x06,0x7d,0x01,0x7f,0x04, -+0x91,0xe7,0xe4,0xff,0x91,0x97,0x22,0xef,0x60,0x0b,0x90,0x9e,0x80,0xe0,0xb4,0x01, -+0x10,0xe4,0xff,0x80,0x09,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x05,0x7f,0x01,0x12,0x75, -+0x92,0x22,0x90,0x01,0x37,0x74,0x02,0xf0,0x90,0x05,0x22,0x74,0xff,0xf0,0x12,0x74, -+0x12,0xef,0x70,0x06,0x90,0x01,0xc8,0x74,0xfd,0xf0,0x7d,0x02,0x7f,0x03,0x12,0x36, -+0xe6,0xe5,0x63,0x60,0x04,0x7f,0x01,0x91,0x97,0x12,0x74,0xc8,0x53,0x61,0xf0,0x43, -+0x61,0x02,0x22,0x7d,0x01,0x7f,0x0c,0x8f,0x6a,0x8d,0x6b,0xe5,0x6a,0x54,0x0f,0xff, -+0xe5,0x61,0x54,0x0f,0x6f,0x60,0x65,0xe5,0x6a,0x30,0xe2,0x28,0xe5,0x61,0x20,0xe2, -+0x04,0x7f,0x01,0xd1,0xc2,0xe5,0x61,0x30,0xe3,0x0c,0xe5,0x6a,0x20,0xe3,0x07,0xb1, -+0x5d,0xef,0x60,0x48,0xa1,0xa5,0xe5,0x61,0x20,0xe3,0x41,0xe5,0x6a,0x30,0xe3,0x3c, -+0xaf,0x6b,0xc1,0xdc,0xe5,0x61,0x54,0x0f,0xff,0xbf,0x0c,0x0c,0xe5,0x6a,0x20,0xe3, -+0x07,0xb1,0x5d,0xef,0x60,0x26,0xb1,0xa5,0xe5,0x61,0x54,0x0f,0xff,0xbf,0x04,0x0c, -+0xe5,0x6a,0x20,0xe2,0x07,0xf1,0x21,0xef,0x60,0x12,0x91,0xb2,0xe5,0x61,0x54,0x0f, -+0xff,0xbf,0x02,0x08,0x12,0x60,0xbd,0xef,0x60,0x02,0xd1,0xaf,0x22,0x71,0xc3,0xef, -+0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x30,0x90,0x9e,0x64,0xe0, -+0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x22,0x90,0x9e,0x63,0xe0,0x60,0x08, -+0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x14,0xe5,0x62,0x54,0x0f,0xd3,0x94,0x04,0x40, -+0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74, -+0x08,0xf0,0x7f,0x00,0x22,0x90,0x06,0x04,0xe0,0x44,0x40,0xf0,0xe5,0x60,0xb4,0x01, -+0x04,0x7f,0x01,0xd1,0xf6,0x53,0x61,0xf0,0x43,0x61,0x04,0x22,0xef,0x64,0x01,0x70, -+0x2e,0x7d,0x78,0x7f,0x02,0x12,0x36,0x75,0x7d,0x02,0x7f,0x03,0x12,0x36,0x75,0x90, -+0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x91,0xe3,0xe4,0xff,0x91,0x97, -+0x90,0x06,0x04,0xe0,0x54,0x7f,0xf0,0x90,0x06,0x0a,0xe0,0x54,0xf8,0xf0,0x22,0x90, -+0x01,0x36,0x74,0x7b,0xf0,0xa3,0x74,0x02,0xf0,0x7d,0x7b,0xff,0x12,0x36,0xe6,0x7d, -+0x02,0x7f,0x03,0x12,0x36,0xe6,0x90,0x06,0x04,0xe0,0x44,0x80,0xf0,0x90,0x06,0x0a, -+0xe0,0x44,0x07,0xf0,0x12,0x62,0x4c,0xe5,0x60,0x20,0xe0,0x05,0xe4,0x90,0x9e,0x58, -+0xf0,0x22,0x8b,0x14,0x8a,0x15,0x89,0x16,0x12,0x60,0xb1,0xab,0x14,0xaa,0x15,0xa9, -+0x16,0x12,0x29,0xd9,0xf5,0x63,0x14,0x60,0x0e,0x14,0x60,0x1e,0x14,0x60,0x2f,0x24, -+0x03,0x70,0x40,0x7f,0x01,0x80,0x3a,0xab,0x14,0xaa,0x15,0xa9,0x16,0x90,0x00,0x02, -+0x12,0x42,0x20,0xfd,0xe4,0xff,0xd1,0x84,0x80,0x27,0xab,0x14,0xaa,0x15,0xa9,0x16, -+0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x01,0xd1,0x84,0x1f,0x80,0x13,0xab,0x14, -+0xaa,0x15,0xa9,0x16,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x02,0xd1,0x84,0xe4, -+0xff,0xb1,0xbc,0x22,0xef,0x24,0xfe,0x60,0x0b,0x04,0x70,0x22,0x90,0x9e,0x65,0x74, -+0x01,0xf0,0x80,0x16,0xed,0x70,0x0a,0x90,0x9e,0x62,0xe0,0x90,0x9e,0x65,0xf0,0x80, -+0x05,0x90,0x9e,0x65,0xed,0xf0,0x90,0x9e,0x65,0xe0,0x90,0x9e,0x56,0xf0,0x22,0x53, -+0x61,0xf0,0x43,0x61,0x01,0x12,0x45,0x00,0x12,0x45,0x01,0x53,0x61,0xf0,0x43,0x61, -+0x02,0x22,0x90,0x9e,0xaf,0xef,0xf0,0x12,0x74,0x53,0x90,0x9e,0xaf,0xe0,0x60,0x05, -+0x90,0x05,0x22,0xe4,0xf0,0x53,0x61,0xf0,0x43,0x61,0x04,0x22,0x90,0x06,0x04,0xe0, -+0x54,0xbf,0xf0,0xef,0x60,0x09,0xe5,0x60,0xb4,0x01,0x04,0xe4,0xff,0xd1,0xf6,0x53, -+0x61,0xf0,0x43,0x61,0x0c,0x22,0x8f,0x27,0x12,0x45,0xb0,0xbf,0x01,0x22,0x90,0x9e, -+0x7a,0xe0,0xff,0x7d,0x01,0x12,0x47,0x79,0xab,0x07,0xaa,0x06,0xad,0x03,0xac,0x02, -+0xaf,0x27,0x12,0x60,0x2a,0xaf,0x03,0x12,0x5f,0xf7,0x90,0x04,0x1f,0x74,0x20,0xf0, -+0x22,0x71,0xc3,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x58, -+0xe5,0x64,0x54,0x03,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x4a,0xe5,0x62, -+0x54,0x0f,0xd3,0x94,0x02,0x40,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x39,0xe5, -+0x64,0x30,0xe2,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x2c,0xe5,0x64,0x30,0xe4, -+0x08,0x90,0x01,0xb9,0x74,0x10,0xf0,0x80,0x1f,0x90,0x9e,0x58,0xe0,0x60,0x08,0x90, -+0x01,0xb9,0x74,0x20,0xf0,0x80,0x11,0x90,0x9e,0x5e,0xe0,0x60,0x08,0x90,0x01,0xb9, -+0x74,0x80,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74,0x04,0xf0,0x7f,0x00, -+0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00, -+0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01, -+0xc4,0x74,0x91,0xf0,0x74,0x57,0xa3,0xf0,0x53,0x91,0xef,0x90,0x00,0x51,0xe0,0xff, -+0x90,0x00,0x55,0xe0,0x5f,0xf5,0x3d,0x90,0x00,0x52,0xe0,0xff,0x90,0x00,0x56,0xe0, -+0x5f,0xf5,0x3e,0xe5,0x3d,0x30,0xe4,0x06,0x90,0x00,0x55,0x74,0x10,0xf0,0xe5,0x3d, -+0x30,0xe5,0x06,0x90,0x00,0x55,0x74,0x20,0xf0,0xe5,0x3d,0x30,0xe6,0x1b,0x90,0x00, -+0x55,0x74,0x40,0xf0,0x90,0x9e,0x42,0xe0,0x54,0x03,0xff,0xbf,0x03,0x0b,0x90,0x9e, -+0x3f,0xe0,0x60,0x05,0x7f,0x01,0x12,0x49,0x1a,0xe5,0x3d,0x30,0xe7,0x15,0x90,0x00, -+0x55,0x74,0x80,0xf0,0x90,0x9e,0x42,0xe0,0x54,0x03,0xff,0xbf,0x03,0x05,0x7f,0x02, -+0x12,0x49,0x1a,0xe5,0x3e,0x30,0xe0,0x06,0x90,0x00,0x56,0x74,0x01,0xf0,0xe5,0x3e, -+0x30,0xe1,0x06,0x90,0x00,0x56,0x74,0x02,0xf0,0xe5,0x3e,0x30,0xe2,0x06,0x90,0x00, -+0x56,0x74,0x04,0xf0,0xe5,0x3e,0x30,0xe3,0x06,0x90,0x00,0x56,0x74,0x08,0xf0,0x90, -+0x01,0xc4,0x74,0x91,0xf0,0x74,0x57,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0, -+0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0, -+0xf0,0xd0,0xe0,0x32,0x90,0x01,0xcc,0xe0,0x54,0x0f,0x90,0x9e,0x19,0xf0,0x90,0x9e, -+0x19,0xe0,0xfd,0x70,0x02,0x21,0xb5,0x90,0x9e,0xae,0xe0,0xff,0x74,0x01,0x7e,0x00, -+0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xef,0x5d,0x70, -+0x02,0x21,0xae,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd0,0x12,0x43,0x5f, -+0xe0,0x90,0x9e,0x1a,0xf0,0x75,0x23,0x01,0x75,0x24,0x9e,0x75,0x25,0x1a,0x75,0x26, -+0x01,0x7b,0x01,0x7a,0x9e,0x79,0x1b,0x12,0x45,0x09,0x90,0x9e,0x1b,0xe0,0xff,0xc4, -+0x13,0x13,0x13,0x54,0x01,0x90,0x9e,0xae,0x30,0xe0,0x59,0xe0,0x75,0xf0,0x02,0x90, -+0x00,0x88,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1c,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0, -+0x02,0x90,0x00,0x89,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1d,0xf0,0x90,0x9e,0xae,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd1,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1e,0xf0,0x90,0x9e, -+0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x1f,0xf0, -+0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x5f,0xe0,0x90,0x9e, -+0x20,0xf0,0x80,0x33,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd1,0x12,0x43,0x5f,0xe0,0x90, -+0x9e,0x1c,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x5f, -+0xe0,0x90,0x9e,0x1d,0xf0,0x90,0x9e,0xae,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12, -+0x43,0x5f,0xe0,0x90,0x9e,0x1e,0xf0,0xef,0x54,0x7f,0xff,0x7b,0x01,0x7a,0x9e,0x79, -+0x1c,0x31,0xb6,0x90,0x9e,0x19,0xe0,0xff,0x90,0x9e,0xae,0xe0,0xfe,0x74,0x01,0xa8, -+0x06,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0x5f,0x90,0x9e,0x19,0xf0,0x90,0x9e, -+0xae,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0x90,0x01, -+0xcc,0xf0,0x90,0x9e,0xae,0xe0,0x04,0xf0,0xe0,0x54,0x03,0xf0,0x01,0x7e,0x90,0x01, -+0xc6,0xe0,0x44,0x02,0xf0,0x22,0x90,0x9e,0x21,0x12,0x43,0x8b,0xef,0x12,0x43,0x94, -+0x59,0xfc,0x01,0x59,0xf4,0x02,0x5a,0x20,0x03,0x5a,0x29,0x05,0x5a,0x32,0x06,0x5a, -+0x7e,0x07,0x5a,0x3a,0x09,0x5a,0x43,0x0b,0x5a,0x4c,0x0c,0x5a,0x55,0x0d,0x5a,0x5e, -+0x0e,0x5a,0x67,0x1b,0x5a,0x6f,0x1c,0x5a,0x05,0x2d,0x5a,0x0e,0x2e,0x5a,0x17,0x3b, -+0x00,0x00,0x5a,0x77,0x90,0x9e,0x21,0x12,0x43,0x6b,0xe1,0xe9,0x90,0x9e,0x21,0x12, -+0x43,0x6b,0x02,0x71,0xd0,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x72,0x0b,0x90,0x9e, -+0x21,0x12,0x43,0x6b,0x02,0x72,0x53,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x72,0x8c, -+0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x72,0xb6,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02, -+0x70,0x4a,0x90,0x9e,0x21,0x12,0x43,0x6b,0x80,0x45,0x90,0x9e,0x21,0x12,0x43,0x6b, -+0x02,0x72,0xfe,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x70,0xa2,0x90,0x9e,0x21,0x12, -+0x43,0x6b,0x02,0x49,0xc2,0x90,0x9e,0x21,0x12,0x43,0x6b,0x02,0x7b,0x16,0x90,0x9e, -+0x21,0x12,0x43,0x6b,0x02,0x4a,0xfc,0x90,0x9e,0x21,0x12,0x43,0x6b,0xe1,0xef,0x90, -+0x9e,0x21,0x12,0x43,0x6b,0xe1,0xd1,0x90,0x01,0xc6,0xe0,0x44,0x01,0xf0,0x22,0x90, -+0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x1f,0xfe,0xef,0x54,0x20,0xc4,0x13,0x54,0x07, -+0xfd,0xaf,0x06,0x90,0x9e,0x24,0xef,0xf0,0xa3,0xed,0xf0,0xa3,0x12,0x43,0x8b,0x90, -+0x9e,0x26,0x12,0x43,0x6b,0x90,0x00,0x03,0x12,0x42,0x20,0x54,0xf0,0xc4,0x54,0x0f, -+0x90,0x9e,0x29,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0x54,0x40,0xc4,0x13,0x13,0x54, -+0x03,0x90,0x9e,0x2a,0xf0,0x90,0x9e,0x24,0xe0,0xff,0x75,0xf0,0x09,0x90,0x96,0x46, -+0x12,0x43,0x5f,0xad,0x82,0xac,0x83,0x90,0x9e,0x2b,0xec,0xf0,0xa3,0xed,0xf0,0xef, -+0x75,0xf0,0x09,0xa4,0x24,0x44,0xf9,0x74,0x96,0x35,0xf0,0xfa,0x7b,0x01,0xa3,0x12, -+0x43,0x8b,0x90,0x9e,0x26,0x12,0x43,0x6b,0x90,0x00,0x03,0x12,0x42,0x20,0x54,0x0f, -+0xff,0x90,0x9e,0x2d,0x12,0x43,0x6b,0xef,0x12,0x42,0x4d,0x90,0x9e,0x26,0x12,0x43, -+0x6b,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x90,0x9e,0x2d,0x12,0x43,0x6b,0x90,0x00, -+0x01,0xef,0x12,0x42,0x5f,0x90,0x9e,0x26,0x12,0x43,0x6b,0x90,0x00,0x01,0x12,0x42, -+0x20,0xff,0x90,0x9e,0x2b,0xe0,0xfc,0xa3,0xe0,0xfd,0xf5,0x82,0x8c,0x83,0xef,0xf0, -+0x12,0x29,0xd9,0x8d,0x82,0x8c,0x83,0xa3,0xf0,0x90,0x9e,0x29,0xe0,0xfe,0x90,0x9e, -+0x24,0xe0,0xff,0x24,0x82,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0x90,0x9e, -+0x25,0xe0,0xfe,0x75,0xf0,0x09,0xef,0x90,0x96,0x4a,0x12,0x43,0x5f,0xee,0xf0,0x75, -+0xf0,0x09,0xef,0x90,0x96,0x4b,0x12,0x43,0x5f,0x74,0x01,0xf0,0x90,0x9e,0x2a,0xe0, -+0xfe,0x75,0xf0,0x09,0xef,0x90,0x96,0x4c,0x12,0x43,0x5f,0xee,0xf0,0x8f,0x14,0xef, -+0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xaf,0x82,0xf5,0x16,0x8f,0x17,0xe5, -+0x14,0x75,0xf0,0x02,0xa4,0x24,0x02,0xf9,0x74,0x95,0x35,0xf0,0x75,0x18,0x01,0xf5, -+0x19,0x89,0x1a,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x46,0x12,0x43,0x5f,0xaf,0x82, -+0x85,0x83,0x1b,0x8f,0x1c,0xe5,0x14,0x75,0xf0,0x09,0xa4,0x24,0x44,0xf9,0x74,0x96, -+0x35,0xf0,0x75,0x1d,0x01,0xf5,0x1e,0x89,0x1f,0x74,0x82,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xe0,0x12,0x43,0x94,0x5c,0x0d,0x00,0x5c,0x22,0x01,0x5c,0x37, -+0x02,0x5c,0x4c,0x03,0x5c,0x75,0x04,0x5c,0x8a,0x05,0x5c,0x9f,0x06,0x5c,0xc5,0x0c, -+0x5c,0xf2,0x0d,0x5d,0x1f,0x0e,0x5d,0x4c,0x0f,0x00,0x00,0x5d,0x80,0xe5,0x14,0x25, -+0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0x74,0x15, -+0x80,0x3c,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74, -+0xf0,0xf0,0xa3,0x74,0x10,0x80,0x27,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4, -+0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0x74,0x05,0x80,0x12,0xe5,0x14,0x25,0xe0, -+0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xf0,0xf0,0xa3,0xe4,0xf0,0xe5, -+0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0x74,0x0f,0xf0,0xa3, -+0x74,0x8f,0xf0,0xa1,0x80,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b, -+0xf5,0x83,0x74,0x0f,0xf0,0xa3,0x74,0xf5,0x80,0x27,0xe5,0x14,0x25,0xe0,0x24,0xc6, -+0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0x0f,0xf0,0xa3,0x74,0xf0,0x80,0x12,0xe5, -+0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0,0xa3,0x74, -+0x0d,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe4, -+0xf0,0xa3,0xf0,0xa1,0x80,0x90,0x04,0x47,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12, -+0x42,0x4d,0x90,0x04,0x46,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x01,0x12, -+0x42,0x5f,0x90,0x04,0x45,0xe0,0x85,0x17,0x82,0x85,0x16,0x83,0xf0,0x90,0x04,0x44, -+0xa1,0x77,0x90,0x04,0x4b,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12,0x42,0x4d,0x90, -+0x04,0x4a,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x01,0x12,0x42,0x5f,0x90, -+0x04,0x49,0xe0,0x85,0x17,0x82,0x85,0x16,0x83,0xf0,0x90,0x04,0x48,0x80,0x58,0x90, -+0x04,0x4f,0xe0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12,0x42,0x4d,0x90,0x04,0x4e,0xe0, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x01,0x12,0x42,0x5f,0x90,0x04,0x4d,0xe0, -+0x85,0x17,0x82,0x85,0x16,0x83,0xf0,0x90,0x04,0x4c,0x80,0x2b,0x90,0x04,0x53,0xe0, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0x12,0x42,0x4d,0x90,0x04,0x52,0xe0,0xab,0x18,0xaa, -+0x19,0xa9,0x1a,0x90,0x00,0x01,0x12,0x42,0x5f,0x90,0x04,0x51,0xe0,0x85,0x17,0x82, -+0x85,0x16,0x83,0xf0,0x90,0x04,0x50,0xe0,0x85,0x17,0x82,0x85,0x16,0x83,0xa3,0xf0, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0xc0,0x03,0xc0,0x02,0xc0,0x01,0x12,0x29,0xd9,0xff, -+0xab,0x1d,0xaa,0x1e,0xa9,0x1f,0x12,0x29,0xd9,0x5f,0xd0,0x01,0xd0,0x02,0xd0,0x03, -+0x12,0x42,0x4d,0xab,0x18,0xe5,0x1a,0x24,0x01,0xf9,0xe4,0x35,0x19,0xfa,0xc0,0x03, -+0xc0,0x02,0xc0,0x01,0x12,0x29,0xd9,0xff,0xab,0x1d,0xaa,0x1e,0xa9,0x1f,0x90,0x00, -+0x01,0x12,0x42,0x20,0x5f,0xd0,0x01,0xd0,0x02,0xd0,0x03,0x12,0x42,0x4d,0x85,0x17, -+0x82,0x85,0x16,0x83,0xc0,0x83,0xc0,0x82,0xe0,0xff,0x85,0x1c,0x82,0x85,0x1b,0x83, -+0xe0,0xfe,0xef,0x5e,0xd0,0x82,0xd0,0x83,0xf0,0x85,0x17,0x82,0x85,0x16,0x83,0xa3, -+0xc0,0x83,0xc0,0x82,0xe0,0xff,0x85,0x1c,0x82,0x85,0x1b,0x83,0xa3,0xe0,0xfe,0xef, -+0x5e,0xd0,0x82,0xd0,0x83,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34, -+0x95,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3b,0x75,0x15,0x0b,0x74,0x01,0x7e, -+0x00,0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xe5,0x14, -+0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x60,0x06,0xe5,0x15,0x24,0x10,0x80,0x5d,0x15,0x15,0xe5,0x15,0xc3,0x94, -+0x00,0x50,0xca,0x80,0x56,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b, -+0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3d,0x75,0x15,0x0f,0x74,0x01,0x7e,0x00, -+0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xe5,0x14,0x25, -+0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f, -+0x4e,0x60,0x08,0x90,0x9e,0x30,0xe5,0x15,0xf0,0x80,0x10,0x15,0x15,0xe5,0x15,0xc3, -+0x94,0x00,0x50,0xc8,0x80,0x05,0xe4,0x90,0x9e,0x30,0xf0,0xe5,0x14,0x25,0xe0,0x24, -+0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x3b,0xe4, -+0xf5,0x15,0x74,0x01,0x7e,0x00,0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce, -+0xd8,0xf9,0xff,0xe5,0x14,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83, -+0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x08,0x90,0x9e,0x31,0xe5,0x15,0xf0,0x80, -+0x5b,0x05,0x15,0xe5,0x15,0xb4,0x10,0xca,0x80,0x52,0xe5,0x14,0x25,0xe0,0x24,0x02, -+0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0x4e,0x60,0x39,0xe4,0xf5, -+0x15,0x74,0x01,0x7e,0x00,0xa8,0x15,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8, -+0xf9,0xff,0xe5,0x14,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0, -+0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x06,0xe5,0x15,0x24,0x10,0x80,0x0a,0x05,0x15, -+0xe5,0x15,0xb4,0x0c,0xcc,0x80,0x05,0xe4,0x90,0x9e,0x31,0xf0,0x90,0x9e,0x30,0xe0, -+0xff,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x48,0x12,0x43,0x5f,0xef,0xf0,0x90,0x9e, -+0x31,0xe0,0xfe,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x49,0x12,0x43,0x5f,0xee,0xf0, -+0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0xd3,0x9f,0x40,0x06, -+0x90,0x9e,0x30,0x12,0x62,0x94,0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x04,0xf5, -+0x83,0xe0,0xff,0x90,0x9e,0x31,0xe0,0xfe,0xef,0xc3,0x9e,0x50,0x03,0x12,0x62,0x94, -+0x90,0x9e,0x30,0xe0,0xff,0xd3,0x94,0x13,0x40,0x07,0x90,0x96,0x43,0x74,0x03,0xf0, -+0x22,0xef,0xd3,0x94,0x0b,0x40,0x07,0x90,0x96,0x43,0x74,0x02,0xf0,0x22,0xef,0xd3, -+0x94,0x03,0x40,0x07,0x90,0x96,0x43,0x74,0x01,0xf0,0x22,0xe4,0x90,0x96,0x43,0xf0, -+0x22,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x3f,0xfe,0xef,0x54,0x80,0xc4,0x13, -+0x13,0x13,0x54,0x01,0xfd,0xaf,0x06,0x41,0x93,0x12,0x29,0xd9,0xf5,0x60,0x22,0x12, -+0x29,0xd9,0x90,0x95,0x01,0xf0,0x22,0xad,0x07,0x74,0x11,0x2d,0xf5,0x82,0xe4,0x34, -+0xfc,0xf5,0x83,0xe0,0x44,0x01,0xf0,0x90,0x04,0x80,0xe0,0x54,0x0f,0xfc,0x74,0x14, -+0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xc0,0x4c,0xfd,0x74,0x14,0x2f, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xed,0xf0,0x22,0xef,0x60,0x0f,0x74,0x21,0x2d, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x22,0x74,0x21,0x2d,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xef,0xf0,0x22,0xe4,0xf5,0x60,0xf5,0x64, -+0xf5,0x63,0x75,0x62,0x0c,0x75,0x61,0x0c,0x90,0x9e,0x66,0xf0,0x90,0x9e,0x64,0xf0, -+0x90,0x9e,0x63,0xf0,0x90,0x9e,0x65,0x04,0xf0,0x90,0x9e,0x56,0xf0,0xe4,0x90,0x9e, -+0x67,0xf0,0x90,0x9e,0x58,0xf0,0x90,0x9e,0x61,0x74,0x07,0xf0,0xe4,0x90,0x9e,0x57, -+0xf0,0x90,0x9e,0x5f,0xf0,0xa3,0x74,0x03,0xf0,0x90,0x9e,0x5c,0x74,0x0a,0xf0,0xa3, -+0x74,0x05,0xf0,0x90,0x9e,0x5b,0x74,0x14,0xf0,0x90,0x9e,0x62,0x74,0x05,0xf0,0xe4, -+0x90,0x9e,0x5a,0xf0,0x90,0x9e,0x55,0xf0,0x90,0x9e,0x7f,0xf0,0x90,0x9e,0x5e,0xf0, -+0x22,0xe4,0x90,0x9e,0x67,0xf0,0x90,0x9e,0x57,0xf0,0xf5,0x64,0x22,0x7f,0x00,0x22, -+0xe5,0x62,0x30,0xe6,0x19,0xe5,0x62,0x54,0x0f,0xff,0x90,0x9e,0x54,0xe0,0xfe,0x4f, -+0x90,0x01,0x2f,0xf0,0xee,0x64,0x80,0x90,0x9e,0x54,0xf0,0x53,0x62,0xbf,0x22,0xe5, -+0x60,0x64,0x01,0x70,0x68,0xe5,0x63,0x60,0x64,0xe5,0x63,0x64,0x02,0x60,0x06,0xe5, -+0x63,0x64,0x05,0x70,0x27,0x90,0x06,0xab,0xe0,0x90,0x9e,0x56,0xf0,0x90,0x06,0xaa, -+0xe0,0x90,0x9e,0x65,0xf0,0x90,0x9e,0x56,0xe0,0x70,0x07,0x90,0x9e,0x65,0xe0,0xff, -+0x80,0x05,0x90,0x9e,0x56,0xe0,0xff,0x90,0x9e,0x56,0xef,0xf0,0x90,0x9e,0x58,0xe0, -+0x60,0x03,0xe0,0x14,0xf0,0xe4,0x90,0x9e,0x57,0xf0,0x90,0x05,0x58,0x74,0x03,0xf0, -+0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x53,0x64,0xfd,0x53,0x64, -+0xef,0xe5,0x63,0x14,0x24,0xfd,0x50,0x02,0x80,0x03,0x12,0x45,0x53,0x22,0xe4,0xfb, -+0x90,0x9e,0x9c,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x63,0x60,0x6a,0xe5,0x60, -+0x64,0x01,0x70,0x64,0xe5,0x63,0x14,0x60,0x2b,0x24,0xfd,0x60,0x27,0x24,0x02,0x24, -+0xfb,0x50,0x02,0x80,0x21,0x90,0x9e,0x56,0xe0,0x14,0xf0,0xe0,0x60,0x04,0xa3,0xe0, -+0x60,0x14,0x90,0x9e,0x56,0xe0,0x70,0x08,0x90,0x9e,0x65,0xe0,0x90,0x9e,0x56,0xf0, -+0x7b,0x01,0x80,0x02,0x7b,0x01,0xeb,0x60,0x2f,0x43,0x64,0x10,0xe4,0x90,0x9e,0x85, -+0xf0,0x90,0x9e,0x57,0xe0,0x75,0xf0,0x03,0xa4,0xff,0x90,0x9e,0x61,0xe0,0x2f,0x12, -+0x44,0x53,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x61,0x54,0x0f,0xc3,0x94,0x04,0x50, -+0x07,0x7d,0x01,0x7f,0x04,0x12,0x54,0xe7,0x22,0xe4,0x90,0x9e,0x15,0xf0,0xe5,0x63, -+0x60,0x79,0x90,0x9e,0x67,0xe0,0x60,0x0d,0xe4,0xf0,0x53,0x64,0xfd,0xe5,0x64,0x54, -+0x07,0x70,0x68,0x80,0x63,0x90,0x9e,0x57,0xe0,0x04,0xf0,0x53,0x64,0xef,0x90,0x9e, -+0x15,0xe0,0xf9,0xff,0x7e,0x00,0x24,0x01,0xfd,0xee,0x33,0xfc,0x90,0x9e,0x57,0xe0, -+0xb5,0x05,0x06,0xe4,0xb5,0x04,0x02,0x80,0x12,0xef,0x24,0x02,0xff,0xe4,0x3e,0xfe, -+0x90,0x9e,0x57,0xe0,0xb5,0x07,0x0a,0xe4,0xb5,0x06,0x06,0x90,0x05,0x58,0xe0,0x04, -+0xf0,0xe9,0xff,0x90,0x9e,0x5c,0xe0,0x2f,0xff,0xe4,0x33,0xfe,0x90,0x9e,0x57,0xe0, -+0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x40,0x0d,0xe5,0x60,0xb4,0x01,0x0b, -+0xa3,0xe0,0x70,0x07,0xe0,0x04,0xf0,0x22,0x12,0x44,0xcb,0x22,0x90,0x9e,0x5f,0xe0, -+0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e, -+0x93,0x12,0x43,0x8b,0x90,0x9e,0x96,0xe0,0x54,0xf0,0x44,0x06,0xff,0xf0,0xed,0x54, -+0x0f,0xc4,0x54,0xf0,0xfe,0xef,0x54,0x0f,0x4e,0xf0,0x90,0x9e,0x93,0x12,0x43,0x6b, -+0x90,0x9e,0x90,0x12,0x43,0x8b,0x7b,0x01,0x7a,0x9e,0x79,0x96,0x12,0x53,0xf1,0xd0, -+0xd0,0x92,0xaf,0x22,0xe0,0xfd,0x74,0x26,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9d,0xf5, -+0x83,0xed,0xf0,0xaf,0x14,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xef,0xc3,0x94,0x20, -+0x50,0x0e,0x74,0x84,0x2f,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xed,0xf0,0x80,0x29, -+0x74,0xa6,0x2f,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xed,0xf0,0x90,0x9e,0x68,0xef, -+0xf0,0x24,0xa6,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x90,0x9e,0x69,0xf0,0x7b, -+0x01,0x7a,0x9e,0x79,0x68,0x7d,0x02,0x51,0x57,0xd0,0xd0,0x92,0xaf,0x22,0x8f,0x0a, -+0x8d,0x0b,0xe5,0x0b,0x54,0x1f,0xf5,0x10,0x74,0x01,0x2f,0xf5,0x82,0xe4,0x34,0x94, -+0xf5,0x83,0xe0,0xf5,0x0e,0x90,0x04,0xfd,0xe0,0xb4,0x01,0x05,0x75,0x11,0x03,0x80, -+0x03,0x75,0x11,0x01,0xeb,0xc3,0x95,0x11,0x40,0x04,0xaf,0x0a,0x80,0x33,0xe5,0x0e, -+0x25,0x0d,0xf5,0x0f,0xe5,0x10,0x90,0x41,0xd6,0x93,0xff,0xe5,0x0f,0xd3,0x9f,0x74, -+0x01,0x40,0x11,0x25,0x0a,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe4,0xf0,0xad,0x0b, -+0xaf,0x0a,0x41,0xa5,0x25,0x0a,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe5,0x0f,0xf0, -+0x22,0xad,0x07,0x75,0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0xe0,0xff,0x74, -+0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xe0,0x54,0x1f,0xf5,0x12,0xd3,0x9f, -+0x40,0x02,0x8f,0x12,0xe5,0x12,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5, -+0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xe5,0x12,0x25,0xe0,0x24,0x66,0xf5,0x82, -+0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe, -+0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee, -+0xf0,0xa3,0xef,0xf0,0xaf,0x05,0xad,0x12,0x51,0xa5,0xaf,0x12,0x22,0xac,0x07,0xec, -+0xc3,0x94,0x20,0x50,0x0d,0x74,0x84,0x2c,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0, -+0x80,0x0b,0x74,0xa6,0x2c,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x54,0x7f,0xf5, -+0x1f,0xe5,0x1f,0x54,0x1f,0xff,0x90,0x9e,0x25,0xf0,0x75,0xf0,0x09,0xec,0x90,0x96, -+0x49,0x12,0x43,0x5f,0xe0,0x90,0x9e,0x27,0xf0,0x75,0xf0,0x09,0xec,0x90,0x96,0x48, -+0x12,0x43,0x5f,0xe0,0xfe,0x90,0x9e,0x28,0xf0,0xec,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x29,0xcb,0xf0,0xa3,0xeb, -+0xf0,0xec,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xfb,0xa3, -+0xe0,0x90,0x9e,0x2b,0xcb,0xf0,0xa3,0xeb,0xf0,0xef,0xd3,0x9e,0x40,0x0a,0x90,0x9e, -+0x28,0xe0,0x90,0x9e,0x25,0xf0,0xf5,0x1f,0xed,0x70,0x02,0xa1,0x13,0x90,0x9e,0x26, -+0xed,0xf0,0xe5,0x1f,0x30,0xe6,0x0a,0x90,0x9e,0x25,0xe0,0xf5,0x1f,0xa3,0xe0,0x14, -+0xf0,0x90,0x9e,0x26,0xe0,0x70,0x02,0xa1,0x13,0x90,0x9e,0x25,0xe0,0xff,0xd3,0x94, -+0x00,0x50,0x02,0xa1,0x13,0xe4,0x90,0x9e,0x24,0xf0,0xef,0x14,0x90,0x9e,0x23,0xf0, -+0x90,0x9e,0x27,0xe0,0xfd,0x90,0x9e,0x23,0xe0,0xff,0xd3,0x9d,0x40,0x6b,0xef,0x94, -+0x10,0x40,0x21,0xef,0x24,0xf0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x2b,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x70,0x27,0x90,0x9e,0x23,0xe0,0xff,0xc3,0x94,0x10,0x50,0x33,0x74,0x01, -+0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90, -+0x9e,0x29,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x60,0x16,0x90,0x9e,0x23,0xe0,0xf5, -+0x1f,0xa3,0xe0,0x04,0xf0,0x90,0x9e,0x26,0xe0,0xff,0x90,0x9e,0x24,0xe0,0x6f,0x60, -+0x08,0x90,0x9e,0x23,0xe0,0x14,0xf0,0x80,0x87,0x90,0x9e,0x26,0xe0,0xff,0x90,0x9e, -+0x24,0xe0,0xc3,0x9f,0x50,0x0d,0x90,0x9e,0x23,0xe0,0xb5,0x05,0x06,0x90,0x9e,0x27, -+0xe0,0xf5,0x1f,0xe5,0x1f,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83, -+0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xe5,0x1f,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4, -+0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef, -+0x13,0xff,0xec,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0, -+0xa3,0xef,0xf0,0xaf,0x04,0xad,0x1f,0x51,0xa5,0xaf,0x1f,0x22,0xad,0x07,0xed,0xc3, -+0x94,0x20,0x50,0x0d,0x74,0x84,0x2d,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x80, -+0x0b,0x74,0xa6,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x54,0x7f,0xf5,0x1f, -+0xe5,0x1f,0x54,0x1f,0xfc,0x75,0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0xe0, -+0xff,0x90,0x9e,0x23,0xf0,0xed,0x25,0xe0,0x24,0x02,0xf5,0x82,0xe4,0x34,0x95,0xf5, -+0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x24,0xcb,0xf0,0xa3,0xeb,0xf0,0xed,0x25,0xe0, -+0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfb,0xa3,0xe0,0x90,0x9e,0x26, -+0xcb,0xf0,0xa3,0xeb,0xf0,0xec,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5, -+0x83,0xe4,0x93,0xfa,0x74,0x01,0x93,0xfb,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xea,0xf0,0xa3,0xeb,0xf0,0xec,0xc3,0x9f,0x40,0x02,0xc1,0x7a, -+0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xec,0xf0,0x04,0xfb,0x90,0x9e, -+0x23,0xe0,0xff,0xeb,0xd3,0x9f,0x40,0x02,0xc1,0xab,0xeb,0xc3,0x94,0x10,0x40,0x21, -+0xeb,0x24,0xf0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce, -+0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x24,0xe0,0x5e,0xfe,0xa3,0xe0,0x5f,0x4e,0x70, -+0x23,0xeb,0xc3,0x94,0x10,0x50,0x40,0x74,0x01,0x7e,0x00,0xa8,0x03,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x9e,0x26,0xe0,0x5e,0xfe,0xa3,0xe0, -+0x5f,0x4e,0x60,0x23,0xbb,0x11,0x09,0x90,0x9e,0x25,0xe0,0x30,0xe7,0x02,0x7b,0x17, -+0xeb,0x64,0x13,0x60,0x03,0xbb,0x12,0x09,0x90,0x9e,0x24,0xe0,0x30,0xe0,0x02,0x7b, -+0x18,0xac,0x03,0x8c,0x1f,0x80,0x34,0x0b,0x80,0x84,0x90,0x9e,0x23,0xe0,0xfb,0x6c, -+0x70,0x69,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xec,0xf0,0x75,0xf0, -+0x09,0xed,0x90,0x96,0x4a,0x12,0x43,0x5f,0xe0,0xb4,0x01,0x0c,0xe5,0x1f,0x20,0xe6, -+0x07,0xec,0x44,0x40,0xf5,0x1f,0x80,0x03,0xaf,0x1f,0x22,0xec,0x25,0xe0,0x24,0x9e, -+0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xec,0x25, -+0xe0,0x24,0x66,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4, -+0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4, -+0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0x80,0x5b,0xec,0xd3,0x9b,0x40,0x56, -+0x90,0x9e,0x23,0xe0,0xff,0x74,0x67,0x2d,0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xef, -+0xf0,0xac,0x07,0x8f,0x1f,0xec,0x25,0xe0,0x24,0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5, -+0x83,0xe4,0x93,0xfe,0x74,0x01,0x93,0xff,0xec,0x25,0xe0,0x24,0x66,0xf5,0x82,0xe4, -+0x34,0x41,0xf5,0x83,0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef, -+0x13,0xff,0xed,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0, -+0xa3,0xef,0xf0,0xaf,0x1f,0x22,0x74,0x01,0x2d,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83, -+0xe4,0xf0,0xaf,0x05,0xe5,0x1f,0x44,0x80,0xfd,0x51,0xa5,0xe5,0x1f,0x44,0x80,0xff, -+0x22,0xef,0xc3,0x94,0x20,0x50,0x39,0xef,0x30,0xe0,0x17,0xed,0xc4,0x54,0xf0,0xfd, -+0xef,0xc3,0x13,0xfe,0x24,0xa4,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x54,0x0f, -+0x80,0x10,0xef,0xc3,0x13,0xfe,0x24,0xa4,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0, -+0x54,0xf0,0xf0,0x74,0xa4,0x2e,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0xe0,0x4d,0xf0, -+0x22,0xe4,0xf5,0x14,0xe5,0x14,0xb4,0x20,0x14,0x90,0x9a,0xc5,0xe0,0x04,0xf0,0x90, -+0x95,0x01,0xe0,0xff,0x90,0x9a,0xc5,0xe0,0xb5,0x07,0x02,0xe4,0xf0,0x75,0xf0,0x09, -+0xe5,0x14,0x90,0x96,0x4b,0x12,0x43,0x5f,0xe0,0x64,0x01,0x60,0x03,0x02,0x6e,0x6a, -+0xe5,0x14,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe0,0xfe,0xa3, -+0xe0,0xd3,0x94,0x00,0xee,0x94,0x00,0x50,0x03,0x02,0x6e,0x6a,0xe5,0x14,0x94,0x20, -+0x40,0x09,0x90,0x9a,0xc5,0xe0,0x60,0x03,0x02,0x6e,0x76,0xe5,0x14,0x75,0xf0,0x0a, -+0xa4,0x24,0x00,0xf9,0x74,0x90,0x35,0xf0,0x75,0x18,0x01,0xf5,0x19,0x89,0x1a,0xe5, -+0x14,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe0,0xff,0xa3,0xe0, -+0x90,0x9e,0x1b,0xcf,0xf0,0xa3,0xef,0xf0,0xe5,0x14,0x25,0xe0,0x24,0xc4,0xf5,0x82, -+0xe4,0x34,0x98,0xf5,0x83,0xe0,0xff,0xa3,0xe0,0x90,0x9e,0x1d,0xcf,0xf0,0xa3,0xef, -+0xf0,0xe5,0x14,0xc3,0x94,0x20,0x50,0x14,0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34, -+0x04,0xf5,0x83,0xe0,0x54,0x3f,0x90,0x9e,0x19,0xf0,0x80,0x12,0x74,0xa6,0x25,0x14, -+0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x54,0x3f,0x90,0x9e,0x19,0xf0,0x90,0x9e, -+0x19,0xe0,0xfe,0x54,0x1f,0xa3,0xf0,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x48,0x12, -+0x43,0x5f,0xe0,0x90,0x9e,0x20,0xf0,0x74,0xe6,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c, -+0xf5,0x83,0xe0,0xc3,0x94,0x05,0x40,0x02,0x41,0x9f,0x90,0x9e,0x20,0xe0,0xff,0x90, -+0x9e,0x1a,0xe0,0x9f,0x40,0x13,0x90,0x9e,0x20,0xe0,0x90,0x9e,0x1a,0xf0,0xee,0x54, -+0x40,0xfe,0x90,0x9e,0x19,0xf0,0xef,0x4e,0xf0,0x90,0x04,0xfd,0xe0,0x54,0x05,0x64, -+0x01,0x70,0x29,0x90,0x9e,0x1a,0xe0,0xff,0x90,0x41,0x4a,0x93,0xfe,0x74,0x44,0x25, -+0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xc3,0x9e,0x40,0x06,0xef,0x90,0x40, -+0xda,0x80,0x30,0x90,0x9e,0x1a,0xe0,0x90,0x40,0xf6,0x80,0x27,0x90,0x9e,0x1a,0xe0, -+0xff,0x90,0x41,0x4a,0x93,0xfe,0x74,0x44,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5, -+0x83,0xe0,0xc3,0x9e,0x40,0x06,0xef,0x90,0x41,0x12,0x80,0x07,0x90,0x9e,0x1a,0xe0, -+0x90,0x41,0x2e,0x93,0x90,0x9e,0x1f,0xf0,0x90,0x9e,0x1f,0xe0,0x75,0xf0,0x06,0xa4, -+0x24,0x50,0xf9,0x74,0x40,0x35,0xf0,0xfa,0x7b,0xff,0x8b,0x15,0xf5,0x16,0x89,0x17, -+0xe5,0x14,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xe0,0xf5,0x1b, -+0xa3,0xe0,0xf5,0x1c,0x12,0x29,0xd9,0xff,0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a, -+0x12,0x42,0x97,0xfd,0xac,0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35, -+0x1b,0xf5,0x1b,0xab,0x15,0xaa,0x16,0xa9,0x17,0x90,0x00,0x01,0x12,0x42,0x20,0xff, -+0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x02,0x12,0x42,0xc2,0xfd,0xac, -+0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xab,0x15, -+0xaa,0x16,0xa9,0x17,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x7e,0x00,0xab,0x18,0xaa, -+0x19,0xa9,0x1a,0x90,0x00,0x04,0x12,0x42,0xc2,0xfd,0xac,0xf0,0x12,0x29,0xf2,0xef, -+0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xab,0x15,0xaa,0x16,0xa9,0x17,0x90, -+0x00,0x03,0x12,0x42,0x20,0xff,0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00, -+0x06,0x12,0x42,0xc2,0xfd,0xac,0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee, -+0x35,0x1b,0xf5,0x1b,0xab,0x15,0xaa,0x16,0xa9,0x17,0x90,0x00,0x04,0x12,0x42,0x20, -+0xff,0x7e,0x00,0xab,0x18,0xaa,0x19,0xa9,0x1a,0x90,0x00,0x08,0x12,0x42,0xc2,0xfd, -+0xac,0xf0,0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xab, -+0x15,0xaa,0x16,0xa9,0x17,0x90,0x00,0x05,0x12,0x42,0x20,0xff,0x7e,0x00,0x90,0x9e, -+0x1b,0xe0,0xfc,0xa3,0xe0,0xfd,0x12,0x29,0xf2,0xd3,0xe5,0x1c,0x9f,0xe5,0x1b,0x9e, -+0x40,0x0c,0xe5,0x1c,0x9f,0xf5,0x1c,0xe5,0x1b,0x9e,0xf5,0x1b,0x80,0x05,0xe4,0xf5, -+0x1b,0xf5,0x1c,0xe5,0x14,0x25,0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83, -+0xe5,0x1b,0xf0,0xa3,0xe5,0x1c,0xf0,0x90,0x9e,0x19,0xe0,0x25,0xe0,0x24,0x66,0xf5, -+0x82,0xe4,0x34,0x41,0xf5,0x83,0xc3,0x74,0x01,0x93,0x95,0x1c,0xe4,0x93,0x95,0x1b, -+0x50,0x07,0xaf,0x14,0x12,0x65,0x5c,0xa1,0x31,0x90,0x9e,0x19,0xe0,0x25,0xe0,0x24, -+0x9e,0xf5,0x82,0xe4,0x34,0x41,0xf5,0x83,0xd3,0x74,0x01,0x93,0x95,0x1c,0xe4,0x93, -+0x95,0x1b,0x50,0x02,0xa1,0x31,0x7d,0x01,0xaf,0x14,0x12,0x63,0xbd,0xa1,0x31,0x74, -+0xe6,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0xfc,0x64,0x05,0x60,0x02, -+0x81,0x3a,0x90,0x96,0x43,0xe0,0xff,0xb4,0x03,0x0b,0x90,0x9e,0x1a,0xe0,0xc3,0x94, -+0x19,0x40,0x3d,0x80,0x2e,0xef,0xb4,0x02,0x0b,0x90,0x9e,0x1a,0xe0,0xc3,0x94,0x11, -+0x40,0x2e,0x80,0x1f,0x90,0x96,0x43,0xe0,0xff,0xb4,0x01,0x0b,0x90,0x9e,0x1a,0xe0, -+0xc3,0x94,0x0a,0x40,0x1b,0x80,0x0c,0xef,0x70,0x11,0x90,0x9e,0x1a,0xe0,0xc3,0x94, -+0x03,0x40,0x0d,0x90,0x9a,0x84,0x74,0x01,0xf0,0x80,0x05,0xe4,0x90,0x9a,0x84,0xf0, -+0x74,0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe0,0xf5,0x1e,0x74,0x44, -+0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xff,0xc3,0x94,0x30,0x50,0x02, -+0x61,0xe7,0x90,0x9a,0x84,0xe0,0x64,0x01,0x60,0x02,0x61,0xe7,0x74,0x85,0x25,0x14, -+0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0x64,0x0a,0x60,0x51,0xef,0x24,0x05,0xff, -+0xe4,0x33,0xfe,0x74,0x41,0x25,0x14,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xe0,0xfd, -+0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x50,0x32,0xed,0x24,0x05,0xff,0xe4, -+0x33,0xfe,0x74,0x44,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xd3,0x9f, -+0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x50,0x14,0x74,0x26,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x9d,0xf5,0x83,0xe0,0xff,0x90,0x9e,0x1a,0xe0,0x6f,0x60,0x3d,0x74,0x44,0x25, -+0x14,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xff,0xd3,0x94,0x42,0x40,0x05,0x75, -+0x1e,0x05,0x80,0x0e,0xef,0xd3,0x94,0x39,0x40,0x05,0x75,0x1e,0x03,0x80,0x03,0x75, -+0x1e,0x01,0x74,0x41,0x25,0x14,0xf5,0x82,0xe4,0x34,0x94,0xf5,0x83,0xef,0xf0,0x74, -+0x85,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a,0x80,0x29,0x74,0xe6,0x25,0x14,0xf5,0x82, -+0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0x85,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9a, -+0xf5,0x83,0xe0,0x04,0xf0,0x80,0x10,0xe4,0xf5,0x1e,0x74,0xe6,0x25,0x14,0xf5,0x82, -+0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x90,0x9e,0x1a,0xe0,0xff,0x74,0x26,0x25,0x14, -+0xf5,0x82,0xe4,0x34,0x9d,0xf5,0x83,0xef,0xf0,0x74,0x84,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x98,0xf5,0x83,0xe5,0x1e,0xf0,0x75,0xf0,0x09,0xe5,0x14,0x90,0x96,0x4c,0x12, -+0x43,0x5f,0xe0,0xb4,0x01,0x10,0xe4,0xf5,0x1e,0x74,0xe6,0x25,0x14,0xf5,0x82,0xe4, -+0x34,0x9c,0xf5,0x83,0xe4,0xf0,0xad,0x1e,0xa1,0x2c,0xec,0x64,0x06,0x60,0x02,0xa1, -+0x31,0xf5,0x1b,0xf5,0x1c,0x90,0x42,0x13,0x93,0xff,0x7e,0x00,0x90,0x9e,0x1b,0xe0, -+0xfc,0xa3,0xe0,0xfd,0x12,0x29,0xf2,0x90,0x9e,0x21,0xee,0xf0,0xa3,0xef,0xf0,0x74, -+0x84,0x25,0x14,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe0,0xf5,0x1e,0xe4,0xf5,0x1d, -+0xab,0x18,0xaa,0x19,0xa9,0x1a,0x75,0xf0,0x02,0xe5,0x1d,0xa4,0xf5,0x82,0x85,0xf0, -+0x83,0x12,0x42,0xc2,0xfd,0xac,0xf0,0xe5,0x1d,0x90,0x42,0x0e,0x93,0xff,0x7e,0x00, -+0x12,0x29,0xf2,0xef,0x25,0x1c,0xf5,0x1c,0xee,0x35,0x1b,0xf5,0x1b,0xc3,0x90,0x9e, -+0x22,0xe0,0x95,0x1c,0x90,0x9e,0x21,0xe0,0x95,0x1b,0x40,0x07,0x05,0x1d,0xe5,0x1d, -+0xb4,0x05,0xbd,0xe5,0x1d,0xc3,0x13,0xf5,0x1d,0xe5,0x1e,0xb4,0x01,0x06,0xe5,0x1d, -+0x70,0x46,0x80,0x13,0xe5,0x1e,0xb4,0x03,0x15,0xe5,0x1d,0x70,0x05,0x75,0x1e,0x03, -+0x80,0x39,0xe5,0x1d,0xb4,0x01,0x05,0x75,0x1e,0x01,0x80,0x2f,0x80,0x2a,0xe5,0x1e, -+0xb4,0x05,0x28,0xe5,0x1d,0x70,0x05,0x75,0x1e,0x05,0x80,0x0d,0xe5,0x1d,0xb4,0x01, -+0x05,0x75,0x1e,0x03,0x80,0x03,0x75,0x1e,0x01,0xd3,0x90,0x9e,0x1e,0xe0,0x94,0x03, -+0x90,0x9e,0x1d,0xe0,0x94,0x00,0x40,0x03,0xe4,0xf5,0x1e,0xd3,0x90,0x9e,0x1e,0xe0, -+0x94,0x03,0x90,0x9e,0x1d,0xe0,0x94,0x00,0x40,0x03,0xe4,0xf5,0x1e,0x74,0x84,0x25, -+0x14,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe5,0x1e,0xf0,0xfd,0xaf,0x14,0x12,0x67, -+0x61,0x74,0xe6,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0xd3,0x94,0x05, -+0x74,0xe6,0x50,0x0e,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe0,0x04,0xf0, -+0x80,0x0b,0x25,0x14,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x90,0x9e,0x1d, -+0xe0,0xfe,0xa3,0xe0,0xff,0xc3,0x74,0xff,0x9f,0xfd,0x74,0xff,0x9e,0xfc,0xe5,0x14, -+0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xd3, -+0x9d,0xea,0x9c,0xe5,0x14,0x50,0x13,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a, -+0xf5,0x83,0xee,0x8f,0xf0,0x12,0x42,0x81,0x80,0x10,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9a,0xf5,0x83,0x74,0xff,0xf0,0xa3,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x44, -+0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe0,0xfe,0xa3,0xe0,0xff,0xc3,0x74,0xff,0x9f, -+0xfd,0x74,0xff,0x9e,0xfc,0xe5,0x14,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b, -+0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xd3,0x9d,0xea,0x9c,0xe5,0x14,0x50,0x13,0x25,0xe0, -+0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xee,0x8f,0xf0,0x12,0x42,0x81,0x80, -+0x10,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0x74,0xff,0xf0,0xa3, -+0xf0,0xab,0x18,0xaa,0x19,0xa9,0x1a,0xe4,0xf5,0xf0,0x12,0x42,0xfa,0xab,0x18,0xaa, -+0x19,0xa9,0x1a,0x90,0x00,0x02,0xe4,0xf5,0xf0,0x12,0x43,0x19,0x90,0x00,0x04,0xe4, -+0xf5,0xf0,0x12,0x43,0x19,0x90,0x00,0x06,0xe4,0xf5,0xf0,0x12,0x43,0x19,0x90,0x00, -+0x08,0xe4,0xf5,0xf0,0x12,0x43,0x19,0xe5,0x14,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4, -+0x34,0x93,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xe5,0x14,0x25,0xe0,0x24,0xc4,0xf5,0x82, -+0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0xe5,0x14,0x25,0xe0,0x24,0x44,0xf5, -+0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0,0x05,0x14,0xe5,0x14,0xc3,0x94, -+0x40,0x50,0x03,0x02,0x67,0xa4,0x22,0x90,0x04,0x44,0x74,0x11,0xf0,0xa3,0x74,0xf0, -+0xf0,0xa3,0x74,0x0f,0xf0,0xa3,0xe4,0xf0,0xfd,0x74,0xa4,0x2d,0xf5,0x82,0xe4,0x34, -+0x04,0xf5,0x83,0xe4,0xf0,0x0d,0xbd,0x10,0xf0,0xe4,0x90,0x9a,0xc5,0xf0,0x90,0x95, -+0x01,0x04,0xf0,0xe4,0xfd,0x75,0xf0,0x0a,0xed,0x90,0x90,0x00,0x12,0x43,0x5f,0xe4, -+0xf0,0xa3,0xf0,0x75,0xf0,0x0a,0xed,0x90,0x90,0x02,0x12,0x43,0x5f,0xe4,0xf0,0xa3, -+0xf0,0x75,0xf0,0x0a,0xed,0x90,0x90,0x04,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75, -+0xf0,0x0a,0xed,0x90,0x90,0x06,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x75,0xf0,0x0a, -+0xed,0x90,0x90,0x08,0x12,0x43,0x5f,0xe4,0xf0,0xa3,0xf0,0x74,0x26,0x2d,0xf5,0x82, -+0xe4,0x34,0x9d,0xf5,0x83,0x74,0x13,0xf0,0x74,0x85,0x2d,0xf5,0x82,0xe4,0x34,0x9a, -+0xf5,0x83,0xe4,0xf0,0x74,0x84,0x2d,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0, -+0xed,0x25,0xe0,0x24,0x80,0xf5,0x82,0xe4,0x34,0x93,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x98,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0xc4,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0x44,0xf5,0x82,0xe4,0x34,0x99,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0xed,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0,0xa3,0xf0, -+0x74,0x86,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0x46,0x2d,0xf5, -+0x82,0xe4,0x34,0x9c,0xf5,0x83,0xe4,0xf0,0x74,0xe6,0x2d,0xf5,0x82,0xe4,0x34,0x9c, -+0xf5,0x83,0xe4,0xf0,0x90,0x41,0xc4,0x93,0xfe,0x74,0x01,0x93,0xff,0x90,0x41,0x8c, -+0x74,0x01,0x93,0x2f,0xff,0xe4,0x93,0x3e,0xc3,0x13,0xfe,0xef,0x13,0xff,0xed,0x25, -+0xe0,0x24,0xc2,0xf5,0x82,0xe4,0x34,0x95,0xf5,0x83,0xee,0xf0,0xa3,0xef,0xf0,0x75, -+0xf0,0x09,0xed,0x90,0x96,0x4b,0x12,0x43,0x5f,0x74,0x01,0xf0,0x75,0xf0,0x09,0xed, -+0x90,0x96,0x4a,0x12,0x43,0x5f,0x74,0x01,0xf0,0x74,0x82,0x2d,0xf5,0x82,0xe4,0x34, -+0x95,0xf5,0x83,0x74,0x0c,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x46,0x12,0x43,0x5f, -+0x74,0xff,0xf0,0xa3,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x44,0x12,0x43,0x5f,0xe4, -+0xf0,0xa3,0x74,0x0f,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x48,0x12,0x43,0x5f,0x74, -+0x13,0xf0,0x75,0xf0,0x09,0xed,0x90,0x96,0x49,0x12,0x43,0x5f,0xe4,0xf0,0xed,0xc3, -+0x94,0x20,0x50,0x0f,0x74,0x84,0x2d,0xf5,0x82,0xe4,0x34,0x04,0xf5,0x83,0x74,0x13, -+0xf0,0x80,0x0d,0x74,0xa6,0x2d,0xf5,0x82,0xe4,0x34,0x9c,0xf5,0x83,0x74,0x13,0xf0, -+0x0d,0xed,0x64,0x40,0x60,0x03,0x02,0x6e,0xa5,0x22,0x12,0x29,0xd9,0xf5,0x14,0xc3, -+0x94,0x40,0x50,0x15,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0x74,0x44,0x25,0x14,0xf5, -+0x82,0xe4,0x34,0x9a,0xf5,0x83,0xef,0xf0,0x22,0xe5,0x14,0xb4,0x40,0x0a,0x90,0x00, -+0x02,0x12,0x42,0x20,0x90,0x96,0x42,0xf0,0x22,0x90,0x9e,0x30,0x12,0x43,0x8b,0x90, -+0x9e,0x33,0xe0,0x54,0xf0,0x44,0x02,0xf0,0x54,0x0f,0x44,0xc0,0xf0,0x90,0x9e,0x30, -+0x12,0x43,0x6b,0x90,0x9e,0x90,0x12,0x43,0x8b,0x7b,0x01,0x7a,0x9e,0x79,0x33,0x02, -+0x53,0xf1,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x90,0x00,0x01,0x12,0x42,0x20,0xfc, -+0xed,0xc3,0x94,0x40,0x40,0x02,0xe4,0xfd,0xec,0xc3,0x94,0x40,0x40,0x02,0xe4,0xfc, -+0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xfa,0xa3,0xe0, -+0xfb,0xea,0x90,0x9e,0x24,0xf0,0xeb,0xa3,0xf0,0xed,0x25,0xe0,0x24,0x46,0xf5,0x82, -+0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xfb,0xea,0x90,0x9e,0x26,0xf0,0xeb, -+0xa3,0xf0,0xa3,0xed,0xf0,0xa3,0x74,0xff,0xf0,0xec,0x25,0xe0,0x24,0xc6,0xf5,0x82, -+0xe4,0x34,0x9a,0xf5,0x83,0xe0,0xfa,0xa3,0xe0,0xfb,0xea,0x90,0x9e,0x2a,0xf0,0xeb, -+0xa3,0xf0,0xec,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe0,0xfa, -+0xa3,0xe0,0xfb,0xea,0x90,0x9e,0x2c,0xf0,0xeb,0xa3,0xf0,0xa3,0xec,0xf0,0xa3,0x74, -+0xff,0xf0,0xed,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0xed,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0xec,0x25,0xe0,0x24,0xc6,0xf5,0x82,0xe4,0x34,0x9a,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0xec,0x25,0xe0,0x24,0x46,0xf5,0x82,0xe4,0x34,0x9b,0xf5,0x83,0xe4,0xf0, -+0xa3,0xf0,0x7b,0x01,0x7a,0x9e,0x79,0x24,0x01,0x79,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0x90,0x9e,0xa4,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0x90,0x9e, -+0xa4,0xe0,0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x2d,0xc3,0x90,0x9e,0xa7, -+0xe0,0x94,0xe8,0x90,0x9e,0xa6,0xe0,0x94,0x03,0x40,0x0b,0x90,0x01,0xc6,0xe0,0x44, -+0x10,0xf0,0x7f,0x00,0x80,0x15,0x90,0x9e,0xa6,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81, -+0x7f,0x0a,0x7e,0x00,0x12,0x37,0x54,0x80,0xc5,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x24,0x12,0x2a,0x8b,0x00,0x00,0x00, -+0x00,0x90,0x00,0x01,0x12,0x42,0x20,0x90,0x9e,0x66,0xf0,0x90,0x00,0x03,0x12,0x42, -+0x20,0x90,0x9e,0x55,0xf0,0x12,0x56,0x22,0x90,0x01,0xe5,0xe5,0x63,0xf0,0x90,0x9e, -+0x66,0xe0,0x90,0x01,0xe6,0xf0,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x02,0x12,0x42, -+0x20,0xff,0x30,0xe0,0x25,0x12,0x29,0xd9,0x90,0x9e,0x5c,0xf0,0x90,0x00,0x01,0x12, -+0x42,0x20,0x90,0x9e,0x5d,0xf0,0xef,0xc3,0x13,0x54,0x7f,0x90,0x9e,0x5b,0xf0,0x90, -+0x00,0x03,0x12,0x42,0x20,0x90,0x9e,0x62,0xf0,0x22,0x90,0x9e,0x5c,0x74,0x0a,0xf0, -+0x90,0x9e,0x5d,0x74,0x05,0xf0,0x90,0x9e,0x5b,0x74,0x14,0xf0,0x90,0x9e,0x62,0x74, -+0x05,0xf0,0x22,0x12,0x29,0xd9,0x30,0xe0,0x19,0xc3,0x13,0x54,0x7f,0x90,0x9e,0x61, -+0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x90,0x9e,0x5f,0xe4,0xf0,0xa3,0xef,0xf0, -+0x80,0x0f,0x90,0x9e,0x61,0x74,0x07,0xf0,0x90,0x9e,0x5f,0xe4,0xf0,0xa3,0x74,0x03, -+0xf0,0x90,0x9e,0x5f,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0x90,0x9e,0x24,0x12, -+0x2a,0x8b,0x00,0x00,0x00,0x00,0x12,0x29,0xd9,0x60,0x0d,0x90,0x9e,0x5e,0xf0,0xe4, -+0xfd,0x7f,0x04,0x12,0x54,0xe7,0x80,0x05,0xe4,0x90,0x9e,0x5e,0xf0,0x90,0x9e,0x5e, -+0xe0,0x90,0x01,0xe7,0xf0,0x22,0x90,0x02,0x09,0xe0,0xfd,0x12,0x29,0xd9,0xfe,0xaf, -+0x05,0xed,0x2e,0x90,0x9e,0x78,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xed,0x2f, -+0x90,0x9e,0x79,0xf0,0x90,0x00,0x02,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x9e,0x7a, -+0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x9e,0x7b,0xf0,0x90,0x00, -+0x04,0x12,0x42,0x20,0xff,0xae,0x05,0xed,0x2f,0x90,0x9e,0x7c,0xf0,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x9e,0x24,0x12,0x43,0x8b,0x90,0x9e,0x24,0x12,0x43, -+0x6b,0x90,0x00,0x01,0x12,0x42,0xc2,0xfa,0xe5,0xf0,0x24,0x00,0xff,0xe4,0x3a,0xfe, -+0x90,0x9e,0x24,0x12,0x43,0x6b,0x90,0x00,0x01,0xee,0x8f,0xf0,0x12,0x43,0x19,0x12, -+0x29,0xd9,0xff,0x60,0x2d,0xb5,0x65,0x16,0x90,0x9e,0x24,0x12,0x43,0x6b,0x90,0x00, -+0x01,0x12,0x42,0xc2,0x65,0x67,0x70,0x04,0xe5,0x66,0x65,0xf0,0x60,0x24,0x90,0x9e, -+0x24,0x12,0x43,0x6b,0x90,0x00,0x01,0x12,0x42,0xc2,0xff,0xae,0xf0,0x12,0x4e,0x37, -+0x80,0x10,0x90,0x9e,0x24,0x12,0x43,0x6b,0x12,0x29,0xd9,0x65,0x65,0x60,0x03,0x12, -+0x44,0xc2,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x06,0x34,0x74,0xff,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0x22,0x90,0x06,0x34,0xe0,0x60,0x24,0x14,0x70,0x1a,0x7b,0x01, -+0x7a,0x06,0x79,0x35,0x7f,0xf9,0x7e,0x01,0x71,0xb0,0xbf,0x01,0x09,0x90,0x06,0x35, -+0xe0,0x54,0x0f,0xf0,0x80,0x04,0x80,0x00,0x80,0xcd,0xe4,0x90,0x06,0x34,0xf0,0x22, -+0x8e,0x14,0x8f,0x15,0x8b,0x16,0x8a,0x17,0x89,0x18,0xe4,0x90,0x9e,0x19,0xf0,0xef, -+0x90,0x00,0x31,0xf0,0x12,0x4d,0x45,0xe5,0x14,0x54,0x03,0xff,0x90,0x00,0x32,0xe0, -+0x54,0xfc,0x4f,0xf0,0x12,0x4d,0x45,0x90,0x00,0x33,0xe0,0x54,0x7f,0xf0,0x12,0x4d, -+0x45,0x90,0x00,0x33,0xe0,0x20,0xe7,0x0e,0x90,0x9e,0x19,0xe0,0xc3,0x94,0x64,0x50, -+0x05,0xe0,0x04,0xf0,0x80,0xeb,0x90,0x9e,0x19,0xe0,0xc3,0x94,0x64,0x50,0x10,0x90, -+0x00,0x30,0xe0,0xab,0x16,0xaa,0x17,0xa9,0x18,0x12,0x42,0x4d,0x7f,0x01,0x22,0x7f, -+0x00,0x22,0xe4,0x90,0x9e,0xac,0xf0,0xa3,0xf0,0x90,0x05,0xf8,0xe0,0x70,0x0f,0xa3, -+0xe0,0x70,0x0b,0xa3,0xe0,0x70,0x07,0xa3,0xe0,0x70,0x03,0x7f,0x01,0x22,0xd3,0x90, -+0x9e,0xad,0xe0,0x94,0xe8,0x90,0x9e,0xac,0xe0,0x94,0x03,0x40,0x03,0x7f,0x00,0x22, -+0x7f,0x32,0x7e,0x00,0x12,0x37,0x54,0x90,0x9e,0xac,0xe4,0x75,0xf0,0x01,0x12,0x42, -+0x81,0x80,0xc6,0x90,0x9d,0xff,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x78,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x03,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x9e,0x07,0x12,0x43,0x53,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x0b,0x12, -+0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x80,0x59,0x12,0x2a,0x8b,0x00,0x03,0x2d,0x95,0xe4,0xfd,0xff,0x12,0x34,0x81,0x90, -+0x9e,0x80,0xe0,0xb4,0x01,0x11,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x03,0x2d,0x95, -+0xe4,0xfd,0x7f,0x01,0x12,0x34,0x81,0x22,0x7f,0x78,0x7e,0x08,0x12,0x27,0xde,0x90, -+0x9d,0xff,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x9e,0x03,0x12, -+0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0x07,0x12,0x2a,0x7f,0x90, -+0x9e,0x80,0xe0,0x90,0x9d,0xff,0xb4,0x01,0x0d,0x12,0x43,0x53,0xef,0x54,0xc7,0xff, -+0xed,0x54,0xc7,0xfd,0x80,0x07,0x12,0x43,0x53,0xef,0x54,0xc7,0xff,0xec,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9e,0x03,0x12,0x43, -+0x53,0xef,0x54,0x0f,0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c, -+0x12,0x2f,0xd9,0x90,0x9e,0x07,0x12,0x43,0x53,0xef,0x44,0x02,0xff,0xec,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x7f,0x70,0x7e,0x0e,0x12, -+0x27,0xde,0x90,0x9e,0x0b,0x12,0x2a,0x7f,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b, -+0x25,0xa0,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00, -+0x00,0x00,0x00,0xe4,0xfd,0xff,0x12,0x34,0x81,0x90,0x9e,0x80,0xe0,0xb4,0x01,0x11, -+0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe4,0xfd,0x7f,0x01,0x12,0x34, -+0x81,0x22,0xef,0x70,0x02,0xe1,0x49,0x90,0x9e,0x0f,0xe0,0x60,0x03,0x02,0x7b,0x15, -+0x90,0x9d,0xfb,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x08, -+0x12,0x2f,0xd9,0x90,0x9d,0xa7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9d,0xab,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x9d,0xaf,0x12,0x43,0x53,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xb3,0x12, -+0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x9d,0xb7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x74,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x9d,0xbb,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x78, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xbf,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xc3,0x12,0x43,0x53,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xc7,0x12,0x43, -+0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d, -+0xcb,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x88,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x9d,0xcf,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x8c,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xd3,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0xd0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xd7,0x12,0x43,0x53,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0xd4,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xdb,0x12,0x43,0x53, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd8,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xdf, -+0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xdc,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x9d,0xe3,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xe0,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x9d,0xe7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x9d,0xeb,0x12,0x43,0x53,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x9d,0xef,0x12,0x43,0x53,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9,0x90,0x9d,0xf3,0x12, -+0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f,0xd9,0x90, -+0x9d,0xf7,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08,0x12, -+0x2f,0xd9,0x90,0x9e,0x0f,0x74,0x01,0xf0,0x22,0x90,0x9e,0x0f,0xe0,0x64,0x01,0x60, -+0x03,0x02,0x7b,0x15,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xfb,0x12,0x2a, -+0x7f,0x7f,0x44,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xa7,0x12,0x2a,0x7f,0x7f,0x5c, -+0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xab,0x12,0x2a,0x7f,0x7f,0x6c,0x7e,0x0e,0x12, -+0x27,0xde,0x90,0x9d,0xaf,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12,0x27,0xde,0x90, -+0x9d,0xb3,0x12,0x2a,0x7f,0x7f,0x74,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xb7,0x12, -+0x2a,0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xbb,0x12,0x2a,0x7f,0x7f, -+0x7c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xbf,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x0e, -+0x12,0x27,0xde,0x90,0x9d,0xc3,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e,0x12,0x27,0xde, -+0x90,0x9d,0xc7,0x12,0x2a,0x7f,0x7f,0x88,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xcb, -+0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xcf,0x12,0x2a,0x7f, -+0x7f,0xd0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xd3,0x12,0x2a,0x7f,0x7f,0xd4,0x7e, -+0x0e,0x12,0x27,0xde,0x90,0x9d,0xd7,0x12,0x2a,0x7f,0x7f,0xd8,0x7e,0x0e,0x12,0x27, -+0xde,0x90,0x9d,0xdb,0x12,0x2a,0x7f,0x7f,0xdc,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d, -+0xdf,0x12,0x2a,0x7f,0x7f,0xe0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xe3,0x12,0x2a, -+0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x27,0xde,0x90,0x9d,0xe7,0x12,0x2a,0x7f,0x7f,0x04, -+0x7e,0x0c,0x12,0x27,0xde,0x90,0x9d,0xeb,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12, -+0x27,0xde,0x90,0x9d,0xef,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde,0x90, -+0x9d,0xf3,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90,0x9d,0xf7,0x12, -+0x2a,0x7f,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90, -+0x9e,0xa8,0x12,0x43,0x53,0xed,0x44,0xc0,0xfd,0xec,0x90,0x9e,0xa8,0x12,0x2a,0x7f, -+0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x08, -+0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x01,0x00,0x00,0x7f,0x44,0x7e, -+0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0xdb,0x25,0xa4,0x7f,0x5c, -+0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f, -+0x6c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4, -+0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x04,0x1b,0x25, -+0xa4,0x7f,0x74,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x04,0x1b, -+0x25,0xa4,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x04, -+0x1b,0x25,0xa4,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b, -+0x04,0x1b,0x25,0xa4,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a, -+0x8b,0x63,0xdb,0x25,0xa4,0x7f,0x84,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12, -+0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x88,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85, -+0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0x8c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80, -+0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd0,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd4,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd8,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f,0xdc,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f,0xe0,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x24,0xdb,0x25,0xa4,0x7f,0xec,0x7e, -+0x0e,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x9e,0xa8,0x12,0x2a, -+0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xe4,0xff,0xec,0x90,0x9e,0xa8,0x12,0x2a,0x7f, -+0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x11,0xff,0xec,0x90,0x9e,0xa8,0x12,0x2a, -+0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e, -+0x0c,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0d,0x12,0x27,0xde,0x90,0x9e,0xa8,0x12,0x2a, -+0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x54,0xf0,0xff,0xec,0x90,0x9e,0xa8,0x12, -+0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x01,0xff,0xec,0x90,0x9e,0xa8, -+0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x04,0x7e,0x0d,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde,0x90,0x9e,0xa8, -+0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xe4,0xff,0xec,0x90,0x9e,0xa8,0x12, -+0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xef,0x44,0x11,0xff,0xec,0x90,0x9e,0xa8, -+0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x0c,0x7e,0x09,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde,0x90,0x9e,0xa8, -+0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xed,0x54,0x0f,0xfd,0xec,0x54,0xf0, -+0xfc,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43,0x53,0xed,0x44,0x10, -+0xfd,0xec,0x44,0x01,0xfc,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43, -+0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f,0xd9,0x7f,0x04, -+0x7e,0x08,0x12,0x27,0xde,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12,0x43, -+0x53,0xef,0x54,0xf0,0xff,0xec,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8,0x12, -+0x43,0x53,0xef,0x44,0x01,0xff,0xec,0x90,0x9e,0xa8,0x12,0x2a,0x7f,0x90,0x9e,0xa8, -+0x12,0x43,0x53,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08,0x12,0x2f,0xd9, -+0xe4,0x90,0x9e,0x0f,0xf0,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x9e,0x43,0xf0, -+0xe0,0x60,0x04,0xe0,0xf4,0x70,0x21,0xa2,0xaf,0xe4,0x33,0xf5,0x14,0xc2,0xaf,0x90, -+0x00,0x47,0xe0,0x54,0xfb,0xfd,0x7f,0x47,0x12,0x49,0x05,0x7d,0x40,0x7f,0x01,0x12, -+0x36,0xaf,0xe5,0x14,0x24,0xff,0x92,0xaf,0x22,0x90,0x9e,0x3a,0xe0,0xc3,0x94,0x14, -+0x50,0x05,0xe0,0x04,0xf0,0x81,0x01,0x90,0x9e,0x3a,0xe0,0x64,0x14,0x60,0x02,0x81, -+0x01,0x90,0x9e,0x49,0xe0,0x70,0x25,0x90,0x9e,0x4c,0xe0,0x70,0x1f,0x90,0x9e,0x4a, -+0xe0,0x70,0x19,0x90,0x9e,0x4d,0xe0,0x70,0x13,0x90,0x9e,0x4b,0xe0,0x70,0x0d,0x90, -+0x9e,0x4e,0xe0,0x70,0x07,0x90,0x04,0xfd,0xe0,0x54,0xfe,0xf0,0x90,0x9e,0x49,0xe0, -+0x90,0x04,0x44,0xf0,0x90,0x9e,0x4a,0xe0,0x90,0x04,0x45,0xf0,0x90,0x9e,0x4b,0xe0, -+0x90,0x04,0x46,0xf0,0xa3,0xe4,0xf0,0x90,0x9e,0x4c,0xe0,0x90,0x04,0x48,0xf0,0x90, -+0x9e,0x4d,0xe0,0x90,0x04,0x49,0xf0,0x90,0x9e,0x4e,0xe0,0x90,0x04,0x4a,0xf0,0xa3, -+0xe4,0xf0,0x90,0x9e,0x35,0xe0,0x90,0x04,0x4c,0xf0,0x90,0x9e,0x36,0xe0,0x90,0x04, -+0x4d,0xf0,0x90,0x9e,0x37,0xe0,0x90,0x04,0x4e,0xf0,0x90,0x9e,0x38,0xe0,0x90,0x04, -+0x4f,0xf0,0xe4,0x90,0x9e,0x3a,0xf0,0x90,0x9e,0x35,0x04,0xf0,0xe4,0xa3,0xf0,0xa3, -+0xf0,0xa3,0xf0,0x90,0x9e,0x49,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3, -+0xf0,0x90,0x05,0x60,0xe0,0x90,0x9e,0x19,0xf0,0x90,0x05,0x61,0xe0,0x90,0x9e,0x1a, -+0xf0,0x90,0x05,0x62,0xe0,0x90,0x9e,0x1b,0xf0,0x90,0x05,0x63,0xe0,0x90,0x9e,0x1c, -+0xf0,0x90,0x9e,0x52,0xe0,0xff,0x90,0x9e,0x1c,0xe0,0xfe,0xd3,0x9f,0x50,0x0b,0x90, -+0x9e,0x52,0xe0,0xc3,0x9e,0xd3,0x94,0x01,0x40,0x11,0x90,0x9e,0x40,0xe0,0xb4,0x01, -+0x02,0x80,0x03,0x90,0x9e,0x44,0xe0,0xff,0x12,0x4c,0xf0,0x22,0x90,0x9e,0x53,0xe0, -+0x64,0x01,0x60,0x08,0x90,0x9e,0x41,0xe0,0x60,0x02,0xa1,0x23,0x90,0x9e,0x35,0xe0, -+0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x3b,0x90,0x9e,0x36,0xe0,0xc3,0x94, -+0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x28,0x90,0x9e,0x37,0xe0,0xc3,0x94,0xff, -+0x50,0x0a,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x36,0xf0,0x80,0x15,0x90,0x9e,0x38,0xe0, -+0xc3,0x94,0xff,0x50,0x10,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x37,0xf0,0x90,0x9e,0x36, -+0xf0,0x90,0x9e,0x35,0xf0,0x90,0x00,0x44,0xe0,0x54,0x0c,0x60,0x76,0xe0,0x30,0xe2, -+0x32,0x90,0x9e,0x49,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90, -+0x9e,0x4a,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x9e, -+0x4b,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x4a,0xf0,0x90, -+0x9e,0x49,0xf0,0x90,0x00,0x44,0xe0,0x30,0xe3,0x32,0x90,0x9e,0x4c,0xe0,0xc3,0x94, -+0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90,0x9e,0x4d,0xe0,0xc3,0x94,0xff,0x50, -+0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x9e,0x4e,0xe0,0xc3,0x94,0xff,0x50,0x0c, -+0xe0,0x04,0xf0,0xe4,0x90,0x9e,0x4d,0xf0,0x90,0x9e,0x4c,0xf0,0x90,0x04,0xfd,0xe0, -+0x44,0x01,0xf0,0x22,0x68,0x4c,}; -+#else -+// =================== v88 TSMC P2PPS with CCX report C2H 2012-12-05 ======================= -+u8 Rtl8192CUFwTSMCImgArray[TSMCImgArrayLength] = { -+0xC1, 0x88, 0x02, 0x05, 0x58, 0x00, 0x02, 0x00, 0x12, 0x05, 0x17, 0x12, 0xDE, 0x3E, 0x00, 0x00, -+0x94, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x02, 0x46, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x02, 0x60, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x02, 0x68, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4B, 0x87, 0x00, 0x00, -+0x05, 0x04, 0x03, 0x02, 0x00, 0x03, 0x06, 0x05, 0x04, 0x03, 0x00, 0x04, 0x06, 0x05, 0x04, 0x02, -+0x00, 0x04, 0x08, 0x07, 0x06, 0x04, 0x00, 0x06, 0x0A, 0x09, 0x08, 0x06, 0x00, 0x08, 0x0A, 0x09, -+0x08, 0x04, 0x00, 0x08, 0x0A, 0x09, 0x08, 0x02, 0x00, 0x08, 0x0A, 0x09, 0x08, 0x00, 0x00, 0x08, -+0x12, 0x11, 0x10, 0x08, 0x00, 0x10, 0x1A, 0x19, 0x18, 0x10, 0x00, 0x18, 0x22, 0x21, 0x20, 0x18, -+0x00, 0x20, 0x22, 0x21, 0x20, 0x10, 0x00, 0x20, 0x22, 0x21, 0x20, 0x08, 0x00, 0x20, 0x22, 0x21, -+0x1C, 0x08, 0x00, 0x20, 0x22, 0x21, 0x14, 0x08, 0x00, 0x20, 0x22, 0x20, 0x18, 0x08, 0x00, 0x20, -+0x31, 0x30, 0x20, 0x10, 0x00, 0x30, 0x31, 0x30, 0x18, 0x00, 0x00, 0x30, 0x31, 0x2F, 0x10, 0x10, -+0x00, 0x30, 0x31, 0x2C, 0x10, 0x10, 0x00, 0x30, 0x31, 0x28, 0x10, 0x00, 0x00, 0x30, 0x31, 0x20, -+0x10, 0x00, 0x00, 0x30, 0x31, 0x10, 0x10, 0x00, 0x00, 0x30, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, -+0x05, 0x07, 0x07, 0x07, 0x08, 0x0A, 0x04, 0x04, 0x04, 0x04, 0x06, 0x0A, 0x0B, 0x0D, 0x05, 0x05, -+0x07, 0x07, 0x08, 0x0B, 0x0D, 0x0F, 0x04, 0x04, 0x04, 0x05, 0x07, 0x07, 0x09, 0x09, 0x0C, 0x0E, -+0x10, 0x12, 0x06, 0x07, 0x09, 0x0A, 0x0C, 0x0E, 0x11, 0x13, 0x09, 0x09, 0x09, 0x09, 0x0C, 0x0E, -+0x11, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x26, 0x2A, 0x18, 0x1A, -+0x1D, 0x1F, 0x21, 0x27, 0x29, 0x2A, 0x00, 0x00, 0x00, 0x1F, 0x23, 0x28, 0x2A, 0x2C, 0x00, 0x04, -+0x00, 0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x18, 0x00, 0x24, 0x00, 0x30, 0x00, 0x48, 0x00, 0x60, -+0x00, 0x90, 0x00, 0xC0, 0x00, 0xD8, 0x00, 0x50, 0x00, 0x78, 0x00, 0xA0, 0x00, 0xC8, 0x01, 0x40, -+0x01, 0x90, 0x01, 0xE0, 0x02, 0x30, 0x01, 0x2C, 0x01, 0x40, 0x01, 0xE0, 0x02, 0xD0, 0x03, 0xE8, -+0x04, 0xB0, 0x06, 0x40, 0x07, 0xD0, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00, 0x0C, -+0x00, 0x12, 0x00, 0x18, 0x00, 0x24, 0x00, 0x30, 0x00, 0x48, 0x00, 0x60, 0x00, 0x6C, 0x00, 0x28, -+0x00, 0x3C, 0x00, 0x50, 0x00, 0x64, 0x00, 0xA0, 0x00, 0xC8, 0x00, 0xF0, 0x01, 0x18, 0x00, 0x64, -+0x00, 0xA0, 0x00, 0xF0, 0x01, 0x68, 0x01, 0xF4, 0x02, 0x58, 0x03, 0x20, 0x03, 0xE8, 0x02, 0x02, -+0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x07, 0x02, 0x03, 0x04, 0x0A, 0x0C, 0x0E, -+0x10, 0x12, 0x05, 0x07, 0x07, 0x08, 0x0B, 0x12, 0x24, 0x3C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, -+0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x05, 0x06, -+0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x20, 0x1E, 0x1C, 0x18, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0xBB, 0x01, 0x0C, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE0, 0x22, 0x50, -+0x06, 0xE9, 0x25, 0x82, 0xF8, 0xE6, 0x22, 0xBB, 0xFE, 0x06, 0xE9, 0x25, 0x82, 0xF8, 0xE2, 0x22, -+0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE4, 0x93, 0x22, 0xBB, 0x01, 0x06, -+0x89, 0x82, 0x8A, 0x83, 0xF0, 0x22, 0x50, 0x02, 0xF7, 0x22, 0xBB, 0xFE, 0x01, 0xF3, 0x22, 0xF8, -+0xBB, 0x01, 0x0D, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE8, 0xF0, 0x22, -+0x50, 0x06, 0xE9, 0x25, 0x82, 0xC8, 0xF6, 0x22, 0xBB, 0xFE, 0x05, 0xE9, 0x25, 0x82, 0xC8, 0xF2, -+0x22, 0xC5, 0xF0, 0xF8, 0xA3, 0xE0, 0x28, 0xF0, 0xC5, 0xF0, 0xF8, 0xE5, 0x82, 0x15, 0x82, 0x70, -+0x02, 0x15, 0x83, 0xE0, 0x38, 0xF0, 0x22, 0xBB, 0x01, 0x0A, 0x89, 0x82, 0x8A, 0x83, 0xE0, 0xF5, -+0xF0, 0xA3, 0xE0, 0x22, 0x50, 0x06, 0x87, 0xF0, 0x09, 0xE7, 0x19, 0x22, 0xBB, 0xFE, 0x07, 0xE3, -+0xF5, 0xF0, 0x09, 0xE3, 0x19, 0x22, 0x89, 0x82, 0x8A, 0x83, 0xE4, 0x93, 0xF5, 0xF0, 0x74, 0x01, -+0x93, 0x22, 0xBB, 0x01, 0x10, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE0, -+0xF5, 0xF0, 0xA3, 0xE0, 0x22, 0x50, 0x09, 0xE9, 0x25, 0x82, 0xF8, 0x86, 0xF0, 0x08, 0xE6, 0x22, -+0xBB, 0xFE, 0x0A, 0xE9, 0x25, 0x82, 0xF8, 0xE2, 0xF5, 0xF0, 0x08, 0xE2, 0x22, 0xE5, 0x83, 0x2A, -+0xF5, 0x83, 0xE9, 0x93, 0xF5, 0xF0, 0xA3, 0xE9, 0x93, 0x22, 0xBB, 0x01, 0x0A, 0x89, 0x82, 0x8A, -+0x83, 0xF0, 0xE5, 0xF0, 0xA3, 0xF0, 0x22, 0x50, 0x06, 0xF7, 0x09, 0xA7, 0xF0, 0x19, 0x22, 0xBB, -+0xFE, 0x06, 0xF3, 0xE5, 0xF0, 0x09, 0xF3, 0x19, 0x22, 0xF8, 0xBB, 0x01, 0x11, 0xE5, 0x82, 0x29, -+0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE8, 0xF0, 0xE5, 0xF0, 0xA3, 0xF0, 0x22, 0x50, 0x09, -+0xE9, 0x25, 0x82, 0xC8, 0xF6, 0x08, 0xA6, 0xF0, 0x22, 0xBB, 0xFE, 0x09, 0xE9, 0x25, 0x82, 0xC8, -+0xF2, 0xE5, 0xF0, 0x08, 0xF2, 0x22, 0xEF, 0x4B, 0xFF, 0xEE, 0x4A, 0xFE, 0xED, 0x49, 0xFD, 0xEC, -+0x48, 0xFC, 0x22, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0xA3, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0x22, 0xA4, -+0x25, 0x82, 0xF5, 0x82, 0xE5, 0xF0, 0x35, 0x83, 0xF5, 0x83, 0x22, 0xE0, 0xFB, 0xA3, 0xE0, 0xFA, -+0xA3, 0xE0, 0xF9, 0x22, 0xF8, 0xE0, 0xFB, 0xA3, 0xA3, 0xE0, 0xF9, 0x25, 0xF0, 0xF0, 0xE5, 0x82, -+0x15, 0x82, 0x70, 0x02, 0x15, 0x83, 0xE0, 0xFA, 0x38, 0xF0, 0x22, 0xEB, 0xF0, 0xA3, 0xEA, 0xF0, -+0xA3, 0xE9, 0xF0, 0x22, 0xD0, 0x83, 0xD0, 0x82, 0xF8, 0xE4, 0x93, 0x70, 0x12, 0x74, 0x01, 0x93, -+0x70, 0x0D, 0xA3, 0xA3, 0x93, 0xF8, 0x74, 0x01, 0x93, 0xF5, 0x82, 0x88, 0x83, 0xE4, 0x73, 0x74, -+0x02, 0x93, 0x68, 0x60, 0xEF, 0xA3, 0xA3, 0xA3, 0x80, 0xDF, 0xD0, 0x83, 0xD0, 0x82, 0xF8, 0xE4, -+0x93, 0x70, 0x12, 0x74, 0x01, 0x93, 0x70, 0x0D, 0xA3, 0xA3, 0x93, 0xF8, 0x74, 0x01, 0x93, 0xF5, -+0x82, 0x88, 0x83, 0xE4, 0x73, 0x74, 0x02, 0x93, 0xB5, 0xF0, 0x06, 0x74, 0x03, 0x93, 0x68, 0x60, -+0xE9, 0xA3, 0xA3, 0xA3, 0xA3, 0x80, 0xD8, 0xE4, 0x90, 0x8A, 0xC5, 0xF0, 0xE5, 0x24, 0x70, 0x03, -+0x02, 0x44, 0x9D, 0xE5, 0x21, 0x64, 0x01, 0x60, 0x03, 0x02, 0x44, 0x9D, 0xE5, 0x24, 0x14, 0x60, -+0x29, 0x24, 0xFD, 0x60, 0x25, 0x24, 0x02, 0x24, 0xFB, 0x50, 0x02, 0x80, 0x23, 0x90, 0x8B, 0x0B, -+0xE0, 0x14, 0xF0, 0xE0, 0x60, 0x04, 0xA3, 0xE0, 0x60, 0x16, 0x90, 0x8B, 0x0B, 0xE0, 0x70, 0x0A, -+0x90, 0x8B, 0x19, 0xE0, 0x90, 0x8B, 0x0B, 0xF0, 0x80, 0x00, 0x90, 0x8A, 0xC5, 0x74, 0x01, 0xF0, -+0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x16, 0xA3, 0xE0, 0xB4, 0x06, 0x05, 0xE4, 0x90, 0x8A, 0xC5, -+0xF0, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x70, 0x04, 0x90, 0x8A, 0xC5, 0xF0, 0x90, 0x8A, 0xC5, -+0xE0, 0x60, 0x4A, 0x43, 0x25, 0x10, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0C, 0xE0, 0x75, -+0xF0, 0x03, 0xA4, 0xFF, 0x90, 0x8B, 0x15, 0xE0, 0x2F, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, 0x05, 0xF0, 0xE5, 0x22, 0x54, -+0x0F, 0xC3, 0x94, 0x04, 0x50, 0x07, 0x7D, 0x01, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x90, 0x8B, 0x2C, -+0xE0, 0x30, 0xE0, 0x09, 0x12, 0x7D, 0xC1, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x22, 0xE4, 0xF5, -+0x25, 0xF5, 0x24, 0x75, 0x23, 0x0C, 0x75, 0x22, 0x0C, 0x90, 0x8B, 0x1A, 0xF0, 0x90, 0x8B, 0x18, -+0xF0, 0x90, 0x8B, 0x17, 0xF0, 0x90, 0x8B, 0x19, 0x04, 0xF0, 0x90, 0x8B, 0x0B, 0xF0, 0xE4, 0x90, -+0x8B, 0x1B, 0xF0, 0x90, 0x8B, 0x0D, 0xF0, 0x90, 0x8B, 0x15, 0x74, 0x05, 0xF0, 0xE4, 0x90, 0x8B, -+0x0C, 0xF0, 0x90, 0x8B, 0x13, 0xF0, 0xA3, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x10, 0xF0, 0xA3, 0x74, -+0x05, 0xF0, 0x90, 0x8B, 0x0F, 0x74, 0x14, 0xF0, 0x90, 0x8B, 0x16, 0x74, 0x05, 0xF0, 0xE4, 0x90, -+0x8B, 0x0E, 0xF0, 0x90, 0x8B, 0x0A, 0xF0, 0x90, 0x8B, 0x08, 0xF0, 0x90, 0x8B, 0x12, 0xF0, 0x22, -+0x7F, 0x00, 0x22, 0x02, 0x45, 0x03, 0x02, 0x45, 0x06, 0x8E, 0x64, 0x8F, 0x65, 0xAD, 0x65, 0xAC, -+0x64, 0xAF, 0x63, 0x12, 0x4A, 0x5B, 0xAF, 0x65, 0xAE, 0x64, 0x90, 0x04, 0x80, 0xE0, 0x54, 0x0F, -+0xFD, 0xAC, 0x07, 0x74, 0x11, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x01, -+0xF0, 0x74, 0x11, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xFB, 0xF0, 0xAC, -+0x07, 0x74, 0x16, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0xFA, 0xF0, 0x74, -+0x15, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x1F, 0xF0, 0xAC, 0x07, 0x74, -+0x06, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x0F, 0xF0, 0x90, 0x04, 0x53, -+0xE4, 0xF0, 0x90, 0x04, 0x52, 0xF0, 0x90, 0x04, 0x51, 0x74, 0xFF, 0xF0, 0x90, 0x04, 0x50, 0x74, -+0xFD, 0xF0, 0x74, 0x14, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xC0, 0x4D, -+0xFD, 0x74, 0x14, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xED, 0xF0, 0x22, 0x7D, 0x01, -+0x7F, 0x0C, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, 0x67, 0x8D, 0x68, 0xE5, 0x67, 0x54, -+0x0F, 0xFF, 0xE5, 0x22, 0x54, 0x0F, 0x6F, 0x60, 0x72, 0xE5, 0x67, 0x30, 0xE2, 0x30, 0xE5, 0x22, -+0x20, 0xE2, 0x05, 0x7F, 0x01, 0x12, 0x4A, 0xB2, 0xE5, 0x22, 0x30, 0xE3, 0x10, 0xE5, 0x67, 0x20, -+0xE3, 0x0B, 0x12, 0x49, 0xD5, 0xEF, 0x60, 0x53, 0x12, 0x4A, 0xCC, 0x80, 0x4E, 0xE5, 0x22, 0x20, -+0xE3, 0x49, 0xE5, 0x67, 0x30, 0xE3, 0x44, 0xAF, 0x68, 0x12, 0x4A, 0x7C, 0x80, 0x3D, 0xE5, 0x22, -+0x54, 0x0F, 0xFF, 0xBF, 0x0C, 0x0E, 0xE5, 0x67, 0x20, 0xE3, 0x09, 0x12, 0x49, 0xD5, 0xEF, 0x60, -+0x2A, 0x12, 0x4A, 0xCC, 0xE5, 0x22, 0x54, 0x0F, 0xFF, 0xBF, 0x04, 0x0E, 0xE5, 0x67, 0x20, 0xE2, -+0x09, 0x12, 0x49, 0x93, 0xEF, 0x60, 0x14, 0x12, 0x4A, 0x32, 0xE5, 0x22, 0x54, 0x0F, 0xFF, 0xBF, -+0x02, 0x09, 0x12, 0x45, 0x00, 0xEF, 0x60, 0x03, 0x12, 0x4B, 0x10, 0xD0, 0xD0, 0x92, 0xAF, 0x22, -+0x02, 0x46, 0x6E, 0x02, 0x50, 0xC6, 0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0x40, 0x03, 0xF6, -+0x80, 0x01, 0xF2, 0x08, 0xDF, 0xF4, 0x80, 0x29, 0xE4, 0x93, 0xA3, 0xF8, 0x54, 0x07, 0x24, 0x0C, -+0xC8, 0xC3, 0x33, 0xC4, 0x54, 0x0F, 0x44, 0x20, 0xC8, 0x83, 0x40, 0x04, 0xF4, 0x56, 0x80, 0x01, -+0x46, 0xF6, 0xDF, 0xE4, 0x80, 0x0B, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x90, 0x4B, -+0x23, 0xE4, 0x7E, 0x01, 0x93, 0x60, 0xBC, 0xA3, 0xFF, 0x54, 0x3F, 0x30, 0xE5, 0x09, 0x54, 0x1F, -+0xFE, 0xE4, 0x93, 0xA3, 0x60, 0x01, 0x0E, 0xCF, 0x54, 0xC0, 0x25, 0xE0, 0x60, 0xA8, 0x40, 0xB8, -+0xE4, 0x93, 0xA3, 0xFA, 0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0xC8, 0xC5, 0x82, 0xC8, 0xCA, -+0xC5, 0x83, 0xCA, 0xF0, 0xA3, 0xC8, 0xC5, 0x82, 0xC8, 0xCA, 0xC5, 0x83, 0xCA, 0xDF, 0xE9, 0xDE, -+0xE7, 0x80, 0xBE, 0xE5, 0x21, 0x64, 0x01, 0x70, 0x67, 0xE5, 0x24, 0x60, 0x63, 0xE5, 0x24, 0x64, -+0x02, 0x60, 0x06, 0xE5, 0x24, 0x64, 0x05, 0x70, 0x27, 0x90, 0x06, 0xAB, 0xE0, 0x90, 0x8B, 0x0B, -+0xF0, 0x90, 0x06, 0xAA, 0xE0, 0x90, 0x8B, 0x19, 0xF0, 0x90, 0x8B, 0x0B, 0xE0, 0x70, 0x07, 0x90, -+0x8B, 0x19, 0xE0, 0xFF, 0x80, 0x05, 0x90, 0x8B, 0x0B, 0xE0, 0xFF, 0x90, 0x8B, 0x0B, 0xEF, 0xF0, -+0x90, 0x8B, 0x0D, 0xE0, 0x60, 0x02, 0xE4, 0xF0, 0xE4, 0x90, 0x8B, 0x0C, 0xF0, 0x90, 0x05, 0x58, -+0x74, 0x03, 0xF0, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x53, 0x25, -+0xFD, 0x53, 0x25, 0xEF, 0xE5, 0x24, 0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x03, 0x12, 0x47, 0x8E, -+0x22, 0xEF, 0x64, 0x01, 0x70, 0x35, 0x7D, 0x78, 0x7F, 0x02, 0x12, 0x36, 0x75, 0x7D, 0x02, 0x7F, -+0x03, 0x12, 0x36, 0x75, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x12, -+0x45, 0x9E, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x03, 0x12, 0x7D, 0xC1, 0x90, 0x06, 0x04, 0xE0, -+0x54, 0x7F, 0xF0, 0x90, 0x06, 0x0A, 0xE0, 0x54, 0xF8, 0xF0, 0x22, 0x90, 0x01, 0x36, 0x74, 0x7B, -+0xF0, 0xA3, 0x74, 0x02, 0xF0, 0x7D, 0x7B, 0xFF, 0x12, 0x36, 0xE6, 0x7D, 0x02, 0x7F, 0x03, 0x12, -+0x36, 0xE6, 0x90, 0x06, 0x04, 0xE0, 0x44, 0x80, 0xF0, 0x90, 0x06, 0x0A, 0xE0, 0x44, 0x07, 0xF0, -+0x12, 0x4B, 0x4F, 0xE5, 0x21, 0x20, 0xE0, 0x05, 0xE4, 0x90, 0x8B, 0x0D, 0xF0, 0x22, 0xE4, 0x90, -+0x8A, 0xC5, 0xF0, 0x90, 0x06, 0xA9, 0xE0, 0x90, 0x8A, 0xC5, 0xF0, 0xE0, 0x54, 0xC0, 0x70, 0x09, -+0x53, 0x25, 0xFE, 0x53, 0x25, 0xFD, 0x12, 0x4A, 0xFC, 0x90, 0x8A, 0xC5, 0xE0, 0x30, 0xE6, 0x15, -+0x43, 0x25, 0x01, 0x90, 0x8B, 0x1A, 0xE0, 0x64, 0x02, 0x60, 0x05, 0x12, 0x4A, 0x97, 0x80, 0x08, -+0x12, 0x49, 0x49, 0x80, 0x03, 0x53, 0x25, 0xFE, 0x90, 0x8A, 0xC5, 0xE0, 0x30, 0xE7, 0x27, 0x43, -+0x25, 0x02, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x11, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, -+0xFB, 0xFD, 0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, 0x05, 0xF0, 0x90, -+0x8B, 0x1B, 0x74, 0x01, 0xF0, 0x22, 0x53, 0x25, 0xFD, 0x22, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x8B, -+0x12, 0x4B, 0x43, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xF5, 0x24, 0x14, 0x60, -+0x0E, 0x14, 0x60, 0x1F, 0x14, 0x60, 0x31, 0x24, 0x03, 0x70, 0x44, 0x7F, 0x01, 0x80, 0x3D, 0x90, -+0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFD, 0xE4, 0xFF, 0x12, 0x4A, -+0x07, 0x80, 0x29, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFD, -+0x7F, 0x01, 0x12, 0x4A, 0x07, 0x1F, 0x80, 0x14, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, -+0x02, 0x12, 0x42, 0x20, 0xFD, 0x7F, 0x02, 0x12, 0x4A, 0x07, 0xE4, 0xFF, 0x12, 0x47, 0x21, 0x22, -+0xE4, 0x90, 0x8A, 0xCB, 0xF0, 0xE5, 0x24, 0x60, 0x49, 0x90, 0x8B, 0x1B, 0xE0, 0x60, 0x0D, 0xE4, -+0xF0, 0x53, 0x25, 0xFD, 0xE5, 0x25, 0x54, 0x07, 0x70, 0x38, 0x80, 0x33, 0x90, 0x8B, 0x0C, 0xE0, -+0x04, 0xF0, 0x53, 0x25, 0xEF, 0x90, 0x8A, 0xCB, 0xE0, 0xFF, 0x90, 0x8B, 0x10, 0xE0, 0x2F, 0xFF, -+0xE4, 0x33, 0xFE, 0x90, 0x8B, 0x0C, 0xE0, 0xD3, 0x9F, 0xEE, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, -+0x40, 0x0D, 0xE5, 0x21, 0xB4, 0x01, 0x0B, 0xA3, 0xE0, 0x70, 0x07, 0xE0, 0x04, 0xF0, 0x22, 0x12, -+0x4A, 0xFC, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, 0x63, 0x90, 0x04, 0x1D, 0xE0, -+0x60, 0x24, 0x90, 0x05, 0x22, 0xE0, 0xF5, 0x66, 0x74, 0xFF, 0xF0, 0x12, 0x7E, 0x9A, 0xBF, 0x01, -+0x0D, 0x90, 0x8A, 0xF9, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xFD, 0x12, 0x45, 0x09, 0x90, 0x05, -+0x22, 0xE5, 0x66, 0xF0, 0x80, 0x0D, 0x90, 0x8A, 0xF9, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xFD, -+0x12, 0x45, 0x09, 0x90, 0x04, 0x1F, 0x74, 0x20, 0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE5, 0x24, -+0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x41, 0x90, 0x8B, 0x1A, 0xE0, 0x60, 0x2B, 0x12, 0x45, 0x9E, -+0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x58, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, -+0x74, 0x01, 0xF0, 0x90, 0x8B, 0x18, 0xF0, 0x22, 0xE5, 0x22, 0x54, 0x0F, 0xC3, 0x94, 0x04, 0x50, -+0x07, 0x7D, 0x01, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x22, 0x90, 0x01, 0x5F, 0xE4, 0xF0, 0x90, 0x01, -+0x3C, 0x74, 0x08, 0xF0, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, -+0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x5C, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x5F, 0x74, 0x05, -+0xF0, 0x90, 0x06, 0x92, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x17, 0x14, 0xF0, 0xE5, 0x22, 0x54, 0x0F, -+0xC3, 0x94, 0x0C, 0x50, 0x0D, 0x12, 0x45, 0x9E, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x03, 0x12, -+0x7D, 0xC1, 0x22, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x37, 0xE5, 0x25, 0x54, 0x03, 0x70, -+0x31, 0xE5, 0x23, 0x54, 0x0F, 0xD3, 0x94, 0x02, 0x50, 0x28, 0xE5, 0x25, 0x20, 0xE2, 0x23, 0xE5, -+0x25, 0x20, 0xE4, 0x1E, 0x90, 0x8B, 0x0D, 0xE0, 0x70, 0x18, 0x90, 0x8B, 0x12, 0xE0, 0x70, 0x12, -+0xE5, 0x26, 0x70, 0x0E, 0x90, 0x01, 0xB9, 0xE4, 0xF0, 0x90, 0x01, 0xB8, 0x74, 0x04, 0xF0, 0x7F, -+0x01, 0x22, 0x7F, 0x00, 0x22, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x27, 0x90, 0x8B, 0x18, -+0xE0, 0x70, 0x21, 0x90, 0x8B, 0x17, 0xE0, 0x70, 0x1B, 0xE5, 0x23, 0x54, 0x0F, 0xD3, 0x94, 0x04, -+0x50, 0x12, 0xE5, 0x26, 0x70, 0x0E, 0x90, 0x01, 0xB9, 0xE4, 0xF0, 0x90, 0x01, 0xB8, 0x74, 0x08, -+0xF0, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0xEF, 0x24, 0xFE, 0x60, 0x0B, 0x04, 0x70, 0x22, 0x90, -+0x8B, 0x19, 0x74, 0x01, 0xF0, 0x80, 0x16, 0xED, 0x70, 0x0A, 0x90, 0x8B, 0x16, 0xE0, 0x90, 0x8B, -+0x19, 0xF0, 0x80, 0x05, 0x90, 0x8B, 0x19, 0xED, 0xF0, 0x90, 0x8B, 0x19, 0xE0, 0x90, 0x8B, 0x0B, -+0xF0, 0x22, 0x90, 0x01, 0x37, 0x74, 0x02, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x7E, -+0x9A, 0xEF, 0x70, 0x06, 0x90, 0x01, 0xC8, 0x74, 0xFD, 0xF0, 0x7D, 0x02, 0x7F, 0x03, 0x12, 0x36, -+0xE6, 0x12, 0x7C, 0x50, 0x53, 0x22, 0xF0, 0x43, 0x22, 0x02, 0x22, 0xEF, 0x60, 0x0F, 0x74, 0x21, -+0x2D, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x10, 0xF0, 0x22, 0x74, 0x21, 0x2D, -+0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xEF, 0xF0, 0x22, 0x90, 0x06, 0x04, 0xE0, -+0x54, 0xBF, 0xF0, 0xEF, 0x60, 0x0A, 0xE5, 0x21, 0xB4, 0x01, 0x05, 0xE4, 0xFF, 0x12, 0x48, 0xB3, -+0x53, 0x22, 0xF0, 0x43, 0x22, 0x0C, 0x22, 0x90, 0x04, 0x1D, 0xE0, 0x70, 0x14, 0x90, 0x8A, 0xF8, -+0xE0, 0xFF, 0xE4, 0xFD, 0x12, 0x5F, 0xFD, 0x8E, 0x69, 0x8F, 0x6A, 0x90, 0x04, 0x1F, 0x74, 0x20, -+0xF0, 0x22, 0x90, 0x8B, 0x52, 0xEF, 0xF0, 0x12, 0x7D, 0x42, 0x90, 0x8B, 0x52, 0xE0, 0x60, 0x05, -+0x90, 0x05, 0x22, 0xE4, 0xF0, 0x53, 0x22, 0xF0, 0x43, 0x22, 0x04, 0x22, 0x90, 0x06, 0x04, 0xE0, -+0x44, 0x40, 0xF0, 0xE5, 0x21, 0xB4, 0x01, 0x05, 0x7F, 0x01, 0x12, 0x48, 0xB3, 0x53, 0x22, 0xF0, -+0x43, 0x22, 0x04, 0x22, 0xE5, 0x23, 0x30, 0xE6, 0x12, 0xE5, 0x23, 0x54, 0x0F, 0xFF, 0x90, 0x01, -+0x2F, 0xE0, 0x54, 0x80, 0x4F, 0x64, 0x80, 0xF0, 0x53, 0x23, 0xBF, 0x22, 0x90, 0x8B, 0x2C, 0xE0, -+0x30, 0xE0, 0x05, 0xAF, 0x23, 0x02, 0x7E, 0x06, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x22, -+0x53, 0x22, 0xF0, 0x43, 0x22, 0x01, 0x12, 0x4B, 0x5A, 0x12, 0x4B, 0x5B, 0x53, 0x22, 0xF0, 0x43, -+0x22, 0x02, 0x22, 0x41, 0x8A, 0xF6, 0x00, 0x41, 0x8B, 0x05, 0x00, 0x41, 0x8B, 0x51, 0x00, 0x41, -+0x8B, 0x53, 0x00, 0x00, 0x90, 0x04, 0x1B, 0xE0, 0x54, 0x7F, 0x64, 0x7F, 0x7F, 0x01, 0x60, 0x02, -+0x7F, 0x00, 0x22, 0xE4, 0x90, 0x8B, 0x1B, 0xF0, 0x90, 0x8B, 0x0C, 0xF0, 0xF5, 0x25, 0x22, 0x90, -+0x8B, 0x13, 0xE0, 0xA3, 0xE0, 0x90, 0x05, 0x58, 0xF0, 0x22, 0x22, 0x22, 0xF0, 0x90, 0x8B, 0x0F, -+0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x58, 0x7E, 0x01, 0xD3, 0x10, 0xAF, 0x01, -+0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x3D, 0xE0, 0xFB, 0xA3, 0xE0, 0xF5, 0x44, 0xE4, 0xF5, 0x45, 0x12, -+0x35, 0xAB, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, -+0xD0, 0x75, 0xD0, 0x00, 0xC0, 0x00, 0xC0, 0x01, 0xC0, 0x02, 0xC0, 0x03, 0xC0, 0x04, 0xC0, 0x05, -+0xC0, 0x06, 0xC0, 0x07, 0x75, 0x0E, 0x00, 0x90, 0x01, 0xC4, 0x74, 0x87, 0xF0, 0x74, 0x4B, 0xA3, -+0xF0, 0x53, 0x91, 0xDF, 0x90, 0x01, 0x3C, 0xE0, 0x55, 0x30, 0xF5, 0x34, 0xA3, 0xE0, 0x55, 0x31, -+0xF5, 0x35, 0xA3, 0xE0, 0x55, 0x32, 0xF5, 0x36, 0xA3, 0xE0, 0x55, 0x33, 0xF5, 0x37, 0xE5, 0x34, -+0x30, 0xE0, 0x51, 0x90, 0x01, 0x3C, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x1F, -+0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x18, 0x90, 0x8B, 0x34, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xE0, -+0x64, 0x03, 0x60, 0x0B, 0x7F, 0x01, 0xB1, 0xE0, 0xEF, 0x70, 0x04, 0x7F, 0x02, 0xD1, 0x89, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x1D, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x16, 0x90, 0x8B, -+0x2E, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x09, 0xE4, 0xFF, 0xB1, 0xE0, 0xEF, -+0x70, 0x02, 0xD1, 0x56, 0xE5, 0x34, 0x30, 0xE1, 0x08, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x11, -+0x60, 0xE5, 0x34, 0x30, 0xE2, 0x28, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, 0x90, 0x06, 0x92, 0xE0, -+0x30, 0xE0, 0x14, 0x90, 0x8B, 0x3D, 0xE4, 0x71, 0x5C, 0x90, 0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, -+0x06, 0x92, 0x74, 0x01, 0xF0, 0x80, 0x07, 0x90, 0x8B, 0x18, 0xE4, 0xF0, 0x51, 0xFC, 0xE5, 0x34, -+0x30, 0xE3, 0x38, 0x90, 0x01, 0x3C, 0x74, 0x08, 0xF0, 0x90, 0x06, 0x92, 0xE0, 0x30, 0xE1, 0x24, -+0x90, 0x8B, 0x3D, 0xE4, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x5C, 0x7E, 0x01, 0x71, 0x6C, 0x90, 0x01, 0x5F, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, 0x74, -+0x02, 0xF0, 0x80, 0x07, 0x90, 0x8B, 0x17, 0xE4, 0xF0, 0x51, 0xFC, 0xE5, 0x34, 0x30, 0xE4, 0x09, -+0x90, 0x01, 0x3C, 0x74, 0x10, 0xF0, 0x12, 0x51, 0xC9, 0xE5, 0x34, 0x30, 0xE5, 0x06, 0x90, 0x01, -+0x3C, 0x74, 0x20, 0xF0, 0xE5, 0x35, 0x30, 0xE0, 0x10, 0x90, 0x01, 0x3D, 0x74, 0x01, 0xF0, 0x90, -+0x00, 0x83, 0xE0, 0xF5, 0x23, 0x51, 0xE4, 0x51, 0xFC, 0xE5, 0x35, 0x30, 0xE2, 0x06, 0x90, 0x01, -+0x3D, 0x74, 0x04, 0xF0, 0xE5, 0x35, 0x30, 0xE4, 0x1B, 0x90, 0x01, 0x3D, 0x74, 0x10, 0xF0, 0x90, -+0x8B, 0x05, 0xE0, 0x60, 0x0F, 0xE4, 0xF0, 0x90, 0x05, 0x53, 0xE0, 0x44, 0x01, 0xF0, 0x90, 0x05, -+0xFD, 0xE0, 0x04, 0xF0, 0xE5, 0x36, 0x30, 0xE0, 0x75, 0x90, 0x01, 0x3E, 0x74, 0x01, 0xF0, 0x90, -+0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x18, 0x90, 0x8B, 0x36, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x64, -+0x03, 0x60, 0x0B, 0x7F, 0x01, 0xB1, 0xE0, 0xEF, 0x60, 0x04, 0x7F, 0x01, 0xD1, 0x89, 0x90, 0x8B, -+0x2C, 0xE0, 0x30, 0xE0, 0x49, 0x90, 0x8B, 0x30, 0xE4, 0xF0, 0xFF, 0xB1, 0xE0, 0xEF, 0x60, 0x3E, -+0x12, 0x65, 0x5F, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0x64, 0x06, 0x60, 0x32, 0xEF, 0xB4, 0x04, 0x02, -+0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, 0x80, 0x14, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x05, 0x7F, -+0x01, 0x12, 0x65, 0x82, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x12, 0x7D, 0xC1, 0xE5, 0x36, -+0x30, 0xE1, 0x47, 0x90, 0x01, 0x3E, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x19, -+0x90, 0x8B, 0x36, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x64, 0x03, 0x60, 0x0B, 0x7F, 0x01, -+0xB1, 0xE0, 0xEF, 0x70, 0x04, 0x7F, 0x02, 0xD1, 0x89, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x1A, -+0x90, 0x8B, 0x30, 0x74, 0x01, 0xF0, 0x12, 0x7E, 0x2B, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, -+0x09, 0xE4, 0xFF, 0xB1, 0xE0, 0xEF, 0x70, 0x02, 0xD1, 0x56, 0x74, 0x87, 0x04, 0x90, 0x01, 0xC4, -+0xF0, 0x74, 0x4B, 0xA3, 0xF0, 0xD0, 0x07, 0xD0, 0x06, 0xD0, 0x05, 0xD0, 0x04, 0xD0, 0x03, 0xD0, -+0x02, 0xD0, 0x01, 0xD0, 0x00, 0xD0, 0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0, 0xE0, 0x32, -+0xEF, 0x64, 0x01, 0x70, 0x3D, 0x90, 0x8B, 0x35, 0xE0, 0x60, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, -+0x08, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x34, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, -+0x90, 0x8B, 0x32, 0xE0, 0xFF, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x0B, 0xEF, 0xC4, 0x13, 0x54, -+0x07, 0x30, 0xE0, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x36, 0xE0, 0x7F, 0x01, 0x60, 0x36, 0x7F, -+0x00, 0x22, 0x90, 0x8B, 0x2F, 0xE0, 0x60, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x08, 0xE0, 0x60, -+0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x2E, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x2C, -+0xE0, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x30, 0xE0, 0x7F, -+0x01, 0x60, 0x02, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x0D, 0xE0, 0x60, 0x16, 0x90, 0x8B, 0x2D, 0xE0, -+0x70, 0x04, 0x7F, 0x05, 0x80, 0x1F, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x01, 0x70, 0x1A, 0x7F, 0x02, -+0x80, 0x13, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, 0x04, 0x7F, 0x03, 0x80, 0x08, 0x90, 0x8B, 0x2D, -+0xE0, 0x70, 0x05, 0x7F, 0x04, 0x12, 0x65, 0x82, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x8B, 0x33, 0xE0, 0x90, 0x8B, 0x55, 0xF0, 0x6F, 0x70, 0x02, 0xE1, 0x55, 0xEF, 0x14, 0x60, -+0x3B, 0x14, 0x60, 0x5F, 0x14, 0x70, 0x02, 0xE1, 0x30, 0x24, 0x03, 0x60, 0x02, 0xE1, 0x55, 0x90, -+0x8B, 0x55, 0xE0, 0xB4, 0x03, 0x04, 0xF1, 0xC2, 0xE1, 0x55, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x02, -+0x04, 0xF1, 0xAF, 0xE1, 0x55, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x04, 0x04, 0xF1, 0xC6, 0xE1, 0x55, -+0x90, 0x8B, 0x55, 0xE0, 0x64, 0x01, 0x70, 0x7D, 0xF1, 0xB1, 0x80, 0x79, 0x90, 0x8B, 0x55, 0xE0, -+0xFF, 0xB4, 0x03, 0x04, 0xF1, 0xCA, 0x80, 0x6D, 0xEF, 0xB4, 0x02, 0x04, 0xF1, 0xA1, 0x80, 0x65, -+0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x04, 0x04, 0xF1, 0xD5, 0x80, 0x59, 0xEF, 0x70, 0x56, 0xF1, -+0x8E, 0x80, 0x52, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x03, 0x05, 0x12, 0x7C, 0x41, 0x80, 0x46, 0x90, -+0x8B, 0x55, 0xE0, 0xB4, 0x01, 0x04, 0xF1, 0x72, 0x80, 0x3B, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x04, -+0x05, 0x12, 0x7D, 0x23, 0x80, 0x2F, 0x90, 0x8B, 0x55, 0xE0, 0x70, 0x29, 0xF1, 0x70, 0x80, 0x25, -+0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x01, 0x04, 0xF1, 0x5A, 0x80, 0x19, 0xEF, 0xB4, 0x02, 0x04, -+0xF1, 0x6B, 0x80, 0x11, 0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x04, 0x04, 0xF1, 0x5A, 0x80, 0x05, -+0xEF, 0x70, 0x02, 0xF1, 0x67, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x05, 0x22, 0x74, 0x6F, 0xF0, -+0x90, 0x8B, 0x33, 0x74, 0x03, 0xF0, 0x22, 0xF1, 0x8E, 0x80, 0xEF, 0x12, 0x7D, 0x42, 0x80, 0xEA, -+0xF1, 0x8E, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x7E, 0x9A, 0xEF, 0x70, 0x06, 0x90, 0x01, -+0xC8, 0x74, 0xFD, 0xF0, 0x12, 0x7C, 0x50, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x01, -+0x3E, 0x74, 0x03, 0xF0, 0xFD, 0x7F, 0x02, 0x12, 0x37, 0x00, 0x90, 0x8B, 0x33, 0x74, 0x01, 0xF0, -+0x22, 0x12, 0x7D, 0x42, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0x04, 0xF0, 0x22, 0xF1, -+0xA1, 0x7D, 0x03, 0x7F, 0x02, 0x12, 0x36, 0x92, 0x90, 0x05, 0x27, 0xE4, 0xF0, 0x90, 0x8B, 0x33, -+0xF0, 0x22, 0xF1, 0xCA, 0x80, 0xEB, 0xF1, 0xD5, 0x80, 0xE7, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, -+0x8B, 0x33, 0x04, 0xF0, 0x22, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0x04, 0xF0, 0x22, -+0xF1, 0x8E, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x33, 0x74, 0x04, 0xF0, 0x22, 0x90, -+0x02, 0x84, 0xEF, 0xF0, 0xA3, 0xEE, 0xF0, 0xA3, 0x74, 0x05, 0xF0, 0x22, 0xEF, 0x8E, 0xF0, 0x12, -+0x43, 0xBA, 0x50, 0x1A, 0x00, 0x40, 0x50, 0x42, 0x00, 0x80, 0x50, 0x6D, 0x01, 0x00, 0x50, 0x81, -+0x02, 0x00, 0x50, 0x99, 0x04, 0x00, 0x00, 0x00, 0x50, 0xB6, 0xED, 0x54, 0x3F, 0x70, 0x04, 0xFE, -+0xFF, 0x80, 0x04, 0x7E, 0x00, 0x7F, 0x40, 0xEF, 0x2D, 0xFF, 0xEE, 0x3C, 0xFE, 0xEF, 0x78, 0x06, -+0xCE, 0xC3, 0x13, 0xCE, 0x13, 0xD8, 0xF9, 0x78, 0x06, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, -+0x80, 0x26, 0xED, 0x54, 0x7F, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x00, 0x7F, 0x80, 0xEF, -+0x2D, 0xFF, 0xEE, 0x3C, 0xFE, 0xEF, 0x78, 0x07, 0xCE, 0xC3, 0x13, 0xCE, 0x13, 0xD8, 0xF9, 0x78, -+0x07, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFD, 0xAC, 0x06, 0x80, 0x49, 0xED, 0x70, 0x04, -+0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x01, 0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0x7D, 0x00, 0xFC, 0x80, -+0x35, 0xEC, 0x54, 0x01, 0x4D, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x02, 0x7F, 0x00, 0xEF, -+0x2D, 0xEE, 0x3C, 0xC3, 0x13, 0x7D, 0x00, 0x80, 0x1A, 0xEC, 0x54, 0x03, 0x4D, 0x70, 0x04, 0xFE, -+0xFF, 0x80, 0x04, 0x7E, 0x04, 0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0x13, 0x13, 0x54, 0x3F, 0x7D, -+0x00, 0x25, 0xE0, 0x25, 0xE0, 0xFC, 0xAE, 0x04, 0xAF, 0x05, 0x22, 0x90, 0x01, 0xE4, 0x74, 0x58, -+0xF0, 0xA3, 0x74, 0x02, 0xF0, 0x22, 0xE4, 0x90, 0x8A, 0xCC, 0xF0, 0xA3, 0xF0, 0x75, 0x8E, 0x02, -+0x91, 0x0E, 0x12, 0x68, 0x44, 0x90, 0x8B, 0x07, 0xEF, 0xF0, 0x12, 0x68, 0x51, 0x90, 0x8B, 0x09, -+0xEF, 0xF0, 0x12, 0x68, 0x5D, 0x90, 0x8A, 0xF4, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xE4, 0xF5, 0x55, -+0xF5, 0x21, 0x12, 0x72, 0x55, 0x12, 0x44, 0x9E, 0x12, 0x32, 0x3D, 0x7F, 0x03, 0x12, 0x78, 0x42, -+0x12, 0x7C, 0x3D, 0x12, 0x68, 0x0A, 0x12, 0x68, 0x75, 0x12, 0x68, 0x8A, 0x12, 0x68, 0x28, 0x12, -+0x68, 0x43, 0x90, 0x8A, 0xCE, 0xE5, 0xD9, 0xF0, 0x31, 0x5F, 0xC2, 0xAF, 0x90, 0x00, 0x80, 0xE0, -+0x44, 0x40, 0xF0, 0x51, 0x0E, 0x75, 0xE8, 0x03, 0x43, 0xA8, 0x85, 0xD2, 0xAF, 0x11, 0xBB, 0x90, -+0x8A, 0xCC, 0xE0, 0x64, 0x01, 0xF0, 0x24, 0xC6, 0x90, 0x01, 0xC4, 0xF0, 0x74, 0x50, 0xA3, 0xF0, -+0xE5, 0x55, 0x30, 0xE4, 0x09, 0xC2, 0xAF, 0x53, 0x55, 0xEF, 0xD2, 0xAF, 0xB1, 0x59, 0xE5, 0x55, -+0x30, 0xE6, 0xDC, 0xC2, 0xAF, 0x53, 0x55, 0xBF, 0xD2, 0xAF, 0x12, 0x6B, 0xBD, 0x80, 0xD0, 0x90, -+0x01, 0x3C, 0x74, 0xFF, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x01, 0x34, 0xF0, 0xA3, 0xF0, 0xA3, -+0xF0, 0xA3, 0xF0, 0xFD, 0x7F, 0x54, 0x31, 0x88, 0x7D, 0xFF, 0x7F, 0x55, 0x31, 0x88, 0x7D, 0xFF, -+0x7F, 0x56, 0x31, 0x88, 0x7D, 0xFF, 0x7F, 0x57, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, -+0x82, 0x75, 0x83, 0x00, 0xED, 0xF0, 0x51, 0x0E, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x01, 0x30, -+0xE4, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x01, 0x38, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, -+0xA3, 0xF0, 0xFD, 0x7F, 0x50, 0x31, 0x88, 0xE4, 0xFD, 0x7F, 0x51, 0x31, 0x88, 0xE4, 0xFD, 0x7F, -+0x52, 0x31, 0x88, 0xE4, 0xFD, 0x7F, 0x53, 0x80, 0xBF, 0xE5, 0x5E, 0x64, 0x01, 0x70, 0x3B, 0x71, -+0x4E, 0xBF, 0x01, 0x04, 0x7F, 0x01, 0x71, 0x42, 0x90, 0x00, 0x46, 0xE0, 0x44, 0x04, 0xFD, 0x7F, -+0x46, 0x31, 0x88, 0x90, 0x00, 0x44, 0xE0, 0x54, 0xFB, 0xFD, 0x7F, 0x44, 0x31, 0x88, 0x90, 0x00, -+0x46, 0xE0, 0x54, 0xFB, 0xFD, 0x7F, 0x46, 0x31, 0x88, 0x7F, 0x02, 0x71, 0x6A, 0x8F, 0x62, 0x90, -+0x01, 0xC9, 0xE5, 0x62, 0xF0, 0xB4, 0x01, 0x02, 0x51, 0xE2, 0x22, 0xE0, 0x5F, 0xF0, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x7F, 0x10, 0xDF, 0xFE, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xE0, 0xED, 0xF0, 0x90, 0x8A, 0xDF, 0xEF, 0xF0, 0xD3, -+0x94, 0x07, 0x50, 0x4E, 0xA3, 0xE0, 0x70, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, -+0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x47, 0xE0, 0x5F, 0xF0, -+0x80, 0x17, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, -+0xD8, 0xFC, 0xFF, 0x90, 0x00, 0x47, 0xE0, 0x4F, 0xF0, 0x51, 0x0E, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, -+0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x46, -+0x80, 0x59, 0x90, 0x8A, 0xDF, 0xE0, 0x24, 0xF8, 0xF0, 0xA3, 0xE0, 0x70, 0x1D, 0x90, 0x8A, 0xDF, -+0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xC4, 0x54, 0xF0, -+0xF4, 0xFF, 0x90, 0x00, 0x43, 0xE0, 0x5F, 0xF0, 0x80, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, -+0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xC4, 0x54, 0xF0, 0xFF, 0x90, 0x00, -+0x43, 0xE0, 0x4F, 0xF0, 0x51, 0x0E, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, -+0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0x51, 0x0B, 0xD0, 0xD0, 0x92, -+0xAF, 0x22, 0x90, 0x00, 0x49, 0xE0, 0x90, 0x8B, 0x54, 0xF0, 0xE0, 0x54, 0x0F, 0xF0, 0x44, 0xF0, -+0xFD, 0x7F, 0x49, 0x31, 0x88, 0x90, 0x8B, 0x54, 0xE0, 0x44, 0xB0, 0xFD, 0x7F, 0x49, 0x21, 0x88, -+0x90, 0x8A, 0xDD, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x75, 0x5E, 0x01, 0x8E, 0x5F, 0xF5, 0x60, 0xE4, -+0xFD, 0x7F, 0x0B, 0x51, 0x1E, 0xE4, 0xFD, 0x7F, 0x02, 0x51, 0x1E, 0x71, 0x4E, 0xE4, 0xFF, 0x71, -+0x42, 0xE4, 0xF5, 0x62, 0x90, 0x01, 0xC9, 0xE5, 0x62, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFC, 0xA3, -+0xE0, 0xFD, 0xEC, 0xFB, 0x8D, 0x44, 0xE4, 0xF5, 0x45, 0x7D, 0x01, 0x7F, 0x60, 0x7E, 0x01, 0x02, -+0x35, 0xAB, 0x90, 0x01, 0xCA, 0xE5, 0x61, 0xF0, 0xEF, 0x60, 0x02, 0x51, 0xE2, 0x22, 0x7F, 0x0B, -+0x71, 0x6A, 0xEF, 0x65, 0x61, 0x60, 0x10, 0xE5, 0x61, 0xB4, 0x01, 0x05, 0xE4, 0xF5, 0x61, 0x80, -+0x03, 0x75, 0x61, 0x01, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, -+0xD0, 0x90, 0x8B, 0x57, 0xEF, 0xF0, 0xD3, 0x94, 0x07, 0x50, 0x43, 0xE0, 0xFF, 0x74, 0x01, 0xA8, -+0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x46, 0x51, 0x0B, 0x90, -+0x8B, 0x57, 0xE0, 0xFD, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x05, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, -+0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x00, 0x44, 0xE0, 0xFB, 0xE4, 0xFE, 0xEF, 0x5B, 0xA8, 0x05, -+0x08, 0x80, 0x06, 0xCE, 0xA2, 0xE7, 0x13, 0xCE, 0x13, 0xD8, 0xF8, 0xFF, 0x80, 0x4B, 0x90, 0x8B, -+0x57, 0xE0, 0x24, 0xF8, 0xF0, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, -+0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0xE0, 0x5F, 0xF0, 0x51, 0x0E, 0x90, 0x8B, 0x57, 0xE0, -+0xFD, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x05, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0x90, 0x00, 0x42, 0xE0, 0xFB, 0xE4, 0xFE, 0xEF, 0x5B, 0xA8, 0x05, 0x08, 0x80, 0x06, -+0xCE, 0xA2, 0xE7, 0x13, 0xCE, 0x13, 0xD8, 0xF8, 0xFF, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE4, 0x90, -+0x8B, 0x04, 0xF0, 0x90, 0x00, 0x80, 0xE0, 0x44, 0x80, 0xFD, 0x7F, 0x80, 0x21, 0x88, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDA, 0x12, 0x43, -+0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0xFA, 0xE5, 0xF0, 0x24, 0x00, 0xFF, 0xE4, 0x3A, 0xFE, -+0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0xEE, 0x8F, 0xF0, 0x12, 0x43, 0x19, 0x12, -+0x29, 0xD9, 0xFF, 0x60, 0x2C, 0xB5, 0x5E, 0x16, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, -+0x01, 0x12, 0x42, 0xC2, 0x65, 0x60, 0x70, 0x04, 0xE5, 0x5F, 0x65, 0xF0, 0x60, 0x22, 0x90, 0x8A, -+0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0xFF, 0xAE, 0xF0, 0x71, 0x00, 0x80, -+0x0F, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0x65, 0x5E, 0x60, 0x02, 0x91, 0x95, -+0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE4, 0xF5, 0x5E, 0x7F, 0x60, 0x7E, 0x01, 0x8F, 0x82, 0x8E, 0x83, -+0xA3, 0xA3, 0xA3, 0xE4, 0xF0, 0x22, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x8B, 0xEF, 0x12, 0x43, 0x94, -+0x54, 0xE7, 0x01, 0x54, 0xDE, 0x02, 0x55, 0x0B, 0x03, 0x55, 0x14, 0x05, 0x55, 0x1D, 0x06, 0x55, -+0x58, 0x07, 0x55, 0x25, 0x08, 0x55, 0x2E, 0x09, 0x55, 0x36, 0x20, 0x55, 0x3F, 0x2C, 0x54, 0xF0, -+0x2D, 0x54, 0xF9, 0x2E, 0x55, 0x02, 0x3B, 0x55, 0x48, 0x4B, 0x00, 0x00, 0x55, 0x51, 0x90, 0x8A, -+0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0x85, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0x8B, -+0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0xB8, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, -+0x75, 0x00, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x75, 0x39, 0x90, 0x8A, 0xD7, 0x12, 0x43, -+0x6B, 0x02, 0x75, 0x52, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0x0F, 0x90, 0x8A, 0xD7, -+0x12, 0x43, 0x6B, 0xC1, 0xA6, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x75, 0x9A, 0x90, 0x8A, -+0xD7, 0x12, 0x43, 0x6B, 0x81, 0x1E, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x78, 0x81, 0x90, -+0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x7A, 0xC2, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x7C, -+0x2B, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x01, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x01, 0xCC, 0xE0, 0x54, 0x0F, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFD, 0x70, -+0x02, 0xC1, 0xA1, 0x90, 0x8B, 0x51, 0xE0, 0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, -+0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xEF, 0x5D, 0x70, 0x02, 0xC1, 0x9A, 0x90, -+0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD0, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD0, -+0xF0, 0x75, 0x1D, 0x01, 0x75, 0x1E, 0x8A, 0x75, 0x1F, 0xD0, 0x75, 0x20, 0x01, 0x7B, 0x01, 0x7A, -+0x8A, 0x79, 0xD1, 0x12, 0x5E, 0xE4, 0x90, 0x8A, 0xD1, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x13, 0x54, -+0x01, 0x90, 0x8B, 0x51, 0x30, 0xE0, 0x59, 0xE0, 0x75, 0xF0, 0x02, 0x90, 0x00, 0x88, 0x12, 0x43, -+0x5F, 0xE0, 0x90, 0x8A, 0xD2, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x02, 0x90, 0x00, 0x89, -+0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD3, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, -+0x01, 0xD1, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD4, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, -+0x04, 0x90, 0x01, 0xD2, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD5, 0xF0, 0x90, 0x8B, 0x51, 0xE0, -+0x75, 0xF0, 0x04, 0x90, 0x01, 0xD3, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD6, 0xF0, 0x80, 0x33, -+0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD1, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD2, 0xF0, 0x90, -+0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD2, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD3, -+0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD3, 0x12, 0x43, 0x5F, 0xE0, 0x90, -+0x8A, 0xD4, 0xF0, 0xEF, 0x54, 0x7F, 0xFF, 0x7B, 0x01, 0x7A, 0x8A, 0x79, 0xD2, 0x91, 0xA6, 0x90, -+0x8A, 0xCF, 0xE0, 0xFF, 0x90, 0x8B, 0x51, 0xE0, 0xFE, 0x74, 0x01, 0xA8, 0x06, 0x08, 0x80, 0x02, -+0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0x5F, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0xFF, 0x74, -+0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0x90, 0x01, 0xCC, 0xF0, 0x90, 0x8B, -+0x51, 0xE0, 0x04, 0xF0, 0xE0, 0x54, 0x03, 0xF0, 0xA1, 0x6A, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x02, -+0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x00, 0x04, 0x12, 0x42, 0x20, 0xFF, 0x54, 0x1F, 0xFE, -+0xEF, 0x54, 0x20, 0xC4, 0x13, 0x54, 0x07, 0xFD, 0xAF, 0x06, 0x90, 0x8A, 0xDA, 0xEF, 0xF0, 0xA3, -+0xED, 0xF0, 0xA3, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x03, 0x12, -+0x42, 0x20, 0x54, 0xF0, 0xC4, 0x54, 0x0F, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x00, 0x04, 0x12, 0x42, -+0x20, 0x54, 0x40, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x90, 0x8A, 0xE0, 0xF0, 0x90, 0x8A, 0xDA, 0xE0, -+0xFF, 0x75, 0xF0, 0x09, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0xAD, 0x82, 0xAC, 0x83, 0x90, 0x8A, -+0xE1, 0xEC, 0xF0, 0xA3, 0xED, 0xF0, 0xEF, 0x75, 0xF0, 0x09, 0xA4, 0x24, 0x23, 0xF9, 0x74, 0x87, -+0x35, 0xF0, 0xFA, 0x7B, 0x01, 0xA3, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, -+0x00, 0x03, 0x12, 0x42, 0x20, 0x54, 0x0F, 0xFF, 0x90, 0x8A, 0xE3, 0x12, 0x43, 0x6B, 0xEF, 0x12, -+0x42, 0x4D, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x90, -+0x8A, 0xE3, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0xEF, 0x12, 0x42, 0x5F, 0x90, 0x8A, 0xDC, 0x12, -+0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0x90, 0x8A, 0xE1, 0xE0, 0xFC, 0xA3, 0xE0, -+0xFD, 0xF5, 0x82, 0x8C, 0x83, 0xEF, 0xF0, 0x12, 0x29, 0xD9, 0x8D, 0x82, 0x8C, 0x83, 0xA3, 0xF0, -+0x90, 0x8A, 0xDF, 0xE0, 0xFE, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0x24, 0xC1, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xDB, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, -+0x29, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2A, 0x12, 0x43, 0x5F, -+0x74, 0x01, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2B, 0x12, -+0x43, 0x5F, 0xEE, 0xF0, 0x8F, 0x0F, 0xEF, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, -+0xAF, 0x82, 0xF5, 0x10, 0x8F, 0x11, 0xE5, 0x0F, 0x75, 0xF0, 0x02, 0xA4, 0x24, 0x81, 0xF9, 0x74, -+0x86, 0x35, 0xF0, 0x75, 0x12, 0x01, 0xF5, 0x13, 0x89, 0x14, 0x75, 0xF0, 0x09, 0xE5, 0x0F, 0x90, -+0x87, 0x25, 0x12, 0x43, 0x5F, 0xAF, 0x82, 0x85, 0x83, 0x15, 0x8F, 0x16, 0xE5, 0x0F, 0x75, 0xF0, -+0x09, 0xA4, 0x24, 0x23, 0xF9, 0x74, 0x87, 0x35, 0xF0, 0x75, 0x17, 0x01, 0xF5, 0x18, 0x89, 0x19, -+0x74, 0xC1, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x12, 0x43, 0x94, 0x58, -+0x34, 0x00, 0x58, 0x49, 0x01, 0x58, 0x5E, 0x02, 0x58, 0x73, 0x03, 0x58, 0x9C, 0x04, 0x58, 0xB1, -+0x05, 0x58, 0xC6, 0x06, 0x58, 0xEC, 0x0C, 0x59, 0x19, 0x0D, 0x59, 0x46, 0x0E, 0x59, 0x73, 0x0F, -+0x00, 0x00, 0x59, 0xA7, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, 0x15, 0x80, 0x3C, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, 0x10, 0x80, 0x27, 0xE5, 0x0F, -+0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, -+0x05, 0x80, 0x12, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0x74, 0xF0, 0xF0, 0xA3, 0xE4, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0x74, 0x0F, 0xF0, 0xA3, 0x74, 0x8F, 0xF0, 0x21, 0xA7, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0x0F, 0xF0, 0xA3, 0x74, 0xF5, 0x80, -+0x27, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0x0F, -+0xF0, 0xA3, 0x74, 0xF0, 0x80, 0x12, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0x74, 0x0D, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, -+0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x21, 0xA7, 0x90, 0x04, 0x47, 0xE0, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x46, 0xE0, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x45, 0xE0, 0x85, 0x11, 0x82, -+0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, 0x44, 0x21, 0x9E, 0x90, 0x04, 0x4B, 0xE0, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x4A, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x49, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, -+0xF0, 0x90, 0x04, 0x48, 0x80, 0x58, 0x90, 0x04, 0x4F, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0x12, 0x42, 0x4D, 0x90, 0x04, 0x4E, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, -+0x12, 0x42, 0x5F, 0x90, 0x04, 0x4D, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, -+0x4C, 0x80, 0x2B, 0x90, 0x04, 0x53, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, -+0x90, 0x04, 0x52, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, -+0x90, 0x04, 0x51, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, 0x50, 0xE0, 0x85, -+0x11, 0x82, 0x85, 0x10, 0x83, 0xA3, 0xF0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0xC0, 0x03, 0xC0, -+0x02, 0xC0, 0x01, 0x12, 0x29, 0xD9, 0xFF, 0xAB, 0x17, 0xAA, 0x18, 0xA9, 0x19, 0x12, 0x29, 0xD9, -+0x5F, 0xD0, 0x01, 0xD0, 0x02, 0xD0, 0x03, 0x12, 0x42, 0x4D, 0xAB, 0x12, 0xE5, 0x14, 0x24, 0x01, -+0xF9, 0xE4, 0x35, 0x13, 0xFA, 0xC0, 0x03, 0xC0, 0x02, 0xC0, 0x01, 0x12, 0x29, 0xD9, 0xFF, 0xAB, -+0x17, 0xAA, 0x18, 0xA9, 0x19, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x5F, 0xD0, 0x01, 0xD0, 0x02, -+0xD0, 0x03, 0x12, 0x42, 0x4D, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xC0, 0x83, 0xC0, 0x82, 0xE0, -+0xFF, 0x85, 0x16, 0x82, 0x85, 0x15, 0x83, 0xE0, 0xFE, 0xEF, 0x5E, 0xD0, 0x82, 0xD0, 0x83, 0xF0, -+0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xA3, 0xC0, 0x83, 0xC0, 0x82, 0xE0, 0xFF, 0x85, 0x16, 0x82, -+0x85, 0x15, 0x83, 0xA3, 0xE0, 0xFE, 0xEF, 0x5E, 0xD0, 0x82, 0xD0, 0x83, 0xF0, 0xE5, 0x0F, 0x25, -+0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, -+0x4B, 0x90, 0x8A, 0xE6, 0x74, 0x0B, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x00, 0x50, -+0x02, 0x41, 0xEC, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, -+0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, -+0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x0A, 0x90, 0x8A, 0xE6, 0xE0, 0x24, 0x10, -+0xA3, 0xF0, 0x80, 0x68, 0x90, 0x8A, 0xE6, 0xE0, 0x14, 0xF0, 0x80, 0xBB, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x47, -+0x90, 0x8A, 0xE6, 0x74, 0x0F, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x00, 0x40, 0x3C, -+0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, -+0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0x5E, -+0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x08, 0x90, 0x8A, 0xE6, 0xE0, 0xA3, 0xF0, 0x80, 0x0D, 0x90, -+0x8A, 0xE6, 0xE0, 0x14, 0xF0, 0x80, 0xBF, 0xE4, 0x90, 0x8A, 0xE7, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x46, -+0xE4, 0x90, 0x8A, 0xE6, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x40, 0x02, 0x61, -+0xA5, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, -+0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x06, 0x90, 0x8A, 0xE6, 0xE0, 0x80, 0x63, 0x90, 0x8A, -+0xE6, 0xE0, 0x04, 0xF0, 0x80, 0xBF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x46, 0xE4, 0x90, 0x8A, 0xE6, 0xF0, 0x90, -+0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x0C, 0x50, 0x3C, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, -+0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, -+0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x08, -+0x90, 0x8A, 0xE6, 0xE0, 0x24, 0x10, 0x80, 0x09, 0x90, 0x8A, 0xE6, 0xE0, 0x04, 0xF0, 0x80, 0xBF, -+0xE4, 0x90, 0x8A, 0xE8, 0xF0, 0x90, 0x8A, 0xE7, 0xE0, 0xFF, 0x75, 0xF0, 0x09, 0xE5, 0x0F, 0x90, -+0x87, 0x27, 0x12, 0x43, 0x5F, 0xEF, 0xF0, 0x90, 0x8A, 0xE8, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xE5, -+0x0F, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0xE5, 0x0F, 0xC3, 0x94, 0x20, 0x50, 0x32, -+0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0xD3, 0x9F, 0x40, 0x02, -+0x80, 0x18, 0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0xC3, 0x9E, -+0x50, 0x08, 0x90, 0x8A, 0xE8, 0xE0, 0xA3, 0xF0, 0x80, 0x08, 0x90, 0x8A, 0xE7, 0xE0, 0x90, 0x8A, -+0xE9, 0xF0, 0x90, 0x8A, 0xE9, 0xE0, 0xFD, 0xAF, 0x0F, 0x91, 0x4E, 0x90, 0x8A, 0xE9, 0xE0, 0xFF, -+0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, 0x90, 0x8A, 0xE7, -+0xE0, 0xFF, 0xD3, 0x94, 0x13, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x03, 0xF0, 0x22, 0xEF, 0xD3, -+0x94, 0x0B, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x02, 0xF0, 0x22, 0xEF, 0xD3, 0x94, 0x03, 0x40, -+0x07, 0x90, 0x87, 0x22, 0x74, 0x01, 0xF0, 0x22, 0xE4, 0x90, 0x87, 0x22, 0xF0, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x74, 0x84, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xED, -+0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xAC, 0x07, 0xED, 0x54, 0x1F, 0x90, 0x8A, 0xC7, 0xF0, 0x74, -+0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xC5, 0xF0, 0x90, 0x8A, -+0xC8, 0x74, 0x01, 0xF0, 0xEB, 0xC3, 0x94, 0x01, 0x40, 0x02, 0x80, 0x37, 0x90, 0x8A, 0xC5, 0xE0, -+0x25, 0x0D, 0xFF, 0xA3, 0xF0, 0xA3, 0xE0, 0x90, 0x41, 0x9E, 0x93, 0xFE, 0xEF, 0xD3, 0x9E, 0x40, -+0x10, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xAF, 0x04, 0x80, -+0x9D, 0x90, 0x8A, 0xC6, 0xE0, 0xFF, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEF, 0xF0, 0x22, 0xAD, 0x07, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, -+0xFF, 0x90, 0x8A, 0xCA, 0xF0, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, -+0x54, 0x1F, 0x90, 0x8A, 0xC9, 0xF0, 0xD3, 0x9F, 0x40, 0x06, 0xA3, 0xE0, 0x90, 0x8A, 0xC9, 0xF0, -+0x90, 0x8A, 0xC9, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, -+0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, 0xFE, 0xEF, 0x13, -+0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, -+0xEF, 0xF0, 0xAF, 0x05, 0x90, 0x8A, 0xC9, 0xE0, 0xFD, 0x91, 0x4E, 0x90, 0x8A, 0xC9, 0xE0, 0xFF, -+0x22, 0xAC, 0x07, 0x74, 0x84, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x7F, -+0x90, 0x8A, 0xDE, 0xF0, 0xE0, 0x54, 0x1F, 0xFF, 0x90, 0x8A, 0xE1, 0xF0, 0x75, 0xF0, 0x09, 0xEC, -+0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xE3, 0xF0, 0x75, 0xF0, 0x09, 0xEC, 0x90, -+0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0xFE, 0x90, 0x8A, 0xE4, 0xF0, 0xEC, 0x25, 0xE0, 0x24, 0xE4, -+0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE5, 0xCB, 0xF0, -+0xA3, 0xEB, 0xF0, 0xEC, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, -+0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE7, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xEF, 0xD3, 0x9E, 0x40, 0x0C, -+0x90, 0x8A, 0xE4, 0xE0, 0x90, 0x8A, 0xE1, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0xED, 0x70, 0x02, 0xC1, -+0x93, 0x90, 0x8A, 0xE2, 0xED, 0xF0, 0x90, 0x8A, 0xDE, 0xE0, 0x30, 0xE6, 0x0E, 0x90, 0x8A, 0xE1, -+0xE0, 0x90, 0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0x14, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0x70, -+0x02, 0xC1, 0x93, 0x90, 0x8A, 0xE1, 0xE0, 0xFF, 0xD3, 0x94, 0x00, 0x50, 0x02, 0xC1, 0x93, 0xE4, -+0x90, 0x8A, 0xE0, 0xF0, 0xEF, 0x14, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x8A, 0xE3, 0xE0, 0xFD, 0x90, -+0x8A, 0xDF, 0xE0, 0xFF, 0xD3, 0x9D, 0x40, 0x6F, 0xEF, 0x94, 0x10, 0x40, 0x21, 0xEF, 0x24, 0xF0, -+0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0x90, 0x8A, 0xE7, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x70, 0x27, 0x90, 0x8A, -+0xDF, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x50, 0x37, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, -+0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE5, 0xE0, 0x5E, 0xFE, 0xA3, -+0xE0, 0x5F, 0x4E, 0x60, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0x90, 0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xE0, -+0xE0, 0x04, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, 0x6F, 0x60, 0x08, 0x90, -+0x8A, 0xDF, 0xE0, 0x14, 0xF0, 0x80, 0x83, 0x90, 0x8A, 0xE2, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, -+0xC3, 0x9F, 0x50, 0x0F, 0x90, 0x8A, 0xDF, 0xE0, 0xB5, 0x05, 0x08, 0x90, 0x8A, 0xE3, 0xE0, 0x90, -+0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xDE, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, -+0xFE, 0xEF, 0x13, 0xFF, 0xEC, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xAF, 0x04, 0x90, 0x8A, 0xDE, 0xE0, 0xFD, 0x91, 0x4E, 0x90, 0x8A, -+0xDE, 0xE0, 0xFF, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8B, 0x1A, 0x8A, 0x1B, 0x89, -+0x1C, 0x90, 0x8B, 0x3F, 0x12, 0x43, 0x8B, 0xAB, 0x1D, 0xAA, 0x1E, 0xA9, 0x1F, 0x90, 0x8B, 0x42, -+0x12, 0x43, 0x8B, 0xAF, 0x20, 0x15, 0x20, 0xEF, 0x60, 0x1E, 0x90, 0x8B, 0x42, 0xE4, 0x75, 0xF0, -+0x01, 0x12, 0x43, 0x74, 0x12, 0x29, 0xD9, 0xFF, 0x90, 0x8B, 0x3F, 0xE4, 0x75, 0xF0, 0x01, 0x12, -+0x43, 0x74, 0xEF, 0x12, 0x42, 0x4D, 0x80, 0xDB, 0xAB, 0x1A, 0xAA, 0x1B, 0xA9, 0x1C, 0xD0, 0xD0, -+0x92, 0xAF, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x8B, -+0x90, 0x8B, 0x53, 0xE0, 0xFF, 0x04, 0xF0, 0x90, 0x00, 0x01, 0xEF, 0x12, 0x42, 0x5F, 0x7F, 0xAF, -+0x7E, 0x01, 0x12, 0x74, 0x3B, 0xEF, 0x60, 0x47, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x6B, 0x8B, 0x1D, -+0x8A, 0x1E, 0x89, 0x1F, 0x75, 0x20, 0x02, 0x7B, 0x01, 0x7A, 0x01, 0x79, 0xA0, 0xD1, 0xE4, 0x90, -+0x8B, 0x48, 0x12, 0x43, 0x6B, 0x8B, 0x1D, 0x8A, 0x1E, 0x89, 0x1F, 0x90, 0x8B, 0x45, 0x12, 0x43, -+0x6B, 0x12, 0x29, 0xD9, 0xFF, 0xC4, 0x54, 0x0F, 0xF5, 0x20, 0x7B, 0x01, 0x7A, 0x01, 0x79, 0xA2, -+0xD1, 0xE4, 0x90, 0x01, 0xAF, 0x74, 0xFF, 0xF0, 0x90, 0x01, 0xCB, 0xE0, 0x64, 0x80, 0xF0, 0xD0, -+0xD0, 0x92, 0xAF, 0x22, 0x90, 0x8A, 0xC5, 0xE0, 0x54, 0xF0, 0x44, 0x03, 0xF0, 0x54, 0x0F, 0x44, -+0x80, 0xF0, 0x7B, 0x00, 0x7A, 0x00, 0x79, 0x56, 0x90, 0x8B, 0x48, 0x12, 0x43, 0x8B, 0x0B, 0x7A, -+0x8A, 0x79, 0xC5, 0xE1, 0x33, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x01, 0xC4, 0x74, -+0xC5, 0xF0, 0x74, 0x5F, 0xA3, 0xF0, 0x90, 0x04, 0x1D, 0xE0, 0x60, 0x1A, 0x90, 0x05, 0x22, 0xE0, -+0x54, 0x90, 0x60, 0x07, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x40, 0xF0, 0x90, 0x01, 0xC7, 0xE0, 0x30, -+0xE1, 0xE4, 0x7F, 0x00, 0x80, 0x02, 0x7F, 0x01, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, 0xAF, -+0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0xFB, 0xFA, 0xEF, 0x30, 0xE0, 0x02, 0x7B, 0x80, 0xEF, 0xC3, 0x13, -+0x90, 0xFD, 0x10, 0xF0, 0x90, 0x04, 0x25, 0xEF, 0xF0, 0xED, 0x60, 0x1E, 0xAF, 0x03, 0x74, 0x0F, -+0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0x74, 0x10, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0xAF, 0x03, 0x74, 0x08, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x09, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, -+0xF5, 0x83, 0xE0, 0x54, 0xF0, 0xF0, 0x74, 0x21, 0x2B, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, -+0xE0, 0x54, 0xF7, 0xF0, 0xAE, 0x02, 0xAF, 0x03, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x5F, 0xC5, -+0xBF, 0x01, 0x10, 0x90, 0x02, 0x09, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xFD, 0x90, 0x04, 0x1F, -+0x74, 0x20, 0xF0, 0x22, 0x90, 0x01, 0x02, 0xE0, 0x54, 0x03, 0xFF, 0xE0, 0x54, 0x0C, 0x13, 0x13, -+0x54, 0x3F, 0xFE, 0xEF, 0x64, 0x01, 0x60, 0x04, 0xEF, 0xB4, 0x03, 0x0E, 0x90, 0x8A, 0xC5, 0x74, -+0x01, 0xF0, 0xA3, 0x74, 0x37, 0xF0, 0x79, 0x01, 0x80, 0x18, 0xEE, 0x64, 0x01, 0x60, 0x07, 0xAF, -+0x06, 0xEE, 0x64, 0x03, 0x70, 0x3B, 0x90, 0x8A, 0xC5, 0x74, 0x01, 0xF0, 0xA3, 0x74, 0x3D, 0xF0, -+0x79, 0x40, 0x90, 0x8A, 0xC5, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xF5, 0x82, 0x8E, 0x83, 0xE0, 0x59, -+0x60, 0x08, 0xE9, 0xF0, 0xE4, 0x90, 0x8A, 0xF6, 0xF0, 0x22, 0x90, 0x8A, 0xF6, 0xE0, 0x04, 0xF0, -+0xE0, 0xC3, 0x94, 0x0A, 0x40, 0x0B, 0xE4, 0xF0, 0x90, 0x04, 0x19, 0xE0, 0x30, 0xE0, 0x02, 0x11, -+0x6D, 0x22, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, 0xD0, 0x75, 0xD0, 0x00, 0xC0, -+0x00, 0xC0, 0x01, 0xC0, 0x02, 0xC0, 0x03, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, -+0x01, 0xC4, 0x74, 0xF2, 0xF0, 0x74, 0x60, 0xA3, 0xF0, 0x90, 0x01, 0x34, 0xE0, 0x55, 0x28, 0xF5, -+0x2C, 0xA3, 0xE0, 0x55, 0x29, 0xF5, 0x2D, 0xA3, 0xE0, 0x55, 0x2A, 0xF5, 0x2E, 0xA3, 0xE0, 0x55, -+0x2B, 0xF5, 0x2F, 0xE5, 0x2C, 0x20, 0xE0, 0x02, 0x41, 0x89, 0x90, 0x01, 0x34, 0x74, 0x01, 0xF0, -+0x85, 0xD1, 0x4D, 0x85, 0xD2, 0x4E, 0x85, 0xD3, 0x4F, 0x85, 0xD4, 0x50, 0x85, 0xD5, 0x51, 0x85, -+0xD6, 0x52, 0x85, 0xD7, 0x53, 0x85, 0xD9, 0x54, 0xE5, 0x54, 0x54, 0x40, 0xC3, 0x13, 0xFF, 0xE5, -+0x53, 0x54, 0x20, 0x6F, 0x70, 0x02, 0x41, 0x46, 0xE5, 0x54, 0x30, 0xE5, 0x02, 0x41, 0x46, 0xE5, -+0x52, 0x54, 0x1F, 0xF5, 0x08, 0xE5, 0x4D, 0x54, 0x3F, 0xF5, 0x09, 0xE5, 0x51, 0x54, 0x1F, 0xFF, -+0xE5, 0x08, 0x25, 0xE0, 0x24, 0xE3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, -+0x12, 0x42, 0x81, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, -+0xE4, 0x34, 0x85, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, 0x09, 0xD3, 0x94, 0x04, -+0x40, 0x03, 0x75, 0x09, 0x04, 0x75, 0xF0, 0x0A, 0xE5, 0x08, 0x90, 0x84, 0x00, 0x12, 0x43, 0x5F, -+0x75, 0xF0, 0x02, 0xE5, 0x09, 0x12, 0x43, 0x5F, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xE5, 0x53, 0x54, -+0x1F, 0x2F, 0xFF, 0xE4, 0x3E, 0xFE, 0x75, 0xF0, 0x0A, 0xE5, 0x08, 0x90, 0x84, 0x00, 0x12, 0x43, -+0x5F, 0x75, 0xF0, 0x02, 0xE5, 0x09, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xE5, 0x54, -+0x20, 0xE6, 0x24, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, -+0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, 0x4F, 0x30, 0xE7, 0x36, -+0xAF, 0x08, 0x12, 0x5C, 0xC3, 0x80, 0x2F, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, -+0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, -+0x4F, 0x30, 0xE7, 0x12, 0xE5, 0x4F, 0x54, 0x7F, 0xFD, 0xE5, 0x53, 0x54, 0x1F, 0xF5, 0x0D, 0xAB, -+0x09, 0xAF, 0x08, 0x12, 0x5C, 0x66, 0xE5, 0x24, 0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x3A, 0x90, -+0x8B, 0x1A, 0xE0, 0x60, 0x2B, 0x90, 0x01, 0x5B, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, -+0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x21, 0x90, 0x8B, 0x3D, 0x12, 0x4B, 0x5C, 0x90, 0x01, -+0x5B, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x18, 0xF0, 0x80, 0x09, -+0x12, 0x4B, 0x34, 0xBF, 0x01, 0x03, 0x12, 0x4A, 0xFC, 0xE5, 0x2C, 0x30, 0xE1, 0x21, 0x90, 0x01, -+0x34, 0x74, 0x02, 0xF0, 0x85, 0xD1, 0x56, 0x85, 0xD2, 0x57, 0x85, 0xD3, 0x58, 0x85, 0xD4, 0x59, -+0x85, 0xD5, 0x5A, 0x85, 0xD6, 0x5B, 0x85, 0xD7, 0x5C, 0x85, 0xD9, 0x5D, 0x12, 0x5F, 0xA4, 0xE5, -+0x2C, 0x30, 0xE3, 0x06, 0x90, 0x01, 0x34, 0x74, 0x08, 0xF0, 0xE5, 0x2C, 0x30, 0xE4, 0x09, 0x90, -+0x01, 0x34, 0x74, 0x10, 0xF0, 0x43, 0x55, 0x10, 0xE5, 0x2C, 0x30, 0xE5, 0x26, 0x90, 0x01, 0xCF, -+0xE0, 0x30, 0xE5, 0x1F, 0xE0, 0x54, 0xDF, 0xF0, 0x90, 0x01, 0x34, 0x74, 0x20, 0xF0, 0x75, 0xA8, -+0x00, 0x75, 0xE8, 0x00, 0x12, 0x51, 0x9D, 0x90, 0x00, 0x03, 0xE0, 0x54, 0xFB, 0xF0, 0x12, 0x52, -+0x0E, 0x80, 0xFE, 0xE5, 0x2C, 0x30, 0xE6, 0x2D, 0x90, 0x01, 0x34, 0x74, 0x40, 0xF0, 0x90, 0x8B, -+0x32, 0xE0, 0x30, 0xE0, 0x0C, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x05, 0x90, 0x8B, 0x34, 0xE4, -+0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x0C, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x05, -+0x90, 0x8B, 0x2E, 0xE4, 0xF0, 0xE5, 0x2E, 0x20, 0xE0, 0x02, 0x61, 0xE6, 0x90, 0x8B, 0x08, 0x74, -+0x01, 0xF0, 0x90, 0x01, 0x36, 0xF0, 0x90, 0x8B, 0x06, 0xE0, 0x60, 0x0F, 0xE4, 0xF0, 0x90, 0x05, -+0x53, 0xE0, 0x44, 0x02, 0xF0, 0x90, 0x05, 0xFC, 0xE0, 0x04, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, -+0xE0, 0x2F, 0x90, 0x8B, 0x37, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xFF, 0x13, 0x13, 0x54, -+0x3F, 0x30, 0xE0, 0x1D, 0x90, 0x8B, 0x34, 0x74, 0x01, 0xF0, 0xB1, 0x39, 0x90, 0x8B, 0x33, 0xE0, -+0x64, 0x03, 0x60, 0x0D, 0x7F, 0x01, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x05, 0x7F, 0x04, 0x12, 0x4E, -+0x89, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x55, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x4E, -+0x90, 0x8B, 0x2E, 0x74, 0x01, 0xF0, 0xB1, 0x39, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x3E, -+0xB1, 0x5F, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0x64, 0x06, 0x60, -+0x2D, 0xEF, 0xB4, 0x04, 0x02, 0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, -+0x80, 0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x02, 0x04, 0x7F, 0x01, 0xB1, 0x82, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x43, -+0xE7, 0x90, 0x8B, 0x08, 0xE4, 0xF0, 0xE5, 0x2E, 0x30, 0xE1, 0x2F, 0x90, 0x01, 0x36, 0x74, 0x02, -+0xF0, 0x43, 0x55, 0x40, 0x11, 0x84, 0x90, 0x8B, 0x37, 0xE0, 0xB4, 0x01, 0x09, 0x90, 0x05, 0x22, -+0xE4, 0xF0, 0x90, 0x8B, 0x37, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x0D, 0xE4, 0xFF, 0x12, -+0x4D, 0xE0, 0xEF, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0xE5, 0x2E, 0x30, 0xE2, 0x16, 0x90, -+0x01, 0x36, 0x74, 0x04, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x06, 0xA3, 0xE0, 0x64, 0x06, -+0x60, 0x03, 0x12, 0x46, 0xB3, 0xE5, 0x2E, 0x30, 0xE3, 0x38, 0x90, 0x01, 0x36, 0x74, 0x08, 0xF0, -+0xE5, 0x21, 0x64, 0x01, 0x70, 0x2C, 0xE5, 0x24, 0x60, 0x28, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, -+0x01, 0x3C, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x3D, 0xE4, 0xF0, 0x90, 0x8B, 0x11, 0xE0, 0x90, 0x8B, -+0x3E, 0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, -+0x05, 0xF0, 0xE5, 0x2E, 0x30, 0xE4, 0x2B, 0x90, 0x01, 0x36, 0x74, 0x10, 0xF0, 0xE5, 0x21, 0xB4, -+0x01, 0x20, 0xE5, 0x24, 0x60, 0x1C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, -+0xF0, 0x90, 0x8B, 0x1B, 0xE4, 0xF0, 0x53, 0x25, 0xFD, 0xE5, 0x25, 0x54, 0x07, 0x70, 0x03, 0x12, -+0x4A, 0xFC, 0xE5, 0x2E, 0x30, 0xE5, 0x1F, 0x90, 0x01, 0x36, 0x74, 0x20, 0xF0, 0xE5, 0x21, 0xB4, -+0x01, 0x14, 0xE5, 0x24, 0x60, 0x10, 0x90, 0x8B, 0x1A, 0xE0, 0x64, 0x02, 0x60, 0x05, 0x12, 0x4A, -+0x97, 0x80, 0x03, 0x12, 0x49, 0x49, 0xE5, 0x2E, 0x30, 0xE6, 0x1B, 0x90, 0x01, 0x36, 0x74, 0x40, -+0xF0, 0xE5, 0x21, 0xB4, 0x01, 0x10, 0xE5, 0x24, 0x60, 0x0C, 0x53, 0x25, 0xFE, 0xE5, 0x25, 0x54, -+0x07, 0x70, 0x03, 0x12, 0x4A, 0xFC, 0xE5, 0x2F, 0x30, 0xE1, 0x28, 0x90, 0x01, 0x37, 0x74, 0x02, -+0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x18, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x08, -+0x12, 0x48, 0xFE, 0x12, 0x7D, 0xC1, 0x80, 0x0B, 0x90, 0x8B, 0x31, 0x74, 0x01, 0xF0, 0x80, 0x03, -+0x12, 0x48, 0xFE, 0x74, 0xF2, 0x04, 0x90, 0x01, 0xC4, 0xF0, 0x74, 0x60, 0xA3, 0xF0, 0xD0, 0x07, -+0xD0, 0x06, 0xD0, 0x05, 0xD0, 0x04, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, 0xD0, 0x00, 0xD0, 0xD0, -+0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0, 0xE0, 0x32, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x05, -+0x58, 0xE0, 0xFF, 0x90, 0x8B, 0x38, 0xE0, 0x2F, 0x24, 0xFE, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, -+0xFD, 0x7F, 0x50, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x53, 0x74, 0x05, 0xF0, 0x22, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x0A, 0xA3, 0xE0, 0x64, 0x06, -+0x60, 0x04, 0x7F, 0x06, 0xB1, 0x82, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x03, 0x12, 0x78, -+0x35, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0x6F, 0x70, -+0x02, 0xE1, 0x4E, 0xEF, 0x12, 0x43, 0x94, 0x65, 0xB0, 0x00, 0x65, 0xEA, 0x01, 0x66, 0x30, 0x02, -+0x66, 0x6A, 0x03, 0x66, 0xA2, 0x04, 0x66, 0xDB, 0x05, 0x67, 0x16, 0x06, 0x00, 0x00, 0x67, 0x4E, -+0xEE, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xF1, 0x81, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0xB4, -+0x05, 0x04, 0xF1, 0x5D, 0xE1, 0x4E, 0xEF, 0xB4, 0x06, 0x06, 0x7F, 0x01, 0xF1, 0x72, 0x80, 0x16, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, 0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0xF1, 0xA4, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, -+0x06, 0x7F, 0x01, 0xF1, 0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, -+0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xF1, 0x9A, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, -+0x06, 0x06, 0x7F, 0x01, 0xF1, 0x72, 0xE1, 0x4E, 0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, 0x53, -+0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x02, 0x60, 0x02, 0xE1, 0x4E, 0xF1, 0x67, 0xE1, 0x4E, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xF1, 0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, 0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xF1, 0x9A, 0x80, 0x16, -+0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0x7F, 0x01, 0xF1, 0x72, 0x80, 0x08, 0xEE, 0xB4, -+0x03, 0x04, 0x7F, 0x01, 0xF1, 0x53, 0xF1, 0xD0, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, -+0x06, 0x7F, 0x01, 0xF1, 0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, -+0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xF1, 0x9A, 0x80, 0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, -+0x06, 0x06, 0xE4, 0xFF, 0xF1, 0x72, 0x80, 0x06, 0xEE, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0xF1, 0xB9, -+0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0xE4, 0xFF, 0xF1, 0x72, 0x80, 0x13, -+0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, 0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, -+0x02, 0xF1, 0x67, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, 0x04, 0xF1, 0xA4, 0x80, 0x09, 0x90, 0x8B, -+0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, 0xF1, 0xAF, 0x80, 0x73, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, -+0xB4, 0x06, 0x06, 0xE4, 0xFF, 0xF1, 0x72, 0x80, 0x13, 0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, -+0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0x90, 0x8B, 0x2D, 0xE0, -+0xB4, 0x01, 0x04, 0xF1, 0xA4, 0x80, 0x0B, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x04, 0x7F, 0x01, -+0xF1, 0x81, 0xF1, 0xC3, 0x80, 0x38, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xF1, -+0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, 0x90, 0x8B, 0x2D, 0xE0, -+0x70, 0x04, 0xF1, 0x9A, 0x80, 0x16, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x06, 0xE4, 0xFF, 0xF1, -+0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0xF1, 0xDD, 0xD0, 0xD0, -+0x92, 0xAF, 0x22, 0x12, 0x4A, 0xB2, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x22, 0x90, 0x05, 0x22, -+0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0x04, -+0xF0, 0x22, 0xEF, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, -+0x22, 0x90, 0x8B, 0x56, 0xEF, 0xF0, 0x12, 0x7D, 0x42, 0x90, 0x8B, 0x56, 0xE0, 0x60, 0x05, 0x90, -+0x05, 0x22, 0xE4, 0xF0, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x12, 0x4A, 0xCC, 0x90, 0x8B, 0x2D, -+0x74, 0x01, 0xF0, 0x22, 0x7F, 0x01, 0x12, 0x4A, 0x7C, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x12, -+0x7C, 0x4A, 0x90, 0x8B, 0x2D, 0x74, 0x04, 0xF0, 0x22, 0x12, 0x4A, 0x32, 0x90, 0x8B, 0x2D, 0x74, -+0x03, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x05, 0xF0, 0x22, -+0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, -+0x74, 0x6F, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x06, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, -+0xD0, 0xE4, 0xFD, 0xFC, 0xEF, 0x30, 0xE0, 0x02, 0x7D, 0x80, 0xEF, 0xC3, 0x13, 0x90, 0xFD, 0x10, -+0xF0, 0xAE, 0x04, 0xAF, 0x05, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x75, 0x28, 0x33, 0xE4, 0xF5, 0x29, -+0x75, 0x2A, 0x07, 0xF5, 0x2B, 0x90, 0x01, 0x30, 0xE5, 0x28, 0xF0, 0xA3, 0xE5, 0x29, 0xF0, 0xA3, -+0xE5, 0x2A, 0xF0, 0xA3, 0xE5, 0x2B, 0xF0, 0x22, 0x75, 0x30, 0x1F, 0x75, 0x31, 0x01, 0x43, 0x31, -+0x10, 0xE4, 0xF5, 0x32, 0x90, 0x01, 0x38, 0xE5, 0x30, 0xF0, 0xA3, 0xE5, 0x31, 0xF0, 0xA3, 0xE5, -+0x32, 0xF0, 0x22, 0x22, 0x90, 0x00, 0x02, 0xE0, 0x54, 0xE0, 0x7F, 0x01, 0x60, 0x02, 0x7F, 0x00, -+0x22, 0x90, 0x00, 0xF3, 0xE0, 0x7F, 0x00, 0x30, 0xE3, 0x02, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x09, -+0xE0, 0xB4, 0x01, 0x0C, 0x90, 0x00, 0xF2, 0xE0, 0x30, 0xE7, 0x05, 0x7E, 0xFD, 0x7F, 0x33, 0x22, -+0x7E, 0xFD, 0x7F, 0x2F, 0x22, 0x90, 0x00, 0xF3, 0xE0, 0x30, 0xE2, 0x0D, 0x90, 0x05, 0x41, 0x74, -+0x10, 0xF0, 0x90, 0x05, 0x5A, 0xF0, 0xA3, 0xE4, 0xF0, 0x22, 0x90, 0x01, 0x64, 0x74, 0xA0, 0xF0, -+0x22, 0xC0, 0xE0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, 0xD0, 0x75, 0xD0, 0x00, 0xC0, 0x05, 0xC0, 0x06, -+0xC0, 0x07, 0x7D, 0x91, 0x90, 0x01, 0xC4, 0xED, 0xF0, 0x74, 0x68, 0xFF, 0xA3, 0xF0, 0x53, 0x91, -+0xEF, 0x90, 0x00, 0x51, 0xE0, 0xFE, 0x90, 0x00, 0x55, 0xE0, 0x5E, 0xF5, 0x3D, 0x90, 0x00, 0x52, -+0xE0, 0xFE, 0x90, 0x00, 0x56, 0xE0, 0x5E, 0xF5, 0x3E, 0xE5, 0x3D, 0x30, 0xE4, 0x06, 0x90, 0x00, -+0x55, 0x74, 0x10, 0xF0, 0xE5, 0x3D, 0x30, 0xE5, 0x06, 0x90, 0x00, 0x55, 0x74, 0x20, 0xF0, 0xE5, -+0x3D, 0x30, 0xE6, 0x06, 0x90, 0x00, 0x55, 0x74, 0x40, 0xF0, 0xE5, 0x3D, 0x30, 0xE7, 0x06, 0x90, -+0x00, 0x55, 0x74, 0x80, 0xF0, 0xE5, 0x3E, 0x30, 0xE0, 0x06, 0x90, 0x00, 0x56, 0x74, 0x01, 0xF0, -+0xE5, 0x3E, 0x30, 0xE1, 0x06, 0x90, 0x00, 0x56, 0x74, 0x02, 0xF0, 0xE5, 0x3E, 0x30, 0xE2, 0x06, -+0x90, 0x00, 0x56, 0x74, 0x04, 0xF0, 0xE5, 0x3E, 0x30, 0xE3, 0x06, 0x90, 0x00, 0x56, 0x74, 0x08, -+0xF0, 0x90, 0x01, 0xC4, 0xED, 0xF0, 0xA3, 0xEF, 0xF0, 0xD0, 0x07, 0xD0, 0x06, 0xD0, 0x05, 0xD0, -+0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xE0, 0x32, 0xEF, 0xC3, 0x94, 0x20, 0x50, 0x39, 0xEF, 0x30, -+0xE0, 0x17, 0xED, 0xC4, 0x54, 0xF0, 0xFD, 0xEF, 0xC3, 0x13, 0xFE, 0x24, 0xA4, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x0F, 0x80, 0x10, 0xEF, 0xC3, 0x13, 0xFE, 0x24, 0xA4, 0xF5, -+0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0xF0, 0xF0, 0x74, 0xA4, 0x2E, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0xE0, 0x4D, 0xF0, 0x22, 0xAD, 0x07, 0x74, 0x84, 0x2D, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x7F, 0x90, 0x8A, 0xDE, 0xF0, 0xE0, 0xF9, 0x54, 0x1F, 0xA3, -+0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0xFF, 0x90, 0x8A, 0xE1, -+0xF0, 0xED, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, -+0xE0, 0x90, 0x8A, 0xE2, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xED, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, -+0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE4, 0xCB, 0xF0, 0xA3, 0xEB, -+0xF0, 0x90, 0x8A, 0xDF, 0xE0, 0xFE, 0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, -+0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, -+0x34, 0x86, 0xF5, 0x83, 0xEA, 0xF0, 0xA3, 0xEB, 0xF0, 0xEE, 0xC3, 0x9F, 0x40, 0x02, 0x41, 0xB9, -+0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, -+0xF0, 0xEF, 0x04, 0x90, 0x8A, 0xE0, 0xF0, 0x90, 0x8A, 0xE1, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, -+0xFE, 0xD3, 0x9F, 0x40, 0x02, 0x41, 0xF3, 0xEE, 0xC3, 0x94, 0x10, 0x40, 0x21, 0xEE, 0x24, 0xF0, -+0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0x90, 0x8A, 0xE2, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x70, 0x27, 0x90, 0x8A, -+0xE0, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x50, 0x59, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, -+0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE4, 0xE0, 0x5E, 0xFE, 0xA3, -+0xE0, 0x5F, 0x4E, 0x60, 0x3C, 0x90, 0x8A, 0xE0, 0xE0, 0xB4, 0x11, 0x0D, 0x90, 0x8A, 0xE3, 0xE0, -+0x30, 0xE7, 0x06, 0x90, 0x8A, 0xE0, 0x74, 0x17, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xFF, 0x64, 0x13, -+0x60, 0x04, 0xEF, 0xB4, 0x12, 0x0D, 0x90, 0x8A, 0xE2, 0xE0, 0x30, 0xE0, 0x06, 0x90, 0x8A, 0xE0, -+0x74, 0x18, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0x80, -+0x42, 0x90, 0x8A, 0xE0, 0xE0, 0x04, 0xF0, 0x41, 0x17, 0x90, 0x8A, 0xE1, 0xE0, 0xFC, 0x90, 0x8A, -+0xDF, 0xE0, 0xFF, 0x6C, 0x70, 0x71, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, -+0xEF, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x29, 0x12, 0x43, 0x5F, 0xE0, 0xB4, 0x01, 0x10, -+0xE9, 0x20, 0xE6, 0x0C, 0x90, 0x8A, 0xDF, 0xE0, 0x44, 0x40, 0x90, 0x8A, 0xDE, 0xF0, 0x80, 0x03, -+0xAF, 0x01, 0x22, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, -+0xFE, 0xEF, 0x13, 0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x80, 0x66, 0x90, 0x8A, 0xDF, 0xE0, 0xD3, 0x9C, 0x40, 0x5E, 0x90, -+0x8A, 0xE1, 0xE0, 0xFF, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, -+0x90, 0x8A, 0xDF, 0xEF, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0xFC, 0xA3, 0xE0, 0xFF, 0x25, 0xE0, 0x24, -+0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, -+0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, -+0xE4, 0x93, 0x3A, 0xC3, 0x13, 0xFE, 0xEF, 0x13, 0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, -+0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xAF, 0x04, 0x22, 0x74, 0x01, 0x2D, -+0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xAF, 0x05, 0x90, 0x8A, 0xDE, 0xE0, 0x44, -+0x80, 0xFD, 0x12, 0x5C, 0x4E, 0x90, 0x8A, 0xDE, 0xE0, 0x44, 0x80, 0xFF, 0x22, 0xE4, 0x90, 0x8A, -+0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0xC3, 0x94, 0x20, 0x40, 0x03, 0x02, 0x72, 0x54, 0x75, -+0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2A, 0x12, 0x43, 0x5F, 0xE0, 0x64, 0x01, 0x60, 0x03, 0x02, 0x72, -+0x4B, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, -+0xE0, 0xFC, 0xA3, 0xE0, 0xD3, 0x94, 0x00, 0xEC, 0x94, 0x00, 0x50, 0x03, 0x02, 0x72, 0x4B, 0xEF, -+0x75, 0xF0, 0x0A, 0xA4, 0x24, 0x00, 0xF9, 0x74, 0x84, 0x35, 0xF0, 0x75, 0x12, 0x01, 0xF5, 0x13, -+0x89, 0x14, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, -+0x83, 0xE0, 0xFD, 0xA3, 0xE0, 0x90, 0x8A, 0xD4, 0xCD, 0xF0, 0xA3, 0xED, 0xF0, 0xEF, 0x25, 0xE0, -+0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, 0x8A, 0xD6, -+0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0x24, 0x84, 0xF5, 0x82, 0xE4, 0x34, -+0x04, 0xF5, 0x83, 0xE0, 0x54, 0x3F, 0x90, 0x8A, 0xD0, 0xF0, 0xE0, 0xFD, 0x54, 0x1F, 0xA3, 0xF0, -+0x75, 0xF0, 0x09, 0xEE, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD9, 0xF0, 0x90, -+0x8A, 0xCF, 0xE0, 0xFB, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xC3, 0x94, -+0x05, 0x40, 0x02, 0xC1, 0x9C, 0x90, 0x8A, 0xD9, 0xE0, 0xFE, 0x90, 0x8A, 0xD1, 0xE0, 0x9E, 0x40, -+0x13, 0x90, 0x8A, 0xD9, 0xE0, 0x90, 0x8A, 0xD1, 0xF0, 0xED, 0x54, 0x40, 0xFD, 0x90, 0x8A, 0xD0, -+0xF0, 0xEE, 0x4D, 0xF0, 0x90, 0x8A, 0xD1, 0xE0, 0xFF, 0x90, 0x41, 0x12, 0x93, 0xFE, 0x74, 0x23, -+0x2B, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xC3, 0x9E, 0x40, 0x06, 0xEF, 0x90, 0x40, -+0xDA, 0x80, 0x07, 0x90, 0x8A, 0xD1, 0xE0, 0x90, 0x40, 0xF6, 0x93, 0x90, 0x8A, 0xD8, 0xF0, 0x90, -+0x8A, 0xD8, 0xE0, 0x75, 0xF0, 0x06, 0xA4, 0x24, 0x50, 0xF9, 0x74, 0x40, 0x35, 0xF0, 0x75, 0x0F, -+0xFF, 0xF5, 0x10, 0x89, 0x11, 0x90, 0x8A, 0xD0, 0xE0, 0x90, 0x41, 0xBA, 0x93, 0xFF, 0xD3, 0x90, -+0x8A, 0xD7, 0xE0, 0x9F, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x0D, 0x90, 0x8A, 0xCF, 0xE0, -+0xFF, 0xE4, 0xFD, 0x12, 0x5D, 0x41, 0x02, 0x71, 0xE1, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, -+0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, 0x8A, 0xD2, 0xCF, -+0xF0, 0xA3, 0xEF, 0xF0, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x12, 0x29, 0xD9, 0xFF, 0x7E, 0x00, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x97, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, -+0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, -+0x01, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x02, -+0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, -+0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x7E, -+0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x04, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, -+0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, -+0xA9, 0x11, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, -+0x14, 0x90, 0x00, 0x06, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, -+0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x04, 0x12, -+0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x08, 0x12, 0x42, -+0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, -+0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x05, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0x90, -+0x8A, 0xD4, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0x12, 0x29, 0xF2, 0xD3, 0x90, 0x8A, 0xD3, 0xE0, 0x9F, -+0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x40, 0x0C, 0xA3, 0xE0, 0x9F, 0xF0, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, -+0xF0, 0x80, 0x07, 0xE4, 0x90, 0x8A, 0xD2, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xD2, 0xE0, 0xFC, 0xA3, -+0xE0, 0xFD, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, -+0xF5, 0x83, 0xEC, 0xF0, 0xA3, 0xED, 0xF0, 0x90, 0x8A, 0xD0, 0xE0, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xD3, 0xED, 0x9B, -+0xEC, 0x9A, 0x40, 0x05, 0x31, 0x78, 0x02, 0x71, 0xAF, 0x90, 0x8A, 0xD0, 0xE0, 0x25, 0xE0, 0x24, -+0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFE, 0x74, 0x01, 0x93, 0xFF, 0xC3, -+0x90, 0x8A, 0xD3, 0xE0, 0x9F, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x40, 0x03, 0x02, 0x71, 0xAF, 0x90, -+0x8A, 0xCF, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5D, 0x41, 0x02, 0x71, 0xAF, 0x90, 0x8A, 0xCF, 0xE0, -+0xFF, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xFC, 0x64, 0x05, 0x60, 0x03, -+0x02, 0x70, 0x7D, 0x90, 0x87, 0x22, 0xE0, 0xFE, 0xB4, 0x03, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, -+0x94, 0x19, 0x40, 0x3D, 0x80, 0x2E, 0xEE, 0xB4, 0x02, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, 0x94, -+0x11, 0x40, 0x2E, 0x80, 0x1F, 0x90, 0x87, 0x22, 0xE0, 0xFE, 0xB4, 0x01, 0x0B, 0x90, 0x8A, 0xD1, -+0xE0, 0xC3, 0x94, 0x0A, 0x40, 0x1B, 0x80, 0x0C, 0xEE, 0x70, 0x11, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, -+0x94, 0x03, 0x40, 0x0D, 0x90, 0x89, 0x43, 0x74, 0x01, 0xF0, 0x80, 0x05, 0xE4, 0x90, 0x89, 0x43, -+0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, -+0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x23, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, -+0xC3, 0x94, 0x30, 0x50, 0x0B, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x64, 0x2F, 0x02, 0x70, 0x28, -+0x90, 0x89, 0x43, 0xE0, 0x64, 0x01, 0x60, 0x03, 0x02, 0x70, 0x1D, 0x90, 0x8A, 0xCF, 0xE0, 0x24, -+0x44, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0x64, 0x0A, 0x60, 0x5B, 0x90, 0x8A, 0xCF, -+0xE0, 0xFF, 0xEE, 0x24, 0x05, 0xFB, 0xE4, 0x33, 0xFA, 0x74, 0x21, 0x2F, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xE0, 0xFF, 0xD3, 0x9B, 0xEA, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, 0x50, 0x38, -+0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0xEF, 0x24, 0x05, 0xFB, 0xE4, 0x33, 0xFA, 0x74, 0x23, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xD3, 0x9B, 0xEA, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, -+0x50, 0x16, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x84, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, -+0xFF, 0x90, 0x8A, 0xD1, 0xE0, 0x6F, 0x60, 0x56, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x23, 0xF5, 0x82, -+0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFF, 0xD3, 0x94, 0x42, 0x40, 0x08, 0x90, 0x8A, 0xDD, 0x74, -+0x05, 0xF0, 0x80, 0x11, 0xEF, 0xD3, 0x94, 0x39, 0x90, 0x8A, 0xDD, 0x40, 0x05, 0x74, 0x03, 0xF0, -+0x80, 0x03, 0x74, 0x01, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x23, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0xE0, 0xFE, 0x74, 0x21, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, -+0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x44, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0x80, 0x2F, 0x90, 0x8A, -+0xCF, 0xE0, 0xFF, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x44, -+0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0x04, 0xF0, 0x80, 0x14, 0xE4, 0x90, 0x8A, -+0xDD, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, -+0xF0, 0x90, 0x8A, 0xD1, 0xE0, 0xFE, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x84, 0xF5, 0x82, 0xE4, -+0x34, 0x8A, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFE, 0x74, 0x43, 0x2F, 0xF5, 0x82, -+0xE4, 0x34, 0x88, 0xF5, 0x83, 0xEE, 0xF0, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2B, 0x12, 0x43, -+0x5F, 0xE0, 0xB4, 0x01, 0x11, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x64, 0x2F, 0xF5, 0x82, 0xE4, -+0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFD, 0x21, 0xAC, 0xEC, 0x64, 0x06, -+0x60, 0x02, 0x21, 0xAF, 0x90, 0x8A, 0xD2, 0xF0, 0xA3, 0xF0, 0x90, 0x41, 0xDB, 0x93, 0xFF, 0x7E, -+0x00, 0x90, 0x8A, 0xD4, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xDB, 0xEE, -+0xF0, 0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE0, 0x90, 0x8A, 0xDD, 0xF0, 0xE4, 0x90, 0x8A, 0xDA, 0xF0, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, -+0xD3, 0x94, 0x04, 0x50, 0x47, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x75, 0xF0, 0x02, 0xEF, 0xA4, -+0xF5, 0x82, 0x85, 0xF0, 0x83, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0xEF, 0x90, 0x41, 0xD6, 0x93, -+0xFF, 0x7E, 0x00, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0x90, -+0x8A, 0xDB, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xD3, 0x90, 0x8A, 0xD3, 0xE0, 0x9F, 0x90, 0x8A, 0xD2, -+0xE0, 0x9E, 0x50, 0x08, 0x90, 0x8A, 0xDA, 0xE0, 0x04, 0xF0, 0x80, 0xAF, 0x90, 0x8A, 0xDA, 0xE0, -+0xC3, 0x13, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFF, 0xB4, 0x01, 0x0D, 0x90, 0x8A, 0xDA, 0xE0, 0x70, -+0x5D, 0x90, 0x8A, 0xDD, 0x04, 0xF0, 0x80, 0x5B, 0xEF, 0xB4, 0x03, 0x1D, 0x90, 0x8A, 0xDA, 0xE0, -+0xFF, 0x70, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x03, 0xF0, 0x80, 0x48, 0xEF, 0xB4, 0x01, 0x08, 0x90, -+0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x80, 0x3C, 0x80, 0x35, 0x90, 0x8A, 0xDD, 0xE0, 0x64, 0x05, 0x70, -+0x32, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0x70, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x05, 0xF0, 0x80, 0x0F, -+0xEF, 0x90, 0x8A, 0xDD, 0xB4, 0x01, 0x05, 0x74, 0x03, 0xF0, 0x80, 0x03, 0x74, 0x01, 0xF0, 0xD3, -+0x90, 0x8A, 0xD7, 0xE0, 0x94, 0x03, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x05, 0xE4, 0x90, -+0x8A, 0xDD, 0xF0, 0xD3, 0x90, 0x8A, 0xD7, 0xE0, 0x94, 0x03, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, -+0x40, 0x05, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFD, 0x90, 0x8A, 0xCF, 0xE0, -+0xFF, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xED, 0xF0, 0x12, 0x69, 0x38, 0x90, -+0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xD3, 0x94, -+0x05, 0x50, 0x0F, 0x74, 0x64, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0x04, 0xF0, -+0x80, 0x0F, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, -+0xF0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0xE4, 0xF5, 0xF0, 0x12, 0x42, 0xFA, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x90, 0x00, 0x02, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, 0x04, 0xE4, -+0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, 0x06, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, -+0x08, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0xC0, -+0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x63, -+0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA3, -+0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, -+0xF0, 0x02, 0x6B, 0xC2, 0x22, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0xC3, -+0x94, 0x10, 0x50, 0x14, 0x74, 0xA4, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE4, 0xF0, -+0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x80, 0xE2, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, -+0xE0, 0xFF, 0xC3, 0x94, 0x20, 0x40, 0x02, 0x81, 0x0E, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x00, -+0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x02, 0x12, 0x43, -+0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x04, 0x12, 0x43, 0x5F, 0xE4, -+0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x06, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, -+0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x08, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x74, -+0x84, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0x74, 0x13, 0xF0, 0x74, 0x44, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x43, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x88, -+0xF5, 0x83, 0xE4, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xE3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0x74, 0x44, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, -+0x74, 0x24, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x64, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x90, 0x41, 0x8C, 0x93, 0xFE, 0x74, 0x01, 0x93, -+0xFF, 0x90, 0x41, 0x54, 0x74, 0x01, 0x93, 0x2F, 0xFF, 0xE4, 0x93, 0x3E, 0xC3, 0x13, 0xFE, 0xEF, -+0x13, 0xFF, 0x90, 0x8A, 0xCF, 0xE0, 0xFD, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, -+0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x29, 0x12, 0x43, -+0x5F, 0x74, 0x01, 0xF0, 0x74, 0xC1, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0x74, 0x0C, -+0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0x74, 0xFF, 0xF0, 0xA3, 0xF0, -+0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x23, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0x74, 0x0F, 0xF0, -+0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0x74, 0x13, 0xF0, 0x75, 0xF0, 0x09, -+0xED, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0x74, 0x84, 0x2D, 0xF5, 0x82, 0xE4, 0x34, -+0x04, 0xF5, 0x83, 0x74, 0x13, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x41, 0x7D, 0x22, 0x12, -+0x29, 0xD9, 0xFF, 0xC3, 0x94, 0x20, 0x50, 0x14, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFE, 0x74, -+0x23, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xEE, 0xF0, 0x22, 0xEF, 0xB4, 0x20, 0x0A, -+0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0x90, 0x87, 0x21, 0xF0, 0x22, 0x90, 0x8B, 0x4B, 0xEE, 0xF0, -+0xA3, 0xEF, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x8B, 0x4B, 0xE0, 0xFE, 0xA3, 0xE0, 0xF5, -+0x82, 0x8E, 0x83, 0xE0, 0x60, 0x2C, 0xC3, 0x90, 0x8B, 0x4E, 0xE0, 0x94, 0xE8, 0x90, 0x8B, 0x4D, -+0xE0, 0x94, 0x03, 0x40, 0x0A, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x10, 0xF0, 0x7F, 0x00, 0x22, 0x90, -+0x8B, 0x4D, 0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x7F, 0x0A, 0x7E, 0x00, 0x12, 0x37, 0x54, -+0x80, 0xC6, 0x7F, 0x01, 0x22, 0x12, 0x29, 0xD9, 0xF5, 0x21, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, -+0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x2A, 0x8B, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x01, 0x12, -+0x42, 0x20, 0x90, 0x8B, 0x1A, 0xF0, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x0A, 0xF0, -+0x12, 0x47, 0xFA, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x30, -+0xE0, 0x25, 0x12, 0x29, 0xD9, 0x90, 0x8B, 0x10, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x90, -+0x8B, 0x11, 0xF0, 0xEF, 0xC3, 0x13, 0x54, 0x7F, 0x90, 0x8B, 0x0F, 0xF0, 0x90, 0x00, 0x03, 0x12, -+0x42, 0x20, 0x90, 0x8B, 0x16, 0xF0, 0x22, 0x90, 0x8B, 0x10, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x11, -+0x74, 0x05, 0xF0, 0x90, 0x8B, 0x0F, 0x74, 0x14, 0xF0, 0x90, 0x8B, 0x16, 0x74, 0x05, 0xF0, 0x22, -+0x12, 0x29, 0xD9, 0x30, 0xE0, 0x19, 0xC3, 0x13, 0x54, 0x7F, 0x90, 0x8B, 0x15, 0xF0, 0x90, 0x00, -+0x01, 0x12, 0x42, 0x20, 0xFF, 0x90, 0x8B, 0x13, 0xE4, 0xF0, 0xA3, 0xEF, 0xF0, 0x80, 0x0F, 0x90, -+0x8B, 0x15, 0x74, 0x05, 0xF0, 0x90, 0x8B, 0x13, 0xE4, 0xF0, 0xA3, 0x74, 0x03, 0xF0, 0x90, 0x8B, -+0x13, 0xE0, 0xA3, 0xE0, 0x90, 0x05, 0x58, 0xF0, 0x22, 0x12, 0x29, 0xD9, 0x90, 0x8B, 0x12, 0xF0, -+0x60, 0x07, 0xE4, 0xFD, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x90, 0x8B, 0x12, 0xE0, 0x90, 0x01, 0xE7, -+0xF0, 0x22, 0x90, 0x02, 0x09, 0xE0, 0xFD, 0x12, 0x29, 0xD9, 0xFE, 0xAF, 0x05, 0xED, 0x2E, 0x90, -+0x8A, 0xF7, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xF8, 0xF0, -+0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xF9, 0xF0, 0x90, 0x00, 0x03, -+0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xFA, 0xF0, 0x90, 0x00, 0x04, 0x12, 0x42, 0x20, -+0xFF, 0xAE, 0x05, 0xED, 0x2F, 0x90, 0x8A, 0xFB, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, -+0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x8B, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x12, 0x29, 0xD9, 0xC3, -+0x13, 0x20, 0xE0, 0x02, 0xC1, 0xED, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xFF, -+0x54, 0x02, 0xFE, 0x90, 0x8B, 0x32, 0xE0, 0x54, 0xFD, 0x4E, 0xFE, 0xF0, 0xEF, 0x54, 0x01, 0xFF, -+0xEE, 0x54, 0xFE, 0x4F, 0xFF, 0xF0, 0x12, 0x29, 0xD9, 0xFE, 0x54, 0x08, 0xFD, 0xEF, 0x54, 0xF7, -+0x4D, 0xFF, 0x90, 0x8B, 0x32, 0xF0, 0xEE, 0x54, 0x10, 0xFE, 0xEF, 0x54, 0xEF, 0x4E, 0xFF, 0xF0, -+0x12, 0x29, 0xD9, 0xFE, 0x54, 0x20, 0xFD, 0xEF, 0x54, 0xDF, 0x4D, 0xFF, 0x90, 0x8B, 0x32, 0xF0, -+0xEE, 0x54, 0x40, 0xFE, 0xEF, 0x54, 0xBF, 0x4E, 0xF0, 0x20, 0xE0, 0x02, 0xC1, 0xD9, 0x90, 0x8A, -+0xDD, 0x74, 0x21, 0xF0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xFF, 0x13, 0x13, -+0x54, 0x01, 0xFE, 0x90, 0x8B, 0x32, 0xE0, 0xFD, 0x13, 0x13, 0x54, 0x01, 0x6E, 0x60, 0x2A, 0xEF, -+0x54, 0x04, 0xFF, 0xED, 0x54, 0xFB, 0x4F, 0xF0, 0xE0, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x0E, -+0x90, 0x01, 0x34, 0x74, 0x40, 0xF0, 0xFD, 0xE4, 0xFF, 0x12, 0x36, 0xE6, 0x80, 0x0B, 0xE4, 0x90, -+0x8B, 0x34, 0xF0, 0x7D, 0x40, 0xFF, 0x12, 0x36, 0x75, 0x90, 0x8B, 0x32, 0xE0, 0xFD, 0x13, 0x13, -+0x13, 0x54, 0x1F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x12, 0xF0, 0xED, 0xC4, 0x54, -+0x0F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x14, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xC4, -+0x13, 0x54, 0x07, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x80, 0xF0, 0x90, 0x8B, 0x32, -+0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x20, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x40, 0xF0, -+0x90, 0x8A, 0xDD, 0xE0, 0x90, 0x05, 0x27, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x70, 0x05, 0x7F, 0x01, -+0x12, 0x4E, 0x89, 0x90, 0x8B, 0x32, 0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x04, 0x7F, -+0x03, 0x80, 0x0E, 0x7F, 0x01, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F, -+0x02, 0x12, 0x4E, 0x89, 0x7F, 0x02, 0x02, 0x78, 0x2E, 0x90, 0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x90, -+0x05, 0x27, 0xF0, 0xE4, 0xFF, 0x12, 0x4E, 0x89, 0x7F, 0x03, 0x02, 0x78, 0x2E, 0x90, 0x8A, 0xDA, -+0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xFF, 0x54, 0x02, 0xFE, 0x90, 0x8B, 0x2C, 0xE0, 0x54, 0xFD, -+0x4E, 0xFE, 0xF0, 0xEF, 0x54, 0x01, 0xFF, 0xEE, 0x54, 0xFE, 0x4F, 0xFF, 0xF0, 0x12, 0x29, 0xD9, -+0xFE, 0x54, 0x08, 0xFD, 0xEF, 0x54, 0xF7, 0x4D, 0xFF, 0x90, 0x8B, 0x2C, 0xF0, 0xEE, 0x54, 0x10, -+0xFE, 0xEF, 0x54, 0xEF, 0x4E, 0xFF, 0xF0, 0x12, 0x29, 0xD9, 0xFE, 0x54, 0x40, 0xFD, 0xEF, 0x54, -+0xBF, 0x4D, 0xFF, 0x90, 0x8B, 0x2C, 0xF0, 0xEE, 0x54, 0x04, 0xFE, 0xEF, 0x54, 0xFB, 0x4E, 0xF0, -+0x20, 0xE0, 0x02, 0xE1, 0xE2, 0x90, 0x8A, 0xDD, 0x74, 0x31, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x13, -+0x13, 0x54, 0x3F, 0x20, 0xE0, 0x0B, 0xE4, 0x90, 0x8B, 0x2E, 0xF0, 0x7D, 0x40, 0xFF, 0x12, 0x36, -+0x75, 0x90, 0x8B, 0x2C, 0xE0, 0xFD, 0x13, 0x13, 0x13, 0x54, 0x1F, 0x30, 0xE0, 0x07, 0x90, 0x8A, -+0xDD, 0xE0, 0x44, 0x02, 0xF0, 0xED, 0xC4, 0x54, 0x0F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, -+0x44, 0x04, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0x54, 0x06, 0x60, 0x0C, 0x90, 0x01, 0x3E, 0x74, 0x03, -+0xF0, 0xFD, 0x7F, 0x02, 0x12, 0x37, 0x00, 0x90, 0x8A, 0xDD, 0xE0, 0x90, 0x05, 0x27, 0xF0, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x0D, 0xA3, 0xE0, 0x64, 0x06, -+0x60, 0x2C, 0x7F, 0x06, 0x12, 0x65, 0x82, 0x80, 0x25, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x06, 0x1B, -+0x7F, 0x01, 0x12, 0x65, 0x82, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x09, 0x7D, 0x01, 0xAF, -+0x23, 0x12, 0x45, 0xA2, 0x80, 0x05, 0x12, 0x4E, 0x56, 0x80, 0x03, 0x12, 0x7D, 0xC1, 0x7F, 0x01, -+0x80, 0x4C, 0x90, 0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x27, 0xF0, 0x7D, 0x03, 0x7F, 0x02, -+0x12, 0x36, 0x92, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x06, 0x02, 0x80, 0x1B, 0x90, 0x8B, 0x2D, 0xE0, -+0xB4, 0x04, 0x02, 0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, 0x80, 0x14, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, -+0x02, 0x05, 0x7F, 0x01, 0x12, 0x65, 0x82, 0x11, 0x35, 0x12, 0x4A, 0xFC, 0x7F, 0x03, 0x11, 0x42, -+0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x8B, 0x31, 0xE0, 0xB4, 0x01, 0x05, 0xE4, 0xF0, 0x12, 0x48, -+0xFE, 0x22, 0xAD, 0x07, 0xEF, 0x64, 0x01, 0x60, 0x04, 0xEF, 0xB4, 0x03, 0x15, 0x90, 0x8B, 0x32, -+0xE0, 0x54, 0xFE, 0xF0, 0x54, 0xFB, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, -+0xA3, 0xF0, 0xED, 0x64, 0x02, 0x60, 0x04, 0xED, 0xB4, 0x03, 0x15, 0x90, 0x8B, 0x2C, 0xE0, 0x54, -+0xFE, 0xF0, 0x54, 0xFB, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, -+0x22, 0x12, 0x29, 0xD9, 0x90, 0x8B, 0x38, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x8A, 0xFD, 0xE0, 0x90, 0x8A, 0xE8, 0xF0, 0x90, 0x8A, 0xFE, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, -+0x8A, 0xE9, 0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0xE4, 0x90, 0x8A, 0xE4, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, -+0xFF, 0x24, 0x00, 0xF5, 0x82, 0xE4, 0x34, 0x8B, 0xF5, 0x83, 0xE0, 0xFE, 0x74, 0xEB, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0x04, 0xF0, 0xE0, 0xB4, -+0x04, 0xDA, 0x90, 0x8A, 0xE8, 0xE0, 0x12, 0x43, 0x94, 0x78, 0xF8, 0x00, 0x7A, 0x6B, 0x01, 0x79, -+0x01, 0x02, 0x79, 0x01, 0x03, 0x79, 0x01, 0x04, 0x7A, 0x6B, 0x05, 0x7A, 0x35, 0x80, 0x7A, 0x4E, -+0x81, 0x7A, 0x6B, 0x82, 0x00, 0x00, 0x7A, 0x67, 0x90, 0x8A, 0xEE, 0xE0, 0xFF, 0x51, 0x72, 0x41, -+0x6B, 0x90, 0x8A, 0xE8, 0xE0, 0xFF, 0xB4, 0x02, 0x08, 0x90, 0x8A, 0xE5, 0x74, 0x01, 0xF0, 0x80, -+0x0F, 0xEF, 0x90, 0x8A, 0xE5, 0xB4, 0x03, 0x05, 0x74, 0x02, 0xF0, 0x80, 0x03, 0x74, 0x04, 0xF0, -+0xC3, 0x90, 0x8A, 0xE9, 0xE0, 0x94, 0x08, 0x50, 0x78, 0xE4, 0x90, 0x8A, 0xE4, 0xF0, 0x90, 0x8A, -+0xE5, 0xE0, 0xFF, 0x90, 0x8A, 0xE4, 0xE0, 0xC3, 0x9F, 0x40, 0x02, 0x41, 0x6B, 0x90, 0x8A, 0xE9, -+0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xC3, 0xEE, 0x94, 0x01, 0x90, 0x8A, 0xE4, 0xE0, 0x50, 0x1F, 0xFE, -+0x2F, 0xFF, 0xEE, 0xFD, 0xC3, 0x74, 0x03, 0x9D, 0xFD, 0xE4, 0x94, 0x00, 0xFC, 0x74, 0xEB, 0x2D, -+0xF5, 0x82, 0x74, 0x8A, 0x3C, 0xF5, 0x83, 0xE0, 0xFD, 0x12, 0x51, 0x88, 0x80, 0x2B, 0xFF, 0xFD, -+0xC3, 0x74, 0x03, 0x9D, 0xFD, 0xE4, 0x94, 0x00, 0xFC, 0x74, 0xEB, 0x2D, 0xF5, 0x82, 0x74, 0x8A, -+0x3C, 0xF5, 0x83, 0xE0, 0xFE, 0xEF, 0xFD, 0x90, 0x8A, 0xEA, 0xE0, 0x2D, 0xFD, 0x90, 0x8A, 0xE9, -+0xE0, 0x34, 0x00, 0x8D, 0x82, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0x04, 0xF0, 0x80, -+0x8D, 0xC3, 0x90, 0x8A, 0xE9, 0xE0, 0x94, 0x10, 0x40, 0x02, 0x41, 0x6B, 0x90, 0x8A, 0xE8, 0xE0, -+0x64, 0x04, 0x60, 0x02, 0x41, 0x6B, 0x90, 0x8A, 0xEC, 0xE0, 0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, -+0x10, 0x12, 0x2A, 0x6C, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, 0x8A, 0xEB, 0xE0, -+0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, 0x18, 0x12, 0x2A, 0x6C, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, -+0xD0, 0x00, 0x12, 0x43, 0x46, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, 0x8A, 0xED, -+0xE0, 0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, 0x08, 0x12, 0x2A, 0x6C, 0xD0, 0x03, 0xD0, 0x02, 0xD0, -+0x01, 0xD0, 0x00, 0x12, 0x43, 0x46, 0xA8, 0x04, 0xA9, 0x05, 0xAA, 0x06, 0xAB, 0x07, 0xA3, 0xE0, -+0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x12, 0x43, 0x46, 0xA3, 0x12, 0x2A, 0x7F, 0x90, 0x8A, 0xEF, 0x12, -+0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x90, 0x8A, 0xE9, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, -+0x12, 0x2F, 0xD9, 0x80, 0x36, 0x90, 0x8A, 0xED, 0xE0, 0xFE, 0xA3, 0xE0, 0x24, 0x00, 0xFF, 0xE4, -+0x3E, 0xFE, 0x90, 0x8A, 0xE6, 0xF0, 0xA3, 0xEF, 0xF0, 0x12, 0x37, 0x54, 0x80, 0x1D, 0x90, 0x8A, -+0xED, 0xE0, 0xFE, 0xA3, 0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0xFE, 0x90, 0x8A, 0xE6, 0xF0, 0xA3, -+0xEF, 0xF0, 0x12, 0x36, 0xCB, 0x80, 0x04, 0x7F, 0x00, 0x80, 0x02, 0x7F, 0x01, 0xD0, 0xD0, 0x92, -+0xAF, 0x22, 0x8F, 0x0F, 0xE4, 0x90, 0x8A, 0xF3, 0xF0, 0xE5, 0x0F, 0x14, 0xFE, 0x90, 0x8A, 0xF3, -+0xE0, 0xFF, 0xC3, 0x9E, 0x50, 0x0E, 0xEF, 0x04, 0xFD, 0x12, 0x34, 0xB7, 0x90, 0x8A, 0xF3, 0xE0, -+0x04, 0xF0, 0x80, 0xE5, 0xE5, 0x0F, 0x14, 0xFF, 0x7D, 0xFF, 0x12, 0x34, 0xB7, 0x90, 0x8A, 0xF3, -+0xE5, 0x0F, 0xF0, 0x90, 0x8A, 0xF3, 0xE0, 0xC3, 0x94, 0xFF, 0x50, 0x0F, 0xE0, 0xFF, 0x04, 0xFD, -+0x12, 0x34, 0xB7, 0x90, 0x8A, 0xF3, 0xE0, 0x04, 0xF0, 0x80, 0xE8, 0xAD, 0x0F, 0x7F, 0xFF, 0x02, -+0x34, 0xB7, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0xA3, 0x74, -+0x04, 0xF0, 0xA3, 0xE4, 0xF0, 0x90, 0x8A, 0xE2, 0xF0, 0xA3, 0xF0, 0x90, 0x02, 0x09, 0xE0, 0x90, -+0x8A, 0xE1, 0xF0, 0x12, 0x29, 0xD9, 0xFF, 0x90, 0x8A, 0xE1, 0xE0, 0x2F, 0x90, 0x8A, 0xE0, 0xF0, -+0x30, 0xE0, 0x0B, 0x90, 0x8A, 0xDB, 0xE4, 0xF0, 0xA3, 0x74, 0x80, 0xF0, 0x80, 0x07, 0xE4, 0x90, -+0x8A, 0xDB, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xC3, 0x13, 0x90, 0xFD, 0x10, 0xF0, 0x90, -+0x8A, 0xDD, 0xE0, 0x24, 0x20, 0xF0, 0x90, 0x8A, 0xDB, 0xA3, 0xE0, 0xFD, 0xA3, 0xE0, 0xFC, 0x2D, -+0xFF, 0x24, 0x01, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xFD, 0xF0, 0x74, -+0x02, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0xFE, 0xEC, 0x2D, 0x24, 0x03, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0x90, 0x8A, 0xFE, 0xF0, -+0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xDA, 0x74, 0x04, 0xF0, 0x90, 0x8A, 0xDB, 0xA3, 0xE0, 0xFF, 0xA3, -+0xE0, 0x2F, 0xFF, 0x90, 0x8A, 0xDA, 0xE0, 0xFE, 0x2F, 0x24, 0x00, 0xF5, 0x82, 0xE4, 0x34, 0xFC, -+0xF5, 0x83, 0xE0, 0xFF, 0x74, 0xFC, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, -+0x90, 0x8A, 0xDA, 0xE0, 0x04, 0xF0, 0xE0, 0xB4, 0x08, 0xCF, 0x11, 0x89, 0xEF, 0x70, 0x45, 0x90, -+0x01, 0xC3, 0xE0, 0x60, 0x2B, 0xC3, 0x90, 0x8A, 0xE3, 0xE0, 0x94, 0xE8, 0x90, 0x8A, 0xE2, 0xE0, -+0x94, 0x03, 0x40, 0x09, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x10, 0xF0, 0x80, 0x79, 0x90, 0x8A, 0xE2, -+0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x7F, 0x0A, 0x7E, 0x00, 0x12, 0x37, 0x54, 0x80, 0xCF, -+0x90, 0x01, 0xC6, 0xE0, 0x90, 0x01, 0xC3, 0x30, 0xE2, 0x05, 0x74, 0xFE, 0xF0, 0x80, 0x57, 0x74, -+0xFF, 0xF0, 0x80, 0x52, 0x90, 0x8A, 0xDD, 0xE0, 0xB4, 0x78, 0x2E, 0xE4, 0xF0, 0x90, 0x8A, 0xE0, -+0xE0, 0x04, 0xF0, 0x90, 0x8A, 0xDB, 0xE0, 0x70, 0x04, 0xA3, 0xE0, 0x64, 0x80, 0x90, 0x8A, 0xDB, -+0x70, 0x05, 0xF0, 0xA3, 0xF0, 0x80, 0x06, 0xE4, 0xF0, 0xA3, 0x74, 0x80, 0xF0, 0x90, 0x8A, 0xE0, -+0xE0, 0xC3, 0x13, 0x90, 0xFD, 0x10, 0xF0, 0x80, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x24, 0x08, 0xF0, -+0x90, 0x8A, 0xDE, 0x74, 0xFF, 0xF5, 0xF0, 0x12, 0x42, 0x81, 0x90, 0x8A, 0xDE, 0xE0, 0x70, 0x02, -+0xA3, 0xE0, 0x60, 0x02, 0x61, 0x16, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x29, 0xD9, 0x90, 0x8B, -+0x05, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x06, 0xF0, 0x22, 0xE4, 0xF5, 0x61, -+0x22, 0x91, 0x4A, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, -+0x7F, 0x78, 0x7E, 0x08, 0x12, 0x27, 0xDE, 0x90, 0x8B, 0x1C, 0x12, 0x2A, 0x7F, 0x7F, 0x04, 0x7E, -+0x0C, 0x12, 0x27, 0xDE, 0x90, 0x8B, 0x20, 0x12, 0x2A, 0x7F, 0x7F, 0x00, 0x7E, 0x08, 0x12, 0x27, -+0xDE, 0x90, 0x8B, 0x24, 0x12, 0x2A, 0x7F, 0x90, 0x8B, 0x09, 0xE0, 0x90, 0x8B, 0x1C, 0xB4, 0x01, -+0x0D, 0x12, 0x43, 0x53, 0xEF, 0x54, 0xC7, 0xFF, 0xED, 0x54, 0xC7, 0xFD, 0x80, 0x07, 0x12, 0x43, -+0x53, 0xEF, 0x54, 0xC7, 0xFF, 0xEC, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x78, 0x7E, 0x08, -+0x12, 0x2F, 0xD9, 0x90, 0x8B, 0x20, 0x12, 0x43, 0x53, 0xEF, 0x54, 0x0F, 0xFF, 0xEC, 0x90, 0x80, -+0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x04, 0x7E, 0x0C, 0x12, 0x2F, 0xD9, 0x90, 0x8B, 0x24, 0x12, 0x43, -+0x53, 0xEF, 0x44, 0x02, 0xFF, 0xEC, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x00, 0x7E, 0x08, -+0x12, 0x2F, 0xD9, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x27, 0xDE, 0x90, 0x8B, 0x28, 0x12, 0x2A, 0x7F, -+0x90, 0x80, 0x85, 0x12, 0x2A, 0x8B, 0x00, 0x1B, 0x25, 0xA0, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x2F, -+0xD9, 0x90, 0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, 0x00, 0x00, 0x00, 0xE4, 0xFD, 0xFF, 0x12, 0x34, -+0x81, 0x90, 0x8B, 0x09, 0xE0, 0xB4, 0x01, 0x11, 0x90, 0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, 0x00, -+0x00, 0x00, 0xE4, 0xFD, 0x7F, 0x01, 0x12, 0x34, 0x81, 0x90, 0x00, 0x11, 0xE0, 0x54, 0xF6, 0xF0, -+0x02, 0x52, 0x0E, 0x91, 0x50, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, -+0xFF, 0xF0, 0x90, 0x8B, 0x33, 0x74, 0x04, 0xF0, 0x22, 0xB1, 0x42, 0x90, 0x8B, 0x33, 0x74, 0x04, -+0xF0, 0x22, 0x90, 0x00, 0x11, 0xE0, 0x44, 0x09, 0xF0, 0x12, 0x52, 0x0E, 0x90, 0x8B, 0x1C, 0x12, -+0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x78, 0x7E, 0x08, 0x12, 0x2F, 0xD9, 0x90, -+0x8B, 0x20, 0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x04, 0x7E, 0x0C, 0x12, -+0x2F, 0xD9, 0x90, 0x8B, 0x24, 0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x00, -+0x7E, 0x08, 0x12, 0x2F, 0xD9, 0x90, 0x8B, 0x28, 0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, -+0x7F, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x2F, 0xD9, 0x90, 0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, 0x03, -+0x2D, 0x95, 0xE4, 0xFD, 0xFF, 0x12, 0x34, 0x81, 0x90, 0x8B, 0x09, 0xE0, 0xB4, 0x01, 0x11, 0x90, -+0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, 0x03, 0x2D, 0x95, 0xE4, 0xFD, 0x7F, 0x01, 0x12, 0x34, 0x81, -+0x22, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x3C, 0xE5, 0x22, 0x54, 0x0F, 0x14, 0x60, 0x2E, -+0x14, 0x60, 0x1E, 0x24, 0xFE, 0x60, 0x0E, 0x24, 0xF8, 0x70, 0x2A, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, -+0x90, 0x05, 0x22, 0xF0, 0x22, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x22, 0xE4, 0xF0, -+0x22, 0x90, 0x8B, 0x2D, 0x74, 0x03, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x22, 0x90, 0x01, -+0xC6, 0xE0, 0x44, 0x08, 0xF0, 0x22, 0xAE, 0x07, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x18, -+0x90, 0x8B, 0x2C, 0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x20, 0xE0, 0x0C, 0xAF, 0x06, 0x7D, 0x01, -+0x12, 0x45, 0xA2, 0xB1, 0xC1, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0x90, 0x01, 0x57, 0xE0, 0x60, -+0x3C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x1B, 0xE0, -+0x60, 0x07, 0xE4, 0xF0, 0x53, 0x25, 0xFD, 0x80, 0x24, 0x90, 0x8B, 0x0C, 0xE0, 0x04, 0xF0, 0x53, -+0x25, 0xEF, 0x90, 0x8B, 0x10, 0xE0, 0xFF, 0x90, 0x8B, 0x0C, 0xE0, 0xD3, 0x9F, 0x40, 0x0E, 0xE5, -+0x21, 0xB4, 0x01, 0x09, 0x90, 0x8B, 0x0D, 0xE0, 0x70, 0x03, 0xE0, 0x04, 0xF0, 0x90, 0x01, 0x5B, -+0xE0, 0x60, 0x10, 0x90, 0x01, 0x5B, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, 0xE4, 0x90, -+0x8B, 0x18, 0xF0, 0x90, 0x01, 0x5F, 0xE0, 0x60, 0x10, 0x90, 0x01, 0x5F, 0xE4, 0xF0, 0x90, 0x01, -+0x3C, 0x74, 0x08, 0xF0, 0xE4, 0x90, 0x8B, 0x17, 0xF0, 0x22, 0xE4, 0x90, 0x8B, 0x4F, 0xF0, 0xA3, -+0xF0, 0x90, 0x05, 0xF8, 0xE0, 0x70, 0x0F, 0xA3, 0xE0, 0x70, 0x0B, 0xA3, 0xE0, 0x70, 0x07, 0xA3, -+0xE0, 0x70, 0x03, 0x7F, 0x01, 0x22, 0xD3, 0x90, 0x8B, 0x50, 0xE0, 0x94, 0xE8, 0x90, 0x8B, 0x4F, -+0xE0, 0x94, 0x03, 0x40, 0x03, 0x7F, 0x00, 0x22, 0x7F, 0x32, 0x7E, 0x00, 0x12, 0x37, 0x54, 0x90, -+0x8B, 0x4F, 0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x80, 0xC6, 0x00, 0x92, 0x00}; -+ -+// =================== v88 UMC A Cut P2PPS with CCX report C2H 2012-12-05 ===================== -+u8 Rtl8192CUFwUMCACutImgArray[UMCACutImgArrayLength] = { -+0xC1, 0x88, 0x02, 0x05, 0x58, 0x00, 0x02, 0x00, 0x12, 0x05, 0x17, 0x11, 0xDE, 0x3E, 0x01, 0x00, -+0x94, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x02, 0x46, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x02, 0x60, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x02, 0x68, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4B, 0x87, 0x00, 0x00, -+0x05, 0x04, 0x03, 0x02, 0x00, 0x03, 0x06, 0x05, 0x04, 0x03, 0x00, 0x04, 0x06, 0x05, 0x04, 0x02, -+0x00, 0x04, 0x08, 0x07, 0x06, 0x04, 0x00, 0x06, 0x0A, 0x09, 0x08, 0x06, 0x00, 0x08, 0x0A, 0x09, -+0x08, 0x04, 0x00, 0x08, 0x0A, 0x09, 0x08, 0x02, 0x00, 0x08, 0x0A, 0x09, 0x08, 0x00, 0x00, 0x08, -+0x12, 0x11, 0x10, 0x08, 0x00, 0x10, 0x1A, 0x19, 0x18, 0x10, 0x00, 0x18, 0x22, 0x21, 0x20, 0x18, -+0x00, 0x20, 0x22, 0x21, 0x20, 0x10, 0x00, 0x20, 0x22, 0x21, 0x20, 0x08, 0x00, 0x20, 0x22, 0x21, -+0x1C, 0x08, 0x00, 0x20, 0x22, 0x21, 0x14, 0x08, 0x00, 0x20, 0x22, 0x20, 0x18, 0x08, 0x00, 0x20, -+0x31, 0x30, 0x20, 0x10, 0x00, 0x30, 0x31, 0x30, 0x18, 0x00, 0x00, 0x30, 0x31, 0x2F, 0x10, 0x10, -+0x00, 0x30, 0x31, 0x2C, 0x10, 0x10, 0x00, 0x30, 0x31, 0x28, 0x10, 0x00, 0x00, 0x30, 0x31, 0x20, -+0x10, 0x00, 0x00, 0x30, 0x31, 0x10, 0x10, 0x00, 0x00, 0x30, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, -+0x05, 0x07, 0x07, 0x07, 0x08, 0x0A, 0x04, 0x04, 0x04, 0x04, 0x06, 0x0A, 0x0B, 0x0D, 0x05, 0x05, -+0x07, 0x07, 0x08, 0x0B, 0x0D, 0x0F, 0x04, 0x04, 0x04, 0x05, 0x07, 0x07, 0x09, 0x09, 0x0C, 0x0E, -+0x10, 0x12, 0x06, 0x07, 0x09, 0x0A, 0x0C, 0x0E, 0x11, 0x13, 0x09, 0x09, 0x09, 0x09, 0x0C, 0x0E, -+0x11, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x26, 0x2A, 0x18, 0x1A, -+0x1D, 0x1F, 0x21, 0x27, 0x29, 0x2A, 0x00, 0x00, 0x00, 0x1F, 0x23, 0x28, 0x2A, 0x2C, 0x00, 0x04, -+0x00, 0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x18, 0x00, 0x24, 0x00, 0x30, 0x00, 0x48, 0x00, 0x60, -+0x00, 0x90, 0x00, 0xC0, 0x00, 0xD8, 0x00, 0x50, 0x00, 0x78, 0x00, 0xA0, 0x00, 0xC8, 0x01, 0x40, -+0x01, 0x90, 0x01, 0xE0, 0x02, 0x30, 0x01, 0x2C, 0x01, 0x40, 0x01, 0xE0, 0x02, 0xD0, 0x03, 0xE8, -+0x04, 0xB0, 0x06, 0x40, 0x07, 0xD0, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00, 0x0C, -+0x00, 0x12, 0x00, 0x18, 0x00, 0x24, 0x00, 0x30, 0x00, 0x48, 0x00, 0x60, 0x00, 0x6C, 0x00, 0x28, -+0x00, 0x3C, 0x00, 0x50, 0x00, 0x64, 0x00, 0xA0, 0x00, 0xC8, 0x00, 0xF0, 0x01, 0x18, 0x00, 0x64, -+0x00, 0xA0, 0x00, 0xF0, 0x01, 0x68, 0x01, 0xF4, 0x02, 0x58, 0x03, 0x20, 0x03, 0xE8, 0x02, 0x02, -+0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x07, 0x02, 0x03, 0x04, 0x0A, 0x0C, 0x0E, -+0x10, 0x12, 0x05, 0x07, 0x07, 0x08, 0x0B, 0x12, 0x24, 0x3C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, -+0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x05, 0x06, -+0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x20, 0x1E, 0x1C, 0x18, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0xBB, 0x01, 0x0C, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE0, 0x22, 0x50, -+0x06, 0xE9, 0x25, 0x82, 0xF8, 0xE6, 0x22, 0xBB, 0xFE, 0x06, 0xE9, 0x25, 0x82, 0xF8, 0xE2, 0x22, -+0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE4, 0x93, 0x22, 0xBB, 0x01, 0x06, -+0x89, 0x82, 0x8A, 0x83, 0xF0, 0x22, 0x50, 0x02, 0xF7, 0x22, 0xBB, 0xFE, 0x01, 0xF3, 0x22, 0xF8, -+0xBB, 0x01, 0x0D, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE8, 0xF0, 0x22, -+0x50, 0x06, 0xE9, 0x25, 0x82, 0xC8, 0xF6, 0x22, 0xBB, 0xFE, 0x05, 0xE9, 0x25, 0x82, 0xC8, 0xF2, -+0x22, 0xC5, 0xF0, 0xF8, 0xA3, 0xE0, 0x28, 0xF0, 0xC5, 0xF0, 0xF8, 0xE5, 0x82, 0x15, 0x82, 0x70, -+0x02, 0x15, 0x83, 0xE0, 0x38, 0xF0, 0x22, 0xBB, 0x01, 0x0A, 0x89, 0x82, 0x8A, 0x83, 0xE0, 0xF5, -+0xF0, 0xA3, 0xE0, 0x22, 0x50, 0x06, 0x87, 0xF0, 0x09, 0xE7, 0x19, 0x22, 0xBB, 0xFE, 0x07, 0xE3, -+0xF5, 0xF0, 0x09, 0xE3, 0x19, 0x22, 0x89, 0x82, 0x8A, 0x83, 0xE4, 0x93, 0xF5, 0xF0, 0x74, 0x01, -+0x93, 0x22, 0xBB, 0x01, 0x10, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE0, -+0xF5, 0xF0, 0xA3, 0xE0, 0x22, 0x50, 0x09, 0xE9, 0x25, 0x82, 0xF8, 0x86, 0xF0, 0x08, 0xE6, 0x22, -+0xBB, 0xFE, 0x0A, 0xE9, 0x25, 0x82, 0xF8, 0xE2, 0xF5, 0xF0, 0x08, 0xE2, 0x22, 0xE5, 0x83, 0x2A, -+0xF5, 0x83, 0xE9, 0x93, 0xF5, 0xF0, 0xA3, 0xE9, 0x93, 0x22, 0xBB, 0x01, 0x0A, 0x89, 0x82, 0x8A, -+0x83, 0xF0, 0xE5, 0xF0, 0xA3, 0xF0, 0x22, 0x50, 0x06, 0xF7, 0x09, 0xA7, 0xF0, 0x19, 0x22, 0xBB, -+0xFE, 0x06, 0xF3, 0xE5, 0xF0, 0x09, 0xF3, 0x19, 0x22, 0xF8, 0xBB, 0x01, 0x11, 0xE5, 0x82, 0x29, -+0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE8, 0xF0, 0xE5, 0xF0, 0xA3, 0xF0, 0x22, 0x50, 0x09, -+0xE9, 0x25, 0x82, 0xC8, 0xF6, 0x08, 0xA6, 0xF0, 0x22, 0xBB, 0xFE, 0x09, 0xE9, 0x25, 0x82, 0xC8, -+0xF2, 0xE5, 0xF0, 0x08, 0xF2, 0x22, 0xEF, 0x4B, 0xFF, 0xEE, 0x4A, 0xFE, 0xED, 0x49, 0xFD, 0xEC, -+0x48, 0xFC, 0x22, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0xA3, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0x22, 0xA4, -+0x25, 0x82, 0xF5, 0x82, 0xE5, 0xF0, 0x35, 0x83, 0xF5, 0x83, 0x22, 0xE0, 0xFB, 0xA3, 0xE0, 0xFA, -+0xA3, 0xE0, 0xF9, 0x22, 0xF8, 0xE0, 0xFB, 0xA3, 0xA3, 0xE0, 0xF9, 0x25, 0xF0, 0xF0, 0xE5, 0x82, -+0x15, 0x82, 0x70, 0x02, 0x15, 0x83, 0xE0, 0xFA, 0x38, 0xF0, 0x22, 0xEB, 0xF0, 0xA3, 0xEA, 0xF0, -+0xA3, 0xE9, 0xF0, 0x22, 0xD0, 0x83, 0xD0, 0x82, 0xF8, 0xE4, 0x93, 0x70, 0x12, 0x74, 0x01, 0x93, -+0x70, 0x0D, 0xA3, 0xA3, 0x93, 0xF8, 0x74, 0x01, 0x93, 0xF5, 0x82, 0x88, 0x83, 0xE4, 0x73, 0x74, -+0x02, 0x93, 0x68, 0x60, 0xEF, 0xA3, 0xA3, 0xA3, 0x80, 0xDF, 0xD0, 0x83, 0xD0, 0x82, 0xF8, 0xE4, -+0x93, 0x70, 0x12, 0x74, 0x01, 0x93, 0x70, 0x0D, 0xA3, 0xA3, 0x93, 0xF8, 0x74, 0x01, 0x93, 0xF5, -+0x82, 0x88, 0x83, 0xE4, 0x73, 0x74, 0x02, 0x93, 0xB5, 0xF0, 0x06, 0x74, 0x03, 0x93, 0x68, 0x60, -+0xE9, 0xA3, 0xA3, 0xA3, 0xA3, 0x80, 0xD8, 0xE4, 0x90, 0x8A, 0xC5, 0xF0, 0xE5, 0x24, 0x70, 0x03, -+0x02, 0x44, 0x9D, 0xE5, 0x21, 0x64, 0x01, 0x60, 0x03, 0x02, 0x44, 0x9D, 0xE5, 0x24, 0x14, 0x60, -+0x29, 0x24, 0xFD, 0x60, 0x25, 0x24, 0x02, 0x24, 0xFB, 0x50, 0x02, 0x80, 0x23, 0x90, 0x8B, 0x0B, -+0xE0, 0x14, 0xF0, 0xE0, 0x60, 0x04, 0xA3, 0xE0, 0x60, 0x16, 0x90, 0x8B, 0x0B, 0xE0, 0x70, 0x0A, -+0x90, 0x8B, 0x19, 0xE0, 0x90, 0x8B, 0x0B, 0xF0, 0x80, 0x00, 0x90, 0x8A, 0xC5, 0x74, 0x01, 0xF0, -+0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x16, 0xA3, 0xE0, 0xB4, 0x06, 0x05, 0xE4, 0x90, 0x8A, 0xC5, -+0xF0, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x70, 0x04, 0x90, 0x8A, 0xC5, 0xF0, 0x90, 0x8A, 0xC5, -+0xE0, 0x60, 0x4A, 0x43, 0x25, 0x10, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0C, 0xE0, 0x75, -+0xF0, 0x03, 0xA4, 0xFF, 0x90, 0x8B, 0x15, 0xE0, 0x2F, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, 0x05, 0xF0, 0xE5, 0x22, 0x54, -+0x0F, 0xC3, 0x94, 0x04, 0x50, 0x07, 0x7D, 0x01, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x90, 0x8B, 0x2C, -+0xE0, 0x30, 0xE0, 0x09, 0x12, 0x7D, 0xC1, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x22, 0xE4, 0xF5, -+0x25, 0xF5, 0x24, 0x75, 0x23, 0x0C, 0x75, 0x22, 0x0C, 0x90, 0x8B, 0x1A, 0xF0, 0x90, 0x8B, 0x18, -+0xF0, 0x90, 0x8B, 0x17, 0xF0, 0x90, 0x8B, 0x19, 0x04, 0xF0, 0x90, 0x8B, 0x0B, 0xF0, 0xE4, 0x90, -+0x8B, 0x1B, 0xF0, 0x90, 0x8B, 0x0D, 0xF0, 0x90, 0x8B, 0x15, 0x74, 0x05, 0xF0, 0xE4, 0x90, 0x8B, -+0x0C, 0xF0, 0x90, 0x8B, 0x13, 0xF0, 0xA3, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x10, 0xF0, 0xA3, 0x74, -+0x05, 0xF0, 0x90, 0x8B, 0x0F, 0x74, 0x14, 0xF0, 0x90, 0x8B, 0x16, 0x74, 0x05, 0xF0, 0xE4, 0x90, -+0x8B, 0x0E, 0xF0, 0x90, 0x8B, 0x0A, 0xF0, 0x90, 0x8B, 0x08, 0xF0, 0x90, 0x8B, 0x12, 0xF0, 0x22, -+0x7F, 0x00, 0x22, 0x02, 0x45, 0x03, 0x02, 0x45, 0x06, 0x8E, 0x64, 0x8F, 0x65, 0xAD, 0x65, 0xAC, -+0x64, 0xAF, 0x63, 0x12, 0x4A, 0x5B, 0xAF, 0x65, 0xAE, 0x64, 0x90, 0x04, 0x80, 0xE0, 0x54, 0x0F, -+0xFD, 0xAC, 0x07, 0x74, 0x11, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x01, -+0xF0, 0x74, 0x11, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xFB, 0xF0, 0xAC, -+0x07, 0x74, 0x16, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0xFA, 0xF0, 0x74, -+0x15, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x1F, 0xF0, 0xAC, 0x07, 0x74, -+0x06, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x0F, 0xF0, 0x90, 0x04, 0x53, -+0xE4, 0xF0, 0x90, 0x04, 0x52, 0xF0, 0x90, 0x04, 0x51, 0x74, 0xFF, 0xF0, 0x90, 0x04, 0x50, 0x74, -+0xFD, 0xF0, 0x74, 0x14, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xC0, 0x4D, -+0xFD, 0x74, 0x14, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xED, 0xF0, 0x22, 0x7D, 0x01, -+0x7F, 0x0C, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, 0x67, 0x8D, 0x68, 0xE5, 0x67, 0x54, -+0x0F, 0xFF, 0xE5, 0x22, 0x54, 0x0F, 0x6F, 0x60, 0x72, 0xE5, 0x67, 0x30, 0xE2, 0x30, 0xE5, 0x22, -+0x20, 0xE2, 0x05, 0x7F, 0x01, 0x12, 0x4A, 0xB2, 0xE5, 0x22, 0x30, 0xE3, 0x10, 0xE5, 0x67, 0x20, -+0xE3, 0x0B, 0x12, 0x49, 0xD5, 0xEF, 0x60, 0x53, 0x12, 0x4A, 0xCC, 0x80, 0x4E, 0xE5, 0x22, 0x20, -+0xE3, 0x49, 0xE5, 0x67, 0x30, 0xE3, 0x44, 0xAF, 0x68, 0x12, 0x4A, 0x7C, 0x80, 0x3D, 0xE5, 0x22, -+0x54, 0x0F, 0xFF, 0xBF, 0x0C, 0x0E, 0xE5, 0x67, 0x20, 0xE3, 0x09, 0x12, 0x49, 0xD5, 0xEF, 0x60, -+0x2A, 0x12, 0x4A, 0xCC, 0xE5, 0x22, 0x54, 0x0F, 0xFF, 0xBF, 0x04, 0x0E, 0xE5, 0x67, 0x20, 0xE2, -+0x09, 0x12, 0x49, 0x93, 0xEF, 0x60, 0x14, 0x12, 0x4A, 0x32, 0xE5, 0x22, 0x54, 0x0F, 0xFF, 0xBF, -+0x02, 0x09, 0x12, 0x45, 0x00, 0xEF, 0x60, 0x03, 0x12, 0x4B, 0x10, 0xD0, 0xD0, 0x92, 0xAF, 0x22, -+0x02, 0x46, 0x6E, 0x02, 0x50, 0xC6, 0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0x40, 0x03, 0xF6, -+0x80, 0x01, 0xF2, 0x08, 0xDF, 0xF4, 0x80, 0x29, 0xE4, 0x93, 0xA3, 0xF8, 0x54, 0x07, 0x24, 0x0C, -+0xC8, 0xC3, 0x33, 0xC4, 0x54, 0x0F, 0x44, 0x20, 0xC8, 0x83, 0x40, 0x04, 0xF4, 0x56, 0x80, 0x01, -+0x46, 0xF6, 0xDF, 0xE4, 0x80, 0x0B, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x90, 0x4B, -+0x23, 0xE4, 0x7E, 0x01, 0x93, 0x60, 0xBC, 0xA3, 0xFF, 0x54, 0x3F, 0x30, 0xE5, 0x09, 0x54, 0x1F, -+0xFE, 0xE4, 0x93, 0xA3, 0x60, 0x01, 0x0E, 0xCF, 0x54, 0xC0, 0x25, 0xE0, 0x60, 0xA8, 0x40, 0xB8, -+0xE4, 0x93, 0xA3, 0xFA, 0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0xC8, 0xC5, 0x82, 0xC8, 0xCA, -+0xC5, 0x83, 0xCA, 0xF0, 0xA3, 0xC8, 0xC5, 0x82, 0xC8, 0xCA, 0xC5, 0x83, 0xCA, 0xDF, 0xE9, 0xDE, -+0xE7, 0x80, 0xBE, 0xE5, 0x21, 0x64, 0x01, 0x70, 0x67, 0xE5, 0x24, 0x60, 0x63, 0xE5, 0x24, 0x64, -+0x02, 0x60, 0x06, 0xE5, 0x24, 0x64, 0x05, 0x70, 0x27, 0x90, 0x06, 0xAB, 0xE0, 0x90, 0x8B, 0x0B, -+0xF0, 0x90, 0x06, 0xAA, 0xE0, 0x90, 0x8B, 0x19, 0xF0, 0x90, 0x8B, 0x0B, 0xE0, 0x70, 0x07, 0x90, -+0x8B, 0x19, 0xE0, 0xFF, 0x80, 0x05, 0x90, 0x8B, 0x0B, 0xE0, 0xFF, 0x90, 0x8B, 0x0B, 0xEF, 0xF0, -+0x90, 0x8B, 0x0D, 0xE0, 0x60, 0x02, 0xE4, 0xF0, 0xE4, 0x90, 0x8B, 0x0C, 0xF0, 0x90, 0x05, 0x58, -+0x74, 0x03, 0xF0, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x53, 0x25, -+0xFD, 0x53, 0x25, 0xEF, 0xE5, 0x24, 0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x03, 0x12, 0x47, 0x8E, -+0x22, 0xEF, 0x64, 0x01, 0x70, 0x35, 0x7D, 0x78, 0x7F, 0x02, 0x12, 0x31, 0x2C, 0x7D, 0x02, 0x7F, -+0x03, 0x12, 0x31, 0x2C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x12, -+0x45, 0x9E, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x03, 0x12, 0x7D, 0xC1, 0x90, 0x06, 0x04, 0xE0, -+0x54, 0x7F, 0xF0, 0x90, 0x06, 0x0A, 0xE0, 0x54, 0xF8, 0xF0, 0x22, 0x90, 0x01, 0x36, 0x74, 0x7B, -+0xF0, 0xA3, 0x74, 0x02, 0xF0, 0x7D, 0x7B, 0xFF, 0x12, 0x31, 0x9D, 0x7D, 0x02, 0x7F, 0x03, 0x12, -+0x31, 0x9D, 0x90, 0x06, 0x04, 0xE0, 0x44, 0x80, 0xF0, 0x90, 0x06, 0x0A, 0xE0, 0x44, 0x07, 0xF0, -+0x12, 0x4B, 0x4F, 0xE5, 0x21, 0x20, 0xE0, 0x05, 0xE4, 0x90, 0x8B, 0x0D, 0xF0, 0x22, 0xE4, 0x90, -+0x8A, 0xC5, 0xF0, 0x90, 0x06, 0xA9, 0xE0, 0x90, 0x8A, 0xC5, 0xF0, 0xE0, 0x54, 0xC0, 0x70, 0x09, -+0x53, 0x25, 0xFE, 0x53, 0x25, 0xFD, 0x12, 0x4A, 0xFC, 0x90, 0x8A, 0xC5, 0xE0, 0x30, 0xE6, 0x15, -+0x43, 0x25, 0x01, 0x90, 0x8B, 0x1A, 0xE0, 0x64, 0x02, 0x60, 0x05, 0x12, 0x4A, 0x97, 0x80, 0x08, -+0x12, 0x49, 0x49, 0x80, 0x03, 0x53, 0x25, 0xFE, 0x90, 0x8A, 0xC5, 0xE0, 0x30, 0xE7, 0x27, 0x43, -+0x25, 0x02, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x11, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, -+0xFB, 0xFD, 0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, 0x05, 0xF0, 0x90, -+0x8B, 0x1B, 0x74, 0x01, 0xF0, 0x22, 0x53, 0x25, 0xFD, 0x22, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x8B, -+0x12, 0x4B, 0x43, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x12, 0x24, 0x62, 0xF5, 0x24, 0x14, 0x60, -+0x0E, 0x14, 0x60, 0x1F, 0x14, 0x60, 0x31, 0x24, 0x03, 0x70, 0x44, 0x7F, 0x01, 0x80, 0x3D, 0x90, -+0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFD, 0xE4, 0xFF, 0x12, 0x4A, -+0x07, 0x80, 0x29, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFD, -+0x7F, 0x01, 0x12, 0x4A, 0x07, 0x1F, 0x80, 0x14, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, -+0x02, 0x12, 0x42, 0x20, 0xFD, 0x7F, 0x02, 0x12, 0x4A, 0x07, 0xE4, 0xFF, 0x12, 0x47, 0x21, 0x22, -+0xE4, 0x90, 0x8A, 0xCB, 0xF0, 0xE5, 0x24, 0x60, 0x49, 0x90, 0x8B, 0x1B, 0xE0, 0x60, 0x0D, 0xE4, -+0xF0, 0x53, 0x25, 0xFD, 0xE5, 0x25, 0x54, 0x07, 0x70, 0x38, 0x80, 0x33, 0x90, 0x8B, 0x0C, 0xE0, -+0x04, 0xF0, 0x53, 0x25, 0xEF, 0x90, 0x8A, 0xCB, 0xE0, 0xFF, 0x90, 0x8B, 0x10, 0xE0, 0x2F, 0xFF, -+0xE4, 0x33, 0xFE, 0x90, 0x8B, 0x0C, 0xE0, 0xD3, 0x9F, 0xEE, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, -+0x40, 0x0D, 0xE5, 0x21, 0xB4, 0x01, 0x0B, 0xA3, 0xE0, 0x70, 0x07, 0xE0, 0x04, 0xF0, 0x22, 0x12, -+0x4A, 0xFC, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, 0x63, 0x90, 0x04, 0x1D, 0xE0, -+0x60, 0x24, 0x90, 0x05, 0x22, 0xE0, 0xF5, 0x66, 0x74, 0xFF, 0xF0, 0x12, 0x7E, 0x9A, 0xBF, 0x01, -+0x0D, 0x90, 0x8A, 0xF9, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xFD, 0x12, 0x45, 0x09, 0x90, 0x05, -+0x22, 0xE5, 0x66, 0xF0, 0x80, 0x0D, 0x90, 0x8A, 0xF9, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xFD, -+0x12, 0x45, 0x09, 0x90, 0x04, 0x1F, 0x74, 0x20, 0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE5, 0x24, -+0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x41, 0x90, 0x8B, 0x1A, 0xE0, 0x60, 0x2B, 0x12, 0x45, 0x9E, -+0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x58, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, -+0x74, 0x01, 0xF0, 0x90, 0x8B, 0x18, 0xF0, 0x22, 0xE5, 0x22, 0x54, 0x0F, 0xC3, 0x94, 0x04, 0x50, -+0x07, 0x7D, 0x01, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x22, 0x90, 0x01, 0x5F, 0xE4, 0xF0, 0x90, 0x01, -+0x3C, 0x74, 0x08, 0xF0, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, -+0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x5C, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x5F, 0x74, 0x05, -+0xF0, 0x90, 0x06, 0x92, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x17, 0x14, 0xF0, 0xE5, 0x22, 0x54, 0x0F, -+0xC3, 0x94, 0x0C, 0x50, 0x0D, 0x12, 0x45, 0x9E, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x03, 0x12, -+0x7D, 0xC1, 0x22, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x37, 0xE5, 0x25, 0x54, 0x03, 0x70, -+0x31, 0xE5, 0x23, 0x54, 0x0F, 0xD3, 0x94, 0x02, 0x50, 0x28, 0xE5, 0x25, 0x20, 0xE2, 0x23, 0xE5, -+0x25, 0x20, 0xE4, 0x1E, 0x90, 0x8B, 0x0D, 0xE0, 0x70, 0x18, 0x90, 0x8B, 0x12, 0xE0, 0x70, 0x12, -+0xE5, 0x26, 0x70, 0x0E, 0x90, 0x01, 0xB9, 0xE4, 0xF0, 0x90, 0x01, 0xB8, 0x74, 0x04, 0xF0, 0x7F, -+0x01, 0x22, 0x7F, 0x00, 0x22, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x27, 0x90, 0x8B, 0x18, -+0xE0, 0x70, 0x21, 0x90, 0x8B, 0x17, 0xE0, 0x70, 0x1B, 0xE5, 0x23, 0x54, 0x0F, 0xD3, 0x94, 0x04, -+0x50, 0x12, 0xE5, 0x26, 0x70, 0x0E, 0x90, 0x01, 0xB9, 0xE4, 0xF0, 0x90, 0x01, 0xB8, 0x74, 0x08, -+0xF0, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0xEF, 0x24, 0xFE, 0x60, 0x0B, 0x04, 0x70, 0x22, 0x90, -+0x8B, 0x19, 0x74, 0x01, 0xF0, 0x80, 0x16, 0xED, 0x70, 0x0A, 0x90, 0x8B, 0x16, 0xE0, 0x90, 0x8B, -+0x19, 0xF0, 0x80, 0x05, 0x90, 0x8B, 0x19, 0xED, 0xF0, 0x90, 0x8B, 0x19, 0xE0, 0x90, 0x8B, 0x0B, -+0xF0, 0x22, 0x90, 0x01, 0x37, 0x74, 0x02, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x7E, -+0x9A, 0xEF, 0x70, 0x06, 0x90, 0x01, 0xC8, 0x74, 0xFD, 0xF0, 0x7D, 0x02, 0x7F, 0x03, 0x12, 0x31, -+0x9D, 0x12, 0x7C, 0x50, 0x53, 0x22, 0xF0, 0x43, 0x22, 0x02, 0x22, 0xEF, 0x60, 0x0F, 0x74, 0x21, -+0x2D, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x10, 0xF0, 0x22, 0x74, 0x21, 0x2D, -+0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xEF, 0xF0, 0x22, 0x90, 0x06, 0x04, 0xE0, -+0x54, 0xBF, 0xF0, 0xEF, 0x60, 0x0A, 0xE5, 0x21, 0xB4, 0x01, 0x05, 0xE4, 0xFF, 0x12, 0x48, 0xB3, -+0x53, 0x22, 0xF0, 0x43, 0x22, 0x0C, 0x22, 0x90, 0x04, 0x1D, 0xE0, 0x70, 0x14, 0x90, 0x8A, 0xF8, -+0xE0, 0xFF, 0xE4, 0xFD, 0x12, 0x5F, 0xFD, 0x8E, 0x69, 0x8F, 0x6A, 0x90, 0x04, 0x1F, 0x74, 0x20, -+0xF0, 0x22, 0x90, 0x8B, 0x52, 0xEF, 0xF0, 0x12, 0x7D, 0x42, 0x90, 0x8B, 0x52, 0xE0, 0x60, 0x05, -+0x90, 0x05, 0x22, 0xE4, 0xF0, 0x53, 0x22, 0xF0, 0x43, 0x22, 0x04, 0x22, 0x90, 0x06, 0x04, 0xE0, -+0x44, 0x40, 0xF0, 0xE5, 0x21, 0xB4, 0x01, 0x05, 0x7F, 0x01, 0x12, 0x48, 0xB3, 0x53, 0x22, 0xF0, -+0x43, 0x22, 0x04, 0x22, 0xE5, 0x23, 0x30, 0xE6, 0x12, 0xE5, 0x23, 0x54, 0x0F, 0xFF, 0x90, 0x01, -+0x2F, 0xE0, 0x54, 0x80, 0x4F, 0x64, 0x80, 0xF0, 0x53, 0x23, 0xBF, 0x22, 0x90, 0x8B, 0x2C, 0xE0, -+0x30, 0xE0, 0x05, 0xAF, 0x23, 0x02, 0x7E, 0x06, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x22, -+0x53, 0x22, 0xF0, 0x43, 0x22, 0x01, 0x12, 0x4B, 0x5A, 0x12, 0x4B, 0x5B, 0x53, 0x22, 0xF0, 0x43, -+0x22, 0x02, 0x22, 0x41, 0x8A, 0xF6, 0x00, 0x41, 0x8B, 0x05, 0x00, 0x41, 0x8B, 0x51, 0x00, 0x41, -+0x8B, 0x53, 0x00, 0x00, 0x90, 0x04, 0x1B, 0xE0, 0x54, 0x7F, 0x64, 0x7F, 0x7F, 0x01, 0x60, 0x02, -+0x7F, 0x00, 0x22, 0xE4, 0x90, 0x8B, 0x1B, 0xF0, 0x90, 0x8B, 0x0C, 0xF0, 0xF5, 0x25, 0x22, 0x90, -+0x8B, 0x13, 0xE0, 0xA3, 0xE0, 0x90, 0x05, 0x58, 0xF0, 0x22, 0x22, 0x22, 0xF0, 0x90, 0x8B, 0x0F, -+0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x58, 0x7E, 0x01, 0xD3, 0x10, 0xAF, 0x01, -+0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x3D, 0xE0, 0xFB, 0xA3, 0xE0, 0xF5, 0x44, 0xE4, 0xF5, 0x45, 0x12, -+0x30, 0x62, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, -+0xD0, 0x75, 0xD0, 0x00, 0xC0, 0x00, 0xC0, 0x01, 0xC0, 0x02, 0xC0, 0x03, 0xC0, 0x04, 0xC0, 0x05, -+0xC0, 0x06, 0xC0, 0x07, 0x75, 0x0E, 0x00, 0x90, 0x01, 0xC4, 0x74, 0x87, 0xF0, 0x74, 0x4B, 0xA3, -+0xF0, 0x53, 0x91, 0xDF, 0x90, 0x01, 0x3C, 0xE0, 0x55, 0x30, 0xF5, 0x34, 0xA3, 0xE0, 0x55, 0x31, -+0xF5, 0x35, 0xA3, 0xE0, 0x55, 0x32, 0xF5, 0x36, 0xA3, 0xE0, 0x55, 0x33, 0xF5, 0x37, 0xE5, 0x34, -+0x30, 0xE0, 0x51, 0x90, 0x01, 0x3C, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x1F, -+0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x18, 0x90, 0x8B, 0x34, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xE0, -+0x64, 0x03, 0x60, 0x0B, 0x7F, 0x01, 0xB1, 0xE0, 0xEF, 0x70, 0x04, 0x7F, 0x02, 0xD1, 0x89, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x1D, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x16, 0x90, 0x8B, -+0x2E, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x09, 0xE4, 0xFF, 0xB1, 0xE0, 0xEF, -+0x70, 0x02, 0xD1, 0x56, 0xE5, 0x34, 0x30, 0xE1, 0x08, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x11, -+0x60, 0xE5, 0x34, 0x30, 0xE2, 0x28, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, 0x90, 0x06, 0x92, 0xE0, -+0x30, 0xE0, 0x14, 0x90, 0x8B, 0x3D, 0xE4, 0x71, 0x5C, 0x90, 0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, -+0x06, 0x92, 0x74, 0x01, 0xF0, 0x80, 0x07, 0x90, 0x8B, 0x18, 0xE4, 0xF0, 0x51, 0xFC, 0xE5, 0x34, -+0x30, 0xE3, 0x38, 0x90, 0x01, 0x3C, 0x74, 0x08, 0xF0, 0x90, 0x06, 0x92, 0xE0, 0x30, 0xE1, 0x24, -+0x90, 0x8B, 0x3D, 0xE4, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x5C, 0x7E, 0x01, 0x71, 0x6C, 0x90, 0x01, 0x5F, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, 0x74, -+0x02, 0xF0, 0x80, 0x07, 0x90, 0x8B, 0x17, 0xE4, 0xF0, 0x51, 0xFC, 0xE5, 0x34, 0x30, 0xE4, 0x09, -+0x90, 0x01, 0x3C, 0x74, 0x10, 0xF0, 0x12, 0x51, 0xC9, 0xE5, 0x34, 0x30, 0xE5, 0x06, 0x90, 0x01, -+0x3C, 0x74, 0x20, 0xF0, 0xE5, 0x35, 0x30, 0xE0, 0x10, 0x90, 0x01, 0x3D, 0x74, 0x01, 0xF0, 0x90, -+0x00, 0x83, 0xE0, 0xF5, 0x23, 0x51, 0xE4, 0x51, 0xFC, 0xE5, 0x35, 0x30, 0xE2, 0x06, 0x90, 0x01, -+0x3D, 0x74, 0x04, 0xF0, 0xE5, 0x35, 0x30, 0xE4, 0x1B, 0x90, 0x01, 0x3D, 0x74, 0x10, 0xF0, 0x90, -+0x8B, 0x05, 0xE0, 0x60, 0x0F, 0xE4, 0xF0, 0x90, 0x05, 0x53, 0xE0, 0x44, 0x01, 0xF0, 0x90, 0x05, -+0xFD, 0xE0, 0x04, 0xF0, 0xE5, 0x36, 0x30, 0xE0, 0x75, 0x90, 0x01, 0x3E, 0x74, 0x01, 0xF0, 0x90, -+0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x18, 0x90, 0x8B, 0x36, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x64, -+0x03, 0x60, 0x0B, 0x7F, 0x01, 0xB1, 0xE0, 0xEF, 0x60, 0x04, 0x7F, 0x01, 0xD1, 0x89, 0x90, 0x8B, -+0x2C, 0xE0, 0x30, 0xE0, 0x49, 0x90, 0x8B, 0x30, 0xE4, 0xF0, 0xFF, 0xB1, 0xE0, 0xEF, 0x60, 0x3E, -+0x12, 0x65, 0x5F, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0x64, 0x06, 0x60, 0x32, 0xEF, 0xB4, 0x04, 0x02, -+0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, 0x80, 0x14, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x05, 0x7F, -+0x01, 0x12, 0x65, 0x82, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x12, 0x7D, 0xC1, 0xE5, 0x36, -+0x30, 0xE1, 0x47, 0x90, 0x01, 0x3E, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x19, -+0x90, 0x8B, 0x36, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x64, 0x03, 0x60, 0x0B, 0x7F, 0x01, -+0xB1, 0xE0, 0xEF, 0x70, 0x04, 0x7F, 0x02, 0xD1, 0x89, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x1A, -+0x90, 0x8B, 0x30, 0x74, 0x01, 0xF0, 0x12, 0x7E, 0x2B, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, -+0x09, 0xE4, 0xFF, 0xB1, 0xE0, 0xEF, 0x70, 0x02, 0xD1, 0x56, 0x74, 0x87, 0x04, 0x90, 0x01, 0xC4, -+0xF0, 0x74, 0x4B, 0xA3, 0xF0, 0xD0, 0x07, 0xD0, 0x06, 0xD0, 0x05, 0xD0, 0x04, 0xD0, 0x03, 0xD0, -+0x02, 0xD0, 0x01, 0xD0, 0x00, 0xD0, 0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0, 0xE0, 0x32, -+0xEF, 0x64, 0x01, 0x70, 0x3D, 0x90, 0x8B, 0x35, 0xE0, 0x60, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, -+0x08, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x34, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, -+0x90, 0x8B, 0x32, 0xE0, 0xFF, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x0B, 0xEF, 0xC4, 0x13, 0x54, -+0x07, 0x30, 0xE0, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x36, 0xE0, 0x7F, 0x01, 0x60, 0x36, 0x7F, -+0x00, 0x22, 0x90, 0x8B, 0x2F, 0xE0, 0x60, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x08, 0xE0, 0x60, -+0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x2E, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x2C, -+0xE0, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x30, 0xE0, 0x7F, -+0x01, 0x60, 0x02, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x0D, 0xE0, 0x60, 0x16, 0x90, 0x8B, 0x2D, 0xE0, -+0x70, 0x04, 0x7F, 0x05, 0x80, 0x1F, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x01, 0x70, 0x1A, 0x7F, 0x02, -+0x80, 0x13, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, 0x04, 0x7F, 0x03, 0x80, 0x08, 0x90, 0x8B, 0x2D, -+0xE0, 0x70, 0x05, 0x7F, 0x04, 0x12, 0x65, 0x82, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x8B, 0x33, 0xE0, 0x90, 0x8B, 0x55, 0xF0, 0x6F, 0x70, 0x02, 0xE1, 0x55, 0xEF, 0x14, 0x60, -+0x3B, 0x14, 0x60, 0x5F, 0x14, 0x70, 0x02, 0xE1, 0x30, 0x24, 0x03, 0x60, 0x02, 0xE1, 0x55, 0x90, -+0x8B, 0x55, 0xE0, 0xB4, 0x03, 0x04, 0xF1, 0xC2, 0xE1, 0x55, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x02, -+0x04, 0xF1, 0xAF, 0xE1, 0x55, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x04, 0x04, 0xF1, 0xC6, 0xE1, 0x55, -+0x90, 0x8B, 0x55, 0xE0, 0x64, 0x01, 0x70, 0x7D, 0xF1, 0xB1, 0x80, 0x79, 0x90, 0x8B, 0x55, 0xE0, -+0xFF, 0xB4, 0x03, 0x04, 0xF1, 0xCA, 0x80, 0x6D, 0xEF, 0xB4, 0x02, 0x04, 0xF1, 0xA1, 0x80, 0x65, -+0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x04, 0x04, 0xF1, 0xD5, 0x80, 0x59, 0xEF, 0x70, 0x56, 0xF1, -+0x8E, 0x80, 0x52, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x03, 0x05, 0x12, 0x7C, 0x41, 0x80, 0x46, 0x90, -+0x8B, 0x55, 0xE0, 0xB4, 0x01, 0x04, 0xF1, 0x72, 0x80, 0x3B, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x04, -+0x05, 0x12, 0x7D, 0x23, 0x80, 0x2F, 0x90, 0x8B, 0x55, 0xE0, 0x70, 0x29, 0xF1, 0x70, 0x80, 0x25, -+0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x01, 0x04, 0xF1, 0x5A, 0x80, 0x19, 0xEF, 0xB4, 0x02, 0x04, -+0xF1, 0x6B, 0x80, 0x11, 0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x04, 0x04, 0xF1, 0x5A, 0x80, 0x05, -+0xEF, 0x70, 0x02, 0xF1, 0x67, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x05, 0x22, 0x74, 0x6F, 0xF0, -+0x90, 0x8B, 0x33, 0x74, 0x03, 0xF0, 0x22, 0xF1, 0x8E, 0x80, 0xEF, 0x12, 0x7D, 0x42, 0x80, 0xEA, -+0xF1, 0x8E, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x7E, 0x9A, 0xEF, 0x70, 0x06, 0x90, 0x01, -+0xC8, 0x74, 0xFD, 0xF0, 0x12, 0x7C, 0x50, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x01, -+0x3E, 0x74, 0x03, 0xF0, 0xFD, 0x7F, 0x02, 0x12, 0x31, 0xB7, 0x90, 0x8B, 0x33, 0x74, 0x01, 0xF0, -+0x22, 0x12, 0x7D, 0x42, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0x04, 0xF0, 0x22, 0xF1, -+0xA1, 0x7D, 0x03, 0x7F, 0x02, 0x12, 0x31, 0x49, 0x90, 0x05, 0x27, 0xE4, 0xF0, 0x90, 0x8B, 0x33, -+0xF0, 0x22, 0xF1, 0xCA, 0x80, 0xEB, 0xF1, 0xD5, 0x80, 0xE7, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, -+0x8B, 0x33, 0x04, 0xF0, 0x22, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0x04, 0xF0, 0x22, -+0xF1, 0x8E, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x33, 0x74, 0x04, 0xF0, 0x22, 0x90, -+0x02, 0x84, 0xEF, 0xF0, 0xA3, 0xEE, 0xF0, 0xA3, 0x74, 0x05, 0xF0, 0x22, 0xEF, 0x8E, 0xF0, 0x12, -+0x43, 0xBA, 0x50, 0x1A, 0x00, 0x40, 0x50, 0x42, 0x00, 0x80, 0x50, 0x6D, 0x01, 0x00, 0x50, 0x81, -+0x02, 0x00, 0x50, 0x99, 0x04, 0x00, 0x00, 0x00, 0x50, 0xB6, 0xED, 0x54, 0x3F, 0x70, 0x04, 0xFE, -+0xFF, 0x80, 0x04, 0x7E, 0x00, 0x7F, 0x40, 0xEF, 0x2D, 0xFF, 0xEE, 0x3C, 0xFE, 0xEF, 0x78, 0x06, -+0xCE, 0xC3, 0x13, 0xCE, 0x13, 0xD8, 0xF9, 0x78, 0x06, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, -+0x80, 0x26, 0xED, 0x54, 0x7F, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x00, 0x7F, 0x80, 0xEF, -+0x2D, 0xFF, 0xEE, 0x3C, 0xFE, 0xEF, 0x78, 0x07, 0xCE, 0xC3, 0x13, 0xCE, 0x13, 0xD8, 0xF9, 0x78, -+0x07, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFD, 0xAC, 0x06, 0x80, 0x49, 0xED, 0x70, 0x04, -+0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x01, 0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0x7D, 0x00, 0xFC, 0x80, -+0x35, 0xEC, 0x54, 0x01, 0x4D, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x02, 0x7F, 0x00, 0xEF, -+0x2D, 0xEE, 0x3C, 0xC3, 0x13, 0x7D, 0x00, 0x80, 0x1A, 0xEC, 0x54, 0x03, 0x4D, 0x70, 0x04, 0xFE, -+0xFF, 0x80, 0x04, 0x7E, 0x04, 0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0x13, 0x13, 0x54, 0x3F, 0x7D, -+0x00, 0x25, 0xE0, 0x25, 0xE0, 0xFC, 0xAE, 0x04, 0xAF, 0x05, 0x22, 0x90, 0x01, 0xE4, 0x74, 0x58, -+0xF0, 0xA3, 0x74, 0x02, 0xF0, 0x22, 0xE4, 0x90, 0x8A, 0xCC, 0xF0, 0xA3, 0xF0, 0x75, 0x8E, 0x02, -+0x91, 0x0E, 0x12, 0x68, 0x44, 0x90, 0x8B, 0x07, 0xEF, 0xF0, 0x12, 0x68, 0x51, 0x90, 0x8B, 0x09, -+0xEF, 0xF0, 0x12, 0x68, 0x5D, 0x90, 0x8A, 0xF4, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xE4, 0xF5, 0x55, -+0xF5, 0x21, 0x12, 0x72, 0x55, 0x12, 0x44, 0x9E, 0x12, 0x2E, 0x01, 0x7F, 0x03, 0x12, 0x78, 0x42, -+0x12, 0x7C, 0x3D, 0x12, 0x68, 0x0A, 0x12, 0x68, 0x75, 0x12, 0x68, 0x8A, 0x12, 0x68, 0x28, 0x12, -+0x68, 0x43, 0x90, 0x8A, 0xCE, 0xE5, 0xD9, 0xF0, 0x31, 0x5F, 0xC2, 0xAF, 0x90, 0x00, 0x80, 0xE0, -+0x44, 0x40, 0xF0, 0x51, 0x0E, 0x75, 0xE8, 0x03, 0x43, 0xA8, 0x85, 0xD2, 0xAF, 0x11, 0xBB, 0x90, -+0x8A, 0xCC, 0xE0, 0x64, 0x01, 0xF0, 0x24, 0xC6, 0x90, 0x01, 0xC4, 0xF0, 0x74, 0x50, 0xA3, 0xF0, -+0xE5, 0x55, 0x30, 0xE4, 0x09, 0xC2, 0xAF, 0x53, 0x55, 0xEF, 0xD2, 0xAF, 0xB1, 0x59, 0xE5, 0x55, -+0x30, 0xE6, 0xDC, 0xC2, 0xAF, 0x53, 0x55, 0xBF, 0xD2, 0xAF, 0x12, 0x6B, 0xBD, 0x80, 0xD0, 0x90, -+0x01, 0x3C, 0x74, 0xFF, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x01, 0x34, 0xF0, 0xA3, 0xF0, 0xA3, -+0xF0, 0xA3, 0xF0, 0xFD, 0x7F, 0x54, 0x31, 0x88, 0x7D, 0xFF, 0x7F, 0x55, 0x31, 0x88, 0x7D, 0xFF, -+0x7F, 0x56, 0x31, 0x88, 0x7D, 0xFF, 0x7F, 0x57, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, -+0x82, 0x75, 0x83, 0x00, 0xED, 0xF0, 0x51, 0x0E, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x01, 0x30, -+0xE4, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x01, 0x38, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, -+0xA3, 0xF0, 0xFD, 0x7F, 0x50, 0x31, 0x88, 0xE4, 0xFD, 0x7F, 0x51, 0x31, 0x88, 0xE4, 0xFD, 0x7F, -+0x52, 0x31, 0x88, 0xE4, 0xFD, 0x7F, 0x53, 0x80, 0xBF, 0xE5, 0x5E, 0x64, 0x01, 0x70, 0x3B, 0x71, -+0x4E, 0xBF, 0x01, 0x04, 0x7F, 0x01, 0x71, 0x42, 0x90, 0x00, 0x46, 0xE0, 0x44, 0x04, 0xFD, 0x7F, -+0x46, 0x31, 0x88, 0x90, 0x00, 0x44, 0xE0, 0x54, 0xFB, 0xFD, 0x7F, 0x44, 0x31, 0x88, 0x90, 0x00, -+0x46, 0xE0, 0x54, 0xFB, 0xFD, 0x7F, 0x46, 0x31, 0x88, 0x7F, 0x02, 0x71, 0x6A, 0x8F, 0x62, 0x90, -+0x01, 0xC9, 0xE5, 0x62, 0xF0, 0xB4, 0x01, 0x02, 0x51, 0xE2, 0x22, 0xE0, 0x5F, 0xF0, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x7F, 0x10, 0xDF, 0xFE, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xE0, 0xED, 0xF0, 0x90, 0x8A, 0xDF, 0xEF, 0xF0, 0xD3, -+0x94, 0x07, 0x50, 0x4E, 0xA3, 0xE0, 0x70, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, -+0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x47, 0xE0, 0x5F, 0xF0, -+0x80, 0x17, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, -+0xD8, 0xFC, 0xFF, 0x90, 0x00, 0x47, 0xE0, 0x4F, 0xF0, 0x51, 0x0E, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, -+0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x46, -+0x80, 0x59, 0x90, 0x8A, 0xDF, 0xE0, 0x24, 0xF8, 0xF0, 0xA3, 0xE0, 0x70, 0x1D, 0x90, 0x8A, 0xDF, -+0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xC4, 0x54, 0xF0, -+0xF4, 0xFF, 0x90, 0x00, 0x43, 0xE0, 0x5F, 0xF0, 0x80, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, -+0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xC4, 0x54, 0xF0, 0xFF, 0x90, 0x00, -+0x43, 0xE0, 0x4F, 0xF0, 0x51, 0x0E, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, -+0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0x51, 0x0B, 0xD0, 0xD0, 0x92, -+0xAF, 0x22, 0x90, 0x00, 0x49, 0xE0, 0x90, 0x8B, 0x54, 0xF0, 0xE0, 0x54, 0x0F, 0xF0, 0x44, 0xF0, -+0xFD, 0x7F, 0x49, 0x31, 0x88, 0x90, 0x8B, 0x54, 0xE0, 0x44, 0xB0, 0xFD, 0x7F, 0x49, 0x21, 0x88, -+0x90, 0x8A, 0xDD, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x75, 0x5E, 0x01, 0x8E, 0x5F, 0xF5, 0x60, 0xE4, -+0xFD, 0x7F, 0x0B, 0x51, 0x1E, 0xE4, 0xFD, 0x7F, 0x02, 0x51, 0x1E, 0x71, 0x4E, 0xE4, 0xFF, 0x71, -+0x42, 0xE4, 0xF5, 0x62, 0x90, 0x01, 0xC9, 0xE5, 0x62, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFC, 0xA3, -+0xE0, 0xFD, 0xEC, 0xFB, 0x8D, 0x44, 0xE4, 0xF5, 0x45, 0x7D, 0x01, 0x7F, 0x60, 0x7E, 0x01, 0x02, -+0x30, 0x62, 0x90, 0x01, 0xCA, 0xE5, 0x61, 0xF0, 0xEF, 0x60, 0x02, 0x51, 0xE2, 0x22, 0x7F, 0x0B, -+0x71, 0x6A, 0xEF, 0x65, 0x61, 0x60, 0x10, 0xE5, 0x61, 0xB4, 0x01, 0x05, 0xE4, 0xF5, 0x61, 0x80, -+0x03, 0x75, 0x61, 0x01, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, -+0xD0, 0x90, 0x8B, 0x57, 0xEF, 0xF0, 0xD3, 0x94, 0x07, 0x50, 0x43, 0xE0, 0xFF, 0x74, 0x01, 0xA8, -+0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x46, 0x51, 0x0B, 0x90, -+0x8B, 0x57, 0xE0, 0xFD, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x05, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, -+0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x00, 0x44, 0xE0, 0xFB, 0xE4, 0xFE, 0xEF, 0x5B, 0xA8, 0x05, -+0x08, 0x80, 0x06, 0xCE, 0xA2, 0xE7, 0x13, 0xCE, 0x13, 0xD8, 0xF8, 0xFF, 0x80, 0x4B, 0x90, 0x8B, -+0x57, 0xE0, 0x24, 0xF8, 0xF0, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, -+0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0xE0, 0x5F, 0xF0, 0x51, 0x0E, 0x90, 0x8B, 0x57, 0xE0, -+0xFD, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x05, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0x90, 0x00, 0x42, 0xE0, 0xFB, 0xE4, 0xFE, 0xEF, 0x5B, 0xA8, 0x05, 0x08, 0x80, 0x06, -+0xCE, 0xA2, 0xE7, 0x13, 0xCE, 0x13, 0xD8, 0xF8, 0xFF, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE4, 0x90, -+0x8B, 0x04, 0xF0, 0x90, 0x00, 0x80, 0xE0, 0x44, 0x80, 0xFD, 0x7F, 0x80, 0x21, 0x88, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDA, 0x12, 0x43, -+0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0xFA, 0xE5, 0xF0, 0x24, 0x00, 0xFF, 0xE4, 0x3A, 0xFE, -+0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0xEE, 0x8F, 0xF0, 0x12, 0x43, 0x19, 0x12, -+0x24, 0x62, 0xFF, 0x60, 0x2C, 0xB5, 0x5E, 0x16, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, -+0x01, 0x12, 0x42, 0xC2, 0x65, 0x60, 0x70, 0x04, 0xE5, 0x5F, 0x65, 0xF0, 0x60, 0x22, 0x90, 0x8A, -+0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0xFF, 0xAE, 0xF0, 0x71, 0x00, 0x80, -+0x0F, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x24, 0x62, 0x65, 0x5E, 0x60, 0x02, 0x91, 0x95, -+0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE4, 0xF5, 0x5E, 0x7F, 0x60, 0x7E, 0x01, 0x8F, 0x82, 0x8E, 0x83, -+0xA3, 0xA3, 0xA3, 0xE4, 0xF0, 0x22, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x8B, 0xEF, 0x12, 0x43, 0x94, -+0x54, 0xE7, 0x01, 0x54, 0xDE, 0x02, 0x55, 0x0B, 0x03, 0x55, 0x14, 0x05, 0x55, 0x1D, 0x06, 0x55, -+0x58, 0x07, 0x55, 0x25, 0x08, 0x55, 0x2E, 0x09, 0x55, 0x36, 0x20, 0x55, 0x3F, 0x2C, 0x54, 0xF0, -+0x2D, 0x54, 0xF9, 0x2E, 0x55, 0x02, 0x3B, 0x55, 0x48, 0x4B, 0x00, 0x00, 0x55, 0x51, 0x90, 0x8A, -+0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0x85, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0x8B, -+0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0xB8, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, -+0x75, 0x00, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x75, 0x39, 0x90, 0x8A, 0xD7, 0x12, 0x43, -+0x6B, 0x02, 0x75, 0x52, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, 0x0F, 0x90, 0x8A, 0xD7, -+0x12, 0x43, 0x6B, 0xC1, 0xA6, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x75, 0x9A, 0x90, 0x8A, -+0xD7, 0x12, 0x43, 0x6B, 0x81, 0x1E, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x78, 0x81, 0x90, -+0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x7A, 0xC2, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x7C, -+0x2B, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x01, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x01, 0xCC, 0xE0, 0x54, 0x0F, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFD, 0x70, -+0x02, 0xC1, 0xA1, 0x90, 0x8B, 0x51, 0xE0, 0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, -+0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xEF, 0x5D, 0x70, 0x02, 0xC1, 0x9A, 0x90, -+0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD0, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD0, -+0xF0, 0x75, 0x1D, 0x01, 0x75, 0x1E, 0x8A, 0x75, 0x1F, 0xD0, 0x75, 0x20, 0x01, 0x7B, 0x01, 0x7A, -+0x8A, 0x79, 0xD1, 0x12, 0x5E, 0xE4, 0x90, 0x8A, 0xD1, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x13, 0x54, -+0x01, 0x90, 0x8B, 0x51, 0x30, 0xE0, 0x59, 0xE0, 0x75, 0xF0, 0x02, 0x90, 0x00, 0x88, 0x12, 0x43, -+0x5F, 0xE0, 0x90, 0x8A, 0xD2, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x02, 0x90, 0x00, 0x89, -+0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD3, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, -+0x01, 0xD1, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD4, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, -+0x04, 0x90, 0x01, 0xD2, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD5, 0xF0, 0x90, 0x8B, 0x51, 0xE0, -+0x75, 0xF0, 0x04, 0x90, 0x01, 0xD3, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD6, 0xF0, 0x80, 0x33, -+0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD1, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD2, 0xF0, 0x90, -+0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD2, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD3, -+0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD3, 0x12, 0x43, 0x5F, 0xE0, 0x90, -+0x8A, 0xD4, 0xF0, 0xEF, 0x54, 0x7F, 0xFF, 0x7B, 0x01, 0x7A, 0x8A, 0x79, 0xD2, 0x91, 0xA6, 0x90, -+0x8A, 0xCF, 0xE0, 0xFF, 0x90, 0x8B, 0x51, 0xE0, 0xFE, 0x74, 0x01, 0xA8, 0x06, 0x08, 0x80, 0x02, -+0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0x5F, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0xFF, 0x74, -+0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0x90, 0x01, 0xCC, 0xF0, 0x90, 0x8B, -+0x51, 0xE0, 0x04, 0xF0, 0xE0, 0x54, 0x03, 0xF0, 0xA1, 0x6A, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x02, -+0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x00, 0x04, 0x12, 0x42, 0x20, 0xFF, 0x54, 0x1F, 0xFE, -+0xEF, 0x54, 0x20, 0xC4, 0x13, 0x54, 0x07, 0xFD, 0xAF, 0x06, 0x90, 0x8A, 0xDA, 0xEF, 0xF0, 0xA3, -+0xED, 0xF0, 0xA3, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x03, 0x12, -+0x42, 0x20, 0x54, 0xF0, 0xC4, 0x54, 0x0F, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x00, 0x04, 0x12, 0x42, -+0x20, 0x54, 0x40, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x90, 0x8A, 0xE0, 0xF0, 0x90, 0x8A, 0xDA, 0xE0, -+0xFF, 0x75, 0xF0, 0x09, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0xAD, 0x82, 0xAC, 0x83, 0x90, 0x8A, -+0xE1, 0xEC, 0xF0, 0xA3, 0xED, 0xF0, 0xEF, 0x75, 0xF0, 0x09, 0xA4, 0x24, 0x23, 0xF9, 0x74, 0x87, -+0x35, 0xF0, 0xFA, 0x7B, 0x01, 0xA3, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, -+0x00, 0x03, 0x12, 0x42, 0x20, 0x54, 0x0F, 0xFF, 0x90, 0x8A, 0xE3, 0x12, 0x43, 0x6B, 0xEF, 0x12, -+0x42, 0x4D, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x90, -+0x8A, 0xE3, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0xEF, 0x12, 0x42, 0x5F, 0x90, 0x8A, 0xDC, 0x12, -+0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0x90, 0x8A, 0xE1, 0xE0, 0xFC, 0xA3, 0xE0, -+0xFD, 0xF5, 0x82, 0x8C, 0x83, 0xEF, 0xF0, 0x12, 0x24, 0x62, 0x8D, 0x82, 0x8C, 0x83, 0xA3, 0xF0, -+0x90, 0x8A, 0xDF, 0xE0, 0xFE, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0x24, 0xC1, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xDB, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, -+0x29, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2A, 0x12, 0x43, 0x5F, -+0x74, 0x01, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2B, 0x12, -+0x43, 0x5F, 0xEE, 0xF0, 0x8F, 0x0F, 0xEF, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, -+0xAF, 0x82, 0xF5, 0x10, 0x8F, 0x11, 0xE5, 0x0F, 0x75, 0xF0, 0x02, 0xA4, 0x24, 0x81, 0xF9, 0x74, -+0x86, 0x35, 0xF0, 0x75, 0x12, 0x01, 0xF5, 0x13, 0x89, 0x14, 0x75, 0xF0, 0x09, 0xE5, 0x0F, 0x90, -+0x87, 0x25, 0x12, 0x43, 0x5F, 0xAF, 0x82, 0x85, 0x83, 0x15, 0x8F, 0x16, 0xE5, 0x0F, 0x75, 0xF0, -+0x09, 0xA4, 0x24, 0x23, 0xF9, 0x74, 0x87, 0x35, 0xF0, 0x75, 0x17, 0x01, 0xF5, 0x18, 0x89, 0x19, -+0x74, 0xC1, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x12, 0x43, 0x94, 0x58, -+0x34, 0x00, 0x58, 0x49, 0x01, 0x58, 0x5E, 0x02, 0x58, 0x73, 0x03, 0x58, 0x9C, 0x04, 0x58, 0xB1, -+0x05, 0x58, 0xC6, 0x06, 0x58, 0xEC, 0x0C, 0x59, 0x19, 0x0D, 0x59, 0x46, 0x0E, 0x59, 0x73, 0x0F, -+0x00, 0x00, 0x59, 0xA7, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, 0x15, 0x80, 0x3C, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, 0x10, 0x80, 0x27, 0xE5, 0x0F, -+0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, -+0x05, 0x80, 0x12, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0x74, 0xF0, 0xF0, 0xA3, 0xE4, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0x74, 0x0F, 0xF0, 0xA3, 0x74, 0x8F, 0xF0, 0x21, 0xA7, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0x0F, 0xF0, 0xA3, 0x74, 0xF5, 0x80, -+0x27, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0x0F, -+0xF0, 0xA3, 0x74, 0xF0, 0x80, 0x12, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0x74, 0x0D, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, -+0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x21, 0xA7, 0x90, 0x04, 0x47, 0xE0, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x46, 0xE0, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x45, 0xE0, 0x85, 0x11, 0x82, -+0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, 0x44, 0x21, 0x9E, 0x90, 0x04, 0x4B, 0xE0, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x4A, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x49, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, -+0xF0, 0x90, 0x04, 0x48, 0x80, 0x58, 0x90, 0x04, 0x4F, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0x12, 0x42, 0x4D, 0x90, 0x04, 0x4E, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, -+0x12, 0x42, 0x5F, 0x90, 0x04, 0x4D, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, -+0x4C, 0x80, 0x2B, 0x90, 0x04, 0x53, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, -+0x90, 0x04, 0x52, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, -+0x90, 0x04, 0x51, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, 0x50, 0xE0, 0x85, -+0x11, 0x82, 0x85, 0x10, 0x83, 0xA3, 0xF0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0xC0, 0x03, 0xC0, -+0x02, 0xC0, 0x01, 0x12, 0x24, 0x62, 0xFF, 0xAB, 0x17, 0xAA, 0x18, 0xA9, 0x19, 0x12, 0x24, 0x62, -+0x5F, 0xD0, 0x01, 0xD0, 0x02, 0xD0, 0x03, 0x12, 0x42, 0x4D, 0xAB, 0x12, 0xE5, 0x14, 0x24, 0x01, -+0xF9, 0xE4, 0x35, 0x13, 0xFA, 0xC0, 0x03, 0xC0, 0x02, 0xC0, 0x01, 0x12, 0x24, 0x62, 0xFF, 0xAB, -+0x17, 0xAA, 0x18, 0xA9, 0x19, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x5F, 0xD0, 0x01, 0xD0, 0x02, -+0xD0, 0x03, 0x12, 0x42, 0x4D, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xC0, 0x83, 0xC0, 0x82, 0xE0, -+0xFF, 0x85, 0x16, 0x82, 0x85, 0x15, 0x83, 0xE0, 0xFE, 0xEF, 0x5E, 0xD0, 0x82, 0xD0, 0x83, 0xF0, -+0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xA3, 0xC0, 0x83, 0xC0, 0x82, 0xE0, 0xFF, 0x85, 0x16, 0x82, -+0x85, 0x15, 0x83, 0xA3, 0xE0, 0xFE, 0xEF, 0x5E, 0xD0, 0x82, 0xD0, 0x83, 0xF0, 0xE5, 0x0F, 0x25, -+0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, -+0x4B, 0x90, 0x8A, 0xE6, 0x74, 0x0B, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x00, 0x50, -+0x02, 0x41, 0xEC, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, -+0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, -+0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x0A, 0x90, 0x8A, 0xE6, 0xE0, 0x24, 0x10, -+0xA3, 0xF0, 0x80, 0x68, 0x90, 0x8A, 0xE6, 0xE0, 0x14, 0xF0, 0x80, 0xBB, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x47, -+0x90, 0x8A, 0xE6, 0x74, 0x0F, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x00, 0x40, 0x3C, -+0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, -+0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0x5E, -+0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x08, 0x90, 0x8A, 0xE6, 0xE0, 0xA3, 0xF0, 0x80, 0x0D, 0x90, -+0x8A, 0xE6, 0xE0, 0x14, 0xF0, 0x80, 0xBF, 0xE4, 0x90, 0x8A, 0xE7, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x46, -+0xE4, 0x90, 0x8A, 0xE6, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x40, 0x02, 0x61, -+0xA5, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, -+0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x06, 0x90, 0x8A, 0xE6, 0xE0, 0x80, 0x63, 0x90, 0x8A, -+0xE6, 0xE0, 0x04, 0xF0, 0x80, 0xBF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x46, 0xE4, 0x90, 0x8A, 0xE6, 0xF0, 0x90, -+0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x0C, 0x50, 0x3C, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, -+0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, -+0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x08, -+0x90, 0x8A, 0xE6, 0xE0, 0x24, 0x10, 0x80, 0x09, 0x90, 0x8A, 0xE6, 0xE0, 0x04, 0xF0, 0x80, 0xBF, -+0xE4, 0x90, 0x8A, 0xE8, 0xF0, 0x90, 0x8A, 0xE7, 0xE0, 0xFF, 0x75, 0xF0, 0x09, 0xE5, 0x0F, 0x90, -+0x87, 0x27, 0x12, 0x43, 0x5F, 0xEF, 0xF0, 0x90, 0x8A, 0xE8, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xE5, -+0x0F, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0xE5, 0x0F, 0xC3, 0x94, 0x20, 0x50, 0x32, -+0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0xD3, 0x9F, 0x40, 0x02, -+0x80, 0x18, 0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0xC3, 0x9E, -+0x50, 0x08, 0x90, 0x8A, 0xE8, 0xE0, 0xA3, 0xF0, 0x80, 0x08, 0x90, 0x8A, 0xE7, 0xE0, 0x90, 0x8A, -+0xE9, 0xF0, 0x90, 0x8A, 0xE9, 0xE0, 0xFD, 0xAF, 0x0F, 0x91, 0x4E, 0x90, 0x8A, 0xE9, 0xE0, 0xFF, -+0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, 0x90, 0x8A, 0xE7, -+0xE0, 0xFF, 0xD3, 0x94, 0x13, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x03, 0xF0, 0x22, 0xEF, 0xD3, -+0x94, 0x0B, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x02, 0xF0, 0x22, 0xEF, 0xD3, 0x94, 0x03, 0x40, -+0x07, 0x90, 0x87, 0x22, 0x74, 0x01, 0xF0, 0x22, 0xE4, 0x90, 0x87, 0x22, 0xF0, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x74, 0x84, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xED, -+0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xAC, 0x07, 0xED, 0x54, 0x1F, 0x90, 0x8A, 0xC7, 0xF0, 0x74, -+0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xC5, 0xF0, 0x90, 0x8A, -+0xC8, 0x74, 0x01, 0xF0, 0xEB, 0xC3, 0x94, 0x01, 0x40, 0x02, 0x80, 0x37, 0x90, 0x8A, 0xC5, 0xE0, -+0x25, 0x0D, 0xFF, 0xA3, 0xF0, 0xA3, 0xE0, 0x90, 0x41, 0x9E, 0x93, 0xFE, 0xEF, 0xD3, 0x9E, 0x40, -+0x10, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xAF, 0x04, 0x80, -+0x9D, 0x90, 0x8A, 0xC6, 0xE0, 0xFF, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEF, 0xF0, 0x22, 0xAD, 0x07, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, -+0xFF, 0x90, 0x8A, 0xCA, 0xF0, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, -+0x54, 0x1F, 0x90, 0x8A, 0xC9, 0xF0, 0xD3, 0x9F, 0x40, 0x06, 0xA3, 0xE0, 0x90, 0x8A, 0xC9, 0xF0, -+0x90, 0x8A, 0xC9, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, -+0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, 0xFE, 0xEF, 0x13, -+0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, -+0xEF, 0xF0, 0xAF, 0x05, 0x90, 0x8A, 0xC9, 0xE0, 0xFD, 0x91, 0x4E, 0x90, 0x8A, 0xC9, 0xE0, 0xFF, -+0x22, 0xAC, 0x07, 0x74, 0x84, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x7F, -+0x90, 0x8A, 0xDE, 0xF0, 0xE0, 0x54, 0x1F, 0xFF, 0x90, 0x8A, 0xE1, 0xF0, 0x75, 0xF0, 0x09, 0xEC, -+0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xE3, 0xF0, 0x75, 0xF0, 0x09, 0xEC, 0x90, -+0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0xFE, 0x90, 0x8A, 0xE4, 0xF0, 0xEC, 0x25, 0xE0, 0x24, 0xE4, -+0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE5, 0xCB, 0xF0, -+0xA3, 0xEB, 0xF0, 0xEC, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, -+0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE7, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xEF, 0xD3, 0x9E, 0x40, 0x0C, -+0x90, 0x8A, 0xE4, 0xE0, 0x90, 0x8A, 0xE1, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0xED, 0x70, 0x02, 0xC1, -+0x93, 0x90, 0x8A, 0xE2, 0xED, 0xF0, 0x90, 0x8A, 0xDE, 0xE0, 0x30, 0xE6, 0x0E, 0x90, 0x8A, 0xE1, -+0xE0, 0x90, 0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0x14, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0x70, -+0x02, 0xC1, 0x93, 0x90, 0x8A, 0xE1, 0xE0, 0xFF, 0xD3, 0x94, 0x00, 0x50, 0x02, 0xC1, 0x93, 0xE4, -+0x90, 0x8A, 0xE0, 0xF0, 0xEF, 0x14, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x8A, 0xE3, 0xE0, 0xFD, 0x90, -+0x8A, 0xDF, 0xE0, 0xFF, 0xD3, 0x9D, 0x40, 0x6F, 0xEF, 0x94, 0x10, 0x40, 0x21, 0xEF, 0x24, 0xF0, -+0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0x90, 0x8A, 0xE7, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x70, 0x27, 0x90, 0x8A, -+0xDF, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x50, 0x37, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, -+0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE5, 0xE0, 0x5E, 0xFE, 0xA3, -+0xE0, 0x5F, 0x4E, 0x60, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0x90, 0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xE0, -+0xE0, 0x04, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, 0x6F, 0x60, 0x08, 0x90, -+0x8A, 0xDF, 0xE0, 0x14, 0xF0, 0x80, 0x83, 0x90, 0x8A, 0xE2, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, -+0xC3, 0x9F, 0x50, 0x0F, 0x90, 0x8A, 0xDF, 0xE0, 0xB5, 0x05, 0x08, 0x90, 0x8A, 0xE3, 0xE0, 0x90, -+0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xDE, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, -+0xFE, 0xEF, 0x13, 0xFF, 0xEC, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xAF, 0x04, 0x90, 0x8A, 0xDE, 0xE0, 0xFD, 0x91, 0x4E, 0x90, 0x8A, -+0xDE, 0xE0, 0xFF, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8B, 0x1A, 0x8A, 0x1B, 0x89, -+0x1C, 0x90, 0x8B, 0x3F, 0x12, 0x43, 0x8B, 0xAB, 0x1D, 0xAA, 0x1E, 0xA9, 0x1F, 0x90, 0x8B, 0x42, -+0x12, 0x43, 0x8B, 0xAF, 0x20, 0x15, 0x20, 0xEF, 0x60, 0x1E, 0x90, 0x8B, 0x42, 0xE4, 0x75, 0xF0, -+0x01, 0x12, 0x43, 0x74, 0x12, 0x24, 0x62, 0xFF, 0x90, 0x8B, 0x3F, 0xE4, 0x75, 0xF0, 0x01, 0x12, -+0x43, 0x74, 0xEF, 0x12, 0x42, 0x4D, 0x80, 0xDB, 0xAB, 0x1A, 0xAA, 0x1B, 0xA9, 0x1C, 0xD0, 0xD0, -+0x92, 0xAF, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x8B, -+0x90, 0x8B, 0x53, 0xE0, 0xFF, 0x04, 0xF0, 0x90, 0x00, 0x01, 0xEF, 0x12, 0x42, 0x5F, 0x7F, 0xAF, -+0x7E, 0x01, 0x12, 0x74, 0x3B, 0xEF, 0x60, 0x47, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x6B, 0x8B, 0x1D, -+0x8A, 0x1E, 0x89, 0x1F, 0x75, 0x20, 0x02, 0x7B, 0x01, 0x7A, 0x01, 0x79, 0xA0, 0xD1, 0xE4, 0x90, -+0x8B, 0x48, 0x12, 0x43, 0x6B, 0x8B, 0x1D, 0x8A, 0x1E, 0x89, 0x1F, 0x90, 0x8B, 0x45, 0x12, 0x43, -+0x6B, 0x12, 0x24, 0x62, 0xFF, 0xC4, 0x54, 0x0F, 0xF5, 0x20, 0x7B, 0x01, 0x7A, 0x01, 0x79, 0xA2, -+0xD1, 0xE4, 0x90, 0x01, 0xAF, 0x74, 0xFF, 0xF0, 0x90, 0x01, 0xCB, 0xE0, 0x64, 0x80, 0xF0, 0xD0, -+0xD0, 0x92, 0xAF, 0x22, 0x90, 0x8A, 0xC5, 0xE0, 0x54, 0xF0, 0x44, 0x03, 0xF0, 0x54, 0x0F, 0x44, -+0x80, 0xF0, 0x7B, 0x00, 0x7A, 0x00, 0x79, 0x56, 0x90, 0x8B, 0x48, 0x12, 0x43, 0x8B, 0x0B, 0x7A, -+0x8A, 0x79, 0xC5, 0xE1, 0x33, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x01, 0xC4, 0x74, -+0xC5, 0xF0, 0x74, 0x5F, 0xA3, 0xF0, 0x90, 0x04, 0x1D, 0xE0, 0x60, 0x1A, 0x90, 0x05, 0x22, 0xE0, -+0x54, 0x90, 0x60, 0x07, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x40, 0xF0, 0x90, 0x01, 0xC7, 0xE0, 0x30, -+0xE1, 0xE4, 0x7F, 0x00, 0x80, 0x02, 0x7F, 0x01, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, 0xAF, -+0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0xFB, 0xFA, 0xEF, 0x30, 0xE0, 0x02, 0x7B, 0x80, 0xEF, 0xC3, 0x13, -+0x90, 0xFD, 0x10, 0xF0, 0x90, 0x04, 0x25, 0xEF, 0xF0, 0xED, 0x60, 0x1E, 0xAF, 0x03, 0x74, 0x0F, -+0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0x74, 0x10, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0xAF, 0x03, 0x74, 0x08, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x09, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, -+0xF5, 0x83, 0xE0, 0x54, 0xF0, 0xF0, 0x74, 0x21, 0x2B, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, -+0xE0, 0x54, 0xF7, 0xF0, 0xAE, 0x02, 0xAF, 0x03, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x5F, 0xC5, -+0xBF, 0x01, 0x10, 0x90, 0x02, 0x09, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xFD, 0x90, 0x04, 0x1F, -+0x74, 0x20, 0xF0, 0x22, 0x90, 0x01, 0x02, 0xE0, 0x54, 0x03, 0xFF, 0xE0, 0x54, 0x0C, 0x13, 0x13, -+0x54, 0x3F, 0xFE, 0xEF, 0x64, 0x01, 0x60, 0x04, 0xEF, 0xB4, 0x03, 0x0E, 0x90, 0x8A, 0xC5, 0x74, -+0x01, 0xF0, 0xA3, 0x74, 0x37, 0xF0, 0x79, 0x01, 0x80, 0x18, 0xEE, 0x64, 0x01, 0x60, 0x07, 0xAF, -+0x06, 0xEE, 0x64, 0x03, 0x70, 0x3B, 0x90, 0x8A, 0xC5, 0x74, 0x01, 0xF0, 0xA3, 0x74, 0x3D, 0xF0, -+0x79, 0x40, 0x90, 0x8A, 0xC5, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xF5, 0x82, 0x8E, 0x83, 0xE0, 0x59, -+0x60, 0x08, 0xE9, 0xF0, 0xE4, 0x90, 0x8A, 0xF6, 0xF0, 0x22, 0x90, 0x8A, 0xF6, 0xE0, 0x04, 0xF0, -+0xE0, 0xC3, 0x94, 0x0A, 0x40, 0x0B, 0xE4, 0xF0, 0x90, 0x04, 0x19, 0xE0, 0x30, 0xE0, 0x02, 0x11, -+0x6D, 0x22, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, 0xD0, 0x75, 0xD0, 0x00, 0xC0, -+0x00, 0xC0, 0x01, 0xC0, 0x02, 0xC0, 0x03, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, -+0x01, 0xC4, 0x74, 0xF2, 0xF0, 0x74, 0x60, 0xA3, 0xF0, 0x90, 0x01, 0x34, 0xE0, 0x55, 0x28, 0xF5, -+0x2C, 0xA3, 0xE0, 0x55, 0x29, 0xF5, 0x2D, 0xA3, 0xE0, 0x55, 0x2A, 0xF5, 0x2E, 0xA3, 0xE0, 0x55, -+0x2B, 0xF5, 0x2F, 0xE5, 0x2C, 0x20, 0xE0, 0x02, 0x41, 0x89, 0x90, 0x01, 0x34, 0x74, 0x01, 0xF0, -+0x85, 0xD1, 0x4D, 0x85, 0xD2, 0x4E, 0x85, 0xD3, 0x4F, 0x85, 0xD4, 0x50, 0x85, 0xD5, 0x51, 0x85, -+0xD6, 0x52, 0x85, 0xD7, 0x53, 0x85, 0xD9, 0x54, 0xE5, 0x54, 0x54, 0x40, 0xC3, 0x13, 0xFF, 0xE5, -+0x53, 0x54, 0x20, 0x6F, 0x70, 0x02, 0x41, 0x46, 0xE5, 0x54, 0x30, 0xE5, 0x02, 0x41, 0x46, 0xE5, -+0x52, 0x54, 0x1F, 0xF5, 0x08, 0xE5, 0x4D, 0x54, 0x3F, 0xF5, 0x09, 0xE5, 0x51, 0x54, 0x1F, 0xFF, -+0xE5, 0x08, 0x25, 0xE0, 0x24, 0xE3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, -+0x12, 0x42, 0x81, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, -+0xE4, 0x34, 0x85, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, 0x09, 0xD3, 0x94, 0x04, -+0x40, 0x03, 0x75, 0x09, 0x04, 0x75, 0xF0, 0x0A, 0xE5, 0x08, 0x90, 0x84, 0x00, 0x12, 0x43, 0x5F, -+0x75, 0xF0, 0x02, 0xE5, 0x09, 0x12, 0x43, 0x5F, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xE5, 0x53, 0x54, -+0x1F, 0x2F, 0xFF, 0xE4, 0x3E, 0xFE, 0x75, 0xF0, 0x0A, 0xE5, 0x08, 0x90, 0x84, 0x00, 0x12, 0x43, -+0x5F, 0x75, 0xF0, 0x02, 0xE5, 0x09, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xE5, 0x54, -+0x20, 0xE6, 0x24, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, -+0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, 0x4F, 0x30, 0xE7, 0x36, -+0xAF, 0x08, 0x12, 0x5C, 0xC3, 0x80, 0x2F, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, -+0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, -+0x4F, 0x30, 0xE7, 0x12, 0xE5, 0x4F, 0x54, 0x7F, 0xFD, 0xE5, 0x53, 0x54, 0x1F, 0xF5, 0x0D, 0xAB, -+0x09, 0xAF, 0x08, 0x12, 0x5C, 0x66, 0xE5, 0x24, 0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x3A, 0x90, -+0x8B, 0x1A, 0xE0, 0x60, 0x2B, 0x90, 0x01, 0x5B, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, -+0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x21, 0x90, 0x8B, 0x3D, 0x12, 0x4B, 0x5C, 0x90, 0x01, -+0x5B, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x18, 0xF0, 0x80, 0x09, -+0x12, 0x4B, 0x34, 0xBF, 0x01, 0x03, 0x12, 0x4A, 0xFC, 0xE5, 0x2C, 0x30, 0xE1, 0x21, 0x90, 0x01, -+0x34, 0x74, 0x02, 0xF0, 0x85, 0xD1, 0x56, 0x85, 0xD2, 0x57, 0x85, 0xD3, 0x58, 0x85, 0xD4, 0x59, -+0x85, 0xD5, 0x5A, 0x85, 0xD6, 0x5B, 0x85, 0xD7, 0x5C, 0x85, 0xD9, 0x5D, 0x12, 0x5F, 0xA4, 0xE5, -+0x2C, 0x30, 0xE3, 0x06, 0x90, 0x01, 0x34, 0x74, 0x08, 0xF0, 0xE5, 0x2C, 0x30, 0xE4, 0x09, 0x90, -+0x01, 0x34, 0x74, 0x10, 0xF0, 0x43, 0x55, 0x10, 0xE5, 0x2C, 0x30, 0xE5, 0x26, 0x90, 0x01, 0xCF, -+0xE0, 0x30, 0xE5, 0x1F, 0xE0, 0x54, 0xDF, 0xF0, 0x90, 0x01, 0x34, 0x74, 0x20, 0xF0, 0x75, 0xA8, -+0x00, 0x75, 0xE8, 0x00, 0x12, 0x51, 0x9D, 0x90, 0x00, 0x03, 0xE0, 0x54, 0xFB, 0xF0, 0x12, 0x52, -+0x0E, 0x80, 0xFE, 0xE5, 0x2C, 0x30, 0xE6, 0x2D, 0x90, 0x01, 0x34, 0x74, 0x40, 0xF0, 0x90, 0x8B, -+0x32, 0xE0, 0x30, 0xE0, 0x0C, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x05, 0x90, 0x8B, 0x34, 0xE4, -+0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x0C, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x05, -+0x90, 0x8B, 0x2E, 0xE4, 0xF0, 0xE5, 0x2E, 0x20, 0xE0, 0x02, 0x61, 0xE6, 0x90, 0x8B, 0x08, 0x74, -+0x01, 0xF0, 0x90, 0x01, 0x36, 0xF0, 0x90, 0x8B, 0x06, 0xE0, 0x60, 0x0F, 0xE4, 0xF0, 0x90, 0x05, -+0x53, 0xE0, 0x44, 0x02, 0xF0, 0x90, 0x05, 0xFC, 0xE0, 0x04, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, -+0xE0, 0x2F, 0x90, 0x8B, 0x37, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xFF, 0x13, 0x13, 0x54, -+0x3F, 0x30, 0xE0, 0x1D, 0x90, 0x8B, 0x34, 0x74, 0x01, 0xF0, 0xB1, 0x39, 0x90, 0x8B, 0x33, 0xE0, -+0x64, 0x03, 0x60, 0x0D, 0x7F, 0x01, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x05, 0x7F, 0x04, 0x12, 0x4E, -+0x89, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x55, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x4E, -+0x90, 0x8B, 0x2E, 0x74, 0x01, 0xF0, 0xB1, 0x39, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x3E, -+0xB1, 0x5F, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0x64, 0x06, 0x60, -+0x2D, 0xEF, 0xB4, 0x04, 0x02, 0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, -+0x80, 0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x02, 0x04, 0x7F, 0x01, 0xB1, 0x82, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x43, -+0xE7, 0x90, 0x8B, 0x08, 0xE4, 0xF0, 0xE5, 0x2E, 0x30, 0xE1, 0x2F, 0x90, 0x01, 0x36, 0x74, 0x02, -+0xF0, 0x43, 0x55, 0x40, 0x11, 0x84, 0x90, 0x8B, 0x37, 0xE0, 0xB4, 0x01, 0x09, 0x90, 0x05, 0x22, -+0xE4, 0xF0, 0x90, 0x8B, 0x37, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x0D, 0xE4, 0xFF, 0x12, -+0x4D, 0xE0, 0xEF, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0xE5, 0x2E, 0x30, 0xE2, 0x16, 0x90, -+0x01, 0x36, 0x74, 0x04, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x06, 0xA3, 0xE0, 0x64, 0x06, -+0x60, 0x03, 0x12, 0x46, 0xB3, 0xE5, 0x2E, 0x30, 0xE3, 0x38, 0x90, 0x01, 0x36, 0x74, 0x08, 0xF0, -+0xE5, 0x21, 0x64, 0x01, 0x70, 0x2C, 0xE5, 0x24, 0x60, 0x28, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, -+0x01, 0x3C, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x3D, 0xE4, 0xF0, 0x90, 0x8B, 0x11, 0xE0, 0x90, 0x8B, -+0x3E, 0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, -+0x05, 0xF0, 0xE5, 0x2E, 0x30, 0xE4, 0x2B, 0x90, 0x01, 0x36, 0x74, 0x10, 0xF0, 0xE5, 0x21, 0xB4, -+0x01, 0x20, 0xE5, 0x24, 0x60, 0x1C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, -+0xF0, 0x90, 0x8B, 0x1B, 0xE4, 0xF0, 0x53, 0x25, 0xFD, 0xE5, 0x25, 0x54, 0x07, 0x70, 0x03, 0x12, -+0x4A, 0xFC, 0xE5, 0x2E, 0x30, 0xE5, 0x1F, 0x90, 0x01, 0x36, 0x74, 0x20, 0xF0, 0xE5, 0x21, 0xB4, -+0x01, 0x14, 0xE5, 0x24, 0x60, 0x10, 0x90, 0x8B, 0x1A, 0xE0, 0x64, 0x02, 0x60, 0x05, 0x12, 0x4A, -+0x97, 0x80, 0x03, 0x12, 0x49, 0x49, 0xE5, 0x2E, 0x30, 0xE6, 0x1B, 0x90, 0x01, 0x36, 0x74, 0x40, -+0xF0, 0xE5, 0x21, 0xB4, 0x01, 0x10, 0xE5, 0x24, 0x60, 0x0C, 0x53, 0x25, 0xFE, 0xE5, 0x25, 0x54, -+0x07, 0x70, 0x03, 0x12, 0x4A, 0xFC, 0xE5, 0x2F, 0x30, 0xE1, 0x28, 0x90, 0x01, 0x37, 0x74, 0x02, -+0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x18, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x08, -+0x12, 0x48, 0xFE, 0x12, 0x7D, 0xC1, 0x80, 0x0B, 0x90, 0x8B, 0x31, 0x74, 0x01, 0xF0, 0x80, 0x03, -+0x12, 0x48, 0xFE, 0x74, 0xF2, 0x04, 0x90, 0x01, 0xC4, 0xF0, 0x74, 0x60, 0xA3, 0xF0, 0xD0, 0x07, -+0xD0, 0x06, 0xD0, 0x05, 0xD0, 0x04, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, 0xD0, 0x00, 0xD0, 0xD0, -+0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0, 0xE0, 0x32, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x05, -+0x58, 0xE0, 0xFF, 0x90, 0x8B, 0x38, 0xE0, 0x2F, 0x24, 0xFE, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, -+0xFD, 0x7F, 0x50, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x53, 0x74, 0x05, 0xF0, 0x22, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x0A, 0xA3, 0xE0, 0x64, 0x06, -+0x60, 0x04, 0x7F, 0x06, 0xB1, 0x82, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x03, 0x12, 0x78, -+0x35, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0x6F, 0x70, -+0x02, 0xE1, 0x4E, 0xEF, 0x12, 0x43, 0x94, 0x65, 0xB0, 0x00, 0x65, 0xEA, 0x01, 0x66, 0x30, 0x02, -+0x66, 0x6A, 0x03, 0x66, 0xA2, 0x04, 0x66, 0xDB, 0x05, 0x67, 0x16, 0x06, 0x00, 0x00, 0x67, 0x4E, -+0xEE, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xF1, 0x81, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0xB4, -+0x05, 0x04, 0xF1, 0x5D, 0xE1, 0x4E, 0xEF, 0xB4, 0x06, 0x06, 0x7F, 0x01, 0xF1, 0x72, 0x80, 0x16, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, 0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0xF1, 0xA4, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, -+0x06, 0x7F, 0x01, 0xF1, 0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, -+0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xF1, 0x9A, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, -+0x06, 0x06, 0x7F, 0x01, 0xF1, 0x72, 0xE1, 0x4E, 0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, 0x53, -+0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x02, 0x60, 0x02, 0xE1, 0x4E, 0xF1, 0x67, 0xE1, 0x4E, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xF1, 0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, 0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xF1, 0x9A, 0x80, 0x16, -+0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0x7F, 0x01, 0xF1, 0x72, 0x80, 0x08, 0xEE, 0xB4, -+0x03, 0x04, 0x7F, 0x01, 0xF1, 0x53, 0xF1, 0xD0, 0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, -+0x06, 0x7F, 0x01, 0xF1, 0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, -+0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xF1, 0x9A, 0x80, 0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, -+0x06, 0x06, 0xE4, 0xFF, 0xF1, 0x72, 0x80, 0x06, 0xEE, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0xF1, 0xB9, -+0xE1, 0x4E, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0xE4, 0xFF, 0xF1, 0x72, 0x80, 0x13, -+0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, 0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, -+0x02, 0xF1, 0x67, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, 0x04, 0xF1, 0xA4, 0x80, 0x09, 0x90, 0x8B, -+0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, 0xF1, 0xAF, 0x80, 0x73, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, -+0xB4, 0x06, 0x06, 0xE4, 0xFF, 0xF1, 0x72, 0x80, 0x13, 0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xF1, -+0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0x90, 0x8B, 0x2D, 0xE0, -+0xB4, 0x01, 0x04, 0xF1, 0xA4, 0x80, 0x0B, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x04, 0x7F, 0x01, -+0xF1, 0x81, 0xF1, 0xC3, 0x80, 0x38, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xF1, -+0x81, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xF1, 0x5D, 0x90, 0x8B, 0x2D, 0xE0, -+0x70, 0x04, 0xF1, 0x9A, 0x80, 0x16, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x06, 0xE4, 0xFF, 0xF1, -+0x53, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x02, 0xF1, 0x67, 0xF1, 0xDD, 0xD0, 0xD0, -+0x92, 0xAF, 0x22, 0x12, 0x4A, 0xB2, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x22, 0x90, 0x05, 0x22, -+0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0x04, -+0xF0, 0x22, 0xEF, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, -+0x22, 0x90, 0x8B, 0x56, 0xEF, 0xF0, 0x12, 0x7D, 0x42, 0x90, 0x8B, 0x56, 0xE0, 0x60, 0x05, 0x90, -+0x05, 0x22, 0xE4, 0xF0, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x12, 0x4A, 0xCC, 0x90, 0x8B, 0x2D, -+0x74, 0x01, 0xF0, 0x22, 0x7F, 0x01, 0x12, 0x4A, 0x7C, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x12, -+0x7C, 0x4A, 0x90, 0x8B, 0x2D, 0x74, 0x04, 0xF0, 0x22, 0x12, 0x4A, 0x32, 0x90, 0x8B, 0x2D, 0x74, -+0x03, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x05, 0xF0, 0x22, -+0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, -+0x74, 0x6F, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x06, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, -+0xD0, 0xE4, 0xFD, 0xFC, 0xEF, 0x30, 0xE0, 0x02, 0x7D, 0x80, 0xEF, 0xC3, 0x13, 0x90, 0xFD, 0x10, -+0xF0, 0xAE, 0x04, 0xAF, 0x05, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x75, 0x28, 0x33, 0xE4, 0xF5, 0x29, -+0x75, 0x2A, 0x07, 0xF5, 0x2B, 0x90, 0x01, 0x30, 0xE5, 0x28, 0xF0, 0xA3, 0xE5, 0x29, 0xF0, 0xA3, -+0xE5, 0x2A, 0xF0, 0xA3, 0xE5, 0x2B, 0xF0, 0x22, 0x75, 0x30, 0x1F, 0x75, 0x31, 0x01, 0x43, 0x31, -+0x10, 0xE4, 0xF5, 0x32, 0x90, 0x01, 0x38, 0xE5, 0x30, 0xF0, 0xA3, 0xE5, 0x31, 0xF0, 0xA3, 0xE5, -+0x32, 0xF0, 0x22, 0x22, 0x90, 0x00, 0x02, 0xE0, 0x54, 0xE0, 0x7F, 0x01, 0x60, 0x02, 0x7F, 0x00, -+0x22, 0x90, 0x00, 0xF3, 0xE0, 0x7F, 0x00, 0x30, 0xE3, 0x02, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x09, -+0xE0, 0xB4, 0x01, 0x0C, 0x90, 0x00, 0xF2, 0xE0, 0x30, 0xE7, 0x05, 0x7E, 0xFD, 0x7F, 0x33, 0x22, -+0x7E, 0xFD, 0x7F, 0x2F, 0x22, 0x90, 0x00, 0xF3, 0xE0, 0x30, 0xE2, 0x0D, 0x90, 0x05, 0x41, 0x74, -+0x10, 0xF0, 0x90, 0x05, 0x5A, 0xF0, 0xA3, 0xE4, 0xF0, 0x22, 0x90, 0x01, 0x64, 0x74, 0xA0, 0xF0, -+0x22, 0xC0, 0xE0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, 0xD0, 0x75, 0xD0, 0x00, 0xC0, 0x05, 0xC0, 0x06, -+0xC0, 0x07, 0x7D, 0x91, 0x90, 0x01, 0xC4, 0xED, 0xF0, 0x74, 0x68, 0xFF, 0xA3, 0xF0, 0x53, 0x91, -+0xEF, 0x90, 0x00, 0x51, 0xE0, 0xFE, 0x90, 0x00, 0x55, 0xE0, 0x5E, 0xF5, 0x3D, 0x90, 0x00, 0x52, -+0xE0, 0xFE, 0x90, 0x00, 0x56, 0xE0, 0x5E, 0xF5, 0x3E, 0xE5, 0x3D, 0x30, 0xE4, 0x06, 0x90, 0x00, -+0x55, 0x74, 0x10, 0xF0, 0xE5, 0x3D, 0x30, 0xE5, 0x06, 0x90, 0x00, 0x55, 0x74, 0x20, 0xF0, 0xE5, -+0x3D, 0x30, 0xE6, 0x06, 0x90, 0x00, 0x55, 0x74, 0x40, 0xF0, 0xE5, 0x3D, 0x30, 0xE7, 0x06, 0x90, -+0x00, 0x55, 0x74, 0x80, 0xF0, 0xE5, 0x3E, 0x30, 0xE0, 0x06, 0x90, 0x00, 0x56, 0x74, 0x01, 0xF0, -+0xE5, 0x3E, 0x30, 0xE1, 0x06, 0x90, 0x00, 0x56, 0x74, 0x02, 0xF0, 0xE5, 0x3E, 0x30, 0xE2, 0x06, -+0x90, 0x00, 0x56, 0x74, 0x04, 0xF0, 0xE5, 0x3E, 0x30, 0xE3, 0x06, 0x90, 0x00, 0x56, 0x74, 0x08, -+0xF0, 0x90, 0x01, 0xC4, 0xED, 0xF0, 0xA3, 0xEF, 0xF0, 0xD0, 0x07, 0xD0, 0x06, 0xD0, 0x05, 0xD0, -+0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xE0, 0x32, 0xEF, 0xC3, 0x94, 0x20, 0x50, 0x39, 0xEF, 0x30, -+0xE0, 0x17, 0xED, 0xC4, 0x54, 0xF0, 0xFD, 0xEF, 0xC3, 0x13, 0xFE, 0x24, 0xA4, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x0F, 0x80, 0x10, 0xEF, 0xC3, 0x13, 0xFE, 0x24, 0xA4, 0xF5, -+0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0xF0, 0xF0, 0x74, 0xA4, 0x2E, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0xE0, 0x4D, 0xF0, 0x22, 0xAD, 0x07, 0x74, 0x84, 0x2D, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x7F, 0x90, 0x8A, 0xDE, 0xF0, 0xE0, 0xF9, 0x54, 0x1F, 0xA3, -+0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0xFF, 0x90, 0x8A, 0xE1, -+0xF0, 0xED, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, -+0xE0, 0x90, 0x8A, 0xE2, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xED, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, -+0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE4, 0xCB, 0xF0, 0xA3, 0xEB, -+0xF0, 0x90, 0x8A, 0xDF, 0xE0, 0xFE, 0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, -+0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, -+0x34, 0x86, 0xF5, 0x83, 0xEA, 0xF0, 0xA3, 0xEB, 0xF0, 0xEE, 0xC3, 0x9F, 0x40, 0x02, 0x41, 0xB9, -+0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, -+0xF0, 0xEF, 0x04, 0x90, 0x8A, 0xE0, 0xF0, 0x90, 0x8A, 0xE1, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, -+0xFE, 0xD3, 0x9F, 0x40, 0x02, 0x41, 0xF3, 0xEE, 0xC3, 0x94, 0x10, 0x40, 0x21, 0xEE, 0x24, 0xF0, -+0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, -+0xF9, 0xFF, 0x90, 0x8A, 0xE2, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x70, 0x27, 0x90, 0x8A, -+0xE0, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x50, 0x59, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, -+0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE4, 0xE0, 0x5E, 0xFE, 0xA3, -+0xE0, 0x5F, 0x4E, 0x60, 0x3C, 0x90, 0x8A, 0xE0, 0xE0, 0xB4, 0x11, 0x0D, 0x90, 0x8A, 0xE3, 0xE0, -+0x30, 0xE7, 0x06, 0x90, 0x8A, 0xE0, 0x74, 0x17, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xFF, 0x64, 0x13, -+0x60, 0x04, 0xEF, 0xB4, 0x12, 0x0D, 0x90, 0x8A, 0xE2, 0xE0, 0x30, 0xE0, 0x06, 0x90, 0x8A, 0xE0, -+0x74, 0x18, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0x80, -+0x42, 0x90, 0x8A, 0xE0, 0xE0, 0x04, 0xF0, 0x41, 0x17, 0x90, 0x8A, 0xE1, 0xE0, 0xFC, 0x90, 0x8A, -+0xDF, 0xE0, 0xFF, 0x6C, 0x70, 0x71, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, -+0xEF, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x29, 0x12, 0x43, 0x5F, 0xE0, 0xB4, 0x01, 0x10, -+0xE9, 0x20, 0xE6, 0x0C, 0x90, 0x8A, 0xDF, 0xE0, 0x44, 0x40, 0x90, 0x8A, 0xDE, 0xF0, 0x80, 0x03, -+0xAF, 0x01, 0x22, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, -+0xFE, 0xEF, 0x13, 0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x80, 0x66, 0x90, 0x8A, 0xDF, 0xE0, 0xD3, 0x9C, 0x40, 0x5E, 0x90, -+0x8A, 0xE1, 0xE0, 0xFF, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, -+0x90, 0x8A, 0xDF, 0xEF, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0xFC, 0xA3, 0xE0, 0xFF, 0x25, 0xE0, 0x24, -+0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, -+0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, -+0xE4, 0x93, 0x3A, 0xC3, 0x13, 0xFE, 0xEF, 0x13, 0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, -+0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xAF, 0x04, 0x22, 0x74, 0x01, 0x2D, -+0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xAF, 0x05, 0x90, 0x8A, 0xDE, 0xE0, 0x44, -+0x80, 0xFD, 0x12, 0x5C, 0x4E, 0x90, 0x8A, 0xDE, 0xE0, 0x44, 0x80, 0xFF, 0x22, 0xE4, 0x90, 0x8A, -+0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0xC3, 0x94, 0x20, 0x40, 0x03, 0x02, 0x72, 0x54, 0x75, -+0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2A, 0x12, 0x43, 0x5F, 0xE0, 0x64, 0x01, 0x60, 0x03, 0x02, 0x72, -+0x4B, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, -+0xE0, 0xFC, 0xA3, 0xE0, 0xD3, 0x94, 0x00, 0xEC, 0x94, 0x00, 0x50, 0x03, 0x02, 0x72, 0x4B, 0xEF, -+0x75, 0xF0, 0x0A, 0xA4, 0x24, 0x00, 0xF9, 0x74, 0x84, 0x35, 0xF0, 0x75, 0x12, 0x01, 0xF5, 0x13, -+0x89, 0x14, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, -+0x83, 0xE0, 0xFD, 0xA3, 0xE0, 0x90, 0x8A, 0xD4, 0xCD, 0xF0, 0xA3, 0xED, 0xF0, 0xEF, 0x25, 0xE0, -+0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, 0x8A, 0xD6, -+0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0x24, 0x84, 0xF5, 0x82, 0xE4, 0x34, -+0x04, 0xF5, 0x83, 0xE0, 0x54, 0x3F, 0x90, 0x8A, 0xD0, 0xF0, 0xE0, 0xFD, 0x54, 0x1F, 0xA3, 0xF0, -+0x75, 0xF0, 0x09, 0xEE, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD9, 0xF0, 0x90, -+0x8A, 0xCF, 0xE0, 0xFB, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xC3, 0x94, -+0x05, 0x40, 0x02, 0xC1, 0x9C, 0x90, 0x8A, 0xD9, 0xE0, 0xFE, 0x90, 0x8A, 0xD1, 0xE0, 0x9E, 0x40, -+0x13, 0x90, 0x8A, 0xD9, 0xE0, 0x90, 0x8A, 0xD1, 0xF0, 0xED, 0x54, 0x40, 0xFD, 0x90, 0x8A, 0xD0, -+0xF0, 0xEE, 0x4D, 0xF0, 0x90, 0x8A, 0xD1, 0xE0, 0xFF, 0x90, 0x41, 0x12, 0x93, 0xFE, 0x74, 0x23, -+0x2B, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xC3, 0x9E, 0x40, 0x06, 0xEF, 0x90, 0x40, -+0xDA, 0x80, 0x07, 0x90, 0x8A, 0xD1, 0xE0, 0x90, 0x40, 0xF6, 0x93, 0x90, 0x8A, 0xD8, 0xF0, 0x90, -+0x8A, 0xD8, 0xE0, 0x75, 0xF0, 0x06, 0xA4, 0x24, 0x50, 0xF9, 0x74, 0x40, 0x35, 0xF0, 0x75, 0x0F, -+0xFF, 0xF5, 0x10, 0x89, 0x11, 0x90, 0x8A, 0xD0, 0xE0, 0x90, 0x41, 0xBA, 0x93, 0xFF, 0xD3, 0x90, -+0x8A, 0xD7, 0xE0, 0x9F, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x0D, 0x90, 0x8A, 0xCF, 0xE0, -+0xFF, 0xE4, 0xFD, 0x12, 0x5D, 0x41, 0x02, 0x71, 0xE1, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, -+0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, 0x8A, 0xD2, 0xCF, -+0xF0, 0xA3, 0xEF, 0xF0, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x12, 0x24, 0x62, 0xFF, 0x7E, 0x00, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x97, 0xFD, 0xAC, 0xF0, 0x12, 0x24, 0x7B, 0x90, -+0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, -+0x01, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x02, -+0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x24, 0x7B, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, -+0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x7E, -+0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x04, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, -+0x12, 0x24, 0x7B, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, -+0xA9, 0x11, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, -+0x14, 0x90, 0x00, 0x06, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x24, 0x7B, 0x90, 0x8A, 0xD2, -+0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x04, 0x12, -+0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x08, 0x12, 0x42, -+0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x24, 0x7B, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, -+0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x05, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0x90, -+0x8A, 0xD4, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0x12, 0x24, 0x7B, 0xD3, 0x90, 0x8A, 0xD3, 0xE0, 0x9F, -+0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x40, 0x0C, 0xA3, 0xE0, 0x9F, 0xF0, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, -+0xF0, 0x80, 0x07, 0xE4, 0x90, 0x8A, 0xD2, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xD2, 0xE0, 0xFC, 0xA3, -+0xE0, 0xFD, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, -+0xF5, 0x83, 0xEC, 0xF0, 0xA3, 0xED, 0xF0, 0x90, 0x8A, 0xD0, 0xE0, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xD3, 0xED, 0x9B, -+0xEC, 0x9A, 0x40, 0x05, 0x31, 0x78, 0x02, 0x71, 0xAF, 0x90, 0x8A, 0xD0, 0xE0, 0x25, 0xE0, 0x24, -+0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFE, 0x74, 0x01, 0x93, 0xFF, 0xC3, -+0x90, 0x8A, 0xD3, 0xE0, 0x9F, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x40, 0x03, 0x02, 0x71, 0xAF, 0x90, -+0x8A, 0xCF, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5D, 0x41, 0x02, 0x71, 0xAF, 0x90, 0x8A, 0xCF, 0xE0, -+0xFF, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xFC, 0x64, 0x05, 0x60, 0x03, -+0x02, 0x70, 0x7D, 0x90, 0x87, 0x22, 0xE0, 0xFE, 0xB4, 0x03, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, -+0x94, 0x19, 0x40, 0x3D, 0x80, 0x2E, 0xEE, 0xB4, 0x02, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, 0x94, -+0x11, 0x40, 0x2E, 0x80, 0x1F, 0x90, 0x87, 0x22, 0xE0, 0xFE, 0xB4, 0x01, 0x0B, 0x90, 0x8A, 0xD1, -+0xE0, 0xC3, 0x94, 0x0A, 0x40, 0x1B, 0x80, 0x0C, 0xEE, 0x70, 0x11, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, -+0x94, 0x03, 0x40, 0x0D, 0x90, 0x89, 0x43, 0x74, 0x01, 0xF0, 0x80, 0x05, 0xE4, 0x90, 0x89, 0x43, -+0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, -+0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x23, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, -+0xC3, 0x94, 0x30, 0x50, 0x0B, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x64, 0x2F, 0x02, 0x70, 0x28, -+0x90, 0x89, 0x43, 0xE0, 0x64, 0x01, 0x60, 0x03, 0x02, 0x70, 0x1D, 0x90, 0x8A, 0xCF, 0xE0, 0x24, -+0x44, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0x64, 0x0A, 0x60, 0x5B, 0x90, 0x8A, 0xCF, -+0xE0, 0xFF, 0xEE, 0x24, 0x05, 0xFB, 0xE4, 0x33, 0xFA, 0x74, 0x21, 0x2F, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xE0, 0xFF, 0xD3, 0x9B, 0xEA, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, 0x50, 0x38, -+0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0xEF, 0x24, 0x05, 0xFB, 0xE4, 0x33, 0xFA, 0x74, 0x23, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xD3, 0x9B, 0xEA, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, -+0x50, 0x16, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x84, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, -+0xFF, 0x90, 0x8A, 0xD1, 0xE0, 0x6F, 0x60, 0x56, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x23, 0xF5, 0x82, -+0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFF, 0xD3, 0x94, 0x42, 0x40, 0x08, 0x90, 0x8A, 0xDD, 0x74, -+0x05, 0xF0, 0x80, 0x11, 0xEF, 0xD3, 0x94, 0x39, 0x90, 0x8A, 0xDD, 0x40, 0x05, 0x74, 0x03, 0xF0, -+0x80, 0x03, 0x74, 0x01, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x23, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0xE0, 0xFE, 0x74, 0x21, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, -+0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x44, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0x80, 0x2F, 0x90, 0x8A, -+0xCF, 0xE0, 0xFF, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x44, -+0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0x04, 0xF0, 0x80, 0x14, 0xE4, 0x90, 0x8A, -+0xDD, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, -+0xF0, 0x90, 0x8A, 0xD1, 0xE0, 0xFE, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x84, 0xF5, 0x82, 0xE4, -+0x34, 0x8A, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFE, 0x74, 0x43, 0x2F, 0xF5, 0x82, -+0xE4, 0x34, 0x88, 0xF5, 0x83, 0xEE, 0xF0, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2B, 0x12, 0x43, -+0x5F, 0xE0, 0xB4, 0x01, 0x11, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x64, 0x2F, 0xF5, 0x82, 0xE4, -+0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFD, 0x21, 0xAC, 0xEC, 0x64, 0x06, -+0x60, 0x02, 0x21, 0xAF, 0x90, 0x8A, 0xD2, 0xF0, 0xA3, 0xF0, 0x90, 0x41, 0xDB, 0x93, 0xFF, 0x7E, -+0x00, 0x90, 0x8A, 0xD4, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0x12, 0x24, 0x7B, 0x90, 0x8A, 0xDB, 0xEE, -+0xF0, 0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE0, 0x90, 0x8A, 0xDD, 0xF0, 0xE4, 0x90, 0x8A, 0xDA, 0xF0, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, -+0xD3, 0x94, 0x04, 0x50, 0x47, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x75, 0xF0, 0x02, 0xEF, 0xA4, -+0xF5, 0x82, 0x85, 0xF0, 0x83, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0xEF, 0x90, 0x41, 0xD6, 0x93, -+0xFF, 0x7E, 0x00, 0x12, 0x24, 0x7B, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0x90, -+0x8A, 0xDB, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xD3, 0x90, 0x8A, 0xD3, 0xE0, 0x9F, 0x90, 0x8A, 0xD2, -+0xE0, 0x9E, 0x50, 0x08, 0x90, 0x8A, 0xDA, 0xE0, 0x04, 0xF0, 0x80, 0xAF, 0x90, 0x8A, 0xDA, 0xE0, -+0xC3, 0x13, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFF, 0xB4, 0x01, 0x0D, 0x90, 0x8A, 0xDA, 0xE0, 0x70, -+0x5D, 0x90, 0x8A, 0xDD, 0x04, 0xF0, 0x80, 0x5B, 0xEF, 0xB4, 0x03, 0x1D, 0x90, 0x8A, 0xDA, 0xE0, -+0xFF, 0x70, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x03, 0xF0, 0x80, 0x48, 0xEF, 0xB4, 0x01, 0x08, 0x90, -+0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x80, 0x3C, 0x80, 0x35, 0x90, 0x8A, 0xDD, 0xE0, 0x64, 0x05, 0x70, -+0x32, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0x70, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x05, 0xF0, 0x80, 0x0F, -+0xEF, 0x90, 0x8A, 0xDD, 0xB4, 0x01, 0x05, 0x74, 0x03, 0xF0, 0x80, 0x03, 0x74, 0x01, 0xF0, 0xD3, -+0x90, 0x8A, 0xD7, 0xE0, 0x94, 0x03, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x05, 0xE4, 0x90, -+0x8A, 0xDD, 0xF0, 0xD3, 0x90, 0x8A, 0xD7, 0xE0, 0x94, 0x03, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, -+0x40, 0x05, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFD, 0x90, 0x8A, 0xCF, 0xE0, -+0xFF, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xED, 0xF0, 0x12, 0x69, 0x38, 0x90, -+0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xD3, 0x94, -+0x05, 0x50, 0x0F, 0x74, 0x64, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0x04, 0xF0, -+0x80, 0x0F, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, -+0xF0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0xE4, 0xF5, 0xF0, 0x12, 0x42, 0xFA, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x90, 0x00, 0x02, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, 0x04, 0xE4, -+0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, 0x06, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, -+0x08, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0xC0, -+0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x63, -+0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA3, -+0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, -+0xF0, 0x02, 0x6B, 0xC2, 0x22, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0xC3, -+0x94, 0x10, 0x50, 0x14, 0x74, 0xA4, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE4, 0xF0, -+0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x80, 0xE2, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, -+0xE0, 0xFF, 0xC3, 0x94, 0x20, 0x40, 0x02, 0x81, 0x0E, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x00, -+0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x02, 0x12, 0x43, -+0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x04, 0x12, 0x43, 0x5F, 0xE4, -+0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x06, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, -+0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x08, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x74, -+0x84, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0x74, 0x13, 0xF0, 0x74, 0x44, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x43, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x88, -+0xF5, 0x83, 0xE4, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xE3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0xE4, 0xF0, 0xA3, 0xF0, 0x74, 0x44, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, -+0x74, 0x24, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x64, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x90, 0x41, 0x8C, 0x93, 0xFE, 0x74, 0x01, 0x93, -+0xFF, 0x90, 0x41, 0x54, 0x74, 0x01, 0x93, 0x2F, 0xFF, 0xE4, 0x93, 0x3E, 0xC3, 0x13, 0xFE, 0xEF, -+0x13, 0xFF, 0x90, 0x8A, 0xCF, 0xE0, 0xFD, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, -+0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x29, 0x12, 0x43, -+0x5F, 0x74, 0x01, 0xF0, 0x74, 0xC1, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0x74, 0x0C, -+0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0x74, 0xFF, 0xF0, 0xA3, 0xF0, -+0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x23, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0x74, 0x0F, 0xF0, -+0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0x74, 0x13, 0xF0, 0x75, 0xF0, 0x09, -+0xED, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0x74, 0x84, 0x2D, 0xF5, 0x82, 0xE4, 0x34, -+0x04, 0xF5, 0x83, 0x74, 0x13, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x41, 0x7D, 0x22, 0x12, -+0x24, 0x62, 0xFF, 0xC3, 0x94, 0x20, 0x50, 0x14, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFE, 0x74, -+0x23, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xEE, 0xF0, 0x22, 0xEF, 0xB4, 0x20, 0x0A, -+0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0x90, 0x87, 0x21, 0xF0, 0x22, 0x90, 0x8B, 0x4B, 0xEE, 0xF0, -+0xA3, 0xEF, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x8B, 0x4B, 0xE0, 0xFE, 0xA3, 0xE0, 0xF5, -+0x82, 0x8E, 0x83, 0xE0, 0x60, 0x2C, 0xC3, 0x90, 0x8B, 0x4E, 0xE0, 0x94, 0xE8, 0x90, 0x8B, 0x4D, -+0xE0, 0x94, 0x03, 0x40, 0x0A, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x10, 0xF0, 0x7F, 0x00, 0x22, 0x90, -+0x8B, 0x4D, 0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x7F, 0x0A, 0x7E, 0x00, 0x12, 0x32, 0x15, -+0x80, 0xC6, 0x7F, 0x01, 0x22, 0x12, 0x24, 0x62, 0xF5, 0x21, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, -+0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x25, 0x14, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x01, 0x12, -+0x42, 0x20, 0x90, 0x8B, 0x1A, 0xF0, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x0A, 0xF0, -+0x12, 0x47, 0xFA, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x30, -+0xE0, 0x25, 0x12, 0x24, 0x62, 0x90, 0x8B, 0x10, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x90, -+0x8B, 0x11, 0xF0, 0xEF, 0xC3, 0x13, 0x54, 0x7F, 0x90, 0x8B, 0x0F, 0xF0, 0x90, 0x00, 0x03, 0x12, -+0x42, 0x20, 0x90, 0x8B, 0x16, 0xF0, 0x22, 0x90, 0x8B, 0x10, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x11, -+0x74, 0x05, 0xF0, 0x90, 0x8B, 0x0F, 0x74, 0x14, 0xF0, 0x90, 0x8B, 0x16, 0x74, 0x05, 0xF0, 0x22, -+0x12, 0x24, 0x62, 0x30, 0xE0, 0x19, 0xC3, 0x13, 0x54, 0x7F, 0x90, 0x8B, 0x15, 0xF0, 0x90, 0x00, -+0x01, 0x12, 0x42, 0x20, 0xFF, 0x90, 0x8B, 0x13, 0xE4, 0xF0, 0xA3, 0xEF, 0xF0, 0x80, 0x0F, 0x90, -+0x8B, 0x15, 0x74, 0x05, 0xF0, 0x90, 0x8B, 0x13, 0xE4, 0xF0, 0xA3, 0x74, 0x03, 0xF0, 0x90, 0x8B, -+0x13, 0xE0, 0xA3, 0xE0, 0x90, 0x05, 0x58, 0xF0, 0x22, 0x12, 0x24, 0x62, 0x90, 0x8B, 0x12, 0xF0, -+0x60, 0x07, 0xE4, 0xFD, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x90, 0x8B, 0x12, 0xE0, 0x90, 0x01, 0xE7, -+0xF0, 0x22, 0x90, 0x02, 0x09, 0xE0, 0xFD, 0x12, 0x24, 0x62, 0xFE, 0xAF, 0x05, 0xED, 0x2E, 0x90, -+0x8A, 0xF7, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xF8, 0xF0, -+0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xF9, 0xF0, 0x90, 0x00, 0x03, -+0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xFA, 0xF0, 0x90, 0x00, 0x04, 0x12, 0x42, 0x20, -+0xFF, 0xAE, 0x05, 0xED, 0x2F, 0x90, 0x8A, 0xFB, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, -+0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x8B, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x12, 0x24, 0x62, 0xC3, -+0x13, 0x20, 0xE0, 0x02, 0xC1, 0xED, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x24, 0x62, 0xFF, -+0x54, 0x02, 0xFE, 0x90, 0x8B, 0x32, 0xE0, 0x54, 0xFD, 0x4E, 0xFE, 0xF0, 0xEF, 0x54, 0x01, 0xFF, -+0xEE, 0x54, 0xFE, 0x4F, 0xFF, 0xF0, 0x12, 0x24, 0x62, 0xFE, 0x54, 0x08, 0xFD, 0xEF, 0x54, 0xF7, -+0x4D, 0xFF, 0x90, 0x8B, 0x32, 0xF0, 0xEE, 0x54, 0x10, 0xFE, 0xEF, 0x54, 0xEF, 0x4E, 0xFF, 0xF0, -+0x12, 0x24, 0x62, 0xFE, 0x54, 0x20, 0xFD, 0xEF, 0x54, 0xDF, 0x4D, 0xFF, 0x90, 0x8B, 0x32, 0xF0, -+0xEE, 0x54, 0x40, 0xFE, 0xEF, 0x54, 0xBF, 0x4E, 0xF0, 0x20, 0xE0, 0x02, 0xC1, 0xD9, 0x90, 0x8A, -+0xDD, 0x74, 0x21, 0xF0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x24, 0x62, 0xFF, 0x13, 0x13, -+0x54, 0x01, 0xFE, 0x90, 0x8B, 0x32, 0xE0, 0xFD, 0x13, 0x13, 0x54, 0x01, 0x6E, 0x60, 0x2A, 0xEF, -+0x54, 0x04, 0xFF, 0xED, 0x54, 0xFB, 0x4F, 0xF0, 0xE0, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x0E, -+0x90, 0x01, 0x34, 0x74, 0x40, 0xF0, 0xFD, 0xE4, 0xFF, 0x12, 0x31, 0x9D, 0x80, 0x0B, 0xE4, 0x90, -+0x8B, 0x34, 0xF0, 0x7D, 0x40, 0xFF, 0x12, 0x31, 0x2C, 0x90, 0x8B, 0x32, 0xE0, 0xFD, 0x13, 0x13, -+0x13, 0x54, 0x1F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x12, 0xF0, 0xED, 0xC4, 0x54, -+0x0F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x14, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xC4, -+0x13, 0x54, 0x07, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x80, 0xF0, 0x90, 0x8B, 0x32, -+0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x20, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x40, 0xF0, -+0x90, 0x8A, 0xDD, 0xE0, 0x90, 0x05, 0x27, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x70, 0x05, 0x7F, 0x01, -+0x12, 0x4E, 0x89, 0x90, 0x8B, 0x32, 0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x04, 0x7F, -+0x03, 0x80, 0x0E, 0x7F, 0x01, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F, -+0x02, 0x12, 0x4E, 0x89, 0x7F, 0x02, 0x02, 0x78, 0x2E, 0x90, 0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x90, -+0x05, 0x27, 0xF0, 0xE4, 0xFF, 0x12, 0x4E, 0x89, 0x7F, 0x03, 0x02, 0x78, 0x2E, 0x90, 0x8A, 0xDA, -+0x12, 0x43, 0x6B, 0x12, 0x24, 0x62, 0xFF, 0x54, 0x02, 0xFE, 0x90, 0x8B, 0x2C, 0xE0, 0x54, 0xFD, -+0x4E, 0xFE, 0xF0, 0xEF, 0x54, 0x01, 0xFF, 0xEE, 0x54, 0xFE, 0x4F, 0xFF, 0xF0, 0x12, 0x24, 0x62, -+0xFE, 0x54, 0x08, 0xFD, 0xEF, 0x54, 0xF7, 0x4D, 0xFF, 0x90, 0x8B, 0x2C, 0xF0, 0xEE, 0x54, 0x10, -+0xFE, 0xEF, 0x54, 0xEF, 0x4E, 0xFF, 0xF0, 0x12, 0x24, 0x62, 0xFE, 0x54, 0x40, 0xFD, 0xEF, 0x54, -+0xBF, 0x4D, 0xFF, 0x90, 0x8B, 0x2C, 0xF0, 0xEE, 0x54, 0x04, 0xFE, 0xEF, 0x54, 0xFB, 0x4E, 0xF0, -+0x20, 0xE0, 0x02, 0xE1, 0xE2, 0x90, 0x8A, 0xDD, 0x74, 0x31, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x13, -+0x13, 0x54, 0x3F, 0x20, 0xE0, 0x0B, 0xE4, 0x90, 0x8B, 0x2E, 0xF0, 0x7D, 0x40, 0xFF, 0x12, 0x31, -+0x2C, 0x90, 0x8B, 0x2C, 0xE0, 0xFD, 0x13, 0x13, 0x13, 0x54, 0x1F, 0x30, 0xE0, 0x07, 0x90, 0x8A, -+0xDD, 0xE0, 0x44, 0x02, 0xF0, 0xED, 0xC4, 0x54, 0x0F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, -+0x44, 0x04, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0x54, 0x06, 0x60, 0x0C, 0x90, 0x01, 0x3E, 0x74, 0x03, -+0xF0, 0xFD, 0x7F, 0x02, 0x12, 0x31, 0xB7, 0x90, 0x8A, 0xDD, 0xE0, 0x90, 0x05, 0x27, 0xF0, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x0D, 0xA3, 0xE0, 0x64, 0x06, -+0x60, 0x2C, 0x7F, 0x06, 0x12, 0x65, 0x82, 0x80, 0x25, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x06, 0x1B, -+0x7F, 0x01, 0x12, 0x65, 0x82, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x09, 0x7D, 0x01, 0xAF, -+0x23, 0x12, 0x45, 0xA2, 0x80, 0x05, 0x12, 0x4E, 0x56, 0x80, 0x03, 0x12, 0x7D, 0xC1, 0x7F, 0x01, -+0x80, 0x4C, 0x90, 0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x27, 0xF0, 0x7D, 0x03, 0x7F, 0x02, -+0x12, 0x31, 0x49, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x06, 0x02, 0x80, 0x1B, 0x90, 0x8B, 0x2D, 0xE0, -+0xB4, 0x04, 0x02, 0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, 0x80, 0x14, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, -+0x02, 0x05, 0x7F, 0x01, 0x12, 0x65, 0x82, 0x11, 0x35, 0x12, 0x4A, 0xFC, 0x7F, 0x03, 0x11, 0x42, -+0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x8B, 0x31, 0xE0, 0xB4, 0x01, 0x05, 0xE4, 0xF0, 0x12, 0x48, -+0xFE, 0x22, 0xAD, 0x07, 0xEF, 0x64, 0x01, 0x60, 0x04, 0xEF, 0xB4, 0x03, 0x15, 0x90, 0x8B, 0x32, -+0xE0, 0x54, 0xFE, 0xF0, 0x54, 0xFB, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, -+0xA3, 0xF0, 0xED, 0x64, 0x02, 0x60, 0x04, 0xED, 0xB4, 0x03, 0x15, 0x90, 0x8B, 0x2C, 0xE0, 0x54, -+0xFE, 0xF0, 0x54, 0xFB, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, -+0x22, 0x12, 0x24, 0x62, 0x90, 0x8B, 0x38, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x8A, 0xFD, 0xE0, 0x90, 0x8A, 0xE8, 0xF0, 0x90, 0x8A, 0xFE, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, -+0x8A, 0xE9, 0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0xE4, 0x90, 0x8A, 0xE4, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, -+0xFF, 0x24, 0x00, 0xF5, 0x82, 0xE4, 0x34, 0x8B, 0xF5, 0x83, 0xE0, 0xFE, 0x74, 0xEB, 0x2F, 0xF5, -+0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0x04, 0xF0, 0xE0, 0xB4, -+0x04, 0xDA, 0x90, 0x8A, 0xE8, 0xE0, 0x12, 0x43, 0x94, 0x78, 0xF8, 0x00, 0x7A, 0x6B, 0x01, 0x79, -+0x01, 0x02, 0x79, 0x01, 0x03, 0x79, 0x01, 0x04, 0x7A, 0x6B, 0x05, 0x7A, 0x35, 0x80, 0x7A, 0x4E, -+0x81, 0x7A, 0x6B, 0x82, 0x00, 0x00, 0x7A, 0x67, 0x90, 0x8A, 0xEE, 0xE0, 0xFF, 0x51, 0x72, 0x41, -+0x6B, 0x90, 0x8A, 0xE8, 0xE0, 0xFF, 0xB4, 0x02, 0x08, 0x90, 0x8A, 0xE5, 0x74, 0x01, 0xF0, 0x80, -+0x0F, 0xEF, 0x90, 0x8A, 0xE5, 0xB4, 0x03, 0x05, 0x74, 0x02, 0xF0, 0x80, 0x03, 0x74, 0x04, 0xF0, -+0xC3, 0x90, 0x8A, 0xE9, 0xE0, 0x94, 0x08, 0x50, 0x78, 0xE4, 0x90, 0x8A, 0xE4, 0xF0, 0x90, 0x8A, -+0xE5, 0xE0, 0xFF, 0x90, 0x8A, 0xE4, 0xE0, 0xC3, 0x9F, 0x40, 0x02, 0x41, 0x6B, 0x90, 0x8A, 0xE9, -+0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xC3, 0xEE, 0x94, 0x01, 0x90, 0x8A, 0xE4, 0xE0, 0x50, 0x1F, 0xFE, -+0x2F, 0xFF, 0xEE, 0xFD, 0xC3, 0x74, 0x03, 0x9D, 0xFD, 0xE4, 0x94, 0x00, 0xFC, 0x74, 0xEB, 0x2D, -+0xF5, 0x82, 0x74, 0x8A, 0x3C, 0xF5, 0x83, 0xE0, 0xFD, 0x12, 0x51, 0x88, 0x80, 0x2B, 0xFF, 0xFD, -+0xC3, 0x74, 0x03, 0x9D, 0xFD, 0xE4, 0x94, 0x00, 0xFC, 0x74, 0xEB, 0x2D, 0xF5, 0x82, 0x74, 0x8A, -+0x3C, 0xF5, 0x83, 0xE0, 0xFE, 0xEF, 0xFD, 0x90, 0x8A, 0xEA, 0xE0, 0x2D, 0xFD, 0x90, 0x8A, 0xE9, -+0xE0, 0x34, 0x00, 0x8D, 0x82, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0x04, 0xF0, 0x80, -+0x8D, 0xC3, 0x90, 0x8A, 0xE9, 0xE0, 0x94, 0x10, 0x40, 0x02, 0x41, 0x6B, 0x90, 0x8A, 0xE8, 0xE0, -+0x64, 0x04, 0x60, 0x02, 0x41, 0x6B, 0x90, 0x8A, 0xEC, 0xE0, 0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, -+0x10, 0x12, 0x24, 0xF5, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, 0x8A, 0xEB, 0xE0, -+0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, 0x18, 0x12, 0x24, 0xF5, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, -+0xD0, 0x00, 0x12, 0x43, 0x46, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, 0x8A, 0xED, -+0xE0, 0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, 0x08, 0x12, 0x24, 0xF5, 0xD0, 0x03, 0xD0, 0x02, 0xD0, -+0x01, 0xD0, 0x00, 0x12, 0x43, 0x46, 0xA8, 0x04, 0xA9, 0x05, 0xAA, 0x06, 0xAB, 0x07, 0xA3, 0xE0, -+0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x12, 0x43, 0x46, 0xA3, 0x12, 0x25, 0x08, 0x90, 0x8A, 0xEF, 0x12, -+0x43, 0x53, 0x90, 0x80, 0x96, 0x12, 0x25, 0x08, 0x90, 0x8A, 0xE9, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, -+0x12, 0x2B, 0x08, 0x80, 0x36, 0x90, 0x8A, 0xED, 0xE0, 0xFE, 0xA3, 0xE0, 0x24, 0x00, 0xFF, 0xE4, -+0x3E, 0xFE, 0x90, 0x8A, 0xE6, 0xF0, 0xA3, 0xEF, 0xF0, 0x12, 0x32, 0x15, 0x80, 0x1D, 0x90, 0x8A, -+0xED, 0xE0, 0xFE, 0xA3, 0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0xFE, 0x90, 0x8A, 0xE6, 0xF0, 0xA3, -+0xEF, 0xF0, 0x12, 0x31, 0x82, 0x80, 0x04, 0x7F, 0x00, 0x80, 0x02, 0x7F, 0x01, 0xD0, 0xD0, 0x92, -+0xAF, 0x22, 0x8F, 0x0F, 0xE4, 0x90, 0x8A, 0xF3, 0xF0, 0xE5, 0x0F, 0x14, 0xFE, 0x90, 0x8A, 0xF3, -+0xE0, 0xFF, 0xC3, 0x9E, 0x50, 0x0E, 0xEF, 0x04, 0xFD, 0x12, 0x2D, 0x4D, 0x90, 0x8A, 0xF3, 0xE0, -+0x04, 0xF0, 0x80, 0xE5, 0xE5, 0x0F, 0x14, 0xFF, 0x7D, 0xFF, 0x12, 0x2D, 0x4D, 0x90, 0x8A, 0xF3, -+0xE5, 0x0F, 0xF0, 0x90, 0x8A, 0xF3, 0xE0, 0xC3, 0x94, 0xFF, 0x50, 0x0F, 0xE0, 0xFF, 0x04, 0xFD, -+0x12, 0x2D, 0x4D, 0x90, 0x8A, 0xF3, 0xE0, 0x04, 0xF0, 0x80, 0xE8, 0xAD, 0x0F, 0x7F, 0xFF, 0x02, -+0x2D, 0x4D, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0xA3, 0x74, -+0x04, 0xF0, 0xA3, 0xE4, 0xF0, 0x90, 0x8A, 0xE2, 0xF0, 0xA3, 0xF0, 0x90, 0x02, 0x09, 0xE0, 0x90, -+0x8A, 0xE1, 0xF0, 0x12, 0x24, 0x62, 0xFF, 0x90, 0x8A, 0xE1, 0xE0, 0x2F, 0x90, 0x8A, 0xE0, 0xF0, -+0x30, 0xE0, 0x0B, 0x90, 0x8A, 0xDB, 0xE4, 0xF0, 0xA3, 0x74, 0x80, 0xF0, 0x80, 0x07, 0xE4, 0x90, -+0x8A, 0xDB, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xC3, 0x13, 0x90, 0xFD, 0x10, 0xF0, 0x90, -+0x8A, 0xDD, 0xE0, 0x24, 0x20, 0xF0, 0x90, 0x8A, 0xDB, 0xA3, 0xE0, 0xFD, 0xA3, 0xE0, 0xFC, 0x2D, -+0xFF, 0x24, 0x01, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xFD, 0xF0, 0x74, -+0x02, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0xFE, 0xEC, 0x2D, 0x24, 0x03, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0x90, 0x8A, 0xFE, 0xF0, -+0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xDA, 0x74, 0x04, 0xF0, 0x90, 0x8A, 0xDB, 0xA3, 0xE0, 0xFF, 0xA3, -+0xE0, 0x2F, 0xFF, 0x90, 0x8A, 0xDA, 0xE0, 0xFE, 0x2F, 0x24, 0x00, 0xF5, 0x82, 0xE4, 0x34, 0xFC, -+0xF5, 0x83, 0xE0, 0xFF, 0x74, 0xFC, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, -+0x90, 0x8A, 0xDA, 0xE0, 0x04, 0xF0, 0xE0, 0xB4, 0x08, 0xCF, 0x11, 0x89, 0xEF, 0x70, 0x45, 0x90, -+0x01, 0xC3, 0xE0, 0x60, 0x2B, 0xC3, 0x90, 0x8A, 0xE3, 0xE0, 0x94, 0xE8, 0x90, 0x8A, 0xE2, 0xE0, -+0x94, 0x03, 0x40, 0x09, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x10, 0xF0, 0x80, 0x79, 0x90, 0x8A, 0xE2, -+0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x7F, 0x0A, 0x7E, 0x00, 0x12, 0x32, 0x15, 0x80, 0xCF, -+0x90, 0x01, 0xC6, 0xE0, 0x90, 0x01, 0xC3, 0x30, 0xE2, 0x05, 0x74, 0xFE, 0xF0, 0x80, 0x57, 0x74, -+0xFF, 0xF0, 0x80, 0x52, 0x90, 0x8A, 0xDD, 0xE0, 0xB4, 0x78, 0x2E, 0xE4, 0xF0, 0x90, 0x8A, 0xE0, -+0xE0, 0x04, 0xF0, 0x90, 0x8A, 0xDB, 0xE0, 0x70, 0x04, 0xA3, 0xE0, 0x64, 0x80, 0x90, 0x8A, 0xDB, -+0x70, 0x05, 0xF0, 0xA3, 0xF0, 0x80, 0x06, 0xE4, 0xF0, 0xA3, 0x74, 0x80, 0xF0, 0x90, 0x8A, 0xE0, -+0xE0, 0xC3, 0x13, 0x90, 0xFD, 0x10, 0xF0, 0x80, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x24, 0x08, 0xF0, -+0x90, 0x8A, 0xDE, 0x74, 0xFF, 0xF5, 0xF0, 0x12, 0x42, 0x81, 0x90, 0x8A, 0xDE, 0xE0, 0x70, 0x02, -+0xA3, 0xE0, 0x60, 0x02, 0x61, 0x16, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x24, 0x62, 0x90, 0x8B, -+0x05, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x06, 0xF0, 0x22, 0xE4, 0xF5, 0x61, -+0x22, 0x91, 0x4A, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, -+0x7F, 0x78, 0x7E, 0x08, 0x12, 0x22, 0x65, 0x90, 0x8B, 0x1C, 0x12, 0x25, 0x08, 0x7F, 0x04, 0x7E, -+0x0C, 0x12, 0x22, 0x65, 0x90, 0x8B, 0x20, 0x12, 0x25, 0x08, 0x7F, 0x00, 0x7E, 0x08, 0x12, 0x22, -+0x65, 0x90, 0x8B, 0x24, 0x12, 0x25, 0x08, 0x90, 0x8B, 0x09, 0xE0, 0x90, 0x8B, 0x1C, 0xB4, 0x01, -+0x0D, 0x12, 0x43, 0x53, 0xEF, 0x54, 0xC7, 0xFF, 0xED, 0x54, 0xC7, 0xFD, 0x80, 0x07, 0x12, 0x43, -+0x53, 0xEF, 0x54, 0xC7, 0xFF, 0xEC, 0x90, 0x80, 0x96, 0x12, 0x25, 0x08, 0x7F, 0x78, 0x7E, 0x08, -+0x12, 0x2B, 0x08, 0x90, 0x8B, 0x20, 0x12, 0x43, 0x53, 0xEF, 0x54, 0x0F, 0xFF, 0xEC, 0x90, 0x80, -+0x96, 0x12, 0x25, 0x08, 0x7F, 0x04, 0x7E, 0x0C, 0x12, 0x2B, 0x08, 0x90, 0x8B, 0x24, 0x12, 0x43, -+0x53, 0xEF, 0x44, 0x02, 0xFF, 0xEC, 0x90, 0x80, 0x96, 0x12, 0x25, 0x08, 0x7F, 0x00, 0x7E, 0x08, -+0x12, 0x2B, 0x08, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x22, 0x65, 0x90, 0x8B, 0x28, 0x12, 0x25, 0x08, -+0x90, 0x80, 0x96, 0x12, 0x25, 0x14, 0x00, 0x1B, 0x25, 0xA0, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x2B, -+0x08, 0x90, 0x80, 0x68, 0x12, 0x25, 0x14, 0x00, 0x00, 0x00, 0x00, 0xE4, 0xFD, 0xFF, 0x12, 0x30, -+0x2C, 0x90, 0x8B, 0x09, 0xE0, 0xB4, 0x01, 0x11, 0x90, 0x80, 0x68, 0x12, 0x25, 0x14, 0x00, 0x00, -+0x00, 0x00, 0xE4, 0xFD, 0x7F, 0x01, 0x12, 0x30, 0x2C, 0x90, 0x00, 0x11, 0xE0, 0x54, 0xF6, 0xF0, -+0x02, 0x52, 0x0E, 0x91, 0x50, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, -+0xFF, 0xF0, 0x90, 0x8B, 0x33, 0x74, 0x04, 0xF0, 0x22, 0xB1, 0x42, 0x90, 0x8B, 0x33, 0x74, 0x04, -+0xF0, 0x22, 0x90, 0x00, 0x11, 0xE0, 0x44, 0x09, 0xF0, 0x12, 0x52, 0x0E, 0x90, 0x8B, 0x1C, 0x12, -+0x43, 0x53, 0x90, 0x80, 0x96, 0x12, 0x25, 0x08, 0x7F, 0x78, 0x7E, 0x08, 0x12, 0x2B, 0x08, 0x90, -+0x8B, 0x20, 0x12, 0x43, 0x53, 0x90, 0x80, 0x96, 0x12, 0x25, 0x08, 0x7F, 0x04, 0x7E, 0x0C, 0x12, -+0x2B, 0x08, 0x90, 0x8B, 0x24, 0x12, 0x43, 0x53, 0x90, 0x80, 0x96, 0x12, 0x25, 0x08, 0x7F, 0x00, -+0x7E, 0x08, 0x12, 0x2B, 0x08, 0x90, 0x8B, 0x28, 0x12, 0x43, 0x53, 0x90, 0x80, 0x96, 0x12, 0x25, -+0x08, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x2B, 0x08, 0x90, 0x80, 0x68, 0x12, 0x25, 0x14, 0x00, 0x03, -+0x2D, 0x95, 0xE4, 0xFD, 0xFF, 0x12, 0x30, 0x2C, 0x90, 0x8B, 0x09, 0xE0, 0xB4, 0x01, 0x11, 0x90, -+0x80, 0x68, 0x12, 0x25, 0x14, 0x00, 0x03, 0x2D, 0x95, 0xE4, 0xFD, 0x7F, 0x01, 0x12, 0x30, 0x2C, -+0x22, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x3C, 0xE5, 0x22, 0x54, 0x0F, 0x14, 0x60, 0x2E, -+0x14, 0x60, 0x1E, 0x24, 0xFE, 0x60, 0x0E, 0x24, 0xF8, 0x70, 0x2A, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, -+0x90, 0x05, 0x22, 0xF0, 0x22, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x22, 0xE4, 0xF0, -+0x22, 0x90, 0x8B, 0x2D, 0x74, 0x03, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x22, 0x90, 0x01, -+0xC6, 0xE0, 0x44, 0x08, 0xF0, 0x22, 0xAE, 0x07, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x18, -+0x90, 0x8B, 0x2C, 0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x20, 0xE0, 0x0C, 0xAF, 0x06, 0x7D, 0x01, -+0x12, 0x45, 0xA2, 0xB1, 0xC1, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0x90, 0x01, 0x57, 0xE0, 0x60, -+0x3C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x1B, 0xE0, -+0x60, 0x07, 0xE4, 0xF0, 0x53, 0x25, 0xFD, 0x80, 0x24, 0x90, 0x8B, 0x0C, 0xE0, 0x04, 0xF0, 0x53, -+0x25, 0xEF, 0x90, 0x8B, 0x10, 0xE0, 0xFF, 0x90, 0x8B, 0x0C, 0xE0, 0xD3, 0x9F, 0x40, 0x0E, 0xE5, -+0x21, 0xB4, 0x01, 0x09, 0x90, 0x8B, 0x0D, 0xE0, 0x70, 0x03, 0xE0, 0x04, 0xF0, 0x90, 0x01, 0x5B, -+0xE0, 0x60, 0x10, 0x90, 0x01, 0x5B, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, 0xE4, 0x90, -+0x8B, 0x18, 0xF0, 0x90, 0x01, 0x5F, 0xE0, 0x60, 0x10, 0x90, 0x01, 0x5F, 0xE4, 0xF0, 0x90, 0x01, -+0x3C, 0x74, 0x08, 0xF0, 0xE4, 0x90, 0x8B, 0x17, 0xF0, 0x22, 0xE4, 0x90, 0x8B, 0x4F, 0xF0, 0xA3, -+0xF0, 0x90, 0x05, 0xF8, 0xE0, 0x70, 0x0F, 0xA3, 0xE0, 0x70, 0x0B, 0xA3, 0xE0, 0x70, 0x07, 0xA3, -+0xE0, 0x70, 0x03, 0x7F, 0x01, 0x22, 0xD3, 0x90, 0x8B, 0x50, 0xE0, 0x94, 0xE8, 0x90, 0x8B, 0x4F, -+0xE0, 0x94, 0x03, 0x40, 0x03, 0x7F, 0x00, 0x22, 0x7F, 0x32, 0x7E, 0x00, 0x12, 0x32, 0x15, 0x90, -+0x8B, 0x4F, 0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x80, 0xC6, 0x00, 0xFB, 0x98}; -+ -+// =================== v88 UMC B Cut P2PPS with CCX report C2H 2012-12-05 ===================== -+u8 Rtl8192CUFwUMCBCutImgArray[UMCBCutImgArrayLength] = { -+0xC2, 0x88, 0x02, 0x05, 0x58, 0x00, 0x02, 0x00, 0x12, 0x05, 0x17, 0x10, 0xC0, 0x3E, 0x01, 0x00, -+0x94, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x02, 0x46, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x02, 0x60, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x02, 0x67, 0x5B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4B, 0x87, 0x00, 0x00, -+0x05, 0x04, 0x03, 0x02, 0x00, 0x03, 0x06, 0x05, 0x04, 0x03, 0x00, 0x04, 0x06, 0x05, 0x04, 0x02, -+0x00, 0x04, 0x08, 0x07, 0x06, 0x04, 0x00, 0x06, 0x0A, 0x09, 0x08, 0x06, 0x00, 0x08, 0x0A, 0x09, -+0x08, 0x04, 0x00, 0x08, 0x0A, 0x09, 0x08, 0x02, 0x00, 0x08, 0x0A, 0x09, 0x08, 0x00, 0x00, 0x08, -+0x12, 0x11, 0x10, 0x08, 0x00, 0x10, 0x1A, 0x19, 0x18, 0x10, 0x00, 0x18, 0x22, 0x21, 0x20, 0x18, -+0x00, 0x20, 0x22, 0x21, 0x20, 0x10, 0x00, 0x20, 0x22, 0x21, 0x20, 0x08, 0x00, 0x20, 0x22, 0x21, -+0x1C, 0x08, 0x00, 0x20, 0x22, 0x21, 0x14, 0x08, 0x00, 0x20, 0x22, 0x20, 0x18, 0x08, 0x00, 0x20, -+0x31, 0x30, 0x20, 0x10, 0x00, 0x30, 0x31, 0x30, 0x18, 0x00, 0x00, 0x30, 0x31, 0x2F, 0x10, 0x10, -+0x00, 0x30, 0x31, 0x2C, 0x10, 0x10, 0x00, 0x30, 0x31, 0x28, 0x10, 0x00, 0x00, 0x30, 0x31, 0x20, -+0x10, 0x00, 0x00, 0x30, 0x31, 0x10, 0x10, 0x00, 0x00, 0x30, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, -+0x05, 0x07, 0x07, 0x07, 0x08, 0x0A, 0x04, 0x04, 0x04, 0x04, 0x06, 0x0A, 0x0B, 0x0D, 0x05, 0x05, -+0x07, 0x07, 0x08, 0x0B, 0x0D, 0x0F, 0x04, 0x04, 0x04, 0x05, 0x07, 0x07, 0x09, 0x09, 0x0C, 0x0E, -+0x10, 0x12, 0x06, 0x07, 0x09, 0x0A, 0x0C, 0x0E, 0x11, 0x13, 0x09, 0x09, 0x09, 0x09, 0x0C, 0x0E, -+0x11, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x26, 0x2A, 0x18, 0x1A, -+0x1D, 0x1F, 0x21, 0x27, 0x29, 0x2A, 0x00, 0x00, 0x00, 0x1F, 0x23, 0x28, 0x2A, 0x2C, 0x00, 0x04, -+0x00, 0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x18, 0x00, 0x24, 0x00, 0x30, 0x00, 0x48, 0x00, 0x60, -+0x00, 0x90, 0x00, 0xC0, 0x00, 0xD8, 0x00, 0x50, 0x00, 0x78, 0x00, 0xA0, 0x00, 0xC8, 0x01, 0x40, -+0x01, 0x90, 0x01, 0xE0, 0x02, 0x30, 0x01, 0x2C, 0x01, 0x40, 0x01, 0xE0, 0x02, 0xD0, 0x03, 0xE8, -+0x04, 0xB0, 0x06, 0x40, 0x07, 0xD0, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00, 0x0C, -+0x00, 0x12, 0x00, 0x18, 0x00, 0x24, 0x00, 0x30, 0x00, 0x48, 0x00, 0x60, 0x00, 0x6C, 0x00, 0x28, -+0x00, 0x3C, 0x00, 0x50, 0x00, 0x64, 0x00, 0xA0, 0x00, 0xC8, 0x00, 0xF0, 0x01, 0x18, 0x00, 0x64, -+0x00, 0xA0, 0x00, 0xF0, 0x01, 0x68, 0x01, 0xF4, 0x02, 0x58, 0x03, 0x20, 0x03, 0xE8, 0x02, 0x02, -+0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x07, 0x02, 0x03, 0x04, 0x0A, 0x0C, 0x0E, -+0x10, 0x12, 0x05, 0x07, 0x07, 0x08, 0x0B, 0x12, 0x24, 0x3C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, -+0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x05, 0x06, -+0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x20, 0x1E, 0x1C, 0x18, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0xBB, 0x01, 0x0C, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE0, 0x22, 0x50, -+0x06, 0xE9, 0x25, 0x82, 0xF8, 0xE6, 0x22, 0xBB, 0xFE, 0x06, 0xE9, 0x25, 0x82, 0xF8, 0xE2, 0x22, -+0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE4, 0x93, 0x22, 0xBB, 0x01, 0x06, -+0x89, 0x82, 0x8A, 0x83, 0xF0, 0x22, 0x50, 0x02, 0xF7, 0x22, 0xBB, 0xFE, 0x01, 0xF3, 0x22, 0xF8, -+0xBB, 0x01, 0x0D, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE8, 0xF0, 0x22, -+0x50, 0x06, 0xE9, 0x25, 0x82, 0xC8, 0xF6, 0x22, 0xBB, 0xFE, 0x05, 0xE9, 0x25, 0x82, 0xC8, 0xF2, -+0x22, 0xC5, 0xF0, 0xF8, 0xA3, 0xE0, 0x28, 0xF0, 0xC5, 0xF0, 0xF8, 0xE5, 0x82, 0x15, 0x82, 0x70, -+0x02, 0x15, 0x83, 0xE0, 0x38, 0xF0, 0x22, 0xBB, 0x01, 0x0A, 0x89, 0x82, 0x8A, 0x83, 0xE0, 0xF5, -+0xF0, 0xA3, 0xE0, 0x22, 0x50, 0x06, 0x87, 0xF0, 0x09, 0xE7, 0x19, 0x22, 0xBB, 0xFE, 0x07, 0xE3, -+0xF5, 0xF0, 0x09, 0xE3, 0x19, 0x22, 0x89, 0x82, 0x8A, 0x83, 0xE4, 0x93, 0xF5, 0xF0, 0x74, 0x01, -+0x93, 0x22, 0xBB, 0x01, 0x10, 0xE5, 0x82, 0x29, 0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE0, -+0xF5, 0xF0, 0xA3, 0xE0, 0x22, 0x50, 0x09, 0xE9, 0x25, 0x82, 0xF8, 0x86, 0xF0, 0x08, 0xE6, 0x22, -+0xBB, 0xFE, 0x0A, 0xE9, 0x25, 0x82, 0xF8, 0xE2, 0xF5, 0xF0, 0x08, 0xE2, 0x22, 0xE5, 0x83, 0x2A, -+0xF5, 0x83, 0xE9, 0x93, 0xF5, 0xF0, 0xA3, 0xE9, 0x93, 0x22, 0xBB, 0x01, 0x0A, 0x89, 0x82, 0x8A, -+0x83, 0xF0, 0xE5, 0xF0, 0xA3, 0xF0, 0x22, 0x50, 0x06, 0xF7, 0x09, 0xA7, 0xF0, 0x19, 0x22, 0xBB, -+0xFE, 0x06, 0xF3, 0xE5, 0xF0, 0x09, 0xF3, 0x19, 0x22, 0xF8, 0xBB, 0x01, 0x11, 0xE5, 0x82, 0x29, -+0xF5, 0x82, 0xE5, 0x83, 0x3A, 0xF5, 0x83, 0xE8, 0xF0, 0xE5, 0xF0, 0xA3, 0xF0, 0x22, 0x50, 0x09, -+0xE9, 0x25, 0x82, 0xC8, 0xF6, 0x08, 0xA6, 0xF0, 0x22, 0xBB, 0xFE, 0x09, 0xE9, 0x25, 0x82, 0xC8, -+0xF2, 0xE5, 0xF0, 0x08, 0xF2, 0x22, 0xEF, 0x4B, 0xFF, 0xEE, 0x4A, 0xFE, 0xED, 0x49, 0xFD, 0xEC, -+0x48, 0xFC, 0x22, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0xA3, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0x22, 0xA4, -+0x25, 0x82, 0xF5, 0x82, 0xE5, 0xF0, 0x35, 0x83, 0xF5, 0x83, 0x22, 0xE0, 0xFB, 0xA3, 0xE0, 0xFA, -+0xA3, 0xE0, 0xF9, 0x22, 0xF8, 0xE0, 0xFB, 0xA3, 0xA3, 0xE0, 0xF9, 0x25, 0xF0, 0xF0, 0xE5, 0x82, -+0x15, 0x82, 0x70, 0x02, 0x15, 0x83, 0xE0, 0xFA, 0x38, 0xF0, 0x22, 0xEB, 0xF0, 0xA3, 0xEA, 0xF0, -+0xA3, 0xE9, 0xF0, 0x22, 0xD0, 0x83, 0xD0, 0x82, 0xF8, 0xE4, 0x93, 0x70, 0x12, 0x74, 0x01, 0x93, -+0x70, 0x0D, 0xA3, 0xA3, 0x93, 0xF8, 0x74, 0x01, 0x93, 0xF5, 0x82, 0x88, 0x83, 0xE4, 0x73, 0x74, -+0x02, 0x93, 0x68, 0x60, 0xEF, 0xA3, 0xA3, 0xA3, 0x80, 0xDF, 0xD0, 0x83, 0xD0, 0x82, 0xF8, 0xE4, -+0x93, 0x70, 0x12, 0x74, 0x01, 0x93, 0x70, 0x0D, 0xA3, 0xA3, 0x93, 0xF8, 0x74, 0x01, 0x93, 0xF5, -+0x82, 0x88, 0x83, 0xE4, 0x73, 0x74, 0x02, 0x93, 0xB5, 0xF0, 0x06, 0x74, 0x03, 0x93, 0x68, 0x60, -+0xE9, 0xA3, 0xA3, 0xA3, 0xA3, 0x80, 0xD8, 0xE4, 0x90, 0x8A, 0xC5, 0xF0, 0xE5, 0x24, 0x70, 0x03, -+0x02, 0x44, 0x9D, 0xE5, 0x21, 0x64, 0x01, 0x60, 0x03, 0x02, 0x44, 0x9D, 0xE5, 0x24, 0x14, 0x60, -+0x29, 0x24, 0xFD, 0x60, 0x25, 0x24, 0x02, 0x24, 0xFB, 0x50, 0x02, 0x80, 0x23, 0x90, 0x8B, 0x0B, -+0xE0, 0x14, 0xF0, 0xE0, 0x60, 0x04, 0xA3, 0xE0, 0x60, 0x16, 0x90, 0x8B, 0x0B, 0xE0, 0x70, 0x0A, -+0x90, 0x8B, 0x19, 0xE0, 0x90, 0x8B, 0x0B, 0xF0, 0x80, 0x00, 0x90, 0x8A, 0xC5, 0x74, 0x01, 0xF0, -+0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x16, 0xA3, 0xE0, 0xB4, 0x06, 0x05, 0xE4, 0x90, 0x8A, 0xC5, -+0xF0, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x70, 0x04, 0x90, 0x8A, 0xC5, 0xF0, 0x90, 0x8A, 0xC5, -+0xE0, 0x60, 0x4A, 0x43, 0x25, 0x10, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0C, 0xE0, 0x75, -+0xF0, 0x03, 0xA4, 0xFF, 0x90, 0x8B, 0x15, 0xE0, 0x2F, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, 0x05, 0xF0, 0xE5, 0x22, 0x54, -+0x0F, 0xC3, 0x94, 0x04, 0x50, 0x07, 0x7D, 0x01, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x90, 0x8B, 0x2C, -+0xE0, 0x30, 0xE0, 0x09, 0x12, 0x66, 0x20, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x22, 0xE4, 0xF5, -+0x25, 0xF5, 0x24, 0x75, 0x23, 0x0C, 0x75, 0x22, 0x0C, 0x90, 0x8B, 0x1A, 0xF0, 0x90, 0x8B, 0x18, -+0xF0, 0x90, 0x8B, 0x17, 0xF0, 0x90, 0x8B, 0x19, 0x04, 0xF0, 0x90, 0x8B, 0x0B, 0xF0, 0xE4, 0x90, -+0x8B, 0x1B, 0xF0, 0x90, 0x8B, 0x0D, 0xF0, 0x90, 0x8B, 0x15, 0x74, 0x05, 0xF0, 0xE4, 0x90, 0x8B, -+0x0C, 0xF0, 0x90, 0x8B, 0x13, 0xF0, 0xA3, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x10, 0xF0, 0xA3, 0x74, -+0x05, 0xF0, 0x90, 0x8B, 0x0F, 0x74, 0x14, 0xF0, 0x90, 0x8B, 0x16, 0x74, 0x05, 0xF0, 0xE4, 0x90, -+0x8B, 0x0E, 0xF0, 0x90, 0x8B, 0x0A, 0xF0, 0x90, 0x8B, 0x08, 0xF0, 0x90, 0x8B, 0x12, 0xF0, 0x22, -+0x7F, 0x00, 0x22, 0x02, 0x45, 0x03, 0x02, 0x45, 0x06, 0x8E, 0x64, 0x8F, 0x65, 0xAD, 0x65, 0xAC, -+0x64, 0xAF, 0x63, 0x12, 0x4A, 0x5B, 0xAF, 0x65, 0xAE, 0x64, 0x90, 0x04, 0x80, 0xE0, 0x54, 0x0F, -+0xFD, 0xAC, 0x07, 0x74, 0x11, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x01, -+0xF0, 0x74, 0x11, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xFB, 0xF0, 0xAC, -+0x07, 0x74, 0x16, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0xFA, 0xF0, 0x74, -+0x15, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x1F, 0xF0, 0xAC, 0x07, 0x74, -+0x06, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x0F, 0xF0, 0x90, 0x04, 0x53, -+0xE4, 0xF0, 0x90, 0x04, 0x52, 0xF0, 0x90, 0x04, 0x51, 0x74, 0xFF, 0xF0, 0x90, 0x04, 0x50, 0x74, -+0xFD, 0xF0, 0x74, 0x14, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xC0, 0x4D, -+0xFD, 0x74, 0x14, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xED, 0xF0, 0x22, 0x7D, 0x01, -+0x7F, 0x0C, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, 0x67, 0x8D, 0x68, 0xE5, 0x67, 0x54, -+0x0F, 0xFF, 0xE5, 0x22, 0x54, 0x0F, 0x6F, 0x60, 0x72, 0xE5, 0x67, 0x30, 0xE2, 0x30, 0xE5, 0x22, -+0x20, 0xE2, 0x05, 0x7F, 0x01, 0x12, 0x4A, 0xB2, 0xE5, 0x22, 0x30, 0xE3, 0x10, 0xE5, 0x67, 0x20, -+0xE3, 0x0B, 0x12, 0x49, 0xD5, 0xEF, 0x60, 0x53, 0x12, 0x4A, 0xCC, 0x80, 0x4E, 0xE5, 0x22, 0x20, -+0xE3, 0x49, 0xE5, 0x67, 0x30, 0xE3, 0x44, 0xAF, 0x68, 0x12, 0x4A, 0x7C, 0x80, 0x3D, 0xE5, 0x22, -+0x54, 0x0F, 0xFF, 0xBF, 0x0C, 0x0E, 0xE5, 0x67, 0x20, 0xE3, 0x09, 0x12, 0x49, 0xD5, 0xEF, 0x60, -+0x2A, 0x12, 0x4A, 0xCC, 0xE5, 0x22, 0x54, 0x0F, 0xFF, 0xBF, 0x04, 0x0E, 0xE5, 0x67, 0x20, 0xE2, -+0x09, 0x12, 0x49, 0x93, 0xEF, 0x60, 0x14, 0x12, 0x4A, 0x32, 0xE5, 0x22, 0x54, 0x0F, 0xFF, 0xBF, -+0x02, 0x09, 0x12, 0x45, 0x00, 0xEF, 0x60, 0x03, 0x12, 0x4B, 0x10, 0xD0, 0xD0, 0x92, 0xAF, 0x22, -+0x02, 0x46, 0x6E, 0x02, 0x51, 0x39, 0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0x40, 0x03, 0xF6, -+0x80, 0x01, 0xF2, 0x08, 0xDF, 0xF4, 0x80, 0x29, 0xE4, 0x93, 0xA3, 0xF8, 0x54, 0x07, 0x24, 0x0C, -+0xC8, 0xC3, 0x33, 0xC4, 0x54, 0x0F, 0x44, 0x20, 0xC8, 0x83, 0x40, 0x04, 0xF4, 0x56, 0x80, 0x01, -+0x46, 0xF6, 0xDF, 0xE4, 0x80, 0x0B, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x90, 0x4B, -+0x23, 0xE4, 0x7E, 0x01, 0x93, 0x60, 0xBC, 0xA3, 0xFF, 0x54, 0x3F, 0x30, 0xE5, 0x09, 0x54, 0x1F, -+0xFE, 0xE4, 0x93, 0xA3, 0x60, 0x01, 0x0E, 0xCF, 0x54, 0xC0, 0x25, 0xE0, 0x60, 0xA8, 0x40, 0xB8, -+0xE4, 0x93, 0xA3, 0xFA, 0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0xC8, 0xC5, 0x82, 0xC8, 0xCA, -+0xC5, 0x83, 0xCA, 0xF0, 0xA3, 0xC8, 0xC5, 0x82, 0xC8, 0xCA, 0xC5, 0x83, 0xCA, 0xDF, 0xE9, 0xDE, -+0xE7, 0x80, 0xBE, 0xE5, 0x21, 0x64, 0x01, 0x70, 0x67, 0xE5, 0x24, 0x60, 0x63, 0xE5, 0x24, 0x64, -+0x02, 0x60, 0x06, 0xE5, 0x24, 0x64, 0x05, 0x70, 0x27, 0x90, 0x06, 0xAB, 0xE0, 0x90, 0x8B, 0x0B, -+0xF0, 0x90, 0x06, 0xAA, 0xE0, 0x90, 0x8B, 0x19, 0xF0, 0x90, 0x8B, 0x0B, 0xE0, 0x70, 0x07, 0x90, -+0x8B, 0x19, 0xE0, 0xFF, 0x80, 0x05, 0x90, 0x8B, 0x0B, 0xE0, 0xFF, 0x90, 0x8B, 0x0B, 0xEF, 0xF0, -+0x90, 0x8B, 0x0D, 0xE0, 0x60, 0x02, 0xE4, 0xF0, 0xE4, 0x90, 0x8B, 0x0C, 0xF0, 0x90, 0x05, 0x58, -+0x74, 0x03, 0xF0, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x53, 0x25, -+0xFD, 0x53, 0x25, 0xEF, 0xE5, 0x24, 0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x03, 0x12, 0x47, 0x8E, -+0x22, 0xEF, 0x64, 0x01, 0x70, 0x35, 0x7D, 0x78, 0x7F, 0x02, 0x12, 0x36, 0x75, 0x7D, 0x02, 0x7F, -+0x03, 0x12, 0x36, 0x75, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x12, -+0x45, 0x9E, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x03, 0x12, 0x66, 0x20, 0x90, 0x06, 0x04, 0xE0, -+0x54, 0x7F, 0xF0, 0x90, 0x06, 0x0A, 0xE0, 0x54, 0xF8, 0xF0, 0x22, 0x90, 0x01, 0x36, 0x74, 0x7B, -+0xF0, 0xA3, 0x74, 0x02, 0xF0, 0x7D, 0x7B, 0xFF, 0x12, 0x36, 0xE6, 0x7D, 0x02, 0x7F, 0x03, 0x12, -+0x36, 0xE6, 0x90, 0x06, 0x04, 0xE0, 0x44, 0x80, 0xF0, 0x90, 0x06, 0x0A, 0xE0, 0x44, 0x07, 0xF0, -+0x12, 0x4B, 0x4F, 0xE5, 0x21, 0x20, 0xE0, 0x05, 0xE4, 0x90, 0x8B, 0x0D, 0xF0, 0x22, 0xE4, 0x90, -+0x8A, 0xC5, 0xF0, 0x90, 0x06, 0xA9, 0xE0, 0x90, 0x8A, 0xC5, 0xF0, 0xE0, 0x54, 0xC0, 0x70, 0x09, -+0x53, 0x25, 0xFE, 0x53, 0x25, 0xFD, 0x12, 0x4A, 0xFC, 0x90, 0x8A, 0xC5, 0xE0, 0x30, 0xE6, 0x15, -+0x43, 0x25, 0x01, 0x90, 0x8B, 0x1A, 0xE0, 0x64, 0x02, 0x60, 0x05, 0x12, 0x4A, 0x97, 0x80, 0x08, -+0x12, 0x49, 0x49, 0x80, 0x03, 0x53, 0x25, 0xFE, 0x90, 0x8A, 0xC5, 0xE0, 0x30, 0xE7, 0x27, 0x43, -+0x25, 0x02, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x11, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, -+0xFB, 0xFD, 0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, 0x74, 0x05, 0xF0, 0x90, -+0x8B, 0x1B, 0x74, 0x01, 0xF0, 0x22, 0x53, 0x25, 0xFD, 0x22, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x8B, -+0x12, 0x4B, 0x43, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xF5, 0x24, 0x14, 0x60, -+0x0E, 0x14, 0x60, 0x1F, 0x14, 0x60, 0x31, 0x24, 0x03, 0x70, 0x44, 0x7F, 0x01, 0x80, 0x3D, 0x90, -+0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFD, 0xE4, 0xFF, 0x12, 0x4A, -+0x07, 0x80, 0x29, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFD, -+0x7F, 0x01, 0x12, 0x4A, 0x07, 0x1F, 0x80, 0x14, 0x90, 0x8A, 0xDE, 0x12, 0x43, 0x6B, 0x90, 0x00, -+0x02, 0x12, 0x42, 0x20, 0xFD, 0x7F, 0x02, 0x12, 0x4A, 0x07, 0xE4, 0xFF, 0x12, 0x47, 0x21, 0x22, -+0xE4, 0x90, 0x8A, 0xCB, 0xF0, 0xE5, 0x24, 0x60, 0x49, 0x90, 0x8B, 0x1B, 0xE0, 0x60, 0x0D, 0xE4, -+0xF0, 0x53, 0x25, 0xFD, 0xE5, 0x25, 0x54, 0x07, 0x70, 0x38, 0x80, 0x33, 0x90, 0x8B, 0x0C, 0xE0, -+0x04, 0xF0, 0x53, 0x25, 0xEF, 0x90, 0x8A, 0xCB, 0xE0, 0xFF, 0x90, 0x8B, 0x10, 0xE0, 0x2F, 0xFF, -+0xE4, 0x33, 0xFE, 0x90, 0x8B, 0x0C, 0xE0, 0xD3, 0x9F, 0xEE, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, -+0x40, 0x0D, 0xE5, 0x21, 0xB4, 0x01, 0x0B, 0xA3, 0xE0, 0x70, 0x07, 0xE0, 0x04, 0xF0, 0x22, 0x12, -+0x4A, 0xFC, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8F, 0x63, 0x90, 0x04, 0x1D, 0xE0, -+0x60, 0x24, 0x90, 0x05, 0x22, 0xE0, 0xF5, 0x66, 0x74, 0xFF, 0xF0, 0x12, 0x7E, 0x2D, 0xBF, 0x01, -+0x0D, 0x90, 0x8A, 0xF9, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xDE, 0x12, 0x45, 0x09, 0x90, 0x05, -+0x22, 0xE5, 0x66, 0xF0, 0x80, 0x0D, 0x90, 0x8A, 0xF9, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xDE, -+0x12, 0x45, 0x09, 0x90, 0x04, 0x1F, 0x74, 0x20, 0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE5, 0x24, -+0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x41, 0x90, 0x8B, 0x1A, 0xE0, 0x60, 0x2B, 0x12, 0x45, 0x9E, -+0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x58, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, -+0x74, 0x01, 0xF0, 0x90, 0x8B, 0x18, 0xF0, 0x22, 0xE5, 0x22, 0x54, 0x0F, 0xC3, 0x94, 0x04, 0x50, -+0x07, 0x7D, 0x01, 0x7F, 0x04, 0x12, 0x45, 0xA2, 0x22, 0x90, 0x01, 0x5F, 0xE4, 0xF0, 0x90, 0x01, -+0x3C, 0x74, 0x08, 0xF0, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, -+0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x5C, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x5F, 0x74, 0x05, -+0xF0, 0x90, 0x06, 0x92, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x17, 0x14, 0xF0, 0xE5, 0x22, 0x54, 0x0F, -+0xC3, 0x94, 0x0C, 0x50, 0x0D, 0x12, 0x45, 0x9E, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x03, 0x12, -+0x66, 0x20, 0x22, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x37, 0xE5, 0x25, 0x54, 0x03, 0x70, -+0x31, 0xE5, 0x23, 0x54, 0x0F, 0xD3, 0x94, 0x02, 0x50, 0x28, 0xE5, 0x25, 0x20, 0xE2, 0x23, 0xE5, -+0x25, 0x20, 0xE4, 0x1E, 0x90, 0x8B, 0x0D, 0xE0, 0x70, 0x18, 0x90, 0x8B, 0x12, 0xE0, 0x70, 0x12, -+0xE5, 0x26, 0x70, 0x0E, 0x90, 0x01, 0xB9, 0xE4, 0xF0, 0x90, 0x01, 0xB8, 0x74, 0x04, 0xF0, 0x7F, -+0x01, 0x22, 0x7F, 0x00, 0x22, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x27, 0x90, 0x8B, 0x18, -+0xE0, 0x70, 0x21, 0x90, 0x8B, 0x17, 0xE0, 0x70, 0x1B, 0xE5, 0x23, 0x54, 0x0F, 0xD3, 0x94, 0x04, -+0x50, 0x12, 0xE5, 0x26, 0x70, 0x0E, 0x90, 0x01, 0xB9, 0xE4, 0xF0, 0x90, 0x01, 0xB8, 0x74, 0x08, -+0xF0, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0xEF, 0x24, 0xFE, 0x60, 0x0B, 0x04, 0x70, 0x22, 0x90, -+0x8B, 0x19, 0x74, 0x01, 0xF0, 0x80, 0x16, 0xED, 0x70, 0x0A, 0x90, 0x8B, 0x16, 0xE0, 0x90, 0x8B, -+0x19, 0xF0, 0x80, 0x05, 0x90, 0x8B, 0x19, 0xED, 0xF0, 0x90, 0x8B, 0x19, 0xE0, 0x90, 0x8B, 0x0B, -+0xF0, 0x22, 0x90, 0x01, 0x37, 0x74, 0x02, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x7E, -+0x2D, 0xEF, 0x70, 0x06, 0x90, 0x01, 0xC8, 0x74, 0xFD, 0xF0, 0x7D, 0x02, 0x7F, 0x03, 0x12, 0x36, -+0xE6, 0x12, 0x7A, 0x6D, 0x53, 0x22, 0xF0, 0x43, 0x22, 0x02, 0x22, 0xEF, 0x60, 0x0F, 0x74, 0x21, -+0x2D, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x10, 0xF0, 0x22, 0x74, 0x21, 0x2D, -+0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xEF, 0xF0, 0x22, 0x90, 0x06, 0x04, 0xE0, -+0x54, 0xBF, 0xF0, 0xEF, 0x60, 0x0A, 0xE5, 0x21, 0xB4, 0x01, 0x05, 0xE4, 0xFF, 0x12, 0x48, 0xB3, -+0x53, 0x22, 0xF0, 0x43, 0x22, 0x0C, 0x22, 0x90, 0x04, 0x1D, 0xE0, 0x70, 0x14, 0x90, 0x8A, 0xF8, -+0xE0, 0xFF, 0xE4, 0xFD, 0x12, 0x5F, 0xDE, 0x8E, 0x69, 0x8F, 0x6A, 0x90, 0x04, 0x1F, 0x74, 0x20, -+0xF0, 0x22, 0x90, 0x8B, 0x52, 0xEF, 0xF0, 0x12, 0x4F, 0xED, 0x90, 0x8B, 0x52, 0xE0, 0x60, 0x05, -+0x90, 0x05, 0x22, 0xE4, 0xF0, 0x53, 0x22, 0xF0, 0x43, 0x22, 0x04, 0x22, 0x90, 0x06, 0x04, 0xE0, -+0x44, 0x40, 0xF0, 0xE5, 0x21, 0xB4, 0x01, 0x05, 0x7F, 0x01, 0x12, 0x48, 0xB3, 0x53, 0x22, 0xF0, -+0x43, 0x22, 0x04, 0x22, 0xE5, 0x23, 0x30, 0xE6, 0x12, 0xE5, 0x23, 0x54, 0x0F, 0xFF, 0x90, 0x01, -+0x2F, 0xE0, 0x54, 0x80, 0x4F, 0x64, 0x80, 0xF0, 0x53, 0x23, 0xBF, 0x22, 0x90, 0x8B, 0x2C, 0xE0, -+0x30, 0xE0, 0x05, 0xAF, 0x23, 0x02, 0x66, 0x65, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x22, -+0x53, 0x22, 0xF0, 0x43, 0x22, 0x01, 0x12, 0x4B, 0x5A, 0x12, 0x4B, 0x5B, 0x53, 0x22, 0xF0, 0x43, -+0x22, 0x02, 0x22, 0x41, 0x8A, 0xF6, 0x00, 0x41, 0x8B, 0x05, 0x00, 0x41, 0x8B, 0x51, 0x00, 0x41, -+0x8B, 0x53, 0x00, 0x00, 0x90, 0x04, 0x1B, 0xE0, 0x54, 0x7F, 0x64, 0x7F, 0x7F, 0x01, 0x60, 0x02, -+0x7F, 0x00, 0x22, 0xE4, 0x90, 0x8B, 0x1B, 0xF0, 0x90, 0x8B, 0x0C, 0xF0, 0xF5, 0x25, 0x22, 0x90, -+0x8B, 0x13, 0xE0, 0xA3, 0xE0, 0x90, 0x05, 0x58, 0xF0, 0x22, 0x22, 0x22, 0xF0, 0x90, 0x8B, 0x0F, -+0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x58, 0x7E, 0x01, 0xD3, 0x10, 0xAF, 0x01, -+0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x3D, 0xE0, 0xFB, 0xA3, 0xE0, 0xF5, 0x44, 0xE4, 0xF5, 0x45, 0x12, -+0x35, 0xAB, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, -+0xD0, 0x75, 0xD0, 0x00, 0xC0, 0x00, 0xC0, 0x01, 0xC0, 0x02, 0xC0, 0x03, 0xC0, 0x04, 0xC0, 0x05, -+0xC0, 0x06, 0xC0, 0x07, 0x75, 0x0E, 0x00, 0x90, 0x01, 0xC4, 0x74, 0x87, 0xF0, 0x74, 0x4B, 0xA3, -+0xF0, 0x53, 0x91, 0xDF, 0x90, 0x01, 0x3C, 0xE0, 0x55, 0x30, 0xF5, 0x34, 0xA3, 0xE0, 0x55, 0x31, -+0xF5, 0x35, 0xA3, 0xE0, 0x55, 0x32, 0xF5, 0x36, 0xA3, 0xE0, 0x55, 0x33, 0xF5, 0x37, 0xE5, 0x34, -+0x30, 0xE0, 0x51, 0x90, 0x01, 0x3C, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x1F, -+0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x18, 0x90, 0x8B, 0x34, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xE0, -+0x64, 0x03, 0x60, 0x0B, 0x7F, 0x01, 0xB1, 0xE0, 0xEF, 0x70, 0x04, 0x7F, 0x02, 0xD1, 0x89, 0x90, -+0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x1D, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x16, 0x90, 0x8B, -+0x2E, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x09, 0xE4, 0xFF, 0xB1, 0xE0, 0xEF, -+0x70, 0x02, 0xD1, 0x56, 0xE5, 0x34, 0x30, 0xE1, 0x08, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x11, -+0x60, 0xE5, 0x34, 0x30, 0xE2, 0x28, 0x90, 0x01, 0x3C, 0x74, 0x04, 0xF0, 0x90, 0x06, 0x92, 0xE0, -+0x30, 0xE0, 0x14, 0x90, 0x8B, 0x3D, 0xE4, 0x71, 0x5C, 0x90, 0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, -+0x06, 0x92, 0x74, 0x01, 0xF0, 0x80, 0x07, 0x90, 0x8B, 0x18, 0xE4, 0xF0, 0x51, 0xFC, 0xE5, 0x34, -+0x30, 0xE3, 0x38, 0x90, 0x01, 0x3C, 0x74, 0x08, 0xF0, 0x90, 0x06, 0x92, 0xE0, 0x30, 0xE1, 0x24, -+0x90, 0x8B, 0x3D, 0xE4, 0xF0, 0x90, 0x8B, 0x0F, 0xE0, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, -+0x7F, 0x5C, 0x7E, 0x01, 0x71, 0x6C, 0x90, 0x01, 0x5F, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, 0x74, -+0x02, 0xF0, 0x80, 0x07, 0x90, 0x8B, 0x17, 0xE4, 0xF0, 0x51, 0xFC, 0xE5, 0x34, 0x30, 0xE4, 0x09, -+0x90, 0x01, 0x3C, 0x74, 0x10, 0xF0, 0x12, 0x52, 0x3C, 0xE5, 0x34, 0x30, 0xE5, 0x06, 0x90, 0x01, -+0x3C, 0x74, 0x20, 0xF0, 0xE5, 0x35, 0x30, 0xE0, 0x10, 0x90, 0x01, 0x3D, 0x74, 0x01, 0xF0, 0x90, -+0x00, 0x83, 0xE0, 0xF5, 0x23, 0x51, 0xE4, 0x51, 0xFC, 0xE5, 0x35, 0x30, 0xE2, 0x06, 0x90, 0x01, -+0x3D, 0x74, 0x04, 0xF0, 0xE5, 0x35, 0x30, 0xE4, 0x1B, 0x90, 0x01, 0x3D, 0x74, 0x10, 0xF0, 0x90, -+0x8B, 0x05, 0xE0, 0x60, 0x0F, 0xE4, 0xF0, 0x90, 0x05, 0x53, 0xE0, 0x44, 0x01, 0xF0, 0x90, 0x05, -+0xFD, 0xE0, 0x04, 0xF0, 0xE5, 0x36, 0x30, 0xE0, 0x75, 0x90, 0x01, 0x3E, 0x74, 0x01, 0xF0, 0x90, -+0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x18, 0x90, 0x8B, 0x36, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x64, -+0x03, 0x60, 0x0B, 0x7F, 0x01, 0xB1, 0xE0, 0xEF, 0x60, 0x04, 0x7F, 0x01, 0xD1, 0x89, 0x90, 0x8B, -+0x2C, 0xE0, 0x30, 0xE0, 0x49, 0x90, 0x8B, 0x30, 0xE4, 0xF0, 0xFF, 0xB1, 0xE0, 0xEF, 0x60, 0x3E, -+0x12, 0x65, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0x64, 0x06, 0x60, 0x32, 0xEF, 0xB4, 0x04, 0x02, -+0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, 0x80, 0x14, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x05, 0x7F, -+0x01, 0x12, 0x7B, 0x49, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x12, 0x66, 0x20, 0xE5, 0x36, -+0x30, 0xE1, 0x47, 0x90, 0x01, 0x3E, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, 0xE0, 0x19, -+0x90, 0x8B, 0x36, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x33, 0xE0, 0x64, 0x03, 0x60, 0x0B, 0x7F, 0x01, -+0xB1, 0xE0, 0xEF, 0x70, 0x04, 0x7F, 0x02, 0xD1, 0x89, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x1A, -+0x90, 0x8B, 0x30, 0x74, 0x01, 0xF0, 0x12, 0x7D, 0xBE, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, -+0x09, 0xE4, 0xFF, 0xB1, 0xE0, 0xEF, 0x70, 0x02, 0xD1, 0x56, 0x74, 0x87, 0x04, 0x90, 0x01, 0xC4, -+0xF0, 0x74, 0x4B, 0xA3, 0xF0, 0xD0, 0x07, 0xD0, 0x06, 0xD0, 0x05, 0xD0, 0x04, 0xD0, 0x03, 0xD0, -+0x02, 0xD0, 0x01, 0xD0, 0x00, 0xD0, 0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0, 0xE0, 0x32, -+0xEF, 0x64, 0x01, 0x70, 0x3D, 0x90, 0x8B, 0x35, 0xE0, 0x60, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, -+0x08, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x34, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, -+0x90, 0x8B, 0x32, 0xE0, 0xFF, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x0B, 0xEF, 0xC4, 0x13, 0x54, -+0x07, 0x30, 0xE0, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x36, 0xE0, 0x7F, 0x01, 0x60, 0x36, 0x7F, -+0x00, 0x22, 0x90, 0x8B, 0x2F, 0xE0, 0x60, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x08, 0xE0, 0x60, -+0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x2E, 0xE0, 0x60, 0x03, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x2C, -+0xE0, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x03, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x30, 0xE0, 0x7F, -+0x01, 0x60, 0x02, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x0D, 0xE0, 0x60, 0x16, 0x90, 0x8B, 0x2D, 0xE0, -+0x70, 0x04, 0x7F, 0x05, 0x80, 0x1F, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x01, 0x70, 0x1A, 0x7F, 0x02, -+0x80, 0x13, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, 0x04, 0x7F, 0x03, 0x80, 0x08, 0x90, 0x8B, 0x2D, -+0xE0, 0x70, 0x05, 0x7F, 0x04, 0x12, 0x7B, 0x49, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x8B, 0x33, 0xE0, 0x90, 0x8B, 0x55, 0xF0, 0x6F, 0x70, 0x02, 0xE1, 0x55, 0xEF, 0x14, 0x60, -+0x3B, 0x14, 0x60, 0x5F, 0x14, 0x70, 0x02, 0xE1, 0x30, 0x24, 0x03, 0x60, 0x02, 0xE1, 0x55, 0x90, -+0x8B, 0x55, 0xE0, 0xB4, 0x03, 0x04, 0xF1, 0xC0, 0xE1, 0x55, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x02, -+0x04, 0xF1, 0xAD, 0xE1, 0x55, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x04, 0x04, 0xF1, 0xC4, 0xE1, 0x55, -+0x90, 0x8B, 0x55, 0xE0, 0x64, 0x01, 0x70, 0x7D, 0xF1, 0xAF, 0x80, 0x79, 0x90, 0x8B, 0x55, 0xE0, -+0xFF, 0xB4, 0x03, 0x04, 0xF1, 0xC8, 0x80, 0x6D, 0xEF, 0xB4, 0x02, 0x04, 0xF1, 0xA0, 0x80, 0x65, -+0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x04, 0x04, 0xF1, 0xD3, 0x80, 0x59, 0xEF, 0x70, 0x56, 0xF1, -+0x8D, 0x80, 0x52, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x03, 0x05, 0x12, 0x7A, 0x5E, 0x80, 0x46, 0x90, -+0x8B, 0x55, 0xE0, 0xB4, 0x01, 0x04, 0xF1, 0x71, 0x80, 0x3B, 0x90, 0x8B, 0x55, 0xE0, 0xB4, 0x04, -+0x05, 0x12, 0x7B, 0x37, 0x80, 0x2F, 0x90, 0x8B, 0x55, 0xE0, 0x70, 0x29, 0xF1, 0x6F, 0x80, 0x25, -+0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x01, 0x04, 0xF1, 0x5A, 0x80, 0x19, 0xEF, 0xB4, 0x02, 0x04, -+0xF1, 0x6B, 0x80, 0x11, 0x90, 0x8B, 0x55, 0xE0, 0xFF, 0xB4, 0x04, 0x04, 0xF1, 0x5A, 0x80, 0x05, -+0xEF, 0x70, 0x02, 0xF1, 0x67, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x05, 0x22, 0x74, 0x6F, 0xF0, -+0x90, 0x8B, 0x33, 0x74, 0x03, 0xF0, 0x22, 0xF1, 0x8D, 0x80, 0xEF, 0xF1, 0xED, 0x80, 0xEB, 0xF1, -+0x8D, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, 0x7E, 0x2D, 0xEF, 0x70, 0x06, 0x90, 0x01, 0xC8, -+0x74, 0xFD, 0xF0, 0x12, 0x7A, 0x6D, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x01, 0x3E, -+0x74, 0x03, 0xF0, 0xFD, 0x7F, 0x02, 0x12, 0x37, 0x00, 0x90, 0x8B, 0x33, 0x74, 0x01, 0xF0, 0x22, -+0xF1, 0xED, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0x04, 0xF0, 0x22, 0xF1, 0xA0, 0x7D, -+0x03, 0x7F, 0x02, 0x12, 0x36, 0x92, 0x90, 0x05, 0x27, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0xF0, 0x22, -+0xF1, 0xC8, 0x80, 0xEB, 0xF1, 0xD3, 0x80, 0xE7, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, -+0x04, 0xF0, 0x22, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x33, 0x04, 0xF0, 0x22, 0xF1, 0x8D, -+0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x33, 0x74, 0x04, 0xF0, 0x22, 0x90, 0x8B, 0x1C, -+0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x78, 0x7E, 0x08, 0x12, 0x2F, 0xD9, -+0x90, 0x8B, 0x20, 0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x04, 0x7E, 0x0C, -+0x12, 0x2F, 0xD9, 0x90, 0x8B, 0x24, 0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, -+0x00, 0x7E, 0x08, 0x12, 0x2F, 0xD9, 0x90, 0x8B, 0x28, 0x12, 0x43, 0x53, 0x90, 0x80, 0x85, 0x12, -+0x2A, 0x7F, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x2F, 0xD9, 0x90, 0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, -+0x03, 0x2D, 0x95, 0xE4, 0xFD, 0xFF, 0x12, 0x34, 0x81, 0x90, 0x8B, 0x09, 0xE0, 0xB4, 0x01, 0x11, -+0x90, 0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, 0x03, 0x2D, 0x95, 0xE4, 0xFD, 0x7F, 0x01, 0x12, 0x34, -+0x81, 0x22, 0x90, 0x02, 0x84, 0xEF, 0xF0, 0xA3, 0xEE, 0xF0, 0xA3, 0x74, 0x05, 0xF0, 0x22, 0xEF, -+0x8E, 0xF0, 0x12, 0x43, 0xBA, 0x50, 0x8D, 0x00, 0x40, 0x50, 0xB5, 0x00, 0x80, 0x50, 0xE0, 0x01, -+0x00, 0x50, 0xF4, 0x02, 0x00, 0x51, 0x0C, 0x04, 0x00, 0x00, 0x00, 0x51, 0x29, 0xED, 0x54, 0x3F, -+0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x00, 0x7F, 0x40, 0xEF, 0x2D, 0xFF, 0xEE, 0x3C, 0xFE, -+0xEF, 0x78, 0x06, 0xCE, 0xC3, 0x13, 0xCE, 0x13, 0xD8, 0xF9, 0x78, 0x06, 0xC3, 0x33, 0xCE, 0x33, -+0xCE, 0xD8, 0xF9, 0x80, 0x26, 0xED, 0x54, 0x7F, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x00, -+0x7F, 0x80, 0xEF, 0x2D, 0xFF, 0xEE, 0x3C, 0xFE, 0xEF, 0x78, 0x07, 0xCE, 0xC3, 0x13, 0xCE, 0x13, -+0xD8, 0xF9, 0x78, 0x07, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFD, 0xAC, 0x06, 0x80, 0x49, -+0xED, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x01, 0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0x7D, -+0x00, 0xFC, 0x80, 0x35, 0xEC, 0x54, 0x01, 0x4D, 0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x02, -+0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0xC3, 0x13, 0x7D, 0x00, 0x80, 0x1A, 0xEC, 0x54, 0x03, 0x4D, -+0x70, 0x04, 0xFE, 0xFF, 0x80, 0x04, 0x7E, 0x04, 0x7F, 0x00, 0xEF, 0x2D, 0xEE, 0x3C, 0x13, 0x13, -+0x54, 0x3F, 0x7D, 0x00, 0x25, 0xE0, 0x25, 0xE0, 0xFC, 0xAE, 0x04, 0xAF, 0x05, 0x22, 0x90, 0x01, -+0xE4, 0x74, 0x58, 0xF0, 0xA3, 0x74, 0x02, 0xF0, 0x22, 0xE4, 0x90, 0x8A, 0xCC, 0xF0, 0xA3, 0xF0, -+0x75, 0x8E, 0x02, 0x91, 0x81, 0x12, 0x67, 0x0E, 0x90, 0x8B, 0x07, 0xEF, 0xF0, 0x12, 0x67, 0x1B, -+0x90, 0x8B, 0x09, 0xEF, 0xF0, 0x12, 0x67, 0x27, 0x90, 0x8A, 0xF4, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, -+0xE4, 0xF5, 0x55, 0xF5, 0x21, 0x12, 0x71, 0x16, 0x12, 0x44, 0x9E, 0x12, 0x32, 0x3D, 0x7F, 0x03, -+0x12, 0x76, 0xAB, 0x12, 0x7A, 0x5A, 0x12, 0x66, 0xD4, 0x12, 0x67, 0x3F, 0x12, 0x67, 0x54, 0x12, -+0x66, 0xF2, 0x12, 0x67, 0x0D, 0x90, 0x8A, 0xCE, 0xE5, 0xD9, 0xF0, 0x31, 0xD2, 0xC2, 0xAF, 0x90, -+0x00, 0x80, 0xE0, 0x44, 0x40, 0xF0, 0x51, 0x81, 0x75, 0xE8, 0x03, 0x43, 0xA8, 0x85, 0xD2, 0xAF, -+0x31, 0x2E, 0x90, 0x8A, 0xCC, 0xE0, 0x64, 0x01, 0xF0, 0x24, 0x39, 0x90, 0x01, 0xC4, 0xF0, 0x74, -+0x51, 0xA3, 0xF0, 0xE5, 0x55, 0x30, 0xE4, 0x09, 0xC2, 0xAF, 0x53, 0x55, 0xEF, 0xD2, 0xAF, 0xB1, -+0xCC, 0xE5, 0x55, 0x30, 0xE6, 0xDC, 0xC2, 0xAF, 0x53, 0x55, 0xBF, 0xD2, 0xAF, 0x12, 0x68, 0x42, -+0x80, 0xD0, 0x90, 0x01, 0x3C, 0x74, 0xFF, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x01, 0x34, 0xF0, -+0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xFD, 0x7F, 0x54, 0x31, 0xFB, 0x7D, 0xFF, 0x7F, 0x55, 0x31, -+0xFB, 0x7D, 0xFF, 0x7F, 0x56, 0x31, 0xFB, 0x7D, 0xFF, 0x7F, 0x57, 0xD3, 0x10, 0xAF, 0x01, 0xC3, -+0xC0, 0xD0, 0x8F, 0x82, 0x75, 0x83, 0x00, 0xED, 0xF0, 0x51, 0x81, 0xD0, 0xD0, 0x92, 0xAF, 0x22, -+0x90, 0x01, 0x30, 0xE4, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x01, 0x38, 0xF0, 0xA3, -+0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xFD, 0x7F, 0x50, 0x31, 0xFB, 0xE4, 0xFD, 0x7F, 0x51, 0x31, 0xFB, -+0xE4, 0xFD, 0x7F, 0x52, 0x31, 0xFB, 0xE4, 0xFD, 0x7F, 0x53, 0x80, 0xBF, 0xE5, 0x5E, 0x64, 0x01, -+0x70, 0x3B, 0x71, 0xC1, 0xBF, 0x01, 0x04, 0x7F, 0x01, 0x71, 0xB5, 0x90, 0x00, 0x46, 0xE0, 0x44, -+0x04, 0xFD, 0x7F, 0x46, 0x31, 0xFB, 0x90, 0x00, 0x44, 0xE0, 0x54, 0xFB, 0xFD, 0x7F, 0x44, 0x31, -+0xFB, 0x90, 0x00, 0x46, 0xE0, 0x54, 0xFB, 0xFD, 0x7F, 0x46, 0x31, 0xFB, 0x7F, 0x02, 0x71, 0xDD, -+0x8F, 0x62, 0x90, 0x01, 0xC9, 0xE5, 0x62, 0xF0, 0xB4, 0x01, 0x02, 0x71, 0x55, 0x22, 0xE0, 0x5F, -+0xF0, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x7F, 0x10, 0xDF, 0xFE, 0xD0, 0xD0, 0x92, 0xAF, -+0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xE0, 0xED, 0xF0, 0x90, 0x8A, 0xDF, -+0xEF, 0xF0, 0xD3, 0x94, 0x07, 0x50, 0x4E, 0xA3, 0xE0, 0x70, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, -+0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x47, -+0xE0, 0x5F, 0xF0, 0x80, 0x17, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, -+0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xFF, 0x90, 0x00, 0x47, 0xE0, 0x4F, 0xF0, 0x51, 0x81, 0x90, 0x8A, -+0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, -+0x90, 0x00, 0x46, 0x80, 0x59, 0x90, 0x8A, 0xDF, 0xE0, 0x24, 0xF8, 0xF0, 0xA3, 0xE0, 0x70, 0x1D, -+0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, -+0xC4, 0x54, 0xF0, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0xE0, 0x5F, 0xF0, 0x80, 0x1A, 0x90, 0x8A, 0xDF, -+0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xC4, 0x54, 0xF0, -+0xFF, 0x90, 0x00, 0x43, 0xE0, 0x4F, 0xF0, 0x51, 0x81, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0x01, -+0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0x51, 0x7E, -+0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x00, 0x49, 0xE0, 0x90, 0x8B, 0x54, 0xF0, 0xE0, 0x54, 0x0F, -+0xF0, 0x44, 0xF0, 0xFD, 0x7F, 0x49, 0x31, 0xFB, 0x90, 0x8B, 0x54, 0xE0, 0x44, 0xB0, 0xFD, 0x7F, -+0x49, 0x21, 0xFB, 0x90, 0x8A, 0xDD, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x75, 0x5E, 0x01, 0x8E, 0x5F, -+0xF5, 0x60, 0xE4, 0xFD, 0x7F, 0x0B, 0x51, 0x91, 0xE4, 0xFD, 0x7F, 0x02, 0x51, 0x91, 0x71, 0xC1, -+0xE4, 0xFF, 0x71, 0xB5, 0xE4, 0xF5, 0x62, 0x90, 0x01, 0xC9, 0xE5, 0x62, 0xF0, 0x90, 0x8A, 0xDD, -+0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0xEC, 0xFB, 0x8D, 0x44, 0xE4, 0xF5, 0x45, 0x7D, 0x01, 0x7F, 0x60, -+0x7E, 0x01, 0x02, 0x35, 0xAB, 0x90, 0x01, 0xCA, 0xE5, 0x61, 0xF0, 0xEF, 0x60, 0x02, 0x71, 0x55, -+0x22, 0x7F, 0x0B, 0x71, 0xDD, 0xEF, 0x65, 0x61, 0x60, 0x10, 0xE5, 0x61, 0xB4, 0x01, 0x05, 0xE4, -+0xF5, 0x61, 0x80, 0x03, 0x75, 0x61, 0x01, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0xD3, 0x10, 0xAF, -+0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x57, 0xEF, 0xF0, 0xD3, 0x94, 0x07, 0x50, 0x43, 0xE0, 0xFF, -+0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x46, -+0x51, 0x7E, 0x90, 0x8B, 0x57, 0xE0, 0xFD, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x05, 0x08, 0x80, 0x05, -+0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x00, 0x44, 0xE0, 0xFB, 0xE4, 0xFE, 0xEF, -+0x5B, 0xA8, 0x05, 0x08, 0x80, 0x06, 0xCE, 0xA2, 0xE7, 0x13, 0xCE, 0x13, 0xD8, 0xF8, 0xFF, 0x80, -+0x4B, 0x90, 0x8B, 0x57, 0xE0, 0x24, 0xF8, 0xF0, 0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, -+0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0xFF, 0x90, 0x00, 0x43, 0xE0, 0x5F, 0xF0, 0x51, 0x81, 0x90, -+0x8B, 0x57, 0xE0, 0xFD, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x05, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, -+0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x00, 0x42, 0xE0, 0xFB, 0xE4, 0xFE, 0xEF, 0x5B, 0xA8, 0x05, -+0x08, 0x80, 0x06, 0xCE, 0xA2, 0xE7, 0x13, 0xCE, 0x13, 0xD8, 0xF8, 0xFF, 0xD0, 0xD0, 0x92, 0xAF, -+0x22, 0xE4, 0x90, 0x8B, 0x04, 0xF0, 0x90, 0x00, 0x80, 0xE0, 0x44, 0x80, 0xFD, 0x7F, 0x80, 0x21, -+0xFB, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x8B, 0x90, 0x8A, -+0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0xFA, 0xE5, 0xF0, 0x24, 0x00, 0xFF, -+0xE4, 0x3A, 0xFE, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0xEE, 0x8F, 0xF0, 0x12, -+0x43, 0x19, 0x12, 0x29, 0xD9, 0xFF, 0x60, 0x2C, 0xB5, 0x5E, 0x16, 0x90, 0x8A, 0xDA, 0x12, 0x43, -+0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0x65, 0x60, 0x70, 0x04, 0xE5, 0x5F, 0x65, 0xF0, 0x60, -+0x22, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0xC2, 0xFF, 0xAE, 0xF0, -+0x71, 0x73, 0x80, 0x0F, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0x65, 0x5E, 0x60, -+0x02, 0xB1, 0x08, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xE4, 0xF5, 0x5E, 0x7F, 0x60, 0x7E, 0x01, 0x8F, -+0x82, 0x8E, 0x83, 0xA3, 0xA3, 0xA3, 0xE4, 0xF0, 0x22, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x8B, 0xEF, -+0x12, 0x43, 0x94, 0x55, 0x5A, 0x01, 0x55, 0x51, 0x02, 0x55, 0x7E, 0x03, 0x55, 0x87, 0x05, 0x55, -+0x90, 0x06, 0x55, 0xCB, 0x07, 0x55, 0x98, 0x08, 0x55, 0xA1, 0x09, 0x55, 0xA9, 0x20, 0x55, 0xB2, -+0x2C, 0x55, 0x63, 0x2D, 0x55, 0x6C, 0x2E, 0x55, 0x75, 0x3B, 0x55, 0xBB, 0x4B, 0x00, 0x00, 0x55, -+0xC4, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x72, 0xFC, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, -+0x02, 0x73, 0x02, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x73, 0x2F, 0x90, 0x8A, 0xD7, 0x12, -+0x43, 0x6B, 0x02, 0x73, 0x77, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x73, 0xB0, 0x90, 0x8A, -+0xD7, 0x12, 0x43, 0x6B, 0x02, 0x73, 0xC9, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x72, 0xD0, -+0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0xE1, 0x19, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x74, -+0x11, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x81, 0x91, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, -+0x76, 0xEA, 0x90, 0x8A, 0xD7, 0x12, 0x43, 0x6B, 0x02, 0x78, 0xDE, 0x90, 0x8A, 0xD7, 0x12, 0x43, -+0x6B, 0x02, 0x7A, 0x48, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x01, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, -+0xC3, 0xC0, 0xD0, 0x90, 0x01, 0xCC, 0xE0, 0x54, 0x0F, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, -+0xE0, 0xFD, 0x70, 0x02, 0xE1, 0x14, 0x90, 0x8B, 0x51, 0xE0, 0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, -+0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xEF, 0x5D, 0x70, 0x02, -+0xE1, 0x0D, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD0, 0x12, 0x43, 0x5F, 0xE0, -+0x90, 0x8A, 0xD0, 0xF0, 0x75, 0x1D, 0x01, 0x75, 0x1E, 0x8A, 0x75, 0x1F, 0xD0, 0x75, 0x20, 0x01, -+0x7B, 0x01, 0x7A, 0x8A, 0x79, 0xD1, 0x12, 0x5F, 0x57, 0x90, 0x8A, 0xD1, 0xE0, 0xFF, 0xC4, 0x13, -+0x13, 0x13, 0x54, 0x01, 0x90, 0x8B, 0x51, 0x30, 0xE0, 0x59, 0xE0, 0x75, 0xF0, 0x02, 0x90, 0x00, -+0x88, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD2, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x02, -+0x90, 0x00, 0x89, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD3, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, -+0xF0, 0x04, 0x90, 0x01, 0xD1, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD4, 0xF0, 0x90, 0x8B, 0x51, -+0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD2, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD5, 0xF0, 0x90, -+0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD3, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD6, -+0xF0, 0x80, 0x33, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD1, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, -+0xD2, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD2, 0x12, 0x43, 0x5F, 0xE0, -+0x90, 0x8A, 0xD3, 0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x75, 0xF0, 0x04, 0x90, 0x01, 0xD3, 0x12, 0x43, -+0x5F, 0xE0, 0x90, 0x8A, 0xD4, 0xF0, 0xEF, 0x54, 0x7F, 0xFF, 0x7B, 0x01, 0x7A, 0x8A, 0x79, 0xD2, -+0xB1, 0x19, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x90, 0x8B, 0x51, 0xE0, 0xFE, 0x74, 0x01, 0xA8, 0x06, -+0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0xF4, 0x5F, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8B, 0x51, -+0xE0, 0xFF, 0x74, 0x01, 0xA8, 0x07, 0x08, 0x80, 0x02, 0xC3, 0x33, 0xD8, 0xFC, 0x90, 0x01, 0xCC, -+0xF0, 0x90, 0x8B, 0x51, 0xE0, 0x04, 0xF0, 0xE0, 0x54, 0x03, 0xF0, 0xA1, 0xDD, 0x90, 0x01, 0xC6, -+0xE0, 0x44, 0x02, 0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, 0x00, 0x04, 0x12, 0x42, 0x20, 0xFF, -+0x54, 0x1F, 0xFE, 0xEF, 0x54, 0x20, 0xC4, 0x13, 0x54, 0x07, 0xFD, 0xAF, 0x06, 0x90, 0x8A, 0xDA, -+0xEF, 0xF0, 0xA3, 0xED, 0xF0, 0xA3, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, -+0x00, 0x03, 0x12, 0x42, 0x20, 0x54, 0xF0, 0xC4, 0x54, 0x0F, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x00, -+0x04, 0x12, 0x42, 0x20, 0x54, 0x40, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x90, 0x8A, 0xE0, 0xF0, 0x90, -+0x8A, 0xDA, 0xE0, 0xFF, 0x75, 0xF0, 0x09, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0xAD, 0x82, 0xAC, -+0x83, 0x90, 0x8A, 0xE1, 0xEC, 0xF0, 0xA3, 0xED, 0xF0, 0xEF, 0x75, 0xF0, 0x09, 0xA4, 0x24, 0x23, -+0xF9, 0x74, 0x87, 0x35, 0xF0, 0xFA, 0x7B, 0x01, 0xA3, 0x12, 0x43, 0x8B, 0x90, 0x8A, 0xDC, 0x12, -+0x43, 0x6B, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0x54, 0x0F, 0xFF, 0x90, 0x8A, 0xE3, 0x12, 0x43, -+0x6B, 0xEF, 0x12, 0x42, 0x4D, 0x90, 0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x02, 0x12, 0x42, -+0x20, 0xFF, 0x90, 0x8A, 0xE3, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0xEF, 0x12, 0x42, 0x5F, 0x90, -+0x8A, 0xDC, 0x12, 0x43, 0x6B, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0x90, 0x8A, 0xE1, 0xE0, -+0xFC, 0xA3, 0xE0, 0xFD, 0xF5, 0x82, 0x8C, 0x83, 0xEF, 0xF0, 0x12, 0x29, 0xD9, 0x8D, 0x82, 0x8C, -+0x83, 0xA3, 0xF0, 0x90, 0x8A, 0xDF, 0xE0, 0xFE, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0x24, 0xC1, 0xF5, -+0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xDB, 0xE0, 0xFE, 0x75, 0xF0, 0x09, -+0xEF, 0x90, 0x87, 0x29, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2A, -+0x12, 0x43, 0x5F, 0x74, 0x01, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xFE, 0x75, 0xF0, 0x09, 0xEF, 0x90, -+0x87, 0x2B, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0x8F, 0x0F, 0xEF, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, -+0xE4, 0x34, 0x89, 0xAF, 0x82, 0xF5, 0x10, 0x8F, 0x11, 0xE5, 0x0F, 0x75, 0xF0, 0x02, 0xA4, 0x24, -+0x81, 0xF9, 0x74, 0x86, 0x35, 0xF0, 0x75, 0x12, 0x01, 0xF5, 0x13, 0x89, 0x14, 0x75, 0xF0, 0x09, -+0xE5, 0x0F, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0xAF, 0x82, 0x85, 0x83, 0x15, 0x8F, 0x16, 0xE5, -+0x0F, 0x75, 0xF0, 0x09, 0xA4, 0x24, 0x23, 0xF9, 0x74, 0x87, 0x35, 0xF0, 0x75, 0x17, 0x01, 0xF5, -+0x18, 0x89, 0x19, 0x74, 0xC1, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x12, -+0x43, 0x94, 0x58, 0xA7, 0x00, 0x58, 0xBC, 0x01, 0x58, 0xD1, 0x02, 0x58, 0xE6, 0x03, 0x59, 0x0F, -+0x04, 0x59, 0x24, 0x05, 0x59, 0x39, 0x06, 0x59, 0x5F, 0x0C, 0x59, 0x8C, 0x0D, 0x59, 0xB9, 0x0E, -+0x59, 0xE6, 0x0F, 0x00, 0x00, 0x5A, 0x1A, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, -+0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, 0x15, 0x80, 0x3C, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0x74, 0x10, 0x80, -+0x27, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0xF0, -+0xF0, 0xA3, 0x74, 0x05, 0x80, 0x12, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0x74, 0xF0, 0xF0, 0xA3, 0xE4, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, -+0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0x74, 0x0F, 0xF0, 0xA3, 0x74, 0x8F, 0xF0, 0x41, 0x1A, 0xE5, -+0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0x74, 0x0F, 0xF0, 0xA3, -+0x74, 0xF5, 0x80, 0x27, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0x74, 0x0F, 0xF0, 0xA3, 0x74, 0xF0, 0x80, 0x12, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, -+0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0x74, 0x0D, 0xF0, 0xE5, 0x0F, 0x25, 0xE0, -+0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x41, 0x1A, 0x90, -+0x04, 0x47, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x46, 0xE0, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x45, 0xE0, -+0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, 0x44, 0x41, 0x11, 0x90, 0x04, 0x4B, 0xE0, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x4A, 0xE0, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x49, 0xE0, 0x85, 0x11, 0x82, -+0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, 0x48, 0x80, 0x58, 0x90, 0x04, 0x4F, 0xE0, 0xAB, 0x12, 0xAA, -+0x13, 0xA9, 0x14, 0x12, 0x42, 0x4D, 0x90, 0x04, 0x4E, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0x90, 0x00, 0x01, 0x12, 0x42, 0x5F, 0x90, 0x04, 0x4D, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, -+0xF0, 0x90, 0x04, 0x4C, 0x80, 0x2B, 0x90, 0x04, 0x53, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0x12, 0x42, 0x4D, 0x90, 0x04, 0x52, 0xE0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x01, -+0x12, 0x42, 0x5F, 0x90, 0x04, 0x51, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xF0, 0x90, 0x04, -+0x50, 0xE0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xA3, 0xF0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, -+0xC0, 0x03, 0xC0, 0x02, 0xC0, 0x01, 0x12, 0x29, 0xD9, 0xFF, 0xAB, 0x17, 0xAA, 0x18, 0xA9, 0x19, -+0x12, 0x29, 0xD9, 0x5F, 0xD0, 0x01, 0xD0, 0x02, 0xD0, 0x03, 0x12, 0x42, 0x4D, 0xAB, 0x12, 0xE5, -+0x14, 0x24, 0x01, 0xF9, 0xE4, 0x35, 0x13, 0xFA, 0xC0, 0x03, 0xC0, 0x02, 0xC0, 0x01, 0x12, 0x29, -+0xD9, 0xFF, 0xAB, 0x17, 0xAA, 0x18, 0xA9, 0x19, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x5F, 0xD0, -+0x01, 0xD0, 0x02, 0xD0, 0x03, 0x12, 0x42, 0x4D, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xC0, 0x83, -+0xC0, 0x82, 0xE0, 0xFF, 0x85, 0x16, 0x82, 0x85, 0x15, 0x83, 0xE0, 0xFE, 0xEF, 0x5E, 0xD0, 0x82, -+0xD0, 0x83, 0xF0, 0x85, 0x11, 0x82, 0x85, 0x10, 0x83, 0xA3, 0xC0, 0x83, 0xC0, 0x82, 0xE0, 0xFF, -+0x85, 0x16, 0x82, 0x85, 0x15, 0x83, 0xA3, 0xE0, 0xFE, 0xEF, 0x5E, 0xD0, 0x82, 0xD0, 0x83, 0xF0, -+0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, -+0xE0, 0x4E, 0x60, 0x4B, 0x90, 0x8A, 0xE6, 0x74, 0x0B, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, -+0x94, 0x00, 0x50, 0x02, 0x61, 0x5F, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, -+0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, -+0x34, 0x86, 0xF5, 0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x0A, 0x90, 0x8A, 0xE6, -+0xE0, 0x24, 0x10, 0xA3, 0xF0, 0x80, 0x68, 0x90, 0x8A, 0xE6, 0xE0, 0x14, 0xF0, 0x80, 0xBB, 0xE5, -+0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, -+0x4E, 0x60, 0x47, 0x90, 0x8A, 0xE6, 0x74, 0x0F, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, -+0x00, 0x40, 0x3C, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, -+0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x08, 0x90, 0x8A, 0xE6, 0xE0, 0xA3, 0xF0, -+0x80, 0x0D, 0x90, 0x8A, 0xE6, 0xE0, 0x14, 0xF0, 0x80, 0xBF, 0xE4, 0x90, 0x8A, 0xE7, 0xF0, 0xE5, -+0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, -+0x4E, 0x60, 0x46, 0xE4, 0x90, 0x8A, 0xE6, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x10, -+0x40, 0x02, 0x81, 0x18, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, -+0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, -+0xF5, 0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x06, 0x90, 0x8A, 0xE6, 0xE0, 0x80, -+0x63, 0x90, 0x8A, 0xE6, 0xE0, 0x04, 0xF0, 0x80, 0xBF, 0xE5, 0x0F, 0x25, 0xE0, 0x24, 0x81, 0xF5, -+0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFE, 0xA3, 0xE0, 0x4E, 0x60, 0x46, 0xE4, 0x90, 0x8A, -+0xE6, 0xF0, 0x90, 0x8A, 0xE6, 0xE0, 0xFF, 0xC3, 0x94, 0x0C, 0x50, 0x3C, 0x74, 0x01, 0x7E, 0x00, -+0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0xE5, 0x0F, 0x25, -+0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, -+0x4E, 0x60, 0x08, 0x90, 0x8A, 0xE6, 0xE0, 0x24, 0x10, 0x80, 0x09, 0x90, 0x8A, 0xE6, 0xE0, 0x04, -+0xF0, 0x80, 0xBF, 0xE4, 0x90, 0x8A, 0xE8, 0xF0, 0x90, 0x8A, 0xE7, 0xE0, 0xFF, 0x75, 0xF0, 0x09, -+0xE5, 0x0F, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xEF, 0xF0, 0x90, 0x8A, 0xE8, 0xE0, 0xFE, 0x75, -+0xF0, 0x09, 0xE5, 0x0F, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0xE5, 0x0F, 0xC3, 0x94, -+0x20, 0x50, 0x32, 0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0xD3, -+0x9F, 0x40, 0x02, 0x80, 0x18, 0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, -+0xE0, 0xC3, 0x9E, 0x50, 0x08, 0x90, 0x8A, 0xE8, 0xE0, 0xA3, 0xF0, 0x80, 0x08, 0x90, 0x8A, 0xE7, -+0xE0, 0x90, 0x8A, 0xE9, 0xF0, 0x90, 0x8A, 0xE9, 0xE0, 0xFD, 0xAF, 0x0F, 0x91, 0xC1, 0x90, 0x8A, -+0xE9, 0xE0, 0xFF, 0x74, 0x84, 0x25, 0x0F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, -+0x90, 0x8A, 0xE7, 0xE0, 0xFF, 0xD3, 0x94, 0x13, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x03, 0xF0, -+0x22, 0xEF, 0xD3, 0x94, 0x0B, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x02, 0xF0, 0x22, 0xEF, 0xD3, -+0x94, 0x03, 0x40, 0x07, 0x90, 0x87, 0x22, 0x74, 0x01, 0xF0, 0x22, 0xE4, 0x90, 0x87, 0x22, 0xF0, -+0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x74, 0x84, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x04, -+0xF5, 0x83, 0xED, 0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xAC, 0x07, 0xED, 0x54, 0x1F, 0x90, 0x8A, -+0xC7, 0xF0, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xC5, -+0xF0, 0x90, 0x8A, 0xC8, 0x74, 0x01, 0xF0, 0xEB, 0xC3, 0x94, 0x01, 0x40, 0x02, 0x80, 0x37, 0x90, -+0x8A, 0xC5, 0xE0, 0x25, 0x0D, 0xFF, 0xA3, 0xF0, 0xA3, 0xE0, 0x90, 0x41, 0x9E, 0x93, 0xFE, 0xEF, -+0xD3, 0x9E, 0x40, 0x10, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE4, 0xF0, -+0xAF, 0x04, 0x80, 0x9D, 0x90, 0x8A, 0xC6, 0xE0, 0xFF, 0x74, 0x01, 0x2C, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xEF, 0xF0, 0x22, 0xAD, 0x07, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, -+0x43, 0x5F, 0xE0, 0xFF, 0x90, 0x8A, 0xCA, 0xF0, 0x74, 0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, -+0xF5, 0x83, 0xE0, 0x54, 0x1F, 0x90, 0x8A, 0xC9, 0xF0, 0xD3, 0x9F, 0x40, 0x06, 0xA3, 0xE0, 0x90, -+0x8A, 0xC9, 0xF0, 0x90, 0x8A, 0xC9, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, -+0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, -+0xFE, 0xEF, 0x13, 0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xAF, 0x05, 0x90, 0x8A, 0xC9, 0xE0, 0xFD, 0x91, 0xC1, 0x90, 0x8A, -+0xC9, 0xE0, 0xFF, 0x22, 0xAC, 0x07, 0x74, 0x84, 0x2C, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, -+0xE0, 0x54, 0x7F, 0x90, 0x8A, 0xDE, 0xF0, 0xE0, 0x54, 0x1F, 0xFF, 0x90, 0x8A, 0xE1, 0xF0, 0x75, -+0xF0, 0x09, 0xEC, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xE3, 0xF0, 0x75, 0xF0, -+0x09, 0xEC, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0xFE, 0x90, 0x8A, 0xE4, 0xF0, 0xEC, 0x25, -+0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, -+0xE5, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xEC, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, 0x86, -+0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE7, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xEF, 0xD3, -+0x9E, 0x40, 0x0C, 0x90, 0x8A, 0xE4, 0xE0, 0x90, 0x8A, 0xE1, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0xED, -+0x70, 0x02, 0xE1, 0x06, 0x90, 0x8A, 0xE2, 0xED, 0xF0, 0x90, 0x8A, 0xDE, 0xE0, 0x30, 0xE6, 0x0E, -+0x90, 0x8A, 0xE1, 0xE0, 0x90, 0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0x14, 0xF0, 0x90, 0x8A, -+0xE2, 0xE0, 0x70, 0x02, 0xE1, 0x06, 0x90, 0x8A, 0xE1, 0xE0, 0xFF, 0xD3, 0x94, 0x00, 0x50, 0x02, -+0xE1, 0x06, 0xE4, 0x90, 0x8A, 0xE0, 0xF0, 0xEF, 0x14, 0x90, 0x8A, 0xDF, 0xF0, 0x90, 0x8A, 0xE3, -+0xE0, 0xFD, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0xD3, 0x9D, 0x40, 0x6F, 0xEF, 0x94, 0x10, 0x40, 0x21, -+0xEF, 0x24, 0xF0, 0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, -+0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE7, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x70, -+0x27, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x50, 0x37, 0x74, 0x01, 0x7E, 0x00, 0xA8, -+0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE5, 0xE0, -+0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x1A, 0x90, 0x8A, 0xDF, 0xE0, 0x90, 0x8A, 0xDE, 0xF0, -+0x90, 0x8A, 0xE0, 0xE0, 0x04, 0xF0, 0x90, 0x8A, 0xE2, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, 0x6F, -+0x60, 0x08, 0x90, 0x8A, 0xDF, 0xE0, 0x14, 0xF0, 0x80, 0x83, 0x90, 0x8A, 0xE2, 0xE0, 0xFF, 0x90, -+0x8A, 0xE0, 0xE0, 0xC3, 0x9F, 0x50, 0x0F, 0x90, 0x8A, 0xDF, 0xE0, 0xB5, 0x05, 0x08, 0x90, 0x8A, -+0xE3, 0xE0, 0x90, 0x8A, 0xDE, 0xF0, 0x90, 0x8A, 0xDE, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, -+0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, -+0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, -+0x3A, 0xC3, 0x13, 0xFE, 0xEF, 0x13, 0xFF, 0xEC, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xAF, 0x04, 0x90, 0x8A, 0xDE, 0xE0, 0xFD, 0x91, -+0xC1, 0x90, 0x8A, 0xDE, 0xE0, 0xFF, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x8B, 0x1A, -+0x8A, 0x1B, 0x89, 0x1C, 0x90, 0x8B, 0x3F, 0x12, 0x43, 0x8B, 0xAB, 0x1D, 0xAA, 0x1E, 0xA9, 0x1F, -+0x90, 0x8B, 0x42, 0x12, 0x43, 0x8B, 0xAF, 0x20, 0x15, 0x20, 0xEF, 0x60, 0x1E, 0x90, 0x8B, 0x42, -+0xE4, 0x75, 0xF0, 0x01, 0x12, 0x43, 0x74, 0x12, 0x29, 0xD9, 0xFF, 0x90, 0x8B, 0x3F, 0xE4, 0x75, -+0xF0, 0x01, 0x12, 0x43, 0x74, 0xEF, 0x12, 0x42, 0x4D, 0x80, 0xDB, 0xAB, 0x1A, 0xAA, 0x1B, 0xA9, -+0x1C, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x01, 0xC4, -+0x74, 0xA6, 0xF0, 0x74, 0x5F, 0xA3, 0xF0, 0x90, 0x04, 0x1D, 0xE0, 0x60, 0x1A, 0x90, 0x05, 0x22, -+0xE0, 0x54, 0x90, 0x60, 0x07, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x40, 0xF0, 0x90, 0x01, 0xC7, 0xE0, -+0x30, 0xE1, 0xE4, 0x7F, 0x00, 0x80, 0x02, 0x7F, 0x01, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0xFB, 0xFA, 0xEF, 0x30, 0xE0, 0x02, 0x7B, 0x80, 0xEF, 0xC3, -+0x13, 0x90, 0xFD, 0x10, 0xF0, 0x90, 0x04, 0x25, 0xEF, 0xF0, 0xED, 0x60, 0x1E, 0xAF, 0x03, 0x74, -+0x0F, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0x74, 0x10, 0x2F, -+0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0xAF, 0x03, 0x74, 0x08, 0x2F, -+0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x09, 0x2F, 0xF5, 0x82, 0xE4, 0x34, -+0xFC, 0xF5, 0x83, 0xE0, 0x54, 0xF0, 0xF0, 0x74, 0x21, 0x2B, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, -+0x83, 0xE0, 0x54, 0xF7, 0xF0, 0xAE, 0x02, 0xAF, 0x03, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0xFD, 0xFC, 0xEF, 0x30, 0xE0, 0x02, 0x7D, 0x80, 0xEF, 0xC3, -+0x13, 0x90, 0xFD, 0x10, 0xF0, 0xAE, 0x04, 0xAF, 0x05, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x5F, -+0xA6, 0xBF, 0x01, 0x10, 0x90, 0x02, 0x09, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5F, 0xDE, 0x90, 0x04, -+0x1F, 0x74, 0x20, 0xF0, 0x22, 0x90, 0x01, 0x02, 0xE0, 0x54, 0x03, 0xFF, 0xE0, 0x54, 0x0C, 0x13, -+0x13, 0x54, 0x3F, 0xFE, 0xEF, 0x64, 0x01, 0x60, 0x04, 0xEF, 0xB4, 0x03, 0x0E, 0x90, 0x8A, 0xC5, -+0x74, 0x01, 0xF0, 0xA3, 0x74, 0x37, 0xF0, 0x79, 0x01, 0x80, 0x18, 0xEE, 0x64, 0x01, 0x60, 0x07, -+0xAF, 0x06, 0xEE, 0x64, 0x03, 0x70, 0x3B, 0x90, 0x8A, 0xC5, 0x74, 0x01, 0xF0, 0xA3, 0x74, 0x3D, -+0xF0, 0x79, 0x40, 0x90, 0x8A, 0xC5, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xF5, 0x82, 0x8E, 0x83, 0xE0, -+0x59, 0x60, 0x08, 0xE9, 0xF0, 0xE4, 0x90, 0x8A, 0xF6, 0xF0, 0x22, 0x90, 0x8A, 0xF6, 0xE0, 0x04, -+0xF0, 0xE0, 0xC3, 0x94, 0x0A, 0x40, 0x0B, 0xE4, 0xF0, 0x90, 0x04, 0x19, 0xE0, 0x30, 0xE0, 0x02, -+0x11, 0x6E, 0x22, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83, 0xC0, 0x82, 0xC0, 0xD0, 0x75, 0xD0, 0x00, -+0xC0, 0x00, 0xC0, 0x01, 0xC0, 0x02, 0xC0, 0x03, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, -+0x90, 0x01, 0xC4, 0x74, 0xF3, 0xF0, 0x74, 0x60, 0xA3, 0xF0, 0x90, 0x01, 0x34, 0xE0, 0x55, 0x28, -+0xF5, 0x2C, 0xA3, 0xE0, 0x55, 0x29, 0xF5, 0x2D, 0xA3, 0xE0, 0x55, 0x2A, 0xF5, 0x2E, 0xA3, 0xE0, -+0x55, 0x2B, 0xF5, 0x2F, 0xE5, 0x2C, 0x20, 0xE0, 0x02, 0x41, 0x8A, 0x90, 0x01, 0x34, 0x74, 0x01, -+0xF0, 0x85, 0xD1, 0x4D, 0x85, 0xD2, 0x4E, 0x85, 0xD3, 0x4F, 0x85, 0xD4, 0x50, 0x85, 0xD5, 0x51, -+0x85, 0xD6, 0x52, 0x85, 0xD7, 0x53, 0x85, 0xD9, 0x54, 0xE5, 0x54, 0x54, 0x40, 0xC3, 0x13, 0xFF, -+0xE5, 0x53, 0x54, 0x20, 0x6F, 0x70, 0x02, 0x41, 0x47, 0xE5, 0x54, 0x30, 0xE5, 0x02, 0x41, 0x47, -+0xE5, 0x52, 0x54, 0x1F, 0xF5, 0x08, 0xE5, 0x4D, 0x54, 0x3F, 0xF5, 0x09, 0xE5, 0x51, 0x54, 0x1F, -+0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0xE3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, -+0xF0, 0x12, 0x42, 0x81, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0xC0, 0xF5, -+0x82, 0xE4, 0x34, 0x85, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, 0x09, 0xD3, 0x94, -+0x04, 0x40, 0x03, 0x75, 0x09, 0x04, 0x75, 0xF0, 0x0A, 0xE5, 0x08, 0x90, 0x84, 0x00, 0x12, 0x43, -+0x5F, 0x75, 0xF0, 0x02, 0xE5, 0x09, 0x12, 0x43, 0x5F, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0xE5, 0x53, -+0x54, 0x1F, 0x2F, 0xFF, 0xE4, 0x3E, 0xFE, 0x75, 0xF0, 0x0A, 0xE5, 0x08, 0x90, 0x84, 0x00, 0x12, -+0x43, 0x5F, 0x75, 0xF0, 0x02, 0xE5, 0x09, 0x12, 0x43, 0x5F, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0xE5, -+0x54, 0x20, 0xE6, 0x24, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, 0xE0, 0x24, 0x63, 0xF5, -+0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xE5, 0x4F, 0x30, 0xE7, -+0x36, 0xAF, 0x08, 0x12, 0x5D, 0x36, 0x80, 0x2F, 0xE5, 0x53, 0x54, 0x1F, 0xFF, 0xE5, 0x08, 0x25, -+0xE0, 0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE4, 0x8F, 0xF0, 0x12, 0x42, 0x81, -+0xE5, 0x4F, 0x30, 0xE7, 0x12, 0xE5, 0x4F, 0x54, 0x7F, 0xFD, 0xE5, 0x53, 0x54, 0x1F, 0xF5, 0x0D, -+0xAB, 0x09, 0xAF, 0x08, 0x12, 0x5C, 0xD9, 0xE5, 0x24, 0x14, 0x24, 0xFD, 0x50, 0x02, 0x80, 0x3A, -+0x90, 0x8B, 0x1A, 0xE0, 0x60, 0x2B, 0x90, 0x01, 0x5B, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x04, -+0xF0, 0x12, 0x4B, 0x34, 0xEF, 0x64, 0x01, 0x70, 0x21, 0x90, 0x8B, 0x3D, 0x12, 0x4B, 0x5C, 0x90, -+0x01, 0x5B, 0x74, 0x05, 0xF0, 0x90, 0x06, 0x92, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x18, 0xF0, 0x80, -+0x09, 0x12, 0x4B, 0x34, 0xBF, 0x01, 0x03, 0x12, 0x4A, 0xFC, 0xE5, 0x2C, 0x30, 0xE1, 0x20, 0x90, -+0x01, 0x34, 0x74, 0x02, 0xF0, 0x85, 0xD1, 0x56, 0x85, 0xD2, 0x57, 0x85, 0xD3, 0x58, 0x85, 0xD4, -+0x59, 0x85, 0xD5, 0x5A, 0x85, 0xD6, 0x5B, 0x85, 0xD7, 0x5C, 0x85, 0xD9, 0x5D, 0xB1, 0x5F, 0xE5, -+0x2C, 0x30, 0xE3, 0x06, 0x90, 0x01, 0x34, 0x74, 0x08, 0xF0, 0xE5, 0x2C, 0x30, 0xE4, 0x09, 0x90, -+0x01, 0x34, 0x74, 0x10, 0xF0, 0x43, 0x55, 0x10, 0xE5, 0x2C, 0x30, 0xE5, 0x26, 0x90, 0x01, 0xCF, -+0xE0, 0x30, 0xE5, 0x1F, 0xE0, 0x54, 0xDF, 0xF0, 0x90, 0x01, 0x34, 0x74, 0x20, 0xF0, 0x75, 0xA8, -+0x00, 0x75, 0xE8, 0x00, 0x12, 0x52, 0x10, 0x90, 0x00, 0x03, 0xE0, 0x54, 0xFB, 0xF0, 0x12, 0x52, -+0x81, 0x80, 0xFE, 0xE5, 0x2C, 0x30, 0xE6, 0x2D, 0x90, 0x01, 0x34, 0x74, 0x40, 0xF0, 0x90, 0x8B, -+0x32, 0xE0, 0x30, 0xE0, 0x0C, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x05, 0x90, 0x8B, 0x34, 0xE4, -+0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x0C, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x05, -+0x90, 0x8B, 0x2E, 0xE4, 0xF0, 0xE5, 0x2E, 0x20, 0xE0, 0x02, 0x61, 0xE7, 0x90, 0x8B, 0x08, 0x74, -+0x01, 0xF0, 0x90, 0x01, 0x36, 0xF0, 0x90, 0x8B, 0x06, 0xE0, 0x60, 0x0F, 0xE4, 0xF0, 0x90, 0x05, -+0x53, 0xE0, 0x44, 0x02, 0xF0, 0x90, 0x05, 0xFC, 0xE0, 0x04, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0x30, -+0xE0, 0x2F, 0x90, 0x8B, 0x37, 0x74, 0x01, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xFF, 0x13, 0x13, 0x54, -+0x3F, 0x30, 0xE0, 0x1D, 0x90, 0x8B, 0x34, 0x74, 0x01, 0xF0, 0xB1, 0x39, 0x90, 0x8B, 0x33, 0xE0, -+0x64, 0x03, 0x60, 0x0D, 0x7F, 0x01, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x05, 0x7F, 0x04, 0x12, 0x4E, -+0x89, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0x30, 0xE0, 0x56, 0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x4F, -+0x90, 0x8B, 0x2E, 0x74, 0x01, 0xF0, 0xB1, 0x39, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x3F, -+0xB1, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0x64, 0x06, 0x60, -+0x2E, 0xEF, 0xB4, 0x04, 0x02, 0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x04, 0xE4, 0xFF, -+0x80, 0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x02, 0x05, 0x7F, 0x01, 0x12, 0x7B, 0x49, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x12, -+0x43, 0xE7, 0x90, 0x8B, 0x08, 0xE4, 0xF0, 0xE5, 0x2E, 0x30, 0xE1, 0x2F, 0x90, 0x01, 0x36, 0x74, -+0x02, 0xF0, 0x43, 0x55, 0x40, 0x11, 0x85, 0x90, 0x8B, 0x37, 0xE0, 0xB4, 0x01, 0x09, 0x90, 0x05, -+0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x37, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x0D, 0xE4, 0xFF, -+0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0xE5, 0x2E, 0x30, 0xE2, 0x16, -+0x90, 0x01, 0x36, 0x74, 0x04, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x06, 0xA3, 0xE0, 0x64, -+0x06, 0x60, 0x03, 0x12, 0x46, 0xB3, 0xE5, 0x2E, 0x30, 0xE3, 0x38, 0x90, 0x01, 0x36, 0x74, 0x08, -+0xF0, 0xE5, 0x21, 0x64, 0x01, 0x70, 0x2C, 0xE5, 0x24, 0x60, 0x28, 0x90, 0x01, 0x57, 0xE4, 0xF0, -+0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x90, 0x8B, 0x3D, 0xE4, 0xF0, 0x90, 0x8B, 0x11, 0xE0, 0x90, -+0x8B, 0x3E, 0xF0, 0xE4, 0xFB, 0xFD, 0x7F, 0x54, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x57, -+0x74, 0x05, 0xF0, 0xE5, 0x2E, 0x30, 0xE4, 0x2B, 0x90, 0x01, 0x36, 0x74, 0x10, 0xF0, 0xE5, 0x21, -+0xB4, 0x01, 0x20, 0xE5, 0x24, 0x60, 0x1C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, -+0x02, 0xF0, 0x90, 0x8B, 0x1B, 0xE4, 0xF0, 0x53, 0x25, 0xFD, 0xE5, 0x25, 0x54, 0x07, 0x70, 0x03, -+0x12, 0x4A, 0xFC, 0xE5, 0x2E, 0x30, 0xE5, 0x1F, 0x90, 0x01, 0x36, 0x74, 0x20, 0xF0, 0xE5, 0x21, -+0xB4, 0x01, 0x14, 0xE5, 0x24, 0x60, 0x10, 0x90, 0x8B, 0x1A, 0xE0, 0x64, 0x02, 0x60, 0x05, 0x12, -+0x4A, 0x97, 0x80, 0x03, 0x12, 0x49, 0x49, 0xE5, 0x2E, 0x30, 0xE6, 0x1B, 0x90, 0x01, 0x36, 0x74, -+0x40, 0xF0, 0xE5, 0x21, 0xB4, 0x01, 0x10, 0xE5, 0x24, 0x60, 0x0C, 0x53, 0x25, 0xFE, 0xE5, 0x25, -+0x54, 0x07, 0x70, 0x03, 0x12, 0x4A, 0xFC, 0xE5, 0x2F, 0x30, 0xE1, 0x27, 0x90, 0x01, 0x37, 0x74, -+0x02, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0x30, 0xE0, 0x17, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, -+0x07, 0x12, 0x48, 0xFE, 0xD1, 0x20, 0x80, 0x0B, 0x90, 0x8B, 0x31, 0x74, 0x01, 0xF0, 0x80, 0x03, -+0x12, 0x48, 0xFE, 0x74, 0xF3, 0x04, 0x90, 0x01, 0xC4, 0xF0, 0x74, 0x60, 0xA3, 0xF0, 0xD0, 0x07, -+0xD0, 0x06, 0xD0, 0x05, 0xD0, 0x04, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, 0xD0, 0x00, 0xD0, 0xD0, -+0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0, 0xE0, 0x32, 0xE4, 0x90, 0x8B, 0x3D, 0xF0, 0x90, 0x05, -+0x58, 0xE0, 0xFF, 0x90, 0x8B, 0x38, 0xE0, 0x2F, 0x24, 0xFE, 0x90, 0x8B, 0x3E, 0xF0, 0xE4, 0xFB, -+0xFD, 0x7F, 0x50, 0x7E, 0x01, 0x12, 0x4B, 0x6C, 0x90, 0x01, 0x53, 0x74, 0x05, 0xF0, 0x22, 0x90, -+0x8A, 0xC5, 0xE0, 0x54, 0xF0, 0x44, 0x03, 0xF0, 0x54, 0x0F, 0x44, 0x80, 0xF0, 0x7B, 0x00, 0x7A, -+0x00, 0x79, 0x56, 0x90, 0x8B, 0x48, 0x12, 0x43, 0x8B, 0x0B, 0x7A, 0x8A, 0x79, 0xC5, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x8B, 0x90, 0x8B, 0x53, 0xE0, 0xFF, -+0x04, 0xF0, 0x90, 0x00, 0x01, 0xEF, 0x12, 0x42, 0x5F, 0x7F, 0xAF, 0x7E, 0x01, 0xD1, 0x8A, 0xEF, -+0x60, 0x49, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x6B, 0x8B, 0x1D, 0x8A, 0x1E, 0x89, 0x1F, 0x75, 0x20, -+0x02, 0x7B, 0x01, 0x7A, 0x01, 0x79, 0xA0, 0x12, 0x5F, 0x57, 0x90, 0x8B, 0x48, 0x12, 0x43, 0x6B, -+0x8B, 0x1D, 0x8A, 0x1E, 0x89, 0x1F, 0x90, 0x8B, 0x45, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xFF, -+0xC4, 0x54, 0x0F, 0xF5, 0x20, 0x7B, 0x01, 0x7A, 0x01, 0x79, 0xA2, 0x12, 0x5F, 0x57, 0x90, 0x01, -+0xAF, 0x74, 0xFF, 0xF0, 0x90, 0x01, 0xCB, 0xE0, 0x64, 0x80, 0xF0, 0xD0, 0xD0, 0x92, 0xAF, 0x22, -+0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, 0x0B, 0xA3, 0xE0, 0x64, -+0x06, 0x60, 0x05, 0x7F, 0x06, 0x12, 0x7B, 0x49, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x02, -+0xD1, 0x13, 0x22, 0x90, 0x8B, 0x31, 0xE0, 0xB4, 0x01, 0x05, 0xE4, 0xF0, 0x12, 0x48, 0xFE, 0x22, -+0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x06, 0x60, 0x3C, 0xE5, 0x22, 0x54, 0x0F, 0x14, 0x60, 0x2E, 0x14, -+0x60, 0x1E, 0x24, 0xFE, 0x60, 0x0E, 0x24, 0xF8, 0x70, 0x2A, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, 0x90, -+0x05, 0x22, 0xF0, 0x22, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x22, -+0x90, 0x8B, 0x2D, 0x74, 0x03, 0xF0, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x22, 0x90, 0x01, 0xC6, -+0xE0, 0x44, 0x08, 0xF0, 0x22, 0xAE, 0x07, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, 0x60, 0x18, 0x90, -+0x8B, 0x2C, 0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x20, 0xE0, 0x0C, 0xAF, 0x06, 0x7D, 0x01, 0x12, -+0x45, 0xA2, 0xD1, 0x20, 0x7F, 0x01, 0x22, 0x7F, 0x00, 0x22, 0x90, 0x8B, 0x4B, 0xEE, 0xF0, 0xA3, -+0xEF, 0xF0, 0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0x90, 0x8B, 0x4B, 0xE0, 0xFE, 0xA3, 0xE0, 0xF5, 0x82, -+0x8E, 0x83, 0xE0, 0x60, 0x2C, 0xC3, 0x90, 0x8B, 0x4E, 0xE0, 0x94, 0xE8, 0x90, 0x8B, 0x4D, 0xE0, -+0x94, 0x03, 0x40, 0x0A, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x10, 0xF0, 0x7F, 0x00, 0x22, 0x90, 0x8B, -+0x4D, 0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x7F, 0x0A, 0x7E, 0x00, 0x12, 0x37, 0x54, 0x80, -+0xC6, 0x7F, 0x01, 0x22, 0x75, 0x28, 0x33, 0xE4, 0xF5, 0x29, 0x75, 0x2A, 0x07, 0xF5, 0x2B, 0x90, -+0x01, 0x30, 0xE5, 0x28, 0xF0, 0xA3, 0xE5, 0x29, 0xF0, 0xA3, 0xE5, 0x2A, 0xF0, 0xA3, 0xE5, 0x2B, -+0xF0, 0x22, 0x75, 0x30, 0x1F, 0x75, 0x31, 0x01, 0x43, 0x31, 0x10, 0xE4, 0xF5, 0x32, 0x90, 0x01, -+0x38, 0xE5, 0x30, 0xF0, 0xA3, 0xE5, 0x31, 0xF0, 0xA3, 0xE5, 0x32, 0xF0, 0x22, 0x22, 0x90, 0x00, -+0x02, 0xE0, 0x54, 0xE0, 0x7F, 0x01, 0x60, 0x02, 0x7F, 0x00, 0x22, 0x90, 0x00, 0xF3, 0xE0, 0x7F, -+0x00, 0x30, 0xE3, 0x02, 0x7F, 0x01, 0x22, 0x90, 0x8B, 0x09, 0xE0, 0xB4, 0x01, 0x0C, 0x90, 0x00, -+0xF2, 0xE0, 0x30, 0xE7, 0x05, 0x7E, 0xFD, 0x7F, 0x33, 0x22, 0x7E, 0xFD, 0x7F, 0x2F, 0x22, 0x90, -+0x00, 0xF3, 0xE0, 0x30, 0xE2, 0x0D, 0x90, 0x05, 0x41, 0x74, 0x10, 0xF0, 0x90, 0x05, 0x5A, 0xF0, -+0xA3, 0xE4, 0xF0, 0x22, 0x90, 0x01, 0x64, 0x74, 0xA0, 0xF0, 0x22, 0xC0, 0xE0, 0xC0, 0x83, 0xC0, -+0x82, 0xC0, 0xD0, 0x75, 0xD0, 0x00, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x7D, 0x5B, 0x90, 0x01, -+0xC4, 0xED, 0xF0, 0x74, 0x67, 0xFF, 0xA3, 0xF0, 0x53, 0x91, 0xEF, 0x90, 0x00, 0x51, 0xE0, 0xFE, -+0x90, 0x00, 0x55, 0xE0, 0x5E, 0xF5, 0x3D, 0x90, 0x00, 0x52, 0xE0, 0xFE, 0x90, 0x00, 0x56, 0xE0, -+0x5E, 0xF5, 0x3E, 0xE5, 0x3D, 0x30, 0xE4, 0x06, 0x90, 0x00, 0x55, 0x74, 0x10, 0xF0, 0xE5, 0x3D, -+0x30, 0xE5, 0x06, 0x90, 0x00, 0x55, 0x74, 0x20, 0xF0, 0xE5, 0x3D, 0x30, 0xE6, 0x06, 0x90, 0x00, -+0x55, 0x74, 0x40, 0xF0, 0xE5, 0x3D, 0x30, 0xE7, 0x06, 0x90, 0x00, 0x55, 0x74, 0x80, 0xF0, 0xE5, -+0x3E, 0x30, 0xE0, 0x06, 0x90, 0x00, 0x56, 0x74, 0x01, 0xF0, 0xE5, 0x3E, 0x30, 0xE1, 0x06, 0x90, -+0x00, 0x56, 0x74, 0x02, 0xF0, 0xE5, 0x3E, 0x30, 0xE2, 0x06, 0x90, 0x00, 0x56, 0x74, 0x04, 0xF0, -+0xE5, 0x3E, 0x30, 0xE3, 0x06, 0x90, 0x00, 0x56, 0x74, 0x08, 0xF0, 0x90, 0x01, 0xC4, 0xED, 0xF0, -+0xA3, 0xEF, 0xF0, 0xD0, 0x07, 0xD0, 0x06, 0xD0, 0x05, 0xD0, 0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, -+0xE0, 0x32, 0xEF, 0xC3, 0x94, 0x20, 0x50, 0x39, 0xEF, 0x30, 0xE0, 0x17, 0xED, 0xC4, 0x54, 0xF0, -+0xFD, 0xEF, 0xC3, 0x13, 0xFE, 0x24, 0xA4, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, -+0x0F, 0x80, 0x10, 0xEF, 0xC3, 0x13, 0xFE, 0x24, 0xA4, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, -+0xE0, 0x54, 0xF0, 0xF0, 0x74, 0xA4, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x4D, -+0xF0, 0x22, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0xC3, 0x94, 0x20, 0x40, -+0x02, 0xC1, 0xCD, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2A, 0x12, 0x43, 0x5F, 0xE0, 0x64, 0x01, -+0x60, 0x02, 0xC1, 0xC5, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, -+0x85, 0xF5, 0x83, 0xE0, 0xFC, 0xA3, 0xE0, 0xD3, 0x94, 0x00, 0xEC, 0x94, 0x00, 0x50, 0x02, 0xC1, -+0xC5, 0xEF, 0x75, 0xF0, 0x0A, 0xA4, 0x24, 0x00, 0xF9, 0x74, 0x84, 0x35, 0xF0, 0x75, 0x12, 0x01, -+0xF5, 0x13, 0x89, 0x14, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, -+0x85, 0xF5, 0x83, 0xE0, 0xFD, 0xA3, 0xE0, 0x90, 0x8A, 0xD4, 0xCD, 0xF0, 0xA3, 0xED, 0xF0, 0xEF, -+0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, -+0x8A, 0xD6, 0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFE, 0x24, 0x84, 0xF5, 0x82, -+0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x3F, 0x90, 0x8A, 0xD0, 0xF0, 0xE0, 0xFD, 0x54, 0x1F, -+0xA3, 0xF0, 0x75, 0xF0, 0x09, 0xEE, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0xE0, 0x90, 0x8A, 0xD9, -+0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFB, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, -+0xC3, 0x94, 0x05, 0x40, 0x02, 0x61, 0x1A, 0x90, 0x8A, 0xD9, 0xE0, 0xFE, 0x90, 0x8A, 0xD1, 0xE0, -+0x9E, 0x40, 0x13, 0x90, 0x8A, 0xD9, 0xE0, 0x90, 0x8A, 0xD1, 0xF0, 0xED, 0x54, 0x40, 0xFD, 0x90, -+0x8A, 0xD0, 0xF0, 0xEE, 0x4D, 0xF0, 0x90, 0x8A, 0xD1, 0xE0, 0xFF, 0x90, 0x41, 0x12, 0x93, 0xFE, -+0x74, 0x23, 0x2B, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xC3, 0x9E, 0x40, 0x06, 0xEF, -+0x90, 0x40, 0xDA, 0x80, 0x07, 0x90, 0x8A, 0xD1, 0xE0, 0x90, 0x40, 0xF6, 0x93, 0x90, 0x8A, 0xD8, -+0xF0, 0x90, 0x8A, 0xD8, 0xE0, 0x75, 0xF0, 0x06, 0xA4, 0x24, 0x50, 0xF9, 0x74, 0x40, 0x35, 0xF0, -+0x75, 0x0F, 0xFF, 0xF5, 0x10, 0x89, 0x11, 0x90, 0x8A, 0xD0, 0xE0, 0x90, 0x41, 0xBA, 0x93, 0xFF, -+0xD3, 0x90, 0x8A, 0xD7, 0xE0, 0x9F, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x0C, 0x90, 0x8A, -+0xCF, 0xE0, 0xFF, 0xE4, 0xFD, 0x12, 0x5D, 0xB4, 0xC1, 0x5B, 0x90, 0x8A, 0xCF, 0xE0, 0x25, 0xE0, -+0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, 0x8A, 0xD2, -+0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x12, 0x29, 0xD9, 0xFF, 0x7E, -+0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x12, 0x42, 0x97, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, -+0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, -+0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, -+0x02, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, -+0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, -+0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x04, 0x12, 0x42, 0xC2, 0xFD, 0xAC, -+0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, -+0x10, 0xA9, 0x11, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, -+0xA9, 0x14, 0x90, 0x00, 0x06, 0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, -+0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x04, -+0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x08, 0x12, -+0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, -+0x81, 0xAB, 0x0F, 0xAA, 0x10, 0xA9, 0x11, 0x90, 0x00, 0x05, 0x12, 0x42, 0x20, 0xFF, 0x7E, 0x00, -+0x90, 0x8A, 0xD4, 0xE0, 0xFC, 0xA3, 0xE0, 0xFD, 0x12, 0x29, 0xF2, 0xD3, 0x90, 0x8A, 0xD3, 0xE0, -+0x9F, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x40, 0x0C, 0xA3, 0xE0, 0x9F, 0xF0, 0x90, 0x8A, 0xD2, 0xE0, -+0x9E, 0xF0, 0x80, 0x07, 0xE4, 0x90, 0x8A, 0xD2, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xD2, 0xE0, 0xFC, -+0xA3, 0xE0, 0xFD, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xEC, 0xF0, 0xA3, 0xED, 0xF0, 0x90, 0x8A, 0xD0, 0xE0, 0x25, 0xE0, 0x24, 0x2E, -+0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xD3, 0xED, -+0x9B, 0xEC, 0x9A, 0x40, 0x04, 0xD1, 0xCE, 0xC1, 0x29, 0x90, 0x8A, 0xD0, 0xE0, 0x25, 0xE0, 0x24, -+0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFE, 0x74, 0x01, 0x93, 0xFF, 0xC3, -+0x90, 0x8A, 0xD3, 0xE0, 0x9F, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x40, 0x02, 0xC1, 0x29, 0x90, 0x8A, -+0xCF, 0xE0, 0xFF, 0x7D, 0x01, 0x12, 0x5D, 0xB4, 0xC1, 0x29, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, -+0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xFC, 0x64, 0x05, 0x60, 0x02, 0x81, 0xF8, -+0x90, 0x87, 0x22, 0xE0, 0xFE, 0xB4, 0x03, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, 0x94, 0x19, 0x40, -+0x3D, 0x80, 0x2E, 0xEE, 0xB4, 0x02, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, 0x94, 0x11, 0x40, 0x2E, -+0x80, 0x1F, 0x90, 0x87, 0x22, 0xE0, 0xFE, 0xB4, 0x01, 0x0B, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, 0x94, -+0x0A, 0x40, 0x1B, 0x80, 0x0C, 0xEE, 0x70, 0x11, 0x90, 0x8A, 0xD1, 0xE0, 0xC3, 0x94, 0x03, 0x40, -+0x0D, 0x90, 0x89, 0x43, 0x74, 0x01, 0xF0, 0x80, 0x05, 0xE4, 0x90, 0x89, 0x43, 0xF0, 0x90, 0x8A, -+0xCF, 0xE0, 0xFE, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xDD, -+0xF0, 0x74, 0x23, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, 0xC3, 0x94, 0x30, -+0x50, 0x0A, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x64, 0x2F, 0x81, 0xA3, 0x90, 0x89, 0x43, 0xE0, -+0x64, 0x01, 0x60, 0x02, 0x81, 0x98, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x44, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0xE0, 0x64, 0x0A, 0x60, 0x5B, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0xEE, 0x24, 0x05, -+0xFB, 0xE4, 0x33, 0xFA, 0x74, 0x21, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xE0, 0xFF, -+0xD3, 0x9B, 0xEA, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, 0x50, 0x38, 0x90, 0x8A, 0xCF, 0xE0, 0xFE, -+0xEF, 0x24, 0x05, 0xFB, 0xE4, 0x33, 0xFA, 0x74, 0x23, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0xE0, 0xD3, 0x9B, 0xEA, 0x64, 0x80, 0xF8, 0x74, 0x80, 0x98, 0x50, 0x16, 0x90, 0x8A, 0xCF, -+0xE0, 0x24, 0x84, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xFF, 0x90, 0x8A, 0xD1, 0xE0, -+0x6F, 0x60, 0x56, 0x90, 0x8A, 0xCF, 0xE0, 0x24, 0x23, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, -+0xE0, 0xFF, 0xD3, 0x94, 0x42, 0x40, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x05, 0xF0, 0x80, 0x11, 0xEF, -+0xD3, 0x94, 0x39, 0x90, 0x8A, 0xDD, 0x40, 0x05, 0x74, 0x03, 0xF0, 0x80, 0x03, 0x74, 0x01, 0xF0, -+0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x23, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFE, -+0x74, 0x21, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, -+0x24, 0x44, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0x80, 0x2F, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x64, -+0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x44, 0x2F, 0xF5, 0x82, 0xE4, 0x34, -+0x89, 0xF5, 0x83, 0xE0, 0x04, 0xF0, 0x80, 0x14, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x90, 0x8A, 0xCF, -+0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x90, 0x8A, 0xD1, 0xE0, -+0xFE, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x84, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEE, -+0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFE, 0x74, 0x43, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, -+0xEE, 0xF0, 0x75, 0xF0, 0x09, 0xEF, 0x90, 0x87, 0x2B, 0x12, 0x43, 0x5F, 0xE0, 0xB4, 0x01, 0x11, -+0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0x74, 0x64, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, -+0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFD, 0xC1, 0x27, 0xEC, 0x64, 0x06, 0x60, 0x02, 0xC1, 0x29, 0x90, -+0x8A, 0xD2, 0xF0, 0xA3, 0xF0, 0x90, 0x41, 0xDB, 0x93, 0xFF, 0x7E, 0x00, 0x90, 0x8A, 0xD4, 0xE0, -+0xFC, 0xA3, 0xE0, 0xFD, 0x12, 0x29, 0xF2, 0x90, 0x8A, 0xDB, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x90, -+0x8A, 0xCF, 0xE0, 0x24, 0x43, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xDD, -+0xF0, 0xE4, 0x90, 0x8A, 0xDA, 0xF0, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0xD3, 0x94, 0x04, 0x50, 0x47, -+0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x75, 0xF0, 0x02, 0xEF, 0xA4, 0xF5, 0x82, 0x85, 0xF0, 0x83, -+0x12, 0x42, 0xC2, 0xFD, 0xAC, 0xF0, 0xEF, 0x90, 0x41, 0xD6, 0x93, 0xFF, 0x7E, 0x00, 0x12, 0x29, -+0xF2, 0x90, 0x8A, 0xD2, 0xEE, 0x8F, 0xF0, 0x12, 0x42, 0x81, 0x90, 0x8A, 0xDB, 0xE0, 0xFE, 0xA3, -+0xE0, 0xFF, 0xD3, 0x90, 0x8A, 0xD3, 0xE0, 0x9F, 0x90, 0x8A, 0xD2, 0xE0, 0x9E, 0x50, 0x08, 0x90, -+0x8A, 0xDA, 0xE0, 0x04, 0xF0, 0x80, 0xAF, 0x90, 0x8A, 0xDA, 0xE0, 0xC3, 0x13, 0xF0, 0x90, 0x8A, -+0xDD, 0xE0, 0xFF, 0xB4, 0x01, 0x0D, 0x90, 0x8A, 0xDA, 0xE0, 0x70, 0x5D, 0x90, 0x8A, 0xDD, 0x04, -+0xF0, 0x80, 0x5B, 0xEF, 0xB4, 0x03, 0x1D, 0x90, 0x8A, 0xDA, 0xE0, 0xFF, 0x70, 0x08, 0x90, 0x8A, -+0xDD, 0x74, 0x03, 0xF0, 0x80, 0x48, 0xEF, 0xB4, 0x01, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x01, 0xF0, -+0x80, 0x3C, 0x80, 0x35, 0x90, 0x8A, 0xDD, 0xE0, 0x64, 0x05, 0x70, 0x32, 0x90, 0x8A, 0xDA, 0xE0, -+0xFF, 0x70, 0x08, 0x90, 0x8A, 0xDD, 0x74, 0x05, 0xF0, 0x80, 0x0F, 0xEF, 0x90, 0x8A, 0xDD, 0xB4, -+0x01, 0x05, 0x74, 0x03, 0xF0, 0x80, 0x03, 0x74, 0x01, 0xF0, 0xD3, 0x90, 0x8A, 0xD7, 0xE0, 0x94, -+0x03, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x05, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0xD3, 0x90, -+0x8A, 0xD7, 0xE0, 0x94, 0x03, 0x90, 0x8A, 0xD6, 0xE0, 0x94, 0x00, 0x40, 0x05, 0xE4, 0x90, 0x8A, -+0xDD, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0xFD, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x43, 0xF5, 0x82, -+0xE4, 0x34, 0x88, 0xF5, 0x83, 0xED, 0xF0, 0x11, 0x02, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x24, 0x64, -+0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0xD3, 0x94, 0x05, 0x50, 0x0F, 0x74, 0x64, 0x2F, -+0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE0, 0x04, 0xF0, 0x80, 0x0F, 0x90, 0x8A, 0xCF, 0xE0, -+0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0xAB, 0x12, 0xAA, 0x13, 0xA9, -+0x14, 0xE4, 0xF5, 0xF0, 0x12, 0x42, 0xFA, 0xAB, 0x12, 0xAA, 0x13, 0xA9, 0x14, 0x90, 0x00, 0x02, -+0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, 0x04, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, -+0x00, 0x06, 0xE4, 0xF5, 0xF0, 0x12, 0x43, 0x19, 0x90, 0x00, 0x08, 0xE4, 0xF5, 0xF0, 0x12, 0x43, -+0x19, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x01, 0x47, 0x22, 0xAD, 0x07, -+0x74, 0x84, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE0, 0x54, 0x7F, 0x90, 0x8A, 0xDE, -+0xF0, 0xE0, 0xF9, 0x54, 0x1F, 0xA3, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, -+0x5F, 0xE0, 0xFF, 0x90, 0x8A, 0xE1, 0xF0, 0xED, 0x25, 0xE0, 0x24, 0x81, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, 0x8A, 0xE2, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0xED, -+0x25, 0xE0, 0x24, 0xE4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE0, 0xFB, 0xA3, 0xE0, 0x90, -+0x8A, 0xE4, 0xCB, 0xF0, 0xA3, 0xEB, 0xF0, 0x90, 0x8A, 0xDF, 0xE0, 0xFE, 0x25, 0xE0, 0x24, 0x2E, -+0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xED, 0x25, -+0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEA, 0xF0, 0xA3, 0xEB, 0xF0, 0xEE, -+0xC3, 0x9F, 0x40, 0x03, 0x02, 0x70, 0x12, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x74, 0xA5, 0x2D, 0xF5, -+0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, 0xEF, 0x04, 0x90, 0x8A, 0xE0, 0xF0, 0x90, 0x8A, -+0xE1, 0xE0, 0xFF, 0x90, 0x8A, 0xE0, 0xE0, 0xFE, 0xD3, 0x9F, 0x40, 0x03, 0x02, 0x70, 0x4C, 0xEE, -+0xC3, 0x94, 0x10, 0x40, 0x21, 0xEE, 0x24, 0xF0, 0xFF, 0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, -+0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, 0xFF, 0x90, 0x8A, 0xE2, 0xE0, 0x5E, 0xFE, -+0xA3, 0xE0, 0x5F, 0x4E, 0x70, 0x27, 0x90, 0x8A, 0xE0, 0xE0, 0xFF, 0xC3, 0x94, 0x10, 0x50, 0x59, -+0x74, 0x01, 0x7E, 0x00, 0xA8, 0x07, 0x08, 0x80, 0x05, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9, -+0xFF, 0x90, 0x8A, 0xE4, 0xE0, 0x5E, 0xFE, 0xA3, 0xE0, 0x5F, 0x4E, 0x60, 0x3C, 0x90, 0x8A, 0xE0, -+0xE0, 0xB4, 0x11, 0x0D, 0x90, 0x8A, 0xE3, 0xE0, 0x30, 0xE7, 0x06, 0x90, 0x8A, 0xE0, 0x74, 0x17, -+0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xFF, 0x64, 0x13, 0x60, 0x04, 0xEF, 0xB4, 0x12, 0x0D, 0x90, 0x8A, -+0xE2, 0xE0, 0x30, 0xE0, 0x06, 0x90, 0x8A, 0xE0, 0x74, 0x18, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0x90, -+0x8A, 0xDF, 0xF0, 0x90, 0x8A, 0xDE, 0xF0, 0x80, 0x43, 0x90, 0x8A, 0xE0, 0xE0, 0x04, 0xF0, 0x02, -+0x6F, 0x6E, 0x90, 0x8A, 0xE1, 0xE0, 0xFC, 0x90, 0x8A, 0xDF, 0xE0, 0xFF, 0x6C, 0x70, 0x71, 0x74, -+0xA5, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, -+0x87, 0x29, 0x12, 0x43, 0x5F, 0xE0, 0xB4, 0x01, 0x10, 0xE9, 0x20, 0xE6, 0x0C, 0x90, 0x8A, 0xDF, -+0xE0, 0x44, 0x40, 0x90, 0x8A, 0xDE, 0xF0, 0x80, 0x03, 0xAF, 0x01, 0x22, 0x90, 0x8A, 0xDF, 0xE0, -+0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0xE4, 0x93, 0xFA, 0x74, -+0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, 0x83, 0x74, -+0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, 0xFE, 0xEF, 0x13, 0xFF, 0xED, 0x25, 0xE0, -+0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x80, 0x66, -+0x90, 0x8A, 0xDF, 0xE0, 0xD3, 0x9C, 0x40, 0x5E, 0x90, 0x8A, 0xE1, 0xE0, 0xFF, 0x74, 0xA5, 0x2D, -+0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, 0x90, 0x8A, 0xDF, 0xEF, 0xF0, 0x90, 0x8A, -+0xDE, 0xF0, 0xFC, 0xA3, 0xE0, 0xFF, 0x25, 0xE0, 0x24, 0x66, 0xF5, 0x82, 0xE4, 0x34, 0x41, 0xF5, -+0x83, 0xE4, 0x93, 0xFA, 0x74, 0x01, 0x93, 0xFB, 0xEF, 0x25, 0xE0, 0x24, 0x2E, 0xF5, 0x82, 0xE4, -+0x34, 0x41, 0xF5, 0x83, 0x74, 0x01, 0x93, 0x2B, 0xFF, 0xE4, 0x93, 0x3A, 0xC3, 0x13, 0xFE, 0xEF, -+0x13, 0xFF, 0xED, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0xEE, 0xF0, -+0xA3, 0xEF, 0xF0, 0xAF, 0x04, 0x22, 0x74, 0x01, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, -+0xE4, 0xF0, 0xAF, 0x05, 0x90, 0x8A, 0xDE, 0xE0, 0x44, 0x80, 0xFD, 0x12, 0x5C, 0xC1, 0x90, 0x8A, -+0xDE, 0xE0, 0x44, 0x80, 0xFF, 0x22, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0xFF, -+0xC3, 0x94, 0x10, 0x50, 0x14, 0x74, 0xA4, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x04, 0xF5, 0x83, 0xE4, -+0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x80, 0xE2, 0xE4, 0x90, 0x8A, 0xCF, 0xF0, 0x90, 0x8A, -+0xCF, 0xE0, 0xFF, 0xC3, 0x94, 0x20, 0x40, 0x02, 0x41, 0xCF, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, -+0x00, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x02, 0x12, -+0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x04, 0x12, 0x43, 0x5F, -+0xE4, 0xF0, 0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x06, 0x12, 0x43, 0x5F, 0xE4, 0xF0, -+0xA3, 0xF0, 0x75, 0xF0, 0x0A, 0xEF, 0x90, 0x84, 0x08, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0xF0, -+0x74, 0x84, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0x74, 0x13, 0xF0, 0x74, 0x44, 0x2F, -+0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x43, 0x2F, 0xF5, 0x82, 0xE4, 0x34, -+0x88, 0xF5, 0x83, 0xE4, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xC0, 0xF5, 0x82, 0xE4, 0x34, 0x85, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x63, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xE3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA3, 0xF5, 0x82, 0xE4, 0x34, 0x88, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0x64, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0xEF, 0x25, 0xE0, 0x24, 0xA4, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, -+0x83, 0xE4, 0xF0, 0xA3, 0xF0, 0x74, 0x44, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, -+0xF0, 0x74, 0x24, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x74, 0x64, 0x2F, -+0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xE4, 0xF0, 0x90, 0x41, 0x8C, 0x93, 0xFE, 0x74, 0x01, -+0x93, 0xFF, 0x90, 0x41, 0x54, 0x74, 0x01, 0x93, 0x2F, 0xFF, 0xE4, 0x93, 0x3E, 0xC3, 0x13, 0xFE, -+0xEF, 0x13, 0xFF, 0x90, 0x8A, 0xCF, 0xE0, 0xFD, 0x25, 0xE0, 0x24, 0xE1, 0xF5, 0x82, 0xE4, 0x34, -+0x86, 0xF5, 0x83, 0xEE, 0xF0, 0xA3, 0xEF, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x29, 0x12, -+0x43, 0x5F, 0x74, 0x01, 0xF0, 0x74, 0xC1, 0x2D, 0xF5, 0x82, 0xE4, 0x34, 0x86, 0xF5, 0x83, 0x74, -+0x0C, 0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x25, 0x12, 0x43, 0x5F, 0x74, 0xFF, 0xF0, 0xA3, -+0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x23, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0xA3, 0x74, 0x0F, -+0xF0, 0x75, 0xF0, 0x09, 0xED, 0x90, 0x87, 0x27, 0x12, 0x43, 0x5F, 0x74, 0x13, 0xF0, 0x75, 0xF0, -+0x09, 0xED, 0x90, 0x87, 0x28, 0x12, 0x43, 0x5F, 0xE4, 0xF0, 0x74, 0x84, 0x2D, 0xF5, 0x82, 0xE4, -+0x34, 0x04, 0xF5, 0x83, 0x74, 0x13, 0xF0, 0x90, 0x8A, 0xCF, 0xE0, 0x04, 0xF0, 0x21, 0x3E, 0x22, -+0x12, 0x29, 0xD9, 0xFF, 0xC3, 0x94, 0x20, 0x50, 0x14, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFE, -+0x74, 0x23, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x89, 0xF5, 0x83, 0xEE, 0xF0, 0x22, 0xEF, 0xB4, 0x20, -+0x0A, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0x90, 0x87, 0x21, 0xF0, 0x22, 0x12, 0x29, 0xD9, 0xF5, -+0x21, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x2A, 0x8B, 0x00, -+0x00, 0x00, 0x00, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x1A, 0xF0, 0x90, 0x00, 0x03, -+0x12, 0x42, 0x20, 0x90, 0x8B, 0x0A, 0xF0, 0x12, 0x47, 0xFA, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x90, -+0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0x30, 0xE0, 0x25, 0x12, 0x29, 0xD9, 0x90, 0x8B, 0x10, 0xF0, -+0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x11, 0xF0, 0xEF, 0xC3, 0x13, 0x54, 0x7F, 0x90, -+0x8B, 0x0F, 0xF0, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x16, 0xF0, 0x22, 0x90, 0x8B, -+0x10, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x11, 0x74, 0x05, 0xF0, 0x90, 0x8B, 0x0F, 0x74, 0x14, 0xF0, -+0x90, 0x8B, 0x16, 0x74, 0x05, 0xF0, 0x22, 0x12, 0x29, 0xD9, 0x30, 0xE0, 0x19, 0xC3, 0x13, 0x54, -+0x7F, 0x90, 0x8B, 0x15, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, 0xFF, 0x90, 0x8B, 0x13, 0xE4, -+0xF0, 0xA3, 0xEF, 0xF0, 0x80, 0x0F, 0x90, 0x8B, 0x15, 0x74, 0x05, 0xF0, 0x90, 0x8B, 0x13, 0xE4, -+0xF0, 0xA3, 0x74, 0x03, 0xF0, 0x90, 0x8B, 0x13, 0xE0, 0xA3, 0xE0, 0x90, 0x05, 0x58, 0xF0, 0x22, -+0x12, 0x29, 0xD9, 0x90, 0x8B, 0x12, 0xF0, 0x60, 0x07, 0xE4, 0xFD, 0x7F, 0x04, 0x12, 0x45, 0xA2, -+0x90, 0x8B, 0x12, 0xE0, 0x90, 0x01, 0xE7, 0xF0, 0x22, 0x90, 0x02, 0x09, 0xE0, 0xFD, 0x12, 0x29, -+0xD9, 0xFE, 0xAF, 0x05, 0xED, 0x2E, 0x90, 0x8A, 0xF7, 0xF0, 0x90, 0x00, 0x01, 0x12, 0x42, 0x20, -+0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xF8, 0xF0, 0x90, 0x00, 0x02, 0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, -+0x90, 0x8A, 0xF9, 0xF0, 0x90, 0x00, 0x03, 0x12, 0x42, 0x20, 0xFF, 0xED, 0x2F, 0x90, 0x8A, 0xFA, -+0xF0, 0x90, 0x00, 0x04, 0x12, 0x42, 0x20, 0xFF, 0xAE, 0x05, 0xED, 0x2F, 0x90, 0x8A, 0xFB, 0xF0, -+0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x8B, 0xE4, 0x90, -+0x8A, 0xDD, 0xF0, 0x12, 0x29, 0xD9, 0xC3, 0x13, 0x20, 0xE0, 0x02, 0xA1, 0x62, 0x90, 0x8A, 0xDA, -+0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xFF, 0x54, 0x02, 0xFE, 0x90, 0x8B, 0x32, 0xE0, 0x54, 0xFD, -+0x4E, 0xFE, 0xF0, 0xEF, 0x54, 0x01, 0xFF, 0xEE, 0x54, 0xFE, 0x4F, 0xFF, 0xF0, 0x12, 0x29, 0xD9, -+0xFE, 0x54, 0x08, 0xFD, 0xEF, 0x54, 0xF7, 0x4D, 0xFF, 0x90, 0x8B, 0x32, 0xF0, 0xEE, 0x54, 0x10, -+0xFE, 0xEF, 0x54, 0xEF, 0x4E, 0xFF, 0xF0, 0x12, 0x29, 0xD9, 0xFE, 0x54, 0x20, 0xFD, 0xEF, 0x54, -+0xDF, 0x4D, 0xFF, 0x90, 0x8B, 0x32, 0xF0, 0xEE, 0x54, 0x40, 0xFE, 0xEF, 0x54, 0xBF, 0x4E, 0xF0, -+0x20, 0xE0, 0x02, 0xA1, 0x4F, 0x90, 0x8A, 0xDD, 0x74, 0x21, 0xF0, 0x90, 0x8A, 0xDA, 0x12, 0x43, -+0x6B, 0x12, 0x29, 0xD9, 0xFF, 0x13, 0x13, 0x54, 0x01, 0xFE, 0x90, 0x8B, 0x32, 0xE0, 0xFD, 0x13, -+0x13, 0x54, 0x01, 0x6E, 0x60, 0x2A, 0xEF, 0x54, 0x04, 0xFF, 0xED, 0x54, 0xFB, 0x4F, 0xF0, 0xE0, -+0x13, 0x13, 0x54, 0x3F, 0x30, 0xE0, 0x0E, 0x90, 0x01, 0x34, 0x74, 0x40, 0xF0, 0xFD, 0xE4, 0xFF, -+0x12, 0x36, 0xE6, 0x80, 0x0B, 0xE4, 0x90, 0x8B, 0x34, 0xF0, 0x7D, 0x40, 0xFF, 0x12, 0x36, 0x75, -+0x90, 0x8B, 0x32, 0xE0, 0xFD, 0x13, 0x13, 0x13, 0x54, 0x1F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, -+0xE0, 0x44, 0x12, 0xF0, 0xED, 0xC4, 0x54, 0x0F, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, -+0x14, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xC4, 0x13, 0x54, 0x07, 0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, -+0xE0, 0x44, 0x80, 0xF0, 0x90, 0x8B, 0x32, 0xE0, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x20, 0xE0, 0x07, -+0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x40, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0x90, 0x05, 0x27, 0xF0, 0x90, -+0x8B, 0x33, 0xE0, 0x70, 0x05, 0x7F, 0x01, 0x12, 0x4E, 0x89, 0x90, 0x8B, 0x32, 0xE0, 0xC4, 0x13, -+0x13, 0x54, 0x03, 0x30, 0xE0, 0x04, 0x7F, 0x03, 0x80, 0x0E, 0x7F, 0x01, 0x12, 0x4D, 0xE0, 0xEF, -+0x60, 0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F, 0x02, 0x12, 0x4E, 0x89, 0x7F, 0x02, 0xC1, 0xA4, 0x90, -+0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x27, 0xF0, 0xE4, 0xFF, 0x12, 0x4E, 0x89, 0x7F, 0x03, -+0xC1, 0xA4, 0x90, 0x8A, 0xDA, 0x12, 0x43, 0x6B, 0x12, 0x29, 0xD9, 0xFF, 0x54, 0x02, 0xFE, 0x90, -+0x8B, 0x2C, 0xE0, 0x54, 0xFD, 0x4E, 0xFE, 0xF0, 0xEF, 0x54, 0x01, 0xFF, 0xEE, 0x54, 0xFE, 0x4F, -+0xFF, 0xF0, 0x12, 0x29, 0xD9, 0xFE, 0x54, 0x08, 0xFD, 0xEF, 0x54, 0xF7, 0x4D, 0xFF, 0x90, 0x8B, -+0x2C, 0xF0, 0xEE, 0x54, 0x10, 0xFE, 0xEF, 0x54, 0xEF, 0x4E, 0xFF, 0xF0, 0x12, 0x29, 0xD9, 0xFE, -+0x54, 0x40, 0xFD, 0xEF, 0x54, 0xBF, 0x4D, 0xFF, 0x90, 0x8B, 0x2C, 0xF0, 0xEE, 0x54, 0x04, 0xFE, -+0xEF, 0x54, 0xFB, 0x4E, 0xF0, 0x20, 0xE0, 0x02, 0xC1, 0x57, 0x90, 0x8A, 0xDD, 0x74, 0x31, 0xF0, -+0x90, 0x8B, 0x2C, 0xE0, 0x13, 0x13, 0x54, 0x3F, 0x20, 0xE0, 0x0B, 0xE4, 0x90, 0x8B, 0x2E, 0xF0, -+0x7D, 0x40, 0xFF, 0x12, 0x36, 0x75, 0x90, 0x8B, 0x2C, 0xE0, 0xFD, 0x13, 0x13, 0x13, 0x54, 0x1F, -+0x30, 0xE0, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x02, 0xF0, 0xED, 0xC4, 0x54, 0x0F, 0x30, 0xE0, -+0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x44, 0x04, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0x54, 0x06, 0x60, 0x0C, -+0x90, 0x01, 0x3E, 0x74, 0x03, 0xF0, 0xFD, 0x7F, 0x02, 0x12, 0x37, 0x00, 0x90, 0x8A, 0xDD, 0xE0, -+0x90, 0x05, 0x27, 0xF0, 0x90, 0x8B, 0x2C, 0xE0, 0xFF, 0xC4, 0x13, 0x13, 0x54, 0x03, 0x30, 0xE0, -+0x0D, 0xA3, 0xE0, 0x64, 0x06, 0x60, 0x2C, 0x7F, 0x06, 0x12, 0x7B, 0x49, 0x80, 0x25, 0x90, 0x8B, -+0x2D, 0xE0, 0xB4, 0x06, 0x1B, 0x7F, 0x01, 0x12, 0x7B, 0x49, 0xE4, 0xFF, 0x12, 0x4D, 0xE0, 0xEF, -+0x60, 0x09, 0x7D, 0x01, 0xAF, 0x23, 0x12, 0x45, 0xA2, 0x80, 0x05, 0x12, 0x4E, 0x56, 0x80, 0x03, -+0x12, 0x66, 0x20, 0x7F, 0x01, 0x80, 0x4D, 0x90, 0x8A, 0xDD, 0x74, 0x01, 0xF0, 0x90, 0x05, 0x27, -+0xF0, 0x7D, 0x03, 0x7F, 0x02, 0x12, 0x36, 0x92, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x06, 0x02, 0x80, -+0x1B, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x02, 0x80, 0x07, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, -+0x04, 0xE4, 0xFF, 0x80, 0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0x80, 0x09, -+0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x05, 0x7F, 0x01, 0x12, 0x7B, 0x49, 0x12, 0x66, 0x13, 0x12, -+0x4A, 0xFC, 0x7F, 0x03, 0xD1, 0xAB, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xAD, 0x07, 0xEF, 0x64, 0x01, -+0x60, 0x04, 0xEF, 0xB4, 0x03, 0x15, 0x90, 0x8B, 0x32, 0xE0, 0x54, 0xFE, 0xF0, 0x54, 0xFB, 0xF0, -+0xE4, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xED, 0x64, 0x02, 0x60, 0x04, -+0xED, 0xB4, 0x03, 0x15, 0x90, 0x8B, 0x2C, 0xE0, 0x54, 0xFE, 0xF0, 0x54, 0xFB, 0xF0, 0xE4, 0xA3, -+0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0xA3, 0xF0, 0x22, 0x12, 0x29, 0xD9, 0x90, 0x8B, 0x38, -+0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0x90, 0x8A, 0xFD, 0xE0, 0x90, 0x8A, 0xE8, -+0xF0, 0x90, 0x8A, 0xFE, 0xE0, 0xFF, 0xA3, 0xE0, 0x90, 0x8A, 0xE9, 0xCF, 0xF0, 0xA3, 0xEF, 0xF0, -+0xE4, 0x90, 0x8A, 0xE4, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0xFF, 0x24, 0x00, 0xF5, 0x82, 0xE4, 0x34, -+0x8B, 0xF5, 0x83, 0xE0, 0xFE, 0x74, 0xEB, 0x2F, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEE, -+0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0x04, 0xF0, 0xE0, 0xB4, 0x04, 0xDA, 0x90, 0x8A, 0xE8, 0xE0, 0x12, -+0x43, 0x94, 0x77, 0x61, 0x00, 0x78, 0xD7, 0x01, 0x77, 0x6C, 0x02, 0x77, 0x6C, 0x03, 0x77, 0x6C, -+0x04, 0x78, 0xD7, 0x05, 0x78, 0xA1, 0x80, 0x78, 0xBA, 0x81, 0x78, 0xD7, 0x82, 0x00, 0x00, 0x78, -+0xD3, 0x90, 0x8A, 0xEE, 0xE0, 0xFF, 0x12, 0x7E, 0x6E, 0x02, 0x78, 0xD7, 0x90, 0x8A, 0xE8, 0xE0, -+0xFF, 0xB4, 0x02, 0x08, 0x90, 0x8A, 0xE5, 0x74, 0x01, 0xF0, 0x80, 0x0F, 0xEF, 0x90, 0x8A, 0xE5, -+0xB4, 0x03, 0x05, 0x74, 0x02, 0xF0, 0x80, 0x03, 0x74, 0x04, 0xF0, 0xC3, 0x90, 0x8A, 0xE9, 0xE0, -+0x94, 0x08, 0x50, 0x79, 0xE4, 0x90, 0x8A, 0xE4, 0xF0, 0x90, 0x8A, 0xE5, 0xE0, 0xFF, 0x90, 0x8A, -+0xE4, 0xE0, 0xC3, 0x9F, 0x40, 0x03, 0x02, 0x78, 0xD7, 0x90, 0x8A, 0xE9, 0xE0, 0xFE, 0xA3, 0xE0, -+0xFF, 0xC3, 0xEE, 0x94, 0x01, 0x90, 0x8A, 0xE4, 0xE0, 0x50, 0x1F, 0xFE, 0x2F, 0xFF, 0xEE, 0xFD, -+0xC3, 0x74, 0x03, 0x9D, 0xFD, 0xE4, 0x94, 0x00, 0xFC, 0x74, 0xEB, 0x2D, 0xF5, 0x82, 0x74, 0x8A, -+0x3C, 0xF5, 0x83, 0xE0, 0xFD, 0x12, 0x51, 0xFB, 0x80, 0x2B, 0xFF, 0xFD, 0xC3, 0x74, 0x03, 0x9D, -+0xFD, 0xE4, 0x94, 0x00, 0xFC, 0x74, 0xEB, 0x2D, 0xF5, 0x82, 0x74, 0x8A, 0x3C, 0xF5, 0x83, 0xE0, -+0xFE, 0xEF, 0xFD, 0x90, 0x8A, 0xEA, 0xE0, 0x2D, 0xFD, 0x90, 0x8A, 0xE9, 0xE0, 0x34, 0x00, 0x8D, -+0x82, 0xF5, 0x83, 0xEE, 0xF0, 0x90, 0x8A, 0xE4, 0xE0, 0x04, 0xF0, 0x80, 0x8C, 0xC3, 0x90, 0x8A, -+0xE9, 0xE0, 0x94, 0x10, 0x40, 0x02, 0x01, 0xD7, 0x90, 0x8A, 0xE8, 0xE0, 0x64, 0x04, 0x60, 0x02, -+0x01, 0xD7, 0x90, 0x8A, 0xEC, 0xE0, 0xFF, 0xE4, 0xFC, 0xFD, 0xFE, 0x78, 0x10, 0x12, 0x2A, 0x6C, -+0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, 0x8A, 0xEB, 0xE0, 0xFF, 0xE4, 0xFC, 0xFD, -+0xFE, 0x78, 0x18, 0x12, 0x2A, 0x6C, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, 0xD0, 0x00, 0x12, 0x43, -+0x46, 0xC0, 0x04, 0xC0, 0x05, 0xC0, 0x06, 0xC0, 0x07, 0x90, 0x8A, 0xED, 0xE0, 0xFF, 0xE4, 0xFC, -+0xFD, 0xFE, 0x78, 0x08, 0x12, 0x2A, 0x6C, 0xD0, 0x03, 0xD0, 0x02, 0xD0, 0x01, 0xD0, 0x00, 0x12, -+0x43, 0x46, 0xA8, 0x04, 0xA9, 0x05, 0xAA, 0x06, 0xAB, 0x07, 0xA3, 0xE0, 0xFF, 0xE4, 0xFC, 0xFD, -+0xFE, 0x12, 0x43, 0x46, 0xA3, 0x12, 0x2A, 0x7F, 0x90, 0x8A, 0xEF, 0x12, 0x43, 0x53, 0x90, 0x80, -+0x85, 0x12, 0x2A, 0x7F, 0x90, 0x8A, 0xE9, 0xE0, 0xFE, 0xA3, 0xE0, 0xFF, 0x12, 0x2F, 0xD9, 0x80, -+0x36, 0x90, 0x8A, 0xED, 0xE0, 0xFE, 0xA3, 0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0xFE, 0x90, 0x8A, -+0xE6, 0xF0, 0xA3, 0xEF, 0xF0, 0x12, 0x37, 0x54, 0x80, 0x1D, 0x90, 0x8A, 0xED, 0xE0, 0xFE, 0xA3, -+0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0xFE, 0x90, 0x8A, 0xE6, 0xF0, 0xA3, 0xEF, 0xF0, 0x12, 0x36, -+0xCB, 0x80, 0x04, 0x7F, 0x00, 0x80, 0x02, 0x7F, 0x01, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0xD3, 0x10, -+0xAF, 0x01, 0xC3, 0xC0, 0xD0, 0xE4, 0x90, 0x8A, 0xDD, 0xF0, 0xA3, 0x74, 0x04, 0xF0, 0xA3, 0xE4, -+0xF0, 0x90, 0x8A, 0xE2, 0xF0, 0xA3, 0xF0, 0x90, 0x02, 0x09, 0xE0, 0x90, 0x8A, 0xE1, 0xF0, 0x12, -+0x29, 0xD9, 0xFF, 0x90, 0x8A, 0xE1, 0xE0, 0x2F, 0x90, 0x8A, 0xE0, 0xF0, 0x30, 0xE0, 0x0B, 0x90, -+0x8A, 0xDB, 0xE4, 0xF0, 0xA3, 0x74, 0x80, 0xF0, 0x80, 0x07, 0xE4, 0x90, 0x8A, 0xDB, 0xF0, 0xA3, -+0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xC3, 0x13, 0x90, 0xFD, 0x10, 0xF0, 0x90, 0x8A, 0xDD, 0xE0, 0x24, -+0x20, 0xF0, 0x90, 0x8A, 0xDB, 0xA3, 0xE0, 0xFD, 0xA3, 0xE0, 0xFC, 0x2D, 0xFF, 0x24, 0x01, 0xF5, -+0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0x90, 0x8A, 0xFD, 0xF0, 0x74, 0x02, 0x2F, 0xF5, 0x82, -+0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0xFE, 0xEC, 0x2D, 0x24, 0x03, 0xF5, 0x82, 0xE4, 0x34, 0xFC, -+0xF5, 0x83, 0xE0, 0x24, 0x00, 0xFF, 0xE4, 0x3E, 0x90, 0x8A, 0xFE, 0xF0, 0xA3, 0xEF, 0xF0, 0x90, -+0x8A, 0xDA, 0x74, 0x04, 0xF0, 0x90, 0x8A, 0xDB, 0xA3, 0xE0, 0xFF, 0xA3, 0xE0, 0x2F, 0xFF, 0x90, -+0x8A, 0xDA, 0xE0, 0xFE, 0x2F, 0x24, 0x00, 0xF5, 0x82, 0xE4, 0x34, 0xFC, 0xF5, 0x83, 0xE0, 0xFF, -+0x74, 0xFC, 0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x8A, 0xF5, 0x83, 0xEF, 0xF0, 0x90, 0x8A, 0xDA, 0xE0, -+0x04, 0xF0, 0xE0, 0xB4, 0x08, 0xCF, 0x12, 0x76, 0xF2, 0xEF, 0x70, 0x45, 0x90, 0x01, 0xC3, 0xE0, -+0x60, 0x2B, 0xC3, 0x90, 0x8A, 0xE3, 0xE0, 0x94, 0xE8, 0x90, 0x8A, 0xE2, 0xE0, 0x94, 0x03, 0x40, -+0x09, 0x90, 0x01, 0xC6, 0xE0, 0x44, 0x10, 0xF0, 0x80, 0x79, 0x90, 0x8A, 0xE2, 0xE4, 0x75, 0xF0, -+0x01, 0x12, 0x42, 0x81, 0x7F, 0x0A, 0x7E, 0x00, 0x12, 0x37, 0x54, 0x80, 0xCF, 0x90, 0x01, 0xC6, -+0xE0, 0x90, 0x01, 0xC3, 0x30, 0xE2, 0x05, 0x74, 0xFE, 0xF0, 0x80, 0x57, 0x74, 0xFF, 0xF0, 0x80, -+0x52, 0x90, 0x8A, 0xDD, 0xE0, 0xB4, 0x78, 0x2E, 0xE4, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0x04, 0xF0, -+0x90, 0x8A, 0xDB, 0xE0, 0x70, 0x04, 0xA3, 0xE0, 0x64, 0x80, 0x90, 0x8A, 0xDB, 0x70, 0x05, 0xF0, -+0xA3, 0xF0, 0x80, 0x06, 0xE4, 0xF0, 0xA3, 0x74, 0x80, 0xF0, 0x90, 0x8A, 0xE0, 0xE0, 0xC3, 0x13, -+0x90, 0xFD, 0x10, 0xF0, 0x80, 0x07, 0x90, 0x8A, 0xDD, 0xE0, 0x24, 0x08, 0xF0, 0x90, 0x8A, 0xDE, -+0x74, 0xFF, 0xF5, 0xF0, 0x12, 0x42, 0x81, 0x90, 0x8A, 0xDE, 0xE0, 0x70, 0x02, 0xA3, 0xE0, 0x60, -+0x02, 0x21, 0x32, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x29, 0xD9, 0x90, 0x8B, 0x05, 0xF0, 0x90, -+0x00, 0x01, 0x12, 0x42, 0x20, 0x90, 0x8B, 0x06, 0xF0, 0x22, 0xE4, 0xF5, 0x61, 0x22, 0x51, 0x67, -+0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x7F, 0x78, 0x7E, -+0x08, 0x12, 0x27, 0xDE, 0x90, 0x8B, 0x1C, 0x12, 0x2A, 0x7F, 0x7F, 0x04, 0x7E, 0x0C, 0x12, 0x27, -+0xDE, 0x90, 0x8B, 0x20, 0x12, 0x2A, 0x7F, 0x7F, 0x00, 0x7E, 0x08, 0x12, 0x27, 0xDE, 0x90, 0x8B, -+0x24, 0x12, 0x2A, 0x7F, 0x90, 0x8B, 0x09, 0xE0, 0x90, 0x8B, 0x1C, 0xB4, 0x01, 0x0D, 0x12, 0x43, -+0x53, 0xEF, 0x54, 0xC7, 0xFF, 0xED, 0x54, 0xC7, 0xFD, 0x80, 0x07, 0x12, 0x43, 0x53, 0xEF, 0x54, -+0xC7, 0xFF, 0xEC, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x78, 0x7E, 0x08, 0x12, 0x2F, 0xD9, -+0x90, 0x8B, 0x20, 0x12, 0x43, 0x53, 0xEF, 0x54, 0x0F, 0xFF, 0xEC, 0x90, 0x80, 0x85, 0x12, 0x2A, -+0x7F, 0x7F, 0x04, 0x7E, 0x0C, 0x12, 0x2F, 0xD9, 0x90, 0x8B, 0x24, 0x12, 0x43, 0x53, 0xEF, 0x44, -+0x02, 0xFF, 0xEC, 0x90, 0x80, 0x85, 0x12, 0x2A, 0x7F, 0x7F, 0x00, 0x7E, 0x08, 0x12, 0x2F, 0xD9, -+0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x27, 0xDE, 0x90, 0x8B, 0x28, 0x12, 0x2A, 0x7F, 0x90, 0x80, 0x85, -+0x12, 0x2A, 0x8B, 0x00, 0x1B, 0x25, 0xA0, 0x7F, 0x70, 0x7E, 0x0E, 0x12, 0x2F, 0xD9, 0x90, 0x80, -+0x59, 0x12, 0x2A, 0x8B, 0x00, 0x00, 0x00, 0x00, 0xE4, 0xFD, 0xFF, 0x12, 0x34, 0x81, 0x90, 0x8B, -+0x09, 0xE0, 0xB4, 0x01, 0x11, 0x90, 0x80, 0x59, 0x12, 0x2A, 0x8B, 0x00, 0x00, 0x00, 0x00, 0xE4, -+0xFD, 0x7F, 0x01, 0x12, 0x34, 0x81, 0x22, 0x51, 0x6D, 0x90, 0x8B, 0x33, 0x74, 0x02, 0xF0, 0x22, -+0x51, 0x67, 0x90, 0x8B, 0x2D, 0x74, 0x04, 0xF0, 0x22, 0xD3, 0x10, 0xAF, 0x01, 0xC3, 0xC0, 0xD0, -+0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0x6F, 0x70, 0x02, 0xA1, 0x15, 0xEF, 0x12, 0x43, 0x94, 0x7B, 0x77, -+0x00, 0x7B, 0xB1, 0x01, 0x7B, 0xF7, 0x02, 0x7C, 0x31, 0x03, 0x7C, 0x69, 0x04, 0x7C, 0xA2, 0x05, -+0x7C, 0xDD, 0x06, 0x00, 0x00, 0x7D, 0x15, 0xEE, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xB1, 0x48, 0xA1, -+0x15, 0x90, 0x8B, 0x2D, 0xE0, 0xFF, 0xB4, 0x05, 0x04, 0xB1, 0x24, 0xA1, 0x15, 0xEF, 0xB4, 0x06, -+0x06, 0x7F, 0x01, 0xB1, 0x39, 0x80, 0x16, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x03, 0x06, 0x7F, 0x01, -+0xB1, 0x1A, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x02, 0xB1, 0x2E, 0xB1, 0x6B, 0xA1, -+0x15, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xB1, 0x48, 0x80, 0x09, 0x90, 0x8B, -+0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xB1, 0x24, 0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xB1, 0x61, 0xA1, -+0x15, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0x7F, 0x01, 0xB1, 0x39, 0xA1, 0x15, 0xEE, -+0xB4, 0x03, 0x06, 0x7F, 0x01, 0xB1, 0x1A, 0xA1, 0x15, 0x90, 0x8B, 0x2D, 0xE0, 0x64, 0x02, 0x60, -+0x02, 0xA1, 0x15, 0xB1, 0x2E, 0xA1, 0x15, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, -+0xB1, 0x48, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xB1, 0x24, 0x90, 0x8B, 0x2D, -+0xE0, 0x70, 0x04, 0xB1, 0x61, 0x80, 0x16, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0x7F, -+0x01, 0xB1, 0x39, 0x80, 0x08, 0xEE, 0xB4, 0x03, 0x04, 0x7F, 0x01, 0xB1, 0x1A, 0xB1, 0x8D, 0xA1, -+0x15, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xB1, 0x48, 0x80, 0x09, 0x90, 0x8B, -+0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xB1, 0x24, 0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xB1, 0x61, 0x80, -+0x14, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0xE4, 0xFF, 0xB1, 0x39, 0x80, 0x06, 0xEE, -+0xB4, 0x02, 0x02, 0xB1, 0x2E, 0xB1, 0x76, 0xA1, 0x15, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, -+0x06, 0xE4, 0xFF, 0xB1, 0x39, 0x80, 0x13, 0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xB1, 0x1A, 0x80, -+0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, 0x02, 0xB1, 0x2E, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, -+0x04, 0xB1, 0x6B, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, 0x02, 0xB1, 0x24, 0x71, 0x40, -+0x80, 0x73, 0x90, 0x8B, 0x2D, 0xE0, 0xFE, 0xB4, 0x06, 0x06, 0xE4, 0xFF, 0xB1, 0x39, 0x80, 0x13, -+0xEE, 0xB4, 0x03, 0x06, 0x7F, 0x01, 0xB1, 0x1A, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, -+0x02, 0xB1, 0x2E, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x01, 0x04, 0xB1, 0x6B, 0x80, 0x0B, 0x90, 0x8B, -+0x2D, 0xE0, 0xB4, 0x04, 0x04, 0x7F, 0x01, 0xB1, 0x48, 0xB1, 0x80, 0x80, 0x38, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x04, 0x06, 0x7F, 0x01, 0xB1, 0x48, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x05, -+0x02, 0xB1, 0x24, 0x90, 0x8B, 0x2D, 0xE0, 0x70, 0x04, 0xB1, 0x61, 0x80, 0x16, 0x90, 0x8B, 0x2D, -+0xE0, 0xB4, 0x03, 0x06, 0xE4, 0xFF, 0xB1, 0x1A, 0x80, 0x09, 0x90, 0x8B, 0x2D, 0xE0, 0xB4, 0x02, -+0x02, 0xB1, 0x2E, 0xB1, 0x9A, 0xD0, 0xD0, 0x92, 0xAF, 0x22, 0x12, 0x4A, 0xB2, 0x90, 0x8B, 0x2D, -+0x74, 0x01, 0xF0, 0x22, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x90, 0x05, -+0x22, 0xE4, 0xF0, 0x90, 0x8B, 0x2D, 0x04, 0xF0, 0x22, 0xEF, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, -+0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x22, 0x90, 0x8B, 0x56, 0xEF, 0xF0, 0x12, 0x4F, 0xED, -+0x90, 0x8B, 0x56, 0xE0, 0x60, 0x05, 0x90, 0x05, 0x22, 0xE4, 0xF0, 0xE4, 0x90, 0x8B, 0x2D, 0xF0, -+0x22, 0x12, 0x4A, 0xCC, 0x90, 0x8B, 0x2D, 0x74, 0x01, 0xF0, 0x22, 0x7F, 0x01, 0x12, 0x4A, 0x7C, -+0xE4, 0x90, 0x8B, 0x2D, 0xF0, 0x22, 0x12, 0x4A, 0x32, 0x90, 0x8B, 0x2D, 0x74, 0x03, 0xF0, 0x22, -+0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x05, 0xF0, 0x22, 0x90, 0x05, 0x22, -+0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x2D, 0x74, 0x02, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0x6F, 0xF0, -+0x90, 0x8B, 0x2D, 0x74, 0x06, 0xF0, 0x22, 0x90, 0x05, 0x22, 0x74, 0xFF, 0xF0, 0x90, 0x8B, 0x33, -+0x74, 0x04, 0xF0, 0x22, 0x12, 0x4F, 0xED, 0x90, 0x8B, 0x33, 0x74, 0x04, 0xF0, 0x22, 0x90, 0x01, -+0x57, 0xE0, 0x60, 0x3C, 0x90, 0x01, 0x57, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x02, 0xF0, 0x90, -+0x8B, 0x1B, 0xE0, 0x60, 0x07, 0xE4, 0xF0, 0x53, 0x25, 0xFD, 0x80, 0x24, 0x90, 0x8B, 0x0C, 0xE0, -+0x04, 0xF0, 0x53, 0x25, 0xEF, 0x90, 0x8B, 0x10, 0xE0, 0xFF, 0x90, 0x8B, 0x0C, 0xE0, 0xD3, 0x9F, -+0x40, 0x0E, 0xE5, 0x21, 0xB4, 0x01, 0x09, 0x90, 0x8B, 0x0D, 0xE0, 0x70, 0x03, 0xE0, 0x04, 0xF0, -+0x90, 0x01, 0x5B, 0xE0, 0x60, 0x10, 0x90, 0x01, 0x5B, 0xE4, 0xF0, 0x90, 0x01, 0x3C, 0x74, 0x04, -+0xF0, 0xE4, 0x90, 0x8B, 0x18, 0xF0, 0x90, 0x01, 0x5F, 0xE0, 0x60, 0x10, 0x90, 0x01, 0x5F, 0xE4, -+0xF0, 0x90, 0x01, 0x3C, 0x74, 0x08, 0xF0, 0xE4, 0x90, 0x8B, 0x17, 0xF0, 0x22, 0xE4, 0x90, 0x8B, -+0x4F, 0xF0, 0xA3, 0xF0, 0x90, 0x05, 0xF8, 0xE0, 0x70, 0x0F, 0xA3, 0xE0, 0x70, 0x0B, 0xA3, 0xE0, -+0x70, 0x07, 0xA3, 0xE0, 0x70, 0x03, 0x7F, 0x01, 0x22, 0xD3, 0x90, 0x8B, 0x50, 0xE0, 0x94, 0xE8, -+0x90, 0x8B, 0x4F, 0xE0, 0x94, 0x03, 0x40, 0x03, 0x7F, 0x00, 0x22, 0x7F, 0x32, 0x7E, 0x00, 0x12, -+0x37, 0x54, 0x90, 0x8B, 0x4F, 0xE4, 0x75, 0xF0, 0x01, 0x12, 0x42, 0x81, 0x80, 0xC6, 0x8F, 0x0F, -+0xE4, 0x90, 0x8A, 0xF3, 0xF0, 0xE5, 0x0F, 0x14, 0xFE, 0x90, 0x8A, 0xF3, 0xE0, 0xFF, 0xC3, 0x9E, -+0x50, 0x0E, 0xEF, 0x04, 0xFD, 0x12, 0x34, 0xB7, 0x90, 0x8A, 0xF3, 0xE0, 0x04, 0xF0, 0x80, 0xE5, -+0xE5, 0x0F, 0x14, 0xFF, 0x7D, 0xFF, 0x12, 0x34, 0xB7, 0x90, 0x8A, 0xF3, 0xE5, 0x0F, 0xF0, 0x90, -+0x8A, 0xF3, 0xE0, 0xC3, 0x94, 0xFF, 0x50, 0x0F, 0xE0, 0xFF, 0x04, 0xFD, 0x12, 0x34, 0xB7, 0x90, -+0x8A, 0xF3, 0xE0, 0x04, 0xF0, 0x80, 0xE8, 0xAD, 0x0F, 0x7F, 0xFF, 0x02, 0x34, 0xB7, 0xDC, 0xD3, -+}; -+#endif -+ -+//8188C_Formal_All_PHYforMP_111117 2011-11-23 -+//8192C_Formal_92CU_PHYforMP_110817 2011-11-23 -+ -+u32 Rtl8192CUPHY_REG_2TArray[PHY_REG_2TArrayLength] = { -+0x024,0x0011800f, -+0x028,0x00ffdb83, -+0x800,0x80040002, -+0x804,0x00000003, -+0x808,0x0000fc00, -+0x80c,0x0000000a, -+0x810,0x10000330, //for Broadcom AP IOT -+0x814,0x020c3d10, -+0x818,0x02200385, -+0x81c,0x00000000, -+0x820,0x01000100, -+0x824,0x00390004, -+0x828,0x01000100, -+0x82c,0x00390004, -+0x830,0x27272727, -+0x834,0x27272727, -+0x838,0x27272727, -+0x83c,0x27272727, -+0x840,0x00010000, -+0x844,0x00010000, -+0x848,0x27272727, -+0x84c,0x27272727, -+0x850,0x00000000, -+0x854,0x00000000, -+0x858,0x569a569a, -+0x85c,0x0c1b25a4, -+0x860,0x66e60230, -+0x864,0x061f0130, -+0x868,0x27272727, -+0x86c,0x2b2b2b27, -+0x870,0x07000700, -+0x874,0x22184000, -+0x878,0x08080808, -+0x87c,0x00000000, -+0x880,0xc0083070, -+0x884,0x000004d5, -+0x888,0x00000000, -+0x88c,0xcc0000c0, -+0x890,0x00000800, -+0x894,0xfffffffe, -+0x898,0x40302010, -+0x89c,0x00706050, -+0x900,0x00000000, -+0x904,0x00000023, -+0x908,0x00000000, -+0x90c,0x81121313, -+0xa00,0x00d047c8, -+0xa04,0x80ff000c, -+0xa08,0x8c838300, -+0xa0c,0x2e68120f, -+0xa10,0x9500bb78, -+0xa14,0x11144028, -+0xa18,0x00881117, -+0xa1c,0x89140f00, -+0xa20,0x1a1b0000, -+0xa24,0x090e1317, -+0xa28,0x00000204, -+0xa2c,0x00d30000, -+0xa70,0x101fbf00, -+0xa74,0x00000007, -+0xc00,0x48071d40, -+0xc04,0x03a05633, -+0xc08,0x000000e4, -+0xc0c,0x6c6c6c6c, -+0xc10,0x08800000, -+0xc14,0x40000100, -+0xc18,0x08800000, -+0xc1c,0x40000100, -+0xc20,0x00000000, -+0xc24,0x00000000, -+0xc28,0x00000000, -+0xc2c,0x00000000, -+0xc30,0x69e9ac44, -+0xc34,0x469652cf, -+0xc38,0x49795994, -+0xc3c,0x0a97971c, -+0xc40,0x1f7c403f, -+0xc44,0x000100b7, -+0xc48,0xec020107, -+0xc4c,0x007f037f, -+0xc50,0x69543420, -+0xc54,0x43bc0094, -+0xc58,0x69543420, -+0xc5c,0x433c0094, -+0xc60,0x00000000, -+0xc64,0x5116848b, -+0xc68,0x47c00bff, -+0xc6c,0x00000036, -+0xc70,0x2c7f000d, -+0xc74,0x2186115b, -+0xc78,0x0000001f, -+0xc7c,0x00b99612, -+0xc80,0x40000100, -+0xc84,0x20f60000, -+0xc88,0x40000100, -+0xc8c,0xa0e40000, -+0xc90,0x00121820, -+0xc94,0x00000000, -+0xc98,0x00121820, -+0xc9c,0x00007f7f, -+0xca0,0x00000000, -+0xca4,0x00000080, -+0xca8,0x00000000, -+0xcac,0x00000000, -+0xcb0,0x00000000, -+0xcb4,0x00000000, -+0xcb8,0x00000000, -+0xcbc,0x28000000, -+0xcc0,0x00000000, -+0xcc4,0x00000000, -+0xcc8,0x00000000, -+0xccc,0x00000000, -+0xcd0,0x00000000, -+0xcd4,0x00000000, -+0xcd8,0x64b22427, -+0xcdc,0x00766932, -+0xce0,0x00222222, -+0xce4,0x00000000, -+0xce8,0x37644302, -+0xcec,0x2f97d40c, -+0xd00,0x00080740, -+0xd04,0x00020403, -+0xd08,0x0000907f, -+0xd0c,0x20010201, -+0xd10,0xa0633333, -+0xd14,0x3333bc43, -+0xd18,0x7a8f5b6b, -+0xd2c,0xcc979975, -+0xd30,0x00000000, -+0xd34,0x80608000, -+0xd38,0x00000000, -+0xd3c,0x00027293, -+0xd40,0x00000000, -+0xd44,0x00000000, -+0xd48,0x00000000, -+0xd4c,0x00000000, -+0xd50,0x6437140a, -+0xd54,0x00000000, -+0xd58,0x00000000, -+0xd5c,0x30032064, -+0xd60,0x4653de68, -+0xd64,0x04518a3c, -+0xd68,0x00002101, -+0xd6c,0x2a201c16, -+0xd70,0x1812362e, -+0xd74,0x322c2220, -+0xd78,0x000e3c24, -+0xe00,0x2a2a2a2a, -+0xe04,0x2a2a2a2a, -+0xe08,0x03902a2a, -+0xe10,0x2a2a2a2a, -+0xe14,0x2a2a2a2a, -+0xe18,0x2a2a2a2a, -+0xe1c,0x2a2a2a2a, -+0xe28,0x00000000, -+0xe30,0x1000dc1f, -+0xe34,0x10008c1f, -+0xe38,0x02140102, -+0xe3c,0x681604c2, -+0xe40,0x01007c00, -+0xe44,0x01004800, -+0xe48,0xfb000000, -+0xe4c,0x000028d1, -+0xe50,0x1000dc1f, -+0xe54,0x10008c1f, -+0xe58,0x02140102, -+0xe5c,0x28160d05, -+0xe60,0x00000010, -+0xe68,0x001b25a4, -+0xe6c,0x63db25a4, -+0xe70,0x63db25a4, -+0xe74,0x0c1b25a4, -+0xe78,0x0c1b25a4, -+0xe7c,0x0c1b25a4, -+0xe80,0x0c1b25a4, -+0xe84,0x63db25a4, -+0xe88,0x0c1b25a4, -+0xe8c,0x63db25a4, -+0xed0,0x63db25a4, -+0xed4,0x63db25a4, -+0xed8,0x63db25a4, -+0xedc,0x001b25a4, -+0xee0,0x001b25a4, -+0xeec,0x6fdb25a4, -+0xf14,0x00000003, -+0xf4c,0x00000000, -+0xf00,0x00000300, -+}; -+ -+u32 Rtl8192CUPHY_REG_1TArray[PHY_REG_1TArrayLength] = { -+0x024,0x0011800f, -+0x028,0x00ffdb83, -+0x800,0x80040000, -+0x804,0x00000001, -+0x808,0x0000fc00, -+0x80c,0x0000000a, -+0x810,0x10000330, //for Broadcom AP IOT -+0x814,0x020c3d10, -+0x818,0x02200385, -+0x81c,0x00000000, -+0x820,0x01000100, -+0x824,0x00390004, -+0x828,0x00000000, -+0x82c,0x00000000, -+0x830,0x00000000, -+0x834,0x00000000, -+0x838,0x00000000, -+0x83c,0x00000000, -+0x840,0x00010000, -+0x844,0x00000000, -+0x848,0x00000000, -+0x84c,0x00000000, -+0x850,0x00000000, -+0x854,0x00000000, -+0x858,0x569a569a, -+0x85c,0x001b25a4, -+0x860,0x66e60230, -+0x864,0x061f0130, -+0x868,0x00000000, -+0x86c,0x32323200, -+0x870,0x07000700, -+0x874,0x22004000, -+0x878,0x00000808, -+0x87c,0x00000000, -+0x880,0xc0083070, -+0x884,0x000004d5, -+0x888,0x00000000, -+0x88c,0xccc000c0, -+0x890,0x00000800, -+0x894,0xfffffffe, -+0x898,0x40302010, -+0x89c,0x00706050, -+0x900,0x00000000, -+0x904,0x00000023, -+0x908,0x00000000, -+0x90c,0x81121111, -+0xa00,0x00d047c8, -+0xa04,0x80ff000c, -+0xa08,0x8c838300, -+0xa0c,0x2e68120f, -+0xa10,0x9500bb78, -+0xa14,0x11144028, -+0xa18,0x00881117, -+0xa1c,0x89140f00, -+0xa20,0x1a1b0000, -+0xa24,0x090e1317, -+0xa28,0x00000204, -+0xa2c,0x00d30000, -+0xa70,0x101fbf00, -+0xa74,0x00000007, -+0xc00,0x48071d40, -+0xc04,0x03a05611, -+0xc08,0x000000e4, -+0xc0c,0x6c6c6c6c, -+0xc10,0x08800000, -+0xc14,0x40000100, -+0xc18,0x08800000, -+0xc1c,0x40000100, -+0xc20,0x00000000, -+0xc24,0x00000000, -+0xc28,0x00000000, -+0xc2c,0x00000000, -+0xc30,0x69e9ac44, -+0xc34,0x469652cf, -+0xc38,0x49795994, -+0xc3c,0x0a97971c, -+0xc40,0x1f7c403f, -+0xc44,0x000100b7, -+0xc48,0xec020107, -+0xc4c,0x007f037f, -+0xc50,0x69543420, -+0xc54,0x43bc0094, -+0xc58,0x69543420, -+0xc5c,0x433c0094, -+0xc60,0x00000000, -+0xc64,0x5116848b, -+0xc68,0x47c00bff, -+0xc6c,0x00000036, -+0xc70,0x2c7f000d, -+0xc74,0x018610db, -+0xc78,0x0000001f, -+0xc7c,0x00b91612, -+0xc80,0x40000100, -+0xc84,0x20f60000, -+0xc88,0x40000100, -+0xc8c,0x20200000, -+0xc90,0x00121820, -+0xc94,0x00000000, -+0xc98,0x00121820, -+0xc9c,0x00007f7f, -+0xca0,0x00000000, -+0xca4,0x00000080, -+0xca8,0x00000000, -+0xcac,0x00000000, -+0xcb0,0x00000000, -+0xcb4,0x00000000, -+0xcb8,0x00000000, -+0xcbc,0x28000000, -+0xcc0,0x00000000, -+0xcc4,0x00000000, -+0xcc8,0x00000000, -+0xccc,0x00000000, -+0xcd0,0x00000000, -+0xcd4,0x00000000, -+0xcd8,0x64b22427, -+0xcdc,0x00766932, -+0xce0,0x00222222, -+0xce4,0x00000000, -+0xce8,0x37644302, -+0xcec,0x2f97d40c, -+0xd00,0x00000740, -+0xd04,0x00020401, -+0xd08,0x0000907f, -+0xd0c,0x20010201, -+0xd10,0xa0633333, -+0xd14,0x3333bc43, -+0xd18,0x7a8f5b6b, -+0xd2c,0xcc979975, -+0xd30,0x00000000, -+0xd34,0x80608000, -+0xd38,0x00000000, -+0xd3c,0x00027293, -+0xd40,0x00000000, -+0xd44,0x00000000, -+0xd48,0x00000000, -+0xd4c,0x00000000, -+0xd50,0x6437140a, -+0xd54,0x00000000, -+0xd58,0x00000000, -+0xd5c,0x30032064, -+0xd60,0x4653de68, -+0xd64,0x04518a3c, -+0xd68,0x00002101, -+0xd6c,0x2a201c16, -+0xd70,0x1812362e, -+0xd74,0x322c2220, -+0xd78,0x000e3c24, -+0xe00,0x2a2a2a2a, -+0xe04,0x2a2a2a2a, -+0xe08,0x03902a2a, -+0xe10,0x2a2a2a2a, -+0xe14,0x2a2a2a2a, -+0xe18,0x2a2a2a2a, -+0xe1c,0x2a2a2a2a, -+0xe28,0x00000000, -+0xe30,0x1000dc1f, -+0xe34,0x10008c1f, -+0xe38,0x02140102, -+0xe3c,0x681604c2, -+0xe40,0x01007c00, -+0xe44,0x01004800, -+0xe48,0xfb000000, -+0xe4c,0x000028d1, -+0xe50,0x1000dc1f, -+0xe54,0x10008c1f, -+0xe58,0x02140102, -+0xe5c,0x28160d05, -+0xe60,0x00000008, -+0xe68,0x001b25a4, -+0xe6c,0x631b25a0, -+0xe70,0x631b25a0, -+0xe74,0x081b25a0, -+0xe78,0x081b25a0, -+0xe7c,0x081b25a0, -+0xe80,0x081b25a0, -+0xe84,0x631b25a0, -+0xe88,0x081b25a0, -+0xe8c,0x631b25a0, -+0xed0,0x631b25a0, -+0xed4,0x631b25a0, -+0xed8,0x631b25a0, -+0xedc,0x001b25a0, -+0xee0,0x001b25a0, -+0xeec,0x6b1b25a0, -+0xf14,0x00000003, -+0xf4c,0x00000000, -+0xf00,0x00000300, -+}; -+ -+u32 Rtl8192CUPHY_ChangeTo_1T1RArray[PHY_ChangeTo_1T1RArrayLength] = { -+0x0, }; -+ -+u32 Rtl8192CUPHY_ChangeTo_1T2RArray[PHY_ChangeTo_1T2RArrayLength] = { -+0x0, }; -+ -+u32 Rtl8192CUPHY_ChangeTo_2T2RArray[PHY_ChangeTo_2T2RArrayLength] = { -+0x0, }; -+ -+u32 Rtl8192CUPHY_REG_Array_PG[PHY_REG_Array_PGLength] = { -+0xe00,0xffffffff,0x07090c0c, -+0xe04,0xffffffff,0x01020405, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x0b0c0c0e, -+0xe14,0xffffffff,0x01030506, -+0xe18,0xffffffff,0x0b0c0d0e, -+0xe1c,0xffffffff,0x01030509, -+0x830,0xffffffff,0x07090c0c, -+0x834,0xffffffff,0x01020405, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x0b0c0d0e, -+0x848,0xffffffff,0x01030509, -+0x84c,0xffffffff,0x0b0c0d0e, -+0x868,0xffffffff,0x01030509, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x04040404, -+0xe04,0xffffffff,0x00020204, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x06060606, -+0xe14,0xffffffff,0x00020406, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x04040404, -+0x834,0xffffffff,0x00020204, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x06060606, -+0x848,0xffffffff,0x00020406, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x04040404, -+0xe04,0xffffffff,0x00020204, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x04040404, -+0x834,0xffffffff,0x00020204, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+}; -+ -+u32 Rtl8192CUPHY_REG_Array_PG_mCard[PHY_REG_Array_PG_mCardLength] = { -+0xe00,0xffffffff,0x0a0c0c0c, -+0xe04,0xffffffff,0x02040608, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x0a0c0d0e, -+0xe14,0xffffffff,0x02040608, -+0xe18,0xffffffff,0x0a0c0d0e, -+0xe1c,0xffffffff,0x02040608, -+0x830,0xffffffff,0x0a0c0c0c, -+0x834,0xffffffff,0x02040608, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x0a0c0d0e, -+0x848,0xffffffff,0x02040608, -+0x84c,0xffffffff,0x0a0c0d0e, -+0x868,0xffffffff,0x02040608, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x04040404, -+0xe04,0xffffffff,0x00020204, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x06060606, -+0xe14,0xffffffff,0x00020406, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x04040404, -+0x834,0xffffffff,0x00020204, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x06060606, -+0x848,0xffffffff,0x00020406, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x04040404, -+0xe04,0xffffffff,0x00020204, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x04040404, -+0x834,0xffffffff,0x00020204, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+}; -+ -+u32 Rtl8192CUPHY_REG_Array_MP[PHY_REG_Array_MPLength] = { -+0xc30,0x69e9ac4a, -+0xc3c,0x0a979718, -+}; -+ -+u32 Rtl8192CUPHY_REG_1T_HPArray[PHY_REG_1T_HPArrayLength] = { -+0x024,0x0011800f, -+0x028,0x00ffdb83, -+0x040,0x000c0004, -+0x800,0x80040000, -+0x804,0x00000001, -+0x808,0x0000fc00, -+0x80c,0x0000000a, -+0x810,0x10000330, //for Broadcom AP IOT -+0x814,0x020c3d10, -+0x818,0x02200385, -+0x81c,0x00000000, -+0x820,0x01000100, -+0x824,0x00390204, -+0x828,0x00000000, -+0x82c,0x00000000, -+0x830,0x00000000, -+0x834,0x00000000, -+0x838,0x00000000, -+0x83c,0x00000000, -+0x840,0x00010000, -+0x844,0x00000000, -+0x848,0x00000000, -+0x84c,0x00000000, -+0x850,0x00000000, -+0x854,0x00000000, -+0x858,0x569a569a, -+0x85c,0x001b25a4, -+0x860,0x66e60230, -+0x864,0x061f0130, -+0x868,0x00000000, -+0x86c,0x20202000, -+0x870,0x03000300, -+0x874,0x22004000, -+0x878,0x00000808, -+0x87c,0x00ffc3f1, -+0x880,0xc0083070, -+0x884,0x000004d5, -+0x888,0x00000000, -+0x88c,0xccc000c0, -+0x890,0x00000800, -+0x894,0xfffffffe, -+0x898,0x40302010, -+0x89c,0x00706050, -+0x900,0x00000000, -+0x904,0x00000023, -+0x908,0x00000000, -+0x90c,0x81121111, -+0xa00,0x00d047c8, -+0xa04,0x80ff000c, -+0xa08,0x8c838300, -+0xa0c,0x2e68120f, -+0xa10,0x9500bb78, -+0xa14,0x11144028, -+0xa18,0x00881117, -+0xa1c,0x89140f00, -+0xa20,0x15160000, -+0xa24,0x070b0f12, -+0xa28,0x00000104, -+0xa2c,0x00d30000, -+0xa70,0x101fbf00, -+0xa74,0x00000007, -+0xc00,0x48071d40, -+0xc04,0x03a05611, -+0xc08,0x000000e4, -+0xc0c,0x6c6c6c6c, -+0xc10,0x08800000, -+0xc14,0x40000100, -+0xc18,0x08800000, -+0xc1c,0x40000100, -+0xc20,0x00000000, -+0xc24,0x00000000, -+0xc28,0x00000000, -+0xc2c,0x00000000, -+0xc30,0x69e9ac44, -+0xc34,0x469652cf, -+0xc38,0x49795994, -+0xc3c,0x0a97971c, -+0xc40,0x1f7c403f, -+0xc44,0x000100b7, -+0xc48,0xec020107, -+0xc4c,0x007f037f, -+0xc50,0x6954342e, -+0xc54,0x43bc0094, -+0xc58,0x6954342f, -+0xc5c,0x433c0094, -+0xc60,0x00000000, -+0xc64,0x5116848b, -+0xc68,0x47c00bff, -+0xc6c,0x00000036, -+0xc70,0x2c46000d, -+0xc74,0x018610db, -+0xc78,0x0000001f, -+0xc7c,0x00b91612, -+0xc80,0x24000090, -+0xc84,0x20f60000, -+0xc88,0x24000090, -+0xc8c,0x20200000, -+0xc90,0x00121820, -+0xc94,0x00000000, -+0xc98,0x00121820, -+0xc9c,0x00007f7f, -+0xca0,0x00000000, -+0xca4,0x00000080, -+0xca8,0x00000000, -+0xcac,0x00000000, -+0xcb0,0x00000000, -+0xcb4,0x00000000, -+0xcb8,0x00000000, -+0xcbc,0x28000000, -+0xcc0,0x00000000, -+0xcc4,0x00000000, -+0xcc8,0x00000000, -+0xccc,0x00000000, -+0xcd0,0x00000000, -+0xcd4,0x00000000, -+0xcd8,0x64b22427, -+0xcdc,0x00766932, -+0xce0,0x00222222, -+0xce4,0x00000000, -+0xce8,0x37644302, -+0xcec,0x2f97d40c, -+0xd00,0x00000740, -+0xd04,0x00020401, -+0xd08,0x0000907f, -+0xd0c,0x20010201, -+0xd10,0xa0633333, -+0xd14,0x3333bc43, -+0xd18,0x7a8f5b6b, -+0xd2c,0xcc979975, -+0xd30,0x00000000, -+0xd34,0x80608000, -+0xd38,0x00000000, -+0xd3c,0x00027293, -+0xd40,0x00000000, -+0xd44,0x00000000, -+0xd48,0x00000000, -+0xd4c,0x00000000, -+0xd50,0x6437140a, -+0xd54,0x00000000, -+0xd58,0x00000000, -+0xd5c,0x30032064, -+0xd60,0x4653de68, -+0xd64,0x04518a3c, -+0xd68,0x00002101, -+0xd6c,0x2a201c16, -+0xd70,0x1812362e, -+0xd74,0x322c2220, -+0xd78,0x000e3c24, -+0xe00,0x24242424, -+0xe04,0x24242424, -+0xe08,0x03902024, -+0xe10,0x24242424, -+0xe14,0x24242424, -+0xe18,0x24242424, -+0xe1c,0x24242424, -+0xe28,0x00000000, -+0xe30,0x1000dc1f, -+0xe34,0x10008c1f, -+0xe38,0x02140102, -+0xe3c,0x681604c2, -+0xe40,0x01007c00, -+0xe44,0x01004800, -+0xe48,0xfb000000, -+0xe4c,0x000028d1, -+0xe50,0x1000dc1f, -+0xe54,0x10008c1f, -+0xe58,0x02140102, -+0xe5c,0x28160d05, -+0xe60,0x00000008, -+0xe68,0x001b25a4, -+0xe6c,0x631b25a0, -+0xe70,0x631b25a0, -+0xe74,0x081b25a0, -+0xe78,0x081b25a0, -+0xe7c,0x081b25a0, -+0xe80,0x081b25a0, -+0xe84,0x631b25a0, -+0xe88,0x081b25a0, -+0xe8c,0x631b25a0, -+0xed0,0x631b25a0, -+0xed4,0x631b25a0, -+0xed8,0x631b25a0, -+0xedc,0x001b25a0, -+0xee0,0x001b25a0, -+0xeec,0x6b1b25a0, -+0xee8,0x31555448, -+0xf14,0x00000003, -+0xf4c,0x00000000, -+0xf00,0x00000300, -+}; -+ -+u32 Rtl8192CUPHY_REG_1T_mCardArray[PHY_REG_1T_mCardArrayLength] = { -+0x024,0x0011800d, -+0x028,0x00ffdb83, -+0x800,0x80040000, -+0x804,0x00000001, -+0x808,0x0000fc00, -+0x80c,0x0000000a, -+0x810,0x10000330, //for Broadcom AP IOT -+0x814,0x020c3d10, -+0x818,0x02200385, -+0x81c,0x00000000, -+0x820,0x01000100, -+0x824,0x00390004, -+0x828,0x00000000, -+0x82c,0x00000000, -+0x830,0x00000000, -+0x834,0x00000000, -+0x838,0x00000000, -+0x83c,0x00000000, -+0x840,0x00010000, -+0x844,0x00000000, -+0x848,0x00000000, -+0x84c,0x00000000, -+0x850,0x00000000, -+0x854,0x00000000, -+0x858,0x569a569a, -+0x85c,0x001b25a4, -+0x860,0x66e60230, -+0x864,0x061f0130, -+0x868,0x00000000, -+0x86c,0x32323200, -+0x870,0x07000700, -+0x874,0x22004000, -+0x878,0x00000808, -+0x87c,0x00000000, -+0x880,0xc0083070, -+0x884,0x000004d5, -+0x888,0x00000000, -+0x88c,0xccc000c0, -+0x890,0x00000800, -+0x894,0xfffffffe, -+0x898,0x40302010, -+0x89c,0x00706050, -+0x900,0x00000000, -+0x904,0x00000023, -+0x908,0x00000000, -+0x90c,0x81121111, -+0xa00,0x00d047c8, -+0xa04,0x80ff000c, -+0xa08,0x8c838300, -+0xa0c,0x2e68120f, -+0xa10,0x9500bb78, -+0xa14,0x11144028, -+0xa18,0x00881117, -+0xa1c,0x89140f00, -+0xa20,0x1a1b0000, -+0xa24,0x090e1317, -+0xa28,0x00000204, -+0xa2c,0x00d30000, -+0xa70,0x101fbf00, -+0xa74,0x00000007, -+0xc00,0x48071d40, -+0xc04,0x03a05611, -+0xc08,0x000000e4, -+0xc0c,0x6c6c6c6c, -+0xc10,0x08800000, -+0xc14,0x40000100, -+0xc18,0x08800000, -+0xc1c,0x40000100, -+0xc20,0x00000000, -+0xc24,0x00000000, -+0xc28,0x00000000, -+0xc2c,0x00000000, -+0xc30,0x69e9ac44, -+0xc34,0x469652cf, -+0xc38,0x49795994, -+0xc3c,0x0a97971c, -+0xc40,0x1f7c403f, -+0xc44,0x000100b7, -+0xc48,0xec020107, -+0xc4c,0x007f037f, -+0xc50,0x69543420, -+0xc54,0x43bc0094, -+0xc58,0x69543420, -+0xc5c,0x433c0094, -+0xc60,0x00000000, -+0xc64,0x5116848b, -+0xc68,0x47c00bff, -+0xc6c,0x00000036, -+0xc70,0x2c7f000d, -+0xc74,0x018610db, -+0xc78,0x0000001f, -+0xc7c,0x00b91612, -+0xc80,0x40000100, -+0xc84,0x20f60000, -+0xc88,0x40000100, -+0xc8c,0x20200000, -+0xc90,0x00121820, -+0xc94,0x00000000, -+0xc98,0x00121820, -+0xc9c,0x00007f7f, -+0xca0,0x00000000, -+0xca4,0x00000080, -+0xca8,0x00000000, -+0xcac,0x00000000, -+0xcb0,0x00000000, -+0xcb4,0x00000000, -+0xcb8,0x00000000, -+0xcbc,0x28000000, -+0xcc0,0x00000000, -+0xcc4,0x00000000, -+0xcc8,0x00000000, -+0xccc,0x00000000, -+0xcd0,0x00000000, -+0xcd4,0x00000000, -+0xcd8,0x64b22427, -+0xcdc,0x00766932, -+0xce0,0x00222222, -+0xce4,0x00000000, -+0xce8,0x37644302, -+0xcec,0x2f97d40c, -+0xd00,0x00000740, -+0xd04,0x00020401, -+0xd08,0x0000907f, -+0xd0c,0x20010201, -+0xd10,0xa0633333, -+0xd14,0x3333bc43, -+0xd18,0x7a8f5b6b, -+0xd2c,0xcc979975, -+0xd30,0x00000000, -+0xd34,0x80608000, -+0xd38,0x00000000, -+0xd3c,0x00027293, -+0xd40,0x00000000, -+0xd44,0x00000000, -+0xd48,0x00000000, -+0xd4c,0x00000000, -+0xd50,0x6437140a, -+0xd54,0x00000000, -+0xd58,0x00000000, -+0xd5c,0x30032064, -+0xd60,0x4653de68, -+0xd64,0x04518a3c, -+0xd68,0x00002101, -+0xd6c,0x2a201c16, -+0xd70,0x1812362e, -+0xd74,0x322c2220, -+0xd78,0x000e3c24, -+0xe00,0x2a2a2a2a, -+0xe04,0x2a2a2a2a, -+0xe08,0x03902a2a, -+0xe10,0x2a2a2a2a, -+0xe14,0x2a2a2a2a, -+0xe18,0x2a2a2a2a, -+0xe1c,0x2a2a2a2a, -+0xe28,0x00000000, -+0xe30,0x1000dc1f, -+0xe34,0x10008c1f, -+0xe38,0x02140102, -+0xe3c,0x681604c2, -+0xe40,0x01007c00, -+0xe44,0x01004800, -+0xe48,0xfb000000, -+0xe4c,0x000028d1, -+0xe50,0x1000dc1f, -+0xe54,0x10008c1f, -+0xe58,0x02140102, -+0xe5c,0x28160d05, -+0xe60,0x00000008, -+0xe68,0x001b25a4, -+0xe6c,0x631b25a0, -+0xe70,0x631b25a0, -+0xe74,0x081b25a0, -+0xe78,0x081b25a0, -+0xe7c,0x081b25a0, -+0xe80,0x081b25a0, -+0xe84,0x631b25a0, -+0xe88,0x081b25a0, -+0xe8c,0x631b25a0, -+0xed0,0x631b25a0, -+0xed4,0x631b25a0, -+0xed8,0x631b25a0, -+0xedc,0x001b25a0, -+0xee0,0x001b25a0, -+0xeec,0x6b1b25a0, -+0xf14,0x00000003, -+0xf4c,0x00000000, -+0xf00,0x00000300, -+}; -+ -+u32 Rtl8192CUPHY_REG_2T_mCardArray[PHY_REG_2T_mCardArrayLength] = { -+0x024,0x0011800d, -+0x028,0x00ffdb83, -+0x800,0x80040002, -+0x804,0x00000003, -+0x808,0x0000fc00, -+0x80c,0x0000000a, -+0x810,0x10000330, //for Broadcom AP IOT -+0x814,0x020c3d10, -+0x818,0x02200385, -+0x81c,0x00000000, -+0x820,0x01000100, -+0x824,0x00390004, -+0x828,0x01000100, -+0x82c,0x00390004, -+0x830,0x27272727, -+0x834,0x27272727, -+0x838,0x27272727, -+0x83c,0x27272727, -+0x840,0x00010000, -+0x844,0x00010000, -+0x848,0x27272727, -+0x84c,0x27272727, -+0x850,0x00000000, -+0x854,0x00000000, -+0x858,0x569a569a, -+0x85c,0x0c1b25a4, -+0x860,0x66e60230, -+0x864,0x061f0130, -+0x868,0x27272727, -+0x86c,0x2b2b2b27, -+0x870,0x07000700, -+0x874,0x22184000, -+0x878,0x08080808, -+0x87c,0x00000000, -+0x880,0xc0083070, -+0x884,0x000004d5, -+0x888,0x00000000, -+0x88c,0xcc0000c0, -+0x890,0x00000800, -+0x894,0xfffffffe, -+0x898,0x40302010, -+0x89c,0x00706050, -+0x900,0x00000000, -+0x904,0x00000023, -+0x908,0x00000000, -+0x90c,0x81121313, -+0xa00,0x00d047c8, -+0xa04,0x80ff000c, -+0xa08,0x8c838300, -+0xa0c,0x2e68120f, -+0xa10,0x9500bb78, -+0xa14,0x11144028, -+0xa18,0x00881117, -+0xa1c,0x89140f00, -+0xa20,0x1a1b0000, -+0xa24,0x090e1317, -+0xa28,0x00000204, -+0xa2c,0x00d30000, -+0xa70,0x101fbf00, -+0xa74,0x00000007, -+0xc00,0x48071d40, -+0xc04,0x03a05633, -+0xc08,0x000000e4, -+0xc0c,0x6c6c6c6c, -+0xc10,0x08800000, -+0xc14,0x40000100, -+0xc18,0x08800000, -+0xc1c,0x40000100, -+0xc20,0x00000000, -+0xc24,0x00000000, -+0xc28,0x00000000, -+0xc2c,0x00000000, -+0xc30,0x69e9ac44, -+0xc34,0x469652cf, -+0xc38,0x49795994, -+0xc3c,0x0a97971c, -+0xc40,0x1f7c403f, -+0xc44,0x000100b7, -+0xc48,0xec020107, -+0xc4c,0x007f037f, -+0xc50,0x69543420, -+0xc54,0x43bc0094, -+0xc58,0x69543420, -+0xc5c,0x433c0094, -+0xc60,0x00000000, -+0xc64,0x5116848b, -+0xc68,0x47c00bff, -+0xc6c,0x00000036, -+0xc70,0x2c7f000d, -+0xc74,0x218610db, -+0xc78,0x0000001f, -+0xc7c,0x00b91612, -+0xc80,0x40000100, -+0xc84,0x20f60000, -+0xc88,0x40000100, -+0xc8c,0xa0e40000, -+0xc90,0x00121820, -+0xc94,0x00000000, -+0xc98,0x00121820, -+0xc9c,0x00007f7f, -+0xca0,0x00000000, -+0xca4,0x00000080, -+0xca8,0x00000000, -+0xcac,0x00000000, -+0xcb0,0x00000000, -+0xcb4,0x00000000, -+0xcb8,0x00000000, -+0xcbc,0x28000000, -+0xcc0,0x00000000, -+0xcc4,0x00000000, -+0xcc8,0x00000000, -+0xccc,0x00000000, -+0xcd0,0x00000000, -+0xcd4,0x00000000, -+0xcd8,0x64b22427, -+0xcdc,0x00766932, -+0xce0,0x00222222, -+0xce4,0x00000000, -+0xce8,0x37644302, -+0xcec,0x2f97d40c, -+0xd00,0x00080740, -+0xd04,0x00020403, -+0xd08,0x0000907f, -+0xd0c,0x20010201, -+0xd10,0xa0633333, -+0xd14,0x3333bc43, -+0xd18,0x7a8f5b6b, -+0xd2c,0xcc979975, -+0xd30,0x00000000, -+0xd34,0x80608000, -+0xd38,0x00000000, -+0xd3c,0x00027293, -+0xd40,0x00000000, -+0xd44,0x00000000, -+0xd48,0x00000000, -+0xd4c,0x00000000, -+0xd50,0x6437140a, -+0xd54,0x00000000, -+0xd58,0x00000000, -+0xd5c,0x30032064, -+0xd60,0x4653de68, -+0xd64,0x04518a3c, -+0xd68,0x00002101, -+0xd6c,0x2a201c16, -+0xd70,0x1812362e, -+0xd74,0x322c2220, -+0xd78,0x000e3c24, -+0xe00,0x2a2a2a2a, -+0xe04,0x2a2a2a2a, -+0xe08,0x03902a2a, -+0xe10,0x2a2a2a2a, -+0xe14,0x2a2a2a2a, -+0xe18,0x2a2a2a2a, -+0xe1c,0x2a2a2a2a, -+0xe28,0x00000000, -+0xe30,0x1000dc1f, -+0xe34,0x10008c1f, -+0xe38,0x02140102, -+0xe3c,0x681604c2, -+0xe40,0x01007c00, -+0xe44,0x01004800, -+0xe48,0xfb000000, -+0xe4c,0x000028d1, -+0xe50,0x1000dc1f, -+0xe54,0x10008c1f, -+0xe58,0x02140102, -+0xe5c,0x28160d05, -+0xe60,0x00000010, -+0xe68,0x001b25a4, -+0xe6c,0x63db25a4, -+0xe70,0x63db25a4, -+0xe74,0x0c1b25a4, -+0xe78,0x0c1b25a4, -+0xe7c,0x0c1b25a4, -+0xe80,0x0c1b25a4, -+0xe84,0x63db25a4, -+0xe88,0x0c1b25a4, -+0xe8c,0x63db25a4, -+0xed0,0x63db25a4, -+0xed4,0x63db25a4, -+0xed8,0x63db25a4, -+0xedc,0x001b25a4, -+0xee0,0x001b25a4, -+0xeec,0x6fdb25a4, -+0xf14,0x00000003, -+0xf4c,0x00000000, -+0xf00,0x00000300, -+}; -+ -+u32 Rtl8192CUPHY_REG_Array_PG_HP[PHY_REG_Array_PG_HPLength] = { -+0xe00,0xffffffff,0x06080808, -+0xe04,0xffffffff,0x00040406, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x04060608, -+0xe14,0xffffffff,0x00020204, -+0xe18,0xffffffff,0x04060608, -+0xe1c,0xffffffff,0x00020204, -+0x830,0xffffffff,0x06080808, -+0x834,0xffffffff,0x00040406, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x04060608, -+0x848,0xffffffff,0x00020204, -+0x84c,0xffffffff,0x04060608, -+0x868,0xffffffff,0x00020204, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+0xe00,0xffffffff,0x00000000, -+0xe04,0xffffffff,0x00000000, -+0xe08,0x0000ff00,0x00000000, -+0x86c,0xffffff00,0x00000000, -+0xe10,0xffffffff,0x00000000, -+0xe14,0xffffffff,0x00000000, -+0xe18,0xffffffff,0x00000000, -+0xe1c,0xffffffff,0x00000000, -+0x830,0xffffffff,0x00000000, -+0x834,0xffffffff,0x00000000, -+0x838,0xffffff00,0x00000000, -+0x86c,0x000000ff,0x00000000, -+0x83c,0xffffffff,0x00000000, -+0x848,0xffffffff,0x00000000, -+0x84c,0xffffffff,0x00000000, -+0x868,0xffffffff,0x00000000, -+}; -+ -+u32 Rtl8192CURadioA_2TArray[RadioA_2TArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb1, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e52c, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x019,0x00000000, -+0x01a,0x00010255, -+0x01b,0x00060a00, -+0x01c,0x000fc378, -+0x01d,0x000a1250, -+0x01e,0x0004445f, -+0x01f,0x00080001, -+0x020,0x0000b614, -+0x021,0x0006c000, -+0x022,0x00000000, -+0x023,0x00001558, -+0x024,0x00000060, -+0x025,0x00000483, -+0x026,0x0004f000, -+0x027,0x000ec7d9, -+0x028,0x000577c0, -+0x029,0x00004783, -+0x02a,0x00000001, -+0x02b,0x00021334, -+0x02a,0x00000000, -+0x02b,0x00000054, -+0x02a,0x00000001, -+0x02b,0x00000808, -+0x02b,0x00053333, -+0x02c,0x0000000c, -+0x02a,0x00000002, -+0x02b,0x00000808, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000003, -+0x02b,0x00000808, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000004, -+0x02b,0x00000808, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x00000005, -+0x02b,0x00000808, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x00000006, -+0x02b,0x00000709, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000007, -+0x02b,0x00000709, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000008, -+0x02b,0x0000060a, -+0x02b,0x0004b333, -+0x02c,0x0000000d, -+0x02a,0x00000009, -+0x02b,0x0000060a, -+0x02b,0x00053333, -+0x02c,0x0000000d, -+0x02a,0x0000000a, -+0x02b,0x0000060a, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x0000000b, -+0x02b,0x0000060a, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x0000000c, -+0x02b,0x0000060a, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x0000000d, -+0x02b,0x0000060a, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x0000000e, -+0x02b,0x0000050b, -+0x02b,0x00066666, -+0x02c,0x0000001a, -+0x02a,0x000e0000, -+0x010,0x0004000f, -+0x011,0x000e31fc, -+0x010,0x0006000f, -+0x011,0x000ff9f8, -+0x010,0x0002000f, -+0x011,0x000203f9, -+0x010,0x0003000f, -+0x011,0x000ff500, -+0x010,0x00000000, -+0x011,0x00000000, -+0x010,0x0008000f, -+0x011,0x0003f100, -+0x010,0x0009000f, -+0x011,0x00023100, -+0x012,0x00032000, -+0x012,0x00071000, -+0x012,0x000b0000, -+0x012,0x000fc000, -+0x013,0x000287b3, -+0x013,0x000244b7, -+0x013,0x000204ab, -+0x013,0x0001c49f, -+0x013,0x00018493, -+0x013,0x0001429b, -+0x013,0x00010299, -+0x013,0x0000c29c, -+0x013,0x000081a0, -+0x013,0x000040ac, -+0x013,0x00000020, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f424, -+0x015,0x0004f424, -+0x015,0x0008f424, -+0x015,0x000cf424, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+0x000,0x00010159, -+0x018,0x0000f401, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01f,0x00080003, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01e,0x00044457, -+0x01f,0x00080000, -+0x000,0x00030159, -+}; -+ -+u32 Rtl8192CURadioB_2TArray[RadioB_2TArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb1, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e52c, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x012,0x00032000, -+0x012,0x00071000, -+0x012,0x000b0000, -+0x012,0x000fc000, -+0x013,0x000287af, -+0x013,0x000244b7, -+0x013,0x000204ab, -+0x013,0x0001c49f, -+0x013,0x00018493, -+0x013,0x00014297, -+0x013,0x00010295, -+0x013,0x0000c298, -+0x013,0x0000819c, -+0x013,0x000040a8, -+0x013,0x0000001c, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f424, -+0x015,0x0004f424, -+0x015,0x0008f424, -+0x015,0x000cf424, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+}; -+ -+u32 Rtl8192CURadioA_1TArray[RadioA_1TArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb1, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e52c, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x019,0x00000000, -+0x01a,0x00010255, -+0x01b,0x00060a00, -+0x01c,0x000fc378, -+0x01d,0x000a1250, -+0x01e,0x0004445f, -+0x01f,0x00080001, -+0x020,0x0000b614, -+0x021,0x0006c000, -+0x022,0x00000000, -+0x023,0x00001558, -+0x024,0x00000060, -+0x025,0x00000483, -+0x026,0x0004f000, -+0x027,0x000ec7d9, -+0x028,0x000577c0, -+0x029,0x00004783, -+0x02a,0x00000001, -+0x02b,0x00021334, -+0x02a,0x00000000, -+0x02b,0x00000054, -+0x02a,0x00000001, -+0x02b,0x00000808, -+0x02b,0x00053333, -+0x02c,0x0000000c, -+0x02a,0x00000002, -+0x02b,0x00000808, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000003, -+0x02b,0x00000808, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000004, -+0x02b,0x00000808, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x00000005, -+0x02b,0x00000808, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x00000006, -+0x02b,0x00000709, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000007, -+0x02b,0x00000709, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000008, -+0x02b,0x0000060a, -+0x02b,0x0004b333, -+0x02c,0x0000000d, -+0x02a,0x00000009, -+0x02b,0x0000060a, -+0x02b,0x00053333, -+0x02c,0x0000000d, -+0x02a,0x0000000a, -+0x02b,0x0000060a, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x0000000b, -+0x02b,0x0000060a, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x0000000c, -+0x02b,0x0000060a, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x0000000d, -+0x02b,0x0000060a, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x0000000e, -+0x02b,0x0000050b, -+0x02b,0x00066666, -+0x02c,0x0000001a, -+0x02a,0x000e0000, -+0x010,0x0004000f, -+0x011,0x000e31fc, -+0x010,0x0006000f, -+0x011,0x000ff9f8, -+0x010,0x0002000f, -+0x011,0x000203f9, -+0x010,0x0003000f, -+0x011,0x000ff500, -+0x010,0x00000000, -+0x011,0x00000000, -+0x010,0x0008000f, -+0x011,0x0003f100, -+0x010,0x0009000f, -+0x011,0x00023100, -+0x012,0x00032000, -+0x012,0x00071000, -+0x012,0x000b0000, -+0x012,0x000fc000, -+0x013,0x000287b3, -+0x013,0x000244b7, -+0x013,0x000204ab, -+0x013,0x0001c49f, -+0x013,0x00018493, -+0x013,0x0001429b, -+0x013,0x00010299, -+0x013,0x0000c29c, -+0x013,0x000081a0, -+0x013,0x000040ac, -+0x013,0x00000020, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f405, -+0x015,0x0004f405, -+0x015,0x0008f405, -+0x015,0x000cf405, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+0x000,0x00010159, -+0x018,0x0000f401, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01f,0x00080003, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01e,0x00044457, -+0x01f,0x00080000, -+0x000,0x00030159, -+}; -+ -+u32 Rtl8192CURadioB_1TArray[RadioB_1TArrayLength] = { -+0x0, }; -+ -+ -+u32 Rtl8192CURadioA_2T_mCardArray[RadioA_2T_mCardArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb1, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e52c, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x019,0x00000000, -+0x01a,0x00010255, -+0x01b,0x00060a00, -+0x01c,0x000fc378, -+0x01d,0x000a1250, -+0x01e,0x0004445f, -+0x01f,0x00080001, -+0x020,0x0000b614, -+0x021,0x0006c000, -+0x022,0x00000000, -+0x023,0x00001558, -+0x024,0x00000060, -+0x025,0x00000483, -+0x026,0x0004f000, -+0x027,0x000ec7d9, -+0x028,0x000577c0, -+0x029,0x00004783, -+0x02a,0x00000001, -+0x02b,0x00021334, -+0x02a,0x00000000, -+0x02b,0x00000054, -+0x02a,0x00000001, -+0x02b,0x00000808, -+0x02b,0x00053333, -+0x02c,0x0000000c, -+0x02a,0x00000002, -+0x02b,0x00000808, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000003, -+0x02b,0x00000808, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000004, -+0x02b,0x00000808, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x00000005, -+0x02b,0x00000808, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x00000006, -+0x02b,0x00000709, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000007, -+0x02b,0x00000709, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000008, -+0x02b,0x0000060a, -+0x02b,0x0004b333, -+0x02c,0x0000000d, -+0x02a,0x00000009, -+0x02b,0x0000060a, -+0x02b,0x00053333, -+0x02c,0x0000000d, -+0x02a,0x0000000a, -+0x02b,0x0000060a, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x0000000b, -+0x02b,0x0000060a, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x0000000c, -+0x02b,0x0000060a, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x0000000d, -+0x02b,0x0000060a, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x0000000e, -+0x02b,0x0000050b, -+0x02b,0x00066666, -+0x02c,0x0000001a, -+0x02a,0x000e0000, -+0x010,0x0004000f, -+0x011,0x000e31fc, -+0x010,0x0006000f, -+0x011,0x000ff9f8, -+0x010,0x0002000f, -+0x011,0x000203f9, -+0x010,0x0003000f, -+0x011,0x000ff500, -+0x010,0x00000000, -+0x011,0x00000000, -+0x010,0x0008000f, -+0x011,0x0003f100, -+0x010,0x0009000f, -+0x011,0x00023100, -+0x012,0x00032000, -+0x012,0x00071000, -+0x012,0x000b0000, -+0x012,0x000fc000, -+0x013,0x000287b3, -+0x013,0x000244b7, -+0x013,0x000204ab, -+0x013,0x0001c49f, -+0x013,0x00018493, -+0x013,0x0001429b, -+0x013,0x00010299, -+0x013,0x0000c29c, -+0x013,0x000081a0, -+0x013,0x000040ac, -+0x013,0x00000020, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f424, -+0x015,0x0004f424, -+0x015,0x0008f424, -+0x015,0x000cf424, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+0x000,0x00010159, -+0x018,0x0000f401, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01f,0x00080003, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01e,0x00044457, -+0x01f,0x00080000, -+0x000,0x00030159, -+}; -+ -+u32 Rtl8192CURadioB_2T_mCardArray[RadioB_2T_mCardArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb1, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e52c, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x012,0x00032000, -+0x012,0x00071000, -+0x012,0x000b0000, -+0x012,0x000fc000, -+0x013,0x000287af, -+0x013,0x000244b7, -+0x013,0x000204ab, -+0x013,0x0001c49f, -+0x013,0x00018493, -+0x013,0x00014297, -+0x013,0x00010295, -+0x013,0x0000c298, -+0x013,0x0000819c, -+0x013,0x000040a8, -+0x013,0x0000001c, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f424, -+0x015,0x0004f424, -+0x015,0x0008f424, -+0x015,0x000cf424, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+}; -+ -+u32 Rtl8192CURadioA_1T_mCardArray[RadioA_1T_mCardArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb1, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e52c, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x019,0x00000000, -+0x01a,0x00010255, -+0x01b,0x00060a00, -+0x01c,0x000fc378, -+0x01d,0x000a1250, -+0x01e,0x0004445f, -+0x01f,0x00080001, -+0x020,0x0000b614, -+0x021,0x0006c000, -+0x022,0x00000000, -+0x023,0x00001558, -+0x024,0x00000060, -+0x025,0x00000483, -+0x026,0x0004f200, -+0x027,0x000ec7d9, -+0x028,0x000577c0, -+0x029,0x00004783, -+0x02a,0x00000001, -+0x02b,0x00021334, -+0x02a,0x00000000, -+0x02b,0x00000054, -+0x02a,0x00000001, -+0x02b,0x00000808, -+0x02b,0x00053333, -+0x02c,0x0000000c, -+0x02a,0x00000002, -+0x02b,0x00000808, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000003, -+0x02b,0x00000808, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000004, -+0x02b,0x00000808, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x00000005, -+0x02b,0x00000808, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x00000006, -+0x02b,0x00000709, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000007, -+0x02b,0x00000709, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000008, -+0x02b,0x0000060a, -+0x02b,0x0004b333, -+0x02c,0x0000000d, -+0x02a,0x00000009, -+0x02b,0x0000060a, -+0x02b,0x00053333, -+0x02c,0x0000000d, -+0x02a,0x0000000a, -+0x02b,0x0000060a, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x0000000b, -+0x02b,0x0000060a, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x0000000c, -+0x02b,0x0000060a, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x0000000d, -+0x02b,0x0000060a, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x0000000e, -+0x02b,0x0000050b, -+0x02b,0x00066666, -+0x02c,0x0000001a, -+0x02a,0x000e0000, -+0x010,0x0004000f, -+0x011,0x000e31fc, -+0x010,0x0006000f, -+0x011,0x000ff9f8, -+0x010,0x0002000f, -+0x011,0x000203f9, -+0x010,0x0003000f, -+0x011,0x000ff500, -+0x010,0x00000000, -+0x011,0x00000000, -+0x010,0x0008000f, -+0x011,0x0003f100, -+0x010,0x0009000f, -+0x011,0x00023100, -+0x012,0x00032000, -+0x012,0x00071000, -+0x012,0x000b0000, -+0x012,0x000fc000, -+0x013,0x000287b3, -+0x013,0x000244b7, -+0x013,0x000204ab, -+0x013,0x0001c49f, -+0x013,0x00018493, -+0x013,0x0001429b, -+0x013,0x00010299, -+0x013,0x0000c29c, -+0x013,0x000081a0, -+0x013,0x000040ac, -+0x013,0x00000020, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f424, -+0x015,0x0004f424, -+0x015,0x0008f424, -+0x015,0x000cf424, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+0x000,0x00010159, -+0x018,0x0000f401, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01f,0x00080003, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01e,0x00044457, -+0x01f,0x00080000, -+0x000,0x00030159, -+}; -+ -+u32 Rtl8192CURadioB_1T_mCardArray[RadioB_1T_mCardArrayLength] = { -+0x0, }; -+ -+u32 Rtl8192CURadioA_1T_HPArray[RadioA_1T_HPArrayLength] = { -+0x000,0x00030159, -+0x001,0x00031284, -+0x002,0x00098000, -+0x003,0x00018c63, -+0x004,0x000210e7, -+0x009,0x0002044f, -+0x00a,0x0001adb0, -+0x00b,0x00054867, -+0x00c,0x0008992e, -+0x00d,0x0000e529, -+0x00e,0x00039ce7, -+0x00f,0x00000451, -+0x019,0x00000000, -+0x01a,0x00000255, -+0x01b,0x00060a00, -+0x01c,0x000fc378, -+0x01d,0x000a1250, -+0x01e,0x0004445f, -+0x01f,0x00080001, -+0x020,0x0000b614, -+0x021,0x0006c000, -+0x022,0x0000083c, -+0x023,0x00001558, -+0x024,0x00000060, -+0x025,0x00000483, -+0x026,0x0004f000, -+0x027,0x000ec7d9, -+0x028,0x000977c0, -+0x029,0x00004783, -+0x02a,0x00000001, -+0x02b,0x00021334, -+0x02a,0x00000000, -+0x02b,0x00000054, -+0x02a,0x00000001, -+0x02b,0x00000808, -+0x02b,0x00053333, -+0x02c,0x0000000c, -+0x02a,0x00000002, -+0x02b,0x00000808, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000003, -+0x02b,0x00000808, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000004, -+0x02b,0x00000808, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x00000005, -+0x02b,0x00000808, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x00000006, -+0x02b,0x00000709, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x00000007, -+0x02b,0x00000709, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x00000008, -+0x02b,0x0000060a, -+0x02b,0x0004b333, -+0x02c,0x0000000d, -+0x02a,0x00000009, -+0x02b,0x0000060a, -+0x02b,0x00053333, -+0x02c,0x0000000d, -+0x02a,0x0000000a, -+0x02b,0x0000060a, -+0x02b,0x0005b333, -+0x02c,0x0000000d, -+0x02a,0x0000000b, -+0x02b,0x0000060a, -+0x02b,0x00063333, -+0x02c,0x0000000d, -+0x02a,0x0000000c, -+0x02b,0x0000060a, -+0x02b,0x0006b333, -+0x02c,0x0000000d, -+0x02a,0x0000000d, -+0x02b,0x0000060a, -+0x02b,0x00073333, -+0x02c,0x0000000d, -+0x02a,0x0000000e, -+0x02b,0x0000050b, -+0x02b,0x00066666, -+0x02c,0x0000001a, -+0x02a,0x000e0000, -+0x010,0x0004000f, -+0x011,0x000e31fc, -+0x010,0x0006000f, -+0x011,0x000ff9f8, -+0x010,0x0002000f, -+0x011,0x000203f9, -+0x010,0x0003000f, -+0x011,0x000ff500, -+0x010,0x00000000, -+0x011,0x00000000, -+0x010,0x0008000f, -+0x011,0x0003f100, -+0x010,0x0009000f, -+0x011,0x00023100, -+0x012,0x000d8000, -+0x012,0x00090000, -+0x012,0x00051000, -+0x012,0x00012000, -+0x013,0x00028fb4, -+0x013,0x00024fa8, -+0x013,0x000207a4, -+0x013,0x0001c3b0, -+0x013,0x000183a4, -+0x013,0x00014398, -+0x013,0x000101a4, -+0x013,0x0000c198, -+0x013,0x000080a4, -+0x013,0x00004098, -+0x013,0x00000000, -+0x014,0x0001944c, -+0x014,0x00059444, -+0x014,0x0009944c, -+0x014,0x000d9444, -+0x015,0x0000f405, -+0x015,0x0004f405, -+0x015,0x0008f405, -+0x015,0x000cf405, -+0x016,0x000e0330, -+0x016,0x000a0330, -+0x016,0x00060330, -+0x016,0x00020330, -+0x000,0x00010159, -+0x018,0x0000f401, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01f,0x00080003, -+0x0fe,0x00000000, -+0x0fe,0x00000000, -+0x01e,0x00044457, -+0x01f,0x00080000, -+0x000,0x00030159, -+}; -+ -+u32 Rtl8192CURadioB_GM_Array[RadioB_GM_ArrayLength] = { -+0x0, }; -+ -+// MAC reg V14 - 2011-11-23 -+u32 Rtl8192CUMAC_2T_Array[MAC_2T_ArrayLength] = { -+0x420,0x00000080, -+0x423,0x00000000, -+0x430,0x00000000, -+0x431,0x00000000, -+0x432,0x00000000, -+0x433,0x00000001, -+0x434,0x00000004, -+0x435,0x00000005, -+0x436,0x00000006, -+0x437,0x00000007, -+0x438,0x00000000, -+0x439,0x00000000, -+0x43a,0x00000000, -+0x43b,0x00000001, -+0x43c,0x00000004, -+0x43d,0x00000005, -+0x43e,0x00000006, -+0x43f,0x00000007, -+0x440,0x0000005d, -+0x441,0x00000001, -+0x442,0x00000000, -+0x444,0x00000015, -+0x445,0x000000f0, -+0x446,0x0000000f, -+0x447,0x00000000, -+0x458,0x00000041, -+0x459,0x000000a8, -+0x45a,0x00000072, -+0x45b,0x000000b9, -+0x460,0x00000066, -+0x461,0x00000066, -+0x462,0x00000008, -+0x463,0x00000003, -+0x4c8,0x000000ff, -+0x4c9,0x00000008, -+0x4cc,0x000000ff, -+0x4cd,0x000000ff, -+0x4ce,0x00000001, -+0x500,0x00000026, -+0x501,0x000000a2, -+0x502,0x0000002f, -+0x503,0x00000000, -+0x504,0x00000028, -+0x505,0x000000a3, -+0x506,0x0000005e, -+0x507,0x00000000, -+0x508,0x0000002b, -+0x509,0x000000a4, -+0x50a,0x0000005e, -+0x50b,0x00000000, -+0x50c,0x0000004f, -+0x50d,0x000000a4, -+0x50e,0x00000000, -+0x50f,0x00000000, -+0x512,0x0000001c, -+0x514,0x0000000a, -+0x515,0x00000010, -+0x516,0x0000000a, -+0x517,0x00000010, -+0x51a,0x00000016, -+0x524,0x0000000f, -+0x525,0x0000004f, -+0x546,0x00000040, -+0x547,0x00000000, -+0x550,0x00000010, -+0x551,0x00000010, -+0x559,0x00000002, -+0x55a,0x00000002, -+0x55d,0x000000ff, -+0x605,0x00000030, -+0x608,0x0000000e, -+0x609,0x0000002a, -+0x652,0x00000020, -+0x652,0x00000020, -+0x63c,0x00000008, -+0x63d,0x00000008, -+0x63e,0x0000000c, -+0x63f,0x0000000c, -+0x66e,0x00000005, -+0x700,0x00000021, -+0x701,0x00000043, -+0x702,0x00000065, -+0x703,0x00000087, -+0x708,0x00000021, -+0x709,0x00000043, -+0x70a,0x00000065, -+0x70b,0x00000087, -+}; -+ -+u32 Rtl8192CUMACPHY_Array_PG[MACPHY_Array_PGLength] = { -+0x0, }; -+ -+u32 Rtl8192CUAGCTAB_2TArray[AGCTAB_2TArrayLength] = { -+0xc78,0x7b000001, -+0xc78,0x7b010001, -+0xc78,0x7b020001, -+0xc78,0x7b030001, -+0xc78,0x7b040001, -+0xc78,0x7b050001, -+0xc78,0x7a060001, -+0xc78,0x79070001, -+0xc78,0x78080001, -+0xc78,0x77090001, -+0xc78,0x760a0001, -+0xc78,0x750b0001, -+0xc78,0x740c0001, -+0xc78,0x730d0001, -+0xc78,0x720e0001, -+0xc78,0x710f0001, -+0xc78,0x70100001, -+0xc78,0x6f110001, -+0xc78,0x6e120001, -+0xc78,0x6d130001, -+0xc78,0x6c140001, -+0xc78,0x6b150001, -+0xc78,0x6a160001, -+0xc78,0x69170001, -+0xc78,0x68180001, -+0xc78,0x67190001, -+0xc78,0x661a0001, -+0xc78,0x651b0001, -+0xc78,0x641c0001, -+0xc78,0x631d0001, -+0xc78,0x621e0001, -+0xc78,0x611f0001, -+0xc78,0x60200001, -+0xc78,0x49210001, -+0xc78,0x48220001, -+0xc78,0x47230001, -+0xc78,0x46240001, -+0xc78,0x45250001, -+0xc78,0x44260001, -+0xc78,0x43270001, -+0xc78,0x42280001, -+0xc78,0x41290001, -+0xc78,0x402a0001, -+0xc78,0x262b0001, -+0xc78,0x252c0001, -+0xc78,0x242d0001, -+0xc78,0x232e0001, -+0xc78,0x222f0001, -+0xc78,0x21300001, -+0xc78,0x20310001, -+0xc78,0x06320001, -+0xc78,0x05330001, -+0xc78,0x04340001, -+0xc78,0x03350001, -+0xc78,0x02360001, -+0xc78,0x01370001, -+0xc78,0x00380001, -+0xc78,0x00390001, -+0xc78,0x003a0001, -+0xc78,0x003b0001, -+0xc78,0x003c0001, -+0xc78,0x003d0001, -+0xc78,0x003e0001, -+0xc78,0x003f0001, -+0xc78,0x7b400001, -+0xc78,0x7b410001, -+0xc78,0x7b420001, -+0xc78,0x7b430001, -+0xc78,0x7b440001, -+0xc78,0x7b450001, -+0xc78,0x7a460001, -+0xc78,0x79470001, -+0xc78,0x78480001, -+0xc78,0x77490001, -+0xc78,0x764a0001, -+0xc78,0x754b0001, -+0xc78,0x744c0001, -+0xc78,0x734d0001, -+0xc78,0x724e0001, -+0xc78,0x714f0001, -+0xc78,0x70500001, -+0xc78,0x6f510001, -+0xc78,0x6e520001, -+0xc78,0x6d530001, -+0xc78,0x6c540001, -+0xc78,0x6b550001, -+0xc78,0x6a560001, -+0xc78,0x69570001, -+0xc78,0x68580001, -+0xc78,0x67590001, -+0xc78,0x665a0001, -+0xc78,0x655b0001, -+0xc78,0x645c0001, -+0xc78,0x635d0001, -+0xc78,0x625e0001, -+0xc78,0x615f0001, -+0xc78,0x60600001, -+0xc78,0x49610001, -+0xc78,0x48620001, -+0xc78,0x47630001, -+0xc78,0x46640001, -+0xc78,0x45650001, -+0xc78,0x44660001, -+0xc78,0x43670001, -+0xc78,0x42680001, -+0xc78,0x41690001, -+0xc78,0x406a0001, -+0xc78,0x266b0001, -+0xc78,0x256c0001, -+0xc78,0x246d0001, -+0xc78,0x236e0001, -+0xc78,0x226f0001, -+0xc78,0x21700001, -+0xc78,0x20710001, -+0xc78,0x06720001, -+0xc78,0x05730001, -+0xc78,0x04740001, -+0xc78,0x03750001, -+0xc78,0x02760001, -+0xc78,0x01770001, -+0xc78,0x00780001, -+0xc78,0x00790001, -+0xc78,0x007a0001, -+0xc78,0x007b0001, -+0xc78,0x007c0001, -+0xc78,0x007d0001, -+0xc78,0x007e0001, -+0xc78,0x007f0001, -+0xc78,0x3800001e, -+0xc78,0x3801001e, -+0xc78,0x3802001e, -+0xc78,0x3803001e, -+0xc78,0x3804001e, -+0xc78,0x3805001e, -+0xc78,0x3806001e, -+0xc78,0x3807001e, -+0xc78,0x3808001e, -+0xc78,0x3c09001e, -+0xc78,0x3e0a001e, -+0xc78,0x400b001e, -+0xc78,0x440c001e, -+0xc78,0x480d001e, -+0xc78,0x4c0e001e, -+0xc78,0x500f001e, -+0xc78,0x5210001e, -+0xc78,0x5611001e, -+0xc78,0x5a12001e, -+0xc78,0x5e13001e, -+0xc78,0x6014001e, -+0xc78,0x6015001e, -+0xc78,0x6016001e, -+0xc78,0x6217001e, -+0xc78,0x6218001e, -+0xc78,0x6219001e, -+0xc78,0x621a001e, -+0xc78,0x621b001e, -+0xc78,0x621c001e, -+0xc78,0x621d001e, -+0xc78,0x621e001e, -+0xc78,0x621f001e, -+}; -+ -+u32 Rtl8192CUAGCTAB_1TArray[AGCTAB_1TArrayLength] = { -+0xc78,0x7b000001, -+0xc78,0x7b010001, -+0xc78,0x7b020001, -+0xc78,0x7b030001, -+0xc78,0x7b040001, -+0xc78,0x7b050001, -+0xc78,0x7a060001, -+0xc78,0x79070001, -+0xc78,0x78080001, -+0xc78,0x77090001, -+0xc78,0x760a0001, -+0xc78,0x750b0001, -+0xc78,0x740c0001, -+0xc78,0x730d0001, -+0xc78,0x720e0001, -+0xc78,0x710f0001, -+0xc78,0x70100001, -+0xc78,0x6f110001, -+0xc78,0x6e120001, -+0xc78,0x6d130001, -+0xc78,0x6c140001, -+0xc78,0x6b150001, -+0xc78,0x6a160001, -+0xc78,0x69170001, -+0xc78,0x68180001, -+0xc78,0x67190001, -+0xc78,0x661a0001, -+0xc78,0x651b0001, -+0xc78,0x641c0001, -+0xc78,0x631d0001, -+0xc78,0x621e0001, -+0xc78,0x611f0001, -+0xc78,0x60200001, -+0xc78,0x49210001, -+0xc78,0x48220001, -+0xc78,0x47230001, -+0xc78,0x46240001, -+0xc78,0x45250001, -+0xc78,0x44260001, -+0xc78,0x43270001, -+0xc78,0x42280001, -+0xc78,0x41290001, -+0xc78,0x402a0001, -+0xc78,0x262b0001, -+0xc78,0x252c0001, -+0xc78,0x242d0001, -+0xc78,0x232e0001, -+0xc78,0x222f0001, -+0xc78,0x21300001, -+0xc78,0x20310001, -+0xc78,0x06320001, -+0xc78,0x05330001, -+0xc78,0x04340001, -+0xc78,0x03350001, -+0xc78,0x02360001, -+0xc78,0x01370001, -+0xc78,0x00380001, -+0xc78,0x00390001, -+0xc78,0x003a0001, -+0xc78,0x003b0001, -+0xc78,0x003c0001, -+0xc78,0x003d0001, -+0xc78,0x003e0001, -+0xc78,0x003f0001, -+0xc78,0x7b400001, -+0xc78,0x7b410001, -+0xc78,0x7b420001, -+0xc78,0x7b430001, -+0xc78,0x7b440001, -+0xc78,0x7b450001, -+0xc78,0x7a460001, -+0xc78,0x79470001, -+0xc78,0x78480001, -+0xc78,0x77490001, -+0xc78,0x764a0001, -+0xc78,0x754b0001, -+0xc78,0x744c0001, -+0xc78,0x734d0001, -+0xc78,0x724e0001, -+0xc78,0x714f0001, -+0xc78,0x70500001, -+0xc78,0x6f510001, -+0xc78,0x6e520001, -+0xc78,0x6d530001, -+0xc78,0x6c540001, -+0xc78,0x6b550001, -+0xc78,0x6a560001, -+0xc78,0x69570001, -+0xc78,0x68580001, -+0xc78,0x67590001, -+0xc78,0x665a0001, -+0xc78,0x655b0001, -+0xc78,0x645c0001, -+0xc78,0x635d0001, -+0xc78,0x625e0001, -+0xc78,0x615f0001, -+0xc78,0x60600001, -+0xc78,0x49610001, -+0xc78,0x48620001, -+0xc78,0x47630001, -+0xc78,0x46640001, -+0xc78,0x45650001, -+0xc78,0x44660001, -+0xc78,0x43670001, -+0xc78,0x42680001, -+0xc78,0x41690001, -+0xc78,0x406a0001, -+0xc78,0x266b0001, -+0xc78,0x256c0001, -+0xc78,0x246d0001, -+0xc78,0x236e0001, -+0xc78,0x226f0001, -+0xc78,0x21700001, -+0xc78,0x20710001, -+0xc78,0x06720001, -+0xc78,0x05730001, -+0xc78,0x04740001, -+0xc78,0x03750001, -+0xc78,0x02760001, -+0xc78,0x01770001, -+0xc78,0x00780001, -+0xc78,0x00790001, -+0xc78,0x007a0001, -+0xc78,0x007b0001, -+0xc78,0x007c0001, -+0xc78,0x007d0001, -+0xc78,0x007e0001, -+0xc78,0x007f0001, -+0xc78,0x3800001e, -+0xc78,0x3801001e, -+0xc78,0x3802001e, -+0xc78,0x3803001e, -+0xc78,0x3804001e, -+0xc78,0x3805001e, -+0xc78,0x3806001e, -+0xc78,0x3807001e, -+0xc78,0x3808001e, -+0xc78,0x3c09001e, -+0xc78,0x3e0a001e, -+0xc78,0x400b001e, -+0xc78,0x440c001e, -+0xc78,0x480d001e, -+0xc78,0x4c0e001e, -+0xc78,0x500f001e, -+0xc78,0x5210001e, -+0xc78,0x5611001e, -+0xc78,0x5a12001e, -+0xc78,0x5e13001e, -+0xc78,0x6014001e, -+0xc78,0x6015001e, -+0xc78,0x6016001e, -+0xc78,0x6217001e, -+0xc78,0x6218001e, -+0xc78,0x6219001e, -+0xc78,0x621a001e, -+0xc78,0x621b001e, -+0xc78,0x621c001e, -+0xc78,0x621d001e, -+0xc78,0x621e001e, -+0xc78,0x621f001e, -+}; -+ -+u32 Rtl8192CUAGCTAB_1T_HPArray[AGCTAB_1T_HPArrayLength] = { -+0xc78,0x7b000001, -+0xc78,0x7b010001, -+0xc78,0x7b020001, -+0xc78,0x7b030001, -+0xc78,0x7b040001, -+0xc78,0x7b050001, -+0xc78,0x7b060001, -+0xc78,0x7b070001, -+0xc78,0x7b080001, -+0xc78,0x7a090001, -+0xc78,0x790a0001, -+0xc78,0x780b0001, -+0xc78,0x770c0001, -+0xc78,0x760d0001, -+0xc78,0x750e0001, -+0xc78,0x740f0001, -+0xc78,0x73100001, -+0xc78,0x72110001, -+0xc78,0x71120001, -+0xc78,0x70130001, -+0xc78,0x6f140001, -+0xc78,0x6e150001, -+0xc78,0x6d160001, -+0xc78,0x6c170001, -+0xc78,0x6b180001, -+0xc78,0x6a190001, -+0xc78,0x691a0001, -+0xc78,0x681b0001, -+0xc78,0x671c0001, -+0xc78,0x661d0001, -+0xc78,0x651e0001, -+0xc78,0x641f0001, -+0xc78,0x63200001, -+0xc78,0x62210001, -+0xc78,0x61220001, -+0xc78,0x60230001, -+0xc78,0x46240001, -+0xc78,0x45250001, -+0xc78,0x44260001, -+0xc78,0x43270001, -+0xc78,0x42280001, -+0xc78,0x41290001, -+0xc78,0x402a0001, -+0xc78,0x262b0001, -+0xc78,0x252c0001, -+0xc78,0x242d0001, -+0xc78,0x232e0001, -+0xc78,0x222f0001, -+0xc78,0x21300001, -+0xc78,0x20310001, -+0xc78,0x06320001, -+0xc78,0x05330001, -+0xc78,0x04340001, -+0xc78,0x03350001, -+0xc78,0x02360001, -+0xc78,0x01370001, -+0xc78,0x00380001, -+0xc78,0x00390001, -+0xc78,0x003a0001, -+0xc78,0x003b0001, -+0xc78,0x003c0001, -+0xc78,0x003d0001, -+0xc78,0x003e0001, -+0xc78,0x003f0001, -+0xc78,0x7b400001, -+0xc78,0x7b410001, -+0xc78,0x7b420001, -+0xc78,0x7b430001, -+0xc78,0x7b440001, -+0xc78,0x7b450001, -+0xc78,0x7b460001, -+0xc78,0x7b470001, -+0xc78,0x7b480001, -+0xc78,0x7a490001, -+0xc78,0x794a0001, -+0xc78,0x784b0001, -+0xc78,0x774c0001, -+0xc78,0x764d0001, -+0xc78,0x754e0001, -+0xc78,0x744f0001, -+0xc78,0x73500001, -+0xc78,0x72510001, -+0xc78,0x71520001, -+0xc78,0x70530001, -+0xc78,0x6f540001, -+0xc78,0x6e550001, -+0xc78,0x6d560001, -+0xc78,0x6c570001, -+0xc78,0x6b580001, -+0xc78,0x6a590001, -+0xc78,0x695a0001, -+0xc78,0x685b0001, -+0xc78,0x675c0001, -+0xc78,0x665d0001, -+0xc78,0x655e0001, -+0xc78,0x645f0001, -+0xc78,0x63600001, -+0xc78,0x62610001, -+0xc78,0x61620001, -+0xc78,0x60630001, -+0xc78,0x46640001, -+0xc78,0x45650001, -+0xc78,0x44660001, -+0xc78,0x43670001, -+0xc78,0x42680001, -+0xc78,0x41690001, -+0xc78,0x406a0001, -+0xc78,0x266b0001, -+0xc78,0x256c0001, -+0xc78,0x246d0001, -+0xc78,0x236e0001, -+0xc78,0x226f0001, -+0xc78,0x21700001, -+0xc78,0x20710001, -+0xc78,0x06720001, -+0xc78,0x05730001, -+0xc78,0x04740001, -+0xc78,0x03750001, -+0xc78,0x02760001, -+0xc78,0x01770001, -+0xc78,0x00780001, -+0xc78,0x00790001, -+0xc78,0x007a0001, -+0xc78,0x007b0001, -+0xc78,0x007c0001, -+0xc78,0x007d0001, -+0xc78,0x007e0001, -+0xc78,0x007f0001, -+0xc78,0x3800001e, -+0xc78,0x3801001e, -+0xc78,0x3802001e, -+0xc78,0x3803001e, -+0xc78,0x3804001e, -+0xc78,0x3805001e, -+0xc78,0x3806001e, -+0xc78,0x3807001e, -+0xc78,0x3808001e, -+0xc78,0x3c09001e, -+0xc78,0x3e0a001e, -+0xc78,0x400b001e, -+0xc78,0x440c001e, -+0xc78,0x480d001e, -+0xc78,0x4c0e001e, -+0xc78,0x500f001e, -+0xc78,0x5210001e, -+0xc78,0x5611001e, -+0xc78,0x5a12001e, -+0xc78,0x5e13001e, -+0xc78,0x6014001e, -+0xc78,0x6015001e, -+0xc78,0x6016001e, -+0xc78,0x6217001e, -+0xc78,0x6218001e, -+0xc78,0x6219001e, -+0xc78,0x621a001e, -+0xc78,0x621b001e, -+0xc78,0x621c001e, -+0xc78,0x621d001e, -+0xc78,0x621e001e, -+0xc78,0x621f001e, -+}; -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c -@@ -0,0 +1,2564 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/*Created on 2011/11/ 8, 14:15*/ -+ -+#include -+#include "Hal8192CUHWImg_wowlan.h" -+ -+ -+u8 Rtl8192CUFwTSMCWWImgArray[TSMCWWImgArrayLength] = { -+0xc1,0x88,0x02,0x00,0x51,0x00,0x00,0x00,0x03,0x23,0x16,0x43,0x72,0x34,0x00,0x00, -+0x58,0x92,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x02,0x43,0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x57,0xcb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x5c,0xb6,0x00,0x00,0x00,0x00,0x00,0x02,0x5d,0x99,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0xbb,0x01,0x0c,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0,0x22,0x50, -+0x06,0xe9,0x25,0x82,0xf8,0xe6,0x22,0xbb,0xfe,0x06,0xe9,0x25,0x82,0xf8,0xe2,0x22, -+0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe4,0x93,0x22,0xbb,0x01,0x06, -+0x89,0x82,0x8a,0x83,0xf0,0x22,0x50,0x02,0xf7,0x22,0xbb,0xfe,0x01,0xf3,0x22,0xf8, -+0xbb,0x01,0x0d,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0x22, -+0x50,0x06,0xe9,0x25,0x82,0xc8,0xf6,0x22,0xbb,0xfe,0x05,0xe9,0x25,0x82,0xc8,0xf2, -+0x22,0xc5,0xf0,0xf8,0xa3,0xe0,0x28,0xf0,0xc5,0xf0,0xf8,0xe5,0x82,0x15,0x82,0x70, -+0x02,0x15,0x83,0xe0,0x38,0xf0,0x22,0xbb,0x01,0x10,0xe5,0x82,0x29,0xf5,0x82,0xe5, -+0x83,0x3a,0xf5,0x83,0xe0,0xf5,0xf0,0xa3,0xe0,0x22,0x50,0x09,0xe9,0x25,0x82,0xf8, -+0x86,0xf0,0x08,0xe6,0x22,0xbb,0xfe,0x0a,0xe9,0x25,0x82,0xf8,0xe2,0xf5,0xf0,0x08, -+0xe2,0x22,0xe5,0x83,0x2a,0xf5,0x83,0xe9,0x93,0xf5,0xf0,0xa3,0xe9,0x93,0x22,0xf8, -+0xbb,0x01,0x11,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0xe5, -+0xf0,0xa3,0xf0,0x22,0x50,0x09,0xe9,0x25,0x82,0xc8,0xf6,0x08,0xa6,0xf0,0x22,0xbb, -+0xfe,0x09,0xe9,0x25,0x82,0xc8,0xf2,0xe5,0xf0,0x08,0xf2,0x22,0xef,0x4b,0xff,0xee, -+0x4a,0xfe,0xed,0x49,0xfd,0xec,0x48,0xfc,0x22,0xe0,0xfc,0xa3,0xe0,0xfd,0xa3,0xe0, -+0xfe,0xa3,0xe0,0xff,0x22,0xa4,0x25,0x82,0xf5,0x82,0xe5,0xf0,0x35,0x83,0xf5,0x83, -+0x22,0xe0,0xfb,0xa3,0xe0,0xfa,0xa3,0xe0,0xf9,0x22,0xf8,0xe0,0xfb,0xa3,0xa3,0xe0, -+0xf9,0x25,0xf0,0xf0,0xe5,0x82,0x15,0x82,0x70,0x02,0x15,0x83,0xe0,0xfa,0x38,0xf0, -+0x22,0xeb,0xf0,0xa3,0xea,0xf0,0xa3,0xe9,0xf0,0x22,0xd0,0x83,0xd0,0x82,0xf8,0xe4, -+0x93,0x70,0x12,0x74,0x01,0x93,0x70,0x0d,0xa3,0xa3,0x93,0xf8,0x74,0x01,0x93,0xf5, -+0x82,0x88,0x83,0xe4,0x73,0x74,0x02,0x93,0x68,0x60,0xef,0xa3,0xa3,0xa3,0x80,0xdf, -+0xd0,0x83,0xd0,0x82,0xf8,0xe4,0x93,0x70,0x12,0x74,0x01,0x93,0x70,0x0d,0xa3,0xa3, -+0x93,0xf8,0x74,0x01,0x93,0xf5,0x82,0x88,0x83,0xe4,0x73,0x74,0x02,0x93,0xb5,0xf0, -+0x06,0x74,0x03,0x93,0x68,0x60,0xe9,0xa3,0xa3,0xa3,0xa3,0x80,0xd8,0x02,0x43,0xdb, -+0x02,0x50,0x2a,0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0x40,0x03,0xf6,0x80,0x01,0xf2, -+0x08,0xdf,0xf4,0x80,0x29,0xe4,0x93,0xa3,0xf8,0x54,0x07,0x24,0x0c,0xc8,0xc3,0x33, -+0xc4,0x54,0x0f,0x44,0x20,0xc8,0x83,0x40,0x04,0xf4,0x56,0x80,0x01,0x46,0xf6,0xdf, -+0xe4,0x80,0x0b,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x90,0x44,0x20,0xe4,0x7e, -+0x01,0x93,0x60,0xbc,0xa3,0xff,0x54,0x3f,0x30,0xe5,0x09,0x54,0x1f,0xfe,0xe4,0x93, -+0xa3,0x60,0x01,0x0e,0xcf,0x54,0xc0,0x25,0xe0,0x60,0xa8,0x40,0xb8,0xe4,0x93,0xa3, -+0xfa,0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca, -+0xf0,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xdf,0xe9,0xde,0xe7,0x80,0xbe, -+0x41,0x91,0x40,0x00,0x41,0x91,0x9c,0x00,0x41,0x91,0x23,0x80,0x41,0x91,0x24,0x80, -+0x41,0x91,0x9e,0x00,0x41,0x91,0x52,0x00,0x41,0x91,0x93,0x00,0x41,0x91,0x91,0x00, -+0x41,0x91,0x90,0x00,0x41,0x91,0x92,0x00,0x00,0xf0,0x90,0x91,0x30,0xe0,0x90,0x91, -+0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x54,0x7e,0x01,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0x65,0xeb,0xf0,0xa3,0xe0,0xfb,0xa3,0xe0,0xf5,0x44,0xe4,0xf5,0x45,0x12, -+0x35,0xab,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x01,0x5f,0xe4,0xf0,0x90,0x01,0x3c,0x74, -+0x08,0xf0,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4, -+0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x59,0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06, -+0x92,0x74,0x02,0xf0,0x90,0x91,0x36,0x14,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x0c, -+0x50,0x02,0xf1,0x23,0x22,0x90,0x02,0x84,0xef,0xf0,0xa3,0xee,0xf0,0xa3,0x74,0x05, -+0xf0,0x22,0x7d,0x01,0xaf,0x6f,0xe1,0x27,0xf1,0xe6,0xbf,0x01,0x10,0x90,0x91,0x42, -+0xe0,0xff,0xe4,0xfd,0x12,0x48,0x22,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x8f,0x82, -+0x8e,0x83,0xa3,0xa3,0xa3,0xe4,0xf0,0x22,0xe4,0xf5,0x72,0x7f,0x60,0x7e,0x01,0x80, -+0xed,0x7f,0x00,0x22,0x90,0x91,0x53,0xe0,0x54,0xfe,0xf0,0x02,0x50,0xd6,0x22,0xe4, -+0xf5,0x75,0x22,0x02,0x5f,0xe2,0x02,0x5f,0xe9,0xef,0x8e,0xf0,0x71,0x70,0x45,0x26, -+0x00,0x40,0x45,0x4e,0x00,0x80,0x45,0x79,0x01,0x00,0x45,0x8d,0x02,0x00,0x45,0xa5, -+0x04,0x00,0x00,0x00,0x45,0xc2,0xed,0x54,0x3f,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e, -+0x00,0x7f,0x40,0xef,0x2d,0xff,0xee,0x3c,0xfe,0xef,0x78,0x06,0xce,0xc3,0x13,0xce, -+0x13,0xd8,0xf9,0x78,0x06,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0x80,0x26,0xed,0x54, -+0x7f,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e,0x00,0x7f,0x80,0xef,0x2d,0xff,0xee,0x3c, -+0xfe,0xef,0x78,0x07,0xce,0xc3,0x13,0xce,0x13,0xd8,0xf9,0x78,0x07,0xc3,0x33,0xce, -+0x33,0xce,0xd8,0xf9,0xfd,0xac,0x06,0x80,0x49,0xed,0x70,0x04,0xfe,0xff,0x80,0x04, -+0x7e,0x01,0x7f,0x00,0xef,0x2d,0xee,0x3c,0x7d,0x00,0xfc,0x80,0x35,0xec,0x54,0x01, -+0x4d,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e,0x02,0x7f,0x00,0xef,0x2d,0xee,0x3c,0xc3, -+0x13,0x7d,0x00,0x80,0x1a,0xec,0x54,0x03,0x4d,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e, -+0x04,0x7f,0x00,0xef,0x2d,0xee,0x3c,0x13,0x13,0x54,0x3f,0x7d,0x00,0x25,0xe0,0x25, -+0xe0,0xfc,0xae,0x04,0xaf,0x05,0x22,0x90,0x91,0x09,0x12,0x2a,0x8b,0x00,0x00,0x00, -+0x00,0x90,0x06,0xa9,0xe0,0x90,0x91,0x08,0xf0,0xe0,0x54,0xc0,0x70,0x0a,0x53,0x71, -+0xfe,0x53,0x71,0xfd,0x91,0xc2,0x80,0x47,0x90,0x91,0x26,0xe0,0x60,0x41,0x90,0x91, -+0x38,0xe0,0x70,0x3b,0x90,0x91,0x38,0x74,0x01,0xf0,0x7f,0x00,0x7e,0x08,0x12,0x27, -+0xde,0x90,0x91,0x09,0x12,0x2a,0x7f,0x90,0x91,0x09,0x71,0x09,0xec,0x44,0x02,0xfc, -+0x90,0x91,0x09,0x12,0x2a,0x7f,0x90,0x91,0x09,0x71,0x09,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x90, -+0x91,0x08,0xe0,0x30,0xe6,0x13,0x43,0x71,0x01,0x90,0x91,0x3b,0xe0,0x64,0x02,0x60, -+0x04,0x91,0xc8,0x80,0x07,0x91,0x77,0x80,0x03,0x53,0x71,0xfe,0x90,0x91,0x08,0xe0, -+0x30,0xe7,0x16,0x43,0x71,0x02,0xe4,0x90,0x91,0x66,0x91,0x49,0x90,0x01,0x57,0x74, -+0x05,0xf0,0x90,0x91,0x3c,0x74,0x01,0xf0,0x22,0x53,0x71,0xfd,0x22,0xd3,0x10,0xaf, -+0x01,0xc3,0xc0,0xd0,0x8b,0x60,0x8a,0x61,0x89,0x62,0x90,0x91,0x68,0x71,0x41,0xab, -+0x63,0xaa,0x64,0xa9,0x65,0x90,0x91,0x6b,0x71,0x41,0xaf,0x66,0x15,0x66,0xef,0x60, -+0x1b,0x90,0x91,0x6b,0xe4,0x75,0xf0,0x01,0x71,0x2a,0x12,0x29,0xd9,0xff,0x90,0x91, -+0x68,0xe4,0x75,0xf0,0x01,0x71,0x2a,0xef,0x51,0x4d,0x80,0xde,0xab,0x60,0xaa,0x61, -+0xa9,0x62,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91, -+0x6e,0x71,0x41,0x90,0x91,0x9e,0xe0,0xff,0x04,0xf0,0x90,0x00,0x01,0xef,0x51,0x5f, -+0x7f,0xaf,0x7e,0x01,0x12,0x64,0x1c,0xef,0x60,0x44,0x90,0x91,0x6e,0x71,0x21,0x8b, -+0x63,0x8a,0x64,0x89,0x65,0x75,0x66,0x02,0x7b,0x01,0x7a,0x01,0x79,0xa0,0xd1,0x6d, -+0x90,0x91,0x71,0x71,0x21,0x8b,0x63,0x8a,0x64,0x89,0x65,0x90,0x91,0x6e,0x71,0x21, -+0x12,0x29,0xd9,0xff,0xc4,0x54,0x0f,0xf5,0x66,0x7b,0x01,0x7a,0x01,0x79,0xa2,0xd1, -+0x6d,0x90,0x01,0xaf,0x74,0xff,0xf0,0x90,0x01,0xcb,0xe0,0x64,0x80,0xf0,0xd0,0xd0, -+0x92,0xaf,0x22,0x7d,0x01,0x7f,0x0c,0x90,0x91,0x95,0xed,0xf0,0x90,0x91,0x94,0xef, -+0xf0,0x54,0x0f,0xff,0xe5,0x6e,0x54,0x0f,0x6f,0x60,0x76,0x90,0x91,0x94,0xe0,0x30, -+0xe2,0x30,0xe5,0x6e,0x20,0xe2,0x05,0x7f,0x01,0x12,0x62,0x65,0xe5,0x6e,0x30,0xe3, -+0x0f,0x90,0x91,0x94,0xe0,0x20,0xe3,0x08,0x12,0x5a,0x3f,0xef,0x60,0x53,0x80,0x52, -+0xe5,0x6e,0x20,0xe3,0x4c,0x90,0x91,0x94,0xe0,0x30,0xe3,0x45,0xa3,0xe0,0xff,0x02, -+0x62,0x4a,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x0c,0x0f,0x90,0x91,0x94,0xe0,0x20,0xe3, -+0x08,0x12,0x5a,0x3f,0xef,0x60,0x2a,0xf1,0xb2,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x04, -+0x10,0x90,0x91,0x94,0xe0,0x20,0xe2,0x09,0x12,0x5b,0xb3,0xef,0x60,0x13,0x12,0x48, -+0xce,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x02,0x08,0x91,0xf1,0xef,0x60,0x03,0x12,0x63, -+0x56,0x22,0x90,0x06,0x04,0xe0,0x44,0x40,0xf0,0xe5,0x6d,0xb4,0x01,0x04,0x7f,0x01, -+0xf1,0xc9,0x53,0x6e,0xf0,0x43,0x6e,0x04,0x22,0x8f,0x67,0xf1,0xe6,0xbf,0x01,0x15, -+0x90,0x91,0x43,0x12,0x48,0x1e,0xad,0x07,0xac,0x06,0xaf,0x67,0x12,0x61,0xa3,0x90, -+0x04,0x1f,0x74,0x20,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x01,0xc4, -+0x74,0xe6,0xf0,0x74,0x47,0xa3,0xf0,0x90,0x04,0x1d,0xe0,0x60,0x1a,0x90,0x05,0x22, -+0xe0,0x54,0x90,0x60,0x07,0x90,0x01,0xc6,0xe0,0x44,0x40,0xf0,0x90,0x01,0xc7,0xe0, -+0x30,0xe1,0xe4,0x7f,0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xe0,0xff, -+0x7d,0x01,0x90,0x91,0x74,0xef,0xf0,0xa3,0xed,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xe5, -+0x70,0x60,0x04,0xe4,0xff,0x11,0xb3,0x90,0x91,0x74,0xe0,0x30,0xe0,0x09,0x90,0x91, -+0x76,0xe4,0xf0,0xa3,0x74,0x80,0xf0,0x90,0x91,0x74,0xe0,0xff,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x90,0x04,0x25,0xef,0xf0,0x90,0x91,0x75,0xe0,0x60,0x1f,0xa3,0xa3,0xe0, -+0xff,0x24,0x0f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x74,0x10, -+0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x90,0x91,0x76,0xa3, -+0xe0,0xff,0xfd,0x24,0x08,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe4,0xf0,0x74,0x09, -+0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf0,0xf0,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf7,0xf0,0x90,0x91,0x76,0xe0,0xfe,0xa3, -+0xe0,0xff,0x22,0xef,0x60,0x0b,0x90,0x91,0x51,0xe0,0xb4,0x01,0x10,0xe4,0xff,0x80, -+0x09,0x90,0x91,0x51,0xe0,0xb4,0x01,0x05,0x7f,0x01,0x12,0x68,0x87,0x22,0x90,0x01, -+0x37,0x74,0x02,0xf0,0x90,0x05,0x22,0x74,0xff,0xf0,0x12,0x68,0x46,0xef,0x70,0x06, -+0x90,0x01,0xc8,0x74,0xfd,0xf0,0x7d,0x02,0x7f,0x03,0x12,0x36,0xe6,0xe5,0x70,0x60, -+0x04,0x7f,0x01,0x11,0xb3,0x51,0x0c,0x53,0x6e,0xf0,0x43,0x6e,0x02,0x22,0xef,0x64, -+0x01,0x70,0x42,0x7d,0x78,0x7f,0x02,0x12,0x36,0x75,0x7d,0x02,0x7f,0x03,0x12,0x36, -+0x75,0x90,0x01,0x36,0x74,0x03,0xf0,0xfd,0x7f,0x02,0x12,0x36,0xe6,0x7d,0x10,0x7f, -+0x03,0x12,0x36,0x92,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x12, -+0x47,0x23,0xe4,0xff,0x11,0xb3,0x90,0x06,0x04,0xe0,0x54,0x7f,0xf0,0x90,0x06,0x0a, -+0xe0,0x54,0xf8,0xf0,0x22,0x90,0x01,0x36,0x74,0x7b,0xf0,0xa3,0x74,0x02,0xf0,0x7d, -+0x7b,0xff,0x12,0x36,0xe6,0x7d,0x02,0x7f,0x03,0x12,0x36,0xe6,0x7d,0x10,0x7f,0x03, -+0x12,0x36,0x92,0x90,0x06,0x04,0xe0,0x44,0x80,0xf0,0x90,0x06,0x0a,0xe0,0x44,0x07, -+0xf0,0x12,0x64,0x11,0xe5,0x6d,0x20,0xe0,0x05,0xe4,0x90,0x91,0x29,0xf0,0x22,0x8b, -+0x0e,0x8a,0x0f,0x89,0x10,0x12,0x62,0x3e,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x12,0x29, -+0xd9,0xf5,0x70,0x14,0x60,0x0e,0x14,0x60,0x1e,0x14,0x60,0x2f,0x24,0x03,0x70,0x40, -+0x7f,0x01,0x80,0x3a,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00,0x02,0x12,0x42,0x20, -+0xfd,0xe4,0xff,0x31,0xe1,0x80,0x27,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00,0x02, -+0x12,0x42,0x20,0xfd,0x7f,0x01,0x31,0xe1,0x1f,0x80,0x13,0xab,0x0e,0xaa,0x0f,0xa9, -+0x10,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x02,0x31,0xe1,0xe4,0xff,0x11,0xfe, -+0x22,0xef,0x24,0xfe,0x60,0x0b,0x04,0x70,0x22,0x90,0x91,0x39,0x74,0x01,0xf0,0x80, -+0x16,0xed,0x70,0x0a,0x90,0x91,0x35,0xe0,0x90,0x91,0x39,0xf0,0x80,0x05,0x90,0x91, -+0x39,0xed,0xf0,0x90,0x91,0x39,0xe0,0x90,0x91,0x27,0xf0,0x22,0x7f,0x78,0x7e,0x08, -+0x12,0x27,0xde,0x90,0x90,0xd8,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde, -+0x90,0x90,0xdc,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x27,0xde,0x90,0x90,0xe0, -+0x12,0x2a,0x7f,0x90,0x91,0x51,0xe0,0x90,0x90,0xd8,0xb4,0x01,0x0d,0x12,0x43,0x09, -+0xef,0x54,0xc7,0xff,0xed,0x54,0xc7,0xfd,0x80,0x07,0x12,0x43,0x09,0xef,0x54,0xc7, -+0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x08,0x12,0x2f,0xd9,0x90, -+0x90,0xdc,0x12,0x43,0x09,0xef,0x54,0x0f,0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x90,0xe0,0x12,0x43,0x09,0xef,0x44,0x02, -+0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x7f, -+0x70,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xe4,0x12,0x2a,0x7f,0x90,0x80,0x85,0x12, -+0x2a,0x8b,0x00,0x1b,0x25,0xa0,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x59, -+0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe4,0xfd,0xff,0x12,0x34,0x81,0x90,0x91,0x51, -+0xe0,0xb4,0x01,0x11,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe4,0xfd, -+0x7f,0x01,0x12,0x34,0x81,0x90,0x00,0x11,0xe0,0x54,0xf6,0xf0,0x80,0x08,0xf4,0xff, -+0x90,0x00,0x43,0xe0,0x5f,0xf0,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x7f,0x10,0xdf, -+0xfe,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x9b, -+0xed,0xf0,0x90,0x91,0x9a,0xef,0xf0,0xd3,0x94,0x07,0x50,0x63,0xe0,0xff,0x74,0x01, -+0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x47,0xe0,0x5f, -+0xf0,0x51,0xe6,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3, -+0x33,0xd8,0xfc,0xff,0x90,0x00,0x46,0xe0,0x4f,0xf0,0x51,0xe6,0x90,0x91,0x9b,0xe0, -+0x60,0x16,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xff,0x90,0x00,0x45,0x80,0x66,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x45,0x80,0x6b,0x90, -+0x91,0x9a,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3, -+0x33,0xd8,0xfc,0xc4,0x54,0xf0,0x51,0xde,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0x51, -+0xe6,0x90,0x91,0x9b,0xe0,0x60,0x1b,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07, -+0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x42,0xe0,0x4f, -+0x80,0x1a,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x42,0xe0,0x5f,0xf0,0x51,0xe6,0xd0, -+0xd0,0x92,0xaf,0x22,0xf0,0x90,0x00,0x45,0xe0,0x54,0xfe,0xfd,0x7f,0x45,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x8f,0x82,0x75,0x83,0x00,0xed,0xf0,0x51,0xe6,0xd0,0xd0, -+0x92,0xaf,0x22,0xef,0x14,0x60,0x30,0x14,0x60,0x66,0x24,0x02,0x60,0x02,0x81,0xaa, -+0x90,0x90,0xf3,0x74,0x02,0xf0,0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x71, -+0xee,0x90,0x00,0x47,0xe0,0x44,0x08,0xfd,0x7f,0x47,0x71,0xee,0x90,0x00,0x45,0xe0, -+0x44,0x10,0xfd,0x7f,0x45,0x80,0x71,0xe4,0x90,0x90,0xf3,0xf0,0x90,0x90,0xef,0x12, -+0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90, -+0x00,0x45,0xe0,0x44,0xef,0xfd,0x7f,0x45,0x71,0xee,0x90,0x00,0x45,0xe0,0x54,0xef, -+0xfd,0x7f,0x45,0x71,0xee,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x80,0x38, -+0x90,0x90,0xf3,0x74,0x01,0xf0,0x90,0x90,0xf9,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x00,0x45,0xe0,0x44,0x20,0xfd, -+0x7f,0x45,0x71,0xee,0x90,0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0x71,0xee,0x90, -+0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x71,0xee,0x22,0x90,0x00,0x02,0x12,0x42, -+0x20,0x90,0x90,0xf5,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0x25,0xe0,0x25,0xe0,0x90, -+0x90,0xf4,0xf0,0x12,0x29,0xd9,0x25,0xe0,0x25,0xe0,0x90,0x90,0xf8,0xf0,0x90,0x05, -+0x60,0xe0,0x90,0x91,0x03,0xf0,0x90,0x05,0x61,0xe0,0x90,0x91,0x04,0xf0,0x90,0x05, -+0x62,0xe0,0x90,0x91,0x05,0xf0,0x90,0x05,0x63,0xe0,0x90,0x91,0x06,0xf0,0xa2,0xaf, -+0xe4,0x33,0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x90,0x90,0xf4,0xe0,0xff,0x12,0x6e,0x67, -+0x90,0x91,0x1c,0xe0,0x24,0xff,0x92,0xaf,0x90,0x90,0xf5,0xe0,0x70,0x02,0xa1,0xb2, -+0x90,0x90,0xf4,0xe0,0x70,0x02,0xa1,0xb2,0x90,0x90,0xf8,0xe0,0x70,0x02,0xa1,0xb2, -+0xa2,0xaf,0xe4,0x33,0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x90,0x91,0x07,0x74,0x01,0xf0, -+0x90,0x91,0x1c,0xe0,0x24,0xff,0x92,0xaf,0x71,0xe5,0x90,0x00,0x46,0xe0,0x44,0x01, -+0xfd,0x7f,0x46,0x71,0xee,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xf9,0x12,0x43, -+0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x80,0x06, -+0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f,0x45,0x71, -+0xee,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x91,0x03,0xe0,0x90,0x05,0x84,0xf0, -+0x90,0x91,0x04,0xe0,0x90,0x05,0x85,0xf0,0x90,0x91,0x05,0xe0,0x90,0x05,0x86,0xf0, -+0x90,0x91,0x06,0xe0,0x90,0x05,0x87,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x91,0x1c,0xf0, -+0xc2,0xaf,0x90,0x01,0x3c,0xe0,0x44,0x20,0xf0,0x7d,0x20,0xe4,0xff,0x12,0x37,0x00, -+0x80,0x2b,0x90,0x90,0xf5,0xe0,0x70,0x2d,0x90,0x91,0x07,0x71,0xe4,0x90,0x00,0x46, -+0xe0,0x54,0xfe,0xfd,0x7f,0x46,0x71,0xee,0x90,0x05,0x22,0xe4,0xf0,0xa2,0xaf,0x33, -+0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x7d,0x20,0xe4,0xff,0x12,0x36,0x92,0x90,0x91,0x1c, -+0xe0,0x24,0xff,0x92,0xaf,0x22,0x8b,0x0e,0x8a,0x0f,0x89,0x10,0x90,0x00,0x02,0x12, -+0x42,0x20,0x90,0x90,0xf6,0xf0,0xe0,0x30,0xe0,0x4b,0x90,0x90,0xed,0x74,0x01,0xf0, -+0x7f,0x80,0x7e,0x08,0x12,0x27,0xde,0x90,0x90,0xef,0x12,0x2a,0x7f,0xab,0x0e,0xaa, -+0x0f,0xa9,0x10,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xe4,0xfc,0xfd,0xfe,0x78,0x1a, -+0x12,0x2a,0x6c,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab,0x07,0x90,0x90,0xef,0x12,0x43, -+0x09,0xec,0x54,0x03,0xfc,0x12,0x42,0xfc,0x90,0x90,0xf9,0x12,0x2a,0x7f,0x90,0x05, -+0x22,0xe4,0xf0,0x80,0x2d,0xe4,0x90,0x90,0xed,0xf0,0x7f,0x80,0x7e,0x08,0x12,0x27, -+0xde,0xec,0x54,0x03,0xfc,0xec,0x44,0xc0,0xfc,0x90,0x90,0xef,0x12,0x2a,0x7f,0x90, -+0x90,0xef,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12, -+0x2f,0xd9,0x90,0x90,0xf6,0xe0,0x30,0xe1,0x19,0x7d,0x0c,0x7f,0x47,0x71,0xee,0x90, -+0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x71,0xee,0x90,0x00,0x46,0xe0,0x44,0x10, -+0x80,0x1c,0x90,0x00,0x47,0xe0,0x54,0xf3,0xfd,0x7f,0x47,0x71,0xee,0x90,0x00,0x48, -+0xe0,0x54,0xf3,0xfd,0x7f,0x48,0x71,0xee,0x90,0x00,0x46,0xe0,0x54,0xef,0xfd,0x7f, -+0x46,0x71,0xee,0xe4,0x90,0x90,0xf3,0xf0,0x22,0x90,0x01,0x3c,0x74,0xff,0xf0,0xa3, -+0xf0,0xa3,0xf0,0x90,0x01,0x34,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x54, -+0x71,0xee,0x7d,0xff,0x7f,0x55,0x71,0xee,0x7d,0xff,0x7f,0x56,0x71,0xee,0x7d,0xff, -+0x7f,0x57,0x61,0xee,0x90,0x01,0x30,0xe4,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90, -+0x01,0x38,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x50,0x71,0xee,0xe4,0xfd, -+0x7f,0x51,0x71,0xee,0xe4,0xfd,0x7f,0x52,0x71,0xee,0xe4,0xfd,0x7f,0x53,0x61,0xee, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x22,0xed,0xf0,0x90,0x91,0x21,0xef, -+0xf0,0xd3,0x94,0x07,0x50,0x4e,0xa3,0xe0,0x70,0x1a,0x90,0x91,0x21,0xe0,0xff,0x74, -+0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x47,0xe0, -+0x5f,0xf0,0x80,0x17,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02, -+0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x47,0xe0,0x4f,0xf0,0x51,0xe6,0x90,0x91,0x21, -+0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90, -+0x00,0x46,0x80,0x59,0x90,0x91,0x21,0xe0,0x24,0xf8,0xf0,0xa3,0xe0,0x70,0x1d,0x90, -+0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4, -+0x54,0xf0,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0x80,0x1a,0x90,0x91,0x21,0xe0, -+0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xff, -+0x90,0x00,0x43,0xe0,0x4f,0xf0,0x51,0xe6,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0, -+0x51,0xe6,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x49,0xe0,0x90,0x91,0x9f,0xf0,0xe0, -+0x54,0x0f,0xf0,0x44,0xf0,0xfd,0x7f,0x49,0x71,0xee,0x90,0x91,0x9f,0xe0,0x44,0xb0, -+0xfd,0x7f,0x49,0x61,0xee,0x12,0x47,0xe6,0xbf,0x01,0x10,0x90,0x02,0x09,0xe0,0xff, -+0x7d,0x01,0x12,0x48,0x22,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x75,0x28,0x33,0xe4, -+0xf5,0x29,0x75,0x2a,0x07,0xf5,0x2b,0x90,0x01,0x30,0xe5,0x28,0xf0,0xa3,0xe5,0x29, -+0xf0,0xa3,0xe5,0x2a,0xf0,0xa3,0xe5,0x2b,0xf0,0x22,0xe4,0x90,0x91,0x0e,0xf0,0xa3, -+0xf0,0x75,0x8e,0x02,0xf1,0x25,0xd1,0xe8,0x90,0x91,0x4f,0xef,0xf0,0xf1,0x0b,0x90, -+0x91,0x51,0xef,0xf0,0xf1,0x60,0x90,0x91,0x3d,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xf5, -+0x57,0xf1,0x02,0x12,0x61,0xc4,0x12,0x32,0x3d,0x12,0x44,0xff,0x11,0x0c,0xf1,0x36, -+0xd1,0xfb,0xd1,0xd0,0x12,0x44,0xfe,0x31,0x13,0x12,0x44,0xf4,0x12,0x6e,0x09,0x90, -+0x91,0x10,0xe5,0xd9,0xf0,0x12,0x4e,0xb9,0xc2,0xaf,0x90,0x00,0x80,0xe0,0x44,0x40, -+0xf0,0x12,0x4a,0xe6,0x75,0xe8,0x03,0x43,0xa8,0x85,0xd2,0xaf,0x90,0x91,0x0e,0xe0, -+0x64,0x01,0xf0,0x24,0x2a,0x90,0x01,0xc4,0xf0,0x74,0x50,0xa3,0xf0,0xe5,0x57,0x30, -+0xe2,0x10,0x12,0x5f,0xf0,0xbf,0x01,0x0a,0xc2,0xaf,0x53,0x57,0xfb,0xd2,0xaf,0x12, -+0x71,0x97,0xe5,0x57,0x30,0xe4,0x0a,0xc2,0xaf,0x53,0x57,0xef,0xd2,0xaf,0x12,0x60, -+0x2d,0x90,0x90,0xf7,0xe0,0x70,0x03,0x12,0x70,0x74,0x11,0xe7,0x90,0x91,0x3f,0xe0, -+0x90,0x01,0xba,0xf0,0x80,0xb6,0xe4,0x90,0x91,0x55,0xf0,0x90,0x91,0x53,0xe0,0x54, -+0x7f,0xf0,0xa3,0x74,0x0a,0xf0,0x22,0x90,0x06,0x34,0xe0,0x60,0x25,0x14,0x70,0x1b, -+0x7b,0x01,0x7a,0x06,0x79,0x35,0x7f,0xf9,0x7e,0x01,0x12,0x67,0xe4,0xbf,0x01,0x09, -+0x90,0x06,0x35,0xe0,0x54,0x0f,0xf0,0x80,0x04,0x80,0x00,0xe1,0x17,0xe4,0x90,0x06, -+0x34,0xf0,0x22,0x90,0x91,0x56,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0x7f,0xf0,0x90,0x01, -+0x17,0xe0,0xfe,0x90,0x01,0x16,0xe0,0x7c,0x00,0x24,0x00,0xff,0xec,0x3e,0x90,0x91, -+0x5c,0xf0,0xa3,0xef,0xf0,0x90,0x01,0x04,0xe0,0x54,0x0f,0x90,0x91,0x1c,0xf0,0xe0, -+0xff,0x74,0x40,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8, -+0xf9,0x90,0x91,0x5b,0xf0,0xee,0x90,0x91,0x5a,0xf0,0x90,0x91,0x5e,0xe0,0x54,0xfe, -+0xf0,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xfb,0xf0,0xe0,0x54,0xf7,0xf0,0xe0,0x54,0xef, -+0xf0,0xe0,0x54,0xdf,0xf0,0xe0,0x54,0xbf,0xf0,0xe0,0x54,0x7f,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xf7,0xf0,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x12,0x29,0xd9,0x54,0x01,0xff,0x90,0x91,0x56, -+0xe0,0x54,0xfe,0x4f,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0x90,0x91,0x57,0xf0,0x90, -+0x00,0x02,0x12,0x42,0x20,0x90,0x91,0x58,0xf0,0x90,0x91,0x56,0xe0,0x30,0xe0,0x1a, -+0x90,0x06,0x09,0xe0,0x54,0xfe,0xf0,0x90,0x02,0x86,0xe0,0x44,0x04,0xf0,0x43,0x57, -+0x04,0x7d,0x08,0xe4,0xff,0x12,0x36,0xe6,0x80,0x12,0x7d,0x08,0xe4,0xff,0x12,0x36, -+0x75,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x31,0xf1,0x31,0x13,0xd0,0xd0,0x92,0xaf, -+0x22,0x90,0x06,0x90,0xe4,0xf0,0x21,0x5a,0x90,0x91,0x19,0x12,0x43,0x41,0xef,0x12, -+0x43,0x4a,0x52,0x30,0x01,0x52,0x39,0x02,0x52,0x5b,0x03,0x52,0x64,0x09,0x52,0x6c, -+0x0c,0x52,0x75,0x0d,0x52,0x7d,0x0e,0x52,0x8e,0x1a,0x52,0x96,0x2c,0x52,0x41,0x2d, -+0x52,0x4a,0x2e,0x52,0x9e,0x30,0x52,0x53,0x3b,0x52,0x86,0x3c,0x00,0x00,0x52,0xa6, -+0x90,0x91,0x19,0x12,0x43,0x21,0x02,0x64,0x72,0x90,0x91,0x19,0x12,0x43,0x21,0xc1, -+0xf5,0x90,0x91,0x19,0x12,0x43,0x21,0x02,0x65,0x8d,0x90,0x91,0x19,0x12,0x43,0x21, -+0x02,0x65,0xd5,0x90,0x91,0x19,0x12,0x43,0x21,0xe1,0x4b,0x90,0x91,0x19,0x12,0x43, -+0x21,0x02,0x66,0x0e,0x90,0x91,0x19,0x12,0x43,0x21,0x80,0x42,0x90,0x91,0x19,0x12, -+0x43,0x21,0x02,0x4c,0xab,0x90,0x91,0x19,0x12,0x43,0x21,0xe1,0x98,0x90,0x91,0x19, -+0x12,0x43,0x21,0x02,0x4d,0xe6,0x90,0x91,0x19,0x12,0x43,0x21,0x21,0x90,0x90,0x91, -+0x19,0x12,0x43,0x21,0xa1,0x9b,0x90,0x91,0x19,0x12,0x43,0x21,0x81,0x7a,0x90,0x91, -+0x19,0x12,0x43,0x21,0xe1,0x78,0x90,0x01,0xc6,0xe0,0x44,0x01,0xf0,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x1c,0x12,0x43,0x41,0x90,0x91,0x1c,0x12,0x43, -+0x21,0x90,0x00,0x01,0x12,0x42,0x97,0xfa,0xe5,0xf0,0x24,0x00,0xff,0xe4,0x3a,0xfe, -+0x90,0x91,0x1c,0x12,0x43,0x21,0x90,0x00,0x01,0xee,0x8f,0xf0,0x12,0x42,0xcf,0x12, -+0x29,0xd9,0xff,0x60,0x2c,0xb5,0x72,0x16,0x90,0x91,0x1c,0x12,0x43,0x21,0x90,0x00, -+0x01,0x12,0x42,0x97,0x65,0x74,0x70,0x04,0xe5,0x73,0x65,0xf0,0x60,0x23,0x90,0x91, -+0x1c,0x12,0x43,0x21,0x90,0x00,0x01,0x12,0x42,0x97,0xff,0xae,0xf0,0x71,0x26,0x80, -+0x10,0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x29,0xd9,0x65,0x72,0x60,0x03,0x12,0x44, -+0xe8,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x1f,0xee,0xf0,0xa3,0xef,0xf0,0x75,0x72, -+0x01,0x8e,0x73,0xf5,0x74,0xe4,0xfd,0x7f,0x0b,0x12,0x4f,0x10,0xe4,0xfd,0x7f,0x02, -+0x12,0x4f,0x10,0x71,0x6a,0xe4,0xff,0x71,0xcc,0xe4,0xf5,0x76,0x90,0x01,0xc9,0xe5, -+0x76,0xf0,0x90,0x91,0x1f,0xe0,0xfc,0xa3,0xe0,0xfd,0xec,0xfb,0x8d,0x44,0xe4,0xf5, -+0x45,0x7d,0x01,0x7f,0x60,0x7e,0x01,0x02,0x35,0xab,0x7f,0x0b,0x71,0xd9,0xef,0x65, -+0x75,0x60,0x10,0xe5,0x75,0xb4,0x01,0x05,0xe4,0xf5,0x75,0x80,0x03,0x75,0x75,0x01, -+0x7f,0x01,0x22,0x7f,0x00,0x22,0xe5,0x72,0x64,0x01,0x70,0x3f,0x71,0x6a,0xbf,0x01, -+0x04,0x7f,0x01,0x71,0xcc,0x90,0x00,0x46,0xe0,0x44,0x04,0xfd,0x7f,0x46,0x12,0x4b, -+0xee,0x90,0x00,0x44,0xe0,0x54,0xfb,0xfd,0x7f,0x44,0x12,0x4b,0xee,0x90,0x00,0x46, -+0xe0,0x54,0xfb,0xfd,0x7f,0x46,0x12,0x4b,0xee,0x7f,0x02,0x71,0xd9,0x8f,0x76,0x90, -+0x01,0xc9,0xe5,0x76,0xf0,0xb4,0x01,0x03,0x12,0x4f,0xd7,0x22,0x90,0x01,0xca,0xe5, -+0x75,0xf0,0xef,0x60,0x03,0x12,0x4f,0xd7,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0xa0,0xef,0xf0,0xd3,0x94,0x07,0x50,0x47,0xe0,0xff,0x74,0x01,0xa8,0x07, -+0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0xe0,0x5f,0xf0,0x12, -+0x4a,0xe6,0x90,0x91,0xa0,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8,0x05,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x44,0xe0,0xfb,0xe4,0xfe,0xef, -+0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13,0xd8,0xf8,0xff,0x80, -+0x44,0x90,0x91,0xa0,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0x12,0x4a,0xde,0x90,0x91,0xa0,0xe0,0xfd,0x74,0x01,0x7e, -+0x00,0xa8,0x05,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00, -+0x42,0xe0,0xfb,0xe4,0xfe,0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13, -+0xce,0x13,0xd8,0xf8,0xff,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0xe4,0xf5,0x10,0x75,0x11,0x04,0xf5,0x12,0xf5,0x14,0xf5,0x15,0x90,0x02,0x09, -+0xe0,0xff,0x12,0x29,0xd9,0xfe,0xef,0x2e,0xf5,0x13,0x30,0xe0,0x08,0x75,0x0e,0x00, -+0x75,0x0f,0x80,0x80,0x05,0xe4,0xf5,0x0e,0xf5,0x0f,0xe5,0x13,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x74,0x20,0x25,0x10,0xf5,0x10,0xad,0x0f,0xe5,0x10,0x2d,0xff,0x24,0x01, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x90,0x91,0x47,0xf0,0x74,0x02,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0xfe,0xe5,0x10,0x2d,0x24,0x03,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe0,0x24,0x00,0xff,0xe4,0x3e,0x90,0x91,0x48,0xf0,0xa3,0xef, -+0xf0,0x7f,0x04,0xe5,0x10,0x25,0x0f,0x2f,0x24,0x00,0xf5,0x82,0xe4,0x34,0xfc,0xf5, -+0x83,0xe0,0xfe,0x74,0x46,0x2f,0xf5,0x82,0xe4,0x34,0x91,0xf5,0x83,0xee,0xf0,0x0f, -+0xbf,0x08,0xe0,0x12,0x66,0x56,0xef,0x70,0x3f,0x90,0x01,0xc3,0xe0,0x60,0x25,0xc3, -+0xe5,0x15,0x94,0xe8,0xe5,0x14,0x94,0x03,0x40,0x09,0x90,0x01,0xc6,0xe0,0x44,0x10, -+0xf0,0x80,0x63,0x05,0x15,0xe5,0x15,0x70,0x02,0x05,0x14,0x7f,0x0a,0x7e,0x00,0x12, -+0x37,0x54,0x80,0xd5,0x90,0x01,0xc6,0xe0,0x90,0x01,0xc3,0x30,0xe2,0x05,0x74,0xfe, -+0xf0,0x80,0x43,0x74,0xff,0xf0,0x80,0x3e,0xe5,0x10,0xb4,0x78,0x23,0xe4,0xf5,0x10, -+0x05,0x13,0xe5,0x0f,0x64,0x80,0x45,0x0e,0x70,0x06,0xf5,0x0e,0xf5,0x0f,0x80,0x06, -+0x75,0x0e,0x00,0x75,0x0f,0x80,0xe5,0x13,0xc3,0x13,0x90,0xfd,0x10,0xf0,0x80,0x06, -+0x74,0x08,0x25,0x10,0xf5,0x10,0xe5,0x12,0x15,0x12,0x70,0x02,0x15,0x11,0xe5,0x12, -+0x45,0x11,0x60,0x02,0x81,0xb8,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x1c,0x12,0x43, -+0x41,0x12,0x29,0xd9,0xff,0x54,0x01,0xfe,0x90,0x91,0x5e,0xe0,0x54,0xfe,0x4e,0xf0, -+0xef,0x54,0x04,0xff,0xe0,0x54,0xfb,0x4f,0xf0,0x12,0x29,0xd9,0xff,0x54,0x02,0xfe, -+0x90,0x91,0x5e,0xe0,0x54,0xfd,0x4e,0xf0,0xef,0x54,0x08,0xff,0xe0,0x54,0xf7,0x4f, -+0xf0,0x12,0x29,0xd9,0xff,0x54,0x10,0xfe,0x90,0x91,0x5e,0xe0,0x54,0xef,0x4e,0xf0, -+0xef,0x54,0x20,0xff,0xe0,0x54,0xdf,0x4f,0xf0,0x12,0x29,0xd9,0xff,0x54,0x40,0xfe, -+0x90,0x91,0x5e,0xe0,0x54,0xbf,0x4e,0xf0,0xef,0x54,0x80,0xff,0xe0,0x54,0x7f,0x4f, -+0xf0,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x91,0x60,0xf0,0x90,0x00,0x01,0x12,0x42, -+0x20,0x90,0x91,0x5f,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff,0x54,0x01,0xfe,0x90, -+0x91,0x61,0xe0,0x54,0xfe,0x4e,0xf0,0xef,0x54,0x02,0xff,0xe0,0x54,0xfd,0x4f,0xf0, -+0x90,0x00,0x03,0x12,0x42,0x20,0x54,0x04,0xff,0x90,0x91,0x61,0xe0,0x54,0xfb,0x4f, -+0xf0,0x90,0x91,0x5e,0xe0,0x54,0x01,0x90,0x01,0xb8,0xf0,0x90,0x91,0x5e,0xe0,0xff, -+0xc4,0x13,0x54,0x01,0x90,0x01,0xb9,0xf0,0x90,0x91,0x61,0xe0,0x54,0x01,0x90,0x01, -+0xba,0xf0,0xa3,0x74,0xff,0xf0,0x12,0x29,0xd9,0x20,0xe0,0x02,0x21,0xf1,0xe4,0xfd, -+0x7f,0x81,0x12,0x4b,0xee,0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x29,0xd9,0xff,0xc3, -+0x13,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x02,0xf0,0xef,0x13,0x13,0x54,0x3f, -+0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x04,0xf0,0x12,0x29,0xd9,0x13,0x13,0x13, -+0x54,0x1f,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x08,0xf0,0x90,0x91,0x61,0xe0, -+0x30,0xe0,0x1c,0x90,0x91,0x5e,0xe0,0xc4,0x13,0x54,0x07,0x30,0xe0,0x07,0xa3,0xe0, -+0xff,0xe4,0xfd,0x80,0x07,0x90,0x91,0x5f,0xe0,0xff,0x7d,0x01,0x12,0x4a,0xf6,0x22, -+0x75,0x30,0x1f,0x75,0x31,0x01,0xe4,0xf5,0x32,0x90,0x01,0x38,0xe5,0x30,0xf0,0xa3, -+0xe5,0x31,0xf0,0xa3,0xe5,0x32,0xf0,0x22,0x90,0x00,0x02,0xe0,0x54,0xe0,0x7f,0x01, -+0x60,0x02,0x7f,0x00,0x22,0x12,0x29,0xd9,0xf5,0x6d,0x22,0x90,0x01,0x64,0x74,0xa0, -+0xf0,0x22,0x90,0x91,0x51,0xe0,0x90,0x90,0xe8,0xf0,0x22,0x90,0x00,0xf3,0xe0,0x7f, -+0x00,0x30,0xe3,0x02,0x7f,0x01,0x22,0x90,0x06,0x34,0x74,0xff,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0x22,0xe4,0x90,0x91,0x4e,0xf0,0x90,0x00,0x80,0xe0,0x44,0x80, -+0xfd,0x7f,0x80,0x02,0x4b,0xee,0x90,0x00,0xf3,0xe0,0x30,0xe2,0x0d,0x90,0x05,0x41, -+0x74,0x10,0xf0,0x90,0x05,0x5a,0xf0,0xa3,0xe4,0xf0,0x22,0x12,0x29,0xd9,0x60,0x02, -+0x80,0x01,0xe4,0x90,0x91,0x31,0xf0,0x90,0x91,0x31,0xe0,0x90,0x01,0xe7,0xf0,0x22, -+0x90,0x91,0x51,0xe0,0xb4,0x01,0x0c,0x90,0x00,0xf2,0xe0,0x30,0xe7,0x05,0x7e,0xfd, -+0x7f,0x33,0x22,0x7e,0xfd,0x7f,0x2f,0x22,0x12,0x29,0xd9,0xff,0x54,0x01,0xfe,0x90, -+0x91,0x53,0xe0,0x54,0xfe,0x4e,0xf0,0xef,0xc3,0x13,0x30,0xe0,0x0a,0x90,0x00,0x01, -+0x12,0x42,0x20,0x90,0x91,0x54,0xf0,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x90, -+0xf7,0xf0,0xe0,0x60,0x04,0xe0,0xf4,0x70,0x21,0xa2,0xaf,0xe4,0x33,0xf5,0x0e,0xc2, -+0xaf,0x90,0x00,0x47,0xe0,0x54,0xfb,0xfd,0x7f,0x47,0x12,0x4b,0xee,0x7d,0x40,0x7f, -+0x01,0x12,0x36,0xaf,0xe5,0x0e,0x24,0xff,0x92,0xaf,0x22,0xc0,0xe0,0xc0,0xf0,0xc0, -+0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03, -+0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01,0xc4,0x74,0xcb,0xf0,0x74,0x57, -+0xa3,0xf0,0x90,0x01,0x34,0xe0,0x55,0x28,0xf5,0x2c,0x90,0x01,0x36,0xe0,0x55,0x2a, -+0xf5,0x2e,0xa3,0xe0,0x55,0x2b,0xf5,0x2f,0xe5,0x2c,0x30,0xe0,0x5a,0x90,0x01,0x34, -+0x74,0x01,0xf0,0x85,0xd9,0x54,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80,0x48,0x90, -+0x91,0x3b,0xe0,0x60,0x3a,0x90,0x01,0x5b,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x04,0xf0, -+0x51,0x30,0xef,0x64,0x01,0x70,0x30,0x90,0x91,0x66,0xf0,0x90,0x91,0x2d,0xe0,0x90, -+0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44,0x59,0x90,0x01,0x5b, -+0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x90,0x91,0x37,0xf0,0x80,0x08,0x51, -+0x30,0xbf,0x01,0x03,0x12,0x44,0xc2,0xe5,0x2c,0x30,0xe1,0x20,0x90,0x01,0x34,0x74, -+0x02,0xf0,0x85,0xd1,0x58,0x85,0xd2,0x59,0x85,0xd3,0x5a,0x85,0xd4,0x5b,0x85,0xd5, -+0x5c,0x85,0xd6,0x5d,0x85,0xd7,0x5e,0x85,0xd9,0x5f,0x71,0x5c,0xe5,0x2c,0x30,0xe3, -+0x10,0x90,0x01,0x34,0x74,0x08,0xf0,0x90,0x91,0x56,0xe0,0x30,0xe0,0x03,0x43,0x57, -+0x04,0xe5,0x2c,0x30,0xe4,0x09,0x90,0x01,0x34,0x74,0x10,0xf0,0x43,0x57,0x10,0xe5, -+0x2c,0x30,0xe5,0x26,0x90,0x01,0xcf,0xe0,0x30,0xe5,0x1f,0xe0,0x54,0xdf,0xf0,0x90, -+0x01,0x34,0x74,0x20,0xf0,0x75,0xa8,0x00,0x75,0xe8,0x00,0x12,0x4e,0xe4,0x90,0x00, -+0x03,0xe0,0x54,0xfb,0xf0,0x12,0x4a,0xe6,0x80,0xfe,0xe5,0x2c,0x30,0xe6,0x06,0x90, -+0x01,0x34,0x74,0x40,0xf0,0xe5,0x2e,0x30,0xe0,0x13,0x90,0x91,0x50,0x74,0x01,0xf0, -+0x90,0x01,0x36,0xf0,0x91,0x23,0x51,0x87,0x90,0x91,0x50,0xe4,0xf0,0xe5,0x2e,0x30, -+0xe1,0x3c,0x90,0x01,0x36,0x74,0x02,0xf0,0x43,0x57,0x40,0x90,0x01,0x02,0xe0,0x54, -+0x03,0x64,0x01,0x70,0x29,0x90,0x01,0x37,0xe0,0x30,0xe0,0x0a,0x74,0x01,0xf0,0x90, -+0x91,0x40,0xe4,0xf0,0x80,0x18,0x90,0x91,0x40,0xe0,0x04,0xf0,0xe0,0xc3,0x94,0x0a, -+0x40,0x0c,0xe4,0xf0,0x90,0x04,0x19,0xe0,0x30,0xe0,0x03,0x12,0x4f,0xf5,0xe5,0x2e, -+0x30,0xe2,0x19,0x90,0x01,0x36,0x74,0x04,0xf0,0x90,0x91,0x3a,0xe4,0xf0,0x90,0x05, -+0x58,0x74,0x03,0xf0,0x51,0xd8,0x90,0x91,0x3f,0xe0,0x04,0xf0,0xe5,0x2e,0x30,0xe3, -+0x28,0x90,0x01,0x36,0x74,0x08,0xf0,0xe5,0x6d,0x64,0x01,0x70,0x1c,0xe5,0x70,0x60, -+0x18,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x91,0x66,0xe4, -+0x12,0x44,0x49,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x2e,0x30,0xe4,0x2b,0x90,0x01, -+0x36,0x74,0x10,0xf0,0xe5,0x6d,0xb4,0x01,0x20,0xe5,0x70,0x60,0x1c,0x90,0x01,0x57, -+0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x91,0x3c,0xe4,0xf0,0x53,0x71,0xfd, -+0xe5,0x71,0x54,0x07,0x70,0x03,0x12,0x44,0xc2,0xe5,0x2e,0x30,0xe5,0x1f,0x90,0x01, -+0x36,0x74,0x20,0xf0,0xe5,0x6d,0xb4,0x01,0x14,0xe5,0x70,0x60,0x10,0x90,0x91,0x3b, -+0xe0,0x64,0x02,0x60,0x05,0x12,0x44,0xc8,0x80,0x03,0x12,0x44,0x77,0xe5,0x2e,0x30, -+0xe6,0x1b,0x90,0x01,0x36,0x74,0x40,0xf0,0xe5,0x6d,0xb4,0x01,0x10,0xe5,0x70,0x60, -+0x0c,0x53,0x71,0xfe,0xe5,0x71,0x54,0x07,0x70,0x03,0x12,0x44,0xc2,0xe5,0x2f,0x30, -+0xe1,0x08,0x90,0x01,0x37,0x74,0x02,0xf0,0x71,0x7e,0x74,0xcb,0x04,0x90,0x01,0xc4, -+0xf0,0x74,0x57,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0, -+0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32, -+0x90,0x04,0x1b,0xe0,0x54,0x7f,0x64,0x7f,0x7f,0x01,0x60,0x02,0x7f,0x00,0x22,0x51, -+0x30,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x30,0x90,0x91, -+0x37,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x22,0x90,0x91,0x36,0xe0, -+0x60,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x14,0xe5,0x6f,0x54,0x0f,0xd3,0x94, -+0x04,0x40,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01, -+0xb8,0x74,0x08,0xf0,0x7f,0x00,0x22,0x90,0x91,0x53,0xe0,0x30,0xe0,0x49,0xe5,0x6d, -+0x64,0x01,0x70,0x43,0x90,0x91,0x52,0xe0,0x04,0xf0,0xe5,0x70,0x64,0x03,0x60,0x05, -+0xe5,0x70,0xb4,0x06,0x0d,0x90,0x91,0x52,0xe0,0xff,0x74,0x01,0xd3,0x9f,0x50,0x14, -+0x80,0x07,0x90,0x91,0x52,0xe0,0xb4,0x0a,0x0b,0x90,0x91,0x55,0xe0,0x04,0xf0,0xe4, -+0x90,0x91,0x52,0xf0,0x90,0x91,0x55,0xe0,0xff,0x90,0x91,0x54,0xe0,0xb5,0x07,0x07, -+0x71,0x4e,0xe4,0x90,0x91,0x55,0xf0,0x22,0xe5,0x6d,0x64,0x01,0x70,0x63,0xe5,0x70, -+0x60,0x5f,0xe5,0x70,0x64,0x02,0x60,0x06,0xe5,0x70,0x64,0x05,0x70,0x27,0x90,0x06, -+0xab,0xe0,0x90,0x91,0x27,0xf0,0x90,0x06,0xaa,0xe0,0x90,0x91,0x39,0xf0,0x90,0x91, -+0x27,0xe0,0x70,0x07,0x90,0x91,0x39,0xe0,0xff,0x80,0x05,0x90,0x91,0x27,0xe0,0xff, -+0x90,0x91,0x27,0xef,0xf0,0x90,0x91,0x29,0xe0,0x60,0x03,0xe0,0x14,0xf0,0xe4,0x90, -+0x91,0x28,0xf0,0x90,0x01,0x57,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x53,0x71,0xfd, -+0x53,0x71,0xef,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80,0x03,0x12,0x45,0xc7,0x71, -+0x42,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xd0,0xd0,0x92,0xaf,0x22,0xe5,0x6e, -+0x30,0xe3,0x04,0xe4,0xff,0x80,0x02,0x7f,0x01,0x02,0x47,0xc9,0x90,0x91,0x08,0xe0, -+0x54,0xf0,0x44,0x03,0xf0,0x54,0x0f,0x44,0x80,0xf0,0x7b,0x00,0x7a,0x00,0x79,0x58, -+0x90,0x91,0x71,0x12,0x43,0x41,0x0b,0x7a,0x91,0x79,0x08,0x02,0x46,0xb7,0x90,0x91, -+0x80,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80, -+0x21,0x90,0x91,0x3b,0xe0,0x60,0x06,0x7d,0x01,0x7f,0x0c,0x80,0x0d,0xe5,0x6e,0x54, -+0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x27,0xe4,0xff,0x12, -+0x48,0xb3,0x22,0x51,0x30,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0, -+0x80,0x58,0xe5,0x71,0x54,0x03,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x4a, -+0xe5,0x6f,0x54,0x0f,0xd3,0x94,0x02,0x40,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80, -+0x39,0xe5,0x71,0x30,0xe2,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x2c,0xe5,0x71, -+0x30,0xe4,0x08,0x90,0x01,0xb9,0x74,0x10,0xf0,0x80,0x1f,0x90,0x91,0x29,0xe0,0x60, -+0x08,0x90,0x01,0xb9,0x74,0x20,0xf0,0x80,0x11,0x90,0x91,0x31,0xe0,0x60,0x08,0x90, -+0x01,0xb9,0x74,0x80,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74,0x04,0xf0, -+0x7f,0x00,0x22,0xe4,0xfb,0x90,0x91,0x78,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5, -+0x70,0x70,0x02,0x81,0xb5,0xe5,0x6d,0x64,0x01,0x70,0x7a,0xe5,0x70,0x14,0x60,0x2b, -+0x24,0xfd,0x60,0x27,0x24,0x02,0x24,0xfb,0x50,0x02,0x80,0x21,0x90,0x91,0x27,0xe0, -+0x14,0xf0,0xe0,0x60,0x04,0xa3,0xe0,0x60,0x14,0x90,0x91,0x27,0xe0,0x70,0x08,0x90, -+0x91,0x39,0xe0,0x90,0x91,0x27,0xf0,0x7b,0x01,0x80,0x02,0x7b,0x01,0xeb,0x60,0x45, -+0x43,0x71,0x10,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x3a,0xe0,0x75,0xf0,0x05,0xa4, -+0xff,0x90,0x91,0x34,0xe0,0x2f,0x12,0x44,0x4e,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5, -+0x6e,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x27,0x90, -+0x91,0x2e,0xe0,0x60,0x10,0x90,0x91,0x2c,0xe0,0x90,0x07,0x78,0x60,0x04,0x74,0x0d, -+0xf0,0x22,0x74,0x09,0xf0,0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0, -+0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0, -+0x06,0xc0,0x07,0x90,0x01,0xc4,0x74,0xb6,0xf0,0x74,0x5c,0xa3,0xf0,0x53,0x91,0xef, -+0x90,0x00,0x51,0xe0,0xff,0x90,0x00,0x55,0xe0,0x5f,0xf5,0x3d,0x90,0x00,0x52,0xe0, -+0xff,0x90,0x00,0x56,0xe0,0x5f,0xf5,0x3e,0xe5,0x3d,0x30,0xe4,0x06,0x90,0x00,0x55, -+0x74,0x10,0xf0,0xe5,0x3d,0x30,0xe5,0x06,0x90,0x00,0x55,0x74,0x20,0xf0,0xe5,0x3d, -+0x30,0xe6,0x1b,0x90,0x00,0x55,0x74,0x40,0xf0,0x90,0x90,0xf6,0xe0,0x54,0x03,0xff, -+0xbf,0x03,0x0b,0x90,0x90,0xf3,0xe0,0x60,0x05,0x7f,0x01,0x12,0x4c,0x03,0xe5,0x3d, -+0x30,0xe7,0x15,0x90,0x00,0x55,0x74,0x80,0xf0,0x90,0x90,0xf6,0xe0,0x54,0x03,0xff, -+0xbf,0x03,0x05,0x7f,0x02,0x12,0x4c,0x03,0xe5,0x3e,0x30,0xe0,0x06,0x90,0x00,0x56, -+0x74,0x01,0xf0,0xe5,0x3e,0x30,0xe1,0x06,0x90,0x00,0x56,0x74,0x02,0xf0,0xe5,0x3e, -+0x30,0xe2,0x06,0x90,0x00,0x56,0x74,0x04,0xf0,0xe5,0x3e,0x30,0xe3,0x06,0x90,0x00, -+0x56,0x74,0x08,0xf0,0x90,0x01,0xc4,0x74,0xb6,0xf0,0x74,0x5c,0xa3,0xf0,0xd0,0x07, -+0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0, -+0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0, -+0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04, -+0xc0,0x05,0xc0,0x06,0xc0,0x07,0x75,0x0d,0x00,0x90,0x01,0xc4,0x74,0x99,0xf0,0x74, -+0x5d,0xa3,0xf0,0x53,0x91,0xdf,0x90,0x01,0x3c,0xe0,0x55,0x30,0xf5,0x34,0xa3,0xe0, -+0x55,0x31,0xf5,0x35,0xa3,0xe0,0x55,0x32,0xf5,0x36,0xa3,0xe0,0x55,0x33,0xf5,0x37, -+0xe5,0x34,0x30,0xe0,0x06,0x90,0x01,0x3c,0x74,0x01,0xf0,0xe5,0x34,0x30,0xe1,0x08, -+0x90,0x01,0x3c,0x74,0x02,0xf0,0xf1,0x57,0xe5,0x34,0x30,0xe2,0x3a,0x90,0x01,0x3c, -+0x74,0x04,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe0,0x25,0x90,0x91,0x66,0xe4,0xf0,0x90, -+0x91,0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44, -+0x59,0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x80,0x08,0x90, -+0x91,0x37,0xe4,0xf0,0x12,0x44,0xc2,0xe5,0x34,0x30,0xe3,0x3a,0x90,0x01,0x3c,0x74, -+0x08,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe1,0x25,0x90,0x91,0x66,0xe4,0xf0,0x90,0x91, -+0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x12,0x44,0x59, -+0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x80,0x08,0x90,0x91, -+0x36,0xe4,0xf0,0x12,0x44,0xc2,0xe5,0x34,0x30,0xe4,0x09,0x90,0x01,0x3c,0x74,0x10, -+0xf0,0x12,0x53,0x86,0xe5,0x34,0x30,0xe5,0x09,0x90,0x01,0x3c,0x74,0x20,0xf0,0x12, -+0x6e,0xb9,0xe5,0x35,0x30,0xe0,0x5a,0x90,0x01,0x3d,0x74,0x01,0xf0,0x90,0x01,0x2f, -+0xe0,0x44,0x7f,0xf0,0x90,0x00,0x83,0xe0,0x54,0x0f,0xf5,0x0d,0xb4,0x01,0x02,0x80, -+0x1c,0xe5,0x0d,0xb4,0x02,0x05,0x90,0x00,0x83,0x80,0x12,0xe5,0x0d,0xb4,0x04,0x05, -+0x90,0x00,0x83,0x80,0x08,0xe5,0x0d,0xb4,0x0c,0x08,0x90,0x00,0x83,0xe0,0xf5,0x6f, -+0x80,0x06,0x90,0x01,0xbe,0xe0,0x04,0xf0,0x90,0x01,0xbb,0xe5,0x6f,0xf0,0xe5,0x6f, -+0x30,0xe0,0x03,0xa3,0x80,0x03,0x90,0x01,0xbd,0xe0,0x04,0xf0,0xf1,0x38,0x12,0x44, -+0xc2,0xe5,0x35,0x30,0xe2,0x06,0x90,0x01,0x3d,0x74,0x04,0xf0,0xe5,0x36,0x30,0xe0, -+0x06,0x90,0x01,0x3e,0x74,0x01,0xf0,0xe5,0x36,0x30,0xe1,0x06,0x90,0x01,0x3e,0x74, -+0x02,0xf0,0x74,0x99,0x04,0x90,0x01,0xc4,0xf0,0x74,0x5d,0xa3,0xf0,0xd0,0x07,0xd0, -+0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0, -+0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0xe5,0x6f,0x30,0xe6,0x19,0xe5,0x6f,0x54, -+0x0f,0xff,0x90,0x91,0x24,0xe0,0xfe,0x4f,0x90,0x01,0x2f,0xf0,0xee,0x64,0x80,0x90, -+0x91,0x24,0xf0,0x53,0x6f,0xbf,0x22,0xe4,0x90,0x91,0x0d,0xf0,0xe5,0x70,0x70,0x02, -+0xe1,0xe1,0x90,0x91,0x3c,0xe0,0x60,0x0d,0xe4,0xf0,0x53,0x71,0xfd,0xe5,0x71,0x54, -+0x07,0x70,0x6e,0x80,0x69,0x90,0x91,0x28,0xe0,0x04,0xf0,0x53,0x71,0xef,0x90,0x91, -+0x3a,0xe0,0x04,0xf0,0x90,0x91,0x0d,0xe0,0xf9,0xff,0x7e,0x00,0x24,0x01,0xfd,0xee, -+0x33,0xfc,0x90,0x91,0x3a,0xe0,0xb5,0x05,0x06,0xe4,0xb5,0x04,0x02,0x80,0x12,0xef, -+0x24,0x02,0xff,0xe4,0x3e,0xfe,0x90,0x91,0x3a,0xe0,0xb5,0x07,0x0a,0xe4,0xb5,0x06, -+0x06,0x90,0x05,0x58,0xe0,0x04,0xf0,0xe9,0xff,0x90,0x91,0x2f,0xe0,0x2f,0xff,0xe4, -+0x33,0xfe,0x90,0x91,0x28,0xe0,0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x40, -+0x0d,0xe5,0x6d,0xb4,0x01,0x0b,0xa3,0xe0,0x70,0x07,0xe0,0x04,0xf0,0x22,0x12,0x44, -+0xc2,0x22,0x8f,0x20,0x8c,0x21,0x8d,0x22,0x22,0x8f,0x23,0x8c,0x24,0x8d,0x25,0x22, -+0xe4,0x90,0x91,0x11,0xf0,0xa3,0xf0,0x90,0x02,0x86,0xe0,0x20,0xe1,0x2c,0xc3,0x90, -+0x91,0x12,0xe0,0x94,0x20,0x90,0x91,0x11,0xe0,0x94,0x03,0x40,0x0a,0x90,0x01,0xc6, -+0xe0,0x44,0x20,0xf0,0x7f,0x00,0x22,0x90,0x91,0x11,0xe4,0x75,0xf0,0x01,0x12,0x42, -+0x81,0x7f,0x01,0x7e,0x00,0x12,0x37,0x54,0x80,0xcd,0x7f,0x01,0x22,0x90,0x01,0xcc, -+0xe0,0x54,0x0f,0x90,0x91,0x11,0xf0,0x90,0x91,0x11,0xe0,0xfd,0x70,0x02,0x21,0x6f, -+0x90,0x91,0x9c,0xe0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33, -+0xce,0x33,0xce,0xd8,0xf9,0xff,0xef,0x5d,0x70,0x02,0x21,0x68,0x90,0x91,0x9c,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd0,0x12,0x43,0x15,0xe0,0x90,0x91,0x12,0xf0,0x75,0x63, -+0x01,0x75,0x64,0x91,0x75,0x65,0x12,0x75,0x66,0x01,0x7b,0x01,0x7a,0x91,0x79,0x13, -+0x12,0x46,0x6d,0x90,0x91,0x13,0xe0,0xff,0xc4,0x13,0x13,0x13,0x54,0x01,0x90,0x91, -+0x9c,0x30,0xe0,0x59,0xe0,0x75,0xf0,0x02,0x90,0x00,0x88,0x12,0x43,0x15,0xe0,0x90, -+0x91,0x14,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x02,0x90,0x00,0x89,0x12,0x43,0x15, -+0xe0,0x90,0x91,0x15,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd1,0x12, -+0x43,0x15,0xe0,0x90,0x91,0x16,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01, -+0xd2,0x12,0x43,0x15,0xe0,0x90,0x91,0x17,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04, -+0x90,0x01,0xd3,0x12,0x43,0x15,0xe0,0x90,0x91,0x18,0xf0,0x80,0x33,0xe0,0x75,0xf0, -+0x04,0x90,0x01,0xd1,0x12,0x43,0x15,0xe0,0x90,0x91,0x14,0xf0,0x90,0x91,0x9c,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x15,0xe0,0x90,0x91,0x15,0xf0,0x90,0x91, -+0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x15,0xe0,0x90,0x91,0x16,0xf0, -+0xef,0x54,0x7f,0xff,0x7b,0x01,0x7a,0x91,0x79,0x14,0x12,0x51,0xf8,0x90,0x91,0x11, -+0xe0,0xff,0x90,0x91,0x9c,0xe0,0xfe,0x74,0x01,0xa8,0x06,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0x5f,0x90,0x91,0x11,0xf0,0x90,0x91,0x9c,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0x90,0x01,0xcc,0xf0,0x90,0x91,0x9c,0xe0, -+0x04,0xf0,0xe0,0x54,0x03,0xf0,0x01,0x37,0x90,0x01,0xc6,0xe0,0x44,0x02,0xf0,0x22, -+0xad,0x07,0x74,0x11,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x01,0xf0, -+0x90,0x04,0x80,0xe0,0x54,0x0f,0xfc,0x74,0x14,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5, -+0x83,0xe0,0x54,0xc0,0x4c,0xfd,0x74,0x14,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xed,0xf0,0x22,0xef,0x60,0x0f,0x74,0x21,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xe0,0x44,0x10,0xf0,0x22,0x74,0x21,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0, -+0x54,0xef,0xf0,0x22,0xe4,0xf5,0x6d,0xf5,0x71,0xf5,0x70,0x75,0x6f,0x0c,0x75,0x6e, -+0x0c,0x90,0x91,0x3b,0xf0,0x90,0x91,0x37,0xf0,0x90,0x91,0x36,0xf0,0x90,0x91,0x39, -+0x04,0xf0,0x90,0x91,0x27,0xf0,0xe4,0x90,0x91,0x3c,0xf0,0x90,0x91,0x29,0xf0,0x90, -+0x91,0x34,0x74,0x07,0xf0,0xe4,0x90,0x91,0x28,0xf0,0x90,0x91,0x32,0xf0,0xa3,0x74, -+0x03,0xf0,0x90,0x91,0x2f,0x74,0x0a,0xf0,0xa3,0x74,0x05,0xf0,0x90,0x91,0x2d,0x74, -+0x14,0xf0,0x90,0x91,0x35,0x74,0x05,0xf0,0xe4,0x90,0x91,0x2b,0xf0,0x90,0x91,0x25, -+0xf0,0x90,0x91,0x50,0xf0,0x90,0x91,0x31,0xf0,0x90,0x91,0x3a,0xf0,0x90,0x91,0x26, -+0xf0,0x90,0x91,0x38,0xf0,0x90,0x91,0x2e,0xf0,0x90,0x91,0x2c,0xf0,0x22,0xe4,0x90, -+0x91,0x3c,0xf0,0x90,0x91,0x28,0xf0,0xf5,0x71,0x22,0x90,0x06,0x04,0xe0,0x54,0xbf, -+0xf0,0xef,0x60,0x0a,0xe5,0x6d,0xb4,0x01,0x05,0xe4,0xff,0x12,0x47,0xc9,0x53,0x6e, -+0xf0,0x43,0x6e,0x0c,0x22,0x90,0x91,0x9d,0xef,0xf0,0x51,0x7e,0x90,0x91,0x9d,0xe0, -+0x60,0x05,0x90,0x05,0x22,0xe4,0xf0,0x53,0x6e,0xf0,0x43,0x6e,0x04,0x22,0x90,0x00, -+0x11,0xe0,0x44,0x09,0xf0,0x12,0x4a,0xe6,0x90,0x90,0xd8,0x12,0x43,0x09,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0xdc,0x12,0x43, -+0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x90, -+0xe0,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f, -+0xd9,0x90,0x90,0xe4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x03,0x2d,0x95,0xe4,0xfd, -+0xff,0x12,0x34,0x81,0x90,0x91,0x51,0xe0,0xb4,0x01,0x11,0x90,0x80,0x59,0x12,0x2a, -+0x8b,0x00,0x03,0x2d,0x95,0xe4,0xfd,0x7f,0x01,0x12,0x34,0x81,0x22,0x8f,0x77,0xe4, -+0x90,0x91,0x96,0xf0,0xa3,0xf0,0x90,0x01,0x09,0xe0,0x7f,0x00,0x30,0xe7,0x02,0x7f, -+0x01,0xef,0x65,0x77,0x60,0x3e,0xc3,0x90,0x91,0x97,0xe0,0x94,0x88,0x90,0x91,0x96, -+0xe0,0x94,0x13,0x40,0x08,0x90,0x01,0xc6,0xe0,0x44,0x80,0xf0,0x22,0x90,0x91,0x96, -+0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x7f,0x14,0x7e,0x00,0x12,0x37,0x54,0xd3,0x90, -+0x91,0x97,0xe0,0x94,0x32,0x90,0x91,0x96,0xe0,0x94,0x00,0x40,0xb9,0x90,0x01,0xc7, -+0xe0,0x30,0xe0,0xb2,0x22,0x22,0x53,0x6e,0xf0,0x43,0x6e,0x01,0x71,0x55,0x71,0x67, -+0x53,0x6e,0xf0,0x43,0x6e,0x02,0x22,0x22,0x8f,0x78,0x12,0x47,0xe6,0xef,0x64,0x01, -+0x70,0x2e,0x90,0x91,0x44,0x12,0x48,0x1e,0xe5,0x78,0x60,0x10,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x80,0x0e,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xef,0xf0,0x90,0x04,0x1f,0x74,0x20,0xf0, -+0x22,0xe4,0xfb,0x90,0x91,0x7c,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x70,0x60, -+0x5f,0xe5,0x6d,0x64,0x01,0x70,0x59,0x0b,0x90,0x91,0x27,0xf0,0x04,0x60,0x51,0x43, -+0x71,0x10,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x3a,0xe0,0x75,0xf0,0x05,0xa4,0xff, -+0x90,0x91,0x34,0xe0,0x2f,0x90,0x91,0x67,0xf0,0xe4,0x1b,0x12,0x44,0x54,0x90,0x01, -+0x57,0x74,0x05,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f, -+0x04,0x12,0x47,0x27,0x90,0x91,0x2e,0xe0,0x60,0x11,0x90,0x91,0x2c,0xe0,0x90,0x07, -+0x78,0x60,0x05,0x74,0x0d,0xf0,0x80,0x03,0x74,0x09,0xf0,0x90,0x05,0x22,0xe4,0xf0, -+0x22,0x90,0x91,0x32,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0xd3,0x10,0xaf,0x01, -+0xc3,0xc0,0xd0,0x90,0x91,0x84,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0, -+0x90,0x91,0x84,0xe0,0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x2d,0xc3,0x90, -+0x91,0x87,0xe0,0x94,0xe8,0x90,0x91,0x86,0xe0,0x94,0x03,0x40,0x0b,0x90,0x01,0xc6, -+0xe0,0x44,0x10,0xf0,0x7f,0x00,0x80,0x15,0x90,0x91,0x86,0xe4,0x75,0xf0,0x01,0x12, -+0x42,0x81,0x7f,0x0a,0x7e,0x00,0x12,0x37,0x54,0x80,0xc5,0x7f,0x01,0xd0,0xd0,0x92, -+0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x1c,0x12,0x43,0x41,0x90, -+0x91,0x1f,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0x90,0x91,0x1c,0x12,0x43,0x21,0x90, -+0x00,0x01,0x12,0x42,0x20,0x90,0x91,0x3b,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0x90, -+0x91,0x25,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x01,0x90,0x91,0x26,0xf0, -+0xef,0xc3,0x13,0x54,0x01,0x90,0x91,0x2e,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff, -+0x13,0x13,0x54,0x01,0x90,0x91,0x2c,0xf0,0x90,0x91,0x2e,0xe0,0x90,0x91,0x1f,0x70, -+0x26,0x12,0x2a,0x8b,0x00,0x00,0x02,0x10,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x60,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x91,0x1f,0x12,0x2a, -+0x8b,0x00,0x00,0x03,0x10,0x80,0x24,0x12,0x2a,0x8b,0x00,0x00,0x01,0x10,0x90,0x91, -+0x1f,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x60,0x7e,0x08,0x12,0x2f, -+0xd9,0x90,0x91,0x1f,0x12,0x2a,0x8b,0x00,0x00,0x03,0x00,0x90,0x91,0x1f,0x12,0x43, -+0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x91, -+0x26,0xe0,0x70,0x3d,0x90,0x91,0x38,0x74,0x01,0xf0,0x7f,0x00,0x7e,0x08,0x12,0x27, -+0xde,0x90,0x91,0x1f,0x12,0x2a,0x7f,0x90,0x91,0x1f,0x12,0x43,0x09,0xec,0x44,0x02, -+0xfc,0x90,0x91,0x1f,0x12,0x2a,0x7f,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x02,0x86,0xe0,0x54,0xfb, -+0xf0,0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x49,0x7f,0x90,0x01,0xe5,0xe5,0x70,0xf0, -+0x90,0x91,0x3b,0xe0,0x90,0x01,0xe6,0xf0,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x02, -+0x12,0x42,0x20,0xff,0x30,0xe0,0x25,0x12,0x29,0xd9,0x90,0x91,0x2f,0xf0,0x90,0x00, -+0x01,0x12,0x42,0x20,0x90,0x91,0x30,0xf0,0xef,0xc3,0x13,0x54,0x7f,0x90,0x91,0x2d, -+0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0x90,0x91,0x35,0xf0,0x22,0x90,0x91,0x2f,0x74, -+0x0a,0xf0,0x90,0x91,0x30,0x74,0x05,0xf0,0x90,0x91,0x2d,0x74,0x14,0xf0,0x90,0x91, -+0x35,0x74,0x05,0xf0,0x22,0x12,0x29,0xd9,0x30,0xe0,0x19,0xc3,0x13,0x54,0x7f,0x90, -+0x91,0x34,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x90,0x91,0x32,0xe4,0xf0,0xa3, -+0xef,0xf0,0x80,0x0f,0x90,0x91,0x34,0x74,0x07,0xf0,0x90,0x91,0x32,0xe4,0xf0,0xa3, -+0x74,0x03,0xf0,0x90,0x91,0x32,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0x90,0x02, -+0x09,0xe0,0xfd,0x12,0x29,0xd9,0xfe,0xaf,0x05,0xed,0x2e,0x90,0x91,0x41,0xf0,0x90, -+0x00,0x01,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x42,0xf0,0x90,0x00,0x02,0x12, -+0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x43,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff, -+0xed,0x2f,0x90,0x91,0x44,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0xae,0x05,0xed, -+0x2f,0x90,0x91,0x45,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x47, -+0xe0,0x90,0x91,0x1d,0xf0,0x90,0x91,0x48,0xe0,0xf5,0x19,0xa3,0xe0,0xf5,0x1a,0xe4, -+0xf5,0x16,0x74,0x4a,0x25,0x16,0xf5,0x82,0xe4,0x34,0x91,0xf5,0x83,0xe0,0xff,0x74, -+0x1b,0x25,0x16,0xf8,0xa6,0x07,0x05,0x16,0xe5,0x16,0xb4,0x04,0xe5,0x90,0x91,0x1d, -+0xe0,0x12,0x43,0x4a,0x66,0xb3,0x00,0x67,0xdc,0x01,0x66,0xba,0x02,0x66,0xba,0x03, -+0x66,0xba,0x04,0x67,0xdc,0x05,0x67,0xac,0x80,0x67,0xc2,0x81,0x67,0xdc,0x82,0x00, -+0x00,0x67,0xd8,0xaf,0x1e,0x12,0x73,0xea,0xe1,0xdc,0x90,0x91,0x1d,0xe0,0xff,0xb4, -+0x02,0x08,0x90,0x91,0x1c,0x74,0x01,0xf0,0x80,0x0f,0xef,0x90,0x91,0x1c,0xb4,0x03, -+0x05,0x74,0x02,0xf0,0x80,0x03,0x74,0x04,0xf0,0xc3,0xe5,0x19,0x94,0x08,0x50,0x49, -+0xe4,0xf5,0x16,0x90,0x91,0x1c,0xe0,0xff,0xe5,0x16,0xc3,0x9f,0x40,0x02,0xe1,0xdc, -+0xc3,0xe5,0x19,0x94,0x01,0x50,0x14,0xe5,0x16,0x25,0x1a,0xff,0xc3,0x74,0x03,0x95, -+0x16,0x24,0x1b,0xf8,0xe6,0xfd,0x12,0x4b,0xee,0x80,0x1a,0xc3,0x74,0x03,0x95,0x16, -+0x24,0x1b,0xf8,0xe6,0xff,0xe5,0x16,0x7c,0x00,0x25,0x1a,0xfd,0xec,0x35,0x19,0x8d, -+0x82,0xf5,0x83,0xef,0xf0,0x05,0x16,0x80,0xba,0xc3,0xe5,0x19,0x94,0x10,0x40,0x02, -+0xe1,0xdc,0x90,0x91,0x1d,0xe0,0x64,0x04,0x60,0x02,0xe1,0xdc,0xaf,0x1c,0xfc,0xfd, -+0xfe,0x78,0x10,0x12,0x2a,0x6c,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0xaf,0x1b, -+0xe4,0xfc,0xfd,0xfe,0x78,0x18,0x12,0x2a,0x6c,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0, -+0x00,0x12,0x42,0xfc,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0xaf,0x1d,0xe4,0xfc, -+0xfd,0xfe,0x78,0x08,0x12,0x2a,0x6c,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0x12, -+0x42,0xfc,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab,0x07,0xaf,0x1e,0xe4,0xfc,0xfd,0xfe, -+0x12,0x42,0xfc,0xa3,0x12,0x2a,0x7f,0x90,0x91,0x1e,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0xaf,0x1a,0xae,0x19,0x12,0x2f,0xd9,0x80,0x30,0xe5,0x1d,0x7f,0x00, -+0xfe,0xef,0x25,0x1e,0xf5,0x18,0xe4,0x3e,0xf5,0x17,0xaf,0x18,0xfe,0x12,0x37,0x54, -+0x80,0x1a,0xe5,0x1d,0x7f,0x00,0xfe,0xef,0x25,0x1e,0xf5,0x18,0xe4,0x3e,0xf5,0x17, -+0xaf,0x18,0xfe,0x12,0x36,0xcb,0x80,0x04,0x7f,0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0, -+0x92,0xaf,0x22,0x22,0x8e,0x0e,0x8f,0x0f,0x8b,0x10,0x8a,0x11,0x89,0x12,0xe4,0x90, -+0x91,0x11,0xf0,0xef,0x90,0x00,0x31,0xf0,0x12,0x4a,0xe6,0xe5,0x0e,0x54,0x03,0xff, -+0x90,0x00,0x32,0xe0,0x54,0xfc,0x4f,0xf0,0x12,0x4a,0xe6,0x90,0x00,0x33,0xe0,0x54, -+0x7f,0xf0,0x12,0x4a,0xe6,0x90,0x00,0x33,0xe0,0x20,0xe7,0x0e,0x90,0x91,0x11,0xe0, -+0xc3,0x94,0x64,0x50,0x05,0xe0,0x04,0xf0,0x80,0xeb,0x90,0x91,0x11,0xe0,0xc3,0x94, -+0x64,0x50,0x10,0x90,0x00,0x30,0xe0,0xab,0x10,0xaa,0x11,0xa9,0x12,0x12,0x42,0x4d, -+0x7f,0x01,0x22,0x7f,0x00,0x22,0xe4,0x90,0x91,0x98,0xf0,0xa3,0xf0,0x90,0x05,0xf8, -+0xe0,0x70,0x0f,0xa3,0xe0,0x70,0x0b,0xa3,0xe0,0x70,0x07,0xa3,0xe0,0x70,0x03,0x7f, -+0x01,0x22,0xd3,0x90,0x91,0x99,0xe0,0x94,0xe8,0x90,0x91,0x98,0xe0,0x94,0x03,0x40, -+0x03,0x7f,0x00,0x22,0x7f,0x32,0x7e,0x00,0x12,0x37,0x54,0x90,0x91,0x98,0xe4,0x75, -+0xf0,0x01,0x12,0x42,0x81,0x80,0xc6,0xef,0x70,0x02,0x41,0x3d,0x90,0x90,0xe8,0xe0, -+0x60,0x02,0xc1,0x08,0x90,0x90,0xd4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x8c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0x80,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0x84,0x12,0x43,0x09, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0x88, -+0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x90,0x8c,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x90,0x90,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x74,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0x94,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0x98,0x12,0x43,0x09,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0x9c,0x12, -+0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x90,0xa0,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x90,0xa4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x88, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xa8,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x8c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xac,0x12,0x43,0x09,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0xd0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xb0,0x12,0x43, -+0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd4,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90, -+0xb4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd8,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x90,0xb8,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xdc,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x90,0xbc,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0xe0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xc0,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xc4,0x12,0x43,0x09, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x90,0xc8, -+0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9, -+0x90,0x90,0xcc,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09, -+0x12,0x2f,0xd9,0x90,0x90,0xd0,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x04,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0xe8,0x74,0x01,0xf0,0x22,0x90,0x90,0xe8, -+0xe0,0x64,0x01,0x60,0x02,0xc1,0x08,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x90, -+0xd4,0x12,0x2a,0x7f,0x7f,0x44,0x7e,0x08,0x12,0x27,0xde,0x90,0x90,0x80,0x12,0x2a, -+0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x27,0xde,0x90,0x90,0x84,0x12,0x2a,0x7f,0x7f,0x6c, -+0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x88,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12, -+0x27,0xde,0x90,0x90,0x8c,0x12,0x2a,0x7f,0x7f,0x74,0x7e,0x0e,0x12,0x27,0xde,0x90, -+0x90,0x90,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x94,0x12, -+0x2a,0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x98,0x12,0x2a,0x7f,0x7f, -+0x80,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x9c,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e, -+0x12,0x27,0xde,0x90,0x90,0xa0,0x12,0x2a,0x7f,0x7f,0x88,0x7e,0x0e,0x12,0x27,0xde, -+0x90,0x90,0xa4,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xa8, -+0x12,0x2a,0x7f,0x7f,0xd0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xac,0x12,0x2a,0x7f, -+0x7f,0xd4,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xb0,0x12,0x2a,0x7f,0x7f,0xd8,0x7e, -+0x0e,0x12,0x27,0xde,0x90,0x90,0xb4,0x12,0x2a,0x7f,0x7f,0xdc,0x7e,0x0e,0x12,0x27, -+0xde,0x90,0x90,0xb8,0x12,0x2a,0x7f,0x7f,0xe0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90, -+0xbc,0x12,0x2a,0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xc0,0x12,0x2a, -+0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x90,0xc4,0x12,0x2a,0x7f,0x7f,0x04, -+0x7e,0x0d,0x12,0x27,0xde,0x90,0x90,0xc8,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12, -+0x27,0xde,0x90,0x90,0xcc,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90, -+0x90,0xd0,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x91,0x88,0x12, -+0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xed,0x44,0xc0,0xfd,0xec,0x90,0x91,0x88, -+0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x8c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x01,0x00,0x00, -+0x7f,0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0xdb,0x25, -+0xa4,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb, -+0x25,0xa4,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20, -+0xdb,0x25,0xa4,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b, -+0x04,0x1b,0x25,0xa4,0x7f,0x74,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a, -+0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12, -+0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85, -+0x12,0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80, -+0x85,0x12,0x2a,0x8b,0x63,0xdb,0x25,0xa4,0x7f,0x84,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x80,0x85,0x12,0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x88,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0x8c,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd0,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd4,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd8,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f,0xdc, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f, -+0xe0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x24,0xdb,0x25,0xa4, -+0x7f,0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x91, -+0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xe4,0xff,0xec,0x90,0x91,0x88, -+0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x11,0xff,0xec,0x90,0x91, -+0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0d,0x12,0x27,0xde,0x90,0x91, -+0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x54,0xf0,0xff,0xec,0x90, -+0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x01,0xff,0xec, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xe4,0xff,0xec,0x90, -+0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x11,0xff,0xec, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xed,0x54,0x0f,0xfd, -+0xec,0x54,0xf0,0xfc,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09, -+0xed,0x44,0x10,0xfd,0xec,0x44,0x01,0xfc,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91, -+0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f, -+0xd9,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91, -+0x88,0x12,0x43,0x09,0xef,0x54,0xf0,0xff,0xec,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90, -+0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x01,0xff,0xec,0x90,0x91,0x88,0x12,0x2a,0x7f, -+0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08, -+0x12,0x2f,0xd9,0xe4,0x90,0x90,0xe8,0xf0,0x22,0xe4,0xfd,0x7f,0x45,0x12,0x4b,0xee, -+0x90,0x04,0xfd,0xe4,0xf0,0xa3,0xf0,0x90,0x90,0xf7,0xf0,0x90,0x90,0xfd,0xf0,0x90, -+0x91,0x00,0xf0,0x90,0x90,0xfe,0xf0,0x90,0x91,0x01,0xf0,0x90,0x90,0xff,0xf0,0x90, -+0x91,0x02,0xf0,0x90,0x90,0xe9,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90, -+0x90,0xee,0xf0,0x90,0x90,0xf3,0xf0,0x90,0x90,0xf5,0xf0,0x90,0x91,0x07,0xf0,0x90, -+0x90,0xf8,0xf0,0x90,0x90,0xf4,0xf0,0x90,0x90,0xed,0xf0,0x90,0x00,0x51,0xe0,0x44, -+0xc0,0xfd,0x7f,0x51,0x02,0x4b,0xee,0x90,0x05,0x60,0xe0,0x90,0x91,0x03,0xf0,0x90, -+0x05,0x61,0xe0,0x90,0x91,0x04,0xf0,0x90,0x05,0x62,0xe0,0x90,0x91,0x05,0xf0,0x90, -+0x05,0x63,0xe0,0x90,0x91,0x06,0xf0,0xc3,0x74,0xff,0x9f,0xfe,0x90,0x91,0x04,0xe0, -+0xd3,0x9e,0x40,0x1e,0xe0,0x2f,0xf0,0xa3,0xe0,0xb4,0xff,0x0f,0xe4,0xf0,0xa3,0xe0, -+0xb4,0xff,0x03,0xe4,0xf0,0x22,0x90,0x91,0x06,0x80,0x03,0x90,0x91,0x05,0xe0,0x04, -+0xf0,0x22,0x90,0x91,0x04,0xe0,0x2f,0xf0,0x22,0x90,0x90,0xf5,0xe0,0x64,0x01,0x60, -+0x02,0xe1,0x6e,0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46,0x12,0x4b,0xee,0x90, -+0x91,0x07,0xe0,0x70,0x32,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xf9,0x12,0x43, -+0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x80,0x06, -+0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x90,0xf4,0xe0,0xff,0xd1,0x67,0x90,0x91,0x07, -+0x74,0x01,0x12,0x4b,0xe4,0x80,0x40,0x90,0x91,0x07,0xe0,0x64,0x01,0x70,0x38,0x90, -+0x90,0xf8,0xe0,0xff,0xd1,0x67,0xe4,0x90,0x91,0x07,0xf0,0x90,0x00,0x45,0xe0,0x44, -+0x01,0xfd,0x7f,0x45,0x12,0x4b,0xee,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xef, -+0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9, -+0x80,0x05,0x90,0x05,0x22,0xe4,0xf0,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x91, -+0x03,0xe0,0x90,0x05,0x84,0xf0,0x90,0x91,0x04,0xe0,0x90,0x05,0x85,0xf0,0x90,0x91, -+0x05,0xe0,0x90,0x05,0x86,0xf0,0x90,0x91,0x06,0xe0,0x90,0x05,0x87,0xf0,0x22,0x90, -+0x90,0xee,0xe0,0xc3,0x94,0x14,0x50,0x06,0xe0,0x04,0xf0,0x02,0x70,0x29,0x90,0x90, -+0xee,0xe0,0x64,0x14,0x60,0x03,0x02,0x70,0x29,0x90,0x90,0xfd,0xe0,0x70,0x25,0x90, -+0x91,0x00,0xe0,0x70,0x1f,0x90,0x90,0xfe,0xe0,0x70,0x19,0x90,0x91,0x01,0xe0,0x70, -+0x13,0x90,0x90,0xff,0xe0,0x70,0x0d,0x90,0x91,0x02,0xe0,0x70,0x07,0x90,0x04,0xfd, -+0xe0,0x54,0xfe,0xf0,0x90,0x90,0xfd,0xe0,0x90,0x04,0x44,0xf0,0x90,0x90,0xfe,0xe0, -+0x90,0x04,0x45,0xf0,0x90,0x90,0xff,0xe0,0x90,0x04,0x46,0xf0,0xa3,0xe4,0xf0,0x90, -+0x91,0x00,0xe0,0x90,0x04,0x48,0xf0,0x90,0x91,0x01,0xe0,0x90,0x04,0x49,0xf0,0x90, -+0x91,0x02,0xe0,0x90,0x04,0x4a,0xf0,0xa3,0xe4,0xf0,0x90,0x90,0xe9,0xe0,0x90,0x04, -+0x4c,0xf0,0x90,0x90,0xea,0xe0,0x90,0x04,0x4d,0xf0,0x90,0x90,0xeb,0xe0,0x90,0x04, -+0x4e,0xf0,0x90,0x90,0xec,0xe0,0x90,0x04,0x4f,0xf0,0xe4,0x90,0x90,0xee,0xf0,0x90, -+0x90,0xe9,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x90,0xfd,0xf0,0xa3, -+0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x05,0x60,0xe0,0x90,0x91,0x8c, -+0xf0,0x90,0x05,0x61,0xe0,0x90,0x91,0x8d,0xf0,0x90,0x05,0x62,0xe0,0x90,0x91,0x8e, -+0xf0,0x90,0x05,0x63,0xe0,0x90,0x91,0x8f,0xf0,0x90,0x91,0x06,0xe0,0xff,0x90,0x91, -+0x8f,0xe0,0xfe,0xd3,0x9f,0x50,0x0b,0x90,0x91,0x06,0xe0,0xc3,0x9e,0xd3,0x94,0x01, -+0x40,0x11,0x90,0x90,0xf4,0xe0,0xb4,0x01,0x02,0x80,0x03,0x90,0x90,0xf8,0xe0,0xff, -+0x12,0x6e,0x67,0x22,0x90,0x91,0x07,0xe0,0x64,0x01,0x60,0x08,0x90,0x90,0xf5,0xe0, -+0x60,0x02,0x21,0x4b,0x90,0x90,0xe9,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0, -+0x80,0x3b,0x90,0x90,0xea,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80, -+0x28,0x90,0x90,0xeb,0xe0,0xc3,0x94,0xff,0x50,0x0a,0xe0,0x04,0xf0,0xe4,0x90,0x90, -+0xea,0xf0,0x80,0x15,0x90,0x90,0xec,0xe0,0xc3,0x94,0xff,0x50,0x10,0xe0,0x04,0xf0, -+0xe4,0x90,0x90,0xeb,0xf0,0x90,0x90,0xea,0xf0,0x90,0x90,0xe9,0xf0,0x90,0x00,0x44, -+0xe0,0x54,0x0c,0x60,0x76,0xe0,0x30,0xe2,0x32,0x90,0x90,0xfd,0xe0,0xc3,0x94,0xff, -+0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90,0x90,0xfe,0xe0,0xc3,0x94,0xff,0x50,0x06, -+0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x90,0xff,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0, -+0x04,0xf0,0xe4,0x90,0x90,0xfe,0xf0,0x90,0x90,0xfd,0xf0,0x90,0x00,0x44,0xe0,0x30, -+0xe3,0x32,0x90,0x91,0x00,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24, -+0x90,0x91,0x01,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90, -+0x91,0x02,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x91,0x01,0xf0, -+0x90,0x91,0x00,0xf0,0x90,0x04,0xfd,0xe0,0x44,0x01,0xf0,0x22,0x90,0x06,0x90,0xe0, -+0x44,0x01,0xf0,0x90,0x91,0x61,0xe0,0x30,0xe0,0x3c,0x90,0x91,0x5f,0xe0,0xff,0x90, -+0x91,0x5e,0xe0,0xfe,0xc4,0x13,0x54,0x01,0xfd,0x12,0x4a,0xf6,0x90,0x91,0x60,0xe0, -+0x75,0xf0,0x20,0xa4,0xff,0xae,0xf0,0x12,0x37,0x54,0x90,0x91,0x5e,0xe0,0xc4,0x13, -+0x54,0x07,0x30,0xe0,0x07,0xa3,0xe0,0xff,0xe4,0xfd,0x80,0x07,0x90,0x91,0x5f,0xe0, -+0xff,0x7d,0x01,0x12,0x4a,0xf6,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xe4,0x90, -+0x91,0x19,0xf0,0xa3,0x74,0x08,0xf0,0xa3,0xf0,0xe4,0xa3,0xf0,0x90,0x01,0x1f,0xe0, -+0xfe,0x90,0x01,0x1e,0xe0,0x7c,0x00,0x24,0x00,0xff,0xec,0x3e,0x90,0x91,0x11,0xf0, -+0xa3,0xef,0xf0,0x90,0x02,0x87,0xe0,0x90,0x91,0x18,0xf0,0x90,0x91,0x56,0xe0,0x20, -+0xe0,0x02,0x61,0xc4,0xe4,0x90,0x91,0x17,0xf0,0x90,0x91,0x18,0xe0,0xff,0x90,0x91, -+0x17,0xe0,0xc3,0x9f,0x40,0x02,0x61,0xc4,0x90,0x91,0x11,0xe0,0xfc,0xa3,0xe0,0xfd, -+0xec,0xff,0x90,0xfd,0x11,0xf0,0x90,0x91,0x1c,0xef,0xf0,0x74,0x02,0x2d,0xf5,0x82, -+0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x54,0x0f,0xfc,0x33,0x33,0x33,0x54,0xf8,0xff,0xed, -+0x24,0x18,0x2f,0x90,0x91,0x15,0xf0,0xe0,0x24,0x00,0xf5,0x82,0xe4,0x34,0xfb,0xf5, -+0x83,0xe0,0x54,0xfc,0x90,0x91,0x16,0xf0,0x74,0x01,0x2d,0xf5,0x82,0xe4,0x34,0xfb, -+0xf5,0x83,0xe0,0xfe,0x74,0x00,0x2d,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x7a, -+0x00,0x24,0x00,0xff,0xea,0x3e,0x54,0x3f,0xab,0x07,0xfa,0x90,0x91,0x13,0xf0,0xa3, -+0xeb,0xf0,0xaf,0x04,0xef,0x75,0xf0,0x08,0xa4,0x24,0x18,0xff,0xe4,0x35,0xf0,0xfe, -+0xef,0x2b,0xfb,0xee,0x3a,0xfa,0x90,0x91,0x5a,0xe0,0xfe,0xa3,0xe0,0xff,0xad,0x03, -+0xac,0x02,0x12,0x45,0x09,0xaa,0x06,0xab,0x07,0x90,0x91,0x15,0xe0,0x24,0x00,0xf5, -+0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x30,0xe7,0x08,0x90,0x91,0x19,0x74,0x02,0xf0, -+0x80,0x05,0xe4,0x90,0x91,0x19,0xf0,0xaf,0x03,0x90,0x91,0x11,0xea,0x8f,0xf0,0x12, -+0x42,0x81,0x90,0x91,0x5c,0xe0,0xfe,0xa3,0xe0,0xff,0x90,0x91,0x11,0xe0,0xfc,0xa3, -+0xe0,0xfd,0xd3,0x9f,0xec,0x9e,0x40,0x1b,0x90,0x91,0x5d,0xe0,0x24,0x01,0xff,0x90, -+0x91,0x5c,0xe0,0x34,0x00,0xfe,0xc3,0xed,0x9f,0xff,0xec,0x9e,0x90,0x91,0x11,0xf0, -+0xa3,0xef,0xf0,0x90,0x91,0x16,0xe0,0xff,0x24,0x40,0x60,0x04,0x24,0x20,0x70,0x27, -+0x90,0x91,0x5e,0xe0,0xfe,0xc4,0x13,0x13,0x13,0x54,0x01,0x20,0xe0,0x02,0x61,0x9c, -+0xef,0x90,0x00,0x81,0xb4,0xa0,0x05,0xe0,0x44,0x04,0x80,0x03,0xe0,0x44,0x08,0xfd, -+0x7f,0x81,0x12,0x4b,0xee,0x61,0x95,0x90,0x91,0x5e,0xe0,0xc4,0x13,0x13,0x54,0x03, -+0x20,0xe0,0x02,0x61,0x9c,0x90,0x91,0x15,0xe0,0xff,0x24,0x00,0xf5,0x82,0xe4,0x34, -+0xfb,0xf5,0x83,0xe0,0x54,0x0c,0x64,0x08,0x70,0x72,0x90,0x91,0x19,0xe0,0xfe,0xef, -+0x2e,0xff,0xa3,0xe0,0x2f,0xff,0x24,0x1e,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0, -+0x64,0x88,0x70,0x58,0x74,0x1f,0x2f,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x64, -+0x8e,0x70,0x49,0x90,0x91,0x19,0xe0,0xff,0x90,0x91,0x15,0xe0,0x2f,0xff,0x90,0x91, -+0x1a,0xe0,0x2f,0xff,0xa3,0xe0,0x2f,0xff,0x24,0x19,0xf5,0x82,0xe4,0x34,0xfb,0xf5, -+0x83,0xe0,0x64,0x03,0x70,0x26,0x74,0x1e,0x2f,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83, -+0xe0,0x90,0x00,0x81,0x30,0xe3,0x05,0xe0,0x44,0x01,0x80,0x03,0xe0,0x44,0x02,0xfd, -+0x7f,0x81,0x12,0x4b,0xee,0x90,0x91,0x56,0xe0,0x44,0x80,0xf0,0x90,0x91,0x56,0xe0, -+0xff,0xc4,0x13,0x13,0x13,0x54,0x01,0x30,0xe0,0x02,0x31,0x4c,0x71,0xc9,0xbf,0x01, -+0x13,0x90,0x91,0x11,0xe0,0xfe,0xa3,0xe0,0xff,0x12,0x44,0xb5,0x90,0x91,0x17,0xe0, -+0x04,0xf0,0x21,0xd9,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x56,0xe0,0xc4,0x13,0x13, -+0x13,0x54,0x01,0x30,0xe0,0x11,0xe0,0x44,0x80,0xf0,0x90,0x91,0x5e,0xe0,0xc4,0x54, -+0x0f,0x20,0xe0,0x03,0x7f,0x00,0x22,0x7f,0x01,0x22,0x8f,0x1f,0xe4,0x90,0x91,0x22, -+0xf0,0xe5,0x1f,0x14,0xfe,0x90,0x91,0x22,0xe0,0xff,0xc3,0x9e,0x50,0x0e,0xef,0x04, -+0xfd,0x12,0x34,0xb7,0x90,0x91,0x22,0xe0,0x04,0xf0,0x80,0xe5,0xe5,0x1f,0x14,0xff, -+0x7d,0xff,0x12,0x34,0xb7,0x90,0x91,0x22,0xe5,0x1f,0xf0,0x90,0x91,0x22,0xe0,0xc3, -+0x94,0xff,0x50,0x0f,0xe0,0xff,0x04,0xfd,0x12,0x34,0xb7,0x90,0x91,0x22,0xe0,0x04, -+0xf0,0x80,0xe8,0xad,0x1f,0x7f,0xff,0x02,0x34,0xb7,0xc3,0xee,0x94,0x01,0x40,0x0a, -+0x0d,0xed,0x13,0x90,0xfd,0x10,0xf0,0xe4,0x2f,0xff,0x22,0xc3,0xee,0x94,0x01,0x40, -+0x1e,0x90,0xfd,0x11,0xe0,0xb5,0x05,0x14,0x90,0x01,0x17,0xe0,0xb5,0x05,0x07,0x90, -+0xfd,0x11,0xe4,0xf0,0x80,0x06,0xed,0x04,0x90,0xfd,0x11,0xf0,0xe4,0x2f,0xff,0x22, -+0x0f,0x75,}; -+ -+u8 Rtl8192CUFwUMCACutWWImgArray[UMCACutWWImgArrayLength] = { -+0xc1,0x88,0x02,0x00,0x51,0x00,0x00,0x00,0x03,0x23,0x16,0x44,0x72,0x34,0x01,0x00, -+0x58,0x92,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x02,0x43,0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x57,0xcb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x5c,0xb6,0x00,0x00,0x00,0x00,0x00,0x02,0x5d,0x99,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0xbb,0x01,0x0c,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0,0x22,0x50, -+0x06,0xe9,0x25,0x82,0xf8,0xe6,0x22,0xbb,0xfe,0x06,0xe9,0x25,0x82,0xf8,0xe2,0x22, -+0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe4,0x93,0x22,0xbb,0x01,0x06, -+0x89,0x82,0x8a,0x83,0xf0,0x22,0x50,0x02,0xf7,0x22,0xbb,0xfe,0x01,0xf3,0x22,0xf8, -+0xbb,0x01,0x0d,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0x22, -+0x50,0x06,0xe9,0x25,0x82,0xc8,0xf6,0x22,0xbb,0xfe,0x05,0xe9,0x25,0x82,0xc8,0xf2, -+0x22,0xc5,0xf0,0xf8,0xa3,0xe0,0x28,0xf0,0xc5,0xf0,0xf8,0xe5,0x82,0x15,0x82,0x70, -+0x02,0x15,0x83,0xe0,0x38,0xf0,0x22,0xbb,0x01,0x10,0xe5,0x82,0x29,0xf5,0x82,0xe5, -+0x83,0x3a,0xf5,0x83,0xe0,0xf5,0xf0,0xa3,0xe0,0x22,0x50,0x09,0xe9,0x25,0x82,0xf8, -+0x86,0xf0,0x08,0xe6,0x22,0xbb,0xfe,0x0a,0xe9,0x25,0x82,0xf8,0xe2,0xf5,0xf0,0x08, -+0xe2,0x22,0xe5,0x83,0x2a,0xf5,0x83,0xe9,0x93,0xf5,0xf0,0xa3,0xe9,0x93,0x22,0xf8, -+0xbb,0x01,0x11,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0xe5, -+0xf0,0xa3,0xf0,0x22,0x50,0x09,0xe9,0x25,0x82,0xc8,0xf6,0x08,0xa6,0xf0,0x22,0xbb, -+0xfe,0x09,0xe9,0x25,0x82,0xc8,0xf2,0xe5,0xf0,0x08,0xf2,0x22,0xef,0x4b,0xff,0xee, -+0x4a,0xfe,0xed,0x49,0xfd,0xec,0x48,0xfc,0x22,0xe0,0xfc,0xa3,0xe0,0xfd,0xa3,0xe0, -+0xfe,0xa3,0xe0,0xff,0x22,0xa4,0x25,0x82,0xf5,0x82,0xe5,0xf0,0x35,0x83,0xf5,0x83, -+0x22,0xe0,0xfb,0xa3,0xe0,0xfa,0xa3,0xe0,0xf9,0x22,0xf8,0xe0,0xfb,0xa3,0xa3,0xe0, -+0xf9,0x25,0xf0,0xf0,0xe5,0x82,0x15,0x82,0x70,0x02,0x15,0x83,0xe0,0xfa,0x38,0xf0, -+0x22,0xeb,0xf0,0xa3,0xea,0xf0,0xa3,0xe9,0xf0,0x22,0xd0,0x83,0xd0,0x82,0xf8,0xe4, -+0x93,0x70,0x12,0x74,0x01,0x93,0x70,0x0d,0xa3,0xa3,0x93,0xf8,0x74,0x01,0x93,0xf5, -+0x82,0x88,0x83,0xe4,0x73,0x74,0x02,0x93,0x68,0x60,0xef,0xa3,0xa3,0xa3,0x80,0xdf, -+0xd0,0x83,0xd0,0x82,0xf8,0xe4,0x93,0x70,0x12,0x74,0x01,0x93,0x70,0x0d,0xa3,0xa3, -+0x93,0xf8,0x74,0x01,0x93,0xf5,0x82,0x88,0x83,0xe4,0x73,0x74,0x02,0x93,0xb5,0xf0, -+0x06,0x74,0x03,0x93,0x68,0x60,0xe9,0xa3,0xa3,0xa3,0xa3,0x80,0xd8,0x02,0x43,0xdb, -+0x02,0x50,0x2a,0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0x40,0x03,0xf6,0x80,0x01,0xf2, -+0x08,0xdf,0xf4,0x80,0x29,0xe4,0x93,0xa3,0xf8,0x54,0x07,0x24,0x0c,0xc8,0xc3,0x33, -+0xc4,0x54,0x0f,0x44,0x20,0xc8,0x83,0x40,0x04,0xf4,0x56,0x80,0x01,0x46,0xf6,0xdf, -+0xe4,0x80,0x0b,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x90,0x44,0x20,0xe4,0x7e, -+0x01,0x93,0x60,0xbc,0xa3,0xff,0x54,0x3f,0x30,0xe5,0x09,0x54,0x1f,0xfe,0xe4,0x93, -+0xa3,0x60,0x01,0x0e,0xcf,0x54,0xc0,0x25,0xe0,0x60,0xa8,0x40,0xb8,0xe4,0x93,0xa3, -+0xfa,0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca, -+0xf0,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xdf,0xe9,0xde,0xe7,0x80,0xbe, -+0x41,0x91,0x40,0x00,0x41,0x91,0x9c,0x00,0x41,0x91,0x23,0x80,0x41,0x91,0x24,0x80, -+0x41,0x91,0x9e,0x00,0x41,0x91,0x52,0x00,0x41,0x91,0x93,0x00,0x41,0x91,0x91,0x00, -+0x41,0x91,0x90,0x00,0x41,0x91,0x92,0x00,0x00,0xf0,0x90,0x91,0x30,0xe0,0x90,0x91, -+0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x54,0x7e,0x01,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0x65,0xeb,0xf0,0xa3,0xe0,0xfb,0xa3,0xe0,0xf5,0x44,0xe4,0xf5,0x45,0x12, -+0x30,0x62,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x01,0x5f,0xe4,0xf0,0x90,0x01,0x3c,0x74, -+0x08,0xf0,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4, -+0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x59,0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06, -+0x92,0x74,0x02,0xf0,0x90,0x91,0x36,0x14,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x0c, -+0x50,0x02,0xf1,0x23,0x22,0x90,0x02,0x84,0xef,0xf0,0xa3,0xee,0xf0,0xa3,0x74,0x05, -+0xf0,0x22,0x7d,0x01,0xaf,0x6f,0xe1,0x27,0xf1,0xe6,0xbf,0x01,0x10,0x90,0x91,0x42, -+0xe0,0xff,0xe4,0xfd,0x12,0x48,0x22,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x8f,0x82, -+0x8e,0x83,0xa3,0xa3,0xa3,0xe4,0xf0,0x22,0xe4,0xf5,0x72,0x7f,0x60,0x7e,0x01,0x80, -+0xed,0x7f,0x00,0x22,0x90,0x91,0x53,0xe0,0x54,0xfe,0xf0,0x02,0x50,0xd6,0x22,0xe4, -+0xf5,0x75,0x22,0x02,0x5f,0xe2,0x02,0x5f,0xe9,0xef,0x8e,0xf0,0x71,0x70,0x45,0x26, -+0x00,0x40,0x45,0x4e,0x00,0x80,0x45,0x79,0x01,0x00,0x45,0x8d,0x02,0x00,0x45,0xa5, -+0x04,0x00,0x00,0x00,0x45,0xc2,0xed,0x54,0x3f,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e, -+0x00,0x7f,0x40,0xef,0x2d,0xff,0xee,0x3c,0xfe,0xef,0x78,0x06,0xce,0xc3,0x13,0xce, -+0x13,0xd8,0xf9,0x78,0x06,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0x80,0x26,0xed,0x54, -+0x7f,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e,0x00,0x7f,0x80,0xef,0x2d,0xff,0xee,0x3c, -+0xfe,0xef,0x78,0x07,0xce,0xc3,0x13,0xce,0x13,0xd8,0xf9,0x78,0x07,0xc3,0x33,0xce, -+0x33,0xce,0xd8,0xf9,0xfd,0xac,0x06,0x80,0x49,0xed,0x70,0x04,0xfe,0xff,0x80,0x04, -+0x7e,0x01,0x7f,0x00,0xef,0x2d,0xee,0x3c,0x7d,0x00,0xfc,0x80,0x35,0xec,0x54,0x01, -+0x4d,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e,0x02,0x7f,0x00,0xef,0x2d,0xee,0x3c,0xc3, -+0x13,0x7d,0x00,0x80,0x1a,0xec,0x54,0x03,0x4d,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e, -+0x04,0x7f,0x00,0xef,0x2d,0xee,0x3c,0x13,0x13,0x54,0x3f,0x7d,0x00,0x25,0xe0,0x25, -+0xe0,0xfc,0xae,0x04,0xaf,0x05,0x22,0x90,0x91,0x09,0x12,0x25,0x14,0x00,0x00,0x00, -+0x00,0x90,0x06,0xa9,0xe0,0x90,0x91,0x08,0xf0,0xe0,0x54,0xc0,0x70,0x0a,0x53,0x71, -+0xfe,0x53,0x71,0xfd,0x91,0xc2,0x80,0x47,0x90,0x91,0x26,0xe0,0x60,0x41,0x90,0x91, -+0x38,0xe0,0x70,0x3b,0x90,0x91,0x38,0x74,0x01,0xf0,0x7f,0x00,0x7e,0x08,0x12,0x22, -+0x65,0x90,0x91,0x09,0x12,0x25,0x08,0x90,0x91,0x09,0x71,0x09,0xec,0x44,0x02,0xfc, -+0x90,0x91,0x09,0x12,0x25,0x08,0x90,0x91,0x09,0x71,0x09,0x90,0x80,0x96,0x12,0x25, -+0x08,0x7f,0x00,0x7e,0x08,0x12,0x2b,0x08,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x90, -+0x91,0x08,0xe0,0x30,0xe6,0x13,0x43,0x71,0x01,0x90,0x91,0x3b,0xe0,0x64,0x02,0x60, -+0x04,0x91,0xc8,0x80,0x07,0x91,0x77,0x80,0x03,0x53,0x71,0xfe,0x90,0x91,0x08,0xe0, -+0x30,0xe7,0x16,0x43,0x71,0x02,0xe4,0x90,0x91,0x66,0x91,0x49,0x90,0x01,0x57,0x74, -+0x05,0xf0,0x90,0x91,0x3c,0x74,0x01,0xf0,0x22,0x53,0x71,0xfd,0x22,0xd3,0x10,0xaf, -+0x01,0xc3,0xc0,0xd0,0x8b,0x60,0x8a,0x61,0x89,0x62,0x90,0x91,0x68,0x71,0x41,0xab, -+0x63,0xaa,0x64,0xa9,0x65,0x90,0x91,0x6b,0x71,0x41,0xaf,0x66,0x15,0x66,0xef,0x60, -+0x1b,0x90,0x91,0x6b,0xe4,0x75,0xf0,0x01,0x71,0x2a,0x12,0x24,0x62,0xff,0x90,0x91, -+0x68,0xe4,0x75,0xf0,0x01,0x71,0x2a,0xef,0x51,0x4d,0x80,0xde,0xab,0x60,0xaa,0x61, -+0xa9,0x62,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91, -+0x6e,0x71,0x41,0x90,0x91,0x9e,0xe0,0xff,0x04,0xf0,0x90,0x00,0x01,0xef,0x51,0x5f, -+0x7f,0xaf,0x7e,0x01,0x12,0x64,0x1c,0xef,0x60,0x44,0x90,0x91,0x6e,0x71,0x21,0x8b, -+0x63,0x8a,0x64,0x89,0x65,0x75,0x66,0x02,0x7b,0x01,0x7a,0x01,0x79,0xa0,0xd1,0x6d, -+0x90,0x91,0x71,0x71,0x21,0x8b,0x63,0x8a,0x64,0x89,0x65,0x90,0x91,0x6e,0x71,0x21, -+0x12,0x24,0x62,0xff,0xc4,0x54,0x0f,0xf5,0x66,0x7b,0x01,0x7a,0x01,0x79,0xa2,0xd1, -+0x6d,0x90,0x01,0xaf,0x74,0xff,0xf0,0x90,0x01,0xcb,0xe0,0x64,0x80,0xf0,0xd0,0xd0, -+0x92,0xaf,0x22,0x7d,0x01,0x7f,0x0c,0x90,0x91,0x95,0xed,0xf0,0x90,0x91,0x94,0xef, -+0xf0,0x54,0x0f,0xff,0xe5,0x6e,0x54,0x0f,0x6f,0x60,0x76,0x90,0x91,0x94,0xe0,0x30, -+0xe2,0x30,0xe5,0x6e,0x20,0xe2,0x05,0x7f,0x01,0x12,0x62,0x65,0xe5,0x6e,0x30,0xe3, -+0x0f,0x90,0x91,0x94,0xe0,0x20,0xe3,0x08,0x12,0x5a,0x3f,0xef,0x60,0x53,0x80,0x52, -+0xe5,0x6e,0x20,0xe3,0x4c,0x90,0x91,0x94,0xe0,0x30,0xe3,0x45,0xa3,0xe0,0xff,0x02, -+0x62,0x4a,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x0c,0x0f,0x90,0x91,0x94,0xe0,0x20,0xe3, -+0x08,0x12,0x5a,0x3f,0xef,0x60,0x2a,0xf1,0xb2,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x04, -+0x10,0x90,0x91,0x94,0xe0,0x20,0xe2,0x09,0x12,0x5b,0xb3,0xef,0x60,0x13,0x12,0x48, -+0xce,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x02,0x08,0x91,0xf1,0xef,0x60,0x03,0x12,0x63, -+0x56,0x22,0x90,0x06,0x04,0xe0,0x44,0x40,0xf0,0xe5,0x6d,0xb4,0x01,0x04,0x7f,0x01, -+0xf1,0xc9,0x53,0x6e,0xf0,0x43,0x6e,0x04,0x22,0x8f,0x67,0xf1,0xe6,0xbf,0x01,0x15, -+0x90,0x91,0x43,0x12,0x48,0x1e,0xad,0x07,0xac,0x06,0xaf,0x67,0x12,0x61,0xa3,0x90, -+0x04,0x1f,0x74,0x20,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x01,0xc4, -+0x74,0xe6,0xf0,0x74,0x47,0xa3,0xf0,0x90,0x04,0x1d,0xe0,0x60,0x1a,0x90,0x05,0x22, -+0xe0,0x54,0x90,0x60,0x07,0x90,0x01,0xc6,0xe0,0x44,0x40,0xf0,0x90,0x01,0xc7,0xe0, -+0x30,0xe1,0xe4,0x7f,0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xe0,0xff, -+0x7d,0x01,0x90,0x91,0x74,0xef,0xf0,0xa3,0xed,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xe5, -+0x70,0x60,0x04,0xe4,0xff,0x11,0xb3,0x90,0x91,0x74,0xe0,0x30,0xe0,0x09,0x90,0x91, -+0x76,0xe4,0xf0,0xa3,0x74,0x80,0xf0,0x90,0x91,0x74,0xe0,0xff,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x90,0x04,0x25,0xef,0xf0,0x90,0x91,0x75,0xe0,0x60,0x1f,0xa3,0xa3,0xe0, -+0xff,0x24,0x0f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x74,0x10, -+0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x90,0x91,0x76,0xa3, -+0xe0,0xff,0xfd,0x24,0x08,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe4,0xf0,0x74,0x09, -+0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf0,0xf0,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf7,0xf0,0x90,0x91,0x76,0xe0,0xfe,0xa3, -+0xe0,0xff,0x22,0xef,0x60,0x0b,0x90,0x91,0x51,0xe0,0xb4,0x01,0x10,0xe4,0xff,0x80, -+0x09,0x90,0x91,0x51,0xe0,0xb4,0x01,0x05,0x7f,0x01,0x12,0x68,0x87,0x22,0x90,0x01, -+0x37,0x74,0x02,0xf0,0x90,0x05,0x22,0x74,0xff,0xf0,0x12,0x68,0x46,0xef,0x70,0x06, -+0x90,0x01,0xc8,0x74,0xfd,0xf0,0x7d,0x02,0x7f,0x03,0x12,0x31,0x9d,0xe5,0x70,0x60, -+0x04,0x7f,0x01,0x11,0xb3,0x51,0x0c,0x53,0x6e,0xf0,0x43,0x6e,0x02,0x22,0xef,0x64, -+0x01,0x70,0x42,0x7d,0x78,0x7f,0x02,0x12,0x31,0x2c,0x7d,0x02,0x7f,0x03,0x12,0x31, -+0x2c,0x90,0x01,0x36,0x74,0x03,0xf0,0xfd,0x7f,0x02,0x12,0x31,0x9d,0x7d,0x10,0x7f, -+0x03,0x12,0x31,0x49,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x12, -+0x47,0x23,0xe4,0xff,0x11,0xb3,0x90,0x06,0x04,0xe0,0x54,0x7f,0xf0,0x90,0x06,0x0a, -+0xe0,0x54,0xf8,0xf0,0x22,0x90,0x01,0x36,0x74,0x7b,0xf0,0xa3,0x74,0x02,0xf0,0x7d, -+0x7b,0xff,0x12,0x31,0x9d,0x7d,0x02,0x7f,0x03,0x12,0x31,0x9d,0x7d,0x10,0x7f,0x03, -+0x12,0x31,0x49,0x90,0x06,0x04,0xe0,0x44,0x80,0xf0,0x90,0x06,0x0a,0xe0,0x44,0x07, -+0xf0,0x12,0x64,0x11,0xe5,0x6d,0x20,0xe0,0x05,0xe4,0x90,0x91,0x29,0xf0,0x22,0x8b, -+0x0e,0x8a,0x0f,0x89,0x10,0x12,0x62,0x3e,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x12,0x24, -+0x62,0xf5,0x70,0x14,0x60,0x0e,0x14,0x60,0x1e,0x14,0x60,0x2f,0x24,0x03,0x70,0x40, -+0x7f,0x01,0x80,0x3a,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00,0x02,0x12,0x42,0x20, -+0xfd,0xe4,0xff,0x31,0xe1,0x80,0x27,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00,0x02, -+0x12,0x42,0x20,0xfd,0x7f,0x01,0x31,0xe1,0x1f,0x80,0x13,0xab,0x0e,0xaa,0x0f,0xa9, -+0x10,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x02,0x31,0xe1,0xe4,0xff,0x11,0xfe, -+0x22,0xef,0x24,0xfe,0x60,0x0b,0x04,0x70,0x22,0x90,0x91,0x39,0x74,0x01,0xf0,0x80, -+0x16,0xed,0x70,0x0a,0x90,0x91,0x35,0xe0,0x90,0x91,0x39,0xf0,0x80,0x05,0x90,0x91, -+0x39,0xed,0xf0,0x90,0x91,0x39,0xe0,0x90,0x91,0x27,0xf0,0x22,0x7f,0x78,0x7e,0x08, -+0x12,0x22,0x65,0x90,0x90,0xd8,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x22,0x65, -+0x90,0x90,0xdc,0x12,0x25,0x08,0x7f,0x00,0x7e,0x08,0x12,0x22,0x65,0x90,0x90,0xe0, -+0x12,0x25,0x08,0x90,0x91,0x51,0xe0,0x90,0x90,0xd8,0xb4,0x01,0x0d,0x12,0x43,0x09, -+0xef,0x54,0xc7,0xff,0xed,0x54,0xc7,0xfd,0x80,0x07,0x12,0x43,0x09,0xef,0x54,0xc7, -+0xff,0xec,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x78,0x7e,0x08,0x12,0x2b,0x08,0x90, -+0x90,0xdc,0x12,0x43,0x09,0xef,0x54,0x0f,0xff,0xec,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x90,0x90,0xe0,0x12,0x43,0x09,0xef,0x44,0x02, -+0xff,0xec,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x00,0x7e,0x08,0x12,0x2b,0x08,0x7f, -+0x70,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0xe4,0x12,0x25,0x08,0x90,0x80,0x96,0x12, -+0x25,0x14,0x00,0x1b,0x25,0xa0,0x7f,0x70,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x68, -+0x12,0x25,0x14,0x00,0x00,0x00,0x00,0xe4,0xfd,0xff,0x12,0x30,0x2c,0x90,0x91,0x51, -+0xe0,0xb4,0x01,0x11,0x90,0x80,0x68,0x12,0x25,0x14,0x00,0x00,0x00,0x00,0xe4,0xfd, -+0x7f,0x01,0x12,0x30,0x2c,0x90,0x00,0x11,0xe0,0x54,0xf6,0xf0,0x80,0x08,0xf4,0xff, -+0x90,0x00,0x43,0xe0,0x5f,0xf0,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x7f,0x10,0xdf, -+0xfe,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x9b, -+0xed,0xf0,0x90,0x91,0x9a,0xef,0xf0,0xd3,0x94,0x07,0x50,0x63,0xe0,0xff,0x74,0x01, -+0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x47,0xe0,0x5f, -+0xf0,0x51,0xe6,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3, -+0x33,0xd8,0xfc,0xff,0x90,0x00,0x46,0xe0,0x4f,0xf0,0x51,0xe6,0x90,0x91,0x9b,0xe0, -+0x60,0x16,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xff,0x90,0x00,0x45,0x80,0x66,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x45,0x80,0x6b,0x90, -+0x91,0x9a,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3, -+0x33,0xd8,0xfc,0xc4,0x54,0xf0,0x51,0xde,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0x51, -+0xe6,0x90,0x91,0x9b,0xe0,0x60,0x1b,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07, -+0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x42,0xe0,0x4f, -+0x80,0x1a,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x42,0xe0,0x5f,0xf0,0x51,0xe6,0xd0, -+0xd0,0x92,0xaf,0x22,0xf0,0x90,0x00,0x45,0xe0,0x54,0xfe,0xfd,0x7f,0x45,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x8f,0x82,0x75,0x83,0x00,0xed,0xf0,0x51,0xe6,0xd0,0xd0, -+0x92,0xaf,0x22,0xef,0x14,0x60,0x30,0x14,0x60,0x66,0x24,0x02,0x60,0x02,0x81,0xaa, -+0x90,0x90,0xf3,0x74,0x02,0xf0,0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x71, -+0xee,0x90,0x00,0x47,0xe0,0x44,0x08,0xfd,0x7f,0x47,0x71,0xee,0x90,0x00,0x45,0xe0, -+0x44,0x10,0xfd,0x7f,0x45,0x80,0x71,0xe4,0x90,0x90,0xf3,0xf0,0x90,0x90,0xef,0x12, -+0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x90, -+0x00,0x45,0xe0,0x44,0xef,0xfd,0x7f,0x45,0x71,0xee,0x90,0x00,0x45,0xe0,0x54,0xef, -+0xfd,0x7f,0x45,0x71,0xee,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x80,0x38, -+0x90,0x90,0xf3,0x74,0x01,0xf0,0x90,0x90,0xf9,0x12,0x43,0x09,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x90,0x00,0x45,0xe0,0x44,0x20,0xfd, -+0x7f,0x45,0x71,0xee,0x90,0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0x71,0xee,0x90, -+0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x71,0xee,0x22,0x90,0x00,0x02,0x12,0x42, -+0x20,0x90,0x90,0xf5,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0x25,0xe0,0x25,0xe0,0x90, -+0x90,0xf4,0xf0,0x12,0x24,0x62,0x25,0xe0,0x25,0xe0,0x90,0x90,0xf8,0xf0,0x90,0x05, -+0x60,0xe0,0x90,0x91,0x03,0xf0,0x90,0x05,0x61,0xe0,0x90,0x91,0x04,0xf0,0x90,0x05, -+0x62,0xe0,0x90,0x91,0x05,0xf0,0x90,0x05,0x63,0xe0,0x90,0x91,0x06,0xf0,0xa2,0xaf, -+0xe4,0x33,0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x90,0x90,0xf4,0xe0,0xff,0x12,0x6e,0x67, -+0x90,0x91,0x1c,0xe0,0x24,0xff,0x92,0xaf,0x90,0x90,0xf5,0xe0,0x70,0x02,0xa1,0xb2, -+0x90,0x90,0xf4,0xe0,0x70,0x02,0xa1,0xb2,0x90,0x90,0xf8,0xe0,0x70,0x02,0xa1,0xb2, -+0xa2,0xaf,0xe4,0x33,0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x90,0x91,0x07,0x74,0x01,0xf0, -+0x90,0x91,0x1c,0xe0,0x24,0xff,0x92,0xaf,0x71,0xe5,0x90,0x00,0x46,0xe0,0x44,0x01, -+0xfd,0x7f,0x46,0x71,0xee,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xf9,0x12,0x43, -+0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x80,0x06, -+0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f,0x45,0x71, -+0xee,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x91,0x03,0xe0,0x90,0x05,0x84,0xf0, -+0x90,0x91,0x04,0xe0,0x90,0x05,0x85,0xf0,0x90,0x91,0x05,0xe0,0x90,0x05,0x86,0xf0, -+0x90,0x91,0x06,0xe0,0x90,0x05,0x87,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x91,0x1c,0xf0, -+0xc2,0xaf,0x90,0x01,0x3c,0xe0,0x44,0x20,0xf0,0x7d,0x20,0xe4,0xff,0x12,0x31,0xb7, -+0x80,0x2b,0x90,0x90,0xf5,0xe0,0x70,0x2d,0x90,0x91,0x07,0x71,0xe4,0x90,0x00,0x46, -+0xe0,0x54,0xfe,0xfd,0x7f,0x46,0x71,0xee,0x90,0x05,0x22,0xe4,0xf0,0xa2,0xaf,0x33, -+0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x7d,0x20,0xe4,0xff,0x12,0x31,0x49,0x90,0x91,0x1c, -+0xe0,0x24,0xff,0x92,0xaf,0x22,0x8b,0x0e,0x8a,0x0f,0x89,0x10,0x90,0x00,0x02,0x12, -+0x42,0x20,0x90,0x90,0xf6,0xf0,0xe0,0x30,0xe0,0x4b,0x90,0x90,0xed,0x74,0x01,0xf0, -+0x7f,0x80,0x7e,0x08,0x12,0x22,0x65,0x90,0x90,0xef,0x12,0x25,0x08,0xab,0x0e,0xaa, -+0x0f,0xa9,0x10,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xe4,0xfc,0xfd,0xfe,0x78,0x1a, -+0x12,0x24,0xf5,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab,0x07,0x90,0x90,0xef,0x12,0x43, -+0x09,0xec,0x54,0x03,0xfc,0x12,0x42,0xfc,0x90,0x90,0xf9,0x12,0x25,0x08,0x90,0x05, -+0x22,0xe4,0xf0,0x80,0x2d,0xe4,0x90,0x90,0xed,0xf0,0x7f,0x80,0x7e,0x08,0x12,0x22, -+0x65,0xec,0x54,0x03,0xfc,0xec,0x44,0xc0,0xfc,0x90,0x90,0xef,0x12,0x25,0x08,0x90, -+0x90,0xef,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12, -+0x2b,0x08,0x90,0x90,0xf6,0xe0,0x30,0xe1,0x19,0x7d,0x0c,0x7f,0x47,0x71,0xee,0x90, -+0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0x71,0xee,0x90,0x00,0x46,0xe0,0x44,0x10, -+0x80,0x1c,0x90,0x00,0x47,0xe0,0x54,0xf3,0xfd,0x7f,0x47,0x71,0xee,0x90,0x00,0x48, -+0xe0,0x54,0xf3,0xfd,0x7f,0x48,0x71,0xee,0x90,0x00,0x46,0xe0,0x54,0xef,0xfd,0x7f, -+0x46,0x71,0xee,0xe4,0x90,0x90,0xf3,0xf0,0x22,0x90,0x01,0x3c,0x74,0xff,0xf0,0xa3, -+0xf0,0xa3,0xf0,0x90,0x01,0x34,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x54, -+0x71,0xee,0x7d,0xff,0x7f,0x55,0x71,0xee,0x7d,0xff,0x7f,0x56,0x71,0xee,0x7d,0xff, -+0x7f,0x57,0x61,0xee,0x90,0x01,0x30,0xe4,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90, -+0x01,0x38,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x50,0x71,0xee,0xe4,0xfd, -+0x7f,0x51,0x71,0xee,0xe4,0xfd,0x7f,0x52,0x71,0xee,0xe4,0xfd,0x7f,0x53,0x61,0xee, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x22,0xed,0xf0,0x90,0x91,0x21,0xef, -+0xf0,0xd3,0x94,0x07,0x50,0x4e,0xa3,0xe0,0x70,0x1a,0x90,0x91,0x21,0xe0,0xff,0x74, -+0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x47,0xe0, -+0x5f,0xf0,0x80,0x17,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02, -+0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x47,0xe0,0x4f,0xf0,0x51,0xe6,0x90,0x91,0x21, -+0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90, -+0x00,0x46,0x80,0x59,0x90,0x91,0x21,0xe0,0x24,0xf8,0xf0,0xa3,0xe0,0x70,0x1d,0x90, -+0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4, -+0x54,0xf0,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0x80,0x1a,0x90,0x91,0x21,0xe0, -+0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xff, -+0x90,0x00,0x43,0xe0,0x4f,0xf0,0x51,0xe6,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0, -+0x51,0xe6,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x49,0xe0,0x90,0x91,0x9f,0xf0,0xe0, -+0x54,0x0f,0xf0,0x44,0xf0,0xfd,0x7f,0x49,0x71,0xee,0x90,0x91,0x9f,0xe0,0x44,0xb0, -+0xfd,0x7f,0x49,0x61,0xee,0x12,0x47,0xe6,0xbf,0x01,0x10,0x90,0x02,0x09,0xe0,0xff, -+0x7d,0x01,0x12,0x48,0x22,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x75,0x28,0x33,0xe4, -+0xf5,0x29,0x75,0x2a,0x07,0xf5,0x2b,0x90,0x01,0x30,0xe5,0x28,0xf0,0xa3,0xe5,0x29, -+0xf0,0xa3,0xe5,0x2a,0xf0,0xa3,0xe5,0x2b,0xf0,0x22,0xe4,0x90,0x91,0x0e,0xf0,0xa3, -+0xf0,0x75,0x8e,0x02,0xf1,0x25,0xd1,0xe8,0x90,0x91,0x4f,0xef,0xf0,0xf1,0x0b,0x90, -+0x91,0x51,0xef,0xf0,0xf1,0x60,0x90,0x91,0x3d,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xf5, -+0x57,0xf1,0x02,0x12,0x61,0xc4,0x12,0x2e,0x01,0x12,0x44,0xff,0x11,0x0c,0xf1,0x36, -+0xd1,0xfb,0xd1,0xd0,0x12,0x44,0xfe,0x31,0x13,0x12,0x44,0xf4,0x12,0x6e,0x09,0x90, -+0x91,0x10,0xe5,0xd9,0xf0,0x12,0x4e,0xb9,0xc2,0xaf,0x90,0x00,0x80,0xe0,0x44,0x40, -+0xf0,0x12,0x4a,0xe6,0x75,0xe8,0x03,0x43,0xa8,0x85,0xd2,0xaf,0x90,0x91,0x0e,0xe0, -+0x64,0x01,0xf0,0x24,0x2a,0x90,0x01,0xc4,0xf0,0x74,0x50,0xa3,0xf0,0xe5,0x57,0x30, -+0xe2,0x10,0x12,0x5f,0xf0,0xbf,0x01,0x0a,0xc2,0xaf,0x53,0x57,0xfb,0xd2,0xaf,0x12, -+0x71,0x97,0xe5,0x57,0x30,0xe4,0x0a,0xc2,0xaf,0x53,0x57,0xef,0xd2,0xaf,0x12,0x60, -+0x2d,0x90,0x90,0xf7,0xe0,0x70,0x03,0x12,0x70,0x74,0x11,0xe7,0x90,0x91,0x3f,0xe0, -+0x90,0x01,0xba,0xf0,0x80,0xb6,0xe4,0x90,0x91,0x55,0xf0,0x90,0x91,0x53,0xe0,0x54, -+0x7f,0xf0,0xa3,0x74,0x0a,0xf0,0x22,0x90,0x06,0x34,0xe0,0x60,0x25,0x14,0x70,0x1b, -+0x7b,0x01,0x7a,0x06,0x79,0x35,0x7f,0xf9,0x7e,0x01,0x12,0x67,0xe4,0xbf,0x01,0x09, -+0x90,0x06,0x35,0xe0,0x54,0x0f,0xf0,0x80,0x04,0x80,0x00,0xe1,0x17,0xe4,0x90,0x06, -+0x34,0xf0,0x22,0x90,0x91,0x56,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0x7f,0xf0,0x90,0x01, -+0x17,0xe0,0xfe,0x90,0x01,0x16,0xe0,0x7c,0x00,0x24,0x00,0xff,0xec,0x3e,0x90,0x91, -+0x5c,0xf0,0xa3,0xef,0xf0,0x90,0x01,0x04,0xe0,0x54,0x0f,0x90,0x91,0x1c,0xf0,0xe0, -+0xff,0x74,0x40,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8, -+0xf9,0x90,0x91,0x5b,0xf0,0xee,0x90,0x91,0x5a,0xf0,0x90,0x91,0x5e,0xe0,0x54,0xfe, -+0xf0,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xfb,0xf0,0xe0,0x54,0xf7,0xf0,0xe0,0x54,0xef, -+0xf0,0xe0,0x54,0xdf,0xf0,0xe0,0x54,0xbf,0xf0,0xe0,0x54,0x7f,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xf7,0xf0,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x12,0x24,0x62,0x54,0x01,0xff,0x90,0x91,0x56, -+0xe0,0x54,0xfe,0x4f,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0x90,0x91,0x57,0xf0,0x90, -+0x00,0x02,0x12,0x42,0x20,0x90,0x91,0x58,0xf0,0x90,0x91,0x56,0xe0,0x30,0xe0,0x1a, -+0x90,0x06,0x09,0xe0,0x54,0xfe,0xf0,0x90,0x02,0x86,0xe0,0x44,0x04,0xf0,0x43,0x57, -+0x04,0x7d,0x08,0xe4,0xff,0x12,0x31,0x9d,0x80,0x12,0x7d,0x08,0xe4,0xff,0x12,0x31, -+0x2c,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x31,0xf1,0x31,0x13,0xd0,0xd0,0x92,0xaf, -+0x22,0x90,0x06,0x90,0xe4,0xf0,0x21,0x5a,0x90,0x91,0x19,0x12,0x43,0x41,0xef,0x12, -+0x43,0x4a,0x52,0x30,0x01,0x52,0x39,0x02,0x52,0x5b,0x03,0x52,0x64,0x09,0x52,0x6c, -+0x0c,0x52,0x75,0x0d,0x52,0x7d,0x0e,0x52,0x8e,0x1a,0x52,0x96,0x2c,0x52,0x41,0x2d, -+0x52,0x4a,0x2e,0x52,0x9e,0x30,0x52,0x53,0x3b,0x52,0x86,0x3c,0x00,0x00,0x52,0xa6, -+0x90,0x91,0x19,0x12,0x43,0x21,0x02,0x64,0x72,0x90,0x91,0x19,0x12,0x43,0x21,0xc1, -+0xf5,0x90,0x91,0x19,0x12,0x43,0x21,0x02,0x65,0x8d,0x90,0x91,0x19,0x12,0x43,0x21, -+0x02,0x65,0xd5,0x90,0x91,0x19,0x12,0x43,0x21,0xe1,0x4b,0x90,0x91,0x19,0x12,0x43, -+0x21,0x02,0x66,0x0e,0x90,0x91,0x19,0x12,0x43,0x21,0x80,0x42,0x90,0x91,0x19,0x12, -+0x43,0x21,0x02,0x4c,0xab,0x90,0x91,0x19,0x12,0x43,0x21,0xe1,0x98,0x90,0x91,0x19, -+0x12,0x43,0x21,0x02,0x4d,0xe6,0x90,0x91,0x19,0x12,0x43,0x21,0x21,0x90,0x90,0x91, -+0x19,0x12,0x43,0x21,0xa1,0x9b,0x90,0x91,0x19,0x12,0x43,0x21,0x81,0x7a,0x90,0x91, -+0x19,0x12,0x43,0x21,0xe1,0x78,0x90,0x01,0xc6,0xe0,0x44,0x01,0xf0,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x1c,0x12,0x43,0x41,0x90,0x91,0x1c,0x12,0x43, -+0x21,0x90,0x00,0x01,0x12,0x42,0x97,0xfa,0xe5,0xf0,0x24,0x00,0xff,0xe4,0x3a,0xfe, -+0x90,0x91,0x1c,0x12,0x43,0x21,0x90,0x00,0x01,0xee,0x8f,0xf0,0x12,0x42,0xcf,0x12, -+0x24,0x62,0xff,0x60,0x2c,0xb5,0x72,0x16,0x90,0x91,0x1c,0x12,0x43,0x21,0x90,0x00, -+0x01,0x12,0x42,0x97,0x65,0x74,0x70,0x04,0xe5,0x73,0x65,0xf0,0x60,0x23,0x90,0x91, -+0x1c,0x12,0x43,0x21,0x90,0x00,0x01,0x12,0x42,0x97,0xff,0xae,0xf0,0x71,0x26,0x80, -+0x10,0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x24,0x62,0x65,0x72,0x60,0x03,0x12,0x44, -+0xe8,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x1f,0xee,0xf0,0xa3,0xef,0xf0,0x75,0x72, -+0x01,0x8e,0x73,0xf5,0x74,0xe4,0xfd,0x7f,0x0b,0x12,0x4f,0x10,0xe4,0xfd,0x7f,0x02, -+0x12,0x4f,0x10,0x71,0x6a,0xe4,0xff,0x71,0xcc,0xe4,0xf5,0x76,0x90,0x01,0xc9,0xe5, -+0x76,0xf0,0x90,0x91,0x1f,0xe0,0xfc,0xa3,0xe0,0xfd,0xec,0xfb,0x8d,0x44,0xe4,0xf5, -+0x45,0x7d,0x01,0x7f,0x60,0x7e,0x01,0x02,0x30,0x62,0x7f,0x0b,0x71,0xd9,0xef,0x65, -+0x75,0x60,0x10,0xe5,0x75,0xb4,0x01,0x05,0xe4,0xf5,0x75,0x80,0x03,0x75,0x75,0x01, -+0x7f,0x01,0x22,0x7f,0x00,0x22,0xe5,0x72,0x64,0x01,0x70,0x3f,0x71,0x6a,0xbf,0x01, -+0x04,0x7f,0x01,0x71,0xcc,0x90,0x00,0x46,0xe0,0x44,0x04,0xfd,0x7f,0x46,0x12,0x4b, -+0xee,0x90,0x00,0x44,0xe0,0x54,0xfb,0xfd,0x7f,0x44,0x12,0x4b,0xee,0x90,0x00,0x46, -+0xe0,0x54,0xfb,0xfd,0x7f,0x46,0x12,0x4b,0xee,0x7f,0x02,0x71,0xd9,0x8f,0x76,0x90, -+0x01,0xc9,0xe5,0x76,0xf0,0xb4,0x01,0x03,0x12,0x4f,0xd7,0x22,0x90,0x01,0xca,0xe5, -+0x75,0xf0,0xef,0x60,0x03,0x12,0x4f,0xd7,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0xa0,0xef,0xf0,0xd3,0x94,0x07,0x50,0x47,0xe0,0xff,0x74,0x01,0xa8,0x07, -+0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0xe0,0x5f,0xf0,0x12, -+0x4a,0xe6,0x90,0x91,0xa0,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8,0x05,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x44,0xe0,0xfb,0xe4,0xfe,0xef, -+0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13,0xd8,0xf8,0xff,0x80, -+0x44,0x90,0x91,0xa0,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0x12,0x4a,0xde,0x90,0x91,0xa0,0xe0,0xfd,0x74,0x01,0x7e, -+0x00,0xa8,0x05,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00, -+0x42,0xe0,0xfb,0xe4,0xfe,0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13, -+0xce,0x13,0xd8,0xf8,0xff,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0xe4,0xf5,0x10,0x75,0x11,0x04,0xf5,0x12,0xf5,0x14,0xf5,0x15,0x90,0x02,0x09, -+0xe0,0xff,0x12,0x24,0x62,0xfe,0xef,0x2e,0xf5,0x13,0x30,0xe0,0x08,0x75,0x0e,0x00, -+0x75,0x0f,0x80,0x80,0x05,0xe4,0xf5,0x0e,0xf5,0x0f,0xe5,0x13,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x74,0x20,0x25,0x10,0xf5,0x10,0xad,0x0f,0xe5,0x10,0x2d,0xff,0x24,0x01, -+0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x90,0x91,0x47,0xf0,0x74,0x02,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0xfe,0xe5,0x10,0x2d,0x24,0x03,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe0,0x24,0x00,0xff,0xe4,0x3e,0x90,0x91,0x48,0xf0,0xa3,0xef, -+0xf0,0x7f,0x04,0xe5,0x10,0x25,0x0f,0x2f,0x24,0x00,0xf5,0x82,0xe4,0x34,0xfc,0xf5, -+0x83,0xe0,0xfe,0x74,0x46,0x2f,0xf5,0x82,0xe4,0x34,0x91,0xf5,0x83,0xee,0xf0,0x0f, -+0xbf,0x08,0xe0,0x12,0x66,0x56,0xef,0x70,0x3f,0x90,0x01,0xc3,0xe0,0x60,0x25,0xc3, -+0xe5,0x15,0x94,0xe8,0xe5,0x14,0x94,0x03,0x40,0x09,0x90,0x01,0xc6,0xe0,0x44,0x10, -+0xf0,0x80,0x63,0x05,0x15,0xe5,0x15,0x70,0x02,0x05,0x14,0x7f,0x0a,0x7e,0x00,0x12, -+0x32,0x15,0x80,0xd5,0x90,0x01,0xc6,0xe0,0x90,0x01,0xc3,0x30,0xe2,0x05,0x74,0xfe, -+0xf0,0x80,0x43,0x74,0xff,0xf0,0x80,0x3e,0xe5,0x10,0xb4,0x78,0x23,0xe4,0xf5,0x10, -+0x05,0x13,0xe5,0x0f,0x64,0x80,0x45,0x0e,0x70,0x06,0xf5,0x0e,0xf5,0x0f,0x80,0x06, -+0x75,0x0e,0x00,0x75,0x0f,0x80,0xe5,0x13,0xc3,0x13,0x90,0xfd,0x10,0xf0,0x80,0x06, -+0x74,0x08,0x25,0x10,0xf5,0x10,0xe5,0x12,0x15,0x12,0x70,0x02,0x15,0x11,0xe5,0x12, -+0x45,0x11,0x60,0x02,0x81,0xb8,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x1c,0x12,0x43, -+0x41,0x12,0x24,0x62,0xff,0x54,0x01,0xfe,0x90,0x91,0x5e,0xe0,0x54,0xfe,0x4e,0xf0, -+0xef,0x54,0x04,0xff,0xe0,0x54,0xfb,0x4f,0xf0,0x12,0x24,0x62,0xff,0x54,0x02,0xfe, -+0x90,0x91,0x5e,0xe0,0x54,0xfd,0x4e,0xf0,0xef,0x54,0x08,0xff,0xe0,0x54,0xf7,0x4f, -+0xf0,0x12,0x24,0x62,0xff,0x54,0x10,0xfe,0x90,0x91,0x5e,0xe0,0x54,0xef,0x4e,0xf0, -+0xef,0x54,0x20,0xff,0xe0,0x54,0xdf,0x4f,0xf0,0x12,0x24,0x62,0xff,0x54,0x40,0xfe, -+0x90,0x91,0x5e,0xe0,0x54,0xbf,0x4e,0xf0,0xef,0x54,0x80,0xff,0xe0,0x54,0x7f,0x4f, -+0xf0,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x91,0x60,0xf0,0x90,0x00,0x01,0x12,0x42, -+0x20,0x90,0x91,0x5f,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff,0x54,0x01,0xfe,0x90, -+0x91,0x61,0xe0,0x54,0xfe,0x4e,0xf0,0xef,0x54,0x02,0xff,0xe0,0x54,0xfd,0x4f,0xf0, -+0x90,0x00,0x03,0x12,0x42,0x20,0x54,0x04,0xff,0x90,0x91,0x61,0xe0,0x54,0xfb,0x4f, -+0xf0,0x90,0x91,0x5e,0xe0,0x54,0x01,0x90,0x01,0xb8,0xf0,0x90,0x91,0x5e,0xe0,0xff, -+0xc4,0x13,0x54,0x01,0x90,0x01,0xb9,0xf0,0x90,0x91,0x61,0xe0,0x54,0x01,0x90,0x01, -+0xba,0xf0,0xa3,0x74,0xff,0xf0,0x12,0x24,0x62,0x20,0xe0,0x02,0x21,0xf1,0xe4,0xfd, -+0x7f,0x81,0x12,0x4b,0xee,0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x24,0x62,0xff,0xc3, -+0x13,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x02,0xf0,0xef,0x13,0x13,0x54,0x3f, -+0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x04,0xf0,0x12,0x24,0x62,0x13,0x13,0x13, -+0x54,0x1f,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x08,0xf0,0x90,0x91,0x61,0xe0, -+0x30,0xe0,0x1c,0x90,0x91,0x5e,0xe0,0xc4,0x13,0x54,0x07,0x30,0xe0,0x07,0xa3,0xe0, -+0xff,0xe4,0xfd,0x80,0x07,0x90,0x91,0x5f,0xe0,0xff,0x7d,0x01,0x12,0x4a,0xf6,0x22, -+0x75,0x30,0x1f,0x75,0x31,0x01,0xe4,0xf5,0x32,0x90,0x01,0x38,0xe5,0x30,0xf0,0xa3, -+0xe5,0x31,0xf0,0xa3,0xe5,0x32,0xf0,0x22,0x90,0x00,0x02,0xe0,0x54,0xe0,0x7f,0x01, -+0x60,0x02,0x7f,0x00,0x22,0x12,0x24,0x62,0xf5,0x6d,0x22,0x90,0x01,0x64,0x74,0xa0, -+0xf0,0x22,0x90,0x91,0x51,0xe0,0x90,0x90,0xe8,0xf0,0x22,0x90,0x00,0xf3,0xe0,0x7f, -+0x00,0x30,0xe3,0x02,0x7f,0x01,0x22,0x90,0x06,0x34,0x74,0xff,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xf0,0x22,0xe4,0x90,0x91,0x4e,0xf0,0x90,0x00,0x80,0xe0,0x44,0x80, -+0xfd,0x7f,0x80,0x02,0x4b,0xee,0x90,0x00,0xf3,0xe0,0x30,0xe2,0x0d,0x90,0x05,0x41, -+0x74,0x10,0xf0,0x90,0x05,0x5a,0xf0,0xa3,0xe4,0xf0,0x22,0x12,0x24,0x62,0x60,0x02, -+0x80,0x01,0xe4,0x90,0x91,0x31,0xf0,0x90,0x91,0x31,0xe0,0x90,0x01,0xe7,0xf0,0x22, -+0x90,0x91,0x51,0xe0,0xb4,0x01,0x0c,0x90,0x00,0xf2,0xe0,0x30,0xe7,0x05,0x7e,0xfd, -+0x7f,0x33,0x22,0x7e,0xfd,0x7f,0x2f,0x22,0x12,0x24,0x62,0xff,0x54,0x01,0xfe,0x90, -+0x91,0x53,0xe0,0x54,0xfe,0x4e,0xf0,0xef,0xc3,0x13,0x30,0xe0,0x0a,0x90,0x00,0x01, -+0x12,0x42,0x20,0x90,0x91,0x54,0xf0,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x90, -+0xf7,0xf0,0xe0,0x60,0x04,0xe0,0xf4,0x70,0x21,0xa2,0xaf,0xe4,0x33,0xf5,0x0e,0xc2, -+0xaf,0x90,0x00,0x47,0xe0,0x54,0xfb,0xfd,0x7f,0x47,0x12,0x4b,0xee,0x7d,0x40,0x7f, -+0x01,0x12,0x31,0x66,0xe5,0x0e,0x24,0xff,0x92,0xaf,0x22,0xc0,0xe0,0xc0,0xf0,0xc0, -+0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03, -+0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01,0xc4,0x74,0xcb,0xf0,0x74,0x57, -+0xa3,0xf0,0x90,0x01,0x34,0xe0,0x55,0x28,0xf5,0x2c,0x90,0x01,0x36,0xe0,0x55,0x2a, -+0xf5,0x2e,0xa3,0xe0,0x55,0x2b,0xf5,0x2f,0xe5,0x2c,0x30,0xe0,0x5a,0x90,0x01,0x34, -+0x74,0x01,0xf0,0x85,0xd9,0x54,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80,0x48,0x90, -+0x91,0x3b,0xe0,0x60,0x3a,0x90,0x01,0x5b,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x04,0xf0, -+0x51,0x30,0xef,0x64,0x01,0x70,0x30,0x90,0x91,0x66,0xf0,0x90,0x91,0x2d,0xe0,0x90, -+0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44,0x59,0x90,0x01,0x5b, -+0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x90,0x91,0x37,0xf0,0x80,0x08,0x51, -+0x30,0xbf,0x01,0x03,0x12,0x44,0xc2,0xe5,0x2c,0x30,0xe1,0x20,0x90,0x01,0x34,0x74, -+0x02,0xf0,0x85,0xd1,0x58,0x85,0xd2,0x59,0x85,0xd3,0x5a,0x85,0xd4,0x5b,0x85,0xd5, -+0x5c,0x85,0xd6,0x5d,0x85,0xd7,0x5e,0x85,0xd9,0x5f,0x71,0x5c,0xe5,0x2c,0x30,0xe3, -+0x10,0x90,0x01,0x34,0x74,0x08,0xf0,0x90,0x91,0x56,0xe0,0x30,0xe0,0x03,0x43,0x57, -+0x04,0xe5,0x2c,0x30,0xe4,0x09,0x90,0x01,0x34,0x74,0x10,0xf0,0x43,0x57,0x10,0xe5, -+0x2c,0x30,0xe5,0x26,0x90,0x01,0xcf,0xe0,0x30,0xe5,0x1f,0xe0,0x54,0xdf,0xf0,0x90, -+0x01,0x34,0x74,0x20,0xf0,0x75,0xa8,0x00,0x75,0xe8,0x00,0x12,0x4e,0xe4,0x90,0x00, -+0x03,0xe0,0x54,0xfb,0xf0,0x12,0x4a,0xe6,0x80,0xfe,0xe5,0x2c,0x30,0xe6,0x06,0x90, -+0x01,0x34,0x74,0x40,0xf0,0xe5,0x2e,0x30,0xe0,0x13,0x90,0x91,0x50,0x74,0x01,0xf0, -+0x90,0x01,0x36,0xf0,0x91,0x23,0x51,0x87,0x90,0x91,0x50,0xe4,0xf0,0xe5,0x2e,0x30, -+0xe1,0x3c,0x90,0x01,0x36,0x74,0x02,0xf0,0x43,0x57,0x40,0x90,0x01,0x02,0xe0,0x54, -+0x03,0x64,0x01,0x70,0x29,0x90,0x01,0x37,0xe0,0x30,0xe0,0x0a,0x74,0x01,0xf0,0x90, -+0x91,0x40,0xe4,0xf0,0x80,0x18,0x90,0x91,0x40,0xe0,0x04,0xf0,0xe0,0xc3,0x94,0x0a, -+0x40,0x0c,0xe4,0xf0,0x90,0x04,0x19,0xe0,0x30,0xe0,0x03,0x12,0x4f,0xf5,0xe5,0x2e, -+0x30,0xe2,0x19,0x90,0x01,0x36,0x74,0x04,0xf0,0x90,0x91,0x3a,0xe4,0xf0,0x90,0x05, -+0x58,0x74,0x03,0xf0,0x51,0xd8,0x90,0x91,0x3f,0xe0,0x04,0xf0,0xe5,0x2e,0x30,0xe3, -+0x28,0x90,0x01,0x36,0x74,0x08,0xf0,0xe5,0x6d,0x64,0x01,0x70,0x1c,0xe5,0x70,0x60, -+0x18,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x91,0x66,0xe4, -+0x12,0x44,0x49,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x2e,0x30,0xe4,0x2b,0x90,0x01, -+0x36,0x74,0x10,0xf0,0xe5,0x6d,0xb4,0x01,0x20,0xe5,0x70,0x60,0x1c,0x90,0x01,0x57, -+0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x90,0x91,0x3c,0xe4,0xf0,0x53,0x71,0xfd, -+0xe5,0x71,0x54,0x07,0x70,0x03,0x12,0x44,0xc2,0xe5,0x2e,0x30,0xe5,0x1f,0x90,0x01, -+0x36,0x74,0x20,0xf0,0xe5,0x6d,0xb4,0x01,0x14,0xe5,0x70,0x60,0x10,0x90,0x91,0x3b, -+0xe0,0x64,0x02,0x60,0x05,0x12,0x44,0xc8,0x80,0x03,0x12,0x44,0x77,0xe5,0x2e,0x30, -+0xe6,0x1b,0x90,0x01,0x36,0x74,0x40,0xf0,0xe5,0x6d,0xb4,0x01,0x10,0xe5,0x70,0x60, -+0x0c,0x53,0x71,0xfe,0xe5,0x71,0x54,0x07,0x70,0x03,0x12,0x44,0xc2,0xe5,0x2f,0x30, -+0xe1,0x08,0x90,0x01,0x37,0x74,0x02,0xf0,0x71,0x7e,0x74,0xcb,0x04,0x90,0x01,0xc4, -+0xf0,0x74,0x57,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0, -+0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32, -+0x90,0x04,0x1b,0xe0,0x54,0x7f,0x64,0x7f,0x7f,0x01,0x60,0x02,0x7f,0x00,0x22,0x51, -+0x30,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x30,0x90,0x91, -+0x37,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x22,0x90,0x91,0x36,0xe0, -+0x60,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x14,0xe5,0x6f,0x54,0x0f,0xd3,0x94, -+0x04,0x40,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01, -+0xb8,0x74,0x08,0xf0,0x7f,0x00,0x22,0x90,0x91,0x53,0xe0,0x30,0xe0,0x49,0xe5,0x6d, -+0x64,0x01,0x70,0x43,0x90,0x91,0x52,0xe0,0x04,0xf0,0xe5,0x70,0x64,0x03,0x60,0x05, -+0xe5,0x70,0xb4,0x06,0x0d,0x90,0x91,0x52,0xe0,0xff,0x74,0x01,0xd3,0x9f,0x50,0x14, -+0x80,0x07,0x90,0x91,0x52,0xe0,0xb4,0x0a,0x0b,0x90,0x91,0x55,0xe0,0x04,0xf0,0xe4, -+0x90,0x91,0x52,0xf0,0x90,0x91,0x55,0xe0,0xff,0x90,0x91,0x54,0xe0,0xb5,0x07,0x07, -+0x71,0x4e,0xe4,0x90,0x91,0x55,0xf0,0x22,0xe5,0x6d,0x64,0x01,0x70,0x63,0xe5,0x70, -+0x60,0x5f,0xe5,0x70,0x64,0x02,0x60,0x06,0xe5,0x70,0x64,0x05,0x70,0x27,0x90,0x06, -+0xab,0xe0,0x90,0x91,0x27,0xf0,0x90,0x06,0xaa,0xe0,0x90,0x91,0x39,0xf0,0x90,0x91, -+0x27,0xe0,0x70,0x07,0x90,0x91,0x39,0xe0,0xff,0x80,0x05,0x90,0x91,0x27,0xe0,0xff, -+0x90,0x91,0x27,0xef,0xf0,0x90,0x91,0x29,0xe0,0x60,0x03,0xe0,0x14,0xf0,0xe4,0x90, -+0x91,0x28,0xf0,0x90,0x01,0x57,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x53,0x71,0xfd, -+0x53,0x71,0xef,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80,0x03,0x12,0x45,0xc7,0x71, -+0x42,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xd0,0xd0,0x92,0xaf,0x22,0xe5,0x6e, -+0x30,0xe3,0x04,0xe4,0xff,0x80,0x02,0x7f,0x01,0x02,0x47,0xc9,0x90,0x91,0x08,0xe0, -+0x54,0xf0,0x44,0x03,0xf0,0x54,0x0f,0x44,0x80,0xf0,0x7b,0x00,0x7a,0x00,0x79,0x58, -+0x90,0x91,0x71,0x12,0x43,0x41,0x0b,0x7a,0x91,0x79,0x08,0x02,0x46,0xb7,0x90,0x91, -+0x80,0x12,0x25,0x14,0x00,0x00,0x00,0x00,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80, -+0x21,0x90,0x91,0x3b,0xe0,0x60,0x06,0x7d,0x01,0x7f,0x0c,0x80,0x0d,0xe5,0x6e,0x54, -+0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x27,0xe4,0xff,0x12, -+0x48,0xb3,0x22,0x51,0x30,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0, -+0x80,0x58,0xe5,0x71,0x54,0x03,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x4a, -+0xe5,0x6f,0x54,0x0f,0xd3,0x94,0x02,0x40,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80, -+0x39,0xe5,0x71,0x30,0xe2,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x2c,0xe5,0x71, -+0x30,0xe4,0x08,0x90,0x01,0xb9,0x74,0x10,0xf0,0x80,0x1f,0x90,0x91,0x29,0xe0,0x60, -+0x08,0x90,0x01,0xb9,0x74,0x20,0xf0,0x80,0x11,0x90,0x91,0x31,0xe0,0x60,0x08,0x90, -+0x01,0xb9,0x74,0x80,0xf0,0x80,0x03,0x7f,0x01,0x22,0x90,0x01,0xb8,0x74,0x04,0xf0, -+0x7f,0x00,0x22,0xe4,0xfb,0x90,0x91,0x78,0x12,0x25,0x14,0x00,0x00,0x00,0x00,0xe5, -+0x70,0x70,0x02,0x81,0xb5,0xe5,0x6d,0x64,0x01,0x70,0x7a,0xe5,0x70,0x14,0x60,0x2b, -+0x24,0xfd,0x60,0x27,0x24,0x02,0x24,0xfb,0x50,0x02,0x80,0x21,0x90,0x91,0x27,0xe0, -+0x14,0xf0,0xe0,0x60,0x04,0xa3,0xe0,0x60,0x14,0x90,0x91,0x27,0xe0,0x70,0x08,0x90, -+0x91,0x39,0xe0,0x90,0x91,0x27,0xf0,0x7b,0x01,0x80,0x02,0x7b,0x01,0xeb,0x60,0x45, -+0x43,0x71,0x10,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x3a,0xe0,0x75,0xf0,0x05,0xa4, -+0xff,0x90,0x91,0x34,0xe0,0x2f,0x12,0x44,0x4e,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5, -+0x6e,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x27,0x90, -+0x91,0x2e,0xe0,0x60,0x10,0x90,0x91,0x2c,0xe0,0x90,0x07,0x78,0x60,0x04,0x74,0x0d, -+0xf0,0x22,0x74,0x09,0xf0,0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0, -+0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0, -+0x06,0xc0,0x07,0x90,0x01,0xc4,0x74,0xb6,0xf0,0x74,0x5c,0xa3,0xf0,0x53,0x91,0xef, -+0x90,0x00,0x51,0xe0,0xff,0x90,0x00,0x55,0xe0,0x5f,0xf5,0x3d,0x90,0x00,0x52,0xe0, -+0xff,0x90,0x00,0x56,0xe0,0x5f,0xf5,0x3e,0xe5,0x3d,0x30,0xe4,0x06,0x90,0x00,0x55, -+0x74,0x10,0xf0,0xe5,0x3d,0x30,0xe5,0x06,0x90,0x00,0x55,0x74,0x20,0xf0,0xe5,0x3d, -+0x30,0xe6,0x1b,0x90,0x00,0x55,0x74,0x40,0xf0,0x90,0x90,0xf6,0xe0,0x54,0x03,0xff, -+0xbf,0x03,0x0b,0x90,0x90,0xf3,0xe0,0x60,0x05,0x7f,0x01,0x12,0x4c,0x03,0xe5,0x3d, -+0x30,0xe7,0x15,0x90,0x00,0x55,0x74,0x80,0xf0,0x90,0x90,0xf6,0xe0,0x54,0x03,0xff, -+0xbf,0x03,0x05,0x7f,0x02,0x12,0x4c,0x03,0xe5,0x3e,0x30,0xe0,0x06,0x90,0x00,0x56, -+0x74,0x01,0xf0,0xe5,0x3e,0x30,0xe1,0x06,0x90,0x00,0x56,0x74,0x02,0xf0,0xe5,0x3e, -+0x30,0xe2,0x06,0x90,0x00,0x56,0x74,0x04,0xf0,0xe5,0x3e,0x30,0xe3,0x06,0x90,0x00, -+0x56,0x74,0x08,0xf0,0x90,0x01,0xc4,0x74,0xb6,0xf0,0x74,0x5c,0xa3,0xf0,0xd0,0x07, -+0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0, -+0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0, -+0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04, -+0xc0,0x05,0xc0,0x06,0xc0,0x07,0x75,0x0d,0x00,0x90,0x01,0xc4,0x74,0x99,0xf0,0x74, -+0x5d,0xa3,0xf0,0x53,0x91,0xdf,0x90,0x01,0x3c,0xe0,0x55,0x30,0xf5,0x34,0xa3,0xe0, -+0x55,0x31,0xf5,0x35,0xa3,0xe0,0x55,0x32,0xf5,0x36,0xa3,0xe0,0x55,0x33,0xf5,0x37, -+0xe5,0x34,0x30,0xe0,0x06,0x90,0x01,0x3c,0x74,0x01,0xf0,0xe5,0x34,0x30,0xe1,0x08, -+0x90,0x01,0x3c,0x74,0x02,0xf0,0xf1,0x57,0xe5,0x34,0x30,0xe2,0x3a,0x90,0x01,0x3c, -+0x74,0x04,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe0,0x25,0x90,0x91,0x66,0xe4,0xf0,0x90, -+0x91,0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44, -+0x59,0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x80,0x08,0x90, -+0x91,0x37,0xe4,0xf0,0x12,0x44,0xc2,0xe5,0x34,0x30,0xe3,0x3a,0x90,0x01,0x3c,0x74, -+0x08,0xf0,0x90,0x06,0x92,0xe0,0x30,0xe1,0x25,0x90,0x91,0x66,0xe4,0xf0,0x90,0x91, -+0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x12,0x44,0x59, -+0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x80,0x08,0x90,0x91, -+0x36,0xe4,0xf0,0x12,0x44,0xc2,0xe5,0x34,0x30,0xe4,0x09,0x90,0x01,0x3c,0x74,0x10, -+0xf0,0x12,0x53,0x86,0xe5,0x34,0x30,0xe5,0x09,0x90,0x01,0x3c,0x74,0x20,0xf0,0x12, -+0x6e,0xb9,0xe5,0x35,0x30,0xe0,0x5a,0x90,0x01,0x3d,0x74,0x01,0xf0,0x90,0x01,0x2f, -+0xe0,0x44,0x7f,0xf0,0x90,0x00,0x83,0xe0,0x54,0x0f,0xf5,0x0d,0xb4,0x01,0x02,0x80, -+0x1c,0xe5,0x0d,0xb4,0x02,0x05,0x90,0x00,0x83,0x80,0x12,0xe5,0x0d,0xb4,0x04,0x05, -+0x90,0x00,0x83,0x80,0x08,0xe5,0x0d,0xb4,0x0c,0x08,0x90,0x00,0x83,0xe0,0xf5,0x6f, -+0x80,0x06,0x90,0x01,0xbe,0xe0,0x04,0xf0,0x90,0x01,0xbb,0xe5,0x6f,0xf0,0xe5,0x6f, -+0x30,0xe0,0x03,0xa3,0x80,0x03,0x90,0x01,0xbd,0xe0,0x04,0xf0,0xf1,0x38,0x12,0x44, -+0xc2,0xe5,0x35,0x30,0xe2,0x06,0x90,0x01,0x3d,0x74,0x04,0xf0,0xe5,0x36,0x30,0xe0, -+0x06,0x90,0x01,0x3e,0x74,0x01,0xf0,0xe5,0x36,0x30,0xe1,0x06,0x90,0x01,0x3e,0x74, -+0x02,0xf0,0x74,0x99,0x04,0x90,0x01,0xc4,0xf0,0x74,0x5d,0xa3,0xf0,0xd0,0x07,0xd0, -+0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0, -+0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0xe5,0x6f,0x30,0xe6,0x19,0xe5,0x6f,0x54, -+0x0f,0xff,0x90,0x91,0x24,0xe0,0xfe,0x4f,0x90,0x01,0x2f,0xf0,0xee,0x64,0x80,0x90, -+0x91,0x24,0xf0,0x53,0x6f,0xbf,0x22,0xe4,0x90,0x91,0x0d,0xf0,0xe5,0x70,0x70,0x02, -+0xe1,0xe1,0x90,0x91,0x3c,0xe0,0x60,0x0d,0xe4,0xf0,0x53,0x71,0xfd,0xe5,0x71,0x54, -+0x07,0x70,0x6e,0x80,0x69,0x90,0x91,0x28,0xe0,0x04,0xf0,0x53,0x71,0xef,0x90,0x91, -+0x3a,0xe0,0x04,0xf0,0x90,0x91,0x0d,0xe0,0xf9,0xff,0x7e,0x00,0x24,0x01,0xfd,0xee, -+0x33,0xfc,0x90,0x91,0x3a,0xe0,0xb5,0x05,0x06,0xe4,0xb5,0x04,0x02,0x80,0x12,0xef, -+0x24,0x02,0xff,0xe4,0x3e,0xfe,0x90,0x91,0x3a,0xe0,0xb5,0x07,0x0a,0xe4,0xb5,0x06, -+0x06,0x90,0x05,0x58,0xe0,0x04,0xf0,0xe9,0xff,0x90,0x91,0x2f,0xe0,0x2f,0xff,0xe4, -+0x33,0xfe,0x90,0x91,0x28,0xe0,0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80,0x98,0x40, -+0x0d,0xe5,0x6d,0xb4,0x01,0x0b,0xa3,0xe0,0x70,0x07,0xe0,0x04,0xf0,0x22,0x12,0x44, -+0xc2,0x22,0x8f,0x20,0x8c,0x21,0x8d,0x22,0x22,0x8f,0x23,0x8c,0x24,0x8d,0x25,0x22, -+0xe4,0x90,0x91,0x11,0xf0,0xa3,0xf0,0x90,0x02,0x86,0xe0,0x20,0xe1,0x2c,0xc3,0x90, -+0x91,0x12,0xe0,0x94,0x20,0x90,0x91,0x11,0xe0,0x94,0x03,0x40,0x0a,0x90,0x01,0xc6, -+0xe0,0x44,0x20,0xf0,0x7f,0x00,0x22,0x90,0x91,0x11,0xe4,0x75,0xf0,0x01,0x12,0x42, -+0x81,0x7f,0x01,0x7e,0x00,0x12,0x32,0x15,0x80,0xcd,0x7f,0x01,0x22,0x90,0x01,0xcc, -+0xe0,0x54,0x0f,0x90,0x91,0x11,0xf0,0x90,0x91,0x11,0xe0,0xfd,0x70,0x02,0x21,0x6f, -+0x90,0x91,0x9c,0xe0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33, -+0xce,0x33,0xce,0xd8,0xf9,0xff,0xef,0x5d,0x70,0x02,0x21,0x68,0x90,0x91,0x9c,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd0,0x12,0x43,0x15,0xe0,0x90,0x91,0x12,0xf0,0x75,0x63, -+0x01,0x75,0x64,0x91,0x75,0x65,0x12,0x75,0x66,0x01,0x7b,0x01,0x7a,0x91,0x79,0x13, -+0x12,0x46,0x6d,0x90,0x91,0x13,0xe0,0xff,0xc4,0x13,0x13,0x13,0x54,0x01,0x90,0x91, -+0x9c,0x30,0xe0,0x59,0xe0,0x75,0xf0,0x02,0x90,0x00,0x88,0x12,0x43,0x15,0xe0,0x90, -+0x91,0x14,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x02,0x90,0x00,0x89,0x12,0x43,0x15, -+0xe0,0x90,0x91,0x15,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd1,0x12, -+0x43,0x15,0xe0,0x90,0x91,0x16,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01, -+0xd2,0x12,0x43,0x15,0xe0,0x90,0x91,0x17,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04, -+0x90,0x01,0xd3,0x12,0x43,0x15,0xe0,0x90,0x91,0x18,0xf0,0x80,0x33,0xe0,0x75,0xf0, -+0x04,0x90,0x01,0xd1,0x12,0x43,0x15,0xe0,0x90,0x91,0x14,0xf0,0x90,0x91,0x9c,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x15,0xe0,0x90,0x91,0x15,0xf0,0x90,0x91, -+0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x15,0xe0,0x90,0x91,0x16,0xf0, -+0xef,0x54,0x7f,0xff,0x7b,0x01,0x7a,0x91,0x79,0x14,0x12,0x51,0xf8,0x90,0x91,0x11, -+0xe0,0xff,0x90,0x91,0x9c,0xe0,0xfe,0x74,0x01,0xa8,0x06,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0x5f,0x90,0x91,0x11,0xf0,0x90,0x91,0x9c,0xe0,0xff,0x74,0x01,0xa8, -+0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0x90,0x01,0xcc,0xf0,0x90,0x91,0x9c,0xe0, -+0x04,0xf0,0xe0,0x54,0x03,0xf0,0x01,0x37,0x90,0x01,0xc6,0xe0,0x44,0x02,0xf0,0x22, -+0xad,0x07,0x74,0x11,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x01,0xf0, -+0x90,0x04,0x80,0xe0,0x54,0x0f,0xfc,0x74,0x14,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5, -+0x83,0xe0,0x54,0xc0,0x4c,0xfd,0x74,0x14,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xed,0xf0,0x22,0xef,0x60,0x0f,0x74,0x21,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83, -+0xe0,0x44,0x10,0xf0,0x22,0x74,0x21,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0, -+0x54,0xef,0xf0,0x22,0xe4,0xf5,0x6d,0xf5,0x71,0xf5,0x70,0x75,0x6f,0x0c,0x75,0x6e, -+0x0c,0x90,0x91,0x3b,0xf0,0x90,0x91,0x37,0xf0,0x90,0x91,0x36,0xf0,0x90,0x91,0x39, -+0x04,0xf0,0x90,0x91,0x27,0xf0,0xe4,0x90,0x91,0x3c,0xf0,0x90,0x91,0x29,0xf0,0x90, -+0x91,0x34,0x74,0x07,0xf0,0xe4,0x90,0x91,0x28,0xf0,0x90,0x91,0x32,0xf0,0xa3,0x74, -+0x03,0xf0,0x90,0x91,0x2f,0x74,0x0a,0xf0,0xa3,0x74,0x05,0xf0,0x90,0x91,0x2d,0x74, -+0x14,0xf0,0x90,0x91,0x35,0x74,0x05,0xf0,0xe4,0x90,0x91,0x2b,0xf0,0x90,0x91,0x25, -+0xf0,0x90,0x91,0x50,0xf0,0x90,0x91,0x31,0xf0,0x90,0x91,0x3a,0xf0,0x90,0x91,0x26, -+0xf0,0x90,0x91,0x38,0xf0,0x90,0x91,0x2e,0xf0,0x90,0x91,0x2c,0xf0,0x22,0xe4,0x90, -+0x91,0x3c,0xf0,0x90,0x91,0x28,0xf0,0xf5,0x71,0x22,0x90,0x06,0x04,0xe0,0x54,0xbf, -+0xf0,0xef,0x60,0x0a,0xe5,0x6d,0xb4,0x01,0x05,0xe4,0xff,0x12,0x47,0xc9,0x53,0x6e, -+0xf0,0x43,0x6e,0x0c,0x22,0x90,0x91,0x9d,0xef,0xf0,0x51,0x7e,0x90,0x91,0x9d,0xe0, -+0x60,0x05,0x90,0x05,0x22,0xe4,0xf0,0x53,0x6e,0xf0,0x43,0x6e,0x04,0x22,0x90,0x00, -+0x11,0xe0,0x44,0x09,0xf0,0x12,0x4a,0xe6,0x90,0x90,0xd8,0x12,0x43,0x09,0x90,0x80, -+0x96,0x12,0x25,0x08,0x7f,0x78,0x7e,0x08,0x12,0x2b,0x08,0x90,0x90,0xdc,0x12,0x43, -+0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x90,0x90, -+0xe0,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x00,0x7e,0x08,0x12,0x2b, -+0x08,0x90,0x90,0xe4,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x70,0x7e, -+0x0e,0x12,0x2b,0x08,0x90,0x80,0x68,0x12,0x25,0x14,0x00,0x03,0x2d,0x95,0xe4,0xfd, -+0xff,0x12,0x30,0x2c,0x90,0x91,0x51,0xe0,0xb4,0x01,0x11,0x90,0x80,0x68,0x12,0x25, -+0x14,0x00,0x03,0x2d,0x95,0xe4,0xfd,0x7f,0x01,0x12,0x30,0x2c,0x22,0x8f,0x77,0xe4, -+0x90,0x91,0x96,0xf0,0xa3,0xf0,0x90,0x01,0x09,0xe0,0x7f,0x00,0x30,0xe7,0x02,0x7f, -+0x01,0xef,0x65,0x77,0x60,0x3e,0xc3,0x90,0x91,0x97,0xe0,0x94,0x88,0x90,0x91,0x96, -+0xe0,0x94,0x13,0x40,0x08,0x90,0x01,0xc6,0xe0,0x44,0x80,0xf0,0x22,0x90,0x91,0x96, -+0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x7f,0x14,0x7e,0x00,0x12,0x32,0x15,0xd3,0x90, -+0x91,0x97,0xe0,0x94,0x32,0x90,0x91,0x96,0xe0,0x94,0x00,0x40,0xb9,0x90,0x01,0xc7, -+0xe0,0x30,0xe0,0xb2,0x22,0x22,0x53,0x6e,0xf0,0x43,0x6e,0x01,0x71,0x55,0x71,0x67, -+0x53,0x6e,0xf0,0x43,0x6e,0x02,0x22,0x22,0x8f,0x78,0x12,0x47,0xe6,0xef,0x64,0x01, -+0x70,0x2e,0x90,0x91,0x44,0x12,0x48,0x1e,0xe5,0x78,0x60,0x10,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x80,0x0e,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xef,0xf0,0x90,0x04,0x1f,0x74,0x20,0xf0, -+0x22,0xe4,0xfb,0x90,0x91,0x7c,0x12,0x25,0x14,0x00,0x00,0x00,0x00,0xe5,0x70,0x60, -+0x5f,0xe5,0x6d,0x64,0x01,0x70,0x59,0x0b,0x90,0x91,0x27,0xf0,0x04,0x60,0x51,0x43, -+0x71,0x10,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x3a,0xe0,0x75,0xf0,0x05,0xa4,0xff, -+0x90,0x91,0x34,0xe0,0x2f,0x90,0x91,0x67,0xf0,0xe4,0x1b,0x12,0x44,0x54,0x90,0x01, -+0x57,0x74,0x05,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f, -+0x04,0x12,0x47,0x27,0x90,0x91,0x2e,0xe0,0x60,0x11,0x90,0x91,0x2c,0xe0,0x90,0x07, -+0x78,0x60,0x05,0x74,0x0d,0xf0,0x80,0x03,0x74,0x09,0xf0,0x90,0x05,0x22,0xe4,0xf0, -+0x22,0x90,0x91,0x32,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0xd3,0x10,0xaf,0x01, -+0xc3,0xc0,0xd0,0x90,0x91,0x84,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0, -+0x90,0x91,0x84,0xe0,0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x2d,0xc3,0x90, -+0x91,0x87,0xe0,0x94,0xe8,0x90,0x91,0x86,0xe0,0x94,0x03,0x40,0x0b,0x90,0x01,0xc6, -+0xe0,0x44,0x10,0xf0,0x7f,0x00,0x80,0x15,0x90,0x91,0x86,0xe4,0x75,0xf0,0x01,0x12, -+0x42,0x81,0x7f,0x0a,0x7e,0x00,0x12,0x32,0x15,0x80,0xc5,0x7f,0x01,0xd0,0xd0,0x92, -+0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x1c,0x12,0x43,0x41,0x90, -+0x91,0x1f,0x12,0x25,0x14,0x00,0x00,0x00,0x00,0x90,0x91,0x1c,0x12,0x43,0x21,0x90, -+0x00,0x01,0x12,0x42,0x20,0x90,0x91,0x3b,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0x90, -+0x91,0x25,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x01,0x90,0x91,0x26,0xf0, -+0xef,0xc3,0x13,0x54,0x01,0x90,0x91,0x2e,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff, -+0x13,0x13,0x54,0x01,0x90,0x91,0x2c,0xf0,0x90,0x91,0x2e,0xe0,0x90,0x91,0x1f,0x70, -+0x26,0x12,0x25,0x14,0x00,0x00,0x02,0x10,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80, -+0x96,0x12,0x25,0x08,0x7f,0x60,0x7e,0x08,0x12,0x2b,0x08,0x90,0x91,0x1f,0x12,0x25, -+0x14,0x00,0x00,0x03,0x10,0x80,0x24,0x12,0x25,0x14,0x00,0x00,0x01,0x10,0x90,0x91, -+0x1f,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x60,0x7e,0x08,0x12,0x2b, -+0x08,0x90,0x91,0x1f,0x12,0x25,0x14,0x00,0x00,0x03,0x00,0x90,0x91,0x1f,0x12,0x43, -+0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x70,0x7e,0x08,0x12,0x2b,0x08,0x90,0x91, -+0x26,0xe0,0x70,0x3d,0x90,0x91,0x38,0x74,0x01,0xf0,0x7f,0x00,0x7e,0x08,0x12,0x22, -+0x65,0x90,0x91,0x1f,0x12,0x25,0x08,0x90,0x91,0x1f,0x12,0x43,0x09,0xec,0x44,0x02, -+0xfc,0x90,0x91,0x1f,0x12,0x25,0x08,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0x00,0x7e,0x08,0x12,0x2b,0x08,0x90,0x02,0x86,0xe0,0x54,0xfb, -+0xf0,0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x49,0x7f,0x90,0x01,0xe5,0xe5,0x70,0xf0, -+0x90,0x91,0x3b,0xe0,0x90,0x01,0xe6,0xf0,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x02, -+0x12,0x42,0x20,0xff,0x30,0xe0,0x25,0x12,0x24,0x62,0x90,0x91,0x2f,0xf0,0x90,0x00, -+0x01,0x12,0x42,0x20,0x90,0x91,0x30,0xf0,0xef,0xc3,0x13,0x54,0x7f,0x90,0x91,0x2d, -+0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0x90,0x91,0x35,0xf0,0x22,0x90,0x91,0x2f,0x74, -+0x0a,0xf0,0x90,0x91,0x30,0x74,0x05,0xf0,0x90,0x91,0x2d,0x74,0x14,0xf0,0x90,0x91, -+0x35,0x74,0x05,0xf0,0x22,0x12,0x24,0x62,0x30,0xe0,0x19,0xc3,0x13,0x54,0x7f,0x90, -+0x91,0x34,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x90,0x91,0x32,0xe4,0xf0,0xa3, -+0xef,0xf0,0x80,0x0f,0x90,0x91,0x34,0x74,0x07,0xf0,0x90,0x91,0x32,0xe4,0xf0,0xa3, -+0x74,0x03,0xf0,0x90,0x91,0x32,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0x90,0x02, -+0x09,0xe0,0xfd,0x12,0x24,0x62,0xfe,0xaf,0x05,0xed,0x2e,0x90,0x91,0x41,0xf0,0x90, -+0x00,0x01,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x42,0xf0,0x90,0x00,0x02,0x12, -+0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x43,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff, -+0xed,0x2f,0x90,0x91,0x44,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0xae,0x05,0xed, -+0x2f,0x90,0x91,0x45,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x47, -+0xe0,0x90,0x91,0x1d,0xf0,0x90,0x91,0x48,0xe0,0xf5,0x19,0xa3,0xe0,0xf5,0x1a,0xe4, -+0xf5,0x16,0x74,0x4a,0x25,0x16,0xf5,0x82,0xe4,0x34,0x91,0xf5,0x83,0xe0,0xff,0x74, -+0x1b,0x25,0x16,0xf8,0xa6,0x07,0x05,0x16,0xe5,0x16,0xb4,0x04,0xe5,0x90,0x91,0x1d, -+0xe0,0x12,0x43,0x4a,0x66,0xb3,0x00,0x67,0xdc,0x01,0x66,0xba,0x02,0x66,0xba,0x03, -+0x66,0xba,0x04,0x67,0xdc,0x05,0x67,0xac,0x80,0x67,0xc2,0x81,0x67,0xdc,0x82,0x00, -+0x00,0x67,0xd8,0xaf,0x1e,0x12,0x73,0xea,0xe1,0xdc,0x90,0x91,0x1d,0xe0,0xff,0xb4, -+0x02,0x08,0x90,0x91,0x1c,0x74,0x01,0xf0,0x80,0x0f,0xef,0x90,0x91,0x1c,0xb4,0x03, -+0x05,0x74,0x02,0xf0,0x80,0x03,0x74,0x04,0xf0,0xc3,0xe5,0x19,0x94,0x08,0x50,0x49, -+0xe4,0xf5,0x16,0x90,0x91,0x1c,0xe0,0xff,0xe5,0x16,0xc3,0x9f,0x40,0x02,0xe1,0xdc, -+0xc3,0xe5,0x19,0x94,0x01,0x50,0x14,0xe5,0x16,0x25,0x1a,0xff,0xc3,0x74,0x03,0x95, -+0x16,0x24,0x1b,0xf8,0xe6,0xfd,0x12,0x4b,0xee,0x80,0x1a,0xc3,0x74,0x03,0x95,0x16, -+0x24,0x1b,0xf8,0xe6,0xff,0xe5,0x16,0x7c,0x00,0x25,0x1a,0xfd,0xec,0x35,0x19,0x8d, -+0x82,0xf5,0x83,0xef,0xf0,0x05,0x16,0x80,0xba,0xc3,0xe5,0x19,0x94,0x10,0x40,0x02, -+0xe1,0xdc,0x90,0x91,0x1d,0xe0,0x64,0x04,0x60,0x02,0xe1,0xdc,0xaf,0x1c,0xfc,0xfd, -+0xfe,0x78,0x10,0x12,0x24,0xf5,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0xaf,0x1b, -+0xe4,0xfc,0xfd,0xfe,0x78,0x18,0x12,0x24,0xf5,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0, -+0x00,0x12,0x42,0xfc,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0xaf,0x1d,0xe4,0xfc, -+0xfd,0xfe,0x78,0x08,0x12,0x24,0xf5,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0x12, -+0x42,0xfc,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab,0x07,0xaf,0x1e,0xe4,0xfc,0xfd,0xfe, -+0x12,0x42,0xfc,0xa3,0x12,0x25,0x08,0x90,0x91,0x1e,0x12,0x43,0x09,0x90,0x80,0x96, -+0x12,0x25,0x08,0xaf,0x1a,0xae,0x19,0x12,0x2b,0x08,0x80,0x30,0xe5,0x1d,0x7f,0x00, -+0xfe,0xef,0x25,0x1e,0xf5,0x18,0xe4,0x3e,0xf5,0x17,0xaf,0x18,0xfe,0x12,0x32,0x15, -+0x80,0x1a,0xe5,0x1d,0x7f,0x00,0xfe,0xef,0x25,0x1e,0xf5,0x18,0xe4,0x3e,0xf5,0x17, -+0xaf,0x18,0xfe,0x12,0x31,0x82,0x80,0x04,0x7f,0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0, -+0x92,0xaf,0x22,0x22,0x8e,0x0e,0x8f,0x0f,0x8b,0x10,0x8a,0x11,0x89,0x12,0xe4,0x90, -+0x91,0x11,0xf0,0xef,0x90,0x00,0x31,0xf0,0x12,0x4a,0xe6,0xe5,0x0e,0x54,0x03,0xff, -+0x90,0x00,0x32,0xe0,0x54,0xfc,0x4f,0xf0,0x12,0x4a,0xe6,0x90,0x00,0x33,0xe0,0x54, -+0x7f,0xf0,0x12,0x4a,0xe6,0x90,0x00,0x33,0xe0,0x20,0xe7,0x0e,0x90,0x91,0x11,0xe0, -+0xc3,0x94,0x64,0x50,0x05,0xe0,0x04,0xf0,0x80,0xeb,0x90,0x91,0x11,0xe0,0xc3,0x94, -+0x64,0x50,0x10,0x90,0x00,0x30,0xe0,0xab,0x10,0xaa,0x11,0xa9,0x12,0x12,0x42,0x4d, -+0x7f,0x01,0x22,0x7f,0x00,0x22,0xe4,0x90,0x91,0x98,0xf0,0xa3,0xf0,0x90,0x05,0xf8, -+0xe0,0x70,0x0f,0xa3,0xe0,0x70,0x0b,0xa3,0xe0,0x70,0x07,0xa3,0xe0,0x70,0x03,0x7f, -+0x01,0x22,0xd3,0x90,0x91,0x99,0xe0,0x94,0xe8,0x90,0x91,0x98,0xe0,0x94,0x03,0x40, -+0x03,0x7f,0x00,0x22,0x7f,0x32,0x7e,0x00,0x12,0x32,0x15,0x90,0x91,0x98,0xe4,0x75, -+0xf0,0x01,0x12,0x42,0x81,0x80,0xc6,0xef,0x70,0x02,0x41,0x3d,0x90,0x90,0xe8,0xe0, -+0x60,0x02,0xc1,0x08,0x90,0x90,0xd4,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0x8c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x90,0x80,0x12,0x43,0x09,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0x44,0x7e,0x08,0x12,0x2b,0x08,0x90,0x90,0x84,0x12,0x43,0x09, -+0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x5c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x90,0x88, -+0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x6c,0x7e,0x0e,0x12,0x2b,0x08, -+0x90,0x90,0x8c,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x70,0x7e,0x0e, -+0x12,0x2b,0x08,0x90,0x90,0x90,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f, -+0x74,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0x94,0x12,0x43,0x09,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x78,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0x98,0x12,0x43,0x09,0x90, -+0x80,0x96,0x12,0x25,0x08,0x7f,0x7c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0x9c,0x12, -+0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x0e,0x12,0x2b,0x08,0x90, -+0x90,0xa0,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x84,0x7e,0x0e,0x12, -+0x2b,0x08,0x90,0x90,0xa4,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x88, -+0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0xa8,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25, -+0x08,0x7f,0x8c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0xac,0x12,0x43,0x09,0x90,0x80, -+0x96,0x12,0x25,0x08,0x7f,0xd0,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0xb0,0x12,0x43, -+0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0xd4,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90, -+0xb4,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0xd8,0x7e,0x0e,0x12,0x2b, -+0x08,0x90,0x90,0xb8,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0xdc,0x7e, -+0x0e,0x12,0x2b,0x08,0x90,0x90,0xbc,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0xe0,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0xc0,0x12,0x43,0x09,0x90,0x80,0x96, -+0x12,0x25,0x08,0x7f,0xec,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x90,0xc4,0x12,0x43,0x09, -+0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x90,0x90,0xc8, -+0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x0d,0x12,0x2b,0x08, -+0x90,0x90,0xcc,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x0c,0x7e,0x09, -+0x12,0x2b,0x08,0x90,0x90,0xd0,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f, -+0x04,0x7e,0x08,0x12,0x2b,0x08,0x90,0x90,0xe8,0x74,0x01,0xf0,0x22,0x90,0x90,0xe8, -+0xe0,0x64,0x01,0x60,0x02,0xc1,0x08,0x7f,0x8c,0x7e,0x08,0x12,0x22,0x65,0x90,0x90, -+0xd4,0x12,0x25,0x08,0x7f,0x44,0x7e,0x08,0x12,0x22,0x65,0x90,0x90,0x80,0x12,0x25, -+0x08,0x7f,0x5c,0x7e,0x08,0x12,0x22,0x65,0x90,0x90,0x84,0x12,0x25,0x08,0x7f,0x6c, -+0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0x88,0x12,0x25,0x08,0x7f,0x70,0x7e,0x0e,0x12, -+0x22,0x65,0x90,0x90,0x8c,0x12,0x25,0x08,0x7f,0x74,0x7e,0x0e,0x12,0x22,0x65,0x90, -+0x90,0x90,0x12,0x25,0x08,0x7f,0x78,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0x94,0x12, -+0x25,0x08,0x7f,0x7c,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0x98,0x12,0x25,0x08,0x7f, -+0x80,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0x9c,0x12,0x25,0x08,0x7f,0x84,0x7e,0x0e, -+0x12,0x22,0x65,0x90,0x90,0xa0,0x12,0x25,0x08,0x7f,0x88,0x7e,0x0e,0x12,0x22,0x65, -+0x90,0x90,0xa4,0x12,0x25,0x08,0x7f,0x8c,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0xa8, -+0x12,0x25,0x08,0x7f,0xd0,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0xac,0x12,0x25,0x08, -+0x7f,0xd4,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0xb0,0x12,0x25,0x08,0x7f,0xd8,0x7e, -+0x0e,0x12,0x22,0x65,0x90,0x90,0xb4,0x12,0x25,0x08,0x7f,0xdc,0x7e,0x0e,0x12,0x22, -+0x65,0x90,0x90,0xb8,0x12,0x25,0x08,0x7f,0xe0,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90, -+0xbc,0x12,0x25,0x08,0x7f,0xec,0x7e,0x0e,0x12,0x22,0x65,0x90,0x90,0xc0,0x12,0x25, -+0x08,0x7f,0x04,0x7e,0x0c,0x12,0x22,0x65,0x90,0x90,0xc4,0x12,0x25,0x08,0x7f,0x04, -+0x7e,0x0d,0x12,0x22,0x65,0x90,0x90,0xc8,0x12,0x25,0x08,0x7f,0x0c,0x7e,0x09,0x12, -+0x22,0x65,0x90,0x90,0xcc,0x12,0x25,0x08,0x7f,0x04,0x7e,0x08,0x12,0x22,0x65,0x90, -+0x90,0xd0,0x12,0x25,0x08,0x7f,0x8c,0x7e,0x08,0x12,0x22,0x65,0x90,0x91,0x88,0x12, -+0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xed,0x44,0xc0,0xfd,0xec,0x90,0x91,0x88, -+0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f, -+0x8c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0x01,0x00,0x00, -+0x7f,0x44,0x7e,0x08,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0xdb,0x25, -+0xa4,0x7f,0x5c,0x7e,0x08,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb, -+0x25,0xa4,0x7f,0x6c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20, -+0xdb,0x25,0xa4,0x7f,0x70,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14, -+0x04,0x1b,0x25,0xa4,0x7f,0x74,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25, -+0x14,0x04,0x1b,0x25,0xa4,0x7f,0x78,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12, -+0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x7c,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96, -+0x12,0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x80,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80, -+0x96,0x12,0x25,0x14,0x63,0xdb,0x25,0xa4,0x7f,0x84,0x7e,0x0e,0x12,0x2b,0x08,0x90, -+0x80,0x96,0x12,0x25,0x14,0x04,0x1b,0x25,0xa4,0x7f,0x88,0x7e,0x0e,0x12,0x2b,0x08, -+0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0x8c,0x7e,0x0e,0x12,0x2b, -+0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0xd0,0x7e,0x0e,0x12, -+0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0xd4,0x7e,0x0e, -+0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x20,0xdb,0x25,0xa4,0x7f,0xd8,0x7e, -+0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0x1b,0x25,0xa4,0x7f,0xdc, -+0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x00,0x1b,0x25,0xa4,0x7f, -+0xe0,0x7e,0x0e,0x12,0x2b,0x08,0x90,0x80,0x96,0x12,0x25,0x14,0x24,0xdb,0x25,0xa4, -+0x7f,0xec,0x7e,0x0e,0x12,0x2b,0x08,0x7f,0x04,0x7e,0x0c,0x12,0x22,0x65,0x90,0x91, -+0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xe4,0xff,0xec,0x90,0x91,0x88, -+0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x11,0xff,0xec,0x90,0x91, -+0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08, -+0x7f,0x04,0x7e,0x0c,0x12,0x2b,0x08,0x7f,0x04,0x7e,0x0d,0x12,0x22,0x65,0x90,0x91, -+0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x54,0xf0,0xff,0xec,0x90, -+0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x01,0xff,0xec, -+0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x04,0x7e,0x0d,0x12,0x2b,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x22,0x65, -+0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xe4,0xff,0xec,0x90, -+0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x11,0xff,0xec, -+0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x96,0x12, -+0x25,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x2b,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x22,0x65, -+0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09,0xed,0x54,0x0f,0xfd, -+0xec,0x54,0xf0,0xfc,0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91,0x88,0x12,0x43,0x09, -+0xed,0x44,0x10,0xfd,0xec,0x44,0x01,0xfc,0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91, -+0x88,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x0c,0x7e,0x09,0x12,0x2b, -+0x08,0x7f,0x04,0x7e,0x08,0x12,0x22,0x65,0x90,0x91,0x88,0x12,0x25,0x08,0x90,0x91, -+0x88,0x12,0x43,0x09,0xef,0x54,0xf0,0xff,0xec,0x90,0x91,0x88,0x12,0x25,0x08,0x90, -+0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x01,0xff,0xec,0x90,0x91,0x88,0x12,0x25,0x08, -+0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x04,0x7e,0x08, -+0x12,0x2b,0x08,0xe4,0x90,0x90,0xe8,0xf0,0x22,0xe4,0xfd,0x7f,0x45,0x12,0x4b,0xee, -+0x90,0x04,0xfd,0xe4,0xf0,0xa3,0xf0,0x90,0x90,0xf7,0xf0,0x90,0x90,0xfd,0xf0,0x90, -+0x91,0x00,0xf0,0x90,0x90,0xfe,0xf0,0x90,0x91,0x01,0xf0,0x90,0x90,0xff,0xf0,0x90, -+0x91,0x02,0xf0,0x90,0x90,0xe9,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90, -+0x90,0xee,0xf0,0x90,0x90,0xf3,0xf0,0x90,0x90,0xf5,0xf0,0x90,0x91,0x07,0xf0,0x90, -+0x90,0xf8,0xf0,0x90,0x90,0xf4,0xf0,0x90,0x90,0xed,0xf0,0x90,0x00,0x51,0xe0,0x44, -+0xc0,0xfd,0x7f,0x51,0x02,0x4b,0xee,0x90,0x05,0x60,0xe0,0x90,0x91,0x03,0xf0,0x90, -+0x05,0x61,0xe0,0x90,0x91,0x04,0xf0,0x90,0x05,0x62,0xe0,0x90,0x91,0x05,0xf0,0x90, -+0x05,0x63,0xe0,0x90,0x91,0x06,0xf0,0xc3,0x74,0xff,0x9f,0xfe,0x90,0x91,0x04,0xe0, -+0xd3,0x9e,0x40,0x1e,0xe0,0x2f,0xf0,0xa3,0xe0,0xb4,0xff,0x0f,0xe4,0xf0,0xa3,0xe0, -+0xb4,0xff,0x03,0xe4,0xf0,0x22,0x90,0x91,0x06,0x80,0x03,0x90,0x91,0x05,0xe0,0x04, -+0xf0,0x22,0x90,0x91,0x04,0xe0,0x2f,0xf0,0x22,0x90,0x90,0xf5,0xe0,0x64,0x01,0x60, -+0x02,0xe1,0x6e,0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46,0x12,0x4b,0xee,0x90, -+0x91,0x07,0xe0,0x70,0x32,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xf9,0x12,0x43, -+0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08,0x80,0x06, -+0x90,0x05,0x22,0x74,0x7f,0xf0,0x90,0x90,0xf4,0xe0,0xff,0xd1,0x67,0x90,0x91,0x07, -+0x74,0x01,0x12,0x4b,0xe4,0x80,0x40,0x90,0x91,0x07,0xe0,0x64,0x01,0x70,0x38,0x90, -+0x90,0xf8,0xe0,0xff,0xd1,0x67,0xe4,0x90,0x91,0x07,0xf0,0x90,0x00,0x45,0xe0,0x44, -+0x01,0xfd,0x7f,0x45,0x12,0x4b,0xee,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xef, -+0x12,0x43,0x09,0x90,0x80,0x96,0x12,0x25,0x08,0x7f,0x80,0x7e,0x08,0x12,0x2b,0x08, -+0x80,0x05,0x90,0x05,0x22,0xe4,0xf0,0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x91, -+0x03,0xe0,0x90,0x05,0x84,0xf0,0x90,0x91,0x04,0xe0,0x90,0x05,0x85,0xf0,0x90,0x91, -+0x05,0xe0,0x90,0x05,0x86,0xf0,0x90,0x91,0x06,0xe0,0x90,0x05,0x87,0xf0,0x22,0x90, -+0x90,0xee,0xe0,0xc3,0x94,0x14,0x50,0x06,0xe0,0x04,0xf0,0x02,0x70,0x29,0x90,0x90, -+0xee,0xe0,0x64,0x14,0x60,0x03,0x02,0x70,0x29,0x90,0x90,0xfd,0xe0,0x70,0x25,0x90, -+0x91,0x00,0xe0,0x70,0x1f,0x90,0x90,0xfe,0xe0,0x70,0x19,0x90,0x91,0x01,0xe0,0x70, -+0x13,0x90,0x90,0xff,0xe0,0x70,0x0d,0x90,0x91,0x02,0xe0,0x70,0x07,0x90,0x04,0xfd, -+0xe0,0x54,0xfe,0xf0,0x90,0x90,0xfd,0xe0,0x90,0x04,0x44,0xf0,0x90,0x90,0xfe,0xe0, -+0x90,0x04,0x45,0xf0,0x90,0x90,0xff,0xe0,0x90,0x04,0x46,0xf0,0xa3,0xe4,0xf0,0x90, -+0x91,0x00,0xe0,0x90,0x04,0x48,0xf0,0x90,0x91,0x01,0xe0,0x90,0x04,0x49,0xf0,0x90, -+0x91,0x02,0xe0,0x90,0x04,0x4a,0xf0,0xa3,0xe4,0xf0,0x90,0x90,0xe9,0xe0,0x90,0x04, -+0x4c,0xf0,0x90,0x90,0xea,0xe0,0x90,0x04,0x4d,0xf0,0x90,0x90,0xeb,0xe0,0x90,0x04, -+0x4e,0xf0,0x90,0x90,0xec,0xe0,0x90,0x04,0x4f,0xf0,0xe4,0x90,0x90,0xee,0xf0,0x90, -+0x90,0xe9,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x90,0xfd,0xf0,0xa3, -+0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x05,0x60,0xe0,0x90,0x91,0x8c, -+0xf0,0x90,0x05,0x61,0xe0,0x90,0x91,0x8d,0xf0,0x90,0x05,0x62,0xe0,0x90,0x91,0x8e, -+0xf0,0x90,0x05,0x63,0xe0,0x90,0x91,0x8f,0xf0,0x90,0x91,0x06,0xe0,0xff,0x90,0x91, -+0x8f,0xe0,0xfe,0xd3,0x9f,0x50,0x0b,0x90,0x91,0x06,0xe0,0xc3,0x9e,0xd3,0x94,0x01, -+0x40,0x11,0x90,0x90,0xf4,0xe0,0xb4,0x01,0x02,0x80,0x03,0x90,0x90,0xf8,0xe0,0xff, -+0x12,0x6e,0x67,0x22,0x90,0x91,0x07,0xe0,0x64,0x01,0x60,0x08,0x90,0x90,0xf5,0xe0, -+0x60,0x02,0x21,0x4b,0x90,0x90,0xe9,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0, -+0x80,0x3b,0x90,0x90,0xea,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80, -+0x28,0x90,0x90,0xeb,0xe0,0xc3,0x94,0xff,0x50,0x0a,0xe0,0x04,0xf0,0xe4,0x90,0x90, -+0xea,0xf0,0x80,0x15,0x90,0x90,0xec,0xe0,0xc3,0x94,0xff,0x50,0x10,0xe0,0x04,0xf0, -+0xe4,0x90,0x90,0xeb,0xf0,0x90,0x90,0xea,0xf0,0x90,0x90,0xe9,0xf0,0x90,0x00,0x44, -+0xe0,0x54,0x0c,0x60,0x76,0xe0,0x30,0xe2,0x32,0x90,0x90,0xfd,0xe0,0xc3,0x94,0xff, -+0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90,0x90,0xfe,0xe0,0xc3,0x94,0xff,0x50,0x06, -+0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x90,0xff,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0, -+0x04,0xf0,0xe4,0x90,0x90,0xfe,0xf0,0x90,0x90,0xfd,0xf0,0x90,0x00,0x44,0xe0,0x30, -+0xe3,0x32,0x90,0x91,0x00,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24, -+0x90,0x91,0x01,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90, -+0x91,0x02,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x91,0x01,0xf0, -+0x90,0x91,0x00,0xf0,0x90,0x04,0xfd,0xe0,0x44,0x01,0xf0,0x22,0x90,0x06,0x90,0xe0, -+0x44,0x01,0xf0,0x90,0x91,0x61,0xe0,0x30,0xe0,0x3c,0x90,0x91,0x5f,0xe0,0xff,0x90, -+0x91,0x5e,0xe0,0xfe,0xc4,0x13,0x54,0x01,0xfd,0x12,0x4a,0xf6,0x90,0x91,0x60,0xe0, -+0x75,0xf0,0x20,0xa4,0xff,0xae,0xf0,0x12,0x32,0x15,0x90,0x91,0x5e,0xe0,0xc4,0x13, -+0x54,0x07,0x30,0xe0,0x07,0xa3,0xe0,0xff,0xe4,0xfd,0x80,0x07,0x90,0x91,0x5f,0xe0, -+0xff,0x7d,0x01,0x12,0x4a,0xf6,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xe4,0x90, -+0x91,0x19,0xf0,0xa3,0x74,0x08,0xf0,0xa3,0xf0,0xe4,0xa3,0xf0,0x90,0x01,0x1f,0xe0, -+0xfe,0x90,0x01,0x1e,0xe0,0x7c,0x00,0x24,0x00,0xff,0xec,0x3e,0x90,0x91,0x11,0xf0, -+0xa3,0xef,0xf0,0x90,0x02,0x87,0xe0,0x90,0x91,0x18,0xf0,0x90,0x91,0x56,0xe0,0x20, -+0xe0,0x02,0x61,0xc4,0xe4,0x90,0x91,0x17,0xf0,0x90,0x91,0x18,0xe0,0xff,0x90,0x91, -+0x17,0xe0,0xc3,0x9f,0x40,0x02,0x61,0xc4,0x90,0x91,0x11,0xe0,0xfc,0xa3,0xe0,0xfd, -+0xec,0xff,0x90,0xfd,0x11,0xf0,0x90,0x91,0x1c,0xef,0xf0,0x74,0x02,0x2d,0xf5,0x82, -+0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x54,0x0f,0xfc,0x33,0x33,0x33,0x54,0xf8,0xff,0xed, -+0x24,0x18,0x2f,0x90,0x91,0x15,0xf0,0xe0,0x24,0x00,0xf5,0x82,0xe4,0x34,0xfb,0xf5, -+0x83,0xe0,0x54,0xfc,0x90,0x91,0x16,0xf0,0x74,0x01,0x2d,0xf5,0x82,0xe4,0x34,0xfb, -+0xf5,0x83,0xe0,0xfe,0x74,0x00,0x2d,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x7a, -+0x00,0x24,0x00,0xff,0xea,0x3e,0x54,0x3f,0xab,0x07,0xfa,0x90,0x91,0x13,0xf0,0xa3, -+0xeb,0xf0,0xaf,0x04,0xef,0x75,0xf0,0x08,0xa4,0x24,0x18,0xff,0xe4,0x35,0xf0,0xfe, -+0xef,0x2b,0xfb,0xee,0x3a,0xfa,0x90,0x91,0x5a,0xe0,0xfe,0xa3,0xe0,0xff,0xad,0x03, -+0xac,0x02,0x12,0x45,0x09,0xaa,0x06,0xab,0x07,0x90,0x91,0x15,0xe0,0x24,0x00,0xf5, -+0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x30,0xe7,0x08,0x90,0x91,0x19,0x74,0x02,0xf0, -+0x80,0x05,0xe4,0x90,0x91,0x19,0xf0,0xaf,0x03,0x90,0x91,0x11,0xea,0x8f,0xf0,0x12, -+0x42,0x81,0x90,0x91,0x5c,0xe0,0xfe,0xa3,0xe0,0xff,0x90,0x91,0x11,0xe0,0xfc,0xa3, -+0xe0,0xfd,0xd3,0x9f,0xec,0x9e,0x40,0x1b,0x90,0x91,0x5d,0xe0,0x24,0x01,0xff,0x90, -+0x91,0x5c,0xe0,0x34,0x00,0xfe,0xc3,0xed,0x9f,0xff,0xec,0x9e,0x90,0x91,0x11,0xf0, -+0xa3,0xef,0xf0,0x90,0x91,0x16,0xe0,0xff,0x24,0x40,0x60,0x04,0x24,0x20,0x70,0x27, -+0x90,0x91,0x5e,0xe0,0xfe,0xc4,0x13,0x13,0x13,0x54,0x01,0x20,0xe0,0x02,0x61,0x9c, -+0xef,0x90,0x00,0x81,0xb4,0xa0,0x05,0xe0,0x44,0x04,0x80,0x03,0xe0,0x44,0x08,0xfd, -+0x7f,0x81,0x12,0x4b,0xee,0x61,0x95,0x90,0x91,0x5e,0xe0,0xc4,0x13,0x13,0x54,0x03, -+0x20,0xe0,0x02,0x61,0x9c,0x90,0x91,0x15,0xe0,0xff,0x24,0x00,0xf5,0x82,0xe4,0x34, -+0xfb,0xf5,0x83,0xe0,0x54,0x0c,0x64,0x08,0x70,0x72,0x90,0x91,0x19,0xe0,0xfe,0xef, -+0x2e,0xff,0xa3,0xe0,0x2f,0xff,0x24,0x1e,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0, -+0x64,0x88,0x70,0x58,0x74,0x1f,0x2f,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x64, -+0x8e,0x70,0x49,0x90,0x91,0x19,0xe0,0xff,0x90,0x91,0x15,0xe0,0x2f,0xff,0x90,0x91, -+0x1a,0xe0,0x2f,0xff,0xa3,0xe0,0x2f,0xff,0x24,0x19,0xf5,0x82,0xe4,0x34,0xfb,0xf5, -+0x83,0xe0,0x64,0x03,0x70,0x26,0x74,0x1e,0x2f,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83, -+0xe0,0x90,0x00,0x81,0x30,0xe3,0x05,0xe0,0x44,0x01,0x80,0x03,0xe0,0x44,0x02,0xfd, -+0x7f,0x81,0x12,0x4b,0xee,0x90,0x91,0x56,0xe0,0x44,0x80,0xf0,0x90,0x91,0x56,0xe0, -+0xff,0xc4,0x13,0x13,0x13,0x54,0x01,0x30,0xe0,0x02,0x31,0x4c,0x71,0xc9,0xbf,0x01, -+0x13,0x90,0x91,0x11,0xe0,0xfe,0xa3,0xe0,0xff,0x12,0x44,0xb5,0x90,0x91,0x17,0xe0, -+0x04,0xf0,0x21,0xd9,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x56,0xe0,0xc4,0x13,0x13, -+0x13,0x54,0x01,0x30,0xe0,0x11,0xe0,0x44,0x80,0xf0,0x90,0x91,0x5e,0xe0,0xc4,0x54, -+0x0f,0x20,0xe0,0x03,0x7f,0x00,0x22,0x7f,0x01,0x22,0x8f,0x1f,0xe4,0x90,0x91,0x22, -+0xf0,0xe5,0x1f,0x14,0xfe,0x90,0x91,0x22,0xe0,0xff,0xc3,0x9e,0x50,0x0e,0xef,0x04, -+0xfd,0x12,0x2d,0x4d,0x90,0x91,0x22,0xe0,0x04,0xf0,0x80,0xe5,0xe5,0x1f,0x14,0xff, -+0x7d,0xff,0x12,0x2d,0x4d,0x90,0x91,0x22,0xe5,0x1f,0xf0,0x90,0x91,0x22,0xe0,0xc3, -+0x94,0xff,0x50,0x0f,0xe0,0xff,0x04,0xfd,0x12,0x2d,0x4d,0x90,0x91,0x22,0xe0,0x04, -+0xf0,0x80,0xe8,0xad,0x1f,0x7f,0xff,0x02,0x2d,0x4d,0xc3,0xee,0x94,0x01,0x40,0x0a, -+0x0d,0xed,0x13,0x90,0xfd,0x10,0xf0,0xe4,0x2f,0xff,0x22,0xc3,0xee,0x94,0x01,0x40, -+0x1e,0x90,0xfd,0x11,0xe0,0xb5,0x05,0x14,0x90,0x01,0x17,0xe0,0xb5,0x05,0x07,0x90, -+0xfd,0x11,0xe4,0xf0,0x80,0x06,0xed,0x04,0x90,0xfd,0x11,0xf0,0xe4,0x2f,0xff,0x22, -+0x14,0x25,}; -+ -+ -+ -+u8 Rtl8192CUFwUMCBCutWWImgArray[UMCBCutWWImgArrayLength] = { -+0xc2,0x88,0x02,0x00,0x51,0x00,0x00,0x00,0x03,0x23,0x16,0x45,0x66,0x34,0x01,0x00, -+0x58,0x92,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x02,0x43,0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x4a,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x02,0x57,0xe1,0x00,0x00,0x00,0x00,0x00,0x02,0x58,0xc4,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -+0xbb,0x01,0x0c,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe0,0x22,0x50, -+0x06,0xe9,0x25,0x82,0xf8,0xe6,0x22,0xbb,0xfe,0x06,0xe9,0x25,0x82,0xf8,0xe2,0x22, -+0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe4,0x93,0x22,0xbb,0x01,0x06, -+0x89,0x82,0x8a,0x83,0xf0,0x22,0x50,0x02,0xf7,0x22,0xbb,0xfe,0x01,0xf3,0x22,0xf8, -+0xbb,0x01,0x0d,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0x22, -+0x50,0x06,0xe9,0x25,0x82,0xc8,0xf6,0x22,0xbb,0xfe,0x05,0xe9,0x25,0x82,0xc8,0xf2, -+0x22,0xc5,0xf0,0xf8,0xa3,0xe0,0x28,0xf0,0xc5,0xf0,0xf8,0xe5,0x82,0x15,0x82,0x70, -+0x02,0x15,0x83,0xe0,0x38,0xf0,0x22,0xbb,0x01,0x10,0xe5,0x82,0x29,0xf5,0x82,0xe5, -+0x83,0x3a,0xf5,0x83,0xe0,0xf5,0xf0,0xa3,0xe0,0x22,0x50,0x09,0xe9,0x25,0x82,0xf8, -+0x86,0xf0,0x08,0xe6,0x22,0xbb,0xfe,0x0a,0xe9,0x25,0x82,0xf8,0xe2,0xf5,0xf0,0x08, -+0xe2,0x22,0xe5,0x83,0x2a,0xf5,0x83,0xe9,0x93,0xf5,0xf0,0xa3,0xe9,0x93,0x22,0xf8, -+0xbb,0x01,0x11,0xe5,0x82,0x29,0xf5,0x82,0xe5,0x83,0x3a,0xf5,0x83,0xe8,0xf0,0xe5, -+0xf0,0xa3,0xf0,0x22,0x50,0x09,0xe9,0x25,0x82,0xc8,0xf6,0x08,0xa6,0xf0,0x22,0xbb, -+0xfe,0x09,0xe9,0x25,0x82,0xc8,0xf2,0xe5,0xf0,0x08,0xf2,0x22,0xef,0x4b,0xff,0xee, -+0x4a,0xfe,0xed,0x49,0xfd,0xec,0x48,0xfc,0x22,0xe0,0xfc,0xa3,0xe0,0xfd,0xa3,0xe0, -+0xfe,0xa3,0xe0,0xff,0x22,0xa4,0x25,0x82,0xf5,0x82,0xe5,0xf0,0x35,0x83,0xf5,0x83, -+0x22,0xe0,0xfb,0xa3,0xe0,0xfa,0xa3,0xe0,0xf9,0x22,0xf8,0xe0,0xfb,0xa3,0xa3,0xe0, -+0xf9,0x25,0xf0,0xf0,0xe5,0x82,0x15,0x82,0x70,0x02,0x15,0x83,0xe0,0xfa,0x38,0xf0, -+0x22,0xeb,0xf0,0xa3,0xea,0xf0,0xa3,0xe9,0xf0,0x22,0xd0,0x83,0xd0,0x82,0xf8,0xe4, -+0x93,0x70,0x12,0x74,0x01,0x93,0x70,0x0d,0xa3,0xa3,0x93,0xf8,0x74,0x01,0x93,0xf5, -+0x82,0x88,0x83,0xe4,0x73,0x74,0x02,0x93,0x68,0x60,0xef,0xa3,0xa3,0xa3,0x80,0xdf, -+0xd0,0x83,0xd0,0x82,0xf8,0xe4,0x93,0x70,0x12,0x74,0x01,0x93,0x70,0x0d,0xa3,0xa3, -+0x93,0xf8,0x74,0x01,0x93,0xf5,0x82,0x88,0x83,0xe4,0x73,0x74,0x02,0x93,0xb5,0xf0, -+0x06,0x74,0x03,0x93,0x68,0x60,0xe9,0xa3,0xa3,0xa3,0xa3,0x80,0xd8,0x02,0x43,0xdb, -+0x02,0x50,0x34,0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0x40,0x03,0xf6,0x80,0x01,0xf2, -+0x08,0xdf,0xf4,0x80,0x29,0xe4,0x93,0xa3,0xf8,0x54,0x07,0x24,0x0c,0xc8,0xc3,0x33, -+0xc4,0x54,0x0f,0x44,0x20,0xc8,0x83,0x40,0x04,0xf4,0x56,0x80,0x01,0x46,0xf6,0xdf, -+0xe4,0x80,0x0b,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x90,0x44,0x20,0xe4,0x7e, -+0x01,0x93,0x60,0xbc,0xa3,0xff,0x54,0x3f,0x30,0xe5,0x09,0x54,0x1f,0xfe,0xe4,0x93, -+0xa3,0x60,0x01,0x0e,0xcf,0x54,0xc0,0x25,0xe0,0x60,0xa8,0x40,0xb8,0xe4,0x93,0xa3, -+0xfa,0xe4,0x93,0xa3,0xf8,0xe4,0x93,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca, -+0xf0,0xa3,0xc8,0xc5,0x82,0xc8,0xca,0xc5,0x83,0xca,0xdf,0xe9,0xde,0xe7,0x80,0xbe, -+0x41,0x91,0x40,0x00,0x41,0x91,0x9c,0x00,0x41,0x91,0x23,0x80,0x41,0x91,0x24,0x80, -+0x41,0x91,0x9e,0x00,0x41,0x91,0x52,0x00,0x41,0x91,0x93,0x00,0x41,0x91,0x91,0x00, -+0x41,0x91,0x90,0x00,0x41,0x91,0x92,0x00,0x00,0xf0,0x90,0x91,0x30,0xe0,0x90,0x91, -+0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x54,0x7e,0x01,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0x65,0xeb,0xf0,0xa3,0xe0,0xfb,0xa3,0xe0,0xf5,0x44,0xe4,0xf5,0x45,0x12, -+0x35,0xab,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x01,0x5f,0xe4,0xf0,0x90,0x01,0x3c,0x74, -+0x08,0xf0,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4, -+0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x91,0x59,0x90,0x01,0x5f,0x74,0x05,0xf0,0x90,0x06, -+0x92,0x74,0x02,0xf0,0x90,0x91,0x36,0x14,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x0c, -+0x50,0x02,0xf1,0x23,0x22,0x90,0x02,0x84,0xef,0xf0,0xa3,0xee,0xf0,0xa3,0x74,0x05, -+0xf0,0x22,0x7d,0x01,0xaf,0x6f,0xe1,0x27,0xf1,0xe6,0xbf,0x01,0x10,0x90,0x91,0x42, -+0xe0,0xff,0xe4,0xfd,0x12,0x48,0x22,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0x8f,0x82, -+0x8e,0x83,0xa3,0xa3,0xa3,0xe4,0xf0,0x22,0xe4,0xf5,0x72,0x7f,0x60,0x7e,0x01,0x80, -+0xed,0x7f,0x00,0x22,0x90,0x91,0x32,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0,0x22,0x22, -+0x22,0x22,0x22,0x02,0x5e,0x55,0x02,0x5e,0x5c,0xef,0x8e,0xf0,0x71,0x70,0x45,0x26, -+0x00,0x40,0x45,0x4e,0x00,0x80,0x45,0x79,0x01,0x00,0x45,0x8d,0x02,0x00,0x45,0xa5, -+0x04,0x00,0x00,0x00,0x45,0xc2,0xed,0x54,0x3f,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e, -+0x00,0x7f,0x40,0xef,0x2d,0xff,0xee,0x3c,0xfe,0xef,0x78,0x06,0xce,0xc3,0x13,0xce, -+0x13,0xd8,0xf9,0x78,0x06,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0x80,0x26,0xed,0x54, -+0x7f,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e,0x00,0x7f,0x80,0xef,0x2d,0xff,0xee,0x3c, -+0xfe,0xef,0x78,0x07,0xce,0xc3,0x13,0xce,0x13,0xd8,0xf9,0x78,0x07,0xc3,0x33,0xce, -+0x33,0xce,0xd8,0xf9,0xfd,0xac,0x06,0x80,0x49,0xed,0x70,0x04,0xfe,0xff,0x80,0x04, -+0x7e,0x01,0x7f,0x00,0xef,0x2d,0xee,0x3c,0x7d,0x00,0xfc,0x80,0x35,0xec,0x54,0x01, -+0x4d,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e,0x02,0x7f,0x00,0xef,0x2d,0xee,0x3c,0xc3, -+0x13,0x7d,0x00,0x80,0x1a,0xec,0x54,0x03,0x4d,0x70,0x04,0xfe,0xff,0x80,0x04,0x7e, -+0x04,0x7f,0x00,0xef,0x2d,0xee,0x3c,0x13,0x13,0x54,0x3f,0x7d,0x00,0x25,0xe0,0x25, -+0xe0,0xfc,0xae,0x04,0xaf,0x05,0x22,0x90,0x91,0x09,0x12,0x2a,0x8b,0x00,0x00,0x00, -+0x00,0x90,0x06,0xa9,0xe0,0x90,0x91,0x08,0xf0,0xe0,0x54,0xc0,0x70,0x0a,0x53,0x71, -+0xfe,0x53,0x71,0xfd,0x91,0xc2,0x80,0x47,0x90,0x91,0x26,0xe0,0x60,0x41,0x90,0x91, -+0x38,0xe0,0x70,0x3b,0x90,0x91,0x38,0x74,0x01,0xf0,0x7f,0x00,0x7e,0x08,0x12,0x27, -+0xde,0x90,0x91,0x09,0x12,0x2a,0x7f,0x90,0x91,0x09,0x71,0x09,0xec,0x44,0x02,0xfc, -+0x90,0x91,0x09,0x12,0x2a,0x7f,0x90,0x91,0x09,0x71,0x09,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x90, -+0x91,0x08,0xe0,0x30,0xe6,0x13,0x43,0x71,0x01,0x90,0x91,0x3b,0xe0,0x64,0x02,0x60, -+0x04,0x91,0xc8,0x80,0x07,0x91,0x77,0x80,0x03,0x53,0x71,0xfe,0x90,0x91,0x08,0xe0, -+0x30,0xe7,0x16,0x43,0x71,0x02,0xe4,0x90,0x91,0x66,0x91,0x49,0x90,0x01,0x57,0x74, -+0x05,0xf0,0x90,0x91,0x3c,0x74,0x01,0xf0,0x22,0x53,0x71,0xfd,0x22,0xd3,0x10,0xaf, -+0x01,0xc3,0xc0,0xd0,0x8b,0x60,0x8a,0x61,0x89,0x62,0x90,0x91,0x68,0x71,0x41,0xab, -+0x63,0xaa,0x64,0xa9,0x65,0x90,0x91,0x6b,0x71,0x41,0xaf,0x66,0x15,0x66,0xef,0x60, -+0x1b,0x90,0x91,0x6b,0xe4,0x75,0xf0,0x01,0x71,0x2a,0x12,0x29,0xd9,0xff,0x90,0x91, -+0x68,0xe4,0x75,0xf0,0x01,0x71,0x2a,0xef,0x51,0x4d,0x80,0xde,0xab,0x60,0xaa,0x61, -+0xa9,0x62,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91, -+0x6e,0x71,0x41,0x90,0x91,0x9e,0xe0,0xff,0x04,0xf0,0x90,0x00,0x01,0xef,0x51,0x5f, -+0x7f,0xaf,0x7e,0x01,0x12,0x64,0x88,0xef,0x60,0x44,0x90,0x91,0x6e,0x71,0x21,0x8b, -+0x63,0x8a,0x64,0x89,0x65,0x75,0x66,0x02,0x7b,0x01,0x7a,0x01,0x79,0xa0,0xd1,0x6d, -+0x90,0x91,0x71,0x71,0x21,0x8b,0x63,0x8a,0x64,0x89,0x65,0x90,0x91,0x6e,0x71,0x21, -+0x12,0x29,0xd9,0xff,0xc4,0x54,0x0f,0xf5,0x66,0x7b,0x01,0x7a,0x01,0x79,0xa2,0xd1, -+0x6d,0x90,0x01,0xaf,0x74,0xff,0xf0,0x90,0x01,0xcb,0xe0,0x64,0x80,0xf0,0xd0,0xd0, -+0x92,0xaf,0x22,0x7d,0x01,0x7f,0x0c,0x90,0x91,0x95,0xed,0xf0,0x90,0x91,0x94,0xef, -+0xf0,0x54,0x0f,0xff,0xe5,0x6e,0x54,0x0f,0x6f,0x60,0x76,0x90,0x91,0x94,0xe0,0x30, -+0xe2,0x30,0xe5,0x6e,0x20,0xe2,0x05,0x7f,0x01,0x12,0x61,0x86,0xe5,0x6e,0x30,0xe3, -+0x0f,0x90,0x91,0x94,0xe0,0x20,0xe3,0x08,0x12,0x60,0xb1,0xef,0x60,0x53,0x80,0x52, -+0xe5,0x6e,0x20,0xe3,0x4c,0x90,0x91,0x94,0xe0,0x30,0xe3,0x45,0xa3,0xe0,0xff,0x02, -+0x61,0x6b,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x0c,0x0f,0x90,0x91,0x94,0xe0,0x20,0xe3, -+0x08,0x12,0x60,0xb1,0xef,0x60,0x2a,0xf1,0xb2,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x04, -+0x10,0x90,0x91,0x94,0xe0,0x20,0xe2,0x09,0x12,0x60,0xfa,0xef,0x60,0x13,0x12,0x48, -+0xce,0xe5,0x6e,0x54,0x0f,0xff,0xbf,0x02,0x08,0x91,0xf1,0xef,0x60,0x03,0x12,0x62, -+0x6c,0x22,0x90,0x06,0x04,0xe0,0x44,0x40,0xf0,0xe5,0x6d,0xb4,0x01,0x04,0x7f,0x01, -+0xf1,0xc9,0x53,0x6e,0xf0,0x43,0x6e,0x04,0x22,0x8f,0x67,0xf1,0xe6,0xbf,0x01,0x15, -+0x90,0x91,0x43,0x12,0x48,0x1e,0xad,0x07,0xac,0x06,0xaf,0x67,0x12,0x60,0x16,0x90, -+0x04,0x1f,0x74,0x20,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x01,0xc4, -+0x74,0xe6,0xf0,0x74,0x47,0xa3,0xf0,0x90,0x04,0x1d,0xe0,0x60,0x1a,0x90,0x05,0x22, -+0xe0,0x54,0x90,0x60,0x07,0x90,0x01,0xc6,0xe0,0x44,0x40,0xf0,0x90,0x01,0xc7,0xe0, -+0x30,0xe1,0xe4,0x7f,0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xe0,0xff, -+0x7d,0x01,0x90,0x91,0x74,0xef,0xf0,0xa3,0xed,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xe5, -+0x70,0x60,0x04,0xe4,0xff,0x11,0xb3,0x90,0x91,0x74,0xe0,0x30,0xe0,0x09,0x90,0x91, -+0x76,0xe4,0xf0,0xa3,0x74,0x80,0xf0,0x90,0x91,0x74,0xe0,0xff,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x90,0x04,0x25,0xef,0xf0,0x90,0x91,0x75,0xe0,0x60,0x1f,0xa3,0xa3,0xe0, -+0xff,0x24,0x0f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x74,0x10, -+0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x80,0xf0,0x90,0x91,0x76,0xa3, -+0xe0,0xff,0xfd,0x24,0x08,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe4,0xf0,0x74,0x09, -+0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf0,0xf0,0x74,0x21,0x2f,0xf5, -+0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xf7,0xf0,0x90,0x91,0x76,0xe0,0xfe,0xa3, -+0xe0,0xff,0x22,0xef,0x60,0x0b,0x90,0x91,0x51,0xe0,0xb4,0x01,0x10,0xe4,0xff,0x80, -+0x09,0x90,0x91,0x51,0xe0,0xb4,0x01,0x05,0x7f,0x01,0x12,0x69,0x87,0x22,0x90,0x01, -+0x37,0x74,0x02,0xf0,0x90,0x05,0x22,0x74,0xff,0xf0,0x12,0x68,0x7c,0xef,0x70,0x06, -+0x90,0x01,0xc8,0x74,0xfd,0xf0,0x7d,0x02,0x7f,0x03,0x12,0x36,0xe6,0xe5,0x70,0x60, -+0x04,0x7f,0x01,0x11,0xb3,0x12,0x68,0xbd,0x53,0x6e,0xf0,0x43,0x6e,0x02,0x22,0xef, -+0x64,0x01,0x70,0x42,0x7d,0x78,0x7f,0x02,0x12,0x36,0x75,0x7d,0x02,0x7f,0x03,0x12, -+0x36,0x75,0x90,0x01,0x36,0x74,0x03,0xf0,0xfd,0x7f,0x02,0x12,0x36,0xe6,0x7d,0x10, -+0x7f,0x03,0x12,0x36,0x92,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0, -+0x12,0x47,0x23,0xe4,0xff,0x11,0xb3,0x90,0x06,0x04,0xe0,0x54,0x7f,0xf0,0x90,0x06, -+0x0a,0xe0,0x54,0xf8,0xf0,0x22,0x90,0x01,0x36,0x74,0x7b,0xf0,0xa3,0x74,0x02,0xf0, -+0x7d,0x7b,0xff,0x12,0x36,0xe6,0x7d,0x02,0x7f,0x03,0x12,0x36,0xe6,0x7d,0x10,0x7f, -+0x03,0x12,0x36,0x92,0x90,0x06,0x04,0xe0,0x44,0x80,0xf0,0x90,0x06,0x0a,0xe0,0x44, -+0x07,0xf0,0x12,0x44,0xf4,0xe5,0x6d,0x20,0xe0,0x05,0xe4,0x90,0x91,0x29,0xf0,0x22, -+0x8b,0x0e,0x8a,0x0f,0x89,0x10,0xf1,0xf2,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x12,0x29, -+0xd9,0xf5,0x70,0x14,0x60,0x0e,0x14,0x60,0x1e,0x14,0x60,0x2f,0x24,0x03,0x70,0x40, -+0x7f,0x01,0x80,0x3a,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00,0x02,0x12,0x42,0x20, -+0xfd,0xe4,0xff,0x31,0xe1,0x80,0x27,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00,0x02, -+0x12,0x42,0x20,0xfd,0x7f,0x01,0x31,0xe1,0x1f,0x80,0x13,0xab,0x0e,0xaa,0x0f,0xa9, -+0x10,0x90,0x00,0x02,0x12,0x42,0x20,0xfd,0x7f,0x02,0x31,0xe1,0xe4,0xff,0x11,0xff, -+0x22,0xef,0x24,0xfe,0x60,0x0b,0x04,0x70,0x22,0x90,0x91,0x39,0x74,0x01,0xf0,0x80, -+0x16,0xed,0x70,0x0a,0x90,0x91,0x35,0xe0,0x90,0x91,0x39,0xf0,0x80,0x05,0x90,0x91, -+0x39,0xed,0xf0,0x90,0x91,0x39,0xe0,0x90,0x91,0x27,0xf0,0x22,0x12,0x47,0xe6,0xbf, -+0x01,0x0f,0x90,0x02,0x09,0xe0,0xff,0x7d,0x01,0x11,0x22,0x90,0x04,0x1f,0x74,0x20, -+0xf0,0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0, -+0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90, -+0x01,0xc4,0x74,0x22,0xf0,0x74,0x4a,0xa3,0xf0,0x90,0x01,0x34,0xe0,0x55,0x28,0xf5, -+0x2c,0x90,0x01,0x36,0xe0,0x55,0x2a,0xf5,0x2e,0xa3,0xe0,0x55,0x2b,0xf5,0x2f,0xe5, -+0x2c,0x30,0xe0,0x5a,0x90,0x01,0x34,0x74,0x01,0xf0,0x85,0xd9,0x54,0xe5,0x70,0x14, -+0x24,0xfd,0x50,0x02,0x80,0x48,0x90,0x91,0x3b,0xe0,0x60,0x3a,0x90,0x01,0x5b,0xe4, -+0xf0,0x90,0x01,0x3c,0x74,0x04,0xf0,0x91,0x89,0xef,0x64,0x01,0x70,0x30,0x90,0x91, -+0x66,0xf0,0x90,0x91,0x2d,0xe0,0x90,0x91,0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e, -+0x01,0x12,0x44,0x59,0x90,0x01,0x5b,0x74,0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0, -+0x90,0x91,0x37,0xf0,0x80,0x08,0x91,0x89,0xbf,0x01,0x03,0x12,0x44,0xc2,0xe5,0x2c, -+0x30,0xe1,0x21,0x90,0x01,0x34,0x74,0x02,0xf0,0x85,0xd1,0x58,0x85,0xd2,0x59,0x85, -+0xd3,0x5a,0x85,0xd4,0x5b,0x85,0xd5,0x5c,0x85,0xd6,0x5d,0x85,0xd7,0x5e,0x85,0xd9, -+0x5f,0x12,0x64,0x66,0xe5,0x2c,0x30,0xe3,0x10,0x90,0x01,0x34,0x74,0x08,0xf0,0x90, -+0x91,0x56,0xe0,0x30,0xe0,0x03,0x43,0x57,0x04,0xe5,0x2c,0x30,0xe4,0x09,0x90,0x01, -+0x34,0x74,0x10,0xf0,0x43,0x57,0x10,0xe5,0x2c,0x30,0xe5,0x24,0x90,0x01,0xcf,0xe0, -+0x30,0xe5,0x1d,0xe0,0x54,0xdf,0xf0,0x90,0x01,0x34,0x74,0x20,0xf0,0x75,0xa8,0x00, -+0x75,0xe8,0x00,0xd1,0x65,0x90,0x00,0x03,0xe0,0x54,0xfb,0xf0,0x91,0xa0,0x80,0xfe, -+0xe5,0x2c,0x30,0xe6,0x06,0x90,0x01,0x34,0x74,0x40,0xf0,0xe5,0x2e,0x30,0xe0,0x15, -+0x90,0x91,0x50,0x74,0x01,0xf0,0x90,0x01,0x36,0xf0,0x12,0x63,0x2e,0x12,0x70,0xee, -+0x90,0x91,0x50,0xe4,0xf0,0xe5,0x2e,0x30,0xe1,0x3b,0x90,0x01,0x36,0x74,0x02,0xf0, -+0x43,0x57,0x40,0x90,0x01,0x02,0xe0,0x54,0x03,0x64,0x01,0x70,0x28,0x90,0x01,0x37, -+0xe0,0x30,0xe0,0x0a,0x74,0x01,0xf0,0x90,0x91,0x40,0xe4,0xf0,0x80,0x17,0x90,0x91, -+0x40,0xe0,0x04,0xf0,0xe0,0xc3,0x94,0x0a,0x40,0x0b,0xe4,0xf0,0x90,0x04,0x19,0xe0, -+0x30,0xe0,0x02,0x51,0x0c,0xe5,0x2e,0x30,0xe2,0x1a,0x90,0x01,0x36,0x74,0x04,0xf0, -+0x90,0x91,0x3a,0xe4,0xf0,0x90,0x05,0x58,0x74,0x03,0xf0,0x12,0x62,0xb8,0x90,0x91, -+0x3f,0xe0,0x04,0xf0,0xe5,0x2e,0x30,0xe3,0x28,0x90,0x01,0x36,0x74,0x08,0xf0,0xe5, -+0x6d,0x64,0x01,0x70,0x1c,0xe5,0x70,0x60,0x18,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01, -+0x3c,0x74,0x02,0xf0,0x90,0x91,0x66,0xe4,0x12,0x44,0x49,0x90,0x01,0x57,0x74,0x05, -+0xf0,0xe5,0x2e,0x30,0xe4,0x2b,0x90,0x01,0x36,0x74,0x10,0xf0,0xe5,0x6d,0xb4,0x01, -+0x20,0xe5,0x70,0x60,0x1c,0x90,0x01,0x57,0xe4,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0, -+0x90,0x91,0x3c,0xe4,0xf0,0x53,0x71,0xfd,0xe5,0x71,0x54,0x07,0x70,0x03,0x12,0x44, -+0xc2,0xe5,0x2e,0x30,0xe5,0x1f,0x90,0x01,0x36,0x74,0x20,0xf0,0xe5,0x6d,0xb4,0x01, -+0x14,0xe5,0x70,0x60,0x10,0x90,0x91,0x3b,0xe0,0x64,0x02,0x60,0x05,0x12,0x44,0xc8, -+0x80,0x03,0x12,0x44,0x77,0xe5,0x2e,0x30,0xe6,0x1b,0x90,0x01,0x36,0x74,0x40,0xf0, -+0xe5,0x6d,0xb4,0x01,0x10,0xe5,0x70,0x60,0x0c,0x53,0x71,0xfe,0xe5,0x71,0x54,0x07, -+0x70,0x03,0x12,0x44,0xc2,0xe5,0x2f,0x30,0xe1,0x09,0x90,0x01,0x37,0x74,0x02,0xf0, -+0x12,0x64,0x31,0x74,0x22,0x04,0x90,0x01,0xc4,0xf0,0x74,0x4a,0xa3,0xf0,0xd0,0x07, -+0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0, -+0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0,0xe0,0x32,0x90,0x04,0x1b,0xe0,0x54,0x7f,0x64, -+0x7f,0x7f,0x01,0x60,0x02,0x7f,0x00,0x22,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x7f,0x10,0xdf,0xfe,0xd0,0xd0,0x92,0xaf,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x9b,0xed,0xf0,0x90,0x91,0x9a,0xef, -+0xf0,0xd3,0x94,0x07,0x50,0x63,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3, -+0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x47,0xe0,0x5f,0xf0,0x91,0xa0,0x90,0x91,0x9a, -+0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00, -+0x46,0xe0,0x4f,0xf0,0x91,0xa0,0x90,0x91,0x9b,0xe0,0x60,0x16,0x90,0x91,0x9a,0xe0, -+0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x45, -+0x80,0x66,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xf4,0xff,0x90,0x00,0x45,0x80,0x6b,0x90,0x91,0x9a,0xe0,0x24,0xf8,0xf0, -+0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0, -+0x91,0x98,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33, -+0xd8,0xfc,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0x91,0xa0,0x90,0x91,0x9b,0xe0,0x60, -+0x1b,0x90,0x91,0x9a,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8, -+0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x42,0xe0,0x4f,0x80,0x1a,0x90,0x91,0x9a,0xe0, -+0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xf4, -+0xff,0x90,0x00,0x42,0xe0,0x5f,0xf0,0x91,0xa0,0xd0,0xd0,0x92,0xaf,0x22,0xf0,0x90, -+0x00,0x45,0xe0,0x54,0xfe,0xfd,0x7f,0x45,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x8f, -+0x82,0x75,0x83,0x00,0xed,0xf0,0x91,0xa0,0xd0,0xd0,0x92,0xaf,0x22,0xef,0x14,0x60, -+0x30,0x14,0x60,0x66,0x24,0x02,0x60,0x02,0xc1,0x64,0x90,0x90,0xf3,0x74,0x02,0xf0, -+0x90,0x00,0x48,0xe0,0x44,0x0c,0xfd,0x7f,0x48,0xb1,0xa8,0x90,0x00,0x47,0xe0,0x44, -+0x08,0xfd,0x7f,0x47,0xb1,0xa8,0x90,0x00,0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0x80, -+0x71,0xe4,0x90,0x90,0xf3,0xf0,0x90,0x90,0xef,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x00,0x45,0xe0,0x44,0xef,0xfd, -+0x7f,0x45,0xb1,0xa8,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f,0x45,0xb1,0xa8,0x90, -+0x00,0x46,0xe0,0x44,0x10,0xfd,0x7f,0x46,0x80,0x38,0x90,0x90,0xf3,0x74,0x01,0xf0, -+0x90,0x90,0xf9,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08, -+0x12,0x2f,0xd9,0x90,0x00,0x45,0xe0,0x44,0x20,0xfd,0x7f,0x45,0xb1,0xa8,0x90,0x00, -+0x45,0xe0,0x44,0x10,0xfd,0x7f,0x45,0xb1,0xa8,0x90,0x00,0x46,0xe0,0x44,0x10,0xfd, -+0x7f,0x46,0xb1,0xa8,0x22,0x90,0x01,0x30,0xe4,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0, -+0x90,0x01,0x38,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x50,0xb1,0xa8,0xe4, -+0xfd,0x7f,0x51,0xb1,0xa8,0xe4,0xfd,0x7f,0x52,0xb1,0xa8,0xe4,0xfd,0x7f,0x53,0xa1, -+0xa8,0x8b,0x0e,0x8a,0x0f,0x89,0x10,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x90,0xf6, -+0xf0,0xe0,0x30,0xe0,0x4b,0x90,0x90,0xed,0x74,0x01,0xf0,0x7f,0x80,0x7e,0x08,0x12, -+0x27,0xde,0x90,0x90,0xef,0x12,0x2a,0x7f,0xab,0x0e,0xaa,0x0f,0xa9,0x10,0x90,0x00, -+0x01,0x12,0x42,0x20,0xff,0xe4,0xfc,0xfd,0xfe,0x78,0x1a,0x12,0x2a,0x6c,0xa8,0x04, -+0xa9,0x05,0xaa,0x06,0xab,0x07,0x90,0x90,0xef,0x12,0x43,0x09,0xec,0x54,0x03,0xfc, -+0x12,0x42,0xfc,0x90,0x90,0xf9,0x12,0x2a,0x7f,0x90,0x05,0x22,0xe4,0xf0,0x80,0x2d, -+0xe4,0x90,0x90,0xed,0xf0,0x7f,0x80,0x7e,0x08,0x12,0x27,0xde,0xec,0x54,0x03,0xfc, -+0xec,0x44,0xc0,0xfc,0x90,0x90,0xef,0x12,0x2a,0x7f,0x90,0x90,0xef,0x12,0x43,0x09, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0xf6, -+0xe0,0x30,0xe1,0x19,0x7d,0x0c,0x7f,0x47,0xb1,0xa8,0x90,0x00,0x48,0xe0,0x44,0x0c, -+0xfd,0x7f,0x48,0xb1,0xa8,0x90,0x00,0x46,0xe0,0x44,0x10,0x80,0x1c,0x90,0x00,0x47, -+0xe0,0x54,0xf3,0xfd,0x7f,0x47,0xb1,0xa8,0x90,0x00,0x48,0xe0,0x54,0xf3,0xfd,0x7f, -+0x48,0xb1,0xa8,0x90,0x00,0x46,0xe0,0x54,0xef,0xfd,0x7f,0x46,0xb1,0xa8,0xe4,0x90, -+0x90,0xf3,0xf0,0x22,0x90,0x01,0x3c,0x74,0xff,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x01, -+0x34,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xfd,0x7f,0x54,0xb1,0xa8,0x7d,0xff,0x7f, -+0x55,0xb1,0xa8,0x7d,0xff,0x7f,0x56,0xb1,0xa8,0x7d,0xff,0x7f,0x57,0xa1,0xa8,0xe5, -+0x72,0x64,0x01,0x70,0x3e,0x12,0x54,0x41,0xbf,0x01,0x05,0x7f,0x01,0x12,0x56,0xe7, -+0x90,0x00,0x46,0xe0,0x44,0x04,0xfd,0x7f,0x46,0xb1,0xa8,0x90,0x00,0x44,0xe0,0x54, -+0xfb,0xfd,0x7f,0x44,0xb1,0xa8,0x90,0x00,0x46,0xe0,0x54,0xfb,0xfd,0x7f,0x46,0xb1, -+0xa8,0x7f,0x02,0x12,0x6f,0x09,0x8f,0x76,0x90,0x01,0xc9,0xe5,0x76,0xf0,0xb4,0x01, -+0x02,0xf1,0xd4,0x22,0x90,0x00,0x49,0xe0,0x90,0x91,0x9f,0xf0,0xe0,0x54,0x0f,0xf0, -+0x44,0xf0,0xfd,0x7f,0x49,0xb1,0xa8,0x90,0x91,0x9f,0xe0,0x44,0xb0,0xfd,0x7f,0x49, -+0xa1,0xa8,0xe4,0x90,0x91,0x3c,0xf0,0x90,0x91,0x28,0xf0,0xf5,0x71,0x22,0x75,0x28, -+0x33,0xe4,0xf5,0x29,0x75,0x2a,0x07,0xf5,0x2b,0x90,0x01,0x30,0xe5,0x28,0xf0,0xa3, -+0xe5,0x29,0xf0,0xa3,0xe5,0x2a,0xf0,0xa3,0xe5,0x2b,0xf0,0x22,0x75,0x30,0x1f,0x75, -+0x31,0x01,0xe4,0xf5,0x32,0x90,0x01,0x38,0xe5,0x30,0xf0,0xa3,0xe5,0x31,0xf0,0xa3, -+0xe5,0x32,0xf0,0x22,0xe4,0x90,0x91,0x0e,0xf0,0xa3,0xf0,0x75,0x8e,0x02,0xf1,0x02, -+0xd1,0xb4,0x90,0x91,0x4f,0xef,0xf0,0xd1,0xdb,0x90,0x91,0x51,0xef,0xf0,0xf1,0x3d, -+0x90,0x91,0x3d,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xf5,0x57,0xd1,0xd2,0x12,0x60,0x37, -+0x12,0x32,0x3d,0xd1,0xc1,0x12,0x4f,0xfe,0xf1,0x13,0xd1,0xcb,0x11,0x1c,0x12,0x44, -+0xff,0x31,0x23,0x11,0xdf,0x12,0x6f,0xaa,0x90,0x91,0x10,0xe5,0xd9,0xf0,0x12,0x4f, -+0x64,0xc2,0xaf,0x90,0x00,0x80,0xe0,0x44,0x40,0xf0,0x12,0x4c,0xa0,0x75,0xe8,0x03, -+0x43,0xa8,0x85,0xd2,0xaf,0x90,0x91,0x0e,0xe0,0x64,0x01,0xf0,0x24,0x34,0x90,0x01, -+0xc4,0xf0,0x74,0x50,0xa3,0xf0,0xe5,0x57,0x30,0xe2,0x10,0x12,0x5e,0x63,0xbf,0x01, -+0x0a,0xc2,0xaf,0x53,0x57,0xfb,0xd2,0xaf,0x12,0x71,0x8a,0xe5,0x57,0x30,0xe4,0x0a, -+0xc2,0xaf,0x53,0x57,0xef,0xd2,0xaf,0x12,0x5e,0xa0,0x90,0x90,0xf7,0xe0,0x70,0x03, -+0x12,0x70,0x08,0x11,0xf7,0x90,0x91,0x3f,0xe0,0x90,0x01,0xba,0xf0,0x80,0xb6,0x90, -+0x91,0x53,0xe0,0x54,0xfe,0xf0,0xe4,0x90,0x91,0x55,0xf0,0x90,0x91,0x53,0xe0,0x54, -+0x7f,0xf0,0xa3,0x74,0x0a,0xf0,0x22,0x90,0x06,0x34,0xe0,0x60,0x25,0x14,0x70,0x1b, -+0x7b,0x01,0x7a,0x06,0x79,0x35,0x7f,0xf9,0x7e,0x01,0x12,0x68,0x1a,0xbf,0x01,0x09, -+0x90,0x06,0x35,0xe0,0x54,0x0f,0xf0,0x80,0x04,0x80,0x00,0xc1,0xf4,0xe4,0x90,0x06, -+0x34,0xf0,0x22,0x90,0x91,0x56,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0x7f,0xf0,0x90,0x01, -+0x17,0xe0,0xfe,0x90,0x01,0x16,0xe0,0x7c,0x00,0x24,0x00,0xff,0xec,0x3e,0x90,0x91, -+0x5c,0xf0,0xa3,0xef,0xf0,0x90,0x01,0x04,0xe0,0x54,0x0f,0x90,0x91,0x1c,0xf0,0xe0, -+0xff,0x74,0x40,0x7e,0x00,0xa8,0x07,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8, -+0xf9,0x90,0x91,0x5b,0xf0,0xee,0x90,0x91,0x5a,0xf0,0x90,0x91,0x5e,0xe0,0x54,0xfe, -+0xf0,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xfb,0xf0,0xe0,0x54,0xf7,0xf0,0xe0,0x54,0xef, -+0xf0,0xe0,0x54,0xdf,0xf0,0xe0,0x54,0xbf,0xf0,0xe0,0x54,0x7f,0xf0,0xe4,0xa3,0xf0, -+0xa3,0xf0,0xa3,0xe0,0x54,0xfe,0xf0,0xe0,0x54,0xfd,0xf0,0xe0,0x54,0xf7,0xf0,0x22, -+0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x12,0x29,0xd9,0x54,0x01,0xff,0x90,0x91,0x56, -+0xe0,0x54,0xfe,0x4f,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0x90,0x91,0x57,0xf0,0x90, -+0x00,0x02,0x12,0x42,0x20,0x90,0x91,0x58,0xf0,0x90,0x91,0x56,0xe0,0x30,0xe0,0x1a, -+0x90,0x06,0x09,0xe0,0x54,0xfe,0xf0,0x90,0x02,0x86,0xe0,0x44,0x04,0xf0,0x43,0x57, -+0x04,0x7d,0x08,0xe4,0xff,0x12,0x36,0xe6,0x80,0x12,0x7d,0x08,0xe4,0xff,0x12,0x36, -+0x75,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x51,0x01,0x31,0x23,0xd0,0xd0,0x92,0xaf, -+0x22,0x90,0x06,0x90,0xe4,0xf0,0x21,0x6a,0x90,0x91,0x19,0x12,0x43,0x41,0xef,0x12, -+0x43,0x4a,0x52,0x40,0x01,0x52,0x49,0x02,0x52,0x6a,0x03,0x52,0x73,0x09,0x52,0x7b, -+0x0c,0x52,0x84,0x0d,0x52,0x8c,0x0e,0x52,0x9d,0x1a,0x52,0xa5,0x2c,0x52,0x51,0x2d, -+0x52,0x5a,0x2e,0x52,0xad,0x30,0x52,0x62,0x3b,0x52,0x95,0x3c,0x00,0x00,0x52,0xb5, -+0x90,0x91,0x19,0x12,0x43,0x21,0x02,0x64,0xde,0x90,0x91,0x19,0x12,0x43,0x21,0xc1, -+0xc5,0x90,0x91,0x19,0x12,0x43,0x21,0x02,0x65,0xf9,0x90,0x91,0x19,0x12,0x43,0x21, -+0xe1,0xa8,0x90,0x91,0x19,0x12,0x43,0x21,0xe1,0x28,0x90,0x91,0x19,0x12,0x43,0x21, -+0x02,0x66,0x41,0x90,0x91,0x19,0x12,0x43,0x21,0x80,0x42,0x90,0x91,0x19,0x12,0x43, -+0x21,0x02,0x5d,0x16,0x90,0x91,0x19,0x12,0x43,0x21,0xe1,0x75,0x90,0x91,0x19,0x12, -+0x43,0x21,0x02,0x4e,0x91,0x90,0x91,0x19,0x12,0x43,0x21,0x21,0xa0,0x90,0x91,0x19, -+0x12,0x43,0x21,0xa1,0x7f,0x90,0x91,0x19,0x12,0x43,0x21,0x81,0x5e,0x90,0x91,0x19, -+0x12,0x43,0x21,0xe1,0x55,0x90,0x01,0xc6,0xe0,0x44,0x01,0xf0,0x22,0xd3,0x10,0xaf, -+0x01,0xc3,0xc0,0xd0,0x90,0x91,0x1c,0x12,0x43,0x41,0x90,0x91,0x1c,0x12,0x43,0x21, -+0x90,0x00,0x01,0x12,0x42,0x97,0xfa,0xe5,0xf0,0x24,0x00,0xff,0xe4,0x3a,0xfe,0x90, -+0x91,0x1c,0x12,0x43,0x21,0x90,0x00,0x01,0xee,0x8f,0xf0,0x12,0x42,0xcf,0x12,0x29, -+0xd9,0xff,0x60,0x2c,0xb5,0x72,0x16,0x90,0x91,0x1c,0x12,0x43,0x21,0x90,0x00,0x01, -+0x12,0x42,0x97,0x65,0x74,0x70,0x04,0xe5,0x73,0x65,0xf0,0x60,0x23,0x90,0x91,0x1c, -+0x12,0x43,0x21,0x90,0x00,0x01,0x12,0x42,0x97,0xff,0xae,0xf0,0x71,0x35,0x80,0x10, -+0x90,0x91,0x1c,0x12,0x43,0x21,0x12,0x29,0xd9,0x65,0x72,0x60,0x03,0x12,0x44,0xe8, -+0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x1f,0xee,0xf0,0xa3,0xef,0xf0,0x75,0x72,0x01, -+0x8e,0x73,0xf5,0x74,0xe4,0xfd,0x7f,0x0b,0x71,0x77,0xe4,0xfd,0x7f,0x02,0x71,0x77, -+0x91,0x41,0xe4,0xff,0xd1,0xe7,0xe4,0xf5,0x76,0x90,0x01,0xc9,0xe5,0x76,0xf0,0x90, -+0x91,0x1f,0xe0,0xfc,0xa3,0xe0,0xfd,0xec,0xfb,0x8d,0x44,0xe4,0xf5,0x45,0x7d,0x01, -+0x7f,0x60,0x7e,0x01,0x02,0x35,0xab,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91, -+0x22,0xed,0xf0,0x90,0x91,0x21,0xef,0xf0,0xd3,0x94,0x07,0x50,0x4f,0xa3,0xe0,0x70, -+0x1a,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8, -+0xfc,0xf4,0xff,0x90,0x00,0x47,0xe0,0x5f,0xf0,0x80,0x17,0x90,0x91,0x21,0xe0,0xff, -+0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xff,0x90,0x00,0x47,0xe0, -+0x4f,0xf0,0x12,0x4c,0xa0,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0x80,0x5a,0x90,0x91,0x21,0xe0, -+0x24,0xf8,0xf0,0xa3,0xe0,0x70,0x1d,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07, -+0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xf4,0xff,0x90,0x00,0x43,0xe0, -+0x5f,0xf0,0x80,0x1a,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02, -+0xc3,0x33,0xd8,0xfc,0xc4,0x54,0xf0,0xff,0x90,0x00,0x43,0xe0,0x4f,0xf0,0x12,0x4c, -+0xa0,0x90,0x91,0x21,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8, -+0xfc,0xf4,0xff,0x90,0x00,0x43,0xe0,0x5f,0xf0,0x12,0x4c,0xa0,0xd0,0xd0,0x92,0xaf, -+0x22,0x7f,0x0b,0x12,0x6f,0x09,0xef,0x65,0x75,0x60,0x10,0xe5,0x75,0xb4,0x01,0x05, -+0xe4,0xf5,0x75,0x80,0x03,0x75,0x75,0x01,0x7f,0x01,0x22,0x7f,0x00,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0xe4,0xf5,0x10,0x75,0x11,0x04,0xf5,0x12,0xf5,0x14,0xf5, -+0x15,0x90,0x02,0x09,0xe0,0xff,0x12,0x29,0xd9,0xfe,0xef,0x2e,0xf5,0x13,0x30,0xe0, -+0x08,0x75,0x0e,0x00,0x75,0x0f,0x80,0x80,0x05,0xe4,0xf5,0x0e,0xf5,0x0f,0xe5,0x13, -+0xc3,0x13,0x90,0xfd,0x10,0xf0,0x74,0x20,0x25,0x10,0xf5,0x10,0xad,0x0f,0xe5,0x10, -+0x2d,0xff,0x24,0x01,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x90,0x91,0x47,0xf0, -+0x74,0x02,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0xfe,0xe5,0x10,0x2d,0x24, -+0x03,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x24,0x00,0xff,0xe4,0x3e,0x90,0x91, -+0x48,0xf0,0xa3,0xef,0xf0,0x7f,0x04,0xe5,0x10,0x25,0x0f,0x2f,0x24,0x00,0xf5,0x82, -+0xe4,0x34,0xfc,0xf5,0x83,0xe0,0xfe,0x74,0x46,0x2f,0xf5,0x82,0xe4,0x34,0x91,0xf5, -+0x83,0xee,0xf0,0x0f,0xbf,0x08,0xe0,0x12,0x66,0x89,0xef,0x70,0x3f,0x90,0x01,0xc3, -+0xe0,0x60,0x25,0xc3,0xe5,0x15,0x94,0xe8,0xe5,0x14,0x94,0x03,0x40,0x09,0x90,0x01, -+0xc6,0xe0,0x44,0x10,0xf0,0x80,0x63,0x05,0x15,0xe5,0x15,0x70,0x02,0x05,0x14,0x7f, -+0x0a,0x7e,0x00,0x12,0x37,0x54,0x80,0xd5,0x90,0x01,0xc6,0xe0,0x90,0x01,0xc3,0x30, -+0xe2,0x05,0x74,0xfe,0xf0,0x80,0x43,0x74,0xff,0xf0,0x80,0x3e,0xe5,0x10,0xb4,0x78, -+0x23,0xe4,0xf5,0x10,0x05,0x13,0xe5,0x0f,0x64,0x80,0x45,0x0e,0x70,0x06,0xf5,0x0e, -+0xf5,0x0f,0x80,0x06,0x75,0x0e,0x00,0x75,0x0f,0x80,0xe5,0x13,0xc3,0x13,0x90,0xfd, -+0x10,0xf0,0x80,0x06,0x74,0x08,0x25,0x10,0xf5,0x10,0xe5,0x12,0x15,0x12,0x70,0x02, -+0x15,0x11,0xe5,0x12,0x45,0x11,0x60,0x02,0x81,0x9c,0xd0,0xd0,0x92,0xaf,0x22,0x90, -+0x91,0x1c,0x12,0x43,0x41,0x12,0x29,0xd9,0xff,0x54,0x01,0xfe,0x90,0x91,0x5e,0xe0, -+0x54,0xfe,0x4e,0xf0,0xef,0x54,0x04,0xff,0xe0,0x54,0xfb,0x4f,0xf0,0x12,0x29,0xd9, -+0xff,0x54,0x02,0xfe,0x90,0x91,0x5e,0xe0,0x54,0xfd,0x4e,0xf0,0xef,0x54,0x08,0xff, -+0xe0,0x54,0xf7,0x4f,0xf0,0x12,0x29,0xd9,0xff,0x54,0x10,0xfe,0x90,0x91,0x5e,0xe0, -+0x54,0xef,0x4e,0xf0,0xef,0x54,0x20,0xff,0xe0,0x54,0xdf,0x4f,0xf0,0x12,0x29,0xd9, -+0xff,0x54,0x40,0xfe,0x90,0x91,0x5e,0xe0,0x54,0xbf,0x4e,0xf0,0xef,0x54,0x80,0xff, -+0xe0,0x54,0x7f,0x4f,0xf0,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x91,0x60,0xf0,0x90, -+0x00,0x01,0x12,0x42,0x20,0x90,0x91,0x5f,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0xff, -+0x54,0x01,0xfe,0x90,0x91,0x61,0xe0,0x54,0xfe,0x4e,0xf0,0xef,0x54,0x02,0xff,0xe0, -+0x54,0xfd,0x4f,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0x54,0x04,0xff,0x90,0x91,0x61, -+0xe0,0x54,0xfb,0x4f,0xf0,0x90,0x91,0x5e,0xe0,0x54,0x01,0x90,0x01,0xb8,0xf0,0x90, -+0x91,0x5e,0xe0,0xff,0xc4,0x13,0x54,0x01,0x90,0x01,0xb9,0xf0,0x90,0x91,0x61,0xe0, -+0x54,0x01,0x90,0x01,0xba,0xf0,0xa3,0x74,0xff,0xf0,0x12,0x29,0xd9,0x20,0xe0,0x02, -+0x41,0x01,0xe4,0xfd,0x7f,0x81,0x12,0x4d,0xa8,0x90,0x91,0x1c,0x12,0x43,0x21,0x12, -+0x29,0xd9,0xff,0xc3,0x13,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x02,0xf0,0xef, -+0x13,0x13,0x54,0x3f,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x04,0xf0,0x12,0x29, -+0xd9,0x13,0x13,0x13,0x54,0x1f,0x30,0xe0,0x07,0x90,0x06,0x90,0xe0,0x44,0x08,0xf0, -+0x90,0x91,0x61,0xe0,0x30,0xe0,0x1c,0x90,0x91,0x5e,0xe0,0xc4,0x13,0x54,0x07,0x30, -+0xe0,0x07,0xa3,0xe0,0xff,0xe4,0xfd,0x80,0x07,0x90,0x91,0x5f,0xe0,0xff,0x7d,0x01, -+0x12,0x4c,0xb0,0x22,0x90,0x00,0x02,0xe0,0x54,0xe0,0x7f,0x01,0x60,0x02,0x7f,0x00, -+0x22,0xe4,0xf5,0x75,0x22,0x12,0x29,0xd9,0xf5,0x6d,0x22,0x90,0x01,0x64,0x74,0xa0, -+0xf0,0x22,0x90,0x91,0x51,0xe0,0x90,0x90,0xe8,0xf0,0x22,0x90,0x00,0xf3,0xe0,0x7f, -+0x00,0x30,0xe3,0x02,0x7f,0x01,0x22,0x90,0x01,0xca,0xe5,0x75,0xf0,0xef,0x60,0x03, -+0x12,0x4f,0xd4,0x22,0x90,0x06,0x34,0x74,0xff,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3, -+0xf0,0x22,0xe4,0x90,0x91,0x4e,0xf0,0x90,0x00,0x80,0xe0,0x44,0x80,0xfd,0x7f,0x80, -+0x02,0x4d,0xa8,0x90,0x00,0xf3,0xe0,0x30,0xe2,0x0d,0x90,0x05,0x41,0x74,0x10,0xf0, -+0x90,0x05,0x5a,0xf0,0xa3,0xe4,0xf0,0x22,0x12,0x29,0xd9,0x60,0x02,0x80,0x01,0xe4, -+0x90,0x91,0x31,0xf0,0x90,0x91,0x31,0xe0,0x90,0x01,0xe7,0xf0,0x22,0x90,0x91,0x51, -+0xe0,0xb4,0x01,0x0c,0x90,0x00,0xf2,0xe0,0x30,0xe7,0x05,0x7e,0xfd,0x7f,0x33,0x22, -+0x7e,0xfd,0x7f,0x2f,0x22,0x12,0x29,0xd9,0xff,0x54,0x01,0xfe,0x90,0x91,0x53,0xe0, -+0x54,0xfe,0x4e,0xf0,0xef,0xc3,0x13,0x30,0xe0,0x0a,0x90,0x00,0x01,0x12,0x42,0x20, -+0x90,0x91,0x54,0xf0,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x90,0xf7,0xf0,0xe0, -+0x60,0x04,0xe0,0xf4,0x70,0x21,0xa2,0xaf,0xe4,0x33,0xf5,0x0e,0xc2,0xaf,0x90,0x00, -+0x47,0xe0,0x54,0xfb,0xfd,0x7f,0x47,0x12,0x4d,0xa8,0x7d,0x40,0x7f,0x01,0x12,0x36, -+0xaf,0xe5,0x0e,0x24,0xff,0x92,0xaf,0x22,0x12,0x29,0xd9,0x30,0xe0,0x19,0xc3,0x13, -+0x54,0x7f,0x90,0x91,0x34,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0x90,0x91,0x32, -+0xe4,0xf0,0xa3,0xef,0xf0,0x80,0x0f,0x90,0x91,0x34,0x74,0x07,0xf0,0x90,0x91,0x32, -+0xe4,0xf0,0xa3,0x74,0x03,0xf0,0x90,0x91,0x32,0xe0,0xa3,0xe0,0x90,0x05,0x58,0xf0, -+0x22,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0,0x00,0xc0,0x00, -+0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0,0x07,0x90,0x01, -+0xc4,0x74,0xe1,0xf0,0x74,0x57,0xa3,0xf0,0x53,0x91,0xef,0x90,0x00,0x51,0xe0,0xff, -+0x90,0x00,0x55,0xe0,0x5f,0xf5,0x3d,0x90,0x00,0x52,0xe0,0xff,0x90,0x00,0x56,0xe0, -+0x5f,0xf5,0x3e,0xe5,0x3d,0x30,0xe4,0x06,0x90,0x00,0x55,0x74,0x10,0xf0,0xe5,0x3d, -+0x30,0xe5,0x06,0x90,0x00,0x55,0x74,0x20,0xf0,0xe5,0x3d,0x30,0xe6,0x1b,0x90,0x00, -+0x55,0x74,0x40,0xf0,0x90,0x90,0xf6,0xe0,0x54,0x03,0xff,0xbf,0x03,0x0b,0x90,0x90, -+0xf3,0xe0,0x60,0x05,0x7f,0x01,0x12,0x4d,0xbd,0xe5,0x3d,0x30,0xe7,0x15,0x90,0x00, -+0x55,0x74,0x80,0xf0,0x90,0x90,0xf6,0xe0,0x54,0x03,0xff,0xbf,0x03,0x05,0x7f,0x02, -+0x12,0x4d,0xbd,0xe5,0x3e,0x30,0xe0,0x06,0x90,0x00,0x56,0x74,0x01,0xf0,0xe5,0x3e, -+0x30,0xe1,0x06,0x90,0x00,0x56,0x74,0x02,0xf0,0xe5,0x3e,0x30,0xe2,0x06,0x90,0x00, -+0x56,0x74,0x04,0xf0,0xe5,0x3e,0x30,0xe3,0x06,0x90,0x00,0x56,0x74,0x08,0xf0,0x90, -+0x01,0xc4,0x74,0xe1,0xf0,0x74,0x57,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0, -+0x04,0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0, -+0xf0,0xd0,0xe0,0x32,0xc0,0xe0,0xc0,0xf0,0xc0,0x83,0xc0,0x82,0xc0,0xd0,0x75,0xd0, -+0x00,0xc0,0x00,0xc0,0x01,0xc0,0x02,0xc0,0x03,0xc0,0x04,0xc0,0x05,0xc0,0x06,0xc0, -+0x07,0x75,0x0d,0x00,0x90,0x01,0xc4,0x74,0xc4,0xf0,0x74,0x58,0xa3,0xf0,0x53,0x91, -+0xdf,0x90,0x01,0x3c,0xe0,0x55,0x30,0xf5,0x34,0xa3,0xe0,0x55,0x31,0xf5,0x35,0xa3, -+0xe0,0x55,0x32,0xf5,0x36,0xa3,0xe0,0x55,0x33,0xf5,0x37,0xe5,0x34,0x30,0xe0,0x06, -+0x90,0x01,0x3c,0x74,0x01,0xf0,0xe5,0x34,0x30,0xe1,0x08,0x90,0x01,0x3c,0x74,0x02, -+0xf0,0x71,0x89,0xe5,0x34,0x30,0xe2,0x3a,0x90,0x01,0x3c,0x74,0x04,0xf0,0x90,0x06, -+0x92,0xe0,0x30,0xe0,0x25,0x90,0x91,0x66,0xe4,0xf0,0x90,0x91,0x2d,0xe0,0x90,0x91, -+0x67,0xf0,0xe4,0xfb,0xfd,0x7f,0x58,0x7e,0x01,0x12,0x44,0x59,0x90,0x01,0x5b,0x74, -+0x05,0xf0,0x90,0x06,0x92,0x74,0x01,0xf0,0x80,0x08,0x90,0x91,0x37,0xe4,0xf0,0x12, -+0x44,0xc2,0xe5,0x34,0x30,0xe3,0x3a,0x90,0x01,0x3c,0x74,0x08,0xf0,0x90,0x06,0x92, -+0xe0,0x30,0xe1,0x25,0x90,0x91,0x66,0xe4,0xf0,0x90,0x91,0x2d,0xe0,0x90,0x91,0x67, -+0xf0,0xe4,0xfb,0xfd,0x7f,0x5c,0x7e,0x01,0x12,0x44,0x59,0x90,0x01,0x5f,0x74,0x05, -+0xf0,0x90,0x06,0x92,0x74,0x02,0xf0,0x80,0x08,0x90,0x91,0x36,0xe4,0xf0,0x12,0x44, -+0xc2,0xe5,0x34,0x30,0xe4,0x09,0x90,0x01,0x3c,0x74,0x10,0xf0,0x12,0x4f,0x8f,0xe5, -+0x34,0x30,0xe5,0x08,0x90,0x01,0x3c,0x74,0x20,0xf0,0x51,0x62,0xe5,0x35,0x30,0xe0, -+0x5a,0x90,0x01,0x3d,0x74,0x01,0xf0,0x90,0x01,0x2f,0xe0,0x44,0x7f,0xf0,0x90,0x00, -+0x83,0xe0,0x54,0x0f,0xf5,0x0d,0xb4,0x01,0x02,0x80,0x1c,0xe5,0x0d,0xb4,0x02,0x05, -+0x90,0x00,0x83,0x80,0x12,0xe5,0x0d,0xb4,0x04,0x05,0x90,0x00,0x83,0x80,0x08,0xe5, -+0x0d,0xb4,0x0c,0x08,0x90,0x00,0x83,0xe0,0xf5,0x6f,0x80,0x06,0x90,0x01,0xbe,0xe0, -+0x04,0xf0,0x90,0x01,0xbb,0xe5,0x6f,0xf0,0xe5,0x6f,0x30,0xe0,0x03,0xa3,0x80,0x03, -+0x90,0x01,0xbd,0xe0,0x04,0xf0,0x71,0x6a,0x12,0x44,0xc2,0xe5,0x35,0x30,0xe2,0x06, -+0x90,0x01,0x3d,0x74,0x04,0xf0,0xe5,0x36,0x30,0xe0,0x06,0x90,0x01,0x3e,0x74,0x01, -+0xf0,0xe5,0x36,0x30,0xe1,0x06,0x90,0x01,0x3e,0x74,0x02,0xf0,0x74,0xc4,0x04,0x90, -+0x01,0xc4,0xf0,0x74,0x58,0xa3,0xf0,0xd0,0x07,0xd0,0x06,0xd0,0x05,0xd0,0x04,0xd0, -+0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0xd0,0xd0,0xd0,0x82,0xd0,0x83,0xd0,0xf0,0xd0, -+0xe0,0x32,0x90,0x90,0xf5,0xe0,0x64,0x01,0x60,0x02,0x61,0x17,0x90,0x00,0x46,0xe0, -+0x44,0x01,0xfd,0x7f,0x46,0x12,0x4d,0xa8,0x90,0x91,0x07,0xe0,0x70,0x32,0x90,0x90, -+0xed,0xe0,0x60,0x15,0x90,0x90,0xf9,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x80,0x06,0x90,0x05,0x22,0x74,0x7f,0xf0,0x90, -+0x90,0xf4,0xe0,0xff,0x71,0x18,0x90,0x91,0x07,0x74,0x01,0x12,0x4d,0x9e,0x80,0x40, -+0x90,0x91,0x07,0xe0,0x64,0x01,0x70,0x38,0x90,0x90,0xf8,0xe0,0xff,0x71,0x18,0xe4, -+0x90,0x91,0x07,0xf0,0x90,0x00,0x45,0xe0,0x44,0x01,0xfd,0x7f,0x45,0x12,0x4d,0xa8, -+0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xef,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x80,0x05,0x90,0x05,0x22,0xe4,0xf0, -+0x90,0x05,0x87,0xe0,0x64,0x80,0xf0,0x90,0x91,0x03,0xe0,0x90,0x05,0x84,0xf0,0x90, -+0x91,0x04,0xe0,0x90,0x05,0x85,0xf0,0x90,0x91,0x05,0xe0,0x90,0x05,0x86,0xf0,0x90, -+0x91,0x06,0xe0,0x90,0x05,0x87,0xf0,0x22,0x90,0x05,0x60,0xe0,0x90,0x91,0x03,0xf0, -+0x90,0x05,0x61,0xe0,0x90,0x91,0x04,0xf0,0x90,0x05,0x62,0xe0,0x90,0x91,0x05,0xf0, -+0x90,0x05,0x63,0xe0,0x90,0x91,0x06,0xf0,0xc3,0x74,0xff,0x9f,0xfe,0x90,0x91,0x04, -+0xe0,0xd3,0x9e,0x40,0x1e,0xe0,0x2f,0xf0,0xa3,0xe0,0xb4,0xff,0x0f,0xe4,0xf0,0xa3, -+0xe0,0xb4,0xff,0x03,0xe4,0xf0,0x22,0x90,0x91,0x06,0x80,0x03,0x90,0x91,0x05,0xe0, -+0x04,0xf0,0x22,0x90,0x91,0x04,0xe0,0x2f,0xf0,0x22,0xe5,0x6f,0x30,0xe6,0x19,0xe5, -+0x6f,0x54,0x0f,0xff,0x90,0x91,0x24,0xe0,0xfe,0x4f,0x90,0x01,0x2f,0xf0,0xee,0x64, -+0x80,0x90,0x91,0x24,0xf0,0x53,0x6f,0xbf,0x22,0xe4,0x90,0x91,0x0d,0xf0,0xe5,0x70, -+0x70,0x02,0x81,0x13,0x90,0x91,0x3c,0xe0,0x60,0x0d,0xe4,0xf0,0x53,0x71,0xfd,0xe5, -+0x71,0x54,0x07,0x70,0x6e,0x80,0x69,0x90,0x91,0x28,0xe0,0x04,0xf0,0x53,0x71,0xef, -+0x90,0x91,0x3a,0xe0,0x04,0xf0,0x90,0x91,0x0d,0xe0,0xf9,0xff,0x7e,0x00,0x24,0x01, -+0xfd,0xee,0x33,0xfc,0x90,0x91,0x3a,0xe0,0xb5,0x05,0x06,0xe4,0xb5,0x04,0x02,0x80, -+0x12,0xef,0x24,0x02,0xff,0xe4,0x3e,0xfe,0x90,0x91,0x3a,0xe0,0xb5,0x07,0x0a,0xe4, -+0xb5,0x06,0x06,0x90,0x05,0x58,0xe0,0x04,0xf0,0xe9,0xff,0x90,0x91,0x2f,0xe0,0x2f, -+0xff,0xe4,0x33,0xfe,0x90,0x91,0x28,0xe0,0xd3,0x9f,0xee,0x64,0x80,0xf8,0x74,0x80, -+0x98,0x40,0x0d,0xe5,0x6d,0xb4,0x01,0x0b,0xa3,0xe0,0x70,0x07,0xe0,0x04,0xf0,0x22, -+0x12,0x44,0xc2,0x22,0x90,0x90,0xee,0xe0,0xc3,0x94,0x14,0x50,0x05,0xe0,0x04,0xf0, -+0x81,0xcc,0x90,0x90,0xee,0xe0,0x64,0x14,0x60,0x02,0x81,0xcc,0x90,0x90,0xfd,0xe0, -+0x70,0x25,0x90,0x91,0x00,0xe0,0x70,0x1f,0x90,0x90,0xfe,0xe0,0x70,0x19,0x90,0x91, -+0x01,0xe0,0x70,0x13,0x90,0x90,0xff,0xe0,0x70,0x0d,0x90,0x91,0x02,0xe0,0x70,0x07, -+0x90,0x04,0xfd,0xe0,0x54,0xfe,0xf0,0x90,0x90,0xfd,0xe0,0x90,0x04,0x44,0xf0,0x90, -+0x90,0xfe,0xe0,0x90,0x04,0x45,0xf0,0x90,0x90,0xff,0xe0,0x90,0x04,0x46,0xf0,0xa3, -+0xe4,0xf0,0x90,0x91,0x00,0xe0,0x90,0x04,0x48,0xf0,0x90,0x91,0x01,0xe0,0x90,0x04, -+0x49,0xf0,0x90,0x91,0x02,0xe0,0x90,0x04,0x4a,0xf0,0xa3,0xe4,0xf0,0x90,0x90,0xe9, -+0xe0,0x90,0x04,0x4c,0xf0,0x90,0x90,0xea,0xe0,0x90,0x04,0x4d,0xf0,0x90,0x90,0xeb, -+0xe0,0x90,0x04,0x4e,0xf0,0x90,0x90,0xec,0xe0,0x90,0x04,0x4f,0xf0,0xe4,0x90,0x90, -+0xee,0xf0,0x90,0x90,0xe9,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x90, -+0xfd,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0,0x90,0x05,0x60,0xe0, -+0x90,0x91,0x8c,0xf0,0x90,0x05,0x61,0xe0,0x90,0x91,0x8d,0xf0,0x90,0x05,0x62,0xe0, -+0x90,0x91,0x8e,0xf0,0x90,0x05,0x63,0xe0,0x90,0x91,0x8f,0xf0,0x90,0x91,0x06,0xe0, -+0xff,0x90,0x91,0x8f,0xe0,0xfe,0xd3,0x9f,0x50,0x0b,0x90,0x91,0x06,0xe0,0xc3,0x9e, -+0xd3,0x94,0x01,0x40,0x10,0x90,0x90,0xf4,0xe0,0xb4,0x01,0x02,0x80,0x03,0x90,0x90, -+0xf8,0xe0,0xff,0x71,0x18,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0x90,0x90,0xf5,0xf0, -+0x90,0x00,0x01,0x12,0x42,0x20,0x25,0xe0,0x25,0xe0,0x90,0x90,0xf4,0xf0,0x12,0x29, -+0xd9,0x25,0xe0,0x25,0xe0,0x90,0x90,0xf8,0xf0,0x90,0x05,0x60,0xe0,0x90,0x91,0x03, -+0xf0,0x90,0x05,0x61,0xe0,0x90,0x91,0x04,0xf0,0x90,0x05,0x62,0xe0,0x90,0x91,0x05, -+0xf0,0x90,0x05,0x63,0xe0,0x90,0x91,0x06,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x91,0x1c, -+0xf0,0xc2,0xaf,0x90,0x90,0xf4,0xe0,0xff,0x71,0x18,0x90,0x91,0x1c,0xe0,0x24,0xff, -+0x92,0xaf,0x90,0x90,0xf5,0xe0,0x70,0x02,0xc1,0x1f,0x90,0x90,0xf4,0xe0,0x70,0x02, -+0xc1,0x1f,0x90,0x90,0xf8,0xe0,0x70,0x02,0xc1,0x1f,0xa2,0xaf,0xe4,0x33,0x90,0x91, -+0x1c,0xf0,0xc2,0xaf,0x90,0x91,0x07,0x74,0x01,0xf0,0x90,0x91,0x1c,0xe0,0x24,0xff, -+0x92,0xaf,0x12,0x4d,0x9f,0x90,0x00,0x46,0xe0,0x44,0x01,0xfd,0x7f,0x46,0x12,0x4d, -+0xa8,0x90,0x90,0xed,0xe0,0x60,0x15,0x90,0x90,0xf9,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x08,0x12,0x2f,0xd9,0x80,0x06,0x90,0x05,0x22,0x74, -+0x7f,0xf0,0x90,0x00,0x45,0xe0,0x54,0xef,0xfd,0x7f,0x45,0x12,0x4d,0xa8,0x90,0x05, -+0x87,0xe0,0x64,0x80,0xf0,0x90,0x91,0x03,0xe0,0x90,0x05,0x84,0xf0,0x90,0x91,0x04, -+0xe0,0x90,0x05,0x85,0xf0,0x90,0x91,0x05,0xe0,0x90,0x05,0x86,0xf0,0x90,0x91,0x06, -+0xe0,0x90,0x05,0x87,0xf0,0xa2,0xaf,0xe4,0x33,0x90,0x91,0x1c,0xf0,0xc2,0xaf,0x90, -+0x01,0x3c,0xe0,0x44,0x20,0xf0,0x7d,0x20,0xe4,0xff,0x12,0x37,0x00,0x80,0x2d,0x90, -+0x90,0xf5,0xe0,0x70,0x2f,0x90,0x91,0x07,0x12,0x4d,0x9e,0x90,0x00,0x46,0xe0,0x54, -+0xfe,0xfd,0x7f,0x46,0x12,0x4d,0xa8,0x90,0x05,0x22,0xe4,0xf0,0xa2,0xaf,0x33,0x90, -+0x91,0x1c,0xf0,0xc2,0xaf,0x7d,0x20,0xe4,0xff,0x12,0x36,0x92,0x90,0x91,0x1c,0xe0, -+0x24,0xff,0x92,0xaf,0x22,0x8f,0x20,0x8c,0x21,0x8d,0x22,0x22,0x8f,0x23,0x8c,0x24, -+0x8d,0x25,0x22,0xe4,0x90,0x91,0x11,0xf0,0xa3,0xf0,0x90,0x02,0x86,0xe0,0x20,0xe1, -+0x2c,0xc3,0x90,0x91,0x12,0xe0,0x94,0x20,0x90,0x91,0x11,0xe0,0x94,0x03,0x40,0x0a, -+0x90,0x01,0xc6,0xe0,0x44,0x20,0xf0,0x7f,0x00,0x22,0x90,0x91,0x11,0xe4,0x75,0xf0, -+0x01,0x12,0x42,0x81,0x7f,0x01,0x7e,0x00,0x12,0x37,0x54,0x80,0xcd,0x7f,0x01,0x22, -+0x90,0x01,0xcc,0xe0,0x54,0x0f,0x90,0x91,0x11,0xf0,0x90,0x91,0x11,0xe0,0xfd,0x70, -+0x02,0xe1,0xe2,0x90,0x91,0x9c,0xe0,0xff,0x74,0x01,0x7e,0x00,0xa8,0x07,0x08,0x80, -+0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0xef,0x5d,0x70,0x02,0xe1,0xdb,0x90, -+0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd0,0x12,0x43,0x15,0xe0,0x90,0x91,0x12, -+0xf0,0x75,0x63,0x01,0x75,0x64,0x91,0x75,0x65,0x12,0x75,0x66,0x01,0x7b,0x01,0x7a, -+0x91,0x79,0x13,0x12,0x46,0x6d,0x90,0x91,0x13,0xe0,0xff,0xc4,0x13,0x13,0x13,0x54, -+0x01,0x90,0x91,0x9c,0x30,0xe0,0x59,0xe0,0x75,0xf0,0x02,0x90,0x00,0x88,0x12,0x43, -+0x15,0xe0,0x90,0x91,0x14,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x02,0x90,0x00,0x89, -+0x12,0x43,0x15,0xe0,0x90,0x91,0x15,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90, -+0x01,0xd1,0x12,0x43,0x15,0xe0,0x90,0x91,0x16,0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0, -+0x04,0x90,0x01,0xd2,0x12,0x43,0x15,0xe0,0x90,0x91,0x17,0xf0,0x90,0x91,0x9c,0xe0, -+0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x15,0xe0,0x90,0x91,0x18,0xf0,0x80,0x33, -+0xe0,0x75,0xf0,0x04,0x90,0x01,0xd1,0x12,0x43,0x15,0xe0,0x90,0x91,0x14,0xf0,0x90, -+0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd2,0x12,0x43,0x15,0xe0,0x90,0x91,0x15, -+0xf0,0x90,0x91,0x9c,0xe0,0x75,0xf0,0x04,0x90,0x01,0xd3,0x12,0x43,0x15,0xe0,0x90, -+0x91,0x16,0xf0,0xef,0x54,0x7f,0xff,0x7b,0x01,0x7a,0x91,0x79,0x14,0x12,0x52,0x08, -+0x90,0x91,0x11,0xe0,0xff,0x90,0x91,0x9c,0xe0,0xfe,0x74,0x01,0xa8,0x06,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0xf4,0x5f,0x90,0x91,0x11,0xf0,0x90,0x91,0x9c,0xe0,0xff, -+0x74,0x01,0xa8,0x07,0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0x90,0x01,0xcc,0xf0,0x90, -+0x91,0x9c,0xe0,0x04,0xf0,0xe0,0x54,0x03,0xf0,0xc1,0xaa,0x90,0x01,0xc6,0xe0,0x44, -+0x02,0xf0,0x22,0xad,0x07,0x74,0x11,0x2d,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0, -+0x44,0x01,0xf0,0x90,0x04,0x80,0xe0,0x54,0x0f,0xfc,0x74,0x14,0x2d,0xf5,0x82,0xe4, -+0x34,0xfc,0xf5,0x83,0xe0,0x54,0xc0,0x4c,0xfd,0x74,0x14,0x2f,0xf5,0x82,0xe4,0x34, -+0xfc,0xf5,0x83,0xed,0xf0,0x22,0xef,0x60,0x0f,0x74,0x21,0x2d,0xf5,0x82,0xe4,0x34, -+0xfc,0xf5,0x83,0xe0,0x44,0x10,0xf0,0x22,0x74,0x21,0x2d,0xf5,0x82,0xe4,0x34,0xfc, -+0xf5,0x83,0xe0,0x54,0xef,0xf0,0x22,0xe4,0xf5,0x6d,0xf5,0x71,0xf5,0x70,0x75,0x6f, -+0x0c,0x75,0x6e,0x0c,0x90,0x91,0x3b,0xf0,0x90,0x91,0x37,0xf0,0x90,0x91,0x36,0xf0, -+0x90,0x91,0x39,0x04,0xf0,0x90,0x91,0x27,0xf0,0xe4,0x90,0x91,0x3c,0xf0,0x90,0x91, -+0x29,0xf0,0x90,0x91,0x34,0x74,0x07,0xf0,0xe4,0x90,0x91,0x28,0xf0,0x90,0x91,0x32, -+0xf0,0xa3,0x74,0x03,0xf0,0x90,0x91,0x2f,0x74,0x0a,0xf0,0xa3,0x74,0x05,0xf0,0x90, -+0x91,0x2d,0x74,0x14,0xf0,0x90,0x91,0x35,0x74,0x05,0xf0,0xe4,0x90,0x91,0x2b,0xf0, -+0x90,0x91,0x25,0xf0,0x90,0x91,0x50,0xf0,0x90,0x91,0x31,0xf0,0x90,0x91,0x3a,0xf0, -+0x90,0x91,0x26,0xf0,0x90,0x91,0x38,0xf0,0x90,0x91,0x2e,0xf0,0x90,0x91,0x2c,0xf0, -+0x22,0x12,0x4c,0x89,0xef,0x64,0x01,0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80, -+0x30,0x90,0x91,0x37,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x22,0x90, -+0x91,0x36,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x14,0xe5,0x6f,0x54, -+0x0f,0xd3,0x94,0x04,0x40,0x08,0x90,0x01,0xb9,0x74,0x08,0xf0,0x80,0x03,0x7f,0x01, -+0x22,0x90,0x01,0xb8,0x74,0x08,0xf0,0x7f,0x00,0x22,0x12,0x4c,0x89,0xef,0x64,0x01, -+0x60,0x08,0x90,0x01,0xb9,0x74,0x01,0xf0,0x80,0x58,0xe5,0x71,0x54,0x03,0x60,0x08, -+0x90,0x01,0xb9,0x74,0x02,0xf0,0x80,0x4a,0xe5,0x6f,0x54,0x0f,0xd3,0x94,0x02,0x40, -+0x08,0x90,0x01,0xb9,0x74,0x04,0xf0,0x80,0x39,0xe5,0x71,0x30,0xe2,0x08,0x90,0x01, -+0xb9,0x74,0x08,0xf0,0x80,0x2c,0xe5,0x71,0x30,0xe4,0x08,0x90,0x01,0xb9,0x74,0x10, -+0xf0,0x80,0x1f,0x90,0x91,0x29,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x20,0xf0,0x80, -+0x11,0x90,0x91,0x31,0xe0,0x60,0x08,0x90,0x01,0xb9,0x74,0x80,0xf0,0x80,0x03,0x7f, -+0x01,0x22,0x90,0x01,0xb8,0x74,0x04,0xf0,0x7f,0x00,0x22,0x90,0x06,0x04,0xe0,0x54, -+0xbf,0xf0,0xef,0x60,0x0a,0xe5,0x6d,0xb4,0x01,0x05,0xe4,0xff,0x12,0x47,0xc9,0x53, -+0x6e,0xf0,0x43,0x6e,0x0c,0x22,0x90,0x91,0x9d,0xef,0xf0,0x31,0x9f,0x90,0x91,0x9d, -+0xe0,0x60,0x05,0x90,0x05,0x22,0xe4,0xf0,0x53,0x6e,0xf0,0x43,0x6e,0x04,0x22,0x90, -+0x90,0xd8,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x08,0x12, -+0x2f,0xd9,0x90,0x90,0xdc,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04, -+0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x90,0xe0,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0xe4,0x12,0x43,0x09,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x59,0x12,0x2a, -+0x8b,0x00,0x03,0x2d,0x95,0xe4,0xfd,0xff,0x12,0x34,0x81,0x90,0x91,0x51,0xe0,0xb4, -+0x01,0x11,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x03,0x2d,0x95,0xe4,0xfd,0x7f,0x01, -+0x12,0x34,0x81,0x22,0x8f,0x77,0xe4,0x90,0x91,0x96,0xf0,0xa3,0xf0,0x90,0x01,0x09, -+0xe0,0x7f,0x00,0x30,0xe7,0x02,0x7f,0x01,0xef,0x65,0x77,0x60,0x3e,0xc3,0x90,0x91, -+0x97,0xe0,0x94,0x88,0x90,0x91,0x96,0xe0,0x94,0x13,0x40,0x08,0x90,0x01,0xc6,0xe0, -+0x44,0x80,0xf0,0x22,0x90,0x91,0x96,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x7f,0x14, -+0x7e,0x00,0x12,0x37,0x54,0xd3,0x90,0x91,0x97,0xe0,0x94,0x32,0x90,0x91,0x96,0xe0, -+0x94,0x00,0x40,0xb9,0x90,0x01,0xc7,0xe0,0x30,0xe0,0xb2,0x22,0x53,0x6e,0xf0,0x43, -+0x6e,0x01,0x12,0x45,0x00,0x12,0x45,0x01,0x53,0x6e,0xf0,0x43,0x6e,0x02,0x22,0x8f, -+0x78,0x12,0x47,0xe6,0xef,0x64,0x01,0x70,0x2e,0x90,0x91,0x44,0x12,0x48,0x1e,0xe5, -+0x78,0x60,0x10,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x44,0x10, -+0xf0,0x80,0x0e,0x74,0x21,0x2f,0xf5,0x82,0xe4,0x34,0xfc,0xf5,0x83,0xe0,0x54,0xef, -+0xf0,0x90,0x04,0x1f,0x74,0x20,0xf0,0x22,0xe5,0x6d,0x64,0x01,0x70,0x63,0xe5,0x70, -+0x60,0x5f,0xe5,0x70,0x64,0x02,0x60,0x06,0xe5,0x70,0x64,0x05,0x70,0x27,0x90,0x06, -+0xab,0xe0,0x90,0x91,0x27,0xf0,0x90,0x06,0xaa,0xe0,0x90,0x91,0x39,0xf0,0x90,0x91, -+0x27,0xe0,0x70,0x07,0x90,0x91,0x39,0xe0,0xff,0x80,0x05,0x90,0x91,0x27,0xe0,0xff, -+0x90,0x91,0x27,0xef,0xf0,0x90,0x91,0x29,0xe0,0x60,0x03,0xe0,0x14,0xf0,0xe4,0x90, -+0x91,0x28,0xf0,0x90,0x01,0x57,0xf0,0x90,0x01,0x3c,0x74,0x02,0xf0,0x53,0x71,0xfd, -+0x53,0x71,0xef,0xe5,0x70,0x14,0x24,0xfd,0x50,0x02,0x80,0x03,0x12,0x45,0xc7,0x71, -+0x22,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0xd0,0xd0,0x92,0xaf,0x22,0xe4,0xfb, -+0x90,0x91,0x78,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x70,0x70,0x02,0x61,0xc0, -+0xe5,0x6d,0x64,0x01,0x70,0x7a,0xe5,0x70,0x14,0x60,0x2b,0x24,0xfd,0x60,0x27,0x24, -+0x02,0x24,0xfb,0x50,0x02,0x80,0x21,0x90,0x91,0x27,0xe0,0x14,0xf0,0xe0,0x60,0x04, -+0xa3,0xe0,0x60,0x14,0x90,0x91,0x27,0xe0,0x70,0x08,0x90,0x91,0x39,0xe0,0x90,0x91, -+0x27,0xf0,0x7b,0x01,0x80,0x02,0x7b,0x01,0xeb,0x60,0x45,0x43,0x71,0x10,0xe4,0x90, -+0x91,0x66,0xf0,0x90,0x91,0x3a,0xe0,0x75,0xf0,0x05,0xa4,0xff,0x90,0x91,0x34,0xe0, -+0x2f,0x12,0x44,0x4e,0x90,0x01,0x57,0x74,0x05,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94, -+0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x27,0x90,0x91,0x2e,0xe0,0x60,0x10, -+0x90,0x91,0x2c,0xe0,0x90,0x07,0x78,0x60,0x04,0x74,0x0d,0xf0,0x22,0x74,0x09,0xf0, -+0x22,0xe4,0xfb,0x90,0x91,0x7c,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x70,0x60, -+0x5f,0xe5,0x6d,0x64,0x01,0x70,0x59,0x0b,0x90,0x91,0x27,0xf0,0x04,0x60,0x51,0x43, -+0x71,0x10,0xe4,0x90,0x91,0x66,0xf0,0x90,0x91,0x3a,0xe0,0x75,0xf0,0x05,0xa4,0xff, -+0x90,0x91,0x34,0xe0,0x2f,0x90,0x91,0x67,0xf0,0xe4,0x1b,0x12,0x44,0x54,0x90,0x01, -+0x57,0x74,0x05,0xf0,0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f, -+0x04,0x12,0x47,0x27,0x90,0x91,0x2e,0xe0,0x60,0x11,0x90,0x91,0x2c,0xe0,0x90,0x07, -+0x78,0x60,0x05,0x74,0x0d,0xf0,0x80,0x03,0x74,0x09,0xf0,0x90,0x05,0x22,0xe4,0xf0, -+0x22,0x90,0x91,0x80,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe5,0x70,0x14,0x24,0xfd, -+0x50,0x02,0x80,0x21,0x90,0x91,0x3b,0xe0,0x60,0x06,0x7d,0x01,0x7f,0x0c,0x80,0x0d, -+0xe5,0x6e,0x54,0x0f,0xc3,0x94,0x04,0x50,0x07,0x7d,0x01,0x7f,0x04,0x12,0x47,0x27, -+0xe4,0xff,0x12,0x48,0xb3,0x22,0x90,0x91,0x08,0xe0,0x54,0xf0,0x44,0x03,0xf0,0x54, -+0x0f,0x44,0x80,0xf0,0x7b,0x00,0x7a,0x00,0x79,0x58,0x90,0x91,0x71,0x12,0x43,0x41, -+0x0b,0x7a,0x91,0x79,0x08,0x02,0x46,0xb7,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0,0x90, -+0x91,0x84,0xee,0xf0,0xa3,0xef,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0x90,0x91,0x84,0xe0, -+0xfe,0xa3,0xe0,0xf5,0x82,0x8e,0x83,0xe0,0x60,0x2d,0xc3,0x90,0x91,0x87,0xe0,0x94, -+0xe8,0x90,0x91,0x86,0xe0,0x94,0x03,0x40,0x0b,0x90,0x01,0xc6,0xe0,0x44,0x10,0xf0, -+0x7f,0x00,0x80,0x15,0x90,0x91,0x86,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x7f,0x0a, -+0x7e,0x00,0x12,0x37,0x54,0x80,0xc5,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0xd3,0x10, -+0xaf,0x01,0xc3,0xc0,0xd0,0x90,0x91,0x1c,0x12,0x43,0x41,0x90,0x91,0x1f,0x12,0x2a, -+0x8b,0x00,0x00,0x00,0x00,0x90,0x91,0x1c,0x12,0x43,0x21,0x90,0x00,0x01,0x12,0x42, -+0x20,0x90,0x91,0x3b,0xf0,0x90,0x00,0x03,0x12,0x42,0x20,0x90,0x91,0x25,0xf0,0x90, -+0x00,0x04,0x12,0x42,0x20,0xff,0x54,0x01,0x90,0x91,0x26,0xf0,0xef,0xc3,0x13,0x54, -+0x01,0x90,0x91,0x2e,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff,0x13,0x13,0x54,0x01, -+0x90,0x91,0x2c,0xf0,0x90,0x91,0x2e,0xe0,0x90,0x91,0x1f,0x70,0x26,0x12,0x2a,0x8b, -+0x00,0x00,0x02,0x10,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x60,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x91,0x1f,0x12,0x2a,0x8b,0x00,0x00,0x03, -+0x10,0x80,0x24,0x12,0x2a,0x8b,0x00,0x00,0x01,0x10,0x90,0x91,0x1f,0x12,0x43,0x09, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x60,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x91,0x1f, -+0x12,0x2a,0x8b,0x00,0x00,0x03,0x00,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x91,0x26,0xe0,0x70,0x3d, -+0x90,0x91,0x38,0x74,0x01,0xf0,0x7f,0x00,0x7e,0x08,0x12,0x27,0xde,0x90,0x91,0x1f, -+0x12,0x2a,0x7f,0x90,0x91,0x1f,0x12,0x43,0x09,0xec,0x44,0x02,0xfc,0x90,0x91,0x1f, -+0x12,0x2a,0x7f,0x90,0x91,0x1f,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x00,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x02,0x86,0xe0,0x54,0xfb,0xf0,0x90,0x91,0x1c, -+0x12,0x43,0x21,0x12,0x49,0x80,0x90,0x01,0xe5,0xe5,0x70,0xf0,0x90,0x91,0x3b,0xe0, -+0x90,0x01,0xe6,0xf0,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x00,0x02,0x12,0x42,0x20,0xff, -+0x30,0xe0,0x25,0x12,0x29,0xd9,0x90,0x91,0x2f,0xf0,0x90,0x00,0x01,0x12,0x42,0x20, -+0x90,0x91,0x30,0xf0,0xef,0xc3,0x13,0x54,0x7f,0x90,0x91,0x2d,0xf0,0x90,0x00,0x03, -+0x12,0x42,0x20,0x90,0x91,0x35,0xf0,0x22,0x90,0x91,0x2f,0x74,0x0a,0xf0,0x90,0x91, -+0x30,0x74,0x05,0xf0,0x90,0x91,0x2d,0x74,0x14,0xf0,0x90,0x91,0x35,0x74,0x05,0xf0, -+0x22,0x90,0x02,0x09,0xe0,0xfd,0x12,0x29,0xd9,0xfe,0xaf,0x05,0xed,0x2e,0x90,0x91, -+0x41,0xf0,0x90,0x00,0x01,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x42,0xf0,0x90, -+0x00,0x02,0x12,0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x43,0xf0,0x90,0x00,0x03,0x12, -+0x42,0x20,0xff,0xed,0x2f,0x90,0x91,0x44,0xf0,0x90,0x00,0x04,0x12,0x42,0x20,0xff, -+0xae,0x05,0xed,0x2f,0x90,0x91,0x45,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0x47,0xe0,0x90,0x91,0x1d,0xf0,0x90,0x91,0x48,0xe0,0xf5,0x19,0xa3,0xe0, -+0xf5,0x1a,0xe4,0xf5,0x16,0x74,0x4a,0x25,0x16,0xf5,0x82,0xe4,0x34,0x91,0xf5,0x83, -+0xe0,0xff,0x74,0x1b,0x25,0x16,0xf8,0xa6,0x07,0x05,0x16,0xe5,0x16,0xb4,0x04,0xe5, -+0x90,0x91,0x1d,0xe0,0x12,0x43,0x4a,0x66,0xe6,0x00,0x68,0x13,0x01,0x66,0xee,0x02, -+0x66,0xee,0x03,0x66,0xee,0x04,0x68,0x13,0x05,0x67,0xe3,0x80,0x67,0xf9,0x81,0x68, -+0x13,0x82,0x00,0x00,0x68,0x0f,0xaf,0x1e,0x12,0x73,0xdd,0x02,0x68,0x13,0x90,0x91, -+0x1d,0xe0,0xff,0xb4,0x02,0x08,0x90,0x91,0x1c,0x74,0x01,0xf0,0x80,0x0f,0xef,0x90, -+0x91,0x1c,0xb4,0x03,0x05,0x74,0x02,0xf0,0x80,0x03,0x74,0x04,0xf0,0xc3,0xe5,0x19, -+0x94,0x08,0x50,0x4a,0xe4,0xf5,0x16,0x90,0x91,0x1c,0xe0,0xff,0xe5,0x16,0xc3,0x9f, -+0x40,0x03,0x02,0x68,0x13,0xc3,0xe5,0x19,0x94,0x01,0x50,0x14,0xe5,0x16,0x25,0x1a, -+0xff,0xc3,0x74,0x03,0x95,0x16,0x24,0x1b,0xf8,0xe6,0xfd,0x12,0x4d,0xa8,0x80,0x1a, -+0xc3,0x74,0x03,0x95,0x16,0x24,0x1b,0xf8,0xe6,0xff,0xe5,0x16,0x7c,0x00,0x25,0x1a, -+0xfd,0xec,0x35,0x19,0x8d,0x82,0xf5,0x83,0xef,0xf0,0x05,0x16,0x80,0xb9,0xc3,0xe5, -+0x19,0x94,0x10,0x40,0x03,0x02,0x68,0x13,0x90,0x91,0x1d,0xe0,0x64,0x04,0x60,0x03, -+0x02,0x68,0x13,0xaf,0x1c,0xfc,0xfd,0xfe,0x78,0x10,0x12,0x2a,0x6c,0xc0,0x04,0xc0, -+0x05,0xc0,0x06,0xc0,0x07,0xaf,0x1b,0xe4,0xfc,0xfd,0xfe,0x78,0x18,0x12,0x2a,0x6c, -+0xd0,0x03,0xd0,0x02,0xd0,0x01,0xd0,0x00,0x12,0x42,0xfc,0xc0,0x04,0xc0,0x05,0xc0, -+0x06,0xc0,0x07,0xaf,0x1d,0xe4,0xfc,0xfd,0xfe,0x78,0x08,0x12,0x2a,0x6c,0xd0,0x03, -+0xd0,0x02,0xd0,0x01,0xd0,0x00,0x12,0x42,0xfc,0xa8,0x04,0xa9,0x05,0xaa,0x06,0xab, -+0x07,0xaf,0x1e,0xe4,0xfc,0xfd,0xfe,0x12,0x42,0xfc,0xa3,0x12,0x2a,0x7f,0x90,0x91, -+0x1e,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0xaf,0x1a,0xae,0x19,0x12,0x2f, -+0xd9,0x80,0x30,0xe5,0x1d,0x7f,0x00,0xfe,0xef,0x25,0x1e,0xf5,0x18,0xe4,0x3e,0xf5, -+0x17,0xaf,0x18,0xfe,0x12,0x37,0x54,0x80,0x1a,0xe5,0x1d,0x7f,0x00,0xfe,0xef,0x25, -+0x1e,0xf5,0x18,0xe4,0x3e,0xf5,0x17,0xaf,0x18,0xfe,0x12,0x36,0xcb,0x80,0x04,0x7f, -+0x00,0x80,0x02,0x7f,0x01,0xd0,0xd0,0x92,0xaf,0x22,0x8e,0x0e,0x8f,0x0f,0x8b,0x10, -+0x8a,0x11,0x89,0x12,0xe4,0x90,0x91,0x11,0xf0,0xef,0x90,0x00,0x31,0xf0,0x12,0x4c, -+0xa0,0xe5,0x0e,0x54,0x03,0xff,0x90,0x00,0x32,0xe0,0x54,0xfc,0x4f,0xf0,0x12,0x4c, -+0xa0,0x90,0x00,0x33,0xe0,0x54,0x7f,0xf0,0x12,0x4c,0xa0,0x90,0x00,0x33,0xe0,0x20, -+0xe7,0x0e,0x90,0x91,0x11,0xe0,0xc3,0x94,0x64,0x50,0x05,0xe0,0x04,0xf0,0x80,0xeb, -+0x90,0x91,0x11,0xe0,0xc3,0x94,0x64,0x50,0x10,0x90,0x00,0x30,0xe0,0xab,0x10,0xaa, -+0x11,0xa9,0x12,0x12,0x42,0x4d,0x7f,0x01,0x22,0x7f,0x00,0x22,0xe4,0x90,0x91,0x98, -+0xf0,0xa3,0xf0,0x90,0x05,0xf8,0xe0,0x70,0x0f,0xa3,0xe0,0x70,0x0b,0xa3,0xe0,0x70, -+0x07,0xa3,0xe0,0x70,0x03,0x7f,0x01,0x22,0xd3,0x90,0x91,0x99,0xe0,0x94,0xe8,0x90, -+0x91,0x98,0xe0,0x94,0x03,0x40,0x03,0x7f,0x00,0x22,0x7f,0x32,0x7e,0x00,0x12,0x37, -+0x54,0x90,0x91,0x98,0xe4,0x75,0xf0,0x01,0x12,0x42,0x81,0x80,0xc6,0x7f,0x78,0x7e, -+0x08,0x12,0x27,0xde,0x90,0x90,0xd8,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x27, -+0xde,0x90,0x90,0xdc,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x27,0xde,0x90,0x90, -+0xe0,0x12,0x2a,0x7f,0x90,0x91,0x51,0xe0,0x90,0x90,0xd8,0xb4,0x01,0x0d,0x12,0x43, -+0x09,0xef,0x54,0xc7,0xff,0xed,0x54,0xc7,0xfd,0x80,0x07,0x12,0x43,0x09,0xef,0x54, -+0xc7,0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x08,0x12,0x2f,0xd9, -+0x90,0x90,0xdc,0x12,0x43,0x09,0xef,0x54,0x0f,0xff,0xec,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x90,0xe0,0x12,0x43,0x09,0xef,0x44, -+0x02,0xff,0xec,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x00,0x7e,0x08,0x12,0x2f,0xd9, -+0x7f,0x70,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xe4,0x12,0x2a,0x7f,0x90,0x80,0x85, -+0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa0,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80, -+0x59,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe4,0xfd,0xff,0x12,0x34,0x81,0x90,0x91, -+0x51,0xe0,0xb4,0x01,0x11,0x90,0x80,0x59,0x12,0x2a,0x8b,0x00,0x00,0x00,0x00,0xe4, -+0xfd,0x7f,0x01,0x12,0x34,0x81,0x22,0xef,0x70,0x02,0x61,0x3d,0x90,0x90,0xe8,0xe0, -+0x60,0x02,0xe1,0x08,0x90,0x90,0xd4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x8c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0x80,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0x84,0x12,0x43,0x09, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0x88, -+0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x90,0x8c,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x90,0x90,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x74,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0x94,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0x98,0x12,0x43,0x09,0x90, -+0x80,0x85,0x12,0x2a,0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0x9c,0x12, -+0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x90,0xa0,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x90,0xa4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x88, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xa8,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a, -+0x7f,0x7f,0x8c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xac,0x12,0x43,0x09,0x90,0x80, -+0x85,0x12,0x2a,0x7f,0x7f,0xd0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xb0,0x12,0x43, -+0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd4,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90, -+0xb4,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xd8,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x90,0xb8,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0xdc,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x90,0xbc,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0xe0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xc0,0x12,0x43,0x09,0x90,0x80,0x85, -+0x12,0x2a,0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x90,0xc4,0x12,0x43,0x09, -+0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x90,0x90,0xc8, -+0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9, -+0x90,0x90,0xcc,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09, -+0x12,0x2f,0xd9,0x90,0x90,0xd0,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x04,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x90,0xe8,0x74,0x01,0xf0,0x22,0x90,0x90,0xe8, -+0xe0,0x64,0x01,0x60,0x02,0xe1,0x08,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x90, -+0xd4,0x12,0x2a,0x7f,0x7f,0x44,0x7e,0x08,0x12,0x27,0xde,0x90,0x90,0x80,0x12,0x2a, -+0x7f,0x7f,0x5c,0x7e,0x08,0x12,0x27,0xde,0x90,0x90,0x84,0x12,0x2a,0x7f,0x7f,0x6c, -+0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x88,0x12,0x2a,0x7f,0x7f,0x70,0x7e,0x0e,0x12, -+0x27,0xde,0x90,0x90,0x8c,0x12,0x2a,0x7f,0x7f,0x74,0x7e,0x0e,0x12,0x27,0xde,0x90, -+0x90,0x90,0x12,0x2a,0x7f,0x7f,0x78,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x94,0x12, -+0x2a,0x7f,0x7f,0x7c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x98,0x12,0x2a,0x7f,0x7f, -+0x80,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0x9c,0x12,0x2a,0x7f,0x7f,0x84,0x7e,0x0e, -+0x12,0x27,0xde,0x90,0x90,0xa0,0x12,0x2a,0x7f,0x7f,0x88,0x7e,0x0e,0x12,0x27,0xde, -+0x90,0x90,0xa4,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xa8, -+0x12,0x2a,0x7f,0x7f,0xd0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xac,0x12,0x2a,0x7f, -+0x7f,0xd4,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xb0,0x12,0x2a,0x7f,0x7f,0xd8,0x7e, -+0x0e,0x12,0x27,0xde,0x90,0x90,0xb4,0x12,0x2a,0x7f,0x7f,0xdc,0x7e,0x0e,0x12,0x27, -+0xde,0x90,0x90,0xb8,0x12,0x2a,0x7f,0x7f,0xe0,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90, -+0xbc,0x12,0x2a,0x7f,0x7f,0xec,0x7e,0x0e,0x12,0x27,0xde,0x90,0x90,0xc0,0x12,0x2a, -+0x7f,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x90,0xc4,0x12,0x2a,0x7f,0x7f,0x04, -+0x7e,0x0d,0x12,0x27,0xde,0x90,0x90,0xc8,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12, -+0x27,0xde,0x90,0x90,0xcc,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90, -+0x90,0xd0,0x12,0x2a,0x7f,0x7f,0x8c,0x7e,0x08,0x12,0x27,0xde,0x90,0x91,0x88,0x12, -+0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xed,0x44,0xc0,0xfd,0xec,0x90,0x91,0x88, -+0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f, -+0x8c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x01,0x00,0x00, -+0x7f,0x44,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0xdb,0x25, -+0xa4,0x7f,0x5c,0x7e,0x08,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb, -+0x25,0xa4,0x7f,0x6c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20, -+0xdb,0x25,0xa4,0x7f,0x70,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b, -+0x04,0x1b,0x25,0xa4,0x7f,0x74,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a, -+0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x78,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12, -+0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x7c,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85, -+0x12,0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x80,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80, -+0x85,0x12,0x2a,0x8b,0x63,0xdb,0x25,0xa4,0x7f,0x84,0x7e,0x0e,0x12,0x2f,0xd9,0x90, -+0x80,0x85,0x12,0x2a,0x8b,0x04,0x1b,0x25,0xa4,0x7f,0x88,0x7e,0x0e,0x12,0x2f,0xd9, -+0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0x8c,0x7e,0x0e,0x12,0x2f, -+0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd0,0x7e,0x0e,0x12, -+0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd4,0x7e,0x0e, -+0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x20,0xdb,0x25,0xa4,0x7f,0xd8,0x7e, -+0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f,0xdc, -+0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x00,0x1b,0x25,0xa4,0x7f, -+0xe0,0x7e,0x0e,0x12,0x2f,0xd9,0x90,0x80,0x85,0x12,0x2a,0x8b,0x24,0xdb,0x25,0xa4, -+0x7f,0xec,0x7e,0x0e,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0c,0x12,0x27,0xde,0x90,0x91, -+0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xe4,0xff,0xec,0x90,0x91,0x88, -+0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x11,0xff,0xec,0x90,0x91, -+0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f, -+0x7f,0x04,0x7e,0x0c,0x12,0x2f,0xd9,0x7f,0x04,0x7e,0x0d,0x12,0x27,0xde,0x90,0x91, -+0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x54,0xf0,0xff,0xec,0x90, -+0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x01,0xff,0xec, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x04,0x7e,0x0d,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xe4,0xff,0xec,0x90, -+0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x11,0xff,0xec, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12, -+0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f,0xd9,0x7f,0x0c,0x7e,0x09,0x12,0x27,0xde, -+0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09,0xed,0x54,0x0f,0xfd, -+0xec,0x54,0xf0,0xfc,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91,0x88,0x12,0x43,0x09, -+0xed,0x44,0x10,0xfd,0xec,0x44,0x01,0xfc,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91, -+0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x0c,0x7e,0x09,0x12,0x2f, -+0xd9,0x7f,0x04,0x7e,0x08,0x12,0x27,0xde,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90,0x91, -+0x88,0x12,0x43,0x09,0xef,0x54,0xf0,0xff,0xec,0x90,0x91,0x88,0x12,0x2a,0x7f,0x90, -+0x91,0x88,0x12,0x43,0x09,0xef,0x44,0x01,0xff,0xec,0x90,0x91,0x88,0x12,0x2a,0x7f, -+0x90,0x91,0x88,0x12,0x43,0x09,0x90,0x80,0x85,0x12,0x2a,0x7f,0x7f,0x04,0x7e,0x08, -+0x12,0x2f,0xd9,0xe4,0x90,0x90,0xe8,0xf0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0,0xd0, -+0x90,0x91,0xa0,0xef,0xf0,0xd3,0x94,0x07,0x50,0x47,0xe0,0xff,0x74,0x01,0xa8,0x07, -+0x08,0x80,0x02,0xc3,0x33,0xd8,0xfc,0xf4,0xff,0x90,0x00,0x46,0xe0,0x5f,0xf0,0x12, -+0x4c,0xa0,0x90,0x91,0xa0,0xe0,0xfd,0x74,0x01,0x7e,0x00,0xa8,0x05,0x08,0x80,0x05, -+0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00,0x44,0xe0,0xfb,0xe4,0xfe,0xef, -+0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13,0xce,0x13,0xd8,0xf8,0xff,0x80, -+0x44,0x90,0x91,0xa0,0xe0,0x24,0xf8,0xf0,0xe0,0xff,0x74,0x01,0xa8,0x07,0x08,0x80, -+0x02,0xc3,0x33,0xd8,0xfc,0x12,0x4c,0x98,0x90,0x91,0xa0,0xe0,0xfd,0x74,0x01,0x7e, -+0x00,0xa8,0x05,0x08,0x80,0x05,0xc3,0x33,0xce,0x33,0xce,0xd8,0xf9,0xff,0x90,0x00, -+0x42,0xe0,0xfb,0xe4,0xfe,0xef,0x5b,0xa8,0x05,0x08,0x80,0x06,0xce,0xa2,0xe7,0x13, -+0xce,0x13,0xd8,0xf8,0xff,0xd0,0xd0,0x92,0xaf,0x22,0xe4,0xfd,0x7f,0x45,0x12,0x4d, -+0xa8,0x90,0x04,0xfd,0xe4,0xf0,0xa3,0xf0,0x90,0x90,0xf7,0xf0,0x90,0x90,0xfd,0xf0, -+0x90,0x91,0x00,0xf0,0x90,0x90,0xfe,0xf0,0x90,0x91,0x01,0xf0,0x90,0x90,0xff,0xf0, -+0x90,0x91,0x02,0xf0,0x90,0x90,0xe9,0x04,0xf0,0xe4,0xa3,0xf0,0xa3,0xf0,0xa3,0xf0, -+0x90,0x90,0xee,0xf0,0x90,0x90,0xf3,0xf0,0x90,0x90,0xf5,0xf0,0x90,0x91,0x07,0xf0, -+0x90,0x90,0xf8,0xf0,0x90,0x90,0xf4,0xf0,0x90,0x90,0xed,0xf0,0x90,0x00,0x51,0xe0, -+0x44,0xc0,0xfd,0x7f,0x51,0x02,0x4d,0xa8,0x90,0x91,0x07,0xe0,0x64,0x01,0x60,0x08, -+0x90,0x90,0xf5,0xe0,0x60,0x02,0x01,0xdf,0x90,0x90,0xe9,0xe0,0xc3,0x94,0xff,0x50, -+0x05,0xe0,0x04,0xf0,0x80,0x3b,0x90,0x90,0xea,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0, -+0x04,0xf0,0xe4,0x80,0x28,0x90,0x90,0xeb,0xe0,0xc3,0x94,0xff,0x50,0x0a,0xe0,0x04, -+0xf0,0xe4,0x90,0x90,0xea,0xf0,0x80,0x15,0x90,0x90,0xec,0xe0,0xc3,0x94,0xff,0x50, -+0x10,0xe0,0x04,0xf0,0xe4,0x90,0x90,0xeb,0xf0,0x90,0x90,0xea,0xf0,0x90,0x90,0xe9, -+0xf0,0x90,0x00,0x44,0xe0,0x54,0x0c,0x60,0x76,0xe0,0x30,0xe2,0x32,0x90,0x90,0xfd, -+0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0,0x04,0xf0,0x80,0x24,0x90,0x90,0xfe,0xe0,0xc3, -+0x94,0xff,0x50,0x06,0xe0,0x04,0xf0,0xe4,0x80,0x11,0x90,0x90,0xff,0xe0,0xc3,0x94, -+0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4,0x90,0x90,0xfe,0xf0,0x90,0x90,0xfd,0xf0,0x90, -+0x00,0x44,0xe0,0x30,0xe3,0x32,0x90,0x91,0x00,0xe0,0xc3,0x94,0xff,0x50,0x05,0xe0, -+0x04,0xf0,0x80,0x24,0x90,0x91,0x01,0xe0,0xc3,0x94,0xff,0x50,0x06,0xe0,0x04,0xf0, -+0xe4,0x80,0x11,0x90,0x91,0x02,0xe0,0xc3,0x94,0xff,0x50,0x0c,0xe0,0x04,0xf0,0xe4, -+0x90,0x91,0x01,0xf0,0x90,0x91,0x00,0xf0,0x90,0x04,0xfd,0xe0,0x44,0x01,0xf0,0x22, -+0xe5,0x6e,0x30,0xe3,0x04,0xe4,0xff,0x80,0x02,0x7f,0x01,0x02,0x47,0xc9,0x90,0x91, -+0x53,0xe0,0x30,0xe0,0x49,0xe5,0x6d,0x64,0x01,0x70,0x43,0x90,0x91,0x52,0xe0,0x04, -+0xf0,0xe5,0x70,0x64,0x03,0x60,0x05,0xe5,0x70,0xb4,0x06,0x0d,0x90,0x91,0x52,0xe0, -+0xff,0x74,0x01,0xd3,0x9f,0x50,0x14,0x80,0x07,0x90,0x91,0x52,0xe0,0xb4,0x0a,0x0b, -+0x90,0x91,0x55,0xe0,0x04,0xf0,0xe4,0x90,0x91,0x52,0xf0,0x90,0x91,0x55,0xe0,0xff, -+0x90,0x91,0x54,0xe0,0xb5,0x07,0x07,0x11,0xe0,0xe4,0x90,0x91,0x55,0xf0,0x22,0x90, -+0x06,0x90,0xe0,0x44,0x01,0xf0,0x90,0x91,0x61,0xe0,0x30,0xe0,0x3c,0x90,0x91,0x5f, -+0xe0,0xff,0x90,0x91,0x5e,0xe0,0xfe,0xc4,0x13,0x54,0x01,0xfd,0x12,0x4c,0xb0,0x90, -+0x91,0x60,0xe0,0x75,0xf0,0x20,0xa4,0xff,0xae,0xf0,0x12,0x37,0x54,0x90,0x91,0x5e, -+0xe0,0xc4,0x13,0x54,0x07,0x30,0xe0,0x07,0xa3,0xe0,0xff,0xe4,0xfd,0x80,0x07,0x90, -+0x91,0x5f,0xe0,0xff,0x7d,0x01,0x12,0x4c,0xb0,0x22,0xd3,0x10,0xaf,0x01,0xc3,0xc0, -+0xd0,0xe4,0x90,0x91,0x19,0xf0,0xa3,0x74,0x08,0xf0,0xa3,0xf0,0xe4,0xa3,0xf0,0x90, -+0x01,0x1f,0xe0,0xfe,0x90,0x01,0x1e,0xe0,0x7c,0x00,0x24,0x00,0xff,0xec,0x3e,0x90, -+0x91,0x11,0xf0,0xa3,0xef,0xf0,0x90,0x02,0x87,0xe0,0x90,0x91,0x18,0xf0,0x90,0x91, -+0x56,0xe0,0x20,0xe0,0x02,0x61,0xb7,0xe4,0x90,0x91,0x17,0xf0,0x90,0x91,0x18,0xe0, -+0xff,0x90,0x91,0x17,0xe0,0xc3,0x9f,0x40,0x02,0x61,0xb7,0x90,0x91,0x11,0xe0,0xfc, -+0xa3,0xe0,0xfd,0xec,0xff,0x90,0xfd,0x11,0xf0,0x90,0x91,0x1c,0xef,0xf0,0x74,0x02, -+0x2d,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x54,0x0f,0xfc,0x33,0x33,0x33,0x54, -+0xf8,0xff,0xed,0x24,0x18,0x2f,0x90,0x91,0x15,0xf0,0xe0,0x24,0x00,0xf5,0x82,0xe4, -+0x34,0xfb,0xf5,0x83,0xe0,0x54,0xfc,0x90,0x91,0x16,0xf0,0x74,0x01,0x2d,0xf5,0x82, -+0xe4,0x34,0xfb,0xf5,0x83,0xe0,0xfe,0x74,0x00,0x2d,0xf5,0x82,0xe4,0x34,0xfb,0xf5, -+0x83,0xe0,0x7a,0x00,0x24,0x00,0xff,0xea,0x3e,0x54,0x3f,0xab,0x07,0xfa,0x90,0x91, -+0x13,0xf0,0xa3,0xeb,0xf0,0xaf,0x04,0xef,0x75,0xf0,0x08,0xa4,0x24,0x18,0xff,0xe4, -+0x35,0xf0,0xfe,0xef,0x2b,0xfb,0xee,0x3a,0xfa,0x90,0x91,0x5a,0xe0,0xfe,0xa3,0xe0, -+0xff,0xad,0x03,0xac,0x02,0x12,0x45,0x09,0xaa,0x06,0xab,0x07,0x90,0x91,0x15,0xe0, -+0x24,0x00,0xf5,0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x30,0xe7,0x08,0x90,0x91,0x19, -+0x74,0x02,0xf0,0x80,0x05,0xe4,0x90,0x91,0x19,0xf0,0xaf,0x03,0x90,0x91,0x11,0xea, -+0x8f,0xf0,0x12,0x42,0x81,0x90,0x91,0x5c,0xe0,0xfe,0xa3,0xe0,0xff,0x90,0x91,0x11, -+0xe0,0xfc,0xa3,0xe0,0xfd,0xd3,0x9f,0xec,0x9e,0x40,0x1b,0x90,0x91,0x5d,0xe0,0x24, -+0x01,0xff,0x90,0x91,0x5c,0xe0,0x34,0x00,0xfe,0xc3,0xed,0x9f,0xff,0xec,0x9e,0x90, -+0x91,0x11,0xf0,0xa3,0xef,0xf0,0x90,0x91,0x16,0xe0,0xff,0x24,0x40,0x60,0x04,0x24, -+0x20,0x70,0x27,0x90,0x91,0x5e,0xe0,0xfe,0xc4,0x13,0x13,0x13,0x54,0x01,0x20,0xe0, -+0x02,0x61,0x8f,0xef,0x90,0x00,0x81,0xb4,0xa0,0x05,0xe0,0x44,0x04,0x80,0x03,0xe0, -+0x44,0x08,0xfd,0x7f,0x81,0x12,0x4d,0xa8,0x61,0x88,0x90,0x91,0x5e,0xe0,0xc4,0x13, -+0x13,0x54,0x03,0x20,0xe0,0x02,0x61,0x8f,0x90,0x91,0x15,0xe0,0xff,0x24,0x00,0xf5, -+0x82,0xe4,0x34,0xfb,0xf5,0x83,0xe0,0x54,0x0c,0x64,0x08,0x70,0x72,0x90,0x91,0x19, -+0xe0,0xfe,0xef,0x2e,0xff,0xa3,0xe0,0x2f,0xff,0x24,0x1e,0xf5,0x82,0xe4,0x34,0xfb, -+0xf5,0x83,0xe0,0x64,0x88,0x70,0x58,0x74,0x1f,0x2f,0xf5,0x82,0xe4,0x34,0xfb,0xf5, -+0x83,0xe0,0x64,0x8e,0x70,0x49,0x90,0x91,0x19,0xe0,0xff,0x90,0x91,0x15,0xe0,0x2f, -+0xff,0x90,0x91,0x1a,0xe0,0x2f,0xff,0xa3,0xe0,0x2f,0xff,0x24,0x19,0xf5,0x82,0xe4, -+0x34,0xfb,0xf5,0x83,0xe0,0x64,0x03,0x70,0x26,0x74,0x1e,0x2f,0xf5,0x82,0xe4,0x34, -+0xfb,0xf5,0x83,0xe0,0x90,0x00,0x81,0x30,0xe3,0x05,0xe0,0x44,0x01,0x80,0x03,0xe0, -+0x44,0x02,0xfd,0x7f,0x81,0x12,0x4d,0xa8,0x90,0x91,0x56,0xe0,0x44,0x80,0xf0,0x90, -+0x91,0x56,0xe0,0xff,0xc4,0x13,0x13,0x13,0x54,0x01,0x30,0xe0,0x02,0x31,0x3f,0x71, -+0xbc,0xbf,0x01,0x13,0x90,0x91,0x11,0xe0,0xfe,0xa3,0xe0,0xff,0x12,0x44,0xb5,0x90, -+0x91,0x17,0xe0,0x04,0xf0,0x21,0xcc,0xd0,0xd0,0x92,0xaf,0x22,0x90,0x91,0x56,0xe0, -+0xc4,0x13,0x13,0x13,0x54,0x01,0x30,0xe0,0x11,0xe0,0x44,0x80,0xf0,0x90,0x91,0x5e, -+0xe0,0xc4,0x54,0x0f,0x20,0xe0,0x03,0x7f,0x00,0x22,0x7f,0x01,0x22,0x8f,0x1f,0xe4, -+0x90,0x91,0x22,0xf0,0xe5,0x1f,0x14,0xfe,0x90,0x91,0x22,0xe0,0xff,0xc3,0x9e,0x50, -+0x0e,0xef,0x04,0xfd,0x12,0x34,0xb7,0x90,0x91,0x22,0xe0,0x04,0xf0,0x80,0xe5,0xe5, -+0x1f,0x14,0xff,0x7d,0xff,0x12,0x34,0xb7,0x90,0x91,0x22,0xe5,0x1f,0xf0,0x90,0x91, -+0x22,0xe0,0xc3,0x94,0xff,0x50,0x0f,0xe0,0xff,0x04,0xfd,0x12,0x34,0xb7,0x90,0x91, -+0x22,0xe0,0x04,0xf0,0x80,0xe8,0xad,0x1f,0x7f,0xff,0x02,0x34,0xb7,0xc3,0xee,0x94, -+0x01,0x40,0x0a,0x0d,0xed,0x13,0x90,0xfd,0x10,0xf0,0xe4,0x2f,0xff,0x22,0xc3,0xee, -+0x94,0x01,0x40,0x1e,0x90,0xfd,0x11,0xe0,0xb5,0x05,0x14,0x90,0x01,0x17,0xe0,0xb5, -+0x05,0x07,0x90,0xfd,0x11,0xe4,0xf0,0x80,0x06,0xed,0x04,0x90,0xfd,0x11,0xf0,0xe4, -+0x2f,0xff,0x22,0x00,0x18,0x58,}; -+ -+ -+ -+ -+ -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c -@@ -0,0 +1,2680 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#include "drv_types.h" -+#include "rtl8192c_hal.h" -+ -+//================================================================================ -+// Constant. -+//================================================================================ -+ -+// -+// Default LED behavior. -+// -+#define LED_BLINK_NORMAL_INTERVAL 100 -+#define LED_BLINK_SLOWLY_INTERVAL 200 -+#define LED_BLINK_LONG_INTERVAL 400 -+ -+#define LED_BLINK_NO_LINK_INTERVAL_ALPHA 1000 -+#define LED_BLINK_LINK_INTERVAL_ALPHA 500 //500 -+#define LED_BLINK_SCAN_INTERVAL_ALPHA 180 //150 -+#define LED_BLINK_FASTER_INTERVAL_ALPHA 50 -+#define LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA 5000 -+ -+//================================================================================ -+// LED object. -+//================================================================================ -+ -+ -+//================================================================================ -+// Prototype of protected function. -+//================================================================================ -+ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void BlinkTimerCallback(void *data); -+#else -+void BlinkTimerCallback(struct timer_list *t); -+#endif -+ -+static void BlinkWorkItemCallback(struct work_struct *work); -+ -+// -+// Description: -+// Reset blinking status of LED_871x object. -+// -+static void -+ResetLedStatus(PLED_871x pLed) { -+ pLed->CurrLedState = RTW_LED_OFF; // Current LED state. -+ pLed->bLedOn = _FALSE; // true if LED is ON, false if LED is OFF. -+ -+ pLed->bLedBlinkInProgress = _FALSE; // true if it is blinking, false o.w.. -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ pLed->bLedStartToLinkBlinkInProgress = _FALSE; -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ pLed->BlinkTimes = 0; // Number of times to toggle led state for blinking. -+ pLed->BlinkingLedState = LED_UNKNOWN; // Next state for blinking, either RTW_LED_ON or RTW_LED_OFF are. -+} -+ -+//================================================================================ -+// LED_819xUsb routines. -+//================================================================================ -+ -+// -+// Description: -+// Initialize an LED_871x object. -+// -+static void -+InitLed871x( -+ _adapter *padapter, -+ PLED_871x pLed, -+ LED_PIN_871x LedPin -+ ) -+{ -+ pLed->padapter = padapter; -+ pLed->LedPin = LedPin; -+ -+ ResetLedStatus(pLed); -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&(pLed->BlinkTimer), padapter->pnetdev, BlinkTimerCallback, pLed); -+#else -+ timer_setup(&pLed->BlinkTimer, BlinkTimerCallback, 0); -+#endif -+ _init_workitem(&(pLed->BlinkWorkItem), BlinkWorkItemCallback, pLed); -+} -+ -+ -+// -+// Description: -+// DeInitialize an LED_871x object. -+// -+static void -+DeInitLed871x( -+ PLED_871x pLed -+ ) -+{ -+ //call _cancel_workitem_sync(&(pLed->BlinkWorkItem)) -+ //before _cancel_timer_ex(&(pLed->BlinkTimer)) to -+ //avoid led timer restarting when driver is removed -+ -+ _cancel_workitem_sync(&(pLed->BlinkWorkItem)); -+ -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ -+ // We should reset bLedBlinkInProgress if we cancel the LedControlTimer, 2005.03.10, by rcnjko. -+ ResetLedStatus(pLed); -+} -+ -+// -+// Description: -+// Turn on LED according to LedPin specified. -+// -+static void -+SwLedOn( -+ _adapter *padapter, -+ PLED_871x pLed -+) -+{ -+ u8 LedCfg; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ -+ if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) -+ { -+ return; -+ } -+ -+ if( (BOARD_MINICARD == pHalData->BoardType )|| -+ (BOARD_USB_SOLO == pHalData->BoardType)|| -+ (BOARD_USB_COMBO == pHalData->BoardType)) -+ { -+ LedCfg = rtw_read8(padapter, REG_LEDCFG2); -+ switch(pLed->LedPin) -+ { -+ case LED_PIN_GPIO0: -+ break; -+ -+ case LED_PIN_LED0: -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg&0xf0)|BIT5|BIT6); // SW control led0 on. -+ break; -+ -+ case LED_PIN_LED1: -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg&0x0f)|BIT5); // SW control led1 on. -+ break; -+ -+ default: -+ break; -+ -+ } -+ } -+ else -+ { -+ switch(pLed->LedPin) -+ { -+ case LED_PIN_GPIO0: -+ break; -+ -+ case LED_PIN_LED0: -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ if(pHalData->AntDivCfg) -+ { -+ LedCfg = rtw_read8(padapter, REG_LEDCFG2); -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg&0xe0)|BIT7|BIT6|BIT5); // SW control led0 on. -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("SwLedOn LED0 0x%x\n", PlatformEFIORead4Byte(Adapter, REG_LEDCFG2))); -+ } -+ else -+#endif -+ { -+ LedCfg = rtw_read8(padapter, REG_LEDCFG0); -+ rtw_write8(padapter,REG_LEDCFG0, LedCfg&0x70); // SW control led0 on. -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("SwLedOn LED0 0x%lx\n", PlatformEFIORead4Byte(Adapter, REG_LEDCFG0))); -+ } -+ break; -+ -+ case LED_PIN_LED1: -+ LedCfg = rtw_read8(padapter,(REG_LEDCFG1)); -+ rtw_write8(padapter,(REG_LEDCFG1), LedCfg&0x70); // SW control led1 on. -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("SwLedOn LED1 0x%lx\n", PlatformEFIORead4Byte(Adapter, REG_LEDCFG0))); -+ -+ break; -+ -+ default: -+ break; -+ } -+ } -+ pLed->bLedOn = _TRUE; -+ -+} -+ -+ -+// -+// Description: -+// Turn off LED according to LedPin specified. -+// -+static void -+SwLedOff( -+ _adapter *padapter, -+ PLED_871x pLed -+) -+{ -+ u8 LedCfg; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ -+ if((padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) -+ { -+ goto exit; -+ } -+ -+ if( (BOARD_MINICARD == pHalData->BoardType )|| -+ (BOARD_USB_SOLO == pHalData->BoardType)|| -+ (BOARD_USB_COMBO == pHalData->BoardType)) -+ { -+ LedCfg = rtw_read8(padapter, REG_LEDCFG2);//0x4E -+ -+ switch(pLed->LedPin) -+ { -+ -+ case LED_PIN_GPIO0: -+ break; -+ -+ case LED_PIN_LED0: -+ if(BOARD_USB_COMBO == pHalData->BoardType) -+ { -+ LedCfg &= 0x90; // Set to software control. -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3)); -+ LedCfg = rtw_read8(padapter, REG_MAC_PINMUX_CFG); -+ LedCfg &= 0xFE; -+ rtw_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg); -+ } -+ else -+ { -+ LedCfg &= 0xf0; // Set to software control. -+ if(pHalData->bLedOpenDrain == _TRUE) // Open-drain arrangement for controlling the LED -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT1|BIT5|BIT6)); -+ else -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3|BIT5|BIT6)); -+ } -+ break; -+ -+ case LED_PIN_LED1: -+ LedCfg &= 0x0f; // Set to software control. -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3)); -+ break; -+ -+ default: -+ break; -+ } -+ } -+ else -+ { -+ switch(pLed->LedPin) -+ { -+ case LED_PIN_GPIO0: -+ break; -+ -+ case LED_PIN_LED0: -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ if(pHalData->AntDivCfg) -+ { -+ LedCfg = rtw_read8(padapter, REG_LEDCFG2); -+ LedCfg &= 0xe0; // Set to software control. -+ rtw_write8(padapter, REG_LEDCFG2, (LedCfg|BIT3|BIT7|BIT6|BIT5)); -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("SwLedOff LED0 0x%x\n", PlatformEFIORead4Byte(Adapter, REG_LEDCFG2))); -+ } -+ else -+#endif -+ { -+ LedCfg = rtw_read8(padapter, REG_LEDCFG0); -+ LedCfg &= 0x70; // Set to software control. -+ rtw_write8(padapter, REG_LEDCFG0, (LedCfg|BIT3)); -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("SwLedOff LED0 0x%lx\n", PlatformEFIORead4Byte(Adapter, REG_LEDCFG0))); -+ } -+ break; -+ -+ case LED_PIN_LED1: -+ LedCfg = rtw_read8(padapter, (REG_LEDCFG1)); -+ LedCfg &= 0x70; // Set to software control. -+ rtw_write8(padapter, (REG_LEDCFG1), (LedCfg|BIT3)); -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("SwLedOff LED1 0x%lx\n", PlatformEFIORead4Byte(Adapter, REG_LEDCFG0))); -+ break; -+ -+ default: -+ break; -+ } -+ } -+ -+exit: -+ pLed->bLedOn = _FALSE; -+ -+} -+ -+//================================================================================ -+// Interface to manipulate LED objects. -+//================================================================================ -+ -+ -+// -+// Description: -+// Implementation of LED blinking behavior. -+// It toggle off LED and schedule corresponding timer if necessary. -+// -+static void -+SwLedBlink( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 bStopBlinking = _FALSE; -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,( "Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ // Determine if we shall change LED state again. -+ pLed->BlinkTimes--; -+ switch(pLed->CurrLedState) -+ { -+ -+ case LED_BLINK_NORMAL: -+ if(pLed->BlinkTimes == 0) -+ { -+ bStopBlinking = _TRUE; -+ } -+ break; -+ -+ case LED_BLINK_StartToBlink: -+ if( check_fwstate(pmlmepriv, _FW_LINKED) && check_fwstate(pmlmepriv, WIFI_STATION_STATE) ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ if( check_fwstate(pmlmepriv, _FW_LINKED) && -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ else if(pLed->BlinkTimes == 0) -+ { -+ bStopBlinking = _TRUE; -+ } -+ break; -+ -+ case LED_BLINK_WPS: -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ break; -+ -+ -+ default: -+ bStopBlinking = _TRUE; -+ break; -+ -+ } -+ -+ if(bStopBlinking) -+ { -+ //if( padapter->pwrctrlpriv.cpwm >= PS_STATE_S2) -+ if(0) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else if( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && (pLed->bLedOn == _FALSE)) -+ { -+ SwLedOn(padapter, pLed); -+ } -+ else if( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && pLed->bLedOn == _TRUE) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ -+ pLed->BlinkTimes = 0; -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ // Assign LED state to toggle. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ -+ // Schedule a timer to toggle LED state. -+ switch( pLed->CurrLedState ) -+ { -+ case LED_BLINK_NORMAL: -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ break; -+ -+ case LED_BLINK_SLOWLY: -+ case LED_BLINK_StartToBlink: -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ break; -+ -+ case LED_BLINK_WPS: -+ { -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LONG_INTERVAL); -+ else -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LONG_INTERVAL); -+ } -+ break; -+ -+ default: -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ break; -+ } -+ } -+} -+ -+ -+static void -+SwLedBlink1( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ PLED_871x pLed1 = &(ledpriv->SwLed1); -+ u8 bStopBlinking = _FALSE; -+ -+ if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO) -+ pLed = &(ledpriv->SwLed1); -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,( "Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ -+ if(pHalData->EEPROMCustomerID == RT_CID_DEFAULT) -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ if(!pLed1->bSWLedCtrl) -+ { -+ SwLedOn(padapter, pLed1); -+ pLed1->bSWLedCtrl = _TRUE; -+ } -+ else if(!pLed1->bLedOn) -+ SwLedOn(padapter, pLed1); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (): turn on pLed1\n")); -+ } -+ else -+ { -+ if(!pLed1->bSWLedCtrl) -+ { -+ SwLedOff(padapter, pLed1); -+ pLed1->bSWLedCtrl = _TRUE; -+ } -+ else if(pLed1->bLedOn) -+ SwLedOff(padapter, pLed1); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (): turn off pLed1\n")); -+ } -+ } -+ -+ -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ ResetLedStatus(pLed); -+ return; -+ } -+ -+ -+ switch(pLed->CurrLedState) -+ { -+ case LED_BLINK_SLOWLY: -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ break; -+ -+ case LED_BLINK_NORMAL: -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); -+ break; -+ -+ case LED_SCAN_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ pLed->bLedLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_NORMAL; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) -+ { -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_TXRX_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ if(bStopBlinking) -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ pLed->bLedLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_NORMAL; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) -+ { -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->BlinkTimes = 0; -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_BLINK_WPS: -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ break; -+ -+ case LED_BLINK_WPS_STOP: //WPS success -+ if(pLed->BlinkingLedState == RTW_LED_ON) -+ bStopBlinking = _FALSE; -+ else -+ bStopBlinking = _TRUE; -+ -+ if(bStopBlinking) -+ { -+ pLed->bLedLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_NORMAL; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA); -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+} -+ -+static void -+SwLedBlink2( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 bStopBlinking = _FALSE; -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ switch(pLed->CurrLedState) -+ { -+ case LED_SCAN_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop scan blink CurrLedState %d\n", pLed->CurrLedState)); -+ -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop scan blink CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ case LED_TXRX_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop CurrLedState %d\n", pLed->CurrLedState)); -+ -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("stop CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+} -+ -+static void -+SwLedBlink3( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 bStopBlinking = _FALSE; -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ if(pLed->CurrLedState != LED_BLINK_WPS_STOP) -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ switch(pLed->CurrLedState) -+ { -+ case LED_SCAN_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ if( !pLed->bLedOn ) -+ SwLedOn(padapter, pLed); -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ if( pLed->bLedOn ) -+ SwLedOff(padapter, pLed); -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ case LED_TXRX_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ -+ if( !pLed->bLedOn ) -+ SwLedOn(padapter, pLed); -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ else if(check_fwstate(pmlmepriv, _FW_LINKED)== _FALSE) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ -+ if( pLed->bLedOn ) -+ SwLedOff(padapter, pLed); -+ -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ case LED_BLINK_WPS: -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ break; -+ -+ case LED_BLINK_WPS_STOP: //WPS success -+ if(pLed->BlinkingLedState == RTW_LED_ON) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA); -+ bStopBlinking = _FALSE; -+ } -+ else -+ { -+ bStopBlinking = _TRUE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ break; -+ -+ -+ default: -+ break; -+ } -+ -+} -+ -+ -+static void -+SwLedBlink4( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ PLED_871x pLed1 = &(ledpriv->SwLed1); -+ u8 bStopBlinking = _FALSE; -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ if(!pLed1->bLedWPSBlinkInProgress && pLed1->BlinkingLedState == LED_UNKNOWN) -+ { -+ pLed1->BlinkingLedState = RTW_LED_OFF; -+ pLed1->CurrLedState = RTW_LED_OFF; -+ SwLedOff(padapter, pLed1); -+ } -+ -+ switch(pLed->CurrLedState) -+ { -+ case LED_BLINK_SLOWLY: -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ break; -+ -+ case LED_BLINK_StartToBlink: -+ if( pLed->bLedOn ) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ } -+ break; -+ -+ case LED_SCAN_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _FALSE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ } -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ case LED_TXRX_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ } -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ case LED_BLINK_WPS: -+ if( pLed->bLedOn ) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ } -+ break; -+ -+ case LED_BLINK_WPS_STOP: //WPS authentication fail -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ break; -+ -+ case LED_BLINK_WPS_STOP_OVERLAP: //WPS session overlap -+ pLed->BlinkTimes--; -+ if(pLed->BlinkTimes == 0) -+ { -+ if(pLed->bLedOn) -+ { -+ pLed->BlinkTimes = 1; -+ } -+ else -+ { -+ bStopBlinking = _TRUE; -+ } -+ } -+ -+ if(bStopBlinking) -+ { -+ pLed->BlinkTimes = 10; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ } -+ break; -+ -+ -+ default: -+ break; -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("SwLedBlink4 CurrLedState %d\n", pLed->CurrLedState)); -+ -+ -+} -+ -+static void -+SwLedBlink5( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 bStopBlinking = _FALSE; -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ switch(pLed->CurrLedState) -+ { -+ case LED_SCAN_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ if(pLed->bLedOn) -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ if(!pLed->bLedOn) -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ -+ case LED_TXRX_BLINK: -+ pLed->BlinkTimes--; -+ if( pLed->BlinkTimes == 0 ) -+ { -+ bStopBlinking = _TRUE; -+ } -+ -+ if(bStopBlinking) -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ if(pLed->bLedOn) -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ if(!pLed->bLedOn) -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ if( padapter->pwrctrlpriv.rf_pwrstate != rf_on && padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ } -+ break; -+ -+ default: -+ break; -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("SwLedBlink5 CurrLedState %d\n", pLed->CurrLedState)); -+ -+ -+} -+ -+static void -+SwLedBlink6( -+ PLED_871x pLed -+ ) -+{ -+ _adapter *padapter = pLed->padapter; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 bStopBlinking = _FALSE; -+ -+ // Change LED according to BlinkingLedState specified. -+ if( pLed->BlinkingLedState == RTW_LED_ON ) -+ { -+ SwLedOn(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn on\n", pLed->BlinkTimes)); -+ } -+ else -+ { -+ SwLedOff(padapter, pLed); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Blinktimes (%d): turn off\n", pLed->BlinkTimes)); -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("<==== blink6\n")); -+} -+ -+ -+// -+// Description: -+// Callback function of LED BlinkTimer, -+// it just schedules to corresponding BlinkWorkItem. -+// -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void BlinkTimerCallback(void * data) -+{ -+ PLED_871x pLed = (PLED_871x)data; -+#else -+void BlinkTimerCallback(struct timer_list *t) -+{ -+ PLED_871x pLed = from_timer(pLed, t, BlinkTimer); -+#endif -+ _adapter *padapter = pLed->padapter; -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) -+ { -+ //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); -+ return; -+ } -+ -+#ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD -+ rtw_led_blink_cmd(padapter, pLed); -+#else -+ _set_workitem(&(pLed->BlinkWorkItem)); -+#endif -+} -+ -+// -+// Description: -+// Handler function of LED Blinking. -+// We dispatch acture LED blink action according to LedStrategy. -+// -+void BlinkHandler(PLED_871x pLed) -+{ -+ struct led_priv *ledpriv = &(pLed->padapter->ledpriv); -+ _adapter *padapter = pLed->padapter; -+ -+ //DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); -+ -+ if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) -+ { -+ //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); -+ return; -+ } -+ -+ switch(ledpriv->LedStrategy) -+ { -+ case SW_LED_MODE0: -+ SwLedBlink(pLed); -+ break; -+ -+ case SW_LED_MODE1: -+ SwLedBlink1(pLed); -+ break; -+ -+ case SW_LED_MODE2: -+ SwLedBlink2(pLed); -+ break; -+ -+ case SW_LED_MODE3: -+ SwLedBlink3(pLed); -+ break; -+ -+ case SW_LED_MODE4: -+ SwLedBlink4(pLed); -+ break; -+ -+ case SW_LED_MODE5: -+ SwLedBlink5(pLed); -+ break; -+ -+ case SW_LED_MODE6: -+ SwLedBlink6(pLed); -+ break; -+ -+ default: -+ //RT_TRACE(COMP_LED, DBG_LOUD, ("BlinkWorkItemCallback 0x%x \n", pHalData->LedStrategy)); -+ //SwLedBlink(pLed); -+ break; -+ } -+} -+ -+// -+// Description: -+// Callback function of LED BlinkWorkItem. -+// We dispatch acture LED blink action according to LedStrategy. -+// -+static void BlinkWorkItemCallback(struct work_struct *work) -+{ -+ PLED_871x pLed = container_of(work, LED_871x, BlinkWorkItem); -+ BlinkHandler(pLed); -+} -+ -+ -+ -+//================================================================================ -+// Default LED behavior. -+//================================================================================ -+ -+// -+// Description: -+// Implement each led action for SW_LED_MODE0. -+// This is default strategy. -+// -+static void -+SwLedControlMode0( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ PLED_871x pLed = &(ledpriv->SwLed1); -+ -+ // Decide led state -+ switch(LedAction) -+ { -+ case LED_CTL_TX: -+ case LED_CTL_RX: -+ if( pLed->bLedBlinkInProgress == _FALSE ) -+ { -+ pLed->bLedBlinkInProgress = _TRUE; -+ -+ pLed->CurrLedState = LED_BLINK_NORMAL; -+ pLed->BlinkTimes = 2; -+ -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ } -+ break; -+ -+ case LED_CTL_START_TO_LINK: -+ if( pLed->bLedBlinkInProgress == _FALSE ) -+ { -+ pLed->bLedBlinkInProgress = _TRUE; -+ -+ pLed->CurrLedState = LED_BLINK_StartToBlink; -+ pLed->BlinkTimes = 24; -+ -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ } -+ else -+ { -+ pLed->CurrLedState = LED_BLINK_StartToBlink; -+ } -+ break; -+ -+ case LED_CTL_LINK: -+ pLed->CurrLedState = RTW_LED_ON; -+ if( pLed->bLedBlinkInProgress == _FALSE ) -+ { -+ SwLedOn(padapter, pLed); -+ } -+ break; -+ -+ case LED_CTL_NO_LINK: -+ pLed->CurrLedState = RTW_LED_OFF; -+ if( pLed->bLedBlinkInProgress == _FALSE ) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ pLed->CurrLedState = RTW_LED_OFF; -+ if(pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ SwLedOff(padapter, pLed); -+ break; -+ -+ case LED_CTL_START_WPS: -+ if( pLed->bLedBlinkInProgress == _FALSE || pLed->CurrLedState == RTW_LED_ON) -+ { -+ pLed->bLedBlinkInProgress = _TRUE; -+ -+ pLed->CurrLedState = LED_BLINK_WPS; -+ pLed->BlinkTimes = 20; -+ -+ if( pLed->bLedOn ) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LONG_INTERVAL); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LONG_INTERVAL); -+ } -+ } -+ break; -+ -+ case LED_CTL_STOP_WPS: -+ if(pLed->bLedBlinkInProgress) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ break; -+ -+ -+ default: -+ break; -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Led %d\n", pLed->CurrLedState)); -+ -+} -+ -+ //ALPHA, added by chiyoko, 20090106 -+static void -+SwLedControlMode1( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ PLED_871x pLed = &(ledpriv->SwLed0); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO) -+ pLed = &(ledpriv->SwLed1); -+ -+ switch(LedAction) -+ { -+ case LED_CTL_POWER_ON: -+ case LED_CTL_START_TO_LINK: -+ case LED_CTL_NO_LINK: -+ if( pLed->bLedNoLinkBlinkInProgress == _FALSE ) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ if( pLed->bLedLinkBlinkInProgress == _TRUE ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_LINK: -+ if( pLed->bLedLinkBlinkInProgress == _FALSE ) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ pLed->bLedLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_NORMAL; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_LINK_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_SITE_SURVEY: -+ if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) -+ ; -+ else if(pLed->bLedScanBlinkInProgress ==_FALSE) -+ { -+ if(IS_LED_WPS_BLINKING(pLed)) -+ return; -+ -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedLinkBlinkInProgress == _TRUE ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ pLed->bLedScanBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_SCAN_BLINK; -+ pLed->BlinkTimes = 24; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_TX: -+ case LED_CTL_RX: -+ if(pLed->bLedBlinkInProgress ==_FALSE) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedLinkBlinkInProgress == _TRUE ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ pLed->bLedBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_TXRX_BLINK; -+ pLed->BlinkTimes = 2; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_START_WPS: //wait until xinpin finish -+ case LED_CTL_START_WPS_BOTTON: -+ if(pLed->bLedWPSBlinkInProgress ==_FALSE) -+ { -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedLinkBlinkInProgress == _TRUE ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedScanBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ pLed->bLedWPSBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_WPS; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ -+ case LED_CTL_STOP_WPS: -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedLinkBlinkInProgress == _TRUE ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedScanBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ } -+ else -+ { -+ pLed->bLedWPSBlinkInProgress = _TRUE; -+ } -+ -+ pLed->CurrLedState = LED_BLINK_WPS_STOP; -+ if(pLed->bLedOn) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ break; -+ -+ case LED_CTL_STOP_WPS_FAIL: -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ if( pLed->bLedNoLinkBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedLinkBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedWPSBlinkInProgress ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedScanBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ -+ SwLedOff(padapter, pLed); -+ break; -+ -+ default: -+ break; -+ -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Led %d\n", pLed->CurrLedState)); -+} -+ -+ //Arcadyan/Sitecom , added by chiyoko, 20090216 -+static void -+SwLedControlMode2( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ PLED_871x pLed = &(ledpriv->SwLed0); -+ -+ switch(LedAction) -+ { -+ case LED_CTL_SITE_SURVEY: -+ if(pmlmepriv->LinkDetectInfo.bBusyTraffic) -+ ; -+ else if(pLed->bLedScanBlinkInProgress ==_FALSE) -+ { -+ if(IS_LED_WPS_BLINKING(pLed)) -+ return; -+ -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ pLed->bLedScanBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_SCAN_BLINK; -+ pLed->BlinkTimes = 24; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_TX: -+ case LED_CTL_RX: -+ if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ -+ pLed->bLedBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_TXRX_BLINK; -+ pLed->BlinkTimes = 2; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_LINK: -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedScanBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ -+ _set_timer(&(pLed->BlinkTimer), 0); -+ break; -+ -+ case LED_CTL_START_WPS: //wait until xinpin finish -+ case LED_CTL_START_WPS_BOTTON: -+ if(pLed->bLedWPSBlinkInProgress ==_FALSE) -+ { -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedScanBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ pLed->bLedWPSBlinkInProgress = _TRUE; -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ break; -+ -+ case LED_CTL_STOP_WPS: -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ if(padapter->pwrctrlpriv.rf_pwrstate != rf_on) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ break; -+ -+ case LED_CTL_STOP_WPS_FAIL: -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ if(padapter->pwrctrlpriv.rf_pwrstate != rf_on) -+ { -+ SwLedOff(padapter, pLed); -+ } -+ else -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+ } -+ break; -+ -+ case LED_CTL_START_TO_LINK: -+ case LED_CTL_NO_LINK: -+ if(!IS_LED_BLINKING(pLed)) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedScanBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedWPSBlinkInProgress ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ _set_timer(&(pLed->BlinkTimer), 0); -+ break; -+ -+ default: -+ break; -+ -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+} -+ -+ //COREGA, added by chiyoko, 20090316 -+ static void -+ SwLedControlMode3( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ PLED_871x pLed = &(ledpriv->SwLed0); -+ -+ switch(LedAction) -+ { -+ case LED_CTL_SITE_SURVEY: -+ if(pmlmepriv->LinkDetectInfo.bBusyTraffic) -+ ; -+ else if(pLed->bLedScanBlinkInProgress ==_FALSE) -+ { -+ if(IS_LED_WPS_BLINKING(pLed)) -+ return; -+ -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ pLed->bLedScanBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_SCAN_BLINK; -+ pLed->BlinkTimes = 24; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_TX: -+ case LED_CTL_RX: -+ if((pLed->bLedBlinkInProgress ==_FALSE) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ -+ pLed->bLedBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_TXRX_BLINK; -+ pLed->BlinkTimes = 2; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_LINK: -+ if(IS_LED_WPS_BLINKING(pLed)) -+ return; -+ -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedScanBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ -+ _set_timer(&(pLed->BlinkTimer), 0); -+ break; -+ -+ case LED_CTL_START_WPS: //wait until xinpin finish -+ case LED_CTL_START_WPS_BOTTON: -+ if(pLed->bLedWPSBlinkInProgress ==_FALSE) -+ { -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedScanBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ pLed->bLedWPSBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_WPS; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_STOP_WPS: -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ else -+ { -+ pLed->bLedWPSBlinkInProgress = _TRUE; -+ } -+ -+ pLed->CurrLedState = LED_BLINK_WPS_STOP; -+ if(pLed->bLedOn) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ -+ break; -+ -+ case LED_CTL_STOP_WPS_FAIL: -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ break; -+ -+ case LED_CTL_START_TO_LINK: -+ case LED_CTL_NO_LINK: -+ if(!IS_LED_BLINKING(pLed)) -+ { -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedScanBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedWPSBlinkInProgress ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ _set_timer(&(pLed->BlinkTimer), 0); -+ break; -+ -+ default: -+ break; -+ -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("CurrLedState %d\n", pLed->CurrLedState)); -+} -+ -+ -+ //Edimax-Belkin, added by chiyoko, 20090413 -+static void -+SwLedControlMode4( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ PLED_871x pLed = &(ledpriv->SwLed0); -+ PLED_871x pLed1 = &(ledpriv->SwLed1); -+ -+ switch(LedAction) -+ { -+ case LED_CTL_START_TO_LINK: -+ if(pLed1->bLedWPSBlinkInProgress) -+ { -+ pLed1->bLedWPSBlinkInProgress = _FALSE; -+ _cancel_timer_ex(&(pLed1->BlinkTimer)); -+ -+ pLed1->BlinkingLedState = RTW_LED_OFF; -+ pLed1->CurrLedState = RTW_LED_OFF; -+ -+ if(pLed1->bLedOn) -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ -+ if( pLed->bLedStartToLinkBlinkInProgress == _FALSE ) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedNoLinkBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedStartToLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_StartToBlink; -+ if( pLed->bLedOn ) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ } -+ } -+ break; -+ -+ case LED_CTL_LINK: -+ case LED_CTL_NO_LINK: -+ //LED1 settings -+ if(LedAction == LED_CTL_LINK) -+ { -+ if(pLed1->bLedWPSBlinkInProgress) -+ { -+ pLed1->bLedWPSBlinkInProgress = _FALSE; -+ _cancel_timer_ex(&(pLed1->BlinkTimer)); -+ -+ pLed1->BlinkingLedState = RTW_LED_OFF; -+ pLed1->CurrLedState = RTW_LED_OFF; -+ -+ if(pLed1->bLedOn) -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ } -+ -+ if( pLed->bLedNoLinkBlinkInProgress == _FALSE ) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_SITE_SURVEY: -+ if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) -+ ; -+ else if(pLed->bLedScanBlinkInProgress ==_FALSE) -+ { -+ if(IS_LED_WPS_BLINKING(pLed)) -+ return; -+ -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ pLed->bLedScanBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_SCAN_BLINK; -+ pLed->BlinkTimes = 24; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_TX: -+ case LED_CTL_RX: -+ if(pLed->bLedBlinkInProgress ==_FALSE) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK || IS_LED_WPS_BLINKING(pLed)) -+ { -+ return; -+ } -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ pLed->bLedBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_TXRX_BLINK; -+ pLed->BlinkTimes = 2; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_START_WPS: //wait until xinpin finish -+ case LED_CTL_START_WPS_BOTTON: -+ if(pLed1->bLedWPSBlinkInProgress) -+ { -+ pLed1->bLedWPSBlinkInProgress = _FALSE; -+ _cancel_timer_ex(&(pLed1->BlinkTimer)); -+ -+ pLed1->BlinkingLedState = RTW_LED_OFF; -+ pLed1->CurrLedState = RTW_LED_OFF; -+ -+ if(pLed1->bLedOn) -+ _set_timer(&(pLed->BlinkTimer), 0); -+ } -+ -+ if(pLed->bLedWPSBlinkInProgress ==_FALSE) -+ { -+ if(pLed->bLedNoLinkBlinkInProgress == _TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if(pLed->bLedScanBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ pLed->bLedWPSBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_WPS; -+ if( pLed->bLedOn ) -+ { -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SLOWLY_INTERVAL); -+ } -+ else -+ { -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ } -+ } -+ break; -+ -+ case LED_CTL_STOP_WPS: //WPS connect success -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ -+ break; -+ -+ case LED_CTL_STOP_WPS_FAIL: //WPS authentication fail -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ -+ //LED1 settings -+ if(pLed1->bLedWPSBlinkInProgress) -+ _cancel_timer_ex(&(pLed1->BlinkTimer)); -+ else -+ pLed1->bLedWPSBlinkInProgress = _TRUE; -+ -+ pLed1->CurrLedState = LED_BLINK_WPS_STOP; -+ if( pLed1->bLedOn ) -+ pLed1->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed1->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ -+ break; -+ -+ case LED_CTL_STOP_WPS_FAIL_OVERLAP: //WPS session overlap -+ if(pLed->bLedWPSBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ pLed->bLedNoLinkBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_BLINK_SLOWLY; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NO_LINK_INTERVAL_ALPHA); -+ -+ //LED1 settings -+ if(pLed1->bLedWPSBlinkInProgress) -+ _cancel_timer_ex(&(pLed1->BlinkTimer)); -+ else -+ pLed1->bLedWPSBlinkInProgress = _TRUE; -+ -+ pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP; -+ pLed1->BlinkTimes = 10; -+ if( pLed1->bLedOn ) -+ pLed1->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed1->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_NORMAL_INTERVAL); -+ -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ -+ if( pLed->bLedNoLinkBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedNoLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedLinkBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedLinkBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedWPSBlinkInProgress ) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedWPSBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedScanBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedScanBlinkInProgress = _FALSE; -+ } -+ if( pLed->bLedStartToLinkBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedStartToLinkBlinkInProgress = _FALSE; -+ } -+ -+ if( pLed1->bLedWPSBlinkInProgress ) -+ { -+ _cancel_timer_ex(&(pLed1->BlinkTimer)); -+ pLed1->bLedWPSBlinkInProgress = _FALSE; -+ } -+ -+ pLed1->BlinkingLedState = LED_UNKNOWN; -+ SwLedOff(padapter, pLed); -+ SwLedOff(padapter, pLed1); -+ break; -+ -+ default: -+ break; -+ -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Led %d\n", pLed->CurrLedState)); -+} -+ -+ -+ -+ //Sercomm-Belkin, added by chiyoko, 20090415 -+static void -+SwLedControlMode5( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ PLED_871x pLed = &(ledpriv->SwLed0); -+ -+ if(pHalData->EEPROMCustomerID == RT_CID_819x_CAMEO) -+ pLed = &(ledpriv->SwLed1); -+ -+ switch(LedAction) -+ { -+ case LED_CTL_POWER_ON: -+ case LED_CTL_NO_LINK: -+ case LED_CTL_LINK: //solid blue -+ pLed->CurrLedState = RTW_LED_ON; -+ pLed->BlinkingLedState = RTW_LED_ON; -+ -+ _set_timer(&(pLed->BlinkTimer), 0); -+ break; -+ -+ case LED_CTL_SITE_SURVEY: -+ if((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)) -+ ; -+ else if(pLed->bLedScanBlinkInProgress ==_FALSE) -+ { -+ if(pLed->bLedBlinkInProgress ==_TRUE) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ pLed->bLedScanBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_SCAN_BLINK; -+ pLed->BlinkTimes = 24; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_SCAN_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_TX: -+ case LED_CTL_RX: -+ if(pLed->bLedBlinkInProgress ==_FALSE) -+ { -+ if(pLed->CurrLedState == LED_SCAN_BLINK) -+ { -+ return; -+ } -+ pLed->bLedBlinkInProgress = _TRUE; -+ pLed->CurrLedState = LED_TXRX_BLINK; -+ pLed->BlinkTimes = 2; -+ if( pLed->bLedOn ) -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ else -+ pLed->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed->BlinkTimer), LED_BLINK_FASTER_INTERVAL_ALPHA); -+ } -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ pLed->CurrLedState = RTW_LED_OFF; -+ pLed->BlinkingLedState = RTW_LED_OFF; -+ -+ if( pLed->bLedBlinkInProgress) -+ { -+ _cancel_timer_ex(&(pLed->BlinkTimer)); -+ pLed->bLedBlinkInProgress = _FALSE; -+ } -+ -+ SwLedOff(padapter, pLed); -+ break; -+ -+ default: -+ break; -+ -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Led %d\n", pLed->CurrLedState)); -+} -+ -+ //WNC-Corega, added by chiyoko, 20090902 -+static void -+SwLedControlMode6( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ PLED_871x pLed0 = &(ledpriv->SwLed0); -+ -+ switch(LedAction) -+ { -+ case LED_CTL_POWER_ON: -+ case LED_CTL_LINK: -+ case LED_CTL_NO_LINK: -+ _cancel_timer_ex(&(pLed0->BlinkTimer)); -+ pLed0->CurrLedState = RTW_LED_ON; -+ pLed0->BlinkingLedState = RTW_LED_ON; -+ _set_timer(&(pLed0->BlinkTimer), 0); -+ break; -+ -+ case LED_CTL_POWER_OFF: -+ SwLedOff(padapter, pLed0); -+ break; -+ -+ default: -+ break; -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("ledcontrol 6 Led %d\n", pLed0->CurrLedState)); -+} -+ -+ -+// -+// Description: -+// Dispatch LED action according to pHalData->LedStrategy. -+// -+static void -+LedControl871x( -+ _adapter *padapter, -+ LED_CTL_MODE LedAction -+ ) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ -+ if( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE) -+ ||(padapter->hw_init_completed == _FALSE) ) -+ { -+ return; -+ } -+ -+ -+ if( ledpriv->bRegUseLed == _FALSE) -+ return; -+ -+ //if (!priv->up) -+ // return; -+ -+ //if(priv->bInHctTest) -+ // return; -+ -+ if( (padapter->pwrctrlpriv.rf_pwrstate != rf_on && -+ padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) && -+ (LedAction == LED_CTL_TX || LedAction == LED_CTL_RX || -+ LedAction == LED_CTL_SITE_SURVEY || -+ LedAction == LED_CTL_LINK || -+ LedAction == LED_CTL_NO_LINK || -+ LedAction == LED_CTL_POWER_ON) ) -+ { -+ return; -+ } -+ -+ switch(ledpriv->LedStrategy) -+ { -+ case SW_LED_MODE0: -+ //SwLedControlMode0(padapter, LedAction); -+ break; -+ -+ case SW_LED_MODE1: -+ SwLedControlMode1(padapter, LedAction); -+ break; -+ case SW_LED_MODE2: -+ SwLedControlMode2(padapter, LedAction); -+ break; -+ -+ case SW_LED_MODE3: -+ SwLedControlMode3(padapter, LedAction); -+ break; -+ -+ case SW_LED_MODE4: -+ SwLedControlMode4(padapter, LedAction); -+ break; -+ -+ case SW_LED_MODE5: -+ SwLedControlMode5(padapter, LedAction); -+ break; -+ -+ case SW_LED_MODE6: -+ SwLedControlMode6(padapter, LedAction); -+ break; -+ -+ default: -+ break; -+ } -+ -+ RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("LedStrategy:%d, LedAction %d\n", ledpriv->LedStrategy,LedAction)); -+} -+ -+// -+// Description: -+// Initialize all LED_871x objects. -+// -+void -+rtl8192cu_InitSwLeds( -+ _adapter *padapter -+ ) -+{ -+ struct led_priv *pledpriv = &(padapter->ledpriv); -+ -+ pledpriv->LedControlHandler = LedControl871x; -+ -+ InitLed871x(padapter, &(pledpriv->SwLed0), LED_PIN_LED0); -+ -+ InitLed871x(padapter,&(pledpriv->SwLed1), LED_PIN_LED1); -+} -+ -+ -+// -+// Description: -+// DeInitialize all LED_819xUsb objects. -+// -+void -+rtl8192cu_DeInitSwLeds( -+ _adapter *padapter -+ ) -+{ -+ struct led_priv *ledpriv = &(padapter->ledpriv); -+ -+ DeInitLed871x( &(ledpriv->SwLed0) ); -+ DeInitLed871x( &(ledpriv->SwLed1) ); -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c -@@ -0,0 +1,229 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTL8192CU_RECV_C_ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#include -+#include -+ -+#include -+ -+ -+void rtl8192cu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf) -+{ -+ -+ precvbuf->transfer_len = 0; -+ -+ precvbuf->len = 0; -+ -+ precvbuf->ref_cnt = 0; -+ -+ if(precvbuf->pbuf) -+ { -+ precvbuf->pdata = precvbuf->phead = precvbuf->ptail = precvbuf->pbuf; -+ precvbuf->pend = precvbuf->pdata + MAX_RECVBUF_SZ; -+ } -+ -+} -+ -+int rtl8192cu_init_recv_priv(_adapter *padapter) -+{ -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ int i, res = _SUCCESS; -+ struct recv_buf *precvbuf; -+ -+#ifdef CONFIG_RECV_THREAD_MODE -+ _rtw_init_sema(&precvpriv->recv_sema, 0);//will be removed -+ _rtw_init_sema(&precvpriv->terminate_recvthread_sema, 0);//will be removed -+#endif -+ -+#ifdef PLATFORM_LINUX -+ tasklet_init(&precvpriv->recv_tasklet, -+ (void(*)(unsigned long))rtl8192cu_recv_tasklet, -+ (unsigned long)padapter); -+#endif -+ -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+#ifdef PLATFORM_LINUX -+ precvpriv->int_in_urb = usb_alloc_urb(0, GFP_KERNEL); -+ if(precvpriv->int_in_urb == NULL){ -+ DBG_8192C("alloc_urb for interrupt in endpoint fail !!!!\n"); -+ } -+#endif -+ precvpriv->int_in_buf = rtw_zmalloc(sizeof(INTERRUPT_MSG_FORMAT_EX)); -+ if(precvpriv->int_in_buf == NULL){ -+ DBG_8192C("alloc_mem for interrupt in endpoint fail !!!!\n"); -+ } -+#endif -+ -+ //init recv_buf -+ _rtw_init_queue(&precvpriv->free_recv_buf_queue); -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -+ _rtw_init_queue(&precvpriv->recv_buf_pending_queue); -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_RX -+ -+ precvpriv->pallocated_recv_buf = rtw_zmalloc(NR_RECVBUFF *sizeof(struct recv_buf) + 4); -+ if(precvpriv->pallocated_recv_buf==NULL){ -+ res= _FAIL; -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("alloc recv_buf fail!\n")); -+ goto exit; -+ } -+ _rtw_memset(precvpriv->pallocated_recv_buf, 0, NR_RECVBUFF *sizeof(struct recv_buf) + 4); -+ -+ precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_recv_buf), 4); -+ //precvpriv->precv_buf = precvpriv->pallocated_recv_buf + 4 - -+ // ((uint) (precvpriv->pallocated_recv_buf) &(4-1)); -+ -+ -+ precvbuf = (struct recv_buf*)precvpriv->precv_buf; -+ -+ for(i=0; i < NR_RECVBUFF ; i++) -+ { -+ _rtw_init_listhead(&precvbuf->list); -+ -+ _rtw_spinlock_init(&precvbuf->recvbuf_lock); -+ -+ precvbuf->alloc_sz = MAX_RECVBUF_SZ; -+ -+ res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf); -+ if(res==_FAIL) -+ break; -+ -+ precvbuf->ref_cnt = 0; -+ precvbuf->adapter =padapter; -+ -+ -+ //rtw_list_insert_tail(&precvbuf->list, &(precvpriv->free_recv_buf_queue.queue)); -+ -+ precvbuf++; -+ -+ } -+ -+ precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF; -+ -+#ifdef PLATFORM_LINUX -+ -+ skb_queue_head_init(&precvpriv->rx_skb_queue); -+ -+#ifdef CONFIG_PREALLOC_RECV_SKB -+ { -+ int i; -+ SIZE_PTR tmpaddr=0; -+ SIZE_PTR alignment=0; -+ struct sk_buff *pskb=NULL; -+ -+ skb_queue_head_init(&precvpriv->free_recv_skb_queue); -+ -+ for(i=0; idev = padapter->pnetdev; -+ -+ tmpaddr = (SIZE_PTR)pskb->data; -+ alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1); -+ skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignment)); -+ -+ skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb); -+ } -+ -+ pskb=NULL; -+ -+ } -+ } -+#endif -+ -+#endif -+ -+exit: -+ -+ return res; -+ -+} -+ -+void rtl8192cu_free_recv_priv (_adapter *padapter) -+{ -+ int i; -+ struct recv_buf *precvbuf; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ precvbuf = (struct recv_buf *)precvpriv->precv_buf; -+ -+ for(i=0; i < NR_RECVBUFF ; i++) -+ { -+ rtw_os_recvbuf_resource_free(padapter, precvbuf); -+ precvbuf++; -+ } -+ -+ if(precvpriv->pallocated_recv_buf) -+ rtw_mfree(precvpriv->pallocated_recv_buf, NR_RECVBUFF *sizeof(struct recv_buf) + 4); -+ -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+#ifdef PLATFORM_LINUX -+ if(precvpriv->int_in_urb) -+ { -+ usb_free_urb(precvpriv->int_in_urb); -+ } -+#endif -+ if(precvpriv->int_in_buf) -+ rtw_mfree(precvpriv->int_in_buf, sizeof(INTERRUPT_MSG_FORMAT_EX)); -+#endif -+ -+#ifdef PLATFORM_LINUX -+ -+ if (skb_queue_len(&precvpriv->rx_skb_queue)) { -+ DBG_8192C(KERN_WARNING "rx_skb_queue not empty\n"); -+ } -+ -+ rtw_skb_queue_purge(&precvpriv->rx_skb_queue); -+ -+#ifdef CONFIG_PREALLOC_RECV_SKB -+ -+ if (skb_queue_len(&precvpriv->free_recv_skb_queue)) { -+ DBG_8192C(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue)); -+ } -+ -+ rtw_skb_queue_purge(&precvpriv->free_recv_skb_queue); -+ -+#endif -+ -+#endif -+ -+} -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c -@@ -0,0 +1,1150 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RTL8192C_XMIT_C_ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+#error "Shall be Linux or Windows, but not both!\n" -+#endif -+ -+ -+s32 rtl8192cu_init_xmit_priv(_adapter *padapter) -+{ -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+#ifdef PLATFORM_LINUX -+ tasklet_init(&pxmitpriv->xmit_tasklet, -+ (void(*)(unsigned long))rtl8192cu_xmit_tasklet, -+ (unsigned long)padapter); -+#endif -+ return _SUCCESS; -+} -+ -+void rtl8192cu_free_xmit_priv(_adapter *padapter) -+{ -+} -+ -+u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe) -+{ -+ u32 addr; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ -+ switch(pattrib->qsel) -+ { -+ case 0: -+ case 3: -+ addr = BE_QUEUE_INX; -+ break; -+ case 1: -+ case 2: -+ addr = BK_QUEUE_INX; -+ break; -+ case 4: -+ case 5: -+ addr = VI_QUEUE_INX; -+ break; -+ case 6: -+ case 7: -+ addr = VO_QUEUE_INX; -+ break; -+ case 0x10: -+ addr = BCN_QUEUE_INX; -+ break; -+ case 0x11://BC/MC in PS (HIQ) -+ addr = HIGH_QUEUE_INX; -+ break; -+ case 0x12: -+ addr = MGT_QUEUE_INX; -+ break; -+ default: -+ addr = BE_QUEUE_INX; -+ break; -+ -+ } -+ -+ return addr; -+ -+} -+ -+int urb_zero_packet_chk(_adapter *padapter, int sz) -+{ -+ int blnSetTxDescOffset; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); -+ -+ if ( pdvobj->ishighspeed ) -+ { -+ if ( ( (sz + TXDESC_SIZE) % 512 ) == 0 ) { -+ blnSetTxDescOffset = 1; -+ } else { -+ blnSetTxDescOffset = 0; -+ } -+ } -+ else -+ { -+ if ( ( (sz + TXDESC_SIZE) % 64 ) == 0 ) { -+ blnSetTxDescOffset = 1; -+ } else { -+ blnSetTxDescOffset = 0; -+ } -+ } -+ -+ return blnSetTxDescOffset; -+ -+} -+ -+void rtl8192cu_cal_txdesc_chksum(struct tx_desc *ptxdesc) -+{ -+ u16 *usPtr = (u16*)ptxdesc; -+ u32 count = 16; // (32 bytes / 2 bytes per XOR) => 16 times -+ u32 index; -+ u16 checksum = 0; -+ -+ //Clear first -+ ptxdesc->txdw7 &= cpu_to_le32(0xffff0000); -+ -+ for(index = 0 ; index < count ; index++){ -+ checksum = checksum ^ le16_to_cpu(*(usPtr + index)); -+ } -+ -+ ptxdesc->txdw7 |= cpu_to_le32(0x0000ffff&checksum); -+ -+} -+ -+void fill_txdesc_sectype(struct pkt_attrib *pattrib, struct tx_desc *ptxdesc) -+{ -+ if ((pattrib->encrypt > 0) && !pattrib->bswenc) -+ { -+ switch (pattrib->encrypt) -+ { -+ //SEC_TYPE -+ case _WEP40_: -+ case _WEP104_: -+ ptxdesc->txdw1 |= cpu_to_le32((0x01<<22)&0x00c00000); -+ break; -+ case _TKIP_: -+ case _TKIP_WTMIC_: -+ //ptxdesc->txdw1 |= cpu_to_le32((0x02<<22)&0x00c00000); -+ ptxdesc->txdw1 |= cpu_to_le32((0x01<<22)&0x00c00000); -+ break; -+ case _AES_: -+ ptxdesc->txdw1 |= cpu_to_le32((0x03<<22)&0x00c00000); -+ break; -+ case _NO_PRIVACY_: -+ default: -+ break; -+ -+ } -+ -+ } -+ -+} -+ -+static void fill_txdesc_vcs(struct pkt_attrib *pattrib, u32 *pdw) -+{ -+ //DBG_8192C("cvs_mode=%d\n", pattrib->vcs_mode); -+ -+ switch(pattrib->vcs_mode) -+ { -+ case RTS_CTS: -+ *pdw |= cpu_to_le32(BIT(12)); -+ break; -+ case CTS_TO_SELF: -+ *pdw |= cpu_to_le32(BIT(11)); -+ break; -+ case NONE_VCS: -+ default: -+ break; -+ } -+ -+ if(pattrib->vcs_mode) { -+ *pdw |= cpu_to_le32(BIT(13)); -+ -+ // Set RTS BW -+ if(pattrib->ht_en) -+ { -+ *pdw |= (pattrib->bwmode&HT_CHANNEL_WIDTH_40)? cpu_to_le32(BIT(27)):0; -+ -+ if(pattrib->ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER) -+ *pdw |= cpu_to_le32((0x01<<28)&0x30000000); -+ else if(pattrib->ch_offset == HAL_PRIME_CHNL_OFFSET_UPPER) -+ *pdw |= cpu_to_le32((0x02<<28)&0x30000000); -+ else if(pattrib->ch_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE) -+ *pdw |= 0; -+ else -+ *pdw |= cpu_to_le32((0x03<<28)&0x30000000); -+ } -+ } -+} -+ -+static void fill_txdesc_phy(struct pkt_attrib *pattrib, u32 *pdw) -+{ -+ //DBG_8192C("bwmode=%d, ch_off=%d\n", pattrib->bwmode, pattrib->ch_offset); -+ -+ if(pattrib->ht_en) -+ { -+ *pdw |= (pattrib->bwmode&HT_CHANNEL_WIDTH_40)? cpu_to_le32(BIT(25)):0; -+ -+ if(pattrib->ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER) -+ *pdw |= cpu_to_le32((0x01<<20)&0x00300000); -+ else if(pattrib->ch_offset == HAL_PRIME_CHNL_OFFSET_UPPER) -+ *pdw |= cpu_to_le32((0x02<<20)&0x00300000); -+ else if(pattrib->ch_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE) -+ *pdw |= 0; -+ else -+ *pdw |= cpu_to_le32((0x03<<20)&0x00300000); -+ } -+} -+ -+static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bagg_pkt) -+{ -+ int pull=0; -+ uint qsel; -+ _adapter *padapter = pxmitframe->padapter; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct tx_desc *ptxdesc = (struct tx_desc *)pmem; -+ struct ht_priv *phtpriv = &pmlmepriv->htpriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ sint bmcst = IS_MCAST(pattrib->ra); -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ -+#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX -+ if((_FALSE == bagg_pkt) && (urb_zero_packet_chk(padapter, sz)==0)) -+ { -+ ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ); -+ pull = 1; -+ pxmitframe->pkt_offset --; -+ } -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ -+ _rtw_memset(ptxdesc, 0, sizeof(struct tx_desc)); -+ -+ if((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) -+ { -+ //DBG_8192C("pxmitframe->frame_tag == DATA_FRAMETAG\n"); -+ -+ //offset 4 -+ ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x1f); -+ -+ qsel = (uint)(pattrib->qsel & 0x0000001f); -+ ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00); -+ -+ ptxdesc->txdw1 |= cpu_to_le32((pattrib->raid<< 16) & 0x000f0000); -+ -+ fill_txdesc_sectype(pattrib, ptxdesc); -+ -+ if(pattrib->ampdu_en==_TRUE) -+ ptxdesc->txdw1 |= cpu_to_le32(BIT(5));//AGG EN -+ else -+ ptxdesc->txdw1 |= cpu_to_le32(BIT(6));//AGG BK -+ -+ //offset 8 -+ -+ -+ //offset 12 -+ ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<<16)&0xffff0000); -+ -+ -+ //offset 16 , offset 20 -+ if (pattrib->qos_en) -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(6));//QoS -+ -+ if ((pattrib->ether_type != 0x888e) && (pattrib->ether_type != 0x0806) && (pattrib->dhcp_pkt != 1)) -+ { -+ //Non EAP & ARP & DHCP type data packet -+ -+ fill_txdesc_vcs(pattrib, &ptxdesc->txdw4); -+ fill_txdesc_phy(pattrib, &ptxdesc->txdw4); -+ -+ ptxdesc->txdw4 |= cpu_to_le32(0x00000008);//RTS Rate=24M -+ ptxdesc->txdw5 |= cpu_to_le32(0x0001ff00);// -+ //ptxdesc->txdw5 |= cpu_to_le32(0x0000000b);//DataRate - 54M -+ -+ //use REG_INIDATA_RATE_SEL value -+ ptxdesc->txdw5 |= cpu_to_le32(pdmpriv->INIDATA_RATE[pattrib->mac_id]); -+ -+ if(0)//for driver dbg -+ { -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(8));//driver uses rate -+ -+ if(pattrib->ht_en) -+ ptxdesc->txdw5 |= cpu_to_le32(BIT(6));//SGI -+ -+ ptxdesc->txdw5 |= cpu_to_le32(0x00000013);//init rate - mcs7 -+ } -+ -+ } -+ else -+ { -+ // EAP data packet and ARP packet. -+ // Use the 1M data rate to send the EAP/ARP packet. -+ // This will maybe make the handshake smooth. -+ -+ ptxdesc->txdw1 |= cpu_to_le32(BIT(6));//AGG BK -+ -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(8));//driver uses rate -+ -+ if (pmlmeinfo->preamble_mode == PREAMBLE_SHORT) -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(24));// DATA_SHORT -+ -+ ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate)); -+ } -+ -+ //offset 24 -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ if ( pattrib->hw_tcp_csum == 1 ) { -+ // ptxdesc->txdw6 = 0; // clear TCP_CHECKSUM and IP_CHECKSUM. It's zero already!! -+ u8 ip_hdr_offset = 32 + pattrib->hdrlen + pattrib->iv_len + 8; -+ ptxdesc->txdw7 = (1 << 31) | (ip_hdr_offset << 16); -+ DBG_8192C("ptxdesc->txdw7 = %08x\n", ptxdesc->txdw7); -+ } -+#endif -+ } -+ else if((pxmitframe->frame_tag&0x0f)== MGNT_FRAMETAG) -+ { -+ //DBG_8192C("pxmitframe->frame_tag == MGNT_FRAMETAG\n"); -+ -+ //offset 4 -+ ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x1f); -+ -+ qsel = (uint)(pattrib->qsel&0x0000001f); -+ ptxdesc->txdw1 |= cpu_to_le32((qsel<txdw1 |= cpu_to_le32((pattrib->raid<< 16) & 0x000f0000); -+ -+ //fill_txdesc_sectype(pattrib, ptxdesc); -+ -+ //offset 8 -+#ifdef CONFIG_XMIT_ACK -+ //CCX-TXRPT ack for xmit mgmt frames. -+ if (pxmitframe->ack_report) { -+ ptxdesc->txdw2 |= cpu_to_le32(BIT(19)); -+ #ifdef DBG_CCX -+ DBG_871X("%s set ccx\n", __func__); -+ #endif -+ } -+#endif //CONFIG_XMIT_ACK -+ -+ //offset 12 -+ ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<<16)&0xffff0000); -+ -+ //offset 16 -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(8));//driver uses rate -+ -+ //offset 20 -+ ptxdesc->txdw5 |= cpu_to_le32(BIT(17));//retry limit enable -+ if(pattrib->retry_ctrl == _TRUE) -+ { -+#ifdef CONFIG_P2P -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+#ifdef CONFIG_INTEL_WIDI -+ if(padapter->mlmepriv.widi_enable == _TRUE) -+ ptxdesc->txdw5 |= cpu_to_le32(0x00180000);//retry limit = 6 -+ else -+#endif //CONFIG_INTEL_WIDI -+ ptxdesc->txdw5 |= cpu_to_le32(0x00080000);//retry limit = 2 -+ } -+ else -+#endif //CONFIG_P2P -+ ptxdesc->txdw5 |= cpu_to_le32(0x00180000);//retry limit = 6 -+ } -+ else -+ ptxdesc->txdw5 |= cpu_to_le32(0x00300000);//retry limit = 12 -+ -+#ifdef CONFIG_INTEL_PROXIM -+ if((padapter->proximity.proxim_on==_TRUE)&&(pattrib->intel_proxim==_TRUE)){ -+ printk("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate); -+ ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); -+ } -+ else -+#endif -+ { -+ ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate)); -+ } -+ } -+ else if((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG) -+ { -+ DBG_8192C("pxmitframe->frame_tag == TXAGG_FRAMETAG\n"); -+ } -+#ifdef CONFIG_MP_INCLUDED -+ else if((pxmitframe->frame_tag&0x0f) == MP_FRAMETAG) -+ { -+ fill_txdesc_for_mp(padapter, ptxdesc); -+ } -+#endif -+ else -+ { -+ DBG_8192C("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag); -+ -+ //offset 4 -+ ptxdesc->txdw1 |= cpu_to_le32((4)&0x1f);//CAM_ID(MAC_ID) -+ -+ ptxdesc->txdw1 |= cpu_to_le32((6<< 16) & 0x000f0000);//raid -+ -+ //offset 8 -+ -+ //offset 12 -+ ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<<16)&0xffff0000); -+ -+ //offset 16 -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(8));//driver uses rate -+ -+ //offset 20 -+ ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate)); -+ } -+ -+ // 2009.11.05. tynli_test. Suggested by SD4 Filen for FW LPS. -+ // (1) The sequence number of each non-Qos frame / broadcast / multicast / -+ // mgnt frame should be controled by Hw because Fw will also send null data -+ // which we cannot control when Fw LPS enable. -+ // --> default enable non-Qos data sequense number. 2010.06.23. by tynli. -+ // (2) Enable HW SEQ control for beacon packet, because we use Hw beacon. -+ // (3) Use HW Qos SEQ to control the seq num of Ext port non-Qos packets. -+ // 2010.06.23. Added by tynli. -+ if(!pattrib->qos_en) -+ { -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(7)); // Hw set sequence number -+ ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29. -+ } -+ -+ //offset 0 -+ ptxdesc->txdw0 |= cpu_to_le32(sz&0x0000ffff); -+ ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); -+ ptxdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE+OFFSET_SZ)<txdw0 |= cpu_to_le32(BIT(24)); -+ } -+ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("offset0-txdesc=0x%x\n", ptxdesc->txdw0)); -+ -+ //offset 4 -+ // pkt_offset, unit:8 bytes padding -+ if (pxmitframe->pkt_offset > 0) -+ ptxdesc->txdw1 |= cpu_to_le32((pxmitframe->pkt_offset << 26) & 0x7c000000); -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ if (pxmitframe->agg_num > 1) -+ ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << 24) & 0xff000000); -+#endif -+ -+ rtl8192cu_cal_txdesc_chksum(ptxdesc); -+ -+ return pull; -+ -+} -+ -+static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ s32 ret = _SUCCESS; -+ s32 inner_ret = _SUCCESS; -+ int t, sz, w_sz, pull=0; -+ u8 *mem_addr; -+ u32 ff_hwaddr; -+ struct xmit_buf *pxmitbuf = pxmitframe->pxmitbuf; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ if ((pxmitframe->frame_tag == DATA_FRAMETAG) && -+ (pxmitframe->attrib.ether_type != 0x0806) && -+ (pxmitframe->attrib.ether_type != 0x888e) && -+ (pxmitframe->attrib.dhcp_pkt != 1)) -+ { -+ rtw_issue_addbareq_cmd(padapter, pxmitframe); -+ } -+ -+ mem_addr = pxmitframe->buf_addr; -+ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_dump_xframe()\n")); -+ -+ for (t = 0; t < pattrib->nr_frags; t++) -+ { -+ if (inner_ret != _SUCCESS && ret == _SUCCESS) -+ ret = _FAIL; -+ -+ if (t != (pattrib->nr_frags - 1)) -+ { -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("pattrib->nr_frags=%d\n", pattrib->nr_frags)); -+ -+ sz = pxmitpriv->frag_len; -+ sz = sz - 4 - (psecuritypriv->sw_encrypt ? 0 : pattrib->icv_len); -+ } -+ else //no frag -+ { -+ sz = pattrib->last_txcmdsz; -+ } -+ -+ pull = update_txdesc(pxmitframe, mem_addr, sz, _FALSE); -+ -+ if(pull) -+ { -+ mem_addr += PACKET_OFFSET_SZ; //pull txdesc head -+ -+ //pxmitbuf ->pbuf = mem_addr; -+ pxmitframe->buf_addr = mem_addr; -+ -+ w_sz = sz + TXDESC_SIZE; -+ } -+ else -+ { -+ w_sz = sz + TXDESC_SIZE + PACKET_OFFSET_SZ; -+ } -+ -+ ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe); -+ -+ inner_ret = rtw_write_port(padapter, ff_hwaddr, w_sz, (unsigned char*)pxmitbuf); -+ -+ rtw_count_tx_stats(padapter, pxmitframe, sz); -+ -+ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_write_port, w_sz=%d\n", w_sz)); -+ //DBG_8192C("rtw_write_port, w_sz=%d, sz=%d, txdesc_sz=%d, tid=%d\n", w_sz, sz, w_sz-sz, pattrib->priority); -+ -+ mem_addr += w_sz; -+ -+ mem_addr = (u8 *)RND4(((SIZE_PTR)(mem_addr))); -+ -+ } -+ -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ if (ret != _SUCCESS) -+ rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_UNKNOWN); -+ -+ return ret; -+} -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+static u32 xmitframe_need_length(struct xmit_frame *pxmitframe) -+{ -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ -+ u32 len = 0; -+ -+ // no consider fragement -+ len = pattrib->hdrlen + pattrib->iv_len + -+ SNAP_SIZE + sizeof(u16) + -+ pattrib->pktlen + -+ ((pattrib->bswenc) ? pattrib->icv_len : 0); -+ -+ if(pattrib->encrypt ==_TKIP_) -+ len += 8; -+ -+ return len; -+} -+ -+#define IDEA_CONDITION 1 // check all packets before enqueue -+s32 rtl8192cu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct xmit_frame *pxmitframe = NULL; -+ struct xmit_frame *pfirstframe = NULL; -+ -+ // aggregate variable -+ struct hw_xmit *phwxmit; -+ struct sta_info *psta = NULL; -+ struct tx_servq *ptxservq = NULL; -+ -+ _irqL irqL; -+ _list *xmitframe_plist = NULL, *xmitframe_phead = NULL; -+ -+ u32 pbuf; // next pkt address -+ u32 pbuf_tail; // last pkt tail -+ u32 len; // packet length, except TXDESC_SIZE and PKT_OFFSET -+ -+ u32 bulkSize = pHalData->UsbBulkOutSize; -+ u8 descCount; -+ u32 bulkPtr; -+ -+ // dump frame variable -+ u32 ff_hwaddr; -+ -+#ifndef IDEA_CONDITION -+ int res = _SUCCESS; -+#endif -+ -+ RT_TRACE(_module_rtl8192c_xmit_c_, _drv_info_, ("+xmitframe_complete\n")); -+ -+ -+ // check xmitbuffer is ok -+ if (pxmitbuf == NULL) { -+ pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); -+ if (pxmitbuf == NULL) return _FALSE; -+ } -+ -+ -+ //3 1. pick up first frame -+ do { -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ pxmitframe = rtw_dequeue_xframe(pxmitpriv, pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); -+ if (pxmitframe == NULL) { -+ // no more xmit frame, release xmit buffer -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+ return _FALSE; -+ } -+ -+ -+#ifndef IDEA_CONDITION -+ if (pxmitframe->frame_tag != DATA_FRAMETAG) { -+ RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_, -+ ("xmitframe_complete: frame tag(%d) is not DATA_FRAMETAG(%d)!\n", -+ pxmitframe->frame_tag, DATA_FRAMETAG)); -+// rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ continue; -+ } -+ -+ // TID 0~15 -+ if ((pxmitframe->attrib.priority < 0) || -+ (pxmitframe->attrib.priority > 15)) { -+ RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_, -+ ("xmitframe_complete: TID(%d) should be 0~15!\n", -+ pxmitframe->attrib.priority)); -+// rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ continue; -+ } -+#endif -+ -+ pxmitframe->pxmitbuf = pxmitbuf; -+ pxmitframe->buf_addr = pxmitbuf->pbuf; -+ pxmitbuf->priv_data = pxmitframe; -+ -+ //pxmitframe->agg_num = 1; // alloc xmitframe should assign to 1. -+ pxmitframe->pkt_offset = 1; // first frame of aggregation, reserve offset -+ -+ -+ if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) { -+ DBG_871X("%s coalesce 1st xmitframe failed \n",__FUNCTION__); -+ continue; -+ } -+ -+ -+ // always return ndis_packet after rtw_xmitframe_coalesce -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ -+ break; -+ } while (1); -+ -+ //3 2. aggregate same priority and same DA(AP or STA) frames -+ pfirstframe = pxmitframe; -+ len = xmitframe_need_length(pfirstframe) + TXDESC_OFFSET; -+ pbuf_tail = len; -+ pbuf = _RND8(pbuf_tail); -+ -+ // check pkt amount in one bluk -+ descCount = 0; -+ bulkPtr = bulkSize; -+ if (pbuf < bulkPtr) -+ descCount++; -+ else { -+ descCount = 0; -+ bulkPtr = ((pbuf / bulkSize) + 1) * bulkSize; // round to next bulkSize -+ } -+ -+ // dequeue same priority packet from station tx queue -+ psta = pfirstframe->attrib.psta; -+ switch (pfirstframe->attrib.priority) { -+ case 1: -+ case 2: -+ ptxservq = &(psta->sta_xmitpriv.bk_q); -+ phwxmit = pxmitpriv->hwxmits + 3; -+ break; -+ -+ case 4: -+ case 5: -+ ptxservq = &(psta->sta_xmitpriv.vi_q); -+ phwxmit = pxmitpriv->hwxmits + 1; -+ break; -+ -+ case 6: -+ case 7: -+ ptxservq = &(psta->sta_xmitpriv.vo_q); -+ phwxmit = pxmitpriv->hwxmits; -+ break; -+ -+ case 0: -+ case 3: -+ default: -+ ptxservq = &(psta->sta_xmitpriv.be_q); -+ phwxmit = pxmitpriv->hwxmits + 2; -+ break; -+ } -+ -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ xmitframe_phead = get_list_head(&ptxservq->sta_pending); -+ xmitframe_plist = get_next(xmitframe_phead); -+ while (rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist) == _FALSE) -+ { -+ pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list); -+ xmitframe_plist = get_next(xmitframe_plist); -+ -+ len = xmitframe_need_length(pxmitframe) + TXDESC_SIZE; // no offset -+ if (pbuf + len > MAX_XMITBUF_SZ) break; -+ -+ rtw_list_delete(&pxmitframe->list); -+ ptxservq->qcnt--; -+ phwxmit->accnt--; -+ -+#ifndef IDEA_CONDITION -+ // suppose only data frames would be in queue -+ if (pxmitframe->frame_tag != DATA_FRAMETAG) { -+ RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_, -+ ("xmitframe_complete: frame tag(%d) is not DATA_FRAMETAG(%d)!\n", -+ pxmitframe->frame_tag, DATA_FRAMETAG)); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ continue; -+ } -+ -+ // TID 0~15 -+ if ((pxmitframe->attrib.priority < 0) || -+ (pxmitframe->attrib.priority > 15)) { -+ RT_TRACE(_module_rtl8192c_xmit_c_, _drv_err_, -+ ("xmitframe_complete: TID(%d) should be 0~15!\n", -+ pxmitframe->attrib.priority)); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ continue; -+ } -+#endif -+ -+// pxmitframe->pxmitbuf = pxmitbuf; -+ pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf; -+ -+ pxmitframe->agg_num = 0; // not first frame of aggregation -+ pxmitframe->pkt_offset = 0; // not first frame of aggregation, no need to reserve offset -+ -+ if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) { -+ DBG_871X("%s coalesce failed \n",__FUNCTION__); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ continue; -+ } -+ -+ // always return ndis_packet after rtw_xmitframe_coalesce -+ rtw_os_xmit_complete(padapter, pxmitframe); -+ -+ // (len - TXDESC_SIZE) == pxmitframe->attrib.last_txcmdsz -+ update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_txcmdsz, _TRUE); -+ -+ // don't need xmitframe any more -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ // handle pointer and stop condition -+ pbuf_tail = pbuf + len; -+ pbuf = _RND8(pbuf_tail); -+ -+ pfirstframe->agg_num++; -+ if (MAX_TX_AGG_PACKET_NUMBER == pfirstframe->agg_num) -+ break; -+ -+ if (pbuf < bulkPtr) { -+ descCount++; -+ if (descCount == pHalData->UsbTxAggDescNum) -+ break; -+ } else { -+ descCount = 0; -+ bulkPtr = ((pbuf / bulkSize) + 1) * bulkSize; -+ } -+ } -+ if (_rtw_queue_empty(&ptxservq->sta_pending) == _TRUE) -+ rtw_list_delete(&ptxservq->tx_pending); -+ -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ if ((pfirstframe->attrib.ether_type != 0x0806) && -+ (pfirstframe->attrib.ether_type != 0x888e) && -+ (pfirstframe->attrib.dhcp_pkt != 1)) -+ { -+ rtw_issue_addbareq_cmd(padapter, pfirstframe); -+ } -+ -+#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX -+ //3 3. update first frame txdesc -+ if ((pbuf_tail % bulkSize) == 0) { -+ // remove pkt_offset -+ pbuf_tail -= PACKET_OFFSET_SZ; -+ pfirstframe->buf_addr += PACKET_OFFSET_SZ; -+ pfirstframe->pkt_offset = 0; -+ } -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ update_txdesc(pfirstframe, pfirstframe->buf_addr, pfirstframe->attrib.last_txcmdsz, _TRUE); -+ -+ //3 4. write xmit buffer to USB FIFO -+ ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe); -+ -+ // xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr -+ rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf); -+ -+ -+ //3 5. update statisitc -+ pbuf_tail -= (pfirstframe->agg_num * TXDESC_SIZE); -+ if (pfirstframe->pkt_offset == 1) pbuf_tail -= PACKET_OFFSET_SZ; -+ -+ rtw_count_tx_stats(padapter, pfirstframe, pbuf_tail); -+ -+ rtw_free_xmitframe(pxmitpriv, pfirstframe); -+ -+ return _TRUE; -+} -+ -+#else -+ -+s32 rtl8192cu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) -+{ -+ -+ struct hw_xmit *phwxmits; -+ sint hwentry; -+ struct xmit_frame *pxmitframe=NULL; -+ int res=_SUCCESS, xcnt = 0; -+ -+ phwxmits = pxmitpriv->hwxmits; -+ hwentry = pxmitpriv->hwxmit_entry; -+ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete()\n")); -+ -+ if(pxmitbuf==NULL) -+ { -+ pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); -+ if(!pxmitbuf) -+ { -+ return _FALSE; -+ } -+ } -+ -+ -+ do -+ { -+ pxmitframe = rtw_dequeue_xframe(pxmitpriv, phwxmits, hwentry); -+ -+ if(pxmitframe) -+ { -+ pxmitframe->pxmitbuf = pxmitbuf; -+ -+ pxmitframe->buf_addr = pxmitbuf->pbuf; -+ -+ pxmitbuf->priv_data = pxmitframe; -+ -+ if((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) -+ { -+ if(pxmitframe->attrib.priority<=15)//TID0~15 -+ { -+ res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); -+ } -+ -+ rtw_os_xmit_complete(padapter, pxmitframe);//always return ndis_packet after rtw_xmitframe_coalesce -+ } -+ -+ -+ RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("xmitframe_complete(): rtw_dump_xframe\n")); -+ -+ -+ if(res == _SUCCESS) -+ { -+ rtw_dump_xframe(padapter, pxmitframe); -+ } -+ else -+ { -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ } -+ -+ xcnt++; -+ -+ } -+ else -+ { -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+ return _FALSE; -+ } -+ -+ break; -+ -+ }while(0/*xcnt < (NR_XMITFRAME >> 3)*/); -+ -+ return _TRUE; -+ -+} -+#endif -+ -+ -+ -+static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ s32 res = _SUCCESS; -+ -+ -+ res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); -+ if (res == _SUCCESS) { -+ rtw_dump_xframe(padapter, pxmitframe); -+ } -+ -+ return res; -+} -+ -+/* -+ * Return -+ * _TRUE dump packet directly -+ * _FALSE enqueue packet -+ */ -+static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ _irqL irqL; -+ s32 res; -+ struct xmit_buf *pxmitbuf = NULL; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ -+ if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) -+ goto enqueue; -+ -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ goto enqueue; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ goto enqueue; -+#endif -+ -+ pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); -+ if (pxmitbuf == NULL) -+ goto enqueue; -+ -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ pxmitframe->pxmitbuf = pxmitbuf; -+ pxmitframe->buf_addr = pxmitbuf->pbuf; -+ pxmitbuf->priv_data = pxmitframe; -+ -+ if (xmitframe_direct(padapter, pxmitframe) != _SUCCESS) { -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ } -+ -+ return _TRUE; -+ -+enqueue: -+ res = rtw_xmitframe_enqueue(padapter, pxmitframe); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ if (res != _SUCCESS) { -+ RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("pre_xmitframe: enqueue xmitframe fail\n")); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ // Trick, make the statistics correct -+ pxmitpriv->tx_pkts--; -+ pxmitpriv->tx_drop++; -+ return _TRUE; -+ } -+ -+ return _FALSE; -+} -+ -+s32 rtl8192cu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe) -+{ -+ return rtw_dump_xframe(padapter, pmgntframe); -+} -+ -+/* -+ * Return -+ * _TRUE dump packet directly ok -+ * _FALSE temporary can't transmit packets to hardware -+ */ -+s32 rtl8192cu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ return pre_xmitframe(padapter, pxmitframe); -+} -+ -+s32 rtl8192cu_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) -+{ -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ s32 err; -+ -+ if ((err=rtw_xmitframe_enqueue(padapter, pxmitframe)) != _SUCCESS) -+ { -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ // Trick, make the statistics correct -+ pxmitpriv->tx_pkts--; -+ pxmitpriv->tx_drop++; -+ } -+ else -+ { -+#ifdef PLATFORM_LINUX -+ tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); -+#endif -+ } -+ -+ return err; -+ -+} -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ -+static void rtl8192cu_hostap_mgnt_xmit_cb(struct urb *urb) -+{ -+#ifdef PLATFORM_LINUX -+ struct sk_buff *skb = (struct sk_buff *)urb->context; -+ -+ //DBG_8192C("%s\n", __FUNCTION__); -+ -+ rtw_skb_free(skb); -+#endif -+} -+ -+s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) -+{ -+#ifdef PLATFORM_LINUX -+ u16 fc; -+ int rc, len, pipe; -+ unsigned int bmcst, tid, qsel; -+ struct sk_buff *skb, *pxmit_skb; -+ struct urb *urb; -+ unsigned char *pxmitbuf; -+ struct tx_desc *ptxdesc; -+ struct rtw_ieee80211_hdr *tx_hdr; -+ struct hostapd_priv *phostapdpriv = padapter->phostapdpriv; -+ struct net_device *pnetdev = padapter->pnetdev; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); -+ -+ -+ //DBG_8192C("%s\n", __FUNCTION__); -+ -+ skb = pkt; -+ -+ len = skb->len; -+ tx_hdr = (struct rtw_ieee80211_hdr *)(skb->data); -+ fc = le16_to_cpu(tx_hdr->frame_ctl); -+ bmcst = IS_MCAST(tx_hdr->addr1); -+ -+ if ((fc & RTW_IEEE80211_FCTL_FTYPE) != RTW_IEEE80211_FTYPE_MGMT) -+ goto _exit; -+ -+ pxmit_skb = rtw_skb_alloc(len + TXDESC_SIZE); -+ -+ if(!pxmit_skb) -+ goto _exit; -+ -+ pxmitbuf = pxmit_skb->data; -+ -+ urb = usb_alloc_urb(0, GFP_ATOMIC); -+ if (!urb) { -+ goto _exit; -+ } -+ -+ // ----- fill tx desc ----- -+ ptxdesc = (struct tx_desc *)pxmitbuf; -+ _rtw_memset(ptxdesc, 0, sizeof(*ptxdesc)); -+ -+ //offset 0 -+ ptxdesc->txdw0 |= cpu_to_le32(len&0x0000ffff); -+ ptxdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE+OFFSET_SZ)<txdw0 |= cpu_to_le32(OWN | FSG | LSG); -+ -+ if(bmcst) -+ { -+ ptxdesc->txdw0 |= cpu_to_le32(BIT(24)); -+ } -+ -+ //offset 4 -+ ptxdesc->txdw1 |= cpu_to_le32(0x00);//MAC_ID -+ -+ ptxdesc->txdw1 |= cpu_to_le32((0x12<txdw1 |= cpu_to_le32((0x06<< 16) & 0x000f0000);//b mode -+ -+ //offset 8 -+ -+ //offset 12 -+ ptxdesc->txdw3 |= cpu_to_le32((le16_to_cpu(tx_hdr->seq_ctl)<<16)&0xffff0000); -+ -+ //offset 16 -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(8));//driver uses rate -+ -+ //offset 20 -+ -+ -+ //HW append seq -+ ptxdesc->txdw4 |= cpu_to_le32(BIT(7)); // Hw set sequence number -+ ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); //set bit3 to 1. Suugested by TimChen. 2009.12.29. -+ -+ -+ rtl8192cu_cal_txdesc_chksum(ptxdesc); -+ // ----- end of fill tx desc ----- -+ -+ // -+ skb_put(pxmit_skb, len + TXDESC_SIZE); -+ pxmitbuf = pxmitbuf + TXDESC_SIZE; -+ _rtw_memcpy(pxmitbuf, skb->data, len); -+ -+ //DBG_8192C("mgnt_xmit, len=%x\n", pxmit_skb->len); -+ -+ -+ // ----- prepare urb for submit ----- -+ -+ //translate DMA FIFO addr to pipehandle -+ //pipe = ffaddr2pipehdl(pdvobj, MGT_QUEUE_INX); -+ pipe = usb_sndbulkpipe(pdvobj->pusbdev, pHalData->Queue2EPNum[(u8)MGT_QUEUE_INX]&0x0f); -+ -+ usb_fill_bulk_urb(urb, pdvobj->pusbdev, pipe, -+ pxmit_skb->data, pxmit_skb->len, rtl8192cu_hostap_mgnt_xmit_cb, pxmit_skb); -+ -+ urb->transfer_flags |= URB_ZERO_PACKET; -+ usb_anchor_urb(urb, &phostapdpriv->anchored); -+ rc = usb_submit_urb(urb, GFP_ATOMIC); -+ if (rc < 0) { -+ usb_unanchor_urb(urb); -+ kfree_skb(skb); -+ } -+ usb_free_urb(urb); -+ -+ -+_exit: -+ -+ rtw_skb_free(skb); -+ -+#endif -+ -+ return 0; -+ -+} -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c -@@ -0,0 +1,6261 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _HCI_HAL_INIT_C_ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+#include "rtl8192c_sreset.h" -+#endif -+ -+#ifdef CONFIG_IOL -+#include -+#endif -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#ifndef CONFIG_USB_HCI -+ -+#error "CONFIG_USB_HCI shall be on!\n" -+ -+#endif -+ -+#include -+#include -+#include -+ -+#if DISABLE_BB_RF -+ #define HAL_MAC_ENABLE 0 -+ #define HAL_BB_ENABLE 0 -+ #define HAL_RF_ENABLE 0 -+#else -+ #define HAL_MAC_ENABLE 1 -+ #define HAL_BB_ENABLE 1 -+ #define HAL_RF_ENABLE 1 -+#endif -+ -+//endpoint number 1,2,3,4,5 -+// bult in : 1 -+// bult out: 2 (High) -+// bult out: 3 (Normal) for 3 out_ep, (Low) for 2 out_ep -+// interrupt in: 4 -+// bult out: 5 (Low) for 3 out_ep -+ -+ -+static VOID -+_OneOutEpMapping( -+ IN HAL_DATA_TYPE *pHalData -+ ) -+{ -+ //only endpoint number 0x02 -+ -+ pHalData->Queue2EPNum[0] = pHalData->RtBulkOutPipe[0];//VO -+ pHalData->Queue2EPNum[1] = pHalData->RtBulkOutPipe[0];//VI -+ pHalData->Queue2EPNum[2] = pHalData->RtBulkOutPipe[0];//BE -+ pHalData->Queue2EPNum[3] = pHalData->RtBulkOutPipe[0];//BK -+ -+ pHalData->Queue2EPNum[4] = pHalData->RtBulkOutPipe[0];//BCN -+ pHalData->Queue2EPNum[5] = pHalData->RtBulkOutPipe[0];//MGT -+ pHalData->Queue2EPNum[6] = pHalData->RtBulkOutPipe[0];//HIGH -+ pHalData->Queue2EPNum[7] = pHalData->RtBulkOutPipe[0];//TXCMD -+} -+ -+ -+static VOID -+_TwoOutEpMapping( -+ IN HAL_DATA_TYPE *pHalData, -+ IN BOOLEAN bWIFICfg -+ ) -+{ -+ -+/* -+#define VO_QUEUE_INX 0 -+#define VI_QUEUE_INX 1 -+#define BE_QUEUE_INX 2 -+#define BK_QUEUE_INX 3 -+#define BCN_QUEUE_INX 4 -+#define MGT_QUEUE_INX 5 -+#define HIGH_QUEUE_INX 6 -+#define TXCMD_QUEUE_INX 7 -+*/ -+ if(bWIFICfg){ // Normal chip && wmm -+ -+ // BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA -+ //{ 0, 1, 0, 1, 0, 0, 0, 0, 0 }; -+ //0:H(end_number=0x02), 1:L (end_number=0x03) -+ -+ pHalData->Queue2EPNum[0] = pHalData->RtBulkOutPipe[1];//VO -+ pHalData->Queue2EPNum[1] = pHalData->RtBulkOutPipe[0];//VI -+ pHalData->Queue2EPNum[2] = pHalData->RtBulkOutPipe[1];//BE -+ pHalData->Queue2EPNum[3] = pHalData->RtBulkOutPipe[0];//BK -+ -+ pHalData->Queue2EPNum[4] = pHalData->RtBulkOutPipe[0];//BCN -+ pHalData->Queue2EPNum[5] = pHalData->RtBulkOutPipe[0];//MGT -+ pHalData->Queue2EPNum[6] = pHalData->RtBulkOutPipe[0];//HIGH -+ pHalData->Queue2EPNum[7] = pHalData->RtBulkOutPipe[0];//TXCMD -+ } -+ else{//typical setting -+ -+ //BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA -+ //{ 1, 1, 0, 0, 0, 0, 0, 0, 0 }; -+ //0:H(end_number=0x02), 1:L (end_number=0x03) -+ -+ pHalData->Queue2EPNum[0] = pHalData->RtBulkOutPipe[0];//VO -+ pHalData->Queue2EPNum[1] = pHalData->RtBulkOutPipe[0];//VI -+ pHalData->Queue2EPNum[2] = pHalData->RtBulkOutPipe[1];//BE -+ pHalData->Queue2EPNum[3] = pHalData->RtBulkOutPipe[1];//BK -+ -+ pHalData->Queue2EPNum[4] = pHalData->RtBulkOutPipe[0];//BCN -+ pHalData->Queue2EPNum[5] = pHalData->RtBulkOutPipe[0];//MGT -+ pHalData->Queue2EPNum[6] = pHalData->RtBulkOutPipe[0];//HIGH -+ pHalData->Queue2EPNum[7] = pHalData->RtBulkOutPipe[0];//TXCMD -+ } -+ -+} -+ -+ -+static VOID _ThreeOutEpMapping( -+ IN HAL_DATA_TYPE *pHalData, -+ IN BOOLEAN bWIFICfg -+ ) -+{ -+ if(bWIFICfg){//for WMM -+ -+ // BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA -+ //{ 1, 2, 1, 0, 0, 0, 0, 0, 0 }; -+ //0:H(end_number=0x02), 1:N(end_number=0x03), 2:L (end_number=0x05) -+ -+ pHalData->Queue2EPNum[0] = pHalData->RtBulkOutPipe[0];//VO -+ pHalData->Queue2EPNum[1] = pHalData->RtBulkOutPipe[1];//VI -+ pHalData->Queue2EPNum[2] = pHalData->RtBulkOutPipe[2];//BE -+ pHalData->Queue2EPNum[3] = pHalData->RtBulkOutPipe[1];//BK -+ -+ pHalData->Queue2EPNum[4] = pHalData->RtBulkOutPipe[0];//BCN -+ pHalData->Queue2EPNum[5] = pHalData->RtBulkOutPipe[0];//MGT -+ pHalData->Queue2EPNum[6] = pHalData->RtBulkOutPipe[0];//HIGH -+ pHalData->Queue2EPNum[7] = pHalData->RtBulkOutPipe[0];//TXCMD -+ } -+ else{//typical setting -+ -+ // BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA -+ //{ 2, 2, 1, 0, 0, 0, 0, 0, 0 }; -+ //0:H(end_number=0x02), 1:N(end_number=0x03), 2:L (end_number=0x05) -+ pHalData->Queue2EPNum[0] = pHalData->RtBulkOutPipe[0];//VO -+ pHalData->Queue2EPNum[1] = pHalData->RtBulkOutPipe[1];//VI -+ pHalData->Queue2EPNum[2] = pHalData->RtBulkOutPipe[2];//BE -+ pHalData->Queue2EPNum[3] = pHalData->RtBulkOutPipe[2];//BK -+ -+ pHalData->Queue2EPNum[4] = pHalData->RtBulkOutPipe[0];//BCN -+ pHalData->Queue2EPNum[5] = pHalData->RtBulkOutPipe[0];//MGT -+ pHalData->Queue2EPNum[6] = pHalData->RtBulkOutPipe[0];//HIGH -+ pHalData->Queue2EPNum[7] = pHalData->RtBulkOutPipe[0];//TXCMD -+ } -+ -+} -+ -+static BOOLEAN -+_MappingOutEP( -+ IN PADAPTER pAdapter, -+ IN u8 NumOutPipe -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct registry_priv *pregistrypriv = &pAdapter->registrypriv; -+ -+ BOOLEAN bWIFICfg = (pregistrypriv->wifi_spec) ?_TRUE:_FALSE; -+ -+ BOOLEAN result = _TRUE; -+ -+ switch(NumOutPipe) -+ { -+ case 2: -+ _TwoOutEpMapping(pHalData, bWIFICfg); -+ break; -+ case 3: -+ _ThreeOutEpMapping(pHalData, bWIFICfg); -+ break; -+ case 1: -+ _OneOutEpMapping(pHalData); -+ break; -+ default: -+ result = _FALSE; -+ break; -+ } -+ -+ return result; -+ -+} -+ -+static VOID -+_ConfigChipOutEP( -+ IN PADAPTER pAdapter, -+ IN u8 NumOutPipe -+ ) -+{ -+ u8 value8; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ -+ pHalData->OutEpQueueSel = 0; -+ pHalData->OutEpNumber = 0; -+ -+ // Normal and High queue -+ value8 = rtw_read8(pAdapter, (REG_NORMAL_SIE_EP + 1)); -+ -+ if(value8 & USB_NORMAL_SIE_EP_MASK){ -+ pHalData->OutEpQueueSel |= TX_SELE_HQ; -+ pHalData->OutEpNumber++; -+ } -+ -+#ifdef CONFIG_USB_ONE_OUT_EP -+ return; -+#endif -+ -+ if((value8 >> USB_NORMAL_SIE_EP_SHIFT) & USB_NORMAL_SIE_EP_MASK){ -+ pHalData->OutEpQueueSel |= TX_SELE_NQ; -+ pHalData->OutEpNumber++; -+ } -+ -+ // Low queue -+ value8 = rtw_read8(pAdapter, (REG_NORMAL_SIE_EP + 2)); -+ if(value8 & USB_NORMAL_SIE_EP_MASK){ -+ pHalData->OutEpQueueSel |= TX_SELE_LQ; -+ pHalData->OutEpNumber++; -+ } -+ -+ // TODO: Error recovery for this case -+ //RT_ASSERT((NumOutPipe == pHalData->OutEpNumber), ("Out EP number isn't match! %d(Descriptor) != %d (SIE reg)\n", (u4Byte)NumOutPipe, (u4Byte)pHalData->OutEpNumber)); -+ -+} -+ -+static BOOLEAN HalUsbSetQueuePipeMapping8192CUsb( -+ IN PADAPTER pAdapter, -+ IN u8 NumInPipe, -+ IN u8 NumOutPipe -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ BOOLEAN result = _FALSE; -+ -+ _ConfigChipOutEP(pAdapter, NumOutPipe); -+ -+ #ifndef CONFIG_USB_ONE_OUT_EP -+ // Normal chip with one IN and one OUT doesn't have interrupt IN EP. -+ if(1 == pHalData->OutEpNumber){ -+ if(1 != NumInPipe){ -+ return result; -+ } -+ } -+ #endif -+ result = _MappingOutEP(pAdapter, NumOutPipe); -+ -+ return result; -+ -+} -+ -+void rtl8192cu_interface_configure(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ -+ if (pdvobjpriv->ishighspeed == _TRUE) -+ { -+ pHalData->UsbBulkOutSize = USB_HIGH_SPEED_BULK_SIZE;//512 bytes -+ } -+ else -+ { -+ pHalData->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;//64 bytes -+ } -+ -+ pHalData->interfaceIndex = pdvobjpriv->InterfaceNumber; -+ pHalData->RtBulkInPipe = pdvobjpriv->ep_num[0]; -+ pHalData->RtBulkOutPipe[0] = pdvobjpriv->ep_num[1]; -+ pHalData->RtBulkOutPipe[1] = pdvobjpriv->ep_num[2]; -+ pHalData->RtIntInPipe = pdvobjpriv->ep_num[3]; -+ pHalData->RtBulkOutPipe[2] = pdvobjpriv->ep_num[4]; -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ pHalData->UsbTxAggMode = 1; -+ pHalData->UsbTxAggDescNum = 0x6; // only 4 bits -+#endif -+ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ pHalData->UsbRxAggMode = USB_RX_AGG_DMA;// USB_RX_AGG_DMA; -+ pHalData->UsbRxAggBlockCount = 8; //unit : 512b -+ pHalData->UsbRxAggBlockTimeout = 0x6; -+ pHalData->UsbRxAggPageCount = 48; //uint :128 b //0x0A; // 10 = MAX_RX_DMA_BUFFER_SIZE/2/pHalData->UsbBulkOutSize -+ pHalData->UsbRxAggPageTimeout = 0x4; //6, absolute time = 34ms/(2^6) -+#endif -+ -+ HalUsbSetQueuePipeMapping8192CUsb(padapter, pdvobjpriv->RtNumInPipes, -+ #ifdef CONFIG_USB_ONE_OUT_EP -+ 1 -+ #else -+ pdvobjpriv->RtNumOutPipes -+ #endif -+ ); -+ -+} -+ -+static u8 _InitPowerOn(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ u8 ret = _SUCCESS; -+ u16 value16=0; -+ u8 value8 = 0; -+ u32 value32 = 0; -+ -+ // polling autoload done. -+ u32 pollingCount = 0; -+ -+ do -+ { -+ if(rtw_read8(padapter, REG_APS_FSMCO) & PFM_ALDN){ -+ //RT_TRACE(COMP_INIT,DBG_LOUD,("Autoload Done!\n")); -+ break; -+ } -+ -+ if(pollingCount++ > POLLING_READY_TIMEOUT_COUNT){ -+ //RT_TRACE(COMP_INIT,DBG_SERIOUS,("Failed to polling REG_APS_FSMCO[PFM_ALDN] done!\n")); -+ return _FAIL; -+ } -+ -+ }while(_TRUE); -+ -+ -+// For hardware power on sequence. -+ -+ //0. RSV_CTRL 0x1C[7:0] = 0x00 // unlock ISO/CLK/Power control register -+ rtw_write8(padapter, REG_RSV_CTRL, 0x0); -+ // Power on when re-enter from IPS/Radio off/card disable -+ rtw_write8(padapter, REG_SPS0_CTRL, 0x2b);//enable SPS into PWM mode -+/* -+ value16 = PlatformIORead2Byte(Adapter, REG_AFE_XTAL_CTRL);//enable AFE clock -+ value16 &= (~XTAL_GATE_AFE); -+ PlatformIOWrite2Byte(Adapter,REG_AFE_XTAL_CTRL, value16 ); -+*/ -+ -+ rtw_udelay_os(100);//PlatformSleepUs(150);//this is not necessary when initially power on -+ -+ value8 = rtw_read8(padapter, REG_LDOV12D_CTRL); -+ if(0== (value8 & LDV12_EN) ){ -+ value8 |= LDV12_EN; -+ rtw_write8(padapter, REG_LDOV12D_CTRL, value8); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, (" power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x.\n",value8)); -+ rtw_udelay_os(100);//PlatformSleepUs(100);//this is not necessary when initially power on -+ value8 = rtw_read8(padapter, REG_SYS_ISO_CTRL); -+ value8 &= ~ISO_MD2PP; -+ rtw_write8(padapter, REG_SYS_ISO_CTRL, value8); -+ } -+ -+ // auto enable WLAN -+ pollingCount = 0; -+ value16 = rtw_read16(padapter, REG_APS_FSMCO); -+ value16 |= APFM_ONMAC; -+ rtw_write16(padapter, REG_APS_FSMCO, value16); -+ -+ do -+ { -+ if(0 == (rtw_read16(padapter, REG_APS_FSMCO) & APFM_ONMAC)){ -+ //RT_TRACE(COMP_INIT,DBG_LOUD,("MAC auto ON okay!\n")); -+ break; -+ } -+ -+ if(pollingCount++ > POLLING_READY_TIMEOUT_COUNT){ -+ //RT_TRACE(COMP_INIT,DBG_SERIOUS,("Failed to polling REG_APS_FSMCO[APFM_ONMAC] done!\n")); -+ return _FAIL; -+ } -+ -+ }while(_TRUE); -+ -+ //Enable Radio ,GPIO ,and LED function -+ rtw_write16(padapter,REG_APS_FSMCO,0x0812); -+ -+#ifdef CONFIG_AUTOSUSPEND -+ //for usb Combo card ,BT -+ if((BOARD_USB_COMBO == pHalData->BoardType)&&(padapter->registrypriv.usbss_enable)) -+ { -+ value32 = rtw_read32(padapter, REG_APS_FSMCO); -+ value32 |= (SOP_ABG|SOP_AMB|XOP_BTCK); -+ rtw_write32(padapter, REG_APS_FSMCO, value32); -+ } -+#endif -+ -+ // release RF digital isolation -+ value16 = rtw_read16(padapter, REG_SYS_ISO_CTRL); -+ value16 &= ~ISO_DIOR; -+ rtw_write16(padapter, REG_SYS_ISO_CTRL, value16); -+ -+ // Enable MAC DMA/WMAC/SCHEDULE/SEC block -+ value16 = rtw_read16(padapter, REG_CR); -+ value16 |= (HCI_TXDMA_EN | HCI_RXDMA_EN | TXDMA_EN | RXDMA_EN -+ | PROTOCOL_EN | SCHEDULE_EN | MACTXEN | MACRXEN | ENSEC); -+ rtw_write16(padapter, REG_CR, value16); -+ -+ //tynli_test for suspend mode. -+ { -+ rtw_write8(padapter, 0xfe10, 0x19); -+ } -+ -+ // 2010/11/22 MH For slim combo debug mode check. -+ if (pHalData->BoardType == BOARD_USB_COMBO) -+ { -+ if (pHalData->SlimComboDbg == _TRUE) -+ { -+ DBG_8192C("SlimComboDbg == TRUE\n"); -+ -+ // 1. SIC?Test Mode , Debug Ports |۰ Enable, ҥH Driver Wӫ, -+ // nг]w 0x 00[7] -> "1", N Disable. effect if not: power consumption increase -+ rtw_write8(padapter, REG_SYS_ISO_CTRL, rtw_read8(padapter, REG_SYS_ISO_CTRL)|BIT7); -+ -+ // 2. SIC?Test Mode , GPIO-8?| report Power State ҥH Driver Wӫ, г]w? 0x04[6] -> "1" N Disable -+ // effect if not: GPIO-8 could not be GPIO or LED function -+ rtw_write8(padapter, REG_APS_FSMCO, rtw_read8(padapter, REG_APS_FSMCO)|BIT6); -+ -+ // 3. SIC Test Mode , EESK, EECS | report?Host Clock status, ҥH Driver Wӫ, г]w? 0x40[4] -> "1" N EEPROM ϥ Pin (autoload still from Efuse) -+ // effect if not:power consumption increase -+ value8 = rtw_read8(padapter, REG_GPIO_MUXCFG)|BIT4 ; -+ #ifdef CONFIG_BT_COEXIST -+ // 2011/01/26 MH UMB-B cut bug. We need to support the modification. -+ if (IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID) && -+ pHalData->bt_coexist.BT_Coexist) -+ { -+ value8 |= (BIT5); -+ } -+ #endif -+ rtw_write8(padapter, REG_GPIO_MUXCFG,value8 ); -+ -+ -+ // 4. SIC Test Mode ,?SIC Debug ports |۰ Enable , ҥH Driver WӫᰨW, г]w? 0x40[15:11] -> 0x00, NDisable -+ // 4.1Two Steps setting for safety: 0x40[15,13,12, 11] -> "0", then ?0x40[14] -> "0" -+ // effect if not: Host could not transfer packets, and GPIO-3,2 will occupied by SIC then Co-exist could not work. -+ rtw_write16(padapter, REG_GPIO_MUXCFG, (rtw_read16(padapter, REG_GPIO_MUXCFG)&0x07FF)|BIT14); -+ rtw_write16(padapter, REG_GPIO_MUXCFG, rtw_read16(padapter, REG_GPIO_MUXCFG)&0x07FF); -+ } -+ } -+ -+ -+ // 2011/02/18 To Fix RU LNA power leakage problem. We need to execute below below in -+ // Adapter init and halt sequence. Accordingto EEchou's opinion, we can enable the ability for all -+ // IC. According to Johnny's opinion, only RU will meet the condition. -+ if (IS_HARDWARE_TYPE_8192C(padapter) && (pHalData->BoardType == BOARD_USB_High_PA)) -+ rtw_write32(padapter, rFPGA0_XCD_RFParameter, rtw_read32(padapter, rFPGA0_XCD_RFParameter)&(~BIT1)); -+ return ret; -+ -+} -+ -+ -+static void _dbg_dump_macreg(_adapter *padapter) -+{ -+ u32 offset = 0; -+ u32 val32 = 0; -+ u32 index =0 ; -+ for(index=0;index<64;index++) -+ { -+ offset = index*4; -+ val32 = rtw_read32(padapter,offset); -+ DBG_8192C("offset : 0x%02x ,val:0x%08x\n",offset,val32); -+ } -+} -+ -+ -+static void _InitPABias(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ u8 pa_setting; -+ BOOLEAN is92C = IS_92C_SERIAL(pHalData->VersionID); -+ -+ //FIXED PA current issue -+ //efuse_one_byte_read(padapter, 0x1FA, &pa_setting); -+ pa_setting = EFUSE_Read1Byte(padapter, 0x1FA); -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("_InitPABias 0x1FA 0x%x \n",pa_setting)); -+ -+ if(!(pa_setting & BIT0)) -+ { -+ PHY_SetRFReg(padapter, RF_PATH_A, 0x15, 0x0FFFFF, 0x0F406); -+ PHY_SetRFReg(padapter, RF_PATH_A, 0x15, 0x0FFFFF, 0x4F406); -+ PHY_SetRFReg(padapter, RF_PATH_A, 0x15, 0x0FFFFF, 0x8F406); -+ PHY_SetRFReg(padapter, RF_PATH_A, 0x15, 0x0FFFFF, 0xCF406); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("PA BIAS path A\n")); -+ } -+ -+ if(!(pa_setting & BIT1) && is92C) -+ { -+ PHY_SetRFReg(padapter,RF_PATH_B, 0x15, 0x0FFFFF, 0x0F406); -+ PHY_SetRFReg(padapter,RF_PATH_B, 0x15, 0x0FFFFF, 0x4F406); -+ PHY_SetRFReg(padapter,RF_PATH_B, 0x15, 0x0FFFFF, 0x8F406); -+ PHY_SetRFReg(padapter,RF_PATH_B, 0x15, 0x0FFFFF, 0xCF406); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("PA BIAS path B\n")); -+ } -+ -+ if(!(pa_setting & BIT4)) -+ { -+ pa_setting = rtw_read8(padapter, 0x16); -+ pa_setting &= 0x0F; -+ rtw_write8(padapter, 0x16, pa_setting | 0x90); -+ } -+} -+#ifdef CONFIG_BT_COEXIST -+static void _InitBTCoexist(_adapter *padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+ u8 u1Tmp; -+ -+ if(pbtpriv->BT_Coexist && pbtpriv->BT_CoexistType == BT_CSR_BC4) -+ { -+ -+#if MP_DRIVER != 1 -+ if(pbtpriv->BT_Ant_isolation) -+ { -+ rtw_write8( padapter,REG_GPIO_MUXCFG, 0xa0); -+ DBG_8192C("BT write 0x%x = 0x%x\n", REG_GPIO_MUXCFG, 0xa0); -+ } -+#endif -+ -+ u1Tmp = rtw_read8(padapter, 0x4fd) & BIT0; -+ u1Tmp = u1Tmp | -+ ((pbtpriv->BT_Ant_isolation==1)?0:BIT1) | -+ ((pbtpriv->BT_Service==BT_SCO)?0:BIT2); -+ rtw_write8( padapter, 0x4fd, u1Tmp); -+ DBG_8192C("BT write 0x%x = 0x%x for non-isolation\n", 0x4fd, u1Tmp); -+ -+ -+ rtw_write32(padapter, REG_BT_COEX_TABLE+4, 0xaaaa9aaa); -+ DBG_8192C("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+4, 0xaaaa9aaa); -+ -+ rtw_write32(padapter, REG_BT_COEX_TABLE+8, 0xffbd0040); -+ DBG_8192C("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+8, 0xffbd0040); -+ -+ rtw_write32(padapter, REG_BT_COEX_TABLE+0xc, 0x40000010); -+ DBG_8192C("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+0xc, 0x40000010); -+ -+ //Config to 1T1R -+ u1Tmp = rtw_read8(padapter,rOFDM0_TRxPathEnable); -+ u1Tmp &= ~(BIT1); -+ rtw_write8( padapter, rOFDM0_TRxPathEnable, u1Tmp); -+ DBG_8192C("BT write 0xC04 = 0x%x\n", u1Tmp); -+ -+ u1Tmp = rtw_read8(padapter, rOFDM1_TRxPathEnable); -+ u1Tmp &= ~(BIT1); -+ rtw_write8( padapter, rOFDM1_TRxPathEnable, u1Tmp); -+ DBG_8192C("BT write 0xD04 = 0x%x\n", u1Tmp); -+ -+ } -+} -+#endif -+ -+//------------------------------------------------------------------------- -+// -+// LLT R/W/Init function -+// -+//------------------------------------------------------------------------- -+static u8 _LLTWrite( -+ IN PADAPTER Adapter, -+ IN u32 address, -+ IN u32 data -+ ) -+{ -+ u8 status = _SUCCESS; -+ int count = 0; -+ u32 value = _LLT_INIT_ADDR(address) | _LLT_INIT_DATA(data) | _LLT_OP(_LLT_WRITE_ACCESS); -+ -+ rtw_write32(Adapter, REG_LLT_INIT, value); -+ -+ //polling -+ do{ -+ -+ value = rtw_read32(Adapter, REG_LLT_INIT); -+ if(_LLT_NO_ACTIVE == _LLT_OP_VALUE(value)){ -+ break; -+ } -+ -+ if(count > POLLING_LLT_THRESHOLD){ -+ //RT_TRACE(COMP_INIT,DBG_SERIOUS,("Failed to polling write LLT done at address %d!\n", address)); -+ status = _FAIL; -+ break; -+ } -+ }while(count++); -+ -+ return status; -+ -+} -+ -+ -+static u8 _LLTRead( -+ IN PADAPTER Adapter, -+ IN u32 address -+ ) -+{ -+ int count = 0; -+ u32 value = _LLT_INIT_ADDR(address) | _LLT_OP(_LLT_READ_ACCESS); -+ -+ rtw_write32(Adapter, REG_LLT_INIT, value); -+ -+ //polling and get value -+ do{ -+ -+ value = rtw_read32(Adapter, REG_LLT_INIT); -+ if(_LLT_NO_ACTIVE == _LLT_OP_VALUE(value)){ -+ return (u8)value; -+ } -+ -+ if(count > POLLING_LLT_THRESHOLD){ -+ //RT_TRACE(COMP_INIT,DBG_SERIOUS,("Failed to polling read LLT done at address %d!\n", address)); -+ break; -+ } -+ }while(count++); -+ -+ return 0xFF; -+ -+} -+ -+ -+static u8 InitLLTTable( -+ IN PADAPTER Adapter, -+ IN u32 boundary -+ ) -+{ -+ u8 status = _SUCCESS; -+ u32 i; -+ -+#ifdef CONFIG_IOL_LLT -+ if(rtw_IOL_applied(Adapter)) -+ { -+ struct xmit_frame *xmit_frame; -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) -+ return _FAIL; -+ -+ rtw_IOL_append_LLT_cmd(xmit_frame, boundary); -+ status = rtw_IOL_exec_cmds_sync(Adapter, xmit_frame, 1000); -+ } -+ else -+#endif -+ { -+ for(i = 0 ; i < (boundary - 1) ; i++){ -+ status = _LLTWrite(Adapter, i , i + 1); -+ if(_SUCCESS != status){ -+ return status; -+ } -+ } -+ -+ // end of list -+ status = _LLTWrite(Adapter, (boundary - 1), 0xFF); -+ if(_SUCCESS != status){ -+ return status; -+ } -+ -+ // Make the other pages as ring buffer -+ // This ring buffer is used as beacon buffer if we config this MAC as two MAC transfer. -+ // Otherwise used as local loopback buffer. -+ for(i = boundary ; i < LAST_ENTRY_OF_TX_PKT_BUFFER ; i++){ -+ status = _LLTWrite(Adapter, i, (i + 1)); -+ if(_SUCCESS != status){ -+ return status; -+ } -+ } -+ -+ // Let last entry point to the start entry of ring buffer -+ status = _LLTWrite(Adapter, LAST_ENTRY_OF_TX_PKT_BUFFER, boundary); -+ if(_SUCCESS != status){ -+ return status; -+ } -+ } -+ -+ return status; -+ -+} -+ -+ -+//--------------------------------------------------------------- -+// -+// MAC init functions -+// -+//--------------------------------------------------------------- -+static VOID -+_SetMacID( -+ IN PADAPTER Adapter, u8* MacID -+ ) -+{ -+ u32 i; -+ for(i=0 ; i< MAC_ADDR_LEN ; i++){ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->iface_type == IFACE_PORT1) -+ rtw_write32(Adapter, REG_MACID1+i, MacID[i]); -+ else -+#endif -+ rtw_write32(Adapter, REG_MACID+i, MacID[i]); -+ } -+} -+ -+static VOID -+_SetBSSID( -+ IN PADAPTER Adapter, u8* BSSID -+ ) -+{ -+ u32 i; -+ for(i=0 ; i< MAC_ADDR_LEN ; i++){ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->iface_type == IFACE_PORT1) -+ rtw_write32(Adapter, REG_BSSID1+i, BSSID[i]); -+ else -+#endif -+ rtw_write32(Adapter, REG_BSSID+i, BSSID[i]); -+ } -+} -+ -+ -+// Shall USB interface init this? -+static VOID -+_InitInterrupt( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ -+ // HISR - turn all on -+ value32 = 0xFFFFFFFF; -+ rtw_write32(Adapter, REG_HISR, value32); -+ -+ // HIMR - turn all on -+ rtw_write32(Adapter, REG_HIMR, value32); -+} -+ -+ -+static VOID -+_InitQueueReservedPage( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct registry_priv *pregistrypriv = &Adapter->registrypriv; -+ -+ u32 outEPNum = (u32)pHalData->OutEpNumber; -+ u32 numHQ = 0; -+ u32 numLQ = 0; -+ u32 numNQ = 0; -+ u32 numPubQ; -+ u32 value32; -+ u8 value8; -+ BOOLEAN bWiFiConfig = pregistrypriv->wifi_spec; -+ //u32 txQPageNum, txQPageUnit,txQRemainPage; -+ -+ { //for WMM -+ //RT_ASSERT((outEPNum>=2), ("for WMM ,number of out-ep must more than or equal to 2!\n")); -+ -+ if(pHalData->OutEpQueueSel & TX_SELE_HQ){ -+ numHQ = (bWiFiConfig)?WMM_NORMAL_PAGE_NUM_HPQ:NORMAL_PAGE_NUM_HPQ; -+ } -+ -+ if(pHalData->OutEpQueueSel & TX_SELE_LQ){ -+ numLQ = (bWiFiConfig)?WMM_NORMAL_PAGE_NUM_LPQ:NORMAL_PAGE_NUM_LPQ; -+ } -+ // NOTE: This step shall be proceed before writting REG_RQPN. -+ if(pHalData->OutEpQueueSel & TX_SELE_NQ){ -+ numNQ = (bWiFiConfig)?WMM_NORMAL_PAGE_NUM_NPQ:NORMAL_PAGE_NUM_NPQ; -+ } -+ value8 = (u8)_NPQ(numNQ); -+ rtw_write8(Adapter, REG_RQPN_NPQ, value8); -+ -+ if (bWiFiConfig) -+ numPubQ = WMM_NORMAL_TX_TOTAL_PAGE_NUMBER - numHQ - numLQ - numNQ; -+ else -+ numPubQ = TX_TOTAL_PAGE_NUMBER - numHQ - numLQ - numNQ; -+ } -+ -+ // TX DMA -+ value32 = _HPQ(numHQ) | _LPQ(numLQ) | _PUBQ(numPubQ) | LD_RQPN; -+ rtw_write32(Adapter, REG_RQPN, value32); -+} -+ -+static VOID -+_InitTxBufferBoundary( -+ IN PADAPTER Adapter -+ ) -+{ -+ struct registry_priv *pregistrypriv = &Adapter->registrypriv; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ u8 txpktbuf_bndy; -+ -+ if(!pregistrypriv->wifi_spec){ -+ txpktbuf_bndy = TX_PAGE_BOUNDARY; -+ } -+ else{//for WMM -+ txpktbuf_bndy = WMM_NORMAL_TX_PAGE_BOUNDARY; -+ } -+ -+ rtw_write8(Adapter, REG_TXPKTBUF_BCNQ_BDNY, txpktbuf_bndy); -+ rtw_write8(Adapter, REG_TXPKTBUF_MGQ_BDNY, txpktbuf_bndy); -+ rtw_write8(Adapter, REG_TXPKTBUF_WMAC_LBK_BF_HD, txpktbuf_bndy); -+ rtw_write8(Adapter, REG_TRXFF_BNDY, txpktbuf_bndy); -+#if 1 -+ rtw_write8(Adapter, REG_TDECTRL+1, txpktbuf_bndy); -+#else -+ txdmactrl = PlatformIORead2Byte(Adapter, REG_TDECTRL); -+ txdmactrl &= ~BCN_HEAD_MASK; -+ txdmactrl |= BCN_HEAD(txpktbuf_bndy); -+ PlatformIOWrite2Byte(Adapter, REG_TDECTRL, txdmactrl); -+#endif -+} -+ -+static VOID -+_InitPageBoundary( -+ IN PADAPTER Adapter -+ ) -+{ -+ // RX Page Boundary -+ //srand(static_cast(time(NULL)) ); -+ u16 rxff_bndy = 0x27FF;//(rand() % 1) ? 0x27FF : 0x23FF; -+ -+ rtw_write16(Adapter, (REG_TRXFF_BNDY + 2), rxff_bndy); -+ -+ // TODO: ?? shall we set tx boundary? -+} -+ -+ -+static VOID -+_InitNormalChipRegPriority( -+ IN PADAPTER Adapter, -+ IN u16 beQ, -+ IN u16 bkQ, -+ IN u16 viQ, -+ IN u16 voQ, -+ IN u16 mgtQ, -+ IN u16 hiQ -+ ) -+{ -+ u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7); -+ -+ value16 |= _TXDMA_BEQ_MAP(beQ) | _TXDMA_BKQ_MAP(bkQ) | -+ _TXDMA_VIQ_MAP(viQ) | _TXDMA_VOQ_MAP(voQ) | -+ _TXDMA_MGQ_MAP(mgtQ)| _TXDMA_HIQ_MAP(hiQ); -+ -+ rtw_write16(Adapter, REG_TRXDMA_CTRL, value16); -+} -+ -+static VOID -+_InitNormalChipOneOutEpPriority( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ u16 value = 0; -+ switch(pHalData->OutEpQueueSel) -+ { -+ case TX_SELE_HQ: -+ value = QUEUE_HIGH; -+ break; -+ case TX_SELE_LQ: -+ value = QUEUE_LOW; -+ break; -+ case TX_SELE_NQ: -+ value = QUEUE_NORMAL; -+ break; -+ default: -+ //RT_ASSERT(FALSE,("Shall not reach here!\n")); -+ break; -+ } -+ -+ _InitNormalChipRegPriority(Adapter, -+ value, -+ value, -+ value, -+ value, -+ value, -+ value -+ ); -+ -+} -+ -+static VOID -+_InitNormalChipTwoOutEpPriority( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct registry_priv *pregistrypriv = &Adapter->registrypriv; -+ u16 beQ,bkQ,viQ,voQ,mgtQ,hiQ; -+ -+ -+ u16 valueHi = 0; -+ u16 valueLow = 0; -+ -+ switch(pHalData->OutEpQueueSel) -+ { -+ case (TX_SELE_HQ | TX_SELE_LQ): -+ valueHi = QUEUE_HIGH; -+ valueLow = QUEUE_LOW; -+ break; -+ case (TX_SELE_NQ | TX_SELE_LQ): -+ valueHi = QUEUE_NORMAL; -+ valueLow = QUEUE_LOW; -+ break; -+ case (TX_SELE_HQ | TX_SELE_NQ): -+ valueHi = QUEUE_HIGH; -+ valueLow = QUEUE_NORMAL; -+ break; -+ default: -+ //RT_ASSERT(FALSE,("Shall not reach here!\n")); -+ break; -+ } -+ -+ if(!pregistrypriv->wifi_spec ){ -+ beQ = valueLow; -+ bkQ = valueLow; -+ viQ = valueHi; -+ voQ = valueHi; -+ mgtQ = valueHi; -+ hiQ = valueHi; -+ } -+ else{//for WMM ,CONFIG_OUT_EP_WIFI_MODE -+ beQ = valueLow; -+ bkQ = valueHi; -+ viQ = valueHi; -+ voQ = valueLow; -+ mgtQ = valueHi; -+ hiQ = valueHi; -+ } -+ -+ _InitNormalChipRegPriority(Adapter,beQ,bkQ,viQ,voQ,mgtQ,hiQ); -+ -+} -+ -+static VOID -+_InitNormalChipThreeOutEpPriority( -+ IN PADAPTER Adapter -+ ) -+{ -+ struct registry_priv *pregistrypriv = &Adapter->registrypriv; -+ u16 beQ,bkQ,viQ,voQ,mgtQ,hiQ; -+ -+ if(!pregistrypriv->wifi_spec ){// typical setting -+ beQ = QUEUE_LOW; -+ bkQ = QUEUE_LOW; -+ viQ = QUEUE_NORMAL; -+ voQ = QUEUE_HIGH; -+ mgtQ = QUEUE_HIGH; -+ hiQ = QUEUE_HIGH; -+ } -+ else{// for WMM -+ beQ = QUEUE_LOW; -+ bkQ = QUEUE_NORMAL; -+ viQ = QUEUE_NORMAL; -+ voQ = QUEUE_HIGH; -+ mgtQ = QUEUE_HIGH; -+ hiQ = QUEUE_HIGH; -+ } -+ _InitNormalChipRegPriority(Adapter,beQ,bkQ,viQ,voQ,mgtQ,hiQ); -+} -+ -+static VOID -+_InitNormalChipQueuePriority( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ switch(pHalData->OutEpNumber) -+ { -+ case 1: -+ _InitNormalChipOneOutEpPriority(Adapter); -+ break; -+ case 2: -+ _InitNormalChipTwoOutEpPriority(Adapter); -+ break; -+ case 3: -+ _InitNormalChipThreeOutEpPriority(Adapter); -+ break; -+ default: -+ //RT_ASSERT(FALSE,("Shall not reach here!\n")); -+ break; -+ } -+ -+ -+} -+ -+static VOID -+_InitQueuePriority( -+ IN PADAPTER Adapter -+ ) -+{ -+ _InitNormalChipQueuePriority(Adapter); -+} -+ -+static VOID -+_InitHardwareDropIncorrectBulkOut( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32 = rtw_read32(Adapter, REG_TXDMA_OFFSET_CHK); -+ value32 |= DROP_DATA_EN; -+ rtw_write32(Adapter, REG_TXDMA_OFFSET_CHK, value32); -+} -+ -+static VOID -+_InitNetworkType( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ -+ value32 = rtw_read32(Adapter, REG_CR); -+ -+ // TODO: use the other function to set network type -+#if RTL8191C_FPGA_NETWORKTYPE_ADHOC -+ value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AD_HOC); -+#else -+ value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AP); -+#endif -+ rtw_write32(Adapter, REG_CR, value32); -+// RASSERT(pIoBase->rtw_read8(REG_CR + 2) == 0x2); -+} -+ -+static VOID -+_InitTransferPageSize( -+ IN PADAPTER Adapter -+ ) -+{ -+ // Tx page size is always 128. -+ -+ u8 value8; -+ value8 = _PSRX(PBP_128) | _PSTX(PBP_128); -+ rtw_write8(Adapter, REG_PBP, value8); -+} -+ -+static VOID -+_InitDriverInfoSize( -+ IN PADAPTER Adapter, -+ IN u8 drvInfoSize -+ ) -+{ -+ rtw_write8(Adapter,REG_RX_DRVINFO_SZ, drvInfoSize); -+} -+ -+static VOID -+_InitWMACSetting( -+ IN PADAPTER Adapter -+ ) -+{ -+ //u4Byte value32; -+ //u16 value16; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ //pHalData->ReceiveConfig = AAP | APM | AM | AB | APP_ICV | ADF | AMF | APP_FCS | HTC_LOC_CTRL | APP_MIC | APP_PHYSTS; -+ //pHalData->ReceiveConfig = RCR_AAP | RCR_APM | RCR_AM | RCR_AB |RCR_CBSSID_DATA| RCR_CBSSID_BCN| RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL | RCR_APP_MIC | RCR_APP_PHYSTS; -+ // don't turn on AAP, it will allow all packets to driver -+ pHalData->ReceiveConfig = RCR_APM | RCR_AM | RCR_AB |RCR_CBSSID_DATA| RCR_CBSSID_BCN| RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL | RCR_APP_MIC | RCR_APP_PHYSTS; -+ -+#if (0 == RTL8192C_RX_PACKET_NO_INCLUDE_CRC) -+ pHalData->ReceiveConfig |= ACRC32; -+#endif -+ -+ // some REG_RCR will be modified later by phy_ConfigMACWithHeaderFile() -+ rtw_write32(Adapter, REG_RCR, pHalData->ReceiveConfig); -+ -+ // Accept all multicast address -+ rtw_write32(Adapter, REG_MAR, 0xFFFFFFFF); -+ rtw_write32(Adapter, REG_MAR + 4, 0xFFFFFFFF); -+ -+ -+ // Accept all data frames -+ //value16 = 0xFFFF; -+ //rtw_write16(Adapter, REG_RXFLTMAP2, value16); -+ -+ // 2010.09.08 hpfan -+ // Since ADF is removed from RCR, ps-poll will not be indicate to driver, -+ // RxFilterMap should mask ps-poll to gurantee AP mode can rx ps-poll. -+ //value16 = 0x400; -+ //rtw_write16(Adapter, REG_RXFLTMAP1, value16); -+ -+ // Accept all management frames -+ //value16 = 0xFFFF; -+ //rtw_write16(Adapter, REG_RXFLTMAP0, value16); -+ -+ //enable RX_SHIFT bits -+ //rtw_write8(Adapter, REG_TRXDMA_CTRL, rtw_read8(Adapter, REG_TRXDMA_CTRL)|BIT(1)); -+ -+} -+ -+static VOID -+_InitAdaptiveCtrl( -+ IN PADAPTER Adapter -+ ) -+{ -+ u16 value16; -+ u32 value32; -+ -+ // Response Rate Set -+ value32 = rtw_read32(Adapter, REG_RRSR); -+ value32 &= ~RATE_BITMAP_ALL; -+ value32 |= RATE_RRSR_CCK_ONLY_1M; -+ rtw_write32(Adapter, REG_RRSR, value32); -+ -+ // CF-END Threshold -+ //m_spIoBase->rtw_write8(REG_CFEND_TH, 0x1); -+ -+ // SIFS (used in NAV) -+ value16 = _SPEC_SIFS_CCK(0x10) | _SPEC_SIFS_OFDM(0x10); -+ rtw_write16(Adapter, REG_SPEC_SIFS, value16); -+ -+ // Retry Limit -+ value16 = _LRL(0x30) | _SRL(0x30); -+ rtw_write16(Adapter, REG_RL, value16); -+ -+} -+ -+static VOID -+_InitRateFallback( -+ IN PADAPTER Adapter -+ ) -+{ -+ // Set Data Auto Rate Fallback Retry Count register. -+ rtw_write32(Adapter, REG_DARFRC, 0x00000000); -+ rtw_write32(Adapter, REG_DARFRC+4, 0x10080404); -+ rtw_write32(Adapter, REG_RARFRC, 0x04030201); -+ rtw_write32(Adapter, REG_RARFRC+4, 0x08070605); -+ -+} -+ -+ -+static VOID -+_InitEDCA( -+ IN PADAPTER Adapter -+ ) -+{ -+ // Set Spec SIFS (used in NAV) -+ rtw_write16(Adapter,REG_SPEC_SIFS, 0x100a); -+ rtw_write16(Adapter,REG_MAC_SPEC_SIFS, 0x100a); -+ -+ //REG514:SIFS_CCK_CTX -+ //REG515:SIFS_OFDM_CTX -+ //REG516:SIFS_CCK_TRX -+ //REG517:SIFS_OFDM_TRX -+ -+ // Set SIFS for CCK_CTS and OFDM_CTX -+ rtw_write16(Adapter,REG_SIFS_CTX, 0x100a); -+ -+ // Set SIFS for CCK_TRX and OFDM_TRX -+ rtw_write16(Adapter,REG_SIFS_TRX, 0x100a); -+ -+ // TXOP -+ rtw_write32(Adapter, REG_EDCA_BE_PARAM, 0x005EA42B); -+ rtw_write32(Adapter, REG_EDCA_BK_PARAM, 0x0000A44F); -+ rtw_write32(Adapter, REG_EDCA_VI_PARAM, 0x005EA324); -+ rtw_write32(Adapter, REG_EDCA_VO_PARAM, 0x002FA226); -+} -+ -+ -+static VOID -+_InitBeaconMaxError( -+ IN PADAPTER Adapter, -+ IN BOOLEAN InfraMode -+ ) -+{ -+#ifdef RTL8192CU_ADHOC_WORKAROUND_SETTING -+ rtw_write8(Adapter, REG_BCN_MAX_ERR, 0xFF); -+#else -+ //rtw_write8(Adapter, REG_BCN_MAX_ERR, (InfraMode ? 0xFF : 0x10)); -+#endif -+} -+ -+ -+#ifdef CONFIG_LED -+static void _InitHWLed(PADAPTER Adapter) -+{ -+ struct led_priv *pledpriv = &(Adapter->ledpriv); -+ -+ if( pledpriv->LedStrategy != HW_LED) -+ return; -+ -+// HW led control -+// to do .... -+//must consider cases of antenna diversity/ commbo card/solo card/mini card -+ -+} -+#endif //CONFIG_LED -+ -+static VOID -+_InitRDGSetting( -+ IN PADAPTER Adapter -+ ) -+{ -+ rtw_write8(Adapter,REG_RD_CTRL,0xFF); -+ rtw_write16(Adapter, REG_RD_NAV_NXT, 0x200); -+ rtw_write8(Adapter,REG_RD_RESP_PKT_TH,0x05); -+} -+ -+static VOID -+_InitRxSetting( -+ IN PADAPTER Adapter -+ ) -+{ -+ rtw_write32(Adapter, REG_MACID, 0x87654321); -+ rtw_write32(Adapter, 0x0700, 0x87654321); -+} -+ -+static VOID -+_InitRetryFunction( -+ IN PADAPTER Adapter -+ ) -+{ -+ u8 value8; -+ -+ value8 = rtw_read8(Adapter, REG_FWHW_TXQ_CTRL); -+ value8 |= EN_AMPDU_RTY_NEW; -+ rtw_write8(Adapter, REG_FWHW_TXQ_CTRL, value8); -+ -+ // Set ACK timeout -+ rtw_write8(Adapter, REG_ACKTO, 0x40); -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: usb_AggSettingTxUpdate() -+ * -+ * Overview: Seperate TX/RX parameters update independent for TP detection and -+ * dynamic TX/RX aggreagtion parameters update. -+ * -+ * Input: PADAPTER -+ * -+ * Output/Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 12/10/2010 MHC Seperate to smaller function. -+ * -+ *---------------------------------------------------------------------------*/ -+static VOID -+usb_AggSettingTxUpdate( -+ IN PADAPTER Adapter -+ ) -+{ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ //PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); -+ u32 value32; -+ -+ if(Adapter->registrypriv.wifi_spec) -+ pHalData->UsbTxAggMode = _FALSE; -+ -+ if(pHalData->UsbTxAggMode){ -+ value32 = rtw_read32(Adapter, REG_TDECTRL); -+ value32 = value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT); -+ value32 |= ((pHalData->UsbTxAggDescNum & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_SHIFT); -+ -+ rtw_write32(Adapter, REG_TDECTRL, value32); -+ } -+ -+#endif -+} // usb_AggSettingTxUpdate -+ -+ -+/*----------------------------------------------------------------------------- -+ * Function: usb_AggSettingRxUpdate() -+ * -+ * Overview: Seperate TX/RX parameters update independent for TP detection and -+ * dynamic TX/RX aggreagtion parameters update. -+ * -+ * Input: PADAPTER -+ * -+ * Output/Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 12/10/2010 MHC Seperate to smaller function. -+ * -+ *---------------------------------------------------------------------------*/ -+static VOID -+usb_AggSettingRxUpdate( -+ IN PADAPTER Adapter -+ ) -+{ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ //PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); -+ u8 valueDMA; -+ u8 valueUSB; -+ -+ valueDMA = rtw_read8(Adapter, REG_TRXDMA_CTRL); -+ valueUSB = rtw_read8(Adapter, REG_USB_SPECIAL_OPTION); -+ -+ switch(pHalData->UsbRxAggMode) -+ { -+ case USB_RX_AGG_DMA: -+ valueDMA |= RXDMA_AGG_EN; -+ valueUSB &= ~USB_AGG_EN; -+ break; -+ case USB_RX_AGG_USB: -+ valueDMA &= ~RXDMA_AGG_EN; -+ valueUSB |= USB_AGG_EN; -+ break; -+ case USB_RX_AGG_MIX: -+ valueDMA |= RXDMA_AGG_EN; -+ valueUSB |= USB_AGG_EN; -+ break; -+ case USB_RX_AGG_DISABLE: -+ default: -+ valueDMA &= ~RXDMA_AGG_EN; -+ valueUSB &= ~USB_AGG_EN; -+ break; -+ } -+ -+ rtw_write8(Adapter, REG_TRXDMA_CTRL, valueDMA); -+ rtw_write8(Adapter, REG_USB_SPECIAL_OPTION, valueUSB); -+ -+ switch(pHalData->UsbRxAggMode) -+ { -+ case USB_RX_AGG_DMA: -+ rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, pHalData->UsbRxAggPageCount); -+ rtw_write8(Adapter, REG_USB_DMA_AGG_TO, pHalData->UsbRxAggPageTimeout); -+ break; -+ case USB_RX_AGG_USB: -+ rtw_write8(Adapter, REG_USB_AGG_TH, pHalData->UsbRxAggBlockCount); -+ rtw_write8(Adapter, REG_USB_AGG_TO, pHalData->UsbRxAggBlockTimeout); -+ break; -+ case USB_RX_AGG_MIX: -+ rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, pHalData->UsbRxAggPageCount); -+ rtw_write8(Adapter, REG_USB_DMA_AGG_TO, pHalData->UsbRxAggPageTimeout); -+ rtw_write8(Adapter, REG_USB_AGG_TH, pHalData->UsbRxAggBlockCount); -+ rtw_write8(Adapter, REG_USB_AGG_TO, pHalData->UsbRxAggBlockTimeout); -+ break; -+ case USB_RX_AGG_DISABLE: -+ default: -+ // TODO: -+ break; -+ } -+ -+ switch(PBP_128) -+ { -+ case PBP_128: -+ pHalData->HwRxPageSize = 128; -+ break; -+ case PBP_64: -+ pHalData->HwRxPageSize = 64; -+ break; -+ case PBP_256: -+ pHalData->HwRxPageSize = 256; -+ break; -+ case PBP_512: -+ pHalData->HwRxPageSize = 512; -+ break; -+ case PBP_1024: -+ pHalData->HwRxPageSize = 1024; -+ break; -+ default: -+ //RT_ASSERT(FALSE, ("RX_PAGE_SIZE_REG_VALUE definition is incorrect!\n")); -+ break; -+ } -+#endif -+} // usb_AggSettingRxUpdate -+ -+static VOID -+InitUsbAggregationSetting( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ // Tx aggregation setting -+ usb_AggSettingTxUpdate(Adapter); -+ -+ // Rx aggregation setting -+ usb_AggSettingRxUpdate(Adapter); -+ -+ // 201/12/10 MH Add for USB agg mode dynamic switch. -+ pHalData->UsbRxHighSpeedMode = _FALSE; -+} -+ -+/*----------------------------------------------------------------------------- -+ * Function: USB_AggModeSwitch() -+ * -+ * Overview: When RX traffic is more than 40M, we need to adjust some parameters to increase -+ * RX speed by increasing batch indication size. This will decrease TCP ACK speed, we -+ * need to monitor the influence of FTP/network share. -+ * For TX mode, we are still ubder investigation. -+ * -+ * Input: PADAPTER -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 12/10/2010 MHC Create Version 0. -+ * -+ *---------------------------------------------------------------------------*/ -+VOID -+USB_AggModeSwitch( -+ IN PADAPTER Adapter -+ ) -+{ -+#if 0 -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); -+ -+ //pHalData->UsbRxHighSpeedMode = FALSE; -+ // How to measure the RX speed? We assume that when traffic is more than -+ if (pMgntInfo->bRegAggDMEnable == _FALSE) -+ { -+ return; // Inf not support. -+ } -+ -+ -+ if (pmlmepriv->LinkDetectInfo.bHigherBusyTraffic == _TRUE && -+ pHalData->UsbRxHighSpeedMode == _FALSE) -+ { -+ pHalData->UsbRxHighSpeedMode = _TRUE; -+ DBG_8192C("UsbAggModeSwitchCheck to HIGH\n"); -+ } -+ else if (pmlmepriv->LinkDetectInfo.bHigherBusyTraffic == _FALSE && -+ pHalData->UsbRxHighSpeedMode == _TRUE) -+ { -+ pHalData->UsbRxHighSpeedMode = _FALSE; -+ DBG_8192C("UsbAggModeSwitchCheck to LOW\n"); -+ } -+ else -+ { -+ return; -+ } -+ -+ // 2010/12/10 MH Add for USB Aggregation judgement we need to -+ //if( pMgntInfo->LinkDetectInfo.NumRxOkInPeriod > 4000 || -+ // pMgntInfo->LinkDetectInfo.NumTxOkInPeriod > 4000 ) -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ //usb_AggSettingTxUpdate(Adapter); -+#endif -+ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ if (pHalData->UsbRxHighSpeedMode == _TRUE) -+ { -+ // 2010/12/10 MH The parameter is tested by SD1 engineer and SD3 channel emulator. -+ // USB mode -+ pHalData->UsbRxAggBlockCount = 40; -+ pHalData->UsbRxAggBlockTimeout = 5; -+ // Mix mode -+ pHalData->UsbRxAggPageCount = 72; -+ pHalData->UsbRxAggPageTimeout = 6; -+ } -+ else -+ { -+ // USB mode -+ pHalData->UsbRxAggBlockCount = pMgntInfo->RegUsbRxAggBlockCount; -+ pHalData->UsbRxAggBlockTimeout = pMgntInfo->RegUsbRxAggBlockTimeout; -+ // Mix mode -+ pHalData->UsbRxAggPageCount = pMgntInfo->RegUsbRxAggPageCount; -+ pHalData->UsbRxAggPageTimeout = pMgntInfo->RegUsbRxAggPageTimeout; -+ } -+#endif -+#endif -+} // USB_AggModeSwitch -+ -+static VOID -+_InitOperationMode( -+ IN PADAPTER Adapter -+ ) -+{ -+#if 0//gtest -+ PHAL_DATA_8192CUSB pHalData = GetHalData8192CUsb(Adapter); -+ u1Byte regBwOpMode = 0; -+ u4Byte regRATR = 0, regRRSR = 0; -+ -+ -+ //1 This part need to modified according to the rate set we filtered!! -+ // -+ // Set RRSR, RATR, and REG_BWOPMODE registers -+ // -+ switch(Adapter->RegWirelessMode) -+ { -+ case WIRELESS_MODE_B: -+ regBwOpMode = BW_OPMODE_20MHZ; -+ regRATR = RATE_ALL_CCK; -+ regRRSR = RATE_ALL_CCK; -+ break; -+ case WIRELESS_MODE_A: -+ ASSERT(FALSE); -+#if 0 -+ regBwOpMode = BW_OPMODE_5G |BW_OPMODE_20MHZ; -+ regRATR = RATE_ALL_OFDM_AG; -+ regRRSR = RATE_ALL_OFDM_AG; -+#endif -+ break; -+ case WIRELESS_MODE_G: -+ regBwOpMode = BW_OPMODE_20MHZ; -+ regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; -+ regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; -+ break; -+ case WIRELESS_MODE_AUTO: -+ if (Adapter->bInHctTest) -+ { -+ regBwOpMode = BW_OPMODE_20MHZ; -+ regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; -+ regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; -+ } -+ else -+ { -+ regBwOpMode = BW_OPMODE_20MHZ; -+ regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; -+ regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; -+ } -+ break; -+ case WIRELESS_MODE_N_24G: -+ // It support CCK rate by default. -+ // CCK rate will be filtered out only when associated AP does not support it. -+ regBwOpMode = BW_OPMODE_20MHZ; -+ regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; -+ regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; -+ break; -+ case WIRELESS_MODE_N_5G: -+ ASSERT(FALSE); -+#if 0 -+ regBwOpMode = BW_OPMODE_5G; -+ regRATR = RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; -+ regRRSR = RATE_ALL_OFDM_AG; -+#endif -+ break; -+ } -+ -+ // Ziv ???????? -+ //PlatformEFIOWrite4Byte(Adapter, REG_INIRTS_RATE_SEL, regRRSR); -+ PlatformEFIOWrite1Byte(Adapter, REG_BWOPMODE, regBwOpMode); -+ -+ // For Min Spacing configuration. -+ switch(pHalData->RF_Type) -+ { -+ case RF_1T2R: -+ case RF_1T1R: -+ RT_TRACE(COMP_INIT, DBG_LOUD, ("Initializeadapter: RF_Type%s\n", (pHalData->RF_Type==RF_1T1R? "(1T1R)":"(1T2R)"))); -+ Adapter->MgntInfo.MinSpaceCfg = (MAX_MSS_DENSITY_1T<<3); -+ break; -+ case RF_2T2R: -+ case RF_2T2R_GREEN: -+ RT_TRACE(COMP_INIT, DBG_LOUD, ("Initializeadapter:RF_Type(2T2R)\n")); -+ Adapter->MgntInfo.MinSpaceCfg = (MAX_MSS_DENSITY_2T<<3); -+ break; -+ } -+ -+ PlatformEFIOWrite1Byte(Adapter, REG_AMPDU_MIN_SPACE, Adapter->MgntInfo.MinSpaceCfg); -+#endif -+} -+ -+ -+ static VOID -+_InitBeaconParameters( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ rtw_write16(Adapter, REG_BCN_CTRL, 0x1010); -+ -+ // TODO: Remove these magic number -+ rtw_write16(Adapter, REG_TBTT_PROHIBIT,0x6404);// ms -+ -+ rtw_write8(Adapter, REG_DRVERLYINT, DRIVER_EARLY_INT_TIME);// 5ms -+ rtw_write8(Adapter, REG_BCNDMATIM, BCN_DMA_ATIME_INT_TIME); // 2ms -+ -+ // Suggested by designer timchen. Change beacon AIFS to the largest number -+ // beacause test chip does not contension before sending beacon. by tynli. 2009.11.03 -+ rtw_write16(Adapter, REG_BCNTCFG, 0x660F); -+} -+ -+static VOID -+_InitRFType( -+ IN PADAPTER Adapter -+ ) -+{ -+ struct registry_priv *pregpriv = &Adapter->registrypriv; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ BOOLEAN is92CU = IS_92C_SERIAL(pHalData->VersionID); -+ -+#if DISABLE_BB_RF -+ pHalData->rf_chip = RF_PSEUDO_11N; -+ return; -+#endif -+ -+ pHalData->rf_chip = RF_6052; -+ -+ if(_FALSE == is92CU){ -+ pHalData->rf_type = RF_1T1R; -+ DBG_8192C("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n"); -+ return; -+ } -+ -+ // TODO: Consider that EEPROM set 92CU to 1T1R later. -+ // Force to overwrite setting according to chip version. Ignore EEPROM setting. -+ //pHalData->RF_Type = is92CU ? RF_2T2R : RF_1T1R; -+ MSG_8192C("Set RF Chip ID to RF_6052 and RF type to %d.\n", pHalData->rf_type); -+ -+} -+ -+static VOID _InitAdhocWorkaroundParams(IN PADAPTER Adapter) -+{ -+#if RTL8192CU_ADHOC_WORKAROUND_SETTING -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ pHalData->RegBcnCtrlVal = rtw_read8(Adapter, REG_BCN_CTRL); -+ pHalData->RegTxPause = rtw_read8(Adapter, REG_TXPAUSE); -+ pHalData->RegFwHwTxQCtrl = rtw_read8(Adapter, REG_FWHW_TXQ_CTRL+2); -+ pHalData->RegReg542 = rtw_read8(Adapter, REG_TBTT_PROHIBIT+2); -+#endif -+} -+ -+static VOID -+_BeaconFunctionEnable( -+ IN PADAPTER Adapter, -+ IN BOOLEAN Enable, -+ IN BOOLEAN Linked -+ ) -+{ -+ rtw_write8(Adapter, REG_BCN_CTRL, (BIT4 | BIT3 | BIT1)); -+ //SetBcnCtrlReg(Adapter, (BIT4 | BIT3 | BIT1), 0x00); -+ //RT_TRACE(COMP_BEACON, DBG_LOUD, ("_BeaconFunctionEnable 0x550 0x%x\n", PlatformEFIORead1Byte(Adapter, 0x550))); -+ -+ rtw_write8(Adapter, REG_RD_CTRL+1, 0x6F); -+} -+ -+ -+// Set CCK and OFDM Block "ON" -+static VOID _BBTurnOnBlock( -+ IN PADAPTER Adapter -+ ) -+{ -+#if (DISABLE_BB_RF) -+ return; -+#endif -+ -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bCCKEn, 0x1); -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1); -+} -+ -+static VOID _RfPowerSave( -+ IN PADAPTER Adapter -+ ) -+{ -+#if 0 -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); -+ u1Byte eRFPath; -+ -+#if (DISABLE_BB_RF) -+ return; -+#endif -+ -+ if(pMgntInfo->RegRfOff == TRUE){ // User disable RF via registry. -+ RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter8192CUsb(): Turn off RF for RegRfOff.\n")); -+ MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW); -+ // Those action will be discard in MgntActSet_RF_State because off the same state -+ for(eRFPath = 0; eRFPath NumTotalRFPath; eRFPath++) -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0); -+ } -+ else if(pMgntInfo->RfOffReason > RF_CHANGE_BY_PS){ // H/W or S/W RF OFF before sleep. -+ RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter8192CUsb(): Turn off RF for RfOffReason(%ld).\n", pMgntInfo->RfOffReason)); -+ MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason); -+ } -+ else{ -+ pHalData->eRFPowerState = eRfOn; -+ pMgntInfo->RfOffReason = 0; -+ if(Adapter->bInSetPower || Adapter->bResetInProgress) -+ PlatformUsbEnableInPipes(Adapter); -+ RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter8192CUsb(): RF is on.\n")); -+ } -+#endif -+} -+ -+enum { -+ Antenna_Lfet = 1, -+ Antenna_Right = 2, -+}; -+ -+static VOID -+_InitAntenna_Selection(IN PADAPTER Adapter) -+{ -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(pHalData->AntDivCfg==0) -+ return; -+ DBG_8192C("==> %s ....\n",__FUNCTION__); -+ -+ if((RF_1T1R == pHalData->rf_type)) -+ { -+ rtw_write32(Adapter, REG_LEDCFG0, rtw_read32(Adapter, REG_LEDCFG0)|BIT23); -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, BIT13, 0x01); -+ -+ if(PHY_QueryBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300) == Antenna_A) -+ pHalData->CurAntenna = Antenna_A; -+ else -+ pHalData->CurAntenna = Antenna_B; -+ DBG_8192C("%s,Cur_ant:(%x)%s\n",__FUNCTION__,pHalData->CurAntenna,(pHalData->CurAntenna == Antenna_A)?"Antenna_A":"Antenna_B"); -+ -+} -+ -+ -+} -+// -+// 2010/08/09 MH Add for power down check. -+// -+static BOOLEAN -+HalDetectPwrDownMode( -+ IN PADAPTER Adapter -+ ) -+{ -+ u8 tmpvalue; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv; -+ -+ EFUSE_ShadowRead(Adapter, 1, EEPROM_RF_OPT3, (u32 *)&tmpvalue); -+ -+ // 2010/08/25 MH INF priority > PDN Efuse value. -+ if(tmpvalue & BIT4 && pwrctrlpriv->reg_pdnmode) -+ { -+ pHalData->pwrdown = _TRUE; -+ } -+ else -+ { -+ pHalData->pwrdown = _FALSE; -+ } -+ -+ DBG_8192C("HalDetectPwrDownMode(): PDN=%d\n", pHalData->pwrdown); -+ return pHalData->pwrdown; -+ -+} // HalDetectPwrDownMode -+ -+ -+// -+// 2010/08/26 MH Add for selective suspend mode check. -+// If Efuse 0x0e bit1 is not enabled, we can not support selective suspend for Minicard and -+// slim card. -+// -+static VOID -+HalDetectSelectiveSuspendMode( -+ IN PADAPTER Adapter -+ ) -+{ -+ u8 tmpvalue; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(Adapter); -+ -+ // If support HW radio detect, we need to enable WOL ability, otherwise, we -+ // can not use FW to notify host the power state switch. -+ -+ EFUSE_ShadowRead(Adapter, 1, EEPROM_USB_OPTIONAL1, (u32 *)&tmpvalue); -+ -+ DBG_8192C("HalDetectSelectiveSuspendMode(): SS "); -+ if(tmpvalue & BIT1) -+ { -+ DBG_8192C("Enable\n"); -+ } -+ else -+ { -+ DBG_8192C("Disable\n"); -+ pdvobjpriv->RegUsbSS = _FALSE; -+ } -+ -+ // 2010/09/01 MH According to Dongle Selective Suspend INF. We can switch SS mode. -+ if (pdvobjpriv->RegUsbSS && !SUPPORT_HW_RADIO_DETECT(pHalData)) -+ { -+ //PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); -+ -+ //if (!pMgntInfo->bRegDongleSS) -+ //{ -+ // RT_TRACE(COMP_INIT, DBG_LOUD, ("Dongle disable SS\n")); -+ pdvobjpriv->RegUsbSS = _FALSE; -+ //} -+ } -+} // HalDetectSelectiveSuspendMode -+/*----------------------------------------------------------------------------- -+ * Function: HwSuspendModeEnable92Cu() -+ * -+ * Overview: HW suspend mode switch. -+ * -+ * Input: NONE -+ * -+ * Output: NONE -+ * -+ * Return: NONE -+ * -+ * Revised History: -+ * When Who Remark -+ * 08/23/2010 MHC HW suspend mode switch test.. -+ *---------------------------------------------------------------------------*/ -+static VOID -+HwSuspendModeEnable92Cu( -+ IN PADAPTER pAdapter, -+ IN u8 Type -+ ) -+{ -+ //PRT_USB_DEVICE pDevice = GET_RT_USB_DEVICE(pAdapter); -+ u16 reg = rtw_read16(pAdapter, REG_GPIO_MUXCFG); -+ -+ //if (!pDevice->RegUsbSS) -+ { -+ return; -+ } -+ -+ // -+ // 2010/08/23 MH According to Alfred's suggestion, we need to to prevent HW -+ // to enter suspend mode automatically. Otherwise, it will shut down major power -+ // domain and 8051 will stop. When we try to enter selective suspend mode, we -+ // need to prevent HW to enter D2 mode aumotmatically. Another way, Host will -+ // issue a S10 signal to power domain. Then it will cleat SIC setting(from Yngli). -+ // We need to enable HW suspend mode when enter S3/S4 or disable. We need -+ // to disable HW suspend mode for IPS/radio_off. -+ // -+ //RT_TRACE(COMP_RF, DBG_LOUD, ("HwSuspendModeEnable92Cu = %d\n", Type)); -+ if (Type == _FALSE) -+ { -+ reg |= BIT14; -+ //RT_TRACE(COMP_RF, DBG_LOUD, ("REG_GPIO_MUXCFG = %x\n", reg)); -+ rtw_write16(pAdapter, REG_GPIO_MUXCFG, reg); -+ reg |= BIT12; -+ //RT_TRACE(COMP_RF, DBG_LOUD, ("REG_GPIO_MUXCFG = %x\n", reg)); -+ rtw_write16(pAdapter, REG_GPIO_MUXCFG, reg); -+ } -+ else -+ { -+ reg &= (~BIT12); -+ rtw_write16(pAdapter, REG_GPIO_MUXCFG, reg); -+ reg &= (~BIT14); -+ rtw_write16(pAdapter, REG_GPIO_MUXCFG, reg); -+ } -+ -+} // HwSuspendModeEnable92Cu -+rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ u8 val8; -+ rt_rf_power_state rfpowerstate = rf_off; -+ -+ if(pAdapter->pwrctrlpriv.bHWPowerdown) -+ { -+ val8 = rtw_read8(pAdapter, REG_HSISR); -+ DBG_8192C("pwrdown, 0x5c(BIT7)=%02x\n", val8); -+ rfpowerstate = (val8 & BIT7) ? rf_off: rf_on; -+ } -+ else // rf on/off -+ { -+ rtw_write8( pAdapter, REG_MAC_PINMUX_CFG,rtw_read8(pAdapter, REG_MAC_PINMUX_CFG)&~(BIT3)); -+ val8 = rtw_read8(pAdapter, REG_GPIO_IO_SEL); -+ DBG_8192C("GPIO_IN=%02x\n", val8); -+ rfpowerstate = (val8 & BIT3) ? rf_on : rf_off; -+ } -+ return rfpowerstate; -+} // HalDetectPwrDownMode -+ -+void _ps_open_RF(_adapter *padapter); -+ -+ -+u32 rtl8192cu_hal_init(PADAPTER Adapter) -+{ -+ u8 val8 = 0; -+ u32 boundary, status = _SUCCESS; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv; -+ struct registry_priv *pregistrypriv = &Adapter->registrypriv; -+ u8 is92C = IS_92C_SERIAL(pHalData->VersionID); -+ rt_rf_power_state eRfPowerStateToSet; -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+#endif -+ -+ u32 init_start_time = rtw_get_current_time(); -+ -+ -+#ifdef DBG_HAL_INIT_PROFILING -+ -+ enum HAL_INIT_STAGES { -+ HAL_INIT_STAGES_BEGIN = 0, -+ HAL_INIT_STAGES_INIT_PW_ON, -+ HAL_INIT_STAGES_MISC01, -+ HAL_INIT_STAGES_DOWNLOAD_FW, -+ HAL_INIT_STAGES_INIT_LLTT, -+ HAL_INIT_STAGES_MAC, -+ HAL_INIT_STAGES_MISC02, -+ HAL_INIT_STAGES_BB, -+ HAL_INIT_STAGES_RF, -+ HAL_INIT_STAGES_TURN_ON_BLOCK, -+ HAL_INIT_STAGES_INIT_SECURITY, -+ HAL_INIT_STAGES_MISC11, -+ //HAL_INIT_STAGES_RF_PS, -+ HAL_INIT_STAGES_IQK, -+ HAL_INIT_STAGES_PW_TRACK, -+ HAL_INIT_STAGES_LCK, -+ HAL_INIT_STAGES_MISC21, -+ HAL_INIT_STAGES_INIT_PABIAS, -+ HAL_INIT_STAGES_BT_COEXIST, -+ //HAL_INIT_STAGES_ANTENNA_SEL, -+ HAL_INIT_STAGES_INIT_HAL_DM, -+ HAL_INIT_STAGES_MISC31, -+ HAL_INIT_STAGES_END, -+ HAL_INIT_STAGES_NUM -+ }; -+ -+ char * hal_init_stages_str[] = { -+ "HAL_INIT_STAGES_BEGIN", -+ "HAL_INIT_STAGES_INIT_PW_ON", -+ "HAL_INIT_STAGES_MISC01", -+ "HAL_INIT_STAGES_DOWNLOAD_FW", -+ "HAL_INIT_STAGES_INIT_LLTT", -+ "HAL_INIT_STAGES_MAC", -+ "HAL_INIT_STAGES_MISC02", -+ "HAL_INIT_STAGES_BB", -+ "HAL_INIT_STAGES_RF", -+ "HAL_INIT_STAGES_TURN_ON_BLOCK", -+ "HAL_INIT_STAGES_INIT_SECURITY", -+ "HAL_INIT_STAGES_MISC11", -+ //"HAL_INIT_STAGES_RF_PS", -+ "HAL_INIT_STAGES_IQK", -+ "HAL_INIT_STAGES_PW_TRACK", -+ "HAL_INIT_STAGES_LCK", -+ "HAL_INIT_STAGES_MISC21", -+ "HAL_INIT_STAGES_INIT_PABIAS", -+ "HAL_INIT_STAGES_BT_COEXIST", -+ //"HAL_INIT_STAGES_ANTENNA_SEL", -+ "HAL_INIT_STAGES_INIT_HAL_DM", -+ "HAL_INIT_STAGES_MISC31", -+ "HAL_INIT_STAGES_END", -+ }; -+ -+ int hal_init_profiling_i; -+ u32 hal_init_stages_timestamp[HAL_INIT_STAGES_NUM]; //used to record the time of each stage's starting point -+ -+ for(hal_init_profiling_i=0;hal_init_profiling_ipwrctrlpriv.bkeepfwalive) -+ { -+ _ps_open_RF(Adapter); -+ -+ if(pHalData->bIQKInitialized ){ -+ rtl8192c_PHY_IQCalibrate(Adapter,_TRUE); -+ } -+ else{ -+ rtl8192c_PHY_IQCalibrate(Adapter,_FALSE); -+ pHalData->bIQKInitialized = _TRUE; -+ } -+ rtl8192c_dm_CheckTXPowerTracking(Adapter); -+ rtl8192c_PHY_LCCalibrate(Adapter); -+ -+ goto exit; -+ } -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PW_ON); -+ status = _InitPowerOn(Adapter); -+ if(status == _FAIL){ -+ RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init power on!\n")); -+ goto exit; -+ } -+ -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC01); -+ _InitQueueReservedPage(Adapter); -+ _InitTxBufferBoundary(Adapter); -+ _InitQueuePriority(Adapter); -+ _InitPageBoundary(Adapter); -+ _InitTransferPageSize(Adapter); -+ -+ -+#if ENABLE_USB_DROP_INCORRECT_OUT -+ _InitHardwareDropIncorrectBulkOut(Adapter); -+#endif -+ -+ if(pHalData->bRDGEnable){ -+ _InitRDGSetting(Adapter); -+ } -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW); -+#if (1 == MP_DRIVER) -+ _InitRxSetting(Adapter); -+ // Don't Download Firmware -+ Adapter->bFWReady = _FALSE; -+#elif RTL8192CU_FW_DOWNLOAD_ENABLE -+ status = FirmwareDownload92C(Adapter,_FALSE); -+ if(status != _SUCCESS) -+ { -+ Adapter->bFWReady = _FALSE; -+ pHalData->fw_ractrl = _FALSE; -+ DBG_8192C("fw download fail!\n"); -+ goto exit; -+ } -+ else -+ { -+ Adapter->bFWReady = _TRUE; -+ pHalData->fw_ractrl = _TRUE; -+ DBG_8192C("fw download ok!\n"); -+ } -+#endif -+ -+ InitializeFirmwareVars92C(Adapter); -+ -+ if(pwrctrlpriv->reg_rfoff == _TRUE){ -+ pwrctrlpriv->rf_pwrstate = rf_off; -+ } -+ -+ // 2010/08/09 MH We need to check if we need to turnon or off RF after detecting -+ // HW GPIO pin. Before PHY_RFConfig8192C. -+ //HalDetectPwrDownMode(Adapter); -+ // 2010/08/26 MH If Efuse does not support sective suspend then disable the function. -+ //HalDetectSelectiveSuspendMode(Adapter); -+ -+ // Set RF type for BB/RF configuration -+ _InitRFType(Adapter);//->_ReadRFType() -+ -+ // Save target channel -+ // Current Channel will be updated again later. -+ pHalData->CurrentChannel = 6;//default set to 6 -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_LLTT); -+ if(!pregistrypriv->wifi_spec){ -+ boundary = TX_PAGE_BOUNDARY; -+ } -+ else{// for WMM -+ boundary = WMM_NORMAL_TX_PAGE_BOUNDARY; -+ } -+ status = InitLLTTable(Adapter, boundary); -+ if(status == _FAIL){ -+ RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init LLT table\n")); -+ goto exit; -+ } -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC); -+#if (HAL_MAC_ENABLE == 1) -+ status = PHY_MACConfig8192C(Adapter); -+ if(status == _FAIL) -+ { -+ goto exit; -+ } -+#endif -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02); -+ // Get Rx PHY status in order to report RSSI and others. -+ _InitDriverInfoSize(Adapter, DRVINFO_SZ); -+ -+ _InitInterrupt(Adapter); -+ hal_init_macaddr(Adapter);//set mac_address -+ _InitNetworkType(Adapter);//set msr -+ _InitWMACSetting(Adapter); -+ _InitAdaptiveCtrl(Adapter); -+ _InitEDCA(Adapter); -+ _InitRateFallback(Adapter); -+ _InitRetryFunction(Adapter); -+ InitUsbAggregationSetting(Adapter); -+ _InitOperationMode(Adapter);//todo -+ _InitBeaconParameters(Adapter); -+ _InitBeaconMaxError(Adapter, _TRUE); -+ -+#if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_TX_MCAST2UNI) -+ -+#ifdef CONFIG_CHECK_AC_LIFETIME -+ // Enable lifetime check for the four ACs -+ rtw_write8(Adapter, REG_LIFETIME_EN, 0x0F); -+#endif // CONFIG_CHECK_AC_LIFETIME -+ -+#ifdef CONFIG_TX_MCAST2UNI -+ rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x0400); // unit: 256us. 256ms -+ rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); // unit: 256us. 256ms -+#else // CONFIG_TX_MCAST2UNI -+ rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x3000); // unit: 256us. 3s -+ rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x3000); // unit: 256us. 3s -+#endif // CONFIG_TX_MCAST2UNI -+#endif // CONFIG_CONCURRENT_MODE || CONFIG_TX_MCAST2UNI -+ -+ -+#ifdef CONFIG_LED -+ _InitHWLed(Adapter); -+#endif //CONFIG_LED -+ -+ // -+ //d. Initialize BB related configurations. -+ // -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB); -+#if (HAL_BB_ENABLE == 1) -+ status = PHY_BBConfig8192C(Adapter); -+ if(status == _FAIL) -+ { -+ goto exit; -+ } -+#endif -+ -+ // 92CU use 3-wire to r/w RF -+ //pHalData->Rf_Mode = RF_OP_By_SW_3wire; -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF); -+#if (HAL_RF_ENABLE == 1) -+ status = PHY_RFConfig8192C(Adapter); -+ if(status == _FAIL) -+ { -+ goto exit; -+ } -+ -+ if(IS_VENDOR_UMC_A_CUT(pHalData->VersionID) && !IS_92C_SERIAL(pHalData->VersionID)) -+ { -+ PHY_SetRFReg(Adapter, RF_PATH_A, RF_RX_G1, bMaskDWord, 0x30255); -+ PHY_SetRFReg(Adapter, RF_PATH_A, RF_RX_G2, bMaskDWord, 0x50a00); -+ } -+#endif -+ -+ // -+ // Joseph Note: Keep RfRegChnlVal for later use. -+ // -+ pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)0, RF_CHNLBW, bRFRegOffsetMask); -+ pHalData->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)1, RF_CHNLBW, bRFRegOffsetMask); -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK); -+ _BBTurnOnBlock(Adapter); -+ //NicIFSetMacAddress(padapter, padapter->PermanentAddress); -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_SECURITY); -+ invalidate_cam_all(Adapter); -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC11); -+ // 2010/12/17 MH We need to set TX power according to EFUSE content at first. -+ PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel); -+ -+// Move by Neo for USB SS to below setp -+//_RfPowerSave(Adapter); -+ -+ if (!IS_92C_SERIAL( pHalData->VersionID) && (pHalData->AntDivCfg!=0)) -+ { //for 88CU ,1T1R -+ _InitAntenna_Selection(Adapter); -+ } -+ -+ -+ // -+ // Disable BAR, suggested by Scott -+ // 2010.04.09 add by hpfan -+ // -+ rtw_write32(Adapter, REG_BAR_MODE_CTRL, 0x0201ffff); -+ -+ // HW SEQ CTRL -+ //set 0x0 to 0xFF by tynli. Default enable HW SEQ NUM. -+ rtw_write8(Adapter,REG_HWSEQ_CTRL, 0xFF); -+ -+ if(pregistrypriv->wifi_spec) -+ rtw_write16(Adapter,REG_FAST_EDCA_CTRL ,0); -+ -+ //Nav limit , suggest by scott -+ rtw_write8(Adapter, 0x652, 0x0); -+ -+#if (MP_DRIVER == 1) -+ Adapter->mppriv.channel = pHalData->CurrentChannel; -+ MPT_InitializeAdapter(Adapter, Adapter->mppriv.channel); -+#else -+ // -+ // 2010/08/11 MH Merge from 8192SE for Minicard init. We need to confirm current radio status -+ // and then decide to enable RF or not.!!!??? For Selective suspend mode. We may not -+ // call init_adapter. May cause some problem?? -+ // -+ // Fix the bug that Hw/Sw radio off before S3/S4, the RF off action will not be executed -+ // in MgntActSet_RF_State() after wake up, because the value of pHalData->eRFPowerState -+ // is the same as eRfOff, we should change it to eRfOn after we config RF parameters. -+ // Added by tynli. 2010.03.30. -+ pwrctrlpriv->rf_pwrstate = rf_on; -+ -+#if 0 //to do -+ RT_CLEAR_PS_LEVEL(pwrctrlpriv, RT_RF_OFF_LEVL_HALT_NIC); -+#if 1 //Todo -+ // 20100326 Joseph: Copy from GPIOChangeRFWorkItemCallBack() function to check HW radio on/off. -+ // 20100329 Joseph: Revise and integrate the HW/SW radio off code in initialization. -+ -+ eRfPowerStateToSet = (rt_rf_power_state) RfOnOffDetect(Adapter); -+ pwrctrlpriv->rfoff_reason |= eRfPowerStateToSet==rf_on ? RF_CHANGE_BY_INIT : RF_CHANGE_BY_HW; -+ pwrctrlpriv->rfoff_reason |= (pwrctrlpriv->reg_rfoff) ? RF_CHANGE_BY_SW : 0; -+ -+ if(pwrctrlpriv->rfoff_reason&RF_CHANGE_BY_HW) -+ pwrctrlpriv->b_hw_radio_off = _TRUE; -+ -+ DBG_8192C("eRfPowerStateToSet=%d\n", eRfPowerStateToSet); -+ -+ if(pwrctrlpriv->reg_rfoff == _TRUE) -+ { // User disable RF via registry. -+ DBG_8192C("InitializeAdapter8192CU(): Turn off RF for RegRfOff.\n"); -+ //MgntActSet_RF_State(Adapter, rf_off, RF_CHANGE_BY_SW, _TRUE); -+ -+ // Those action will be discard in MgntActSet_RF_State because off the same state -+ //for(eRFPath = 0; eRFPath NumTotalRFPath; eRFPath++) -+ //PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0); -+ } -+ else if(pwrctrlpriv->rfoff_reason > RF_CHANGE_BY_PS) -+ { // H/W or S/W RF OFF before sleep. -+ DBG_8192C(" Turn off RF for RfOffReason(%x) ----------\n", pwrctrlpriv->rfoff_reason); -+ //pwrctrlpriv->rfoff_reason = RF_CHANGE_BY_INIT; -+ pwrctrlpriv->rf_pwrstate = rf_on; -+ //MgntActSet_RF_State(Adapter, rf_off, pwrctrlpriv->rfoff_reason, _TRUE); -+ } -+ else -+ { -+ // Perform GPIO polling to find out current RF state. added by Roger, 2010.04.09. -+ if(pHalData->BoardType == BOARD_MINICARD /*&& (Adapter->MgntInfo.PowerSaveControl.bGpioRfSw)*/) -+ { -+ DBG_8192C("InitializeAdapter8192CU(): RF=%d \n", eRfPowerStateToSet); -+ if (eRfPowerStateToSet == rf_off) -+ { -+ //MgntActSet_RF_State(Adapter, rf_off, RF_CHANGE_BY_HW, _TRUE); -+ pwrctrlpriv->b_hw_radio_off = _TRUE; -+ } -+ else -+ { -+ pwrctrlpriv->rf_pwrstate = rf_off; -+ pwrctrlpriv->rfoff_reason = RF_CHANGE_BY_INIT; -+ pwrctrlpriv->b_hw_radio_off = _FALSE; -+ //MgntActSet_RF_State(Adapter, rf_on, pwrctrlpriv->rfoff_reason, _TRUE); -+ } -+ } -+ else -+ { -+ pwrctrlpriv->rf_pwrstate = rf_off; -+ pwrctrlpriv->rfoff_reason = RF_CHANGE_BY_INIT; -+ //MgntActSet_RF_State(Adapter, rf_on, pwrctrlpriv->rfoff_reason, _TRUE); -+ } -+ -+ pwrctrlpriv->rfoff_reason = 0; -+ pwrctrlpriv->b_hw_radio_off = _FALSE; -+ pwrctrlpriv->rf_pwrstate = rf_on; -+ rtw_led_control(Adapter, LED_CTL_POWER_ON); -+ -+ } -+ -+ // 2010/-8/09 MH For power down module, we need to enable register block contrl reg at 0x1c. -+ // Then enable power down control bit of register 0x04 BIT4 and BIT15 as 1. -+ if(pHalData->pwrdown && eRfPowerStateToSet == rf_off) -+ { -+ // Enable register area 0x0-0xc. -+ rtw_write8(Adapter, REG_RSV_CTRL, 0x0); -+ -+ // -+ // We should configure HW PDn source for WiFi ONLY, and then -+ // our HW will be set in power-down mode if PDn source from all functions are configured. -+ // 2010.10.06. -+ // -+ //if(IS_HARDWARE_TYPE_8723AU(Adapter)) -+ //{ -+ // u1bTmp = rtw_read8(Adapter, REG_MULTI_FUNC_CTRL); -+ // rtw_write8(Adapter, REG_MULTI_FUNC_CTRL, (u1bTmp|WL_HWPDN_EN)); -+ //} -+ //else -+ //{ -+ rtw_write16(Adapter, REG_APS_FSMCO, 0x8812); -+ //} -+ } -+ //DrvIFIndicateCurrentPhyStatus(Adapter); // 2010/08/17 MH Disable to prevent BSOD. -+#endif -+#endif -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_IQK); -+ // 2010/08/26 MH Merge from 8192CE. -+ if(pwrctrlpriv->rf_pwrstate == rf_on) -+ { -+ if(pHalData->bIQKInitialized ){ -+ rtl8192c_PHY_IQCalibrate(Adapter,_TRUE); -+ } -+ else -+ { -+ rtl8192c_PHY_IQCalibrate(Adapter,_FALSE); -+ pHalData->bIQKInitialized = _TRUE; -+ } -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK); -+ rtl8192c_dm_CheckTXPowerTracking(Adapter); -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK); -+ rtl8192c_PHY_LCCalibrate(Adapter); -+ } -+#endif /* #if (MP_DRIVER == 1) */ -+ -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC21); -+#if RTL8192CU_ADHOC_WORKAROUND_SETTING -+ _InitAdhocWorkaroundParams(Adapter); -+#endif -+ -+ -+#ifdef USB_INTERFERENCE_ISSUE -+ //fixed USB interface interference issue -+ rtw_write8(Adapter, 0xfe40, 0xe0); -+ rtw_write8(Adapter, 0xfe41, 0x8d); -+ rtw_write8(Adapter, 0xfe42, 0x80); -+ rtw_write32(Adapter,0x20c,0xfd0320); -+#if 1 -+ //2011/01/07 ,suggest by Johnny,for solved the problem that too many protocol error on USB bus -+ if(!IS_VENDOR_UMC_A_CUT(pHalData->VersionID) )//&& !IS_92C_SERIAL(pHalData->VersionID))// TSMC , 8188 -+ { -+ // 0xE6=0x94 -+ rtw_write8(Adapter, 0xFE40, 0xE6); -+ rtw_write8(Adapter, 0xFE41, 0x94); -+ rtw_write8(Adapter, 0xFE42, 0x80); -+ -+ // 0xE0=0x19 -+ rtw_write8(Adapter, 0xFE40, 0xE0); -+ rtw_write8(Adapter, 0xFE41, 0x19); -+ rtw_write8(Adapter, 0xFE42, 0x80); -+ -+ // 0xE5=0x91 -+ rtw_write8(Adapter, 0xFE40, 0xE5); -+ rtw_write8(Adapter, 0xFE41, 0x91); -+ rtw_write8(Adapter, 0xFE42, 0x80); -+ -+ // 0xE2=0x81 -+ rtw_write8(Adapter, 0xFE40, 0xE2); -+ rtw_write8(Adapter, 0xFE41, 0x81); -+ rtw_write8(Adapter, 0xFE42, 0x80); -+ -+ } -+ -+#endif -+#endif //USB_INTERFERENCE_ISSUE -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PABIAS); -+ _InitPABias(Adapter); -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BT_COEXIST); -+#ifdef CONFIG_BT_COEXIST -+ _InitBTCoexist(Adapter); -+#endif -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM); -+ rtl8192c_InitHalDm(Adapter); -+ -+ // 2010/08/23 MH According to Alfred's suggestion, we need to to prevent HW enter -+ // suspend mode automatically. -+ //HwSuspendModeEnable92Cu(Adapter, _FALSE); -+ -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC31); -+ rtw_write8(Adapter, 0x15, 0xe9);//suggest by Johnny for lower temperature -+ -+ rtw_write8(Adapter, 0xc87, 0x50);//suggest by Jackson for CCA -+ -+ //_dbg_dump_macreg(padapter); -+ -+ rtw_write16(Adapter, REG_BCN_CTRL, 0x1818); // For 2 PORT TSF SYNC -+ -+ -+ -+#ifdef CONFIG_XMIT_ACK -+ //ack for xmit mgmt frames. -+ rtw_write32(Adapter, REG_FWHW_TXQ_CTRL, rtw_read32(Adapter, REG_FWHW_TXQ_CTRL)|BIT(12)); -+#endif //CONFIG_XMIT_ACK -+ -+exit: -+HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END); -+ -+ DBG_871X("%s in %dms\n", __FUNCTION__, rtw_get_passing_time_ms(init_start_time)); -+ -+ #ifdef DBG_HAL_INIT_PROFILING -+ hal_init_stages_timestamp[HAL_INIT_STAGES_END]=rtw_get_current_time(); -+ -+ for(hal_init_profiling_i=0;hal_init_profiling_irf_type == RF_2T2R) -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x380038, 1); -+ else -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x38, 1); -+ PHY_SetBBReg(Adapter, rOFDM0_TRxPathEnable, 0xf0, 1); -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, BIT1, 0); -+ -+ //AFE -+ //DbgPrint("0x0e70 = %x\n", Adapter->PS_BBRegBackup[PSBBREG_AFE0]); -+ //PHY_SetBBReg(Adapter, 0x0e70, bMaskDWord ,Adapter->PS_BBRegBackup[PSBBREG_AFE0] ); -+ //PHY_SetBBReg(Adapter, 0x0e70, bMaskDWord ,0x631B25A0 ); -+ if (pHalData->rf_type == RF_2T2R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x63DB25A0 ); -+ else if (pHalData->rf_type == RF_1T1R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x631B25A0 ); -+ -+ // 4. issue 3-wire command that RF set to Rx idle mode. This is used to re-write the RX idle mode. -+ // We can only prvide a usual value instead and then HW will modify the value by itself. -+ PHY_SetRFReg(Adapter,RF_PATH_A, 0, bRFRegOffsetMask,0x32D95); -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetRFReg(Adapter,RF_PATH_B, 0, bRFRegOffsetMask,0x32D95); -+ } -+ } -+ else // Level 2 or others. -+ { -+ //h. AFE_PLL_CTRL 0x28[7:0] = 0x80 //disable AFE PLL -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL, 0x81); -+ -+ // i. AFE_XTAL_CTRL 0x24[15:0] = 0x880F //gated AFE DIG_CLOCK -+ rtw_write16(Adapter, REG_AFE_XTAL_CTRL, 0x800F); -+ rtw_mdelay_os(1); -+ -+ // 1. Enable MAC Clock. Can not be enabled now. -+ //WriteXBYTE(REG_SYS_CLKR+1, ReadXBYTE(REG_SYS_CLKR+1) | BIT(3)); -+ -+ // 2. Force PWM, Enable SPS18_LDO_Marco_Block -+ rtw_write8(Adapter, REG_SPS0_CTRL, -+ rtw_read8(Adapter, REG_SPS0_CTRL) | (BIT0|BIT3)); -+ -+ // 3. restore BB, AFE control register. -+ //RF -+ if (pHalData->rf_type == RF_2T2R) -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x380038, 1); -+ else -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x38, 1); -+ PHY_SetBBReg(Adapter, rOFDM0_TRxPathEnable, 0xf0, 1); -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, BIT1, 0); -+ -+ //AFE -+ if (pHalData->rf_type == RF_2T2R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x63DB25A0 ); -+ else if (pHalData->rf_type == RF_1T1R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x631B25A0 ); -+ -+ // 4. issue 3-wire command that RF set to Rx idle mode. This is used to re-write the RX idle mode. -+ // We can only prvide a usual value instead and then HW will modify the value by itself. -+ PHY_SetRFReg(Adapter,RF_PATH_A, 0, bRFRegOffsetMask,0x32D95); -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetRFReg(Adapter,RF_PATH_B, 0, bRFRegOffsetMask,0x32D95); -+ } -+ -+ // 5. gated MAC Clock -+ //WriteXBYTE(REG_SYS_CLKR+1, ReadXBYTE(REG_SYS_CLKR+1) & ~(BIT(3))); -+ //PlatformEFIOWrite1Byte(Adapter, REG_SYS_CLKR+1, PlatformEFIORead1Byte(Adapter, REG_SYS_CLKR+1)|(BIT3)); -+ -+ { -+ //u8 eRFPath = RF_PATH_A,value8 = 0, retry = 0; -+ u8 bytetmp; -+ //PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, 0x0, bMaskByte0, 0x0); -+ // 2010/08/12 MH Add for B path under SS test. -+ //if (pHalData->RF_Type == RF_2T2R) -+ //PHY_SetRFReg(Adapter, RF_PATH_B, 0x0, bMaskByte0, 0x0); -+ -+ bytetmp = rtw_read8(Adapter, REG_APSD_CTRL); -+ rtw_write8(Adapter, REG_APSD_CTRL, bytetmp & ~BIT6); -+ -+ rtw_mdelay_os(10); -+ -+ // Set BB reset at first -+ rtw_write8(Adapter, REG_SYS_FUNC_EN, 0x17 );//0x16 -+ //undo clock gated -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)&(~BIT31)); -+ // Enable TX -+ rtw_write8(Adapter, REG_TXPAUSE, 0x0); -+ } -+ //Adapter->HalFunc.InitializeAdapterHandler(Adapter, Adapter->MgntInfo.dot11CurrentChannelNumber); -+ //CardSelectiveSuspendLeave(Adapter); -+ } -+ -+ break; -+ -+ case rf_sleep: -+ case rf_off: -+ value8 = rtw_read8(Adapter, REG_SPS0_CTRL) ; -+ if (IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)) -+ value8 &= ~(BIT0); -+ else -+ value8 &= ~(BIT0|BIT3); -+ if (bRegSSPwrLvl == 1) -+ { -+ //RT_TRACE(COMP_POWER, DBG_LOUD, ("SS LVL1\n")); -+ // Disable RF and BB only for SelectSuspend. -+ -+ // 1. Set BB/RF to shutdown. -+ // (1) Reg878[5:3]= 0 // RF rx_code for preamble power saving -+ // (2)Reg878[21:19]= 0 //Turn off RF-B -+ // (3) RegC04[7:4]= 0 // turn off all paths for packet detection -+ // (4) Reg800[1] = 1 // enable preamble power saving -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_RF0] = PHY_QueryBBReg(Adapter, rFPGA0_XAB_RFParameter, bMaskDWord); -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_RF1] = PHY_QueryBBReg(Adapter, rOFDM0_TRxPathEnable, bMaskDWord); -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_RF2] = PHY_QueryBBReg(Adapter, rFPGA0_RFMOD, bMaskDWord); -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x380038, 0); -+ } -+ else if (pHalData->rf_type == RF_1T1R) -+ { -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x38, 0); -+ } -+ PHY_SetBBReg(Adapter, rOFDM0_TRxPathEnable, 0xf0, 0); -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, BIT1,1); -+ -+ // 2 .AFE control register to power down. bit[30:22] -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_AFE0] = PHY_QueryBBReg(Adapter, rRx_Wait_CCA, bMaskDWord); -+ if (pHalData->rf_type == RF_2T2R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x00DB25A0); -+ else if (pHalData->rf_type == RF_1T1R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x001B25A0); -+ -+ // 3. issue 3-wire command that RF set to power down. -+ PHY_SetRFReg(Adapter,RF_PATH_A, 0, bRFRegOffsetMask,0); -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetRFReg(Adapter,RF_PATH_B, 0, bRFRegOffsetMask,0); -+ } -+ -+ // 4. Force PFM , disable SPS18_LDO_Marco_Block -+ rtw_write8(Adapter, REG_SPS0_CTRL, value8); -+ -+ // 5. gated MAC Clock -+ //WriteXBYTE(REG_SYS_CLKR+1, ReadXBYTE(REG_SYS_CLKR+1) & ~(BIT(3))); -+ } -+ else // Level 2 or others. -+ { -+ //RT_TRACE(COMP_POWER, DBG_LOUD, ("SS LVL2\n")); -+ { -+ u8 eRFPath = RF_PATH_A,value8 = 0; -+ rtw_write8(Adapter, REG_TXPAUSE, 0xFF); -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, 0x0, bMaskByte0, 0x0); -+ // 2010/08/12 MH Add for B path under SS test. -+ //if (pHalData->RF_Type == RF_2T2R) -+ //PHY_SetRFReg(Adapter, RF_PATH_B, 0x0, bMaskByte0, 0x0); -+ -+ value8 |= APSDOFF; -+ rtw_write8(Adapter, REG_APSD_CTRL, value8);//0x40 -+ -+ // After switch APSD, we need to delay for stability -+ rtw_mdelay_os(10); -+ //before BB reset should do clock gated -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)|(BIT31)); -+ // Set BB reset at first -+ value8 = 0 ; -+ value8 |=( FEN_USBD | FEN_USBA | FEN_BB_GLB_RSTn); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN,value8 );//0x16 -+ } -+ -+ // Disable RF and BB only for SelectSuspend. -+ -+ // 1. Set BB/RF to shutdown. -+ // (1) Reg878[5:3]= 0 // RF rx_code for preamble power saving -+ // (2)Reg878[21:19]= 0 //Turn off RF-B -+ // (3) RegC04[7:4]= 0 // turn off all paths for packet detection -+ // (4) Reg800[1] = 1 // enable preamble power saving -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_RF0] = PHY_QueryBBReg(Adapter, rFPGA0_XAB_RFParameter, bMaskDWord); -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_RF1] = PHY_QueryBBReg(Adapter, rOFDM0_TRxPathEnable, bMaskDWord); -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_RF2] = PHY_QueryBBReg(Adapter, rFPGA0_RFMOD, bMaskDWord); -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x380038, 0); -+ } -+ else if (pHalData->rf_type == RF_1T1R) -+ { -+ PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, 0x38, 0); -+ } -+ PHY_SetBBReg(Adapter, rOFDM0_TRxPathEnable, 0xf0, 0); -+ PHY_SetBBReg(Adapter, rFPGA0_RFMOD, BIT1,1); -+ -+ // 2 .AFE control register to power down. bit[30:22] -+ Adapter->pwrctrlpriv.PS_BBRegBackup[PSBBREG_AFE0] = PHY_QueryBBReg(Adapter, rRx_Wait_CCA, bMaskDWord); -+ if (pHalData->rf_type == RF_2T2R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x00DB25A0); -+ else if (pHalData->rf_type == RF_1T1R) -+ PHY_SetBBReg(Adapter, rRx_Wait_CCA, bMaskDWord ,0x001B25A0); -+ -+ // 3. issue 3-wire command that RF set to power down. -+ PHY_SetRFReg(Adapter,RF_PATH_A, 0, bRFRegOffsetMask,0); -+ if (pHalData->rf_type == RF_2T2R) -+ { -+ PHY_SetRFReg(Adapter,RF_PATH_B, 0, bRFRegOffsetMask,0); -+ } -+ -+ // 4. Force PFM , disable SPS18_LDO_Marco_Block -+ rtw_write8(Adapter, REG_SPS0_CTRL, value8); -+ -+ // 2010/10/13 MH/Isaachsu exchange sequence. -+ //h. AFE_PLL_CTRL 0x28[7:0] = 0x80 //disable AFE PLL -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL, 0x80); -+ rtw_mdelay_os(1); -+ -+ // i. AFE_XTAL_CTRL 0x24[15:0] = 0x880F //gated AFE DIG_CLOCK -+ rtw_write16(Adapter, REG_AFE_XTAL_CTRL, 0xA80F); -+ -+ // 5. gated MAC Clock -+ //WriteXBYTE(REG_SYS_CLKR+1, ReadXBYTE(REG_SYS_CLKR+1) & ~(BIT(3))); -+ //PlatformEFIOWrite1Byte(Adapter, REG_SYS_CLKR+1, PlatformEFIORead1Byte(Adapter, REG_SYS_CLKR+1)& ~(BIT3)) -+ -+ //CardSelectiveSuspendEnter(Adapter); -+ } -+ -+ break; -+ -+ default: -+ break; -+ } -+ -+} // phy_PowerSwitch92CU -+ -+void _ps_open_RF(_adapter *padapter) { -+ //here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified -+ phy_SsPwrSwitch92CU(padapter, rf_on, 1); -+} -+ -+void _ps_close_RF(_adapter *padapter){ -+ //here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified -+ phy_SsPwrSwitch92CU(padapter, rf_off, 1); -+} -+#endif //SYNC_SD7_20110802_phy_SsPwrSwitch92CU -+ -+ -+ -+static VOID -+_DisableGPIO( -+ IN PADAPTER Adapter -+ ) -+{ -+/*************************************** -+j. GPIO_PIN_CTRL 0x44[31:0]=0x000 // -+k. Value = GPIO_PIN_CTRL[7:0] -+l. GPIO_PIN_CTRL 0x44[31:0] = 0x00FF0000 | (value <<8); //write external PIN level -+m. GPIO_MUXCFG 0x42 [15:0] = 0x0780 -+n. LEDCFG 0x4C[15:0] = 0x8080 -+***************************************/ -+ u8 value8; -+ u16 value16; -+ u32 value32; -+ -+ //1. Disable GPIO[7:0] -+ rtw_write16(Adapter, REG_GPIO_PIN_CTRL+2, 0x0000); -+ value32 = rtw_read32(Adapter, REG_GPIO_PIN_CTRL) & 0xFFFF00FF; -+ value8 = (u8) (value32&0x000000FF); -+ value32 |= ((value8<<8) | 0x00FF0000); -+ rtw_write32(Adapter, REG_GPIO_PIN_CTRL, value32); -+ -+ //2. Disable GPIO[10:8] -+ rtw_write8(Adapter, REG_GPIO_MUXCFG+3, 0x00); -+ value16 = rtw_read16(Adapter, REG_GPIO_MUXCFG+2) & 0xFF0F; -+ value8 = (u8) (value16&0x000F); -+ value16 |= ((value8<<4) | 0x0780); -+ rtw_write16(Adapter, REG_GPIO_MUXCFG+2, value16); -+ -+ //3. Disable LED0 & 1 -+ rtw_write16(Adapter, REG_LEDCFG0, 0x8080); -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("======> Disable GPIO and LED.\n")); -+ -+} //end of _DisableGPIO() -+ -+static VOID -+_ResetFWDownloadRegister( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ -+ value32 = rtw_read32(Adapter, REG_MCUFWDL); -+ value32 &= ~(MCUFWDL_EN | MCUFWDL_RDY); -+ rtw_write32(Adapter, REG_MCUFWDL, value32); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Reset FW download register.\n")); -+} -+ -+ -+static int -+_DisableRF_AFE( -+ IN PADAPTER Adapter -+ ) -+{ -+ int rtStatus = _SUCCESS; -+ u32 pollingCount = 0; -+ u8 value8; -+ -+ //disable RF/ AFE AD/DA -+ value8 = APSDOFF; -+ rtw_write8(Adapter, REG_APSD_CTRL, value8); -+ -+ -+#if (RTL8192CU_ASIC_VERIFICATION) -+ -+ do -+ { -+ if(rtw_read8(Adapter, REG_APSD_CTRL) & APSDOFF_STATUS){ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Disable RF, AFE, AD, DA Done!\n")); -+ break; -+ } -+ -+ if(pollingCount++ > POLLING_READY_TIMEOUT_COUNT){ -+ //RT_TRACE(COMP_INIT, DBG_SERIOUS, ("Failed to polling APSDOFF_STATUS done!\n")); -+ return _FAIL; -+ } -+ -+ }while(_TRUE); -+ -+#endif -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Disable RF, AFE,AD, DA.\n")); -+ return rtStatus; -+ -+} -+ -+static VOID -+_ResetBB( -+ IN PADAPTER Adapter -+ ) -+{ -+ u16 value16; -+ -+ //before BB reset should do clock gated -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)|(BIT31)); -+ //reset BB -+ value16 = rtw_read16(Adapter, REG_SYS_FUNC_EN); -+ value16 &= ~(FEN_BBRSTB | FEN_BB_GLB_RSTn); -+ rtw_write16(Adapter, REG_SYS_FUNC_EN, value16); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Reset BB.\n")); -+} -+ -+static VOID -+_ResetMCU( -+ IN PADAPTER Adapter -+ ) -+{ -+ u16 value16; -+ -+ // reset MCU -+ value16 = rtw_read16(Adapter, REG_SYS_FUNC_EN); -+ value16 &= ~FEN_CPUEN; -+ rtw_write16(Adapter, REG_SYS_FUNC_EN, value16); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Reset MCU.\n")); -+} -+ -+static VOID -+_DisableMAC_AFE_PLL( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ -+ //disable MAC/ AFE PLL -+ value32 = rtw_read32(Adapter, REG_APS_FSMCO); -+ value32 |= APDM_MAC; -+ rtw_write32(Adapter, REG_APS_FSMCO, value32); -+ -+ value32 |= APFM_OFF; -+ rtw_write32(Adapter, REG_APS_FSMCO, value32); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Disable MAC, AFE PLL.\n")); -+} -+ -+static VOID -+_AutoPowerDownToHostOff( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ rtw_write8(Adapter, REG_SPS0_CTRL, 0x22); -+ -+ value32 = rtw_read32(Adapter, REG_APS_FSMCO); -+ -+ value32 |= APDM_HOST;//card disable -+ rtw_write32(Adapter, REG_APS_FSMCO, value32); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Auto Power Down to Host-off state.\n")); -+ -+ // set USB suspend -+ value32 = rtw_read32(Adapter, REG_APS_FSMCO); -+ value32 &= ~AFSM_PCIE; -+ rtw_write32(Adapter, REG_APS_FSMCO, value32); -+ -+} -+ -+static VOID -+_SetUsbSuspend( -+ IN PADAPTER Adapter -+ ) -+{ -+ u32 value32; -+ -+ value32 = rtw_read32(Adapter, REG_APS_FSMCO); -+ -+ // set USB suspend -+ value32 |= AFSM_HSUS; -+ rtw_write32(Adapter, REG_APS_FSMCO, value32); -+ -+ //RT_ASSERT(0 == (rtw_read32(Adapter, REG_APS_FSMCO) & BIT(12)),("")); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("Set USB suspend.\n")); -+ -+} -+ -+static VOID -+_DisableRFAFEAndResetBB( -+ IN PADAPTER Adapter -+ ) -+{ -+/************************************** -+a. TXPAUSE 0x522[7:0] = 0xFF //Pause MAC TX queue -+b. RF path 0 offset 0x00 = 0x00 // disable RF -+c. APSD_CTRL 0x600[7:0] = 0x40 -+d. SYS_FUNC_EN 0x02[7:0] = 0x16 //reset BB state machine -+e. SYS_FUNC_EN 0x02[7:0] = 0x14 //reset BB state machine -+***************************************/ -+ u8 eRFPath = 0,value8 = 0; -+ rtw_write8(Adapter, REG_TXPAUSE, 0xFF); -+ PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, 0x0, bMaskByte0, 0x0); -+ -+ value8 |= APSDOFF; -+ rtw_write8(Adapter, REG_APSD_CTRL, value8);//0x40 -+ //before BB reset should do clock gated -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)|(BIT31)); -+ value8 = 0 ; -+ value8 |=( FEN_USBD | FEN_USBA | FEN_BB_GLB_RSTn); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN,value8 );//0x16 -+ -+ value8 &=( ~FEN_BB_GLB_RSTn ); -+ rtw_write8(Adapter, REG_SYS_FUNC_EN, value8); //0x14 -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("======> RF off and reset BB.\n")); -+} -+ -+static VOID -+_ResetDigitalProcedure1( -+ IN PADAPTER Adapter, -+ IN BOOLEAN bWithoutHWSM -+ ) -+{ -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(pHalData->FirmwareVersion <= 0x20){ -+ #if 0 -+ /***************************** -+ f. SYS_FUNC_EN 0x03[7:0]=0x54 // reset MAC register, DCORE -+ g. MCUFWDL 0x80[7:0]=0 // reset MCU ready status -+ ******************************/ -+ u4Byte value32 = 0; -+ PlatformIOWrite1Byte(Adapter, REG_SYS_FUNC_EN+1, 0x54); -+ PlatformIOWrite1Byte(Adapter, REG_MCUFWDL, 0); -+ #else -+ /***************************** -+ f. MCUFWDL 0x80[7:0]=0 // reset MCU ready status -+ g. SYS_FUNC_EN 0x02[10]= 0 // reset MCU register, (8051 reset) -+ h. SYS_FUNC_EN 0x02[15-12]= 5 // reset MAC register, DCORE -+ i. SYS_FUNC_EN 0x02[10]= 1 // enable MCU register, (8051 enable) -+ ******************************/ -+ u16 valu16 = 0; -+ rtw_write8(Adapter, REG_MCUFWDL, 0); -+ -+ valu16 = rtw_read16(Adapter, REG_SYS_FUNC_EN); -+ rtw_write16(Adapter, REG_SYS_FUNC_EN, (valu16 & (~FEN_CPUEN)));//reset MCU ,8051 -+ -+ valu16 = rtw_read16(Adapter, REG_SYS_FUNC_EN)&0x0FFF; -+ rtw_write16(Adapter, REG_SYS_FUNC_EN, (valu16 |(FEN_HWPDN|FEN_ELDR)));//reset MAC -+ -+ #ifdef DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE -+ { -+ u8 val; -+ if( (val=rtw_read8(Adapter, REG_MCUFWDL))) -+ DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __FUNCTION__, __LINE__, val); -+ } -+ #endif -+ -+ -+ valu16 = rtw_read16(Adapter, REG_SYS_FUNC_EN); -+ rtw_write16(Adapter, REG_SYS_FUNC_EN, (valu16 | FEN_CPUEN));//enable MCU ,8051 -+ -+ -+ #endif -+ } -+ else{ -+ u8 retry_cnts = 0; -+ -+ if(rtw_read8(Adapter, REG_MCUFWDL) & BIT1) -+ { //IF fw in RAM code, do reset -+ -+ rtw_write8(Adapter, REG_MCUFWDL, 0); -+ if(Adapter->bFWReady){ -+ // 2010/08/25 MH Accordign to RD alfred's suggestion, we need to disable other -+ // HRCV INT to influence 8051 reset. -+ rtw_write8(Adapter, REG_FWIMR, 0x20); -+ -+ rtw_write8(Adapter, REG_HMETFR+3, 0x20);//8051 reset by self -+ -+ while( (retry_cnts++ <100) && (FEN_CPUEN &rtw_read16(Adapter, REG_SYS_FUNC_EN))) -+ { -+ rtw_udelay_os(50);//PlatformStallExecution(50);//us -+ } -+ -+ if(retry_cnts >= 100){ -+ DBG_8192C("%s #####=> 8051 reset failed!.........................\n", __FUNCTION__); -+ // if 8051 reset fail we trigger GPIO 0 for LA -+ //PlatformEFIOWrite4Byte( Adapter, -+ // REG_GPIO_PIN_CTRL, -+ // 0x00010100); -+ // 2010/08/31 MH According to Filen's info, if 8051 reset fail, reset MAC directly. -+ rtw_write8(Adapter, REG_SYS_FUNC_EN+1, 0x50); //Reset MAC and Enable 8051 -+ rtw_mdelay_os(10); -+ } -+ else { -+ //DBG_871X("%s =====> 8051 reset success (%d) .\n", __FUNCTION__, retry_cnts); -+ } -+ } -+ else { -+ DBG_871X("%s =====> 8051 in RAM but !Adapter->bFWReady\n", __FUNCTION__); -+ } -+ } -+ else{ -+ //DBG_871X("%s =====> 8051 in ROM.\n", __FUNCTION__); -+ } -+ -+ #ifdef DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE -+ { -+ u8 val; -+ if( (val=rtw_read8(Adapter, REG_MCUFWDL))) -+ DBG_871X("DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE %s:%d REG_MCUFWDL:0x%02x\n", __FUNCTION__, __LINE__, val); -+ } -+ #endif -+ -+ rtw_write8(Adapter, REG_SYS_FUNC_EN+1, 0x54); //Reset MAC and Enable 8051 -+ } -+ -+ // Clear rpwm value for initial toggle bit trigger. -+ rtw_write8(Adapter, REG_USB_HRPWM, 0x00); -+ -+ if(bWithoutHWSM){ -+ /***************************** -+ Without HW auto state machine -+ g. SYS_CLKR 0x08[15:0] = 0x30A3 //disable MAC clock -+ h. AFE_PLL_CTRL 0x28[7:0] = 0x80 //disable AFE PLL -+ i. AFE_XTAL_CTRL 0x24[15:0] = 0x880F //gated AFE DIG_CLOCK -+ j. SYS_ISO_CTRL 0x00[7:0] = 0xF9 // isolated digital to PON -+ ******************************/ -+ //rtw_write16(Adapter, REG_SYS_CLKR, 0x30A3); -+ rtw_write16(Adapter, REG_SYS_CLKR, 0x70A3);//modify to 0x70A3 by Scott. -+ rtw_write8(Adapter, REG_AFE_PLL_CTRL, 0x80); -+ rtw_write16(Adapter, REG_AFE_XTAL_CTRL, 0x880F); -+ rtw_write8(Adapter, REG_SYS_ISO_CTRL, 0xF9); -+ } -+ else -+ { -+ // Disable all RF/BB power -+ rtw_write8(Adapter, REG_RF_CTRL, 0x00); -+ } -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("======> Reset Digital.\n")); -+ -+} -+ -+static VOID -+_ResetDigitalProcedure2( -+ IN PADAPTER Adapter -+) -+{ -+/***************************** -+k. SYS_FUNC_EN 0x03[7:0] = 0x44 // disable ELDR runction -+l. SYS_CLKR 0x08[15:0] = 0x3083 // disable ELDR clock -+m. SYS_ISO_CTRL 0x01[7:0] = 0x83 // isolated ELDR to PON -+******************************/ -+ //rtw_write8(Adapter, REG_SYS_FUNC_EN+1, 0x44);//marked by Scott. -+ //rtw_write16(Adapter, REG_SYS_CLKR, 0x3083); -+ //rtw_write8(Adapter, REG_SYS_ISO_CTRL+1, 0x83); -+ -+ rtw_write16(Adapter, REG_SYS_CLKR, 0x70a3); //modify to 0x70a3 by Scott. -+ rtw_write8(Adapter, REG_SYS_ISO_CTRL+1, 0x82); //modify to 0x82 by Scott. -+} -+ -+static VOID -+_DisableAnalog( -+ IN PADAPTER Adapter, -+ IN BOOLEAN bWithoutHWSM -+ ) -+{ -+ u16 value16 = 0; -+ u8 value8=0; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(bWithoutHWSM){ -+ /***************************** -+ n. LDOA15_CTRL 0x20[7:0] = 0x04 // disable A15 power -+ o. LDOV12D_CTRL 0x21[7:0] = 0x54 // disable digital core power -+ r. When driver call disable, the ASIC will turn off remaining clock automatically -+ ******************************/ -+ -+ rtw_write8(Adapter, REG_LDOA15_CTRL, 0x04); -+ //PlatformIOWrite1Byte(Adapter, REG_LDOV12D_CTRL, 0x54); -+ -+ value8 = rtw_read8(Adapter, REG_LDOV12D_CTRL); -+ value8 &= (~LDV12_EN); -+ rtw_write8(Adapter, REG_LDOV12D_CTRL, value8); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, (" REG_LDOV12D_CTRL Reg0x21:0x%02x.\n",value8)); -+ } -+ -+/***************************** -+h. SPS0_CTRL 0x11[7:0] = 0x23 //enter PFM mode -+i. APS_FSMCO 0x04[15:0] = 0x4802 // set USB suspend -+******************************/ -+ -+ -+ value8 = 0x23; -+ if (IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)) -+ value8 |= BIT3; -+ -+ rtw_write8(Adapter, REG_SPS0_CTRL, value8); -+ -+ -+ if(bWithoutHWSM) -+ { -+ //value16 |= (APDM_HOST | /*AFSM_HSUS |*/PFM_ALDN); -+ // 2010/08/31 According to Filen description, we need to use HW to shut down 8051 automatically. -+ // Becasue suspend operatione need the asistance of 8051 to wait for 3ms. -+ value16 |= (APDM_HOST | AFSM_HSUS |PFM_ALDN); -+ } -+ else -+ { -+ value16 |= (APDM_HOST | AFSM_HSUS |PFM_ALDN); -+ } -+ -+ rtw_write16(Adapter, REG_APS_FSMCO,value16 );//0x4802 -+ -+ rtw_write8(Adapter, REG_RSV_CTRL, 0x0e); -+ -+ #if 0 -+ //tynli_test for suspend mode. -+ if(!bWithoutHWSM){ -+ rtw_write8(Adapter, 0xfe10, 0x19); -+ } -+#endif -+ -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("======> Disable Analog Reg0x04:0x%04x.\n",value16)); -+} -+ -+static int -+CardDisableHWSM( // HW Auto state machine -+ IN PADAPTER Adapter, -+ IN BOOLEAN resetMCU -+ ) -+{ -+ int rtStatus = _SUCCESS; -+ if(Adapter->bSurpriseRemoved){ -+ return rtStatus; -+ } -+#if 1 -+ //==== RF Off Sequence ==== -+ _DisableRFAFEAndResetBB(Adapter); -+ -+ // ==== Reset digital sequence ====== -+ _ResetDigitalProcedure1(Adapter, _FALSE); -+ -+ // ==== Pull GPIO PIN to balance level and LED control ====== -+ _DisableGPIO(Adapter); -+ -+ // ==== Disable analog sequence === -+ _DisableAnalog(Adapter, _FALSE); -+ -+ RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("======> Card disable finished.\n")); -+#else -+ _DisableGPIO(Adapter); -+ -+ //reset FW download register -+ _ResetFWDownloadRegister(Adapter); -+ -+ -+ //disable RF/ AFE AD/DA -+ rtStatus = _DisableRF_AFE(Adapter); -+ if(RT_STATUS_SUCCESS != rtStatus){ -+ RT_TRACE(COMP_INIT, DBG_SERIOUS, ("_DisableRF_AFE failed!\n")); -+ goto Exit; -+ } -+ _ResetBB(Adapter); -+ -+ if(resetMCU){ -+ _ResetMCU(Adapter); -+ } -+ -+ _AutoPowerDownToHostOff(Adapter); -+ //_DisableMAC_AFE_PLL(Adapter); -+ -+ _SetUsbSuspend(Adapter); -+Exit: -+#endif -+ return rtStatus; -+ -+} -+ -+static int -+CardDisableWithoutHWSM( // without HW Auto state machine -+ IN PADAPTER Adapter -+ ) -+{ -+ int rtStatus = _SUCCESS; -+ -+ if(Adapter->bSurpriseRemoved){ -+ return rtStatus; -+ } -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("======> Card Disable Without HWSM .\n")); -+ //==== RF Off Sequence ==== -+ _DisableRFAFEAndResetBB(Adapter); -+ -+ // ==== Reset digital sequence ====== -+ _ResetDigitalProcedure1(Adapter, _TRUE); -+ -+ // ==== Pull GPIO PIN to balance level and LED control ====== -+ _DisableGPIO(Adapter); -+ -+ // ==== Reset digital sequence ====== -+ _ResetDigitalProcedure2(Adapter); -+ -+ // ==== Disable analog sequence === -+ _DisableAnalog(Adapter, _TRUE); -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("<====== Card Disable Without HWSM .\n")); -+ return rtStatus; -+} -+ -+static void rtl8192cu_hw_power_down(_adapter *padapter) -+{ -+ // 2010/-8/09 MH For power down module, we need to enable register block contrl reg at 0x1c. -+ // Then enable power down control bit of register 0x04 BIT4 and BIT15 as 1. -+ -+ // Enable register area 0x0-0xc. -+ rtw_write8(padapter,REG_RSV_CTRL, 0x0); -+ rtw_write16(padapter, REG_APS_FSMCO, 0x8812); -+} -+ -+u32 rtl8192cu_hal_deinit(PADAPTER Adapter) -+ { -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ DBG_8192C("==> %s \n",__FUNCTION__); -+ // 2011/02/18 To Fix RU LNA power leakage problem. We need to execute below below in -+ // Adapter init and halt sequence. Accordingto EEchou's opinion, we can enable the ability for all -+ // IC. Accord to johnny's opinion, only RU need the support. -+ if (IS_HARDWARE_TYPE_8192C(Adapter) && (pHalData->BoardType == BOARD_USB_High_PA)) -+ rtw_write32(Adapter, rFPGA0_XCD_RFParameter, rtw_read32(Adapter, rFPGA0_XCD_RFParameter)|BIT1); -+ -+ #ifdef SUPPORT_HW_RFOFF_DETECTED -+ DBG_8192C("bkeepfwalive(%x)\n",Adapter->pwrctrlpriv.bkeepfwalive); -+ if(Adapter->pwrctrlpriv.bkeepfwalive) -+ { -+ _ps_close_RF(Adapter); -+ if((Adapter->pwrctrlpriv.bHWPwrPindetect) && (Adapter->pwrctrlpriv.bHWPowerdown)) -+ rtl8192cu_hw_power_down(Adapter); -+ } -+ else -+#endif -+ { -+ if( Adapter->bCardDisableWOHSM == _FALSE) -+ { -+ DBG_8192C("card disble HWSM...........\n"); -+ CardDisableHWSM(Adapter, _FALSE); -+ } -+ else -+ { -+ DBG_8192C("card disble without HWSM...........\n"); -+ CardDisableWithoutHWSM(Adapter); // without HW Auto state machine -+ -+ if((Adapter->pwrctrlpriv.bHWPwrPindetect ) && (Adapter->pwrctrlpriv.bHWPowerdown)) -+ rtl8192cu_hw_power_down(Adapter); -+ } -+ } -+ -+ return _SUCCESS; -+ } -+ -+ -+unsigned int rtl8192cu_inirp_init(PADAPTER Adapter) -+{ -+ u8 i; -+ struct recv_buf *precvbuf; -+ uint status; -+ struct dvobj_priv *pdev = adapter_to_dvobj(Adapter); -+ struct intf_hdl * pintfhdl=&Adapter->iopriv.intf; -+ struct recv_priv *precvpriv = &(Adapter->recvpriv); -+ u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+ u32 (*_read_interrupt)(struct intf_hdl *pintfhdl, u32 addr); -+#endif -+ -+_func_enter_; -+ -+ _read_port = pintfhdl->io_ops._read_port; -+ -+ status = _SUCCESS; -+ -+ RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("===> usb_inirp_init \n")); -+ -+ precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR; -+ -+ //issue Rx irp to receive data -+ precvbuf = (struct recv_buf *)precvpriv->precv_buf; -+ for(i=0; iff_hwaddr, 0, (unsigned char *)precvbuf) == _FALSE ) -+ { -+ RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error \n")); -+ status = _FAIL; -+ goto exit; -+ } -+ -+ precvbuf++; -+ precvpriv->free_recv_buf_queue_cnt--; -+ } -+ -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+ _read_interrupt = pintfhdl->io_ops._read_interrupt; -+ if(_read_interrupt(pintfhdl, RECV_INT_IN_ADDR) == _FALSE ) -+ { -+ RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error \n")); -+ status = _FAIL; -+ } -+#endif -+ -+exit: -+ -+ RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("<=== usb_inirp_init \n")); -+ -+_func_exit_; -+ -+ return status; -+ -+} -+ -+unsigned int rtl8192cu_inirp_deinit(PADAPTER Adapter) -+{ -+ RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n")); -+ -+ rtw_read_port_cancel(Adapter); -+ -+ RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n <=== usb_rx_deinit \n")); -+ -+ return _SUCCESS; -+} -+ -+ -+//------------------------------------------------------------------------- -+// -+// EEPROM Power index mapping -+// -+//------------------------------------------------------------------------- -+ -+ static VOID -+_ReadPowerValueFromPROM( -+ IN PTxPowerInfo pwrInfo, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoLoadFail -+ ) -+{ -+ u32 rfPath, eeAddr, group; -+ -+ _rtw_memset(pwrInfo, 0, sizeof(TxPowerInfo)); -+ -+ if(AutoLoadFail){ -+ for(group = 0 ; group < CHANNEL_GROUP_MAX ; group++){ -+ for(rfPath = 0 ; rfPath < RF_PATH_MAX ; rfPath++){ -+ pwrInfo->CCKIndex[rfPath][group] = EEPROM_Default_TxPowerLevel; -+ pwrInfo->HT40_1SIndex[rfPath][group] = EEPROM_Default_TxPowerLevel; -+ pwrInfo->HT40_2SIndexDiff[rfPath][group]= EEPROM_Default_HT40_2SDiff; -+ pwrInfo->HT20IndexDiff[rfPath][group] = EEPROM_Default_HT20_Diff; -+ pwrInfo->OFDMIndexDiff[rfPath][group] = EEPROM_Default_LegacyHTTxPowerDiff; -+ pwrInfo->HT40MaxOffset[rfPath][group] = EEPROM_Default_HT40_PwrMaxOffset; -+ pwrInfo->HT20MaxOffset[rfPath][group] = EEPROM_Default_HT20_PwrMaxOffset; -+ } -+ } -+ -+ pwrInfo->TSSI_A = EEPROM_Default_TSSI; -+ pwrInfo->TSSI_B = EEPROM_Default_TSSI; -+ -+ return; -+ } -+ -+ for(rfPath = 0 ; rfPath < RF_PATH_MAX ; rfPath++){ -+ for(group = 0 ; group < CHANNEL_GROUP_MAX ; group++){ -+ eeAddr = EEPROM_CCK_TX_PWR_INX + (rfPath * 3) + group; -+ pwrInfo->CCKIndex[rfPath][group] = PROMContent[eeAddr]; -+ -+ eeAddr = EEPROM_HT40_1S_TX_PWR_INX + (rfPath * 3) + group; -+ pwrInfo->HT40_1SIndex[rfPath][group] = PROMContent[eeAddr]; -+ } -+ } -+ -+ for(group = 0 ; group < CHANNEL_GROUP_MAX ; group++){ -+ for(rfPath = 0 ; rfPath < RF_PATH_MAX ; rfPath++){ -+ pwrInfo->HT40_2SIndexDiff[rfPath][group] = -+ (PROMContent[EEPROM_HT40_2S_TX_PWR_INX_DIFF + group] >> (rfPath * 4)) & 0xF; -+ -+#if 1 -+ pwrInfo->HT20IndexDiff[rfPath][group] = -+ (PROMContent[EEPROM_HT20_TX_PWR_INX_DIFF + group] >> (rfPath * 4)) & 0xF; -+ if(pwrInfo->HT20IndexDiff[rfPath][group] & BIT3) //4bit sign number to 8 bit sign number -+ pwrInfo->HT20IndexDiff[rfPath][group] |= 0xF0; -+#else -+ pwrInfo->HT20IndexDiff[rfPath][group] = -+ (PROMContent[EEPROM_HT20_TX_PWR_INX_DIFF + group] >> (rfPath * 4)) & 0xF; -+#endif -+ -+ pwrInfo->OFDMIndexDiff[rfPath][group] = -+ (PROMContent[EEPROM_OFDM_TX_PWR_INX_DIFF+ group] >> (rfPath * 4)) & 0xF; -+ -+ pwrInfo->HT40MaxOffset[rfPath][group] = -+ (PROMContent[EEPROM_HT40_MAX_PWR_OFFSET+ group] >> (rfPath * 4)) & 0xF; -+ -+ pwrInfo->HT20MaxOffset[rfPath][group] = -+ (PROMContent[EEPROM_HT20_MAX_PWR_OFFSET+ group] >> (rfPath * 4)) & 0xF; -+ } -+ } -+ -+ pwrInfo->TSSI_A = PROMContent[EEPROM_TSSI_A]; -+ pwrInfo->TSSI_B = PROMContent[EEPROM_TSSI_B]; -+ -+} -+ -+ -+static u32 -+_GetChannelGroup( -+ IN u32 channel -+ ) -+{ -+ //RT_ASSERT((channel < 14), ("Channel %d no is supported!\n")); -+ -+ if(channel < 3){ // Channel 1~3 -+ return 0; -+ } -+ else if(channel < 9){ // Channel 4~9 -+ return 1; -+ } -+ -+ return 2; // Channel 10~14 -+} -+ -+ -+static VOID -+ReadTxPowerInfo( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoLoadFail -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ TxPowerInfo pwrInfo; -+ u32 rfPath, ch, group; -+ u8 pwr, diff; -+ -+ _ReadPowerValueFromPROM(&pwrInfo, PROMContent, AutoLoadFail); -+ -+ if(!AutoLoadFail) -+ pHalData->bTXPowerDataReadFromEEPORM = _TRUE; -+ -+ for(rfPath = 0 ; rfPath < RF_PATH_MAX ; rfPath++){ -+ for(ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++){ -+ group = _GetChannelGroup(ch); -+ -+ pHalData->TxPwrLevelCck[rfPath][ch] = pwrInfo.CCKIndex[rfPath][group]; -+ pHalData->TxPwrLevelHT40_1S[rfPath][ch] = pwrInfo.HT40_1SIndex[rfPath][group]; -+ -+ pHalData->TxPwrHt20Diff[rfPath][ch] = pwrInfo.HT20IndexDiff[rfPath][group]; -+ pHalData->TxPwrLegacyHtDiff[rfPath][ch] = pwrInfo.OFDMIndexDiff[rfPath][group]; -+ pHalData->PwrGroupHT20[rfPath][ch] = pwrInfo.HT20MaxOffset[rfPath][group]; -+ pHalData->PwrGroupHT40[rfPath][ch] = pwrInfo.HT40MaxOffset[rfPath][group]; -+ -+ pwr = pwrInfo.HT40_1SIndex[rfPath][group]; -+ diff = pwrInfo.HT40_2SIndexDiff[rfPath][group]; -+ -+ pHalData->TxPwrLevelHT40_2S[rfPath][ch] = (pwr > diff) ? (pwr - diff) : 0; -+ } -+ } -+ -+#if DBG -+ -+ for(rfPath = 0 ; rfPath < RF_PATH_MAX ; rfPath++){ -+ for(ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++){ -+ RTPRINT(FINIT, INIT_TxPower, -+ ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", -+ rfPath, ch, pHalData->TxPwrLevelCck[rfPath][ch], -+ pHalData->TxPwrLevelHT40_1S[rfPath][ch], -+ pHalData->TxPwrLevelHT40_2S[rfPath][ch])); -+ -+ } -+ } -+ -+ for(ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++){ -+ RTPRINT(FINIT, INIT_TxPower, ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", ch, pHalData->TxPwrHt20Diff[RF_PATH_A][ch])); -+ } -+ -+ for(ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++){ -+ RTPRINT(FINIT, INIT_TxPower, ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", ch, pHalData->TxPwrLegacyHtDiff[RF_PATH_A][ch])); -+ } -+ -+ for(ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++){ -+ RTPRINT(FINIT, INIT_TxPower, ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", ch, pHalData->TxPwrHt20Diff[RF_PATH_B][ch])); -+ } -+ -+ for(ch = 0 ; ch < CHANNEL_MAX_NUMBER ; ch++){ -+ RTPRINT(FINIT, INIT_TxPower, ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", ch, pHalData->TxPwrLegacyHtDiff[RF_PATH_B][ch])); -+ } -+ -+#endif -+ // 2010/10/19 MH Add Regulator recognize for CU. -+ if(!AutoLoadFail) -+ { -+ pHalData->EEPROMRegulatory = (PROMContent[RF_OPTION1]&0x7); //bit0~2 -+ } -+ else -+ { -+ pHalData->EEPROMRegulatory = 0; -+ } -+ DBG_8192C("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory); -+ -+} -+ -+ -+//------------------------------------------------------------------- -+// -+// EEPROM/EFUSE Content Parsing -+// -+//------------------------------------------------------------------- -+static void -+_ReadIDs( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(_FALSE == AutoloadFail){ -+ // VID, PID -+ pHalData->EEPROMVID = le16_to_cpu( *(u16 *)&PROMContent[EEPROM_VID]); -+ pHalData->EEPROMPID = le16_to_cpu( *(u16 *)&PROMContent[EEPROM_PID]); -+ -+ // Customer ID, 0x00 and 0xff are reserved for Realtek. -+ pHalData->EEPROMCustomerID = *(u8 *)&PROMContent[EEPROM_CUSTOMER_ID]; -+ pHalData->EEPROMSubCustomerID = *(u8 *)&PROMContent[EEPROM_SUBCUSTOMER_ID]; -+ -+ } -+ else{ -+ pHalData->EEPROMVID = EEPROM_Default_VID; -+ pHalData->EEPROMPID = EEPROM_Default_PID; -+ -+ // Customer ID, 0x00 and 0xff are reserved for Realtek. -+ pHalData->EEPROMCustomerID = EEPROM_Default_CustomerID; -+ pHalData->EEPROMSubCustomerID = EEPROM_Default_SubCustomerID; -+ -+ } -+ -+ // For customized behavior. -+ if((pHalData->EEPROMVID == 0x103C) && (pHalData->EEPROMVID == 0x1629))// HP Lite-On for RTL8188CUS Slim Combo. -+ pHalData->CustomerID = RT_CID_819x_HP; -+ -+ // Decide CustomerID according to VID/DID or EEPROM -+ switch(pHalData->EEPROMCustomerID) -+ { -+ case EEPROM_CID_DEFAULT: -+ if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x3308)) -+ pHalData->CustomerID = RT_CID_DLINK; -+ else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x3309)) -+ pHalData->CustomerID = RT_CID_DLINK; -+ else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330a)) -+ pHalData->CustomerID = RT_CID_DLINK; -+ break; -+ case EEPROM_CID_WHQL: -+/* -+ Adapter->bInHctTest = TRUE; -+ -+ pMgntInfo->bSupportTurboMode = FALSE; -+ pMgntInfo->bAutoTurboBy8186 = FALSE; -+ -+ pMgntInfo->PowerSaveControl.bInactivePs = FALSE; -+ pMgntInfo->PowerSaveControl.bIPSModeBackup = FALSE; -+ pMgntInfo->PowerSaveControl.bLeisurePs = FALSE; -+ -+ pMgntInfo->keepAliveLevel = 0; -+ -+ Adapter->bUnloadDriverwhenS3S4 = FALSE; -+*/ -+ break; -+ default: -+ pHalData->CustomerID = RT_CID_DEFAULT; -+ break; -+ -+ } -+ -+ MSG_8192C("EEPROMVID = 0x%04x\n", pHalData->EEPROMVID); -+ MSG_8192C("EEPROMPID = 0x%04x\n", pHalData->EEPROMPID); -+ MSG_8192C("EEPROMCustomerID : 0x%02x\n", pHalData->EEPROMCustomerID); -+ MSG_8192C("EEPROMSubCustomerID: 0x%02x\n", pHalData->EEPROMSubCustomerID); -+ -+ MSG_8192C("RT_CustomerID: 0x%02x\n", pHalData->CustomerID); -+ -+} -+ -+ -+static VOID -+_ReadMACAddress( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); -+ -+ if(_FALSE == AutoloadFail){ -+ //Read Permanent MAC address and set value to hardware -+ _rtw_memcpy(pEEPROM->mac_addr, &PROMContent[EEPROM_MAC_ADDR], ETH_ALEN); -+ } -+ else{ -+ //Random assigh MAC address -+ u8 sMacAddr[MAC_ADDR_LEN] = {0x00, 0xE0, 0x4C, 0x81, 0x92, 0x00}; -+ //sMacAddr[5] = (u8)GetRandomNumber(1, 254); -+ _rtw_memcpy(pEEPROM->mac_addr, sMacAddr, ETH_ALEN); -+ } -+ DBG_8192C("%s MAC Address from EFUSE = "MAC_FMT"\n",__FUNCTION__, MAC_ARG(pEEPROM->mac_addr)); -+ //NicIFSetMacAddress(Adapter, Adapter->PermanentAddress); -+ //RT_PRINT_ADDR(COMP_INIT|COMP_EFUSE, DBG_LOUD, "MAC Addr: %s", Adapter->PermanentAddress); -+ -+} -+ -+static VOID -+_ReadBoardType( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 value32; -+ u8 boardType = BOARD_USB_DONGLE; -+ -+ if(AutoloadFail){ -+ if(IS_8723_SERIES(pHalData->VersionID)) -+ pHalData->rf_type = RF_1T1R; -+ else -+ pHalData->rf_type = RF_2T2R; -+ -+ pHalData->BluetoothCoexist = _FALSE; -+ pHalData->BoardType = boardType; -+ return; -+ } -+ -+ boardType = PROMContent[EEPROM_NORMAL_BoardType]; -+ boardType &= BOARD_TYPE_NORMAL_MASK;//bit[7:5] -+ boardType >>= 5; -+ -+ pHalData->BoardType = boardType; -+ MSG_8192C("_ReadBoardType(%x)\n",pHalData->BoardType); -+ -+ if (boardType == BOARD_USB_High_PA) -+ pHalData->ExternalPA = 1; -+} -+ -+ -+static VOID -+_ReadLEDSetting( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ struct led_priv *pledpriv = &(Adapter->ledpriv); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+#ifdef CONFIG_SW_LED -+ pledpriv->bRegUseLed = _TRUE; -+ -+ // -+ // Led mode -+ // -+ switch(pHalData->CustomerID) -+ { -+ case RT_CID_DEFAULT: -+ pledpriv->LedStrategy = SW_LED_MODE1; -+ pledpriv->bRegUseLed = _TRUE; -+ break; -+ -+ case RT_CID_819x_HP: -+ pledpriv->LedStrategy = SW_LED_MODE6; -+ break; -+ -+ default: -+ pledpriv->LedStrategy = SW_LED_MODE1; -+ break; -+ } -+ -+ if( BOARD_MINICARD == pHalData->BoardType ) -+ { -+ pledpriv->LedStrategy = SW_LED_MODE6; -+ } -+ pHalData->bLedOpenDrain = _TRUE;// Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16. -+#else // HW LED -+ pledpriv->LedStrategy = HW_LED; -+#endif //CONFIG_SW_LED -+} -+ -+static VOID -+_ReadThermalMeter( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u8 tempval; -+ -+ // -+ // ThermalMeter from EEPROM -+ // -+ if(!AutoloadFail) -+ tempval = PROMContent[EEPROM_THERMAL_METER]; -+ else -+ tempval = EEPROM_Default_ThermalMeter; -+ -+ pHalData->EEPROMThermalMeter = (tempval&0x1f); //[4:0] -+ -+ if(pHalData->EEPROMThermalMeter == 0x1f || AutoloadFail) -+ pdmpriv->bAPKThermalMeterIgnore = _TRUE; -+ -+#if 0 -+ if(pHalData->EEPROMThermalMeter < 0x06 || pHalData->EEPROMThermalMeter > 0x1c) -+ pHalData->EEPROMThermalMeter = 0x12; -+#endif -+ -+ pdmpriv->ThermalMeter[0] = pHalData->EEPROMThermalMeter; -+ -+ //RTPRINT(FINIT, INIT_TxPower, ("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter)); -+ -+} -+ -+static VOID -+_ReadRFSetting( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+} -+ -+static void -+_ReadPROMVersion( -+ IN PADAPTER Adapter, -+ IN u8* PROMContent, -+ IN BOOLEAN AutoloadFail -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ if(AutoloadFail){ -+ pHalData->EEPROMVersion = EEPROM_Default_Version; -+ } -+ else{ -+ pHalData->EEPROMVersion = *(u8 *)&PROMContent[EEPROM_VERSION]; -+ } -+} -+ -+static VOID -+readAntennaDiversity( -+ IN PADAPTER pAdapter, -+ IN u8 *hwinfo, -+ IN BOOLEAN AutoLoadFail -+ ) -+{ -+ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ struct registry_priv *registry_par = &pAdapter->registrypriv; -+ -+ if(!AutoLoadFail) -+ { -+ // Antenna Diversity setting. -+ if(registry_par->antdiv_cfg == 2) // 2: From Efuse -+ pHalData->AntDivCfg = (hwinfo[EEPROM_RF_OPT1]&0x18)>>3; -+ else -+ pHalData->AntDivCfg = registry_par->antdiv_cfg ; // 0:OFF , 1:ON, -+ -+ DBG_8192C("### AntDivCfg(%x)\n",pHalData->AntDivCfg); -+ -+ //if(pHalData->EEPROMBluetoothCoexist!=0 && pHalData->EEPROMBluetoothAntNum==Ant_x1) -+ // pHalData->AntDivCfg = 0; -+ } -+ else -+ { -+ pHalData->AntDivCfg = 0; -+ } -+ -+} -+ -+static VOID -+hal_InitPGData( -+ IN PADAPTER pAdapter, -+ IN OUT u8 *PROMContent -+ ) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); -+ u32 i; -+ u16 value16; -+ -+ if(_FALSE == pEEPROM->bautoload_fail_flag) -+ { // autoload OK. -+ if (_TRUE == pEEPROM->EepromOrEfuse) -+ { -+ // Read all Content from EEPROM or EFUSE. -+ for(i = 0; i < HWSET_MAX_SIZE; i += 2) -+ { -+ //value16 = EF2Byte(ReadEEprom(pAdapter, (u2Byte) (i>>1))); -+ //*((u16 *)(&PROMContent[i])) = value16; -+ } -+ } -+ else -+ { -+ // Read EFUSE real map to shadow. -+ EFUSE_ShadowMapUpdate(pAdapter, EFUSE_WIFI, _FALSE); -+ _rtw_memcpy((void*)PROMContent, (void*)pEEPROM->efuse_eeprom_data, HWSET_MAX_SIZE); -+ } -+ } -+ else -+ {//autoload fail -+ //RT_TRACE(COMP_INIT, DBG_LOUD, ("AutoLoad Fail reported from CR9346!!\n")); -+ pEEPROM->bautoload_fail_flag = _TRUE; -+ //update to default value 0xFF -+ if (_FALSE == pEEPROM->EepromOrEfuse) -+ EFUSE_ShadowMapUpdate(pAdapter, EFUSE_WIFI, _FALSE); -+ } -+} -+// Read HW power down mode selection -+static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8 AutoloadFail) -+{ -+ if(AutoloadFail){ -+ Adapter->pwrctrlpriv.bHWPowerdown = _FALSE; -+ Adapter->pwrctrlpriv.bSupportRemoteWakeup = _FALSE; -+ } -+ else { -+ //if(SUPPORT_HW_RADIO_DETECT(Adapter)) -+ Adapter->pwrctrlpriv.bHWPwrPindetect = Adapter->registrypriv.hwpwrp_detect; -+ //else -+ //Adapter->pwrctrlpriv.bHWPwrPindetect = _FALSE;//dongle not support new -+ -+ -+ //hw power down mode selection , 0:rf-off / 1:power down -+ -+ if(Adapter->registrypriv.hwpdn_mode==2) -+ Adapter->pwrctrlpriv.bHWPowerdown = (PROMContent[EEPROM_RF_OPT3] & BIT4); -+ else -+ Adapter->pwrctrlpriv.bHWPowerdown = Adapter->registrypriv.hwpdn_mode; -+#ifdef CONFIG_WOWLAN -+ // decide hw if support remote wakeup function -+ // if hw supported, 8051 (SIE) will generate WeakUP signal( D+/D- toggle) when autoresume -+ Adapter->pwrctrlpriv.bSupportRemoteWakeup = (PROMContent[EEPROM_TEST_USB_OPT] & BIT1)?_TRUE :_FALSE; -+#endif //CONFIG_WOWLAN -+ -+ //if(SUPPORT_HW_RADIO_DETECT(Adapter)) -+ //Adapter->registrypriv.usbss_enable = Adapter->pwrctrlpriv.bSupportRemoteWakeup ; -+ -+ DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__FUNCTION__, -+ Adapter->pwrctrlpriv.bHWPwrPindetect,Adapter->pwrctrlpriv.bHWPowerdown ,Adapter->pwrctrlpriv.bSupportRemoteWakeup); -+ -+ DBG_8192C("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n",Adapter->registrypriv.power_mgnt,Adapter->registrypriv.usbss_enable); -+ -+ } -+ -+} -+ -+static VOID -+readAdapterInfo_8192CU( -+ IN PADAPTER Adapter -+ ) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); -+ PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); -+ u8 PROMContent[HWSET_MAX_SIZE]={0}; -+ -+ hal_InitPGData(Adapter, PROMContent); -+ rtl8192c_EfuseParseIDCode(Adapter, PROMContent); -+ -+ _ReadPROMVersion(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadIDs(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadMACAddress(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ ReadTxPowerInfo(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadBoardType(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ -+#ifdef CONFIG_BT_COEXIST -+ // -+ // Read Bluetooth co-exist and initialize -+ // -+ rtl8192c_ReadBluetoothCoexistInfo(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+#endif -+ -+ rtl8192c_EfuseParseChnlPlan(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadThermalMeter(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadLEDSetting(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadRFSetting(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ _ReadPSSetting(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ readAntennaDiversity(Adapter, PROMContent, pEEPROM->bautoload_fail_flag); -+ -+ //hal_CustomizedBehavior_8723U(Adapter); -+ -+ Adapter->bDongle = (PROMContent[EEPROM_EASY_REPLACEMENT] == 1)? 0: 1; -+ DBG_8192C("%s(): REPLACEMENT = %x\n",__FUNCTION__,Adapter->bDongle); -+#ifdef CONFIG_INTEL_PROXIM -+ /* for intel proximity */ -+ if (pHalData->rf_type== RF_1T1R) { -+ Adapter->proximity.proxim_support = _TRUE; -+ } else if (pHalData->rf_type== RF_2T2R) { -+ if ((pHalData->EEPROMPID == 0x8186) && -+ (pHalData->EEPROMVID== 0x0bda)) -+ Adapter->proximity.proxim_support = _TRUE; -+ } else { -+ Adapter->proximity.proxim_support = _FALSE; -+ } -+#endif //CONFIG_INTEL_PROXIM -+} -+ -+static void _ReadPROMContent( -+ IN PADAPTER Adapter -+ ) -+{ -+ EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 PROMContent[HWSET_MAX_SIZE]={0}; -+ u8 eeValue; -+ u32 i; -+ u16 value16; -+ -+ eeValue = rtw_read8(Adapter, REG_9346CR); -+ // To check system boot selection. -+ pEEPROM->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? _TRUE : _FALSE; -+ pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? _FALSE : _TRUE; -+ -+ -+ DBG_8192C("Boot from %s, Autoload %s !\n", (pEEPROM->EepromOrEfuse ? "EEPROM" : "EFUSE"), -+ (pEEPROM->bautoload_fail_flag ? "Fail" : "OK") ); -+ -+ //pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; -+ -+ //if(IS_HARDWARE_TYPE_8723A(Adapter)) -+ // readAdapterInfo_8723U(Adapter); -+ //else -+ readAdapterInfo_8192CU(Adapter); -+} -+ -+ -+static VOID -+_InitOtherVariable( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ -+ //if(Adapter->bInHctTest){ -+ // pMgntInfo->PowerSaveControl.bInactivePs = FALSE; -+ // pMgntInfo->PowerSaveControl.bIPSModeBackup = FALSE; -+ // pMgntInfo->PowerSaveControl.bLeisurePs = FALSE; -+ // pMgntInfo->keepAliveLevel = 0; -+ //} -+ -+ // 2009/06/10 MH For 92S 1*1=1R/ 1*2&2*2 use 2R. We default set 1*1 use radio A -+ // So if you want to use radio B. Please modify RF path enable bit for correct signal -+ // strength calculate. -+ if (pHalData->rf_type == RF_1T1R){ -+ pHalData->bRFPathRxEnable[0] = _TRUE; -+ } -+ else{ -+ pHalData->bRFPathRxEnable[0] = pHalData->bRFPathRxEnable[1] = _TRUE; -+ } -+ -+} -+ -+static VOID -+_ReadRFType( -+ IN PADAPTER Adapter -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+#if DISABLE_BB_RF -+ pHalData->rf_chip = RF_PSEUDO_11N; -+#else -+ pHalData->rf_chip = RF_6052; -+#endif -+} -+ -+void _ReadSilmComboMode(PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+ pHalData->SlimComboDbg = _FALSE; // Default is not debug mode. -+ -+ // 2010/11/22 MH We need to enter debug mode for TSMA and UMC A cut -+ if ((Adapter->chip_type == RTL8188C_8192C) && -+ (pHalData->BoardType == BOARD_USB_COMBO)) -+ { -+ switch (pHalData->VersionID) -+ { -+ case VERSION_NORMAL_TSMC_CHIP_88C: -+ case VERSION_NORMAL_TSMC_CHIP_92C: -+ case VERSION_NORMAL_TSMC_CHIP_92C_1T2R: -+ case VERSION_NORMAL_UMC_CHIP_88C_A_CUT: -+ case VERSION_NORMAL_UMC_CHIP_92C_A_CUT: -+ case VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT: -+ if ((rtw_read8(Adapter, REG_SYS_CFG+3) &0xF0) == 0x20) -+ pHalData->SlimComboDbg = _TRUE; -+ -+ break; -+ -+ case VERSION_NORMAL_UMC_CHIP_88C_B_CUT: -+ case VERSION_NORMAL_UMC_CHIP_92C_B_CUT: -+ case VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT: -+ // 2011/02/15 MH UNC-B cut ECO fail, we need to support slim combo debug mode. -+ if ((rtw_read8(Adapter, REG_SYS_CFG+3) &0xF0) == 0x20) -+ pHalData->SlimComboDbg = _TRUE; -+ break; -+ -+ default: -+ break; -+ } -+ -+ } -+ -+} -+static int _ReadAdapterInfo8192CU(PADAPTER Adapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u32 start=rtw_get_current_time(); -+ -+ MSG_8192C("====> ReadAdapterInfo8192C\n"); -+ -+ //Efuse_InitSomeVar(Adapter); -+ -+ //if(IS_HARDWARE_TYPE_8723A(Adapter)) -+ // _EfuseCellSel(Adapter); -+ -+ _ReadRFType(Adapter);//rf_chip -> _InitRFType() -+ _ReadPROMContent(Adapter); -+ -+ // 2010/10/25 MH THe function must be called after borad_type & IC-Version recognize. -+ _ReadSilmComboMode(Adapter); -+ -+ _InitOtherVariable(Adapter); -+ -+ //MSG_8192C("%s()(done), rf_chip=0x%x, rf_type=0x%x\n", __FUNCTION__, pHalData->rf_chip, pHalData->rf_type); -+ -+ MSG_8192C("<==== ReadAdapterInfo8192C in %d ms\n", rtw_get_passing_time_ms(start)); -+ -+ return _SUCCESS; -+} -+ -+ -+static void ReadAdapterInfo8192CU(PADAPTER Adapter) -+{ -+ // Read EEPROM size before call any EEPROM function -+ //Adapter->EepromAddressSize=Adapter->HalFunc.GetEEPROMSizeHandler(Adapter); -+ Adapter->EepromAddressSize = GetEEPROMSize8192C(Adapter); -+ -+ _ReadAdapterInfo8192CU(Adapter); -+} -+ -+ -+#define GPIO_DEBUG_PORT_NUM 0 -+static void rtl8192cu_trigger_gpio_0(_adapter *padapter) -+{ -+ -+ u32 gpioctrl; -+ DBG_8192C("==> trigger_gpio_0...\n"); -+ rtw_write16_async(padapter,REG_GPIO_PIN_CTRL,0); -+ rtw_write8_async(padapter,REG_GPIO_PIN_CTRL+2,0xFF); -+ gpioctrl = (BIT(GPIO_DEBUG_PORT_NUM)<<24 )|(BIT(GPIO_DEBUG_PORT_NUM)<<16); -+ rtw_write32_async(padapter,REG_GPIO_PIN_CTRL,gpioctrl); -+ gpioctrl |= (BIT(GPIO_DEBUG_PORT_NUM)<<8); -+ rtw_write32_async(padapter,REG_GPIO_PIN_CTRL,gpioctrl); -+ DBG_8192C("<=== trigger_gpio_0...\n"); -+ -+} -+ -+static void ResumeTxBeacon(_adapter *padapter) -+{ -+ HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter); -+ -+ // 2010.03.01. Marked by tynli. No need to call workitem beacause we record the value -+ // which should be read from register to a global variable. -+ -+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl) | BIT6); -+ pHalData->RegFwHwTxQCtrl |= BIT6; -+} -+ -+static void StopTxBeacon(_adapter *padapter) -+{ -+ HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter); -+ -+ // 2010.03.01. Marked by tynli. No need to call workitem beacause we record the value -+ // which should be read from register to a global variable. -+ -+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl) & (~BIT6)); -+ pHalData->RegFwHwTxQCtrl &= (~BIT6); -+ -+ //todo: CheckFwRsvdPageContent(Adapter); // 2010.06.23. Added by tynli. -+ -+} -+ -+u16 CRC16(u8 data,u16 CRC) -+{ -+ unsigned char shift_in,CRC_BIT15,DataBit,CRC_BIT11,CRC_BIT4 ; -+ int index; -+ unsigned short CRC_Result; -+ -+ for(index=0;index<8;index++) -+ { -+ CRC_BIT15=((CRC&BIT15) ? 1:0); -+ DataBit =(data&(BIT0<iface_type == IFACE_PORT1) -+ { -+ // disable Port1 TSF update -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(4)); -+ -+ // set net_type -+ val8 = rtw_read8(Adapter, MSR)&0x03; -+ val8 |= (mode<<2); -+ rtw_write8(Adapter, MSR, val8); -+ -+ //reset TSF1 -+ rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(1)); -+ -+ DBG_871X("%s()-%d mode = %d\n", __FUNCTION__, __LINE__, mode); -+ -+ if((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) -+ { -+ if(!check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE)) -+ { -+ StopTxBeacon(Adapter); -+ } -+ -+ rtw_write8(Adapter,REG_BCN_CTRL_1, 0x19);//disable atim wnd -+ //rtw_write8(Adapter,REG_BCN_CTRL_1, 0x18); -+ } -+ else if((mode == _HW_STATE_ADHOC_) /*|| (mode == _HW_STATE_AP_)*/) -+ { -+ ResumeTxBeacon(Adapter); -+ rtw_write8(Adapter,REG_BCN_CTRL_1, 0x1a); -+ } -+ else if(mode == _HW_STATE_AP_) -+ { -+ ResumeTxBeacon(Adapter); -+ -+ rtw_write8(Adapter, REG_BCN_CTRL_1, 0x12); -+ -+ //Set RCR -+ //rtw_write32(padapter, REG_RCR, 0x70002a8e);//CBSSID_DATA must set to 0 -+ rtw_write32(Adapter, REG_RCR, 0x7000228e);//CBSSID_DATA must set to 0 -+ //enable to rx data frame -+ rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF); -+ //enable to rx ps-poll -+ rtw_write16(Adapter, REG_RXFLTMAP1, 0x0400); -+ -+ //Beacon Control related register for first time -+ rtw_write8(Adapter, REG_BCNDMATIM, 0x02); // 2ms -+ rtw_write8(Adapter, REG_DRVERLYINT, 0x05);// 5ms -+ //rtw_write8(Adapter, REG_BCN_MAX_ERR, 0xFF); -+ rtw_write8(Adapter, REG_ATIMWND_1, 0x0a); // 10ms for port1 -+ rtw_write16(Adapter, REG_BCNTCFG, 0x00); -+ rtw_write16(Adapter, REG_TBTT_PROHIBIT, 0xff04); -+ rtw_write16(Adapter, REG_TSFTR_SYN_OFFSET, 0x7fff);// +32767 (~32ms) -+ -+ -+ //enable BCN1 Function for if2 -+ //don't enable update TSF1 for if2 (due to TSF update when beacon/probe rsp are received) -+ rtw_write8(Adapter, REG_BCN_CTRL_1, (DIS_TSF_UDT0_NORMAL_CHIP|EN_BCN_FUNCTION | EN_TXBCN_RPT|BIT(1))); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(Adapter, WIFI_FW_NULL_STATE)) -+ rtw_write8(Adapter, REG_BCN_CTRL, -+ rtw_read8(Adapter, REG_BCN_CTRL) & ~EN_BCN_FUNCTION); -+#endif -+ -+ DBG_871X("%s()-%d: REG_BCN_CTRL_1 = %02x\n", __FUNCTION__, __LINE__, rtw_read8(Adapter, REG_BCN_CTRL_1)); -+ -+ //BCN1 TSF will sync to BCN0 TSF with offset(0x518) if if1_sta linked -+ //rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(5)); -+ //rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(3)); -+ -+ //dis BCN0 ATIM WND if if1 is station -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(0)); -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+ // Reset TSF for STA+AP concurrent mode -+ if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { -+ if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) -+ DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", -+ __FUNCTION__, __LINE__); -+ } -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ } -+ -+ } -+ else // (Adapter->iface_type == IFACE_PORT1) -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ // disable Port0 TSF update -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(4)); -+ -+ // set net_type -+ val8 = rtw_read8(Adapter, MSR)&0x0c; -+ val8 |= mode; -+ rtw_write8(Adapter, MSR, val8); -+ -+ //reset TSF0 -+ rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(0)); -+ -+ DBG_871X("%s()-%d mode = %d\n", __FUNCTION__, __LINE__, mode); -+ -+ if((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if(!check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE)) -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ StopTxBeacon(Adapter); -+ } -+ -+ rtw_write8(Adapter,REG_BCN_CTRL, 0x19);//disable atim wnd -+ //rtw_write8(Adapter,REG_BCN_CTRL, 0x18); -+ } -+ else if((mode == _HW_STATE_ADHOC_) /*|| (mode == _HW_STATE_AP_)*/) -+ { -+ ResumeTxBeacon(Adapter); -+ rtw_write8(Adapter,REG_BCN_CTRL, 0x1a); -+ } -+ else if(mode == _HW_STATE_AP_) -+ { -+ ResumeTxBeacon(Adapter); -+ -+ rtw_write8(Adapter, REG_BCN_CTRL, 0x12); -+ -+ //Set RCR -+ //write32(padapter, REG_RCR, 0x70002a8e);//CBSSID_DATA must set to 0 -+ rtw_write32(Adapter, REG_RCR, 0x7000228e);//CBSSID_DATA must set to 0 -+ //enable to rx data frame -+ rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF); -+ //enable to rx ps-poll -+ rtw_write16(Adapter, REG_RXFLTMAP1, 0x0400); -+ -+ //Beacon Control related register for first time -+ -+ rtw_write8(Adapter, REG_BCNDMATIM, 0x02); // 2ms -+ rtw_write8(Adapter, REG_DRVERLYINT, 0x05);// 5ms -+ -+ //write8(Adapter, REG_BCN_MAX_ERR, 0xFF); -+ rtw_write8(Adapter, REG_ATIMWND, 0x0a); // 10ms for port0 -+ rtw_write16(Adapter, REG_BCNTCFG, 0x00); -+ rtw_write16(Adapter, REG_TBTT_PROHIBIT, 0xff04); -+ rtw_write16(Adapter, REG_TSFTR_SYN_OFFSET, 0x7fff);// +32767 (~32ms) -+ -+ //enable BCN0 Function for if1 -+ //don't enable update TSF0 for if1 (due to TSF update when beacon/probe rsp are received) -+ rtw_write8(Adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP|EN_BCN_FUNCTION | EN_TXBCN_RPT|BIT(1))); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(Adapter, WIFI_FW_NULL_STATE)) -+ rtw_write8(Adapter, REG_BCN_CTRL_1, -+ rtw_read8(Adapter, REG_BCN_CTRL_1) & ~EN_BCN_FUNCTION); -+#endif -+ //BCN1 TSF will sync to BCN0 TSF with offset(0x518) if if1_sta linked -+ //only interface 2 as AP MODE need to sync -+ //rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(5)); -+ -+ -+ //dis BCN1 ATIM WND if if2 is station -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(0)); -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+ // Reset TSF for STA+AP concurrent mode -+ if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { -+ if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) -+ DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", -+ __FUNCTION__, __LINE__); -+ } -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ -+ } -+ -+ -+ } -+ -+} -+ -+static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val) -+{ -+ u8 idx = 0; -+ u32 reg_macid; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->iface_type == IFACE_PORT1) -+ { -+ reg_macid = REG_MACID1; -+ } -+ else -+#endif -+ { -+ reg_macid = REG_MACID; -+ } -+ -+ for(idx = 0 ; idx < 6; idx++) -+ { -+ rtw_write8(Adapter, (reg_macid+idx), val[idx]); -+ } -+ -+} -+ -+static void hw_var_set_bssid(PADAPTER Adapter, u8 variable, u8* val) -+{ -+ u8 idx = 0; -+ u32 reg_bssid; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->iface_type == IFACE_PORT1) -+ { -+ reg_bssid = REG_BSSID1; -+ } -+ else -+#endif -+ { -+ reg_bssid = REG_BSSID; -+ } -+ -+ for(idx = 0 ; idx < 6; idx++) -+ { -+ rtw_write8(Adapter, (reg_bssid+idx), val[idx]); -+ } -+ -+} -+ -+static void hw_var_set_bcn_func(PADAPTER Adapter, u8 variable, u8* val) -+{ -+ u32 bcn_ctrl_reg; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->iface_type == IFACE_PORT1) -+ { -+ bcn_ctrl_reg = REG_BCN_CTRL_1; -+ -+ if(*((u8 *)val)) -+ { -+ rtw_write8(Adapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT)); -+ } -+ else -+ { -+ rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT))); -+ } -+ } -+ else -+#endif -+ { -+ bcn_ctrl_reg = REG_BCN_CTRL; -+ if(*((u8 *)val)) -+ { -+ rtw_write8(Adapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT)); -+ } -+ else -+ { -+ //rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT))); -+ rtw_write8(Adapter, bcn_ctrl_reg, (rtw_read8(Adapter, bcn_ctrl_reg)&(~(EN_TXBCN_RPT))) | DIS_TSF_UDT0_NORMAL_CHIP); -+ } -+ } -+ -+ -+} -+ -+#ifdef CONFIG_WOWLAN -+static int rtw_wowlan_set_pattern(_adapter *padapter ,u8* pbuf){ -+ struct pwrctrl_priv *pwrpriv=&padapter->pwrctrlpriv; -+ int res=0,crc_idx; -+ u32 content=0,cmd=0; -+ u32 *pdata; -+ u8 config,crc,mc,bc,uc,idx,pattern_len,packet[200],packet_len,valid; -+ u16 crc_val=0,i; -+ -+ config=pbuf[0]; -+ bc=config & BIT(3)?1:0; -+ mc=config & BIT(4)?1:0; -+ uc=config & BIT(5)?1:0; -+ idx=config & 0x7; -+ crc=config & BIT(6)?1:0; -+ valid=config & BIT(7)?1:0; -+ pattern_len=pbuf[1]; -+ packet_len=pattern_len*8; -+ pdata=(u32 *)pbuf; -+ -+ // Write to the Wakeup CAM -+ //offset 0 -+ if(pattern_len>=4){ -+ content=pdata[1]; -+ } -+ else{ -+ content=0; -+ } -+ DBG_8192C("\nrtw_wowlan_set_pattern offset[0] content 0x%x [cpu_to_le32 0x%x]\n", content,__cpu_to_le32(content)); -+ //rtw_write32(padapter, REG_WKFMCAM_RWD, __cpu_to_le32(content)); -+ pwrpriv->wowlan_pattern_context[idx][0]= __cpu_to_le32(content); -+ //cmd=BIT(31)|BIT(16)|(idx+0); -+ //rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ //offset 4 -+ if(pattern_len>=8){ -+ content=pdata[2]; -+ } -+ else{ -+ content=0; -+ } -+ DBG_8192C("rtw_wowlan_set_pattern offset[4] content 0x%x [cpu_to_le32 0x%x]\n", content,__cpu_to_le32(content)); -+ //rtw_write32(padapter, REG_WKFMCAM_RWD, __cpu_to_le32(content)); -+ pwrpriv->wowlan_pattern_context[idx][1]= __cpu_to_le32(content); -+ -+ //cmd=BIT(31)|BIT(16)|(idx+1); -+ //rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ //offset 8 -+ if(pattern_len>=12){ -+ content=pdata[3]; -+ } -+ else{ -+ content=0; -+ } -+ DBG_8192C("rtw_wowlan_set_pattern offset[8] content 0x%x [cpu_to_le32 0x%x]\n", content,__cpu_to_le32(content)); -+ //rtw_write32(padapter, REG_WKFMCAM_RWD, __cpu_to_le32(content)); -+ pwrpriv->wowlan_pattern_context[idx][2]= __cpu_to_le32(content); -+ //cmd=BIT(31)|BIT(16)|(idx+2); -+ //rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ //offset 12 -+ if(pattern_len>=16){ -+ content=pdata[4]; -+ } -+ else{ -+ content=0; -+ } -+ DBG_8192C("rtw_wowlan_set_pattern offset[12] content 0x%x [cpu_to_le32 0x%x]\n", content,__cpu_to_le32(content)); -+ //rtw_write32(padapter, REG_WKFMCAM_RWD, __cpu_to_le32(content)); -+ pwrpriv->wowlan_pattern_context[idx][3]= __cpu_to_le32(content); -+ //cmd=BIT(31)|BIT(16)|(idx+3); -+ //rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ -+ if(crc){ -+ // Have the CRC value -+ crc_val=*(u16 *)(&pbuf[2]); -+ DBG_8192C("rtw_wowlan_set_pattern crc_val 0x%x \n", crc_val); -+ crc_val=__cpu_to_le16(crc_val); -+ DBG_8192C("rtw_wowlan_set_pattern crc_val after 0x%x \n", crc_val); -+ } -+ else{ -+ DBG_8192C("+rtw_wowlan_set_pattern crc=0[%x] Should calculate the CRC\n", crc); -+ // calculate the CRC the write to the Wakeup CAM -+ crc_idx=0; -+ for(i=0;iwowlan_pattern_context[idx][4]= content; -+ //cmd=BIT(31)|BIT(16)|(idx+4); -+ //rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ pwrpriv->wowlan_pattern_idx|=BIT(idx); -+ -+_rtw_wowlan_set_pattern_exit: -+ return res; -+} -+ -+ -+ -+void rtw_wowlan_reload_pattern(_adapter *padapter){ -+ struct pwrctrl_priv *pwrpriv=&padapter->pwrctrlpriv; -+ u32 content=0,cmd=0; -+ u8 idx; -+ -+ for (idx=0;idx<8;idx ++){ -+ if(pwrpriv->wowlan_pattern_idx & BIT(idx)){ -+ //offset 0 -+ rtw_write32(padapter, REG_WKFMCAM_RWD, pwrpriv->wowlan_pattern_context[idx][0]); -+ cmd=BIT(31)|BIT(16)|(idx+0); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ -+ //offset 4 -+ rtw_write32(padapter, REG_WKFMCAM_RWD, pwrpriv->wowlan_pattern_context[idx][1]); -+ cmd=BIT(31)|BIT(16)|(idx+1); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ -+ //offset 8 -+ rtw_write32(padapter, REG_WKFMCAM_RWD, pwrpriv->wowlan_pattern_context[idx][2]); -+ cmd=BIT(31)|BIT(16)|(idx+2); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ -+ //offset 12 -+ rtw_write32(padapter, REG_WKFMCAM_RWD, pwrpriv->wowlan_pattern_context[idx][3]); -+ cmd=BIT(31)|BIT(16)|(idx+3); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ -+ //offset 16 -+ rtw_write32(padapter, REG_WKFMCAM_RWD, pwrpriv->wowlan_pattern_context[idx][4]); -+ cmd=BIT(31)|BIT(16)|(idx+4); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ -+ } -+ printk("print WOWCAM idx =%d\n",idx); -+ cmd=BIT(31)|(idx+0); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ printk("print WOWCAM offset[0] =%x\n",rtw_read32(padapter, REG_WKFMCAM_RWD)); -+ cmd=BIT(31)|(idx+1); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ printk("print WOWCAM offset[1] =%x\n",rtw_read32(padapter, REG_WKFMCAM_RWD)); -+ cmd=BIT(31)|(idx+2); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ printk("print WOWCAM offset[2] =%x\n",rtw_read32(padapter, REG_WKFMCAM_RWD)); -+ cmd=BIT(31)|(idx+3); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ printk("print WOWCAM offset[3] =%x\n",rtw_read32(padapter, REG_WKFMCAM_RWD)); -+ cmd=BIT(31)|(idx+4); -+ rtw_write32(padapter, REG_WKFMCAM_CMD, cmd); -+ printk("print WOWCAM offset[4] =%x\n",rtw_read32(padapter, REG_WKFMCAM_RWD)); -+ -+ -+ } -+} -+#endif //CONFIG_WOWLAN -+ -+static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ u64 tsf; -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //tsf = pmlmeext->TSFValue - ((u32)pmlmeext->TSFValue % (pmlmeinfo->bcn_interval*1024)) -1024; //us -+ tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) -1024; //us -+ -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) -+ { -+ //pHalData->RegTxPause |= STOP_BCNQ;BIT(6) -+ //rtw_write8(Adapter, REG_TXPAUSE, (rtw_read8(Adapter, REG_TXPAUSE)|BIT(6))); -+ StopTxBeacon(Adapter); -+ } -+ -+ if(Adapter->iface_type == IFACE_PORT1) -+ { -+ //disable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)&(~BIT(3))); -+ -+ rtw_write32(Adapter, REG_TSFTR1, tsf); -+ rtw_write32(Adapter, REG_TSFTR1+4, tsf>>32); -+ -+ //enable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(3)); -+ -+ -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+ // Update buddy port's TSF(TBTT) if it is SoftAP for beacon TX issue! -+ if ( (pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE -+ && check_buddy_fwstate(Adapter, WIFI_AP_STATE) ) { -+ if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) -+ DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", -+ __FUNCTION__, __LINE__); -+ } -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ -+ } -+ else // Adapter->iface_type == IFACE_PORT1 -+ { -+ //disable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(3))); -+ // disable TSF update instead! May induce burst beacon TX -+ //rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(4)); -+ -+ rtw_write32(Adapter, REG_TSFTR, tsf); -+ rtw_write32(Adapter, REG_TSFTR+4, tsf>>32); -+ -+ //enable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(3)); -+ //rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(4))); -+ -+ // Update buddy port's TSF if it is SoftAP for beacon TX issue! -+ if ( (pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE -+ && check_buddy_fwstate(Adapter, WIFI_AP_STATE) -+ ) { -+ //disable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)&(~BIT(3))); -+ // disable TSF update instead! -+ //rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(4)); -+ -+ rtw_write32(Adapter, REG_TSFTR1, tsf); -+ rtw_write32(Adapter, REG_TSFTR1+4, tsf>>32); -+ -+ //enable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(3)); -+ //rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL_1)&(~BIT(4))); -+ } -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+ // Update buddy port's TSF if it is SoftAP for beacon TX issue! -+ if ( (pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE -+ && check_buddy_fwstate(Adapter, WIFI_AP_STATE) ) { -+ if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) -+ DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", -+ __FUNCTION__, __LINE__); -+ } -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ } -+ -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) -+ { -+ //pHalData->RegTxPause &= (~STOP_BCNQ); -+ //rtw_write8(Adapter, REG_TXPAUSE, (rtw_read8(Adapter, REG_TXPAUSE)&(~BIT(6)))); -+ ResumeTxBeacon(Adapter); -+ } -+#endif // CONFIG_CONCURRENT_MODE -+} -+ -+static void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; -+ -+ -+ if(check_buddy_mlmeinfo_state(Adapter, _HW_STATE_NOLINK_)) -+ rtw_write16(Adapter, REG_RXFLTMAP2, 0x00); -+ -+ -+ if(Adapter->iface_type == IFACE_PORT1) -+ { -+ int i; -+ u8 reg_bcn_ctrl_1; -+ -+ // a.Driver set 0x422 bit 6 =0 -+ rtw_write8(Adapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl) & (~BIT6)); -+ pHalData->RegFwHwTxQCtrl &= (~BIT6); -+ -+ -+#ifdef CONFIG_BEACON_DISABLE_OFFLOAD -+ u8 reg_bcn_disable_cnt = rtw_read8(Adapter, REG_FW_BCN_DIS_CNT); -+ DBG_871X("%s()-%d: reg_bcn_disable_cnt=%02x\n", __FUNCTION__, __LINE__, reg_bcn_disable_cnt); -+ -+ reg_bcn_ctrl_1 = rtw_read8(Adapter, REG_BCN_CTRL_1); -+ DBG_871X("%s()-%d: reg_bcn_ctrl_1=%02x\n", __FUNCTION__, __LINE__, reg_bcn_ctrl_1); -+ -+ // b. driver set h2c cmd -+ rtl8192c_dis_beacon_fun_cmd(Adapter); -+ -+ /* -+ // FW Job for port 0 -+ -+ c. 8051 set nettype to ap -+ d. 8051 check dma_int -+ e. 8051 set nettype to no_link -+ f.8051 dis_tsf_update 0x550 bit 4 -+ g.8051 reset beacon function test count 0x553 bit0. -+ h.8051 disable beacon function 0x550 bit3 -+ i. 8051 sent ready to driver -+ -+ */ -+ -+ // The worst case is 100 + 15 ms -+ rtw_msleep_os(120); -+ -+ for (i=0; i< 10; i++) { -+ reg_bcn_ctrl_1 = rtw_read8(Adapter, REG_BCN_CTRL_1); -+ if ( (reg_bcn_ctrl_1 & BIT(3)) == 0 ) { -+ //DBG_871X("%s()-%d: BEACON_DISABLE_OFFLOAD finished! reg=%02x\n", __FUNCTION__, __LINE__, reg); -+ break; -+ } -+ DBG_871X("%s()-%d: BEACON_DISABLE_OFFLOAD not finished! REG_BCN_CTRL_1=%02x\n", __FUNCTION__, __LINE__, reg_bcn_ctrl_1); -+ DBG_871X("%s()-%d: reg_bcn_disable_cnt=%02x\n", __FUNCTION__, __LINE__, rtw_read8(Adapter, REG_FW_BCN_DIS_CNT)); -+ DBG_871X("%s()-%d: REG_BCN_CTRL=%02x\n", __FUNCTION__, __LINE__, rtw_read8(Adapter, REG_BCN_CTRL)); -+ DBG_871X("%s()-%d: FWISR=%08x\n", __FUNCTION__, __LINE__, rtw_read32(Adapter, REG_FWISR)); -+ rtw_msleep_os(100); -+ } -+ DBG_871X("%s()-%d: reg_bcn_disable_cnt=%02x\n", __FUNCTION__, __LINE__, rtw_read8(Adapter, REG_FW_BCN_DIS_CNT)); -+ DBG_871X("%s()-%d: reg_bcn_ctrl_1=%02x\n", __FUNCTION__, __LINE__, reg_bcn_ctrl_1); -+ -+#else // CONFIG_BEACON_DISABLE_OFFLOAD -+ -+ //disable update TSF1 -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)|BIT(4)); -+ -+ //reset TSF1 -+ rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(1)); -+ -+ // disable Port1's beacon function -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)&(~BIT(3))); -+ -+#endif // CONFIG_BEACON_DISABLE_OFFLOAD -+ -+ // j, Driver set 0x422 bit 6 =1 -+ rtw_write8(Adapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl) | BIT6); -+ pHalData->RegFwHwTxQCtrl |= BIT6; -+ -+ // k. re_download beacon pkt -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE)) -+ set_tx_beacon_cmd(pbuddy_adapter); -+ -+ -+ } -+ else // (Adapter->iface_type == IFACE_PORT1) -+ { -+ //disable update TSF -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(4)); -+ -+ //reset TSF -+ rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(0)); -+ -+ // Can't disable Port0's beacon function due to it is used by RA -+ } -+#endif -+} -+ -+static void hw_var_set_mlme_sitesurvey(PADAPTER Adapter, u8 variable, u8* val) -+{ -+ u32 value_rcr, rcr_clear_bit, reg_bcn_ctl; -+ u16 value_rxfltmap2; -+ struct mlme_priv *pmlmepriv=&(Adapter->mlmepriv); -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(Adapter->iface_type == IFACE_PORT1) -+ reg_bcn_ctl = REG_BCN_CTRL_1; -+ else -+#endif -+ reg_bcn_ctl = REG_BCN_CTRL; -+ -+#ifdef CONFIG_FIND_BEST_CHANNEL -+ -+ if( (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+#ifdef CONFIG_CONCURRENT_MODE -+ || (check_buddy_fwstate(Adapter, WIFI_AP_STATE) == _TRUE) -+#endif -+#ifdef CONFIG_TDLS -+ // TDLS will clear RCR_CBSSID_DATA bit for connection. -+ || ( Adapter->tdlsinfo.setup_state & TDLS_LINKED_STATE ) -+#endif // CONFIG_TDLS -+ ) -+ { -+ rcr_clear_bit = RCR_CBSSID_BCN; -+ } -+ else -+ { -+ rcr_clear_bit = (RCR_CBSSID_BCN | RCR_CBSSID_DATA); -+ } -+ -+ // Recieve all data frames -+ value_rxfltmap2 = 0xFFFF; -+ -+#else /* CONFIG_FIND_BEST_CHANNEL */ -+ -+ rcr_clear_bit = RCR_CBSSID_BCN; -+ -+ //config RCR to receive different BSSID & not to receive data frame -+ value_rxfltmap2 = 0; -+ -+#endif /* CONFIG_FIND_BEST_CHANNEL */ -+ -+ value_rcr = rtw_read32(Adapter, REG_RCR); -+ -+ if(*((u8 *)val))//under sitesurvey -+ { -+ value_rcr &= ~(rcr_clear_bit); -+ rtw_write32(Adapter, REG_RCR, value_rcr); -+ -+ rtw_write16(Adapter, REG_RXFLTMAP2, value_rxfltmap2); -+ -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE)) { -+ //disable update TSF -+ rtw_write8(Adapter, reg_bcn_ctl, rtw_read8(Adapter, reg_bcn_ctl)|BIT(4)); -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(Adapter, _FW_LINKED)) -+ { -+ StopTxBeacon(Adapter); -+ } -+#endif -+ } -+ else//sitesurvey done -+ { -+ if(check_fwstate(pmlmepriv, _FW_LINKED) || check_fwstate(pmlmepriv, WIFI_AP_STATE) -+#ifdef CONFIG_CONCURRENT_MODE -+ || check_buddy_fwstate(Adapter, _FW_LINKED) || check_buddy_fwstate(Adapter, WIFI_AP_STATE) -+#endif -+ ) -+ { -+ //enable to rx data frame -+ rtw_write16(Adapter, REG_RXFLTMAP2,0xFFFF); -+ } -+ -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE)) { -+ //enable update TSF -+ rtw_write8(Adapter, reg_bcn_ctl, rtw_read8(Adapter, reg_bcn_ctl)&(~BIT(4))); -+ } -+ -+ value_rcr |= rcr_clear_bit; -+ rtw_write32(Adapter, REG_RCR, value_rcr); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(Adapter, _FW_LINKED)) -+ { -+ ResumeTxBeacon(Adapter); -+ } -+#endif -+ } -+} -+ -+static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val) -+{ -+#ifdef CONFIG_CONCURRENT_MODE -+ u8 RetryLimit = 0x30; -+ u8 type = *((u8 *)val); -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ -+ if(type == 0) // prepare to join -+ { -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(Adapter, _FW_LINKED)) -+ { -+ StopTxBeacon(Adapter); -+ } -+ -+ //enable to rx data frame.Accept all data frame -+ //rtw_write32(padapter, REG_RCR, rtw_read32(padapter, REG_RCR)|RCR_ADF); -+ rtw_write16(Adapter, REG_RXFLTMAP2,0xFFFF); -+ -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE)) -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_BCN); -+ else -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN); -+ -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ RetryLimit = (pHalData->CustomerID == RT_CID_CCX) ? 7 : 48; -+ } -+ else // Ad-hoc Mode -+ { -+ RetryLimit = 0x7; -+ } -+ } -+ else if(type == 1) //joinbss_event call back when join res < 0 -+ { -+ if(check_buddy_mlmeinfo_state(Adapter, _HW_STATE_NOLINK_)) -+ rtw_write16(Adapter, REG_RXFLTMAP2,0x00); -+ -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(Adapter, _FW_LINKED)) -+ { -+ ResumeTxBeacon(Adapter); -+ -+ //reset TSF 1/2 after ResumeTxBeacon -+ //rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(1)|BIT(0)); -+ -+ } -+ } -+ else if(type == 2) //sta add event call back -+ { -+ -+ //enable update TSF -+ if(Adapter->iface_type == IFACE_PORT1) -+ rtw_write8(Adapter, REG_BCN_CTRL_1, rtw_read8(Adapter, REG_BCN_CTRL_1)&(~BIT(4))); -+ else -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(4))); -+ -+ -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE)) -+ { -+ //fixed beacon issue for 8191su........... -+ rtw_write8(Adapter,0x542 ,0x02); -+ RetryLimit = 0x7; -+ } -+ -+ -+ if(check_buddy_mlmeinfo_state(Adapter, WIFI_FW_AP_STATE) && -+ check_buddy_fwstate(Adapter, _FW_LINKED)) -+ { -+ ResumeTxBeacon(Adapter); -+ -+ //reset TSF 1/2 after ResumeTxBeacon -+ //rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(1)|BIT(0)); -+ } -+ -+ } -+ -+ rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | RetryLimit << RETRY_LIMIT_LONG_SHIFT); -+ -+#endif -+} -+ -+void SetHwReg8192CU(PADAPTER Adapter, u8 variable, u8* val) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+_func_enter_; -+ -+ switch(variable) -+ { -+ case HW_VAR_MEDIA_STATUS: -+ { -+ u8 val8; -+ -+ val8 = rtw_read8(Adapter, MSR)&0x0c; -+ val8 |= *((u8 *)val); -+ rtw_write8(Adapter, MSR, val8); -+ } -+ break; -+ case HW_VAR_MEDIA_STATUS1: -+ { -+ u8 val8; -+ -+ val8 = rtw_read8(Adapter, MSR)&0x03; -+ val8 |= *((u8 *)val) <<2; -+ rtw_write8(Adapter, MSR, val8); -+ } -+ break; -+ case HW_VAR_SET_OPMODE: -+ hw_var_set_opmode(Adapter, variable, val); -+ break; -+ case HW_VAR_MAC_ADDR: -+ hw_var_set_macaddr(Adapter, variable, val); -+ break; -+ case HW_VAR_BSSID: -+ hw_var_set_bssid(Adapter, variable, val); -+ break; -+ case HW_VAR_BASIC_RATE: -+ { -+ u16 BrateCfg = 0; -+ u8 RateIndex = 0; -+ -+ // 2007.01.16, by Emily -+ // Select RRSR (in Legacy-OFDM and CCK) -+ // For 8190, we select only 24M, 12M, 6M, 11M, 5.5M, 2M, and 1M from the Basic rate. -+ // We do not use other rates. -+ HalSetBrateCfg( Adapter, val, &BrateCfg ); -+ -+ //2011.03.30 add by Luke Lee -+ //CCK 2M ACK should be disabled for some BCM and Atheros AP IOT -+ //because CCK 2M has poor TXEVM -+ //CCK 5.5M & 11M ACK should be enabled for better performance -+ -+ pHalData->BasicRateSet = BrateCfg = (BrateCfg |0xd) & 0x15d; -+ -+ BrateCfg |= 0x01; // default enable 1M ACK rate -+ -+ DBG_8192C("HW_VAR_BASIC_RATE: BrateCfg(%#x)\n", BrateCfg); -+ -+ // Set RRSR rate table. -+ rtw_write8(Adapter, REG_RRSR, BrateCfg&0xff); -+ rtw_write8(Adapter, REG_RRSR+1, (BrateCfg>>8)&0xff); -+ rtw_write8(Adapter, REG_RRSR+2, rtw_read8(Adapter, REG_RRSR+2)&0xf0); -+ -+ // Set RTS initial rate -+ while(BrateCfg > 0x1) -+ { -+ BrateCfg = (BrateCfg>> 1); -+ RateIndex++; -+ } -+ // Ziv - Check -+ rtw_write8(Adapter, REG_INIRTS_RATE_SEL, RateIndex); -+ } -+ break; -+ case HW_VAR_TXPAUSE: -+ rtw_write8(Adapter, REG_TXPAUSE, *((u8 *)val)); -+ break; -+ case HW_VAR_BCN_FUNC: -+ hw_var_set_bcn_func(Adapter, variable, val); -+ break; -+ case HW_VAR_CORRECT_TSF: -+#ifdef CONFIG_CONCURRENT_MODE -+ hw_var_set_correct_tsf(Adapter, variable, val); -+#else -+ { -+ u64 tsf; -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //tsf = pmlmeext->TSFValue - ((u32)pmlmeext->TSFValue % (pmlmeinfo->bcn_interval*1024)) -1024; //us -+ tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) -1024; //us -+ -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) -+ { -+ //pHalData->RegTxPause |= STOP_BCNQ;BIT(6) -+ //rtw_write8(Adapter, REG_TXPAUSE, (rtw_read8(Adapter, REG_TXPAUSE)|BIT(6))); -+ StopTxBeacon(Adapter); -+ } -+ -+ //disable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(3))); -+ -+ rtw_write32(Adapter, REG_TSFTR, tsf); -+ rtw_write32(Adapter, REG_TSFTR+4, tsf>>32); -+ -+ //enable related TSF function -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(3)); -+ -+ -+ if(((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) -+ { -+ //pHalData->RegTxPause &= (~STOP_BCNQ); -+ //rtw_write8(Adapter, REG_TXPAUSE, (rtw_read8(Adapter, REG_TXPAUSE)&(~BIT(6)))); -+ ResumeTxBeacon(Adapter); -+ } -+ } -+#endif -+ break; -+ case HW_VAR_CHECK_BSSID: -+ if(*((u8 *)val)) -+ { -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN); -+ } -+ else -+ { -+ u32 val32; -+ -+ val32 = rtw_read32(Adapter, REG_RCR); -+ val32 &= ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN); -+ rtw_write32(Adapter, REG_RCR, val32); -+ } -+ break; -+ case HW_VAR_MLME_DISCONNECT: -+#ifdef CONFIG_CONCURRENT_MODE -+ hw_var_set_mlme_disconnect(Adapter, variable, val); -+#else -+ { -+ //Set RCR to not to receive data frame when NO LINK state -+ //rtw_write32(Adapter, REG_RCR, rtw_read32(padapter, REG_RCR) & ~RCR_ADF); -+ //reject all data frames -+ rtw_write16(Adapter, REG_RXFLTMAP2,0x00); -+ -+ //reset TSF -+ rtw_write8(Adapter, REG_DUAL_TSF_RST, (BIT(0)|BIT(1))); -+ -+ //disable update TSF -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(4)); -+ } -+#endif -+ break; -+ case HW_VAR_MLME_SITESURVEY: -+ hw_var_set_mlme_sitesurvey(Adapter, variable, val); -+ break; -+ case HW_VAR_MLME_JOIN: -+#ifdef CONFIG_CONCURRENT_MODE -+ hw_var_set_mlme_join(Adapter, variable, val); -+#else -+ { -+ u8 RetryLimit = 0x30; -+ u8 type = *((u8 *)val); -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ -+ if(type == 0) // prepare to join -+ { -+ //enable to rx data frame.Accept all data frame -+ //rtw_write32(padapter, REG_RCR, rtw_read32(padapter, REG_RCR)|RCR_ADF); -+ rtw_write16(Adapter, REG_RXFLTMAP2,0xFFFF); -+ -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN); -+ -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ RetryLimit = (pHalData->CustomerID == RT_CID_CCX) ? 7 : 48; -+ } -+ else // Ad-hoc Mode -+ { -+ RetryLimit = 0x7; -+ } -+ } -+ else if(type == 1) //joinbss_event call back when join res < 0 -+ { -+ rtw_write16(Adapter, REG_RXFLTMAP2,0x00); -+ } -+ else if(type == 2) //sta add event call back -+ { -+ //enable update TSF -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(4))); -+ -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE)) -+ { -+ //fixed beacon issue for 8191su........... -+ rtw_write8(Adapter,0x542 ,0x02); -+ RetryLimit = 0x7; -+ } -+ } -+ -+ rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | RetryLimit << RETRY_LIMIT_LONG_SHIFT); -+ } -+#endif -+ break; -+ -+ case HW_VAR_ON_RCR_AM: -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_AM); -+ DBG_871X("%s, %d, RCR= %x \n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); -+ break; -+ case HW_VAR_OFF_RCR_AM: -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)& (~RCR_AM)); -+ DBG_871X("%s, %d, RCR= %x \n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); -+ break; -+ -+ case HW_VAR_BEACON_INTERVAL: -+ rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val)); -+ break; -+ case HW_VAR_SLOT_TIME: -+ { -+ u8 u1bAIFS, aSifsTime; -+ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ rtw_write8(Adapter, REG_SLOT, val[0]); -+ -+ if(pmlmeinfo->WMM_enable == 0) -+ { -+ if( pmlmeext->cur_wireless_mode == WIRELESS_11B) -+ aSifsTime = 10; -+ else -+ aSifsTime = 16; -+ -+ u1bAIFS = aSifsTime + (2 * pmlmeinfo->slotTime); -+ -+ // Temporary removed, 2008.06.20. -+ rtw_write8(Adapter, REG_EDCA_VO_PARAM, u1bAIFS); -+ rtw_write8(Adapter, REG_EDCA_VI_PARAM, u1bAIFS); -+ rtw_write8(Adapter, REG_EDCA_BE_PARAM, u1bAIFS); -+ rtw_write8(Adapter, REG_EDCA_BK_PARAM, u1bAIFS); -+ } -+ } -+ break; -+ case HW_VAR_RESP_SIFS: -+ { -+#if 0 -+ // SIFS for OFDM Data ACK -+ rtw_write8(Adapter, REG_SIFS_CTX+1, val[0]); -+ // SIFS for OFDM consecutive tx like CTS data! -+ rtw_write8(Adapter, REG_SIFS_TRX+1, val[1]); -+ -+ rtw_write8(Adapter,REG_SPEC_SIFS+1, val[0]); -+ rtw_write8(Adapter,REG_MAC_SPEC_SIFS+1, val[0]); -+ -+ // 20100719 Joseph: Revise SIFS setting due to Hardware register definition change. -+ rtw_write8(Adapter, REG_R2T_SIFS+1, val[0]); //0x08 - CCK -+ rtw_write8(Adapter, REG_T2T_SIFS+1, val[0]); //0x0e - OFDM -+#else -+ //SIFS_Timer = 0x0a0a0808; -+ //RESP_SIFS for CCK -+ rtw_write8(Adapter, REG_R2T_SIFS, val[0]); // SIFS_T2T_CCK (0x08) -+ rtw_write8(Adapter, REG_R2T_SIFS+1, val[1]); //SIFS_R2T_CCK(0x08) -+ //RESP_SIFS for OFDM -+ rtw_write8(Adapter, REG_T2T_SIFS, val[2]); //SIFS_T2T_OFDM (0x0a) -+ rtw_write8(Adapter, REG_T2T_SIFS+1, val[3]); //SIFS_R2T_OFDM(0x0a) -+#endif -+ } -+ break; -+ case HW_VAR_ACK_PREAMBLE: -+ { -+ u8 regTmp; -+ u8 bShortPreamble = *( (PBOOLEAN)val ); -+ // Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily) -+ regTmp = (pHalData->nCur40MhzPrimeSC)<<5; -+ //regTmp = 0; -+ if(bShortPreamble) -+ regTmp |= 0x80; -+ -+ rtw_write8(Adapter, REG_RRSR+2, regTmp); -+ } -+ break; -+ case HW_VAR_SEC_CFG: -+#ifdef CONFIG_CONCURRENT_MODE -+ rtw_write8(Adapter, REG_SECCFG, 0x0c|BIT(5));// enable tx enc and rx dec engine, and no key search for MC/BC -+#else -+ rtw_write8(Adapter, REG_SECCFG, *((u8 *)val)); -+#endif -+ break; -+ case HW_VAR_DM_FLAG: -+ pdmpriv->DMFlag = *((u8 *)val); -+ break; -+ case HW_VAR_DM_FUNC_OP: -+ if(val[0]) -+ {// save dm flag -+ pdmpriv->DMFlag_tmp = pdmpriv->DMFlag; -+ } -+ else -+ {// restore dm flag -+ pdmpriv->DMFlag = pdmpriv->DMFlag_tmp; -+ } -+ break; -+ case HW_VAR_DM_FUNC_SET: -+ pdmpriv->DMFlag |= *((u8 *)val); -+ break; -+ case HW_VAR_DM_FUNC_CLR: -+ pdmpriv->DMFlag &= *((u8 *)val); -+ break; -+ case HW_VAR_CAM_EMPTY_ENTRY: -+ { -+ u8 ucIndex = *((u8 *)val); -+ u8 i; -+ u32 ulCommand=0; -+ u32 ulContent=0; -+ u32 ulEncAlgo=CAM_AES; -+ -+ for(i=0;iAcParam_BE = ((u32 *)(val))[0]; -+ rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); -+ break; -+ case HW_VAR_AC_PARAM_BK: -+ rtw_write32(Adapter, REG_EDCA_BK_PARAM, ((u32 *)(val))[0]); -+ break; -+ case HW_VAR_ACM_CTRL: -+ { -+ u8 acm_ctrl = *((u8 *)val); -+ u8 AcmCtrl = rtw_read8( Adapter, REG_ACMHWCTRL); -+ -+ if(acm_ctrl > 1) -+ AcmCtrl = AcmCtrl | 0x1; -+ -+ if(acm_ctrl & BIT(3)) -+ AcmCtrl |= AcmHw_VoqEn; -+ else -+ AcmCtrl &= (~AcmHw_VoqEn); -+ -+ if(acm_ctrl & BIT(2)) -+ AcmCtrl |= AcmHw_ViqEn; -+ else -+ AcmCtrl &= (~AcmHw_ViqEn); -+ -+ if(acm_ctrl & BIT(1)) -+ AcmCtrl |= AcmHw_BeqEn; -+ else -+ AcmCtrl &= (~AcmHw_BeqEn); -+ -+ DBG_871X("[HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl ); -+ rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl ); -+ } -+ break; -+ case HW_VAR_AMPDU_MIN_SPACE: -+ { -+ u8 MinSpacingToSet; -+ u8 SecMinSpace; -+ -+ MinSpacingToSet = *((u8 *)val); -+ if(MinSpacingToSet <= 7) -+ { -+ switch(Adapter->securitypriv.dot11PrivacyAlgrthm) -+ { -+ case _NO_PRIVACY_: -+ case _AES_: -+ SecMinSpace = 0; -+ break; -+ -+ case _WEP40_: -+ case _WEP104_: -+ case _TKIP_: -+ case _TKIP_WTMIC_: -+ SecMinSpace = 6; -+ break; -+ default: -+ SecMinSpace = 7; -+ break; -+ } -+ -+ if(MinSpacingToSet < SecMinSpace){ -+ MinSpacingToSet = SecMinSpace; -+ } -+ -+ //RT_TRACE(COMP_MLME, DBG_LOUD, ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n", Adapter->MgntInfo.MinSpaceCfg)); -+ rtw_write8(Adapter, REG_AMPDU_MIN_SPACE, (rtw_read8(Adapter, REG_AMPDU_MIN_SPACE) & 0xf8) | MinSpacingToSet); -+ } -+ } -+ break; -+ case HW_VAR_AMPDU_FACTOR: -+ { -+ u8 RegToSet_Normal[4]={0x41,0xa8,0x72, 0xb9}; -+ u8 RegToSet_BT[4]={0x31,0x74,0x42, 0x97}; -+ u8 FactorToSet; -+ u8 *pRegToSet; -+ u8 index = 0; -+ -+#ifdef CONFIG_BT_COEXIST -+ if( (pHalData->bt_coexist.BT_Coexist) && -+ (pHalData->bt_coexist.BT_CoexistType == BT_CSR_BC4) ) -+ pRegToSet = RegToSet_BT; // 0x97427431; -+ else -+#endif -+ pRegToSet = RegToSet_Normal; // 0xb972a841; -+ -+ FactorToSet = *((u8 *)val); -+ if(FactorToSet <= 3) -+ { -+ FactorToSet = (1<<(FactorToSet + 2)); -+ if(FactorToSet>0xf) -+ FactorToSet = 0xf; -+ -+ for(index=0; index<4; index++) -+ { -+ if((pRegToSet[index] & 0xf0) > (FactorToSet<<4)) -+ pRegToSet[index] = (pRegToSet[index] & 0x0f) | (FactorToSet<<4); -+ -+ if((pRegToSet[index] & 0x0f) > FactorToSet) -+ pRegToSet[index] = (pRegToSet[index] & 0xf0) | (FactorToSet); -+ -+ rtw_write8(Adapter, (REG_AGGLEN_LMT+index), pRegToSet[index]); -+ } -+ -+ //RT_TRACE(COMP_MLME, DBG_LOUD, ("Set HW_VAR_AMPDU_FACTOR: %#x\n", FactorToSet)); -+ } -+ } -+ break; -+ case HW_VAR_RXDMA_AGG_PG_TH: -+ #ifdef CONFIG_USB_RX_AGGREGATION -+ { -+ u8 threshold = *((u8 *)val); -+ if( threshold == 0) -+ { -+ threshold = pHalData->UsbRxAggPageCount; -+ } -+ rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold); -+ } -+ #endif -+ break; -+ case HW_VAR_SET_RPWM: -+ rtw_write8(Adapter, REG_USB_HRPWM, *((u8 *)val)); -+ break; -+ case HW_VAR_H2C_FW_PWRMODE: -+ { -+ u8 psmode = (*(u8 *)val); -+ -+ // Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power -+ // saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. -+ if( (psmode != PS_MODE_ACTIVE) && (!IS_92C_SERIAL(pHalData->VersionID))) -+ { -+ rtl8192c_dm_RF_Saving(Adapter, _TRUE); -+ } -+ rtl8192c_set_FwPwrMode_cmd(Adapter, psmode); -+ } -+ break; -+ case HW_VAR_H2C_FW_JOINBSSRPT: -+ { -+ u8 mstatus = (*(u8 *)val); -+ rtl8192c_set_FwJoinBssReport_cmd(Adapter, mstatus); -+ } -+ break; -+#ifdef CONFIG_P2P_PS -+ case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: -+ { -+ u8 p2p_ps_state = (*(u8 *)val); -+ rtl8192c_set_p2p_ps_offload_cmd(Adapter, p2p_ps_state); -+ } -+ break; -+#endif // CONFIG_P2P_PS -+#ifdef CONFIG_TDLS -+ case HW_VAR_TDLS_WRCR: -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)&(~ BIT(6) )); -+ break; -+ case HW_VAR_TDLS_INIT_CH_SEN: -+ { -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)&(~ BIT(6) )&(~ BIT(7) )); -+ rtw_write16(Adapter, REG_RXFLTMAP2,0xffff); -+ -+ //disable update TSF -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)|BIT(4)); -+ } -+ break; -+ case HW_VAR_TDLS_DONE_CH_SEN: -+ { -+ //enable update TSF -+ rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~ BIT(4))); -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|(BIT(7) )); -+ } -+ break; -+ case HW_VAR_TDLS_RS_RCR: -+ rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|(BIT(6))); -+ break; -+#endif //CONFIG_TDLS -+ case HW_VAR_INITIAL_GAIN: -+ { -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ u32 rx_gain = ((u32 *)(val))[0]; -+ -+ if(rx_gain == 0xff){//restore rx gain -+ pDigTable->CurIGValue = pDigTable->BackupIGValue; -+ PHY_SetBBReg(Adapter, rOFDM0_XAAGCCore1, 0x7f,pDigTable->CurIGValue ); -+ PHY_SetBBReg(Adapter, rOFDM0_XBAGCCore1, 0x7f,pDigTable->CurIGValue); -+ } -+ else{ -+ pDigTable->BackupIGValue = pDigTable->CurIGValue; -+ PHY_SetBBReg(Adapter, rOFDM0_XAAGCCore1, 0x7f,rx_gain ); -+ PHY_SetBBReg(Adapter, rOFDM0_XBAGCCore1, 0x7f,rx_gain); -+ pDigTable->CurIGValue = (u8)rx_gain; -+ } -+ -+ -+ } -+ break; -+ case HW_VAR_TRIGGER_GPIO_0: -+ rtl8192cu_trigger_gpio_0(Adapter); -+ break; -+#ifdef CONFIG_BT_COEXIST -+ case HW_VAR_BT_SET_COEXIST: -+ { -+ u8 bStart = (*(u8 *)val); -+ rtl8192c_set_dm_bt_coexist(Adapter, bStart); -+ } -+ break; -+ case HW_VAR_BT_ISSUE_DELBA: -+ { -+ u8 dir = (*(u8 *)val); -+ rtl8192c_issue_delete_ba(Adapter, dir); -+ } -+ break; -+#endif -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ -+ case HW_VAR_ANTENNA_DIVERSITY_LINK: -+ SwAntDivRestAfterLink8192C(Adapter); -+ break; -+ case HW_VAR_ANTENNA_DIVERSITY_SELECT: -+ { -+ u8 Optimum_antenna = (*(u8 *)val); -+ //switch antenna to Optimum_antenna -+ // DBG_8192C("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B"); -+ if(pHalData->CurAntenna != Optimum_antenna) -+ { -+ PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, Optimum_antenna); -+ pHalData->CurAntenna = Optimum_antenna ; -+ //DBG_8192C("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B"); -+ } -+ } -+ break; -+#endif -+ case HW_VAR_EFUSE_BYTES: // To set EFUE total used bytes, added by Roger, 2008.12.22. -+ pHalData->EfuseUsedBytes = *((u16 *)val); -+ break; -+ case HW_VAR_FIFO_CLEARN_UP: -+ { -+ #define RW_RELEASE_EN BIT18 -+ #define RXDMA_IDLE BIT17 -+ -+ struct pwrctrl_priv *pwrpriv = &Adapter->pwrctrlpriv; -+ u8 trycnt = 100; -+ -+ //pause tx -+ rtw_write8(Adapter,REG_TXPAUSE,0xff); -+ -+ //keep sn -+ Adapter->xmitpriv.nqos_ssn = rtw_read16(Adapter,REG_NQOS_SEQ); -+ -+ if(pwrpriv->bkeepfwalive != _TRUE) -+ { -+ //RX DMA stop -+ rtw_write32(Adapter,REG_RXPKT_NUM,(rtw_read32(Adapter,REG_RXPKT_NUM)|RW_RELEASE_EN)); -+ do{ -+ if(!(rtw_read32(Adapter,REG_RXPKT_NUM)&RXDMA_IDLE)) -+ break; -+ }while(trycnt--); -+ if(trycnt ==0) -+ DBG_8192C("Stop RX DMA failed...... \n"); -+ -+ //RQPN Load 0 -+ rtw_write16(Adapter,REG_RQPN_NPQ,0x0); -+ rtw_write32(Adapter,REG_RQPN,0x80000000); -+ rtw_mdelay_os(10); -+ } -+ } -+ break; -+ case HW_VAR_WOWLAN: -+#ifdef CONFIG_WOWLAN -+ { -+ struct wowlan_ioctl_param *poidparam; -+ -+ int res; -+ -+ poidparam = (struct wowlan_ioctl_param *)val; -+ switch (poidparam->subcode){ -+ case WOWLAN_PATTERN_MATCH: -+ //Turn on the Pattern Match feature -+ DBG_8192C("\n PATTERN_MATCH poidparam->subcode_value=%d\n",poidparam->subcode_value); -+ if(poidparam->subcode_value==1){ -+ //rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)|BIT(1))); -+ Adapter->pwrctrlpriv.wowlan_pattern=_TRUE; -+ DBG_8192C("%s Adapter->pwrctrlpriv.wowlan_pattern=%x\n",__FUNCTION__,Adapter->pwrctrlpriv.wowlan_pattern); -+ } -+ else{ -+ //rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)&~BIT(1))); -+ Adapter->pwrctrlpriv.wowlan_pattern=_FALSE; -+ } -+ break; -+ case WOWLAN_MAGIC_PACKET: -+ //Turn on the Magic Packet feature -+ DBG_8192C("\n MAGIC_PACKET poidparam->subcode_value=%d\n",poidparam->subcode_value); -+ if(poidparam->subcode_value==1){ -+ //rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)|BIT(2))); -+ Adapter->pwrctrlpriv.wowlan_magic=_TRUE; -+ DBG_8192C("%s Adapter->pwrctrlpriv.wowlan_magic=%x\n",__FUNCTION__,Adapter->pwrctrlpriv.wowlan_magic); -+ } -+ else{ -+ //rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)&~BIT(2))); -+ Adapter->pwrctrlpriv.wowlan_magic=_FALSE; -+ } -+ break; -+ case WOWLAN_UNICAST: -+ //Turn on the Unicast wakeup feature -+ if(poidparam->subcode_value==1){ -+ //rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)|BIT(3))); -+ Adapter->pwrctrlpriv.wowlan_unicast=_TRUE; -+ } -+ else{ -+ //rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)&~BIT(3))); -+ Adapter->pwrctrlpriv.wowlan_unicast=_FALSE; -+ DBG_8192C("%s Adapter->pwrctrlpriv.wowlan_unicast=%x\n",__FUNCTION__,Adapter->pwrctrlpriv.wowlan_unicast); -+ } -+ break; -+ case WOWLAN_SET_PATTERN: -+ //Setting the Pattern for wowlan -+ res=rtw_wowlan_set_pattern(Adapter,poidparam->pattern); -+ if(res) -+ DBG_8192C("rtw_wowlan_set_pattern retern value=0x%x",res); -+ break; -+ case WOWLAN_DUMP_REG: -+ //dump the WKFMCAM and WOW_CTRL register -+ /*DBG_8192C("\n\n\n\n rtw_wowlan_ctrl: WOW_CTRL=0x%x \n",rtw_read8(Adapter, REG_WOW_CTRL)); -+ DBG_8192C("print WKFMCAM index =%d ",poidparam->data[0]); -+ { int cmd=0,offset=0; -+ for(offset=0;offset<5;offset++){ -+ cmd=BIT(31)|(poidparam->data[0]+offset); -+ rtw_write32(Adapter, REG_WKFMCAM_CMD, cmd); -+ DBG_8192C("offset[%d]=0x%.8x ",offset,rtw_read32(Adapter, REG_WKFMCAM_RWD)); -+ DBG_8192C("offset[%d]=MSB 0x%x:0x%x:0x%x:0x%x ",offset,rtw_read8(Adapter, REG_WKFMCAM_RWD+3),rtw_read8(Adapter, REG_WKFMCAM_RWD+2),rtw_read8(Adapter, REG_WKFMCAM_RWD+1),rtw_read8(Adapter, REG_WKFMCAM_RWD)); -+ } -+ }*/ -+ -+ break; -+ case WOWLAN_ENABLE: -+ SetFwRelatedForWoWLAN8192CU(Adapter, _TRUE); -+ //Set Pattern -+ if(Adapter->pwrctrlpriv.wowlan_pattern==_TRUE) -+ rtw_wowlan_reload_pattern(Adapter); -+ rtl8192c_set_wowlan_cmd(Adapter); -+ rtw_write8(Adapter, 0x6, rtw_read8(Adapter, 0x6)|BIT(3)); -+ rtw_msleep_os(10); -+ //DBG_8192C(" \n REG_WOW_CTRL=0x%x \n",rtw_read8(Adapter, REG_WOW_CTRL)); -+// if(rtw_read8(Adapter, REG_WOW_CTRL)==0) -+// rtw_write8(Adapter, REG_WOW_CTRL, (rtw_read8(Adapter, REG_WOW_CTRL)|BIT(1)|BIT(2)|BIT(3))); -+ //DBG_8192C(" \n REG_WOW_CTRL=0x%x \n",rtw_read8(Adapter, REG_WOW_CTRL)); -+ break; -+ -+ case WOWLAN_DISABLE: -+ Adapter->pwrctrlpriv.wowlan_mode=_FALSE; -+ rtl8192c_set_wowlan_cmd(Adapter); -+ rtw_msleep_os(10); -+ break; -+ -+ case WOWLAN_STATUS: -+ poidparam->wakeup_reason = rtw_read8(Adapter, REG_WOWLAN_REASON); -+ DBG_8192C("wake on wlan reason 0x%02x\n", poidparam->wakeup_reason); -+ break; -+ -+ default: -+ break; -+ } -+ if (Adapter->pwrctrlpriv.wowlan_unicast||Adapter->pwrctrlpriv.wowlan_magic || Adapter->pwrctrlpriv.wowlan_pattern) -+ Adapter->pwrctrlpriv.wowlan_mode =_TRUE; -+ else -+ Adapter->pwrctrlpriv.wowlan_mode =_FALSE; -+ } -+ -+ break; -+#endif //CONFIG_WOWLAN -+ case HW_VAR_CHECK_TXBUF: -+#ifdef CONFIG_CONCURRENT_MODE -+ { -+ int i; -+ u8 RetryLimit = 0x01; -+ -+ //rtw_write16(Adapter, REG_RL,0x0101); -+ rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | RetryLimit << RETRY_LIMIT_LONG_SHIFT); -+ -+ for(i=0;i<1000;i++) -+ { -+ if(rtw_read32(Adapter, 0x200) != rtw_read32(Adapter, 0x204)) -+ { -+ //DBG_871X("packet in tx packet buffer - 0x204=%x, 0x200=%x (%d)\n", rtw_read32(Adapter, 0x204), rtw_read32(Adapter, 0x200), i); -+ rtw_msleep_os(10); -+ } -+ else -+ { -+ DBG_871X("no packet in tx packet buffer (%d)\n", i); -+ break; -+ } -+ } -+ -+ RetryLimit = 0x30; -+ rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | RetryLimit << RETRY_LIMIT_LONG_SHIFT); -+ -+ } -+#endif -+ break; -+ case HW_VAR_BCN_VALID: -+ //BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2, write 1 to clear, Clear by sw -+ rtw_write8(Adapter, REG_TDECTRL+2, rtw_read8(Adapter, REG_TDECTRL+2) | BIT0); -+ break; -+ case HW_VAR_USB_RXAGG_PAGE_TO: -+ rtw_write8(Adapter, REG_USB_DMA_AGG_TO, *((u8 *)val)); -+ break; -+ default: -+ break; -+ } -+ -+_func_exit_; -+} -+ -+void GetHwReg8192CU(PADAPTER Adapter, u8 variable, u8* val) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ -+_func_enter_; -+ -+ switch(variable) -+ { -+ case HW_VAR_BASIC_RATE: -+ *((u16 *)(val)) = pHalData->BasicRateSet; -+ case HW_VAR_TXPAUSE: -+ val[0] = rtw_read8(Adapter, REG_TXPAUSE); -+ break; -+ case HW_VAR_BCN_VALID: -+ //BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 -+ val[0] = (BIT0 & rtw_read8(Adapter, REG_TDECTRL+2))?_TRUE:_FALSE; -+ break; -+ case HW_VAR_DM_FLAG: -+ val[0] = pHalData->dmpriv.DMFlag; -+ break; -+ case HW_VAR_RF_TYPE: -+ val[0] = pHalData->rf_type; -+ break; -+ case HW_VAR_FWLPS_RF_ON: -+ { -+ //When we halt NIC, we should check if FW LPS is leave. -+ u32 valRCR; -+ -+ if(Adapter->pwrctrlpriv.rf_pwrstate == rf_off) -+ { -+ // If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS Leave, -+ // because Fw is unload. -+ val[0] = _TRUE; -+ } -+ else -+ { -+ valRCR = rtw_read32(Adapter, REG_RCR); -+ valRCR &= 0x00070000; -+ if(valRCR) -+ val[0] = _FALSE; -+ else -+ val[0] = _TRUE; -+ } -+ } -+ break; -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ case HW_VAR_CURRENT_ANTENNA: -+ val[0] = pHalData->CurAntenna; -+ break; -+#endif -+ case HW_VAR_EFUSE_BYTES: // To get EFUE total used bytes, added by Roger, 2008.12.22. -+ *((u16 *)(val)) = pHalData->EfuseUsedBytes; -+ break; -+ case HW_VAR_VID: -+ *((u16 *)(val)) = pHalData->EEPROMVID; -+ break; -+ case HW_VAR_PID: -+ *((u16 *)(val)) = pHalData->EEPROMPID; -+ break; -+ default: -+ break; -+ } -+ -+_func_exit_; -+} -+ -+// -+// Description: -+// Query setting of specified variable. -+// -+u8 -+GetHalDefVar8192CUsb( -+ IN PADAPTER Adapter, -+ IN HAL_DEF_VARIABLE eVariable, -+ IN PVOID pValue -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 bResult = _TRUE; -+ -+ switch(eVariable) -+ { -+ case HAL_DEF_UNDERCORATEDSMOOTHEDPWDB: -+#if 0 //trunk -+ { -+ struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -+ struct sta_priv * pstapriv = &Adapter->stapriv; -+ struct sta_info * psta; -+ psta = rtw_get_stainfo(pstapriv, pmlmepriv->cur_network.network.MacAddress); -+ if(psta) -+ { -+ *((int *)pValue) = psta->rssi_stat.UndecoratedSmoothedPWDB; -+ } -+ } -+#else //v4 branch -+ //if(check_fwstate(&Adapter->mlmepriv, WIFI_STATION_STATE) == _TRUE){ -+ *((int *)pValue) = pHalData->dmpriv.UndecoratedSmoothedPWDB; -+ //} -+ //else{ -+ -+ //} -+#endif -+ break; -+ case HAL_DEF_IS_SUPPORT_ANT_DIV: -+ #ifdef CONFIG_ANTENNA_DIVERSITY -+ *((u8 *)pValue) = (IS_92C_SERIAL(pHalData->VersionID) ||(pHalData->AntDivCfg==0))?_FALSE:_TRUE; -+ #endif -+ break; -+ case HAL_DEF_CURRENT_ANTENNA: -+ #ifdef CONFIG_ANTENNA_DIVERSITY -+ *(( u8*)pValue) = pHalData->CurAntenna; -+ #endif -+ break; -+ case HAL_DEF_DRVINFO_SZ: -+ *(( u32*)pValue) = DRVINFO_SZ; -+ break; -+ case HAL_DEF_MAX_RECVBUF_SZ: -+ *(( u32*)pValue) = MAX_RECVBUF_SZ; -+ break; -+ case HAL_DEF_RX_PACKET_OFFSET: -+ *(( u32*)pValue) = RXDESC_SIZE + DRVINFO_SZ; -+ break; -+ case HAL_DEF_DBG_DUMP_RXPKT: -+ *(( u8*)pValue) = pHalData->bDumpRxPkt; -+ break; -+ case HAL_DEF_DBG_DM_FUNC: -+ *(( u8*)pValue) = pHalData->dmpriv.DMFlag; -+ break; -+ default: -+ //RT_TRACE(COMP_INIT, DBG_WARNING, ("GetHalDefVar8192CUsb(): Unkown variable: %d!\n", eVariable)); -+ bResult = _FALSE; -+ break; -+ } -+ -+ return bResult; -+} -+ -+ -+ -+ -+// -+// Description: -+// Change default setting of specified variable. -+// -+u8 -+SetHalDefVar8192CUsb( -+ IN PADAPTER Adapter, -+ IN HAL_DEF_VARIABLE eVariable, -+ IN PVOID pValue -+ ) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); -+ u8 bResult = _TRUE; -+ -+ switch(eVariable) -+ { -+ case HAL_DEF_DBG_DUMP_RXPKT: -+ pHalData->bDumpRxPkt = *(( u8*)pValue); -+ break; -+ case HAL_DEF_DBG_DM_FUNC: -+ { -+ u8 dm_func = *(( u8*)pValue); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ -+ if(dm_func == 0){ //disable all dynamic func -+ pdmpriv->DMFlag = DYNAMIC_FUNC_DISABLE; -+ DBG_8192C("==> Disable all dynamic function...\n"); -+ } -+ else if(dm_func == 1){//disable DIG -+ pdmpriv->DMFlag &= (~DYNAMIC_FUNC_DIG); -+ DBG_8192C("==> Disable DIG...\n"); -+ } -+ else if(dm_func == 2){//disable High power -+ pdmpriv->DMFlag &= (~DYNAMIC_FUNC_HP); -+ } -+ else if(dm_func == 3){//disable tx power tracking -+ pdmpriv->DMFlag &= (~DYNAMIC_FUNC_SS); -+ DBG_8192C("==> Disable tx power tracking...\n"); -+ } -+ else if(dm_func == 4){//disable BT coexistence -+ pdmpriv->DMFlag &= (~DYNAMIC_FUNC_BT); -+ } -+ else if(dm_func == 5){//disable antenna diversity -+ pdmpriv->DMFlag &= (~DYNAMIC_FUNC_ANT_DIV); -+ } -+ else if(dm_func == 6){//turn on all dynamic func -+ if(!(pdmpriv->DMFlag & DYNAMIC_FUNC_DIG)) -+ { -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ DIG_T *pDigTable = &pdmpriv->DM_DigTable; -+ pDigTable->PreIGValue = rtw_read8(Adapter,0xc50); -+ } -+ -+ pdmpriv->DMFlag |= (DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS| -+ DYNAMIC_FUNC_BT|DYNAMIC_FUNC_ANT_DIV) ; -+ DBG_8192C("==> Turn on all dynamic function...\n"); -+ } -+ } -+ break; -+ default: -+ //RT_TRACE(COMP_INIT, DBG_TRACE, ("SetHalDefVar819xUsb(): Unkown variable: %d!\n", eVariable)); -+ bResult = _FALSE; -+ break; -+ } -+ -+ return bResult; -+} -+ -+u32 _update_92cu_basic_rate(_adapter *padapter, unsigned int mask) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+#endif -+ unsigned int BrateCfg = 0; -+ -+#ifdef CONFIG_BT_COEXIST -+ if( (pbtpriv->BT_Coexist) && (pbtpriv->BT_CoexistType == BT_CSR_BC4) ) -+ { -+ BrateCfg = mask & 0x151; -+ //DBG_8192C("BT temp disable cck 2/5.5/11M, (0x%x = 0x%x)\n", REG_RRSR, BrateCfg & 0x151); -+ } -+ else -+#endif -+ { -+ if(pHalData->VersionID != VERSION_TEST_CHIP_88C) -+ BrateCfg = mask & 0x15F; -+ else //for 88CU 46PING setting, Disable CCK 2M, 5.5M, Others must tuning -+ BrateCfg = mask & 0x159; -+ } -+ -+ BrateCfg |= 0x01; // default enable 1M ACK rate -+ -+ return BrateCfg; -+} -+ -+void _update_response_rate(_adapter *padapter,unsigned int mask) -+{ -+ u8 RateIndex = 0; -+ // Set RRSR rate table. -+ rtw_write8(padapter, REG_RRSR, mask&0xff); -+ rtw_write8(padapter,REG_RRSR+1, (mask>>8)&0xff); -+ -+ -+ // Set RTS initial rate -+ while(mask > 0x1) -+ { -+ mask = (mask>> 1); -+ RateIndex++; -+ } -+ rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex); -+} -+ -+void UpdateHalRAMask8192CUsb(PADAPTER padapter, u32 mac_id) -+{ -+ //volatile unsigned int result; -+ u8 init_rate=0; -+ u8 networkType, raid; -+ u32 mask; -+ u8 shortGIrate = _FALSE; -+ int supportRateNum = 0; -+ struct sta_info *psta; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); -+#endif -+ -+ if (mac_id >= NUM_STA) //CAM_SIZE -+ { -+ return; -+ } -+ -+ psta = pmlmeinfo->FW_sta_info[mac_id].psta; -+ if(psta == NULL) -+ { -+ return; -+ } -+ -+ switch (mac_id) -+ { -+ case 0:// for infra mode -+#ifdef CONFIG_CONCURRENT_MODE -+ case 2:// first station uses macid=0, second station uses macid=2 -+#endif -+ supportRateNum = rtw_get_rateset_len(cur_network->SupportedRates); -+ networkType = judge_network_type(padapter, cur_network->SupportedRates, supportRateNum) & 0xf; -+ //pmlmeext->cur_wireless_mode = networkType; -+ raid = networktype_to_raid(networkType); -+ -+ mask = update_supported_rate(cur_network->SupportedRates, supportRateNum); -+ mask |= (pmlmeinfo->HT_enable)? update_MSC_rate(&(pmlmeinfo->HT_caps)): 0; -+ mask |= ((raid<<28)&0xf0000000); -+ -+ if (support_short_GI(padapter, &(pmlmeinfo->HT_caps))) -+ { -+ shortGIrate = _TRUE; -+ } -+ -+ break; -+ -+ case 1://for broadcast/multicast -+ supportRateNum = rtw_get_rateset_len(pmlmeinfo->FW_sta_info[mac_id].SupportedRates); -+ if(pmlmeext->cur_wireless_mode & WIRELESS_11B) -+ networkType = WIRELESS_11B; -+ else -+ networkType = WIRELESS_11G; -+ raid = networktype_to_raid(networkType); -+ -+ mask = update_basic_rate(cur_network->SupportedRates, supportRateNum); -+ mask |= ((raid<<28)&0xf0000000); -+ -+ break; -+ -+ default: //for each sta in IBSS -+#ifdef CONFIG_TDLS -+ if(psta->tdls_sta_state & TDLS_LINKED_STATE) -+ { -+ shortGIrate = update_sgi_tdls(padapter, psta); -+ mask = update_mask_tdls(padapter, psta); -+ raid = mask>>28; -+ break; -+ } -+ else -+#endif //CONFIG_TDLS -+ { -+ supportRateNum = rtw_get_rateset_len(pmlmeinfo->FW_sta_info[mac_id].SupportedRates); -+ networkType = judge_network_type(padapter, pmlmeinfo->FW_sta_info[mac_id].SupportedRates, supportRateNum) & 0xf; -+ //pmlmeext->cur_wireless_mode = networkType; -+ raid = networktype_to_raid(networkType); -+ -+ mask = update_supported_rate(cur_network->SupportedRates, supportRateNum); -+ mask |= ((raid<<28)&0xf0000000); -+ -+ //todo: support HT in IBSS -+ -+ break; -+ } -+ } -+ -+#ifdef CONFIG_BT_COEXIST -+ if( (pbtpriv->BT_Coexist) && -+ (pbtpriv->BT_CoexistType == BT_CSR_BC4) && -+ (pbtpriv->BT_CUR_State) && -+ (pbtpriv->BT_Ant_isolation) && -+ ((pbtpriv->BT_Service==BT_SCO)|| -+ (pbtpriv->BT_Service==BT_Busy)) ) -+ mask &= 0xffffcfc0; -+ else -+#endif -+ mask &=0xffffffff; -+ -+ -+ init_rate = get_highest_rate_idx(mask)&0x3f; -+ -+ if(pHalData->fw_ractrl == _TRUE) -+ { -+ u8 arg = 0; -+ -+ //arg = (cam_idx-4)&0x1f;//MACID -+ arg = mac_id&0x1f;//MACID -+ -+ arg |= BIT(7); -+ -+ if (shortGIrate==_TRUE) -+ arg |= BIT(5); -+ -+ DBG_871X("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg); -+ psta->ra_mask=mask; -+#ifdef CONFIG_INTEL_PROXIM -+ if(padapter->proximity.proxim_on ==_TRUE){ -+ arg &= ~BIT(6); -+ } -+ else { -+ arg |= BIT(6); -+ } -+#endif //CONFIG_INTEL_PROXIM -+ rtl8192c_set_raid_cmd(padapter, mask, arg); -+ -+ } -+ else -+ { -+ if (shortGIrate==_TRUE) -+ init_rate |= BIT(6); -+ -+ rtw_write8(padapter, (REG_INIDATA_RATE_SEL+mac_id), init_rate); -+ } -+ -+ -+ //set ra_id -+ psta->raid = raid; -+ psta->init_rate = init_rate; -+ -+ //set correct initial date rate for each mac_id -+ pdmpriv->INIDATA_RATE[mac_id] = init_rate; -+} -+ -+void SetBeaconRelatedRegisters8192CUsb(PADAPTER padapter) -+{ -+ u32 value32; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ //reset TSF, enable update TSF, correcting TSF On Beacon -+ -+ //REG_BCN_INTERVAL -+ //REG_BCNDMATIM -+ //REG_ATIMWND -+ //REG_TBTT_PROHIBIT -+ //REG_DRVERLYINT -+ //REG_BCN_MAX_ERR -+ //REG_BCNTCFG //(0x510) -+ //REG_DUAL_TSF_RST -+ //REG_BCN_CTRL //(0x550) -+ -+ //BCN interval -+ rtw_write16(padapter, REG_BCN_INTERVAL, pmlmeinfo->bcn_interval); -+ rtw_write8(padapter, REG_ATIMWND, 0x02);// 2ms -+ -+ _InitBeaconParameters(padapter); -+ -+ rtw_write8(padapter, REG_SLOT, 0x09); -+ -+ value32 =rtw_read32(padapter, REG_TCR); -+ value32 &= ~TSFRST; -+ rtw_write32(padapter, REG_TCR, value32); -+ -+ value32 |= TSFRST; -+ rtw_write32(padapter, REG_TCR, value32); -+ -+ // NOTE: Fix test chip's bug (about contention windows's randomness) -+ rtw_write8(padapter, REG_RXTSF_OFFSET_CCK, 0x50); -+ rtw_write8(padapter, REG_RXTSF_OFFSET_OFDM, 0x50); -+ -+ _BeaconFunctionEnable(padapter, _TRUE, _TRUE); -+ -+ ResumeTxBeacon(padapter); -+ -+ //rtw_write8(padapter, 0x422, rtw_read8(padapter, 0x422)|BIT(6)); -+ -+ //rtw_write8(padapter, 0x541, 0xff); -+ -+ //rtw_write8(padapter, 0x542, rtw_read8(padapter, 0x541)|BIT(0)); -+ -+ rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)|BIT(1)); -+ -+} -+ -+static void rtl8192cu_init_default_value(_adapter * padapter) -+{ -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ struct dm_priv *pdmpriv = &pHalData->dmpriv; -+ u8 i; -+ -+ //init default value -+ pHalData->fw_ractrl = _FALSE; -+ pHalData->bIQKInitialized = _FALSE; -+ if(!pwrctrlpriv->bkeepfwalive) -+ pHalData->LastHMEBoxNum = 0; -+ -+ pHalData->bIQKInitialized = _FALSE; -+ //init dm default value -+ pdmpriv->TM_Trigger = 0; -+ pdmpriv->binitialized = _FALSE; -+ pdmpriv->prv_traffic_idx = 3; -+ pdmpriv->initialize = 0; -+ -+ pdmpriv->ThermalValue_HP_index = 0; -+ for(i = 0; i < HP_THERMAL_NUM; i++) -+ pdmpriv->ThermalValue_HP[i] = 0; -+} -+ -+static u8 rtl8192cu_ps_func(PADAPTER Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val) -+{ -+ u8 bResult = _TRUE; -+ switch(efunc_id){ -+ -+ #if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) -+ case HAL_USB_SELECT_SUSPEND: -+ { -+ u8 bfwpoll = *(( u8*)val); -+ rtl8192c_set_FwSelectSuspend_cmd(Adapter,bfwpoll ,500);//note fw to support hw power down ping detect -+ } -+ break; -+ #endif //CONFIG_AUTOSUSPEND && SUPPORT_HW_RFOFF_DETECTED -+ -+ default: -+ break; -+ } -+ return bResult; -+} -+ -+void rtl8192cu_set_hal_ops(_adapter * padapter) -+{ -+ struct hal_ops *pHalFunc = &padapter->HalFunc; -+ -+_func_enter_; -+ -+ padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE)); -+ if(padapter->HalData == NULL){ -+ DBG_8192C("cant not alloc memory for HAL DATA \n"); -+ } -+ //_rtw_memset(padapter->HalData, 0, sizeof(HAL_DATA_TYPE)); -+ padapter->hal_data_sz = sizeof(HAL_DATA_TYPE); -+ -+ pHalFunc->hal_init = &rtl8192cu_hal_init; -+ pHalFunc->hal_deinit = &rtl8192cu_hal_deinit; -+ -+ //pHalFunc->free_hal_data = &rtl8192c_free_hal_data; -+ -+ pHalFunc->inirp_init = &rtl8192cu_inirp_init; -+ pHalFunc->inirp_deinit = &rtl8192cu_inirp_deinit; -+ -+ pHalFunc->init_xmit_priv = &rtl8192cu_init_xmit_priv; -+ pHalFunc->free_xmit_priv = &rtl8192cu_free_xmit_priv; -+ -+ pHalFunc->init_recv_priv = &rtl8192cu_init_recv_priv; -+ pHalFunc->free_recv_priv = &rtl8192cu_free_recv_priv; -+#ifdef CONFIG_SW_LED -+ pHalFunc->InitSwLeds = &rtl8192cu_InitSwLeds; -+ pHalFunc->DeInitSwLeds = &rtl8192cu_DeInitSwLeds; -+#else //case of hw led or no led -+ pHalFunc->InitSwLeds = NULL; -+ pHalFunc->DeInitSwLeds = NULL; -+#endif//CONFIG_SW_LED -+ -+ //pHalFunc->dm_init = &rtl8192c_init_dm_priv; -+ //pHalFunc->dm_deinit = &rtl8192c_deinit_dm_priv; -+ -+ pHalFunc->init_default_value = &rtl8192cu_init_default_value; -+ pHalFunc->intf_chip_configure = &rtl8192cu_interface_configure; -+ pHalFunc->read_adapter_info = &ReadAdapterInfo8192CU; -+ -+ //pHalFunc->set_bwmode_handler = &PHY_SetBWMode8192C; -+ //pHalFunc->set_channel_handler = &PHY_SwChnl8192C; -+ -+ //pHalFunc->hal_dm_watchdog = &rtl8192c_HalDmWatchDog; -+ -+ pHalFunc->SetHwRegHandler = &SetHwReg8192CU; -+ pHalFunc->GetHwRegHandler = &GetHwReg8192CU; -+ pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb; -+ pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb; -+ -+ pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb; -+ pHalFunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8192CUsb; -+ -+ //pHalFunc->Add_RateATid = &rtl8192c_Add_RateATid; -+ -+//#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ //pHalFunc->AntDivBeforeLinkHandler = &SwAntDivBeforeLink8192C; -+ //pHalFunc->AntDivCompareHandler = &SwAntDivCompare8192C; -+//#endif -+ -+ pHalFunc->hal_xmit = &rtl8192cu_hal_xmit; -+ pHalFunc->mgnt_xmit = &rtl8192cu_mgnt_xmit; -+ pHalFunc->hal_xmitframe_enqueue = &rtl8192cu_hal_xmitframe_enqueue; -+ -+ //pHalFunc->read_bbreg = &rtl8192c_PHY_QueryBBReg; -+ //pHalFunc->write_bbreg = &rtl8192c_PHY_SetBBReg; -+ //pHalFunc->read_rfreg = &rtl8192c_PHY_QueryRFReg; -+ //pHalFunc->write_rfreg = &rtl8192c_PHY_SetRFReg; -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ pHalFunc->hostap_mgnt_xmit_entry = &rtl8192cu_hostap_mgnt_xmit_entry; -+#endif -+ pHalFunc->interface_ps_func = &rtl8192cu_ps_func; -+ -+ rtl8192c_set_hal_ops(pHalFunc); -+_func_exit_; -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c -@@ -0,0 +1,1207 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _HCI_OPS_OS_C_ -+ -+#include -+#include -+#include -+#include -+ -+#ifndef PLATFORM_OS_CE -+ #error "PLATFORM_OS_CE shall be set \n" -+#endif -+ -+#ifndef CONFIG_USB_HCI -+ #error "CONFIG_USB_HCI shall be on!\n" -+#endif -+ -+#include -+#include -+ -+#include -+ -+ -+struct zero_bulkout_context -+{ -+ void *pbuf; -+ void *purb; -+ void *pirp; -+ void *padapter; -+}; -+ -+ -+ -+#define PUSB_ERROR LPDWORD -+#define USBD_HALTED(Status) ((ULONG)(Status) >> 30 == 3) -+ -+ -+USB_PIPE ffaddr2pipehdl(struct dvobj_priv *pNdisCEDvice, u32 addr); -+ -+ -+static NTSTATUS usb_async_interrupt_in_complete( LPVOID Context ); -+static NTSTATUS usb_async_interrupt_out_complete( LPVOID Context ); -+ -+DWORD usb_write_port_complete( LPVOID Context ); -+DWORD usb_read_port_complete( LPVOID Context ); -+ -+void usb_read_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+_func_enter_; -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+_func_exit_; -+} -+ -+ -+ -+BOOL -+CloseTransferHandle( -+ LPCUSB_FUNCS pUsbFuncs, -+ USB_TRANSFER hTransfer -+ ) -+{ -+ BOOL bRc = TRUE; -+ -+ // This assert may fail on suprise remove, -+ // but should pass during normal I/O. -+ // ASSERT( pUsbFuncs->lpIsTransferComplete(hTransfer) ); -+ -+ // CloseTransfer aborts any pending transfers -+ if ( !pUsbFuncs->lpCloseTransfer(hTransfer) ) { -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("*** CloseTransfer ERROR:%d ***\n", GetLastError())); -+ bRc = FALSE; -+ } -+ -+ return bRc; -+} -+ -+ -+BOOL -+GetTransferStatus( -+ LPCUSB_FUNCS pUsbFuncs, -+ USB_TRANSFER hTransfer, -+ LPDWORD pBytesTransferred , // OPTIONAL returns number of bytes transferred -+ PUSB_ERROR pUsbError // returns USB error code -+ ) -+{ -+ -+ BOOL bRc = TRUE; -+ -+ if ( pUsbFuncs->lpGetTransferStatus(hTransfer, pBytesTransferred, pUsbError) ) { -+ if ( USB_NO_ERROR != *pUsbError ) { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("*** CloseTransfer ERROR:%d ***\n", GetLastError())); -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("GetTransferStatus (BytesTransferred:%d, UsbError:0x%x)\n", pBytesTransferred?*pBytesTransferred:-1, pUsbError?*pUsbError:-1 )); -+ } -+ } else { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_,("*** GetTransferStatus ERROR:%d ***\n", GetLastError())); -+ *pUsbError = USB_CANCELED_ERROR; -+ bRc = FALSE; -+ } -+ -+ return bRc; -+} -+ -+ -+// The driver should never read RxCmd register. We have to set -+// RCR CMDHAT0 (bit6) to append Rx status before the Rx frame. -+// -+// |<-------- pBulkUrb->TransferBufferLength ------------>| -+// +------------------+-------------------+------------+ -+// | Rx status (16 bytes) | Rx frame ..... | CRC(4 bytes) | -+// +------------------+-------------------+------------+ -+// ^ -+// ^pRfd->Buffer.VirtualAddress -+// -+/*! \brief USB RX IRP Complete Routine. -+ @param Context pointer of RT_RFD -+*/ -+u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+ struct intf_priv *pintfpriv = pintfhdl->pintfpriv; -+ struct dvobj_priv *pdvobj_priv = (struct dvobj_priv*)pintfpriv->intf_dev; -+ _adapter *adapter = (_adapter *)pdvobj_priv->padapter; -+ -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ -+ struct recv_buf *precvbuf = (struct recv_buf *)rmem; -+ DWORD dwErr = ERROR_SUCCESS ; -+ DWORD dwBytesTransferred = 0 ; -+ USB_TRANSFER hTransfer = NULL; -+ USB_PIPE hPipe; -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ -+_func_enter_; -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_read_port(%u)\n", __LINE__)); -+ -+#if (CONFIG_PWRCTRL == 1) -+ if (adapter->pwrctrlpriv.pnp_bstop_trx) -+ { -+ return _FALSE; -+ } -+#endif -+ -+ if(adapter->bDriverStopped || adapter->bSurpriseRemoved) -+ { -+ RT_TRACE(_module_hci_ops_os_c_, _drv_info_,("usb_read_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved)!!!\n")); -+ return _FALSE; -+ } -+ -+ if(precvbuf !=NULL) -+ { -+ -+ // get a recv buffer -+ rtl8192cu_init_recvbuf(adapter, precvbuf); -+ -+ -+ -+ _rtw_spinlock(&precvpriv->lock); -+ precvpriv->rx_pending_cnt++; -+ precvbuf->irp_pending = _TRUE; -+ _rtw_spinunlock(&precvpriv->lock); -+ -+ -+ //translate DMA FIFO addr to pipehandle -+ hPipe = ffaddr2pipehdl(pdvobj_priv, addr); -+ -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_read_port(%u)\n", __LINE__)); -+ -+ precvbuf->usb_transfer_read_port = (*usb_funcs_vp->lpIssueBulkTransfer)( -+ hPipe, -+ usb_read_port_complete, -+ precvbuf, -+ USB_IN_TRANSFER|USB_SHORT_TRANSFER_OK, -+ MAX_RECVBUF_SZ, -+ precvbuf->pbuf, -+ 0); -+ -+ -+ if(precvbuf->usb_transfer_read_port) -+ { -+ -+ // GetTransferStatus(usb_funcs_vp, hTransfer, &dwBytesTransferred,&UsbRc); -+ -+ // CloseTransferHandle(usb_funcs_vp, hTransfer); -+ -+ } -+ else -+ { -+ -+ dwErr = GetLastError(); -+ //RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_read_port ERROR : %d\n", dwErr)); -+ -+ } -+ -+// if ( USB_NO_ERROR != UsbRc && ERROR_SUCCESS == dwErr) { -+// dwErr = ERROR_GEN_FAILURE; -+// } -+ -+ -+ if ( ERROR_SUCCESS != dwErr ) { -+ -+ SetLastError(dwErr); -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_read_port ERROR : %d\n", dwErr)); -+ } -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("-usb_read_port(%u)\n", __LINE__)); -+ -+ } -+ else // if(precvbuf !=NULL) -+ { -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:precv_frame ==NULL\n")); -+ } -+ -+ return _TRUE; -+ -+} -+ -+DWORD usb_read_port_complete( PVOID context ) -+{ -+ struct recv_buf *precvbuf = (struct recv_buf *)context; -+ _adapter *adapter = (_adapter *)precvbuf->adapter; -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ -+ -+ struct intf_hdl *pintfhdl = &adapter->pio_queue->intf; -+ struct intf_priv *pintfpriv = pintfhdl->pintfpriv; -+ struct dvobj_priv *pdvobj_priv = (struct dvobj_priv*)pintfpriv->intf_dev; -+ -+ -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ -+ DWORD dwBytesTransferred = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ -+ uint isevt, *pbuf; -+ int fComplete =_FALSE; -+ -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_read_port_complete(%u)\n", __LINE__)); -+ -+_func_enter_; -+ -+ -+ _rtw_spinlock_ex(&precvpriv->lock); -+ precvbuf->irp_pending=_FALSE; -+ precvpriv->rx_pending_cnt --; -+ _rtw_spinunlock_ex(&precvpriv->lock); -+ -+ -+#if 1 -+ -+ (*usb_funcs_vp->lpGetTransferStatus)(precvbuf->usb_transfer_read_port, &dwBytesTransferred, &dwErr); -+ fComplete = (*usb_funcs_vp->lpIsTransferComplete)(precvbuf->usb_transfer_read_port); -+ if(fComplete!=_TRUE) -+ { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete CloseTransfer before complete\n")); -+ } -+ (*usb_funcs_vp->lpCloseTransfer)(precvbuf->usb_transfer_read_port); -+ -+ -+#endif -+ -+ -+ if(USB_NO_ERROR != dwErr) -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete Fail :%d\n",dwErr)); -+ -+ { -+ -+ if ( dwBytesTransferred > MAX_RECVBUF_SZ || dwBytesTransferred < RXDESC_SIZE ) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_, -+ ("\n usb_read_port_complete: (pbulkurb->TransferBufferLength > MAX_RECVBUF_SZ) || (pbulkurb->TransferBufferLength < RXDESC_SIZE): %d\n",dwBytesTransferred)); -+ rtw_read_port(adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ -+ //usb_read_port(pintfhdl, 0, 0, (unsigned char *)precvframe); -+ } -+ else -+ { -+ precvbuf->transfer_len = dwBytesTransferred; -+ -+ pbuf = (uint*)precvbuf->pbuf; -+ -+ if((isevt = *(pbuf+1)&0x1ff) == 0x1ff) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_info_, -+ ("\n usb_read_port_complete: get a event\n")); -+ rxcmd_event_hdl(adapter, pbuf);//rx c2h events -+ -+ rtw_read_port(adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ else -+ { -+ if(recvbuf2recvframe(adapter, precvbuf)==_FAIL)//rx packets -+ { -+ //precvbuf->reuse = _TRUE; -+ rtw_read_port(adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ } -+ } -+ } -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("-usb_read_port_complete(%u)\n", __LINE__)); -+ -+_func_exit_; -+ return ERROR_SUCCESS; -+// return STATUS_MORE_PROCESSING_REQUIRED; -+} -+ -+void usb_read_port_cancel(_adapter *padapter){ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_read_port_cancel(%u)\n",__FUNCTION__, __LINE__)); -+} -+ -+DWORD usb_write_mem_complete( LPVOID Context ) -+{ -+ int fComplete =_FALSE; -+ DWORD dwBytes = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ -+ _irqL irqL; -+ _list *head; -+ _list *plist; -+ struct io_req *pio_req; -+ struct io_queue *pio_q = (struct io_queue *) Context; -+ struct intf_hdl *pintf = &(pio_q->intf); -+ struct intf_priv *pintfpriv = pintf->pintfpriv; -+ _adapter *padapter = (_adapter *)pintf->adapter; -+ NTSTATUS status = STATUS_SUCCESS; -+ struct xmit_priv * pxmitpriv = &padapter->xmitpriv; -+ -+ struct dvobj_priv * pdvobj_priv = (struct dvobj_priv*)pintfpriv->intf_dev; -+ -+ USB_HANDLE usbHandle = pdvobj_priv->usb_extension._hDevice; -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ -+ // get the head from the processing io_queue -+ head = &(pio_q->processing); -+ -+_func_enter_; -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("+usb_write_mem_complete %p\n", Context)); -+ -+#if 1 -+ _enter_critical_bh(&(pio_q->lock), &irqL); -+ -+ -+ //free irp in processing list... -+ while(rtw_is_list_empty(head) != _TRUE) -+ { -+ plist = get_next(head); -+ rtw_list_delete(plist); -+ pio_req = LIST_CONTAINOR(plist, struct io_req, list); -+ _rtw_up_sema(&pio_req->sema); -+ } -+ -+ _exit_critical_bh(&(pio_q->lock), &irqL); -+#endif -+ -+ -+#if 1 -+ -+ (*usb_funcs_vp->lpGetTransferStatus)(pio_req->usb_transfer_write_mem , &dwBytes, &dwErr); -+ fComplete = (*usb_funcs_vp->lpIsTransferComplete)(pio_req->usb_transfer_write_mem); -+ if(fComplete!=_TRUE) -+ { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_write_mem_complete CloseTransfer before complete\n")); -+ } -+ (*usb_funcs_vp->lpCloseTransfer)(pio_req->usb_transfer_write_mem ); -+ -+#endif -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("-usb_write_mem_complete\n")); -+ -+_func_exit_; -+ -+ -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ -+} -+ -+ -+void usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) -+{ -+ -+ NTSTATUS NtStatus = STATUS_SUCCESS; -+ USB_PIPE hPipe; -+ _irqL irqL; -+ -+ int fComplete = _FALSE; -+ DWORD dwBytes = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ -+ -+ struct io_req *pio_req; -+ -+ _adapter *adapter = (_adapter *)pintfhdl->adapter; -+ struct intf_priv *pintfpriv = pintfhdl->pintfpriv; -+ struct dvobj_priv * pdvobj_priv = (struct dvobj_priv*)pintfpriv->intf_dev; -+ -+ -+ struct xmit_priv *pxmitpriv = &adapter->xmitpriv; -+ struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ -+ -+_func_enter_; -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_write_mem(%u) pintfhdl %p wmem %p\n", __LINE__, pintfhdl, wmem)); -+ -+ // fetch a io_request from the io_queue -+ pio_req = alloc_ioreq(pio_queue); -+ -+ if ((pio_req == NULL)||(adapter->bSurpriseRemoved)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("async_irp_write32 : pio_req =0x%x adapter->bSurpriseRemoved=0x%x",pio_req,adapter->bSurpriseRemoved )); -+ goto exit; -+ } -+ -+ _enter_critical_bh(&(pio_queue->lock), &irqL); -+ -+ -+ // insert the io_request into processing io_queue -+ rtw_list_insert_tail(&(pio_req->list),&(pio_queue->processing)); -+ -+ -+ if((adapter->bDriverStopped) || (adapter->bSurpriseRemoved) ||(adapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\npadapter->pwrctrlpriv.pnp_bstop_trx==_TRUE\n")); -+ goto exit; -+ } -+ -+ //translate DMA FIFO addr to pipehandle -+ hPipe = ffaddr2pipehdl(pdvobj_priv, addr); -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_,("usb_write_mem(%u)\n",__LINE__)); -+ -+ pio_req->usb_transfer_write_mem = (*usb_funcs_vp->lpIssueBulkTransfer)( -+ hPipe, -+ usb_write_mem_complete, -+ pio_queue, -+ USB_OUT_TRANSFER, -+ cnt, -+ wmem, -+ 0); -+ -+#if 0 -+ -+ (*usb_funcs_vp->lpGetTransferStatus)(pio_req->usb_transfer_write_mem , &dwBytes, &dwErr); -+ -+ while( fComplete != _TRUE) -+ { -+ fComplete = (*usb_funcs_vp->lpIsTransferComplete)(pio_req->usb_transfer_write_mem); -+ if(fComplete==_TRUE) -+ { -+ (*usb_funcs_vp->lpCloseTransfer)(pio_req->usb_transfer_write_mem ); -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_write_mem finished\n")); -+ break; -+ } -+ else -+ { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, -+ ("usb_write_mem not yet finished %X\n", -+ pio_req->usb_transfer_write_mem)); -+ rtw_msleep_os(10); -+ } -+ -+ } -+ -+#endif -+ -+ -+// _rtw_down_sema(&pio_req->sema); -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("-usb_write_mem(%X)\n",pio_req->usb_transfer_write_mem)); -+ -+ _exit_critical_bh(&(pio_queue->lock), &irqL); -+ -+ _rtw_down_sema(&pio_req->sema); -+ free_ioreq(pio_req, pio_queue); -+ -+exit: -+_func_exit_; -+ return; -+} -+ -+u32 usb_write_cnt=0; -+u32 usb_complete_cnt=0; -+ -+USB_PIPE ffaddr2pipehdl(struct dvobj_priv *pNdisCEDvice, u32 addr) -+{ -+ USB_PIPE PipeHandle = NULL; -+ _adapter *padapter = pNdisCEDvice->padapter; -+ -+ -+ if(pNdisCEDvice->nr_endpoint == 11) -+ { -+ switch(addr) -+ { -+ case RTL8712_DMA_BEQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[3] ; -+ break; -+ case RTL8712_DMA_BKQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[4]; -+ break; -+ case RTL8712_DMA_VIQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[2]; -+ break; -+ case RTL8712_DMA_VOQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[1]; -+ break; -+ case RTL8712_DMA_BCNQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[6]; -+ break; -+ case RTL8712_DMA_BMCQ: //HI Queue -+ PipeHandle= padapter->halpriv.pipehdls_r8712[7]; -+ break; -+ case RTL8712_DMA_MGTQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[8]; -+ break; -+ case RTL8712_DMA_RX0FF: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[0]; -+ break; -+ case RTL8712_DMA_C2HCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[5]; -+ break; -+ case RTL8712_DMA_H2CCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[9]; -+ break; -+ -+ } -+ -+ } -+ else if(pNdisCEDvice->nr_endpoint == 6) -+ { -+ switch(addr) -+ { -+ case RTL8712_DMA_BEQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[3]; -+ break; -+ case RTL8712_DMA_BKQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[4]; -+ break; -+ case RTL8712_DMA_VIQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[2]; -+ break; -+ case RTL8712_DMA_VOQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[1]; -+ break; -+ case RTL8712_DMA_RX0FF: -+ case RTL8712_DMA_C2HCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[0]; -+ break; -+ case RTL8712_DMA_H2CCMD: -+ case RTL8712_DMA_BCNQ: -+ case RTL8712_DMA_BMCQ: -+ case RTL8712_DMA_MGTQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[5]; -+ break; -+ -+ } -+ -+ } -+ else if(pNdisCEDvice->nr_endpoint == 4) -+ { -+ switch(addr) -+ { -+ case RTL8712_DMA_BEQ: -+ case RTL8712_DMA_BKQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[2]; -+ break; -+ case RTL8712_DMA_VIQ: -+ case RTL8712_DMA_VOQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[1]; -+ break; -+ case RTL8712_DMA_RX0FF: -+ case RTL8712_DMA_C2HCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[0]; -+ break; -+ case RTL8712_DMA_H2CCMD: -+ case RTL8712_DMA_BCNQ: -+ case RTL8712_DMA_BMCQ: -+ case RTL8712_DMA_MGTQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[3]; -+ break; -+ } -+ -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("ffaddr2pipehdl():nr_endpoint=%d error!\n", pNdisCEDvice->nr_endpoint)); -+ } -+ -+ return PipeHandle; -+ -+} -+ -+DWORD usb_bulkout_zero_complete( LPVOID pZeroContext ) -+{ -+ struct zero_bulkout_context *pcontext = (struct zero_bulkout_context *)pZeroContext; -+ _adapter * padapter = pcontext->padapter; -+ struct dvobj_priv * pdvobj_priv = (struct dvobj_priv *)&padapter->dvobjpriv; -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ struct xmit_priv * pxmitpriv = &padapter->xmitpriv; -+ -+ int fComplete =_FALSE; -+ DWORD dwBytesTransferred = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ -+_func_enter_; -+ -+#if 1 -+ -+ (*usb_funcs_vp->lpGetTransferStatus)(pxmitpriv->usb_transfer_write_port, &dwBytesTransferred, &dwErr); -+ fComplete = (*usb_funcs_vp->lpIsTransferComplete)(pxmitpriv->usb_transfer_write_port); -+ if(fComplete!=_TRUE) -+ { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_bulkout_zero_complete CloseTransfer before complete\n")); -+ } -+ (*usb_funcs_vp->lpCloseTransfer)(pxmitpriv->usb_transfer_write_port); -+ -+#endif -+ -+ if(pcontext) -+ { -+ if(pcontext->pbuf) -+ { -+ rtw_mfree(pcontext->pbuf, sizeof(int)); -+ } -+ -+ rtw_mfree((u8*)pcontext, sizeof(struct zero_bulkout_context)); -+ } -+ -+_func_exit_; -+ -+ return ERROR_SUCCESS; -+ -+ -+} -+ -+u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ struct zero_bulkout_context *pcontext; -+ unsigned char *pbuf; -+ u8 len = 0 ; -+ _adapter *padapter = (_adapter *)pintfhdl->adapter; -+ struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv; -+ struct xmit_priv * pxmitpriv = &padapter->xmitpriv; -+ -+ -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj->usb_extension._lpUsbFuncs; -+ -+ USB_PIPE hPipe; -+ -+_func_enter_; -+ -+ if((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ return _FAIL; -+ } -+ -+ -+ pcontext = (struct zero_bulkout_context *)rtw_zmalloc(sizeof(struct zero_bulkout_context)); -+ -+ pbuf = (unsigned char *)rtw_zmalloc(sizeof(int)); -+ -+ len = 0; -+ -+ pcontext->pbuf = pbuf; -+ pcontext->purb = NULL; -+ pcontext->pirp = NULL; -+ pcontext->padapter = padapter; -+ -+ -+//translate DMA FIFO addr to pipehandle -+ hPipe = ffaddr2pipehdl(pdvobj, addr); -+ -+ -+ -+ -+ pxmitpriv->usb_transfer_write_port = (*usb_funcs_vp->lpIssueBulkTransfer)( -+ hPipe, usb_bulkout_zero_complete, -+ pcontext, USB_OUT_TRANSFER, -+ len, pbuf, 0); -+ -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) -+{ -+ -+ u32 i, bwritezero = _FALSE; -+ u32 ac_tag = addr; -+ -+ u8* ptr; -+ -+ struct intf_priv * pintfpriv = pintfhdl->pintfpriv; -+ struct dvobj_priv * pdvobj_priv = (struct dvobj_priv*)pintfpriv->intf_dev; -+ _adapter * padapter = pdvobj_priv->padapter; -+ -+ struct xmit_priv * pxmitpriv = &padapter->xmitpriv; -+ struct xmit_frame * pxmitframe = (struct xmit_frame *)wmem; -+ -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ -+ USB_PIPE hPipe; -+ -+ u32 bResult = _FALSE; -+ -+_func_enter_; -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("+usb_write_port\n")); -+ -+#if (CONFIG_PWRCTRL == 1) -+ if(padapter->pwrctrlpriv.pnp_bstop_trx==_TRUE){ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("\npadapter->pwrctrlpriv.pnp_bstop_trx==_TRUE\n")); -+ -+ } -+#endif -+ -+ if((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ bResult = _FALSE; -+ goto exit; -+ } -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_write_port(%u)\n", __LINE__)); -+ -+ for(i=0; i<8; i++) -+ { -+ if(pxmitframe->bpending[i] == _FALSE) -+ { -+ _rtw_spinlock(&pxmitpriv->lock); -+ pxmitpriv->txirp_cnt++; -+ pxmitframe->bpending[i] = _TRUE; -+ _rtw_spinunlock(&pxmitpriv->lock); -+ -+ pxmitframe->sz[i] = cnt; -+ pxmitframe->ac_tag[i] = ac_tag; -+ -+ break; -+ } -+ } -+ -+ -+ //TODO: -+ if (pdvobj_priv->ishighspeed) -+ { -+ if(cnt> 0 && cnt%512 == 0) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("ishighspeed, cnt=%d\n", cnt)); -+ // cnt=cnt+1; -+ bwritezero = _TRUE; -+ -+ } -+ } -+ else -+ { -+ if(cnt > 0 && cnt%64 == 0) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_info_,("cnt=%d\n", cnt)); -+ // cnt=cnt+1; -+ bwritezero = _TRUE; -+ -+ } -+ } -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("usb_write_port: pipe handle convert\n")); -+ -+ //translate DMA FIFO addr to pipehandle -+ hPipe = ffaddr2pipehdl(pdvobj_priv, addr); -+ -+ -+#if 0 -+ // for tx fifo, the maximum payload number is 8, -+ // we workaround this issue here by separate whole fifo into 8 segments. -+ if (cnt <= 500) -+ cnt = 500; -+#endif -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, -+ ("usb_write_port(%u): pxmitframe %X pxmitframe->padapter %X\n",__LINE__, pxmitframe, pxmitframe->padapter)); -+ -+ pxmitpriv->usb_transfer_write_port = (*usb_funcs_vp->lpIssueBulkTransfer)( -+ hPipe, usb_write_port_complete, -+ pxmitframe, USB_OUT_TRANSFER, -+ cnt, pxmitframe->mem_addr, 0); -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ -+ ptr=(u8 *)&pxmitframe->mem; -+ -+#if 0 -+ if (pdvobj_priv->ishighspeed) -+ { -+ ptr=ptr+512; -+ } -+ else -+ { -+ ptr=ptr+64; -+ -+ } -+#endif -+ if(bwritezero == _TRUE) -+ { -+ usb_bulkout_zero(pintfhdl, addr); -+ } -+ -+// if (!pxmitframe->usb_transfer_xmit) -+// padapter->bSurpriseRemoved=_TRUE; -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ bResult = _SUCCESS; -+ -+exit: -+_func_exit_; -+ return bResult; -+} -+ -+DWORD usb_write_port_complete( LPVOID Context ) -+{ -+ -+// u8 *ptr; -+ -+ struct xmit_frame * pxmitframe = (struct xmit_frame *) Context; -+ _adapter * padapter = pxmitframe->padapter; -+ struct dvobj_priv * pdvobj_priv = (struct dvobj_priv *)&padapter->dvobjpriv; -+ struct xmit_priv * pxmitpriv = &padapter->xmitpriv; -+ struct xmit_buf *pxmitbuf = pxmitframe->pxmitbuf; -+ LPCUSB_FUNCS usb_funcs_vp = pdvobj_priv->usb_extension._lpUsbFuncs; -+ -+ int fComplete =_FALSE; -+ DWORD dwBytesTransferred = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u), pxmitframe %X\n",__FUNCTION__, __LINE__, Context)); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_info_,("+usb_write_port_complete\n")); -+ -+ _rtw_spinlock_ex(&pxmitpriv->lock); -+ pxmitpriv->txirp_cnt--; -+ _rtw_spinunlock_ex(&pxmitpriv->lock); -+ -+ if(pxmitpriv->txirp_cnt==0){ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: txirp_cnt== 0, set allrxreturnevt!\n")); -+ _rtw_up_sema(&(pxmitpriv->tx_retevt)); -+ } -+ -+ -+ //not to consider tx fragment -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ -+#if 1 -+ -+ (*usb_funcs_vp->lpGetTransferStatus)(pxmitpriv->usb_transfer_write_port, &dwBytesTransferred, &dwErr); -+ fComplete = (*usb_funcs_vp->lpIsTransferComplete)(pxmitpriv->usb_transfer_write_port); -+ if(fComplete!=_TRUE) -+ { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_write_port_complete CloseTransfer before complete\n")); -+ } -+ (*usb_funcs_vp->lpCloseTransfer)(pxmitpriv->usb_transfer_write_port); -+ -+#else -+ -+ if((*usb_funcs_vp->lpIsTransferComplete)(pxmitpriv->usb_transfer_write_port)) -+ { -+ (*usb_funcs_vp->lpCloseTransfer)(pxmitpriv->usb_transfer_write_port); -+ } -+ -+#endif -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, -+ ("%s(%u): pxmitpriv %X pxmitpriv->free_xmitframe_cnt %X pxmitframe->padapter %X pxmitframe->padapter %X\n", -+ __LINE__, pxmitpriv, pxmitpriv->free_xmitframe_cnt, pxmitframe->padapter)); -+ -+ rtl8192cu_xmitframe_complete(padapter, pxmitpriv, pxmitbuf); -+ -+_func_exit_; -+ -+ return STATUS_SUCCESS; -+} -+ -+DWORD usb_write_scsi_complete(LPVOID pTxContext) -+{ -+#ifndef PLATFORM_OS_CE -+ struct SCSI_BUFFER_ENTRY *psb_entry = (struct SCSI_BUFFER_ENTRY *)pTxContext; -+ _adapter *padapter = psb_entry->padapter; -+ struct SCSI_BUFFER *psb = padapter->pscsi_buf; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct dvobj_priv *pdvobj_priv = (struct dvobj_priv *)&padapter->dvobjpriv; -+ LPCUSB_FUNCS lpUsbFuncs = pdvobj_priv->pUsbExtension->_lpUsbFuncs; -+ -+ int fComplete =_FALSE; -+ DWORD dwBytesTransferred = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ -+_func_enter_; -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u): circ_space = %d\n",__FUNCTION__, __LINE__, CIRC_SPACE( psb->head,psb->tail, SCSI_BUFFER_NUMBER))); -+ -+#if 1 -+ -+ (*lpUsbFuncs->lpGetTransferStatus)(psb_entry->usb_transfer_scsi_txcmd, &dwBytesTransferred, &dwErr); -+ fComplete = (*lpUsbFuncs->lpIsTransferComplete)(psb_entry->usb_transfer_scsi_txcmd); -+ if(fComplete!=_TRUE) -+ { -+ RT_TRACE( _module_hci_ops_os_c_, _drv_err_, ("usb_write_scsi_complete CloseTransfer before complete\n")); -+ } -+ (*lpUsbFuncs->lpCloseTransfer)(psb_entry->usb_transfer_scsi_txcmd); -+ -+#else -+ -+ if((*lpUsbFuncs->lpIsTransferComplete)(psb_entry->usb_transfer_scsi_txcmd)) -+ (*lpUsbFuncs->lpCloseTransfer)(psb_entry->usb_transfer_scsi_txcmd); -+#endif -+ -+ memset(psb_entry->entry_memory, 0, 8); -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ if((psb->tail+1)==SCSI_BUFFER_NUMBER) -+ psb->tail=0; -+ else -+ psb->tail++; -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ if(CIRC_CNT(psb->head,psb->tail,SCSI_BUFFER_NUMBER)==0){ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("write_txcmd_scsififo_callback: up_sema\n")); -+ _rtw_up_sema(&pxmitpriv->xmit_sema); -+ } -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ if(padapter->bSurpriseRemoved) { -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ } -+ -+_func_exit_; -+#endif -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ return STATUS_MORE_PROCESSING_REQUIRED; -+} -+ -+uint usb_write_scsi(struct intf_hdl *pintfhdl, u32 cnt, u8 *wmem) -+{ -+ -+#ifndef PLATFORM_OS_CE -+ -+ _adapter *padapter = (_adapter *)pintfhdl->adapter; -+ struct dvobj_priv *pdev = (struct dvobj_priv*)&padapter->dvobjpriv; -+ -+ struct SCSI_BUFFER *psb =padapter->pscsi_buf; -+ struct SCSI_BUFFER_ENTRY *psb_entry=LIST_CONTAINOR(wmem,struct SCSI_BUFFER_ENTRY,entry_memory); -+ -+_func_enter_; -+ if(padapter->bSurpriseRemoved||padapter->bDriverStopped) -+ return 0; -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ psb_entry->usb_transfer_scsi_txcmd=pdev->pUsbExtension->_lpUsbFuncs->lpIssueBulkTransfer( -+ pdev->scsi_out_pipehandle, -+ usb_write_scsi_complete, -+ psb_entry, -+ USB_OUT_TRANSFER, -+ cnt, -+ wmem, -+ 0); -+ -+_func_exit_; -+#endif -+ -+ return _SUCCESS; -+} -+ -+ -+/* -+ */ -+uint usb_init_intf_priv(struct intf_priv *pintfpriv) -+{ -+ // get the dvobj_priv object -+ struct dvobj_priv * pNdisCEDvice = (struct dvobj_priv *) pintfpriv->intf_dev; -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+ // set init intf_priv init status as _IOREADY -+ pintfpriv->intf_status = _IOREADY; -+ -+ // determine the max io size by dvobj_priv.ishighspeed -+ if(pNdisCEDvice->ishighspeed) -+ pintfpriv->max_iosz = 128; -+ else -+ pintfpriv->max_iosz = 64; -+ -+ // read/write size set as 0 -+ pintfpriv->io_wsz = 0; -+ pintfpriv->io_rsz = 0; -+ -+ // init io_rwmem buffer -+ pintfpriv->allocated_io_rwmem = rtw_zmalloc(pintfpriv->max_iosz +4); -+ if (pintfpriv->allocated_io_rwmem == NULL) -+ { -+ rtw_mfree((u8 *)(pintfpriv->allocated_io_rwmem), pintfpriv->max_iosz +4); -+ return _FAIL; -+ } -+ else -+ { -+ // word align the io_rwmem -+ pintfpriv->io_rwmem = pintfpriv->allocated_io_rwmem + 4 - ( (u32)(pintfpriv->allocated_io_rwmem) & 3); -+ } -+ -+#ifndef PLATFORM_OS_CE -+ -+ // init io_r_mem buffer -+ pintfpriv->allocated_io_r_mem = rtw_zmalloc(pintfpriv->max_iosz +4); -+ if (pintfpriv->allocated_io_r_mem == NULL) -+ { -+ rtw_mfree((u8 *)(pintfpriv->allocated_io_r_mem), pintfpriv->max_iosz +4); -+ return _FAIL; -+ } -+ else -+ { -+ // word align the io_rwmem -+ pintfpriv->io_r_mem = pintfpriv->allocated_io_r_mem + 4 - ( (u32)(pintfpriv->allocated_io_r_mem) & 3); -+ } -+#endif -+ -+ return _SUCCESS; -+} -+ -+void usb_unload_intf_priv(struct intf_priv *pintfpriv) -+{ -+#ifndef PLATFORM_OS_CE -+ -+ rtw_mfree((u8 *)(pintfpriv->allocated_io_rwmem), pintfpriv->max_iosz+4); -+ rtw_mfree((u8 *)(pintfpriv->allocated_io_r_mem), pintfpriv->max_iosz+4); -+#endif -+ -+ RT_TRACE( _module_hci_ops_os_c_, _drv_info_, ("%s(%u)\n",__FUNCTION__, __LINE__)); -+} -+ -+ -+ -+void usb_write_port_cancel(_adapter *padapter) -+{ -+ -+ sint i,j; -+ struct dvobj_priv *pdev = &padapter->dvobjpriv; -+ struct xmit_priv *pxmitpriv=&padapter->xmitpriv; -+ struct xmit_frame *pxmitframe; -+ -+ _rtw_spinlock(&pxmitpriv->lock); -+ pxmitpriv->txirp_cnt--; //decrease 1 for Initialize ++ -+ _rtw_spinunlock(&pxmitpriv->lock); -+ -+ if (pxmitpriv->txirp_cnt) -+ { -+ // Canceling Pending Recv Irp -+ pxmitframe= (struct xmit_frame *)pxmitpriv->pxmit_frame_buf; -+ -+ for( i = 0; i < NR_XMITFRAME; i++ ) -+ { -+ for(j=0;j<8;j++) -+ { -+ if (pxmitframe->bpending[j]==_TRUE) -+ { -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,(" usb_write_port_cancel() :IoCancelIrp\n")); -+ -+ } -+ } -+ -+ pxmitframe++; -+ } -+ -+ _rtw_down_sema(&(pxmitpriv->tx_retevt)); -+ -+ } -+ -+} -+ -+DWORD usbctrl_vendorreq_complete(LPVOID lpvNotifyParameter) -+{ -+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv*)lpvNotifyParameter; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_debug_,("+usbctrl_vendorreq_complete\n")); -+ -+ return STATUS_SUCCESS; -+} -+ -+ -+int usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype) -+{ -+ u8 ret=_TRUE; -+// NTSTATUS ntstatus; -+// int fComplete; -+// LPCUSB_DEVICE lpDeviceInfo; -+ -+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)pintfpriv->intf_dev; -+ -+ USB_TRANSFER usbTrans; -+ USB_DEVICE_REQUEST usb_device_req; -+ USB_HANDLE usbHandle = pdvobjpriv->usb_extension._hDevice; -+ LPCUSB_FUNCS usbFuncs = pdvobjpriv->usb_extension._lpUsbFuncs; -+ -+ u32 transfer_flags = 0; -+ -+ _func_enter_; -+ -+ memset( &usb_device_req, 0, sizeof( USB_DEVICE_REQUEST ) ); -+ -+ if( 0x01 == requesttype ) -+ { -+ usb_device_req.bmRequestType = USB_REQUEST_DEVICE_TO_HOST | USB_REQUEST_VENDOR | USB_REQUEST_FOR_DEVICE; -+ } -+ else -+ { -+ usb_device_req.bmRequestType = USB_REQUEST_HOST_TO_DEVICE | USB_REQUEST_VENDOR | USB_REQUEST_FOR_DEVICE; -+ } -+ -+ usb_device_req.bRequest = request; -+ usb_device_req.wValue = value; -+ usb_device_req.wIndex = index; -+ usb_device_req.wLength = len; -+ -+ if (requesttype == 0x01) -+ { -+ transfer_flags = USB_IN_TRANSFER;//read_in -+ } -+ else -+ { -+ transfer_flags= USB_OUT_TRANSFER;//write_out -+ } -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_debug_,("+usbctrl_vendorreq\n",__FUNCTION__,__LINE__)); -+ -+#if 0 -+ // Remember to add callback for sync -+ usbTrans = (*usbFuncs->lpIssueVendorTransfer)(usbHandle, -+ usbctrl_vendorreq_complete, pdvobjpriv, -+ transfer_flags, &usb_device_req, pdata, 0); -+#else -+ // Remember to add callback for sync -+ usbTrans = (*usbFuncs->lpIssueVendorTransfer)(usbHandle, -+ NULL, 0, -+ transfer_flags, &usb_device_req, pdata, 0); -+#endif -+ -+// rtw_usleep_os(10); -+ -+ if ( usbTrans ) -+ { -+ DWORD dwBytes = 0; -+ DWORD dwErr = USB_CANCELED_ERROR; -+ int fComplete; -+ -+ (*usbFuncs->lpGetTransferStatus)(usbTrans, &dwBytes, &dwErr); -+ -+ fComplete = (*usbFuncs->lpIsTransferComplete)(usbTrans); -+ -+ if (fComplete== _TRUE) -+ { -+ (*usbFuncs->lpCloseTransfer)(usbTrans); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_debug_,("usbctrl_vendorreq lpCloseTransfer\n")); -+ } -+ -+ if ( dwErr != USB_NO_ERROR || fComplete != _TRUE) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq lpCloseTransfer without complete\n")); -+ ret = _FALSE; -+ goto exit; -+ } -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq without usbTrans\n")); -+ ret = _FALSE; -+ goto exit; -+ -+ } -+ -+exit: -+ RT_TRACE(_module_hci_ops_os_c_,_drv_debug_,("-usbctrl_vendorreq\n")); -+_func_exit_; -+ -+ return ret; -+ -+} -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c -@@ -0,0 +1,1536 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _HCI_OPS_OS_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype) -+{ -+ _adapter *padapter = pintfhdl->padapter; -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct usb_device *udev = pdvobjpriv->pusbdev; -+ -+ unsigned int pipe; -+ int status = 0; -+ u32 tmp_buflen=0; -+ u8 reqtype; -+ u8 *pIo_buf; -+ int vendorreq_times = 0; -+ -+ #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE -+ u8 *tmp_buf; -+ #else // use stack memory -+ u8 tmp_buf[MAX_USB_IO_CTL_SIZE]; -+ #endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->adapter_type > PRIMARY_ADAPTER) -+ { -+ padapter = padapter->pbuddy_adapter; -+ pdvobjpriv = adapter_to_dvobj(padapter); -+ udev = pdvobjpriv->pusbdev; -+ } -+#endif -+ -+ -+ //DBG_871X("%s %s:%d\n",__FUNCTION__, current->comm, current->pid); -+ -+ if((padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)){ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq:(padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ status = -EPERM; -+ goto exit; -+ } -+ -+ if(len>MAX_VENDOR_REQ_CMD_SIZE){ -+ DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __FUNCTION__ ); -+ status = -EINVAL; -+ goto exit; -+ } -+ -+ #ifdef CONFIG_USB_VENDOR_REQ_MUTEX -+ _enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); -+ #endif -+ -+ -+ // Acquire IO memory for vendorreq -+#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC -+ pIo_buf = pdvobjpriv->usb_vendor_req_buf; -+#else -+ #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE -+ tmp_buf = rtw_malloc( (u32) len + ALIGNMENT_UNIT); -+ tmp_buflen = (u32)len + ALIGNMENT_UNIT; -+ #else // use stack memory -+ tmp_buflen = MAX_USB_IO_CTL_SIZE; -+ #endif -+ -+ // Added by Albert 2010/02/09 -+ // For mstar platform, mstar suggests the address for USB IO should be 16 bytes alignment. -+ // Trying to fix it here. -+ pIo_buf = (tmp_buf==NULL)?NULL:tmp_buf + ALIGNMENT_UNIT -((SIZE_PTR)(tmp_buf) & 0x0f ); -+#endif -+ -+ if ( pIo_buf== NULL) { -+ DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ ); -+ status = -ENOMEM; -+ goto release_mutex; -+ } -+ -+ while(++vendorreq_times<= MAX_USBCTRL_VENDORREQ_TIMES) -+ { -+ _rtw_memset(pIo_buf, 0, len); -+ -+ if (requesttype == 0x01) -+ { -+ pipe = usb_rcvctrlpipe(udev, 0);//read_in -+ reqtype = REALTEK_USB_VENQT_READ; -+ } -+ else -+ { -+ pipe = usb_sndctrlpipe(udev, 0);//write_out -+ reqtype = REALTEK_USB_VENQT_WRITE; -+ _rtw_memcpy( pIo_buf, pdata, len); -+ } -+ -+ #if 0 -+ //timeout test for firmware downloading -+ status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len -+ , ((value >= FW_8192C_START_ADDRESS && value <= FW_8192C_END_ADDRESS) ||value!=0x1000) ?RTW_USB_CONTROL_MSG_TIMEOUT : RTW_USB_CONTROL_MSG_TIMEOUT_TEST -+ ); -+ #else -+ status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT); -+ #endif -+ -+ if ( status == len) // Success this control transfer. -+ { -+ rtw_reset_continual_urb_error(pdvobjpriv); -+ if ( requesttype == 0x01 ) -+ { // For Control read transfer, we have to copy the read data from pIo_buf to pdata. -+ _rtw_memcpy( pdata, pIo_buf, len ); -+ } -+ } -+ else { // error cases -+ DBG_8192C("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n" -+ , value,(requesttype == 0x01)?"read":"write" , len, status, *(u32*)pdata, vendorreq_times); -+ -+ if (status < 0) { -+ if(status == (-ESHUTDOWN) || status == -ENODEV ) -+ { -+ padapter->bSurpriseRemoved = _TRUE; -+ } else { -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ { -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL; -+ } -+ #endif -+ } -+ } -+ else // status != len && status >= 0 -+ { -+ if(status > 0) { -+ if ( requesttype == 0x01 ) -+ { // For Control read transfer, we have to copy the read data from pIo_buf to pdata. -+ _rtw_memcpy( pdata, pIo_buf, len ); -+ } -+ } -+ } -+ -+ if(rtw_inc_and_chk_continual_urb_error(pdvobjpriv) == _TRUE ){ -+ padapter->bSurpriseRemoved = _TRUE; -+ break; -+ } -+ -+ } -+ -+ // firmware download is checksumed, don't retry -+ if( (value >= FW_8192C_START_ADDRESS && value <= FW_8192C_END_ADDRESS) || status == len ) -+ break; -+ -+ } -+ -+ // release IO memory used by vendorreq -+ #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE -+ rtw_mfree(tmp_buf, tmp_buflen); -+ #endif -+ -+release_mutex: -+ #ifdef CONFIG_USB_VENDOR_REQ_MUTEX -+ _exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); -+ #endif -+exit: -+ return status; -+ -+} -+ -+static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u32 data=0; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x01;//read_in -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = 1; -+ -+ usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); -+ -+ _func_exit_; -+ -+ return (u8)(le32_to_cpu(data)&0x0ff); -+ -+} -+ -+static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u32 data=0; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x01;//read_in -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = 2; -+ -+ usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); -+ -+ _func_exit_; -+ -+ return (u16)(le32_to_cpu(data)&0xffff); -+ -+} -+ -+static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u32 data=0; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x01;//read_in -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = 4; -+ -+ usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); -+ -+ _func_exit_; -+ -+ return le32_to_cpu(data); -+ -+} -+ -+static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u32 data; -+ int ret; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x00;//write_out -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = 1; -+ -+ data = val; -+ data = cpu_to_le32(data&0x000000ff); -+ -+ ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u32 data; -+ int ret; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x00;//write_out -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = 2; -+ -+ data = val; -+ data = cpu_to_le32(data&0x0000ffff); -+ -+ ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u32 data; -+ int ret; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x00;//write_out -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = 4; -+ data = cpu_to_le32(val); -+ -+ -+ ret =usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ u16 len; -+ u8 buf[VENDOR_CMD_MAX_DATA_LEN]={0}; -+ int ret; -+ -+ _func_enter_; -+ -+ request = 0x05; -+ requesttype = 0x00;//write_out -+ index = 0;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ len = length; -+ _rtw_memcpy(buf, pdata, len ); -+ -+ ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, buf, len, requesttype); -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs) -+{ -+ int err; -+ _adapter *padapter = (_adapter *)purb->context; -+ -+ if(purb->status==0)//SUCCESS -+ { -+ if (purb->actual_length > sizeof(INTERRUPT_MSG_FORMAT_EX)) -+ { -+ DBG_8192C("usb_read_interrupt_complete: purb->actual_length > sizeof(INTERRUPT_MSG_FORMAT_EX) \n"); -+ } -+ -+ err = usb_submit_urb(purb, GFP_ATOMIC); -+ if((err) && (err != (-EPERM))) -+ { -+ DBG_8192C("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, purb->status); -+ } -+ } -+ else -+ { -+ DBG_8192C("###=> usb_read_interrupt_complete => urb status(%d)\n", purb->status); -+ -+ switch(purb->status) { -+ case -EINVAL: -+ case -EPIPE: -+ case -ENODEV: -+ case -ESHUTDOWN: -+ //padapter->bSurpriseRemoved=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); -+ case -ENOENT: -+ padapter->bDriverStopped=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); -+ break; -+ case -EPROTO: -+ break; -+ case -EINPROGRESS: -+ DBG_8192C("ERROR: URB IS IN PROGRESS!/n"); -+ break; -+ default: -+ break; -+ } -+ } -+ -+} -+ -+static u32 usb_read_interrupt(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ int err; -+ unsigned int pipe; -+ u32 ret = _SUCCESS; -+ _adapter *adapter = pintfhdl->padapter; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ struct usb_device *pusbd = pdvobj->pusbdev; -+ -+_func_enter_; -+ -+ //translate DMA FIFO addr to pipehandle -+ pipe = ffaddr2pipehdl(pdvobj, addr); -+ -+ usb_fill_int_urb(precvpriv->int_in_urb, pusbd, pipe, -+ precvpriv->int_in_buf, -+ sizeof(INTERRUPT_MSG_FORMAT_EX), -+ usb_read_interrupt_complete, -+ adapter, -+ 1); -+ -+ err = usb_submit_urb(precvpriv->int_in_urb, GFP_ATOMIC); -+ if((err) && (err != (-EPERM))) -+ { -+ DBG_8192C("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, precvpriv->int_in_urb->status); -+ ret = _FAIL; -+ } -+ -+_func_exit_; -+ -+ return ret; -+} -+#endif -+ -+static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxstat, struct phy_stat *pphy_info) -+{ -+ s32 ret=_SUCCESS; -+#ifdef CONFIG_CONCURRENT_MODE -+ u8 *primary_myid, *secondary_myid, *paddr1; -+ union recv_frame *precvframe_if2 = NULL; -+ _adapter *primary_padapter = precvframe->u.hdr.adapter; -+ _adapter *secondary_padapter = primary_padapter->pbuddy_adapter; -+ struct recv_priv *precvpriv = &primary_padapter->recvpriv; -+ _queue *pfree_recv_queue = &precvpriv->free_recv_queue; -+ u8 *pbuf = precvframe->u.hdr.rx_data; -+ -+ if(!secondary_padapter) -+ return ret; -+ -+ paddr1 = GetAddr1Ptr(precvframe->u.hdr.rx_data); -+ -+ if(IS_MCAST(paddr1) == _FALSE)//unicast packets -+ { -+ //primary_myid = myid(&primary_padapter->eeprompriv); -+ secondary_myid = myid(&secondary_padapter->eeprompriv); -+ -+ if(_rtw_memcmp(paddr1, secondary_myid, ETH_ALEN)) -+ { -+ //change to secondary interface -+ precvframe->u.hdr.adapter = secondary_padapter; -+ } -+ -+ //ret = recv_entry(precvframe); -+ -+ } -+ else // Handle BC/MC Packets -+ { -+ -+ u8 clone = _TRUE; -+#if 0 -+ u8 type, subtype, *paddr2, *paddr3; -+ -+ type = GetFrameType(pbuf); -+ subtype = GetFrameSubType(pbuf); //bit(7)~bit(2) -+ -+ switch (type) -+ { -+ case WIFI_MGT_TYPE: //Handle BC/MC mgnt Packets -+ if(subtype == WIFI_BEACON) -+ { -+ paddr3 = GetAddr3Ptr(precvframe->u.hdr.rx_data); -+ -+ if (check_fwstate(&secondary_padapter->mlmepriv, _FW_LINKED) && -+ _rtw_memcmp(paddr3, get_bssid(&secondary_padapter->mlmepriv), ETH_ALEN)) -+ { -+ //change to secondary interface -+ precvframe->u.hdr.adapter = secondary_padapter; -+ clone = _FALSE; -+ } -+ -+ if(check_fwstate(&primary_padapter->mlmepriv, _FW_LINKED) && -+ _rtw_memcmp(paddr3, get_bssid(&primary_padapter->mlmepriv), ETH_ALEN)) -+ { -+ if(clone==_FALSE) -+ { -+ clone = _TRUE; -+ } -+ else -+ { -+ clone = _FALSE; -+ } -+ -+ precvframe->u.hdr.adapter = primary_padapter; -+ } -+ -+ if(check_fwstate(&primary_padapter->mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) || -+ check_fwstate(&secondary_padapter->mlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) -+ { -+ clone = _TRUE; -+ precvframe->u.hdr.adapter = primary_padapter; -+ } -+ -+ } -+ else if(subtype == WIFI_PROBEREQ) -+ { -+ //probe req frame is only for interface2 -+ //change to secondary interface -+ precvframe->u.hdr.adapter = secondary_padapter; -+ clone = _FALSE; -+ } -+ break; -+ case WIFI_CTRL_TYPE: // Handle BC/MC ctrl Packets -+ -+ break; -+ case WIFI_DATA_TYPE: //Handle BC/MC data Packets -+ //Notes: AP MODE never rx BC/MC data packets -+ -+ paddr2 = GetAddr2Ptr(precvframe->u.hdr.rx_data); -+ -+ if(_rtw_memcmp(paddr2, get_bssid(&secondary_padapter->mlmepriv), ETH_ALEN)) -+ { -+ //change to secondary interface -+ precvframe->u.hdr.adapter = secondary_padapter; -+ clone = _FALSE; -+ } -+ -+ break; -+ default: -+ -+ break; -+ } -+#endif -+ -+ if(_TRUE == clone) -+ { -+ //clone/copy to if2 -+ u8 shift_sz = 0; -+ u32 alloc_sz, skb_len; -+ _pkt *pkt_copy = NULL; -+ struct rx_pkt_attrib *pattrib = NULL; -+ -+ precvframe_if2 = rtw_alloc_recvframe(pfree_recv_queue); -+ if(precvframe_if2) -+ { -+ precvframe_if2->u.hdr.adapter = secondary_padapter; -+ -+ _rtw_init_listhead(&precvframe_if2->u.hdr.list); -+ precvframe_if2->u.hdr.precvbuf = NULL; //can't access the precvbuf for new arch. -+ precvframe_if2->u.hdr.len=0; -+ -+ _rtw_memcpy(&precvframe_if2->u.hdr.attrib, &precvframe->u.hdr.attrib, sizeof(struct rx_pkt_attrib)); -+ -+ pattrib = &precvframe_if2->u.hdr.attrib; -+ -+ // Modified by Albert 20101213 -+ // For 8 bytes IP header alignment. -+ if (pattrib->qos) // Qos data, wireless lan header length is 26 -+ { -+ shift_sz = 6; -+ } -+ else -+ { -+ shift_sz = 0; -+ } -+ -+ skb_len = pattrib->pkt_len; -+ -+ // for first fragment packet, driver need allocate 1536+drvinfo_sz+RXDESC_SIZE to defrag packet. -+ // modify alloc_sz for recvive crc error packet by thomas 2011-06-02 -+ if((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)){ -+ //alloc_sz = 1664; //1664 is 128 alignment. -+ if(skb_len <= 1650) -+ alloc_sz = 1664; -+ else -+ alloc_sz = skb_len + 14; -+ } -+ else { -+ alloc_sz = skb_len; -+ // 6 is for IP header 8 bytes alignment in QoS packet case. -+ // 8 is for skb->data 4 bytes alignment. -+ alloc_sz += 14; -+ } -+ -+ pkt_copy = rtw_skb_alloc(alloc_sz); -+ -+ if(pkt_copy) -+ { -+ pkt_copy->dev = secondary_padapter->pnetdev; -+ precvframe_if2->u.hdr.pkt = pkt_copy; -+ precvframe_if2->u.hdr.rx_head = pkt_copy->data; -+ precvframe_if2->u.hdr.rx_end = pkt_copy->data + alloc_sz; -+ skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address -+ skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz. -+ _rtw_memcpy(pkt_copy->data, pbuf, skb_len); -+ precvframe_if2->u.hdr.rx_data = precvframe_if2->u.hdr.rx_tail = pkt_copy->data; -+ -+ -+ recvframe_put(precvframe_if2, skb_len); -+ //recvframe_pull(precvframe_if2, drvinfo_sz + RXDESC_SIZE); -+ -+ rtl8192c_translate_rx_signal_stuff(precvframe_if2, pphy_info); -+ -+ ret = rtw_recv_entry(precvframe_if2); -+ -+ } else { -+ rtw_free_recvframe(precvframe_if2, pfree_recv_queue); -+ DBG_8192C("%s()-%d: alloc_skb() failed!\n", __FUNCTION__, __LINE__); -+ } -+ -+ } -+ -+ } -+ -+ } -+ -+ rtl8192c_translate_rx_signal_stuff(precvframe, pphy_info); -+ -+ ret = rtw_recv_entry(precvframe); -+ -+#endif -+ -+ return ret; -+ -+} -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -+static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) -+{ -+ u8 *pbuf; -+ u8 shift_sz = 0; -+ u16 pkt_cnt, drvinfo_sz; -+ u32 pkt_offset, skb_len, alloc_sz; -+ s32 transfer_len; -+ struct recv_stat *prxstat; -+ struct phy_stat *pphy_info = NULL; -+ _pkt *pkt_copy = NULL; -+ union recv_frame *precvframe = NULL; -+ struct rx_pkt_attrib *pattrib = NULL; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *pfree_recv_queue = &precvpriv->free_recv_queue; -+ -+ -+ transfer_len = (s32)precvbuf->transfer_len; -+ pbuf = precvbuf->pbuf; -+ -+ prxstat = (struct recv_stat *)pbuf; -+ pkt_cnt = (le32_to_cpu(prxstat->rxdw2)>>16) & 0xff; -+ -+#if 0 //temp remove when disable usb rx aggregation -+ if((pkt_cnt > 10) || (pkt_cnt < 1) || (transfer_lenrxdw0, prxstat->rxdw1, prxstat->rxdw2, prxstat->rxdw4)); -+ -+ prxstat = (struct recv_stat *)pbuf; -+ -+ precvframe = rtw_alloc_recvframe(pfree_recv_queue); -+ if(precvframe==NULL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n")); -+ DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__); -+ goto _exit_recvbuf2recvframe; -+ } -+ -+ _rtw_init_listhead(&precvframe->u.hdr.list); -+ precvframe->u.hdr.precvbuf = NULL; //can't access the precvbuf for new arch. -+ precvframe->u.hdr.len=0; -+ -+ rtl8192c_query_rx_desc_status(precvframe, prxstat); -+ -+ pattrib = &precvframe->u.hdr.attrib; -+ if(pattrib->physt) -+ { -+ pphy_info = (struct phy_stat *)(pbuf + RXDESC_OFFSET); -+ } -+ -+ pkt_offset = RXDESC_SIZE + pattrib->drvinfo_sz + pattrib->shift_sz + pattrib->pkt_len; -+ -+ if((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); -+ DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); -+ rtw_free_recvframe(precvframe, pfree_recv_queue); -+ goto _exit_recvbuf2recvframe; -+ } -+ -+ // Modified by Albert 20101213 -+ // For 8 bytes IP header alignment. -+ if (pattrib->qos) // Qos data, wireless lan header length is 26 -+ { -+ shift_sz = 6; -+ } -+ else -+ { -+ shift_sz = 0; -+ } -+ -+ skb_len = pattrib->pkt_len; -+ -+ // for first fragment packet, driver need allocate 1536+drvinfo_sz+RXDESC_SIZE to defrag packet. -+ // modify alloc_sz for recvive crc error packet by thomas 2011-06-02 -+ if((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)){ -+ //alloc_sz = 1664; //1664 is 128 alignment. -+ if(skb_len <= 1650) -+ alloc_sz = 1664; -+ else -+ alloc_sz = skb_len + 14; -+ } -+ else { -+ alloc_sz = skb_len; -+ // 6 is for IP header 8 bytes alignment in QoS packet case. -+ // 8 is for skb->data 4 bytes alignment. -+ alloc_sz += 14; -+ } -+ -+ pkt_copy = rtw_skb_alloc(alloc_sz); -+ -+ if(pkt_copy) -+ { -+ pkt_copy->dev = padapter->pnetdev; -+ precvframe->u.hdr.pkt = pkt_copy; -+ precvframe->u.hdr.rx_head = pkt_copy->data; -+ precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz; -+ skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address -+ skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz. -+ _rtw_memcpy(pkt_copy->data, (pbuf + pattrib->shift_sz + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len); -+ precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data; -+ } -+ else -+ { -+ DBG_8192C("recvbuf2recvframe:can not allocate memory for skb copy\n"); -+ //precvframe->u.hdr.pkt = rtw_skb_clone(pskb); -+ //precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pbuf; -+ //precvframe->u.hdr.rx_end = pbuf + (pkt_offset>1612?pkt_offset:1612); -+ -+ precvframe->u.hdr.pkt = NULL; -+ rtw_free_recvframe(precvframe, pfree_recv_queue); -+ -+ goto _exit_recvbuf2recvframe; -+ } -+ -+ recvframe_put(precvframe, skb_len); -+ //recvframe_pull(precvframe, drvinfo_sz + RXDESC_SIZE); -+ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ switch(pHalData->UsbRxAggMode) -+ { -+ case USB_RX_AGG_DMA: -+ case USB_RX_AGG_MIX: -+ pkt_offset = (u16)_RND128(pkt_offset); -+ break; -+ case USB_RX_AGG_USB: -+ pkt_offset = (u16)_RND4(pkt_offset); -+ break; -+ case USB_RX_AGG_DISABLE: -+ default: -+ break; -+ } -+#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(rtw_buddy_adapter_up(padapter)) -+ { -+ if(pre_recv_entry(precvframe, prxstat, pphy_info) != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: recv_entry(precvframe) != _SUCCESS\n")); -+ } -+ } -+ else -+ { -+ rtl8192c_translate_rx_signal_stuff(precvframe, pphy_info); -+ if(rtw_recv_entry(precvframe) != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: rtw_recv_entry(precvframe) != _SUCCESS\n")); -+ } -+ } -+ -+#else -+ rtl8192c_translate_rx_signal_stuff(precvframe, pphy_info); -+ if(rtw_recv_entry(precvframe) != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: rtw_recv_entry(precvframe) != _SUCCESS\n")); -+ } -+#endif -+ -+ pkt_cnt--; -+ transfer_len -= pkt_offset; -+ pbuf += pkt_offset; -+ precvframe = NULL; -+ pkt_copy = NULL; -+ -+ if(transfer_len>0 && pkt_cnt==0) -+ pkt_cnt = (le32_to_cpu(prxstat->rxdw2)>>16) & 0xff; -+ -+ }while((transfer_len>0) && (pkt_cnt>0)); -+ -+_exit_recvbuf2recvframe: -+ -+ return _SUCCESS; -+} -+ -+void rtl8192cu_recv_tasklet(void *priv) -+{ -+ struct recv_buf *precvbuf = NULL; -+ _adapter *padapter = (_adapter*)priv; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ while (NULL != (precvbuf = rtw_dequeue_recvbuf(&precvpriv->recv_buf_pending_queue))) -+ { -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) -+ { -+ DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); -+ -+ break; -+ } -+ -+ -+ recvbuf2recvframe(padapter, precvbuf); -+ -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ -+} -+ -+static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) -+{ -+ struct recv_buf *precvbuf = (struct recv_buf *)purb->context; -+ _adapter *padapter =(_adapter *)precvbuf->adapter; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); -+ -+ precvpriv->rx_pending_cnt --; -+ -+ if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ -+ goto exit; -+ } -+ -+ if(purb->status==0)//SUCCESS -+ { -+ if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n")); -+ -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ else -+ { -+ rtw_reset_continual_urb_error(adapter_to_dvobj(padapter)); -+ -+ precvbuf->transfer_len = purb->actual_length; -+ -+ //rtw_enqueue_rx_transfer_buffer(precvpriv, rx_transfer_buf); -+ rtw_enqueue_recvbuf(precvbuf, &precvpriv->recv_buf_pending_queue); -+ -+ tasklet_schedule(&precvpriv->recv_tasklet); -+ } -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status)); -+ -+ DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); -+ -+ if(rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){ -+ padapter->bSurpriseRemoved = _TRUE; -+ } -+ -+ switch(purb->status) { -+ case -EINVAL: -+ case -EPIPE: -+ case -ENODEV: -+ case -ESHUTDOWN: -+ //padapter->bSurpriseRemoved=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); -+ case -ENOENT: -+ padapter->bDriverStopped=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); -+ break; -+ case -EPROTO: -+ case -EILSEQ: -+ case -ETIME: -+ case -ECOMM: -+ case -EOVERFLOW: -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ { -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL; -+ } -+ #endif -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ break; -+ case -EINPROGRESS: -+ DBG_8192C("ERROR: URB IS IN PROGRESS!/n"); -+ break; -+ default: -+ break; -+ } -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+} -+ -+static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+ int err; -+ unsigned int pipe; -+ u32 ret = _SUCCESS; -+ PURB purb = NULL; -+ struct recv_buf *precvbuf = (struct recv_buf *)rmem; -+ _adapter *adapter = pintfhdl->padapter; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ struct usb_device *pusbd = pdvobj->pusbdev; -+ -+_func_enter_; -+ -+ if(adapter->bDriverStopped || adapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ return _FAIL; -+ } -+ -+ if(precvbuf !=NULL) -+ { -+ rtl8192cu_init_recvbuf(adapter, precvbuf); -+ -+ if(precvbuf->pbuf) -+ { -+ precvpriv->rx_pending_cnt++; -+ -+ purb = precvbuf->purb; -+ -+ //translate DMA FIFO addr to pipehandle -+ pipe = ffaddr2pipehdl(pdvobj, addr); -+ -+ usb_fill_bulk_urb(purb, pusbd, pipe, -+ precvbuf->pbuf, -+ MAX_RECVBUF_SZ, -+ usb_read_port_complete, -+ precvbuf);//context is precvbuf -+ -+ purb->transfer_dma = precvbuf->dma_transfer_addr; -+ purb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; -+ -+ err = usb_submit_urb(purb, GFP_ATOMIC); -+ if((err) && (err != (-EPERM))) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status)); -+ DBG_8192C("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status); -+ ret = _FAIL; -+ } -+ -+ } -+ -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:precvbuf ==NULL\n")); -+ ret = _FAIL; -+ } -+ -+_func_exit_; -+ -+ return ret; -+} -+#else // CONFIG_USE_USB_BUFFER_ALLOC_RX -+static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) -+{ -+ u8 *pbuf; -+ u8 shift_sz = 0; -+ u16 pkt_cnt; -+ u32 pkt_offset, skb_len, alloc_sz; -+ s32 transfer_len; -+ struct recv_stat *prxstat; -+ struct phy_stat *pphy_info = NULL; -+ _pkt *pkt_copy = NULL; -+ union recv_frame *precvframe = NULL; -+ struct rx_pkt_attrib *pattrib = NULL; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ _queue *pfree_recv_queue = &precvpriv->free_recv_queue; -+ -+ -+ transfer_len = (s32)pskb->len; -+ pbuf = pskb->data; -+ -+ prxstat = (struct recv_stat *)pbuf; -+ pkt_cnt = (le32_to_cpu(prxstat->rxdw2)>>16) & 0xff; -+ -+#if 0 //temp remove when disable usb rx aggregation -+ if((pkt_cnt > 10) || (pkt_cnt < 1) || (transfer_lenrxdw0, prxstat->rxdw1, prxstat->rxdw2, prxstat->rxdw4)); -+ -+ prxstat = (struct recv_stat *)pbuf; -+ -+ precvframe = rtw_alloc_recvframe(pfree_recv_queue); -+ if(precvframe==NULL) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n")); -+ DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__); -+ goto _exit_recvbuf2recvframe; -+ } -+ -+ _rtw_init_listhead(&precvframe->u.hdr.list); -+ precvframe->u.hdr.precvbuf = NULL; //can't access the precvbuf for new arch. -+ precvframe->u.hdr.len=0; -+ -+ rtl8192c_query_rx_desc_status(precvframe, prxstat); -+ -+ pattrib = &precvframe->u.hdr.attrib; -+ if(pattrib->physt) -+ { -+ pphy_info = (struct phy_stat *)(pbuf + RXDESC_OFFSET); -+ } -+ -+ pkt_offset = RXDESC_SIZE + pattrib->drvinfo_sz + pattrib->shift_sz + pattrib->pkt_len; -+ -+ if((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); -+ DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); -+ rtw_free_recvframe(precvframe, pfree_recv_queue); -+ goto _exit_recvbuf2recvframe; -+ } -+ -+ // Modified by Albert 20101213 -+ // For 8 bytes IP header alignment. -+ if (pattrib->qos) // Qos data, wireless lan header length is 26 -+ { -+ shift_sz = 6; -+ } -+ else -+ { -+ shift_sz = 0; -+ } -+ -+ skb_len = pattrib->pkt_len; -+ -+ // for first fragment packet, driver need allocate 1536+drvinfo_sz+RXDESC_SIZE to defrag packet. -+ // modify alloc_sz for recvive crc error packet by thomas 2011-06-02 -+ if((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)){ -+ //alloc_sz = 1664; //1664 is 128 alignment. -+ if(skb_len <= 1650) -+ alloc_sz = 1664; -+ else -+ alloc_sz = skb_len + 14; -+ } -+ else { -+ alloc_sz = skb_len; -+ // 6 is for IP header 8 bytes alignment in QoS packet case. -+ // 8 is for skb->data 4 bytes alignment. -+ alloc_sz += 14; -+ } -+ -+ pkt_copy = rtw_skb_alloc(alloc_sz); -+ -+ if(pkt_copy) -+ { -+ pkt_copy->dev = padapter->pnetdev; -+ precvframe->u.hdr.pkt = pkt_copy; -+ precvframe->u.hdr.rx_head = pkt_copy->data; -+ precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz; -+ skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address -+ skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz. -+ _rtw_memcpy(pkt_copy->data, (pbuf + pattrib->shift_sz + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len); -+ precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data; -+ -+ } -+ else -+ { -+ precvframe->u.hdr.pkt = rtw_skb_clone(pskb); -+ if(pkt_copy) -+ { -+ precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pbuf; -+ precvframe->u.hdr.rx_end = pbuf + alloc_sz; -+ } -+ else -+ { -+ DBG_8192C("recvbuf2recvframe: rtw_skb_clone fail\n"); -+ rtw_free_recvframe(precvframe, pfree_recv_queue); -+ goto _exit_recvbuf2recvframe; -+ } -+ } -+ -+ recvframe_put(precvframe, skb_len); -+ //recvframe_pull(precvframe, drvinfo_sz + RXDESC_SIZE); -+ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ switch(pHalData->UsbRxAggMode) -+ { -+ case USB_RX_AGG_DMA: -+ case USB_RX_AGG_MIX: -+ pkt_offset = (u16)_RND128(pkt_offset); -+ break; -+ case USB_RX_AGG_USB: -+ pkt_offset = (u16)_RND4(pkt_offset); -+ break; -+ case USB_RX_AGG_DISABLE: -+ default: -+ break; -+ } -+#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(rtw_buddy_adapter_up(padapter)) -+ { -+ if(pre_recv_entry(precvframe, prxstat, pphy_info) != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: recv_entry(precvframe) != _SUCCESS\n")); -+ } -+ } -+ else -+ { -+ rtl8192c_translate_rx_signal_stuff(precvframe, pphy_info); -+ if(rtw_recv_entry(precvframe) != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: rtw_recv_entry(precvframe) != _SUCCESS\n")); -+ } -+ } -+ -+#else -+ rtl8192c_translate_rx_signal_stuff(precvframe, pphy_info); -+ if(rtw_recv_entry(precvframe) != _SUCCESS) -+ { -+ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: rtw_recv_entry(precvframe) != _SUCCESS\n")); -+ } -+#endif -+ -+ pkt_cnt--; -+ transfer_len -= pkt_offset; -+ pbuf += pkt_offset; -+ precvframe = NULL; -+ pkt_copy = NULL; -+ -+ if(transfer_len>0 && pkt_cnt==0) -+ pkt_cnt = (le32_to_cpu(prxstat->rxdw2)>>16) & 0xff; -+ -+ }while((transfer_len>0) && (pkt_cnt>0)); -+ -+_exit_recvbuf2recvframe: -+ -+ return _SUCCESS; -+} -+ -+void rtl8192cu_recv_tasklet(void *priv) -+{ -+ _pkt *pskb; -+ _adapter *padapter = (_adapter*)priv; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) -+ { -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) -+ { -+ DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); -+ rtw_skb_free(pskb); -+ break; -+ } -+ -+ recvbuf2recvframe(padapter, pskb); -+ -+#ifdef CONFIG_PREALLOC_RECV_SKB -+ -+ skb_reset_tail_pointer(pskb); -+ -+ pskb->len = 0; -+ -+ skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb); -+ -+#else -+ rtw_skb_free(pskb); -+#endif -+ -+ } -+ -+} -+ -+ -+static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) -+{ -+ _irqL irqL; -+ uint isevt, *pbuf; -+ struct recv_buf *precvbuf = (struct recv_buf *)purb->context; -+ _adapter *padapter =(_adapter *)precvbuf->adapter; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); -+ -+ //_enter_critical(&precvpriv->lock, &irqL); -+ //precvbuf->irp_pending=_FALSE; -+ //precvpriv->rx_pending_cnt --; -+ //_exit_critical(&precvpriv->lock, &irqL); -+ -+ precvpriv->rx_pending_cnt --; -+ -+ //if(precvpriv->rx_pending_cnt== 0) -+ //{ -+ // RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: rx_pending_cnt== 0, set allrxreturnevt!\n")); -+ // _rtw_up_sema(&precvpriv->allrxreturnevt); -+ //} -+ -+ if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ -+ #ifdef CONFIG_PREALLOC_RECV_SKB -+ precvbuf->reuse = _TRUE; -+ #else -+ if(precvbuf->pskb){ -+ DBG_8192C("==> free skb(%p)\n",precvbuf->pskb); -+ rtw_skb_free(precvbuf->pskb); -+ } -+ #endif -+ DBG_8192C("%s()-%d: RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", -+ __FUNCTION__, __LINE__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); -+ goto exit; -+ } -+ -+ if(purb->status==0)//SUCCESS -+ { -+ if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n")); -+ precvbuf->reuse = _TRUE; -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); -+ } -+ else -+ { -+ rtw_reset_continual_urb_error(adapter_to_dvobj(padapter)); -+ -+ precvbuf->transfer_len = purb->actual_length; -+ skb_put(precvbuf->pskb, purb->actual_length); -+ skb_queue_tail(&precvpriv->rx_skb_queue, precvbuf->pskb); -+ -+ if (skb_queue_len(&precvpriv->rx_skb_queue)<=1) -+ tasklet_schedule(&precvpriv->recv_tasklet); -+ -+ precvbuf->pskb = NULL; -+ precvbuf->reuse = _FALSE; -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status)); -+ -+ DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); -+ -+ if(rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){ -+ padapter->bSurpriseRemoved = _TRUE; -+ } -+ -+ switch(purb->status) { -+ case -EINVAL: -+ case -EPIPE: -+ case -ENODEV: -+ case -ESHUTDOWN: -+ //padapter->bSurpriseRemoved=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bSurpriseRemoved=TRUE\n")); -+ case -ENOENT: -+ padapter->bDriverStopped=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped=TRUE\n")); -+ break; -+ case -EPROTO: -+ case -EILSEQ: -+ case -ETIME: -+ case -ECOMM: -+ case -EOVERFLOW: -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ { -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL; -+ } -+ #endif -+ precvbuf->reuse = _TRUE; -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ break; -+ case -EINPROGRESS: -+ precvpriv->read_port_complete_EINPROGRESS_cnt++; -+ DBG_8192C("ERROR: URB IS IN PROGRESS!/n"); -+ break; -+ default: -+ precvpriv->read_port_complete_other_urb_err_cnt++; -+ break; -+ } -+ -+ } -+ -+exit: -+ -+_func_exit_; -+ -+} -+ -+static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+ _irqL irqL; -+ int err; -+ unsigned int pipe; -+ SIZE_PTR tmpaddr=0; -+ SIZE_PTR alignment=0; -+ u32 ret = _SUCCESS; -+ PURB purb = NULL; -+ struct recv_buf *precvbuf = (struct recv_buf *)rmem; -+ _adapter *adapter = pintfhdl->padapter; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ struct usb_device *pusbd = pdvobj->pusbdev; -+ -+_func_enter_; -+ -+ if(adapter->bDriverStopped || adapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ return _FAIL; -+ } -+ -+#ifdef CONFIG_PREALLOC_RECV_SKB -+ if((precvbuf->reuse == _FALSE) || (precvbuf->pskb == NULL)) -+ { -+ if (NULL != (precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue))) -+ { -+ precvbuf->reuse = _TRUE; -+ } -+ } -+#endif -+ -+ -+ if(precvbuf !=NULL) -+ { -+ rtl8192cu_init_recvbuf(adapter, precvbuf); -+ -+ //re-assign for linux based on skb -+ if((precvbuf->reuse == _FALSE) || (precvbuf->pskb == NULL)) -+ { -+ precvbuf->pskb = rtw_skb_alloc(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); -+ -+ if(precvbuf->pskb == NULL) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("init_recvbuf(): alloc_skb fail!\n")); -+ precvpriv->recvbuf_skb_alloc_fail_cnt++; -+ return _FAIL; -+ } -+ -+ tmpaddr = (SIZE_PTR)precvbuf->pskb->data; -+ alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1); -+ skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); -+ -+ precvbuf->phead = precvbuf->pskb->head; -+ precvbuf->pdata = precvbuf->pskb->data; -+ precvbuf->ptail = skb_tail_pointer(precvbuf->pskb); -+ precvbuf->pend = skb_end_pointer(precvbuf->pskb); -+ precvbuf->pbuf = precvbuf->pskb->data; -+ } -+ else//reuse skb -+ { -+ precvbuf->phead = precvbuf->pskb->head; -+ precvbuf->pdata = precvbuf->pskb->data; -+ precvbuf->ptail = skb_tail_pointer(precvbuf->pskb); -+ precvbuf->pend = skb_end_pointer(precvbuf->pskb); -+ precvbuf->pbuf = precvbuf->pskb->data; -+ -+ precvbuf->reuse = _FALSE; -+ } -+ -+ //_enter_critical(&precvpriv->lock, &irqL); -+ //precvpriv->rx_pending_cnt++; -+ //precvbuf->irp_pending = _TRUE; -+ //_exit_critical(&precvpriv->lock, &irqL); -+ -+ precvpriv->rx_pending_cnt++; -+ -+ purb = precvbuf->purb; -+ -+ //translate DMA FIFO addr to pipehandle -+ pipe = ffaddr2pipehdl(pdvobj, addr); -+ -+ usb_fill_bulk_urb(purb, pusbd, pipe, -+ precvbuf->pbuf, -+ MAX_RECVBUF_SZ, -+ usb_read_port_complete, -+ precvbuf);//context is precvbuf -+ -+ err = usb_submit_urb(purb, GFP_ATOMIC); -+ if((err) && (err != (-EPERM))) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status)); -+ DBG_8192C("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status); -+ ret = _FAIL; -+ } -+ } -+ else -+ { -+ precvpriv->recvbuf_null_cnt++; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:precvbuf ==NULL\n")); -+ ret = _FAIL; -+ } -+ -+_func_exit_; -+ -+ return ret; -+} -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_RX -+ -+void rtl8192cu_xmit_tasklet(void *priv) -+{ -+ int ret = _FALSE; -+ _adapter *padapter = (_adapter*)priv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ if(check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE) -+ return; -+ -+ while(1) -+ { -+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE) || (padapter->bWritePortCancel == _TRUE)) -+ { -+ DBG_8192C("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n"); -+ break; -+ } -+ -+ ret = rtl8192cu_xmitframe_complete(padapter, pxmitpriv, NULL); -+ -+ if(ret==_FALSE) -+ break; -+ -+ } -+ -+} -+ -+void rtl8192cu_set_intf_ops(struct _io_ops *pops) -+{ -+ _func_enter_; -+ -+ _rtw_memset((u8 *)pops, 0, sizeof(struct _io_ops)); -+ -+ pops->_read8 = &usb_read8; -+ pops->_read16 = &usb_read16; -+ pops->_read32 = &usb_read32; -+ pops->_read_mem = &usb_read_mem; -+ pops->_read_port = &usb_read_port; -+ -+ pops->_write8 = &usb_write8; -+ pops->_write16 = &usb_write16; -+ pops->_write32 = &usb_write32; -+ pops->_writeN = &usb_writeN; -+ -+#ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ -+ pops->_write8_async= &usb_async_write8; -+ pops->_write16_async = &usb_async_write16; -+ pops->_write32_async = &usb_async_write32; -+#endif -+ pops->_write_mem = &usb_write_mem; -+ pops->_write_port = &usb_write_port; -+ -+ pops->_read_port_cancel = &usb_read_port_cancel; -+ pops->_write_port_cancel = &usb_write_port_cancel; -+ -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+ pops->_read_interrupt = &usb_read_interrupt; -+#endif -+ -+ _func_exit_; -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c -@@ -0,0 +1,1265 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _HCI_OPS_OS_C_ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ #error "Shall be Linux or Windows, but not both!\n" -+#endif -+ -+#ifndef CONFIG_USB_HCI -+ #error "CONFIG_USB_HCI shall be on!\n" -+#endif -+ -+ -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+ -+ -+struct zero_bulkout_context -+{ -+ void *pbuf; -+ void *purb; -+ void *pirp; -+ void *padapter; -+}; -+ -+#define usb_write_cmd usb_write_mem -+#define usb_read_cmd usb_read_mem -+#define usb_write_cmd_complete usb_write_mem_complete -+//#define usb_read_cmd_complete usb_read_mem_complete -+ -+ -+ -+uint usb_init_intf_priv(struct intf_priv *pintfpriv) -+{ -+ -+ PURB piorw_urb; -+ u8 NextDeviceStackSize; -+ struct dvobj_priv *pdev = (struct dvobj_priv *)pintfpriv->intf_dev; -+ _adapter * padapter=pdev->padapter; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_info_,("\n +usb_init_intf_priv\n")); -+ -+ pintfpriv->intf_status = _IOREADY; -+ -+ if(pdev->ishighspeed) pintfpriv->max_iosz = 128; -+ else pintfpriv->max_iosz = 64; -+ -+ -+ _init_timer(&pintfpriv->io_timer, padapter->hndis_adapter, io_irp_timeout_handler, pintfpriv); -+ -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_info_,("usb_init_intf_priv:pintfpriv->max_iosz:%d\n",pintfpriv->max_iosz)); -+ -+ pintfpriv->io_wsz = 0; -+ pintfpriv->io_rsz = 0; -+ -+ pintfpriv->allocated_io_rwmem = rtw_zmalloc(pintfpriv->max_iosz +4); -+ -+ if (pintfpriv->allocated_io_rwmem == NULL){ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_init_intf_priv:pintfpriv->allocated_io_rwmem == NULL\n")); -+ goto usb_init_intf_priv_fail; -+ } -+ -+ pintfpriv->io_rwmem = pintfpriv->allocated_io_rwmem + 4 \ -+ -( (u32)(pintfpriv->allocated_io_rwmem) & 3); -+ -+ -+ -+ NextDeviceStackSize = (u8)pdev->nextdevstacksz;//pintfpriv->pUsbDevObj->StackSize + 1; -+ -+ piorw_urb = (PURB)ExAllocatePool(NonPagedPool, sizeof(URB) ); -+ if(piorw_urb == NULL) -+ goto usb_init_intf_priv_fail; -+ -+ pintfpriv->piorw_urb = piorw_urb; -+ -+ pintfpriv->piorw_irp = IoAllocateIrp(NextDeviceStackSize , FALSE); -+ -+ -+ pintfpriv->io_irp_cnt=1; -+ pintfpriv->bio_irp_pending=_FALSE; -+ -+ _rtw_init_sema(&(pintfpriv->io_retevt), 0);//NdisInitializeEvent(&pintfpriv->io_irp_return_evt); -+ -+_func_exit_; -+ return _SUCCESS; -+ -+usb_init_intf_priv_fail: -+ -+ if (pintfpriv->allocated_io_rwmem) -+ rtw_mfree((u8 *)(pintfpriv->allocated_io_rwmem), pintfpriv->max_iosz +4); -+ -+ if(piorw_urb) -+ ExFreePool(piorw_urb); -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_info_,("\n -usb_init_intf_priv(usb_init_intf_priv_fail)\n")); -+ -+_func_exit_; -+ return _FAIL; -+ -+} -+ -+void usb_unload_intf_priv(struct intf_priv *pintfpriv) -+{ -+ -+_func_enter_; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n+usb_unload_intf_priv\n")); -+ -+ rtw_mfree((u8 *)(pintfpriv->allocated_io_rwmem), pintfpriv->max_iosz+4); -+ -+#ifdef PLATFORM_WINDOWS -+ if(pintfpriv->piorw_urb) -+ ExFreePool(pintfpriv->piorw_urb); -+ -+ if(pintfpriv->piorw_irp) -+ IoFreeIrp(pintfpriv->piorw_irp); -+#endif -+ -+ -+#ifdef PLATFORM_LINUX -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\npintfpriv->io_irp_cnt=%d\n",pintfpriv->io_irp_cnt)); -+ pintfpriv->io_irp_cnt--; -+ if(pintfpriv->io_irp_cnt){ -+ if(pintfpriv->bio_irp_pending==_TRUE){ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\nkill iorw_urb\n")); -+ usb_kill_urb(pintfpriv->piorw_urb); -+ } -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n wait io_retevt\n")); -+ _rtw_down_sema(&(pintfpriv->io_retevt)); -+ } -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n cancel io_urb ok\n")); -+#endif -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n-usb_unload_intf_priv\n")); -+ -+_func_exit_; -+ -+} -+ -+void *ffaddr2pipehdl(struct dvobj_priv *pNdisCEDvice, u32 addr) -+{ -+ HANDLE PipeHandle = NULL; -+ _adapter *padapter = pNdisCEDvice->padapter; -+ -+ -+ if(pNdisCEDvice->nr_endpoint == 11) -+ { -+ switch(addr) -+ { -+ case RTL8712_DMA_BEQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[3] ; -+ break; -+ case RTL8712_DMA_BKQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[4]; -+ break; -+ case RTL8712_DMA_VIQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[2]; -+ break; -+ case RTL8712_DMA_VOQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[1]; -+ break; -+ case RTL8712_DMA_BCNQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[6]; -+ break; -+ case RTL8712_DMA_BMCQ: //HI Queue -+ PipeHandle= padapter->halpriv.pipehdls_r8712[7]; -+ break; -+ case RTL8712_DMA_MGTQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[8]; -+ break; -+ case RTL8712_DMA_RX0FF: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[0]; -+ break; -+ case RTL8712_DMA_C2HCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[5]; -+ break; -+ case RTL8712_DMA_H2CCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[9]; -+ break; -+ -+ } -+ -+ } -+ else if(pNdisCEDvice->nr_endpoint == 6) -+ { -+ switch(addr) -+ { -+ case RTL8712_DMA_BEQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[3]; -+ break; -+ case RTL8712_DMA_BKQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[4]; -+ break; -+ case RTL8712_DMA_VIQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[2]; -+ break; -+ case RTL8712_DMA_VOQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[1]; -+ break; -+ case RTL8712_DMA_RX0FF: -+ case RTL8712_DMA_C2HCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[0]; -+ break; -+ case RTL8712_DMA_H2CCMD: -+ case RTL8712_DMA_BCNQ: -+ case RTL8712_DMA_BMCQ: -+ case RTL8712_DMA_MGTQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[5]; -+ break; -+ -+ } -+ -+ } -+ else if(pNdisCEDvice->nr_endpoint == 4) -+ { -+ switch(addr) -+ { -+ case RTL8712_DMA_BEQ: -+ //case RTL8712_DMA_BKQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[2]; -+ break; -+ //case RTL8712_DMA_VIQ: -+ case RTL8712_DMA_VOQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[1]; -+ break; -+ case RTL8712_DMA_RX0FF: -+ case RTL8712_DMA_C2HCMD: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[0]; -+ break; -+ case RTL8712_DMA_H2CCMD: -+ case RTL8712_DMA_BCNQ: -+ case RTL8712_DMA_BMCQ: -+ case RTL8712_DMA_MGTQ: -+ PipeHandle= padapter->halpriv.pipehdls_r8712[3]; -+ break; -+ } -+ -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("ffaddr2pipehdl():nr_endpoint=%d error!\n", pNdisCEDvice->nr_endpoint)); -+ } -+ -+ return PipeHandle; -+ -+} -+ -+ -+NTSTATUS usb_bulkout_zero_complete( -+ PDEVICE_OBJECT pUsbDevObj, -+ PIRP pIrp, void* pZeroContext) -+{ -+ struct zero_bulkout_context *pcontext = (struct zero_bulkout_context *)pZeroContext; -+ -+_func_enter_; -+ -+ if(pcontext) -+ { -+ if(pcontext->pbuf) -+ { -+ ExFreePool(pcontext->pbuf); -+ } -+ -+ if(pcontext->purb) -+ { -+ ExFreePool(pcontext->purb); -+ } -+ -+ if(pcontext->pirp && (pIrp ==pcontext->pirp)) -+ { -+ IoFreeIrp(pIrp); -+ } -+ -+ ExFreePool(pcontext); -+ } -+ -+_func_exit_; -+ -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ -+ -+} -+ -+u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ struct zero_bulkout_context *pcontext; -+ unsigned char *pbuf; -+ char NextDeviceStackSize, len; -+ PIO_STACK_LOCATION nextStack; -+ USBD_STATUS usbdstatus; -+ HANDLE PipeHandle; -+ PIRP pirp = NULL; -+ PURB purb = NULL; -+ NDIS_STATUS ndisStatus = NDIS_STATUS_SUCCESS; -+ _adapter *padapter = (_adapter *)pintfhdl->adapter; -+ struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv; -+ -+ -+_func_enter_; -+ -+ if((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ return _FAIL; -+ } -+ -+ len = 0; -+ NextDeviceStackSize = (char)pdvobj->nextdevstacksz; -+ -+ pcontext = (struct zero_bulkout_context *)ExAllocatePool(NonPagedPool, sizeof(struct zero_bulkout_context)); -+ pbuf = (unsigned char *)ExAllocatePool(NonPagedPool, sizeof(int)); -+ purb = (PURB)ExAllocatePool(NonPagedPool, sizeof(URB)); -+ pirp = IoAllocateIrp(NextDeviceStackSize, FALSE); -+ -+ pcontext->pbuf = pbuf; -+ pcontext->purb = purb; -+ pcontext->pirp = pirp; -+ pcontext->padapter = padapter; -+ -+ //translate DMA FIFO addr to pipehandle -+ PipeHandle = ffaddr2pipehdl(pdvobj, addr); -+ -+ -+ // Build our URB for USBD -+ UsbBuildInterruptOrBulkTransferRequest( -+ purb, -+ sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), -+ PipeHandle, -+ pbuf, -+ NULL, -+ len, -+ 0, -+ NULL); -+ -+ // -+ // call the calss driver to perform the operation -+ // pass the URB to the USB driver stack -+ // -+ nextStack = IoGetNextIrpStackLocation(pirp); -+ nextStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; -+ nextStack->Parameters.Others.Argument1 = purb; -+ nextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; -+ -+ //Set Completion Routine -+ IoSetCompletionRoutine(pirp, // irp to use -+ usb_bulkout_zero_complete, // callback routine -+ pcontext, // context -+ TRUE, // call on success -+ TRUE, // call on error -+ TRUE); // call on cancel -+ -+ -+ // Call IoCallDriver to send the irp to the usb bus driver -+ // -+ ndisStatus = IoCallDriver(pdvobj->pnextdevobj, pirp); -+ usbdstatus = URB_STATUS(purb); -+ -+ if( USBD_HALTED(usbdstatus) ) -+ { -+ padapter->bDriverStopped=_TRUE; -+ padapter->bSurpriseRemoved=_TRUE; -+ } -+ -+ // -+ // The usb bus driver should always return STATUS_PENDING when bulk out irp async -+ // -+ if ( ndisStatus != STATUS_PENDING ) -+ { -+ return _FAIL; -+ } -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+void usb_read_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+ _func_enter_; -+ -+ -+ -+ _func_exit_; -+} -+ -+NTSTATUS usb_write_mem_complete(PDEVICE_OBJECT pUsbDevObj, PIRP piowrite_irp, PVOID pusb_cnxt) -+{ -+ -+ _irqL irqL; -+ _list *head, *plist; -+ struct io_req *pio_req; -+ struct io_queue *pio_q = (struct io_queue *) pusb_cnxt; -+ struct intf_hdl *pintf = &(pio_q->intf); -+ struct intf_priv *pintfpriv = pintf->pintfpriv; -+ _adapter *padapter = (_adapter *)pintf->adapter; -+ NTSTATUS status = STATUS_SUCCESS; -+ -+ head = &(pio_q->processing); -+ -+ _func_enter_; -+ -+ _enter_critical_bh(&(pio_q->lock), &irqL); -+ -+ pintfpriv->io_irp_cnt--; -+ if(pintfpriv->io_irp_cnt ==0){ -+ _rtw_up_sema(&(pintfpriv->io_retevt)); -+ } -+ -+ pintfpriv->bio_irp_pending=_FALSE; -+ -+ switch(piowrite_irp->IoStatus.Status) -+ { -+ case STATUS_SUCCESS: -+ break; -+ -+ default: -+ padapter->bSurpriseRemoved=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usbAsynIntOutComplete:pioread_irp->IoStatus.Status !=STATUS_SUCCESS\n")); -+ break; -+ } -+ -+ //free irp in processing list... -+ while(rtw_is_list_empty(head) != _TRUE) -+ { -+ plist = get_next(head); -+ rtw_list_delete(plist); -+ pio_req = LIST_CONTAINOR(plist, struct io_req, list); -+ _rtw_up_sema(&pio_req->sema); -+ } -+ -+ _exit_critical_bh(&(pio_q->lock), &irqL); -+ -+ _func_exit_; -+ -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ -+} -+ -+void usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) -+{ -+ u32 bwritezero; -+ _irqL irqL; -+ USBD_STATUS usbdstatus; -+ PIO_STACK_LOCATION nextStack; -+ HANDLE PipeHandle; -+ struct io_req *pio_req; -+ -+ _adapter *adapter = (_adapter *)pintfhdl->adapter; -+ struct intf_priv *pintfpriv = pintfhdl->pintfpriv; -+ struct dvobj_priv *pdev = (struct dvobj_priv *)pintfpriv->intf_dev; -+ PURB piorw_urb = pintfpriv->piorw_urb; -+ PIRP piorw_irp = pintfpriv->piorw_irp; -+ struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; -+ NTSTATUS NtStatus = STATUS_SUCCESS; -+ -+ _func_enter_; -+ -+ pio_req = alloc_ioreq(pio_queue); -+ -+ if ((pio_req == NULL)||(adapter->bSurpriseRemoved)){ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("async_irp_write32 : pio_req =0x%x adapter->bSurpriseRemoved=0x%x",pio_req,adapter->bSurpriseRemoved )); -+ goto exit; -+ } -+ -+ _enter_critical_bh(&(pio_queue->lock), &irqL); -+ -+ rtw_list_insert_tail(&(pio_req->list),&(pio_queue->processing)); -+ -+ -+#ifdef NDIS51_MINIPORT -+ IoReuseIrp(piorw_irp, STATUS_SUCCESS); -+#else -+ piorw_irp->Cancel = _FALSE; -+#endif -+ -+ if((adapter->bDriverStopped) || (adapter->bSurpriseRemoved) ||(adapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\npadapter->pwrctrlpriv.pnp_bstop_trx==_TRUE\n")); -+ _func_exit_; -+ return; -+ } -+ -+ //translate DMA FIFO addr to pipehandle -+ PipeHandle = ffaddr2pipehdl(pdev, addr); -+ -+ -+ pintfpriv->io_irp_cnt++; -+ pintfpriv->bio_irp_pending=_TRUE; -+ // Build our URB for USBD -+ UsbBuildInterruptOrBulkTransferRequest( -+ piorw_urb, -+ sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), -+ PipeHandle, -+ (PVOID)wmem, -+ NULL, -+ cnt, -+ 0, -+ NULL); -+ -+ // -+ // call the calss driver to perform the operation -+ // pass the URB to the USB driver stack -+ // -+ nextStack = IoGetNextIrpStackLocation(piorw_irp); -+ nextStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; -+ nextStack->Parameters.Others.Argument1 = (PURB)piorw_urb; -+ nextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; -+ -+ IoSetCompletionRoutine( -+ piorw_irp, // irp to use -+ usb_write_mem_complete, // routine to call when irp is done -+ pio_queue, // context to pass routine -+ TRUE, // call on success -+ TRUE, // call on error -+ TRUE); // call on cancel -+ -+ // -+ // Call IoCallDriver to send the irp to the usb port -+ // -+ NtStatus = IoCallDriver(pdev->pnextdevobj, piorw_irp); -+ usbdstatus = URB_STATUS(piorw_urb); -+ -+ // -+ // The USB driver should always return STATUS_PENDING when -+ // it receives a write irp -+ // -+ if ((NtStatus != STATUS_PENDING) || USBD_HALTED(usbdstatus) ) { -+ -+ if( USBD_HALTED(usbdstatus) ) { -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_mem():USBD_HALTED(usbdstatus)=%X!\n",USBD_HALTED(usbdstatus)) ); -+ } -+ _func_exit_; -+ return;//STATUS_UNSUCCESSFUL; -+ } -+ -+ _exit_critical_bh(&(pio_queue->lock), &irqL); -+ -+ _rtw_down_sema(&pio_req->sema); -+ free_ioreq(pio_req, pio_queue); -+ -+ -+ bwritezero = _FALSE; -+ if (pdev->ishighspeed) -+ { -+ if(cnt> 0 && cnt%512 == 0) -+ bwritezero = _TRUE; -+ -+ } -+ else -+ { -+ if(cnt > 0 && cnt%64 == 0) -+ bwritezero = _TRUE; -+ } -+ -+ -+ if(bwritezero == _TRUE) -+ { -+ usb_bulkout_zero(pintfhdl, addr); -+ } -+ -+exit: -+ -+ _func_exit_; -+ -+} -+ -+NTSTATUS usb_read_port_complete(PDEVICE_OBJECT pUsbDevObj, PIRP pIrp, PVOID context) -+{ -+ uint isevt, *pbuf; -+ struct _URB_BULK_OR_INTERRUPT_TRANSFER *pbulkurb; -+ USBD_STATUS usbdstatus; -+ struct recv_buf *precvbuf = (struct recv_buf *)context; -+ _adapter *adapter =(_adapter *)precvbuf->adapter; -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ struct dvobj_priv *dev = (struct dvobj_priv *)&adapter->dvobjpriv; -+ PURB purb = precvbuf->purb; -+ struct intf_hdl *pintfhdl = &adapter->pio_queue->intf; -+ -+ //RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); -+ -+ usbdstatus = URB_STATUS(purb); -+ -+ _rtw_spinlock_ex(&precvpriv->lock); -+ precvbuf->irp_pending=_FALSE; -+ precvpriv->rx_pending_cnt --; -+ _rtw_spinunlock_ex(&precvpriv->lock); -+ -+ if(precvpriv->rx_pending_cnt== 0) { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: rx_pending_cnt== 0, set allrxreturnevt!\n")); -+ _rtw_up_sema(&precvpriv->allrxreturnevt); -+ } -+ -+ -+ if( pIrp->Cancel == _TRUE ) { -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: One IRP has been cancelled succesfully\n")); -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ } -+ if(adapter->bSurpriseRemoved) { -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved)); -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ } -+ -+ switch(pIrp->IoStatus.Status) -+ { -+ case STATUS_SUCCESS: -+ -+ pbulkurb = &(precvbuf->purb)->UrbBulkOrInterruptTransfer; -+ if((pbulkurb->TransferBufferLength >(MAX_RECVBUF_SZ)) || (pbulkurb->TransferBufferLength < RXDESC_SIZE) ) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_read_port_complete: (pbulkurb->TransferBufferLength > MAX_RECVBUF_SZ) || (pbulkurb->TransferBufferLength < RXDESC_SIZE)\n")); -+ rtw_read_port(adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ else -+ { -+ precvbuf->transfer_len = pbulkurb->TransferBufferLength; -+ -+ pbuf = (uint*)precvbuf->pbuf; -+ -+ if((isevt = *(pbuf+1)&0x1ff) == 0x1ff) -+ { -+ rxcmd_event_hdl(adapter, pbuf);//rx c2h events -+ -+ rtw_read_port(adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ else -+ { -+ if(recvbuf2recvframe(adapter, precvbuf)==_FAIL)//rx packets -+ { -+ //precvbuf->reuse = _TRUE; -+ rtw_read_port(adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ } -+ -+ } -+ -+ break; -+ -+ default: -+ -+ if( !USBD_HALTED(usbdstatus) ) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_read_port_complete():USBD_HALTED(usbdstatus)=%x (need to handle ) \n",USBD_HALTED(usbdstatus))); -+ -+ } -+ else -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_read_port_complete(): USBD_HALTED(usbdstatus)=%x \n\n", USBD_HALTED(usbdstatus)) ); -+ adapter->bDriverStopped = _TRUE; -+ adapter->bSurpriseRemoved = _TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete(): USBD_HALTED(usbdstatus)=%x \n\n", USBD_HALTED(usbdstatus))) ; -+ } -+ -+ break; -+ -+ } -+ -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ -+} -+ -+u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+ u8 *pdata; -+ u16 size; -+ PURB purb; -+ PIRP pirp; -+ PIO_STACK_LOCATION nextStack; -+ NTSTATUS ntstatus; -+ USBD_STATUS usbdstatus; -+ HANDLE PipeHandle; -+ struct recv_buf *precvbuf = (struct recv_buf *)rmem; -+ struct intf_priv *pintfpriv = pintfhdl->pintfpriv; -+ struct dvobj_priv *pdev = (struct dvobj_priv *)pintfpriv->intf_dev; -+ _adapter *adapter = (_adapter *)pdev->padapter; -+ struct recv_priv *precvpriv = &adapter->recvpriv; -+ u32 bResult = _FALSE; -+ -+_func_enter_; -+ -+ if(adapter->bDriverStopped || adapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx) { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ return bResult; -+ } -+ -+ if(precvbuf !=NULL) -+ { -+ -+ rtl8192cu_init_recvbuf(adapter, precvbuf); -+ -+ _rtw_spinlock(&precvpriv->lock); -+ precvpriv->rx_pending_cnt++; -+ precvbuf->irp_pending = _TRUE; -+ _rtw_spinunlock(&precvpriv->lock); -+ -+ pdata = (u8*)precvbuf->pbuf; -+ -+ size = sizeof( struct _URB_BULK_OR_INTERRUPT_TRANSFER ); -+ purb = precvbuf->purb; -+ -+ //translate DMA FIFO addr to pipehandle -+ PipeHandle = ffaddr2pipehdl(pdev, addr); -+ -+ UsbBuildInterruptOrBulkTransferRequest( -+ purb, -+ (USHORT)size, -+ PipeHandle, -+ pdata, -+ NULL, -+ MAX_RECVBUF_SZ, -+ USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, -+ NULL -+ ); -+ -+ pirp = precvbuf->pirp; -+ -+#if NDIS51_MINIPORT -+ IoReuseIrp(pirp, STATUS_SUCCESS); -+#else -+ pirp->Cancel = _FALSE; -+#endif -+ -+ // call the class driver to perform the operation -+ // and pass the URB to the USB driver stack -+ nextStack = IoGetNextIrpStackLocation(pirp); -+ nextStack->Parameters.Others.Argument1 = purb; -+ nextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; -+ nextStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; -+ -+ IoSetCompletionRoutine( -+ pirp, // irp to use -+ usb_read_port_complete, // routine to call when irp is done -+ precvbuf, // context to pass routine -+ TRUE, // call on success -+ TRUE, // call on error -+ TRUE); // call on cancel -+ -+ // -+ // The IoCallDriver routine -+ // sends an IRP to the driver associated with a specified device object. -+ // -+ ntstatus = IoCallDriver(pdev->pnextdevobj, pirp); -+ usbdstatus = URB_STATUS(purb); -+ -+ if( USBD_HALTED(usbdstatus) ) { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_read_port(): USBD_HALTED(usbdstatus=0x%.8x)=%.8x \n\n", usbdstatus, USBD_HALTED(usbdstatus))); -+ pdev->padapter->bDriverStopped=_TRUE; -+ pdev->padapter->bSurpriseRemoved=_TRUE; -+ } -+ -+ if( ntstatus == STATUS_PENDING ) -+ { -+ bResult = _TRUE;// The IRP is pended in USBD as we expected. -+ } -+ else { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port(): IoCallDriver failed!!! IRP STATUS: %X\n", ntstatus)); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port(): IoCallDriver failed!!! USB STATUS: %X\n", usbdstatus)); -+ } -+ -+ } -+ else{ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port:precv_frame ==NULL\n")); -+ } -+ -+_func_exit_; -+ -+ return bResult; -+ -+} -+ -+void usb_read_port_cancel(_adapter *padapter) -+{ -+ struct recv_buf *precvbuf; -+ sint i; -+ struct dvobj_priv *pdev = &padapter->dvobjpriv; -+ struct recv_priv *precvpriv=&padapter->recvpriv; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n ==>usb_read_port_cancel\n")); -+ -+ _rtw_spinlock(&precvpriv->lock); -+ precvpriv->rx_pending_cnt--; //decrease 1 for Initialize ++ -+ _rtw_spinunlock(&precvpriv->lock); -+ -+ if (precvpriv->rx_pending_cnt) -+ { -+ // Canceling Pending Recv Irp -+ precvbuf = (struct recv_buf *)precvpriv->precv_buf; -+ -+ for( i = 0; i < NR_RECVBUFF; i++ ) -+ { -+ if (precvbuf->irp_pending == _TRUE) -+ { -+ IoCancelIrp(precvbuf->pirp); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_cancel() :IoCancelIrp\n")); -+ } -+ -+ precvbuf++; -+ } -+ -+ _rtw_down_sema(&precvpriv->allrxreturnevt); -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_cancel:down sema\n")); -+ -+ } -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("<==usb_read_port_cancel\n")); -+ -+} -+ -+NTSTATUS usb_write_port_complete( -+ PDEVICE_OBJECT pUsbDevObj, -+ PIRP pIrp, -+ PVOID pTxContext -+) -+{ -+ u32 i, bIrpSuccess, sz; -+ NTSTATUS status = STATUS_SUCCESS; -+ u8 *ptr; -+ struct xmit_frame *pxmitframe = (struct xmit_frame *) pTxContext; -+ struct xmit_buf *pxmitbuf = pxmitframe->pxmitbuf; -+ _adapter *padapter = pxmitframe->padapter; -+ struct dvobj_priv *pdev = (struct dvobj_priv *)&padapter->dvobjpriv; -+ struct io_queue *pio_queue = (struct io_queue *)padapter->pio_queue; -+ struct intf_hdl *pintfhdl = &(pio_queue->intf); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("+usb_write_port_complete\n")); -+ -+ _rtw_spinlock_ex(&pxmitpriv->lock); -+ pxmitpriv->txirp_cnt--; -+ _rtw_spinunlock_ex(&pxmitpriv->lock); -+ -+ if(pxmitpriv->txirp_cnt==0){ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: txirp_cnt== 0, set allrxreturnevt!\n")); -+ _rtw_up_sema(&(pxmitpriv->tx_retevt)); -+ } -+ -+ status = pIrp->IoStatus.Status; -+ -+ if( status == STATUS_SUCCESS ) -+ bIrpSuccess = _TRUE; -+ else -+ bIrpSuccess = _FALSE; -+ -+ if( pIrp->Cancel == _TRUE ) -+ { -+ if(pxmitframe !=NULL) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_write_port_complete:pIrp->Cancel == _TRUE,(pxmitframe !=NULL\n")); -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ } -+ -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ } -+ -+ if(padapter->bSurpriseRemoved) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ } -+ -+ -+ // -+ // Send 0-byte here if necessary. -+ // -+ // -+ // 1. We MUST keep at most one IRP pending in each endpoint, otherwise USB host controler driver will hang. -+ // Besides, even 0-byte IRP shall be count into #IRP sent down, so, we send 0-byte here instead of TxFillDescriptor8187(). -+ // 2. If we don't count 0-byte IRP into an #IRP sent down, Tx will stuck when we download files via BT and -+ // play online video on XP SP1 EHCU. -+ // 2005.12.26, by rcnjko. -+ // -+ -+ -+ for(i=0; i< 8; i++) -+ { -+ if(pIrp == pxmitframe->pxmit_irp[i]) -+ { -+ pxmitframe->bpending[i] = _FALSE;// -+ //ac_tag = pxmitframe->ac_tag[i]; -+ sz = pxmitframe->sz[i]; -+ break; -+ } -+ } -+ -+#if 0 -+ pxmitframe->fragcnt--; -+ if(pxmitframe->fragcnt == 0)// if((pxmitframe->fragcnt == 0) && (pxmitframe->irpcnt == 8)){ -+ { -+ //RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_write_port_complete:pxmitframe->fragcnt == 0\n")); -+ rtw_free_xmitframe(pxmitpriv,pxmitframe); -+ } -+#else -+ -+ //not to consider tx fragment -+ rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+#endif -+ -+ rtl8192cu_xmitframe_complete(padapter, pxmitpriv, pxmitbuf); -+ -+_func_exit_; -+ -+ return STATUS_MORE_PROCESSING_REQUIRED; -+ -+} -+ -+u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) -+{ -+ u32 i, bwritezero; -+ u8 *ptr; -+ PIO_STACK_LOCATION nextStack; -+ USBD_STATUS usbdstatus; -+ HANDLE PipeHandle; -+ PIRP pirp = NULL; -+ PURB purb = NULL; -+ NDIS_STATUS ndisStatus = NDIS_STATUS_SUCCESS; -+ _adapter *padapter = (_adapter *)pintfhdl->adapter; -+ struct dvobj_priv *pNdisCEDvice = (struct dvobj_priv *)&padapter->dvobjpriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct xmit_frame *pxmitframe = (struct xmit_frame *)wmem; -+ -+_func_enter_; -+ -+ if((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ return _FAIL; -+ } -+ -+ -+ for(i=0; i<8; i++) -+ { -+ if(pxmitframe->bpending[i] == _FALSE) -+ { -+ _rtw_spinlock(&pxmitpriv->lock); -+ pxmitpriv->txirp_cnt++; -+ pxmitframe->bpending[i] = _TRUE; -+ _rtw_spinunlock(&pxmitpriv->lock); -+ -+ pxmitframe->sz[i] = cnt; -+ purb = pxmitframe->pxmit_urb[i]; -+ pirp = pxmitframe->pxmit_irp[i]; -+ -+ //pxmitframe->ac_tag[i] = ac_tag; -+ -+ break; -+ } -+ } -+ -+ bwritezero = _FALSE; -+ if (pNdisCEDvice->ishighspeed) -+ { -+ if(cnt> 0 && cnt%512 == 0) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("ishighspeed, cnt=%d\n", cnt)); -+ //cnt=cnt+1; -+ bwritezero = _TRUE; -+ } -+ } -+ else -+ { -+ if(cnt > 0 && cnt%64 == 0) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cnt=%d\n", cnt)); -+ //cnt=cnt+1; -+ bwritezero = _TRUE; -+ } -+ } -+ -+ -+#ifdef NDIS51_MINIPORT -+ IoReuseIrp(pirp, STATUS_SUCCESS); -+#else -+ pirp->Cancel = _FALSE; -+#endif -+ -+ -+ //translate DMA FIFO addr to pipehandle -+ PipeHandle = ffaddr2pipehdl(pNdisCEDvice, addr); -+ -+ -+ // Build our URB for USBD -+ UsbBuildInterruptOrBulkTransferRequest( -+ purb, -+ sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), -+ PipeHandle, -+ pxmitframe->mem_addr, -+ NULL, -+ cnt, -+ 0, -+ NULL); -+ -+ // -+ // call the calss driver to perform the operation -+ // pass the URB to the USB driver stack -+ // -+ nextStack = IoGetNextIrpStackLocation(pirp); -+ nextStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; -+ nextStack->Parameters.Others.Argument1 = purb; -+ nextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; -+ -+ //Set Completion Routine -+ IoSetCompletionRoutine(pirp, // irp to use -+ usb_write_port_complete, // callback routine -+ pxmitframe, // context -+ TRUE, // call on success -+ TRUE, // call on error -+ TRUE); // call on cancel -+ -+ -+ // Call IoCallDriver to send the irp to the usb bus driver -+ // -+ ndisStatus = IoCallDriver(pNdisCEDvice->pnextdevobj, pirp); -+ usbdstatus = URB_STATUS(purb); -+ -+ if( USBD_HALTED(usbdstatus) ) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_write_port(): USBD_HALTED(usbdstatus)=%x set bDriverStopped TRUE!\n\n",USBD_HALTED(usbdstatus)) ); -+ padapter->bDriverStopped=_TRUE; -+ padapter->bSurpriseRemoved=_TRUE; -+ } -+ -+ // -+ // The usb bus driver should always return STATUS_PENDING when bulk out irp async -+ // -+ if ( ndisStatus != STATUS_PENDING ) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("\n usb_write_port(): ndisStatus(%x) != STATUS_PENDING!\n\n", ndisStatus)); -+ -+ _func_exit_; -+ -+ return _FAIL; -+ } -+ -+ if(bwritezero == _TRUE) -+ { -+ usb_bulkout_zero(pintfhdl, addr); -+ } -+ -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+} -+ -+ -+void usb_write_port_cancel(_adapter *padapter) -+{ -+ -+ sint i,j; -+ struct dvobj_priv *pdev = &padapter->dvobjpriv; -+ struct xmit_priv *pxmitpriv=&padapter->xmitpriv; -+ struct xmit_frame *pxmitframe; -+ -+ _rtw_spinlock(&pxmitpriv->lock); -+ pxmitpriv->txirp_cnt--; //decrease 1 for Initialize ++ -+ _rtw_spinunlock(&pxmitpriv->lock); -+ -+ if (pxmitpriv->txirp_cnt) -+ { -+ // Canceling Pending Recv Irp -+ pxmitframe= (struct xmit_frame *)pxmitpriv->pxmit_frame_buf; -+ -+ for( i = 0; i < NR_XMITFRAME; i++ ) -+ { -+ for(j=0;j<8;j++) -+ { -+ if (pxmitframe->bpending[j]==_TRUE) -+ { -+ IoCancelIrp(pxmitframe->pxmit_irp[j]); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,(" usb_write_port_cancel() :IoCancelIrp\n")); -+ -+ } -+ } -+ -+ pxmitframe++; -+ } -+ -+ _rtw_down_sema(&(pxmitpriv->tx_retevt)); -+ -+ } -+ -+} -+ -+ -+/*! \brief Wrap the pUrb to an IRP and send this IRP to Bus Driver. Then wait for this IRP completion. -+ The Caller shall be at Passive Level. -+*/ -+NTSTATUS sync_callusbd(struct dvobj_priv *pdvobjpriv, PURB purb) -+{ -+ -+ KEVENT kevent; -+ PIRP irp; -+ IO_STATUS_BLOCK iostatusblock; -+ PIO_STACK_LOCATION nextstack; -+ USBD_STATUS usbdstatus; -+ LARGE_INTEGER waittime; -+ NTSTATUS ntstatus = STATUS_SUCCESS; -+ _adapter *padapter = pdvobjpriv->padapter; -+ -+ -+ _func_enter_; -+ -+// if(padapter->bDriverStopped) { -+// goto exit; -+// } -+ -+ KeInitializeEvent(&kevent, NotificationEvent, _FALSE); -+ irp = IoBuildDeviceIoControlRequest( -+ IOCTL_INTERNAL_USB_SUBMIT_URB, -+ pdvobjpriv->pphysdevobj,//CEdevice->pUsbDevObj, -+ NULL, -+ 0, -+ NULL, -+ 0, -+ _TRUE, -+ &kevent, -+ &iostatusblock); -+ -+ if(irp == NULL) { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("SyncCallUSBD: memory alloc for irp failed\n")); -+ ntstatus=STATUS_INSUFFICIENT_RESOURCES; -+ goto exit; -+ } -+ -+ nextstack = IoGetNextIrpStackLocation(irp); -+ if(nextstack == NULL) -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("IoGetNextIrpStackLocation fail\n")); -+ -+ nextstack->Parameters.Others.Argument1 = purb; -+ -+ // Issue an IRP for Sync IO. -+ ntstatus = IoCallDriver(pdvobjpriv->pphysdevobj, irp); -+ usbdstatus = URB_STATUS(purb); -+ -+ if(ntstatus == STATUS_PENDING) -+ { -+ // Method 1 -+ waittime.QuadPart = -10000 * 50000; -+ ntstatus = KeWaitForSingleObject(&kevent, Executive, KernelMode, _FALSE, &waittime); //8150 code -+ -+ // Method 2 -+ //ntStatus = KeWaitForSingleObject(&Kevent, Executive, KernelMode, FALSE, NULL); //DDK sample -+ -+ usbdstatus = URB_STATUS(purb); -+ -+ if(ntstatus == STATUS_TIMEOUT) -+ { -+ //usbdevice->nIoStuckCnt++; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("SyncCallUSBD: TIMEOUT....5000ms\n")); -+ -+ // Method 2 -+ IoCancelIrp(irp); -+ ntstatus = KeWaitForSingleObject(&kevent, Executive, KernelMode, _FALSE, NULL); //DDK sample -+ usbdstatus = URB_STATUS(purb); -+ -+ usbdstatus = USBD_STATUS_SUCCESS; -+ } -+ -+ } -+ -+exit: -+ -+ _func_exit_; -+ -+ return ntstatus; -+ -+} -+int usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype) -+{ -+ PURB purb; -+ u8 ret; -+ unsigned long transferflags; -+ NTSTATUS ntstatus; -+ -+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)pintfpriv->intf_dev; -+ -+ _func_enter_; -+ -+ ret=_TRUE; -+ purb = (PURB)ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST) ); -+ if(purb == NULL) { -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq(): Failed to allocate urb !!!\n")); -+ ret =_FALSE; -+ goto exit; -+ } -+ -+ if (requesttype == 0x01) { -+ transferflags = USBD_TRANSFER_DIRECTION_IN;//read_in -+ } else { -+ transferflags= 0;//write_out -+ } -+ -+ UsbBuildVendorRequest( -+ purb, //Pointer to an URB that is to be formatted as a vendor or class request. -+ URB_FUNCTION_VENDOR_DEVICE, //Indicates the URB is a vendor-defined request for a USB device. -+ sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), //Specifies the length, in bytes, of the URB. -+ transferflags, //TransferFlags -+ 0, //ReservedBits -+ request, //Request -+ value, //Value -+ index, //Index -+ pdata, //TransferBuffer -+ NULL, //TransferBufferMDL -+ len, //TransferBufferLength -+ NULL //Link -+ ); -+ -+ ntstatus = sync_callusbd(pdvobjpriv, purb); -+ if(!NT_SUCCESS(ntstatus)) -+ { -+ ExFreePool(purb); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,(" usbctrl_vendorreq() : SOMETHING WRONG\n") ); -+ ret = _FALSE; -+ goto exit; -+ } -+ -+ ExFreePool(purb); -+ -+exit: -+ _func_exit_; -+ -+ return ret; -+ -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0 -@@ -0,0 +1,4 @@ -+#DHCP client -+DEVICE=wlan0 -+BOOTPROTO=dhcp -+ONBOOT=yes -\ No newline at end of file ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h -@@ -0,0 +1,85 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __INC_HAL8192CE_FW_IMG_H -+#define __INC_HAL8192CE_FW_IMG_H -+ -+#include -+ -+/*Created on 2011/ 6/15, 5:45*/ -+ -+#ifdef CONFIG_BT_COEXISTENCE -+#define TSMCImgArrayLength 15706 //v84 TSMC COMMON 2012-04-13 -+#else //#ifdef CONFIG_P2P -+#define TSMCImgArrayLength 16126 //v88 TSMC P2PPS with CCX report C2H 2012-12-05 -+#endif -+extern u8 Rtl8192CEFwTSMCImgArray[TSMCImgArrayLength]; -+ -+#ifdef CONFIG_BT_COEXISTENCE -+#define UMCACutImgArrayLength 16248 //v79 UMC A Cut COMMON 2011-10-06 -+#else //#ifdef CONFIG_P2P -+#define UMCACutImgArrayLength 16126 //v88 UMC A Cut P2PPS with CCX report C2H 2012-12-05 -+#endif -+extern u8 Rtl8192CEFwUMCACutImgArray[UMCACutImgArrayLength]; -+ -+#ifdef CONFIG_BT_COEXISTENCE -+#define UMCBCutImgArrayLength 15686 //v84 UMC B Cut COMMON 2012-04-13 -+#else //#ifdef CONFIG_P2P -+#define UMCBCutImgArrayLength 16096 //v88 UMC B Cut P2PPS with CCX report C2H 2012-12-05 -+#endif -+extern u8 Rtl8192CEFwUMCBCutImgArray[UMCBCutImgArrayLength]; -+ -+//8192C_Formal_92CE_PHYforMP_110804 2011-11-23 -+//8188C_Formal_88CE_PHYforMP_111117 2011-11-23 -+ -+#define PHY_REG_2TArrayLength 374 -+extern u32 Rtl8192CEPHY_REG_2TArray[PHY_REG_2TArrayLength]; -+#define PHY_REG_1TArrayLength 374 -+extern u32 Rtl8192CEPHY_REG_1TArray[PHY_REG_1TArrayLength]; -+#define PHY_ChangeTo_1T1RArrayLength 1 -+extern u32 Rtl8192CEPHY_ChangeTo_1T1RArray[PHY_ChangeTo_1T1RArrayLength]; -+#define PHY_ChangeTo_1T2RArrayLength 1 -+extern u32 Rtl8192CEPHY_ChangeTo_1T2RArray[PHY_ChangeTo_1T2RArrayLength]; -+#define PHY_ChangeTo_2T2RArrayLength 1 -+extern u32 Rtl8192CEPHY_ChangeTo_2T2RArray[PHY_ChangeTo_2T2RArrayLength]; -+#define PHY_REG_Array_PGLength 336 -+extern u32 Rtl8192CEPHY_REG_Array_PG[PHY_REG_Array_PGLength]; -+#define PHY_REG_Array_MPLength 4 -+extern u32 Rtl8192CEPHY_REG_Array_MP[PHY_REG_Array_MPLength]; -+#define RadioA_2TArrayLength 282 -+extern u32 Rtl8192CERadioA_2TArray[RadioA_2TArrayLength]; -+#define RadioB_2TArrayLength 78 -+extern u32 Rtl8192CERadioB_2TArray[RadioB_2TArrayLength]; -+#define RadioA_1TArrayLength 282 -+extern u32 Rtl8192CERadioA_1TArray[RadioA_1TArrayLength]; -+#define RadioB_1TArrayLength 1 -+extern u32 Rtl8192CERadioB_1TArray[RadioB_1TArrayLength]; -+#define RadioB_GM_ArrayLength 1 -+extern u32 Rtl8192CERadioB_GM_Array[RadioB_GM_ArrayLength]; -+// MAC reg V14 - 2011-11-23 -+#define MAC_2T_ArrayLength 174 -+extern u32 Rtl8192CEMAC_2T_Array[MAC_2T_ArrayLength]; -+#define MACPHY_Array_PGLength 1 -+extern u32 Rtl8192CEMACPHY_Array_PG[MACPHY_Array_PGLength]; -+#define AGCTAB_2TArrayLength 320 -+extern u32 Rtl8192CEAGCTAB_2TArray[AGCTAB_2TArrayLength]; -+#define AGCTAB_1TArrayLength 320 -+extern u32 Rtl8192CEAGCTAB_1TArray[AGCTAB_1TArrayLength]; -+ -+#endif //__INC_HAL8192CE_FW_IMG_H ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h -@@ -0,0 +1,428 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/***************************************************************************** -+ * Module: __INC_HAL8192CPHYCFG_H -+ * -+ * -+ * Note: -+ * -+ * -+ * Export: Constants, macro, functions(API), global variables(None). -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. -+ * 2. Reorganize code architecture. -+ * -+ *****************************************************************************/ -+ /* Check to see if the file has been included already. */ -+#ifndef __INC_HAL8192CPHYCFG_H -+#define __INC_HAL8192CPHYCFG_H -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+#define LOOP_LIMIT 5 -+#define MAX_STALL_TIME 50 //us -+#define AntennaDiversityValue 0x80 //(Adapter->bSoftwareAntennaDiversity ? 0x00:0x80) -+#define MAX_TXPWR_IDX_NMODE_92S 63 -+#define Reset_Cnt_Limit 3 -+ -+#define IQK_MAC_REG_NUM 4 -+#define IQK_ADDA_REG_NUM 16 -+#define IQK_BB_REG_NUM 9 -+#define HP_THERMAL_NUM 8 -+ -+#ifdef CONFIG_PCI_HCI -+#define MAX_AGGR_NUM 0x0A0A -+#else -+#define MAX_AGGR_NUM 0x0909 -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+#define SET_RTL8192SE_RF_SLEEP(_pAdapter) \ -+{ \ -+ u1Byte u1bTmp; \ -+ u1bTmp = PlatformEFIORead1Byte(_pAdapter, REG_LDOV12D_CTRL); \ -+ u1bTmp |= BIT0; \ -+ PlatformEFIOWrite1Byte(_pAdapter, REG_LDOV12D_CTRL, u1bTmp); \ -+ PlatformEFIOWrite1Byte(_pAdapter, REG_SPS_OCP_CFG, 0x0); \ -+ PlatformEFIOWrite1Byte(_pAdapter, TXPAUSE, 0xFF); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x57FC); \ -+ delay_us(100); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x77FC); \ -+ PlatformEFIOWrite1Byte(_pAdapter, PHY_CCA, 0x0); \ -+ delay_us(10); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x37FC); \ -+ delay_us(10); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x77FC); \ -+ delay_us(10); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x57FC); \ -+} -+#endif -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+/*------------------------------Define structure----------------------------*/ -+typedef enum _SwChnlCmdID{ -+ CmdID_End, -+ CmdID_SetTxPowerLevel, -+ CmdID_BBRegWrite10, -+ CmdID_WritePortUlong, -+ CmdID_WritePortUshort, -+ CmdID_WritePortUchar, -+ CmdID_RF_WriteReg, -+}SwChnlCmdID; -+ -+ -+/* 1. Switch channel related */ -+typedef struct _SwChnlCmd{ -+ SwChnlCmdID CmdID; -+ u32 Para1; -+ u32 Para2; -+ u32 msDelay; -+}SwChnlCmd; -+ -+typedef enum _HW90_BLOCK{ -+ HW90_BLOCK_MAC = 0, -+ HW90_BLOCK_PHY0 = 1, -+ HW90_BLOCK_PHY1 = 2, -+ HW90_BLOCK_RF = 3, -+ HW90_BLOCK_MAXIMUM = 4, // Never use this -+}HW90_BLOCK_E, *PHW90_BLOCK_E; -+ -+#define RF_PATH_MAX 2 -+ -+#define CHANNEL_MAX_NUMBER 14 // 14 is the max channel number -+#define CHANNEL_GROUP_MAX 3 // ch1~3, ch4~9, ch10~14 total three groups -+ -+typedef enum _WIRELESS_MODE { -+ WIRELESS_MODE_UNKNOWN = 0x00, -+ WIRELESS_MODE_A = 0x01, -+ WIRELESS_MODE_B = 0x02, -+ WIRELESS_MODE_G = 0x04, -+ WIRELESS_MODE_AUTO = 0x08, -+ WIRELESS_MODE_N_24G = 0x10, -+ WIRELESS_MODE_N_5G = 0x20 -+} WIRELESS_MODE; -+ -+typedef enum _BaseBand_Config_Type{ -+ BaseBand_Config_PHY_REG = 0, //Radio Path A -+ BaseBand_Config_AGC_TAB = 1, //Radio Path B -+}BaseBand_Config_Type, *PBaseBand_Config_Type; -+ -+ -+typedef enum _PHY_Rate_Tx_Power_Offset_Area{ -+ RA_OFFSET_LEGACY_OFDM1, -+ RA_OFFSET_LEGACY_OFDM2, -+ RA_OFFSET_HT_OFDM1, -+ RA_OFFSET_HT_OFDM2, -+ RA_OFFSET_HT_OFDM3, -+ RA_OFFSET_HT_OFDM4, -+ RA_OFFSET_HT_CCK, -+}RA_OFFSET_AREA,*PRA_OFFSET_AREA; -+ -+ -+/* BB/RF related */ -+typedef enum _RF_TYPE_8190P{ -+ RF_TYPE_MIN, // 0 -+ RF_8225=1, // 1 11b/g RF for verification only -+ RF_8256=2, // 2 11b/g/n -+ RF_8258=3, // 3 11a/b/g/n RF -+ RF_6052=4, // 4 11b/g/n RF -+ //RF_6052=5, // 4 11b/g/n RF -+ // TODO: We sholud remove this psudo PHY RF after we get new RF. -+ RF_PSEUDO_11N=5, // 5, It is a temporality RF. -+}RF_TYPE_8190P_E,*PRF_TYPE_8190P_E; -+ -+typedef struct _BB_REGISTER_DEFINITION{ -+ u32 rfintfs; // set software control: -+ // 0x870~0x877[8 bytes] -+ -+ u32 rfintfi; // readback data: -+ // 0x8e0~0x8e7[8 bytes] -+ -+ u32 rfintfo; // output data: -+ // 0x860~0x86f [16 bytes] -+ -+ u32 rfintfe; // output enable: -+ // 0x860~0x86f [16 bytes] -+ -+ u32 rf3wireOffset; // LSSI data: -+ // 0x840~0x84f [16 bytes] -+ -+ u32 rfLSSI_Select; // BB Band Select: -+ // 0x878~0x87f [8 bytes] -+ -+ u32 rfTxGainStage; // Tx gain stage: -+ // 0x80c~0x80f [4 bytes] -+ -+ u32 rfHSSIPara1; // wire parameter control1 : -+ // 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes] -+ -+ u32 rfHSSIPara2; // wire parameter control2 : -+ // 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes] -+ -+ u32 rfSwitchControl; //Tx Rx antenna control : -+ // 0x858~0x85f [16 bytes] -+ -+ u32 rfAGCControl1; //AGC parameter control1 : -+ // 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes] -+ -+ u32 rfAGCControl2; //AGC parameter control2 : -+ // 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] -+ -+ u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix : -+ // 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] -+ -+ u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter : -+ // 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes] -+ -+ u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix -+ // 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes] -+ -+ u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type -+ // 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] -+ -+ u32 rfLSSIReadBack; //LSSI RF readback data SI mode -+ // 0x8a0~0x8af [16 bytes] -+ -+ u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B -+ -+}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T; -+ -+#ifdef CONFIG_MP_INCLUDED -+typedef enum _ANTENNA_PATH{ -+ ANTENNA_NONE = 0x00, -+ ANTENNA_D , -+ ANTENNA_C , -+ ANTENNA_CD , -+ ANTENNA_B , -+ ANTENNA_BD , -+ ANTENNA_BC , -+ ANTENNA_BCD , -+ ANTENNA_A , -+ ANTENNA_AD , -+ ANTENNA_AC , -+ ANTENNA_ACD , -+ ANTENNA_AB , -+ ANTENNA_ABD , -+ ANTENNA_ABC , -+ ANTENNA_ABCD -+} ANTENNA_PATH; -+#endif -+ -+typedef struct _R_ANTENNA_SELECT_OFDM{ -+ u32 r_tx_antenna:4; -+ u32 r_ant_l:4; -+ u32 r_ant_non_ht:4; -+ u32 r_ant_ht1:4; -+ u32 r_ant_ht2:4; -+ u32 r_ant_ht_s1:4; -+ u32 r_ant_non_ht_s1:4; -+ u32 OFDM_TXSC:2; -+ u32 Reserved:2; -+}R_ANTENNA_SELECT_OFDM; -+ -+typedef struct _R_ANTENNA_SELECT_CCK{ -+ u8 r_cckrx_enable_2:2; -+ u8 r_cckrx_enable:2; -+ u8 r_ccktx_enable:4; -+}R_ANTENNA_SELECT_CCK; -+ -+/*------------------------------Define structure----------------------------*/ -+ -+ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export global variable----------------------------*/ -+ -+ -+/*------------------------Export Marco Definition---------------------------*/ -+/*------------------------Export Marco Definition---------------------------*/ -+ -+ -+/*--------------------------Exported Function prototype---------------------*/ -+// -+// BB and RF register read/write -+// -+u32 rtl8192c_PHY_QueryBBReg( IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask ); -+void rtl8192c_PHY_SetBBReg( IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data ); -+u32 rtl8192c_PHY_QueryRFReg( IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 RegAddr, -+ IN u32 BitMask ); -+void rtl8192c_PHY_SetRFReg( IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data ); -+ -+// -+// Initialization related function -+// -+/* MAC/BB/RF HAL config */ -+int PHY_MACConfig8192C( IN PADAPTER Adapter ); -+int PHY_BBConfig8192C( IN PADAPTER Adapter ); -+int PHY_RFConfig8192C( IN PADAPTER Adapter ); -+/* RF config */ -+int rtl8192c_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, -+ IN u8* pFileName, -+ IN RF_RADIO_PATH_E eRFPath); -+int rtl8192c_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath); -+ -+/* BB/RF readback check for making sure init OK */ -+int rtl8192c_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, -+ IN HW90_BLOCK_E CheckBlock, -+ IN RF_RADIO_PATH_E eRFPath ); -+/* Read initi reg value for tx power setting. */ -+void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); -+ -+// -+// RF Power setting -+// -+//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, -+// IN RT_RF_POWER_STATE eRFPowerState); -+ -+// -+// BB TX Power R/W -+// -+void PHY_GetTxPowerLevel8192C( IN PADAPTER Adapter, -+ OUT u32* powerlevel ); -+void PHY_SetTxPowerLevel8192C( IN PADAPTER Adapter, -+ IN u8 channel ); -+BOOLEAN PHY_UpdateTxPowerDbm8192C( IN PADAPTER Adapter, -+ IN int powerInDbm ); -+ -+// -+VOID -+PHY_ScanOperationBackup8192C(IN PADAPTER Adapter, -+ IN u8 Operation ); -+ -+// -+// Switch bandwidth for 8192S -+// -+//extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -+void PHY_SetBWMode8192C( IN PADAPTER pAdapter, -+ IN HT_CHANNEL_WIDTH ChnlWidth, -+ IN unsigned char Offset ); -+ -+// -+// Set FW CMD IO for 8192S. -+// -+//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, -+// IN IO_TYPE IOType); -+ -+// -+// Set A2 entry to fw for 8192S -+// -+extern void FillA2Entry8192C( IN PADAPTER Adapter, -+ IN u8 index, -+ IN u8* val); -+ -+ -+// -+// channel switch related funciton -+// -+//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -+void PHY_SwChnl8192C( IN PADAPTER pAdapter, -+ IN u8 channel ); -+ // Call after initialization -+void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, -+ IN u8 channel ); -+ -+void ChkFwCmdIoDone( IN PADAPTER Adapter); -+ -+#ifdef USE_WORKITEM -+//extern void SetIOWorkItemCallback( IN PVOID pContext ); -+#else -+//extern void SetIOTimerCallback( IN PRT_TIMER pTimer); -+#endif -+ -+// -+// BB/MAC/RF other monitor API -+// -+void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, -+ IN BOOLEAN bEnableMonitorMode ); -+ -+BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, -+ IN u32 eRFPath ); -+ -+// -+// IQ calibrate -+// -+VOID rtl8192c_PHY_IQCalibrate( IN PADAPTER pAdapter , IN BOOLEAN bReCovery); -+ -+// -+// LC calibrate -+// -+VOID rtl8192c_PHY_LCCalibrate(IN PADAPTER pAdapter); -+ -+// -+// AP calibrate -+// -+VOID rtl8192c_PHY_APCalibrate(IN PADAPTER pAdapter, IN char delta); -+ -+VOID rtl8192c_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); -+ -+// -+// Modify the value of the hw register when beacon interval be changed. -+// -+void -+rtl8192c_PHY_SetBeaconHwReg( IN PADAPTER Adapter, -+ IN u16 BeaconInterval ); -+ -+ -+extern VOID -+PHY_SwitchEphyParameter( -+ IN PADAPTER Adapter -+ ); -+ -+extern VOID -+PHY_EnableHostClkReq( -+ IN PADAPTER Adapter -+ ); -+ -+BOOLEAN -+SetAntennaConfig92C( -+ IN PADAPTER Adapter, -+ IN u8 DefaultAnt -+ ); -+ -+ -+/*--------------------------Exported Function prototype---------------------*/ -+ -+#define PHY_QueryBBReg(Adapter, RegAddr, BitMask) rtl8192c_PHY_QueryBBReg((Adapter), (RegAddr), (BitMask)) -+#define PHY_SetBBReg(Adapter, RegAddr, BitMask, Data) rtl8192c_PHY_SetBBReg((Adapter), (RegAddr), (BitMask), (Data)) -+#define PHY_QueryRFReg(Adapter, eRFPath, RegAddr, BitMask) rtl8192c_PHY_QueryRFReg((Adapter), (eRFPath), (RegAddr), (BitMask)) -+#define PHY_SetRFReg(Adapter, eRFPath, RegAddr, BitMask, Data) rtl8192c_PHY_SetRFReg((Adapter), (eRFPath), (RegAddr), (BitMask), (Data)) -+ -+#define PHY_SetMacReg PHY_SetBBReg -+ -+#endif // __INC_HAL8192CPHYCFG_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h -@@ -0,0 +1,1123 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/***************************************************************************** -+ * -+ * Module: __INC_HAL8192CPHYREG_H -+ * -+ * -+ * Note: 1. Define PMAC/BB register map -+ * 2. Define RF register map -+ * 3. PMAC/BB register bit mask. -+ * 4. RF reg bit mask. -+ * 5. Other BB/RF relative definition. -+ * -+ * -+ * Export: Constants, macro, functions(API), global variables(None). -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. -+ * 2. Reorganize code architecture. -+ * 09/25/2008 MH 1. Add RL6052 register definition -+ * -+ *****************************************************************************/ -+#ifndef __INC_HAL8192CPHYREG_H -+#define __INC_HAL8192CPHYREG_H -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+//============================================================ -+// 8192S Regsiter offset definition -+//============================================================ -+ -+// -+// BB-PHY register PMAC 0x100 PHY 0x800 - 0xEFF -+// 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF -+// 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 -+// 3. RF register 0x00-2E -+// 4. Bit Mask for BB/RF register -+// 5. Other defintion for BB/RF R/W -+// -+ -+ -+// -+// 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF -+// 1. Page1(0x100) -+// -+#define rPMAC_Reset 0x100 -+#define rPMAC_TxStart 0x104 -+#define rPMAC_TxLegacySIG 0x108 -+#define rPMAC_TxHTSIG1 0x10c -+#define rPMAC_TxHTSIG2 0x110 -+#define rPMAC_PHYDebug 0x114 -+#define rPMAC_TxPacketNum 0x118 -+#define rPMAC_TxIdle 0x11c -+#define rPMAC_TxMACHeader0 0x120 -+#define rPMAC_TxMACHeader1 0x124 -+#define rPMAC_TxMACHeader2 0x128 -+#define rPMAC_TxMACHeader3 0x12c -+#define rPMAC_TxMACHeader4 0x130 -+#define rPMAC_TxMACHeader5 0x134 -+#define rPMAC_TxDataType 0x138 -+#define rPMAC_TxRandomSeed 0x13c -+#define rPMAC_CCKPLCPPreamble 0x140 -+#define rPMAC_CCKPLCPHeader 0x144 -+#define rPMAC_CCKCRC16 0x148 -+#define rPMAC_OFDMRxCRC32OK 0x170 -+#define rPMAC_OFDMRxCRC32Er 0x174 -+#define rPMAC_OFDMRxParityEr 0x178 -+#define rPMAC_OFDMRxCRC8Er 0x17c -+#define rPMAC_CCKCRxRC16Er 0x180 -+#define rPMAC_CCKCRxRC32Er 0x184 -+#define rPMAC_CCKCRxRC32OK 0x188 -+#define rPMAC_TxStatus 0x18c -+ -+// -+// 2. Page2(0x200) -+// -+// The following two definition are only used for USB interface. -+#define RF_BB_CMD_ADDR 0x02c0 // RF/BB read/write command address. -+#define RF_BB_CMD_DATA 0x02c4 // RF/BB read/write command data. -+ -+// -+// 3. Page8(0x800) -+// -+#define rFPGA0_RFMOD 0x800 //RF mode & CCK TxSC // RF BW Setting?? -+ -+#define rFPGA0_TxInfo 0x804 // Status report?? -+#define rFPGA0_PSDFunction 0x808 -+ -+#define rFPGA0_TxGainStage 0x80c // Set TX PWR init gain? -+ -+#define rFPGA0_RFTiming1 0x810 // Useless now -+#define rFPGA0_RFTiming2 0x814 -+ -+#define rFPGA0_XA_HSSIParameter1 0x820 // RF 3 wire register -+#define rFPGA0_XA_HSSIParameter2 0x824 -+#define rFPGA0_XB_HSSIParameter1 0x828 -+#define rFPGA0_XB_HSSIParameter2 0x82c -+#define rTxAGC_B_Rate18_06 0x830 -+#define rTxAGC_B_Rate54_24 0x834 -+#define rTxAGC_B_CCK1_55_Mcs32 0x838 -+#define rTxAGC_B_Mcs03_Mcs00 0x83c -+ -+#define rTxAGC_B_Mcs07_Mcs04 0x848 -+#define rTxAGC_B_Mcs11_Mcs08 0x84c -+ -+#define rFPGA0_XA_LSSIParameter 0x840 -+#define rFPGA0_XB_LSSIParameter 0x844 -+ -+#define rFPGA0_RFWakeUpParameter 0x850 // Useless now -+#define rFPGA0_RFSleepUpParameter 0x854 -+ -+#define rFPGA0_XAB_SwitchControl 0x858 // RF Channel switch -+#define rFPGA0_XCD_SwitchControl 0x85c -+ -+#define rFPGA0_XA_RFInterfaceOE 0x860 // RF Channel switch -+#define rFPGA0_XB_RFInterfaceOE 0x864 -+ -+#define rTxAGC_B_Mcs15_Mcs12 0x868 -+#define rTxAGC_B_CCK11_A_CCK2_11 0x86c -+ -+#define rFPGA0_XAB_RFInterfaceSW 0x870 // RF Interface Software Control -+#define rFPGA0_XCD_RFInterfaceSW 0x874 -+ -+#define rFPGA0_XAB_RFParameter 0x878 // RF Parameter -+#define rFPGA0_XCD_RFParameter 0x87c -+ -+#define rFPGA0_AnalogParameter1 0x880 // Crystal cap setting RF-R/W protection for parameter4?? -+#define rFPGA0_AnalogParameter2 0x884 -+#define rFPGA0_AnalogParameter3 0x888 // Useless now -+#define rFPGA0_AnalogParameter4 0x88c -+ -+#define rFPGA0_XA_LSSIReadBack 0x8a0 // Tranceiver LSSI Readback -+#define rFPGA0_XB_LSSIReadBack 0x8a4 -+#define rFPGA0_XC_LSSIReadBack 0x8a8 -+#define rFPGA0_XD_LSSIReadBack 0x8ac -+ -+#define rFPGA0_PSDReport 0x8b4 // Useless now -+#define TransceiverA_HSPI_Readback 0x8b8 // Transceiver A HSPI Readback -+#define TransceiverB_HSPI_Readback 0x8bc // Transceiver B HSPI Readback -+#define rFPGA0_XAB_RFInterfaceRB 0x8e0 // Useless now // RF Interface Readback Value -+#define rFPGA0_XCD_RFInterfaceRB 0x8e4 // Useless now -+ -+// -+// 4. Page9(0x900) -+// -+#define rFPGA1_RFMOD 0x900 //RF mode & OFDM TxSC // RF BW Setting?? -+ -+#define rFPGA1_TxBlock 0x904 // Useless now -+#define rFPGA1_DebugSelect 0x908 // Useless now -+#define rFPGA1_TxInfo 0x90c // Useless now // Status report?? -+ -+// -+// 5. PageA(0xA00) -+// -+// Set Control channel to upper or lower. These settings are required only for 40MHz -+#define rCCK0_System 0xa00 -+ -+#define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI -+#define rCCK0_CCA 0xa08 // Disable init gain now // Init gain -+ -+#define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series -+#define rCCK0_RxAGC2 0xa10 //AGC & DAGC -+ -+#define rCCK0_RxHP 0xa14 -+ -+#define rCCK0_DSPParameter1 0xa18 //Timing recovery & Channel estimation threshold -+#define rCCK0_DSPParameter2 0xa1c //SQ threshold -+ -+#define rCCK0_TxFilter1 0xa20 -+#define rCCK0_TxFilter2 0xa24 -+#define rCCK0_DebugPort 0xa28 //debug port and Tx filter3 -+#define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report -+#define rCCK0_TRSSIReport 0xa50 -+#define rCCK0_RxReport 0xa54 //0xa57 -+#define rCCK0_FACounterLower 0xa5c //0xa5b -+#define rCCK0_FACounterUpper 0xa58 //0xa5c -+ -+// -+// PageB(0xB00) -+// -+#define rPdp_AntA 0xb00 -+#define rPdp_AntA_4 0xb04 -+#define rConfig_Pmpd_AntA 0xb28 -+#define rConfig_AntA 0xb68 -+#define rConfig_AntB 0xb6c -+#define rPdp_AntB 0xb70 -+#define rPdp_AntB_4 0xb74 -+#define rConfig_Pmpd_AntB 0xb98 -+#define rAPK 0xbd8 -+ -+// -+// 6. PageC(0xC00) -+// -+#define rOFDM0_LSTF 0xc00 -+ -+#define rOFDM0_TRxPathEnable 0xc04 -+#define rOFDM0_TRMuxPar 0xc08 -+#define rOFDM0_TRSWIsolation 0xc0c -+ -+#define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter -+#define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix -+#define rOFDM0_XBRxAFE 0xc18 -+#define rOFDM0_XBRxIQImbalance 0xc1c -+#define rOFDM0_XCRxAFE 0xc20 -+#define rOFDM0_XCRxIQImbalance 0xc24 -+#define rOFDM0_XDRxAFE 0xc28 -+#define rOFDM0_XDRxIQImbalance 0xc2c -+ -+#define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain -+#define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync. -+#define rOFDM0_RxDetector3 0xc38 //Frame Sync. -+#define rOFDM0_RxDetector4 0xc3c //PD, SBD, Frame Sync & Short-GI -+ -+#define rOFDM0_RxDSP 0xc40 //Rx Sync Path -+#define rOFDM0_CFOandDAGC 0xc44 //CFO & DAGC -+#define rOFDM0_CCADropThreshold 0xc48 //CCA Drop threshold -+#define rOFDM0_ECCAThreshold 0xc4c // energy CCA -+ -+#define rOFDM0_XAAGCCore1 0xc50 // DIG -+#define rOFDM0_XAAGCCore2 0xc54 -+#define rOFDM0_XBAGCCore1 0xc58 -+#define rOFDM0_XBAGCCore2 0xc5c -+#define rOFDM0_XCAGCCore1 0xc60 -+#define rOFDM0_XCAGCCore2 0xc64 -+#define rOFDM0_XDAGCCore1 0xc68 -+#define rOFDM0_XDAGCCore2 0xc6c -+ -+#define rOFDM0_AGCParameter1 0xc70 -+#define rOFDM0_AGCParameter2 0xc74 -+#define rOFDM0_AGCRSSITable 0xc78 -+#define rOFDM0_HTSTFAGC 0xc7c -+ -+#define rOFDM0_XATxIQImbalance 0xc80 // TX PWR TRACK and DIG -+#define rOFDM0_XATxAFE 0xc84 -+#define rOFDM0_XBTxIQImbalance 0xc88 -+#define rOFDM0_XBTxAFE 0xc8c -+#define rOFDM0_XCTxIQImbalance 0xc90 -+#define rOFDM0_XCTxAFE 0xc94 -+#define rOFDM0_XDTxIQImbalance 0xc98 -+#define rOFDM0_XDTxAFE 0xc9c -+ -+#define rOFDM0_RxIQExtAnta 0xca0 -+#define rOFDM0_TxCoeff1 0xca4 -+#define rOFDM0_TxCoeff2 0xca8 -+#define rOFDM0_TxCoeff3 0xcac -+#define rOFDM0_TxCoeff4 0xcb0 -+#define rOFDM0_TxCoeff5 0xcb4 -+#define rOFDM0_TxCoeff6 0xcb8 -+#define rOFDM0_RxHPParameter 0xce0 -+#define rOFDM0_TxPseudoNoiseWgt 0xce4 -+#define rOFDM0_FrameSync 0xcf0 -+#define rOFDM0_DFSReport 0xcf4 -+ -+// -+// 7. PageD(0xD00) -+// -+#define rOFDM1_LSTF 0xd00 -+#define rOFDM1_TRxPathEnable 0xd04 -+ -+#define rOFDM1_CFO 0xd08 // No setting now -+#define rOFDM1_CSI1 0xd10 -+#define rOFDM1_SBD 0xd14 -+#define rOFDM1_CSI2 0xd18 -+#define rOFDM1_CFOTracking 0xd2c -+#define rOFDM1_TRxMesaure1 0xd34 -+#define rOFDM1_IntfDet 0xd3c -+#define rOFDM1_PseudoNoiseStateAB 0xd50 -+#define rOFDM1_PseudoNoiseStateCD 0xd54 -+#define rOFDM1_RxPseudoNoiseWgt 0xd58 -+ -+#define rOFDM_PHYCounter1 0xda0 //cca, parity fail -+#define rOFDM_PHYCounter2 0xda4 //rate illegal, crc8 fail -+#define rOFDM_PHYCounter3 0xda8 //MCS not support -+ -+#define rOFDM_ShortCFOAB 0xdac // No setting now -+#define rOFDM_ShortCFOCD 0xdb0 -+#define rOFDM_LongCFOAB 0xdb4 -+#define rOFDM_LongCFOCD 0xdb8 -+#define rOFDM_TailCFOAB 0xdbc -+#define rOFDM_TailCFOCD 0xdc0 -+#define rOFDM_PWMeasure1 0xdc4 -+#define rOFDM_PWMeasure2 0xdc8 -+#define rOFDM_BWReport 0xdcc -+#define rOFDM_AGCReport 0xdd0 -+#define rOFDM_RxSNR 0xdd4 -+#define rOFDM_RxEVMCSI 0xdd8 -+#define rOFDM_SIGReport 0xddc -+ -+ -+// -+// 8. PageE(0xE00) -+// -+#define rTxAGC_A_Rate18_06 0xe00 -+#define rTxAGC_A_Rate54_24 0xe04 -+#define rTxAGC_A_CCK1_Mcs32 0xe08 -+#define rTxAGC_A_Mcs03_Mcs00 0xe10 -+#define rTxAGC_A_Mcs07_Mcs04 0xe14 -+#define rTxAGC_A_Mcs11_Mcs08 0xe18 -+#define rTxAGC_A_Mcs15_Mcs12 0xe1c -+ -+#define rFPGA0_IQK 0xe28 -+#define rTx_IQK_Tone_A 0xe30 -+#define rRx_IQK_Tone_A 0xe34 -+#define rTx_IQK_PI_A 0xe38 -+#define rRx_IQK_PI_A 0xe3c -+ -+#define rTx_IQK 0xe40 -+#define rRx_IQK 0xe44 -+#define rIQK_AGC_Pts 0xe48 -+#define rIQK_AGC_Rsp 0xe4c -+#define rTx_IQK_Tone_B 0xe50 -+#define rRx_IQK_Tone_B 0xe54 -+#define rTx_IQK_PI_B 0xe58 -+#define rRx_IQK_PI_B 0xe5c -+#define rIQK_AGC_Cont 0xe60 -+ -+#define rBlue_Tooth 0xe6c -+#define rRx_Wait_CCA 0xe70 -+#define rTx_CCK_RFON 0xe74 -+#define rTx_CCK_BBON 0xe78 -+#define rTx_OFDM_RFON 0xe7c -+#define rTx_OFDM_BBON 0xe80 -+#define rTx_To_Rx 0xe84 -+#define rTx_To_Tx 0xe88 -+#define rRx_CCK 0xe8c -+ -+#define rTx_Power_Before_IQK_A 0xe94 -+#define rTx_Power_After_IQK_A 0xe9c -+ -+#define rRx_Power_Before_IQK_A 0xea0 -+#define rRx_Power_Before_IQK_A_2 0xea4 -+#define rRx_Power_After_IQK_A 0xea8 -+#define rRx_Power_After_IQK_A_2 0xeac -+ -+#define rTx_Power_Before_IQK_B 0xeb4 -+#define rTx_Power_After_IQK_B 0xebc -+ -+#define rRx_Power_Before_IQK_B 0xec0 -+#define rRx_Power_Before_IQK_B_2 0xec4 -+#define rRx_Power_After_IQK_B 0xec8 -+#define rRx_Power_After_IQK_B_2 0xecc -+ -+#define rRx_OFDM 0xed0 -+#define rRx_Wait_RIFS 0xed4 -+#define rRx_TO_Rx 0xed8 -+#define rStandby 0xedc -+#define rSleep 0xee0 -+#define rPMPD_ANAEN 0xeec -+ -+// -+// 7. RF Register 0x00-0x2E (RF 8256) -+// RF-0222D 0x00-3F -+// -+//Zebra1 -+#define rZebra1_HSSIEnable 0x0 // Useless now -+#define rZebra1_TRxEnable1 0x1 -+#define rZebra1_TRxEnable2 0x2 -+#define rZebra1_AGC 0x4 -+#define rZebra1_ChargePump 0x5 -+#define rZebra1_Channel 0x7 // RF channel switch -+ -+//#endif -+#define rZebra1_TxGain 0x8 // Useless now -+#define rZebra1_TxLPF 0x9 -+#define rZebra1_RxLPF 0xb -+#define rZebra1_RxHPFCorner 0xc -+ -+//Zebra4 -+#define rGlobalCtrl 0 // Useless now -+#define rRTL8256_TxLPF 19 -+#define rRTL8256_RxLPF 11 -+ -+//RTL8258 -+#define rRTL8258_TxLPF 0x11 // Useless now -+#define rRTL8258_RxLPF 0x13 -+#define rRTL8258_RSSILPF 0xa -+ -+// -+// RL6052 Register definition -+// -+#define RF_AC 0x00 // -+ -+#define RF_IQADJ_G1 0x01 // -+#define RF_IQADJ_G2 0x02 // -+#define RF_BS_PA_APSET_G1_G4 0x03 -+#define RF_BS_PA_APSET_G5_G8 0x04 -+#define RF_POW_TRSW 0x05 // -+ -+#define RF_GAIN_RX 0x06 // -+#define RF_GAIN_TX 0x07 // -+ -+#define RF_TXM_IDAC 0x08 // -+#define RF_IPA_G 0x09 // -+#define RF_TXBIAS_G 0x0A -+#define RF_TXPA_AG 0x0B -+#define RF_IPA_A 0x0C // -+#define RF_TXBIAS_A 0x0D -+#define RF_BS_PA_APSET_G9_G11 0x0E -+#define RF_BS_IQGEN 0x0F // -+ -+#define RF_MODE1 0x10 // -+#define RF_MODE2 0x11 // -+ -+#define RF_RX_AGC_HP 0x12 // -+#define RF_TX_AGC 0x13 // -+#define RF_BIAS 0x14 // -+#define RF_IPA 0x15 // -+#define RF_POW_ABILITY 0x17 // -+#define RF_MODE_AG 0x18 // -+#define rRfChannel 0x18 // RF channel and BW switch -+#define RF_CHNLBW 0x18 // RF channel and BW switch -+#define RF_TOP 0x19 // -+ -+#define RF_RX_G1 0x1A // -+#define RF_RX_G2 0x1B // -+ -+#define RF_RX_BB2 0x1C // -+#define RF_RX_BB1 0x1D // -+ -+#define RF_RCK1 0x1E // -+#define RF_RCK2 0x1F // -+ -+#define RF_TX_G1 0x20 // -+#define RF_TX_G2 0x21 // -+#define RF_TX_G3 0x22 // -+ -+#define RF_TX_BB1 0x23 // -+ -+#define RF_T_METER 0x24 // -+ -+#define RF_SYN_G1 0x25 // RF TX Power control -+#define RF_SYN_G2 0x26 // RF TX Power control -+#define RF_SYN_G3 0x27 // RF TX Power control -+#define RF_SYN_G4 0x28 // RF TX Power control -+#define RF_SYN_G5 0x29 // RF TX Power control -+#define RF_SYN_G6 0x2A // RF TX Power control -+#define RF_SYN_G7 0x2B // RF TX Power control -+#define RF_SYN_G8 0x2C // RF TX Power control -+ -+#define RF_RCK_OS 0x30 // RF TX PA control -+ -+#define RF_TXPA_G1 0x31 // RF TX PA control -+#define RF_TXPA_G2 0x32 // RF TX PA control -+#define RF_TXPA_G3 0x33 // RF TX PA control -+ -+// -+//Bit Mask -+// -+// 1. Page1(0x100) -+#define bBBResetB 0x100 // Useless now? -+#define bGlobalResetB 0x200 -+#define bOFDMTxStart 0x4 -+#define bCCKTxStart 0x8 -+#define bCRC32Debug 0x100 -+#define bPMACLoopback 0x10 -+#define bTxLSIG 0xffffff -+#define bOFDMTxRate 0xf -+#define bOFDMTxReserved 0x10 -+#define bOFDMTxLength 0x1ffe0 -+#define bOFDMTxParity 0x20000 -+#define bTxHTSIG1 0xffffff -+#define bTxHTMCSRate 0x7f -+#define bTxHTBW 0x80 -+#define bTxHTLength 0xffff00 -+#define bTxHTSIG2 0xffffff -+#define bTxHTSmoothing 0x1 -+#define bTxHTSounding 0x2 -+#define bTxHTReserved 0x4 -+#define bTxHTAggreation 0x8 -+#define bTxHTSTBC 0x30 -+#define bTxHTAdvanceCoding 0x40 -+#define bTxHTShortGI 0x80 -+#define bTxHTNumberHT_LTF 0x300 -+#define bTxHTCRC8 0x3fc00 -+#define bCounterReset 0x10000 -+#define bNumOfOFDMTx 0xffff -+#define bNumOfCCKTx 0xffff0000 -+#define bTxIdleInterval 0xffff -+#define bOFDMService 0xffff0000 -+#define bTxMACHeader 0xffffffff -+#define bTxDataInit 0xff -+#define bTxHTMode 0x100 -+#define bTxDataType 0x30000 -+#define bTxRandomSeed 0xffffffff -+#define bCCKTxPreamble 0x1 -+#define bCCKTxSFD 0xffff0000 -+#define bCCKTxSIG 0xff -+#define bCCKTxService 0xff00 -+#define bCCKLengthExt 0x8000 -+#define bCCKTxLength 0xffff0000 -+#define bCCKTxCRC16 0xffff -+#define bCCKTxStatus 0x1 -+#define bOFDMTxStatus 0x2 -+ -+#define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff)) -+ -+// 2. Page8(0x800) -+#define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD -+#define bJapanMode 0x2 -+#define bCCKTxSC 0x30 -+#define bCCKEn 0x1000000 -+#define bOFDMEn 0x2000000 -+ -+#define bOFDMRxADCPhase 0x10000 // Useless now -+#define bOFDMTxDACPhase 0x40000 -+#define bXATxAGC 0x3f -+ -+#define bAntennaSelect 0x0300 -+ -+#define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage -+#define bXCTxAGC 0xf000 -+#define bXDTxAGC 0xf0000 -+ -+#define bPAStart 0xf0000000 // Useless now -+#define bTRStart 0x00f00000 -+#define bRFStart 0x0000f000 -+#define bBBStart 0x000000f0 -+#define bBBCCKStart 0x0000000f -+#define bPAEnd 0xf //Reg0x814 -+#define bTREnd 0x0f000000 -+#define bRFEnd 0x000f0000 -+#define bCCAMask 0x000000f0 //T2R -+#define bR2RCCAMask 0x00000f00 -+#define bHSSI_R2TDelay 0xf8000000 -+#define bHSSI_T2RDelay 0xf80000 -+#define bContTxHSSI 0x400 //chane gain at continue Tx -+#define bIGFromCCK 0x200 -+#define bAGCAddress 0x3f -+#define bRxHPTx 0x7000 -+#define bRxHPT2R 0x38000 -+#define bRxHPCCKIni 0xc0000 -+#define bAGCTxCode 0xc00000 -+#define bAGCRxCode 0x300000 -+ -+#define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1 -+#define b3WireAddressLength 0x400 -+ -+#define b3WireRFPowerDown 0x1 // Useless now -+//#define bHWSISelect 0x8 -+#define b5GPAPEPolarity 0x40000000 -+#define b2GPAPEPolarity 0x80000000 -+#define bRFSW_TxDefaultAnt 0x3 -+#define bRFSW_TxOptionAnt 0x30 -+#define bRFSW_RxDefaultAnt 0x300 -+#define bRFSW_RxOptionAnt 0x3000 -+#define bRFSI_3WireData 0x1 -+#define bRFSI_3WireClock 0x2 -+#define bRFSI_3WireLoad 0x4 -+#define bRFSI_3WireRW 0x8 -+#define bRFSI_3Wire 0xf -+ -+#define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW -+ -+#define bRFSI_TRSW 0x20 // Useless now -+#define bRFSI_TRSWB 0x40 -+#define bRFSI_ANTSW 0x100 -+#define bRFSI_ANTSWB 0x200 -+#define bRFSI_PAPE 0x400 -+#define bRFSI_PAPE5G 0x800 -+#define bBandSelect 0x1 -+#define bHTSIG2_GI 0x80 -+#define bHTSIG2_Smoothing 0x01 -+#define bHTSIG2_Sounding 0x02 -+#define bHTSIG2_Aggreaton 0x08 -+#define bHTSIG2_STBC 0x30 -+#define bHTSIG2_AdvCoding 0x40 -+#define bHTSIG2_NumOfHTLTF 0x300 -+#define bHTSIG2_CRC8 0x3fc -+#define bHTSIG1_MCS 0x7f -+#define bHTSIG1_BandWidth 0x80 -+#define bHTSIG1_HTLength 0xffff -+#define bLSIG_Rate 0xf -+#define bLSIG_Reserved 0x10 -+#define bLSIG_Length 0x1fffe -+#define bLSIG_Parity 0x20 -+#define bCCKRxPhase 0x4 -+ -+#define bLSSIReadAddress 0x7f800000 // T65 RF -+ -+#define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal -+ -+#define bLSSIReadBackData 0xfffff // T65 RF -+ -+#define bLSSIReadOKFlag 0x1000 // Useless now -+#define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz -+#define bRegulator0Standby 0x1 -+#define bRegulatorPLLStandby 0x2 -+#define bRegulator1Standby 0x4 -+#define bPLLPowerUp 0x8 -+#define bDPLLPowerUp 0x10 -+#define bDA10PowerUp 0x20 -+#define bAD7PowerUp 0x200 -+#define bDA6PowerUp 0x2000 -+#define bXtalPowerUp 0x4000 -+#define b40MDClkPowerUP 0x8000 -+#define bDA6DebugMode 0x20000 -+#define bDA6Swing 0x380000 -+ -+#define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ -+ -+#define b80MClkDelay 0x18000000 // Useless -+#define bAFEWatchDogEnable 0x20000000 -+ -+#define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap -+#define bXtalCap23 0x3 -+#define bXtalCap92x 0x0f000000 -+#define bXtalCap 0x0f000000 -+ -+#define bIntDifClkEnable 0x400 // Useless -+#define bExtSigClkEnable 0x800 -+#define bBandgapMbiasPowerUp 0x10000 -+#define bAD11SHGain 0xc0000 -+#define bAD11InputRange 0x700000 -+#define bAD11OPCurrent 0x3800000 -+#define bIPathLoopback 0x4000000 -+#define bQPathLoopback 0x8000000 -+#define bAFELoopback 0x10000000 -+#define bDA10Swing 0x7e0 -+#define bDA10Reverse 0x800 -+#define bDAClkSource 0x1000 -+#define bAD7InputRange 0x6000 -+#define bAD7Gain 0x38000 -+#define bAD7OutputCMMode 0x40000 -+#define bAD7InputCMMode 0x380000 -+#define bAD7Current 0xc00000 -+#define bRegulatorAdjust 0x7000000 -+#define bAD11PowerUpAtTx 0x1 -+#define bDA10PSAtTx 0x10 -+#define bAD11PowerUpAtRx 0x100 -+#define bDA10PSAtRx 0x1000 -+#define bCCKRxAGCFormat 0x200 -+#define bPSDFFTSamplepPoint 0xc000 -+#define bPSDAverageNum 0x3000 -+#define bIQPathControl 0xc00 -+#define bPSDFreq 0x3ff -+#define bPSDAntennaPath 0x30 -+#define bPSDIQSwitch 0x40 -+#define bPSDRxTrigger 0x400000 -+#define bPSDTxTrigger 0x80000000 -+#define bPSDSineToneScale 0x7f000000 -+#define bPSDReport 0xffff -+ -+// 3. Page9(0x900) -+#define bOFDMTxSC 0x30000000 // Useless -+#define bCCKTxOn 0x1 -+#define bOFDMTxOn 0x2 -+#define bDebugPage 0xfff //reset debug page and also HWord, LWord -+#define bDebugItem 0xff //reset debug page and LWord -+#define bAntL 0x10 -+#define bAntNonHT 0x100 -+#define bAntHT1 0x1000 -+#define bAntHT2 0x10000 -+#define bAntHT1S1 0x100000 -+#define bAntNonHTS1 0x1000000 -+ -+// 4. PageA(0xA00) -+#define bCCKBBMode 0x3 // Useless -+#define bCCKTxPowerSaving 0x80 -+#define bCCKRxPowerSaving 0x40 -+ -+#define bCCKSideBand 0x10 // Reg 0xa00 rCCK0_System 20/40 switch -+ -+#define bCCKScramble 0x8 // Useless -+#define bCCKAntDiversity 0x8000 -+#define bCCKCarrierRecovery 0x4000 -+#define bCCKTxRate 0x3000 -+#define bCCKDCCancel 0x0800 -+#define bCCKISICancel 0x0400 -+#define bCCKMatchFilter 0x0200 -+#define bCCKEqualizer 0x0100 -+#define bCCKPreambleDetect 0x800000 -+#define bCCKFastFalseCCA 0x400000 -+#define bCCKChEstStart 0x300000 -+#define bCCKCCACount 0x080000 -+#define bCCKcs_lim 0x070000 -+#define bCCKBistMode 0x80000000 -+#define bCCKCCAMask 0x40000000 -+#define bCCKTxDACPhase 0x4 -+#define bCCKRxADCPhase 0x20000000 //r_rx_clk -+#define bCCKr_cp_mode0 0x0100 -+#define bCCKTxDCOffset 0xf0 -+#define bCCKRxDCOffset 0xf -+#define bCCKCCAMode 0xc000 -+#define bCCKFalseCS_lim 0x3f00 -+#define bCCKCS_ratio 0xc00000 -+#define bCCKCorgBit_sel 0x300000 -+#define bCCKPD_lim 0x0f0000 -+#define bCCKNewCCA 0x80000000 -+#define bCCKRxHPofIG 0x8000 -+#define bCCKRxIG 0x7f00 -+#define bCCKLNAPolarity 0x800000 -+#define bCCKRx1stGain 0x7f0000 -+#define bCCKRFExtend 0x20000000 //CCK Rx Iinital gain polarity -+#define bCCKRxAGCSatLevel 0x1f000000 -+#define bCCKRxAGCSatCount 0xe0 -+#define bCCKRxRFSettle 0x1f //AGCsamp_dly -+#define bCCKFixedRxAGC 0x8000 -+//#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824 -+#define bCCKAntennaPolarity 0x2000 -+#define bCCKTxFilterType 0x0c00 -+#define bCCKRxAGCReportType 0x0300 -+#define bCCKRxDAGCEn 0x80000000 -+#define bCCKRxDAGCPeriod 0x20000000 -+#define bCCKRxDAGCSatLevel 0x1f000000 -+#define bCCKTimingRecovery 0x800000 -+#define bCCKTxC0 0x3f0000 -+#define bCCKTxC1 0x3f000000 -+#define bCCKTxC2 0x3f -+#define bCCKTxC3 0x3f00 -+#define bCCKTxC4 0x3f0000 -+#define bCCKTxC5 0x3f000000 -+#define bCCKTxC6 0x3f -+#define bCCKTxC7 0x3f00 -+#define bCCKDebugPort 0xff0000 -+#define bCCKDACDebug 0x0f000000 -+#define bCCKFalseAlarmEnable 0x8000 -+#define bCCKFalseAlarmRead 0x4000 -+#define bCCKTRSSI 0x7f -+#define bCCKRxAGCReport 0xfe -+#define bCCKRxReport_AntSel 0x80000000 -+#define bCCKRxReport_MFOff 0x40000000 -+#define bCCKRxRxReport_SQLoss 0x20000000 -+#define bCCKRxReport_Pktloss 0x10000000 -+#define bCCKRxReport_Lockedbit 0x08000000 -+#define bCCKRxReport_RateError 0x04000000 -+#define bCCKRxReport_RxRate 0x03000000 -+#define bCCKRxFACounterLower 0xff -+#define bCCKRxFACounterUpper 0xff000000 -+#define bCCKRxHPAGCStart 0xe000 -+#define bCCKRxHPAGCFinal 0x1c00 -+#define bCCKRxFalseAlarmEnable 0x8000 -+#define bCCKFACounterFreeze 0x4000 -+#define bCCKTxPathSel 0x10000000 -+#define bCCKDefaultRxPath 0xc000000 -+#define bCCKOptionRxPath 0x3000000 -+ -+// 5. PageC(0xC00) -+#define bNumOfSTF 0x3 // Useless -+#define bShift_L 0xc0 -+#define bGI_TH 0xc -+#define bRxPathA 0x1 -+#define bRxPathB 0x2 -+#define bRxPathC 0x4 -+#define bRxPathD 0x8 -+#define bTxPathA 0x1 -+#define bTxPathB 0x2 -+#define bTxPathC 0x4 -+#define bTxPathD 0x8 -+#define bTRSSIFreq 0x200 -+#define bADCBackoff 0x3000 -+#define bDFIRBackoff 0xc000 -+#define bTRSSILatchPhase 0x10000 -+#define bRxIDCOffset 0xff -+#define bRxQDCOffset 0xff00 -+#define bRxDFIRMode 0x1800000 -+#define bRxDCNFType 0xe000000 -+#define bRXIQImb_A 0x3ff -+#define bRXIQImb_B 0xfc00 -+#define bRXIQImb_C 0x3f0000 -+#define bRXIQImb_D 0xffc00000 -+#define bDC_dc_Notch 0x60000 -+#define bRxNBINotch 0x1f000000 -+#define bPD_TH 0xf -+#define bPD_TH_Opt2 0xc000 -+#define bPWED_TH 0x700 -+#define bIfMF_Win_L 0x800 -+#define bPD_Option 0x1000 -+#define bMF_Win_L 0xe000 -+#define bBW_Search_L 0x30000 -+#define bwin_enh_L 0xc0000 -+#define bBW_TH 0x700000 -+#define bED_TH2 0x3800000 -+#define bBW_option 0x4000000 -+#define bRatio_TH 0x18000000 -+#define bWindow_L 0xe0000000 -+#define bSBD_Option 0x1 -+#define bFrame_TH 0x1c -+#define bFS_Option 0x60 -+#define bDC_Slope_check 0x80 -+#define bFGuard_Counter_DC_L 0xe00 -+#define bFrame_Weight_Short 0x7000 -+#define bSub_Tune 0xe00000 -+#define bFrame_DC_Length 0xe000000 -+#define bSBD_start_offset 0x30000000 -+#define bFrame_TH_2 0x7 -+#define bFrame_GI2_TH 0x38 -+#define bGI2_Sync_en 0x40 -+#define bSarch_Short_Early 0x300 -+#define bSarch_Short_Late 0xc00 -+#define bSarch_GI2_Late 0x70000 -+#define bCFOAntSum 0x1 -+#define bCFOAcc 0x2 -+#define bCFOStartOffset 0xc -+#define bCFOLookBack 0x70 -+#define bCFOSumWeight 0x80 -+#define bDAGCEnable 0x10000 -+#define bTXIQImb_A 0x3ff -+#define bTXIQImb_B 0xfc00 -+#define bTXIQImb_C 0x3f0000 -+#define bTXIQImb_D 0xffc00000 -+#define bTxIDCOffset 0xff -+#define bTxQDCOffset 0xff00 -+#define bTxDFIRMode 0x10000 -+#define bTxPesudoNoiseOn 0x4000000 -+#define bTxPesudoNoise_A 0xff -+#define bTxPesudoNoise_B 0xff00 -+#define bTxPesudoNoise_C 0xff0000 -+#define bTxPesudoNoise_D 0xff000000 -+#define bCCADropOption 0x20000 -+#define bCCADropThres 0xfff00000 -+#define bEDCCA_H 0xf -+#define bEDCCA_L 0xf0 -+#define bLambda_ED 0x300 -+#define bRxInitialGain 0x7f -+#define bRxAntDivEn 0x80 -+#define bRxAGCAddressForLNA 0x7f00 -+#define bRxHighPowerFlow 0x8000 -+#define bRxAGCFreezeThres 0xc0000 -+#define bRxFreezeStep_AGC1 0x300000 -+#define bRxFreezeStep_AGC2 0xc00000 -+#define bRxFreezeStep_AGC3 0x3000000 -+#define bRxFreezeStep_AGC0 0xc000000 -+#define bRxRssi_Cmp_En 0x10000000 -+#define bRxQuickAGCEn 0x20000000 -+#define bRxAGCFreezeThresMode 0x40000000 -+#define bRxOverFlowCheckType 0x80000000 -+#define bRxAGCShift 0x7f -+#define bTRSW_Tri_Only 0x80 -+#define bPowerThres 0x300 -+#define bRxAGCEn 0x1 -+#define bRxAGCTogetherEn 0x2 -+#define bRxAGCMin 0x4 -+#define bRxHP_Ini 0x7 -+#define bRxHP_TRLNA 0x70 -+#define bRxHP_RSSI 0x700 -+#define bRxHP_BBP1 0x7000 -+#define bRxHP_BBP2 0x70000 -+#define bRxHP_BBP3 0x700000 -+#define bRSSI_H 0x7f0000 //the threshold for high power -+#define bRSSI_Gen 0x7f000000 //the threshold for ant diversity -+#define bRxSettle_TRSW 0x7 -+#define bRxSettle_LNA 0x38 -+#define bRxSettle_RSSI 0x1c0 -+#define bRxSettle_BBP 0xe00 -+#define bRxSettle_RxHP 0x7000 -+#define bRxSettle_AntSW_RSSI 0x38000 -+#define bRxSettle_AntSW 0xc0000 -+#define bRxProcessTime_DAGC 0x300000 -+#define bRxSettle_HSSI 0x400000 -+#define bRxProcessTime_BBPPW 0x800000 -+#define bRxAntennaPowerShift 0x3000000 -+#define bRSSITableSelect 0xc000000 -+#define bRxHP_Final 0x7000000 -+#define bRxHTSettle_BBP 0x7 -+#define bRxHTSettle_HSSI 0x8 -+#define bRxHTSettle_RxHP 0x70 -+#define bRxHTSettle_BBPPW 0x80 -+#define bRxHTSettle_Idle 0x300 -+#define bRxHTSettle_Reserved 0x1c00 -+#define bRxHTRxHPEn 0x8000 -+#define bRxHTAGCFreezeThres 0x30000 -+#define bRxHTAGCTogetherEn 0x40000 -+#define bRxHTAGCMin 0x80000 -+#define bRxHTAGCEn 0x100000 -+#define bRxHTDAGCEn 0x200000 -+#define bRxHTRxHP_BBP 0x1c00000 -+#define bRxHTRxHP_Final 0xe0000000 -+#define bRxPWRatioTH 0x3 -+#define bRxPWRatioEn 0x4 -+#define bRxMFHold 0x3800 -+#define bRxPD_Delay_TH1 0x38 -+#define bRxPD_Delay_TH2 0x1c0 -+#define bRxPD_DC_COUNT_MAX 0x600 -+//#define bRxMF_Hold 0x3800 -+#define bRxPD_Delay_TH 0x8000 -+#define bRxProcess_Delay 0xf0000 -+#define bRxSearchrange_GI2_Early 0x700000 -+#define bRxFrame_Guard_Counter_L 0x3800000 -+#define bRxSGI_Guard_L 0xc000000 -+#define bRxSGI_Search_L 0x30000000 -+#define bRxSGI_TH 0xc0000000 -+#define bDFSCnt0 0xff -+#define bDFSCnt1 0xff00 -+#define bDFSFlag 0xf0000 -+#define bMFWeightSum 0x300000 -+#define bMinIdxTH 0x7f000000 -+#define bDAFormat 0x40000 -+#define bTxChEmuEnable 0x01000000 -+#define bTRSWIsolation_A 0x7f -+#define bTRSWIsolation_B 0x7f00 -+#define bTRSWIsolation_C 0x7f0000 -+#define bTRSWIsolation_D 0x7f000000 -+#define bExtLNAGain 0x7c00 -+ -+// 6. PageE(0xE00) -+#define bSTBCEn 0x4 // Useless -+#define bAntennaMapping 0x10 -+#define bNss 0x20 -+#define bCFOAntSumD 0x200 -+#define bPHYCounterReset 0x8000000 -+#define bCFOReportGet 0x4000000 -+#define bOFDMContinueTx 0x10000000 -+#define bOFDMSingleCarrier 0x20000000 -+#define bOFDMSingleTone 0x40000000 -+//#define bRxPath1 0x01 -+//#define bRxPath2 0x02 -+//#define bRxPath3 0x04 -+//#define bRxPath4 0x08 -+//#define bTxPath1 0x10 -+//#define bTxPath2 0x20 -+#define bHTDetect 0x100 -+#define bCFOEn 0x10000 -+#define bCFOValue 0xfff00000 -+#define bSigTone_Re 0x3f -+#define bSigTone_Im 0x7f00 -+#define bCounter_CCA 0xffff -+#define bCounter_ParityFail 0xffff0000 -+#define bCounter_RateIllegal 0xffff -+#define bCounter_CRC8Fail 0xffff0000 -+#define bCounter_MCSNoSupport 0xffff -+#define bCounter_FastSync 0xffff -+#define bShortCFO 0xfff -+#define bShortCFOTLength 12 //total -+#define bShortCFOFLength 11 //fraction -+#define bLongCFO 0x7ff -+#define bLongCFOTLength 11 -+#define bLongCFOFLength 11 -+#define bTailCFO 0x1fff -+#define bTailCFOTLength 13 -+#define bTailCFOFLength 12 -+#define bmax_en_pwdB 0xffff -+#define bCC_power_dB 0xffff0000 -+#define bnoise_pwdB 0xffff -+#define bPowerMeasTLength 10 -+#define bPowerMeasFLength 3 -+#define bRx_HT_BW 0x1 -+#define bRxSC 0x6 -+#define bRx_HT 0x8 -+#define bNB_intf_det_on 0x1 -+#define bIntf_win_len_cfg 0x30 -+#define bNB_Intf_TH_cfg 0x1c0 -+#define bRFGain 0x3f -+#define bTableSel 0x40 -+#define bTRSW 0x80 -+#define bRxSNR_A 0xff -+#define bRxSNR_B 0xff00 -+#define bRxSNR_C 0xff0000 -+#define bRxSNR_D 0xff000000 -+#define bSNREVMTLength 8 -+#define bSNREVMFLength 1 -+#define bCSI1st 0xff -+#define bCSI2nd 0xff00 -+#define bRxEVM1st 0xff0000 -+#define bRxEVM2nd 0xff000000 -+#define bSIGEVM 0xff -+#define bPWDB 0xff00 -+#define bSGIEN 0x10000 -+ -+#define bSFactorQAM1 0xf // Useless -+#define bSFactorQAM2 0xf0 -+#define bSFactorQAM3 0xf00 -+#define bSFactorQAM4 0xf000 -+#define bSFactorQAM5 0xf0000 -+#define bSFactorQAM6 0xf0000 -+#define bSFactorQAM7 0xf00000 -+#define bSFactorQAM8 0xf000000 -+#define bSFactorQAM9 0xf0000000 -+#define bCSIScheme 0x100000 -+ -+#define bNoiseLvlTopSet 0x3 // Useless -+#define bChSmooth 0x4 -+#define bChSmoothCfg1 0x38 -+#define bChSmoothCfg2 0x1c0 -+#define bChSmoothCfg3 0xe00 -+#define bChSmoothCfg4 0x7000 -+#define bMRCMode 0x800000 -+#define bTHEVMCfg 0x7000000 -+ -+#define bLoopFitType 0x1 // Useless -+#define bUpdCFO 0x40 -+#define bUpdCFOOffData 0x80 -+#define bAdvUpdCFO 0x100 -+#define bAdvTimeCtrl 0x800 -+#define bUpdClko 0x1000 -+#define bFC 0x6000 -+#define bTrackingMode 0x8000 -+#define bPhCmpEnable 0x10000 -+#define bUpdClkoLTF 0x20000 -+#define bComChCFO 0x40000 -+#define bCSIEstiMode 0x80000 -+#define bAdvUpdEqz 0x100000 -+#define bUChCfg 0x7000000 -+#define bUpdEqz 0x8000000 -+ -+//Rx Pseduo noise -+#define bRxPesudoNoiseOn 0x20000000 // Useless -+#define bRxPesudoNoise_A 0xff -+#define bRxPesudoNoise_B 0xff00 -+#define bRxPesudoNoise_C 0xff0000 -+#define bRxPesudoNoise_D 0xff000000 -+#define bPesudoNoiseState_A 0xffff -+#define bPesudoNoiseState_B 0xffff0000 -+#define bPesudoNoiseState_C 0xffff -+#define bPesudoNoiseState_D 0xffff0000 -+ -+//7. RF Register -+//Zebra1 -+#define bZebra1_HSSIEnable 0x8 // Useless -+#define bZebra1_TRxControl 0xc00 -+#define bZebra1_TRxGainSetting 0x07f -+#define bZebra1_RxCorner 0xc00 -+#define bZebra1_TxChargePump 0x38 -+#define bZebra1_RxChargePump 0x7 -+#define bZebra1_ChannelNum 0xf80 -+#define bZebra1_TxLPFBW 0x400 -+#define bZebra1_RxLPFBW 0x600 -+ -+//Zebra4 -+#define bRTL8256RegModeCtrl1 0x100 // Useless -+#define bRTL8256RegModeCtrl0 0x40 -+#define bRTL8256_TxLPFBW 0x18 -+#define bRTL8256_RxLPFBW 0x600 -+ -+//RTL8258 -+#define bRTL8258_TxLPFBW 0xc // Useless -+#define bRTL8258_RxLPFBW 0xc00 -+#define bRTL8258_RSSILPFBW 0xc0 -+ -+ -+// -+// Other Definition -+// -+ -+//byte endable for sb_write -+#define bByte0 0x1 // Useless -+#define bByte1 0x2 -+#define bByte2 0x4 -+#define bByte3 0x8 -+#define bWord0 0x3 -+#define bWord1 0xc -+#define bDWord 0xf -+ -+//for PutRegsetting & GetRegSetting BitMask -+#define bMaskByte0 0xff // Reg 0xc50 rOFDM0_XAAGCCore~0xC6f -+#define bMaskByte1 0xff00 -+#define bMaskByte2 0xff0000 -+#define bMaskByte3 0xff000000 -+#define bMaskHWord 0xffff0000 -+#define bMaskLWord 0x0000ffff -+#define bMaskDWord 0xffffffff -+#define bMask12Bits 0xfff -+#define bMaskH4Bits 0xf0000000 -+#define bMaskOFDM_D 0xffc00000 -+#define bMaskCCK 0x3f3f3f3f -+ -+//for PutRFRegsetting & GetRFRegSetting BitMask -+//#define bMask12Bits 0xfffff // RF Reg mask bits -+//#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF -+#define bRFRegOffsetMask 0xfffff -+ -+#define bEnable 0x1 // Useless -+#define bDisable 0x0 -+ -+#define LeftAntenna 0x0 // Useless -+#define RightAntenna 0x1 -+ -+#define tCheckTxStatus 500 //500ms // Useless -+#define tUpdateRxCounter 100 //100ms -+ -+#define rateCCK 0 // Useless -+#define rateOFDM 1 -+#define rateHT 2 -+ -+//define Register-End -+#define bPMAC_End 0x1ff // Useless -+#define bFPGAPHY0_End 0x8ff -+#define bFPGAPHY1_End 0x9ff -+#define bCCKPHY0_End 0xaff -+#define bOFDMPHY0_End 0xcff -+#define bOFDMPHY1_End 0xdff -+ -+//define max debug item in each debug page -+//#define bMaxItem_FPGA_PHY0 0x9 -+//#define bMaxItem_FPGA_PHY1 0x3 -+//#define bMaxItem_PHY_11B 0x16 -+//#define bMaxItem_OFDM_PHY0 0x29 -+//#define bMaxItem_OFDM_PHY1 0x0 -+ -+#define bPMACControl 0x0 // Useless -+#define bWMACControl 0x1 -+#define bWNICControl 0x2 -+ -+#define PathA 0x0 // Useless -+#define PathB 0x1 -+#define PathC 0x2 -+#define PathD 0x3 -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+#endif //__INC_HAL8192SPHYREG_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h -@@ -0,0 +1,105 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __INC_HAL8192CU_FW_IMG_H -+#define __INC_HAL8192CU_FW_IMG_H -+ -+/*Created on 2011/ 6/15, 5:45*/ -+ -+#ifdef CONFIG_BT_COEXISTENCE -+#define TSMCImgArrayLength 15706 //v84 TSMC COMMON 2012-04-13 -+#else //#ifdef CONFIG_P2P -+#define TSMCImgArrayLength 16126 //v88 TSMC P2PPS with CCX report C2H 2012-12-05 -+#endif -+extern u8 Rtl8192CUFwTSMCImgArray[TSMCImgArrayLength]; -+ -+#ifdef CONFIG_BT_COEXISTENCE -+#define UMCACutImgArrayLength 16248 //v79 UMC A Cut COMMON 2011-10-06 -+#else //#ifdef CONFIG_P2P -+#define UMCACutImgArrayLength 16126 //v88 UMC A Cut P2PPS with CCX report C2H 2012-12-05 -+#endif -+extern u8 Rtl8192CUFwUMCACutImgArray[UMCACutImgArrayLength]; -+ -+#ifdef CONFIG_BT_COEXISTENCE -+#define UMCBCutImgArrayLength 15686 //v84 UMC B Cut COMMON 2012-04-13 -+#else //#ifdef CONFIG_P2P -+#define UMCBCutImgArrayLength 16096 //v88 UMC B Cut P2PPS with CCX report C2H 2012-12-05 -+#endif -+extern u8 Rtl8192CUFwUMCBCutImgArray[UMCBCutImgArrayLength]; -+ -+//8188C_Formal_All_PHYforMP_111117 2011-11-23 -+//8192C_Formal_92CU_PHYforMP_110817 2011-11-23 -+#define PHY_REG_2TArrayLength 374 -+extern u32 Rtl8192CUPHY_REG_2TArray[PHY_REG_2TArrayLength]; -+#define PHY_REG_1TArrayLength 374 -+extern u32 Rtl8192CUPHY_REG_1TArray[PHY_REG_1TArrayLength]; -+#define PHY_ChangeTo_1T1RArrayLength 1 -+extern u32 Rtl8192CUPHY_ChangeTo_1T1RArray[PHY_ChangeTo_1T1RArrayLength]; -+#define PHY_ChangeTo_1T2RArrayLength 1 -+extern u32 Rtl8192CUPHY_ChangeTo_1T2RArray[PHY_ChangeTo_1T2RArrayLength]; -+#define PHY_ChangeTo_2T2RArrayLength 1 -+extern u32 Rtl8192CUPHY_ChangeTo_2T2RArray[PHY_ChangeTo_2T2RArrayLength]; -+#define PHY_REG_Array_PGLength 336 -+extern u32 Rtl8192CUPHY_REG_Array_PG[PHY_REG_Array_PGLength]; -+#define PHY_REG_Array_PG_mCardLength 336 -+extern u32 Rtl8192CUPHY_REG_Array_PG_mCard[PHY_REG_Array_PG_mCardLength]; -+#define PHY_REG_Array_MPLength 4 -+extern u32 Rtl8192CUPHY_REG_Array_MP[PHY_REG_Array_MPLength]; -+#define PHY_REG_1T_HPArrayLength 378 -+extern u32 Rtl8192CUPHY_REG_1T_HPArray[PHY_REG_1T_HPArrayLength]; -+#define PHY_REG_1T_mCardArrayLength 374 -+extern u32 Rtl8192CUPHY_REG_1T_mCardArray[PHY_REG_1T_mCardArrayLength]; -+#define PHY_REG_2T_mCardArrayLength 374 -+extern u32 Rtl8192CUPHY_REG_2T_mCardArray[PHY_REG_2T_mCardArrayLength]; -+#define PHY_REG_Array_PG_HPLength 336 -+extern u32 Rtl8192CUPHY_REG_Array_PG_HP[PHY_REG_Array_PG_HPLength]; -+#define RadioA_2TArrayLength 282 -+extern u32 Rtl8192CURadioA_2TArray[RadioA_2TArrayLength]; -+#define RadioB_2TArrayLength 78 -+extern u32 Rtl8192CURadioB_2TArray[RadioB_2TArrayLength]; -+#define RadioA_1TArrayLength 282 -+extern u32 Rtl8192CURadioA_1TArray[RadioA_1TArrayLength]; -+#define RadioB_1TArrayLength 1 -+extern u32 Rtl8192CURadioB_1TArray[RadioB_1TArrayLength]; -+#define RadioA_2T_mCardArrayLength 282 -+extern u32 Rtl8192CURadioA_2T_mCardArray[RadioA_2T_mCardArrayLength]; -+#define RadioB_2T_mCardArrayLength 78 -+extern u32 Rtl8192CURadioB_2T_mCardArray[RadioB_2T_mCardArrayLength]; -+#define RadioA_1T_mCardArrayLength 282 -+extern u32 Rtl8192CURadioA_1T_mCardArray[RadioA_1T_mCardArrayLength]; -+#define RadioB_1T_mCardArrayLength 1 -+extern u32 Rtl8192CURadioB_1T_mCardArray[RadioB_1T_mCardArrayLength]; -+#define RadioA_1T_HPArrayLength 282 -+extern u32 Rtl8192CURadioA_1T_HPArray[RadioA_1T_HPArrayLength]; -+#define RadioB_GM_ArrayLength 1 -+extern u32 Rtl8192CURadioB_GM_Array[RadioB_GM_ArrayLength]; -+ -+// MAC reg V14 - 2011-11-23 -+#define MAC_2T_ArrayLength 174 -+extern u32 Rtl8192CUMAC_2T_Array[MAC_2T_ArrayLength]; -+#define MACPHY_Array_PGLength 1 -+extern u32 Rtl8192CUMACPHY_Array_PG[MACPHY_Array_PGLength]; -+#define AGCTAB_2TArrayLength 320 -+extern u32 Rtl8192CUAGCTAB_2TArray[AGCTAB_2TArrayLength]; -+#define AGCTAB_1TArrayLength 320 -+extern u32 Rtl8192CUAGCTAB_1TArray[AGCTAB_1TArrayLength]; -+#define AGCTAB_1T_HPArrayLength 320 -+extern u32 Rtl8192CUAGCTAB_1T_HPArray[AGCTAB_1T_HPArrayLength]; -+ -+#endif //__INC_HAL8192CU_FW_IMG_H ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h -@@ -0,0 +1,34 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __INC_HAL8192CU_FW_IMG_WOWLAN_H -+#define __INC_HAL8192CU_FW_IMG_WOWLAN_H -+ -+/*Created on 2011/11/ 8, 14:15*/ -+ -+ -+#define TSMCWWImgArrayLength 13458 -+extern u8 Rtl8192CUFwTSMCWWImgArray[TSMCWWImgArrayLength]; -+#define UMCACutWWImgArrayLength 13458 -+extern u8 Rtl8192CUFwUMCACutWWImgArray[UMCACutWWImgArrayLength]; -+#define UMCBCutWWImgArrayLength 13446 -+extern u8 Rtl8192CUFwUMCBCutWWImgArray[UMCBCutWWImgArrayLength]; -+ -+#endif //__INC_HAL8192CU_FW_IMG_WOWLAN_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h -@@ -0,0 +1,66 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __INC_HAL8192DE_FW_IMG_H -+#define __INC_HAL8192DE_FW_IMG_H -+ -+#include -+ -+/*Created on 2011/11/11, 8: 8*/ -+ -+#define Rtl8192DEImgArrayLength 32296 -+extern const u8 Rtl8192DEFwImgArray[Rtl8192DEImgArrayLength]; -+#define Rtl8192DEMainArrayLength 1 -+extern const u8 Rtl8192DEFwMainArray[Rtl8192DEMainArrayLength]; -+#define Rtl8192DEDataArrayLength 1 -+extern const u8 Rtl8192DEFwDataArray[Rtl8192DEDataArrayLength]; -+#define Rtl8192DEPHY_REG_2TArrayLength 372 -+extern const u32 Rtl8192DEPHY_REG_2TArray[Rtl8192DEPHY_REG_2TArrayLength]; -+#define Rtl8192DEPHY_REG_1TArrayLength 1 -+extern const u32 Rtl8192DEPHY_REG_1TArray[Rtl8192DEPHY_REG_1TArrayLength]; -+#define Rtl8192DEPHY_REG_Array_PGLength 624 -+extern const u32 Rtl8192DEPHY_REG_Array_PG[Rtl8192DEPHY_REG_Array_PGLength]; -+#define Rtl8192DEPHY_REG_Array_MPLength 12 -+extern const u32 Rtl8192DEPHY_REG_Array_MP[Rtl8192DEPHY_REG_Array_MPLength]; -+#define Rtl8192DERadioA_2TArrayLength 378 -+extern const u32 Rtl8192DERadioA_2TArray[Rtl8192DERadioA_2TArrayLength]; -+#define Rtl8192DERadioB_2TArrayLength 384 -+extern const u32 Rtl8192DERadioB_2TArray[Rtl8192DERadioB_2TArrayLength]; -+#define Rtl8192DERadioA_1TArrayLength 1 -+extern const u32 Rtl8192DERadioA_1TArray[Rtl8192DERadioA_1TArrayLength]; -+#define Rtl8192DERadioB_1TArrayLength 1 -+extern const u32 Rtl8192DERadioB_1TArray[Rtl8192DERadioB_1TArrayLength]; -+#define Rtl8192DERadioA_2T_intPAArrayLength 378 -+extern const u32 Rtl8192DERadioA_2T_intPAArray[Rtl8192DERadioA_2T_intPAArrayLength]; -+#define Rtl8192DERadioB_2T_intPAArrayLength 384 -+extern const u32 Rtl8192DERadioB_2T_intPAArray[Rtl8192DERadioB_2T_intPAArrayLength]; -+#define Rtl8192DEMAC_2T_ArrayLength 192 -+extern const u32 Rtl8192DEMAC_2T_Array[Rtl8192DEMAC_2T_ArrayLength]; -+#define Rtl8192DEAGCTAB_ArrayLength 386 -+extern const u32 Rtl8192DEAGCTAB_Array[Rtl8192DEAGCTAB_ArrayLength]; -+#define Rtl8192DEAGCTAB_5GArrayLength 194 -+extern const u32 Rtl8192DEAGCTAB_5GArray[Rtl8192DEAGCTAB_5GArrayLength]; -+#define Rtl8192DEAGCTAB_2GArrayLength 194 -+extern const u32 Rtl8192DEAGCTAB_2GArray[Rtl8192DEAGCTAB_2GArrayLength]; -+#define Rtl8192DEAGCTAB_2TArrayLength 1 -+extern const u32 Rtl8192DEAGCTAB_2TArray[Rtl8192DEAGCTAB_2TArrayLength]; -+#define Rtl8192DEAGCTAB_1TArrayLength 1 -+extern const u32 Rtl8192DEAGCTAB_1TArray[Rtl8192DEAGCTAB_1TArrayLength]; -+ -+#endif //__INC_HAL8192CU_FW_IMG_H ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h -@@ -0,0 +1,528 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/***************************************************************************** -+ * -+ * Module: __INC_HAL8192DPHYCFG_H -+ * -+ * -+ * Note: -+ * -+ * -+ * Export: Constants, macro, functions(API), global variables(None). -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. -+ * 2. Reorganize code architecture. -+ * -+ *****************************************************************************/ -+ /* Check to see if the file has been included already. */ -+#ifndef __INC_HAL8192DPHYCFG_H -+#define __INC_HAL8192DPHYCFG_H -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+#define LOOP_LIMIT 5 -+#define MAX_STALL_TIME 50 //us -+#define AntennaDiversityValue 0x80 //(Adapter->bSoftwareAntennaDiversity ? 0x00:0x80) -+#define MAX_TXPWR_IDX_NMODE_92S 63 -+#define Reset_Cnt_Limit 3 -+ -+ -+#define IQK_MAC_REG_NUM 4 -+#define IQK_ADDA_REG_NUM 16 -+#define IQK_BB_REG_NUM 10 -+#define IQK_BB_REG_NUM_92C 9 -+#define IQK_BB_REG_NUM_92D 10 -+#define IQK_BB_REG_NUM_test 6 -+#define index_mapping_NUM 13 -+#define Rx_index_mapping_NUM 15 -+#define AVG_THERMAL_NUM 8 -+#define IQK_Matrix_REG_NUM 8 -+#define IQK_Matrix_Settings_NUM 1+24+21 -+ -+#ifdef CONFIG_PCI_HCI -+#define SET_RTL8192SE_RF_SLEEP(_pAdapter) \ -+{ \ -+ u1Byte u1bTmp; \ -+ u1bTmp = PlatformEFIORead1Byte(_pAdapter, REG_LDOV12D_CTRL); \ -+ u1bTmp |= BIT0; \ -+ PlatformEFIOWrite1Byte(_pAdapter, REG_LDOV12D_CTRL, u1bTmp); \ -+ PlatformEFIOWrite1Byte(_pAdapter, REG_SPS_OCP_CFG, 0x0); \ -+ PlatformEFIOWrite1Byte(_pAdapter, TXPAUSE, 0xFF); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x57FC); \ -+ delay_us(100); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x77FC); \ -+ PlatformEFIOWrite1Byte(_pAdapter, PHY_CCA, 0x0); \ -+ delay_us(10); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x37FC); \ -+ delay_us(10); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x77FC); \ -+ delay_us(10); \ -+ PlatformEFIOWrite2Byte(_pAdapter, CMDR, 0x57FC); \ -+} -+#endif -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+/*------------------------------Define structure----------------------------*/ -+typedef enum _SwChnlCmdID{ -+ CmdID_End, -+ CmdID_SetTxPowerLevel, -+ CmdID_BBRegWrite10, -+ CmdID_WritePortUlong, -+ CmdID_WritePortUshort, -+ CmdID_WritePortUchar, -+ CmdID_RF_WriteReg, -+}SwChnlCmdID; -+ -+ -+/* 1. Switch channel related */ -+typedef struct _SwChnlCmd{ -+ SwChnlCmdID CmdID; -+ u32 Para1; -+ u32 Para2; -+ u32 msDelay; -+}SwChnlCmd; -+ -+typedef enum _HW90_BLOCK{ -+ HW90_BLOCK_MAC = 0, -+ HW90_BLOCK_PHY0 = 1, -+ HW90_BLOCK_PHY1 = 2, -+ HW90_BLOCK_RF = 3, -+ HW90_BLOCK_MAXIMUM = 4, // Never use this -+}HW90_BLOCK_E, *PHW90_BLOCK_E; -+ -+//vivi added this for read parameter from header, 20100908 -+typedef enum _RF_CONTENT{ -+ radioa_txt = 0x1000, -+ radiob_txt = 0x1001, -+ radioc_txt = 0x1002, -+ radiod_txt = 0x1003 -+} RF_CONTENT; -+ -+#define RF_PATH_MAX 2 -+ -+typedef enum _WIRELESS_MODE { -+ WIRELESS_MODE_UNKNOWN = 0x00, -+ WIRELESS_MODE_A = 0x01, -+ WIRELESS_MODE_B = 0x02, -+ WIRELESS_MODE_G = 0x04, -+ WIRELESS_MODE_AUTO = 0x08, -+ WIRELESS_MODE_N_24G = 0x10, -+ WIRELESS_MODE_N_5G = 0x20 -+} WIRELESS_MODE; -+ -+ -+#define CHANNEL_MAX_NUMBER 14+24+21 // 14 is the max channel number -+#define CHANNEL_GROUP_MAX 3+9 // ch1~3, ch4~9, ch10~14 total three groups -+#define MAX_PG_GROUP 13 -+ -+#define CHANNEL_GROUP_MAX_2G 3 -+#define CHANNEL_GROUP_IDX_5GL 3 -+#define CHANNEL_GROUP_IDX_5GM 6 -+#define CHANNEL_GROUP_IDX_5GH 9 -+#define CHANNEL_GROUP_MAX_5G 9 -+#define CHANNEL_MAX_NUMBER_2G 14 -+ -+typedef enum _BaseBand_Config_Type{ -+ BaseBand_Config_PHY_REG = 0, //Radio Path A -+ BaseBand_Config_AGC_TAB = 1, //Radio Path B -+}BaseBand_Config_Type, *PBaseBand_Config_Type; -+ -+typedef enum _MACPHY_MODE_8192D{ -+ SINGLEMAC_SINGLEPHY, -+ DUALMAC_DUALPHY, -+ DUALMAC_SINGLEPHY, -+}MACPHY_MODE_8192D,*PMACPHY_MODE_8192D; -+ -+typedef enum _MACPHY_MODE_CHANGE_ACTION{ -+ DMDP2DMSP = 0, -+ DMSP2DMDP = 1, -+ DMDP2SMSP = 2, -+ SMSP2DMDP = 3, -+ DMSP2SMSP = 4, -+ SMSP2DMSP = 5, -+ MAXACTION -+}MACPHY_MODE_CHANGE_ACTION,*PMACPHY_MODE_CHANGE_ACTION; -+ -+typedef enum _BAND_TYPE{ -+ BAND_ON_2_4G = 0, -+ BAND_ON_5G, -+ BAND_ON_BOTH, -+ BANDMAX -+}BAND_TYPE,*PBAND_TYPE; -+ -+typedef enum _PHY_Rate_Tx_Power_Offset_Area{ -+ RA_OFFSET_LEGACY_OFDM1, -+ RA_OFFSET_LEGACY_OFDM2, -+ RA_OFFSET_HT_OFDM1, -+ RA_OFFSET_HT_OFDM2, -+ RA_OFFSET_HT_OFDM3, -+ RA_OFFSET_HT_OFDM4, -+ RA_OFFSET_HT_CCK, -+}RA_OFFSET_AREA,*PRA_OFFSET_AREA; -+ -+ -+/* BB/RF related */ -+typedef enum _RF_TYPE_8190P{ -+ RF_TYPE_MIN, // 0 -+ RF_8225=1, // 1 11b/g RF for verification only -+ RF_8256=2, // 2 11b/g/n -+ RF_8258=3, // 3 11a/b/g/n RF -+ RF_6052=4, // 4 11b/g/n RF -+ //RF_6052=5, // 4 11b/g/n RF -+ // TODO: We sholud remove this psudo PHY RF after we get new RF. -+ RF_PSEUDO_11N=5, // 5, It is a temporality RF. -+}RF_TYPE_8190P_E,*PRF_TYPE_8190P_E; -+ -+typedef struct _BB_REGISTER_DEFINITION{ -+ u32 rfintfs; // set software control: -+ // 0x870~0x877[8 bytes] -+ -+ u32 rfintfi; // readback data: -+ // 0x8e0~0x8e7[8 bytes] -+ -+ u32 rfintfo; // output data: -+ // 0x860~0x86f [16 bytes] -+ -+ u32 rfintfe; // output enable: -+ // 0x860~0x86f [16 bytes] -+ -+ u32 rf3wireOffset; // LSSI data: -+ // 0x840~0x84f [16 bytes] -+ -+ u32 rfLSSI_Select; // BB Band Select: -+ // 0x878~0x87f [8 bytes] -+ -+ u32 rfTxGainStage; // Tx gain stage: -+ // 0x80c~0x80f [4 bytes] -+ -+ u32 rfHSSIPara1; // wire parameter control1 : -+ // 0x820~0x823,0x828~0x82b, 0x830~0x833, 0x838~0x83b [16 bytes] -+ -+ u32 rfHSSIPara2; // wire parameter control2 : -+ // 0x824~0x827,0x82c~0x82f, 0x834~0x837, 0x83c~0x83f [16 bytes] -+ -+ u32 rfSwitchControl; //Tx Rx antenna control : -+ // 0x858~0x85f [16 bytes] -+ -+ u32 rfAGCControl1; //AGC parameter control1 : -+ // 0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63, 0xc68~0xc6b [16 bytes] -+ -+ u32 rfAGCControl2; //AGC parameter control2 : -+ // 0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] -+ -+ u32 rfRxIQImbalance; //OFDM Rx IQ imbalance matrix : -+ // 0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] -+ -+ u32 rfRxAFE; //Rx IQ DC ofset and Rx digital filter, Rx DC notch filter : -+ // 0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23, 0xc28~0xc2b [16 bytes] -+ -+ u32 rfTxIQImbalance; //OFDM Tx IQ imbalance matrix -+ // 0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93, 0xc98~0xc9b [16 bytes] -+ -+ u32 rfTxAFE; //Tx IQ DC Offset and Tx DFIR type -+ // 0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] -+ -+ u32 rfLSSIReadBack; //LSSI RF readback data SI mode -+ // 0x8a0~0x8af [16 bytes] -+ -+ u32 rfLSSIReadBackPi; //LSSI RF readback data PI mode 0x8b8-8bc for Path A and B -+ -+}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T; -+ -+#ifdef CONFIG_MP_INCLUDED -+typedef enum _ANTENNA_PATH{ -+ ANTENNA_NONE = 0x00, -+ ANTENNA_D , -+ ANTENNA_C , -+ ANTENNA_CD , -+ ANTENNA_B , -+ ANTENNA_BD , -+ ANTENNA_BC , -+ ANTENNA_BCD , -+ ANTENNA_A , -+ ANTENNA_AD , -+ ANTENNA_AC , -+ ANTENNA_ACD , -+ ANTENNA_AB , -+ ANTENNA_ABD , -+ ANTENNA_ABC , -+ ANTENNA_ABCD -+} ANTENNA_PATH; -+#endif -+ -+typedef struct _R_ANTENNA_SELECT_OFDM{ -+ u32 r_tx_antenna:4; -+ u32 r_ant_l:4; -+ u32 r_ant_non_ht:4; -+ u32 r_ant_ht1:4; -+ u32 r_ant_ht2:4; -+ u32 r_ant_ht_s1:4; -+ u32 r_ant_non_ht_s1:4; -+ u32 OFDM_TXSC:2; -+ u32 Reserved:2; -+}R_ANTENNA_SELECT_OFDM; -+ -+typedef struct _R_ANTENNA_SELECT_CCK{ -+ u8 r_cckrx_enable_2:2; -+ u8 r_cckrx_enable:2; -+ u8 r_ccktx_enable:4; -+}R_ANTENNA_SELECT_CCK; -+ -+/*------------------------------Define structure----------------------------*/ -+ -+ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export global variable----------------------------*/ -+ -+ -+/*------------------------Export Marco Definition---------------------------*/ -+/*------------------------Export Marco Definition---------------------------*/ -+ -+//Added for TX Power -+//u8 GetRightChnlPlace(u8 chnl); -+u8 rtl8192d_GetRightChnlPlaceforIQK(u8 chnl); -+u8 rtl8192d_getChnlGroupfromArray(u8 chnl); -+/*--------------------------Exported Function prototype---------------------*/ -+// -+// BB and RF register read/write -+// -+void rtl8192d_PHY_SetBBReg1Byte( IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data ); -+u32 rtl8192d_PHY_QueryBBReg( IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask ); -+void rtl8192d_PHY_SetBBReg( IN PADAPTER Adapter, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data ); -+u32 rtl8192d_PHY_QueryRFReg( IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 RegAddr, -+ IN u32 BitMask ); -+void rtl8192d_PHY_SetRFReg( IN PADAPTER Adapter, -+ IN RF_RADIO_PATH_E eRFPath, -+ IN u32 RegAddr, -+ IN u32 BitMask, -+ IN u32 Data ); -+ -+// -+// Initialization related function -+// -+/* MAC/BB/RF HAL config */ -+extern int PHY_MACConfig8192D( IN PADAPTER Adapter ); -+extern int PHY_BBConfig8192D( IN PADAPTER Adapter ); -+extern int PHY_RFConfig8192D( IN PADAPTER Adapter ); -+/* RF config */ -+int rtl8192d_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, -+ IN u8* pFileName, -+ IN RF_RADIO_PATH_E eRFPath); -+int rtl8192d_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, -+ IN RF_CONTENT Content, -+ IN RF_RADIO_PATH_E eRFPath); -+/* BB/RF readback check for making sure init OK */ -+int rtl8192d_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, -+ IN HW90_BLOCK_E CheckBlock, -+ IN RF_RADIO_PATH_E eRFPath ); -+/* Read initi reg value for tx power setting. */ -+void rtl8192d_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); -+ -+// -+// RF Power setting -+// -+//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, -+// IN RT_RF_POWER_STATE eRFPowerState); -+ -+// -+// BB TX Power R/W -+// -+void PHY_GetTxPowerLevel8192D( IN PADAPTER Adapter, -+ OUT u32* powerlevel ); -+void PHY_SetTxPowerLevel8192D( IN PADAPTER Adapter, -+ IN u8 channel ); -+BOOLEAN PHY_UpdateTxPowerDbm8192D( IN PADAPTER Adapter, -+ IN int powerInDbm ); -+ -+// -+VOID -+PHY_ScanOperationBackup8192D(IN PADAPTER Adapter, -+ IN u8 Operation ); -+ -+// -+// Switch bandwidth for 8192S -+// -+//void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -+void PHY_SetBWMode8192D( IN PADAPTER pAdapter, -+ IN HT_CHANNEL_WIDTH ChnlWidth, -+ IN unsigned char Offset ); -+ -+// -+// Set FW CMD IO for 8192S. -+// -+//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, -+// IN IO_TYPE IOType); -+ -+// -+// Set A2 entry to fw for 8192S -+// -+extern void FillA2Entry8192C( IN PADAPTER Adapter, -+ IN u8 index, -+ IN u8* val); -+ -+ -+// -+// channel switch related funciton -+// -+//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -+void PHY_SwChnl8192D( IN PADAPTER pAdapter, -+ IN u8 channel ); -+ // Call after initialization -+void PHY_SwChnlPhy8192D( IN PADAPTER pAdapter, -+ IN u8 channel ); -+ -+extern void ChkFwCmdIoDone( IN PADAPTER Adapter); -+ -+#ifdef USE_WORKITEM -+//extern void SetIOWorkItemCallback( IN PVOID pContext ); -+#else -+//extern void SetIOTimerCallback( IN PRT_TIMER pTimer); -+#endif -+ -+// -+// BB/MAC/RF other monitor API -+// -+void PHY_SetMonitorMode8192D(IN PADAPTER pAdapter, -+ IN BOOLEAN bEnableMonitorMode ); -+ -+BOOLEAN PHY_CheckIsLegalRfPath8192D(IN PADAPTER pAdapter, -+ IN u32 eRFPath ); -+ -+// -+// IQ calibrate -+// -+void rtl8192d_PHY_IQCalibrate( IN PADAPTER pAdapter); -+ -+ -+// -+// LC calibrate -+// -+void rtl8192d_PHY_LCCalibrate(IN PADAPTER pAdapter); -+ -+// -+// AP calibrate -+// -+void rtl8192d_PHY_APCalibrate(IN PADAPTER pAdapter, IN char delta); -+ -+ -+// -+// Modify the value of the hw register when beacon interval be changed. -+// -+void -+rtl8192d_PHY_SetBeaconHwReg( IN PADAPTER Adapter, -+ IN u16 BeaconInterval ); -+ -+ -+extern VOID -+PHY_SwitchEphyParameter( -+ IN PADAPTER Adapter -+ ); -+ -+extern VOID -+PHY_EnableHostClkReq( -+ IN PADAPTER Adapter -+ ); -+ -+BOOLEAN -+SetAntennaConfig92C( -+ IN PADAPTER Adapter, -+ IN u8 DefaultAnt -+ ); -+ -+VOID -+PHY_StopTRXBeforeChangeBand8192D( -+ PADAPTER Adapter -+); -+ -+VOID -+PHY_UpdateBBRFConfiguration8192D( -+ IN PADAPTER Adapter, -+ IN BOOLEAN bisBandSwitch -+); -+ -+VOID PHY_ReadMacPhyMode92D( -+ IN PADAPTER Adapter, -+ IN BOOLEAN AutoloadFail -+); -+ -+VOID PHY_ConfigMacPhyMode92D( -+ IN PADAPTER Adapter -+); -+ -+VOID PHY_ConfigMacPhyModeInfo92D( -+ IN PADAPTER Adapter -+); -+ -+VOID PHY_ConfigMacCoexist_RFPage92D( -+ IN PADAPTER Adapter -+); -+ -+VOID -+rtl8192d_PHY_InitRxSetting( -+ IN PADAPTER Adapter -+); -+ -+VOID -+rtl8192d_PHY_ResetIQKResult( -+ IN PADAPTER Adapter -+); -+ -+ -+VOID -+rtl8192d_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); -+ -+VOID -+HalChangeCCKStatus8192D( -+ IN PADAPTER Adapter, -+ IN BOOLEAN bCCKDisable -+); -+ -+VOID -+PHY_InitPABias92D(IN PADAPTER Adapter); -+ -+/*--------------------------Exported Function prototype---------------------*/ -+ -+#define PHY_SetBBReg1Byte(Adapter, RegAddr, BitMask, Data) rtl8192d_PHY_SetBBReg1Byte((Adapter), (RegAddr), (BitMask), (Data)) -+#define PHY_QueryBBReg(Adapter, RegAddr, BitMask) rtl8192d_PHY_QueryBBReg((Adapter), (RegAddr), (BitMask)) -+#define PHY_SetBBReg(Adapter, RegAddr, BitMask, Data) rtl8192d_PHY_SetBBReg((Adapter), (RegAddr), (BitMask), (Data)) -+#define PHY_QueryRFReg(Adapter, eRFPath, RegAddr, BitMask) rtl8192d_PHY_QueryRFReg((Adapter), (eRFPath), (RegAddr), (BitMask)) -+#define PHY_SetRFReg(Adapter, eRFPath, RegAddr, BitMask, Data) rtl8192d_PHY_SetRFReg((Adapter), (eRFPath), (RegAddr), (BitMask), (Data)) -+ -+#define PHY_SetMacReg PHY_SetBBReg -+ -+#endif // __INC_HAL8192SPHYCFG_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h -@@ -0,0 +1,1171 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/***************************************************************************** -+ * -+ * Module: __INC_HAL8192DPHYREG_H -+ * -+ * -+ * Note: 1. Define PMAC/BB register map -+ * 2. Define RF register map -+ * 3. PMAC/BB register bit mask. -+ * 4. RF reg bit mask. -+ * 5. Other BB/RF relative definition. -+ * -+ * -+ * Export: Constants, macro, functions(API), global variables(None). -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. -+ * 2. Reorganize code architecture. -+ * 09/25/2008 MH 1. Add RL6052 register definition -+ * -+ *****************************************************************************/ -+#ifndef __INC_HAL8192DPHYREG_H -+#define __INC_HAL8192DPHYREG_H -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+//============================================================ -+// 8192S Regsiter offset definition -+//============================================================ -+ -+// -+// BB-PHY register PMAC 0x100 PHY 0x800 - 0xEFF -+// 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF -+// 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 -+// 3. RF register 0x00-2E -+// 4. Bit Mask for BB/RF register -+// 5. Other defintion for BB/RF R/W -+// -+ -+ -+// -+// 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF -+// 1. Page1(0x100) -+// -+#define rPMAC_Reset 0x100 -+#define rPMAC_TxStart 0x104 -+#define rPMAC_TxLegacySIG 0x108 -+#define rPMAC_TxHTSIG1 0x10c -+#define rPMAC_TxHTSIG2 0x110 -+#define rPMAC_PHYDebug 0x114 -+#define rPMAC_TxPacketNum 0x118 -+#define rPMAC_TxIdle 0x11c -+#define rPMAC_TxMACHeader0 0x120 -+#define rPMAC_TxMACHeader1 0x124 -+#define rPMAC_TxMACHeader2 0x128 -+#define rPMAC_TxMACHeader3 0x12c -+#define rPMAC_TxMACHeader4 0x130 -+#define rPMAC_TxMACHeader5 0x134 -+#define rPMAC_TxDataType 0x138 -+#define rPMAC_TxRandomSeed 0x13c -+#define rPMAC_CCKPLCPPreamble 0x140 -+#define rPMAC_CCKPLCPHeader 0x144 -+#define rPMAC_CCKCRC16 0x148 -+#define rPMAC_OFDMRxCRC32OK 0x170 -+#define rPMAC_OFDMRxCRC32Er 0x174 -+#define rPMAC_OFDMRxParityEr 0x178 -+#define rPMAC_OFDMRxCRC8Er 0x17c -+#define rPMAC_CCKCRxRC16Er 0x180 -+#define rPMAC_CCKCRxRC32Er 0x184 -+#define rPMAC_CCKCRxRC32OK 0x188 -+#define rPMAC_TxStatus 0x18c -+ -+// -+// 2. Page2(0x200) -+// -+// The following two definition are only used for USB interface. -+#define RF_BB_CMD_ADDR 0x02c0 // RF/BB read/write command address. -+#define RF_BB_CMD_DATA 0x02c4 // RF/BB read/write command data. -+ -+// -+// 3. Page8(0x800) -+// -+#define rFPGA0_RFMOD 0x800 //RF mode & CCK TxSC // RF BW Setting?? -+ -+#define rFPGA0_TxInfo 0x804 // Status report?? -+#define rFPGA0_PSDFunction 0x808 -+ -+#define rFPGA0_TxGainStage 0x80c // Set TX PWR init gain? -+ -+#define rFPGA0_RFTiming1 0x810 // Useless now -+#define rFPGA0_RFTiming2 0x814 -+ -+#define rFPGA0_XA_HSSIParameter1 0x820 // RF 3 wire register -+#define rFPGA0_XA_HSSIParameter2 0x824 -+#define rFPGA0_XB_HSSIParameter1 0x828 -+#define rFPGA0_XB_HSSIParameter2 0x82c -+ -+#define rFPGA0_XA_LSSIParameter 0x840 -+#define rFPGA0_XB_LSSIParameter 0x844 -+ -+#define rFPGA0_RFWakeUpParameter 0x850 // Useless now -+#define rFPGA0_RFSleepUpParameter 0x854 -+ -+#define rFPGA0_XAB_SwitchControl 0x858 // RF Channel switch -+#define rFPGA0_XCD_SwitchControl 0x85c -+ -+#define rFPGA0_XA_RFInterfaceOE 0x860 // RF Channel switch -+#define rFPGA0_XB_RFInterfaceOE 0x864 -+ -+#define rFPGA0_XAB_RFInterfaceSW 0x870 // RF Interface Software Control -+#define rFPGA0_XCD_RFInterfaceSW 0x874 -+ -+#define rFPGA0_XAB_RFParameter 0x878 // RF Parameter -+#define rFPGA0_XCD_RFParameter 0x87c -+ -+#define rFPGA0_AnalogParameter1 0x880 // Crystal cap setting RF-R/W protection for parameter4?? -+#define rFPGA0_AnalogParameter2 0x884 -+#define rFPGA0_AnalogParameter3 0x888 -+#define rFPGA0_AdDaClockEn 0x888 // enable ad/da clock1 for dual-phy -+#define rFPGA0_AnalogParameter4 0x88c -+ -+#define rFPGA0_XA_LSSIReadBack 0x8a0 // Tranceiver LSSI Readback -+#define rFPGA0_XB_LSSIReadBack 0x8a4 -+#define rFPGA0_XC_LSSIReadBack 0x8a8 -+#define rFPGA0_XD_LSSIReadBack 0x8ac -+ -+#define rFPGA0_PSDReport 0x8b4 // Useless now -+#define TransceiverA_HSPI_Readback 0x8b8 // Transceiver A HSPI Readback -+#define TransceiverB_HSPI_Readback 0x8bc // Transceiver B HSPI Readback -+#define rFPGA0_XAB_RFInterfaceRB 0x8e0 // Useless now // RF Interface Readback Value -+#define rFPGA0_XCD_RFInterfaceRB 0x8e4 // Useless now -+ -+// -+// 4. Page9(0x900) -+// -+#define rFPGA1_RFMOD 0x900 //RF mode & OFDM TxSC // RF BW Setting?? -+ -+#define rFPGA1_TxBlock 0x904 // Useless now -+#define rFPGA1_DebugSelect 0x908 // Useless now -+#define rFPGA1_TxInfo 0x90c // Useless now // Status report?? -+ -+// -+// 5. PageA(0xA00) -+// -+// Set Control channel to upper or lower. These settings are required only for 40MHz -+#define rCCK0_System 0xa00 -+ -+#define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI -+#define rCCK0_CCA 0xa08 // Disable init gain now // Init gain -+ -+#define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series -+#define rCCK0_RxAGC2 0xa10 //AGC & DAGC -+ -+#define rCCK0_RxHP 0xa14 -+ -+#define rCCK0_DSPParameter1 0xa18 //Timing recovery & Channel estimation threshold -+#define rCCK0_DSPParameter2 0xa1c //SQ threshold -+ -+#define rCCK0_TxFilter1 0xa20 -+#define rCCK0_TxFilter2 0xa24 -+#define rCCK0_DebugPort 0xa28 //debug port and Tx filter3 -+#define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report -+#define rCCK0_TRSSIReport 0xa50 -+#define rCCK0_RxReport 0xa54 //0xa57 -+#define rCCK0_FACounterLower 0xa5c //0xa5b -+#define rCCK0_FACounterUpper 0xa58 //0xa5c -+ -+// -+// PageB(0xB00) -+// -+#define rPdp_AntA 0xb00 -+#define rPdp_AntA_4 0xb04 -+#define rPdp_AntA_8 0xb08 -+#define rPdp_AntA_C 0xb0c -+#define rPdp_AntA_10 0xb10 -+#define rPdp_AntA_14 0xb14 -+#define rPdp_AntA_18 0xb18 -+#define rPdp_AntA_1C 0xb1c -+#define rPdp_AntA_20 0xb20 -+#define rPdp_AntA_24 0xb24 -+ -+#define rConfig_Pmpd_AntA 0xb28 -+#define rConfig_ram64x16 0xb2c -+ -+#define rBndA 0xb30 -+#define rHssiPar 0xb34 -+ -+#define rConfig_AntA 0xb68 -+#define rConfig_AntB 0xb6c -+ -+#define rPdp_AntB 0xb70 -+#define rPdp_AntB_4 0xb74 -+#define rPdp_AntB_8 0xb78 -+#define rPdp_AntB_C 0xb7c -+#define rPdp_AntB_10 0xb80 -+#define rPdp_AntB_14 0xb84 -+#define rPdp_AntB_18 0xb88 -+#define rPdp_AntB_1C 0xb8c -+#define rPdp_AntB_20 0xb90 -+#define rPdp_AntB_24 0xb94 -+ -+#define rConfig_Pmpd_AntB 0xb98 -+ -+#define rBndB 0xba0 -+ -+#define rAPK 0xbd8 -+#define rPm_Rx0_AntA 0xbdc -+#define rPm_Rx1_AntA 0xbe0 -+#define rPm_Rx2_AntA 0xbe4 -+#define rPm_Rx3_AntA 0xbe8 -+#define rPm_Rx0_AntB 0xbec -+#define rPm_Rx1_AntB 0xbf0 -+#define rPm_Rx2_AntB 0xbf4 -+#define rPm_Rx3_AntB 0xbf8 -+ -+// -+// 6. PageC(0xC00) -+// -+#define rOFDM0_LSTF 0xc00 -+ -+#define rOFDM0_TRxPathEnable 0xc04 -+#define rOFDM0_TRMuxPar 0xc08 -+#define rOFDM0_TRSWIsolation 0xc0c -+ -+#define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter -+#define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix -+#define rOFDM0_XBRxAFE 0xc18 -+#define rOFDM0_XBRxIQImbalance 0xc1c -+#define rOFDM0_XCRxAFE 0xc20 -+#define rOFDM0_XCRxIQImbalance 0xc24 -+#define rOFDM0_XDRxAFE 0xc28 -+#define rOFDM0_XDRxIQImbalance 0xc2c -+ -+#define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain -+#define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync. -+#define rOFDM0_RxDetector3 0xc38 //Frame Sync. -+#define rOFDM0_RxDetector4 0xc3c //PD, SBD, Frame Sync & Short-GI -+ -+#define rOFDM0_RxDSP 0xc40 //Rx Sync Path -+#define rOFDM0_CFOandDAGC 0xc44 //CFO & DAGC -+#define rOFDM0_CCADropThreshold 0xc48 //CCA Drop threshold -+#define rOFDM0_ECCAThreshold 0xc4c // energy CCA -+ -+#define rOFDM0_XAAGCCore1 0xc50 // DIG -+#define rOFDM0_XAAGCCore2 0xc54 -+#define rOFDM0_XBAGCCore1 0xc58 -+#define rOFDM0_XBAGCCore2 0xc5c -+#define rOFDM0_XCAGCCore1 0xc60 -+#define rOFDM0_XCAGCCore2 0xc64 -+#define rOFDM0_XDAGCCore1 0xc68 -+#define rOFDM0_XDAGCCore2 0xc6c -+ -+#define rOFDM0_AGCParameter1 0xc70 -+#define rOFDM0_AGCParameter2 0xc74 -+#define rOFDM0_AGCRSSITable 0xc78 -+#define rOFDM0_HTSTFAGC 0xc7c -+ -+#define rOFDM0_XATxIQImbalance 0xc80 // TX PWR TRACK and DIG -+#define rOFDM0_XATxAFE 0xc84 -+#define rOFDM0_XBTxIQImbalance 0xc88 -+#define rOFDM0_XBTxAFE 0xc8c -+#define rOFDM0_XCTxIQImbalance 0xc90 -+#define rOFDM0_XCTxAFE 0xc94 -+#define rOFDM0_XDTxIQImbalance 0xc98 -+#define rOFDM0_XDTxAFE 0xc9c -+ -+#define rOFDM0_RxIQExtAnta 0xca0 -+#define rOFDM0_TxCoeff1 0xca4 -+#define rOFDM0_TxCoeff2 0xca8 -+#define rOFDM0_TxCoeff3 0xcac -+#define rOFDM0_TxCoeff4 0xcb0 -+#define rOFDM0_TxCoeff5 0xcb4 -+#define rOFDM0_TxCoeff6 0xcb8 -+#define rOFDM0_RxHPParameter 0xce0 -+#define rOFDM0_TxPseudoNoiseWgt 0xce4 -+#define rOFDM0_FrameSync 0xcf0 -+#define rOFDM0_DFSReport 0xcf4 -+ -+// -+// 7. PageD(0xD00) -+// -+#define rOFDM1_LSTF 0xd00 -+#define rOFDM1_TRxPathEnable 0xd04 -+ -+#define rOFDM1_CFO 0xd08 // No setting now -+#define rOFDM1_CSI1 0xd10 -+#define rOFDM1_SBD 0xd14 -+#define rOFDM1_CSI2 0xd18 -+#define rOFDM1_CFOTracking 0xd2c -+#define rOFDM1_TRxMesaure1 0xd34 -+#define rOFDM1_IntfDet 0xd3c -+#define rOFDM1_PseudoNoiseStateAB 0xd50 -+#define rOFDM1_PseudoNoiseStateCD 0xd54 -+#define rOFDM1_RxPseudoNoiseWgt 0xd58 -+ -+#define rOFDM_PHYCounter1 0xda0 //cca, parity fail -+#define rOFDM_PHYCounter2 0xda4 //rate illegal, crc8 fail -+#define rOFDM_PHYCounter3 0xda8 //MCS not support -+ -+#define rOFDM_ShortCFOAB 0xdac // No setting now -+#define rOFDM_ShortCFOCD 0xdb0 -+#define rOFDM_LongCFOAB 0xdb4 -+#define rOFDM_LongCFOCD 0xdb8 -+#define rOFDM_TailCFOAB 0xdbc -+#define rOFDM_TailCFOCD 0xdc0 -+#define rOFDM_PWMeasure1 0xdc4 -+#define rOFDM_PWMeasure2 0xdc8 -+#define rOFDM_BWReport 0xdcc -+#define rOFDM_AGCReport 0xdd0 -+#define rOFDM_RxSNR 0xdd4 -+#define rOFDM_RxEVMCSI 0xdd8 -+#define rOFDM_SIGReport 0xddc -+ -+ -+// -+// 8. PageE(0xE00) -+// -+#define rTxAGC_A_Rate18_06 0xe00 -+#define rTxAGC_A_Rate54_24 0xe04 -+#define rTxAGC_A_CCK1_Mcs32 0xe08 -+#define rTxAGC_A_Mcs03_Mcs00 0xe10 -+#define rTxAGC_A_Mcs07_Mcs04 0xe14 -+#define rTxAGC_A_Mcs11_Mcs08 0xe18 -+#define rTxAGC_A_Mcs15_Mcs12 0xe1c -+ -+#define rTxAGC_B_Rate18_06 0x830 -+#define rTxAGC_B_Rate54_24 0x834 -+#define rTxAGC_B_CCK1_55_Mcs32 0x838 -+#define rTxAGC_B_Mcs03_Mcs00 0x83c -+#define rTxAGC_B_Mcs07_Mcs04 0x848 -+#define rTxAGC_B_Mcs11_Mcs08 0x84c -+#define rTxAGC_B_Mcs15_Mcs12 0x868 -+#define rTxAGC_B_CCK11_A_CCK2_11 0x86c -+ -+#define rFPGA0_IQK 0xe28 -+#define rTx_IQK_Tone_A 0xe30 -+#define rRx_IQK_Tone_A 0xe34 -+#define rTx_IQK_PI_A 0xe38 -+#define rRx_IQK_PI_A 0xe3c -+ -+#define rTx_IQK 0xe40 -+#define rRx_IQK 0xe44 -+#define rIQK_AGC_Pts 0xe48 -+#define rIQK_AGC_Rsp 0xe4c -+#define rTx_IQK_Tone_B 0xe50 -+#define rRx_IQK_Tone_B 0xe54 -+#define rTx_IQK_PI_B 0xe58 -+#define rRx_IQK_PI_B 0xe5c -+#define rIQK_AGC_Cont 0xe60 -+ -+#define rBlue_Tooth 0xe6c -+#define rRx_Wait_CCA 0xe70 -+#define rTx_CCK_RFON 0xe74 -+#define rTx_CCK_BBON 0xe78 -+#define rTx_OFDM_RFON 0xe7c -+#define rTx_OFDM_BBON 0xe80 -+#define rTx_To_Rx 0xe84 -+#define rTx_To_Tx 0xe88 -+#define rRx_CCK 0xe8c -+ -+#define rTx_Power_Before_IQK_A 0xe94 -+#define rTx_Power_After_IQK_A 0xe9c -+ -+#define rRx_Power_Before_IQK_A 0xea0 -+#define rRx_Power_Before_IQK_A_2 0xea4 -+#define rRx_Power_After_IQK_A 0xea8 -+#define rRx_Power_After_IQK_A_2 0xeac -+ -+#define rTx_Power_Before_IQK_B 0xeb4 -+#define rTx_Power_After_IQK_B 0xebc -+ -+#define rRx_Power_Before_IQK_B 0xec0 -+#define rRx_Power_Before_IQK_B_2 0xec4 -+#define rRx_Power_After_IQK_B 0xec8 -+#define rRx_Power_After_IQK_B_2 0xecc -+ -+#define rRx_OFDM 0xed0 -+#define rRx_Wait_RIFS 0xed4 -+#define rRx_TO_Rx 0xed8 -+#define rStandby 0xedc -+#define rSleep 0xee0 -+#define rPMPD_ANAEN 0xeec -+ -+// -+// 7. RF Register 0x00-0x2E (RF 8256) -+// RF-0222D 0x00-3F -+// -+//Zebra1 -+#define rZebra1_HSSIEnable 0x0 // Useless now -+#define rZebra1_TRxEnable1 0x1 -+#define rZebra1_TRxEnable2 0x2 -+#define rZebra1_AGC 0x4 -+#define rZebra1_ChargePump 0x5 -+#define rZebra1_Channel 0x7 // RF channel switch -+ -+//#endif -+#define rZebra1_TxGain 0x8 // Useless now -+#define rZebra1_TxLPF 0x9 -+#define rZebra1_RxLPF 0xb -+#define rZebra1_RxHPFCorner 0xc -+ -+//Zebra4 -+#define rGlobalCtrl 0 // Useless now -+#define rRTL8256_TxLPF 19 -+#define rRTL8256_RxLPF 11 -+ -+//RTL8258 -+#define rRTL8258_TxLPF 0x11 // Useless now -+#define rRTL8258_RxLPF 0x13 -+#define rRTL8258_RSSILPF 0xa -+ -+// -+// RL6052 Register definition -+// -+#define RF_AC 0x00 // -+ -+#define RF_IQADJ_G1 0x01 // -+#define RF_IQADJ_G2 0x02 // -+#define RF_BS_PA_APSET_G1_G4 0x03 -+#define RF_BS_PA_APSET_G5_G8 0x04 -+#define RF_POW_TRSW 0x05 // -+ -+#define RF_GAIN_RX 0x06 // -+#define RF_GAIN_TX 0x07 // -+ -+#define RF_TXM_IDAC 0x08 // -+#define RF_IPA_G 0x09 // -+#define RF_TXBIAS_G 0x0A -+#define RF_TXPA_AG 0x0B -+#define RF_IPA_A 0x0C // -+#define RF_TXBIAS_A 0x0D -+#define RF_BS_PA_APSET_G9_G11 0x0E -+#define RF_BS_IQGEN 0x0F // -+ -+#define RF_MODE1 0x10 // -+#define RF_MODE2 0x11 // -+ -+#define RF_RX_AGC_HP 0x12 // -+#define RF_TX_AGC 0x13 // -+#define RF_BIAS 0x14 // -+#define RF_IPA 0x15 // -+#define RF_POW_ABILITY 0x17 // -+#define RF_MODE_AG 0x18 // -+#define rRfChannel 0x18 // RF channel and BW switch -+#define RF_CHNLBW 0x18 // RF channel and BW switch -+#define RF_TOP 0x19 // -+ -+#define RF_RX_G1 0x1A // -+#define RF_RX_G2 0x1B // -+ -+#define RF_RX_BB2 0x1C // -+#define RF_RX_BB1 0x1D // -+ -+#define RF_RCK1 0x1E // -+#define RF_RCK2 0x1F // -+ -+#define RF_TX_G1 0x20 // -+#define RF_TX_G2 0x21 // -+#define RF_TX_G3 0x22 // -+ -+#define RF_TX_BB1 0x23 // -+ -+#define RF_T_METER 0x42 // -+ -+#define RF_SYN_G1 0x25 // RF TX Power control -+#define RF_SYN_G2 0x26 // RF TX Power control -+#define RF_SYN_G3 0x27 // RF TX Power control -+#define RF_SYN_G4 0x28 // RF TX Power control -+#define RF_SYN_G5 0x29 // RF TX Power control -+#define RF_SYN_G6 0x2A // RF TX Power control -+#define RF_SYN_G7 0x2B // RF TX Power control -+#define RF_SYN_G8 0x2C // RF TX Power control -+ -+#define RF_RCK_OS 0x30 // RF TX PA control -+ -+#define RF_TXPA_G1 0x31 // RF TX PA control -+#define RF_TXPA_G2 0x32 // RF TX PA control -+#define RF_TXPA_G3 0x33 // RF TX PA control -+#define RF_LOBF_9 0x38 -+#define RF_RXRF_A3 0x3C // -+#define RF_TRSW 0x3F -+ -+#define RF_TXRF_A2 0x41 -+#define RF_TXPA_G4 0x46 -+#define RF_TXPA_A4 0x4B -+ -+// -+//Bit Mask -+// -+// 1. Page1(0x100) -+#define bBBResetB 0x100 // Useless now? -+#define bGlobalResetB 0x200 -+#define bOFDMTxStart 0x4 -+#define bCCKTxStart 0x8 -+#define bCRC32Debug 0x100 -+#define bPMACLoopback 0x10 -+#define bTxLSIG 0xffffff -+#define bOFDMTxRate 0xf -+#define bOFDMTxReserved 0x10 -+#define bOFDMTxLength 0x1ffe0 -+#define bOFDMTxParity 0x20000 -+#define bTxHTSIG1 0xffffff -+#define bTxHTMCSRate 0x7f -+#define bTxHTBW 0x80 -+#define bTxHTLength 0xffff00 -+#define bTxHTSIG2 0xffffff -+#define bTxHTSmoothing 0x1 -+#define bTxHTSounding 0x2 -+#define bTxHTReserved 0x4 -+#define bTxHTAggreation 0x8 -+#define bTxHTSTBC 0x30 -+#define bTxHTAdvanceCoding 0x40 -+#define bTxHTShortGI 0x80 -+#define bTxHTNumberHT_LTF 0x300 -+#define bTxHTCRC8 0x3fc00 -+#define bCounterReset 0x10000 -+#define bNumOfOFDMTx 0xffff -+#define bNumOfCCKTx 0xffff0000 -+#define bTxIdleInterval 0xffff -+#define bOFDMService 0xffff0000 -+#define bTxMACHeader 0xffffffff -+#define bTxDataInit 0xff -+#define bTxHTMode 0x100 -+#define bTxDataType 0x30000 -+#define bTxRandomSeed 0xffffffff -+#define bCCKTxPreamble 0x1 -+#define bCCKTxSFD 0xffff0000 -+#define bCCKTxSIG 0xff -+#define bCCKTxService 0xff00 -+#define bCCKLengthExt 0x8000 -+#define bCCKTxLength 0xffff0000 -+#define bCCKTxCRC16 0xffff -+#define bCCKTxStatus 0x1 -+#define bOFDMTxStatus 0x2 -+ -+#define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff)) -+ -+// 2. Page8(0x800) -+#define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD -+#define bJapanMode 0x2 -+#define bCCKTxSC 0x30 -+#define bCCKEn 0x1000000 -+#define bOFDMEn 0x2000000 -+ -+#define bOFDMRxADCPhase 0x10000 // Useless now -+#define bOFDMTxDACPhase 0x40000 -+#define bXATxAGC 0x3f -+ -+#define bAntennaSelect 0x0300 -+ -+#define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage -+#define bXCTxAGC 0xf000 -+#define bXDTxAGC 0xf0000 -+ -+#define bPAStart 0xf0000000 // Useless now -+#define bTRStart 0x00f00000 -+#define bRFStart 0x0000f000 -+#define bBBStart 0x000000f0 -+#define bBBCCKStart 0x0000000f -+#define bPAEnd 0xf //Reg0x814 -+#define bTREnd 0x0f000000 -+#define bRFEnd 0x000f0000 -+#define bCCAMask 0x000000f0 //T2R -+#define bR2RCCAMask 0x00000f00 -+#define bHSSI_R2TDelay 0xf8000000 -+#define bHSSI_T2RDelay 0xf80000 -+#define bContTxHSSI 0x400 //chane gain at continue Tx -+#define bIGFromCCK 0x200 -+#define bAGCAddress 0x3f -+#define bRxHPTx 0x7000 -+#define bRxHPT2R 0x38000 -+#define bRxHPCCKIni 0xc0000 -+#define bAGCTxCode 0xc00000 -+#define bAGCRxCode 0x300000 -+ -+#define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1 -+#define b3WireAddressLength 0x400 -+ -+#define b3WireRFPowerDown 0x1 // Useless now -+//#define bHWSISelect 0x8 -+#define b5GPAPEPolarity 0x40000000 -+#define b2GPAPEPolarity 0x80000000 -+#define bRFSW_TxDefaultAnt 0x3 -+#define bRFSW_TxOptionAnt 0x30 -+#define bRFSW_RxDefaultAnt 0x300 -+#define bRFSW_RxOptionAnt 0x3000 -+#define bRFSI_3WireData 0x1 -+#define bRFSI_3WireClock 0x2 -+#define bRFSI_3WireLoad 0x4 -+#define bRFSI_3WireRW 0x8 -+#define bRFSI_3Wire 0xf -+ -+#define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW -+ -+#define bRFSI_TRSW 0x20 // Useless now -+#define bRFSI_TRSWB 0x40 -+#define bRFSI_ANTSW 0x100 -+#define bRFSI_ANTSWB 0x200 -+#define bRFSI_PAPE 0x400 -+#define bRFSI_PAPE5G 0x800 -+#define bBandSelect 0x1 -+#define bHTSIG2_GI 0x80 -+#define bHTSIG2_Smoothing 0x01 -+#define bHTSIG2_Sounding 0x02 -+#define bHTSIG2_Aggreaton 0x08 -+#define bHTSIG2_STBC 0x30 -+#define bHTSIG2_AdvCoding 0x40 -+#define bHTSIG2_NumOfHTLTF 0x300 -+#define bHTSIG2_CRC8 0x3fc -+#define bHTSIG1_MCS 0x7f -+#define bHTSIG1_BandWidth 0x80 -+#define bHTSIG1_HTLength 0xffff -+#define bLSIG_Rate 0xf -+#define bLSIG_Reserved 0x10 -+#define bLSIG_Length 0x1fffe -+#define bLSIG_Parity 0x20 -+#define bCCKRxPhase 0x4 -+ -+#define bLSSIReadAddress 0x7f800000 // T65 RF -+ -+#define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal -+ -+#define bLSSIReadBackData 0xfffff // T65 RF -+ -+#define bLSSIReadOKFlag 0x1000 // Useless now -+#define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz -+#define bRegulator0Standby 0x1 -+#define bRegulatorPLLStandby 0x2 -+#define bRegulator1Standby 0x4 -+#define bPLLPowerUp 0x8 -+#define bDPLLPowerUp 0x10 -+#define bDA10PowerUp 0x20 -+#define bAD7PowerUp 0x200 -+#define bDA6PowerUp 0x2000 -+#define bXtalPowerUp 0x4000 -+#define b40MDClkPowerUP 0x8000 -+#define bDA6DebugMode 0x20000 -+#define bDA6Swing 0x380000 -+ -+#define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ -+ -+#define b80MClkDelay 0x18000000 // Useless -+#define bAFEWatchDogEnable 0x20000000 -+ -+#define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap -+#define bXtalCap23 0x3 -+#define bXtalCap92x 0x0f000000 -+#define bXtalCap 0x0f000000 -+ -+#define bIntDifClkEnable 0x400 // Useless -+#define bExtSigClkEnable 0x800 -+#define bBandgapMbiasPowerUp 0x10000 -+#define bAD11SHGain 0xc0000 -+#define bAD11InputRange 0x700000 -+#define bAD11OPCurrent 0x3800000 -+#define bIPathLoopback 0x4000000 -+#define bQPathLoopback 0x8000000 -+#define bAFELoopback 0x10000000 -+#define bDA10Swing 0x7e0 -+#define bDA10Reverse 0x800 -+#define bDAClkSource 0x1000 -+#define bAD7InputRange 0x6000 -+#define bAD7Gain 0x38000 -+#define bAD7OutputCMMode 0x40000 -+#define bAD7InputCMMode 0x380000 -+#define bAD7Current 0xc00000 -+#define bRegulatorAdjust 0x7000000 -+#define bAD11PowerUpAtTx 0x1 -+#define bDA10PSAtTx 0x10 -+#define bAD11PowerUpAtRx 0x100 -+#define bDA10PSAtRx 0x1000 -+#define bCCKRxAGCFormat 0x200 -+#define bPSDFFTSamplepPoint 0xc000 -+#define bPSDAverageNum 0x3000 -+#define bIQPathControl 0xc00 -+#define bPSDFreq 0x3ff -+#define bPSDAntennaPath 0x30 -+#define bPSDIQSwitch 0x40 -+#define bPSDRxTrigger 0x400000 -+#define bPSDTxTrigger 0x80000000 -+#define bPSDSineToneScale 0x7f000000 -+#define bPSDReport 0xffff -+ -+// 3. Page9(0x900) -+#define bOFDMTxSC 0x30000000 // Useless -+#define bCCKTxOn 0x1 -+#define bOFDMTxOn 0x2 -+#define bDebugPage 0xfff //reset debug page and also HWord, LWord -+#define bDebugItem 0xff //reset debug page and LWord -+#define bAntL 0x10 -+#define bAntNonHT 0x100 -+#define bAntHT1 0x1000 -+#define bAntHT2 0x10000 -+#define bAntHT1S1 0x100000 -+#define bAntNonHTS1 0x1000000 -+ -+// 4. PageA(0xA00) -+#define bCCKBBMode 0x3 // Useless -+#define bCCKTxPowerSaving 0x80 -+#define bCCKRxPowerSaving 0x40 -+ -+#define bCCKSideBand 0x10 // Reg 0xa00 rCCK0_System 20/40 switch -+ -+#define bCCKScramble 0x8 // Useless -+#define bCCKAntDiversity 0x8000 -+#define bCCKCarrierRecovery 0x4000 -+#define bCCKTxRate 0x3000 -+#define bCCKDCCancel 0x0800 -+#define bCCKISICancel 0x0400 -+#define bCCKMatchFilter 0x0200 -+#define bCCKEqualizer 0x0100 -+#define bCCKPreambleDetect 0x800000 -+#define bCCKFastFalseCCA 0x400000 -+#define bCCKChEstStart 0x300000 -+#define bCCKCCACount 0x080000 -+#define bCCKcs_lim 0x070000 -+#define bCCKBistMode 0x80000000 -+#define bCCKCCAMask 0x40000000 -+#define bCCKTxDACPhase 0x4 -+#define bCCKRxADCPhase 0x20000000 //r_rx_clk -+#define bCCKr_cp_mode0 0x0100 -+#define bCCKTxDCOffset 0xf0 -+#define bCCKRxDCOffset 0xf -+#define bCCKCCAMode 0xc000 -+#define bCCKFalseCS_lim 0x3f00 -+#define bCCKCS_ratio 0xc00000 -+#define bCCKCorgBit_sel 0x300000 -+#define bCCKPD_lim 0x0f0000 -+#define bCCKNewCCA 0x80000000 -+#define bCCKRxHPofIG 0x8000 -+#define bCCKRxIG 0x7f00 -+#define bCCKLNAPolarity 0x800000 -+#define bCCKRx1stGain 0x7f0000 -+#define bCCKRFExtend 0x20000000 //CCK Rx Iinital gain polarity -+#define bCCKRxAGCSatLevel 0x1f000000 -+#define bCCKRxAGCSatCount 0xe0 -+#define bCCKRxRFSettle 0x1f //AGCsamp_dly -+#define bCCKFixedRxAGC 0x8000 -+//#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824 -+#define bCCKAntennaPolarity 0x2000 -+#define bCCKTxFilterType 0x0c00 -+#define bCCKRxAGCReportType 0x0300 -+#define bCCKRxDAGCEn 0x80000000 -+#define bCCKRxDAGCPeriod 0x20000000 -+#define bCCKRxDAGCSatLevel 0x1f000000 -+#define bCCKTimingRecovery 0x800000 -+#define bCCKTxC0 0x3f0000 -+#define bCCKTxC1 0x3f000000 -+#define bCCKTxC2 0x3f -+#define bCCKTxC3 0x3f00 -+#define bCCKTxC4 0x3f0000 -+#define bCCKTxC5 0x3f000000 -+#define bCCKTxC6 0x3f -+#define bCCKTxC7 0x3f00 -+#define bCCKDebugPort 0xff0000 -+#define bCCKDACDebug 0x0f000000 -+#define bCCKFalseAlarmEnable 0x8000 -+#define bCCKFalseAlarmRead 0x4000 -+#define bCCKTRSSI 0x7f -+#define bCCKRxAGCReport 0xfe -+#define bCCKRxReport_AntSel 0x80000000 -+#define bCCKRxReport_MFOff 0x40000000 -+#define bCCKRxRxReport_SQLoss 0x20000000 -+#define bCCKRxReport_Pktloss 0x10000000 -+#define bCCKRxReport_Lockedbit 0x08000000 -+#define bCCKRxReport_RateError 0x04000000 -+#define bCCKRxReport_RxRate 0x03000000 -+#define bCCKRxFACounterLower 0xff -+#define bCCKRxFACounterUpper 0xff000000 -+#define bCCKRxHPAGCStart 0xe000 -+#define bCCKRxHPAGCFinal 0x1c00 -+#define bCCKRxFalseAlarmEnable 0x8000 -+#define bCCKFACounterFreeze 0x4000 -+#define bCCKTxPathSel 0x10000000 -+#define bCCKDefaultRxPath 0xc000000 -+#define bCCKOptionRxPath 0x3000000 -+ -+// 5. PageC(0xC00) -+#define bNumOfSTF 0x3 // Useless -+#define bShift_L 0xc0 -+#define bGI_TH 0xc -+#define bRxPathA 0x1 -+#define bRxPathB 0x2 -+#define bRxPathC 0x4 -+#define bRxPathD 0x8 -+#define bTxPathA 0x1 -+#define bTxPathB 0x2 -+#define bTxPathC 0x4 -+#define bTxPathD 0x8 -+#define bTRSSIFreq 0x200 -+#define bADCBackoff 0x3000 -+#define bDFIRBackoff 0xc000 -+#define bTRSSILatchPhase 0x10000 -+#define bRxIDCOffset 0xff -+#define bRxQDCOffset 0xff00 -+#define bRxDFIRMode 0x1800000 -+#define bRxDCNFType 0xe000000 -+#define bRXIQImb_A 0x3ff -+#define bRXIQImb_B 0xfc00 -+#define bRXIQImb_C 0x3f0000 -+#define bRXIQImb_D 0xffc00000 -+#define bDC_dc_Notch 0x60000 -+#define bRxNBINotch 0x1f000000 -+#define bPD_TH 0xf -+#define bPD_TH_Opt2 0xc000 -+#define bPWED_TH 0x700 -+#define bIfMF_Win_L 0x800 -+#define bPD_Option 0x1000 -+#define bMF_Win_L 0xe000 -+#define bBW_Search_L 0x30000 -+#define bwin_enh_L 0xc0000 -+#define bBW_TH 0x700000 -+#define bED_TH2 0x3800000 -+#define bBW_option 0x4000000 -+#define bRatio_TH 0x18000000 -+#define bWindow_L 0xe0000000 -+#define bSBD_Option 0x1 -+#define bFrame_TH 0x1c -+#define bFS_Option 0x60 -+#define bDC_Slope_check 0x80 -+#define bFGuard_Counter_DC_L 0xe00 -+#define bFrame_Weight_Short 0x7000 -+#define bSub_Tune 0xe00000 -+#define bFrame_DC_Length 0xe000000 -+#define bSBD_start_offset 0x30000000 -+#define bFrame_TH_2 0x7 -+#define bFrame_GI2_TH 0x38 -+#define bGI2_Sync_en 0x40 -+#define bSarch_Short_Early 0x300 -+#define bSarch_Short_Late 0xc00 -+#define bSarch_GI2_Late 0x70000 -+#define bCFOAntSum 0x1 -+#define bCFOAcc 0x2 -+#define bCFOStartOffset 0xc -+#define bCFOLookBack 0x70 -+#define bCFOSumWeight 0x80 -+#define bDAGCEnable 0x10000 -+#define bTXIQImb_A 0x3ff -+#define bTXIQImb_B 0xfc00 -+#define bTXIQImb_C 0x3f0000 -+#define bTXIQImb_D 0xffc00000 -+#define bTxIDCOffset 0xff -+#define bTxQDCOffset 0xff00 -+#define bTxDFIRMode 0x10000 -+#define bTxPesudoNoiseOn 0x4000000 -+#define bTxPesudoNoise_A 0xff -+#define bTxPesudoNoise_B 0xff00 -+#define bTxPesudoNoise_C 0xff0000 -+#define bTxPesudoNoise_D 0xff000000 -+#define bCCADropOption 0x20000 -+#define bCCADropThres 0xfff00000 -+#define bEDCCA_H 0xf -+#define bEDCCA_L 0xf0 -+#define bLambda_ED 0x300 -+#define bRxInitialGain 0x7f -+#define bRxAntDivEn 0x80 -+#define bRxAGCAddressForLNA 0x7f00 -+#define bRxHighPowerFlow 0x8000 -+#define bRxAGCFreezeThres 0xc0000 -+#define bRxFreezeStep_AGC1 0x300000 -+#define bRxFreezeStep_AGC2 0xc00000 -+#define bRxFreezeStep_AGC3 0x3000000 -+#define bRxFreezeStep_AGC0 0xc000000 -+#define bRxRssi_Cmp_En 0x10000000 -+#define bRxQuickAGCEn 0x20000000 -+#define bRxAGCFreezeThresMode 0x40000000 -+#define bRxOverFlowCheckType 0x80000000 -+#define bRxAGCShift 0x7f -+#define bTRSW_Tri_Only 0x80 -+#define bPowerThres 0x300 -+#define bRxAGCEn 0x1 -+#define bRxAGCTogetherEn 0x2 -+#define bRxAGCMin 0x4 -+#define bRxHP_Ini 0x7 -+#define bRxHP_TRLNA 0x70 -+#define bRxHP_RSSI 0x700 -+#define bRxHP_BBP1 0x7000 -+#define bRxHP_BBP2 0x70000 -+#define bRxHP_BBP3 0x700000 -+#define bRSSI_H 0x7f0000 //the threshold for high power -+#define bRSSI_Gen 0x7f000000 //the threshold for ant diversity -+#define bRxSettle_TRSW 0x7 -+#define bRxSettle_LNA 0x38 -+#define bRxSettle_RSSI 0x1c0 -+#define bRxSettle_BBP 0xe00 -+#define bRxSettle_RxHP 0x7000 -+#define bRxSettle_AntSW_RSSI 0x38000 -+#define bRxSettle_AntSW 0xc0000 -+#define bRxProcessTime_DAGC 0x300000 -+#define bRxSettle_HSSI 0x400000 -+#define bRxProcessTime_BBPPW 0x800000 -+#define bRxAntennaPowerShift 0x3000000 -+#define bRSSITableSelect 0xc000000 -+#define bRxHP_Final 0x7000000 -+#define bRxHTSettle_BBP 0x7 -+#define bRxHTSettle_HSSI 0x8 -+#define bRxHTSettle_RxHP 0x70 -+#define bRxHTSettle_BBPPW 0x80 -+#define bRxHTSettle_Idle 0x300 -+#define bRxHTSettle_Reserved 0x1c00 -+#define bRxHTRxHPEn 0x8000 -+#define bRxHTAGCFreezeThres 0x30000 -+#define bRxHTAGCTogetherEn 0x40000 -+#define bRxHTAGCMin 0x80000 -+#define bRxHTAGCEn 0x100000 -+#define bRxHTDAGCEn 0x200000 -+#define bRxHTRxHP_BBP 0x1c00000 -+#define bRxHTRxHP_Final 0xe0000000 -+#define bRxPWRatioTH 0x3 -+#define bRxPWRatioEn 0x4 -+#define bRxMFHold 0x3800 -+#define bRxPD_Delay_TH1 0x38 -+#define bRxPD_Delay_TH2 0x1c0 -+#define bRxPD_DC_COUNT_MAX 0x600 -+//#define bRxMF_Hold 0x3800 -+#define bRxPD_Delay_TH 0x8000 -+#define bRxProcess_Delay 0xf0000 -+#define bRxSearchrange_GI2_Early 0x700000 -+#define bRxFrame_Guard_Counter_L 0x3800000 -+#define bRxSGI_Guard_L 0xc000000 -+#define bRxSGI_Search_L 0x30000000 -+#define bRxSGI_TH 0xc0000000 -+#define bDFSCnt0 0xff -+#define bDFSCnt1 0xff00 -+#define bDFSFlag 0xf0000 -+#define bMFWeightSum 0x300000 -+#define bMinIdxTH 0x7f000000 -+#define bDAFormat 0x40000 -+#define bTxChEmuEnable 0x01000000 -+#define bTRSWIsolation_A 0x7f -+#define bTRSWIsolation_B 0x7f00 -+#define bTRSWIsolation_C 0x7f0000 -+#define bTRSWIsolation_D 0x7f000000 -+#define bExtLNAGain 0x7c00 -+ -+// 6. PageE(0xE00) -+#define bSTBCEn 0x4 // Useless -+#define bAntennaMapping 0x10 -+#define bNss 0x20 -+#define bCFOAntSumD 0x200 -+#define bPHYCounterReset 0x8000000 -+#define bCFOReportGet 0x4000000 -+#define bOFDMContinueTx 0x10000000 -+#define bOFDMSingleCarrier 0x20000000 -+#define bOFDMSingleTone 0x40000000 -+//#define bRxPath1 0x01 -+//#define bRxPath2 0x02 -+//#define bRxPath3 0x04 -+//#define bRxPath4 0x08 -+//#define bTxPath1 0x10 -+//#define bTxPath2 0x20 -+#define bHTDetect 0x100 -+#define bCFOEn 0x10000 -+#define bCFOValue 0xfff00000 -+#define bSigTone_Re 0x3f -+#define bSigTone_Im 0x7f00 -+#define bCounter_CCA 0xffff -+#define bCounter_ParityFail 0xffff0000 -+#define bCounter_RateIllegal 0xffff -+#define bCounter_CRC8Fail 0xffff0000 -+#define bCounter_MCSNoSupport 0xffff -+#define bCounter_FastSync 0xffff -+#define bShortCFO 0xfff -+#define bShortCFOTLength 12 //total -+#define bShortCFOFLength 11 //fraction -+#define bLongCFO 0x7ff -+#define bLongCFOTLength 11 -+#define bLongCFOFLength 11 -+#define bTailCFO 0x1fff -+#define bTailCFOTLength 13 -+#define bTailCFOFLength 12 -+#define bmax_en_pwdB 0xffff -+#define bCC_power_dB 0xffff0000 -+#define bnoise_pwdB 0xffff -+#define bPowerMeasTLength 10 -+#define bPowerMeasFLength 3 -+#define bRx_HT_BW 0x1 -+#define bRxSC 0x6 -+#define bRx_HT 0x8 -+#define bNB_intf_det_on 0x1 -+#define bIntf_win_len_cfg 0x30 -+#define bNB_Intf_TH_cfg 0x1c0 -+#define bRFGain 0x3f -+#define bTableSel 0x40 -+#define bTRSW 0x80 -+#define bRxSNR_A 0xff -+#define bRxSNR_B 0xff00 -+#define bRxSNR_C 0xff0000 -+#define bRxSNR_D 0xff000000 -+#define bSNREVMTLength 8 -+#define bSNREVMFLength 1 -+#define bCSI1st 0xff -+#define bCSI2nd 0xff00 -+#define bRxEVM1st 0xff0000 -+#define bRxEVM2nd 0xff000000 -+#define bSIGEVM 0xff -+#define bPWDB 0xff00 -+#define bSGIEN 0x10000 -+ -+#define bSFactorQAM1 0xf // Useless -+#define bSFactorQAM2 0xf0 -+#define bSFactorQAM3 0xf00 -+#define bSFactorQAM4 0xf000 -+#define bSFactorQAM5 0xf0000 -+#define bSFactorQAM6 0xf0000 -+#define bSFactorQAM7 0xf00000 -+#define bSFactorQAM8 0xf000000 -+#define bSFactorQAM9 0xf0000000 -+#define bCSIScheme 0x100000 -+ -+#define bNoiseLvlTopSet 0x3 // Useless -+#define bChSmooth 0x4 -+#define bChSmoothCfg1 0x38 -+#define bChSmoothCfg2 0x1c0 -+#define bChSmoothCfg3 0xe00 -+#define bChSmoothCfg4 0x7000 -+#define bMRCMode 0x800000 -+#define bTHEVMCfg 0x7000000 -+ -+#define bLoopFitType 0x1 // Useless -+#define bUpdCFO 0x40 -+#define bUpdCFOOffData 0x80 -+#define bAdvUpdCFO 0x100 -+#define bAdvTimeCtrl 0x800 -+#define bUpdClko 0x1000 -+#define bFC 0x6000 -+#define bTrackingMode 0x8000 -+#define bPhCmpEnable 0x10000 -+#define bUpdClkoLTF 0x20000 -+#define bComChCFO 0x40000 -+#define bCSIEstiMode 0x80000 -+#define bAdvUpdEqz 0x100000 -+#define bUChCfg 0x7000000 -+#define bUpdEqz 0x8000000 -+ -+//Rx Pseduo noise -+#define bRxPesudoNoiseOn 0x20000000 // Useless -+#define bRxPesudoNoise_A 0xff -+#define bRxPesudoNoise_B 0xff00 -+#define bRxPesudoNoise_C 0xff0000 -+#define bRxPesudoNoise_D 0xff000000 -+#define bPesudoNoiseState_A 0xffff -+#define bPesudoNoiseState_B 0xffff0000 -+#define bPesudoNoiseState_C 0xffff -+#define bPesudoNoiseState_D 0xffff0000 -+ -+//7. RF Register -+//Zebra1 -+#define bZebra1_HSSIEnable 0x8 // Useless -+#define bZebra1_TRxControl 0xc00 -+#define bZebra1_TRxGainSetting 0x07f -+#define bZebra1_RxCorner 0xc00 -+#define bZebra1_TxChargePump 0x38 -+#define bZebra1_RxChargePump 0x7 -+#define bZebra1_ChannelNum 0xf80 -+#define bZebra1_TxLPFBW 0x400 -+#define bZebra1_RxLPFBW 0x600 -+ -+//Zebra4 -+#define bRTL8256RegModeCtrl1 0x100 // Useless -+#define bRTL8256RegModeCtrl0 0x40 -+#define bRTL8256_TxLPFBW 0x18 -+#define bRTL8256_RxLPFBW 0x600 -+ -+//RTL8258 -+#define bRTL8258_TxLPFBW 0xc // Useless -+#define bRTL8258_RxLPFBW 0xc00 -+#define bRTL8258_RSSILPFBW 0xc0 -+ -+ -+// -+// Other Definition -+// -+ -+//byte endable for sb_write -+#define bByte0 0x1 // Useless -+#define bByte1 0x2 -+#define bByte2 0x4 -+#define bByte3 0x8 -+#define bWord0 0x3 -+#define bWord1 0xc -+#define bDWord 0xf -+ -+//for PutRegsetting & GetRegSetting BitMask -+#define bMaskByte0 0xff // Reg 0xc50 rOFDM0_XAAGCCore~0xC6f -+#define bMaskByte1 0xff00 -+#define bMaskByte2 0xff0000 -+#define bMaskByte3 0xff000000 -+#define bMaskHWord 0xffff0000 -+#define bMaskLWord 0x0000ffff -+#define bMaskDWord 0xffffffff -+#define bMask12Bits 0xfff -+#define bMaskH4Bits 0xf0000000 -+#define bMaskOFDM_D 0xffc00000 -+#define bMaskCCK 0x3f3f3f3f -+ -+//for PutRFRegsetting & GetRFRegSetting BitMask -+//#define bMask12Bits 0xfffff // RF Reg mask bits -+//#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF -+#define bRFRegOffsetMask 0xfffff -+//#define bRFRegOffsetMask 0xfff -+ -+//MAC0 will wirte PHY1 -+#define MAC0_ACCESS_PHY1 0x4000 -+//MAC1 will wirte PHY0 -+#define MAC1_ACCESS_PHY0 0x2000 -+ -+#define bEnable 0x1 // Useless -+#define bDisable 0x0 -+ -+#define LeftAntenna 0x0 // Useless -+#define RightAntenna 0x1 -+ -+#define tCheckTxStatus 500 //500ms // Useless -+#define tUpdateRxCounter 100 //100ms -+ -+#define rateCCK 0 // Useless -+#define rateOFDM 1 -+#define rateHT 2 -+ -+//define Register-End -+#define bPMAC_End 0x1ff // Useless -+#define bFPGAPHY0_End 0x8ff -+#define bFPGAPHY1_End 0x9ff -+#define bCCKPHY0_End 0xaff -+#define bOFDMPHY0_End 0xcff -+#define bOFDMPHY1_End 0xdff -+ -+//define max debug item in each debug page -+//#define bMaxItem_FPGA_PHY0 0x9 -+//#define bMaxItem_FPGA_PHY1 0x3 -+//#define bMaxItem_PHY_11B 0x16 -+//#define bMaxItem_OFDM_PHY0 0x29 -+//#define bMaxItem_OFDM_PHY1 0x0 -+ -+#define bPMACControl 0x0 // Useless -+#define bWMACControl 0x1 -+#define bWNICControl 0x2 -+ -+#define PathA 0x0 // Useless -+#define PathB 0x1 -+#define PathC 0x2 -+#define PathD 0x3 -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+#endif //__INC_HAL8192SPHYREG_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h -@@ -0,0 +1,66 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __INC_HAL8192DU_FW_IMG_H -+#define __INC_HAL8192DU_FW_IMG_H -+ -+#include -+ -+/*Created on 2011/11/11, 8: 8*/ -+ -+#define Rtl8192DUImgArrayLength 31452 -+extern const u8 Rtl8192DUFwImgArray[Rtl8192DUImgArrayLength]; -+#define Rtl8192DUMainArrayLength 1 -+extern const u8 Rtl8192DUFwMainArray[Rtl8192DUMainArrayLength]; -+#define Rtl8192DUDataArrayLength 1 -+extern const u8 Rtl8192DUFwDataArray[Rtl8192DUDataArrayLength]; -+#define Rtl8192DUPHY_REG_2TArrayLength 372 -+extern const u32 Rtl8192DUPHY_REG_2TArray[Rtl8192DUPHY_REG_2TArrayLength]; -+#define Rtl8192DUPHY_REG_1TArrayLength 1 -+extern const u32 Rtl8192DUPHY_REG_1TArray[Rtl8192DUPHY_REG_1TArrayLength]; -+#define Rtl8192DUPHY_REG_Array_PGLength 624 -+extern const u32 Rtl8192DUPHY_REG_Array_PG[Rtl8192DUPHY_REG_Array_PGLength]; -+#define Rtl8192DUPHY_REG_Array_MPLength 14 -+extern const u32 Rtl8192DUPHY_REG_Array_MP[Rtl8192DUPHY_REG_Array_MPLength]; -+#define Rtl8192DURadioA_2TArrayLength 378 -+extern const u32 Rtl8192DURadioA_2TArray[Rtl8192DURadioA_2TArrayLength]; -+#define Rtl8192DURadioB_2TArrayLength 384 -+extern const u32 Rtl8192DURadioB_2TArray[Rtl8192DURadioB_2TArrayLength]; -+#define Rtl8192DURadioA_1TArrayLength 1 -+extern const u32 Rtl8192DURadioA_1TArray[Rtl8192DURadioA_1TArrayLength]; -+#define Rtl8192DURadioB_1TArrayLength 1 -+extern const u32 Rtl8192DURadioB_1TArray[Rtl8192DURadioB_1TArrayLength]; -+#define Rtl8192DURadioA_2T_intPAArrayLength 378 -+extern const u32 Rtl8192DURadioA_2T_intPAArray[Rtl8192DURadioA_2T_intPAArrayLength]; -+#define Rtl8192DURadioB_2T_intPAArrayLength 384 -+extern const u32 Rtl8192DURadioB_2T_intPAArray[Rtl8192DURadioB_2T_intPAArrayLength]; -+#define Rtl8192DUMAC_2T_ArrayLength 192 -+extern const u32 Rtl8192DUMAC_2T_Array[Rtl8192DUMAC_2T_ArrayLength]; -+#define Rtl8192DUAGCTAB_ArrayLength 386 -+extern const u32 Rtl8192DUAGCTAB_Array[Rtl8192DUAGCTAB_ArrayLength]; -+#define Rtl8192DUAGCTAB_5GArrayLength 194 -+extern const u32 Rtl8192DUAGCTAB_5GArray[Rtl8192DUAGCTAB_5GArrayLength]; -+#define Rtl8192DUAGCTAB_2GArrayLength 194 -+extern const u32 Rtl8192DUAGCTAB_2GArray[Rtl8192DUAGCTAB_2GArrayLength]; -+#define Rtl8192DUAGCTAB_2TArrayLength 1 -+extern const u32 Rtl8192DUAGCTAB_2TArray[Rtl8192DUAGCTAB_2TArrayLength]; -+#define Rtl8192DUAGCTAB_1TArrayLength 1 -+extern const u32 Rtl8192DUAGCTAB_1TArray[Rtl8192DUAGCTAB_1TArrayLength]; -+ -+#endif //__INC_HAL8192CU_FW_IMG_H ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h -@@ -0,0 +1,30 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __INC_HAL8192DU_FW_IMG_WOWLAN_H -+#define __INC_HAL8192DU_FW_IMG_WOWLAN_H -+ -+/*Created on 2011/11/ 8, 14:15*/ -+ -+ -+#define DUWWImgArrayLength 24818 -+extern u8 Rtl8192DUFwWWImgArray[DUWWImgArrayLength]; -+ -+#endif //__INC_HAL8192DU_FW_IMG_WOWLAN_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h -@@ -0,0 +1,137 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __HALPWRSEQCMD_H__ -+#define __HALPWRSEQCMD_H__ -+ -+#include -+ -+/*---------------------------------------------*/ -+//3 The value of cmd: 4 bits -+/*---------------------------------------------*/ -+#define PWR_CMD_READ 0x00 -+ // offset: the read register offset -+ // msk: the mask of the read value -+ // value: N/A, left by 0 -+ // note: dirver shall implement this function by read & msk -+ -+#define PWR_CMD_WRITE 0x01 -+ // offset: the read register offset -+ // msk: the mask of the write bits -+ // value: write value -+ // note: driver shall implement this cmd by read & msk after write -+ -+#define PWR_CMD_POLLING 0x02 -+ // offset: the read register offset -+ // msk: the mask of the polled value -+ // value: the value to be polled, masked by the msd field. -+ // note: driver shall implement this cmd by -+ // do{ -+ // if( (Read(offset) & msk) == (value & msk) ) -+ // break; -+ // } while(not timeout); -+ -+#define PWR_CMD_DELAY 0x03 -+ // offset: the value to delay -+ // msk: N/A -+ // value: the unit of delay, 0: us, 1: ms -+ -+#define PWR_CMD_END 0x04 -+ // offset: N/A -+ // msk: N/A -+ // value: N/A -+ -+/*---------------------------------------------*/ -+//3 The value of base: 4 bits -+/*---------------------------------------------*/ -+ // define the base address of each block -+#define PWR_BASEADDR_MAC 0x00 -+#define PWR_BASEADDR_USB 0x01 -+#define PWR_BASEADDR_PCIE 0x02 -+#define PWR_BASEADDR_SDIO 0x03 -+ -+/*---------------------------------------------*/ -+//3 The value of interface_msk: 4 bits -+/*---------------------------------------------*/ -+#define PWR_INTF_SDIO_MSK BIT(0) -+#define PWR_INTF_USB_MSK BIT(1) -+#define PWR_INTF_PCI_MSK BIT(2) -+#define PWR_INTF_ALL_MSK (BIT(0)|BIT(1)|BIT(2)|BIT(3)) -+ -+/*---------------------------------------------*/ -+//3 The value of fab_msk: 4 bits -+/*---------------------------------------------*/ -+#define PWR_FAB_TSMC_MSK BIT(0) -+#define PWR_FAB_UMC_MSK BIT(1) -+#define PWR_FAB_ALL_MSK (BIT(0)|BIT(1)|BIT(2)|BIT(3)) -+ -+/*---------------------------------------------*/ -+//3 The value of cut_msk: 8 bits -+/*---------------------------------------------*/ -+#define PWR_CUT_TESTCHIP_MSK BIT(0) -+#define PWR_CUT_A_MSK BIT(1) -+#define PWR_CUT_B_MSK BIT(2) -+#define PWR_CUT_C_MSK BIT(3) -+#define PWR_CUT_D_MSK BIT(4) -+#define PWR_CUT_E_MSK BIT(5) -+#define PWR_CUT_F_MSK BIT(6) -+#define PWR_CUT_G_MSK BIT(7) -+#define PWR_CUT_ALL_MSK 0xFF -+ -+ -+typedef enum _PWRSEQ_CMD_DELAY_UNIT_ -+{ -+ PWRSEQ_DELAY_US, -+ PWRSEQ_DELAY_MS, -+} PWRSEQ_DELAY_UNIT; -+ -+typedef struct _WL_PWR_CFG_ -+{ -+ u16 offset; -+ u8 cut_msk; -+ u8 fab_msk:4; -+ u8 interface_msk:4; -+ u8 base:4; -+ u8 cmd:4; -+ u8 msk; -+ u8 value; -+} WLAN_PWR_CFG, *PWLAN_PWR_CFG; -+ -+ -+#define GET_PWR_CFG_OFFSET(__PWR_CMD) __PWR_CMD.offset -+#define GET_PWR_CFG_CUT_MASK(__PWR_CMD) __PWR_CMD.cut_msk -+#define GET_PWR_CFG_FAB_MASK(__PWR_CMD) __PWR_CMD.fab_msk -+#define GET_PWR_CFG_INTF_MASK(__PWR_CMD) __PWR_CMD.interface_msk -+#define GET_PWR_CFG_BASE(__PWR_CMD) __PWR_CMD.base -+#define GET_PWR_CFG_CMD(__PWR_CMD) __PWR_CMD.cmd -+#define GET_PWR_CFG_MASK(__PWR_CMD) __PWR_CMD.msk -+#define GET_PWR_CFG_VALUE(__PWR_CMD) __PWR_CMD.value -+ -+ -+//================================================================================ -+// Prototype of protected function. -+//================================================================================ -+u8 HalPwrSeqCmdParsing( -+ PADAPTER padapter, -+ u8 CutVersion, -+ u8 FabVersion, -+ u8 InterfaceType, -+ WLAN_PWR_CFG PwrCfgCmd[]); -+ -+#endif ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h -@@ -0,0 +1,336 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+/* -+ * Public General Config -+ */ -+#define AUTOCONF_INCLUDED -+#define RTL871X_MODULE_NAME "92CU" -+#define DRV_NAME "rtl8192cu" -+ -+#define CONFIG_USB_HCI 1 -+ -+#define CONFIG_RTL8192C 1 -+ -+#define PLATFORM_LINUX 1 -+ -+#define CONFIG_IOCTL_CFG80211 1 -+#ifdef CONFIG_IOCTL_CFG80211 -+ #define RTW_USE_CFG80211_STA_EVENT /* Indicate new sta asoc through cfg80211_new_sta */ -+ //#define CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER -+ //#define CONFIG_DEBUG_CFG80211 1 -+ //#define CONFIG_DRV_ISSUE_PROV_REQ // IOT FOR S2 -+ #define CONFIG_SET_SCAN_DENY_TIMER -+#endif -+ -+/* -+ * Internal General Config -+ */ -+//#define CONFIG_PWRCTRL -+//#define CONFIG_H2CLBK -+ -+#define CONFIG_EMBEDDED_FWIMG 1 -+//#define CONFIG_FILE_FWIMG -+ -+#ifdef CONFIG_WAKE_ON_WLAN -+#define CONFIG_WOWLAN 1 -+#endif //CONFIG_WAKE_ON_WLAN -+ -+#define CONFIG_R871X_TEST 1 -+ -+#define CONFIG_XMIT_ACK -+#ifdef CONFIG_XMIT_ACK -+ #define CONFIG_XMIT_ACK_POLLING -+ #define CONFIG_ACTIVE_KEEP_ALIVE_CHECK -+#endif -+ -+#define CONFIG_80211N_HT 1 -+ -+#define CONFIG_RECV_REORDERING_CTRL 1 -+ -+//#define CONFIG_TCP_CSUM_OFFLOAD_RX 1 -+ -+//#define CONFIG_BEFORE_LINKED_DIG -+//#define CONFIG_DRVEXT_MODULE 1 -+ -+#ifndef CONFIG_MP_INCLUDED -+ #define CONFIG_IPS 1 -+ #ifdef CONFIG_IPS -+ //#define CONFIG_IPS_LEVEL_2 1 //enable this to set default IPS mode to IPS_LEVEL_2 -+ #endif -+ -+ #define SUPPORT_HW_RFOFF_DETECTED 1 -+ -+ #define CONFIG_LPS 1 -+ #define CONFIG_BT_COEXIST 1 -+ -+ //befor link -+ #define CONFIG_ANTENNA_DIVERSITY -+ -+ //after link -+ #ifdef CONFIG_ANTENNA_DIVERSITY -+ #define CONFIG_SW_ANTENNA_DIVERSITY -+ //#define CONFIG_HW_ANTENNA_DIVERSITY -+ #endif -+ -+ #define CONFIG_IOL -+#else //#ifndef CONFIG_MP_INCLUDED -+ #define CONFIG_MP_IWPRIV_SUPPORT 1 -+#endif //#ifndef CONFIG_MP_INCLUDED -+ -+#define CONFIG_AP_MODE 1 -+#ifdef CONFIG_AP_MODE -+ #define CONFIG_NATIVEAP_MLME 1 -+ #ifndef CONFIG_NATIVEAP_MLME -+ #define CONFIG_HOSTAPD_MLME 1 -+ #endif -+ #define CONFIG_FIND_BEST_CHANNEL 1 -+ //#define CONFIG_NO_WIRELESS_HANDLERS 1 -+#endif -+ -+// Added by Albert 20110314 -+#define CONFIG_P2P 1 -+#ifdef CONFIG_P2P -+ //Added by Albert 20110812 -+ //The CONFIG_WFD is for supporting the Wi-Fi display -+ #define CONFIG_WFD -+ -+ #ifndef CONFIG_WIFI_TEST -+ #define CONFIG_P2P_REMOVE_GROUP_INFO -+ #endif -+ //#define CONFIG_DBG_P2P -+ -+ //#define CONFIG_P2P_PS -+ //#define CONFIG_P2P_IPS -+ -+ #define P2P_OP_CHECK_SOCIAL_CH -+ // Added comment by Borg 2013/06/21 -+ // Issue: Nexus 4 is hard to do miracast. -+ // Root Cause: After group formation, -+ // Nexus 4 is possible to be not at OP channel of Invitation Resp/Nego Confirm but at social channel. -+ // Patch: While scan OP channel, -+ // not only scan OP channel of Invitation Resp/Nego Confirm, -+ // but also scan social channel(1, 6, 11) -+#endif -+ -+// Added by Kurt 20110511 -+//#define CONFIG_TDLS 1 -+#ifdef CONFIG_TDLS -+// #ifndef CONFIG_WFD -+// #define CONFIG_WFD 1 -+// #endif -+// #define CONFIG_TDLS_AUTOSETUP 1 -+// #define CONFIG_TDLS_AUTOCHECKALIVE 1 -+#endif -+ -+#define CONFIG_SKB_COPY 1//for amsdu -+ -+#define CONFIG_LED -+#ifdef CONFIG_LED -+ #define CONFIG_SW_LED -+ #ifdef CONFIG_SW_LED -+ //#define CONFIG_LED_HANDLED_BY_CMD_THREAD -+ #endif -+#endif // CONFIG_LED -+ -+ -+ -+#define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface -+#define CONFIG_GLOBAL_UI_PID -+ -+#define CONFIG_LAYER2_ROAMING -+#define CONFIG_LAYER2_ROAMING_RESUME -+//#define CONFIG_ADAPTOR_INFO_CACHING_FILE // now just applied on 8192cu only, should make it general... -+//#define CONFIG_RESUME_IN_WORKQUEUE -+//#define CONFIG_SET_SCAN_DENY_TIMER -+#define CONFIG_LONG_DELAY_ISSUE -+#define CONFIG_NEW_SIGNAL_STAT_PROCESS -+//#define CONFIG_SIGNAL_DISPLAY_DBM //display RX signal with dbm -+#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable */ -+#define CONFIG_DEAUTH_BEFORE_CONNECT -+ -+#ifdef CONFIG_IOL -+ #define CONFIG_IOL_LLT -+ #define CONFIG_IOL_MAC -+ #define CONFIG_IOL_BB_PHY_REG -+ #define CONFIG_IOL_BB_AGC_TAB -+ #define CONFIG_IOL_RF_RF90_PATH_A -+ #define CONFIG_IOL_RF_RF90_PATH_B -+#endif -+ -+#define CONFIG_BR_EXT 1 // Enable NAT2.5 support for STA mode interface with a L2 Bridge -+#ifdef CONFIG_BR_EXT -+#define CONFIG_BR_EXT_BRNAME "br0" -+#endif // CONFIG_BR_EXT -+ -+#define CONFIG_TX_MCAST2UNI 1 // Support IP multicast->unicast -+//#define CONFIG_DM_ADAPTIVITY -+//#define CONFIG_CHECK_AC_LIFETIME 1 // Check packet lifetime of 4 ACs. -+ -+//#define CONFIG_CONCURRENT_MODE 1 -+#ifdef CONFIG_CONCURRENT_MODE -+ #define CONFIG_TSF_RESET_OFFLOAD 1 // For 2 PORT TSF SYNC. -+ //#define CONFIG_HWPORT_SWAP //Port0->Sec , Port1 -> Pri -+ //#define CONFIG_STA_MODE_SCAN_UNDER_AP_MODE -+ //#define CONFIG_MULTI_VIR_IFACES //besides primary&secondary interfaces, extend to support more interfaces -+#endif // CONFIG_CONCURRENT_MODE -+ -+#define CONFIG_80211D -+ -+/* -+ * Interface Related Config -+ */ -+ -+//#define CONFIG_USB_ONE_OUT_EP -+//#define CONFIG_USB_INTERRUPT_IN_PIPE 1 -+ -+#ifndef CONFIG_MINIMAL_MEMORY_USAGE -+ #define CONFIG_USB_TX_AGGREGATION 1 -+ #define CONFIG_USB_RX_AGGREGATION 1 -+#endif -+ -+#define CONFIG_PREALLOC_RECV_SKB 1 -+//#define CONFIG_REDUCE_USB_TX_INT 1 // Trade-off: Improve performance, but may cause TX URBs blocked by USB Host/Bus driver on few platforms. -+//#define CONFIG_EASY_REPLACEMENT 1 -+ -+/* -+ * CONFIG_USE_USB_BUFFER_ALLOC_XX uses Linux USB Buffer alloc API and is for Linux platform only now! -+ */ -+//#define CONFIG_USE_USB_BUFFER_ALLOC_TX 1 // Trade-off: For TX path, improve stability on some platforms, but may cause performance degrade on other platforms. -+//#define CONFIG_USE_USB_BUFFER_ALLOC_RX 1 // For RX path -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -+#undef CONFIG_PREALLOC_RECV_SKB -+#endif -+ -+/* -+ * USB VENDOR REQ BUFFER ALLOCATION METHOD -+ * if not set we'll use function local variable (stack memory) -+ */ -+//#define CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE -+#define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC -+ -+#define CONFIG_USB_VENDOR_REQ_MUTEX -+#define CONFIG_VENDOR_REQ_RETRY -+ -+//#define CONFIG_USB_SUPPORT_ASYNC_VDN_REQ 1 -+ -+ -+/* -+ * HAL Related Config -+ */ -+ -+#define RTL8192C_RX_PACKET_NO_INCLUDE_CRC 1 -+ -+#define SUPPORTED_BLOCK_IO -+ -+ -+ -+#define RTL8192CU_FW_DOWNLOAD_ENABLE 1 -+ -+#define CONFIG_ONLY_ONE_OUT_EP_TO_LOW 0 -+ -+#define CONFIG_OUT_EP_WIFI_MODE 0 -+ -+#define ENABLE_USB_DROP_INCORRECT_OUT 0 -+ -+#define RTL8192CU_ASIC_VERIFICATION 0 // For ASIC verification. -+ -+#define RTL8192CU_ADHOC_WORKAROUND_SETTING 1 -+ -+#define DISABLE_BB_RF 0 -+ -+#define RTL8191C_FPGA_NETWORKTYPE_ADHOC 0 -+ -+#ifdef CONFIG_MP_INCLUDED -+ #define MP_DRIVER 1 -+ #undef CONFIG_USB_TX_AGGREGATION -+ #undef CONFIG_USB_RX_AGGREGATION -+#else -+ #define MP_DRIVER 0 -+#endif -+ -+ -+/* -+ * Platform Related Config -+ */ -+#ifdef CONFIG_PLATFORM_MN10300 -+#define CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV -+ -+#if defined (CONFIG_SW_ANTENNA_DIVERSITY) -+ #undef CONFIG_SW_ANTENNA_DIVERSITY -+ #define CONFIG_HW_ANTENNA_DIVERSITY -+#endif -+ -+#endif -+ -+#ifdef CONFIG_WISTRON_PLATFORM -+ -+#endif -+ -+#ifdef CONFIG_PLATFORM_TI_DM365 -+#define CONFIG_USE_USB_BUFFER_ALLOC_RX 1 -+#endif -+ -+#define CONFIG_ATTEMPT_TO_FIX_AP_BEACON_ERROR -+ -+/* -+ * Debug Related Config -+ */ -+//#define CONFIG_DEBUG_RTL871X -+ -+#define DBG 0 -+//#define CONFIG_DEBUG_RTL819X -+ -+//#define CONFIG_PROC_DEBUG 1 -+ -+//#define DBG_IO -+//#define DBG_DELAY_OS -+//#define DBG_MEM_ALLOC -+//#define DBG_IOCTL -+ -+//#define DBG_TX -+//#define DBG_XMIT_BUF -+//#define DBG_TX_DROP_FRAME -+ -+//#define DBG_RX_DROP_FRAME -+//#define DBG_RX_SEQ -+//#define DBG_RX_SIGNAL_DISPLAY_PROCESSING -+//#define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap" -+ -+//#define DBG_EXPIRATION_CHK -+ -+ -+//#define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE -+//#define DBG_ROAMING_TEST -+ -+//#define DBG_HAL_INIT_PROFILING -+ -+//#define DBG_MEMORY_LEAK 1 -+ -+//#define DBG_CONFIG_ERROR_DETECT -+//#define DBG_CONFIG_ERROR_RESET -+ -+//TX use 1 urb -+//#define CONFIG_SINGLE_XMIT_BUF -+//RX use 1 urb -+//#define CONFIG_SINGLE_RECV_BUF -+ -+//turn off power tracking when traffic is busy -+//#define CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h -@@ -0,0 +1,321 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __BASIC_TYPES_H__ -+#define __BASIC_TYPES_H__ -+ -+#include -+ -+ -+#define SUCCESS 0 -+#define FAIL (-1) -+ -+#ifndef TRUE -+ #define _TRUE 1 -+#else -+ #define _TRUE TRUE -+#endif -+ -+#ifndef FALSE -+ #define _FALSE 0 -+#else -+ #define _FALSE FALSE -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+ typedef signed char s8; -+ typedef unsigned char u8; -+ -+ typedef signed short s16; -+ typedef unsigned short u16; -+ -+ typedef signed long s32; -+ typedef unsigned long u32; -+ -+ typedef unsigned int uint; -+ typedef signed int sint; -+ -+ -+ typedef signed long long s64; -+ typedef unsigned long long u64; -+ -+ #ifdef NDIS50_MINIPORT -+ -+ #define NDIS_MAJOR_VERSION 5 -+ #define NDIS_MINOR_VERSION 0 -+ -+ #endif -+ -+ #ifdef NDIS51_MINIPORT -+ -+ #define NDIS_MAJOR_VERSION 5 -+ #define NDIS_MINOR_VERSION 1 -+ -+ #endif -+ -+ typedef NDIS_PROC proc_t; -+ -+ typedef LONG atomic_t; -+ -+#endif -+ -+ -+#ifdef PLATFORM_LINUX -+ -+ #include -+ #define IN -+ #define OUT -+ #define VOID void -+ #define NDIS_OID uint -+ #define NDIS_STATUS uint -+ -+ typedef signed int sint; -+ -+ #ifndef PVOID -+ typedef void * PVOID; -+ //#define PVOID (void *) -+ #endif -+ -+ #define UCHAR u8 -+ #define USHORT u16 -+ #define UINT u32 -+ #define ULONG u32 -+ -+ typedef void (*proc_t)(void*); -+ -+ typedef __kernel_size_t SIZE_T; -+ typedef __kernel_ssize_t SSIZE_T; -+ #define FIELD_OFFSET(s,field) ((SSIZE_T)&((s*)(0))->field) -+ -+#endif -+ -+ -+#ifdef PLATFORM_FREEBSD -+ -+ typedef signed char s8; -+ typedef unsigned char u8; -+ -+ typedef signed short s16; -+ typedef unsigned short u16; -+ -+ typedef signed int s32; -+ typedef unsigned int u32; -+ -+ typedef unsigned int uint; -+ typedef signed int sint; -+ typedef long atomic_t; -+ -+ typedef signed long long s64; -+ typedef unsigned long long u64; -+ #define IN -+ #define OUT -+ #define VOID void -+ #define NDIS_OID uint -+ #define NDIS_STATUS uint -+ -+ #ifndef PVOID -+ typedef void * PVOID; -+ //#define PVOID (void *) -+ #endif -+ typedef u32 dma_addr_t; -+ #define UCHAR u8 -+ #define USHORT u16 -+ #define UINT u32 -+ #define ULONG u32 -+ -+ typedef void (*proc_t)(void*); -+ -+ typedef unsigned int __kernel_size_t; -+ typedef int __kernel_ssize_t; -+ -+ typedef __kernel_size_t SIZE_T; -+ typedef __kernel_ssize_t SSIZE_T; -+ #define FIELD_OFFSET(s,field) ((SSIZE_T)&((s*)(0))->field) -+ -+#endif -+ -+#define MEM_ALIGNMENT_OFFSET (sizeof (SIZE_T)) -+#define MEM_ALIGNMENT_PADDING (sizeof(SIZE_T) - 1) -+ -+#define SIZE_PTR SIZE_T -+#define SSIZE_PTR SSIZE_T -+ -+//port from fw by thomas -+// TODO: Belows are Sync from SD7-Driver. It is necessary to check correctness -+ -+/* -+ * Call endian free function when -+ * 1. Read/write packet content. -+ * 2. Before write integer to IO. -+ * 3. After read integer from IO. -+*/ -+ -+// -+// Byte Swapping routine. -+// -+#define EF1Byte -+#define EF2Byte le16_to_cpu -+#define EF4Byte le32_to_cpu -+ -+// -+// Read LE format data from memory -+// -+#define ReadEF1Byte(_ptr) EF1Byte(*((u8 *)(_ptr))) -+#define ReadEF2Byte(_ptr) EF2Byte(*((u16 *)(_ptr))) -+#define ReadEF4Byte(_ptr) EF4Byte(*((u32 *)(_ptr))) -+ -+// -+// Write LE data to memory -+// -+#define WriteEF1Byte(_ptr, _val) (*((u8 *)(_ptr)))=EF1Byte(_val) -+#define WriteEF2Byte(_ptr, _val) (*((u16 *)(_ptr)))=EF2Byte(_val) -+#define WriteEF4Byte(_ptr, _val) (*((u32 *)(_ptr)))=EF4Byte(_val) -+ -+// -+// Example: -+// BIT_LEN_MASK_32(0) => 0x00000000 -+// BIT_LEN_MASK_32(1) => 0x00000001 -+// BIT_LEN_MASK_32(2) => 0x00000003 -+// BIT_LEN_MASK_32(32) => 0xFFFFFFFF -+// -+#define BIT_LEN_MASK_32(__BitLen) \ -+ (0xFFFFFFFF >> (32 - (__BitLen))) -+// -+// Example: -+// BIT_OFFSET_LEN_MASK_32(0, 2) => 0x00000003 -+// BIT_OFFSET_LEN_MASK_32(16, 2) => 0x00030000 -+// -+#define BIT_OFFSET_LEN_MASK_32(__BitOffset, __BitLen) \ -+ (BIT_LEN_MASK_32(__BitLen) << (__BitOffset)) -+ -+// -+// Description: -+// Return 4-byte value in host byte ordering from -+// 4-byte pointer in litten-endian system. -+// -+#define LE_P4BYTE_TO_HOST_4BYTE(__pStart) \ -+ (EF4Byte(*((u32 *)(__pStart)))) -+ -+// -+// Description: -+// Translate subfield (continuous bits in little-endian) of 4-byte value in litten byte to -+// 4-byte value in host byte ordering. -+// -+#define LE_BITS_TO_4BYTE(__pStart, __BitOffset, __BitLen) \ -+ ( \ -+ ( LE_P4BYTE_TO_HOST_4BYTE(__pStart) >> (__BitOffset) ) \ -+ & \ -+ BIT_LEN_MASK_32(__BitLen) \ -+ ) -+ -+// -+// Description: -+// Mask subfield (continuous bits in little-endian) of 4-byte value in litten byte oredering -+// and return the result in 4-byte value in host byte ordering. -+// -+#define LE_BITS_CLEARED_TO_4BYTE(__pStart, __BitOffset, __BitLen) \ -+ ( \ -+ LE_P4BYTE_TO_HOST_4BYTE(__pStart) \ -+ & \ -+ ( ~BIT_OFFSET_LEN_MASK_32(__BitOffset, __BitLen) ) \ -+ ) -+ -+// -+// Description: -+// Set subfield of little-endian 4-byte value to specified value. -+// -+#define SET_BITS_TO_LE_4BYTE(__pStart, __BitOffset, __BitLen, __Value) \ -+ *((u32 *)(__pStart)) = \ -+ EF4Byte( \ -+ LE_BITS_CLEARED_TO_4BYTE(__pStart, __BitOffset, __BitLen) \ -+ | \ -+ ( (((u32)__Value) & BIT_LEN_MASK_32(__BitLen)) << (__BitOffset) ) \ -+ ); -+ -+ -+#define BIT_LEN_MASK_16(__BitLen) \ -+ (0xFFFF >> (16 - (__BitLen))) -+ -+#define BIT_OFFSET_LEN_MASK_16(__BitOffset, __BitLen) \ -+ (BIT_LEN_MASK_16(__BitLen) << (__BitOffset)) -+ -+#define LE_P2BYTE_TO_HOST_2BYTE(__pStart) \ -+ (EF2Byte(*((u16 *)(__pStart)))) -+ -+#define LE_BITS_TO_2BYTE(__pStart, __BitOffset, __BitLen) \ -+ ( \ -+ ( LE_P2BYTE_TO_HOST_2BYTE(__pStart) >> (__BitOffset) ) \ -+ & \ -+ BIT_LEN_MASK_16(__BitLen) \ -+ ) -+ -+#define LE_BITS_CLEARED_TO_2BYTE(__pStart, __BitOffset, __BitLen) \ -+ ( \ -+ LE_P2BYTE_TO_HOST_2BYTE(__pStart) \ -+ & \ -+ ( ~BIT_OFFSET_LEN_MASK_16(__BitOffset, __BitLen) ) \ -+ ) -+ -+#define SET_BITS_TO_LE_2BYTE(__pStart, __BitOffset, __BitLen, __Value) \ -+ *((u16 *)(__pStart)) = \ -+ EF2Byte( \ -+ LE_BITS_CLEARED_TO_2BYTE(__pStart, __BitOffset, __BitLen) \ -+ | \ -+ ( (((u16)__Value) & BIT_LEN_MASK_16(__BitLen)) << (__BitOffset) ) \ -+ ); -+ -+#define BIT_LEN_MASK_8(__BitLen) \ -+ (0xFF >> (8 - (__BitLen))) -+ -+#define BIT_OFFSET_LEN_MASK_8(__BitOffset, __BitLen) \ -+ (BIT_LEN_MASK_8(__BitLen) << (__BitOffset)) -+ -+#define LE_P1BYTE_TO_HOST_1BYTE(__pStart) \ -+ (EF1Byte(*((u8 *)(__pStart)))) -+ -+#define LE_BITS_TO_1BYTE(__pStart, __BitOffset, __BitLen) \ -+ ( \ -+ ( LE_P1BYTE_TO_HOST_1BYTE(__pStart) >> (__BitOffset) ) \ -+ & \ -+ BIT_LEN_MASK_8(__BitLen) \ -+ ) -+ -+#define LE_BITS_CLEARED_TO_1BYTE(__pStart, __BitOffset, __BitLen) \ -+ ( \ -+ LE_P1BYTE_TO_HOST_1BYTE(__pStart) \ -+ & \ -+ ( ~BIT_OFFSET_LEN_MASK_8(__BitOffset, __BitLen) ) \ -+ ) -+ -+#define SET_BITS_TO_LE_1BYTE(__pStart, __BitOffset, __BitLen, __Value) \ -+ *((u8 *)(__pStart)) = \ -+ EF1Byte( \ -+ LE_BITS_CLEARED_TO_1BYTE(__pStart, __BitOffset, __BitLen) \ -+ | \ -+ ( (((u8)__Value) & BIT_LEN_MASK_8(__BitLen)) << (__BitOffset) ) \ -+ ); -+ -+// Get the N-bytes aligment offset from the current length -+#define N_BYTE_ALIGMENT(__Value, __Aligment) ((__Aligment == 1) ? (__Value) : (((__Value + __Aligment - 1) / __Aligment) * __Aligment)) -+ -+typedef unsigned char BOOLEAN,*PBOOLEAN; -+ -+#endif //__BASIC_TYPES_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h -@@ -0,0 +1,87 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H -+#define _LINUX_BYTEORDER_BIG_ENDIAN_H -+ -+#ifndef __BIG_ENDIAN -+#define __BIG_ENDIAN 4321 -+#endif -+#ifndef __BIG_ENDIAN_BITFIELD -+#define __BIG_ENDIAN_BITFIELD -+#endif -+ -+#include -+ -+#define __constant_htonl(x) ((__u32)(x)) -+#define __constant_ntohl(x) ((__u32)(x)) -+#define __constant_htons(x) ((__u16)(x)) -+#define __constant_ntohs(x) ((__u16)(x)) -+#define __constant_cpu_to_le64(x) ___constant_swab64((x)) -+#define __constant_le64_to_cpu(x) ___constant_swab64((x)) -+#define __constant_cpu_to_le32(x) ___constant_swab32((x)) -+#define __constant_le32_to_cpu(x) ___constant_swab32((x)) -+#define __constant_cpu_to_le16(x) ___constant_swab16((x)) -+#define __constant_le16_to_cpu(x) ___constant_swab16((x)) -+#define __constant_cpu_to_be64(x) ((__u64)(x)) -+#define __constant_be64_to_cpu(x) ((__u64)(x)) -+#define __constant_cpu_to_be32(x) ((__u32)(x)) -+#define __constant_be32_to_cpu(x) ((__u32)(x)) -+#define __constant_cpu_to_be16(x) ((__u16)(x)) -+#define __constant_be16_to_cpu(x) ((__u16)(x)) -+#define __cpu_to_le64(x) __swab64((x)) -+#define __le64_to_cpu(x) __swab64((x)) -+#define __cpu_to_le32(x) __swab32((x)) -+#define __le32_to_cpu(x) __swab32((x)) -+#define __cpu_to_le16(x) __swab16((x)) -+#define __le16_to_cpu(x) __swab16((x)) -+#define __cpu_to_be64(x) ((__u64)(x)) -+#define __be64_to_cpu(x) ((__u64)(x)) -+#define __cpu_to_be32(x) ((__u32)(x)) -+#define __be32_to_cpu(x) ((__u32)(x)) -+#define __cpu_to_be16(x) ((__u16)(x)) -+#define __be16_to_cpu(x) ((__u16)(x)) -+#define __cpu_to_le64p(x) __swab64p((x)) -+#define __le64_to_cpup(x) __swab64p((x)) -+#define __cpu_to_le32p(x) __swab32p((x)) -+#define __le32_to_cpup(x) __swab32p((x)) -+#define __cpu_to_le16p(x) __swab16p((x)) -+#define __le16_to_cpup(x) __swab16p((x)) -+#define __cpu_to_be64p(x) (*(__u64*)(x)) -+#define __be64_to_cpup(x) (*(__u64*)(x)) -+#define __cpu_to_be32p(x) (*(__u32*)(x)) -+#define __be32_to_cpup(x) (*(__u32*)(x)) -+#define __cpu_to_be16p(x) (*(__u16*)(x)) -+#define __be16_to_cpup(x) (*(__u16*)(x)) -+#define __cpu_to_le64s(x) __swab64s((x)) -+#define __le64_to_cpus(x) __swab64s((x)) -+#define __cpu_to_le32s(x) __swab32s((x)) -+#define __le32_to_cpus(x) __swab32s((x)) -+#define __cpu_to_le16s(x) __swab16s((x)) -+#define __le16_to_cpus(x) __swab16s((x)) -+#define __cpu_to_be64s(x) do {} while (0) -+#define __be64_to_cpus(x) do {} while (0) -+#define __cpu_to_be32s(x) do {} while (0) -+#define __be32_to_cpus(x) do {} while (0) -+#define __cpu_to_be16s(x) do {} while (0) -+#define __be16_to_cpus(x) do {} while (0) -+ -+#include -+ -+#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h -@@ -0,0 +1,212 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _LINUX_BYTEORDER_GENERIC_H -+#define _LINUX_BYTEORDER_GENERIC_H -+ -+/* -+ * linux/byteorder_generic.h -+ * Generic Byte-reordering support -+ * -+ * Francois-Rene Rideau 19970707 -+ * gathered all the good ideas from all asm-foo/byteorder.h into one file, -+ * cleaned them up. -+ * I hope it is compliant with non-GCC compilers. -+ * I decided to put __BYTEORDER_HAS_U64__ in byteorder.h, -+ * because I wasn't sure it would be ok to put it in types.h -+ * Upgraded it to 2.1.43 -+ * Francois-Rene Rideau 19971012 -+ * Upgraded it to 2.1.57 -+ * to please Linus T., replaced huge #ifdef's between little/big endian -+ * by nestedly #include'd files. -+ * Francois-Rene Rideau 19971205 -+ * Made it to 2.1.71; now a facelift: -+ * Put files under include/linux/byteorder/ -+ * Split swab from generic support. -+ * -+ * TODO: -+ * = Regular kernel maintainers could also replace all these manual -+ * byteswap macros that remain, disseminated among drivers, -+ * after some grep or the sources... -+ * = Linus might want to rename all these macros and files to fit his taste, -+ * to fit his personal naming scheme. -+ * = it seems that a few drivers would also appreciate -+ * nybble swapping support... -+ * = every architecture could add their byteswap macro in asm/byteorder.h -+ * see how some architectures already do (i386, alpha, ppc, etc) -+ * = cpu_to_beXX and beXX_to_cpu might some day need to be well -+ * distinguished throughout the kernel. This is not the case currently, -+ * since little endian, big endian, and pdp endian machines needn't it. -+ * But this might be the case for, say, a port of Linux to 20/21 bit -+ * architectures (and F21 Linux addict around?). -+ */ -+ -+/* -+ * The following macros are to be defined by : -+ * -+ * Conversion of long and short int between network and host format -+ * ntohl(__u32 x) -+ * ntohs(__u16 x) -+ * htonl(__u32 x) -+ * htons(__u16 x) -+ * It seems that some programs (which? where? or perhaps a standard? POSIX?) -+ * might like the above to be functions, not macros (why?). -+ * if that's true, then detect them, and take measures. -+ * Anyway, the measure is: define only ___ntohl as a macro instead, -+ * and in a separate file, have -+ * unsigned long inline ntohl(x){return ___ntohl(x);} -+ * -+ * The same for constant arguments -+ * __constant_ntohl(__u32 x) -+ * __constant_ntohs(__u16 x) -+ * __constant_htonl(__u32 x) -+ * __constant_htons(__u16 x) -+ * -+ * Conversion of XX-bit integers (16- 32- or 64-) -+ * between native CPU format and little/big endian format -+ * 64-bit stuff only defined for proper architectures -+ * cpu_to_[bl]eXX(__uXX x) -+ * [bl]eXX_to_cpu(__uXX x) -+ * -+ * The same, but takes a pointer to the value to convert -+ * cpu_to_[bl]eXXp(__uXX x) -+ * [bl]eXX_to_cpup(__uXX x) -+ * -+ * The same, but change in situ -+ * cpu_to_[bl]eXXs(__uXX x) -+ * [bl]eXX_to_cpus(__uXX x) -+ * -+ * See asm-foo/byteorder.h for examples of how to provide -+ * architecture-optimized versions -+ * -+ */ -+ -+ -+#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) || defined(PLATFORM_MPIXEL) || defined(PLATFORM_FREEBSD) -+/* -+ * inside the kernel, we can use nicknames; -+ * outside of it, we must avoid POSIX namespace pollution... -+ */ -+#define cpu_to_le64 __cpu_to_le64 -+#define le64_to_cpu __le64_to_cpu -+#define cpu_to_le32 __cpu_to_le32 -+#define le32_to_cpu __le32_to_cpu -+#define cpu_to_le16 __cpu_to_le16 -+#define le16_to_cpu __le16_to_cpu -+#define cpu_to_be64 __cpu_to_be64 -+#define be64_to_cpu __be64_to_cpu -+#define cpu_to_be32 __cpu_to_be32 -+#define be32_to_cpu __be32_to_cpu -+#define cpu_to_be16 __cpu_to_be16 -+#define be16_to_cpu __be16_to_cpu -+#define cpu_to_le64p __cpu_to_le64p -+#define le64_to_cpup __le64_to_cpup -+#define cpu_to_le32p __cpu_to_le32p -+#define le32_to_cpup __le32_to_cpup -+#define cpu_to_le16p __cpu_to_le16p -+#define le16_to_cpup __le16_to_cpup -+#define cpu_to_be64p __cpu_to_be64p -+#define be64_to_cpup __be64_to_cpup -+#define cpu_to_be32p __cpu_to_be32p -+#define be32_to_cpup __be32_to_cpup -+#define cpu_to_be16p __cpu_to_be16p -+#define be16_to_cpup __be16_to_cpup -+#define cpu_to_le64s __cpu_to_le64s -+#define le64_to_cpus __le64_to_cpus -+#define cpu_to_le32s __cpu_to_le32s -+#define le32_to_cpus __le32_to_cpus -+#define cpu_to_le16s __cpu_to_le16s -+#define le16_to_cpus __le16_to_cpus -+#define cpu_to_be64s __cpu_to_be64s -+#define be64_to_cpus __be64_to_cpus -+#define cpu_to_be32s __cpu_to_be32s -+#define be32_to_cpus __be32_to_cpus -+#define cpu_to_be16s __cpu_to_be16s -+#define be16_to_cpus __be16_to_cpus -+#endif -+ -+ -+/* -+ * Handle ntohl and suches. These have various compatibility -+ * issues - like we want to give the prototype even though we -+ * also have a macro for them in case some strange program -+ * wants to take the address of the thing or something.. -+ * -+ * Note that these used to return a "long" in libc5, even though -+ * long is often 64-bit these days.. Thus the casts. -+ * -+ * They have to be macros in order to do the constant folding -+ * correctly - if the argument passed into a inline function -+ * it is no longer constant according to gcc.. -+ */ -+ -+#undef ntohl -+#undef ntohs -+#undef htonl -+#undef htons -+ -+/* -+ * Do the prototypes. Somebody might want to take the -+ * address or some such sick thing.. -+ */ -+#if defined(PLATFORM_LINUX) || (defined (__GLIBC__) && __GLIBC__ >= 2) -+extern __u32 ntohl(__u32); -+extern __u32 htonl(__u32); -+#else //defined(PLATFORM_LINUX) || (defined (__GLIBC__) && __GLIBC__ >= 2) -+#ifndef PLATFORM_FREEBSD -+extern unsigned long int ntohl(unsigned long int); -+extern unsigned long int htonl(unsigned long int); -+#endif -+#endif -+#ifndef PLATFORM_FREEBSD -+extern unsigned short int ntohs(unsigned short int); -+extern unsigned short int htons(unsigned short int); -+#endif -+ -+#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) || defined(PLATFORM_MPIXEL) -+ -+#define ___htonl(x) __cpu_to_be32(x) -+#define ___htons(x) __cpu_to_be16(x) -+#define ___ntohl(x) __be32_to_cpu(x) -+#define ___ntohs(x) __be16_to_cpu(x) -+ -+#if defined(PLATFORM_LINUX) || (defined (__GLIBC__) && __GLIBC__ >= 2) -+#define htonl(x) ___htonl(x) -+#define ntohl(x) ___ntohl(x) -+#else -+#define htonl(x) ((unsigned long)___htonl(x)) -+#define ntohl(x) ((unsigned long)___ntohl(x)) -+#endif -+#define htons(x) ___htons(x) -+#define ntohs(x) ___ntohs(x) -+ -+#endif /* OPTIMIZE */ -+ -+ -+#if defined (PLATFORM_WINDOWS) -+ -+#define htonl(x) __cpu_to_be32(x) -+#define ntohl(x) __be32_to_cpu(x) -+#define htons(x) __cpu_to_be16(x) -+#define ntohs(x) __be16_to_cpu(x) -+ -+ -+#endif -+ -+#endif /* _LINUX_BYTEORDER_GENERIC_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h -@@ -0,0 +1,89 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H -+#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H -+ -+#ifndef __LITTLE_ENDIAN -+#define __LITTLE_ENDIAN 1234 -+#endif -+#ifndef __LITTLE_ENDIAN_BITFIELD -+#define __LITTLE_ENDIAN_BITFIELD -+#endif -+ -+#include -+ -+#ifndef __constant_htonl -+#define __constant_htonl(x) ___constant_swab32((x)) -+#define __constant_ntohl(x) ___constant_swab32((x)) -+#define __constant_htons(x) ___constant_swab16((x)) -+#define __constant_ntohs(x) ___constant_swab16((x)) -+#define __constant_cpu_to_le64(x) ((__u64)(x)) -+#define __constant_le64_to_cpu(x) ((__u64)(x)) -+#define __constant_cpu_to_le32(x) ((__u32)(x)) -+#define __constant_le32_to_cpu(x) ((__u32)(x)) -+#define __constant_cpu_to_le16(x) ((__u16)(x)) -+#define __constant_le16_to_cpu(x) ((__u16)(x)) -+#define __constant_cpu_to_be64(x) ___constant_swab64((x)) -+#define __constant_be64_to_cpu(x) ___constant_swab64((x)) -+#define __constant_cpu_to_be32(x) ___constant_swab32((x)) -+#define __constant_be32_to_cpu(x) ___constant_swab32((x)) -+#define __constant_cpu_to_be16(x) ___constant_swab16((x)) -+#define __constant_be16_to_cpu(x) ___constant_swab16((x)) -+#define __cpu_to_le64(x) ((__u64)(x)) -+#define __le64_to_cpu(x) ((__u64)(x)) -+#define __cpu_to_le32(x) ((__u32)(x)) -+#define __le32_to_cpu(x) ((__u32)(x)) -+#define __cpu_to_le16(x) ((__u16)(x)) -+#define __le16_to_cpu(x) ((__u16)(x)) -+#define __cpu_to_be64(x) __swab64((x)) -+#define __be64_to_cpu(x) __swab64((x)) -+#define __cpu_to_be32(x) __swab32((x)) -+#define __be32_to_cpu(x) __swab32((x)) -+#define __cpu_to_be16(x) __swab16((x)) -+#define __be16_to_cpu(x) __swab16((x)) -+#define __cpu_to_le64p(x) (*(__u64*)(x)) -+#define __le64_to_cpup(x) (*(__u64*)(x)) -+#define __cpu_to_le32p(x) (*(__u32*)(x)) -+#define __le32_to_cpup(x) (*(__u32*)(x)) -+#define __cpu_to_le16p(x) (*(__u16*)(x)) -+#define __le16_to_cpup(x) (*(__u16*)(x)) -+#define __cpu_to_be64p(x) __swab64p((x)) -+#define __be64_to_cpup(x) __swab64p((x)) -+#define __cpu_to_be32p(x) __swab32p((x)) -+#define __be32_to_cpup(x) __swab32p((x)) -+#define __cpu_to_be16p(x) __swab16p((x)) -+#define __be16_to_cpup(x) __swab16p((x)) -+#define __cpu_to_le64s(x) do {} while (0) -+#define __le64_to_cpus(x) do {} while (0) -+#define __cpu_to_le32s(x) do {} while (0) -+#define __le32_to_cpus(x) do {} while (0) -+#define __cpu_to_le16s(x) do {} while (0) -+#define __le16_to_cpus(x) do {} while (0) -+#define __cpu_to_be64s(x) __swab64s((x)) -+#define __be64_to_cpus(x) __swab64s((x)) -+#define __cpu_to_be32s(x) __swab32s((x)) -+#define __be32_to_cpus(x) __swab32s((x)) -+#define __cpu_to_be16s(x) __swab16s((x)) -+#define __be16_to_cpus(x) __swab16s((x)) -+#endif // __constant_htonl -+ -+#include -+ -+#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h -@@ -0,0 +1,140 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _LINUX_BYTEORDER_SWAB_H -+#define _LINUX_BYTEORDER_SWAB_H -+ -+#if !defined(CONFIG_PLATFORM_MSTAR) -+#ifndef __u16 -+typedef unsigned short __u16; -+#endif -+ -+#ifndef __u32 -+typedef unsigned int __u32; -+#endif -+ -+#ifndef __u8 -+typedef unsigned char __u8; -+#endif -+ -+#ifndef __u64 -+typedef unsigned long long __u64; -+#endif -+ -+ -+__inline static __u16 ___swab16(__u16 x) -+{ -+ __u16 __x = x; -+ return -+ ((__u16)( -+ (((__u16)(__x) & (__u16)0x00ffU) << 8) | -+ (((__u16)(__x) & (__u16)0xff00U) >> 8) )); -+ -+} -+ -+__inline static __u32 ___swab32(__u32 x) -+{ -+ __u32 __x = (x); -+ return ((__u32)( -+ (((__u32)(__x) & (__u32)0x000000ffUL) << 24) | -+ (((__u32)(__x) & (__u32)0x0000ff00UL) << 8) | -+ (((__u32)(__x) & (__u32)0x00ff0000UL) >> 8) | -+ (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); -+} -+ -+__inline static __u64 ___swab64(__u64 x) -+{ -+ __u64 __x = (x); -+ -+ return -+ ((__u64)( \ -+ (__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) | \ -+ (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | \ -+ (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | \ -+ (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) << 8) | \ -+ (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >> 8) | \ -+ (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ -+ (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | \ -+ (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); \ -+} -+#endif // CONFIG_PLATFORM_MSTAR -+ -+#ifndef __arch__swab16 -+__inline static __u16 __arch__swab16(__u16 x) -+{ -+ return ___swab16(x); -+} -+ -+#endif -+ -+#ifndef __arch__swab32 -+__inline static __u32 __arch__swab32(__u32 x) -+{ -+ __u32 __tmp = (x) ; -+ return ___swab32(__tmp); -+} -+#endif -+ -+#ifndef __arch__swab64 -+ -+__inline static __u64 __arch__swab64(__u64 x) -+{ -+ __u64 __tmp = (x) ; -+ return ___swab64(__tmp); -+} -+ -+ -+#endif -+ -+#ifndef __swab16 -+#define __swab16(x) __fswab16(x) -+#define __swab32(x) __fswab32(x) -+#define __swab64(x) __fswab64(x) -+#endif // __swab16 -+ -+#ifdef PLATFORM_FREEBSD -+__inline static __u16 __fswab16(__u16 x) -+#else -+__inline static const __u16 __fswab16(__u16 x) -+#endif //PLATFORM_FREEBSD -+{ -+ return __arch__swab16(x); -+} -+#ifdef PLATFORM_FREEBSD -+__inline static __u32 __fswab32(__u32 x) -+#else -+__inline static const __u32 __fswab32(__u32 x) -+#endif //PLATFORM_FREEBSD -+{ -+ return __arch__swab32(x); -+} -+ -+#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) -+#define swab16 __swab16 -+#define swab32 __swab32 -+#define swab64 __swab64 -+#define swab16p __swab16p -+#define swab32p __swab32p -+#define swab64p __swab64p -+#define swab16s __swab16s -+#define swab32s __swab32s -+#define swab64s __swab64s -+#endif -+ -+#endif /* _LINUX_BYTEORDER_SWAB_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h -@@ -0,0 +1,156 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _LINUX_BYTEORDER_SWABB_H -+#define _LINUX_BYTEORDER_SWABB_H -+ -+/* -+ * linux/byteorder/swabb.h -+ * SWAp Bytes Bizarrely -+ * swaHHXX[ps]?(foo) -+ * -+ * Support for obNUXIous pdp-endian and other bizarre architectures. -+ * Will Linux ever run on such ancient beasts? if not, this file -+ * will be but a programming pearl. Still, it's a reminder that we -+ * shouldn't be making too many assumptions when trying to be portable. -+ * -+ */ -+ -+/* -+ * Meaning of the names I chose (vaxlinux people feel free to correct them): -+ * swahw32 swap 16-bit half-words in a 32-bit word -+ * swahb32 swap 8-bit halves of each 16-bit half-word in a 32-bit word -+ * -+ * No 64-bit support yet. I don't know NUXI conventions for long longs. -+ * I guarantee it will be a mess when it's there, though :-> -+ * It will be even worse if there are conflicting 64-bit conventions. -+ * Hopefully, no one ever used 64-bit objects on NUXI machines. -+ * -+ */ -+ -+#define ___swahw32(x) \ -+({ \ -+ __u32 __x = (x); \ -+ ((__u32)( \ -+ (((__u32)(__x) & (__u32)0x0000ffffUL) << 16) | \ -+ (((__u32)(__x) & (__u32)0xffff0000UL) >> 16) )); \ -+}) -+#define ___swahb32(x) \ -+({ \ -+ __u32 __x = (x); \ -+ ((__u32)( \ -+ (((__u32)(__x) & (__u32)0x00ff00ffUL) << 8) | \ -+ (((__u32)(__x) & (__u32)0xff00ff00UL) >> 8) )); \ -+}) -+ -+#define ___constant_swahw32(x) \ -+ ((__u32)( \ -+ (((__u32)(x) & (__u32)0x0000ffffUL) << 16) | \ -+ (((__u32)(x) & (__u32)0xffff0000UL) >> 16) )) -+#define ___constant_swahb32(x) \ -+ ((__u32)( \ -+ (((__u32)(x) & (__u32)0x00ff00ffUL) << 8) | \ -+ (((__u32)(x) & (__u32)0xff00ff00UL) >> 8) )) -+ -+/* -+ * provide defaults when no architecture-specific optimization is detected -+ */ -+#ifndef __arch__swahw32 -+# define __arch__swahw32(x) ___swahw32(x) -+#endif -+#ifndef __arch__swahb32 -+# define __arch__swahb32(x) ___swahb32(x) -+#endif -+ -+#ifndef __arch__swahw32p -+# define __arch__swahw32p(x) __swahw32(*(x)) -+#endif -+#ifndef __arch__swahb32p -+# define __arch__swahb32p(x) __swahb32(*(x)) -+#endif -+ -+#ifndef __arch__swahw32s -+# define __arch__swahw32s(x) do { *(x) = __swahw32p((x)); } while (0) -+#endif -+#ifndef __arch__swahb32s -+# define __arch__swahb32s(x) do { *(x) = __swahb32p((x)); } while (0) -+#endif -+ -+ -+/* -+ * Allow constant folding -+ */ -+#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) -+# define __swahw32(x) \ -+(__builtin_constant_p((__u32)(x)) ? \ -+ ___swahw32((x)) : \ -+ __fswahw32((x))) -+# define __swahb32(x) \ -+(__builtin_constant_p((__u32)(x)) ? \ -+ ___swahb32((x)) : \ -+ __fswahb32((x))) -+#else -+# define __swahw32(x) __fswahw32(x) -+# define __swahb32(x) __fswahb32(x) -+#endif /* OPTIMIZE */ -+ -+ -+__inline static__ __const__ __u32 __fswahw32(__u32 x) -+{ -+ return __arch__swahw32(x); -+} -+__inline static__ __u32 __swahw32p(__u32 *x) -+{ -+ return __arch__swahw32p(x); -+} -+__inline static__ void __swahw32s(__u32 *addr) -+{ -+ __arch__swahw32s(addr); -+} -+ -+ -+__inline static__ __const__ __u32 __fswahb32(__u32 x) -+{ -+ return __arch__swahb32(x); -+} -+__inline static__ __u32 __swahb32p(__u32 *x) -+{ -+ return __arch__swahb32p(x); -+} -+__inline static__ void __swahb32s(__u32 *addr) -+{ -+ __arch__swahb32s(addr); -+} -+ -+#ifdef __BYTEORDER_HAS_U64__ -+/* -+ * Not supported yet -+ */ -+#endif /* __BYTEORDER_HAS_U64__ */ -+ -+#if defined(PLATFORM_LINUX) -+#define swahw32 __swahw32 -+#define swahb32 __swahb32 -+#define swahw32p __swahw32p -+#define swahb32p __swahb32p -+#define swahw32s __swahw32s -+#define swahb32s __swahb32s -+#endif -+ -+#endif /* _LINUX_BYTEORDER_SWABB_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h -@@ -0,0 +1,27 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __CIRC_BUF_H_ -+#define __CIRC_BUF_H_ 1 -+ -+#define CIRC_CNT(head,tail,size) (((head) - (tail)) & ((size)-1)) -+ -+#define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) -+ -+#endif //_CIRC_BUF_H_ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h -@@ -0,0 +1,36 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __CMD_OSDEP_H_ -+#define __CMD_OSDEP_H_ -+ -+ -+#include -+#include -+#include -+ -+extern sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); -+extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv); -+extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv); -+extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); -+extern sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj); -+extern struct cmd_obj *_rtw_dequeue_cmd(_queue *queue); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h -@@ -0,0 +1,78 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __DRV_CONF_H__ -+#define __DRV_CONF_H__ -+#include "autoconf.h" -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+//Older Android kernel doesn't has CONFIG_ANDROID defined, -+//add this to force CONFIG_ANDROID defined -+#ifdef CONFIG_PLATFORM_ANDROID -+#define CONFIG_ANDROID -+#endif -+ -+#ifdef CONFIG_ANDROID -+//Some Android build will restart the UI while non-printable ascii is passed -+//between java and c/c++ layer (JNI). We force CONFIG_VALIDATE_SSID -+//for Android here. If you are sure there is no risk on your system about this, -+//mask this macro define to support non-printable ascii ssid. -+//#define CONFIG_VALIDATE_SSID -+ -+//Android expect dbm as the rx signal strength unit -+#define CONFIG_SIGNAL_DISPLAY_DBM -+#endif -+ -+#if defined(CONFIG_HAS_EARLYSUSPEND) && defined (CONFIG_RESUME_IN_WORKQUEUE) -+ #warning "You have CONFIG_HAS_EARLYSUSPEND enabled in your system, we disable CONFIG_RESUME_IN_WORKQUEUE automatically" -+ #undef CONFIG_RESUME_IN_WORKQUEUE -+#endif -+ -+#if defined(CONFIG_ANDROID_POWER) && defined (CONFIG_RESUME_IN_WORKQUEUE) -+ #warning "You have CONFIG_ANDROID_POWER enabled in your system, we disable CONFIG_RESUME_IN_WORKQUEUE automatically" -+ #undef CONFIG_RESUME_IN_WORKQUEUE -+#endif -+ -+#ifdef CONFIG_RESUME_IN_WORKQUEUE //this can be removed, because there is no case for this... -+ #if !defined( CONFIG_WAKELOCK) && !defined(CONFIG_ANDROID_POWER) -+ #error "enable CONFIG_RESUME_IN_WORKQUEUE without CONFIG_WAKELOCK or CONFIG_ANDROID_POWER will suffer from the danger of wifi's unfunctionality..." -+ #error "If you still want to enable CONFIG_RESUME_IN_WORKQUEUE in this case, mask this preprossor checking and GOOD LUCK..." -+ #endif -+#endif -+ -+//About USB VENDOR REQ -+#if defined(CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX) -+ #warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC automatically" -+ #define CONFIG_USB_VENDOR_REQ_MUTEX -+#endif -+#if defined(CONFIG_VENDOR_REQ_RETRY) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX) -+ #warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_VENDOR_REQ_RETRY automatically" -+ #define CONFIG_USB_VENDOR_REQ_MUTEX -+#endif -+ -+ -+//#include -+ -+#endif // __DRV_CONF_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h -@@ -0,0 +1,662 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/*------------------------------------------------------------------------------- -+ -+ For type defines and data structure defines -+ -+--------------------------------------------------------------------------------*/ -+ -+ -+#ifndef __DRV_TYPES_H__ -+#define __DRV_TYPES_H__ -+ -+#include -+#include -+#include -+ -+ -+#ifdef PLATFORM_OS_XP -+#include -+#endif -+ -+#ifdef PLATFORM_OS_CE -+#include -+#endif -+ -+#ifdef PLATFORM_LINUX -+#include -+#endif -+ -+enum _NIC_VERSION { -+ -+ RTL8711_NIC, -+ RTL8712_NIC, -+ RTL8713_NIC, -+ RTL8716_NIC -+ -+}; -+ -+enum{ -+ UP_LINK, -+ DOWN_LINK, -+}; -+typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER; -+ -+#ifdef CONFIG_80211N_HT -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_DRVEXT_MODULE -+#include -+#endif -+ -+#ifdef CONFIG_MP_INCLUDED -+#include -+#endif -+ -+#ifdef CONFIG_BR_EXT -+#include -+#endif // CONFIG_BR_EXT -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ #include "ioctl_cfg80211.h" -+#endif //CONFIG_IOCTL_CFG80211 -+ -+#define SPEC_DEV_ID_NONE BIT(0) -+#define SPEC_DEV_ID_DISABLE_HT BIT(1) -+#define SPEC_DEV_ID_ENABLE_PS BIT(2) -+#define SPEC_DEV_ID_RF_CONFIG_1T1R BIT(3) -+#define SPEC_DEV_ID_RF_CONFIG_2T2R BIT(4) -+#define SPEC_DEV_ID_ASSIGN_IFNAME BIT(5) -+ -+struct specific_device_id{ -+ -+ u32 flags; -+ -+ u16 idVendor; -+ u16 idProduct; -+ -+}; -+ -+struct registry_priv -+{ -+ u8 chip_version; -+ u8 rfintfs; -+ u8 lbkmode; -+ u8 hci; -+ NDIS_802_11_SSID ssid; -+ u8 network_mode; //infra, ad-hoc, auto -+ u8 channel;//ad-hoc support requirement -+ u8 wireless_mode;//A, B, G, auto -+ u8 scan_mode;//active, passive -+ u8 radio_enable; -+ u8 preamble;//long, short, auto -+ u8 vrtl_carrier_sense;//Enable, Disable, Auto -+ u8 vcs_type;//RTS/CTS, CTS-to-self -+ u16 rts_thresh; -+ u16 frag_thresh; -+ u8 adhoc_tx_pwr; -+ u8 soft_ap; -+ u8 power_mgnt; -+ u8 ips_mode; -+ u8 smart_ps; -+ u8 long_retry_lmt; -+ u8 short_retry_lmt; -+ u16 busy_thresh; -+ u8 ack_policy; -+ u8 mp_mode; -+ u8 software_encrypt; -+ u8 software_decrypt; -+ -+ u8 acm_method; -+ //UAPSD -+ u8 wmm_enable; -+ u8 uapsd_enable; -+ u8 uapsd_max_sp; -+ u8 uapsd_acbk_en; -+ u8 uapsd_acbe_en; -+ u8 uapsd_acvi_en; -+ u8 uapsd_acvo_en; -+ -+ WLAN_BSSID_EX dev_network; -+ -+#ifdef CONFIG_80211N_HT -+ u8 ht_enable; -+ u8 cbw40_enable; -+ u8 ampdu_enable;//for tx -+ u8 rx_stbc; -+ u8 ampdu_amsdu;//A-MPDU Supports A-MSDU is permitted -+#endif -+ u8 lowrate_two_xmit; -+ -+ u8 rf_config ; -+ u8 low_power ; -+ -+ u8 wifi_spec;// !turbo_mode -+ -+ u8 channel_plan; -+#ifdef CONFIG_BT_COEXIST -+ u8 bt_iso; -+ u8 bt_sco; -+ u8 bt_ampdu; -+#endif -+ BOOLEAN bAcceptAddbaReq; -+ -+ u8 antdiv_cfg; -+ -+ u8 usbss_enable;//0:disable,1:enable -+ u8 hwpdn_mode;//0:disable,1:enable,2:decide by EFUSE config -+ u8 hwpwrp_detect;//0:disable,1:enable -+ -+ u8 hw_wps_pbc;//0:disable,1:enable -+ -+#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -+ char adaptor_info_caching_file_path[PATH_LENGTH_MAX]; -+#endif -+ -+#ifdef CONFIG_LAYER2_ROAMING -+ u8 max_roaming_times; // the max number driver will try to roaming -+#endif -+ -+#ifdef CONFIG_IOL -+ bool force_iol; //enable iol without other concern -+#endif -+ u8 special_rf_path; //0: 2T2R ,1: only turn on path A 1T1R, 2: only turn on path B 1T1R -+ u8 mac_phy_mode; //0:by efuse, 1:smsp, 2:dmdp, 3:dmsp. -+ -+#ifdef CONFIG_80211D -+ u8 enable80211d; -+#endif -+ -+ u8 ifname[16]; -+ u8 if2name[16]; -+ -+ u8 notch_filter; -+ -+#ifdef CONFIG_MULTI_VIR_IFACES -+ u8 ext_iface_num;//primary/secondary iface is excluded -+#endif -+}; -+ -+ -+//For registry parameters -+#define RGTRY_OFT(field) ((ULONG)FIELD_OFFSET(struct registry_priv,field)) -+#define RGTRY_SZ(field) sizeof(((struct registry_priv*) 0)->field) -+#define BSSID_OFT(field) ((ULONG)FIELD_OFFSET(WLAN_BSSID_EX,field)) -+#define BSSID_SZ(field) sizeof(((PWLAN_BSSID_EX) 0)->field) -+ -+#define MAX_CONTINUAL_URB_ERR 4 -+ -+#ifdef CONFIG_SDIO_HCI -+#include -+#define INTF_DATA SDIO_DATA -+#endif -+ -+#define GET_PRIMARY_ADAPTER(padapter) (((_adapter *)padapter)->dvobj->if1) -+ -+#define GET_IFACE_NUMS(padapter) (((_adapter *)padapter)->dvobj->iface_nums) -+#define GET_ADAPTER(padapter, iface_id) (((_adapter *)padapter)->dvobj->padapters[iface_id]) -+ -+enum _IFACE_ID { -+ IFACE_ID0, //maping to PRIMARY_ADAPTER -+ IFACE_ID1, //maping to SECONDARY_ADAPTER -+ IFACE_ID2, -+ IFACE_ID3, -+ IFACE_ID_MAX, -+}; -+ -+struct dvobj_priv -+{ -+ _adapter *if1; //PRIMARY_ADAPTER -+ _adapter *if2; //SECONDARY_ADAPTER -+ -+ s32 processing_dev_remove; -+ -+ //for local/global synchronization -+ _mutex hw_init_mutex; -+ _mutex h2c_fwcmd_mutex; -+ _mutex setch_mutex; -+ _mutex setbw_mutex; -+ -+ unsigned char oper_channel; //saved channel info when call set_channel_bw -+ unsigned char oper_bwmode; -+ unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET -+ u32 on_oper_ch_time; -+ -+ //extend to support mulitu interface -+ //padapters[IFACE_ID0] == if1 -+ //padapters[IFACE_ID1] == if2 -+ _adapter *padapters[IFACE_ID_MAX]; -+ u8 iface_nums; // total number of ifaces used runtime -+ -+ //For 92D, DMDP have 2 interface. -+ u8 InterfaceNumber; -+ u8 NumInterfaces; -+ u8 DualMacMode; -+ u8 irq_alloc; -+ -+/*-------- below is for SDIO INTERFACE --------*/ -+ -+#ifdef INTF_DATA -+ INTF_DATA intf_data; -+#endif -+ -+/*-------- below is for USB INTERFACE --------*/ -+ -+#ifdef CONFIG_USB_HCI -+ -+ u8 nr_endpoint; -+ u8 ishighspeed; -+ u8 RtNumInPipes; -+ u8 RtNumOutPipes; -+ int ep_num[5]; //endpoint number -+ -+ int RegUsbSS; -+ -+ _sema usb_suspend_sema; -+ -+#ifdef CONFIG_USB_VENDOR_REQ_MUTEX -+ _mutex usb_vendor_req_mutex; -+#endif -+ -+#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC -+ u8 * usb_alloc_vendor_req_buf; -+ u8 * usb_vendor_req_buf; -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ //related device objects -+ PDEVICE_OBJECT pphysdevobj;//pPhysDevObj; -+ PDEVICE_OBJECT pfuncdevobj;//pFuncDevObj; -+ PDEVICE_OBJECT pnextdevobj;//pNextDevObj; -+ -+ u8 nextdevstacksz;//unsigned char NextDeviceStackSize; //= (CHAR)CEdevice->pUsbDevObj->StackSize + 1; -+ -+ //urb for control diescriptor request -+ -+#ifdef PLATFORM_OS_XP -+ struct _URB_CONTROL_DESCRIPTOR_REQUEST descriptor_urb; -+ PUSB_CONFIGURATION_DESCRIPTOR pconfig_descriptor;//UsbConfigurationDescriptor; -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ WCHAR active_path[MAX_ACTIVE_REG_PATH]; // adapter regpath -+ USB_EXTENSION usb_extension; -+ -+ _nic_hdl pipehdls_r8192c[0x10]; -+#endif -+ -+ u32 config_descriptor_len;//ULONG UsbConfigurationDescriptorLength; -+#endif//PLATFORM_WINDOWS -+ -+#ifdef PLATFORM_LINUX -+ struct usb_interface *pusbintf; -+ struct usb_device *pusbdev; -+#endif//PLATFORM_LINUX -+ -+#ifdef PLATFORM_FREEBSD -+ struct usb_interface *pusbintf; -+ struct usb_device *pusbdev; -+#endif//PLATFORM_FREEBSD -+ ATOMIC_T continual_urb_error; -+#endif//CONFIG_USB_HCI -+ -+/*-------- below is for PCIE INTERFACE --------*/ -+ -+#ifdef CONFIG_PCI_HCI -+ -+#ifdef PLATFORM_LINUX -+ struct pci_dev *ppcidev; -+ -+ //PCI MEM map -+ unsigned long pci_mem_end; /* shared mem end */ -+ unsigned long pci_mem_start; /* shared mem start */ -+ -+ //PCI IO map -+ unsigned long pci_base_addr; /* device I/O address */ -+ -+ //PciBridge -+ struct pci_priv pcipriv; -+ -+ u16 irqline; -+ u8 irq_enabled; -+ RT_ISR_CONTENT isr_content; -+ _lock irq_th_lock; -+ -+ //ASPM -+ u8 const_pci_aspm; -+ u8 const_amdpci_aspm; -+ u8 const_hwsw_rfoff_d3; -+ u8 const_support_pciaspm; -+ // pci-e bridge */ -+ u8 const_hostpci_aspm_setting; -+ // pci-e device */ -+ u8 const_devicepci_aspm_setting; -+ u8 b_support_aspm; // If it supports ASPM, Offset[560h] = 0x40, otherwise Offset[560h] = 0x00. -+ u8 b_support_backdoor; -+ u8 bdma64; -+#endif//PLATFORM_LINUX -+ -+#endif//CONFIG_PCI_HCI -+}; -+ -+#ifdef PLATFORM_LINUX -+static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) -+{ -+ /* todo: get interface type from dvobj and the return the dev accordingly */ -+#ifdef RTW_DVOBJ_CHIP_HW_TYPE -+#endif -+ -+#ifdef CONFIG_USB_HCI -+ return &dvobj->pusbintf->dev; -+#endif -+#ifdef CONFIG_SDIO_HCI -+ return &dvobj->intf_data.func->dev; -+#endif -+#ifdef CONFIG_PCI_HCI -+ return &dvobj->ppcidev->dev; -+#endif -+} -+#endif -+ -+ -+enum _IFACE_TYPE { -+ IFACE_PORT0, //mapping to port0 for C/D series chips -+ IFACE_PORT1, //mapping to port1 for C/D series chip -+ MAX_IFACE_PORT, -+}; -+ -+enum _ADAPTER_TYPE { -+ PRIMARY_ADAPTER, -+ SECONDARY_ADAPTER, -+ MAX_ADAPTER = 0xFF, -+}; -+ -+typedef enum _DRIVER_STATE{ -+ DRIVER_NORMAL = 0, -+ DRIVER_DISAPPEAR = 1, -+ DRIVER_REPLACE_DONGLE = 2, -+}DRIVER_STATE; -+ -+#ifdef CONFIG_INTEL_PROXIM -+struct proxim { -+ bool proxim_support; -+ bool proxim_on; -+ -+ void *proximity_priv; -+ int (*proxim_rx)(_adapter *padapter, -+ union recv_frame *precv_frame); -+ u8 (*proxim_get_var)(_adapter* padapter, u8 type); -+}; -+#endif //CONFIG_INTEL_PROXIM -+ -+#ifdef RTL8723A_SDIO_LOOPBACK -+typedef struct loopbackdata -+{ -+ _sema sema; -+ _thread_hdl_ lbkthread; -+ u8 bstop; -+ u32 cnt; -+ u16 size; -+ u16 txsize; -+ u8 txbuf[0x8000]; -+ u16 rxsize; -+ u8 rxbuf[0x8000]; -+ u8 msg[100]; -+ -+}LOOPBACKDATA, *PLOOPBACKDATA; -+#endif -+ -+struct _ADAPTER{ -+ int DriverState;// for disable driver using module, use dongle to replace module. -+ int pid[3];//process id from UI, 0:wps, 1:hostapd, 2:dhcpcd -+ int bDongle;//build-in module or external dongle -+ u16 chip_type; -+ u16 HardwareType; -+ u16 interface_type;//USB,SDIO,PCI -+ -+ struct dvobj_priv *dvobj; -+ struct mlme_priv mlmepriv; -+ struct mlme_ext_priv mlmeextpriv; -+ struct cmd_priv cmdpriv; -+ struct evt_priv evtpriv; -+ //struct io_queue *pio_queue; -+ struct io_priv iopriv; -+ struct xmit_priv xmitpriv; -+ struct recv_priv recvpriv; -+ struct sta_priv stapriv; -+ struct security_priv securitypriv; -+ _lock security_key_mutex; // add for CONFIG_IEEE80211W, none 11w also can use -+ struct registry_priv registrypriv; -+ struct pwrctrl_priv pwrctrlpriv; -+ struct eeprom_priv eeprompriv; -+ struct led_priv ledpriv; -+ -+#ifdef CONFIG_MP_INCLUDED -+ struct mp_priv mppriv; -+#endif -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ struct drvext_priv drvextpriv; -+#endif -+ -+#ifdef CONFIG_AP_MODE -+ struct hostapd_priv *phostapdpriv; -+#endif -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+#ifdef CONFIG_P2P -+ struct cfg80211_wifidirect_info cfg80211_wdinfo; -+#endif //CONFIG_P2P -+#endif //CONFIG_IOCTL_CFG80211 -+ u32 setband; -+#ifdef CONFIG_P2P -+ struct wifidirect_info wdinfo; -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_TDLS -+ struct tdls_info tdlsinfo; -+#endif //CONFIG_TDLS -+ -+#ifdef CONFIG_WFD -+ struct wifi_display_info wfd_info; -+#endif //CONFIG_WFD -+ -+ PVOID HalData; -+ u32 hal_data_sz; -+ struct hal_ops HalFunc; -+ -+#ifdef CONFIG_BT_COEXIST -+ //struct btcoexist_priv bt_coexist; -+#endif -+ s32 bDriverStopped; -+ s32 bSurpriseRemoved; -+ s32 bCardDisableWOHSM; -+ -+ u32 IsrContent; -+ u32 ImrContent; -+ -+ u8 EepromAddressSize; -+ u8 hw_init_completed; -+ u8 bDriverIsGoingToUnload; -+ u8 init_adpt_in_progress; -+ u8 bHaltInProgress; -+ -+ _thread_hdl_ cmdThread; -+ _thread_hdl_ evtThread; -+ _thread_hdl_ xmitThread; -+ _thread_hdl_ recvThread; -+ -+#ifndef PLATFORM_LINUX -+ NDIS_STATUS (*dvobj_init)(struct dvobj_priv *dvobj); -+ void (*dvobj_deinit)(struct dvobj_priv *dvobj); -+#endif -+ -+ void (*intf_start)(_adapter * adapter); -+ void (*intf_stop)(_adapter * adapter); -+ -+#ifdef PLATFORM_WINDOWS -+ _nic_hdl hndis_adapter;//hNdisAdapter(NDISMiniportAdapterHandle); -+ _nic_hdl hndis_config;//hNdisConfiguration; -+ NDIS_STRING fw_img; -+ -+ u32 NdisPacketFilter; -+ u8 MCList[MAX_MCAST_LIST_NUM][6]; -+ u32 MCAddrCount; -+#endif //end of PLATFORM_WINDOWS -+ -+ -+#ifdef PLATFORM_LINUX -+ _nic_hdl pnetdev; -+ -+ // used by rtw_rereg_nd_name related function -+ struct rereg_nd_name_data { -+ _nic_hdl old_pnetdev; -+ char old_ifname[IFNAMSIZ]; -+ u8 old_ips_mode; -+ u8 old_bRegUseLed; -+ } rereg_nd_name_priv; -+ -+ int bup; -+ struct net_device_stats stats; -+ struct iw_statistics iwstats; -+ struct proc_dir_entry *dir_dev;// for proc directory -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ struct wireless_dev *rtw_wdev; -+#endif //CONFIG_IOCTL_CFG80211 -+ -+#endif //end of PLATFORM_LINUX -+ -+#ifdef PLATFORM_FREEBSD -+ _nic_hdl pifp; -+ int bup; -+ _lock glock; -+#endif //PLATFORM_FREEBSD -+ int net_closed; -+ -+ u8 bFWReady; -+ u8 bReadPortCancel; -+ u8 bWritePortCancel; -+ u8 bRxRSSIDisplay; -+ // Added by Albert 2012/07/26 -+ // The driver will write the initial gain everytime when running in the DM_Write_DIG function. -+ u8 bForceWriteInitGain; -+ // Added by Albert 2012/10/26 -+ // The driver will show up the desired channel number when this flag is 1. -+ u8 bNotifyChannelChange; -+#ifdef CONFIG_P2P -+ // Added by Albert 2012/12/06 -+ // The driver will show the current P2P status when the upper application reads it. -+ u8 bShowGetP2PState; -+#endif -+#ifdef CONFIG_AUTOSUSPEND -+ u8 bDisableAutosuspend; -+#endif -+ -+ //pbuddy_adapter is used only in two inteface case, (iface_nums=2 in struct dvobj_priv) -+ //PRIMARY_ADAPTER's buddy is SECONDARY_ADAPTER -+ //SECONDARY_ADAPTER's buddy is PRIMARY_ADAPTER -+ //for iface_id > SECONDARY_ADAPTER(IFACE_ID1), refer to padapters[iface_id] in struct dvobj_priv -+ //and their pbuddy_adapter is PRIMARY_ADAPTER. -+ //for PRIMARY_ADAPTER(IFACE_ID0) can directly refer to if1 in struct dvobj_priv -+ _adapter *pbuddy_adapter; -+ -+#if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) -+ u8 isprimary; //is primary adapter or not -+ //notes: -+ // if isprimary is true, the adapter_type value is 0, iface_id is IFACE_ID0 for PRIMARY_ADAPTER -+ // if isprimary is false, the adapter_type value is 1, iface_id is IFACE_ID1 for SECONDARY_ADAPTER -+ // refer to iface_id if iface_nums>2 and isprimary is false and the adapter_type value is 0xff. -+ u8 adapter_type;//used only in two inteface case(PRIMARY_ADAPTER and SECONDARY_ADAPTER) . -+ u8 iface_type; //interface port type, it depends on HW port -+#endif -+ -+ //extend to support multi interface -+ //IFACE_ID0 is equals to PRIMARY_ADAPTER -+ //IFACE_ID1 is equals to SECONDARY_ADAPTER -+ u8 iface_id; -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ u8 DualMacConcurrent; // 1: DMSP 0:DMDP -+#endif -+ -+#ifdef CONFIG_BR_EXT -+ _lock br_ext_lock; -+ //unsigned int macclone_completed; -+ struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE]; -+ int pppoe_connection_in_progress; -+ unsigned char pppoe_addr[MACADDRLEN]; -+ unsigned char scdb_mac[MACADDRLEN]; -+ unsigned char scdb_ip[4]; -+ struct nat25_network_db_entry *scdb_entry; -+ unsigned char br_mac[MACADDRLEN]; -+ unsigned char br_ip[4]; -+ -+ struct br_ext_info ethBrExtInfo; -+#endif // CONFIG_BR_EXT -+ -+#ifdef CONFIG_INTEL_PROXIM -+ /* intel Proximity, should be alloc mem -+ * in intel Proximity module and can only -+ * be used in intel Proximity mode */ -+ struct proxim proximity; -+#endif //CONFIG_INTEL_PROXIM -+ -+#ifdef RTL8723A_SDIO_LOOPBACK -+ PLOOPBACKDATA ploopback; -+#endif -+ -+}; -+ -+#define adapter_to_dvobj(adapter) (adapter->dvobj) -+ -+int rtw_handle_dualmac(_adapter *adapter, bool init); -+ -+__inline static u8 *myid(struct eeprom_priv *peepriv) -+{ -+ return (peepriv->mac_addr); -+} -+ -+ -+#endif //__DRV_TYPES_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h -@@ -0,0 +1,92 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __DRV_TYPES_CE_H__ -+#define __DRV_TYPES_CE_H__ -+ -+#include -+#include -+ -+#include -+ -+#define MAX_ACTIVE_REG_PATH 256 -+ -+#define MAX_MCAST_LIST_NUM 32 -+ -+ -+ -+//for ioctl -+#define MAKE_DRIVER_VERSION(_MainVer,_MinorVer) ((((u32)(_MainVer))<<16)+_MinorVer) -+ -+#define NIC_HEADER_SIZE 14 //!< can be moved to typedef.h -+#define NIC_MAX_PACKET_SIZE 1514 //!< can be moved to typedef.h -+#define NIC_MAX_SEND_PACKETS 10 // max number of send packets the MiniportSendPackets function can accept, can be moved to typedef.h -+#define NIC_VENDOR_DRIVER_VERSION MAKE_DRIVER_VERSION(0,001) //!< can be moved to typedef.h -+#define NIC_MAX_PACKET_SIZE 1514 //!< can be moved to typedef.h -+ -+typedef struct _MP_REG_ENTRY -+{ -+ -+ NDIS_STRING RegName; // variable name text -+ BOOLEAN bRequired; // 1 -> required, 0 -> optional -+ -+ u8 Type; // NdisParameterInteger/NdisParameterHexInteger/NdisParameterStringle/NdisParameterMultiString -+ uint FieldOffset; // offset to MP_ADAPTER field -+ uint FieldSize; // size (in bytes) of the field -+ -+#ifdef UNDER_AMD64 -+ u64 Default; -+#else -+ u32 Default; // default value to use -+#endif -+ -+ u32 Min; // minimum value allowed -+ u32 Max; // maximum value allowed -+} MP_REG_ENTRY, *PMP_REG_ENTRY; -+ -+#ifdef CONFIG_USB_HCI -+typedef struct _USB_EXTENSION { -+ LPCUSB_FUNCS _lpUsbFuncs; -+ USB_HANDLE _hDevice; -+ PVOID pAdapter; -+ -+#if 0 -+ USB_ENDPOINT_DESCRIPTOR _endpACLIn; -+ USB_ENDPOINT_DESCRIPTOR _endpACLOutHigh; -+ USB_ENDPOINT_DESCRIPTOR _endpACLOutNormal; -+ -+ USB_PIPE pPipeIn; -+ USB_PIPE pPipeOutNormal; -+ USB_PIPE pPipeOutHigh; -+#endif -+ -+} USB_EXTENSION, *PUSB_EXTENSION; -+#endif -+ -+ -+typedef struct _OCTET_STRING{ -+ u8 *Octet; -+ u16 Length; -+} OCTET_STRING, *POCTET_STRING; -+ -+ -+ -+ -+ -+#endif ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h -@@ -0,0 +1,25 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __DRV_TYPES_LINUX_H__ -+#define __DRV_TYPES_LINUX_H__ -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h -@@ -0,0 +1,70 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __DRV_TYPES_SDIO_H__ -+#define __DRV_TYPES_SDIO_H__ -+ -+#include -+#include -+ -+// SDIO Header Files -+#ifdef PLATFORM_LINUX -+#include -+#endif -+#ifdef PLATFORM_OS_XP -+#include -+#include -+#endif -+#ifdef PLATFORM_OS_CE -+#include -+#endif -+ -+ -+typedef struct sdio_data -+{ -+ u8 func_number; -+ -+ u8 tx_block_mode; -+ u8 rx_block_mode; -+ u32 block_transfer_len; -+ -+#ifdef PLATFORM_LINUX -+ struct sdio_func *func; -+#endif -+ -+#ifdef PLATFORM_OS_XP -+ PDEVICE_OBJECT pphysdevobj; -+ PDEVICE_OBJECT pfuncdevobj; -+ PDEVICE_OBJECT pnextdevobj; -+ SDBUS_INTERFACE_STANDARD sdbusinft; -+ u8 nextdevstacksz; -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ SD_DEVICE_HANDLE hDevice; -+ SD_CARD_RCA sd_rca; -+ SD_CARD_INTERFACE card_intf; -+ BOOLEAN enableIsarWithStatus; -+ WCHAR active_path[MAX_ACTIVE_REG_PATH]; -+ SD_HOST_BLOCK_CAPABILITY sd_host_blk_cap; -+#endif -+} SDIO_DATA, *PSDIO_DATA; -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h -@@ -0,0 +1,95 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __DRV_TYPES_XP_H__ -+#define __DRV_TYPES_XP_H__ -+ -+#include -+#include -+ -+ -+ -+#define MAX_MCAST_LIST_NUM 32 -+ -+ -+ -+//for ioctl -+#define MAKE_DRIVER_VERSION(_MainVer,_MinorVer) ((((u32)(_MainVer))<<16)+_MinorVer) -+ -+#define NIC_HEADER_SIZE 14 //!< can be moved to typedef.h -+#define NIC_MAX_PACKET_SIZE 1514 //!< can be moved to typedef.h -+#define NIC_MAX_SEND_PACKETS 10 // max number of send packets the MiniportSendPackets function can accept, can be moved to typedef.h -+#define NIC_VENDOR_DRIVER_VERSION MAKE_DRIVER_VERSION(0,001) //!< can be moved to typedef.h -+#define NIC_MAX_PACKET_SIZE 1514 //!< can be moved to typedef.h -+ -+ -+#undef ON_VISTA -+//added by Jackson -+#ifndef ON_VISTA -+// -+// Bus driver versions -+// -+ -+#define SDBUS_DRIVER_VERSION_1 0x100 -+#define SDBUS_DRIVER_VERSION_2 0x200 -+ -+#define SDP_FUNCTION_TYPE 4 -+#define SDP_BUS_DRIVER_VERSION 5 -+#define SDP_BUS_WIDTH 6 -+#define SDP_BUS_CLOCK 7 -+#define SDP_BUS_INTERFACE_CONTROL 8 -+#define SDP_HOST_BLOCK_LENGTH 9 -+#define SDP_FUNCTION_BLOCK_LENGTH 10 -+#define SDP_FN0_BLOCK_LENGTH 11 -+#define SDP_FUNCTION_INT_ENABLE 12 -+#endif -+ -+ -+typedef struct _MP_REG_ENTRY -+{ -+ -+ NDIS_STRING RegName; // variable name text -+ BOOLEAN bRequired; // 1 -> required, 0 -> optional -+ -+ u8 Type; // NdisParameterInteger/NdisParameterHexInteger/NdisParameterStringle/NdisParameterMultiString -+ uint FieldOffset; // offset to MP_ADAPTER field -+ uint FieldSize; // size (in bytes) of the field -+ -+#ifdef UNDER_AMD64 -+ u64 Default; -+#else -+ u32 Default; // default value to use -+#endif -+ -+ u32 Min; // minimum value allowed -+ u32 Max; // maximum value allowed -+} MP_REG_ENTRY, *PMP_REG_ENTRY; -+ -+ -+typedef struct _OCTET_STRING{ -+ u8 *Octet; -+ u16 Length; -+} OCTET_STRING, *POCTET_STRING; -+ -+ -+ -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h -@@ -0,0 +1,41 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/*! \file */ -+#ifndef __INC_ETHERNET_H -+#define __INC_ETHERNET_H -+ -+#define ETHERNET_ADDRESS_LENGTH 6 //!< Ethernet Address Length -+#define ETHERNET_HEADER_SIZE 14 //!< Ethernet Header Length -+#define LLC_HEADER_SIZE 6 //!< LLC Header Length -+#define TYPE_LENGTH_FIELD_SIZE 2 //!< Type/Length Size -+#define MINIMUM_ETHERNET_PACKET_SIZE 60 //!< Minimum Ethernet Packet Size -+#define MAXIMUM_ETHERNET_PACKET_SIZE 1514 //!< Maximum Ethernet Packet Size -+ -+#define RT_ETH_IS_MULTICAST(_pAddr) ((((UCHAR *)(_pAddr))[0]&0x01)!=0) //!< Is Multicast Address? -+#define RT_ETH_IS_BROADCAST(_pAddr) ( \ -+ ((UCHAR *)(_pAddr))[0]==0xff && \ -+ ((UCHAR *)(_pAddr))[1]==0xff && \ -+ ((UCHAR *)(_pAddr))[2]==0xff && \ -+ ((UCHAR *)(_pAddr))[3]==0xff && \ -+ ((UCHAR *)(_pAddr))[4]==0xff && \ -+ ((UCHAR *)(_pAddr))[5]==0xff ) //!< Is Broadcast Address? -+ -+ -+#endif // #ifndef __INC_ETHERNET_H ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h -@@ -0,0 +1,35 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+ -+#define _H2CLBK_H_ -+ -+ -+#include -+#include -+ -+ -+void _lbk_cmd(PADAPTER Adapter); -+ -+void _lbk_rsp(PADAPTER Adapter); -+ -+void _lbk_evt(IN PADAPTER Adapter); -+ -+void h2c_event_callback(unsigned char *dev, unsigned char *pbuf); ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h -@@ -0,0 +1,146 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __HAL_COMMON_H__ -+#define __HAL_COMMON_H__ -+ -+//CCK -+#define RATE_1M BIT(0) -+#define RATE_2M BIT(1) -+#define RATE_5_5M BIT(2) -+#define RATE_11M BIT(3) -+//OFDM -+#define RATE_6M BIT(4) -+#define RATE_9M BIT(5) -+#define RATE_12M BIT(6) -+#define RATE_18M BIT(7) -+#define RATE_24M BIT(8) -+#define RATE_36M BIT(9) -+#define RATE_48M BIT(10) -+#define RATE_54M BIT(11) -+//MCS 1 Spatial Stream -+#define RATE_MCS0 BIT(12) -+#define RATE_MCS1 BIT(13) -+#define RATE_MCS2 BIT(14) -+#define RATE_MCS3 BIT(15) -+#define RATE_MCS4 BIT(16) -+#define RATE_MCS5 BIT(17) -+#define RATE_MCS6 BIT(18) -+#define RATE_MCS7 BIT(19) -+//MCS 2 Spatial Stream -+#define RATE_MCS8 BIT(20) -+#define RATE_MCS9 BIT(21) -+#define RATE_MCS10 BIT(22) -+#define RATE_MCS11 BIT(23) -+#define RATE_MCS12 BIT(24) -+#define RATE_MCS13 BIT(25) -+#define RATE_MCS14 BIT(26) -+#define RATE_MCS15 BIT(27) -+ -+// ALL CCK Rate -+#define RATE_ALL_CCK RATR_1M|RATR_2M|RATR_55M|RATR_11M -+#define RATE_ALL_OFDM_AG RATR_6M|RATR_9M|RATR_12M|RATR_18M|RATR_24M|\ -+ RATR_36M|RATR_48M|RATR_54M -+#define RATE_ALL_OFDM_1SS RATR_MCS0|RATR_MCS1|RATR_MCS2|RATR_MCS3 |\ -+ RATR_MCS4|RATR_MCS5|RATR_MCS6 |RATR_MCS7 -+#define RATE_ALL_OFDM_2SS RATR_MCS8|RATR_MCS9 |RATR_MCS10|RATR_MCS11|\ -+ RATR_MCS12|RATR_MCS13|RATR_MCS14|RATR_MCS15 -+ -+/*------------------------------ Tx Desc definition Macro ------------------------*/ -+//#pragma mark -- Tx Desc related definition. -- -+//---------------------------------------------------------------------------- -+//----------------------------------------------------------- -+// Rate -+//----------------------------------------------------------- -+// CCK Rates, TxHT = 0 -+#define DESC_RATE1M 0x00 -+#define DESC_RATE2M 0x01 -+#define DESC_RATE5_5M 0x02 -+#define DESC_RATE11M 0x03 -+ -+// OFDM Rates, TxHT = 0 -+#define DESC_RATE6M 0x04 -+#define DESC_RATE9M 0x05 -+#define DESC_RATE12M 0x06 -+#define DESC_RATE18M 0x07 -+#define DESC_RATE24M 0x08 -+#define DESC_RATE36M 0x09 -+#define DESC_RATE48M 0x0a -+#define DESC_RATE54M 0x0b -+ -+// MCS Rates, TxHT = 1 -+#define DESC_RATEMCS0 0x0c -+#define DESC_RATEMCS1 0x0d -+#define DESC_RATEMCS2 0x0e -+#define DESC_RATEMCS3 0x0f -+#define DESC_RATEMCS4 0x10 -+#define DESC_RATEMCS5 0x11 -+#define DESC_RATEMCS6 0x12 -+#define DESC_RATEMCS7 0x13 -+#define DESC_RATEMCS8 0x14 -+#define DESC_RATEMCS9 0x15 -+#define DESC_RATEMCS10 0x16 -+#define DESC_RATEMCS11 0x17 -+#define DESC_RATEMCS12 0x18 -+#define DESC_RATEMCS13 0x19 -+#define DESC_RATEMCS14 0x1a -+#define DESC_RATEMCS15 0x1b -+#define DESC_RATEMCS15_SG 0x1c -+#define DESC_RATEMCS32 0x20 -+ -+//============================================================ -+// Global var -+//============================================================ -+#define OFDM_TABLE_SIZE_92C 37 -+#define OFDM_TABLE_SIZE_92D 43 -+#define CCK_TABLE_SIZE 33 -+ -+extern u32 OFDMSwingTable[OFDM_TABLE_SIZE_92D] ; -+ -+extern u8 CCKSwingTable_Ch1_Ch13[CCK_TABLE_SIZE][8]; -+ -+extern u8 CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8]; -+ -+#ifdef CONFIG_CHIP_VER_INTEGRATION -+void dump_chip_info(HAL_VERSION ChipVersion); -+#endif -+ -+u8 //return the final channel plan decision -+hal_com_get_channel_plan( -+ IN PADAPTER padapter, -+ IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) -+ IN u8 sw_channel_plan, //channel plan from SW (registry/module param) -+ IN u8 def_channel_plan, //channel plan used when the former two is invalid -+ IN BOOLEAN AutoLoadFail -+ ); -+ -+void HalSetBrateCfg( -+ IN PADAPTER Adapter, -+ IN u8 *mBratesOS, -+ OUT u16 *pBrateCfg); -+ -+u8 MRateToHwRate(u8 rate); -+ -+void hal_init_macaddr(_adapter *adapter); -+ -+void c2h_evt_clear(_adapter *adapter); -+s32 c2h_evt_read(_adapter *adapter, u8 *buf); -+ -+#endif //__HAL_COMMON_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h -@@ -0,0 +1,432 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __HAL_INTF_H__ -+#define __HAL_INTF_H__ -+ -+#include -+#include -+#include -+ -+#ifdef CONFIG_PCI_HCI -+#include -+#endif -+ -+ -+enum RTL871X_HCI_TYPE { -+ -+ RTW_SDIO, -+ RTW_USB, -+ RTW_PCIE -+}; -+ -+enum _CHIP_TYPE { -+ -+ NULL_CHIP_TYPE, -+ RTL8712_8188S_8191S_8192S, -+ RTL8188C_8192C, -+ RTL8192D, -+ RTL8723A, -+ RTL8188E, -+ MAX_CHIP_TYPE -+}; -+ -+ -+typedef enum _HW_VARIABLES{ -+ HW_VAR_MEDIA_STATUS, -+ HW_VAR_MEDIA_STATUS1, -+ HW_VAR_SET_OPMODE, -+ HW_VAR_MAC_ADDR, -+ HW_VAR_BSSID, -+ HW_VAR_INIT_RTS_RATE, -+ HW_VAR_INIT_DATA_RATE, -+ HW_VAR_BASIC_RATE, -+ HW_VAR_TXPAUSE, -+ HW_VAR_BCN_FUNC, -+ HW_VAR_CORRECT_TSF, -+ HW_VAR_CHECK_BSSID, -+ HW_VAR_MLME_DISCONNECT, -+ HW_VAR_MLME_SITESURVEY, -+ HW_VAR_MLME_JOIN, -+ HW_VAR_ON_RCR_AM, -+ HW_VAR_OFF_RCR_AM, -+ HW_VAR_BEACON_INTERVAL, -+ HW_VAR_SLOT_TIME, -+ HW_VAR_RESP_SIFS, -+ HW_VAR_ACK_PREAMBLE, -+ HW_VAR_SEC_CFG, -+ HW_VAR_BCN_VALID, -+ HW_VAR_RF_TYPE, -+ HW_VAR_DM_FLAG, -+ HW_VAR_DM_FUNC_OP, -+ HW_VAR_DM_FUNC_SET, -+ HW_VAR_DM_FUNC_CLR, -+ HW_VAR_DM_INIT_PWDB, -+ HW_VAR_CAM_EMPTY_ENTRY, -+ HW_VAR_CAM_INVALID_ALL, -+ HW_VAR_CAM_WRITE, -+ HW_VAR_CAM_READ, -+ HW_VAR_AC_PARAM_VO, -+ HW_VAR_AC_PARAM_VI, -+ HW_VAR_AC_PARAM_BE, -+ HW_VAR_AC_PARAM_BK, -+ HW_VAR_ACM_CTRL, -+ HW_VAR_AMPDU_MIN_SPACE, -+ HW_VAR_AMPDU_FACTOR, -+ HW_VAR_RXDMA_AGG_PG_TH, -+ HW_VAR_SET_RPWM, -+ HW_VAR_H2C_FW_PWRMODE, -+ HW_VAR_H2C_FW_JOINBSSRPT, -+ HW_VAR_FWLPS_RF_ON, -+ HW_VAR_H2C_FW_P2P_PS_OFFLOAD, -+ HW_VAR_TDLS_WRCR, -+ HW_VAR_TDLS_INIT_CH_SEN, -+ HW_VAR_TDLS_RS_RCR, -+ HW_VAR_TDLS_DONE_CH_SEN, -+ HW_VAR_INITIAL_GAIN, -+ HW_VAR_TRIGGER_GPIO_0, -+ HW_VAR_BT_SET_COEXIST, -+ HW_VAR_BT_ISSUE_DELBA, -+ HW_VAR_CURRENT_ANTENNA, -+ HW_VAR_ANTENNA_DIVERSITY_LINK, -+ HW_VAR_ANTENNA_DIVERSITY_SELECT, -+ HW_VAR_SWITCH_EPHY_WoWLAN, -+ HW_VAR_EFUSE_BYTES, -+ HW_VAR_FIFO_CLEARN_UP, -+ HW_VAR_CHECK_TXBUF, -+ HW_VAR_APFM_ON_MAC, //Auto FSM to Turn On, include clock, isolation, power control for MAC only -+ HW_VAR_WOWLAN, -+ HW_VAR_VID, -+ HW_VAR_PID, -+ HW_VAR_MBSSID_CAM_WRITE, -+ HW_VAR_MBSSID_CAM_CLEAR, -+ HW_VAR_RCR_MBSSID_EN, -+ HW_VAR_USB_RXAGG_PAGE_TO, -+}HW_VARIABLES; -+ -+typedef enum _HAL_DEF_VARIABLE{ -+ HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, -+ HAL_DEF_IS_SUPPORT_ANT_DIV, -+ HAL_DEF_CURRENT_ANTENNA, -+ HAL_DEF_DRVINFO_SZ, -+ HAL_DEF_MAX_RECVBUF_SZ, -+ HAL_DEF_RX_PACKET_OFFSET, -+ HAL_DEF_DBG_DUMP_RXPKT,//for dbg -+ HAL_DEF_DBG_DM_FUNC,//for dbg -+ HAL_DEF_DUAL_MAC_MODE, -+}HAL_DEF_VARIABLE; -+ -+typedef enum _HAL_INTF_PS_FUNC{ -+ HAL_USB_SELECT_SUSPEND, -+ HAL_MAX_ID, -+}HAL_INTF_PS_FUNC; -+ -+typedef s32 (*c2h_id_filter)(u8 id); -+ -+struct hal_ops { -+ u32 (*hal_init)(PADAPTER Adapter); -+ u32 (*hal_deinit)(PADAPTER Adapter); -+ -+ void (*free_hal_data)(PADAPTER Adapter); -+ -+ u32 (*inirp_init)(PADAPTER Adapter); -+ u32 (*inirp_deinit)(PADAPTER Adapter); -+ -+ s32 (*init_xmit_priv)(PADAPTER Adapter); -+ void (*free_xmit_priv)(PADAPTER Adapter); -+ -+ s32 (*init_recv_priv)(PADAPTER Adapter); -+ void (*free_recv_priv)(PADAPTER Adapter); -+ -+ void (*InitSwLeds)(PADAPTER Adapter); -+ void (*DeInitSwLeds)(PADAPTER Adapter); -+ -+ void (*dm_init)(PADAPTER Adapter); -+ void (*dm_deinit)(PADAPTER Adapter); -+ void (*read_chip_version)(PADAPTER Adapter); -+ -+ void (*init_default_value)(PADAPTER Adapter); -+ -+ void (*intf_chip_configure)(PADAPTER Adapter); -+ -+ void (*read_adapter_info)(PADAPTER Adapter); -+ -+ void (*enable_interrupt)(PADAPTER Adapter); -+ void (*disable_interrupt)(PADAPTER Adapter); -+ s32 (*interrupt_handler)(PADAPTER Adapter); -+ -+ void (*set_bwmode_handler)(PADAPTER Adapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); -+ void (*set_channel_handler)(PADAPTER Adapter, u8 channel); -+ -+ void (*hal_dm_watchdog)(PADAPTER Adapter); -+ -+ void (*SetHwRegHandler)(PADAPTER Adapter, u8 variable,u8* val); -+ void (*GetHwRegHandler)(PADAPTER Adapter, u8 variable,u8* val); -+ -+ u8 (*GetHalDefVarHandler)(PADAPTER Adapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -+ u8 (*SetHalDefVarHandler)(PADAPTER Adapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -+ -+ void (*UpdateRAMaskHandler)(PADAPTER Adapter, u32 mac_id); -+ void (*SetBeaconRelatedRegistersHandler)(PADAPTER Adapter); -+ -+ void (*Add_RateATid)(PADAPTER Adapter, u32 bitmap, u8 arg); -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ u8 (*AntDivBeforeLinkHandler)(PADAPTER Adapter); -+ void (*AntDivCompareHandler)(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); -+#endif -+ u8 (*interface_ps_func)(PADAPTER Adapter,HAL_INTF_PS_FUNC efunc_id, u8* val); -+ -+ s32 (*hal_xmit)(PADAPTER Adapter, struct xmit_frame *pxmitframe); -+ s32 (*mgnt_xmit)(PADAPTER Adapter, struct xmit_frame *pmgntframe); -+ s32 (*hal_xmitframe_enqueue)(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+ u32 (*read_bbreg)(PADAPTER Adapter, u32 RegAddr, u32 BitMask); -+ void (*write_bbreg)(PADAPTER Adapter, u32 RegAddr, u32 BitMask, u32 Data); -+ u32 (*read_rfreg)(PADAPTER Adapter, u32 eRFPath, u32 RegAddr, u32 BitMask); -+ void (*write_rfreg)(PADAPTER Adapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ s32 (*hostap_mgnt_xmit_entry)(PADAPTER Adapter, _pkt *pkt); -+#endif -+ void (*EfusePowerSwitch)(PADAPTER pAdapter, u8 bWrite, u8 PwrState); -+ void (*ReadEFuse)(PADAPTER Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest); -+ void (*EFUSEGetEfuseDefinition)(PADAPTER pAdapter, u8 efuseType, u8 type, PVOID *pOut, BOOLEAN bPseudoTest); -+ u16 (*EfuseGetCurrentSize)(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); -+ int (*Efuse_PgPacketRead)(PADAPTER pAdapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); -+ int (*Efuse_PgPacketWrite)(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); -+ u8 (*Efuse_WordEnableDataWrite)(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+ void (*sreset_init_value)(_adapter *padapter); -+ void (*sreset_reset_value)(_adapter *padapter); -+ void (*silentreset)(_adapter *padapter); -+ void (*sreset_xmit_status_check)(_adapter *padapter); -+ void (*sreset_linked_status_check) (_adapter *padapter); -+ u8 (*sreset_get_wifi_status)(_adapter *padapter); -+ bool (*sreset_inprogress)(_adapter *padapter); -+#endif -+ -+#ifdef CONFIG_IOL -+ int (*IOL_exec_cmds_sync)(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms); -+#endif -+ void (*hal_notch_filter)(_adapter * adapter, bool enable); -+ void (*hal_reset_security_engine)(_adapter * adapter); -+ -+ s32 (*c2h_handler)(_adapter *padapter, struct c2h_evt_hdr *c2h_evt); -+ c2h_id_filter c2h_id_filter_ccx; -+}; -+ -+typedef enum _RT_EEPROM_TYPE{ -+ EEPROM_93C46, -+ EEPROM_93C56, -+ EEPROM_BOOT_EFUSE, -+}RT_EEPROM_TYPE,*PRT_EEPROM_TYPE; -+ -+#define USB_HIGH_SPEED_BULK_SIZE 512 -+#define USB_FULL_SPEED_BULK_SIZE 64 -+ -+#define RF_CHANGE_BY_INIT 0 -+#define RF_CHANGE_BY_IPS BIT28 -+#define RF_CHANGE_BY_PS BIT29 -+#define RF_CHANGE_BY_HW BIT30 -+#define RF_CHANGE_BY_SW BIT31 -+ -+typedef enum _HARDWARE_TYPE{ -+ HARDWARE_TYPE_RTL8180, -+ HARDWARE_TYPE_RTL8185, -+ HARDWARE_TYPE_RTL8187, -+ HARDWARE_TYPE_RTL8188, -+ HARDWARE_TYPE_RTL8190P, -+ HARDWARE_TYPE_RTL8192E, -+ HARDWARE_TYPE_RTL819xU, -+ HARDWARE_TYPE_RTL8192SE, -+ HARDWARE_TYPE_RTL8192SU, -+ HARDWARE_TYPE_RTL8192CE, -+ HARDWARE_TYPE_RTL8192CU, -+ HARDWARE_TYPE_RTL8192DE, -+ HARDWARE_TYPE_RTL8192DU, -+ HARDWARE_TYPE_RTL8723AE, -+ HARDWARE_TYPE_RTL8723AU, -+ HARDWARE_TYPE_RTL8723AS, -+ HARDWARE_TYPE_RTL8188EE, -+ HARDWARE_TYPE_RTL8188EU, -+ HARDWARE_TYPE_RTL8188ES, -+ HARDWARE_TYPE_MAX, -+}HARDWARE_TYPE; -+ -+// -+// RTL8192C Series -+// -+#define IS_HARDWARE_TYPE_8192CE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE) -+#define IS_HARDWARE_TYPE_8192CU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU) -+#define IS_HARDWARE_TYPE_8192C(_Adapter) \ -+(IS_HARDWARE_TYPE_8192CE(_Adapter) || IS_HARDWARE_TYPE_8192CU(_Adapter)) -+ -+// -+// RTL8192D Series -+// -+#define IS_HARDWARE_TYPE_8192DE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE) -+#define IS_HARDWARE_TYPE_8192DU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU) -+#define IS_HARDWARE_TYPE_8192D(_Adapter) \ -+(IS_HARDWARE_TYPE_8192DE(_Adapter) || IS_HARDWARE_TYPE_8192DU(_Adapter)) -+ -+// -+// RTL8723A Series -+// -+#define IS_HARDWARE_TYPE_8723AE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE) -+#define IS_HARDWARE_TYPE_8723AU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU) -+#define IS_HARDWARE_TYPE_8723AS(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS) -+#define IS_HARDWARE_TYPE_8723A(_Adapter) \ -+(IS_HARDWARE_TYPE_8723AE(_Adapter) || IS_HARDWARE_TYPE_8723AU(_Adapter) || IS_HARDWARE_TYPE_8723AS(_Adapter)) -+ -+// -+// RTL8188E Series -+// -+#define IS_HARDWARE_TYPE_8188EE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE) -+#define IS_HARDWARE_TYPE_8188EU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU) -+#define IS_HARDWARE_TYPE_8188ES(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES) -+#define IS_HARDWARE_TYPE_8188E(_Adapter) \ -+(IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter)) -+ -+ -+typedef struct eeprom_priv EEPROM_EFUSE_PRIV, *PEEPROM_EFUSE_PRIV; -+#define GET_EEPROM_EFUSE_PRIV(priv) (&priv->eeprompriv) -+ -+#ifdef CONFIG_WOWLAN -+typedef enum _wowlan_subcode{ -+ WOWLAN_PATTERN_MATCH = 1, -+ WOWLAN_MAGIC_PACKET = 2, -+ WOWLAN_UNICAST = 3, -+ WOWLAN_SET_PATTERN = 4, -+ WOWLAN_DUMP_REG = 5, -+ WOWLAN_ENABLE = 6, -+ WOWLAN_DISABLE = 7, -+ WOWLAN_STATUS = 8, -+ WOWLAN_DEBUG_RELOAD_FW = 9, -+ WOWLAN_DEBUG_1 =10, -+ WOWLAN_DEBUG_2 =11 -+}wowlan_subcode; -+ -+struct wowlan_ioctl_param{ -+ unsigned int subcode; -+ unsigned int subcode_value; -+ unsigned int wakeup_reason; -+ unsigned int len; -+ unsigned char pattern[0]; -+}; -+ -+#define Rx_Pairwisekey BIT(0) -+#define Rx_GTK BIT(1) -+#define Rx_DisAssoc BIT(2) -+#define Rx_DeAuth BIT(3) -+#define FWDecisionDisconnect BIT(4) -+#define Rx_MagicPkt BIT(5) -+#define FinishBtFwPatch BIT(7) -+ -+#endif // CONFIG_WOWLAN -+ -+void rtw_hal_def_value_init(_adapter *padapter); -+void rtw_hal_free_data(_adapter *padapter); -+ -+void rtw_hal_dm_init(_adapter *padapter); -+void rtw_hal_dm_deinit(_adapter *padapter); -+void rtw_hal_sw_led_init(_adapter *padapter); -+void rtw_hal_sw_led_deinit(_adapter *padapter); -+ -+uint rtw_hal_init(_adapter *padapter); -+uint rtw_hal_deinit(_adapter *padapter); -+void rtw_hal_stop(_adapter *padapter); -+ -+void rtw_hal_set_hwreg(PADAPTER padapter, u8 variable, u8 *val); -+void rtw_hal_get_hwreg(PADAPTER padapter, u8 variable, u8 *val); -+ -+void rtw_hal_chip_configure(_adapter *padapter); -+void rtw_hal_read_chip_info(_adapter *padapter); -+void rtw_hal_read_chip_version(_adapter *padapter); -+ -+u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -+u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -+ -+void rtw_hal_enable_interrupt(_adapter *padapter); -+void rtw_hal_disable_interrupt(_adapter *padapter); -+ -+u32 rtw_hal_inirp_init(_adapter *padapter); -+u32 rtw_hal_inirp_deinit(_adapter *padapter); -+ -+u8 rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); -+ -+s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -+s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); -+s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); -+ -+s32 rtw_hal_init_xmit_priv(_adapter *padapter); -+void rtw_hal_free_xmit_priv(_adapter *padapter); -+ -+s32 rtw_hal_init_recv_priv(_adapter *padapter); -+void rtw_hal_free_recv_priv(_adapter *padapter); -+ -+void rtw_hal_update_ra_mask(_adapter *padapter, u32 mac_id); -+void rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8 arg); -+ -+void rtw_hal_bcn_related_reg_setting(_adapter *padapter); -+ -+u32 rtw_hal_read_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask); -+void rtw_hal_write_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); -+u32 rtw_hal_read_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask); -+void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -+ -+s32 rtw_hal_interrupt_handler(_adapter *padapter); -+ -+void rtw_hal_set_bwmode(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); -+void rtw_hal_set_chan(_adapter *padapter, u8 channel); -+ -+void rtw_hal_dm_watchdog(_adapter *padapter); -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+u8 rtw_hal_antdiv_before_linked(_adapter *padapter); -+void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); -+#endif -+ -+#ifdef CONFIG_HOSTAPD_MLME -+s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); -+#endif -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+void rtw_hal_sreset_init(_adapter *padapter); -+void rtw_hal_sreset_reset(_adapter *padapter); -+void rtw_hal_sreset_reset_value(_adapter *padapter); -+void rtw_hal_sreset_xmit_status_check(_adapter *padapter); -+void rtw_hal_sreset_linked_status_check(_adapter *padapter); -+u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter); -+bool rtw_hal_sreset_inprogress(_adapter *padapter); -+#endif -+ -+#ifdef CONFIG_IOL -+int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms); -+#endif -+ -+void rtw_hal_notch_filter(_adapter * adapter, bool enable); -+void rtw_hal_reset_security_engine(_adapter * adapter); -+ -+s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt); -+c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter); -+ -+#endif //__HAL_INTF_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h -@@ -0,0 +1,1580 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __IEEE80211_H -+#define __IEEE80211_H -+ -+ -+#ifndef CONFIG_RTL8711FW -+ -+ #include -+ #include -+ #include -+ #include "wifi.h" -+ -+ #if defined PLATFORM_OS_XP -+ #include -+ #endif -+ #if defined PLATFORM_LINUX -+ #include -+ #endif -+#else -+ -+ #include -+ -+#endif -+ -+#define MGMT_QUEUE_NUM 5 -+ -+#define ETH_ALEN 6 -+#define ETH_TYPE_LEN 2 -+#define PAYLOAD_TYPE_LEN 1 -+ -+#ifdef CONFIG_AP_MODE -+ -+#define RTL_IOCTL_HOSTAPD (SIOCIWFIRSTPRIV + 28) -+ -+/* RTL871X_IOCTL_HOSTAPD ioctl() cmd: */ -+enum { -+ RTL871X_HOSTAPD_FLUSH = 1, -+ RTL871X_HOSTAPD_ADD_STA = 2, -+ RTL871X_HOSTAPD_REMOVE_STA = 3, -+ RTL871X_HOSTAPD_GET_INFO_STA = 4, -+ /* REMOVED: PRISM2_HOSTAPD_RESET_TXEXC_STA = 5, */ -+ RTL871X_HOSTAPD_GET_WPAIE_STA = 5, -+ RTL871X_SET_ENCRYPTION = 6, -+ RTL871X_GET_ENCRYPTION = 7, -+ RTL871X_HOSTAPD_SET_FLAGS_STA = 8, -+ RTL871X_HOSTAPD_GET_RID = 9, -+ RTL871X_HOSTAPD_SET_RID = 10, -+ RTL871X_HOSTAPD_SET_ASSOC_AP_ADDR = 11, -+ RTL871X_HOSTAPD_SET_GENERIC_ELEMENT = 12, -+ RTL871X_HOSTAPD_MLME = 13, -+ RTL871X_HOSTAPD_SCAN_REQ = 14, -+ RTL871X_HOSTAPD_STA_CLEAR_STATS = 15, -+ RTL871X_HOSTAPD_SET_BEACON=16, -+ RTL871X_HOSTAPD_SET_WPS_BEACON = 17, -+ RTL871X_HOSTAPD_SET_WPS_PROBE_RESP = 18, -+ RTL871X_HOSTAPD_SET_WPS_ASSOC_RESP = 19, -+ RTL871X_HOSTAPD_SET_HIDDEN_SSID = 20, -+ RTL871X_HOSTAPD_SET_MACADDR_ACL = 21, -+ RTL871X_HOSTAPD_ACL_ADD_STA = 22, -+ RTL871X_HOSTAPD_ACL_REMOVE_STA = 23, -+}; -+ -+/* STA flags */ -+#define WLAN_STA_AUTH BIT(0) -+#define WLAN_STA_ASSOC BIT(1) -+#define WLAN_STA_PS BIT(2) -+#define WLAN_STA_TIM BIT(3) -+#define WLAN_STA_PERM BIT(4) -+#define WLAN_STA_AUTHORIZED BIT(5) -+#define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */ -+#define WLAN_STA_SHORT_PREAMBLE BIT(7) -+#define WLAN_STA_PREAUTH BIT(8) -+#define WLAN_STA_WME BIT(9) -+#define WLAN_STA_MFP BIT(10) -+#define WLAN_STA_HT BIT(11) -+#define WLAN_STA_WPS BIT(12) -+#define WLAN_STA_MAYBE_WPS BIT(13) -+#define WLAN_STA_NONERP BIT(31) -+ -+#endif -+ -+#define IEEE_CMD_SET_WPA_PARAM 1 -+#define IEEE_CMD_SET_WPA_IE 2 -+#define IEEE_CMD_SET_ENCRYPTION 3 -+#define IEEE_CMD_MLME 4 -+ -+#define IEEE_PARAM_WPA_ENABLED 1 -+#define IEEE_PARAM_TKIP_COUNTERMEASURES 2 -+#define IEEE_PARAM_DROP_UNENCRYPTED 3 -+#define IEEE_PARAM_PRIVACY_INVOKED 4 -+#define IEEE_PARAM_AUTH_ALGS 5 -+#define IEEE_PARAM_IEEE_802_1X 6 -+#define IEEE_PARAM_WPAX_SELECT 7 -+ -+#define AUTH_ALG_OPEN_SYSTEM 0x1 -+#define AUTH_ALG_SHARED_KEY 0x2 -+#define AUTH_ALG_LEAP 0x00000004 -+ -+#define IEEE_MLME_STA_DEAUTH 1 -+#define IEEE_MLME_STA_DISASSOC 2 -+ -+#define IEEE_CRYPT_ERR_UNKNOWN_ALG 2 -+#define IEEE_CRYPT_ERR_UNKNOWN_ADDR 3 -+#define IEEE_CRYPT_ERR_CRYPT_INIT_FAILED 4 -+#define IEEE_CRYPT_ERR_KEY_SET_FAILED 5 -+#define IEEE_CRYPT_ERR_TX_KEY_SET_FAILED 6 -+#define IEEE_CRYPT_ERR_CARD_CONF_FAILED 7 -+ -+ -+#define IEEE_CRYPT_ALG_NAME_LEN 16 -+ -+#define WPA_CIPHER_NONE BIT(0) -+#define WPA_CIPHER_WEP40 BIT(1) -+#define WPA_CIPHER_WEP104 BIT(2) -+#define WPA_CIPHER_TKIP BIT(3) -+#define WPA_CIPHER_CCMP BIT(4) -+ -+ -+ -+#define WPA_SELECTOR_LEN 4 -+extern u8 RTW_WPA_OUI_TYPE[] ; -+extern u16 RTW_WPA_VERSION ; -+extern u8 WPA_AUTH_KEY_MGMT_NONE[]; -+extern u8 WPA_AUTH_KEY_MGMT_UNSPEC_802_1X[]; -+extern u8 WPA_AUTH_KEY_MGMT_PSK_OVER_802_1X[]; -+extern u8 WPA_CIPHER_SUITE_NONE[]; -+extern u8 WPA_CIPHER_SUITE_WEP40[]; -+extern u8 WPA_CIPHER_SUITE_TKIP[]; -+extern u8 WPA_CIPHER_SUITE_WRAP[]; -+extern u8 WPA_CIPHER_SUITE_CCMP[]; -+extern u8 WPA_CIPHER_SUITE_WEP104[]; -+ -+ -+#define RSN_HEADER_LEN 4 -+#define RSN_SELECTOR_LEN 4 -+ -+extern u16 RSN_VERSION_BSD; -+extern u8 RSN_AUTH_KEY_MGMT_UNSPEC_802_1X[]; -+extern u8 RSN_AUTH_KEY_MGMT_PSK_OVER_802_1X[]; -+extern u8 RSN_CIPHER_SUITE_NONE[]; -+extern u8 RSN_CIPHER_SUITE_WEP40[]; -+extern u8 RSN_CIPHER_SUITE_TKIP[]; -+extern u8 RSN_CIPHER_SUITE_WRAP[]; -+extern u8 RSN_CIPHER_SUITE_CCMP[]; -+extern u8 RSN_CIPHER_SUITE_WEP104[]; -+ -+typedef enum _RATR_TABLE_MODE{ -+ RATR_INX_WIRELESS_NGB = 0, // BGN 40 Mhz 2SS 1SS -+ RATR_INX_WIRELESS_NG = 1, // GN or N -+ RATR_INX_WIRELESS_NB = 2, // BGN 20 Mhz 2SS 1SS or BN -+ RATR_INX_WIRELESS_N = 3, -+ RATR_INX_WIRELESS_GB = 4, -+ RATR_INX_WIRELESS_G = 5, -+ RATR_INX_WIRELESS_B = 6, -+ RATR_INX_WIRELESS_MC = 7, -+ RATR_INX_WIRELESS_AC_N = 8, -+}RATR_TABLE_MODE, *PRATR_TABLE_MODE; -+ -+enum NETWORK_TYPE -+{ -+ WIRELESS_INVALID = 0, -+ //Sub-Element -+ WIRELESS_11B = BIT(0), // tx: cck only , rx: cck only, hw: cck -+ WIRELESS_11G = BIT(1), // tx: ofdm only, rx: ofdm & cck, hw: cck & ofdm -+ WIRELESS_11A = BIT(2), // tx: ofdm only, rx: ofdm only, hw: ofdm only -+ WIRELESS_11_24N = BIT(3), // tx: MCS only, rx: MCS & cck, hw: MCS & cck -+ WIRELESS_11_5N = BIT(4), // tx: MCS only, rx: MCS & ofdm, hw: ofdm only -+ //WIRELESS_AUTO = BIT(5), -+ WIRELESS_AC = BIT(6), -+ -+ //Combination -+ WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), // tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm -+ WIRELESS_11G_24N = (WIRELESS_11G|WIRELESS_11_24N), // tx: ofdm & MCS, rx: ofdm & cck & MCS, hw: cck & ofdm -+ WIRELESS_11A_5N = (WIRELESS_11A|WIRELESS_11_5N), // tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only -+ WIRELESS_11BG_24N = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N), // tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck -+ WIRELESS_11AGN = (WIRELESS_11A|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), // tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only -+ WIRELESS_11ABGN = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), -+}; -+ -+#define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N) -+#define SUPPORTED_5G_NETTYPE_MSK (WIRELESS_11A | WIRELESS_11_5N) -+ -+#define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? _TRUE : _FALSE) -+#define IsSupported5G(NetType) ((NetType) & SUPPORTED_5G_NETTYPE_MSK ? _TRUE : _FALSE) -+ -+#define IsEnableHWCCK(NetType) IsSupported24G(NetType) -+#define IsEnableHWOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11_24N|SUPPORTED_5G_NETTYPE_MSK) ? _TRUE : _FALSE) -+ -+#define IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType) -+#define IsSupportedRxOFDM(NetType) IsEnableHWOFDM(NetType) -+#define IsSupportedRxMCS(NetType) IsEnableHWOFDM(NetType) -+ -+#define IsSupportedTxCCK(NetType) ((NetType) & (WIRELESS_11B) ? _TRUE : _FALSE) -+#define IsSupportedTxOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11A) ? _TRUE : _FALSE) -+#define IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? _TRUE : _FALSE) -+ -+ -+typedef struct ieee_param { -+ u32 cmd; -+ u8 sta_addr[ETH_ALEN]; -+ union { -+ struct { -+ u8 name; -+ u32 value; -+ } wpa_param; -+ struct { -+ u32 len; -+ u8 reserved[32]; -+ u8 data[0]; -+ } wpa_ie; -+ struct{ -+ int command; -+ int reason_code; -+ } mlme; -+ struct { -+ u8 alg[IEEE_CRYPT_ALG_NAME_LEN]; -+ u8 set_tx; -+ u32 err; -+ u8 idx; -+ u8 seq[8]; /* sequence counter (set: RX, get: TX) */ -+ u16 key_len; -+ u8 key[0]; -+ } crypt; -+#ifdef CONFIG_AP_MODE -+ struct { -+ u16 aid; -+ u16 capability; -+ int flags; -+ u8 tx_supp_rates[16]; -+ struct rtw_ieee80211_ht_cap ht_cap; -+ } add_sta; -+ struct { -+ u8 reserved[2];//for set max_num_sta -+ u8 buf[0]; -+ } bcn_ie; -+#endif -+ -+ } u; -+}ieee_param; -+ -+#ifdef CONFIG_AP_MODE -+typedef struct ieee_param_ex { -+ u32 cmd; -+ u8 sta_addr[ETH_ALEN]; -+ u8 data[0]; -+}ieee_param_ex; -+ -+struct sta_data{ -+ u16 aid; -+ u16 capability; -+ int flags; -+ u32 sta_set; -+ u8 tx_supp_rates[16]; -+ u32 tx_supp_rates_len; -+ struct rtw_ieee80211_ht_cap ht_cap; -+ u64 rx_pkts; -+ u64 rx_bytes; -+ u64 rx_drops; -+ u64 tx_pkts; -+ u64 tx_bytes; -+ u64 tx_drops; -+}; -+#endif -+ -+ -+#if WIRELESS_EXT < 17 -+#define IW_QUAL_QUAL_INVALID 0x10 -+#define IW_QUAL_LEVEL_INVALID 0x20 -+#define IW_QUAL_NOISE_INVALID 0x40 -+#define IW_QUAL_QUAL_UPDATED 0x1 -+#define IW_QUAL_LEVEL_UPDATED 0x2 -+#define IW_QUAL_NOISE_UPDATED 0x4 -+#endif -+ -+#define IEEE80211_DATA_LEN 2304 -+/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section -+ 6.2.1.1.2. -+ -+ The figure in section 7.1.2 suggests a body size of up to 2312 -+ bytes is allowed, which is a bit confusing, I suspect this -+ represents the 2304 bytes of real data, plus a possible 8 bytes of -+ WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */ -+ -+ -+#define IEEE80211_HLEN 30 -+#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) -+ -+ -+/* this is stolen from ipw2200 driver */ -+#define IEEE_IBSS_MAC_HASH_SIZE 31 -+ -+struct ieee_ibss_seq { -+ u8 mac[ETH_ALEN]; -+ u16 seq_num; -+ u16 frag_num; -+ unsigned long packet_time; -+ _list list; -+}; -+ -+#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW)||defined(PLATFORM_FREEBSD) -+ -+struct rtw_ieee80211_hdr { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[ETH_ALEN]; -+ u8 addr2[ETH_ALEN]; -+ u8 addr3[ETH_ALEN]; -+ u16 seq_ctl; -+ u8 addr4[ETH_ALEN]; -+} __attribute__ ((packed)); -+ -+struct rtw_ieee80211_hdr_3addr { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[ETH_ALEN]; -+ u8 addr2[ETH_ALEN]; -+ u8 addr3[ETH_ALEN]; -+ u16 seq_ctl; -+} __attribute__ ((packed)); -+ -+ -+struct rtw_ieee80211_hdr_qos { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[ETH_ALEN]; -+ u8 addr2[ETH_ALEN]; -+ u8 addr3[ETH_ALEN]; -+ u16 seq_ctl; -+ u8 addr4[ETH_ALEN]; -+ u16 qc; -+} __attribute__ ((packed)); -+ -+struct rtw_ieee80211_hdr_3addr_qos { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[ETH_ALEN]; -+ u8 addr2[ETH_ALEN]; -+ u8 addr3[ETH_ALEN]; -+ u16 seq_ctl; -+ u16 qc; -+} __attribute__ ((packed)); -+ -+struct eapol { -+ u8 snap[6]; -+ u16 ethertype; -+ u8 version; -+ u8 type; -+ u16 length; -+} __attribute__ ((packed)); -+ -+#endif -+ -+ -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+struct rtw_ieee80211_hdr { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[ETH_ALEN]; -+ u8 addr2[ETH_ALEN]; -+ u8 addr3[ETH_ALEN]; -+ u16 seq_ctl; -+ u8 addr4[ETH_ALEN]; -+}; -+ -+struct rtw_ieee80211_hdr_3addr { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[ETH_ALEN]; -+ u8 addr2[ETH_ALEN]; -+ u8 addr3[ETH_ALEN]; -+ u16 seq_ctl; -+}; -+ -+ -+struct rtw_ieee80211_hdr_qos { -+ struct rtw_ieee80211_hdr wlan_hdr; -+ u16 qc; -+}; -+ -+struct rtw_ieee80211_hdr_3addr_qos { -+ struct rtw_ieee80211_hdr_3addr wlan_hdr; -+ u16 qc; -+}; -+ -+struct eapol { -+ u8 snap[6]; -+ u16 ethertype; -+ u8 version; -+ u8 type; -+ u16 length; -+}; -+#pragma pack() -+ -+#endif -+ -+ -+ -+enum eap_type { -+ EAP_PACKET = 0, -+ EAPOL_START, -+ EAPOL_LOGOFF, -+ EAPOL_KEY, -+ EAPOL_ENCAP_ASF_ALERT -+}; -+ -+#define IEEE80211_3ADDR_LEN 24 -+#define IEEE80211_4ADDR_LEN 30 -+#define IEEE80211_FCS_LEN 4 -+ -+#define MIN_FRAG_THRESHOLD 256U -+#define MAX_FRAG_THRESHOLD 2346U -+ -+/* Frame control field constants */ -+#define RTW_IEEE80211_FCTL_VERS 0x0003 -+#define RTW_IEEE80211_FCTL_FTYPE 0x000c -+#define RTW_IEEE80211_FCTL_STYPE 0x00f0 -+#define RTW_IEEE80211_FCTL_TODS 0x0100 -+#define RTW_IEEE80211_FCTL_FROMDS 0x0200 -+#define RTW_IEEE80211_FCTL_MOREFRAGS 0x0400 -+#define RTW_IEEE80211_FCTL_RETRY 0x0800 -+#define RTW_IEEE80211_FCTL_PM 0x1000 -+#define RTW_IEEE80211_FCTL_MOREDATA 0x2000 -+#define RTW_IEEE80211_FCTL_PROTECTED 0x4000 -+#define RTW_IEEE80211_FCTL_ORDER 0x8000 -+#define RTW_IEEE80211_FCTL_CTL_EXT 0x0f00 -+ -+#define RTW_IEEE80211_FTYPE_MGMT 0x0000 -+#define RTW_IEEE80211_FTYPE_CTL 0x0004 -+#define RTW_IEEE80211_FTYPE_DATA 0x0008 -+#define RTW_IEEE80211_FTYPE_EXT 0x000c -+ -+/* management */ -+#define RTW_IEEE80211_STYPE_ASSOC_REQ 0x0000 -+#define RTW_IEEE80211_STYPE_ASSOC_RESP 0x0010 -+#define RTW_IEEE80211_STYPE_REASSOC_REQ 0x0020 -+#define RTW_IEEE80211_STYPE_REASSOC_RESP 0x0030 -+#define RTW_IEEE80211_STYPE_PROBE_REQ 0x0040 -+#define RTW_IEEE80211_STYPE_PROBE_RESP 0x0050 -+#define RTW_IEEE80211_STYPE_BEACON 0x0080 -+#define RTW_IEEE80211_STYPE_ATIM 0x0090 -+#define RTW_IEEE80211_STYPE_DISASSOC 0x00A0 -+#define RTW_IEEE80211_STYPE_AUTH 0x00B0 -+#define RTW_IEEE80211_STYPE_DEAUTH 0x00C0 -+#define RTW_IEEE80211_STYPE_ACTION 0x00D0 -+ -+/* control */ -+#define RTW_IEEE80211_STYPE_CTL_EXT 0x0060 -+#define RTW_IEEE80211_STYPE_BACK_REQ 0x0080 -+#define RTW_IEEE80211_STYPE_BACK 0x0090 -+#define RTW_IEEE80211_STYPE_PSPOLL 0x00A0 -+#define RTW_IEEE80211_STYPE_RTS 0x00B0 -+#define RTW_IEEE80211_STYPE_CTS 0x00C0 -+#define RTW_IEEE80211_STYPE_ACK 0x00D0 -+#define RTW_IEEE80211_STYPE_CFEND 0x00E0 -+#define RTW_IEEE80211_STYPE_CFENDACK 0x00F0 -+ -+/* data */ -+#define RTW_IEEE80211_STYPE_DATA 0x0000 -+#define RTW_IEEE80211_STYPE_DATA_CFACK 0x0010 -+#define RTW_IEEE80211_STYPE_DATA_CFPOLL 0x0020 -+#define RTW_IEEE80211_STYPE_DATA_CFACKPOLL 0x0030 -+#define RTW_IEEE80211_STYPE_NULLFUNC 0x0040 -+#define RTW_IEEE80211_STYPE_CFACK 0x0050 -+#define RTW_IEEE80211_STYPE_CFPOLL 0x0060 -+#define RTW_IEEE80211_STYPE_CFACKPOLL 0x0070 -+#define RTW_IEEE80211_STYPE_QOS_DATA 0x0080 -+#define RTW_IEEE80211_STYPE_QOS_DATA_CFACK 0x0090 -+#define RTW_IEEE80211_STYPE_QOS_DATA_CFPOLL 0x00A0 -+#define RTW_IEEE80211_STYPE_QOS_DATA_CFACKPOLL 0x00B0 -+#define RTW_IEEE80211_STYPE_QOS_NULLFUNC 0x00C0 -+#define RTW_IEEE80211_STYPE_QOS_CFACK 0x00D0 -+#define RTW_IEEE80211_STYPE_QOS_CFPOLL 0x00E0 -+#define RTW_IEEE80211_STYPE_QOS_CFACKPOLL 0x00F0 -+ -+/* sequence control field */ -+#define RTW_IEEE80211_SCTL_FRAG 0x000F -+#define RTW_IEEE80211_SCTL_SEQ 0xFFF0 -+ -+ -+#define RTW_ERP_INFO_NON_ERP_PRESENT BIT(0) -+#define RTW_ERP_INFO_USE_PROTECTION BIT(1) -+#define RTW_ERP_INFO_BARKER_PREAMBLE_MODE BIT(2) -+ -+/* QoS,QOS */ -+#define NORMAL_ACK 0 -+#define NO_ACK 1 -+#define NON_EXPLICIT_ACK 2 -+#define BLOCK_ACK 3 -+ -+#ifndef ETH_P_PAE -+#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ -+#endif /* ETH_P_PAE */ -+ -+#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */ -+ -+#define ETH_P_ECONET 0x0018 -+ -+#ifndef ETH_P_80211_RAW -+#define ETH_P_80211_RAW (ETH_P_ECONET + 1) -+#endif -+ -+/* IEEE 802.11 defines */ -+ -+#define P80211_OUI_LEN 3 -+ -+#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) || defined(PLATFORM_FREEBSD) -+ -+struct ieee80211_snap_hdr { -+ -+ u8 dsap; /* always 0xAA */ -+ u8 ssap; /* always 0xAA */ -+ u8 ctrl; /* always 0x03 */ -+ u8 oui[P80211_OUI_LEN]; /* organizational universal id */ -+ -+} __attribute__ ((packed)); -+ -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+struct ieee80211_snap_hdr { -+ -+ u8 dsap; /* always 0xAA */ -+ u8 ssap; /* always 0xAA */ -+ u8 ctrl; /* always 0x03 */ -+ u8 oui[P80211_OUI_LEN]; /* organizational universal id */ -+ -+}; -+#pragma pack() -+ -+#endif -+ -+ -+#define SNAP_SIZE sizeof(struct ieee80211_snap_hdr) -+ -+#define WLAN_FC_GET_TYPE(fc) ((fc) & RTW_IEEE80211_FCTL_FTYPE) -+#define WLAN_FC_GET_STYPE(fc) ((fc) & RTW_IEEE80211_FCTL_STYPE) -+ -+#define WLAN_QC_GET_TID(qc) ((qc) & 0x0f) -+ -+#define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTW_IEEE80211_SCTL_FRAG) -+#define WLAN_GET_SEQ_SEQ(seq) ((seq) & RTW_IEEE80211_SCTL_SEQ) -+ -+/* Authentication algorithms */ -+#define WLAN_AUTH_OPEN 0 -+#define WLAN_AUTH_SHARED_KEY 1 -+ -+#define WLAN_AUTH_CHALLENGE_LEN 128 -+ -+#define WLAN_CAPABILITY_BSS (1<<0) -+#define WLAN_CAPABILITY_IBSS (1<<1) -+#define WLAN_CAPABILITY_CF_POLLABLE (1<<2) -+#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) -+#define WLAN_CAPABILITY_PRIVACY (1<<4) -+#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5) -+#define WLAN_CAPABILITY_PBCC (1<<6) -+#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7) -+#define WLAN_CAPABILITY_SHORT_SLOT (1<<10) -+ -+/* Status codes */ -+#define WLAN_STATUS_SUCCESS 0 -+#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 -+#define WLAN_STATUS_CAPS_UNSUPPORTED 10 -+#define WLAN_STATUS_REASSOC_NO_ASSOC 11 -+#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 -+#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 -+#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 -+#define WLAN_STATUS_CHALLENGE_FAIL 15 -+#define WLAN_STATUS_AUTH_TIMEOUT 16 -+#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 -+#define WLAN_STATUS_ASSOC_DENIED_RATES 18 -+/* 802.11b */ -+#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19 -+#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20 -+#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21 -+ -+/* Reason codes */ -+#define WLAN_REASON_UNSPECIFIED 1 -+#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 -+#define WLAN_REASON_DEAUTH_LEAVING 3 -+#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -+#define WLAN_REASON_DISASSOC_AP_BUSY 5 -+#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -+#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 -+#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -+#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 -+#define WLAN_REASON_JOIN_WRONG_CHANNEL 65534 -+#define WLAN_REASON_EXPIRATION_CHK 65535 -+ -+/* Information Element IDs */ -+#define WLAN_EID_SSID 0 -+#define WLAN_EID_SUPP_RATES 1 -+#define WLAN_EID_FH_PARAMS 2 -+#define WLAN_EID_DS_PARAMS 3 -+#define WLAN_EID_CF_PARAMS 4 -+#define WLAN_EID_TIM 5 -+#define WLAN_EID_IBSS_PARAMS 6 -+#define WLAN_EID_CHALLENGE 16 -+/* EIDs defined by IEEE 802.11h - START */ -+#define WLAN_EID_PWR_CONSTRAINT 32 -+#define WLAN_EID_PWR_CAPABILITY 33 -+#define WLAN_EID_TPC_REQUEST 34 -+#define WLAN_EID_TPC_REPORT 35 -+#define WLAN_EID_SUPPORTED_CHANNELS 36 -+#define WLAN_EID_CHANNEL_SWITCH 37 -+#define WLAN_EID_MEASURE_REQUEST 38 -+#define WLAN_EID_MEASURE_REPORT 39 -+#define WLAN_EID_QUITE 40 -+#define WLAN_EID_IBSS_DFS 41 -+/* EIDs defined by IEEE 802.11h - END */ -+#define WLAN_EID_ERP_INFO 42 -+#define WLAN_EID_HT_CAP 45 -+#define WLAN_EID_RSN 48 -+#define WLAN_EID_EXT_SUPP_RATES 50 -+#define WLAN_EID_MOBILITY_DOMAIN 54 -+#define WLAN_EID_FAST_BSS_TRANSITION 55 -+#define WLAN_EID_TIMEOUT_INTERVAL 56 -+#define WLAN_EID_RIC_DATA 57 -+#define WLAN_EID_HT_OPERATION 61 -+#define WLAN_EID_SECONDARY_CHANNEL_OFFSET 62 -+#define WLAN_EID_20_40_BSS_COEXISTENCE 72 -+#define WLAN_EID_20_40_BSS_INTOLERANT 73 -+#define WLAN_EID_OVERLAPPING_BSS_SCAN_PARAMS 74 -+#define WLAN_EID_MMIE 76 -+#define WLAN_EID_VENDOR_SPECIFIC 221 -+#define WLAN_EID_GENERIC (WLAN_EID_VENDOR_SPECIFIC) -+ -+#define IEEE80211_MGMT_HDR_LEN 24 -+#define IEEE80211_DATA_HDR3_LEN 24 -+#define IEEE80211_DATA_HDR4_LEN 30 -+ -+ -+#define IEEE80211_STATMASK_SIGNAL (1<<0) -+#define IEEE80211_STATMASK_RSSI (1<<1) -+#define IEEE80211_STATMASK_NOISE (1<<2) -+#define IEEE80211_STATMASK_RATE (1<<3) -+#define IEEE80211_STATMASK_WEMASK 0x7 -+ -+ -+#define IEEE80211_CCK_MODULATION (1<<0) -+#define IEEE80211_OFDM_MODULATION (1<<1) -+ -+#define IEEE80211_24GHZ_BAND (1<<0) -+#define IEEE80211_52GHZ_BAND (1<<1) -+ -+#define IEEE80211_CCK_RATE_LEN 4 -+#define IEEE80211_NUM_OFDM_RATESLEN 8 -+ -+ -+#define IEEE80211_CCK_RATE_1MB 0x02 -+#define IEEE80211_CCK_RATE_2MB 0x04 -+#define IEEE80211_CCK_RATE_5MB 0x0B -+#define IEEE80211_CCK_RATE_11MB 0x16 -+#define IEEE80211_OFDM_RATE_LEN 8 -+#define IEEE80211_OFDM_RATE_6MB 0x0C -+#define IEEE80211_OFDM_RATE_9MB 0x12 -+#define IEEE80211_OFDM_RATE_12MB 0x18 -+#define IEEE80211_OFDM_RATE_18MB 0x24 -+#define IEEE80211_OFDM_RATE_24MB 0x30 -+#define IEEE80211_OFDM_RATE_36MB 0x48 -+#define IEEE80211_OFDM_RATE_48MB 0x60 -+#define IEEE80211_OFDM_RATE_54MB 0x6C -+#define IEEE80211_BASIC_RATE_MASK 0x80 -+ -+#define IEEE80211_CCK_RATE_1MB_MASK (1<<0) -+#define IEEE80211_CCK_RATE_2MB_MASK (1<<1) -+#define IEEE80211_CCK_RATE_5MB_MASK (1<<2) -+#define IEEE80211_CCK_RATE_11MB_MASK (1<<3) -+#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4) -+#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5) -+#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6) -+#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7) -+#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8) -+#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9) -+#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10) -+#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11) -+ -+#define IEEE80211_CCK_RATES_MASK 0x0000000F -+#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \ -+ IEEE80211_CCK_RATE_2MB_MASK) -+#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \ -+ IEEE80211_CCK_RATE_5MB_MASK | \ -+ IEEE80211_CCK_RATE_11MB_MASK) -+ -+#define IEEE80211_OFDM_RATES_MASK 0x00000FF0 -+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \ -+ IEEE80211_OFDM_RATE_12MB_MASK | \ -+ IEEE80211_OFDM_RATE_24MB_MASK) -+#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \ -+ IEEE80211_OFDM_RATE_9MB_MASK | \ -+ IEEE80211_OFDM_RATE_18MB_MASK | \ -+ IEEE80211_OFDM_RATE_36MB_MASK | \ -+ IEEE80211_OFDM_RATE_48MB_MASK | \ -+ IEEE80211_OFDM_RATE_54MB_MASK) -+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \ -+ IEEE80211_CCK_DEFAULT_RATES_MASK) -+ -+#define IEEE80211_NUM_OFDM_RATES 8 -+#define IEEE80211_NUM_CCK_RATES 4 -+#define IEEE80211_OFDM_SHIFT_MASK_A 4 -+ -+ -+ -+ -+/* NOTE: This data is for statistical purposes; not all hardware provides this -+ * information for frames received. Not setting these will not cause -+ * any adverse affects. */ -+struct ieee80211_rx_stats { -+ //u32 mac_time[2]; -+ s8 rssi; -+ u8 signal; -+ u8 noise; -+ u8 received_channel; -+ u16 rate; /* in 100 kbps */ -+ //u8 control; -+ u8 mask; -+ u8 freq; -+ u16 len; -+}; -+ -+/* IEEE 802.11 requires that STA supports concurrent reception of at least -+ * three fragmented frames. This define can be increased to support more -+ * concurrent frames, but it should be noted that each entry can consume about -+ * 2 kB of RAM and increasing cache size will slow down frame reassembly. */ -+#define IEEE80211_FRAG_CACHE_LEN 4 -+ -+struct ieee80211_frag_entry { -+ u32 first_frag_time; -+ uint seq; -+ uint last_frag; -+ uint qos; //jackson -+ uint tid; //jackson -+ struct sk_buff *skb; -+ u8 src_addr[ETH_ALEN]; -+ u8 dst_addr[ETH_ALEN]; -+}; -+ -+#ifndef PLATFORM_FREEBSD //Baron BSD has already defined -+struct ieee80211_stats { -+ uint tx_unicast_frames; -+ uint tx_multicast_frames; -+ uint tx_fragments; -+ uint tx_unicast_octets; -+ uint tx_multicast_octets; -+ uint tx_deferred_transmissions; -+ uint tx_single_retry_frames; -+ uint tx_multiple_retry_frames; -+ uint tx_retry_limit_exceeded; -+ uint tx_discards; -+ uint rx_unicast_frames; -+ uint rx_multicast_frames; -+ uint rx_fragments; -+ uint rx_unicast_octets; -+ uint rx_multicast_octets; -+ uint rx_fcs_errors; -+ uint rx_discards_no_buffer; -+ uint tx_discards_wrong_sa; -+ uint rx_discards_undecryptable; -+ uint rx_message_in_msg_fragments; -+ uint rx_message_in_bad_msg_fragments; -+}; -+#endif //PLATFORM_FREEBSD -+struct ieee80211_softmac_stats{ -+ uint rx_ass_ok; -+ uint rx_ass_err; -+ uint rx_probe_rq; -+ uint tx_probe_rs; -+ uint tx_beacons; -+ uint rx_auth_rq; -+ uint rx_auth_rs_ok; -+ uint rx_auth_rs_err; -+ uint tx_auth_rq; -+ uint no_auth_rs; -+ uint no_ass_rs; -+ uint tx_ass_rq; -+ uint rx_ass_rq; -+ uint tx_probe_rq; -+ uint reassoc; -+ uint swtxstop; -+ uint swtxawake; -+}; -+ -+#define SEC_KEY_1 (1<<0) -+#define SEC_KEY_2 (1<<1) -+#define SEC_KEY_3 (1<<2) -+#define SEC_KEY_4 (1<<3) -+#define SEC_ACTIVE_KEY (1<<4) -+#define SEC_AUTH_MODE (1<<5) -+#define SEC_UNICAST_GROUP (1<<6) -+#define SEC_LEVEL (1<<7) -+#define SEC_ENABLED (1<<8) -+ -+#define SEC_LEVEL_0 0 /* None */ -+#define SEC_LEVEL_1 1 /* WEP 40 and 104 bit */ -+#define SEC_LEVEL_2 2 /* Level 1 + TKIP */ -+#define SEC_LEVEL_2_CKIP 3 /* Level 1 + CKIP */ -+#define SEC_LEVEL_3 4 /* Level 2 + CCMP */ -+ -+#define WEP_KEYS 4 -+#define WEP_KEY_LEN 13 -+ -+#ifdef CONFIG_IEEE80211W -+#define BIP_MAX_KEYID 5 -+#define BIP_AAD_SIZE 20 -+#endif //CONFIG_IEEE80211W -+ -+#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) -+ -+struct ieee80211_security { -+ u16 active_key:2, -+ enabled:1, -+ auth_mode:2, -+ auth_algo:4, -+ unicast_uses_group:1; -+ u8 key_sizes[WEP_KEYS]; -+ u8 keys[WEP_KEYS][WEP_KEY_LEN]; -+ u8 level; -+ u16 flags; -+} __attribute__ ((packed)); -+ -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+struct ieee80211_security { -+ u16 active_key:2, -+ enabled:1, -+ auth_mode:2, -+ auth_algo:4, -+ unicast_uses_group:1; -+ u8 key_sizes[WEP_KEYS]; -+ u8 keys[WEP_KEYS][WEP_KEY_LEN]; -+ u8 level; -+ u16 flags; -+} ; -+#pragma pack() -+ -+#endif -+ -+/* -+ -+ 802.11 data frame from AP -+ -+ ,-------------------------------------------------------------------. -+Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | -+ |------|------|---------|---------|---------|------|---------|------| -+Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | frame | fcs | -+ | | tion | (BSSID) | | | ence | data | | -+ `-------------------------------------------------------------------' -+ -+Total: 28-2340 bytes -+ -+*/ -+ -+struct ieee80211_header_data { -+ u16 frame_ctl; -+ u16 duration_id; -+ u8 addr1[6]; -+ u8 addr2[6]; -+ u8 addr3[6]; -+ u16 seq_ctrl; -+}; -+ -+#define BEACON_PROBE_SSID_ID_POSITION 12 -+ -+/* Management Frame Information Element Types */ -+#define MFIE_TYPE_SSID 0 -+#define MFIE_TYPE_RATES 1 -+#define MFIE_TYPE_FH_SET 2 -+#define MFIE_TYPE_DS_SET 3 -+#define MFIE_TYPE_CF_SET 4 -+#define MFIE_TYPE_TIM 5 -+#define MFIE_TYPE_IBSS_SET 6 -+#define MFIE_TYPE_CHALLENGE 16 -+#define MFIE_TYPE_ERP 42 -+#define MFIE_TYPE_RSN 48 -+#define MFIE_TYPE_RATES_EX 50 -+#define MFIE_TYPE_GENERIC 221 -+ -+#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) -+ -+struct ieee80211_info_element_hdr { -+ u8 id; -+ u8 len; -+} __attribute__ ((packed)); -+ -+struct ieee80211_info_element { -+ u8 id; -+ u8 len; -+ u8 data[0]; -+} __attribute__ ((packed)); -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+struct ieee80211_info_element_hdr { -+ u8 id; -+ u8 len; -+} ; -+ -+struct ieee80211_info_element { -+ u8 id; -+ u8 len; -+ u8 data[0]; -+} ; -+#pragma pack() -+ -+#endif -+ -+ -+/* -+ * These are the data types that can make up management packets -+ * -+ u16 auth_algorithm; -+ u16 auth_sequence; -+ u16 beacon_interval; -+ u16 capability; -+ u8 current_ap[ETH_ALEN]; -+ u16 listen_interval; -+ struct { -+ u16 association_id:14, reserved:2; -+ } __attribute__ ((packed)); -+ u32 time_stamp[2]; -+ u16 reason; -+ u16 status; -+*/ -+ -+#define IEEE80211_DEFAULT_TX_ESSID "Penguin" -+#define IEEE80211_DEFAULT_BASIC_RATE 10 -+ -+ -+#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8711FW) -+ -+ -+struct ieee80211_authentication { -+ struct ieee80211_header_data header; -+ u16 algorithm; -+ u16 transaction; -+ u16 status; -+ //struct ieee80211_info_element_hdr info_element; -+} __attribute__ ((packed)); -+ -+ -+struct ieee80211_probe_response { -+ struct ieee80211_header_data header; -+ u32 time_stamp[2]; -+ u16 beacon_interval; -+ u16 capability; -+ struct ieee80211_info_element info_element; -+} __attribute__ ((packed)); -+ -+struct ieee80211_probe_request { -+ struct ieee80211_header_data header; -+ /*struct ieee80211_info_element info_element;*/ -+} __attribute__ ((packed)); -+ -+struct ieee80211_assoc_request_frame { -+ struct rtw_ieee80211_hdr_3addr header; -+ u16 capability; -+ u16 listen_interval; -+ //u8 current_ap[ETH_ALEN]; -+ struct ieee80211_info_element_hdr info_element; -+} __attribute__ ((packed)); -+ -+struct ieee80211_assoc_response_frame { -+ struct rtw_ieee80211_hdr_3addr header; -+ u16 capability; -+ u16 status; -+ u16 aid; -+// struct ieee80211_info_element info_element; /* supported rates */ -+} __attribute__ ((packed)); -+#endif -+ -+ -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+ -+struct ieee80211_authentication { -+ struct ieee80211_header_data header; -+ u16 algorithm; -+ u16 transaction; -+ u16 status; -+ //struct ieee80211_info_element_hdr info_element; -+} ; -+ -+ -+struct ieee80211_probe_response { -+ struct ieee80211_header_data header; -+ u32 time_stamp[2]; -+ u16 beacon_interval; -+ u16 capability; -+ struct ieee80211_info_element info_element; -+} ; -+ -+struct ieee80211_probe_request { -+ struct ieee80211_header_data header; -+ /*struct ieee80211_info_element info_element;*/ -+} ; -+ -+struct ieee80211_assoc_request_frame { -+ struct rtw_ieee80211_hdr_3addr header; -+ u16 capability; -+ u16 listen_interval; -+ //u8 current_ap[ETH_ALEN]; -+ struct ieee80211_info_element_hdr info_element; -+} ; -+ -+struct ieee80211_assoc_response_frame { -+ struct rtw_ieee80211_hdr_3addr header; -+ u16 capability; -+ u16 status; -+ u16 aid; -+// struct ieee80211_info_element info_element; /* supported rates */ -+}; -+ -+#pragma pack() -+ -+#endif -+ -+ -+ -+ -+struct ieee80211_txb { -+ u8 nr_frags; -+ u8 encrypted; -+ u16 reserved; -+ u16 frag_size; -+ u16 payload_size; -+ struct sk_buff *fragments[0]; -+}; -+ -+ -+/* SWEEP TABLE ENTRIES NUMBER*/ -+#define MAX_SWEEP_TAB_ENTRIES 42 -+#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7 -+/* MAX_RATES_LENGTH needs to be 12. The spec says 8, and many APs -+ * only use 8, and then use extended rates for the remaining supported -+ * rates. Other APs, however, stick all of their supported rates on the -+ * main rates information element... */ -+#define MAX_RATES_LENGTH ((u8)12) -+#define MAX_RATES_EX_LENGTH ((u8)16) -+#define MAX_NETWORK_COUNT 128 -+#define MAX_CHANNEL_NUMBER 161 -+#define IEEE80211_SOFTMAC_SCAN_TIME 400 -+//(HZ / 2) -+#define IEEE80211_SOFTMAC_ASSOC_RETRY_TIME (HZ * 2) -+ -+#define CRC_LENGTH 4U -+ -+#define MAX_WPA_IE_LEN (256) -+#define MAX_WPS_IE_LEN (512) -+#define MAX_P2P_IE_LEN (256) -+#define MAX_WFD_IE_LEN (128) -+ -+#define NETWORK_EMPTY_ESSID (1<<0) -+#define NETWORK_HAS_OFDM (1<<1) -+#define NETWORK_HAS_CCK (1<<2) -+ -+#define IEEE80211_DTIM_MBCAST 4 -+#define IEEE80211_DTIM_UCAST 2 -+#define IEEE80211_DTIM_VALID 1 -+#define IEEE80211_DTIM_INVALID 0 -+ -+#define IEEE80211_PS_DISABLED 0 -+#define IEEE80211_PS_UNICAST IEEE80211_DTIM_UCAST -+#define IEEE80211_PS_MBCAST IEEE80211_DTIM_MBCAST -+#define IW_ESSID_MAX_SIZE 32 -+#if 0 -+struct ieee80211_network { -+ /* These entries are used to identify a unique network */ -+ u8 bssid[ETH_ALEN]; -+ u8 channel; -+ /* Ensure null-terminated for any debug msgs */ -+ u8 ssid[IW_ESSID_MAX_SIZE + 1]; -+ u8 ssid_len; -+ u8 rssi; //relative signal strength -+ u8 sq; //signal quality -+ -+ /* These are network statistics */ -+ //struct ieee80211_rx_stats stats; -+ u16 capability; -+ u16 aid; -+ u8 rates[MAX_RATES_LENGTH]; -+ u8 rates_len; -+ u8 rates_ex[MAX_RATES_EX_LENGTH]; -+ u8 rates_ex_len; -+ -+ u8 edca_parmsets[18]; -+ -+ u8 mode; -+ u8 flags; -+ u8 time_stamp[8]; -+ u16 beacon_interval; -+ u16 listen_interval; -+ u16 atim_window; -+ u8 wpa_ie[MAX_WPA_IE_LEN]; -+ size_t wpa_ie_len; -+ u8 rsn_ie[MAX_WPA_IE_LEN]; -+ size_t rsn_ie_len; -+ u8 country[6]; -+ u8 dtim_period; -+ u8 dtim_data; -+ u8 power_constraint; -+ u8 qosinfo; -+ u8 qbssload[5]; -+ u8 network_type; -+ int join_res; -+ unsigned long last_scanned; -+}; -+#endif -+/* -+join_res: -+-1: authentication fail -+-2: association fail -+> 0: TID -+*/ -+ -+#ifndef PLATFORM_FREEBSD //Baron BSD has already defined -+ -+enum ieee80211_state { -+ -+ /* the card is not linked at all */ -+ IEEE80211_NOLINK = 0, -+ -+ /* IEEE80211_ASSOCIATING* are for BSS client mode -+ * the driver shall not perform RX filtering unless -+ * the state is LINKED. -+ * The driver shall just check for the state LINKED and -+ * defaults to NOLINK for ALL the other states (including -+ * LINKED_SCANNING) -+ */ -+ -+ /* the association procedure will start (wq scheduling)*/ -+ IEEE80211_ASSOCIATING, -+ IEEE80211_ASSOCIATING_RETRY, -+ -+ /* the association procedure is sending AUTH request*/ -+ IEEE80211_ASSOCIATING_AUTHENTICATING, -+ -+ /* the association procedure has successfully authentcated -+ * and is sending association request -+ */ -+ IEEE80211_ASSOCIATING_AUTHENTICATED, -+ -+ /* the link is ok. the card associated to a BSS or linked -+ * to a ibss cell or acting as an AP and creating the bss -+ */ -+ IEEE80211_LINKED, -+ -+ /* same as LINKED, but the driver shall apply RX filter -+ * rules as we are in NO_LINK mode. As the card is still -+ * logically linked, but it is doing a syncro site survey -+ * then it will be back to LINKED state. -+ */ -+ IEEE80211_LINKED_SCANNING, -+ -+}; -+#endif //PLATFORM_FREEBSD -+ -+#define DEFAULT_MAX_SCAN_AGE (15 * HZ) -+#define DEFAULT_FTS 2346 -+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -+#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] -+ -+#ifdef PLATFORM_FREEBSD //Baron change func to macro -+#define is_multicast_mac_addr(Addr) ((((Addr[0]) & 0x01) == 0x01) && ((Addr[0]) != 0xff)) -+#define is_broadcast_mac_addr(Addr) ((((Addr[0]) & 0xff) == 0xff) && (((Addr[1]) & 0xff) == 0xff) && \ -+(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ -+(((Addr[5]) & 0xff) == 0xff)) -+#else -+extern __inline int is_multicast_mac_addr(const u8 *addr) -+{ -+ return ((addr[0] != 0xff) && (0x01 & addr[0])); -+} -+ -+extern __inline int is_broadcast_mac_addr(const u8 *addr) -+{ -+ return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ -+ (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); -+} -+ -+extern __inline int is_zero_mac_addr(const u8 *addr) -+{ -+ return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ -+ (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); -+} -+#endif //PLATFORM_FREEBSD -+ -+#define CFG_IEEE80211_RESERVE_FCS (1<<0) -+#define CFG_IEEE80211_COMPUTE_FCS (1<<1) -+ -+typedef struct tx_pending_t{ -+ int frag; -+ struct ieee80211_txb *txb; -+}tx_pending_t; -+ -+ -+ -+#define MAXTID 16 -+ -+#define IEEE_A (1<<0) -+#define IEEE_B (1<<1) -+#define IEEE_G (1<<2) -+#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) -+ -+//Baron move to ieee80211.c -+int ieee80211_is_empty_essid(const char *essid, int essid_len); -+int ieee80211_get_hdrlen(u16 fc); -+ -+#if 0 -+/* Action frame categories (IEEE 802.11-2007, 7.3.1.11, Table 7-24) */ -+#define WLAN_ACTION_SPECTRUM_MGMT 0 -+#define WLAN_ACTION_QOS 1 -+#define WLAN_ACTION_DLS 2 -+#define WLAN_ACTION_BLOCK_ACK 3 -+#define WLAN_ACTION_RADIO_MEASUREMENT 5 -+#define WLAN_ACTION_FT 6 -+#define WLAN_ACTION_SA_QUERY 8 -+#define WLAN_ACTION_WMM 17 -+#endif -+ -+ -+/* Action category code */ -+enum rtw_ieee80211_category { -+ RTW_WLAN_CATEGORY_SPECTRUM_MGMT = 0, -+ RTW_WLAN_CATEGORY_QOS = 1, -+ RTW_WLAN_CATEGORY_DLS = 2, -+ RTW_WLAN_CATEGORY_BACK = 3, -+ RTW_WLAN_CATEGORY_PUBLIC = 4, //IEEE 802.11 public action frames -+ RTW_WLAN_CATEGORY_RADIO_MEASUREMENT = 5, -+ RTW_WLAN_CATEGORY_FT = 6, -+ RTW_WLAN_CATEGORY_HT = 7, -+ RTW_WLAN_CATEGORY_SA_QUERY = 8, -+ RTW_WLAN_CATEGORY_UNPROTECTED_WNM = 11, // add for CONFIG_IEEE80211W, none 11w also can use -+ RTW_WLAN_CATEGORY_TDLS = 12, -+ RTW_WLAN_CATEGORY_SELF_PROTECTED = 15, // add for CONFIG_IEEE80211W, none 11w also can use -+ RTW_WLAN_CATEGORY_WMM = 17, -+ RTW_WLAN_CATEGORY_P2P = 0x7f,//P2P action frames -+}; -+ -+/* SPECTRUM_MGMT action code */ -+enum rtw_ieee80211_spectrum_mgmt_actioncode { -+ RTW_WLAN_ACTION_SPCT_MSR_REQ = 0, -+ RTW_WLAN_ACTION_SPCT_MSR_RPRT = 1, -+ RTW_WLAN_ACTION_SPCT_TPC_REQ = 2, -+ RTW_WLAN_ACTION_SPCT_TPC_RPRT = 3, -+ RTW_WLAN_ACTION_SPCT_CHL_SWITCH = 4, -+ RTW_WLAN_ACTION_SPCT_EXT_CHL_SWITCH = 5, -+}; -+ -+enum _PUBLIC_ACTION{ -+ ACT_PUBLIC_BSSCOEXIST = 0, // 20/40 BSS Coexistence -+ ACT_PUBLIC_DSE_ENABLE = 1, -+ ACT_PUBLIC_DSE_DEENABLE = 2, -+ ACT_PUBLIC_DSE_REG_LOCATION = 3, -+ ACT_PUBLIC_EXT_CHL_SWITCH = 4, -+ ACT_PUBLIC_DSE_MSR_REQ = 5, -+ ACT_PUBLIC_DSE_MSR_RPRT = 6, -+ ACT_PUBLIC_MP = 7, // Measurement Pilot -+ ACT_PUBLIC_DSE_PWR_CONSTRAINT = 8, -+ ACT_PUBLIC_VENDOR = 9, // for WIFI_DIRECT -+ ACT_PUBLIC_GAS_INITIAL_REQ = 10, -+ ACT_PUBLIC_GAS_INITIAL_RSP = 11, -+ ACT_PUBLIC_GAS_COMEBACK_REQ = 12, -+ ACT_PUBLIC_GAS_COMEBACK_RSP = 13, -+ ACT_PUBLIC_TDLS_DISCOVERY_RSP = 14, -+ ACT_PUBLIC_LOCATION_TRACK = 15, -+ ACT_PUBLIC_MAX -+}; -+ -+#ifdef CONFIG_TDLS -+enum TDLS_ACTION_FIELD{ -+ TDLS_SETUP_REQUEST = 0, -+ TDLS_SETUP_RESPONSE = 1, -+ TDLS_SETUP_CONFIRM = 2, -+ TDLS_TEARDOWN = 3, -+ TDLS_PEER_TRAFFIC_INDICATION = 4, -+ TDLS_CHANNEL_SWITCH_REQUEST = 5, -+ TDLS_CHANNEL_SWITCH_RESPONSE = 6, -+ TDLS_PEER_PSM_REQUEST = 7, -+ TDLS_PEER_PSM_RESPONSE = 8, -+ TDLS_PEER_TRAFFIC_RESPONSE = 9, -+ TDLS_DISCOVERY_REQUEST = 10, -+ TDLS_DISCOVERY_RESPONSE = 14, //it's used in public action frame -+}; -+ -+#define TUNNELED_PROBE_REQ 15 -+#define TUNNELED_PROBE_RSP 16 -+#endif //CONFIG_TDLS -+ -+/* BACK action code */ -+enum rtw_ieee80211_back_actioncode { -+ RTW_WLAN_ACTION_ADDBA_REQ = 0, -+ RTW_WLAN_ACTION_ADDBA_RESP = 1, -+ RTW_WLAN_ACTION_DELBA = 2, -+}; -+ -+/* HT features action code */ -+enum rtw_ieee80211_ht_actioncode { -+ RTW_WLAN_ACTION_NOTIFY_CH_WIDTH = 0, -+ RTW_WLAN_ACTION_SM_PS = 1, -+ RTW_WLAN_ACTION_PSPM = 2, -+ RTW_WLAN_ACTION_PCO_PHASE = 3, -+ RTW_WLAN_ACTION_MIMO_CSI_MX = 4, -+ RTW_WLAN_ACTION_MIMO_NONCP_BF = 5, -+ RTW_WLAN_ACTION_MIMP_CP_BF = 6, -+ RTW_WLAN_ACTION_ASEL_INDICATES_FB = 7, -+ RTW_WLAN_ACTION_HI_INFO_EXCHG = 8, -+}; -+ -+/* BACK (block-ack) parties */ -+enum rtw_ieee80211_back_parties { -+ RTW_WLAN_BACK_RECIPIENT = 0, -+ RTW_WLAN_BACK_INITIATOR = 1, -+ RTW_WLAN_BACK_TIMER = 2, -+}; -+ -+ -+#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs) -+ * 00:50:F2 */ -+#ifndef PLATFORM_FREEBSD //Baron BSD has defined -+#define WME_OUI_TYPE 2 -+#endif //PLATFORM_FREEBSD -+#define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0 -+#define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1 -+#define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2 -+#define WME_VERSION 1 -+ -+#define WME_ACTION_CODE_SETUP_REQUEST 0 -+#define WME_ACTION_CODE_SETUP_RESPONSE 1 -+#define WME_ACTION_CODE_TEARDOWN 2 -+ -+#define WME_SETUP_RESPONSE_STATUS_ADMISSION_ACCEPTED 0 -+#define WME_SETUP_RESPONSE_STATUS_INVALID_PARAMETERS 1 -+#define WME_SETUP_RESPONSE_STATUS_REFUSED 3 -+ -+#define WME_TSPEC_DIRECTION_UPLINK 0 -+#define WME_TSPEC_DIRECTION_DOWNLINK 1 -+#define WME_TSPEC_DIRECTION_BI_DIRECTIONAL 3 -+ -+ -+#define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */ -+ -+#define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */ -+ -+/** -+ * enum rtw_ieee80211_channel_flags - channel flags -+ * -+ * Channel flags set by the regulatory control code. -+ * -+ * @RTW_IEEE80211_CHAN_DISABLED: This channel is disabled. -+ * @RTW_IEEE80211_CHAN_PASSIVE_SCAN: Only passive scanning is permitted -+ * on this channel. -+ * @RTW_IEEE80211_CHAN_NO_IBSS: IBSS is not allowed on this channel. -+ * @RTW_IEEE80211_CHAN_RADAR: Radar detection is required on this channel. -+ * @RTW_IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel -+ * is not permitted. -+ * @RTW_IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel -+ * is not permitted. -+ */ -+ enum rtw_ieee80211_channel_flags { -+ RTW_IEEE80211_CHAN_DISABLED = 1<<0, -+ RTW_IEEE80211_CHAN_PASSIVE_SCAN = 1<<1, -+ RTW_IEEE80211_CHAN_NO_IBSS = 1<<2, -+ RTW_IEEE80211_CHAN_RADAR = 1<<3, -+ RTW_IEEE80211_CHAN_NO_HT40PLUS = 1<<4, -+ RTW_IEEE80211_CHAN_NO_HT40MINUS = 1<<5, -+ }; -+ -+ #define RTW_IEEE80211_CHAN_NO_HT40 \ -+ (RTW_IEEE80211_CHAN_NO_HT40PLUS | RTW_IEEE80211_CHAN_NO_HT40MINUS) -+ -+/* Represent channel details, subset of ieee80211_channel */ -+struct rtw_ieee80211_channel { -+ //enum ieee80211_band band; -+ //u16 center_freq; -+ u16 hw_value; -+ u32 flags; -+ //int max_antenna_gain; -+ //int max_power; -+ //int max_reg_power; -+ //bool beacon_found; -+ //u32 orig_flags; -+ //int orig_mag; -+ //int orig_mpwr; -+}; -+ -+#define CHAN_FMT \ -+ /*"band:%d, "*/ \ -+ /*"center_freq:%u, "*/ \ -+ "hw_value:%u, " \ -+ "flags:0x%08x" \ -+ /*"max_antenna_gain:%d\n"*/ \ -+ /*"max_power:%d\n"*/ \ -+ /*"max_reg_power:%d\n"*/ \ -+ /*"beacon_found:%u\n"*/ \ -+ /*"orig_flags:0x%08x\n"*/ \ -+ /*"orig_mag:%d\n"*/ \ -+ /*"orig_mpwr:%d\n"*/ -+ -+#define CHAN_ARG(channel) \ -+ /*(channel)->band*/ \ -+ /*, (channel)->center_freq*/ \ -+ (channel)->hw_value \ -+ , (channel)->flags \ -+ /*, (channel)->max_antenna_gain*/ \ -+ /*, (channel)->max_power*/ \ -+ /*, (channel)->max_reg_power*/ \ -+ /*, (channel)->beacon_found*/ \ -+ /*, (channel)->orig_flags*/ \ -+ /*, (channel)->orig_mag*/ \ -+ /*, (channel)->orig_mpwr*/ \ -+ -+/* Parsed Information Elements */ -+struct rtw_ieee802_11_elems { -+ u8 *ssid; -+ u8 ssid_len; -+ u8 *supp_rates; -+ u8 supp_rates_len; -+ u8 *fh_params; -+ u8 fh_params_len; -+ u8 *ds_params; -+ u8 ds_params_len; -+ u8 *cf_params; -+ u8 cf_params_len; -+ u8 *tim; -+ u8 tim_len; -+ u8 *ibss_params; -+ u8 ibss_params_len; -+ u8 *challenge; -+ u8 challenge_len; -+ u8 *erp_info; -+ u8 erp_info_len; -+ u8 *ext_supp_rates; -+ u8 ext_supp_rates_len; -+ u8 *wpa_ie; -+ u8 wpa_ie_len; -+ u8 *rsn_ie; -+ u8 rsn_ie_len; -+ u8 *wme; -+ u8 wme_len; -+ u8 *wme_tspec; -+ u8 wme_tspec_len; -+ u8 *wps_ie; -+ u8 wps_ie_len; -+ u8 *power_cap; -+ u8 power_cap_len; -+ u8 *supp_channels; -+ u8 supp_channels_len; -+ u8 *mdie; -+ u8 mdie_len; -+ u8 *ftie; -+ u8 ftie_len; -+ u8 *timeout_int; -+ u8 timeout_int_len; -+ u8 *ht_capabilities; -+ u8 ht_capabilities_len; -+ u8 *ht_operation; -+ u8 ht_operation_len; -+ u8 *vendor_ht_cap; -+ u8 vendor_ht_cap_len; -+}; -+ -+typedef enum { ParseOK = 0, ParseUnknown = 1, ParseFailed = -1 } ParseRes; -+ -+ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, -+ struct rtw_ieee802_11_elems *elems, -+ int show_errors); -+ -+u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source, unsigned int *frlen); -+u8 *rtw_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen); -+ -+enum secondary_ch_offset { -+ SCN = 0, /* no secondary channel */ -+ SCA = 1, /* secondary channel above */ -+ SCB = 3, /* secondary channel below */ -+}; -+u8 secondary_ch_offset_to_hal_ch_offset(u8 ch_offset); -+u8 hal_ch_offset_to_secondary_ch_offset(u8 ch_offset); -+u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode, u8 new_ch, u8 ch_switch_cnt); -+u8 *rtw_set_ie_secondary_ch_offset(u8 *buf, u32 *buf_len, u8 secondary_ch_offset); -+u8 *rtw_set_ie_mesh_ch_switch_parm(u8 *buf, u32 *buf_len, u8 ttl, u8 flags, u16 reason, u16 precedence); -+ -+u8 *rtw_get_ie(u8*pbuf, sint index, sint *len, sint limit); -+u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, uint *ielen); -+int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 oui_len); -+ -+void rtw_set_supported_rate(u8* SupportedRates, uint mode) ; -+ -+unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit); -+unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit); -+int rtw_get_wpa_cipher_suite(u8 *s); -+int rtw_get_wpa2_cipher_suite(u8 *s); -+int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher); -+int rtw_parse_wpa2_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher); -+ -+int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len); -+ -+u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen); -+u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen); -+u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_attr, u32 *len_attr); -+u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_content, uint *len_content); -+ -+/** -+ * for_each_ie - iterate over continuous IEs -+ * @ie: -+ * @buf: -+ * @buf_len: -+ */ -+#define for_each_ie(ie, buf, buf_len) \ -+ for (ie = (void*)buf; (((u8*)ie) - ((u8*)buf) + 1) < buf_len; ie = (void*)(((u8*)ie) + *(((u8*)ie)+1) + 2)) -+ -+void dump_ies(u8 *buf, u32 buf_len); -+void dump_wps_ie(u8 *ie, u32 ie_len); -+ -+#ifdef CONFIG_P2P -+u32 rtw_get_p2p_merged_ies_len(u8 *in_ie, u32 in_len); -+int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie); -+void dump_p2p_ie(u8 *ie, u32 ie_len); -+u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen); -+u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr, u32 *len_attr); -+u8 *rtw_get_p2p_attr_content(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_content, uint *len_content); -+u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr); -+void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id); -+#endif -+ -+#ifdef CONFIG_WFD -+int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen); -+int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 *attr_content, uint *attr_contentlen); -+#endif // CONFIG_WFD -+ -+uint rtw_get_rateset_len(u8 *rateset); -+ -+struct registry_priv; -+int rtw_generate_ie(struct registry_priv *pregistrypriv); -+ -+ -+int rtw_get_bit_value_from_ieee_value(u8 val); -+ -+uint rtw_is_cckrates_included(u8 *rate); -+ -+uint rtw_is_cckratesonly_included(u8 *rate); -+ -+int rtw_check_network_type(unsigned char *rate, int ratelen, int channel); -+ -+void rtw_macaddr_cfg(u8 *mac_addr); -+ -+u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40, unsigned char * MCS_rate); -+ -+int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8* category, u8 *action); -+const char *action_public_str(u8 action); -+ -+#endif /* IEEE80211_H */ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h -@@ -0,0 +1,477 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __IEEE80211_EXT_H -+#define __IEEE80211_EXT_H -+ -+#include -+#include -+#include -+ -+#define WMM_OUI_TYPE 2 -+#define WMM_OUI_SUBTYPE_INFORMATION_ELEMENT 0 -+#define WMM_OUI_SUBTYPE_PARAMETER_ELEMENT 1 -+#define WMM_OUI_SUBTYPE_TSPEC_ELEMENT 2 -+#define WMM_VERSION 1 -+ -+#define WPA_PROTO_WPA BIT(0) -+#define WPA_PROTO_RSN BIT(1) -+ -+#define WPA_KEY_MGMT_IEEE8021X BIT(0) -+#define WPA_KEY_MGMT_PSK BIT(1) -+#define WPA_KEY_MGMT_NONE BIT(2) -+#define WPA_KEY_MGMT_IEEE8021X_NO_WPA BIT(3) -+#define WPA_KEY_MGMT_WPA_NONE BIT(4) -+ -+ -+#define WPA_CAPABILITY_PREAUTH BIT(0) -+#define WPA_CAPABILITY_MGMT_FRAME_PROTECTION BIT(6) -+#define WPA_CAPABILITY_PEERKEY_ENABLED BIT(9) -+ -+ -+#define PMKID_LEN 16 -+ -+ -+#ifdef PLATFORM_LINUX -+struct wpa_ie_hdr { -+ u8 elem_id; -+ u8 len; -+ u8 oui[4]; /* 24-bit OUI followed by 8-bit OUI type */ -+ u8 version[2]; /* little endian */ -+}__attribute__ ((packed)); -+ -+struct rsn_ie_hdr { -+ u8 elem_id; /* WLAN_EID_RSN */ -+ u8 len; -+ u8 version[2]; /* little endian */ -+}__attribute__ ((packed)); -+ -+struct wme_ac_parameter { -+#if defined(CONFIG_LITTLE_ENDIAN) -+ /* byte 1 */ -+ u8 aifsn:4, -+ acm:1, -+ aci:2, -+ reserved:1; -+ -+ /* byte 2 */ -+ u8 eCWmin:4, -+ eCWmax:4; -+#elif defined(CONFIG_BIG_ENDIAN) -+ /* byte 1 */ -+ u8 reserved:1, -+ aci:2, -+ acm:1, -+ aifsn:4; -+ -+ /* byte 2 */ -+ u8 eCWmax:4, -+ eCWmin:4; -+#else -+#error "Please fix " -+#endif -+ -+ /* bytes 3 & 4 */ -+ u16 txopLimit; -+} __attribute__ ((packed)); -+ -+struct wme_parameter_element { -+ /* required fields for WME version 1 */ -+ u8 oui[3]; -+ u8 oui_type; -+ u8 oui_subtype; -+ u8 version; -+ u8 acInfo; -+ u8 reserved; -+ struct wme_ac_parameter ac[4]; -+ -+} __attribute__ ((packed)); -+ -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+ -+struct wpa_ie_hdr { -+ u8 elem_id; -+ u8 len; -+ u8 oui[4]; /* 24-bit OUI followed by 8-bit OUI type */ -+ u8 version[2]; /* little endian */ -+}; -+ -+struct rsn_ie_hdr { -+ u8 elem_id; /* WLAN_EID_RSN */ -+ u8 len; -+ u8 version[2]; /* little endian */ -+}; -+ -+#pragma pack() -+ -+#endif -+ -+#define WPA_PUT_LE16(a, val) \ -+ do { \ -+ (a)[1] = ((u16) (val)) >> 8; \ -+ (a)[0] = ((u16) (val)) & 0xff; \ -+ } while (0) -+ -+#define WPA_PUT_BE32(a, val) \ -+ do { \ -+ (a)[0] = (u8) ((((u32) (val)) >> 24) & 0xff); \ -+ (a)[1] = (u8) ((((u32) (val)) >> 16) & 0xff); \ -+ (a)[2] = (u8) ((((u32) (val)) >> 8) & 0xff); \ -+ (a)[3] = (u8) (((u32) (val)) & 0xff); \ -+ } while (0) -+ -+#define WPA_PUT_LE32(a, val) \ -+ do { \ -+ (a)[3] = (u8) ((((u32) (val)) >> 24) & 0xff); \ -+ (a)[2] = (u8) ((((u32) (val)) >> 16) & 0xff); \ -+ (a)[1] = (u8) ((((u32) (val)) >> 8) & 0xff); \ -+ (a)[0] = (u8) (((u32) (val)) & 0xff); \ -+ } while (0) -+ -+#define RSN_SELECTOR_PUT(a, val) WPA_PUT_BE32((u8 *) (a), (val)) -+//#define RSN_SELECTOR_PUT(a, val) WPA_PUT_LE32((u8 *) (a), (val)) -+ -+ -+ -+/* Action category code */ -+enum ieee80211_category { -+ WLAN_CATEGORY_SPECTRUM_MGMT = 0, -+ WLAN_CATEGORY_QOS = 1, -+ WLAN_CATEGORY_DLS = 2, -+ WLAN_CATEGORY_BACK = 3, -+ WLAN_CATEGORY_HT = 7, -+ WLAN_CATEGORY_WMM = 17, -+}; -+ -+/* SPECTRUM_MGMT action code */ -+enum ieee80211_spectrum_mgmt_actioncode { -+ WLAN_ACTION_SPCT_MSR_REQ = 0, -+ WLAN_ACTION_SPCT_MSR_RPRT = 1, -+ WLAN_ACTION_SPCT_TPC_REQ = 2, -+ WLAN_ACTION_SPCT_TPC_RPRT = 3, -+ WLAN_ACTION_SPCT_CHL_SWITCH = 4, -+ WLAN_ACTION_SPCT_EXT_CHL_SWITCH = 5, -+}; -+ -+/* BACK action code */ -+enum ieee80211_back_actioncode { -+ WLAN_ACTION_ADDBA_REQ = 0, -+ WLAN_ACTION_ADDBA_RESP = 1, -+ WLAN_ACTION_DELBA = 2, -+}; -+ -+/* HT features action code */ -+enum ieee80211_ht_actioncode { -+ WLAN_ACTION_NOTIFY_CH_WIDTH = 0, -+ WLAN_ACTION_SM_PS = 1, -+ WLAN_ACTION_PSPM = 2, -+ WLAN_ACTION_PCO_PHASE = 3, -+ WLAN_ACTION_MIMO_CSI_MX = 4, -+ WLAN_ACTION_MIMO_NONCP_BF = 5, -+ WLAN_ACTION_MIMP_CP_BF = 6, -+ WLAN_ACTION_ASEL_INDICATES_FB = 7, -+ WLAN_ACTION_HI_INFO_EXCHG = 8, -+}; -+ -+/* BACK (block-ack) parties */ -+enum ieee80211_back_parties { -+ WLAN_BACK_RECIPIENT = 0, -+ WLAN_BACK_INITIATOR = 1, -+ WLAN_BACK_TIMER = 2, -+}; -+ -+#ifdef PLATFORM_LINUX -+ -+struct ieee80211_mgmt { -+ u16 frame_control; -+ u16 duration; -+ u8 da[6]; -+ u8 sa[6]; -+ u8 bssid[6]; -+ u16 seq_ctrl; -+ union { -+ struct { -+ u16 auth_alg; -+ u16 auth_transaction; -+ u16 status_code; -+ /* possibly followed by Challenge text */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) auth; -+ struct { -+ u16 reason_code; -+ } __attribute__ ((packed)) deauth; -+ struct { -+ u16 capab_info; -+ u16 listen_interval; -+ /* followed by SSID and Supported rates */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) assoc_req; -+ struct { -+ u16 capab_info; -+ u16 status_code; -+ u16 aid; -+ /* followed by Supported rates */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) assoc_resp, reassoc_resp; -+ struct { -+ u16 capab_info; -+ u16 listen_interval; -+ u8 current_ap[6]; -+ /* followed by SSID and Supported rates */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) reassoc_req; -+ struct { -+ u16 reason_code; -+ } __attribute__ ((packed)) disassoc; -+ struct { -+ __le64 timestamp; -+ u16 beacon_int; -+ u16 capab_info; -+ /* followed by some of SSID, Supported rates, -+ * FH Params, DS Params, CF Params, IBSS Params, TIM */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) beacon; -+ struct { -+ /* only variable items: SSID, Supported rates */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) probe_req; -+ struct { -+ __le64 timestamp; -+ u16 beacon_int; -+ u16 capab_info; -+ /* followed by some of SSID, Supported rates, -+ * FH Params, DS Params, CF Params, IBSS Params */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) probe_resp; -+ struct { -+ u8 category; -+ union { -+ struct { -+ u8 action_code; -+ u8 dialog_token; -+ u8 status_code; -+ u8 variable[0]; -+ } __attribute__ ((packed)) wme_action; -+#if 0 -+ struct{ -+ u8 action_code; -+ u8 element_id; -+ u8 length; -+ struct ieee80211_channel_sw_ie sw_elem; -+ } __attribute__ ((packed)) chan_switch; -+ struct{ -+ u8 action_code; -+ u8 dialog_token; -+ u8 element_id; -+ u8 length; -+ struct ieee80211_msrment_ie msr_elem; -+ } __attribute__ ((packed)) measurement; -+#endif -+ struct{ -+ u8 action_code; -+ u8 dialog_token; -+ u16 capab; -+ u16 timeout; -+ u16 start_seq_num; -+ } __attribute__ ((packed)) addba_req; -+ struct{ -+ u8 action_code; -+ u8 dialog_token; -+ u16 status; -+ u16 capab; -+ u16 timeout; -+ } __attribute__ ((packed)) addba_resp; -+ struct{ -+ u8 action_code; -+ u16 params; -+ u16 reason_code; -+ } __attribute__ ((packed)) delba; -+ struct{ -+ u8 action_code; -+ /* capab_info for open and confirm, -+ * reason for close -+ */ -+ u16 aux; -+ /* Followed in plink_confirm by status -+ * code, AID and supported rates, -+ * and directly by supported rates in -+ * plink_open and plink_close -+ */ -+ u8 variable[0]; -+ } __attribute__ ((packed)) plink_action; -+ struct{ -+ u8 action_code; -+ u8 variable[0]; -+ } __attribute__ ((packed)) mesh_action; -+ } __attribute__ ((packed)) u; -+ } __attribute__ ((packed)) action; -+ } __attribute__ ((packed)) u; -+}__attribute__ ((packed)); -+ -+#endif -+ -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+ -+struct ieee80211_mgmt { -+ u16 frame_control; -+ u16 duration; -+ u8 da[6]; -+ u8 sa[6]; -+ u8 bssid[6]; -+ u16 seq_ctrl; -+ union { -+ struct { -+ u16 auth_alg; -+ u16 auth_transaction; -+ u16 status_code; -+ /* possibly followed by Challenge text */ -+ u8 variable[0]; -+ } auth; -+ struct { -+ u16 reason_code; -+ } deauth; -+ struct { -+ u16 capab_info; -+ u16 listen_interval; -+ /* followed by SSID and Supported rates */ -+ u8 variable[0]; -+ } assoc_req; -+ struct { -+ u16 capab_info; -+ u16 status_code; -+ u16 aid; -+ /* followed by Supported rates */ -+ u8 variable[0]; -+ } assoc_resp, reassoc_resp; -+ struct { -+ u16 capab_info; -+ u16 listen_interval; -+ u8 current_ap[6]; -+ /* followed by SSID and Supported rates */ -+ u8 variable[0]; -+ } reassoc_req; -+ struct { -+ u16 reason_code; -+ } disassoc; -+#if 0 -+ struct { -+ __le64 timestamp; -+ u16 beacon_int; -+ u16 capab_info; -+ /* followed by some of SSID, Supported rates, -+ * FH Params, DS Params, CF Params, IBSS Params, TIM */ -+ u8 variable[0]; -+ } beacon; -+ struct { -+ /* only variable items: SSID, Supported rates */ -+ u8 variable[0]; -+ } probe_req; -+ -+ struct { -+ __le64 timestamp; -+ u16 beacon_int; -+ u16 capab_info; -+ /* followed by some of SSID, Supported rates, -+ * FH Params, DS Params, CF Params, IBSS Params */ -+ u8 variable[0]; -+ } probe_resp; -+#endif -+ struct { -+ u8 category; -+ union { -+ struct { -+ u8 action_code; -+ u8 dialog_token; -+ u8 status_code; -+ u8 variable[0]; -+ } wme_action; -+/* -+ struct{ -+ u8 action_code; -+ u8 element_id; -+ u8 length; -+ struct ieee80211_channel_sw_ie sw_elem; -+ } chan_switch; -+ struct{ -+ u8 action_code; -+ u8 dialog_token; -+ u8 element_id; -+ u8 length; -+ struct ieee80211_msrment_ie msr_elem; -+ } measurement; -+*/ -+ struct{ -+ u8 action_code; -+ u8 dialog_token; -+ u16 capab; -+ u16 timeout; -+ u16 start_seq_num; -+ } addba_req; -+ struct{ -+ u8 action_code; -+ u8 dialog_token; -+ u16 status; -+ u16 capab; -+ u16 timeout; -+ } addba_resp; -+ struct{ -+ u8 action_code; -+ u16 params; -+ u16 reason_code; -+ } delba; -+ struct{ -+ u8 action_code; -+ /* capab_info for open and confirm, -+ * reason for close -+ */ -+ u16 aux; -+ /* Followed in plink_confirm by status -+ * code, AID and supported rates, -+ * and directly by supported rates in -+ * plink_open and plink_close -+ */ -+ u8 variable[0]; -+ } plink_action; -+ struct{ -+ u8 action_code; -+ u8 variable[0]; -+ } mesh_action; -+ } u; -+ } action; -+ } u; -+} ; -+ -+#pragma pack() -+ -+#endif -+ -+/* mgmt header + 1 byte category code */ -+#define IEEE80211_MIN_ACTION_SIZE FIELD_OFFSET(struct ieee80211_mgmt, u.action.u) -+ -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h -@@ -0,0 +1,112 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef _LINUX_IF_ETHER_H -+#define _LINUX_IF_ETHER_H -+ -+/* -+ * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -+ * and FCS/CRC (frame check sequence). -+ */ -+ -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#define ETH_HLEN 14 /* Total octets in header. */ -+#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ -+#define ETH_DATA_LEN 1500 /* Max. octets in payload */ -+#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ -+ -+/* -+ * These are the defined Ethernet Protocol ID's. -+ */ -+ -+#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ -+#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ -+#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ -+#define ETH_P_IP 0x0800 /* Internet Protocol packet */ -+#define ETH_P_X25 0x0805 /* CCITT X.25 */ -+#define ETH_P_ARP 0x0806 /* Address Resolution packet */ -+#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ -+#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ -+#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ -+#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ -+#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ -+#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ -+#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ -+#define ETH_P_LAT 0x6004 /* DEC LAT */ -+#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ -+#define ETH_P_CUST 0x6006 /* DEC Customer use */ -+#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ -+#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ -+#define ETH_P_ATALK 0x809B /* Appletalk DDP */ -+#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ -+#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ -+#define ETH_P_IPX 0x8137 /* IPX over DIX */ -+#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ -+#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ -+#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ -+#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ -+#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport -+ * over Ethernet -+ */ -+ -+/* -+ * Non DIX types. Won't clash for 1500 types. -+ */ -+ -+#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ -+#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ -+#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ -+#define ETH_P_802_2 0x0004 /* 802.2 frames */ -+#define ETH_P_SNAP 0x0005 /* Internal only */ -+#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ -+#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ -+#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ -+#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ -+#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ -+#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ -+#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ -+#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ -+#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ -+#define ETH_P_ECONET 0x0018 /* Acorn Econet */ -+ -+/* -+ * This is an Ethernet frame header. -+ */ -+ -+struct ethhdr -+{ -+ unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ -+ unsigned char h_source[ETH_ALEN]; /* source ether addr */ -+ unsigned short h_proto; /* packet type ID field */ -+}; -+ -+struct _vlan { -+ unsigned short h_vlan_TCI; // Encapsulates priority and VLAN ID -+ unsigned short h_vlan_encapsulated_proto; -+}; -+ -+ -+ -+#define get_vlan_id(pvlan) ((ntohs((unsigned short )pvlan->h_vlan_TCI)) & 0xfff) -+#define get_vlan_priority(pvlan) ((ntohs((unsigned short )pvlan->h_vlan_TCI))>>13) -+#define get_vlan_encap_proto(pvlan) (ntohs((unsigned short )pvlan->h_vlan_encapsulated_proto)) -+ -+ -+#endif /* _LINUX_IF_ETHER_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h -@@ -0,0 +1,184 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __IOCTL_CFG80211_H__ -+#define __IOCTL_CFG80211_H__ -+ -+#if defined(CONFIG_IOCTL_CFG80211) && !defined(CONFIG_CFG80211) && !defined(CONFIG_CFG80211_MODULE) -+ #error "Can't define CONFIG_IOCTL_CFG80211 because neither CONFIG_CFG80211 nor CONFIG_CFG80211_MODULE is defined in kernel" -+#endif -+#if defined(CONFIG_IOCTL_CFG80211) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) -+ #error "We haven't verify our cfg80211 solution below kernel version 2.6.35" -+#endif -+ -+#if defined(RTW_USE_CFG80211_STA_EVENT) -+ #undef CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER -+#endif -+ -+struct rtw_wdev_invit_info { -+ u8 state; /* 0: req, 1:rep */ -+ u8 peer_mac[ETH_ALEN]; -+ u8 active; -+ u8 token; -+ u8 flags; -+ u8 status; -+ u8 req_op_ch; -+ u8 rsp_op_ch; -+}; -+ -+#define rtw_wdev_invit_info_init(invit_info) \ -+ do { \ -+ (invit_info)->state = 0xff; \ -+ _rtw_memset((invit_info)->peer_mac, 0, ETH_ALEN); \ -+ (invit_info)->active = 0xff; \ -+ (invit_info)->token = 0; \ -+ (invit_info)->flags = 0x00; \ -+ (invit_info)->status = 0xff; \ -+ (invit_info)->req_op_ch = 0; \ -+ (invit_info)->rsp_op_ch = 0; \ -+ } while (0) -+ -+struct rtw_wdev_nego_info { -+ u8 state; /* 0: req, 1:rep, 3:conf */ -+ u8 peer_mac[ETH_ALEN]; -+ u8 active; -+ u8 token; -+ u8 status; -+ u8 req_intent; -+ u8 req_op_ch; -+ u8 req_listen_ch; -+ u8 rsp_intent; -+ u8 rsp_op_ch; -+ u8 conf_op_ch; -+}; -+ -+#define rtw_wdev_nego_info_init(nego_info) \ -+ do { \ -+ (nego_info)->state = 0xff; \ -+ _rtw_memset((nego_info)->peer_mac, 0, ETH_ALEN); \ -+ (nego_info)->active = 0xff; \ -+ (nego_info)->token = 0; \ -+ (nego_info)->status = 0xff; \ -+ (nego_info)->req_intent = 0xff; \ -+ (nego_info)->req_op_ch = 0; \ -+ (nego_info)->req_listen_ch = 0; \ -+ (nego_info)->rsp_intent = 0xff; \ -+ (nego_info)->rsp_op_ch = 0; \ -+ (nego_info)->conf_op_ch = 0; \ -+ } while (0) -+ -+struct rtw_wdev_priv -+{ -+ struct wireless_dev *rtw_wdev; -+ -+ _adapter *padapter; -+ -+ struct cfg80211_scan_request *scan_request; -+ _lock scan_req_lock; -+ -+ struct net_device *pmon_ndev;//for monitor interface -+ char ifname_mon[IFNAMSIZ + 1]; //interface name for monitor interface -+ -+ u8 p2p_enabled; -+ -+ u8 provdisc_req_issued; -+ -+ struct rtw_wdev_invit_info invit_info; -+ struct rtw_wdev_nego_info nego_info; -+ -+ u8 bandroid_scan; -+ bool block; -+ bool power_mgmt; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ ATOMIC_T ro_ch_to; -+ ATOMIC_T switch_ch_to; -+#endif -+ -+}; -+ -+#define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w))) -+ -+#define wiphy_to_adapter(x) (_adapter *)(((struct rtw_wdev_priv*)wiphy_priv(x))->padapter) -+ -+#define wiphy_to_wdev(x) (struct wireless_dev *)(((struct rtw_wdev_priv*)wiphy_priv(x))->rtw_wdev) -+ -+int rtw_wdev_alloc(_adapter *padapter, struct device *dev); -+void rtw_wdev_free(struct wireless_dev *wdev); -+void rtw_wdev_unregister(struct wireless_dev *wdev); -+ -+void rtw_cfg80211_init_wiphy(_adapter *padapter); -+ -+void rtw_cfg80211_surveydone_event_callback(_adapter *padapter); -+int rtw_cfg80211_check_bss(_adapter *padapter); -+void rtw_cfg80211_indicate_connect(_adapter *padapter); -+void rtw_cfg80211_indicate_disconnect(_adapter *padapter); -+void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool aborted); -+ -+#ifdef CONFIG_AP_MODE -+void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint frame_len); -+void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason); -+#endif //CONFIG_AP_MODE -+ -+void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, size_t len); -+void rtw_cfg80211_rx_p2p_action_public(_adapter *padapter, u8 *pmgmt_frame, uint frame_len); -+void rtw_cfg80211_rx_action_p2p(_adapter *padapter, u8 *pmgmt_frame, uint frame_len); -+void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const char*msg); -+ -+int rtw_cfg80211_set_mgnt_wpsp2pie(struct net_device *net, char *buf, int len, int type); -+ -+bool rtw_cfg80211_pwr_mgmt(_adapter *adapter); -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && !defined(COMPAT_KERNEL_RELEASE) -+#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, buf, len, gfp) -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)) -+#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, sig_dbm, buf, len, gfp) -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)) -+#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp) -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)) -+#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0, gfp) -+#else -+#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0) -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && !defined(COMPAT_KERNEL_RELEASE) -+#define rtw_cfg80211_send_rx_assoc(adapter, bss, buf, len) cfg80211_send_rx_assoc((adapter)->pnetdev, buf, len) -+#else -+#define rtw_cfg80211_send_rx_assoc(adapter, bss, buf, len) cfg80211_send_rx_assoc((adapter)->pnetdev, bss, buf, len) -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)) -+#define rtw_cfg80211_mgmt_tx_status(adapter, cookie, buf, len, ack, gfp) cfg80211_mgmt_tx_status((adapter)->pnetdev, cookie, buf, len, ack, gfp) -+#else -+#define rtw_cfg80211_mgmt_tx_status(adapter, cookie, buf, len, ack, gfp) cfg80211_mgmt_tx_status((adapter)->rtw_wdev, cookie, buf, len, ack, gfp) -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)) -+#define rtw_cfg80211_ready_on_channel(adapter, cookie, chan, channel_type, duration, gfp) cfg80211_ready_on_channel((adapter)->pnetdev, cookie, chan, channel_type, duration, gfp) -+#define rtw_cfg80211_remain_on_channel_expired(adapter, cookie, chan, chan_type, gfp) cfg80211_remain_on_channel_expired((adapter)->pnetdev, cookie, chan, chan_type, gfp) -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) -+#define rtw_cfg80211_ready_on_channel(adapter, cookie, chan, channel_type, duration, gfp) cfg80211_ready_on_channel((adapter)->rtw_wdev, cookie, chan, channel_type, duration, gfp) -+#define rtw_cfg80211_remain_on_channel_expired(adapter, cookie, chan, chan_type, gfp) cfg80211_remain_on_channel_expired((adapter)->rtw_wdev, cookie, chan, chan_type, gfp) -+#else -+#define rtw_cfg80211_ready_on_channel(adapter, cookie, chan, channel_type, duration, gfp) cfg80211_ready_on_channel((adapter)->rtw_wdev, cookie, chan, duration, gfp) -+#define rtw_cfg80211_remain_on_channel_expired(adapter, cookie, chan, chan_type, gfp) cfg80211_remain_on_channel_expired((adapter)->rtw_wdev, cookie, chan, gfp) -+#endif -+ -+#endif //__IOCTL_CFG80211_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/ip.h -@@ -0,0 +1,141 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _LINUX_IP_H -+#define _LINUX_IP_H -+#include -+ -+/* SOL_IP socket options */ -+ -+#define IPTOS_TOS_MASK 0x1E -+#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK) -+#define IPTOS_LOWDELAY 0x10 -+#define IPTOS_THROUGHPUT 0x08 -+#define IPTOS_RELIABILITY 0x04 -+#define IPTOS_MINCOST 0x02 -+ -+#define IPTOS_PREC_MASK 0xE0 -+#define IPTOS_PREC(tos) ((tos)&IPTOS_PREC_MASK) -+#define IPTOS_PREC_NETCONTROL 0xe0 -+#define IPTOS_PREC_INTERNETCONTROL 0xc0 -+#define IPTOS_PREC_CRITIC_ECP 0xa0 -+#define IPTOS_PREC_FLASHOVERRIDE 0x80 -+#define IPTOS_PREC_FLASH 0x60 -+#define IPTOS_PREC_IMMEDIATE 0x40 -+#define IPTOS_PREC_PRIORITY 0x20 -+#define IPTOS_PREC_ROUTINE 0x00 -+ -+ -+/* IP options */ -+#define IPOPT_COPY 0x80 -+#define IPOPT_CLASS_MASK 0x60 -+#define IPOPT_NUMBER_MASK 0x1f -+ -+#define IPOPT_COPIED(o) ((o)&IPOPT_COPY) -+#define IPOPT_CLASS(o) ((o)&IPOPT_CLASS_MASK) -+#define IPOPT_NUMBER(o) ((o)&IPOPT_NUMBER_MASK) -+ -+#define IPOPT_CONTROL 0x00 -+#define IPOPT_RESERVED1 0x20 -+#define IPOPT_MEASUREMENT 0x40 -+#define IPOPT_RESERVED2 0x60 -+ -+#define IPOPT_END (0 |IPOPT_CONTROL) -+#define IPOPT_NOOP (1 |IPOPT_CONTROL) -+#define IPOPT_SEC (2 |IPOPT_CONTROL|IPOPT_COPY) -+#define IPOPT_LSRR (3 |IPOPT_CONTROL|IPOPT_COPY) -+#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT) -+#define IPOPT_RR (7 |IPOPT_CONTROL) -+#define IPOPT_SID (8 |IPOPT_CONTROL|IPOPT_COPY) -+#define IPOPT_SSRR (9 |IPOPT_CONTROL|IPOPT_COPY) -+#define IPOPT_RA (20|IPOPT_CONTROL|IPOPT_COPY) -+ -+#define IPVERSION 4 -+#define MAXTTL 255 -+#define IPDEFTTL 64 -+ -+/* struct timestamp, struct route and MAX_ROUTES are removed. -+ -+ REASONS: it is clear that nobody used them because: -+ - MAX_ROUTES value was wrong. -+ - "struct route" was wrong. -+ - "struct timestamp" had fatally misaligned bitfields and was completely unusable. -+ */ -+ -+#define IPOPT_OPTVAL 0 -+#define IPOPT_OLEN 1 -+#define IPOPT_OFFSET 2 -+#define IPOPT_MINOFF 4 -+#define MAX_IPOPTLEN 40 -+#define IPOPT_NOP IPOPT_NOOP -+#define IPOPT_EOL IPOPT_END -+#define IPOPT_TS IPOPT_TIMESTAMP -+ -+#define IPOPT_TS_TSONLY 0 /* timestamps only */ -+#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -+#define IPOPT_TS_PRESPEC 3 /* specified modules only */ -+ -+#ifdef PLATFORM_LINUX -+ -+struct ip_options { -+ __u32 faddr; /* Saved first hop address */ -+ unsigned char optlen; -+ unsigned char srr; -+ unsigned char rr; -+ unsigned char ts; -+ unsigned char is_setbyuser:1, /* Set by setsockopt? */ -+ is_data:1, /* Options in __data, rather than skb */ -+ is_strictroute:1, /* Strict source route */ -+ srr_is_hit:1, /* Packet destination addr was our one */ -+ is_changed:1, /* IP checksum more not valid */ -+ rr_needaddr:1, /* Need to record addr of outgoing dev */ -+ ts_needtime:1, /* Need to record timestamp */ -+ ts_needaddr:1; /* Need to record addr of outgoing dev */ -+ unsigned char router_alert; -+ unsigned char __pad1; -+ unsigned char __pad2; -+ unsigned char __data[0]; -+}; -+ -+#define optlength(opt) (sizeof(struct ip_options) + opt->optlen) -+#endif -+ -+struct iphdr { -+#if defined(__LITTLE_ENDIAN_BITFIELD) -+ __u8 ihl:4, -+ version:4; -+#elif defined (__BIG_ENDIAN_BITFIELD) -+ __u8 version:4, -+ ihl:4; -+#else -+#error "Please fix " -+#endif -+ __u8 tos; -+ __u16 tot_len; -+ __u16 id; -+ __u16 frag_off; -+ __u8 ttl; -+ __u8 protocol; -+ __u16 check; -+ __u32 saddr; -+ __u32 daddr; -+ /*The options start here. */ -+}; -+ -+#endif /* _LINUX_IP_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h -@@ -0,0 +1,90 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef _LINUX_WIRELESS_H -+#define _LINUX_WIRELESS_H -+ -+/***************************** INCLUDES *****************************/ -+ -+#if 0 -+#include /* for __u* and __s* typedefs */ -+#include /* for "struct sockaddr" et al */ -+#include /* for IFNAMSIZ and co... */ -+#else -+#define __user -+//typedef uint16_t __u16; -+#include /* for "struct sockaddr" et al */ -+#include /* for IFNAMSIZ and co... */ -+#endif -+ -+/****************************** TYPES ******************************/ -+ -+/* --------------------------- SUBTYPES --------------------------- */ -+/* -+ * For all data larger than 16 octets, we need to use a -+ * pointer to memory allocated in user space. -+ */ -+struct iw_point -+{ -+ void __user *pointer; /* Pointer to the data (in user space) */ -+ __u16 length; /* number of fields or size in bytes */ -+ __u16 flags; /* Optional params */ -+}; -+ -+ -+/* ------------------------ IOCTL REQUEST ------------------------ */ -+/* -+ * This structure defines the payload of an ioctl, and is used -+ * below. -+ * -+ * Note that this structure should fit on the memory footprint -+ * of iwreq (which is the same as ifreq), which mean a max size of -+ * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... -+ * You should check this when increasing the structures defined -+ * above in this file... -+ */ -+union iwreq_data -+{ -+ /* Config - generic */ -+ char name[IFNAMSIZ]; -+ /* Name : used to verify the presence of wireless extensions. -+ * Name of the protocol/provider... */ -+ -+ struct iw_point data; /* Other large parameters */ -+}; -+ -+/* -+ * The structure to exchange data for ioctl. -+ * This structure is the same as 'struct ifreq', but (re)defined for -+ * convenience... -+ * Do I need to remind you about structure size (32 octets) ? -+ */ -+struct iwreq -+{ -+ union -+ { -+ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ -+ } ifr_ifrn; -+ -+ /* Data part (defined just above) */ -+ union iwreq_data u; -+}; -+ -+#endif /* _LINUX_WIRELESS_H */ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h -@@ -0,0 +1,40 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __MLME_OSDEP_H_ -+#define __MLME_OSDEP_H_ -+ -+#include -+#include -+#include -+ -+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MPIXEL) -+extern int time_after(u32 now, u32 old); -+#endif -+ -+extern void rtw_init_mlme_timer(_adapter *padapter); -+extern void rtw_os_indicate_disconnect( _adapter *adapter ); -+extern void rtw_os_indicate_connect( _adapter *adapter ); -+void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted); -+extern void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie); -+ -+void rtw_reset_securitypriv( _adapter *adapter ); -+ -+#endif //_MLME_OSDEP_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h -@@ -0,0 +1,353 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __CUSTOM_OID_H -+#define __CUSTOM_OID_H -+ -+// by Owen -+// 0xFF818000 - 0xFF81802F RTL8180 Mass Production Kit -+// 0xFF818500 - 0xFF81850F RTL8185 Setup Utility -+// 0xFF818580 - 0xFF81858F RTL8185 Phy Status Utility -+ -+// -+ -+// by Owen for Production Kit -+// For Production Kit with Agilent Equipments -+// in order to make our custom oids hopefully somewhat unique -+// we will use 0xFF (indicating implementation specific OID) -+// 81(first byte of non zero Realtek unique identifier) -+// 80 (second byte of non zero Realtek unique identifier) -+// XX (the custom OID number - providing 255 possible custom oids) -+ -+#define OID_RT_PRO_RESET_DUT 0xFF818000 -+#define OID_RT_PRO_SET_DATA_RATE 0xFF818001 -+#define OID_RT_PRO_START_TEST 0xFF818002 -+#define OID_RT_PRO_STOP_TEST 0xFF818003 -+#define OID_RT_PRO_SET_PREAMBLE 0xFF818004 -+#define OID_RT_PRO_SET_SCRAMBLER 0xFF818005 -+#define OID_RT_PRO_SET_FILTER_BB 0xFF818006 -+#define OID_RT_PRO_SET_MANUAL_DIVERSITY_BB 0xFF818007 -+#define OID_RT_PRO_SET_CHANNEL_DIRECT_CALL 0xFF818008 -+#define OID_RT_PRO_SET_SLEEP_MODE_DIRECT_CALL 0xFF818009 -+#define OID_RT_PRO_SET_WAKE_MODE_DIRECT_CALL 0xFF81800A -+ -+#define OID_RT_PRO_SET_TX_ANTENNA_BB 0xFF81800D -+#define OID_RT_PRO_SET_ANTENNA_BB 0xFF81800E -+#define OID_RT_PRO_SET_CR_SCRAMBLER 0xFF81800F -+#define OID_RT_PRO_SET_CR_NEW_FILTER 0xFF818010 -+#define OID_RT_PRO_SET_TX_POWER_CONTROL 0xFF818011 -+#define OID_RT_PRO_SET_CR_TX_CONFIG 0xFF818012 -+#define OID_RT_PRO_GET_TX_POWER_CONTROL 0xFF818013 -+#define OID_RT_PRO_GET_CR_SIGNAL_QUALITY 0xFF818014 -+#define OID_RT_PRO_SET_CR_SETPOINT 0xFF818015 -+#define OID_RT_PRO_SET_INTEGRATOR 0xFF818016 -+#define OID_RT_PRO_SET_SIGNAL_QUALITY 0xFF818017 -+#define OID_RT_PRO_GET_INTEGRATOR 0xFF818018 -+#define OID_RT_PRO_GET_SIGNAL_QUALITY 0xFF818019 -+#define OID_RT_PRO_QUERY_EEPROM_TYPE 0xFF81801A -+#define OID_RT_PRO_WRITE_MAC_ADDRESS 0xFF81801B -+#define OID_RT_PRO_READ_MAC_ADDRESS 0xFF81801C -+#define OID_RT_PRO_WRITE_CIS_DATA 0xFF81801D -+#define OID_RT_PRO_READ_CIS_DATA 0xFF81801E -+#define OID_RT_PRO_WRITE_POWER_CONTROL 0xFF81801F -+#define OID_RT_PRO_READ_POWER_CONTROL 0xFF818020 -+#define OID_RT_PRO_WRITE_EEPROM 0xFF818021 -+#define OID_RT_PRO_READ_EEPROM 0xFF818022 -+#define OID_RT_PRO_RESET_TX_PACKET_SENT 0xFF818023 -+#define OID_RT_PRO_QUERY_TX_PACKET_SENT 0xFF818024 -+#define OID_RT_PRO_RESET_RX_PACKET_RECEIVED 0xFF818025 -+#define OID_RT_PRO_QUERY_RX_PACKET_RECEIVED 0xFF818026 -+#define OID_RT_PRO_QUERY_RX_PACKET_CRC32_ERROR 0xFF818027 -+#define OID_RT_PRO_QUERY_CURRENT_ADDRESS 0xFF818028 -+#define OID_RT_PRO_QUERY_PERMANENT_ADDRESS 0xFF818029 -+#define OID_RT_PRO_SET_PHILIPS_RF_PARAMETERS 0xFF81802A -+#define OID_RT_PRO_RECEIVE_PACKET 0xFF81802C -+// added by Owen on 04/08/03 for Cameo's request -+#define OID_RT_PRO_WRITE_EEPROM_BYTE 0xFF81802D -+#define OID_RT_PRO_READ_EEPROM_BYTE 0xFF81802E -+#define OID_RT_PRO_SET_MODULATION 0xFF81802F -+// -+ -+//Sean -+#define OID_RT_DRIVER_OPTION 0xFF818080 -+#define OID_RT_RF_OFF 0xFF818081 -+#define OID_RT_AUTH_STATUS 0xFF818082 -+ -+//======================================================================== -+#define OID_RT_PRO_SET_CONTINUOUS_TX 0xFF81800B -+#define OID_RT_PRO_SET_SINGLE_CARRIER_TX 0xFF81800C -+#define OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX 0xFF81802B -+#define OID_RT_PRO_SET_SINGLE_TONE_TX 0xFF818043 -+//======================================================================== -+ -+ -+// by Owen for RTL8185 Phy Status Report Utility -+#define OID_RT_UTILITY_FALSE_ALARM_COUNTERS 0xFF818580 -+#define OID_RT_UTILITY_SELECT_DEBUG_MODE 0xFF818581 -+#define OID_RT_UTILITY_SELECT_SUBCARRIER_NUMBER 0xFF818582 -+#define OID_RT_UTILITY_GET_RSSI_STATUS 0xFF818583 -+#define OID_RT_UTILITY_GET_FRAME_DETECTION_STATUS 0xFF818584 -+#define OID_RT_UTILITY_GET_AGC_AND_FREQUENCY_OFFSET_ESTIMATION_STATUS 0xFF818585 -+#define OID_RT_UTILITY_GET_CHANNEL_ESTIMATION_STATUS 0xFF818586 -+// -+ -+// by Owen on 03/09/19-03/09/22 for RTL8185 -+#define OID_RT_WIRELESS_MODE 0xFF818500 -+#define OID_RT_SUPPORTED_RATES 0xFF818501 -+#define OID_RT_DESIRED_RATES 0xFF818502 -+#define OID_RT_WIRELESS_MODE_STARTING_ADHOC 0xFF818503 -+// -+ -+#define OID_RT_GET_CONNECT_STATE 0xFF030001 -+#define OID_RT_RESCAN 0xFF030002 -+#define OID_RT_SET_KEY_LENGTH 0xFF030003 -+#define OID_RT_SET_DEFAULT_KEY_ID 0xFF030004 -+ -+#define OID_RT_SET_CHANNEL 0xFF010182 -+#define OID_RT_SET_SNIFFER_MODE 0xFF010183 -+#define OID_RT_GET_SIGNAL_QUALITY 0xFF010184 -+#define OID_RT_GET_SMALL_PACKET_CRC 0xFF010185 -+#define OID_RT_GET_MIDDLE_PACKET_CRC 0xFF010186 -+#define OID_RT_GET_LARGE_PACKET_CRC 0xFF010187 -+#define OID_RT_GET_TX_RETRY 0xFF010188 -+#define OID_RT_GET_RX_RETRY 0xFF010189 -+#define OID_RT_PRO_SET_FW_DIG_STATE 0xFF01018A//S -+#define OID_RT_PRO_SET_FW_RA_STATE 0xFF01018B//S -+ -+#define OID_RT_GET_RX_TOTAL_PACKET 0xFF010190 -+#define OID_RT_GET_TX_BEACON_OK 0xFF010191 -+#define OID_RT_GET_TX_BEACON_ERR 0xFF010192 -+#define OID_RT_GET_RX_ICV_ERR 0xFF010193 -+#define OID_RT_SET_ENCRYPTION_ALGORITHM 0xFF010194 -+#define OID_RT_SET_NO_AUTO_RESCAN 0xFF010195 -+#define OID_RT_GET_PREAMBLE_MODE 0xFF010196 -+#define OID_RT_GET_DRIVER_UP_DELTA_TIME 0xFF010197 -+#define OID_RT_GET_AP_IP 0xFF010198 -+#define OID_RT_GET_CHANNELPLAN 0xFF010199 -+#define OID_RT_SET_PREAMBLE_MODE 0xFF01019A -+#define OID_RT_SET_BCN_INTVL 0xFF01019B -+#define OID_RT_GET_RF_VENDER 0xFF01019C -+#define OID_RT_DEDICATE_PROBE 0xFF01019D -+#define OID_RT_PRO_RX_FILTER_PATTERN 0xFF01019E -+ -+#define OID_RT_GET_DCST_CURRENT_THRESHOLD 0xFF01019F -+ -+#define OID_RT_GET_CCA_ERR 0xFF0101A0 -+#define OID_RT_GET_CCA_UPGRADE_THRESHOLD 0xFF0101A1 -+#define OID_RT_GET_CCA_FALLBACK_THRESHOLD 0xFF0101A2 -+ -+#define OID_RT_GET_CCA_UPGRADE_EVALUATE_TIMES 0xFF0101A3 -+#define OID_RT_GET_CCA_FALLBACK_EVALUATE_TIMES 0xFF0101A4 -+ -+// by Owen on 03/31/03 for Cameo's request -+#define OID_RT_SET_RATE_ADAPTIVE 0xFF0101A5 -+// -+#define OID_RT_GET_DCST_EVALUATE_PERIOD 0xFF0101A5 -+#define OID_RT_GET_DCST_TIME_UNIT_INDEX 0xFF0101A6 -+#define OID_RT_GET_TOTAL_TX_BYTES 0xFF0101A7 -+#define OID_RT_GET_TOTAL_RX_BYTES 0xFF0101A8 -+#define OID_RT_CURRENT_TX_POWER_LEVEL 0xFF0101A9 -+#define OID_RT_GET_ENC_KEY_MISMATCH_COUNT 0xFF0101AA -+#define OID_RT_GET_ENC_KEY_MATCH_COUNT 0xFF0101AB -+#define OID_RT_GET_CHANNEL 0xFF0101AC -+ -+#define OID_RT_SET_CHANNELPLAN 0xFF0101AD -+#define OID_RT_GET_HARDWARE_RADIO_OFF 0xFF0101AE -+#define OID_RT_CHANNELPLAN_BY_COUNTRY 0xFF0101AF -+#define OID_RT_SCAN_AVAILABLE_BSSID 0xFF0101B0 -+#define OID_RT_GET_HARDWARE_VERSION 0xFF0101B1 -+#define OID_RT_GET_IS_ROAMING 0xFF0101B2 -+#define OID_RT_GET_IS_PRIVACY 0xFF0101B3 -+#define OID_RT_GET_KEY_MISMATCH 0xFF0101B4 -+#define OID_RT_SET_RSSI_ROAM_TRAFFIC_TH 0xFF0101B5 -+#define OID_RT_SET_RSSI_ROAM_SIGNAL_TH 0xFF0101B6 -+#define OID_RT_RESET_LOG 0xFF0101B7 -+#define OID_RT_GET_LOG 0xFF0101B8 -+#define OID_RT_SET_INDICATE_HIDDEN_AP 0xFF0101B9 -+#define OID_RT_GET_HEADER_FAIL 0xFF0101BA -+#define OID_RT_SUPPORTED_WIRELESS_MODE 0xFF0101BB -+#define OID_RT_GET_CHANNEL_LIST 0xFF0101BC -+#define OID_RT_GET_SCAN_IN_PROGRESS 0xFF0101BD -+#define OID_RT_GET_TX_INFO 0xFF0101BE -+#define OID_RT_RF_READ_WRITE_OFFSET 0xFF0101BF -+#define OID_RT_RF_READ_WRITE 0xFF0101C0 -+ -+// For Netgear request. 2005.01.13, by rcnjko. -+#define OID_RT_FORCED_DATA_RATE 0xFF0101C1 -+#define OID_RT_WIRELESS_MODE_FOR_SCAN_LIST 0xFF0101C2 -+// For Netgear request. 2005.02.17, by rcnjko. -+#define OID_RT_GET_BSS_WIRELESS_MODE 0xFF0101C3 -+// For AZ project. 2005.06.27, by rcnjko. -+#define OID_RT_SCAN_WITH_MAGIC_PACKET 0xFF0101C4 -+ -+// Vincent 8185MP -+#define OID_RT_PRO_RX_FILTER 0xFF0111C0 -+ -+//Andy TEST -+//#define OID_RT_PRO_WRITE_REGISTRY 0xFF0111C1 -+//#define OID_RT_PRO_READ_REGISTRY 0xFF0111C2 -+#define OID_CE_USB_WRITE_REGISTRY 0xFF0111C1 -+#define OID_CE_USB_READ_REGISTRY 0xFF0111C2 -+ -+ -+#define OID_RT_PRO_SET_INITIAL_GAIN 0xFF0111C3 -+#define OID_RT_PRO_SET_BB_RF_STANDBY_MODE 0xFF0111C4 -+#define OID_RT_PRO_SET_BB_RF_SHUTDOWN_MODE 0xFF0111C5 -+#define OID_RT_PRO_SET_TX_CHARGE_PUMP 0xFF0111C6 -+#define OID_RT_PRO_SET_RX_CHARGE_PUMP 0xFF0111C7 -+#define OID_RT_PRO_RF_WRITE_REGISTRY 0xFF0111C8 -+#define OID_RT_PRO_RF_READ_REGISTRY 0xFF0111C9 -+#define OID_RT_PRO_QUERY_RF_TYPE 0xFF0111CA -+ -+// AP OID -+#define OID_RT_AP_GET_ASSOCIATED_STATION_LIST 0xFF010300 -+#define OID_RT_AP_GET_CURRENT_TIME_STAMP 0xFF010301 -+#define OID_RT_AP_SWITCH_INTO_AP_MODE 0xFF010302 -+#define OID_RT_AP_SET_DTIM_PERIOD 0xFF010303 -+#define OID_RT_AP_SUPPORTED 0xFF010304 // Determine if driver supports AP mode. 2004.08.27, by rcnjko. -+#define OID_RT_AP_SET_PASSPHRASE 0xFF010305 // Set WPA-PSK passphrase into authenticator. 2005.07.08, byrcnjko. -+ -+// 8187MP. 2004.09.06, by rcnjko. -+#define OID_RT_PRO8187_WI_POLL 0xFF818780 -+#define OID_RT_PRO_WRITE_BB_REG 0xFF818781 -+#define OID_RT_PRO_READ_BB_REG 0xFF818782 -+#define OID_RT_PRO_WRITE_RF_REG 0xFF818783 -+#define OID_RT_PRO_READ_RF_REG 0xFF818784 -+ -+// Meeting House. added by Annie, 2005-07-20. -+#define OID_RT_MH_VENDER_ID 0xFFEDC100 -+ -+//8711 MP OID added 20051230. -+#define OID_RT_PRO8711_JOIN_BSS 0xFF871100//S -+ -+#define OID_RT_PRO_READ_REGISTER 0xFF871101 //Q -+#define OID_RT_PRO_WRITE_REGISTER 0xFF871102 //S -+ -+#define OID_RT_PRO_BURST_READ_REGISTER 0xFF871103 //Q -+#define OID_RT_PRO_BURST_WRITE_REGISTER 0xFF871104 //S -+ -+#define OID_RT_PRO_WRITE_TXCMD 0xFF871105 //S -+ -+#define OID_RT_PRO_READ16_EEPROM 0xFF871106 //Q -+#define OID_RT_PRO_WRITE16_EEPROM 0xFF871107 //S -+ -+#define OID_RT_PRO_H2C_SET_COMMAND 0xFF871108 //S -+#define OID_RT_PRO_H2C_QUERY_RESULT 0xFF871109 //Q -+ -+#define OID_RT_PRO8711_WI_POLL 0xFF87110A //Q -+#define OID_RT_PRO8711_PKT_LOSS 0xFF87110B //Q -+#define OID_RT_RD_ATTRIB_MEM 0xFF87110C//Q -+#define OID_RT_WR_ATTRIB_MEM 0xFF87110D//S -+ -+ -+//Method 2 for H2C/C2H -+#define OID_RT_PRO_H2C_CMD_MODE 0xFF871110 //S -+#define OID_RT_PRO_H2C_CMD_RSP_MODE 0xFF871111 //Q -+#define OID_RT_PRO_H2C_CMD_EVENT_MODE 0xFF871112 //S -+#define OID_RT_PRO_WAIT_C2H_EVENT 0xFF871113 //Q -+#define OID_RT_PRO_RW_ACCESS_PROTOCOL_TEST 0xFF871114//Q -+ -+#define OID_RT_PRO_SCSI_ACCESS_TEST 0xFF871115 //Q, S -+ -+#define OID_RT_PRO_SCSI_TCPIPOFFLOAD_OUT 0xFF871116 //S -+#define OID_RT_PRO_SCSI_TCPIPOFFLOAD_IN 0xFF871117 //Q,S -+#define OID_RT_RRO_RX_PKT_VIA_IOCTRL 0xFF871118 //Q -+#define OID_RT_RRO_RX_PKTARRAY_VIA_IOCTRL 0xFF871119 //Q -+ -+#define OID_RT_RPO_SET_PWRMGT_TEST 0xFF87111A //S -+#define OID_RT_PRO_QRY_PWRMGT_TEST 0XFF87111B //Q -+#define OID_RT_RPO_ASYNC_RWIO_TEST 0xFF87111C //S -+#define OID_RT_RPO_ASYNC_RWIO_POLL 0xFF87111D //Q -+#define OID_RT_PRO_SET_RF_INTFS 0xFF87111E //S -+#define OID_RT_POLL_RX_STATUS 0xFF87111F //Q -+ -+#define OID_RT_PRO_CFG_DEBUG_MESSAGE 0xFF871120 //Q,S -+#define OID_RT_PRO_SET_DATA_RATE_EX 0xFF871121//S -+#define OID_RT_PRO_SET_BASIC_RATE 0xFF871122//S -+#define OID_RT_PRO_READ_TSSI 0xFF871123//S -+#define OID_RT_PRO_SET_POWER_TRACKING 0xFF871124//S -+ -+ -+#define OID_RT_PRO_QRY_PWRSTATE 0xFF871150 //Q -+#define OID_RT_PRO_SET_PWRSTATE 0xFF871151 //S -+ -+//Method 2 , using workitem -+#define OID_RT_SET_READ_REG 0xFF871181 //S -+#define OID_RT_SET_WRITE_REG 0xFF871182 //S -+#define OID_RT_SET_BURST_READ_REG 0xFF871183 //S -+#define OID_RT_SET_BURST_WRITE_REG 0xFF871184 //S -+#define OID_RT_SET_WRITE_TXCMD 0xFF871185 //S -+#define OID_RT_SET_READ16_EEPROM 0xFF871186 //S -+#define OID_RT_SET_WRITE16_EEPROM 0xFF871187 //S -+#define OID_RT_QRY_POLL_WKITEM 0xFF871188 //Q -+ -+//For SDIO INTERFACE only -+#define OID_RT_PRO_SYNCPAGERW_SRAM 0xFF8711A0 //Q, S -+#define OID_RT_PRO_871X_DRV_EXT 0xFF8711A1 -+ -+//For USB INTERFACE only -+#define OID_RT_PRO_USB_VENDOR_REQ 0xFF8711B0 //Q, S -+#define OID_RT_PRO_SCSI_AUTO_TEST 0xFF8711B1 //S -+#define OID_RT_PRO_USB_MAC_AC_FIFO_WRITE 0xFF8711B2 //S -+#define OID_RT_PRO_USB_MAC_RX_FIFO_READ 0xFF8711B3 //Q -+#define OID_RT_PRO_USB_MAC_RX_FIFO_POLLING 0xFF8711B4 //Q -+ -+#define OID_RT_PRO_H2C_SET_RATE_TABLE 0xFF8711FB //S -+#define OID_RT_PRO_H2C_GET_RATE_TABLE 0xFF8711FC //S -+#define OID_RT_PRO_H2C_C2H_LBK_TEST 0xFF8711FE -+ -+#define OID_RT_PRO_ENCRYPTION_CTRL 0xFF871200 //Q, S -+#define OID_RT_PRO_ADD_STA_INFO 0xFF871201 //S -+#define OID_RT_PRO_DELE_STA_INFO 0xFF871202 //S -+#define OID_RT_PRO_QUERY_DR_VARIABLE 0xFF871203 //Q -+ -+#define OID_RT_PRO_RX_PACKET_TYPE 0xFF871204 //Q, S -+ -+#define OID_RT_PRO_READ_EFUSE 0xFF871205 //Q -+#define OID_RT_PRO_WRITE_EFUSE 0xFF871206 //S -+#define OID_RT_PRO_RW_EFUSE_PGPKT 0xFF871207 //Q, S -+#define OID_RT_GET_EFUSE_CURRENT_SIZE 0xFF871208 //Q -+ -+#define OID_RT_SET_BANDWIDTH 0xFF871209 //S -+#define OID_RT_SET_CRYSTAL_CAP 0xFF87120A //S -+ -+#define OID_RT_SET_RX_PACKET_TYPE 0xFF87120B //S -+ -+#define OID_RT_GET_EFUSE_MAX_SIZE 0xFF87120C //Q -+ -+#define OID_RT_PRO_SET_TX_AGC_OFFSET 0xFF87120D //S -+ -+#define OID_RT_PRO_SET_PKT_TEST_MODE 0xFF87120E //S -+ -+#define OID_RT_PRO_FOR_EVM_TEST_SETTING 0xFF87120F //S -+ -+#define OID_RT_PRO_GET_THERMAL_METER 0xFF871210 //Q -+ -+#define OID_RT_RESET_PHY_RX_PACKET_COUNT 0xFF871211 //S -+#define OID_RT_GET_PHY_RX_PACKET_RECEIVED 0xFF871212 //Q -+#define OID_RT_GET_PHY_RX_PACKET_CRC32_ERROR 0xFF871213 //Q -+ -+#define OID_RT_SET_POWER_DOWN 0xFF871214 //S -+ -+#define OID_RT_GET_POWER_MODE 0xFF871215 //Q -+ -+#define OID_RT_PRO_EFUSE 0xFF871216 //Q, S -+#define OID_RT_PRO_EFUSE_MAP 0xFF871217 //Q, S -+ -+#endif //#ifndef __CUSTOM_OID_H ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h -@@ -0,0 +1,47 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+ -+#ifndef __NIC_SPEC_H__ -+#define __NIC_SPEC_H__ -+ -+#include -+ -+#define RTL8711_MCTRL_ (0x20000) -+#define RTL8711_UART_ (0x30000) -+#define RTL8711_TIMER_ (0x40000) -+#define RTL8711_FINT_ (0x50000) -+#define RTL8711_HINT_ (0x50000) -+#define RTL8711_GPIO_ (0x60000) -+#define RTL8711_WLANCTRL_ (0x200000) -+#define RTL8711_WLANFF_ (0xe00000) -+#define RTL8711_HCICTRL_ (0x600000) -+#define RTL8711_SYSCFG_ (0x620000) -+#define RTL8711_SYSCTRL_ (0x620000) -+#define RTL8711_MCCTRL_ (0x020000) -+ -+ -+#include -+ -+#include -+ -+ -+#endif // __RTL8711_SPEC_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h -@@ -0,0 +1,171 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef __OSDEP_CE_SERVICE_H_ -+#define __OSDEP_CE_SERVICE_H_ -+ -+ -+#include -+#include -+ -+#ifdef CONFIG_SDIO_HCI -+#include "SDCardDDK.h" -+#endif -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+typedef HANDLE _sema; -+typedef LIST_ENTRY _list; -+typedef NDIS_STATUS _OS_STATUS; -+ -+typedef NDIS_SPIN_LOCK _lock; -+ -+typedef HANDLE _rwlock; //Mutex -+ -+typedef u32 _irqL; -+ -+typedef NDIS_HANDLE _nic_hdl; -+ -+ -+typedef NDIS_MINIPORT_TIMER _timer; -+ -+struct __queue { -+ LIST_ENTRY queue; -+ _lock lock; -+}; -+ -+typedef NDIS_PACKET _pkt; -+typedef NDIS_BUFFER _buffer; -+typedef struct __queue _queue; -+ -+typedef HANDLE _thread_hdl_; -+typedef DWORD thread_return; -+typedef void* thread_context; -+typedef NDIS_WORK_ITEM _workitem; -+ -+#define thread_exit() ExitThread(STATUS_SUCCESS); return 0; -+ -+ -+#define SEMA_UPBND (0x7FFFFFFF) //8192 -+ -+__inline static _list *get_prev(_list *list) -+{ -+ return list->Blink; -+} -+ -+__inline static _list *get_next(_list *list) -+{ -+ return list->Flink; -+} -+ -+__inline static _list *get_list_head(_queue *queue) -+{ -+ return (&(queue->queue)); -+} -+ -+#define LIST_CONTAINOR(ptr, type, member) CONTAINING_RECORD(ptr, type, member) -+ -+__inline static void _enter_critical(_lock *plock, _irqL *pirqL) -+{ -+ NdisAcquireSpinLock(plock); -+} -+ -+__inline static void _exit_critical(_lock *plock, _irqL *pirqL) -+{ -+ NdisReleaseSpinLock(plock); -+} -+ -+__inline static _enter_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ NdisDprAcquireSpinLock(plock); -+} -+ -+__inline static _exit_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ NdisDprReleaseSpinLock(plock); -+} -+ -+ -+__inline static void _enter_hwio_critical(_rwlock *prwlock, _irqL *pirqL) -+{ -+ WaitForSingleObject(*prwlock, INFINITE ); -+ -+} -+ -+__inline static void _exit_hwio_critical(_rwlock *prwlock, _irqL *pirqL) -+{ -+ ReleaseMutex(*prwlock); -+} -+ -+__inline static void rtw_list_delete(_list *plist) -+{ -+ RemoveEntryList(plist); -+ InitializeListHead(plist); -+} -+ -+__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,PVOID cntx) -+{ -+ NdisMInitializeTimer(ptimer, nic_hdl, pfunc, cntx); -+} -+ -+__inline static void _set_timer(_timer *ptimer,u32 delay_time) -+{ -+ NdisMSetTimer(ptimer,delay_time); -+} -+ -+__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) -+{ -+ NdisMCancelTimer(ptimer,bcancelled); -+} -+ -+__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) -+{ -+ -+ NdisInitializeWorkItem(pwork, pfunc, cntx); -+} -+ -+__inline static void _set_workitem(_workitem *pwork) -+{ -+ NdisScheduleWorkItem(pwork); -+} -+ -+#define ATOMIC_INIT(i) { (i) } -+ -+// -+// Global Mutex: can only be used at PASSIVE level. -+// -+ -+#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+ while (NdisInterlockedIncrement((PULONG)&(_MutexCounter)) != 1)\ -+ { \ -+ NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \ -+ NdisMSleep(10000); \ -+ } \ -+} -+ -+#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+ NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \ -+} -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h -@@ -0,0 +1,155 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef __OSDEP_INTF_H_ -+#define __OSDEP_INTF_H_ -+ -+#include -+#include -+#include -+ -+struct intf_priv { -+ -+ u8 *intf_dev; -+ u32 max_iosz; //USB2.0: 128, USB1.1: 64, SDIO:64 -+ u32 max_xmitsz; //USB2.0: unlimited, SDIO:512 -+ u32 max_recvsz; //USB2.0: unlimited, SDIO:512 -+ -+ volatile u8 *io_rwmem; -+ volatile u8 *allocated_io_rwmem; -+ u32 io_wsz; //unit: 4bytes -+ u32 io_rsz;//unit: 4bytes -+ u8 intf_status; -+ -+ void (*_bus_io)(u8 *priv); -+ -+/* -+Under Sync. IRP (SDIO/USB) -+A protection mechanism is necessary for the io_rwmem(read/write protocol) -+ -+Under Async. IRP (SDIO/USB) -+The protection mechanism is through the pending queue. -+*/ -+ -+ _mutex ioctl_mutex; -+ -+ -+#ifdef PLATFORM_LINUX -+ #ifdef CONFIG_USB_HCI -+ // when in USB, IO is through interrupt in/out endpoints -+ struct usb_device *udev; -+ PURB piorw_urb; -+ u8 io_irp_cnt; -+ u8 bio_irp_pending; -+ _sema io_retevt; -+ _timer io_timer; -+ u8 bio_irp_timeout; -+ u8 bio_timer_cancel; -+ #endif -+#endif -+ -+#ifdef PLATFORM_OS_XP -+ #ifdef CONFIG_SDIO_HCI -+ // below is for io_rwmem... -+ PMDL pmdl; -+ PSDBUS_REQUEST_PACKET sdrp; -+ PSDBUS_REQUEST_PACKET recv_sdrp; -+ PSDBUS_REQUEST_PACKET xmit_sdrp; -+ -+ PIRP piorw_irp; -+ -+ #endif -+ #ifdef CONFIG_USB_HCI -+ PURB piorw_urb; -+ PIRP piorw_irp; -+ u8 io_irp_cnt; -+ u8 bio_irp_pending; -+ _sema io_retevt; -+ #endif -+#endif -+ -+}; -+ -+ -+#ifdef CONFIG_R871X_TEST -+int rtw_start_pseudo_adhoc(_adapter *padapter); -+int rtw_stop_pseudo_adhoc(_adapter *padapter); -+#endif -+ -+struct dvobj_priv *devobj_init(void); -+void devobj_deinit(struct dvobj_priv *pdvobj); -+ -+u8 rtw_init_drv_sw(_adapter *padapter); -+u8 rtw_free_drv_sw(_adapter *padapter); -+u8 rtw_reset_drv_sw(_adapter *padapter); -+ -+u32 rtw_start_drv_threads(_adapter *padapter); -+void rtw_stop_drv_threads (_adapter *padapter); -+void rtw_cancel_all_timer(_adapter *padapter); -+ -+#ifdef PLATFORM_LINUX -+int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); -+ -+int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname); -+struct net_device *rtw_init_netdev(_adapter *padapter); -+void rtw_unregister_netdevs(struct dvobj_priv *dvobj); -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+u16 rtw_recv_select_queue(struct sk_buff *skb); -+#endif //LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35) -+ -+#ifdef CONFIG_PROC_DEBUG -+void rtw_proc_init_one(struct net_device *dev); -+void rtw_proc_remove_one(struct net_device *dev); -+#else //!CONFIG_PROC_DEBUG -+static void rtw_proc_init_one(struct net_device *dev){} -+static void rtw_proc_remove_one(struct net_device *dev){} -+#endif //!CONFIG_PROC_DEBUG -+#endif //PLATFORM_LINUX -+ -+ -+#ifdef PLATFORM_FREEBSD -+extern int rtw_ioctl(struct ifnet * ifp, u_long cmd, caddr_t data); -+#endif -+ -+void rtw_ips_dev_unload(_adapter *padapter); -+#ifdef CONFIG_IPS -+int rtw_ips_pwr_up(_adapter *padapter); -+void rtw_ips_pwr_down(_adapter *padapter); -+#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+struct _io_ops; -+_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)); -+void rtw_drv_if2_free(_adapter *if2); -+void rtw_drv_if2_stop(_adapter *if2); -+#ifdef CONFIG_MULTI_VIR_IFACES -+struct dvobj_priv; -+_adapter *rtw_drv_add_vir_if(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)); -+void rtw_drv_stop_vir_ifaces(struct dvobj_priv *dvobj); -+void rtw_drv_free_vir_ifaces(struct dvobj_priv *dvobj); -+#endif //CONFIG_MULTI_VIR_IFACES -+#endif -+ -+int rtw_drv_register_netdev(_adapter *padapter); -+void rtw_ndev_destructor(_nic_hdl ndev); -+ -+#endif //_OSDEP_INTF_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h -@@ -0,0 +1,1821 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __OSDEP_SERVICE_H_ -+#define __OSDEP_SERVICE_H_ -+ -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#endif -+#include -+#include -+//#include -+ -+#define _FAIL 0 -+#define _SUCCESS 1 -+#define RTW_RX_HANDLED 2 -+//#define RTW_STATUS_TIMEDOUT -110 -+ -+#undef _TRUE -+#define _TRUE 1 -+ -+#undef _FALSE -+#define _FALSE 0 -+ -+ -+#ifdef PLATFORM_FREEBSD -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include "usbdevs.h" -+ -+#define USB_DEBUG_VAR rum_debug -+#include -+ -+#if 1 //Baron porting from linux, it's all temp solution, needs to check again -+#include -+#include /* XXX for PCPU_GET */ -+// typedef struct semaphore _sema; -+ typedef struct sema _sema; -+// typedef spinlock_t _lock; -+ typedef struct mtx _lock; -+ typedef struct mtx _mutex; -+ typedef struct timer_list _timer; -+ struct list_head { -+ struct list_head *next, *prev; -+ }; -+ struct __queue { -+ struct list_head queue; -+ _lock lock; -+ }; -+ -+ //typedef struct sk_buff _pkt; -+ typedef struct mbuf _pkt; -+ typedef struct mbuf _buffer; -+ -+ typedef struct __queue _queue; -+ typedef struct list_head _list; -+ typedef int _OS_STATUS; -+ //typedef u32 _irqL; -+ typedef unsigned long _irqL; -+ typedef struct ifnet * _nic_hdl; -+ -+ typedef pid_t _thread_hdl_; -+// typedef struct thread _thread_hdl_; -+ typedef void thread_return; -+ typedef void* thread_context; -+ -+ //#define thread_exit() complete_and_exit(NULL, 0) -+ -+ typedef void timer_hdl_return; -+ typedef void* timer_hdl_context; -+ typedef struct work_struct _workitem; -+ -+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -+/* emulate a modern version */ -+#define LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 35) -+ -+#define WIRELESS_EXT -1 -+#define HZ hz -+#define spin_lock_irqsave mtx_lock_irqsave -+#define spin_lock_bh mtx_lock_irqsave -+#define mtx_lock_irqsave(lock, x) mtx_lock(lock)//{local_irq_save((x)); mtx_lock_spin((lock));} -+//#define IFT_RTW 0xf9 //ifnet allocate type for RTW -+#define free_netdev if_free -+#define LIST_CONTAINOR(ptr, type, member) \ -+ ((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member))) -+#define container_of(p,t,n) (t*)((p)-&(((t*)0)->n)) -+/* -+ * Linux timers are emulated using FreeBSD callout functions -+ * (and taskqueue functionality). -+ * -+ * Currently no timer stats functionality. -+ * -+ * See (linux_compat) processes.c -+ * -+ */ -+struct timer_list { -+ -+ /* FreeBSD callout related fields */ -+ struct callout callout; -+ -+ //timeout function -+ void (*function)(void*); -+ //argument -+ void *arg; -+ -+}; -+struct workqueue_struct; -+struct work_struct; -+typedef void (*work_func_t)(struct work_struct *work); -+/* Values for the state of an item of work (work_struct) */ -+typedef enum work_state { -+ WORK_STATE_UNSET = 0, -+ WORK_STATE_CALLOUT_PENDING = 1, -+ WORK_STATE_TASK_PENDING = 2, -+ WORK_STATE_WORK_CANCELLED = 3 -+} work_state_t; -+ -+struct work_struct { -+ struct task task; /* FreeBSD task */ -+ work_state_t state; /* the pending or otherwise state of work. */ -+ work_func_t func; -+}; -+#define spin_unlock_irqrestore mtx_unlock_irqrestore -+#define spin_unlock_bh mtx_unlock_irqrestore -+#define mtx_unlock_irqrestore(lock,x) mtx_unlock(lock); -+extern void _rtw_spinlock_init(_lock *plock); -+ -+//modify private structure to match freebsd -+#define BITS_PER_LONG 32 -+union ktime { -+ s64 tv64; -+#if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR) -+ struct { -+#ifdef __BIG_ENDIAN -+ s32 sec, nsec; -+#else -+ s32 nsec, sec; -+#endif -+ } tv; -+#endif -+}; -+#define kmemcheck_bitfield_begin(name) -+#define kmemcheck_bitfield_end(name) -+#define CHECKSUM_NONE 0 -+typedef unsigned char *sk_buff_data_t; -+typedef union ktime ktime_t; /* Kill this */ -+ -+void rtw_mtx_lock(_lock *plock); -+ -+void rtw_mtx_unlock(_lock *plock); -+ -+/** -+ * struct sk_buff - socket buffer -+ * @next: Next buffer in list -+ * @prev: Previous buffer in list -+ * @sk: Socket we are owned by -+ * @tstamp: Time we arrived -+ * @dev: Device we arrived on/are leaving by -+ * @transport_header: Transport layer header -+ * @network_header: Network layer header -+ * @mac_header: Link layer header -+ * @_skb_refdst: destination entry (with norefcount bit) -+ * @sp: the security path, used for xfrm -+ * @cb: Control buffer. Free for use by every layer. Put private vars here -+ * @len: Length of actual data -+ * @data_len: Data length -+ * @mac_len: Length of link layer header -+ * @hdr_len: writable header length of cloned skb -+ * @csum: Checksum (must include start/offset pair) -+ * @csum_start: Offset from skb->head where checksumming should start -+ * @csum_offset: Offset from csum_start where checksum should be stored -+ * @local_df: allow local fragmentation -+ * @cloned: Head may be cloned (check refcnt to be sure) -+ * @nohdr: Payload reference only, must not modify header -+ * @pkt_type: Packet class -+ * @fclone: skbuff clone status -+ * @ip_summed: Driver fed us an IP checksum -+ * @priority: Packet queueing priority -+ * @users: User count - see {datagram,tcp}.c -+ * @protocol: Packet protocol from driver -+ * @truesize: Buffer size -+ * @head: Head of buffer -+ * @data: Data head pointer -+ * @tail: Tail pointer -+ * @end: End pointer -+ * @destructor: Destruct function -+ * @mark: Generic packet mark -+ * @nfct: Associated connection, if any -+ * @ipvs_property: skbuff is owned by ipvs -+ * @peeked: this packet has been seen already, so stats have been -+ * done for it, don't do them again -+ * @nf_trace: netfilter packet trace flag -+ * @nfctinfo: Relationship of this skb to the connection -+ * @nfct_reasm: netfilter conntrack re-assembly pointer -+ * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c -+ * @skb_iif: ifindex of device we arrived on -+ * @rxhash: the packet hash computed on receive -+ * @queue_mapping: Queue mapping for multiqueue devices -+ * @tc_index: Traffic control index -+ * @tc_verd: traffic control verdict -+ * @ndisc_nodetype: router type (from link layer) -+ * @dma_cookie: a cookie to one of several possible DMA operations -+ * done by skb DMA functions -+ * @secmark: security marking -+ * @vlan_tci: vlan tag control information -+ */ -+ -+struct sk_buff { -+ /* These two members must be first. */ -+ struct sk_buff *next; -+ struct sk_buff *prev; -+ -+ ktime_t tstamp; -+ -+ struct sock *sk; -+ //struct net_device *dev; -+ struct ifnet *dev; -+ -+ /* -+ * This is the control buffer. It is free to use for every -+ * layer. Please put your private variables there. If you -+ * want to keep them across layers you have to do a skb_clone() -+ * first. This is owned by whoever has the skb queued ATM. -+ */ -+ char cb[48] __aligned(8); -+ -+ unsigned long _skb_refdst; -+#ifdef CONFIG_XFRM -+ struct sec_path *sp; -+#endif -+ unsigned int len, -+ data_len; -+ u16 mac_len, -+ hdr_len; -+ union { -+ u32 csum; -+ struct { -+ u16 csum_start; -+ u16 csum_offset; -+ }smbol2; -+ }smbol1; -+ u32 priority; -+ kmemcheck_bitfield_begin(flags1); -+ u8 local_df:1, -+ cloned:1, -+ ip_summed:2, -+ nohdr:1, -+ nfctinfo:3; -+ u8 pkt_type:3, -+ fclone:2, -+ ipvs_property:1, -+ peeked:1, -+ nf_trace:1; -+ kmemcheck_bitfield_end(flags1); -+ u16 protocol; -+ -+ void (*destructor)(struct sk_buff *skb); -+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) -+ struct nf_conntrack *nfct; -+ struct sk_buff *nfct_reasm; -+#endif -+#ifdef CONFIG_BRIDGE_NETFILTER -+ struct nf_bridge_info *nf_bridge; -+#endif -+ -+ int skb_iif; -+#ifdef CONFIG_NET_SCHED -+ u16 tc_index; /* traffic control index */ -+#ifdef CONFIG_NET_CLS_ACT -+ u16 tc_verd; /* traffic control verdict */ -+#endif -+#endif -+ -+ u32 rxhash; -+ -+ kmemcheck_bitfield_begin(flags2); -+ u16 queue_mapping:16; -+#ifdef CONFIG_IPV6_NDISC_NODETYPE -+ u8 ndisc_nodetype:2, -+ deliver_no_wcard:1; -+#else -+ u8 deliver_no_wcard:1; -+#endif -+ kmemcheck_bitfield_end(flags2); -+ -+ /* 0/14 bit hole */ -+ -+#ifdef CONFIG_NET_DMA -+ dma_cookie_t dma_cookie; -+#endif -+#ifdef CONFIG_NETWORK_SECMARK -+ u32 secmark; -+#endif -+ union { -+ u32 mark; -+ u32 dropcount; -+ }symbol3; -+ -+ u16 vlan_tci; -+ -+ sk_buff_data_t transport_header; -+ sk_buff_data_t network_header; -+ sk_buff_data_t mac_header; -+ /* These elements must be at the end, see alloc_skb() for details. */ -+ sk_buff_data_t tail; -+ sk_buff_data_t end; -+ unsigned char *head, -+ *data; -+ unsigned int truesize; -+ atomic_t users; -+}; -+struct sk_buff_head { -+ /* These two members must be first. */ -+ struct sk_buff *next; -+ struct sk_buff *prev; -+ -+ u32 qlen; -+ _lock lock; -+}; -+#define skb_tail_pointer(skb) skb->tail -+static inline unsigned char *skb_put(struct sk_buff *skb, unsigned int len) -+{ -+ unsigned char *tmp = skb_tail_pointer(skb); -+ //SKB_LINEAR_ASSERT(skb); -+ skb->tail += len; -+ skb->len += len; -+ return tmp; -+} -+ -+static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len) -+{ -+ skb->len -= len; -+ if(skb->len < skb->data_len) -+ printf("%s(),%d,error!\n",__FUNCTION__,__LINE__); -+ return skb->data += len; -+} -+static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) -+{ -+ #ifdef PLATFORM_FREEBSD -+ return __skb_pull(skb, len); -+ #else -+ return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len); -+ #endif //PLATFORM_FREEBSD -+} -+static inline u32 skb_queue_len(const struct sk_buff_head *list_) -+{ -+ return list_->qlen; -+} -+static inline void __skb_insert(struct sk_buff *newsk, -+ struct sk_buff *prev, struct sk_buff *next, -+ struct sk_buff_head *list) -+{ -+ newsk->next = next; -+ newsk->prev = prev; -+ next->prev = prev->next = newsk; -+ list->qlen++; -+} -+static inline void __skb_queue_before(struct sk_buff_head *list, -+ struct sk_buff *next, -+ struct sk_buff *newsk) -+{ -+ __skb_insert(newsk, next->prev, next, list); -+} -+static inline void skb_queue_tail(struct sk_buff_head *list, -+ struct sk_buff *newsk) -+{ -+ mtx_lock(&list->lock); -+ __skb_queue_before(list, (struct sk_buff *)list, newsk); -+ mtx_unlock(&list->lock); -+} -+static inline struct sk_buff *skb_peek(struct sk_buff_head *list_) -+{ -+ struct sk_buff *list = ((struct sk_buff *)list_)->next; -+ if (list == (struct sk_buff *)list_) -+ list = NULL; -+ return list; -+} -+static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list) -+{ -+ struct sk_buff *next, *prev; -+ -+ list->qlen--; -+ next = skb->next; -+ prev = skb->prev; -+ skb->next = skb->prev = NULL; -+ next->prev = prev; -+ prev->next = next; -+} -+ -+static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list) -+{ -+ mtx_lock(&list->lock); -+ -+ struct sk_buff *skb = skb_peek(list); -+ if (skb) -+ __skb_unlink(skb, list); -+ -+ mtx_unlock(&list->lock); -+ -+ return skb; -+} -+static inline void skb_reserve(struct sk_buff *skb, int len) -+{ -+ skb->data += len; -+ skb->tail += len; -+} -+static inline void __skb_queue_head_init(struct sk_buff_head *list) -+{ -+ list->prev = list->next = (struct sk_buff *)list; -+ list->qlen = 0; -+} -+/* -+ * This function creates a split out lock class for each invocation; -+ * this is needed for now since a whole lot of users of the skb-queue -+ * infrastructure in drivers have different locking usage (in hardirq) -+ * than the networking core (in softirq only). In the long run either the -+ * network layer or drivers should need annotation to consolidate the -+ * main types of usage into 3 classes. -+ */ -+static inline void skb_queue_head_init(struct sk_buff_head *list) -+{ -+ _rtw_spinlock_init(&list->lock); -+ __skb_queue_head_init(list); -+} -+unsigned long copy_from_user(void *to, const void *from, unsigned long n); -+unsigned long copy_to_user(void *to, const void *from, unsigned long n); -+struct sk_buff * dev_alloc_skb(unsigned int size); -+struct sk_buff *skb_clone(const struct sk_buff *skb); -+void dev_kfree_skb_any(struct sk_buff *skb); -+#endif //Baron porting from linux, it's all temp solution, needs to check again -+ -+ -+#if 1 // kenny add Linux compatibility code for Linux USB driver -+#include -+ -+#define __init // __attribute ((constructor)) -+#define __exit // __attribute ((destructor)) -+ -+/* -+ * Definitions for module_init and module_exit macros. -+ * -+ * These macros will use the SYSINIT framework to call a specified -+ * function (with no arguments) on module loading or unloading. -+ * -+ */ -+ -+void module_init_exit_wrapper(void *arg); -+ -+#define module_init(initfn) \ -+ SYSINIT(mod_init_ ## initfn, \ -+ SI_SUB_KLD, SI_ORDER_FIRST, \ -+ module_init_exit_wrapper, initfn) -+ -+#define module_exit(exitfn) \ -+ SYSUNINIT(mod_exit_ ## exitfn, \ -+ SI_SUB_KLD, SI_ORDER_ANY, \ -+ module_init_exit_wrapper, exitfn) -+ -+/* -+ * The usb_register and usb_deregister functions are used to register -+ * usb drivers with the usb subsystem. -+ */ -+int usb_register(struct usb_driver *driver); -+int usb_deregister(struct usb_driver *driver); -+ -+/* -+ * usb_get_dev and usb_put_dev - increment/decrement the reference count -+ * of the usb device structure. -+ * -+ * Original body of usb_get_dev: -+ * -+ * if (dev) -+ * get_device(&dev->dev); -+ * return dev; -+ * -+ * Reference counts are not currently used in this compatibility -+ * layer. So these functions will do nothing. -+ */ -+static inline struct usb_device * -+usb_get_dev(struct usb_device *dev) -+{ -+ return dev; -+} -+ -+static inline void -+usb_put_dev(struct usb_device *dev) -+{ -+ return; -+} -+ -+ -+// rtw_usb_compat_linux -+int rtw_usb_submit_urb(struct urb *urb, uint16_t mem_flags); -+int rtw_usb_unlink_urb(struct urb *urb); -+int rtw_usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe); -+int rtw_usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *uhe, -+ uint8_t request, uint8_t requesttype, -+ uint16_t value, uint16_t index, void *data, -+ uint16_t size, usb_timeout_t timeout); -+int rtw_usb_set_interface(struct usb_device *dev, uint8_t iface_no, uint8_t alt_index); -+int rtw_usb_setup_endpoint(struct usb_device *dev, -+ struct usb_host_endpoint *uhe, usb_size_t bufsize); -+struct urb *rtw_usb_alloc_urb(uint16_t iso_packets, uint16_t mem_flags); -+struct usb_host_endpoint *rtw_usb_find_host_endpoint(struct usb_device *dev, uint8_t type, uint8_t ep); -+struct usb_host_interface *rtw_usb_altnum_to_altsetting(const struct usb_interface *intf, uint8_t alt_index); -+struct usb_interface *rtw_usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no); -+void *rtw_usb_buffer_alloc(struct usb_device *dev, usb_size_t size, uint8_t *dma_addr); -+void *rtw_usbd_get_intfdata(struct usb_interface *intf); -+void rtw_usb_linux_register(void *arg); -+void rtw_usb_linux_deregister(void *arg); -+void rtw_usb_linux_free_device(struct usb_device *dev); -+void rtw_usb_buffer_free(struct usb_device *dev, usb_size_t size, -+ void *addr, uint8_t dma_addr); -+void rtw_usb_free_urb(struct urb *urb); -+void rtw_usb_init_urb(struct urb *urb); -+void rtw_usb_kill_urb(struct urb *urb); -+void rtw_usb_set_intfdata(struct usb_interface *intf, void *data); -+void rtw_usb_fill_bulk_urb(struct urb *urb, struct usb_device *udev, -+ struct usb_host_endpoint *uhe, void *buf, -+ int length, usb_complete_t callback, void *arg); -+int rtw_usb_bulk_msg(struct usb_device *udev, struct usb_host_endpoint *uhe, -+ void *data, int len, uint16_t *pactlen, usb_timeout_t timeout); -+void *usb_get_intfdata(struct usb_interface *intf); -+int usb_linux_init_endpoints(struct usb_device *udev); -+ -+ -+ -+typedef struct urb * PURB; -+ -+typedef unsigned gfp_t; -+#define __GFP_WAIT ((gfp_t)0x10u) /* Can wait and reschedule? */ -+#define __GFP_HIGH ((gfp_t)0x20u) /* Should access emergency pools? */ -+#define __GFP_IO ((gfp_t)0x40u) /* Can start physical IO? */ -+#define __GFP_FS ((gfp_t)0x80u) /* Can call down to low-level FS? */ -+#define __GFP_COLD ((gfp_t)0x100u) /* Cache-cold page required */ -+#define __GFP_NOWARN ((gfp_t)0x200u) /* Suppress page allocation failure warning */ -+#define __GFP_REPEAT ((gfp_t)0x400u) /* Retry the allocation. Might fail */ -+#define __GFP_NOFAIL ((gfp_t)0x800u) /* Retry for ever. Cannot fail */ -+#define __GFP_NORETRY ((gfp_t)0x1000u)/* Do not retry. Might fail */ -+#define __GFP_NO_GROW ((gfp_t)0x2000u)/* Slab internal usage */ -+#define __GFP_COMP ((gfp_t)0x4000u)/* Add compound page metadata */ -+#define __GFP_ZERO ((gfp_t)0x8000u)/* Return zeroed page on success */ -+#define __GFP_NOMEMALLOC ((gfp_t)0x10000u) /* Don't use emergency reserves */ -+#define __GFP_HARDWALL ((gfp_t)0x20000u) /* Enforce hardwall cpuset memory allocs */ -+ -+/* This equals 0, but use constants in case they ever change */ -+#define GFP_NOWAIT (GFP_ATOMIC & ~__GFP_HIGH) -+/* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */ -+#define GFP_ATOMIC (__GFP_HIGH) -+#define GFP_NOIO (__GFP_WAIT) -+#define GFP_NOFS (__GFP_WAIT | __GFP_IO) -+#define GFP_KERNEL (__GFP_WAIT | __GFP_IO | __GFP_FS) -+#define GFP_USER (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL) -+#define GFP_HIGHUSER (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL | \ -+ __GFP_HIGHMEM) -+ -+ -+#endif // kenny add Linux compatibility code for Linux USB -+ -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -+#endif -+ -+__inline static _list *get_next(_list *list) -+{ -+ return list->next; -+} -+ -+__inline static _list *get_list_head(_queue *queue) -+{ -+ return (&(queue->queue)); -+} -+ -+ -+#define LIST_CONTAINOR(ptr, type, member) \ -+ ((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member))) -+ -+ -+__inline static void _enter_critical(_lock *plock, _irqL *pirqL) -+{ -+ spin_lock_irqsave(plock, *pirqL); -+} -+ -+__inline static void _exit_critical(_lock *plock, _irqL *pirqL) -+{ -+ spin_unlock_irqrestore(plock, *pirqL); -+} -+ -+__inline static void _enter_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ spin_lock_irqsave(plock, *pirqL); -+} -+ -+__inline static void _exit_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ spin_unlock_irqrestore(plock, *pirqL); -+} -+ -+__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL) -+{ -+ spin_lock_bh(plock, *pirqL); -+} -+ -+__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL) -+{ -+ spin_unlock_bh(plock, *pirqL); -+} -+ -+__inline static void _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL) -+{ -+ -+ mtx_lock(pmutex); -+ -+} -+ -+ -+__inline static void _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL) -+{ -+ -+ mtx_unlock(pmutex); -+ -+} -+static inline void __list_del(struct list_head * prev, struct list_head * next) -+{ -+ next->prev = prev; -+ prev->next = next; -+} -+static inline void INIT_LIST_HEAD(struct list_head *list) -+{ -+ list->next = list; -+ list->prev = list; -+} -+__inline static void rtw_list_delete(_list *plist) -+{ -+ __list_del(plist->prev, plist->next); -+ INIT_LIST_HEAD(plist); -+} -+ -+__inline static void _init_timer(_timer *ptimer,_nic_hdl padapter,void *pfunc,void* cntx) -+{ -+ ptimer->function = pfunc; -+ ptimer->arg = cntx; -+ callout_init(&ptimer->callout, CALLOUT_MPSAFE); -+} -+ -+__inline static void _set_timer(_timer *ptimer,u32 delay_time) -+{ -+ // mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); -+ if(ptimer->function && ptimer->arg){ -+ rtw_mtx_lock(NULL); -+ callout_reset(&ptimer->callout, delay_time,ptimer->function, ptimer->arg); -+ rtw_mtx_unlock(NULL); -+ } -+} -+ -+__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) -+{ -+ // del_timer_sync(ptimer); -+ // *bcancelled= _TRUE;//TRUE ==1; FALSE==0 -+ rtw_mtx_lock(NULL); -+ callout_drain(&ptimer->callout); -+ rtw_mtx_unlock(NULL); -+} -+ -+__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) -+{ -+ printf("%s Not implement yet! \n",__FUNCTION__); -+} -+ -+__inline static void _set_workitem(_workitem *pwork) -+{ -+ printf("%s Not implement yet! \n",__FUNCTION__); -+// schedule_work(pwork); -+} -+ -+// -+// Global Mutex: can only be used at PASSIVE level. -+// -+ -+#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+} -+ -+#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+} -+ -+#define ATOMIC_INIT(i) { (i) } -+ -+#endif //PLATFORM_FREEBSD -+ -+ -+#ifdef PLATFORM_LINUX -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,5)) -+ #include -+#endif -+ //#include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+ #include -+#else -+ #include -+#endif -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include // Necessary because we use the proc fs -+ #include // for struct tasklet_struct -+ #include -+ #include -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+// #include -+ #include -+ #include -+#endif //CONFIG_IOCTL_CFG80211 -+ -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ #include -+ #include -+#endif -+ -+#ifdef CONFIG_USB_HCI -+ #include -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) -+ #include -+#else -+ #include -+#endif -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ #include -+#endif -+ -+ -+#ifdef CONFIG_USB_HCI -+ typedef struct urb * PURB; -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22)) -+#ifdef CONFIG_USB_SUSPEND -+#define CONFIG_AUTOSUSPEND 1 -+#endif -+#endif -+#endif -+ -+ typedef struct semaphore _sema; -+ typedef spinlock_t _lock; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ typedef struct mutex _mutex; -+#else -+ typedef struct semaphore _mutex; -+#endif -+ typedef struct timer_list _timer; -+ -+ struct __queue { -+ struct list_head queue; -+ _lock lock; -+ }; -+ -+ typedef struct sk_buff _pkt; -+ typedef unsigned char _buffer; -+ -+ typedef struct __queue _queue; -+ typedef struct list_head _list; -+ typedef int _OS_STATUS; -+ //typedef u32 _irqL; -+ typedef unsigned long _irqL; -+ typedef struct net_device * _nic_hdl; -+ -+ typedef void* _thread_hdl_; -+ typedef int thread_return; -+ typedef void* thread_context; -+ -+ #define thread_exit() complete_and_exit(NULL, 0) -+ -+ typedef void timer_hdl_return; -+ typedef void* timer_hdl_context; -+ typedef struct work_struct _workitem; -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) -+// Porting from linux kernel, for compatible with old kernel. -+static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb) -+{ -+ return skb->tail; -+} -+ -+static inline void skb_reset_tail_pointer(struct sk_buff *skb) -+{ -+ skb->tail = skb->data; -+} -+ -+static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset) -+{ -+ skb->tail = skb->data + offset; -+} -+ -+static inline unsigned char *skb_end_pointer(const struct sk_buff *skb) -+{ -+ return skb->end; -+} -+#endif -+ -+__inline static _list *get_next(_list *list) -+{ -+ return list->next; -+} -+ -+__inline static _list *get_list_head(_queue *queue) -+{ -+ return (&(queue->queue)); -+} -+ -+ -+#define LIST_CONTAINOR(ptr, type, member) \ -+ ((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member))) -+ -+ -+__inline static void _enter_critical(_lock *plock, _irqL *pirqL) -+{ -+ spin_lock_irqsave(plock, *pirqL); -+} -+ -+__inline static void _exit_critical(_lock *plock, _irqL *pirqL) -+{ -+ spin_unlock_irqrestore(plock, *pirqL); -+} -+ -+__inline static void _enter_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ spin_lock_irqsave(plock, *pirqL); -+} -+ -+__inline static void _exit_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ spin_unlock_irqrestore(plock, *pirqL); -+} -+ -+__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL) -+{ -+ spin_lock_bh(plock); -+} -+ -+__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL) -+{ -+ spin_unlock_bh(plock); -+} -+ -+__inline static void _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL) -+{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ mutex_lock(pmutex); -+#else -+ down(pmutex); -+#endif -+} -+ -+ -+__inline static void _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL) -+{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ mutex_unlock(pmutex); -+#else -+ up(pmutex); -+#endif -+} -+ -+__inline static void rtw_list_delete(_list *plist) -+{ -+ list_del_init(plist); -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx) -+{ -+ //setup_timer(ptimer, pfunc,(u32)cntx); -+ ptimer->function = pfunc; -+ ptimer->data = (unsigned long)cntx; -+ init_timer(ptimer); -+} -+#endif -+ -+__inline static void _set_timer(_timer *ptimer,u32 delay_time) -+{ -+ mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); -+} -+ -+__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) -+{ -+ del_timer_sync(ptimer); -+ *bcancelled= _TRUE;//TRUE ==1; FALSE==0 -+} -+ -+#ifdef PLATFORM_LINUX -+#define RTW_TIMER_HDL_ARGS void *FunctionContext -+#elif defined(PLATFORM_OS_CE) || defined(PLATFORM_WINDOWS) -+#define RTW_TIMER_HDL_ARGS IN PVOID SystemSpecific1, IN PVOID FunctionContext, IN PVOID SystemSpecific2, IN PVOID SystemSpecific3 -+#endif -+ -+#define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl -+#define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS) -+ -+ -+__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) -+{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) -+ INIT_WORK(pwork, pfunc); -+#else -+ INIT_WORK(pwork, pfunc,pwork); -+#endif -+} -+ -+__inline static void _set_workitem(_workitem *pwork) -+{ -+ schedule_work(pwork); -+} -+ -+__inline static void _cancel_workitem_sync(_workitem *pwork) -+{ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22)) -+ cancel_work_sync(pwork); -+#else -+ flush_scheduled_work(); -+#endif -+} -+ -+// -+// Global Mutex: can only be used at PASSIVE level. -+// -+ -+#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+ while (atomic_inc_return((atomic_t *)&(_MutexCounter)) != 1)\ -+ { \ -+ atomic_dec((atomic_t *)&(_MutexCounter)); \ -+ msleep(10); \ -+ } \ -+} -+ -+#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+ atomic_dec((atomic_t *)&(_MutexCounter)); \ -+} -+ -+static inline int rtw_netif_queue_stopped(struct net_device *pnetdev) -+{ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ return (netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) && -+ netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 1)) && -+ netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 2)) && -+ netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 3)) ); -+#else -+ return netif_queue_stopped(pnetdev); -+#endif -+} -+ -+static inline void rtw_netif_wake_queue(struct net_device *pnetdev) -+{ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ netif_tx_wake_all_queues(pnetdev); -+#else -+ netif_wake_queue(pnetdev); -+#endif -+} -+ -+static inline void rtw_netif_start_queue(struct net_device *pnetdev) -+{ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ netif_tx_start_all_queues(pnetdev); -+#else -+ netif_start_queue(pnetdev); -+#endif -+} -+ -+static inline void rtw_netif_stop_queue(struct net_device *pnetdev) -+{ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ netif_tx_stop_all_queues(pnetdev); -+#else -+ netif_stop_queue(pnetdev); -+#endif -+} -+ -+#endif // PLATFORM_LINUX -+ -+ -+#ifdef PLATFORM_OS_XP -+ -+ #include -+ #include -+ #include -+ #include -+ -+#ifdef CONFIG_USB_HCI -+ #include -+ #include -+ #include -+#endif -+ -+ typedef KSEMAPHORE _sema; -+ typedef LIST_ENTRY _list; -+ typedef NDIS_STATUS _OS_STATUS; -+ -+ -+ typedef NDIS_SPIN_LOCK _lock; -+ -+ typedef KMUTEX _mutex; -+ -+ typedef KIRQL _irqL; -+ -+ // USB_PIPE for WINCE , but handle can be use just integer under windows -+ typedef NDIS_HANDLE _nic_hdl; -+ -+ -+ typedef NDIS_MINIPORT_TIMER _timer; -+ -+ struct __queue { -+ LIST_ENTRY queue; -+ _lock lock; -+ }; -+ -+ typedef NDIS_PACKET _pkt; -+ typedef NDIS_BUFFER _buffer; -+ typedef struct __queue _queue; -+ -+ typedef PKTHREAD _thread_hdl_; -+ typedef void thread_return; -+ typedef void* thread_context; -+ -+ typedef NDIS_WORK_ITEM _workitem; -+ -+ #define thread_exit() PsTerminateSystemThread(STATUS_SUCCESS); -+ -+ #define HZ 10000000 -+ #define SEMA_UPBND (0x7FFFFFFF) //8192 -+ -+__inline static _list *get_next(_list *list) -+{ -+ return list->Flink; -+} -+ -+__inline static _list *get_list_head(_queue *queue) -+{ -+ return (&(queue->queue)); -+} -+ -+ -+#define LIST_CONTAINOR(ptr, type, member) CONTAINING_RECORD(ptr, type, member) -+ -+ -+__inline static _enter_critical(_lock *plock, _irqL *pirqL) -+{ -+ NdisAcquireSpinLock(plock); -+} -+ -+__inline static _exit_critical(_lock *plock, _irqL *pirqL) -+{ -+ NdisReleaseSpinLock(plock); -+} -+ -+ -+__inline static _enter_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ NdisDprAcquireSpinLock(plock); -+} -+ -+__inline static _exit_critical_ex(_lock *plock, _irqL *pirqL) -+{ -+ NdisDprReleaseSpinLock(plock); -+} -+ -+__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL) -+{ -+ NdisDprAcquireSpinLock(plock); -+} -+ -+__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL) -+{ -+ NdisDprReleaseSpinLock(plock); -+} -+ -+__inline static _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL) -+{ -+ KeWaitForSingleObject(pmutex, Executive, KernelMode, FALSE, NULL); -+} -+ -+ -+__inline static _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL) -+{ -+ KeReleaseMutex(pmutex, FALSE); -+} -+ -+ -+__inline static void rtw_list_delete(_list *plist) -+{ -+ RemoveEntryList(plist); -+ InitializeListHead(plist); -+} -+ -+__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,PVOID cntx) -+{ -+ NdisMInitializeTimer(ptimer, nic_hdl, pfunc, cntx); -+} -+ -+__inline static void _set_timer(_timer *ptimer,u32 delay_time) -+{ -+ NdisMSetTimer(ptimer,delay_time); -+} -+ -+__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) -+{ -+ NdisMCancelTimer(ptimer,bcancelled); -+} -+ -+__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) -+{ -+ -+ NdisInitializeWorkItem(pwork, pfunc, cntx); -+} -+ -+__inline static void _set_workitem(_workitem *pwork) -+{ -+ NdisScheduleWorkItem(pwork); -+} -+ -+ -+#define ATOMIC_INIT(i) { (i) } -+ -+// -+// Global Mutex: can only be used at PASSIVE level. -+// -+ -+#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+ while (NdisInterlockedIncrement((PULONG)&(_MutexCounter)) != 1)\ -+ { \ -+ NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \ -+ NdisMSleep(10000); \ -+ } \ -+} -+ -+#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \ -+{ \ -+ NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \ -+} -+ -+#endif // PLATFORM_OS_XP -+ -+ -+#ifdef PLATFORM_OS_CE -+#include -+#endif -+ -+#include -+ -+#ifndef BIT -+ #define BIT(x) ( 1 << (x)) -+#endif -+ -+extern int RTW_STATUS_CODE(int error_code); -+ -+#define CONFIG_USE_VMALLOC -+ -+/* flags used for rtw_mstat_update() */ -+enum mstat_f { -+ /* type: 0x00ff */ -+ MSTAT_TYPE_VIR = 0x00, -+ MSTAT_TYPE_PHY= 0x01, -+ MSTAT_TYPE_SKB = 0x02, -+ MSTAT_TYPE_USB = 0x03, -+ MSTAT_TYPE_MAX = 0x04, -+ -+ /* func: 0xff00 */ -+ MSTAT_FUNC_UNSPECIFIED = 0x00<<8, -+ MSTAT_FUNC_IO = 0x01<<8, -+ MSTAT_FUNC_TX_IO = 0x02<<8, -+ MSTAT_FUNC_RX_IO = 0x03<<8, -+ MSTAT_FUNC_TX = 0x04<<8, -+ MSTAT_FUNC_RX = 0x05<<8, -+ MSTAT_FUNC_MAX = 0x06<<8, -+}; -+ -+#define mstat_tf_idx(flags) ((flags)&0xff) -+#define mstat_ff_idx(flags) (((flags)&0xff00) >> 8) -+ -+typedef enum mstat_status{ -+ MSTAT_ALLOC_SUCCESS = 0, -+ MSTAT_ALLOC_FAIL, -+ MSTAT_FREE -+} MSTAT_STATUS; -+ -+#ifdef DBG_MEM_ALLOC -+void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 sz); -+int _rtw_mstat_dump(char *buf, int len); -+void rtw_mstat_dump (void); -+u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line); -+u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line); -+void dbg_rtw_vmfree(u8 *pbuf, const enum mstat_f flags, u32 sz, const char *func, const int line); -+u8* dbg_rtw_malloc(u32 sz, const enum mstat_f flags, const char *func, const int line); -+u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line); -+void dbg_rtw_mfree(u8 *pbuf, const enum mstat_f flags, u32 sz, const char *func, const int line); -+ -+struct sk_buff * dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f flags, const char *func, const int line); -+void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line); -+struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line); -+struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line); -+int dbg_rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line); -+void dbg_rtw_skb_queue_purge(struct sk_buff_head *list, enum mstat_f flags, const char *func, int line); -+ -+#ifdef CONFIG_USB_HCI -+void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma, const enum mstat_f flags, const char *func, const int line); -+void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma, const enum mstat_f flags, const char *func, const int line); -+#endif /* CONFIG_USB_HCI */ -+ -+#ifdef CONFIG_USE_VMALLOC -+#define rtw_vmalloc(sz) dbg_rtw_vmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) -+#define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) -+#define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) -+#define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_vmalloc((sz), ((mstat_f)&0xff00)|MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) -+#define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zvmalloc((sz), ((mstat_f)&0xff00)|MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) -+#define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_vmfree((pbuf), (sz), ((mstat_f)&0xff00)|MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) -+#else /* CONFIG_USE_VMALLOC */ -+#define rtw_vmalloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f)&0xff00)|MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f)&0xff00)|MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f)&0xff00)|MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#endif /* CONFIG_USE_VMALLOC */ -+#define rtw_malloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_malloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f)&0xff00)|MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_zmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f)&0xff00)|MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+#define rtw_mfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f)&0xff00)|MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) -+ -+#define rtw_skb_alloc(size) dbg_rtw_skb_alloc((size), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_free(skb) dbg_rtw_skb_free((skb), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_alloc_f(size, mstat_f) dbg_rtw_skb_alloc((size), ((mstat_f)&0xff00)|MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_free_f(skb, mstat_f) dbg_rtw_skb_free((skb), ((mstat_f)&0xff00)|MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_copy(skb) dbg_rtw_skb_copy((skb), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_clone(skb) dbg_rtw_skb_clone((skb), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_copy_f(skb, mstat_f) dbg_rtw_skb_copy((skb), ((mstat_f)&0xff00)|MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_clone_f(skb, mstat_f) dbg_rtw_skb_clone((skb), ((mstat_f)&0xff00)|MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_netif_rx(ndev, skb) dbg_rtw_netif_rx(ndev, skb, MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#define rtw_skb_queue_purge(sk_buff_head) dbg_rtw_skb_queue_purge(sk_buff_head, MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) -+#ifdef CONFIG_USB_HCI -+#define rtw_usb_buffer_alloc(dev, size, dma) dbg_rtw_usb_buffer_alloc((dev), (size), (dma), MSTAT_TYPE_USB, __FUNCTION__, __LINE__) -+#define rtw_usb_buffer_free(dev, size, addr, dma) dbg_rtw_usb_buffer_free((dev), (size), (addr), (dma), MSTAT_TYPE_USB, __FUNCTION__, __LINE__) -+#define rtw_usb_buffer_alloc_f(dev, size, dma, mstat_f) dbg_rtw_usb_buffer_alloc((dev), (size), (dma), ((mstat_f)&0xff00)|MSTAT_TYPE_USB, __FUNCTION__, __LINE__) -+#define rtw_usb_buffer_free_f(dev, size, addr, dma, mstat_f) dbg_rtw_usb_buffer_free((dev), (size), (addr), (dma), ((mstat_f)&0xff00)|MSTAT_TYPE_USB, __FUNCTION__, __LINE__) -+#endif /* CONFIG_USB_HCI */ -+ -+#else /* DBG_MEM_ALLOC */ -+#define rtw_mstat_update(flag, status, sz) do {} while(0) -+#define rtw_mstat_dump() do {} while(0) -+u8* _rtw_vmalloc(u32 sz); -+u8* _rtw_zvmalloc(u32 sz); -+void _rtw_vmfree(u8 *pbuf, u32 sz); -+u8* _rtw_zmalloc(u32 sz); -+u8* _rtw_malloc(u32 sz); -+void _rtw_mfree(u8 *pbuf, u32 sz); -+ -+struct sk_buff *_rtw_skb_alloc(u32 sz); -+void _rtw_skb_free(struct sk_buff *skb); -+struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb); -+struct sk_buff *_rtw_skb_clone(struct sk_buff *skb); -+int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); -+void _rtw_skb_queue_purge(struct sk_buff_head *list); -+ -+#ifdef CONFIG_USB_HCI -+void *_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma); -+void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma); -+#endif /* CONFIG_USB_HCI */ -+ -+#ifdef CONFIG_USE_VMALLOC -+#define rtw_vmalloc(sz) _rtw_vmalloc((sz)) -+#define rtw_zvmalloc(sz) _rtw_zvmalloc((sz)) -+#define rtw_vmfree(pbuf, sz) _rtw_vmfree((pbuf), (sz)) -+#define rtw_vmalloc_f(sz, mstat_f) _rtw_vmalloc((sz)) -+#define rtw_zvmalloc_f(sz, mstat_f) _rtw_zvmalloc((sz)) -+#define rtw_vmfree_f(pbuf, sz, mstat_f) _rtw_vmfree((pbuf), (sz)) -+#else /* CONFIG_USE_VMALLOC */ -+#define rtw_vmalloc(sz) _rtw_malloc((sz)) -+#define rtw_zvmalloc(sz) _rtw_zmalloc((sz)) -+#define rtw_vmfree(pbuf, sz) _rtw_mfree((pbuf), (sz)) -+#define rtw_vmalloc_f(sz, mstat_f) _rtw_malloc((sz)) -+#define rtw_zvmalloc_f(sz, mstat_f) _rtw_zmalloc((sz)) -+#define rtw_vmfree_f(pbuf, sz, mstat_f) _rtw_mfree((pbuf), (sz)) -+#endif /* CONFIG_USE_VMALLOC */ -+#define rtw_malloc(sz) _rtw_malloc((sz)) -+#define rtw_zmalloc(sz) _rtw_zmalloc((sz)) -+#define rtw_mfree(pbuf, sz) _rtw_mfree((pbuf), (sz)) -+#define rtw_malloc_f(sz, mstat_f) _rtw_malloc((sz)) -+#define rtw_zmalloc_f(sz, mstat_f) _rtw_zmalloc((sz)) -+#define rtw_mfree_f(pbuf, sz, mstat_f) _rtw_mfree((pbuf), (sz)) -+ -+#define rtw_skb_alloc(size) _rtw_skb_alloc((size)) -+#define rtw_skb_free(skb) _rtw_skb_free((skb)) -+#define rtw_skb_alloc_f(size, mstat_f) _rtw_skb_alloc((size)) -+#define rtw_skb_free_f(skb, mstat_f) _rtw_skb_free((skb)) -+#define rtw_skb_copy(skb) _rtw_skb_copy((skb)) -+#define rtw_skb_clone(skb) _rtw_skb_clone((skb)) -+#define rtw_skb_copy_f(skb, mstat_f) _rtw_skb_copy((skb)) -+#define rtw_skb_clone_f(skb, mstat_f) _rtw_skb_clone((skb)) -+#define rtw_netif_rx(ndev, skb) _rtw_netif_rx(ndev, skb) -+#define rtw_skb_queue_purge(sk_buff_head) _rtw_skb_queue_purge(sk_buff_head) -+#ifdef CONFIG_USB_HCI -+#define rtw_usb_buffer_alloc(dev, size, dma) _rtw_usb_buffer_alloc((dev), (size), (dma)) -+#define rtw_usb_buffer_free(dev, size, addr, dma) _rtw_usb_buffer_free((dev), (size), (addr), (dma)) -+#define rtw_usb_buffer_alloc_f(dev, size, dma, mstat_f) _rtw_usb_buffer_alloc((dev), (size), (dma)) -+#define rtw_usb_buffer_free_f(dev, size, addr, dma, mstat_f) _rtw_usb_buffer_free((dev), (size), (addr), (dma)) -+#endif /* CONFIG_USB_HCI */ -+#endif /* DBG_MEM_ALLOC */ -+ -+extern void* rtw_malloc2d(int h, int w, int size); -+extern void rtw_mfree2d(void *pbuf, int h, int w, int size); -+ -+extern void _rtw_memcpy(void *dec, const void *sour, u32 sz); -+extern int _rtw_memcmp(const void *dst, const void *src, u32 sz); -+extern void _rtw_memset(void *pbuf, int c, u32 sz); -+ -+extern void _rtw_init_listhead(_list *list); -+extern u32 rtw_is_list_empty(_list *phead); -+extern void rtw_list_insert_head(_list *plist, _list *phead); -+extern void rtw_list_insert_tail(_list *plist, _list *phead); -+#ifndef PLATFORM_FREEBSD -+extern void rtw_list_delete(_list *plist); -+#endif //PLATFORM_FREEBSD -+ -+extern void _rtw_init_sema(_sema *sema, int init_val); -+extern void _rtw_free_sema(_sema *sema); -+extern void _rtw_up_sema(_sema *sema); -+extern u32 _rtw_down_sema(_sema *sema); -+extern void _rtw_mutex_init(_mutex *pmutex); -+extern void _rtw_mutex_free(_mutex *pmutex); -+#ifndef PLATFORM_FREEBSD -+extern void _rtw_spinlock_init(_lock *plock); -+#endif //PLATFORM_FREEBSD -+extern void _rtw_spinlock_free(_lock *plock); -+extern void _rtw_spinlock(_lock *plock); -+extern void _rtw_spinunlock(_lock *plock); -+extern void _rtw_spinlock_ex(_lock *plock); -+extern void _rtw_spinunlock_ex(_lock *plock); -+ -+extern void _rtw_init_queue(_queue *pqueue); -+extern u32 _rtw_queue_empty(_queue *pqueue); -+extern u32 rtw_end_of_queue_search(_list *queue, _list *pelement); -+ -+extern u32 rtw_get_current_time(void); -+extern u32 rtw_systime_to_ms(u32 systime); -+extern u32 rtw_ms_to_systime(u32 ms); -+extern s32 rtw_get_passing_time_ms(u32 start); -+extern s32 rtw_get_time_interval_ms(u32 start, u32 end); -+ -+extern void rtw_sleep_schedulable(int ms); -+ -+extern void rtw_msleep_os(int ms); -+extern void rtw_usleep_os(int us); -+ -+extern u32 rtw_atoi(u8* s); -+ -+#ifdef DBG_DELAY_OS -+#define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __FUNCTION__, __LINE__) -+#define rtw_udelay_os(ms) _rtw_udelay_os((ms), __FUNCTION__, __LINE__) -+extern void _rtw_mdelay_os(int ms, const char *func, const int line); -+extern void _rtw_udelay_os(int us, const char *func, const int line); -+#else -+extern void rtw_mdelay_os(int ms); -+extern void rtw_udelay_os(int us); -+#endif -+ -+extern void rtw_yield_os(void); -+ -+ -+__inline static unsigned char _cancel_timer_ex(_timer *ptimer) -+{ -+#ifdef PLATFORM_LINUX -+ return del_timer_sync(ptimer); -+#endif -+#ifdef PLATFORM_FREEBSD -+ _cancel_timer(ptimer,0); -+ return 0; -+#endif -+#ifdef PLATFORM_WINDOWS -+ u8 bcancelled; -+ -+ _cancel_timer(ptimer, &bcancelled); -+ -+ return bcancelled; -+#endif -+} -+ -+#ifdef PLATFORM_FREEBSD -+static __inline void thread_enter(void *context); -+#endif //PLATFORM_FREEBSD -+static __inline void thread_enter(char *name) -+{ -+#ifdef PLATFORM_LINUX -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)) -+ daemonize("%s", name); -+ #endif -+ allow_signal(SIGTERM); -+#endif -+#ifdef PLATFORM_FREEBSD -+ printf("%s", "RTKTHREAD_enter"); -+#endif -+} -+ -+#ifdef PLATFORM_FREEBSD -+#define thread_exit() do{printf("%s", "RTKTHREAD_exit");}while(0) -+#endif //PLATFORM_FREEBSD -+__inline static void flush_signals_thread(void) -+{ -+#ifdef PLATFORM_LINUX -+ if (signal_pending (current)) -+ { -+ flush_signals(current); -+ } -+#endif -+} -+ -+__inline static _OS_STATUS res_to_status(sint res) -+{ -+ -+ -+#if defined (PLATFORM_LINUX) || defined (PLATFORM_MPIXEL) || defined (PLATFORM_FREEBSD) -+ return res; -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+ if (res == _SUCCESS) -+ return NDIS_STATUS_SUCCESS; -+ else -+ return NDIS_STATUS_FAILURE; -+ -+#endif -+ -+} -+ -+__inline static void rtw_dump_stack(void) -+{ -+#ifdef PLATFORM_LINUX -+ dump_stack(); -+#endif -+} -+ -+#ifdef PLATFORM_LINUX -+#define rtw_warn_on(condition) WARN_ON(condition) -+#else -+#define rtw_warn_on(condition) do {} while (0) -+#endif -+ -+#define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) -+#define RND4(x) (((x >> 2) + (((x & 3) == 0) ? 0: 1)) << 2) -+ -+__inline static u32 _RND4(u32 sz) -+{ -+ -+ u32 val; -+ -+ val = ((sz >> 2) + ((sz & 3) ? 1: 0)) << 2; -+ -+ return val; -+ -+} -+ -+__inline static u32 _RND8(u32 sz) -+{ -+ -+ u32 val; -+ -+ val = ((sz >> 3) + ((sz & 7) ? 1: 0)) << 3; -+ -+ return val; -+ -+} -+ -+__inline static u32 _RND128(u32 sz) -+{ -+ -+ u32 val; -+ -+ val = ((sz >> 7) + ((sz & 127) ? 1: 0)) << 7; -+ -+ return val; -+ -+} -+ -+__inline static u32 _RND256(u32 sz) -+{ -+ -+ u32 val; -+ -+ val = ((sz >> 8) + ((sz & 255) ? 1: 0)) << 8; -+ -+ return val; -+ -+} -+ -+__inline static u32 _RND512(u32 sz) -+{ -+ -+ u32 val; -+ -+ val = ((sz >> 9) + ((sz & 511) ? 1: 0)) << 9; -+ -+ return val; -+ -+} -+ -+__inline static u32 bitshift(u32 bitmask) -+{ -+ u32 i; -+ -+ for (i = 0; i <= 31; i++) -+ if (((bitmask>>i) & 0x1) == 1) break; -+ -+ return i; -+} -+ -+#ifndef MAC_FMT -+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -+#endif -+#ifndef MAC_ARG -+#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] -+#endif -+ -+//#ifdef __GNUC__ -+#ifdef PLATFORM_LINUX -+#define STRUCT_PACKED __attribute__ ((packed)) -+#else -+#define STRUCT_PACKED -+#endif -+ -+ -+// limitation of path length -+#ifdef PLATFORM_LINUX -+ #define PATH_LENGTH_MAX PATH_MAX -+#elif defined(PLATFORM_WINDOWS) -+ #define PATH_LENGTH_MAX MAX_PATH -+#endif -+ -+ -+// Suspend lock prevent system from going suspend -+#ifdef CONFIG_WAKELOCK -+#include -+#elif defined(CONFIG_ANDROID_POWER) -+#include -+#endif -+ -+extern void rtw_suspend_lock_init(void); -+extern void rtw_suspend_lock_uninit(void); -+extern void rtw_lock_suspend(void); -+extern void rtw_unlock_suspend(void); -+extern void rtw_lock_suspend_timeout(u32 timeout_ms); -+ -+ -+//Atomic integer operations -+#ifdef PLATFORM_LINUX -+ #define ATOMIC_T atomic_t -+#elif defined(PLATFORM_WINDOWS) -+ #define ATOMIC_T LONG -+#elif defined(PLATFORM_FREEBSD) -+ typedef uint32_t ATOMIC_T ; -+#endif -+ -+extern void ATOMIC_SET(ATOMIC_T *v, int i); -+extern int ATOMIC_READ(ATOMIC_T *v); -+extern void ATOMIC_ADD(ATOMIC_T *v, int i); -+extern void ATOMIC_SUB(ATOMIC_T *v, int i); -+extern void ATOMIC_INC(ATOMIC_T *v); -+extern void ATOMIC_DEC(ATOMIC_T *v); -+extern int ATOMIC_ADD_RETURN(ATOMIC_T *v, int i); -+extern int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i); -+extern int ATOMIC_INC_RETURN(ATOMIC_T *v); -+extern int ATOMIC_DEC_RETURN(ATOMIC_T *v); -+ -+//File operation APIs, just for linux now -+extern int rtw_is_file_readable(char *path); -+extern int rtw_retrive_from_file(char *path, u8* buf, u32 sz); -+extern int rtw_store_to_file(char *path, u8* buf, u32 sz); -+ -+ -+#if 1 //#ifdef MEM_ALLOC_REFINE_ADAPTOR -+struct rtw_netdev_priv_indicator { -+ void *priv; -+ u32 sizeof_priv; -+}; -+struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_priv); -+extern struct net_device * rtw_alloc_etherdev(int sizeof_priv); -+ -+#ifndef PLATFORM_FREEBSD -+#define rtw_netdev_priv(netdev) ( ((struct rtw_netdev_priv_indicator *)netdev_priv(netdev))->priv ) -+#else //PLATFORM_FREEBSD -+#define rtw_netdev_priv(netdev) (((struct ifnet *)netdev)->if_softc) -+#endif //PLATFORM_FREEBSD -+ -+#ifndef PLATFORM_FREEBSD -+extern void rtw_free_netdev(struct net_device * netdev); -+#else //PLATFORM_FREEBSD -+#define rtw_free_netdev(netdev) if_free((netdev)) -+#endif //PLATFORM_FREEBSD -+ -+#else //MEM_ALLOC_REFINE_ADAPTOR -+ -+#define rtw_alloc_etherdev(sizeof_priv) alloc_etherdev((sizeof_priv)) -+ -+#ifndef PLATFORM_FREEBSD -+#define rtw_netdev_priv(netdev) netdev_priv((netdev)) -+#define rtw_free_netdev(netdev) free_netdev((netdev)) -+#else //PLATFORM_FREEBSD -+#define rtw_netdev_priv(netdev) (((struct ifnet *)netdev)->if_softc) -+#define rtw_free_netdev(netdev) if_free((netdev)) -+#endif //PLATFORM_FREEBSD -+#endif -+ -+#ifdef PLATFORM_LINUX -+#define NDEV_FMT "%s" -+#define NDEV_ARG(ndev) ndev->name -+#define ADPT_FMT "%s" -+#define ADPT_ARG(adapter) adapter->pnetdev->name -+#define FUNC_NDEV_FMT "%s(%s)" -+#define FUNC_NDEV_ARG(ndev) __func__, ndev->name -+#define FUNC_ADPT_FMT "%s(%s)" -+#define FUNC_ADPT_ARG(adapter) __func__, adapter->pnetdev->name -+#else -+#define NDEV_FMT "%s" -+#define NDEV_ARG(ndev) "" -+#define ADPT_FMT "%s" -+#define ADPT_ARG(adapter) "" -+#define FUNC_NDEV_FMT "%s" -+#define FUNC_NDEV_ARG(ndev) __func__ -+#define FUNC_ADPT_FMT "%s" -+#define FUNC_ADPT_ARG(adapter) __func__ -+#endif -+ -+#ifdef PLATFORM_LINUX -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) -+#define rtw_signal_process(pid, sig) kill_pid(find_vpid((pid)),(sig), 1) -+#else //(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) -+#define rtw_signal_process(pid, sig) kill_proc((pid), (sig), 1) -+#endif //(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) -+#endif //PLATFORM_LINUX -+ -+extern u64 rtw_modular64(u64 x, u64 y); -+extern u64 rtw_division64(u64 x, u64 y); -+ -+ -+/* Macros for handling unaligned memory accesses */ -+ -+#define RTW_GET_BE16(a) ((u16) (((a)[0] << 8) | (a)[1])) -+#define RTW_PUT_BE16(a, val) \ -+ do { \ -+ (a)[0] = ((u16) (val)) >> 8; \ -+ (a)[1] = ((u16) (val)) & 0xff; \ -+ } while (0) -+ -+#define RTW_GET_LE16(a) ((u16) (((a)[1] << 8) | (a)[0])) -+#define RTW_PUT_LE16(a, val) \ -+ do { \ -+ (a)[1] = ((u16) (val)) >> 8; \ -+ (a)[0] = ((u16) (val)) & 0xff; \ -+ } while (0) -+ -+#define RTW_GET_BE24(a) ((((u32) (a)[0]) << 16) | (((u32) (a)[1]) << 8) | \ -+ ((u32) (a)[2])) -+#define RTW_PUT_BE24(a, val) \ -+ do { \ -+ (a)[0] = (u8) ((((u32) (val)) >> 16) & 0xff); \ -+ (a)[1] = (u8) ((((u32) (val)) >> 8) & 0xff); \ -+ (a)[2] = (u8) (((u32) (val)) & 0xff); \ -+ } while (0) -+ -+#define RTW_GET_BE32(a) ((((u32) (a)[0]) << 24) | (((u32) (a)[1]) << 16) | \ -+ (((u32) (a)[2]) << 8) | ((u32) (a)[3])) -+#define RTW_PUT_BE32(a, val) \ -+ do { \ -+ (a)[0] = (u8) ((((u32) (val)) >> 24) & 0xff); \ -+ (a)[1] = (u8) ((((u32) (val)) >> 16) & 0xff); \ -+ (a)[2] = (u8) ((((u32) (val)) >> 8) & 0xff); \ -+ (a)[3] = (u8) (((u32) (val)) & 0xff); \ -+ } while (0) -+ -+#define RTW_GET_LE32(a) ((((u32) (a)[3]) << 24) | (((u32) (a)[2]) << 16) | \ -+ (((u32) (a)[1]) << 8) | ((u32) (a)[0])) -+#define RTW_PUT_LE32(a, val) \ -+ do { \ -+ (a)[3] = (u8) ((((u32) (val)) >> 24) & 0xff); \ -+ (a)[2] = (u8) ((((u32) (val)) >> 16) & 0xff); \ -+ (a)[1] = (u8) ((((u32) (val)) >> 8) & 0xff); \ -+ (a)[0] = (u8) (((u32) (val)) & 0xff); \ -+ } while (0) -+ -+#define RTW_GET_BE64(a) ((((u64) (a)[0]) << 56) | (((u64) (a)[1]) << 48) | \ -+ (((u64) (a)[2]) << 40) | (((u64) (a)[3]) << 32) | \ -+ (((u64) (a)[4]) << 24) | (((u64) (a)[5]) << 16) | \ -+ (((u64) (a)[6]) << 8) | ((u64) (a)[7])) -+#define RTW_PUT_BE64(a, val) \ -+ do { \ -+ (a)[0] = (u8) (((u64) (val)) >> 56); \ -+ (a)[1] = (u8) (((u64) (val)) >> 48); \ -+ (a)[2] = (u8) (((u64) (val)) >> 40); \ -+ (a)[3] = (u8) (((u64) (val)) >> 32); \ -+ (a)[4] = (u8) (((u64) (val)) >> 24); \ -+ (a)[5] = (u8) (((u64) (val)) >> 16); \ -+ (a)[6] = (u8) (((u64) (val)) >> 8); \ -+ (a)[7] = (u8) (((u64) (val)) & 0xff); \ -+ } while (0) -+ -+#define RTW_GET_LE64(a) ((((u64) (a)[7]) << 56) | (((u64) (a)[6]) << 48) | \ -+ (((u64) (a)[5]) << 40) | (((u64) (a)[4]) << 32) | \ -+ (((u64) (a)[3]) << 24) | (((u64) (a)[2]) << 16) | \ -+ (((u64) (a)[1]) << 8) | ((u64) (a)[0])) -+ -+void rtw_buf_free(u8 **buf, u32 *buf_len); -+void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len); -+ -+struct rtw_cbuf { -+ u32 write; -+ u32 read; -+ u32 size; -+ void *bufs[0]; -+}; -+ -+bool rtw_cbuf_full(struct rtw_cbuf *cbuf); -+bool rtw_cbuf_empty(struct rtw_cbuf *cbuf); -+bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf); -+void *rtw_cbuf_pop(struct rtw_cbuf *cbuf); -+struct rtw_cbuf *rtw_cbuf_alloc(u32 size); -+void rtw_cbuf_free(struct rtw_cbuf *cbuf); -+ -+#endif -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h -@@ -0,0 +1,168 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __PCI_HAL_H__ -+#define __PCI_HAL_H__ -+ -+ -+#define INTEL_VENDOR_ID 0x8086 -+#define SIS_VENDOR_ID 0x1039 -+#define ATI_VENDOR_ID 0x1002 -+#define ATI_DEVICE_ID 0x7914 -+#define AMD_VENDOR_ID 0x1022 -+ -+#define PCI_MAX_BRIDGE_NUMBER 255 -+#define PCI_MAX_DEVICES 32 -+#define PCI_MAX_FUNCTION 8 -+ -+#define PCI_CONF_ADDRESS 0x0CF8 // PCI Configuration Space Address -+#define PCI_CONF_DATA 0x0CFC // PCI Configuration Space Data -+ -+#define PCI_CLASS_BRIDGE_DEV 0x06 -+#define PCI_SUBCLASS_BR_PCI_TO_PCI 0x04 -+ -+#define PCI_CAPABILITY_ID_PCI_EXPRESS 0x10 -+ -+#define U1DONTCARE 0xFF -+#define U2DONTCARE 0xFFFF -+#define U4DONTCARE 0xFFFFFFFF -+ -+#define PCI_VENDER_ID_REALTEK 0x10ec -+ -+#define HAL_HW_PCI_8180_DEVICE_ID 0x8180 -+#define HAL_HW_PCI_8185_DEVICE_ID 0x8185 //8185 or 8185b -+#define HAL_HW_PCI_8188_DEVICE_ID 0x8188 //8185b -+#define HAL_HW_PCI_8198_DEVICE_ID 0x8198 //8185b -+#define HAL_HW_PCI_8190_DEVICE_ID 0x8190 //8190 -+#define HAL_HW_PCI_8723E_DEVICE_ID 0x8723 //8723E -+#define HAL_HW_PCI_8192_DEVICE_ID 0x8192 //8192 PCI-E -+#define HAL_HW_PCI_8192SE_DEVICE_ID 0x8192 //8192 SE -+#define HAL_HW_PCI_8174_DEVICE_ID 0x8174 //8192 SE -+#define HAL_HW_PCI_8173_DEVICE_ID 0x8173 //8191 SE Crab -+#define HAL_HW_PCI_8172_DEVICE_ID 0x8172 //8191 SE RE -+#define HAL_HW_PCI_8171_DEVICE_ID 0x8171 //8191 SE Unicron -+#define HAL_HW_PCI_0045_DEVICE_ID 0x0045 //8190 PCI for Ceraga -+#define HAL_HW_PCI_0046_DEVICE_ID 0x0046 //8190 Cardbus for Ceraga -+#define HAL_HW_PCI_0044_DEVICE_ID 0x0044 //8192e PCIE for Ceraga -+#define HAL_HW_PCI_0047_DEVICE_ID 0x0047 //8192e Express Card for Ceraga -+#define HAL_HW_PCI_700F_DEVICE_ID 0x700F -+#define HAL_HW_PCI_701F_DEVICE_ID 0x701F -+#define HAL_HW_PCI_DLINK_DEVICE_ID 0x3304 -+#define HAL_HW_PCI_8192CET_DEVICE_ID 0x8191 //8192ce -+#define HAL_HW_PCI_8192CE_DEVICE_ID 0x8178 //8192ce -+#define HAL_HW_PCI_8191CE_DEVICE_ID 0x8177 //8192ce -+#define HAL_HW_PCI_8188CE_DEVICE_ID 0x8176 //8192ce -+#define HAL_HW_PCI_8192CU_DEVICE_ID 0x8191 //8192ce -+#define HAL_HW_PCI_8192DE_DEVICE_ID 0x8193 //8192de -+#define HAL_HW_PCI_002B_DEVICE_ID 0x002B //8192de, provided by HW SD -+ -+#define HAL_MEMORY_MAPPED_IO_RANGE_8190PCI 0x1000 //8190 support 16 pages of IO registers -+#define HAL_HW_PCI_REVISION_ID_8190PCI 0x00 -+#define HAL_MEMORY_MAPPED_IO_RANGE_8192PCIE 0x4000 //8192 support 16 pages of IO registers -+#define HAL_HW_PCI_REVISION_ID_8192PCIE 0x01 -+#define HAL_MEMORY_MAPPED_IO_RANGE_8192SE 0x4000 //8192 support 16 pages of IO registers -+#define HAL_HW_PCI_REVISION_ID_8192SE 0x10 -+#define HAL_HW_PCI_REVISION_ID_8192CE 0x1 -+#define HAL_MEMORY_MAPPED_IO_RANGE_8192CE 0x4000 //8192 support 16 pages of IO registers -+#define HAL_HW_PCI_REVISION_ID_8192DE 0x0 -+#define HAL_MEMORY_MAPPED_IO_RANGE_8192DE 0x4000 //8192 support 16 pages of IO registers -+ -+enum pci_bridge_vendor { -+ PCI_BRIDGE_VENDOR_INTEL = 0x0,//0b'0000,0001 -+ PCI_BRIDGE_VENDOR_ATI, //= 0x02,//0b'0000,0010 -+ PCI_BRIDGE_VENDOR_AMD, //= 0x04,//0b'0000,0100 -+ PCI_BRIDGE_VENDOR_SIS ,//= 0x08,//0b'0000,1000 -+ PCI_BRIDGE_VENDOR_UNKNOWN, //= 0x40,//0b'0100,0000 -+ PCI_BRIDGE_VENDOR_MAX ,//= 0x80 -+} ; -+ -+struct rt_pci_capabilities_header { -+ u8 capability_id; -+ u8 next; -+}; -+ -+struct pci_priv{ -+ u8 linkctrl_reg; -+ -+ u8 busnumber; -+ u8 devnumber; -+ u8 funcnumber; -+ -+ u8 pcibridge_busnum; -+ u8 pcibridge_devnum; -+ u8 pcibridge_funcnum; -+ u8 pcibridge_vendor; -+ u16 pcibridge_vendorid; -+ u16 pcibridge_deviceid; -+ u8 pcibridge_pciehdr_offset; -+ u8 pcibridge_linkctrlreg; -+ -+ u8 amd_l1_patch; -+}; -+ -+typedef struct _RT_ISR_CONTENT -+{ -+ union{ -+ u32 IntArray[2]; -+ u32 IntReg4Byte; -+ u16 IntReg2Byte; -+ }; -+}RT_ISR_CONTENT, *PRT_ISR_CONTENT; -+ -+//#define RegAddr(addr) (addr + 0xB2000000UL) -+//some platform macros will def here -+static inline void NdisRawWritePortUlong(u32 port, u32 val) -+{ -+ outl(val, port); -+ //writel(val, (u8 *)RegAddr(port)); -+} -+ -+static inline void NdisRawWritePortUchar(u32 port, u8 val) -+{ -+ outb(val, port); -+ //writeb(val, (u8 *)RegAddr(port)); -+} -+ -+static inline void NdisRawReadPortUchar(u32 port, u8 *pval) -+{ -+ *pval = inb(port); -+ //*pval = readb((u8 *)RegAddr(port)); -+} -+ -+static inline void NdisRawReadPortUshort(u32 port, u16 *pval) -+{ -+ *pval = inw(port); -+ //*pval = readw((u8 *)RegAddr(port)); -+} -+ -+static inline void NdisRawReadPortUlong(u32 port, u32 *pval) -+{ -+ *pval = inl(port); -+ //*pval = readl((u8 *)RegAddr(port)); -+} -+ -+#ifdef CONFIG_RTL8192C -+void rtl8192ce_set_hal_ops(_adapter * padapter); -+#endif -+#ifdef CONFIG_RTL8192D -+void rtl8192de_set_hal_ops(_adapter * padapter); -+#endif -+ -+#endif //__PCIE_HAL_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h -@@ -0,0 +1,60 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __PCI_OPS_H_ -+#define __PCI_OPS_H_ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_RTL8192C -+u32 rtl8192ce_init_desc_ring(_adapter * padapter); -+u32 rtl8192ce_free_desc_ring(_adapter * padapter); -+void rtl8192ce_reset_desc_ring(_adapter * padapter); -+#ifdef CONFIG_64BIT_DMA -+u8 PlatformEnable92CEDMA64(PADAPTER Adapter); -+#endif -+int rtl8192ce_interrupt(PADAPTER Adapter); -+void rtl8192ce_xmit_tasklet(void *priv); -+void rtl8192ce_recv_tasklet(void *priv); -+void rtl8192ce_prepare_bcn_tasklet(void *priv); -+void rtl8192ce_set_intf_ops(struct _io_ops *pops); -+#define pci_set_intf_ops rtl8192ce_set_intf_ops -+#endif -+ -+#ifdef CONFIG_RTL8192D -+u32 rtl8192de_init_desc_ring(_adapter * padapter); -+u32 rtl8192de_free_desc_ring(_adapter * padapter); -+void rtl8192de_reset_desc_ring(_adapter * padapter); -+#ifdef CONFIG_64BIT_DMA -+u8 PlatformEnable92DEDMA64(PADAPTER Adapter); -+#endif -+int rtl8192de_interrupt(PADAPTER Adapter); -+void rtl8192de_xmit_tasklet(void *priv); -+void rtl8192de_recv_tasklet(void *priv); -+void rtl8192de_prepare_bcn_tasklet(void *priv); -+void rtl8192de_set_intf_ops(struct _io_ops *pops); -+#define pci_set_intf_ops rtl8192de_set_intf_ops -+u32 MpReadPCIDwordDBI8192D(IN PADAPTER Adapter, IN u16 Offset, IN u8 Direct); -+void MpWritePCIDwordDBI8192D(IN PADAPTER Adapter, IN u16 Offset, IN u32 Value, IN u8 Direct); -+#endif -+ -+#endif ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h -@@ -0,0 +1,33 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __PCI_OSINTF_H -+#define __PCI_OSINTF_H -+ -+#include -+#include -+#include -+ -+ -+void rtw_pci_disable_aspm(_adapter *padapter); -+void rtw_pci_enable_aspm(_adapter *padapter); -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h -@@ -0,0 +1,58 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RECV_OSDEP_H_ -+#define __RECV_OSDEP_H_ -+ -+#include -+#include -+#include -+ -+ -+extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter); -+extern void _rtw_free_recv_priv (struct recv_priv *precvpriv); -+ -+ -+extern s32 rtw_recv_entry(union recv_frame *precv_frame); -+extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame); -+extern void rtw_recv_returnpacket(IN _nic_hdl cnxt, IN _pkt *preturnedpkt); -+ -+extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame); -+extern void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup); -+ -+ -+int rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter); -+void rtw_free_recv_priv (struct recv_priv *precvpriv); -+ -+ -+int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter); -+int rtw_os_recv_resource_alloc(_adapter *padapter, union recv_frame *precvframe); -+void rtw_os_recv_resource_free(struct recv_priv *precvpriv); -+ -+ -+int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf); -+int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf); -+ -+void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf); -+ -+void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); -+ -+ -+#endif // -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h -@@ -0,0 +1,153 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192C_CMD_H_ -+#define __RTL8192C_CMD_H_ -+ -+ -+enum cmd_msg_element_id -+{ -+ NONE_CMDMSG_EID, -+ AP_OFFLOAD_EID=0, -+ SET_PWRMODE_EID=1, -+ JOINBSS_RPT_EID=2, -+ RSVD_PAGE_EID=3, -+ RSSI_4_EID = 4, -+ RSSI_SETTING_EID=5, -+ MACID_CONFIG_EID=6, -+ MACID_PS_MODE_EID=7, -+ P2P_PS_OFFLOAD_EID=8, -+ SELECTIVE_SUSPEND_ROF_CMD=9, -+#ifdef CONFIG_WOWLAN -+ H2C_WO_WLAN_CMD = 26, // Wake on Wlan. -+ EXT_MACID_PERIOD_EID = 27, // support macid to 64 -+ MACID64_CONFIG_EID = 28, // support macid to 64 -+#endif // CONFIG_WOWLAN -+ P2P_PS_CTW_CMD_EID=32, -+ H2C_92C_IO_OFFLOAD=44, -+#ifdef CONFIG_WOWLAN -+ KEEP_ALIVE_CONTROL_CMD=48, -+ DISCONNECT_DECISION_CTRL_CMD=49, -+ REMOTE_WAKE_CTRL_CMD=60, -+#endif // CONFIG_WOWLAN -+ H2C_92C_TSF_SYNC=67, -+ H2C_92C_DISABLE_BCN_FUNC=68, -+ H2C_92C_RESET_TSF = 75, -+ H2C_92C_CMD_MAX -+}; -+ -+struct cmd_msg_parm { -+ u8 eid; //element id -+ u8 sz; // sz -+ u8 buf[6]; -+}; -+ -+typedef struct _SETPWRMODE_PARM{ -+ u8 Mode; -+ u8 SmartPS; -+ u8 BcnPassTime; // unit: 100ms -+}SETPWRMODE_PARM, *PSETPWRMODE_PARM; -+ -+#ifdef CONFIG_WOWLAN -+typedef struct _SETWOWLAN_PARM{ -+ u8 mode; -+ u8 gpio_index; -+ u8 gpio_duration; -+ u8 second_mode; -+ u8 reserve; -+}SETWOWLAN_PARM, *PSETWOWLAN_PARM; -+ -+#define FW_WOWLAN_FUN_EN BIT(0) -+#define FW_WOWLAN_PATTERN_MATCH BIT(1) -+#define FW_WOWLAN_MAGIC_PKT BIT(2) -+#define FW_WOWLAN_UNICAST BIT(3) -+#define FW_WOWLAN_ALL_PKT_DROP BIT(4) -+#define FW_WOWLAN_GPIO_ACTIVE BIT(5) -+#define FW_WOWLAN_REKEY_WAKEUP BIT(6) -+#define FW_WOWLAN_DEAUTH_WAKEUP BIT(7) -+ -+#define FW_WOWLAN_GPIO_WAKEUP_EN BIT(0) -+#define FW_FW_PARSE_MAGIC_PKT BIT(1) -+#endif // CONFIG_WOWLAN -+ -+struct H2C_SS_RFOFF_PARAM{ -+ u8 ROFOn; // 1: on, 0:off -+ u16 gpio_period; // unit: 1024 us -+}__attribute__ ((packed)); -+ -+ -+typedef struct JOINBSSRPT_PARM{ -+ u8 OpMode; // RT_MEDIA_STATUS -+}JOINBSSRPT_PARM, *PJOINBSSRPT_PARM; -+ -+typedef struct _RSVDPAGE_LOC{ -+ u8 LocProbeRsp; -+ u8 LocPsPoll; -+ u8 LocNullData; -+}RSVDPAGE_LOC, *PRSVDPAGE_LOC; -+ -+struct P2P_PS_Offload_t { -+ unsigned char Offload_En:1; -+ unsigned char role:1; // 1: Owner, 0: Client -+ unsigned char CTWindow_En:1; -+ unsigned char NoA0_En:1; -+ unsigned char NoA1_En:1; -+ unsigned char AllStaSleep:1; // Only valid in Owner -+ unsigned char discovery:1; -+ unsigned char rsvd:1; -+}; -+ -+struct P2P_PS_CTWPeriod_t { -+ unsigned char CTWPeriod; //TU -+}; -+ -+// host message to firmware cmd -+void rtl8192c_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode); -+void rtl8192c_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus); -+u8 rtl8192c_set_rssi_cmd(_adapter*padapter, u8 *param); -+u8 rtl8192c_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg); -+void rtl8192c_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg); -+u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter*padapter,u8 bfwpoll, u16 period); -+#ifdef CONFIG_P2P -+void rtl8192c_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state); -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_IOL -+typedef struct _IO_OFFLOAD_LOC{ -+ u8 LocCmd; -+}IO_OFFLOAD_LOC, *PIO_OFFLOAD_LOC; -+int rtl8192c_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms); -+#endif //CONFIG_IOL -+ -+#ifdef CONFIG_BEACON_DISABLE_OFFLOAD -+u8 rtl8192c_dis_beacon_fun_cmd(_adapter* padapter); -+#endif // CONFIG_BEACON_DISABLE_OFFLOAD -+ -+ -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+int reset_tsf(PADAPTER Adapter, u8 reset_port ); -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ -+#ifdef CONFIG_WOWLAN -+void rtl8192c_set_wowlan_cmd(_adapter* padapter); -+void SetFwRelatedForWoWLAN8192CU(_adapter* padapter,u8 bHostIsGoingtoSleep); -+#endif // CONFIG_WOWLAN -+ -+#endif // __RTL8192C_CMD_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h -@@ -0,0 +1,516 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192C_DM_H__ -+#define __RTL8192C_DM_H__ -+//============================================================ -+// Description: -+// -+// This file is for 92CE/92CU dynamic mechanism only -+// -+// -+//============================================================ -+ -+#define RSSI_CCK 0 -+#define RSSI_OFDM 1 -+#define RSSI_DEFAULT 2 -+ -+//============================================================ -+// structure and define -+//============================================================ -+ -+typedef struct _FALSE_ALARM_STATISTICS{ -+ u32 Cnt_Parity_Fail; -+ u32 Cnt_Rate_Illegal; -+ u32 Cnt_Crc8_fail; -+ u32 Cnt_Mcs_fail; -+ u32 Cnt_Ofdm_fail; -+ u32 Cnt_Cck_fail; -+ u32 Cnt_all; -+ u32 Cnt_Fast_Fsync; -+ u32 Cnt_SB_Search_fail; -+}FALSE_ALARM_STATISTICS, *PFALSE_ALARM_STATISTICS; -+ -+typedef struct _Dynamic_Power_Saving_ -+{ -+ u8 PreCCAState; -+ u8 CurCCAState; -+ -+ u8 PreRFState; -+ u8 CurRFState; -+ -+ s32 Rssi_val_min; -+ -+}PS_T; -+ -+typedef struct _Dynamic_Initial_Gain_Threshold_ -+{ -+ u8 Dig_Enable_Flag; -+ u8 Dig_Ext_Port_Stage; -+ -+ int RssiLowThresh; -+ int RssiHighThresh; -+ -+ u32 FALowThresh; -+ u32 FAHighThresh; -+ -+ u8 CurSTAConnectState; -+ u8 PreSTAConnectState; -+ u8 CurMultiSTAConnectState; -+ -+ u8 PreIGValue; -+ u8 CurIGValue; -+ u8 BackupIGValue; -+ -+ char BackoffVal; -+ char BackoffVal_range_max; -+ char BackoffVal_range_min; -+ u8 rx_gain_range_max; -+ u8 rx_gain_range_min; -+ u8 Rssi_val_min; -+ -+ u8 PreCCKPDState; -+ u8 CurCCKPDState; -+ u8 PreCCKFAState; -+ u8 CurCCKFAState; -+ u8 PreCCAState; -+ u8 CurCCAState; -+ -+ u8 LargeFAHit; -+ u8 ForbiddenIGI; -+ u32 Recover_cnt; -+ u8 rx_gain_range_min_nolink; -+ -+}DIG_T; -+ -+typedef enum tag_Dynamic_Init_Gain_Operation_Type_Definition -+{ -+ DIG_TYPE_THRESH_HIGH = 0, -+ DIG_TYPE_THRESH_LOW = 1, -+ DIG_TYPE_BACKOFF = 2, -+ DIG_TYPE_RX_GAIN_MIN = 3, -+ DIG_TYPE_RX_GAIN_MAX = 4, -+ DIG_TYPE_ENABLE = 5, -+ DIG_TYPE_DISABLE = 6, -+ DIG_OP_TYPE_MAX -+}DM_DIG_OP_E; -+ -+typedef enum tag_CCK_Packet_Detection_Threshold_Type_Definition -+{ -+ CCK_PD_STAGE_LowRssi = 0, -+ CCK_PD_STAGE_HighRssi = 1, -+ CCK_PD_STAGE_MAX = 3, -+}DM_CCK_PDTH_E; -+ -+typedef enum tag_1R_CCA_Type_Definition -+{ -+ CCA_1R =0, -+ CCA_2R = 1, -+ CCA_MAX = 2, -+}DM_1R_CCA_E; -+ -+typedef enum tag_RF_Type_Definition -+{ -+ RF_Save =0, -+ RF_Normal = 1, -+ RF_MAX = 2, -+}DM_RF_E; -+ -+typedef enum tag_DIG_EXT_PORT_ALGO_Definition -+{ -+ DIG_EXT_PORT_STAGE_0 = 0, -+ DIG_EXT_PORT_STAGE_1 = 1, -+ DIG_EXT_PORT_STAGE_2 = 2, -+ DIG_EXT_PORT_STAGE_3 = 3, -+ DIG_EXT_PORT_STAGE_MAX = 4, -+}DM_DIG_EXT_PORT_ALG_E; -+ -+ -+typedef enum tag_DIG_Connect_Definition -+{ -+ DIG_STA_DISCONNECT = 0, -+ DIG_STA_CONNECT = 1, -+ DIG_STA_BEFORE_CONNECT = 2, -+ DIG_MultiSTA_DISCONNECT = 3, -+ DIG_MultiSTA_CONNECT = 4, -+ DIG_CONNECT_MAX -+}DM_DIG_CONNECT_E; -+ -+ -+ -+typedef enum _BT_Ant_NUM{ -+ Ant_x2 = 0, -+ Ant_x1 = 1 -+} BT_Ant_NUM, *PBT_Ant_NUM; -+ -+typedef enum _BT_CoType{ -+ BT_2Wire = 0, -+ BT_ISSC_3Wire = 1, -+ BT_Accel = 2, -+ BT_CSR_BC4 = 3, -+ BT_CSR_BC8 = 4, -+ BT_RTL8756 = 5, -+} BT_CoType, *PBT_CoType; -+ -+typedef enum _BT_CurState{ -+ BT_OFF = 0, -+ BT_ON = 1, -+} BT_CurState, *PBT_CurState; -+ -+typedef enum _BT_ServiceType{ -+ BT_SCO = 0, -+ BT_A2DP = 1, -+ BT_HID = 2, -+ BT_HID_Idle = 3, -+ BT_Scan = 4, -+ BT_Idle = 5, -+ BT_OtherAction = 6, -+ BT_Busy = 7, -+ BT_OtherBusy = 8, -+ BT_PAN = 9, -+} BT_ServiceType, *PBT_ServiceType; -+ -+typedef enum _BT_RadioShared{ -+ BT_Radio_Shared = 0, -+ BT_Radio_Individual = 1, -+} BT_RadioShared, *PBT_RadioShared; -+ -+struct btcoexist_priv { -+ u8 BT_Coexist; -+ u8 BT_Ant_Num; -+ u8 BT_CoexistType; -+ u8 BT_State; -+ u8 BT_CUR_State; //0:on, 1:off -+ u8 BT_Ant_isolation; //0:good, 1:bad -+ u8 BT_PapeCtrl; //0:SW, 1:SW/HW dynamic -+ u8 BT_Service; -+ u8 BT_Ampdu; // 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. -+ u8 BT_RadioSharedType; -+ u32 Ratio_Tx; -+ u32 Ratio_PRI; -+ u8 BtRfRegOrigin1E; -+ u8 BtRfRegOrigin1F; -+ u8 BtRssiState; -+ u32 BtEdcaUL; -+ u32 BtEdcaDL; -+ u32 BT_EDCA[2]; -+ u8 bCOBT; -+ -+ u8 bInitSet; -+ u8 bBTBusyTraffic; -+ u8 bBTTrafficModeSet; -+ u8 bBTNonTrafficModeSet; -+ //BTTraffic BT21TrafficStatistics; -+ u32 CurrentState; -+ u32 PreviousState; -+ u8 BtPreRssiState; -+ u8 bFWCoexistAllOff; -+ u8 bSWCoexistAllOff; -+}; -+ -+#define BW_AUTO_SWITCH_HIGH_LOW 25 -+#define BW_AUTO_SWITCH_LOW_HIGH 30 -+ -+#define DM_DIG_THRESH_HIGH 40 -+#define DM_DIG_THRESH_LOW 35 -+ -+#define DM_FALSEALARM_THRESH_LOW 400 -+#define DM_FALSEALARM_THRESH_HIGH 1000 -+ -+#define DM_DIG_MAX 0x3e -+#define DM_DIG_MIN 0x1e //0x22//0x1c -+ -+#define DM_DIG_FA_UPPER 0x3e -+#define DM_DIG_FA_LOWER 0x20 -+#define DM_DIG_FA_TH0 0x20 -+#define DM_DIG_FA_TH1 0x100 -+#define DM_DIG_FA_TH2 0x200 -+ -+#define DM_DIG_BACKOFF_MAX 12 -+#define DM_DIG_BACKOFF_MIN (-4) -+#define DM_DIG_BACKOFF_DEFAULT 10 -+ -+#define RxPathSelection_SS_TH_low 30 -+#define RxPathSelection_diff_TH 18 -+ -+#define DM_RATR_STA_INIT 0 -+#define DM_RATR_STA_HIGH 1 -+#define DM_RATR_STA_MIDDLE 2 -+#define DM_RATR_STA_LOW 3 -+ -+#define CTSToSelfTHVal 30 -+#define RegC38_TH 20 -+ -+#define WAIotTHVal 25 -+ -+//Dynamic Tx Power Control Threshold -+#define TX_POWER_NEAR_FIELD_THRESH_LVL2 74 -+#define TX_POWER_NEAR_FIELD_THRESH_LVL1 67 -+ -+#define TxHighPwrLevel_Normal 0 -+#define TxHighPwrLevel_Level1 1 -+#define TxHighPwrLevel_Level2 2 -+#define TxHighPwrLevel_BT1 3 -+#define TxHighPwrLevel_BT2 4 -+#define TxHighPwrLevel_15 5 -+#define TxHighPwrLevel_35 6 -+#define TxHighPwrLevel_50 7 -+#define TxHighPwrLevel_70 8 -+#define TxHighPwrLevel_100 9 -+ -+#define DM_Type_ByFW 0 -+#define DM_Type_ByDriver 1 -+ -+ -+typedef struct _RATE_ADAPTIVE -+{ -+ u8 RateAdaptiveDisabled; -+ u8 RATRState; -+ u16 reserve; -+ -+ u32 HighRSSIThreshForRA; -+ u32 High2LowRSSIThreshForRA; -+ u8 Low2HighRSSIThreshForRA40M; -+ u32 LowRSSIThreshForRA40M; -+ u8 Low2HighRSSIThreshForRA20M; -+ u32 LowRSSIThreshForRA20M; -+ u32 UpperRSSIThresholdRATR; -+ u32 MiddleRSSIThresholdRATR; -+ u32 LowRSSIThresholdRATR; -+ u32 LowRSSIThresholdRATR40M; -+ u32 LowRSSIThresholdRATR20M; -+ u8 PingRSSIEnable; //cosa add for Netcore long range ping issue -+ u32 PingRSSIRATR; //cosa add for Netcore long range ping issue -+ u32 PingRSSIThreshForRA;//cosa add for Netcore long range ping issue -+ u32 LastRATR; -+ u8 PreRATRState; -+ -+} RATE_ADAPTIVE, *PRATE_ADAPTIVE; -+ -+typedef enum tag_SW_Antenna_Switch_Definition -+{ -+ Antenna_B = 1, -+ Antenna_A = 2, -+ Antenna_MAX = 3, -+}DM_SWAS_E; -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+// This indicates two different the steps. -+// In SWAW_STEP_PEAK, driver needs to switch antenna and listen to the signal on the air. -+// In SWAW_STEP_DETERMINE, driver just compares the signal captured in SWAW_STEP_PEAK -+// with original RSSI to determine if it is necessary to switch antenna. -+#define SWAW_STEP_PEAK 0 -+#define SWAW_STEP_DETERMINE 1 -+ -+#define TP_MODE 0 -+#define RSSI_MODE 1 -+#define TRAFFIC_LOW 0 -+#define TRAFFIC_HIGH 1 -+ -+typedef struct _SW_Antenna_Switch_ -+{ -+ u8 try_flag; -+ s32 PreRSSI; -+ u8 CurAntenna; -+ u8 PreAntenna; -+ u8 RSSI_Trying; -+ u8 TestMode; -+ u8 bTriggerAntennaSwitch; -+ u8 SelectAntennaMap; -+ // Before link Antenna Switch check -+ u8 SWAS_NoLink_State; -+ -+}SWAT_T; -+ -+ -+#endif -+ -+ -+struct dm_priv -+{ -+ u8 DM_Type; -+ u8 DMFlag, DMFlag_tmp; -+ -+ -+ //for DIG -+ u8 bDMInitialGainEnable; -+ u8 binitialized; // for dm_initial_gain_Multi_STA use. -+ DIG_T DM_DigTable; -+ -+ PS_T DM_PSTable; -+ -+ FALSE_ALARM_STATISTICS FalseAlmCnt; -+ -+ //for rate adaptive, in fact, 88c/92c fw will handle this -+ u8 bUseRAMask; -+ RATE_ADAPTIVE RateAdaptive; -+ -+ //* Upper and Lower Signal threshold for Rate Adaptive*/ -+ int UndecoratedSmoothedPWDB; -+ int UndecoratedSmoothedCCK; -+ int EntryMinUndecoratedSmoothedPWDB; -+ int EntryMaxUndecoratedSmoothedPWDB; -+ -+ -+ //for High Power -+ u8 bDynamicTxPowerEnable; -+ u8 LastDTPLvl; -+ u8 DynamicTxHighPowerLvl;//Add by Jacken Tx Power Control for Near/Far Range 2008/03/06 -+ -+ //for tx power tracking -+ //u8 bTXPowerTracking; -+ u8 TXPowercount; -+ u8 bTXPowerTrackingInit; -+ u8 TxPowerTrackControl; //for mp mode, turn off txpwrtracking as default -+ u8 TM_Trigger; -+ -+ u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 -+ u8 ThermalValue; -+ u8 ThermalValue_LCK; -+ u8 ThermalValue_IQK; -+ u8 ThermalValue_DPK; -+ -+ u8 bRfPiEnable; -+ -+ //for APK -+ u32 APKoutput[2][2]; //path A/B; output1_1a/output1_2a -+ u8 bAPKdone; -+ u8 bAPKThermalMeterIgnore; -+ u8 bDPdone; -+ u8 bDPPathAOK; -+ u8 bDPPathBOK; -+ -+ //for IQK -+ u32 RegC04; -+ u32 Reg874; -+ u32 RegC08; -+ u32 RegB68; -+ u32 RegB6C; -+ u32 Reg870; -+ u32 Reg860; -+ u32 Reg864; -+ u32 ADDA_backup[IQK_ADDA_REG_NUM]; -+ u32 IQK_MAC_backup[IQK_MAC_REG_NUM]; -+ u32 IQK_BB_backup_recover[9]; -+ u32 IQK_BB_backup[IQK_BB_REG_NUM]; -+ u8 PowerIndex_backup[6]; -+ -+ u8 bCCKinCH14; -+ -+ char CCK_index; -+ char OFDM_index[2]; -+ -+ BOOLEAN bDoneTxpower; -+ char CCK_index_HP; -+ char OFDM_index_HP[2]; -+ u8 ThermalValue_HP[HP_THERMAL_NUM]; -+ u8 ThermalValue_HP_index; -+ -+ //for TxPwrTracking -+ int RegE94; -+ int RegE9C; -+ int RegEB4; -+ int RegEBC; -+ -+ u32 TXPowerTrackingCallbackCnt; //cosa add for debug -+ -+ u32 prv_traffic_idx; // edca turbo -+ -+ // for dm_RF_Saving -+ u8 initialize; -+ u32 rf_saving_Reg874; -+ u32 rf_saving_RegC70; -+ u32 rf_saving_Reg85C; -+ u32 rf_saving_RegA74; -+ -+ //for Antenna diversity -+#ifdef CONFIG_ANTENNA_DIVERSITY -+ SWAT_T DM_SWAT_Table; -+#endif -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ _timer SwAntennaSwitchTimer; -+ -+ u64 lastTxOkCnt; -+ u64 lastRxOkCnt; -+ u64 TXByteCnt_A; -+ u64 TXByteCnt_B; -+ u64 RXByteCnt_A; -+ u64 RXByteCnt_B; -+ u8 DoubleComfirm; -+ u8 TrafficLoad; -+#endif -+ -+ s32 OFDM_Pkt_Cnt; -+ u8 RSSI_Select; -+ u8 DIG_Dynamic_MIN ; -+ -+ // Add for Reading Initial Data Rate SEL Register 0x484 during watchdog. Using for fill tx desc. 2011.3.21 by Thomas -+ u8 INIDATA_RATE[32]; -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ /* Ported from ODM, for ESTI Adaptivity test */ -+ s8 TH_L2H_ini; -+ s8 TH_EDCCA_HL_diff; -+ s8 IGI_Base; -+ u8 IGI_target; -+ bool ForceEDCCA; -+ u8 AdapEn_RSSI; -+ s8 Force_TH_H; -+ s8 Force_TH_L; -+ u8 IGI_LowerBound; -+ -+ bool bPreEdccaEnable; -+#endif -+}; -+ -+ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export Marco Definition---------------------------*/ -+//#define DM_MultiSTA_InitGainChangeNotify(Event) {DM_DigTable.CurMultiSTAConnectState = Event;} -+ -+ -+//============================================================ -+// function prototype -+//============================================================ -+void rtl8192c_init_dm_priv(IN PADAPTER Adapter); -+void rtl8192c_deinit_dm_priv(IN PADAPTER Adapter); -+void rtl8192c_InitHalDm(IN PADAPTER Adapter); -+void rtl8192c_HalDmWatchDog(IN PADAPTER Adapter); -+ -+VOID rtl8192c_dm_CheckTXPowerTracking(IN PADAPTER Adapter); -+ -+void rtl8192c_dm_RF_Saving(IN PADAPTER pAdapter, IN u8 bForceInNormal); -+ -+#ifdef CONFIG_BT_COEXIST -+void rtl8192c_set_dm_bt_coexist(_adapter *padapter, u8 bStart); -+void rtl8192c_issue_delete_ba(_adapter *padapter, u8 dir); -+#endif -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+void SwAntDivRSSICheck8192C(_adapter *padapter ,u32 RxPWDBAll); -+void SwAntDivRestAfterLink8192C(IN PADAPTER Adapter); -+#endif -+#ifdef CONFIG_ANTENNA_DIVERSITY -+void SwAntDivCompare8192C(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); -+u8 SwAntDivBeforeLink8192C(IN PADAPTER Adapter); -+#endif -+ -+#endif //__HAL8190PCIDM_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h -@@ -0,0 +1,28 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL8192C_EVENT_H_ -+#define _RTL8192C_EVENT_H_ -+ -+ -+ -+ -+#endif -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h -@@ -0,0 +1,937 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192C_HAL_H__ -+#define __RTL8192C_HAL_H__ -+ -+#include "hal_com.h" -+#include "rtl8192c_spec.h" -+#include "Hal8192CPhyReg.h" -+#include "Hal8192CPhyCfg.h" -+#include "rtl8192c_rf.h" -+#include "rtl8192c_dm.h" -+#include "rtl8192c_recv.h" -+#include "rtl8192c_xmit.h" -+#include "rtl8192c_cmd.h" -+#ifdef DBG_CONFIG_ERROR_DETECT -+#include "rtl8192c_sreset.h" -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ -+ #include "Hal8192CEHWImg.h" -+ -+ #define RTL819X_DEFAULT_RF_TYPE RF_2T2R -+ //#define RTL819X_DEFAULT_RF_TYPE RF_1T2R -+ #define RTL819X_TOTAL_RF_PATH 2 -+ -+ //2TODO: The following need to check!! -+ #define RTL8192C_FW_TSMC_IMG "rtl8192CE\\rtl8192cfwT.bin" -+ #define RTL8192C_FW_UMC_IMG "rtl8192CE\\rtl8192cfwU.bin" -+ #define RTL8192C_FW_UMC_B_IMG "rtl8192CE\\rtl8192cfwU_B.bin" -+ -+ #define RTL8188C_PHY_REG "rtl8192CE\\PHY_REG_1T.txt" -+ #define RTL8188C_PHY_RADIO_A "rtl8192CE\\radio_a_1T.txt" -+ #define RTL8188C_PHY_RADIO_B "rtl8192CE\\radio_b_1T.txt" -+ #define RTL8188C_AGC_TAB "rtl8192CE\\AGC_TAB_1T.txt" -+ #define RTL8188C_PHY_MACREG "rtl8192CE\\MACREG_1T.txt" -+ -+ #define RTL8192C_PHY_REG "rtl8192CE\\PHY_REG_2T.txt" -+ #define RTL8192C_PHY_RADIO_A "rtl8192CE\\radio_a_2T.txt" -+ #define RTL8192C_PHY_RADIO_B "rtl8192CE\\radio_b_2T.txt" -+ #define RTL8192C_AGC_TAB "rtl8192CE\\AGC_TAB_2T.txt" -+ #define RTL8192C_PHY_MACREG "rtl8192CE\\MACREG_2T.txt" -+ -+ #define RTL819X_PHY_MACPHY_REG "rtl8192CE\\MACPHY_reg.txt" -+ #define RTL819X_PHY_MACPHY_REG_PG "rtl8192CE\\MACPHY_reg_PG.txt" -+ #define RTL819X_PHY_MACREG "rtl8192CE\\MAC_REG.txt" -+ #define RTL819X_PHY_REG "rtl8192CE\\PHY_REG.txt" -+ #define RTL819X_PHY_REG_1T2R "rtl8192CE\\PHY_REG_1T2R.txt" -+ #define RTL819X_PHY_REG_to1T1R "rtl8192CE\\phy_to1T1R_a.txt" -+ #define RTL819X_PHY_REG_to1T2R "rtl8192CE\\phy_to1T2R.txt" -+ #define RTL819X_PHY_REG_to2T2R "rtl8192CE\\phy_to2T2R.txt" -+ #define RTL819X_PHY_REG_PG "rtl8192CE\\PHY_REG_PG.txt" -+ #define RTL819X_AGC_TAB "rtl8192CE\\AGC_TAB.txt" -+ #define RTL819X_PHY_RADIO_A "rtl8192CE\\radio_a.txt" -+ #define RTL819X_PHY_RADIO_A_1T "rtl8192CE\\radio_a_1t.txt" -+ #define RTL819X_PHY_RADIO_A_2T "rtl8192CE\\radio_a_2t.txt" -+ #define RTL819X_PHY_RADIO_B "rtl8192CE\\radio_b.txt" -+ #define RTL819X_PHY_RADIO_B_GM "rtl8192CE\\radio_b_gm.txt" -+ #define RTL819X_PHY_RADIO_C "rtl8192CE\\radio_c.txt" -+ #define RTL819X_PHY_RADIO_D "rtl8192CE\\radio_d.txt" -+ #define RTL819X_EEPROM_MAP "rtl8192CE\\8192ce.map" -+ #define RTL819X_EFUSE_MAP "rtl8192CE\\8192ce.map" -+ -+//--------------------------------------------------------------------- -+// RTL8723E From file -+//--------------------------------------------------------------------- -+ #define RTL8723_FW_UMC_IMG "rtl8723E\\rtl8723fw.bin" -+ #define RTL8723_PHY_REG "rtl8723E\\PHY_REG_1T.txt" -+ #define RTL8723_PHY_RADIO_A "rtl8723E\\radio_a_1T.txt" -+ #define RTL8723_PHY_RADIO_B "rtl8723E\\radio_b_1T.txt" -+ #define RTL8723_AGC_TAB "rtl8723E\\AGC_TAB_1T.txt" -+ #define RTL8723_PHY_MACREG "rtl8723E\\MAC_REG.txt" -+ #define RTL8723_PHY_MACREG "rtl8723E\\MAC_REG.txt" -+ #define RTL8723_PHY_REG_PG "rtl8723E\\PHY_REG_PG.txt" -+ #define RTL8723_PHY_REG_MP "rtl8723E\\PHY_REG_MP.txt" -+ -+ // The file name "_2T" is for 92CE, "_1T" is for 88CE. Modified by tynli. 2009.11.24. -+ #define Rtl819XFwTSMCImageArray Rtl8192CEFwTSMCImgArray -+ #define Rtl819XFwUMCACutImageArray Rtl8192CEFwUMCACutImgArray -+ #define Rtl819XFwUMCBCutImageArray Rtl8192CEFwUMCBCutImgArray -+ -+ #define Rtl8723FwUMCImageArray Rtl8192CEFwUMC8723ImgArray -+ #define Rtl819XMAC_Array Rtl8192CEMAC_2T_Array -+ #define Rtl819XAGCTAB_2TArray Rtl8192CEAGCTAB_2TArray -+ #define Rtl819XAGCTAB_1TArray Rtl8192CEAGCTAB_1TArray -+ #define Rtl819XPHY_REG_2TArray Rtl8192CEPHY_REG_2TArray -+ #define Rtl819XPHY_REG_1TArray Rtl8192CEPHY_REG_1TArray -+ #define Rtl819XRadioA_2TArray Rtl8192CERadioA_2TArray -+ #define Rtl819XRadioA_1TArray Rtl8192CERadioA_1TArray -+ #define Rtl819XRadioB_2TArray Rtl8192CERadioB_2TArray -+ #define Rtl819XRadioB_1TArray Rtl8192CERadioB_1TArray -+ #define Rtl819XPHY_REG_Array_PG Rtl8192CEPHY_REG_Array_PG -+ #define Rtl819XPHY_REG_Array_MP Rtl8192CEPHY_REG_Array_MP -+ -+#elif defined(CONFIG_USB_HCI) -+ -+ #include "Hal8192CUHWImg.h" -+#ifdef CONFIG_WOWLAN -+ #include "Hal8192CUHWImg_wowlan.h" -+#endif //CONFIG_WOWLAN -+ //2TODO: We should define 8192S firmware related macro settings here!! -+ #define RTL819X_DEFAULT_RF_TYPE RF_1T2R -+ #define RTL819X_TOTAL_RF_PATH 2 -+ -+ //TODO: The following need to check!! -+ #define RTL8192C_FW_TSMC_IMG "rtl8192CU\\rtl8192cfwT.bin" -+ #define RTL8192C_FW_UMC_IMG "rtl8192CU\\rtl8192cfwU.bin" -+ #define RTL8192C_FW_UMC_B_IMG "rtl8192CU\\rtl8192cfwU_B.bin" -+#ifdef CONFIG_WOWLAN -+ #define RTL8192C_FW_TSMC_WW_IMG "rtl8192CU\\rtl8192cfwTww.bin" -+ #define RTL8192C_FW_UMC_WW_IMG "rtl8192CU\\rtl8192cfwUww.bin" -+ #define RTL8192C_FW_UMC_B_WW_IMG "rtl8192CU\\rtl8192cfwU_Bww.bin" -+#endif // CONFIG_WOWLAN -+ //#define RTL819X_FW_BOOT_IMG "rtl8192CU\\boot.img" -+ //#define RTL819X_FW_MAIN_IMG "rtl8192CU\\main.img" -+ //#define RTL819X_FW_DATA_IMG "rtl8192CU\\data.img" -+ -+ #define RTL8188C_PHY_REG "rtl8188CU\\PHY_REG.txt" -+ #define RTL8188C_PHY_RADIO_A "rtl8188CU\\radio_a.txt" -+ #define RTL8188C_PHY_RADIO_B "rtl8188CU\\radio_b.txt" -+ #define RTL8188C_PHY_RADIO_A_mCard "rtl8192CU\\radio_a_1T_mCard.txt" -+ #define RTL8188C_PHY_RADIO_B_mCard "rtl8192CU\\radio_b_1T_mCard.txt" -+ #define RTL8188C_PHY_RADIO_A_HP "rtl8192CU\\radio_a_1T_HP.txt" -+ #define RTL8188C_AGC_TAB "rtl8188CU\\AGC_TAB.txt" -+ #define RTL8188C_PHY_MACREG "rtl8188CU\\MACREG.txt" -+ -+ #define RTL8192C_PHY_REG "rtl8192CU\\PHY_REG.txt" -+ #define RTL8192C_PHY_RADIO_A "rtl8192CU\\radio_a.txt" -+ #define RTL8192C_PHY_RADIO_B "rtl8192CU\\radio_b.txt" -+ #define RTL8192C_AGC_TAB "rtl8192CU\\AGC_TAB.txt" -+ #define RTL8192C_PHY_MACREG "rtl8192CU\\MACREG.txt" -+ -+ #define RTL819X_PHY_REG_PG "rtl8192CU\\PHY_REG_PG.txt" -+ -+//--------------------------------------------------------------------- -+// RTL8723U From file -+//--------------------------------------------------------------------- -+ #define RTL8723_FW_UMC_IMG "rtl8723U\\rtl8723fw.bin" -+ #define RTL8723_PHY_REG "rtl8723U\\PHY_REG_1T.txt" -+ #define RTL8723_PHY_RADIO_A "rtl8723U\\radio_a_1T.txt" -+ #define RTL8723_PHY_RADIO_B "rtl8723U\\radio_b_1T.txt" -+ #define RTL8723_AGC_TAB "rtl8723U\\AGC_TAB_1T.txt" -+ #define RTL8723_PHY_MACREG "rtl8723U\\MAC_REG.txt" -+ #define RTL8723_PHY_MACREG "rtl8723U\\MAC_REG.txt" -+ #define RTL8723_PHY_REG_PG "rtl8723U\\PHY_REG_PG.txt" -+ #define RTL8723_PHY_REG_MP "rtl8723U\\PHY_REG_MP.txt" -+ -+ // The file name "_2T" is for 92CU, "_1T" is for 88CU. Modified by tynli. 2009.11.24. -+ #define Rtl819XFwImageArray Rtl8192CUFwTSMCImgArray -+ #define Rtl819XFwTSMCImageArray Rtl8192CUFwTSMCImgArray -+ #define Rtl819XFwUMCACutImageArray Rtl8192CUFwUMCACutImgArray -+ #define Rtl819XFwUMCBCutImageArray Rtl8192CUFwUMCBCutImgArray -+#ifdef CONFIG_WOWLAN -+ #define Rtl8192C_FwTSMCWWImageArray Rtl8192CUFwTSMCWWImgArray -+ #define Rtl8192C_FwUMCWWImageArray Rtl8192CUFwUMCACutWWImgArray -+ #define Rtl8192C_FwUMCBCutWWImageArray Rtl8192CUFwUMCBCutWWImgArray -+#endif //CONFIG_WOWLAN -+ #define Rtl819XMAC_Array Rtl8192CUMAC_2T_Array -+ #define Rtl819XAGCTAB_2TArray Rtl8192CUAGCTAB_2TArray -+ #define Rtl819XAGCTAB_1TArray Rtl8192CUAGCTAB_1TArray -+ #define Rtl819XAGCTAB_1T_HPArray Rtl8192CUAGCTAB_1T_HPArray -+ #define Rtl819XPHY_REG_2TArray Rtl8192CUPHY_REG_2TArray -+ #define Rtl819XPHY_REG_1TArray Rtl8192CUPHY_REG_1TArray -+ #define Rtl819XPHY_REG_1T_mCardArray Rtl8192CUPHY_REG_1T_mCardArray -+ #define Rtl819XPHY_REG_2T_mCardArray Rtl8192CUPHY_REG_2T_mCardArray -+ #define Rtl819XPHY_REG_1T_HPArray Rtl8192CUPHY_REG_1T_HPArray -+ #define Rtl819XRadioA_2TArray Rtl8192CURadioA_2TArray -+ #define Rtl819XRadioA_1TArray Rtl8192CURadioA_1TArray -+ #define Rtl819XRadioA_1T_mCardArray Rtl8192CURadioA_1T_mCardArray -+ #define Rtl819XRadioB_2TArray Rtl8192CURadioB_2TArray -+ #define Rtl819XRadioB_1TArray Rtl8192CURadioB_1TArray -+ #define Rtl819XRadioB_1T_mCardArray Rtl8192CURadioB_1T_mCardArray -+ #define Rtl819XRadioA_1T_HPArray Rtl8192CURadioA_1T_HPArray -+ #define Rtl819XPHY_REG_Array_PG Rtl8192CUPHY_REG_Array_PG -+ #define Rtl819XPHY_REG_Array_PG_mCard Rtl8192CUPHY_REG_Array_PG_mCard -+ #define Rtl819XPHY_REG_Array_PG_HP Rtl8192CUPHY_REG_Array_PG_HP -+ #define Rtl819XPHY_REG_Array_MP Rtl8192CUPHY_REG_Array_MP -+#endif -+ -+#define DRVINFO_SZ 4 // unit is 8bytes -+#define PageNum_128(_Len) (u32)(((_Len)>>7) + ((_Len)&0x7F ? 1:0)) -+ -+#define FW_8192C_SIZE 16384+32//16k -+#define FW_8192C_START_ADDRESS 0x1000 -+//#define FW_8192C_END_ADDRESS 0x3FFF //Filen said this is for test chip -+#define FW_8192C_END_ADDRESS 0x1FFF -+ -+#define MAX_PAGE_SIZE 4096 // @ page : 4k bytes -+ -+#define IS_FW_HEADER_EXIST(_pFwHdr) ((le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x92C0 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x88C0 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x2300) -+ -+typedef enum _FIRMWARE_SOURCE{ -+ FW_SOURCE_IMG_FILE = 0, -+ FW_SOURCE_HEADER_FILE = 1, //from header file -+}FIRMWARE_SOURCE, *PFIRMWARE_SOURCE; -+ -+typedef struct _RT_FIRMWARE{ -+ FIRMWARE_SOURCE eFWSource; -+ u8* szFwBuffer; -+ u32 ulFwLength; -+#ifdef CONFIG_WOWLAN -+ u8* szWoWLANFwBuffer; -+ u32 ulWoWLANFwLength; -+#endif //CONFIG_WOWLAN -+}RT_FIRMWARE, *PRT_FIRMWARE, RT_FIRMWARE_92C, *PRT_FIRMWARE_92C; -+ -+// -+// This structure must be cared byte-ordering -+// -+// Added by tynli. 2009.12.04. -+typedef struct _RT_8192C_FIRMWARE_HDR {//8-byte alinment required -+ -+ //--- LONG WORD 0 ---- -+ u16 Signature; // 92C0: test chip; 92C, 88C0: test chip; 88C1: MP A-cut; 92C1: MP A-cut -+ u8 Category; // AP/NIC and USB/PCI -+ u8 Function; // Reserved for different FW function indcation, for further use when driver needs to download different FW in different conditions -+ u16 Version; // FW Version -+ u8 Subversion; // FW Subversion, default 0x00 -+ u16 Rsvd1; -+ -+ -+ //--- LONG WORD 1 ---- -+ u8 Month; // Release time Month field -+ u8 Date; // Release time Date field -+ u8 Hour; // Release time Hour field -+ u8 Minute; // Release time Minute field -+ u16 RamCodeSize; // The size of RAM code -+ u16 Rsvd2; -+ -+ //--- LONG WORD 2 ---- -+ u32 SvnIdx; // The SVN entry index -+ u32 Rsvd3; -+ -+ //--- LONG WORD 3 ---- -+ u32 Rsvd4; -+ u32 Rsvd5; -+ -+}RT_8192C_FIRMWARE_HDR, *PRT_8192C_FIRMWARE_HDR; -+ -+#define DRIVER_EARLY_INT_TIME 0x05 -+#define BCN_DMA_ATIME_INT_TIME 0x02 -+ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ -+typedef enum _USB_RX_AGG_MODE{ -+ USB_RX_AGG_DISABLE, -+ USB_RX_AGG_DMA, -+ USB_RX_AGG_USB, -+ USB_RX_AGG_MIX -+}USB_RX_AGG_MODE; -+ -+#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer -+ -+#endif -+ -+ -+#define TX_SELE_HQ BIT(0) // High Queue -+#define TX_SELE_LQ BIT(1) // Low Queue -+#define TX_SELE_NQ BIT(2) // Normal Queue -+ -+ -+// Note: We will divide number of page equally for each queue other than public queue! -+ -+#define TX_TOTAL_PAGE_NUMBER 0xF8 -+#define TX_PAGE_BOUNDARY (TX_TOTAL_PAGE_NUMBER + 1) -+ -+// For Normal Chip Setting -+// (HPQ + LPQ + NPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER -+#define NORMAL_PAGE_NUM_PUBQ 0xE7 -+#define NORMAL_PAGE_NUM_HPQ 0x0C -+#define NORMAL_PAGE_NUM_LPQ 0x02 -+#define NORMAL_PAGE_NUM_NPQ 0x02 -+ -+ -+// For Test Chip Setting -+// (HPQ + LPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER -+#define TEST_PAGE_NUM_PUBQ 0x7E -+ -+ -+// For Test Chip Setting -+#define WMM_TEST_TX_TOTAL_PAGE_NUMBER 0xF5 -+#define WMM_TEST_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6 -+ -+#define WMM_TEST_PAGE_NUM_PUBQ 0xA3 -+#define WMM_TEST_PAGE_NUM_HPQ 0x29 -+#define WMM_TEST_PAGE_NUM_LPQ 0x29 -+ -+ -+//Note: For Normal Chip Setting ,modify later -+#define WMM_NORMAL_TX_TOTAL_PAGE_NUMBER 0xF5 -+#define WMM_NORMAL_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6 -+ -+#define WMM_NORMAL_PAGE_NUM_PUBQ 0x65 -+#define WMM_NORMAL_PAGE_NUM_HPQ 0x30 -+#define WMM_NORMAL_PAGE_NUM_LPQ 0x30 -+#define WMM_NORMAL_PAGE_NUM_NPQ 0x30 -+ -+//------------------------------------------------------------------------- -+// Chip specific -+//------------------------------------------------------------------------- -+#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3) -+#define CHIP_BONDING_92C_1T2R 0x1 -+#define CHIP_BONDING_88C_USB_MCARD 0x2 -+#define CHIP_BONDING_88C_USB_HP 0x1 -+ -+// -+// 2011.01.06. Define new structure of chip version for RTL8723 and so on. Added by tynli. -+// -+/* -+ | BIT15:12 | BIT11:8 | BIT 7 | BIT6:4 | BIT3 | BIT2:0 | -+ |-------------+-----------+-----------+-------+-----------+-------| -+ | IC version(CUT) | ROM version | Manufacturer | RF type | Chip type | IC Type | -+ | | | TSMC/UMC | | TEST/NORMAL| | -+*/ -+// [15:12] IC version(CUT): A-cut=0, B-cut=1, C-cut=2, D-cut=3 -+// [7] Manufacturer: TSMC=0, UMC=1 -+// [6:4] RF type: 1T1R=0, 1T2R=1, 2T2R=2 -+// [3] Chip type: TEST=0, NORMAL=1 -+// [2:0] IC type: 81xxC=0, 8723=1, 92D=2 -+ -+#define CHIP_8723 BIT(0) -+#define CHIP_92D BIT(1) -+#define NORMAL_CHIP BIT(3) -+#define RF_TYPE_1T1R (~(BIT(4)|BIT(5)|BIT(6))) -+#define RF_TYPE_1T2R BIT(4) -+#define RF_TYPE_2T2R BIT(5) -+#define CHIP_VENDOR_UMC BIT(7) -+#define B_CUT_VERSION BIT(12) -+#define C_CUT_VERSION BIT(13) -+#define D_CUT_VERSION ((BIT(13)|BIT(14))) -+ -+ -+// MASK -+#define IC_TYPE_MASK (BIT(0)|BIT(1)|BIT(2)) -+#define CHIP_TYPE_MASK BIT(3) -+#define RF_TYPE_MASK (BIT(4)|BIT(5)|BIT(6)) -+#define MANUFACTUER_MASK BIT(7) -+#define ROM_VERSION_MASK (BIT(11)|BIT(10)|BIT(9)|BIT(8)) -+#define CUT_VERSION_MASK (BIT(15)|BIT(14)|BIT(13)|BIT(12)) -+ -+// Get element -+#define GET_CVID_IC_TYPE(version) ((version) & IC_TYPE_MASK) -+#define GET_CVID_CHIP_TYPE(version) ((version) & CHIP_TYPE_MASK) -+#define GET_CVID_RF_TYPE(version) ((version) & RF_TYPE_MASK) -+#define GET_CVID_MANUFACTUER(version) ((version) & MANUFACTUER_MASK) -+#define GET_CVID_ROM_VERSION(version) ((version) & ROM_VERSION_MASK) -+#define GET_CVID_CUT_VERSION(version) ((version) & CUT_VERSION_MASK) -+ -+#define IS_81XXC(version) ((GET_CVID_IC_TYPE(version) == 0)? _TRUE : _FALSE) -+#define IS_8723_SERIES(version) ((GET_CVID_IC_TYPE(version) == CHIP_8723)? _TRUE : _FALSE) -+#define IS_92D(version) ((GET_CVID_IC_TYPE(version) == CHIP_92D)? _TRUE : _FALSE) -+#define IS_1T1R(version) ((GET_CVID_RF_TYPE(version))? _FALSE : _TRUE) -+#define IS_1T2R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R)? _TRUE : _FALSE) -+#define IS_2T2R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R)? _TRUE : _FALSE) -+#define IS_NORMAL_CHIP(version) ((GET_CVID_CHIP_TYPE(version))? _TRUE: _FALSE) -+#define IS_CHIP_VENDOR_UMC(version) ((GET_CVID_MANUFACTUER(version))? _TRUE: _FALSE) -+ -+#define IS_81XXC_TEST_CHIP(version) ((IS_81XXC(version) && (!IS_NORMAL_CHIP(version)))? _TRUE: _FALSE) -+#define IS_92D_TEST_CHIP(version) ((IS_92D(version) && (!IS_NORMAL_CHIP(version)))? _TRUE: _FALSE) -+#define IS_92C_SERIAL(version) ((IS_81XXC(version) && IS_2T2R(version)) ? _TRUE : _FALSE) -+#define IS_VENDOR_UMC_A_CUT(version) ((IS_CHIP_VENDOR_UMC(version)) ? ((GET_CVID_CUT_VERSION(version)) ? _FALSE : _TRUE) : _FALSE) -+#define IS_VENDOR_8723_A_CUT(version) ((IS_8723_SERIES(version)) ? ((GET_CVID_CUT_VERSION(version)) ? _FALSE : _TRUE) : _FALSE) -+// 88/92C UMC B-cut vendor is set to TSMC so we need to check CHIP_VENDOR_UMC bit is not 1. -+#define IS_81xxC_VENDOR_UMC_B_CUT(version) ((IS_CHIP_VENDOR_UMC(version)) ? ((GET_CVID_CUT_VERSION(version) == B_CUT_VERSION) ? _TRUE : _FALSE):_FALSE) -+#define IS_92D_SINGLEPHY(version) ((IS_92D(version)) ? (IS_2T2R(version) ? _TRUE: _FALSE) : _FALSE) -+#define IS_92D_C_CUT(version) ((IS_92D(version)) ? ((GET_CVID_CUT_VERSION(version) == 0x2) ? _TRUE : _FALSE) : _FALSE) -+#define IS_92D_D_CUT(version) ((IS_92D(version)) ? ((GET_CVID_CUT_VERSION(version) == 0x3) ? _TRUE : _FALSE) : _FALSE) -+ -+typedef enum _VERSION_8192C{ -+ VERSION_TEST_CHIP_88C = 0x0000, -+ VERSION_TEST_CHIP_92C = 0x0020, -+ VERSION_TEST_UMC_CHIP_8723 = 0x0081, -+ VERSION_NORMAL_TSMC_CHIP_88C = 0x0008, -+ VERSION_NORMAL_TSMC_CHIP_92C = 0x0028, -+ VERSION_NORMAL_TSMC_CHIP_92C_1T2R = 0x0018, -+ VERSION_NORMAL_UMC_CHIP_88C_A_CUT = 0x0088, -+ VERSION_NORMAL_UMC_CHIP_92C_A_CUT = 0x00a8, -+ VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT = 0x0098, -+ VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT = 0x0089, -+ VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT = 0x1089, -+ VERSION_NORMAL_UMC_CHIP_88C_B_CUT = 0x1088, -+ VERSION_NORMAL_UMC_CHIP_92C_B_CUT = 0x10a8, -+ VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT = 0x1090, -+ VERSION_TEST_CHIP_92D_SINGLEPHY= 0x0022, -+ VERSION_TEST_CHIP_92D_DUALPHY = 0x0002, -+ VERSION_NORMAL_CHIP_92D_SINGLEPHY= 0x002a, -+ VERSION_NORMAL_CHIP_92D_DUALPHY = 0x000a, -+ VERSION_NORMAL_CHIP_92D_C_CUT_SINGLEPHY = 0x202a, -+ VERSION_NORMAL_CHIP_92D_C_CUT_DUALPHY = 0x200a, -+ VERSION_NORMAL_CHIP_92D_D_CUT_SINGLEPHY = 0x302a, -+ VERSION_NORMAL_CHIP_92D_D_CUT_DUALPHY = 0x300a, -+}VERSION_8192C,*PVERSION_8192C; -+ -+ -+ -+//------------------------------------------------------------------------- -+// Channel Plan -+//------------------------------------------------------------------------- -+enum ChannelPlan{ -+ CHPL_FCC = 0, -+ CHPL_IC = 1, -+ CHPL_ETSI = 2, -+ CHPL_SPAIN = 3, -+ CHPL_FRANCE = 4, -+ CHPL_MKK = 5, -+ CHPL_MKK1 = 6, -+ CHPL_ISRAEL = 7, -+ CHPL_TELEC = 8, -+ CHPL_GLOBAL = 9, -+ CHPL_WORLD = 10, -+}; -+ -+typedef struct _TxPowerInfo{ -+ u8 CCKIndex[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT40_1SIndex[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT40_2SIndexDiff[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ s8 HT20IndexDiff[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 OFDMIndexDiff[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT40MaxOffset[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT20MaxOffset[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 TSSI_A; -+ u8 TSSI_B; -+}TxPowerInfo, *PTxPowerInfo; -+ -+#define EFUSE_REAL_CONTENT_LEN 512 -+#define EFUSE_MAP_LEN 128 -+#define EFUSE_MAX_SECTION 16 -+#define EFUSE_IC_ID_OFFSET 506 //For some inferiority IC purpose. added by Roger, 2009.09.02. -+#define AVAILABLE_EFUSE_ADDR(addr) (addr < EFUSE_REAL_CONTENT_LEN) -+// -+// To prevent out of boundary programming case, leave 1byte and program full section -+// 9bytes + 1byt + 5bytes and pre 1byte. -+// For worst case: -+// | 1byte|----8bytes----|1byte|--5bytes--| -+// | | Reserved(14bytes) | -+// -+#define EFUSE_OOB_PROTECT_BYTES 15 // PG data exclude header, dummy 6 bytes frome CP test and reserved 1byte. -+ -+ -+#define EFUSE_MAP_LEN_8723 256 -+#define EFUSE_MAX_SECTION_8723 32 -+ -+//======================================================== -+// EFUSE for BT definition -+//======================================================== -+#define EFUSE_BT_REAL_CONTENT_LEN 1536 // 512*3 -+#define EFUSE_BT_MAP_LEN 1024 // 1k bytes -+#define EFUSE_BT_MAX_SECTION 128 // 1024/8 -+ -+#define EFUSE_PROTECT_BYTES_BANK 16 -+ -+// -+// For RTL8723 WiFi/BT/GPS multi-function configuration. 2010.10.06. -+// -+typedef enum _RT_MULTI_FUNC{ -+ RT_MULTI_FUNC_NONE = 0x00, -+ RT_MULTI_FUNC_WIFI = 0x01, -+ RT_MULTI_FUNC_BT = 0x02, -+ RT_MULTI_FUNC_GPS = 0x04, -+}RT_MULTI_FUNC,*PRT_MULTI_FUNC; -+ -+// -+// For RTL8723 WiFi PDn/GPIO polarity control configuration. 2010.10.08. -+// -+typedef enum _RT_POLARITY_CTL{ -+ RT_POLARITY_LOW_ACT = 0, -+ RT_POLARITY_HIGH_ACT = 1, -+}RT_POLARITY_CTL,*PRT_POLARITY_CTL; -+ -+// For RTL8723 regulator mode. by tynli. 2011.01.14. -+typedef enum _RT_REGULATOR_MODE{ -+ RT_SWITCHING_REGULATOR = 0, -+ RT_LDO_REGULATOR = 1, -+}RT_REGULATOR_MODE,*PRT_REGULATOR_MODE; -+ -+enum c2h_id_8192c { -+ C2H_DBG = 0, -+ C2H_TSF = 1, -+ C2H_AP_RPT_RSP = 2, -+ C2H_CCX_TX_RPT = 3, -+ C2H_BT_RSSI = 4, -+ C2H_BT_OP_MODE = 5, -+ C2H_EXT_RA_RPT = 6, -+ C2H_HW_INFO_EXCH = 10, -+ C2H_C2H_H2C_TEST = 11, -+ C2H_BT_INFO = 12, -+ C2H_BT_MP_INFO = 15, -+ MAX_C2HEVENT -+}; -+ -+#ifdef CONFIG_PCI_HCI -+struct hal_data_8192ce -+{ -+ VERSION_8192C VersionID; -+ RT_MULTI_FUNC MultiFunc; // For multi-function consideration. -+ RT_POLARITY_CTL PolarityCtl; // For Wifi PDn Polarity control. -+ RT_REGULATOR_MODE RegulatorMode; // switching regulator or LDO -+ u16 CustomerID; -+ -+ u16 FirmwareVersion; -+ u16 FirmwareVersionRev; -+ u16 FirmwareSubVersion; -+ -+ u32 IntrMask[2]; -+ u32 IntrMaskToSet[2]; -+ -+ u32 DisabledFunctions; -+ -+ //current WIFI_PHY values -+ u32 ReceiveConfig; -+ u32 TransmitConfig; -+ WIRELESS_MODE CurrentWirelessMode; -+ HT_CHANNEL_WIDTH CurrentChannelBW; -+ u8 CurrentChannel; -+ u8 nCur40MhzPrimeSC;// Control channel sub-carrier -+ -+ u16 BasicRateSet; -+ -+ //rf_ctrl -+ _lock rf_lock; -+ u8 rf_chip; -+ u8 rf_type; -+ u8 NumTotalRFPath; -+ -+ INTERFACE_SELECT_8192CPCIe InterfaceSel; -+ -+ // -+ // EEPROM setting. -+ // -+ u16 EEPROMVID; -+ u16 EEPROMDID; -+ u16 EEPROMSVID; -+ u16 EEPROMSMID; -+ u16 EEPROMChannelPlan; -+ u16 EEPROMVersion; -+ -+ u8 EEPROMChnlAreaTxPwrCCK[2][3]; -+ u8 EEPROMChnlAreaTxPwrHT40_1S[2][3]; -+ u8 EEPROMChnlAreaTxPwrHT40_2SDiff[2][3]; -+ u8 EEPROMPwrLimitHT20[3]; -+ u8 EEPROMPwrLimitHT40[3]; -+ -+ u8 bTXPowerDataReadFromEEPORM; -+ u8 EEPROMThermalMeter; -+ u8 EEPROMTSSI[2]; -+ -+ u8 EEPROMCustomerID; -+ u8 EEPROMBoardType; -+ u8 EEPROMRegulatory; -+ -+ u8 bDefaultAntenna; -+ u8 bIQKInitialized; -+ -+ u8 TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ u8 TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ u8 TxPwrLevelHT40_2S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ s8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// HT 20<->40 Pwr diff -+ u8 TxPwrLegacyHtDiff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// For HT<->legacy pwr diff -+ // For power group -+ u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ -+ u8 LegacyHTTxPowerDiff;// Legacy to HT rate power diff -+ -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv bt_coexist; -+#endif -+ -+ // Read/write are allow for following hardware information variables -+ u8 framesync; -+ u32 framesyncC34; -+ u8 framesyncMonitor; -+ u8 DefaultInitialGain[4]; -+ u8 pwrGroupCnt; -+ u32 MCSTxPowerLevelOriginalOffset[7][16]; -+ u32 CCKTxPowerLevelOriginalOffset; -+ -+ u32 AntennaTxPath; // Antenna path Tx -+ u32 AntennaRxPath; // Antenna path Rx -+ u8 BluetoothCoexist; -+ u8 ExternalPA; -+ -+ //u32 LedControlNum; -+ //u32 LedControlMode; -+ u8 bLedOpenDrain; // Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16. -+ //u32 TxPowerTrackControl; -+ u8 b1x1RecvCombine; // for 1T1R receive combining -+ -+ u8 bCurrentTurboEDCA; -+ u32 AcParam_BE; //Original parameter for BE, use for EDCA turbo. -+ -+ //vivi, for tx power tracking, 20080407 -+ //u16 TSSI_13dBm; -+ //u32 Pwr_Track; -+ // The current Tx Power Level -+ u8 CurrentCckTxPwrIdx; -+ u8 CurrentOfdm24GTxPwrIdx; -+ -+ BB_REGISTER_DEFINITION_T PHYRegDef[4]; //Radio A/B/C/D -+ -+ BOOLEAN bRFPathRxEnable[4]; // We support 4 RF path now. -+ -+ u32 RfRegChnlVal[2]; -+ -+ u8 bCckHighPower; -+ -+ //RDG enable -+ BOOLEAN bRDGEnable; -+ -+ //for host message to fw -+ u8 LastHMEBoxNum; -+ -+ u8 fw_ractrl; -+ u8 RegTxPause; -+ // Beacon function related global variable. -+ u32 RegBcnCtrlVal; -+ u8 RegFwHwTxQCtrl; -+ u8 RegReg542; -+ u8 CurAntenna; -+ u8 AntDivCfg; -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ //SW Antenna Switch -+ s32 RSSI_sum_A; -+ s32 RSSI_sum_B; -+ s32 RSSI_cnt_A; -+ s32 RSSI_cnt_B; -+ BOOLEAN RSSI_test; -+#endif -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ //Hybrid Antenna Diversity -+ u32 CCK_Ant1_Cnt; -+ u32 CCK_Ant2_Cnt; -+ u32 OFDM_Ant1_Cnt; -+ u32 OFDM_Ant2_Cnt; -+#endif -+ -+ struct dm_priv dmpriv; -+ u8 bDumpRxPkt;//for debug -+#ifdef DBG_CONFIG_ERROR_DETECT -+ struct sreset_priv srestpriv; -+#endif -+ u8 bInterruptMigration; -+ u8 bDisableTxInt; -+ u8 bGpioHwWpsPbc; -+ -+ u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. -+ -+ u16 EfuseUsedBytes; -+ -+#ifdef CONFIG_P2P -+ struct P2P_PS_Offload_t p2p_ps_offload; -+#endif //CONFIG_P2P -+}; -+ -+typedef struct hal_data_8192ce HAL_DATA_TYPE, *PHAL_DATA_TYPE; -+ -+// -+// Function disabled. -+// -+#define DF_TX_BIT BIT0 -+#define DF_RX_BIT BIT1 -+#define DF_IO_BIT BIT2 -+#define DF_IO_D3_BIT BIT3 -+ -+#define RT_DF_TYPE u32 -+#define RT_DISABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions |= ((RT_DF_TYPE)(__FuncBits))) -+#define RT_ENABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions &= (~((RT_DF_TYPE)(__FuncBits)))) -+#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) -+#define IS_MULTI_FUNC_CHIP(_Adapter) (((((PHAL_DATA_TYPE)(_Adapter->HalData))->MultiFunc) & (RT_MULTI_FUNC_BT|RT_MULTI_FUNC_GPS)) ? _TRUE : _FALSE) -+ -+void InterruptRecognized8192CE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -+VOID UpdateInterruptMask8192CE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); -+#endif -+ -+#ifdef CONFIG_USB_HCI -+struct hal_data_8192cu -+{ -+ VERSION_8192C VersionID; -+ RT_MULTI_FUNC MultiFunc; // For multi-function consideration. -+ RT_POLARITY_CTL PolarityCtl; // For Wifi PDn Polarity control. -+ RT_REGULATOR_MODE RegulatorMode; // switching regulator or LDO -+ u16 CustomerID; -+ -+ u16 FirmwareVersion; -+ u16 FirmwareVersionRev; -+ u16 FirmwareSubVersion; -+ -+ //current WIFI_PHY values -+ u32 ReceiveConfig; -+ WIRELESS_MODE CurrentWirelessMode; -+ HT_CHANNEL_WIDTH CurrentChannelBW; -+ u8 CurrentChannel; -+ u8 nCur40MhzPrimeSC;// Control channel sub-carrier -+ -+ u16 BasicRateSet; -+ -+ //rf_ctrl -+ u8 rf_chip; -+ u8 rf_type; -+ u8 NumTotalRFPath; -+ -+ u8 BoardType; -+ //INTERFACE_SELECT_8192CUSB InterfaceSel; -+ -+ // -+ // EEPROM setting. -+ // -+ u16 EEPROMVID; -+ u16 EEPROMPID; -+ u16 EEPROMSVID; -+ u16 EEPROMSDID; -+ u8 EEPROMCustomerID; -+ u8 EEPROMSubCustomerID; -+ u8 EEPROMVersion; -+ u8 EEPROMRegulatory; -+ -+ u8 bTXPowerDataReadFromEEPORM; -+ u8 EEPROMThermalMeter; -+ -+ u8 bIQKInitialized; -+ -+ u8 TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ u8 TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ u8 TxPwrLevelHT40_2S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ s8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// HT 20<->40 Pwr diff -+ u8 TxPwrLegacyHtDiff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// For HT<->legacy pwr diff -+ // For power group -+ u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ -+ u8 LegacyHTTxPowerDiff;// Legacy to HT rate power diff -+ -+ // Read/write are allow for following hardware information variables -+ u8 framesync; -+ u32 framesyncC34; -+ u8 framesyncMonitor; -+ u8 DefaultInitialGain[4]; -+ u8 pwrGroupCnt; -+ u32 MCSTxPowerLevelOriginalOffset[7][16]; -+ u32 CCKTxPowerLevelOriginalOffset; -+ -+ u32 AntennaTxPath; // Antenna path Tx -+ u32 AntennaRxPath; // Antenna path Rx -+ u8 BluetoothCoexist; -+ u8 ExternalPA; -+ -+ u8 bLedOpenDrain; // Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16. -+ -+ //u32 LedControlNum; -+ //u32 LedControlMode; -+ //u32 TxPowerTrackControl; -+ u8 b1x1RecvCombine; // for 1T1R receive combining -+ -+ u8 bCurrentTurboEDCA; -+ u32 AcParam_BE; //Original parameter for BE, use for EDCA turbo. -+ -+ //vivi, for tx power tracking, 20080407 -+ //u16 TSSI_13dBm; -+ //u32 Pwr_Track; -+ // The current Tx Power Level -+ u8 CurrentCckTxPwrIdx; -+ u8 CurrentOfdm24GTxPwrIdx; -+ -+ BB_REGISTER_DEFINITION_T PHYRegDef[4]; //Radio A/B/C/D -+ -+ BOOLEAN bRFPathRxEnable[4]; // We support 4 RF path now. -+ -+ u32 RfRegChnlVal[2]; -+ -+ u8 bCckHighPower; -+ -+ //RDG enable -+ BOOLEAN bRDGEnable; -+ -+ //for host message to fw -+ u8 LastHMEBoxNum; -+ -+ u8 fw_ractrl; -+ u8 RegTxPause; -+ // Beacon function related global variable. -+ u32 RegBcnCtrlVal; -+ u8 RegFwHwTxQCtrl; -+ u8 RegReg542; -+ -+ struct dm_priv dmpriv; -+#ifdef DBG_CONFIG_ERROR_DETECT -+ struct sreset_priv srestpriv; -+#endif -+ -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv bt_coexist; -+#endif -+ u8 CurAntenna; -+ u8 AntDivCfg; -+ -+#ifdef CONFIG_SW_ANTENNA_DIVERSITY -+ //SW Antenna Switch -+ s32 RSSI_sum_A; -+ s32 RSSI_sum_B; -+ s32 RSSI_cnt_A; -+ s32 RSSI_cnt_B; -+ BOOLEAN RSSI_test; -+#endif -+#ifdef CONFIG_HW_ANTENNA_DIVERSITY -+ //Hybrid Antenna Diversity -+ u32 CCK_Ant1_Cnt; -+ u32 CCK_Ant2_Cnt; -+ u32 OFDM_Ant1_Cnt; -+ u32 OFDM_Ant2_Cnt; -+#endif -+ -+ u8 bDumpRxPkt;//for debug -+ u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. -+ -+ // 2010/08/09 MH Add CU power down mode. -+ BOOLEAN pwrdown; -+ -+ // For 92C USB endpoint setting -+ // -+ -+ u32 UsbBulkOutSize; -+ -+ int RtBulkOutPipe[3]; -+ int RtBulkInPipe; -+ int RtIntInPipe; -+ // Add for dual MAC 0--Mac0 1--Mac1 -+ u32 interfaceIndex; -+ -+ u8 OutEpQueueSel; -+ u8 OutEpNumber; -+ -+ u8 Queue2EPNum[8];//for out endpoint number mapping -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ u8 UsbTxAggMode; -+ u8 UsbTxAggDescNum; -+#endif -+#ifdef CONFIG_USB_RX_AGGREGATION -+ u16 HwRxPageSize; // Hardware setting -+ u32 MaxUsbRxAggBlock; -+ -+ USB_RX_AGG_MODE UsbRxAggMode; -+ u8 UsbRxAggBlockCount; // USB Block count. Block size is 512-byte in hight speed and 64-byte in full speed -+ u8 UsbRxAggBlockTimeout; -+ u8 UsbRxAggPageCount; // 8192C DMA page count -+ u8 UsbRxAggPageTimeout; -+#endif -+ -+ // 2010/12/10 MH Add for USB aggreation mode dynamic shceme. -+ BOOLEAN UsbRxHighSpeedMode; -+ -+ // 2010/11/22 MH Add for slim combo debug mode selective. -+ // This is used for fix the drawback of CU TSMC-A/UMC-A cut. HW auto suspend ability. Close BT clock. -+ BOOLEAN SlimComboDbg; -+ -+ u16 EfuseUsedBytes; -+ -+#ifdef CONFIG_P2P -+ struct P2P_PS_Offload_t p2p_ps_offload; -+#endif //CONFIG_P2P -+}; -+ -+typedef struct hal_data_8192cu HAL_DATA_TYPE, *PHAL_DATA_TYPE; -+#endif -+ -+#define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData)) -+#define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type) -+ -+#define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT) -+#define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS) -+ -+VOID rtl8192c_FirmwareSelfReset(IN PADAPTER Adapter); -+int FirmwareDownload92C(IN PADAPTER Adapter,IN BOOLEAN bUsedWoWLANFw); -+VOID InitializeFirmwareVars92C(PADAPTER Adapter); -+u8 GetEEPROMSize8192C(PADAPTER Adapter); -+void rtl8192c_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -+VERSION_8192C rtl8192c_ReadChipVersion(IN PADAPTER Adapter); -+void rtl8192c_ReadBluetoothCoexistInfo(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); -+//void rtl8192c_free_hal_data(_adapter * padapter); -+VOID rtl8192c_EfuseParseIDCode(PADAPTER pAdapter, u8 *hwinfo); -+void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc); -+ -+s32 c2h_id_filter_ccx_8192c(u8 id); -+#endif -+ -+#ifdef CONFIG_MP_INCLUDED -+ -+extern void Hal_SetAntenna(PADAPTER pAdapter); -+extern void Hal_SetBandwidth(PADAPTER pAdapter); -+ -+extern void Hal_SetTxPower(PADAPTER pAdapter); -+extern void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetSingleToneTx ( PADAPTER pAdapter , u8 bStart ); -+extern void Hal_SetSingleCarrierTx (PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetContinuousTx (PADAPTER pAdapter, u8 bStart); -+ -+extern void Hal_SetDataRate(PADAPTER pAdapter); -+extern void Hal_SetChannel(PADAPTER pAdapter); -+extern void Hal_SetAntennaPathPower(PADAPTER pAdapter); -+extern s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther); -+extern s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable); -+extern void Hal_GetPowerTracking(PADAPTER padapter, u8 * enable); -+extern void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value); -+extern void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter); -+extern void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14); -+extern void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven); -+extern void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 * TxPower); -+extern void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 * TxPower); -+extern void Hal_TriggerRFThermalMeter(PADAPTER pAdapter); -+extern u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter); -+extern void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); -+ -+#endif -+ -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h -@@ -0,0 +1,42 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192C_LED_H_ -+#define __RTL8192C_LED_H_ -+ -+#include -+#include -+#include -+ -+ -+//================================================================================ -+// Interface to manipulate LED objects. -+//================================================================================ -+#ifdef CONFIG_USB_HCI -+void rtl8192cu_InitSwLeds(_adapter *padapter); -+void rtl8192cu_DeInitSwLeds(_adapter *padapter); -+#endif -+#ifdef CONFIG_PCI_HCI -+void rtl8192ce_gen_RefreshLedState(PADAPTER Adapter); -+void rtl8192ce_InitSwLeds(_adapter *padapter); -+void rtl8192ce_DeInitSwLeds(_adapter *padapter); -+#endif -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h -@@ -0,0 +1,184 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL8192C_RECV_H_ -+#define _RTL8192C_RECV_H_ -+ -+#include -+#include -+#include -+ -+ -+#ifdef PLATFORM_OS_XP -+ #define NR_RECVBUFF (16) -+#elif defined(PLATFORM_OS_CE) -+ #define NR_RECVBUFF (4) -+#else -+#ifdef CONFIG_SINGLE_RECV_BUF -+ #define NR_RECVBUFF (1) -+#else -+ #define NR_RECVBUFF (4) -+#endif //CONFIG_SINGLE_RECV_BUF -+ -+ #define NR_PREALLOC_RECV_SKB (8) -+#endif -+ -+ -+#define RECV_BLK_SZ 512 -+#define RECV_BLK_CNT 16 -+#define RECV_BLK_TH RECV_BLK_CNT -+ -+#if defined(CONFIG_USB_HCI) -+ -+#ifdef PLATFORM_OS_CE -+#define MAX_RECVBUF_SZ (8192+1024) // 8K+1k -+#else -+ #ifndef CONFIG_MINIMAL_MEMORY_USAGE -+ //#define MAX_RECVBUF_SZ (32768) // 32k -+ //#define MAX_RECVBUF_SZ (16384) //16K -+ //#define MAX_RECVBUF_SZ (10240) //10K -+ #ifdef CONFIG_PLATFORM_MSTAR -+ #define MAX_RECVBUF_SZ (8192) // 8K -+ #else -+ #define MAX_RECVBUF_SZ (15360) // 15k < 16k -+ #endif -+ //#define MAX_RECVBUF_SZ (8192+1024) // 8K+1k -+ #else -+ #define MAX_RECVBUF_SZ (4000) // about 4K -+ #endif -+#endif -+ -+#elif defined(CONFIG_PCI_HCI) -+//#ifndef CONFIG_MINIMAL_MEMORY_USAGE -+// #define MAX_RECVBUF_SZ (9100) -+//#else -+ #define MAX_RECVBUF_SZ (4000) // about 4K -+//#endif -+ -+#define RX_MPDU_QUEUE 0 -+#define RX_CMD_QUEUE 1 -+#define RX_MAX_QUEUE 2 -+#endif -+ -+ -+#define RECV_BULK_IN_ADDR 0x80 -+#define RECV_INT_IN_ADDR 0x81 -+ -+#define PHY_RSSI_SLID_WIN_MAX 100 -+#define PHY_LINKQUALITY_SLID_WIN_MAX 20 -+ -+ -+struct phy_stat -+{ -+ unsigned int phydw0; -+ -+ unsigned int phydw1; -+ -+ unsigned int phydw2; -+ -+ unsigned int phydw3; -+ -+ unsigned int phydw4; -+ -+ unsigned int phydw5; -+ -+ unsigned int phydw6; -+ -+ unsigned int phydw7; -+}; -+ -+typedef struct _Phy_OFDM_Rx_Status_Report_8192cd -+{ -+ unsigned char trsw_gain_X[4]; -+ unsigned char pwdb_all; -+ unsigned char cfosho_X[4]; -+ unsigned char cfotail_X[4]; -+ unsigned char rxevm_X[2]; -+ unsigned char rxsnr_X[4]; -+ unsigned char pdsnr_X[2]; -+ unsigned char csi_current_X[2]; -+ unsigned char csi_target_X[2]; -+ unsigned char sigevm; -+ unsigned char max_ex_pwr; -+//#ifdef RTL8192SE -+#ifdef CONFIG_LITTLE_ENDIAN -+ unsigned char ex_intf_flg:1; -+ unsigned char sgi_en:1; -+ unsigned char rxsc:2; -+ //unsigned char rsvd:4; -+ unsigned char idle_long:1; -+ unsigned char r_ant_train_en:1; -+ unsigned char ANTSELB:1; -+ unsigned char ANTSEL:1; -+#else // _BIG_ENDIAN_ -+ //unsigned char rsvd:4; -+ unsigned char ANTSEL:1; -+ unsigned char ANTSELB:1; -+ unsigned char r_ant_train_en:1; -+ unsigned char idle_long:1; -+ unsigned char rxsc:2; -+ unsigned char sgi_en:1; -+ unsigned char ex_intf_flg:1; -+#endif -+//#else // RTL8190, RTL8192E -+// unsigned char sgi_en; -+// unsigned char rxsc_sgien_exflg; -+//#endif -+} __attribute__ ((packed))PHY_STS_OFDM_8192CD_T,PHY_RX_DRIVER_INFO_8192CD; -+ -+typedef struct _Phy_CCK_Rx_Status_Report_8192cd -+{ -+ /* For CCK rate descriptor. This is a signed 8:1 variable. LSB bit presend -+ 0.5. And MSB 7 bts presend a signed value. Range from -64~+63.5. */ -+ u8 adc_pwdb_X[4]; -+ u8 SQ_rpt; -+ u8 cck_agc_rpt; -+} PHY_STS_CCK_8192CD_T; -+ -+ -+// Rx smooth factor -+#define Rx_Smooth_Factor (20) -+ -+ -+#ifdef CONFIG_USB_HCI -+typedef struct _INTERRUPT_MSG_FORMAT_EX{ -+ unsigned int C2H_MSG0; -+ unsigned int C2H_MSG1; -+ unsigned int C2H_MSG2; -+ unsigned int C2H_MSG3; -+ unsigned int HISR; // from HISR Reg0x124, read to clear -+ unsigned int HISRE;// from HISRE Reg0x12c, read to clear -+ unsigned int MSG_EX; -+}INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX; -+ -+void rtl8192cu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); -+int rtl8192cu_init_recv_priv(_adapter * padapter); -+void rtl8192cu_free_recv_priv(_adapter * padapter); -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+int rtl8192ce_init_recv_priv(_adapter * padapter); -+void rtl8192ce_free_recv_priv(_adapter * padapter); -+#endif -+ -+void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_info); -+void rtl8192c_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h -@@ -0,0 +1,92 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/****************************************************************************** -+ * -+ * -+ * Module: rtl8192c_rf.h ( Header File) -+ * -+ * Note: Collect every HAL RF type exter API or constant. -+ * -+ * Function: -+ * -+ * Export: -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * -+ * 09/25/2008 MHC Create initial version. -+ * -+ * -+******************************************************************************/ -+#ifndef _RTL8192C_RF_H_ -+#define _RTL8192C_RF_H_ -+/* Check to see if the file has been included already. */ -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+// -+// For RF 6052 Series -+// -+#define RF6052_MAX_TX_PWR 0x3F -+#define RF6052_MAX_REG 0x3F -+#define RF6052_MAX_PATH 2 -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+/*------------------------------Define structure----------------------------*/ -+ -+/*------------------------------Define structure----------------------------*/ -+ -+ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export global variable----------------------------*/ -+ -+/*------------------------Export Marco Definition---------------------------*/ -+ -+/*------------------------Export Marco Definition---------------------------*/ -+ -+ -+/*--------------------------Exported Function prototype---------------------*/ -+ -+// -+// RF RL6052 Series API -+// -+void rtl8192c_RF_ChangeTxPath( IN PADAPTER Adapter, -+ IN u16 DataRate); -+void rtl8192c_PHY_RF6052SetBandwidth( -+ IN PADAPTER Adapter, -+ IN HT_CHANNEL_WIDTH Bandwidth); -+VOID rtl8192c_PHY_RF6052SetCckTxPower( -+ IN PADAPTER Adapter, -+ IN u8* pPowerlevel); -+VOID rtl8192c_PHY_RF6052SetOFDMTxPower( -+ IN PADAPTER Adapter, -+ IN u8* pPowerLevel, -+ IN u8 Channel); -+int PHY_RF6052_Config8192C( IN PADAPTER Adapter ); -+ -+/*--------------------------Exported Function prototype---------------------*/ -+ -+ -+#endif/* End of HalRf.h */ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h -@@ -0,0 +1,1865 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192C_SPEC_H__ -+#define __RTL8192C_SPEC_H__ -+ -+#include -+ -+#ifndef BIT -+#define BIT(x) (1 << (x)) -+#endif -+ -+#define BIT0 0x00000001 -+#define BIT1 0x00000002 -+#define BIT2 0x00000004 -+#define BIT3 0x00000008 -+#define BIT4 0x00000010 -+#define BIT5 0x00000020 -+#define BIT6 0x00000040 -+#define BIT7 0x00000080 -+#define BIT8 0x00000100 -+#define BIT9 0x00000200 -+#define BIT10 0x00000400 -+#define BIT11 0x00000800 -+#define BIT12 0x00001000 -+#define BIT13 0x00002000 -+#define BIT14 0x00004000 -+#define BIT15 0x00008000 -+#define BIT16 0x00010000 -+#define BIT17 0x00020000 -+#define BIT18 0x00040000 -+#define BIT19 0x00080000 -+#define BIT20 0x00100000 -+#define BIT21 0x00200000 -+#define BIT22 0x00400000 -+#define BIT23 0x00800000 -+#define BIT24 0x01000000 -+#define BIT25 0x02000000 -+#define BIT26 0x04000000 -+#define BIT27 0x08000000 -+#define BIT28 0x10000000 -+#define BIT29 0x20000000 -+#define BIT30 0x40000000 -+#define BIT31 0x80000000 -+ -+ -+//============================================================ -+// 8192C Regsiter offset definition -+//============================================================ -+ -+ -+//============================================================ -+// -+//============================================================ -+ -+//----------------------------------------------------- -+// -+// 0x0000h ~ 0x00FFh System Configuration -+// -+//----------------------------------------------------- -+#define REG_SYS_ISO_CTRL 0x0000 -+#define REG_SYS_FUNC_EN 0x0002 -+#define REG_APS_FSMCO 0x0004 -+#define REG_SYS_CLKR 0x0008 -+#define REG_9346CR 0x000A -+#define REG_EE_VPD 0x000C -+#define REG_AFE_MISC 0x0010 -+#define REG_SPS0_CTRL 0x0011 -+#define REG_SPS_OCP_CFG 0x0018 -+#define REG_RSV_CTRL 0x001C -+#define REG_RF_CTRL 0x001F -+#define REG_LDOA15_CTRL 0x0020 -+#define REG_LDOV12D_CTRL 0x0021 -+#define REG_LDOHCI12_CTRL 0x0022 -+#define REG_LPLDO_CTRL 0x0023 -+#define REG_AFE_XTAL_CTRL 0x0024 -+#define REG_AFE_PLL_CTRL 0x0028 -+#define REG_EFUSE_CTRL 0x0030 -+#define REG_EFUSE_TEST 0x0034 -+#define REG_PWR_DATA 0x0038 -+#define REG_CAL_TIMER 0x003C -+#define REG_ACLK_MON 0x003E -+#define REG_GPIO_MUXCFG 0x0040 -+#define REG_GPIO_IO_SEL 0x0042 -+#define REG_MAC_PINMUX_CFG 0x0043 -+#define REG_GPIO_PIN_CTRL 0x0044 -+#define REG_GPIO_INTM 0x0048 -+#define REG_LEDCFG0 0x004C -+#define REG_LEDCFG1 0x004D -+#define REG_LEDCFG2 0x004E -+#define REG_LEDCFG3 0x004F -+#define REG_LEDCFG REG_LEDCFG2 -+#define REG_FSIMR 0x0050 -+#define REG_FSISR 0x0054 -+#define REG_HSIMR 0x0058 -+#define REG_HSISR 0x005c -+#define REG_GPIO_PIN_CTRL_2 0x0060 // RTL8723 WIFI/BT/GPS Multi-Function GPIO Pin Control. -+#define REG_GPIO_IO_SEL_2 0x0062 // RTL8723 WIFI/BT/GPS Multi-Function GPIO Select. -+#define REG_MULTI_FUNC_CTRL 0x0068 // RTL8723 WIFI/BT/GPS Multi-Function control source. -+#define REG_MCUFWDL 0x0080 -+#ifdef CONFIG_WOWLAN -+#define REG_WOWLAN_REASON 0x0081 -+#endif //CONFIG_WOWLAN -+#define REG_HMEBOX_EXT_0 0x0088 -+#define REG_HMEBOX_EXT_1 0x008A -+#define REG_HMEBOX_EXT_2 0x008C -+#define REG_HMEBOX_EXT_3 0x008E -+#define REG_HOST_SUSP_CNT 0x00BC // Host suspend counter on FPGA platform -+#define REG_EFUSE_ACCESS 0x00CF // Efuse access protection for RTL8723 -+#define REG_BIST_SCAN 0x00D0 -+#define REG_BIST_RPT 0x00D4 -+#define REG_BIST_ROM_RPT 0x00D8 -+#define REG_USB_SIE_INTF 0x00E0 -+#define REG_PCIE_MIO_INTF 0x00E4 -+#define REG_PCIE_MIO_INTD 0x00E8 -+#define REG_HPON_FSM 0x00EC -+#define REG_SYS_CFG 0x00F0 -+#define REG_GPIO_OUTSTS 0x00F4 // For RTL8723 only. -+ -+//----------------------------------------------------- -+// -+// 0x0100h ~ 0x01FFh MACTOP General Configuration -+// -+//----------------------------------------------------- -+#define REG_CR 0x0100 -+#define REG_PBP 0x0104 -+#define REG_TRXDMA_CTRL 0x010C -+#define REG_TRXFF_BNDY 0x0114 -+#define REG_TRXFF_STATUS 0x0118 -+#define REG_RXFF_PTR 0x011C -+#define REG_HIMR 0x0120 -+#define REG_HISR 0x0124 -+#define REG_HIMRE 0x0128 -+#define REG_HISRE 0x012C -+#define REG_CPWM 0x012F -+#define REG_FWIMR 0x0130 -+#define REG_FWISR 0x0134 -+#define REG_PKTBUF_DBG_CTRL 0x0140 -+#define REG_PKTBUF_DBG_DATA_L 0x0144 -+#define REG_PKTBUF_DBG_DATA_H 0x0148 -+ -+#define REG_TC0_CTRL 0x0150 -+#define REG_TC1_CTRL 0x0154 -+#define REG_TC2_CTRL 0x0158 -+#define REG_TC3_CTRL 0x015C -+#define REG_TC4_CTRL 0x0160 -+#define REG_TCUNIT_BASE 0x0164 -+#define REG_MBIST_START 0x0174 -+#define REG_MBIST_DONE 0x0178 -+#define REG_MBIST_FAIL 0x017C -+#define REG_C2HEVT_MSG_NORMAL 0x01A0 -+#define REG_C2HEVT_CLEAR 0x01AF -+#define REG_C2HEVT_MSG_TEST 0x01B8 -+#define REG_MCUTST_1 0x01c0 -+#define REG_FMETHR 0x01C8 -+#define REG_HMETFR 0x01CC -+#define REG_HMEBOX_0 0x01D0 -+#define REG_HMEBOX_1 0x01D4 -+#define REG_HMEBOX_2 0x01D8 -+#define REG_HMEBOX_3 0x01DC -+ -+#define REG_LLT_INIT 0x01E0 -+#define REG_BB_ACCEESS_CTRL 0x01E8 -+#define REG_BB_ACCESS_DATA 0x01EC -+ -+ -+//----------------------------------------------------- -+// -+// 0x0200h ~ 0x027Fh TXDMA Configuration -+// -+//----------------------------------------------------- -+#define REG_RQPN 0x0200 -+#define REG_FIFOPAGE 0x0204 -+#define REG_TDECTRL 0x0208 -+#define REG_TXDMA_OFFSET_CHK 0x020C -+#define REG_TXDMA_STATUS 0x0210 -+#define REG_RQPN_NPQ 0x0214 -+ -+//----------------------------------------------------- -+// -+// 0x0280h ~ 0x02FFh RXDMA Configuration -+// -+//----------------------------------------------------- -+#define REG_RXDMA_AGG_PG_TH 0x0280 -+#define REG_RXPKT_NUM 0x0284 -+#define REG_RXDMA_STATUS 0x0288 -+ -+ -+//----------------------------------------------------- -+// -+// 0x0300h ~ 0x03FFh PCIe -+// -+//----------------------------------------------------- -+#define REG_PCIE_CTRL_REG 0x0300 -+#define REG_INT_MIG 0x0304 // Interrupt Migration -+#define REG_BCNQ_DESA 0x0308 // TX Beacon Descriptor Address -+#define REG_HQ_DESA 0x0310 // TX High Queue Descriptor Address -+#define REG_MGQ_DESA 0x0318 // TX Manage Queue Descriptor Address -+#define REG_VOQ_DESA 0x0320 // TX VO Queue Descriptor Address -+#define REG_VIQ_DESA 0x0328 // TX VI Queue Descriptor Address -+#define REG_BEQ_DESA 0x0330 // TX BE Queue Descriptor Address -+#define REG_BKQ_DESA 0x0338 // TX BK Queue Descriptor Address -+#define REG_RX_DESA 0x0340 // RX Queue Descriptor Address -+#define REG_DBI 0x0348 // Backdoor REG for Access Configuration -+#define REG_MDIO 0x0354 // MDIO for Access PCIE PHY -+#define REG_DBG_SEL 0x0360 // Debug Selection Register -+#define REG_PCIE_HRPWM 0x0361 //PCIe RPWM -+#define REG_PCIE_HCPWM 0x0363 //PCIe CPWM -+#define REG_UART_CTRL 0x0364 // UART Control -+#define REG_UART_TX_DESA 0x0370 // UART TX Descriptor Address -+#define REG_UART_RX_DESA 0x0378 // UART Rx Descriptor Address -+ -+ -+// spec version 11 -+//----------------------------------------------------- -+// -+// 0x0400h ~ 0x047Fh Protocol Configuration -+// -+//----------------------------------------------------- -+#define REG_VOQ_INFORMATION 0x0400 -+#define REG_VIQ_INFORMATION 0x0404 -+#define REG_BEQ_INFORMATION 0x0408 -+#define REG_BKQ_INFORMATION 0x040C -+#define REG_MGQ_INFORMATION 0x0410 -+#define REG_HGQ_INFORMATION 0x0414 -+#define REG_BCNQ_INFORMATION 0x0418 -+ -+ -+#define REG_CPU_MGQ_INFORMATION 0x041C -+#define REG_FWHW_TXQ_CTRL 0x0420 -+#define REG_HWSEQ_CTRL 0x0423 -+#define REG_TXPKTBUF_BCNQ_BDNY 0x0424 -+#define REG_TXPKTBUF_MGQ_BDNY 0x0425 -+#define REG_LIFETIME_EN 0x0426 -+#define REG_MULTI_BCNQ_OFFSET 0x0427 -+#define REG_SPEC_SIFS 0x0428 -+#define REG_RL 0x042A -+#define REG_DARFRC 0x0430 -+#define REG_RARFRC 0x0438 -+#define REG_RRSR 0x0440 -+#define REG_ARFR0 0x0444 -+#define REG_ARFR1 0x0448 -+#define REG_ARFR2 0x044C -+#define REG_ARFR3 0x0450 -+#define REG_AGGLEN_LMT 0x0458 -+#define REG_AMPDU_MIN_SPACE 0x045C -+#define REG_TXPKTBUF_WMAC_LBK_BF_HD 0x045D -+#define REG_FAST_EDCA_CTRL 0x0460 -+#define REG_RD_RESP_PKT_TH 0x0463 -+#define REG_INIRTS_RATE_SEL 0x0480 -+#define REG_INIDATA_RATE_SEL 0x0484 -+ -+//#define REG_FW_TSF_SYNC_CNT 0x04A0 -+#define REG_FW_RESET_TSF_CNT_1 0x05FC -+#define REG_FW_RESET_TSF_CNT_0 0x05FD -+#define REG_FW_BCN_DIS_CNT 0x05FE -+ -+#define REG_POWER_STATUS 0x04A4 -+#define REG_POWER_STAGE1 0x04B4 -+#define REG_POWER_STAGE2 0x04B8 -+#define REG_PKT_VO_VI_LIFE_TIME 0x04C0 -+#define REG_PKT_BE_BK_LIFE_TIME 0x04C2 -+#define REG_STBC_SETTING 0x04C4 -+#define REG_PROT_MODE_CTRL 0x04C8 -+#define REG_MAX_AGGR_NUM 0x04CA -+#define REG_RTS_MAX_AGGR_NUM 0x04CB -+#define REG_BAR_MODE_CTRL 0x04CC -+#define REG_RA_TRY_RATE_AGG_LMT 0x04CF -+#define REG_NQOS_SEQ 0x04DC -+#define REG_QOS_SEQ 0x04DE -+#define REG_NEED_CPU_HANDLE 0x04E0 -+#define REG_PKT_LOSE_RPT 0x04E1 -+#define REG_PTCL_ERR_STATUS 0x04E2 -+#define REG_DUMMY 0x04FC -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0x0500h ~ 0x05FFh EDCA Configuration -+// -+//----------------------------------------------------- -+#define REG_EDCA_VO_PARAM 0x0500 -+#define REG_EDCA_VI_PARAM 0x0504 -+#define REG_EDCA_BE_PARAM 0x0508 -+#define REG_EDCA_BK_PARAM 0x050C -+#define REG_BCNTCFG 0x0510 -+#define REG_PIFS 0x0512 -+#define REG_RDG_PIFS 0x0513 -+#define REG_SIFS_CCK 0x0514 -+#define REG_SIFS_OFDM 0x0516 -+#define REG_SIFS_CTX 0x0514 -+#define REG_SIFS_TRX 0x0516 -+#define REG_TSFTR_SYN_OFFSET 0x0518 -+#define REG_AGGR_BREAK_TIME 0x051A -+#define REG_SLOT 0x051B -+#define REG_TX_PTCL_CTRL 0x0520 -+#define REG_TXPAUSE 0x0522 -+#define REG_DIS_TXREQ_CLR 0x0523 -+#define REG_RD_CTRL 0x0524 -+#define REG_TBTT_PROHIBIT 0x0540 -+#define REG_RD_NAV_NXT 0x0544 -+#define REG_NAV_PROT_LEN 0x0546 -+#define REG_BCN_CTRL 0x0550 -+#define REG_BCN_CTRL_1 0x0551 -+#define REG_MBID_NUM 0x0552 -+#define REG_DUAL_TSF_RST 0x0553 -+#define REG_BCN_INTERVAL 0x0554 // The same as REG_MBSSID_BCN_SPACE -+#define REG_MBSSID_BCN_SPACE 0x0554 -+#define REG_DRVERLYINT 0x0558 -+#define REG_BCNDMATIM 0x0559 -+#define REG_ATIMWND 0x055A -+#define REG_BCN_MAX_ERR 0x055D -+#define REG_RXTSF_OFFSET_CCK 0x055E -+#define REG_RXTSF_OFFSET_OFDM 0x055F -+#define REG_TSFTR 0x0560 -+#define REG_TSFTR1 0x0568 -+#define REG_INIT_TSFTR 0x0564 -+#define REG_ATIMWND_1 0x0570 -+#define REG_PSTIMER 0x0580 -+#define REG_TIMER0 0x0584 -+#define REG_TIMER1 0x0588 -+#define REG_ACMHWCTRL 0x05C0 -+#define REG_ACMRSTCTRL 0x05C1 -+#define REG_ACMAVG 0x05C2 -+#define REG_VO_ADMTIME 0x05C4 -+#define REG_VI_ADMTIME 0x05C6 -+#define REG_BE_ADMTIME 0x05C8 -+#define REG_EDCA_RANDOM_GEN 0x05CC -+#define REG_SCH_TXCMD 0x05D0 -+ -+ -+//----------------------------------------------------- -+// -+// 0x0600h ~ 0x07FFh WMAC Configuration -+// -+//----------------------------------------------------- -+#define REG_APSD_CTRL 0x0600 -+#define REG_BWOPMODE 0x0603 -+#define REG_TCR 0x0604 -+#define REG_RCR 0x0608 -+#define REG_RX_PKT_LIMIT 0x060C -+#define REG_RX_DLK_TIME 0x060D -+#define REG_RX_DRVINFO_SZ 0x060F -+ -+#define REG_MACID 0x0610 -+#define REG_BSSID 0x0618 -+#define REG_MAR 0x0620 -+#define REG_MBIDCAMCFG 0x0628 -+ -+#define REG_USTIME_EDCA 0x0638 -+#define REG_MAC_SPEC_SIFS 0x063A -+ -+// 20100719 Joseph: Hardware register definition change. (HW datasheet v54) -+#define REG_R2T_SIFS 0x063C // [15:8]SIFS_R2T_OFDM, [7:0]SIFS_R2T_CCK -+#define REG_T2T_SIFS 0x063E // [15:8]SIFS_T2T_OFDM, [7:0]SIFS_T2T_CCK -+#define REG_ACKTO 0x0640 -+#define REG_CTS2TO 0x0641 -+#define REG_EIFS 0x0642 -+ -+//WMA, BA, CCX -+#define REG_NAV_CTRL 0x0650 -+#define REG_BACAMCMD 0x0654 -+#define REG_BACAMCONTENT 0x0658 -+#define REG_LBDLY 0x0660 -+#define REG_FWDLY 0x0661 -+#define REG_RXERR_RPT 0x0664 -+#define REG_WMAC_TRXPTCL_CTL 0x0668 -+ -+ -+// Security -+#define REG_CAMCMD 0x0670 -+#define REG_CAMWRITE 0x0674 -+#define REG_CAMREAD 0x0678 -+#define REG_CAMDBG 0x067C -+#define REG_SECCFG 0x0680 -+ -+// Power -+#define REG_WOW_CTRL 0x0690 -+#define REG_PSSTATUS 0x0691 -+#define REG_PS_RX_INFO 0x0692 -+#define REG_LPNAV_CTRL 0x0694 -+#define REG_WKFMCAM_CMD 0x0698 -+#define REG_WKFMCAM_RWD 0x069C -+#define REG_RXFLTMAP0 0x06A0 -+#define REG_RXFLTMAP1 0x06A2 -+#define REG_RXFLTMAP2 0x06A4 -+#define REG_BCN_PSR_RPT 0x06A8 -+#define REG_CALB32K_CTRL 0x06AC -+#define REG_PKT_MON_CTRL 0x06B4 -+#define REG_BT_COEX_TABLE 0x06C0 -+#define REG_WMAC_RESP_TXINFO 0x06D8 -+ -+#define REG_MACID1 0x0700 -+#define REG_BSSID1 0x0708 -+ -+ -+//----------------------------------------------------- -+// -+// 0xFE00h ~ 0xFE55h USB Configuration -+// -+//----------------------------------------------------- -+#define REG_USB_INFO 0xFE17 -+#define REG_USB_SPECIAL_OPTION 0xFE55 -+#define REG_USB_DMA_AGG_TO 0xFE5B -+#define REG_USB_AGG_TO 0xFE5C -+#define REG_USB_AGG_TH 0xFE5D -+ -+// For test chip -+#define REG_TEST_USB_TXQS 0xFE48 -+#define REG_TEST_SIE_VID 0xFE60 // 0xFE60~0xFE61 -+#define REG_TEST_SIE_PID 0xFE62 // 0xFE62~0xFE63 -+#define REG_TEST_SIE_OPTIONAL 0xFE64 -+#define REG_TEST_SIE_CHIRP_K 0xFE65 -+#define REG_TEST_SIE_PHY 0xFE66 // 0xFE66~0xFE6B -+#define REG_TEST_SIE_MAC_ADDR 0xFE70 // 0xFE70~0xFE75 -+#define REG_TEST_SIE_STRING 0xFE80 // 0xFE80~0xFEB9 -+ -+ -+// For normal chip -+#define REG_NORMAL_SIE_VID 0xFE60 // 0xFE60~0xFE61 -+#define REG_NORMAL_SIE_PID 0xFE62 // 0xFE62~0xFE63 -+#define REG_NORMAL_SIE_OPTIONAL 0xFE64 -+#define REG_NORMAL_SIE_EP 0xFE65 // 0xFE65~0xFE67 -+#define REG_NORMAL_SIE_PHY 0xFE68 // 0xFE68~0xFE6B -+#define REG_NORMAL_SIE_OPTIONAL2 0xFE6C -+#define REG_NORMAL_SIE_GPS_EP 0xFE6D // 0xFE6D, for RTL8723 only. -+#define REG_NORMAL_SIE_MAC_ADDR 0xFE70 // 0xFE70~0xFE75 -+#define REG_NORMAL_SIE_STRING 0xFE80 // 0xFE80~0xFEDF -+ -+ -+//----------------------------------------------------- -+// -+// Redifine 8192C register definition for compatibility -+// -+//----------------------------------------------------- -+ -+// TODO: use these definition when using REG_xxx naming rule. -+// NOTE: DO NOT Remove these definition. Use later. -+ -+#define SYS_ISO_CTRL REG_SYS_ISO_CTRL // System Isolation Interface Control. -+#define SYS_FUNC_EN REG_SYS_FUNC_EN // System Function Enable. -+#define SYS_CLK REG_SYS_CLKR -+#define CR9346 REG_9346CR // 93C46/93C56 Command Register. -+#define EFUSE_CTRL REG_EFUSE_CTRL // E-Fuse Control. -+#define EFUSE_TEST REG_EFUSE_TEST // E-Fuse Test. -+#define MSR (REG_CR + 2) // Media Status register -+#define ISR REG_HISR -+#define TSFR REG_TSFTR // Timing Sync Function Timer Register. -+ -+#define MACIDR0 REG_MACID // MAC ID Register, Offset 0x0050-0x0053 -+#define MACIDR4 (REG_MACID + 4) // MAC ID Register, Offset 0x0054-0x0055 -+ -+#define PBP REG_PBP -+ -+// Redifine MACID register, to compatible prior ICs. -+#define IDR0 MACIDR0 -+#define IDR4 MACIDR4 -+ -+ -+// -+// 9. Security Control Registers (Offset: ) -+// -+#define RWCAM REG_CAMCMD //IN 8190 Data Sheet is called CAMcmd -+#define WCAMI REG_CAMWRITE // Software write CAM input content -+#define RCAMO REG_CAMREAD // Software read/write CAM config -+#define CAMDBG REG_CAMDBG -+#define SECR REG_SECCFG //Security Configuration Register -+ -+// Unused register -+#define UnusedRegister 0x1BF -+#define DCAM UnusedRegister -+#define PSR UnusedRegister -+#define BBAddr UnusedRegister -+#define PhyDataR UnusedRegister -+ -+#define InvalidBBRFValue 0x12345678 -+ -+// Min Spacing related settings. -+#define MAX_MSS_DENSITY_2T 0x13 -+#define MAX_MSS_DENSITY_1T 0x0A -+ -+//---------------------------------------------------------------------------- -+// 8192C Cmd9346CR bits (Offset 0xA, 16bit) -+//---------------------------------------------------------------------------- -+#define CmdEEPROM_En BIT5 // EEPROM enable when set 1 -+#define CmdEERPOMSEL BIT4 // System EEPROM select, 0: boot from E-FUSE, 1: The EEPROM used is 9346 -+#define Cmd9346CR_9356SEL BIT4 -+#define AutoLoadEEPROM (CmdEEPROM_En|CmdEERPOMSEL) -+#define AutoLoadEFUSE CmdEEPROM_En -+ -+//---------------------------------------------------------------------------- -+// 8192C GPIO MUX Configuration Register (offset 0x40, 4 byte) -+//---------------------------------------------------------------------------- -+#define GPIOSEL_GPIO 0 -+#define GPIOSEL_ENBT BIT5 -+ -+//---------------------------------------------------------------------------- -+// 8192C GPIO PIN Control Register (offset 0x44, 4 byte) -+//---------------------------------------------------------------------------- -+#define GPIO_IN REG_GPIO_PIN_CTRL // GPIO pins input value -+#define GPIO_OUT (REG_GPIO_PIN_CTRL+1) // GPIO pins output value -+#define GPIO_IO_SEL (REG_GPIO_PIN_CTRL+2) // GPIO pins output enable when a bit is set to "1"; otherwise, input is configured. -+#define GPIO_MOD (REG_GPIO_PIN_CTRL+3) -+ -+//---------------------------------------------------------------------------- -+// 8192C (MSR) Media Status Register (Offset 0x4C, 8 bits) -+//---------------------------------------------------------------------------- -+/* -+Network Type -+00: No link -+01: Link in ad hoc network -+10: Link in infrastructure network -+11: AP mode -+Default: 00b. -+*/ -+#define MSR_NOLINK 0x00 -+#define MSR_ADHOC 0x01 -+#define MSR_INFRA 0x02 -+#define MSR_AP 0x03 -+ -+// -+// 6. Adaptive Control Registers (Offset: 0x0160 - 0x01CF) -+// -+//---------------------------------------------------------------------------- -+// 8192C Response Rate Set Register (offset 0x181, 24bits) -+//---------------------------------------------------------------------------- -+#define RRSR_RSC_OFFSET 21 -+#define RRSR_SHORT_OFFSET 23 -+#define RRSR_RSC_BW_40M 0x600000 -+#define RRSR_RSC_UPSUBCHNL 0x400000 -+#define RRSR_RSC_LOWSUBCHNL 0x200000 -+#define RRSR_SHORT 0x800000 -+#define RRSR_1M BIT0 -+#define RRSR_2M BIT1 -+#define RRSR_5_5M BIT2 -+#define RRSR_11M BIT3 -+#define RRSR_6M BIT4 -+#define RRSR_9M BIT5 -+#define RRSR_12M BIT6 -+#define RRSR_18M BIT7 -+#define RRSR_24M BIT8 -+#define RRSR_36M BIT9 -+#define RRSR_48M BIT10 -+#define RRSR_54M BIT11 -+#define RRSR_MCS0 BIT12 -+#define RRSR_MCS1 BIT13 -+#define RRSR_MCS2 BIT14 -+#define RRSR_MCS3 BIT15 -+#define RRSR_MCS4 BIT16 -+#define RRSR_MCS5 BIT17 -+#define RRSR_MCS6 BIT18 -+#define RRSR_MCS7 BIT19 -+#define BRSR_AckShortPmb BIT23 -+// CCK ACK: use Short Preamble or not -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C Rate Definition -+//---------------------------------------------------------------------------- -+//CCK -+#define RATR_1M 0x00000001 -+#define RATR_2M 0x00000002 -+#define RATR_55M 0x00000004 -+#define RATR_11M 0x00000008 -+//OFDM -+#define RATR_6M 0x00000010 -+#define RATR_9M 0x00000020 -+#define RATR_12M 0x00000040 -+#define RATR_18M 0x00000080 -+#define RATR_24M 0x00000100 -+#define RATR_36M 0x00000200 -+#define RATR_48M 0x00000400 -+#define RATR_54M 0x00000800 -+//MCS 1 Spatial Stream -+#define RATR_MCS0 0x00001000 -+#define RATR_MCS1 0x00002000 -+#define RATR_MCS2 0x00004000 -+#define RATR_MCS3 0x00008000 -+#define RATR_MCS4 0x00010000 -+#define RATR_MCS5 0x00020000 -+#define RATR_MCS6 0x00040000 -+#define RATR_MCS7 0x00080000 -+//MCS 2 Spatial Stream -+#define RATR_MCS8 0x00100000 -+#define RATR_MCS9 0x00200000 -+#define RATR_MCS10 0x00400000 -+#define RATR_MCS11 0x00800000 -+#define RATR_MCS12 0x01000000 -+#define RATR_MCS13 0x02000000 -+#define RATR_MCS14 0x04000000 -+#define RATR_MCS15 0x08000000 -+ -+//---------------------------------------------------------------------------- -+// 8192C BW_OPMODE bits (Offset 0x203, 8bit) -+//---------------------------------------------------------------------------- -+#define BW_OPMODE_20MHZ BIT2 -+#define BW_OPMODE_5G BIT1 -+#define BW_OPMODE_11J BIT0 -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C CAM Config Setting (offset 0x250, 1 byte) -+//---------------------------------------------------------------------------- -+#define CAM_VALID BIT15 -+#define CAM_NOTVALID 0x0000 -+#define CAM_USEDK BIT5 -+ -+#define CAM_CONTENT_COUNT 8 -+ -+#define CAM_NONE 0x0 -+#define CAM_WEP40 0x01 -+#define CAM_TKIP 0x02 -+#define CAM_AES 0x04 -+#define CAM_WEP104 0x05 -+ -+#define TOTAL_CAM_ENTRY 32 -+#define HALF_CAM_ENTRY 16 -+ -+#define CAM_CONFIG_USEDK _TRUE -+#define CAM_CONFIG_NO_USEDK _FALSE -+ -+#define CAM_WRITE BIT16 -+#define CAM_READ 0x00000000 -+#define CAM_POLLINIG BIT31 -+ -+#define SCR_UseDK 0x01 -+#define SCR_TxSecEnable 0x02 -+#define SCR_RxSecEnable 0x04 -+ -+ -+// -+// 12. Host Interrupt Status Registers (Offset: 0x0300 - 0x030F) -+// -+//---------------------------------------------------------------------------- -+// 8190 IMR/ISR bits (offset 0xfd, 8bits) -+//---------------------------------------------------------------------------- -+#define IMR8190_DISABLED 0x0 -+// IMR DW0 Bit 0-31 -+#define IMR_BCNDMAINT6 BIT31 // Beacon DMA Interrupt 6 -+#define IMR_BCNDMAINT5 BIT30 // Beacon DMA Interrupt 5 -+#define IMR_BCNDMAINT4 BIT29 // Beacon DMA Interrupt 4 -+#define IMR_BCNDMAINT3 BIT28 // Beacon DMA Interrupt 3 -+#define IMR_BCNDMAINT2 BIT27 // Beacon DMA Interrupt 2 -+#define IMR_BCNDMAINT1 BIT26 // Beacon DMA Interrupt 1 -+#define IMR_BCNDOK8 BIT25 // Beacon Queue DMA OK Interrup 8 -+#define IMR_BCNDOK7 BIT24 // Beacon Queue DMA OK Interrup 7 -+#define IMR_BCNDOK6 BIT23 // Beacon Queue DMA OK Interrup 6 -+#define IMR_BCNDOK5 BIT22 // Beacon Queue DMA OK Interrup 5 -+#define IMR_BCNDOK4 BIT21 // Beacon Queue DMA OK Interrup 4 -+#define IMR_BCNDOK3 BIT20 // Beacon Queue DMA OK Interrup 3 -+#define IMR_BCNDOK2 BIT19 // Beacon Queue DMA OK Interrup 2 -+#define IMR_BCNDOK1 BIT18 // Beacon Queue DMA OK Interrup 1 -+#define IMR_TIMEOUT2 BIT17 // Timeout interrupt 2 -+#define IMR_TIMEOUT1 BIT16 // Timeout interrupt 1 -+#define IMR_TXFOVW BIT15 // Transmit FIFO Overflow -+#define IMR_PSTIMEOUT BIT14 // Power save time out interrupt -+#define IMR_BcnInt BIT13 // Beacon DMA Interrupt 0 -+#define IMR_RXFOVW BIT12 // Receive FIFO Overflow -+#define IMR_RDU BIT11 // Receive Descriptor Unavailable -+#define IMR_ATIMEND BIT10 // For 92C,ATIM Window End Interrupt -+#define IMR_BDOK BIT9 // Beacon Queue DMA OK Interrup -+#define IMR_HIGHDOK BIT8 // High Queue DMA OK Interrupt -+#define IMR_TBDOK BIT7 // Transmit Beacon OK interrup -+#define IMR_MGNTDOK BIT6 // Management Queue DMA OK Interrupt -+#define IMR_TBDER BIT5 // For 92C,Transmit Beacon Error Interrupt -+#define IMR_BKDOK BIT4 // AC_BK DMA OK Interrupt -+#define IMR_BEDOK BIT3 // AC_BE DMA OK Interrupt -+#define IMR_VIDOK BIT2 // AC_VI DMA OK Interrupt -+#define IMR_VODOK BIT1 // AC_VO DMA Interrupt -+#define IMR_ROK BIT0 // Receive DMA OK Interrupt -+ -+#define IMR_RX_MASK (IMR_ROK|IMR_RDU|IMR_RXFOVW) -+#define IMR_TX_MASK (IMR_VODOK|IMR_VIDOK|IMR_BEDOK|IMR_BKDOK|IMR_MGNTDOK|IMR_HIGHDOK|IMR_BDOK) -+ -+// 13. Host Interrupt Status Extension Register (Offset: 0x012C-012Eh) -+#define IMR_BcnInt_E BIT12 -+#define IMR_TXERR BIT11 -+#define IMR_RXERR BIT10 -+#define IMR_C2HCMD BIT9 -+#define IMR_CPWM BIT8 -+//RSVD [2-7] -+#define IMR_OCPINT BIT1 -+#define IMR_WLANOFF BIT0 -+ -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C EFUSE -+//---------------------------------------------------------------------------- -+#define HWSET_MAX_SIZE 128 -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C EEPROM/EFUSE share register definition. -+//---------------------------------------------------------------------------- -+ -+// -+// Default Value for EEPROM or EFUSE!!! -+// -+#define EEPROM_Default_TSSI 0x0 -+#define EEPROM_Default_TxPowerDiff 0x0 -+#define EEPROM_Default_CrystalCap 0x5 -+#define EEPROM_Default_BoardType 0x02 // Default: 2X2, RTL8192CE(QFPN68) -+#define EEPROM_Default_TxPower 0x1010 -+#define EEPROM_Default_HT2T_TxPwr 0x10 -+ -+#define EEPROM_Default_LegacyHTTxPowerDiff 0x3 -+#define EEPROM_Default_ThermalMeter 0x12 -+ -+#define EEPROM_Default_AntTxPowerDiff 0x0 -+#define EEPROM_Default_TxPwDiff_CrystalCap 0x5 -+#define EEPROM_Default_TxPowerLevel 0x22 -+#define EEPROM_Default_HT40_2SDiff 0x0 -+#define EEPROM_Default_HT20_Diff 2 // HT20<->40 default Tx Power Index Difference -+#define EEPROM_Default_LegacyHTTxPowerDiff 0x3 -+#define EEPROM_Default_HT40_PwrMaxOffset 0 -+#define EEPROM_Default_HT20_PwrMaxOffset 0 -+ -+// For debug -+#define EEPROM_Default_PID 0x1234 -+#define EEPROM_Default_VID 0x5678 -+#define EEPROM_Default_CustomerID 0xAB -+#define EEPROM_Default_SubCustomerID 0xCD -+#define EEPROM_Default_Version 0 -+ -+#define EEPROM_CHANNEL_PLAN_FCC 0x0 -+#define EEPROM_CHANNEL_PLAN_IC 0x1 -+#define EEPROM_CHANNEL_PLAN_ETSI 0x2 -+#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 -+#define EEPROM_CHANNEL_PLAN_FRANCE 0x4 -+#define EEPROM_CHANNEL_PLAN_MKK 0x5 -+#define EEPROM_CHANNEL_PLAN_MKK1 0x6 -+#define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 -+#define EEPROM_CHANNEL_PLAN_TELEC 0x8 -+#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 -+#define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA -+#define EEPROM_CHANNEL_PLAN_NCC 0xB -+#define EEPROM_USB_OPTIONAL1 0xE -+#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 -+ -+ -+#define EEPROM_CID_DEFAULT 0x0 -+#define EEPROM_CID_TOSHIBA 0x4 -+#define EEPROM_CID_CCX 0x10 // CCX test. By Bruce, 2009-02-25. -+#define EEPROM_CID_QMI 0x0D -+#define EEPROM_CID_WHQL 0xFE // added by chiyoko for dtm, 20090108 -+ -+ -+#define RTL_EEPROM_ID 0x8129 -+ -+ -+#ifdef CONFIG_PCI_HCI -+#define RT_IBSS_INT_MASKS (IMR_BcnInt | IMR_TBDOK | IMR_TBDER) -+#define RT_AC_INT_MASKS (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK) -+#define RT_BSS_INT_MASKS (RT_IBSS_INT_MASKS) -+ -+// -+// Interface type. -+// -+typedef enum _INTERFACE_SELECT_8192CPCIe{ -+ INTF_SEL0_SOLO_MINICARD = 0, // WiFi solo-mCard -+ INTF_SEL1_BT_COMBO_MINICARD = 1, // WiFi+BT combo-mCard -+ INTF_SEL2_PCIe = 2, // PCIe Card -+} INTERFACE_SELECT_8192CPCIe, *PINTERFACE_SELECT_8192CPCIe; -+ -+#define RTL8190_EEPROM_ID 0x8129 // 0-1 -+#define EEPROM_HPON 0x02 // LDO settings.2-5 -+#define EEPROM_CLK 0x06 // Clock settings.6-7 -+#define EEPROM_TESTR 0x08 // SE Test mode.8 -+ -+#define EEPROM_VID 0x0A // SE Vendor ID.A-B -+#define EEPROM_DID 0x0C // SE Device ID. C-D -+#define EEPROM_SVID 0x0E // SE Vendor ID.E-F -+#define EEPROM_SMID 0x10 // SE PCI Subsystem ID. 10-11 -+ -+#define EEPROM_MAC_ADDR 0x16 // SEMAC Address. 12-17 -+ -+//---------------------------------------------------------------- -+// Ziv - Let PCIe and USB use the same define. Modify address mapping later. -+#define EEPROM_CCK_TX_PWR_INX 0x5A -+#define EEPROM_HT40_1S_TX_PWR_INX 0x60 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF 0x66 -+#define EEPROM_HT20_TX_PWR_INX_DIFF 0x69 -+#define EEPROM_OFDM_TX_PWR_INX_DIFF 0x6C -+#define EEPROM_HT40_MAX_PWR_OFFSET 0x6F -+#define EEPROM_HT20_MAX_PWR_OFFSET 0x72 -+ -+#define EEPROM_CHANNEL_PLAN 0x75 -+#define EEPROM_TSSI_A 0x76 -+#define EEPROM_TSSI_B 0x77 -+#define EEPROM_THERMAL_METER 0x78 -+#define EEPROM_RF_OPT1 0x79 -+#define EEPROM_RF_OPT2 0x7A -+#define EEPROM_RF_OPT3 0x7B -+#define EEPROM_RF_OPT4 0x7C -+#define EEPROM_VERSION 0x7E -+#define EEPROM_CUSTOMER_ID 0x7F -+ -+#define EEPROM_NORMAL_BoardType EEPROM_RF_OPT1 //[7:5] -+ -+#endif -+ -+#ifdef CONFIG_USB_HCI -+ -+//should be renamed and moved to another file -+typedef enum _BOARD_TYPE_8192CUSB{ -+ BOARD_USB_DONGLE = 0, // USB dongle -+ BOARD_USB_High_PA = 1, // USB dongle with high power PA -+ BOARD_MINICARD = 2, // Minicard -+ BOARD_USB_SOLO = 3, // USB solo-Slim module -+ BOARD_USB_COMBO = 4, // USB Combo-Slim module -+} BOARD_TYPE_8192CUSB, *PBOARD_TYPE_8192CUSB; -+ -+#define SUPPORT_HW_RADIO_DETECT(pHalData) (pHalData->BoardType == BOARD_MINICARD||\ -+ pHalData->BoardType == BOARD_USB_SOLO||\ -+ pHalData->BoardType == BOARD_USB_COMBO) -+ -+//--------------------------------------------------------------- -+// EEPROM address for Test chip -+//--------------------------------------------------------------- -+#define EEPROM_TEST_USB_OPT 0x0E -+#define EEPROM_TEST_CHIRP_K 0x0F -+#define EEPROM_TEST_EP_SETTING 0x0E -+#define EEPROM_TEST_USB_PHY 0x10 -+ -+ -+//--------------------------------------------------------------- -+// EEPROM address for Normal chip -+//--------------------------------------------------------------- -+#define EEPROM_NORMAL_USB_OPT 0x0E -+#define EEPROM_NORMAL_CHIRP_K 0x0E // Changed -+#define EEPROM_NORMAL_EP_SETTING 0x0F // Changed -+#define EEPROM_NORMAL_USB_PHY 0x12 // Changed -+ -+ -+// Test chip and normal chip common define -+//--------------------------------------------------------------- -+// EEPROM address for both -+//--------------------------------------------------------------- -+#define EEPROM_ID0 0x00 -+#define EEPROM_ID1 0x01 -+#define EEPROM_RTK_RSV1 0x02 -+#define EEPROM_RTK_RSV2 0x03 -+#define EEPROM_RTK_RSV3 0x04 -+#define EEPROM_RTK_RSV4 0x05 -+#define EEPROM_RTK_RSV5 0x06 -+#define EEPROM_DBG_SEL 0x07 -+#define EEPROM_RTK_RSV6 0x08 -+#define EEPROM_VID 0x0A -+#define EEPROM_PID 0x0C -+ -+#define EEPROM_MAC_ADDR 0x16 -+#define EEPROM_STRING 0x1C -+#define EEPROM_SUBCUSTOMER_ID 0x59 -+#define EEPROM_CCK_TX_PWR_INX 0x5A -+#define EEPROM_HT40_1S_TX_PWR_INX 0x60 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF 0x66 -+#define EEPROM_HT20_TX_PWR_INX_DIFF 0x69 -+#define EEPROM_OFDM_TX_PWR_INX_DIFF 0x6C -+#define EEPROM_HT40_MAX_PWR_OFFSET 0x6F -+#define EEPROM_HT20_MAX_PWR_OFFSET 0x72 -+ -+#define EEPROM_CHANNEL_PLAN 0x75 -+#define EEPROM_TSSI_A 0x76 -+#define EEPROM_TSSI_B 0x77 -+#define EEPROM_THERMAL_METER 0x78 -+#define EEPROM_RF_OPT1 0x79 -+#define EEPROM_RF_OPT2 0x7A -+#define EEPROM_RF_OPT3 0x7B -+#define EEPROM_RF_OPT4 0x7C -+#define EEPROM_VERSION 0x7E -+#define EEPROM_CUSTOMER_ID 0x7F -+ -+#define EEPROM_BoardType 0x54 //0x0: RTL8188SU, 0x1: RTL8191SU, 0x2: RTL8192SU, 0x3: RTL8191GU -+#define EEPROM_TxPwIndex 0x5C //0x5C-0x76, Tx Power index. -+#define EEPROM_PwDiff 0x67 // Difference of gain index between legacy and high throughput OFDM. -+ -+#define EEPROM_TxPowerCCK 0x5A // CCK Tx Power -+ -+// 2009/02/09 Cosa Add for SD3 requirement -+#define EEPROM_TX_PWR_HT20_DIFF 0x6e// HT20 Tx Power Index Difference -+#define DEFAULT_HT20_TXPWR_DIFF 2 // HT20<->40 default Tx Power Index Difference -+#define EEPROM_TX_PWR_OFDM_DIFF 0x71// OFDM Tx Power Index Difference -+ -+#define EEPROM_TxPWRGroup 0x73// Power diff for channel group -+#define EEPROM_Regulatory 0x79// Check if power safety is need -+ -+#define EEPROM_BLUETOOTH_COEXIST 0x7E // 92cu, 0x7E[4] -+#define EEPROM_NORMAL_BoardType EEPROM_RF_OPT1 //[7:5] -+#define BOARD_TYPE_NORMAL_MASK 0xE0 -+#define BOARD_TYPE_TEST_MASK 0x0F -+#define EEPROM_EASY_REPLACEMENT 0x50//BIT0 1 for build-in module, 0 for external dongle -+//------------------------------------------------------------- -+// EEPROM content definitions -+//------------------------------------------------------------- -+#define OS_LINK_SPEED BIT(5) -+ -+#define BOARD_TYPE_MASK 0xF -+ -+#define BT_COEXISTENCE BIT(4) -+#define BT_CO_SHIFT 4 -+ -+#define EP_NUMBER_MASK 0x30 //bit 4:5 0Eh -+#define EP_NUMBER_SHIFT 4 -+ -+ -+#define USB_PHY_PARA_SIZE 5 -+ -+ -+//------------------------------------------------------------- -+// EEPROM default value definitions -+//------------------------------------------------------------- -+// Use 0xABCD instead of 0x8192 for debug -+#define EEPROM_DEF_ID_0 0xCD // Byte 0x00 -+#define EEPROM_DEF_ID_1 0xAB // Byte 0x01 -+ -+#define EEPROM_DEF_RTK_RSV_A3 0x74 // Byte 0x03 -+#define EEPROM_DEF_RTK_RSV_A4 0x6D // Byte 0x04 -+#define EEPROM_DEF_RTK_RSV_A8 0xFF // Byte 0x08 -+ -+#define EEPROM_DEF_VID_0 0x0A // Byte 0x0A -+#define EEPROM_DEF_VID_1 0x0B -+ -+#define EEPROM_DEF_PID_0 0x92 // Byte 0x0C -+#define EEPROM_DEF_PID_1 0x81 -+ -+ -+#define EEPROM_TEST_DEF_USB_OPT 0x80 // Byte 0x0E -+#define EEPROM_NORMAL_DEF_USB_OPT 0x00 // Byte 0x0E -+ -+#define EEPROM_DEF_CHIRPK 0x15 // Byte 0x0F -+ -+#define EEPROM_DEF_USB_PHY_0 0x85 // Byte 0x10 -+#define EEPROM_DEF_USB_PHY_1 0x62 // Byte 0x11 -+#define EEPROM_DEF_USB_PHY_2 0x9E // Byte 0x12 -+#define EEPROM_DEF_USB_PHY_3 0x06 // Byte 0x13 -+ -+#define EEPROM_DEF_TSSI_A 0x09 // Byte 0x78 -+#define EEPROM_DEF_TSSI_B 0x09 // Byte 0x79 -+ -+ -+#define EEPROM_DEF_THERMAL_METER 0x12 // Byte 0x7A -+ -+#define RF_OPTION1 0x79// Check if power safety spec is need -+#define RF_OPTION2 0x7A -+#define RF_OPTION3 0x7B -+#define RF_OPTION4 0x7C -+ -+ -+#define EEPROM_USB_SN BIT(0) -+#define EEPROM_USB_REMOTE_WAKEUP BIT(1) -+#define EEPROM_USB_DEVICE_PWR BIT(2) -+#define EEPROM_EP_NUMBER (BIT(3)|BIT(4)) -+ -+#if 0 -+#define EEPROM_CHANNEL_PLAN_FCC 0x0 -+#define EEPROM_CHANNEL_PLAN_IC 0x1 -+#define EEPROM_CHANNEL_PLAN_ETSI 0x2 -+#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 -+#define EEPROM_CHANNEL_PLAN_FRANCE 0x4 -+#define EEPROM_CHANNEL_PLAN_MKK 0x5 -+#define EEPROM_CHANNEL_PLAN_MKK1 0x6 -+#define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 -+#define EEPROM_CHANNEL_PLAN_TELEC 0x8 -+#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 -+#define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA -+#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 -+ -+#define EEPROM_CID_DEFAULT 0x0 -+ -+#define EEPROM_CID_WHQL 0xFE // added by chiyoko for dtm, 20090108 -+ -+ -+#define EEPROM_CID_CCX 0x10 // CCX test. By Bruce, 2009-02-25. -+#endif -+ -+#endif -+ -+ -+/*=================================================================== -+===================================================================== -+Here the register defines are for 92C. When the define is as same with 92C, -+we will use the 92C's define for the consistency -+So the following defines for 92C is not entire!!!!!! -+===================================================================== -+=====================================================================*/ -+/* -+Based on Datasheet V33---090401 -+Register Summary -+Current IOREG MAP -+0x0000h ~ 0x00FFh System Configuration (256 Bytes) -+0x0100h ~ 0x01FFh MACTOP General Configuration (256 Bytes) -+0x0200h ~ 0x027Fh TXDMA Configuration (128 Bytes) -+0x0280h ~ 0x02FFh RXDMA Configuration (128 Bytes) -+0x0300h ~ 0x03FFh PCIE EMAC Reserved Region (256 Bytes) -+0x0400h ~ 0x04FFh Protocol Configuration (256 Bytes) -+0x0500h ~ 0x05FFh EDCA Configuration (256 Bytes) -+0x0600h ~ 0x07FFh WMAC Configuration (512 Bytes) -+0x2000h ~ 0x3FFFh 8051 FW Download Region (8196 Bytes) -+*/ -+ -+//---------------------------------------------------------------------------- -+// 8192C (RCR) Receive Configuration Register (Offset 0x608, 32 bits) -+//---------------------------------------------------------------------------- -+#define RCR_APPFCS BIT31 //WMAC append FCS after pauload -+#define RCR_APP_MIC BIT30 // -+#define RCR_APP_PHYSTS BIT28// -+#define RCR_APP_ICV BIT29 // -+#define RCR_APP_PHYST_RXFF BIT28 // -+#define RCR_APP_BA_SSN BIT27 //Accept BA SSN -+#define RCR_ENMBID BIT24 //Enable Multiple BssId. -+#define RCR_LSIGEN BIT23 -+#define RCR_MFBEN BIT22 -+#define RCR_HTC_LOC_CTRL BIT14 //MFC<--HTC=1 MFC-->HTC=0 -+#define RCR_AMF BIT13 //Accept management type frame -+#define RCR_ACF BIT12 //Accept control type frame -+#define RCR_ADF BIT11 //Accept data type frame -+#define RCR_AICV BIT9 //Accept ICV error packet -+#define RCR_ACRC32 BIT8 //Accept CRC32 error packet -+#define RCR_CBSSID_BCN BIT7 //Accept BSSID match packet (Rx beacon, probe rsp) -+#define RCR_CBSSID_DATA BIT6 //Accept BSSID match packet (Data) -+#define RCR_CBSSID RCR_CBSSID_DATA //Accept BSSID match packet -+#define RCR_APWRMGT BIT5 //Accept power management packet -+#define RCR_ADD3 BIT4 //Accept address 3 match packet -+#define RCR_AB BIT3 //Accept broadcast packet -+#define RCR_AM BIT2 //Accept multicast packet -+#define RCR_APM BIT1 //Accept physical match packet -+#define RCR_AAP BIT0 //Accept all unicast packet -+#define RCR_MXDMA_OFFSET 8 -+#define RCR_FIFO_OFFSET 13 -+ -+ -+ -+//============================================================================ -+// 8192c USB specific Regsiter Offset and Content definition, -+// 2009.08.18, added by vivi. for merge 92c and 92C into one driver -+//============================================================================ -+//#define APS_FSMCO 0x0004 same with 92Ce -+#define RSV_CTRL 0x001C -+#define RD_CTRL 0x0524 -+ -+//----------------------------------------------------- -+// -+// 0xFE00h ~ 0xFE55h USB Configuration -+// -+//----------------------------------------------------- -+#define REG_USB_INFO 0xFE17 -+#define REG_USB_SPECIAL_OPTION 0xFE55 -+#define REG_USB_DMA_AGG_TO 0xFE5B -+#define REG_USB_AGG_TO 0xFE5C -+#define REG_USB_AGG_TH 0xFE5D -+ -+#define REG_USB_VID 0xFE60 -+#define REG_USB_PID 0xFE62 -+#define REG_USB_OPTIONAL 0xFE64 -+#define REG_USB_CHIRP_K 0xFE65 -+#define REG_USB_PHY 0xFE66 -+#define REG_USB_MAC_ADDR 0xFE70 -+ -+#define REG_USB_HRPWM 0xFE58 -+#define REG_USB_HCPWM 0xFE57 -+ -+#define InvalidBBRFValue 0x12345678 -+ -+//============================================================================ -+// 8192C Regsiter Bit and Content definition -+//============================================================================ -+//----------------------------------------------------- -+// -+// 0x0000h ~ 0x00FFh System Configuration -+// -+//----------------------------------------------------- -+ -+//2 SPS0_CTRL -+#define SW18_FPWM BIT(3) -+ -+ -+//2 SYS_ISO_CTRL -+#define ISO_MD2PP BIT(0) -+#define ISO_UA2USB BIT(1) -+#define ISO_UD2CORE BIT(2) -+#define ISO_PA2PCIE BIT(3) -+#define ISO_PD2CORE BIT(4) -+#define ISO_IP2MAC BIT(5) -+#define ISO_DIOP BIT(6) -+#define ISO_DIOE BIT(7) -+#define ISO_EB2CORE BIT(8) -+#define ISO_DIOR BIT(9) -+ -+#define PWC_EV25V BIT(14) -+#define PWC_EV12V BIT(15) -+ -+ -+//2 SYS_FUNC_EN -+#define FEN_BBRSTB BIT(0) -+#define FEN_BB_GLB_RSTn BIT(1) -+#define FEN_USBA BIT(2) -+#define FEN_UPLL BIT(3) -+#define FEN_USBD BIT(4) -+#define FEN_DIO_PCIE BIT(5) -+#define FEN_PCIEA BIT(6) -+#define FEN_PPLL BIT(7) -+#define FEN_PCIED BIT(8) -+#define FEN_DIOE BIT(9) -+#define FEN_CPUEN BIT(10) -+#define FEN_DCORE BIT(11) -+#define FEN_ELDR BIT(12) -+#define FEN_DIO_RF BIT(13) -+#define FEN_HWPDN BIT(14) -+#define FEN_MREGEN BIT(15) -+ -+//2 APS_FSMCO -+#define PFM_LDALL BIT(0) -+#define PFM_ALDN BIT(1) -+#define PFM_LDKP BIT(2) -+#define PFM_WOWL BIT(3) -+#define EnPDN BIT(4) -+#define PDN_PL BIT(5) -+#define APFM_ONMAC BIT(8) -+#define APFM_OFF BIT(9) -+#define APFM_RSM BIT(10) -+#define AFSM_HSUS BIT(11) -+#define AFSM_PCIE BIT(12) -+#define APDM_MAC BIT(13) -+#define APDM_HOST BIT(14) -+#define APDM_HPDN BIT(15) -+#define RDY_MACON BIT(16) -+#define SUS_HOST BIT(17) -+#define ROP_ALD BIT(20) -+#define ROP_PWR BIT(21) -+#define ROP_SPS BIT(22) -+#define SOP_MRST BIT(25) -+#define SOP_FUSE BIT(26) -+#define SOP_ABG BIT(27) -+#define SOP_AMB BIT(28) -+#define SOP_RCK BIT(29) -+#define SOP_A8M BIT(30) -+#define XOP_BTCK BIT(31) -+ -+//2 SYS_CLKR -+#define ANAD16V_EN BIT(0) -+#define ANA8M BIT(1) -+#define MACSLP BIT(4) -+#define LOADER_CLK_EN BIT(5) -+#define _80M_SSC_DIS BIT(7) -+#define _80M_SSC_EN_HO BIT(8) -+#define PHY_SSC_RSTB BIT(9) -+#define SEC_CLK_EN BIT(10) -+#define MAC_CLK_EN BIT(11) -+#define SYS_CLK_EN BIT(12) -+#define RING_CLK_EN BIT(13) -+ -+ -+//2 9346CR -+ -+ -+#define EEDO BIT(0) -+#define EEDI BIT(1) -+#define EESK BIT(2) -+#define EECS BIT(3) -+//#define EERPROMSEL BIT(4) -+//#define EEPROM_EN BIT(5) -+#define BOOT_FROM_EEPROM BIT(4) -+#define EEPROM_EN BIT(5) -+#define EEM0 BIT(6) -+#define EEM1 BIT(7) -+ -+ -+//2 AFE_MISC -+#define AFE_BGEN BIT(0) -+#define AFE_MBEN BIT(1) -+#define MAC_ID_EN BIT(7) -+ -+ -+//2 SPS0_CTRL -+ -+ -+//2 SPS_OCP_CFG -+ -+ -+//2 RSV_CTRL -+#define WLOCK_ALL BIT(0) -+#define WLOCK_00 BIT(1) -+#define WLOCK_04 BIT(2) -+#define WLOCK_08 BIT(3) -+#define WLOCK_40 BIT(4) -+#define R_DIS_PRST_0 BIT(5) -+#define R_DIS_PRST_1 BIT(6) -+#define LOCK_ALL_EN BIT(7) -+ -+//2 RF_CTRL -+#define RF_EN BIT(0) -+#define RF_RSTB BIT(1) -+#define RF_SDMRSTB BIT(2) -+ -+ -+ -+//2 LDOA15_CTRL -+#define LDA15_EN BIT(0) -+#define LDA15_STBY BIT(1) -+#define LDA15_OBUF BIT(2) -+#define LDA15_REG_VOS BIT(3) -+#define _LDA15_VOADJ(x) (((x) & 0x7) << 4) -+ -+ -+ -+//2 LDOV12D_CTRL -+#define LDV12_EN BIT(0) -+#define LDV12_SDBY BIT(1) -+#define LPLDO_HSM BIT(2) -+#define LPLDO_LSM_DIS BIT(3) -+#define _LDV12_VADJ(x) (((x) & 0xF) << 4) -+ -+ -+//2 AFE_XTAL_CTRL -+#define XTAL_EN BIT(0) -+#define XTAL_BSEL BIT(1) -+#define _XTAL_BOSC(x) (((x) & 0x3) << 2) -+#define _XTAL_CADJ(x) (((x) & 0xF) << 4) -+#define XTAL_GATE_USB BIT(8) -+#define _XTAL_USB_DRV(x) (((x) & 0x3) << 9) -+#define XTAL_GATE_AFE BIT(11) -+#define _XTAL_AFE_DRV(x) (((x) & 0x3) << 12) -+#define XTAL_RF_GATE BIT(14) -+#define _XTAL_RF_DRV(x) (((x) & 0x3) << 15) -+#define XTAL_GATE_DIG BIT(17) -+#define _XTAL_DIG_DRV(x) (((x) & 0x3) << 18) -+#define XTAL_BT_GATE BIT(20) -+#define _XTAL_BT_DRV(x) (((x) & 0x3) << 21) -+#define _XTAL_GPIO(x) (((x) & 0x7) << 23) -+ -+ -+#define CKDLY_AFE BIT(26) -+#define CKDLY_USB BIT(27) -+#define CKDLY_DIG BIT(28) -+#define CKDLY_BT BIT(29) -+ -+ -+//2 AFE_PLL_CTRL -+#define APLL_EN BIT(0) -+#define APLL_320_EN BIT(1) -+#define APLL_FREF_SEL BIT(2) -+#define APLL_EDGE_SEL BIT(3) -+#define APLL_WDOGB BIT(4) -+#define APLL_LPFEN BIT(5) -+ -+#define APLL_REF_CLK_13MHZ 0x1 -+#define APLL_REF_CLK_19_2MHZ 0x2 -+#define APLL_REF_CLK_20MHZ 0x3 -+#define APLL_REF_CLK_25MHZ 0x4 -+#define APLL_REF_CLK_26MHZ 0x5 -+#define APLL_REF_CLK_38_4MHZ 0x6 -+#define APLL_REF_CLK_40MHZ 0x7 -+ -+#define APLL_320EN BIT(14) -+#define APLL_80EN BIT(15) -+#define APLL_1MEN BIT(24) -+ -+ -+//2 EFUSE_CTRL -+#define ALD_EN BIT(18) -+#define EF_PD BIT(19) -+#define EF_FLAG BIT(31) -+ -+//2 EFUSE_TEST (For RTL8723 partially) -+#define EF_TRPT BIT(7) -+#define EF_CELL_SEL (BIT(8)|BIT(9)) // 00: Wifi Efuse, 01: BT Efuse0, 10: BT Efuse1, 11: BT Efuse2 -+#define LDOE25_EN BIT(31) -+#define EFUSE_SEL(x) (((x) & 0x3) << 8) -+#define EFUSE_SEL_MASK 0x300 -+#define EFUSE_WIFI_SEL_0 0x0 -+#define EFUSE_BT_SEL_0 0x1 -+#define EFUSE_BT_SEL_1 0x2 -+#define EFUSE_BT_SEL_2 0x3 -+ -+#define EFUSE_ACCESS_ON 0x69 // For RTL8723 only. -+#define EFUSE_ACCESS_OFF 0x00 // For RTL8723 only. -+ -+//2 PWR_DATA -+ -+//2 CAL_TIMER -+ -+//2 ACLK_MON -+#define RSM_EN BIT(0) -+#define Timer_EN BIT(4) -+ -+ -+//2 GPIO_MUXCFG -+#define TRSW0EN BIT(2) -+#define TRSW1EN BIT(3) -+#define EROM_EN BIT(4) -+#define EnBT BIT(5) -+#define EnUart BIT(8) -+#define Uart_910 BIT(9) -+#define EnPMAC BIT(10) -+#define SIC_SWRST BIT(11) -+#define EnSIC BIT(12) -+#define SIC_23 BIT(13) -+#define EnHDP BIT(14) -+#define SIC_LBK BIT(15) -+ -+//2 GPIO_PIN_CTRL -+ -+// GPIO BIT -+#define HAL_8192C_HW_GPIO_WPS_BIT BIT(2) -+ -+//2 GPIO_INTM -+ -+//2 LEDCFG -+#define LED0PL BIT(4) -+#define LED0DIS BIT(7) -+#define LED1DIS BIT(15) -+#define LED1PL BIT(12) -+ -+#define SECCAM_CLR BIT(30) -+ -+ -+//2 FSIMR -+ -+//2 FSISR -+ -+ -+//2 8051FWDL -+//2 MCUFWDL -+#define MCUFWDL_EN BIT(0) -+#define MCUFWDL_RDY BIT(1) -+#define FWDL_ChkSum_rpt BIT(2) -+#define MACINI_RDY BIT(3) -+#define BBINI_RDY BIT(4) -+#define RFINI_RDY BIT(5) -+#define WINTINI_RDY BIT(6) -+#define CPRST BIT(23) -+ -+//2REG_HPON_FSM -+#define BOND92CE_1T2R_CFG BIT(22) -+ -+ -+//2 REG_SYS_CFG -+#define XCLK_VLD BIT(0) -+#define ACLK_VLD BIT(1) -+#define UCLK_VLD BIT(2) -+#define PCLK_VLD BIT(3) -+#define PCIRSTB BIT(4) -+#define V15_VLD BIT(5) -+#define TRP_B15V_EN BIT(7) -+#define SIC_IDLE BIT(8) -+#define BD_MAC2 BIT(9) -+#define BD_MAC1 BIT(10) -+#define IC_MACPHY_MODE BIT(11) -+#define CHIP_VER (BIT(12)|BIT(13)|BIT(14)|BIT(15)) -+#define BT_FUNC BIT(16) -+#define VENDOR_ID BIT(19) -+#define PAD_HWPD_IDN BIT(22) -+#define TRP_VAUX_EN BIT(23) -+#define TRP_BT_EN BIT(24) -+#define BD_PKG_SEL BIT(25) -+#define BD_HCI_SEL BIT(26) -+#define TYPE_ID BIT(27) -+ -+#define CHIP_VER_RTL_MASK 0xF000 //Bit 12 ~ 15 -+#define CHIP_VER_RTL_SHIFT 12 -+ -+//2REG_GPIO_OUTSTS (For RTL8723 only) -+#define EFS_HCI_SEL (BIT(0)|BIT(1)) -+#define PAD_HCI_SEL (BIT(2)|BIT(3)) -+#define HCI_SEL (BIT(4)|BIT(5)) -+#define PKG_SEL_HCI BIT(6) -+#define FEN_GPS BIT(7) -+#define FEN_BT BIT(8) -+#define FEN_WL BIT(9) -+#define FEN_PCI BIT(10) -+#define FEN_USB BIT(11) -+#define BTRF_HWPDN_N BIT(12) -+#define WLRF_HWPDN_N BIT(13) -+#define PDN_BT_N BIT(14) -+#define PDN_GPS_N BIT(15) -+#define BT_CTL_HWPDN BIT(16) -+#define GPS_CTL_HWPDN BIT(17) -+#define PPHY_SUSB BIT(20) -+#define UPHY_SUSB BIT(21) -+#define PCI_SUSEN BIT(22) -+#define USB_SUSEN BIT(23) -+#define RF_RL_ID (BIT(31)|BIT(30)|BIT(29)|BIT(28)) -+ -+//----------------------------------------------------- -+// -+// 0x0100h ~ 0x01FFh MACTOP General Configuration -+// -+//----------------------------------------------------- -+ -+ -+//2 Function Enable Registers -+//2 CR -+ -+#define REG_LBMODE (REG_CR + 3) -+ -+ -+#define HCI_TXDMA_EN BIT(0) -+#define HCI_RXDMA_EN BIT(1) -+#define TXDMA_EN BIT(2) -+#define RXDMA_EN BIT(3) -+#define PROTOCOL_EN BIT(4) -+#define SCHEDULE_EN BIT(5) -+#define MACTXEN BIT(6) -+#define MACRXEN BIT(7) -+#define ENSWBCN BIT(8) -+#define ENSEC BIT(9) -+ -+// Network type -+#define _NETTYPE(x) (((x) & 0x3) << 16) -+#define MASK_NETTYPE 0x30000 -+#define NT_NO_LINK 0x0 -+#define NT_LINK_AD_HOC 0x1 -+#define NT_LINK_AP 0x2 -+#define NT_AS_AP 0x3 -+ -+#define _LBMODE(x) (((x) & 0xF) << 24) -+#define MASK_LBMODE 0xF000000 -+#define LOOPBACK_NORMAL 0x0 -+#define LOOPBACK_IMMEDIATELY 0xB -+#define LOOPBACK_MAC_DELAY 0x3 -+#define LOOPBACK_PHY 0x1 -+#define LOOPBACK_DMA 0x7 -+ -+ -+//2 PBP - Page Size Register -+#define GET_RX_PAGE_SIZE(value) ((value) & 0xF) -+#define GET_TX_PAGE_SIZE(value) (((value) & 0xF0) >> 4) -+#define _PSRX_MASK 0xF -+#define _PSTX_MASK 0xF0 -+#define _PSRX(x) (x) -+#define _PSTX(x) ((x) << 4) -+ -+#define PBP_64 0x0 -+#define PBP_128 0x1 -+#define PBP_256 0x2 -+#define PBP_512 0x3 -+#define PBP_1024 0x4 -+ -+ -+//2 TX/RXDMA -+#define RXDMA_ARBBW_EN BIT(0) -+#define RXSHFT_EN BIT(1) -+#define RXDMA_AGG_EN BIT(2) -+#define QS_VO_QUEUE BIT(8) -+#define QS_VI_QUEUE BIT(9) -+#define QS_BE_QUEUE BIT(10) -+#define QS_BK_QUEUE BIT(11) -+#define QS_MANAGER_QUEUE BIT(12) -+#define QS_HIGH_QUEUE BIT(13) -+ -+#define HQSEL_VOQ BIT(0) -+#define HQSEL_VIQ BIT(1) -+#define HQSEL_BEQ BIT(2) -+#define HQSEL_BKQ BIT(3) -+#define HQSEL_MGTQ BIT(4) -+#define HQSEL_HIQ BIT(5) -+ -+// For normal driver, 0x10C -+#define _TXDMA_HIQ_MAP(x) (((x)&0x3) << 14) -+#define _TXDMA_MGQ_MAP(x) (((x)&0x3) << 12) -+#define _TXDMA_BKQ_MAP(x) (((x)&0x3) << 10) -+#define _TXDMA_BEQ_MAP(x) (((x)&0x3) << 8 ) -+#define _TXDMA_VIQ_MAP(x) (((x)&0x3) << 6 ) -+#define _TXDMA_VOQ_MAP(x) (((x)&0x3) << 4 ) -+ -+#define QUEUE_LOW 1 -+#define QUEUE_NORMAL 2 -+#define QUEUE_HIGH 3 -+ -+ -+ -+//2 TRXFF_BNDY -+ -+ -+//2 LLT_INIT -+#define _LLT_NO_ACTIVE 0x0 -+#define _LLT_WRITE_ACCESS 0x1 -+#define _LLT_READ_ACCESS 0x2 -+ -+#define _LLT_INIT_DATA(x) ((x) & 0xFF) -+#define _LLT_INIT_ADDR(x) (((x) & 0xFF) << 8) -+#define _LLT_OP(x) (((x) & 0x3) << 30) -+#define _LLT_OP_VALUE(x) (((x) >> 30) & 0x3) -+ -+ -+//2 BB_ACCESS_CTRL -+#define BB_WRITE_READ_MASK (BIT(31) | BIT(30)) -+#define BB_WRITE_EN BIT(30) -+#define BB_READ_EN BIT(31) -+//#define BB_ADDR_MASK 0xFFF -+//#define _BB_ADDR(x) ((x) & BB_ADDR_MASK) -+ -+//----------------------------------------------------- -+// -+// 0x0200h ~ 0x027Fh TXDMA Configuration -+// -+//----------------------------------------------------- -+//2 RQPN -+#define _HPQ(x) ((x) & 0xFF) -+#define _LPQ(x) (((x) & 0xFF) << 8) -+#define _PUBQ(x) (((x) & 0xFF) << 16) -+#define _NPQ(x) ((x) & 0xFF) // NOTE: in RQPN_NPQ register -+ -+ -+#define HPQ_PUBLIC_DIS BIT(24) -+#define LPQ_PUBLIC_DIS BIT(25) -+#define LD_RQPN BIT(31) -+ -+ -+//2 TDECTRL -+#define BCN_VALID BIT(16) -+#define BCN_HEAD(x) (((x) & 0xFF) << 8) -+#define BCN_HEAD_MASK 0xFF00 -+ -+//2 TDECTL -+#define BLK_DESC_NUM_SHIFT 4 -+#define BLK_DESC_NUM_MASK 0xF -+ -+ -+//2 TXDMA_OFFSET_CHK -+#define DROP_DATA_EN BIT(9) -+ -+//----------------------------------------------------- -+// -+// 0x0400h ~ 0x047Fh Protocol Configuration -+// -+//----------------------------------------------------- -+//2 FWHW_TXQ_CTRL -+#define EN_AMPDU_RTY_NEW BIT(7) -+ -+//2 INIRTSMCS_SEL -+#define _INIRTSMCS_SEL(x) ((x) & 0x3F) -+ -+ -+//2 SPEC SIFS -+#define _SPEC_SIFS_CCK(x) ((x) & 0xFF) -+#define _SPEC_SIFS_OFDM(x) (((x) & 0xFF) << 8) -+ -+ -+//2 RRSR -+ -+#define RATE_REG_BITMAP_ALL 0xFFFFF -+ -+#define _RRSC_BITMAP(x) ((x) & 0xFFFFF) -+ -+#define _RRSR_RSC(x) (((x) & 0x3) << 21) -+#define RRSR_RSC_RESERVED 0x0 -+#define RRSR_RSC_UPPER_SUBCHANNEL 0x1 -+#define RRSR_RSC_LOWER_SUBCHANNEL 0x2 -+#define RRSR_RSC_DUPLICATE_MODE 0x3 -+ -+ -+//2 ARFR -+#define USE_SHORT_G1 BIT(20) -+ -+//2 AGGLEN_LMT_L -+#define _AGGLMT_MCS0(x) ((x) & 0xF) -+#define _AGGLMT_MCS1(x) (((x) & 0xF) << 4) -+#define _AGGLMT_MCS2(x) (((x) & 0xF) << 8) -+#define _AGGLMT_MCS3(x) (((x) & 0xF) << 12) -+#define _AGGLMT_MCS4(x) (((x) & 0xF) << 16) -+#define _AGGLMT_MCS5(x) (((x) & 0xF) << 20) -+#define _AGGLMT_MCS6(x) (((x) & 0xF) << 24) -+#define _AGGLMT_MCS7(x) (((x) & 0xF) << 28) -+ -+ -+//2 RL -+#define RETRY_LIMIT_SHORT_SHIFT 8 -+#define RETRY_LIMIT_LONG_SHIFT 0 -+ -+ -+//2 DARFRC -+#define _DARF_RC1(x) ((x) & 0x1F) -+#define _DARF_RC2(x) (((x) & 0x1F) << 8) -+#define _DARF_RC3(x) (((x) & 0x1F) << 16) -+#define _DARF_RC4(x) (((x) & 0x1F) << 24) -+// NOTE: shift starting from address (DARFRC + 4) -+#define _DARF_RC5(x) ((x) & 0x1F) -+#define _DARF_RC6(x) (((x) & 0x1F) << 8) -+#define _DARF_RC7(x) (((x) & 0x1F) << 16) -+#define _DARF_RC8(x) (((x) & 0x1F) << 24) -+ -+ -+//2 RARFRC -+#define _RARF_RC1(x) ((x) & 0x1F) -+#define _RARF_RC2(x) (((x) & 0x1F) << 8) -+#define _RARF_RC3(x) (((x) & 0x1F) << 16) -+#define _RARF_RC4(x) (((x) & 0x1F) << 24) -+// NOTE: shift starting from address (RARFRC + 4) -+#define _RARF_RC5(x) ((x) & 0x1F) -+#define _RARF_RC6(x) (((x) & 0x1F) << 8) -+#define _RARF_RC7(x) (((x) & 0x1F) << 16) -+#define _RARF_RC8(x) (((x) & 0x1F) << 24) -+ -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0x0500h ~ 0x05FFh EDCA Configuration -+// -+//----------------------------------------------------- -+ -+ -+ -+//2 EDCA setting -+#define AC_PARAM_TXOP_LIMIT_OFFSET 16 -+#define AC_PARAM_ECW_MAX_OFFSET 12 -+#define AC_PARAM_ECW_MIN_OFFSET 8 -+#define AC_PARAM_AIFS_OFFSET 0 -+ -+ -+//2 EDCA_VO_PARAM -+#define _AIFS(x) (x) -+#define _ECW_MAX_MIN(x) ((x) << 8) -+#define _TXOP_LIMIT(x) ((x) << 16) -+ -+ -+#define _BCNIFS(x) ((x) & 0xFF) -+#define _BCNECW(x) (((x) & 0xF))<< 8) -+ -+ -+#define _LRL(x) ((x) & 0x3F) -+#define _SRL(x) (((x) & 0x3F) << 8) -+ -+ -+//2 SIFS_CCK -+#define _SIFS_CCK_CTX(x) ((x) & 0xFF) -+#define _SIFS_CCK_TRX(x) (((x) & 0xFF) << 8); -+ -+ -+//2 SIFS_OFDM -+#define _SIFS_OFDM_CTX(x) ((x) & 0xFF) -+#define _SIFS_OFDM_TRX(x) (((x) & 0xFF) << 8); -+ -+ -+//2 TBTT PROHIBIT -+#define _TBTT_PROHIBIT_HOLD(x) (((x) & 0xFF) << 8) -+ -+ -+//2 REG_RD_CTRL -+#define DIS_EDCA_CNT_DWN BIT(11) -+ -+ -+//2 BCN_CTRL -+#define EN_MBSSID BIT(1) -+#define EN_TXBCN_RPT BIT(2) -+#define EN_BCN_FUNCTION BIT(3) -+// The same function but different bit field. -+#define DIS_TSF_UDT0_NORMAL_CHIP BIT(4) -+#define DIS_TSF_UDT0_TEST_CHIP BIT(5) -+ -+//2 ACMHWCTRL -+#define AcmHw_HwEn BIT(0) -+#define AcmHw_BeqEn BIT(1) -+#define AcmHw_ViqEn BIT(2) -+#define AcmHw_VoqEn BIT(3) -+#define AcmHw_BeqStatus BIT(4) -+#define AcmHw_ViqStatus BIT(5) -+#define AcmHw_VoqStatus BIT(6) -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0x0600h ~ 0x07FFh WMAC Configuration -+// -+//----------------------------------------------------- -+ -+//2 APSD_CTRL -+#define APSDOFF BIT(6) -+#define APSDOFF_STATUS BIT(7) -+ -+ -+//2 BWOPMODE -+#define BW_20MHZ BIT(2) -+//#define BW_OPMODE_20MHZ BIT(2) // For compability -+ -+ -+#define RATE_BITMAP_ALL 0xFFFFF -+ -+// Only use CCK 1M rate for ACK -+#define RATE_RRSR_CCK_ONLY_1M 0xFFFF1 -+ -+//2 TCR -+#define TSFRST BIT(0) -+#define DIS_GCLK BIT(1) -+#define PAD_SEL BIT(2) -+#define PWR_ST BIT(6) -+#define PWRBIT_OW_EN BIT(7) -+#define ACRC BIT(8) -+#define CFENDFORM BIT(9) -+#define ICV BIT(10) -+ -+ -+ -+//2 RCR -+#define AAP BIT(0) -+#define APM BIT(1) -+#define AM BIT(2) -+#define AB BIT(3) -+#define ADD3 BIT(4) -+#define APWRMGT BIT(5) -+#define CBSSID BIT(6) -+#define CBSSID_BCN BIT(7) -+#define ACRC32 BIT(8) -+#define AICV BIT(9) -+#define ADF BIT(11) -+#define ACF BIT(12) -+#define AMF BIT(13) -+#define HTC_LOC_CTRL BIT(14) -+#define UC_DATA_EN BIT(16) -+#define BM_DATA_EN BIT(17) -+#define MFBEN BIT(22) -+#define LSIGEN BIT(23) -+#define EnMBID BIT(24) -+#define APP_BASSN BIT(27) -+#define APP_PHYSTS BIT(28) -+#define APP_ICV BIT(29) -+#define APP_MIC BIT(30) -+#define APP_FCS BIT(31) -+ -+//2 RX_PKT_LIMIT -+ -+//2 RX_DLK_TIME -+ -+//2 MBIDCAMCFG -+ -+ -+ -+//2 AMPDU_MIN_SPACE -+#define _MIN_SPACE(x) ((x) & 0x7) -+#define _SHORT_GI_PADDING(x) (((x) & 0x1F) << 3) -+ -+ -+//2 RXERR_RPT -+#define RXERR_TYPE_OFDM_PPDU 0 -+#define RXERR_TYPE_OFDM_FALSE_ALARM 1 -+#define RXERR_TYPE_OFDM_MPDU_OK 2 -+#define RXERR_TYPE_OFDM_MPDU_FAIL 3 -+#define RXERR_TYPE_CCK_PPDU 4 -+#define RXERR_TYPE_CCK_FALSE_ALARM 5 -+#define RXERR_TYPE_CCK_MPDU_OK 6 -+#define RXERR_TYPE_CCK_MPDU_FAIL 7 -+#define RXERR_TYPE_HT_PPDU 8 -+#define RXERR_TYPE_HT_FALSE_ALARM 9 -+#define RXERR_TYPE_HT_MPDU_TOTAL 10 -+#define RXERR_TYPE_HT_MPDU_OK 11 -+#define RXERR_TYPE_HT_MPDU_FAIL 12 -+#define RXERR_TYPE_RX_FULL_DROP 15 -+ -+#define RXERR_COUNTER_MASK 0xFFFFF -+#define RXERR_RPT_RST BIT(27) -+#define _RXERR_RPT_SEL(type) ((type) << 28) -+ -+ -+//2 SECCFG -+#define SCR_TxUseDK BIT(0) //Force Tx Use Default Key -+#define SCR_RxUseDK BIT(1) //Force Rx Use Default Key -+#define SCR_TxEncEnable BIT(2) //Enable Tx Encryption -+#define SCR_RxDecEnable BIT(3) //Enable Rx Decryption -+#define SCR_SKByA2 BIT(4) //Search kEY BY A2 -+#define SCR_NoSKMC BIT(5) //No Key Search Multicast -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0xFE00h ~ 0xFE55h USB Configuration -+// -+//----------------------------------------------------- -+ -+//2 USB Information (0xFE17) -+#define USB_IS_HIGH_SPEED 0 -+#define USB_IS_FULL_SPEED 1 -+#define USB_SPEED_MASK BIT(5) -+ -+#define USB_NORMAL_SIE_EP_MASK 0xF -+#define USB_NORMAL_SIE_EP_SHIFT 4 -+ -+#define USB_TEST_EP_MASK 0x30 -+#define USB_TEST_EP_SHIFT 4 -+ -+//2 Special Option -+#define USB_AGG_EN BIT(3) -+ -+ -+//2REG_C2HEVT_CLEAR -+#define C2H_EVT_HOST_CLOSE 0x00 // Set by driver and notify FW that the driver has read the C2H command message -+#define C2H_EVT_FW_CLOSE 0xFF // Set by FW indicating that FW had set the C2H command message and it's not yet read by driver. -+ -+ -+//2REG_MULTI_FUNC_CTRL(For RTL8723 Only) -+#define WL_HWPDN_EN BIT0 // Enable GPIO[9] as WiFi HW PDn source -+#define WL_HWPDN_SL BIT1 // WiFi HW PDn polarity control -+#define WL_FUNC_EN BIT2 // WiFi function enable -+#define WL_HWROF_EN BIT3 // Enable GPIO[9] as WiFi RF HW PDn source -+#define BT_HWPDN_EN BIT16 // Enable GPIO[11] as BT HW PDn source -+#define BT_HWPDN_SL BIT17 // BT HW PDn polarity control -+#define BT_FUNC_EN BIT18 // BT function enable -+#define BT_HWROF_EN BIT19 // Enable GPIO[11] as BT/GPS RF HW PDn source -+#define GPS_HWPDN_EN BIT20 // Enable GPIO[10] as GPS HW PDn source -+#define GPS_HWPDN_SL BIT21 // GPS HW PDn polarity control -+#define GPS_FUNC_EN BIT22 // GPS function enable -+ -+//3 REG_LIFECTRL_CTRL -+#define HAL92C_EN_PKT_LIFE_TIME_BK BIT3 -+#define HAL92C_EN_PKT_LIFE_TIME_BE BIT2 -+#define HAL92C_EN_PKT_LIFE_TIME_VI BIT1 -+#define HAL92C_EN_PKT_LIFE_TIME_VO BIT0 -+ -+#define HAL92C_MSDU_LIFE_TIME_UNIT 128 // in us, said by Tim. -+ -+//======================================================== -+// General definitions -+//======================================================== -+ -+#define MAC_ADDR_LEN 6 -+#define LAST_ENTRY_OF_TX_PKT_BUFFER 255 -+ -+#define POLLING_LLT_THRESHOLD 20 -+#define POLLING_READY_TIMEOUT_COUNT 1000 -+ -+// Min Spacing related settings. -+#define MAX_MSS_DENSITY_2T 0x13 -+#define MAX_MSS_DENSITY_1T 0x0A -+ -+//---------------------------------------------------------------------------- -+// 8192C GPIO MUX Configuration Register (offset 0x40, 4 byte) -+//---------------------------------------------------------------------------- -+#define GPIOSEL_GPIO 0 -+#define GPIOSEL_ENBT BIT5 -+ -+//---------------------------------------------------------------------------- -+// 8192C GPIO PIN Control Register (offset 0x44, 4 byte) -+//---------------------------------------------------------------------------- -+#define GPIO_IN REG_GPIO_PIN_CTRL // GPIO pins input value -+#define GPIO_OUT (REG_GPIO_PIN_CTRL+1) // GPIO pins output value -+#define GPIO_IO_SEL (REG_GPIO_PIN_CTRL+2) // GPIO pins output enable when a bit is set to "1"; otherwise, input is configured. -+#define GPIO_MOD (REG_GPIO_PIN_CTRL+3) -+ -+ -+ -+#include "basic_types.h" -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h -@@ -0,0 +1,32 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL8192C_SRESET_C_ -+#define _RTL8192C_SRESET_C_ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+extern void rtl8192c_sreset_xmit_status_check(_adapter *padapter); -+extern void rtl8192c_sreset_linked_status_check(_adapter *padapter); -+#endif -+#endif ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h -@@ -0,0 +1,129 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL8192C_XMIT_H_ -+#define _RTL8192C_XMIT_H_ -+ -+// -+// Queue Select Value in TxDesc -+// -+#define QSLT_BK 0x2//0x01 -+#define QSLT_BE 0x0 -+#define QSLT_VI 0x5//0x4 -+#define QSLT_VO 0x7//0x6 -+#define QSLT_BEACON 0x10 -+#define QSLT_HIGH 0x11 -+#define QSLT_MGNT 0x12 -+#define QSLT_CMD 0x13 -+ -+struct txrpt_ccx_8192c { -+ /* offset 0 */ -+ u8 retry_cnt:6; -+ u8 rsvd_0:2; -+ -+ /* offset 1 */ -+ u8 rts_retry_cnt:6; -+ u8 rsvd_1:2; -+ -+ /* offset 2 */ -+ u8 ccx_qtime0; -+ u8 ccx_qtime1; -+ -+ /* offset 4 */ -+ u8 missed_pkt_num:5; -+ u8 rsvd_4:3; -+ -+ /* offset 5 */ -+ u8 mac_id:5; -+ u8 des1_fragssn:3; -+ -+ /* offset 6 */ -+ u8 rpt_pkt_num:5; -+ u8 pkt_drop:1; -+ u8 lifetime_over:1; -+ u8 retry_over:1; -+ -+ /* offset 7*/ -+ u8 edca_tx_queue:4; -+ u8 rsvd_7:1; -+ u8 bmc:1; -+ u8 pkt_ok:1; -+ u8 int_ccx:1; -+}; -+ -+#define txrpt_ccx_qtime_8192c(txrpt_ccx) ((txrpt_ccx)->ccx_qtime0+((txrpt_ccx)->ccx_qtime1<<8)) -+ -+#ifdef CONFIG_XMIT_ACK -+void dump_txrpt_ccx_8192c(void *buf); -+void handle_txrpt_ccx_8192c(_adapter *adapter, void *buf); -+#else -+#define dump_txrpt_ccx_8192c(buf) do {} while(0) -+#define handle_txrpt_ccx_8192c(adapter, buf) do {} while(0) -+#endif -+ -+#ifdef CONFIG_USB_HCI -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+#define MAX_TX_AGG_PACKET_NUMBER 0xFF -+#endif -+ -+s32 rtl8192cu_init_xmit_priv(_adapter * padapter); -+ -+void rtl8192cu_free_xmit_priv(_adapter * padapter); -+ -+void rtl8192cu_cal_txdesc_chksum(struct tx_desc *ptxdesc); -+ -+s32 rtl8192cu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -+ -+s32 rtl8192cu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); -+ -+s32 rtl8192cu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+s32 rtl8192cu_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+#ifdef CONFIG_HOSTAPD_MLME -+s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); -+#endif -+ -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+s32 rtl8192ce_init_xmit_priv(_adapter * padapter); -+void rtl8192ce_free_xmit_priv(_adapter * padapter); -+ -+s32 rtl8192ce_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf); -+struct xmit_buf *rtl8192ce_dequeue_xmitbuf(struct rtw_tx_ring *ring); -+ -+void rtl8192ce_xmitframe_resume(_adapter *padapter); -+ -+s32 rtl8192ce_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); -+ -+s32 rtl8192ce_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+s32 rtl8192ce_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+ -+#ifdef CONFIG_HOSTAPD_MLME -+s32 rtl8192ce_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); -+#endif -+ -+#endif -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h -@@ -0,0 +1,142 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192D_CMD_H_ -+#define __RTL8192D_CMD_H_ -+ -+ -+//-------------------------------------------- -+//3 Host Message Box -+//-------------------------------------------- -+ -+// User Define Message [31:8] -+ -+//_SETPWRMODE_PARM -+#define SET_H2CCMD_PWRMODE_PARM_MODE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value) -+#define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value) -+#define SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value) -+ -+//JOINBSSRPT_PARM -+#define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value) -+ -+//_RSVDPAGE_LOC -+#define SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value) -+#define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value) -+#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value) -+ -+//P2P_PS_OFFLOAD -+ -+struct P2P_PS_Offload_t { -+ unsigned char Offload_En:1; -+ unsigned char role:1; // 1: Owner, 0: Client -+ unsigned char CTWindow_En:1; -+ unsigned char NoA0_En:1; -+ unsigned char NoA1_En:1; -+ unsigned char AllStaSleep:1; // Only valid in Owner -+ unsigned char discovery:1; -+ unsigned char rsvd:1; -+}; -+ -+#define SET_H2CCMD_P2P_PS_OFFLOAD_EN(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value) -+#define SET_H2CCMD_P2P_PS_OFFLOAD_ROLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value) -+#define SET_H2CCMD_P2P_PS_OFFLOAD_CTW(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 2, 1, __Value) -+#define SET_H2CCMD_P2P_PS_OFFLOAD_NOA0(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 3, 1, __Value) -+#define SET_H2CCMD_P2P_PS_OFFLOAD_NOA1(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 4, 1, __Value) -+#define SET_H2CCMD_P2P_PS_OFFLOAD_ALLSTASLEEP(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 5, 1, __Value) -+#define SET_H2CCMD_P2P_PS_OFFLOAD_DISCOVERY(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 6, 1, __Value) -+ -+// Description: Determine the types of H2C commands that are the same in driver and Fw. -+// Fisrt constructed by tynli. 2009.10.09. -+typedef enum _RTL8192D_H2C_CMD -+{ -+ H2C_AP_OFFLOAD = 0, /*0*/ -+ H2C_SETPWRMODE = 1, /*1*/ -+ H2C_JOINBSSRPT = 2, /*2*/ -+ H2C_RSVDPAGE = 3, -+ H2C_RSSI_REPORT = 5, -+ H2C_RA_MASK = 6, -+ H2C_P2P_PS_OFFLOAD = 8, -+ H2C_MAC_MODE_SEL = 9, -+ H2C_PWRM=15, -+#ifdef CONFIG_WOWLAN -+ H2C_WO_WLAN_CMD = 20, // Wake on Wlan. -+#endif // CONFIG_WOWLAN -+ H2C_P2P_PS_CTW_CMD = 24, -+ H2C_PathDiv = 26, //PathDiv--NeilChen--2011.07.15 -+#ifdef CONFIG_WOWLAN -+ KEEP_ALIVE_CONTROL_CMD=31, //keep alive for wake on wlan -+ DISCONNECT_DECISION_CTRL_CMD=32, -+ REMOTE_WAKE_CTRL_CMD=34, -+#endif // CONFIG_WOWLAN -+ H2C_92D_TSF_SYNC=36, -+ H2C_92D_RESET_TSF = 43, -+ H2C_CMD_MAX -+}RTL8192D_H2C_CMD; -+ -+struct cmd_msg_parm { -+ u8 eid; //element id -+ u8 sz; // sz -+ u8 buf[6]; -+}; -+ -+ -+void FillH2CCmd92D(_adapter* padapter, u8 ElementID, u32 CmdLen, u8* pCmdBuffer); -+ -+// host message to firmware cmd -+void rtl8192d_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode); -+void rtl8192d_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus); -+u8 rtl8192d_set_rssi_cmd(_adapter*padapter, u8 *param); -+u8 rtl8192d_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg); -+void rtl8192d_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg); -+#ifdef CONFIG_P2P -+void rtl8192d_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state); -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_TSF_RESET_OFFLOAD -+int reset_tsf(PADAPTER Adapter, u8 reset_port ); -+#endif // CONFIG_TSF_RESET_OFFLOAD -+ -+#ifdef CONFIG_WOWLAN -+typedef struct _SETWOWLAN_PARM{ -+ u8 mode; -+ u8 gpio_index; -+ u8 gpio_duration; -+ u8 second_mode; -+ u8 reserve; -+}SETWOWLAN_PARM, *PSETWOWLAN_PARM; -+ -+#define FW_WOWLAN_FUN_EN BIT(0) -+#define FW_WOWLAN_PATTERN_MATCH BIT(1) -+#define FW_WOWLAN_MAGIC_PKT BIT(2) -+#define FW_WOWLAN_UNICAST BIT(3) -+#define FW_WOWLAN_ALL_PKT_DROP BIT(4) -+#define FW_WOWLAN_GPIO_ACTIVE BIT(5) -+#define FW_WOWLAN_REKEY_WAKEUP BIT(6) -+#define FW_WOWLAN_DEAUTH_WAKEUP BIT(7) -+ -+#define FW_WOWLAN_GPIO_WAKEUP_EN BIT(0) -+#define FW_FW_PARSE_MAGIC_PKT BIT(1) -+ -+void rtl8192d_set_wowlan_cmd(_adapter* padapter); -+void SetFwRelatedForWoWLAN8192DU(_adapter* padapter,u8 bHostIsGoingtoSleep); -+#endif // CONFIG_WOWLAN -+ -+#endif // __RTL8192D_CMD_H_ -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h -@@ -0,0 +1,420 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192D_DM_H__ -+#define __RTL8192D_DM_H__ -+//============================================================ -+// Description: -+// -+// This file is for 92CE/92CU dynamic mechanism only -+// -+// -+//============================================================ -+//============================================================ -+// Global var -+//============================================================ -+ -+extern u32 EDCAParam[maxAP][3] ; -+ -+//============================================================ -+// structure and define -+//============================================================ -+ -+typedef struct _FALSE_ALARM_STATISTICS{ -+ u32 Cnt_Parity_Fail; -+ u32 Cnt_Rate_Illegal; -+ u32 Cnt_Crc8_fail; -+ u32 Cnt_Mcs_fail; -+ u32 Cnt_Ofdm_fail; -+ u32 Cnt_Cck_fail; -+ u32 Cnt_all; -+ u32 Cnt_Fast_Fsync; -+ u32 Cnt_SB_Search_fail; -+}FALSE_ALARM_STATISTICS, *PFALSE_ALARM_STATISTICS; -+ -+typedef struct _Dynamic_Power_Saving_ -+{ -+ u8 PreCCAState; -+ u8 CurCCAState; -+ -+ u8 PreRFState; -+ u8 CurRFState; -+ -+ //int Rssi_val_min; -+ -+}PS_T,*pPS_T; -+ -+typedef struct _Dynamic_Initial_Gain_Threshold_ -+{ -+ u8 Dig_Enable_Flag; -+ u8 Dig_Ext_Port_Stage; -+ -+ int RssiLowThresh; -+ int RssiHighThresh; -+ -+ u32 FALowThresh; -+ u32 FAHighThresh; -+ -+ u8 CurSTAConnectState; -+ u8 PreSTAConnectState; -+ u8 CurMultiSTAConnectState; -+ -+ u8 PreIGValue; -+ u8 CurIGValue; -+ u8 BackupIGValue; -+ -+ char BackoffVal; -+ char BackoffVal_range_max; -+ char BackoffVal_range_min; -+ u8 rx_gain_range_max; -+ u8 rx_gain_range_min; -+ u8 Rssi_val_min; -+ -+ u8 PreCCKPDState; -+ u8 CurCCKPDState; -+ -+ u8 LargeFAHit; -+ u8 ForbiddenIGI; -+ u32 Recover_cnt; -+ u8 rx_gain_range_min_nolink; -+}DIG_T,*pDIG_T; -+ -+typedef enum tag_Dynamic_Init_Gain_Operation_Type_Definition -+{ -+ DIG_TYPE_THRESH_HIGH = 0, -+ DIG_TYPE_THRESH_LOW = 1, -+ DIG_TYPE_BACKOFF = 2, -+ DIG_TYPE_RX_GAIN_MIN = 3, -+ DIG_TYPE_RX_GAIN_MAX = 4, -+ DIG_TYPE_ENABLE = 5, -+ DIG_TYPE_DISABLE = 6, -+ DIG_OP_TYPE_MAX -+}DM_DIG_OP_E; -+ -+typedef enum tag_CCK_Packet_Detection_Threshold_Type_Definition -+{ -+ CCK_PD_STAGE_LowRssi = 0, -+ CCK_PD_STAGE_HighRssi = 1, -+ CCK_PD_STAGE_MAX = 3, -+}DM_CCK_PDTH_E; -+ -+typedef enum tag_1R_CCA_Type_Definition -+{ -+ CCA_MIN = 0, -+ CCA_1R =1, -+ CCA_2R = 2, -+ CCA_MAX = 3, -+}DM_1R_CCA_E; -+ -+typedef enum tag_RF_Type_Definition -+{ -+ RF_Save =0, -+ RF_Normal = 1, -+ RF_MAX = 2, -+}DM_RF_E; -+ -+typedef enum tag_DIG_EXT_PORT_ALGO_Definition -+{ -+ DIG_EXT_PORT_STAGE_0 = 0, -+ DIG_EXT_PORT_STAGE_1 = 1, -+ DIG_EXT_PORT_STAGE_2 = 2, -+ DIG_EXT_PORT_STAGE_3 = 3, -+ DIG_EXT_PORT_STAGE_MAX = 4, -+}DM_DIG_EXT_PORT_ALG_E; -+ -+ -+typedef enum tag_DIG_Connect_Definition -+{ -+ DIG_STA_DISCONNECT = 0, -+ DIG_STA_CONNECT = 1, -+ DIG_STA_BEFORE_CONNECT = 2, -+ DIG_MultiSTA_DISCONNECT = 3, -+ DIG_MultiSTA_CONNECT = 4, -+ DIG_CONNECT_MAX -+}DM_DIG_CONNECT_E; -+ -+ -+#define DM_DIG_THRESH_HIGH 40 -+#define DM_DIG_THRESH_LOW 35 -+ -+#define DM_FALSEALARM_THRESH_LOW 400 -+#define DM_FALSEALARM_THRESH_HIGH 1000 -+ -+#define DM_DIG_MAX 0x3e -+#define DM_DIG_MIN 0x1e //0x22//0x1c -+ -+#define DM_DIG_FA_UPPER 0x32 -+#define DM_DIG_FA_LOWER 0x20 -+ -+//vivi 92c&92d has different definition, 20110504 -+//this is for 92c -+#define DM_DIG_FA_TH0 0x200//0x20 -+#define DM_DIG_FA_TH1 0x300//0x100 -+#define DM_DIG_FA_TH2 0x400//0x200 -+//this is for 92d -+#define DM_DIG_FA_TH0_92D 0x100 -+#define DM_DIG_FA_TH1_92D 0x150 -+#define DM_DIG_FA_TH2_92D 0x250 -+ -+#define DM_DIG_BACKOFF_MAX 12 -+#define DM_DIG_BACKOFF_MIN (-4) -+#define DM_DIG_BACKOFF_DEFAULT 10 -+ -+#define RxPathSelection_SS_TH_low 30 -+#define RxPathSelection_diff_TH 18 -+ -+#define DM_RATR_STA_INIT 0 -+#define DM_RATR_STA_HIGH 1 -+#define DM_RATR_STA_MIDDLE 2 -+#define DM_RATR_STA_LOW 3 -+ -+#define CTSToSelfTHVal 30 -+#define RegC38_TH 20 -+ -+#define WAIotTHVal 25 -+ -+//Dynamic Tx Power Control Threshold -+#define TX_POWER_NEAR_FIELD_THRESH_LVL2 74 -+#define TX_POWER_NEAR_FIELD_THRESH_LVL1 67 -+ -+#define TxHighPwrLevel_Normal 0 -+#define TxHighPwrLevel_Level1 1 -+#define TxHighPwrLevel_Level2 2 -+#define TxHighPwrLevel_BT1 3 -+#define TxHighPwrLevel_BT2 4 -+#define TxHighPwrLevel_15 5 -+#define TxHighPwrLevel_35 6 -+#define TxHighPwrLevel_50 7 -+#define TxHighPwrLevel_70 8 -+#define TxHighPwrLevel_100 9 -+ -+#define DM_Type_ByFW 0 -+#define DM_Type_ByDriver 1 -+ -+typedef struct _RATE_ADAPTIVE -+{ -+ u8 RateAdaptiveDisabled; -+ u8 RATRState; -+ u16 reserve; -+ -+ u32 HighRSSIThreshForRA; -+ u32 High2LowRSSIThreshForRA; -+ u8 Low2HighRSSIThreshForRA40M; -+ u32 LowRSSIThreshForRA40M; -+ u8 Low2HighRSSIThreshForRA20M; -+ u32 LowRSSIThreshForRA20M; -+ u32 UpperRSSIThresholdRATR; -+ u32 MiddleRSSIThresholdRATR; -+ u32 LowRSSIThresholdRATR; -+ u32 LowRSSIThresholdRATR40M; -+ u32 LowRSSIThresholdRATR20M; -+ u8 PingRSSIEnable; //cosa add for Netcore long range ping issue -+ u32 PingRSSIRATR; //cosa add for Netcore long range ping issue -+ u32 PingRSSIThreshForRA;//cosa add for Netcore long range ping issue -+ u32 LastRATR; -+ u8 PreRATRState; -+ -+} RATE_ADAPTIVE, *PRATE_ADAPTIVE; -+ -+typedef enum tag_SW_Antenna_Switch_Definition -+{ -+ Antenna_B = 1, -+ Antenna_A = 2, -+ Antenna_MAX = 3, -+}DM_SWAS_E; -+ -+// 20100514 Joseph: Add definition for antenna switching test after link. -+// This indicates two different the steps. -+// In SWAW_STEP_PEAK, driver needs to switch antenna and listen to the signal on the air. -+// In SWAW_STEP_DETERMINE, driver just compares the signal captured in SWAW_STEP_PEAK -+// with original RSSI to determine if it is necessary to switch antenna. -+#define SWAW_STEP_PEAK 0 -+#define SWAW_STEP_DETERMINE 1 -+ -+#define TP_MODE 0 -+#define RSSI_MODE 1 -+#define TRAFFIC_LOW 0 -+#define TRAFFIC_HIGH 1 -+ -+//============================= -+//Neil Chen---2011--06--15-- -+//============================== -+//3 PathDiv -+typedef struct _SW_Antenna_Switch_ -+{ -+ u8 try_flag; -+ s32 PreRSSI; -+ u8 CurAntenna; -+ u8 PreAntenna; -+ u8 RSSI_Trying; -+ u8 TestMode; -+ u8 bTriggerAntennaSwitch; -+ u8 SelectAntennaMap; -+ -+ // Before link Antenna Switch check -+ u8 SWAS_NoLink_State; -+ u32 SWAS_NoLink_BK_Reg860; -+}SWAT_T, *pSWAT_T; -+//======================================== -+ -+struct dm_priv -+{ -+ u8 DM_Type; -+ u8 DMFlag, DMFlag_tmp; -+ -+ //for DIG -+ u8 bDMInitialGainEnable; -+ //u8 binitialized; // for dm_initial_gain_Multi_STA use. -+ DIG_T DM_DigTable; -+ -+ PS_T DM_PSTable; -+ -+ FALSE_ALARM_STATISTICS FalseAlmCnt; -+ -+ //for rate adaptive, in fact, 88c/92c fw will handle this -+ u8 bUseRAMask; -+ RATE_ADAPTIVE RateAdaptive; -+ -+ //* Upper and Lower Signal threshold for Rate Adaptive*/ -+ int UndecoratedSmoothedPWDB; -+ int EntryMinUndecoratedSmoothedPWDB; -+ int EntryMaxUndecoratedSmoothedPWDB; -+ int MinUndecoratedPWDBForDM; -+ int LastMinUndecoratedPWDBForDM; -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ int RssiValMinForAnotherMacOfDMSP; -+ u32 CurDigValueForAnotherMacOfDMSP; -+ BOOLEAN bWriteDigForAnotherMacOfDMSP; -+ BOOLEAN bChangeCCKPDStateForAnotherMacOfDMSP; -+ u8 CurCCKPDStateForAnotherMacOfDMSP; -+ BOOLEAN bChangeTxHighPowerLvlForAnotherMacOfDMSP; -+ u8 CurTxHighLvlForAnotherMacOfDMSP; -+#endif -+ -+ //for High Power -+ u8 bDynamicTxPowerEnable; -+ u8 LastDTPLvl; -+ u8 DynamicTxHighPowerLvl;//Add by Jacken Tx Power Control for Near/Far Range 2008/03/06 -+ -+ //for tx power tracking -+ u8 bTXPowerTracking; -+ u8 TXPowercount; -+ u8 bTXPowerTrackingInit; -+ u8 TxPowerTrackControl; //for mp mode, turn off txpwrtracking as default -+ u8 TM_Trigger; -+ -+ u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 -+ u8 ThermalValue; -+ u8 ThermalValue_LCK; -+ u8 ThermalValue_IQK; -+ u8 ThermalValue_AVG[AVG_THERMAL_NUM]; -+ u8 ThermalValue_AVG_index; -+ u8 ThermalValue_RxGain; -+ u8 ThermalValue_Crystal; -+ u8 Delta_IQK; -+ u8 Delta_LCK; -+ u8 bRfPiEnable; -+ u8 bReloadtxpowerindex; -+ u8 bDoneTxpower; -+ -+ //for APK -+ u32 APKoutput[2][2]; //path A/B; output1_1a/output1_2a -+ u8 bAPKdone; -+ u8 bAPKThermalMeterIgnore; -+ BOOLEAN bDPKdone[2]; -+ BOOLEAN bDPKstore; -+ BOOLEAN bDPKworking; -+ u8 OFDM_min_index_internalPA_DPK[2]; -+ u8 TxPowerLevelDPK[2]; -+ -+ u32 RegA24; -+ -+ //for IQK -+ u32 Reg874; -+ u32 RegC08; -+ u32 Reg88C; -+ u8 Reg522; -+ u8 Reg550; -+ u8 Reg551; -+ u32 Reg870; -+ u32 ADDA_backup[IQK_ADDA_REG_NUM]; -+ u32 IQK_MAC_backup[IQK_MAC_REG_NUM]; -+ u32 IQK_BB_backup[IQK_BB_REG_NUM]; -+ -+ u8 bCCKinCH14; -+ -+ char CCK_index; -+ //u8 Record_CCK_20Mindex; -+ //u8 Record_CCK_40Mindex; -+ char OFDM_index[2]; -+ -+ SWAT_T DM_SWAT_Table; -+ -+ //for TxPwrTracking -+ int RegE94; -+ int RegE9C; -+ int RegEB4; -+ int RegEBC; -+#if MP_DRIVER == 1 -+ u8 RegC04_MP; -+ u32 RegD04_MP; -+#endif -+ u32 TXPowerTrackingCallbackCnt; //cosa add for debug -+ -+ u32 prv_traffic_idx; // edca turbo -+ -+ u32 RegRF3C[2]; //pathA / pathB -+ -+ // Add for Reading Initial Data Rate SEL Register 0x484 during watchdog. Using for fill tx desc. 2011.3.21 by Thomas -+ u8 INIDATA_RATE[32]; -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ /* Ported from ODM, for ESTI Adaptivity test */ -+ s8 TH_L2H_ini; -+ s8 TH_EDCCA_HL_diff; -+ s8 IGI_Base; -+ u8 IGI_target; -+ bool ForceEDCCA; -+ u8 AdapEn_RSSI; -+ s8 Force_TH_H; -+ s8 Force_TH_L; -+ u8 IGI_LowerBound; -+ -+ bool bPreEdccaEnable; -+#endif -+}; -+ -+ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export Marco Definition---------------------------*/ -+//#define DM_MultiSTA_InitGainChangeNotify(Event) {DM_DigTable.CurMultiSTAConnectState = Event;} -+ -+ -+//============================================================ -+// function prototype -+//============================================================ -+void rtl8192d_init_dm_priv(IN PADAPTER Adapter); -+void rtl8192d_deinit_dm_priv(IN PADAPTER Adapter); -+void rtl8192d_InitHalDm(IN PADAPTER Adapter); -+void rtl8192d_HalDmWatchDog(IN PADAPTER Adapter); -+ -+VOID rtl8192d_dm_CheckTXPowerTracking(IN PADAPTER Adapter); -+ -+#endif //__HAL8190PCIDM_H__ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h -@@ -0,0 +1,1126 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192D_HAL_H__ -+#define __RTL8192D_HAL_H__ -+ -+#include "hal_com.h" -+#include "rtl8192d_spec.h" -+#include "Hal8192DPhyReg.h" -+#include "Hal8192DPhyCfg.h" -+#include "rtl8192d_rf.h" -+#include "rtl8192d_dm.h" -+#include "rtl8192d_recv.h" -+#include "rtl8192d_xmit.h" -+#include "rtl8192d_cmd.h" -+ -+/*---------------------------Define Local Constant---------------------------*/ -+/* Channel switch:The size of command tables for switch channel*/ -+#define MAX_PRECMD_CNT 16 -+#define MAX_RFDEPENDCMD_CNT 16 -+#define MAX_POSTCMD_CNT 16 -+ -+#define MAX_DOZE_WAITING_TIMES_9x 64 -+ -+#define MAX_RF_IMR_INDEX 12 -+#define MAX_RF_IMR_INDEX_NORMAL 13 -+#define RF_REG_NUM_for_C_CUT_5G 6 -+#define RF_REG_NUM_for_C_CUT_5G_internalPA 7 -+#define RF_REG_NUM_for_C_CUT_2G 5 -+#define RF_CHNL_NUM_5G 19 -+#define RF_CHNL_NUM_5G_40M 17 -+#define TARGET_CHNL_NUM_5G 221 -+#define TARGET_CHNL_NUM_2G 14 -+#define TARGET_CHNL_NUM_2G_5G 59 -+#define CV_CURVE_CNT 64 -+ -+//static u32 RF_REG_FOR_5G_SWCHNL[MAX_RF_IMR_INDEX]={0,0x2f,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x38,0x39,0x0}; -+static u32 RF_REG_FOR_5G_SWCHNL_NORMAL[MAX_RF_IMR_INDEX_NORMAL]={0,0x2f,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x0}; -+ -+static u8 RF_REG_for_C_CUT_5G[RF_REG_NUM_for_C_CUT_5G] = -+ {RF_SYN_G1, RF_SYN_G2, RF_SYN_G3, RF_SYN_G4, RF_SYN_G5, RF_SYN_G6}; -+ -+static u8 RF_REG_for_C_CUT_5G_internalPA[RF_REG_NUM_for_C_CUT_5G_internalPA] = -+ {0x0B, 0x48, 0x49, 0x4B, 0x03, 0x04, 0x0E}; -+static u8 RF_REG_for_C_CUT_2G[RF_REG_NUM_for_C_CUT_2G] = -+ {RF_SYN_G1, RF_SYN_G2, RF_SYN_G3, RF_SYN_G7, RF_SYN_G8}; -+ -+#if DBG -+static u32 RF_REG_MASK_for_C_CUT_2G[RF_REG_NUM_for_C_CUT_2G] = -+ {BIT19|BIT18|BIT17|BIT14|BIT1, BIT10|BIT9, -+ BIT18|BIT17|BIT16|BIT1, BIT2|BIT1, -+ BIT15|BIT14|BIT13|BIT12|BIT11}; -+#endif //amy, temp remove -+static u8 RF_CHNL_5G[RF_CHNL_NUM_5G] = -+ {36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140}; -+static u8 RF_CHNL_5G_40M[RF_CHNL_NUM_5G_40M] = -+ {38,42,46,50,54,58,62,102,106,110,114,118,122,126,130,134,138}; -+ -+static u32 RF_REG_Param_for_C_CUT_5G[5][RF_REG_NUM_for_C_CUT_5G] = { -+ {0xE43BE, 0xFC638, 0x77C0A, 0xDE471, 0xd7110, 0x8EB04}, -+ {0xE43BE, 0xFC078, 0xF7C1A, 0xE0C71, 0xD7550, 0xAEB04}, -+ {0xE43BF, 0xFF038, 0xF7C0A, 0xDE471, 0xE5550, 0xAEB04}, -+ {0xE43BF, 0xFF079, 0xF7C1A, 0xDE471, 0xE5550, 0xAEB04}, -+ {0xE43BF, 0xFF038, 0xF7C1A, 0xDE471, 0xd7550, 0xAEB04}}; -+ -+static u32 RF_REG_Param_for_C_CUT_2G[3][RF_REG_NUM_for_C_CUT_2G] = { -+ {0x643BC, 0xFC038, 0x77C1A, 0x41289, 0x01840}, -+ {0x643BC, 0xFC038, 0x07C1A, 0x41289, 0x01840}, -+ {0x243BC, 0xFC438, 0x07C1A, 0x4128B, 0x0FC41}}; -+ -+#if SWLCK == 1 -+static u32 RF_REG_SYN_G4_for_C_CUT_2G = 0xD1C31&0x7FF; -+#endif -+ -+static u32 RF_REG_Param_for_C_CUT_5G_internalPA[3][RF_REG_NUM_for_C_CUT_5G_internalPA] = { -+ {0x01a00, 0x40443, 0x00eb5, 0x89bec, 0x94a12, 0x94a12, 0x94a12}, -+ {0x01800, 0xc0443, 0x00730, 0x896ee, 0x94a52, 0x94a52, 0x94a52}, -+ {0x01800, 0xc0443, 0x00730, 0x896ee, 0x94a12, 0x94a12, 0x94a12}}; -+ -+ -+ -+//[mode][patha+b][reg] -+static u32 RF_IMR_Param_Normal[1][3][MAX_RF_IMR_INDEX_NORMAL]={{ -+ {0x70000,0x00ff0,0x4400f,0x00ff0,0x0,0x0,0x0,0x0,0x0,0x64888,0xe266c,0x00090,0x22fff},// channel 1-14. -+ {0x70000,0x22880,0x4470f,0x55880,0x00070, 0x88000, 0x0,0x88080,0x70000,0x64a82,0xe466c,0x00090,0x32c9a}, //path 36-64 -+ {0x70000,0x44880,0x4477f,0x77880,0x00070, 0x88000, 0x0,0x880b0,0x0,0x64b82,0xe466c,0x00090,0x32c9a} //100 -165 -+} -+}; -+ -+//static u32 CurveIndex_5G[TARGET_CHNL_NUM_5G]={0}; -+//static u32 CurveIndex_2G[TARGET_CHNL_NUM_2G]={0}; -+static u32 CurveIndex[TARGET_CHNL_NUM_2G_5G]={0}; -+ -+static u32 TargetChnl_5G[TARGET_CHNL_NUM_5G] = { -+25141, 25116, 25091, 25066, 25041, -+25016, 24991, 24966, 24941, 24917, -+24892, 24867, 24843, 24818, 24794, -+24770, 24765, 24721, 24697, 24672, -+24648, 24624, 24600, 24576, 24552, -+24528, 24504, 24480, 24457, 24433, -+24409, 24385, 24362, 24338, 24315, -+24291, 24268, 24245, 24221, 24198, -+24175, 24151, 24128, 24105, 24082, -+24059, 24036, 24013, 23990, 23967, -+23945, 23922, 23899, 23876, 23854, -+23831, 23809, 23786, 23764, 23741, -+23719, 23697, 23674, 23652, 23630, -+23608, 23586, 23564, 23541, 23519, -+23498, 23476, 23454, 23432, 23410, -+23388, 23367, 23345, 23323, 23302, -+23280, 23259, 23237, 23216, 23194, -+23173, 23152, 23130, 23109, 23088, -+23067, 23046, 23025, 23003, 22982, -+22962, 22941, 22920, 22899, 22878, -+22857, 22837, 22816, 22795, 22775, -+22754, 22733, 22713, 22692, 22672, -+22652, 22631, 22611, 22591, 22570, -+22550, 22530, 22510, 22490, 22469, -+22449, 22429, 22409, 22390, 22370, -+22350, 22336, 22310, 22290, 22271, -+22251, 22231, 22212, 22192, 22173, -+22153, 22134, 22114, 22095, 22075, -+22056, 22037, 22017, 21998, 21979, -+21960, 21941, 21921, 21902, 21883, -+21864, 21845, 21826, 21807, 21789, -+21770, 21751, 21732, 21713, 21695, -+21676, 21657, 21639, 21620, 21602, -+21583, 21565, 21546, 21528, 21509, -+21491, 21473, 21454, 21436, 21418, -+21400, 21381, 21363, 21345, 21327, -+21309, 21291, 21273, 21255, 21237, -+21219, 21201, 21183, 21166, 21148, -+21130, 21112, 21095, 21077, 21059, -+21042, 21024, 21007, 20989, 20972, -+25679, 25653, 25627, 25601, 25575, -+25549, 25523, 25497, 25471, 25446, -+25420, 25394, 25369, 25343, 25318, -+25292, 25267, 25242, 25216, 25191, -+25166 }; -+ -+static u32 TargetChnl_2G[TARGET_CHNL_NUM_2G] = { // channel 1~14 -+26084, 26030, 25976, 25923, 25869, 25816, 25764, -+25711, 25658, 25606, 25554, 25502, 25451, 25328 -+}; -+ -+ -+#ifdef CONFIG_PCI_HCI -+ #include -+ #include "Hal8192DEHWImg.h" -+ -+ #define RTL819X_DEFAULT_RF_TYPE RF_2T2R -+ -+//--------------------------------------------------------------------- -+// RTL8192DE From file -+//--------------------------------------------------------------------- -+ #define RTL8192D_FW_IMG "rtl8192DE\\rtl8192dfw.bin" -+ -+ #define RTL8192D_PHY_REG "rtl8192DE\\PHY_REG.txt" -+ #define RTL8192D_PHY_REG_PG "rtl8192DE\\PHY_REG_PG.txt" -+ #define RTL8192D_PHY_REG_MP "rtl8192DE\\PHY_REG_MP.txt" -+ -+ #define RTL8192D_AGC_TAB "rtl8192DE\\AGC_TAB.txt" -+ #define RTL8192D_AGC_TAB_2G "rtl8192DE\\AGC_TAB_2G.txt" -+ #define RTL8192D_AGC_TAB_5G "rtl8192DE\\AGC_TAB_5G.txt" -+ #define RTL8192D_PHY_RADIO_A "rtl8192DE\\radio_a.txt" -+ #define RTL8192D_PHY_RADIO_B "rtl8192DE\\radio_b.txt" -+ #define RTL8192D_PHY_RADIO_A_intPA "rtl8192DE\\radio_a_intPA.txt" -+ #define RTL8192D_PHY_RADIO_B_intPA "rtl8192DE\\radio_b_intPA.txt" -+ #define RTL8192D_PHY_MACREG "rtl8192DE\\MAC_REG.txt" -+ -+//--------------------------------------------------------------------- -+// RTL8192DE From header -+//--------------------------------------------------------------------- -+ -+ // Fw Array -+ #define Rtl8192D_FwImageArray Rtl8192DEFwImgArray -+ -+ // MAC/BB/PHY Array -+ #define Rtl8192D_MAC_Array Rtl8192DEMAC_2T_Array -+ #define Rtl8192D_AGCTAB_Array Rtl8192DEAGCTAB_Array -+ #define Rtl8192D_AGCTAB_5GArray Rtl8192DEAGCTAB_5GArray -+ #define Rtl8192D_AGCTAB_2GArray Rtl8192DEAGCTAB_2GArray -+ #define Rtl8192D_AGCTAB_2TArray Rtl8192DEAGCTAB_2TArray -+ #define Rtl8192D_AGCTAB_1TArray Rtl8192DEAGCTAB_1TArray -+ #define Rtl8192D_PHY_REG_2TArray Rtl8192DEPHY_REG_2TArray -+ #define Rtl8192D_PHY_REG_1TArray Rtl8192DEPHY_REG_1TArray -+ #define Rtl8192D_PHY_REG_Array_PG Rtl8192DEPHY_REG_Array_PG -+ #define Rtl8192D_PHY_REG_Array_MP Rtl8192DEPHY_REG_Array_MP -+ #define Rtl8192D_RadioA_2TArray Rtl8192DERadioA_2TArray -+ #define Rtl8192D_RadioA_1TArray Rtl8192DERadioA_1TArray -+ #define Rtl8192D_RadioB_2TArray Rtl8192DERadioB_2TArray -+ #define Rtl8192D_RadioB_1TArray Rtl8192DERadioB_1TArray -+ #define Rtl8192D_RadioA_2T_intPAArray Rtl8192DERadioA_2T_intPAArray -+ #define Rtl8192D_RadioB_2T_intPAArray Rtl8192DERadioB_2T_intPAArray -+ -+ // Array length -+ #define Rtl8192D_FwImageArrayLength Rtl8192DEImgArrayLength -+ #define Rtl8192D_MAC_ArrayLength Rtl8192DEMAC_2T_ArrayLength -+ #define Rtl8192D_AGCTAB_5GArrayLength Rtl8192DEAGCTAB_5GArrayLength -+ #define Rtl8192D_AGCTAB_2GArrayLength Rtl8192DEAGCTAB_2GArrayLength -+ #define Rtl8192D_AGCTAB_2TArrayLength Rtl8192DEAGCTAB_2TArrayLength -+ #define Rtl8192D_AGCTAB_1TArrayLength Rtl8192DEAGCTAB_1TArrayLength -+ #define Rtl8192D_AGCTAB_ArrayLength Rtl8192DEAGCTAB_ArrayLength -+ #define Rtl8192D_PHY_REG_2TArrayLength Rtl8192DEPHY_REG_2TArrayLength -+ #define Rtl8192D_PHY_REG_1TArrayLength Rtl8192DEPHY_REG_1TArrayLength -+ #define Rtl8192D_PHY_REG_Array_PGLength Rtl8192DEPHY_REG_Array_PGLength -+ #define Rtl8192D_PHY_REG_Array_MPLength Rtl8192DEPHY_REG_Array_MPLength -+ #define Rtl8192D_RadioA_2TArrayLength Rtl8192DERadioA_2TArrayLength -+ #define Rtl8192D_RadioB_2TArrayLength Rtl8192DERadioB_2TArrayLength -+ #define Rtl8192D_RadioA_2T_intPAArrayLength Rtl8192DERadioA_2T_intPAArrayLength -+ #define Rtl8192D_RadioB_2T_intPAArrayLength Rtl8192DERadioB_2T_intPAArrayLength -+ -+#elif defined(CONFIG_USB_HCI) -+ -+ #include "Hal8192DUHWImg.h" -+#ifdef CONFIG_WOWLAN -+ #include "Hal8192DUHWImg_wowlan.h" -+#endif //CONFIG_WOWLAN -+ #define RTL819X_DEFAULT_RF_TYPE RF_1T2R -+ -+//--------------------------------------------------------------------- -+// RTL8192DU From file -+//--------------------------------------------------------------------- -+ #define RTL8192D_FW_IMG "rtl8192DU\\rtl8192dfw.bin" -+ -+ #define RTL8192D_PHY_REG "rtl8192DU\\PHY_REG.txt" -+ #define RTL8192D_PHY_REG_PG "rtl8192DU\\PHY_REG_PG.txt" -+ #define RTL8192D_PHY_REG_MP "rtl8192DU\\PHY_REG_MP.txt" -+ -+ #define RTL8192D_AGC_TAB "rtl8192DU\\AGC_TAB.txt" -+ #define RTL8192D_AGC_TAB_2G "rtl8192DU\\AGC_TAB_2G.txt" -+ #define RTL8192D_AGC_TAB_5G "rtl8192DU\\AGC_TAB_5G.txt" -+ #define RTL8192D_PHY_RADIO_A "rtl8192DU\\radio_a.txt" -+ #define RTL8192D_PHY_RADIO_B "rtl8192DU\\radio_b.txt" -+ #define RTL8192D_PHY_RADIO_A_intPA "rtl8192DU\\radio_a_intPA.txt" -+ #define RTL8192D_PHY_RADIO_B_intPA "rtl8192DU\\radio_b_intPA.txt" -+ #define RTL8192D_PHY_MACREG "rtl8192DU\\MAC_REG.txt" -+ -+//--------------------------------------------------------------------- -+// RTL8192DU From header -+//--------------------------------------------------------------------- -+ -+ // Fw Array -+ #define Rtl8192D_FwImageArray Rtl8192DUFwImgArray -+#ifdef CONFIG_WOWLAN -+ #define Rtl8192D_FwWWImageArray Rtl8192DUFwWWImgArray -+#endif //CONFIG_WOWLAN -+ // MAC/BB/PHY Array -+ #define Rtl8192D_MAC_Array Rtl8192DUMAC_2T_Array -+ #define Rtl8192D_AGCTAB_Array Rtl8192DUAGCTAB_Array -+ #define Rtl8192D_AGCTAB_5GArray Rtl8192DUAGCTAB_5GArray -+ #define Rtl8192D_AGCTAB_2GArray Rtl8192DUAGCTAB_2GArray -+ #define Rtl8192D_AGCTAB_2TArray Rtl8192DUAGCTAB_2TArray -+ #define Rtl8192D_AGCTAB_1TArray Rtl8192DUAGCTAB_1TArray -+ #define Rtl8192D_PHY_REG_2TArray Rtl8192DUPHY_REG_2TArray -+ #define Rtl8192D_PHY_REG_1TArray Rtl8192DUPHY_REG_1TArray -+ #define Rtl8192D_PHY_REG_Array_PG Rtl8192DUPHY_REG_Array_PG -+ #define Rtl8192D_PHY_REG_Array_MP Rtl8192DUPHY_REG_Array_MP -+ #define Rtl8192D_RadioA_2TArray Rtl8192DURadioA_2TArray -+ #define Rtl8192D_RadioA_1TArray Rtl8192DURadioA_1TArray -+ #define Rtl8192D_RadioB_2TArray Rtl8192DURadioB_2TArray -+ #define Rtl8192D_RadioB_1TArray Rtl8192DURadioB_1TArray -+ #define Rtl8192D_RadioA_2T_intPAArray Rtl8192DURadioA_2T_intPAArray -+ #define Rtl8192D_RadioB_2T_intPAArray Rtl8192DURadioB_2T_intPAArray -+ -+ // Array length -+ #define Rtl8192D_FwImageArrayLength Rtl8192DUImgArrayLength -+ #define Rtl8192D_MAC_ArrayLength Rtl8192DUMAC_2T_ArrayLength -+ #define Rtl8192D_AGCTAB_5GArrayLength Rtl8192DUAGCTAB_5GArrayLength -+ #define Rtl8192D_AGCTAB_2GArrayLength Rtl8192DUAGCTAB_2GArrayLength -+ #define Rtl8192D_AGCTAB_2TArrayLength Rtl8192DUAGCTAB_2TArrayLength -+ #define Rtl8192D_AGCTAB_1TArrayLength Rtl8192DUAGCTAB_1TArrayLength -+ #define Rtl8192D_AGCTAB_ArrayLength Rtl8192DUAGCTAB_ArrayLength -+ #define Rtl8192D_PHY_REG_2TArrayLength Rtl8192DUPHY_REG_2TArrayLength -+ #define Rtl8192D_PHY_REG_1TArrayLength Rtl8192DUPHY_REG_1TArrayLength -+ #define Rtl8192D_PHY_REG_Array_PGLength Rtl8192DUPHY_REG_Array_PGLength -+ #define Rtl8192D_PHY_REG_Array_MPLength Rtl8192DUPHY_REG_Array_MPLength -+ #define Rtl8192D_RadioA_2TArrayLength Rtl8192DURadioA_2TArrayLength -+ #define Rtl8192D_RadioB_2TArrayLength Rtl8192DURadioB_2TArrayLength -+ #define Rtl8192D_RadioA_2T_intPAArrayLength Rtl8192DURadioA_2T_intPAArrayLength -+ #define Rtl8192D_RadioB_2T_intPAArrayLength Rtl8192DURadioB_2T_intPAArrayLength -+ -+ // The file name "_2T" is for 92CU, "_1T" is for 88CU. Modified by tynli. 2009.11.24. -+/* #define Rtl819XFwImageArray Rtl8192DUFwImgArray -+ #define Rtl819XMAC_Array Rtl8192DUMAC_2TArray -+ #define Rtl819XAGCTAB_Array Rtl8192DUAGCTAB_Array -+ #define Rtl819XAGCTAB_5GArray Rtl8192DUAGCTAB_5GArray -+ #define Rtl819XAGCTAB_2GArray Rtl8192DUAGCTAB_2GArray -+ #define Rtl819XPHY_REG_2TArray Rtl8192DUPHY_REG_2TArray -+ #define Rtl819XPHY_REG_1TArray Rtl8192DUPHY_REG_1TArray -+ #define Rtl819XRadioA_2TArray Rtl8192DURadioA_2TArray -+ #define Rtl819XRadioA_1TArray Rtl8192DURadioA_1TArray -+ #define Rtl819XRadioA_2T_intPAArray Rtl8192DURadioA_2T_intPAArray -+ #define Rtl819XRadioB_2TArray Rtl8192DURadioB_2TArray -+ #define Rtl819XRadioB_1TArray Rtl8192DURadioB_1TArray -+ #define Rtl819XRadioB_2T_intPAArray Rtl8192DURadioB_2T_intPAArray -+ #define Rtl819XPHY_REG_Array_PG Rtl8192DUPHY_REG_Array_PG -+ #define Rtl819XPHY_REG_Array_MP Rtl8192DUPHY_REG_Array_MP -+ -+ #define Rtl819XAGCTAB_2TArray Rtl8192DUAGCTAB_2TArray -+ #define Rtl819XAGCTAB_1TArray Rtl8192DUAGCTAB_1TArray*/ -+ -+#endif -+ -+#define DRVINFO_SZ 4 // unit is 8bytes -+#define PageNum_128(_Len) (u32)(((_Len)>>7) + ((_Len)&0x7F ? 1:0)) -+ -+// -+// Check if FW header exists. We do not consider the lower 4 bits in this case. -+// By tynli. 2009.12.04. -+// -+#define IS_FW_HEADER_EXIST(_pFwHdr) ((le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x92C0 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x88C0 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFFF) == 0x92D0 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFFF) == 0x92D1 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFFF) == 0x92D2 ||\ -+ (le16_to_cpu(_pFwHdr->Signature)&0xFFFF) == 0x92D3 ) -+ -+#define FW_8192D_SIZE 0x8020 // Max FW len = 32k + 32(FW header length). -+#define FW_8192D_START_ADDRESS 0x1000 -+#define FW_8192D_END_ADDRESS 0x1FFF -+ -+#define MAX_PAGE_SIZE 4096 // @ page : 4k bytes -+ -+typedef enum _FIRMWARE_SOURCE{ -+ FW_SOURCE_IMG_FILE = 0, -+ FW_SOURCE_HEADER_FILE = 1, //from header file -+}FIRMWARE_SOURCE, *PFIRMWARE_SOURCE; -+ -+typedef struct _RT_FIRMWARE{ -+ FIRMWARE_SOURCE eFWSource; -+ u8* szFwBuffer; -+ u32 ulFwLength; -+#ifdef CONFIG_WOWLAN -+ u8* szWoWLANFwBuffer; -+ u32 ulWoWLANFwLength; -+#endif //CONFIG_WOWLAN -+}RT_FIRMWARE, *PRT_FIRMWARE, RT_FIRMWARE_92D, *PRT_FIRMWARE_92D; -+ -+// -+// This structure must be cared byte-ordering -+// -+// Added by tynli. 2009.12.04. -+typedef struct _RT_8192D_FIRMWARE_HDR {//8-byte alinment required -+ -+ //--- LONG WORD 0 ---- -+ u16 Signature; // 92C0: test chip; 92C, 88C0: test chip; 88C1: MP A-cut; 92C1: MP A-cut -+ u8 Category; // AP/NIC and USB/PCI -+ u8 Function; // Reserved for different FW function indcation, for further use when driver needs to download different FW in different conditions -+ u16 Version; // FW Version -+ u8 Subversion; // FW Subversion, default 0x00 -+ u8 Rsvd1; -+ -+ -+ //--- LONG WORD 1 ---- -+ u8 Month; // Release time Month field -+ u8 Date; // Release time Date field -+ u8 Hour; // Release time Hour field -+ u8 Minute; // Release time Minute field -+ u16 RamCodeSize; // The size of RAM code -+ u16 Rsvd2; -+ -+ //--- LONG WORD 2 ---- -+ u32 SvnIdx; // The SVN entry index -+ u32 Rsvd3; -+ -+ //--- LONG WORD 3 ---- -+ u32 Rsvd4; -+ u32 Rsvd5; -+ -+}RT_8192D_FIRMWARE_HDR, *PRT_8192D_FIRMWARE_HDR; -+ -+#define DRIVER_EARLY_INT_TIME 0x05 -+#define BCN_DMA_ATIME_INT_TIME 0x02 -+ -+typedef enum _BT_CoType{ -+ BT_2Wire = 0, -+ BT_ISSC_3Wire = 1, -+ BT_Accel = 2, -+ BT_CSR = 3, -+ BT_CSR_ENHAN = 4, -+ BT_RTL8756 = 5, -+} BT_CoType, *PBT_CoType; -+ -+typedef enum _BT_CurState{ -+ BT_OFF = 0, -+ BT_ON = 1, -+} BT_CurState, *PBT_CurState; -+ -+typedef enum _BT_ServiceType{ -+ BT_SCO = 0, -+ BT_A2DP = 1, -+ BT_HID = 2, -+ BT_HID_Idle = 3, -+ BT_Scan = 4, -+ BT_Idle = 5, -+ BT_OtherAction = 6, -+ BT_Busy = 7, -+ BT_OtherBusy = 8, -+} BT_ServiceType, *PBT_ServiceType; -+ -+typedef enum _BT_RadioShared{ -+ BT_Radio_Shared = 0, -+ BT_Radio_Individual = 1, -+} BT_RadioShared, *PBT_RadioShared; -+ -+typedef struct _BT_COEXIST_STR{ -+ u8 BluetoothCoexist; -+ u8 BT_Ant_Num; -+ u8 BT_CoexistType; -+ u8 BT_State; -+ u8 BT_CUR_State; //0:on, 1:off -+ u8 BT_Ant_isolation; //0:good, 1:bad -+ u8 BT_PapeCtrl; //0:SW, 1:SW/HW dynamic -+ u8 BT_Service; -+ u8 BT_RadioSharedType; -+ u8 Ratio_Tx; -+ u8 Ratio_PRI; -+}BT_COEXIST_STR, *PBT_COEXIST_STR; -+ -+//Added for 92D IQK setting. -+typedef struct _IQK_MATRIX_REGS_SETTING{ -+ BOOLEAN bIQKDone; -+#if 1 -+ int Value[1][IQK_Matrix_REG_NUM]; -+#else -+ u32 Mark[IQK_Matrix_REG_NUM]; -+ u32 Value[IQK_Matrix_REG_NUM]; -+#endif -+}IQK_MATRIX_REGS_SETTING,*PIQK_MATRIX_REGS_SETTING; -+ -+#ifdef CONFIG_USB_RX_AGGREGATION -+ -+typedef enum _USB_RX_AGG_MODE{ -+ USB_RX_AGG_DISABLE, -+ USB_RX_AGG_DMA, -+ USB_RX_AGG_USB, -+ USB_RX_AGG_DMA_USB -+}USB_RX_AGG_MODE; -+ -+#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer -+ -+#endif -+ -+ -+#define TX_SELE_HQ BIT(0) // High Queue -+#define TX_SELE_LQ BIT(1) // Low Queue -+#define TX_SELE_NQ BIT(2) // Normal Queue -+ -+ -+// Note: We will divide number of page equally for each queue other than public queue! -+ -+#define TX_TOTAL_PAGE_NUMBER 0xF8 -+#define TX_PAGE_BOUNDARY (TX_TOTAL_PAGE_NUMBER + 1) -+ -+// For Normal Chip Setting -+// (HPQ + LPQ + NPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER -+#define NORMAL_PAGE_NUM_PUBQ 0x56 -+ -+ -+// For Test Chip Setting -+// (HPQ + LPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER -+#define TEST_PAGE_NUM_PUBQ_92DU 0x89 -+#define TX_TOTAL_PAGE_NUMBER_92D_DUAL_MAC 0x7A -+#define NORMAL_PAGE_NUM_PUBQ_92D_DUAL_MAC 0x5A -+#define NORMAL_PAGE_NUM_HPQ_92D_DUAL_MAC 0x10 -+#define NORMAL_PAGE_NUM_LPQ_92D_DUAL_MAC 0x10 -+#define NORMAL_PAGE_NUM_NORMALQ_92D_DUAL_MAC 0 -+ -+#define TX_PAGE_BOUNDARY_DUAL_MAC (TX_TOTAL_PAGE_NUMBER_92D_DUAL_MAC + 1) -+ -+// For Test Chip Setting -+#define WMM_TEST_TX_TOTAL_PAGE_NUMBER 0xF5 -+#define WMM_TEST_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6 -+ -+#define WMM_TEST_PAGE_NUM_PUBQ 0xA3 -+#define WMM_TEST_PAGE_NUM_HPQ 0x29 -+#define WMM_TEST_PAGE_NUM_LPQ 0x29 -+ -+ -+//Note: For Normal Chip Setting ,modify later -+#define WMM_NORMAL_TX_TOTAL_PAGE_NUMBER 0xF5 -+#define WMM_NORMAL_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6 -+ -+#define WMM_NORMAL_PAGE_NUM_PUBQ_92D 0X65//0x82 -+#define WMM_NORMAL_PAGE_NUM_HPQ_92D 0X30//0x29 -+#define WMM_NORMAL_PAGE_NUM_LPQ_92D 0X30 -+#define WMM_NORMAL_PAGE_NUM_NPQ_92D 0X30 -+ -+#define WMM_NORMAL_PAGE_NUM_PUBQ_92D_DUAL_MAC 0X32 -+#define WMM_NORMAL_PAGE_NUM_HPQ_92D_DUAL_MAC 0X18 -+#define WMM_NORMAL_PAGE_NUM_LPQ_92D_DUAL_MAC 0X18 -+#define WMM_NORMAL_PAGE_NUM_NPQ_92D_DUAL_MAC 0X18 -+ -+//------------------------------------------------------------------------- -+// Chip specific -+//------------------------------------------------------------------------- -+ -+#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3) -+#define CHIP_BONDING_92C_1T2R 0x1 -+#define CHIP_BONDING_88C_USB_MCARD 0x2 -+#define CHIP_BONDING_88C_USB_HP 0x1 -+ -+// -+// 2011.01.06. Define new structure of chip version for RTL8723 and so on. Added by tynli. -+// -+/* -+ | BIT15:12 | BIT11:8 | BIT 7 | BIT6:4 | BIT3 | BIT2:0 | -+ |-------------+-----------+-----------+-------+-----------+-------| -+ | IC version(CUT) | ROM version | Manufacturer | RF type | Chip type | IC Type | -+ | | | TSMC/UMC | | TEST/NORMAL| | -+*/ -+// [15:12] IC version(CUT): A-cut=0, B-cut=1, C-cut=2, D-cut=3 -+// [7] Manufacturer: TSMC=0, UMC=1 -+// [6:4] RF type: 1T1R=0, 1T2R=1, 2T2R=2 -+// [3] Chip type: TEST=0, NORMAL=1 -+// [2:0] IC type: 81xxC=0, 8723=1, 92D=2 -+ -+#define CHIP_8723 BIT(0) -+#define CHIP_92D BIT(1) -+#define NORMAL_CHIP BIT(3) -+#define RF_TYPE_1T1R (~(BIT(4)|BIT(5)|BIT(6))) -+#define RF_TYPE_1T2R BIT(4) -+#define RF_TYPE_2T2R BIT(5) -+#define CHIP_VENDOR_UMC BIT(7) -+#define B_CUT_VERSION BIT(12) -+#define C_CUT_VERSION BIT(13) -+#define D_CUT_VERSION ((BIT(12)|BIT(13))) -+#define E_CUT_VERSION BIT(14) -+ -+ -+// MASK -+#define IC_TYPE_MASK (BIT(0)|BIT(1)|BIT(2)) -+#define CHIP_TYPE_MASK BIT(3) -+#define RF_TYPE_MASK (BIT(4)|BIT(5)|BIT(6)) -+#define MANUFACTUER_MASK BIT(7) -+#define ROM_VERSION_MASK (BIT(11)|BIT(10)|BIT(9)|BIT(8)) -+#define CUT_VERSION_MASK (BIT(15)|BIT(14)|BIT(13)|BIT(12)) -+ -+// Get element -+#define GET_CVID_IC_TYPE(version) ((version) & IC_TYPE_MASK) -+#define GET_CVID_CHIP_TYPE(version) ((version) & CHIP_TYPE_MASK) -+#define GET_CVID_RF_TYPE(version) ((version) & RF_TYPE_MASK) -+#define GET_CVID_MANUFACTUER(version) ((version) & MANUFACTUER_MASK) -+#define GET_CVID_ROM_VERSION(version) ((version) & ROM_VERSION_MASK) -+#define GET_CVID_CUT_VERSION(version) ((version) & CUT_VERSION_MASK) -+ -+#define IS_81XXC(version) ((GET_CVID_IC_TYPE(version) == 0)? _TRUE : _FALSE) -+#define IS_8723_SERIES(version) ((GET_CVID_IC_TYPE(version) == CHIP_8723)? _TRUE : _FALSE) -+#define IS_92D(version) ((GET_CVID_IC_TYPE(version) == CHIP_92D)? _TRUE : _FALSE) -+#define IS_1T1R(version) ((GET_CVID_RF_TYPE(version))? _FALSE : _TRUE) -+#define IS_1T2R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R)? _TRUE : _FALSE) -+#define IS_2T2R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R)? _TRUE : _FALSE) -+#define IS_CHIP_VENDOR_UMC(version) ((GET_CVID_MANUFACTUER(version))? _TRUE: _FALSE) -+ -+#define IS_92C_SERIAL(version) ((IS_81XXC(version) && IS_2T2R(version)) ? _TRUE : _FALSE) -+#define IS_VENDOR_UMC_A_CUT(version) ((IS_CHIP_VENDOR_UMC(version)) ? ((GET_CVID_CUT_VERSION(version)) ? _FALSE : _TRUE) : _FALSE) -+#define IS_VENDOR_8723_A_CUT(version) ((IS_8723_SERIES(version)) ? ((GET_CVID_CUT_VERSION(version)) ? _FALSE : _TRUE) : _FALSE) -+// 88/92C UMC B-cut vendor is set to TSMC so we need to check CHIP_VENDOR_UMC bit is not 1. -+#define IS_81xxC_VENDOR_UMC_B_CUT(version) ((IS_CHIP_VENDOR_UMC(version)) ? ((GET_CVID_CUT_VERSION(version) == B_CUT_VERSION) ? _TRUE : _FALSE):_FALSE) -+#define IS_92D_SINGLEPHY(version) ((IS_92D(version)) ? (IS_2T2R(version) ? _TRUE: _FALSE) : _FALSE) -+ -+#define IS_92D_C_CUT(version) ((IS_92D(version)) ? ((GET_CVID_CUT_VERSION(version) == C_CUT_VERSION) ? _TRUE : _FALSE) : _FALSE) -+#define IS_92D_D_CUT(version) ((IS_92D(version)) ? ((GET_CVID_CUT_VERSION(version) == D_CUT_VERSION) ? _TRUE : _FALSE) : _FALSE) -+#define IS_92D_E_CUT(version) ((IS_92D(version)) ? ((GET_CVID_CUT_VERSION(version) == E_CUT_VERSION) ? _TRUE : _FALSE) : _FALSE) -+#define IS_NORMAL_CHIP92D(version) ((GET_CVID_CHIP_TYPE(version))? _TRUE: _FALSE) -+ -+typedef enum _VERSION_8192D{ -+ VERSION_TEST_CHIP_88C = 0x0000, -+ VERSION_TEST_CHIP_92C = 0x0020, -+ VERSION_TEST_UMC_CHIP_8723 = 0x0081, -+ VERSION_NORMAL_TSMC_CHIP_88C = 0x0008, -+ VERSION_NORMAL_TSMC_CHIP_92C = 0x0028, -+ VERSION_NORMAL_TSMC_CHIP_92C_1T2R = 0x0018, -+ VERSION_NORMAL_UMC_CHIP_88C_A_CUT = 0x0088, -+ VERSION_NORMAL_UMC_CHIP_92C_A_CUT = 0x00a8, -+ VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT = 0x0098, -+ VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT = 0x0089, -+ VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT = 0x1089, -+ VERSION_NORMAL_UMC_CHIP_88C_B_CUT = 0x1088, -+ VERSION_NORMAL_UMC_CHIP_92C_B_CUT = 0x10a8, -+ VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT = 0x1090, -+ VERSION_TEST_CHIP_92D_SINGLEPHY= 0x0022, -+ VERSION_TEST_CHIP_92D_DUALPHY = 0x0002, -+ VERSION_NORMAL_CHIP_92D_SINGLEPHY= 0x002a, -+ VERSION_NORMAL_CHIP_92D_DUALPHY = 0x000a, -+ VERSION_NORMAL_CHIP_92D_C_CUT_SINGLEPHY = 0x202a, -+ VERSION_NORMAL_CHIP_92D_C_CUT_DUALPHY = 0x200a, -+ VERSION_NORMAL_CHIP_92D_D_CUT_SINGLEPHY = 0x302a, -+ VERSION_NORMAL_CHIP_92D_D_CUT_DUALPHY = 0x300a, -+ VERSION_NORMAL_CHIP_92D_E_CUT_SINGLEPHY = 0x402a, -+ VERSION_NORMAL_CHIP_92D_E_CUT_DUALPHY = 0x400a, -+}VERSION_8192D,*PVERSION_8192D; -+ -+ -+//------------------------------------------------------------------------- -+// Channel Plan -+//------------------------------------------------------------------------- -+enum ChannelPlan{ -+ CHPL_FCC = 0, -+ CHPL_IC = 1, -+ CHPL_ETSI = 2, -+ CHPL_SPAIN = 3, -+ CHPL_FRANCE = 4, -+ CHPL_MKK = 5, -+ CHPL_MKK1 = 6, -+ CHPL_ISRAEL = 7, -+ CHPL_TELEC = 8, -+ CHPL_GLOBAL = 9, -+ CHPL_WORLD = 10, -+}; -+ -+typedef struct _TxPowerInfo{ -+ u8 CCKIndex[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT40_1SIndex[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT40_2SIndexDiff[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ s8 HT20IndexDiff[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 OFDMIndexDiff[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT40MaxOffset[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 HT20MaxOffset[RF_PATH_MAX][CHANNEL_GROUP_MAX]; -+ u8 TSSI_A[3]; -+ u8 TSSI_B[3]; -+ u8 TSSI_A_5G[3]; //5GL/5GM/5GH -+ u8 TSSI_B_5G[3]; -+}TxPowerInfo, *PTxPowerInfo; -+ -+#define EFUSE_REAL_CONTENT_LEN 1024 -+#define EFUSE_MAP_LEN 256 -+#define EFUSE_MAX_SECTION 32 -+#define EFUSE_MAX_SECTION_BASE 16 -+// To prevent out of boundary programming case, leave 1byte and program full section -+// 9bytes + 1byt + 5bytes and pre 1byte. -+// For worst case: -+// | 2byte|----8bytes----|1byte|--7bytes--| //92D -+#define EFUSE_OOB_PROTECT_BYTES 18 // PG data exclude header, dummy 7 bytes frome CP test and reserved 1byte. -+ -+typedef enum _PA_MODE { -+ PA_MODE_EXTERNAL = 0x00, -+ PA_MODE_INTERNAL_SP3T = 0x01, -+ PA_MODE_INTERNAL_SPDT = 0x02 -+} PA_MODE; -+ -+/* Copy from rtl8192c */ -+enum c2h_id_8192d { -+ C2H_DBG = 0, -+ C2H_TSF = 1, -+ C2H_AP_RPT_RSP = 2, -+ C2H_CCX_TX_RPT = 3, -+ C2H_BT_RSSI = 4, -+ C2H_BT_OP_MODE = 5, -+ C2H_EXT_RA_RPT = 6, -+ C2H_HW_INFO_EXCH = 10, -+ C2H_C2H_H2C_TEST = 11, -+ C2H_BT_INFO = 12, -+ C2H_BT_MP_INFO = 15, -+ MAX_C2HEVENT -+}; -+ -+#ifdef CONFIG_PCI_HCI -+struct hal_data_8192de -+{ -+ VERSION_8192D VersionID; -+ -+ // add for 92D Phy mode/mac/Band mode -+ MACPHY_MODE_8192D MacPhyMode92D; -+ BAND_TYPE CurrentBandType92D; //0:2.4G, 1:5G -+ BAND_TYPE BandSet92D; -+ BOOLEAN bIsVS; -+ BOOLEAN bSupportRemoteWakeUp; -+ u8 AutoLoadStatusFor8192D; -+ -+ BOOLEAN bNOPG; -+ -+ BOOLEAN bMasterOfDMSP; -+ BOOLEAN bSlaveOfDMSP; -+ -+ u16 CustomerID; -+ -+ u16 FirmwareVersion; -+ u16 FirmwareVersionRev; -+ u16 FirmwareSubVersion; -+ -+ u32 IntrMask[2]; -+ u32 IntrMaskToSet[2]; -+ -+ u32 DisabledFunctions; -+ -+ //current WIFI_PHY values -+ u32 ReceiveConfig; -+ u32 TransmitConfig; -+ WIRELESS_MODE CurrentWirelessMode; -+ HT_CHANNEL_WIDTH CurrentChannelBW; -+ u8 CurrentChannel; -+ u8 nCur40MhzPrimeSC;// Control channel sub-carrier -+ u16 BasicRateSet; -+ -+ //rf_ctrl -+ u8 rf_chip; -+ u8 rf_type; -+ u8 NumTotalRFPath; -+ -+ // -+ // EEPROM setting. -+ // -+ u16 EEPROMVID; -+ u16 EEPROMDID; -+ u16 EEPROMSVID; -+ u16 EEPROMSMID; -+ u16 EEPROMChannelPlan; -+ u16 EEPROMVersion; -+ -+ u8 EEPROMCustomerID; -+ u8 EEPROMBoardType; -+ u8 EEPROMRegulatory; -+ -+ u8 EEPROMThermalMeter; -+ -+ u8 EEPROMC9; -+ u8 EEPROMCC; -+ u8 PAMode; -+ -+ u8 TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER_2G]; -+ u8 TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ u8 TxPwrLevelHT40_2S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ s8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// HT 20<->40 Pwr diff -+ u8 TxPwrLegacyHtDiff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// For HT<->legacy pwr diff -+ // For power group -+ u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ -+ u8 LegacyHTTxPowerDiff;// Legacy to HT rate power diff -+ -+ u8 CrystalCap; // CrystalCap. -+ -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv bt_coexist; -+#endif -+ -+ // Read/write are allow for following hardware information variables -+ u8 framesync; -+ u32 framesyncC34; -+ u8 framesyncMonitor; -+ u8 DefaultInitialGain[4]; -+ u8 pwrGroupCnt; -+ u32 MCSTxPowerLevelOriginalOffset[MAX_PG_GROUP][16]; -+ u32 CCKTxPowerLevelOriginalOffset; -+ -+ u32 AntennaTxPath; // Antenna path Tx -+ u32 AntennaRxPath; // Antenna path Rx -+ u8 BluetoothCoexist; -+ u8 ExternalPA; -+ u8 InternalPA5G[2]; //pathA / pathB -+ -+ //u32 LedControlNum; -+ //u32 LedControlMode; -+ //u32 TxPowerTrackControl; -+ u8 b1x1RecvCombine; // for 1T1R receive combining -+ -+ u8 bCurrentTurboEDCA; -+ u32 AcParam_BE; //Original parameter for BE, use for EDCA turbo. -+ -+ //vivi, for tx power tracking, 20080407 -+ //u16 TSSI_13dBm; -+ //u32 Pwr_Track; -+ // The current Tx Power Level -+ u8 CurrentCckTxPwrIdx; -+ u8 CurrentOfdm24GTxPwrIdx; -+ -+ BB_REGISTER_DEFINITION_T PHYRegDef[4]; //Radio A/B/C/D -+ -+ BOOLEAN bRFPathRxEnable[4]; // We support 4 RF path now. -+ -+ u32 RfRegChnlVal[2]; -+ -+ u8 bCckHighPower; -+ -+ BOOLEAN bPhyValueInitReady; -+ -+ BOOLEAN bTXPowerDataReadFromEEPORM; -+ -+ BOOLEAN bInSetPower; -+ -+ //RDG enable -+ BOOLEAN bRDGEnable; -+ -+ BOOLEAN bLoadIMRandIQKSettingFor2G;// True if IMR or IQK have done for 2.4G in scan progress -+ BOOLEAN bNeedIQK; -+ -+ BOOLEAN bLCKInProgress; -+ -+ BOOLEAN bEarlyModeEnable; -+ -+#if 1 -+ IQK_MATRIX_REGS_SETTING IQKMatrixRegSetting[IQK_Matrix_Settings_NUM]; -+#else -+ //regc80regc94regc4cregc88regc9cregc14regca0regc1cregc78 -+ u4Byte IQKMatrixReg[IQK_Matrix_REG_NUM]; -+ IQK_MATRIX_REGS_SETTING IQKMatrixRegSetting[IQK_Matrix_Settings_NUM]; // 1->2G,24->5G 20M channel,21->5G 40M channel. -+#endif -+ -+ //for host message to fw -+ u8 LastHMEBoxNum; -+ -+ u8 fw_ractrl; -+ // Beacon function related global variable. -+ u32 RegBcnCtrlVal; -+ u8 RegTxPause; -+ u8 RegFwHwTxQCtrl; -+ u8 RegReg542; -+ u8 RegCR_1; -+ -+ struct dm_priv dmpriv; -+ -+ u8 bInterruptMigration; -+ -+ u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. -+ -+ // Add for dual MAC 0--Mac0 1--Mac1 -+ u32 interfaceIndex; -+ -+ u16 RegRRSR; -+ -+ u16 EfuseUsedBytes; -+ u8 RTSInitRate; // 2010.11.24.by tynli. -+#ifdef CONFIG_P2P -+ struct P2P_PS_Offload_t p2p_ps_offload; -+#endif //CONFIG_P2P -+}; -+ -+typedef struct hal_data_8192de HAL_DATA_TYPE, *PHAL_DATA_TYPE; -+ -+// -+// Function disabled. -+// -+#define DF_TX_BIT BIT0 -+#define DF_RX_BIT BIT1 -+#define DF_IO_BIT BIT2 -+#define DF_IO_D3_BIT BIT3 -+ -+#define RT_DF_TYPE u32 -+#define RT_DISABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions |= ((RT_DF_TYPE)(__FuncBits))) -+#define RT_ENABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions &= (~((RT_DF_TYPE)(__FuncBits)))) -+#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) -+ -+void InterruptRecognized8192DE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -+VOID UpdateInterruptMask8192DE(PADAPTER Adapter, u32 AddMSR, u32 RemoveMSR); -+#endif -+ -+#ifdef CONFIG_USB_HCI -+ -+//should be renamed and moved to another file -+typedef enum _INTERFACE_SELECT_8192DUSB{ -+ INTF_SEL0_USB = 0, // USB -+ INTF_SEL1_MINICARD = 1, // Minicard -+ INTF_SEL2_EKB_PRO = 2, // Eee keyboard proprietary -+ INTF_SEL3_PRO = 3, // Customized proprietary -+} INTERFACE_SELECT_8192DUSB, *PINTERFACE_SELECT_8192DUSB; -+ -+typedef INTERFACE_SELECT_8192DUSB INTERFACE_SELECT_USB; -+ -+struct hal_data_8192du -+{ -+ VERSION_8192D VersionID; -+ -+ // add for 92D Phy mode/mac/Band mode -+ MACPHY_MODE_8192D MacPhyMode92D; -+ BAND_TYPE CurrentBandType92D; //0:2.4G, 1:5G -+ BAND_TYPE BandSet92D; -+ BOOLEAN bIsVS; -+ -+ BOOLEAN bNOPG; -+ -+ BOOLEAN bSupportRemoteWakeUp; -+ BOOLEAN bMasterOfDMSP; -+ BOOLEAN bSlaveOfDMSP; -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ BOOLEAN bInModeSwitchProcess; -+#endif -+ -+ u16 CustomerID; -+ -+ u16 FirmwareVersion; -+ u16 FirmwareVersionRev; -+ u16 FirmwareSubVersion; -+ -+ //current WIFI_PHY values -+ u32 ReceiveConfig; -+ WIRELESS_MODE CurrentWirelessMode; -+ HT_CHANNEL_WIDTH CurrentChannelBW; -+ u8 CurrentChannel; -+ u8 nCur40MhzPrimeSC;// Control channel sub-carrier -+ u16 BasicRateSet; -+ -+ INTERFACE_SELECT_8192DUSB InterfaceSel; -+ -+ //rf_ctrl -+ u8 rf_chip; -+ u8 rf_type; -+ u8 NumTotalRFPath; -+ -+ // -+ // EEPROM setting. -+ // -+ u8 EEPROMVersion; -+ u16 EEPROMVID; -+ u16 EEPROMPID; -+ u16 EEPROMSVID; -+ u16 EEPROMSDID; -+ u8 EEPROMCustomerID; -+ u8 EEPROMSubCustomerID; -+ u8 EEPROMRegulatory; -+ -+ u8 EEPROMThermalMeter; -+ -+ u8 EEPROMC9; -+ u8 EEPROMCC; -+ u8 PAMode; -+ -+ u8 TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER_2G]; -+ u8 TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ u8 TxPwrLevelHT40_2S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr -+ s8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// HT 20<->40 Pwr diff -+ u8 TxPwrLegacyHtDiff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// For HT<->legacy pwr diff -+ // For power group -+ u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; -+ -+ u8 LegacyHTTxPowerDiff;// Legacy to HT rate power diff -+ -+ u8 CrystalCap; // CrystalCap. -+ -+#ifdef CONFIG_BT_COEXIST -+ struct btcoexist_priv bt_coexist; -+#endif -+ -+ // Read/write are allow for following hardware information variables -+ u8 framesync; -+ u32 framesyncC34; -+ u8 framesyncMonitor; -+ u8 DefaultInitialGain[4]; -+ u8 pwrGroupCnt; -+ u32 MCSTxPowerLevelOriginalOffset[MAX_PG_GROUP][16]; -+ u32 CCKTxPowerLevelOriginalOffset; -+ -+ u32 AntennaTxPath; // Antenna path Tx -+ u32 AntennaRxPath; // Antenna path Rx -+ u8 BluetoothCoexist; -+ u8 ExternalPA; -+ u8 InternalPA5G[2]; //pathA / pathB -+ -+ //u32 LedControlNum; -+ //u32 LedControlMode; -+ //u32 TxPowerTrackControl; -+ u8 b1x1RecvCombine; // for 1T1R receive combining -+ -+ u8 bCurrentTurboEDCA; -+ u32 AcParam_BE; //Original parameter for BE, use for EDCA turbo. -+ -+ //vivi, for tx power tracking, 20080407 -+ //u16 TSSI_13dBm; -+ //u32 Pwr_Track; -+ // The current Tx Power Level -+ u8 CurrentCckTxPwrIdx; -+ u8 CurrentOfdm24GTxPwrIdx; -+ -+ BB_REGISTER_DEFINITION_T PHYRegDef[4]; //Radio A/B/C/D -+ -+ BOOLEAN bRFPathRxEnable[4]; // We support 4 RF path now. -+ -+ u32 RfRegChnlVal[2]; -+ -+ u8 bCckHighPower; -+ -+ BOOLEAN bPhyValueInitReady; -+ -+ BOOLEAN bTXPowerDataReadFromEEPORM; -+ -+ BOOLEAN bInSetPower; -+ -+ //RDG enable -+ BOOLEAN bRDGEnable; -+ -+ BOOLEAN bLoadIMRandIQKSettingFor2G;// True if IMR or IQK have done for 2.4G in scan progress -+ BOOLEAN bNeedIQK; -+ -+ BOOLEAN bLCKInProgress; -+ -+ BOOLEAN bEarlyModeEnable; -+ -+#if 1 -+ IQK_MATRIX_REGS_SETTING IQKMatrixRegSetting[IQK_Matrix_Settings_NUM]; -+#else -+ //regc80regc94regc4cregc88regc9cregc14regca0regc1cregc78 -+ u4Byte IQKMatrixReg[IQK_Matrix_REG_NUM]; -+ IQK_MATRIX_REGS_SETTING IQKMatrixRegSetting[IQK_Matrix_Settings_NUM]; // 1->2G,24->5G 20M channel,21->5G 40M channel. -+#endif -+ -+ //for host message to fw -+ u8 LastHMEBoxNum; -+ -+ u8 fw_ractrl; -+ // Beacon function related global variable. -+ u32 RegBcnCtrlVal; -+ u8 RegTxPause; -+ u8 RegFwHwTxQCtrl; -+ u8 RegReg542; -+ u8 RegCR_1; -+ -+ struct dm_priv dmpriv; -+ -+ u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. -+ -+ //Query RF by FW -+ BOOLEAN bReadRFbyFW; -+ -+ // For 92C USB endpoint setting -+ // -+ -+ u32 UsbBulkOutSize; -+ -+ int RtBulkOutPipe[3]; -+ int RtBulkInPipe; -+ int RtIntInPipe; -+ -+ // Add for dual MAC 0--Mac0 1--Mac1 -+ u32 interfaceIndex; -+ -+ u8 OutEpQueueSel; -+ u8 OutEpNumber; -+ -+ u8 Queue2EPNum[8];//for out endpoint number mapping -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+ u8 UsbTxAggMode; -+ u8 UsbTxAggDescNum; -+#endif -+#ifdef CONFIG_USB_RX_AGGREGATION -+ u16 HwRxPageSize; // Hardware setting -+ u32 MaxUsbRxAggBlock; -+ -+ USB_RX_AGG_MODE UsbRxAggMode; -+ u8 UsbRxAggBlockCount; // USB Block count. Block size is 512-byte in hight speed and 64-byte in full speed -+ u8 UsbRxAggBlockTimeout; -+ u8 UsbRxAggPageCount; // 8192C DMA page count -+ u8 UsbRxAggPageTimeout; -+#endif -+ -+ u16 RegRRSR; -+ -+ u16 EfuseUsedBytes; -+ u8 RTSInitRate; // 2010.11.24.by tynli. -+#ifdef CONFIG_P2P -+ struct P2P_PS_Offload_t p2p_ps_offload; -+#endif //CONFIG_P2P -+}; -+ -+typedef struct hal_data_8192du HAL_DATA_TYPE, *PHAL_DATA_TYPE; -+#endif -+ -+#define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData)) -+#define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type) -+ -+int FirmwareDownload92D(IN PADAPTER Adapter,IN BOOLEAN bUsedWoWLANFw); -+VOID rtl8192d_FirmwareSelfReset(IN PADAPTER Adapter); -+void rtl8192d_ReadChipVersion(IN PADAPTER Adapter); -+VOID rtl8192d_EfuseParseChnlPlan(PADAPTER Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -+VOID rtl8192d_ReadTxPowerInfo(PADAPTER Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); -+VOID rtl8192d_ResetDualMacSwitchVariables(IN PADAPTER Adapter); -+u8 GetEEPROMSize8192D(PADAPTER Adapter); -+BOOLEAN PHY_CheckPowerOffFor8192D(PADAPTER Adapter); -+VOID PHY_SetPowerOnFor8192D(PADAPTER Adapter); -+//void PHY_ConfigMacPhyMode92D(PADAPTER Adapter); -+void rtl8192d_free_hal_data(_adapter * padapter); -+void rtl8192d_set_hal_ops(struct hal_ops *pHalFunc); -+ -+#endif -+ -+#ifdef CONFIG_MP_INCLUDED -+ -+ -+extern void Hal_SetAntenna(PADAPTER pAdapter); -+extern void Hal_SetBandwidth(PADAPTER pAdapter); -+ -+extern void Hal_SetTxPower(PADAPTER pAdapter); -+extern void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetSingleToneTx ( PADAPTER pAdapter , u8 bStart ); -+extern void Hal_SetSingleCarrierTx (PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetContinuousTx (PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetBandwidth(PADAPTER pAdapter); -+ -+extern void Hal_SetDataRate(PADAPTER pAdapter); -+extern void Hal_SetChannel(PADAPTER pAdapter); -+extern void Hal_SetAntennaPathPower(PADAPTER pAdapter); -+extern s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther); -+extern s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable); -+extern void Hal_GetPowerTracking(PADAPTER padapter, u8 * enable); -+extern void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value); -+extern void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter); -+extern void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14); -+extern void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven); -+extern void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 * TxPower); -+extern void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 * TxPower); -+extern void Hal_TriggerRFThermalMeter(PADAPTER pAdapter); -+extern u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter); -+extern void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); -+ -+ -+#endif //end CONFIG_MP_INCLUDED -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h -@@ -0,0 +1,43 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTL8192D_LED_H_ -+#define __RTL8192D_LED_H_ -+ -+#include -+#include -+#include -+ -+ -+//================================================================================ -+// Interface to manipulate LED objects. -+//================================================================================ -+#ifdef CONFIG_USB_HCI -+void rtl8192du_InitSwLeds(_adapter *padapter); -+void rtl8192du_DeInitSwLeds(_adapter *padapter); -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+void rtl8192de_gen_RefreshLedState(PADAPTER Adapter); -+void rtl8192de_InitSwLeds(_adapter *padapter); -+void rtl8192de_DeInitSwLeds(_adapter *padapter); -+#endif -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h -@@ -0,0 +1,187 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL8192D_RECV_H_ -+#define _RTL8192D_RECV_H_ -+ -+#include -+#include -+#include -+ -+ -+#ifdef PLATFORM_OS_XP -+ #ifdef CONFIG_SDIO_HCI -+ #define NR_RECVBUFF 1024//512//128 -+ #else -+ #define NR_RECVBUFF (16) -+ #endif -+#elif defined(PLATFORM_OS_CE) -+ #ifdef CONFIG_SDIO_HCI -+ #define NR_RECVBUFF (128) -+ #else -+ #define NR_RECVBUFF (4) -+ #endif -+#else -+#ifdef CONFIG_SINGLE_RECV_BUF -+ #define NR_RECVBUFF (1) -+#else -+ #define NR_RECVBUFF (4) -+#endif //CONFIG_SINGLE_RECV_BUF -+ #define NR_PREALLOC_RECV_SKB (8) -+#endif -+ -+ -+ -+#define RECV_BLK_SZ 512 -+#define RECV_BLK_CNT 16 -+#define RECV_BLK_TH RECV_BLK_CNT -+ -+#if defined(CONFIG_USB_HCI) -+ -+#ifdef PLATFORM_OS_CE -+#define MAX_RECVBUF_SZ (8192+1024) // 8K+1k -+#else -+ #ifndef CONFIG_MINIMAL_MEMORY_USAGE -+ //#define MAX_RECVBUF_SZ (32768) // 32k -+ //#define MAX_RECVBUF_SZ (16384) //16K -+ //#define MAX_RECVBUF_SZ (10240) //10K -+ #ifdef CONFIG_PLATFORM_MSTAR -+ #define MAX_RECVBUF_SZ (8192) // 8K -+ #else -+ #define MAX_RECVBUF_SZ (15360) // 15k < 16k -+ #endif -+ #else -+ #define MAX_RECVBUF_SZ (4000) // about 4K -+ #endif -+#endif -+ -+#elif defined(CONFIG_PCI_HCI) -+//#ifndef CONFIG_MINIMAL_MEMORY_USAGE -+// #define MAX_RECVBUF_SZ (9100) -+//#else -+ #define MAX_RECVBUF_SZ (4000) // about 4K -+//#endif -+ -+#define RX_MPDU_QUEUE 0 -+#define RX_CMD_QUEUE 1 -+#define RX_MAX_QUEUE 2 -+#endif -+ -+#define RECV_BULK_IN_ADDR 0x80 -+#define RECV_INT_IN_ADDR 0x81 -+ -+#define PHY_RSSI_SLID_WIN_MAX 100 -+#define PHY_LINKQUALITY_SLID_WIN_MAX 20 -+ -+struct phy_stat -+{ -+ unsigned int phydw0; -+ -+ unsigned int phydw1; -+ -+ unsigned int phydw2; -+ -+ unsigned int phydw3; -+ -+ unsigned int phydw4; -+ -+ unsigned int phydw5; -+ -+ unsigned int phydw6; -+ -+ unsigned int phydw7; -+}; -+ -+typedef struct _Phy_OFDM_Rx_Status_Report_8192cd -+{ -+ unsigned char trsw_gain_X[4]; -+ unsigned char pwdb_all; -+ unsigned char cfosho_X[4]; -+ unsigned char cfotail_X[4]; -+ unsigned char rxevm_X[2]; -+ unsigned char rxsnr_X[4]; -+ unsigned char pdsnr_X[2]; -+ unsigned char csi_current_X[2]; -+ unsigned char csi_target_X[2]; -+ unsigned char sigevm; -+ unsigned char max_ex_pwr; -+//#ifdef RTL8192SE -+#ifdef CONFIG_LITTLE_ENDIAN -+ unsigned char ex_intf_flg:1; -+ unsigned char sgi_en:1; -+ unsigned char rxsc:2; -+ //unsigned char rsvd:4; -+ unsigned char idle_long:1; -+ unsigned char r_ant_train_en:1; -+ unsigned char ANTSELB:1; -+ unsigned char ANTSEL:1; -+#else // _BIG_ENDIAN_ -+ //unsigned char rsvd:4; -+ unsigned char ANTSEL:1; -+ unsigned char ANTSELB:1; -+ unsigned char r_ant_train_en:1; -+ unsigned char idle_long:1; -+ unsigned char rxsc:2; -+ unsigned char sgi_en:1; -+ unsigned char ex_intf_flg:1; -+#endif -+//#else // RTL8190, RTL8192E -+// unsigned char sgi_en; -+// unsigned char rxsc_sgien_exflg; -+//#endif -+}__attribute__ ((packed)) PHY_STS_OFDM_8192CD_T,PHY_RX_DRIVER_INFO_8192CD; -+ -+typedef struct _Phy_CCK_Rx_Status_Report_8192cd -+{ -+ /* For CCK rate descriptor. This is a signed 8:1 variable. LSB bit presend -+ 0.5. And MSB 7 bts presend a signed value. Range from -64~+63.5. */ -+ u8 adc_pwdb_X[4]; -+ u8 SQ_rpt; -+ u8 cck_agc_rpt; -+} PHY_STS_CCK_8192CD_T; -+ -+// Rx smooth factor -+#define Rx_Smooth_Factor (20) -+ -+#ifdef CONFIG_USB_HCI -+typedef struct _INTERRUPT_MSG_FORMAT_EX{ -+ unsigned int C2H_MSG0; -+ unsigned int C2H_MSG1; -+ unsigned int C2H_MSG2; -+ unsigned int C2H_MSG3; -+ unsigned int HISR; // from HISR Reg0x124, read to clear -+ unsigned int HISRE;// from HISRE Reg0x12c, read to clear -+ unsigned int MSG_EX; -+}INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX; -+ -+void rtl8192du_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); -+int rtl8192du_init_recv_priv(_adapter * padapter); -+void rtl8192du_free_recv_priv(_adapter * padapter); -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+int rtl8192de_init_recv_priv(_adapter * padapter); -+void rtl8192de_free_recv_priv(_adapter * padapter); -+#endif -+ -+void rtl8192d_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_info); -+void rtl8192d_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h -@@ -0,0 +1,97 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/****************************************************************************** -+ * -+ * -+ * Module: rtl8192d_rf.h ( Header File) -+ * -+ * Note: Collect every HAL RF type exter API or constant. -+ * -+ * Function: -+ * -+ * Export: -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * -+ * 09/25/2008 MHC Create initial version. -+ * -+ * -+******************************************************************************/ -+#ifndef _RTL8192D_RF_H_ -+#define _RTL8192D_RF_H_ -+/* Check to see if the file has been included already. */ -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+// -+// For RF 6052 Series -+// -+#define RF6052_MAX_TX_PWR 0x3F -+#define RF6052_MAX_REG 0x3F -+#define RF6052_MAX_PATH 2 -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+/*------------------------------Define structure----------------------------*/ -+ -+/*------------------------------Define structure----------------------------*/ -+ -+ -+/*------------------------Export global variable----------------------------*/ -+/*------------------------Export global variable----------------------------*/ -+ -+/*------------------------Export Marco Definition---------------------------*/ -+ -+/*------------------------Export Marco Definition---------------------------*/ -+ -+ -+/*--------------------------Exported Function prototype---------------------*/ -+ -+// -+// RF RL6052 Series API -+// -+void rtl8192d_RF_ChangeTxPath( IN PADAPTER Adapter, -+ IN u16 DataRate); -+void rtl8192d_PHY_RF6052SetBandwidth( -+ IN PADAPTER Adapter, -+ IN HT_CHANNEL_WIDTH Bandwidth); -+VOID rtl8192d_PHY_RF6052SetCckTxPower( -+ IN PADAPTER Adapter, -+ IN u8* pPowerlevel); -+VOID rtl8192d_PHY_RF6052SetOFDMTxPower( -+ IN PADAPTER Adapter, -+ IN u8* pPowerLevel, -+ IN u8 Channel); -+int PHY_RF6052_Config8192D( IN PADAPTER Adapter ); -+ -+BOOLEAN rtl8192d_PHY_EnableAnotherPHY(IN PADAPTER Adapter, IN BOOLEAN bMac0); -+ -+void rtl8192d_PHY_PowerDownAnotherPHY(IN PADAPTER Adapter, IN BOOLEAN bMac0); -+ -+ -+/*--------------------------Exported Function prototype---------------------*/ -+ -+ -+#endif/* End of HalRf.h */ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h -@@ -0,0 +1,1841 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef __RTL8192D_SPEC_H__ -+#define __RTL8192D_SPEC_H__ -+ -+#include -+ -+#ifndef BIT -+#define BIT(x) (1 << (x)) -+#endif -+ -+#define BIT0 0x00000001 -+#define BIT1 0x00000002 -+#define BIT2 0x00000004 -+#define BIT3 0x00000008 -+#define BIT4 0x00000010 -+#define BIT5 0x00000020 -+#define BIT6 0x00000040 -+#define BIT7 0x00000080 -+#define BIT8 0x00000100 -+#define BIT9 0x00000200 -+#define BIT10 0x00000400 -+#define BIT11 0x00000800 -+#define BIT12 0x00001000 -+#define BIT13 0x00002000 -+#define BIT14 0x00004000 -+#define BIT15 0x00008000 -+#define BIT16 0x00010000 -+#define BIT17 0x00020000 -+#define BIT18 0x00040000 -+#define BIT19 0x00080000 -+#define BIT20 0x00100000 -+#define BIT21 0x00200000 -+#define BIT22 0x00400000 -+#define BIT23 0x00800000 -+#define BIT24 0x01000000 -+#define BIT25 0x02000000 -+#define BIT26 0x04000000 -+#define BIT27 0x08000000 -+#define BIT28 0x10000000 -+#define BIT29 0x20000000 -+#define BIT30 0x40000000 -+#define BIT31 0x80000000 -+ -+ -+//============================================================ -+// 8192D Regsiter offset definition -+//============================================================ -+ -+ -+//============================================================ -+// -+//============================================================ -+ -+//----------------------------------------------------- -+// -+// 0x0000h ~ 0x00FFh System Configuration -+// -+//----------------------------------------------------- -+#define REG_SYS_ISO_CTRL 0x0000 -+#define REG_SYS_FUNC_EN 0x0002 -+#define REG_APS_FSMCO 0x0004 -+#define REG_SYS_CLKR 0x0008 -+#define REG_9346CR 0x000A -+#define REG_EE_VPD 0x000C -+#define REG_AFE_MISC 0x0010 -+#define REG_SPS0_CTRL 0x0011 -+#define REG_POWER_OFF_IN_PROCESS 0x0017 -+#define REG_SPS_OCP_CFG 0x0018 -+#define REG_RSV_CTRL 0x001C -+#define REG_RF_CTRL 0x001F -+#define REG_LDOA15_CTRL 0x0020 -+#define REG_LDOV12D_CTRL 0x0021 -+#define REG_LDOHCI12_CTRL 0x0022 -+#define REG_LPLDO_CTRL 0x0023 -+#define REG_AFE_XTAL_CTRL 0x0024 -+#define REG_AFE_PLL_CTRL 0x0028 -+#define REG_MAC_PHY_CTRL 0x002c //for 92d, DMDP,SMSP,DMSP contrl -+#define REG_EFUSE_CTRL 0x0030 -+#define REG_EFUSE_TEST 0x0034 -+#define REG_PWR_DATA 0x0038 -+#define REG_CAL_TIMER 0x003C -+#define REG_ACLK_MON 0x003E -+#define REG_GPIO_MUXCFG 0x0040 -+//#define REG_GPIO_MUXCFG 0x0041 -+#define REG_GPIO_IO_SEL 0x0042 -+#define REG_MAC_PINMUX_CFG 0x0043 -+#define REG_GPIO_PIN_CTRL 0x0044 -+#define REG_GPIO_INTM 0x0048 -+#define REG_LEDCFG0 0x004C -+#define REG_LEDCFG1 0x004D -+#define REG_LEDCFG2 0x004E -+#define REG_LEDCFG3 0x004F -+#define REG_FSIMR 0x0050 -+#define REG_FSISR 0x0054 -+ -+#define REG_MCUFWDL 0x0080 -+#ifdef CONFIG_WOWLAN -+#define REG_WOWLAN_REASON 0x00FC -+#endif // CONFIG_WOWLAN -+#define REG_HMEBOX_EXT_0 0x0088 -+#define REG_HMEBOX_EXT_1 0x008A -+#define REG_HMEBOX_EXT_2 0x008C -+#define REG_HMEBOX_EXT_3 0x008E -+ -+#define REG_BIST_SCAN 0x00D0 -+#define REG_BIST_RPT 0x00D4 -+#define REG_BIST_ROM_RPT 0x00D8 -+#define REG_USB_SIE_INTF 0x00E0 -+#define REG_PCIE_MIO_INTF 0x00E4 -+#define REG_PCIE_MIO_INTD 0x00E8 -+#define REG_HPON_FSM 0x00EC -+#define REG_SYS_CFG 0x00F0 -+#define REG_MAC_PHY_CTRL_NORMAL 0x00f8 -+ -+#define REG_MAC0 0x0081 -+#define REG_MAC1 0x0053 -+#define FW_MAC0_ready 0x18 -+#define FW_MAC1_ready 0x1A -+#define MAC0_ON BIT7 -+#define MAC1_ON BIT0 -+#define mac0_ready BIT0 -+#define mac1_ready BIT0 -+ -+ -+//----------------------------------------------------- -+// -+// 0x0100h ~ 0x01FFh MACTOP General Configuration -+// -+//----------------------------------------------------- -+#define REG_CR 0x0100 -+#define REG_PBP 0x0104 -+#define REG_TRXDMA_CTRL 0x010C -+#define REG_TRXFF_BNDY 0x0114 -+#define REG_TRXFF_STATUS 0x0118 -+#define REG_RXFF_PTR 0x011C -+#define REG_HIMR 0x0120 -+#define REG_HISR 0x0124 -+#define REG_HIMRE 0x0128 -+#define REG_HISRE 0x012C -+#define REG_CPWM 0x012F -+#define REG_FWIMR 0x0130 -+#define REG_FWISR 0x0134 -+#define REG_FTIMR 0x0138 -+#define REG_PKTBUF_DBG_CTRL 0x0140 -+#define REG_PKTBUF_DBG_DATA_L 0x0144 -+#define REG_PKTBUF_DBG_DATA_H 0x0148 -+ -+#define REG_TC0_CTRL 0x0150 -+#define REG_TC1_CTRL 0x0154 -+#define REG_TC2_CTRL 0x0158 -+#define REG_TC3_CTRL 0x015C -+#define REG_TC4_CTRL 0x0160 -+#define REG_TCUNIT_BASE 0x0164 -+#define REG_MBIST_START 0x0174 -+#define REG_MBIST_DONE 0x0178 -+#define REG_MBIST_FAIL 0x017C -+#define REG_C2HEVT_MSG_NORMAL 0x01A0 -+#define REG_C2HEVT_CLEAR 0x01AF -+#define REG_C2HEVT_MSG_TEST 0x01B8 -+#define REG_MCUTST_1 0x01c0 -+#define REG_FMETHR 0x01C8 -+#define REG_HMETFR 0x01CC -+#define REG_HMEBOX_0 0x01D0 -+#define REG_HMEBOX_1 0x01D4 -+#define REG_HMEBOX_2 0x01D8 -+#define REG_HMEBOX_3 0x01DC -+ -+#define REG_LLT_INIT 0x01E0 -+#define REG_BB_ACCEESS_CTRL 0x01E8 -+#define REG_BB_ACCESS_DATA 0x01EC -+ -+ -+//----------------------------------------------------- -+// -+// 0x0200h ~ 0x027Fh TXDMA Configuration -+// -+//----------------------------------------------------- -+#define REG_RQPN 0x0200 -+#define REG_FIFOPAGE 0x0204 -+#define REG_TDECTRL 0x0208 -+#define REG_TXDMA_OFFSET_CHK 0x020C -+#define REG_TXDMA_STATUS 0x0210 -+#define REG_RQPN_NPQ 0x0214 -+ -+//----------------------------------------------------- -+// -+// 0x0280h ~ 0x02FFh RXDMA Configuration -+// -+//----------------------------------------------------- -+#define REG_RXDMA_AGG_PG_TH 0x0280 -+#define REG_RXPKT_NUM 0x0284 -+#define REG_RXDMA_STATUS 0x0288 -+ -+ -+//----------------------------------------------------- -+// -+// 0x0300h ~ 0x03FFh PCIe -+// -+//----------------------------------------------------- -+#define REG_PCIE_CTRL_REG 0x0300 -+#define REG_INT_MIG 0x0304 // Interrupt Migration -+#define REG_BCNQ_DESA 0x0308 // TX Beacon Descriptor Address -+#define REG_HQ_DESA 0x0310 // TX High Queue Descriptor Address -+#define REG_MGQ_DESA 0x0318 // TX Manage Queue Descriptor Address -+#define REG_VOQ_DESA 0x0320 // TX VO Queue Descriptor Address -+#define REG_VIQ_DESA 0x0328 // TX VI Queue Descriptor Address -+#define REG_BEQ_DESA 0x0330 // TX BE Queue Descriptor Address -+#define REG_BKQ_DESA 0x0338 // TX BK Queue Descriptor Address -+#define REG_RX_DESA 0x0340 // RX Queue Descriptor Address -+#define REG_DBI 0x0348 // Backdoor REG for Access Configuration -+//sherry added for DBI Read/Write 20091126 -+#define REG_DBI_WDATA 0x0348 // Backdoor REG for Access Configuration -+#define REG_DBI_RDATA 0x034C //Backdoor REG for Access Configuration -+#define REG_DBI_CTRL 0x0350 //Backdoor REG for Access Configuration -+#define REG_DBI_FLAG 0x0352 //Backdoor REG for Access Configuration#define REG_MDIO 0x0354 // MDIO for Access PCIE PHY -+#define REG_MDIO 0x0354 // MDIO for Access PCIE PHY -+#define REG_DBG_SEL 0x0360 // Debug Selection Register -+#define REG_PCIE_HRPWM 0x0361 //PCIe RPWM -+#define REG_PCIE_HCPWM 0x0363 //PCIe CPWM -+#define REG_UART_CTRL 0x0364 // UART Control -+#define REG_UART_TX_DESA 0x0370 // UART TX Descriptor Address -+#define REG_UART_RX_DESA 0x0378 // UART Rx Descriptor Address -+ -+ -+// spec version 11 -+//----------------------------------------------------- -+// -+// 0x0400h ~ 0x047Fh Protocol Configuration -+// -+//----------------------------------------------------- -+#define REG_VOQ_INFORMATION 0x0400 -+#define REG_VIQ_INFORMATION 0x0404 -+#define REG_BEQ_INFORMATION 0x0408 -+#define REG_BKQ_INFORMATION 0x040C -+#define REG_MGQ_INFORMATION 0x0410 -+#define REG_HGQ_INFORMATION 0x0414 -+#define REG_BCNQ_INFORMATION 0x0418 -+ -+ -+#define REG_CPU_MGQ_INFORMATION 0x041C -+#define REG_FWHW_TXQ_CTRL 0x0420 -+#define REG_HWSEQ_CTRL 0x0423 -+#define REG_TXPKTBUF_BCNQ_BDNY 0x0424 -+#define REG_TXPKTBUF_MGQ_BDNY 0x0425 -+#define REG_LIFETIME_EN 0x0426 -+#define REG_MULTI_BCNQ_OFFSET 0x0427 -+#define REG_SPEC_SIFS 0x0428 -+#define REG_RL 0x042A -+#define REG_DARFRC 0x0430 -+#define REG_RARFRC 0x0438 -+#define REG_RRSR 0x0440 -+#define REG_ARFR0 0x0444 -+#define REG_ARFR1 0x0448 -+#define REG_ARFR2 0x044C -+#define REG_ARFR3 0x0450 -+#define REG_AGGLEN_LMT 0x0458 -+#define REG_AMPDU_MIN_SPACE 0x045C -+#define REG_TXPKTBUF_WMAC_LBK_BF_HD 0x045D -+#define REG_FAST_EDCA_CTRL 0x0460 -+#define REG_RD_RESP_PKT_TH 0x0463 -+#define REG_INIRTS_RATE_SEL 0x0480 -+#define REG_INIDATA_RATE_SEL 0x0484 -+ -+//#define REG_FW_TSF_SYNC_CNT 0x04A0 -+#define REG_FW_RESET_TSF_CNT_1 0x05FC -+#define REG_FW_RESET_TSF_CNT_0 0x05FD -+#define REG_FW_BCN_DIS_CNT 0x05FE -+ -+#define REG_POWER_STATUS 0x04A4 -+#define REG_POWER_STAGE1 0x04B4 -+#define REG_POWER_STAGE2 0x04B8 -+#define REG_PKT_VO_VI_LIFE_TIME 0x04C0 -+#define REG_PKT_BE_BK_LIFE_TIME 0x04C2 -+#define REG_STBC_SETTING 0x04C4 -+#define REG_PROT_MODE_CTRL 0x04C8 -+#define REG_MAX_AGGR_NUM 0x04CA -+#define REG_RTS_MAX_AGGR_NUM 0x04CB -+#define REG_BAR_MODE_CTRL 0x04CC -+#define REG_RA_TRY_RATE_AGG_LMT 0x04CF -+#define REG_EARLY_MODE_CONTROL 0x04D0 -+#define REG_NQOS_SEQ 0x04DC -+#define REG_QOS_SEQ 0x04DE -+#define REG_NEED_CPU_HANDLE 0x04E0 -+#define REG_PKT_LOSE_RPT 0x04E1 -+#define REG_PTCL_ERR_STATUS 0x04E2 -+#define REG_DUMMY 0x04FC -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0x0500h ~ 0x05FFh EDCA Configuration -+// -+//----------------------------------------------------- -+#define REG_EDCA_VO_PARAM 0x0500 -+#define REG_EDCA_VI_PARAM 0x0504 -+#define REG_EDCA_BE_PARAM 0x0508 -+#define REG_EDCA_BK_PARAM 0x050C -+#define REG_BCNTCFG 0x0510 -+#define REG_PIFS 0x0512 -+#define REG_RDG_PIFS 0x0513 -+#define REG_SIFS_CTX 0x0514 -+#define REG_SIFS_TRX 0x0516 -+#define REG_TSFTR_SYN_OFFSET 0x0518 -+#define REG_AGGR_BREAK_TIME 0x051A -+#define REG_SLOT 0x051B -+#define REG_TX_PTCL_CTRL 0x0520 -+#define REG_TXPAUSE 0x0522 -+#define REG_DIS_TXREQ_CLR 0x0523 -+#define REG_RD_CTRL 0x0524 -+#define REG_TBTT_PROHIBIT 0x0540 -+#define REG_RD_NAV_NXT 0x0544 -+#define REG_NAV_PROT_LEN 0x0546 -+#define REG_BCN_CTRL 0x0550 -+#define REG_BCN_CTRL_1 0x0551 -+#define REG_MBID_NUM 0x0552 -+#define REG_DUAL_TSF_RST 0x0553 -+#define REG_BCN_INTERVAL 0x0554 // The same as REG_MBSSID_BCN_SPACE -+#define REG_MBSSID_BCN_SPACE 0x0554 -+#define REG_DRVERLYINT 0x0558 -+#define REG_BCNDMATIM 0x0559 -+#define REG_ATIMWND 0x055A -+#define REG_USTIME_TSF 0x055C -+#define REG_BCN_MAX_ERR 0x055D -+#define REG_RXTSF_OFFSET_CCK 0x055E -+#define REG_RXTSF_OFFSET_OFDM 0x055F -+#define REG_TSFTR 0x0560 -+#define REG_TSFTR1 0x0568 -+#define REG_INIT_TSFTR 0x0564 -+#define REG_ATIMWND_1 0x0570 -+#define REG_PSTIMER 0x0580 -+#define REG_TIMER0 0x0584 -+#define REG_TIMER1 0x0588 -+#define REG_ACMHWCTRL 0x05C0 -+#define REG_ACMRSTCTRL 0x05C1 -+#define REG_ACMAVG 0x05C2 -+#define REG_VO_ADMTIME 0x05C4 -+#define REG_VI_ADMTIME 0x05C6 -+#define REG_BE_ADMTIME 0x05C8 -+#define REG_EDCA_RANDOM_GEN 0x05CC -+#define REG_SCH_TXCMD 0x05D0 -+ -+#define REG_DMC 0x05F0 //Dual MAC Co-Existence Register -+ -+ -+//----------------------------------------------------- -+// -+// 0x0600h ~ 0x07FFh WMAC Configuration -+// -+//----------------------------------------------------- -+#define REG_APSD_CTRL 0x0600 -+#define REG_BWOPMODE 0x0603 -+#define REG_TCR 0x0604 -+#define REG_RCR 0x0608 -+#define REG_RX_PKT_LIMIT 0x060C -+#define REG_RX_DLK_TIME 0x060D -+#define REG_RX_DRVINFO_SZ 0x060F -+ -+#define REG_MACID 0x0610 -+#define REG_BSSID 0x0618 -+#define REG_MAR 0x0620 -+#define REG_MBIDCAMCFG 0x0628 -+ -+#define REG_USTIME_EDCA 0x0638 -+#define REG_MAC_SPEC_SIFS 0x063A -+#define REG_RESP_SIFS_CCK 0x063C -+#define REG_RESP_SIFS_OFDM 0x063E -+#define REG_ACKTO 0x0640 -+#define REG_CTS2TO 0x0641 -+#define REG_EIFS 0x0642 -+ -+ -+//WMA, BA, CCX -+#define REG_NAV_CTRL 0x0650 -+#define REG_BACAMCMD 0x0654 -+#define REG_BACAMCONTENT 0x0658 -+#define REG_LBDLY 0x0660 -+#define REG_FWDLY 0x0661 -+#define REG_RXERR_RPT 0x0664 -+#define REG_WMAC_TRXPTCL_CTL 0x0668 -+ -+ -+// Security -+#define REG_CAMCMD 0x0670 -+#define REG_CAMWRITE 0x0674 -+#define REG_CAMREAD 0x0678 -+#define REG_CAMDBG 0x067C -+#define REG_SECCFG 0x0680 -+ -+// Power -+#define REG_WOW_CTRL 0x0690 -+#define REG_PSSTATUS 0x0691 -+#define REG_PS_RX_INFO 0x0692 -+#define REG_LPNAV_CTRL 0x0694 -+#define REG_WKFMCAM_CMD 0x0698 -+#define REG_WKFMCAM_RWD 0x069C -+#define REG_RXFLTMAP0 0x06A0 -+#define REG_RXFLTMAP1 0x06A2 -+#define REG_RXFLTMAP2 0x06A4 -+#define REG_BCN_PSR_RPT 0x06A8 -+#define REG_CALB32K_CTRL 0x06AC -+#define REG_PKT_MON_CTRL 0x06B4 -+#define REG_BT_COEX_TABLE 0x06C0 -+#define REG_WMAC_RESP_TXINFO 0x06D8 -+ -+#define REG_MACID1 0x0700 -+#define REG_BSSID1 0x0708 -+ -+//----------------------------------------------------- -+// -+// 0xFE00h ~ 0xFE55h USB Configuration -+// -+//----------------------------------------------------- -+#define REG_USB_INFO 0xFE17 -+#define REG_USB_SPECIAL_OPTION 0xFE55 -+#define REG_USB_DMA_AGG_TO 0xFE5B -+#define REG_USB_AGG_TO 0xFE5C -+#define REG_USB_AGG_TH 0xFE5D -+ -+// for 92DU high_Queue low_Queue Normal_Queue select -+#define REG_USB_High_NORMAL_Queue_Select_MAC0 0xFE44 -+//#define REG_USB_LOW_Queue_Select_MAC0 0xFE45 -+#define REG_USB_High_NORMAL_Queue_Select_MAC1 0xFE47 -+//#define REG_USB_LOW_Queue_Select_MAC1 0xFE48 -+ -+// For test chip -+#define REG_TEST_USB_TXQS 0xFE48 -+#define REG_TEST_SIE_VID 0xFE60 // 0xFE60~0xFE61 -+#define REG_TEST_SIE_PID 0xFE62 // 0xFE62~0xFE63 -+#define REG_TEST_SIE_OPTIONAL 0xFE64 -+#define REG_TEST_SIE_CHIRP_K 0xFE65 -+#define REG_TEST_SIE_PHY 0xFE66 // 0xFE66~0xFE6B -+#define REG_TEST_SIE_MAC_ADDR 0xFE70 // 0xFE70~0xFE75 -+#define REG_TEST_SIE_STRING 0xFE80 // 0xFE80~0xFEB9 -+ -+ -+// For normal chip -+#define REG_NORMAL_SIE_VID 0xFE60 // 0xFE60~0xFE61 -+#define REG_NORMAL_SIE_PID 0xFE62 // 0xFE62~0xFE63 -+#define REG_NORMAL_SIE_OPTIONAL 0xFE64 -+#define REG_NORMAL_SIE_EP 0xFE65 // 0xFE65~0xFE67 -+#define REG_NORMAL_SIE_PHY 0xFE68 // 0xFE68~0xFE6B -+#define REG_NORMAL_SIE_MAC_ADDR 0xFE70 // 0xFE70~0xFE75 -+#define REG_NORMAL_SIE_STRING 0xFE80 // 0xFE80~0xFEDF -+ -+ -+//----------------------------------------------------- -+// -+// Redifine 8192C register definition for compatibility -+// -+//----------------------------------------------------- -+ -+// TODO: use these definition when using REG_xxx naming rule. -+// NOTE: DO NOT Remove these definition. Use later. -+ -+#define SYS_ISO_CTRL REG_SYS_ISO_CTRL // System Isolation Interface Control. -+#define SYS_FUNC_EN REG_SYS_FUNC_EN // System Function Enable. -+#define SYS_CLK REG_SYS_CLKR -+#define CR9346 REG_9346CR // 93C46/93C56 Command Register. -+#define EFUSE_CTRL REG_EFUSE_CTRL // E-Fuse Control. -+#define EFUSE_TEST REG_EFUSE_TEST // E-Fuse Test. -+#define MSR (REG_CR + 2) // Media Status register -+#define ISR REG_HISR -+#define TSFR REG_TSFTR // Timing Sync Function Timer Register. -+ -+#define MACIDR0 REG_MACID // MAC ID Register, Offset 0x0050-0x0053 -+#define MACIDR4 (REG_MACID + 4) // MAC ID Register, Offset 0x0054-0x0055 -+ -+#define PBP REG_PBP -+ -+// Redifine MACID register, to compatible prior ICs. -+#define IDR0 MACIDR0 -+#define IDR4 MACIDR4 -+ -+ -+// -+// 9. Security Control Registers (Offset: ) -+// -+#define RWCAM REG_CAMCMD //IN 8190 Data Sheet is called CAMcmd -+#define WCAMI REG_CAMWRITE // Software write CAM input content -+#define RCAMO REG_CAMREAD // Software read/write CAM config -+#define CAMDBG REG_CAMDBG -+#define SECR REG_SECCFG //Security Configuration Register -+ -+// Unused register -+#define UnusedRegister 0x1BF -+#define DCAM UnusedRegister -+#define PSR UnusedRegister -+#define BBAddr UnusedRegister -+#define PhyDataR UnusedRegister -+ -+#define InvalidBBRFValue 0x12345678 -+ -+// Min Spacing related settings. -+#define MAX_MSS_DENSITY_2T 0x13 -+#define MAX_MSS_DENSITY_1T 0x0A -+ -+//---------------------------------------------------------------------------- -+// 8192C Cmd9346CR bits (Offset 0xA, 16bit) -+//---------------------------------------------------------------------------- -+#define CmdEEPROM_En BIT5 // EEPROM enable when set 1 -+#define CmdEERPOMSEL BIT4 // System EEPROM select, 0: boot from E-FUSE, 1: The EEPROM used is 9346 -+#define Cmd9346CR_9356SEL BIT4 -+#define AutoLoadEEPROM (CmdEEPROM_En|CmdEERPOMSEL) -+#define AutoLoadEFUSE CmdEEPROM_En -+ -+// 8192C GPIO MUX Configuration Register (offset 0x40, 4 byte) -+//---------------------------------------------------------------------------- -+#define GPIOSEL_GPIO 0 -+#define GPIOSEL_ENBT BIT5 -+ -+//---------------------------------------------------------------------------- -+// 8192C GPIO PIN Control Register (offset 0x44, 4 byte) -+//---------------------------------------------------------------------------- -+#define GPIO_IN REG_GPIO_PIN_CTRL // GPIO pins input value -+#define GPIO_OUT (REG_GPIO_PIN_CTRL+1) // GPIO pins output value -+#define GPIO_IO_SEL (REG_GPIO_PIN_CTRL+2) // GPIO pins output enable when a bit is set to "1"; otherwise, input is configured. -+#define GPIO_MOD (REG_GPIO_PIN_CTRL+3) -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C (MSR) Media Status Register (Offset 0x4C, 8 bits) -+//---------------------------------------------------------------------------- -+/* -+Network Type -+00: No link -+01: Link in ad hoc network -+10: Link in infrastructure network -+11: AP mode -+Default: 00b. -+*/ -+#define MSR_NOLINK 0x00 -+#define MSR_ADHOC 0x01 -+#define MSR_INFRA 0x02 -+#define MSR_AP 0x03 -+ -+// -+// 6. Adaptive Control Registers (Offset: 0x0160 - 0x01CF) -+// -+//---------------------------------------------------------------------------- -+// 8192C Response Rate Set Register (offset 0x181, 24bits) -+//---------------------------------------------------------------------------- -+#define RRSR_RSC_OFFSET 21 -+#define RRSR_SHORT_OFFSET 23 -+#define RRSR_RSC_BW_40M 0x600000 -+#define RRSR_RSC_UPSUBCHNL 0x400000 -+#define RRSR_RSC_LOWSUBCHNL 0x200000 -+#define RRSR_SHORT 0x800000 -+#define RRSR_1M BIT0 -+#define RRSR_2M BIT1 -+#define RRSR_5_5M BIT2 -+#define RRSR_11M BIT3 -+#define RRSR_6M BIT4 -+#define RRSR_9M BIT5 -+#define RRSR_12M BIT6 -+#define RRSR_18M BIT7 -+#define RRSR_24M BIT8 -+#define RRSR_36M BIT9 -+#define RRSR_48M BIT10 -+#define RRSR_54M BIT11 -+#define RRSR_MCS0 BIT12 -+#define RRSR_MCS1 BIT13 -+#define RRSR_MCS2 BIT14 -+#define RRSR_MCS3 BIT15 -+#define RRSR_MCS4 BIT16 -+#define RRSR_MCS5 BIT17 -+#define RRSR_MCS6 BIT18 -+#define RRSR_MCS7 BIT19 -+#define BRSR_AckShortPmb BIT23 -+// CCK ACK: use Short Preamble or not -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C Rate Definition -+//---------------------------------------------------------------------------- -+//CCK -+#define RATR_1M 0x00000001 -+#define RATR_2M 0x00000002 -+#define RATR_55M 0x00000004 -+#define RATR_11M 0x00000008 -+//OFDM -+#define RATR_6M 0x00000010 -+#define RATR_9M 0x00000020 -+#define RATR_12M 0x00000040 -+#define RATR_18M 0x00000080 -+#define RATR_24M 0x00000100 -+#define RATR_36M 0x00000200 -+#define RATR_48M 0x00000400 -+#define RATR_54M 0x00000800 -+//MCS 1 Spatial Stream -+#define RATR_MCS0 0x00001000 -+#define RATR_MCS1 0x00002000 -+#define RATR_MCS2 0x00004000 -+#define RATR_MCS3 0x00008000 -+#define RATR_MCS4 0x00010000 -+#define RATR_MCS5 0x00020000 -+#define RATR_MCS6 0x00040000 -+#define RATR_MCS7 0x00080000 -+//MCS 2 Spatial Stream -+#define RATR_MCS8 0x00100000 -+#define RATR_MCS9 0x00200000 -+#define RATR_MCS10 0x00400000 -+#define RATR_MCS11 0x00800000 -+#define RATR_MCS12 0x01000000 -+#define RATR_MCS13 0x02000000 -+#define RATR_MCS14 0x04000000 -+#define RATR_MCS15 0x08000000 -+ -+//---------------------------------------------------------------------------- -+// 8192C BW_OPMODE bits (Offset 0x203, 8bit) -+//---------------------------------------------------------------------------- -+#define BW_OPMODE_20MHZ BIT2 -+#define BW_OPMODE_5G BIT1 -+#define BW_OPMODE_11J BIT0 -+ -+ -+//---------------------------------------------------------------------------- -+// 8192C CAM Config Setting (offset 0x250, 1 byte) -+//---------------------------------------------------------------------------- -+#define CAM_VALID BIT15 -+#define CAM_NOTVALID 0x0000 -+#define CAM_USEDK BIT5 -+ -+#define CAM_CONTENT_COUNT 8 -+ -+#define CAM_NONE 0x0 -+#define CAM_WEP40 0x01 -+#define CAM_TKIP 0x02 -+#define CAM_AES 0x04 -+#define CAM_WEP104 0x05 -+#define CAM_SMS4 0x6 -+ -+ -+#define TOTAL_CAM_ENTRY 32 -+#define HALF_CAM_ENTRY 16 -+ -+#define CAM_CONFIG_USEDK _TRUE -+#define CAM_CONFIG_NO_USEDK _FALSE -+ -+#define CAM_WRITE BIT16 -+#define CAM_READ 0x00000000 -+#define CAM_POLLINIG BIT31 -+ -+#define SCR_UseDK 0x01 -+#define SCR_TxSecEnable 0x02 -+#define SCR_RxSecEnable 0x04 -+ -+ -+// -+// 12. Host Interrupt Status Registers (Offset: 0x0300 - 0x030F) -+// -+//---------------------------------------------------------------------------- -+// 8190 IMR/ISR bits (offset 0xfd, 8bits) -+//---------------------------------------------------------------------------- -+#define IMR8190_DISABLED 0x0 -+// IMR DW0 Bit 0-31 -+#define IMR_BCNDMAINT6 BIT31 // Beacon DMA Interrupt 6 -+#define IMR_BCNDMAINT5 BIT30 // Beacon DMA Interrupt 5 -+#define IMR_BCNDMAINT4 BIT29 // Beacon DMA Interrupt 4 -+#define IMR_BCNDMAINT3 BIT28 // Beacon DMA Interrupt 3 -+#define IMR_BCNDMAINT2 BIT27 // Beacon DMA Interrupt 2 -+#define IMR_BCNDMAINT1 BIT26 // Beacon DMA Interrupt 1 -+#define IMR_BCNDOK8 BIT25 // Beacon Queue DMA OK Interrup 8 -+#define IMR_BCNDOK7 BIT24 // Beacon Queue DMA OK Interrup 7 -+#define IMR_BCNDOK6 BIT23 // Beacon Queue DMA OK Interrup 6 -+#define IMR_BCNDOK5 BIT22 // Beacon Queue DMA OK Interrup 5 -+#define IMR_BCNDOK4 BIT21 // Beacon Queue DMA OK Interrup 4 -+#define IMR_BCNDOK3 BIT20 // Beacon Queue DMA OK Interrup 3 -+#define IMR_BCNDOK2 BIT19 // Beacon Queue DMA OK Interrup 2 -+#define IMR_BCNDOK1 BIT18 // Beacon Queue DMA OK Interrup 1 -+#define IMR_TIMEOUT2 BIT17 // Timeout interrupt 2 -+#define IMR_TIMEOUT1 BIT16 // Timeout interrupt 1 -+#define IMR_TXFOVW BIT15 // Transmit FIFO Overflow -+#define IMR_PSTIMEOUT BIT14 // Power save time out interrupt -+#define IMR_BcnInt BIT13 // Beacon DMA Interrupt 0 -+#define IMR_RXFOVW BIT12 // Receive FIFO Overflow -+#define IMR_RDU BIT11 // Receive Descriptor Unavailable -+#define IMR_ATIMEND BIT10 // For 92C,ATIM Window End Interrupt -+#define IMR_BDOK BIT9 // Beacon Queue DMA OK Interrup -+#define IMR_HIGHDOK BIT8 // High Queue DMA OK Interrupt -+#define IMR_TBDOK BIT7 // Transmit Beacon OK interrup -+#define IMR_MGNTDOK BIT6 // Management Queue DMA OK Interrupt -+#define IMR_TBDER BIT5 // For 92C,Transmit Beacon Error Interrupt -+#define IMR_BKDOK BIT4 // AC_BK DMA OK Interrupt -+#define IMR_BEDOK BIT3 // AC_BE DMA OK Interrupt -+#define IMR_VIDOK BIT2 // AC_VI DMA OK Interrupt -+#define IMR_VODOK BIT1 // AC_VO DMA Interrupt -+#define IMR_ROK BIT0 // Receive DMA OK Interrupt -+ -+// 13. Host Interrupt Status Extension Register (Offset: 0x012C-012Eh) -+#define IMR_TXERR BIT11 -+#define IMR_RXERR BIT10 -+#define IMR_C2HCMD BIT9 -+#define IMR_CPWM BIT8 -+//RSVD [2-7] -+#define IMR_OCPINT BIT1 -+#define IMR_WLANOFF BIT0 -+ -+ -+ -+//---------------------------------------------------------------------------- -+// 8192D EFUSE -+//---------------------------------------------------------------------------- -+#define HWSET_MAX_SIZE 256 -+ -+//---------------------------------------------------------------------------- -+// 8192C EEPROM/EFUSE share register definition. -+//---------------------------------------------------------------------------- -+ -+// -+// Default Value for EEPROM or EFUSE!!! -+// -+#define EEPROM_Default_TSSI 0x0 -+#define EEPROM_Default_TxPowerDiff 0x0 -+#define EEPROM_Default_CrystalCap 0x0 //92D default 0x0 -+#define EEPROM_Default_BoardType 0x02 // Default: 2X2, RTL8192CE(QFPN68) -+#define EEPROM_Default_TxPower 0x1010 -+#define EEPROM_Default_HT2T_TxPwr 0x10 -+ -+#define EEPROM_Default_LegacyHTTxPowerDiff 0x4 -+#define EEPROM_Default_ThermalMeter 0x12 -+ -+#define EEPROM_Default_AntTxPowerDiff 0x0 -+//#define EEPROM_Default_TxPwDiff_CrystalCap 0x5 -+#define EEPROM_Default_TxPowerLevel_2G 0x2C -+#define EEPROM_Default_TxPowerLevel_5G 0x22 -+ -+#define EEPROM_Default_HT40_2SDiff 0x0 -+#define EEPROM_Default_HT20_Diff 2 // HT20<->40 default Tx Power Index Difference -+#define EEPROM_Default_LegacyHTTxPowerDiff 0x4 //OFDM Tx Power index diff -+#define EEPROM_Default_HT40_PwrMaxOffset 0 -+#define EEPROM_Default_HT20_PwrMaxOffset 0 -+ -+// For debug -+#define EEPROM_Default_PID 0x1234 -+#define EEPROM_Default_VID 0x5678 -+#define EEPROM_Default_CustomerID 0xAB -+#define EEPROM_Default_SubCustomerID 0xCD -+#define EEPROM_Default_Version 0 -+ -+#define EEPROM_Default_externalPA_C9 0x00 -+#define EEPROM_Default_externalPA_CC 0xFF -+#define EEPROM_Default_internalPA_SP3T_C9 0xAA -+#define EEPROM_Default_internalPA_SP3T_CC 0xAF -+#define EEPROM_Default_internalPA_SPDT_C9 0xAA -+#ifdef CONFIG_PCI_HCI -+#define EEPROM_Default_internalPA_SPDT_CC 0xA0 -+#else -+#define EEPROM_Default_internalPA_SPDT_CC 0xFA -+#endif -+ -+#define EEPROM_CHANNEL_PLAN_FCC 0x0 -+#define EEPROM_CHANNEL_PLAN_IC 0x1 -+#define EEPROM_CHANNEL_PLAN_ETSI 0x2 -+#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 -+#define EEPROM_CHANNEL_PLAN_FRANCE 0x4 -+#define EEPROM_CHANNEL_PLAN_MKK 0x5 -+#define EEPROM_CHANNEL_PLAN_MKK1 0x6 -+#define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 -+#define EEPROM_CHANNEL_PLAN_TELEC 0x8 -+#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 -+#define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA -+#define EEPROM_CHANNEL_PLAN_NCC 0xB -+#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 -+ -+ -+#define EEPROM_CID_DEFAULT 0x0 -+#define EEPROM_CID_TOSHIBA 0x4 -+#define EEPROM_CID_CCX 0x10 // CCX test. By Bruce, 2009-02-25. -+#define EEPROM_CID_QMI 0x0D -+#define EEPROM_CID_WHQL 0xFE // added by chiyoko for dtm, 20090108 -+ -+ -+#define RTL8192_EEPROM_ID 0x8129 -+#define EEPROM_WAPI_SUPPORT 0x78 -+ -+ -+#ifdef CONFIG_PCI_HCI -+#define RT_IBSS_INT_MASKS (IMR_BcnInt | IMR_TBDOK | IMR_TBDER) -+#define RT_AC_INT_MASKS (IMR_VIDOK | IMR_VODOK | IMR_BEDOK|IMR_BKDOK) -+#define RT_BSS_INT_MASKS (RT_IBSS_INT_MASKS) -+ -+#define RTL8190_EEPROM_ID 0x8129 // 0-1 -+#define EEPROM_HPON 0x02 // LDO settings.2-5 -+#define EEPROM_CLK 0x06 // Clock settings.6-7 -+#define EEPROM_MAC_FUNCTION 0x08 // SE Test mode.8 -+ -+#define EEPROM_VID 0x28 // SE Vendor ID.A-B -+#define EEPROM_DID 0x2A // SE Device ID. C-D -+#define EEPROM_SVID 0x2C // SE Vendor ID.E-F -+#define EEPROM_SMID 0x2E // SE PCI Subsystem ID. 10-11 -+ -+#define EEPROM_MAC_ADDR 0x16 // SEMAC Address. 12-17 -+#define EEPROM_MAC_ADDR_MAC0_92D 0x55 -+#define EEPROM_MAC_ADDR_MAC1_92D 0x5B -+//---------------------------------------------------------------- -+// 2.4G band Tx power index setting -+#define EEPROM_CCK_TX_PWR_INX_2G 0x61 -+#define EEPROM_HT40_1S_TX_PWR_INX_2G 0x67 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_2G 0x6D -+#define EEPROM_HT20_TX_PWR_INX_DIFF_2G 0x70 -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_2G 0x73 -+#define EEPROM_HT40_MAX_PWR_OFFSET_2G 0x76 -+#define EEPROM_HT20_MAX_PWR_OFFSET_2G 0x79 -+ -+//5GL channel 32-64 -+#define EEPROM_HT40_1S_TX_PWR_INX_5GL 0x7C -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_5GL 0x82 -+#define EEPROM_HT20_TX_PWR_INX_DIFF_5GL 0x85 -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_5GL 0x88 -+#define EEPROM_HT40_MAX_PWR_OFFSET_5GL 0x8B -+#define EEPROM_HT20_MAX_PWR_OFFSET_5GL 0x8E -+ -+//5GM channel 100-140 -+#define EEPROM_HT40_1S_TX_PWR_INX_5GM 0x91 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_5GM 0x97 -+#define EEPROM_HT20_TX_PWR_INX_DIFF_5GM 0x9A -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_5GM 0x9D -+#define EEPROM_HT40_MAX_PWR_OFFSET_5GM 0xA0 -+#define EEPROM_HT20_MAX_PWR_OFFSET_5GM 0xA3 -+ -+//5GH channel 149-165 -+#define EEPROM_HT40_1S_TX_PWR_INX_5GH 0xA6 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_5GH 0xAC -+#define EEPROM_HT20_TX_PWR_INX_DIFF_5GH 0xAF -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_5GH 0xB2 -+#define EEPROM_HT40_MAX_PWR_OFFSET_5GH 0xB5 -+#define EEPROM_HT20_MAX_PWR_OFFSET_5GH 0xB8 -+ -+#define EEPROM_CHANNEL_PLAN 0xBB // Map of supported channels. -+#define EEPROM_IQK_DELTA 0xBC -+#define EEPROM_LCK_DELTA 0xBC -+#define EEPROM_XTAL_K 0xBD //[7:5] -+#define EEPROM_TSSI_A_5G 0xBE -+#define EEPROM_TSSI_B_5G 0xBF -+#define EEPROM_TSSI_AB_5G 0xC0 -+#define EEPROM_THERMAL_METER 0xC3 //[4:0] -+#define EEPROM_PATHDIV 0xC4 -+#define EEPROM_RF_OPT1 0xC4 -+#define EEPROM_RF_OPT2 0xC5 -+#define EEPROM_RF_OPT3 0xC6 -+#define EEPROM_RF_OPT4 0xC7 -+#define EEPROM_RF_OPT5 0xC8 -+#define EEPROM_RF_OPT6 0xC9 -+#define EEPROM_VERSION 0xCA -+#define EEPROM_CUSTOMER_ID 0xCB -+#define EEPROM_RF_OPT7 0xCC -+ -+#define EEPROM_WIDIPAIRING_ADDR 0xF0 -+#define EEPROM_WIDIPAIRING_KEY 0xF6 -+ -+#define EEPROM_DEF_PART_NO 0x3FD //Byte -+#define EEPROME_CHIP_VERSION_L 0x3FF -+#define EEPROME_CHIP_VERSION_H 0x3FE -+#endif -+ -+#ifdef CONFIG_USB_HCI -+#define RTL8190_EEPROM_ID 0x8129 // 0-1 -+#define EEPROM_HPON 0x02 // LDO settings.2-5 -+#define EEPROM_CLK 0x06 // Clock settings.6-7 -+#define EEPROM_MAC_FUNCTION 0x08 // SE Test mode.8 -+ -+#define EEPROM_VID 0xC // SE Vendor ID.A-B -+#define EEPROM_PID 0xE // SE Device ID. C-D -+#define EEPROM_ENDPOINT_SETTING 0x10 -+#ifdef CONFIG_WOWLAN -+#define EEPROM_Option_Setting 0x11 -+#endif // CONFIG_WOWLAN -+#define EEPROM_CHIRP_K 0x12 // Changed -+#define EEPROM_USB_PHY 0x13 // Changed -+#define EEPROM_NORMAL_BoardType EEPROM_RF_OPT1 //[7:5] -+#define EEPROM_MAC_ADDR 0x16 // SEMAC Address. 12-17 -+#define EEPROM_STRING 0x1F -+#define EEPROM_SUBCUSTOMER_ID 0x59 -+ -+#define EEPROM_MAC_ADDR_MAC0_92D 0x19 -+#define EEPROM_MAC_ADDR_MAC1_92D 0x5B -+//---------------------------------------------------------------- -+// 2.4G band Tx power index setting -+#define EEPROM_CCK_TX_PWR_INX_2G 0x61 -+#define EEPROM_HT40_1S_TX_PWR_INX_2G 0x67 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_2G 0x6D -+#define EEPROM_HT20_TX_PWR_INX_DIFF_2G 0x70 -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_2G 0x73 -+#define EEPROM_HT40_MAX_PWR_OFFSET_2G 0x76 -+#define EEPROM_HT20_MAX_PWR_OFFSET_2G 0x79 -+ -+//5GL channel 32-64 -+#define EEPROM_HT40_1S_TX_PWR_INX_5GL 0x7C -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_5GL 0x82 -+#define EEPROM_HT20_TX_PWR_INX_DIFF_5GL 0x85 -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_5GL 0x88 -+#define EEPROM_HT40_MAX_PWR_OFFSET_5GL 0x8B -+#define EEPROM_HT20_MAX_PWR_OFFSET_5GL 0x8E -+ -+//5GM channel 100-140 -+#define EEPROM_HT40_1S_TX_PWR_INX_5GM 0x91 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_5GM 0x97 -+#define EEPROM_HT20_TX_PWR_INX_DIFF_5GM 0x9A -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_5GM 0x9D -+#define EEPROM_HT40_MAX_PWR_OFFSET_5GM 0xA0 -+#define EEPROM_HT20_MAX_PWR_OFFSET_5GM 0xA3 -+ -+//5GH channel 149-165 -+#define EEPROM_HT40_1S_TX_PWR_INX_5GH 0xA6 -+#define EEPROM_HT40_2S_TX_PWR_INX_DIFF_5GH 0xAC -+#define EEPROM_HT20_TX_PWR_INX_DIFF_5GH 0xAF -+#define EEPROM_OFDM_TX_PWR_INX_DIFF_5GH 0xB2 -+#define EEPROM_HT40_MAX_PWR_OFFSET_5GH 0xB5 -+#define EEPROM_HT20_MAX_PWR_OFFSET_5GH 0xB8 -+ -+#define EEPROM_CHANNEL_PLAN 0xBB // Map of supported channels. -+#define EEPROM_TEST_CHANNEL_PLAN 0xBB -+#define EEPROM_IQK_DELTA 0xBC -+#define EEPROM_LCK_DELTA 0xBC -+#define EEPROM_XTAL_K 0xBD //[7:5] -+#define EEPROM_TSSI_A_5G 0xBE -+#define EEPROM_TSSI_B_5G 0xBF -+#define EEPROM_TSSI_AB_5G 0xC0 -+#define EEPROM_THERMAL_METER 0xC3 //[4:0] -+#define EEPROM_RF_OPT1 0xC4 -+#define EEPROM_RF_OPT2 0xC5 -+#define EEPROM_RF_OPT3 0xC6 -+#define EEPROM_RF_OPT4 0xC7 -+#define EEPROM_RF_OPT5 0xC8 -+#define EEPROM_RF_OPT6 0xC9 -+#define EEPROM_VERSION 0xCA -+#define EEPROM_CUSTOMER_ID 0xCB -+#define EEPROM_RF_OPT7 0xCC -+ -+#define EEPROM_DEF_PART_NO 0x3FD //Byte -+#define EEPROME_CHIP_VERSION_L 0x3FF -+#define EEPROME_CHIP_VERSION_H 0x3FE -+ -+//------------------------------------------------------------- -+// EEPROM content definitions -+//------------------------------------------------------------- -+#define OS_LINK_SPEED_NORMAL_MASK BIT3 | BIT2 -+#define OS_LINK_SPEED_TEST_MASK BIT3 | BIT4 -+ -+#define BOARD_TYPE_NORMAL_MASK 0xE0 -+#define BOARD_TYPE_TEST_MASK 0xF -+ -+#define BT_COEXISTENCE_TEST BIT4 -+#define BT_COEXISTENCE_NORMAL BIT5 -+ -+#define BT_CO_SHIFT_TEST 4 -+#define BT_CO_SHIFT_NORMAL 5 -+ -+#define EP_NUMBER_MASK_TEST 0x30 //bit 4:5 0Eh -+#define EP_NUMBER_SHIFT_TEST 4 -+ -+#define USB_PHY_PARA_SIZE_TEST 6 -+#define USB_PHY_PARA_SIZE_NORMAL 4 -+ -+//------------------------------------------------------------- -+// EEPROM default value definitions -+//------------------------------------------------------------- -+// Use 0xABCD instead of 0x8192 for debug -+#define EEPROM_DEF_ID_0 0xCD // Byte 0x00 -+#define EEPROM_DEF_ID_1 0xAB // Byte 0x01 -+ -+#define EEPROM_DEF_RTK_RSV_A3 0x74 // Byte 0x03 -+#define EEPROM_DEF_RTK_RSV_A4 0x6D // Byte 0x04 -+#define EEPROM_DEF_RTK_RSV_A8 0xFF // Byte 0x08 -+ -+#define EEPROM_DEF_VID_0 0x0A // Byte 0x0A -+#define EEPROM_DEF_VID_1 0x0B -+ -+#define EEPROM_DEF_PID_0 0x92 // Byte 0x0C -+#define EEPROM_DEF_PID_1 0x81 -+ -+ -+#define EEPROM_TEST_DEF_USB_OPT 0x80 // Byte 0x0E -+#define EEPROM_NORMAL_DEF_USB_OPT 0x00 // Byte 0x0E -+ -+#define EEPROM_DEF_CHIRPK 0x15 // Byte 0x0F -+ -+#define EEPROM_DEF_USB_PHY_0 0x85 // Byte 0x10 -+#define EEPROM_DEF_USB_PHY_1 0x62 // Byte 0x11 -+#define EEPROM_DEF_USB_PHY_2 0x9E // Byte 0x12 -+#define EEPROM_DEF_USB_PHY_3 0x06 // Byte 0x13 -+ -+#define EEPROM_DEF_TSSI_A 0x09 // Byte 0x78 -+#define EEPROM_DEF_TSSI_B 0x09 // Byte 0x79 -+ -+ -+#define EEPROM_DEF_THERMAL_METER 0x12 // Byte 0x7A -+ -+ -+#define EEPROM_USB_SN BIT(0) -+#define EEPROM_USB_REMOTE_WAKEUP BIT(1) -+#define EEPROM_USB_DEVICE_PWR BIT(2) -+#define EEPROM_EP_NUMBER (BIT(3)|BIT(4)) -+ -+#if 0 -+#define EEPROM_CHANNEL_PLAN_FCC 0x0 -+#define EEPROM_CHANNEL_PLAN_IC 0x1 -+#define EEPROM_CHANNEL_PLAN_ETSI 0x2 -+#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 -+#define EEPROM_CHANNEL_PLAN_FRANCE 0x4 -+#define EEPROM_CHANNEL_PLAN_MKK 0x5 -+#define EEPROM_CHANNEL_PLAN_MKK1 0x6 -+#define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 -+#define EEPROM_CHANNEL_PLAN_TELEC 0x8 -+#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 -+#define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA -+#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 -+ -+#define EEPROM_CID_DEFAULT 0x0 -+ -+#define EEPROM_CID_WHQL 0xFE // added by chiyoko for dtm, 20090108 -+ -+ -+#define EEPROM_CID_CCX 0x10 // CCX test. By Bruce, 2009-02-25. -+ -+#endif -+#endif -+ -+ -+/*=================================================================== -+===================================================================== -+Here the register defines are for 92C. When the define is as same with 92C, -+we will use the 92C's define for the consistency -+So the following defines for 92C is not entire!!!!!! -+===================================================================== -+=====================================================================*/ -+/* -+Based on Datasheet V33---090401 -+Register Summary -+Current IOREG MAP -+0x0000h ~ 0x00FFh System Configuration (256 Bytes) -+0x0100h ~ 0x01FFh MACTOP General Configuration (256 Bytes) -+0x0200h ~ 0x027Fh TXDMA Configuration (128 Bytes) -+0x0280h ~ 0x02FFh RXDMA Configuration (128 Bytes) -+0x0300h ~ 0x03FFh PCIE EMAC Reserved Region (256 Bytes) -+0x0400h ~ 0x04FFh Protocol Configuration (256 Bytes) -+0x0500h ~ 0x05FFh EDCA Configuration (256 Bytes) -+0x0600h ~ 0x07FFh WMAC Configuration (512 Bytes) -+0x2000h ~ 0x3FFFh 8051 FW Download Region (8196 Bytes) -+*/ -+ -+//---------------------------------------------------------------------------- -+// 8192C (RCR) Receive Configuration Register (Offset 0x608, 32 bits) -+//---------------------------------------------------------------------------- -+#define RCR_APPFCS BIT31 //WMAC append FCS after pauload -+#define RCR_APP_MIC BIT30 // -+#define RCR_APP_ICV BIT29 // -+#define RCR_APP_PHYST_RXFF BIT28 // -+#define RCR_APP_BA_SSN BIT27 //Accept BA SSN -+#define RCR_ENMBID BIT24 //Enable Multiple BssId. -+#define RCR_LSIGEN BIT23 -+#define RCR_MFBEN BIT22 -+#define RCR_HTC_LOC_CTRL BIT14 //MFC<--HTC=1 MFC-->HTC=0 -+#define RCR_AMF BIT13 //Accept management type frame -+#define RCR_ACF BIT12 //Accept control type frame -+#define RCR_ADF BIT11 //Accept data type frame -+#define RCR_AICV BIT9 //Accept ICV error packet -+#define RCR_ACRC32 BIT8 //Accept CRC32 error packet -+#define RCR_CBSSID_BCN BIT7 //Accept BSSID match packet (Rx beacon, probe rsp) -+#define RCR_CBSSID_DATA BIT6 //Accept BSSID match packet (Data) -+#define RCR_CBSSID RCR_CBSSID_DATA //Accept BSSID match packet -+#define RCR_APWRMGT BIT5 //Accept power management packet -+#define RCR_ADD3 BIT4 //Accept address 3 match packet -+#define RCR_AB BIT3 //Accept broadcast packet -+#define RCR_AM BIT2 //Accept multicast packet -+#define RCR_APM BIT1 //Accept physical match packet -+#define RCR_AAP BIT0 //Accept all unicast packet -+#define RCR_MXDMA_OFFSET 8 -+#define RCR_FIFO_OFFSET 13 -+ -+ -+ -+//============================================================================ -+// 8192c USB specific Regsiter Offset and Content definition, -+// 2009.08.18, added by vivi. for merge 92c and 92C into one driver -+//============================================================================ -+//#define APS_FSMCO 0x0004 same with 92Ce -+#define RSV_CTRL 0x001C -+#define RD_CTRL 0x0524 -+ -+//----------------------------------------------------- -+// -+// 0xFE00h ~ 0xFE55h USB Configuration -+// -+//----------------------------------------------------- -+#define REG_USB_INFO 0xFE17 -+#define REG_USB_SPECIAL_OPTION 0xFE55 -+#define REG_USB_DMA_AGG_TO 0xFE5B -+#define REG_USB_AGG_TO 0xFE5C -+#define REG_USB_AGG_TH 0xFE5D -+ -+#define REG_USB_VID 0xFE60 -+#define REG_USB_PID 0xFE62 -+#define REG_USB_OPTIONAL 0xFE64 -+#define REG_USB_CHIRP_K 0xFE65 -+#define REG_USB_PHY 0xFE66 -+#define REG_USB_MAC_ADDR 0xFE70 -+ -+#define REG_USB_HRPWM 0xFE58 -+#define REG_USB_HCPWM 0xFE57 -+ -+#define InvalidBBRFValue 0x12345678 -+ -+//============================================================================ -+// 8192C Regsiter Bit and Content definition -+//============================================================================ -+//----------------------------------------------------- -+// -+// 0x0000h ~ 0x00FFh System Configuration -+// -+//----------------------------------------------------- -+ -+//2 SPS0_CTRL -+#define SW18_FPWM BIT(3) -+ -+ -+//2 SYS_ISO_CTRL -+#define ISO_MD2PP BIT(0) -+#define ISO_UA2USB BIT(1) -+#define ISO_UD2CORE BIT(2) -+#define ISO_PA2PCIE BIT(3) -+#define ISO_PD2CORE BIT(4) -+#define ISO_IP2MAC BIT(5) -+#define ISO_DIOP BIT(6) -+#define ISO_DIOE BIT(7) -+#define ISO_EB2CORE BIT(8) -+#define ISO_DIOR BIT(9) -+ -+#define PWC_EV25V BIT(14) -+#define PWC_EV12V BIT(15) -+ -+ -+//2 SYS_FUNC_EN -+#define FEN_BBRSTB BIT(0) -+#define FEN_BB_GLB_RSTn BIT(1) -+#define FEN_USBA BIT(2) -+#define FEN_UPLL BIT(3) -+#define FEN_USBD BIT(4) -+#define FEN_DIO_PCIE BIT(5) -+#define FEN_PCIEA BIT(6) -+#define FEN_PPLL BIT(7) -+#define FEN_PCIED BIT(8) -+#define FEN_DIOE BIT(9) -+#define FEN_CPUEN BIT(10) -+#define FEN_DCORE BIT(11) -+#define FEN_ELDR BIT(12) -+#define FEN_DIO_RF BIT(13) -+#define FEN_HWPDN BIT(14) -+#define FEN_MREGEN BIT(15) -+ -+//2 APS_FSMCO -+#define PFM_LDALL BIT(0) -+#define PFM_ALDN BIT(1) -+#define PFM_LDKP BIT(2) -+#define PFM_WOWL BIT(3) -+#define EnPDN BIT(4) -+#define PDN_PL BIT(5) -+#define APFM_ONMAC BIT(8) -+#define APFM_OFF BIT(9) -+#define APFM_RSM BIT(10) -+#define AFSM_HSUS BIT(11) -+#define AFSM_PCIE BIT(12) -+#define APDM_MAC BIT(13) -+#define APDM_HOST BIT(14) -+#define APDM_HPDN BIT(15) -+#define RDY_MACON BIT(16) -+#define SUS_HOST BIT(17) -+#define ROP_ALD BIT(20) -+#define ROP_PWR BIT(21) -+#define ROP_SPS BIT(22) -+#define SOP_MRST BIT(25) -+#define SOP_FUSE BIT(26) -+#define SOP_ABG BIT(27) -+#define SOP_AMB BIT(28) -+#define SOP_RCK BIT(29) -+#define SOP_A8M BIT(30) -+#define XOP_BTCK BIT(31) -+ -+//2 SYS_CLKR -+#define ANAD16V_EN BIT(0) -+#define ANA8M BIT(1) -+#define MACSLP BIT(4) -+#define LOADER_CLK_EN BIT(5) -+#define _80M_SSC_DIS BIT(7) -+#define _80M_SSC_EN_HO BIT(8) -+#define PHY_SSC_RSTB BIT(9) -+#define SEC_CLK_EN BIT(10) -+#define MAC_CLK_EN BIT(11) -+#define SYS_CLK_EN BIT(12) -+#define RING_CLK_EN BIT(13) -+ -+ -+//2 9346CR -+ -+#define BOOT_FROM_EEPROM BIT(4) -+#define EEPROM_EN BIT(5) -+ -+ -+//2 AFE_MISC -+#define AFE_BGEN BIT(0) -+#define AFE_MBEN BIT(1) -+#define MAC_ID_EN BIT(7) -+ -+ -+//2 SPS0_CTRL -+ -+ -+//2 SPS_OCP_CFG -+ -+ -+//2 RSV_CTRL -+#define WLOCK_ALL BIT(0) -+#define WLOCK_00 BIT(1) -+#define WLOCK_04 BIT(2) -+#define WLOCK_08 BIT(3) -+#define WLOCK_40 BIT(4) -+#define R_DIS_PRST_0 BIT(5) -+#define R_DIS_PRST_1 BIT(6) -+#define LOCK_ALL_EN BIT(7) -+ -+//2 RF_CTRL -+#define RF_EN BIT(0) -+#define RF_RSTB BIT(1) -+#define RF_SDMRSTB BIT(2) -+ -+ -+ -+//2 LDOA15_CTRL -+#define LDA15_EN BIT(0) -+#define LDA15_STBY BIT(1) -+#define LDA15_OBUF BIT(2) -+#define LDA15_REG_VOS BIT(3) -+#define _LDA15_VOADJ(x) (((x) & 0x7) << 4) -+ -+ -+ -+//2 LDOV12D_CTRL -+#define LDV12_EN BIT(0) -+#define LDV12_SDBY BIT(1) -+#define LPLDO_HSM BIT(2) -+#define LPLDO_LSM_DIS BIT(3) -+#define _LDV12_VADJ(x) (((x) & 0xF) << 4) -+ -+ -+//2 AFE_XTAL_CTRL -+#define XTAL_EN BIT(0) -+#define XTAL_BSEL BIT(1) -+#define _XTAL_BOSC(x) (((x) & 0x3) << 2) -+#define _XTAL_CADJ(x) (((x) & 0xF) << 4) -+#define XTAL_GATE_USB BIT(8) -+#define _XTAL_USB_DRV(x) (((x) & 0x3) << 9) -+#define XTAL_GATE_AFE BIT(11) -+#define _XTAL_AFE_DRV(x) (((x) & 0x3) << 12) -+#define XTAL_RF_GATE BIT(14) -+#define _XTAL_RF_DRV(x) (((x) & 0x3) << 15) -+#define XTAL_GATE_DIG BIT(17) -+#define _XTAL_DIG_DRV(x) (((x) & 0x3) << 18) -+#define XTAL_BT_GATE BIT(20) -+#define _XTAL_BT_DRV(x) (((x) & 0x3) << 21) -+#define _XTAL_GPIO(x) (((x) & 0x7) << 23) -+ -+ -+#define CKDLY_AFE BIT(26) -+#define CKDLY_USB BIT(27) -+#define CKDLY_DIG BIT(28) -+#define CKDLY_BT BIT(29) -+ -+ -+//2 AFE_PLL_CTRL -+#define APLL_EN BIT(0) -+#define APLL_320_EN BIT(1) -+#define APLL_FREF_SEL BIT(2) -+#define APLL_EDGE_SEL BIT(3) -+#define APLL_WDOGB BIT(4) -+#define APLL_LPFEN BIT(5) -+ -+#define APLL_REF_CLK_13MHZ 0x1 -+#define APLL_REF_CLK_19_2MHZ 0x2 -+#define APLL_REF_CLK_20MHZ 0x3 -+#define APLL_REF_CLK_25MHZ 0x4 -+#define APLL_REF_CLK_26MHZ 0x5 -+#define APLL_REF_CLK_38_4MHZ 0x6 -+#define APLL_REF_CLK_40MHZ 0x7 -+ -+#define APLL_320EN BIT(14) -+#define APLL_80EN BIT(15) -+#define APLL_1MEN BIT(24) -+ -+ -+//2 EFUSE_CTRL -+#define ALD_EN BIT(18) -+#define EF_PD BIT(19) -+#define EF_FLAG BIT(31) -+ -+//2 EFUSE_TEST -+#define EF_TRPT BIT(7) -+#define LDOE25_EN BIT(31) -+ -+//2 PWR_DATA -+ -+//2 CAL_TIMER -+ -+//2 ACLK_MON -+#define RSM_EN BIT(0) -+#define Timer_EN BIT(4) -+ -+ -+//2 GPIO_MUXCFG -+#define TRSW0EN BIT(2) -+#define TRSW1EN BIT(3) -+#define EROM_EN BIT(4) -+#define EnBT BIT(5) -+#define EnUart BIT(8) -+#define Uart_910 BIT(9) -+#define EnPMAC BIT(10) -+#define SIC_SWRST BIT(11) -+#define EnSIC BIT(12) -+#define SIC_23 BIT(13) -+#define EnHDP BIT(14) -+#define SIC_LBK BIT(15) -+ -+//2 GPIO_PIN_CTRL -+ -+ -+ -+//2 GPIO_INTM -+ -+//2 LEDCFG -+#define LED0PL BIT(4) -+#define LED1PL BIT(12) -+#define LED0DIS BIT(7) -+ -+#define SECCAM_CLR BIT(30) -+ -+//2 FSIMR -+ -+//2 FSISR -+ -+ -+//2 8051FWDL -+//2 MCUFWDL -+#define MCUFWDL_EN BIT(0) -+#define MCUFWDL_RDY BIT(1) -+#define FWDL_ChkSum_rpt BIT(2) -+#define MACINI_RDY BIT(3) -+#define BBINI_RDY BIT(4) -+#define RFINI_RDY BIT(5) -+#define WINTINI_RDY BIT(6) -+#define MAC1_WINTINI_RDY BIT(11)// 0X81 BIT3 -+#define CPRST BIT(23) -+ -+ -+ -+ -+//2 REG_SYS_CFG -+#define XCLK_VLD BIT(0) -+#define ACLK_VLD BIT(1) -+#define UCLK_VLD BIT(2) -+#define PCLK_VLD BIT(3) -+#define PCIRSTB BIT(4) -+#define V15_VLD BIT(5) -+#define TRP_B15V_EN BIT(7) -+#define SIC_IDLE BIT(8) -+#define BD_MAC2 BIT(9) -+#define BD_MAC1 BIT(10) -+#define IC_MACPHY_MODE BIT(11) -+#define PAD_HWPD_IDN BIT(22) -+#define TRP_VAUX_EN BIT(23) -+#define TRP_BT_EN BIT(24) -+#define BD_PKG_SEL BIT(25) -+#define BD_HCI_SEL BIT(26) -+#define TYPE_ID BIT(27) -+ -+#define CHIP_VER_RTL_MASK 0xF000 //Bit 12 ~ 15 -+#define CHIP_VER_RTL_SHIFT 12 -+ -+//----------------------------------------------------- -+// -+// 0x0100h ~ 0x01FFh MACTOP General Configuration -+// -+//----------------------------------------------------- -+ -+ -+//2 Function Enable Registers -+//2 CR -+ -+#define REG_LBMODE (REG_CR + 3) -+ -+ -+#define HCI_TXDMA_EN BIT(0) -+#define HCI_RXDMA_EN BIT(1) -+#define TXDMA_EN BIT(2) -+#define RXDMA_EN BIT(3) -+#define PROTOCOL_EN BIT(4) -+#define SCHEDULE_EN BIT(5) -+#define MACTXEN BIT(6) -+#define MACRXEN BIT(7) -+#define ENSWBCN BIT(8) -+#define ENSEC BIT(9) -+ -+// Network type -+#define _NETTYPE(x) (((x) & 0x3) << 16) -+#define MASK_NETTYPE 0x30000 -+#define NT_NO_LINK 0x0 -+#define NT_LINK_AD_HOC 0x1 -+#define NT_LINK_AP 0x2 -+#define NT_AS_AP 0x3 -+ -+#define _LBMODE(x) (((x) & 0xF) << 24) -+#define MASK_LBMODE 0xF000000 -+#define LOOPBACK_NORMAL 0x0 -+#define LOOPBACK_IMMEDIATELY 0xB -+#define LOOPBACK_MAC_DELAY 0x3 -+#define LOOPBACK_PHY 0x1 -+#define LOOPBACK_DMA 0x7 -+ -+ -+//2 PBP - Page Size Register -+#define GET_RX_PAGE_SIZE(value) ((value) & 0xF) -+#define GET_TX_PAGE_SIZE(value) (((value) & 0xF0) >> 4) -+#define _PSRX_MASK 0xF -+#define _PSTX_MASK 0xF0 -+#define _PSRX(x) (x) -+#define _PSTX(x) ((x) << 4) -+ -+#define PBP_64 0x0 -+#define PBP_128 0x1 -+#define PBP_256 0x2 -+#define PBP_512 0x3 -+#define PBP_1024 0x4 -+ -+ -+//2 TX/RXDMA -+#define RXDMA_ARBBW_EN BIT(0) -+#define RXSHFT_EN BIT(1) -+#define RXDMA_AGG_EN BIT(2) -+#define QS_VO_QUEUE BIT(8) -+#define QS_VI_QUEUE BIT(9) -+#define QS_BE_QUEUE BIT(10) -+#define QS_BK_QUEUE BIT(11) -+#define QS_MANAGER_QUEUE BIT(12) -+#define QS_HIGH_QUEUE BIT(13) -+ -+#define HQSEL_VOQ BIT(0) -+#define HQSEL_VIQ BIT(1) -+#define HQSEL_BEQ BIT(2) -+#define HQSEL_BKQ BIT(3) -+#define HQSEL_MGTQ BIT(4) -+#define HQSEL_HIQ BIT(5) -+ -+// For normal driver, 0x10C -+#define _TXDMA_HIQ_MAP(x) (((x)&0x3) << 14) -+#define _TXDMA_MGQ_MAP(x) (((x)&0x3) << 12) -+#define _TXDMA_BKQ_MAP(x) (((x)&0x3) << 10) -+#define _TXDMA_BEQ_MAP(x) (((x)&0x3) << 8 ) -+#define _TXDMA_VIQ_MAP(x) (((x)&0x3) << 6 ) -+#define _TXDMA_VOQ_MAP(x) (((x)&0x3) << 4 ) -+ -+#define QUEUE_LOW 1 -+#define QUEUE_NORMAL 2 -+#define QUEUE_HIGH 3 -+ -+ -+ -+//2 TRXFF_BNDY -+ -+ -+//2 LLT_INIT -+#define _LLT_NO_ACTIVE 0x0 -+#define _LLT_WRITE_ACCESS 0x1 -+#define _LLT_READ_ACCESS 0x2 -+ -+#define _LLT_INIT_DATA(x) ((x) & 0xFF) -+#define _LLT_INIT_ADDR(x) (((x) & 0xFF) << 8) -+#define _LLT_OP(x) (((x) & 0x3) << 30) -+#define _LLT_OP_VALUE(x) (((x) >> 30) & 0x3) -+ -+ -+//2 BB_ACCESS_CTRL -+#define BB_WRITE_READ_MASK (BIT(31) | BIT(30)) -+#define BB_WRITE_EN BIT(30) -+#define BB_READ_EN BIT(31) -+//#define BB_ADDR_MASK 0xFFF -+//#define _BB_ADDR(x) ((x) & BB_ADDR_MASK) -+ -+//----------------------------------------------------- -+// -+// 0x0200h ~ 0x027Fh TXDMA Configuration -+// -+//----------------------------------------------------- -+//2 RQPN -+#define _HPQ(x) ((x) & 0xFF) -+#define _LPQ(x) (((x) & 0xFF) << 8) -+#define _PUBQ(x) (((x) & 0xFF) << 16) -+#define _NPQ(x) ((x) & 0xFF) // NOTE: in RQPN_NPQ register -+ -+ -+#define HPQ_PUBLIC_DIS BIT(24) -+#define LPQ_PUBLIC_DIS BIT(25) -+#define LD_RQPN BIT(31) -+ -+ -+//2 TDECTRL -+#define BCN_VALID BIT(16) -+#define BCN_HEAD(x) (((x) & 0xFF) << 8) -+#define BCN_HEAD_MASK 0xFF00 -+ -+//2 TDECTL -+#define BLK_DESC_NUM_SHIFT 4 -+#define BLK_DESC_NUM_MASK 0xF -+ -+ -+//2 TXDMA_OFFSET_CHK -+#define DROP_DATA_EN BIT(9) -+ -+//----------------------------------------------------- -+// -+// 0x0400h ~ 0x047Fh Protocol Configuration -+// -+//----------------------------------------------------- -+//2 FWHW_TXQ_CTRL -+#define EN_AMPDU_RTY_NEW BIT(7) -+ -+//2 INIRTSMCS_SEL -+#define _INIRTSMCS_SEL(x) ((x) & 0x3F) -+ -+ -+//2 SPEC SIFS -+#define _SPEC_SIFS_CCK(x) ((x) & 0xFF) -+#define _SPEC_SIFS_OFDM(x) (((x) & 0xFF) << 8) -+ -+ -+//2 RRSR -+ -+#define RATE_REG_BITMAP_ALL 0xFFFFF -+ -+#define _RRSC_BITMAP(x) ((x) & 0xFFFFF) -+ -+#define _RRSR_RSC(x) (((x) & 0x3) << 21) -+#define RRSR_RSC_RESERVED 0x0 -+#define RRSR_RSC_UPPER_SUBCHANNEL 0x1 -+#define RRSR_RSC_LOWER_SUBCHANNEL 0x2 -+#define RRSR_RSC_DUPLICATE_MODE 0x3 -+ -+ -+//2 ARFR -+#define USE_SHORT_G1 BIT(20) -+ -+//2 AGGLEN_LMT_L -+#define _AGGLMT_MCS0(x) ((x) & 0xF) -+#define _AGGLMT_MCS1(x) (((x) & 0xF) << 4) -+#define _AGGLMT_MCS2(x) (((x) & 0xF) << 8) -+#define _AGGLMT_MCS3(x) (((x) & 0xF) << 12) -+#define _AGGLMT_MCS4(x) (((x) & 0xF) << 16) -+#define _AGGLMT_MCS5(x) (((x) & 0xF) << 20) -+#define _AGGLMT_MCS6(x) (((x) & 0xF) << 24) -+#define _AGGLMT_MCS7(x) (((x) & 0xF) << 28) -+ -+ -+//2 RL -+#define RETRY_LIMIT_SHORT_SHIFT 8 -+#define RETRY_LIMIT_LONG_SHIFT 0 -+ -+ -+//2 DARFRC -+#define _DARF_RC1(x) ((x) & 0x1F) -+#define _DARF_RC2(x) (((x) & 0x1F) << 8) -+#define _DARF_RC3(x) (((x) & 0x1F) << 16) -+#define _DARF_RC4(x) (((x) & 0x1F) << 24) -+// NOTE: shift starting from address (DARFRC + 4) -+#define _DARF_RC5(x) ((x) & 0x1F) -+#define _DARF_RC6(x) (((x) & 0x1F) << 8) -+#define _DARF_RC7(x) (((x) & 0x1F) << 16) -+#define _DARF_RC8(x) (((x) & 0x1F) << 24) -+ -+ -+//2 RARFRC -+#define _RARF_RC1(x) ((x) & 0x1F) -+#define _RARF_RC2(x) (((x) & 0x1F) << 8) -+#define _RARF_RC3(x) (((x) & 0x1F) << 16) -+#define _RARF_RC4(x) (((x) & 0x1F) << 24) -+// NOTE: shift starting from address (RARFRC + 4) -+#define _RARF_RC5(x) ((x) & 0x1F) -+#define _RARF_RC6(x) (((x) & 0x1F) << 8) -+#define _RARF_RC7(x) (((x) & 0x1F) << 16) -+#define _RARF_RC8(x) (((x) & 0x1F) << 24) -+ -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0x0500h ~ 0x05FFh EDCA Configuration -+// -+//----------------------------------------------------- -+ -+ -+ -+//2 EDCA setting -+#define AC_PARAM_TXOP_LIMIT_OFFSET 16 -+#define AC_PARAM_ECW_MAX_OFFSET 12 -+#define AC_PARAM_ECW_MIN_OFFSET 8 -+#define AC_PARAM_AIFS_OFFSET 0 -+ -+ -+//2 EDCA_VO_PARAM -+#define _AIFS(x) (x) -+#define _ECW_MAX_MIN(x) ((x) << 8) -+#define _TXOP_LIMIT(x) ((x) << 16) -+ -+ -+#define _BCNIFS(x) ((x) & 0xFF) -+#define _BCNECW(x) (((x) & 0xF))<< 8) -+ -+ -+#define _LRL(x) ((x) & 0x3F) -+#define _SRL(x) (((x) & 0x3F) << 8) -+ -+ -+//2 SIFS_CCK -+#define _SIFS_CCK_CTX(x) ((x) & 0xFF) -+#define _SIFS_CCK_TRX(x) (((x) & 0xFF) << 8); -+ -+ -+//2 SIFS_OFDM -+#define _SIFS_OFDM_CTX(x) ((x) & 0xFF) -+#define _SIFS_OFDM_TRX(x) (((x) & 0xFF) << 8); -+ -+ -+//2 TBTT PROHIBIT -+#define _TBTT_PROHIBIT_HOLD(x) (((x) & 0xFF) << 8) -+ -+ -+//2 REG_RD_CTRL -+#define DIS_EDCA_CNT_DWN BIT(11) -+ -+ -+//2 BCN_CTRL -+#define EN_MBSSID BIT(1) -+#define EN_TXBCN_RPT BIT(2) -+#define EN_BCN_FUNCTION BIT(3) -+// The same function but different bit field. -+#define DIS_TSF_UDT0_NORMAL_CHIP BIT(4) -+#define DIS_TSF_UDT0_TEST_CHIP BIT(5) -+ -+//2 ACMHWCTRL -+#define AcmHw_HwEn BIT(0) -+#define AcmHw_BeqEn BIT(1) -+#define AcmHw_ViqEn BIT(2) -+#define AcmHw_VoqEn BIT(3) -+#define AcmHw_BeqStatus BIT(4) -+#define AcmHw_ViqStatus BIT(5) -+#define AcmHw_VoqStatus BIT(6) -+ -+ -+ -+//----------------------------------------------------- -+// -+// 0x0600h ~ 0x07FFh WMAC Configuration -+// -+//----------------------------------------------------- -+ -+//2 APSD_CTRL -+#define APSDOFF BIT(6) -+#define APSDOFF_STATUS BIT(7) -+ -+ -+//2 BWOPMODE -+#define BW_20MHZ BIT(2) -+//#define BW_OPMODE_20MHZ BIT(2) // For compability -+ -+ -+#define RATE_BITMAP_ALL 0xFFFFF -+ -+// Only use CCK 1M rate for ACK -+#define RATE_RRSR_CCK_ONLY_1M 0xFFFF1 -+#define RATE_RRSR_WITHOUT_CCK 0xFFFF0 -+ -+//2 TCR -+#define TSFRST BIT(0) -+#define DIS_GCLK BIT(1) -+#define PAD_SEL BIT(2) -+#define PWR_ST BIT(6) -+#define PWRBIT_OW_EN BIT(7) -+#define ACRC BIT(8) -+#define CFENDFORM BIT(9) -+#define ICV BIT(10) -+ -+ -+ -+//2 RCR -+#define AAP BIT(0) -+#define APM BIT(1) -+#define AM BIT(2) -+#define AB BIT(3) -+#define ADD3 BIT(4) -+#define APWRMGT BIT(5) -+#define CBSSID BIT(6) -+#define CBSSID_BCN BIT(7) -+#define ACRC32 BIT(8) -+#define AICV BIT(9) -+#define ADF BIT(11) -+#define ACF BIT(12) -+#define AMF BIT(13) -+#define HTC_LOC_CTRL BIT(14) -+#define UC_DATA_EN BIT(16) -+#define BM_DATA_EN BIT(17) -+#define MFBEN BIT(22) -+#define LSIGEN BIT(23) -+#define EnMBID BIT(24) -+#define APP_BASSN BIT(27) -+#define APP_PHYSTS BIT(28) -+#define APP_ICV BIT(29) -+#define APP_MIC BIT(30) -+#define APP_FCS BIT(31) -+ -+//2 RX_PKT_LIMIT -+ -+//2 RX_DLK_TIME -+ -+//2 MBIDCAMCFG -+ -+ -+ -+//2 AMPDU_MIN_SPACE -+#define _MIN_SPACE(x) ((x) & 0x7) -+#define _SHORT_GI_PADDING(x) (((x) & 0x1F) << 3) -+ -+ -+//2 RXERR_RPT -+#define RXERR_TYPE_OFDM_PPDU 0 -+#define RXERR_TYPE_OFDM_FALSE_ALARM 1 -+#define RXERR_TYPE_OFDM_MPDU_OK 2 -+#define RXERR_TYPE_OFDM_MPDU_FAIL 3 -+#define RXERR_TYPE_CCK_PPDU 4 -+#define RXERR_TYPE_CCK_FALSE_ALARM 5 -+#define RXERR_TYPE_CCK_MPDU_OK 6 -+#define RXERR_TYPE_CCK_MPDU_FAIL 7 -+#define RXERR_TYPE_HT_PPDU 8 -+#define RXERR_TYPE_HT_FALSE_ALARM 9 -+#define RXERR_TYPE_HT_MPDU_TOTAL 10 -+#define RXERR_TYPE_HT_MPDU_OK 11 -+#define RXERR_TYPE_HT_MPDU_FAIL 12 -+#define RXERR_TYPE_RX_FULL_DROP 15 -+ -+#define RXERR_COUNTER_MASK 0xFFFFF -+#define RXERR_RPT_RST BIT(27) -+#define _RXERR_RPT_SEL(type) ((type) << 28) -+ -+ -+//2 SECCFG -+#define SCR_TxUseDK BIT(0) //Force Tx Use Default Key -+#define SCR_RxUseDK BIT(1) //Force Rx Use Default Key -+#define SCR_TxEncEnable BIT(2) //Enable Tx Encryption -+#define SCR_RxDecEnable BIT(3) //Enable Rx Decryption -+#define SCR_SKByA2 BIT(4) //Search kEY BY A2 -+#define SCR_NoSKMC BIT(5) //No Key Search Multicast -+#define SCR_TXBCUSEDK BIT(6) // Force Tx Broadcast packets Use Default Key -+#define SCR_RXBCUSEDK BIT(7) // Force Rx Broadcast packets Use Default Key -+ -+//vivi added for new cam search flow, 20091028 -+#ifdef HW_EN_DE_CRYPTION_FOR_NEW_CAM_SEARCH_FLOW -+#define SCR_TxUseBroadcastDK BIT6 //Force Tx Use Broadcast Default Key -+#define SCR_RxUseBroadcastDK BIT7 //Force Rx Use Broadcast Default Key -+#endif -+ -+ -+//----------------------------------------------------- -+// -+// 0xFE00h ~ 0xFE55h USB Configuration -+// -+//----------------------------------------------------- -+ -+//2 USB Information (0xFE17) -+#define USB_IS_HIGH_SPEED 0 -+#define USB_IS_FULL_SPEED 1 -+#define USB_SPEED_MASK BIT(5) -+ -+#define USB_NORMAL_SIE_EP_MASK 0xF -+#define USB_NORMAL_SIE_EP_SHIFT 4 -+ -+#define USB_TEST_EP_MASK 0x30 -+#define USB_TEST_EP_SHIFT 4 -+ -+//2 Special Option -+#define USB_AGG_EN BIT(3) -+ -+ -+//2REG_C2HEVT_CLEAR -+#define C2H_EVT_HOST_CLOSE 0x00 // Set by driver and notify FW that the driver has read the C2H command message -+#define C2H_EVT_FW_CLOSE 0xFF // Set by FW indicating that FW had set the C2H command message and it's not yet read by driver. -+ -+//2 8192D PartNo. -+#define PARTNO_92D_NIC (BIT7|BIT6) -+#define PARTNO_92D_NIC_REMARK (BIT5|BIT4) -+#define PARTNO_SINGLE_BAND_VS BIT3 -+#define PARTNO_SINGLE_BAND_VS_REMARK BIT1 -+#define PARTNO_CONCURRENT_BAND_VC (BIT3|BIT2) -+#define PARTNO_CONCURRENT_BAND_VC_REMARK (BIT1|BIT0) -+//======================================================== -+// General definitions -+//======================================================== -+ -+#define MAC_ADDR_LEN 6 -+#define LAST_ENTRY_OF_TX_PKT_BUFFER 255 -+#define LAST_ENTRY_OF_TX_PKT_BUFFER_DUAL_MAC 127 -+ -+#define POLLING_LLT_THRESHOLD 20 -+#define POLLING_READY_TIMEOUT_COUNT 1000 -+ -+// Min Spacing related settings. -+#define MAX_MSS_DENSITY_2T 0x13 -+#define MAX_MSS_DENSITY_1T 0x0A -+// GPIO BIT -+#define HAL_8192C_HW_GPIO_WPS_BIT BIT2 -+ -+ -+#include "basic_types.h" -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h -@@ -0,0 +1,145 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL8192D_XMIT_H_ -+#define _RTL8192D_XMIT_H_ -+ -+// -+// Queue Select Value in TxDesc -+// -+#define QSLT_BK 0x2//0x01 -+#define QSLT_BE 0x0 -+#define QSLT_VI 0x5//0x4 -+#define QSLT_VO 0x7//0x6 -+#define QSLT_BEACON 0x10 -+#define QSLT_HIGH 0x11 -+#define QSLT_MGNT 0x12 -+#define QSLT_CMD 0x13 -+ -+//Because we open EM for normal case, we just always insert 2*8 bytes.by wl -+#define USB_92D_DUMMY_OFFSET 2 -+#define USB_92D_DUMMY_LENGTH (USB_92D_DUMMY_OFFSET * PACKET_OFFSET_SZ) -+#define USB_HWDESC_HEADER_LEN (TXDESC_SIZE + USB_92D_DUMMY_LENGTH) -+ -+//For 92D early mode -+#define SET_EARLYMODE_PKTNUM(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr, 0, 3, __Value) -+#define SET_EARLYMODE_LEN0(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr, 4, 12, __Value) -+#define SET_EARLYMODE_LEN1(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr, 16, 12, __Value) -+#define SET_EARLYMODE_LEN2_1(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr, 28, 4, __Value) -+#define SET_EARLYMODE_LEN2_2(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr+4, 0, 8, __Value) -+#define SET_EARLYMODE_LEN3(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr+4, 8, 12, __Value) -+#define SET_EARLYMODE_LEN4(__pAddr, __Value) SET_BITS_TO_LE_4BYTE(__pAddr+4, 20, 12, __Value) -+ -+/* Copy from rtl8192c */ -+struct txrpt_ccx_8192d { -+ /* offset 0 */ -+ u8 retry_cnt:6; -+ u8 rsvd_0:2; -+ -+ /* offset 1 */ -+ u8 rts_retry_cnt:6; -+ u8 rsvd_1:2; -+ -+ /* offset 2 */ -+ u8 ccx_qtime0; -+ u8 ccx_qtime1; -+ -+ /* offset 4 */ -+ u8 missed_pkt_num:5; -+ u8 rsvd_4:3; -+ -+ /* offset 5 */ -+ u8 mac_id:5; -+ u8 des1_fragssn:3; -+ -+ /* offset 6 */ -+ u8 rpt_pkt_num:5; -+ u8 pkt_drop:1; -+ u8 lifetime_over:1; -+ u8 retry_over:1; -+ -+ /* offset 7*/ -+ u8 edca_tx_queue:4; -+ u8 rsvd_7:1; -+ u8 bmc:1; -+ u8 pkt_ok:1; -+ u8 int_ccx:1; -+}; -+ -+#define txrpt_ccx_qtime_8192d(txrpt_ccx) ((txrpt_ccx)->ccx_qtime0+((txrpt_ccx)->ccx_qtime1<<8)) -+ -+#ifdef CONFIG_XMIT_ACK -+void dump_txrpt_ccx_8192d(void *buf); -+void handle_txrpt_ccx_8192d(_adapter *adapter, void *buf); -+#else -+#define dump_txrpt_ccx_8192d(buf) do {} while(0) -+#define handle_txrpt_ccx_8192d(adapter, buf) do {} while(0) -+#endif -+ -+#ifdef CONFIG_USB_HCI -+ -+#ifdef CONFIG_USB_TX_AGGREGATION -+#define MAX_TX_AGG_PACKET_NUMBER 0xFF -+#endif -+ -+s32 rtl8192du_init_xmit_priv(_adapter * padapter); -+ -+void rtl8192du_free_xmit_priv(_adapter * padapter); -+ -+void rtl8192du_cal_txdesc_chksum(struct tx_desc *ptxdesc); -+ -+s32 rtl8192du_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -+ -+s32 rtl8192du_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); -+ -+s32 rtl8192du_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+s32 rtl8192du_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+ -+#ifdef CONFIG_HOSTAPD_MLME -+s32 rtl8192du_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); -+#endif -+ -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+s32 rtl8192de_init_xmit_priv(_adapter * padapter); -+void rtl8192de_free_xmit_priv(_adapter * padapter); -+ -+s32 rtl8192de_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf); -+struct xmit_buf *rtl8192de_dequeue_xmitbuf(struct rtw_tx_ring *ring); -+ -+void rtl8192de_xmitframe_resume(_adapter *padapter); -+ -+s32 rtl8192de_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); -+ -+s32 rtl8192de_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+s32 rtl8192de_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -+ -+#ifdef CONFIG_HOSTAPD_MLME -+s32 rtl8192de_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); -+#endif -+ -+#endif -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h -@@ -0,0 +1,90 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef __RTW_ANDROID_H__ -+#define __RTW_ANDROID_H__ -+ -+#include -+#include -+ -+enum ANDROID_WIFI_CMD { -+ ANDROID_WIFI_CMD_START, -+ ANDROID_WIFI_CMD_STOP, -+ ANDROID_WIFI_CMD_SCAN_ACTIVE, -+ ANDROID_WIFI_CMD_SCAN_PASSIVE, -+ ANDROID_WIFI_CMD_RSSI, -+ ANDROID_WIFI_CMD_LINKSPEED, -+ ANDROID_WIFI_CMD_RXFILTER_START, -+ ANDROID_WIFI_CMD_RXFILTER_STOP, -+ ANDROID_WIFI_CMD_RXFILTER_ADD, -+ ANDROID_WIFI_CMD_RXFILTER_REMOVE, -+ ANDROID_WIFI_CMD_BTCOEXSCAN_START, -+ ANDROID_WIFI_CMD_BTCOEXSCAN_STOP, -+ ANDROID_WIFI_CMD_BTCOEXMODE, -+ ANDROID_WIFI_CMD_SETSUSPENDOPT, -+ ANDROID_WIFI_CMD_P2P_DEV_ADDR, -+ ANDROID_WIFI_CMD_SETFWPATH, -+ ANDROID_WIFI_CMD_SETBAND, -+ ANDROID_WIFI_CMD_GETBAND, -+ ANDROID_WIFI_CMD_COUNTRY, -+ ANDROID_WIFI_CMD_P2P_SET_NOA, -+ ANDROID_WIFI_CMD_P2P_GET_NOA, -+ ANDROID_WIFI_CMD_P2P_SET_PS, -+ ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE, -+#ifdef PNO_SUPPORT -+ ANDROID_WIFI_CMD_PNOSSIDCLR_SET, -+ ANDROID_WIFI_CMD_PNOSETUP_SET, -+ ANDROID_WIFI_CMD_PNOENABLE_SET, -+ ANDROID_WIFI_CMD_PNODEBUG_SET, -+#endif -+ -+ ANDROID_WIFI_CMD_MACADDR, -+ -+ ANDROID_WIFI_CMD_BLOCK, -+ -+ ANDROID_WIFI_CMD_WFD_ENABLE, -+ ANDROID_WIFI_CMD_WFD_DISABLE, -+ -+ ANDROID_WIFI_CMD_WFD_SET_TCPPORT, -+ ANDROID_WIFI_CMD_WFD_SET_MAX_TPUT, -+ ANDROID_WIFI_CMD_WFD_SET_DEVTYPE, -+ -+ ANDROID_WIFI_CMD_MAX -+}; -+ -+int rtw_android_cmdstr_to_num(char *cmdstr); -+int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd); -+ -+#if defined(RTW_ENABLE_WIFI_CONTROL_FUNC) -+int rtw_android_wifictrl_func_add(void); -+void rtw_android_wifictrl_func_del(void); -+void* wl_android_prealloc(int section, unsigned long size); -+ -+int wifi_get_irq_number(unsigned long *irq_flags_ptr); -+int wifi_set_power(int on, unsigned long msec); -+int wifi_get_mac_addr(unsigned char *buf); -+void *wifi_get_country_code(char *ccode); -+#else -+static int rtw_android_wifictrl_func_add(void) { return 0; } -+static void rtw_android_wifictrl_func_del(void) {} -+#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ -+ -+#endif //__RTW_ANDROID_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h -@@ -0,0 +1,64 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_AP_H_ -+#define __RTW_AP_H_ -+ -+#include -+#include -+#include -+ -+ -+#ifdef CONFIG_AP_MODE -+ -+//external function -+extern void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta); -+extern void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta); -+ -+ -+void init_mlme_ap_info(_adapter *padapter); -+void free_mlme_ap_info(_adapter *padapter); -+//void update_BCNTIM(_adapter *padapter); -+void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len); -+void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index); -+void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx); -+void expire_timeout_chk(_adapter *padapter); -+void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta); -+int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len); -+void rtw_ap_restore_network(_adapter *padapter); -+void rtw_set_macaddr_acl(_adapter *padapter, int mode); -+int rtw_acl_add_sta(_adapter *padapter, u8 *addr); -+int rtw_acl_remove_sta(_adapter *padapter, u8 *addr); -+ -+#ifdef CONFIG_NATIVEAP_MLME -+void associated_clients_update(_adapter *padapter, u8 updated); -+void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta); -+u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta); -+void sta_info_update(_adapter *padapter, struct sta_info *psta); -+void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta); -+u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason); -+int rtw_sta_flush(_adapter *padapter); -+int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset); -+void start_ap_mode(_adapter *padapter); -+void stop_ap_mode(_adapter *padapter); -+#endif -+#endif //end of CONFIG_AP_MODE -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h -@@ -0,0 +1,76 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_BR_EXT_H_ -+#define _RTW_BR_EXT_H_ -+ -+#if 1 // rtw_wifi_driver -+#define CL_IPV6_PASS 1 -+#define MACADDRLEN 6 -+#define _DEBUG_ERR printk -+#define _DEBUG_INFO //printk -+#define DEBUG_WARN printk -+#define DEBUG_INFO //printk -+#define DEBUG_ERR printk -+//#define GET_MY_HWADDR ((GET_MIB(priv))->dot11OperationEntry.hwaddr) -+#define GET_MY_HWADDR(padapter) ((padapter)->eeprompriv.mac_addr) -+#endif // rtw_wifi_driver -+ -+#define NAT25_HASH_BITS 4 -+#define NAT25_HASH_SIZE (1 << NAT25_HASH_BITS) -+#define NAT25_AGEING_TIME 300 -+ -+#ifdef CL_IPV6_PASS -+#define MAX_NETWORK_ADDR_LEN 17 -+#else -+#define MAX_NETWORK_ADDR_LEN 11 -+#endif -+ -+struct nat25_network_db_entry -+{ -+ struct nat25_network_db_entry *next_hash; -+ struct nat25_network_db_entry **pprev_hash; -+ atomic_t use_count; -+ unsigned char macAddr[6]; -+ unsigned long ageing_timer; -+ unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; -+}; -+ -+enum NAT25_METHOD { -+ NAT25_MIN, -+ NAT25_CHECK, -+ NAT25_INSERT, -+ NAT25_LOOKUP, -+ NAT25_PARSE, -+ NAT25_MAX -+}; -+ -+struct br_ext_info { -+ unsigned int nat25_disable; -+ unsigned int macclone_enable; -+ unsigned int dhcp_bcst_disable; -+ int addPPPoETag; // 1: Add PPPoE relay-SID, 0: disable -+ unsigned char nat25_dmzMac[MACADDRLEN]; -+ unsigned int nat25sc_disable; -+}; -+ -+void nat25_db_cleanup(_adapter *priv); -+ -+#endif // _RTW_BR_EXT_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h -@@ -0,0 +1,40 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTL871X_BYTEORDER_H_ -+#define _RTL871X_BYTEORDER_H_ -+ -+#include -+ -+#if defined (CONFIG_LITTLE_ENDIAN) && defined (CONFIG_BIG_ENDIAN) -+#error "Shall be CONFIG_LITTLE_ENDIAN or CONFIG_BIG_ENDIAN, but not both!\n" -+#endif -+ -+#if defined (CONFIG_LITTLE_ENDIAN) -+#ifndef CONFIG_PLATFORM_MSTAR389 -+# include -+#endif -+#elif defined (CONFIG_BIG_ENDIAN) -+# include -+#else -+# error "Must be LITTLE/BIG Endian Host" -+#endif -+ -+#endif /* _RTL871X_BYTEORDER_H_ */ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h -@@ -0,0 +1,1167 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_CMD_H_ -+#define __RTW_CMD_H_ -+ -+#include -+#include -+#include -+#include -+ -+#define C2H_MEM_SZ (16*1024) -+ -+#ifndef CONFIG_RTL8711FW -+ -+ #include -+ #include // -+ -+ -+ #define FREE_CMDOBJ_SZ 128 -+ -+ #define MAX_CMDSZ 1024 -+ #define MAX_RSPSZ 512 -+ #define MAX_EVTSZ 1024 -+ -+#ifdef PLATFORM_OS_CE -+ #define CMDBUFF_ALIGN_SZ 4 -+#else -+ #define CMDBUFF_ALIGN_SZ 512 -+#endif -+ -+ struct cmd_obj { -+ _adapter *padapter; -+ u16 cmdcode; -+ u8 res; -+ u8 *parmbuf; -+ u32 cmdsz; -+ u8 *rsp; -+ u32 rspsz; -+ //_sema cmd_sem; -+ _list list; -+ }; -+ -+ struct cmd_priv { -+ _sema cmd_queue_sema; -+ //_sema cmd_done_sema; -+ _sema terminate_cmdthread_sema; -+ _queue cmd_queue; -+ u8 cmd_seq; -+ u8 *cmd_buf; //shall be non-paged, and 4 bytes aligned -+ u8 *cmd_allocated_buf; -+ u8 *rsp_buf; //shall be non-paged, and 4 bytes aligned -+ u8 *rsp_allocated_buf; -+ u32 cmd_issued_cnt; -+ u32 cmd_done_cnt; -+ u32 rsp_cnt; -+ u8 cmdthd_running; -+ u8 stop_req; -+ _adapter *padapter; -+ }; -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+ struct evt_obj { -+ u16 evtcode; -+ u8 res; -+ u8 *parmbuf; -+ u32 evtsz; -+ _list list; -+ }; -+#endif -+ -+ struct evt_priv { -+#ifdef CONFIG_EVENT_THREAD_MODE -+ _sema evt_notify; -+ _sema terminate_evtthread_sema; -+ _queue evt_queue; -+#endif -+ -+//#define CONFIG_C2H_WK -+#ifdef CONFIG_C2H_WK -+ _workitem c2h_wk; -+ bool c2h_wk_alive; -+ struct rtw_cbuf *c2h_queue; -+ #define C2H_QUEUE_MAX_LEN 10 -+#endif -+ -+#ifdef CONFIG_H2CLBK -+ _sema lbkevt_done; -+ u8 lbkevt_limit; -+ u8 lbkevt_num; -+ u8 *cmdevt_parm; -+#endif -+ ATOMIC_T event_seq; -+ u8 *evt_buf; //shall be non-paged, and 4 bytes aligned -+ u8 *evt_allocated_buf; -+ u32 evt_done_cnt; -+#ifdef CONFIG_SDIO_HCI -+ u8 *c2h_mem; -+ u8 *allocated_c2h_mem; -+#ifdef PLATFORM_OS_XP -+ PMDL pc2h_mdl; -+#endif -+#endif -+ -+ }; -+ -+#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \ -+do {\ -+ _rtw_init_listhead(&pcmd->list);\ -+ pcmd->cmdcode = code;\ -+ pcmd->parmbuf = (u8 *)(pparm);\ -+ pcmd->cmdsz = sizeof (*pparm);\ -+ pcmd->rsp = NULL;\ -+ pcmd->rspsz = 0;\ -+} while(0) -+ -+struct c2h_evt_hdr { -+ u8 id:4; -+ u8 plen:4; -+ u8 seq; -+ u8 payload[0]; -+}; -+ -+#define c2h_evt_exist(c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen) -+ -+extern u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); -+extern struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); -+extern void rtw_free_cmd_obj(struct cmd_obj *pcmd); -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+extern u32 rtw_enqueue_evt(struct evt_priv *pevtpriv, struct evt_obj *obj); -+extern struct evt_obj *rtw_dequeue_evt(_queue *queue); -+extern void rtw_free_evt_obj(struct evt_obj *pcmd); -+#endif -+ -+void rtw_stop_cmd_thread(_adapter *adapter); -+thread_return rtw_cmd_thread(thread_context context); -+ -+extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); -+extern void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); -+ -+extern u32 rtw_init_evt_priv (struct evt_priv *pevtpriv); -+extern void rtw_free_evt_priv (struct evt_priv *pevtpriv); -+extern void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv); -+extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); -+#ifdef CONFIG_P2P -+u8 p2p_protocol_wk_cmd(_adapter*padapter, int intCmdType ); -+#endif //CONFIG_P2P -+ -+#else -+ #include -+#endif /* CONFIG_RTL8711FW */ -+ -+enum rtw_drvextra_cmd_id -+{ -+ NONE_WK_CID, -+ DYNAMIC_CHK_WK_CID, -+ DM_CTRL_WK_CID, -+ PBC_POLLING_WK_CID, -+ POWER_SAVING_CTRL_WK_CID,//IPS,AUTOSuspend -+ LPS_CTRL_WK_CID, -+ ANT_SELECT_WK_CID, -+ P2P_PS_WK_CID, -+ P2P_PROTO_WK_CID, -+ CHECK_HIQ_WK_CID,//for softap mode, check hi queue if empty -+ INTEl_WIDI_WK_CID, -+ C2H_WK_CID, -+ RESET_SECURITYPRIV, // add for CONFIG_IEEE80211W, none 11w also can use -+ FREE_ASSOC_RESOURCES, // add for CONFIG_IEEE80211W, none 11w also can use -+ MAX_WK_CID -+}; -+ -+enum LPS_CTRL_TYPE -+{ -+ LPS_CTRL_SCAN=0, -+ LPS_CTRL_JOINBSS=1, -+ LPS_CTRL_CONNECT=2, -+ LPS_CTRL_DISCONNECT=3, -+ LPS_CTRL_SPECIAL_PACKET=4, -+}; -+ -+enum RFINTFS { -+ SWSI, -+ HWSI, -+ HWPI, -+}; -+ -+/* -+Caller Mode: Infra, Ad-HoC(C) -+ -+Notes: To enter USB suspend mode -+ -+Command Mode -+ -+*/ -+struct usb_suspend_parm { -+ u32 action;// 1: sleep, 0:resume -+}; -+ -+/* -+Caller Mode: Infra, Ad-HoC -+ -+Notes: To join a known BSS. -+ -+Command-Event Mode -+ -+*/ -+ -+/* -+Caller Mode: Infra, Ad-Hoc -+ -+Notes: To join the specified bss -+ -+Command Event Mode -+ -+*/ -+struct joinbss_parm { -+ WLAN_BSSID_EX network; -+}; -+ -+/* -+Caller Mode: Infra, Ad-HoC(C) -+ -+Notes: To disconnect the current associated BSS -+ -+Command Mode -+ -+*/ -+struct disconnect_parm { -+ u32 deauth_timeout_ms; -+}; -+ -+/* -+Caller Mode: AP, Ad-HoC(M) -+ -+Notes: To create a BSS -+ -+Command Mode -+*/ -+struct createbss_parm { -+ WLAN_BSSID_EX network; -+}; -+ -+/* -+Caller Mode: AP, Ad-HoC, Infra -+ -+Notes: To set the NIC mode of RTL8711 -+ -+Command Mode -+ -+The definition of mode: -+ -+#define IW_MODE_AUTO 0 // Let the driver decides which AP to join -+#define IW_MODE_ADHOC 1 // Single cell network (Ad-Hoc Clients) -+#define IW_MODE_INFRA 2 // Multi cell network, roaming, .. -+#define IW_MODE_MASTER 3 // Synchronisation master or Access Point -+#define IW_MODE_REPEAT 4 // Wireless Repeater (forwarder) -+#define IW_MODE_SECOND 5 // Secondary master/repeater (backup) -+#define IW_MODE_MONITOR 6 // Passive monitor (listen only) -+ -+*/ -+struct setopmode_parm { -+ u8 mode; -+ u8 rsvd[3]; -+}; -+ -+/* -+Caller Mode: AP, Ad-HoC, Infra -+ -+Notes: To ask RTL8711 performing site-survey -+ -+Command-Event Mode -+ -+*/ -+ -+#define RTW_SSID_SCAN_AMOUNT 9 // for WEXT_CSCAN_AMOUNT 9 -+#define RTW_CHANNEL_SCAN_AMOUNT (14+37) -+struct sitesurvey_parm { -+ sint scan_mode; //active: 1, passive: 0 -+ /* sint bsslimit; // 1 ~ 48 */ -+ u8 ssid_num; -+ u8 ch_num; -+ NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; -+ struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT]; -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To set the auth type of RTL8711. open/shared/802.1x -+ -+Command Mode -+ -+*/ -+struct setauth_parm { -+ u8 mode; //0: legacy open, 1: legacy shared 2: 802.1x -+ u8 _1x; //0: PSK, 1: TLS -+ u8 rsvd[2]; -+}; -+ -+/* -+Caller Mode: Infra -+ -+a. algorithm: wep40, wep104, tkip & aes -+b. keytype: grp key/unicast key -+c. key contents -+ -+when shared key ==> keyid is the camid -+when 802.1x ==> keyid [0:1] ==> grp key -+when 802.1x ==> keyid > 2 ==> unicast key -+ -+*/ -+struct setkey_parm { -+ u8 algorithm; // encryption algorithm, could be none, wep40, TKIP, CCMP, wep104 -+ u8 keyid; -+ u8 grpkey; // 1: this is the grpkey for 802.1x. 0: this is the unicast key for 802.1x -+ u8 set_tx; // 1: main tx key for wep. 0: other key. -+ u8 key[16]; // this could be 40 or 104 -+}; -+ -+/* -+When in AP or Ad-Hoc mode, this is used to -+allocate an sw/hw entry for a newly associated sta. -+ -+Command -+ -+when shared key ==> algorithm/keyid -+ -+*/ -+struct set_stakey_parm { -+ u8 addr[ETH_ALEN]; -+ u8 algorithm; -+ u8 id;// currently for erasing cam entry if algorithm == _NO_PRIVACY_ -+ u8 key[16]; -+}; -+ -+struct set_stakey_rsp { -+ u8 addr[ETH_ALEN]; -+ u8 keyid; -+ u8 rsvd; -+}; -+ -+/* -+Caller Ad-Hoc/AP -+ -+Command -Rsp(AID == CAMID) mode -+ -+This is to force fw to add an sta_data entry per driver's request. -+ -+FW will write an cam entry associated with it. -+ -+*/ -+struct set_assocsta_parm { -+ u8 addr[ETH_ALEN]; -+}; -+ -+struct set_assocsta_rsp { -+ u8 cam_id; -+ u8 rsvd[3]; -+}; -+ -+/* -+ Caller Ad-Hoc/AP -+ -+ Command mode -+ -+ This is to force fw to del an sta_data entry per driver's request -+ -+ FW will invalidate the cam entry associated with it. -+ -+*/ -+struct del_assocsta_parm { -+ u8 addr[ETH_ALEN]; -+}; -+ -+/* -+Caller Mode: AP/Ad-HoC(M) -+ -+Notes: To notify fw that given staid has changed its power state -+ -+Command Mode -+ -+*/ -+struct setstapwrstate_parm { -+ u8 staid; -+ u8 status; -+ u8 hwaddr[6]; -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To setup the basic rate of RTL8711 -+ -+Command Mode -+ -+*/ -+struct setbasicrate_parm { -+ u8 basicrates[NumRates]; -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To read the current basic rate -+ -+Command-Rsp Mode -+ -+*/ -+struct getbasicrate_parm { -+ u32 rsvd; -+}; -+ -+struct getbasicrate_rsp { -+ u8 basicrates[NumRates]; -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To setup the data rate of RTL8711 -+ -+Command Mode -+ -+*/ -+struct setdatarate_parm { -+#ifdef MP_FIRMWARE_OFFLOAD -+ u32 curr_rateidx; -+#else -+ u8 mac_id; -+ u8 datarates[NumRates]; -+#endif -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To read the current data rate -+ -+Command-Rsp Mode -+ -+*/ -+struct getdatarate_parm { -+ u32 rsvd; -+ -+}; -+struct getdatarate_rsp { -+ u8 datarates[NumRates]; -+}; -+ -+ -+/* -+Caller Mode: Any -+AP: AP can use the info for the contents of beacon frame -+Infra: STA can use the info when sitesurveying -+Ad-HoC(M): Like AP -+Ad-HoC(C): Like STA -+ -+ -+Notes: To set the phy capability of the NIC -+ -+Command Mode -+ -+*/ -+ -+struct setphyinfo_parm { -+ struct regulatory_class class_sets[NUM_REGULATORYS]; -+ u8 status; -+}; -+ -+struct getphyinfo_parm { -+ u32 rsvd; -+}; -+ -+struct getphyinfo_rsp { -+ struct regulatory_class class_sets[NUM_REGULATORYS]; -+ u8 status; -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To set the channel/modem/band -+This command will be used when channel/modem/band is changed. -+ -+Command Mode -+ -+*/ -+struct setphy_parm { -+ u8 rfchannel; -+ u8 modem; -+}; -+ -+/* -+Caller Mode: Any -+ -+Notes: To get the current setting of channel/modem/band -+ -+Command-Rsp Mode -+ -+*/ -+struct getphy_parm { -+ u32 rsvd; -+ -+}; -+struct getphy_rsp { -+ u8 rfchannel; -+ u8 modem; -+}; -+ -+struct readBB_parm { -+ u8 offset; -+}; -+struct readBB_rsp { -+ u8 value; -+}; -+ -+struct readTSSI_parm { -+ u8 offset; -+}; -+struct readTSSI_rsp { -+ u8 value; -+}; -+ -+struct writeBB_parm { -+ u8 offset; -+ u8 value; -+}; -+ -+struct readRF_parm { -+ u8 offset; -+}; -+struct readRF_rsp { -+ u32 value; -+}; -+ -+struct writeRF_parm { -+ u32 offset; -+ u32 value; -+}; -+ -+struct getrfintfs_parm { -+ u8 rfintfs; -+}; -+ -+ -+struct Tx_Beacon_param -+{ -+ WLAN_BSSID_EX network; -+}; -+ -+/* -+ Notes: This command is used for H2C/C2H loopback testing -+ -+ mac[0] == 0 -+ ==> CMD mode, return H2C_SUCCESS. -+ The following condition must be ture under CMD mode -+ mac[1] == mac[4], mac[2] == mac[3], mac[0]=mac[5]= 0; -+ s0 == 0x1234, s1 == 0xabcd, w0 == 0x78563412, w1 == 0x5aa5def7; -+ s2 == (b1 << 8 | b0); -+ -+ mac[0] == 1 -+ ==> CMD_RSP mode, return H2C_SUCCESS_RSP -+ -+ The rsp layout shall be: -+ rsp: parm: -+ mac[0] = mac[5]; -+ mac[1] = mac[4]; -+ mac[2] = mac[3]; -+ mac[3] = mac[2]; -+ mac[4] = mac[1]; -+ mac[5] = mac[0]; -+ s0 = s1; -+ s1 = swap16(s0); -+ w0 = swap32(w1); -+ b0 = b1 -+ s2 = s0 + s1 -+ b1 = b0 -+ w1 = w0 -+ -+ mac[0] == 2 -+ ==> CMD_EVENT mode, return H2C_SUCCESS -+ The event layout shall be: -+ event: parm: -+ mac[0] = mac[5]; -+ mac[1] = mac[4]; -+ mac[2] = event's sequence number, starting from 1 to parm's marc[3] -+ mac[3] = mac[2]; -+ mac[4] = mac[1]; -+ mac[5] = mac[0]; -+ s0 = swap16(s0) - event.mac[2]; -+ s1 = s1 + event.mac[2]; -+ w0 = swap32(w0); -+ b0 = b1 -+ s2 = s0 + event.mac[2] -+ b1 = b0 -+ w1 = swap32(w1) - event.mac[2]; -+ -+ parm->mac[3] is the total event counts that host requested. -+ -+ -+ event will be the same with the cmd's param. -+ -+*/ -+ -+#ifdef CONFIG_H2CLBK -+ -+struct seth2clbk_parm { -+ u8 mac[6]; -+ u16 s0; -+ u16 s1; -+ u32 w0; -+ u8 b0; -+ u16 s2; -+ u8 b1; -+ u32 w1; -+}; -+ -+struct geth2clbk_parm { -+ u32 rsv; -+}; -+ -+struct geth2clbk_rsp { -+ u8 mac[6]; -+ u16 s0; -+ u16 s1; -+ u32 w0; -+ u8 b0; -+ u16 s2; -+ u8 b1; -+ u32 w1; -+}; -+ -+#endif /* CONFIG_H2CLBK */ -+ -+// CMD param Formart for driver extra cmd handler -+struct drvextra_cmd_parm { -+ int ec_id; //extra cmd id -+ int type_size; // Can use this field as the type id or command size -+ unsigned char *pbuf; -+}; -+ -+/*------------------- Below are used for RF/BB tunning ---------------------*/ -+ -+struct setantenna_parm { -+ u8 tx_antset; -+ u8 rx_antset; -+ u8 tx_antenna; -+ u8 rx_antenna; -+}; -+ -+struct enrateadaptive_parm { -+ u32 en; -+}; -+ -+struct settxagctbl_parm { -+ u32 txagc[MAX_RATES_LENGTH]; -+}; -+ -+struct gettxagctbl_parm { -+ u32 rsvd; -+}; -+struct gettxagctbl_rsp { -+ u32 txagc[MAX_RATES_LENGTH]; -+}; -+ -+struct setagcctrl_parm { -+ u32 agcctrl; // 0: pure hw, 1: fw -+}; -+ -+ -+struct setssup_parm { -+ u32 ss_ForceUp[MAX_RATES_LENGTH]; -+}; -+ -+struct getssup_parm { -+ u32 rsvd; -+}; -+struct getssup_rsp { -+ u8 ss_ForceUp[MAX_RATES_LENGTH]; -+}; -+ -+ -+struct setssdlevel_parm { -+ u8 ss_DLevel[MAX_RATES_LENGTH]; -+}; -+ -+struct getssdlevel_parm { -+ u32 rsvd; -+}; -+struct getssdlevel_rsp { -+ u8 ss_DLevel[MAX_RATES_LENGTH]; -+}; -+ -+struct setssulevel_parm { -+ u8 ss_ULevel[MAX_RATES_LENGTH]; -+}; -+ -+struct getssulevel_parm { -+ u32 rsvd; -+}; -+struct getssulevel_rsp { -+ u8 ss_ULevel[MAX_RATES_LENGTH]; -+}; -+ -+ -+struct setcountjudge_parm { -+ u8 count_judge[MAX_RATES_LENGTH]; -+}; -+ -+struct getcountjudge_parm { -+ u32 rsvd; -+}; -+struct getcountjudge_rsp { -+ u8 count_judge[MAX_RATES_LENGTH]; -+}; -+ -+ -+struct setratable_parm { -+ u8 ss_ForceUp[NumRates]; -+ u8 ss_ULevel[NumRates]; -+ u8 ss_DLevel[NumRates]; -+ u8 count_judge[NumRates]; -+}; -+ -+struct getratable_parm { -+ uint rsvd; -+}; -+struct getratable_rsp { -+ u8 ss_ForceUp[NumRates]; -+ u8 ss_ULevel[NumRates]; -+ u8 ss_DLevel[NumRates]; -+ u8 count_judge[NumRates]; -+}; -+ -+ -+//to get TX,RX retry count -+struct gettxretrycnt_parm{ -+ unsigned int rsvd; -+}; -+struct gettxretrycnt_rsp{ -+ unsigned long tx_retrycnt; -+}; -+ -+struct getrxretrycnt_parm{ -+ unsigned int rsvd; -+}; -+struct getrxretrycnt_rsp{ -+ unsigned long rx_retrycnt; -+}; -+ -+//to get BCNOK,BCNERR count -+struct getbcnokcnt_parm{ -+ unsigned int rsvd; -+}; -+struct getbcnokcnt_rsp{ -+ unsigned long bcnokcnt; -+}; -+ -+struct getbcnerrcnt_parm{ -+ unsigned int rsvd; -+}; -+struct getbcnerrcnt_rsp{ -+ unsigned long bcnerrcnt; -+}; -+ -+// to get current TX power level -+struct getcurtxpwrlevel_parm{ -+ unsigned int rsvd; -+}; -+struct getcurtxpwrlevel_rsp{ -+ unsigned short tx_power; -+}; -+ -+struct setprobereqextraie_parm { -+ unsigned char e_id; -+ unsigned char ie_len; -+ unsigned char ie[0]; -+}; -+ -+struct setassocreqextraie_parm { -+ unsigned char e_id; -+ unsigned char ie_len; -+ unsigned char ie[0]; -+}; -+ -+struct setproberspextraie_parm { -+ unsigned char e_id; -+ unsigned char ie_len; -+ unsigned char ie[0]; -+}; -+ -+struct setassocrspextraie_parm { -+ unsigned char e_id; -+ unsigned char ie_len; -+ unsigned char ie[0]; -+}; -+ -+ -+struct addBaReq_parm -+{ -+ unsigned int tid; -+ u8 addr[ETH_ALEN]; -+}; -+ -+/*H2C Handler index: 46 */ -+struct set_ch_parm { -+ u8 ch; -+ u8 bw; -+ u8 ch_offset; -+}; -+ -+#ifdef MP_FIRMWARE_OFFLOAD -+/*H2C Handler index: 47 */ -+struct SetTxPower_parm -+{ -+ u8 TxPower; -+}; -+ -+/*H2C Handler index: 48 */ -+struct SwitchAntenna_parm -+{ -+ u16 antenna_tx; -+ u16 antenna_rx; -+// R_ANTENNA_SELECT_CCK cck_txrx; -+ u8 cck_txrx; -+}; -+ -+/*H2C Handler index: 49 */ -+struct SetCrystalCap_parm -+{ -+ u32 curr_crystalcap; -+}; -+ -+/*H2C Handler index: 50 */ -+struct SetSingleCarrierTx_parm -+{ -+ u8 bStart; -+}; -+ -+/*H2C Handler index: 51 */ -+struct SetSingleToneTx_parm -+{ -+ u8 bStart; -+ u8 curr_rfpath; -+}; -+ -+/*H2C Handler index: 52 */ -+struct SetCarrierSuppressionTx_parm -+{ -+ u8 bStart; -+ u32 curr_rateidx; -+}; -+ -+/*H2C Handler index: 53 */ -+struct SetContinuousTx_parm -+{ -+ u8 bStart; -+ u8 CCK_flag; /*1:CCK 2:OFDM*/ -+ u32 curr_rateidx; -+}; -+ -+/*H2C Handler index: 54 */ -+struct SwitchBandwidth_parm -+{ -+ u8 curr_bandwidth; -+}; -+ -+#endif /* MP_FIRMWARE_OFFLOAD */ -+ -+/*H2C Handler index: 59 */ -+struct SetChannelPlan_param -+{ -+ u8 channel_plan; -+}; -+ -+/*H2C Handler index: 60 */ -+struct LedBlink_param -+{ -+ PLED_871x pLed; -+}; -+ -+/*H2C Handler index: 61 */ -+struct SetChannelSwitch_param -+{ -+ u8 new_ch_no; -+}; -+ -+/*H2C Handler index: 62 */ -+struct TDLSoption_param -+{ -+ u8 addr[ETH_ALEN]; -+ u8 option; -+}; -+ -+#define GEN_CMD_CODE(cmd) cmd ## _CMD_ -+ -+ -+/* -+ -+Result: -+0x00: success -+0x01: sucess, and check Response. -+0x02: cmd ignored due to duplicated sequcne number -+0x03: cmd dropped due to invalid cmd code -+0x04: reserved. -+ -+*/ -+ -+#define H2C_RSP_OFFSET 512 -+ -+#define H2C_SUCCESS 0x00 -+#define H2C_SUCCESS_RSP 0x01 -+#define H2C_DUPLICATED 0x02 -+#define H2C_DROPPED 0x03 -+#define H2C_PARAMETERS_ERROR 0x04 -+#define H2C_REJECTED 0x05 -+#define H2C_CMD_OVERFLOW 0x06 -+#define H2C_RESERVED 0x07 -+ -+extern u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr); -+extern u8 rtw_setstandby_cmd(_adapter *padapter, uint action); -+u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); -+extern u8 rtw_createbss_cmd(_adapter *padapter); -+extern u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz); -+extern u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch); -+extern u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key); -+extern u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue); -+extern u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork); -+u8 rtw_disassoc_cmd(_adapter *padapter, u32 deauth_timeout_ms, bool enqueue); -+extern u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); -+extern u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset); -+extern u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset); -+extern u8 rtw_setbbreg_cmd(_adapter * padapter, u8 offset, u8 val); -+extern u8 rtw_setrfreg_cmd(_adapter * padapter, u8 offset, u32 val); -+extern u8 rtw_getbbreg_cmd(_adapter * padapter, u8 offset, u8 * pval); -+extern u8 rtw_getrfreg_cmd(_adapter * padapter, u8 offset, u8 * pval); -+extern u8 rtw_setrfintfs_cmd(_adapter *padapter, u8 mode); -+extern u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table); -+extern u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval); -+ -+extern u8 rtw_gettssi_cmd(_adapter *padapter, u8 offset,u8 *pval); -+extern u8 rtw_setfwdig_cmd(_adapter*padapter, u8 type); -+extern u8 rtw_setfwra_cmd(_adapter*padapter, u8 type); -+ -+extern u8 rtw_addbareq_cmd(_adapter*padapter, u8 tid, u8 *addr); -+// add for CONFIG_IEEE80211W, none 11w also can use -+extern u8 rtw_reset_securitypriv_cmd(_adapter*padapter); -+extern u8 rtw_free_assoc_resources_cmd(_adapter *padapter); -+extern u8 rtw_dynamic_chk_wk_cmd(_adapter *adapter); -+ -+u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue); -+ -+#ifdef CONFIG_ANTENNA_DIVERSITY -+extern u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue); -+#endif -+ -+extern u8 rtw_ps_cmd(_adapter*padapter); -+ -+ -+#ifdef CONFIG_AP_MODE -+u8 rtw_chk_hi_queue_cmd(_adapter*padapter); -+#endif -+ -+u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue); -+extern u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue); -+extern u8 rtw_led_blink_cmd(_adapter*padapter, PLED_871x pLed); -+extern u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no); -+extern u8 rtw_tdls_cmd(_adapter*padapter, u8 *addr, u8 option); -+ -+extern u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *c2h_evt); -+ -+u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf); -+ -+extern void rtw_survey_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_disassoc_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_joinbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_getbbrfreg_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd); -+ -+extern void rtw_setstaKey_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_setassocsta_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -+extern void rtw_getrttbl_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -+ -+ -+struct _cmd_callback { -+ u32 cmd_code; -+ void (*callback)(_adapter *padapter, struct cmd_obj *cmd); -+}; -+ -+enum rtw_h2c_cmd -+{ -+ GEN_CMD_CODE(_Read_MACREG) , /*0*/ -+ GEN_CMD_CODE(_Write_MACREG) , -+ GEN_CMD_CODE(_Read_BBREG) , -+ GEN_CMD_CODE(_Write_BBREG) , -+ GEN_CMD_CODE(_Read_RFREG) , -+ GEN_CMD_CODE(_Write_RFREG) , /*5*/ -+ GEN_CMD_CODE(_Read_EEPROM) , -+ GEN_CMD_CODE(_Write_EEPROM) , -+ GEN_CMD_CODE(_Read_EFUSE) , -+ GEN_CMD_CODE(_Write_EFUSE) , -+ -+ GEN_CMD_CODE(_Read_CAM) , /*10*/ -+ GEN_CMD_CODE(_Write_CAM) , -+ GEN_CMD_CODE(_setBCNITV), -+ GEN_CMD_CODE(_setMBIDCFG), -+ GEN_CMD_CODE(_JoinBss), /*14*/ -+ GEN_CMD_CODE(_DisConnect) , /*15*/ -+ GEN_CMD_CODE(_CreateBss) , -+ GEN_CMD_CODE(_SetOpMode) , -+ GEN_CMD_CODE(_SiteSurvey), /*18*/ -+ GEN_CMD_CODE(_SetAuth) , -+ -+ GEN_CMD_CODE(_SetKey) , /*20*/ -+ GEN_CMD_CODE(_SetStaKey) , -+ GEN_CMD_CODE(_SetAssocSta) , -+ GEN_CMD_CODE(_DelAssocSta) , -+ GEN_CMD_CODE(_SetStaPwrState) , -+ GEN_CMD_CODE(_SetBasicRate) , /*25*/ -+ GEN_CMD_CODE(_GetBasicRate) , -+ GEN_CMD_CODE(_SetDataRate) , -+ GEN_CMD_CODE(_GetDataRate) , -+ GEN_CMD_CODE(_SetPhyInfo) , -+ -+ GEN_CMD_CODE(_GetPhyInfo) , /*30*/ -+ GEN_CMD_CODE(_SetPhy) , -+ GEN_CMD_CODE(_GetPhy) , -+ GEN_CMD_CODE(_readRssi) , -+ GEN_CMD_CODE(_readGain) , -+ GEN_CMD_CODE(_SetAtim) , /*35*/ -+ GEN_CMD_CODE(_SetPwrMode) , -+ GEN_CMD_CODE(_JoinbssRpt), -+ GEN_CMD_CODE(_SetRaTable) , -+ GEN_CMD_CODE(_GetRaTable) , -+ -+ GEN_CMD_CODE(_GetCCXReport), /*40*/ -+ GEN_CMD_CODE(_GetDTMReport), -+ GEN_CMD_CODE(_GetTXRateStatistics), -+ GEN_CMD_CODE(_SetUsbSuspend), -+ GEN_CMD_CODE(_SetH2cLbk), -+ GEN_CMD_CODE(_AddBAReq) , /*45*/ -+ GEN_CMD_CODE(_SetChannel), /*46*/ -+ GEN_CMD_CODE(_SetTxPower), -+ GEN_CMD_CODE(_SwitchAntenna), -+ GEN_CMD_CODE(_SetCrystalCap), -+ GEN_CMD_CODE(_SetSingleCarrierTx), /*50*/ -+ -+ GEN_CMD_CODE(_SetSingleToneTx),/*51*/ -+ GEN_CMD_CODE(_SetCarrierSuppressionTx), -+ GEN_CMD_CODE(_SetContinuousTx), -+ GEN_CMD_CODE(_SwitchBandwidth), /*54*/ -+ GEN_CMD_CODE(_TX_Beacon), /*55*/ -+ -+ GEN_CMD_CODE(_Set_MLME_EVT), /*56*/ -+ GEN_CMD_CODE(_Set_Drv_Extra), /*57*/ -+ GEN_CMD_CODE(_Set_H2C_MSG), /*58*/ -+ -+ GEN_CMD_CODE(_SetChannelPlan), /*59*/ -+ GEN_CMD_CODE(_LedBlink), /*60*/ -+ -+ GEN_CMD_CODE(_SetChannelSwitch), /*61*/ -+ GEN_CMD_CODE(_TDLS), /*62*/ -+ -+ MAX_H2CCMD -+}; -+ -+#define _GetBBReg_CMD_ _Read_BBREG_CMD_ -+#define _SetBBReg_CMD_ _Write_BBREG_CMD_ -+#define _GetRFReg_CMD_ _Read_RFREG_CMD_ -+#define _SetRFReg_CMD_ _Write_RFREG_CMD_ -+ -+#ifdef _RTW_CMD_C_ -+struct _cmd_callback rtw_cmd_callback[] = -+{ -+ {GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/ -+ {GEN_CMD_CODE(_Write_MACREG), NULL}, -+ {GEN_CMD_CODE(_Read_BBREG), &rtw_getbbrfreg_cmdrsp_callback}, -+ {GEN_CMD_CODE(_Write_BBREG), NULL}, -+ {GEN_CMD_CODE(_Read_RFREG), &rtw_getbbrfreg_cmdrsp_callback}, -+ {GEN_CMD_CODE(_Write_RFREG), NULL}, /*5*/ -+ {GEN_CMD_CODE(_Read_EEPROM), NULL}, -+ {GEN_CMD_CODE(_Write_EEPROM), NULL}, -+ {GEN_CMD_CODE(_Read_EFUSE), NULL}, -+ {GEN_CMD_CODE(_Write_EFUSE), NULL}, -+ -+ {GEN_CMD_CODE(_Read_CAM), NULL}, /*10*/ -+ {GEN_CMD_CODE(_Write_CAM), NULL}, -+ {GEN_CMD_CODE(_setBCNITV), NULL}, -+ {GEN_CMD_CODE(_setMBIDCFG), NULL}, -+ {GEN_CMD_CODE(_JoinBss), &rtw_joinbss_cmd_callback}, /*14*/ -+ {GEN_CMD_CODE(_DisConnect), &rtw_disassoc_cmd_callback}, /*15*/ -+ {GEN_CMD_CODE(_CreateBss), &rtw_createbss_cmd_callback}, -+ {GEN_CMD_CODE(_SetOpMode), NULL}, -+ {GEN_CMD_CODE(_SiteSurvey), &rtw_survey_cmd_callback}, /*18*/ -+ {GEN_CMD_CODE(_SetAuth), NULL}, -+ -+ {GEN_CMD_CODE(_SetKey), NULL}, /*20*/ -+ {GEN_CMD_CODE(_SetStaKey), &rtw_setstaKey_cmdrsp_callback}, -+ {GEN_CMD_CODE(_SetAssocSta), &rtw_setassocsta_cmdrsp_callback}, -+ {GEN_CMD_CODE(_DelAssocSta), NULL}, -+ {GEN_CMD_CODE(_SetStaPwrState), NULL}, -+ {GEN_CMD_CODE(_SetBasicRate), NULL}, /*25*/ -+ {GEN_CMD_CODE(_GetBasicRate), NULL}, -+ {GEN_CMD_CODE(_SetDataRate), NULL}, -+ {GEN_CMD_CODE(_GetDataRate), NULL}, -+ {GEN_CMD_CODE(_SetPhyInfo), NULL}, -+ -+ {GEN_CMD_CODE(_GetPhyInfo), NULL}, /*30*/ -+ {GEN_CMD_CODE(_SetPhy), NULL}, -+ {GEN_CMD_CODE(_GetPhy), NULL}, -+ {GEN_CMD_CODE(_readRssi), NULL}, -+ {GEN_CMD_CODE(_readGain), NULL}, -+ {GEN_CMD_CODE(_SetAtim), NULL}, /*35*/ -+ {GEN_CMD_CODE(_SetPwrMode), NULL}, -+ {GEN_CMD_CODE(_JoinbssRpt), NULL}, -+ {GEN_CMD_CODE(_SetRaTable), NULL}, -+ {GEN_CMD_CODE(_GetRaTable) , NULL}, -+ -+ {GEN_CMD_CODE(_GetCCXReport), NULL}, /*40*/ -+ {GEN_CMD_CODE(_GetDTMReport), NULL}, -+ {GEN_CMD_CODE(_GetTXRateStatistics), NULL}, -+ {GEN_CMD_CODE(_SetUsbSuspend), NULL}, -+ {GEN_CMD_CODE(_SetH2cLbk), NULL}, -+ {GEN_CMD_CODE(_AddBAReq), NULL}, /*45*/ -+ {GEN_CMD_CODE(_SetChannel), NULL}, /*46*/ -+ {GEN_CMD_CODE(_SetTxPower), NULL}, -+ {GEN_CMD_CODE(_SwitchAntenna), NULL}, -+ {GEN_CMD_CODE(_SetCrystalCap), NULL}, -+ {GEN_CMD_CODE(_SetSingleCarrierTx), NULL}, /*50*/ -+ -+ {GEN_CMD_CODE(_SetSingleToneTx), NULL}, /*51*/ -+ {GEN_CMD_CODE(_SetCarrierSuppressionTx), NULL}, -+ {GEN_CMD_CODE(_SetContinuousTx), NULL}, -+ {GEN_CMD_CODE(_SwitchBandwidth), NULL}, /*54*/ -+ {GEN_CMD_CODE(_TX_Beacon), NULL},/*55*/ -+ -+ {GEN_CMD_CODE(_Set_MLME_EVT), NULL},/*56*/ -+ {GEN_CMD_CODE(_Set_Drv_Extra), NULL},/*57*/ -+ {GEN_CMD_CODE(_Set_H2C_MSG), NULL},/*58*/ -+ {GEN_CMD_CODE(_SetChannelPlan), NULL},/*59*/ -+ {GEN_CMD_CODE(_LedBlink), NULL},/*60*/ -+ -+ {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*61*/ -+ {GEN_CMD_CODE(_TDLS), NULL},/*62*/ -+}; -+#endif -+ -+#endif // _CMD_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h -@@ -0,0 +1,538 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_DEBUG_H__ -+#define __RTW_DEBUG_H__ -+ -+#include -+#include -+#include -+ -+ -+#define _no_debug_ 0 -+#define _drv_emerg_ 1 -+#define _drv_alert_ 2 -+#define _drv_crit_ 3 -+#define _drv_err_ 4 -+#define _drv_warning_ 5 -+#define _drv_notice_ 6 -+#define _drv_info_ 7 -+#define _drv_dump_ 8 -+#define _drv_debug_ 9 -+#define _drv_always_ _drv_emerg_ -+ -+#define _module_rtl871x_xmit_c_ BIT(0) -+#define _module_xmit_osdep_c_ BIT(1) -+#define _module_rtl871x_recv_c_ BIT(2) -+#define _module_recv_osdep_c_ BIT(3) -+#define _module_rtl871x_mlme_c_ BIT(4) -+#define _module_mlme_osdep_c_ BIT(5) -+#define _module_rtl871x_sta_mgt_c_ BIT(6) -+#define _module_rtl871x_cmd_c_ BIT(7) -+#define _module_cmd_osdep_c_ BIT(8) -+#define _module_rtl871x_io_c_ BIT(9) -+#define _module_io_osdep_c_ BIT(10) -+#define _module_os_intfs_c_ BIT(11) -+#define _module_rtl871x_security_c_ BIT(12) -+#define _module_rtl871x_eeprom_c_ BIT(13) -+#define _module_hal_init_c_ BIT(14) -+#define _module_hci_hal_init_c_ BIT(15) -+#define _module_rtl871x_ioctl_c_ BIT(16) -+#define _module_rtl871x_ioctl_set_c_ BIT(17) -+#define _module_rtl871x_ioctl_query_c_ BIT(18) -+#define _module_rtl871x_pwrctrl_c_ BIT(19) -+#define _module_hci_intfs_c_ BIT(20) -+#define _module_hci_ops_c_ BIT(21) -+#define _module_osdep_service_c_ BIT(22) -+#define _module_mp_ BIT(23) -+#define _module_hci_ops_os_c_ BIT(24) -+#define _module_rtl871x_ioctl_os_c BIT(25) -+#define _module_rtl8712_cmd_c_ BIT(26) -+//#define _module_efuse_ BIT(27) -+#define _module_rtl8192c_xmit_c_ BIT(28) -+#define _module_hal_xmit_c_ BIT(28) -+#define _module_efuse_ BIT(29) -+#define _module_rtl8712_recv_c_ BIT(30) -+#define _module_rtl8712_led_c_ BIT(31) -+ -+#undef _MODULE_DEFINE_ -+ -+#if defined _RTW_XMIT_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_xmit_c_ -+#elif defined _XMIT_OSDEP_C_ -+ #define _MODULE_DEFINE_ _module_xmit_osdep_c_ -+#elif defined _RTW_RECV_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_recv_c_ -+#elif defined _RECV_OSDEP_C_ -+ #define _MODULE_DEFINE_ _module_recv_osdep_c_ -+#elif defined _RTW_MLME_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_mlme_c_ -+#elif defined _MLME_OSDEP_C_ -+ #define _MODULE_DEFINE_ _module_mlme_osdep_c_ -+#elif defined _RTW_MLME_EXT_C_ -+ #define _MODULE_DEFINE_ 1 -+#elif defined _RTW_STA_MGT_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_sta_mgt_c_ -+#elif defined _RTW_CMD_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_cmd_c_ -+#elif defined _CMD_OSDEP_C_ -+ #define _MODULE_DEFINE_ _module_cmd_osdep_c_ -+#elif defined _RTW_IO_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_io_c_ -+#elif defined _IO_OSDEP_C_ -+ #define _MODULE_DEFINE_ _module_io_osdep_c_ -+#elif defined _OS_INTFS_C_ -+ #define _MODULE_DEFINE_ _module_os_intfs_c_ -+#elif defined _RTW_SECURITY_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_security_c_ -+#elif defined _RTW_EEPROM_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_eeprom_c_ -+#elif defined _HAL_INTF_C_ -+ #define _MODULE_DEFINE_ _module_hal_init_c_ -+#elif defined _HCI_HAL_INIT_C_ -+ #define _MODULE_DEFINE_ _module_hci_hal_init_c_ -+#elif defined _RTL871X_IOCTL_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_ioctl_c_ -+#elif defined _RTL871X_IOCTL_SET_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_ioctl_set_c_ -+#elif defined _RTL871X_IOCTL_QUERY_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_ioctl_query_c_ -+#elif defined _RTL871X_PWRCTRL_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_pwrctrl_c_ -+#elif defined _RTW_PWRCTRL_C_ -+ #define _MODULE_DEFINE_ 1 -+#elif defined _HCI_INTF_C_ -+ #define _MODULE_DEFINE_ _module_hci_intfs_c_ -+#elif defined _HCI_OPS_C_ -+ #define _MODULE_DEFINE_ _module_hci_ops_c_ -+#elif defined _SDIO_OPS_C_ -+ #define _MODULE_DEFINE_ 1 -+#elif defined _OSDEP_HCI_INTF_C_ -+ #define _MODULE_DEFINE_ _module_hci_intfs_c_ -+#elif defined _OSDEP_SERVICE_C_ -+ #define _MODULE_DEFINE_ _module_osdep_service_c_ -+#elif defined _HCI_OPS_OS_C_ -+ #define _MODULE_DEFINE_ _module_hci_ops_os_c_ -+#elif defined _RTL871X_IOCTL_LINUX_C_ -+ #define _MODULE_DEFINE_ _module_rtl871x_ioctl_os_c -+#elif defined _RTL8712_CMD_C_ -+ #define _MODULE_DEFINE_ _module_rtl8712_cmd_c_ -+#elif defined _RTL8192C_XMIT_C_ -+ #define _MODULE_DEFINE_ 1 -+#elif defined _RTL8723AS_XMIT_C_ -+ #define _MODULE_DEFINE_ 1 -+#elif defined _RTL8712_RECV_C_ -+ #define _MODULE_DEFINE_ _module_rtl8712_recv_c_ -+#elif defined _RTL8192CU_RECV_C_ -+ #define _MODULE_DEFINE_ _module_rtl8712_recv_c_ -+#elif defined _RTL871X_MLME_EXT_C_ -+ #define _MODULE_DEFINE_ _module_mlme_osdep_c_ -+#elif defined _RTW_MP_C_ -+ #define _MODULE_DEFINE_ _module_mp_ -+#elif defined _RTW_MP_IOCTL_C_ -+ #define _MODULE_DEFINE_ _module_mp_ -+#elif defined _RTW_EFUSE_C_ -+ #define _MODULE_DEFINE_ _module_efuse_ -+#endif -+ -+#ifdef PLATFORM_OS_CE -+extern void rtl871x_cedbg(const char *fmt, ...); -+#endif -+ -+#define RT_TRACE(_Comp, _Level, Fmt) do{}while(0) -+#define _func_enter_ do{}while(0) -+#define _func_exit_ do{}while(0) -+#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) do{}while(0) -+ -+#undef _dbgdump -+ -+#ifdef CONFIG_DEBUG_RTL871X -+ -+#ifndef _RTL871X_DEBUG_C_ -+ extern u32 GlobalDebugLevel; -+ extern u64 GlobalDebugComponents; -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+ #ifdef PLATFORM_OS_XP -+ -+ #define _dbgdump DbgPrint -+ -+ #elif defined PLATFORM_OS_CE -+ -+ #define _dbgdump rtl871x_cedbg -+ -+ #endif -+ -+#elif defined PLATFORM_LINUX -+ -+ #define _dbgdump printk -+ -+#elif defined PLATFORM_FREEBSD -+ -+ #define _dbgdump printf -+ -+#endif -+ -+#endif /* CONFIG_DEBUG_RTL871X */ -+ -+ -+#if defined (_dbgdump) && defined (_MODULE_DEFINE_) -+ -+ #undef RT_TRACE -+ #define RT_TRACE(_Comp, _Level, Fmt)\ -+ do {\ -+ if((_Comp & GlobalDebugComponents) && (_Level <= GlobalDebugLevel)) {\ -+ _dbgdump("%s [0x%08x,%d]", RTL871X_MODULE_NAME, (unsigned int)_Comp, _Level);\ -+ _dbgdump Fmt;\ -+ }\ -+ }while(0) -+ -+#endif -+ -+ -+#if defined (_dbgdump) -+ -+ #undef _func_enter_ -+ #define _func_enter_ \ -+ do { \ -+ if (GlobalDebugLevel >= _drv_debug_) \ -+ { \ -+ _dbgdump("\n %s : %s enters at %d\n", RTL871X_MODULE_NAME, __FUNCTION__, __LINE__);\ -+ } \ -+ } while(0) -+ -+ #undef _func_exit_ -+ #define _func_exit_ \ -+ do { \ -+ if (GlobalDebugLevel >= _drv_debug_) \ -+ { \ -+ _dbgdump("\n %s : %s exits at %d\n", RTL871X_MODULE_NAME, __FUNCTION__, __LINE__); \ -+ } \ -+ } while(0) -+ -+ #undef RT_PRINT_DATA -+ #define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \ -+ if(((_Comp) & GlobalDebugComponents) && (_Level <= GlobalDebugLevel)) \ -+ { \ -+ int __i; \ -+ u8 *ptr = (u8 *)_HexData; \ -+ _dbgdump("Rtl871x: "); \ -+ _dbgdump(_TitleString); \ -+ for( __i=0; __i<(int)_HexDataLen; __i++ ) \ -+ { \ -+ _dbgdump("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" "); \ -+ if (((__i + 1) % 16) == 0) _dbgdump("\n"); \ -+ } \ -+ _dbgdump("\n"); \ -+ } -+#endif -+ -+ -+#ifdef CONFIG_DEBUG_RTL819X -+ -+#undef _dbgdump -+ -+#ifdef PLATFORM_WINDOWS -+ -+ #ifdef PLATFORM_OS_XP -+ -+ #define _dbgdump DbgPrint -+ -+ #elif defined PLATFORM_OS_CE -+ -+ #define _dbgdump rtl871x_cedbg -+ -+ #endif -+ -+#elif defined PLATFORM_LINUX -+ -+ #define _dbgdump printk -+ -+#elif defined PLATFORM_FREEBSD -+ -+ #define _dbgdump printf -+ -+#endif -+ -+#endif /* CONFIG_DEBUG_RTL819X */ -+ -+ -+#ifdef PLATFORM_WINDOWS -+ #define DBG_871X do {} while(0) -+ #define MSG_8192C do {} while(0) -+ #define DBG_8192C do {} while(0) -+ #define WRN_8192C do {} while(0) -+ #define ERR_8192C do {} while(0) -+#endif -+ -+#ifdef PLATFORM_LINUX -+ #define DBG_871X(x, ...) do {} while(0) -+ #define MSG_8192C(x, ...) do {} while(0) -+ #define DBG_8192C(x,...) do {} while(0) -+ #define WRN_8192C(x,...) do {} while(0) -+ #define ERR_8192C(x,...) do {} while(0) -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+ #define _dbgdump printf -+ #define DBG_871X(x, ...) do {} while(0) -+ #define MSG_8192C(x, ...) do {} while(0) -+ #define DBG_8192C(x,...) do {} while(0) -+ #define WRN_8192C(x,...) do {} while(0) -+ #define ERR_8192C(x,...) do {} while(0) -+#endif -+ -+extern u32 GlobalDebugLevel; -+#define LOG_LEVEL(level, ...)\ -+ do {\ -+ if(level <= GlobalDebugLevel) {\ -+ printk(__VA_ARGS__);\ -+ }\ -+ }while(0) -+ -+#define DBG_871X_LEVEL LOG_LEVEL -+ -+#if defined (_dbgdump) -+ #undef DBG_871X -+// #define DBG_871X _dbgdump -+ #define DBG_871X(...) LOG_LEVEL(_drv_debug_ , __VA_ARGS__) -+ -+ #undef MSG_8192C -+// #define MSG_8192C _dbgdump -+ #define MSG_8192C(...) LOG_LEVEL(_drv_info_ , __VA_ARGS__) -+ -+ #undef DBG_8192C -+// #define DBG_8192C _dbgdump -+ #define DBG_8192C(...) LOG_LEVEL(_drv_debug_ , __VA_ARGS__) -+ -+ -+ #undef WRN_8192C -+ #define WRN_8192C _dbgdump -+ -+ #undef ERR_8192C -+ #define ERR_8192C _dbgdump -+#endif -+ -+ -+#ifdef CONFIG_PROC_DEBUG -+ -+ int proc_get_drv_version(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_log_level(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_log_level(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+#ifdef DBG_MEM_ALLOC -+ int proc_get_mstat(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+#endif /* DBG_MEM_ALLOC */ -+ -+ int proc_get_write_reg(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_write_reg(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ int proc_get_read_reg(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_read_reg(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ -+ int proc_get_fwstate(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_sec_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_mlmext_state(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_qos_option(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_ht_option(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rf_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_ap_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_adapter_state(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_trx_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_mac_reg_dump1(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_mac_reg_dump2(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_mac_reg_dump3(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_bb_reg_dump1(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_bb_reg_dump2(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_bb_reg_dump3(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rf_reg_dump1(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rf_reg_dump2(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rf_reg_dump3(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rf_reg_dump4(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+#ifdef CONFIG_AP_MODE -+ -+ int proc_get_all_sta_info(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+ int proc_get_malloc_cnt(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+#endif -+ -+#ifdef CONFIG_FIND_BEST_CHANNEL -+ int proc_get_best_channel(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ int proc_set_best_channel(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+#endif -+ -+ int proc_get_rx_signal(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_rx_signal(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ int proc_get_ht_enable(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_ht_enable(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ int proc_get_cbw40_enable(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_cbw40_enable(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ int proc_get_ampdu_enable(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_ampdu_enable(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ int proc_get_two_path_rssi(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rx_stbc(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_rx_stbc(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+ -+ int proc_get_vid(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_pid(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_get_rssi_disp(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+ -+ int proc_set_rssi_disp(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, void *data); -+int proc_set_sreset(struct file *file, const char *buffer, unsigned long count, void *data); -+#endif /* DBG_CONFIG_ERROR_DETECT */ -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+int proc_get_dm_adaptivity(char *page, char **start, -+ off_t offset, int count, -+ int *eof, void *data); -+int proc_set_dm_adaptivity(struct file *file, const char *buffer, -+ unsigned long count, void *data); -+#endif /* CONFIG_DM_ADAPTIVITY */ -+ -+#endif //CONFIG_PROC_DEBUG -+ -+#endif //__RTW_DEBUG_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h -@@ -0,0 +1,152 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_EEPROM_H__ -+#define __RTW_EEPROM_H__ -+ -+#include -+#include -+#include -+ -+#define RTL8712_EEPROM_ID 0x8712 -+#define EEPROM_MAX_SIZE 256 -+#define CLOCK_RATE 50 //100us -+ -+//- EEPROM opcodes -+#define EEPROM_READ_OPCODE 06 -+#define EEPROM_WRITE_OPCODE 05 -+#define EEPROM_ERASE_OPCODE 07 -+#define EEPROM_EWEN_OPCODE 19 // Erase/write enable -+#define EEPROM_EWDS_OPCODE 16 // Erase/write disable -+ -+//Country codes -+#define USA 0x555320 -+#define EUROPE 0x1 //temp, should be provided later -+#define JAPAN 0x2 //temp, should be provided later -+ -+#ifdef CONFIG_SDIO_HCI -+#define eeprom_cis0_sz 17 -+#define eeprom_cis1_sz 50 -+#endif -+ -+#define EEPROM_CID_DEFAULT 0x0 -+#define EEPROM_CID_ALPHA 0x1 -+#define EEPROM_CID_Senao 0x3 -+#define EEPROM_CID_NetCore 0x5 -+#define EEPROM_CID_CAMEO 0X8 -+#define EEPROM_CID_SITECOM 0x9 -+#define EEPROM_CID_COREGA 0xB -+#define EEPROM_CID_EDIMAX_BELKIN 0xC -+#define EEPROM_CID_SERCOMM_BELKIN 0xE -+#define EEPROM_CID_CAMEO1 0xF -+#define EEPROM_CID_WNC_COREGA 0x12 -+#define EEPROM_CID_CLEVO 0x13 -+#define EEPROM_CID_WHQL 0xFE // added by chiyoko for dtm, 20090108 -+ -+// -+// Customer ID, note that: -+// This variable is initiailzed through EEPROM or registry, -+// however, its definition may be different with that in EEPROM for -+// EEPROM size consideration. So, we have to perform proper translation between them. -+// Besides, CustomerID of registry has precedence of that of EEPROM. -+// defined below. 060703, by rcnjko. -+// -+typedef enum _RT_CUSTOMER_ID -+{ -+ RT_CID_DEFAULT = 0, -+ RT_CID_8187_ALPHA0 = 1, -+ RT_CID_8187_SERCOMM_PS = 2, -+ RT_CID_8187_HW_LED = 3, -+ RT_CID_8187_NETGEAR = 4, -+ RT_CID_WHQL = 5, -+ RT_CID_819x_CAMEO = 6, -+ RT_CID_819x_RUNTOP = 7, -+ RT_CID_819x_Senao = 8, -+ RT_CID_TOSHIBA = 9, // Merge by Jacken, 2008/01/31. -+ RT_CID_819x_Netcore = 10, -+ RT_CID_Nettronix = 11, -+ RT_CID_DLINK = 12, -+ RT_CID_PRONET = 13, -+ RT_CID_COREGA = 14, -+ RT_CID_CHINA_MOBILE = 15, -+ RT_CID_819x_ALPHA = 16, -+ RT_CID_819x_Sitecom = 17, -+ RT_CID_CCX = 18, // It's set under CCX logo test and isn't demanded for CCX functions, but for test behavior like retry limit and tx report. By Bruce, 2009-02-17. -+ RT_CID_819x_Lenovo = 19, -+ RT_CID_819x_QMI = 20, -+ RT_CID_819x_Edimax_Belkin = 21, -+ RT_CID_819x_Sercomm_Belkin = 22, -+ RT_CID_819x_CAMEO1 = 23, -+ RT_CID_819x_MSI = 24, -+ RT_CID_819x_Acer = 25, -+ RT_CID_819x_AzWave_ASUS = 26, -+ RT_CID_819x_AzWave = 27, // For AzWave in PCIe, The ID is AzWave use and not only Asus -+ RT_CID_819x_HP = 28, -+ RT_CID_819x_WNC_COREGA = 29, -+ RT_CID_819x_Arcadyan_Belkin = 30, -+ RT_CID_819x_SAMSUNG = 31, -+ RT_CID_819x_CLEVO = 32, -+ RT_CID_819x_DELL = 33, -+ RT_CID_819x_PRONETS = 34, -+ RT_CID_819x_Edimax_ASUS = 35, -+ RT_CID_819x_CAMEO_NETGEAR = 36, -+}RT_CUSTOMER_ID, *PRT_CUSTOMER_ID; -+ -+struct eeprom_priv -+{ -+ u8 bautoload_fail_flag; -+ //u8 bempty; -+ //u8 sys_config; -+ u8 mac_addr[6]; //PermanentAddress -+ //u8 config0; -+ u16 channel_plan; -+ //u8 country_string[3]; -+ //u8 tx_power_b[15]; -+ //u8 tx_power_g[15]; -+ //u8 tx_power_a[201]; -+ -+ u8 EepromOrEfuse; -+ -+ u8 efuse_eeprom_data[EEPROM_MAX_SIZE]; -+ -+#ifdef CONFIG_SDIO_HCI -+ u8 sdio_setting; -+ u32 ocr; -+ u8 cis0[eeprom_cis0_sz]; -+ u8 cis1[eeprom_cis1_sz]; -+#endif -+}; -+ -+ -+extern void eeprom_write16(_adapter *padapter, u16 reg, u16 data); -+extern u16 eeprom_read16(_adapter *padapter, u16 reg); -+extern void read_eeprom_content(_adapter *padapter); -+extern void eeprom_read_sz(_adapter * padapter, u16 reg,u8* data, u32 sz); -+ -+extern void read_eeprom_content_by_attrib(_adapter * padapter ); -+ -+#ifdef PLATFORM_LINUX -+#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -+extern int isAdaptorInfoFileValid(void); -+extern int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv); -+extern int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv); -+#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE -+#endif //PLATFORM_LINUX -+ -+#endif //__RTL871X_EEPROM_H__ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h -@@ -0,0 +1,124 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_EFUSE_H__ -+#define __RTW_EFUSE_H__ -+ -+#include -+#include -+ -+#define EFUSE_ERROE_HANDLE 1 -+ -+#define PG_STATE_HEADER 0x01 -+#define PG_STATE_WORD_0 0x02 -+#define PG_STATE_WORD_1 0x04 -+#define PG_STATE_WORD_2 0x08 -+#define PG_STATE_WORD_3 0x10 -+#define PG_STATE_DATA 0x20 -+ -+#define PG_SWBYTE_H 0x01 -+#define PG_SWBYTE_L 0x02 -+ -+#define PGPKT_DATA_SIZE 8 -+ -+#define EFUSE_WIFI 0 -+#define EFUSE_BT 1 -+ -+enum _EFUSE_DEF_TYPE { -+ TYPE_EFUSE_MAX_SECTION = 0, -+ TYPE_EFUSE_REAL_CONTENT_LEN = 1, -+ TYPE_AVAILABLE_EFUSE_BYTES_BANK = 2, -+ TYPE_AVAILABLE_EFUSE_BYTES_TOTAL = 3, -+ TYPE_EFUSE_MAP_LEN = 4, -+ TYPE_EFUSE_PROTECT_BYTES_BANK = 5, -+}; -+ -+#define EFUSE_MAX_MAP_LEN 256 -+#define EFUSE_MAX_HW_SIZE 512 -+#define EFUSE_MAX_SECTION_BASE 16 -+ -+#define EXT_HEADER(header) ((header & 0x1F ) == 0x0F) -+#define ALL_WORDS_DISABLED(wde) ((wde & 0x0F) == 0x0F) -+#define GET_HDR_OFFSET_2_0(header) ( (header & 0xE0) >> 5) -+ -+#define EFUSE_REPEAT_THRESHOLD_ 3 -+ -+//============================================= -+// The following is for BT Efuse definition -+//============================================= -+#define EFUSE_BT_MAX_MAP_LEN 1024 -+#define EFUSE_MAX_BANK 4 -+#define EFUSE_MAX_BT_BANK (EFUSE_MAX_BANK-1) -+//============================================= -+/*--------------------------Define Parameters-------------------------------*/ -+#define EFUSE_MAX_WORD_UNIT 4 -+ -+/*------------------------------Define structure----------------------------*/ -+typedef struct PG_PKT_STRUCT_A{ -+ u8 offset; -+ u8 word_en; -+ u8 data[8]; -+ u8 word_cnts; -+}PGPKT_STRUCT,*PPGPKT_STRUCT; -+/*------------------------------Define structure----------------------------*/ -+ -+ -+/*------------------------Export global variable----------------------------*/ -+extern u8 fakeEfuseBank; -+extern u32 fakeEfuseUsedBytes; -+extern u8 fakeEfuseContent[]; -+extern u8 fakeEfuseInitMap[]; -+extern u8 fakeEfuseModifiedMap[]; -+ -+extern u32 BTEfuseUsedBytes; -+extern u8 BTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE]; -+extern u8 BTEfuseInitMap[]; -+extern u8 BTEfuseModifiedMap[]; -+ -+extern u32 fakeBTEfuseUsedBytes; -+extern u8 fakeBTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE]; -+extern u8 fakeBTEfuseInitMap[]; -+extern u8 fakeBTEfuseModifiedMap[]; -+/*------------------------Export global variable----------------------------*/ -+ -+u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size); -+u16 efuse_GetMaxSize(PADAPTER padapter); -+u8 rtw_efuse_access(PADAPTER padapter, u8 bRead, u16 start_addr, u16 cnts, u8 *data); -+u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); -+u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); -+ -+u16 Efuse_GetCurrentSize(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); -+u8 Efuse_CalculateWordCnts(u8 word_en); -+void ReadEFuseByte(PADAPTER Adapter, u16 _offset, u8 *pbuf, BOOLEAN bPseudoTest) ; -+void EFUSE_GetEfuseDefinition(PADAPTER pAdapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); -+u8 efuse_OneByteRead(PADAPTER pAdapter, u16 addr, u8 *data, BOOLEAN bPseudoTest); -+u8 efuse_OneByteWrite(PADAPTER pAdapter, u16 addr, u8 data, BOOLEAN bPseudoTest); -+ -+void Efuse_PowerSwitch(PADAPTER pAdapter,u8 bWrite,u8 PwrState); -+int Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); -+int Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); -+void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata); -+u8 Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); -+ -+u8 EFUSE_Read1Byte(PADAPTER pAdapter, u16 Address); -+void EFUSE_ShadowMapUpdate(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); -+void EFUSE_ShadowRead(PADAPTER pAdapter, u8 Type, u16 Offset, u32 *Value); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h -@@ -0,0 +1,154 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_EVENT_H_ -+#define _RTW_EVENT_H_ -+#include -+#include -+ -+#ifndef CONFIG_RTL8711FW -+#ifdef PLATFORM_LINUX -+#include -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+#include -+#else -+#include -+#endif -+#include -+#endif -+#else -+#include -+#endif//CONFIG_RTL8711FW -+ -+ -+ -+#ifdef CONFIG_H2CLBK -+#include -+#endif -+ -+/* -+Used to report a bss has been scanned -+ -+*/ -+struct survey_event { -+ WLAN_BSSID_EX bss; -+}; -+ -+/* -+Used to report that the requested site survey has been done. -+ -+bss_cnt indicates the number of bss that has been reported. -+ -+ -+*/ -+struct surveydone_event { -+ unsigned int bss_cnt; -+ -+}; -+ -+/* -+Used to report the link result of joinning the given bss -+ -+ -+join_res: -+-1: authentication fail -+-2: association fail -+> 0: TID -+ -+*/ -+struct joinbss_event { -+ struct wlan_network network; -+}; -+ -+/* -+Used to report a given STA has joinned the created BSS. -+It is used in AP/Ad-HoC(M) mode. -+ -+ -+*/ -+struct stassoc_event { -+ unsigned char macaddr[6]; -+ unsigned char rsvd[2]; -+ int cam_id; -+ -+}; -+ -+struct stadel_event { -+ unsigned char macaddr[6]; -+ unsigned char rsvd[2]; //for reason -+ int mac_id; -+}; -+ -+struct addba_event -+{ -+ unsigned int tid; -+}; -+ -+ -+#ifdef CONFIG_H2CLBK -+struct c2hlbk_event{ -+ unsigned char mac[6]; -+ unsigned short s0; -+ unsigned short s1; -+ unsigned int w0; -+ unsigned char b0; -+ unsigned short s2; -+ unsigned char b1; -+ unsigned int w1; -+}; -+#endif//CONFIG_H2CLBK -+ -+#define GEN_EVT_CODE(event) event ## _EVT_ -+ -+ -+ -+struct fwevent { -+ u32 parmsize; -+ void (*event_callback)(_adapter *dev, u8 *pbuf); -+}; -+ -+ -+#define C2HEVENT_SZ 32 -+ -+struct event_node{ -+ unsigned char *node; -+ unsigned char evt_code; -+ unsigned short evt_sz; -+ volatile int *caller_ff_tail; -+ int caller_ff_sz; -+}; -+ -+struct c2hevent_queue { -+ volatile int head; -+ volatile int tail; -+ struct event_node nodes[C2HEVENT_SZ]; -+ unsigned char seq; -+}; -+ -+#define NETWORK_QUEUE_SZ 4 -+ -+struct network_queue { -+ volatile int head; -+ volatile int tail; -+ WLAN_BSSID_EX networks[NETWORK_QUEUE_SZ]; -+}; -+ -+ -+#endif // _WLANEVENT_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h -@@ -0,0 +1,50 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_HT_H_ -+#define _RTW_HT_H_ -+ -+#include -+#include -+#include "wifi.h" -+ -+struct ht_priv -+{ -+ u32 ht_option; -+ u32 ampdu_enable;//for enable Tx A-MPDU -+ //u8 baddbareq_issued[16]; -+ u32 tx_amsdu_enable;//for enable Tx A-MSDU -+ u32 tx_amdsu_maxlen; // 1: 8k, 0:4k ; default:8k, for tx -+ u32 rx_ampdu_maxlen; //for rx reordering ctrl win_sz, updated when join_callback. -+ -+ u8 bwmode;// -+ u8 ch_offset;//PRIME_CHNL_OFFSET -+ u8 sgi;//short GI -+ -+ //for processing Tx A-MPDU -+ u8 agg_enable_bitmap; -+ //u8 ADDBA_retry_count; -+ u8 candidate_tid_bitmap; -+ -+ struct rtw_ieee80211_ht_cap ht_cap; -+ -+}; -+ -+#endif //_RTL871X_HT_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h -@@ -0,0 +1,504 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#ifndef _RTW_IO_H_ -+#define _RTW_IO_H_ -+ -+#include -+#include -+#include -+ -+#ifdef PLATFORM_LINUX -+#include -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+#include -+#else -+#include -+#endif -+#include -+//#include -+#include -+#include -+ -+#ifdef CONFIG_USB_HCI -+#include -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) -+#include -+#else -+#include -+#endif -+#endif //CONFIG_USB_HCI -+ -+#endif //PLATFORM_LINUX -+ -+ -+#define NUM_IOREQ 8 -+ -+#ifdef PLATFORM_WINDOWS -+#define MAX_PROT_SZ 64 -+#endif -+#ifdef PLATFORM_LINUX -+#define MAX_PROT_SZ (64-16) -+#endif -+ -+#define _IOREADY 0 -+#define _IO_WAIT_COMPLETE 1 -+#define _IO_WAIT_RSP 2 -+ -+// IO COMMAND TYPE -+#define _IOSZ_MASK_ (0x7F) -+#define _IO_WRITE_ BIT(7) -+#define _IO_FIXED_ BIT(8) -+#define _IO_BURST_ BIT(9) -+#define _IO_BYTE_ BIT(10) -+#define _IO_HW_ BIT(11) -+#define _IO_WORD_ BIT(12) -+#define _IO_SYNC_ BIT(13) -+#define _IO_CMDMASK_ (0x1F80) -+ -+ -+/* -+ For prompt mode accessing, caller shall free io_req -+ Otherwise, io_handler will free io_req -+*/ -+ -+ -+ -+// IO STATUS TYPE -+#define _IO_ERR_ BIT(2) -+#define _IO_SUCCESS_ BIT(1) -+#define _IO_DONE_ BIT(0) -+ -+ -+#define IO_RD32 (_IO_SYNC_ | _IO_WORD_) -+#define IO_RD16 (_IO_SYNC_ | _IO_HW_) -+#define IO_RD8 (_IO_SYNC_ | _IO_BYTE_) -+ -+#define IO_RD32_ASYNC (_IO_WORD_) -+#define IO_RD16_ASYNC (_IO_HW_) -+#define IO_RD8_ASYNC (_IO_BYTE_) -+ -+#define IO_WR32 (_IO_WRITE_ | _IO_SYNC_ | _IO_WORD_) -+#define IO_WR16 (_IO_WRITE_ | _IO_SYNC_ | _IO_HW_) -+#define IO_WR8 (_IO_WRITE_ | _IO_SYNC_ | _IO_BYTE_) -+ -+#define IO_WR32_ASYNC (_IO_WRITE_ | _IO_WORD_) -+#define IO_WR16_ASYNC (_IO_WRITE_ | _IO_HW_) -+#define IO_WR8_ASYNC (_IO_WRITE_ | _IO_BYTE_) -+ -+/* -+ -+ Only Sync. burst accessing is provided. -+ -+*/ -+ -+#define IO_WR_BURST(x) (_IO_WRITE_ | _IO_SYNC_ | _IO_BURST_ | ( (x) & _IOSZ_MASK_)) -+#define IO_RD_BURST(x) (_IO_SYNC_ | _IO_BURST_ | ( (x) & _IOSZ_MASK_)) -+ -+ -+ -+//below is for the intf_option bit defition... -+ -+#define _INTF_ASYNC_ BIT(0) //support async io -+ -+struct intf_priv; -+struct intf_hdl; -+struct io_queue; -+ -+struct _io_ops -+{ -+ u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr); -+ u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr); -+ u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr); -+ -+ int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val); -+ int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val); -+ int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val); -+ int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata); -+ -+ int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val); -+ int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val); -+ int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val); -+ -+ void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ -+ void (*_sync_irp_protocol_rw)(struct io_queue *pio_q); -+ -+ u32 (*_read_interrupt)(struct intf_hdl *pintfhdl, u32 addr); -+ -+ u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); -+ -+ u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem); -+ -+ void (*_read_port_cancel)(struct intf_hdl *pintfhdl); -+ void (*_write_port_cancel)(struct intf_hdl *pintfhdl); -+ -+}; -+ -+struct io_req { -+ _list list; -+ u32 addr; -+ volatile u32 val; -+ u32 command; -+ u32 status; -+ u8 *pbuf; -+ _sema sema; -+ -+#ifdef PLATFORM_OS_CE -+#ifdef CONFIG_USB_HCI -+ // URB handler for rtw_write_mem -+ USB_TRANSFER usb_transfer_write_mem; -+#endif -+#endif -+ -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt); -+ u8 *cnxt; -+ -+#ifdef PLATFORM_OS_XP -+ PMDL pmdl; -+ PIRP pirp; -+ -+#ifdef CONFIG_SDIO_HCI -+ PSDBUS_REQUEST_PACKET sdrp; -+#endif -+ -+#endif -+ -+ -+}; -+ -+struct intf_hdl { -+ -+/* -+ u32 intf_option; -+ u32 bus_status; -+ u32 do_flush; -+ u8 *adapter; -+ u8 *intf_dev; -+ struct intf_priv *pintfpriv; -+ u8 cnt; -+ void (*intf_hdl_init)(u8 *priv); -+ void (*intf_hdl_unload)(u8 *priv); -+ void (*intf_hdl_open)(u8 *priv); -+ void (*intf_hdl_close)(u8 *priv); -+ struct _io_ops io_ops; -+ //u8 intf_status;//moved to struct intf_priv -+ u16 len; -+ u16 done_len; -+*/ -+ _adapter *padapter; -+ struct dvobj_priv *pintf_dev;// pointer to &(padapter->dvobjpriv); -+ -+ struct _io_ops io_ops; -+ -+}; -+ -+struct reg_protocol_rd { -+ -+#ifdef CONFIG_LITTLE_ENDIAN -+ -+ //DW1 -+ u32 NumOfTrans:4; -+ u32 Reserved1:4; -+ u32 Reserved2:24; -+ //DW2 -+ u32 ByteCount:7; -+ u32 WriteEnable:1; //0:read, 1:write -+ u32 FixOrContinuous:1; //0:continuous, 1: Fix -+ u32 BurstMode:1; -+ u32 Byte1Access:1; -+ u32 Byte2Access:1; -+ u32 Byte4Access:1; -+ u32 Reserved3:3; -+ u32 Reserved4:16; -+ //DW3 -+ u32 BusAddress; -+ //DW4 -+ //u32 Value; -+#else -+ -+ -+//DW1 -+ u32 Reserved1 :4; -+ u32 NumOfTrans :4; -+ -+ u32 Reserved2 :24; -+ -+ //DW2 -+ u32 WriteEnable : 1; -+ u32 ByteCount :7; -+ -+ -+ u32 Reserved3 : 3; -+ u32 Byte4Access : 1; -+ -+ u32 Byte2Access : 1; -+ u32 Byte1Access : 1; -+ u32 BurstMode :1 ; -+ u32 FixOrContinuous : 1; -+ -+ u32 Reserved4 : 16; -+ -+ //DW3 -+ u32 BusAddress; -+ -+ //DW4 -+ //u32 Value; -+ -+#endif -+ -+}; -+ -+ -+struct reg_protocol_wt { -+ -+ -+#ifdef CONFIG_LITTLE_ENDIAN -+ -+ //DW1 -+ u32 NumOfTrans:4; -+ u32 Reserved1:4; -+ u32 Reserved2:24; -+ //DW2 -+ u32 ByteCount:7; -+ u32 WriteEnable:1; //0:read, 1:write -+ u32 FixOrContinuous:1; //0:continuous, 1: Fix -+ u32 BurstMode:1; -+ u32 Byte1Access:1; -+ u32 Byte2Access:1; -+ u32 Byte4Access:1; -+ u32 Reserved3:3; -+ u32 Reserved4:16; -+ //DW3 -+ u32 BusAddress; -+ //DW4 -+ u32 Value; -+ -+#else -+ //DW1 -+ u32 Reserved1 :4; -+ u32 NumOfTrans :4; -+ -+ u32 Reserved2 :24; -+ -+ //DW2 -+ u32 WriteEnable : 1; -+ u32 ByteCount :7; -+ -+ u32 Reserved3 : 3; -+ u32 Byte4Access : 1; -+ -+ u32 Byte2Access : 1; -+ u32 Byte1Access : 1; -+ u32 BurstMode :1 ; -+ u32 FixOrContinuous : 1; -+ -+ u32 Reserved4 : 16; -+ -+ //DW3 -+ u32 BusAddress; -+ -+ //DW4 -+ u32 Value; -+ -+#endif -+ -+}; -+ -+ -+ -+/* -+Below is the data structure used by _io_handler -+ -+*/ -+ -+struct io_queue { -+ _lock lock; -+ _list free_ioreqs; -+ _list pending; //The io_req list that will be served in the single protocol read/write. -+ _list processing; -+ u8 *free_ioreqs_buf; // 4-byte aligned -+ u8 *pallocated_free_ioreqs_buf; -+ struct intf_hdl intf; -+}; -+ -+struct io_priv{ -+ -+ _adapter *padapter; -+ -+ struct intf_hdl intf; -+ -+}; -+ -+extern uint ioreq_flush(_adapter *adapter, struct io_queue *ioqueue); -+extern void sync_ioreq_enqueue(struct io_req *preq,struct io_queue *ioqueue); -+extern uint sync_ioreq_flush(_adapter *adapter, struct io_queue *ioqueue); -+ -+ -+extern uint free_ioreq(struct io_req *preq, struct io_queue *pio_queue); -+extern struct io_req *alloc_ioreq(struct io_queue *pio_q); -+ -+extern uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); -+extern void unregister_intf_hdl(struct intf_hdl *pintfhdl); -+ -+extern void _rtw_attrib_read(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+extern void _rtw_attrib_write(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+ -+extern u8 _rtw_read8(_adapter *adapter, u32 addr); -+extern u16 _rtw_read16(_adapter *adapter, u32 addr); -+extern u32 _rtw_read32(_adapter *adapter, u32 addr); -+extern void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+extern void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+extern void _rtw_read_port_cancel(_adapter *adapter); -+ -+ -+extern int _rtw_write8(_adapter *adapter, u32 addr, u8 val); -+extern int _rtw_write16(_adapter *adapter, u32 addr, u16 val); -+extern int _rtw_write32(_adapter *adapter, u32 addr, u32 val); -+extern int _rtw_writeN(_adapter *adapter, u32 addr, u32 length, u8 *pdata); -+ -+extern int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val); -+extern int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val); -+extern int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val); -+ -+extern void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+extern u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms); -+extern void _rtw_write_port_cancel(_adapter *adapter); -+ -+#ifdef DBG_IO -+bool match_read_sniff_ranges(u16 addr, u16 len); -+bool match_write_sniff_ranges(u16 addr, u16 len); -+ -+extern u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line); -+extern u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line); -+extern u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line); -+ -+extern int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line); -+extern int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line); -+extern int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line); -+extern int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line); -+ -+#define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __FUNCTION__, __LINE__) -+#define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __FUNCTION__, __LINE__) -+#define rtw_read32(adapter, addr) dbg_rtw_read32((adapter), (addr), __FUNCTION__, __LINE__) -+#define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem((adapter), (addr), (cnt), (mem)) -+#define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port((adapter), (addr), (cnt), (mem)) -+#define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter)) -+ -+#define rtw_write8(adapter, addr, val) dbg_rtw_write8((adapter), (addr), (val), __FUNCTION__, __LINE__) -+#define rtw_write16(adapter, addr, val) dbg_rtw_write16((adapter), (addr), (val), __FUNCTION__, __LINE__) -+#define rtw_write32(adapter, addr, val) dbg_rtw_write32((adapter), (addr), (val), __FUNCTION__, __LINE__) -+#define rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN((adapter), (addr), (length), (data), __FUNCTION__, __LINE__) -+ -+#define rtw_write8_async(adapter, addr, val) _rtw_write8_async((adapter), (addr), (val)) -+#define rtw_write16_async(adapter, addr, val) _rtw_write16_async((adapter), (addr), (val)) -+#define rtw_write32_async(adapter, addr, val) _rtw_write32_async((adapter), (addr), (val)) -+ -+#define rtw_write_mem(adapter, addr, cnt, mem) _rtw_write_mem((adapter), addr, cnt, mem) -+#define rtw_write_port(adapter, addr, cnt, mem) _rtw_write_port(adapter, addr, cnt, mem) -+#define rtw_write_port_and_wait(adapter, addr, cnt, mem, timeout_ms) _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms)) -+#define rtw_write_port_cancel(adapter) _rtw_write_port_cancel(adapter) -+#else //DBG_IO -+#define rtw_read8(adapter, addr) _rtw_read8((adapter), (addr)) -+#define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr)) -+#define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr)) -+#define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem((adapter), (addr), (cnt), (mem)) -+#define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port((adapter), (addr), (cnt), (mem)) -+#define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter)) -+ -+#define rtw_write8(adapter, addr, val) _rtw_write8((adapter), (addr), (val)) -+#define rtw_write16(adapter, addr, val) _rtw_write16((adapter), (addr), (val)) -+#define rtw_write32(adapter, addr, val) _rtw_write32((adapter), (addr), (val)) -+#define rtw_writeN(adapter, addr, length, data) _rtw_writeN((adapter), (addr), (length), (data)) -+ -+#define rtw_write8_async(adapter, addr, val) _rtw_write8_async((adapter), (addr), (val)) -+#define rtw_write16_async(adapter, addr, val) _rtw_write16_async((adapter), (addr), (val)) -+#define rtw_write32_async(adapter, addr, val) _rtw_write32_async((adapter), (addr), (val)) -+ -+#define rtw_write_mem(adapter, addr, cnt, mem) _rtw_write_mem((adapter), (addr), (cnt), (mem)) -+#define rtw_write_port(adapter, addr, cnt, mem) _rtw_write_port((adapter), (addr), (cnt), (mem)) -+#define rtw_write_port_and_wait(adapter, addr, cnt, mem, timeout_ms) _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms)) -+#define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter)) -+#endif //DBG_IO -+ -+extern void rtw_write_scsi(_adapter *adapter, u32 cnt, u8 *pmem); -+ -+//ioreq -+extern void ioreq_read8(_adapter *adapter, u32 addr, u8 *pval); -+extern void ioreq_read16(_adapter *adapter, u32 addr, u16 *pval); -+extern void ioreq_read32(_adapter *adapter, u32 addr, u32 *pval); -+extern void ioreq_write8(_adapter *adapter, u32 addr, u8 val); -+extern void ioreq_write16(_adapter *adapter, u32 addr, u16 val); -+extern void ioreq_write32(_adapter *adapter, u32 addr, u32 val); -+ -+ -+extern uint async_read8(_adapter *adapter, u32 addr, u8 *pbuff, -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -+extern uint async_read16(_adapter *adapter, u32 addr, u8 *pbuff, -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -+extern uint async_read32(_adapter *adapter, u32 addr, u8 *pbuff, -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -+ -+extern void async_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+extern void async_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+ -+extern void async_write8(_adapter *adapter, u32 addr, u8 val, -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -+extern void async_write16(_adapter *adapter, u32 addr, u16 val, -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -+extern void async_write32(_adapter *adapter, u32 addr, u32 val, -+ void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -+ -+extern void async_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+extern void async_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -+ -+ -+int rtw_init_io_priv(_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)); -+ -+ -+extern uint alloc_io_queue(_adapter *adapter); -+extern void free_io_queue(_adapter *adapter); -+extern void async_bus_io(struct io_queue *pio_q); -+extern void bus_sync_io(struct io_queue *pio_q); -+extern u32 _ioreq2rwmem(struct io_queue *pio_q); -+extern void dev_power_down(_adapter * Adapter, u8 bpwrup); -+ -+/* -+#define RTL_R8(reg) rtw_read8(padapter, reg) -+#define RTL_R16(reg) rtw_read16(padapter, reg) -+#define RTL_R32(reg) rtw_read32(padapter, reg) -+#define RTL_W8(reg, val8) rtw_write8(padapter, reg, val8) -+#define RTL_W16(reg, val16) rtw_write16(padapter, reg, val16) -+#define RTL_W32(reg, val32) rtw_write32(padapter, reg, val32) -+*/ -+ -+/* -+#define RTL_W8_ASYNC(reg, val8) rtw_write32_async(padapter, reg, val8) -+#define RTL_W16_ASYNC(reg, val16) rtw_write32_async(padapter, reg, val16) -+#define RTL_W32_ASYNC(reg, val32) rtw_write32_async(padapter, reg, val32) -+ -+#define RTL_WRITE_BB(reg, val32) phy_SetUsbBBReg(padapter, reg, val32) -+#define RTL_READ_BB(reg) phy_QueryUsbBBReg(padapter, reg) -+*/ -+ -+#endif //_RTL8711_IO_H_ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h -@@ -0,0 +1,269 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_IOCTL_H_ -+#define _RTW_IOCTL_H_ -+ -+#include -+#include -+#include -+ -+#ifndef OID_802_11_CAPABILITY -+ #define OID_802_11_CAPABILITY 0x0d010122 -+#endif -+ -+#ifndef OID_802_11_PMKID -+ #define OID_802_11_PMKID 0x0d010123 -+#endif -+ -+ -+// For DDK-defined OIDs -+#define OID_NDIS_SEG1 0x00010100 -+#define OID_NDIS_SEG2 0x00010200 -+#define OID_NDIS_SEG3 0x00020100 -+#define OID_NDIS_SEG4 0x01010100 -+#define OID_NDIS_SEG5 0x01020100 -+#define OID_NDIS_SEG6 0x01020200 -+#define OID_NDIS_SEG7 0xFD010100 -+#define OID_NDIS_SEG8 0x0D010100 -+#define OID_NDIS_SEG9 0x0D010200 -+#define OID_NDIS_SEG10 0x0D020200 -+ -+#define SZ_OID_NDIS_SEG1 23 -+#define SZ_OID_NDIS_SEG2 3 -+#define SZ_OID_NDIS_SEG3 6 -+#define SZ_OID_NDIS_SEG4 6 -+#define SZ_OID_NDIS_SEG5 4 -+#define SZ_OID_NDIS_SEG6 8 -+#define SZ_OID_NDIS_SEG7 7 -+#define SZ_OID_NDIS_SEG8 36 -+#define SZ_OID_NDIS_SEG9 24 -+#define SZ_OID_NDIS_SEG10 19 -+ -+// For Realtek-defined OIDs -+#define OID_MP_SEG1 0xFF871100 -+#define OID_MP_SEG2 0xFF818000 -+ -+#define OID_MP_SEG3 0xFF818700 -+#define OID_MP_SEG4 0xFF011100 -+ -+#define DEBUG_OID(dbg, str) \ -+ if((!dbg)) \ -+ { \ -+ RT_TRACE(_module_rtl871x_ioctl_c_,_drv_info_,("%s(%d): %s", __FUNCTION__, __LINE__, str)); \ -+ } -+ -+ -+enum oid_type -+{ -+ QUERY_OID, -+ SET_OID -+}; -+ -+struct oid_funs_node { -+ unsigned int oid_start; //the starting number for OID -+ unsigned int oid_end; //the ending number for OID -+ struct oid_obj_priv *node_array; -+ unsigned int array_sz; //the size of node_array -+ int query_counter; //count the number of query hits for this segment -+ int set_counter; //count the number of set hits for this segment -+}; -+ -+struct oid_par_priv -+{ -+ void *adapter_context; -+ NDIS_OID oid; -+ void *information_buf; -+ u32 information_buf_len; -+ u32 *bytes_rw; -+ u32 *bytes_needed; -+ enum oid_type type_of_oid; -+ u32 dbg; -+}; -+ -+struct oid_obj_priv { -+ unsigned char dbg; // 0: without OID debug message 1: with OID debug message -+ NDIS_STATUS (*oidfuns)(struct oid_par_priv *poid_par_priv); -+}; -+ -+#if (defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_)) || \ -+ (defined(PLATFORM_WINDOWS) && defined(_RTW_IOCTL_RTL_C_)) -+static NDIS_STATUS oid_null_function(struct oid_par_priv* poid_par_priv) -+{ -+ _func_enter_; -+ _func_exit_; -+ return NDIS_STATUS_SUCCESS; -+} -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+int TranslateNdisPsToRtPs(IN NDIS_802_11_POWER_MODE ndisPsMode); -+ -+//OID Handler for Segment 1 -+NDIS_STATUS oid_gen_supported_list_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_hardware_status_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_media_supported_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_media_in_use_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_maximum_lookahead_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_maximum_frame_size_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_link_speed_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_transmit_buffer_space_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_receive_buffer_space_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_transmit_block_size_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_receive_block_size_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_vendor_id_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_vendor_description_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_current_packet_filter_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_current_lookahead_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_driver_version_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_maximum_total_size_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_protocol_options_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_mac_options_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_media_connect_status_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_maximum_send_packets_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_vendor_driver_version_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//OID Handler for Segment 2 -+NDIS_STATUS oid_gen_physical_medium_hdl(struct oid_par_priv* poid_par_priv); -+ -+//OID Handler for Segment 3 -+NDIS_STATUS oid_gen_xmit_ok_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_rcv_ok_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_xmit_error_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_rcv_error_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_gen_rcv_no_buffer_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//OID Handler for Segment 4 -+NDIS_STATUS oid_802_3_permanent_address_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_current_address_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_multicast_list_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_maximum_list_size_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_mac_options_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+ -+//OID Handler for Segment 5 -+NDIS_STATUS oid_802_3_rcv_error_alignment_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_one_collision_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_more_collisions_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//OID Handler for Segment 6 -+NDIS_STATUS oid_802_3_xmit_deferred_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_max_collisions_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_rcv_overrun_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_underrun_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_heartbeat_failure_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_times_crs_lost_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_3_xmit_late_collisions_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+ -+//OID Handler for Segment 7 -+NDIS_STATUS oid_pnp_capabilities_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_pnp_set_power_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_pnp_query_power_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_pnp_add_wake_up_pattern_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_pnp_remove_wake_up_pattern_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_pnp_wake_up_pattern_list_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_pnp_enable_wake_up_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+ -+//OID Handler for Segment 8 -+NDIS_STATUS oid_802_11_bssid_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_ssid_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_infrastructure_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_add_wep_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_remove_wep_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_disassociate_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_authentication_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_privacy_filter_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_bssid_list_scan_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_encryption_status_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_reload_defaults_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_add_key_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_remove_key_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_association_information_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_test_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_media_stream_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_capability_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_pmkid_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+ -+ -+ -+//OID Handler for Segment 9 -+NDIS_STATUS oid_802_11_network_types_supported_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_network_type_in_use_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_tx_power_level_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_rssi_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_rssi_trigger_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_fragmentation_threshold_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_rts_threshold_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_number_of_antennas_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_rx_antenna_selected_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_tx_antenna_selected_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_supported_rates_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_desired_rates_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_configuration_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_power_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_802_11_bssid_list_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//OID Handler for Segment 10 -+NDIS_STATUS oid_802_11_statistics_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//OID Handler for Segment ED -+NDIS_STATUS oid_rt_mh_vender_id_hdl(struct oid_par_priv* poid_par_priv); -+ -+void Set_802_3_MULTICAST_LIST(ADAPTER *pAdapter, UCHAR *MCListbuf, ULONG MCListlen, BOOLEAN bAcceptAllMulticast); -+ -+#endif// end of PLATFORM_WINDOWS -+ -+ -+#if defined(PLATFORM_LINUX) && defined(CONFIG_WIRELESS_EXT) -+extern struct iw_handler_def rtw_handlers_def; -+#endif -+ -+extern NDIS_STATUS drv_query_info( -+ IN _nic_hdl MiniportAdapterContext, -+ IN NDIS_OID Oid, -+ IN void * InformationBuffer, -+ IN u32 InformationBufferLength, -+ OUT u32* BytesWritten, -+ OUT u32* BytesNeeded -+ ); -+ -+extern NDIS_STATUS drv_set_info( -+ IN _nic_hdl MiniportAdapterContext, -+ IN NDIS_OID Oid, -+ IN void * InformationBuffer, -+ IN u32 InformationBufferLength, -+ OUT u32* BytesRead, -+ OUT u32* BytesNeeded -+ ); -+ -+#endif // #ifndef __INC_CEINFO_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h -@@ -0,0 +1,36 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_IOCTL_QUERY_H_ -+#define _RTW_IOCTL_QUERY_H_ -+ -+#include -+#include -+ -+ -+#ifdef PLATFORM_WINDOWS -+ -+u8 query_802_11_capability(_adapter* padapter,u8* pucBuf,u32 * pulOutLen); -+u8 query_802_11_association_information (_adapter * padapter, PNDIS_802_11_ASSOCIATION_INFORMATION pAssocInfo); -+ -+#endif -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h -@@ -0,0 +1,83 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_IOCTL_RTL_H_ -+#define _RTW_IOCTL_RTL_H_ -+ -+#include -+#include -+#include -+ -+//************** oid_rtl_seg_01_01 ************** -+NDIS_STATUS oid_rt_get_signal_quality_hdl(struct oid_par_priv* poid_par_priv);//84 -+NDIS_STATUS oid_rt_get_small_packet_crc_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_large_packet_crc_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_tx_retry_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_rx_retry_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_rx_total_packet_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_set_fw_dig_state_hdl(struct oid_par_priv* poid_par_priv); //8a -+NDIS_STATUS oid_rt_pro_set_fw_ra_state_hdl(struct oid_par_priv* poid_par_priv); //8b -+ -+NDIS_STATUS oid_rt_get_rx_icv_err_hdl(struct oid_par_priv* poid_par_priv);//93 -+NDIS_STATUS oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_preamble_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_ap_ip_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_channelplan_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_set_channelplan_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_set_preamble_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_set_bcn_intvl_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_dedicate_probe_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_current_tx_power_level_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_channel_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_key_mismatch_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_supported_wireless_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_channel_list_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_scan_in_progress_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_forced_data_rate_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv* poid_par_priv); -+ -+//************** oid_rtl_seg_01_03 section start ************** -+NDIS_STATUS oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_ap_supported_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_ap_set_passphrase_hdl(struct oid_par_priv* poid_par_priv); -+ -+// oid_rtl_seg_01_11 -+NDIS_STATUS oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv* poid_par_priv); -+ -+//************** oid_rtl_seg_03_00 section start ************** -+NDIS_STATUS oid_rt_get_connect_state_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_set_default_key_id_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+ -+ -+#endif ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h -@@ -0,0 +1,79 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_IOCTL_SET_H_ -+#define __RTW_IOCTL_SET_H_ -+ -+#include -+#include -+ -+ -+typedef u8 NDIS_802_11_PMKID_VALUE[16]; -+ -+typedef struct _BSSIDInfo { -+ NDIS_802_11_MAC_ADDRESS BSSID; -+ NDIS_802_11_PMKID_VALUE PMKID; -+} BSSIDInfo, *PBSSIDInfo; -+ -+ -+#ifdef PLATFORM_OS_XP -+typedef struct _NDIS_802_11_PMKID { -+ u32 Length; -+ u32 BSSIDInfoCount; -+ BSSIDInfo BSSIDInfo[1]; -+} NDIS_802_11_PMKID, *PNDIS_802_11_PMKID; -+#endif -+ -+ -+#ifdef PLATFORM_WINDOWS -+u8 rtw_set_802_11_reload_defaults(_adapter * padapter, NDIS_802_11_RELOAD_DEFAULTS reloadDefaults); -+u8 rtw_set_802_11_test(_adapter * padapter, NDIS_802_11_TEST * test); -+u8 rtw_set_802_11_pmkid(_adapter *pdapter, NDIS_802_11_PMKID *pmkid); -+ -+u8 rtw_pnp_set_power_sleep(_adapter* padapter); -+u8 rtw_pnp_set_power_wakeup(_adapter* padapter); -+ -+void rtw_pnp_resume_wk(void *context); -+void rtw_pnp_sleep_wk(void * context); -+ -+#endif -+ -+u8 rtw_set_802_11_add_key(_adapter * padapter, NDIS_802_11_KEY * key); -+u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode); -+u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid); -+u8 rtw_set_802_11_add_wep(_adapter * padapter, NDIS_802_11_WEP * wep); -+u8 rtw_set_802_11_disassociate(_adapter * padapter); -+u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num); -+u8 rtw_set_802_11_infrastructure_mode(_adapter * padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); -+u8 rtw_set_802_11_remove_wep(_adapter * padapter, u32 keyindex); -+u8 rtw_set_802_11_ssid(_adapter * padapter, NDIS_802_11_SSID * ssid); -+u8 rtw_set_802_11_connect(_adapter *padapter, const u8 *bssid, NDIS_802_11_SSID *ssid); -+u8 rtw_set_802_11_remove_key(_adapter * padapter, NDIS_802_11_REMOVE_KEY * key); -+ -+u8 rtw_validate_bssid(const u8 *bssid); -+u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid); -+ -+u16 rtw_get_cur_max_rate(_adapter *adapter); -+int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode); -+int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan); -+int rtw_set_country(_adapter *adapter, const char *country_code); -+int rtw_set_band(_adapter *adapter, enum _BAND band); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h -@@ -0,0 +1,89 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_IOL_H_ -+#define __RTW_IOL_H_ -+ -+#include -+#include -+#include -+ -+typedef struct _io_offload_cmd { -+ u8 rsvd0; -+ u8 cmd; -+ u16 address; -+ u32 value; -+} IO_OFFLOAD_CMD, IOL_CMD; -+ -+#define IOL_CMD_LLT 0x00 -+//#define IOL_CMD_R_EFUSE 0x01 -+#define IOL_CMD_WB_REG 0x02 -+#define IOL_CMD_WW_REG 0x03 -+#define IOL_CMD_WD_REG 0x04 -+//#define IOL_CMD_W_RF 0x05 -+#define IOL_CMD_DELAY_US 0x80 -+#define IOL_CMD_DELAY_MS 0x81 -+//#define IOL_CMD_DELAY_S 0x82 -+#define IOL_CMD_END 0x83 -+ -+/***************************************************** -+CMD Address Value -+(B1) (B2/B3:H/L addr) (B4:B7 : MSB:LSB) -+****************************************************** -+IOL_CMD_LLT - B7: PGBNDY -+//IOL_CMD_R_EFUSE - - -+IOL_CMD_WB_REG 0x0~0xFFFF B7 -+IOL_CMD_WW_REG 0x0~0xFFFF B6~B7 -+IOL_CMD_WD_REG 0x0~0xFFFF B4~B7 -+//IOL_CMD_W_RF RF Reg B5~B7 -+IOL_CMD_DELAY_US - B6~B7 -+IOL_CMD_DELAY_MS - B6~B7 -+//IOL_CMD_DELAY_S - B6~B7 -+IOL_CMD_END - - -+******************************************************/ -+ -+struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter); -+int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len); -+int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary); -+int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value); -+int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value); -+int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value); -+int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us); -+int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms); -+int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame); -+int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms); -+int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms); -+int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms); -+ -+#ifdef DBG_IO -+int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line); -+int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line); -+int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line); -+#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__) -+#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__) -+#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__) -+#else -+#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value)) -+#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value)) -+#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) _rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value)) -+#endif -+ -+bool rtw_IOL_applied(ADAPTER *adapter); -+ -+#endif //__RTW_IOL_H_ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h -@@ -0,0 +1,217 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_LED_H_ -+#define __RTW_LED_H_ -+ -+#include -+#include -+#include -+ -+#define MSECS(t) (HZ * ((t) / 1000) + (HZ * ((t) % 1000)) / 1000) -+ -+typedef enum _LED_CTL_MODE{ -+ LED_CTL_POWER_ON = 1, -+ LED_CTL_LINK = 2, -+ LED_CTL_NO_LINK = 3, -+ LED_CTL_TX = 4, -+ LED_CTL_RX = 5, -+ LED_CTL_SITE_SURVEY = 6, -+ LED_CTL_POWER_OFF = 7, -+ LED_CTL_START_TO_LINK = 8, -+ LED_CTL_START_WPS = 9, -+ LED_CTL_STOP_WPS = 10, -+ LED_CTL_START_WPS_BOTTON = 11, //added for runtop -+ LED_CTL_STOP_WPS_FAIL = 12, //added for ALPHA -+ LED_CTL_STOP_WPS_FAIL_OVERLAP = 13, //added for BELKIN -+}LED_CTL_MODE; -+ -+ -+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) -+//================================================================================ -+// LED object. -+//================================================================================ -+ -+typedef enum _LED_STATE_871x{ -+ LED_UNKNOWN = 0, -+ RTW_LED_ON = 1, -+ RTW_LED_OFF = 2, -+ LED_BLINK_NORMAL = 3, -+ LED_BLINK_SLOWLY = 4, -+ LED_POWER_ON_BLINK = 5, -+ LED_SCAN_BLINK = 6, // LED is blinking during scanning period, the # of times to blink is depend on time for scanning. -+ LED_NO_LINK_BLINK = 7, // LED is blinking during no link state. -+ LED_BLINK_StartToBlink = 8,// Customzied for Sercomm Printer Server case -+ LED_BLINK_WPS = 9, // LED is blinkg during WPS communication -+ LED_TXRX_BLINK = 10, -+ LED_BLINK_WPS_STOP = 11, //for ALPHA -+ LED_BLINK_WPS_STOP_OVERLAP = 12, //for BELKIN -+}LED_STATE_871x; -+ -+#define IS_LED_WPS_BLINKING(_LED_871x) (((PLED_871x)_LED_871x)->CurrLedState==LED_BLINK_WPS \ -+ || ((PLED_871x)_LED_871x)->CurrLedState==LED_BLINK_WPS_STOP \ -+ || ((PLED_871x)_LED_871x)->bLedWPSBlinkInProgress) -+ -+#define IS_LED_BLINKING(_LED_871x) (((PLED_871x)_LED_871x)->bLedWPSBlinkInProgress \ -+ ||((PLED_871x)_LED_871x)->bLedScanBlinkInProgress) -+ -+typedef enum _LED_PIN_871x{ -+ LED_PIN_GPIO0, -+ LED_PIN_LED0, -+ LED_PIN_LED1 -+}LED_PIN_871x; -+ -+typedef struct _LED_871x{ -+ _adapter *padapter; -+ LED_PIN_871x LedPin; // Identify how to implement this SW led. -+ LED_STATE_871x CurrLedState; // Current LED state. -+ u8 bLedOn; // true if LED is ON, false if LED is OFF. -+ -+ u8 bSWLedCtrl; -+ -+ u8 bLedBlinkInProgress; // true if it is blinking, false o.w.. -+ // ALPHA, added by chiyoko, 20090106 -+ u8 bLedNoLinkBlinkInProgress; -+ u8 bLedLinkBlinkInProgress; -+ u8 bLedStartToLinkBlinkInProgress; -+ u8 bLedScanBlinkInProgress; -+ u8 bLedWPSBlinkInProgress; -+ -+ u32 BlinkTimes; // Number of times to toggle led state for blinking. -+ LED_STATE_871x BlinkingLedState; // Next state for blinking, either RTW_LED_ON or RTW_LED_OFF are. -+ -+ _timer BlinkTimer; // Timer object for led blinking. -+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)|| defined PLATFORM_FREEBSD -+ _workitem BlinkWorkItem; // Workitem used by BlinkTimer to manipulate H/W to blink LED. -+#endif -+} LED_871x, *PLED_871x; -+ -+ -+//================================================================================ -+// LED customization. -+//================================================================================ -+ -+typedef enum _LED_STRATEGY_871x{ -+ SW_LED_MODE0, // SW control 1 LED via GPIO0. It is default option. -+ SW_LED_MODE1, // 2 LEDs, through LED0 and LED1. For ALPHA. -+ SW_LED_MODE2, // SW control 1 LED via GPIO0, customized for AzWave 8187 minicard. -+ SW_LED_MODE3, // SW control 1 LED via GPIO0, customized for Sercomm Printer Server case. -+ SW_LED_MODE4, //for Edimax / Belkin -+ SW_LED_MODE5, //for Sercomm / Belkin -+ SW_LED_MODE6, //for 88CU minicard, porting from ce SW_LED_MODE7 -+ HW_LED, // HW control 2 LEDs, LED0 and LED1 (there are 4 different control modes, see MAC.CONFIG1 for details.) -+}LED_STRATEGY_871x, *PLED_STRATEGY_871x; -+#endif //CONFIG_USB_HCI -+ -+#ifdef CONFIG_PCI_HCI -+//================================================================================ -+// LED object. -+//================================================================================ -+ -+typedef enum _LED_STATE_871x{ -+ LED_UNKNOWN = 0, -+ RTW_LED_ON = 1, -+ RTW_LED_OFF = 2, -+ LED_BLINK_NORMAL = 3, -+ LED_BLINK_SLOWLY = 4, -+ LED_POWER_ON_BLINK = 5, -+ LED_SCAN_BLINK = 6, // LED is blinking during scanning period, the # of times to blink is depend on time for scanning. -+ LED_NO_LINK_BLINK = 7, // LED is blinking during no link state. -+ LED_BLINK_StartToBlink = 8, -+ LED_BLINK_TXRX = 9, -+ LED_BLINK_RUNTOP = 10, // Customized for RunTop -+ LED_BLINK_CAMEO = 11, -+}LED_STATE_871x; -+ -+typedef enum _LED_PIN_871x{ -+ LED_PIN_GPIO0, -+ LED_PIN_LED0, -+ LED_PIN_LED1, -+ LED_PIN_LED2 -+}LED_PIN_871x; -+ -+typedef struct _LED_871x{ -+ _adapter *padapter; -+ -+ LED_PIN_871x LedPin; // Identify how to implement this SW led. -+ -+ LED_STATE_871x CurrLedState; // Current LED state. -+ u8 bLedOn; // TRUE if LED is ON, FALSE if LED is OFF. -+ -+ u8 bLedBlinkInProgress; // TRUE if it is blinking, FALSE o.w.. -+ u8 bLedWPSBlinkInProgress; // TRUE if it is blinking, FALSE o.w.. -+ -+ u8 bLedSlowBlinkInProgress;//added by vivi, for led new mode -+ u32 BlinkTimes; // Number of times to toggle led state for blinking. -+ LED_STATE_871x BlinkingLedState; // Next state for blinking, either RTW_LED_ON or RTW_LED_OFF are. -+ -+ _timer BlinkTimer; // Timer object for led blinking. -+ -+ u8 bLedLinkBlinkInProgress; -+ u8 bLedNoLinkBlinkInProgress; -+ u8 bLedScanBlinkInProgress; -+} LED_871x, *PLED_871x; -+ -+ -+//================================================================================ -+// LED customization. -+//================================================================================ -+ -+typedef enum _LED_STRATEGY_871x{ -+ SW_LED_MODE0, // SW control 1 LED via GPIO0. It is default option. -+ SW_LED_MODE1, // SW control for PCI Express -+ SW_LED_MODE2, // SW control for Cameo. -+ SW_LED_MODE3, // SW contorl for RunTop. -+ SW_LED_MODE4, // SW control for Netcore -+ SW_LED_MODE5, //added by vivi, for led new mode, DLINK -+ SW_LED_MODE6, //added by vivi, for led new mode, PRONET -+ SW_LED_MODE7, //added by chiyokolin, for Lenovo, PCI Express Minicard Spec Rev.1.2 spec -+ SW_LED_MODE8, //added by chiyokolin, for QMI -+ SW_LED_MODE9, //added by chiyokolin, for BITLAND, PCI Express Minicard Spec Rev.1.1 -+ SW_LED_MODE10, //added by chiyokolin, for Edimax-ASUS -+ HW_LED, // HW control 2 LEDs, LED0 and LED1 (there are 4 different control modes) -+}LED_STRATEGY_871x, *PLED_STRATEGY_871x; -+ -+#define LED_CM8_BLINK_INTERVAL 500 //for QMI -+#endif //CONFIG_PCI_HCI -+ -+struct led_priv{ -+ /* add for led controll */ -+ LED_871x SwLed0; -+ LED_871x SwLed1; -+ LED_STRATEGY_871x LedStrategy; -+ u8 bRegUseLed; -+ void (*LedControlHandler)(_adapter *padapter, LED_CTL_MODE LedAction); -+ /* add for led controll */ -+}; -+ -+#ifdef CONFIG_SW_LED -+#define rtw_led_control(adapter, LedAction) \ -+ do { \ -+ if((adapter)->ledpriv.LedControlHandler) \ -+ (adapter)->ledpriv.LedControlHandler((adapter), (LedAction)); \ -+ } while(0) -+#else //CONFIG_SW_LED -+#define rtw_led_control(adapter, LedAction) -+#endif //CONFIG_SW_LED -+ -+extern void BlinkHandler(PLED_871x pLed); -+ -+#endif //__RTW_LED_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h -@@ -0,0 +1,850 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_MLME_H_ -+#define __RTW_MLME_H_ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_INTEL_WIDI -+#include -+#endif -+ -+#define MAX_BSS_CNT 128 -+//#define MAX_JOIN_TIMEOUT 2000 -+//#define MAX_JOIN_TIMEOUT 2500 -+#define MAX_JOIN_TIMEOUT 6500 -+ -+// Commented by Albert 20101105 -+// Increase the scanning timeout because of increasing the SURVEY_TO value. -+ -+#define SCANNING_TIMEOUT 8000 -+ -+#define SCAN_INTERVAL (30) // unit:2sec, 30*2=60sec -+ -+#ifdef PALTFORM_OS_WINCE -+#define SCANQUEUE_LIFETIME 12000000 // unit:us -+#else -+#define SCANQUEUE_LIFETIME 20 // unit:sec -+#endif -+ -+#define WIFI_NULL_STATE 0x00000000 -+ -+#define WIFI_ASOC_STATE 0x00000001 // Under Linked state... -+#define WIFI_REASOC_STATE 0x00000002 -+#define WIFI_SLEEP_STATE 0x00000004 -+#define WIFI_STATION_STATE 0x00000008 -+ -+#define WIFI_AP_STATE 0x00000010 -+#define WIFI_ADHOC_STATE 0x00000020 -+#define WIFI_ADHOC_MASTER_STATE 0x00000040 -+#define WIFI_UNDER_LINKING 0x00000080 -+ -+#define WIFI_UNDER_WPS 0x00000100 -+//#define WIFI_UNDER_CMD 0x00000200 -+//#define WIFI_UNDER_P2P 0x00000400 -+#define WIFI_STA_ALIVE_CHK_STATE 0x00000400 -+#define WIFI_SITE_MONITOR 0x00000800 //to indicate the station is under site surveying -+ -+#ifdef WDS -+#define WIFI_WDS 0x00001000 -+#define WIFI_WDS_RX_BEACON 0x00002000 // already rx WDS AP beacon -+#endif -+#ifdef AUTO_CONFIG -+#define WIFI_AUTOCONF 0x00004000 -+#define WIFI_AUTOCONF_IND 0x00008000 -+#endif -+ -+/* -+// ========== P2P Section Start =============== -+#define WIFI_P2P_LISTEN_STATE 0x00010000 -+#define WIFI_P2P_GROUP_FORMATION_STATE 0x00020000 -+// ========== P2P Section End =============== -+*/ -+ -+//#ifdef UNDER_MPTEST -+#define WIFI_MP_STATE 0x00010000 -+#define WIFI_MP_CTX_BACKGROUND 0x00020000 // in continous tx background -+#define WIFI_MP_CTX_ST 0x00040000 // in continous tx with single-tone -+#define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 // pending in continous tx background due to out of skb -+#define WIFI_MP_CTX_CCK_HW 0x00100000 // in continous tx -+#define WIFI_MP_CTX_CCK_CS 0x00200000 // in continous tx with carrier suppression -+#define WIFI_MP_LPBK_STATE 0x00400000 -+//#endif -+ -+//#define _FW_UNDER_CMD WIFI_UNDER_CMD -+#define _FW_UNDER_LINKING WIFI_UNDER_LINKING -+#define _FW_LINKED WIFI_ASOC_STATE -+#define _FW_UNDER_SURVEY WIFI_SITE_MONITOR -+ -+ -+enum dot11AuthAlgrthmNum { -+ dot11AuthAlgrthm_Open = 0, -+ dot11AuthAlgrthm_Shared, -+ dot11AuthAlgrthm_8021X, -+ dot11AuthAlgrthm_Auto, -+ dot11AuthAlgrthm_MaxNum -+}; -+ -+// Scan type including active and passive scan. -+typedef enum _RT_SCAN_TYPE -+{ -+ SCAN_PASSIVE, -+ SCAN_ACTIVE, -+ SCAN_MIX, -+}RT_SCAN_TYPE, *PRT_SCAN_TYPE; -+ -+enum DriverInterface { -+ DRIVER_WEXT = 1, -+ DRIVER_CFG80211 = 2 -+}; -+ -+enum _BAND -+{ -+ GHZ24_50 = 0, -+ GHZ_50, -+ GHZ_24, -+ GHZ_MAX, -+}; -+ -+#define rtw_band_valid(band) ((band) >= GHZ24_50 && (band) < GHZ_MAX) -+ -+enum SCAN_RESULT_TYPE -+{ -+ SCAN_RESULT_P2P_ONLY = 0, // Will return all the P2P devices. -+ SCAN_RESULT_ALL = 1, // Will return all the scanned device, include AP. -+ SCAN_RESULT_WFD_TYPE = 2 // Will just return the correct WFD device. -+ // If this device is Miracast sink device, it will just return all the Miracast source devices. -+}; -+ -+/* -+ -+there are several "locks" in mlme_priv, -+since mlme_priv is a shared resource between many threads, -+like ISR/Call-Back functions, the OID handlers, and even timer functions. -+ -+ -+Each _queue has its own locks, already. -+Other items are protected by mlme_priv.lock. -+ -+To avoid possible dead lock, any thread trying to modifiying mlme_priv -+SHALL not lock up more than one locks at a time! -+ -+*/ -+ -+ -+#define traffic_threshold 10 -+#define traffic_scan_period 500 -+ -+struct sitesurvey_ctrl { -+ u64 last_tx_pkts; -+ uint last_rx_pkts; -+ sint traffic_busy; -+ _timer sitesurvey_ctrl_timer; -+}; -+ -+typedef struct _RT_LINK_DETECT_T{ -+ u32 NumTxOkInPeriod; -+ u32 NumRxOkInPeriod; -+ u32 NumRxUnicastOkInPeriod; -+ BOOLEAN bBusyTraffic; -+ BOOLEAN bTxBusyTraffic; -+ BOOLEAN bRxBusyTraffic; -+ BOOLEAN bHigherBusyTraffic; // For interrupt migration purpose. -+ BOOLEAN bHigherBusyRxTraffic; // We may disable Tx interrupt according as Rx traffic. -+ BOOLEAN bHigherBusyTxTraffic; // We may disable Tx interrupt according as Tx traffic. -+}RT_LINK_DETECT_T, *PRT_LINK_DETECT_T; -+ -+struct profile_info { -+ u8 ssidlen; -+ u8 ssid[ WLAN_SSID_MAXLEN ]; -+ u8 peermac[ ETH_ALEN ]; -+}; -+ -+struct tx_invite_req_info{ -+ u8 token; -+ u8 benable; -+ u8 go_ssid[ WLAN_SSID_MAXLEN ]; -+ u8 ssidlen; -+ u8 go_bssid[ ETH_ALEN ]; -+ u8 peer_macaddr[ ETH_ALEN ]; -+ u8 operating_ch; // This information will be set by using the p2p_set op_ch=x -+ u8 peer_ch; // The listen channel for peer P2P device -+ -+}; -+ -+struct tx_invite_resp_info{ -+ u8 token; // Used to record the dialog token of p2p invitation request frame. -+}; -+ -+#ifdef CONFIG_WFD -+ -+struct wifi_display_info{ -+ u16 wfd_enable; // Eanble/Disable the WFD function. -+ u16 rtsp_ctrlport; // TCP port number at which the this WFD device listens for RTSP messages -+ u16 peer_rtsp_ctrlport; // TCP port number at which the peer WFD device listens for RTSP messages -+ // This filed should be filled when receiving the gropu negotiation request -+ -+ u8 peer_session_avail; // WFD session is available or not for the peer wfd device. -+ // This variable will be set when sending the provisioning discovery request to peer WFD device. -+ // And this variable will be reset when it is read by using the iwpriv p2p_get wfd_sa command. -+ -+ u8 ip_address[4]; -+ u8 peer_ip_address[4]; -+ u8 wfd_pc; // WFD preferred connection -+ // 0 -> Prefer to use the P2P for WFD connection on peer side. -+ // 1 -> Prefer to use the TDLS for WFD connection on peer side. -+ -+ u8 wfd_device_type; // WFD Device Type -+ // 0 -> WFD Source Device -+ // 1 -> WFD Primary Sink Device -+ enum SCAN_RESULT_TYPE scan_result_type; // Used when P2P is enable. This parameter will impact the scan result. -+}; -+#endif //CONFIG_WFD -+ -+struct tx_provdisc_req_info{ -+ u16 wps_config_method_request; // Used when sending the provisioning request frame -+ u16 peer_channel_num[2]; // The channel number which the receiver stands. -+ NDIS_802_11_SSID ssid; -+ u8 peerDevAddr[ ETH_ALEN ]; // Peer device address -+ u8 peerIFAddr[ ETH_ALEN ]; // Peer interface address -+ u8 benable; // This provision discovery request frame is trigger to send or not -+}; -+ -+struct rx_provdisc_req_info{ //When peer device issue prov_disc_req first, we should store the following informations -+ u8 peerDevAddr[ ETH_ALEN ]; // Peer device address -+ u8 strconfig_method_desc_of_prov_disc_req[4]; // description for the config method located in the provisioning discovery request frame. -+ // The UI must know this information to know which config method the remote p2p device is requiring. -+}; -+ -+struct tx_nego_req_info{ -+ u16 peer_channel_num[2]; // The channel number which the receiver stands. -+ u8 peerDevAddr[ ETH_ALEN ]; // Peer device address -+ u8 benable; // This negoitation request frame is trigger to send or not -+}; -+ -+struct group_id_info{ -+ u8 go_device_addr[ ETH_ALEN ]; // The GO's device address of this P2P group -+ u8 ssid[ WLAN_SSID_MAXLEN ]; // The SSID of this P2P group -+}; -+ -+struct scan_limit_info{ -+ u8 scan_op_ch_only; // When this flag is set, the driver should just scan the operation channel -+#ifndef P2P_OP_CHECK_SOCIAL_CH -+ u8 operation_ch[2]; // Store the operation channel of invitation request frame -+#else -+ u8 operation_ch[5]; // Store additional channel 1,6,11 for Android 4.2 IOT & Nexus 4 -+#endif //P2P_OP_CHECK_SOCIAL_CH -+}; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+struct cfg80211_wifidirect_info{ -+ _timer remain_on_ch_timer; -+ u8 restore_channel; -+ struct ieee80211_channel remain_on_ch_channel; -+ enum nl80211_channel_type remain_on_ch_type; -+ u64 remain_on_ch_cookie; -+ bool is_ro_ch; -+}; -+#endif //CONFIG_IOCTL_CFG80211 -+ -+struct wifidirect_info{ -+ _adapter* padapter; -+ _timer find_phase_timer; -+ _timer restore_p2p_state_timer; -+ -+ // Used to do the scanning. After confirming the peer is availalble, the driver transmits the P2P frame to peer. -+ _timer pre_tx_scan_timer; -+ _timer reset_ch_sitesurvey; -+ _timer reset_ch_sitesurvey2; // Just for resetting the scan limit function by using p2p nego -+#ifdef CONFIG_CONCURRENT_MODE -+ // Used to switch the channel between legacy AP and listen state. -+ _timer ap_p2p_switch_timer; -+#endif -+ struct tx_provdisc_req_info tx_prov_disc_info; -+ struct rx_provdisc_req_info rx_prov_disc_info; -+ struct tx_invite_req_info invitereq_info; -+ struct profile_info profileinfo[ P2P_MAX_PERSISTENT_GROUP_NUM ]; // Store the profile information of persistent group -+ struct tx_invite_resp_info inviteresp_info; -+ struct tx_nego_req_info nego_req_info; -+ struct group_id_info groupid_info; // Store the group id information when doing the group negotiation handshake. -+ struct scan_limit_info rx_invitereq_info; // Used for get the limit scan channel from the Invitation procedure -+ struct scan_limit_info p2p_info; // Used for get the limit scan channel from the P2P negotiation handshake -+#ifdef CONFIG_WFD -+ struct wifi_display_info *wfd_info; -+#endif -+ enum P2P_ROLE role; -+ enum P2P_STATE pre_p2p_state; -+ enum P2P_STATE p2p_state; -+ u8 device_addr[ETH_ALEN]; // The device address should be the mac address of this device. -+ u8 interface_addr[ETH_ALEN]; -+ u8 social_chan[4]; -+ u8 listen_channel; -+ u8 operating_channel; -+ u8 listen_dwell; // This value should be between 1 and 3 -+ u8 support_rate[8]; -+ u8 p2p_wildcard_ssid[P2P_WILDCARD_SSID_LEN]; -+ u8 intent; // should only include the intent value. -+ u8 p2p_peer_interface_addr[ ETH_ALEN ]; -+ u8 p2p_peer_device_addr[ ETH_ALEN ]; -+ u8 peer_intent; // Included the intent value and tie breaker value. -+ u8 device_name[ WPS_MAX_DEVICE_NAME_LEN ]; // Device name for displaying on searching device screen -+ u8 device_name_len; -+ u8 profileindex; // Used to point to the index of profileinfo array -+ u8 peer_operating_ch; -+ u8 find_phase_state_exchange_cnt; -+ u16 device_password_id_for_nego; // The device password ID for group negotation -+ u8 negotiation_dialog_token; -+ u8 nego_ssid[ WLAN_SSID_MAXLEN ]; // SSID information for group negotitation -+ u8 nego_ssidlen; -+ u8 p2p_group_ssid[WLAN_SSID_MAXLEN]; -+ u8 p2p_group_ssid_len; -+ u8 persistent_supported; // Flag to know the persistent function should be supported or not. -+ // In the Sigma test, the Sigma will provide this enable from the sta_set_p2p CAPI. -+ // 0: disable -+ // 1: enable -+ u8 session_available; // Flag to set the WFD session available to enable or disable "by Sigma" -+ // In the Sigma test, the Sigma will disable the session available by using the sta_preset CAPI. -+ // 0: disable -+ // 1: enable -+ u8 wfd_tdls_enable; // Flag to enable or disable the TDLS by WFD Sigma -+ // 0: disable -+ // 1: enable -+ u8 wfd_tdls_weaksec; // Flag to enable or disable the weak security function for TDLS by WFD Sigma -+ // 0: disable -+ // In this case, the driver can't issue the tdsl setup request frame. -+ // 1: enable -+ // In this case, the driver can issue the tdls setup request frame -+ // even the current security is weak security. -+ -+ enum P2P_WPSINFO ui_got_wps_info; // This field will store the WPS value (PIN value or PBC) that UI had got from the user. -+ u16 supported_wps_cm; // This field describes the WPS config method which this driver supported. -+ // The value should be the combination of config method defined in page104 of WPS v2.0 spec. -+ u8 external_uuid; // UUID flag -+ u8 uuid[16]; // UUID -+ uint channel_list_attr_len; // This field will contain the length of body of P2P Channel List attribute of group negotitation response frame. -+ u8 channel_list_attr[100]; // This field will contain the body of P2P Channel List attribute of group negotitation response frame. -+ // We will use the channel_cnt and channel_list fields when constructing the group negotitation confirm frame. -+ u8 driver_interface; // Indicate DRIVER_WEXT or DRIVER_CFG80211 -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ u16 ext_listen_interval; // The interval to be available with legacy AP (ms) -+ u16 ext_listen_period; // The time period to be available for P2P listen state (ms) -+#endif -+#ifdef CONFIG_P2P_PS -+ enum P2P_PS_MODE p2p_ps_mode; // indicate p2p ps mode -+ enum P2P_PS_STATE p2p_ps_state; // indicate p2p ps state -+ u8 noa_index; // Identifies and instance of Notice of Absence timing. -+ u8 ctwindow; // Client traffic window. A period of time in TU after TBTT. -+ u8 opp_ps; // opportunistic power save. -+ u8 noa_num; // number of NoA descriptor in P2P IE. -+ u8 noa_count[P2P_MAX_NOA_NUM]; // Count for owner, Type of client. -+ u32 noa_duration[P2P_MAX_NOA_NUM]; // Max duration for owner, preferred or min acceptable duration for client. -+ u32 noa_interval[P2P_MAX_NOA_NUM]; // Length of interval for owner, preferred or max acceptable interval of client. -+ u32 noa_start_time[P2P_MAX_NOA_NUM]; // schedule expressed in terms of the lower 4 bytes of the TSF timer. -+#endif // CONFIG_P2P_PS -+}; -+ -+struct tdls_ss_record{ //signal strength record; recording the tdls sta with lowerest ss -+ u8 macaddr[ETH_ALEN]; -+ u8 RxPWDBAll; -+ u8 is_tdls_sta; // _TRUE: direct link sta, _FALSE: else -+}; -+ -+struct tdls_info{ -+ u8 ap_prohibited; -+ uint setup_state; -+ u8 sta_cnt; -+ u8 sta_maximum; // 1:tdls sta is equal (NUM_STA-1), reach max direct link number; 0: else; -+ struct tdls_ss_record ss_record; -+ u8 macid_index; //macid entry that is ready to write -+ u8 clear_cam; //cam entry that is trying to clear, using it in direct link teardown -+ u8 ch_sensing; -+ u8 cur_channel; -+ u8 candidate_ch; -+ u8 collect_pkt_num[MAX_CHANNEL_NUM]; -+ _lock cmd_lock; -+ _lock hdl_lock; -+ u8 watchdog_count; -+ u8 dev_discovered; //WFD_TDLS: for sigma test -+ u8 enable; -+#ifdef CONFIG_WFD -+ struct wifi_display_info *wfd_info; -+#endif -+}; -+ -+struct mlme_priv { -+ -+ _lock lock; -+ sint fw_state; //shall we protect this variable? maybe not necessarily... -+ -+ u8 to_join; //flag -+ #ifdef CONFIG_LAYER2_ROAMING -+ u8 to_roaming; // roaming trying times -+ #endif -+ -+ u8 *nic_hdl; -+ -+ u8 not_indic_disco; -+ _list *pscanned; -+ _queue free_bss_pool; -+ _queue scanned_queue; -+ u8 *free_bss_buf; -+ u32 num_of_scanned; -+ -+ NDIS_802_11_SSID assoc_ssid; -+ u8 assoc_bssid[6]; -+ -+ struct wlan_network cur_network; -+ -+ //uint wireless_mode; no used, remove it -+ -+ u32 scan_interval; -+ -+ _timer assoc_timer; -+ -+ uint assoc_by_bssid; -+ uint assoc_by_rssi; -+ -+ _timer scan_to_timer; // driver itself handles scan_timeout status. -+ u32 scan_start_time; // used to evaluate the time spent in scanning -+ -+ #ifdef CONFIG_SET_SCAN_DENY_TIMER -+ _timer set_scan_deny_timer; -+ ATOMIC_T set_scan_deny; //0: allowed, 1: deny -+ #endif -+ -+ struct qos_priv qospriv; -+ -+#ifdef CONFIG_80211N_HT -+ -+ /* Number of non-HT AP/stations */ -+ int num_sta_no_ht; -+ -+ /* Number of HT AP/stations 20 MHz */ -+ //int num_sta_ht_20mhz; -+ -+ -+ int num_FortyMHzIntolerant; -+ -+ struct ht_priv htpriv; -+ -+#endif -+ -+ RT_LINK_DETECT_T LinkDetectInfo; -+ _timer dynamic_chk_timer; //dynamic/periodic check timer -+ -+ u8 acm_mask; // for wmm acm mask -+ u8 ChannelPlan; -+ RT_SCAN_TYPE scan_mode; // active: 1, passive: 0 -+ -+ //u8 probereq_wpsie[MAX_WPS_IE_LEN];//added in probe req -+ //int probereq_wpsie_len; -+ u8 *wps_probe_req_ie; -+ u32 wps_probe_req_ie_len; -+ -+#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ /* Number of associated Non-ERP stations (i.e., stations using 802.11b -+ * in 802.11g BSS) */ -+ int num_sta_non_erp; -+ -+ /* Number of associated stations that do not support Short Slot Time */ -+ int num_sta_no_short_slot_time; -+ -+ /* Number of associated stations that do not support Short Preamble */ -+ int num_sta_no_short_preamble; -+ -+ int olbc; /* Overlapping Legacy BSS Condition */ -+ -+ /* Number of HT associated stations that do not support greenfield */ -+ int num_sta_ht_no_gf; -+ -+ /* Number of associated non-HT stations */ -+ //int num_sta_no_ht; -+ -+ /* Number of HT associated stations 20 MHz */ -+ int num_sta_ht_20mhz; -+ -+ /* Overlapping BSS information */ -+ int olbc_ht; -+ -+#ifdef CONFIG_80211N_HT -+ u16 ht_op_mode; -+#endif /* CONFIG_80211N_HT */ -+ -+ u8 *assoc_req; -+ u32 assoc_req_len; -+ u8 *assoc_rsp; -+ u32 assoc_rsp_len; -+ -+ u8 *wps_beacon_ie; -+ //u8 *wps_probe_req_ie; -+ u8 *wps_probe_resp_ie; -+ u8 *wps_assoc_resp_ie; // for CONFIG_IOCTL_CFG80211, this IE could include p2p ie / wfd ie -+ -+ u32 wps_beacon_ie_len; -+ //u32 wps_probe_req_ie_len; -+ u32 wps_probe_resp_ie_len; -+ u32 wps_assoc_resp_ie_len; // for CONFIG_IOCTL_CFG80211, this IE len could include p2p ie / wfd ie -+ -+ u8 *p2p_beacon_ie; -+ u8 *p2p_probe_req_ie; -+ u8 *p2p_probe_resp_ie; -+ u8 *p2p_go_probe_resp_ie; //for GO -+ u8 *p2p_assoc_req_ie; -+ -+ u32 p2p_beacon_ie_len; -+ u32 p2p_probe_req_ie_len; -+ u32 p2p_probe_resp_ie_len; -+ u32 p2p_go_probe_resp_ie_len; //for GO -+ u32 p2p_assoc_req_ie_len; -+/* -+#if defined(CONFIG_P2P) && defined(CONFIG_IOCTL_CFG80211) -+ //u8 *wps_p2p_beacon_ie; -+ u8 *p2p_beacon_ie; -+ u8 *wps_p2p_probe_resp_ie; -+ u8 *wps_p2p_assoc_resp_ie; -+ //u32 wps_p2p_beacon_ie_len; -+ u32 p2p_beacon_ie_len; -+ u32 wps_p2p_probe_resp_ie_len; -+ u32 wps_p2p_assoc_resp_ie_len; -+#endif -+*/ -+ -+ _lock bcn_update_lock; -+ u8 update_bcn; -+ -+ -+#endif //#if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) -+ -+#if defined(CONFIG_WFD) && defined(CONFIG_IOCTL_CFG80211) -+ -+ u8 *wfd_beacon_ie; -+ u8 *wfd_probe_req_ie; -+ u8 *wfd_probe_resp_ie; -+ u8 *wfd_go_probe_resp_ie; //for GO -+ u8 *wfd_assoc_req_ie; -+ -+ u32 wfd_beacon_ie_len; -+ u32 wfd_probe_req_ie_len; -+ u32 wfd_probe_resp_ie_len; -+ u32 wfd_go_probe_resp_ie_len; //for GO -+ u32 wfd_assoc_req_ie_len; -+ -+#endif -+ -+#ifdef RTK_DMP_PLATFORM -+ // DMP kobject_hotplug function signal need in passive level -+ _workitem Linkup_workitem; -+ _workitem Linkdown_workitem; -+#endif -+ -+#ifdef CONFIG_INTEL_WIDI -+ int widi_state; -+ int listen_state; -+ _timer listen_timer; -+ ATOMIC_T rx_probe_rsp; // 1:receive probe respone from RDS source. -+ u8 *l2sdTaBuffer; -+ u8 channel_idx; -+ s8 group_cnt; //For WiDi 3.5, they specified another scan algo. for WFD/RDS co-existed -+ u8 sa_ext[L2SDTA_SERVICE_VE_LEN]; -+ -+ u8 widi_enable; -+ /** -+ * For WiDi 4; upper layer would set -+ * p2p_primary_device_type_category_id -+ * p2p_primary_device_type_sub_category_id -+ * p2p_secondary_device_type_category_id -+ * p2p_secondary_device_type_sub_category_id -+ */ -+ u16 p2p_pdt_cid; -+ u16 p2p_pdt_scid; -+ u8 num_p2p_sdt; -+ u16 p2p_sdt_cid[MAX_NUM_P2P_SDT]; -+ u16 p2p_sdt_scid[MAX_NUM_P2P_SDT]; -+ u8 p2p_reject_disable; //When starting NL80211 wpa_supplicant/hostapd, it will call netdev_close -+ //such that it will cause p2p disabled. Use this flag to reject. -+#endif // CONFIG_INTEL_WIDI -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ u8 scanning_via_buddy_intf; -+#endif -+}; -+ -+#ifdef CONFIG_AP_MODE -+ -+struct hostapd_priv -+{ -+ _adapter *padapter; -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ struct net_device *pmgnt_netdev; -+ struct usb_anchor anchored; -+#endif -+ -+}; -+ -+extern int hostapd_mode_init(_adapter *padapter); -+extern void hostapd_mode_unload(_adapter *padapter); -+#endif -+ -+ -+extern void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf); -+extern void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf); -+extern void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf); -+extern void rtw_joinbss_event_callback(_adapter *adapter, u8 *pbuf); -+extern void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf); -+extern void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf); -+extern void rtw_atimdone_event_callback(_adapter *adapter, u8 *pbuf); -+extern void rtw_cpwm_event_callback(_adapter *adapter, u8 *pbuf); -+ -+#ifdef PLATFORM_WINDOWS -+extern thread_return event_thread(void *context); -+ -+extern void rtw_join_timeout_handler ( -+ IN PVOID SystemSpecific1, -+ IN PVOID FunctionContext, -+ IN PVOID SystemSpecific2, -+ IN PVOID SystemSpecific3 -+ ); -+ -+extern void _rtw_scan_timeout_handler ( -+ IN PVOID SystemSpecific1, -+ IN PVOID FunctionContext, -+ IN PVOID SystemSpecific2, -+ IN PVOID SystemSpecific3 -+ ); -+ -+#endif -+ -+#if defined (PLATFORM_LINUX)|| defined (PLATFORM_FREEBSD) -+extern int event_thread(void *context); -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+extern void rtw_join_timeout_handler(void *FunctionContext); -+extern void _rtw_scan_timeout_handler(void* FunctionContext); -+#else -+extern void rtw_join_timeout_handler(struct timer_list *t); -+extern void _rtw_scan_timeout_handler(struct timer_list *t); -+#endif -+#endif -+ -+extern void rtw_free_network_queue(_adapter *adapter,u8 isfreeall); -+extern int rtw_init_mlme_priv(_adapter *adapter);// (struct mlme_priv *pmlmepriv); -+ -+extern void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); -+ -+ -+extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); -+extern sint rtw_set_key(_adapter *adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx); -+extern sint rtw_set_auth(_adapter *adapter,struct security_priv *psecuritypriv); -+ -+__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) -+{ //if sta_mode:pmlmepriv->cur_network.network.MacAddress=> bssid -+ // if adhoc_mode:pmlmepriv->cur_network.network.MacAddress=> ibss mac address -+ return pmlmepriv->cur_network.network.MacAddress; -+} -+ -+__inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) -+{ -+ if (pmlmepriv->fw_state & state) -+ return _TRUE; -+ -+ return _FALSE; -+} -+ -+__inline static sint get_fwstate(struct mlme_priv *pmlmepriv) -+{ -+ return pmlmepriv->fw_state; -+} -+ -+/* -+ * No Limit on the calling context, -+ * therefore set it to be the critical section... -+ * -+ * ### NOTE:#### (!!!!) -+ * MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock -+ */ -+__inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) -+{ -+ pmlmepriv->fw_state |= state; -+} -+ -+__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) -+{ -+ pmlmepriv->fw_state &= ~state; -+} -+ -+/* -+ * No Limit on the calling context, -+ * therefore set it to be the critical section... -+ */ -+__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) -+{ -+ _irqL irqL; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ if (check_fwstate(pmlmepriv, state) == _TRUE) -+ pmlmepriv->fw_state ^= state; -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+ -+__inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state) -+{ -+ _irqL irqL; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _clr_fwstate_(pmlmepriv, state); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+ -+__inline static void up_scanned_network(struct mlme_priv *pmlmepriv) -+{ -+ _irqL irqL; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ pmlmepriv->num_of_scanned++; -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+ -+#ifdef CONFIG_CONCURRENT_MODE -+sint rtw_buddy_adapter_up(_adapter *padapter); -+sint check_buddy_fwstate(_adapter *padapter, sint state); -+#endif //CONFIG_CONCURRENT_MODE -+ -+__inline static void down_scanned_network(struct mlme_priv *pmlmepriv) -+{ -+ _irqL irqL; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ pmlmepriv->num_of_scanned--; -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+ -+__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) -+{ -+ _irqL irqL; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ pmlmepriv->num_of_scanned = val; -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+} -+ -+extern u16 rtw_get_capability(WLAN_BSSID_EX *bss); -+extern void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target); -+extern void rtw_disconnect_hdl_under_linked(_adapter* adapter, struct sta_info *psta, u8 free_assoc); -+extern void rtw_generate_random_ibss(u8 *pibss); -+extern struct wlan_network* rtw_find_network(_queue *scanned_queue, u8 *addr); -+extern struct wlan_network* rtw_get_oldest_wlan_network(_queue *scanned_queue); -+ -+extern void rtw_free_assoc_resources(_adapter* adapter, int lock_scanned_queue); -+extern void rtw_indicate_disconnect(_adapter* adapter); -+extern void rtw_indicate_connect(_adapter* adapter); -+void rtw_indicate_scan_done( _adapter *padapter, bool aborted); -+void rtw_scan_abort(_adapter *adapter); -+ -+extern int rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len); -+extern int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); -+extern void rtw_init_registrypriv_dev_network(_adapter *adapter); -+ -+extern void rtw_update_registrypriv_dev_network(_adapter *adapter); -+ -+extern void rtw_get_encrypt_decrypt_from_registrypriv(_adapter *adapter); -+ -+extern void _rtw_join_timeout_handler(_adapter *adapter); -+extern void rtw_scan_timeout_handler(_adapter *adapter); -+ -+extern void rtw_dynamic_check_timer_handlder(_adapter *adapter); -+#ifdef CONFIG_SET_SCAN_DENY_TIMER -+bool rtw_is_scan_deny(_adapter *adapter); -+void rtw_clear_scan_deny(_adapter *adapter); -+void rtw_set_scan_deny_timer_hdl(_adapter *adapter); -+void rtw_set_scan_deny(_adapter *adapter, u32 ms); -+#else -+#define rtw_is_scan_deny(adapter) _FALSE -+#define rtw_clear_scan_deny(adapter) do {} while (0) -+#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) -+#define rtw_set_scan_deny(adapter, ms) do {} while (0) -+#endif -+ -+ -+extern int _rtw_init_mlme_priv(_adapter *padapter); -+ -+void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); -+ -+extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); -+ -+extern int _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork); -+ -+extern struct wlan_network* _rtw_dequeue_network(_queue *queue); -+ -+extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv); -+ -+ -+extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); -+extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); -+ -+ -+extern struct wlan_network* _rtw_find_network(_queue *scanned_queue, u8 *addr); -+ -+extern void _rtw_free_network_queue(_adapter* padapter, u8 isfreeall); -+ -+extern sint rtw_if_up(_adapter *padapter); -+ -+ -+u8 *rtw_get_capability_from_ie(u8 *ie); -+u8 *rtw_get_timestampe_from_ie(u8 *ie); -+u8 *rtw_get_beacon_interval_from_ie(u8 *ie); -+ -+ -+void rtw_joinbss_reset(_adapter *padapter); -+ -+#ifdef CONFIG_80211N_HT -+unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len, u8 channel); -+void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len, u8 channel); -+void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe); -+#endif -+ -+int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork); -+int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst); -+ -+#ifdef CONFIG_LAYER2_ROAMING -+void _rtw_roaming(_adapter *adapter, struct wlan_network *tgt_network); -+void rtw_roaming(_adapter *adapter, struct wlan_network *tgt_network); -+void rtw_set_roaming(_adapter *adapter, u8 to_roaming); -+u8 rtw_to_roaming(_adapter *adapter); -+#else -+#define _rtw_roaming(adapter, tgt_network) do {} while(0) -+#define rtw_roaming(adapter, tgt_network) do {} while(0) -+#define rtw_set_roaming(adapter, to_roaming) do {} while(0) -+#define rtw_to_roaming(adapter) 0 -+#endif -+ -+ -+#ifdef CONFIG_INTEL_PROXIM -+void rtw_proxim_enable(_adapter *padapter); -+void rtw_proxim_disable(_adapter *padapter); -+void rtw_proxim_send_packet(_adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate); -+#endif //CONFIG_INTEL_PROXIM -+#endif //__RTL871X_MLME_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h -@@ -0,0 +1,963 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_MLME_EXT_H_ -+#define __RTW_MLME_EXT_H_ -+ -+#include -+#include -+#include -+#include -+ -+ -+// Commented by Albert 20101105 -+// Increase the SURVEY_TO value from 100 to 150 ( 100ms to 150ms ) -+// The Realtek 8188CE SoftAP will spend around 100ms to send the probe response after receiving the probe request. -+// So, this driver tried to extend the dwell time for each scanning channel. -+// This will increase the chance to receive the probe response from SoftAP. -+ -+#define SURVEY_TO (100) -+#define REAUTH_TO (300) //(50) -+#define REASSOC_TO (300) //(50) -+//#define DISCONNECT_TO (3000) -+#define ADDBA_TO (2000) -+ -+#define LINKED_TO (1) //unit:2 sec, 1x2=2 sec -+ -+#define REAUTH_LIMIT (4) -+#define REASSOC_LIMIT (4) -+#define READDBA_LIMIT (2) -+ -+//#define IOCMD_REG0 0x10250370 -+//#define IOCMD_REG1 0x10250374 -+//#define IOCMD_REG2 0x10250378 -+ -+//#define FW_DYNAMIC_FUN_SWITCH 0x10250364 -+ -+//#define WRITE_BB_CMD 0xF0000001 -+//#define SET_CHANNEL_CMD 0xF3000000 -+//#define UPDATE_RA_CMD 0xFD0000A2 -+ -+#define DYNAMIC_FUNC_DISABLE (0x0) -+#define DYNAMIC_FUNC_DIG BIT(0) -+#define DYNAMIC_FUNC_HP BIT(1) -+#define DYNAMIC_FUNC_SS BIT(2) //Tx Power Tracking -+#define DYNAMIC_FUNC_BT BIT(3) -+#define DYNAMIC_FUNC_ANT_DIV BIT(4) -+#define DYNAMIC_FUNC_ADAPTIVITY BIT(5) -+ -+#define _HW_STATE_NOLINK_ 0x00 -+#define _HW_STATE_ADHOC_ 0x01 -+#define _HW_STATE_STATION_ 0x02 -+#define _HW_STATE_AP_ 0x03 -+ -+ -+#define _1M_RATE_ 0 -+#define _2M_RATE_ 1 -+#define _5M_RATE_ 2 -+#define _11M_RATE_ 3 -+#define _6M_RATE_ 4 -+#define _9M_RATE_ 5 -+#define _12M_RATE_ 6 -+#define _18M_RATE_ 7 -+#define _24M_RATE_ 8 -+#define _36M_RATE_ 9 -+#define _48M_RATE_ 10 -+#define _54M_RATE_ 11 -+ -+ -+extern unsigned char RTW_WPA_OUI[]; -+extern unsigned char WMM_OUI[]; -+extern unsigned char WPS_OUI[]; -+extern unsigned char WFD_OUI[]; -+extern unsigned char P2P_OUI[]; -+ -+extern unsigned char WMM_INFO_OUI[]; -+extern unsigned char WMM_PARA_OUI[]; -+ -+ -+// -+// Channel Plan Type. -+// Note: -+// We just add new channel plan when the new channel plan is different from any of the following -+// channel plan. -+// If you just wnat to customize the acitions(scan period or join actions) about one of the channel plan, -+// customize them in RT_CHANNEL_INFO in the RT_CHANNEL_LIST. -+// -+typedef enum _RT_CHANNEL_DOMAIN -+{ -+ //===== old channel plan mapping =====// -+ RT_CHANNEL_DOMAIN_FCC = 0x00, -+ RT_CHANNEL_DOMAIN_IC = 0x01, -+ RT_CHANNEL_DOMAIN_ETSI = 0x02, -+ RT_CHANNEL_DOMAIN_SPAIN = 0x03, -+ RT_CHANNEL_DOMAIN_FRANCE = 0x04, -+ RT_CHANNEL_DOMAIN_MKK = 0x05, -+ RT_CHANNEL_DOMAIN_MKK1 = 0x06, -+ RT_CHANNEL_DOMAIN_ISRAEL = 0x07, -+ RT_CHANNEL_DOMAIN_TELEC = 0x08, -+ RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN = 0x09, -+ RT_CHANNEL_DOMAIN_WORLD_WIDE_13 = 0x0A, -+ RT_CHANNEL_DOMAIN_TAIWAN = 0x0B, -+ RT_CHANNEL_DOMAIN_CHINA = 0x0C, -+ RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO = 0x0D, -+ RT_CHANNEL_DOMAIN_KOREA = 0x0E, -+ RT_CHANNEL_DOMAIN_TURKEY = 0x0F, -+ RT_CHANNEL_DOMAIN_JAPAN = 0x10, -+ RT_CHANNEL_DOMAIN_FCC_NO_DFS = 0x11, -+ RT_CHANNEL_DOMAIN_JAPAN_NO_DFS = 0x12, -+ RT_CHANNEL_DOMAIN_WORLD_WIDE_5G = 0x13, -+ RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS = 0x14, -+ -+ //===== new channel plan mapping, (2GDOMAIN_5GDOMAIN) =====// -+ RT_CHANNEL_DOMAIN_WORLD_NULL = 0x20, -+ RT_CHANNEL_DOMAIN_ETSI1_NULL = 0x21, -+ RT_CHANNEL_DOMAIN_FCC1_NULL = 0x22, -+ RT_CHANNEL_DOMAIN_MKK1_NULL = 0x23, -+ RT_CHANNEL_DOMAIN_ETSI2_NULL = 0x24, -+ RT_CHANNEL_DOMAIN_FCC1_FCC1 = 0x25, -+ RT_CHANNEL_DOMAIN_WORLD_ETSI1 = 0x26, -+ RT_CHANNEL_DOMAIN_MKK1_MKK1 = 0x27, -+ RT_CHANNEL_DOMAIN_WORLD_KCC1 = 0x28, -+ RT_CHANNEL_DOMAIN_WORLD_FCC2 = 0x29, -+ RT_CHANNEL_DOMAIN_WORLD_FCC3 = 0x30, -+ RT_CHANNEL_DOMAIN_WORLD_FCC4 = 0x31, -+ RT_CHANNEL_DOMAIN_WORLD_FCC5 = 0x32, -+ RT_CHANNEL_DOMAIN_WORLD_FCC6 = 0x33, -+ RT_CHANNEL_DOMAIN_FCC1_FCC7 = 0x34, -+ RT_CHANNEL_DOMAIN_WORLD_ETSI2 = 0x35, -+ RT_CHANNEL_DOMAIN_WORLD_ETSI3 = 0x36, -+ RT_CHANNEL_DOMAIN_MKK1_MKK2 = 0x37, -+ RT_CHANNEL_DOMAIN_MKK1_MKK3 = 0x38, -+ RT_CHANNEL_DOMAIN_FCC1_NCC1 = 0x39, -+ RT_CHANNEL_DOMAIN_FCC1_NCC2 = 0x40, -+ -+ //===== Add new channel plan above this line===============// -+ RT_CHANNEL_DOMAIN_MAX, -+ RT_CHANNEL_DOMAIN_REALTEK_DEFINE = 0x7F, -+}RT_CHANNEL_DOMAIN, *PRT_CHANNEL_DOMAIN; -+ -+typedef enum _RT_CHANNEL_DOMAIN_2G -+{ -+ RT_CHANNEL_DOMAIN_2G_WORLD = 0x00, //Worldwird 13 -+ RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01, //Europe -+ RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02, //US -+ RT_CHANNEL_DOMAIN_2G_MKK1 = 0x03, //Japan -+ RT_CHANNEL_DOMAIN_2G_ETSI2 = 0x04, //France -+ RT_CHANNEL_DOMAIN_2G_NULL = 0x05, -+ //===== Add new channel plan above this line===============// -+ RT_CHANNEL_DOMAIN_2G_MAX, -+}RT_CHANNEL_DOMAIN_2G, *PRT_CHANNEL_DOMAIN_2G; -+ -+typedef enum _RT_CHANNEL_DOMAIN_5G -+{ -+ RT_CHANNEL_DOMAIN_5G_NULL = 0x00, -+ RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, //Europe -+ RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02, //Australia, New Zealand -+ RT_CHANNEL_DOMAIN_5G_ETSI3 = 0x03, //Russia -+ RT_CHANNEL_DOMAIN_5G_FCC1 = 0x04, //US -+ RT_CHANNEL_DOMAIN_5G_FCC2 = 0x05, //FCC o/w DFS Channels -+ RT_CHANNEL_DOMAIN_5G_FCC3 = 0x06, //India, Mexico -+ RT_CHANNEL_DOMAIN_5G_FCC4 = 0x07, //Venezuela -+ RT_CHANNEL_DOMAIN_5G_FCC5 = 0x08, //China -+ RT_CHANNEL_DOMAIN_5G_FCC6 = 0x09, //Israel -+ RT_CHANNEL_DOMAIN_5G_FCC7_IC1 = 0x0A, //US, Canada -+ RT_CHANNEL_DOMAIN_5G_KCC1 = 0x0B, //Korea -+ RT_CHANNEL_DOMAIN_5G_MKK1 = 0x0C, //Japan -+ RT_CHANNEL_DOMAIN_5G_MKK2 = 0x0D, //Japan (W52, W53) -+ RT_CHANNEL_DOMAIN_5G_MKK3 = 0x0E, //Japan (W56) -+ RT_CHANNEL_DOMAIN_5G_NCC1 = 0x0F, //Taiwan -+ RT_CHANNEL_DOMAIN_5G_NCC2 = 0x10, //Taiwan o/w DFS -+ //===== Add new channel plan above this line===============// -+ //===== Driver Self Defined =====// -+ RT_CHANNEL_DOMAIN_5G_FCC = 0x11, -+ RT_CHANNEL_DOMAIN_5G_JAPAN_NO_DFS = 0x12, -+ RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS = 0x13, -+ RT_CHANNEL_DOMAIN_5G_MAX, -+}RT_CHANNEL_DOMAIN_5G, *PRT_CHANNEL_DOMAIN_5G; -+ -+#define rtw_is_channel_plan_valid(chplan) (chplansurvey_timer, (ms)); \ -+ } while(0) -+ -+#define set_link_timer(mlmeext, ms) \ -+ do { \ -+ /*DBG_871X("%s set_link_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \ -+ _set_timer(&(mlmeext)->link_timer, (ms)); \ -+ } while(0) -+#ifdef CONFIG_IEEE80211W -+#define set_sa_query_timer(mlmeext, ms) \ -+ do { \ -+ DBG_871X("%s set_sa_query_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms)); \ -+ _set_timer(&(mlmeext)->sa_query_timer, (ms)); \ -+ } while(0) -+#endif //CONFIG_IEEE80211W -+extern int cckrates_included(unsigned char *rate, int ratelen); -+extern int cckratesonly_included(unsigned char *rate, int ratelen); -+ -+extern void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr); -+ -+extern void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); -+extern void correct_TSF(_adapter *padapter, struct mlme_ext_priv *pmlmeext); -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ sint check_buddy_mlmeinfo_state(_adapter *padapter, u32 state); -+void concurrent_chk_joinbss_done(_adapter *padapter, int join_res); -+#endif //CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+void dc_SelectChannel(_adapter *padapter, unsigned char channel); -+void dc_SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset); -+void dc_set_channel_bwmode_disconnect(_adapter *padapter); -+u8 dc_handle_join_request(_adapter *padapter); -+void dc_handle_join_done(_adapter *padapter, u8 join_res); -+sint dc_check_fwstate(_adapter *padapter, sint fw_state); -+u8 dc_handle_site_survey(_adapter *padapter); -+void dc_report_survey_event(_adapter *padapter, union recv_frame *precv_frame); -+void dc_set_channel_bwmode_survey_done(_adapter *padapter); -+void dc_set_ap_channel_bandwidth(_adapter *padapter, u8 channel, u8 channel_offset, u8 bwmode); -+void dc_resume_xmit(_adapter *padapter); -+u8 dc_check_xmit(_adapter *padapter); -+#endif -+ -+int rtw_chk_start_clnt_join(_adapter *padapter); -+int rtw_get_ch_setting_union(_adapter *adapter, u8 *ch, u8 *bw, u8 *offset); -+ -+struct cmd_hdl { -+ uint parmsize; -+ u8 (*h2cfuns)(struct _ADAPTER *padapter, u8 *pbuf); -+}; -+ -+ -+u8 read_macreg_hdl(_adapter *padapter, u8 *pbuf); -+u8 write_macreg_hdl(_adapter *padapter, u8 *pbuf); -+u8 read_bbreg_hdl(_adapter *padapter, u8 *pbuf); -+u8 write_bbreg_hdl(_adapter *padapter, u8 *pbuf); -+u8 read_rfreg_hdl(_adapter *padapter, u8 *pbuf); -+u8 write_rfreg_hdl(_adapter *padapter, u8 *pbuf); -+ -+ -+u8 NULL_hdl(_adapter *padapter, u8 *pbuf); -+u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf); -+u8 disconnect_hdl(_adapter *padapter, u8 *pbuf); -+u8 createbss_hdl(_adapter *padapter, u8 *pbuf); -+u8 setopmode_hdl(_adapter *padapter, u8 *pbuf); -+u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf); -+u8 setauth_hdl(_adapter *padapter, u8 *pbuf); -+u8 setkey_hdl(_adapter *padapter, u8 *pbuf); -+u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf); -+u8 set_assocsta_hdl(_adapter *padapter, u8 *pbuf); -+u8 del_assocsta_hdl(_adapter *padapter, u8 *pbuf); -+u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf); -+ -+u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf); -+u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf); -+u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf); -+u8 set_ch_hdl(_adapter *padapter, u8 *pbuf); -+u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf); -+u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf); -+u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf); //Kurt: Handling DFS channel switch announcement ie. -+u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf); -+ -+ -+#define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl}, -+#define GEN_MLME_EXT_HANDLER(size, cmd) {size, cmd}, -+ -+#ifdef _RTW_CMD_C_ -+ -+struct cmd_hdl wlancmds[] = -+{ -+ GEN_DRV_CMD_HANDLER(0, NULL) /*0*/ -+ GEN_DRV_CMD_HANDLER(0, NULL) -+ GEN_DRV_CMD_HANDLER(0, NULL) -+ GEN_DRV_CMD_HANDLER(0, NULL) -+ GEN_DRV_CMD_HANDLER(0, NULL) -+ GEN_DRV_CMD_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) /*10*/ -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct joinbss_parm), join_cmd_hdl) /*14*/ -+ GEN_MLME_EXT_HANDLER(sizeof (struct disconnect_parm), disconnect_hdl) -+ GEN_MLME_EXT_HANDLER(sizeof (struct createbss_parm), createbss_hdl) -+ GEN_MLME_EXT_HANDLER(sizeof (struct setopmode_parm), setopmode_hdl) -+ GEN_MLME_EXT_HANDLER(sizeof (struct sitesurvey_parm), sitesurvey_cmd_hdl) /*18*/ -+ GEN_MLME_EXT_HANDLER(sizeof (struct setauth_parm), setauth_hdl) -+ GEN_MLME_EXT_HANDLER(sizeof (struct setkey_parm), setkey_hdl) /*20*/ -+ GEN_MLME_EXT_HANDLER(sizeof (struct set_stakey_parm), set_stakey_hdl) -+ GEN_MLME_EXT_HANDLER(sizeof (struct set_assocsta_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct del_assocsta_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct setstapwrstate_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct setbasicrate_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct getbasicrate_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct setdatarate_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct getdatarate_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct setphyinfo_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct getphyinfo_parm), NULL) /*30*/ -+ GEN_MLME_EXT_HANDLER(sizeof (struct setphy_parm), NULL) -+ GEN_MLME_EXT_HANDLER(sizeof (struct getphy_parm), NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) /*40*/ -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(sizeof(struct addBaReq_parm), add_ba_hdl) -+ GEN_MLME_EXT_HANDLER(sizeof(struct set_ch_parm), set_ch_hdl) /* 46 */ -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) /*50*/ -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(0, NULL) -+ GEN_MLME_EXT_HANDLER(sizeof(struct Tx_Beacon_param), tx_beacon_hdl) /*55*/ -+ -+ GEN_MLME_EXT_HANDLER(0, mlme_evt_hdl) /*56*/ -+ GEN_MLME_EXT_HANDLER(0, rtw_drvextra_cmd_hdl) /*57*/ -+ -+ GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/ -+ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl) /*59*/ -+ GEN_MLME_EXT_HANDLER(sizeof(struct LedBlink_param), led_blink_hdl) /*60*/ -+ GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*61*/ -+ GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*62*/ -+}; -+ -+#endif -+ -+struct C2HEvent_Header -+{ -+ -+#ifdef CONFIG_LITTLE_ENDIAN -+ -+ unsigned int len:16; -+ unsigned int ID:8; -+ unsigned int seq:8; -+ -+#elif defined(CONFIG_BIG_ENDIAN) -+ -+ unsigned int seq:8; -+ unsigned int ID:8; -+ unsigned int len:16; -+ -+#else -+ -+# error "Must be LITTLE or BIG Endian" -+ -+#endif -+ -+ unsigned int rsvd; -+ -+}; -+ -+void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf); -+void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf); -+ -+enum rtw_c2h_event -+{ -+ GEN_EVT_CODE(_Read_MACREG)=0, /*0*/ -+ GEN_EVT_CODE(_Read_BBREG), -+ GEN_EVT_CODE(_Read_RFREG), -+ GEN_EVT_CODE(_Read_EEPROM), -+ GEN_EVT_CODE(_Read_EFUSE), -+ GEN_EVT_CODE(_Read_CAM), /*5*/ -+ GEN_EVT_CODE(_Get_BasicRate), -+ GEN_EVT_CODE(_Get_DataRate), -+ GEN_EVT_CODE(_Survey), /*8*/ -+ GEN_EVT_CODE(_SurveyDone), /*9*/ -+ -+ GEN_EVT_CODE(_JoinBss) , /*10*/ -+ GEN_EVT_CODE(_AddSTA), -+ GEN_EVT_CODE(_DelSTA), -+ GEN_EVT_CODE(_AtimDone) , -+ GEN_EVT_CODE(_TX_Report), -+ GEN_EVT_CODE(_CCX_Report), /*15*/ -+ GEN_EVT_CODE(_DTM_Report), -+ GEN_EVT_CODE(_TX_Rate_Statistics), -+ GEN_EVT_CODE(_C2HLBK), -+ GEN_EVT_CODE(_FWDBG), -+ GEN_EVT_CODE(_C2HFEEDBACK), /*20*/ -+ GEN_EVT_CODE(_ADDBA), -+ GEN_EVT_CODE(_C2HBCN), -+ GEN_EVT_CODE(_ReportPwrState), //filen: only for PCIE, USB -+ GEN_EVT_CODE(_CloseRF), //filen: only for PCIE, work around ASPM -+ MAX_C2HEVT -+}; -+ -+ -+#ifdef _RTW_MLME_EXT_C_ -+ -+static struct fwevent wlanevents[] = -+{ -+ {0, rtw_dummy_event_callback}, /*0*/ -+ {0, NULL}, -+ {0, NULL}, -+ {0, NULL}, -+ {0, NULL}, -+ {0, NULL}, -+ {0, NULL}, -+ {0, NULL}, -+ {0, &rtw_survey_event_callback}, /*8*/ -+ {sizeof (struct surveydone_event), &rtw_surveydone_event_callback}, /*9*/ -+ -+ {0, &rtw_joinbss_event_callback}, /*10*/ -+ {sizeof(struct stassoc_event), &rtw_stassoc_event_callback}, -+ {sizeof(struct stadel_event), &rtw_stadel_event_callback}, -+ {0, &rtw_atimdone_event_callback}, -+ {0, rtw_dummy_event_callback}, -+ {0, NULL}, /*15*/ -+ {0, NULL}, -+ {0, NULL}, -+ {0, NULL}, -+ {0, rtw_fwdbg_event_callback}, -+ {0, NULL}, /*20*/ -+ {0, NULL}, -+ {0, NULL}, -+ {0, &rtw_cpwm_event_callback}, -+}; -+ -+#endif//_RTL8192C_CMD_C_ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h -@@ -0,0 +1,712 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_MP_H_ -+#define _RTW_MP_H_ -+ -+#ifndef PLATFORM_WINDOWS -+// 00 - Success -+// 11 - Error -+#define STATUS_SUCCESS (0x00000000L) -+#define STATUS_PENDING (0x00000103L) -+ -+#define STATUS_UNSUCCESSFUL (0xC0000001L) -+#define STATUS_INSUFFICIENT_RESOURCES (0xC000009AL) -+#define STATUS_NOT_SUPPORTED (0xC00000BBL) -+ -+#define NDIS_STATUS_SUCCESS ((NDIS_STATUS)STATUS_SUCCESS) -+#define NDIS_STATUS_PENDING ((NDIS_STATUS)STATUS_PENDING) -+#define NDIS_STATUS_NOT_RECOGNIZED ((NDIS_STATUS)0x00010001L) -+#define NDIS_STATUS_NOT_COPIED ((NDIS_STATUS)0x00010002L) -+#define NDIS_STATUS_NOT_ACCEPTED ((NDIS_STATUS)0x00010003L) -+#define NDIS_STATUS_CALL_ACTIVE ((NDIS_STATUS)0x00010007L) -+ -+#define NDIS_STATUS_FAILURE ((NDIS_STATUS)STATUS_UNSUCCESSFUL) -+#define NDIS_STATUS_RESOURCES ((NDIS_STATUS)STATUS_INSUFFICIENT_RESOURCES) -+#define NDIS_STATUS_CLOSING ((NDIS_STATUS)0xC0010002L) -+#define NDIS_STATUS_BAD_VERSION ((NDIS_STATUS)0xC0010004L) -+#define NDIS_STATUS_BAD_CHARACTERISTICS ((NDIS_STATUS)0xC0010005L) -+#define NDIS_STATUS_ADAPTER_NOT_FOUND ((NDIS_STATUS)0xC0010006L) -+#define NDIS_STATUS_OPEN_FAILED ((NDIS_STATUS)0xC0010007L) -+#define NDIS_STATUS_DEVICE_FAILED ((NDIS_STATUS)0xC0010008L) -+#define NDIS_STATUS_MULTICAST_FULL ((NDIS_STATUS)0xC0010009L) -+#define NDIS_STATUS_MULTICAST_EXISTS ((NDIS_STATUS)0xC001000AL) -+#define NDIS_STATUS_MULTICAST_NOT_FOUND ((NDIS_STATUS)0xC001000BL) -+#define NDIS_STATUS_REQUEST_ABORTED ((NDIS_STATUS)0xC001000CL) -+#define NDIS_STATUS_RESET_IN_PROGRESS ((NDIS_STATUS)0xC001000DL) -+#define NDIS_STATUS_CLOSING_INDICATING ((NDIS_STATUS)0xC001000EL) -+#define NDIS_STATUS_NOT_SUPPORTED ((NDIS_STATUS)STATUS_NOT_SUPPORTED) -+#define NDIS_STATUS_INVALID_PACKET ((NDIS_STATUS)0xC001000FL) -+#define NDIS_STATUS_OPEN_LIST_FULL ((NDIS_STATUS)0xC0010010L) -+#define NDIS_STATUS_ADAPTER_NOT_READY ((NDIS_STATUS)0xC0010011L) -+#define NDIS_STATUS_ADAPTER_NOT_OPEN ((NDIS_STATUS)0xC0010012L) -+#define NDIS_STATUS_NOT_INDICATING ((NDIS_STATUS)0xC0010013L) -+#define NDIS_STATUS_INVALID_LENGTH ((NDIS_STATUS)0xC0010014L) -+#define NDIS_STATUS_INVALID_DATA ((NDIS_STATUS)0xC0010015L) -+#define NDIS_STATUS_BUFFER_TOO_SHORT ((NDIS_STATUS)0xC0010016L) -+#define NDIS_STATUS_INVALID_OID ((NDIS_STATUS)0xC0010017L) -+#define NDIS_STATUS_ADAPTER_REMOVED ((NDIS_STATUS)0xC0010018L) -+#define NDIS_STATUS_UNSUPPORTED_MEDIA ((NDIS_STATUS)0xC0010019L) -+#define NDIS_STATUS_GROUP_ADDRESS_IN_USE ((NDIS_STATUS)0xC001001AL) -+#define NDIS_STATUS_FILE_NOT_FOUND ((NDIS_STATUS)0xC001001BL) -+#define NDIS_STATUS_ERROR_READING_FILE ((NDIS_STATUS)0xC001001CL) -+#define NDIS_STATUS_ALREADY_MAPPED ((NDIS_STATUS)0xC001001DL) -+#define NDIS_STATUS_RESOURCE_CONFLICT ((NDIS_STATUS)0xC001001EL) -+#define NDIS_STATUS_NO_CABLE ((NDIS_STATUS)0xC001001FL) -+ -+#define NDIS_STATUS_INVALID_SAP ((NDIS_STATUS)0xC0010020L) -+#define NDIS_STATUS_SAP_IN_USE ((NDIS_STATUS)0xC0010021L) -+#define NDIS_STATUS_INVALID_ADDRESS ((NDIS_STATUS)0xC0010022L) -+#define NDIS_STATUS_VC_NOT_ACTIVATED ((NDIS_STATUS)0xC0010023L) -+#define NDIS_STATUS_DEST_OUT_OF_ORDER ((NDIS_STATUS)0xC0010024L) // cause 27 -+#define NDIS_STATUS_VC_NOT_AVAILABLE ((NDIS_STATUS)0xC0010025L) // cause 35,45 -+#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE ((NDIS_STATUS)0xC0010026L) // cause 37 -+#define NDIS_STATUS_INCOMPATABLE_QOS ((NDIS_STATUS)0xC0010027L) // cause 49 -+#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED ((NDIS_STATUS)0xC0010028L) // cause 93 -+#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION ((NDIS_STATUS)0xC0010029L) // cause 3 -+#endif /* #ifndef PLATFORM_WINDOWS */ -+ -+#if 0 -+#define MPT_NOOP 0 -+#define MPT_READ_MAC_1BYTE 1 -+#define MPT_READ_MAC_2BYTE 2 -+#define MPT_READ_MAC_4BYTE 3 -+#define MPT_WRITE_MAC_1BYTE 4 -+#define MPT_WRITE_MAC_2BYTE 5 -+#define MPT_WRITE_MAC_4BYTE 6 -+#define MPT_READ_BB_CCK 7 -+#define MPT_WRITE_BB_CCK 8 -+#define MPT_READ_BB_OFDM 9 -+#define MPT_WRITE_BB_OFDM 10 -+#define MPT_READ_RF 11 -+#define MPT_WRITE_RF 12 -+#define MPT_READ_EEPROM_1BYTE 13 -+#define MPT_WRITE_EEPROM_1BYTE 14 -+#define MPT_READ_EEPROM_2BYTE 15 -+#define MPT_WRITE_EEPROM_2BYTE 16 -+#define MPT_SET_CSTHRESHOLD 21 -+#define MPT_SET_INITGAIN 22 -+#define MPT_SWITCH_BAND 23 -+#define MPT_SWITCH_CHANNEL 24 -+#define MPT_SET_DATARATE 25 -+#define MPT_SWITCH_ANTENNA 26 -+#define MPT_SET_TX_POWER 27 -+#define MPT_SET_CONT_TX 28 -+#define MPT_SET_SINGLE_CARRIER 29 -+#define MPT_SET_CARRIER_SUPPRESSION 30 -+#define MPT_GET_RATE_TABLE 31 -+#define MPT_READ_TSSI 32 -+#define MPT_GET_THERMAL_METER 33 -+#endif -+ -+#define MAX_MP_XMITBUF_SZ 2048 -+#define NR_MP_XMITFRAME 8 -+ -+struct mp_xmit_frame -+{ -+ _list list; -+ -+ struct pkt_attrib attrib; -+ -+ _pkt *pkt; -+ -+ int frame_tag; -+ -+ _adapter *padapter; -+ -+#ifdef CONFIG_USB_HCI -+ -+ //insert urb, irp, and irpcnt info below... -+ //max frag_cnt = 8 -+ -+ u8 *mem_addr; -+ u32 sz[8]; -+ -+#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) -+ PURB pxmit_urb[8]; -+#endif -+ -+#ifdef PLATFORM_OS_XP -+ PIRP pxmit_irp[8]; -+#endif -+ -+ u8 bpending[8]; -+ sint ac_tag[8]; -+ sint last[8]; -+ uint irpcnt; -+ uint fragcnt; -+#endif /* CONFIG_USB_HCI */ -+ -+ uint mem[(MAX_MP_XMITBUF_SZ >> 2)]; -+}; -+ -+struct mp_wiparam -+{ -+ u32 bcompleted; -+ u32 act_type; -+ u32 io_offset; -+ u32 io_value; -+}; -+ -+typedef void(*wi_act_func)(void* padapter); -+ -+#ifdef PLATFORM_WINDOWS -+struct mp_wi_cntx -+{ -+ u8 bmpdrv_unload; -+ -+ // Work Item -+ NDIS_WORK_ITEM mp_wi; -+ NDIS_EVENT mp_wi_evt; -+ _lock mp_wi_lock; -+ u8 bmp_wi_progress; -+ wi_act_func curractfunc; -+ // Variable needed in each implementation of CurrActFunc. -+ struct mp_wiparam param; -+}; -+#endif -+ -+struct mp_tx -+{ -+ u8 stop; -+ u32 count, sended; -+ u8 payload; -+ struct pkt_attrib attrib; -+ struct tx_desc desc; -+ u8 *pallocated_buf; -+ u8 *buf; -+ u32 buf_size, write_size; -+ _thread_hdl_ PktTxThread; -+}; -+ -+//#if (MP_DRIVER == 1) -+#if defined(CONFIG_RTL8192C) || defined(CONFIG_RTL8192D) || defined(CONFIG_RTL8723A) || defined(CONFIG_RTL8188E) -+#ifdef CONFIG_RTL8192C -+#include -+#endif -+#ifdef CONFIG_RTL8192D -+#include -+#endif -+#ifdef CONFIG_RTL8723A -+#include -+#endif -+#ifdef CONFIG_RTL8188E -+#include -+#endif -+#define MP_MAX_LINES 1000 -+#define MP_MAX_LINES_BYTES 256 -+#define u1Byte u8 -+#define s1Byte s8 -+#define u4Byte u32 -+#define s4Byte s32 -+typedef VOID (*MPT_WORK_ITEM_HANDLER)(IN PVOID Adapter); -+typedef struct _MPT_CONTEXT -+{ -+ // Indicate if we have started Mass Production Test. -+ BOOLEAN bMassProdTest; -+ -+ // Indicate if the driver is unloading or unloaded. -+ BOOLEAN bMptDrvUnload; -+ -+ /* 8190 PCI does not support NDIS_WORK_ITEM. */ -+ // Work Item for Mass Production Test. -+ //NDIS_WORK_ITEM MptWorkItem; -+// RT_WORK_ITEM MptWorkItem; -+ // Event used to sync the case unloading driver and MptWorkItem is still in progress. -+// NDIS_EVENT MptWorkItemEvent; -+ // To protect the following variables. -+// NDIS_SPIN_LOCK MptWorkItemSpinLock; -+ // Indicate a MptWorkItem is scheduled and not yet finished. -+ BOOLEAN bMptWorkItemInProgress; -+ // An instance which implements function and context of MptWorkItem. -+ MPT_WORK_ITEM_HANDLER CurrMptAct; -+ -+ // 1=Start, 0=Stop from UI. -+ ULONG MptTestStart; -+ // _TEST_MODE, defined in MPT_Req2.h -+ ULONG MptTestItem; -+ // Variable needed in each implementation of CurrMptAct. -+ ULONG MptActType; // Type of action performed in CurrMptAct. -+ // The Offset of IO operation is depend of MptActType. -+ ULONG MptIoOffset; -+ // The Value of IO operation is depend of MptActType. -+ ULONG MptIoValue; -+ // The RfPath of IO operation is depend of MptActType. -+ ULONG MptRfPath; -+ -+ WIRELESS_MODE MptWirelessModeToSw; // Wireless mode to switch. -+ u8 MptChannelToSw; // Channel to switch. -+ u8 MptInitGainToSet; // Initial gain to set. -+ //ULONG bMptAntennaA; // TRUE if we want to use antenna A. -+ ULONG MptBandWidth; // bandwidth to switch. -+ ULONG MptRateIndex; // rate index. -+ // Register value kept for Single Carrier Tx test. -+ u8 btMpCckTxPower; -+ // Register value kept for Single Carrier Tx test. -+ u8 btMpOfdmTxPower; -+ // For MP Tx Power index -+ u8 TxPwrLevel[2]; // rf-A, rf-B -+ -+ // Content of RCR Regsiter for Mass Production Test. -+ ULONG MptRCR; -+ // TRUE if we only receive packets with specific pattern. -+ BOOLEAN bMptFilterPattern; -+ // Rx OK count, statistics used in Mass Production Test. -+ ULONG MptRxOkCnt; -+ // Rx CRC32 error count, statistics used in Mass Production Test. -+ ULONG MptRxCrcErrCnt; -+ -+ BOOLEAN bCckContTx; // TRUE if we are in CCK Continuous Tx test. -+ BOOLEAN bOfdmContTx; // TRUE if we are in OFDM Continuous Tx test. -+ BOOLEAN bStartContTx; // TRUE if we have start Continuous Tx test. -+ // TRUE if we are in Single Carrier Tx test. -+ BOOLEAN bSingleCarrier; -+ // TRUE if we are in Carrier Suppression Tx Test. -+ BOOLEAN bCarrierSuppression; -+ //TRUE if we are in Single Tone Tx test. -+ BOOLEAN bSingleTone; -+ -+ // ACK counter asked by K.Y.. -+ BOOLEAN bMptEnableAckCounter; -+ ULONG MptAckCounter; -+ -+ // SD3 Willis For 8192S to save 1T/2T RF table for ACUT Only fro ACUT delete later ~~~! -+ //s1Byte BufOfLines[2][MAX_LINES_HWCONFIG_TXT][MAX_BYTES_LINE_HWCONFIG_TXT]; -+ //s1Byte BufOfLines[2][MP_MAX_LINES][MP_MAX_LINES_BYTES]; -+ //s4Byte RfReadLine[2]; -+ -+ u8 APK_bound[2]; //for APK path A/path B -+ BOOLEAN bMptIndexEven; -+ -+ u8 backup0xc50; -+ u8 backup0xc58; -+ u8 backup0xc30; -+}MPT_CONTEXT, *PMPT_CONTEXT; -+#endif -+//#endif -+ -+/* E-Fuse */ -+#ifdef CONFIG_RTL8192D -+#define EFUSE_MAP_SIZE 255 -+#endif -+#ifdef CONFIG_RTL8192C -+#define EFUSE_MAP_SIZE 128 -+#endif -+#ifdef CONFIG_RTL8723A -+#define EFUSE_MAP_SIZE 256 -+#endif -+#ifdef CONFIG_RTL8188E -+#define EFUSE_MAP_SIZE 256 -+#endif -+#define EFUSE_MAX_SIZE 512 -+ -+/* end of E-Fuse */ -+ -+//#define RTPRIV_IOCTL_MP ( SIOCIWFIRSTPRIV + 0x17) -+enum { -+ WRITE_REG = 1, -+ READ_REG, -+ WRITE_RF, -+ READ_RF, -+ MP_START, -+ MP_STOP, -+ MP_RATE, -+ MP_CHANNEL, -+ MP_BANDWIDTH, -+ MP_TXPOWER, -+ MP_ANT_TX, -+ MP_ANT_RX, -+ MP_CTX, -+ MP_QUERY, -+ MP_ARX, -+ MP_PSD, -+ MP_PWRTRK, -+ MP_THER, -+ MP_IOCTL, -+ EFUSE_GET, -+ EFUSE_SET, -+ MP_RESET_STATS, -+ MP_DUMP, -+ MP_PHYPARA, -+ MP_NULL, -+}; -+ -+struct mp_priv -+{ -+ _adapter *papdater; -+ -+ //Testing Flag -+ u32 mode;//0 for normal type packet, 1 for loopback packet (16bytes TXCMD) -+ -+ u32 prev_fw_state; -+ -+ //OID cmd handler -+ struct mp_wiparam workparam; -+// u8 act_in_progress; -+ -+ //Tx Section -+ u8 TID; -+ u32 tx_pktcount; -+ struct mp_tx tx; -+ -+ //Rx Section -+ u32 rx_pktcount; -+ u32 rx_crcerrpktcount; -+ u32 rx_pktloss; -+ -+ struct recv_stat rxstat; -+ -+ //RF/BB relative -+ u8 channel; -+ u8 bandwidth; -+ u8 prime_channel_offset; -+ u8 txpoweridx; -+ u8 txpoweridx_b; -+ u8 rateidx; -+ u32 preamble; -+// u8 modem; -+ u32 CrystalCap; -+// u32 curr_crystalcap; -+ -+ u16 antenna_tx; -+ u16 antenna_rx; -+// u8 curr_rfpath; -+ -+ u8 check_mp_pkt; -+ -+// uint ForcedDataRate; -+ -+ struct wlan_network mp_network; -+ NDIS_802_11_MAC_ADDRESS network_macaddr; -+ -+#ifdef PLATFORM_WINDOWS -+ u32 rx_testcnt; -+ u32 rx_testcnt1; -+ u32 rx_testcnt2; -+ u32 tx_testcnt; -+ u32 tx_testcnt1; -+ -+ struct mp_wi_cntx wi_cntx; -+ -+ u8 h2c_result; -+ u8 h2c_seqnum; -+ u16 h2c_cmdcode; -+ u8 h2c_resp_parambuf[512]; -+ _lock h2c_lock; -+ _lock wkitm_lock; -+ u32 h2c_cmdcnt; -+ NDIS_EVENT h2c_cmd_evt; -+ NDIS_EVENT c2h_set; -+ NDIS_EVENT h2c_clr; -+ NDIS_EVENT cpwm_int; -+ -+ NDIS_EVENT scsir_full_evt; -+ NDIS_EVENT scsiw_empty_evt; -+#endif -+ -+ u8 *pallocated_mp_xmitframe_buf; -+ u8 *pmp_xmtframe_buf; -+ _queue free_mp_xmitqueue; -+ u32 free_mp_xmitframe_cnt; -+ -+ MPT_CONTEXT MptCtx; -+}; -+ -+typedef struct _IOCMD_STRUCT_ { -+ u8 cmdclass; -+ u16 value; -+ u8 index; -+}IOCMD_STRUCT; -+ -+struct rf_reg_param { -+ u32 path; -+ u32 offset; -+ u32 value; -+}; -+ -+struct bb_reg_param { -+ u32 offset; -+ u32 value; -+}; -+//======================================================================= -+ -+#define LOWER _TRUE -+#define RAISE _FALSE -+ -+/* Hardware Registers */ -+#if 0 -+#if 0 -+#define IOCMD_CTRL_REG 0x102502C0 -+#define IOCMD_DATA_REG 0x102502C4 -+#else -+#define IOCMD_CTRL_REG 0x10250370 -+#define IOCMD_DATA_REG 0x10250374 -+#endif -+ -+#define IOCMD_GET_THERMAL_METER 0xFD000028 -+ -+#define IOCMD_CLASS_BB_RF 0xF0 -+#define IOCMD_BB_READ_IDX 0x00 -+#define IOCMD_BB_WRITE_IDX 0x01 -+#define IOCMD_RF_READ_IDX 0x02 -+#define IOCMD_RF_WRIT_IDX 0x03 -+#endif -+#define BB_REG_BASE_ADDR 0x800 -+ -+/* MP variables */ -+#if 0 -+#define _2MAC_MODE_ 0 -+#define _LOOPBOOK_MODE_ 1 -+#endif -+typedef enum _MP_MODE_ { -+ MP_OFF, -+ MP_ON, -+ MP_ERR, -+ MP_CONTINUOUS_TX, -+ MP_SINGLE_CARRIER_TX, -+ MP_CARRIER_SUPPRISSION_TX, -+ MP_SINGLE_TONE_TX, -+ MP_PACKET_TX, -+ MP_PACKET_RX -+} MP_MODE; -+ -+#ifdef CONFIG_RTL8192C -+#define RF_PATH_A RF_PATH_A -+#define RF_PATH_B RF_PATH_B -+#define RF_PATH_C RF_PATH_C -+#define RF_PATH_D RF_PATH_D -+ -+#define MAX_RF_PATH_NUMS RF_PATH_MAX -+#else -+#define RF_PATH_A 0 -+#define RF_PATH_B 1 -+#define RF_PATH_C 2 -+#define RF_PATH_D 3 -+ -+#define MAX_RF_PATH_NUMS 2 -+#endif -+ -+extern u8 mpdatarate[NumRates]; -+ -+/* MP set force data rate base on the definition. */ -+typedef enum _MPT_RATE_INDEX -+{ -+ /* CCK rate. */ -+ MPT_RATE_1M, /* 0 */ -+ MPT_RATE_2M, -+ MPT_RATE_55M, -+ MPT_RATE_11M, /* 3 */ -+ -+ /* OFDM rate. */ -+ MPT_RATE_6M, /* 4 */ -+ MPT_RATE_9M, -+ MPT_RATE_12M, -+ MPT_RATE_18M, -+ MPT_RATE_24M, -+ MPT_RATE_36M, -+ MPT_RATE_48M, -+ MPT_RATE_54M, /* 11 */ -+ -+ /* HT rate. */ -+ MPT_RATE_MCS0, /* 12 */ -+ MPT_RATE_MCS1, -+ MPT_RATE_MCS2, -+ MPT_RATE_MCS3, -+ MPT_RATE_MCS4, -+ MPT_RATE_MCS5, -+ MPT_RATE_MCS6, -+ MPT_RATE_MCS7, /* 19 */ -+ MPT_RATE_MCS8, -+ MPT_RATE_MCS9, -+ MPT_RATE_MCS10, -+ MPT_RATE_MCS11, -+ MPT_RATE_MCS12, -+ MPT_RATE_MCS13, -+ MPT_RATE_MCS14, -+ MPT_RATE_MCS15, /* 27 */ -+ MPT_RATE_LAST -+}MPT_RATE_E, *PMPT_RATE_E; -+ -+#if 0 -+// Represent Channel Width in HT Capabilities -+typedef enum _HT_CHANNEL_WIDTH { -+ HT_CHANNEL_WIDTH_20 = 0, -+ HT_CHANNEL_WIDTH_40 = 1, -+}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; -+#endif -+ -+#define MAX_TX_PWR_INDEX_N_MODE 64 // 0x3F -+ -+typedef enum _POWER_MODE_ { -+ POWER_LOW = 0, -+ POWER_NORMAL -+}POWER_MODE; -+ -+ -+#define RX_PKT_BROADCAST 1 -+#define RX_PKT_DEST_ADDR 2 -+#define RX_PKT_PHY_MATCH 3 -+ -+#if 0 -+#define RPTMaxCount 0x000FFFFF; -+ -+// parameter 1 : BitMask -+// bit 0 : OFDM PPDU -+// bit 1 : OFDM False Alarm -+// bit 2 : OFDM MPDU OK -+// bit 3 : OFDM MPDU Fail -+// bit 4 : CCK PPDU -+// bit 5 : CCK False Alarm -+// bit 6 : CCK MPDU ok -+// bit 7 : CCK MPDU fail -+// bit 8 : HT PPDU counter -+// bit 9 : HT false alarm -+// bit 10 : HT MPDU total -+// bit 11 : HT MPDU OK -+// bit 12 : HT MPDU fail -+// bit 15 : RX full drop -+typedef enum _RXPHY_BITMASK_ -+{ -+ OFDM_PPDU_BIT = 0, -+ OFDM_FALSE_BIT, -+ OFDM_MPDU_OK_BIT, -+ OFDM_MPDU_FAIL_BIT, -+ CCK_PPDU_BIT, -+ CCK_FALSE_BIT, -+ CCK_MPDU_OK_BIT, -+ CCK_MPDU_FAIL_BIT, -+ HT_PPDU_BIT, -+ HT_FALSE_BIT, -+ HT_MPDU_BIT, -+ HT_MPDU_OK_BIT, -+ HT_MPDU_FAIL_BIT, -+} RXPHY_BITMASK; -+#endif -+ -+typedef enum _ENCRY_CTRL_STATE_ { -+ HW_CONTROL, //hw encryption& decryption -+ SW_CONTROL, //sw encryption& decryption -+ HW_ENCRY_SW_DECRY, //hw encryption & sw decryption -+ SW_ENCRY_HW_DECRY //sw encryption & hw decryption -+}ENCRY_CTRL_STATE; -+ -+typedef enum _OFDM_TX_MODE { -+ OFDM_ALL_OFF = 0, -+ OFDM_ContinuousTx = 1, -+ OFDM_SingleCarrier = 2, -+ OFDM_SingleTone = 4, -+} OFDM_TX_MODE; -+ -+//======================================================================= -+//extern struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv); -+//extern int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe); -+ -+extern s32 init_mp_priv(PADAPTER padapter); -+extern void free_mp_priv(struct mp_priv *pmp_priv); -+extern s32 MPT_InitializeAdapter(PADAPTER padapter, u8 Channel); -+extern void MPT_DeInitAdapter(PADAPTER padapter); -+extern s32 mp_start_test(PADAPTER padapter); -+extern void mp_stop_test(PADAPTER padapter); -+ -+//======================================================================= -+//extern void IQCalibrateBcut(PADAPTER pAdapter); -+ -+//extern u32 bb_reg_read(PADAPTER Adapter, u16 offset); -+//extern u8 bb_reg_write(PADAPTER Adapter, u16 offset, u32 value); -+//extern u32 rf_reg_read(PADAPTER Adapter, u8 path, u8 offset); -+//extern u8 rf_reg_write(PADAPTER Adapter, u8 path, u8 offset, u32 value); -+ -+//extern u32 get_bb_reg(PADAPTER Adapter, u16 offset, u32 bitmask); -+//extern u8 set_bb_reg(PADAPTER Adapter, u16 offset, u32 bitmask, u32 value); -+//extern u32 get_rf_reg(PADAPTER Adapter, u8 path, u8 offset, u32 bitmask); -+//extern u8 set_rf_reg(PADAPTER Adapter, u8 path, u8 offset, u32 bitmask, u32 value); -+ -+extern u32 _read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask); -+extern void _write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val); -+ -+extern u32 read_macreg(_adapter *padapter, u32 addr, u32 sz); -+extern void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz); -+extern u32 read_bbreg(_adapter *padapter, u32 addr, u32 bitmask); -+extern void write_bbreg(_adapter *padapter, u32 addr, u32 bitmask, u32 val); -+extern u32 read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr); -+extern void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val); -+ -+extern void SetChannel(PADAPTER pAdapter); -+extern void SetBandwidth(PADAPTER pAdapter); -+extern void SetTxPower(PADAPTER pAdapter); -+extern void SetAntennaPathPower(PADAPTER pAdapter); -+//extern void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset); -+extern void SetDataRate(PADAPTER pAdapter); -+ -+extern void SetAntenna(PADAPTER pAdapter); -+ -+//extern void SetCrystalCap(PADAPTER pAdapter); -+ -+extern s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther); -+extern void GetThermalMeter(PADAPTER pAdapter, u8 *value); -+ -+extern void SetContinuousTx(PADAPTER pAdapter, u8 bStart); -+extern void SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart); -+extern void SetSingleToneTx(PADAPTER pAdapter, u8 bStart); -+extern void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); -+ -+extern void fill_txdesc_for_mp(PADAPTER padapter, struct tx_desc *ptxdesc); -+extern void SetPacketTx(PADAPTER padapter); -+extern void SetPacketRx(PADAPTER pAdapter, u8 bStartRx); -+ -+extern void ResetPhyRxPktCount(PADAPTER pAdapter); -+extern u32 GetPhyRxPktReceived(PADAPTER pAdapter); -+extern u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter); -+ -+extern s32 SetPowerTracking(PADAPTER padapter, u8 enable); -+extern void GetPowerTracking(PADAPTER padapter, u8 *enable); -+ -+extern u32 mp_query_psd(PADAPTER pAdapter, u8 *data); -+ -+ -+extern void Hal_SetAntenna(PADAPTER pAdapter); -+extern void Hal_SetBandwidth(PADAPTER pAdapter); -+ -+extern void Hal_SetTxPower(PADAPTER pAdapter); -+extern void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetSingleToneTx ( PADAPTER pAdapter , u8 bStart ); -+extern void Hal_SetSingleCarrierTx (PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetContinuousTx (PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetBandwidth(PADAPTER pAdapter); -+ -+extern void Hal_SetDataRate(PADAPTER pAdapter); -+extern void Hal_SetChannel(PADAPTER pAdapter); -+extern void Hal_SetAntennaPathPower(PADAPTER pAdapter); -+extern s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther); -+extern s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable); -+extern void Hal_GetPowerTracking(PADAPTER padapter, u8 * enable); -+extern void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value); -+extern void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter); -+extern void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14); -+extern void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven); -+extern void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 * TxPower); -+extern void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 * TxPower); -+extern void Hal_TriggerRFThermalMeter(PADAPTER pAdapter); -+extern u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter); -+extern void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); -+extern void Hal_ProSetCrystalCap (PADAPTER pAdapter , u32 CrystalCapVal); -+ -+#endif //_RTW_MP_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h -@@ -0,0 +1,596 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_MP_IOCTL_H_ -+#define _RTW_MP_IOCTL_H_ -+ -+//#include -+//#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if 0 -+#define TESTFWCMDNUMBER 1000000 -+#define TEST_H2CINT_WAIT_TIME 500 -+#define TEST_C2HINT_WAIT_TIME 500 -+#define HCI_TEST_SYSCFG_HWMASK 1 -+#define _BUSCLK_40M (4 << 2) -+#endif -+//------------------------------------------------------------------------------ -+typedef struct CFG_DBG_MSG_STRUCT { -+ u32 DebugLevel; -+ u32 DebugComponent_H32; -+ u32 DebugComponent_L32; -+}CFG_DBG_MSG_STRUCT,*PCFG_DBG_MSG_STRUCT; -+ -+typedef struct _RW_REG { -+ u32 offset; -+ u32 width; -+ u32 value; -+}mp_rw_reg,RW_Reg, *pRW_Reg; -+ -+//for OID_RT_PRO_READ16_EEPROM & OID_RT_PRO_WRITE16_EEPROM -+typedef struct _EEPROM_RW_PARAM { -+ u32 offset; -+ u16 value; -+}eeprom_rw_param,EEPROM_RWParam, *pEEPROM_RWParam; -+ -+typedef struct _EFUSE_ACCESS_STRUCT_ { -+ u16 start_addr; -+ u16 cnts; -+ u8 data[0]; -+}EFUSE_ACCESS_STRUCT, *PEFUSE_ACCESS_STRUCT; -+ -+typedef struct _BURST_RW_REG { -+ u32 offset; -+ u32 len; -+ u8 Data[256]; -+}burst_rw_reg,Burst_RW_Reg, *pBurst_RW_Reg; -+ -+typedef struct _USB_VendorReq{ -+ u8 bRequest; -+ u16 wValue; -+ u16 wIndex; -+ u16 wLength; -+ u8 u8Dir;//0:OUT, 1:IN -+ u8 u8InData; -+}usb_vendor_req, USB_VendorReq, *pUSB_VendorReq; -+ -+typedef struct _DR_VARIABLE_STRUCT_ { -+ u8 offset; -+ u32 variable; -+}DR_VARIABLE_STRUCT; -+ -+//int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); -+ -+//void _irqlevel_changed_(_irqL *irqlevel, /*BOOLEAN*/unsigned char bLower); -+#ifdef PLATFORM_OS_XP -+static void _irqlevel_changed_(_irqL *irqlevel, u8 bLower) -+{ -+ -+ if (bLower == LOWER) { -+ *irqlevel = KeGetCurrentIrql(); -+ -+ if (*irqlevel > PASSIVE_LEVEL) { -+ KeLowerIrql(PASSIVE_LEVEL); -+ } -+ } else { -+ if (KeGetCurrentIrql() == PASSIVE_LEVEL) { -+ KeRaiseIrql(DISPATCH_LEVEL, irqlevel); -+ } -+ } -+ -+} -+#else -+#define _irqlevel_changed_(a,b) -+#endif -+ -+//oid_rtl_seg_81_80_00 -+NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv* poid_par_priv); -+//oid_rtl_seg_81_80_20 -+NDIS_STATUS oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_modulation_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//oid_rtl_seg_81_87 -+NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//oid_rtl_seg_81_85 -+NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+// oid_rtl_seg_87_11_00 -+NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_burst_write_register_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_write_txcmd_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_write16_eeprom_hdl (struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro8711_wi_poll_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro8711_pkt_loss_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_rd_attrib_mem_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_wr_attrib_mem_hdl (struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_rf_intfs_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_poll_rx_status_hdl(struct oid_par_priv* poid_par_priv); -+// oid_rtl_seg_87_11_20 -+NDIS_STATUS oid_rt_pro_cfg_debug_message_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_basic_rate_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv* poid_par_priv); -+//oid_rtl_seg_87_11_50 -+NDIS_STATUS oid_rt_pro_qry_pwrstate_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_pwrstate_hdl(struct oid_par_priv* poid_par_priv); -+//oid_rtl_seg_87_11_F0 -+NDIS_STATUS oid_rt_pro_h2c_set_rate_table_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_h2c_get_rate_table_hdl(struct oid_par_priv* poid_par_priv); -+ -+ -+//oid_rtl_seg_87_12_00 -+NDIS_STATUS oid_rt_pro_encryption_ctrl_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_add_sta_info_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_dele_sta_info_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_query_dr_variable_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv); -+NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv); -+NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv); -+NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv); -+NDIS_STATUS oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv); -+NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv); -+ -+NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_set_crystal_cap_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_set_rx_packet_type_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_efuse_max_size_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_pro_set_tx_agc_offset_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv* poid_par_priv); -+NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_get_power_mode_hdl(struct oid_par_priv* poid_par_priv); -+ -+NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv); -+ -+#ifdef _RTW_MP_IOCTL_C_ -+ -+const struct oid_obj_priv oid_rtl_seg_81_80_00[] = -+{ -+ {1, &oid_null_function}, //0x00 OID_RT_PRO_RESET_DUT -+ {1, &oid_rt_pro_set_data_rate_hdl}, //0x01 -+ {1, &oid_rt_pro_start_test_hdl}, //0x02 -+ {1, &oid_rt_pro_stop_test_hdl}, //0x03 -+ {1, &oid_null_function}, //0x04 OID_RT_PRO_SET_PREAMBLE -+ {1, &oid_null_function}, //0x05 OID_RT_PRO_SET_SCRAMBLER -+ {1, &oid_null_function}, //0x06 OID_RT_PRO_SET_FILTER_BB -+ {1, &oid_null_function}, //0x07 OID_RT_PRO_SET_MANUAL_DIVERSITY_BB -+ {1, &oid_rt_pro_set_channel_direct_call_hdl}, //0x08 -+ {1, &oid_null_function}, //0x09 OID_RT_PRO_SET_SLEEP_MODE_DIRECT_CALL -+ {1, &oid_null_function}, //0x0A OID_RT_PRO_SET_WAKE_MODE_DIRECT_CALL -+ {1, &oid_rt_pro_set_continuous_tx_hdl}, //0x0B OID_RT_PRO_SET_TX_CONTINUOUS_DIRECT_CALL -+ {1, &oid_rt_pro_set_single_carrier_tx_hdl}, //0x0C OID_RT_PRO_SET_SINGLE_CARRIER_TX_CONTINUOUS -+ {1, &oid_null_function}, //0x0D OID_RT_PRO_SET_TX_ANTENNA_BB -+ {1, &oid_rt_pro_set_antenna_bb_hdl}, //0x0E -+ {1, &oid_null_function}, //0x0F OID_RT_PRO_SET_CR_SCRAMBLER -+ {1, &oid_null_function}, //0x10 OID_RT_PRO_SET_CR_NEW_FILTER -+ {1, &oid_rt_pro_set_tx_power_control_hdl}, //0x11 OID_RT_PRO_SET_TX_POWER_CONTROL -+ {1, &oid_null_function}, //0x12 OID_RT_PRO_SET_CR_TX_CONFIG -+ {1, &oid_null_function}, //0x13 OID_RT_PRO_GET_TX_POWER_CONTROL -+ {1, &oid_null_function}, //0x14 OID_RT_PRO_GET_CR_SIGNAL_QUALITY -+ {1, &oid_null_function}, //0x15 OID_RT_PRO_SET_CR_SETPOINT -+ {1, &oid_null_function}, //0x16 OID_RT_PRO_SET_INTEGRATOR -+ {1, &oid_null_function}, //0x17 OID_RT_PRO_SET_SIGNAL_QUALITY -+ {1, &oid_null_function}, //0x18 OID_RT_PRO_GET_INTEGRATOR -+ {1, &oid_null_function}, //0x19 OID_RT_PRO_GET_SIGNAL_QUALITY -+ {1, &oid_null_function}, //0x1A OID_RT_PRO_QUERY_EEPROM_TYPE -+ {1, &oid_null_function}, //0x1B OID_RT_PRO_WRITE_MAC_ADDRESS -+ {1, &oid_null_function}, //0x1C OID_RT_PRO_READ_MAC_ADDRESS -+ {1, &oid_null_function}, //0x1D OID_RT_PRO_WRITE_CIS_DATA -+ {1, &oid_null_function}, //0x1E OID_RT_PRO_READ_CIS_DATA -+ {1, &oid_null_function} //0x1F OID_RT_PRO_WRITE_POWER_CONTROL -+ -+}; -+ -+const struct oid_obj_priv oid_rtl_seg_81_80_20[] = -+{ -+ {1, &oid_null_function}, //0x20 OID_RT_PRO_READ_POWER_CONTROL -+ {1, &oid_null_function}, //0x21 OID_RT_PRO_WRITE_EEPROM -+ {1, &oid_null_function}, //0x22 OID_RT_PRO_READ_EEPROM -+ {1, &oid_rt_pro_reset_tx_packet_sent_hdl}, //0x23 -+ {1, &oid_rt_pro_query_tx_packet_sent_hdl}, //0x24 -+ {1, &oid_rt_pro_reset_rx_packet_received_hdl}, //0x25 -+ {1, &oid_rt_pro_query_rx_packet_received_hdl}, //0x26 -+ {1, &oid_rt_pro_query_rx_packet_crc32_error_hdl}, //0x27 -+ {1, &oid_null_function}, //0x28 OID_RT_PRO_QUERY_CURRENT_ADDRESS -+ {1, &oid_null_function}, //0x29 OID_RT_PRO_QUERY_PERMANENT_ADDRESS -+ {1, &oid_null_function}, //0x2A OID_RT_PRO_SET_PHILIPS_RF_PARAMETERS -+ {1, &oid_rt_pro_set_carrier_suppression_tx_hdl},//0x2B OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX -+ {1, &oid_null_function}, //0x2C OID_RT_PRO_RECEIVE_PACKET -+ {1, &oid_null_function}, //0x2D OID_RT_PRO_WRITE_EEPROM_BYTE -+ {1, &oid_null_function}, //0x2E OID_RT_PRO_READ_EEPROM_BYTE -+ {1, &oid_rt_pro_set_modulation_hdl} //0x2F -+ -+}; -+ -+const struct oid_obj_priv oid_rtl_seg_81_80_40[] = -+{ -+ {1, &oid_null_function}, //0x40 -+ {1, &oid_null_function}, //0x41 -+ {1, &oid_null_function}, //0x42 -+ {1, &oid_rt_pro_set_single_tone_tx_hdl}, //0x43 -+ {1, &oid_null_function}, //0x44 -+ {1, &oid_null_function} //0x45 -+}; -+ -+const struct oid_obj_priv oid_rtl_seg_81_80_80[] = -+{ -+ {1, &oid_null_function}, //0x80 OID_RT_DRIVER_OPTION -+ {1, &oid_null_function}, //0x81 OID_RT_RF_OFF -+ {1, &oid_null_function} //0x82 OID_RT_AUTH_STATUS -+ -+}; -+ -+const struct oid_obj_priv oid_rtl_seg_81_85[] = -+{ -+ {1, &oid_rt_wireless_mode_hdl} //0x00 OID_RT_WIRELESS_MODE -+}; -+ -+struct oid_obj_priv oid_rtl_seg_81_87[] = -+{ -+ {1, &oid_null_function}, //0x80 OID_RT_PRO8187_WI_POLL -+ {1, &oid_rt_pro_write_bb_reg_hdl}, //0x81 -+ {1, &oid_rt_pro_read_bb_reg_hdl}, //0x82 -+ {1, &oid_rt_pro_write_rf_reg_hdl}, //0x82 -+ {1, &oid_rt_pro_read_rf_reg_hdl} //0x83 -+}; -+ -+struct oid_obj_priv oid_rtl_seg_87_11_00[] = -+{ -+ {1, &oid_rt_pro8711_join_bss_hdl}, //0x00 //S -+ {1, &oid_rt_pro_read_register_hdl}, //0x01 -+ {1, &oid_rt_pro_write_register_hdl}, //0x02 -+ {1, &oid_rt_pro_burst_read_register_hdl}, //0x03 -+ {1, &oid_rt_pro_burst_write_register_hdl}, //0x04 -+ {1, &oid_rt_pro_write_txcmd_hdl}, //0x05 -+ {1, &oid_rt_pro_read16_eeprom_hdl}, //0x06 -+ {1, &oid_rt_pro_write16_eeprom_hdl}, //0x07 -+ {1, &oid_null_function}, //0x08 OID_RT_PRO_H2C_SET_COMMAND -+ {1, &oid_null_function}, //0x09 OID_RT_PRO_H2C_QUERY_RESULT -+ {1, &oid_rt_pro8711_wi_poll_hdl}, //0x0A -+ {1, &oid_rt_pro8711_pkt_loss_hdl}, //0x0B -+ {1, &oid_rt_rd_attrib_mem_hdl}, //0x0C -+ {1, &oid_rt_wr_attrib_mem_hdl}, //0x0D -+ {1, &oid_null_function}, //0x0E -+ {1, &oid_null_function}, //0x0F -+ {1, &oid_null_function}, //0x10 OID_RT_PRO_H2C_CMD_MODE -+ {1, &oid_null_function}, //0x11 OID_RT_PRO_H2C_CMD_RSP_MODE -+ {1, &oid_null_function}, //0X12 OID_RT_PRO_WAIT_C2H_EVENT -+ {1, &oid_null_function}, //0X13 OID_RT_PRO_RW_ACCESS_PROTOCOL_TEST -+ {1, &oid_null_function}, //0X14 OID_RT_PRO_SCSI_ACCESS_TEST -+ {1, &oid_null_function}, //0X15 OID_RT_PRO_SCSI_TCPIPOFFLOAD_OUT -+ {1, &oid_null_function}, //0X16 OID_RT_PRO_SCSI_TCPIPOFFLOAD_IN -+ {1, &oid_null_function}, //0X17 OID_RT_RRO_RX_PKT_VIA_IOCTRL -+ {1, &oid_null_function}, //0X18 OID_RT_RRO_RX_PKTARRAY_VIA_IOCTRL -+ {1, &oid_null_function}, //0X19 OID_RT_RPO_SET_PWRMGT_TEST -+ {1, &oid_null_function}, //0X1A -+ {1, &oid_null_function}, //0X1B OID_RT_PRO_QRY_PWRMGT_TEST -+ {1, &oid_null_function}, //0X1C OID_RT_RPO_ASYNC_RWIO_TEST -+ {1, &oid_null_function}, //0X1D OID_RT_RPO_ASYNC_RWIO_POLL -+ {1, &oid_rt_pro_set_rf_intfs_hdl}, //0X1E -+ {1, &oid_rt_poll_rx_status_hdl} //0X1F -+}; -+ -+struct oid_obj_priv oid_rtl_seg_87_11_20[] = -+{ -+ {1, &oid_rt_pro_cfg_debug_message_hdl}, //0x20 -+ {1, &oid_rt_pro_set_data_rate_ex_hdl}, //0x21 -+ {1, &oid_rt_pro_set_basic_rate_hdl}, //0x22 -+ {1, &oid_rt_pro_read_tssi_hdl}, //0x23 -+ {1, &oid_rt_pro_set_power_tracking_hdl} //0x24 -+}; -+ -+ -+struct oid_obj_priv oid_rtl_seg_87_11_50[] = -+{ -+ {1, &oid_rt_pro_qry_pwrstate_hdl}, //0x50 -+ {1, &oid_rt_pro_set_pwrstate_hdl} //0x51 -+}; -+ -+struct oid_obj_priv oid_rtl_seg_87_11_80[] = -+{ -+ {1, &oid_null_function} //0x80 -+}; -+ -+struct oid_obj_priv oid_rtl_seg_87_11_B0[] = -+{ -+ {1, &oid_null_function} //0xB0 -+}; -+ -+struct oid_obj_priv oid_rtl_seg_87_11_F0[] = -+{ -+ {1, &oid_null_function}, //0xF0 -+ {1, &oid_null_function}, //0xF1 -+ {1, &oid_null_function}, //0xF2 -+ {1, &oid_null_function}, //0xF3 -+ {1, &oid_null_function}, //0xF4 -+ {1, &oid_null_function}, //0xF5 -+ {1, &oid_null_function}, //0xF6 -+ {1, &oid_null_function}, //0xF7 -+ {1, &oid_null_function}, //0xF8 -+ {1, &oid_null_function}, //0xF9 -+ {1, &oid_null_function}, //0xFA -+ {1, &oid_rt_pro_h2c_set_rate_table_hdl}, //0xFB -+ {1, &oid_rt_pro_h2c_get_rate_table_hdl}, //0xFC -+ {1, &oid_null_function}, //0xFD -+ {1, &oid_null_function}, //0xFE OID_RT_PRO_H2C_C2H_LBK_TEST -+ {1, &oid_null_function} //0xFF -+ -+}; -+ -+struct oid_obj_priv oid_rtl_seg_87_12_00[]= -+{ -+ {1, &oid_rt_pro_encryption_ctrl_hdl}, //0x00 Q&S -+ {1, &oid_rt_pro_add_sta_info_hdl}, //0x01 S -+ {1, &oid_rt_pro_dele_sta_info_hdl}, //0x02 S -+ {1, &oid_rt_pro_query_dr_variable_hdl}, //0x03 Q -+ {1, &oid_rt_pro_rx_packet_type_hdl}, //0x04 Q,S -+ {1, &oid_rt_pro_read_efuse_hdl}, //0x05 Q OID_RT_PRO_READ_EFUSE -+ {1, &oid_rt_pro_write_efuse_hdl}, //0x06 S OID_RT_PRO_WRITE_EFUSE -+ {1, &oid_rt_pro_rw_efuse_pgpkt_hdl}, //0x07 Q,S -+ {1, &oid_rt_get_efuse_current_size_hdl}, //0x08 Q -+ {1, &oid_rt_set_bandwidth_hdl}, //0x09 -+ {1, &oid_rt_set_crystal_cap_hdl}, //0x0a -+ {1, &oid_rt_set_rx_packet_type_hdl}, //0x0b S -+ {1, &oid_rt_get_efuse_max_size_hdl}, //0x0c -+ {1, &oid_rt_pro_set_tx_agc_offset_hdl}, //0x0d -+ {1, &oid_rt_pro_set_pkt_test_mode_hdl}, //0x0e -+ {1, &oid_null_function}, //0x0f OID_RT_PRO_FOR_EVM_TEST_SETTING -+ {1, &oid_rt_get_thermal_meter_hdl}, //0x10 Q OID_RT_PRO_GET_THERMAL_METER -+ {1, &oid_rt_reset_phy_rx_packet_count_hdl}, //0x11 S OID_RT_RESET_PHY_RX_PACKET_COUNT -+ {1, &oid_rt_get_phy_rx_packet_received_hdl}, //0x12 Q OID_RT_GET_PHY_RX_PACKET_RECEIVED -+ {1, &oid_rt_get_phy_rx_packet_crc32_error_hdl}, //0x13 Q OID_RT_GET_PHY_RX_PACKET_CRC32_ERROR -+ {1, &oid_rt_set_power_down_hdl}, //0x14 Q OID_RT_SET_POWER_DOWN -+ {1, &oid_rt_get_power_mode_hdl} //0x15 Q OID_RT_GET_POWER_MODE -+}; -+ -+#else /* _RTL871X_MP_IOCTL_C_ */ -+ -+extern struct oid_obj_priv oid_rtl_seg_81_80_00[32]; -+extern struct oid_obj_priv oid_rtl_seg_81_80_20[16]; -+extern struct oid_obj_priv oid_rtl_seg_81_80_40[6]; -+extern struct oid_obj_priv oid_rtl_seg_81_80_80[3]; -+ -+extern struct oid_obj_priv oid_rtl_seg_81_85[1]; -+extern struct oid_obj_priv oid_rtl_seg_81_87[5]; -+ -+extern struct oid_obj_priv oid_rtl_seg_87_11_00[32]; -+extern struct oid_obj_priv oid_rtl_seg_87_11_20[5]; -+extern struct oid_obj_priv oid_rtl_seg_87_11_50[2]; -+extern struct oid_obj_priv oid_rtl_seg_87_11_80[1]; -+extern struct oid_obj_priv oid_rtl_seg_87_11_B0[1]; -+extern struct oid_obj_priv oid_rtl_seg_87_11_F0[16]; -+ -+extern struct oid_obj_priv oid_rtl_seg_87_12_00[32]; -+ -+#endif /* _RTL871X_MP_IOCTL_C_ */ -+ -+struct rwreg_param{ -+ u32 offset; -+ u32 width; -+ u32 value; -+}; -+ -+struct bbreg_param{ -+ u32 offset; -+ u32 phymask; -+ u32 value; -+}; -+/* -+struct rfchannel_param{ -+ u32 ch; -+ u32 modem; -+}; -+*/ -+struct txpower_param{ -+ u32 pwr_index; -+}; -+ -+ -+struct datarate_param{ -+ u32 rate_index; -+}; -+ -+ -+struct rfintfs_parm { -+ u32 rfintfs; -+}; -+ -+typedef struct _mp_xmit_parm_ { -+ u8 enable; -+ u32 count; -+ u16 length; -+ u8 payload_type; -+ u8 da[ETH_ALEN]; -+}MP_XMIT_PARM, *PMP_XMIT_PARM; -+ -+struct mp_xmit_packet { -+ u32 len; -+ u32 mem[MAX_MP_XMITBUF_SZ >> 2]; -+}; -+ -+struct psmode_param { -+ u32 ps_mode; -+ u32 smart_ps; -+}; -+ -+//for OID_RT_PRO_READ16_EEPROM & OID_RT_PRO_WRITE16_EEPROM -+struct eeprom_rw_param { -+ u32 offset; -+ u16 value; -+}; -+ -+struct mp_ioctl_handler { -+ u32 paramsize; -+ u32 (*handler)(struct oid_par_priv* poid_par_priv); -+ u32 oid; -+}; -+ -+struct mp_ioctl_param{ -+ u32 subcode; -+ u32 len; -+ u8 data[0]; -+}; -+ -+#define GEN_MP_IOCTL_SUBCODE(code) _MP_IOCTL_ ## code ## _CMD_ -+ -+enum RTL871X_MP_IOCTL_SUBCODE { -+ GEN_MP_IOCTL_SUBCODE(MP_START), /*0*/ -+ GEN_MP_IOCTL_SUBCODE(MP_STOP), -+ GEN_MP_IOCTL_SUBCODE(READ_REG), -+ GEN_MP_IOCTL_SUBCODE(WRITE_REG), -+ GEN_MP_IOCTL_SUBCODE(READ_BB_REG), -+ GEN_MP_IOCTL_SUBCODE(WRITE_BB_REG), /*5*/ -+ GEN_MP_IOCTL_SUBCODE(READ_RF_REG), -+ GEN_MP_IOCTL_SUBCODE(WRITE_RF_REG), -+ GEN_MP_IOCTL_SUBCODE(SET_CHANNEL), -+ GEN_MP_IOCTL_SUBCODE(SET_TXPOWER), -+ GEN_MP_IOCTL_SUBCODE(SET_DATARATE), /*10*/ -+ GEN_MP_IOCTL_SUBCODE(SET_BANDWIDTH), -+ GEN_MP_IOCTL_SUBCODE(SET_ANTENNA), -+ GEN_MP_IOCTL_SUBCODE(CNTU_TX), -+ GEN_MP_IOCTL_SUBCODE(SC_TX), -+ GEN_MP_IOCTL_SUBCODE(CS_TX), /*15*/ -+ GEN_MP_IOCTL_SUBCODE(ST_TX), -+ GEN_MP_IOCTL_SUBCODE(IOCTL_XMIT_PACKET), -+ GEN_MP_IOCTL_SUBCODE(SET_RX_PKT_TYPE), -+ GEN_MP_IOCTL_SUBCODE(RESET_PHY_RX_PKT_CNT), -+ GEN_MP_IOCTL_SUBCODE(GET_PHY_RX_PKT_RECV), /*20*/ -+ GEN_MP_IOCTL_SUBCODE(GET_PHY_RX_PKT_ERROR), -+ GEN_MP_IOCTL_SUBCODE(READ16_EEPROM), -+ GEN_MP_IOCTL_SUBCODE(WRITE16_EEPROM), -+ GEN_MP_IOCTL_SUBCODE(EFUSE), -+ GEN_MP_IOCTL_SUBCODE(EFUSE_MAP), /*25*/ -+ GEN_MP_IOCTL_SUBCODE(GET_EFUSE_MAX_SIZE), -+ GEN_MP_IOCTL_SUBCODE(GET_EFUSE_CURRENT_SIZE), -+ GEN_MP_IOCTL_SUBCODE(GET_THERMAL_METER), -+ GEN_MP_IOCTL_SUBCODE(SET_PTM), -+ GEN_MP_IOCTL_SUBCODE(SET_POWER_DOWN), /*30*/ -+ GEN_MP_IOCTL_SUBCODE(TRIGGER_GPIO), -+ GEN_MP_IOCTL_SUBCODE(SET_DM_BT), /*35*/ -+ GEN_MP_IOCTL_SUBCODE(DEL_BA), /*36*/ -+ GEN_MP_IOCTL_SUBCODE(GET_WIFI_STATUS), /*37*/ -+ MAX_MP_IOCTL_SUBCODE, -+}; -+ -+u32 mp_ioctl_xmit_packet_hdl(struct oid_par_priv* poid_par_priv); -+ -+#ifdef _RTW_MP_IOCTL_C_ -+ -+#define GEN_MP_IOCTL_HANDLER(sz, hdl, oid) {sz, hdl, oid}, -+ -+#define EXT_MP_IOCTL_HANDLER(sz, subcode, oid) {sz, mp_ioctl_ ## subcode ## _hdl, oid}, -+ -+ -+struct mp_ioctl_handler mp_ioctl_hdl[] = { -+ -+/*0*/ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_start_test_hdl, OID_RT_PRO_START_TEST) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_stop_test_hdl, OID_RT_PRO_STOP_TEST) -+ -+ GEN_MP_IOCTL_HANDLER(sizeof(struct rwreg_param), oid_rt_pro_read_register_hdl, OID_RT_PRO_READ_REGISTER) -+ GEN_MP_IOCTL_HANDLER(sizeof(struct rwreg_param), oid_rt_pro_write_register_hdl, OID_RT_PRO_WRITE_REGISTER) -+ GEN_MP_IOCTL_HANDLER(sizeof(struct bb_reg_param), oid_rt_pro_read_bb_reg_hdl, OID_RT_PRO_READ_BB_REG) -+/*5*/ GEN_MP_IOCTL_HANDLER(sizeof(struct bb_reg_param), oid_rt_pro_write_bb_reg_hdl, OID_RT_PRO_WRITE_BB_REG) -+ GEN_MP_IOCTL_HANDLER(sizeof(struct rf_reg_param), oid_rt_pro_read_rf_reg_hdl, OID_RT_PRO_RF_READ_REGISTRY) -+ GEN_MP_IOCTL_HANDLER(sizeof(struct rf_reg_param), oid_rt_pro_write_rf_reg_hdl, OID_RT_PRO_RF_WRITE_REGISTRY) -+ -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_channel_direct_call_hdl, OID_RT_PRO_SET_CHANNEL_DIRECT_CALL) -+ GEN_MP_IOCTL_HANDLER(sizeof(struct txpower_param), oid_rt_pro_set_tx_power_control_hdl, OID_RT_PRO_SET_TX_POWER_CONTROL) -+/*10*/ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_data_rate_hdl, OID_RT_PRO_SET_DATA_RATE) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_set_bandwidth_hdl, OID_RT_SET_BANDWIDTH) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_antenna_bb_hdl, OID_RT_PRO_SET_ANTENNA_BB) -+ -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_continuous_tx_hdl, OID_RT_PRO_SET_CONTINUOUS_TX) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_single_carrier_tx_hdl, OID_RT_PRO_SET_SINGLE_CARRIER_TX) -+/*15*/ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_carrier_suppression_tx_hdl, OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_pro_set_single_tone_tx_hdl, OID_RT_PRO_SET_SINGLE_TONE_TX) -+ -+ EXT_MP_IOCTL_HANDLER(0, xmit_packet, 0) -+ -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_set_rx_packet_type_hdl, OID_RT_SET_RX_PACKET_TYPE) -+ GEN_MP_IOCTL_HANDLER(0, oid_rt_reset_phy_rx_packet_count_hdl, OID_RT_RESET_PHY_RX_PACKET_COUNT) -+/*20*/ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_phy_rx_packet_received_hdl, OID_RT_GET_PHY_RX_PACKET_RECEIVED) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_phy_rx_packet_crc32_error_hdl, OID_RT_GET_PHY_RX_PACKET_CRC32_ERROR) -+ -+ GEN_MP_IOCTL_HANDLER(sizeof(struct eeprom_rw_param), NULL, 0) -+ GEN_MP_IOCTL_HANDLER(sizeof(struct eeprom_rw_param), NULL, 0) -+ GEN_MP_IOCTL_HANDLER(sizeof(EFUSE_ACCESS_STRUCT), oid_rt_pro_efuse_hdl, OID_RT_PRO_EFUSE) -+/*25*/ GEN_MP_IOCTL_HANDLER(0, oid_rt_pro_efuse_map_hdl, OID_RT_PRO_EFUSE_MAP) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_efuse_max_size_hdl, OID_RT_GET_EFUSE_MAX_SIZE) -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_efuse_current_size_hdl, OID_RT_GET_EFUSE_CURRENT_SIZE) -+ -+ GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_thermal_meter_hdl, OID_RT_PRO_GET_THERMAL_METER) -+ GEN_MP_IOCTL_HANDLER(sizeof(u8), oid_rt_pro_set_power_tracking_hdl, OID_RT_PRO_SET_POWER_TRACKING) -+/*30*/ GEN_MP_IOCTL_HANDLER(sizeof(u8), oid_rt_set_power_down_hdl, OID_RT_SET_POWER_DOWN) -+/*31*/ GEN_MP_IOCTL_HANDLER(0, oid_rt_pro_trigger_gpio_hdl, 0) -+ -+ -+}; -+ -+#else /* _RTW_MP_IOCTL_C_ */ -+ -+extern struct mp_ioctl_handler mp_ioctl_hdl[]; -+ -+#endif /* _RTW_MP_IOCTL_C_ */ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h -@@ -0,0 +1,1097 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+/***************************************************************************** -+ * -+ * Module: __RTW_MP_PHY_REGDEF_H_ -+ * -+ * -+ * Note: 1. Define PMAC/BB register map -+ * 2. Define RF register map -+ * 3. PMAC/BB register bit mask. -+ * 4. RF reg bit mask. -+ * 5. Other BB/RF relative definition. -+ * -+ * -+ * Export: Constants, macro, functions(API), global variables(None). -+ * -+ * Abbrev: -+ * -+ * History: -+ * Data Who Remark -+ * 08/07/2007 MHC 1. Porting from 9x series PHYCFG.h. -+ * 2. Reorganize code architecture. -+ * 09/25/2008 MH 1. Add RL6052 register definition -+ * -+ *****************************************************************************/ -+#ifndef __RTW_MP_PHY_REGDEF_H_ -+#define __RTW_MP_PHY_REGDEF_H_ -+ -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+//============================================================ -+// 8192S Regsiter offset definition -+//============================================================ -+ -+// -+// BB-PHY register PMAC 0x100 PHY 0x800 - 0xEFF -+// 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF -+// 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 -+// 3. RF register 0x00-2E -+// 4. Bit Mask for BB/RF register -+// 5. Other defintion for BB/RF R/W -+// -+ -+ -+// -+// 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF -+// 1. Page1(0x100) -+// -+#define rPMAC_Reset 0x100 -+#define rPMAC_TxStart 0x104 -+#define rPMAC_TxLegacySIG 0x108 -+#define rPMAC_TxHTSIG1 0x10c -+#define rPMAC_TxHTSIG2 0x110 -+#define rPMAC_PHYDebug 0x114 -+#define rPMAC_TxPacketNum 0x118 -+#define rPMAC_TxIdle 0x11c -+#define rPMAC_TxMACHeader0 0x120 -+#define rPMAC_TxMACHeader1 0x124 -+#define rPMAC_TxMACHeader2 0x128 -+#define rPMAC_TxMACHeader3 0x12c -+#define rPMAC_TxMACHeader4 0x130 -+#define rPMAC_TxMACHeader5 0x134 -+#define rPMAC_TxDataType 0x138 -+#define rPMAC_TxRandomSeed 0x13c -+#define rPMAC_CCKPLCPPreamble 0x140 -+#define rPMAC_CCKPLCPHeader 0x144 -+#define rPMAC_CCKCRC16 0x148 -+#define rPMAC_OFDMRxCRC32OK 0x170 -+#define rPMAC_OFDMRxCRC32Er 0x174 -+#define rPMAC_OFDMRxParityEr 0x178 -+#define rPMAC_OFDMRxCRC8Er 0x17c -+#define rPMAC_CCKCRxRC16Er 0x180 -+#define rPMAC_CCKCRxRC32Er 0x184 -+#define rPMAC_CCKCRxRC32OK 0x188 -+#define rPMAC_TxStatus 0x18c -+ -+// -+// 2. Page2(0x200) -+// -+// The following two definition are only used for USB interface. -+//#define RF_BB_CMD_ADDR 0x02c0 // RF/BB read/write command address. -+//#define RF_BB_CMD_DATA 0x02c4 // RF/BB read/write command data. -+ -+// -+// 3. Page8(0x800) -+// -+#define rFPGA0_RFMOD 0x800 //RF mode & CCK TxSC // RF BW Setting?? -+ -+#define rFPGA0_TxInfo 0x804 // Status report?? -+#define rFPGA0_PSDFunction 0x808 -+ -+#define rFPGA0_TxGainStage 0x80c // Set TX PWR init gain? -+ -+#define rFPGA0_RFTiming1 0x810 // Useless now -+#define rFPGA0_RFTiming2 0x814 -+//#define rFPGA0_XC_RFTiming 0x818 -+//#define rFPGA0_XD_RFTiming 0x81c -+ -+#define rFPGA0_XA_HSSIParameter1 0x820 // RF 3 wire register -+#define rFPGA0_XA_HSSIParameter2 0x824 -+#define rFPGA0_XB_HSSIParameter1 0x828 -+#define rFPGA0_XB_HSSIParameter2 0x82c -+#define rFPGA0_XC_HSSIParameter1 0x830 -+#define rFPGA0_XC_HSSIParameter2 0x834 -+#define rFPGA0_XD_HSSIParameter1 0x838 -+#define rFPGA0_XD_HSSIParameter2 0x83c -+#define rFPGA0_XA_LSSIParameter 0x840 -+#define rFPGA0_XB_LSSIParameter 0x844 -+#define rFPGA0_XC_LSSIParameter 0x848 -+#define rFPGA0_XD_LSSIParameter 0x84c -+ -+#define rFPGA0_RFWakeUpParameter 0x850 // Useless now -+#define rFPGA0_RFSleepUpParameter 0x854 -+ -+#define rFPGA0_XAB_SwitchControl 0x858 // RF Channel switch -+#define rFPGA0_XCD_SwitchControl 0x85c -+ -+#define rFPGA0_XA_RFInterfaceOE 0x860 // RF Channel switch -+#define rFPGA0_XB_RFInterfaceOE 0x864 -+#define rFPGA0_XC_RFInterfaceOE 0x868 -+#define rFPGA0_XD_RFInterfaceOE 0x86c -+ -+#define rFPGA0_XAB_RFInterfaceSW 0x870 // RF Interface Software Control -+#define rFPGA0_XCD_RFInterfaceSW 0x874 -+ -+#define rFPGA0_XAB_RFParameter 0x878 // RF Parameter -+#define rFPGA0_XCD_RFParameter 0x87c -+ -+#define rFPGA0_AnalogParameter1 0x880 // Crystal cap setting RF-R/W protection for parameter4?? -+#define rFPGA0_AnalogParameter2 0x884 -+#define rFPGA0_AnalogParameter3 0x888 // Useless now -+#define rFPGA0_AnalogParameter4 0x88c -+ -+#define rFPGA0_XA_LSSIReadBack 0x8a0 // Tranceiver LSSI Readback -+#define rFPGA0_XB_LSSIReadBack 0x8a4 -+#define rFPGA0_XC_LSSIReadBack 0x8a8 -+#define rFPGA0_XD_LSSIReadBack 0x8ac -+ -+#define rFPGA0_PSDReport 0x8b4 // Useless now -+#define rFPGA0_XAB_RFInterfaceRB 0x8e0 // Useless now // RF Interface Readback Value -+#define rFPGA0_XCD_RFInterfaceRB 0x8e4 // Useless now -+ -+// -+// 4. Page9(0x900) -+// -+#define rFPGA1_RFMOD 0x900 //RF mode & OFDM TxSC // RF BW Setting?? -+ -+#define rFPGA1_TxBlock 0x904 // Useless now -+#define rFPGA1_DebugSelect 0x908 // Useless now -+#define rFPGA1_TxInfo 0x90c // Useless now // Status report?? -+ -+// -+// 5. PageA(0xA00) -+// -+// Set Control channel to upper or lower. These settings are required only for 40MHz -+#define rCCK0_System 0xa00 -+ -+#define rCCK0_AFESetting 0xa04 // Disable init gain now // Select RX path by RSSI -+#define rCCK0_CCA 0xa08 // Disable init gain now // Init gain -+ -+#define rCCK0_RxAGC1 0xa0c //AGC default value, saturation level // Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. Not the same as 90 series -+#define rCCK0_RxAGC2 0xa10 //AGC & DAGC -+ -+#define rCCK0_RxHP 0xa14 -+ -+#define rCCK0_DSPParameter1 0xa18 //Timing recovery & Channel estimation threshold -+#define rCCK0_DSPParameter2 0xa1c //SQ threshold -+ -+#define rCCK0_TxFilter1 0xa20 -+#define rCCK0_TxFilter2 0xa24 -+#define rCCK0_DebugPort 0xa28 //debug port and Tx filter3 -+#define rCCK0_FalseAlarmReport 0xa2c //0xa2d useless now 0xa30-a4f channel report -+#define rCCK0_TRSSIReport 0xa50 -+#define rCCK0_RxReport 0xa54 //0xa57 -+#define rCCK0_FACounterLower 0xa5c //0xa5b -+#define rCCK0_FACounterUpper 0xa58 //0xa5c -+ -+// -+// 6. PageC(0xC00) -+// -+#define rOFDM0_LSTF 0xc00 -+ -+#define rOFDM0_TRxPathEnable 0xc04 -+#define rOFDM0_TRMuxPar 0xc08 -+#define rOFDM0_TRSWIsolation 0xc0c -+ -+#define rOFDM0_XARxAFE 0xc10 //RxIQ DC offset, Rx digital filter, DC notch filter -+#define rOFDM0_XARxIQImbalance 0xc14 //RxIQ imblance matrix -+#define rOFDM0_XBRxAFE 0xc18 -+#define rOFDM0_XBRxIQImbalance 0xc1c -+#define rOFDM0_XCRxAFE 0xc20 -+#define rOFDM0_XCRxIQImbalance 0xc24 -+#define rOFDM0_XDRxAFE 0xc28 -+#define rOFDM0_XDRxIQImbalance 0xc2c -+ -+#define rOFDM0_RxDetector1 0xc30 //PD,BW & SBD // DM tune init gain -+#define rOFDM0_RxDetector2 0xc34 //SBD & Fame Sync. -+#define rOFDM0_RxDetector3 0xc38 //Frame Sync. -+#define rOFDM0_RxDetector4 0xc3c //PD, SBD, Frame Sync & Short-GI -+ -+#define rOFDM0_RxDSP 0xc40 //Rx Sync Path -+#define rOFDM0_CFOandDAGC 0xc44 //CFO & DAGC -+#define rOFDM0_CCADropThreshold 0xc48 //CCA Drop threshold -+#define rOFDM0_ECCAThreshold 0xc4c // energy CCA -+ -+#define rOFDM0_XAAGCCore1 0xc50 // DIG -+#define rOFDM0_XAAGCCore2 0xc54 -+#define rOFDM0_XBAGCCore1 0xc58 -+#define rOFDM0_XBAGCCore2 0xc5c -+#define rOFDM0_XCAGCCore1 0xc60 -+#define rOFDM0_XCAGCCore2 0xc64 -+#define rOFDM0_XDAGCCore1 0xc68 -+#define rOFDM0_XDAGCCore2 0xc6c -+ -+#define rOFDM0_AGCParameter1 0xc70 -+#define rOFDM0_AGCParameter2 0xc74 -+#define rOFDM0_AGCRSSITable 0xc78 -+#define rOFDM0_HTSTFAGC 0xc7c -+ -+#define rOFDM0_XATxIQImbalance 0xc80 // TX PWR TRACK and DIG -+#define rOFDM0_XATxAFE 0xc84 -+#define rOFDM0_XBTxIQImbalance 0xc88 -+#define rOFDM0_XBTxAFE 0xc8c -+#define rOFDM0_XCTxIQImbalance 0xc90 -+#define rOFDM0_XCTxAFE 0xc94 -+#define rOFDM0_XDTxIQImbalance 0xc98 -+#define rOFDM0_XDTxAFE 0xc9c -+#define rOFDM0_RxIQExtAnta 0xca0 -+ -+#define rOFDM0_RxHPParameter 0xce0 -+#define rOFDM0_TxPseudoNoiseWgt 0xce4 -+#define rOFDM0_FrameSync 0xcf0 -+#define rOFDM0_DFSReport 0xcf4 -+#define rOFDM0_TxCoeff1 0xca4 -+#define rOFDM0_TxCoeff2 0xca8 -+#define rOFDM0_TxCoeff3 0xcac -+#define rOFDM0_TxCoeff4 0xcb0 -+#define rOFDM0_TxCoeff5 0xcb4 -+#define rOFDM0_TxCoeff6 0xcb8 -+ -+ -+// -+// 7. PageD(0xD00) -+// -+#define rOFDM1_LSTF 0xd00 -+#define rOFDM1_TRxPathEnable 0xd04 -+ -+#define rOFDM1_CFO 0xd08 // No setting now -+#define rOFDM1_CSI1 0xd10 -+#define rOFDM1_SBD 0xd14 -+#define rOFDM1_CSI2 0xd18 -+#define rOFDM1_CFOTracking 0xd2c -+#define rOFDM1_TRxMesaure1 0xd34 -+#define rOFDM1_IntfDet 0xd3c -+#define rOFDM1_PseudoNoiseStateAB 0xd50 -+#define rOFDM1_PseudoNoiseStateCD 0xd54 -+#define rOFDM1_RxPseudoNoiseWgt 0xd58 -+ -+#define rOFDM_PHYCounter1 0xda0 //cca, parity fail -+#define rOFDM_PHYCounter2 0xda4 //rate illegal, crc8 fail -+#define rOFDM_PHYCounter3 0xda8 //MCS not support -+ -+#define rOFDM_ShortCFOAB 0xdac // No setting now -+#define rOFDM_ShortCFOCD 0xdb0 -+#define rOFDM_LongCFOAB 0xdb4 -+#define rOFDM_LongCFOCD 0xdb8 -+#define rOFDM_TailCFOAB 0xdbc -+#define rOFDM_TailCFOCD 0xdc0 -+#define rOFDM_PWMeasure1 0xdc4 -+#define rOFDM_PWMeasure2 0xdc8 -+#define rOFDM_BWReport 0xdcc -+#define rOFDM_AGCReport 0xdd0 -+#define rOFDM_RxSNR 0xdd4 -+#define rOFDM_RxEVMCSI 0xdd8 -+#define rOFDM_SIGReport 0xddc -+ -+ -+// -+// 8. PageE(0xE00) -+// -+#define rTxAGC_Rate18_06 0xe00 -+#define rTxAGC_Rate54_24 0xe04 -+#define rTxAGC_CCK_Mcs32 0xe08 -+#define rTxAGC_Mcs03_Mcs00 0xe10 -+#define rTxAGC_Mcs07_Mcs04 0xe14 -+#define rTxAGC_Mcs11_Mcs08 0xe18 -+#define rTxAGC_Mcs15_Mcs12 0xe1c -+ -+// Analog- control in RX_WAIT_CCA : REG: EE0 [Analog- Power & Control Register] -+#define rRx_Wait_CCCA 0xe70 -+#define rAnapar_Ctrl_BB 0xee0 -+ -+// -+// 7. RF Register 0x00-0x2E (RF 8256) -+// RF-0222D 0x00-3F -+// -+//Zebra1 -+#define RTL92SE_FPGA_VERIFY 0 -+#define rZebra1_HSSIEnable 0x0 // Useless now -+#define rZebra1_TRxEnable1 0x1 -+#define rZebra1_TRxEnable2 0x2 -+#define rZebra1_AGC 0x4 -+#define rZebra1_ChargePump 0x5 -+//#if (RTL92SE_FPGA_VERIFY == 1) -+#define rZebra1_Channel 0x7 // RF channel switch -+//#else -+ -+//#endif -+#define rZebra1_TxGain 0x8 // Useless now -+#define rZebra1_TxLPF 0x9 -+#define rZebra1_RxLPF 0xb -+#define rZebra1_RxHPFCorner 0xc -+ -+//Zebra4 -+#define rGlobalCtrl 0 // Useless now -+#define rRTL8256_TxLPF 19 -+#define rRTL8256_RxLPF 11 -+ -+//RTL8258 -+#define rRTL8258_TxLPF 0x11 // Useless now -+#define rRTL8258_RxLPF 0x13 -+#define rRTL8258_RSSILPF 0xa -+ -+// -+// RL6052 Register definition -+// -+#define RF_AC 0x00 // -+ -+#define RF_IQADJ_G1 0x01 // -+#define RF_IQADJ_G2 0x02 // -+#define RF_POW_TRSW 0x05 // -+ -+#define RF_GAIN_RX 0x06 // -+#define RF_GAIN_TX 0x07 // -+ -+#define RF_TXM_IDAC 0x08 // -+#define RF_BS_IQGEN 0x0F // -+ -+#define RF_MODE1 0x10 // -+#define RF_MODE2 0x11 // -+ -+#define RF_RX_AGC_HP 0x12 // -+#define RF_TX_AGC 0x13 // -+#define RF_BIAS 0x14 // -+#define RF_IPA 0x15 // -+#define RF_POW_ABILITY 0x17 // -+#define RF_MODE_AG 0x18 // -+#define rRfChannel 0x18 // RF channel and BW switch -+#define RF_CHNLBW 0x18 // RF channel and BW switch -+#define RF_TOP 0x19 // -+ -+#define RF_RX_G1 0x1A // -+#define RF_RX_G2 0x1B // -+ -+#define RF_RX_BB2 0x1C // -+#define RF_RX_BB1 0x1D // -+ -+#define RF_RCK1 0x1E // -+#define RF_RCK2 0x1F // -+ -+#define RF_TX_G1 0x20 // -+#define RF_TX_G2 0x21 // -+#define RF_TX_G3 0x22 // -+ -+#define RF_TX_BB1 0x23 // -+ -+#define RF_T_METER 0x24 // -+ -+#define RF_SYN_G1 0x25 // RF TX Power control -+#define RF_SYN_G2 0x26 // RF TX Power control -+#define RF_SYN_G3 0x27 // RF TX Power control -+#define RF_SYN_G4 0x28 // RF TX Power control -+#define RF_SYN_G5 0x29 // RF TX Power control -+#define RF_SYN_G6 0x2A // RF TX Power control -+#define RF_SYN_G7 0x2B // RF TX Power control -+#define RF_SYN_G8 0x2C // RF TX Power control -+ -+#define RF_RCK_OS 0x30 // RF TX PA control -+ -+#define RF_TXPA_G1 0x31 // RF TX PA control -+#define RF_TXPA_G2 0x32 // RF TX PA control -+#define RF_TXPA_G3 0x33 // RF TX PA control -+ -+// -+//Bit Mask -+// -+// 1. Page1(0x100) -+#define bBBResetB 0x100 // Useless now? -+#define bGlobalResetB 0x200 -+#define bOFDMTxStart 0x4 -+#define bCCKTxStart 0x8 -+#define bCRC32Debug 0x100 -+#define bPMACLoopback 0x10 -+#define bTxLSIG 0xffffff -+#define bOFDMTxRate 0xf -+#define bOFDMTxReserved 0x10 -+#define bOFDMTxLength 0x1ffe0 -+#define bOFDMTxParity 0x20000 -+#define bTxHTSIG1 0xffffff -+#define bTxHTMCSRate 0x7f -+#define bTxHTBW 0x80 -+#define bTxHTLength 0xffff00 -+#define bTxHTSIG2 0xffffff -+#define bTxHTSmoothing 0x1 -+#define bTxHTSounding 0x2 -+#define bTxHTReserved 0x4 -+#define bTxHTAggreation 0x8 -+#define bTxHTSTBC 0x30 -+#define bTxHTAdvanceCoding 0x40 -+#define bTxHTShortGI 0x80 -+#define bTxHTNumberHT_LTF 0x300 -+#define bTxHTCRC8 0x3fc00 -+#define bCounterReset 0x10000 -+#define bNumOfOFDMTx 0xffff -+#define bNumOfCCKTx 0xffff0000 -+#define bTxIdleInterval 0xffff -+#define bOFDMService 0xffff0000 -+#define bTxMACHeader 0xffffffff -+#define bTxDataInit 0xff -+#define bTxHTMode 0x100 -+#define bTxDataType 0x30000 -+#define bTxRandomSeed 0xffffffff -+#define bCCKTxPreamble 0x1 -+#define bCCKTxSFD 0xffff0000 -+#define bCCKTxSIG 0xff -+#define bCCKTxService 0xff00 -+#define bCCKLengthExt 0x8000 -+#define bCCKTxLength 0xffff0000 -+#define bCCKTxCRC16 0xffff -+#define bCCKTxStatus 0x1 -+#define bOFDMTxStatus 0x2 -+ -+#define IS_BB_REG_OFFSET_92S(_Offset) ((_Offset >= 0x800) && (_Offset <= 0xfff)) -+ -+// 2. Page8(0x800) -+#define bRFMOD 0x1 // Reg 0x800 rFPGA0_RFMOD -+#define bJapanMode 0x2 -+#define bCCKTxSC 0x30 -+#define bCCKEn 0x1000000 -+#define bOFDMEn 0x2000000 -+ -+#define bOFDMRxADCPhase 0x10000 // Useless now -+#define bOFDMTxDACPhase 0x40000 -+#define bXATxAGC 0x3f -+ -+#define bXBTxAGC 0xf00 // Reg 80c rFPGA0_TxGainStage -+#define bXCTxAGC 0xf000 -+#define bXDTxAGC 0xf0000 -+ -+#define bPAStart 0xf0000000 // Useless now -+#define bTRStart 0x00f00000 -+#define bRFStart 0x0000f000 -+#define bBBStart 0x000000f0 -+#define bBBCCKStart 0x0000000f -+#define bPAEnd 0xf //Reg0x814 -+#define bTREnd 0x0f000000 -+#define bRFEnd 0x000f0000 -+#define bCCAMask 0x000000f0 //T2R -+#define bR2RCCAMask 0x00000f00 -+#define bHSSI_R2TDelay 0xf8000000 -+#define bHSSI_T2RDelay 0xf80000 -+#define bContTxHSSI 0x400 //chane gain at continue Tx -+#define bIGFromCCK 0x200 -+#define bAGCAddress 0x3f -+#define bRxHPTx 0x7000 -+#define bRxHPT2R 0x38000 -+#define bRxHPCCKIni 0xc0000 -+#define bAGCTxCode 0xc00000 -+#define bAGCRxCode 0x300000 -+ -+#define b3WireDataLength 0x800 // Reg 0x820~84f rFPGA0_XA_HSSIParameter1 -+#define b3WireAddressLength 0x400 -+ -+#define b3WireRFPowerDown 0x1 // Useless now -+//#define bHWSISelect 0x8 -+#define b5GPAPEPolarity 0x40000000 -+#define b2GPAPEPolarity 0x80000000 -+#define bRFSW_TxDefaultAnt 0x3 -+#define bRFSW_TxOptionAnt 0x30 -+#define bRFSW_RxDefaultAnt 0x300 -+#define bRFSW_RxOptionAnt 0x3000 -+#define bRFSI_3WireData 0x1 -+#define bRFSI_3WireClock 0x2 -+#define bRFSI_3WireLoad 0x4 -+#define bRFSI_3WireRW 0x8 -+#define bRFSI_3Wire 0xf -+ -+#define bRFSI_RFENV 0x10 // Reg 0x870 rFPGA0_XAB_RFInterfaceSW -+ -+#define bRFSI_TRSW 0x20 // Useless now -+#define bRFSI_TRSWB 0x40 -+#define bRFSI_ANTSW 0x100 -+#define bRFSI_ANTSWB 0x200 -+#define bRFSI_PAPE 0x400 -+#define bRFSI_PAPE5G 0x800 -+#define bBandSelect 0x1 -+#define bHTSIG2_GI 0x80 -+#define bHTSIG2_Smoothing 0x01 -+#define bHTSIG2_Sounding 0x02 -+#define bHTSIG2_Aggreaton 0x08 -+#define bHTSIG2_STBC 0x30 -+#define bHTSIG2_AdvCoding 0x40 -+#define bHTSIG2_NumOfHTLTF 0x300 -+#define bHTSIG2_CRC8 0x3fc -+#define bHTSIG1_MCS 0x7f -+#define bHTSIG1_BandWidth 0x80 -+#define bHTSIG1_HTLength 0xffff -+#define bLSIG_Rate 0xf -+#define bLSIG_Reserved 0x10 -+#define bLSIG_Length 0x1fffe -+#define bLSIG_Parity 0x20 -+#define bCCKRxPhase 0x4 -+#if (RTL92SE_FPGA_VERIFY == 1) -+#define bLSSIReadAddress 0x3f000000 //LSSI "Read" Address // Reg 0x824 rFPGA0_XA_HSSIParameter2 -+#else -+#define bLSSIReadAddress 0x7f800000 // T65 RF -+#endif -+#define bLSSIReadEdge 0x80000000 //LSSI "Read" edge signal -+#if (RTL92SE_FPGA_VERIFY == 1) -+#define bLSSIReadBackData 0xfff // Reg 0x8a0 rFPGA0_XA_LSSIReadBack -+#else -+#define bLSSIReadBackData 0xfffff // T65 RF -+#endif -+#define bLSSIReadOKFlag 0x1000 // Useless now -+#define bCCKSampleRate 0x8 //0: 44MHz, 1:88MHz -+#define bRegulator0Standby 0x1 -+#define bRegulatorPLLStandby 0x2 -+#define bRegulator1Standby 0x4 -+#define bPLLPowerUp 0x8 -+#define bDPLLPowerUp 0x10 -+#define bDA10PowerUp 0x20 -+#define bAD7PowerUp 0x200 -+#define bDA6PowerUp 0x2000 -+#define bXtalPowerUp 0x4000 -+#define b40MDClkPowerUP 0x8000 -+#define bDA6DebugMode 0x20000 -+#define bDA6Swing 0x380000 -+ -+#define bADClkPhase 0x4000000 // Reg 0x880 rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ -+ -+#define b80MClkDelay 0x18000000 // Useless -+#define bAFEWatchDogEnable 0x20000000 -+ -+#define bXtalCap01 0xc0000000 // Reg 0x884 rFPGA0_AnalogParameter2 Crystal cap -+#define bXtalCap23 0x3 -+#define bXtalCap92x 0x0f000000 -+#define bXtalCap 0x0f000000 -+ -+#define bIntDifClkEnable 0x400 // Useless -+#define bExtSigClkEnable 0x800 -+#define bBandgapMbiasPowerUp 0x10000 -+#define bAD11SHGain 0xc0000 -+#define bAD11InputRange 0x700000 -+#define bAD11OPCurrent 0x3800000 -+#define bIPathLoopback 0x4000000 -+#define bQPathLoopback 0x8000000 -+#define bAFELoopback 0x10000000 -+#define bDA10Swing 0x7e0 -+#define bDA10Reverse 0x800 -+#define bDAClkSource 0x1000 -+#define bAD7InputRange 0x6000 -+#define bAD7Gain 0x38000 -+#define bAD7OutputCMMode 0x40000 -+#define bAD7InputCMMode 0x380000 -+#define bAD7Current 0xc00000 -+#define bRegulatorAdjust 0x7000000 -+#define bAD11PowerUpAtTx 0x1 -+#define bDA10PSAtTx 0x10 -+#define bAD11PowerUpAtRx 0x100 -+#define bDA10PSAtRx 0x1000 -+#define bCCKRxAGCFormat 0x200 -+#define bPSDFFTSamplepPoint 0xc000 -+#define bPSDAverageNum 0x3000 -+#define bIQPathControl 0xc00 -+#define bPSDFreq 0x3ff -+#define bPSDAntennaPath 0x30 -+#define bPSDIQSwitch 0x40 -+#define bPSDRxTrigger 0x400000 -+#define bPSDTxTrigger 0x80000000 -+#define bPSDSineToneScale 0x7f000000 -+#define bPSDReport 0xffff -+ -+// 3. Page9(0x900) -+#define bOFDMTxSC 0x30000000 // Useless -+#define bCCKTxOn 0x1 -+#define bOFDMTxOn 0x2 -+#define bDebugPage 0xfff //reset debug page and also HWord, LWord -+#define bDebugItem 0xff //reset debug page and LWord -+#define bAntL 0x10 -+#define bAntNonHT 0x100 -+#define bAntHT1 0x1000 -+#define bAntHT2 0x10000 -+#define bAntHT1S1 0x100000 -+#define bAntNonHTS1 0x1000000 -+ -+// 4. PageA(0xA00) -+#define bCCKBBMode 0x3 // Useless -+#define bCCKTxPowerSaving 0x80 -+#define bCCKRxPowerSaving 0x40 -+ -+#define bCCKSideBand 0x10 // Reg 0xa00 rCCK0_System 20/40 switch -+ -+#define bCCKScramble 0x8 // Useless -+#define bCCKAntDiversity 0x8000 -+#define bCCKCarrierRecovery 0x4000 -+#define bCCKTxRate 0x3000 -+#define bCCKDCCancel 0x0800 -+#define bCCKISICancel 0x0400 -+#define bCCKMatchFilter 0x0200 -+#define bCCKEqualizer 0x0100 -+#define bCCKPreambleDetect 0x800000 -+#define bCCKFastFalseCCA 0x400000 -+#define bCCKChEstStart 0x300000 -+#define bCCKCCACount 0x080000 -+#define bCCKcs_lim 0x070000 -+#define bCCKBistMode 0x80000000 -+#define bCCKCCAMask 0x40000000 -+#define bCCKTxDACPhase 0x4 -+#define bCCKRxADCPhase 0x20000000 //r_rx_clk -+#define bCCKr_cp_mode0 0x0100 -+#define bCCKTxDCOffset 0xf0 -+#define bCCKRxDCOffset 0xf -+#define bCCKCCAMode 0xc000 -+#define bCCKFalseCS_lim 0x3f00 -+#define bCCKCS_ratio 0xc00000 -+#define bCCKCorgBit_sel 0x300000 -+#define bCCKPD_lim 0x0f0000 -+#define bCCKNewCCA 0x80000000 -+#define bCCKRxHPofIG 0x8000 -+#define bCCKRxIG 0x7f00 -+#define bCCKLNAPolarity 0x800000 -+#define bCCKRx1stGain 0x7f0000 -+#define bCCKRFExtend 0x20000000 //CCK Rx Iinital gain polarity -+#define bCCKRxAGCSatLevel 0x1f000000 -+#define bCCKRxAGCSatCount 0xe0 -+#define bCCKRxRFSettle 0x1f //AGCsamp_dly -+#define bCCKFixedRxAGC 0x8000 -+//#define bCCKRxAGCFormat 0x4000 //remove to HSSI register 0x824 -+#define bCCKAntennaPolarity 0x2000 -+#define bCCKTxFilterType 0x0c00 -+#define bCCKRxAGCReportType 0x0300 -+#define bCCKRxDAGCEn 0x80000000 -+#define bCCKRxDAGCPeriod 0x20000000 -+#define bCCKRxDAGCSatLevel 0x1f000000 -+#define bCCKTimingRecovery 0x800000 -+#define bCCKTxC0 0x3f0000 -+#define bCCKTxC1 0x3f000000 -+#define bCCKTxC2 0x3f -+#define bCCKTxC3 0x3f00 -+#define bCCKTxC4 0x3f0000 -+#define bCCKTxC5 0x3f000000 -+#define bCCKTxC6 0x3f -+#define bCCKTxC7 0x3f00 -+#define bCCKDebugPort 0xff0000 -+#define bCCKDACDebug 0x0f000000 -+#define bCCKFalseAlarmEnable 0x8000 -+#define bCCKFalseAlarmRead 0x4000 -+#define bCCKTRSSI 0x7f -+#define bCCKRxAGCReport 0xfe -+#define bCCKRxReport_AntSel 0x80000000 -+#define bCCKRxReport_MFOff 0x40000000 -+#define bCCKRxRxReport_SQLoss 0x20000000 -+#define bCCKRxReport_Pktloss 0x10000000 -+#define bCCKRxReport_Lockedbit 0x08000000 -+#define bCCKRxReport_RateError 0x04000000 -+#define bCCKRxReport_RxRate 0x03000000 -+#define bCCKRxFACounterLower 0xff -+#define bCCKRxFACounterUpper 0xff000000 -+#define bCCKRxHPAGCStart 0xe000 -+#define bCCKRxHPAGCFinal 0x1c00 -+#define bCCKRxFalseAlarmEnable 0x8000 -+#define bCCKFACounterFreeze 0x4000 -+#define bCCKTxPathSel 0x10000000 -+#define bCCKDefaultRxPath 0xc000000 -+#define bCCKOptionRxPath 0x3000000 -+ -+// 5. PageC(0xC00) -+#define bNumOfSTF 0x3 // Useless -+#define bShift_L 0xc0 -+#define bGI_TH 0xc -+#define bRxPathA 0x1 -+#define bRxPathB 0x2 -+#define bRxPathC 0x4 -+#define bRxPathD 0x8 -+#define bTxPathA 0x1 -+#define bTxPathB 0x2 -+#define bTxPathC 0x4 -+#define bTxPathD 0x8 -+#define bTRSSIFreq 0x200 -+#define bADCBackoff 0x3000 -+#define bDFIRBackoff 0xc000 -+#define bTRSSILatchPhase 0x10000 -+#define bRxIDCOffset 0xff -+#define bRxQDCOffset 0xff00 -+#define bRxDFIRMode 0x1800000 -+#define bRxDCNFType 0xe000000 -+#define bRXIQImb_A 0x3ff -+#define bRXIQImb_B 0xfc00 -+#define bRXIQImb_C 0x3f0000 -+#define bRXIQImb_D 0xffc00000 -+#define bDC_dc_Notch 0x60000 -+#define bRxNBINotch 0x1f000000 -+#define bPD_TH 0xf -+#define bPD_TH_Opt2 0xc000 -+#define bPWED_TH 0x700 -+#define bIfMF_Win_L 0x800 -+#define bPD_Option 0x1000 -+#define bMF_Win_L 0xe000 -+#define bBW_Search_L 0x30000 -+#define bwin_enh_L 0xc0000 -+#define bBW_TH 0x700000 -+#define bED_TH2 0x3800000 -+#define bBW_option 0x4000000 -+#define bRatio_TH 0x18000000 -+#define bWindow_L 0xe0000000 -+#define bSBD_Option 0x1 -+#define bFrame_TH 0x1c -+#define bFS_Option 0x60 -+#define bDC_Slope_check 0x80 -+#define bFGuard_Counter_DC_L 0xe00 -+#define bFrame_Weight_Short 0x7000 -+#define bSub_Tune 0xe00000 -+#define bFrame_DC_Length 0xe000000 -+#define bSBD_start_offset 0x30000000 -+#define bFrame_TH_2 0x7 -+#define bFrame_GI2_TH 0x38 -+#define bGI2_Sync_en 0x40 -+#define bSarch_Short_Early 0x300 -+#define bSarch_Short_Late 0xc00 -+#define bSarch_GI2_Late 0x70000 -+#define bCFOAntSum 0x1 -+#define bCFOAcc 0x2 -+#define bCFOStartOffset 0xc -+#define bCFOLookBack 0x70 -+#define bCFOSumWeight 0x80 -+#define bDAGCEnable 0x10000 -+#define bTXIQImb_A 0x3ff -+#define bTXIQImb_B 0xfc00 -+#define bTXIQImb_C 0x3f0000 -+#define bTXIQImb_D 0xffc00000 -+#define bTxIDCOffset 0xff -+#define bTxQDCOffset 0xff00 -+#define bTxDFIRMode 0x10000 -+#define bTxPesudoNoiseOn 0x4000000 -+#define bTxPesudoNoise_A 0xff -+#define bTxPesudoNoise_B 0xff00 -+#define bTxPesudoNoise_C 0xff0000 -+#define bTxPesudoNoise_D 0xff000000 -+#define bCCADropOption 0x20000 -+#define bCCADropThres 0xfff00000 -+#define bEDCCA_H 0xf -+#define bEDCCA_L 0xf0 -+#define bLambda_ED 0x300 -+#define bRxInitialGain 0x7f -+#define bRxAntDivEn 0x80 -+#define bRxAGCAddressForLNA 0x7f00 -+#define bRxHighPowerFlow 0x8000 -+#define bRxAGCFreezeThres 0xc0000 -+#define bRxFreezeStep_AGC1 0x300000 -+#define bRxFreezeStep_AGC2 0xc00000 -+#define bRxFreezeStep_AGC3 0x3000000 -+#define bRxFreezeStep_AGC0 0xc000000 -+#define bRxRssi_Cmp_En 0x10000000 -+#define bRxQuickAGCEn 0x20000000 -+#define bRxAGCFreezeThresMode 0x40000000 -+#define bRxOverFlowCheckType 0x80000000 -+#define bRxAGCShift 0x7f -+#define bTRSW_Tri_Only 0x80 -+#define bPowerThres 0x300 -+#define bRxAGCEn 0x1 -+#define bRxAGCTogetherEn 0x2 -+#define bRxAGCMin 0x4 -+#define bRxHP_Ini 0x7 -+#define bRxHP_TRLNA 0x70 -+#define bRxHP_RSSI 0x700 -+#define bRxHP_BBP1 0x7000 -+#define bRxHP_BBP2 0x70000 -+#define bRxHP_BBP3 0x700000 -+#define bRSSI_H 0x7f0000 //the threshold for high power -+#define bRSSI_Gen 0x7f000000 //the threshold for ant diversity -+#define bRxSettle_TRSW 0x7 -+#define bRxSettle_LNA 0x38 -+#define bRxSettle_RSSI 0x1c0 -+#define bRxSettle_BBP 0xe00 -+#define bRxSettle_RxHP 0x7000 -+#define bRxSettle_AntSW_RSSI 0x38000 -+#define bRxSettle_AntSW 0xc0000 -+#define bRxProcessTime_DAGC 0x300000 -+#define bRxSettle_HSSI 0x400000 -+#define bRxProcessTime_BBPPW 0x800000 -+#define bRxAntennaPowerShift 0x3000000 -+#define bRSSITableSelect 0xc000000 -+#define bRxHP_Final 0x7000000 -+#define bRxHTSettle_BBP 0x7 -+#define bRxHTSettle_HSSI 0x8 -+#define bRxHTSettle_RxHP 0x70 -+#define bRxHTSettle_BBPPW 0x80 -+#define bRxHTSettle_Idle 0x300 -+#define bRxHTSettle_Reserved 0x1c00 -+#define bRxHTRxHPEn 0x8000 -+#define bRxHTAGCFreezeThres 0x30000 -+#define bRxHTAGCTogetherEn 0x40000 -+#define bRxHTAGCMin 0x80000 -+#define bRxHTAGCEn 0x100000 -+#define bRxHTDAGCEn 0x200000 -+#define bRxHTRxHP_BBP 0x1c00000 -+#define bRxHTRxHP_Final 0xe0000000 -+#define bRxPWRatioTH 0x3 -+#define bRxPWRatioEn 0x4 -+#define bRxMFHold 0x3800 -+#define bRxPD_Delay_TH1 0x38 -+#define bRxPD_Delay_TH2 0x1c0 -+#define bRxPD_DC_COUNT_MAX 0x600 -+//#define bRxMF_Hold 0x3800 -+#define bRxPD_Delay_TH 0x8000 -+#define bRxProcess_Delay 0xf0000 -+#define bRxSearchrange_GI2_Early 0x700000 -+#define bRxFrame_Guard_Counter_L 0x3800000 -+#define bRxSGI_Guard_L 0xc000000 -+#define bRxSGI_Search_L 0x30000000 -+#define bRxSGI_TH 0xc0000000 -+#define bDFSCnt0 0xff -+#define bDFSCnt1 0xff00 -+#define bDFSFlag 0xf0000 -+#define bMFWeightSum 0x300000 -+#define bMinIdxTH 0x7f000000 -+#define bDAFormat 0x40000 -+#define bTxChEmuEnable 0x01000000 -+#define bTRSWIsolation_A 0x7f -+#define bTRSWIsolation_B 0x7f00 -+#define bTRSWIsolation_C 0x7f0000 -+#define bTRSWIsolation_D 0x7f000000 -+#define bExtLNAGain 0x7c00 -+ -+// 6. PageE(0xE00) -+#define bSTBCEn 0x4 // Useless -+#define bAntennaMapping 0x10 -+#define bNss 0x20 -+#define bCFOAntSumD 0x200 -+#define bPHYCounterReset 0x8000000 -+#define bCFOReportGet 0x4000000 -+#define bOFDMContinueTx 0x10000000 -+#define bOFDMSingleCarrier 0x20000000 -+#define bOFDMSingleTone 0x40000000 -+//#define bRxPath1 0x01 -+//#define bRxPath2 0x02 -+//#define bRxPath3 0x04 -+//#define bRxPath4 0x08 -+//#define bTxPath1 0x10 -+//#define bTxPath2 0x20 -+#define bHTDetect 0x100 -+#define bCFOEn 0x10000 -+#define bCFOValue 0xfff00000 -+#define bSigTone_Re 0x3f -+#define bSigTone_Im 0x7f00 -+#define bCounter_CCA 0xffff -+#define bCounter_ParityFail 0xffff0000 -+#define bCounter_RateIllegal 0xffff -+#define bCounter_CRC8Fail 0xffff0000 -+#define bCounter_MCSNoSupport 0xffff -+#define bCounter_FastSync 0xffff -+#define bShortCFO 0xfff -+#define bShortCFOTLength 12 //total -+#define bShortCFOFLength 11 //fraction -+#define bLongCFO 0x7ff -+#define bLongCFOTLength 11 -+#define bLongCFOFLength 11 -+#define bTailCFO 0x1fff -+#define bTailCFOTLength 13 -+#define bTailCFOFLength 12 -+#define bmax_en_pwdB 0xffff -+#define bCC_power_dB 0xffff0000 -+#define bnoise_pwdB 0xffff -+#define bPowerMeasTLength 10 -+#define bPowerMeasFLength 3 -+#define bRx_HT_BW 0x1 -+#define bRxSC 0x6 -+#define bRx_HT 0x8 -+#define bNB_intf_det_on 0x1 -+#define bIntf_win_len_cfg 0x30 -+#define bNB_Intf_TH_cfg 0x1c0 -+#define bRFGain 0x3f -+#define bTableSel 0x40 -+#define bTRSW 0x80 -+#define bRxSNR_A 0xff -+#define bRxSNR_B 0xff00 -+#define bRxSNR_C 0xff0000 -+#define bRxSNR_D 0xff000000 -+#define bSNREVMTLength 8 -+#define bSNREVMFLength 1 -+#define bCSI1st 0xff -+#define bCSI2nd 0xff00 -+#define bRxEVM1st 0xff0000 -+#define bRxEVM2nd 0xff000000 -+#define bSIGEVM 0xff -+#define bPWDB 0xff00 -+#define bSGIEN 0x10000 -+ -+#define bSFactorQAM1 0xf // Useless -+#define bSFactorQAM2 0xf0 -+#define bSFactorQAM3 0xf00 -+#define bSFactorQAM4 0xf000 -+#define bSFactorQAM5 0xf0000 -+#define bSFactorQAM6 0xf0000 -+#define bSFactorQAM7 0xf00000 -+#define bSFactorQAM8 0xf000000 -+#define bSFactorQAM9 0xf0000000 -+#define bCSIScheme 0x100000 -+ -+#define bNoiseLvlTopSet 0x3 // Useless -+#define bChSmooth 0x4 -+#define bChSmoothCfg1 0x38 -+#define bChSmoothCfg2 0x1c0 -+#define bChSmoothCfg3 0xe00 -+#define bChSmoothCfg4 0x7000 -+#define bMRCMode 0x800000 -+#define bTHEVMCfg 0x7000000 -+ -+#define bLoopFitType 0x1 // Useless -+#define bUpdCFO 0x40 -+#define bUpdCFOOffData 0x80 -+#define bAdvUpdCFO 0x100 -+#define bAdvTimeCtrl 0x800 -+#define bUpdClko 0x1000 -+#define bFC 0x6000 -+#define bTrackingMode 0x8000 -+#define bPhCmpEnable 0x10000 -+#define bUpdClkoLTF 0x20000 -+#define bComChCFO 0x40000 -+#define bCSIEstiMode 0x80000 -+#define bAdvUpdEqz 0x100000 -+#define bUChCfg 0x7000000 -+#define bUpdEqz 0x8000000 -+ -+#define bTxAGCRate18_06 0x7f7f7f7f // Useless -+#define bTxAGCRate54_24 0x7f7f7f7f -+#define bTxAGCRateMCS32 0x7f -+#define bTxAGCRateCCK 0x7f00 -+#define bTxAGCRateMCS3_MCS0 0x7f7f7f7f -+#define bTxAGCRateMCS7_MCS4 0x7f7f7f7f -+#define bTxAGCRateMCS11_MCS8 0x7f7f7f7f -+#define bTxAGCRateMCS15_MCS12 0x7f7f7f7f -+ -+//Rx Pseduo noise -+#define bRxPesudoNoiseOn 0x20000000 // Useless -+#define bRxPesudoNoise_A 0xff -+#define bRxPesudoNoise_B 0xff00 -+#define bRxPesudoNoise_C 0xff0000 -+#define bRxPesudoNoise_D 0xff000000 -+#define bPesudoNoiseState_A 0xffff -+#define bPesudoNoiseState_B 0xffff0000 -+#define bPesudoNoiseState_C 0xffff -+#define bPesudoNoiseState_D 0xffff0000 -+ -+//7. RF Register -+//Zebra1 -+#define bZebra1_HSSIEnable 0x8 // Useless -+#define bZebra1_TRxControl 0xc00 -+#define bZebra1_TRxGainSetting 0x07f -+#define bZebra1_RxCorner 0xc00 -+#define bZebra1_TxChargePump 0x38 -+#define bZebra1_RxChargePump 0x7 -+#define bZebra1_ChannelNum 0xf80 -+#define bZebra1_TxLPFBW 0x400 -+#define bZebra1_RxLPFBW 0x600 -+ -+//Zebra4 -+#define bRTL8256RegModeCtrl1 0x100 // Useless -+#define bRTL8256RegModeCtrl0 0x40 -+#define bRTL8256_TxLPFBW 0x18 -+#define bRTL8256_RxLPFBW 0x600 -+ -+//RTL8258 -+#define bRTL8258_TxLPFBW 0xc // Useless -+#define bRTL8258_RxLPFBW 0xc00 -+#define bRTL8258_RSSILPFBW 0xc0 -+ -+ -+// -+// Other Definition -+// -+ -+//byte endable for sb_write -+#define bByte0 0x1 // Useless -+#define bByte1 0x2 -+#define bByte2 0x4 -+#define bByte3 0x8 -+#define bWord0 0x3 -+#define bWord1 0xc -+#define bDWord 0xf -+ -+//for PutRegsetting & GetRegSetting BitMask -+#define bMaskByte0 0xff // Reg 0xc50 rOFDM0_XAAGCCore~0xC6f -+#define bMaskByte1 0xff00 -+#define bMaskByte2 0xff0000 -+#define bMaskByte3 0xff000000 -+#define bMaskHWord 0xffff0000 -+#define bMaskLWord 0x0000ffff -+#define bMaskDWord 0xffffffff -+#define bMaskH4Bits 0xf0000000 -+#define bMaskOFDM_D 0xffc00000 -+#define bMaskCCK 0x3f3f3f3f -+#define bMask12Bits 0xfff -+ -+//for PutRFRegsetting & GetRFRegSetting BitMask -+#if (RTL92SE_FPGA_VERIFY == 1) -+//#define bMask12Bits 0xfff // RF Reg mask bits -+//#define bMask20Bits 0xfff // RF Reg mask bits T65 RF -+#define bRFRegOffsetMask 0xfff -+#else -+//#define bMask12Bits 0xfffff // RF Reg mask bits -+//#define bMask20Bits 0xfffff // RF Reg mask bits T65 RF -+#define bRFRegOffsetMask 0xfffff -+#endif -+#define bEnable 0x1 // Useless -+#define bDisable 0x0 -+ -+#define LeftAntenna 0x0 // Useless -+#define RightAntenna 0x1 -+ -+#define tCheckTxStatus 500 //500ms // Useless -+#define tUpdateRxCounter 100 //100ms -+ -+#define rateCCK 0 // Useless -+#define rateOFDM 1 -+#define rateHT 2 -+ -+//define Register-End -+#define bPMAC_End 0x1ff // Useless -+#define bFPGAPHY0_End 0x8ff -+#define bFPGAPHY1_End 0x9ff -+#define bCCKPHY0_End 0xaff -+#define bOFDMPHY0_End 0xcff -+#define bOFDMPHY1_End 0xdff -+ -+//define max debug item in each debug page -+//#define bMaxItem_FPGA_PHY0 0x9 -+//#define bMaxItem_FPGA_PHY1 0x3 -+//#define bMaxItem_PHY_11B 0x16 -+//#define bMaxItem_OFDM_PHY0 0x29 -+//#define bMaxItem_OFDM_PHY1 0x0 -+ -+#define bPMACControl 0x0 // Useless -+#define bWMACControl 0x1 -+#define bWNICControl 0x2 -+ -+#if 0 -+#define ANTENNA_A 0x1 // Useless -+#define ANTENNA_B 0x2 -+#define ANTENNA_AB 0x3 // ANTENNA_A|ANTENNA_B -+ -+#define ANTENNA_C 0x4 -+#define ANTENNA_D 0x8 -+#endif -+ -+#define RCR_AAP BIT(0) // accept all physical address -+#define RCR_APM BIT(1) // accept physical match -+#define RCR_AM BIT(2) // accept multicast -+#define RCR_AB BIT(3) // accept broadcast -+#define RCR_ACRC32 BIT(5) // accept error packet -+#define RCR_9356SEL BIT(6) -+#define RCR_AICV BIT(12) // Accept ICV error packet -+#define RCR_RXFTH0 (BIT(13)|BIT(14)|BIT(15)) // Rx FIFO threshold -+#define RCR_ADF BIT(18) // Accept Data(frame type) frame -+#define RCR_ACF BIT(19) // Accept control frame -+#define RCR_AMF BIT(20) // Accept management frame -+#define RCR_ADD3 BIT(21) -+#define RCR_APWRMGT BIT(22) // Accept power management packet -+#define RCR_CBSSID BIT(23) // Accept BSSID match packet -+#define RCR_ENMARP BIT(28) // enable mac auto reset phy -+#define RCR_EnCS1 BIT(29) // enable carrier sense method 1 -+#define RCR_EnCS2 BIT(30) // enable carrier sense method 2 -+#define RCR_OnlyErlPkt BIT(31) // Rx Early mode is performed for packet size greater than 1536 -+ -+/*--------------------------Define Parameters-------------------------------*/ -+ -+ -+#endif //__INC_HAL8192SPHYREG_H -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h -@@ -0,0 +1,161 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_P2P_H_ -+#define __RTW_P2P_H_ -+ -+#include -+ -+u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8* pssid, u8 ussidlen, u8* pdev_raddr ); -+u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status_code); -+u32 build_deauth_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+#ifdef CONFIG_WFD -+u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunneled); -+u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf); -+#endif //CONFIG_WFD -+ -+u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len); -+u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len, struct sta_info *psta); -+u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len); -+u32 process_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe, uint len); -+u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len); -+u8 process_p2p_provdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe); -+u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ); -+u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ); -+u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ); -+u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len); -+ -+void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType); -+ -+#ifdef CONFIG_P2P_PS -+void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength); -+void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state); -+u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue); -+#endif // CONFIG_P2P_PS -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+void rtw_init_cfg80211_wifidirect_info( _adapter* padapter); -+int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx); -+void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32 *len); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+void reset_global_wifidirect_info( _adapter* padapter ); -+int rtw_init_wifi_display_info(_adapter* padapter); -+void rtw_init_wifidirect_timers(_adapter* padapter); -+void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr); -+void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role); -+int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role); -+ -+static inline void _rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state) -+{ -+ if(wdinfo->p2p_state != state) { -+ //wdinfo->pre_p2p_state = wdinfo->p2p_state; -+ wdinfo->p2p_state = state; -+ } -+} -+static inline void _rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state) -+{ -+ if(wdinfo->pre_p2p_state != state) { -+ wdinfo->pre_p2p_state = state; -+ } -+} -+#if 0 -+static inline void _rtw_p2p_restore_state(struct wifidirect_info *wdinfo) -+{ -+ if(wdinfo->pre_p2p_state != -1) { -+ wdinfo->p2p_state = wdinfo->pre_p2p_state; -+ wdinfo->pre_p2p_state = -1; -+ } -+} -+#endif -+static inline void _rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role) -+{ -+ if(wdinfo->role != role) { -+ wdinfo->role = role; -+ } -+} -+static inline int _rtw_p2p_state(struct wifidirect_info *wdinfo) -+{ -+ return wdinfo->p2p_state; -+} -+static inline int _rtw_p2p_pre_state(struct wifidirect_info *wdinfo) -+{ -+ return wdinfo->pre_p2p_state; -+} -+static inline int _rtw_p2p_role(struct wifidirect_info *wdinfo) -+{ -+ return wdinfo->role; -+} -+static inline bool _rtw_p2p_chk_state(struct wifidirect_info *wdinfo, enum P2P_STATE state) -+{ -+ return wdinfo->p2p_state == state; -+} -+static inline bool _rtw_p2p_chk_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role) -+{ -+ return wdinfo->role == role; -+} -+ -+#ifdef CONFIG_DBG_P2P -+void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line); -+void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line); -+//void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *caller, int line); -+void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, const char *caller, int line); -+#define rtw_p2p_set_state(wdinfo, state) dbg_rtw_p2p_set_state(wdinfo, state, __FUNCTION__, __LINE__) -+#define rtw_p2p_set_pre_state(wdinfo, state) dbg_rtw_p2p_set_pre_state(wdinfo, state, __FUNCTION__, __LINE__) -+#define rtw_p2p_set_role(wdinfo, role) dbg_rtw_p2p_set_role(wdinfo, role, __FUNCTION__, __LINE__) -+//#define rtw_p2p_restore_state(wdinfo) dbg_rtw_p2p_restore_state(wdinfo, __FUNCTION__, __LINE__) -+#else //CONFIG_DBG_P2P -+#define rtw_p2p_set_state(wdinfo, state) _rtw_p2p_set_state(wdinfo, state) -+#define rtw_p2p_set_pre_state(wdinfo, state) _rtw_p2p_set_pre_state(wdinfo, state) -+#define rtw_p2p_set_role(wdinfo, role) _rtw_p2p_set_role(wdinfo, role) -+//#define rtw_p2p_restore_state(wdinfo) _rtw_p2p_restore_state(wdinfo) -+#endif //CONFIG_DBG_P2P -+ -+#define rtw_p2p_state(wdinfo) _rtw_p2p_state(wdinfo) -+#define rtw_p2p_pre_state(wdinfo) _rtw_p2p_pre_state(wdinfo) -+#define rtw_p2p_role(wdinfo) _rtw_p2p_role(wdinfo) -+#define rtw_p2p_chk_state(wdinfo, state) _rtw_p2p_chk_state(wdinfo, state) -+#define rtw_p2p_chk_role(wdinfo, role) _rtw_p2p_chk_role(wdinfo, role) -+ -+#define rtw_p2p_findphase_ex_set(wdinfo, value) \ -+ (wdinfo)->find_phase_state_exchange_cnt = (value) -+ -+//is this find phase exchange for social channel scan? -+#define rtw_p2p_findphase_ex_is_social(wdinfo) \ -+ (wdinfo)->find_phase_state_exchange_cnt >= P2P_FINDPHASE_EX_SOCIAL_FIRST -+ -+//should we need find phase exchange anymore? -+#define rtw_p2p_findphase_ex_is_needed(wdinfo) \ -+ ((wdinfo)->find_phase_state_exchange_cnt < P2P_FINDPHASE_EX_MAX && \ -+ (wdinfo)->find_phase_state_exchange_cnt != P2P_FINDPHASE_EX_NONE) -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h -@@ -0,0 +1,362 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_PWRCTRL_H_ -+#define __RTW_PWRCTRL_H_ -+ -+#include -+#include -+#include -+ -+#ifdef CONFIG_HAS_EARLYSUSPEND -+#include -+#endif //CONFIG_HAS_EARLYSUSPEND -+ -+ -+#define FW_PWR0 0 -+#define FW_PWR1 1 -+#define FW_PWR2 2 -+#define FW_PWR3 3 -+ -+ -+#define HW_PWR0 7 -+#define HW_PWR1 6 -+#define HW_PWR2 2 -+#define HW_PWR3 0 -+#define HW_PWR4 8 -+ -+#define FW_PWRMSK 0x7 -+ -+ -+#define XMIT_ALIVE BIT(0) -+#define RECV_ALIVE BIT(1) -+#define CMD_ALIVE BIT(2) -+#define EVT_ALIVE BIT(3) -+ -+ -+enum Power_Mgnt -+{ -+ PS_MODE_ACTIVE = 0 , -+ PS_MODE_MIN , -+ PS_MODE_MAX , -+ PS_MODE_DTIM , -+ PS_MODE_VOIP , -+ PS_MODE_UAPSD_WMM , -+ PS_MODE_UAPSD , -+ PS_MODE_IBSS , -+ PS_MODE_WWLAN , -+ PM_Radio_Off , -+ PM_Card_Disable , -+ PS_MODE_NUM -+}; -+ -+ -+/* -+ BIT[2:0] = HW state -+ BIT[3] = Protocol PS state, 0: register active state , 1: register sleep state -+ BIT[4] = sub-state -+*/ -+ -+#define PS_DPS BIT(0) -+#define PS_LCLK (PS_DPS) -+#define PS_RF_OFF BIT(1) -+#define PS_ALL_ON BIT(2) -+#define PS_ST_ACTIVE BIT(3) -+ -+#define PS_ISR_ENABLE BIT(4) -+#define PS_IMR_ENABLE BIT(5) -+#define PS_ACK BIT(6) -+#define PS_TOGGLE BIT(7) -+ -+#define PS_STATE_MASK (0x0F) -+#define PS_STATE_HW_MASK (0x07) -+#define PS_SEQ_MASK (0xc0) -+ -+#define PS_STATE(x) (PS_STATE_MASK & (x)) -+#define PS_STATE_HW(x) (PS_STATE_HW_MASK & (x)) -+#define PS_SEQ(x) (PS_SEQ_MASK & (x)) -+ -+#define PS_STATE_S0 (PS_DPS) -+#define PS_STATE_S1 (PS_LCLK) -+#define PS_STATE_S2 (PS_RF_OFF) -+#define PS_STATE_S3 (PS_ALL_ON) -+#define PS_STATE_S4 ((PS_ST_ACTIVE) | (PS_ALL_ON)) -+ -+ -+#define PS_IS_RF_ON(x) ((x) & (PS_ALL_ON)) -+#define PS_IS_ACTIVE(x) ((x) & (PS_ST_ACTIVE)) -+#define CLR_PS_STATE(x) ((x) = ((x) & (0xF0))) -+ -+ -+struct reportpwrstate_parm { -+ unsigned char mode; -+ unsigned char state; //the CPWM value -+ unsigned short rsvd; -+}; -+ -+ -+typedef _sema _pwrlock; -+ -+ -+__inline static void _init_pwrlock(_pwrlock *plock) -+{ -+ _rtw_init_sema(plock, 1); -+} -+ -+__inline static void _free_pwrlock(_pwrlock *plock) -+{ -+ _rtw_free_sema(plock); -+} -+ -+ -+__inline static void _enter_pwrlock(_pwrlock *plock) -+{ -+ _rtw_down_sema(plock); -+} -+ -+ -+__inline static void _exit_pwrlock(_pwrlock *plock) -+{ -+ _rtw_up_sema(plock); -+} -+ -+#define LPS_DELAY_TIME 1*HZ // 1 sec -+ -+#define EXE_PWR_NONE 0x01 -+#define EXE_PWR_IPS 0x02 -+#define EXE_PWR_LPS 0x04 -+ -+// RF state. -+typedef enum _rt_rf_power_state -+{ -+ rf_on, // RF is on after RFSleep or RFOff -+ rf_sleep, // 802.11 Power Save mode -+ rf_off, // HW/SW Radio OFF or Inactive Power Save -+ //=====Add the new RF state above this line=====// -+ rf_max -+}rt_rf_power_state; -+ -+// RF Off Level for IPS or HW/SW radio off -+#define RT_RF_OFF_LEVL_ASPM BIT(0) // PCI ASPM -+#define RT_RF_OFF_LEVL_CLK_REQ BIT(1) // PCI clock request -+#define RT_RF_OFF_LEVL_PCI_D3 BIT(2) // PCI D3 mode -+#define RT_RF_OFF_LEVL_HALT_NIC BIT(3) // NIC halt, re-initialize hw parameters -+#define RT_RF_OFF_LEVL_FREE_FW BIT(4) // FW free, re-download the FW -+#define RT_RF_OFF_LEVL_FW_32K BIT(5) // FW in 32k -+#define RT_RF_PS_LEVEL_ALWAYS_ASPM BIT(6) // Always enable ASPM and Clock Req in initialization. -+#define RT_RF_LPS_DISALBE_2R BIT(30) // When LPS is on, disable 2R if no packet is received or transmittd. -+#define RT_RF_LPS_LEVEL_ASPM BIT(31) // LPS with ASPM -+ -+#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG) ? _TRUE : _FALSE) -+#define RT_CLEAR_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level &= (~(_PS_FLAG))) -+#define RT_SET_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level |= _PS_FLAG) -+ -+ -+enum _PS_BBRegBackup_ { -+ PSBBREG_RF0 = 0, -+ PSBBREG_RF1, -+ PSBBREG_RF2, -+ PSBBREG_AFE0, -+ PSBBREG_TOTALCNT -+}; -+ -+enum { // for ips_mode -+ IPS_NONE=0, -+ IPS_NORMAL, -+ IPS_LEVEL_2, -+}; -+ -+struct pwrctrl_priv -+{ -+ _pwrlock lock; -+ volatile u8 rpwm; // requested power state for fw -+ volatile u8 cpwm; // fw current power state. updated when 1. read from HCPWM 2. driver lowers power level -+ volatile u8 tog; // toggling -+ volatile u8 cpwm_tog; // toggling -+ u8 pwr_mode; -+ u8 smart_ps; -+ u32 alives; -+ -+ u8 b_hw_radio_off; -+ u8 reg_rfoff; -+ u8 reg_pdnmode; //powerdown mode -+ u32 rfoff_reason; -+ -+ //RF OFF Level -+ u32 cur_ps_level; -+ u32 reg_rfps_level; -+ -+ -+ -+#ifdef CONFIG_PCI_HCI -+ //just for PCIE ASPM -+ u8 b_support_aspm; // If it supports ASPM, Offset[560h] = 0x40, otherwise Offset[560h] = 0x00. -+ u8 b_support_backdoor; -+ -+ //just for PCIE ASPM -+ u8 const_amdpci_aspm; -+#endif -+ -+ uint ips_enter_cnts; -+ uint ips_leave_cnts; -+ -+ u8 ips_mode; -+ u8 ips_mode_req; // used to accept the mode setting request, will update to ipsmode later -+ uint bips_processing; -+ u32 ips_deny_time; /* will deny IPS when system time is smaller than this */ -+ u8 ps_processing; /* temporarily used to mark whether in rtw_ps_processor */ -+ -+ u8 bLeisurePs; -+ u8 LpsIdleCount; -+ u8 power_mgnt; -+ u8 bFwCurrentInPSMode; -+ u32 DelayLPSLastTimeStamp; -+ -+ s32 pnp_current_pwr_state; -+ u8 pnp_bstop_trx; -+ -+ -+ u8 bInternalAutoSuspend; -+ u8 bInSuspend; -+ u8 bSupportRemoteWakeup; -+#ifdef CONFIG_WOWLAN -+ u8 wowlan_mode; -+ u8 wowlan_pattern; -+ u8 wowlan_magic; -+ u8 wowlan_unicast; -+ u8 wowlan_pattern_idx; -+ u32 wowlan_pattern_context[8][5]; -+#endif // CONFIG_WOWLAN -+ _timer pwr_state_check_timer; -+ int pwr_state_check_interval; -+ u8 pwr_state_check_cnts; -+ -+ int ps_flag; -+ -+ rt_rf_power_state rf_pwrstate;//cur power state -+ //rt_rf_power_state current_rfpwrstate; -+ rt_rf_power_state change_rfpwrstate; -+ -+ u8 bHWPowerdown;//if support hw power down -+ u8 bHWPwrPindetect; -+ u8 bkeepfwalive; -+ u8 brfoffbyhw; -+ unsigned long PS_BBRegBackup[PSBBREG_TOTALCNT]; -+ -+ #ifdef CONFIG_RESUME_IN_WORKQUEUE -+ struct workqueue_struct *rtw_workqueue; -+ _workitem resume_work; -+ #endif -+ -+ #ifdef CONFIG_HAS_EARLYSUSPEND -+ struct early_suspend early_suspend; -+ u8 do_late_resume; -+ #endif //CONFIG_HAS_EARLYSUSPEND -+ -+ #ifdef CONFIG_ANDROID_POWER -+ android_early_suspend_t early_suspend; -+ u8 do_late_resume; -+ #endif -+ -+}; -+ -+#define rtw_get_ips_mode_req(pwrctrlpriv) \ -+ (pwrctrlpriv)->ips_mode_req -+ -+#define rtw_ips_mode_req(pwrctrlpriv, ips_mode) \ -+ (pwrctrlpriv)->ips_mode_req = (ips_mode) -+ -+#define RTW_PWR_STATE_CHK_INTERVAL 2000 -+ -+#define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \ -+ do { \ -+ /*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __FUNCTION__, (pwrctrlpriv), (ms));*/ \ -+ _set_timer(&(pwrctrlpriv)->pwr_state_check_timer, (ms)); \ -+ } while(0) -+ -+#define rtw_set_pwr_state_check_timer(pwrctrlpriv) \ -+ _rtw_set_pwr_state_check_timer((pwrctrlpriv), (pwrctrlpriv)->pwr_state_check_interval) -+ -+extern void rtw_init_pwrctrl_priv(_adapter *adapter); -+extern void rtw_free_pwrctrl_priv(_adapter * adapter); -+ -+#ifdef CONFIG_LPS_LCLK -+extern s32 rtw_register_tx_alive(PADAPTER padapter); -+extern void rtw_unregister_tx_alive(PADAPTER padapter); -+extern s32 rtw_register_rx_alive(PADAPTER padapter); -+extern void rtw_unregister_rx_alive(PADAPTER padapter); -+extern s32 rtw_register_cmd_alive(PADAPTER padapter); -+extern void rtw_unregister_cmd_alive(PADAPTER padapter); -+extern s32 rtw_register_evt_alive(PADAPTER padapter); -+extern void rtw_unregister_evt_alive(PADAPTER padapter); -+extern void cpwm_int_hdl(PADAPTER padapter, struct reportpwrstate_parm *preportpwrstate); -+#endif -+ -+extern void rtw_set_ps_mode(_adapter * padapter, u8 ps_mode, u8 smart_ps); -+extern void rtw_set_rpwm(_adapter * padapter, u8 val8); -+extern void LeaveAllPowerSaveMode(PADAPTER Adapter); -+#ifdef CONFIG_IPS -+void _ips_enter(_adapter * padapter); -+void ips_enter(_adapter * padapter); -+int _ips_leave(_adapter * padapter); -+int ips_leave(_adapter * padapter); -+#endif -+ -+void rtw_ps_processor(_adapter*padapter); -+ -+#ifdef CONFIG_AUTOSUSPEND -+int autoresume_enter(_adapter* padapter); -+#endif -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ); -+#endif -+ -+ -+#ifdef CONFIG_LPS -+void LPS_Enter(PADAPTER padapter); -+void LPS_Leave(PADAPTER padapter); -+#endif -+ -+#ifdef CONFIG_RESUME_IN_WORKQUEUE -+void rtw_resume_in_workqueue(struct pwrctrl_priv *pwrpriv); -+#endif //CONFIG_RESUME_IN_WORKQUEUE -+ -+#if defined(CONFIG_HAS_EARLYSUSPEND ) || defined(CONFIG_ANDROID_POWER) -+bool rtw_is_earlysuspend_registered(struct pwrctrl_priv *pwrpriv); -+bool rtw_is_do_late_resume(struct pwrctrl_priv *pwrpriv); -+void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable); -+void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv); -+void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv); -+#else -+#define rtw_is_earlysuspend_registered(pwrpriv) _FALSE -+#define rtw_is_do_late_resume(pwrpriv) _FALSE -+#define rtw_set_do_late_resume(pwrpriv, enable) do {} while (0) -+#define rtw_register_early_suspend(pwrpriv) do {} while (0) -+#define rtw_unregister_early_suspend(pwrpriv) do {} while (0) -+#endif /* CONFIG_HAS_EARLYSUSPEND || CONFIG_ANDROID_POWER */ -+ -+u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val); -+void rtw_set_ips_deny(_adapter *padapter, u32 ms); -+int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller); -+#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __FUNCTION__) -+#define rtw_pwr_wakeup_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __FUNCTION__) -+int rtw_pm_set_ips(_adapter *padapter, u8 mode); -+int rtw_pm_set_lps(_adapter *padapter, u8 mode); -+ -+#endif //__RTL871X_PWRCTRL_H_ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h -@@ -0,0 +1,40 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+ -+#ifndef _RTW_QOS_H_ -+#define _RTW_QOS_H_ -+#include -+#include -+ -+ -+ -+ -+ -+ -+struct qos_priv { -+ -+ unsigned int qos_option; //bit mask option: u-apsd, s-apsd, ts, block ack... -+ -+}; -+ -+ -+#endif //_RTL871X_QOS_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h -@@ -0,0 +1,731 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_RECV_H_ -+#define _RTW_RECV_H_ -+ -+#include -+#include -+#include -+ -+ -+#define NR_RECVFRAME 256 -+ -+#define RXFRAME_ALIGN 8 -+#define RXFRAME_ALIGN_SZ (1<signal_stat_timer, (recvpriv)->signal_stat_sampling_interval) -+#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -+ -+struct sta_recv_priv { -+ -+ _lock lock; -+ sint option; -+ -+ //_queue blk_strms[MAX_RX_NUMBLKS]; -+ _queue defrag_q; //keeping the fragment frame until defrag -+ -+ struct stainfo_rxcache rxcache; -+ -+ //uint sta_rx_bytes; -+ //uint sta_rx_pkts; -+ //uint sta_rx_fail; -+ -+}; -+ -+ -+struct recv_buf -+{ -+ _list list; -+ -+ _lock recvbuf_lock; -+ -+ u32 ref_cnt; -+ -+ PADAPTER adapter; -+ -+ u8 *pbuf; -+ u8 *pallocated_buf; -+ -+ u32 len; -+ u8 *phead; -+ u8 *pdata; -+ u8 *ptail; -+ u8 *pend; -+ -+#ifdef CONFIG_USB_HCI -+ -+ #if defined(PLATFORM_OS_XP)||defined(PLATFORM_LINUX)||defined(PLATFORM_FREEBSD) -+ PURB purb; -+ dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ -+ u32 alloc_sz; -+ #endif -+ -+ #ifdef PLATFORM_OS_XP -+ PIRP pirp; -+ #endif -+ -+ #ifdef PLATFORM_OS_CE -+ USB_TRANSFER usb_transfer_read_port; -+ #endif -+ -+ u8 irp_pending; -+ int transfer_len; -+ -+#endif -+ -+#ifdef PLATFORM_LINUX -+ _pkt *pskb; -+ u8 reuse; -+#endif -+#ifdef PLATFORM_FREEBSD //skb solution -+ struct sk_buff *pskb; -+ u8 reuse; -+#endif //PLATFORM_FREEBSD //skb solution -+}; -+ -+ -+/* -+ head -----> -+ -+ data -----> -+ -+ payload -+ -+ tail -----> -+ -+ -+ end -----> -+ -+ len = (unsigned int )(tail - data); -+ -+*/ -+struct recv_frame_hdr -+{ -+ _list list; -+#ifndef CONFIG_BSD_RX_USE_MBUF -+ struct sk_buff *pkt; -+ struct sk_buff *pkt_newalloc; -+#else // CONFIG_BSD_RX_USE_MBUF -+ _pkt *pkt; -+ _pkt *pkt_newalloc; -+#endif // CONFIG_BSD_RX_USE_MBUF -+ -+ _adapter *adapter; -+ -+ u8 fragcnt; -+ -+ int frame_tag; -+ -+ struct rx_pkt_attrib attrib; -+ -+ uint len; -+ u8 *rx_head; -+ u8 *rx_data; -+ u8 *rx_tail; -+ u8 *rx_end; -+ -+ void *precvbuf; -+ -+ -+ // -+ struct sta_info *psta; -+ -+ //for A-MPDU Rx reordering buffer control -+ struct recv_reorder_ctrl *preorder_ctrl; -+ -+}; -+ -+ -+union recv_frame{ -+ -+ union{ -+ _list list; -+ struct recv_frame_hdr hdr; -+ uint mem[RECVFRAME_HDR_ALIGN>>2]; -+ }u; -+ -+ //uint mem[MAX_RXSZ>>2]; -+ -+}; -+ -+ -+extern union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue -+extern union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue -+extern void rtw_init_recvframe(union recv_frame *precvframe ,struct recv_priv *precvpriv); -+extern int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue); -+ -+#define rtw_dequeue_recvframe(queue) rtw_alloc_recvframe(queue) -+extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue); -+extern int rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue); -+ -+extern void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue); -+u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter); -+ -+sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue); -+sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue); -+struct recv_buf *rtw_dequeue_recvbuf (_queue *queue); -+ -+void rtw_reordering_ctrl_timeout_handler(void *pcontext); -+ -+__inline static u8 *get_rxmem(union recv_frame *precvframe) -+{ -+ //always return rx_head... -+ if(precvframe==NULL) -+ return NULL; -+ -+ return precvframe->u.hdr.rx_head; -+} -+ -+__inline static u8 *get_rx_status(union recv_frame *precvframe) -+{ -+ -+ return get_rxmem(precvframe); -+ -+} -+ -+__inline static u8 *get_recvframe_data(union recv_frame *precvframe) -+{ -+ -+ //alwasy return rx_data -+ if(precvframe==NULL) -+ return NULL; -+ -+ return precvframe->u.hdr.rx_data; -+ -+} -+ -+__inline static u8 *recvframe_push(union recv_frame *precvframe, sint sz) -+{ -+ // append data before rx_data -+ -+ /* add data to the start of recv_frame -+ * -+ * This function extends the used data area of the recv_frame at the buffer -+ * start. rx_data must be still larger than rx_head, after pushing. -+ */ -+ -+ if(precvframe==NULL) -+ return NULL; -+ -+ -+ precvframe->u.hdr.rx_data -= sz ; -+ if( precvframe->u.hdr.rx_data < precvframe->u.hdr.rx_head ) -+ { -+ precvframe->u.hdr.rx_data += sz ; -+ return NULL; -+ } -+ -+ precvframe->u.hdr.len +=sz; -+ -+ return precvframe->u.hdr.rx_data; -+ -+} -+ -+ -+__inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) -+{ -+ // rx_data += sz; move rx_data sz bytes hereafter -+ -+ //used for extract sz bytes from rx_data, update rx_data and return the updated rx_data to the caller -+ -+ -+ if(precvframe==NULL) -+ return NULL; -+ -+ -+ precvframe->u.hdr.rx_data += sz; -+ -+ if(precvframe->u.hdr.rx_data > precvframe->u.hdr.rx_tail) -+ { -+ precvframe->u.hdr.rx_data -= sz; -+ return NULL; -+ } -+ -+ precvframe->u.hdr.len -=sz; -+ -+ return precvframe->u.hdr.rx_data; -+ -+} -+ -+__inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) -+{ -+ // rx_tai += sz; move rx_tail sz bytes hereafter -+ -+ //used for append sz bytes from ptr to rx_tail, update rx_tail and return the updated rx_tail to the caller -+ //after putting, rx_tail must be still larger than rx_end. -+ unsigned char * prev_rx_tail; -+ -+ if(precvframe==NULL) -+ return NULL; -+ -+ prev_rx_tail = precvframe->u.hdr.rx_tail; -+ -+ precvframe->u.hdr.rx_tail += sz; -+ -+ if(precvframe->u.hdr.rx_tail > precvframe->u.hdr.rx_end) -+ { -+ precvframe->u.hdr.rx_tail -= sz; -+ return NULL; -+ } -+ -+ precvframe->u.hdr.len +=sz; -+ -+ return precvframe->u.hdr.rx_tail; -+ -+} -+ -+ -+ -+__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) -+{ -+ // rmv data from rx_tail (by yitsen) -+ -+ //used for extract sz bytes from rx_end, update rx_end and return the updated rx_end to the caller -+ //after pulling, rx_end must be still larger than rx_data. -+ -+ if(precvframe==NULL) -+ return NULL; -+ -+ precvframe->u.hdr.rx_tail -= sz; -+ -+ if(precvframe->u.hdr.rx_tail < precvframe->u.hdr.rx_data) -+ { -+ precvframe->u.hdr.rx_tail += sz; -+ return NULL; -+ } -+ -+ precvframe->u.hdr.len -=sz; -+ -+ return precvframe->u.hdr.rx_tail; -+ -+} -+ -+ -+ -+__inline static _buffer * get_rxbuf_desc(union recv_frame *precvframe) -+{ -+ _buffer * buf_desc; -+ -+ if(precvframe==NULL) -+ return NULL; -+#ifdef PLATFORM_WINDOWS -+ NdisQueryPacket(precvframe->u.hdr.pkt, NULL, NULL, &buf_desc, NULL); -+#endif -+ -+ return buf_desc; -+} -+ -+ -+__inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) -+{ -+ //due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame -+ //from any given member of recv_frame. -+ // rxmem indicates the any member/address in recv_frame -+ -+ return (union recv_frame*)(((SIZE_PTR)rxmem >> RXFRAME_ALIGN) << RXFRAME_ALIGN); -+ -+} -+ -+__inline static union recv_frame *pkt_to_recvframe(_pkt *pkt) -+{ -+ -+ u8 * buf_star; -+ union recv_frame * precv_frame; -+#ifdef PLATFORM_WINDOWS -+ _buffer * buf_desc; -+ uint len; -+ -+ NdisQueryPacket(pkt, NULL, NULL, &buf_desc, &len); -+ NdisQueryBufferSafe(buf_desc, &buf_star, &len, HighPagePriority); -+#endif -+ precv_frame = rxmem_to_recvframe((unsigned char*)buf_star); -+ -+ return precv_frame; -+} -+ -+__inline static u8 *pkt_to_recvmem(_pkt *pkt) -+{ -+ // return the rx_head -+ -+ union recv_frame * precv_frame = pkt_to_recvframe(pkt); -+ -+ return precv_frame->u.hdr.rx_head; -+ -+} -+ -+__inline static u8 *pkt_to_recvdata(_pkt *pkt) -+{ -+ // return the rx_data -+ -+ union recv_frame * precv_frame =pkt_to_recvframe(pkt); -+ -+ return precv_frame->u.hdr.rx_data; -+ -+} -+ -+ -+__inline static sint get_recvframe_len(union recv_frame *precvframe) -+{ -+ return precvframe->u.hdr.len; -+} -+ -+__inline static u8 query_rx_pwr_percentage(s8 antpower ) -+{ -+ if ((antpower <= -100) || (antpower >= 20)) -+ { -+ return 0; -+ } -+ else if (antpower >= 0) -+ { -+ return 100; -+ } -+ else -+ { -+ return (100+antpower); -+ } -+} -+ -+__inline static s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) -+{ -+ s32 SignalPower; // in dBm. -+ -+ // Translate to dBm (x=0.5y-95). -+ SignalPower = (s32)((SignalStrengthIndex + 1) >> 1); -+ SignalPower -= 95; -+ -+ return SignalPower; -+} -+ -+ -+struct sta_info; -+ -+extern void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv); -+ -+extern void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h -@@ -0,0 +1,152 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_RF_H_ -+#define __RTW_RF_H_ -+ -+#include -+#include -+ -+#define OFDM_PHY 1 -+#define MIXED_PHY 2 -+#define CCK_PHY 3 -+ -+#define NumRates (13) -+ -+// slot time for 11g -+#define SHORT_SLOT_TIME 9 -+#define NON_SHORT_SLOT_TIME 20 -+ -+#define RTL8711_RF_MAX_SENS 6 -+#define RTL8711_RF_DEF_SENS 4 -+ -+// -+// We now define the following channels as the max channels in each channel plan. -+// 2G, total 14 chnls -+// {1,2,3,4,5,6,7,8,9,10,11,12,13,14} -+// 5G, total 24 chnls -+// {36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,165} -+#define MAX_CHANNEL_NUM_2G 14 -+#define MAX_CHANNEL_NUM_5G 24 -+#define MAX_CHANNEL_NUM 38//14+24 -+ -+//#define NUM_REGULATORYS 21 -+#define NUM_REGULATORYS 1 -+ -+//Country codes -+#define USA 0x555320 -+#define EUROPE 0x1 //temp, should be provided later -+#define JAPAN 0x2 //temp, should be provided later -+ -+struct regulatory_class { -+ u32 starting_freq; //MHz, -+ u8 channel_set[MAX_CHANNEL_NUM]; -+ u8 channel_cck_power[MAX_CHANNEL_NUM];//dbm -+ u8 channel_ofdm_power[MAX_CHANNEL_NUM];//dbm -+ u8 txpower_limit; //dbm -+ u8 channel_spacing; //MHz -+ u8 modem; -+}; -+ -+typedef enum _CAPABILITY{ -+ cESS = 0x0001, -+ cIBSS = 0x0002, -+ cPollable = 0x0004, -+ cPollReq = 0x0008, -+ cPrivacy = 0x0010, -+ cShortPreamble = 0x0020, -+ cPBCC = 0x0040, -+ cChannelAgility = 0x0080, -+ cSpectrumMgnt = 0x0100, -+ cQos = 0x0200, // For HCCA, use with CF-Pollable and CF-PollReq -+ cShortSlotTime = 0x0400, -+ cAPSD = 0x0800, -+ cRM = 0x1000, // RRM (Radio Request Measurement) -+ cDSSS_OFDM = 0x2000, -+ cDelayedBA = 0x4000, -+ cImmediateBA = 0x8000, -+}CAPABILITY, *PCAPABILITY; -+ -+enum _REG_PREAMBLE_MODE{ -+ PREAMBLE_LONG = 1, -+ PREAMBLE_AUTO = 2, -+ PREAMBLE_SHORT = 3, -+}; -+ -+ -+enum _RTL8712_RF_MIMO_CONFIG_{ -+ RTL8712_RFCONFIG_1T=0x10, -+ RTL8712_RFCONFIG_2T=0x20, -+ RTL8712_RFCONFIG_1R=0x01, -+ RTL8712_RFCONFIG_2R=0x02, -+ RTL8712_RFCONFIG_1T1R=0x11, -+ RTL8712_RFCONFIG_1T2R=0x12, -+ RTL8712_RFCONFIG_TURBO=0x92, -+ RTL8712_RFCONFIG_2T2R=0x22 -+}; -+ -+ -+// Bandwidth Offset -+#define HAL_PRIME_CHNL_OFFSET_DONT_CARE 0 -+#define HAL_PRIME_CHNL_OFFSET_LOWER 1 -+#define HAL_PRIME_CHNL_OFFSET_UPPER 2 -+ -+// Represent Channel Width in HT Capabilities -+// -+typedef enum _HT_CHANNEL_WIDTH { -+ HT_CHANNEL_WIDTH_20 = 0, -+ HT_CHANNEL_WIDTH_40 = 1, -+}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; -+ -+// -+// Represent Extention Channel Offset in HT Capabilities -+// This is available only in 40Mhz mode. -+// -+typedef enum _HT_EXTCHNL_OFFSET{ -+ HT_EXTCHNL_OFFSET_NO_EXT = 0, -+ HT_EXTCHNL_OFFSET_UPPER = 1, -+ HT_EXTCHNL_OFFSET_NO_DEF = 2, -+ HT_EXTCHNL_OFFSET_LOWER = 3, -+}HT_EXTCHNL_OFFSET, *PHT_EXTCHNL_OFFSET; -+ -+/* 2007/11/15 MH Define different RF type. */ -+typedef enum _RT_RF_TYPE_DEFINITION -+{ -+ RF_1T2R = 0, -+ RF_2T4R = 1, -+ RF_2T2R = 2, -+ RF_1T1R = 3, -+ RF_2T2R_GREEN = 4, -+ RF_819X_MAX_TYPE = 5, -+}RT_RF_TYPE_DEF_E; -+ -+typedef enum _RF_RADIO_PATH{ -+ RF_PATH_A = 0, //Radio Path A -+ RF_PATH_B = 1, //Radio Path B -+ RF_PATH_C = 2, //Radio Path C -+ RF_PATH_D = 3, //Radio Path D -+ //RF_PATH_MAX //Max RF number 90 support -+}RF_RADIO_PATH_E, *PRF_RADIO_PATH_E; -+ -+u32 rtw_ch2freq(u32 ch); -+u32 rtw_freq2ch(u32 freq); -+ -+ -+#endif //_RTL8711_RF_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h -@@ -0,0 +1,447 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_SECURITY_H_ -+#define __RTW_SECURITY_H_ -+ -+ -+#include -+#include -+#include -+ -+ -+#define _NO_PRIVACY_ 0x0 -+#define _WEP40_ 0x1 -+#define _TKIP_ 0x2 -+#define _TKIP_WTMIC_ 0x3 -+#define _AES_ 0x4 -+#define _WEP104_ 0x5 -+#ifdef CONFIG_IEEE80211W -+#define _BIP_ 0x8 -+#endif //CONFIG_IEEE80211W -+#define is_wep_enc(alg) (((alg) == _WEP40_) || ((alg) == _WEP104_)) -+ -+#define _WPA_IE_ID_ 0xdd -+#define _WPA2_IE_ID_ 0x30 -+ -+#define SHA256_MAC_LEN 32 -+#define AES_BLOCK_SIZE 16 -+#define AES_PRIV_SIZE (4 * 44) -+ -+#ifndef Ndis802_11AuthModeWPA2 -+#define Ndis802_11AuthModeWPA2 (Ndis802_11AuthModeWPANone + 1) -+#endif -+ -+#ifndef Ndis802_11AuthModeWPA2PSK -+#define Ndis802_11AuthModeWPA2PSK (Ndis802_11AuthModeWPANone + 2) -+#endif -+ -+union pn48 { -+ -+ u64 val; -+ -+#ifdef CONFIG_LITTLE_ENDIAN -+ -+struct { -+ u8 TSC0; -+ u8 TSC1; -+ u8 TSC2; -+ u8 TSC3; -+ u8 TSC4; -+ u8 TSC5; -+ u8 TSC6; -+ u8 TSC7; -+} _byte_; -+ -+#elif defined(CONFIG_BIG_ENDIAN) -+ -+struct { -+ u8 TSC7; -+ u8 TSC6; -+ u8 TSC5; -+ u8 TSC4; -+ u8 TSC3; -+ u8 TSC2; -+ u8 TSC1; -+ u8 TSC0; -+} _byte_; -+ -+#endif -+ -+}; -+ -+union Keytype { -+ u8 skey[16]; -+ u32 lkey[4]; -+}; -+ -+ -+typedef struct _RT_PMKID_LIST -+{ -+ u8 bUsed; -+ u8 Bssid[6]; -+ u8 PMKID[16]; -+ u8 SsidBuf[33]; -+ u8* ssid_octet; -+ u16 ssid_length; -+} RT_PMKID_LIST, *PRT_PMKID_LIST; -+ -+ -+struct security_priv -+{ -+ u32 dot11AuthAlgrthm; // 802.11 auth, could be open, shared, 8021x and authswitch -+ u32 dot11PrivacyAlgrthm; // This specify the privacy for shared auth. algorithm. -+ -+ /* WEP */ -+ u32 dot11PrivacyKeyIndex; // this is only valid for legendary wep, 0~3 for key id. (tx key index) -+ union Keytype dot11DefKey[4]; // this is only valid for def. key -+ u32 dot11DefKeylen[4]; -+ u8 key_mask; /* use to restore wep key after hal_init */ -+ -+ u32 dot118021XGrpPrivacy; // This specify the privacy algthm. used for Grp key -+ u32 dot118021XGrpKeyid; // key id used for Grp Key ( tx key index) -+ union Keytype dot118021XGrpKey[4]; // 802.1x Group Key, for inx0 and inx1 -+ union Keytype dot118021XGrptxmickey[4]; -+ union Keytype dot118021XGrprxmickey[4]; -+ union pn48 dot11Grptxpn; // PN48 used for Grp Key xmit. -+ union pn48 dot11Grprxpn; // PN48 used for Grp Key recv. -+#ifdef CONFIG_IEEE80211W -+ u32 dot11wBIPKeyid; // key id used for BIP Key ( tx key index) -+ union Keytype dot11wBIPKey[6]; // BIP Key, for index4 and index5 -+ union pn48 dot11wBIPtxpn; // PN48 used for Grp Key xmit. -+ union pn48 dot11wBIPrxpn; // PN48 used for Grp Key recv. -+#endif //CONFIG_IEEE80211W -+#ifdef CONFIG_AP_MODE -+ //extend security capabilities for AP_MODE -+ unsigned int dot8021xalg;//0:disable, 1:psk, 2:802.1x -+ unsigned int wpa_psk;//0:disable, bit(0): WPA, bit(1):WPA2 -+ unsigned int wpa_group_cipher; -+ unsigned int wpa2_group_cipher; -+ unsigned int wpa_pairwise_cipher; -+ unsigned int wpa2_pairwise_cipher; -+#endif -+ -+ u8 wps_ie[MAX_WPS_IE_LEN];//added in assoc req -+ int wps_ie_len; -+ -+ -+ u8 binstallGrpkey; -+#ifdef CONFIG_IEEE80211W -+ u8 binstallBIPkey; -+#endif //CONFIG_IEEE80211W -+ u8 busetkipkey; -+ //_timer tkip_timer; -+ u8 bcheck_grpkey; -+ u8 bgrpkey_handshake; -+ -+ //u8 packet_cnt;//unused, removed -+ -+ s32 sw_encrypt;//from registry_priv -+ s32 sw_decrypt;//from registry_priv -+ -+ s32 hw_decrypted;//if the rx packets is hw_decrypted==_FALSE, it means the hw has not been ready. -+ -+ -+ //keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc) -+ u32 ndisauthtype; // NDIS_802_11_AUTHENTICATION_MODE -+ u32 ndisencryptstatus; // NDIS_802_11_ENCRYPTION_STATUS -+ -+ WLAN_BSSID_EX sec_bss; //for joinbss (h2c buffer) usage -+ -+ NDIS_802_11_WEP ndiswep; -+#ifdef PLATFORM_WINDOWS -+ u8 KeyMaterial[16];// variable length depending on above field. -+#endif -+ -+ u8 assoc_info[600]; -+ u8 szofcapability[256]; //for wpa2 usage -+ u8 oidassociation[512]; //for wpa/wpa2 usage -+ u8 authenticator_ie[256]; //store ap security information element -+ u8 supplicant_ie[256]; //store sta security information element -+ -+ -+ //for tkip countermeasure -+ u32 last_mic_err_time; -+ u8 btkip_countermeasure; -+ u8 btkip_wait_report; -+ u32 btkip_countermeasure_time; -+ -+ //--------------------------------------------------------------------------- -+ // For WPA2 Pre-Authentication. -+ //--------------------------------------------------------------------------- -+ //u8 RegEnablePreAuth; // Default value: Pre-Authentication enabled or not, from registry "EnablePreAuth". Added by Annie, 2005-11-01. -+ //u8 EnablePreAuthentication; // Current Value: Pre-Authentication enabled or not. -+ RT_PMKID_LIST PMKIDList[NUM_PMKID_CACHE]; // Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. -+ u8 PMKIDIndex; -+ //u32 PMKIDCount; // Added by Annie, 2006-10-13. -+ //u8 szCapability[256]; // For WPA2-PSK using zero-config, by Annie, 2005-09-20. -+ -+ u8 bWepDefaultKeyIdxSet; -+}; -+ -+struct sha256_state { -+ u64 length; -+ u32 state[8], curlen; -+ u8 buf[64]; -+}; -+ -+#define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\ -+do{\ -+ switch(psecuritypriv->dot11AuthAlgrthm)\ -+ {\ -+ case dot11AuthAlgrthm_Open:\ -+ case dot11AuthAlgrthm_Shared:\ -+ case dot11AuthAlgrthm_Auto:\ -+ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ -+ break;\ -+ case dot11AuthAlgrthm_8021X:\ -+ if(bmcst)\ -+ encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\ -+ else\ -+ encry_algo =(u8) psta->dot118021XPrivacy;\ -+ break;\ -+ }\ -+}while(0) -+ -+ -+#define SET_ICE_IV_LEN( iv_len, icv_len, encrypt)\ -+do{\ -+ switch(encrypt)\ -+ {\ -+ case _WEP40_:\ -+ case _WEP104_:\ -+ iv_len = 4;\ -+ icv_len = 4;\ -+ break;\ -+ case _TKIP_:\ -+ iv_len = 8;\ -+ icv_len = 4;\ -+ break;\ -+ case _AES_:\ -+ iv_len = 8;\ -+ icv_len = 8;\ -+ break;\ -+ default:\ -+ iv_len = 0;\ -+ icv_len = 0;\ -+ break;\ -+ }\ -+}while(0) -+ -+ -+#define GET_TKIP_PN(iv,dot11txpn)\ -+do{\ -+ dot11txpn._byte_.TSC0=iv[2];\ -+ dot11txpn._byte_.TSC1=iv[0];\ -+ dot11txpn._byte_.TSC2=iv[4];\ -+ dot11txpn._byte_.TSC3=iv[5];\ -+ dot11txpn._byte_.TSC4=iv[6];\ -+ dot11txpn._byte_.TSC5=iv[7];\ -+}while(0) -+ -+ -+#define ROL32( A, n ) ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) ) -+#define ROR32( A, n ) ROL32( (A), 32-(n) ) -+ -+struct mic_data -+{ -+ u32 K0, K1; // Key -+ u32 L, R; // Current state -+ u32 M; // Message accumulator (single word) -+ u32 nBytesInM; // # bytes in M -+}; -+ -+extern const u32 Te0[256]; -+extern const u32 Te1[256]; -+extern const u32 Te2[256]; -+extern const u32 Te3[256]; -+extern const u32 Te4[256]; -+extern const u32 Td0[256]; -+extern const u32 Td1[256]; -+extern const u32 Td2[256]; -+extern const u32 Td3[256]; -+extern const u32 Td4[256]; -+extern const u32 rcon[10]; -+extern const u8 Td4s[256]; -+extern const u8 rcons[10]; -+ -+#define RCON(i) (rcons[(i)] << 24) -+ -+static inline u32 rotr(u32 val, int bits) -+{ -+ return (val >> bits) | (val << (32 - bits)); -+} -+ -+#define TE0(i) Te0[((i) >> 24) & 0xff] -+#define TE1(i) rotr(Te0[((i) >> 16) & 0xff], 8) -+#define TE2(i) rotr(Te0[((i) >> 8) & 0xff], 16) -+#define TE3(i) rotr(Te0[(i) & 0xff], 24) -+#define TE41(i) ((Te0[((i) >> 24) & 0xff] << 8) & 0xff000000) -+#define TE42(i) (Te0[((i) >> 16) & 0xff] & 0x00ff0000) -+#define TE43(i) (Te0[((i) >> 8) & 0xff] & 0x0000ff00) -+#define TE44(i) ((Te0[(i) & 0xff] >> 8) & 0x000000ff) -+#define TE421(i) ((Te0[((i) >> 16) & 0xff] << 8) & 0xff000000) -+#define TE432(i) (Te0[((i) >> 8) & 0xff] & 0x00ff0000) -+#define TE443(i) (Te0[(i) & 0xff] & 0x0000ff00) -+#define TE414(i) ((Te0[((i) >> 24) & 0xff] >> 8) & 0x000000ff) -+#define TE4(i) ((Te0[(i)] >> 8) & 0x000000ff) -+ -+#define TD0(i) Td0[((i) >> 24) & 0xff] -+#define TD1(i) rotr(Td0[((i) >> 16) & 0xff], 8) -+#define TD2(i) rotr(Td0[((i) >> 8) & 0xff], 16) -+#define TD3(i) rotr(Td0[(i) & 0xff], 24) -+#define TD41(i) (Td4s[((i) >> 24) & 0xff] << 24) -+#define TD42(i) (Td4s[((i) >> 16) & 0xff] << 16) -+#define TD43(i) (Td4s[((i) >> 8) & 0xff] << 8) -+#define TD44(i) (Td4s[(i) & 0xff]) -+#define TD0_(i) Td0[(i) & 0xff] -+#define TD1_(i) rotr(Td0[(i) & 0xff], 8) -+#define TD2_(i) rotr(Td0[(i) & 0xff], 16) -+#define TD3_(i) rotr(Td0[(i) & 0xff], 24) -+ -+#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ \ -+ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3])) -+ -+#define PUTU32(ct, st) { \ -+(ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); \ -+(ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); } -+ -+#define WPA_GET_BE32(a) ((((u32) (a)[0]) << 24) | (((u32) (a)[1]) << 16) | \ -+ (((u32) (a)[2]) << 8) | ((u32) (a)[3])) -+ -+#define WPA_PUT_LE16(a, val) \ -+ do { \ -+ (a)[1] = ((u16) (val)) >> 8; \ -+ (a)[0] = ((u16) (val)) & 0xff; \ -+ } while (0) -+ -+#define WPA_PUT_BE32(a, val) \ -+ do { \ -+ (a)[0] = (u8) ((((u32) (val)) >> 24) & 0xff); \ -+ (a)[1] = (u8) ((((u32) (val)) >> 16) & 0xff); \ -+ (a)[2] = (u8) ((((u32) (val)) >> 8) & 0xff); \ -+ (a)[3] = (u8) (((u32) (val)) & 0xff); \ -+ } while (0) -+ -+#define WPA_PUT_BE64(a, val) \ -+ do { \ -+ (a)[0] = (u8) (((u64) (val)) >> 56); \ -+ (a)[1] = (u8) (((u64) (val)) >> 48); \ -+ (a)[2] = (u8) (((u64) (val)) >> 40); \ -+ (a)[3] = (u8) (((u64) (val)) >> 32); \ -+ (a)[4] = (u8) (((u64) (val)) >> 24); \ -+ (a)[5] = (u8) (((u64) (val)) >> 16); \ -+ (a)[6] = (u8) (((u64) (val)) >> 8); \ -+ (a)[7] = (u8) (((u64) (val)) & 0xff); \ -+ } while (0) -+ -+/* ===== start - public domain SHA256 implementation ===== */ -+ -+/* This is based on SHA256 implementation in LibTomCrypt that was released into -+ * public domain by Tom St Denis. */ -+ -+/* the K array */ -+static const unsigned long K[64] = { -+ 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL, -+ 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL, -+ 0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, -+ 0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL, -+ 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL, -+ 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL, -+ 0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, -+ 0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, -+ 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL, -+ 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL, -+ 0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, -+ 0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, -+ 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL -+}; -+ -+ -+/* Various logical functions */ -+#define RORc(x, y) \ -+( ((((unsigned long) (x) & 0xFFFFFFFFUL) >> (unsigned long) ((y) & 31)) | \ -+ ((unsigned long) (x) << (unsigned long) (32 - ((y) & 31)))) & 0xFFFFFFFFUL) -+#define Ch(x,y,z) (z ^ (x & (y ^ z))) -+#define Maj(x,y,z) (((x | y) & z) | (x & y)) -+#define S(x, n) RORc((x), (n)) -+#define R(x, n) (((x)&0xFFFFFFFFUL)>>(n)) -+#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22)) -+#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25)) -+#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3)) -+#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10)) -+#ifndef MIN -+#define MIN(x, y) (((x) < (y)) ? (x) : (y)) -+#endif -+#ifdef CONFIG_IEEE80211W -+int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac); -+#endif //CONFIG_IEEE80211W -+void rtw_secmicsetkey(struct mic_data *pmicdata, u8 * key ); -+void rtw_secmicappendbyte(struct mic_data *pmicdata, u8 b ); -+void rtw_secmicappend(struct mic_data *pmicdata, u8 * src, u32 nBytes ); -+void rtw_secgetmic(struct mic_data *pmicdata, u8 * dst ); -+ -+void rtw_seccalctkipmic( -+ u8 * key, -+ u8 *header, -+ u8 *data, -+ u32 data_len, -+ u8 *Miccode, -+ u8 priority); -+ -+u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe); -+u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe); -+void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe); -+ -+u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe); -+u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe); -+void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe); -+#ifdef CONFIG_IEEE80211W -+u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe); -+#endif //CONFIG_IEEE80211W -+#ifdef CONFIG_TDLS -+void wpa_tdls_generate_tpk(_adapter *padapter, struct sta_info *psta); -+int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq, -+ u8 *lnkid, u8 *rsnie, u8 *timeoutie, u8 *ftie, -+ u8 *mic); -+int tdls_verify_mic(u8 *kck, u8 trans_seq, -+ u8 *lnkid, u8 *rsnie, u8 *timeoutie, u8 *ftie); -+#endif //CONFIG_TDLS -+ -+#ifdef PLATFORM_WINDOWS -+void rtw_use_tkipkey_handler ( -+ IN PVOID SystemSpecific1, -+ IN PVOID FunctionContext, -+ IN PVOID SystemSpecific2, -+ IN PVOID SystemSpecific3 -+ ); -+#endif -+#ifdef PLATFORM_LINUX -+void rtw_use_tkipkey_handler(void* FunctionContext); -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+void rtw_use_tkipkey_handler(void* FunctionContext); -+#endif //PLATFORM_FREEBSD -+ -+void rtw_sec_restore_wep_key(_adapter *adapter); -+u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller); -+ -+#endif //__RTL871X_SECURITY_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h -@@ -0,0 +1,74 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_SRESET_C_ -+#define _RTW_SRESET_C_ -+ -+#include -+#include -+#include -+ -+enum { -+ SRESET_TGP_NULL = 0, -+ SRESET_TGP_XMIT_STATUS = 1, -+ SRESET_TGP_LINK_STATUS = 2, -+}; -+ -+struct sreset_priv { -+ _mutex silentreset_mutex; -+ u8 silent_reset_inprogress; -+ u8 Wifi_Error_Status; -+ unsigned long last_tx_time; -+ unsigned long last_tx_complete_time; -+ -+ s32 dbg_trigger_point; -+}; -+ -+#ifdef CONFIG_RTL8192C -+#include -+#endif -+#ifdef CONFIG_RTL8192D -+#include -+#endif -+#ifdef CONFIG_RTL8723A -+#include -+#endif -+#ifdef CONFIG_RTL8188E -+#include -+#endif -+ -+#define WIFI_STATUS_SUCCESS 0 -+#define USB_VEN_REQ_CMD_FAIL BIT0 -+#define USB_READ_PORT_FAIL BIT1 -+#define USB_WRITE_PORT_FAIL BIT2 -+#define WIFI_MAC_TXDMA_ERROR BIT3 -+#define WIFI_TX_HANG BIT4 -+#define WIFI_RX_HANG BIT5 -+#define WIFI_IF_NOT_EXIST BIT6 -+ -+void sreset_init_value(_adapter *padapter); -+void sreset_reset_value(_adapter *padapter); -+u8 sreset_get_wifi_status(_adapter *padapter); -+void sreset_set_wifi_error_status(_adapter *padapter, u32 status); -+void sreset_set_trigger_point(_adapter *padapter, s32 tgp); -+bool sreset_inprogress(_adapter *padapter); -+void sreset_reset(_adapter *padapter); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h -@@ -0,0 +1,143 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __RTW_TDLS_H_ -+#define __RTW_TDLS_H_ -+ -+#include -+ -+#ifdef CONFIG_TDLS -+/* TDLS STA state */ -+#define TDLS_STATE_NONE 0x00000000 //default state -+#define TDLS_INITIATOR_STATE 0x10000000 -+#define TDLS_RESPONDER_STATE 0x20000000 -+#define TDLS_LINKED_STATE 0x40000000 -+#define TDLS_CH_SWITCH_ON_STATE 0x01000000 -+#define TDLS_PEER_AT_OFF_STATE 0x02000000 //could send pkt on target ch -+#define TDLS_AT_OFF_CH_STATE 0x04000000 -+#define TDLS_CH_SW_INITIATOR_STATE 0x08000000 //avoiding duplicated or unconditional ch. switch rsp. -+#define TDLS_APSD_CHSW_STATE 0x00100000 //in APSD and want to setup channel switch -+#define TDLS_PEER_SLEEP_STATE 0x00200000 //peer sta is sleeping -+#define TDLS_SW_OFF_STATE 0x00400000 //terminate channel swithcing -+#define TDLS_ALIVE_STATE 0x00010000 //Check if peer sta is alived. -+ -+#define TPK_RESEND_COUNT 301 -+#define CH_SWITCH_TIME 10 -+#define CH_SWITCH_TIMEOUT 30 -+#define TDLS_STAY_TIME 500 -+#define TDLS_SIGNAL_THRESH 0x20 -+#define TDLS_WATCHDOG_PERIOD 10 //Periodically sending tdls discovery request in TDLS_WATCHDOG_PERIOD * 2 sec -+#define TDLS_ALIVE_TIMER_PH1 5000 -+#define TDLS_ALIVE_TIMER_PH2 2000 -+#define TDLS_STAY_TIME 500 -+#define TDLS_HANDSHAKE_TIME 2000 -+#define TDLS_ALIVE_COUNT 3 -+#define TDLS_INI_MACID_ENTRY 6 -+ -+/* TDLS */ -+#define TDLS_MIC_LEN 16 -+#define WPA_NONCE_LEN 32 -+#define TDLS_TIMEOUT_LEN 4 -+ -+struct wpa_tdls_ftie { -+ u8 ie_type; /* FTIE */ -+ u8 ie_len; -+ u8 mic_ctrl[2]; -+ u8 mic[TDLS_MIC_LEN]; -+ u8 Anonce[WPA_NONCE_LEN]; /* Responder Nonce in TDLS */ -+ u8 Snonce[WPA_NONCE_LEN]; /* Initiator Nonce in TDLS */ -+ /* followed by optional elements */ -+} ; -+ -+struct wpa_tdls_lnkid { -+ u8 ie_type; /* Link Identifier IE */ -+ u8 ie_len; -+ u8 bssid[ETH_ALEN]; -+ u8 init_sta[ETH_ALEN]; -+ u8 resp_sta[ETH_ALEN]; -+} ; -+ -+static u8 TDLS_RSNIE[]={ 0x01, 0x00, //version shall be set to 1 -+ 0x00, 0x0f, 0xac, 0x07, //group sipher suite -+ 0x01, 0x00, //pairwise cipher suite count -+ 0x00, 0x0f, 0xac, 0x04, //pairwise cipher suite list; CCMP only -+ 0x01, 0x00, //AKM suite count -+ 0x00, 0x0f, 0xac, 0x07, //TPK Handshake -+ 0x00, 0x02, -+ //PMKID shall not be present -+ }; -+ -+static u8 TDLS_WMMIE[]={0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00}; //Qos info all set zero -+ -+static u8 TDLS_EXT_CAPIE[] = {0x00, 0x00, 0x00, 0x50, 0x20}; //bit(28), bit(30), bit(37) -+ -+// SRC: Supported Regulatory Classes -+static u8 TDLS_SRC[] = { 0x01, 0x01, 0x02, 0x03, 0x04, 0x0c, 0x16, 0x17, 0x18, 0x19, 0x1b, 0x1c, 0x1d, 0x1e, 0x20, 0x21 }; -+ -+void rtw_reset_tdls_info(_adapter* padapter); -+int rtw_init_tdls_info(_adapter* padapter); -+void rtw_free_tdls_info(struct tdls_info *ptdlsinfo); -+void issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, struct sta_info *ptdls_sta, unsigned int power_mode); -+void init_TPK_timer(_adapter *padapter, struct sta_info *psta); -+void init_ch_switch_timer(_adapter *padapter, struct sta_info *psta); -+void init_base_ch_timer(_adapter *padapter, struct sta_info *psta); -+void init_off_ch_timer(_adapter *padapter, struct sta_info *psta); -+void init_tdls_alive_timer(_adapter *padapter, struct sta_info *psta); -+void init_handshake_timer(_adapter *padapter, struct sta_info *psta); -+void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta); -+#ifdef CONFIG_WFD -+void issue_tunneled_probe_req(_adapter *padapter); -+void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame); -+#endif //CONFIG_WFD -+void issue_tdls_dis_req(_adapter *padapter, u8 *mac_addr); -+void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr); -+void issue_tdls_setup_rsp(_adapter *padapter, union recv_frame *precv_frame); -+void issue_tdls_setup_cfm(_adapter *padapter, union recv_frame *precv_frame); -+void issue_tdls_dis_rsp(_adapter * padapter, union recv_frame * precv_frame, u8 dialog); -+void issue_tdls_teardown(_adapter *padapter, u8 *mac_addr); -+void issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *psta); -+void issue_tdls_ch_switch_req(_adapter *padapter, u8 *mac_addr); -+void issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr); -+sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Dis_Req(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Teardown(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame); -+sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame); -+void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_setup_cfm_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_teardown_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_dis_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 dialog); -+void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tunneled_probe_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+void rtw_build_tunneled_probe_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -+ -+int update_sgi_tdls(_adapter *padapter, struct sta_info *psta); -+u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta); -+#endif //CONFIG_TDLS -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h -@@ -0,0 +1 @@ -+#define DRIVERVERSION "v4.0.2_9000.20130911" ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h -@@ -0,0 +1,754 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _RTW_XMIT_H_ -+#define _RTW_XMIT_H_ -+ -+#include -+#include -+#include -+#ifdef PLATFORM_FREEBSD -+#include -+#endif //PLATFORM_FREEBSD -+ -+#ifdef CONFIG_SDIO_HCI -+//#define MAX_XMITBUF_SZ (30720)// (2048) -+#define MAX_XMITBUF_SZ (12288) -+#define NR_XMITBUFF (16) -+ -+#elif defined (CONFIG_USB_HCI) -+#ifdef CONFIG_USB_TX_AGGREGATION -+ #if defined(CONFIG_PLATFORM_ARM_SUNxI) || defined(CONFIG_PLATFORM_ARM_SUN6I) -+ #define MAX_XMITBUF_SZ (12288) //12k 1536*8 -+ #elif defined (CONFIG_PLATFORM_MSTAR) -+ #define MAX_XMITBUF_SZ 7680 // 7.5k -+ #else -+ #define MAX_XMITBUF_SZ (20480) // 20k -+ #endif -+#else -+#define MAX_XMITBUF_SZ (2048) -+#endif //CONFIG_USB_TX_AGGREGATION -+#ifdef CONFIG_SINGLE_XMIT_BUF -+#define NR_XMITBUFF (1) -+#else -+#define NR_XMITBUFF (4) -+#endif //CONFIG_SINGLE_XMIT_BUF -+ -+#elif defined (CONFIG_PCI_HCI) -+#define MAX_XMITBUF_SZ (1664) -+#define NR_XMITBUFF (128) -+#endif -+ -+#ifdef PLATFORM_OS_CE -+#define XMITBUF_ALIGN_SZ 4 -+#else -+#ifdef CONFIG_PCI_HCI -+#define XMITBUF_ALIGN_SZ 4 -+#else -+#define XMITBUF_ALIGN_SZ 512 -+#endif -+#endif -+ -+// xmit extension buff defination -+#define MAX_XMIT_EXTBUF_SZ (1536) -+#ifdef CONFIG_SINGLE_XMIT_BUF -+#define NR_XMIT_EXTBUFF (1) -+#else -+#define NR_XMIT_EXTBUFF (32) -+#endif //CONFIG_SINGLE_XMIT_BUF -+ -+#define MAX_NUMBLKS (1) -+ -+#define XMIT_VO_QUEUE (0) -+#define XMIT_VI_QUEUE (1) -+#define XMIT_BE_QUEUE (2) -+#define XMIT_BK_QUEUE (3) -+ -+#define VO_QUEUE_INX 0 -+#define VI_QUEUE_INX 1 -+#define BE_QUEUE_INX 2 -+#define BK_QUEUE_INX 3 -+#define BCN_QUEUE_INX 4 -+#define MGT_QUEUE_INX 5 -+#define HIGH_QUEUE_INX 6 -+#define TXCMD_QUEUE_INX 7 -+ -+#define HW_QUEUE_ENTRY 8 -+ -+#ifdef CONFIG_PCI_HCI -+//#define TXDESC_NUM 64 -+#define TXDESC_NUM 128 -+#define TXDESC_NUM_BE_QUEUE 128 -+#endif -+ -+#define WEP_IV(pattrib_iv, dot11txpn, keyidx)\ -+do{\ -+ pattrib_iv[0] = dot11txpn._byte_.TSC0;\ -+ pattrib_iv[1] = dot11txpn._byte_.TSC1;\ -+ pattrib_iv[2] = dot11txpn._byte_.TSC2;\ -+ pattrib_iv[3] = ((keyidx & 0x3)<<6);\ -+ dot11txpn.val = (dot11txpn.val == 0xffffff) ? 0: (dot11txpn.val+1);\ -+}while(0) -+ -+ -+#define TKIP_IV(pattrib_iv, dot11txpn, keyidx)\ -+do{\ -+ pattrib_iv[0] = dot11txpn._byte_.TSC1;\ -+ pattrib_iv[1] = (dot11txpn._byte_.TSC1 | 0x20) & 0x7f;\ -+ pattrib_iv[2] = dot11txpn._byte_.TSC0;\ -+ pattrib_iv[3] = BIT(5) | ((keyidx & 0x3)<<6);\ -+ pattrib_iv[4] = dot11txpn._byte_.TSC2;\ -+ pattrib_iv[5] = dot11txpn._byte_.TSC3;\ -+ pattrib_iv[6] = dot11txpn._byte_.TSC4;\ -+ pattrib_iv[7] = dot11txpn._byte_.TSC5;\ -+ dot11txpn.val = dot11txpn.val == 0xffffffffffffULL ? 0: (dot11txpn.val+1);\ -+}while(0) -+ -+#define AES_IV(pattrib_iv, dot11txpn, keyidx)\ -+do{\ -+ pattrib_iv[0] = dot11txpn._byte_.TSC0;\ -+ pattrib_iv[1] = dot11txpn._byte_.TSC1;\ -+ pattrib_iv[2] = 0;\ -+ pattrib_iv[3] = BIT(5) | ((keyidx & 0x3)<<6);\ -+ pattrib_iv[4] = dot11txpn._byte_.TSC2;\ -+ pattrib_iv[5] = dot11txpn._byte_.TSC3;\ -+ pattrib_iv[6] = dot11txpn._byte_.TSC4;\ -+ pattrib_iv[7] = dot11txpn._byte_.TSC5;\ -+ dot11txpn.val = dot11txpn.val == 0xffffffffffffULL ? 0: (dot11txpn.val+1);\ -+}while(0) -+ -+ -+#define HWXMIT_ENTRY 4 -+ -+#define TXDESC_SIZE 32 -+ -+#ifdef CONFIG_SDIO_HCI -+#define TXDESC_OFFSET TXDESC_SIZE -+#endif -+ -+#ifdef CONFIG_USB_HCI -+#define PACKET_OFFSET_SZ (8) -+#define TXDESC_OFFSET (TXDESC_SIZE + PACKET_OFFSET_SZ) -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+#define TXDESC_OFFSET 0 -+#define TX_DESC_NEXT_DESC_OFFSET 40 -+#endif -+ -+// -+//defined for TX DESC Operation -+// -+ -+#define MAX_TID (15) -+ -+//OFFSET 0 -+#define OFFSET_SZ 0 -+#define OFFSET_SHT 16 -+#define BMC BIT(24) -+#define LSG BIT(26) -+#define FSG BIT(27) -+#define OWN BIT(31) -+ -+//OFFSET 4 -+#define PKT_OFFSET_SZ 0 -+#define BK BIT(6) -+#define QSEL_SHT 8 -+#define Rate_ID_SHT 16 -+#define NAVUSEHDR BIT(20) -+#define PKT_OFFSET_SHT 26 -+#define HWPC BIT(31) -+ -+//OFFSET 8 -+#define AGG_EN BIT(29) -+ -+//OFFSET 12 -+#define SEQ_SHT 16 -+ -+//OFFSET 16 -+#define QoS BIT(6) -+#define HW_SEQ_EN BIT(7) -+#define USERATE BIT(8) -+#define DISDATAFB BIT(10) -+#define DATA_SHORT BIT(24) -+#define DATA_BW BIT(25) -+ -+//OFFSET 20 -+#define SGI BIT(6) -+ -+struct tx_desc{ -+ -+ //DWORD 0 -+ unsigned int txdw0; -+ -+ unsigned int txdw1; -+ -+ unsigned int txdw2; -+ -+ unsigned int txdw3; -+ -+ unsigned int txdw4; -+ -+ unsigned int txdw5; -+ -+ unsigned int txdw6; -+ -+ unsigned int txdw7; -+#ifdef CONFIG_PCI_HCI -+ unsigned int txdw8; -+ -+ unsigned int txdw9; -+ -+ unsigned int txdw10; -+ -+ unsigned int txdw11; -+ -+ // 2008/05/15 MH Because PCIE HW memory R/W 4K limit. And now, our descriptor -+ // size is 40 bytes. If you use more than 102 descriptor( 103*40>4096), HW will execute -+ // memoryR/W CRC error. And then all DMA fetch will fail. We must decrease descriptor -+ // number or enlarge descriptor size as 64 bytes. -+ unsigned int txdw12; -+ -+ unsigned int txdw13; -+ -+ unsigned int txdw14; -+ -+ unsigned int txdw15; -+#endif -+}; -+ -+ -+union txdesc { -+ struct tx_desc txdesc; -+ unsigned int value[TXDESC_SIZE>>2]; -+}; -+ -+#ifdef CONFIG_PCI_HCI -+#define PCI_MAX_TX_QUEUE_COUNT 8 -+ -+struct rtw_tx_ring { -+ struct tx_desc *desc; -+ dma_addr_t dma; -+ unsigned int idx; -+ unsigned int entries; -+ _queue queue; -+ u32 qlen; -+}; -+#endif -+ -+struct hw_xmit { -+ //_lock xmit_lock; -+ //_list pending; -+ _queue *sta_queue; -+ //struct hw_txqueue *phwtxqueue; -+ //sint txcmdcnt; -+ int accnt; -+}; -+ -+#if 0 -+struct pkt_attrib -+{ -+ u8 type; -+ u8 subtype; -+ u8 bswenc; -+ u8 dhcp_pkt; -+ u16 ether_type; -+ int pktlen; //the original 802.3 pkt raw_data len (not include ether_hdr data) -+ int pkt_hdrlen; //the original 802.3 pkt header len -+ int hdrlen; //the WLAN Header Len -+ int nr_frags; -+ int last_txcmdsz; -+ int encrypt; //when 0 indicate no encrypt. when non-zero, indicate the encrypt algorith -+ u8 iv[8]; -+ int iv_len; -+ u8 icv[8]; -+ int icv_len; -+ int priority; -+ int ack_policy; -+ int mac_id; -+ int vcs_mode; //virtual carrier sense method -+ -+ u8 dst[ETH_ALEN]; -+ u8 src[ETH_ALEN]; -+ u8 ta[ETH_ALEN]; -+ u8 ra[ETH_ALEN]; -+ -+ u8 key_idx; -+ -+ u8 qos_en; -+ u8 ht_en; -+ u8 raid;//rate adpative id -+ u8 bwmode; -+ u8 ch_offset;//PRIME_CHNL_OFFSET -+ u8 sgi;//short GI -+ u8 ampdu_en;//tx ampdu enable -+ u8 mdata;//more data bit -+ u8 eosp; -+ -+ u8 pctrl;//per packet txdesc control enable -+ u8 triggered;//for ap mode handling Power Saving sta -+ -+ u32 qsel; -+ u16 seqnum; -+ -+ struct sta_info * psta; -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ u8 hw_tcp_csum; -+#endif -+}; -+#else -+//reduce size -+struct pkt_attrib -+{ -+ u8 type; -+ u8 subtype; -+ u8 bswenc; -+ u8 dhcp_pkt; -+ u16 ether_type; -+ u16 seqnum; -+ u16 pkt_hdrlen; //the original 802.3 pkt header len -+ u16 hdrlen; //the WLAN Header Len -+ u32 pktlen; //the original 802.3 pkt raw_data len (not include ether_hdr data) -+ u32 last_txcmdsz; -+ u8 nr_frags; -+ u8 encrypt; //when 0 indicate no encrypt. when non-zero, indicate the encrypt algorith -+ u8 iv_len; -+ u8 icv_len; -+ u8 iv[8]; -+ u8 icv[8]; -+ u8 priority; -+ u8 ack_policy; -+ u8 mac_id; -+ u8 vcs_mode; //virtual carrier sense method -+ u8 dst[ETH_ALEN]; -+ u8 src[ETH_ALEN]; -+ u8 ta[ETH_ALEN]; -+ u8 ra[ETH_ALEN]; -+ u8 key_idx; -+ u8 qos_en; -+ u8 ht_en; -+ u8 raid;//rate adpative id -+ u8 bwmode; -+ u8 ch_offset;//PRIME_CHNL_OFFSET -+ u8 sgi;//short GI -+ u8 ampdu_en;//tx ampdu enable -+ u8 mdata;//more data bit -+ u8 pctrl;//per packet txdesc control enable -+ u8 triggered;//for ap mode handling Power Saving sta -+ u8 qsel; -+ u8 eosp; -+ u8 rate; -+ u8 intel_proxim; -+ u8 retry_ctrl; -+ struct sta_info * psta; -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ u8 hw_tcp_csum; -+#endif -+ union Keytype dot11tkiptxmickey; -+ //union Keytype dot11tkiprxmickey; -+ union Keytype dot118021x_UncstKey; -+}; -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#define ETH_HLEN 14 /* Total octets in header. */ -+#define ETH_P_IP 0x0800 /* Internet Protocol packet */ -+ -+/*struct rtw_ieee80211_hdr { -+ uint16_t frame_control; -+ uint16_t duration_id; -+ u8 addr1[6]; -+ u8 addr2[6]; -+ u8 addr3[6]; -+ uint16_t seq_ctrl; -+ u8 addr4[6]; -+} ;*/ -+#endif //PLATFORM_FREEBSD -+ -+#define WLANHDR_OFFSET 64 -+ -+#define NULL_FRAMETAG (0x0) -+#define DATA_FRAMETAG 0x01 -+#define L2_FRAMETAG 0x02 -+#define MGNT_FRAMETAG 0x03 -+#define AMSDU_FRAMETAG 0x04 -+ -+#define EII_FRAMETAG 0x05 -+#define IEEE8023_FRAMETAG 0x06 -+ -+#define MP_FRAMETAG 0x07 -+ -+#define TXAGG_FRAMETAG 0x08 -+ -+struct submit_ctx{ -+ u32 submit_time; /* */ -+ u32 timeout_ms; /* <0: not synchronous, 0: wait forever, >0: up to ms waiting */ -+ int status; /* status for operation */ -+#ifdef PLATFORM_LINUX -+ struct completion done; -+#endif -+}; -+ -+enum { -+ RTW_SCTX_SUBMITTED = -1, -+ RTW_SCTX_DONE_SUCCESS = 0, -+ RTW_SCTX_DONE_UNKNOWN, -+ RTW_SCTX_DONE_TIMEOUT, -+ RTW_SCTX_DONE_BUF_ALLOC, -+ RTW_SCTX_DONE_BUF_FREE, -+ RTW_SCTX_DONE_WRITE_PORT_ERR, -+ RTW_SCTX_DONE_TX_DESC_NA, -+ RTW_SCTX_DONE_TX_DENY, -+ RTW_SCTX_DONE_CCX_PKT_FAIL, -+ RTW_SCTX_DONE_DRV_STOP, -+ RTW_SCTX_DONE_DEV_REMOVE, -+}; -+ -+ -+void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms); -+int rtw_sctx_wait(struct submit_ctx *sctx); -+void rtw_sctx_done_err(struct submit_ctx **sctx, int status); -+void rtw_sctx_done(struct submit_ctx **sctx); -+ -+struct xmit_buf -+{ -+ _list list; -+ -+ _adapter *padapter; -+ -+ u8 *pallocated_buf; -+ -+ u8 *pbuf; -+ -+ void *priv_data; -+ -+ u16 ext_tag; // 0: Normal xmitbuf, 1: extension xmitbuf. -+ u16 flags; -+ u32 alloc_sz; -+ -+ struct submit_ctx *sctx; -+ -+#ifdef CONFIG_USB_HCI -+ -+ u32 sz[8]; -+ -+#if defined(PLATFORM_OS_XP)||defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) -+ PURB pxmit_urb[8]; -+ dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ -+#endif -+ -+#ifdef PLATFORM_OS_XP -+ PIRP pxmit_irp[8]; -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ USB_TRANSFER usb_transfer_write_port; -+#endif -+ -+ u8 bpending[8]; -+ -+ sint last[8]; -+ -+#endif -+ -+#ifdef CONFIG_SDIO_HCI -+ u32 len; -+ u8 *phead; -+ u8 *pdata; -+ u8 *ptail; -+ u8 *pend; -+ u32 ff_hwaddr; -+#ifdef PLATFORM_OS_XP -+ PMDL pxmitbuf_mdl; -+ PIRP pxmitbuf_irp; -+ PSDBUS_REQUEST_PACKET pxmitbuf_sdrp; -+#endif -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ u32 len; -+#endif -+ -+#ifdef DBG_XMIT_BUF -+ u8 no; -+#endif -+ -+}; -+ -+struct xmit_frame -+{ -+ _list list; -+ -+ struct pkt_attrib attrib; -+ -+ _pkt *pkt; -+ -+ int frame_tag; -+ -+ _adapter *padapter; -+ -+ u8 *buf_addr; -+ -+ struct xmit_buf *pxmitbuf; -+ -+#ifdef CONFIG_SDIO_HCI -+ u8 pg_num; -+ u8 agg_num; -+#endif -+ -+#ifdef CONFIG_USB_HCI -+#ifdef CONFIG_USB_TX_AGGREGATION -+ u8 agg_num; -+#endif -+ u8 pkt_offset; -+#ifdef CONFIG_RTL8192D -+ u8 EMPktNum; -+ u16 EMPktLen[5];//The max value by HW -+#endif -+#endif -+#ifdef CONFIG_XMIT_ACK -+ u8 ack_report; -+#endif -+ -+ u8 *alloc_addr; /* the actual address this xmitframe allocated */ -+ u8 ext_tag; /* 0:data, 1:mgmt */ -+ -+}; -+ -+struct tx_servq { -+ _list tx_pending; -+ _queue sta_pending; -+ int qcnt; -+}; -+ -+ -+ -+struct sta_xmit_priv -+{ -+ _lock lock; -+ sint option; -+ sint apsd_setting; //When bit mask is on, the associated edca queue supports APSD. -+ -+ -+ //struct tx_servq blk_q[MAX_NUMBLKS]; -+ struct tx_servq be_q; //priority == 0,3 -+ struct tx_servq bk_q; //priority == 1,2 -+ struct tx_servq vi_q; //priority == 4,5 -+ struct tx_servq vo_q; //priority == 6,7 -+ _list legacy_dz; -+ _list apsd; -+ -+ u16 txseq_tid[16]; -+ -+ //uint sta_tx_bytes; -+ //u64 sta_tx_pkts; -+ //uint sta_tx_fail; -+ -+}; -+ -+ -+struct hw_txqueue { -+ volatile sint head; -+ volatile sint tail; -+ volatile sint free_sz; //in units of 64 bytes -+ volatile sint free_cmdsz; -+ volatile sint txsz[8]; -+ uint ff_hwaddr; -+ uint cmd_hwaddr; -+ sint ac_tag; -+}; -+ -+ -+struct xmit_priv { -+ -+ _lock lock; -+ -+ _sema xmit_sema; -+ _sema terminate_xmitthread_sema; -+ -+ //_queue blk_strms[MAX_NUMBLKS]; -+ _queue be_pending; -+ _queue bk_pending; -+ _queue vi_pending; -+ _queue vo_pending; -+ _queue bm_pending; -+ -+ //_queue legacy_dz_queue; -+ //_queue apsd_queue; -+ -+ u8 *pallocated_frame_buf; -+ u8 *pxmit_frame_buf; -+ uint free_xmitframe_cnt; -+ _queue free_xmit_queue; -+ -+ //uint mapping_addr; -+ //uint pkt_sz; -+ -+ u8 *xframe_ext_alloc_addr; -+ u8 *xframe_ext; -+ uint free_xframe_ext_cnt; -+ _queue free_xframe_ext_queue; -+ -+ //struct hw_txqueue be_txqueue; -+ //struct hw_txqueue bk_txqueue; -+ //struct hw_txqueue vi_txqueue; -+ //struct hw_txqueue vo_txqueue; -+ //struct hw_txqueue bmc_txqueue; -+ -+ uint frag_len; -+ -+ _adapter *adapter; -+ -+ u8 vcs_setting; -+ u8 vcs; -+ u8 vcs_type; -+ //u16 rts_thresh; -+ -+ u64 tx_bytes; -+ u64 tx_pkts; -+ u64 tx_drop; -+ u64 last_tx_bytes; -+ u64 last_tx_pkts; -+ -+ struct hw_xmit *hwxmits; -+ u8 hwxmit_entry; -+ -+#ifdef CONFIG_USB_HCI -+ _sema tx_retevt;//all tx return event; -+ u8 txirp_cnt;// -+ -+#ifdef PLATFORM_OS_CE -+ USB_TRANSFER usb_transfer_write_port; -+// USB_TRANSFER usb_transfer_write_mem; -+#endif -+#ifdef PLATFORM_LINUX -+ struct tasklet_struct xmit_tasklet; -+#endif -+#ifdef PLATFORM_FREEBSD -+ struct task xmit_tasklet; -+#endif -+ //per AC pending irp -+ int beq_cnt; -+ int bkq_cnt; -+ int viq_cnt; -+ int voq_cnt; -+ -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+ // Tx -+ struct rtw_tx_ring tx_ring[PCI_MAX_TX_QUEUE_COUNT]; -+ int txringcount[PCI_MAX_TX_QUEUE_COUNT]; -+#ifdef PLATFORM_LINUX -+ struct tasklet_struct xmit_tasklet; -+#endif -+#endif -+ -+ _queue free_xmitbuf_queue; -+ _queue pending_xmitbuf_queue; -+ u8 *pallocated_xmitbuf; -+ u8 *pxmitbuf; -+ uint free_xmitbuf_cnt; -+ -+ _queue free_xmit_extbuf_queue; -+ u8 *pallocated_xmit_extbuf; -+ u8 *pxmit_extbuf; -+ uint free_xmit_extbuf_cnt; -+ -+ u16 nqos_ssn; -+ -+#ifdef CONFIG_XMIT_ACK -+ int ack_tx; -+ _mutex ack_tx_mutex; -+ struct submit_ctx ack_tx_ops; -+#endif -+ _lock lock_sctx; -+}; -+ -+extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv); -+extern s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -+ -+extern struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv); -+extern s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -+ -+void rtw_count_tx_stats(_adapter *padapter, struct xmit_frame *pxmitframe, int sz); -+extern void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len); -+extern s32 rtw_make_wlanhdr(_adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib); -+extern s32 rtw_put_snap(u8 *data, u16 h_proto); -+ -+extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv); -+struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv); -+struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv); -+extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); -+extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue); -+struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac); -+extern s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -+extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry); -+ -+extern s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe); -+extern thread_return rtw_xmit_thread(thread_context context); -+extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib); -+#define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib) -+extern s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); -+#ifdef CONFIG_IEEE80211W -+extern s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); -+#endif //CONFIG_IEEE80211W -+#ifdef CONFIG_TDLS -+s32 rtw_xmit_tdls_coalesce(_adapter *padapter, struct xmit_frame *pxmitframe, u8 action); -+#endif //CONFIG_TDLS -+s32 _rtw_init_hw_txqueue(struct hw_txqueue* phw_txqueue, u8 ac_tag); -+void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv); -+ -+ -+s32 rtw_txframes_pending(_adapter *padapter); -+s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib); -+void rtw_init_hwxmits(struct hw_xmit *phwxmit, sint entry); -+ -+ -+s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter); -+void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv); -+ -+ -+void rtw_alloc_hwxmits(_adapter *padapter); -+void rtw_free_hwxmits(_adapter *padapter); -+ -+ -+s32 rtw_xmit(_adapter *padapter, _pkt **pkt); -+ -+#if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS) -+sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe); -+void stop_sta_xmit(_adapter *padapter, struct sta_info *psta); -+void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta); -+void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta); -+#endif -+ -+u8 qos_acm(u8 acm_mask, u8 priority); -+ -+#ifdef CONFIG_XMIT_ACK -+int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); -+void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status); -+#endif //CONFIG_XMIT_ACK -+ -+ -+//include after declaring struct xmit_buf, in order to avoid warning -+#include -+ -+#endif //_RTL871X_XMIT_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h -@@ -0,0 +1,432 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __STA_INFO_H_ -+#define __STA_INFO_H_ -+ -+#include -+#include -+#include -+#include -+ -+#define IBSS_START_MAC_ID 2 -+#define NUM_STA 32 -+#define NUM_ACL 16 -+ -+ -+//if mode ==0, then the sta is allowed once the addr is hit. -+//if mode ==1, then the sta is rejected once the addr is non-hit. -+struct rtw_wlan_acl_node { -+ _list list; -+ u8 addr[ETH_ALEN]; -+ u8 valid; -+}; -+ -+//mode=0, disable -+//mode=1, accept unless in deny list -+//mode=2, deny unless in accept list -+struct wlan_acl_pool { -+ int mode; -+ int num; -+ struct rtw_wlan_acl_node aclnode[NUM_ACL]; -+ _queue acl_node_q; -+}; -+ -+typedef struct _RSSI_STA{ -+ s32 UndecoratedSmoothedPWDB; -+ s32 UndecoratedSmoothedCCK; -+ s32 UndecoratedSmoothedOFDM; -+ u64 PacketMap; -+ u8 ValidBit; -+}RSSI_STA, *PRSSI_STA; -+ -+struct stainfo_stats { -+ -+ u64 rx_mgnt_pkts; -+ u64 rx_beacon_pkts; -+ u64 rx_probereq_pkts; -+ u64 rx_probersp_pkts; -+ u64 rx_probersp_bm_pkts; -+ u64 rx_probersp_uo_pkts; -+ u64 rx_ctrl_pkts; -+ u64 rx_data_pkts; -+ -+ u64 last_rx_mgnt_pkts; -+ u64 last_rx_beacon_pkts; -+ u64 last_rx_probereq_pkts; -+ u64 last_rx_probersp_pkts; -+ u64 last_rx_probersp_bm_pkts; -+ u64 last_rx_probersp_uo_pkts; -+ u64 last_rx_ctrl_pkts; -+ u64 last_rx_data_pkts; -+ -+ u64 rx_bytes; -+ u64 rx_drops; -+ -+ u64 tx_pkts; -+ u64 tx_bytes; -+ u64 tx_drops; -+ -+}; -+ -+#ifdef CONFIG_TDLS -+struct TDLS_PeerKey { -+ u8 kck[16]; /* TPK-KCK */ -+ u8 tk[16]; /* TPK-TK; only CCMP will be used */ -+} ; -+#endif //CONFIG_TDLS -+ -+struct sta_info { -+ -+ _lock lock; -+ _list list; //free_sta_queue -+ _list hash_list; //sta_hash -+ //_list asoc_list; //20061114 -+ //_list sleep_list;//sleep_q -+ //_list wakeup_list;//wakeup_q -+ -+ struct sta_xmit_priv sta_xmitpriv; -+ struct sta_recv_priv sta_recvpriv; -+ -+ _queue sleep_q; -+ unsigned int sleepq_len; -+ -+ uint state; -+ uint aid; -+ uint mac_id; -+ uint qos_option; -+ u8 hwaddr[ETH_ALEN]; -+ -+ uint ieee8021x_blocked; //0: allowed, 1:blocked -+ uint dot118021XPrivacy; //aes, tkip... -+ union Keytype dot11tkiptxmickey; -+ union Keytype dot11tkiprxmickey; -+ union Keytype dot118021x_UncstKey; -+ union pn48 dot11txpn; // PN48 used for Unicast xmit. -+#ifdef CONFIG_IEEE80211W -+ union pn48 dot11wtxpn; // PN48 used for Unicast mgmt xmit. -+#endif //CONFIG_IEEE80211W -+ union pn48 dot11rxpn; // PN48 used for Unicast recv. -+ -+ -+ u8 bssrateset[16]; -+ u32 bssratelen; -+ s32 rssi; -+ s32 signal_quality; -+ -+ u8 cts2self; -+ u8 rtsen; -+ -+ u8 raid; -+ u8 init_rate; -+ u32 ra_mask; -+ struct stainfo_stats sta_stats; -+ -+#ifdef CONFIG_TDLS -+ u32 tdls_sta_state; -+ u8 dialog; -+ u8 SNonce[32]; -+ u8 ANonce[32]; -+ u32 TDLS_PeerKey_Lifetime; -+ u16 TPK_count; -+ _timer TPK_timer; -+ struct TDLS_PeerKey tpk; -+ _adapter *padapter; -+ u16 stat_code; -+ u8 off_ch; -+ u16 ch_switch_time; -+ u16 ch_switch_timeout; -+ u8 option; -+ _timer option_timer; -+ _timer base_ch_timer; -+ _timer off_ch_timer; -+ -+ _timer handshake_timer; -+ _timer alive_timer1; -+ _timer alive_timer2; -+ u8 timer_flag; -+ u8 alive_count; -+#endif //CONFIG_TDLS -+ -+ //for A-MPDU TX, ADDBA timeout check -+ _timer addba_retry_timer; -+ -+ //for A-MPDU Rx reordering buffer control -+ struct recv_reorder_ctrl recvreorder_ctrl[16]; -+ -+ //for A-MPDU Tx -+ //unsigned char ampdu_txen_bitmap; -+ u16 BA_starting_seqctrl[16]; -+ -+ -+#ifdef CONFIG_80211N_HT -+ struct ht_priv htpriv; -+#endif -+ -+ //Notes: -+ //STA_Mode: -+ //curr_network(mlme_priv/security_priv/qos/ht) + sta_info: (STA & AP) CAP/INFO -+ //scan_q: AP CAP/INFO -+ -+ //AP_Mode: -+ //curr_network(mlme_priv/security_priv/qos/ht) : AP CAP/INFO -+ //sta_info: (AP & STA) CAP/INFO -+ -+#ifdef CONFIG_AP_MODE -+ -+ _list asoc_list; -+ _list auth_list; -+ -+ unsigned int expire_to; -+ unsigned int auth_seq; -+ unsigned int authalg; -+ unsigned char chg_txt[128]; -+ -+ u16 capability; -+ int flags; -+ -+ int dot8021xalg;//0:disable, 1:psk, 2:802.1x -+ int wpa_psk;//0:disable, bit(0): WPA, bit(1):WPA2 -+ int wpa_group_cipher; -+ int wpa2_group_cipher; -+ int wpa_pairwise_cipher; -+ int wpa2_pairwise_cipher; -+ -+ u8 bpairwise_key_installed; -+ -+#ifdef CONFIG_NATIVEAP_MLME -+ u8 wpa_ie[32]; -+ -+ u8 nonerp_set; -+ u8 no_short_slot_time_set; -+ u8 no_short_preamble_set; -+ u8 no_ht_gf_set; -+ u8 no_ht_set; -+ u8 ht_20mhz_set; -+#endif // CONFIG_NATIVEAP_MLME -+ -+ unsigned int tx_ra_bitmap; -+ u8 qos_info; -+ -+ u8 max_sp_len; -+ u8 uapsd_bk;//BIT(0): Delivery enabled, BIT(1): Trigger enabled -+ u8 uapsd_be; -+ u8 uapsd_vi; -+ u8 uapsd_vo; -+ -+ u8 has_legacy_ac; -+ unsigned int sleepq_ac_len; -+ -+#ifdef CONFIG_P2P -+ //p2p priv data -+ u8 is_p2p_device; -+ u8 p2p_status_code; -+ -+ //p2p client info -+ u8 dev_addr[ETH_ALEN]; -+ //u8 iface_addr[ETH_ALEN];//= hwaddr[ETH_ALEN] -+ u8 dev_cap; -+ u16 config_methods; -+ u8 primary_dev_type[8]; -+ u8 num_of_secdev_type; -+ u8 secdev_types_list[32];// 32/8 == 4; -+ u16 dev_name_len; -+ u8 dev_name[32]; -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_TX_MCAST2UNI -+ u8 under_exist_checking; -+#endif // CONFIG_TX_MCAST2UNI -+ -+ u8 keep_alive_trycnt; -+ -+#endif // CONFIG_AP_MODE -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ u8 *passoc_req; -+ u32 assoc_req_len; -+#endif -+ -+ //for DM -+ RSSI_STA rssi_stat; -+ -+ /* To store the sequence number of received management frame */ -+ u16 RxMgmtFrameSeqNum; -+}; -+ -+#define sta_rx_pkts(sta) \ -+ (sta->sta_stats.rx_mgnt_pkts \ -+ + sta->sta_stats.rx_ctrl_pkts \ -+ + sta->sta_stats.rx_data_pkts) -+ -+#define sta_last_rx_pkts(sta) \ -+ (sta->sta_stats.last_rx_mgnt_pkts \ -+ + sta->sta_stats.last_rx_ctrl_pkts \ -+ + sta->sta_stats.last_rx_data_pkts) -+ -+#define sta_rx_data_pkts(sta) \ -+ (sta->sta_stats.rx_data_pkts) -+ -+#define sta_last_rx_data_pkts(sta) \ -+ (sta->sta_stats.last_rx_data_pkts) -+ -+#define sta_rx_mgnt_pkts(sta) \ -+ (sta->sta_stats.rx_mgnt_pkts) -+ -+#define sta_last_rx_mgnt_pkts(sta) \ -+ (sta->sta_stats.last_rx_mgnt_pkts) -+ -+#define sta_rx_beacon_pkts(sta) \ -+ (sta->sta_stats.rx_beacon_pkts) -+ -+#define sta_last_rx_beacon_pkts(sta) \ -+ (sta->sta_stats.last_rx_beacon_pkts) -+ -+#define sta_rx_probereq_pkts(sta) \ -+ (sta->sta_stats.rx_probereq_pkts) -+ -+#define sta_last_rx_probereq_pkts(sta) \ -+ (sta->sta_stats.last_rx_probereq_pkts) -+ -+#define sta_rx_probersp_pkts(sta) \ -+ (sta->sta_stats.rx_probersp_pkts) -+ -+#define sta_last_rx_probersp_pkts(sta) \ -+ (sta->sta_stats.last_rx_probersp_pkts) -+ -+#define sta_rx_probersp_bm_pkts(sta) \ -+ (sta->sta_stats.rx_probersp_bm_pkts) -+ -+#define sta_last_rx_probersp_bm_pkts(sta) \ -+ (sta->sta_stats.last_rx_probersp_bm_pkts) -+ -+#define sta_rx_probersp_uo_pkts(sta) \ -+ (sta->sta_stats.rx_probersp_uo_pkts) -+ -+#define sta_last_rx_probersp_uo_pkts(sta) \ -+ (sta->sta_stats.last_rx_probersp_uo_pkts) -+ -+#define sta_update_last_rx_pkts(sta) \ -+ do { \ -+ sta->sta_stats.last_rx_mgnt_pkts = sta->sta_stats.rx_mgnt_pkts; \ -+ sta->sta_stats.last_rx_beacon_pkts = sta->sta_stats.rx_beacon_pkts; \ -+ sta->sta_stats.last_rx_probereq_pkts = sta->sta_stats.rx_probereq_pkts; \ -+ sta->sta_stats.last_rx_probersp_pkts = sta->sta_stats.rx_probersp_pkts; \ -+ sta->sta_stats.last_rx_probersp_bm_pkts = sta->sta_stats.rx_probersp_bm_pkts; \ -+ sta->sta_stats.last_rx_probersp_uo_pkts = sta->sta_stats.rx_probersp_uo_pkts; \ -+ sta->sta_stats.last_rx_ctrl_pkts = sta->sta_stats.rx_ctrl_pkts; \ -+ sta->sta_stats.last_rx_data_pkts = sta->sta_stats.rx_data_pkts; \ -+ } while(0) -+ -+#define STA_RX_PKTS_ARG(sta) \ -+ sta->sta_stats.rx_mgnt_pkts \ -+ , sta->sta_stats.rx_ctrl_pkts \ -+ , sta->sta_stats.rx_data_pkts -+ -+#define STA_LAST_RX_PKTS_ARG(sta) \ -+ sta->sta_stats.last_rx_mgnt_pkts \ -+ , sta->sta_stats.last_rx_ctrl_pkts \ -+ , sta->sta_stats.last_rx_data_pkts -+ -+#define STA_RX_PKTS_DIFF_ARG(sta) \ -+ sta->sta_stats.rx_mgnt_pkts - sta->sta_stats.last_rx_mgnt_pkts \ -+ , sta->sta_stats.rx_ctrl_pkts - sta->sta_stats.last_rx_ctrl_pkts \ -+ , sta->sta_stats.rx_data_pkts -sta->sta_stats.last_rx_data_pkts -+ -+#define STA_PKTS_FMT "(m:%llu, c:%llu, d:%llu)" -+ -+struct sta_priv { -+ -+ u8 *pallocated_stainfo_buf; -+ u8 *pstainfo_buf; -+ _queue free_sta_queue; -+ -+ _lock sta_hash_lock; -+ _list sta_hash[NUM_STA]; -+ int asoc_sta_count; -+ _queue sleep_q; -+ _queue wakeup_q; -+ -+ _adapter *padapter; -+ -+ -+#ifdef CONFIG_AP_MODE -+ _list asoc_list; -+ _list auth_list; -+ _lock asoc_list_lock; -+ _lock auth_list_lock; -+ u8 asoc_list_cnt; -+ u8 auth_list_cnt; -+ -+ unsigned int auth_to; //sec, time to expire in authenticating. -+ unsigned int assoc_to; //sec, time to expire before associating. -+ unsigned int expire_to; //sec , time to expire after associated. -+ -+ /* pointers to STA info; based on allocated AID or NULL if AID free -+ * AID is in the range 1-2007, so sta_aid[0] corresponders to AID 1 -+ * and so on -+ */ -+ struct sta_info *sta_aid[NUM_STA]; -+ -+ u16 sta_dz_bitmap;//only support 15 stations, staion aid bitmap for sleeping sta. -+ u16 tim_bitmap;//only support 15 stations, aid=0~15 mapping bit0~bit15 -+ -+ u16 max_num_sta; -+ -+ struct wlan_acl_pool acl_list; -+#endif -+ -+}; -+ -+ -+__inline static u32 wifi_mac_hash(const u8 *mac) -+{ -+ u32 x; -+ -+ x = mac[0]; -+ x = (x << 2) ^ mac[1]; -+ x = (x << 2) ^ mac[2]; -+ x = (x << 2) ^ mac[3]; -+ x = (x << 2) ^ mac[4]; -+ x = (x << 2) ^ mac[5]; -+ -+ x ^= x >> 8; -+ x = x & (NUM_STA - 1); -+ -+ return x; -+} -+ -+ -+extern u32 _rtw_init_sta_priv(struct sta_priv *pstapriv); -+extern u32 _rtw_free_sta_priv(struct sta_priv *pstapriv); -+ -+#define stainfo_offset_valid(offset) (offset < NUM_STA && offset >= 0) -+int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta); -+struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset); -+ -+extern struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); -+extern u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta); -+extern void rtw_free_all_stainfo(_adapter *padapter); -+extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, const u8 *hwaddr); -+extern u32 rtw_init_bcmc_stainfo(_adapter* padapter); -+extern struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter); -+extern u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr); -+ -+#endif //_STA_INFO_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h -@@ -0,0 +1,37 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __USB_HAL_H__ -+#define __USB_HAL_H__ -+ -+ -+void rtl8192cu_set_hal_ops(_adapter * padapter); -+ -+void rtl8192du_set_hal_ops(_adapter * padapter); -+#ifdef CONFIG_INTEL_PROXIM -+extern _adapter *rtw_usb_get_sw_pointer(void); -+#endif //CONFIG_INTEL_PROXIM -+#ifdef CONFIG_WOWLAN -+#ifdef CONFIG_WOWLAN_MANUAL -+extern int rtw_suspend_toshiba(PADAPTER Adapter); -+extern int rtw_resume_toshiba(PADAPTER Adapter); -+#endif // CONFIG_WOWLAN_MANUAL -+#endif //CONFIG_WOWLAN -+#endif //__USB_HAL_H__ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h -@@ -0,0 +1,110 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __USB_OPS_H_ -+#define __USB_OPS_H_ -+ -+#include -+#include -+#include -+#include -+ -+#define REALTEK_USB_VENQT_READ 0xC0 -+#define REALTEK_USB_VENQT_WRITE 0x40 -+#define REALTEK_USB_VENQT_CMD_REQ 0x05 -+#define REALTEK_USB_VENQT_CMD_IDX 0x00 -+ -+enum{ -+ VENDOR_WRITE = 0x00, -+ VENDOR_READ = 0x01, -+}; -+#define ALIGNMENT_UNIT 16 -+#define MAX_VENDOR_REQ_CMD_SIZE 254 //8188cu SIE Support -+#define MAX_USB_IO_CTL_SIZE (MAX_VENDOR_REQ_CMD_SIZE +ALIGNMENT_UNIT) -+ -+#ifdef PLATFORM_LINUX -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) -+#define rtw_usb_control_msg(dev, pipe, request, requesttype, value, index, data, size, timeout_ms) \ -+ usb_control_msg((dev), (pipe), (request), (requesttype), (value), (index), (data), (size), (timeout_ms)) -+#define rtw_usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout_ms) \ -+ usb_bulk_msg((usb_dev), (pipe), (data), (len), (actual_length), (timeout_ms)) -+#else -+#define rtw_usb_control_msg(dev, pipe, request, requesttype, value, index, data, size,timeout_ms) \ -+ usb_control_msg((dev), (pipe), (request), (requesttype), (value), (index), (data), (size), \ -+ ((timeout_ms) == 0) ||((timeout_ms)*HZ/1000>0)?((timeout_ms)*HZ/1000):1) -+#define rtw_usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout_ms) \ -+ usb_bulk_msg((usb_dev), (pipe), (data), (len), (actual_length), \ -+ ((timeout_ms) == 0) ||((timeout_ms)*HZ/1000>0)?((timeout_ms)*HZ/1000):1) -+#endif -+#include -+#endif //PLATFORM_LINUX -+ -+#ifdef CONFIG_RTL8192C -+void rtl8192cu_set_intf_ops(struct _io_ops *pops); -+#define usb_set_intf_ops rtl8192cu_set_intf_ops -+ -+void rtl8192cu_recv_tasklet(void *priv); -+ -+void rtl8192cu_xmit_tasklet(void *priv); -+#endif -+ -+#ifdef CONFIG_RTL8192D -+void rtl8192du_set_intf_ops(struct _io_ops *pops); -+#define usb_set_intf_ops rtl8192du_set_intf_ops -+ -+#ifndef PLATFORM_FREEBSD -+void rtl8192du_recv_tasklet(void *priv); -+#else // PLATFORM_FREEBSD -+void rtl8192du_recv_tasklet(void *priv, int npending); -+#ifdef CONFIG_RX_INDICATE_QUEUE -+void rtw_rx_indicate_tasklet(void *priv, int npending); -+#endif // CONFIG_RX_INDICATE_QUEUE -+#endif // PLATFORM_FREEBSD -+ -+void rtl8192du_xmit_tasklet(void *priv); -+#endif -+ -+/* -+* Increase and check if the continual_urb_error of this @param dvobjprive is larger than MAX_CONTINUAL_URB_ERR -+* @return _TRUE: -+* @return _FALSE: -+*/ -+static inline int rtw_inc_and_chk_continual_urb_error(struct dvobj_priv *dvobj) -+{ -+ int ret = _FALSE; -+ int value; -+ if( (value=ATOMIC_INC_RETURN(&dvobj->continual_urb_error)) > MAX_CONTINUAL_URB_ERR) { -+ DBG_871X("[dvobj:%p][ERROR] continual_urb_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_URB_ERR); -+ ret = _TRUE; -+ } else { -+ //DBG_871X("[dvobj:%p] continual_urb_error:%d\n", dvobj, value); -+ } -+ return ret; -+} -+ -+/* -+* Set the continual_urb_error of this @param dvobjprive to 0 -+*/ -+static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj) -+{ -+ ATOMIC_SET(&dvobj->continual_urb_error, 0); -+} -+ -+#endif //__USB_OPS_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h -@@ -0,0 +1,63 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __USB_OPS_LINUX_H__ -+#define __USB_OPS_LINUX_H__ -+ -+#define VENDOR_CMD_MAX_DATA_LEN 254 -+ -+#define RTW_USB_CONTROL_MSG_TIMEOUT_TEST 10//ms -+#define RTW_USB_CONTROL_MSG_TIMEOUT 500//ms -+ -+#if defined(CONFIG_VENDOR_REQ_RETRY) && defined(CONFIG_USB_VENDOR_REQ_MUTEX) -+/* vendor req retry should be in the situation when each vendor req is atomically submitted from others */ -+#define MAX_USBCTRL_VENDORREQ_TIMES 10 -+#else -+#define MAX_USBCTRL_VENDORREQ_TIMES 1 -+#endif -+ -+#define RTW_USB_BULKOUT_TIMEOUT 5000//ms -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) -+#define _usbctrl_vendorreq_async_callback(urb, regs) _usbctrl_vendorreq_async_callback(urb) -+#define usb_bulkout_zero_complete(purb, regs) usb_bulkout_zero_complete(purb) -+#define usb_write_mem_complete(purb, regs) usb_write_mem_complete(purb) -+#define usb_write_port_complete(purb, regs) usb_write_port_complete(purb) -+#define usb_read_port_complete(purb, regs) usb_read_port_complete(purb) -+#define usb_read_interrupt_complete(purb, regs) usb_read_interrupt_complete(purb) -+#endif -+ -+#ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ -+int usb_async_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val); -+int usb_async_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val); -+int usb_async_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val); -+#endif /* CONFIG_USB_SUPPORT_ASYNC_VDN_REQ */ -+ -+unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr); -+ -+void usb_read_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem); -+void usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem); -+ -+void usb_read_port_cancel(struct intf_hdl *pintfhdl); -+ -+u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem); -+void usb_write_port_cancel(struct intf_hdl *pintfhdl); -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h -@@ -0,0 +1,38 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __USB_OSINTF_H -+#define __USB_OSINTF_H -+ -+#include -+#include -+#include -+#include -+ -+#define USBD_HALTED(Status) ((ULONG)(Status) >> 30 == 3) -+ -+ -+//uint usb_dvobj_init(_adapter * adapter); -+//void usb_dvobj_deinit(_adapter * adapter); -+ -+u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, RT_USB_BREQUEST brequest, RT_USB_WVALUE wvalue, u8 windex, void* data, u8 datalen, u8 isdirectionin); -+ -+ -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h -@@ -0,0 +1,59 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _USB_VENDOR_REQUEST_H_ -+#define _USB_VENDOR_REQUEST_H_ -+ -+//4 Set/Get Register related wIndex/Data -+#define RT_USB_RESET_MASK_OFF 0 -+#define RT_USB_RESET_MASK_ON 1 -+#define RT_USB_SLEEP_MASK_OFF 0 -+#define RT_USB_SLEEP_MASK_ON 1 -+#define RT_USB_LDO_ON 1 -+#define RT_USB_LDO_OFF 0 -+ -+//4 Set/Get SYSCLK related wValue or Data -+#define RT_USB_SYSCLK_32KHZ 0 -+#define RT_USB_SYSCLK_40MHZ 1 -+#define RT_USB_SYSCLK_60MHZ 2 -+ -+ -+typedef enum _RT_USB_BREQUEST { -+ RT_USB_SET_REGISTER = 1, -+ RT_USB_SET_SYSCLK = 2, -+ RT_USB_GET_SYSCLK = 3, -+ RT_USB_GET_REGISTER = 4 -+} RT_USB_BREQUEST; -+ -+ -+typedef enum _RT_USB_WVALUE { -+ RT_USB_RESET_MASK = 1, -+ RT_USB_SLEEP_MASK = 2, -+ RT_USB_USB_HRCPWM = 3, -+ RT_USB_LDO = 4, -+ RT_USB_BOOT_TYPE = 5 -+} RT_USB_WVALUE; -+ -+ -+//BOOLEAN usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, PVOID Data, UCHAR DataLength, BOOLEAN isDirectionIn); -+//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, PVOID Data); -+//BOOLEAN CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT FeatureSelector, IN USHORT Index); -+//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN PVOID TransferBuffer, IN ULONG TransferBufferLength); -+ -+#endif ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h -@@ -0,0 +1,1248 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef _WIFI_H_ -+#define _WIFI_H_ -+ -+#include -+ -+#ifdef BIT -+//#error "BIT define occurred earlier elsewhere!\n" -+#undef BIT -+#endif -+#define BIT(x) (1 << (x)) -+ -+ -+#define WLAN_ETHHDR_LEN 14 -+#define WLAN_ETHADDR_LEN 6 -+#define WLAN_IEEE_OUI_LEN 3 -+#define WLAN_ADDR_LEN 6 -+#define WLAN_CRC_LEN 4 -+#define WLAN_BSSID_LEN 6 -+#define WLAN_BSS_TS_LEN 8 -+#define WLAN_HDR_A3_LEN 24 -+#define WLAN_HDR_A4_LEN 30 -+#define WLAN_HDR_A3_QOS_LEN 26 -+#define WLAN_HDR_A4_QOS_LEN 32 -+#define WLAN_SSID_MAXLEN 32 -+#define WLAN_DATA_MAXLEN 2312 -+ -+#define WLAN_A3_PN_OFFSET 24 -+#define WLAN_A4_PN_OFFSET 30 -+ -+#define WLAN_MIN_ETHFRM_LEN 60 -+#define WLAN_MAX_ETHFRM_LEN 1514 -+#define WLAN_ETHHDR_LEN 14 -+ -+#define P80211CAPTURE_VERSION 0x80211001 -+ -+#ifdef GREEN_HILL -+#pragma pack(1) -+#endif -+ -+enum WIFI_FRAME_TYPE { -+ WIFI_MGT_TYPE = (0), -+ WIFI_CTRL_TYPE = (BIT(2)), -+ WIFI_DATA_TYPE = (BIT(3)), -+ WIFI_QOS_DATA_TYPE = (BIT(7)|BIT(3)), //!< QoS Data -+}; -+ -+enum WIFI_FRAME_SUBTYPE { -+ -+ // below is for mgt frame -+ WIFI_ASSOCREQ = (0 | WIFI_MGT_TYPE), -+ WIFI_ASSOCRSP = (BIT(4) | WIFI_MGT_TYPE), -+ WIFI_REASSOCREQ = (BIT(5) | WIFI_MGT_TYPE), -+ WIFI_REASSOCRSP = (BIT(5) | BIT(4) | WIFI_MGT_TYPE), -+ WIFI_PROBEREQ = (BIT(6) | WIFI_MGT_TYPE), -+ WIFI_PROBERSP = (BIT(6) | BIT(4) | WIFI_MGT_TYPE), -+ WIFI_BEACON = (BIT(7) | WIFI_MGT_TYPE), -+ WIFI_ATIM = (BIT(7) | BIT(4) | WIFI_MGT_TYPE), -+ WIFI_DISASSOC = (BIT(7) | BIT(5) | WIFI_MGT_TYPE), -+ WIFI_AUTH = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE), -+ WIFI_DEAUTH = (BIT(7) | BIT(6) | WIFI_MGT_TYPE), -+ WIFI_ACTION = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE), -+ -+ // below is for control frame -+ WIFI_PSPOLL = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE), -+ WIFI_RTS = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE), -+ WIFI_CTS = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE), -+ WIFI_ACK = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE), -+ WIFI_CFEND = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE), -+ WIFI_CFEND_CFACK = (BIT(7) | BIT(6) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE), -+ -+ // below is for data frame -+ WIFI_DATA = (0 | WIFI_DATA_TYPE), -+ WIFI_DATA_CFACK = (BIT(4) | WIFI_DATA_TYPE), -+ WIFI_DATA_CFPOLL = (BIT(5) | WIFI_DATA_TYPE), -+ WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE), -+ WIFI_DATA_NULL = (BIT(6) | WIFI_DATA_TYPE), -+ WIFI_CF_ACK = (BIT(6) | BIT(4) | WIFI_DATA_TYPE), -+ WIFI_CF_POLL = (BIT(6) | BIT(5) | WIFI_DATA_TYPE), -+ WIFI_CF_ACKPOLL = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE), -+ WIFI_QOS_DATA_NULL = (BIT(6) | WIFI_QOS_DATA_TYPE), -+}; -+ -+enum WIFI_REASON_CODE { -+ _RSON_RESERVED_ = 0, -+ _RSON_UNSPECIFIED_ = 1, -+ _RSON_AUTH_NO_LONGER_VALID_ = 2, -+ _RSON_DEAUTH_STA_LEAVING_ = 3, -+ _RSON_INACTIVITY_ = 4, -+ _RSON_UNABLE_HANDLE_ = 5, -+ _RSON_CLS2_ = 6, -+ _RSON_CLS3_ = 7, -+ _RSON_DISAOC_STA_LEAVING_ = 8, -+ _RSON_ASOC_NOT_AUTH_ = 9, -+ -+ // WPA reason -+ _RSON_INVALID_IE_ = 13, -+ _RSON_MIC_FAILURE_ = 14, -+ _RSON_4WAY_HNDSHK_TIMEOUT_ = 15, -+ _RSON_GROUP_KEY_UPDATE_TIMEOUT_ = 16, -+ _RSON_DIFF_IE_ = 17, -+ _RSON_MLTCST_CIPHER_NOT_VALID_ = 18, -+ _RSON_UNICST_CIPHER_NOT_VALID_ = 19, -+ _RSON_AKMP_NOT_VALID_ = 20, -+ _RSON_UNSUPPORT_RSNE_VER_ = 21, -+ _RSON_INVALID_RSNE_CAP_ = 22, -+ _RSON_IEEE_802DOT1X_AUTH_FAIL_ = 23, -+ -+ //belowing are Realtek definition -+ _RSON_PMK_NOT_AVAILABLE_ = 24, -+ _RSON_TDLS_TEAR_TOOFAR_ = 25, -+ _RSON_TDLS_TEAR_UN_RSN_ = 26, -+}; -+ -+/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) */ -+#if 0 -+#define WLAN_REASON_UNSPECIFIED 1 -+#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 -+#define WLAN_REASON_DEAUTH_LEAVING 3 -+#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -+#define WLAN_REASON_DISASSOC_AP_BUSY 5 -+#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -+#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 -+#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -+#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 -+#endif -+/* IEEE 802.11h */ -+#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10 -+#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11 -+#if 0 -+/* IEEE 802.11i */ -+#define WLAN_REASON_INVALID_IE 13 -+#define WLAN_REASON_MICHAEL_MIC_FAILURE 14 -+#define WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT 15 -+#define WLAN_REASON_GROUP_KEY_UPDATE_TIMEOUT 16 -+#define WLAN_REASON_IE_IN_4WAY_DIFFERS 17 -+#define WLAN_REASON_GROUP_CIPHER_NOT_VALID 18 -+#define WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID 19 -+#define WLAN_REASON_AKMP_NOT_VALID 20 -+#define WLAN_REASON_UNSUPPORTED_RSN_IE_VERSION 21 -+#define WLAN_REASON_INVALID_RSN_IE_CAPAB 22 -+#define WLAN_REASON_IEEE_802_1X_AUTH_FAILED 23 -+#define WLAN_REASON_CIPHER_SUITE_REJECTED 24 -+#endif -+ -+enum WIFI_STATUS_CODE { -+ _STATS_SUCCESSFUL_ = 0, -+ _STATS_FAILURE_ = 1, -+ _STATS_CAP_FAIL_ = 10, -+ _STATS_NO_ASOC_ = 11, -+ _STATS_OTHER_ = 12, -+ _STATS_NO_SUPP_ALG_ = 13, -+ _STATS_OUT_OF_AUTH_SEQ_ = 14, -+ _STATS_CHALLENGE_FAIL_ = 15, -+ _STATS_AUTH_TIMEOUT_ = 16, -+ _STATS_UNABLE_HANDLE_STA_ = 17, -+ _STATS_RATE_FAIL_ = 18, -+}; -+ -+/* Status codes (IEEE 802.11-2007, 7.3.1.9, Table 7-23) */ -+#if 0 -+#define WLAN_STATUS_SUCCESS 0 -+#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 -+#define WLAN_STATUS_CAPS_UNSUPPORTED 10 -+#define WLAN_STATUS_REASSOC_NO_ASSOC 11 -+#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 -+#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 -+#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 -+#define WLAN_STATUS_CHALLENGE_FAIL 15 -+#define WLAN_STATUS_AUTH_TIMEOUT 16 -+#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 -+#define WLAN_STATUS_ASSOC_DENIED_RATES 18 -+#endif -+//entended -+/* IEEE 802.11b */ -+#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19 -+#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20 -+#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21 -+/* IEEE 802.11h */ -+#define WLAN_STATUS_SPEC_MGMT_REQUIRED 22 -+#define WLAN_STATUS_PWR_CAPABILITY_NOT_VALID 23 -+#define WLAN_STATUS_SUPPORTED_CHANNEL_NOT_VALID 24 -+/* IEEE 802.11g */ -+#define WLAN_STATUS_ASSOC_DENIED_NO_SHORT_SLOT_TIME 25 -+#define WLAN_STATUS_ASSOC_DENIED_NO_ER_PBCC 26 -+#define WLAN_STATUS_ASSOC_DENIED_NO_DSSS_OFDM 27 -+/* IEEE 802.11w */ -+#define WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY 30 -+#define WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION 31 -+/* IEEE 802.11i */ -+#define WLAN_STATUS_INVALID_IE 40 -+#define WLAN_STATUS_GROUP_CIPHER_NOT_VALID 41 -+#define WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID 42 -+#define WLAN_STATUS_AKMP_NOT_VALID 43 -+#define WLAN_STATUS_UNSUPPORTED_RSN_IE_VERSION 44 -+#define WLAN_STATUS_INVALID_RSN_IE_CAPAB 45 -+#define WLAN_STATUS_CIPHER_REJECTED_PER_POLICY 46 -+#define WLAN_STATUS_TS_NOT_CREATED 47 -+#define WLAN_STATUS_DIRECT_LINK_NOT_ALLOWED 48 -+#define WLAN_STATUS_DEST_STA_NOT_PRESENT 49 -+#define WLAN_STATUS_DEST_STA_NOT_QOS_STA 50 -+#define WLAN_STATUS_ASSOC_DENIED_LISTEN_INT_TOO_LARGE 51 -+/* IEEE 802.11r */ -+#define WLAN_STATUS_INVALID_FT_ACTION_FRAME_COUNT 52 -+#define WLAN_STATUS_INVALID_PMKID 53 -+#define WLAN_STATUS_INVALID_MDIE 54 -+#define WLAN_STATUS_INVALID_FTIE 55 -+ -+ -+enum WIFI_REG_DOMAIN { -+ DOMAIN_FCC = 1, -+ DOMAIN_IC = 2, -+ DOMAIN_ETSI = 3, -+ DOMAIN_SPAIN = 4, -+ DOMAIN_FRANCE = 5, -+ DOMAIN_MKK = 6, -+ DOMAIN_ISRAEL = 7, -+ DOMAIN_MKK1 = 8, -+ DOMAIN_MKK2 = 9, -+ DOMAIN_MKK3 = 10, -+ DOMAIN_MAX -+}; -+ -+#define _TO_DS_ BIT(8) -+#define _FROM_DS_ BIT(9) -+#define _MORE_FRAG_ BIT(10) -+#define _RETRY_ BIT(11) -+#define _PWRMGT_ BIT(12) -+#define _MORE_DATA_ BIT(13) -+#define _PRIVACY_ BIT(14) -+#define _ORDER_ BIT(15) -+ -+#define SetToDs(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_TO_DS_); \ -+ } while(0) -+ -+#define GetToDs(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_TO_DS_)) != 0) -+ -+#define ClearToDs(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_TO_DS_)); \ -+ } while(0) -+ -+#define SetFrDs(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_FROM_DS_); \ -+ } while(0) -+ -+#define GetFrDs(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_FROM_DS_)) != 0) -+ -+#define ClearFrDs(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_FROM_DS_)); \ -+ } while(0) -+ -+#define get_tofr_ds(pframe) ((GetToDs(pframe) << 1) | GetFrDs(pframe)) -+ -+ -+#define SetMFrag(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_MORE_FRAG_); \ -+ } while(0) -+ -+#define GetMFrag(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_MORE_FRAG_)) != 0) -+ -+#define ClearMFrag(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_)); \ -+ } while(0) -+ -+#define SetRetry(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_RETRY_); \ -+ } while(0) -+ -+#define GetRetry(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_RETRY_)) != 0) -+ -+#define ClearRetry(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_RETRY_)); \ -+ } while(0) -+ -+#define SetPwrMgt(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_PWRMGT_); \ -+ } while(0) -+ -+#define GetPwrMgt(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_PWRMGT_)) != 0) -+ -+#define ClearPwrMgt(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_PWRMGT_)); \ -+ } while(0) -+ -+#define SetMData(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_MORE_DATA_); \ -+ } while(0) -+ -+#define GetMData(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_MORE_DATA_)) != 0) -+ -+#define ClearMData(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_)); \ -+ } while(0) -+ -+#define SetPrivacy(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_PRIVACY_); \ -+ } while(0) -+ -+#define GetPrivacy(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_PRIVACY_)) != 0) -+ -+#define ClearPrivacy(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= (~cpu_to_le16(_PRIVACY_)); \ -+ } while(0) -+ -+ -+#define GetOrder(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) -+ -+#define GetFrameType(pbuf) (le16_to_cpu(*(unsigned short *)(pbuf)) & (BIT(3) | BIT(2))) -+ -+#define SetFrameType(pbuf,type) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ -+ *(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \ -+ } while(0) -+ -+#define GetFrameSubType(pbuf) (cpu_to_le16(*(unsigned short *)(pbuf)) & (BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))) -+ -+#define SetFrameSubType(pbuf,type) \ -+ do { \ -+ *(unsigned short *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(type); \ -+ } while(0) -+ -+#define GetSequence(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 22)) >> 4) -+ -+#define GetFragNum(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 22)) & 0x0f) -+ -+#define GetTupleCache(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 22))) -+ -+#define SetFragNum(pbuf, num) \ -+ do { \ -+ *(unsigned short *)((SIZE_PTR)(pbuf) + 22) = \ -+ ((*(unsigned short *)((SIZE_PTR)(pbuf) + 22)) & le16_to_cpu(~(0x000f))) | \ -+ cpu_to_le16(0x0f & (num)); \ -+ } while(0) -+ -+#define SetSeqNum(pbuf, num) \ -+ do { \ -+ *(unsigned short *)((SIZE_PTR)(pbuf) + 22) = \ -+ ((*(unsigned short *)((SIZE_PTR)(pbuf) + 22)) & le16_to_cpu((unsigned short)~0xfff0)) | \ -+ le16_to_cpu((unsigned short)(0xfff0 & (num << 4))); \ -+ } while(0) -+ -+#define SetDuration(pbuf, dur) \ -+ do { \ -+ *(unsigned short *)((SIZE_PTR)(pbuf) + 2) = cpu_to_le16(0xffff & (dur)); \ -+ } while(0) -+ -+ -+#define SetPriority(pbuf, tid) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(tid & 0xf); \ -+ } while(0) -+ -+#define GetPriority(pbuf) ((le16_to_cpu(*(unsigned short *)(pbuf))) & 0xf) -+ -+#define SetEOSP(pbuf, eosp) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16( (eosp & 1) << 4); \ -+ } while(0) -+ -+#define SetAckpolicy(pbuf, ack) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16( (ack & 3) << 5); \ -+ } while(0) -+ -+#define GetAckpolicy(pbuf) (((le16_to_cpu(*(unsigned short *)pbuf)) >> 5) & 0x3) -+ -+#define GetAMsdu(pbuf) (((le16_to_cpu(*(unsigned short *)pbuf)) >> 7) & 0x1) -+ -+#define SetAMsdu(pbuf, amsdu) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16( (amsdu & 1) << 7); \ -+ } while(0) -+ -+#define GetAid(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + 2)) & 0x3fff) -+ -+#define GetTid(pbuf) (cpu_to_le16(*(unsigned short *)((SIZE_PTR)(pbuf) + (((GetToDs(pbuf)<<1)|GetFrDs(pbuf))==3?30:24))) & 0x000f) -+ -+#define GetAddr1Ptr(pbuf) ((unsigned char *)((SIZE_PTR)(pbuf) + 4)) -+ -+#define GetAddr2Ptr(pbuf) ((unsigned char *)((SIZE_PTR)(pbuf) + 10)) -+ -+#define GetAddr3Ptr(pbuf) ((unsigned char *)((SIZE_PTR)(pbuf) + 16)) -+ -+#define GetAddr4Ptr(pbuf) ((unsigned char *)((SIZE_PTR)(pbuf) + 24)) -+ -+#define MacAddr_isBcst(addr) \ -+( \ -+ ( (addr[0] == 0xff) && (addr[1] == 0xff) && \ -+ (addr[2] == 0xff) && (addr[3] == 0xff) && \ -+ (addr[4] == 0xff) && (addr[5] == 0xff) ) ? _TRUE : _FALSE \ -+) -+ -+__inline static int IS_MCAST(const unsigned char *da) -+{ -+ if ((*da) & 0x01) -+ return _TRUE; -+ else -+ return _FALSE; -+} -+ -+ -+__inline static unsigned char * get_da(unsigned char *pframe) -+{ -+ unsigned char *da; -+ unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); -+ -+ switch (to_fr_ds) { -+ case 0x00: // ToDs=0, FromDs=0 -+ da = GetAddr1Ptr(pframe); -+ break; -+ case 0x01: // ToDs=0, FromDs=1 -+ da = GetAddr1Ptr(pframe); -+ break; -+ case 0x02: // ToDs=1, FromDs=0 -+ da = GetAddr3Ptr(pframe); -+ break; -+ default: // ToDs=1, FromDs=1 -+ da = GetAddr3Ptr(pframe); -+ break; -+ } -+ -+ return da; -+} -+ -+ -+__inline static unsigned char * get_sa(unsigned char *pframe) -+{ -+ unsigned char *sa; -+ unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); -+ -+ switch (to_fr_ds) { -+ case 0x00: // ToDs=0, FromDs=0 -+ sa = GetAddr2Ptr(pframe); -+ break; -+ case 0x01: // ToDs=0, FromDs=1 -+ sa = GetAddr3Ptr(pframe); -+ break; -+ case 0x02: // ToDs=1, FromDs=0 -+ sa = GetAddr2Ptr(pframe); -+ break; -+ default: // ToDs=1, FromDs=1 -+ sa = GetAddr4Ptr(pframe); -+ break; -+ } -+ -+ return sa; -+} -+ -+__inline static unsigned char * get_hdr_bssid(unsigned char *pframe) -+{ -+ unsigned char *sa; -+ unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); -+ -+ switch (to_fr_ds) { -+ case 0x00: // ToDs=0, FromDs=0 -+ sa = GetAddr3Ptr(pframe); -+ break; -+ case 0x01: // ToDs=0, FromDs=1 -+ sa = GetAddr2Ptr(pframe); -+ break; -+ case 0x02: // ToDs=1, FromDs=0 -+ sa = GetAddr1Ptr(pframe); -+ break; -+ case 0x03: // ToDs=1, FromDs=1 -+ sa = GetAddr1Ptr(pframe); -+ break; -+ default: -+ sa =NULL; //??????? -+ break; -+ } -+ -+ return sa; -+} -+ -+ -+__inline static int IsFrameTypeCtrl(unsigned char *pframe) -+{ -+ if(WIFI_CTRL_TYPE == GetFrameType(pframe)) -+ return _TRUE; -+ else -+ return _FALSE; -+} -+/*----------------------------------------------------------------------------- -+ Below is for the security related definition -+------------------------------------------------------------------------------*/ -+#define _RESERVED_FRAME_TYPE_ 0 -+#define _SKB_FRAME_TYPE_ 2 -+#define _PRE_ALLOCMEM_ 1 -+#define _PRE_ALLOCHDR_ 3 -+#define _PRE_ALLOCLLCHDR_ 4 -+#define _PRE_ALLOCICVHDR_ 5 -+#define _PRE_ALLOCMICHDR_ 6 -+ -+#define _SIFSTIME_ ((priv->pmib->dot11BssType.net_work_type&WIRELESS_11A)?16:10) -+#define _ACKCTSLNG_ 14 //14 bytes long, including crclng -+#define _CRCLNG_ 4 -+ -+#define _ASOCREQ_IE_OFFSET_ 4 // excluding wlan_hdr -+#define _ASOCRSP_IE_OFFSET_ 6 -+#define _REASOCREQ_IE_OFFSET_ 10 -+#define _REASOCRSP_IE_OFFSET_ 6 -+#define _PROBEREQ_IE_OFFSET_ 0 -+#define _PROBERSP_IE_OFFSET_ 12 -+#define _AUTH_IE_OFFSET_ 6 -+#define _DEAUTH_IE_OFFSET_ 0 -+#define _BEACON_IE_OFFSET_ 12 -+#define _PUBLIC_ACTION_IE_OFFSET_ 8 -+ -+#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -+ -+#define _SSID_IE_ 0 -+#define _SUPPORTEDRATES_IE_ 1 -+#define _DSSET_IE_ 3 -+#define _TIM_IE_ 5 -+#define _IBSS_PARA_IE_ 6 -+#define _COUNTRY_IE_ 7 -+#define _CHLGETXT_IE_ 16 -+#define _POW_CAP_IE_ 33 -+#define _SUPPORTED_CH_IE_ 36 -+#define _CH_SWTICH_ANNOUNCE_ 37 //Secondary Channel Offset -+#define _RSN_IE_2_ 48 -+#define _SSN_IE_1_ 221 -+#define _ERPINFO_IE_ 42 -+#define _EXT_SUPPORTEDRATES_IE_ 50 -+ -+#define _HT_CAPABILITY_IE_ 45 -+#define _FTIE_ 55 -+#define _TIMEOUT_ITVL_IE_ 56 -+#define _SRC_IE_ 59 -+#define _HT_EXTRA_INFO_IE_ 61 -+#define _HT_ADD_INFO_IE_ 61 //_HT_EXTRA_INFO_IE_ -+ -+#define EID_BSSCoexistence 72 // 20/40 BSS Coexistence -+#define EID_BSSIntolerantChlReport 73 -+#define _RIC_Descriptor_IE_ 75 -+ -+#ifdef CONFIG_IEEE80211W -+#define _MME_IE_ 76 //802.11w Management MIC element -+#endif //CONFIG_IEEE80211W -+#define _LINK_ID_IE_ 101 -+#define _CH_SWITCH_TIMING_ 104 -+#define _PTI_BUFFER_STATUS_ 106 -+#define _EXT_CAP_IE_ 127 -+#define _VENDOR_SPECIFIC_IE_ 221 -+ -+#define _RESERVED47_ 47 -+ -+/* --------------------------------------------------------------------------- -+ Below is the fixed elements... -+-----------------------------------------------------------------------------*/ -+#define _AUTH_ALGM_NUM_ 2 -+#define _AUTH_SEQ_NUM_ 2 -+#define _BEACON_ITERVAL_ 2 -+#define _CAPABILITY_ 2 -+#define _CURRENT_APADDR_ 6 -+#define _LISTEN_INTERVAL_ 2 -+#define _RSON_CODE_ 2 -+#define _ASOC_ID_ 2 -+#define _STATUS_CODE_ 2 -+#define _TIMESTAMP_ 8 -+ -+#define AUTH_ODD_TO 0 -+#define AUTH_EVEN_TO 1 -+ -+#define WLAN_ETHCONV_ENCAP 1 -+#define WLAN_ETHCONV_RFC1042 2 -+#define WLAN_ETHCONV_8021h 3 -+ -+#define cap_ESS BIT(0) -+#define cap_IBSS BIT(1) -+#define cap_CFPollable BIT(2) -+#define cap_CFRequest BIT(3) -+#define cap_Privacy BIT(4) -+#define cap_ShortPremble BIT(5) -+#define cap_PBCC BIT(6) -+#define cap_ChAgility BIT(7) -+#define cap_SpecMgmt BIT(8) -+#define cap_QoS BIT(9) -+#define cap_ShortSlot BIT(10) -+ -+/*----------------------------------------------------------------------------- -+ Below is the definition for 802.11i / 802.1x -+------------------------------------------------------------------------------*/ -+#define _IEEE8021X_MGT_ 1 // WPA -+#define _IEEE8021X_PSK_ 2 // WPA with pre-shared key -+ -+/* -+#define _NO_PRIVACY_ 0 -+#define _WEP_40_PRIVACY_ 1 -+#define _TKIP_PRIVACY_ 2 -+#define _WRAP_PRIVACY_ 3 -+#define _CCMP_PRIVACY_ 4 -+#define _WEP_104_PRIVACY_ 5 -+#define _WEP_WPA_MIXED_PRIVACY_ 6 // WEP + WPA -+*/ -+ -+#ifdef CONFIG_IEEE80211W -+#define _MME_IE_LENGTH_ 18 -+#endif //CONFIG_IEEE80211W -+/*----------------------------------------------------------------------------- -+ Below is the definition for WMM -+------------------------------------------------------------------------------*/ -+#define _WMM_IE_Length_ 7 // for WMM STA -+#define _WMM_Para_Element_Length_ 24 -+ -+ -+/*----------------------------------------------------------------------------- -+ Below is the definition for 802.11n -+------------------------------------------------------------------------------*/ -+ -+/* block-ack parameters */ -+#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 -+#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C -+#define RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0 -+#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 -+#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 -+ -+//#ifdef CONFIG_80211N_HT -+ -+#define SetOrderBit(pbuf) \ -+ do { \ -+ *(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \ -+ } while(0) -+ -+#define GetOrderBit(pbuf) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) -+ -+ -+/** -+ * struct rtw_ieee80211_bar - HT Block Ack Request -+ * -+ * This structure refers to "HT BlockAckReq" as -+ * described in 802.11n draft section 7.2.1.7.1 -+ */ -+ #if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW) -+struct rtw_ieee80211_bar { -+ unsigned short frame_control; -+ unsigned short duration; -+ unsigned char ra[6]; -+ unsigned char ta[6]; -+ unsigned short control; -+ unsigned short start_seq_num; -+} __attribute__((packed)); -+ #endif -+ -+/* 802.11 BAR control masks */ -+#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 -+#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 -+ -+ -+ #if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW) || defined(PLATFORM_FREEBSD) -+ -+ -+ -+ /** -+ * struct rtw_ieee80211_ht_cap - HT capabilities -+ * -+ * This structure refers to "HT capabilities element" as -+ * described in 802.11n draft section 7.3.2.52 -+ */ -+ -+struct rtw_ieee80211_ht_cap { -+ unsigned short cap_info; -+ unsigned char ampdu_params_info; -+ unsigned char supp_mcs_set[16]; -+ unsigned short extended_ht_cap_info; -+ unsigned int tx_BF_cap_info; -+ unsigned char antenna_selection_info; -+} __attribute__ ((packed)); -+ -+/** -+ * struct rtw_ieee80211_ht_cap - HT additional information -+ * -+ * This structure refers to "HT information element" as -+ * described in 802.11n draft section 7.3.2.53 -+ */ -+struct ieee80211_ht_addt_info { -+ unsigned char control_chan; -+ unsigned char ht_param; -+ unsigned short operation_mode; -+ unsigned short stbc_param; -+ unsigned char basic_set[16]; -+} __attribute__ ((packed)); -+ -+ -+struct HT_caps_element -+{ -+ union -+ { -+ struct -+ { -+ unsigned short HT_caps_info; -+ unsigned char AMPDU_para; -+ unsigned char MCS_rate[16]; -+ unsigned short HT_ext_caps; -+ unsigned int Beamforming_caps; -+ unsigned char ASEL_caps; -+ } HT_cap_element; -+ unsigned char HT_cap[26]; -+ }u; -+} __attribute__ ((packed)); -+ -+struct HT_info_element -+{ -+ unsigned char primary_channel; -+ unsigned char infos[5]; -+ unsigned char MCS_rate[16]; -+} __attribute__ ((packed)); -+ -+struct AC_param -+{ -+ unsigned char ACI_AIFSN; -+ unsigned char CW; -+ unsigned short TXOP_limit; -+} __attribute__ ((packed)); -+ -+struct WMM_para_element -+{ -+ unsigned char QoS_info; -+ unsigned char reserved; -+ struct AC_param ac_param[4]; -+} __attribute__ ((packed)); -+ -+struct ADDBA_request -+{ -+ unsigned char dialog_token; -+ unsigned short BA_para_set; -+ unsigned short BA_timeout_value; -+ unsigned short BA_starting_seqctrl; -+} __attribute__ ((packed)); -+ -+ -+ -+#endif -+ -+ -+#ifdef PLATFORM_WINDOWS -+ -+#pragma pack(1) -+ -+struct rtw_ieee80211_ht_cap { -+ unsigned short cap_info; -+ unsigned char ampdu_params_info; -+ unsigned char supp_mcs_set[16]; -+ unsigned short extended_ht_cap_info; -+ unsigned int tx_BF_cap_info; -+ unsigned char antenna_selection_info; -+}; -+ -+ -+struct ieee80211_ht_addt_info { -+ unsigned char control_chan; -+ unsigned char ht_param; -+ unsigned short operation_mode; -+ unsigned short stbc_param; -+ unsigned char basic_set[16]; -+}; -+ -+struct HT_caps_element -+{ -+ union -+ { -+ struct -+ { -+ unsigned short HT_caps_info; -+ unsigned char AMPDU_para; -+ unsigned char MCS_rate[16]; -+ unsigned short HT_ext_caps; -+ unsigned int Beamforming_caps; -+ unsigned char ASEL_caps; -+ } HT_cap_element; -+ unsigned char HT_cap[26]; -+ }; -+}; -+ -+struct HT_info_element -+{ -+ unsigned char primary_channel; -+ unsigned char infos[5]; -+ unsigned char MCS_rate[16]; -+}; -+ -+struct AC_param -+{ -+ unsigned char ACI_AIFSN; -+ unsigned char CW; -+ unsigned short TXOP_limit; -+}; -+ -+struct WMM_para_element -+{ -+ unsigned char QoS_info; -+ unsigned char reserved; -+ struct AC_param ac_param[4]; -+}; -+ -+struct ADDBA_request -+{ -+ unsigned char dialog_token; -+ unsigned short BA_para_set; -+ unsigned short BA_timeout_value; -+ unsigned short BA_starting_seqctrl; -+}; -+ -+ -+#pragma pack() -+ -+#endif -+ -+ -+/* 802.11n HT capabilities masks */ -+#define IEEE80211_HT_CAP_SUP_WIDTH 0x0002 -+#define IEEE80211_HT_CAP_SM_PS 0x000C -+#define IEEE80211_HT_CAP_GRN_FLD 0x0010 -+#define IEEE80211_HT_CAP_SGI_20 0x0020 -+#define IEEE80211_HT_CAP_SGI_40 0x0040 -+#define IEEE80211_HT_CAP_TX_STBC 0x0080 -+#define IEEE80211_HT_CAP_RX_STBC 0x0300 -+#define IEEE80211_HT_CAP_DELAY_BA 0x0400 -+#define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 -+#define IEEE80211_HT_CAP_DSSSCCK40 0x1000 -+/* 802.11n HT capability AMPDU settings */ -+#define IEEE80211_HT_CAP_AMPDU_FACTOR 0x03 -+#define IEEE80211_HT_CAP_AMPDU_DENSITY 0x1C -+/* 802.11n HT capability MSC set */ -+#define IEEE80211_SUPP_MCS_SET_UEQM 4 -+#define IEEE80211_HT_CAP_MAX_STREAMS 4 -+#define IEEE80211_SUPP_MCS_SET_LEN 10 -+/* maximum streams the spec allows */ -+#define IEEE80211_HT_CAP_MCS_TX_DEFINED 0x01 -+#define IEEE80211_HT_CAP_MCS_TX_RX_DIFF 0x02 -+#define IEEE80211_HT_CAP_MCS_TX_STREAMS 0x0C -+#define IEEE80211_HT_CAP_MCS_TX_UEQM 0x10 -+/* 802.11n HT IE masks */ -+#define IEEE80211_HT_IE_CHA_SEC_OFFSET 0x03 -+#define IEEE80211_HT_IE_CHA_SEC_NONE 0x00 -+#define IEEE80211_HT_IE_CHA_SEC_ABOVE 0x01 -+#define IEEE80211_HT_IE_CHA_SEC_BELOW 0x03 -+#define IEEE80211_HT_IE_CHA_WIDTH 0x04 -+#define IEEE80211_HT_IE_HT_PROTECTION 0x0003 -+#define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 -+#define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 -+ -+/* block-ack parameters */ -+#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 -+#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C -+#define RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0 -+#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 -+#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 -+ -+/* -+ * A-PMDU buffer sizes -+ * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) -+ */ -+#define IEEE80211_MIN_AMPDU_BUF 0x8 -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)) -+#define IEEE80211_MAX_AMPDU_BUF 0x40 -+#endif -+ -+ -+/* Spatial Multiplexing Power Save Modes */ -+#define WLAN_HT_CAP_SM_PS_STATIC 0 -+#define WLAN_HT_CAP_SM_PS_DYNAMIC 1 -+#define WLAN_HT_CAP_SM_PS_INVALID 2 -+#define WLAN_HT_CAP_SM_PS_DISABLED 3 -+ -+ -+#define OP_MODE_PURE 0 -+#define OP_MODE_MAY_BE_LEGACY_STAS 1 -+#define OP_MODE_20MHZ_HT_STA_ASSOCED 2 -+#define OP_MODE_MIXED 3 -+ -+#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK ((u8) BIT(0) | BIT(1)) -+#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE ((u8) BIT(0)) -+#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW ((u8) BIT(0) | BIT(1)) -+#define HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH ((u8) BIT(2)) -+#define HT_INFO_HT_PARAM_RIFS_MODE ((u8) BIT(3)) -+#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY ((u8) BIT(4)) -+#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY ((u8) BIT(5)) -+ -+#define HT_INFO_OPERATION_MODE_OP_MODE_MASK \ -+ ((u16) (0x0001 | 0x0002)) -+#define HT_INFO_OPERATION_MODE_OP_MODE_OFFSET 0 -+#define HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT ((u8) BIT(2)) -+#define HT_INFO_OPERATION_MODE_TRANSMIT_BURST_LIMIT ((u8) BIT(3)) -+#define HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT ((u8) BIT(4)) -+ -+#define HT_INFO_STBC_PARAM_DUAL_BEACON ((u16) BIT(6)) -+#define HT_INFO_STBC_PARAM_DUAL_STBC_PROTECT ((u16) BIT(7)) -+#define HT_INFO_STBC_PARAM_SECONDARY_BCN ((u16) BIT(8)) -+#define HT_INFO_STBC_PARAM_LSIG_TXOP_PROTECT_ALLOWED ((u16) BIT(9)) -+#define HT_INFO_STBC_PARAM_PCO_ACTIVE ((u16) BIT(10)) -+#define HT_INFO_STBC_PARAM_PCO_PHASE ((u16) BIT(11)) -+ -+ -+ -+//#endif -+ -+// ===============WPS Section=============== -+// For WPSv1.0 -+#define WPSOUI 0x0050f204 -+// WPS attribute ID -+#define WPS_ATTR_VER1 0x104A -+#define WPS_ATTR_SIMPLE_CONF_STATE 0x1044 -+#define WPS_ATTR_RESP_TYPE 0x103B -+#define WPS_ATTR_UUID_E 0x1047 -+#define WPS_ATTR_MANUFACTURER 0x1021 -+#define WPS_ATTR_MODEL_NAME 0x1023 -+#define WPS_ATTR_MODEL_NUMBER 0x1024 -+#define WPS_ATTR_SERIAL_NUMBER 0x1042 -+#define WPS_ATTR_PRIMARY_DEV_TYPE 0x1054 -+#define WPS_ATTR_SEC_DEV_TYPE_LIST 0x1055 -+#define WPS_ATTR_DEVICE_NAME 0x1011 -+#define WPS_ATTR_CONF_METHOD 0x1008 -+#define WPS_ATTR_RF_BANDS 0x103C -+#define WPS_ATTR_DEVICE_PWID 0x1012 -+#define WPS_ATTR_REQUEST_TYPE 0x103A -+#define WPS_ATTR_ASSOCIATION_STATE 0x1002 -+#define WPS_ATTR_CONFIG_ERROR 0x1009 -+#define WPS_ATTR_VENDOR_EXT 0x1049 -+#define WPS_ATTR_SELECTED_REGISTRAR 0x1041 -+ -+// Value of WPS attribute "WPS_ATTR_DEVICE_NAME -+#define WPS_MAX_DEVICE_NAME_LEN 32 -+ -+// Value of WPS Request Type Attribute -+#define WPS_REQ_TYPE_ENROLLEE_INFO_ONLY 0x00 -+#define WPS_REQ_TYPE_ENROLLEE_OPEN_8021X 0x01 -+#define WPS_REQ_TYPE_REGISTRAR 0x02 -+#define WPS_REQ_TYPE_WLAN_MANAGER_REGISTRAR 0x03 -+ -+// Value of WPS Response Type Attribute -+#define WPS_RESPONSE_TYPE_INFO_ONLY 0x00 -+#define WPS_RESPONSE_TYPE_8021X 0x01 -+#define WPS_RESPONSE_TYPE_REGISTRAR 0x02 -+#define WPS_RESPONSE_TYPE_AP 0x03 -+ -+// Value of WPS WiFi Simple Configuration State Attribute -+#define WPS_WSC_STATE_NOT_CONFIG 0x01 -+#define WPS_WSC_STATE_CONFIG 0x02 -+ -+// Value of WPS Version Attribute -+#define WPS_VERSION_1 0x10 -+ -+// Value of WPS Configuration Method Attribute -+#define WPS_CONFIG_METHOD_FLASH 0x0001 -+#define WPS_CONFIG_METHOD_ETHERNET 0x0002 -+#define WPS_CONFIG_METHOD_LABEL 0x0004 -+#define WPS_CONFIG_METHOD_DISPLAY 0x0008 -+#define WPS_CONFIG_METHOD_E_NFC 0x0010 -+#define WPS_CONFIG_METHOD_I_NFC 0x0020 -+#define WPS_CONFIG_METHOD_NFC 0x0040 -+#define WPS_CONFIG_METHOD_PBC 0x0080 -+#define WPS_CONFIG_METHOD_KEYPAD 0x0100 -+#define WPS_CONFIG_METHOD_VPBC 0x0280 -+#define WPS_CONFIG_METHOD_PPBC 0x0480 -+#define WPS_CONFIG_METHOD_VDISPLAY 0x2008 -+#define WPS_CONFIG_METHOD_PDISPLAY 0x4008 -+ -+// Value of Category ID of WPS Primary Device Type Attribute -+#define WPS_PDT_CID_DISPLAYS 0x0007 -+#define WPS_PDT_CID_MULIT_MEDIA 0x0008 -+#define WPS_PDT_CID_RTK_WIDI WPS_PDT_CID_MULIT_MEDIA -+ -+// Value of Sub Category ID of WPS Primary Device Type Attribute -+#define WPS_PDT_SCID_MEDIA_SERVER 0x0005 -+#define WPS_PDT_SCID_RTK_DMP WPS_PDT_SCID_MEDIA_SERVER -+ -+// Value of Device Password ID -+#define WPS_DPID_PIN 0x0000 -+#define WPS_DPID_USER_SPEC 0x0001 -+#define WPS_DPID_MACHINE_SPEC 0x0002 -+#define WPS_DPID_REKEY 0x0003 -+#define WPS_DPID_PBC 0x0004 -+#define WPS_DPID_REGISTRAR_SPEC 0x0005 -+ -+// Value of WPS RF Bands Attribute -+#define WPS_RF_BANDS_2_4_GHZ 0x01 -+#define WPS_RF_BANDS_5_GHZ 0x02 -+ -+// Value of WPS Association State Attribute -+#define WPS_ASSOC_STATE_NOT_ASSOCIATED 0x00 -+#define WPS_ASSOC_STATE_CONNECTION_SUCCESS 0x01 -+#define WPS_ASSOC_STATE_CONFIGURATION_FAILURE 0x02 -+#define WPS_ASSOC_STATE_ASSOCIATION_FAILURE 0x03 -+#define WPS_ASSOC_STATE_IP_FAILURE 0x04 -+ -+// =====================P2P Section===================== -+// For P2P -+#define P2POUI 0x506F9A09 -+ -+// P2P Attribute ID -+#define P2P_ATTR_STATUS 0x00 -+#define P2P_ATTR_MINOR_REASON_CODE 0x01 -+#define P2P_ATTR_CAPABILITY 0x02 -+#define P2P_ATTR_DEVICE_ID 0x03 -+#define P2P_ATTR_GO_INTENT 0x04 -+#define P2P_ATTR_CONF_TIMEOUT 0x05 -+#define P2P_ATTR_LISTEN_CH 0x06 -+#define P2P_ATTR_GROUP_BSSID 0x07 -+#define P2P_ATTR_EX_LISTEN_TIMING 0x08 -+#define P2P_ATTR_INTENTED_IF_ADDR 0x09 -+#define P2P_ATTR_MANAGEABILITY 0x0A -+#define P2P_ATTR_CH_LIST 0x0B -+#define P2P_ATTR_NOA 0x0C -+#define P2P_ATTR_DEVICE_INFO 0x0D -+#define P2P_ATTR_GROUP_INFO 0x0E -+#define P2P_ATTR_GROUP_ID 0x0F -+#define P2P_ATTR_INTERFACE 0x10 -+#define P2P_ATTR_OPERATING_CH 0x11 -+#define P2P_ATTR_INVITATION_FLAGS 0x12 -+ -+// Value of Status Attribute -+#define P2P_STATUS_SUCCESS 0x00 -+#define P2P_STATUS_FAIL_INFO_UNAVAILABLE 0x01 -+#define P2P_STATUS_FAIL_INCOMPATIBLE_PARAM 0x02 -+#define P2P_STATUS_FAIL_LIMIT_REACHED 0x03 -+#define P2P_STATUS_FAIL_INVALID_PARAM 0x04 -+#define P2P_STATUS_FAIL_REQUEST_UNABLE 0x05 -+#define P2P_STATUS_FAIL_PREVOUS_PROTO_ERR 0x06 -+#define P2P_STATUS_FAIL_NO_COMMON_CH 0x07 -+#define P2P_STATUS_FAIL_UNKNOWN_P2PGROUP 0x08 -+#define P2P_STATUS_FAIL_BOTH_GOINTENT_15 0x09 -+#define P2P_STATUS_FAIL_INCOMPATIBLE_PROVSION 0x0A -+#define P2P_STATUS_FAIL_USER_REJECT 0x0B -+ -+// Value of Inviation Flags Attribute -+#define P2P_INVITATION_FLAGS_PERSISTENT BIT(0) -+ -+#define DMP_P2P_DEVCAP_SUPPORT (P2P_DEVCAP_SERVICE_DISCOVERY | \ -+ P2P_DEVCAP_CLIENT_DISCOVERABILITY | \ -+ P2P_DEVCAP_CONCURRENT_OPERATION | \ -+ P2P_DEVCAP_INVITATION_PROC) -+ -+#define DMP_P2P_GRPCAP_SUPPORT (P2P_GRPCAP_INTRABSS) -+ -+// Value of Device Capability Bitmap -+#define P2P_DEVCAP_SERVICE_DISCOVERY BIT(0) -+#define P2P_DEVCAP_CLIENT_DISCOVERABILITY BIT(1) -+#define P2P_DEVCAP_CONCURRENT_OPERATION BIT(2) -+#define P2P_DEVCAP_INFRA_MANAGED BIT(3) -+#define P2P_DEVCAP_DEVICE_LIMIT BIT(4) -+#define P2P_DEVCAP_INVITATION_PROC BIT(5) -+ -+// Value of Group Capability Bitmap -+#define P2P_GRPCAP_GO BIT(0) -+#define P2P_GRPCAP_PERSISTENT_GROUP BIT(1) -+#define P2P_GRPCAP_GROUP_LIMIT BIT(2) -+#define P2P_GRPCAP_INTRABSS BIT(3) -+#define P2P_GRPCAP_CROSS_CONN BIT(4) -+#define P2P_GRPCAP_PERSISTENT_RECONN BIT(5) -+#define P2P_GRPCAP_GROUP_FORMATION BIT(6) -+ -+// P2P Public Action Frame ( Management Frame ) -+#define P2P_PUB_ACTION_ACTION 0x09 -+ -+// P2P Public Action Frame Type -+#define P2P_GO_NEGO_REQ 0 -+#define P2P_GO_NEGO_RESP 1 -+#define P2P_GO_NEGO_CONF 2 -+#define P2P_INVIT_REQ 3 -+#define P2P_INVIT_RESP 4 -+#define P2P_DEVDISC_REQ 5 -+#define P2P_DEVDISC_RESP 6 -+#define P2P_PROVISION_DISC_REQ 7 -+#define P2P_PROVISION_DISC_RESP 8 -+ -+// P2P Action Frame Type -+#define P2P_NOTICE_OF_ABSENCE 0 -+#define P2P_PRESENCE_REQUEST 1 -+#define P2P_PRESENCE_RESPONSE 2 -+#define P2P_GO_DISC_REQUEST 3 -+ -+ -+#define P2P_MAX_PERSISTENT_GROUP_NUM 10 -+ -+#define P2P_PROVISIONING_SCAN_CNT 3 -+ -+#define P2P_WILDCARD_SSID_LEN 7 -+ -+#define P2P_FINDPHASE_EX_NONE 0 // default value, used when: (1)p2p disabed or (2)p2p enabled but only do 1 scan phase -+#define P2P_FINDPHASE_EX_FULL 1 // used when p2p enabled and want to do 1 scan phase and P2P_FINDPHASE_EX_MAX-1 find phase -+#define P2P_FINDPHASE_EX_SOCIAL_FIRST (P2P_FINDPHASE_EX_FULL+1) -+#define P2P_FINDPHASE_EX_MAX 4 -+#define P2P_FINDPHASE_EX_SOCIAL_LAST P2P_FINDPHASE_EX_MAX -+ -+#define P2P_PROVISION_TIMEOUT 5000 // 5 seconds timeout for sending the provision discovery request -+#define P2P_CONCURRENT_PROVISION_TIMEOUT 3000 // 3 seconds timeout for sending the provision discovery request under concurrent mode -+#define P2P_GO_NEGO_TIMEOUT 5000 // 5 seconds timeout for receiving the group negotation response -+#define P2P_CONCURRENT_GO_NEGO_TIMEOUT 3000 // 3 seconds timeout for sending the negotiation request under concurrent mode -+#define P2P_TX_PRESCAN_TIMEOUT 100 // 100ms -+#define P2P_INVITE_TIMEOUT 5000 // 5 seconds timeout for sending the invitation request -+#define P2P_CONCURRENT_INVITE_TIMEOUT 3000 // 3 seconds timeout for sending the invitation request under concurrent mode -+#define P2P_RESET_SCAN_CH 15000 // 15 seconds timeout to reset the scan channel ( based on channel plan ) -+#define P2P_MAX_INTENT 15 -+ -+#define P2P_MAX_NOA_NUM 2 -+ -+// WPS Configuration Method -+#define WPS_CM_NONE 0x0000 -+#define WPS_CM_LABEL 0x0004 -+#define WPS_CM_DISPLYA 0x0008 -+#define WPS_CM_EXTERNAL_NFC_TOKEN 0x0010 -+#define WPS_CM_INTEGRATED_NFC_TOKEN 0x0020 -+#define WPS_CM_NFC_INTERFACE 0x0040 -+#define WPS_CM_PUSH_BUTTON 0x0080 -+#define WPS_CM_KEYPAD 0x0100 -+#define WPS_CM_SW_PUHS_BUTTON 0x0280 -+#define WPS_CM_HW_PUHS_BUTTON 0x0480 -+#define WPS_CM_SW_DISPLAY_PIN 0x2008 -+#define WPS_CM_LCD_DISPLAY_PIN 0x4008 -+ -+enum P2P_ROLE { -+ P2P_ROLE_DISABLE = 0, -+ P2P_ROLE_DEVICE = 1, -+ P2P_ROLE_CLIENT = 2, -+ P2P_ROLE_GO = 3 -+}; -+ -+enum P2P_STATE { -+ P2P_STATE_NONE = 0, // P2P disable -+ P2P_STATE_IDLE = 1, // P2P had enabled and do nothing -+ P2P_STATE_LISTEN = 2, // In pure listen state -+ P2P_STATE_SCAN = 3, // In scan phase -+ P2P_STATE_FIND_PHASE_LISTEN = 4, // In the listen state of find phase -+ P2P_STATE_FIND_PHASE_SEARCH = 5, // In the search state of find phase -+ P2P_STATE_TX_PROVISION_DIS_REQ = 6, // In P2P provisioning discovery -+ P2P_STATE_RX_PROVISION_DIS_RSP = 7, -+ P2P_STATE_RX_PROVISION_DIS_REQ = 8, -+ P2P_STATE_GONEGO_ING = 9, // Doing the group owner negoitation handshake -+ P2P_STATE_GONEGO_OK = 10, // finish the group negoitation handshake with success -+ P2P_STATE_GONEGO_FAIL = 11, // finish the group negoitation handshake with failure -+ P2P_STATE_RECV_INVITE_REQ_MATCH = 12, // receiving the P2P Inviation request and match with the profile. -+ P2P_STATE_PROVISIONING_ING = 13, // Doing the P2P WPS -+ P2P_STATE_PROVISIONING_DONE = 14, // Finish the P2P WPS -+ P2P_STATE_TX_INVITE_REQ = 15, // Transmit the P2P Invitation request -+ P2P_STATE_RX_INVITE_RESP_OK = 16, // Receiving the P2P Invitation response with sucess -+ P2P_STATE_RECV_INVITE_REQ_DISMATCH = 17, // receiving the P2P Inviation request and dismatch with the profile. -+ P2P_STATE_RECV_INVITE_REQ_GO = 18, // receiving the P2P Inviation request and this wifi is GO. -+ P2P_STATE_RECV_INVITE_REQ_JOIN = 19, // receiving the P2P Inviation request to join an existing P2P Group. -+ P2P_STATE_RX_INVITE_RESP_FAIL = 20, // recveing the P2P Inviation response with failure -+ P2P_STATE_RX_INFOR_NOREADY = 21, // receiving p2p negoitation response with information is not available -+ P2P_STATE_TX_INFOR_NOREADY = 22, // sending p2p negoitation response with information is not available -+}; -+ -+enum P2P_WPSINFO { -+ P2P_NO_WPSINFO = 0, -+ P2P_GOT_WPSINFO_PEER_DISPLAY_PIN = 1, -+ P2P_GOT_WPSINFO_SELF_DISPLAY_PIN = 2, -+ P2P_GOT_WPSINFO_PBC = 3, -+}; -+ -+#define P2P_PRIVATE_IOCTL_SET_LEN 64 -+ -+enum P2P_PROTO_WK_ID -+{ -+ P2P_FIND_PHASE_WK = 0, -+ P2P_RESTORE_STATE_WK = 1, -+ P2P_PRE_TX_PROVDISC_PROCESS_WK = 2, -+ P2P_PRE_TX_NEGOREQ_PROCESS_WK = 3, -+ P2P_PRE_TX_INVITEREQ_PROCESS_WK = 4, -+ P2P_AP_P2P_CH_SWITCH_PROCESS_WK =5, -+ P2P_RO_CH_WK = 6, -+}; -+ -+#ifdef CONFIG_P2P_PS -+enum P2P_PS_STATE -+{ -+ P2P_PS_DISABLE = 0, -+ P2P_PS_ENABLE = 1, -+ P2P_PS_SCAN = 2, -+ P2P_PS_SCAN_DONE = 3, -+ P2P_PS_ALLSTASLEEP = 4, // for P2P GO -+}; -+ -+enum P2P_PS_MODE -+{ -+ P2P_PS_NONE = 0, -+ P2P_PS_CTWINDOW = 1, -+ P2P_PS_NOA = 2, -+ P2P_PS_MIX = 3, // CTWindow and NoA -+}; -+#endif // CONFIG_P2P_PS -+ -+// =====================WFD Section===================== -+// For Wi-Fi Display -+#define WFD_ATTR_DEVICE_INFO 0x00 -+#define WFD_ATTR_ASSOC_BSSID 0x01 -+#define WFD_ATTR_COUPLED_SINK_INFO 0x06 -+#define WFD_ATTR_LOCAL_IP_ADDR 0x08 -+#define WFD_ATTR_SESSION_INFO 0x09 -+#define WFD_ATTR_ALTER_MAC 0x0a -+ -+// For WFD Device Information Attribute -+#define WFD_DEVINFO_SOURCE 0x0000 -+#define WFD_DEVINFO_PSINK 0x0001 -+#define WFD_DEVINFO_SSINK 0x0002 -+#define WFD_DEVINFO_DUAL 0x0003 -+ -+#define WFD_DEVINFO_SESSION_AVAIL 0x0010 -+#define WFD_DEVINFO_WSD 0x0040 -+#define WFD_DEVINFO_PC_TDLS 0x0080 -+#define WFD_DEVINFO_HDCP_SUPPORT 0x0100 -+ -+ -+#ifdef CONFIG_TX_MCAST2UNI -+#define IP_MCAST_MAC(mac) ((mac[0]==0x01)&&(mac[1]==0x00)&&(mac[2]==0x5e)) -+#define ICMPV6_MCAST_MAC(mac) ((mac[0]==0x33)&&(mac[1]==0x33)&&(mac[2]!=0xff)) -+#endif // CONFIG_TX_MCAST2UNI -+ -+ -+ -+#endif // _WIFI_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h -@@ -0,0 +1,703 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __WLAN_BSSDEF_H__ -+#define __WLAN_BSSDEF_H__ -+ -+ -+#define MAX_IE_SZ 768 -+ -+ -+#ifdef PLATFORM_LINUX -+ -+#define NDIS_802_11_LENGTH_SSID 32 -+#define NDIS_802_11_LENGTH_RATES 8 -+#define NDIS_802_11_LENGTH_RATES_EX 16 -+ -+typedef unsigned char NDIS_802_11_MAC_ADDRESS[6]; -+typedef long NDIS_802_11_RSSI; // in dBm -+typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; // Set of 8 data rates -+typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; // Set of 16 data rates -+ -+ -+typedef ULONG NDIS_802_11_KEY_INDEX; -+typedef unsigned long long NDIS_802_11_KEY_RSC; -+ -+ -+typedef struct _NDIS_802_11_SSID -+{ -+ ULONG SsidLength; -+ UCHAR Ssid[32]; -+} NDIS_802_11_SSID, *PNDIS_802_11_SSID; -+ -+typedef enum _NDIS_802_11_NETWORK_TYPE -+{ -+ Ndis802_11FH, -+ Ndis802_11DS, -+ Ndis802_11OFDM5, -+ Ndis802_11OFDM24, -+ Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound -+} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; -+ -+typedef struct _NDIS_802_11_CONFIGURATION_FH -+{ -+ ULONG Length; // Length of structure -+ ULONG HopPattern; // As defined by 802.11, MSB set -+ ULONG HopSet; // to one if non-802.11 -+ ULONG DwellTime; // units are Kusec -+} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; -+ -+ -+/* -+ FW will only save the channel number in DSConfig. -+ ODI Handler will convert the channel number to freq. number. -+*/ -+typedef struct _NDIS_802_11_CONFIGURATION -+{ -+ ULONG Length; // Length of structure -+ ULONG BeaconPeriod; // units are Kusec -+ ULONG ATIMWindow; // units are Kusec -+ ULONG DSConfig; // Frequency, units are kHz -+ NDIS_802_11_CONFIGURATION_FH FHConfig; -+} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; -+ -+ -+ -+typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE -+{ -+ Ndis802_11IBSS, -+ Ndis802_11Infrastructure, -+ Ndis802_11AutoUnknown, -+ Ndis802_11InfrastructureMax, // Not a real value, defined as upper bound -+ Ndis802_11APMode -+} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; -+ -+ -+ -+ -+ -+typedef struct _NDIS_802_11_FIXED_IEs -+{ -+ UCHAR Timestamp[8]; -+ USHORT BeaconInterval; -+ USHORT Capabilities; -+} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs; -+ -+ -+ -+typedef struct _NDIS_802_11_VARIABLE_IEs -+{ -+ UCHAR ElementID; -+ UCHAR Length; -+ UCHAR data[1]; -+} NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs; -+ -+ -+ -+/* -+ -+ -+ -+Length is the 4 bytes multiples of the sume of -+ sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + sizeof (NDIS_802_11_SSID) + sizeof (ULONG) -++ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) + sizeof (NDIS_802_11_CONFIGURATION) -++ sizeof (NDIS_802_11_RATES_EX) + IELength -+ -+Except the IELength, all other fields are fixed length. Therefore, we can define a marco to present the -+partial sum. -+ -+*/ -+#if 0 -+typedef struct _NDIS_WLAN_BSSID_EX -+{ -+ ULONG Length; -+ NDIS_802_11_MAC_ADDRESS MacAddress; -+ UCHAR Reserved[2];//[0]: IS beacon frame, [1]:optimum_antenna=>For antenna diversity; -+ NDIS_802_11_SSID Ssid; -+ ULONG Privacy; -+ NDIS_802_11_RSSI Rssi; -+ NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -+ NDIS_802_11_CONFIGURATION Configuration; -+ NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -+ NDIS_802_11_RATES_EX SupportedRates; -+ ULONG IELength; -+ UCHAR IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information) -+} NDIS_WLAN_BSSID_EX, *PNDIS_WLAN_BSSID_EX; -+ -+ -+typedef struct _NDIS_802_11_BSSID_LIST_EX -+{ -+ ULONG NumberOfItems; -+ NDIS_WLAN_BSSID_EX Bssid[1]; -+} NDIS_802_11_BSSID_LIST_EX, *PNDIS_802_11_BSSID_LIST_EX; -+#endif -+ -+typedef enum _NDIS_802_11_AUTHENTICATION_MODE -+{ -+ Ndis802_11AuthModeOpen, -+ Ndis802_11AuthModeShared, -+ Ndis802_11AuthModeAutoSwitch, -+ Ndis802_11AuthModeWPA, -+ Ndis802_11AuthModeWPAPSK, -+ Ndis802_11AuthModeWPANone, -+ Ndis802_11AuthModeMax // Not a real mode, defined as upper bound -+} NDIS_802_11_AUTHENTICATION_MODE, *PNDIS_802_11_AUTHENTICATION_MODE; -+ -+typedef enum _NDIS_802_11_WEP_STATUS -+{ -+ Ndis802_11WEPEnabled, -+ Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, -+ Ndis802_11WEPDisabled, -+ Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, -+ Ndis802_11WEPKeyAbsent, -+ Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, -+ Ndis802_11WEPNotSupported, -+ Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, -+ Ndis802_11Encryption2Enabled, -+ Ndis802_11Encryption2KeyAbsent, -+ Ndis802_11Encryption3Enabled, -+ Ndis802_11Encryption3KeyAbsent -+} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS, -+ NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS; -+ -+ -+#define NDIS_802_11_AI_REQFI_CAPABILITIES 1 -+#define NDIS_802_11_AI_REQFI_LISTENINTERVAL 2 -+#define NDIS_802_11_AI_REQFI_CURRENTAPADDRESS 4 -+ -+#define NDIS_802_11_AI_RESFI_CAPABILITIES 1 -+#define NDIS_802_11_AI_RESFI_STATUSCODE 2 -+#define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4 -+ -+typedef struct _NDIS_802_11_AI_REQFI -+{ -+ USHORT Capabilities; -+ USHORT ListenInterval; -+ NDIS_802_11_MAC_ADDRESS CurrentAPAddress; -+} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; -+ -+typedef struct _NDIS_802_11_AI_RESFI -+{ -+ USHORT Capabilities; -+ USHORT StatusCode; -+ USHORT AssociationId; -+} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; -+ -+typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION -+{ -+ ULONG Length; -+ USHORT AvailableRequestFixedIEs; -+ NDIS_802_11_AI_REQFI RequestFixedIEs; -+ ULONG RequestIELength; -+ ULONG OffsetRequestIEs; -+ USHORT AvailableResponseFixedIEs; -+ NDIS_802_11_AI_RESFI ResponseFixedIEs; -+ ULONG ResponseIELength; -+ ULONG OffsetResponseIEs; -+} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION; -+ -+typedef enum _NDIS_802_11_RELOAD_DEFAULTS -+{ -+ Ndis802_11ReloadWEPKeys -+} NDIS_802_11_RELOAD_DEFAULTS, *PNDIS_802_11_RELOAD_DEFAULTS; -+ -+ -+// Key mapping keys require a BSSID -+typedef struct _NDIS_802_11_KEY -+{ -+ ULONG Length; // Length of this structure -+ ULONG KeyIndex; -+ ULONG KeyLength; // length of key in bytes -+ NDIS_802_11_MAC_ADDRESS BSSID; -+ NDIS_802_11_KEY_RSC KeyRSC; -+ UCHAR KeyMaterial[32]; // variable length depending on above field -+} NDIS_802_11_KEY, *PNDIS_802_11_KEY; -+ -+typedef struct _NDIS_802_11_REMOVE_KEY -+{ -+ ULONG Length; // Length of this structure -+ ULONG KeyIndex; -+ NDIS_802_11_MAC_ADDRESS BSSID; -+} NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY; -+ -+typedef struct _NDIS_802_11_WEP -+{ -+ ULONG Length; // Length of this structure -+ ULONG KeyIndex; // 0 is the per-client key, 1-N are the global keys -+ ULONG KeyLength; // length of key in bytes -+ UCHAR KeyMaterial[16];// variable length depending on above field -+} NDIS_802_11_WEP, *PNDIS_802_11_WEP; -+ -+typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST -+{ -+ ULONG Length; // Length of structure -+ NDIS_802_11_MAC_ADDRESS Bssid; -+ ULONG Flags; -+} NDIS_802_11_AUTHENTICATION_REQUEST, *PNDIS_802_11_AUTHENTICATION_REQUEST; -+ -+typedef enum _NDIS_802_11_STATUS_TYPE -+{ -+ Ndis802_11StatusType_Authentication, -+ Ndis802_11StatusType_MediaStreamMode, -+ Ndis802_11StatusType_PMKID_CandidateList, -+ Ndis802_11StatusTypeMax // not a real type, defined as an upper bound -+} NDIS_802_11_STATUS_TYPE, *PNDIS_802_11_STATUS_TYPE; -+ -+typedef struct _NDIS_802_11_STATUS_INDICATION -+{ -+ NDIS_802_11_STATUS_TYPE StatusType; -+} NDIS_802_11_STATUS_INDICATION, *PNDIS_802_11_STATUS_INDICATION; -+ -+// mask for authentication/integrity fields -+#define NDIS_802_11_AUTH_REQUEST_AUTH_FIELDS 0x0f -+#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01 -+#define NDIS_802_11_AUTH_REQUEST_KEYUPDATE 0x02 -+#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06 -+#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E -+ -+// MIC check time, 60 seconds. -+#define MIC_CHECK_TIME 60000000 -+ -+typedef struct _NDIS_802_11_AUTHENTICATION_EVENT -+{ -+ NDIS_802_11_STATUS_INDICATION Status; -+ NDIS_802_11_AUTHENTICATION_REQUEST Request[1]; -+} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT; -+ -+typedef struct _NDIS_802_11_TEST -+{ -+ ULONG Length; -+ ULONG Type; -+ union -+ { -+ NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent; -+ NDIS_802_11_RSSI RssiTrigger; -+ }tt; -+} NDIS_802_11_TEST, *PNDIS_802_11_TEST; -+ -+ -+#endif //end of #ifdef PLATFORM_LINUX -+ -+#ifdef PLATFORM_FREEBSD -+ -+#define NDIS_802_11_LENGTH_SSID 32 -+#define NDIS_802_11_LENGTH_RATES 8 -+#define NDIS_802_11_LENGTH_RATES_EX 16 -+ -+typedef unsigned char NDIS_802_11_MAC_ADDRESS[6]; -+typedef long NDIS_802_11_RSSI; // in dBm -+typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; // Set of 8 data rates -+typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; // Set of 16 data rates -+ -+ -+typedef ULONG NDIS_802_11_KEY_INDEX; -+typedef unsigned long long NDIS_802_11_KEY_RSC; -+ -+ -+typedef struct _NDIS_802_11_SSID -+{ -+ ULONG SsidLength; -+ UCHAR Ssid[32]; -+} NDIS_802_11_SSID, *PNDIS_802_11_SSID; -+ -+typedef enum _NDIS_802_11_NETWORK_TYPE -+{ -+ Ndis802_11FH, -+ Ndis802_11DS, -+ Ndis802_11OFDM5, -+ Ndis802_11OFDM24, -+ Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound -+} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; -+ -+typedef struct _NDIS_802_11_CONFIGURATION_FH -+{ -+ ULONG Length; // Length of structure -+ ULONG HopPattern; // As defined by 802.11, MSB set -+ ULONG HopSet; // to one if non-802.11 -+ ULONG DwellTime; // units are Kusec -+} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; -+ -+ -+/* -+ FW will only save the channel number in DSConfig. -+ ODI Handler will convert the channel number to freq. number. -+*/ -+typedef struct _NDIS_802_11_CONFIGURATION -+{ -+ ULONG Length; // Length of structure -+ ULONG BeaconPeriod; // units are Kusec -+ ULONG ATIMWindow; // units are Kusec -+ ULONG DSConfig; // Frequency, units are kHz -+ NDIS_802_11_CONFIGURATION_FH FHConfig; -+} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; -+ -+ -+ -+typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE -+{ -+ Ndis802_11IBSS, -+ Ndis802_11Infrastructure, -+ Ndis802_11AutoUnknown, -+ Ndis802_11InfrastructureMax, // Not a real value, defined as upper bound -+ Ndis802_11APMode -+} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; -+ -+ -+ -+ -+ -+typedef struct _NDIS_802_11_FIXED_IEs -+{ -+ UCHAR Timestamp[8]; -+ USHORT BeaconInterval; -+ USHORT Capabilities; -+} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs; -+ -+ -+ -+typedef struct _NDIS_802_11_VARIABLE_IEs -+{ -+ UCHAR ElementID; -+ UCHAR Length; -+ UCHAR data[1]; -+} NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs; -+ -+ -+ -+/* -+ -+ -+ -+Length is the 4 bytes multiples of the sume of -+ sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + sizeof (NDIS_802_11_SSID) + sizeof (ULONG) -++ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) + sizeof (NDIS_802_11_CONFIGURATION) -++ sizeof (NDIS_802_11_RATES_EX) + IELength -+ -+Except the IELength, all other fields are fixed length. Therefore, we can define a marco to present the -+partial sum. -+ -+*/ -+#if 0 -+typedef struct _NDIS_WLAN_BSSID_EX -+{ -+ ULONG Length; -+ NDIS_802_11_MAC_ADDRESS MacAddress; -+ UCHAR Reserved[2];//[0]: IS beacon frame, [1]:optimum_antenna=>For antenna diversity; -+ NDIS_802_11_SSID Ssid; -+ ULONG Privacy; -+ NDIS_802_11_RSSI Rssi; -+ NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -+ NDIS_802_11_CONFIGURATION Configuration; -+ NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -+ NDIS_802_11_RATES_EX SupportedRates; -+ ULONG IELength; -+ UCHAR IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information) -+} NDIS_WLAN_BSSID_EX, *PNDIS_WLAN_BSSID_EX; -+ -+ -+typedef struct _NDIS_802_11_BSSID_LIST_EX -+{ -+ ULONG NumberOfItems; -+ NDIS_WLAN_BSSID_EX Bssid[1]; -+} NDIS_802_11_BSSID_LIST_EX, *PNDIS_802_11_BSSID_LIST_EX; -+#endif -+ -+typedef enum _NDIS_802_11_AUTHENTICATION_MODE -+{ -+ Ndis802_11AuthModeOpen, -+ Ndis802_11AuthModeShared, -+ Ndis802_11AuthModeAutoSwitch, -+ Ndis802_11AuthModeWPA, -+ Ndis802_11AuthModeWPAPSK, -+ Ndis802_11AuthModeWPANone, -+ Ndis802_11AuthModeMax // Not a real mode, defined as upper bound -+} NDIS_802_11_AUTHENTICATION_MODE, *PNDIS_802_11_AUTHENTICATION_MODE; -+ -+typedef enum _NDIS_802_11_WEP_STATUS -+{ -+ Ndis802_11WEPEnabled, -+ Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, -+ Ndis802_11WEPDisabled, -+ Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, -+ Ndis802_11WEPKeyAbsent, -+ Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, -+ Ndis802_11WEPNotSupported, -+ Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, -+ Ndis802_11Encryption2Enabled, -+ Ndis802_11Encryption2KeyAbsent, -+ Ndis802_11Encryption3Enabled, -+ Ndis802_11Encryption3KeyAbsent -+} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS, -+ NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS; -+ -+ -+#define NDIS_802_11_AI_REQFI_CAPABILITIES 1 -+#define NDIS_802_11_AI_REQFI_LISTENINTERVAL 2 -+#define NDIS_802_11_AI_REQFI_CURRENTAPADDRESS 4 -+ -+#define NDIS_802_11_AI_RESFI_CAPABILITIES 1 -+#define NDIS_802_11_AI_RESFI_STATUSCODE 2 -+#define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4 -+ -+typedef struct _NDIS_802_11_AI_REQFI -+{ -+ USHORT Capabilities; -+ USHORT ListenInterval; -+ NDIS_802_11_MAC_ADDRESS CurrentAPAddress; -+} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; -+ -+typedef struct _NDIS_802_11_AI_RESFI -+{ -+ USHORT Capabilities; -+ USHORT StatusCode; -+ USHORT AssociationId; -+} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; -+ -+typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION -+{ -+ ULONG Length; -+ USHORT AvailableRequestFixedIEs; -+ NDIS_802_11_AI_REQFI RequestFixedIEs; -+ ULONG RequestIELength; -+ ULONG OffsetRequestIEs; -+ USHORT AvailableResponseFixedIEs; -+ NDIS_802_11_AI_RESFI ResponseFixedIEs; -+ ULONG ResponseIELength; -+ ULONG OffsetResponseIEs; -+} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION; -+ -+typedef enum _NDIS_802_11_RELOAD_DEFAULTS -+{ -+ Ndis802_11ReloadWEPKeys -+} NDIS_802_11_RELOAD_DEFAULTS, *PNDIS_802_11_RELOAD_DEFAULTS; -+ -+ -+// Key mapping keys require a BSSID -+typedef struct _NDIS_802_11_KEY -+{ -+ ULONG Length; // Length of this structure -+ ULONG KeyIndex; -+ ULONG KeyLength; // length of key in bytes -+ NDIS_802_11_MAC_ADDRESS BSSID; -+ NDIS_802_11_KEY_RSC KeyRSC; -+ UCHAR KeyMaterial[32]; // variable length depending on above field -+} NDIS_802_11_KEY, *PNDIS_802_11_KEY; -+ -+typedef struct _NDIS_802_11_REMOVE_KEY -+{ -+ ULONG Length; // Length of this structure -+ ULONG KeyIndex; -+ NDIS_802_11_MAC_ADDRESS BSSID; -+} NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY; -+ -+typedef struct _NDIS_802_11_WEP -+{ -+ ULONG Length; // Length of this structure -+ ULONG KeyIndex; // 0 is the per-client key, 1-N are the global keys -+ ULONG KeyLength; // length of key in bytes -+ UCHAR KeyMaterial[16];// variable length depending on above field -+} NDIS_802_11_WEP, *PNDIS_802_11_WEP; -+ -+typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST -+{ -+ ULONG Length; // Length of structure -+ NDIS_802_11_MAC_ADDRESS Bssid; -+ ULONG Flags; -+} NDIS_802_11_AUTHENTICATION_REQUEST, *PNDIS_802_11_AUTHENTICATION_REQUEST; -+ -+typedef enum _NDIS_802_11_STATUS_TYPE -+{ -+ Ndis802_11StatusType_Authentication, -+ Ndis802_11StatusType_MediaStreamMode, -+ Ndis802_11StatusType_PMKID_CandidateList, -+ Ndis802_11StatusTypeMax // not a real type, defined as an upper bound -+} NDIS_802_11_STATUS_TYPE, *PNDIS_802_11_STATUS_TYPE; -+ -+typedef struct _NDIS_802_11_STATUS_INDICATION -+{ -+ NDIS_802_11_STATUS_TYPE StatusType; -+} NDIS_802_11_STATUS_INDICATION, *PNDIS_802_11_STATUS_INDICATION; -+ -+// mask for authentication/integrity fields -+#define NDIS_802_11_AUTH_REQUEST_AUTH_FIELDS 0x0f -+#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01 -+#define NDIS_802_11_AUTH_REQUEST_KEYUPDATE 0x02 -+#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06 -+#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E -+ -+// MIC check time, 60 seconds. -+#define MIC_CHECK_TIME 60000000 -+ -+typedef struct _NDIS_802_11_AUTHENTICATION_EVENT -+{ -+ NDIS_802_11_STATUS_INDICATION Status; -+ NDIS_802_11_AUTHENTICATION_REQUEST Request[1]; -+} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT; -+ -+typedef struct _NDIS_802_11_TEST -+{ -+ ULONG Length; -+ ULONG Type; -+ union -+ { -+ NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent; -+ NDIS_802_11_RSSI RssiTrigger; -+ }tt; -+} NDIS_802_11_TEST, *PNDIS_802_11_TEST; -+ -+ -+#endif //PLATFORM_FREEBSD -+#ifndef Ndis802_11APMode -+#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1) -+#endif -+ -+typedef struct _WLAN_PHY_INFO -+{ -+ u8 SignalStrength;//(in percentage) -+ u8 SignalQuality;//(in percentage) -+ u8 Optimum_antenna; //for Antenna diversity -+ u8 Reserved_0; -+}WLAN_PHY_INFO,*PWLAN_PHY_INFO; -+ -+/* temporally add #pragma pack for structure alignment issue of -+* WLAN_BSSID_EX and get_WLAN_BSSID_EX_sz() -+*/ -+#ifdef PLATFORM_WINDOWS -+#pragma pack(push) -+#pragma pack(1) -+#endif -+typedef struct _WLAN_BSSID_EX -+{ -+ ULONG Length; -+ NDIS_802_11_MAC_ADDRESS MacAddress; -+ UCHAR Reserved[2];//[0]: IS beacon frame -+ NDIS_802_11_SSID Ssid; -+ ULONG Privacy; -+ NDIS_802_11_RSSI Rssi;//(in dBM,raw data ,get from PHY) -+ NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -+ NDIS_802_11_CONFIGURATION Configuration; -+ NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -+ NDIS_802_11_RATES_EX SupportedRates; -+ WLAN_PHY_INFO PhyInfo; -+ ULONG IELength; -+ UCHAR IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information) -+} -+#ifndef PLATFORM_WINDOWS -+__attribute__((packed)) -+#endif -+WLAN_BSSID_EX, *PWLAN_BSSID_EX; -+#ifdef PLATFORM_WINDOWS -+#pragma pack(pop) -+#endif -+ -+__inline static uint get_WLAN_BSSID_EX_sz(WLAN_BSSID_EX *bss) -+{ -+ return (sizeof(WLAN_BSSID_EX) - MAX_IE_SZ + bss->IELength); -+} -+ -+struct wlan_network { -+ _list list; -+ int network_type; //refer to ieee80211.h for WIRELESS_11A/B/G -+ int fixed; // set to fixed when not to be removed as site-surveying -+ unsigned long last_scanned; //timestamp for the network -+ int aid; //will only be valid when a BSS is joinned. -+ int join_res; -+ WLAN_BSSID_EX network; //must be the last item -+#ifdef PLATFORM_WINDOWS -+ unsigned char iebuf[MAX_IE_SZ]; -+#endif -+ -+}; -+ -+enum VRTL_CARRIER_SENSE -+{ -+ DISABLE_VCS, -+ ENABLE_VCS, -+ AUTO_VCS -+}; -+ -+enum VCS_TYPE -+{ -+ NONE_VCS, -+ RTS_CTS, -+ CTS_TO_SELF -+}; -+ -+ -+ -+ -+#define PWR_CAM 0 -+#define PWR_MINPS 1 -+#define PWR_MAXPS 2 -+#define PWR_UAPSD 3 -+#define PWR_VOIP 4 -+ -+ -+enum UAPSD_MAX_SP -+{ -+ NO_LIMIT, -+ TWO_MSDU, -+ FOUR_MSDU, -+ SIX_MSDU -+}; -+ -+ -+//john -+#define NUM_PRE_AUTH_KEY 16 -+#define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY -+ -+/* -+* WPA2 -+*/ -+ -+#ifndef PLATFORM_OS_CE -+typedef struct _PMKID_CANDIDATE { -+ NDIS_802_11_MAC_ADDRESS BSSID; -+ ULONG Flags; -+} PMKID_CANDIDATE, *PPMKID_CANDIDATE; -+ -+typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST -+{ -+ ULONG Version; // Version of the structure -+ ULONG NumCandidates; // No. of pmkid candidates -+ PMKID_CANDIDATE CandidateList[1]; -+} NDIS_802_11_PMKID_CANDIDATE_LIST, *PNDIS_802_11_PMKID_CANDIDATE_LIST; -+ -+ -+typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION -+{ -+ NDIS_802_11_AUTHENTICATION_MODE AuthModeSupported; -+ NDIS_802_11_ENCRYPTION_STATUS EncryptStatusSupported; -+ -+} NDIS_802_11_AUTHENTICATION_ENCRYPTION, *PNDIS_802_11_AUTHENTICATION_ENCRYPTION; -+ -+typedef struct _NDIS_802_11_CAPABILITY -+{ -+ ULONG Length; -+ ULONG Version; -+ ULONG NoOfPMKIDs; -+ ULONG NoOfAuthEncryptPairsSupported; -+ NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1]; -+ -+} NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY; -+#endif -+ -+ -+#endif //#ifndef WLAN_BSSDEF_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h -@@ -0,0 +1,95 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#ifndef __XMIT_OSDEP_H_ -+#define __XMIT_OSDEP_H_ -+ -+#include -+#include -+#include -+ -+struct pkt_file { -+ _pkt *pkt; -+ SIZE_T pkt_len; //the remainder length of the open_file -+ _buffer *cur_buffer; -+ u8 *buf_start; -+ u8 *cur_addr; -+ SIZE_T buf_len; -+}; -+ -+#ifdef PLATFORM_WINDOWS -+ -+#ifdef PLATFORM_OS_XP -+#ifdef CONFIG_USB_HCI -+#include -+#include -+#include -+#endif -+#endif -+ -+#define NR_XMITFRAME 128 -+ -+#define ETH_ALEN 6 -+ -+extern NDIS_STATUS rtw_xmit_entry( -+IN _nic_hdl cnxt, -+IN NDIS_PACKET *pkt, -+IN UINT flags -+); -+ -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+#define NR_XMITFRAME 256 -+extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); -+extern void rtw_xmit_entry_wrap (struct ifnet * pifp); -+#endif //PLATFORM_FREEBSD -+ -+#ifdef PLATFORM_LINUX -+ -+#define NR_XMITFRAME 256 -+ -+struct xmit_priv; -+struct pkt_attrib; -+struct sta_xmit_priv; -+struct xmit_frame; -+struct xmit_buf; -+ -+extern int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); -+extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); -+ -+#endif -+ -+void rtw_os_xmit_schedule(_adapter *padapter); -+ -+int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz); -+void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz); -+ -+extern void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib); -+ -+extern uint rtw_remainder_len(struct pkt_file *pfile); -+extern void _rtw_open_pktfile(_pkt *pkt, struct pkt_file *pfile); -+extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen); -+extern sint rtw_endofpktfile (struct pkt_file *pfile); -+ -+extern void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt); -+extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe); -+ -+#endif //__XMIT_OSDEP_H_ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c -@@ -0,0 +1,5589 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _IOCTL_CFG80211_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ -+#include "ioctl_cfg80211.h" -+ -+#define RTW_MAX_MGMT_TX_CNT (8) -+ -+#define RTW_SCAN_IE_LEN_MAX 2304 -+#define RTW_MAX_REMAIN_ON_CHANNEL_DURATION 65535 //ms -+#define RTW_MAX_NUM_PMKIDS 4 -+ -+#define RTW_CH_MAX_2G_CHANNEL 14 /* Max channel in 2G band */ -+ -+static const u32 rtw_cipher_suites[] = { -+ WLAN_CIPHER_SUITE_WEP40, -+ WLAN_CIPHER_SUITE_WEP104, -+ WLAN_CIPHER_SUITE_TKIP, -+ WLAN_CIPHER_SUITE_CCMP, -+#ifdef CONFIG_IEEE80211W -+ WLAN_CIPHER_SUITE_AES_CMAC, -+#endif //CONFIG_IEEE80211W -+}; -+ -+#define RATETAB_ENT(_rate, _rateid, _flags) \ -+ { \ -+ .bitrate = (_rate), \ -+ .hw_value = (_rateid), \ -+ .flags = (_flags), \ -+ } -+ -+#define CHAN2G(_channel, _freq, _flags) { \ -+ .band = NL80211_BAND_2GHZ, \ -+ .center_freq = (_freq), \ -+ .hw_value = (_channel), \ -+ .flags = (_flags), \ -+ .max_antenna_gain = 0, \ -+ .max_power = 30, \ -+} -+ -+#define CHAN5G(_channel, _flags) { \ -+ .band = NL80211_BAND_5GHZ, \ -+ .center_freq = 5000 + (5 * (_channel)), \ -+ .hw_value = (_channel), \ -+ .flags = (_flags), \ -+ .max_antenna_gain = 0, \ -+ .max_power = 30, \ -+} -+ -+static struct ieee80211_rate rtw_rates[] = { -+ RATETAB_ENT(10, 0x1, 0), -+ RATETAB_ENT(20, 0x2, 0), -+ RATETAB_ENT(55, 0x4, 0), -+ RATETAB_ENT(110, 0x8, 0), -+ RATETAB_ENT(60, 0x10, 0), -+ RATETAB_ENT(90, 0x20, 0), -+ RATETAB_ENT(120, 0x40, 0), -+ RATETAB_ENT(180, 0x80, 0), -+ RATETAB_ENT(240, 0x100, 0), -+ RATETAB_ENT(360, 0x200, 0), -+ RATETAB_ENT(480, 0x400, 0), -+ RATETAB_ENT(540, 0x800, 0), -+}; -+ -+#define rtw_a_rates (rtw_rates + 4) -+#define RTW_A_RATES_NUM 8 -+#define rtw_g_rates (rtw_rates + 0) -+#define RTW_G_RATES_NUM 12 -+ -+#define RTW_2G_CHANNELS_NUM 14 -+#define RTW_5G_CHANNELS_NUM 37 -+ -+static struct ieee80211_channel rtw_2ghz_channels[] = { -+ CHAN2G(1, 2412, 0), -+ CHAN2G(2, 2417, 0), -+ CHAN2G(3, 2422, 0), -+ CHAN2G(4, 2427, 0), -+ CHAN2G(5, 2432, 0), -+ CHAN2G(6, 2437, 0), -+ CHAN2G(7, 2442, 0), -+ CHAN2G(8, 2447, 0), -+ CHAN2G(9, 2452, 0), -+ CHAN2G(10, 2457, 0), -+ CHAN2G(11, 2462, 0), -+ CHAN2G(12, 2467, 0), -+ CHAN2G(13, 2472, 0), -+ CHAN2G(14, 2484, 0), -+}; -+ -+static struct ieee80211_channel rtw_5ghz_a_channels[] = { -+ CHAN5G(34, 0), CHAN5G(36, 0), -+ CHAN5G(38, 0), CHAN5G(40, 0), -+ CHAN5G(42, 0), CHAN5G(44, 0), -+ CHAN5G(46, 0), CHAN5G(48, 0), -+ CHAN5G(52, 0), CHAN5G(56, 0), -+ CHAN5G(60, 0), CHAN5G(64, 0), -+ CHAN5G(100, 0), CHAN5G(104, 0), -+ CHAN5G(108, 0), CHAN5G(112, 0), -+ CHAN5G(116, 0), CHAN5G(120, 0), -+ CHAN5G(124, 0), CHAN5G(128, 0), -+ CHAN5G(132, 0), CHAN5G(136, 0), -+ CHAN5G(140, 0), CHAN5G(149, 0), -+ CHAN5G(153, 0), CHAN5G(157, 0), -+ CHAN5G(161, 0), CHAN5G(165, 0), -+ CHAN5G(184, 0), CHAN5G(188, 0), -+ CHAN5G(192, 0), CHAN5G(196, 0), -+ CHAN5G(200, 0), CHAN5G(204, 0), -+ CHAN5G(208, 0), CHAN5G(212, 0), -+ CHAN5G(216, 0), -+}; -+ -+ -+void rtw_2g_channels_init(struct ieee80211_channel *channels) -+{ -+ _rtw_memcpy((void*)channels, (void*)rtw_2ghz_channels, -+ sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM -+ ); -+} -+ -+void rtw_5g_channels_init(struct ieee80211_channel *channels) -+{ -+ _rtw_memcpy((void*)channels, (void*)rtw_5ghz_a_channels, -+ sizeof(struct ieee80211_channel)*RTW_5G_CHANNELS_NUM -+ ); -+} -+ -+void rtw_2g_rates_init(struct ieee80211_rate *rates) -+{ -+ _rtw_memcpy(rates, rtw_g_rates, -+ sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM -+ ); -+} -+ -+void rtw_5g_rates_init(struct ieee80211_rate *rates) -+{ -+ _rtw_memcpy(rates, rtw_a_rates, -+ sizeof(struct ieee80211_rate)*RTW_A_RATES_NUM -+ ); -+} -+ -+struct ieee80211_supported_band *rtw_spt_band_alloc( -+ enum nl80211_band band -+ ) -+{ -+ struct ieee80211_supported_band *spt_band = NULL; -+ int n_channels, n_bitrates; -+ -+ if(band == NL80211_BAND_2GHZ) -+ { -+ n_channels = RTW_2G_CHANNELS_NUM; -+ n_bitrates = RTW_G_RATES_NUM; -+ } -+ else if(band == NL80211_BAND_5GHZ) -+ { -+ n_channels = RTW_5G_CHANNELS_NUM; -+ n_bitrates = RTW_A_RATES_NUM; -+ } -+ else -+ { -+ goto exit; -+ } -+ -+ spt_band = (struct ieee80211_supported_band *)rtw_zmalloc( -+ sizeof(struct ieee80211_supported_band) -+ + sizeof(struct ieee80211_channel)*n_channels -+ + sizeof(struct ieee80211_rate)*n_bitrates -+ ); -+ if(!spt_band) -+ goto exit; -+ -+ spt_band->channels = (struct ieee80211_channel*)(((u8*)spt_band)+sizeof(struct ieee80211_supported_band)); -+ spt_band->bitrates= (struct ieee80211_rate*)(((u8*)spt_band->channels)+sizeof(struct ieee80211_channel)*n_channels); -+ spt_band->band = band; -+ spt_band->n_channels = n_channels; -+ spt_band->n_bitrates = n_bitrates; -+ -+ if(band == NL80211_BAND_2GHZ) -+ { -+ rtw_2g_channels_init(spt_band->channels); -+ rtw_2g_rates_init(spt_band->bitrates); -+ } -+ else if(band == NL80211_BAND_5GHZ) -+ { -+ rtw_5g_channels_init(spt_band->channels); -+ rtw_5g_rates_init(spt_band->bitrates); -+ } -+ -+ //spt_band.ht_cap -+ -+exit: -+ -+ return spt_band; -+} -+ -+void rtw_spt_band_free(struct ieee80211_supported_band *spt_band) -+{ -+ u32 size = 0; -+ -+ if(!spt_band) -+ return; -+ -+ if(spt_band->band == NL80211_BAND_2GHZ) -+ { -+ size = sizeof(struct ieee80211_supported_band) -+ + sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM -+ + sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM; -+ } -+ else if(spt_band->band == NL80211_BAND_5GHZ) -+ { -+ size = sizeof(struct ieee80211_supported_band) -+ + sizeof(struct ieee80211_channel)*RTW_5G_CHANNELS_NUM -+ + sizeof(struct ieee80211_rate)*RTW_A_RATES_NUM; -+ } -+ else -+ { -+ -+ } -+ rtw_mfree((u8*)spt_band, size); -+} -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+static const struct ieee80211_txrx_stypes -+rtw_cfg80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = { -+ [NL80211_IFTYPE_ADHOC] = { -+ .tx = 0xffff, -+ .rx = BIT(IEEE80211_STYPE_ACTION >> 4) -+ }, -+ [NL80211_IFTYPE_STATION] = { -+ .tx = 0xffff, -+ .rx = BIT(IEEE80211_STYPE_ACTION >> 4) | -+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) -+ }, -+ [NL80211_IFTYPE_AP] = { -+ .tx = 0xffff, -+ .rx = BIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | -+ BIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | -+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) | -+ BIT(IEEE80211_STYPE_DISASSOC >> 4) | -+ BIT(IEEE80211_STYPE_AUTH >> 4) | -+ BIT(IEEE80211_STYPE_DEAUTH >> 4) | -+ BIT(IEEE80211_STYPE_ACTION >> 4) -+ }, -+ [NL80211_IFTYPE_AP_VLAN] = { -+ /* copy AP */ -+ .tx = 0xffff, -+ .rx = BIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | -+ BIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | -+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) | -+ BIT(IEEE80211_STYPE_DISASSOC >> 4) | -+ BIT(IEEE80211_STYPE_AUTH >> 4) | -+ BIT(IEEE80211_STYPE_DEAUTH >> 4) | -+ BIT(IEEE80211_STYPE_ACTION >> 4) -+ }, -+ [NL80211_IFTYPE_P2P_CLIENT] = { -+ .tx = 0xffff, -+ .rx = BIT(IEEE80211_STYPE_ACTION >> 4) | -+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) -+ }, -+ [NL80211_IFTYPE_P2P_GO] = { -+ .tx = 0xffff, -+ .rx = BIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | -+ BIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | -+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) | -+ BIT(IEEE80211_STYPE_DISASSOC >> 4) | -+ BIT(IEEE80211_STYPE_AUTH >> 4) | -+ BIT(IEEE80211_STYPE_DEAUTH >> 4) | -+ BIT(IEEE80211_STYPE_ACTION >> 4) -+ }, -+}; -+#endif -+ -+static int rtw_ieee80211_channel_to_frequency(int chan, int band) -+{ -+ /* see 802.11 17.3.8.3.2 and Annex J -+ * there are overlapping channel numbers in 5GHz and 2GHz bands */ -+ -+ if (band == NL80211_BAND_5GHZ) { -+ if (chan >= 182 && chan <= 196) -+ return 4000 + chan * 5; -+ else -+ return 5000 + chan * 5; -+ } else { /* NL80211_BAND_2GHZ */ -+ if (chan == 14) -+ return 2484; -+ else if (chan < 14) -+ return 2407 + chan * 5; -+ else -+ return 0; /* not supported */ -+ } -+} -+ -+#define MAX_BSSINFO_LEN 1000 -+static int rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnetwork) -+{ -+ int ret=0; -+ struct ieee80211_channel *notify_channel; -+ struct cfg80211_bss *bss; -+ //struct ieee80211_supported_band *band; -+ u16 channel; -+ u32 freq; -+ u64 notify_timestamp; -+ u16 notify_capability; -+ u16 notify_interval; -+ u8 *notify_ie; -+ size_t notify_ielen; -+ s32 notify_signal; -+ u8 *buf, *pbuf; -+ size_t len,bssinf_len=0; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ -+ struct wireless_dev *wdev = padapter->rtw_wdev; -+ struct wiphy *wiphy = wdev->wiphy; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ -+ //DBG_8192C("%s\n", __func__); -+ -+ bssinf_len = pnetwork->network.IELength+sizeof (struct rtw_ieee80211_hdr_3addr); -+ if(bssinf_len > MAX_BSSINFO_LEN){ -+ DBG_871X("%s IE Length too long > %d byte \n",__FUNCTION__,MAX_BSSINFO_LEN); -+ goto exit; -+ } -+ -+ //To reduce PBC Overlap rate -+ //_enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL); -+ if(wdev_to_priv(wdev)->scan_request != NULL) -+ { -+ u8 *psr=NULL, sr = 0; -+ NDIS_802_11_SSID *pssid = &pnetwork->network.Ssid; -+ struct cfg80211_scan_request *request = wdev_to_priv(wdev)->scan_request; -+ struct cfg80211_ssid *ssids = request->ssids; -+ u32 wpsielen=0; -+ u8 *wpsie=NULL; -+ -+ wpsie = rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wpsielen); -+ -+ if(wpsie && wpsielen>0) -+ psr = rtw_get_wps_attr_content(wpsie, wpsielen, WPS_ATTR_SELECTED_REGISTRAR, (u8*)(&sr), NULL); -+ -+ if (sr != 0) -+ { -+ if(request->n_ssids == 1 && request->n_channels == 1) // it means under processing WPS -+ { -+ DBG_8192C("ssid=%s, len=%d\n", pssid->Ssid, pssid->SsidLength); -+ -+ if(pssid->SsidLength == ssids[0].ssid_len && -+ _rtw_memcmp(pssid->Ssid, ssids[0].ssid, ssids[0].ssid_len)) -+ { -+ DBG_871X("%s, got sr and ssid match!\n", __func__); -+ } -+ else -+ { -+ if(psr !=NULL) -+ *psr = 0; //clear sr -+ -+#if 0 -+ WLAN_BSSID_EX *pselect_network = &pnetwork->network; -+ struct cfg80211_bss *pselect_bss = NULL; -+ struct ieee80211_channel *notify_channel = NULL; -+ u32 freq; -+ -+ DBG_871X("%s, got sr, but ssid mismatch, to remove this bss\n", __func__); -+ -+ if (pselect_network->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, NL80211_BAND_5GHZ); -+ -+ notify_channel = ieee80211_get_channel(wiphy, freq); -+ pselect_bss = cfg80211_get_bss(wiphy, NULL/*notify_channel*/, -+ pselect_network->MacAddress, pselect_network->Ssid.Ssid, -+ pselect_network->Ssid.SsidLength, 0/*WLAN_CAPABILITY_ESS*/, -+ 0/*WLAN_CAPABILITY_ESS*/); -+ -+ if(pselect_bss) -+ { -+ DBG_871X("%s, got bss for cfg80211 for unlinking bss\n", __func__); -+ -+ cfg80211_unlink_bss(wiphy, pselect_bss); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) -+ cfg80211_put_bss(wiphy, pselect_bss); -+#else -+ cfg80211_put_bss(pselect_bss); -+#endif -+ -+ } -+ -+ goto exit; -+#endif -+ } -+ } -+ } -+ } -+ //_exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); -+ -+ channel = pnetwork->network.Configuration.DSConfig; -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+ notify_channel = ieee80211_get_channel(wiphy, freq); -+ -+ //rtw_get_timestampe_from_ie() -+ notify_timestamp = jiffies_to_msecs(jiffies)*1000; /* uSec */ -+ -+ notify_interval = le16_to_cpu(*(u16*)rtw_get_beacon_interval_from_ie(pnetwork->network.IEs)); -+ notify_capability = le16_to_cpu(*(u16*)rtw_get_capability_from_ie(pnetwork->network.IEs)); -+ -+ -+ notify_ie = pnetwork->network.IEs+_FIXED_IE_LENGTH_; -+ notify_ielen = pnetwork->network.IELength-_FIXED_IE_LENGTH_; -+ -+ //We've set wiphy's signal_type as CFG80211_SIGNAL_TYPE_MBM: signal strength in mBm (100*dBm) -+ if ( check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE && -+ is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network)) { -+ notify_signal = 100*translate_percentage_to_dbm(padapter->recvpriv.signal_strength);//dbm -+ } else { -+ notify_signal = 100*translate_percentage_to_dbm(pnetwork->network.PhyInfo.SignalStrength);//dbm -+ } -+ -+/* -+ DBG_8192C("bssid: %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n", -+ pnetwork->network.MacAddress[0], pnetwork->network.MacAddress[1], pnetwork->network.MacAddress[2], -+ pnetwork->network.MacAddress[3], pnetwork->network.MacAddress[4], pnetwork->network.MacAddress[5]); -+ DBG_8192C("Channel: %d(%d)\n", channel, freq); -+ DBG_8192C("Capability: %X\n", notify_capability); -+ DBG_8192C("Beacon interval: %d\n", notify_interval); -+ DBG_8192C("Signal: %d\n", notify_signal); -+ DBG_8192C("notify_timestamp: %#018llx\n", notify_timestamp); -+*/ -+ -+ buf = rtw_zmalloc(MAX_BSSINFO_LEN); -+ pbuf = buf; -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pbuf; -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/); -+ //pmlmeext->mgnt_seq++; -+ -+ if (pnetwork->network.Reserved[0] == 1) { // WIFI_BEACON -+ _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); -+ SetFrameSubType(pbuf, WIFI_BEACON); -+ } else { -+ _rtw_memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ SetFrameSubType(pbuf, WIFI_PROBERSP); -+ } -+ -+ _rtw_memcpy(pwlanhdr->addr2, pnetwork->network.MacAddress, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pnetwork->network.MacAddress, ETH_ALEN); -+ -+ -+ pbuf += sizeof(struct rtw_ieee80211_hdr_3addr); -+ len = sizeof (struct rtw_ieee80211_hdr_3addr); -+ -+ _rtw_memcpy(pbuf, pnetwork->network.IEs, pnetwork->network.IELength); -+ len += pnetwork->network.IELength; -+ -+ rtw_mfree(buf, MAX_BSSINFO_LEN); -+ -+ //#ifdef CONFIG_P2P -+ //if(rtw_get_p2p_ie(pnetwork->network.IEs+12, pnetwork->network.IELength-12, NULL, NULL)) -+ //{ -+ // DBG_8192C("%s, got p2p_ie\n", __func__); -+ //} -+ //#endif -+ -+ -+#if 1 -+ bss = cfg80211_inform_bss_frame(wiphy, notify_channel, (struct ieee80211_mgmt *)buf, -+ len, notify_signal, GFP_ATOMIC); -+#else -+ -+ bss = cfg80211_inform_bss(wiphy, notify_channel, (const u8 *)pnetwork->network.MacAddress, -+ notify_timestamp, notify_capability, notify_interval, notify_ie, -+ notify_ielen, notify_signal, GFP_ATOMIC/*GFP_KERNEL*/); -+#endif -+ -+ if (unlikely(!bss)) { -+ DBG_8192C("rtw_cfg80211_inform_bss error\n"); -+ return -EINVAL; -+ } -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)) -+#ifndef COMPAT_KERNEL_RELEASE -+ //patch for cfg80211, update beacon ies to information_elements -+ if (pnetwork->network.Reserved[0] == 1) { // WIFI_BEACON -+ -+ if(bss->len_information_elements != bss->len_beacon_ies) -+ { -+ bss->information_elements = bss->beacon_ies; -+ bss->len_information_elements = bss->len_beacon_ies; -+ } -+ } -+#endif //COMPAT_KERNEL_RELEASE -+#endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) -+ -+/* -+ { -+ if( bss->information_elements == bss->proberesp_ies) -+ { -+ if( bss->len_information_elements != bss->len_proberesp_ies) -+ { -+ DBG_8192C("error!, len_information_elements != bss->len_proberesp_ies\n"); -+ } -+ -+ } -+ else if(bss->len_information_elements < bss->len_beacon_ies) -+ { -+ bss->information_elements = bss->beacon_ies; -+ bss->len_information_elements = bss->len_beacon_ies; -+ } -+ } -+*/ -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) -+ cfg80211_put_bss(wiphy, bss); -+#else -+ cfg80211_put_bss(bss); -+#endif -+ -+exit: -+ return ret; -+ -+} -+ -+/* -+ Check the given bss is valid by kernel API cfg80211_get_bss() -+ @padapter : the given adapter -+ -+ return _TRUE if bss is valid, _FALSE for not found. -+*/ -+int rtw_cfg80211_check_bss(_adapter *padapter) -+{ -+ WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); -+ struct cfg80211_bss *bss = NULL; -+ struct ieee80211_channel *notify_channel = NULL; -+ u32 freq; -+ -+ if (!(pnetwork) || !(padapter->rtw_wdev)) -+ return _FALSE; -+ -+ if (pnetwork->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_5GHZ); -+ -+ notify_channel = ieee80211_get_channel(padapter->rtw_wdev->wiphy, freq); -+ bss = cfg80211_get_bss(padapter->rtw_wdev->wiphy, notify_channel, -+ pnetwork->MacAddress, pnetwork->Ssid.Ssid, -+ pnetwork->Ssid.SsidLength, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) -+ WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); -+#else -+ IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY); -+#endif -+ -+ return (bss!=NULL); -+} -+ -+void rtw_cfg80211_indicate_connect(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ struct wireless_dev *pwdev = padapter->rtw_wdev; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif -+ struct cfg80211_bss *bss = NULL; -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ if (pwdev->iftype != NL80211_IFTYPE_STATION -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ && pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT -+ #endif -+ ) { -+ return; -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ return; -+ -+#ifdef CONFIG_P2P -+ if(pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ DBG_8192C("%s, role=%d, p2p_state=%d, pre_p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), rtw_p2p_pre_state(pwdinfo)); -+ } -+ } -+#endif //CONFIG_P2P -+ -+ #ifdef CONFIG_LAYER2_ROAMING -+ if (rtw_to_roaming(padapter) > 0) { -+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) -+ struct wiphy *wiphy = pwdev->wiphy; -+ struct ieee80211_channel *notify_channel; -+ u32 freq; -+ u16 channel = cur_network->network.Configuration.DSConfig; -+ -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+ notify_channel = ieee80211_get_channel(wiphy, freq); -+ #endif -+ -+ DBG_871X("%s call cfg80211_roamed\n", __FUNCTION__); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ { -+ struct cfg80211_roam_info roam_info = { -+ .channel = notify_channel, -+ .bssid = cur_network->network.MacAddress, -+ .req_ie = pmlmepriv->assoc_req+sizeof(struct rtw_ieee80211_hdr_3addr)+2, -+ .req_ie_len = pmlmepriv->assoc_req_len-sizeof(struct rtw_ieee80211_hdr_3addr)-2, -+ .resp_ie = pmlmepriv->assoc_rsp+sizeof(struct rtw_ieee80211_hdr_3addr)+6, -+ .resp_ie_len = pmlmepriv->assoc_rsp_len-sizeof(struct rtw_ieee80211_hdr_3addr)-6, -+ }; -+ cfg80211_roamed(padapter->pnetdev, &roam_info, GFP_ATOMIC); -+ } -+ #else -+ cfg80211_roamed(padapter->pnetdev -+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) -+ , notify_channel -+ #endif -+ , cur_network->network.MacAddress -+ , pmlmepriv->assoc_req+sizeof(struct rtw_ieee80211_hdr_3addr)+2 -+ , pmlmepriv->assoc_req_len-sizeof(struct rtw_ieee80211_hdr_3addr)-2 -+ , pmlmepriv->assoc_rsp+sizeof(struct rtw_ieee80211_hdr_3addr)+6 -+ , pmlmepriv->assoc_rsp_len-sizeof(struct rtw_ieee80211_hdr_3addr)-6 -+ , GFP_ATOMIC); -+ #endif -+ } -+ else -+ #endif -+ { -+ DBG_8192C("pwdev->sme_state(b)=%d\n", pwdev->sme_state); -+ cfg80211_connect_result(padapter->pnetdev, cur_network->network.MacAddress -+ , pmlmepriv->assoc_req+sizeof(struct rtw_ieee80211_hdr_3addr)+2 -+ , pmlmepriv->assoc_req_len-sizeof(struct rtw_ieee80211_hdr_3addr)-2 -+ , pmlmepriv->assoc_rsp+sizeof(struct rtw_ieee80211_hdr_3addr)+6 -+ , pmlmepriv->assoc_rsp_len-sizeof(struct rtw_ieee80211_hdr_3addr)-6 -+ , WLAN_STATUS_SUCCESS, GFP_ATOMIC); -+ DBG_8192C("pwdev->sme_state(a)=%d\n", pwdev->sme_state); -+ } -+} -+ -+void rtw_cfg80211_indicate_disconnect(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct wireless_dev *pwdev = padapter->rtw_wdev; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ -+ if (pwdev->iftype != NL80211_IFTYPE_STATION -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ && pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT -+ #endif -+ ) { -+ return; -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ return; -+ -+#ifdef CONFIG_P2P -+ if( pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ _cancel_timer_ex( &pwdinfo->find_phase_timer ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ _cancel_timer_ex( &pwdinfo->pre_tx_scan_timer); -+ -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ -+ DBG_8192C("%s, role=%d, p2p_state=%d, pre_p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), rtw_p2p_pre_state(pwdinfo)); -+ } -+ } -+#endif //CONFIG_P2P -+ -+ if (!padapter->mlmepriv.not_indic_disco) { -+ DBG_8192C("pwdev->sme_state(b)=%d\n", pwdev->sme_state); -+ -+ if (check_fwstate(pmlmepriv, WIFI_UNDER_LINKING)) { -+ cfg80211_connect_result(padapter->pnetdev, NULL, NULL, 0, NULL, 0, -+ WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_ATOMIC/*GFP_KERNEL*/); -+ } else { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) -+ cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, GFP_ATOMIC); -+#else -+ cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, false, GFP_ATOMIC); -+#endif -+ } -+ -+ DBG_8192C("pwdev->sme_state(a)=%d\n", pwdev->sme_state); -+ } -+} -+ -+ -+#ifdef CONFIG_AP_MODE -+static u8 set_pairwise_key(_adapter *padapter, struct sta_info *psta) -+{ -+ struct cmd_obj* ph2c; -+ struct set_stakey_parm *psetstakey_para; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if ( ph2c == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm)); -+ if(psetstakey_para==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_); -+ -+ -+ psetstakey_para->algorithm = (u8)psta->dot118021XPrivacy; -+ -+ _rtw_memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN); -+ -+ _rtw_memcpy(psetstakey_para->key, &psta->dot118021x_UncstKey, 16); -+ -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+ return res; -+ -+} -+ -+static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) -+{ -+ u8 keylen; -+ struct cmd_obj* pcmd; -+ struct setkey_parm *psetkeyparm; -+ struct cmd_priv *pcmdpriv=&(padapter->cmdpriv); -+ int res=_SUCCESS; -+ -+ DBG_8192C("%s\n", __FUNCTION__); -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm)); -+ if(psetkeyparm==NULL){ -+ rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memset(psetkeyparm, 0, sizeof(struct setkey_parm)); -+ -+ psetkeyparm->keyid=(u8)keyid; -+ if (is_wep_enc(alg)) -+ padapter->securitypriv.key_mask |= BIT(psetkeyparm->keyid); -+ -+ psetkeyparm->algorithm = alg; -+ -+ psetkeyparm->set_tx = 1; -+ -+ switch(alg) -+ { -+ case _WEP40_: -+ keylen = 5; -+ break; -+ case _WEP104_: -+ keylen = 13; -+ break; -+ case _TKIP_: -+ case _TKIP_WTMIC_: -+ case _AES_: -+ keylen = 16; -+ break; -+ default: -+ keylen = 16; -+ } -+ -+ _rtw_memcpy(&(psetkeyparm->key[0]), key, keylen); -+ -+ pcmd->cmdcode = _SetKey_CMD_; -+ pcmd->parmbuf = (u8 *)psetkeyparm; -+ pcmd->cmdsz = (sizeof(struct setkey_parm)); -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ -+ _rtw_init_listhead(&pcmd->list); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+ -+ return res; -+ -+ -+} -+ -+static int set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid) -+{ -+ u8 alg; -+ -+ switch(keylen) -+ { -+ case 5: -+ alg =_WEP40_; -+ break; -+ case 13: -+ alg =_WEP104_; -+ break; -+ default: -+ alg =_NO_PRIVACY_; -+ } -+ -+ return set_group_key(padapter, key, alg, keyid); -+ -+} -+ -+static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len) -+{ -+ int ret = 0; -+ u32 wep_key_idx, wep_key_len,wep_total_len; -+ struct sta_info *psta = NULL, *pbcmc_sta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_8192C("%s\n", __FUNCTION__); -+ -+ param->u.crypt.err = 0; -+ param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; -+ -+ //sizeof(struct ieee_param) = 64 bytes; -+ //if (param_len != (u32) ((u8 *) param->u.crypt.key - (u8 *) param) + param->u.crypt.key_len) -+ if (param_len != sizeof(struct ieee_param) + param->u.crypt.key_len) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ if (param->u.crypt.idx >= WEP_KEYS) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ } -+ else -+ { -+ psta = rtw_get_stainfo(pstapriv, param->sta_addr); -+ if(!psta) -+ { -+ //ret = -EINVAL; -+ DBG_8192C("rtw_set_encryption(), sta has already been removed or never been added\n"); -+ goto exit; -+ } -+ } -+ -+ if (strcmp(param->u.crypt.alg, "none") == 0 && (psta==NULL)) -+ { -+ //todo:clear default encryption keys -+ -+ DBG_8192C("clear default encryption keys, keyid=%d\n", param->u.crypt.idx); -+ -+ goto exit; -+ } -+ -+ -+ if (strcmp(param->u.crypt.alg, "WEP") == 0 && (psta==NULL)) -+ { -+ DBG_8192C("r871x_set_encryption, crypt.alg = WEP\n"); -+ -+ wep_key_idx = param->u.crypt.idx; -+ wep_key_len = param->u.crypt.key_len; -+ -+ DBG_8192C("r871x_set_encryption, wep_key_idx=%d, len=%d\n", wep_key_idx, wep_key_len); -+ -+ if((wep_key_idx >= WEP_KEYS) || (wep_key_len<=0)) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (wep_key_len > 0) -+ { -+ wep_key_len = wep_key_len <= 5 ? 5 : 13; -+ } -+ -+ if (psecuritypriv->bWepDefaultKeyIdxSet == 0) -+ { -+ //wep default key has not been set, so use this key index as default key. -+ -+ psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ psecuritypriv->dot11PrivacyAlgrthm=_WEP40_; -+ psecuritypriv->dot118021XGrpPrivacy=_WEP40_; -+ -+ if(wep_key_len == 13) -+ { -+ psecuritypriv->dot11PrivacyAlgrthm=_WEP104_; -+ psecuritypriv->dot118021XGrpPrivacy=_WEP104_; -+ } -+ -+ psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; -+ } -+ -+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); -+ -+ psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; -+ -+ set_wep_key(padapter, param->u.crypt.key, wep_key_len, wep_key_idx); -+ -+ goto exit; -+ -+ } -+ -+ -+ if(!psta && check_fwstate(pmlmepriv, WIFI_AP_STATE)) // //group key -+ { -+ if(param->u.crypt.set_tx == 0) //group key -+ { -+ if(strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ DBG_8192C("%s, set group_key, WEP\n", __FUNCTION__); -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -+ if(param->u.crypt.key_len==13) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _WEP104_; -+ } -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "TKIP") == 0) -+ { -+ DBG_8192C("%s, set group_key, TKIP\n", __FUNCTION__); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _TKIP_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); -+ //set mic key -+ _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); -+ -+ psecuritypriv->busetkipkey = _TRUE; -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ DBG_8192C("%s, set group_key, CCMP\n", __FUNCTION__); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _AES_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ } -+ else -+ { -+ DBG_8192C("%s, set group_key, none\n", __FUNCTION__); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ } -+ -+ psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; -+ -+ psecuritypriv->binstallGrpkey = _TRUE; -+ -+ psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! -+ -+ set_group_key(padapter, param->u.crypt.key, psecuritypriv->dot118021XGrpPrivacy, param->u.crypt.idx); -+ -+ pbcmc_sta=rtw_get_bcmc_stainfo(padapter); -+ if(pbcmc_sta) -+ { -+ pbcmc_sta->ieee8021x_blocked = _FALSE; -+ pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy -+ } -+ -+ } -+ -+ goto exit; -+ -+ } -+ -+ if(psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && psta) // psk/802_1x -+ { -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) -+ { -+ if(param->u.crypt.set_tx ==1) //pairwise key -+ { -+ _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ if(strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ DBG_8192C("%s, set pairwise key, WEP\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _WEP40_; -+ if(param->u.crypt.key_len==13) -+ { -+ psta->dot118021XPrivacy = _WEP104_; -+ } -+ } -+ else if(strcmp(param->u.crypt.alg, "TKIP") == 0) -+ { -+ DBG_8192C("%s, set pairwise key, TKIP\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _TKIP_; -+ -+ //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); -+ //set mic key -+ _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); -+ -+ psecuritypriv->busetkipkey = _TRUE; -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ -+ DBG_8192C("%s, set pairwise key, CCMP\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _AES_; -+ } -+ else -+ { -+ DBG_8192C("%s, set pairwise key, none\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _NO_PRIVACY_; -+ } -+ -+ set_pairwise_key(padapter, psta); -+ -+ psta->ieee8021x_blocked = _FALSE; -+ -+ psta->bpairwise_key_installed = _TRUE; -+ -+ } -+ else//group key??? -+ { -+ if(strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -+ if(param->u.crypt.key_len==13) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _WEP104_; -+ } -+ } -+ else if(strcmp(param->u.crypt.alg, "TKIP") == 0) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _TKIP_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); -+ //set mic key -+ _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); -+ -+ psecuritypriv->busetkipkey = _TRUE; -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _AES_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ } -+ else -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ } -+ -+ psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; -+ -+ psecuritypriv->binstallGrpkey = _TRUE; -+ -+ psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! -+ -+ set_group_key(padapter, param->u.crypt.key, psecuritypriv->dot118021XGrpPrivacy, param->u.crypt.idx); -+ -+ pbcmc_sta=rtw_get_bcmc_stainfo(padapter); -+ if(pbcmc_sta) -+ { -+ pbcmc_sta->ieee8021x_blocked = _FALSE; -+ pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy -+ } -+ -+ } -+ -+ } -+ -+ } -+ -+exit: -+ -+ return ret; -+ -+} -+#endif -+ -+static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len) -+{ -+ int ret = 0; -+ u32 wep_key_idx, wep_key_len,wep_total_len; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ -+_func_enter_; -+ -+ DBG_8192C("%s\n", __func__); -+ -+ param->u.crypt.err = 0; -+ param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; -+ -+ if (param_len < (u32) ((u8 *) param->u.crypt.key - (u8 *) param) + param->u.crypt.key_len) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ if (param->u.crypt.idx >= WEP_KEYS -+#ifdef CONFIG_IEEE80211W -+ && param->u.crypt.idx > BIP_MAX_KEYID -+#endif //CONFIG_IEEE80211W -+ ) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ } else { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("wpa_set_encryption, crypt.alg = WEP\n")); -+ DBG_8192C("wpa_set_encryption, crypt.alg = WEP\n"); -+ -+ wep_key_idx = param->u.crypt.idx; -+ wep_key_len = param->u.crypt.key_len; -+ -+ if ((wep_key_idx > WEP_KEYS) || (wep_key_len <= 0)) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (psecuritypriv->bWepDefaultKeyIdxSet == 0) -+ { -+ //wep default key has not been set, so use this key index as default key. -+ -+ wep_key_len = wep_key_len <= 5 ? 5 : 13; -+ -+ psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; -+ psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -+ -+ if(wep_key_len==13) -+ { -+ psecuritypriv->dot11PrivacyAlgrthm = _WEP104_; -+ psecuritypriv->dot118021XGrpPrivacy = _WEP104_; -+ } -+ -+ psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; -+ } -+ -+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); -+ -+ psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; -+ -+ rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0); -+ -+ goto exit; -+ } -+ -+ if(padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) // 802_1x -+ { -+ struct sta_info * psta,*pbcmc_sta; -+ struct sta_priv * pstapriv = &padapter->stapriv; -+ -+ //DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X \n", __func__); -+ -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == _TRUE) //sta mode -+ { -+ psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); -+ if (psta == NULL) { -+ //DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); -+ DBG_8192C("%s, : Obtain Sta_info fail \n", __func__); -+ } -+ else -+ { -+ //Jeff: don't disable ieee8021x_blocked while clearing key -+ if (strcmp(param->u.crypt.alg, "none") != 0) -+ psta->ieee8021x_blocked = _FALSE; -+ -+ -+ if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| -+ (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) -+ { -+ psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; -+ } -+ -+ if(param->u.crypt.set_tx ==1)//pairwise key -+ { -+ -+ DBG_8192C("%s, : param->u.crypt.set_tx ==1 \n", __func__); -+ -+ _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ if(strcmp(param->u.crypt.alg, "TKIP") == 0)//set mic key -+ { -+ //DEBUG_ERR(("\nset key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); -+ _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); -+ -+ padapter->securitypriv.busetkipkey=_FALSE; -+ //_set_timer(&padapter->securitypriv.tkip_timer, 50); -+ } -+ -+ //DEBUG_ERR((" param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); -+ DBG_871X(" ~~~~set sta key:unicastkey\n"); -+ -+ rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE); -+ } -+ else//group key -+ { -+ if(strcmp(param->u.crypt.alg, "TKIP") == 0 || strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ _rtw_memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ _rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); -+ _rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); -+ padapter->securitypriv.binstallGrpkey = _TRUE; -+ //DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); -+ DBG_871X(" ~~~~set sta key:groupkey\n"); -+ -+ padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx; -+ -+ rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1); -+ } -+#ifdef CONFIG_IEEE80211W -+ else if(strcmp(param->u.crypt.alg, "BIP") == 0) -+ { -+ int no; -+ //DBG_871X("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); -+ //save the IGTK key, length 16 bytes -+ _rtw_memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ /*DBG_871X("IGTK key below:\n"); -+ for(no=0;no<16;no++) -+ printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); -+ DBG_871X("\n");*/ -+ padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx; -+ padapter->securitypriv.binstallBIPkey = _TRUE; -+ DBG_871X(" ~~~~set sta key:IGKT\n"); -+ } -+#endif //CONFIG_IEEE80211W -+ -+#ifdef CONFIG_P2P -+ if(pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING)) -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_PROVISIONING_DONE); -+ } -+ } -+#endif //CONFIG_P2P -+ -+ } -+ } -+ -+ pbcmc_sta=rtw_get_bcmc_stainfo(padapter); -+ if(pbcmc_sta==NULL) -+ { -+ //DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null \n")); -+ } -+ else -+ { -+ //Jeff: don't disable ieee8021x_blocked while clearing key -+ if (strcmp(param->u.crypt.alg, "none") != 0) -+ pbcmc_sta->ieee8021x_blocked = _FALSE; -+ -+ if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| -+ (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) -+ { -+ pbcmc_sta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; -+ } -+ } -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) //adhoc mode -+ { -+ } -+ } -+ -+exit: -+ -+ DBG_8192C("%s, ret=%d\n", __func__, ret); -+ -+ _func_exit_; -+ -+ return ret; -+} -+ -+static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ u8 key_index, bool pairwise, const u8 *mac_addr, -+#else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ u8 key_index, const u8 *mac_addr, -+#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ struct key_params *params) -+{ -+ char *alg_name; -+ u32 param_len; -+ struct ieee_param *param = NULL; -+ int ret=0; -+ struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy); -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ DBG_871X(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr); -+ DBG_871X("cipher=0x%x\n", params->cipher); -+ DBG_871X("key_len=0x%x\n", params->key_len); -+ DBG_871X("seq_len=0x%x\n", params->seq_len); -+ DBG_871X("key_index=%d\n", key_index); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ DBG_871X("pairwise=%d\n", pairwise); -+#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ -+ param_len = sizeof(struct ieee_param) + params->key_len; -+ param = (struct ieee_param *)rtw_malloc(param_len); -+ if (param == NULL) -+ return -1; -+ -+ _rtw_memset(param, 0, param_len); -+ -+ param->cmd = IEEE_CMD_SET_ENCRYPTION; -+ _rtw_memset(param->sta_addr, 0xff, ETH_ALEN); -+ -+ switch (params->cipher) { -+ case IW_AUTH_CIPHER_NONE: -+ //todo: remove key -+ //remove = 1; -+ alg_name = "none"; -+ break; -+ case WLAN_CIPHER_SUITE_WEP40: -+ case WLAN_CIPHER_SUITE_WEP104: -+ alg_name = "WEP"; -+ break; -+ case WLAN_CIPHER_SUITE_TKIP: -+ alg_name = "TKIP"; -+ break; -+ case WLAN_CIPHER_SUITE_CCMP: -+ alg_name = "CCMP"; -+ break; -+#ifdef CONFIG_IEEE80211W -+ case WLAN_CIPHER_SUITE_AES_CMAC: -+ alg_name = "BIP"; -+ break; -+#endif //CONFIG_IEEE80211W -+ default: -+ return -ENOTSUPP; -+ } -+ -+ strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN); -+ -+ -+ if (!mac_addr || is_broadcast_ether_addr(mac_addr)) -+ { -+ param->u.crypt.set_tx = 0; //for wpa/wpa2 group key -+ } else { -+ param->u.crypt.set_tx = 1; //for wpa/wpa2 pairwise key -+ } -+ -+ -+ //param->u.crypt.idx = key_index - 1; -+ param->u.crypt.idx = key_index; -+ -+ if (params->seq_len && params->seq) -+ { -+ _rtw_memcpy(param->u.crypt.seq, params->seq, params->seq_len); -+ } -+ -+ if(params->key_len && params->key) -+ { -+ param->u.crypt.key_len = params->key_len; -+ _rtw_memcpy(param->u.crypt.key, params->key, params->key_len); -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ ret = rtw_cfg80211_set_encryption(ndev, param, param_len); -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+#ifdef CONFIG_AP_MODE -+ if(mac_addr) -+ _rtw_memcpy(param->sta_addr, (void*)mac_addr, ETH_ALEN); -+ -+ ret = rtw_cfg80211_ap_set_encryption(ndev, param, param_len); -+#endif -+ } -+ else -+ { -+ DBG_8192C("error! fw_state=0x%x, iftype=%d\n", pmlmepriv->fw_state, rtw_wdev->iftype); -+ -+ } -+ -+ if(param) -+ { -+ rtw_mfree((u8*)param, param_len); -+ } -+ -+ return ret; -+ -+} -+ -+static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ u8 key_index, bool pairwise, const u8 *mac_addr, -+#else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ u8 key_index, const u8 *mac_addr, -+#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ void *cookie, -+ void (*callback)(void *cookie, -+ struct key_params*)) -+{ -+#if 0 -+ struct iwm_priv *iwm = ndev_to_iwm(ndev); -+ struct iwm_key *key = &iwm->keys[key_index]; -+ struct key_params params; -+ -+ IWM_DBG_WEXT(iwm, DBG, "Getting key %d\n", key_index); -+ -+ memset(¶ms, 0, sizeof(params)); -+ -+ params.cipher = key->cipher; -+ params.key_len = key->key_len; -+ params.seq_len = key->seq_len; -+ params.seq = key->seq; -+ params.key = key->key; -+ -+ callback(cookie, ¶ms); -+ -+ return key->key_len ? 0 : -ENOENT; -+#endif -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ return 0; -+} -+ -+static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ u8 key_index, bool pairwise, const u8 *mac_addr) -+#else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ u8 key_index, const u8 *mac_addr) -+#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index); -+ -+ if (key_index == psecuritypriv->dot11PrivacyKeyIndex) -+ { -+ //clear the flag of wep default key set. -+ psecuritypriv->bWepDefaultKeyIdxSet = 0; -+ } -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, -+ struct net_device *ndev, u8 key_index -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ , bool unicast, bool multicast -+ #endif -+ ) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ DBG_871X(FUNC_NDEV_FMT" key_index=%d" -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ ", unicast=%d, multicast=%d" -+ #endif -+ ".\n", FUNC_NDEV_ARG(ndev), key_index -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ , unicast, multicast -+ #endif -+ ); -+ -+ if ((key_index < WEP_KEYS) && ((psecuritypriv->dot11PrivacyAlgrthm == _WEP40_) || (psecuritypriv->dot11PrivacyAlgrthm == _WEP104_))) //set wep default key -+ { -+ psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ -+ psecuritypriv->dot11PrivacyKeyIndex = key_index; -+ -+ psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; -+ psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -+ if (psecuritypriv->dot11DefKeylen[key_index] == 13) -+ { -+ psecuritypriv->dot11PrivacyAlgrthm = _WEP104_; -+ psecuritypriv->dot118021XGrpPrivacy = _WEP104_; -+ } -+ -+ psecuritypriv->bWepDefaultKeyIdxSet = 1; //set the flag to represent that wep default key has been set -+ } -+ -+ return 0; -+ -+} -+ -+static int cfg80211_rtw_get_station(struct wiphy *wiphy, -+ struct net_device *ndev, -+ const u8 *mac, struct station_info *sinfo) -+{ -+ int ret = 0; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ sinfo->filled = 0; -+ -+ if (!mac) { -+ DBG_871X(FUNC_NDEV_FMT" mac==%p\n", FUNC_NDEV_ARG(ndev), mac); -+ ret = -ENOENT; -+ goto exit; -+ } -+ -+ psta = rtw_get_stainfo(pstapriv, mac); -+ if (psta == NULL) { -+ DBG_8192C("%s, sta_info is null\n", __func__); -+ ret = -ENOENT; -+ goto exit; -+ } -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac)); -+#endif -+ -+ //for infra./P2PClient mode -+ if( check_fwstate(pmlmepriv, WIFI_STATION_STATE) -+ && check_fwstate(pmlmepriv, _FW_LINKED) -+ ) -+ { -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ -+ if (_rtw_memcmp(mac, cur_network->network.MacAddress, ETH_ALEN) == _FALSE) { -+ DBG_871X("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress)); -+ ret = -ENOENT; -+ goto exit; -+ } -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)) -+ sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); -+#else -+ sinfo->filled |= STATION_INFO_SIGNAL; -+#endif -+ sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)) -+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); -+#else -+ sinfo->filled |= STATION_INFO_TX_BITRATE; -+#endif -+ sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)) -+ sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); -+#else -+ sinfo->filled |= STATION_INFO_RX_PACKETS; -+#endif -+ sinfo->rx_packets = sta_rx_data_pkts(psta); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)) -+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); -+#else -+ sinfo->filled |= STATION_INFO_TX_PACKETS; -+#endif -+ sinfo->tx_packets = psta->sta_stats.tx_pkts; -+ -+ } -+ -+ //for Ad-Hoc/AP mode -+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) -+ ||check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) -+ ||check_fwstate(pmlmepriv, WIFI_AP_STATE)) -+ && check_fwstate(pmlmepriv, _FW_LINKED) -+ ) -+ { -+ //TODO: should acquire station info... -+ } -+ -+exit: -+ return ret; -+} -+ -+extern int netdev_open(struct net_device *pnetdev); -+#ifdef CONFIG_CONCURRENT_MODE -+extern int netdev_if2_open(struct net_device *pnetdev); -+#endif -+ -+/* -+enum nl80211_iftype { -+ NL80211_IFTYPE_UNSPECIFIED, -+ NL80211_IFTYPE_ADHOC, //1 -+ NL80211_IFTYPE_STATION, //2 -+ NL80211_IFTYPE_AP, //3 -+ NL80211_IFTYPE_AP_VLAN, -+ NL80211_IFTYPE_WDS, -+ NL80211_IFTYPE_MONITOR, //6 -+ NL80211_IFTYPE_MESH_POINT, -+ NL80211_IFTYPE_P2P_CLIENT, //8 -+ NL80211_IFTYPE_P2P_GO, //9 -+ //keep last -+ NUM_NL80211_IFTYPES, -+ NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1 -+}; -+*/ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+static int cfg80211_rtw_change_iface(struct wiphy *wiphy, -+ struct net_device *ndev, -+ enum nl80211_iftype type, -+ struct vif_params *params) -+#else -+static int cfg80211_rtw_change_iface(struct wiphy *wiphy, -+ struct net_device *ndev, -+ enum nl80211_iftype type, u32 *flags, -+ struct vif_params *params) -+#endif -+{ -+ enum nl80211_iftype old_type; -+ NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _queue *queue = &pmlmepriv->scanned_queue; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif -+ int ret = 0; -+ u8 change = _FALSE; -+ -+ if (adapter_to_dvobj(padapter)->processing_dev_remove == _TRUE) { -+ ret= -EPERM; -+ goto exit; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->adapter_type == SECONDARY_ADAPTER) -+ { -+ DBG_871X(FUNC_NDEV_FMT" call netdev_if2_open\n", FUNC_NDEV_ARG(ndev)); -+ if(netdev_if2_open(ndev) != 0) { -+ ret= -EPERM; -+ goto exit; -+ } -+ } -+ else if(padapter->adapter_type == PRIMARY_ADAPTER) -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ DBG_871X(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev)); -+ if(netdev_open(ndev) != 0) { -+ ret= -EPERM; -+ goto exit; -+ } -+ } -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) { -+ ret= -EPERM; -+ goto exit; -+ } -+ -+ old_type = rtw_wdev->iftype; -+ DBG_871X(FUNC_NDEV_FMT" old_iftype=%d, new_iftype=%d\n", -+ FUNC_NDEV_ARG(ndev), old_type, type); -+ -+ if(old_type != type) -+ { -+ change = _TRUE; -+ pmlmeext->action_public_rxseq = 0xffff; -+ pmlmeext->action_public_dialog_token = 0xff; -+ } -+ -+ switch (type) { -+ case NL80211_IFTYPE_ADHOC: -+ networkType = Ndis802_11IBSS; -+ break; -+#if defined(CONFIG_P2P) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)) -+ case NL80211_IFTYPE_P2P_CLIENT: -+#endif -+ case NL80211_IFTYPE_STATION: -+ networkType = Ndis802_11Infrastructure; -+ #ifdef CONFIG_P2P -+ if(pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(change && rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ _cancel_timer_ex( &pwdinfo->find_phase_timer ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ _cancel_timer_ex( &pwdinfo->pre_tx_scan_timer); -+ -+ //it means remove GO and change mode from AP(GO) to station(P2P DEVICE) -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+ -+ DBG_8192C("%s, role=%d, p2p_state=%d, pre_p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), rtw_p2p_pre_state(pwdinfo)); -+ } -+ } -+ #endif //CONFIG_P2P -+ break; -+#if defined(CONFIG_P2P) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)) -+ case NL80211_IFTYPE_P2P_GO: -+#endif -+ case NL80211_IFTYPE_AP: -+ networkType = Ndis802_11APMode; -+ #ifdef CONFIG_P2P -+ if(pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(change && !rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ //it means P2P Group created, we will be GO and change mode from P2P DEVICE to AP(GO) -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ } -+ } -+ #endif //CONFIG_P2P -+ break; -+ default: -+ return -EOPNOTSUPP; -+ } -+ -+ rtw_wdev->iftype = type; -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _enter_critical_bh(&queue->lock, &irqL); -+ -+ if (rtw_set_802_11_infrastructure_mode(padapter, networkType) ==_FALSE) -+ { -+ rtw_wdev->iftype = old_type; -+ ret = -EPERM; -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ goto exit; -+ } -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ rtw_setopmode_cmd(padapter, networkType); -+ -+exit: -+ -+ return ret; -+} -+ -+void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool aborted) -+{ -+ _irqL irqL; -+ -+ _enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL); -+ if(pwdev_priv->scan_request != NULL) -+ { -+ //struct cfg80211_scan_request *scan_request = pwdev_priv->scan_request; -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("%s with scan req\n", __FUNCTION__); -+ #endif -+ -+ //avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); -+ //if(scan_request == wiphy_to_dev(scan_request->wiphy)->scan_req) -+ if(pwdev_priv->scan_request->wiphy != pwdev_priv->rtw_wdev->wiphy) -+ { -+ DBG_8192C("error wiphy compare\n"); -+ } -+ else -+ { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+ cfg80211_scan_done(pwdev_priv->scan_request, aborted); -+#else -+ struct cfg80211_scan_info info = { -+ .aborted = aborted -+ }; -+ cfg80211_scan_done(pwdev_priv->scan_request, &info); -+#endif -+ } -+ -+ pwdev_priv->scan_request = NULL; -+ -+ } else { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("%s without scan req\n", __FUNCTION__); -+ #endif -+ } -+ _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); -+} -+ -+void rtw_cfg80211_surveydone_event_callback(_adapter *padapter) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u32 cnt=0; -+ u32 wait_for_surveydone; -+ sint wait_status; -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s\n", __func__); -+#endif -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ //report network only if the current channel set contains the channel to which this network belongs -+ if(rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0 -+ && rtw_mlme_band_check(padapter, pnetwork->network.Configuration.DSConfig) == _TRUE -+ && _TRUE == rtw_validate_ssid(&(pnetwork->network.Ssid)) -+ ) -+ { -+ //ev=translate_scan(padapter, a, pnetwork, ev, stop); -+ rtw_cfg80211_inform_bss(padapter, pnetwork); -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ //call this after other things have been done -+ rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), _FALSE); -+} -+ -+static int rtw_cfg80211_set_probe_req_wpsp2pie(_adapter *padapter, char *buf, int len) -+{ -+ int ret = 0; -+ uint wps_ielen = 0; -+ u8 *wps_ie; -+ u32 p2p_ielen = 0; -+ u8 *p2p_ie; -+ u32 wfd_ielen = 0; -+ u8 *wfd_ie; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, ielen=%d\n", __func__, len); -+#endif -+ -+ if(len>0) -+ { -+ if((wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen))) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("probe_req_wps_ielen=%d\n", wps_ielen); -+ #endif -+ -+ if(pmlmepriv->wps_probe_req_ie) -+ { -+ u32 free_len = pmlmepriv->wps_probe_req_ie_len; -+ pmlmepriv->wps_probe_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->wps_probe_req_ie, free_len); -+ pmlmepriv->wps_probe_req_ie = NULL; -+ } -+ -+ pmlmepriv->wps_probe_req_ie = rtw_malloc(wps_ielen); -+ if ( pmlmepriv->wps_probe_req_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ _rtw_memcpy(pmlmepriv->wps_probe_req_ie, wps_ie, wps_ielen); -+ pmlmepriv->wps_probe_req_ie_len = wps_ielen; -+ } -+ -+ //buf += wps_ielen; -+ //len -= wps_ielen; -+ -+ #ifdef CONFIG_P2P -+ if((p2p_ie=rtw_get_p2p_ie(buf, len, NULL, &p2p_ielen))) -+ { -+ struct wifidirect_info *wdinfo = &padapter->wdinfo; -+ u32 attr_contentlen = 0; -+ u8 listen_ch_attr[5]; -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("probe_req_p2p_ielen=%d\n", p2p_ielen); -+ #endif -+ -+ if(pmlmepriv->p2p_probe_req_ie) -+ { -+ u32 free_len = pmlmepriv->p2p_probe_req_ie_len; -+ pmlmepriv->p2p_probe_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->p2p_probe_req_ie, free_len); -+ pmlmepriv->p2p_probe_req_ie = NULL; -+ } -+ -+ pmlmepriv->p2p_probe_req_ie = rtw_malloc(p2p_ielen); -+ if ( pmlmepriv->p2p_probe_req_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ _rtw_memcpy(pmlmepriv->p2p_probe_req_ie, p2p_ie, p2p_ielen); -+ pmlmepriv->p2p_probe_req_ie_len = p2p_ielen; -+ -+ if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_LISTEN_CH, (u8*)listen_ch_attr, (uint*) &attr_contentlen) -+ && attr_contentlen == 5) -+ { -+ if (wdinfo->listen_channel != listen_ch_attr[4]) { -+ DBG_871X(FUNC_ADPT_FMT" listen channel - country:%c%c%c, class:%u, ch:%u\n", -+ FUNC_ADPT_ARG(padapter), listen_ch_attr[0], listen_ch_attr[1], listen_ch_attr[2], -+ listen_ch_attr[3], listen_ch_attr[4]); -+ wdinfo->listen_channel = listen_ch_attr[4]; -+ } -+ } -+ } -+ #endif //CONFIG_P2P -+ -+ //buf += p2p_ielen; -+ //len -= p2p_ielen; -+ -+ #ifdef CONFIG_WFD -+ if(rtw_get_wfd_ie(buf, len, NULL, &wfd_ielen)) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("probe_req_wfd_ielen=%d\n", wfd_ielen); -+ #endif -+ -+ if(pmlmepriv->wfd_probe_req_ie) -+ { -+ u32 free_len = pmlmepriv->wfd_probe_req_ie_len; -+ pmlmepriv->wfd_probe_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->wfd_probe_req_ie, free_len); -+ pmlmepriv->wfd_probe_req_ie = NULL; -+ } -+ -+ pmlmepriv->wfd_probe_req_ie = rtw_malloc(wfd_ielen); -+ if ( pmlmepriv->wfd_probe_req_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ rtw_get_wfd_ie(buf, len, pmlmepriv->wfd_probe_req_ie, &pmlmepriv->wfd_probe_req_ie_len); -+ } -+ #endif //CONFIG_WFD -+ -+ } -+ -+ return ret; -+ -+} -+ -+static int cfg80211_rtw_scan(struct wiphy *wiphy -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) -+ , struct net_device *ndev -+ #endif -+ , struct cfg80211_scan_request *request) -+{ -+ int i; -+ u8 _status = _FALSE; -+ int ret = 0; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct mlme_priv *pmlmepriv= &padapter->mlmepriv; -+ NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; -+ struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT]; -+ _irqL irqL; -+ u8 *wps_ie=NULL; -+ uint wps_ielen=0; -+ u8 *p2p_ie=NULL; -+ uint p2p_ielen=0; -+ u8 survey_times=3; -+ u8 survey_times_for_one_ch=6; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ struct cfg80211_ssid *ssids = request->ssids; -+ int social_channel = 0, j = 0; -+ bool need_indicate_scan_done = _FALSE; -+#ifdef CONFIG_CONCURRENT_MODE -+ PADAPTER pbuddy_adapter = NULL; -+ struct mlme_priv *pbuddy_mlmepriv = NULL; -+#endif //CONFIG_CONCURRENT_MODE -+ -+//#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+//#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->pbuddy_adapter) { -+ pbuddy_adapter = padapter->pbuddy_adapter; -+ pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_MP_INCLUDED -+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ { -+ ret = -EPERM; -+ goto exit; -+ } -+#endif -+ -+ _enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL); -+ pwdev_priv->scan_request = request; -+ _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); -+ -+ if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X("%s under WIFI_AP_STATE\n", __FUNCTION__); -+#endif -+ -+ if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ DBG_8192C("%s, fwstate=0x%x\n", __func__, pmlmepriv->fw_state); -+ -+ if(check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) -+ { -+ DBG_8192C("AP mode process WPS \n"); -+ } -+ -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+ } -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) { -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+ -+ #ifdef CONFIG_P2P -+ if( pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(ssids->ssid != NULL -+ && _rtw_memcmp(ssids->ssid, "DIRECT-", 7) -+ && rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL) -+ ) -+ { -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ u32 initialgain = 0x30; -+ rtw_p2p_enable(padapter, P2P_ROLE_DEVICE); -+ wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _TRUE; -+ padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_INITIAL_GAIN, (u8 *)&(initialgain)); -+ padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_INITIAL_GAIN, (u8 *)&(initialgain)); -+ } -+ else -+ { -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); -+ #endif -+ } -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN); -+ -+ if(request->n_channels == 3 && -+ request->channels[0]->hw_value == 1 && -+ request->channels[1]->hw_value == 6 && -+ request->channels[2]->hw_value == 11 -+ ) -+ { -+ social_channel = 1; -+ } -+ } -+ } -+ #endif //CONFIG_P2P -+ -+ if(request->ie && request->ie_len>0) -+ { -+ rtw_cfg80211_set_probe_req_wpsp2pie(padapter, (u8 *)request->ie, request->ie_len ); -+ } -+ -+ if (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE) -+ { -+ DBG_8192C("%s, bBusyTraffic == _TRUE\n", __func__); -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+ if (rtw_is_scan_deny(padapter)){ -+ DBG_871X(FUNC_ADPT_FMT ": scan deny\n", FUNC_ADPT_ARG(padapter)); -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pbuddy_mlmepriv && (pbuddy_mlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE)) -+ { -+ DBG_8192C("%s, bBusyTraffic == _TRUE at buddy_intf\n", __func__); -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+#endif //CONFIG_CONCURRENT_MODE -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ DBG_8192C("%s, fwstate=0x%x\n", __func__, pmlmepriv->fw_state); -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, -+ _FW_UNDER_SURVEY|_FW_UNDER_LINKING|WIFI_UNDER_WPS) == _TRUE) -+ { -+ if(check_buddy_fwstate(padapter, _FW_UNDER_SURVEY)) -+ { -+ DBG_8192C("scanning_via_buddy_intf\n"); -+ pmlmepriv->scanning_via_buddy_intf = _TRUE; -+ } -+ -+ DBG_8192C("buddy_intf's mlme state:0x%x\n", pbuddy_mlmepriv->fw_state); -+ -+ need_indicate_scan_done = _TRUE; -+ goto check_need_indicate_scan_done; -+ } -+#endif -+ -+ -+#ifdef CONFIG_P2P -+ if( pwdinfo->driver_interface == DRIVER_CFG80211 ) -+ { -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) && !rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); -+ rtw_free_network_queue(padapter, _TRUE); -+ -+ if(social_channel == 0) -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); -+ else -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_SOCIAL_LAST); -+ } -+ } -+#endif //CONFIG_P2P -+ -+ -+ _rtw_memset(ssid, 0, sizeof(NDIS_802_11_SSID)*RTW_SSID_SCAN_AMOUNT); -+ //parsing request ssids, n_ssids -+ for (i = 0; i < request->n_ssids && i < RTW_SSID_SCAN_AMOUNT; i++) { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("ssid=%s, len=%d\n", ssids[i].ssid, ssids[i].ssid_len); -+ #endif -+ _rtw_memcpy(ssid[i].Ssid, ssids[i].ssid, ssids[i].ssid_len); -+ ssid[i].SsidLength = ssids[i].ssid_len; -+ } -+ -+ -+ /* parsing channels, n_channels */ -+ _rtw_memset(ch, 0, sizeof(struct rtw_ieee80211_channel)*RTW_CHANNEL_SCAN_AMOUNT); -+ for (i=0;in_channels && ichannels[i])); -+ #endif -+ ch[i].hw_value = request->channels[i]->hw_value; -+ ch[i].flags = request->channels[i]->flags; -+ } -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ if (request->n_channels == 1) { -+ for(i=1;in_channels == 2) { -+ _rtw_memcpy(&ch[3], &ch[1], sizeof(struct rtw_ieee80211_channel)); -+ for(i=1;ilock, &irqL); -+ -+ -+ if(_status == _FALSE) -+ { -+ ret = -1; -+ } -+ -+check_need_indicate_scan_done: -+ if(need_indicate_scan_done) -+ rtw_cfg80211_surveydone_event_callback(padapter); -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed) -+{ -+#if 0 -+ struct iwm_priv *iwm = wiphy_to_iwm(wiphy); -+ -+ if (changed & WIPHY_PARAM_RTS_THRESHOLD && -+ (iwm->conf.rts_threshold != wiphy->rts_threshold)) { -+ int ret; -+ -+ iwm->conf.rts_threshold = wiphy->rts_threshold; -+ -+ ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX, -+ CFG_RTS_THRESHOLD, -+ iwm->conf.rts_threshold); -+ if (ret < 0) -+ return ret; -+ } -+ -+ if (changed & WIPHY_PARAM_FRAG_THRESHOLD && -+ (iwm->conf.frag_threshold != wiphy->frag_threshold)) { -+ int ret; -+ -+ iwm->conf.frag_threshold = wiphy->frag_threshold; -+ -+ ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_FA_CFG_FIX, -+ CFG_FRAG_THRESHOLD, -+ iwm->conf.frag_threshold); -+ if (ret < 0) -+ return ret; -+ } -+#endif -+ DBG_8192C("%s\n", __func__); -+ return 0; -+} -+ -+static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_ibss_params *params) -+{ -+#if 0 -+ struct iwm_priv *iwm = wiphy_to_iwm(wiphy); -+ struct ieee80211_channel *chan = params->channel; -+ -+ if (!test_bit(IWM_STATUS_READY, &iwm->status)) -+ return -EIO; -+ -+ /* UMAC doesn't support creating or joining an IBSS network -+ * with specified bssid. */ -+ if (params->bssid) -+ return -EOPNOTSUPP; -+ -+ iwm->channel = ieee80211_frequency_to_channel(chan->center_freq); -+ iwm->umac_profile->ibss.band = chan->band; -+ iwm->umac_profile->ibss.channel = iwm->channel; -+ iwm->umac_profile->ssid.ssid_len = params->ssid_len; -+ memcpy(iwm->umac_profile->ssid.ssid, params->ssid, params->ssid_len); -+ -+ return iwm_send_mlme_profile(iwm); -+#endif -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ return 0; -+} -+ -+static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev) -+{ -+#if 0 -+ struct iwm_priv *iwm = wiphy_to_iwm(wiphy); -+ -+ if (iwm->umac_profile_active) -+ return iwm_invalidate_mlme_profile(iwm); -+#endif -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ return 0; -+} -+ -+static int rtw_cfg80211_set_wpa_version(struct security_priv *psecuritypriv, u32 wpa_version) -+{ -+ DBG_8192C("%s, wpa_version=%d\n", __func__, wpa_version); -+ -+ if (!wpa_version) { -+ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; -+ return 0; -+ } -+ -+ -+ if (wpa_version & (NL80211_WPA_VERSION_1 | NL80211_WPA_VERSION_2)) -+ { -+ psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPAPSK; -+ } -+ -+/* -+ if (wpa_version & NL80211_WPA_VERSION_2) -+ { -+ psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPA2PSK; -+ } -+*/ -+ -+ return 0; -+ -+} -+ -+static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv, -+ enum nl80211_auth_type sme_auth_type) -+{ -+ DBG_8192C("%s, nl80211_auth_type=%d\n", __func__, sme_auth_type); -+ -+ -+ switch (sme_auth_type) { -+ case NL80211_AUTHTYPE_AUTOMATIC: -+ -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; -+ -+ break; -+ case NL80211_AUTHTYPE_OPEN_SYSTEM: -+ -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; -+ -+ if(psecuritypriv->ndisauthtype>Ndis802_11AuthModeWPA) -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; -+ -+ break; -+ case NL80211_AUTHTYPE_SHARED_KEY: -+ -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Shared; -+ -+ psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ -+ -+ break; -+ default: -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; -+ //return -ENOTSUPP; -+ } -+ -+ return 0; -+ -+} -+ -+static int rtw_cfg80211_set_cipher(struct security_priv *psecuritypriv, u32 cipher, bool ucast) -+{ -+ u32 ndisencryptstatus = Ndis802_11EncryptionDisabled; -+ -+ u32 *profile_cipher = ucast ? &psecuritypriv->dot11PrivacyAlgrthm : -+ &psecuritypriv->dot118021XGrpPrivacy; -+ -+ DBG_8192C("%s, ucast=%d, cipher=0x%x\n", __func__, ucast, cipher); -+ -+ -+ if (!cipher) { -+ *profile_cipher = _NO_PRIVACY_; -+ psecuritypriv->ndisencryptstatus = ndisencryptstatus; -+ return 0; -+ } -+ -+ switch (cipher) { -+ case IW_AUTH_CIPHER_NONE: -+ *profile_cipher = _NO_PRIVACY_; -+ ndisencryptstatus = Ndis802_11EncryptionDisabled; -+ break; -+ case WLAN_CIPHER_SUITE_WEP40: -+ *profile_cipher = _WEP40_; -+ ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ case WLAN_CIPHER_SUITE_WEP104: -+ *profile_cipher = _WEP104_; -+ ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ case WLAN_CIPHER_SUITE_TKIP: -+ *profile_cipher = _TKIP_; -+ ndisencryptstatus = Ndis802_11Encryption2Enabled; -+ break; -+ case WLAN_CIPHER_SUITE_CCMP: -+ *profile_cipher = _AES_; -+ ndisencryptstatus = Ndis802_11Encryption3Enabled; -+ break; -+ default: -+ DBG_8192C("Unsupported cipher: 0x%x\n", cipher); -+ return -ENOTSUPP; -+ } -+ -+ if(ucast) -+ { -+ psecuritypriv->ndisencryptstatus = ndisencryptstatus; -+ -+ //if(psecuritypriv->dot11PrivacyAlgrthm >= _AES_) -+ // psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPA2PSK; -+ } -+ -+ return 0; -+} -+ -+static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key_mgt) -+{ -+ DBG_8192C("%s, key_mgt=0x%x\n", __func__, key_mgt); -+ -+ if (key_mgt == WLAN_AKM_SUITE_8021X) -+ //*auth_type = UMAC_AUTH_TYPE_8021X; -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; -+ else if (key_mgt == WLAN_AKM_SUITE_PSK) { -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; -+ } else { -+ DBG_8192C("Invalid key mgt: 0x%x\n", key_mgt); -+ //return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, const u8 *pie, size_t ielen) -+{ -+ u8 *buf=NULL, *pos=NULL; -+ u32 left; -+ int group_cipher = 0, pairwise_cipher = 0; -+ int ret = 0; -+ int wpa_ielen=0; -+ int wpa2_ielen=0; -+ u8 *pwpa, *pwpa2; -+ u8 null_addr[]= {0,0,0,0,0,0}; -+ -+ if (pie == NULL || !ielen) { -+ /* Treat this as normal case, but need to clear WIFI_UNDER_WPS */ -+ _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ goto exit; -+ } -+ -+ if (ielen > MAX_WPA_IE_LEN+MAX_WPS_IE_LEN+MAX_P2P_IE_LEN) { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ buf = rtw_zmalloc(ielen); -+ if (buf == NULL){ -+ ret = -ENOMEM; -+ goto exit; -+ } -+ -+ _rtw_memcpy(buf, pie , ielen); -+ -+ //dump -+ { -+ int i; -+ DBG_8192C("set wpa_ie(length:%zu):\n", ielen); -+ for(i=0;i0) -+ { -+ if(rtw_parse_wpa_ie(pwpa, wpa_ielen+2, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; -+ padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPAPSK; -+ _rtw_memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen+2); -+ -+ DBG_8192C("got wpa_ie, wpa_ielen:%u\n", wpa_ielen); -+ } -+ } -+ -+ pwpa2 = rtw_get_wpa2_ie(buf, &wpa2_ielen, ielen); -+ if(pwpa2 && wpa2_ielen>0) -+ { -+ if(rtw_parse_wpa2_ie(pwpa2, wpa2_ielen+2, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; -+ padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPA2PSK; -+ _rtw_memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen+2); -+ -+ DBG_8192C("got wpa2_ie, wpa2_ielen:%u\n", wpa2_ielen); -+ } -+ } -+ -+ if (group_cipher == 0) -+ { -+ group_cipher = WPA_CIPHER_NONE; -+ } -+ if (pairwise_cipher == 0) -+ { -+ pairwise_cipher = WPA_CIPHER_NONE; -+ } -+ -+ switch(group_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_; -+ padapter->securitypriv.ndisencryptstatus=Ndis802_11EncryptionDisabled; -+ break; -+ case WPA_CIPHER_WEP40: -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP40_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ case WPA_CIPHER_TKIP: -+ padapter->securitypriv.dot118021XGrpPrivacy=_TKIP_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -+ break; -+ case WPA_CIPHER_CCMP: -+ padapter->securitypriv.dot118021XGrpPrivacy=_AES_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -+ break; -+ case WPA_CIPHER_WEP104: -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP104_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ } -+ -+ switch(pairwise_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ padapter->securitypriv.ndisencryptstatus=Ndis802_11EncryptionDisabled; -+ break; -+ case WPA_CIPHER_WEP40: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ case WPA_CIPHER_TKIP: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_TKIP_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -+ break; -+ case WPA_CIPHER_CCMP: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_AES_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -+ break; -+ case WPA_CIPHER_WEP104: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ } -+ -+ {/* handle wps_ie */ -+ uint wps_ielen; -+ u8 *wps_ie; -+ -+ wps_ie = rtw_get_wps_ie(buf, ielen, NULL, &wps_ielen); -+ if (wps_ie && wps_ielen > 0) { -+ DBG_8192C("got wps_ie, wps_ielen:%u\n", wps_ielen); -+ padapter->securitypriv.wps_ie_len = wps_ielensecuritypriv.wps_ie, wps_ie, padapter->securitypriv.wps_ie_len); -+ set_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ } else { -+ _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ } -+ } -+ -+ #ifdef CONFIG_P2P -+ {//check p2p_ie for assoc req; -+ uint p2p_ielen=0; -+ u8 *p2p_ie; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if((p2p_ie=rtw_get_p2p_ie(buf, ielen, NULL, &p2p_ielen))) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s p2p_assoc_req_ielen=%d\n", __FUNCTION__, p2p_ielen); -+ #endif -+ -+ if(pmlmepriv->p2p_assoc_req_ie) -+ { -+ u32 free_len = pmlmepriv->p2p_assoc_req_ie_len; -+ pmlmepriv->p2p_assoc_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->p2p_assoc_req_ie, free_len); -+ pmlmepriv->p2p_assoc_req_ie = NULL; -+ } -+ -+ pmlmepriv->p2p_assoc_req_ie = rtw_malloc(p2p_ielen); -+ if ( pmlmepriv->p2p_assoc_req_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ goto exit; -+ } -+ _rtw_memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen); -+ pmlmepriv->p2p_assoc_req_ie_len = p2p_ielen; -+ } -+ } -+ #endif //CONFIG_P2P -+ -+ #ifdef CONFIG_WFD -+ {//check wfd_ie for assoc req; -+ uint wfd_ielen=0; -+ u8 *wfd_ie; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if(rtw_get_wfd_ie(buf, ielen, NULL, &wfd_ielen)) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s wfd_assoc_req_ielen=%d\n", __FUNCTION__, wfd_ielen); -+ #endif -+ -+ if(pmlmepriv->wfd_assoc_req_ie) -+ { -+ u32 free_len = pmlmepriv->wfd_assoc_req_ie_len; -+ pmlmepriv->wfd_assoc_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->wfd_assoc_req_ie, free_len); -+ pmlmepriv->wfd_assoc_req_ie = NULL; -+ } -+ -+ pmlmepriv->wfd_assoc_req_ie = rtw_malloc(wfd_ielen); -+ if ( pmlmepriv->wfd_assoc_req_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ goto exit; -+ } -+ rtw_get_wfd_ie(buf, ielen, pmlmepriv->wfd_assoc_req_ie, &pmlmepriv->wfd_assoc_req_ie_len); -+ } -+ } -+ #endif //CONFIG_WFD -+ -+ //TKIP and AES disallow multicast packets until installing group key -+ if(padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_ -+ || padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_WTMIC_ -+ || padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) -+ //WPS open need to enable multicast -+ //|| check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == _TRUE) -+ rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr); -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("rtw_set_wpa_ie: pairwise_cipher=0x%08x padapter->securitypriv.ndisencryptstatus=%d padapter->securitypriv.ndisauthtype=%d\n", -+ pairwise_cipher, padapter->securitypriv.ndisencryptstatus, padapter->securitypriv.ndisauthtype)); -+ -+exit: -+ if (buf) -+ rtw_mfree(buf, ielen); -+ if (ret) -+ _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ return ret; -+} -+ -+static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_connect_params *sme) -+{ -+ int ret=0; -+ _irqL irqL; -+ _list *phead; -+ struct wlan_network *pnetwork = NULL; -+ NDIS_802_11_AUTHENTICATION_MODE authmode; -+ NDIS_802_11_SSID ndis_ssid; -+ u8 *dst_ssid, *src_ssid; -+ u8 *dst_bssid, *src_bssid; -+ //u8 matched_by_bssid=_FALSE; -+ //u8 matched_by_ssid=_FALSE; -+ u8 matched=_FALSE; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ _queue *queue = &pmlmepriv->scanned_queue; -+ -+ DBG_871X("=>"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ DBG_871X("privacy=%d, key=%p, key_len=%d, key_idx=%d\n", -+ sme->privacy, sme->key, sme->key_len, sme->key_idx); -+ -+ -+ if(wdev_to_priv(padapter->rtw_wdev)->block == _TRUE) -+ { -+ ret = -EBUSY; -+ DBG_871X("%s wdev_priv.block is set\n", __FUNCTION__); -+ goto exit; -+ } -+ -+#ifdef CONFIG_PLATFORM_MSTAR -+ printk("MStar Android!\n"); -+ if((wdev_to_priv(padapter->rtw_wdev))->bandroid_scan == _FALSE) -+ { -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+#endif //CONFIG_P2P -+ { -+ ret = -EBUSY; -+ printk("Android hasn't attached yet!\n"); -+ goto exit; -+ } -+ } -+#endif -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) { -+ ret= -EPERM; -+ goto exit; -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) { -+ ret = -EPERM; -+ goto exit; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, _FW_UNDER_LINKING) == _TRUE) { -+ DBG_8192C("%s, but buddy_intf is under linking\n", __FUNCTION__); -+ ret = -EINVAL; -+ goto exit; -+ } -+ if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY) == _TRUE) { -+ rtw_scan_abort(padapter->pbuddy_adapter); -+ } -+#endif -+ -+ if (!sme->ssid || !sme->ssid_len) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (sme->ssid_len > IW_ESSID_MAX_SIZE){ -+ -+ ret= -E2BIG; -+ goto exit; -+ } -+ -+ _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); -+ ndis_ssid.SsidLength = sme->ssid_len; -+ _rtw_memcpy(ndis_ssid.Ssid, sme->ssid, sme->ssid_len); -+ -+ DBG_8192C("ssid=%s, len=%zu\n", ndis_ssid.Ssid, sme->ssid_len); -+ -+ -+ if (sme->bssid) -+ DBG_8192C("bssid="MAC_FMT"\n", MAC_ARG(sme->bssid)); -+ -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { -+ ret = -EBUSY; -+ DBG_8192C("%s, fw_state=0x%x, goto exit\n", __FUNCTION__, pmlmepriv->fw_state); -+ goto exit; -+ } -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { -+ rtw_scan_abort(padapter); -+ } -+ -+ psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; -+ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; -+ psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; //open system -+ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; -+ -+ -+ ret = rtw_cfg80211_set_wpa_version(psecuritypriv, sme->crypto.wpa_versions); -+ if (ret < 0) -+ goto exit; -+ -+ ret = rtw_cfg80211_set_auth_type(psecuritypriv, sme->auth_type); -+ if (ret < 0) -+ goto exit; -+ -+ DBG_8192C("%s, ie_len=%zu\n", __func__, sme->ie_len); -+ -+ ret = rtw_cfg80211_set_wpa_ie(padapter, sme->ie, sme->ie_len); -+ if (ret < 0) -+ goto exit; -+ -+ if (sme->crypto.n_ciphers_pairwise) { -+ ret = rtw_cfg80211_set_cipher(psecuritypriv, sme->crypto.ciphers_pairwise[0], _TRUE); -+ if (ret < 0) -+ goto exit; -+ } -+ -+ //For WEP Shared auth -+ if((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared -+ || psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key -+ ) -+ { -+ u32 wep_key_idx, wep_key_len,wep_total_len; -+ NDIS_802_11_WEP *pwep = NULL; -+ DBG_871X("%s(): Shared/Auto WEP\n",__FUNCTION__); -+ -+ wep_key_idx = sme->key_idx; -+ wep_key_len = sme->key_len; -+ -+ if (sme->key_idx > WEP_KEYS) { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (wep_key_len > 0) -+ { -+ wep_key_len = wep_key_len <= 5 ? 5 : 13; -+ wep_total_len = wep_key_len + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial); -+ pwep =(NDIS_802_11_WEP *) rtw_malloc(wep_total_len); -+ if(pwep == NULL){ -+ DBG_871X(" wpa_set_encryption: pwep allocate fail !!!\n"); -+ ret = -ENOMEM; -+ goto exit; -+ } -+ -+ _rtw_memset(pwep, 0, wep_total_len); -+ -+ pwep->KeyLength = wep_key_len; -+ pwep->Length = wep_total_len; -+ -+ if(wep_key_len==13) -+ { -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP104_; -+ } -+ } -+ else { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ pwep->KeyIndex = wep_key_idx; -+ pwep->KeyIndex |= 0x80000000; -+ -+ _rtw_memcpy(pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength); -+ -+ if(rtw_set_802_11_add_wep(padapter, pwep) == (u8)_FAIL) -+ { -+ ret = -EOPNOTSUPP ; -+ } -+ -+ if (pwep) { -+ rtw_mfree((u8 *)pwep,wep_total_len); -+ } -+ -+ if(ret < 0) -+ goto exit; -+ } -+ -+ ret = rtw_cfg80211_set_cipher(psecuritypriv, sme->crypto.cipher_group, _FALSE); -+ if (ret < 0) -+ return ret; -+ -+ if (sme->crypto.n_akm_suites) { -+ ret = rtw_cfg80211_set_key_mgt(psecuritypriv, sme->crypto.akm_suites[0]); -+ if (ret < 0) -+ goto exit; -+ } -+ -+ authmode = psecuritypriv->ndisauthtype; -+ rtw_set_802_11_authentication_mode(padapter, authmode); -+ -+ //rtw_set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); -+ -+ if (rtw_set_802_11_connect(padapter, sme->bssid, &ndis_ssid) == _FALSE) { -+ ret = -1; -+ goto exit; -+ } -+ -+ DBG_8192C("set ssid:dot11AuthAlgrthm=%d, dot11PrivacyAlgrthm=%d, dot118021XGrpPrivacy=%d\n", psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm, psecuritypriv->dot118021XGrpPrivacy); -+ -+exit: -+ -+ DBG_8192C("<=%s, ret %d\n",__FUNCTION__, ret); -+ -+ return ret; -+} -+ -+static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev, -+ u16 reason_code) -+{ -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ rtw_set_roaming(padapter, 0); -+ -+ if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)) -+ { -+ rtw_scan_abort(padapter); -+ LeaveAllPowerSaveMode(padapter); -+ rtw_disassoc_cmd(padapter, 500, _FALSE); -+ -+ DBG_871X("%s...call rtw_indicate_disconnect\n", __FUNCTION__); -+ -+ padapter->mlmepriv.not_indic_disco = _TRUE; -+ rtw_indicate_disconnect(padapter); -+ padapter->mlmepriv.not_indic_disco = _FALSE; -+ -+ rtw_free_assoc_resources(padapter, 1); -+ } -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_set_txpower(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) -+ struct wireless_dev *wdev, -+#endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) || defined(COMPAT_KERNEL_RELEASE) -+ enum nl80211_tx_power_setting type, int mbm) -+#else -+ enum tx_power_setting type, int dbm) -+#endif -+{ -+#if 0 -+ struct iwm_priv *iwm = wiphy_to_iwm(wiphy); -+ int ret; -+ -+ switch (type) { -+ case NL80211_TX_POWER_AUTOMATIC: -+ return 0; -+ case NL80211_TX_POWER_FIXED: -+ if (mbm < 0 || (mbm % 100)) -+ return -EOPNOTSUPP; -+ -+ if (!test_bit(IWM_STATUS_READY, &iwm->status)) -+ return 0; -+ -+ ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX, -+ CFG_TX_PWR_LIMIT_USR, -+ MBM_TO_DBM(mbm) * 2); -+ if (ret < 0) -+ return ret; -+ -+ return iwm_tx_power_trigger(iwm); -+ default: -+ IWM_ERR(iwm, "Unsupported power type: %d\n", type); -+ return -EOPNOTSUPP; -+ } -+#endif -+ DBG_8192C("%s\n", __func__); -+ return 0; -+} -+ -+static int cfg80211_rtw_get_txpower(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) -+ struct wireless_dev *wdev, -+#endif -+ int *dbm) -+{ -+ //_adapter *padapter = wiphy_to_adapter(wiphy); -+ -+ DBG_8192C("%s\n", __func__); -+ -+ *dbm = (12); -+ -+ return 0; -+} -+ -+inline bool rtw_cfg80211_pwr_mgmt(_adapter *adapter) -+{ -+ struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(adapter->rtw_wdev); -+ return rtw_wdev_priv->power_mgmt; -+} -+ -+static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy, -+ struct net_device *ndev, -+ bool enabled, int timeout) -+{ -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ -+ DBG_871X(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev), -+ enabled, timeout); -+ -+ rtw_wdev_priv->power_mgmt = enabled; -+ -+ #ifdef CONFIG_LPS -+ if (!enabled) -+ LPS_Leave(padapter); -+ #endif -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, -+ struct net_device *netdev, -+ struct cfg80211_pmksa *pmksa) -+{ -+ u8 index,blInserted = _FALSE; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 }; -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); -+ -+ if ( _rtw_memcmp( pmksa->bssid, strZeroMacAddress, ETH_ALEN ) == _TRUE ) -+ { -+ return -EINVAL; -+ } -+ -+ blInserted = _FALSE; -+ -+ //overwrite PMKID -+ for(index=0 ; indexPMKIDList[index].Bssid, pmksa->bssid, ETH_ALEN) ==_TRUE ) -+ { // BSSID is matched, the same AP => rewrite with new PMKID. -+ DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev)); -+ -+ _rtw_memcpy( psecuritypriv->PMKIDList[index].PMKID, pmksa->pmkid, WLAN_PMKID_LEN); -+ psecuritypriv->PMKIDList[index].bUsed = _TRUE; -+ psecuritypriv->PMKIDIndex = index+1; -+ blInserted = _TRUE; -+ break; -+ } -+ } -+ -+ if(!blInserted) -+ { -+ // Find a new entry -+ DBG_871X(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n", -+ FUNC_NDEV_ARG(netdev), psecuritypriv->PMKIDIndex ); -+ -+ _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, pmksa->bssid, ETH_ALEN); -+ _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, pmksa->pmkid, WLAN_PMKID_LEN); -+ -+ psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = _TRUE; -+ psecuritypriv->PMKIDIndex++ ; -+ if(psecuritypriv->PMKIDIndex==16) -+ { -+ psecuritypriv->PMKIDIndex =0; -+ } -+ } -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, -+ struct net_device *netdev, -+ struct cfg80211_pmksa *pmksa) -+{ -+ u8 index, bMatched = _FALSE; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); -+ -+ for(index=0 ; indexPMKIDList[index].Bssid, pmksa->bssid, ETH_ALEN) ==_TRUE ) -+ { // BSSID is matched, the same AP => Remove this PMKID information and reset it. -+ _rtw_memset( psecuritypriv->PMKIDList[index].Bssid, 0x00, ETH_ALEN ); -+ _rtw_memset( psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN ); -+ psecuritypriv->PMKIDList[index].bUsed = _FALSE; -+ bMatched = _TRUE; -+ break; -+ } -+ } -+ -+ if(_FALSE == bMatched) -+ { -+ DBG_871X(FUNC_NDEV_FMT" do not have matched BSSID\n" -+ , FUNC_NDEV_ARG(netdev)); -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy, -+ struct net_device *netdev) -+{ -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); -+ -+ _rtw_memset( &psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); -+ psecuritypriv->PMKIDIndex = 0; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_AP_MODE -+void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) -+{ -+ s32 freq; -+ int channel; -+ struct wireless_dev *pwdev = padapter->rtw_wdev; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct net_device *ndev = padapter->pnetdev; -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ -+#if defined(RTW_USE_CFG80211_STA_EVENT) || defined(COMPAT_KERNEL_RELEASE) -+ { -+ struct station_info sinfo; -+ u8 ie_offset; -+ if (GetFrameSubType(pmgmt_frame) == WIFI_ASSOCREQ) -+ ie_offset = _ASOCREQ_IE_OFFSET_; -+ else // WIFI_REASSOCREQ -+ ie_offset = _REASOCREQ_IE_OFFSET_; -+ -+ sinfo.filled = 0; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)) -+ sinfo.filled = STATION_INFO_ASSOC_REQ_IES; -+#endif -+ sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset; -+ sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset; -+ cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC); -+ } -+#else /* defined(RTW_USE_CFG80211_STA_EVENT) */ -+ channel = pmlmeext->cur_channel; -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+ #ifdef COMPAT_KERNEL_RELEASE -+ rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC); -+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC); -+ #else //COMPAT_KERNEL_RELEASE -+ { -+ //to avoid WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION) when calling cfg80211_send_rx_assoc() -+ #ifndef CONFIG_PLATFORM_MSTAR -+ pwdev->iftype = NL80211_IFTYPE_STATION; -+ #endif //CONFIG_PLATFORM_MSTAR -+ DBG_8192C("iftype=%d before call cfg80211_send_rx_assoc()\n", pwdev->iftype); -+ rtw_cfg80211_send_rx_assoc(padapter, NULL, pmgmt_frame, frame_len); -+ DBG_8192C("iftype=%d after call cfg80211_send_rx_assoc()\n", pwdev->iftype); -+ pwdev->iftype = NL80211_IFTYPE_AP; -+ //cfg80211_rx_action(padapter->pnetdev, freq, pmgmt_frame, frame_len, GFP_ATOMIC); -+ } -+ #endif //COMPAT_KERNEL_RELEASE -+#endif /* defined(RTW_USE_CFG80211_STA_EVENT) */ -+ -+} -+ -+void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason) -+{ -+ s32 freq; -+ int channel; -+ u8 *pmgmt_frame; -+ uint frame_len; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ u8 mgmt_buf[128] = {0}; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct net_device *ndev = padapter->pnetdev; -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ -+#if defined(RTW_USE_CFG80211_STA_EVENT) || defined(COMPAT_KERNEL_RELEASE) -+ cfg80211_del_sta(ndev, da, GFP_ATOMIC); -+#else /* defined(RTW_USE_CFG80211_STA_EVENT) */ -+ channel = pmlmeext->cur_channel; -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+ pmgmt_frame = mgmt_buf; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pmgmt_frame; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ //_rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); -+ //_rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, da, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pmgmt_frame, WIFI_DEAUTH); -+ -+ pmgmt_frame += sizeof(struct rtw_ieee80211_hdr_3addr); -+ frame_len = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ reason = cpu_to_le16(reason); -+ pmgmt_frame = rtw_set_fixed_ie(pmgmt_frame, _RSON_CODE_ , (unsigned char *)&reason, &frame_len); -+ -+ #ifdef COMPAT_KERNEL_RELEASE -+ rtw_cfg80211_rx_mgmt(padapter, freq, 0, mgmt_buf, frame_len, GFP_ATOMIC); -+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) -+ rtw_cfg80211_rx_mgmt(padapter, freq, 0, mgmt_buf, frame_len, GFP_ATOMIC); -+ #else //COMPAT_KERNEL_RELEASE -+ cfg80211_send_disassoc(padapter->pnetdev, mgmt_buf, frame_len); -+ //cfg80211_rx_action(padapter->pnetdev, freq, mgmt_buf, frame_len, GFP_ATOMIC); -+ #endif //COMPAT_KERNEL_RELEASE -+#endif /* defined(RTW_USE_CFG80211_STA_EVENT) */ -+} -+ -+static int rtw_cfg80211_monitor_if_open(struct net_device *ndev) -+{ -+ int ret = 0; -+ -+ DBG_8192C("%s\n", __func__); -+ -+ return ret; -+} -+ -+static int rtw_cfg80211_monitor_if_close(struct net_device *ndev) -+{ -+ int ret = 0; -+ -+ DBG_8192C("%s\n", __func__); -+ -+ return ret; -+} -+ -+static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_device *ndev) -+{ -+ int ret = 0; -+ int rtap_len; -+ int qos_len = 0; -+ int dot11_hdr_len = 24; -+ int snap_len = 6; -+ unsigned char *pdata; -+ u16 frame_ctl; -+ unsigned char src_mac_addr[6]; -+ unsigned char dst_mac_addr[6]; -+ struct ieee80211_hdr *dot11_hdr; -+ struct ieee80211_radiotap_header *rtap_hdr; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ if (skb) -+ rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize); -+ -+ if (unlikely(skb->len < sizeof(struct ieee80211_radiotap_header))) -+ goto fail; -+ -+ rtap_hdr = (struct ieee80211_radiotap_header *)skb->data; -+ if (unlikely(rtap_hdr->it_version)) -+ goto fail; -+ -+ rtap_len = ieee80211_get_radiotap_len(skb->data); -+ if (unlikely(skb->len < rtap_len)) -+ goto fail; -+ -+ if(rtap_len != 14) -+ { -+ DBG_8192C("radiotap len (should be 14): %d\n", rtap_len); -+ goto fail; -+ } -+ -+ /* Skip the ratio tap header */ -+ skb_pull(skb, rtap_len); -+ -+ dot11_hdr = (struct ieee80211_hdr *)skb->data; -+ frame_ctl = le16_to_cpu(dot11_hdr->frame_control); -+ /* Check if the QoS bit is set */ -+ if ((frame_ctl & RTW_IEEE80211_FCTL_FTYPE) == RTW_IEEE80211_FTYPE_DATA) { -+ /* Check if this ia a Wireless Distribution System (WDS) frame -+ * which has 4 MAC addresses -+ */ -+ if (dot11_hdr->frame_control & 0x0080) -+ qos_len = 2; -+ if ((dot11_hdr->frame_control & 0x0300) == 0x0300) -+ dot11_hdr_len += 6; -+ -+ memcpy(dst_mac_addr, dot11_hdr->addr1, sizeof(dst_mac_addr)); -+ memcpy(src_mac_addr, dot11_hdr->addr2, sizeof(src_mac_addr)); -+ -+ /* Skip the 802.11 header, QoS (if any) and SNAP, but leave spaces for -+ * for two MAC addresses -+ */ -+ skb_pull(skb, dot11_hdr_len + qos_len + snap_len - sizeof(src_mac_addr) * 2); -+ pdata = (unsigned char*)skb->data; -+ memcpy(pdata, dst_mac_addr, sizeof(dst_mac_addr)); -+ memcpy(pdata + sizeof(dst_mac_addr), src_mac_addr, sizeof(src_mac_addr)); -+ -+ DBG_8192C("should be eapol packet\n"); -+ -+ /* Use the real net device to transmit the packet */ -+ ret = _rtw_xmit_entry(skb, padapter->pnetdev); -+ -+ return ret; -+ -+ } -+ else if ((frame_ctl & (RTW_IEEE80211_FCTL_FTYPE|RTW_IEEE80211_FCTL_STYPE)) -+ == (RTW_IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION) -+ ) -+ { -+ //only for action frames -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ //u8 category, action, OUI_Subtype, dialogToken=0; -+ //unsigned char *frame_body; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ u8 *buf = skb->data; -+ u32 len = skb->len; -+ u8 category, action; -+ int type = -1; -+ -+ if (rtw_action_frame_parse(buf, len, &category, &action) == _FALSE) { -+ DBG_8192C(FUNC_NDEV_FMT" frame_control:0x%x\n", FUNC_NDEV_ARG(ndev), -+ le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)buf)->frame_ctl)); -+ goto fail; -+ } -+ -+ DBG_8192C("RTW_Tx:da="MAC_FMT" via "FUNC_NDEV_FMT"\n", -+ MAC_ARG(GetAddr1Ptr(buf)), FUNC_NDEV_ARG(ndev)); -+ #ifdef CONFIG_P2P -+ if((type = rtw_p2p_check_frames(padapter, buf, len, _TRUE)) >= 0) -+ goto dump; -+ #endif -+ if (category == RTW_WLAN_CATEGORY_PUBLIC) -+ DBG_871X("RTW_Tx:%s\n", action_public_str(action)); -+ else -+ DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, action); -+ -+dump: -+ //starting alloc mgmt frame to dump it -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ goto fail; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ pattrib->retry_ctrl = _FALSE; -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ -+ _rtw_memcpy(pframe, (void*)buf, len); -+ #ifdef CONFIG_WFD -+ if (type >= 0) -+ { -+ struct wifi_display_info *pwfd_info; -+ -+ pwfd_info = padapter->wdinfo.wfd_info; -+ -+ if ( _TRUE == pwfd_info->wfd_enable ) -+ { -+ rtw_append_wfd_ie( padapter, pframe, &len ); -+ } -+ } -+ #endif // CONFIG_WFD -+ pattrib->pktlen = len; -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ //update seq number -+ pmlmeext->mgnt_seq = GetSequence(pwlanhdr); -+ pattrib->seqnum = pmlmeext->mgnt_seq; -+ pmlmeext->mgnt_seq++; -+ -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ dump_mgntframe(padapter, pmgntframe); -+ -+ } -+ else -+ { -+ DBG_8192C("frame_ctl=0x%x\n", frame_ctl & (RTW_IEEE80211_FCTL_FTYPE|RTW_IEEE80211_FCTL_STYPE)); -+ } -+ -+ -+fail: -+ -+ dev_kfree_skb(skb); -+ -+ return 0; -+ -+} -+ -+static void rtw_cfg80211_monitor_if_set_multicast_list(struct net_device *ndev) -+{ -+ DBG_8192C("%s\n", __func__); -+} -+ -+static int rtw_cfg80211_monitor_if_set_mac_address(struct net_device *ndev, void *addr) -+{ -+ int ret = 0; -+ -+ DBG_8192C("%s\n", __func__); -+ -+ return ret; -+} -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+static const struct net_device_ops rtw_cfg80211_monitor_if_ops = { -+ .ndo_open = rtw_cfg80211_monitor_if_open, -+ .ndo_stop = rtw_cfg80211_monitor_if_close, -+ .ndo_start_xmit = rtw_cfg80211_monitor_if_xmit_entry, -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) -+ .ndo_set_multicast_list = rtw_cfg80211_monitor_if_set_multicast_list, -+ #endif -+ .ndo_set_mac_address = rtw_cfg80211_monitor_if_set_mac_address, -+}; -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) -+static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, unsigned char name_assign_type, struct net_device **ndev) -+#else -+static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct net_device **ndev) -+#endif -+{ -+ int ret = 0; -+ struct net_device* mon_ndev = NULL; -+ struct wireless_dev* mon_wdev = NULL; -+ struct rtw_netdev_priv_indicator *pnpi; -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ -+ if (!name ) { -+ DBG_871X(FUNC_ADPT_FMT" without specific name\n", FUNC_ADPT_ARG(padapter)); -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ if (pwdev_priv->pmon_ndev) { -+ DBG_871X(FUNC_ADPT_FMT" monitor interface exist: "NDEV_FMT"\n", -+ FUNC_ADPT_ARG(padapter), NDEV_ARG(pwdev_priv->pmon_ndev)); -+ ret = -EBUSY; -+ goto out; -+ } -+ -+ mon_ndev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator)); -+ if (!mon_ndev) { -+ DBG_871X(FUNC_ADPT_FMT" allocate ndev fail\n", FUNC_ADPT_ARG(padapter)); -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP; -+ strncpy(mon_ndev->name, name, IFNAMSIZ); -+ mon_ndev->name[IFNAMSIZ - 1] = 0; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) -+ mon_ndev->name_assign_type = name_assign_type; -+#endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) -+ mon_ndev->needs_free_netdev = true; -+ mon_ndev->priv_destructor = rtw_ndev_destructor; -+#else -+ mon_ndev->destructor = rtw_ndev_destructor; -+#endif -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+ mon_ndev->netdev_ops = &rtw_cfg80211_monitor_if_ops; -+#else -+ mon_ndev->open = rtw_cfg80211_monitor_if_open; -+ mon_ndev->stop = rtw_cfg80211_monitor_if_close; -+ mon_ndev->hard_start_xmit = rtw_cfg80211_monitor_if_xmit_entry; -+ mon_ndev->set_mac_address = rtw_cfg80211_monitor_if_set_mac_address; -+#endif -+ -+ pnpi = netdev_priv(mon_ndev); -+ pnpi->priv = padapter; -+ pnpi->sizeof_priv = sizeof(_adapter); -+ -+ /* wdev */ -+ mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev)); -+ if (!mon_wdev) { -+ DBG_871X(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter)); -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ mon_wdev->wiphy = padapter->rtw_wdev->wiphy; -+ mon_wdev->netdev = mon_ndev; -+ mon_wdev->iftype = NL80211_IFTYPE_MONITOR; -+ mon_ndev->ieee80211_ptr = mon_wdev; -+ -+ ret = register_netdevice(mon_ndev); -+ if (ret) { -+ goto out; -+ } -+ -+ *ndev = pwdev_priv->pmon_ndev = mon_ndev; -+ _rtw_memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1); -+ -+out: -+ if (ret && mon_wdev) { -+ rtw_mfree((u8*)mon_wdev, sizeof(struct wireless_dev)); -+ mon_wdev = NULL; -+ } -+ -+ if (ret && mon_ndev) { -+ free_netdev(mon_ndev); -+ *ndev = mon_ndev = NULL; -+ } -+ -+ return ret; -+} -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+static struct wireless_dev * -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+static struct net_device * -+#else -+static int -+#endif -+ cfg80211_rtw_add_virtual_intf( -+ struct wiphy *wiphy, -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) -+ const char *name, -+ #else -+ char *name, -+ #endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) -+ unsigned char name_assign_type, -+#endif -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) -+ enum nl80211_iftype type, struct vif_params *params) -+ #else -+ enum nl80211_iftype type, u32 *flags, struct vif_params *params) -+ #endif -+{ -+ int ret = 0; -+ struct net_device* ndev = NULL; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ -+ DBG_871X(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n", -+ FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type); -+ -+ switch (type) { -+ case NL80211_IFTYPE_ADHOC: -+ case NL80211_IFTYPE_AP_VLAN: -+ case NL80211_IFTYPE_WDS: -+ case NL80211_IFTYPE_MESH_POINT: -+ ret = -ENODEV; -+ break; -+ case NL80211_IFTYPE_MONITOR: -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) -+ ret = rtw_cfg80211_add_monitor_if(padapter, (char *)name, name_assign_type, &ndev); -+#else -+ ret = rtw_cfg80211_add_monitor_if(padapter, (char *)name, &ndev); -+#endif -+ break; -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ case NL80211_IFTYPE_P2P_CLIENT: -+#endif -+ case NL80211_IFTYPE_STATION: -+ ret = -ENODEV; -+ break; -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ case NL80211_IFTYPE_P2P_GO: -+#endif -+ case NL80211_IFTYPE_AP: -+ ret = -ENODEV; -+ break; -+ default: -+ ret = -ENODEV; -+ DBG_871X("Unsupported interface type\n"); -+ break; -+ } -+ -+ DBG_871X(FUNC_ADPT_FMT" ndev:%p, ret:%d\n", FUNC_ADPT_ARG(padapter), ndev, ret); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+ return ndev ? ndev->ieee80211_ptr : ERR_PTR(ret); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ return ndev ? ndev : ERR_PTR(ret); -+#else -+ return ret; -+#endif -+} -+ -+static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+ struct wireless_dev *wdev -+#else -+ struct net_device *ndev -+#endif -+) -+{ -+ struct rtw_wdev_priv *pwdev_priv = (struct rtw_wdev_priv *)wiphy_priv(wiphy); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+ struct net_device *ndev; -+ ndev = wdev ? wdev->netdev : NULL; -+#endif -+ -+ if (!ndev) -+ goto exit; -+ -+ unregister_netdevice(ndev); -+ -+ if (ndev == pwdev_priv->pmon_ndev) { -+ pwdev_priv->pmon_ndev = NULL; -+ pwdev_priv->ifname_mon[0] = '\0'; -+ DBG_871X(FUNC_NDEV_FMT" remove monitor interface\n", FUNC_NDEV_ARG(ndev)); -+ } -+ -+exit: -+ return 0; -+} -+ -+static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len) -+{ -+ int ret=0; -+ u8 *pbuf = NULL; -+ uint len, wps_ielen=0; -+ uint p2p_ielen=0; -+ u8 *p2p_ie; -+ u8 got_p2p_ie = _FALSE; -+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -+ //struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ -+ DBG_8192C("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __FUNCTION__, head_len, tail_len); -+ -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ if(head_len<24) -+ return -EINVAL; -+ -+ -+ pbuf = rtw_zmalloc(head_len+tail_len); -+ if(!pbuf) -+ return -ENOMEM; -+ -+ -+ //_rtw_memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); -+ -+ //if((pstapriv->max_num_sta>NUM_STA) || (pstapriv->max_num_sta<=0)) -+ // pstapriv->max_num_sta = NUM_STA; -+ -+ -+ _rtw_memcpy(pbuf, (void *)head+24, head_len-24);// 24=beacon header len. -+ _rtw_memcpy(pbuf+head_len-24, (void *)tail, tail_len); -+ -+ len = head_len+tail_len-24; -+ -+ //check wps ie if inclued -+ if(rtw_get_wps_ie(pbuf+_FIXED_IE_LENGTH_, len-_FIXED_IE_LENGTH_, NULL, &wps_ielen)) -+ DBG_8192C("add bcn, wps_ielen=%d\n", wps_ielen); -+ -+#ifdef CONFIG_P2P -+ //check p2p ie if inclued -+ if( adapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ { -+ //check p2p if enable -+ if(rtw_get_p2p_ie(pbuf+_FIXED_IE_LENGTH_, len-_FIXED_IE_LENGTH_, NULL, &p2p_ielen)) -+ { -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ struct wifidirect_info *pwdinfo= &(adapter->wdinfo); -+ -+ DBG_8192C("got p2p_ie, len=%d\n", p2p_ielen); -+ got_p2p_ie = _TRUE; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ DBG_8192C("Enable P2P function for the first time\n"); -+ rtw_p2p_enable(adapter, P2P_ROLE_GO); -+ wdev_to_priv(adapter->rtw_wdev)->p2p_enabled = _TRUE; -+ } -+ else -+ { -+ _cancel_timer_ex( &pwdinfo->find_phase_timer ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ _cancel_timer_ex( &pwdinfo->pre_tx_scan_timer); -+ -+ DBG_8192C("enter GO Mode, p2p_ielen=%d\n", p2p_ielen); -+ -+ rtw_p2p_set_role(pwdinfo, P2P_ROLE_GO); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_OK); -+ pwdinfo->intent = 15; -+ } -+ } -+ } -+#endif // CONFIG_P2P -+ -+ /* pbss_network->IEs will not include p2p_ie, wfd ie */ -+ rtw_ies_remove_ie(pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, P2P_OUI, 4); -+ rtw_ies_remove_ie(pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, WFD_OUI, 4); -+ -+ if (rtw_check_beacon_data(adapter, pbuf, len) == _SUCCESS) -+ { -+#ifdef CONFIG_P2P -+ //check p2p if enable -+ if(got_p2p_ie == _TRUE) -+ { -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ struct wifidirect_info *pwdinfo= &(adapter->wdinfo); -+ pwdinfo->operating_channel = pmlmeext->cur_channel; -+ } -+#endif //CONFIG_P2P -+ ret = 0; -+ } -+ else -+ { -+ ret = -EINVAL; -+ } -+ -+ -+ rtw_mfree(pbuf, head_len+tail_len); -+ -+ return ret; -+} -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && !defined(COMPAT_KERNEL_RELEASE) -+static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev, -+ struct beacon_parameters *info) -+{ -+ int ret=0; -+ _adapter *adapter = wiphy_to_adapter(wiphy); -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); -+ -+ return ret; -+} -+ -+static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev, -+ struct beacon_parameters *info) -+{ -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ pmlmeext->bstart_bss = _TRUE; -+ -+ cfg80211_rtw_add_beacon(wiphy, ndev, info); -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_del_beacon(struct wiphy *wiphy, struct net_device *ndev) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ return 0; -+} -+#else -+static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_ap_settings *settings) -+{ -+ int ret = 0; -+ _adapter *adapter = wiphy_to_adapter(wiphy); -+ -+ DBG_871X(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev), -+ settings->hidden_ssid, settings->auth_type); -+ -+ ret = rtw_add_beacon(adapter, settings->beacon.head, settings->beacon.head_len, -+ settings->beacon.tail, settings->beacon.tail_len); -+ -+ adapter->mlmeextpriv.mlmext_info.hidden_ssid_mode = settings->hidden_ssid; -+ -+ if (settings->ssid && settings->ssid_len) { -+ WLAN_BSSID_EX *pbss_network = &adapter->mlmepriv.cur_network.network; -+ WLAN_BSSID_EX *pbss_network_ext = &adapter->mlmeextpriv.mlmext_info.network; -+ -+ if(0) -+ DBG_871X(FUNC_ADPT_FMT" ssid:(%s,%d), from ie:(%s,%d)\n", FUNC_ADPT_ARG(adapter), -+ settings->ssid, settings->ssid_len, -+ pbss_network->Ssid.Ssid, pbss_network->Ssid.SsidLength); -+ -+ _rtw_memcpy(pbss_network->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); -+ pbss_network->Ssid.SsidLength = settings->ssid_len; -+ _rtw_memcpy(pbss_network_ext->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); -+ pbss_network_ext->Ssid.SsidLength = settings->ssid_len; -+ -+ if(0) -+ DBG_871X(FUNC_ADPT_FMT" after ssid:(%s,%d), (%s,%d)\n", FUNC_ADPT_ARG(adapter), -+ pbss_network->Ssid.Ssid, pbss_network->Ssid.SsidLength, -+ pbss_network_ext->Ssid.Ssid, pbss_network_ext->Ssid.SsidLength); -+ } -+ -+ return ret; -+} -+ -+static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_beacon_data *info) -+{ -+ int ret = 0; -+ _adapter *adapter = wiphy_to_adapter(wiphy); -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); -+ -+ return ret; -+} -+ -+static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ return 0; -+} -+ -+#endif //(LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) -+ -+static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev, -+ const u8 *mac, struct station_parameters *params) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) -+ u8 *mac) { -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)) -+ const u8 *mac) { -+#else -+ struct station_del_parameters *params) -+{ -+ const u8 *mac = params->mac; -+#endif -+ int ret=0; -+ _irqL irqL; -+ _list *phead, *plist; -+ u8 updated = _FALSE; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) -+ { -+ DBG_8192C("%s, fw_state != FW_LINKED|WIFI_AP_STATE\n", __func__); -+ return -EINVAL; -+ } -+ -+ -+ if(!mac) -+ { -+ DBG_8192C("flush all sta, and cam_entry\n"); -+ -+ flush_all_cam_entry(padapter); //clear CAM -+ -+ ret = rtw_sta_flush(padapter); -+ -+ return ret; -+ } -+ -+ -+ DBG_8192C("free sta macaddr =" MAC_FMT "\n", MAC_ARG(mac)); -+ -+ if (mac[0] == 0xff && mac[1] == 0xff && -+ mac[2] == 0xff && mac[3] == 0xff && -+ mac[4] == 0xff && mac[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ //check asoc_queue -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ -+ plist = get_next(plist); -+ -+ if(_rtw_memcmp(mac, psta->hwaddr, ETH_ALEN)) -+ { -+ if(psta->dot8021xalg == 1 && psta->bpairwise_key_installed == _FALSE) -+ { -+ DBG_8192C("%s, sta's dot8021xalg = 1 and key_installed = _FALSE\n", __func__); -+ } -+ else -+ { -+ DBG_8192C("free psta=%p, aid=%d\n", psta, psta->aid); -+ -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ -+ //_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); -+ //_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ psta = NULL; -+ -+ break; -+ } -+ -+ } -+ -+ } -+ -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ associated_clients_update(padapter, updated); -+ -+ DBG_871X("-"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ return ret; -+ -+} -+ -+static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *ndev, -+ const u8 *mac, struct station_parameters *params) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *ndev, -+ int idx, u8 *mac, struct station_info *sinfo) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ //TODO: dump scanned queue -+ -+ return -ENOENT; -+} -+ -+static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device *ndev, -+ struct bss_parameters *params) -+{ -+ u8 i; -+ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+/* -+ DBG_8192C("use_cts_prot=%d\n", params->use_cts_prot); -+ DBG_8192C("use_short_preamble=%d\n", params->use_short_preamble); -+ DBG_8192C("use_short_slot_time=%d\n", params->use_short_slot_time); -+ DBG_8192C("ap_isolate=%d\n", params->ap_isolate); -+ -+ DBG_8192C("basic_rates_len=%d\n", params->basic_rates_len); -+ for(i=0; ibasic_rates_len; i++) -+ { -+ DBG_8192C("basic_rates=%d\n", params->basic_rates[i]); -+ -+ } -+*/ -+ return 0; -+ -+} -+ -+static int cfg80211_rtw_set_channel(struct wiphy *wiphy -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ , struct net_device *ndev -+ #endif -+ , struct ieee80211_channel *chan, enum nl80211_channel_type channel_type) -+{ -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ #endif -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_auth_request *req) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ return 0; -+} -+ -+static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev, -+ struct cfg80211_assoc_request *req) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+ return 0; -+} -+#endif //CONFIG_AP_MODE -+ -+void rtw_cfg80211_rx_action_p2p(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) -+{ -+ int type; -+ s32 freq; -+ int channel; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ u8 category, action; -+ -+ channel = rtw_get_oper_ch(padapter); -+ -+ DBG_8192C("RTW_Rx:cur_ch=%d\n", channel); -+ #ifdef CONFIG_P2P -+ type = rtw_p2p_check_frames(padapter, pmgmt_frame, frame_len, _FALSE); -+ if (type >= 0) -+ goto indicate; -+ #endif -+ rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action); -+ DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action); -+ -+indicate: -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC); -+#else -+ cfg80211_rx_action(padapter->pnetdev, freq, pmgmt_frame, frame_len, GFP_ATOMIC); -+#endif -+} -+ -+void rtw_cfg80211_rx_p2p_action_public(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) -+{ -+ int type; -+ s32 freq; -+ int channel; -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ u8 category, action; -+ -+ channel = rtw_get_oper_ch(padapter); -+ -+ DBG_8192C("RTW_Rx:cur_ch=%d\n", channel); -+ #ifdef CONFIG_P2P -+ type = rtw_p2p_check_frames(padapter, pmgmt_frame, frame_len, _FALSE); -+ if (type >= 0) { -+ switch (type) { -+ case P2P_GO_NEGO_CONF: -+ case P2P_PROVISION_DISC_RESP: -+ case P2P_INVIT_RESP: -+ rtw_set_scan_deny(padapter, 2000); -+ rtw_clear_scan_deny(padapter); -+ } -+ goto indicate; -+ } -+ #endif -+ rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action); -+ DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action); -+ -+indicate: -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC); -+#else -+ cfg80211_rx_action(padapter->pnetdev, freq, pmgmt_frame, frame_len, GFP_ATOMIC); -+#endif -+} -+ -+void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const char*msg) -+{ -+ s32 freq; -+ int channel; -+ struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); -+ u8 category, action; -+ -+ channel = rtw_get_oper_ch(adapter); -+ -+ rtw_action_frame_parse(frame, frame_len, &category, &action); -+ -+ DBG_8192C("RTW_Rx:cur_ch=%d\n", channel); -+ if (msg) -+ DBG_871X("RTW_Rx:%s\n", msg); -+ else -+ DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action); -+ -+ if (channel <= RTW_CH_MAX_2G_CHANNEL) -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ); -+ else -+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ rtw_cfg80211_rx_mgmt(adapter, freq, 0, frame, frame_len, GFP_ATOMIC); -+#else -+ cfg80211_rx_action(adapter->pnetdev, freq, frame, frame_len, GFP_ATOMIC); -+#endif -+ -+} -+ -+#ifdef CONFIG_P2P -+void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, size_t len) -+{ -+ u16 wps_devicepassword_id = 0x0000; -+ uint wps_devicepassword_id_len = 0; -+ u8 wpsie[ 255 ] = { 0x00 }, p2p_ie[ 255 ] = { 0x00 }; -+ uint p2p_ielen = 0; -+ uint wpsielen = 0; -+ u32 devinfo_contentlen = 0; -+ u8 devinfo_content[64] = { 0x00 }; -+ u16 capability = 0; -+ uint capability_len = 0; -+ -+ unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; -+ u8 action = P2P_PUB_ACTION_ACTION; -+ u8 dialogToken = 1; -+ u32 p2poui = cpu_to_be32(P2POUI); -+ u8 oui_subtype = P2P_PROVISION_DISC_REQ; -+ u32 p2pielen = 0; -+#ifdef CONFIG_WFD -+ u32 wfdielen = 0; -+#endif //CONFIG_WFD -+ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ unsigned short *fctrl; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ u8 *frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr)); -+ size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ -+ DBG_871X( "[%s] In\n", __FUNCTION__ ); -+ -+ //prepare for building provision_request frame -+ _rtw_memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN); -+ _rtw_memcpy(pwdinfo->tx_prov_disc_info.peerDevAddr, GetAddr1Ptr(buf), ETH_ALEN); -+ -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_PUSH_BUTTON; -+ -+ rtw_get_wps_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, frame_body_len - _PUBLIC_ACTION_IE_OFFSET_, wpsie, &wpsielen); -+ rtw_get_wps_attr_content( wpsie, wpsielen, WPS_ATTR_DEVICE_PWID, (u8*) &wps_devicepassword_id, &wps_devicepassword_id_len); -+ wps_devicepassword_id = be16_to_cpu( wps_devicepassword_id ); -+ -+ switch(wps_devicepassword_id) -+ { -+ case WPS_DPID_PIN: -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_LABEL; -+ break; -+ case WPS_DPID_USER_SPEC: -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_DISPLYA; -+ break; -+ case WPS_DPID_MACHINE_SPEC: -+ break; -+ case WPS_DPID_REKEY: -+ break; -+ case WPS_DPID_PBC: -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_PUSH_BUTTON; -+ break; -+ case WPS_DPID_REGISTRAR_SPEC: -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_KEYPAD; -+ break; -+ default: -+ break; -+ } -+ -+ -+ if ( rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, frame_body_len - _PUBLIC_ACTION_IE_OFFSET_, p2p_ie, &p2p_ielen ) ) -+ { -+ -+ rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, devinfo_content, &devinfo_contentlen); -+ rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&capability, &capability_len); -+ -+ } -+ -+ -+ //start to build provision_request frame -+ _rtw_memset(wpsie, 0, sizeof(wpsie)); -+ _rtw_memset(p2p_ie, 0, sizeof(p2p_ie)); -+ p2p_ielen = 0; -+ -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ return; -+ } -+ -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ -+ fctrl = &(pwlanhdr->frame_ctl); -+ *(fctrl) = 0; -+ -+ _rtw_memcpy(pwlanhdr->addr1, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); -+ _rtw_memcpy(pwlanhdr->addr3, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN); -+ -+ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); -+ pmlmeext->mgnt_seq++; -+ SetFrameSubType(pframe, WIFI_ACTION); -+ -+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr); -+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); -+ -+ pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); -+ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen)); -+ -+ -+ //build_prov_disc_request_p2p_ie -+ // P2P OUI -+ p2pielen = 0; -+ p2p_ie[ p2pielen++ ] = 0x50; -+ p2p_ie[ p2pielen++ ] = 0x6F; -+ p2p_ie[ p2pielen++ ] = 0x9A; -+ p2p_ie[ p2pielen++ ] = 0x09; // WFA P2P v1.0 -+ -+ // Commented by Albert 20110301 -+ // According to the P2P Specification, the provision discovery request frame should contain 3 P2P attributes -+ // 1. P2P Capability -+ // 2. Device Info -+ // 3. Group ID ( When joining an operating P2P Group ) -+ -+ // P2P Capability ATTR -+ // Type: -+ p2p_ie[ p2pielen++ ] = P2P_ATTR_CAPABILITY; -+ -+ // Length: -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 0x0002 ); -+ RTW_PUT_LE16(p2p_ie + p2pielen, 0x0002); -+ p2pielen += 2; -+ -+ // Value: -+ // Device Capability Bitmap, 1 byte -+ // Group Capability Bitmap, 1 byte -+ _rtw_memcpy(p2p_ie + p2pielen, &capability, 2); -+ p2pielen += 2; -+ -+ -+ // Device Info ATTR -+ // Type: -+ p2p_ie[ p2pielen++ ] = P2P_ATTR_DEVICE_INFO; -+ -+ // Length: -+ // 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) -+ // + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) -+ //*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); -+ RTW_PUT_LE16(p2p_ie + p2pielen, devinfo_contentlen); -+ p2pielen += 2; -+ -+ // Value: -+ _rtw_memcpy(p2p_ie + p2pielen, devinfo_content, devinfo_contentlen); -+ p2pielen += devinfo_contentlen; -+ -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2p_ie, &p2p_ielen); -+ //p2pielen = build_prov_disc_request_p2p_ie( pwdinfo, pframe, NULL, 0, pwdinfo->tx_prov_disc_info.peerDevAddr); -+ //pframe += p2pielen; -+ pattrib->pktlen += p2p_ielen; -+ -+ wpsielen = 0; -+ // WPS OUI -+ *(u32*) ( wpsie ) = cpu_to_be32( WPSOUI ); -+ wpsielen += 4; -+ -+ // WPS version -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_VER1 ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0001 ); -+ wpsielen += 2; -+ -+ // Value: -+ wpsie[wpsielen++] = WPS_VERSION_1; // Version 1.0 -+ -+ // Config Method -+ // Type: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_CONF_METHOD ); -+ wpsielen += 2; -+ -+ // Length: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0002 ); -+ wpsielen += 2; -+ -+ // Value: -+ *(u16*) ( wpsie + wpsielen ) = cpu_to_be16( pwdinfo->tx_prov_disc_info.wps_config_method_request ); -+ wpsielen += 2; -+ -+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *) wpsie, &pattrib->pktlen ); -+ -+ -+#ifdef CONFIG_WFD -+ wfdielen = build_provdisc_req_wfd_ie(pwdinfo, pframe); -+ pframe += wfdielen; -+ pattrib->pktlen += wfdielen; -+#endif //CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ //dump_mgntframe(padapter, pmgntframe); -+ if (dump_mgntframe_and_wait_ack(padapter, pmgntframe) != _SUCCESS) -+ DBG_8192C("%s, ack to\n", __func__); -+ -+ //if(wps_devicepassword_id == WPS_DPID_REGISTRAR_SPEC) -+ //{ -+ // DBG_8192C("waiting for p2p peer key-in PIN CODE\n"); -+ // rtw_msleep_os(15000); // 15 sec for key in PIN CODE, workaround for GS2 before issuing Nego Req. -+ //} -+ -+} -+ -+static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+ struct wireless_dev *wdev, -+#else -+ struct net_device *ndev, -+#endif -+ struct ieee80211_channel * channel, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) -+ enum nl80211_channel_type channel_type, -+#endif -+ unsigned int duration, u64 *cookie) -+{ -+ s32 err = 0; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; -+ u8 remain_ch = (u8) ieee80211_frequency_to_channel(channel->center_freq); -+ u8 ready_on_channel = _FALSE; -+ -+ DBG_871X(FUNC_ADPT_FMT" ch:%u duration:%d\n", FUNC_ADPT_ARG(padapter), remain_ch, duration); -+ -+ if(pcfg80211_wdinfo->is_ro_ch == _TRUE) -+ { -+ DBG_8192C("%s, cancel ro ch timer\n", __func__); -+ -+ _cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ ATOMIC_SET(&pwdev_priv->ro_ch_to, 1); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ p2p_protocol_wk_hdl(padapter, P2P_RO_CH_WK); -+ } -+ -+ pcfg80211_wdinfo->is_ro_ch = _TRUE; -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) { -+ err = -EFAULT; -+ goto exit; -+ } -+ -+ _rtw_memcpy(&pcfg80211_wdinfo->remain_on_ch_channel, channel, sizeof(struct ieee80211_channel)); -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) -+ pcfg80211_wdinfo->remain_on_ch_type= channel_type; -+ #endif -+ pcfg80211_wdinfo->remain_on_ch_cookie= *cookie; -+ -+ rtw_scan_abort(padapter); -+#ifdef CONFIG_CONCURRENT_MODE -+ if(rtw_buddy_adapter_up(padapter)) -+ rtw_scan_abort(padapter->pbuddy_adapter); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ //if(!rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) && !rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ rtw_p2p_enable(padapter, P2P_ROLE_DEVICE); -+ wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _TRUE; -+ } -+ else -+ { -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); -+#endif -+ } -+ -+ -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN); -+ -+ -+ if(duration < 400) -+ duration = duration*3;//extend from exper. -+ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(check_buddy_fwstate(padapter, _FW_LINKED) && -+ (durationext_listen_interval)) -+ { -+ duration = duration + pwdinfo->ext_listen_interval; -+ } -+#endif -+ -+ pcfg80211_wdinfo->restore_channel = rtw_get_oper_ch(padapter); -+ -+ if(rtw_ch_set_search_ch(pmlmeext->channel_set, remain_ch) >= 0) { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ if(remain_ch != pbuddy_mlmeext->cur_channel) -+ { -+ if(ATOMIC_READ(&pwdev_priv->switch_ch_to)==1 || -+ (remain_ch != pmlmeext->cur_channel)) -+ { -+ DBG_8192C("%s, issue nulldata pwrbit=1\n", __func__); -+ issue_nulldata(padapter->pbuddy_adapter, NULL, 1, 3, 500); -+ -+ ATOMIC_SET(&pwdev_priv->switch_ch_to, 0); -+ -+ DBG_8192C("%s, set switch ch timer, duration=%d\n", __func__, duration-pwdinfo->ext_listen_interval); -+ _set_timer(&pwdinfo->ap_p2p_switch_timer, duration-pwdinfo->ext_listen_interval); -+ } -+ } -+ -+ ready_on_channel = _TRUE; -+ //pmlmeext->cur_channel = remain_ch; -+ //set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ }else -+#endif //CONFIG_CONCURRENT_MODE -+ if(remain_ch != pmlmeext->cur_channel ) -+ { -+ ready_on_channel = _TRUE; -+ //pmlmeext->cur_channel = remain_ch; -+ //set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ } else { -+ DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch); -+ } -+ -+ -+ //call this after other things have been done -+#ifdef CONFIG_CONCURRENT_MODE -+ if(ATOMIC_READ(&pwdev_priv->ro_ch_to)==1 || -+ (remain_ch != pmlmeext->cur_channel)) -+ { -+ u8 co_channel = 0xff; -+ ATOMIC_SET(&pwdev_priv->ro_ch_to, 0); -+#endif -+ -+ if(ready_on_channel == _TRUE) -+ { -+ if ( !check_fwstate(&padapter->mlmepriv, _FW_LINKED ) ) -+ pmlmeext->cur_channel = remain_ch; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ co_channel = rtw_get_oper_ch(padapter); -+ -+ if(co_channel !=remain_ch) -+#endif -+ { -+ if (!padapter->mlmepriv.LinkDetectInfo.bBusyTraffic) -+ set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ } -+ DBG_8192C("%s, set ro ch timer, duration=%d\n", __func__, duration); -+ _set_timer( &pcfg80211_wdinfo->remain_on_ch_timer, duration); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ } -+#endif -+ -+ rtw_cfg80211_ready_on_channel(padapter, *cookie, channel, channel_type, duration, GFP_KERNEL); -+ -+exit: -+ if (err) -+ pcfg80211_wdinfo->is_ro_ch = _FALSE; -+ -+ return err; -+} -+ -+static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+ struct wireless_dev *wdev, -+#else -+ struct net_device *ndev, -+#endif -+ u64 cookie) -+{ -+ s32 err = 0; -+ _adapter *padapter = wiphy_to_adapter(wiphy); -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; -+ -+ DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); -+ -+ if (pcfg80211_wdinfo->is_ro_ch == _TRUE) { -+ DBG_8192C("%s, cancel ro ch timer\n", __func__); -+ _cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer); -+ #ifdef CONFIG_CONCURRENT_MODE -+ ATOMIC_SET(&pwdev_priv->ro_ch_to, 1); -+ #endif -+ p2p_protocol_wk_hdl(padapter, P2P_RO_CH_WK); -+ } -+ -+ #if 0 -+ // Disable P2P Listen State -+ if(!rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) && !rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ _cancel_timer_ex( &pwdinfo->find_phase_timer ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ _cancel_timer_ex( &pwdinfo->pre_tx_scan_timer); -+ -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); -+ _rtw_memset(pwdinfo, 0x00, sizeof(struct wifidirect_info)); -+ } -+ } -+ else -+ #endif -+ { -+ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); -+#endif -+ } -+ pcfg80211_wdinfo->is_ro_ch = _FALSE; -+ -+ return err; -+} -+ -+#endif //CONFIG_P2P -+ -+static int _cfg80211_rtw_mgmt_tx(_adapter *padapter, u8 tx_ch, const u8 *buf, size_t len) -+{ -+ struct xmit_frame *pmgntframe; -+ struct pkt_attrib *pattrib; -+ unsigned char *pframe; -+ int ret = _FAIL; -+ bool ack = _TRUE; -+ struct rtw_ieee80211_hdr *pwlanhdr; -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ //struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) { -+ ret = -EFAULT; -+ goto exit; -+ } -+ -+ rtw_set_scan_deny(padapter, 1000); -+ -+ rtw_scan_abort(padapter); -+ #ifdef CONFIG_CONCURRENT_MODE -+ if(rtw_buddy_adapter_up(padapter)) -+ rtw_scan_abort(padapter->pbuddy_adapter); -+ #endif /* CONFIG_CONCURRENT_MODE */ -+ -+ if (padapter->cfg80211_wdinfo.is_ro_ch == _TRUE) { -+ //DBG_8192C("%s, cancel ro ch timer\n", __func__); -+ //_cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer); -+ //padapter->cfg80211_wdinfo.is_ro_ch = _FALSE; -+ #ifdef CONFIG_CONCURRENT_MODE -+ if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED )) -+ { -+ DBG_8192C("%s, extend ro ch time\n", __func__); -+ _set_timer( &padapter->cfg80211_wdinfo.remain_on_ch_timer, pwdinfo->ext_listen_period); -+ } -+ #endif //CONFIG_CONCURRENT_MODE -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, _FW_LINKED )) { -+ u8 co_channel=0xff; -+ PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ co_channel = rtw_get_oper_ch(padapter); -+ -+ if (tx_ch != pbuddy_mlmeext->cur_channel) { -+ -+ u16 ext_listen_period; -+ -+ if (ATOMIC_READ(&pwdev_priv->switch_ch_to)==1) { -+ DBG_8192C("%s, issue nulldata pwrbit=1\n", __func__); -+ issue_nulldata(padapter->pbuddy_adapter, NULL, 1, 3, 500); -+ -+ ATOMIC_SET(&pwdev_priv->switch_ch_to, 0); -+ -+ //DBG_8192C("%s, set switch ch timer, period=%d\n", __func__, pwdinfo->ext_listen_period); -+ //_set_timer(&pwdinfo->ap_p2p_switch_timer, pwdinfo->ext_listen_period); -+ } -+ -+ if (check_fwstate(&padapter->mlmepriv, _FW_LINKED )) -+ { -+ ext_listen_period = 500;// 500ms -+ } -+ else -+ { -+ ext_listen_period = pwdinfo->ext_listen_period; -+ } -+ -+ DBG_8192C("%s, set switch ch timer, period=%d\n", __func__, ext_listen_period); -+ _set_timer(&pwdinfo->ap_p2p_switch_timer, ext_listen_period); -+ -+ } -+ -+ if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED )) -+ pmlmeext->cur_channel = tx_ch; -+ -+ if (tx_ch != co_channel) -+ set_channel_bwmode(padapter, tx_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ }else -+#endif //CONFIG_CONCURRENT_MODE -+ //if (tx_ch != pmlmeext->cur_channel) { -+ if(tx_ch != rtw_get_oper_ch(padapter)) { -+ if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED )) -+ pmlmeext->cur_channel = tx_ch; -+ set_channel_bwmode(padapter, tx_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ -+ //starting alloc mgmt frame to dump it -+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) -+ { -+ //ret = -ENOMEM; -+ ret = _FAIL; -+ goto exit; -+ } -+ -+ //update attribute -+ pattrib = &pmgntframe->attrib; -+ update_mgntframe_attrib(padapter, pattrib); -+ pattrib->retry_ctrl = _FALSE; -+ -+ _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); -+ -+ pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; -+ -+ _rtw_memcpy(pframe, (void*)buf, len); -+ pattrib->pktlen = len; -+ -+ pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; -+ //update seq number -+ pmlmeext->mgnt_seq = GetSequence(pwlanhdr); -+ pattrib->seqnum = pmlmeext->mgnt_seq; -+ pmlmeext->mgnt_seq++; -+ -+#ifdef CONFIG_WFD -+ { -+ struct wifi_display_info *pwfd_info; -+ -+ pwfd_info = padapter->wdinfo.wfd_info; -+ -+ if ( _TRUE == pwfd_info->wfd_enable ) -+ { -+ rtw_append_wfd_ie( padapter, pframe, &pattrib->pktlen ); -+ } -+ } -+#endif // CONFIG_WFD -+ -+ pattrib->last_txcmdsz = pattrib->pktlen; -+ -+ if (dump_mgntframe_and_wait_ack(padapter, pmgntframe) != _SUCCESS) -+ { -+ ack = _FALSE; -+ ret = _FAIL; -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, ack == _FAIL\n", __func__); -+ #endif -+ } -+ else -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, ack=%d, ok!\n", __func__, ack); -+ #endif -+ ret = _SUCCESS; -+ } -+ -+exit: -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, ret=%d\n", __func__, ret); -+ #endif -+ -+ return ret; -+ -+} -+ -+static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -+ struct wireless_dev *wdev, -+#else -+ struct net_device *ndev, -+#endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) -+ struct cfg80211_mgmt_tx_params *params, -+#else -+ struct ieee80211_channel *chan, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ bool offchan, -+#endif -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) -+ enum nl80211_channel_type channel_type, -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ bool channel_type_valid, -+ #endif -+#endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ unsigned int wait, -+#endif -+ const u8 *buf, size_t len, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) -+ bool no_cck, -+#endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -+ bool dont_wait_for_ack, -+#endif -+#endif -+ u64 *cookie) -+{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) -+ struct ieee80211_channel *chan = params->chan; -+ const u8 *buf = params->buf; -+ size_t len = params->len; -+#endif -+ -+ _adapter *padapter = (_adapter *)wiphy_to_adapter(wiphy); -+ struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); -+ int ret = 0; -+ int tx_ret; -+ u32 dump_limit = RTW_MAX_MGMT_TX_CNT; -+ u32 dump_cnt = 0; -+ bool ack = _TRUE; -+ u8 tx_ch = (u8)ieee80211_frequency_to_channel(chan->center_freq); -+ u8 category, action; -+ int type = (-1); -+ u32 start = rtw_get_current_time(); -+ -+ /* cookie generation */ -+ *cookie = (unsigned long) buf; -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X(FUNC_ADPT_FMT" len=%zu, ch=%d" -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) -+ ", ch_type=%d" -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ ", channel_type_valid=%d" -+ #endif -+ #endif -+ "\n", FUNC_ADPT_ARG(padapter), -+ len, tx_ch -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) -+ , channel_type -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ , channel_type_valid -+ #endif -+ #endif -+ ); -+#endif /* CONFIG_DEBUG_CFG80211 */ -+ -+ /* indicate ack before issue frame to avoid racing with rsp frame */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ rtw_cfg80211_mgmt_tx_status(padapter, *cookie, buf, len, ack, GFP_KERNEL); -+#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) -+ cfg80211_action_tx_status(ndev, *cookie, buf, len, ack, GFP_KERNEL); -+#endif -+ -+ if (rtw_action_frame_parse(buf, len, &category, &action) == _FALSE) { -+ DBG_8192C(FUNC_ADPT_FMT" frame_control:0x%x\n", FUNC_ADPT_ARG(padapter), -+ le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)buf)->frame_ctl)); -+ goto exit; -+ } -+ -+ DBG_8192C("RTW_Tx:tx_ch=%d, da="MAC_FMT"\n", tx_ch, MAC_ARG(GetAddr1Ptr(buf))); -+ #ifdef CONFIG_P2P -+ if((type = rtw_p2p_check_frames(padapter, buf, len, _TRUE)) >= 0) { -+ goto dump; -+ } -+ #endif -+ if (category == RTW_WLAN_CATEGORY_PUBLIC) -+ DBG_871X("RTW_Tx:%s\n", action_public_str(action)); -+ else -+ DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, action); -+ -+dump: -+ do { -+ dump_cnt++; -+ tx_ret = _cfg80211_rtw_mgmt_tx(padapter, tx_ch, buf, len); -+ } while (dump_cnt < dump_limit && tx_ret != _SUCCESS); -+ -+ if (tx_ret != _SUCCESS || dump_cnt > 1) { -+ DBG_871X(FUNC_ADPT_FMT" %s (%d/%d) in %d ms\n", FUNC_ADPT_ARG(padapter), -+ tx_ret==_SUCCESS?"OK":"FAIL", dump_cnt, dump_limit, rtw_get_passing_time_ms(start)); -+ } -+ -+ switch (type) { -+ case P2P_GO_NEGO_CONF: -+ rtw_clear_scan_deny(padapter); -+ break; -+ case P2P_INVIT_RESP: -+ if (pwdev_priv->invit_info.flags & BIT(0) -+ && pwdev_priv->invit_info.status == 0) -+ { -+ DBG_871X(FUNC_ADPT_FMT" agree with invitation of persistent group\n", -+ FUNC_ADPT_ARG(padapter)); -+ rtw_set_scan_deny(padapter, 5000); -+ rtw_pwr_wakeup_ex(padapter, 5000); -+ rtw_clear_scan_deny(padapter); -+ } -+ break; -+ } -+ -+exit: -+ return ret; -+} -+ -+static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) -+ struct wireless_dev *wdev, -+#else -+ struct net_device *ndev, -+#endif -+ u16 frame_type, bool reg) -+{ -+ _adapter *adapter = wiphy_to_adapter(wiphy); -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_871X(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter), -+ frame_type, reg); -+#endif -+ -+ if (frame_type != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ)) -+ return; -+ -+ return; -+} -+ -+static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, int len) -+{ -+ int ret = 0; -+ uint wps_ielen = 0; -+ u8 *wps_ie; -+ u32 p2p_ielen = 0; -+ u8 wps_oui[8]={0x0,0x50,0xf2,0x04}; -+ u8 *p2p_ie; -+ u32 wfd_ielen = 0; -+ u8 *wfd_ie; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ -+ DBG_871X(FUNC_NDEV_FMT" ielen=%d\n", FUNC_NDEV_ARG(ndev), len); -+ -+ if(len>0) -+ { -+ if((wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen))) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("bcn_wps_ielen=%d\n", wps_ielen); -+ #endif -+ -+ if(pmlmepriv->wps_beacon_ie) -+ { -+ u32 free_len = pmlmepriv->wps_beacon_ie_len; -+ pmlmepriv->wps_beacon_ie_len = 0; -+ rtw_mfree(pmlmepriv->wps_beacon_ie, free_len); -+ pmlmepriv->wps_beacon_ie = NULL; -+ } -+ -+ pmlmepriv->wps_beacon_ie = rtw_malloc(wps_ielen); -+ if ( pmlmepriv->wps_beacon_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ -+ _rtw_memcpy(pmlmepriv->wps_beacon_ie, wps_ie, wps_ielen); -+ pmlmepriv->wps_beacon_ie_len = wps_ielen; -+ -+ update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, _TRUE); -+ -+ } -+ -+ //buf += wps_ielen; -+ //len -= wps_ielen; -+ -+ #ifdef CONFIG_P2P -+ if((p2p_ie=rtw_get_p2p_ie(buf, len, NULL, &p2p_ielen))) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("bcn_p2p_ielen=%d\n", p2p_ielen); -+ #endif -+ -+ if(pmlmepriv->p2p_beacon_ie) -+ { -+ u32 free_len = pmlmepriv->p2p_beacon_ie_len; -+ pmlmepriv->p2p_beacon_ie_len = 0; -+ rtw_mfree(pmlmepriv->p2p_beacon_ie, free_len); -+ pmlmepriv->p2p_beacon_ie = NULL; -+ } -+ -+ pmlmepriv->p2p_beacon_ie = rtw_malloc(p2p_ielen); -+ if ( pmlmepriv->p2p_beacon_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ -+ _rtw_memcpy(pmlmepriv->p2p_beacon_ie, p2p_ie, p2p_ielen); -+ pmlmepriv->p2p_beacon_ie_len = p2p_ielen; -+ -+ } -+ #endif //CONFIG_P2P -+ -+ //buf += p2p_ielen; -+ //len -= p2p_ielen; -+ -+ #ifdef CONFIG_WFD -+ if(rtw_get_wfd_ie(buf, len, NULL, &wfd_ielen)) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("bcn_wfd_ielen=%d\n", wfd_ielen); -+ #endif -+ -+ if(pmlmepriv->wfd_beacon_ie) -+ { -+ u32 free_len = pmlmepriv->wfd_beacon_ie_len; -+ pmlmepriv->wfd_beacon_ie_len = 0; -+ rtw_mfree(pmlmepriv->wfd_beacon_ie, free_len); -+ pmlmepriv->wfd_beacon_ie = NULL; -+ } -+ -+ pmlmepriv->wfd_beacon_ie = rtw_malloc(wfd_ielen); -+ if ( pmlmepriv->wfd_beacon_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ rtw_get_wfd_ie(buf, len, pmlmepriv->wfd_beacon_ie, &pmlmepriv->wfd_beacon_ie_len); -+ } -+ #endif //CONFIG_WFD -+ -+ pmlmeext->bstart_bss = _TRUE; -+ -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *buf, int len) -+{ -+ int ret = 0; -+ uint wps_ielen = 0; -+ u8 *wps_ie; -+ u32 p2p_ielen = 0; -+ u8 *p2p_ie; -+ u32 wfd_ielen = 0; -+ u8 *wfd_ie; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(net); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, ielen=%d\n", __func__, len); -+#endif -+ -+ if(len>0) -+ { -+ if((wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen))) -+ { -+ uint attr_contentlen = 0; -+ u16 uconfig_method, *puconfig_method = NULL; -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("probe_resp_wps_ielen=%d\n", wps_ielen); -+ #endif -+ -+ if(check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) -+ { -+ u8 sr = 0; -+ rtw_get_wps_attr_content(wps_ie, wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8*)(&sr), NULL); -+ -+ if (sr != 0) -+ { -+ DBG_871X("%s, got sr\n", __func__); -+ } -+ else -+ { -+ DBG_8192C("GO mode process WPS under site-survey, sr no set\n"); -+ return ret; -+ } -+ } -+ -+ if(pmlmepriv->wps_probe_resp_ie) -+ { -+ u32 free_len = pmlmepriv->wps_probe_resp_ie_len; -+ pmlmepriv->wps_probe_resp_ie_len = 0; -+ rtw_mfree(pmlmepriv->wps_probe_resp_ie, free_len); -+ pmlmepriv->wps_probe_resp_ie = NULL; -+ } -+ -+ pmlmepriv->wps_probe_resp_ie = rtw_malloc(wps_ielen); -+ if ( pmlmepriv->wps_probe_resp_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ -+ //add PUSH_BUTTON config_method by driver self in wpsie of probe_resp at GO Mode -+ if ( (puconfig_method = (u16*)rtw_get_wps_attr_content( wps_ie, wps_ielen, WPS_ATTR_CONF_METHOD , NULL, &attr_contentlen)) != NULL ) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ //printk("config_method in wpsie of probe_resp = 0x%x\n", be16_to_cpu(*puconfig_method)); -+ #endif -+ -+ uconfig_method = WPS_CM_PUSH_BUTTON; -+ uconfig_method = cpu_to_be16( uconfig_method ); -+ -+ *puconfig_method |= uconfig_method; -+ } -+ -+ _rtw_memcpy(pmlmepriv->wps_probe_resp_ie, wps_ie, wps_ielen); -+ pmlmepriv->wps_probe_resp_ie_len = wps_ielen; -+ -+ } -+ -+ //buf += wps_ielen; -+ //len -= wps_ielen; -+ -+ #ifdef CONFIG_P2P -+ if((p2p_ie=rtw_get_p2p_ie(buf, len, NULL, &p2p_ielen))) -+ { -+ u8 is_GO = _FALSE; -+ u32 attr_contentlen = 0; -+ u16 cap_attr=0; -+ -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("probe_resp_p2p_ielen=%d\n", p2p_ielen); -+ #endif -+ -+ //Check P2P Capability ATTR -+ if( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) ) -+ { -+ u8 grp_cap=0; -+ //DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ ); -+ cap_attr = le16_to_cpu(cap_attr); -+ grp_cap = (u8)((cap_attr >> 8)&0xff); -+ -+ is_GO = (grp_cap&BIT(0)) ? _TRUE:_FALSE; -+ -+ if(is_GO) -+ DBG_8192C("Got P2P Capability Attr, grp_cap=0x%x, is_GO\n", grp_cap); -+ } -+ -+ -+ if(is_GO == _FALSE) -+ { -+ if(pmlmepriv->p2p_probe_resp_ie) -+ { -+ u32 free_len = pmlmepriv->p2p_probe_resp_ie_len; -+ pmlmepriv->p2p_probe_resp_ie_len = 0; -+ rtw_mfree(pmlmepriv->p2p_probe_resp_ie, free_len); -+ pmlmepriv->p2p_probe_resp_ie = NULL; -+ } -+ -+ pmlmepriv->p2p_probe_resp_ie = rtw_malloc(p2p_ielen); -+ if ( pmlmepriv->p2p_probe_resp_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ _rtw_memcpy(pmlmepriv->p2p_probe_resp_ie, p2p_ie, p2p_ielen); -+ pmlmepriv->p2p_probe_resp_ie_len = p2p_ielen; -+ } -+ else -+ { -+ if(pmlmepriv->p2p_go_probe_resp_ie) -+ { -+ u32 free_len = pmlmepriv->p2p_go_probe_resp_ie_len; -+ pmlmepriv->p2p_go_probe_resp_ie_len = 0; -+ rtw_mfree(pmlmepriv->p2p_go_probe_resp_ie, free_len); -+ pmlmepriv->p2p_go_probe_resp_ie = NULL; -+ } -+ -+ pmlmepriv->p2p_go_probe_resp_ie = rtw_malloc(p2p_ielen); -+ if ( pmlmepriv->p2p_go_probe_resp_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ _rtw_memcpy(pmlmepriv->p2p_go_probe_resp_ie, p2p_ie, p2p_ielen); -+ pmlmepriv->p2p_go_probe_resp_ie_len = p2p_ielen; -+ } -+ -+ } -+ #endif //CONFIG_P2P -+ -+ //buf += p2p_ielen; -+ //len -= p2p_ielen; -+ -+ #ifdef CONFIG_WFD -+ if(rtw_get_wfd_ie(buf, len, NULL, &wfd_ielen)) -+ { -+ #ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("probe_resp_wfd_ielen=%d\n", wfd_ielen); -+ #endif -+ -+ if(pmlmepriv->wfd_probe_resp_ie) -+ { -+ u32 free_len = pmlmepriv->wfd_probe_resp_ie_len; -+ pmlmepriv->wfd_probe_resp_ie_len = 0; -+ rtw_mfree(pmlmepriv->wfd_probe_resp_ie, free_len); -+ pmlmepriv->wfd_probe_resp_ie = NULL; -+ } -+ -+ pmlmepriv->wfd_probe_resp_ie = rtw_malloc(wfd_ielen); -+ if ( pmlmepriv->wfd_probe_resp_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ rtw_get_wfd_ie(buf, len, pmlmepriv->wfd_probe_resp_ie, &pmlmepriv->wfd_probe_resp_ie_len); -+ } -+ #endif //CONFIG_WFD -+ -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *buf, int len) -+{ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(net); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ DBG_8192C("%s, ielen=%d\n", __func__, len); -+ -+ if(len>0) -+ { -+ if(pmlmepriv->wps_assoc_resp_ie) -+ { -+ u32 free_len = pmlmepriv->wps_assoc_resp_ie_len; -+ pmlmepriv->wps_assoc_resp_ie_len = 0; -+ rtw_mfree(pmlmepriv->wps_assoc_resp_ie, free_len); -+ pmlmepriv->wps_assoc_resp_ie = NULL; -+ } -+ -+ pmlmepriv->wps_assoc_resp_ie = rtw_malloc(len); -+ if ( pmlmepriv->wps_assoc_resp_ie == NULL) { -+ DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ -+ } -+ _rtw_memcpy(pmlmepriv->wps_assoc_resp_ie, buf, len); -+ pmlmepriv->wps_assoc_resp_ie_len = len; -+ } -+ -+ return ret; -+ -+} -+ -+int rtw_cfg80211_set_mgnt_wpsp2pie(struct net_device *net, char *buf, int len, -+ int type) -+{ -+ int ret = 0; -+ uint wps_ielen = 0; -+ u32 p2p_ielen = 0; -+ -+#ifdef CONFIG_DEBUG_CFG80211 -+ DBG_8192C("%s, ielen=%d\n", __func__, len); -+#endif -+ -+ if( (rtw_get_wps_ie(buf, len, NULL, &wps_ielen) && (wps_ielen>0)) -+ #ifdef CONFIG_P2P -+ || (rtw_get_p2p_ie(buf, len, NULL, &p2p_ielen) && (p2p_ielen>0)) -+ #endif -+ ) -+ { -+ if (net != NULL) -+ { -+ switch (type) -+ { -+ case 0x1: //BEACON -+ ret = rtw_cfg80211_set_beacon_wpsp2pie(net, buf, len); -+ break; -+ case 0x2: //PROBE_RESP -+ ret = rtw_cfg80211_set_probe_resp_wpsp2pie(net, buf, len); -+ break; -+ case 0x4: //ASSOC_RESP -+ ret = rtw_cfg80211_set_assoc_resp_wpsp2pie(net, buf, len); -+ break; -+ } -+ } -+ } -+ -+ return ret; -+ -+} -+ -+static struct cfg80211_ops rtw_cfg80211_ops = { -+ .change_virtual_intf = cfg80211_rtw_change_iface, -+ .add_key = cfg80211_rtw_add_key, -+ .get_key = cfg80211_rtw_get_key, -+ .del_key = cfg80211_rtw_del_key, -+ .set_default_key = cfg80211_rtw_set_default_key, -+ .get_station = cfg80211_rtw_get_station, -+ .scan = cfg80211_rtw_scan, -+ .set_wiphy_params = cfg80211_rtw_set_wiphy_params, -+ .connect = cfg80211_rtw_connect, -+ .disconnect = cfg80211_rtw_disconnect, -+ .join_ibss = cfg80211_rtw_join_ibss, -+ .leave_ibss = cfg80211_rtw_leave_ibss, -+ .set_tx_power = cfg80211_rtw_set_txpower, -+ .get_tx_power = cfg80211_rtw_get_txpower, -+ .set_power_mgmt = cfg80211_rtw_set_power_mgmt, -+ .set_pmksa = cfg80211_rtw_set_pmksa, -+ .del_pmksa = cfg80211_rtw_del_pmksa, -+ .flush_pmksa = cfg80211_rtw_flush_pmksa, -+ -+#ifdef CONFIG_AP_MODE -+ .add_virtual_intf = cfg80211_rtw_add_virtual_intf, -+ .del_virtual_intf = cfg80211_rtw_del_virtual_intf, -+ -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) && !defined(COMPAT_KERNEL_RELEASE) -+ .add_beacon = cfg80211_rtw_add_beacon, -+ .set_beacon = cfg80211_rtw_set_beacon, -+ .del_beacon = cfg80211_rtw_del_beacon, -+ #else -+ .start_ap = cfg80211_rtw_start_ap, -+ .change_beacon = cfg80211_rtw_change_beacon, -+ .stop_ap = cfg80211_rtw_stop_ap, -+ #endif -+ -+ .add_station = cfg80211_rtw_add_station, -+ .del_station = cfg80211_rtw_del_station, -+ .change_station = cfg80211_rtw_change_station, -+ .dump_station = cfg80211_rtw_dump_station, -+ .change_bss = cfg80211_rtw_change_bss, -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) -+ .set_channel = cfg80211_rtw_set_channel, -+ #endif -+ //.auth = cfg80211_rtw_auth, -+ //.assoc = cfg80211_rtw_assoc, -+#endif //CONFIG_AP_MODE -+ -+#ifdef CONFIG_P2P -+ .remain_on_channel = cfg80211_rtw_remain_on_channel, -+ .cancel_remain_on_channel = cfg80211_rtw_cancel_remain_on_channel, -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+ .mgmt_tx = cfg80211_rtw_mgmt_tx, -+ .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, -+#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) -+ .action = cfg80211_rtw_mgmt_tx, -+#endif -+}; -+ -+static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band, u8 rf_type) -+{ -+ -+#define MAX_BIT_RATE_40MHZ_MCS15 300 /* Mbps */ -+#define MAX_BIT_RATE_40MHZ_MCS7 150 /* Mbps */ -+ -+ ht_cap->ht_supported = _TRUE; -+ -+ ht_cap->cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 | -+ IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20 | -+ IEEE80211_HT_CAP_DSSSCCK40 | IEEE80211_HT_CAP_MAX_AMSDU; -+ -+ /* -+ *Maximum length of AMPDU that the STA can receive. -+ *Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets) -+ */ -+ ht_cap->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; -+ -+ /*Minimum MPDU start spacing , */ -+ ht_cap->ampdu_density = IEEE80211_HT_MPDU_DENSITY_16; -+ -+ ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED; -+ -+ /* -+ *hw->wiphy->bands[NL80211_BAND_2GHZ] -+ *base on ant_num -+ *rx_mask: RX mask -+ *if rx_ant =1 rx_mask[0]=0xff;==>MCS0-MCS7 -+ *if rx_ant =2 rx_mask[1]=0xff;==>MCS8-MCS15 -+ *if rx_ant >=3 rx_mask[2]=0xff; -+ *if BW_40 rx_mask[4]=0x01; -+ *highest supported RX rate -+ */ -+ if(rf_type == RF_1T1R) -+ { -+ ht_cap->mcs.rx_mask[0] = 0xFF; -+ ht_cap->mcs.rx_mask[1] = 0x00; -+ ht_cap->mcs.rx_mask[4] = 0x01; -+ -+ ht_cap->mcs.rx_highest = MAX_BIT_RATE_40MHZ_MCS7; -+ } -+ else if((rf_type == RF_1T2R) || (rf_type==RF_2T2R)) -+ { -+ ht_cap->mcs.rx_mask[0] = 0xFF; -+ ht_cap->mcs.rx_mask[1] = 0xFF; -+ ht_cap->mcs.rx_mask[4] = 0x01; -+ -+ ht_cap->mcs.rx_highest = MAX_BIT_RATE_40MHZ_MCS15; -+ } -+ else -+ { -+ DBG_8192C("%s, error rf_type=%d\n", __func__, rf_type); -+ } -+ -+} -+ -+void rtw_cfg80211_init_wiphy(_adapter *padapter) -+{ -+ u8 rf_type; -+ struct ieee80211_supported_band *bands; -+ struct wireless_dev *pwdev = padapter->rtw_wdev; -+ struct wiphy *wiphy = pwdev->wiphy; -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ -+ DBG_8192C("%s:rf_type=%d\n", __func__, rf_type); -+ -+ /* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */ -+ { -+ bands = wiphy->bands[NL80211_BAND_2GHZ]; -+ if(bands) -+ rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_2GHZ, rf_type); -+ } -+ -+ /* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */ -+ { -+ bands = wiphy->bands[NL80211_BAND_5GHZ]; -+ if(bands) -+ rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_5GHZ, rf_type); -+ } -+} -+ -+/* -+struct ieee80211_iface_limit rtw_limits[] = { -+ { .max = 1, .types = BIT(NL80211_IFTYPE_STATION) -+ | BIT(NL80211_IFTYPE_ADHOC) -+#ifdef CONFIG_AP_MODE -+ | BIT(NL80211_IFTYPE_AP) -+#endif -+#if defined(CONFIG_P2P) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)) -+ | BIT(NL80211_IFTYPE_P2P_CLIENT) -+ | BIT(NL80211_IFTYPE_P2P_GO) -+#endif -+ }, -+ {.max = 1, .types = BIT(NL80211_IFTYPE_MONITOR)}, -+}; -+ -+struct ieee80211_iface_combination rtw_combinations = { -+ .limits = rtw_limits, -+ .n_limits = ARRAY_SIZE(rtw_limits), -+ .max_interfaces = 2, -+ .num_different_channels = 1, -+}; -+*/ -+ -+static void rtw_cfg80211_preinit_wiphy(_adapter *padapter, struct wiphy *wiphy) -+{ -+ -+ wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; -+ -+ wiphy->max_scan_ssids = RTW_SSID_SCAN_AMOUNT; -+ wiphy->max_scan_ie_len = RTW_SCAN_IE_LEN_MAX; -+ wiphy->max_num_pmkids = RTW_MAX_NUM_PMKIDS; -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) -+ wiphy->max_remain_on_channel_duration = RTW_MAX_REMAIN_ON_CHANNEL_DURATION; -+#endif -+ -+ wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) -+ | BIT(NL80211_IFTYPE_ADHOC) -+#ifdef CONFIG_AP_MODE -+ | BIT(NL80211_IFTYPE_AP) -+ | BIT(NL80211_IFTYPE_MONITOR) -+#endif -+#if defined(CONFIG_P2P) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)) -+ | BIT(NL80211_IFTYPE_P2P_CLIENT) -+ | BIT(NL80211_IFTYPE_P2P_GO) -+#endif -+ ; -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) -+#ifdef CONFIG_AP_MODE -+ wiphy->mgmt_stypes = rtw_cfg80211_default_mgmt_stypes; -+#endif //CONFIG_AP_MODE -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)) -+ wiphy->software_iftypes |= BIT(NL80211_IFTYPE_MONITOR); -+#endif -+ -+ /* -+ wiphy->iface_combinations = &rtw_combinations; -+ wiphy->n_iface_combinations = 1; -+ */ -+ -+ wiphy->cipher_suites = rtw_cipher_suites; -+ wiphy->n_cipher_suites = ARRAY_SIZE(rtw_cipher_suites); -+ -+ /* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */ -+ wiphy->bands[NL80211_BAND_2GHZ] = rtw_spt_band_alloc(NL80211_BAND_2GHZ); -+ /* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */ -+ wiphy->bands[NL80211_BAND_5GHZ] = rtw_spt_band_alloc(NL80211_BAND_5GHZ); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)) -+ wiphy->flags |= WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS; -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -+ wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; -+ wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME; -+#endif -+ -+ if(padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE) -+ wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; -+ else -+ wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; -+} -+ -+int rtw_wdev_alloc(_adapter *padapter, struct device *dev) -+{ -+ int ret = 0; -+ struct wiphy *wiphy; -+ struct wireless_dev *wdev; -+ struct rtw_wdev_priv *pwdev_priv; -+ struct net_device *pnetdev = padapter->pnetdev; -+ -+ DBG_8192C("%s(padapter=%p)\n", __func__, padapter); -+ -+ /* wiphy */ -+ wiphy = wiphy_new(&rtw_cfg80211_ops, sizeof(struct rtw_wdev_priv)); -+ if (!wiphy) { -+ DBG_8192C("Couldn't allocate wiphy device\n"); -+ ret = -ENOMEM; -+ goto exit; -+ } -+ set_wiphy_dev(wiphy, dev); -+ rtw_cfg80211_preinit_wiphy(padapter, wiphy); -+ -+ ret = wiphy_register(wiphy); -+ if (ret < 0) { -+ DBG_8192C("Couldn't register wiphy device\n"); -+ goto free_wiphy; -+ } -+ -+ /* wdev */ -+ wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev)); -+ if (!wdev) { -+ DBG_8192C("Couldn't allocate wireless device\n"); -+ ret = -ENOMEM; -+ goto unregister_wiphy; -+ } -+ wdev->wiphy = wiphy; -+ wdev->netdev = pnetdev; -+ -+ wdev->iftype = NL80211_IFTYPE_STATION; // will be init in rtw_hal_init() -+ // Must sync with _rtw_init_mlme_priv() -+ // pmlmepriv->fw_state = WIFI_STATION_STATE -+ //wdev->iftype = NL80211_IFTYPE_MONITOR; // for rtw_setopmode_cmd() in cfg80211_rtw_change_iface() -+ padapter->rtw_wdev = wdev; -+ pnetdev->ieee80211_ptr = wdev; -+ -+ //init pwdev_priv -+ pwdev_priv = wdev_to_priv(wdev); -+ pwdev_priv->rtw_wdev = wdev; -+ pwdev_priv->pmon_ndev = NULL; -+ pwdev_priv->ifname_mon[0] = '\0'; -+ pwdev_priv->padapter = padapter; -+ pwdev_priv->scan_request = NULL; -+ _rtw_spinlock_init(&pwdev_priv->scan_req_lock); -+ -+ pwdev_priv->p2p_enabled = _FALSE; -+ pwdev_priv->provdisc_req_issued = _FALSE; -+ rtw_wdev_invit_info_init(&pwdev_priv->invit_info); -+ rtw_wdev_nego_info_init(&pwdev_priv->nego_info); -+ -+ pwdev_priv->bandroid_scan = _FALSE; -+ -+ if(padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE) -+ pwdev_priv->power_mgmt = _TRUE; -+ else -+ pwdev_priv->power_mgmt = _FALSE; -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ ATOMIC_SET(&pwdev_priv->switch_ch_to, 1); -+ ATOMIC_SET(&pwdev_priv->ro_ch_to, 1); -+#endif -+ -+ return ret; -+ -+ rtw_mfree((u8*)wdev, sizeof(struct wireless_dev)); -+unregister_wiphy: -+ wiphy_unregister(wiphy); -+ free_wiphy: -+ wiphy_free(wiphy); -+exit: -+ return ret; -+ -+} -+ -+void rtw_wdev_free(struct wireless_dev *wdev) -+{ -+ struct rtw_wdev_priv *pwdev_priv; -+ -+ DBG_8192C("%s(wdev=%p)\n", __func__, wdev); -+ -+ if (!wdev) -+ return; -+ -+ pwdev_priv = wdev_to_priv(wdev); -+ -+ rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_2GHZ]); -+ rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_5GHZ]); -+ -+ wiphy_free(wdev->wiphy); -+ -+ rtw_mfree((u8*)wdev, sizeof(struct wireless_dev)); -+} -+ -+void rtw_wdev_unregister(struct wireless_dev *wdev) -+{ -+ struct rtw_wdev_priv *pwdev_priv; -+ -+ DBG_8192C("%s(wdev=%p)\n", __func__, wdev); -+ -+ if (!wdev) -+ return; -+ -+ pwdev_priv = wdev_to_priv(wdev); -+ -+ rtw_cfg80211_indicate_scan_done(pwdev_priv, _TRUE); -+ -+ if (pwdev_priv->pmon_ndev) { -+ DBG_8192C("%s, unregister monitor interface\n", __func__); -+ unregister_netdev(pwdev_priv->pmon_ndev); -+ } -+ -+ wiphy_unregister(wdev->wiphy); -+} -+ -+#endif //CONFIG_IOCTL_CFG80211 -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c -@@ -0,0 +1,11909 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _IOCTL_LINUX_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+//#ifdef CONFIG_MP_INCLUDED -+#include -+//#endif -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif //CONFIG_USB_HCI -+#include -+ -+#ifdef CONFIG_MP_INCLUDED -+#include -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) -+#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e) -+#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e) -+#endif -+ -+ -+#define RTL_IOCTL_WPA_SUPPLICANT SIOCIWFIRSTPRIV+30 -+ -+#define SCAN_ITEM_SIZE 768 -+#define MAX_CUSTOM_LEN 64 -+#define RATE_COUNT 4 -+ -+#ifdef CONFIG_GLOBAL_UI_PID -+extern int ui_pid[3]; -+#endif -+ -+// combo scan -+#define WEXT_CSCAN_AMOUNT 9 -+#define WEXT_CSCAN_BUF_LEN 360 -+#define WEXT_CSCAN_HEADER "CSCAN S\x01\x00\x00S\x00" -+#define WEXT_CSCAN_HEADER_SIZE 12 -+#define WEXT_CSCAN_SSID_SECTION 'S' -+#define WEXT_CSCAN_CHANNEL_SECTION 'C' -+#define WEXT_CSCAN_NPROBE_SECTION 'N' -+#define WEXT_CSCAN_ACTV_DWELL_SECTION 'A' -+#define WEXT_CSCAN_PASV_DWELL_SECTION 'P' -+#define WEXT_CSCAN_HOME_DWELL_SECTION 'H' -+#define WEXT_CSCAN_TYPE_SECTION 'T' -+ -+ -+extern u8 key_2char2num(u8 hch, u8 lch); -+extern u8 str_2char2num(u8 hch, u8 lch); -+extern u8 convert_ip_addr(u8 hch, u8 mch, u8 lch); -+ -+u32 rtw_rates[] = {1000000,2000000,5500000,11000000, -+ 6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000}; -+ -+static const char * const iw_operation_mode[] = -+{ -+ "Auto", "Ad-Hoc", "Managed", "Master", "Repeater", "Secondary", "Monitor" -+}; -+ -+static int hex2num_i(char c) -+{ -+ if (c >= '0' && c <= '9') -+ return c - '0'; -+ if (c >= 'a' && c <= 'f') -+ return c - 'a' + 10; -+ if (c >= 'A' && c <= 'F') -+ return c - 'A' + 10; -+ return -1; -+} -+ -+static int hex2byte_i(const char *hex) -+{ -+ int a, b; -+ a = hex2num_i(*hex++); -+ if (a < 0) -+ return -1; -+ b = hex2num_i(*hex++); -+ if (b < 0) -+ return -1; -+ return (a << 4) | b; -+} -+ -+/** -+ * hwaddr_aton - Convert ASCII string to MAC address -+ * @txt: MAC address as a string (e.g., "00:11:22:33:44:55") -+ * @addr: Buffer for the MAC address (ETH_ALEN = 6 bytes) -+ * Returns: 0 on success, -1 on failure (e.g., string not a MAC address) -+ */ -+static int hwaddr_aton_i(const char *txt, u8 *addr) -+{ -+ int i; -+ -+ for (i = 0; i < 6; i++) { -+ int a, b; -+ -+ a = hex2num_i(*txt++); -+ if (a < 0) -+ return -1; -+ b = hex2num_i(*txt++); -+ if (b < 0) -+ return -1; -+ *addr++ = (a << 4) | b; -+ if (i < 5 && *txt++ != ':') -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static void indicate_wx_custom_event(_adapter *padapter, char *msg) -+{ -+#ifndef CONFIG_IOCTL_CFG80211 -+ u8 *buff, *p; -+ union iwreq_data wrqu; -+ -+ if ((u32)strlen(msg) > IW_CUSTOM_MAX) { -+ DBG_871X("%s strlen(msg):%u > IW_CUSTOM_MAX:%u\n", __FUNCTION__ ,(u32)strlen(msg), IW_CUSTOM_MAX); -+ return; -+ } -+ -+ buff = rtw_zmalloc(IW_CUSTOM_MAX+1); -+ if(!buff) -+ return; -+ -+ _rtw_memcpy(buff, msg, strlen(msg)); -+ -+ _rtw_memset(&wrqu,0,sizeof(wrqu)); -+ wrqu.data.length = strlen(msg); -+ -+ DBG_871X("%s %s\n", __FUNCTION__, buff); -+ wireless_send_event(padapter->pnetdev, IWEVCUSTOM, &wrqu, buff); -+ -+ rtw_mfree(buff, IW_CUSTOM_MAX+1); -+#endif -+} -+ -+ -+static void request_wps_pbc_event(_adapter *padapter) -+{ -+#ifndef CONFIG_IOCTL_CFG80211 -+ u8 *buff, *p; -+ union iwreq_data wrqu; -+ -+ buff = rtw_malloc(IW_CUSTOM_MAX); -+ if(!buff) -+ return; -+ -+ _rtw_memset(buff, 0, IW_CUSTOM_MAX); -+ -+ p=buff; -+ -+ p+=sprintf(p, "WPS_PBC_START.request=TRUE"); -+ -+ _rtw_memset(&wrqu,0,sizeof(wrqu)); -+ -+ wrqu.data.length = p-buff; -+ -+ wrqu.data.length = (wrqu.data.lengthpnetdev, IWEVCUSTOM, &wrqu, buff); -+ -+ if(buff) -+ { -+ rtw_mfree(buff, IW_CUSTOM_MAX); -+ } -+#endif -+} -+ -+ -+void indicate_wx_scan_complete_event(_adapter *padapter) -+{ -+#ifndef CONFIG_IOCTL_CFG80211 -+ union iwreq_data wrqu; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); -+ -+ //DBG_871X("+rtw_indicate_wx_scan_complete_event\n"); -+ wireless_send_event(padapter->pnetdev, SIOCGIWSCAN, &wrqu, NULL); -+#endif -+} -+ -+ -+void rtw_indicate_wx_assoc_event(_adapter *padapter) -+{ -+#ifndef CONFIG_IOCTL_CFG80211 -+ union iwreq_data wrqu; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); -+ -+ wrqu.ap_addr.sa_family = ARPHRD_ETHER; -+ -+ _rtw_memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.MacAddress, ETH_ALEN); -+ -+ //DBG_871X("+rtw_indicate_wx_assoc_event\n"); -+ wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL); -+#endif -+} -+ -+void rtw_indicate_wx_disassoc_event(_adapter *padapter) -+{ -+#ifndef CONFIG_IOCTL_CFG80211 -+ union iwreq_data wrqu; -+ -+ _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); -+ -+ wrqu.ap_addr.sa_family = ARPHRD_ETHER; -+ _rtw_memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN); -+ -+ //DBG_871X("+rtw_indicate_wx_disassoc_event\n"); -+ wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL); -+#endif -+} -+ -+/* -+uint rtw_is_cckrates_included(u8 *rate) -+{ -+ u32 i = 0; -+ -+ while(rate[i]!=0) -+ { -+ if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) || -+ (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) ) -+ return _TRUE; -+ i++; -+ } -+ -+ return _FALSE; -+} -+ -+uint rtw_is_cckratesonly_included(u8 *rate) -+{ -+ u32 i = 0; -+ -+ while(rate[i]!=0) -+ { -+ if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) && -+ (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) ) -+ return _FALSE; -+ i++; -+ } -+ -+ return _TRUE; -+} -+*/ -+ -+static char *translate_scan(_adapter *padapter, -+ struct iw_request_info* info, struct wlan_network *pnetwork, -+ char *start, char *stop) -+{ -+ struct iw_event iwe; -+ u16 cap; -+ u32 ht_ielen = 0; -+ char custom[MAX_CUSTOM_LEN]; -+ char *p; -+ u16 max_rate=0, rate, ht_cap=_FALSE; -+ u32 i = 0; -+ char *current_val; -+ long rssi; -+ u8 bw_40MHz=0, short_GI=0; -+ u16 mcs_rate=0; -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_P2P -+#ifdef CONFIG_WFD -+ if ( SCAN_RESULT_ALL == pwdinfo->wfd_info->scan_result_type ) -+ { -+ -+ } -+ else if ( ( SCAN_RESULT_P2P_ONLY == pwdinfo->wfd_info->scan_result_type ) || -+ ( SCAN_RESULT_WFD_TYPE == pwdinfo->wfd_info->scan_result_type ) ) -+#endif // CONFIG_WFD -+ { -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ u32 blnGotP2PIE = _FALSE; -+ -+ // User is doing the P2P device discovery -+ // The prefix of SSID should be "DIRECT-" and the IE should contains the P2P IE. -+ // If not, the driver should ignore this AP and go to the next AP. -+ -+ // Verifying the SSID -+ if ( _rtw_memcmp( pnetwork->network.Ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN ) ) -+ { -+ u32 p2pielen = 0; -+ -+ // Verifying the P2P IE -+ if ( rtw_get_p2p_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &p2pielen) ) -+ { -+ blnGotP2PIE = _TRUE; -+ } -+ } -+ -+ if ( blnGotP2PIE == _FALSE ) -+ { -+ return start; -+ } -+ -+ } -+ } -+ -+#ifdef CONFIG_WFD -+ if ( SCAN_RESULT_WFD_TYPE == pwdinfo->wfd_info->scan_result_type ) -+ { -+ u32 blnGotWFD = _FALSE; -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ uint wfd_ielen = 0; -+ -+ if ( rtw_get_wfd_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 wfd_devinfo[ 6 ] = { 0x00 }; -+ uint wfd_devlen = 6; -+ -+ if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen) ) -+ { -+ if ( pwdinfo->wfd_info->wfd_device_type == WFD_DEVINFO_PSINK ) -+ { -+ // the first two bits will indicate the WFD device type -+ if ( ( wfd_devinfo[ 1 ] & 0x03 ) == WFD_DEVINFO_SOURCE ) -+ { -+ // If this device is Miracast PSink device, the scan reuslt should just provide the Miracast source. -+ blnGotWFD = _TRUE; -+ } -+ } -+ else if ( pwdinfo->wfd_info->wfd_device_type == WFD_DEVINFO_SOURCE ) -+ { -+ // the first two bits will indicate the WFD device type -+ if ( ( wfd_devinfo[ 1 ] & 0x03 ) == WFD_DEVINFO_PSINK ) -+ { -+ // If this device is Miracast source device, the scan reuslt should just provide the Miracast PSink. -+ // Todo: How about the SSink?! -+ blnGotWFD = _TRUE; -+ } -+ } -+ } -+ } -+ -+ if ( blnGotWFD == _FALSE ) -+ { -+ return start; -+ } -+ } -+#endif // CONFIG_WFD -+ -+#endif //CONFIG_P2P -+ /* AP MAC address */ -+ iwe.cmd = SIOCGIWAP; -+ iwe.u.ap_addr.sa_family = ARPHRD_ETHER; -+ -+ _rtw_memcpy(iwe.u.ap_addr.sa_data, pnetwork->network.MacAddress, ETH_ALEN); -+ start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN); -+ -+ /* Add the ESSID */ -+ iwe.cmd = SIOCGIWESSID; -+ iwe.u.data.flags = 1; -+ iwe.u.data.length = min((u16)pnetwork->network.Ssid.SsidLength, (u16)32); -+ start = iwe_stream_add_point(info, start, stop, &iwe, pnetwork->network.Ssid.Ssid); -+ -+ //parsing HT_CAP_IE -+ p = rtw_get_ie(&pnetwork->network.IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength-12); -+ -+ if(p && ht_ielen>0) -+ { -+ struct rtw_ieee80211_ht_cap *pht_capie; -+ ht_cap = _TRUE; -+ pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2); -+ _rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2); -+ bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0; -+ short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1:0; -+ } -+ -+ /* Add the protocol name */ -+ iwe.cmd = SIOCGIWNAME; -+ if ((rtw_is_cckratesonly_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) -+ { -+ if(ht_cap == _TRUE) -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn"); -+ else -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b"); -+ } -+ else if ((rtw_is_cckrates_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) -+ { -+ if(ht_cap == _TRUE) -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn"); -+ else -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg"); -+ } -+ else -+ { -+ if(pnetwork->network.Configuration.DSConfig > 14) -+ { -+ if(ht_cap == _TRUE) -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an"); -+ else -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a"); -+ } -+ else -+ { -+ if(ht_cap == _TRUE) -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); -+ else -+ snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11g"); -+ } -+ } -+ -+ start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN); -+ -+ /* Add mode */ -+ iwe.cmd = SIOCGIWMODE; -+ _rtw_memcpy((u8 *)&cap, rtw_get_capability_from_ie(pnetwork->network.IEs), 2); -+ -+ -+ cap = le16_to_cpu(cap); -+ -+ if(cap & (WLAN_CAPABILITY_IBSS |WLAN_CAPABILITY_BSS)){ -+ if (cap & WLAN_CAPABILITY_BSS) -+ iwe.u.mode = IW_MODE_MASTER; -+ else -+ iwe.u.mode = IW_MODE_ADHOC; -+ -+ start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN); -+ } -+ -+ if(pnetwork->network.Configuration.DSConfig<1 /*|| pnetwork->network.Configuration.DSConfig>14*/) -+ pnetwork->network.Configuration.DSConfig = 1; -+ -+ /* Add frequency/channel */ -+ iwe.cmd = SIOCGIWFREQ; -+ iwe.u.freq.m = rtw_ch2freq(pnetwork->network.Configuration.DSConfig) * 100000; -+ iwe.u.freq.e = 1; -+ iwe.u.freq.i = pnetwork->network.Configuration.DSConfig; -+ start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN); -+ -+ /* Add encryption capability */ -+ iwe.cmd = SIOCGIWENCODE; -+ if (cap & WLAN_CAPABILITY_PRIVACY) -+ iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; -+ else -+ iwe.u.data.flags = IW_ENCODE_DISABLED; -+ iwe.u.data.length = 0; -+ start = iwe_stream_add_point(info, start, stop, &iwe, pnetwork->network.Ssid.Ssid); -+ -+ /*Add basic and extended rates */ -+ max_rate = 0; -+ p = custom; -+ p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Rates (Mb/s): "); -+ while(pnetwork->network.SupportedRates[i]!=0) -+ { -+ rate = pnetwork->network.SupportedRates[i]&0x7F; -+ if (rate > max_rate) -+ max_rate = rate; -+ p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), -+ "%d%s ", rate >> 1, (rate & 1) ? ".5" : ""); -+ i++; -+ } -+ -+ if(ht_cap == _TRUE) -+ { -+ if(mcs_rate&0x8000)//MCS15 -+ { -+ max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130); -+ -+ } -+ else if(mcs_rate&0x0080)//MCS7 -+ { -+ max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65); -+ } -+ else//default MCS7 -+ { -+ DBG_871X("wx_get_scan, mcs_rate_bitmap=0x%x\n", mcs_rate); -+ max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65); -+ } -+ -+ max_rate = max_rate*2;//Mbps/2; -+ } -+ -+ iwe.cmd = SIOCGIWRATE; -+ iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; -+ iwe.u.bitrate.value = max_rate * 500000; -+ start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN); -+ -+ //parsing WPA/WPA2 IE -+ { -+ u8 buf[MAX_WPA_IE_LEN]; -+ u8 wpa_ie[255],rsn_ie[255]; -+ u16 wpa_len=0,rsn_len=0; -+ u8 *p; -+ sint out_len=0; -+ out_len=rtw_get_sec_ie(pnetwork->network.IEs ,pnetwork->network.IELength,rsn_ie,&rsn_len,wpa_ie,&wpa_len); -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan: ssid=%s\n",pnetwork->network.Ssid.Ssid)); -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan: wpa_len=%d rsn_len=%d\n",wpa_len,rsn_len)); -+ -+ if (wpa_len > 0) -+ { -+ p=buf; -+ _rtw_memset(buf, 0, MAX_WPA_IE_LEN); -+ p += sprintf(p, "wpa_ie="); -+ for (i = 0; i < wpa_len; i++) { -+ p += sprintf(p, "%02x", wpa_ie[i]); -+ } -+ -+ _rtw_memset(&iwe, 0, sizeof(iwe)); -+ iwe.cmd = IWEVCUSTOM; -+ iwe.u.data.length = strlen(buf); -+ start = iwe_stream_add_point(info, start, stop, &iwe,buf); -+ -+ _rtw_memset(&iwe, 0, sizeof(iwe)); -+ iwe.cmd =IWEVGENIE; -+ iwe.u.data.length = wpa_len; -+ start = iwe_stream_add_point(info, start, stop, &iwe, wpa_ie); -+ } -+ if (rsn_len > 0) -+ { -+ p = buf; -+ _rtw_memset(buf, 0, MAX_WPA_IE_LEN); -+ p += sprintf(p, "rsn_ie="); -+ for (i = 0; i < rsn_len; i++) { -+ p += sprintf(p, "%02x", rsn_ie[i]); -+ } -+ _rtw_memset(&iwe, 0, sizeof(iwe)); -+ iwe.cmd = IWEVCUSTOM; -+ iwe.u.data.length = strlen(buf); -+ start = iwe_stream_add_point(info, start, stop, &iwe,buf); -+ -+ _rtw_memset(&iwe, 0, sizeof(iwe)); -+ iwe.cmd =IWEVGENIE; -+ iwe.u.data.length = rsn_len; -+ start = iwe_stream_add_point(info, start, stop, &iwe, rsn_ie); -+ } -+ } -+ -+ { //parsing WPS IE -+ uint cnt = 0,total_ielen; -+ u8 *wpsie_ptr=NULL; -+ uint wps_ielen = 0; -+ -+ u8 *ie_ptr = pnetwork->network.IEs +_FIXED_IE_LENGTH_; -+ total_ielen= pnetwork->network.IELength - _FIXED_IE_LENGTH_; -+ -+ while(cnt < total_ielen) -+ { -+ if(rtw_is_wps_ie(&ie_ptr[cnt], &wps_ielen) && (wps_ielen>2)) -+ { -+ wpsie_ptr = &ie_ptr[cnt]; -+ iwe.cmd =IWEVGENIE; -+ iwe.u.data.length = (u16)wps_ielen; -+ start = iwe_stream_add_point(info, start, stop, &iwe, wpsie_ptr); -+ } -+ cnt+=ie_ptr[cnt+1]+2; //goto next -+ } -+ } -+ -+ -+{ -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 ss, sq; -+ -+ /* Add quality statistics */ -+ iwe.cmd = IWEVQUAL; -+ iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID -+ #ifdef CONFIG_SIGNAL_DISPLAY_DBM -+ | IW_QUAL_DBM -+ #endif -+ ; -+ -+ if ( check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE && -+ is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network)) { -+ ss = padapter->recvpriv.signal_strength; -+ sq = padapter->recvpriv.signal_qual; -+ } else { -+ ss = pnetwork->network.PhyInfo.SignalStrength; -+ sq = pnetwork->network.PhyInfo.SignalQuality; -+ } -+ -+ -+ #ifdef CONFIG_SIGNAL_DISPLAY_DBM -+ iwe.u.qual.level = (u8) translate_percentage_to_dbm(ss);//dbm -+ #else -+ iwe.u.qual.level = (u8)ss;//% -+ #endif -+ -+ iwe.u.qual.qual = (u8)sq; // signal quality -+ -+ #ifdef CONFIG_PLATFORM_ROCKCHIPS -+ iwe.u.qual.noise = -100; // noise level suggest by zhf@rockchips -+ #else -+ iwe.u.qual.noise = 0; // noise level -+ #endif //CONFIG_PLATFORM_ROCKCHIPS -+ -+ //DBG_871X("iqual=%d, ilevel=%d, inoise=%d, iupdated=%d\n", iwe.u.qual.qual, iwe.u.qual.level , iwe.u.qual.noise, iwe.u.qual.updated); -+ -+ start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN); -+} -+ -+ return start; -+} -+ -+static int wpa_set_auth_algs(struct net_device *dev, u32 value) -+{ -+ _adapter *padapter = (_adapter *) rtw_netdev_priv(dev); -+ int ret = 0; -+ -+ if ((value & AUTH_ALG_SHARED_KEY)&&(value & AUTH_ALG_OPEN_SYSTEM)) -+ { -+ DBG_871X("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY and AUTH_ALG_OPEN_SYSTEM [value:0x%x]\n",value); -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch; -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; -+ } -+ else if (value & AUTH_ALG_SHARED_KEY) -+ { -+ DBG_871X("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY [value:0x%x]\n",value); -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ -+#ifdef CONFIG_PLATFORM_MT53XX -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch; -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; -+#else -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared; -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Shared; -+#endif -+ } -+ else if(value & AUTH_ALG_OPEN_SYSTEM) -+ { -+ DBG_871X("wpa_set_auth_algs, AUTH_ALG_OPEN_SYSTEM\n"); -+ //padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; -+ if(padapter->securitypriv.ndisauthtype < Ndis802_11AuthModeWPAPSK) -+ { -+#ifdef CONFIG_PLATFORM_MT53XX -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch; -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; -+#else -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open; -+#endif -+ } -+ -+ } -+ else if(value & AUTH_ALG_LEAP) -+ { -+ DBG_871X("wpa_set_auth_algs, AUTH_ALG_LEAP\n"); -+ } -+ else -+ { -+ DBG_871X("wpa_set_auth_algs, error!\n"); -+ ret = -EINVAL; -+ } -+ -+ return ret; -+ -+} -+ -+static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len) -+{ -+ int ret = 0; -+ u32 wep_key_idx, wep_key_len,wep_total_len; -+ NDIS_802_11_WEP *pwep = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ -+_func_enter_; -+ -+ param->u.crypt.err = 0; -+ param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; -+ -+ if (param_len < (u32) ((u8 *) param->u.crypt.key - (u8 *) param) + param->u.crypt.key_len) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ -+ if (param->u.crypt.idx >= WEP_KEYS -+#ifdef CONFIG_IEEE80211W -+ && param->u.crypt.idx > BIP_MAX_KEYID -+#endif //CONFIG_IEEE80211W -+ ) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ } -+ else -+ { -+ -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ } -+ -+ if (strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("wpa_set_encryption, crypt.alg = WEP\n")); -+ DBG_871X("wpa_set_encryption, crypt.alg = WEP\n"); -+ -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP40_; -+ -+ wep_key_idx = param->u.crypt.idx; -+ wep_key_len = param->u.crypt.key_len; -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("(1)wep_key_idx=%d\n", wep_key_idx)); -+ DBG_871X("(1)wep_key_idx=%d\n", wep_key_idx); -+ -+ if (wep_key_idx > WEP_KEYS) -+ return -EINVAL; -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("(2)wep_key_idx=%d\n", wep_key_idx)); -+ -+ if (wep_key_len > 0) -+ { -+ wep_key_len = wep_key_len <= 5 ? 5 : 13; -+ wep_total_len = wep_key_len + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial); -+ pwep =(NDIS_802_11_WEP *) rtw_malloc(wep_total_len); -+ if(pwep == NULL){ -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,(" wpa_set_encryption: pwep allocate fail !!!\n")); -+ goto exit; -+ } -+ -+ _rtw_memset(pwep, 0, wep_total_len); -+ -+ pwep->KeyLength = wep_key_len; -+ pwep->Length = wep_total_len; -+ -+ if(wep_key_len==13) -+ { -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP104_; -+ } -+ } -+ else { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ pwep->KeyIndex = wep_key_idx; -+ pwep->KeyIndex |= 0x80000000; -+ -+ _rtw_memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength); -+ -+ if(param->u.crypt.set_tx) -+ { -+ DBG_871X("wep, set_tx=1\n"); -+ -+ if(rtw_set_802_11_add_wep(padapter, pwep) == (u8)_FAIL) -+ { -+ ret = -EOPNOTSUPP ; -+ } -+ } -+ else -+ { -+ DBG_871X("wep, set_tx=0\n"); -+ -+ //don't update "psecuritypriv->dot11PrivacyAlgrthm" and -+ //"psecuritypriv->dot11PrivacyKeyIndex=keyid", but can rtw_set_key to fw/cam -+ -+ if (wep_key_idx >= WEP_KEYS) { -+ ret = -EOPNOTSUPP ; -+ goto exit; -+ } -+ -+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); -+ psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength; -+ rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0); -+ } -+ -+ goto exit; -+ } -+ -+ if(padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) // 802_1x -+ { -+ struct sta_info * psta,*pbcmc_sta; -+ struct sta_priv * pstapriv = &padapter->stapriv; -+ -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == _TRUE) //sta mode -+ { -+ psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); -+ if (psta == NULL) { -+ //DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); -+ } -+ else -+ { -+ //Jeff: don't disable ieee8021x_blocked while clearing key -+ if (strcmp(param->u.crypt.alg, "none") != 0) -+ psta->ieee8021x_blocked = _FALSE; -+ -+ if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| -+ (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) -+ { -+ psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; -+ } -+ -+ if(param->u.crypt.set_tx ==1)//pairwise key -+ { -+ _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ if(strcmp(param->u.crypt.alg, "TKIP") == 0)//set mic key -+ { -+ //DEBUG_ERR(("\nset key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); -+ _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); -+ -+ padapter->securitypriv.busetkipkey=_FALSE; -+ //_set_timer(&padapter->securitypriv.tkip_timer, 50); -+ } -+ -+ //DEBUG_ERR(("\n param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); -+ //DEBUG_ERR(("\n ~~~~stastakey:unicastkey\n")); -+ DBG_871X("\n ~~~~stastakey:unicastkey\n"); -+ -+ rtw_setstakey_cmd(padapter, (unsigned char *)psta, _TRUE); -+ } -+ else//group key -+ { -+ if(strcmp(param->u.crypt.alg, "TKIP") == 0 || strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ _rtw_memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ //only TKIP group key need to install this -+ if(param->u.crypt.key_len > 16) -+ { -+ _rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); -+ _rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); -+ } -+ padapter->securitypriv.binstallGrpkey = _TRUE; -+ //DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); -+ DBG_871X(" ~~~~set sta key:groupkey\n"); -+ -+ padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx; -+ -+ rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1); -+ } -+#ifdef CONFIG_IEEE80211W -+ else if(strcmp(param->u.crypt.alg, "BIP") == 0) -+ { -+ int no; -+ //printk("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); -+ //save the IGTK key, length 16 bytes -+ _rtw_memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ /*printk("IGTK key below:\n"); -+ for(no=0;no<16;no++) -+ printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); -+ printk("\n");*/ -+ padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx; -+ padapter->securitypriv.binstallBIPkey = _TRUE; -+ DBG_871X(" ~~~~set sta key:IGKT\n"); -+ } -+#endif //CONFIG_IEEE80211W -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING)) -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_PROVISIONING_DONE); -+ } -+#endif //CONFIG_P2P -+ -+ } -+ } -+ -+ pbcmc_sta=rtw_get_bcmc_stainfo(padapter); -+ if(pbcmc_sta==NULL) -+ { -+ //DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null \n")); -+ } -+ else -+ { -+ //Jeff: don't disable ieee8021x_blocked while clearing key -+ if (strcmp(param->u.crypt.alg, "none") != 0) -+ pbcmc_sta->ieee8021x_blocked = _FALSE; -+ -+ if((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled)|| -+ (padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) -+ { -+ pbcmc_sta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; -+ } -+ } -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) //adhoc mode -+ { -+ } -+ } -+ -+exit: -+ -+ if (pwep) { -+ rtw_mfree((u8 *)pwep, wep_total_len); -+ } -+ -+ _func_exit_; -+ -+ return ret; -+} -+ -+static int rtw_set_wpa_ie(_adapter *padapter, char *pie, unsigned short ielen) -+{ -+ u8 *buf=NULL, *pos=NULL; -+ u32 left; -+ int group_cipher = 0, pairwise_cipher = 0; -+ int ret = 0; -+ u8 null_addr[]= {0,0,0,0,0,0}; -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ -+ if((ielen > MAX_WPA_IE_LEN) || (pie == NULL)){ -+ _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ if(pie == NULL) -+ return ret; -+ else -+ return -EINVAL; -+ } -+ -+ if(ielen) -+ { -+ buf = rtw_zmalloc(ielen); -+ if (buf == NULL){ -+ ret = -ENOMEM; -+ goto exit; -+ } -+ -+ _rtw_memcpy(buf, pie , ielen); -+ -+ //dump -+ { -+ int i; -+ DBG_871X("\n wpa_ie(length:%d):\n", ielen); -+ for(i=0;i= RSN_SELECTOR_LEN){ -+ pos += RSN_SELECTOR_LEN; -+ left -= RSN_SELECTOR_LEN; -+ } -+ else if (left > 0){ -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("Ie length mismatch, %u too much \n", left)); -+ ret =-1; -+ goto exit; -+ } -+#endif -+ -+ if(rtw_parse_wpa_ie(buf, ielen, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; -+ padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPAPSK; -+ _rtw_memcpy(padapter->securitypriv.supplicant_ie, &buf[0], ielen); -+ } -+ -+ if(rtw_parse_wpa2_ie(buf, ielen, &group_cipher, &pairwise_cipher) == _SUCCESS) -+ { -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; -+ padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPA2PSK; -+ _rtw_memcpy(padapter->securitypriv.supplicant_ie, &buf[0], ielen); -+ } -+ -+ if (group_cipher == 0) -+ { -+ group_cipher = WPA_CIPHER_NONE; -+ } -+ if (pairwise_cipher == 0) -+ { -+ pairwise_cipher = WPA_CIPHER_NONE; -+ } -+ -+ switch(group_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_; -+ padapter->securitypriv.ndisencryptstatus=Ndis802_11EncryptionDisabled; -+ break; -+ case WPA_CIPHER_WEP40: -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP40_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ case WPA_CIPHER_TKIP: -+ padapter->securitypriv.dot118021XGrpPrivacy=_TKIP_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -+ break; -+ case WPA_CIPHER_CCMP: -+ padapter->securitypriv.dot118021XGrpPrivacy=_AES_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -+ break; -+ case WPA_CIPHER_WEP104: -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP104_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ } -+ -+ switch(pairwise_cipher) -+ { -+ case WPA_CIPHER_NONE: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ padapter->securitypriv.ndisencryptstatus=Ndis802_11EncryptionDisabled; -+ break; -+ case WPA_CIPHER_WEP40: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ case WPA_CIPHER_TKIP: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_TKIP_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -+ break; -+ case WPA_CIPHER_CCMP: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_AES_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -+ break; -+ case WPA_CIPHER_WEP104: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_; -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ break; -+ } -+ -+ _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ {//set wps_ie -+ u16 cnt = 0; -+ u8 eid, wps_oui[4]={0x0,0x50,0xf2,0x04}; -+ -+ while( cnt < ielen ) -+ { -+ eid = buf[cnt]; -+ -+ if((eid==_VENDOR_SPECIFIC_IE_)&&(_rtw_memcmp(&buf[cnt+2], wps_oui, 4)==_TRUE)) -+ { -+ DBG_871X("SET WPS_IE\n"); -+ -+ padapter->securitypriv.wps_ie_len = ( (buf[cnt+1]+2) < (MAX_WPA_IE_LEN<<2)) ? (buf[cnt+1]+2):(MAX_WPA_IE_LEN<<2); -+ -+ _rtw_memcpy(padapter->securitypriv.wps_ie, &buf[cnt], padapter->securitypriv.wps_ie_len); -+ -+ set_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS); -+ -+#ifdef CONFIG_P2P -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_OK)) -+ { -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_PROVISIONING_ING); -+ } -+#endif //CONFIG_P2P -+ cnt += buf[cnt+1]+2; -+ -+ break; -+ } else { -+ cnt += buf[cnt+1]+2; //goto next -+ } -+ } -+ } -+ } -+ -+ //TKIP and AES disallow multicast packets until installing group key -+ if(padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_ -+ || padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_WTMIC_ -+ || padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) -+ //WPS open need to enable multicast -+ //|| check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == _TRUE) -+ rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr); -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("rtw_set_wpa_ie: pairwise_cipher=0x%08x padapter->securitypriv.ndisencryptstatus=%d padapter->securitypriv.ndisauthtype=%d\n", -+ pairwise_cipher, padapter->securitypriv.ndisencryptstatus, padapter->securitypriv.ndisauthtype)); -+ -+exit: -+ -+ if (buf) rtw_mfree(buf, ielen); -+ -+ return ret; -+} -+ -+static int rtw_wx_get_name(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u16 cap; -+ u32 ht_ielen = 0; -+ char *p; -+ u8 ht_cap=_FALSE; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; -+ NDIS_802_11_RATES_EX* prates = NULL; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("cmd_code=%x\n", info->cmd)); -+ -+ _func_enter_; -+ -+ if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == _TRUE) -+ { -+ //parsing HT_CAP_IE -+ p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12); -+ if(p && ht_ielen>0) -+ { -+ ht_cap = _TRUE; -+ } -+ -+ prates = &pcur_bss->SupportedRates; -+ -+ if (rtw_is_cckratesonly_included((u8*)prates) == _TRUE) -+ { -+ if(ht_cap == _TRUE) -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bn"); -+ else -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11b"); -+ } -+ else if ((rtw_is_cckrates_included((u8*)prates)) == _TRUE) -+ { -+ if(ht_cap == _TRUE) -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bgn"); -+ else -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg"); -+ } -+ else -+ { -+ if(pcur_bss->Configuration.DSConfig > 14) -+ { -+ if(ht_cap == _TRUE) -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an"); -+ else -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a"); -+ } -+ else -+ { -+ if(ht_cap == _TRUE) -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn"); -+ else -+ snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g"); -+ } -+ } -+ } -+ else -+ { -+ //prates = &padapter->registrypriv.dev_network.SupportedRates; -+ //snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11g"); -+ snprintf(wrqu->name, IFNAMSIZ, "unassociated"); -+ } -+ -+ _func_exit_; -+ -+ return 0; -+} -+ -+static int rtw_wx_set_freq(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_wx_set_freq\n")); -+ -+ _func_exit_; -+ -+ return 0; -+} -+ -+static int rtw_wx_get_freq(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) -+ { -+ //wrqu->freq.m = ieee80211_wlan_frequencies[pcur_bss->Configuration.DSConfig-1] * 100000; -+ wrqu->freq.m = rtw_ch2freq(pcur_bss->Configuration.DSConfig) * 100000; -+ wrqu->freq.e = 1; -+ wrqu->freq.i = pcur_bss->Configuration.DSConfig; -+ -+ } -+ else{ -+ wrqu->freq.m = rtw_ch2freq(padapter->mlmeextpriv.cur_channel) * 100000; -+ wrqu->freq.e = 1; -+ wrqu->freq.i = padapter->mlmeextpriv.cur_channel; -+ } -+ -+ return 0; -+} -+ -+static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, -+ union iwreq_data *wrqu, char *b) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ; -+ int ret = 0; -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _queue *queue = &pmlmepriv->scanned_queue; -+ _func_enter_; -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) { -+ ret= -EPERM; -+ goto exit; -+ } -+ -+ if (padapter->hw_init_completed==_FALSE){ -+ ret = -EPERM; -+ goto exit; -+ } -+ -+ switch(wrqu->mode) -+ { -+ case IW_MODE_AUTO: -+ networkType = Ndis802_11AutoUnknown; -+ DBG_871X("set_mode = IW_MODE_AUTO\n"); -+ break; -+ case IW_MODE_ADHOC: -+ networkType = Ndis802_11IBSS; -+ DBG_871X("set_mode = IW_MODE_ADHOC\n"); -+ break; -+ case IW_MODE_MASTER: -+ networkType = Ndis802_11APMode; -+ DBG_871X("set_mode = IW_MODE_MASTER\n"); -+ //rtw_setopmode_cmd(padapter, networkType); -+ break; -+ case IW_MODE_INFRA: -+ networkType = Ndis802_11Infrastructure; -+ DBG_871X("set_mode = IW_MODE_INFRA\n"); -+ break; -+ -+ default : -+ ret = -EINVAL;; -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("\n Mode: %s is not supported \n", iw_operation_mode[wrqu->mode])); -+ goto exit; -+ } -+ -+/* -+ if(Ndis802_11APMode == networkType) -+ { -+ rtw_setopmode_cmd(padapter, networkType); -+ } -+ else -+ { -+ rtw_setopmode_cmd(padapter, Ndis802_11AutoUnknown); -+ } -+*/ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _enter_critical_bh(&queue->lock, &irqL); -+ if (rtw_set_802_11_infrastructure_mode(padapter, networkType) ==_FALSE){ -+ -+ ret = -EPERM; -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ goto exit; -+ -+ } -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ rtw_setopmode_cmd(padapter, networkType); -+ -+exit: -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, -+ union iwreq_data *wrqu, char *b) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode \n")); -+ -+ _func_enter_; -+ -+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE) -+ { -+ wrqu->mode = IW_MODE_INFRA; -+ } -+ else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE)) -+ -+ { -+ wrqu->mode = IW_MODE_ADHOC; -+ } -+ else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ wrqu->mode = IW_MODE_MASTER; -+ } -+ else -+ { -+ wrqu->mode = IW_MODE_AUTO; -+ } -+ -+ _func_exit_; -+ -+ return 0; -+ -+} -+ -+ -+static int rtw_wx_set_pmkid(struct net_device *dev, -+ struct iw_request_info *a, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 j,blInserted = _FALSE; -+ int intReturn = _FALSE; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct iw_pmksa* pPMK = ( struct iw_pmksa* ) extra; -+ u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 }; -+ u8 strIssueBssid[ ETH_ALEN ] = { 0x00 }; -+ -+/* -+ struct iw_pmksa -+ { -+ __u32 cmd; -+ struct sockaddr bssid; -+ __u8 pmkid[IW_PMKID_LEN]; //IW_PMKID_LEN=16 -+ } -+ There are the BSSID information in the bssid.sa_data array. -+ If cmd is IW_PMKSA_FLUSH, it means the wpa_suppplicant wants to clear all the PMKID information. -+ If cmd is IW_PMKSA_ADD, it means the wpa_supplicant wants to add a PMKID/BSSID to driver. -+ If cmd is IW_PMKSA_REMOVE, it means the wpa_supplicant wants to remove a PMKID/BSSID from driver. -+ */ -+ -+ _rtw_memcpy( strIssueBssid, pPMK->bssid.sa_data, ETH_ALEN); -+ if ( pPMK->cmd == IW_PMKSA_ADD ) -+ { -+ DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_ADD!\n" ); -+ if ( _rtw_memcmp( strIssueBssid, strZeroMacAddress, ETH_ALEN ) == _TRUE ) -+ { -+ return( intReturn ); -+ } -+ else -+ { -+ intReturn = _TRUE; -+ } -+ blInserted = _FALSE; -+ -+ //overwrite PMKID -+ for(j=0 ; jPMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) ==_TRUE ) -+ { // BSSID is matched, the same AP => rewrite with new PMKID. -+ -+ DBG_871X( "[rtw_wx_set_pmkid] BSSID exists in the PMKList.\n" ); -+ -+ _rtw_memcpy( psecuritypriv->PMKIDList[j].PMKID, pPMK->pmkid, IW_PMKID_LEN); -+ psecuritypriv->PMKIDList[ j ].bUsed = _TRUE; -+ psecuritypriv->PMKIDIndex = j+1; -+ blInserted = _TRUE; -+ break; -+ } -+ } -+ -+ if(!blInserted) -+ { -+ // Find a new entry -+ DBG_871X( "[rtw_wx_set_pmkid] Use the new entry index = %d for this PMKID.\n", -+ psecuritypriv->PMKIDIndex ); -+ -+ _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, strIssueBssid, ETH_ALEN); -+ _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, pPMK->pmkid, IW_PMKID_LEN); -+ -+ psecuritypriv->PMKIDList[ psecuritypriv->PMKIDIndex ].bUsed = _TRUE; -+ psecuritypriv->PMKIDIndex++ ; -+ if(psecuritypriv->PMKIDIndex==16) -+ { -+ psecuritypriv->PMKIDIndex =0; -+ } -+ } -+ } -+ else if ( pPMK->cmd == IW_PMKSA_REMOVE ) -+ { -+ DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_REMOVE!\n" ); -+ intReturn = _TRUE; -+ for(j=0 ; jPMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) ==_TRUE ) -+ { // BSSID is matched, the same AP => Remove this PMKID information and reset it. -+ _rtw_memset( psecuritypriv->PMKIDList[ j ].Bssid, 0x00, ETH_ALEN ); -+ psecuritypriv->PMKIDList[ j ].bUsed = _FALSE; -+ break; -+ } -+ } -+ } -+ else if ( pPMK->cmd == IW_PMKSA_FLUSH ) -+ { -+ DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n" ); -+ _rtw_memset( &psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); -+ psecuritypriv->PMKIDIndex = 0; -+ intReturn = _TRUE; -+ } -+ return( intReturn ); -+} -+ -+static int rtw_wx_get_sens(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ #ifdef CONFIG_PLATFORM_ROCKCHIPS -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ /* -+ * 20110311 Commented by Jeff -+ * For rockchip platform's wpa_driver_wext_get_rssi -+ */ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { -+ //wrqu->sens.value=-padapter->recvpriv.signal_strength; -+ wrqu->sens.value=-padapter->recvpriv.rssi; -+ //DBG_871X("%s: %d\n", __FUNCTION__, wrqu->sens.value); -+ wrqu->sens.fixed = 0; /* no auto select */ -+ } else -+ #endif -+ { -+ wrqu->sens.value = 0; -+ wrqu->sens.fixed = 0; /* no auto select */ -+ wrqu->sens.disabled = 1; -+ } -+ return 0; -+} -+ -+static int rtw_wx_get_range(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ struct iw_range *range = (struct iw_range *)extra; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ u16 val; -+ int i; -+ -+ _func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_range. cmd_code=%x\n", info->cmd)); -+ -+ wrqu->data.length = sizeof(*range); -+ _rtw_memset(range, 0, sizeof(*range)); -+ -+ /* Let's try to keep this struct in the same order as in -+ * linux/include/wireless.h -+ */ -+ -+ /* TODO: See what values we can set, and remove the ones we can't -+ * set, or fill them with some default data. -+ */ -+ -+ /* ~5 Mb/s real (802.11b) */ -+ range->throughput = 5 * 1000 * 1000; -+ -+ // TODO: Not used in 802.11b? -+// range->min_nwid; /* Minimal NWID we are able to set */ -+ // TODO: Not used in 802.11b? -+// range->max_nwid; /* Maximal NWID we are able to set */ -+ -+ /* Old Frequency (backward compat - moved lower ) */ -+// range->old_num_channels; -+// range->old_num_frequency; -+// range->old_freq[6]; /* Filler to keep "version" at the same offset */ -+ -+ /* signal level threshold range */ -+ -+ //percent values between 0 and 100. -+ range->max_qual.qual = 100; -+ range->max_qual.level = 100; -+ range->max_qual.noise = 100; -+ range->max_qual.updated = 7; /* Updated all three */ -+ -+ -+ range->avg_qual.qual = 92; /* > 8% missed beacons is 'bad' */ -+ /* TODO: Find real 'good' to 'bad' threshol value for RSSI */ -+ range->avg_qual.level = 20 + -98; -+ range->avg_qual.noise = 0; -+ range->avg_qual.updated = 7; /* Updated all three */ -+ -+ range->num_bitrates = RATE_COUNT; -+ -+ for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) { -+ range->bitrate[i] = rtw_rates[i]; -+ } -+ -+ range->min_frag = MIN_FRAG_THRESHOLD; -+ range->max_frag = MAX_FRAG_THRESHOLD; -+ -+ range->pm_capa = 0; -+ -+ range->we_version_compiled = WIRELESS_EXT; -+ range->we_version_source = 16; -+ -+// range->retry_capa; /* What retry options are supported */ -+// range->retry_flags; /* How to decode max/min retry limit */ -+// range->r_time_flags; /* How to decode max/min retry life */ -+// range->min_retry; /* Minimal number of retries */ -+// range->max_retry; /* Maximal number of retries */ -+// range->min_r_time; /* Minimal retry lifetime */ -+// range->max_r_time; /* Maximal retry lifetime */ -+ -+ for (i = 0, val = 0; i < MAX_CHANNEL_NUM; i++) { -+ -+ // Include only legal frequencies for some countries -+ if(pmlmeext->channel_set[i].ChannelNum != 0) -+ { -+ range->freq[val].i = pmlmeext->channel_set[i].ChannelNum; -+ range->freq[val].m = rtw_ch2freq(pmlmeext->channel_set[i].ChannelNum) * 100000; -+ range->freq[val].e = 1; -+ val++; -+ } -+ -+ if (val == IW_MAX_FREQUENCIES) -+ break; -+ } -+ -+ range->num_channels = val; -+ range->num_frequency = val; -+ -+// Commented by Albert 2009/10/13 -+// The following code will proivde the security capability to network manager. -+// If the driver doesn't provide this capability to network manager, -+// the WPA/WPA2 routers can't be choosen in the network manager. -+ -+/* -+#define IW_SCAN_CAPA_NONE 0x00 -+#define IW_SCAN_CAPA_ESSID 0x01 -+#define IW_SCAN_CAPA_BSSID 0x02 -+#define IW_SCAN_CAPA_CHANNEL 0x04 -+#define IW_SCAN_CAPA_MODE 0x08 -+#define IW_SCAN_CAPA_RATE 0x10 -+#define IW_SCAN_CAPA_TYPE 0x20 -+#define IW_SCAN_CAPA_TIME 0x40 -+*/ -+ -+#if WIRELESS_EXT > 17 -+ range->enc_capa = IW_ENC_CAPA_WPA|IW_ENC_CAPA_WPA2| -+ IW_ENC_CAPA_CIPHER_TKIP|IW_ENC_CAPA_CIPHER_CCMP; -+#endif -+ -+#ifdef IW_SCAN_CAPA_ESSID //WIRELESS_EXT > 21 -+ range->scan_capa = IW_SCAN_CAPA_ESSID | IW_SCAN_CAPA_TYPE |IW_SCAN_CAPA_BSSID| -+ IW_SCAN_CAPA_CHANNEL|IW_SCAN_CAPA_MODE|IW_SCAN_CAPA_RATE; -+#endif -+ -+ -+ _func_exit_; -+ -+ return 0; -+ -+} -+ -+//set bssid flow -+//s1. rtw_set_802_11_infrastructure_mode() -+//s2. rtw_set_802_11_authentication_mode() -+//s3. set_802_11_encryption_mode() -+//s4. rtw_set_802_11_bssid() -+static int rtw_wx_set_wap(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *awrq, -+ char *extra) -+{ -+ _irqL irqL; -+ uint ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct sockaddr *temp = (struct sockaddr *)awrq; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ _list *phead; -+ u8 *dst_bssid, *src_bssid; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ NDIS_802_11_AUTHENTICATION_MODE authmode; -+ -+ _func_enter_; -+/* -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->iface_type > PRIMARY_IFACE) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+*/ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ printk("set bssid, but buddy_intf is under scanning or linking\n"); -+ -+ ret = -EINVAL; -+ -+ goto exit; -+ } -+#endif -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== _TRUE) -+ { -+ printk("set bssid, but buddy_intf is under scanning or linking\n"); -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) -+ { -+ ret= -1; -+ goto exit; -+ } -+ -+ if(!padapter->bup){ -+ ret = -1; -+ goto exit; -+ } -+ -+ -+ if (temp->sa_family != ARPHRD_ETHER){ -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ authmode = padapter->securitypriv.ndisauthtype; -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _enter_critical_bh(&queue->lock, &irqL); -+ phead = get_list_head(queue); -+ pmlmepriv->pscanned = get_next(phead); -+ -+ while (1) -+ { -+ -+ if ((rtw_end_of_queue_search(phead, pmlmepriv->pscanned)) == _TRUE) -+ { -+#if 0 -+ ret = -EINVAL; -+ goto exit; -+ -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) -+ { -+ rtw_set_802_11_bssid(padapter, temp->sa_data); -+ goto exit; -+ } -+ else -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+ -+ break; -+ } -+ -+ pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); -+ -+ pmlmepriv->pscanned = get_next(pmlmepriv->pscanned); -+ -+ dst_bssid = pnetwork->network.MacAddress; -+ -+ src_bssid = temp->sa_data; -+ -+ if ((_rtw_memcmp(dst_bssid, src_bssid, ETH_ALEN)) == _TRUE) -+ { -+ if(!rtw_set_802_11_infrastructure_mode(padapter, pnetwork->network.InfrastructureMode)) -+ { -+ ret = -1; -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ goto exit; -+ } -+ -+ break; -+ } -+ -+ } -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ rtw_set_802_11_authentication_mode(padapter, authmode); -+ //set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); -+ if (rtw_set_802_11_bssid(padapter, temp->sa_data) == _FALSE) { -+ ret = -1; -+ goto exit; -+ } -+ -+exit: -+ -+ _func_exit_; -+ -+ return ret; -+} -+ -+static int rtw_wx_get_wap(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; -+ -+ wrqu->ap_addr.sa_family = ARPHRD_ETHER; -+ -+ _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_wap\n")); -+ -+ _func_enter_; -+ -+ if ( ((check_fwstate(pmlmepriv, _FW_LINKED)) == _TRUE) || -+ ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) || -+ ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == _TRUE) ) -+ { -+ -+ _rtw_memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); -+ } -+ else -+ { -+ _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); -+ } -+ -+ _func_exit_; -+ -+ return 0; -+ -+} -+ -+static int rtw_wx_set_mlme(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+#if 0 -+/* SIOCSIWMLME data */ -+struct iw_mlme -+{ -+ __u16 cmd; /* IW_MLME_* */ -+ __u16 reason_code; -+ struct sockaddr addr; -+}; -+#endif -+ -+ int ret=0; -+ u16 reason; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_mlme *mlme = (struct iw_mlme *) extra; -+ -+ -+ if(mlme==NULL) -+ return -1; -+ -+ printk("%s\n", __FUNCTION__); -+ -+ reason = cpu_to_le16(mlme->reason_code); -+ -+ -+ printk("%s, cmd=%d, reason=%d\n", __FUNCTION__, mlme->cmd, reason); -+ -+ switch (mlme->cmd) -+ { -+ case IW_MLME_DEAUTH: -+ if(!rtw_set_802_11_disassociate(padapter)) -+ ret = -1; -+ break; -+ -+ case IW_MLME_DISASSOC: -+ if(!rtw_set_802_11_disassociate(padapter)) -+ ret = -1; -+ -+ break; -+ -+ default: -+ return -EOPNOTSUPP; -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, -+ union iwreq_data *wrqu, char *extra) -+{ -+ u8 _status = _FALSE; -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv= &padapter->mlmepriv; -+ NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; -+ _irqL irqL; -+#ifdef CONFIG_P2P -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif //CONFIG_P2P -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_set_scan\n")); -+ -+_func_enter_; -+ -+ #ifdef DBG_IOCTL -+ DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__); -+ #endif -+/* -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->iface_type > PRIMARY_IFACE) -+ { -+ ret = -1; -+ goto exit; -+ } -+#endif -+*/ -+ -+#ifdef CONFIG_MP_INCLUDED -+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) -+ { -+ ret = -1; -+ goto exit; -+ } -+#endif -+ -+ if(_FAIL == rtw_pwr_wakeup(padapter)) -+ { -+ ret= -1; -+ goto exit; -+ } -+ -+ if(padapter->bDriverStopped){ -+ DBG_871X("bDriverStopped=%d\n", padapter->bDriverStopped); -+ ret= -1; -+ goto exit; -+ } -+ -+ if(!padapter->bup){ -+ ret = -1; -+ goto exit; -+ } -+ -+ if (padapter->hw_init_completed==_FALSE){ -+ ret = -1; -+ goto exit; -+ } -+ -+ // When Busy Traffic, driver do not site survey. So driver return success. -+ // wpa_supplicant will not issue SIOCSIWSCAN cmd again after scan timeout. -+ // modify by thomas 2011-02-22. -+ if (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE) -+ { -+ indicate_wx_scan_complete_event(padapter); -+ goto exit; -+ } -+ -+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ indicate_wx_scan_complete_event(padapter); -+ goto exit; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, -+ _FW_UNDER_SURVEY|_FW_UNDER_LINKING|WIFI_UNDER_WPS) == _TRUE) -+ { -+ if(check_buddy_fwstate(padapter, _FW_UNDER_SURVEY)) -+ { -+ printk("scanning_via_buddy_intf\n"); -+ pmlmepriv->scanning_via_buddy_intf = _TRUE; -+ } -+ -+ indicate_wx_scan_complete_event(padapter); -+ -+ goto exit; -+ } -+#endif -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== _TRUE) -+ { -+ indicate_wx_scan_complete_event(padapter); -+ goto exit; -+ } -+#endif -+ -+// Mareded by Albert 20101103 -+// For the DMP WiFi Display project, the driver won't to scan because -+// the pmlmepriv->scan_interval is always equal to 3. -+// So, the wpa_supplicant won't find out the WPS SoftAP. -+ -+/* -+ if(pmlmepriv->scan_interval>10) -+ pmlmepriv->scan_interval = 0; -+ -+ if(pmlmepriv->scan_interval > 0) -+ { -+ DBG_871X("scan done\n"); -+ ret = 0; -+ goto exit; -+ } -+ -+*/ -+#ifdef CONFIG_P2P -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ rtw_p2p_set_pre_state( pwdinfo, rtw_p2p_state( pwdinfo ) ); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_FULL); -+ rtw_free_network_queue(padapter, _TRUE); -+ } -+#endif //CONFIG_P2P -+ -+ _rtw_memset(ssid, 0, sizeof(NDIS_802_11_SSID)*RTW_SSID_SCAN_AMOUNT); -+ -+#if WIRELESS_EXT >= 17 -+ if (wrqu->data.length == sizeof(struct iw_scan_req)) -+ { -+ struct iw_scan_req *req = (struct iw_scan_req *)extra; -+ -+ if (wrqu->data.flags & IW_SCAN_THIS_ESSID) -+ { -+ int len = min((int)req->essid_len, IW_ESSID_MAX_SIZE); -+ -+ _rtw_memcpy(ssid[0].Ssid, req->essid, len); -+ ssid[0].SsidLength = len; -+ -+ DBG_871X("IW_SCAN_THIS_ESSID, ssid=%s, len=%d\n", req->essid, req->essid_len); -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ _status = rtw_sitesurvey_cmd(padapter, ssid, 1, NULL, 0); -+ -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+ } -+ else if (req->scan_type == IW_SCAN_TYPE_PASSIVE) -+ { -+ DBG_871X("rtw_wx_set_scan, req->scan_type == IW_SCAN_TYPE_PASSIVE\n"); -+ } -+ -+ } -+ else -+#endif -+ -+ if( wrqu->data.length >= WEXT_CSCAN_HEADER_SIZE -+ && _rtw_memcmp(extra, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == _TRUE -+ ) -+ { -+ int len = wrqu->data.length -WEXT_CSCAN_HEADER_SIZE; -+ char *pos = extra+WEXT_CSCAN_HEADER_SIZE; -+ char section; -+ char sec_len; -+ int ssid_index = 0; -+ -+ //DBG_871X("%s COMBO_SCAN header is recognized\n", __FUNCTION__); -+ -+ while(len >= 1) { -+ section = *(pos++); len-=1; -+ -+ switch(section) { -+ case WEXT_CSCAN_SSID_SECTION: -+ //DBG_871X("WEXT_CSCAN_SSID_SECTION\n"); -+ if(len < 1) { -+ len = 0; -+ break; -+ } -+ -+ sec_len = *(pos++); len-=1; -+ -+ if(sec_len>0 && sec_len<=len) { -+ ssid[ssid_index].SsidLength = sec_len; -+ _rtw_memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); -+ //DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __FUNCTION__ -+ // , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); -+ ssid_index++; -+ } -+ -+ pos+=sec_len; len-=sec_len; -+ break; -+ -+ -+ case WEXT_CSCAN_CHANNEL_SECTION: -+ //DBG_871X("WEXT_CSCAN_CHANNEL_SECTION\n"); -+ pos+=1; len-=1; -+ break; -+ case WEXT_CSCAN_ACTV_DWELL_SECTION: -+ //DBG_871X("WEXT_CSCAN_ACTV_DWELL_SECTION\n"); -+ pos+=2; len-=2; -+ break; -+ case WEXT_CSCAN_PASV_DWELL_SECTION: -+ //DBG_871X("WEXT_CSCAN_PASV_DWELL_SECTION\n"); -+ pos+=2; len-=2; -+ break; -+ case WEXT_CSCAN_HOME_DWELL_SECTION: -+ //DBG_871X("WEXT_CSCAN_HOME_DWELL_SECTION\n"); -+ pos+=2; len-=2; -+ break; -+ case WEXT_CSCAN_TYPE_SECTION: -+ //DBG_871X("WEXT_CSCAN_TYPE_SECTION\n"); -+ pos+=1; len-=1; -+ break; -+ #if 0 -+ case WEXT_CSCAN_NPROBE_SECTION: -+ DBG_871X("WEXT_CSCAN_NPROBE_SECTION\n"); -+ break; -+ #endif -+ -+ default: -+ //DBG_871X("Unknown CSCAN section %c\n", section); -+ len = 0; // stop parsing -+ } -+ //DBG_871X("len:%d\n", len); -+ -+ } -+ -+ //jeff: it has still some scan paramater to parse, we only do this now... -+ _status = rtw_set_802_11_bssid_list_scan(padapter, ssid, RTW_SSID_SCAN_AMOUNT); -+ -+ } else -+ -+ { -+ _status = rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); -+ } -+ -+ if(_status == _FALSE) -+ ret = -1; -+ -+exit: -+ #ifdef DBG_IOCTL -+ DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret); -+ #endif -+ -+_func_exit_; -+ -+ return ret; -+} -+ -+static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _irqL irqL; -+ _list *plist, *phead; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ char *ev = extra; -+ char *stop = ev + wrqu->data.length; -+ u32 ret = 0; -+ u32 cnt=0; -+ u32 wait_for_surveydone; -+ sint wait_status; -+#ifdef CONFIG_CONCURRENT_MODE -+ //PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; -+ //struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -+#endif -+#ifdef CONFIG_P2P -+ struct wifidirect_info* pwdinfo = &padapter->wdinfo; -+#endif //CONFIG_P2P -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_scan\n")); -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_, (" Start of Query SIOCGIWSCAN .\n")); -+ -+ _func_enter_; -+ -+ #ifdef DBG_IOCTL -+ DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__); -+ #endif -+ -+/* -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->iface_type > PRIMARY_IFACE) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+*/ -+ if(padapter->pwrctrlpriv.brfoffbyhw && padapter->bDriverStopped) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+#ifdef CONFIG_P2P -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ // P2P is enabled -+ if ( padapter->chip_type == RTL8192D ) -+ wait_for_surveydone = 300; // Because the 8192du supports more channels. -+ else -+ wait_for_surveydone = 200; -+ } -+ else -+ { -+ // P2P is disabled -+ wait_for_surveydone = 100; -+ } -+#else -+ { -+ wait_for_surveydone = 100; -+ } -+#endif //CONFIG_P2P -+ -+/* -+#ifdef CONFIG_CONCURRENT_MODE -+ if(pmlmepriv->scanning_via_buddy_intf == _TRUE) -+ { -+ pmlmepriv->scanning_via_buddy_intf = _FALSE;//reset -+ -+ // change pointers to buddy interface -+ padapter = pbuddy_adapter; -+ pmlmepriv = pbuddy_mlmepriv; -+ queue = &(pbuddy_mlmepriv->scanned_queue); -+ -+ } -+#endif // CONFIG_CONCURRENT_MODE -+*/ -+ -+ wait_status = _FW_UNDER_SURVEY -+ #ifndef CONFIG_ANDROID -+ |_FW_UNDER_LINKING -+ #endif -+ ; -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ while(dc_check_fwstate(padapter, wait_status)== _TRUE) -+ { -+ rtw_msleep_os(30); -+ cnt++; -+ if(cnt > wait_for_surveydone ) -+ break; -+ } -+#endif // CONFIG_DUALMAC_CONCURRENT -+ -+ while(check_fwstate(pmlmepriv, wait_status) == _TRUE) -+ { -+ rtw_msleep_os(30); -+ cnt++; -+ if(cnt > wait_for_surveydone ) -+ break; -+ } -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ if((stop - ev) < SCAN_ITEM_SIZE) { -+ ret = -E2BIG; -+ break; -+ } -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ //report network only if the current channel set contains the channel to which this network belongs -+ if(rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0 -+ && rtw_mlme_band_check(padapter, pnetwork->network.Configuration.DSConfig) == _TRUE -+ && _TRUE == rtw_validate_ssid(&(pnetwork->network.Ssid)) -+ ) -+ { -+ ev=translate_scan(padapter, a, pnetwork, ev, stop); -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ wrqu->data.length = ev-extra; -+ wrqu->data.flags = 0; -+ -+exit: -+ -+ _func_exit_; -+ -+ #ifdef DBG_IOCTL -+ DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret); -+ #endif -+ -+ return ret ; -+ -+} -+ -+//set ssid flow -+//s1. rtw_set_802_11_infrastructure_mode() -+//s2. set_802_11_authenticaion_mode() -+//s3. set_802_11_encryption_mode() -+//s4. rtw_set_802_11_ssid() -+static int rtw_wx_set_essid(struct net_device *dev, -+ struct iw_request_info *a, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _irqL irqL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _queue *queue = &pmlmepriv->scanned_queue; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ _list *phead; -+ s8 status = _TRUE; -+ struct wlan_network *pnetwork = NULL; -+ NDIS_802_11_AUTHENTICATION_MODE authmode; -+ NDIS_802_11_SSID ndis_ssid; -+ u8 *dst_ssid, *src_ssid; -+ -+ uint ret = 0, len; -+ -+ _func_enter_; -+ -+ #ifdef DBG_IOCTL -+ DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__); -+ #endif -+ -+/* -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->iface_type > PRIMARY_IFACE) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+*/ -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if (check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) -+ { -+ printk("set ssid, but buddy_intf is under scanning or linking\n"); -+ -+ ret = -EINVAL; -+ -+ goto exit; -+ } -+#endif -+ -+#ifdef CONFIG_DUALMAC_CONCURRENT -+ if (dc_check_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)== _TRUE) -+ { -+ printk("set bssid, but buddy_intf is under scanning or linking\n"); -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("+rtw_wx_set_essid: fw_state=0x%08x\n", get_fwstate(pmlmepriv))); -+ if(_FAIL == rtw_pwr_wakeup(padapter)) -+ { -+ ret = -1; -+ goto exit; -+ } -+ -+ if(!padapter->bup){ -+ ret = -1; -+ goto exit; -+ } -+ -+#if WIRELESS_EXT <= 20 -+ if ((wrqu->essid.length-1) > IW_ESSID_MAX_SIZE){ -+#else -+ if (wrqu->essid.length > IW_ESSID_MAX_SIZE){ -+#endif -+ ret= -E2BIG; -+ goto exit; -+ } -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) { -+ ret = -1; -+ goto exit; -+ } -+ -+ authmode = padapter->securitypriv.ndisauthtype; -+ DBG_871X("=>%s\n",__FUNCTION__); -+ if (wrqu->essid.flags && wrqu->essid.length) -+ { -+ // Commented by Albert 20100519 -+ // We got the codes in "set_info" function of iwconfig source code. -+ // ========================================= -+ // wrq.u.essid.length = strlen(essid) + 1; -+ // if(we_kernel_version > 20) -+ // wrq.u.essid.length--; -+ // ========================================= -+ // That means, if the WIRELESS_EXT less than or equal to 20, the correct ssid len should subtract 1. -+#if WIRELESS_EXT <= 20 -+ len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE; -+#else -+ len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? wrqu->essid.length : IW_ESSID_MAX_SIZE; -+#endif -+ -+ if( wrqu->essid.length != 33 ) -+ DBG_871X("ssid=%s, len=%d\n", extra, wrqu->essid.length); -+ -+ _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); -+ ndis_ssid.SsidLength = len; -+ _rtw_memcpy(ndis_ssid.Ssid, extra, len); -+ src_ssid = ndis_ssid.Ssid; -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("rtw_wx_set_essid: ssid=[%s]\n", src_ssid)); -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _enter_critical_bh(&queue->lock, &irqL); -+ phead = get_list_head(queue); -+ pmlmepriv->pscanned = get_next(phead); -+ -+ while (1) -+ { -+ if (rtw_end_of_queue_search(phead, pmlmepriv->pscanned) == _TRUE) -+ { -+#if 0 -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) -+ { -+ rtw_set_802_11_ssid(padapter, &ndis_ssid); -+ -+ goto exit; -+ } -+ else -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("rtw_wx_set_ssid(): scanned_queue is empty\n")); -+ ret = -EINVAL; -+ goto exit; -+ } -+#endif -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_warning_, -+ ("rtw_wx_set_essid: scan_q is empty, set ssid to check if scanning again!\n")); -+ -+ break; -+ } -+ -+ pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); -+ -+ pmlmepriv->pscanned = get_next(pmlmepriv->pscanned); -+ -+ dst_ssid = pnetwork->network.Ssid.Ssid; -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("rtw_wx_set_essid: dst_ssid=%s\n", -+ pnetwork->network.Ssid.Ssid)); -+ -+ if ((_rtw_memcmp(dst_ssid, src_ssid, ndis_ssid.SsidLength) == _TRUE) && -+ (pnetwork->network.Ssid.SsidLength==ndis_ssid.SsidLength)) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("rtw_wx_set_essid: find match, set infra mode\n")); -+ -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) -+ { -+ if(pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode) -+ continue; -+ } -+ -+ if (rtw_set_802_11_infrastructure_mode(padapter, pnetwork->network.InfrastructureMode) == _FALSE) -+ { -+ ret = -1; -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ goto exit; -+ } -+ -+ break; -+ } -+ } -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("set ssid: set_802_11_auth. mode=%d\n", authmode)); -+ rtw_set_802_11_authentication_mode(padapter, authmode); -+ //set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); -+ if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == _FALSE) { -+ ret = -1; -+ goto exit; -+ } -+ } -+ -+exit: -+ -+ DBG_871X("<=%s, ret %d\n",__FUNCTION__, ret); -+ -+ #ifdef DBG_IOCTL -+ DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret); -+ #endif -+ -+ _func_exit_; -+ -+ return ret; -+} -+ -+static int rtw_wx_get_essid(struct net_device *dev, -+ struct iw_request_info *a, -+ union iwreq_data *wrqu, char *extra) -+{ -+ u32 len,ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_essid\n")); -+ -+ _func_enter_; -+ -+ if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) || -+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) -+ { -+ len = pcur_bss->Ssid.SsidLength; -+ -+ wrqu->essid.length = len; -+ -+ _rtw_memcpy(extra, pcur_bss->Ssid.Ssid, len); -+ -+ wrqu->essid.flags = 1; -+ } -+ else -+ { -+ ret = -1; -+ goto exit; -+ } -+ -+exit: -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int rtw_wx_set_rate(struct net_device *dev, -+ struct iw_request_info *a, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int i, ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 datarates[NumRates]; -+ u32 target_rate = wrqu->bitrate.value; -+ u32 fixed = wrqu->bitrate.fixed; -+ u32 ratevalue = 0; -+ u8 mpdatarate[NumRates]={11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff}; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_set_rate \n")); -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("target_rate = %d, fixed = %d\n",target_rate,fixed)); -+ -+ if(target_rate == -1){ -+ ratevalue = 11; -+ goto set_rate; -+ } -+ target_rate = target_rate/100000; -+ -+ switch(target_rate){ -+ case 10: -+ ratevalue = 0; -+ break; -+ case 20: -+ ratevalue = 1; -+ break; -+ case 55: -+ ratevalue = 2; -+ break; -+ case 60: -+ ratevalue = 3; -+ break; -+ case 90: -+ ratevalue = 4; -+ break; -+ case 110: -+ ratevalue = 5; -+ break; -+ case 120: -+ ratevalue = 6; -+ break; -+ case 180: -+ ratevalue = 7; -+ break; -+ case 240: -+ ratevalue = 8; -+ break; -+ case 360: -+ ratevalue = 9; -+ break; -+ case 480: -+ ratevalue = 10; -+ break; -+ case 540: -+ ratevalue = 11; -+ break; -+ default: -+ ratevalue = 11; -+ break; -+ } -+ -+set_rate: -+ -+ for(i=0; ibitrate.fixed = 0; /* no auto select */ -+ wrqu->bitrate.value = max_rate * 100000; -+ -+ return 0; -+} -+ -+static int rtw_wx_set_rts(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ _func_enter_; -+ -+ if (wrqu->rts.disabled) -+ padapter->registrypriv.rts_thresh = 2347; -+ else { -+ if (wrqu->rts.value < 0 || -+ wrqu->rts.value > 2347) -+ return -EINVAL; -+ -+ padapter->registrypriv.rts_thresh = wrqu->rts.value; -+ } -+ -+ DBG_871X("%s, rts_thresh=%d\n", __func__, padapter->registrypriv.rts_thresh); -+ -+ _func_exit_; -+ -+ return 0; -+ -+} -+ -+static int rtw_wx_get_rts(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ _func_enter_; -+ -+ DBG_871X("%s, rts_thresh=%d\n", __func__, padapter->registrypriv.rts_thresh); -+ -+ wrqu->rts.value = padapter->registrypriv.rts_thresh; -+ wrqu->rts.fixed = 0; /* no auto select */ -+ //wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD); -+ -+ _func_exit_; -+ -+ return 0; -+} -+ -+static int rtw_wx_set_frag(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ _func_enter_; -+ -+ if (wrqu->frag.disabled) -+ padapter->xmitpriv.frag_len = MAX_FRAG_THRESHOLD; -+ else { -+ if (wrqu->frag.value < MIN_FRAG_THRESHOLD || -+ wrqu->frag.value > MAX_FRAG_THRESHOLD) -+ return -EINVAL; -+ -+ padapter->xmitpriv.frag_len = wrqu->frag.value & ~0x1; -+ } -+ -+ DBG_871X("%s, frag_len=%d\n", __func__, padapter->xmitpriv.frag_len); -+ -+ _func_exit_; -+ -+ return 0; -+ -+} -+ -+static int rtw_wx_get_frag(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ _func_enter_; -+ -+ DBG_871X("%s, frag_len=%d\n", __func__, padapter->xmitpriv.frag_len); -+ -+ wrqu->frag.value = padapter->xmitpriv.frag_len; -+ wrqu->frag.fixed = 0; /* no auto select */ -+ //wrqu->frag.disabled = (wrqu->frag.value == DEFAULT_FRAG_THRESHOLD); -+ -+ _func_exit_; -+ -+ return 0; -+} -+ -+static int rtw_wx_get_retry(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ -+ wrqu->retry.value = 7; -+ wrqu->retry.fixed = 0; /* no auto select */ -+ wrqu->retry.disabled = 1; -+ -+ return 0; -+ -+} -+ -+#if 0 -+#define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ -+#define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ -+#define IW_ENCODE_MODE 0xF000 /* Modes defined below */ -+#define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ -+#define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ -+#define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ -+#define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ -+#define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ -+#define IW_ENCODE_TEMP 0x0400 /* Temporary key */ -+/* -+iwconfig wlan0 key on -> flags = 0x6001 -> maybe it means auto -+iwconfig wlan0 key off -> flags = 0x8800 -+iwconfig wlan0 key open -> flags = 0x2800 -+iwconfig wlan0 key open 1234567890 -> flags = 0x2000 -+iwconfig wlan0 key restricted -> flags = 0x4800 -+iwconfig wlan0 key open [3] 1234567890 -> flags = 0x2003 -+iwconfig wlan0 key restricted [2] 1234567890 -> flags = 0x4002 -+iwconfig wlan0 key open [3] -> flags = 0x2803 -+iwconfig wlan0 key restricted [2] -> flags = 0x4802 -+*/ -+#endif -+ -+static int rtw_wx_set_enc(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *keybuf) -+{ -+ u32 key, ret = 0; -+ u32 keyindex_provided; -+ NDIS_802_11_WEP wep; -+ NDIS_802_11_AUTHENTICATION_MODE authmode; -+ -+ struct iw_point *erq = &(wrqu->encoding); -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ DBG_871X("+rtw_wx_set_enc, flags=0x%x\n", erq->flags); -+ -+ _rtw_memset(&wep, 0, sizeof(NDIS_802_11_WEP)); -+ -+ key = erq->flags & IW_ENCODE_INDEX; -+ -+ _func_enter_; -+ -+ if (erq->flags & IW_ENCODE_DISABLED) -+ { -+ DBG_871X("EncryptionDisabled\n"); -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_; -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Open; //open system -+ authmode = Ndis802_11AuthModeOpen; -+ padapter->securitypriv.ndisauthtype=authmode; -+ -+ goto exit; -+ } -+ -+ if (key) { -+ if (key > WEP_KEYS) -+ return -EINVAL; -+ key--; -+ keyindex_provided = 1; -+ } -+ else -+ { -+ keyindex_provided = 0; -+ key = padapter->securitypriv.dot11PrivacyKeyIndex; -+ DBG_871X("rtw_wx_set_enc, key=%d\n", key); -+ } -+ -+ //set authentication mode -+ if(erq->flags & IW_ENCODE_OPEN) -+ { -+ DBG_871X("rtw_wx_set_enc():IW_ENCODE_OPEN\n"); -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;//Ndis802_11EncryptionDisabled; -+ -+#ifdef CONFIG_PLATFORM_MT53XX -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; -+#else -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Open; -+#endif -+ -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_; -+ authmode = Ndis802_11AuthModeOpen; -+ padapter->securitypriv.ndisauthtype=authmode; -+ } -+ else if(erq->flags & IW_ENCODE_RESTRICTED) -+ { -+ DBG_871X("rtw_wx_set_enc():IW_ENCODE_RESTRICTED\n"); -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ -+#ifdef CONFIG_PLATFORM_MT53XX -+ padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; -+#else -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Shared; -+#endif -+ -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_WEP40_; -+ authmode = Ndis802_11AuthModeShared; -+ padapter->securitypriv.ndisauthtype=authmode; -+ } -+ else -+ { -+ DBG_871X("rtw_wx_set_enc():erq->flags=0x%x\n", erq->flags); -+ -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;//Ndis802_11EncryptionDisabled; -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Open; //open system -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_; -+ authmode = Ndis802_11AuthModeOpen; -+ padapter->securitypriv.ndisauthtype=authmode; -+ } -+ -+ wep.KeyIndex = key; -+ if (erq->length > 0) -+ { -+ wep.KeyLength = erq->length <= 5 ? 5 : 13; -+ -+ wep.Length = wep.KeyLength + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial); -+ } -+ else -+ { -+ wep.KeyLength = 0 ; -+ -+ if(keyindex_provided == 1)// set key_id only, no given KeyMaterial(erq->length==0). -+ { -+ padapter->securitypriv.dot11PrivacyKeyIndex = key; -+ -+ DBG_871X("(keyindex_provided == 1), keyid=%d, key_len=%d\n", key, padapter->securitypriv.dot11DefKeylen[key]); -+ -+ switch(padapter->securitypriv.dot11DefKeylen[key]) -+ { -+ case 5: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_; -+ break; -+ case 13: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_; -+ break; -+ default: -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ break; -+ } -+ -+ goto exit; -+ -+ } -+ -+ } -+ -+ wep.KeyIndex |= 0x80000000; -+ -+ _rtw_memcpy(wep.KeyMaterial, keybuf, wep.KeyLength); -+ -+ if (rtw_set_802_11_add_wep(padapter, &wep) == _FALSE) { -+ if(rf_on == pwrpriv->rf_pwrstate ) -+ ret = -EOPNOTSUPP; -+ goto exit; -+ } -+ -+exit: -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int rtw_wx_get_enc(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *keybuf) -+{ -+ uint key, ret =0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *erq = &(wrqu->encoding); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ _func_enter_; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) -+ { -+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE) -+ { -+ erq->length = 0; -+ erq->flags |= IW_ENCODE_DISABLED; -+ return 0; -+ } -+ } -+ -+ -+ key = erq->flags & IW_ENCODE_INDEX; -+ -+ if (key) { -+ if (key > WEP_KEYS) -+ return -EINVAL; -+ key--; -+ } else -+ { -+ key = padapter->securitypriv.dot11PrivacyKeyIndex; -+ } -+ -+ erq->flags = key + 1; -+ -+ //if(padapter->securitypriv.ndisauthtype == Ndis802_11AuthModeOpen) -+ //{ -+ // erq->flags |= IW_ENCODE_OPEN; -+ //} -+ -+ switch(padapter->securitypriv.ndisencryptstatus) -+ { -+ case Ndis802_11EncryptionNotSupported: -+ case Ndis802_11EncryptionDisabled: -+ -+ erq->length = 0; -+ erq->flags |= IW_ENCODE_DISABLED; -+ -+ break; -+ -+ case Ndis802_11Encryption1Enabled: -+ -+ erq->length = padapter->securitypriv.dot11DefKeylen[key]; -+ -+ if(erq->length) -+ { -+ _rtw_memcpy(keybuf, padapter->securitypriv.dot11DefKey[key].skey, padapter->securitypriv.dot11DefKeylen[key]); -+ -+ erq->flags |= IW_ENCODE_ENABLED; -+ -+ if(padapter->securitypriv.ndisauthtype == Ndis802_11AuthModeOpen) -+ { -+ erq->flags |= IW_ENCODE_OPEN; -+ } -+ else if(padapter->securitypriv.ndisauthtype == Ndis802_11AuthModeShared) -+ { -+ erq->flags |= IW_ENCODE_RESTRICTED; -+ } -+ } -+ else -+ { -+ erq->length = 0; -+ erq->flags |= IW_ENCODE_DISABLED; -+ } -+ -+ break; -+ -+ case Ndis802_11Encryption2Enabled: -+ case Ndis802_11Encryption3Enabled: -+ -+ erq->length = 16; -+ erq->flags |= (IW_ENCODE_ENABLED | IW_ENCODE_OPEN | IW_ENCODE_NOKEY); -+ -+ break; -+ -+ default: -+ erq->length = 0; -+ erq->flags |= IW_ENCODE_DISABLED; -+ -+ break; -+ -+ } -+ -+ _func_exit_; -+ -+ return ret; -+ -+} -+ -+static int rtw_wx_get_power(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ wrqu->power.value = 0; -+ wrqu->power.fixed = 0; /* no auto select */ -+ wrqu->power.disabled = 1; -+ -+ return 0; -+ -+} -+ -+static int rtw_wx_set_gen_ie(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ ret = rtw_set_wpa_ie(padapter, extra, wrqu->data.length); -+ -+ return ret; -+} -+ -+static int rtw_wx_set_auth(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_param *param = (struct iw_param*)&(wrqu->param); -+ int ret = 0; -+ -+ switch (param->flags & IW_AUTH_INDEX) { -+ case IW_AUTH_WPA_VERSION: -+ break; -+ case IW_AUTH_CIPHER_PAIRWISE: -+ -+ break; -+ case IW_AUTH_CIPHER_GROUP: -+ -+ break; -+ case IW_AUTH_KEY_MGMT: -+ /* -+ * ??? does not use these parameters -+ */ -+ break; -+ -+ case IW_AUTH_TKIP_COUNTERMEASURES: -+ { -+ if ( param->value ) -+ { // wpa_supplicant is enabling the tkip countermeasure. -+ padapter->securitypriv.btkip_countermeasure = _TRUE; -+ } -+ else -+ { // wpa_supplicant is disabling the tkip countermeasure. -+ padapter->securitypriv.btkip_countermeasure = _FALSE; -+ } -+ break; -+ } -+ case IW_AUTH_DROP_UNENCRYPTED: -+ { -+ /* HACK: -+ * -+ * wpa_supplicant calls set_wpa_enabled when the driver -+ * is loaded and unloaded, regardless of if WPA is being -+ * used. No other calls are made which can be used to -+ * determine if encryption will be used or not prior to -+ * association being expected. If encryption is not being -+ * used, drop_unencrypted is set to false, else true -- we -+ * can use this to determine if the CAP_PRIVACY_ON bit should -+ * be set. -+ */ -+ -+ if(padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption1Enabled) -+ { -+ break;//it means init value, or using wep, ndisencryptstatus = Ndis802_11Encryption1Enabled, -+ // then it needn't reset it; -+ } -+ -+ if(param->value){ -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; -+ padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; -+ padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_; -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Open; //open system -+ padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeOpen; -+ } -+ -+ break; -+ } -+ -+ case IW_AUTH_80211_AUTH_ALG: -+ -+ #if defined(CONFIG_ANDROID) || 1 -+ /* -+ * It's the starting point of a link layer connection using wpa_supplicant -+ */ -+ if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { -+ LeaveAllPowerSaveMode(padapter); -+ rtw_disassoc_cmd(padapter, 500, _FALSE); -+ DBG_871X("%s...call rtw_indicate_disconnect\n ",__FUNCTION__); -+ rtw_indicate_disconnect(padapter); -+ rtw_free_assoc_resources(padapter, 1); -+ } -+ #endif -+ -+ -+ ret = wpa_set_auth_algs(dev, (u32)param->value); -+ -+ break; -+ -+ case IW_AUTH_WPA_ENABLED: -+ -+ //if(param->value) -+ // padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; //802.1x -+ //else -+ // padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;//open system -+ -+ //_disassociate(priv); -+ -+ break; -+ -+ case IW_AUTH_RX_UNENCRYPTED_EAPOL: -+ //ieee->ieee802_1x = param->value; -+ break; -+ -+ case IW_AUTH_PRIVACY_INVOKED: -+ //ieee->privacy_invoked = param->value; -+ break; -+ -+ default: -+ return -EOPNOTSUPP; -+ -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_wx_set_enc_ext(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ char *alg_name; -+ u32 param_len; -+ struct ieee_param *param = NULL; -+ struct iw_point *pencoding = &wrqu->encoding; -+ struct iw_encode_ext *pext = (struct iw_encode_ext *)extra; -+ int ret=0; -+ -+ param_len = sizeof(struct ieee_param) + pext->key_len; -+ param = (struct ieee_param *)rtw_malloc(param_len); -+ if (param == NULL) -+ return -1; -+ -+ _rtw_memset(param, 0, param_len); -+ -+ param->cmd = IEEE_CMD_SET_ENCRYPTION; -+ _rtw_memset(param->sta_addr, 0xff, ETH_ALEN); -+ -+ -+ switch (pext->alg) { -+ case IW_ENCODE_ALG_NONE: -+ //todo: remove key -+ //remove = 1; -+ alg_name = "none"; -+ break; -+ case IW_ENCODE_ALG_WEP: -+ alg_name = "WEP"; -+ break; -+ case IW_ENCODE_ALG_TKIP: -+ alg_name = "TKIP"; -+ break; -+ case IW_ENCODE_ALG_CCMP: -+ alg_name = "CCMP"; -+ break; -+#ifdef CONFIG_IEEE80211W -+ case IW_ENCODE_ALG_AES_CMAC: -+ alg_name = "BIP"; -+ break; -+#endif //CONFIG_IEEE80211W -+ default: -+ return -1; -+ } -+ -+ strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN); -+ -+ -+ if((pext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)//? -+#ifdef CONFIG_IEEE80211W -+ || (pext->ext_flags & IW_ENCODE_ALG_AES_CMAC) -+#endif //CONFIG_IEEE80211W -+ ) -+ { -+ param->u.crypt.set_tx = 0; -+ } -+ -+ if (pext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)//? -+ { -+ param->u.crypt.set_tx = 1; -+ } -+ -+ param->u.crypt.idx = (pencoding->flags&0x00FF) -1 ; -+ -+ if (pext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) -+ { -+ _rtw_memcpy(param->u.crypt.seq, pext->rx_seq, 8); -+ } -+ -+ if(pext->key_len) -+ { -+ param->u.crypt.key_len = pext->key_len; -+ //_rtw_memcpy(param + 1, pext + 1, pext->key_len); -+ _rtw_memcpy(param->u.crypt.key, pext + 1, pext->key_len); -+ } -+ -+ -+ if (pencoding->flags & IW_ENCODE_DISABLED) -+ { -+ //todo: remove key -+ //remove = 1; -+ } -+ -+ ret = wpa_set_encryption(dev, param, param_len); -+ -+ -+ if(param) -+ { -+ rtw_mfree((u8*)param, param_len); -+ } -+ -+ -+ return ret; -+ -+} -+ -+ -+static int rtw_wx_get_nick(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ //struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ if(extra) -+ { -+ wrqu->data.length = 14; -+ wrqu->data.flags = 1; -+ _rtw_memcpy(extra, "", 14); -+ } -+ -+ //rtw_signal_process(pid, SIGUSR1); //for test -+ -+ //dump debug info here -+/* -+ u32 dot11AuthAlgrthm; // 802.11 auth, could be open, shared, and 8021x -+ u32 dot11PrivacyAlgrthm; // This specify the privacy for shared auth. algorithm. -+ u32 dot118021XGrpPrivacy; // This specify the privacy algthm. used for Grp key -+ u32 ndisauthtype; -+ u32 ndisencryptstatus; -+*/ -+ -+ //DBG_871X("auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n", -+ // psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm, -+ // psecuritypriv->ndisauthtype, psecuritypriv->ndisencryptstatus); -+ -+ //DBG_871X("enc_alg=0x%x\n", psecuritypriv->dot11PrivacyAlgrthm); -+ //DBG_871X("auth_type=0x%x\n", psecuritypriv->ndisauthtype); -+ //DBG_871X("enc_type=0x%x\n", psecuritypriv->ndisencryptstatus); -+ -+#if 0 -+ DBG_871X("dbg(0x210)=0x%x\n", rtw_read32(padapter, 0x210)); -+ DBG_871X("dbg(0x608)=0x%x\n", rtw_read32(padapter, 0x608)); -+ DBG_871X("dbg(0x280)=0x%x\n", rtw_read32(padapter, 0x280)); -+ DBG_871X("dbg(0x284)=0x%x\n", rtw_read32(padapter, 0x284)); -+ DBG_871X("dbg(0x288)=0x%x\n", rtw_read32(padapter, 0x288)); -+ -+ DBG_871X("dbg(0x664)=0x%x\n", rtw_read32(padapter, 0x664)); -+ -+ -+ DBG_871X("\n"); -+ -+ DBG_871X("dbg(0x430)=0x%x\n", rtw_read32(padapter, 0x430)); -+ DBG_871X("dbg(0x438)=0x%x\n", rtw_read32(padapter, 0x438)); -+ -+ DBG_871X("dbg(0x440)=0x%x\n", rtw_read32(padapter, 0x440)); -+ -+ DBG_871X("dbg(0x458)=0x%x\n", rtw_read32(padapter, 0x458)); -+ -+ DBG_871X("dbg(0x484)=0x%x\n", rtw_read32(padapter, 0x484)); -+ DBG_871X("dbg(0x488)=0x%x\n", rtw_read32(padapter, 0x488)); -+ -+ DBG_871X("dbg(0x444)=0x%x\n", rtw_read32(padapter, 0x444)); -+ DBG_871X("dbg(0x448)=0x%x\n", rtw_read32(padapter, 0x448)); -+ DBG_871X("dbg(0x44c)=0x%x\n", rtw_read32(padapter, 0x44c)); -+ DBG_871X("dbg(0x450)=0x%x\n", rtw_read32(padapter, 0x450)); -+#endif -+ -+ return 0; -+ -+} -+ -+static int rtw_wx_read32(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ PADAPTER padapter; -+ struct iw_point *p; -+ u16 len; -+ u32 addr; -+ u32 data32; -+ u32 bytes; -+ u8 *ptmp; -+ -+ -+ padapter = (PADAPTER)rtw_netdev_priv(dev); -+ p = &wrqu->data; -+ len = p->length; -+ ptmp = (u8*)rtw_malloc(len); -+ if (NULL == ptmp) -+ return -ENOMEM; -+ -+ if (copy_from_user(ptmp, p->pointer, len)) { -+ rtw_mfree(ptmp, len); -+ return -EFAULT; -+ } -+ -+ bytes = 0; -+ addr = 0; -+ sscanf(ptmp, "%d,%x", &bytes, &addr); -+ -+ switch (bytes) { -+ case 1: -+ data32 = rtw_read8(padapter, addr); -+ sprintf(extra, "0x%02X", data32); -+ break; -+ case 2: -+ data32 = rtw_read16(padapter, addr); -+ sprintf(extra, "0x%04X", data32); -+ break; -+ case 4: -+ data32 = rtw_read32(padapter, addr); -+ sprintf(extra, "0x%08X", data32); -+ break; -+ default: -+ printk(KERN_INFO "%s: usage> read [bytes],[address(hex)]\n", __func__); -+ return -EINVAL; -+ } -+ printk(KERN_INFO "%s: addr=0x%08X data=%s\n", __func__, addr, extra); -+ -+ rtw_mfree(ptmp, len); -+ -+ return 0; -+} -+ -+static int rtw_wx_write32(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ PADAPTER padapter = (PADAPTER)rtw_netdev_priv(dev); -+ -+ u32 addr; -+ u32 data32; -+ u32 bytes; -+ -+ -+ bytes = 0; -+ addr = 0; -+ data32 = 0; -+ sscanf(extra, "%d,%x,%x", &bytes, &addr, &data32); -+ -+ switch (bytes) { -+ case 1: -+ rtw_write8(padapter, addr, (u8)data32); -+ printk(KERN_INFO "%s: addr=0x%08X data=0x%02X\n", __func__, addr, (u8)data32); -+ break; -+ case 2: -+ rtw_write16(padapter, addr, (u16)data32); -+ printk(KERN_INFO "%s: addr=0x%08X data=0x%04X\n", __func__, addr, (u16)data32); -+ break; -+ case 4: -+ rtw_write32(padapter, addr, data32); -+ printk(KERN_INFO "%s: addr=0x%08X data=0x%08X\n", __func__, addr, data32); -+ break; -+ default: -+ printk(KERN_INFO "%s: usage> write [bytes],[address(hex)],[data(hex)]\n", __func__); -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static int rtw_wx_read_rf(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u32 path, addr, data32; -+ -+ -+ path = *(u32*)extra; -+ addr = *((u32*)extra + 1); -+ data32 = rtw_hal_read_rfreg(padapter, path, addr, 0xFFFFF); -+// DBG_871X("%s: path=%d addr=0x%02x data=0x%05x\n", __func__, path, addr, data32); -+ /* -+ * IMPORTANT!! -+ * Only when wireless private ioctl is at odd order, -+ * "extra" would be copied to user space. -+ */ -+ sprintf(extra, "0x%05x", data32); -+ -+ return 0; -+} -+ -+static int rtw_wx_write_rf(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u32 path, addr, data32; -+ -+ -+ path = *(u32*)extra; -+ addr = *((u32*)extra + 1); -+ data32 = *((u32*)extra + 2); -+// DBG_871X("%s: path=%d addr=0x%02x data=0x%05x\n", __func__, path, addr, data32); -+ rtw_hal_write_rfreg(padapter, path, addr, 0xFFFFF, data32); -+ -+ return 0; -+} -+ -+static int rtw_wx_priv_null(struct net_device *dev, struct iw_request_info *a, -+ union iwreq_data *wrqu, char *b) -+{ -+ return -1; -+} -+ -+static int dummy(struct net_device *dev, struct iw_request_info *a, -+ union iwreq_data *wrqu, char *b) -+{ -+ //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ //DBG_871X("cmd_code=%x, fwstate=0x%x\n", a->cmd, get_fwstate(pmlmepriv)); -+ -+ return -1; -+ -+} -+ -+static int rtw_wx_set_channel_plan(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct registry_priv *pregistrypriv = &padapter->registrypriv; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ extern int rtw_channel_plan; -+ u8 channel_plan_req = (u8) (*((int *)wrqu)); -+ -+ #if 0 -+ rtw_channel_plan = (int)wrqu->data.pointer; -+ pregistrypriv->channel_plan = rtw_channel_plan; -+ pmlmepriv->ChannelPlan = pregistrypriv->channel_plan; -+ #endif -+ -+ if( _SUCCESS == rtw_set_chplan_cmd(padapter, channel_plan_req, 1) ) { -+ DBG_871X("%s set channel_plan = 0x%02X\n", __func__, pmlmepriv->ChannelPlan); -+ } else -+ return -EPERM; -+ -+ return 0; -+} -+ -+static int rtw_wx_set_mtk_wps_probe_ie(struct net_device *dev, -+ struct iw_request_info *a, -+ union iwreq_data *wrqu, char *b) -+{ -+#ifdef CONFIG_PLATFORM_MT53XX -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, -+ ("WLAN IOCTL: cmd_code=%x, fwstate=0x%x\n", -+ a->cmd, get_fwstate(pmlmepriv))); -+#endif -+ return 0; -+} -+ -+static int rtw_wx_get_sensitivity(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *buf) -+{ -+#ifdef CONFIG_PLATFORM_MT53XX -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ // Modified by Albert 20110914 -+ // This is in dbm format for MTK platform. -+ wrqu->qual.level = padapter->recvpriv.rssi; -+ DBG_871X(" level = %u\n", wrqu->qual.level ); -+#endif -+ return 0; -+} -+ -+static int rtw_wx_set_mtk_wps_ie(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+#ifdef CONFIG_PLATFORM_MT53XX -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ return rtw_set_wpa_ie(padapter, wrqu->data.pointer, wrqu->data.length); -+#else -+ return 0; -+#endif -+} -+ -+/* -+typedef int (*iw_handler)(struct net_device *dev, struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra); -+*/ -+/* -+ * For all data larger than 16 octets, we need to use a -+ * pointer to memory allocated in user space. -+ */ -+static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ #if 0 -+struct iw_point -+{ -+ void __user *pointer; /* Pointer to the data (in user space) */ -+ __u16 length; /* number of fields or size in bytes */ -+ __u16 flags; /* Optional params */ -+}; -+ #endif -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ u8 res; -+ struct drvext_handler *phandler; -+ struct drvext_oidparam *poidparam; -+ int ret; -+ u16 len; -+ u8 *pparmbuf, bset; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *p = &wrqu->data; -+ -+ if( (!p->length) || (!p->pointer)){ -+ ret = -EINVAL; -+ goto _rtw_drvext_hdl_exit; -+ } -+ -+ -+ bset = (u8)(p->flags&0xFFFF); -+ len = p->length; -+ pparmbuf = (u8*)rtw_malloc(len); -+ if (pparmbuf == NULL){ -+ ret = -ENOMEM; -+ goto _rtw_drvext_hdl_exit; -+ } -+ -+ if(bset)//set info -+ { -+ if (copy_from_user(pparmbuf, p->pointer,len)) { -+ rtw_mfree(pparmbuf, len); -+ ret = -EFAULT; -+ goto _rtw_drvext_hdl_exit; -+ } -+ } -+ else//query info -+ { -+ -+ } -+ -+ -+ // -+ poidparam = (struct drvext_oidparam *)pparmbuf; -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("drvext set oid subcode [%d], len[%d], InformationBufferLength[%d]\r\n", -+ poidparam->subcode, poidparam->len, len)); -+ -+ -+ //check subcode -+ if ( poidparam->subcode >= MAX_DRVEXT_HANDLERS) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("no matching drvext handlers\r\n")); -+ ret = -EINVAL; -+ goto _rtw_drvext_hdl_exit; -+ } -+ -+ -+ if ( poidparam->subcode >= MAX_DRVEXT_OID_SUBCODES) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("no matching drvext subcodes\r\n")); -+ ret = -EINVAL; -+ goto _rtw_drvext_hdl_exit; -+ } -+ -+ -+ phandler = drvextoidhandlers + poidparam->subcode; -+ -+ if (poidparam->len != phandler->parmsize) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("no matching drvext param size %d vs %d\r\n", -+ poidparam->len , phandler->parmsize)); -+ ret = -EINVAL; -+ goto _rtw_drvext_hdl_exit; -+ } -+ -+ -+ res = phandler->handler(&padapter->drvextpriv, bset, poidparam->data); -+ -+ if(res==0) -+ { -+ ret = 0; -+ -+ if (bset == 0x00) {//query info -+ //_rtw_memcpy(p->pointer, pparmbuf, len); -+ if (copy_to_user(p->pointer, pparmbuf, len)) -+ ret = -EFAULT; -+ } -+ } -+ else -+ ret = -EFAULT; -+ -+ -+_rtw_drvext_hdl_exit: -+ -+ return ret; -+ -+#endif -+ -+ return 0; -+ -+} -+ -+static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len) -+{ -+ pRW_Reg RegRWStruct; -+ struct rf_reg_param *prfreg; -+ u8 path; -+ u8 offset; -+ u32 value; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ switch(id) -+ { -+ case GEN_MP_IOCTL_SUBCODE(MP_START): -+ DBG_871X("871x_driver is only for normal mode, can't enter mp mode\n"); -+ break; -+ case GEN_MP_IOCTL_SUBCODE(READ_REG): -+ RegRWStruct = (pRW_Reg)pdata; -+ switch (RegRWStruct->width) -+ { -+ case 1: -+ RegRWStruct->value = rtw_read8(padapter, RegRWStruct->offset); -+ break; -+ case 2: -+ RegRWStruct->value = rtw_read16(padapter, RegRWStruct->offset); -+ break; -+ case 4: -+ RegRWStruct->value = rtw_read32(padapter, RegRWStruct->offset); -+ break; -+ default: -+ break; -+ } -+ -+ break; -+ case GEN_MP_IOCTL_SUBCODE(WRITE_REG): -+ RegRWStruct = (pRW_Reg)pdata; -+ switch (RegRWStruct->width) -+ { -+ case 1: -+ rtw_write8(padapter, RegRWStruct->offset, (u8)RegRWStruct->value); -+ break; -+ case 2: -+ rtw_write16(padapter, RegRWStruct->offset, (u16)RegRWStruct->value); -+ break; -+ case 4: -+ rtw_write32(padapter, RegRWStruct->offset, (u32)RegRWStruct->value); -+ break; -+ default: -+ break; -+ } -+ -+ break; -+ case GEN_MP_IOCTL_SUBCODE(READ_RF_REG): -+ -+ prfreg = (struct rf_reg_param *)pdata; -+ -+ path = (u8)prfreg->path; -+ offset = (u8)prfreg->offset; -+ -+ value = rtw_hal_read_rfreg(padapter, path, offset, 0xffffffff); -+ -+ prfreg->value = value; -+ -+ break; -+ case GEN_MP_IOCTL_SUBCODE(WRITE_RF_REG): -+ -+ prfreg = (struct rf_reg_param *)pdata; -+ -+ path = (u8)prfreg->path; -+ offset = (u8)prfreg->offset; -+ value = prfreg->value; -+ -+ rtw_hal_write_rfreg(padapter, path, offset, 0xffffffff, value); -+ -+ break; -+ case GEN_MP_IOCTL_SUBCODE(TRIGGER_GPIO): -+ DBG_871X("==> trigger gpio 0\n"); -+ rtw_hal_set_hwreg(padapter, HW_VAR_TRIGGER_GPIO_0, 0); -+ break; -+#ifdef CONFIG_BT_COEXIST -+ case GEN_MP_IOCTL_SUBCODE(SET_DM_BT): -+ DBG_871X("==> set dm_bt_coexist:%x\n",*(u8 *)pdata); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BT_SET_COEXIST, pdata); -+ break; -+ case GEN_MP_IOCTL_SUBCODE(DEL_BA): -+ DBG_871X("==> delete ba:%x\n",*(u8 *)pdata); -+ rtw_hal_set_hwreg(padapter, HW_VAR_BT_ISSUE_DELBA, pdata); -+ break; -+#endif -+#ifdef DBG_CONFIG_ERROR_DETECT -+ case GEN_MP_IOCTL_SUBCODE(GET_WIFI_STATUS): -+ *pdata = rtw_hal_sreset_get_wifi_status(padapter); -+ break; -+#endif -+ -+ default: -+ break; -+ } -+ -+} -+ -+static int rtw_mp_ioctl_hdl(struct net_device *dev, struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ u32 BytesRead, BytesWritten, BytesNeeded; -+ struct oid_par_priv oid_par; -+ struct mp_ioctl_handler *phandler; -+ struct mp_ioctl_param *poidparam; -+ uint status=0; -+ u16 len; -+ u8 *pparmbuf = NULL, bset; -+ PADAPTER padapter = (PADAPTER)rtw_netdev_priv(dev); -+ struct iw_point *p = &wrqu->data; -+ -+ //DBG_871X("+rtw_mp_ioctl_hdl\n"); -+ -+ //mutex_lock(&ioctl_mutex); -+ -+ if ((!p->length) || (!p->pointer)) { -+ ret = -EINVAL; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+ -+ pparmbuf = NULL; -+ bset = (u8)(p->flags & 0xFFFF); -+ len = p->length; -+ pparmbuf = (u8*)rtw_malloc(len); -+ if (pparmbuf == NULL){ -+ ret = -ENOMEM; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+ -+ if (copy_from_user(pparmbuf, p->pointer, len)) { -+ ret = -EFAULT; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+ -+ poidparam = (struct mp_ioctl_param *)pparmbuf; -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, -+ ("rtw_mp_ioctl_hdl: subcode [%d], len[%d], buffer_len[%d]\r\n", -+ poidparam->subcode, poidparam->len, len)); -+ -+ if (poidparam->subcode >= MAX_MP_IOCTL_SUBCODE) { -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("no matching drvext subcodes\r\n")); -+ ret = -EINVAL; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+ -+ //DBG_871X("%s: %d\n", __func__, poidparam->subcode); -+ -+#ifdef CONFIG_MP_INCLUDED -+ phandler = mp_ioctl_hdl + poidparam->subcode; -+ -+ if ((phandler->paramsize != 0) && (poidparam->len < phandler->paramsize)) -+ { -+ RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, -+ ("no matching drvext param size %d vs %d\r\n", -+ poidparam->len, phandler->paramsize)); -+ ret = -EINVAL; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+ -+ if (phandler->handler) -+ { -+ oid_par.adapter_context = padapter; -+ oid_par.oid = phandler->oid; -+ oid_par.information_buf = poidparam->data; -+ oid_par.information_buf_len = poidparam->len; -+ oid_par.dbg = 0; -+ -+ BytesWritten = 0; -+ BytesNeeded = 0; -+ -+ if (bset) { -+ oid_par.bytes_rw = &BytesRead; -+ oid_par.bytes_needed = &BytesNeeded; -+ oid_par.type_of_oid = SET_OID; -+ } else { -+ oid_par.bytes_rw = &BytesWritten; -+ oid_par.bytes_needed = &BytesNeeded; -+ oid_par.type_of_oid = QUERY_OID; -+ } -+ -+ status = phandler->handler(&oid_par); -+ -+ //todo:check status, BytesNeeded, etc. -+ } -+ else { -+ DBG_871X("rtw_mp_ioctl_hdl(): err!, subcode=%d, oid=%d, handler=%p\n", -+ poidparam->subcode, phandler->oid, phandler->handler); -+ ret = -EFAULT; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+#else -+ -+ rtw_dbg_mode_hdl(padapter, poidparam->subcode, poidparam->data, poidparam->len); -+ -+#endif -+ -+ if (bset == 0x00) {//query info -+ if (copy_to_user(p->pointer, pparmbuf, len)) -+ ret = -EFAULT; -+ } -+ -+ if (status) { -+ ret = -EFAULT; -+ goto _rtw_mp_ioctl_hdl_exit; -+ } -+ -+_rtw_mp_ioctl_hdl_exit: -+ -+ if (pparmbuf) -+ rtw_mfree(pparmbuf, len); -+ -+ //mutex_unlock(&ioctl_mutex); -+ -+ return ret; -+} -+ -+static int rtw_get_ap_info(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int bssid_match, ret = 0; -+ u32 cnt=0, wpa_ielen; -+ _irqL irqL; -+ _list *plist, *phead; -+ unsigned char *pbuf; -+ u8 bssid[ETH_ALEN]; -+ char data[32]; -+ struct wlan_network *pnetwork = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct iw_point *pdata = &wrqu->data; -+ -+ DBG_871X("+rtw_get_aplist_info\n"); -+ -+ if((padapter->bDriverStopped) || (pdata==NULL)) -+ { -+ ret= -EINVAL; -+ goto exit; -+ } -+ -+ while((check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))) == _TRUE) -+ { -+ rtw_msleep_os(30); -+ cnt++; -+ if(cnt > 100) -+ break; -+ } -+ -+ -+ //pdata->length = 0;//? -+ pdata->flags = 0; -+ if(pdata->length>=32) -+ { -+ if(copy_from_user(data, pdata->pointer, 32)) -+ { -+ ret= -EINVAL; -+ goto exit; -+ } -+ } -+ else -+ { -+ ret= -EINVAL; -+ goto exit; -+ } -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ //if(hwaddr_aton_i(pdata->pointer, bssid)) -+ if(hwaddr_aton_i(data, bssid)) -+ { -+ DBG_871X("Invalid BSSID '%s'.\n", (u8*)data); -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ return -EINVAL; -+ } -+ -+ -+ if(_rtw_memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN) == _TRUE)//BSSID match, then check if supporting wpa/wpa2 -+ { -+ DBG_871X("BSSID:" MAC_FMT "\n", MAC_ARG(bssid)); -+ -+ pbuf = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12); -+ if(pbuf && (wpa_ielen>0)) -+ { -+ pdata->flags = 1; -+ break; -+ } -+ -+ pbuf = rtw_get_wpa2_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12); -+ if(pbuf && (wpa_ielen>0)) -+ { -+ pdata->flags = 2; -+ break; -+ } -+ -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if(pdata->length>=34) -+ { -+ if(copy_to_user((u8*)pdata->pointer+32, (u8*)&pdata->flags, 1)) -+ { -+ ret= -EINVAL; -+ goto exit; -+ } -+ } -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int rtw_set_pid(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = rtw_netdev_priv(dev); -+ int *pdata = (int *)wrqu; -+ int selector; -+ -+ if((padapter->bDriverStopped) || (pdata==NULL)) -+ { -+ ret= -EINVAL; -+ goto exit; -+ } -+ -+ selector = *pdata; -+ if(selector < 3 && selector >=0) { -+ padapter->pid[selector] = *(pdata+1); -+ #ifdef CONFIG_GLOBAL_UI_PID -+ ui_pid[selector] = *(pdata+1); -+ #endif -+ DBG_871X("%s set pid[%d]=%d\n", __FUNCTION__, selector ,padapter->pid[selector]); -+ } -+ else -+ DBG_871X("%s selector %d error\n", __FUNCTION__, selector); -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int rtw_wps_start(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ u32 u32wps_start = 0; -+ unsigned int uintRet = 0; -+ -+ uintRet = copy_from_user( ( void* ) &u32wps_start, pdata->pointer, 4 ); -+ -+ if((padapter->bDriverStopped) || (pdata==NULL)) -+ { -+ ret= -EINVAL; -+ goto exit; -+ } -+ -+ if ( u32wps_start == 0 ) -+ { -+ u32wps_start = *extra; -+ } -+ -+ DBG_871X( "[%s] wps_start = %d\n", __FUNCTION__, u32wps_start ); -+ -+ if ( u32wps_start == 1 ) // WPS Start -+ { -+ rtw_led_control(padapter, LED_CTL_START_WPS); -+ } -+ else if ( u32wps_start == 2 ) // WPS Stop because of wps success -+ { -+ rtw_led_control(padapter, LED_CTL_STOP_WPS); -+ } -+ else if ( u32wps_start == 3 ) // WPS Stop because of wps fail -+ { -+ rtw_led_control(padapter, LED_CTL_STOP_WPS_FAIL); -+ } -+ -+#ifdef CONFIG_INTEL_WIDI -+ process_intel_widi_wps_status(padapter, u32wps_start); -+#endif //CONFIG_INTEL_WIDI -+ -+exit: -+ -+ return ret; -+ -+} -+ -+#ifdef CONFIG_P2P -+static int rtw_wext_p2p_enable(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ enum P2P_ROLE init_role = P2P_ROLE_DISABLE; -+ -+ if(*extra == '0' ) -+ init_role = P2P_ROLE_DISABLE; -+ else if(*extra == '1') -+ init_role = P2P_ROLE_DEVICE; -+ else if(*extra == '2') -+ init_role = P2P_ROLE_CLIENT; -+ else if(*extra == '3') -+ init_role = P2P_ROLE_GO; -+ -+ if(_FAIL == rtw_p2p_enable(padapter, init_role)) -+ { -+ ret = -EFAULT; -+ goto exit; -+ } -+ -+ //set channel/bandwidth -+ if(init_role != P2P_ROLE_DISABLE) -+ { -+ u8 channel, ch_offset; -+ u16 bwmode; -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_LISTEN)) -+ { -+ // Stay at the listen state and wait for discovery. -+ channel = pwdinfo->listen_channel; -+ pwdinfo->operating_channel = pwdinfo->listen_channel; -+ ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; -+ bwmode = HT_CHANNEL_WIDTH_20; -+ } -+#ifdef CONFIG_CONCURRENT_MODE -+ else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) -+ { -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ //struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+ -+ _set_timer( &pwdinfo->ap_p2p_switch_timer, pwdinfo->ext_listen_interval ); -+ if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) ) -+ { -+ pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel; -+ // How about the ch_offset and bwmode ?? -+ } -+ else -+ { -+ pwdinfo->operating_channel = pwdinfo->listen_channel; -+ } -+ -+ channel = pbuddy_mlmeext->cur_channel; -+ ch_offset = pbuddy_mlmeext->cur_ch_offset; -+ bwmode = pbuddy_mlmeext->cur_bwmode; -+ } -+#endif -+ else -+ { -+ pwdinfo->operating_channel = pmlmeext->cur_channel; -+ -+ channel = pwdinfo->operating_channel; -+ ch_offset = pmlmeext->cur_ch_offset; -+ bwmode = pmlmeext->cur_bwmode; -+ } -+ -+ set_channel_bwmode(padapter, channel, ch_offset, bwmode); -+ } -+ -+exit: -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+ DBG_871X( "[%s] ssid = %s, len = %d\n", __FUNCTION__, extra, (u32)strlen( extra ) ); -+ _rtw_memcpy( pwdinfo->nego_ssid, extra, strlen( extra ) ); -+ pwdinfo->nego_ssidlen = strlen( extra ); -+ -+ return ret; -+ -+} -+ -+ -+static int rtw_p2p_set_intent(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ u8 intent = pwdinfo->intent; -+ -+ extra[ wrqu->data.length ] = 0x00; -+ -+ intent = rtw_atoi( extra ); -+ -+ if ( intent <= 15 ) -+ { -+ pwdinfo->intent= intent; -+ } -+ else -+ { -+ ret = -1; -+ } -+ -+ DBG_871X( "[%s] intent = %d\n", __FUNCTION__, intent); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_listen_ch(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ u8 listen_ch = pwdinfo->listen_channel; // Listen channel number -+ -+ extra[ wrqu->data.length ] = 0x00; -+ listen_ch = rtw_atoi( extra ); -+ -+ if ( ( listen_ch == 1 ) || ( listen_ch == 6 ) || ( listen_ch == 11 ) ) -+ { -+ pwdinfo->listen_channel = listen_ch; -+ set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+ else -+ { -+ ret = -1; -+ } -+ -+ DBG_871X( "[%s] listen_ch = %d\n", __FUNCTION__, pwdinfo->listen_channel ); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_op_ch(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+// Commented by Albert 20110524 -+// This function is used to set the operating channel if the driver will become the group owner -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ u8 op_ch = pwdinfo->operating_channel; // Operating channel number -+ -+ extra[ wrqu->data.length ] = 0x00; -+ -+ op_ch = ( u8 ) rtw_atoi( extra ); -+ if ( op_ch > 0 ) -+ { -+ pwdinfo->operating_channel = op_ch; -+ } -+ else -+ { -+ ret = -1; -+ } -+ -+ DBG_871X( "[%s] op_ch = %d\n", __FUNCTION__, pwdinfo->operating_channel ); -+ -+ return ret; -+ -+} -+ -+ -+static int rtw_p2p_profilefound(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+ // Comment by Albert 2010/10/13 -+ // Input data format: -+ // Ex: 0 -+ // Ex: 1XX:XX:XX:XX:XX:XXYYSSID -+ // 0 => Reflush the profile record list. -+ // 1 => Add the profile list -+ // XX:XX:XX:XX:XX:XX => peer's MAC Address ( ex: 00:E0:4C:00:00:01 ) -+ // YY => SSID Length -+ // SSID => SSID for persistence group -+ -+ DBG_871X( "[%s] In value = %s, len = %d \n", __FUNCTION__, extra, wrqu->data.length -1); -+ -+ -+ // The upper application should pass the SSID to driver by using this rtw_p2p_profilefound function. -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ if ( extra[ 0 ] == '0' ) -+ { -+ // Remove all the profile information of wifidirect_info structure. -+ _rtw_memset( &pwdinfo->profileinfo[ 0 ], 0x00, sizeof( struct profile_info ) * P2P_MAX_PERSISTENT_GROUP_NUM ); -+ pwdinfo->profileindex = 0; -+ } -+ else -+ { -+ if ( pwdinfo->profileindex >= P2P_MAX_PERSISTENT_GROUP_NUM ) -+ { -+ ret = -1; -+ } -+ else -+ { -+ int jj, kk; -+ -+ // Add this profile information into pwdinfo->profileinfo -+ // Ex: 1XX:XX:XX:XX:XX:XXYYSSID -+ for( jj = 0, kk = 1; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ pwdinfo->profileinfo[ pwdinfo->profileindex ].peermac[ jj ] = key_2char2num(extra[ kk ], extra[ kk+ 1 ]); -+ } -+ -+ //pwdinfo->profileinfo[ pwdinfo->profileindex ].ssidlen = ( extra[18] - '0' ) * 10 + ( extra[ 19 ] - '0' ); -+ //_rtw_memcpy( pwdinfo->profileinfo[ pwdinfo->profileindex ].ssid, &extra[ 20 ], pwdinfo->profileinfo[ pwdinfo->profileindex ].ssidlen ); -+ pwdinfo->profileindex++; -+ } -+ } -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_setDN(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+ -+ DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ _rtw_memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN ); -+ _rtw_memcpy( pwdinfo->device_name, extra, wrqu->data.length - 1 ); -+ pwdinfo->device_name_len = wrqu->data.length - 1; -+ return ret; -+ -+} -+ -+ -+static int rtw_p2p_get_status(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ -+ if ( padapter->bShowGetP2PState ) -+ { -+ DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), -+ pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ], -+ pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); -+ } -+ -+ // Commented by Albert 2010/10/12 -+ // Because of the output size limitation, I had removed the "Role" information. -+ // About the "Role" information, we will use the new private IOCTL to get the "Role" information. -+ sprintf( extra, "\n\nStatus=%.2d\n", rtw_p2p_state(pwdinfo) ); -+ wrqu->data.length = strlen( extra ); -+ -+ return ret; -+ -+} -+ -+// Commented by Albert 20110520 -+// This function will return the config method description -+// This config method description will show us which config method the remote P2P device is intented to use -+// by sending the provisioning discovery request frame. -+ -+static int rtw_p2p_get_req_cm(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ sprintf( extra, "\n\nCM=%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+ -+static int rtw_p2p_get_role(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ -+ DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), -+ pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ], -+ pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); -+ -+ sprintf( extra, "\n\nRole=%.2d\n", rtw_p2p_role(pwdinfo) ); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+ -+static int rtw_p2p_get_peer_ifaddr(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ -+ DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), -+ pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ], -+ pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); -+ -+ sprintf( extra, "\nMAC %.2X:%.2X:%.2X:%.2X:%.2X:%.2X", -+ pwdinfo->p2p_peer_interface_addr[ 0 ], pwdinfo->p2p_peer_interface_addr[ 1 ], pwdinfo->p2p_peer_interface_addr[ 2 ], -+ pwdinfo->p2p_peer_interface_addr[ 3 ], pwdinfo->p2p_peer_interface_addr[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_peer_devaddr(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+ -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), -+ pwdinfo->rx_prov_disc_info.peerDevAddr[ 0 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 1 ], -+ pwdinfo->rx_prov_disc_info.peerDevAddr[ 2 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 3 ], -+ pwdinfo->rx_prov_disc_info.peerDevAddr[ 4 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 5 ]); -+ sprintf( extra, "\n%.2X%.2X%.2X%.2X%.2X%.2X", -+ pwdinfo->rx_prov_disc_info.peerDevAddr[ 0 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 1 ], -+ pwdinfo->rx_prov_disc_info.peerDevAddr[ 2 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 3 ], -+ pwdinfo->rx_prov_disc_info.peerDevAddr[ 4 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 5 ]); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+ -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), -+ pwdinfo->p2p_peer_device_addr[ 0 ], pwdinfo->p2p_peer_device_addr[ 1 ], -+ pwdinfo->p2p_peer_device_addr[ 2 ], pwdinfo->p2p_peer_device_addr[ 3 ], -+ pwdinfo->p2p_peer_device_addr[ 4 ], pwdinfo->p2p_peer_device_addr[ 5 ]); -+ sprintf( extra, "\nMAC %.2X:%.2X:%.2X:%.2X:%.2X:%.2X", -+ pwdinfo->p2p_peer_device_addr[ 0 ], pwdinfo->p2p_peer_device_addr[ 1 ], -+ pwdinfo->p2p_peer_device_addr[ 2 ], pwdinfo->p2p_peer_device_addr[ 3 ], -+ pwdinfo->p2p_peer_device_addr[ 4 ], pwdinfo->p2p_peer_device_addr[ 5 ]); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_groupid(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+ -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ sprintf( extra, "\n%.2X:%.2X:%.2X:%.2X:%.2X:%.2X %s", -+ pwdinfo->groupid_info.go_device_addr[ 0 ], pwdinfo->groupid_info.go_device_addr[ 1 ], -+ pwdinfo->groupid_info.go_device_addr[ 2 ], pwdinfo->groupid_info.go_device_addr[ 3 ], -+ pwdinfo->groupid_info.go_device_addr[ 4 ], pwdinfo->groupid_info.go_device_addr[ 5 ], -+ pwdinfo->groupid_info.ssid); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_op_ch(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+ -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ -+ DBG_871X( "[%s] Op_ch = %02x\n", __FUNCTION__, pwdinfo->operating_channel); -+ -+ sprintf( extra, "\n\nOp_ch=%.2d\n", pwdinfo->operating_channel ); -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+inline static void macstr2num(u8 *dst, u8 *src) -+{ -+ int jj, kk; -+ for (jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3) -+ { -+ dst[jj] = key_2char2num(src[kk], src[kk + 1]); -+ } -+} -+ -+static int rtw_p2p_get_wps_configmethod(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra, char *subcmd) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 peerMAC[ETH_ALEN] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _list * plist,*phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u8 blnMatch = 0; -+ u16 attr_content = 0; -+ uint attr_contentlen = 0; -+ u8 attr_content_str[P2P_PRIVATE_IOCTL_SET_LEN] = { 0x00 }; -+ -+ // Commented by Albert 20110727 -+ // The input data is the MAC address which the application wants to know its WPS config method. -+ // After knowing its WPS config method, the application can decide the config method for provisioning discovery. -+ // Format: iwpriv wlanx p2p_get_wpsCM 00:E0:4C:00:00:05 -+ -+ DBG_871X("[%s] data = %s\n", __FUNCTION__, subcmd); -+ -+ macstr2num(peerMAC, subcmd); -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while (1) -+ { -+ if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) -+ { -+ u8 *wpsie; -+ uint wpsie_len = 0; -+ -+ // The mac address is matched. -+ -+ if ((wpsie = rtw_get_wps_ie(&pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &wpsie_len))) -+ { -+ rtw_get_wps_attr_content(wpsie, wpsie_len, WPS_ATTR_CONF_METHOD, (u8 *)&attr_content, &attr_contentlen); -+ if (attr_contentlen) -+ { -+ attr_content = be16_to_cpu(attr_content); -+ sprintf(attr_content_str, "\n\nM=%.4d", attr_content); -+ blnMatch = 1; -+ } -+ } -+ -+ break; -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if (!blnMatch) -+ { -+ sprintf(attr_content_str, "\n\nM=0000"); -+ } -+ -+ wrqu->data.length = strlen(attr_content_str); -+ _rtw_memcpy(extra, attr_content_str, wrqu->data.length); -+ -+ return ret; -+ -+} -+ -+#ifdef CONFIG_WFD -+static int rtw_p2p_get_peer_wfd_port(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ DBG_871X( "[%s] p2p_state = %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); -+ -+ sprintf( extra, "\n\nPort=%d\n", pwdinfo->wfd_info->peer_rtsp_ctrlport ); -+ DBG_871X( "[%s] remote port = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); -+ -+ wrqu->data.length = strlen( extra ); -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ sprintf( extra, "\n\nwfd_pc=%d\n", pwdinfo->wfd_info->wfd_pc ); -+ DBG_871X( "[%s] wfd_pc = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_pc ); -+ -+ wrqu->data.length = strlen( extra ); -+ pwdinfo->wfd_info->wfd_pc = _FALSE; // Reset the WFD preferred connection to P2P -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ sprintf( extra, "\n\nwfd_sa=%d\n", pwdinfo->wfd_info->peer_session_avail ); -+ DBG_871X( "[%s] wfd_sa = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_session_avail ); -+ -+ wrqu->data.length = strlen( extra ); -+ pwdinfo->wfd_info->peer_session_avail = _TRUE; // Reset the WFD session available -+ return ret; -+ -+} -+ -+#endif // CONFIG_WFD -+ -+static int rtw_p2p_get_go_device_address(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra, char *subcmd) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 peerMAC[ETH_ALEN] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u8 blnMatch = 0; -+ u8 *p2pie; -+ uint p2pielen = 0, attr_contentlen = 0; -+ u8 attr_content[100] = { 0x00 }; -+ u8 go_devadd_str[P2P_PRIVATE_IOCTL_SET_LEN] = { 0x00 }; -+ -+ // Commented by Albert 20121209 -+ // The input data is the GO's interface address which the application wants to know its device address. -+ // Format: iwpriv wlanx p2p_get2 go_devadd=00:E0:4C:00:00:05 -+ -+ DBG_871X("[%s] data = %s\n", __FUNCTION__, subcmd); -+ -+ macstr2num(peerMAC, subcmd); -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while (1) -+ { -+ if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) -+ { -+ // Commented by Albert 2011/05/18 -+ // Match the device address located in the P2P IE -+ // This is for the case that the P2P device address is not the same as the P2P interface address. -+ -+ if ((p2pie = rtw_get_p2p_ie(&pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &p2pielen))) -+ { -+ while (p2pie) -+ { -+ // The P2P Device ID attribute is included in the Beacon frame. -+ // The P2P Device Info attribute is included in the probe response frame. -+ -+ _rtw_memset(attr_content, 0x00, 100); -+ if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen)) -+ { -+ // Handle the P2P Device ID attribute of Beacon first -+ blnMatch = 1; -+ break; -+ -+ } else if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen)) -+ { -+ // Handle the P2P Device Info attribute of probe response -+ blnMatch = 1; -+ break; -+ } -+ -+ //Get the next P2P IE -+ p2pie = rtw_get_p2p_ie(p2pie + p2pielen, pnetwork->network.IELength - 12 - (p2pie - &pnetwork->network.IEs[12] + p2pielen), NULL, &p2pielen); -+ } -+ } -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if (!blnMatch) -+ { -+ sprintf(go_devadd_str, "\n\ndev_add=NULL"); -+ } else -+ { -+ sprintf(go_devadd_str, "\n\ndev_add=%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", -+ attr_content[0], attr_content[1], attr_content[2], attr_content[3], attr_content[4], attr_content[5]); -+ } -+ -+ wrqu->data.length = strlen(go_devadd_str); -+ _rtw_memcpy(extra, go_devadd_str, wrqu->data.length); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_device_type(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra, char *subcmd) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 peerMAC[ETH_ALEN] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u8 blnMatch = 0; -+ u8 dev_type[8] = { 0x00 }; -+ uint dev_type_len = 0; -+ u8 dev_type_str[P2P_PRIVATE_IOCTL_SET_LEN] = { 0x00 }; // +9 is for the str "dev_type=", we have to clear it at wrqu->data.pointer -+ -+ // Commented by Albert 20121209 -+ // The input data is the MAC address which the application wants to know its device type. -+ // Such user interface could know the device type. -+ // Format: iwpriv wlanx p2p_get2 dev_type=00:E0:4C:00:00:05 -+ -+ DBG_871X("[%s] data = %s\n", __FUNCTION__, subcmd); -+ -+ macstr2num(peerMAC, subcmd); -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while (1) -+ { -+ if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) -+ { -+ u8 *wpsie; -+ uint wpsie_len = 0; -+ -+ // The mac address is matched. -+ -+ if ((wpsie = rtw_get_wps_ie(&pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &wpsie_len))) -+ { -+ rtw_get_wps_attr_content(wpsie, wpsie_len, WPS_ATTR_PRIMARY_DEV_TYPE, dev_type, &dev_type_len); -+ if (dev_type_len) -+ { -+ u16 type = 0; -+ -+ _rtw_memcpy(&type, dev_type, 2); -+ type = be16_to_cpu(type); -+ sprintf(dev_type_str, "\n\nN=%.2d", type); -+ blnMatch = 1; -+ } -+ } -+ break; -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if (!blnMatch) -+ { -+ sprintf(dev_type_str, "\n\nN=00"); -+ } -+ -+ wrqu->data.length = strlen(dev_type_str); -+ _rtw_memcpy(extra, dev_type_str, wrqu->data.length); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_device_name(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra, char *subcmd) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 peerMAC[ETH_ALEN] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u8 blnMatch = 0; -+ u8 dev_name[WPS_MAX_DEVICE_NAME_LEN] = { 0x00 }; -+ uint dev_len = 0; -+ u8 dev_name_str[P2P_PRIVATE_IOCTL_SET_LEN] = { 0x00 }; -+ -+ // Commented by Albert 20121225 -+ // The input data is the MAC address which the application wants to know its device name. -+ // Such user interface could show peer device's device name instead of ssid. -+ // Format: iwpriv wlanx p2p_get2 devN=00:E0:4C:00:00:05 -+ -+ DBG_871X("[%s] data = %s\n", __FUNCTION__, subcmd); -+ -+ macstr2num(peerMAC, subcmd); -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while (1) -+ { -+ if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) -+ { -+ u8 *wpsie; -+ uint wpsie_len = 0; -+ -+ // The mac address is matched. -+ -+ if ((wpsie = rtw_get_wps_ie(&pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &wpsie_len))) -+ { -+ rtw_get_wps_attr_content(wpsie, wpsie_len, WPS_ATTR_DEVICE_NAME, dev_name, &dev_len); -+ if (dev_len) -+ { -+ sprintf(dev_name_str, "\n\nN=%s", dev_name); -+ blnMatch = 1; -+ } -+ } -+ break; -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if (!blnMatch) -+ { -+ sprintf(dev_name_str, "\n\nN=0000"); -+ } -+ -+ wrqu->data.length = strlen(dev_name_str); -+ _rtw_memcpy(extra, dev_name_str, wrqu->data.length); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_get_invitation_procedure(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra, char *subcmd) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 peerMAC[ETH_ALEN] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u8 blnMatch = 0; -+ u8 *p2pie; -+ uint p2pielen = 0, attr_contentlen = 0; -+ u8 attr_content[2] = { 0x00 }; -+ u8 inv_proc_str[P2P_PRIVATE_IOCTL_SET_LEN] = { 0x00 }; -+ -+ // Commented by Ouden 20121226 -+ // The application wants to know P2P initation procedure is support or not. -+ // Format: iwpriv wlanx p2p_get2 InvProc=00:E0:4C:00:00:05 -+ -+ DBG_871X("[%s] data = %s\n", __FUNCTION__, subcmd); -+ -+ macstr2num(peerMAC, subcmd); -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while (1) -+ { -+ if (rtw_end_of_queue_search(phead, plist) == _TRUE) break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ if (_rtw_memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) -+ { -+ // Commented by Albert 20121226 -+ // Match the device address located in the P2P IE -+ // This is for the case that the P2P device address is not the same as the P2P interface address. -+ -+ if ((p2pie = rtw_get_p2p_ie(&pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &p2pielen))) -+ { -+ while (p2pie) -+ { -+ //_rtw_memset( attr_content, 0x00, 2); -+ if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_CAPABILITY, attr_content, &attr_contentlen)) -+ { -+ // Handle the P2P capability attribute -+ blnMatch = 1; -+ break; -+ -+ } -+ -+ //Get the next P2P IE -+ p2pie = rtw_get_p2p_ie(p2pie + p2pielen, pnetwork->network.IELength - 12 - (p2pie - &pnetwork->network.IEs[12] + p2pielen), NULL, &p2pielen); -+ } -+ } -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if (!blnMatch) -+ { -+ sprintf(inv_proc_str, "\nIP=-1"); -+ } else -+ { -+ if (attr_content[0] && 0x20) -+ { -+ sprintf(inv_proc_str, "\nIP=1"); -+ } else -+ { -+ sprintf(inv_proc_str, "\nIP=0"); -+ } -+ } -+ -+ wrqu->data.length = strlen(inv_proc_str); -+ _rtw_memcpy(extra, inv_proc_str, wrqu->data.length); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_connect(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ u8 peerMAC[ ETH_ALEN ] = { 0x00 }; -+ int jj,kk; -+ u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _irqL irqL; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ uint uintPeerChannel = 0; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif // CONFIG_CONCURRENT_MODE -+ -+ -+ // Commented by Albert 20110304 -+ // The input data contains two informations. -+ // 1. First information is the MAC address which wants to formate with -+ // 2. Second information is the WPS PINCode or "pbc" string for push button method -+ // Format: 00:E0:4C:00:00:05 -+ // Format: 00:E0:4C:00:00:05 -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); -+ return ret; -+ } -+ -+ if ( pwdinfo->ui_got_wps_info == P2P_NO_WPSINFO ) -+ { -+ return -1; -+ } -+ -+ for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ peerMAC[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] ); -+ } -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ if ( _rtw_memcmp( pnetwork->network.MacAddress, peerMAC, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if ( uintPeerChannel ) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer ); -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ _rtw_memset( &pwdinfo->nego_req_info, 0x00, sizeof( struct tx_nego_req_info ) ); -+ _rtw_memset( &pwdinfo->groupid_info, 0x00, sizeof( struct group_id_info ) ); -+ -+ pwdinfo->nego_req_info.peer_channel_num[ 0 ] = uintPeerChannel; -+ _rtw_memcpy( pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN ); -+ pwdinfo->nego_req_info.benable = _TRUE; -+ -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ if ( rtw_p2p_state(pwdinfo) != P2P_STATE_GONEGO_OK ) -+ { -+ // Restore to the listen state if the current p2p state is not nego OK -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN ); -+ } -+ -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_ING); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ // Have to enter the power saving with the AP -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ -+ issue_nulldata(pbuddy_adapter, NULL, 1, 3, 500); -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ DBG_871X( "[%s] Start PreTx Procedure!\n", __FUNCTION__ ); -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_CONCURRENT_GO_NEGO_TIMEOUT ); -+ } -+ else -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_GO_NEGO_TIMEOUT ); -+ } -+#else -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_GO_NEGO_TIMEOUT ); -+#endif // CONFIG_CONCURRENT_MODE -+ -+ } -+ else -+ { -+ DBG_871X( "[%s] Not Found in Scanning Queue~\n", __FUNCTION__ ); -+ ret = -1; -+ } -+exit: -+ return ret; -+} -+ -+static int rtw_p2p_invite_req(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ int jj,kk; -+ u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ uint uintPeerChannel = 0; -+ u8 attr_content[50] = { 0x00 }, _status = 0; -+ u8 *p2pie; -+ uint p2pielen = 0, attr_contentlen = 0; -+ _irqL irqL; -+ struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif // CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_WFD -+ struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; -+#endif // CONFIG_WFD -+ -+ // Commented by Albert 20120321 -+ // The input data contains two informations. -+ // 1. First information is the P2P device address which you want to send to. -+ // 2. Second information is the group id which combines with GO's mac address, space and GO's ssid. -+ // Command line sample: iwpriv wlan0 p2p_set invite="00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy" -+ // Format: 00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if ( wrqu->data.length <= 37 ) -+ { -+ DBG_871X( "[%s] Wrong format!\n", __FUNCTION__ ); -+ return ret; -+ } -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); -+ return ret; -+ } -+ else -+ { -+ // Reset the content of struct tx_invite_req_info -+ pinvite_req_info->benable = _FALSE; -+ _rtw_memset( pinvite_req_info->go_bssid, 0x00, ETH_ALEN ); -+ _rtw_memset( pinvite_req_info->go_ssid, 0x00, WLAN_SSID_MAXLEN ); -+ pinvite_req_info->ssidlen = 0x00; -+ pinvite_req_info->operating_ch = pwdinfo->operating_channel; -+ _rtw_memset( pinvite_req_info->peer_macaddr, 0x00, ETH_ALEN ); -+ pinvite_req_info->token = 3; -+ } -+ -+ for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ pinvite_req_info->peer_macaddr[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] ); -+ } -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ // Commented by Albert 2011/05/18 -+ // Match the device address located in the P2P IE -+ // This is for the case that the P2P device address is not the same as the P2P interface address. -+ -+ if ( (p2pie=rtw_get_p2p_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &p2pielen)) ) -+ { -+ // The P2P Device ID attribute is included in the Beacon frame. -+ // The P2P Device Info attribute is included in the probe response frame. -+ -+ if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) ) -+ { -+ // Handle the P2P Device ID attribute of Beacon first -+ if ( _rtw_memcmp( attr_content, pinvite_req_info->peer_macaddr, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+ else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) ) -+ { -+ // Handle the P2P Device Info attribute of probe response -+ if ( _rtw_memcmp( attr_content, pinvite_req_info->peer_macaddr, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+ -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+#ifdef CONFIG_WFD -+ if ( uintPeerChannel ) -+ { -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ uint wfd_ielen = 0; -+ -+ if ( rtw_get_wfd_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 wfd_devinfo[ 6 ] = { 0x00 }; -+ uint wfd_devlen = 6; -+ -+ DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ ); -+ if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) ) -+ { -+ u16 wfd_devinfo_field = 0; -+ -+ // Commented by Albert 20120319 -+ // The first two bytes are the WFD device information field of WFD device information subelement. -+ // In big endian format. -+ wfd_devinfo_field = RTW_GET_BE16(wfd_devinfo); -+ if ( wfd_devinfo_field & WFD_DEVINFO_SESSION_AVAIL ) -+ { -+ pwfd_info->peer_session_avail = _TRUE; -+ } -+ else -+ { -+ pwfd_info->peer_session_avail = _FALSE; -+ } -+ } -+ } -+ -+ if ( _FALSE == pwfd_info->peer_session_avail ) -+ { -+ DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ ); -+ goto exit; -+ } -+ } -+#endif // CONFIG_WFD -+ -+ if ( uintPeerChannel ) -+ { -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) ) -+ { -+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer ); -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ -+ // Store the GO's bssid -+ for( jj = 0, kk = 18; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ pinvite_req_info->go_bssid[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] ); -+ } -+ -+ // Store the GO's ssid -+ pinvite_req_info->ssidlen = wrqu->data.length - 36; -+ _rtw_memcpy( pinvite_req_info->go_ssid, &extra[ 36 ], (u32) pinvite_req_info->ssidlen ); -+ pinvite_req_info->benable = _TRUE; -+ pinvite_req_info->peer_ch = uintPeerChannel; -+ -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_INVITE_REQ); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) ) -+ { -+ // Have to enter the power saving with the AP -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ -+ issue_nulldata(pbuddy_adapter, NULL, 1, 3, 500); -+ } -+ else -+ { -+ set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+#else -+ set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+#endif -+ -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) ) -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_CONCURRENT_INVITE_TIMEOUT ); -+ } -+ else -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_INVITE_TIMEOUT ); -+ } -+#else -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_INVITE_TIMEOUT ); -+#endif // CONFIG_CONCURRENT_MODE -+ -+ -+ } -+ else -+ { -+ DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); -+ } -+exit: -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_persistent(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ int jj,kk; -+ u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ uint uintPeerChannel = 0; -+ u8 attr_content[50] = { 0x00 }, _status = 0; -+ u8 *p2pie; -+ uint p2pielen = 0, attr_contentlen = 0; -+ _irqL irqL; -+ struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif // CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_WFD -+ struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; -+#endif // CONFIG_WFD -+ -+ // Commented by Albert 20120328 -+ // The input data is 0 or 1 -+ // 0: disable persistent group functionality -+ // 1: enable persistent group founctionality -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); -+ return ret; -+ } -+ else -+ { -+ if ( extra[ 0 ] == '0' ) // Disable the persistent group function. -+ { -+ pwdinfo->persistent_supported = _FALSE; -+ } -+ else if ( extra[ 0 ] == '1' ) // Enable the persistent group function. -+ { -+ pwdinfo->persistent_supported = _TRUE; -+ } -+ else -+ { -+ pwdinfo->persistent_supported = _FALSE; -+ } -+ } -+ printk( "[%s] persistent_supported = %d\n", __FUNCTION__, pwdinfo->persistent_supported ); -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int hexstr2bin(const char *hex, u8 *buf, size_t len) -+{ -+ size_t i; -+ int a; -+ const char *ipos = hex; -+ u8 *opos = buf; -+ -+ for (i = 0; i < len; i++) { -+ a = hex2byte_i(ipos); -+ if (a < 0) -+ return -1; -+ *opos++ = a; -+ ipos += 2; -+ } -+ return 0; -+} -+ -+static int uuid_str2bin(const char *str, u8 *bin) -+{ -+ const char *pos; -+ u8 *opos; -+ -+ pos = str; -+ opos = bin; -+ -+ if (hexstr2bin(pos, opos, 4)) -+ return -1; -+ pos += 8; -+ opos += 4; -+ -+ if (*pos++ != '-' || hexstr2bin(pos, opos, 2)) -+ return -1; -+ pos += 4; -+ opos += 2; -+ -+ if (*pos++ != '-' || hexstr2bin(pos, opos, 2)) -+ return -1; -+ pos += 4; -+ opos += 2; -+ -+ if (*pos++ != '-' || hexstr2bin(pos, opos, 2)) -+ return -1; -+ pos += 4; -+ opos += 2; -+ -+ if (*pos++ != '-' || hexstr2bin(pos, opos, 6)) -+ return -1; -+ -+ return 0; -+} -+ -+static int rtw_p2p_set_wps_uuid(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo = &(padapter->wdinfo); -+ -+ DBG_871X("[%s] data = %s\n", __FUNCTION__, extra); -+ -+ if ((36 == strlen(extra)) && (uuid_str2bin(extra, pwdinfo->uuid) == 0)) -+ { -+ pwdinfo->external_uuid = 1; -+ } else { -+ pwdinfo->external_uuid = 0; -+ ret = -EINVAL; -+ } -+ -+ return ret; -+ -+} -+#ifdef CONFIG_WFD -+static int rtw_p2p_set_pc(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ u8 peerMAC[ ETH_ALEN ] = { 0x00 }; -+ int jj,kk; -+ u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ u8 attr_content[50] = { 0x00 }, _status = 0; -+ u8 *p2pie; -+ uint p2pielen = 0, attr_contentlen = 0; -+ _irqL irqL; -+ uint uintPeerChannel = 0; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif // CONFIG_CONCURRENT_MODE -+ struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; -+ -+ // Commented by Albert 20120512 -+ // 1. Input information is the MAC address which wants to know the Preferred Connection bit (PC bit) -+ // Format: 00:E0:4C:00:00:05 -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); -+ return ret; -+ } -+ -+ for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ peerMAC[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] ); -+ } -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ // Commented by Albert 2011/05/18 -+ // Match the device address located in the P2P IE -+ // This is for the case that the P2P device address is not the same as the P2P interface address. -+ -+ if ( (p2pie=rtw_get_p2p_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, NULL, &p2pielen)) ) -+ { -+ // The P2P Device ID attribute is included in the Beacon frame. -+ // The P2P Device Info attribute is included in the probe response frame. -+ printk( "[%s] Got P2P IE\n", __FUNCTION__ ); -+ if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) ) -+ { -+ // Handle the P2P Device ID attribute of Beacon first -+ printk( "[%s] P2P_ATTR_DEVICE_ID \n", __FUNCTION__ ); -+ if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+ else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) ) -+ { -+ // Handle the P2P Device Info attribute of probe response -+ printk( "[%s] P2P_ATTR_DEVICE_INFO \n", __FUNCTION__ ); -+ if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+ -+ } -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ printk( "[%s] channel = %d\n", __FUNCTION__, uintPeerChannel ); -+ -+ if ( uintPeerChannel ) -+ { -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ uint wfd_ielen = 0; -+ -+ if ( rtw_get_wfd_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 wfd_devinfo[ 6 ] = { 0x00 }; -+ uint wfd_devlen = 6; -+ -+ DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ ); -+ if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) ) -+ { -+ u16 wfd_devinfo_field = 0; -+ -+ // Commented by Albert 20120319 -+ // The first two bytes are the WFD device information field of WFD device information subelement. -+ // In big endian format. -+ wfd_devinfo_field = RTW_GET_BE16(wfd_devinfo); -+ if ( wfd_devinfo_field & WFD_DEVINFO_PC_TDLS ) -+ { -+ pwfd_info->wfd_pc = _TRUE; -+ } -+ else -+ { -+ pwfd_info->wfd_pc = _FALSE; -+ } -+ } -+ } -+ } -+ else -+ { -+ DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); -+ } -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_wfd_device_type(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; -+ -+ // Commented by Albert 20120328 -+ // The input data is 0 or 1 -+ // 0: specify to Miracast source device -+ // 1 or others: specify to Miracast sink device (display device) -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if ( extra[ 0 ] == '0' ) // Set to Miracast source device. -+ { -+ pwfd_info->wfd_device_type = WFD_DEVINFO_SOURCE; -+ } -+ else // Set to Miracast sink device. -+ { -+ pwfd_info->wfd_device_type = WFD_DEVINFO_PSINK; -+ } -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_scan_result_type(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; -+ -+ // Commented by Albert 20120328 -+ // The input data is 0 , 1 , 2 -+ // 0: when the P2P is enabled, the scan result will return all the found P2P device. -+ // 1: when the P2P is enabled, the scan result will return all the found P2P device and AP. -+ // 2: when the P2P is enabled, the scan result will show up the found Miracast devices base on... -+ // It will show up all the Miracast source device if this device is sink. -+ // It will show up all the Miracast sink device if this device is source. -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if ( extra[ 0 ] == '0' ) -+ { -+ pwfd_info->scan_result_type = SCAN_RESULT_P2P_ONLY; -+ } -+ else if ( extra[ 0 ] == '1' ) -+ { -+ pwfd_info->scan_result_type = SCAN_RESULT_ALL; -+ } -+ else if ( extra[ 0 ] == '2' ) -+ { -+ pwfd_info->scan_result_type = SCAN_RESULT_WFD_TYPE; -+ } -+ else -+ { -+ pwfd_info->scan_result_type = SCAN_RESULT_P2P_ONLY; -+ } -+ -+exit: -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_wfd_enable(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+// Commented by Kurt 20121206 -+// This function is used to set wfd enabled -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+ if(*extra == '0' ) -+ pwdinfo->wfd_info->wfd_enable = _FALSE; -+ else if(*extra == '1') -+ pwdinfo->wfd_info->wfd_enable = _TRUE; -+ -+ DBG_871X( "[%s] wfd_enable = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_enable ); -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_set_driver_iface(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+// Commented by Kurt 20121206 -+// This function is used to set driver iface is WEXT or CFG80211 -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ -+ if(*extra == '1' ) -+ { -+ pwdinfo->driver_interface = DRIVER_WEXT; -+ DBG_871X( "[%s] driver_interface = WEXT\n", __FUNCTION__); -+ } -+ else if(*extra == '2') -+ { -+ pwdinfo->driver_interface = DRIVER_CFG80211; -+ DBG_871X( "[%s] driver_interface = CFG80211\n", __FUNCTION__); -+ } -+ -+ return ret; -+ -+} -+ -+// To set the WFD session available to enable or disable -+static int rtw_p2p_set_sa(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if( 0 ) -+ { -+ DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); -+ return ret; -+ } -+ else -+ { -+ if ( extra[ 0 ] == '0' ) // Disable the session available. -+ { -+ pwdinfo->session_available = _FALSE; -+ } -+ else if ( extra[ 0 ] == '1' ) // Enable the session available. -+ { -+ pwdinfo->session_available = _TRUE; -+ } -+ else -+ { -+ pwdinfo->session_available = _FALSE; -+ } -+ } -+ printk( "[%s] session available = %d\n", __FUNCTION__, pwdinfo->session_available ); -+ -+exit: -+ -+ return ret; -+ -+} -+#endif //CONFIG_WFD -+ -+static int rtw_p2p_prov_disc(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ u8 peerMAC[ ETH_ALEN ] = { 0x00 }; -+ int jj,kk; -+ u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _list *plist, *phead; -+ _queue *queue = &(pmlmepriv->scanned_queue); -+ struct wlan_network *pnetwork = NULL; -+ uint uintPeerChannel = 0; -+ u8 attr_content[100] = { 0x00 }, _status = 0; -+ u8 *p2pie; -+ uint p2pielen = 0, attr_contentlen = 0; -+ _irqL irqL; -+ u8 ie_offset; -+#ifdef CONFIG_CONCURRENT_MODE -+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter; -+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; -+#endif // CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_WFD -+ struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; -+#endif // CONFIG_WFD -+ -+ // Commented by Albert 20110301 -+ // The input data contains two informations. -+ // 1. First information is the MAC address which wants to issue the provisioning discovery request frame. -+ // 2. Second information is the WPS configuration method which wants to discovery -+ // Format: 00:E0:4C:00:00:05_display -+ // Format: 00:E0:4C:00:00:05_keypad -+ // Format: 00:E0:4C:00:00:05_pbc -+ // Format: 00:E0:4C:00:00:05_label -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ -+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); -+ return ret; -+ } -+ else -+ { -+#ifdef CONFIG_INTEL_WIDI -+ if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE){ -+ DBG_871X( "[%s] WiFi is under survey!\n", __FUNCTION__ ); -+ return ret; -+ } -+#endif //CONFIG_INTEL_WIDI -+ -+ // Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. -+ _rtw_memset( pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN ); -+ _rtw_memset( pwdinfo->tx_prov_disc_info.peerIFAddr, 0x00, ETH_ALEN ); -+ _rtw_memset( &pwdinfo->tx_prov_disc_info.ssid, 0x00, sizeof( NDIS_802_11_SSID ) ); -+ pwdinfo->tx_prov_disc_info.peer_channel_num[ 0 ] = 0; -+ pwdinfo->tx_prov_disc_info.peer_channel_num[ 1 ] = 0; -+ pwdinfo->tx_prov_disc_info.benable = _FALSE; -+ } -+ -+ for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) -+ { -+ peerMAC[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] ); -+ } -+ -+ if ( _rtw_memcmp( &extra[ 18 ], "display", 7 ) ) -+ { -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_DISPLYA; -+ } -+ else if ( _rtw_memcmp( &extra[ 18 ], "keypad", 7 ) ) -+ { -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_KEYPAD; -+ } -+ else if ( _rtw_memcmp( &extra[ 18 ], "pbc", 3 ) ) -+ { -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_PUSH_BUTTON; -+ } -+ else if ( _rtw_memcmp( &extra[ 18 ], "label", 5 ) ) -+ { -+ pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_LABEL; -+ } -+ else -+ { -+ DBG_871X( "[%s] Unknown WPS config methodn", __FUNCTION__ ); -+ return( ret ); -+ } -+ -+ -+ _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ phead = get_list_head(queue); -+ plist = get_next(phead); -+ -+ while(1) -+ { -+ if (rtw_end_of_queue_search(phead,plist)== _TRUE) -+ break; -+ -+ if( uintPeerChannel != 0 ) -+ break; -+ -+ pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); -+ -+ // Commented by Albert 2011/05/18 -+ // Match the device address located in the P2P IE -+ // This is for the case that the P2P device address is not the same as the P2P interface address. -+ -+ if (pnetwork->network.Reserved[0] == 2) { // Probe Request -+ ie_offset = 0; -+ } else { // Beacon or Probe Respones -+ ie_offset = 12; -+ } -+ if ( (p2pie=rtw_get_p2p_ie( &pnetwork->network.IEs[ie_offset], pnetwork->network.IELength - ie_offset, NULL, &p2pielen)) ) -+ { -+ while ( p2pie ) -+ { -+ // The P2P Device ID attribute is included in the Beacon frame. -+ // The P2P Device Info attribute is included in the probe response frame. -+ -+ if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) ) -+ { -+ // Handle the P2P Device ID attribute of Beacon first -+ if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+ else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) ) -+ { -+ // Handle the P2P Device Info attribute of probe response -+ if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+ -+ //Get the next P2P IE -+ p2pie = rtw_get_p2p_ie(p2pie+p2pielen, pnetwork->network.IELength - ie_offset -(p2pie -&pnetwork->network.IEs[ie_offset] + p2pielen), NULL, &p2pielen); -+ } -+ } -+ -+#ifdef CONFIG_INTEL_WIDI -+ // Some Intel WiDi source may not provide P2P IE, -+ // so we could only compare mac addr by 802.11 Source Address -+ if( pmlmepriv->widi_state == INTEL_WIDI_STATE_WFD_CONNECTION -+ && uintPeerChannel == 0 ) -+ { -+ if ( _rtw_memcmp( pnetwork->network.MacAddress, peerMAC, ETH_ALEN ) ) -+ { -+ uintPeerChannel = pnetwork->network.Configuration.DSConfig; -+ break; -+ } -+ } -+#endif //CONFIG_INTEL_WIDI -+ -+ plist = get_next(plist); -+ -+ } -+ -+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); -+ -+ if ( uintPeerChannel ) -+ { -+#ifdef CONFIG_WFD -+ { -+ u8 wfd_ie[ 128 ] = { 0x00 }; -+ uint wfd_ielen = 0; -+ -+ if ( rtw_get_wfd_ie( &pnetwork->network.IEs[12], pnetwork->network.IELength - 12, wfd_ie, &wfd_ielen ) ) -+ { -+ u8 wfd_devinfo[ 6 ] = { 0x00 }; -+ uint wfd_devlen = 6; -+ -+ DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ ); -+ if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) ) -+ { -+ u16 wfd_devinfo_field = 0; -+ -+ // Commented by Albert 20120319 -+ // The first two bytes are the WFD device information field of WFD device information subelement. -+ // In big endian format. -+ wfd_devinfo_field = RTW_GET_BE16(wfd_devinfo); -+ if ( wfd_devinfo_field & WFD_DEVINFO_SESSION_AVAIL ) -+ { -+ pwfd_info->peer_session_avail = _TRUE; -+ } -+ else -+ { -+ pwfd_info->peer_session_avail = _FALSE; -+ } -+ } -+ } -+ -+ if ( _FALSE == pwfd_info->peer_session_avail ) -+ { -+ DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ ); -+ goto exit; -+ } -+ } -+#endif // CONFIG_WFD -+ -+ DBG_871X( "[%s] peer channel: %d!\n", __FUNCTION__, uintPeerChannel ); -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer ); -+ } -+#endif // CONFIG_CONCURRENT_MODE -+ _rtw_memcpy( pwdinfo->tx_prov_disc_info.peerIFAddr, pnetwork->network.MacAddress, ETH_ALEN ); -+ _rtw_memcpy( pwdinfo->tx_prov_disc_info.peerDevAddr, peerMAC, ETH_ALEN ); -+ pwdinfo->tx_prov_disc_info.peer_channel_num[0] = ( u16 ) uintPeerChannel; -+ pwdinfo->tx_prov_disc_info.benable = _TRUE; -+ rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ); -+ -+ if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT)) -+ { -+ _rtw_memcpy( &pwdinfo->tx_prov_disc_info.ssid, &pnetwork->network.Ssid, sizeof( NDIS_802_11_SSID ) ); -+ } -+ else if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) -+ { -+ _rtw_memcpy( pwdinfo->tx_prov_disc_info.ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN ); -+ pwdinfo->tx_prov_disc_info.ssid.SsidLength= P2P_WILDCARD_SSID_LEN; -+ } -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ // Have to enter the power saving with the AP -+ set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); -+ -+ issue_nulldata(pbuddy_adapter, NULL, 1, 3, 500); -+ } -+ else -+ { -+ set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+ } -+#else -+ set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); -+#endif -+ -+ _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_CONCURRENT_PROVISION_TIMEOUT ); -+ } -+ else -+ { -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT ); -+ } -+#else -+ _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT ); -+#endif // CONFIG_CONCURRENT_MODE -+ -+ -+ } -+ else -+ { -+ DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); -+#ifdef CONFIG_INTEL_WIDI -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); -+ rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); -+ rtw_free_network_queue(padapter, _TRUE); -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ rtw_sitesurvey_cmd(padapter, NULL, 0, NULL, 0); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+#endif //CONFIG_INTEL_WIDI -+ } -+exit: -+ -+ return ret; -+ -+} -+ -+// Added by Albert 20110328 -+// This function is used to inform the driver the user had specified the pin code value or pbc -+// to application. -+ -+static int rtw_p2p_got_wpsinfo(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); -+ -+ -+ DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); -+ // Added by Albert 20110328 -+ // if the input data is P2P_NO_WPSINFO -> reset the wpsinfo -+ // if the input data is P2P_GOT_WPSINFO_PEER_DISPLAY_PIN -> the utility just input the PIN code got from the peer P2P device. -+ // if the input data is P2P_GOT_WPSINFO_SELF_DISPLAY_PIN -> the utility just got the PIN code from itself. -+ // if the input data is P2P_GOT_WPSINFO_PBC -> the utility just determine to use the PBC -+ -+ if ( *extra == '0' ) -+ { -+ pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO; -+ } -+ else if ( *extra == '1' ) -+ { -+ pwdinfo->ui_got_wps_info = P2P_GOT_WPSINFO_PEER_DISPLAY_PIN; -+ } -+ else if ( *extra == '2' ) -+ { -+ pwdinfo->ui_got_wps_info = P2P_GOT_WPSINFO_SELF_DISPLAY_PIN; -+ } -+ else if ( *extra == '3' ) -+ { -+ pwdinfo->ui_got_wps_info = P2P_GOT_WPSINFO_PBC; -+ } -+ else -+ { -+ pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO; -+ } -+ -+ return ret; -+ -+} -+ -+#endif //CONFIG_P2P -+ -+static int rtw_p2p_set(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+#ifdef CONFIG_P2P -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); -+ -+ if ( _rtw_memcmp( extra, "enable=", 7 ) ) -+ { -+ rtw_wext_p2p_enable( dev, info, wrqu, &extra[7] ); -+ } -+ else if ( _rtw_memcmp( extra, "setDN=", 6 ) ) -+ { -+ wrqu->data.length -= 6; -+ rtw_p2p_setDN( dev, info, wrqu, &extra[6] ); -+ } -+ else if ( _rtw_memcmp( extra, "profilefound=", 13 ) ) -+ { -+ wrqu->data.length -= 13; -+ rtw_p2p_profilefound( dev, info, wrqu, &extra[13] ); -+ } -+ else if ( _rtw_memcmp( extra, "prov_disc=", 10 ) ) -+ { -+ wrqu->data.length -= 10; -+ rtw_p2p_prov_disc( dev, info, wrqu, &extra[10] ); -+ } -+ else if ( _rtw_memcmp( extra, "nego=", 5 ) ) -+ { -+ wrqu->data.length -= 5; -+ rtw_p2p_connect( dev, info, wrqu, &extra[5] ); -+ } -+ else if ( _rtw_memcmp( extra, "intent=", 7 ) ) -+ { -+ // Commented by Albert 2011/03/23 -+ // The wrqu->data.length will include the null character -+ // So, we will decrease 7 + 1 -+ wrqu->data.length -= 8; -+ rtw_p2p_set_intent( dev, info, wrqu, &extra[7] ); -+ } -+ else if ( _rtw_memcmp( extra, "ssid=", 5 ) ) -+ { -+ wrqu->data.length -= 5; -+ rtw_p2p_set_go_nego_ssid( dev, info, wrqu, &extra[5] ); -+ } -+ else if ( _rtw_memcmp( extra, "got_wpsinfo=", 12 ) ) -+ { -+ wrqu->data.length -= 12; -+ rtw_p2p_got_wpsinfo( dev, info, wrqu, &extra[12] ); -+ } -+ else if ( _rtw_memcmp( extra, "listen_ch=", 10 ) ) -+ { -+ // Commented by Albert 2011/05/24 -+ // The wrqu->data.length will include the null character -+ // So, we will decrease (10 + 1) -+ wrqu->data.length -= 11; -+ rtw_p2p_set_listen_ch( dev, info, wrqu, &extra[10] ); -+ } -+ else if ( _rtw_memcmp( extra, "op_ch=", 6 ) ) -+ { -+ // Commented by Albert 2011/05/24 -+ // The wrqu->data.length will include the null character -+ // So, we will decrease (6 + 1) -+ wrqu->data.length -= 7; -+ rtw_p2p_set_op_ch( dev, info, wrqu, &extra[6] ); -+ } -+ else if ( _rtw_memcmp( extra, "invite=", 7 ) ) -+ { -+ wrqu->data.length -= 8; -+ rtw_p2p_invite_req( dev, info, wrqu, &extra[7] ); -+ } -+ else if ( _rtw_memcmp( extra, "persistent=", 11 ) ) -+ { -+ wrqu->data.length -= 11; -+ rtw_p2p_set_persistent( dev, info, wrqu, &extra[11] ); -+ } -+ else if ( _rtw_memcmp ( extra, "uuid=", 5) ) -+ { -+ wrqu->data.length -= 5; -+ ret = rtw_p2p_set_wps_uuid( dev, info, wrqu, &extra[5] ); -+ } -+#ifdef CONFIG_WFD -+ else if ( _rtw_memcmp( extra, "sa=", 3 ) ) -+ { -+ // sa: WFD Session Available information -+ wrqu->data.length -= 3; -+ rtw_p2p_set_sa( dev, info, wrqu, &extra[3] ); -+ } -+ else if ( _rtw_memcmp( extra, "pc=", 3 ) ) -+ { -+ // pc: WFD Preferred Connection -+ wrqu->data.length -= 3; -+ rtw_p2p_set_pc( dev, info, wrqu, &extra[3] ); -+ } -+ else if ( _rtw_memcmp( extra, "wfd_type=", 9 ) ) -+ { -+ // Specify this device is Mircast source or sink -+ wrqu->data.length -= 9; -+ rtw_p2p_set_wfd_device_type( dev, info, wrqu, &extra[9] ); -+ } -+ else if ( _rtw_memcmp( extra, "scan_type=", 10 ) ) -+ { -+ wrqu->data.length -= 10; -+ rtw_p2p_set_scan_result_type( dev, info, wrqu, &extra[10] ); -+ } -+ else if ( _rtw_memcmp( extra, "wfd_enable=", 11 ) ) -+ { -+ wrqu->data.length -= 11; -+ rtw_p2p_set_wfd_enable( dev, info, wrqu, &extra[11] ); -+ } -+ else if ( _rtw_memcmp( extra, "driver_iface=", 13 ) ) -+ { -+ wrqu->data.length -= 13; -+ rtw_p2p_set_driver_iface( dev, info, wrqu, &extra[13] ); -+ } -+#endif //CONFIG_WFD -+#endif //CONFIG_P2P -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_get(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ -+#ifdef CONFIG_P2P -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct iw_point *pdata = &wrqu->data; -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+ if ( padapter->bShowGetP2PState ) -+ { -+ DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer ); -+ } -+ -+ if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) ) -+ { -+ rtw_p2p_get_status( dev, info, wrqu, extra ); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "role", 4 ) ) -+ { -+ rtw_p2p_get_role( dev, info, wrqu, extra); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "peer_ifa", 8 ) ) -+ { -+ rtw_p2p_get_peer_ifaddr( dev, info, wrqu, extra); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "req_cm", 6 ) ) -+ { -+ rtw_p2p_get_req_cm( dev, info, wrqu, extra); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "peer_deva", 9 ) ) -+ { -+ // Get the P2P device address when receiving the provision discovery request frame. -+ rtw_p2p_get_peer_devaddr( dev, info, wrqu, extra); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "group_id", 8 ) ) -+ { -+ rtw_p2p_get_groupid( dev, info, wrqu, extra); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "inv_peer_deva", 13 ) ) -+ { -+ // Get the P2P device address when receiving the P2P Invitation request frame. -+ rtw_p2p_get_peer_devaddr_by_invitation( dev, info, wrqu, extra); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "op_ch", 5 ) ) -+ { -+ rtw_p2p_get_op_ch( dev, info, wrqu, extra); -+ } -+#ifdef CONFIG_WFD -+ else if ( _rtw_memcmp( wrqu->data.pointer, "peer_port", 9 ) ) -+ { -+ rtw_p2p_get_peer_wfd_port( dev, info, wrqu, extra ); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_sa", 6 ) ) -+ { -+ rtw_p2p_get_peer_wfd_session_available( dev, info, wrqu, extra ); -+ } -+ else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_pc", 6 ) ) -+ { -+ rtw_p2p_get_peer_wfd_preferred_connection( dev, info, wrqu, extra ); -+ } -+#endif // CONFIG_WFD -+ -+#endif //CONFIG_P2P -+ -+ return ret; -+ -+} -+ -+static int rtw_p2p_get2(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ -+#ifdef CONFIG_P2P -+ -+ int length = wrqu->data.length; -+ char *buffer = (u8 *)rtw_malloc(length); -+ -+ if (buffer == NULL) -+ { -+ ret = -ENOMEM; -+ goto bad; -+ } -+ -+ if (copy_from_user(buffer, wrqu->data.pointer, wrqu->data.length)) -+ { -+ ret - EFAULT; -+ goto bad; -+ } -+ -+ DBG_871X("[%s] buffer = %s\n", __FUNCTION__, buffer); -+ -+ if (_rtw_memcmp(buffer, "wpsCM=", 6)) -+ { -+ ret = rtw_p2p_get_wps_configmethod(dev, info, wrqu, extra, &buffer[6]); -+ } else if (_rtw_memcmp(buffer, "devN=", 5)) -+ { -+ ret = rtw_p2p_get_device_name(dev, info, wrqu, extra, &buffer[5]); -+ } else if (_rtw_memcmp(buffer, "dev_type=", 9)) -+ { -+ ret = rtw_p2p_get_device_type(dev, info, wrqu, extra, &buffer[9]); -+ } else if (_rtw_memcmp(buffer, "go_devadd=", 10)) -+ { -+ ret = rtw_p2p_get_go_device_address(dev, info, wrqu, extra, &buffer[10]); -+ } else if (_rtw_memcmp(buffer, "InvProc=", 8)) -+ { -+ ret = rtw_p2p_get_invitation_procedure(dev, info, wrqu, extra, &buffer[8]); -+ } else -+ { -+ snprintf(extra, sizeof("Command not found."), "Command not found."); -+ wrqu->data.length = strlen(extra); -+ } -+ -+bad: -+ if (buffer) -+ { -+ rtw_mfree(buffer, length); -+ } -+ -+#endif //CONFIG_P2P -+ -+ return ret; -+ -+} -+ -+extern int rtw_change_ifname(_adapter *padapter, const char *ifname); -+static int rtw_rereg_nd_name(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ _adapter *padapter = rtw_netdev_priv(dev); -+ struct rereg_nd_name_data *rereg_priv = &padapter->rereg_nd_name_priv; -+ char new_ifname[IFNAMSIZ]; -+ -+ if(rereg_priv->old_ifname[0] == 0) { -+ char *reg_ifname; -+#ifdef CONFIG_CONCURRENT_MODE -+ if (padapter->isprimary) -+ reg_ifname = padapter->registrypriv.ifname; -+ else -+#endif -+ reg_ifname = padapter->registrypriv.if2name; -+ -+ strncpy(rereg_priv->old_ifname, reg_ifname, IFNAMSIZ); -+ rereg_priv->old_ifname[IFNAMSIZ-1] = 0; -+ } -+ -+ //DBG_871X("%s wrqu->data.length:%d\n", __FUNCTION__, wrqu->data.length); -+ if(wrqu->data.length > IFNAMSIZ) -+ return -EFAULT; -+ -+ if ( copy_from_user(new_ifname, wrqu->data.pointer, IFNAMSIZ) ) { -+ return -EFAULT; -+ } -+ -+ if( 0 == strcmp(rereg_priv->old_ifname, new_ifname) ) { -+ return ret; -+ } -+ -+ DBG_871X("%s new_ifname:%s\n", __FUNCTION__, new_ifname); -+ if( 0 != (ret = rtw_change_ifname(padapter, new_ifname)) ) { -+ goto exit; -+ } -+ -+ if(_rtw_memcmp(rereg_priv->old_ifname, "disable%d", 9) == _TRUE) { -+ padapter->ledpriv.bRegUseLed= rereg_priv->old_bRegUseLed; -+ rtw_hal_sw_led_init(padapter); -+ rtw_ips_mode_req(&padapter->pwrctrlpriv, rereg_priv->old_ips_mode); -+ } -+ -+ strncpy(rereg_priv->old_ifname, new_ifname, IFNAMSIZ); -+ rereg_priv->old_ifname[IFNAMSIZ-1] = 0; -+ -+ if(_rtw_memcmp(new_ifname, "disable%d", 9) == _TRUE) { -+ -+ DBG_871X("%s disable\n", __FUNCTION__); -+ // free network queue for Android's timming issue -+ rtw_free_network_queue(padapter, _TRUE); -+ -+ // close led -+ rtw_led_control(padapter, LED_CTL_POWER_OFF); -+ rereg_priv->old_bRegUseLed = padapter->ledpriv.bRegUseLed; -+ padapter->ledpriv.bRegUseLed= _FALSE; -+ rtw_hal_sw_led_deinit(padapter); -+ -+ // the interface is being "disabled", we can do deeper IPS -+ rereg_priv->old_ips_mode = rtw_get_ips_mode_req(&padapter->pwrctrlpriv); -+ rtw_ips_mode_req(&padapter->pwrctrlpriv, IPS_NORMAL); -+ } -+exit: -+ return ret; -+ -+} -+ -+#if 0 -+void mac_reg_dump(_adapter *padapter) -+{ -+ int i,j=1; -+ DBG_871X("\n======= MAC REG =======\n"); -+ for(i=0x0;i<0x300;i+=4) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+ for(i=0x400;i<0x800;i+=4) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+} -+void bb_reg_dump(_adapter *padapter) -+{ -+ int i,j=1; -+ DBG_871X("\n======= BB REG =======\n"); -+ for(i=0x800;i<0x1000;i+=4) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+} -+void rf_reg_dump(_adapter *padapter) -+{ -+ int i,j=1,path; -+ u32 value; -+ DBG_871X("\n======= RF REG =======\n"); -+ for(path=0;path<2;path++) -+ { -+ DBG_871X("\nRF_Path(%x)\n",path); -+ for(i=0;i<0x100;i++) -+ { -+ value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord); -+ if(j%4==1) DBG_871X("0x%02x ",i); -+ DBG_871X(" 0x%08x ",value); -+ if((j++)%4==0) DBG_871X("\n"); -+ } -+ } -+} -+ -+#endif -+ -+void mac_reg_dump(_adapter *padapter) -+{ -+ int i,j=1; -+ DBG_871X("\n======= MAC REG =======\n"); -+ for(i=0x0;i<0x300;i+=4) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+ for(i=0x400;i<0x800;i+=4) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+} -+void bb_reg_dump(_adapter *padapter) -+{ -+ int i,j=1; -+ DBG_871X("\n======= BB REG =======\n"); -+ for(i=0x800;i<0x1000;i+=4) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+} -+void rf_reg_dump(_adapter *padapter) -+{ -+ int i,j=1,path; -+ u32 value; -+ u8 rf_type,path_nums = 0; -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ -+ DBG_871X("\n======= RF REG =======\n"); -+ if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) -+ path_nums = 1; -+ else -+ path_nums = 2; -+ -+ for(path=0;path -+#endif -+#ifdef DBG_CONFIG_ERROR_DETECT -+#include -+#endif -+static int rtw_dbg_port(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ _irqL irqL; -+ int ret = 0; -+ u8 major_cmd, minor_cmd; -+ u16 arg; -+ u32 extra_arg, *pdata, val32; -+ struct sta_info *psta; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ struct wlan_network *cur_network = &(pmlmepriv->cur_network); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ -+ pdata = (u32*)&wrqu->data; -+ -+ val32 = *pdata; -+ arg = (u16)(val32&0x0000ffff); -+ major_cmd = (u8)(val32>>24); -+ minor_cmd = (u8)((val32>>16)&0x00ff); -+ -+ extra_arg = *(pdata+1); -+ -+ switch(major_cmd) -+ { -+ case 0x70://read_reg -+ switch(minor_cmd) -+ { -+ case 1: -+ DBG_871X("rtw_read8(0x%x)=0x%02x\n", arg, rtw_read8(padapter, arg)); -+ break; -+ case 2: -+ DBG_871X("rtw_read16(0x%x)=0x%04x\n", arg, rtw_read16(padapter, arg)); -+ break; -+ case 4: -+ DBG_871X("rtw_read32(0x%x)=0x%08x\n", arg, rtw_read32(padapter, arg)); -+ break; -+ } -+ break; -+ case 0x71://write_reg -+ switch(minor_cmd) -+ { -+ case 1: -+ rtw_write8(padapter, arg, extra_arg); -+ DBG_871X("rtw_write8(0x%x)=0x%02x\n", arg, rtw_read8(padapter, arg)); -+ break; -+ case 2: -+ rtw_write16(padapter, arg, extra_arg); -+ DBG_871X("rtw_write16(0x%x)=0x%04x\n", arg, rtw_read16(padapter, arg)); -+ break; -+ case 4: -+ rtw_write32(padapter, arg, extra_arg); -+ DBG_871X("rtw_write32(0x%x)=0x%08x\n", arg, rtw_read32(padapter, arg)); -+ break; -+ } -+ break; -+ case 0x72://read_bb -+ DBG_871X("read_bbreg(0x%x)=0x%x\n", arg, rtw_hal_read_bbreg(padapter, arg, 0xffffffff)); -+ break; -+ case 0x73://write_bb -+ rtw_hal_write_bbreg(padapter, arg, 0xffffffff, extra_arg); -+ DBG_871X("write_bbreg(0x%x)=0x%x\n", arg, rtw_hal_read_bbreg(padapter, arg, 0xffffffff)); -+ break; -+ case 0x74://read_rf -+ DBG_871X("read RF_reg path(0x%02x),offset(0x%x),value(0x%08x)\n",minor_cmd,arg,rtw_hal_read_rfreg(padapter, minor_cmd, arg, 0xffffffff)); -+ break; -+ case 0x75://write_rf -+ rtw_hal_write_rfreg(padapter, minor_cmd, arg, 0xffffffff, extra_arg); -+ DBG_871X("write RF_reg path(0x%02x),offset(0x%x),value(0x%08x)\n",minor_cmd,arg, rtw_hal_read_rfreg(padapter, minor_cmd, arg, 0xffffffff)); -+ break; -+ -+ case 0x76: -+ switch(minor_cmd) -+ { -+ case 0x00: //normal mode, -+ padapter->recvpriv.is_signal_dbg = 0; -+ break; -+ case 0x01: //dbg mode -+ padapter->recvpriv.is_signal_dbg = 1; -+ extra_arg = extra_arg>100?100:extra_arg; -+ extra_arg = extra_arg<0?0:extra_arg; -+ padapter->recvpriv.signal_strength_dbg=extra_arg; -+ break; -+ } -+ break; -+ case 0x78: //IOL test -+ switch(minor_cmd) -+ { -+ #ifdef CONFIG_IOL -+ case 0x04: //LLT table initialization test -+ { -+ u8 page_boundary = 0xf9; -+ { -+ struct xmit_frame *xmit_frame; -+ -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(padapter)) == NULL) { -+ ret = -ENOMEM; -+ break; -+ } -+ -+ rtw_IOL_append_LLT_cmd(xmit_frame, page_boundary); -+ -+ -+ if(_SUCCESS != rtw_IOL_exec_cmds_sync(padapter, xmit_frame, 500) ) -+ ret = -EPERM; -+ } -+ } -+ break; -+ case 0x05: //blink LED test -+ { -+ u16 reg = 0x4c; -+ u32 blink_num = 50; -+ u32 blink_delay_ms = 200; -+ int i; -+ -+ { -+ struct xmit_frame *xmit_frame; -+ -+ if((xmit_frame=rtw_IOL_accquire_xmit_frame(padapter)) == NULL) { -+ ret = -ENOMEM; -+ break; -+ } -+ -+ for(i=0;inetwork.MacAddress -+ , WLAN_REASON_EXPIRATION_CHK); -+ break; -+ -+ case 0x7F: -+ switch(minor_cmd) -+ { -+ case 0x0: -+ DBG_871X("fwstate=0x%x\n", get_fwstate(pmlmepriv)); -+ break; -+ case 0x01: -+ DBG_871X("auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n", -+ psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm, -+ psecuritypriv->ndisauthtype, psecuritypriv->ndisencryptstatus); -+ break; -+ case 0x02: -+ DBG_871X("pmlmeinfo->state=0x%x\n", pmlmeinfo->state); -+ break; -+ case 0x03: -+ DBG_871X("qos_option=%d\n", pmlmepriv->qospriv.qos_option); -+ DBG_871X("ht_option=%d\n", pmlmepriv->htpriv.ht_option); -+ break; -+ case 0x04: -+ DBG_871X("cur_ch=%d\n", pmlmeext->cur_channel); -+ DBG_871X("cur_bw=%d\n", pmlmeext->cur_bwmode); -+ DBG_871X("cur_ch_off=%d\n", pmlmeext->cur_ch_offset); -+ break; -+ case 0x05: -+ psta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress); -+ if(psta) -+ { -+ int i; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ -+ DBG_871X("SSID=%s\n", cur_network->network.Ssid.Ssid); -+ DBG_871X("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); -+ DBG_871X("cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); -+ DBG_871X("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); -+ DBG_871X("qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate); -+ DBG_871X("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); -+ DBG_871X("bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi); -+ DBG_871X("ampdu_enable = %d\n", psta->htpriv.ampdu_enable); -+ DBG_871X("agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap); -+ -+ for(i=0;i<16;i++) -+ { -+ preorder_ctrl = &psta->recvreorder_ctrl[i]; -+ if(preorder_ctrl->enable) -+ { -+ DBG_871X("tid=%d, indicate_seq=%d\n", i, preorder_ctrl->indicate_seq); -+ } -+ } -+ -+ } -+ else -+ { -+ DBG_871X("can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress)); -+ } -+ break; -+ case 0x06: -+ { -+ u8 DMFlag; -+ rtw_hal_get_hwreg(padapter, HW_VAR_DM_FLAG, (u8 *)(&DMFlag)); -+ DBG_871X("(B)DMFlag=0x%x, arg=0x%x\n", DMFlag, arg); -+ DMFlag = (u8)(0x0f&arg); -+ DBG_871X("(A)DMFlag=0x%x\n", DMFlag); -+ rtw_hal_set_hwreg(padapter, HW_VAR_DM_FLAG, (u8 *)(&DMFlag)); -+ } -+ break; -+ case 0x07: -+ DBG_871X("bSurpriseRemoved=%d, bDriverStopped=%d\n", -+ padapter->bSurpriseRemoved, padapter->bDriverStopped); -+ break; -+ case 0x08: -+ { -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+ DBG_871X("free_xmitbuf_cnt=%d, free_xmitframe_cnt=%d" -+ ", free_xmit_extbuf_cnt=%d, free_xframe_ext_cnt=%d" -+ ", free_recvframe_cnt=%d\n", -+ pxmitpriv->free_xmitbuf_cnt, pxmitpriv->free_xmitframe_cnt, -+ pxmitpriv->free_xmit_extbuf_cnt, pxmitpriv->free_xframe_ext_cnt, -+ precvpriv->free_recvframe_cnt); -+ #ifdef CONFIG_USB_HCI -+ DBG_871X("rx_urb_pending_cn=%d\n", precvpriv->rx_pending_cnt); -+ #endif -+ } -+ break; -+ case 0x09: -+ { -+ int i, j; -+ _list *plist, *phead; -+ struct recv_reorder_ctrl *preorder_ctrl; -+ -+#ifdef CONFIG_AP_MODE -+ DBG_871X("sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap); -+#endif -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(i=0; i< NUM_STA; i++) -+ { -+ phead = &(pstapriv->sta_hash[i]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); -+ -+ plist = get_next(plist); -+ -+ if(extra_arg == psta->aid) -+ { -+ DBG_871X("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); -+ DBG_871X("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); -+ DBG_871X("qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate); -+ DBG_871X("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); -+ DBG_871X("bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi); -+ DBG_871X("ampdu_enable = %d\n", psta->htpriv.ampdu_enable); -+ DBG_871X("agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap); -+#ifdef CONFIG_AP_MODE -+ DBG_871X("capability=0x%x\n", psta->capability); -+ DBG_871X("flags=0x%x\n", psta->flags); -+ DBG_871X("wpa_psk=0x%x\n", psta->wpa_psk); -+ DBG_871X("wpa2_group_cipher=0x%x\n", psta->wpa2_group_cipher); -+ DBG_871X("wpa2_pairwise_cipher=0x%x\n", psta->wpa2_pairwise_cipher); -+ DBG_871X("qos_info=0x%x\n", psta->qos_info); -+#endif -+ DBG_871X("dot118021XPrivacy=0x%x\n", psta->dot118021XPrivacy); -+ -+ -+ -+ for(j=0;j<16;j++) -+ { -+ preorder_ctrl = &psta->recvreorder_ctrl[j]; -+ if(preorder_ctrl->enable) -+ { -+ DBG_871X("tid=%d, indicate_seq=%d\n", j, preorder_ctrl->indicate_seq); -+ } -+ } -+ -+ } -+ -+ } -+ } -+ -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ } -+ break; -+ -+ case 0x0c://dump rx packet -+ { -+ DBG_871X("dump rx packet (%d)\n",extra_arg); -+ //pHalData->bDumpRxPkt =extra_arg; -+ rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_RXPKT, &(extra_arg)); -+ } -+ break; -+#if 0 -+ case 0x0d://dump cam -+ { -+ //u8 entry = (u8) extra_arg; -+ u8 entry=0; -+ //dump cam -+ for(entry=0;entry<32;entry++) -+ read_cam(padapter,entry); -+ } -+ break; -+#endif -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ case 0x0f: -+ { -+ if(extra_arg == 0){ -+ DBG_871X("###### silent reset test.......#####\n"); -+ rtw_hal_sreset_reset(padapter); -+ } else { -+ sreset_set_trigger_point(padapter, extra_arg); -+ } -+ -+ } -+ break; -+ case 0x15: -+ { -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ DBG_871X("==>silent resete cnts:%d\n",pwrpriv->ips_enter_cnts); -+ } -+ break; -+ -+ #endif -+ -+ case 0x10:// driver version display -+ DBG_871X("rtw driver version=%s\n", DRIVERVERSION); -+ break; -+ case 0x11: -+ { -+ DBG_871X("turn %s Rx RSSI display function\n",(extra_arg==1)?"on":"off"); -+ padapter->bRxRSSIDisplay = extra_arg ; -+ } -+ break; -+ case 0x12: //set rx_stbc -+ { -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ // 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, 0x3: enable both 2.4g and 5g -+ //default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ -+ if( pregpriv && (extra_arg == 0 || extra_arg == 1|| extra_arg == 2 || extra_arg == 3)) -+ { -+ pregpriv->rx_stbc= extra_arg; -+ DBG_871X("set rx_stbc=%d\n",pregpriv->rx_stbc); -+ } -+ else -+ DBG_871X("get rx_stbc=%d\n",pregpriv->rx_stbc); -+ -+ } -+ break; -+ case 0x13: //set ampdu_enable -+ { -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ // 0: disable, 0x1:enable (but wifi_spec should be 0), 0x2: force enable (don't care wifi_spec) -+ if( pregpriv && extra_arg >= 0 && extra_arg < 3 ) -+ { -+ pregpriv->ampdu_enable= extra_arg; -+ DBG_871X("set ampdu_enable=%d\n",pregpriv->ampdu_enable); -+ } -+ else -+ DBG_871X("get ampdu_enable=%d\n",pregpriv->ampdu_enable); -+ -+ } -+ break; -+ case 0x14: //get wifi_spec -+ { -+ struct registry_priv *pregpriv = &padapter->registrypriv; -+ DBG_871X("get wifi_spec=%d\n",pregpriv->wifi_spec); -+ -+ } -+ break; -+ case 0x22: -+ { -+ DBG_871X("turn %s the ForceWriteInitGain Variable\n",(extra_arg==1)?"on":"off"); -+ padapter->bForceWriteInitGain = extra_arg; -+ break; -+ } -+ case 0x23: -+ { -+ DBG_871X("turn %s the bNotifyChannelChange Variable\n",(extra_arg==1)?"on":"off"); -+ padapter->bNotifyChannelChange = extra_arg; -+ break; -+ } -+ case 0x24: -+ { -+#ifdef CONFIG_P2P -+ DBG_871X("turn %s the bShowGetP2PState Variable\n",(extra_arg==1)?"on":"off"); -+ padapter->bShowGetP2PState = extra_arg; -+#endif // CONFIG_P2P -+ break; -+ } -+#if 1 -+ case 0xdd://registers dump , 0 for mac reg,1 for bb reg, 2 for rf reg -+ { -+ if(extra_arg==0){ -+ mac_reg_dump(padapter); -+ } -+ else if(extra_arg==1){ -+ bb_reg_dump(padapter); -+ } -+ else if(extra_arg==2){ -+ rf_reg_dump(padapter); -+ } -+ -+ } -+ break; -+#endif -+ case 0xee://turn on/off dynamic funcs -+ { -+ u8 dm_flag; -+ -+ if(0xf==extra_arg){ -+ rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&dm_flag); -+ DBG_871X(" === DMFlag(0x%02x) === \n",dm_flag); -+ DBG_871X("extra_arg = 0 - disable all dynamic func \n"); -+ DBG_871X("extra_arg = 1 - disable DIG- BIT(0)\n"); -+ DBG_871X("extra_arg = 2 - disable High power - BIT(1)\n"); -+ DBG_871X("extra_arg = 3 - disable tx power tracking - BIT(2)\n"); -+ DBG_871X("extra_arg = 4 - disable BT coexistence - BIT(3)\n"); -+ DBG_871X("extra_arg = 5 - disable antenna diversity - BIT(4)\n"); -+ DBG_871X("extra_arg = 6 - enable all dynamic func \n"); -+ } -+ else{ -+ /* extra_arg = 0 - disable all dynamic func -+ extra_arg = 1 - disable DIG -+ extra_arg = 2 - disable tx power tracking -+ extra_arg = 3 - turn on all dynamic func -+ */ -+ rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &(extra_arg)); -+ rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&dm_flag); -+ DBG_871X(" === DMFlag(0x%02x) === \n",dm_flag); -+ } -+ } -+ break; -+ -+ case 0xfd: -+ rtw_write8(padapter, 0xc50, arg); -+ DBG_871X("wr(0xc50)=0x%x\n", rtw_read8(padapter, 0xc50)); -+ rtw_write8(padapter, 0xc58, arg); -+ DBG_871X("wr(0xc58)=0x%x\n", rtw_read8(padapter, 0xc58)); -+ break; -+ case 0xfe: -+ DBG_871X("rd(0xc50)=0x%x\n", rtw_read8(padapter, 0xc50)); -+ DBG_871X("rd(0xc58)=0x%x\n", rtw_read8(padapter, 0xc58)); -+ break; -+ case 0xff: -+ { -+ DBG_871X("dbg(0x210)=0x%x\n", rtw_read32(padapter, 0x210)); -+ DBG_871X("dbg(0x608)=0x%x\n", rtw_read32(padapter, 0x608)); -+ DBG_871X("dbg(0x280)=0x%x\n", rtw_read32(padapter, 0x280)); -+ DBG_871X("dbg(0x284)=0x%x\n", rtw_read32(padapter, 0x284)); -+ DBG_871X("dbg(0x288)=0x%x\n", rtw_read32(padapter, 0x288)); -+ -+ DBG_871X("dbg(0x664)=0x%x\n", rtw_read32(padapter, 0x664)); -+ -+ -+ DBG_871X("\n"); -+ -+ DBG_871X("dbg(0x430)=0x%x\n", rtw_read32(padapter, 0x430)); -+ DBG_871X("dbg(0x438)=0x%x\n", rtw_read32(padapter, 0x438)); -+ -+ DBG_871X("dbg(0x440)=0x%x\n", rtw_read32(padapter, 0x440)); -+ -+ DBG_871X("dbg(0x458)=0x%x\n", rtw_read32(padapter, 0x458)); -+ -+ DBG_871X("dbg(0x484)=0x%x\n", rtw_read32(padapter, 0x484)); -+ DBG_871X("dbg(0x488)=0x%x\n", rtw_read32(padapter, 0x488)); -+ -+ DBG_871X("dbg(0x444)=0x%x\n", rtw_read32(padapter, 0x444)); -+ DBG_871X("dbg(0x448)=0x%x\n", rtw_read32(padapter, 0x448)); -+ DBG_871X("dbg(0x44c)=0x%x\n", rtw_read32(padapter, 0x44c)); -+ DBG_871X("dbg(0x450)=0x%x\n", rtw_read32(padapter, 0x450)); -+ } -+ break; -+ } -+ break; -+ default: -+ DBG_871X("error dbg cmd!\n"); -+ break; -+ } -+ -+ -+ return ret; -+ -+} -+ -+static int wpa_set_param(struct net_device *dev, u8 name, u32 value) -+{ -+ uint ret=0; -+ u32 flags; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ switch (name){ -+ case IEEE_PARAM_WPA_ENABLED: -+ -+ padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; //802.1x -+ -+ //ret = ieee80211_wpa_enable(ieee, value); -+ -+ switch((value)&0xff) -+ { -+ case 1 : //WPA -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK; //WPA_PSK -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled; -+ break; -+ case 2: //WPA2 -+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK; //WPA2_PSK -+ padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled; -+ break; -+ } -+ -+ RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("wpa_set_param:padapter->securitypriv.ndisauthtype=%d\n", padapter->securitypriv.ndisauthtype)); -+ -+ break; -+ -+ case IEEE_PARAM_TKIP_COUNTERMEASURES: -+ //ieee->tkip_countermeasures=value; -+ break; -+ -+ case IEEE_PARAM_DROP_UNENCRYPTED: -+ { -+ /* HACK: -+ * -+ * wpa_supplicant calls set_wpa_enabled when the driver -+ * is loaded and unloaded, regardless of if WPA is being -+ * used. No other calls are made which can be used to -+ * determine if encryption will be used or not prior to -+ * association being expected. If encryption is not being -+ * used, drop_unencrypted is set to false, else true -- we -+ * can use this to determine if the CAP_PRIVACY_ON bit should -+ * be set. -+ */ -+ -+#if 0 -+ struct ieee80211_security sec = { -+ .flags = SEC_ENABLED, -+ .enabled = value, -+ }; -+ ieee->drop_unencrypted = value; -+ /* We only change SEC_LEVEL for open mode. Others -+ * are set by ipw_wpa_set_encryption. -+ */ -+ if (!value) { -+ sec.flags |= SEC_LEVEL; -+ sec.level = SEC_LEVEL_0; -+ } -+ else { -+ sec.flags |= SEC_LEVEL; -+ sec.level = SEC_LEVEL_1; -+ } -+ if (ieee->set_security) -+ ieee->set_security(ieee->dev, &sec); -+#endif -+ break; -+ -+ } -+ case IEEE_PARAM_PRIVACY_INVOKED: -+ -+ //ieee->privacy_invoked=value; -+ -+ break; -+ -+ case IEEE_PARAM_AUTH_ALGS: -+ -+ ret = wpa_set_auth_algs(dev, value); -+ -+ break; -+ -+ case IEEE_PARAM_IEEE_802_1X: -+ -+ //ieee->ieee802_1x=value; -+ -+ break; -+ -+ case IEEE_PARAM_WPAX_SELECT: -+ -+ // added for WPA2 mixed mode -+ //DBG_871X(KERN_WARNING "------------------------>wpax value = %x\n", value); -+ /* -+ spin_lock_irqsave(&ieee->wpax_suitlist_lock,flags); -+ ieee->wpax_type_set = 1; -+ ieee->wpax_type_notify = value; -+ spin_unlock_irqrestore(&ieee->wpax_suitlist_lock,flags); -+ */ -+ -+ break; -+ -+ default: -+ -+ -+ -+ ret = -EOPNOTSUPP; -+ -+ -+ break; -+ -+ } -+ -+ return ret; -+ -+} -+ -+static int wpa_mlme(struct net_device *dev, u32 command, u32 reason) -+{ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ switch (command) -+ { -+ case IEEE_MLME_STA_DEAUTH: -+ -+ if(!rtw_set_802_11_disassociate(padapter)) -+ ret = -1; -+ -+ break; -+ -+ case IEEE_MLME_STA_DISASSOC: -+ -+ if(!rtw_set_802_11_disassociate(padapter)) -+ ret = -1; -+ -+ break; -+ -+ default: -+ ret = -EOPNOTSUPP; -+ break; -+ } -+ -+ return ret; -+ -+} -+ -+static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p) -+{ -+ struct ieee_param *param; -+ uint ret=0; -+ -+ //down(&ieee->wx_sem); -+ -+ if (p->length < sizeof(struct ieee_param) || !p->pointer){ -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ param = (struct ieee_param *)rtw_malloc(p->length); -+ if (param == NULL) -+ { -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ if (copy_from_user(param, p->pointer, p->length)) -+ { -+ rtw_mfree((u8*)param, p->length); -+ ret = -EFAULT; -+ goto out; -+ } -+ -+ switch (param->cmd) { -+ -+ case IEEE_CMD_SET_WPA_PARAM: -+ ret = wpa_set_param(dev, param->u.wpa_param.name, param->u.wpa_param.value); -+ break; -+ -+ case IEEE_CMD_SET_WPA_IE: -+ //ret = wpa_set_wpa_ie(dev, param, p->length); -+ ret = rtw_set_wpa_ie((_adapter *)rtw_netdev_priv(dev), (char*)param->u.wpa_ie.data, (u16)param->u.wpa_ie.len); -+ break; -+ -+ case IEEE_CMD_SET_ENCRYPTION: -+ ret = wpa_set_encryption(dev, param, p->length); -+ break; -+ -+ case IEEE_CMD_MLME: -+ ret = wpa_mlme(dev, param->u.mlme.command, param->u.mlme.reason_code); -+ break; -+ -+ default: -+ DBG_871X("Unknown WPA supplicant request: %d\n", param->cmd); -+ ret = -EOPNOTSUPP; -+ break; -+ -+ } -+ -+ if (ret == 0 && copy_to_user(p->pointer, param, p->length)) -+ ret = -EFAULT; -+ -+ rtw_mfree((u8 *)param, p->length); -+ -+out: -+ -+ //up(&ieee->wx_sem); -+ -+ return ret; -+ -+} -+ -+#ifdef CONFIG_AP_MODE -+static u8 set_pairwise_key(_adapter *padapter, struct sta_info *psta) -+{ -+ struct cmd_obj* ph2c; -+ struct set_stakey_parm *psetstakey_para; -+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv; -+ u8 res=_SUCCESS; -+ -+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if ( ph2c == NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ -+ psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm)); -+ if(psetstakey_para==NULL){ -+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); -+ res=_FAIL; -+ goto exit; -+ } -+ -+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_); -+ -+ -+ psetstakey_para->algorithm = (u8)psta->dot118021XPrivacy; -+ -+ _rtw_memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN); -+ -+ _rtw_memcpy(psetstakey_para->key, &psta->dot118021x_UncstKey, 16); -+ -+ -+ res = rtw_enqueue_cmd(pcmdpriv, ph2c); -+ -+exit: -+ -+ return res; -+ -+} -+ -+static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) -+{ -+ u8 keylen; -+ struct cmd_obj* pcmd; -+ struct setkey_parm *psetkeyparm; -+ struct cmd_priv *pcmdpriv=&(padapter->cmdpriv); -+ int res=_SUCCESS; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); -+ if(pcmd==NULL){ -+ res= _FAIL; -+ goto exit; -+ } -+ psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm)); -+ if(psetkeyparm==NULL){ -+ rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); -+ res= _FAIL; -+ goto exit; -+ } -+ -+ _rtw_memset(psetkeyparm, 0, sizeof(struct setkey_parm)); -+ -+ psetkeyparm->keyid=(u8)keyid; -+ if (is_wep_enc(alg)) -+ padapter->securitypriv.key_mask |= BIT(psetkeyparm->keyid); -+ -+ psetkeyparm->algorithm = alg; -+ -+ psetkeyparm->set_tx = 1; -+ -+ switch(alg) -+ { -+ case _WEP40_: -+ keylen = 5; -+ break; -+ case _WEP104_: -+ keylen = 13; -+ break; -+ case _TKIP_: -+ case _TKIP_WTMIC_: -+ case _AES_: -+ keylen = 16; -+ default: -+ keylen = 16; -+ } -+ -+ _rtw_memcpy(&(psetkeyparm->key[0]), key, keylen); -+ -+ pcmd->cmdcode = _SetKey_CMD_; -+ pcmd->parmbuf = (u8 *)psetkeyparm; -+ pcmd->cmdsz = (sizeof(struct setkey_parm)); -+ pcmd->rsp = NULL; -+ pcmd->rspsz = 0; -+ -+ -+ _rtw_init_listhead(&pcmd->list); -+ -+ res = rtw_enqueue_cmd(pcmdpriv, pcmd); -+ -+exit: -+ -+ return res; -+ -+ -+} -+ -+static int set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid) -+{ -+ u8 alg; -+ -+ switch(keylen) -+ { -+ case 5: -+ alg =_WEP40_; -+ break; -+ case 13: -+ alg =_WEP104_; -+ break; -+ default: -+ alg =_NO_PRIVACY_; -+ } -+ -+ return set_group_key(padapter, key, alg, keyid); -+ -+} -+ -+ -+static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len) -+{ -+ int ret = 0; -+ u32 wep_key_idx, wep_key_len,wep_total_len; -+ NDIS_802_11_WEP *pwep = NULL; -+ struct sta_info *psta = NULL, *pbcmc_sta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ param->u.crypt.err = 0; -+ param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; -+ -+ //sizeof(struct ieee_param) = 64 bytes; -+ //if (param_len != (u32) ((u8 *) param->u.crypt.key - (u8 *) param) + param->u.crypt.key_len) -+ if (param_len != sizeof(struct ieee_param) + param->u.crypt.key_len) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ if (param->u.crypt.idx >= WEP_KEYS) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ } -+ else -+ { -+ psta = rtw_get_stainfo(pstapriv, param->sta_addr); -+ if(!psta) -+ { -+ //ret = -EINVAL; -+ DBG_871X("rtw_set_encryption(), sta has already been removed or never been added\n"); -+ goto exit; -+ } -+ } -+ -+ if (strcmp(param->u.crypt.alg, "none") == 0 && (psta==NULL)) -+ { -+ //todo:clear default encryption keys -+ -+ DBG_871X("clear default encryption keys, keyid=%d\n", param->u.crypt.idx); -+ -+ goto exit; -+ } -+ -+ -+ if (strcmp(param->u.crypt.alg, "WEP") == 0 && (psta==NULL)) -+ { -+ DBG_871X("r871x_set_encryption, crypt.alg = WEP\n"); -+ -+ wep_key_idx = param->u.crypt.idx; -+ wep_key_len = param->u.crypt.key_len; -+ -+ DBG_871X("r871x_set_encryption, wep_key_idx=%d, len=%d\n", wep_key_idx, wep_key_len); -+ -+ if((wep_key_idx >= WEP_KEYS) || (wep_key_len<=0)) -+ { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ -+ if (wep_key_len > 0) -+ { -+ wep_key_len = wep_key_len <= 5 ? 5 : 13; -+ wep_total_len = wep_key_len + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial); -+ pwep =(NDIS_802_11_WEP *)rtw_malloc(wep_total_len); -+ if(pwep == NULL){ -+ DBG_871X(" r871x_set_encryption: pwep allocate fail !!!\n"); -+ goto exit; -+ } -+ -+ _rtw_memset(pwep, 0, wep_total_len); -+ -+ pwep->KeyLength = wep_key_len; -+ pwep->Length = wep_total_len; -+ -+ } -+ -+ pwep->KeyIndex = wep_key_idx; -+ -+ _rtw_memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength); -+ -+ if(param->u.crypt.set_tx) -+ { -+ DBG_871X("wep, set_tx=1\n"); -+ -+ psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; -+ psecuritypriv->dot11PrivacyAlgrthm=_WEP40_; -+ psecuritypriv->dot118021XGrpPrivacy=_WEP40_; -+ -+ if(pwep->KeyLength==13) -+ { -+ psecuritypriv->dot11PrivacyAlgrthm=_WEP104_; -+ psecuritypriv->dot118021XGrpPrivacy=_WEP104_; -+ } -+ -+ -+ psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; -+ -+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); -+ -+ psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength; -+ -+ set_wep_key(padapter, pwep->KeyMaterial, pwep->KeyLength, wep_key_idx); -+ -+ -+ } -+ else -+ { -+ DBG_871X("wep, set_tx=0\n"); -+ -+ //don't update "psecuritypriv->dot11PrivacyAlgrthm" and -+ //"psecuritypriv->dot11PrivacyKeyIndex=keyid", but can rtw_set_key to cam -+ -+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); -+ -+ psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength; -+ -+ set_wep_key(padapter, pwep->KeyMaterial, pwep->KeyLength, wep_key_idx); -+ -+ } -+ -+ goto exit; -+ -+ } -+ -+ -+ if(!psta && check_fwstate(pmlmepriv, WIFI_AP_STATE)) // //group key -+ { -+ if(param->u.crypt.set_tx ==1) -+ { -+ if(strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ DBG_871X("%s, set group_key, WEP\n", __FUNCTION__); -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -+ if(param->u.crypt.key_len==13) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _WEP104_; -+ } -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "TKIP") == 0) -+ { -+ DBG_871X("%s, set group_key, TKIP\n", __FUNCTION__); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _TKIP_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); -+ //set mic key -+ _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); -+ -+ psecuritypriv->busetkipkey = _TRUE; -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ DBG_871X("%s, set group_key, CCMP\n", __FUNCTION__); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _AES_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ } -+ else -+ { -+ DBG_871X("%s, set group_key, none\n", __FUNCTION__); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ } -+ -+ psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; -+ -+ psecuritypriv->binstallGrpkey = _TRUE; -+ -+ psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! -+ -+ set_group_key(padapter, param->u.crypt.key, psecuritypriv->dot118021XGrpPrivacy, param->u.crypt.idx); -+ -+ pbcmc_sta=rtw_get_bcmc_stainfo(padapter); -+ if(pbcmc_sta) -+ { -+ pbcmc_sta->ieee8021x_blocked = _FALSE; -+ pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy -+ } -+ -+ } -+ -+ goto exit; -+ -+ } -+ -+ if(psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && psta) // psk/802_1x -+ { -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE)) -+ { -+ if(param->u.crypt.set_tx ==1) -+ { -+ _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ if(strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ DBG_871X("%s, set pairwise key, WEP\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _WEP40_; -+ if(param->u.crypt.key_len==13) -+ { -+ psta->dot118021XPrivacy = _WEP104_; -+ } -+ } -+ else if(strcmp(param->u.crypt.alg, "TKIP") == 0) -+ { -+ DBG_871X("%s, set pairwise key, TKIP\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _TKIP_; -+ -+ //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); -+ //set mic key -+ _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); -+ -+ psecuritypriv->busetkipkey = _TRUE; -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ -+ DBG_871X("%s, set pairwise key, CCMP\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _AES_; -+ } -+ else -+ { -+ DBG_871X("%s, set pairwise key, none\n", __FUNCTION__); -+ -+ psta->dot118021XPrivacy = _NO_PRIVACY_; -+ } -+ -+ set_pairwise_key(padapter, psta); -+ -+ psta->ieee8021x_blocked = _FALSE; -+ -+ } -+ else//group key??? -+ { -+ if(strcmp(param->u.crypt.alg, "WEP") == 0) -+ { -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ psecuritypriv->dot118021XGrpPrivacy = _WEP40_; -+ if(param->u.crypt.key_len==13) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _WEP104_; -+ } -+ } -+ else if(strcmp(param->u.crypt.alg, "TKIP") == 0) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _TKIP_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ -+ //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); -+ //set mic key -+ _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); -+ _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); -+ -+ psecuritypriv->busetkipkey = _TRUE; -+ -+ } -+ else if(strcmp(param->u.crypt.alg, "CCMP") == 0) -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _AES_; -+ -+ _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); -+ } -+ else -+ { -+ psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ } -+ -+ psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; -+ -+ psecuritypriv->binstallGrpkey = _TRUE; -+ -+ psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;//!!! -+ -+ set_group_key(padapter, param->u.crypt.key, psecuritypriv->dot118021XGrpPrivacy, param->u.crypt.idx); -+ -+ pbcmc_sta=rtw_get_bcmc_stainfo(padapter); -+ if(pbcmc_sta) -+ { -+ pbcmc_sta->ieee8021x_blocked = _FALSE; -+ pbcmc_sta->dot118021XPrivacy= psecuritypriv->dot118021XGrpPrivacy;//rx will use bmc_sta's dot118021XPrivacy -+ } -+ -+ } -+ -+ } -+ -+ } -+ -+exit: -+ -+ if(pwep) -+ { -+ rtw_mfree((u8 *)pwep,wep_total_len); -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ unsigned char *pbuf = param->u.bcn_ie.buf; -+ -+ -+ DBG_871X("%s, len=%d\n", __FUNCTION__, len); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ _rtw_memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); -+ -+ if((pstapriv->max_num_sta>NUM_STA) || (pstapriv->max_num_sta<=0)) -+ pstapriv->max_num_sta = NUM_STA; -+ -+ -+ if(rtw_check_beacon_data(padapter, pbuf, (len-12-2)) == _SUCCESS)// 12 = param header, 2:no packed -+ ret = 0; -+ else -+ ret = -EINVAL; -+ -+ -+ return ret; -+ -+} -+ -+static int rtw_hostapd_sta_flush(struct net_device *dev) -+{ -+ //_irqL irqL; -+ //_list *phead, *plist; -+ int ret=0; -+ //struct sta_info *psta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ //struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ flush_all_cam_entry(padapter); //clear CAM -+ -+ ret = rtw_sta_flush(padapter); -+ -+ return ret; -+ -+} -+ -+static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) -+{ -+ _irqL irqL; -+ int ret=0; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("rtw_add_sta(aid=%d)=" MAC_FMT "\n", param->u.add_sta.aid, MAC_ARG(param->sta_addr)); -+ -+ if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) -+ { -+ return -EINVAL; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+/* -+ psta = rtw_get_stainfo(pstapriv, param->sta_addr); -+ if(psta) -+ { -+ DBG_871X("rtw_add_sta(), free has been added psta=%p\n", psta); -+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ rtw_free_stainfo(padapter, psta); -+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); -+ -+ psta = NULL; -+ } -+*/ -+ //psta = rtw_alloc_stainfo(pstapriv, param->sta_addr); -+ psta = rtw_get_stainfo(pstapriv, param->sta_addr); -+ if(psta) -+ { -+ int flags = param->u.add_sta.flags; -+ -+ //DBG_871X("rtw_add_sta(), init sta's variables, psta=%p\n", psta); -+ -+ psta->aid = param->u.add_sta.aid;//aid=1~2007 -+ -+ _rtw_memcpy(psta->bssrateset, param->u.add_sta.tx_supp_rates, 16); -+ -+ -+ //check wmm cap. -+ if(WLAN_STA_WME&flags) -+ psta->qos_option = 1; -+ else -+ psta->qos_option = 0; -+ -+ if(pmlmepriv->qospriv.qos_option == 0) -+ psta->qos_option = 0; -+ -+ -+#ifdef CONFIG_80211N_HT -+ //chec 802.11n ht cap. -+ if(WLAN_STA_HT&flags) -+ { -+ psta->htpriv.ht_option = _TRUE; -+ psta->qos_option = 1; -+ _rtw_memcpy((void*)&psta->htpriv.ht_cap, (void*)¶m->u.add_sta.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); -+ } -+ else -+ { -+ psta->htpriv.ht_option = _FALSE; -+ } -+ -+ if(pmlmepriv->htpriv.ht_option == _FALSE) -+ psta->htpriv.ht_option = _FALSE; -+#endif -+ -+ -+ update_sta_info_apmode(padapter, psta); -+ -+ -+ } -+ else -+ { -+ ret = -ENOMEM; -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) -+{ -+ _irqL irqL; -+ int ret=0; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("rtw_del_sta=" MAC_FMT "\n", MAC_ARG(param->sta_addr)); -+ -+ if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) -+ { -+ return -EINVAL; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+ psta = rtw_get_stainfo(pstapriv, param->sta_addr); -+ if(psta) -+ { -+ u8 updated=_FALSE; -+ -+ //DBG_871X("free psta=%p, aid=%d\n", psta, psta->aid); -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) -+ { -+ rtw_list_delete(&psta->asoc_list); -+ pstapriv->asoc_list_cnt--; -+ updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); -+ -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ associated_clients_update(padapter, updated); -+ -+ psta = NULL; -+ -+ } -+ else -+ { -+ DBG_871X("rtw_del_sta(), sta has already been removed or never been added\n"); -+ -+ //ret = -1; -+ } -+ -+ -+ return ret; -+ -+} -+ -+static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param; -+ struct sta_data *psta_data = (struct sta_data *)param_ex->data; -+ -+ DBG_871X("rtw_ioctl_get_sta_info, sta_addr: " MAC_FMT "\n", MAC_ARG(param_ex->sta_addr)); -+ -+ if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) -+ { -+ return -EINVAL; -+ } -+ -+ if (param_ex->sta_addr[0] == 0xff && param_ex->sta_addr[1] == 0xff && -+ param_ex->sta_addr[2] == 0xff && param_ex->sta_addr[3] == 0xff && -+ param_ex->sta_addr[4] == 0xff && param_ex->sta_addr[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+ psta = rtw_get_stainfo(pstapriv, param_ex->sta_addr); -+ if(psta) -+ { -+#if 0 -+ struct { -+ u16 aid; -+ u16 capability; -+ int flags; -+ u32 sta_set; -+ u8 tx_supp_rates[16]; -+ u32 tx_supp_rates_len; -+ struct rtw_ieee80211_ht_cap ht_cap; -+ u64 rx_pkts; -+ u64 rx_bytes; -+ u64 rx_drops; -+ u64 tx_pkts; -+ u64 tx_bytes; -+ u64 tx_drops; -+ } get_sta; -+#endif -+ psta_data->aid = (u16)psta->aid; -+ psta_data->capability = psta->capability; -+ psta_data->flags = psta->flags; -+ -+/* -+ nonerp_set : BIT(0) -+ no_short_slot_time_set : BIT(1) -+ no_short_preamble_set : BIT(2) -+ no_ht_gf_set : BIT(3) -+ no_ht_set : BIT(4) -+ ht_20mhz_set : BIT(5) -+*/ -+ -+ psta_data->sta_set =((psta->nonerp_set) | -+ (psta->no_short_slot_time_set <<1) | -+ (psta->no_short_preamble_set <<2) | -+ (psta->no_ht_gf_set <<3) | -+ (psta->no_ht_set <<4) | -+ (psta->ht_20mhz_set <<5)); -+ -+ psta_data->tx_supp_rates_len = psta->bssratelen; -+ _rtw_memcpy(psta_data->tx_supp_rates, psta->bssrateset, psta->bssratelen); -+ -+ _rtw_memcpy(&psta_data->ht_cap, &psta->htpriv.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); -+ -+ psta_data->rx_pkts = psta->sta_stats.rx_data_pkts; -+ psta_data->rx_bytes = psta->sta_stats.rx_bytes; -+ psta_data->rx_drops = psta->sta_stats.rx_drops; -+ -+ psta_data->tx_pkts = psta->sta_stats.tx_pkts; -+ psta_data->tx_bytes = psta->sta_stats.tx_bytes; -+ psta_data->tx_drops = psta->sta_stats.tx_drops; -+ -+ -+ } -+ else -+ { -+ ret = -1; -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) -+{ -+ int ret=0; -+ struct sta_info *psta = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ DBG_871X("rtw_get_sta_wpaie, sta_addr: " MAC_FMT "\n", MAC_ARG(param->sta_addr)); -+ -+ if(check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != _TRUE) -+ { -+ return -EINVAL; -+ } -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+ psta = rtw_get_stainfo(pstapriv, param->sta_addr); -+ if(psta) -+ { -+ if((psta->wpa_ie[0] == WLAN_EID_RSN) || (psta->wpa_ie[0] == WLAN_EID_GENERIC)) -+ { -+ int wpa_ie_len; -+ int copy_len; -+ -+ wpa_ie_len = psta->wpa_ie[1]; -+ -+ copy_len = ((wpa_ie_len+2) > sizeof(psta->wpa_ie)) ? (sizeof(psta->wpa_ie)):(wpa_ie_len+2); -+ -+ param->u.wpa_ie.len = copy_len; -+ -+ _rtw_memcpy(param->u.wpa_ie.reserved, psta->wpa_ie, copy_len); -+ } -+ else -+ { -+ //ret = -1; -+ DBG_871X("sta's wpa_ie is NONE\n"); -+ } -+ } -+ else -+ { -+ ret = -1; -+ } -+ -+ return ret; -+ -+} -+ -+static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ unsigned char wps_oui[4]={0x0,0x50,0xf2,0x04}; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ int ie_len; -+ -+ DBG_871X("%s, len=%d\n", __FUNCTION__, len); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ ie_len = len-12-2;// 12 = param header, 2:no packed -+ -+ -+ if(pmlmepriv->wps_beacon_ie) -+ { -+ rtw_mfree(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len); -+ pmlmepriv->wps_beacon_ie = NULL; -+ } -+ -+ if(ie_len>0) -+ { -+ pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len); -+ pmlmepriv->wps_beacon_ie_len = ie_len; -+ if ( pmlmepriv->wps_beacon_ie == NULL) { -+ DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ } -+ -+ _rtw_memcpy(pmlmepriv->wps_beacon_ie, param->u.bcn_ie.buf, ie_len); -+ -+ update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, _TRUE); -+ -+ pmlmeext->bstart_bss = _TRUE; -+ -+ } -+ -+ -+ return ret; -+ -+} -+ -+static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ int ie_len; -+ -+ DBG_871X("%s, len=%d\n", __FUNCTION__, len); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ ie_len = len-12-2;// 12 = param header, 2:no packed -+ -+ -+ if(pmlmepriv->wps_probe_resp_ie) -+ { -+ rtw_mfree(pmlmepriv->wps_probe_resp_ie, pmlmepriv->wps_probe_resp_ie_len); -+ pmlmepriv->wps_probe_resp_ie = NULL; -+ } -+ -+ if(ie_len>0) -+ { -+ pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len); -+ pmlmepriv->wps_probe_resp_ie_len = ie_len; -+ if ( pmlmepriv->wps_probe_resp_ie == NULL) { -+ DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ } -+ _rtw_memcpy(pmlmepriv->wps_probe_resp_ie, param->u.bcn_ie.buf, ie_len); -+ } -+ -+ -+ return ret; -+ -+} -+ -+static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ int ie_len; -+ -+ DBG_871X("%s, len=%d\n", __FUNCTION__, len); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ ie_len = len-12-2;// 12 = param header, 2:no packed -+ -+ -+ if(pmlmepriv->wps_assoc_resp_ie) -+ { -+ rtw_mfree(pmlmepriv->wps_assoc_resp_ie, pmlmepriv->wps_assoc_resp_ie_len); -+ pmlmepriv->wps_assoc_resp_ie = NULL; -+ } -+ -+ if(ie_len>0) -+ { -+ pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len); -+ pmlmepriv->wps_assoc_resp_ie_len = ie_len; -+ if ( pmlmepriv->wps_assoc_resp_ie == NULL) { -+ DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ return -EINVAL; -+ } -+ -+ _rtw_memcpy(pmlmepriv->wps_assoc_resp_ie, param->u.bcn_ie.buf, ie_len); -+ } -+ -+ -+ return ret; -+ -+} -+ -+static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *mlmepriv = &(adapter->mlmepriv); -+ struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv); -+ struct mlme_ext_info *mlmeinfo = &(mlmeext->mlmext_info); -+ int ie_len; -+ u8 *ssid_ie; -+ char ssid[NDIS_802_11_LENGTH_SSID + 1]; -+ sint ssid_len; -+ u8 ignore_broadcast_ssid; -+ -+ if(check_fwstate(mlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EPERM; -+ -+ if (param->u.bcn_ie.reserved[0] != 0xea) -+ return -EINVAL; -+ -+ mlmeinfo->hidden_ssid_mode = ignore_broadcast_ssid = param->u.bcn_ie.reserved[1]; -+ -+ ie_len = len-12-2;// 12 = param header, 2:no packed -+ ssid_ie = rtw_get_ie(param->u.bcn_ie.buf, WLAN_EID_SSID, &ssid_len, ie_len); -+ -+ if (ssid_ie && ssid_len) { -+ WLAN_BSSID_EX *pbss_network = &mlmepriv->cur_network.network; -+ WLAN_BSSID_EX *pbss_network_ext = &mlmeinfo->network; -+ -+ _rtw_memcpy(ssid, ssid_ie+2, ssid_len); -+ ssid[ssid_len>NDIS_802_11_LENGTH_SSID?NDIS_802_11_LENGTH_SSID:ssid_len] = 0x0; -+ -+ if(0) -+ DBG_871X(FUNC_ADPT_FMT" ssid:(%s,%d), from ie:(%s,%d), (%s,%d)\n", FUNC_ADPT_ARG(adapter), -+ ssid, ssid_len, -+ pbss_network->Ssid.Ssid, pbss_network->Ssid.SsidLength, -+ pbss_network_ext->Ssid.Ssid, pbss_network_ext->Ssid.SsidLength); -+ -+ _rtw_memcpy(pbss_network->Ssid.Ssid, (void *)ssid, ssid_len); -+ pbss_network->Ssid.SsidLength = ssid_len; -+ _rtw_memcpy(pbss_network_ext->Ssid.Ssid, (void *)ssid, ssid_len); -+ pbss_network_ext->Ssid.SsidLength = ssid_len; -+ -+ if(0) -+ DBG_871X(FUNC_ADPT_FMT" after ssid:(%s,%d), (%s,%d)\n", FUNC_ADPT_ARG(adapter), -+ pbss_network->Ssid.Ssid, pbss_network->Ssid.SsidLength, -+ pbss_network_ext->Ssid.Ssid, pbss_network_ext->Ssid.SsidLength); -+ } -+ -+ DBG_871X(FUNC_ADPT_FMT" ignore_broadcast_ssid:%d, %s,%d\n", FUNC_ADPT_ARG(adapter), -+ ignore_broadcast_ssid, ssid, ssid_len); -+ -+ return ret; -+} -+ -+static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+ ret = rtw_acl_remove_sta(padapter, param->sta_addr); -+ -+ return ret; -+ -+} -+ -+static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && -+ param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && -+ param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) -+ { -+ return -EINVAL; -+ } -+ -+ ret = rtw_acl_add_sta(padapter, param->sta_addr); -+ -+ return ret; -+ -+} -+ -+static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param *param, int len) -+{ -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) -+ return -EINVAL; -+ -+ rtw_set_macaddr_acl(padapter, param->u.mlme.command); -+ -+ return ret; -+} -+ -+static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) -+{ -+ struct ieee_param *param; -+ int ret=0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ /* -+ * this function is expect to call in master mode, which allows no power saving -+ * so, we just check hw_init_completed instead of call rfpwrstate_check() -+ */ -+ -+ if (padapter->hw_init_completed==_FALSE){ -+ ret = -EPERM; -+ goto out; -+ } -+ -+ -+ //if (p->length < sizeof(struct ieee_param) || !p->pointer){ -+ if(!p->pointer){ -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ param = (struct ieee_param *)rtw_malloc(p->length); -+ if (param == NULL) -+ { -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ if (copy_from_user(param, p->pointer, p->length)) -+ { -+ rtw_mfree((u8*)param, p->length); -+ ret = -EFAULT; -+ goto out; -+ } -+ -+ //DBG_871X("%s, cmd=%d\n", __FUNCTION__, param->cmd); -+ -+ switch (param->cmd) -+ { -+ case RTL871X_HOSTAPD_FLUSH: -+ -+ ret = rtw_hostapd_sta_flush(dev); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_ADD_STA: -+ -+ ret = rtw_add_sta(dev, param); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_REMOVE_STA: -+ -+ ret = rtw_del_sta(dev, param); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_SET_BEACON: -+ -+ ret = rtw_set_beacon(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_SET_ENCRYPTION: -+ -+ ret = rtw_set_encryption(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_GET_WPAIE_STA: -+ -+ ret = rtw_get_sta_wpaie(dev, param); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_SET_WPS_BEACON: -+ -+ ret = rtw_set_wps_beacon(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_SET_WPS_PROBE_RESP: -+ -+ ret = rtw_set_wps_probe_resp(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_SET_WPS_ASSOC_RESP: -+ -+ ret = rtw_set_wps_assoc_resp(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_SET_HIDDEN_SSID: -+ -+ ret = rtw_set_hidden_ssid(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_GET_INFO_STA: -+ -+ ret = rtw_ioctl_get_sta_data(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_SET_MACADDR_ACL: -+ -+ ret = rtw_ioctl_set_macaddr_acl(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_ACL_ADD_STA: -+ -+ ret = rtw_ioctl_acl_add_sta(dev, param, p->length); -+ -+ break; -+ -+ case RTL871X_HOSTAPD_ACL_REMOVE_STA: -+ -+ ret = rtw_ioctl_acl_remove_sta(dev, param, p->length); -+ -+ break; -+ -+ default: -+ DBG_871X("Unknown hostapd request: %d\n", param->cmd); -+ ret = -EOPNOTSUPP; -+ break; -+ -+ } -+ -+ if (ret == 0 && copy_to_user(p->pointer, param, p->length)) -+ ret = -EFAULT; -+ -+ -+ rtw_mfree((u8 *)param, p->length); -+ -+out: -+ -+ return ret; -+ -+} -+#endif -+ -+#include -+static int rtw_wx_set_priv(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *awrq, -+ char *extra) -+{ -+ -+#ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV -+ char *ext_dbg; -+#endif -+ -+ int ret = 0; -+ int len = 0; -+ char *ext; -+ int i; -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_point *dwrq = (struct iw_point*)awrq; -+ -+ //RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, ("+rtw_wx_set_priv\n")); -+ if(dwrq->length == 0) -+ return -EFAULT; -+ len = dwrq->length; -+ if (!(ext = rtw_vmalloc(len))) -+ return -ENOMEM; -+ -+ if (copy_from_user(ext, dwrq->pointer, len)) { -+ rtw_vmfree(ext, len); -+ return -EFAULT; -+ } -+ -+ -+ //RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, -+ // ("rtw_wx_set_priv: %s req=%s\n", -+ // dev->name, ext)); -+ -+ #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV -+ if (!(ext_dbg = rtw_vmalloc(len))) -+ { -+ rtw_vmfree(ext, len); -+ return -ENOMEM; -+ } -+ -+ _rtw_memcpy(ext_dbg, ext, len); -+ #endif -+ -+ //added for wps2.0 @20110524 -+ if(dwrq->flags == 0x8766 && len > 8) -+ { -+ u32 cp_sz; -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ u8 *probereq_wpsie = ext; -+ int probereq_wpsie_len = len; -+ u8 wps_oui[4]={0x0,0x50,0xf2,0x04}; -+ -+ if((_VENDOR_SPECIFIC_IE_ == probereq_wpsie[0]) && -+ (_rtw_memcmp(&probereq_wpsie[2], wps_oui, 4) ==_TRUE)) -+ { -+ cp_sz = probereq_wpsie_len>MAX_WPS_IE_LEN ? MAX_WPS_IE_LEN:probereq_wpsie_len; -+ -+ //_rtw_memcpy(pmlmepriv->probereq_wpsie, probereq_wpsie, cp_sz); -+ //pmlmepriv->probereq_wpsie_len = cp_sz; -+ -+ printk("probe_req_wps_ielen=%d\n", cp_sz); -+ -+ if(pmlmepriv->wps_probe_req_ie) -+ { -+ u32 free_len = pmlmepriv->wps_probe_req_ie_len; -+ pmlmepriv->wps_probe_req_ie_len = 0; -+ rtw_mfree(pmlmepriv->wps_probe_req_ie, free_len); -+ pmlmepriv->wps_probe_req_ie = NULL; -+ } -+ -+ pmlmepriv->wps_probe_req_ie = rtw_malloc(cp_sz); -+ if ( pmlmepriv->wps_probe_req_ie == NULL) { -+ printk("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); -+ ret = -EINVAL; -+ goto FREE_EXT; -+ -+ } -+ -+ _rtw_memcpy(pmlmepriv->wps_probe_req_ie, probereq_wpsie, cp_sz); -+ pmlmepriv->wps_probe_req_ie_len = cp_sz; -+ -+ } -+ -+ goto FREE_EXT; -+ -+ } -+ -+ if( len >= WEXT_CSCAN_HEADER_SIZE -+ && _rtw_memcmp(ext, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == _TRUE -+ ){ -+ ret = rtw_wx_set_scan(dev, info, awrq, ext); -+ goto FREE_EXT; -+ } -+ -+#ifdef CONFIG_ANDROID -+ //DBG_871X("rtw_wx_set_priv: %s req=%s\n", dev->name, ext); -+ -+ i = rtw_android_cmdstr_to_num(ext); -+ -+ switch(i) { -+ case ANDROID_WIFI_CMD_START : -+ indicate_wx_custom_event(padapter, "START"); -+ break; -+ case ANDROID_WIFI_CMD_STOP : -+ indicate_wx_custom_event(padapter, "STOP"); -+ break; -+ case ANDROID_WIFI_CMD_RSSI : -+ { -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct wlan_network *pcur_network = &pmlmepriv->cur_network; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { -+ sprintf(ext, "%s rssi %d", pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi); -+ } else { -+ sprintf(ext, "OK"); -+ } -+ } -+ break; -+ case ANDROID_WIFI_CMD_LINKSPEED : -+ { -+ u16 mbps = rtw_get_cur_max_rate(padapter)/10; -+ sprintf(ext, "LINKSPEED %d", mbps); -+ } -+ break; -+ case ANDROID_WIFI_CMD_MACADDR : -+ sprintf(ext, "MACADDR = " MAC_FMT, MAC_ARG(dev->dev_addr)); -+ break; -+ case ANDROID_WIFI_CMD_SCAN_ACTIVE : -+ { -+ //rtw_set_scan_mode(padapter, SCAN_ACTIVE); -+ sprintf(ext, "OK"); -+ } -+ break; -+ case ANDROID_WIFI_CMD_SCAN_PASSIVE : -+ { -+ //rtw_set_scan_mode(padapter, SCAN_PASSIVE); -+ sprintf(ext, "OK"); -+ } -+ break; -+ -+ case ANDROID_WIFI_CMD_COUNTRY : -+ { -+ char country_code[10]; -+ sscanf(ext, "%*s %s", country_code); -+ rtw_set_country(padapter, country_code); -+ sprintf(ext, "OK"); -+ } -+ break; -+ default : -+ #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV -+ DBG_871X("%s: %s unknowned req=%s\n", __FUNCTION__, -+ dev->name, ext_dbg); -+ #endif -+ -+ sprintf(ext, "OK"); -+ -+ } -+ -+ if (copy_to_user(dwrq->pointer, ext, min(dwrq->length, (u16)(strlen(ext)+1)) ) ) -+ ret = -EFAULT; -+ -+ #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV -+ DBG_871X("%s: %s req=%s rep=%s dwrq->length=%d, strlen(ext)+1=%d\n", __FUNCTION__, -+ dev->name, ext_dbg ,ext, dwrq->length, (u16)(strlen(ext)+1)); -+ #endif -+#endif //end of CONFIG_ANDROID -+ -+ -+FREE_EXT: -+ -+ rtw_vmfree(ext, len); -+ #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV -+ rtw_vmfree(ext_dbg, len); -+ #endif -+ -+ //DBG_871X("rtw_wx_set_priv: (SIOCSIWPRIV) %s ret=%d\n", -+ // dev->name, ret); -+ -+ return ret; -+ -+} -+ -+static int rtw_mp_efuse_get(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wdata, char *extra) -+{ -+ struct iw_point *wrqu = (struct iw_point *)wdata; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ struct mp_priv *pmp_priv; -+ -+ int i,j =0; -+ u8 data[EFUSE_MAP_SIZE]; -+ u8 rawdata[EFUSE_MAX_SIZE]; -+ u16 mapLen=0; -+ char *pch, *ptmp, *token, *tmp[3]={0x00,0x00,0x00}; -+ u16 addr = 0, cnts = 0, max_available_size = 0,raw_cursize = 0 ,raw_maxsize = 0; -+ -+ _rtw_memset(data, '\0', sizeof(data)); -+ _rtw_memset(rawdata, '\0', sizeof(rawdata)); -+ -+ if (copy_from_user(extra, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ pch = extra; -+ DBG_871X("%s: in=%s\n", __func__, extra); -+ -+ i=0; -+ //mac 16 "00e04c871200" rmap,00,2 -+ while ( (token = strsep (&pch,",") )!=NULL ) -+ { -+ if(i>2) break; -+ tmp[i] = token; -+ i++; -+ } -+ -+ if ( strcmp(tmp[0],"realmap") == 0 ) { -+ -+ DBG_871X("strcmp OK = %s \n" ,tmp[0]); -+ -+ mapLen = EFUSE_MAP_SIZE; -+ -+ if (rtw_efuse_map_read(padapter, 0, mapLen, data) == _SUCCESS){ -+ DBG_871X("\t rtw_efuse_map_read \n"); -+ }else { -+ DBG_871X("\t rtw_efuse_map_read : Fail \n"); -+ return -EFAULT; -+ } -+ _rtw_memset(extra, '\0', sizeof(extra)); -+ DBG_871X("\tOFFSET\tVALUE(hex)\n"); -+ sprintf(extra, "%s \n", extra); -+ for ( i = 0; i < EFUSE_MAP_SIZE; i += 16 ) -+ { -+ DBG_871X("\t0x%02x\t", i); -+ sprintf(extra, "%s \t0x%02x\t", extra,i); -+ for (j = 0; j < 8; j++) -+ { -+ DBG_871X("%02X ", data[i+j]); -+ sprintf(extra, "%s %02X", extra, data[i+j]); -+ } -+ DBG_871X("\t"); -+ sprintf(extra,"%s\t",extra); -+ for (; j < 16; j++){ -+ DBG_871X("%02X ", data[i+j]); -+ sprintf(extra, "%s %02X", extra, data[i+j]); -+ } -+ DBG_871X("\n"); -+ sprintf(extra,"%s\n",extra); -+ } -+ DBG_871X("\n"); -+ wrqu->length = strlen(extra); -+ -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"rmap") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ // rmap addr cnts -+ addr = simple_strtoul(tmp[1], &ptmp, 16); -+ -+ DBG_871X("addr = %x \n" ,addr); -+ -+ cnts=simple_strtoul(tmp[2], &ptmp,10); -+ if(cnts==0) return -EINVAL; -+ -+ DBG_871X("cnts = %d \n" ,cnts); -+ //_rtw_memset(extra, '\0', wrqu->data.length); -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ if ((addr + cnts) > max_available_size) { -+ DBG_871X("(addr + cnts parameter error \n"); -+ return -EFAULT; -+ } -+ -+ if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL) -+ { -+ DBG_871X("rtw_efuse_access error \n"); -+ } -+ else{ -+ DBG_871X("rtw_efuse_access ok \n"); -+ } -+ -+ _rtw_memset(extra, '\0', sizeof(extra)); -+ for ( i = 0; i < cnts; i ++) { -+ DBG_871X("0x%02x", data[i]); -+ sprintf(extra, "%s 0x%02X", extra, data[i]); -+ DBG_871X(" "); -+ sprintf(extra,"%s ",extra); -+ } -+ -+ wrqu->length = strlen(extra)+1; -+ -+ DBG_871X("extra = %s ", extra); -+ -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"realraw") == 0 ) { -+ addr=0; -+ mapLen = EFUSE_MAX_SIZE; -+ -+ if (rtw_efuse_access(padapter, _FALSE, addr, mapLen, rawdata) == _FAIL) -+ { -+ DBG_871X("\t rtw_efuse_map_read : Fail \n"); -+ return -EFAULT; -+ } else -+ { -+ DBG_871X("\t rtw_efuse_access raw ok \n"); -+ } -+ -+ _rtw_memset(extra, '\0', sizeof(extra)); -+ for ( i=0; ilength = strlen(extra); -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"mac") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ #ifdef CONFIG_RTL8192C -+ addr = 0x16; -+ cnts = 6; -+ #endif -+ #ifdef CONFIG_RTL8192D -+ addr = 0x19; -+ cnts = 6; -+ #endif -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ if ((addr + mapLen) > max_available_size) { -+ DBG_871X("(addr + cnts parameter error \n"); -+ return -EFAULT; -+ } -+ if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL) -+ { -+ DBG_871X("rtw_efuse_access error \n"); -+ } -+ else{ -+ DBG_871X("rtw_efuse_access ok \n"); -+ } -+ _rtw_memset(extra, '\0', sizeof(extra)); -+ for ( i = 0; i < cnts; i ++) { -+ DBG_871X("0x%02x", data[i]); -+ sprintf(extra, "%s 0x%02X", extra, data[i+j]); -+ DBG_871X(" "); -+ sprintf(extra,"%s ",extra); -+ } -+ wrqu->length = strlen(extra); -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"vidpid") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ #ifdef CONFIG_RTL8192C -+ addr=0x0a; -+ #endif -+ #ifdef CONFIG_RTL8192D -+ addr = 0x0c; -+ #endif -+ cnts = 4; -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ if ((addr + mapLen) > max_available_size) { -+ DBG_871X("(addr + cnts parameter error \n"); -+ return -EFAULT; -+ } -+ if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL) -+ { -+ DBG_871X("rtw_efuse_access error \n"); -+ } -+ else{ -+ DBG_871X("rtw_efuse_access ok \n"); -+ } -+ _rtw_memset(extra, '\0', sizeof(extra)); -+ for ( i = 0; i < cnts; i ++) { -+ DBG_871X("0x%02x", data[i]); -+ sprintf(extra, "%s 0x%02X", extra, data[i+j]); -+ DBG_871X(" "); -+ sprintf(extra,"%s ",extra); -+ } -+ wrqu->length = strlen(extra); -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"ableraw") == 0 ) { -+ efuse_GetCurrentSize(padapter,&raw_cursize); -+ raw_maxsize = efuse_GetMaxSize(padapter); -+ sprintf(extra, "%s : [ available raw size] = %d",extra,raw_maxsize-raw_cursize); -+ wrqu->length = strlen(extra); -+ -+ return 0; -+ }else -+ { -+ sprintf(extra, "%s : Command not found\n",extra); -+ wrqu->length = strlen(extra); -+ return 0; -+ } -+ -+ return 0; -+} -+ -+static int rtw_mp_efuse_set(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wdata, char *extra) -+{ -+ struct iw_point *wrqu = (struct iw_point *)wdata; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ u8 buffer[40]; -+ u32 i,jj,kk; -+ u8 setdata[EFUSE_MAP_SIZE]; -+ u8 setrawdata[EFUSE_MAX_SIZE]; -+ char *pch, *ptmp, *token, *edata,*tmp[3]={0x00,0x00,0x00}; -+ -+ u16 addr = 0, max_available_size = 0; -+ u32 cnts = 0; -+ -+ pch = extra; -+ DBG_871X("%s: in=%s\n", __func__, extra); -+ -+ i=0; -+ while ( (token = strsep (&pch,",") )!=NULL ) -+ { -+ if(i>2) break; -+ tmp[i] = token; -+ i++; -+ } -+ -+ // tmp[0],[1],[2] -+ // wmap,addr,00e04c871200 -+ if ( strcmp(tmp[0],"wmap") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ if ( ! strlen( tmp[2] )/2 > 1 ) return -EFAULT; -+ -+ addr = simple_strtoul( tmp[1], &ptmp, 16 ); -+ addr = addr & 0xFF; -+ DBG_871X("addr = %x \n" ,addr); -+ -+ cnts = strlen( tmp[2] )/2; -+ if ( cnts == 0) return -EFAULT; -+ -+ DBG_871X("cnts = %d \n" ,cnts); -+ DBG_871X("target data = %s \n" ,tmp[2]); -+ -+ for( jj = 0, kk = 0; jj < cnts; jj++, kk += 2 ) -+ { -+ setdata[jj] = key_2char2num( tmp[2][kk], tmp[2][kk+ 1] ); -+ } -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ -+ if ((addr + cnts) > max_available_size) { -+ DBG_871X("parameter error \n"); -+ return -EFAULT; -+ } -+ if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL) { -+ DBG_871X("rtw_efuse_map_write error \n"); -+ return -EFAULT; -+ } else -+ DBG_871X("rtw_efuse_map_write ok \n"); -+ -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"wraw") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ if ( ! strlen( tmp[2] )/2 > 1 ) return -EFAULT; -+ addr = simple_strtoul( tmp[1], &ptmp, 16 ); -+ addr = addr & 0xFF; -+ DBG_871X("addr = %x \n" ,addr); -+ -+ cnts=strlen( tmp[2] )/2; -+ if ( cnts == 0) return -EFAULT; -+ -+ DBG_871X(" cnts = %d \n" ,cnts ); -+ DBG_871X("target data = %s \n" ,tmp[2] ); -+ -+ for( jj = 0, kk = 0; jj < cnts; jj++, kk += 2 ) -+ { -+ setrawdata[jj] = key_2char2num( tmp[2][kk], tmp[2][kk+ 1] ); -+ } -+ -+ if ( rtw_efuse_access( padapter, _TRUE, addr, cnts, setrawdata ) == _FAIL ){ -+ DBG_871X("\t rtw_efuse_map_read : Fail \n"); -+ return -EFAULT; -+ } else -+ DBG_871X("\t rtw_efuse_access raw ok \n"); -+ -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"mac") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ //mac,00e04c871200 -+ #ifdef CONFIG_RTL8192C -+ addr = 0x16; -+ #endif -+ #ifdef CONFIG_RTL8192D -+ addr = 0x19; -+ #endif -+ cnts = strlen( tmp[1] )/2; -+ if ( cnts == 0) return -EFAULT; -+ if ( cnts > 6 ){ -+ DBG_871X("error data for mac addr = %s \n" ,tmp[1]); -+ return -EFAULT; -+ } -+ -+ DBG_871X("target data = %s \n" ,tmp[1]); -+ -+ for( jj = 0, kk = 0; jj < cnts; jj++, kk += 2 ) -+ { -+ setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+ 1]); -+ } -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ -+ if ((addr + cnts) > max_available_size) { -+ DBG_871X("parameter error \n"); -+ return -EFAULT; -+ } -+ if ( rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL ) { -+ DBG_871X("rtw_efuse_map_write error \n"); -+ return -EFAULT; -+ } else -+ DBG_871X("rtw_efuse_map_write ok \n"); -+ -+ return 0; -+ } -+ else if ( strcmp(tmp[0],"vidpid") == 0 ) { -+ if ( tmp[1]==NULL || tmp[2]==NULL ) return -EINVAL; -+ // pidvid,da0b7881 -+ #ifdef CONFIG_RTL8192C -+ addr=0x0a; -+ #endif -+ #ifdef CONFIG_RTL8192D -+ addr = 0x0c; -+ #endif -+ -+ cnts=strlen( tmp[1] )/2; -+ if ( cnts == 0) return -EFAULT; -+ DBG_871X("target data = %s \n" ,tmp[1]); -+ -+ for( jj = 0, kk = 0; jj < cnts; jj++, kk += 2 ) -+ { -+ setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+ 1]); -+ } -+ -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ -+ if ((addr + cnts) > max_available_size) { -+ DBG_871X("parameter error \n"); -+ return -EFAULT; -+ } -+ -+ if ( rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL ) { -+ DBG_871X("rtw_efuse_map_write error \n"); -+ return -EFAULT; -+ } else -+ DBG_871X("rtw_efuse_map_write ok \n"); -+ -+ return 0; -+ } -+ else{ -+ DBG_871X("Command not found\n"); -+ return 0; -+ } -+ -+ return 0; -+} -+ -+ -+ -+#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT) -+ -+/* -+ * Input Format: %s,%d,%d -+ * %s is width, could be -+ * "b" for 1 byte -+ * "w" for WORD (2 bytes) -+ * "dw" for DWORD (4 bytes) -+ * 1st %d is address(offset) -+ * 2st %d is data to write -+ */ -+static int rtw_mp_write_reg(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ char *pch, *pnext, *ptmp; -+ char *width_str; -+ char width; -+ u32 addr, data; -+ int ret; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ pch = extra; -+ pnext = strpbrk(pch, " ,.-"); -+ if (pnext == NULL) return -EINVAL; -+ *pnext = 0; -+ width_str = pch; -+ -+ pch = pnext + 1; -+ pnext = strpbrk(pch, " ,.-"); -+ if (pnext == NULL) return -EINVAL; -+ *pnext = 0; -+ addr = simple_strtoul(pch, &ptmp, 16); -+ if (addr > 0x3FFF) return -EINVAL; -+ -+ pch = pnext + 1; -+ if ((pch - extra) >= wrqu->length) return -EINVAL; -+ data = simple_strtoul(pch, &ptmp, 16); -+ -+ ret = 0; -+ width = width_str[0]; -+ switch (width) { -+ case 'b': -+ // 1 byte -+ if (data > 0xFF) { -+ ret = -EINVAL; -+ break; -+ } -+ rtw_write8(padapter, addr, data); -+ break; -+ case 'w': -+ // 2 bytes -+ if (data > 0xFFFF) { -+ ret = -EINVAL; -+ break; -+ } -+ rtw_write16(padapter, addr, data); -+ break; -+ case 'd': -+ // 4 bytes -+ rtw_write32(padapter, addr, data); -+ break; -+ default: -+ ret = -EINVAL; -+ break; -+ } -+ -+ return ret; -+} -+ -+/* -+ * Input Format: %s,%d -+ * %s is width, could be -+ * "b" for 1 byte -+ * "w" for WORD (2 bytes) -+ * "dw" for DWORD (4 bytes) -+ * %d is address(offset) -+ * -+ * Return: -+ * %d for data readed -+ */ -+static int rtw_mp_read_reg(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ char input[wrqu->length]; -+ char *pch, *pnext, *ptmp; -+ char *width_str; -+ char width; -+ char data[20],tmp[20]; -+ u32 addr; -+ //u32 *data = (u32*)extra; -+ u32 ret, i=0, j=0, strtout=0; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (wrqu->length > 128) return -EFAULT; -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ _rtw_memset(data, 0, 20); -+ _rtw_memset(tmp, 0, 20); -+ _rtw_memset(extra, 0, wrqu->length); -+ -+ pch = input; -+ pnext = strpbrk(pch, " ,.-"); -+ if (pnext == NULL) return -EINVAL; -+ *pnext = 0; -+ width_str = pch; -+ -+ pch = pnext + 1; -+ if ((pch - input) >= wrqu->length) return -EINVAL; -+ -+ addr = simple_strtoul(pch, &ptmp, 16); -+ if (addr > 0x3FFF) return -EINVAL; -+ -+ ret = 0; -+ width = width_str[0]; -+ switch (width) { -+ case 'b': -+ // 1 byte -+ // *(u8*)data = rtw_read8(padapter, addr); -+ sprintf(extra, "%d\n", rtw_read8(padapter, addr)); -+ wrqu->length = strlen(extra); -+ break; -+ case 'w': -+ // 2 bytes -+ //*(u16*)data = rtw_read16(padapter, addr); -+ sprintf(data, "%04d\n", rtw_read16(padapter, addr)); -+ for( i=0 ; i <= strlen(data) ; i++) -+ { -+ if( i%2==0 ) -+ { -+ tmp[j]=' '; -+ j++; -+ } -+ if ( data[i] != '\0' ) -+ tmp[j] = data[i]; -+ -+ j++; -+ } -+ pch = tmp; -+ DBG_871X("pch=%s",pch); -+ -+ while( *pch != '\0' ) -+ { -+ pnext = strpbrk(pch, " "); -+ pnext++; -+ if ( *pnext != '\0' ) -+ { -+ strtout = simple_strtoul (pnext , &ptmp, 16); -+ sprintf( extra, "%s %d" ,extra ,strtout ); -+ } -+ else{ -+ break; -+ } -+ pch = pnext; -+ } -+ wrqu->length = 6; -+ break; -+ case 'd': -+ // 4 bytes -+ //*data = rtw_read32(padapter, addr); -+ sprintf(data, "%08x", rtw_read32(padapter, addr)); -+ //add read data format blank -+ for( i=0 ; i <= strlen(data) ; i++) -+ { -+ if( i%2==0 ) -+ { -+ tmp[j]=' '; -+ j++; -+ } -+ tmp[j] = data[i]; -+ j++; -+ } -+ pch = tmp; -+ DBG_871X("pch=%s",pch); -+ -+ while( *pch != '\0' ) -+ { -+ pnext = strpbrk(pch, " "); -+ pnext++; -+ if ( *pnext != '\0' ) -+ { -+ strtout = simple_strtoul (pnext , &ptmp, 16); -+ sprintf( extra, "%s %d" ,extra ,strtout ); -+ } -+ else{ -+ break; -+ } -+ pch = pnext; -+ } -+ wrqu->length = strlen(extra); -+ break; -+ -+ default: -+ wrqu->length = 0; -+ ret = -EINVAL; -+ break; -+ -+ } -+ -+ return ret; -+} -+ -+/* -+ * Input Format: %d,%x,%x -+ * %d is RF path, should be smaller than MAX_RF_PATH_NUMS -+ * 1st %x is address(offset) -+ * 2st %x is data to write -+ */ -+ static int rtw_mp_write_rf(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+/*static int rtw_mp_write_rf(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+*/ -+ u32 path, addr, data; -+ int ret; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ ret = sscanf(extra, "%d,%x,%x", &path, &addr, &data); -+ if (ret < 3) return -EINVAL; -+ -+ if (path >= MAX_RF_PATH_NUMS) return -EINVAL; -+ if (addr > 0xFF) return -EINVAL; -+ if (data > 0xFFFFF) return -EINVAL; -+ _rtw_memset(extra, 0, wrqu->length); -+ -+ write_rfreg(padapter, path, addr, data); -+ -+ sprintf(extra, "write_rf completed \n"); -+ -+ return 0; -+} -+ -+/* -+ * Input Format: %d,%x -+ * %d is RF path, should be smaller than MAX_RF_PATH_NUMS -+ * %x is address(offset) -+ * -+ * Return: -+ * %d for data readed -+ */ -+static int rtw_mp_read_rf(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ char input[wrqu->length]; -+ char *pch, *pnext, *ptmp; -+ char data[20],tmp[20]; -+ //u32 *data = (u32*)extra; -+ u32 path, addr; -+ u32 ret,i=0 ,j=0,strtou=0; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ if (wrqu->length > 128) return -EFAULT; -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ ret = sscanf(input, "%d,%x", &path, &addr); -+ if (ret < 2) return -EINVAL; -+ -+ if (path >= MAX_RF_PATH_NUMS) return -EINVAL; -+ if (addr > 0xFF) return -EINVAL; -+ -+ _rtw_memset(extra, 0, wrqu->length); -+ -+ //*data = read_rfreg(padapter, path, addr); -+ sprintf(data, "%08x", read_rfreg(padapter, path, addr)); -+ //add read data format blank -+ for( i=0 ; i <= strlen(data) ; i++) -+ { -+ if( i%2==0 ) -+ { -+ tmp[j]=' '; -+ j++; -+ } -+ tmp[j] = data[i]; -+ j++; -+ } -+ pch = tmp; -+ DBG_871X("pch=%s",pch); -+ -+ while( *pch != '\0' ) -+ { -+ pnext = strpbrk(pch, " "); -+ pnext++; -+ if ( *pnext != '\0' ) -+ { -+ strtou = simple_strtoul (pnext , &ptmp, 16); -+ sprintf( extra, "%s %d" ,extra ,strtou ); -+ } -+ else{ -+ break; -+ } -+ pch = pnext; -+ } -+ wrqu->length = strlen(extra); -+ -+ return 0; -+} -+ -+static int rtw_mp_start(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u8 val8; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ if (padapter->registrypriv.mp_mode == 0) -+ return -EPERM; -+ -+ if (padapter->mppriv.mode == MP_OFF) { -+ if (mp_start_test(padapter) == _FAIL) -+ return -EPERM; -+ padapter->mppriv.mode = MP_ON; -+ } -+ -+ return 0; -+} -+ -+static int rtw_mp_stop(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ if (padapter->mppriv.mode != MP_OFF) { -+ mp_stop_test(padapter); -+ padapter->mppriv.mode = MP_OFF; -+ } -+ -+ return 0; -+} -+ -+extern int wifirate2_ratetbl_inx(unsigned char rate); -+ -+static int rtw_mp_rate(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u32 rate = MPT_RATE_1M; -+ u8 input[wrqu->length]; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ rate = rtw_atoi(input); -+ sprintf( extra, "Set data rate to %d" , rate ); -+ -+ if(rate <= 0x7f) -+ rate = wifirate2_ratetbl_inx( (u8)rate); -+ else -+ rate =(rate-0x80+MPT_RATE_MCS0); -+ -+ //DBG_871X("%s: rate=%d\n", __func__, rate); -+ -+ if (rate >= MPT_RATE_LAST ) -+ return -EINVAL; -+ -+ padapter->mppriv.rateidx = rate; -+ Hal_SetDataRate(padapter); -+ -+ wrqu->length = strlen(extra) + 1; -+ return 0; -+} -+ -+static int rtw_mp_channel(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ u8 input[wrqu->length]; -+ u32 channel = 1; -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ channel = rtw_atoi(input); -+ //DBG_871X("%s: channel=%d\n", __func__, channel); -+ sprintf( extra, "Change channel %d to channel %d", padapter->mppriv.channel , channel ); -+ -+ padapter->mppriv.channel = channel; -+ Hal_SetChannel(padapter); -+ -+ wrqu->length = strlen(extra) + 1; -+ return 0; -+} -+ -+static int rtw_mp_bandwidth(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u32 bandwidth=0, sg=0; -+ //u8 buffer[40]; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ //if (copy_from_user(buffer, (void*)wrqu->data.pointer, wrqu->data.length)) -+ // return -EFAULT; -+ -+ //DBG_871X("%s:iwpriv in=%s\n", __func__, extra); -+ -+ sscanf(extra, "40M=%d,shortGI=%d", &bandwidth, &sg); -+ -+ if (bandwidth != HT_CHANNEL_WIDTH_40) -+ bandwidth = HT_CHANNEL_WIDTH_20; -+ -+ //DBG_871X("%s: bw=%d sg=%d \n", __func__, bandwidth , sg); -+ -+ padapter->mppriv.bandwidth = (u8)bandwidth; -+ padapter->mppriv.preamble = sg; -+ -+ SetBandwidth(padapter); -+ -+ return 0; -+} -+ -+static int rtw_mp_txpower(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u32 idx_a=0,idx_b=0; -+ u8 input[wrqu->length]; -+ -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ sscanf(input,"patha=%d,pathb=%d",&idx_a,&idx_b); -+ //DBG_871X("%s: tx_pwr_idx_a=%x b=%x\n", __func__, idx_a, idx_b); -+ -+ sprintf( extra, "Set power level path_A:%d path_B:%d", idx_a , idx_b ); -+ padapter->mppriv.txpoweridx = (u8)idx_a; -+ padapter->mppriv.txpoweridx_b = (u8)idx_b; -+ -+ Hal_SetAntennaPathPower(padapter); -+ -+ wrqu->length = strlen(extra) + 1; -+ return 0; -+} -+ -+static int rtw_mp_ant_tx(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u8 i; -+ u8 input[wrqu->length]; -+ u16 antenna = 0; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ //DBG_871X("%s: input=%s\n", __func__, input); -+ -+ sprintf( extra, "switch Tx antenna to %s", input ); -+ -+ for (i=0; i < strlen(input); i++) -+ { -+ switch(input[i]) -+ { -+ case 'a' : -+ antenna|=ANTENNA_A; -+ break; -+ case 'b': -+ antenna|=ANTENNA_B; -+ break; -+ } -+ } -+ //antenna |= BIT(extra[i]-'a'); -+ //DBG_871X("%s: antenna=0x%x\n", __func__, antenna); -+ padapter->mppriv.antenna_tx = antenna; -+ //DBG_871X("%s:mppriv.antenna_rx=%d\n", __func__, padapter->mppriv.antenna_tx); -+ -+ Hal_SetAntenna(padapter); -+ -+ wrqu->length = strlen(extra) + 1; -+ return 0; -+} -+ -+static int rtw_mp_ant_rx(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u8 i; -+ u16 antenna = 0; -+ u8 input[wrqu->length]; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ //DBG_871X("%s: input=%s\n", __func__, input); -+ _rtw_memset(extra, 0, wrqu->length); -+ -+ sprintf( extra, "switch Rx antenna to %s", input ); -+ -+ for (i=0; i < strlen(input); i++) { -+ -+ switch( input[i] ) -+ { -+ case 'a' : -+ antenna|=ANTENNA_A; -+ break; -+ case 'b': -+ antenna|=ANTENNA_B; -+ break; -+ } -+ } -+ -+ //DBG_871X("%s: antenna=0x%x\n", __func__, antenna); -+ padapter->mppriv.antenna_rx = antenna; -+ //DBG_871X("%s:mppriv.antenna_rx=%d\n", __func__, padapter->mppriv.antenna_rx); -+ Hal_SetAntenna(padapter); -+ wrqu->length = strlen(extra); -+ -+ return 0; -+} -+ -+static int rtw_mp_ctx(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u32 pkTx = 1, countPkTx = 1, cotuTx = 1, CarrSprTx = 1, scTx = 1, sgleTx = 1, stop = 1; -+ u32 bStartTest = 1; -+ u32 count = 0; -+ struct mp_priv *pmp_priv; -+ struct pkt_attrib *pattrib; -+ -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ pmp_priv = &padapter->mppriv; -+ -+ if (copy_from_user(extra, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ DBG_871X("%s: in=%s\n", __func__, extra); -+ -+ countPkTx = strncmp(extra, "count=", 5); // strncmp TRUE is 0 -+ cotuTx = strncmp(extra, "background", 20); -+ CarrSprTx = strncmp(extra, "background,cs", 20); -+ scTx = strncmp(extra, "background,sc", 20); -+ sgleTx = strncmp(extra, "background,stone", 20); -+ pkTx = strncmp(extra, "background,pkt", 20); -+ stop = strncmp(extra, "stop", 5); -+ sscanf(extra, "count=%d,pkt", &count); -+ -+ //DBG_871X("%s: count=%d countPkTx=%d cotuTx=%d CarrSprTx=%d scTx=%d sgleTx=%d pkTx=%d stop=%d\n", __func__, count, countPkTx, cotuTx, CarrSprTx, pkTx, sgleTx, scTx, stop); -+ _rtw_memset(extra, '\0', sizeof(extra)); -+ -+ if (stop == 0) { -+ bStartTest = 0; // To set Stop -+ pmp_priv->tx.stop = 1; -+ sprintf( extra, "Stop continuous Tx"); -+ } else { -+ bStartTest = 1; -+ if (pmp_priv->mode != MP_ON) { -+ if (pmp_priv->tx.stop != 1) { -+ DBG_871X("%s: MP_MODE != ON %d\n", __func__, pmp_priv->mode); -+ return -EFAULT; -+ } -+ } -+ } -+ -+ if (pkTx == 0 || countPkTx == 0) -+ pmp_priv->mode = MP_PACKET_TX; -+ if (sgleTx == 0) -+ pmp_priv->mode = MP_SINGLE_TONE_TX; -+ if (cotuTx == 0) -+ pmp_priv->mode = MP_CONTINUOUS_TX; -+ if (CarrSprTx == 0) -+ pmp_priv->mode = MP_CARRIER_SUPPRISSION_TX; -+ if (scTx == 0) -+ pmp_priv->mode = MP_SINGLE_CARRIER_TX; -+ -+ switch (pmp_priv->mode) -+ { -+ case MP_PACKET_TX: -+ -+ //DBG_871X("%s:pkTx %d\n", __func__,bStartTest); -+ if (bStartTest == 0) -+ { -+ pmp_priv->tx.stop = 1; -+ pmp_priv->mode = MP_ON; -+ sprintf( extra, "Stop continuous Tx"); -+ } -+ else if (pmp_priv->tx.stop == 1) -+ { -+ sprintf( extra, "Start continuous DA=ffffffffffff len=1500 count=%u,\n",count); -+ //DBG_871X("%s:countPkTx %d\n", __func__,count); -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx.count = count; -+ pmp_priv->tx.payload = 2; -+ pattrib = &pmp_priv->tx.attrib; -+ pattrib->pktlen = 1460; -+ _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN); -+ SetPacketTx(padapter); -+ } -+ else { -+ //DBG_871X("%s: pkTx not stop\n", __func__); -+ return -EFAULT; -+ } -+ wrqu->length = strlen(extra); -+ return 0; -+ -+ case MP_SINGLE_TONE_TX: -+ //DBG_871X("%s: sgleTx %d \n", __func__, bStartTest); -+ if (bStartTest != 0){ -+ sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); -+ -+ } -+ Hal_SetSingleToneTx(padapter, (u8)bStartTest); -+ break; -+ -+ case MP_CONTINUOUS_TX: -+ DBG_871X("%s: cotuTx %d\n", __func__, bStartTest); -+ if (bStartTest != 0){ -+ sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); -+ } -+ Hal_SetContinuousTx(padapter, (u8)bStartTest); -+ break; -+ -+ case MP_CARRIER_SUPPRISSION_TX: -+ //DBG_871X("%s: CarrSprTx %d\n", __func__, bStartTest); -+ if (bStartTest != 0){ -+ if( pmp_priv->rateidx <= MPT_RATE_11M ) -+ { -+ sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); -+ }else -+ sprintf( extra, "Specify carrier suppression but not CCK rate"); -+ } -+ Hal_SetCarrierSuppressionTx(padapter, (u8)bStartTest); -+ break; -+ -+ case MP_SINGLE_CARRIER_TX: -+ //DBG_871X("%s: scTx %d\n", __func__, bStartTest); -+ if (bStartTest != 0){ -+ sprintf( extra, "Start continuous DA=ffffffffffff len=1500 \n infinite=yes."); -+ } -+ Hal_SetSingleCarrierTx(padapter, (u8)bStartTest); -+ break; -+ -+ default: -+ //DBG_871X("%s:No Match MP_MODE\n", __func__); -+ sprintf( extra, "Error! Continuous-Tx is not on-going."); -+ return -EFAULT; -+ } -+ -+ if (bStartTest) { -+ struct mp_priv *pmp_priv = &padapter->mppriv; -+ if (pmp_priv->tx.stop == 0) { -+ pmp_priv->tx.stop = 1; -+ //DBG_871X("%s: pkt tx is running...\n", __func__); -+ rtw_msleep_os(5); -+ } -+ pmp_priv->tx.stop = 0; -+ pmp_priv->tx.count = 1; -+ SetPacketTx(padapter); -+ } else { -+ pmp_priv->mode = MP_ON; -+ } -+ -+ wrqu->length = strlen(extra); -+ return 0; -+} -+ -+static int rtw_mp_arx(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u8 bStartRx=0,bStopRx=0; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ u8 input[wrqu->length]; -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ DBG_871X("%s: %s\n", __func__, input); -+ -+ bStartRx = (strncmp(input, "start", 5)==0)?1:0; // strncmp TRUE is 0 -+ bStopRx = (strncmp(input, "stop", 5)==0)?1:0; // strncmp TRUE is 0 -+ SetPacketRx(padapter, bStartRx); -+ -+ if(bStartRx) -+ { -+ sprintf( extra, "start"); -+ wrqu->length = strlen(extra) + 1; -+ } -+ else if(bStopRx) -+ { -+ sprintf( extra, "Received packet OK:%d CRC error:%d",padapter->mppriv.rx_pktcount, -+ padapter->mppriv.rx_crcerrpktcount); -+ wrqu->length = strlen(extra) + 1; -+ } -+ -+ -+ return 0; -+} -+ -+static int rtw_mp_trx_query(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u32 txok,txfail,rxok,rxfail; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ //if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) -+ // return -EFAULT; -+ -+ txok=padapter->mppriv.tx.sended; -+ txfail=0; -+ rxok = padapter->mppriv.rx_pktcount; -+ rxfail = padapter->mppriv.rx_crcerrpktcount; -+ -+ _rtw_memset(extra, '\0', 128); -+ -+ sprintf(extra, "Tx OK:%d, Tx Fail:%d, Rx OK:%d, CRC error:%d ", txok, txfail,rxok,rxfail); -+ -+ wrqu->length=strlen(extra)+1; -+ -+ return 0; -+} -+ -+static int rtw_mp_pwrtrk(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u8 enable; -+ u32 thermal; -+ s32 ret; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ u8 input[wrqu->length]; -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ _rtw_memset(extra, 0, wrqu->length); -+ -+ enable = 1; -+ if (wrqu->length > 1) { // not empty string -+ if (strncmp(input, "stop", 4) == 0) -+ { -+ enable = 0; -+ sprintf(extra, "mp tx power tracking stop"); -+ } -+ else if (sscanf(input, "ther=%d", &thermal)) { -+ ret = Hal_SetThermalMeter(padapter, (u8)thermal); -+ if (ret == _FAIL) return -EPERM; -+ sprintf(extra, "mp tx power tracking start,target value=%d ok ",thermal); -+ }else { -+ return -EINVAL; -+ } -+ } -+ -+ ret = Hal_SetPowerTracking(padapter, enable); -+ if (ret == _FAIL) return -EPERM; -+ -+ wrqu->length = strlen(extra); -+ -+ return 0; -+} -+ -+static int rtw_mp_psd(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ u8 input[wrqu->length]; -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ strcpy(extra,input); -+ -+ wrqu->length = mp_query_psd(padapter, extra); -+ -+ return 0; -+} -+ -+static int rtw_mp_thermal(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ u8 val; -+ u16 bwrite=1; -+ #ifdef CONFIG_RTL8192C -+ u16 addr=0x78; -+ #endif -+ #ifdef CONFIG_RTL8192D -+ u16 addr=0xc3; -+ #endif -+ u16 cnt=1; -+ u16 max_available_size=0; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (copy_from_user(extra, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ //DBG_871X("print extra %s \n",extra); -+ -+ bwrite = strncmp(extra, "write", 6); // strncmp TRUE is 0 -+ -+ Hal_GetThermalMeter(padapter, &val); -+ -+ if( bwrite == 0 ) -+ { -+ //DBG_871X("to write val:%d",val); -+ EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); -+ if( 2 > max_available_size ) -+ { -+ DBG_871X("no available efuse!\n"); -+ return -EFAULT; -+ } -+ if ( rtw_efuse_map_write(padapter, addr, cnt, &val) == _FAIL ) -+ { -+ DBG_871X("rtw_efuse_map_write error \n"); -+ return -EFAULT; -+ } -+ else -+ { -+ sprintf(extra, " efuse write ok :%d", val); -+ } -+ } -+ else -+ { -+ sprintf(extra, "%d", val); -+ } -+ wrqu->length = strlen(extra); -+ -+ return 0; -+} -+ -+static int rtw_mp_reset_stats(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ struct mp_priv *pmp_priv; -+ struct pkt_attrib *pattrib; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ pmp_priv = &padapter->mppriv; -+ -+ pmp_priv->tx.sended = 0; -+ padapter->mppriv.rx_pktcount = 0; -+ padapter->mppriv.rx_crcerrpktcount = 0; -+ -+ return 0; -+} -+ -+static int rtw_mp_dump(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ struct mp_priv *pmp_priv; -+ struct pkt_attrib *pattrib; -+ u32 value; -+ u8 rf_type,path_nums = 0; -+ u32 i,j=1,path; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ pmp_priv = &padapter->mppriv; -+ -+ -+ //if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) -+ // return -EFAULT; -+ -+ if ( strncmp(extra, "all", 4)==0 ) -+ { -+ DBG_871X("\n======= MAC REG =======\n"); -+ for ( i=0x0;i<0x300;i+=4 ) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+ for( i=0x400;i<0x800;i+=4 ) -+ { -+ if(j%4==1) DBG_871X("0x%02x",i); -+ DBG_871X(" 0x%08x ",rtw_read32(padapter,i)); -+ if((j++)%4 == 0) DBG_871X("\n"); -+ } -+ -+ i,j=1; -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ -+ DBG_871X("\n======= RF REG =======\n"); -+ if(( RF_1T2R == rf_type ) ||( RF_1T1R ==rf_type )) -+ path_nums = 1; -+ else -+ path_nums = 2; -+ -+ for(path=0;pathlength]; -+ u32 valxcap; -+ -+ if (copy_from_user(input, wrqu->pointer, wrqu->length)) -+ return -EFAULT; -+ -+ DBG_871X("%s:iwpriv in=%s\n", __func__, input); -+ -+ sscanf(input, "xcap=%d", &valxcap); -+ -+ if (!IS_HARDWARE_TYPE_8192D(padapter)) -+ return 0; -+#ifdef CONFIG_RTL8192D -+ Hal_ProSetCrystalCap( padapter , valxcap ); -+#endif -+ -+ sprintf( extra, "Set xcap=%d",valxcap ); -+ wrqu->length = strlen(extra) + 1; -+ -+return 0; -+ -+} -+ -+ -+/* update Tx AGC offset */ -+static int rtw_mp_antBdiff(struct net_device *dev, -+ struct iw_request_info *info, -+ struct iw_point *wrqu, char *extra) -+{ -+ -+ -+ // MPT_ProSetTxAGCOffset -+ return 0; -+} -+ -+ -+static int rtw_mp_set(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wdata, char *extra) -+{ -+ struct iw_point *wrqu = (struct iw_point *)wdata; -+ u32 subcmd = wrqu->flags; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ if (padapter == NULL) -+ { -+ return -ENETDOWN; -+ } -+ -+ //_rtw_memset(extra, 0x00, IW_PRIV_SIZE_MASK); -+ -+ if (extra == NULL) -+ { -+ wrqu->length = 0; -+ return -EIO; -+ } -+ -+ switch(subcmd) -+ { -+ case WRITE_REG : -+ rtw_mp_write_reg (dev,info,wrqu,extra); -+ break; -+ -+ case WRITE_RF: -+ rtw_mp_write_rf (dev,info,wrqu,extra); -+ break; -+ -+ case MP_START: -+ DBG_871X("set case mp_start \n"); -+ rtw_mp_start (dev,info,wrqu,extra); -+ break; -+ -+ case MP_STOP: -+ DBG_871X("set case mp_stop \n"); -+ rtw_mp_stop (dev,info,wrqu,extra); -+ break; -+ -+ case MP_BANDWIDTH: -+ DBG_871X("set case mp_bandwidth \n"); -+ rtw_mp_bandwidth (dev,info,wrqu,extra); -+ break; -+ -+ case MP_RESET_STATS: -+ DBG_871X("set case MP_RESET_STATS \n"); -+ rtw_mp_reset_stats (dev,info,wrqu,extra); -+ break; -+ -+ case EFUSE_SET: -+ DBG_871X("efuse set \n"); -+ rtw_mp_efuse_set (dev,info,wdata,extra); -+ break; -+ -+ } -+ -+ -+ return 0; -+} -+ -+ -+static int rtw_mp_get(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wdata, char *extra) -+{ -+ struct iw_point *wrqu = (struct iw_point *)wdata; -+ u32 subcmd = wrqu->flags; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ //DBG_871X("in mp_get extra= %s \n",extra); -+ -+ if (padapter == NULL) -+ { -+ return -ENETDOWN; -+ } -+ if (extra == NULL) -+ { -+ wrqu->length = 0; -+ return -EIO; -+ } -+ -+ switch(subcmd) -+ { -+ case MP_PHYPARA: -+ DBG_871X("mp_get MP_PHYPARA \n"); -+ rtw_mp_phypara(dev,info,wrqu,extra); -+ break; -+ -+ case MP_CHANNEL: -+ DBG_871X("set case mp_channel \n"); -+ rtw_mp_channel (dev,info,wrqu,extra); -+ break; -+ -+ case READ_REG: -+ DBG_871X("mp_get READ_REG \n"); -+ rtw_mp_read_reg (dev,info,wrqu,extra); -+ break; -+ case READ_RF: -+ DBG_871X("mp_get READ_RF \n"); -+ rtw_mp_read_rf (dev,info,wrqu,extra); -+ break; -+ -+ case MP_RATE: -+ DBG_871X("set case mp_rate \n"); -+ rtw_mp_rate (dev,info,wrqu,extra); -+ break; -+ -+ case MP_TXPOWER: -+ DBG_871X("set case MP_TXPOWER \n"); -+ rtw_mp_txpower (dev,info,wrqu,extra); -+ break; -+ -+ case MP_ANT_TX: -+ DBG_871X("set case MP_ANT_TX \n"); -+ rtw_mp_ant_tx (dev,info,wrqu,extra); -+ break; -+ -+ case MP_ANT_RX: -+ DBG_871X("set case MP_ANT_RX \n"); -+ rtw_mp_ant_rx (dev,info,wrqu,extra); -+ break; -+ -+ case MP_QUERY: -+ DBG_871X("mp_get mp_query MP_QUERY \n"); -+ rtw_mp_trx_query(dev,info,wrqu,extra); -+ break; -+ -+ case MP_CTX: -+ DBG_871X("set case MP_CTX \n"); -+ rtw_mp_ctx (dev,info,wrqu,extra); -+ break; -+ -+ case MP_ARX: -+ DBG_871X("set case MP_ARX \n"); -+ rtw_mp_arx (dev,info,wrqu,extra); -+ break; -+ -+ case EFUSE_GET: -+ DBG_871X("efuse get EFUSE_GET \n"); -+ rtw_mp_efuse_get(dev,info,wdata,extra); -+ break; -+ -+ case MP_DUMP: -+ DBG_871X("set case MP_DUMP \n"); -+ rtw_mp_dump (dev,info,wrqu,extra); -+ break; -+ case MP_PSD: -+ DBG_871X("set case MP_PSD \n"); -+ rtw_mp_psd (dev,info,wrqu,extra); -+ break; -+ -+ case MP_THER: -+ DBG_871X("set case MP_THER \n"); -+ rtw_mp_thermal (dev,info,wrqu,extra); -+ break; -+ -+ case MP_PWRTRK: -+ DBG_871X("set case MP_PWRTRK \n"); -+ rtw_mp_pwrtrk (dev,info,wrqu,extra); -+ break; -+ } -+ -+return 0; -+} -+ -+#endif //#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT) -+ -+static int rtw_wfd_tdls_enable(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_WFD -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ if ( extra[ 0 ] == '0' ) -+ { -+ padapter->wdinfo.wfd_tdls_enable = 0; -+ } -+ else -+ { -+ padapter->wdinfo.wfd_tdls_enable = 1; -+ } -+ -+#endif //CONFIG_WFD -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_weaksec(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ u8 i, j; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ if ( extra[ 0 ] == '0' ) -+ { -+ padapter->wdinfo.wfd_tdls_weaksec = 0; -+ } -+ else -+ { -+ padapter->wdinfo.wfd_tdls_weaksec = 1; -+ } -+#endif -+ -+ return ret; -+} -+ -+ -+static int rtw_tdls_enable(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ _irqL irqL; -+ _list *plist, *phead; -+ s32 index; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ u8 tdls_sta[NUM_STA][ETH_ALEN]; -+ u8 empty_hwaddr[ETH_ALEN] = { 0x00 }; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ _rtw_memset(tdls_sta, 0x00, sizeof(tdls_sta)); -+ -+ if ( extra[ 0 ] == '0' ) -+ { -+ ptdlsinfo->enable = 0; -+ -+ if(pstapriv->asoc_sta_count==1) -+ return ret; -+ -+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ for(index=0; index< NUM_STA; index++) -+ { -+ phead = &(pstapriv->sta_hash[index]); -+ plist = get_next(phead); -+ -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) -+ { -+ psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); -+ -+ plist = get_next(plist); -+ -+ if(psta->tdls_sta_state != TDLS_STATE_NONE) -+ { -+ _rtw_memcpy(tdls_sta[index], psta->hwaddr, ETH_ALEN); -+ } -+ } -+ } -+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); -+ -+ for(index=0; index< NUM_STA; index++) -+ { -+ if( !_rtw_memcmp(tdls_sta[index], empty_hwaddr, ETH_ALEN) ) -+ { -+ printk("issue tear down to "MAC_FMT"\n", MAC_ARG(tdls_sta[index])); -+ issue_tdls_teardown(padapter, tdls_sta[index]); -+ } -+ } -+ rtw_tdls_cmd(padapter, myid(&(padapter->eeprompriv)), TDLS_RS_RCR); -+ rtw_reset_tdls_info(padapter); -+ } -+ else if ( extra[ 0 ] == '1' ) -+ { -+ ptdlsinfo->enable = 1; -+ } -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_setup(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ u8 i, j; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 mac_addr[ETH_ALEN]; -+ -+#ifdef CONFIG_WFD -+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -+#endif // CONFIG_WFD -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ for( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ -+ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); -+ } -+ -+#ifdef CONFIG_WFD -+ if ( _AES_ != padapter->securitypriv.dot11PrivacyAlgrthm ) -+ { -+ // Weak Security situation with AP. -+ if ( 0 == pwdinfo->wfd_tdls_weaksec ) -+ { -+ // Can't send the tdls setup request out!! -+ DBG_871X( "[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __FUNCTION__ ); -+ } -+ else -+ { -+ issue_tdls_setup_req(padapter, mac_addr); -+ } -+ } -+ else -+#endif // CONFIG_WFD -+ { -+ issue_tdls_setup_req(padapter, mac_addr); -+ } -+#endif -+ -+ return ret; -+} -+ -+static int rtw_tdls_teardown(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ u8 i,j; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct sta_info *ptdls_sta = NULL; -+ u8 mac_addr[ETH_ALEN]; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ for( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ -+ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); -+ } -+ -+ ptdls_sta = rtw_get_stainfo( &(padapter->stapriv), mac_addr); -+ -+ if(ptdls_sta != NULL) -+ { -+ ptdls_sta->stat_code = _RSON_TDLS_TEAR_UN_RSN_; -+ issue_tdls_teardown(padapter, mac_addr); -+ } -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_discovery(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ issue_tdls_dis_req(padapter, NULL); -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_ch_switch(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ u8 i, j, mac_addr[ETH_ALEN]; -+ struct sta_info *ptdls_sta = NULL; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ for( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ -+ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); -+ } -+ -+ ptdls_sta = rtw_get_stainfo(&padapter->stapriv, mac_addr); -+ if( ptdls_sta == NULL ) -+ return ret; -+ ptdlsinfo->ch_sensing=1; -+ -+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_INIT_CH_SEN); -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_pson(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 i, j, mac_addr[ETH_ALEN]; -+ struct sta_info *ptdls_sta = NULL; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ for( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ -+ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); -+ } -+ -+ ptdls_sta = rtw_get_stainfo(&padapter->stapriv, mac_addr); -+ -+ issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 1); -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_psoff(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ u8 i, j, mac_addr[ETH_ALEN]; -+ struct sta_info *ptdls_sta = NULL; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ for( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ -+ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); -+ } -+ -+ ptdls_sta = rtw_get_stainfo(&padapter->stapriv, mac_addr); -+ -+ issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta, 0); -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_setip(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_WFD -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; -+ u8 i=0, j=0, k=0, tag=0, ip[3] = { 0xff }, *ptr = extra; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length - 1 ); -+ -+ -+ while( i < 4 ) -+ { -+ for( j=0; j < 4; j++) -+ { -+ if( *( extra + j + tag ) == '.' || *( extra + j + tag ) == '\0' ) -+ { -+ if( j == 1 ) -+ pwfd_info->ip_address[i]=convert_ip_addr( '0', '0', *(extra+(j-1)+tag)); -+ if( j == 2 ) -+ pwfd_info->ip_address[i]=convert_ip_addr( '0', *(extra+(j-2)+tag), *(extra+(j-1)+tag)); -+ if( j == 3 ) -+ pwfd_info->ip_address[i]=convert_ip_addr( *(extra+(j-3)+tag), *(extra+(j-2)+tag), *(extra+(j-1)+tag)); -+ -+ tag += j + 1; -+ break; -+ } -+ } -+ i++; -+ } -+ -+ printk( "[%s] Set IP = %u.%u.%u.%u \n", __FUNCTION__, -+ ptdlsinfo->wfd_info->ip_address[0], ptdlsinfo->wfd_info->ip_address[1], -+ ptdlsinfo->wfd_info->ip_address[2], ptdlsinfo->wfd_info->ip_address[3] -+ ); -+ -+#endif //CONFIG_WFD -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_getip(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_WFD -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; -+ -+ printk( "[%s]\n", __FUNCTION__); -+ -+ sprintf( extra, "\n\n%u.%u.%u.%u\n", -+ pwfd_info->peer_ip_address[0], pwfd_info->peer_ip_address[1], -+ pwfd_info->peer_ip_address[2], pwfd_info->peer_ip_address[3] -+ ); -+ -+ printk( "[%s] IP=%u.%u.%u.%u\n", __FUNCTION__, -+ pwfd_info->peer_ip_address[0], pwfd_info->peer_ip_address[1], -+ pwfd_info->peer_ip_address[2], pwfd_info->peer_ip_address[3] -+ ); -+ -+ wrqu->data.length = strlen( extra ); -+ -+#endif //CONFIG_WFD -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls_getport(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_WFD -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; -+ -+ printk( "[%s]\n", __FUNCTION__); -+ -+ sprintf( extra, "\n\n%d\n", pwfd_info->peer_rtsp_ctrlport ); -+ printk( "[%s] remote port = %d\n", __FUNCTION__, pwfd_info->peer_rtsp_ctrlport ); -+ -+ wrqu->data.length = strlen( extra ); -+ -+#endif //CONFIG_WFD -+#endif //CONFIG_TDLS -+ -+ return ret; -+ -+} -+ -+//WFDTDLS, for sigma test -+static int rtw_tdls_dis_result(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_WFD -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; -+ -+ printk( "[%s]\n", __FUNCTION__); -+ -+ if(ptdlsinfo->dev_discovered == 1 ) -+ { -+ sprintf( extra, "\n\nDis=1\n" ); -+ ptdlsinfo->dev_discovered = 0; -+ } -+ -+ wrqu->data.length = strlen( extra ); -+ -+#endif //CONFIG_WFD -+#endif //CONFIG_TDLS -+ -+ return ret; -+ -+} -+ -+//WFDTDLS, for sigma test -+static int rtw_wfd_tdls_status(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+#ifdef CONFIG_WFD -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; -+ struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; -+ -+ printk( "[%s]\n", __FUNCTION__); -+ -+ if(ptdlsinfo->setup_state == TDLS_LINKED_STATE ) -+ { -+ sprintf( extra, "\n\nStatus=1\n" ); -+ } -+ else -+ { -+ sprintf( extra, "\n\nStatus=0\n" ); -+ } -+ -+ wrqu->data.length = strlen( extra ); -+ -+#endif //CONFIG_WFD -+#endif //CONFIG_TDLS -+ -+ return ret; -+ -+} -+ -+static int rtw_tdls_ch_switch_off(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ u8 i, j, mac_addr[ETH_ALEN]; -+ struct sta_info *ptdls_sta = NULL; -+ -+ printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); -+ -+ for( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ -+ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); -+ } -+ -+ ptdls_sta = rtw_get_stainfo(&padapter->stapriv, mac_addr); -+ -+ ptdls_sta->tdls_sta_state |= TDLS_SW_OFF_STATE; -+/* -+ if((ptdls_sta->tdls_sta_state & TDLS_AT_OFF_CH_STATE) && (ptdls_sta->tdls_sta_state & TDLS_PEER_AT_OFF_STATE)){ -+ pmlmeinfo->tdls_candidate_ch= pmlmeext->cur_channel; -+ issue_tdls_ch_switch_req(padapter, mac_addr); -+ DBG_871X("issue tdls ch switch req back to base channel\n"); -+ } -+*/ -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+static int rtw_tdls(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_TDLS -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ printk( "[%s] extra = %s\n", __FUNCTION__, extra ); -+ // WFD Sigma will use the tdls enable command to let the driver know we want to test the tdls now! -+ if ( _rtw_memcmp( extra, "wfdenable=", 10 ) ) -+ { -+ wrqu->data.length -=10; -+ rtw_wfd_tdls_enable( dev, info, wrqu, &extra[10] ); -+ return ret; -+ } -+ else if ( _rtw_memcmp( extra, "weaksec=", 8 ) ) -+ { -+ wrqu->data.length -=8; -+ rtw_tdls_weaksec( dev, info, wrqu, &extra[8] ); -+ return ret; -+ } -+ else if ( _rtw_memcmp( extra, "tdlsenable=", 11 ) ) -+ { -+ wrqu->data.length -=11; -+ rtw_tdls_enable( dev, info, wrqu, &extra[11] ); -+ return ret; -+ } -+ -+ if( padapter->tdlsinfo.enable == 0 ) -+ { -+ printk("tdls haven't enabled\n"); -+ return 0; -+ } -+ -+ if ( _rtw_memcmp( extra, "setup=", 6 ) ) -+ { -+ wrqu->data.length -=6; -+ rtw_tdls_setup( dev, info, wrqu, &extra[6] ); -+ } -+ else if (_rtw_memcmp( extra, "tear=", 5 ) ) -+ { -+ wrqu->data.length -= 5; -+ rtw_tdls_teardown( dev, info, wrqu, &extra[5] ); -+ } -+ else if (_rtw_memcmp( extra, "dis=", 4 ) ) -+ { -+ wrqu->data.length -= 4; -+ rtw_tdls_discovery( dev, info, wrqu, &extra[4] ); -+ } -+ else if (_rtw_memcmp( extra, "sw=", 3 ) ) -+ { -+ wrqu->data.length -= 3; -+ rtw_tdls_ch_switch( dev, info, wrqu, &extra[3] ); -+ } -+ else if (_rtw_memcmp( extra, "swoff=", 6 ) ) -+ { -+ wrqu->data.length -= 6; -+ rtw_tdls_ch_switch_off( dev, info, wrqu, &extra[6] ); -+ } -+ else if (_rtw_memcmp( extra, "pson=", 5 ) ) -+ { -+ wrqu->data.length -= 5; -+ rtw_tdls_pson( dev, info, wrqu, &extra[5] ); -+ } -+ else if (_rtw_memcmp( extra, "psoff=", 6 ) ) -+ { -+ wrqu->data.length -= 6; -+ rtw_tdls_psoff( dev, info, wrqu, &extra[6] ); -+ } -+#ifdef CONFIG_WFD -+ else if (_rtw_memcmp( extra, "setip=", 6 ) ) -+ { -+ wrqu->data.length -= 6; -+ rtw_tdls_setip( dev, info, wrqu, &extra[6] ); -+ } -+ else if (_rtw_memcmp( extra, "tprobe=", 6 ) ) -+ { -+ issue_tunneled_probe_req((_adapter *)rtw_netdev_priv(dev)); -+ } -+#endif //CONFIG_WFD -+ -+#endif //CONFIG_TDLS -+ -+ return ret; -+} -+ -+ -+static int rtw_tdls_get(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ -+#ifdef CONFIG_WFD -+ -+ DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer ); -+ -+ if ( _rtw_memcmp( wrqu->data.pointer, "ip", 2 ) ) -+ { -+ rtw_tdls_getip( dev, info, wrqu, extra ); -+ } -+ if ( _rtw_memcmp( wrqu->data.pointer, "port", 4 ) ) -+ { -+ rtw_tdls_getport( dev, info, wrqu, extra ); -+ } -+ -+ //WFDTDLS, for sigma test -+ if ( _rtw_memcmp( wrqu->data.pointer, "dis", 3 ) ) -+ { -+ rtw_tdls_dis_result( dev, info, wrqu, extra ); -+ } -+ if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) ) -+ { -+ rtw_wfd_tdls_status( dev, info, wrqu, extra ); -+ } -+ -+#endif //CONFIG_WFD -+ -+ return ret; -+} -+ -+static int rtw_pm_set(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ unsigned mode = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); -+ -+ if ( _rtw_memcmp( extra, "lps=", 4 ) ) -+ { -+ sscanf(extra+4, "%u", &mode); -+ ret = rtw_pm_set_lps(padapter,mode); -+ } -+ else if ( _rtw_memcmp( extra, "ips=", 4 ) ) -+ { -+ sscanf(extra+4, "%u", &mode); -+ ret = rtw_pm_set_ips(padapter,mode); -+ } -+ else{ -+ ret = -EINVAL; -+ } -+ -+ return ret; -+} -+ -+#ifdef CONFIG_WOWLAN -+static int rtw_wowlan_ctrl(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ struct oid_par_priv oid_par; -+ struct wowlan_ioctl_param *poidparam; -+ uint status=0; -+ u16 len; -+ u8 *pparmbuf = NULL, bset; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ struct iw_point *p = &wrqu->data; -+ -+ //DBG_871X("+rtw_wowlan_ctrl\n"); -+ -+ //mutex_lock(&ioctl_mutex); -+ -+ if ((!p->length) || (!p->pointer)) { -+ ret = -EINVAL; -+ goto _rtw_wowlan_ctrl_exit; -+ } -+ -+ pparmbuf = NULL; -+ bset = (u8)(p->flags & 0xFFFF); -+ len = p->length; -+ pparmbuf = (u8*)rtw_malloc(len); -+ if (pparmbuf == NULL){ -+ ret = -ENOMEM; -+ goto _rtw_wowlan_ctrl_exit; -+ } -+ -+ if (copy_from_user(pparmbuf, p->pointer, len)) { -+ ret = -EFAULT; -+ goto _rtw_wowlan_ctrl_exit_free; -+ } -+ poidparam = (struct wowlan_ioctl_param *)pparmbuf; -+ -+ if(padapter->pwrctrlpriv.bSupportRemoteWakeup==_FALSE){ -+ ret = -EPERM; -+ DBG_871X("+rtw_wowlan_ctrl: Device didn't support the remote wakeup!!\n"); -+ goto _rtw_wowlan_ctrl_exit_free; -+ } -+ rtw_hal_set_hwreg(padapter,HW_VAR_WOWLAN,(u8 *)poidparam); -+ -+ DBG_871X("rtw_wowlan_ctrl: subcode [%d], len[%d], buffer_len[%d]\r\n", -+ poidparam->subcode, poidparam->len, len); -+ -+ if (copy_to_user(p->pointer, pparmbuf, len)) { -+ ret = -EFAULT; -+ } -+ -+ -+_rtw_wowlan_ctrl_exit_free: -+ //DBG_871X("-rtw_wowlan_ctrl( subcode = %d)\n", poidparam->subcode); -+ rtw_mfree(pparmbuf, len); -+_rtw_wowlan_ctrl_exit: -+ -+ -+ return ret; -+} -+#endif //CONFIG_WOWLAN -+ -+#ifdef CONFIG_INTEL_WIDI -+static int rtw_widi_set(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ process_intel_widi_cmd(padapter, extra); -+ -+ return ret; -+} -+ -+static int rtw_widi_set_probe_request(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ int ret = 0; -+ u8 *pbuf = NULL; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ -+ pbuf = rtw_malloc(sizeof(l2_msg_t)); -+ if(pbuf) -+ { -+ copy_from_user(pbuf, wrqu->data.pointer, wrqu->data.length); -+ //_rtw_memcpy(pbuf, wrqu->data.pointer, wrqu->data.length); -+ -+ if( wrqu->data.flags == 0 ) -+ intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf); -+ else if( wrqu->data.flags == 1 ) -+ rtw_set_wfd_rds_sink_info( padapter, (l2_msg_t *)pbuf ); -+ } -+ return ret; -+} -+ -+#endif // CONFIG_INTEL_WIDI -+ -+#ifdef RTL8723A_SDIO_LOOPBACK -+#include -+ -+static s32 initLoopback(PADAPTER padapter) -+{ -+ PLOOPBACKDATA ploopback; -+ -+ -+ if (padapter->ploopback == NULL) { -+ ploopback = (PLOOPBACKDATA)rtw_zmalloc(sizeof(LOOPBACKDATA)); -+ if (ploopback == NULL) return -ENOMEM; -+ -+ _rtw_init_sema(&ploopback->sema, 0); -+ -+ ploopback->bstop = _TRUE; -+ ploopback->cnt = 0; -+ ploopback->size = 300; -+ _rtw_memset(ploopback->msg, 0, sizeof(ploopback->msg)); -+ -+ padapter->ploopback = ploopback; -+ } -+ -+ return 0; -+} -+ -+static void freeLoopback(PADAPTER padapter) -+{ -+ PLOOPBACKDATA ploopback; -+ -+ -+ ploopback = padapter->ploopback; -+ if (ploopback) { -+ rtw_mfree((u8*)ploopback, sizeof(LOOPBACKDATA)); -+ padapter->ploopback = NULL; -+ } -+} -+ -+static s32 initpseudoadhoc(PADAPTER padapter) -+{ -+ NDIS_802_11_NETWORK_INFRASTRUCTURE networkType; -+ s32 err; -+ _irqL irqL; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ _queue *queue = &pmlmepriv->scanned_queue; -+ -+ networkType = Ndis802_11IBSS; -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ _enter_critical_bh(&queue->lock, &irqL); -+ err = rtw_set_802_11_infrastructure_mode(padapter, networkType); -+ _exit_critical_bh(&queue->lock, &irqL); -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ if (err == _FALSE) return _FAIL; -+ -+ err = rtw_setopmode_cmd(padapter, networkType); -+ if (err == _FAIL) return _FAIL; -+ -+ return _SUCCESS; -+} -+ -+static s32 createpseudoadhoc(PADAPTER padapter) -+{ -+ NDIS_802_11_AUTHENTICATION_MODE authmode; -+ struct mlme_priv *pmlmepriv; -+ NDIS_802_11_SSID *passoc_ssid; -+ WLAN_BSSID_EX *pdev_network; -+ u8 *pibss; -+ u8 ssid[] = "pseduo_ad-hoc"; -+ s32 err; -+ _irqL irqL; -+ -+ -+ pmlmepriv = &padapter->mlmepriv; -+ -+ authmode = Ndis802_11AuthModeOpen; -+ err = rtw_set_802_11_authentication_mode(padapter, authmode); -+ if (err == _FALSE) return _FAIL; -+ -+ passoc_ssid = &pmlmepriv->assoc_ssid; -+ _rtw_memset(passoc_ssid, 0, sizeof(NDIS_802_11_SSID)); -+ passoc_ssid->SsidLength = sizeof(ssid) - 1; -+ _rtw_memcpy(passoc_ssid->Ssid, ssid, passoc_ssid->SsidLength); -+ -+ pdev_network = &padapter->registrypriv.dev_network; -+ pibss = padapter->registrypriv.dev_network.MacAddress; -+ _rtw_memcpy(&pdev_network->Ssid, passoc_ssid, sizeof(NDIS_802_11_SSID)); -+ -+ rtw_update_registrypriv_dev_network(padapter); -+ rtw_generate_random_ibss(pibss); -+ -+ _enter_critical_bh(&pmlmepriv->lock, &irqL); -+ pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; -+ _exit_critical_bh(&pmlmepriv->lock, &irqL); -+ -+#if 0 -+ err = rtw_createbss_cmd(padapter); -+ if (err == _FAIL) return _FAIL; -+#else -+{ -+ struct wlan_network *pcur_network; -+ struct sta_info *psta; -+ -+ //3 create a new psta -+ pcur_network = &pmlmepriv->cur_network; -+ -+ //clear psta in the cur_network, if any -+ psta = rtw_get_stainfo(&padapter->stapriv, pcur_network->network.MacAddress); -+ if (psta) rtw_free_stainfo(padapter, psta); -+ -+ psta = rtw_alloc_stainfo(&padapter->stapriv, pibss); -+ if (psta == NULL) return _FAIL; -+ -+ //3 join psudo AdHoc -+ pcur_network->join_res = 1; -+ pcur_network->aid = psta->aid = 1; -+ _rtw_memcpy(&pcur_network->network, pdev_network, get_WLAN_BSSID_EX_sz(pdev_network)); -+ -+ // set msr to WIFI_FW_ADHOC_STATE -+#if 0 -+ Set_NETYPE0_MSR(padapter, WIFI_FW_ADHOC_STATE); -+#else -+ { -+ u8 val8; -+ -+ val8 = rtw_read8(padapter, MSR); -+ val8 &= 0xFC; // clear NETYPE0 -+ val8 |= WIFI_FW_ADHOC_STATE & 0x3; -+ rtw_write8(padapter, MSR, val8); -+ } -+#endif -+} -+#endif -+ -+ return _SUCCESS; -+} -+ -+extern void rtl8723a_cal_txdesc_chksum(struct tx_desc *ptxdesc); -+extern void rtl8723a_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf); -+ -+static struct xmit_frame* createloopbackpkt(PADAPTER padapter, u32 size) -+{ -+ struct xmit_priv *pxmitpriv; -+ struct xmit_frame *pframe; -+ struct xmit_buf *pxmitbuf; -+ struct pkt_attrib *pattrib; -+ struct tx_desc *desc; -+ u8 *pkt_start, *pkt_end, *ptr; -+ struct rtw_ieee80211_hdr *hdr; -+ s32 bmcast; -+ _irqL irqL; -+ -+ -+ if ((TXDESC_SIZE + WLANHDR_OFFSET + size) > MAX_XMITBUF_SZ) return NULL; -+ -+ pxmitpriv = &padapter->xmitpriv; -+ pframe = NULL; -+ -+ //2 1. allocate xmit frame -+ pframe = rtw_alloc_xmitframe(pxmitpriv); -+ if (pframe == NULL) return NULL; -+ pframe->padapter = padapter; -+ -+ //2 2. allocate xmit buffer -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+ if (pxmitbuf == NULL) { -+ rtw_free_xmitframe(pxmitpriv, pframe); -+ return NULL; -+ } -+ -+ pframe->pxmitbuf = pxmitbuf; -+ pframe->buf_addr = pxmitbuf->pbuf; -+ pxmitbuf->priv_data = pframe; -+ -+ //2 3. update_attrib() -+ pattrib = &pframe->attrib; -+ -+ // init xmitframe attribute -+ _rtw_memset(pattrib, 0, sizeof(struct pkt_attrib)); -+ -+ pattrib->ether_type = 0x8723; -+ _rtw_memcpy(pattrib->src, padapter->eeprompriv.mac_addr, ETH_ALEN); -+ _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); -+ _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN); -+ _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); -+// pattrib->pctrl = 0; -+// pattrib->dhcp_pkt = 0; -+// pattrib->pktlen = 0; -+ pattrib->ack_policy = 0; -+// pattrib->pkt_hdrlen = ETH_HLEN; -+ pattrib->hdrlen = WLAN_HDR_A3_LEN; -+ pattrib->subtype = WIFI_DATA; -+ pattrib->priority = 0; -+ pattrib->qsel = pattrib->priority; -+// do_queue_select(padapter, pattrib); -+ pattrib->nr_frags = 1; -+ pattrib->encrypt = 0; -+ pattrib->bswenc = _FALSE; -+ pattrib->qos_en = _FALSE; -+ -+ bmcast = IS_MCAST(pattrib->ra); -+ if (bmcast) { -+ pattrib->mac_id = 1; -+ pattrib->psta = rtw_get_bcmc_stainfo(padapter); -+ } else { -+ pattrib->mac_id = 0; -+ pattrib->psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv)); -+ } -+ -+ pattrib->pktlen = size; -+ pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->pktlen; -+ -+ //2 4. fill TX descriptor -+ desc = (struct tx_desc*)pframe->buf_addr; -+ _rtw_memset(desc, 0, TXDESC_SIZE); -+ -+ rtl8723a_fill_default_txdesc(pframe, (u8*)desc); -+ -+ // Hw set sequence number -+ ((PTXDESC)desc)->hwseq_en = 0; // HWSEQ_EN, 0:disable, 1:enable -+// ((PTXDESC)desc)->hwseq_sel = 0; // HWSEQ_SEL -+ -+ ((PTXDESC)desc)->disdatafb = 1; -+ -+ // convert to little endian -+ desc->txdw0 = cpu_to_le32(desc->txdw0); -+ desc->txdw1 = cpu_to_le32(desc->txdw1); -+ desc->txdw2 = cpu_to_le32(desc->txdw2); -+ desc->txdw3 = cpu_to_le32(desc->txdw3); -+ desc->txdw4 = cpu_to_le32(desc->txdw4); -+ desc->txdw5 = cpu_to_le32(desc->txdw5); -+ desc->txdw6 = cpu_to_le32(desc->txdw6); -+ desc->txdw7 = cpu_to_le32(desc->txdw7); -+#ifdef CONFIG_PCI_HCI -+ desc->txdw8 = cpu_to_le32(desc->txdw8); -+ desc->txdw9 = cpu_to_le32(desc->txdw9); -+ desc->txdw10 = cpu_to_le32(desc->txdw10); -+ desc->txdw11 = cpu_to_le32(desc->txdw11); -+ desc->txdw12 = cpu_to_le32(desc->txdw12); -+ desc->txdw13 = cpu_to_le32(desc->txdw13); -+ desc->txdw14 = cpu_to_le32(desc->txdw14); -+ desc->txdw15 = cpu_to_le32(desc->txdw15); -+#endif -+ -+ rtl8723a_cal_txdesc_chksum(desc); -+ -+ //2 5. coalesce -+ pkt_start = pframe->buf_addr + TXDESC_SIZE; -+ pkt_end = pkt_start + pattrib->last_txcmdsz; -+ -+ //3 5.1. make wlan header, make_wlanhdr() -+ hdr = (struct rtw_ieee80211_hdr *)pkt_start; -+ SetFrameSubType(&hdr->frame_ctl, pattrib->subtype); -+ _rtw_memcpy(hdr->addr1, pattrib->dst, ETH_ALEN); // DA -+ _rtw_memcpy(hdr->addr2, pattrib->src, ETH_ALEN); // SA -+ _rtw_memcpy(hdr->addr3, get_bssid(&padapter->mlmepriv), ETH_ALEN); // RA, BSSID -+ -+ //3 5.2. make payload -+ ptr = pkt_start + pattrib->hdrlen; -+ get_random_bytes(ptr, pkt_end - ptr); -+ -+ pxmitbuf->len = TXDESC_SIZE + pattrib->last_txcmdsz; -+ pxmitbuf->ptail += pxmitbuf->len; -+ -+ return pframe; -+} -+ -+static void freeloopbackpkt(PADAPTER padapter, struct xmit_frame *pframe) -+{ -+ struct xmit_priv *pxmitpriv; -+ struct xmit_buf *pxmitbuf; -+ -+ -+ pxmitpriv = &padapter->xmitpriv; -+ pxmitbuf = pframe->pxmitbuf; -+ -+ rtw_free_xmitframe(pxmitpriv, pframe); -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+} -+ -+extern u32 get_txfifo_hwaddr(struct xmit_frame *pxmitframe); -+ -+thread_return lbk_thread(thread_context context) -+{ -+ s32 err; -+ PADAPTER padapter; -+ PLOOPBACKDATA ploopback; -+ struct xmit_frame *pxmitframe; -+ u32 cnt, ok, fail, i, headerlen; -+ u32 pktsize; -+ u32 ff_hwaddr; -+ -+ -+ padapter = (PADAPTER)context; -+ ploopback = padapter->ploopback; -+ if (ploopback == NULL) return -1; -+ cnt = 0; -+ ok = 0; -+ fail = 0; -+ -+ daemonize("%s", "RTW_LBK_THREAD"); -+ allow_signal(SIGTERM); -+ -+ do { -+ if (ploopback->size == 0) { -+ get_random_bytes(&pktsize, 4); -+ pktsize = (pktsize % 1535) + 1; // 1~1535 -+ } else -+ pktsize = ploopback->size; -+ -+ pxmitframe = createloopbackpkt(padapter, pktsize); -+ if (pxmitframe == NULL) { -+ sprintf(ploopback->msg, "loopback FAIL! 3. create Packet FAIL!"); -+ break; -+ } -+ -+ ploopback->txsize = TXDESC_SIZE + pxmitframe->attrib.last_txcmdsz; -+ _rtw_memcpy(ploopback->txbuf, pxmitframe->buf_addr, ploopback->txsize); -+ -+ ff_hwaddr = get_txfifo_hwaddr(pxmitframe); -+ rtw_write_port(padapter, ff_hwaddr, ploopback->txsize, ploopback->txbuf); -+ cnt++; -+ -+ _rtw_down_sema(&ploopback->sema); -+ -+{ -+ PHAL_DATA_TYPE phal; -+ struct recv_stat *prxstat; -+ struct recv_stat report; -+ PRXREPORT prxreport; -+ u32 drvinfosize; -+ u32 rxpktsize; -+ u8 fcssize; -+ -+ prxstat = (struct recv_stat*)ploopback->rxbuf; -+ report.rxdw0 = le32_to_cpu(prxstat->rxdw0); -+ report.rxdw1 = le32_to_cpu(prxstat->rxdw1); -+ report.rxdw2 = le32_to_cpu(prxstat->rxdw2); -+ report.rxdw3 = le32_to_cpu(prxstat->rxdw3); -+ report.rxdw4 = le32_to_cpu(prxstat->rxdw4); -+ report.rxdw5 = le32_to_cpu(prxstat->rxdw5); -+ -+ prxreport = (PRXREPORT)&report; -+ drvinfosize = prxreport->drvinfosize << 3; -+ rxpktsize = prxreport->pktlen; -+ -+ phal = GET_HAL_DATA(padapter); -+ if (phal->ReceiveConfig & RCR_APPFCS) fcssize = IEEE80211_FCS_LEN; -+ else fcssize = 0; -+ -+ if ((ploopback->txsize - TXDESC_SIZE) != (rxpktsize - fcssize)) { -+ printk("%s: cnt=%d, size not match! tx=%d rx=%d\n", -+ __func__, i, ploopback->txsize - TXDESC_SIZE, -+ rxpktsize - fcssize); -+ err = _FALSE; -+ } else { -+ err = _rtw_memcmp(ploopback->txbuf + TXDESC_SIZE,\ -+ ploopback->rxbuf + RXDESC_SIZE + drvinfosize,\ -+ ploopback->txsize - TXDESC_SIZE); -+ } -+} -+ -+ if (err == _TRUE) -+ ok++; -+ else -+ fail++; -+ -+ ploopback->txsize = 0; -+ _rtw_memset(ploopback->txbuf, 0, 0x8000); -+ ploopback->rxsize = 0; -+ _rtw_memset(ploopback->rxbuf, 0, 0x8000); -+ -+ freeloopbackpkt(padapter, pxmitframe); -+ pxmitframe = NULL; -+ -+ if (signal_pending(current)) { -+ flush_signals(current); -+ } -+ -+ if ((ploopback->bstop == _TRUE) || -+ ((ploopback->cnt != 0) && (ploopback->cnt == cnt))) -+ { -+ u32 ok_rate, fail_rate; -+ ok_rate = (ok*100)/cnt; -+ fail_rate = (fail*100)/cnt; -+ sprintf(ploopback->msg, "loopback result: ok=%d%%(%d/%d),error=%d%%(%d/%d)", ok_rate, ok, cnt, fail_rate, fail, cnt); -+ break; -+ } -+ } while (1); -+ -+ ploopback->bstop = _TRUE; -+ -+ thread_exit(); -+} -+ -+static void loopbackTest(PADAPTER padapter, u32 cnt, u32 size, u8* pmsg) -+{ -+ PLOOPBACKDATA ploopback; -+ u32 len; -+ s32 err; -+ -+ -+ ploopback = padapter->ploopback; -+ -+ if (ploopback) -+ { -+ ploopback->bstop = _TRUE; -+ len = 0; -+ do { -+ len = strlen(ploopback->msg); -+ if (len) break; -+ rtw_msleep_os(1); -+ } while (1); -+ _rtw_memcpy(pmsg, ploopback->msg, len+1); -+ freeLoopback(padapter); -+ return; -+ } -+ -+ // create pseudo ad-hoc connection -+ err = initpseudoadhoc(padapter); -+ if (err == _FAIL) { -+ sprintf(pmsg, "loopback FAIL! 1.1 init ad-hoc FAIL!"); -+ return; -+ } -+ -+ err = createpseudoadhoc(padapter); -+ if (err == _FAIL) { -+ sprintf(pmsg, "loopback FAIL! 1.2 create ad-hoc master FAIL!"); -+ return; -+ } -+ -+ err = initLoopback(padapter); -+ if (err) { -+ sprintf(pmsg, "loopback FAIL! 2. init FAIL! error code=%d", err); -+ return; -+ } -+ -+ ploopback = padapter->ploopback; -+ -+ ploopback->bstop = _FALSE; -+ ploopback->cnt = cnt; -+ ploopback->size = size; -+ ploopback->lbkthread = kthread_run(lbk_thread, padapter, "RTW_LBK_THREAD"); -+ if (IS_ERR(padapter->lbkthread)) -+ { -+ freeLoopback(padapter); -+ sprintf(pmsg, "loopback start FAIL! cnt=%d", cnt); -+ return; -+ } -+ -+ sprintf(pmsg, "loopback start! cnt=%d", cnt); -+} -+ -+extern u8 _InitPowerOn(PADAPTER padapter); -+extern s32 rtl8723a_FirmwareDownload(PADAPTER padapter); -+ -+static int rtw_test( -+ struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ u32 len; -+ u8 *pbuf, *pch; -+ char *ptmp; -+ u8 *delim = ","; -+ PADAPTER padapter = rtw_netdev_priv(dev); -+ -+ -+ printk("+%s\n", __func__); -+ len = wrqu->data.length; -+ -+ pbuf = (u8*)rtw_zmalloc(len); -+ if (pbuf == NULL) { -+ printk("%s: no memory!\n", __func__); -+ return -ENOMEM; -+ } -+ -+ if (copy_from_user(pbuf, wrqu->data.pointer, len)) { -+ rtw_mfree(pbuf, len); -+ printk("%s: copy from user fail!\n", __func__); -+ return -EFAULT; -+ } -+ printk("%s: string=\"%s\"\n", __func__, pbuf); -+ -+ ptmp = (char*)pbuf; -+ pch = strsep(&ptmp, delim); -+ if ((pch == NULL) || (strlen(pch) == 0)) { -+ rtw_mfree(pbuf, len); -+ printk("%s: parameter error(level 1)!\n", __func__); -+ return -EFAULT; -+ } -+ -+#ifdef RTL8723A_SDIO_LOOPBACK -+ if (strcmp(pch, "loopback") == 0) -+ { -+ s32 cnt = 0; -+ u32 size = 64; -+ -+ pch = strsep(&ptmp, delim); -+ if ((pch == NULL) || (strlen(pch) == 0)) { -+ rtw_mfree(pbuf, len); -+ printk("%s: parameter error(level 2)!\n", __func__); -+ return -EFAULT; -+ } -+ -+ sscanf(pch, "%d", &cnt); -+ printk("%s: loopback cnt=%d\n", __func__, cnt); -+ -+ pch = strsep(&ptmp, delim); -+ if ((pch == NULL) || (strlen(pch) == 0)) { -+ rtw_mfree(pbuf, len); -+ printk("%s: parameter error(level 2)!\n", __func__); -+ return -EFAULT; -+ } -+ -+ sscanf(pch, "%d", &size); -+ printk("%s: loopback size=%d\n", __func__, size); -+ -+ loopbackTest(padapter, cnt, size, extra); -+ wrqu->data.length = strlen(extra) + 1; -+ -+ rtw_mfree(pbuf, len); -+ return 0; -+ } -+#endif -+ -+ if (strcmp(pch, "poweron") == 0) -+ { -+ s32 ret; -+ -+ ret = _InitPowerOn(padapter); -+ if (_FAIL == ret) -+ printk("%s: power on FAIL!\n", __func__); -+ else -+ printk("%s: power on OK.\n", __func__); -+ -+ rtw_mfree(pbuf, len); -+ return 0; -+ } -+ -+ if (strcmp(pch, "dlfw") == 0) -+ { -+ s32 ret; -+ -+ ret = rtl8723a_FirmwareDownload(padapter); -+ if (_FAIL == ret) -+ printk("%s: download FW FAIL!\n", __func__); -+ else -+ printk("%s: download FW OK.\n", __func__); -+ -+ rtw_mfree(pbuf, len); -+ return 0; -+ } -+ -+ rtw_mfree(pbuf, len); -+ return 0; -+} -+#else -+static int rtw_test( -+ struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, char *extra) -+{ -+ printk("%s\n", __func__); -+ return 0; -+} -+#endif //RTL8723A_SDIO_LOOPBACK -+ -+#include -+int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) -+{ -+ struct iwreq *wrq = (struct iwreq *)rq; -+ int ret=0; -+ -+ switch (cmd) -+ { -+ case RTL_IOCTL_WPA_SUPPLICANT: -+ ret = wpa_supplicant_ioctl(dev, &wrq->u.data); -+ break; -+#ifdef CONFIG_AP_MODE -+ case RTL_IOCTL_HOSTAPD: -+ ret = rtw_hostapd_ioctl(dev, &wrq->u.data); -+ break; -+#ifdef CONFIG_NO_WIRELESS_HANDLERS -+ case SIOCSIWMODE: -+ ret = rtw_wx_set_mode(dev, NULL, &wrq->u, NULL); -+ break; -+#endif -+#endif -+ case (SIOCDEVPRIVATE+1): -+ ret = rtw_android_priv_cmd(dev, rq, cmd); -+ break; -+ default: -+ ret = -EOPNOTSUPP; -+ break; -+ } -+ -+ return ret; -+} -+ -+static iw_handler rtw_handlers[] = -+{ -+ NULL, /* SIOCSIWCOMMIT */ -+ rtw_wx_get_name, /* SIOCGIWNAME */ -+ dummy, /* SIOCSIWNWID */ -+ dummy, /* SIOCGIWNWID */ -+ rtw_wx_set_freq, /* SIOCSIWFREQ */ -+ rtw_wx_get_freq, /* SIOCGIWFREQ */ -+ rtw_wx_set_mode, /* SIOCSIWMODE */ -+ rtw_wx_get_mode, /* SIOCGIWMODE */ -+ dummy, /* SIOCSIWSENS */ -+ rtw_wx_get_sens, /* SIOCGIWSENS */ -+ NULL, /* SIOCSIWRANGE */ -+ rtw_wx_get_range, /* SIOCGIWRANGE */ -+ rtw_wx_set_priv, /* SIOCSIWPRIV */ -+ NULL, /* SIOCGIWPRIV */ -+ NULL, /* SIOCSIWSTATS */ -+ NULL, /* SIOCGIWSTATS */ -+ dummy, /* SIOCSIWSPY */ -+ dummy, /* SIOCGIWSPY */ -+ NULL, /* SIOCGIWTHRSPY */ -+ NULL, /* SIOCWIWTHRSPY */ -+ rtw_wx_set_wap, /* SIOCSIWAP */ -+ rtw_wx_get_wap, /* SIOCGIWAP */ -+ rtw_wx_set_mlme, /* request MLME operation; uses struct iw_mlme */ -+ dummy, /* SIOCGIWAPLIST -- depricated */ -+ rtw_wx_set_scan, /* SIOCSIWSCAN */ -+ rtw_wx_get_scan, /* SIOCGIWSCAN */ -+ rtw_wx_set_essid, /* SIOCSIWESSID */ -+ rtw_wx_get_essid, /* SIOCGIWESSID */ -+ dummy, /* SIOCSIWNICKN */ -+ rtw_wx_get_nick, /* SIOCGIWNICKN */ -+ NULL, /* -- hole -- */ -+ NULL, /* -- hole -- */ -+ rtw_wx_set_rate, /* SIOCSIWRATE */ -+ rtw_wx_get_rate, /* SIOCGIWRATE */ -+ rtw_wx_set_rts, /* SIOCSIWRTS */ -+ rtw_wx_get_rts, /* SIOCGIWRTS */ -+ rtw_wx_set_frag, /* SIOCSIWFRAG */ -+ rtw_wx_get_frag, /* SIOCGIWFRAG */ -+ dummy, /* SIOCSIWTXPOW */ -+ dummy, /* SIOCGIWTXPOW */ -+ dummy, /* SIOCSIWRETRY */ -+ rtw_wx_get_retry, /* SIOCGIWRETRY */ -+ rtw_wx_set_enc, /* SIOCSIWENCODE */ -+ rtw_wx_get_enc, /* SIOCGIWENCODE */ -+ dummy, /* SIOCSIWPOWER */ -+ rtw_wx_get_power, /* SIOCGIWPOWER */ -+ NULL, /*---hole---*/ -+ NULL, /*---hole---*/ -+ rtw_wx_set_gen_ie, /* SIOCSIWGENIE */ -+ NULL, /* SIOCGWGENIE */ -+ rtw_wx_set_auth, /* SIOCSIWAUTH */ -+ NULL, /* SIOCGIWAUTH */ -+ rtw_wx_set_enc_ext, /* SIOCSIWENCODEEXT */ -+ NULL, /* SIOCGIWENCODEEXT */ -+ rtw_wx_set_pmkid, /* SIOCSIWPMKSA */ -+ NULL, /*---hole---*/ -+}; -+ -+#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT) -+ -+static const struct iw_priv_args rtw_private_args[] = -+{ -+ { SIOCIWFIRSTPRIV + 0x00, IW_PRIV_TYPE_CHAR | 1024, 0 , ""}, //set -+ { SIOCIWFIRSTPRIV + 0x01, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK , ""},//get -+/* --- sub-ioctls definitions --- */ -+ { MP_START , IW_PRIV_TYPE_CHAR | 1024, 0, "mp_start" }, //set -+ { MP_PHYPARA, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_phypara" },//get -+ { MP_STOP , IW_PRIV_TYPE_CHAR | 1024, 0, "mp_stop" }, //set -+ { MP_CHANNEL , IW_PRIV_TYPE_CHAR | 1024 , IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_channel" },//get -+ { MP_BANDWIDTH , IW_PRIV_TYPE_CHAR | 1024, 0, "mp_bandwidth"}, //set -+ { MP_RATE , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_rate" },//get -+ { MP_RESET_STATS , IW_PRIV_TYPE_CHAR | 1024, 0, "mp_reset_stats"}, -+ { MP_QUERY , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK , "mp_query"}, //get -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { READ_REG , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "read_reg" }, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_RATE , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_rate" }, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { READ_RF , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "read_rf" }, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_PSD , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_psd"}, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_DUMP, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_dump" }, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_TXPOWER , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_txpower"}, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_ANT_TX , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_ant_tx"}, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_ANT_RX , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_ant_rx"}, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { WRITE_REG , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "write_reg" }, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { WRITE_RF , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "write_rf" }, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_CTX , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_ctx"}, -+ { MP_NULL, IW_PRIV_TYPE_CHAR | 128, 0,"NULL"},//set -+ { MP_ARX , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_arx"}, -+ { MP_ANT_RX , IW_PRIV_TYPE_CHAR | 1024, 0, "mp_ant_rx"}, -+ { MP_THER , IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_ther"}, -+ { EFUSE_SET, IW_PRIV_TYPE_CHAR | 1024, 0, "efuse_set" }, -+ { EFUSE_GET, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "efuse_get" }, -+ { MP_NULL , IW_PRIV_TYPE_CHAR | 1024, 0, "NULL"}, -+ { MP_PWRTRK, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "mp_pwrtrk" }, -+ { MP_IOCTL, IW_PRIV_TYPE_CHAR | 1024, 0, "mp_ioctl"}, // mp_ioctl -+ -+ -+ { SIOCIWFIRSTPRIV + 0x02, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK , "test"},//set -+}; -+ -+ -+static iw_handler rtw_private_handler[] = -+{ -+ rtw_mp_set, -+ rtw_mp_get, -+}; -+ -+#else // not inlucde MP -+ -+static const struct iw_priv_args rtw_private_args[] = { -+ { -+ SIOCIWFIRSTPRIV + 0x0, -+ IW_PRIV_TYPE_CHAR | 0x7FF, 0, "write" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x1, -+ IW_PRIV_TYPE_CHAR | 0x7FF, -+ IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | IFNAMSIZ, "read" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x2, 0, 0, "driver_ext" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x3, 0, 0, "mp_ioctl" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x4, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "apinfo" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x5, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "setpid" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x6, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wps_start" -+ }, -+//for PLATFORM_MT53XX -+ { -+ SIOCIWFIRSTPRIV + 0x7, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "get_sensitivity" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x8, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wps_prob_req_ie" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x9, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wps_assoc_req_ie" -+ }, -+ -+//for RTK_DMP_PLATFORM -+ { -+ SIOCIWFIRSTPRIV + 0xA, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "channel_plan" -+ }, -+ -+ { -+ SIOCIWFIRSTPRIV + 0xB, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "dbg" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0xC, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, 0, "rfw" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0xD, -+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | IFNAMSIZ, "rfr" -+ }, -+#ifdef CONFIG_WOWLAN -+ { -+ SIOCIWFIRSTPRIV + 0xE,0,0, "wowlan_ctrl" -+ }, -+#endif // CONFIG_WOWLAN -+ { -+ SIOCIWFIRSTPRIV + 0x10, -+ IW_PRIV_TYPE_CHAR | 1024, 0, "p2p_set" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x11, -+ IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK , "p2p_get" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x12, 0, 0, "NULL" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x13, -+ IW_PRIV_TYPE_CHAR | 64, IW_PRIV_TYPE_CHAR | 64 , "p2p_get2" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x14, -+ IW_PRIV_TYPE_CHAR | 64, 0, "tdls" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x15, -+ IW_PRIV_TYPE_CHAR | P2P_PRIVATE_IOCTL_SET_LEN, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | P2P_PRIVATE_IOCTL_SET_LEN , "tdls_get" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x16, -+ IW_PRIV_TYPE_CHAR | 64, 0, "pm_set" -+ }, -+ -+ {SIOCIWFIRSTPRIV + 0x18, IW_PRIV_TYPE_CHAR | IFNAMSIZ , 0 , "rereg_nd_name"}, -+ -+ {SIOCIWFIRSTPRIV + 0x1A, IW_PRIV_TYPE_CHAR | 128, 0, "efuse_set"}, -+ {SIOCIWFIRSTPRIV + 0x1B, IW_PRIV_TYPE_CHAR | 128, IW_PRIV_TYPE_CHAR |IW_PRIV_SIZE_FIXED |0x700 ,"efuse_get"}, -+ { -+ SIOCIWFIRSTPRIV + 0x1D, -+ IW_PRIV_TYPE_CHAR | 40, IW_PRIV_TYPE_CHAR | 0x7FF, "test" -+ }, -+#ifdef CONFIG_INTEL_WIDI -+ { -+ SIOCIWFIRSTPRIV + 0x1E, -+ IW_PRIV_TYPE_CHAR | 1024, 0, "widi_set" -+ }, -+ { -+ SIOCIWFIRSTPRIV + 0x1F, -+ IW_PRIV_TYPE_CHAR | 128, 0, "widi_prob_req" -+ }, -+#endif // CONFIG_INTEL_WIDI -+}; -+ -+static iw_handler rtw_private_handler[] = -+{ -+ rtw_wx_write32, //0x00 -+ rtw_wx_read32, //0x01 -+ rtw_drvext_hdl, //0x02 -+ rtw_mp_ioctl_hdl, //0x03 -+ -+// for MM DTV platform -+ rtw_get_ap_info, //0x04 -+ -+ rtw_set_pid, //0x05 -+ rtw_wps_start, //0x06 -+ -+// for PLATFORM_MT53XX -+ rtw_wx_get_sensitivity, //0x07 -+ rtw_wx_set_mtk_wps_probe_ie, //0x08 -+ rtw_wx_set_mtk_wps_ie, //0x09 -+ -+// for RTK_DMP_PLATFORM -+// Set Channel depend on the country code -+ rtw_wx_set_channel_plan, //0x0A -+ -+ rtw_dbg_port, //0x0B -+ rtw_wx_write_rf, //0x0C -+ rtw_wx_read_rf, //0x0D -+ -+#ifdef CONFIG_WOWLAN -+ rtw_wowlan_ctrl, //0x0E -+#else -+ rtw_wx_priv_null, //0x0E -+#endif //CONFIG_WOWLAN -+ rtw_wx_priv_null, //0x0F -+ -+ rtw_p2p_set, //0x10 -+ rtw_p2p_get, //0x11 -+ NULL, //0x12 -+ rtw_p2p_get2, //0x13 -+ -+ rtw_tdls, //0x14 -+ rtw_tdls_get, //0x15 -+ -+ rtw_pm_set, //0x16 -+ rtw_wx_priv_null, //0x17 -+ rtw_rereg_nd_name, //0x18 -+ rtw_wx_priv_null, //0x19 -+ -+ rtw_mp_efuse_set, //0x1A -+ rtw_mp_efuse_get, //0x1B -+ NULL, // 0x1C is reserved for hostapd -+ rtw_test , // 0x1D -+#ifdef CONFIG_INTEL_WIDI -+ rtw_widi_set, //0x1E -+ rtw_widi_set_probe_request, //0x1F -+#endif // CONFIG_INTEL_WIDI -+}; -+ -+#endif // #if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT) -+ -+#if WIRELESS_EXT >= 17 -+static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); -+ struct iw_statistics *piwstats=&padapter->iwstats; -+ int tmp_level = 0; -+ int tmp_qual = 0; -+ int tmp_noise = 0; -+ -+ if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) != _TRUE) -+ { -+ piwstats->qual.qual = 0; -+ piwstats->qual.level = 0; -+ piwstats->qual.noise = 0; -+ //DBG_871X("No link level:%d, qual:%d, noise:%d\n", tmp_level, tmp_qual, tmp_noise); -+ } -+ else{ -+ #ifdef CONFIG_SIGNAL_DISPLAY_DBM -+ tmp_level = translate_percentage_to_dbm(padapter->recvpriv.signal_strength); -+ #else -+ tmp_level = padapter->recvpriv.signal_strength; -+ #endif -+ -+ tmp_qual = padapter->recvpriv.signal_qual; -+ tmp_noise =padapter->recvpriv.noise; -+ //DBG_871X("level:%d, qual:%d, noise:%d, rssi (%d)\n", tmp_level, tmp_qual, tmp_noise,padapter->recvpriv.rssi); -+ -+ piwstats->qual.level = tmp_level; -+ piwstats->qual.qual = tmp_qual; -+ piwstats->qual.noise = tmp_noise; -+ } -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) -+ piwstats->qual.updated = IW_QUAL_ALL_UPDATED ;//|IW_QUAL_DBM; -+#else -+#ifdef RTK_DMP_PLATFORM -+ //IW_QUAL_DBM= 0x8, if driver use this flag, wireless extension will show value of dbm. -+ //remove this flag for show percentage 0~100 -+ piwstats->qual.updated = 0x07; -+#else -+ piwstats->qual.updated = 0x0f; -+#endif -+#endif -+ -+ #ifdef CONFIG_SIGNAL_DISPLAY_DBM -+ piwstats->qual.updated = piwstats->qual.updated | IW_QUAL_DBM; -+ #endif -+ -+ return &padapter->iwstats; -+} -+#endif -+ -+#ifdef CONFIG_WIRELESS_EXT -+struct iw_handler_def rtw_handlers_def = -+{ -+ .standard = rtw_handlers, -+ .num_standard = sizeof(rtw_handlers) / sizeof(iw_handler), -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) || defined(CONFIG_WEXT_PRIV) -+ .private = rtw_private_handler, -+ .private_args = (struct iw_priv_args *)rtw_private_args, -+ .num_private = sizeof(rtw_private_handler) / sizeof(iw_handler), -+ .num_private_args = sizeof(rtw_private_args) / sizeof(struct iw_priv_args), -+#endif -+#if WIRELESS_EXT >= 17 -+ .get_wireless_stats = rtw_get_wireless_stats, -+#endif -+}; -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c -@@ -0,0 +1,653 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+ -+#define _MLME_OSDEP_C_ -+ -+#include -+#include -+#include -+#include -+ -+ -+#ifdef RTK_DMP_PLATFORM -+void Linkup_workitem_callback(struct work_struct *work) -+{ -+ struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkup_workitem); -+ _adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("+ Linkup_workitem_callback\n")); -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) -+ kobject_uevent(&padapter->pnetdev->dev.kobj, KOBJ_LINKUP); -+#else -+ kobject_hotplug(&padapter->pnetdev->class_dev.kobj, KOBJ_LINKUP); -+#endif -+ -+_func_exit_; -+} -+ -+void Linkdown_workitem_callback(struct work_struct *work) -+{ -+ struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkdown_workitem); -+ _adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv); -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("+ Linkdown_workitem_callback\n")); -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) -+ kobject_uevent(&padapter->pnetdev->dev.kobj, KOBJ_LINKDOWN); -+#else -+ kobject_hotplug(&padapter->pnetdev->class_dev.kobj, KOBJ_LINKDOWN); -+#endif -+ -+_func_exit_; -+} -+#endif -+ -+ -+/* -+void sitesurvey_ctrl_handler(void *FunctionContext) -+{ -+ _adapter *adapter = (_adapter *)FunctionContext; -+ -+ _sitesurvey_ctrl_handler(adapter); -+ -+ _set_timer(&adapter->mlmepriv.sitesurveyctrl.sitesurvey_ctrl_timer, 3000); -+} -+*/ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void rtw_join_timeout_handler(void *FunctionContext) -+#else -+void rtw_join_timeout_handler(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, mlmepriv.assoc_timer); -+#endif -+ -+ _rtw_join_timeout_handler(adapter); -+} -+ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void _rtw_scan_timeout_handler(void *FunctionContext) -+#else -+void _rtw_scan_timeout_handler(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, mlmepriv.scan_to_timer); -+#endif -+ rtw_scan_timeout_handler(adapter); -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void _dynamic_check_timer_handlder(void *FunctionContext) -+#else -+static void _dynamic_check_timer_handlder(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, mlmepriv.dynamic_chk_timer); -+#endif -+ rtw_dynamic_check_timer_handlder(adapter); -+ -+ _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); -+} -+ -+#ifdef CONFIG_SET_SCAN_DENY_TIMER -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void _rtw_set_scan_deny_timer_hdl(void *FunctionContext) -+#else -+void _rtw_set_scan_deny_timer_hdl(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *adapter = (_adapter *)FunctionContext; -+#else -+ _adapter *adapter = from_timer(adapter, t, mlmepriv.set_scan_deny_timer); -+#endif -+ rtw_set_scan_deny_timer_hdl(adapter); -+} -+#endif -+ -+ -+void rtw_init_mlme_timer(_adapter *padapter) -+{ -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, rtw_join_timeout_handler, padapter); -+ _init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter); -+ _init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter); -+ #ifdef CONFIG_SET_SCAN_DENY_TIMER -+ _init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter); -+ #endif -+#else -+ timer_setup(&pmlmepriv->assoc_timer, rtw_join_timeout_handler, 0); -+ timer_setup(&pmlmepriv->scan_to_timer, _rtw_scan_timeout_handler, 0); -+ timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder, 0); -+ #ifdef CONFIG_SET_SCAN_DENY_TIMER -+ timer_setup(&pmlmepriv->set_scan_deny_timer, _rtw_set_scan_deny_timer_hdl, 0); -+ #endif -+#endif -+ -+#ifdef RTK_DMP_PLATFORM -+ _init_workitem(&(pmlmepriv->Linkup_workitem), Linkup_workitem_callback, padapter); -+ _init_workitem(&(pmlmepriv->Linkdown_workitem), Linkdown_workitem_callback, padapter); -+#endif -+ -+} -+ -+extern void rtw_indicate_wx_assoc_event(_adapter *padapter); -+extern void rtw_indicate_wx_disassoc_event(_adapter *padapter); -+ -+void rtw_os_indicate_connect(_adapter *adapter) -+{ -+ -+_func_enter_; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_indicate_connect(adapter); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ rtw_indicate_wx_assoc_event(adapter); -+ netif_carrier_on(adapter->pnetdev); -+ -+ if(adapter->pid[2] !=0) -+ rtw_signal_process(adapter->pid[2], SIGALRM); -+ -+#ifdef RTK_DMP_PLATFORM -+ _set_workitem(&adapter->mlmepriv.Linkup_workitem); -+#endif -+ -+_func_exit_; -+ -+} -+ -+extern void indicate_wx_scan_complete_event(_adapter *padapter); -+void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted) -+{ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), aborted); -+#endif -+ indicate_wx_scan_complete_event(padapter); -+} -+ -+static RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ]; -+void rtw_reset_securitypriv( _adapter *adapter ) -+{ -+ u8 backupPMKIDIndex = 0; -+ u8 backupTKIPCountermeasure = 0x00; -+ u32 backupTKIPcountermeasure_time = 0; -+ // add for CONFIG_IEEE80211W, none 11w also can use -+ _irqL irqL; -+ struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -+ -+ _enter_critical_bh(&adapter->security_key_mutex, &irqL); -+ -+ if(adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)//802.1x -+ { -+ // Added by Albert 2009/02/18 -+ // We have to backup the PMK information for WiFi PMK Caching test item. -+ // -+ // Backup the btkip_countermeasure information. -+ // When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. -+ -+ _rtw_memset( &backupPMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); -+ -+ _rtw_memcpy( &backupPMKIDList[ 0 ], &adapter->securitypriv.PMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); -+ backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; -+ backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; -+ backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; -+#ifdef CONFIG_IEEE80211W -+ //reset RX BIP packet number -+ pmlmeext->mgnt_80211w_IPN_rx = 0; -+#endif //CONFIG_IEEE80211W -+ _rtw_memset((unsigned char *)&adapter->securitypriv, 0, sizeof (struct security_priv)); -+ //_init_timer(&(adapter->securitypriv.tkip_timer),adapter->pnetdev, rtw_use_tkipkey_handler, adapter); -+ -+ // Added by Albert 2009/02/18 -+ // Restore the PMK information to securitypriv structure for the following connection. -+ _rtw_memcpy( &adapter->securitypriv.PMKIDList[ 0 ], &backupPMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); -+ adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; -+ adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; -+ adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; -+ -+ adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; -+ adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; -+ -+ } -+ else //reset values in securitypriv -+ { -+ //if(adapter->mlmepriv.fw_state & WIFI_STATION_STATE) -+ //{ -+ struct security_priv *psec_priv=&adapter->securitypriv; -+ -+ psec_priv->dot11AuthAlgrthm =dot11AuthAlgrthm_Open; //open system -+ psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; -+ psec_priv->dot11PrivacyKeyIndex = 0; -+ -+ psec_priv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ psec_priv->dot118021XGrpKeyid = 1; -+ -+ psec_priv->ndisauthtype = Ndis802_11AuthModeOpen; -+ psec_priv->ndisencryptstatus = Ndis802_11WEPDisabled; -+ //} -+ } -+ // add for CONFIG_IEEE80211W, none 11w also can use -+ _exit_critical_bh(&adapter->security_key_mutex, &irqL); -+} -+ -+void rtw_os_indicate_disconnect( _adapter *adapter ) -+{ -+ //RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ]; -+ -+_func_enter_; -+ -+ netif_carrier_off(adapter->pnetdev); // Do it first for tx broadcast pkt after disconnection issue! -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_indicate_disconnect(adapter); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ rtw_indicate_wx_disassoc_event(adapter); -+ -+#ifdef RTK_DMP_PLATFORM -+ _set_workitem(&adapter->mlmepriv.Linkdown_workitem); -+#endif -+ //modify for CONFIG_IEEE80211W, none 11w also can use the same command -+ rtw_reset_securitypriv_cmd(adapter); -+ -+_func_exit_; -+ -+} -+ -+void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie) -+{ -+ uint len; -+ u8 *buff,*p,i; -+ union iwreq_data wrqu; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("+rtw_report_sec_ie, authmode=%d\n", authmode)); -+ -+ buff = NULL; -+ if(authmode==_WPA_IE_ID_) -+ { -+ RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("rtw_report_sec_ie, authmode=%d\n", authmode)); -+ -+ buff = rtw_malloc(IW_CUSTOM_MAX); -+ -+ _rtw_memset(buff,0,IW_CUSTOM_MAX); -+ -+ p=buff; -+ -+ p+=sprintf(p,"ASSOCINFO(ReqIEs="); -+ -+ len = sec_ie[1]+2; -+ len = (len < IW_CUSTOM_MAX) ? len:IW_CUSTOM_MAX; -+ -+ for(i=0;ipnetdev,IWEVCUSTOM,&wrqu,buff); -+ -+ if(buff) -+ rtw_mfree(buff, IW_CUSTOM_MAX); -+ -+ } -+ -+_func_exit_; -+ -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void _survey_timer_hdl(void *FunctionContext) -+#else -+static void _survey_timer_hdl(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *padapter = (_adapter *)FunctionContext; -+#else -+ _adapter *padapter = from_timer(padapter, t, mlmeextpriv.survey_timer); -+#endif -+ survey_timer_hdl(padapter); -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void _link_timer_hdl (void *FunctionContext) -+#else -+static void _link_timer_hdl(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *padapter = (_adapter *)FunctionContext; -+#else -+ _adapter *padapter = from_timer(padapter, t, mlmeextpriv.link_timer); -+#endif -+ link_timer_hdl(padapter); -+} -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+static void _addba_timer_hdl(void *FunctionContext) -+#else -+static void _addba_timer_hdl(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ struct sta_info *psta = (struct sta_info *)FunctionContext; -+#else -+ struct sta_info *psta = from_timer(psta, t, addba_retry_timer); -+#endif -+ addba_timer_hdl(psta); -+} -+ -+#ifdef CONFIG_IEEE80211W -+void _sa_query_timer_hdl (void *FunctionContext) -+{ -+ _adapter *padapter = (_adapter *)FunctionContext; -+ sa_query_timer_hdl(padapter); -+} -+#endif //CONFIG_IEEE80211W -+ -+void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&psta->addba_retry_timer, padapter->pnetdev, _addba_timer_hdl, psta); -+#else -+ timer_setup(&psta->addba_retry_timer, _addba_timer_hdl, 0); -+#endif -+} -+ -+/* -+void _reauth_timer_hdl(void *FunctionContext) -+{ -+ _adapter *padapter = (_adapter *)FunctionContext; -+ reauth_timer_hdl(padapter); -+} -+ -+void _reassoc_timer_hdl(void *FunctionContext) -+{ -+ _adapter *padapter = (_adapter *)FunctionContext; -+ reassoc_timer_hdl(padapter); -+} -+*/ -+ -+void init_mlme_ext_timer(_adapter *padapter) -+{ -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, _survey_timer_hdl, padapter); -+ _init_timer(&pmlmeext->link_timer, padapter->pnetdev, _link_timer_hdl, padapter); -+#else -+ timer_setup(&pmlmeext->survey_timer, _survey_timer_hdl, 0); -+ timer_setup(&pmlmeext->link_timer, _link_timer_hdl, 0); -+#endif -+#ifdef CONFIG_IEEE80211W -+ _init_timer(&pmlmeext->sa_query_timer, padapter->pnetdev, _sa_query_timer_hdl, padapter); -+#endif //CONFIG_IEEE80211W -+ //_init_timer(&pmlmeext->ADDBA_timer, padapter->pnetdev, _addba_timer_hdl, padapter); -+ -+ //_init_timer(&pmlmeext->reauth_timer, padapter->pnetdev, _reauth_timer_hdl, padapter); -+ //_init_timer(&pmlmeext->reassoc_timer, padapter->pnetdev, _reassoc_timer_hdl, padapter); -+} -+ -+#ifdef CONFIG_AP_MODE -+ -+void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta) -+{ -+ union iwreq_data wrqu; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ if(psta==NULL) -+ return; -+ -+ if(psta->aid > NUM_STA) -+ return; -+ -+ if(pstapriv->sta_aid[psta->aid - 1] != psta) -+ return; -+ -+ -+ wrqu.addr.sa_family = ARPHRD_ETHER; -+ -+ _rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); -+ -+ DBG_871X("+rtw_indicate_sta_assoc_event\n"); -+ -+ wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL); -+ -+} -+ -+void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta) -+{ -+ union iwreq_data wrqu; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ -+ if(psta==NULL) -+ return; -+ -+ if(psta->aid > NUM_STA) -+ return; -+ -+ if(pstapriv->sta_aid[psta->aid - 1] != psta) -+ return; -+ -+ -+ wrqu.addr.sa_family = ARPHRD_ETHER; -+ -+ _rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); -+ -+ DBG_871X("+rtw_indicate_sta_disassoc_event\n"); -+ -+ wireless_send_event(padapter->pnetdev, IWEVEXPIRED, &wrqu, NULL); -+ -+} -+ -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ -+static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev) -+{ -+ struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); -+ _adapter *padapter = (_adapter *)phostapdpriv->padapter; -+ -+ //DBG_871X("%s\n", __FUNCTION__); -+ -+ return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb); -+} -+ -+static int mgnt_netdev_open(struct net_device *pnetdev) -+{ -+ struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); -+ -+ DBG_871X("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr)); -+ -+ -+ init_usb_anchor(&phostapdpriv->anchored); -+ -+ if(!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_start_queue(pnetdev); -+ else -+ rtw_netif_wake_queue(pnetdev); -+ -+ -+ netif_carrier_on(pnetdev); -+ -+ //rtw_write16(phostapdpriv->padapter, 0x0116, 0x0100);//only excluding beacon -+ -+ return 0; -+} -+static int mgnt_netdev_close(struct net_device *pnetdev) -+{ -+ struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); -+ -+ DBG_871X("%s\n", __FUNCTION__); -+ -+ usb_kill_anchored_urbs(&phostapdpriv->anchored); -+ -+ netif_carrier_off(pnetdev); -+ -+ if (!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_stop_queue(pnetdev); -+ -+ //rtw_write16(phostapdpriv->padapter, 0x0116, 0x3f3f); -+ -+ return 0; -+} -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+static const struct net_device_ops rtl871x_mgnt_netdev_ops = { -+ .ndo_open = mgnt_netdev_open, -+ .ndo_stop = mgnt_netdev_close, -+ .ndo_start_xmit = mgnt_xmit_entry, -+ //.ndo_set_mac_address = r871x_net_set_mac_address, -+ //.ndo_get_stats = r871x_net_get_stats, -+ //.ndo_do_ioctl = r871x_mp_ioctl, -+}; -+#endif -+ -+int hostapd_mode_init(_adapter *padapter) -+{ -+ unsigned char mac[ETH_ALEN]; -+ struct hostapd_priv *phostapdpriv; -+ struct net_device *pnetdev; -+ -+ pnetdev = rtw_alloc_etherdev(sizeof(struct hostapd_priv)); -+ if (!pnetdev) -+ return -ENOMEM; -+ -+ //SET_MODULE_OWNER(pnetdev); -+ ether_setup(pnetdev); -+ -+ //pnetdev->type = ARPHRD_IEEE80211; -+ -+ phostapdpriv = rtw_netdev_priv(pnetdev); -+ phostapdpriv->pmgnt_netdev = pnetdev; -+ phostapdpriv->padapter= padapter; -+ padapter->phostapdpriv = phostapdpriv; -+ -+ //pnetdev->init = NULL; -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+ -+ DBG_871X("register rtl871x_mgnt_netdev_ops to netdev_ops\n"); -+ -+ pnetdev->netdev_ops = &rtl871x_mgnt_netdev_ops; -+ -+#else -+ -+ pnetdev->open = mgnt_netdev_open; -+ -+ pnetdev->stop = mgnt_netdev_close; -+ -+ pnetdev->hard_start_xmit = mgnt_xmit_entry; -+ -+ //pnetdev->set_mac_address = r871x_net_set_mac_address; -+ -+ //pnetdev->get_stats = r871x_net_get_stats; -+ -+ //pnetdev->do_ioctl = r871x_mp_ioctl; -+ -+#endif -+ -+ pnetdev->watchdog_timeo = HZ; /* 1 second timeout */ -+ -+ //pnetdev->wireless_handlers = NULL; -+ -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ pnetdev->features |= NETIF_F_IP_CSUM; -+#endif -+ -+ -+ -+ if(dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0) -+ { -+ DBG_871X("hostapd_mode_init(): dev_alloc_name, fail! \n"); -+ } -+ -+ -+ //SET_NETDEV_DEV(pnetdev, pintfpriv->udev); -+ -+ -+ mac[0]=0x00; -+ mac[1]=0xe0; -+ mac[2]=0x4c; -+ mac[3]=0x87; -+ mac[4]=0x11; -+ mac[5]=0x12; -+ -+ _rtw_memcpy(pnetdev->dev_addr, mac, ETH_ALEN); -+ -+ -+ netif_carrier_off(pnetdev); -+ -+ -+ /* Tell the network stack we exist */ -+ if (register_netdev(pnetdev) != 0) -+ { -+ DBG_871X("hostapd_mode_init(): register_netdev fail!\n"); -+ -+ if(pnetdev) -+ { -+ rtw_free_netdev(pnetdev); -+ } -+ } -+ -+ return 0; -+ -+} -+ -+void hostapd_mode_unload(_adapter *padapter) -+{ -+ struct hostapd_priv *phostapdpriv = padapter->phostapdpriv; -+ struct net_device *pnetdev = phostapdpriv->pmgnt_netdev; -+ -+ unregister_netdev(pnetdev); -+ rtw_free_netdev(pnetdev); -+ -+} -+ -+#endif -+#endif -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c -@@ -0,0 +1,2768 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _OS_INTFS_C_ -+ -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+#ifdef CONFIG_PCI_HCI -+#include -+#endif -+ -+#ifdef CONFIG_BR_EXT -+#include -+#endif //CONFIG_BR_EXT -+ -+MODULE_LICENSE("GPL"); -+MODULE_DESCRIPTION("Realtek Wireless Lan Driver"); -+MODULE_AUTHOR("Realtek Semiconductor Corp."); -+MODULE_VERSION(DRIVERVERSION); -+ -+/* module param defaults */ -+int rtw_chip_version = 0x00; -+int rtw_rfintfs = HWPI; -+int rtw_lbkmode = 0;//RTL8712_AIR_TRX; -+ -+ -+int rtw_network_mode = Ndis802_11IBSS;//Ndis802_11Infrastructure;//infra, ad-hoc, auto -+//NDIS_802_11_SSID ssid; -+int rtw_channel = 1;//ad-hoc support requirement -+int rtw_wireless_mode = WIRELESS_11BG_24N; -+int rtw_vrtl_carrier_sense = AUTO_VCS; -+int rtw_vcs_type = RTS_CTS;//* -+int rtw_rts_thresh = 2347;//* -+int rtw_frag_thresh = 2346;//* -+int rtw_preamble = PREAMBLE_LONG;//long, short, auto -+int rtw_scan_mode = 1;//active, passive -+int rtw_adhoc_tx_pwr = 1; -+int rtw_soft_ap = 0; -+//int smart_ps = 1; -+#ifdef CONFIG_POWER_SAVING -+int rtw_power_mgnt = 1; -+#ifdef CONFIG_IPS_LEVEL_2 -+int rtw_ips_mode = IPS_LEVEL_2; -+#else -+int rtw_ips_mode = IPS_NORMAL; -+#endif -+#else -+int rtw_power_mgnt = PS_MODE_ACTIVE; -+int rtw_ips_mode = IPS_NONE; -+#endif -+module_param(rtw_ips_mode, int, 0644); -+MODULE_PARM_DESC(rtw_ips_mode,"The default IPS mode"); -+ -+int rtw_radio_enable = 1; -+int rtw_long_retry_lmt = 7; -+int rtw_short_retry_lmt = 7; -+int rtw_busy_thresh = 40; -+//int qos_enable = 0; //* -+int rtw_ack_policy = NORMAL_ACK; -+#ifdef CONFIG_MP_INCLUDED -+int rtw_mp_mode = 1; -+#else -+int rtw_mp_mode = 0; -+#endif -+int rtw_software_encrypt = 0; -+int rtw_software_decrypt = 0; -+ -+int rtw_acm_method = 0;// 0:By SW 1:By HW. -+ -+int rtw_wmm_enable = 1;// default is set to enable the wmm. -+int rtw_uapsd_enable = 0; -+int rtw_uapsd_max_sp = NO_LIMIT; -+int rtw_uapsd_acbk_en = 0; -+int rtw_uapsd_acbe_en = 0; -+int rtw_uapsd_acvi_en = 0; -+int rtw_uapsd_acvo_en = 0; -+ -+#ifdef CONFIG_80211N_HT -+int rtw_ht_enable = 1; -+int rtw_cbw40_enable = 3; // 0 :diable, bit(0): enable 2.4g, bit(1): enable 5g -+int rtw_ampdu_enable = 1;//for enable tx_ampdu -+int rtw_rx_stbc = 1;// 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ -+int rtw_ampdu_amsdu = 0;// 0: disabled, 1:enabled, 2:auto -+#endif -+ -+int rtw_lowrate_two_xmit = 1;//Use 2 path Tx to transmit MCS0~7 and legacy mode -+ -+//int rf_config = RF_1T2R; // 1T2R -+int rtw_rf_config = RF_819X_MAX_TYPE; //auto -+int rtw_low_power = 0; -+#ifdef CONFIG_WIFI_TEST -+int rtw_wifi_spec = 1;//for wifi test -+#else -+int rtw_wifi_spec = 0; -+#endif -+ -+int rtw_special_rf_path = 0; //0: 2T2R ,1: only turn on path A 1T1R, 2: only turn on path B 1T1R -+ -+int rtw_channel_plan = RT_CHANNEL_DOMAIN_MAX; -+ -+#ifdef CONFIG_BT_COEXIST -+int rtw_bt_iso = 2;// 0:Low, 1:High, 2:From Efuse -+int rtw_bt_sco = 3;// 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter, 4.Busy, 5.OtherBusy -+int rtw_bt_ampdu =1 ;// 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU. -+#endif -+int rtw_AcceptAddbaReq = _TRUE;// 0:Reject AP's Add BA req, 1:Accept AP's Add BA req. -+ -+int rtw_antdiv_cfg = 2; // 0:OFF , 1:ON, 2:decide by Efuse config -+ -+#ifdef CONFIG_USB_AUTOSUSPEND -+int rtw_enusbss = 1;//0:disable,1:enable -+#else -+int rtw_enusbss = 0;//0:disable,1:enable -+#endif -+ -+int rtw_hwpdn_mode=2;//0:disable,1:enable,2: by EFUSE config -+ -+#ifdef CONFIG_HW_PWRP_DETECTION -+int rtw_hwpwrp_detect = 1; -+#else -+int rtw_hwpwrp_detect = 0; //HW power ping detect 0:disable , 1:enable -+#endif -+ -+#ifdef CONFIG_USB_HCI -+int rtw_hw_wps_pbc = 1; -+#else -+int rtw_hw_wps_pbc = 0; -+#endif -+ -+#ifdef CONFIG_TX_MCAST2UNI -+int rtw_mc2u_disable = 0; -+#endif // CONFIG_TX_MCAST2UNI -+ -+int rtw_mac_phy_mode = 0; //0:by efuse, 1:smsp, 2:dmdp, 3:dmsp. -+ -+#ifdef CONFIG_80211D -+int rtw_80211d = 0; -+#endif -+ -+char* ifname = "wlan%d"; -+module_param(ifname, charp, 0644); -+MODULE_PARM_DESC(ifname, "The default name to allocate for first interface"); -+ -+char* if2name = "wlan%d"; -+module_param(if2name, charp, 0644); -+MODULE_PARM_DESC(if2name, "The default name to allocate for second interface"); -+ -+char* rtw_initmac = 0; // temp mac address if users want to use instead of the mac address in Efuse -+ -+#ifdef CONFIG_MULTI_VIR_IFACES -+int rtw_ext_iface_num = 1;//primary/secondary iface is excluded -+module_param(rtw_ext_iface_num, int, 0644); -+#endif //CONFIG_MULTI_VIR_IFACES -+ -+module_param(rtw_initmac, charp, 0644); -+module_param(rtw_channel_plan, int, 0644); -+module_param(rtw_chip_version, int, 0644); -+module_param(rtw_rfintfs, int, 0644); -+module_param(rtw_lbkmode, int, 0644); -+module_param(rtw_network_mode, int, 0644); -+module_param(rtw_channel, int, 0644); -+module_param(rtw_mp_mode, int, 0644); -+module_param(rtw_wmm_enable, int, 0644); -+module_param(rtw_vrtl_carrier_sense, int, 0644); -+module_param(rtw_vcs_type, int, 0644); -+module_param(rtw_busy_thresh, int, 0644); -+#ifdef CONFIG_80211N_HT -+module_param(rtw_ht_enable, int, 0644); -+module_param(rtw_cbw40_enable, int, 0644); -+module_param(rtw_ampdu_enable, int, 0644); -+module_param(rtw_rx_stbc, int, 0644); -+module_param(rtw_ampdu_amsdu, int, 0644); -+#endif -+ -+module_param(rtw_lowrate_two_xmit, int, 0644); -+ -+module_param(rtw_rf_config, int, 0644); -+module_param(rtw_power_mgnt, int, 0644); -+module_param(rtw_low_power, int, 0644); -+module_param(rtw_wifi_spec, int, 0644); -+ -+module_param(rtw_special_rf_path, int, 0644); -+ -+module_param(rtw_antdiv_cfg, int, 0644); -+ -+ -+module_param(rtw_enusbss, int, 0644); -+module_param(rtw_hwpdn_mode, int, 0644); -+module_param(rtw_hwpwrp_detect, int, 0644); -+ -+module_param(rtw_hw_wps_pbc, int, 0644); -+ -+#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -+char *rtw_adaptor_info_caching_file_path= "/data/misc/wifi/rtw_cache"; -+module_param(rtw_adaptor_info_caching_file_path, charp, 0644); -+MODULE_PARM_DESC(rtw_adaptor_info_caching_file_path, "The path of adapter info cache file"); -+#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE -+ -+#ifdef CONFIG_LAYER2_ROAMING -+uint rtw_max_roaming_times=2; -+module_param(rtw_max_roaming_times, uint, 0644); -+MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try"); -+#endif //CONFIG_LAYER2_ROAMING -+ -+#ifdef CONFIG_IOL -+bool rtw_force_iol=_FALSE; -+module_param(rtw_force_iol, bool, 0644); -+MODULE_PARM_DESC(rtw_force_iol,"Force to enable IOL"); -+#endif //CONFIG_IOL -+ -+#ifdef CONFIG_FILE_FWIMG -+char *rtw_fw_file_path= ""; -+module_param(rtw_fw_file_path, charp, 0644); -+MODULE_PARM_DESC(rtw_fw_file_path, "The path of fw image"); -+#endif //CONFIG_FILE_FWIMG -+ -+#ifdef CONFIG_TX_MCAST2UNI -+module_param(rtw_mc2u_disable, int, 0644); -+#endif // CONFIG_TX_MCAST2UNI -+ -+module_param(rtw_mac_phy_mode, int, 0644); -+ -+#ifdef CONFIG_80211D -+module_param(rtw_80211d, int, 0644); -+#endif -+ -+uint rtw_notch_filter = RTW_NOTCH_FILTER; -+module_param(rtw_notch_filter, uint, 0644); -+MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P"); -+ -+static uint loadparam( _adapter *padapter, _nic_hdl pnetdev); -+int _netdev_open(struct net_device *pnetdev); -+int netdev_open (struct net_device *pnetdev); -+static int netdev_close (struct net_device *pnetdev); -+ -+//#ifdef RTK_DMP_PLATFORM -+#ifdef CONFIG_PROC_DEBUG -+#define RTL8192C_PROC_NAME "rtl819xC" -+#define RTL8192D_PROC_NAME "rtl819xD" -+static char rtw_proc_name[IFNAMSIZ]; -+static struct proc_dir_entry *rtw_proc = NULL; -+static int rtw_proc_cnt = 0; -+ -+#define RTW_PROC_NAME DRV_NAME -+ -+void rtw_proc_init_one(struct net_device *dev) -+{ -+#if(LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) -+ struct proc_dir_entry *dir_dev = NULL; -+ struct proc_dir_entry *entry=NULL; -+ _adapter *padapter = rtw_netdev_priv(dev); -+ u8 rf_type; -+ -+ if(rtw_proc == NULL) -+ { -+ if(padapter->chip_type == RTL8188C_8192C) -+ { -+ _rtw_memcpy(rtw_proc_name, RTL8192C_PROC_NAME, sizeof(RTL8192C_PROC_NAME)); -+ } -+ else if(padapter->chip_type == RTL8192D) -+ { -+ _rtw_memcpy(rtw_proc_name, RTL8192D_PROC_NAME, sizeof(RTL8192D_PROC_NAME)); -+ } -+ else if(padapter->chip_type == RTL8723A) -+ { -+ _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); -+ } -+ else if(padapter->chip_type == RTL8188E) -+ { -+ _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); -+ } -+ else -+ { -+ _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); -+ } -+ -+#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, proc_net); -+#else -+ rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net); -+#endif -+ if (rtw_proc == NULL) { -+ DBG_871X(KERN_ERR "Unable to create rtw_proc directory\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("log_level", S_IFREG | S_IRUGO, -+ rtw_proc, proc_get_log_level, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_log_level; -+ -+#ifdef DBG_MEM_ALLOC -+ entry = create_proc_read_entry("mstat", S_IFREG | S_IRUGO, -+ rtw_proc, proc_get_mstat, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+#endif /* DBG_MEM_ALLOC */ -+ } -+ -+ -+ -+ if(padapter->dir_dev == NULL) -+ { -+ padapter->dir_dev = create_proc_entry(dev->name, -+ S_IFDIR | S_IRUGO | S_IXUGO, -+ rtw_proc); -+ -+ dir_dev = padapter->dir_dev; -+ -+ if(dir_dev==NULL) -+ { -+ if(rtw_proc_cnt == 0) -+ { -+ if(rtw_proc){ -+#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ remove_proc_entry(rtw_proc_name, proc_net); -+#else -+ remove_proc_entry(rtw_proc_name, init_net.proc_net); -+#endif -+ rtw_proc = NULL; -+ } -+ } -+ -+ DBG_871X("Unable to create dir_dev directory\n"); -+ return; -+ } -+ } -+ else -+ { -+ return; -+ } -+ -+ rtw_proc_cnt++; -+ -+ entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_write_reg, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_write_reg; -+ -+ entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_read_reg, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_read_reg; -+ -+ -+ entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_fwstate, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ -+ entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_sec_info, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ -+ entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_mlmext_state, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ -+ entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_qos_option, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_ht_option, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rf_info, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_ap_info, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_adapter_state, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_trx_info, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_mac_reg_dump1, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_mac_reg_dump2, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_mac_reg_dump3, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_bb_reg_dump1, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_bb_reg_dump2, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_bb_reg_dump3, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rf_reg_dump1, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rf_reg_dump2, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) { -+ entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rf_reg_dump3, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rf_reg_dump4, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ } -+ -+#ifdef CONFIG_AP_MODE -+ -+ entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_all_sta_info, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+ entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_malloc_cnt, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+#endif -+ -+#ifdef CONFIG_FIND_BEST_CHANNEL -+ entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_best_channel, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_best_channel; -+#endif -+ -+ entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rx_signal, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_rx_signal; -+ -+ entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_ht_enable, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_ht_enable; -+ -+ entry = create_proc_read_entry("cbw40_enable", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_cbw40_enable, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_cbw40_enable; -+ -+ entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_ampdu_enable, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_ampdu_enable; -+ -+ entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rx_stbc, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_rx_stbc; -+ -+ -+ entry = create_proc_read_entry("path_rssi", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_two_path_rssi, dev); -+ -+ entry = create_proc_read_entry("vid", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_vid, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("pid", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_pid, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ -+ entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_rssi_disp, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_rssi_disp; -+ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ entry = create_proc_read_entry("sreset", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_sreset, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_sreset; -+#endif /* DBG_CONFIG_ERROR_DETECT */ -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ entry = create_proc_read_entry("dm_adaptivity", S_IFREG | S_IRUGO, -+ dir_dev, proc_get_dm_adaptivity, dev); -+ if (!entry) { -+ DBG_871X("Unable to create_proc_read_entry!\n"); -+ return; -+ } -+ entry->write_proc = proc_set_dm_adaptivity; -+#endif /* CONFIG_DM_ADAPTIVITY */ -+ -+#else /* kernel version < 3.10 */ -+ DBG_871X(KERN_ERR "Unable to create /proc entry in this kernel version\n"); -+#endif -+} -+ -+void rtw_proc_remove_one(struct net_device *dev) -+{ -+ struct proc_dir_entry *dir_dev = NULL; -+ _adapter *padapter = rtw_netdev_priv(dev); -+ u8 rf_type; -+ -+ dir_dev = padapter->dir_dev; -+ padapter->dir_dev = NULL; -+ -+ if (dir_dev) { -+ -+ remove_proc_entry("write_reg", dir_dev); -+ remove_proc_entry("read_reg", dir_dev); -+ remove_proc_entry("fwstate", dir_dev); -+ remove_proc_entry("sec_info", dir_dev); -+ remove_proc_entry("mlmext_state", dir_dev); -+ remove_proc_entry("qos_option", dir_dev); -+ remove_proc_entry("ht_option", dir_dev); -+ remove_proc_entry("rf_info", dir_dev); -+ remove_proc_entry("ap_info", dir_dev); -+ remove_proc_entry("adapter_state", dir_dev); -+ remove_proc_entry("trx_info", dir_dev); -+ -+ remove_proc_entry("mac_reg_dump1", dir_dev); -+ remove_proc_entry("mac_reg_dump2", dir_dev); -+ remove_proc_entry("mac_reg_dump3", dir_dev); -+ remove_proc_entry("bb_reg_dump1", dir_dev); -+ remove_proc_entry("bb_reg_dump2", dir_dev); -+ remove_proc_entry("bb_reg_dump3", dir_dev); -+ remove_proc_entry("rf_reg_dump1", dir_dev); -+ remove_proc_entry("rf_reg_dump2", dir_dev); -+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); -+ if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) { -+ remove_proc_entry("rf_reg_dump3", dir_dev); -+ remove_proc_entry("rf_reg_dump4", dir_dev); -+ } -+#ifdef CONFIG_AP_MODE -+ remove_proc_entry("all_sta_info", dir_dev); -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+ remove_proc_entry("_malloc_cnt", dir_dev); -+#endif -+ -+#ifdef CONFIG_FIND_BEST_CHANNEL -+ remove_proc_entry("best_channel", dir_dev); -+#endif -+ remove_proc_entry("rx_signal", dir_dev); -+ -+ remove_proc_entry("cbw40_enable", dir_dev); -+ -+ remove_proc_entry("ht_enable", dir_dev); -+ -+ remove_proc_entry("ampdu_enable", dir_dev); -+ -+ remove_proc_entry("rx_stbc", dir_dev); -+ -+ remove_proc_entry("path_rssi", dir_dev); -+ -+ remove_proc_entry("vid", dir_dev); -+ -+ remove_proc_entry("pid", dir_dev); -+ -+ remove_proc_entry("rssi_disp", dir_dev); -+ -+#if defined(DBG_CONFIG_ERROR_DETECT) -+ remove_proc_entry("sreset", dir_dev); -+#endif /* DBG_CONFIG_ERROR_DETECT */ -+ -+#ifdef CONFIG_DM_ADAPTIVITY -+ remove_proc_entry("dm_adaptivity", dir_dev); -+#endif -+ -+ remove_proc_entry(dev->name, rtw_proc); -+ dir_dev = NULL; -+ -+ } -+ else -+ { -+ return; -+ } -+ -+ rtw_proc_cnt--; -+ -+ if(rtw_proc_cnt == 0) -+ { -+ if(rtw_proc){ -+ remove_proc_entry("ver_info", rtw_proc); -+ -+ remove_proc_entry("log_level", rtw_proc); -+ #ifdef DBG_MEM_ALLOC -+ remove_proc_entry("mstat", rtw_proc); -+ #endif /* DBG_MEM_ALLOC */ -+#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ remove_proc_entry(rtw_proc_name, proc_net); -+#else -+ remove_proc_entry(rtw_proc_name, init_net.proc_net); -+#endif -+ rtw_proc = NULL; -+ } -+ } -+} -+#endif -+ -+uint loadparam( _adapter *padapter, _nic_hdl pnetdev); -+uint loadparam( _adapter *padapter, _nic_hdl pnetdev) -+{ -+ -+ uint status = _SUCCESS; -+ struct registry_priv *registry_par = &padapter->registrypriv; -+ -+_func_enter_; -+ -+ registry_par->chip_version = (u8)rtw_chip_version; -+ registry_par->rfintfs = (u8)rtw_rfintfs; -+ registry_par->lbkmode = (u8)rtw_lbkmode; -+ //registry_par->hci = (u8)hci; -+ registry_par->network_mode = (u8)rtw_network_mode; -+ -+ _rtw_memcpy(registry_par->ssid.Ssid, "ANY", 3); -+ registry_par->ssid.SsidLength = 3; -+ -+ registry_par->channel = (u8)rtw_channel; -+ registry_par->wireless_mode = (u8)rtw_wireless_mode; -+ registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ; -+ registry_par->vcs_type = (u8)rtw_vcs_type; -+ registry_par->rts_thresh=(u16)rtw_rts_thresh; -+ registry_par->frag_thresh=(u16)rtw_frag_thresh; -+ registry_par->preamble = (u8)rtw_preamble; -+ registry_par->scan_mode = (u8)rtw_scan_mode; -+ registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr; -+ registry_par->soft_ap= (u8)rtw_soft_ap; -+ //registry_par->smart_ps = (u8)rtw_smart_ps; -+ registry_par->power_mgnt = (u8)rtw_power_mgnt; -+ registry_par->ips_mode = (u8)rtw_ips_mode; -+ registry_par->radio_enable = (u8)rtw_radio_enable; -+ registry_par->long_retry_lmt = (u8)rtw_long_retry_lmt; -+ registry_par->short_retry_lmt = (u8)rtw_short_retry_lmt; -+ registry_par->busy_thresh = (u16)rtw_busy_thresh; -+ //registry_par->qos_enable = (u8)rtw_qos_enable; -+ registry_par->ack_policy = (u8)rtw_ack_policy; -+ registry_par->mp_mode = (u8)rtw_mp_mode; -+ registry_par->software_encrypt = (u8)rtw_software_encrypt; -+ registry_par->software_decrypt = (u8)rtw_software_decrypt; -+ -+ registry_par->acm_method = (u8)rtw_acm_method; -+ -+ //UAPSD -+ registry_par->wmm_enable = (u8)rtw_wmm_enable; -+ registry_par->uapsd_enable = (u8)rtw_uapsd_enable; -+ registry_par->uapsd_max_sp = (u8)rtw_uapsd_max_sp; -+ registry_par->uapsd_acbk_en = (u8)rtw_uapsd_acbk_en; -+ registry_par->uapsd_acbe_en = (u8)rtw_uapsd_acbe_en; -+ registry_par->uapsd_acvi_en = (u8)rtw_uapsd_acvi_en; -+ registry_par->uapsd_acvo_en = (u8)rtw_uapsd_acvo_en; -+ -+#ifdef CONFIG_80211N_HT -+ registry_par->ht_enable = (u8)rtw_ht_enable; -+ registry_par->cbw40_enable = (u8)rtw_cbw40_enable; -+ registry_par->ampdu_enable = (u8)rtw_ampdu_enable; -+ registry_par->rx_stbc = (u8)rtw_rx_stbc; -+ registry_par->ampdu_amsdu = (u8)rtw_ampdu_amsdu; -+#endif -+ -+ registry_par->lowrate_two_xmit = (u8)rtw_lowrate_two_xmit; -+ registry_par->rf_config = (u8)rtw_rf_config; -+ registry_par->low_power = (u8)rtw_low_power; -+ -+ -+ registry_par->wifi_spec = (u8)rtw_wifi_spec; -+ registry_par->special_rf_path = (u8)rtw_special_rf_path; -+ registry_par->channel_plan = (u8)rtw_channel_plan; -+ -+#ifdef CONFIG_BT_COEXIST -+ registry_par->bt_iso = (u8)rtw_bt_iso; -+ registry_par->bt_sco = (u8)rtw_bt_sco; -+ registry_par->bt_ampdu = (u8)rtw_bt_ampdu; -+#endif -+ registry_par->bAcceptAddbaReq = (u8)rtw_AcceptAddbaReq; -+ -+ registry_par->antdiv_cfg = (u8)rtw_antdiv_cfg; -+ -+#ifdef CONFIG_AUTOSUSPEND -+ registry_par->usbss_enable = (u8)rtw_enusbss;//0:disable,1:enable -+#endif -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+ registry_par->hwpdn_mode = (u8)rtw_hwpdn_mode;//0:disable,1:enable,2:by EFUSE config -+ registry_par->hwpwrp_detect = (u8)rtw_hwpwrp_detect;//0:disable,1:enable -+#endif -+ -+ registry_par->hw_wps_pbc = (u8)rtw_hw_wps_pbc; -+ -+#ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE -+ snprintf(registry_par->adaptor_info_caching_file_path, PATH_LENGTH_MAX, "%s", rtw_adaptor_info_caching_file_path); -+ registry_par->adaptor_info_caching_file_path[PATH_LENGTH_MAX-1]=0; -+#endif -+ -+#ifdef CONFIG_LAYER2_ROAMING -+ registry_par->max_roaming_times = (u8)rtw_max_roaming_times; -+#ifdef CONFIG_INTEL_WIDI -+ registry_par->max_roaming_times = (u8)rtw_max_roaming_times + 2; -+#endif // CONFIG_INTEL_WIDI -+#endif -+ -+#ifdef CONFIG_IOL -+ registry_par->force_iol = rtw_force_iol; -+#endif -+ -+ registry_par->mac_phy_mode = rtw_mac_phy_mode; -+ -+#ifdef CONFIG_80211D -+ registry_par->enable80211d = (u8)rtw_80211d; -+#endif -+ -+ snprintf(registry_par->ifname, 16, "%s", ifname); -+ snprintf(registry_par->if2name, 16, "%s", if2name); -+ -+ registry_par->notch_filter = (u8)rtw_notch_filter; -+ -+#ifdef CONFIG_MULTI_VIR_IFACES -+ registry_par->ext_iface_num = (u8)rtw_ext_iface_num; -+#endif //CONFIG_MULTI_VIR_IFACES -+ -+_func_exit_; -+ -+ return status; -+} -+ -+static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ struct sockaddr *addr = p; -+ -+ if(padapter->bup == _FALSE) -+ { -+ //DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], -+ //addr->sa_data[4], addr->sa_data[5]); -+ _rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); -+ //_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); -+ //padapter->bset_hwaddr = _TRUE; -+ } -+ -+ return 0; -+} -+ -+static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ struct recv_priv *precvpriv = &(padapter->recvpriv); -+ -+ padapter->stats.tx_packets = pxmitpriv->tx_pkts;//pxmitpriv->tx_pkts++; -+ padapter->stats.rx_packets = precvpriv->rx_pkts;//precvpriv->rx_pkts++; -+ padapter->stats.tx_dropped = pxmitpriv->tx_drop; -+ padapter->stats.rx_dropped = precvpriv->rx_drop; -+ padapter->stats.tx_bytes = pxmitpriv->tx_bytes; -+ padapter->stats.rx_bytes = precvpriv->rx_bytes; -+ -+ return &padapter->stats; -+} -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+/* -+ * AC to queue mapping -+ * -+ * AC_VO -> queue 0 -+ * AC_VI -> queue 1 -+ * AC_BE -> queue 2 -+ * AC_BK -> queue 3 -+ */ -+static const u16 rtw_1d_to_queue[8] = { 2, 3, 3, 2, 1, 1, 0, 0 }; -+ -+/* Given a data frame determine the 802.1p/1d tag to use. */ -+unsigned int rtw_classify8021d(struct sk_buff *skb) -+{ -+ unsigned int dscp; -+ -+ /* skb->priority values from 256->263 are magic values to -+ * directly indicate a specific 802.1d priority. This is used -+ * to allow 802.1d priority to be passed directly in from VLAN -+ * tags, etc. -+ */ -+ if (skb->priority >= 256 && skb->priority <= 263) -+ return skb->priority - 256; -+ -+ switch (skb->protocol) { -+ case htons(ETH_P_IP): -+ dscp = ip_hdr(skb)->tos & 0xfc; -+ break; -+ default: -+ return 0; -+ } -+ -+ return dscp >> 5; -+} -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(4,19,0)) -+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, -+ struct net_device *sb_dev, -+ select_queue_fallback_t fallback) -+#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(3,14,0)) -+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, -+ void *accel_priv, -+ select_queue_fallback_t fallback) -+#else -+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb) -+#endif -+{ -+ _adapter *padapter = rtw_netdev_priv(dev); -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ skb->priority = rtw_classify8021d(skb); -+ -+ if(pmlmepriv->acm_mask != 0) -+ { -+ skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority); -+ } -+ -+ return rtw_1d_to_queue[skb->priority]; -+} -+ -+u16 rtw_recv_select_queue(struct sk_buff *skb) -+{ -+ struct iphdr *piphdr; -+ unsigned int dscp; -+ u16 eth_type; -+ u32 priority; -+ u8 *pdata = skb->data; -+ -+ _rtw_memcpy(ð_type, pdata+(ETH_ALEN<<1), 2); -+ -+ switch (eth_type) { -+ case htons(ETH_P_IP): -+ -+ piphdr = (struct iphdr *)(pdata+ETH_HLEN); -+ -+ dscp = piphdr->tos & 0xfc; -+ -+ priority = dscp >> 5; -+ -+ break; -+ default: -+ priority = 0; -+ } -+ -+ return rtw_1d_to_queue[priority]; -+ -+} -+ -+#endif -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+static const struct net_device_ops rtw_netdev_ops = { -+ .ndo_open = netdev_open, -+ .ndo_stop = netdev_close, -+ .ndo_start_xmit = rtw_xmit_entry, -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ .ndo_select_queue = rtw_select_queue, -+#endif -+ .ndo_set_mac_address = rtw_net_set_mac_address, -+ .ndo_get_stats = rtw_net_get_stats, -+ .ndo_do_ioctl = rtw_ioctl, -+}; -+#endif -+ -+int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) -+{ -+ _adapter *padapter = rtw_netdev_priv(pnetdev); -+ -+#ifdef CONFIG_EASY_REPLACEMENT -+ struct net_device *TargetNetdev = NULL; -+ _adapter *TargetAdapter = NULL; -+ struct net *devnet = NULL; -+ -+ if(padapter->bDongle == 1) -+ { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ TargetNetdev = dev_get_by_name("wlan0"); -+#else -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+ devnet = pnetdev->nd_net; -+ #else -+ devnet = dev_net(pnetdev); -+ #endif -+ TargetNetdev = dev_get_by_name(devnet, "wlan0"); -+#endif -+ if(TargetNetdev) { -+ DBG_871X("Force onboard module driver disappear !!!\n"); -+ TargetAdapter = rtw_netdev_priv(TargetNetdev); -+ TargetAdapter->DriverState = DRIVER_DISAPPEAR; -+ -+ padapter->pid[0] = TargetAdapter->pid[0]; -+ padapter->pid[1] = TargetAdapter->pid[1]; -+ padapter->pid[2] = TargetAdapter->pid[2]; -+ -+ dev_put(TargetNetdev); -+ unregister_netdev(TargetNetdev); -+ -+ if(TargetAdapter->chip_type == padapter->chip_type) -+ rtw_proc_remove_one(TargetNetdev); -+ -+ padapter->DriverState = DRIVER_REPLACE_DONGLE; -+ } -+ } -+#endif //CONFIG_EASY_REPLACEMENT -+ -+ if(dev_alloc_name(pnetdev, ifname) < 0) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail! \n")); -+ } -+ -+ netif_carrier_off(pnetdev); -+ //rtw_netif_stop_queue(pnetdev); -+ -+ return 0; -+} -+ -+static const struct device_type wlan_type = { -+ .name = "wlan", -+}; -+ -+struct net_device *rtw_init_netdev(_adapter *old_padapter) -+{ -+ _adapter *padapter; -+ struct net_device *pnetdev; -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n")); -+ -+ if(old_padapter != NULL) -+ pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(_adapter), (void *)old_padapter); -+ else -+ pnetdev = rtw_alloc_etherdev(sizeof(_adapter)); -+ -+ if (!pnetdev) -+ return NULL; -+ -+ pnetdev->dev.type = &wlan_type; -+ padapter = rtw_netdev_priv(pnetdev); -+ padapter->pnetdev = pnetdev; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) -+ SET_MODULE_OWNER(pnetdev); -+#endif -+ -+ //pnetdev->init = NULL; -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+ DBG_871X("register rtw_netdev_ops to netdev_ops\n"); -+ pnetdev->netdev_ops = &rtw_netdev_ops; -+#else -+ pnetdev->open = netdev_open; -+ pnetdev->stop = netdev_close; -+ pnetdev->hard_start_xmit = rtw_xmit_entry; -+ pnetdev->set_mac_address = rtw_net_set_mac_address; -+ pnetdev->get_stats = rtw_net_get_stats; -+ pnetdev->do_ioctl = rtw_ioctl; -+#endif -+ -+ -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ pnetdev->features |= NETIF_F_IP_CSUM; -+#endif -+ //pnetdev->tx_timeout = NULL; -+ pnetdev->watchdog_timeo = HZ*3; /* 3 second timeout */ -+#ifdef CONFIG_WIRELESS_EXT -+ pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def; -+#endif -+ -+#ifdef WIRELESS_SPY -+ //priv->wireless_data.spy_data = &priv->spy_data; -+ //pnetdev->wireless_data = &priv->wireless_data; -+#endif -+ -+ //step 2. -+ loadparam(padapter, pnetdev); -+ -+ return pnetdev; -+ -+} -+ -+void rtw_unregister_netdevs(struct dvobj_priv *dvobj) -+{ -+ int i; -+ _adapter *padapter = NULL; -+ -+ for (i=0;iiface_nums;i++) { -+ struct net_device *pnetdev = NULL; -+ -+ padapter = dvobj->padapters[i]; -+ -+ if (padapter == NULL) -+ continue; -+ -+ pnetdev = padapter->pnetdev; -+ -+ if((padapter->DriverState != DRIVER_DISAPPEAR) && pnetdev) { -+ unregister_netdev(pnetdev); //will call netdev_close() -+ rtw_proc_remove_one(pnetdev); -+ } -+ -+ #ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_unregister(padapter->rtw_wdev); -+ #endif -+ } -+ -+} -+ -+u32 rtw_start_drv_threads(_adapter *padapter) -+{ -+ -+ u32 _status = _SUCCESS; -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_start_drv_threads\n")); -+#ifdef CONFIG_XMIT_THREAD_MODE -+ padapter->xmitThread = kthread_run(rtw_xmit_thread, padapter, "RTW_XMIT_THREAD"); -+ if(IS_ERR(padapter->xmitThread)) -+ _status = _FAIL; -+#endif -+ -+#ifdef CONFIG_RECV_THREAD_MODE -+ padapter->recvThread = kthread_run(rtw_recv_thread, padapter, "RTW_RECV_THREAD"); -+ if(IS_ERR(padapter->recvThread)) -+ _status = _FAIL; -+#endif -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->isprimary == _TRUE) -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD"); -+ if(IS_ERR(padapter->cmdThread)) -+ _status = _FAIL; -+ else -+ _rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema); //wait for cmd_thread to run -+ } -+ -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+ padapter->evtThread = kthread_run(event_thread, padapter, "RTW_EVENT_THREAD"); -+ if(IS_ERR(padapter->evtThread)) -+ _status = _FAIL; -+#endif -+ -+ return _status; -+ -+} -+ -+void rtw_stop_drv_threads (_adapter *padapter) -+{ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n")); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ if(padapter->isprimary == _TRUE) -+#endif //CONFIG_CONCURRENT_MODE -+ { -+ rtw_stop_cmd_thread(padapter); -+ } -+ -+#ifdef CONFIG_EVENT_THREAD_MODE -+ _rtw_up_sema(&padapter->evtpriv.evt_notify); -+ if(padapter->evtThread){ -+ _rtw_down_sema(&padapter->evtpriv.terminate_evtthread_sema); -+ } -+#endif -+ -+#ifdef CONFIG_XMIT_THREAD_MODE -+ // Below is to termindate tx_thread... -+ _rtw_up_sema(&padapter->xmitpriv.xmit_sema); -+ _rtw_down_sema(&padapter->xmitpriv.terminate_xmitthread_sema); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt: rtw_xmit_thread can be terminated ! \n")); -+#endif -+ -+#ifdef CONFIG_RECV_THREAD_MODE -+ // Below is to termindate rx_thread... -+ _rtw_up_sema(&padapter->recvpriv.recv_sema); -+ _rtw_down_sema(&padapter->recvpriv.terminate_recvthread_sema); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt:recv_thread can be terminated! \n")); -+#endif -+ -+ -+} -+ -+u8 rtw_init_default_value(_adapter *padapter); -+u8 rtw_init_default_value(_adapter *padapter) -+{ -+ u8 ret = _SUCCESS; -+ struct registry_priv* pregistrypriv = &padapter->registrypriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct mlme_priv *pmlmepriv= &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ -+ //xmit_priv -+ pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense; -+ pxmitpriv->vcs = pregistrypriv->vcs_type; -+ pxmitpriv->vcs_type = pregistrypriv->vcs_type; -+ //pxmitpriv->rts_thresh = pregistrypriv->rts_thresh; -+ pxmitpriv->frag_len = pregistrypriv->frag_thresh; -+ -+ -+ -+ //recv_priv -+ -+ -+ //mlme_priv -+ pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec -+ pmlmepriv->scan_mode = SCAN_ACTIVE; -+ -+ //qos_priv -+ //pmlmepriv->qospriv.qos_option = pregistrypriv->wmm_enable; -+ -+ //ht_priv -+#ifdef CONFIG_80211N_HT -+ pmlmepriv->htpriv.ampdu_enable = _FALSE;//set to disabled -+#endif -+ -+ //security_priv -+ //rtw_get_encrypt_decrypt_from_registrypriv(padapter); -+ psecuritypriv->binstallGrpkey = _FAIL; -+ psecuritypriv->sw_encrypt=pregistrypriv->software_encrypt; -+ psecuritypriv->sw_decrypt=pregistrypriv->software_decrypt; -+ -+ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; //open system -+ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; -+ -+ psecuritypriv->dot11PrivacyKeyIndex = 0; -+ -+ psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; -+ psecuritypriv->dot118021XGrpKeyid = 1; -+ -+ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; -+ psecuritypriv->ndisencryptstatus = Ndis802_11WEPDisabled; -+ -+ -+ //pwrctrl_priv -+ -+ -+ //registry_priv -+ rtw_init_registrypriv_dev_network(padapter); -+ rtw_update_registrypriv_dev_network(padapter); -+ -+ -+ //hal_priv -+ rtw_hal_def_value_init(padapter); -+ -+ //misc. -+ padapter->bReadPortCancel = _FALSE; -+ padapter->bWritePortCancel = _FALSE; -+ padapter->bRxRSSIDisplay = 0; -+ padapter->bForceWriteInitGain = 1; -+ padapter->bNotifyChannelChange = 0; -+#ifdef CONFIG_P2P -+ padapter->bShowGetP2PState = 1; -+#endif -+ return ret; -+} -+ -+struct dvobj_priv *devobj_init(void) -+{ -+ struct dvobj_priv *pdvobj = NULL; -+ -+ if ((pdvobj = (struct dvobj_priv*)rtw_zmalloc(sizeof(*pdvobj))) == NULL) -+ return NULL; -+ -+ _rtw_mutex_init(&pdvobj->hw_init_mutex); -+ _rtw_mutex_init(&pdvobj->h2c_fwcmd_mutex); -+ _rtw_mutex_init(&pdvobj->setch_mutex); -+ _rtw_mutex_init(&pdvobj->setbw_mutex); -+ -+ pdvobj->processing_dev_remove = _FALSE; -+ -+ return pdvobj; -+} -+ -+void devobj_deinit(struct dvobj_priv *pdvobj) -+{ -+ if(!pdvobj) -+ return; -+ -+ _rtw_mutex_free(&pdvobj->hw_init_mutex); -+ _rtw_mutex_free(&pdvobj->h2c_fwcmd_mutex); -+ _rtw_mutex_free(&pdvobj->setch_mutex); -+ _rtw_mutex_free(&pdvobj->setbw_mutex); -+ -+ rtw_mfree((u8*)pdvobj, sizeof(*pdvobj)); -+} -+ -+u8 rtw_reset_drv_sw(_adapter *padapter) -+{ -+ u8 ret8=_SUCCESS; -+ struct mlme_priv *pmlmepriv= &padapter->mlmepriv; -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ -+ //hal_priv -+ rtw_hal_def_value_init(padapter); -+ padapter->bReadPortCancel = _FALSE; -+ padapter->bWritePortCancel = _FALSE; -+ padapter->bRxRSSIDisplay = 0; -+ pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec -+ -+ pwrctrlpriv->bips_processing = _FALSE; -+ pwrctrlpriv->rf_pwrstate = rf_on; -+ -+ padapter->xmitpriv.tx_pkts = 0; -+ padapter->recvpriv.rx_pkts = 0; -+ -+ pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE; -+ -+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING); -+ -+#ifdef CONFIG_AUTOSUSPEND -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,34)) -+ adapter_to_dvobj(padapter)->pusbdev->autosuspend_disabled = 1;//autosuspend disabled by the user -+ #endif -+#endif -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+ rtw_hal_sreset_reset_value(padapter); -+#endif -+ pwrctrlpriv->pwr_state_check_cnts = 0; -+ -+ //mlmeextpriv -+ padapter->mlmeextpriv.sitesurvey_res.state= SCAN_DISABLE; -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ rtw_set_signal_stat_timer(&padapter->recvpriv); -+#endif -+ -+ return ret8; -+} -+ -+ -+u8 rtw_init_drv_sw(_adapter *padapter) -+{ -+ -+ u8 ret8=_SUCCESS; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_init_drv_sw\n")); -+ -+ if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init cmd_priv\n")); -+ ret8=_FAIL; -+ goto exit; -+ } -+ -+ padapter->cmdpriv.padapter=padapter; -+ -+ if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init evt_priv\n")); -+ ret8=_FAIL; -+ goto exit; -+ } -+ -+ -+ if (rtw_init_mlme_priv(padapter) == _FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init mlme_priv\n")); -+ ret8=_FAIL; -+ goto exit; -+ } -+ -+#ifdef CONFIG_P2P -+ rtw_init_wifidirect_timers(padapter); -+ init_wifidirect_info(padapter, P2P_ROLE_DISABLE); -+ reset_global_wifidirect_info(padapter); -+ #ifdef CONFIG_IOCTL_CFG80211 -+ rtw_init_cfg80211_wifidirect_info(padapter); -+ #endif -+#ifdef CONFIG_WFD -+ if(rtw_init_wifi_display_info(padapter) == _FAIL) -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init init_wifi_display_info\n")); -+#endif -+#endif /* CONFIG_P2P */ -+ -+ if(init_mlme_ext_priv(padapter) == _FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init mlme_ext_priv\n")); -+ ret8=_FAIL; -+ goto exit; -+ } -+ -+#ifdef CONFIG_TDLS -+ if(rtw_init_tdls_info(padapter) == _FAIL) -+ { -+ DBG_871X("Can't rtw_init_tdls_info\n"); -+ ret8=_FAIL; -+ goto exit; -+ } -+#endif //CONFIG_TDLS -+ -+ if(_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) -+ { -+ DBG_871X("Can't _rtw_init_xmit_priv\n"); -+ ret8=_FAIL; -+ goto exit; -+ } -+ -+ if(_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL) -+ { -+ DBG_871X("Can't _rtw_init_recv_priv\n"); -+ ret8=_FAIL; -+ goto exit; -+ } -+ // add for CONFIG_IEEE80211W, none 11w also can use -+ _rtw_spinlock_init(&padapter->security_key_mutex); -+ -+ // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). -+ //_rtw_memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); -+ -+ //_init_timer(&(padapter->securitypriv.tkip_timer), padapter->pifp, rtw_use_tkipkey_handler, padapter); -+ -+ if(_rtw_init_sta_priv(&padapter->stapriv) == _FAIL) -+ { -+ DBG_871X("Can't _rtw_init_sta_priv\n"); -+ ret8=_FAIL; -+ goto exit; -+ } -+ -+ padapter->stapriv.padapter = padapter; -+ padapter->setband = GHZ24_50; -+ rtw_init_bcmc_stainfo(padapter); -+ -+ rtw_init_pwrctrl_priv(padapter); -+ -+ //_rtw_memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv));//move to mlme_priv -+ -+#ifdef CONFIG_MP_INCLUDED -+ if (init_mp_priv(padapter) == _FAIL) { -+ DBG_871X("%s: initialize MP private data Fail!\n", __func__); -+ } -+#endif -+ -+ ret8 = rtw_init_default_value(padapter); -+ -+ rtw_hal_dm_init(padapter); -+ rtw_hal_sw_led_init(padapter); -+ -+#ifdef DBG_CONFIG_ERROR_DETECT -+ rtw_hal_sreset_init(padapter); -+#endif -+ -+#ifdef CONFIG_INTEL_WIDI -+ if(rtw_init_intel_widi(padapter) == _FAIL) -+ { -+ DBG_871X("Can't rtw_init_intel_widi\n"); -+ ret8=_FAIL; -+ goto exit; -+ } -+#endif //CONFIG_INTEL_WIDI -+ -+#ifdef CONFIG_BR_EXT -+ _rtw_spinlock_init(&padapter->br_ext_lock); -+#endif // CONFIG_BR_EXT -+ -+exit: -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_init_drv_sw\n")); -+ -+ _func_exit_; -+ -+ return ret8; -+ -+} -+ -+void rtw_cancel_all_timer(_adapter *padapter) -+{ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n")); -+ -+ _cancel_timer_ex(&padapter->mlmepriv.assoc_timer); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete! \n")); -+ -+ //_cancel_timer_ex(&padapter->securitypriv.tkip_timer); -+ //RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel tkip_timer! \n")); -+ -+ _cancel_timer_ex(&padapter->mlmepriv.scan_to_timer); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer! \n")); -+ -+ _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n")); -+ -+ // cancel sw led timer -+ rtw_hal_sw_led_deinit(padapter); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds! \n")); -+ -+ _cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+#ifdef CONFIG_P2P -+ _cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer); -+#endif //CONFIG_P2P -+#endif //CONFIG_IOCTL_CFG80211 -+ -+#ifdef CONFIG_SET_SCAN_DENY_TIMER -+ _cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer); -+ rtw_clear_scan_deny(padapter); -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n")); -+#endif -+ -+#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS -+ _cancel_timer_ex(&padapter->recvpriv.signal_stat_timer); -+#endif -+ -+ // cancel dm timer -+ rtw_hal_dm_deinit(padapter); -+ -+#ifdef CONFIG_PLATFORM_FS_MX61 -+ msleep(50); -+#endif -+} -+ -+u8 rtw_free_drv_sw(_adapter *padapter) -+{ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("==>rtw_free_drv_sw")); -+ -+ -+ //we can call rtw_p2p_enable here, but: -+ // 1. rtw_p2p_enable may have IO operation -+ // 2. rtw_p2p_enable is bundled with wext interface -+ #ifdef CONFIG_P2P -+ { -+ struct wifidirect_info *pwdinfo = &padapter->wdinfo; -+ if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) -+ { -+ _cancel_timer_ex( &pwdinfo->find_phase_timer ); -+ _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); -+ _cancel_timer_ex( &pwdinfo->pre_tx_scan_timer); -+#ifdef CONFIG_CONCURRENT_MODE -+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer ); -+#endif // CONFIG_CONCURRENT_MODE -+ rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); -+ } -+ } -+ #endif -+ // add for CONFIG_IEEE80211W, none 11w also can use -+ _rtw_spinlock_free(&padapter->security_key_mutex); -+ -+#ifdef CONFIG_BR_EXT -+ _rtw_spinlock_free(&padapter->br_ext_lock); -+#endif // CONFIG_BR_EXT -+ -+#ifdef CONFIG_INTEL_WIDI -+ rtw_free_intel_widi(padapter); -+#endif //CONFIG_INTEL_WIDI -+ -+ free_mlme_ext_priv(&padapter->mlmeextpriv); -+ -+#ifdef CONFIG_TDLS -+ //rtw_free_tdls_info(&padapter->tdlsinfo); -+#endif //CONFIG_TDLS -+ -+ rtw_free_cmd_priv(&padapter->cmdpriv); -+ -+ rtw_free_evt_priv(&padapter->evtpriv); -+ -+ rtw_free_mlme_priv(&padapter->mlmepriv); -+ -+ //free_io_queue(padapter); -+ -+ _rtw_free_xmit_priv(&padapter->xmitpriv); -+ -+ _rtw_free_sta_priv(&padapter->stapriv); //will free bcmc_stainfo here -+ -+ _rtw_free_recv_priv(&padapter->recvpriv); -+ -+ rtw_free_pwrctrl_priv(padapter); -+ -+ //rtw_mfree((void *)padapter, sizeof (padapter)); -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ free_drvext(&padapter->drvextpriv); -+#endif -+ -+ rtw_hal_free_data(padapter); -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("<==rtw_free_drv_sw\n")); -+ -+ //free the old_pnetdev -+ if(padapter->rereg_nd_name_priv.old_pnetdev) { -+ free_netdev(padapter->rereg_nd_name_priv.old_pnetdev); -+ padapter->rereg_nd_name_priv.old_pnetdev = NULL; -+ } -+ -+ // clear pbuddy_adapter to avoid access wrong pointer. -+ if(padapter->pbuddy_adapter != NULL) -+ { -+ padapter->pbuddy_adapter->pbuddy_adapter = NULL; -+ } -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_free_drv_sw\n")); -+ -+ return _SUCCESS; -+ -+} -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_USB_HCI -+ #include -+#endif -+ -+#ifdef CONFIG_MULTI_VIR_IFACES -+int _netdev_vir_if_open(struct net_device *pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ _adapter *primary_padapter = GET_PRIMARY_ADAPTER(padapter); -+ -+ DBG_871X(FUNC_NDEV_FMT" enter\n", FUNC_NDEV_ARG(pnetdev)); -+ -+ if(!primary_padapter) -+ goto _netdev_virtual_iface_open_error; -+ -+ if(primary_padapter->bup == _FALSE || primary_padapter->hw_init_completed == _FALSE) -+ { -+ _netdev_open(primary_padapter->pnetdev); -+ } -+ -+ if(padapter->bup == _FALSE && primary_padapter->bup == _TRUE && -+ primary_padapter->hw_init_completed == _TRUE) -+ { -+ int i; -+ -+ padapter->bDriverStopped = _FALSE; -+ padapter->bSurpriseRemoved = _FALSE; -+ padapter->bCardDisableWOHSM = _FALSE; -+ -+ _rtw_memcpy(padapter->HalData, primary_padapter->HalData, padapter->hal_data_sz); -+ -+ padapter->bFWReady = primary_padapter->bFWReady; -+ -+ if(rtw_start_drv_threads(padapter) == _FAIL) -+ { -+ goto _netdev_virtual_iface_open_error; -+ } -+ -+ padapter->dir_dev = NULL; -+ rtw_proc_init_one(pnetdev); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_init_wiphy(padapter); -+#endif -+ -+ padapter->bup = _TRUE; -+ padapter->hw_init_completed = _TRUE; -+ -+ rtw_start_mbssid_cam(padapter);//start mbssid_cam after bup = _TRUE & hw_init_completed = _TRUE -+ -+ } -+ -+ padapter->net_closed = _FALSE; -+ -+ _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); -+ -+ if(!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_start_queue(pnetdev); -+ else -+ rtw_netif_wake_queue(pnetdev); -+ -+ -+ DBG_871X(FUNC_NDEV_FMT" exit\n", FUNC_NDEV_ARG(pnetdev)); -+ return 0; -+ -+_netdev_virtual_iface_open_error: -+ -+ padapter->bup = _FALSE; -+ -+ netif_carrier_off(pnetdev); -+ rtw_netif_stop_queue(pnetdev); -+ -+ return (-1); -+ -+} -+ -+int netdev_vir_if_open(struct net_device *pnetdev) -+{ -+ int ret; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); -+ ret = _netdev_vir_if_open(pnetdev); -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); -+ return ret; -+} -+ -+static int netdev_vir_if_close(struct net_device *pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ -+ padapter->net_closed = _TRUE; -+ -+ if(pnetdev) -+ { -+ if (!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_stop_queue(pnetdev); -+ } -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_scan_abort(padapter); -+ wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE; -+#endif -+ -+ return 0; -+} -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+static const struct net_device_ops rtw_netdev_vir_if_ops = { -+ .ndo_open = netdev_vir_if_open, -+ .ndo_stop = netdev_vir_if_close, -+ .ndo_start_xmit = rtw_xmit_entry, -+ .ndo_set_mac_address = rtw_net_set_mac_address, -+ .ndo_get_stats = rtw_net_get_stats, -+ .ndo_do_ioctl = rtw_ioctl, -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ .ndo_select_queue = rtw_select_queue, -+#endif -+}; -+#endif -+ -+_adapter *rtw_drv_add_vir_if(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)) -+{ -+ -+ int res = _FAIL; -+ struct net_device *pnetdev=NULL; -+ _adapter *padapter = NULL; -+ struct dvobj_priv *pdvobjpriv; -+ u8 mac[ETH_ALEN]; -+ -+/* -+ if((primary_padapter->bup == _FALSE) || -+ (rtw_buddy_adapter_up(primary_padapter) == _FALSE)) -+ { -+ goto error_rtw_drv_add_iface; -+ } -+ -+*/ -+ /****** init netdev ******/ -+ pnetdev = rtw_init_netdev(NULL); -+ if (!pnetdev) -+ goto error_rtw_drv_add_iface; -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+ DBG_871X("register rtw_netdev_virtual_iface_ops to netdev_ops\n"); -+ pnetdev->netdev_ops = &rtw_netdev_vir_if_ops; -+#else -+ pnetdev->open = netdev_vir_if_open; -+ pnetdev->stop = netdev_vir_if_close; -+#endif -+ -+#ifdef CONFIG_NO_WIRELESS_HANDLERS -+ pnetdev->wireless_handlers = NULL; -+#endif -+ -+ /****** init adapter ******/ -+ padapter = rtw_netdev_priv(pnetdev); -+ _rtw_memcpy(padapter, primary_padapter, sizeof(_adapter)); -+ -+ // -+ padapter->bup = _FALSE; -+ padapter->net_closed = _TRUE; -+ padapter->hw_init_completed = _FALSE; -+ -+ -+ //set adapter_type/iface type -+ padapter->isprimary = _FALSE; -+ padapter->adapter_type = MAX_ADAPTER; -+ padapter->pbuddy_adapter = primary_padapter; -+#if 0 -+#ifndef CONFIG_HWPORT_SWAP //Port0 -> Pri , Port1 -> Sec -+ padapter->iface_type = IFACE_PORT1; -+#else -+ padapter->iface_type = IFACE_PORT0; -+#endif //CONFIG_HWPORT_SWAP -+#else -+ //extended virtual interfaces always are set to port0 -+ padapter->iface_type = IFACE_PORT0; -+#endif -+ // -+ padapter->pnetdev = pnetdev; -+ -+ /****** setup dvobj ******/ -+ pdvobjpriv = adapter_to_dvobj(padapter); -+ padapter->iface_id = pdvobjpriv->iface_nums; -+ pdvobjpriv->padapters[pdvobjpriv->iface_nums++] = padapter; -+ -+ SET_NETDEV_DEV(pnetdev, dvobj_to_dev(pdvobjpriv)); -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_alloc(padapter, dvobj_to_dev(pdvobjpriv)); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ //set interface_type/chip_type/HardwareType -+ padapter->interface_type = primary_padapter->interface_type; -+ padapter->chip_type = primary_padapter->chip_type; -+ padapter->HardwareType = primary_padapter->HardwareType; -+ -+ //set hal data & hal ops -+#if defined(CONFIG_RTL8192C) -+ #if defined(CONFIG_PCI_HCI) -+ rtl8192ce_set_hal_ops(padapter); -+ #elif defined(CONFIG_USB_HCI) -+ rtl8192cu_set_hal_ops(padapter); -+ #endif -+#elif defined(CONFIG_RTL8192D) -+ #if defined(CONFIG_PCI_HCI) -+ rtl8192de_set_hal_ops(padapter); -+ #elif defined(CONFIG_USB_HCI) -+ rtl8192du_set_hal_ops(padapter); -+ #endif -+#endif -+ -+ padapter->HalFunc.inirp_init = NULL; -+ padapter->HalFunc.inirp_deinit = NULL; -+ padapter->intf_start = NULL; -+ padapter->intf_stop = NULL; -+ -+ //step init_io_priv -+ if ((rtw_init_io_priv(padapter, set_intf_ops)) == _FAIL) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,(" \n Can't init io_reqs\n")); -+ } -+ -+ //step read_chip_version -+ rtw_hal_read_chip_version(padapter); -+ -+ //step usb endpoint mapping -+ rtw_hal_chip_configure(padapter); -+ -+ -+ //init drv data -+ if(rtw_init_drv_sw(padapter)!= _SUCCESS) -+ goto error_rtw_drv_add_iface; -+ -+ -+ //get mac address from primary_padapter -+ _rtw_memcpy(mac, primary_padapter->eeprompriv.mac_addr, ETH_ALEN); -+ -+ if (((mac[0]==0xff) &&(mac[1]==0xff) && (mac[2]==0xff) && -+ (mac[3]==0xff) && (mac[4]==0xff) &&(mac[5]==0xff)) || -+ ((mac[0]==0x0) && (mac[1]==0x0) && (mac[2]==0x0) && -+ (mac[3]==0x0) && (mac[4]==0x0) &&(mac[5]==0x0))) -+ { -+ mac[0] = 0x00; -+ mac[1] = 0xe0; -+ mac[2] = 0x4c; -+ mac[3] = 0x87; -+ mac[4] = 0x11; -+ mac[5] = 0x22; -+ } -+ else -+ { -+ //If the BIT1 is 0, the address is universally administered. -+ //If it is 1, the address is locally administered -+#if 1 //needs enable MBSSID CAM -+ mac[0] |= BIT(1); // locally administered -+ mac[0] |= (padapter->iface_id-1)<<4; -+#endif -+ } -+ -+ _rtw_memcpy(padapter->eeprompriv.mac_addr, mac, ETH_ALEN); -+ -+ padapter->dir_dev = NULL; -+ -+ res = _SUCCESS; -+ -+ return padapter; -+ -+ -+error_rtw_drv_add_iface: -+ -+ if(padapter) -+ rtw_free_drv_sw(padapter); -+ -+ if (pnetdev) -+ rtw_free_netdev(pnetdev); -+ -+ return NULL; -+ -+} -+ -+void rtw_drv_stop_vir_if(_adapter *padapter) -+{ -+ struct net_device *pnetdev=NULL; -+ -+ if (padapter == NULL) -+ return; -+ -+ pnetdev = padapter->pnetdev; -+ -+ rtw_cancel_all_timer(padapter); -+ -+ if(padapter->bup == _TRUE) -+ { -+ padapter->bDriverStopped = _TRUE; -+ -+ #ifdef CONFIG_XMIT_ACK -+ if (padapter->xmitpriv.ack_tx) -+ rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); -+ #endif -+ -+ if(padapter->intf_stop) -+ { -+ padapter->intf_stop(padapter); -+ } -+ -+ rtw_stop_drv_threads(padapter); -+ -+ padapter->bup = _FALSE; -+ } -+} -+ -+void rtw_drv_free_vir_if(_adapter *padapter) -+{ -+ struct net_device *pnetdev=NULL; -+ -+ if (padapter == NULL) -+ return; -+ -+ padapter->pbuddy_adapter = NULL; -+ -+ pnetdev = padapter->pnetdev; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_free(padapter->rtw_wdev); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ rtw_free_drv_sw(padapter); -+ -+ rtw_free_netdev(pnetdev); -+} -+ -+void rtw_drv_stop_vir_ifaces(struct dvobj_priv *dvobj) -+{ -+ int i; -+ //struct dvobj_priv *dvobj = primary_padapter->dvobj; -+ -+ for(i=2;iiface_nums;i++) -+ { -+ rtw_drv_stop_vir_if(dvobj->padapters[i]); -+ } -+} -+ -+void rtw_drv_free_vir_ifaces(struct dvobj_priv *dvobj) -+{ -+ int i; -+ //struct dvobj_priv *dvobj = primary_padapter->dvobj; -+ -+ for(i=2;iiface_nums;i++) -+ { -+ rtw_drv_free_vir_if(dvobj->padapters[i]); -+ } -+} -+ -+void rtw_drv_del_vir_if(_adapter *padapter) -+{ -+ rtw_drv_stop_vir_if(padapter); -+ rtw_drv_free_vir_if(padapter); -+} -+ -+void rtw_drv_del_vir_ifaces(_adapter *primary_padapter) -+{ -+ int i; -+ struct dvobj_priv *dvobj = primary_padapter->dvobj; -+ -+ for(i=2;iiface_nums;i++) -+ { -+ rtw_drv_del_vir_if(dvobj->padapters[i]); -+ } -+} -+#endif //CONFIG_MULTI_VIR_IFACES -+ -+int _netdev_if2_open(struct net_device *pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ _adapter *primary_padapter = padapter->pbuddy_adapter; -+ -+ DBG_871X("+871x_drv - if2_open, bup=%d\n", padapter->bup); -+ -+ if(primary_padapter->bup == _FALSE || primary_padapter->hw_init_completed == _FALSE) -+ { -+ _netdev_open(primary_padapter->pnetdev); -+ } -+ -+ if(padapter->bup == _FALSE && primary_padapter->bup == _TRUE && -+ primary_padapter->hw_init_completed == _TRUE) -+ { -+ int i; -+ -+ padapter->bDriverStopped = _FALSE; -+ padapter->bSurpriseRemoved = _FALSE; -+ padapter->bCardDisableWOHSM = _FALSE; -+ -+ _rtw_memcpy(padapter->HalData, primary_padapter->HalData, padapter->hal_data_sz); -+ -+ padapter->bFWReady = primary_padapter->bFWReady; -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_DM_INIT_PWDB, NULL); -+ -+ //if (init_mlme_ext_priv(padapter) == _FAIL) -+ // goto netdev_if2_open_error; -+ -+ -+ if(rtw_start_drv_threads(padapter) == _FAIL) -+ { -+ goto netdev_if2_open_error; -+ } -+ -+ -+ if(padapter->intf_start) -+ { -+ padapter->intf_start(padapter); -+ } -+ -+ -+ padapter->hw_init_completed = _TRUE; -+ -+ padapter->dir_dev = NULL; -+ rtw_proc_init_one(pnetdev); -+ -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_init_wiphy(padapter); -+#endif -+ -+ padapter->bup = _TRUE; -+ -+ } -+ -+ padapter->net_closed = _FALSE; -+ -+ _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); -+ -+ if(!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_start_queue(pnetdev); -+ else -+ rtw_netif_wake_queue(pnetdev); -+ -+ DBG_871X("-871x_drv - if2_open, bup=%d\n", padapter->bup); -+ return 0; -+ -+netdev_if2_open_error: -+ -+ padapter->bup = _FALSE; -+ -+ netif_carrier_off(pnetdev); -+ rtw_netif_stop_queue(pnetdev); -+ -+ return (-1); -+ -+} -+ -+int netdev_if2_open(struct net_device *pnetdev) -+{ -+ int ret; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); -+ ret = _netdev_if2_open(pnetdev); -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); -+ return ret; -+} -+ -+static int netdev_if2_close(struct net_device *pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ -+ padapter->net_closed = _TRUE; -+ -+ if(pnetdev) -+ { -+ if (!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_stop_queue(pnetdev); -+ } -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_scan_abort(padapter); -+ wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE; -+#endif -+ -+ return 0; -+} -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+static const struct net_device_ops rtw_netdev_if2_ops = { -+ .ndo_open = netdev_if2_open, -+ .ndo_stop = netdev_if2_close, -+ .ndo_start_xmit = rtw_xmit_entry, -+ .ndo_set_mac_address = rtw_net_set_mac_address, -+ .ndo_get_stats = rtw_net_get_stats, -+ .ndo_do_ioctl = rtw_ioctl, -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ .ndo_select_queue = rtw_select_queue, -+#endif -+}; -+#endif -+ -+_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)) -+{ -+ int res = _FAIL; -+ struct net_device *pnetdev = NULL; -+ _adapter *padapter = NULL; -+ struct dvobj_priv *pdvobjpriv; -+ u8 mac[ETH_ALEN]; -+ -+ /****** init netdev ******/ -+ pnetdev = rtw_init_netdev(NULL); -+ if (!pnetdev) -+ goto error_rtw_drv_if2_init; -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) -+ DBG_871X("register rtw_netdev_if2_ops to netdev_ops\n"); -+ pnetdev->netdev_ops = &rtw_netdev_if2_ops; -+#else -+ pnetdev->open = netdev_if2_open; -+ pnetdev->stop = netdev_if2_close; -+#endif -+ -+#ifdef CONFIG_NO_WIRELESS_HANDLERS -+ pnetdev->wireless_handlers = NULL; -+#endif -+ -+ /****** init adapter ******/ -+ padapter = rtw_netdev_priv(pnetdev); -+ _rtw_memcpy(padapter, primary_padapter, sizeof(_adapter)); -+ -+ // -+ padapter->bup = _FALSE; -+ padapter->net_closed = _TRUE; -+ padapter->hw_init_completed = _FALSE; -+ -+ //set adapter_type/iface type -+ padapter->isprimary = _FALSE; -+ padapter->adapter_type = SECONDARY_ADAPTER; -+ padapter->pbuddy_adapter = primary_padapter; -+ padapter->iface_id = IFACE_ID1; -+#ifndef CONFIG_HWPORT_SWAP //Port0 -> Pri , Port1 -> Sec -+ padapter->iface_type = IFACE_PORT1; -+#else -+ padapter->iface_type = IFACE_PORT0; -+#endif //CONFIG_HWPORT_SWAP -+ // -+ padapter->pnetdev = pnetdev; -+ -+ /****** setup dvobj ******/ -+ pdvobjpriv = adapter_to_dvobj(padapter); -+ pdvobjpriv->if2 = padapter; -+ pdvobjpriv->padapters[pdvobjpriv->iface_nums++] = padapter; -+ -+ SET_NETDEV_DEV(pnetdev, dvobj_to_dev(pdvobjpriv)); -+ #ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_alloc(padapter, dvobj_to_dev(pdvobjpriv)); -+ #endif //CONFIG_IOCTL_CFG80211 -+ -+ //set interface_type/chip_type/HardwareType -+ padapter->interface_type = primary_padapter->interface_type; -+ padapter->chip_type = primary_padapter->chip_type; -+ padapter->HardwareType = primary_padapter->HardwareType; -+ -+ //set hal data & hal ops -+#if defined(CONFIG_RTL8192C) -+ #if defined(CONFIG_PCI_HCI) -+ rtl8192ce_set_hal_ops(padapter); -+ #elif defined(CONFIG_USB_HCI) -+ rtl8192cu_set_hal_ops(padapter); -+ #endif -+#elif defined(CONFIG_RTL8192D) -+ #if defined(CONFIG_PCI_HCI) -+ rtl8192de_set_hal_ops(padapter); -+ #elif defined(CONFIG_USB_HCI) -+ rtl8192du_set_hal_ops(padapter); -+ #endif -+#endif -+ -+ padapter->HalFunc.inirp_init = NULL; -+ padapter->HalFunc.inirp_deinit = NULL; -+ -+ // -+ padapter->intf_start = primary_padapter->intf_start; -+ padapter->intf_stop = primary_padapter->intf_stop; -+ -+ //step init_io_priv -+ if ((rtw_init_io_priv(padapter, set_intf_ops)) == _FAIL) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,(" \n Can't init io_reqs\n")); -+ } -+ -+ //step read_chip_version -+ rtw_hal_read_chip_version(padapter); -+ -+ //step usb endpoint mapping -+ rtw_hal_chip_configure(padapter); -+ -+ -+ //init drv data -+ if(rtw_init_drv_sw(padapter)!= _SUCCESS) -+ goto error_rtw_drv_if2_init; -+ -+ //get mac address from primary_padapter -+ _rtw_memcpy(mac, primary_padapter->eeprompriv.mac_addr, ETH_ALEN); -+ -+ if (((mac[0]==0xff) &&(mac[1]==0xff) && (mac[2]==0xff) && -+ (mac[3]==0xff) && (mac[4]==0xff) &&(mac[5]==0xff)) || -+ ((mac[0]==0x0) && (mac[1]==0x0) && (mac[2]==0x0) && -+ (mac[3]==0x0) && (mac[4]==0x0) &&(mac[5]==0x0))) -+ { -+ mac[0] = 0x00; -+ mac[1] = 0xe0; -+ mac[2] = 0x4c; -+ mac[3] = 0x87; -+ mac[4] = 0x11; -+ mac[5] = 0x22; -+ } -+ else -+ { -+ //If the BIT1 is 0, the address is universally administered. -+ //If it is 1, the address is locally administered -+ mac[0] |= BIT(1); // locally administered -+ -+ } -+ -+ _rtw_memcpy(padapter->eeprompriv.mac_addr, mac, ETH_ALEN); -+ rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); -+ -+ primary_padapter->pbuddy_adapter = padapter; -+ -+ padapter->dir_dev = NULL; -+ -+ res = _SUCCESS; -+ -+ return padapter; -+ -+ -+error_rtw_drv_if2_init: -+ -+ if(padapter) -+ rtw_free_drv_sw(padapter); -+ -+ if (pnetdev) -+ rtw_free_netdev(pnetdev); -+ -+ return NULL; -+ -+} -+ -+void rtw_drv_if2_free(_adapter *if2) -+{ -+ _adapter *padapter = if2; -+ struct net_device *pnetdev = NULL; -+ -+ if (padapter == NULL) -+ return; -+ -+ pnetdev = padapter->pnetdev; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_free(padapter->rtw_wdev); -+#endif /* CONFIG_IOCTL_CFG80211 */ -+ -+ -+ rtw_free_drv_sw(padapter); -+ -+ rtw_free_netdev(pnetdev); -+ -+} -+ -+void rtw_drv_if2_stop(_adapter *if2) -+{ -+ _adapter *padapter = if2; -+ -+ if (padapter == NULL) -+ return; -+ -+ rtw_cancel_all_timer(padapter); -+ -+ if (padapter->bup == _TRUE) { -+ padapter->bDriverStopped = _TRUE; -+ #ifdef CONFIG_XMIT_ACK -+ if (padapter->xmitpriv.ack_tx) -+ rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); -+ #endif -+ -+ if(padapter->intf_stop) -+ { -+ padapter->intf_stop(padapter); -+ } -+ -+ rtw_stop_drv_threads(padapter); -+ -+ padapter->bup = _FALSE; -+ } -+} -+#endif //end of CONFIG_CONCURRENT_MODE -+ -+#ifdef CONFIG_BR_EXT -+void netdev_br_init(struct net_device *netdev) -+{ -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(netdev); -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ rcu_read_lock(); -+#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ -+ //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) -+ { -+ //struct net_bridge *br = netdev->br_port->br;//->dev->dev_addr; -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ if (netdev->br_port) -+#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ if (rcu_dereference(adapter->pnetdev->rx_handler_data)) -+#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ { -+ struct net_device *br_netdev; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ br_netdev = dev_get_by_name(CONFIG_BR_EXT_BRNAME); -+#else // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ struct net *devnet = NULL; -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+ devnet = netdev->nd_net; -+#else // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+ devnet = dev_net(netdev); -+#endif // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+ -+ br_netdev = dev_get_by_name(devnet, CONFIG_BR_EXT_BRNAME); -+#endif // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -+ -+ if (br_netdev) { -+ memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN); -+ dev_put(br_netdev); -+ } else -+ printk("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME); -+ } -+ -+ adapter->ethBrExtInfo.addPPPoETag = 1; -+ } -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+ rcu_read_unlock(); -+#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+} -+#endif //CONFIG_BR_EXT -+ -+static int _rtw_drv_register_netdev(_adapter *padapter, char *name) -+{ -+ int ret = _SUCCESS; -+ struct net_device *pnetdev = padapter->pnetdev; -+ -+ /* alloc netdev name */ -+ rtw_init_netdev_name(pnetdev, name); -+ -+ _rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); -+ -+ /* Tell the network stack we exist */ -+ if (register_netdev(pnetdev) != 0) { -+ DBG_871X(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev)); -+ ret = _FAIL; -+ goto error_register_netdev; -+ } -+ -+ DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __FUNCTION__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr)); -+ -+ return ret; -+ -+error_register_netdev: -+ -+ if(padapter->iface_id > IFACE_ID0) -+ { -+ rtw_free_drv_sw(padapter); -+ -+ rtw_free_netdev(pnetdev); -+ } -+ -+ return ret; -+} -+ -+int rtw_drv_register_netdev(_adapter *if1) -+{ -+ int i, status = _SUCCESS; -+ struct dvobj_priv *dvobj = if1->dvobj; -+ -+ if(dvobj->iface_nums < IFACE_ID_MAX) -+ { -+ for(i=0; iiface_nums; i++) -+ { -+ _adapter *padapter = dvobj->padapters[i]; -+ -+ if(padapter) -+ { -+ char *name; -+ -+ if(padapter->iface_id == IFACE_ID0) -+ name = if1->registrypriv.ifname; -+ else if(padapter->iface_id == IFACE_ID1) -+ name = if1->registrypriv.if2name; -+ else -+ name = "wlan%d"; -+ -+ if((status = _rtw_drv_register_netdev(padapter, name)) != _SUCCESS) { -+ break; -+ } -+ } -+ } -+ } -+ -+ return status; -+} -+ -+int _netdev_open(struct net_device *pnetdev) -+{ -+ uint status; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n")); -+ DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup); -+ -+ if(pwrctrlpriv->ps_flag == _TRUE){ -+ padapter->net_closed = _FALSE; -+ goto netdev_open_normal_process; -+ } -+ -+ if(padapter->bup == _FALSE) -+ { -+ padapter->bDriverStopped = _FALSE; -+ padapter->bSurpriseRemoved = _FALSE; -+ padapter->bCardDisableWOHSM = _FALSE; -+ -+ status = rtw_hal_init(padapter); -+ if (status ==_FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("rtl871x_hal_init(): Can't init h/w!\n")); -+ goto netdev_open_error; -+ } -+ -+ DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr)); -+ -+ -+ status=rtw_start_drv_threads(padapter); -+ if(status ==_FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("Initialize driver software resource Failed!\n")); -+ goto netdev_open_error; -+ } -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ init_drvext(padapter); -+#endif -+ -+ if(padapter->intf_start) -+ { -+ padapter->intf_start(padapter); -+ } -+ -+#ifndef RTK_DMP_PLATFORM -+ rtw_proc_init_one(pnetdev); -+#endif -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_cfg80211_init_wiphy(padapter); -+#endif -+ -+ rtw_led_control(padapter, LED_CTL_NO_LINK); -+ -+ padapter->bup = _TRUE; -+ } -+ padapter->net_closed = _FALSE; -+ -+ _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000); -+ -+ padapter->pwrctrlpriv.bips_processing = _FALSE; -+ rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv); -+ -+ //netif_carrier_on(pnetdev);//call this func when rtw_joinbss_event_callback return success -+ if(!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_start_queue(pnetdev); -+ else -+ rtw_netif_wake_queue(pnetdev); -+ -+#ifdef CONFIG_BR_EXT -+ netdev_br_init(pnetdev); -+#endif // CONFIG_BR_EXT -+ -+netdev_open_normal_process: -+ -+ #ifdef CONFIG_CONCURRENT_MODE -+ { -+ _adapter *sec_adapter = padapter->pbuddy_adapter; -+ if(sec_adapter && (sec_adapter->bup == _FALSE || sec_adapter->hw_init_completed == _FALSE)) -+ _netdev_if2_open(sec_adapter->pnetdev); -+ } -+ #endif -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - dev_open\n")); -+ DBG_871X("-871x_drv - drv_open, bup=%d\n", padapter->bup); -+ -+ return 0; -+ -+netdev_open_error: -+ -+ padapter->bup = _FALSE; -+ -+ netif_carrier_off(pnetdev); -+ rtw_netif_stop_queue(pnetdev); -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("-871x_drv - dev_open, fail!\n")); -+ DBG_871X("-871x_drv - drv_open fail, bup=%d\n", padapter->bup); -+ -+ return (-1); -+ -+} -+ -+int netdev_open(struct net_device *pnetdev) -+{ -+ int ret; -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ -+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); -+ ret = _netdev_open(pnetdev); -+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); -+ -+ return ret; -+} -+ -+#ifdef CONFIG_IPS -+int ips_netdrv_open(_adapter *padapter) -+{ -+ int status = _SUCCESS; -+ padapter->net_closed = _FALSE; -+ DBG_871X("===> %s.........\n",__FUNCTION__); -+ -+ -+ padapter->bDriverStopped = _FALSE; -+ padapter->bCardDisableWOHSM = _FALSE; -+ //padapter->bup = _TRUE; -+ -+ status = rtw_hal_init(padapter); -+ if (status ==_FAIL) -+ { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("ips_netdrv_open(): Can't init h/w!\n")); -+ goto netdev_open_error; -+ } -+ -+ if(padapter->intf_start) -+ { -+ padapter->intf_start(padapter); -+ } -+ -+ rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv); -+ _set_timer(&padapter->mlmepriv.dynamic_chk_timer,5000); -+ -+ return _SUCCESS; -+ -+netdev_open_error: -+ //padapter->bup = _FALSE; -+ DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup); -+ -+ return _FAIL; -+} -+ -+ -+int rtw_ips_pwr_up(_adapter *padapter) -+{ -+ int result; -+ u32 start_time = rtw_get_current_time(); -+ DBG_871X("===> rtw_ips_pwr_up..............\n"); -+ rtw_reset_drv_sw(padapter); -+ -+ result = ips_netdrv_open(padapter); -+ -+ rtw_led_control(padapter, LED_CTL_NO_LINK); -+ -+ DBG_871X("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time)); -+ return result; -+ -+} -+ -+void rtw_ips_pwr_down(_adapter *padapter) -+{ -+ u32 start_time = rtw_get_current_time(); -+ DBG_871X("===> rtw_ips_pwr_down...................\n"); -+ -+ padapter->bCardDisableWOHSM = _TRUE; -+ padapter->net_closed = _TRUE; -+ -+ rtw_led_control(padapter, LED_CTL_POWER_OFF); -+ -+ rtw_ips_dev_unload(padapter); -+ padapter->bCardDisableWOHSM = _FALSE; -+ DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); -+} -+#endif -+void rtw_ips_dev_unload(_adapter *padapter) -+{ -+ struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; -+ struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -+ DBG_871X("====> %s...\n",__FUNCTION__); -+ -+ rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0); -+ -+ if(padapter->intf_stop) -+ { -+ padapter->intf_stop(padapter); -+ } -+ -+ //s5. -+ if(padapter->bSurpriseRemoved == _FALSE) -+ { -+ rtw_hal_deinit(padapter); -+ } -+ -+} -+ -+int pm_netdev_open(struct net_device *pnetdev,u8 bnormal) -+{ -+ int status; -+ if(bnormal) -+ status = netdev_open(pnetdev); -+#ifdef CONFIG_IPS -+ else -+ status = (_SUCCESS == ips_netdrv_open((_adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1); -+#endif -+ -+ return status; -+} -+ -+static int netdev_close(struct net_device *pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - drv_close\n")); -+ -+ if(padapter->pwrctrlpriv.bInternalAutoSuspend == _TRUE) -+ { -+ //rtw_pwr_wakeup(padapter); -+ if(padapter->pwrctrlpriv.rf_pwrstate == rf_off) -+ padapter->pwrctrlpriv.ps_flag = _TRUE; -+ } -+ padapter->net_closed = _TRUE; -+ -+/* if(!padapter->hw_init_completed) -+ { -+ DBG_871X("(1)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed); -+ -+ padapter->bDriverStopped = _TRUE; -+ -+ rtw_dev_unload(padapter); -+ } -+ else*/ -+ if(padapter->pwrctrlpriv.rf_pwrstate == rf_on){ -+ DBG_871X("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed); -+ -+ //s1. -+ if(pnetdev) -+ { -+ if (!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_stop_queue(pnetdev); -+ } -+ -+#ifndef CONFIG_ANDROID -+ //s2. -+ LeaveAllPowerSaveMode(padapter); -+ rtw_disassoc_cmd(padapter, 500, _FALSE); -+ //s2-2. indicate disconnect to os -+ rtw_indicate_disconnect(padapter); -+ //s2-3. -+ rtw_free_assoc_resources(padapter, 1); -+ //s2-4. -+ rtw_free_network_queue(padapter,_TRUE); -+#endif -+ // Close LED -+ rtw_led_control(padapter, LED_CTL_POWER_OFF); -+ } -+ -+#ifdef CONFIG_BR_EXT -+ //if (OPMODE & (WIFI_STATION_STATE | WIFI_ADHOC_STATE)) -+ { -+ //void nat25_db_cleanup(_adapter *priv); -+ nat25_db_cleanup(padapter); -+ } -+#endif // CONFIG_BR_EXT -+ -+#ifdef CONFIG_P2P -+#ifdef CONFIG_IOCTL_CFG80211 -+ if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ { -+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled == _TRUE) -+ wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _FALSE; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+ rtw_p2p_enable(padapter, P2P_ROLE_DISABLE); -+#endif //CONFIG_P2P -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ rtw_scan_abort(padapter); -+ wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE; -+ padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; //set this at the end -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n")); -+ DBG_871X("-871x_drv - drv_close, bup=%d\n", padapter->bup); -+ -+ return 0; -+} -+ -+void rtw_ndev_destructor(struct net_device *ndev) -+{ -+ DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if (ndev->ieee80211_ptr) -+ rtw_mfree((u8 *)ndev->ieee80211_ptr, sizeof(struct wireless_dev)); -+#endif -+ free_netdev(ndev); -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c -@@ -0,0 +1,1997 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _HCI_INTF_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef CONFIG_PCI_HCI -+ -+#error "CONFIG_PCI_HCI shall be on!\n" -+ -+#endif -+ -+#include -+#include -+#include -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#ifdef CONFIG_80211N_HT -+extern int rtw_ht_enable; -+extern int rtw_cbw40_enable; -+extern int rtw_ampdu_enable;//for enable tx_ampdu -+#endif -+ -+#ifdef CONFIG_PM -+extern int pm_netdev_open(struct net_device *pnetdev); -+static int rtw_suspend(struct pci_dev *pdev, pm_message_t state); -+static int rtw_resume(struct pci_dev *pdev); -+#endif -+ -+ -+static int rtw_drv_init(struct pci_dev *pdev, const struct pci_device_id *pdid); -+static void rtw_dev_remove(struct pci_dev *pdev); -+ -+static struct specific_device_id specific_device_id_tbl[] = { -+ {.idVendor=0x0b05, .idProduct=0x1791, .flags=SPEC_DEV_ID_DISABLE_HT}, -+ {.idVendor=0x13D3, .idProduct=0x3311, .flags=SPEC_DEV_ID_DISABLE_HT}, -+ {} -+}; -+ -+struct pci_device_id rtw_pci_id_tbl[] = { -+#ifdef CONFIG_RTL8192C -+ {PCI_DEVICE(PCI_VENDER_ID_REALTEK, 0x8191)}, -+ {PCI_DEVICE(PCI_VENDER_ID_REALTEK, 0x8178)}, -+ {PCI_DEVICE(PCI_VENDER_ID_REALTEK, 0x8177)}, -+ {PCI_DEVICE(PCI_VENDER_ID_REALTEK, 0x8176)}, -+#endif -+#ifdef CONFIG_RTL8192D -+ {PCI_DEVICE(PCI_VENDER_ID_REALTEK, 0x8193)}, -+ {PCI_DEVICE(PCI_VENDER_ID_REALTEK, 0x002B)}, -+#endif -+ {}, -+}; -+ -+struct pci_drv_priv { -+ struct pci_driver rtw_pci_drv; -+ int drv_registered; -+}; -+ -+ -+static struct pci_drv_priv pci_drvpriv = { -+ .rtw_pci_drv.name = (char*)DRV_NAME, -+ .rtw_pci_drv.probe = rtw_drv_init, -+ .rtw_pci_drv.remove = rtw_dev_remove, -+ .rtw_pci_drv.id_table = rtw_pci_id_tbl, -+#ifdef CONFIG_PM -+ .rtw_pci_drv.suspend = rtw_suspend, -+ .rtw_pci_drv.resume = rtw_resume, -+#else -+ .rtw_pci_drv.suspend = NULL, -+ .rtw_pci_drv.resume = NULL, -+#endif -+}; -+ -+ -+MODULE_DEVICE_TABLE(pci, rtw_pci_id_tbl); -+ -+ -+static u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = { -+ INTEL_VENDOR_ID, -+ ATI_VENDOR_ID, -+ AMD_VENDOR_ID, -+ SIS_VENDOR_ID -+}; -+ -+static u8 rtw_pci_platform_switch_device_pci_aspm(_adapter *padapter, u8 value) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ u8 bresult = _SUCCESS; -+ int error; -+ -+ value |= 0x40; -+ -+ error = pci_write_config_byte(pdvobjpriv->ppcidev, 0x80, value); -+ -+ if(error != 0) -+ { -+ bresult = _FALSE; -+ DBG_871X("rtw_pci_platform_switch_device_pci_aspm error (%d)\n",error); -+ } -+ -+ return bresult; -+} -+ -+// -+// When we set 0x01 to enable clk request. Set 0x0 to disable clk req. -+// -+static u8 rtw_pci_switch_clk_req(_adapter *padapter, u8 value) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ u8 buffer, bresult = _SUCCESS; -+ int error; -+ -+ buffer = value; -+ -+ if(!padapter->hw_init_completed) -+ return bresult; -+ -+ error = pci_write_config_byte(pdvobjpriv->ppcidev, 0x81, value); -+ -+ if(error != 0) -+ { -+ bresult = _FALSE; -+ DBG_871X("rtw_pci_switch_clk_req error (%d)\n",error); -+ } -+ -+ return bresult; -+} -+ -+#if 0 -+//Description: -+//Disable RTL8192SE ASPM & Disable Pci Bridge ASPM -+void rtw_pci_disable_aspm(_adapter *padapter) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ u32 pcicfg_addrport = 0; -+ u8 num4bytes; -+ u8 linkctrl_reg; -+ u16 pcibridge_linkctrlreg, aspmlevel = 0; -+ -+ // When there exists anyone's busnum, devnum, and funcnum that are set to 0xff, -+ // we do not execute any action and return. -+ // if it is not intel bus then don't enable ASPM. -+ if ((pcipriv->busnumber == 0xff -+ && pcipriv->devnumber == 0xff -+ && pcipriv->funcnumber == 0xff) -+ || (pcipriv->pcibridge_busnum == 0xff -+ && pcipriv->pcibridge_devnum == 0xff -+ && pcipriv->pcibridge_funcnum == 0xff)) -+ { -+ DBG_871X("PlatformEnableASPM(): Fail to enable ASPM. Cannot find the Bus of PCI(Bridge).\n"); -+ return; -+ } -+ -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) { -+ DBG_871X("%s(): Disable ASPM. Recognize the Bus of PCI(Bridge) as UNKNOWN.\n", __func__); -+ } -+ -+ if (pwrpriv->reg_rfps_level & RT_RF_OFF_LEVL_CLK_REQ) { -+ RT_CLEAR_PS_LEVEL(pwrpriv, RT_RF_OFF_LEVL_CLK_REQ); -+ rtw_pci_switch_clk_req(padapter, 0x0); -+ } -+ -+ { -+ // Suggested by SD1 for promising device will in L0 state after an I/O. -+ u8 tmp_u1b; -+ -+ pci_read_config_byte(pdvobjpriv->ppcidev, 0x80, &tmp_u1b); -+ } -+ -+ // Retrieve original configuration settings. -+ linkctrl_reg = pcipriv->linkctrl_reg; -+ pcibridge_linkctrlreg = pcipriv->pcibridge_linkctrlreg; -+ -+ // Set corresponding value. -+ aspmlevel |= BIT(0) | BIT(1); -+ linkctrl_reg &= ~aspmlevel; -+ pcibridge_linkctrlreg &= ~(BIT(0) | BIT(1)); -+ -+ rtw_pci_platform_switch_device_pci_aspm(padapter, linkctrl_reg); -+ rtw_udelay_os(50); -+ -+ //When there exists anyone's busnum, devnum, and funcnum that are set to 0xff, -+ // we do not execute any action and return. -+ if ((pcipriv->busnumber == 0xff && -+ pcipriv->devnumber == 0xff && -+ pcipriv->funcnumber == 0xff) || -+ (pcipriv->pcibridge_busnum == 0xff && -+ pcipriv->pcibridge_devnum == 0xff -+ && pcipriv->pcibridge_funcnum == 0xff)) -+ { -+ //Do Nothing!! -+ } -+ else -+ { -+ //4 //Disable Pci Bridge ASPM -+ pcicfg_addrport = (pcipriv->pcibridge_busnum << 16) | -+ (pcipriv->pcibridge_devnum << 11) | -+ (pcipriv->pcibridge_funcnum << 8) | (1 << 31); -+ num4bytes = (pcipriv->pcibridge_pciehdr_offset + 0x10) / 4; -+ -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (num4bytes << 2)); -+ -+ // now grab data port with device|vendor 4 byte dword -+ NdisRawWritePortUchar(PCI_CONF_DATA, pcibridge_linkctrlreg); -+ -+ DBG_871X("rtw_pci_disable_aspm():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n", -+ pcipriv->pcibridge_busnum, pcipriv->pcibridge_devnum, -+ pcipriv->pcibridge_funcnum, -+ (pcipriv->pcibridge_pciehdr_offset+0x10), pcibridge_linkctrlreg); -+ -+ rtw_udelay_os(50); -+ } -+} -+ -+//[ASPM] -+//Description: -+// Enable RTL8192SE ASPM & Enable Pci Bridge ASPM for power saving -+// We should follow the sequence to enable RTL8192SE first then enable Pci Bridge ASPM -+// or the system will show bluescreen. -+void rtw_pci_enable_aspm(_adapter *padapter) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ u16 aspmlevel = 0; -+ u32 pcicfg_addrport = 0; -+ u8 num4bytes; -+ u8 u_pcibridge_aspmsetting = 0; -+ u8 u_device_aspmsetting = 0; -+ -+ // When there exists anyone's busnum, devnum, and funcnum that are set to 0xff, -+ // we do not execute any action and return. -+ // if it is not intel bus then don't enable ASPM. -+ -+ if ((pcipriv->busnumber == 0xff -+ && pcipriv->devnumber == 0xff -+ && pcipriv->funcnumber == 0xff) -+ || (pcipriv->pcibridge_busnum == 0xff -+ && pcipriv->pcibridge_devnum == 0xff -+ && pcipriv->pcibridge_funcnum == 0xff)) -+ { -+ DBG_871X("PlatformEnableASPM(): Fail to enable ASPM. Cannot find the Bus of PCI(Bridge).\n"); -+ return; -+ } -+ -+ //4 Enable Pci Bridge ASPM -+ pcicfg_addrport = (pcipriv->pcibridge_busnum << 16) -+ | (pcipriv->pcibridge_devnum << 11) -+ | (pcipriv->pcibridge_funcnum << 8) | (1 << 31); -+ num4bytes = (pcipriv->pcibridge_pciehdr_offset + 0x10) / 4; -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (num4bytes << 2)); -+ // now grab data port with device|vendor 4 byte dword -+ -+ u_pcibridge_aspmsetting = pcipriv->pcibridge_linkctrlreg | pdvobjpriv->const_hostpci_aspm_setting; -+ -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL || -+ pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_SIS) -+ u_pcibridge_aspmsetting &= ~BIT(0); -+ -+ NdisRawWritePortUchar(PCI_CONF_DATA, u_pcibridge_aspmsetting); -+ -+ DBG_871X("PlatformEnableASPM():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n", -+ pcipriv->pcibridge_busnum, -+ pcipriv->pcibridge_devnum, -+ pcipriv->pcibridge_funcnum, -+ (pcipriv->pcibridge_pciehdr_offset+0x10), -+ u_pcibridge_aspmsetting); -+ -+ rtw_udelay_os(50); -+ -+ // Get ASPM level (with/without Clock Req) -+ aspmlevel |= pdvobjpriv->const_devicepci_aspm_setting; -+ u_device_aspmsetting = pcipriv->linkctrl_reg; -+ u_device_aspmsetting |= aspmlevel; -+ -+ rtw_pci_platform_switch_device_pci_aspm(padapter, u_device_aspmsetting); //(priv->linkctrl_reg | ASPMLevel)); -+ -+ if (pwrpriv->reg_rfps_level & RT_RF_OFF_LEVL_CLK_REQ) { -+ rtw_pci_switch_clk_req(padapter, (pwrpriv->reg_rfps_level & RT_RF_OFF_LEVL_CLK_REQ) ? 1 : 0); -+ RT_SET_PS_LEVEL(pwrpriv, RT_RF_OFF_LEVL_CLK_REQ); -+ } -+ -+ rtw_udelay_os(50); -+} -+ -+// -+//Description: -+//To get link control field by searching from PCIe capability lists. -+// -+static u8 -+rtw_get_link_control_field(_adapter *padapter, u8 busnum, u8 devnum, -+ u8 funcnum) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ struct rt_pci_capabilities_header capability_hdr; -+ u8 capability_offset, num4bytes; -+ u32 pcicfg_addrport = 0; -+ u8 linkctrl_reg; -+ u8 status = _FALSE; -+ -+ //If busnum, devnum, funcnum are set to 0xff. -+ if (busnum == 0xff && devnum == 0xff && funcnum == 0xff) { -+ DBG_871X("GetLinkControlField(): Fail to find PCIe Capability\n"); -+ return _FALSE; -+ } -+ -+ pcicfg_addrport = (busnum << 16) | (devnum << 11) | (funcnum << 8) | (1 << 31); -+ -+ //2PCIeCap -+ -+ // The device supports capability lists. Find the capabilities. -+ num4bytes = 0x34 / 4; -+ //get capability_offset -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (num4bytes << 2)); -+ // now grab data port with device|vendor 4 byte dword -+ NdisRawReadPortUchar(PCI_CONF_DATA, &capability_offset); -+ -+ // Loop through the capabilities in search of the power management capability. -+ // The list is NULL-terminated, so the last offset will always be zero. -+ -+ while (capability_offset != 0) { -+ // First find the number of 4 Byte. -+ num4bytes = capability_offset / 4; -+ -+ // Read the header of the capability at this offset. If the retrieved capability is not -+ // the power management capability that we are looking for, follow the link to the -+ // next capability and continue looping. -+ -+ //4 get capability_hdr -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (num4bytes << 2)); -+ // now grab data port with device|vendor 4 byte dword -+ NdisRawReadPortUshort(PCI_CONF_DATA, (u16 *) & capability_hdr); -+ -+ // Found the PCI express capability -+ if (capability_hdr.capability_id == PCI_CAPABILITY_ID_PCI_EXPRESS) -+ { -+ break; -+ } -+ else -+ { -+ // This is some other capability. Keep looking for the PCI express capability. -+ capability_offset = capability_hdr.next; -+ } -+ } -+ -+ if (capability_hdr.capability_id == PCI_CAPABILITY_ID_PCI_EXPRESS) // -+ { -+ num4bytes = (capability_offset + 0x10) / 4; -+ -+ //4 Read Link Control Register -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (num4bytes << 2)); -+ // now grab data port with device|vendor 4 byte dword -+ NdisRawReadPortUchar(PCI_CONF_DATA, &linkctrl_reg); -+ -+ pcipriv->pcibridge_pciehdr_offset = capability_offset; -+ pcipriv->pcibridge_linkctrlreg = linkctrl_reg; -+ -+ status = _TRUE; -+ } -+ else -+ { -+ // We didn't find a PCIe capability. -+ DBG_871X("GetLinkControlField(): Cannot Find PCIe Capability\n"); -+ } -+ -+ return status; -+} -+ -+// -+//Description: -+//To get PCI bus infomation and return busnum, devnum, and funcnum about -+//the bus(bridge) which the device binds. -+// -+static u8 -+rtw_get_pci_bus_info(_adapter *padapter, -+ u16 vendorid, -+ u16 deviceid, -+ u8 irql, u8 basecode, u8 subclass, u8 filed19val, -+ u8 * busnum, u8 * devnum, u8 * funcnum) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pci_dev *pdev = pdvobjpriv->ppcidev; -+ u8 busnum_idx, devicenum_idx, functionnum_idx; -+ u32 pcicfg_addrport = 0; -+ u32 dev_venid = 0, classcode, field19, headertype; -+ u16 venId, devId; -+ u8 basec, subc, irqline; -+ u16 regoffset; -+ u8 b_singlefunc = _FALSE; -+ u8 b_bridgechk = _FALSE; -+ -+ *busnum = 0xFF; -+ *devnum = 0xFF; -+ *funcnum = 0xFF; -+ -+ //DBG_871X("==============>vendorid:%x,deviceid:%x,irql:%x\n", vendorid,deviceid,irql); -+ if ((basecode == PCI_CLASS_BRIDGE_DEV) && -+ (subclass == PCI_SUBCLASS_BR_PCI_TO_PCI) -+ && (filed19val == U1DONTCARE)) -+ b_bridgechk = _TRUE; -+ -+ // perform a complete pci bus scan operation -+ for (busnum_idx = 0; busnum_idx < PCI_MAX_BRIDGE_NUMBER; busnum_idx++) //255 -+ { -+ for (devicenum_idx = 0; devicenum_idx < PCI_MAX_DEVICES; devicenum_idx++) //32 -+ { -+ b_singlefunc = _FALSE; -+ for (functionnum_idx = 0; functionnum_idx < PCI_MAX_FUNCTION; functionnum_idx++) //8 -+ { -+ // -+ // We have to skip redundant Bus scan to prevent unexpected system hang -+ // if single function is present in this device. -+ // 2009.02.26. -+ // -+ if (functionnum_idx == 0) { -+ //4 get header type (DWORD #3) -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31); -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (3 << 2)); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &headertype); -+ headertype = ((headertype >> 16) & 0x0080) >> 7; // address 0x0e[7]. -+ if (headertype == 0) //Single function -+ b_singlefunc = _TRUE; -+ } -+ else -+ {//By pass the following scan process. -+ if (b_singlefunc == _TRUE) -+ break; -+ } -+ -+ // Set access enable control. -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31); -+ -+ //4 // Get vendorid/ deviceid -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport); -+ // now grab data port with device|vendor 4 byte dword -+ NdisRawReadPortUlong(PCI_CONF_DATA, &dev_venid); -+ -+ // if data port is full of 1s, no device is present -+ // some broken boards return 0 if a slot is empty: -+ if (dev_venid == 0xFFFFFFFF || dev_venid == 0) -+ continue; //PCI_INVALID_VENDORID -+ -+ // 4 // Get irql -+ regoffset = 0x3C; -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31) | (regoffset & 0xFFFFFFFC); -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport); -+ NdisRawReadPortUchar((PCI_CONF_DATA +(regoffset & 0x3)), &irqline); -+ -+ venId = (u16) (dev_venid >> 0) & 0xFFFF; -+ devId = (u16) (dev_venid >> 16) & 0xFFFF; -+ -+ // Check Vendor ID -+ if (!b_bridgechk && (venId != vendorid) && (vendorid != U2DONTCARE)) -+ continue; -+ -+ // Check Device ID -+ if (!b_bridgechk && (devId != deviceid) && (deviceid != U2DONTCARE)) -+ continue; -+ -+ // Check irql -+ if (!b_bridgechk && (irqline != irql) && (irql != U1DONTCARE)) -+ continue; -+ -+ //4 get Class Code -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31); -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (2 << 2)); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &classcode); -+ classcode = classcode >> 8; -+ -+ basec = (u8) (classcode >> 16) & 0xFF; -+ subc = (u8) (classcode >> 8) & 0xFF; -+ if (b_bridgechk && (venId != vendorid) && (basec == basecode) && (subc == subclass)) -+ return _TRUE; -+ -+ // Check Vendor ID -+ if (b_bridgechk && (venId != vendorid) && (vendorid != U2DONTCARE)) -+ continue; -+ -+ // Check Device ID -+ if (b_bridgechk && (devId != deviceid) && (deviceid != U2DONTCARE)) -+ continue; -+ -+ // Check irql -+ if (b_bridgechk && (irqline != irql) && (irql != U1DONTCARE)) -+ continue; -+ -+ //4 get field 0x19 value (DWORD #6) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (6 << 2)); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &field19); -+ field19 = (field19 >> 8) & 0xFF; -+ -+ //4 Matching Class Code and filed19. -+ if ((basec == basecode) && (subc == subclass) && ((field19 == filed19val) || (filed19val == U1DONTCARE))) { -+ *busnum = busnum_idx; -+ *devnum = devicenum_idx; -+ *funcnum = functionnum_idx; -+ -+ DBG_871X("GetPciBusInfo(): Find Device(%X:%X) bus=%d dev=%d, func=%d\n", -+ vendorid, deviceid, busnum_idx, devicenum_idx, functionnum_idx); -+ return _TRUE; -+ } -+ } -+ } -+ } -+ -+ DBG_871X("GetPciBusInfo(): Cannot Find Device(%X:%X:%X)\n", vendorid, deviceid, dev_venid); -+ -+ return _FALSE; -+} -+ -+static u8 -+rtw_get_pci_brideg_info(_adapter *padapter, -+ u8 basecode, -+ u8 subclass, -+ u8 filed19val, u8 * busnum, u8 * devnum, -+ u8 * funcnum, u16 * vendorid, u16 * deviceid) -+{ -+ u8 busnum_idx, devicenum_idx, functionnum_idx; -+ u32 pcicfg_addrport = 0; -+ u32 dev_venid, classcode, field19, headertype; -+ u16 venId, devId; -+ u8 basec, subc, irqline; -+ u16 regoffset; -+ u8 b_singlefunc = _FALSE; -+ -+ *busnum = 0xFF; -+ *devnum = 0xFF; -+ *funcnum = 0xFF; -+ -+ // perform a complete pci bus scan operation -+ for (busnum_idx = 0; busnum_idx < PCI_MAX_BRIDGE_NUMBER; busnum_idx++) //255 -+ { -+ for (devicenum_idx = 0; devicenum_idx < PCI_MAX_DEVICES; devicenum_idx++) //32 -+ { -+ b_singlefunc = _FALSE; -+ for (functionnum_idx = 0; functionnum_idx < PCI_MAX_FUNCTION; functionnum_idx++) //8 -+ { -+ // -+ // We have to skip redundant Bus scan to prevent unexpected system hang -+ // if single function is present in this device. -+ // 2009.02.26. -+ // -+ if (functionnum_idx == 0) -+ { -+ //4 get header type (DWORD #3) -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31); -+ //NdisRawWritePortUlong((ULONG_PTR)PCI_CONF_ADDRESS , pcicfg_addrport + (3 << 2)); -+ //NdisRawReadPortUlong((ULONG_PTR)PCI_CONF_DATA, &headertype); -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (3 << 2)); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &headertype); -+ headertype = ((headertype >> 16) & 0x0080) >> 7; // address 0x0e[7]. -+ if (headertype == 0) //Single function -+ b_singlefunc = _TRUE; -+ } -+ else -+ {//By pass the following scan process. -+ if (b_singlefunc == _TRUE) -+ break; -+ } -+ -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31); -+ -+ //4 // Get vendorid/ deviceid -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport); -+ // now grab data port with device|vendor 4 byte dword -+ NdisRawReadPortUlong(PCI_CONF_DATA, &dev_venid); -+ -+ //4 Get irql -+ regoffset = 0x3C; -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31) | (regoffset & 0xFFFFFFFC); -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport); -+ NdisRawReadPortUchar((PCI_CONF_DATA + (regoffset & 0x3)), &irqline); -+ -+ venId = (u16) (dev_venid >> 0) & 0xFFFF; -+ devId = (u16) (dev_venid >> 16) & 0xFFFF; -+ -+ //4 get Class Code -+ pcicfg_addrport = (busnum_idx << 16) | (devicenum_idx << 11) | (functionnum_idx << 8) | (1 << 31); -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (2 << 2)); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &classcode); -+ classcode = classcode >> 8; -+ -+ basec = (u8) (classcode >> 16) & 0xFF; -+ subc = (u8) (classcode >> 8) & 0xFF; -+ -+ //4 get field 0x19 value (DWORD #6) -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (6 << 2)); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &field19); -+ field19 = (field19 >> 8) & 0xFF; -+ -+ //4 Matching Class Code and filed19. -+ if ((basec == basecode) && (subc == subclass) && ((field19 == filed19val) || (filed19val == U1DONTCARE))) { -+ *busnum = busnum_idx; -+ *devnum = devicenum_idx; -+ *funcnum = functionnum_idx; -+ *vendorid = venId; -+ *deviceid = devId; -+ -+ DBG_871X("GetPciBridegInfo : Find Device(%X:%X) bus=%d dev=%d, func=%d\n", -+ venId, devId, busnum_idx, devicenum_idx, functionnum_idx); -+ -+ return _TRUE; -+ } -+ } -+ } -+ } -+ -+ DBG_871X("GetPciBridegInfo(): Cannot Find PciBridge for Device\n"); -+ -+ return _FALSE; -+} // end of GetPciBridegInfo -+ -+// -+//Description: -+//To find specific bridge information. -+// -+static void rtw_find_bridge_info(_adapter *padapter) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ u8 pcibridge_busnum = 0xff; -+ u8 pcibridge_devnum = 0xff; -+ u8 pcibridge_funcnum = 0xff; -+ u16 pcibridge_vendorid = 0xff; -+ u16 pcibridge_deviceid = 0xff; -+ u8 tmp = 0; -+ -+ rtw_get_pci_brideg_info(padapter, -+ PCI_CLASS_BRIDGE_DEV, -+ PCI_SUBCLASS_BR_PCI_TO_PCI, -+ pcipriv->busnumber, -+ &pcibridge_busnum, -+ &pcibridge_devnum, &pcibridge_funcnum, -+ &pcibridge_vendorid, &pcibridge_deviceid); -+ -+ // match the array of vendor id and regonize which chipset is used. -+ pcipriv->pcibridge_vendor = PCI_BRIDGE_VENDOR_UNKNOWN; -+ -+ for (tmp = 0; tmp < PCI_BRIDGE_VENDOR_MAX; tmp++) { -+ if (pcibridge_vendorid == pcibridge_vendors[tmp]) { -+ pcipriv->pcibridge_vendor = tmp; -+ DBG_871X("Pci Bridge Vendor is found index: %d\n", tmp); -+ break; -+ } -+ } -+ DBG_871X("Pci Bridge Vendor is %x\n", pcibridge_vendors[tmp]); -+ -+ // Update corresponding PCI bus info. -+ pcipriv->pcibridge_busnum = pcibridge_busnum; -+ pcipriv->pcibridge_devnum = pcibridge_devnum; -+ pcipriv->pcibridge_funcnum = pcibridge_funcnum; -+ pcipriv->pcibridge_vendorid = pcibridge_vendorid; -+ pcipriv->pcibridge_deviceid = pcibridge_deviceid; -+ -+} -+ -+static u8 -+rtw_get_amd_l1_patch(_adapter *padapter, u8 busnum, u8 devnum, -+ u8 funcnum) -+{ -+ u8 status = _FALSE; -+ u8 offset_e0; -+ unsigned offset_e4; -+ u32 pcicfg_addrport = 0; -+ -+ pcicfg_addrport = (busnum << 16) | (devnum << 11) | (funcnum << 8) | (1 << 31); -+ -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + 0xE0); -+ NdisRawWritePortUchar(PCI_CONF_DATA, 0xA0); -+ -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + 0xE0); -+ NdisRawReadPortUchar(PCI_CONF_DATA, &offset_e0); -+ -+ if (offset_e0 == 0xA0) -+ { -+ NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + 0xE4); -+ NdisRawReadPortUlong(PCI_CONF_DATA, &offset_e4); -+ //DbgPrint("Offset E4 %x\n", offset_e4); -+ if (offset_e4 & BIT(23)) -+ status = _TRUE; -+ } -+ -+ return status; -+} -+#else -+/*Disable RTL8192SE ASPM & Disable Pci Bridge ASPM*/ -+void rtw_pci_disable_aspm(_adapter *padapter) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct pci_dev *pdev = pdvobjpriv->ppcidev; -+ struct pci_dev *bridge_pdev = pdev->bus->self; -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ u8 linkctrl_reg; -+ u16 pcibridge_linkctrlreg; -+ u16 aspmlevel = 0; -+ -+ // We do not diable/enable ASPM by driver, in the future, the BIOS will enable host and NIC ASPM. -+ // Advertised by SD1 victorh. Added by tynli. 2009.11.23. -+ if(pdvobjpriv->const_pci_aspm == 0) -+ return; -+ -+ if(!padapter->hw_init_completed) -+ return; -+ -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) { -+ RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s(): PCI(Bridge) UNKNOWN.\n", __FUNCTION__)); -+ return; -+ } -+ -+ linkctrl_reg = pcipriv->linkctrl_reg; -+ pcibridge_linkctrlreg = pcipriv->pcibridge_linkctrlreg; -+ -+ // Set corresponding value. -+ aspmlevel |= BIT(0) | BIT(1); -+ linkctrl_reg &=~aspmlevel; -+ pcibridge_linkctrlreg &=~aspmlevel; -+ -+ if (pwrpriv->reg_rfps_level & RT_RF_OFF_LEVL_CLK_REQ) { -+ RT_CLEAR_PS_LEVEL(pwrpriv, RT_RF_OFF_LEVL_CLK_REQ); -+ rtw_pci_switch_clk_req(padapter, 0x0); -+ } -+ -+ { -+ /*for promising device will in L0 state after an I/O.*/ -+ u8 tmp_u1b; -+ pci_read_config_byte(pdev, 0x80, &tmp_u1b); -+ } -+ -+ rtw_pci_platform_switch_device_pci_aspm(padapter, linkctrl_reg); -+ rtw_udelay_os(50); -+ -+ //When there exists anyone's BusNum, DevNum, and FuncNum that are set to 0xff, -+ // we do not execute any action and return. Added by tynli. -+ if( (pcipriv->busnumber == 0xff && pcipriv->devnumber == 0xff && pcipriv->funcnumber == 0xff) || -+ (pcipriv->pcibridge_busnum == 0xff && pcipriv->pcibridge_devnum == 0xff && pcipriv->pcibridge_funcnum == 0xff) ) -+ { -+ // Do Nothing!! -+ } -+ else -+ { -+ /*Disable Pci Bridge ASPM*/ -+ //NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + (num4bytes << 2)); -+ //NdisRawWritePortUchar(PCI_CONF_DATA, pcibridge_linkctrlreg); -+ pci_write_config_byte(bridge_pdev, pcipriv->pcibridge_pciehdr_offset + 0x10, pcibridge_linkctrlreg); -+ -+ DBG_871X("rtw_pci_disable_aspm():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n", -+ pcipriv->pcibridge_busnum, pcipriv->pcibridge_devnum, -+ pcipriv->pcibridge_funcnum, -+ (pcipriv->pcibridge_pciehdr_offset+0x10), pcibridge_linkctrlreg); -+ -+ rtw_udelay_os(50); -+ } -+ -+} -+ -+/*Enable RTL8192SE ASPM & Enable Pci Bridge ASPM for -+power saving We should follow the sequence to enable -+RTL8192SE first then enable Pci Bridge ASPM -+or the system will show bluescreen.*/ -+void rtw_pci_enable_aspm(_adapter *padapter) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct pci_dev *pdev = pdvobjpriv->ppcidev; -+ struct pci_dev *bridge_pdev = pdev->bus->self; -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ u16 aspmlevel = 0; -+ u8 u_pcibridge_aspmsetting = 0; -+ u8 u_device_aspmsetting = 0; -+ u32 u_device_aspmsupportsetting = 0; -+ -+ // We do not diable/enable ASPM by driver, in the future, the BIOS will enable host and NIC ASPM. -+ // Advertised by SD1 victorh. Added by tynli. 2009.11.23. -+ if(pdvobjpriv->const_pci_aspm == 0) -+ return; -+ -+ //When there exists anyone's BusNum, DevNum, and FuncNum that are set to 0xff, -+ // we do not execute any action and return. Added by tynli. -+ if( (pcipriv->busnumber == 0xff && pcipriv->devnumber == 0xff && pcipriv->funcnumber == 0xff) || -+ (pcipriv->pcibridge_busnum == 0xff && pcipriv->pcibridge_devnum == 0xff && pcipriv->pcibridge_funcnum == 0xff) ) -+ { -+ DBG_871X("rtw_pci_enable_aspm(): Fail to enable ASPM. Cannot find the Bus of PCI(Bridge).\n"); -+ return; -+ } -+ -+//Get Bridge ASPM Support -+//not to enable bridge aspm if bridge does not support -+//Added by sherry 20100803 -+ if (IS_HARDWARE_TYPE_8192DE(padapter)) -+ { -+ //PciCfgAddrPort = (pcipriv->pcibridge_busnum << 16)|(pcipriv->pcibridge_devnum<< 11)|(pcipriv->pcibridge_funcnum << 8)|(1 << 31); -+ //Num4Bytes = (pcipriv->pcibridge_pciehdr_offset+0x0C)/4; -+ //NdisRawWritePortUlong((ULONG_PTR)PCI_CONF_ADDRESS , PciCfgAddrPort+(Num4Bytes << 2)); -+ //NdisRawReadPortUlong((ULONG_PTR)PCI_CONF_DATA,&uDeviceASPMSupportSetting); -+ pci_read_config_dword(bridge_pdev, (pcipriv->pcibridge_pciehdr_offset+0x0C), &u_device_aspmsupportsetting); -+ DBG_871X("rtw_pci_enable_aspm(): Bridge ASPM support %x \n",u_device_aspmsupportsetting); -+ if(((u_device_aspmsupportsetting & BIT(11)) != BIT(11)) || ((u_device_aspmsupportsetting & BIT(10)) != BIT(10))) -+ { -+ if(pdvobjpriv->const_devicepci_aspm_setting == 3) -+ { -+ DBG_871X("rtw_pci_enable_aspm(): Bridge not support L0S or L1\n"); -+ return; -+ } -+ else if(pdvobjpriv->const_devicepci_aspm_setting == 2) -+ { -+ if((u_device_aspmsupportsetting & BIT(11)) != BIT(11)) -+ { -+ DBG_871X("rtw_pci_enable_aspm(): Bridge not support L1 \n"); -+ return; -+ } -+ } -+ else if(pdvobjpriv->const_devicepci_aspm_setting == 1) -+ { -+ if((u_device_aspmsupportsetting & BIT(10)) != BIT(10)) -+ { -+ DBG_871X("rtw_pci_enable_aspm(): Bridge not support L0s \n"); -+ return; -+ } -+ -+ } -+ } -+ else -+ { -+ DBG_871X("rtw_pci_enable_aspm(): Bridge support L0s and L1 \n"); -+ } -+ } -+ -+ -+ /*Enable Pci Bridge ASPM*/ -+ //PciCfgAddrPort = (pcipriv->pcibridge_busnum << 16)|(pcipriv->pcibridge_devnum<< 11) |(pcipriv->pcibridge_funcnum << 8)|(1 << 31); -+ //Num4Bytes = (pcipriv->pcibridge_pciehdr_offset+0x10)/4; -+ // set up address port at 0xCF8 offset field= 0 (dev|vend) -+ //NdisRawWritePortUlong(PCI_CONF_ADDRESS, PciCfgAddrPort + (Num4Bytes << 2)); -+ // now grab data port with device|vendor 4 byte dword -+ -+ u_pcibridge_aspmsetting = pcipriv->pcibridge_linkctrlreg; -+ u_pcibridge_aspmsetting |= pdvobjpriv->const_hostpci_aspm_setting; -+ -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL || -+ pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_SIS ) -+ u_pcibridge_aspmsetting &= ~BIT(0); // for intel host 42 device 43 -+ -+ //NdisRawWritePortUchar(PCI_CONF_DATA, u_pcibridge_aspmsetting); -+ pci_write_config_byte(bridge_pdev, (pcipriv->pcibridge_pciehdr_offset+0x10), u_pcibridge_aspmsetting); -+ -+ DBG_871X("PlatformEnableASPM():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n", -+ pcipriv->pcibridge_busnum, pcipriv->pcibridge_devnum, pcipriv->pcibridge_funcnum, -+ (pcipriv->pcibridge_pciehdr_offset+0x10), -+ u_pcibridge_aspmsetting); -+ -+ rtw_udelay_os(50); -+ -+ /*Get ASPM level (with/without Clock Req)*/ -+ aspmlevel |= pdvobjpriv->const_devicepci_aspm_setting; -+ u_device_aspmsetting = pcipriv->linkctrl_reg; -+ u_device_aspmsetting |= aspmlevel; // device 43 -+ -+ rtw_pci_platform_switch_device_pci_aspm(padapter, u_device_aspmsetting); -+ -+ if (pwrpriv->reg_rfps_level & RT_RF_OFF_LEVL_CLK_REQ) { -+ rtw_pci_switch_clk_req(padapter, (pwrpriv->reg_rfps_level & RT_RF_OFF_LEVL_CLK_REQ) ? 1 : 0); -+ RT_SET_PS_LEVEL(pwrpriv, RT_RF_OFF_LEVL_CLK_REQ); -+ } -+ -+ rtw_udelay_os(50); -+} -+ -+static u8 rtw_pci_get_amd_l1_patch(struct dvobj_priv *dvobj) -+{ -+ struct pci_dev *pdev = dvobj->ppcidev; -+ struct pci_dev *bridge_pdev = pdev->bus->self; -+ u8 status = _FALSE; -+ u8 offset_e0; -+ u32 offset_e4; -+ -+ //NdisRawWritePortUlong(PCI_CONF_ADDRESS,pcicfg_addrport + 0xE0); -+ //NdisRawWritePortUchar(PCI_CONF_DATA, 0xA0); -+ pci_write_config_byte(bridge_pdev, 0xE0, 0xA0); -+ -+ //NdisRawWritePortUlong(PCI_CONF_ADDRESS,pcicfg_addrport + 0xE0); -+ //NdisRawReadPortUchar(PCI_CONF_DATA, &offset_e0); -+ pci_read_config_byte(bridge_pdev, 0xE0, &offset_e0); -+ -+ if (offset_e0 == 0xA0) { -+ //NdisRawWritePortUlong(PCI_CONF_ADDRESS, pcicfg_addrport + 0xE4); -+ //NdisRawReadPortUlong(PCI_CONF_DATA, &offset_e4); -+ pci_read_config_dword(bridge_pdev, 0xE4, &offset_e4); -+ if (offset_e4 & BIT(23)) -+ status = _TRUE; -+ } -+ -+ return status; -+} -+ -+static void rtw_pci_get_linkcontrol_field(struct dvobj_priv *dvobj) -+{ -+ struct pci_priv *pcipriv = &(dvobj->pcipriv); -+ struct pci_dev *pdev = dvobj->ppcidev; -+ struct pci_dev *bridge_pdev = pdev->bus->self; -+ u8 capabilityoffset = pcipriv->pcibridge_pciehdr_offset; -+ u8 linkctrl_reg; -+ -+ /*Read Link Control Register*/ -+ pci_read_config_byte(bridge_pdev, capabilityoffset + PCI_EXP_LNKCTL, &linkctrl_reg); -+ -+ pcipriv->pcibridge_linkctrlreg = linkctrl_reg; -+} -+#endif -+ -+static void rtw_pci_parse_configuration(struct dvobj_priv *dvobj) -+{ -+ struct pci_dev *pdev = dvobj->ppcidev; -+ struct pci_priv *pcipriv = &(dvobj->pcipriv); -+ u8 tmp; -+ int pos; -+ u8 linkctrl_reg; -+ -+ //Link Control Register -+ pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); -+ pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg); -+ pcipriv->linkctrl_reg = linkctrl_reg; -+ -+ //DBG_871X("Link Control Register = %x\n", pcipriv->linkctrl_reg); -+ -+ pci_read_config_byte(pdev, 0x98, &tmp); -+ tmp |= BIT(4); -+ pci_write_config_byte(pdev, 0x98, tmp); -+ -+ //tmp = 0x17; -+ //pci_write_config_byte(pdev, 0x70f, tmp); -+} -+ -+// -+// Update PCI dependent default settings. -+// -+static void rtw_pci_update_default_setting(_adapter *padapter) -+{ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct pci_priv *pcipriv = &(pdvobjpriv->pcipriv); -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+ //reset pPSC->reg_rfps_level & priv->b_support_aspm -+ pwrpriv->reg_rfps_level = 0; -+ pwrpriv->b_support_aspm = 0; -+ -+ // Dynamic Mechanism, -+ //rtw_hal_set_def_var(pAdapter, HAL_DEF_INIT_GAIN, &(pDevice->InitGainState)); -+ -+ // Update PCI ASPM setting -+ pwrpriv->const_amdpci_aspm = pdvobjpriv->const_amdpci_aspm; -+ switch (pdvobjpriv->const_pci_aspm) { -+ case 0: // No ASPM -+ break; -+ -+ case 1: // ASPM dynamically enabled/disable. -+ pwrpriv->reg_rfps_level |= RT_RF_LPS_LEVEL_ASPM; -+ break; -+ -+ case 2: // ASPM with Clock Req dynamically enabled/disable. -+ pwrpriv->reg_rfps_level |= (RT_RF_LPS_LEVEL_ASPM | RT_RF_OFF_LEVL_CLK_REQ); -+ break; -+ -+ case 3: // Always enable ASPM and Clock Req from initialization to halt. -+ pwrpriv->reg_rfps_level &= ~(RT_RF_LPS_LEVEL_ASPM); -+ pwrpriv->reg_rfps_level |= (RT_RF_PS_LEVEL_ALWAYS_ASPM | RT_RF_OFF_LEVL_CLK_REQ); -+ break; -+ -+ case 4: // Always enable ASPM without Clock Req from initialization to halt. -+ pwrpriv->reg_rfps_level &= ~(RT_RF_LPS_LEVEL_ASPM | RT_RF_OFF_LEVL_CLK_REQ); -+ pwrpriv->reg_rfps_level |= RT_RF_PS_LEVEL_ALWAYS_ASPM; -+ break; -+ } -+ -+ pwrpriv->reg_rfps_level |= RT_RF_OFF_LEVL_HALT_NIC; -+ -+ // Update Radio OFF setting -+ switch (pdvobjpriv->const_hwsw_rfoff_d3) { -+ case 1: -+ if (pwrpriv->reg_rfps_level & RT_RF_LPS_LEVEL_ASPM) -+ pwrpriv->reg_rfps_level |= RT_RF_OFF_LEVL_ASPM; -+ break; -+ -+ case 2: -+ if (pwrpriv->reg_rfps_level & RT_RF_LPS_LEVEL_ASPM) -+ pwrpriv->reg_rfps_level |= RT_RF_OFF_LEVL_ASPM; -+ pwrpriv->reg_rfps_level |= RT_RF_OFF_LEVL_HALT_NIC; -+ break; -+ -+ case 3: -+ pwrpriv->reg_rfps_level |= RT_RF_OFF_LEVL_PCI_D3; -+ break; -+ } -+ -+ // Update Rx 2R setting -+ //pPSC->reg_rfps_level |= ((pDevice->RegLPS2RDisable) ? RT_RF_LPS_DISALBE_2R : 0); -+ -+ // -+ // Set HW definition to determine if it supports ASPM. -+ // -+ switch (pdvobjpriv->const_support_pciaspm) { -+ case 0: // Not support ASPM. -+ { -+ u8 b_support_aspm = _FALSE; -+ pwrpriv->b_support_aspm = b_support_aspm; -+ } -+ break; -+ -+ case 1: // Support ASPM. -+ { -+ u8 b_support_aspm = _TRUE; -+ u8 b_support_backdoor = _TRUE; -+ -+ pwrpriv->b_support_aspm = b_support_aspm; -+ -+ /*if(pAdapter->MgntInfo.CustomerID == RT_CID_TOSHIBA && -+ pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_AMD && -+ !pcipriv->amd_l1_patch) -+ b_support_backdoor = _FALSE;*/ -+ -+ pwrpriv->b_support_backdoor = b_support_backdoor; -+ } -+ break; -+ -+ case 2: // Set by Chipset. -+ // ASPM value set by chipset. -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL) { -+ u8 b_support_aspm = _TRUE; -+ pwrpriv->b_support_aspm = b_support_aspm; -+ } -+ break; -+ -+ default: -+ // Do nothing. Set when finding the chipset. -+ break; -+ } -+} -+ -+static void rtw_pci_initialize_adapter_common(_adapter *padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ -+ rtw_pci_update_default_setting(padapter); -+ -+ if (pwrpriv->reg_rfps_level & RT_RF_PS_LEVEL_ALWAYS_ASPM) { -+ // Always enable ASPM & Clock Req. -+ rtw_pci_enable_aspm(padapter); -+ RT_SET_PS_LEVEL(pwrpriv, RT_RF_PS_LEVEL_ALWAYS_ASPM); -+ } -+ -+} -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) -+#define rtw_pci_interrupt(x,y,z) rtw_pci_interrupt(x,y) -+#endif -+ -+static irqreturn_t rtw_pci_interrupt(int irq, void *priv, struct pt_regs *regs) -+{ -+ struct dvobj_priv *dvobj = (struct dvobj_priv *)priv; -+ _adapter *adapter = dvobj->if1; -+ -+ if (dvobj->irq_enabled == 0) { -+ return IRQ_HANDLED; -+ } -+ -+ if(rtw_hal_interrupt_handler(adapter) == _FAIL) -+ return IRQ_HANDLED; -+ //return IRQ_NONE; -+ -+ return IRQ_HANDLED; -+} -+ -+#ifdef RTK_DMP_PLATFORM -+#define pci_iounmap(x,y) iounmap(y) -+#endif -+ -+int pci_alloc_irq(struct dvobj_priv *dvobj) -+{ -+ int err; -+ struct pci_dev *pdev = dvobj->ppcidev; -+ -+#if defined(IRQF_SHARED) -+ err = request_irq(pdev->irq, &rtw_pci_interrupt, IRQF_SHARED, DRV_NAME, dvobj); -+#else -+ err = request_irq(pdev->irq, &rtw_pci_interrupt, SA_SHIRQ, DRV_NAME, dvobj); -+#endif -+ if (err) { -+ DBG_871X("Error allocating IRQ %d",pdev->irq); -+ } else { -+ dvobj->irq_alloc = 1; -+ DBG_871X("Request_irq OK, IRQ %d\n",pdev->irq); -+ } -+ -+ return err?_FAIL:_SUCCESS; -+} -+ -+static struct dvobj_priv *pci_dvobj_init(struct pci_dev *pdev) -+{ -+ int err; -+ u32 status = _FAIL; -+ struct dvobj_priv *dvobj = NULL; -+ struct pci_priv *pcipriv = NULL; -+ struct pci_dev *bridge_pdev = pdev->bus->self; -+ unsigned long pmem_start, pmem_len, pmem_flags; -+ u8 tmp; -+ -+_func_enter_; -+ -+ if ((dvobj = devobj_init()) == NULL) { -+ goto exit; -+ } -+ dvobj->ppcidev = pdev; -+ pcipriv = &(dvobj->pcipriv); -+ pci_set_drvdata(pdev, dvobj); -+ -+ if ( (err = pci_enable_device(pdev)) != 0) { -+ DBG_871X(KERN_ERR "%s : Cannot enable new PCI device\n", pci_name(pdev)); -+ goto free_dvobj; -+ } -+ -+#ifdef CONFIG_64BIT_DMA -+ if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { -+ DBG_871X("RTL819xCE: Using 64bit DMA\n"); -+ if ((err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) != 0) { -+ DBG_871X(KERN_ERR "Unable to obtain 64bit DMA for consistent allocations\n"); -+ goto disable_picdev; -+ } -+ dvobj->bdma64 = _TRUE; -+ } else -+#endif -+ { -+ if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { -+ if ((err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { -+ DBG_871X(KERN_ERR "Unable to obtain 32bit DMA for consistent allocations\n"); -+ goto disable_picdev; -+ } -+ } -+ } -+ -+ pci_set_master(pdev); -+ -+ if ((err = pci_request_regions(pdev, DRV_NAME)) != 0) { -+ DBG_871X(KERN_ERR "Can't obtain PCI resources\n"); -+ goto disable_picdev; -+ } -+ //MEM map -+ pmem_start = pci_resource_start(pdev, 2); -+ pmem_len = pci_resource_len(pdev, 2); -+ pmem_flags = pci_resource_flags(pdev, 2); -+ -+#ifdef RTK_DMP_PLATFORM -+ dvobj->pci_mem_start = (unsigned long)ioremap_nocache(pmem_start, pmem_len); -+#else -+ dvobj->pci_mem_start = (unsigned long)pci_iomap(pdev, 2, pmem_len); /* shared mem start */ -+#endif -+ if (dvobj->pci_mem_start == 0) { -+ DBG_871X(KERN_ERR "Can't map PCI mem\n"); -+ goto release_regions; -+ } -+ -+ DBG_871X("Memory mapped space start: 0x%08lx len:%08lx flags:%08lx, after map:0x%08lx\n", -+ pmem_start, pmem_len, pmem_flags, dvobj->pci_mem_start); -+ -+ // Disable Clk Request */ -+ pci_write_config_byte(pdev, 0x81, 0); -+ // leave D3 mode */ -+ pci_write_config_byte(pdev, 0x44, 0); -+ pci_write_config_byte(pdev, 0x04, 0x06); -+ pci_write_config_byte(pdev, 0x04, 0x07); -+ -+ -+#if 1 -+ /*find bus info*/ -+ pcipriv->busnumber = pdev->bus->number; -+ pcipriv->devnumber = PCI_SLOT(pdev->devfn); -+ pcipriv->funcnumber = PCI_FUNC(pdev->devfn); -+ -+ /*find bridge info*/ -+ pcipriv->pcibridge_vendor = PCI_BRIDGE_VENDOR_UNKNOWN; -+ if(bridge_pdev){ -+ pcipriv->pcibridge_vendorid = bridge_pdev->vendor; -+ for (tmp = 0; tmp < PCI_BRIDGE_VENDOR_MAX; tmp++) { -+ if (bridge_pdev->vendor == pcibridge_vendors[tmp]) { -+ pcipriv->pcibridge_vendor = tmp; -+ DBG_871X("Pci Bridge Vendor is found index: %d, %x\n", tmp, pcibridge_vendors[tmp]); -+ break; -+ } -+ } -+ } -+ -+ //if (pcipriv->pcibridge_vendor != PCI_BRIDGE_VENDOR_UNKNOWN) { -+ if(bridge_pdev){ -+ pcipriv->pcibridge_busnum = bridge_pdev->bus->number; -+ pcipriv->pcibridge_devnum = PCI_SLOT(bridge_pdev->devfn); -+ pcipriv->pcibridge_funcnum = PCI_FUNC(bridge_pdev->devfn); -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) -+ pcipriv->pcibridge_pciehdr_offset = pci_find_capability(bridge_pdev, PCI_CAP_ID_EXP); -+#else -+ pcipriv->pcibridge_pciehdr_offset = bridge_pdev->pcie_cap; -+#endif -+ -+ rtw_pci_get_linkcontrol_field(dvobj); -+ -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_AMD) { -+ pcipriv->amd_l1_patch = rtw_pci_get_amd_l1_patch(dvobj); -+ } -+ } -+#else -+ // -+ // Find bridge related info. -+ // -+ rtw_get_pci_bus_info(padapter, -+ pdev->vendor, -+ pdev->device, -+ (u8) pdvobjpriv->irqline, -+ 0x02, 0x80, U1DONTCARE, -+ &pcipriv->busnumber, -+ &pcipriv->devnumber, -+ &pcipriv->funcnumber); -+ -+ rtw_find_bridge_info(padapter); -+ -+ if (pcipriv->pcibridge_vendor != PCI_BRIDGE_VENDOR_UNKNOWN) { -+ rtw_get_link_control_field(padapter, -+ pcipriv->pcibridge_busnum, -+ pcipriv->pcibridge_devnum, -+ pcipriv->pcibridge_funcnum); -+ -+ if (pcipriv->pcibridge_vendor == PCI_BRIDGE_VENDOR_AMD) { -+ pcipriv->amd_l1_patch = -+ rtw_get_amd_l1_patch(padapter, -+ pcipriv->pcibridge_busnum, -+ pcipriv->pcibridge_devnum, -+ pcipriv->pcibridge_funcnum); -+ } -+ } -+#endif -+ -+ // -+ // Allow the hardware to look at PCI config information. -+ // -+ rtw_pci_parse_configuration(dvobj); -+ -+ DBG_871X("pcidev busnumber:devnumber:funcnumber:" -+ "vendor:link_ctl %d:%d:%d:%x:%x\n", -+ pcipriv->busnumber, -+ pcipriv->devnumber, -+ pcipriv->funcnumber, -+ pdev->vendor, -+ pcipriv->linkctrl_reg); -+ -+ DBG_871X("pci_bridge busnumber:devnumber:funcnumber:vendor:" -+ "pcie_cap:link_ctl_reg: %d:%d:%d:%x:%x:%x:%x\n", -+ pcipriv->pcibridge_busnum, -+ pcipriv->pcibridge_devnum, -+ pcipriv->pcibridge_funcnum, -+ pcibridge_vendors[pcipriv->pcibridge_vendor], -+ pcipriv->pcibridge_pciehdr_offset, -+ pcipriv->pcibridge_linkctrlreg, -+ pcipriv->amd_l1_patch); -+ -+ status = _SUCCESS; -+ -+iounmap: -+ if (status != _SUCCESS && dvobj->pci_mem_start != 0) { -+ pci_iounmap(pdev, (void *)dvobj->pci_mem_start); -+ dvobj->pci_mem_start = 0; -+ } -+release_regions: -+ if (status != _SUCCESS) -+ pci_release_regions(pdev); -+disable_picdev: -+ if (status != _SUCCESS) -+ pci_disable_device(pdev); -+free_dvobj: -+ if (status != _SUCCESS && dvobj) { -+ pci_set_drvdata(pdev, NULL); -+ devobj_deinit(dvobj); -+ dvobj = NULL; -+ } -+exit: -+_func_exit_; -+ return dvobj; -+} -+ -+static void pci_dvobj_deinit(struct pci_dev *pdev) -+{ -+ struct dvobj_priv *dvobj = pci_get_drvdata(pdev); -+_func_enter_; -+ -+ pci_set_drvdata(pdev, NULL); -+ if (dvobj) { -+ if (dvobj->irq_alloc) { -+ free_irq(pdev->irq, dvobj); -+ dvobj->irq_alloc = 0; -+ } -+ -+ if (dvobj->pci_mem_start != 0) { -+ pci_iounmap(pdev, (void *)dvobj->pci_mem_start); -+ dvobj->pci_mem_start = 0; -+ } -+ -+ devobj_deinit(dvobj); -+ } -+ -+ pci_release_regions(pdev); -+ pci_disable_device(pdev); -+ -+_func_exit_; -+} -+ -+static void decide_chip_type_by_pci_device_id(_adapter *padapter, struct pci_dev *pdev) -+{ -+ u16 venderid, deviceid, irqline; -+ u8 revisionid; -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ -+ -+ venderid = pdev->vendor; -+ deviceid = pdev->device; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) -+ pci_read_config_byte(pdev, PCI_REVISION_ID, &revisionid); // PCI_REVISION_ID 0x08 -+#else -+ revisionid = pdev->revision; -+#endif -+ pci_read_config_word(pdev, PCI_INTERRUPT_LINE, &irqline); // PCI_INTERRUPT_LINE 0x3c -+ pdvobjpriv->irqline = irqline; -+ -+ -+ // -+ // Decide hardware type here. -+ // -+ if( deviceid == HAL_HW_PCI_8185_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8188_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8198_DEVICE_ID) -+ { -+ DBG_871X("Adapter (8185/8185B) is found- VendorID/DeviceID=%x/%x\n", venderid, deviceid); -+ padapter->HardwareType=HARDWARE_TYPE_RTL8185; -+ } -+ else if (deviceid == HAL_HW_PCI_8190_DEVICE_ID || -+ deviceid == HAL_HW_PCI_0045_DEVICE_ID || -+ deviceid == HAL_HW_PCI_0046_DEVICE_ID || -+ deviceid == HAL_HW_PCI_DLINK_DEVICE_ID) -+ { -+ DBG_871X("Adapter(8190 PCI) is found - vendorid/deviceid=%x/%x\n", venderid, deviceid); -+ padapter->HardwareType = HARDWARE_TYPE_RTL8190P; -+ } -+ else if (deviceid == HAL_HW_PCI_8192_DEVICE_ID || -+ deviceid == HAL_HW_PCI_0044_DEVICE_ID || -+ deviceid == HAL_HW_PCI_0047_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8192SE_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8174_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8173_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8172_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8171_DEVICE_ID) -+ { -+ // 8192e and and 8192se may have the same device ID 8192. However, their Revision -+ // ID is different -+ // Added for 92DE. We deferentiate it from SVID,SDID. -+ if( pdev->subsystem_vendor == 0x10EC && pdev->subsystem_device == 0xE020){ -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192DE; -+ DBG_871X("Adapter(8192DE) is found - VendorID/DeviceID/RID=%X/%X/%X\n", venderid, deviceid, revisionid); -+ }else{ -+ switch (revisionid) { -+ case HAL_HW_PCI_REVISION_ID_8192PCIE: -+ DBG_871X("Adapter(8192 PCI-E) is found - vendorid/deviceid=%x/%x\n", venderid, deviceid); -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192E; -+ break; -+ case HAL_HW_PCI_REVISION_ID_8192SE: -+ DBG_871X("Adapter(8192SE) is found - vendorid/deviceid=%x/%x\n", venderid, deviceid); -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192SE; -+ break; -+ default: -+ DBG_871X("Err: Unknown device - vendorid/deviceid=%x/%x\n", venderid, deviceid); -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192SE; -+ break; -+ } -+ } -+ } -+ else if(deviceid==HAL_HW_PCI_8723E_DEVICE_ID ) -+ {//RTL8723E may have the same device ID with RTL8192CET -+ padapter->HardwareType = HARDWARE_TYPE_RTL8723AE; -+ DBG_871X("Adapter(8723 PCI-E) is found - VendorID/DeviceID=%x/%x\n", venderid, deviceid); -+ } -+ else if (deviceid == HAL_HW_PCI_8192CET_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8192CE_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8191CE_DEVICE_ID || -+ deviceid == HAL_HW_PCI_8188CE_DEVICE_ID) -+ { -+ DBG_871X("Adapter(8192C PCI-E) is found - vendorid/deviceid=%x/%x\n", venderid, deviceid); -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192CE; -+ } -+ else if (deviceid == HAL_HW_PCI_8192DE_DEVICE_ID || -+ deviceid == HAL_HW_PCI_002B_DEVICE_ID ){ -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192DE; -+ DBG_871X("Adapter(8192DE) is found - VendorID/DeviceID/RID=%X/%X/%X\n", venderid, deviceid, revisionid); -+ } -+ else -+ { -+ DBG_871X("Err: Unknown device - vendorid/deviceid=%x/%x\n", venderid, deviceid); -+ //padapter->HardwareType = HAL_DEFAULT_HARDWARE_TYPE; -+ } -+ -+ -+ padapter->chip_type = NULL_CHIP_TYPE; -+ -+ //TODO: -+#ifdef CONFIG_RTL8192C -+ padapter->chip_type = RTL8188C_8192C; -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192CE; -+#endif -+#ifdef CONFIG_RTL8192D -+ pdvobjpriv->InterfaceNumber = revisionid; -+ -+ padapter->chip_type = RTL8192D; -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192DE; -+#endif -+ -+} -+ -+static void pci_intf_start(_adapter *padapter) -+{ -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+pci_intf_start\n")); -+ DBG_871X("+pci_intf_start\n"); -+ -+#ifdef CONFIG_PCILED_BLINK -+ rtw_led_control(padapter, LED_CTL_NO_LINK); -+#endif -+ //Enable hw interrupt -+ rtw_hal_enable_interrupt(padapter); -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-pci_intf_start\n")); -+ DBG_871X("-pci_intf_start\n"); -+} -+ -+static void pci_intf_stop(_adapter *padapter) -+{ -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+pci_intf_stop\n")); -+ -+ //Disable hw interrupt -+ if(padapter->bSurpriseRemoved == _FALSE) -+ { -+ //device still exists, so driver can do i/o operation -+ rtw_hal_disable_interrupt(padapter); -+ tasklet_disable(&(padapter->recvpriv.recv_tasklet)); -+ tasklet_disable(&(padapter->recvpriv.irq_prepare_beacon_tasklet)); -+ tasklet_disable(&(padapter->xmitpriv.xmit_tasklet)); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ /* This function only be called at driver removing. disable buddy_adapter too -+ don't disable interrupt of buddy_adapter because it is same as primary. -+ */ -+ if (padapter->pbuddy_adapter){ -+ tasklet_disable(&(padapter->pbuddy_adapter->recvpriv.recv_tasklet)); -+ tasklet_disable(&(padapter->pbuddy_adapter->recvpriv.irq_prepare_beacon_tasklet)); -+ tasklet_disable(&(padapter->pbuddy_adapter->xmitpriv.xmit_tasklet)); -+ } -+#endif -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("pci_intf_stop: SurpriseRemoved==_FALSE\n")); -+ } -+ else -+ { -+ // Clear irq_enabled to prevent handle interrupt function. -+ adapter_to_dvobj(padapter)->irq_enabled = 0; -+ } -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-pci_intf_stop\n")); -+ -+} -+ -+ -+static void rtw_dev_unload(_adapter *padapter) -+{ -+ struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_dev_unload\n")); -+ -+ if(padapter->bup == _TRUE) -+ { -+ DBG_871X("+rtw_dev_unload\n"); -+ -+ padapter->bDriverStopped = _TRUE; -+ #ifdef CONFIG_XMIT_ACK -+ if (padapter->xmitpriv.ack_tx) -+ rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); -+ #endif -+ -+ //s3. -+ if(padapter->intf_stop) -+ { -+ padapter->intf_stop(padapter); -+ } -+ -+ //s4. -+ rtw_stop_drv_threads(padapter); -+ -+ -+ //s5. -+ if(padapter->bSurpriseRemoved == _FALSE) -+ { -+ DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n"); -+ rtw_hal_deinit(padapter); -+ -+ padapter->bSurpriseRemoved = _TRUE; -+ } -+ -+ padapter->bup = _FALSE; -+ -+ } -+ else -+ { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == _FALSE\n" )); -+ } -+ -+ DBG_871X("-rtw_dev_unload\n"); -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-rtw_dev_unload\n")); -+ -+} -+ -+static void disable_ht_for_spec_devid(const struct pci_device_id *pdid) -+{ -+#ifdef CONFIG_80211N_HT -+ u16 vid, pid; -+ u32 flags; -+ int i; -+ int num = sizeof(specific_device_id_tbl)/sizeof(struct specific_device_id); -+ -+ for(i=0; ivendor==vid) && (pdid->device==pid) && (flags&SPEC_DEV_ID_DISABLE_HT)) -+ { -+ rtw_ht_enable = 0; -+ rtw_cbw40_enable = 0; -+ rtw_ampdu_enable = 0; -+ } -+ -+ } -+#endif -+} -+ -+#ifdef CONFIG_PM -+static int rtw_suspend(struct pci_dev *pdev, pm_message_t state) -+{ -+ _func_enter_; -+ -+ -+ _func_exit_; -+ return 0; -+} -+ -+static int rtw_resume(struct pci_dev *pdev) -+{ -+ _func_enter_; -+ -+ -+ _func_exit_; -+ -+ return 0; -+} -+#endif -+ -+_adapter *rtw_pci_if1_init(struct dvobj_priv * dvobj, struct pci_dev *pdev, -+ const struct pci_device_id *pdid) -+{ -+ _adapter *padapter = NULL; -+ struct net_device *pnetdev = NULL; -+ int status = _FAIL; -+ -+ if ((padapter = (_adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) { -+ goto exit; -+ } -+ padapter->dvobj = dvobj; -+ dvobj->if1 = padapter; -+ -+ padapter->bDriverStopped=_TRUE; -+ -+ dvobj->padapters[dvobj->iface_nums++] = padapter; -+ padapter->iface_id = IFACE_ID0; -+ -+#if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) -+ //set adapter_type/iface type for primary padapter -+ padapter->isprimary = _TRUE; -+ padapter->adapter_type = PRIMARY_ADAPTER; -+ #ifndef CONFIG_HWPORT_SWAP -+ padapter->iface_type = IFACE_PORT0; -+ #else -+ padapter->iface_type = IFACE_PORT1; -+ #endif -+#endif -+ -+ //step 1-1., decide the chip_type via vid/pid -+ padapter->interface_type = RTW_PCIE; -+ decide_chip_type_by_pci_device_id(padapter, pdev); -+ -+ if((pnetdev = rtw_init_netdev(padapter)) == NULL) { -+ goto free_adapter; -+ } -+ if (dvobj->bdma64) -+ pnetdev->features |= NETIF_F_HIGHDMA; -+ pnetdev->irq = pdev->irq; -+ SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj)); -+ padapter = rtw_netdev_priv(pnetdev); -+ -+ //step 2. hook HalFunc, allocate HalData -+ if (padapter->chip_type == RTL8188C_8192C) { -+ #ifdef CONFIG_RTL8192C -+ rtl8192ce_set_hal_ops(padapter); -+ #endif -+ } else if (padapter->chip_type == RTL8192D) { -+ #ifdef CONFIG_RTL8192D -+ rtl8192de_set_hal_ops(padapter); -+ #endif -+ } else { -+ DBG_871X("Detect NULL_CHIP_TYPE\n"); -+ goto free_hal_data; -+ } -+ -+ //step 3. initialize the dvobj_priv -+ padapter->intf_start=&pci_intf_start; -+ padapter->intf_stop=&pci_intf_stop; -+ -+ -+ //.2 -+ if ((rtw_init_io_priv(padapter, pci_set_intf_ops)) == _FAIL) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,(" \n Can't init io_reqs\n")); -+ goto free_hal_data; -+ } -+ -+ //.3 -+ rtw_hal_read_chip_version(padapter); -+ -+ //.4 -+ rtw_hal_chip_configure(padapter); -+ -+ //step 4. read efuse/eeprom data and get mac_addr -+ rtw_hal_read_chip_info(padapter); -+ -+ if (rtw_handle_dualmac(padapter, 1) != _SUCCESS) -+ goto free_hal_data; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)) != 0) { -+ goto handle_dualmac; -+ } -+#endif -+ -+ //step 5. -+ if (rtw_init_drv_sw(padapter) == _FAIL) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("Initialize driver software resource Failed!\n")); -+ goto free_wdev; -+ } -+ -+ status = rtw_hal_inirp_init(padapter); -+ if(status ==_FAIL){ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("Initialize PCI desc ring Failed!\n")); -+ goto free_drv_sw; -+ } -+ -+ rtw_macaddr_cfg(padapter->eeprompriv.mac_addr); -+ rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); -+ -+ -+ rtw_hal_disable_interrupt(padapter); -+ -+ //step 6. Init pci related configuration -+ rtw_pci_initialize_adapter_common(padapter); -+ -+ DBG_871X("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n" -+ ,padapter->bDriverStopped -+ ,padapter->bSurpriseRemoved -+ ,padapter->bup -+ ,padapter->hw_init_completed -+ ); -+ -+ status = _SUCCESS; -+ -+inirp_deinit: -+ if (status != _SUCCESS) -+ rtw_hal_inirp_deinit(padapter); -+free_drv_sw: -+ if (status != _SUCCESS) -+ rtw_free_drv_sw(padapter); -+free_wdev: -+ if (status != _SUCCESS) { -+ #ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_unregister(padapter->rtw_wdev); -+ rtw_wdev_free(padapter->rtw_wdev); -+ #endif -+ } -+handle_dualmac: -+ if (status != _SUCCESS) -+ rtw_handle_dualmac(padapter, 0); -+free_hal_data: -+ if (status != _SUCCESS && padapter->HalData) -+ rtw_mfree(padapter->HalData, sizeof(*(padapter->HalData))); -+free_adapter: -+ if (status != _SUCCESS) { -+ if (pnetdev) -+ rtw_free_netdev(pnetdev); -+ else if (padapter) -+ rtw_vmfree((u8*)padapter, sizeof(*padapter)); -+ padapter = NULL; -+ } -+exit: -+ return padapter; -+} -+ -+static void rtw_pci_if1_deinit(_adapter *if1) -+{ -+ struct net_device *pnetdev = if1->pnetdev; -+ struct mlme_priv *pmlmepriv= &if1->mlmepriv; -+ -+ // padapter->intf_stop(padapter); -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED)) -+ rtw_disassoc_cmd(if1, 0, _FALSE); -+ -+#ifdef CONFIG_AP_MODE -+ free_mlme_ap_info(if1); -+ #ifdef CONFIG_HOSTAPD_MLME -+ hostapd_mode_unload(if1); -+ #endif -+#endif -+ -+ rtw_cancel_all_timer(if1); -+#ifdef CONFIG_WOWLAN -+ if1->pwrctrlpriv.wowlan_mode=_FALSE; -+#endif //CONFIG_WOWLAN -+ rtw_dev_unload(if1); -+ -+ DBG_871X("%s, hw_init_completed=%d\n", __func__, if1->hw_init_completed); -+ -+ //s6. -+ rtw_handle_dualmac(if1, 0); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if (if1->rtw_wdev) -+ rtw_wdev_free(if1->rtw_wdev); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ rtw_hal_inirp_deinit(if1); -+ rtw_free_drv_sw(if1); -+ -+ if(pnetdev) -+ rtw_free_netdev(pnetdev); -+ -+#ifdef CONFIG_PLATFORM_RTD2880B -+ DBG_871X("wlan link down\n"); -+ rtd2885_wlan_netlink_sendMsg("linkdown", "8712"); -+#endif -+} -+ -+/* -+ * drv_init() - a device potentially for us -+ * -+ * notes: drv_init() is called when the bus driver has located a card for us to support. -+ * We accept the new device by returning 0. -+*/ -+static int rtw_drv_init(struct pci_dev *pdev, const struct pci_device_id *did) -+{ -+ int i, err = -ENODEV; -+ -+ int status; -+ _adapter *if1 = NULL, *if2 = NULL; -+ struct dvobj_priv *dvobj; -+ -+ RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_init\n")); -+ -+ //step 0. -+ disable_ht_for_spec_devid(did); -+ -+ /* Initialize dvobj_priv */ -+ if ((dvobj = pci_dvobj_init(pdev)) == NULL) { -+ RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("initialize device object priv Failed!\n")); -+ goto exit; -+ } -+ -+ /* Initialize if1 */ -+ if ((if1 = rtw_pci_if1_init(dvobj, pdev, did)) == NULL) { -+ DBG_871X("rtw_pci_if1_init Failed!\n"); -+ goto free_dvobj; -+ } -+ -+ /* Initialize if2 */ -+#ifdef CONFIG_CONCURRENT_MODE -+ if((if2 = rtw_drv_if2_init(if1, pci_set_intf_ops)) == NULL) { -+ goto free_if1; -+ } -+#endif -+ -+#ifdef CONFIG_GLOBAL_UI_PID -+ if (ui_pid[1]!=0) { -+ DBG_871X("ui_pid[1]:%d\n",ui_pid[1]); -+ rtw_signal_process(ui_pid[1], SIGUSR2); -+ } -+#endif -+ -+ //dev_alloc_name && register_netdev -+ if((status = rtw_drv_register_netdev(if1)) != _SUCCESS) { -+ goto free_if1; -+ } -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ hostapd_mode_init(if1); -+#endif -+ -+#ifdef CONFIG_PLATFORM_RTD2880B -+ DBG_871X("wlan link up\n"); -+ rtd2885_wlan_netlink_sendMsg("linkup", "8712"); -+#endif -+ -+#ifdef RTK_DMP_PLATFORM -+ rtw_proc_init_one(if1->pnetdev); -+#endif -+ -+ -+ /* alloc irq */ -+ if (pci_alloc_irq(dvobj) != _SUCCESS) -+ goto free_if2; -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-871x_drv - drv_init, success!\n")); -+ //DBG_871X("-871x_drv - drv_init, success!\n"); -+ -+ status = _SUCCESS; -+ -+free_if2: -+ if(status != _SUCCESS && if2) { -+ #ifdef CONFIG_CONCURRENT_MODE -+ rtw_drv_if2_stop(if2); -+ rtw_drv_if2_free(if2); -+ #endif -+ } -+free_if1: -+ if (status != _SUCCESS && if1) { -+ rtw_pci_if1_deinit(if1); -+ } -+free_dvobj: -+ if (status != _SUCCESS) -+ pci_dvobj_deinit(pdev); -+exit: -+ return status == _SUCCESS?0:-ENODEV; -+} -+ -+/* -+ * dev_remove() - our device is being removed -+*/ -+//rmmod module & unplug(SurpriseRemoved) will call r871xu_dev_remove() => how to recognize both -+static void rtw_dev_remove(struct pci_dev *pdev) -+{ -+ struct dvobj_priv *pdvobjpriv = pci_get_drvdata(pdev); -+ _adapter *padapter = pdvobjpriv->if1; -+ struct net_device *pnetdev = padapter->pnetdev; -+ -+_func_exit_; -+ -+ DBG_871X("+rtw_dev_remove\n"); -+ -+ pdvobjpriv->processing_dev_remove = _TRUE; -+ -+ if (unlikely(!padapter)) { -+ return; -+ } -+ -+ rtw_unregister_netdevs(pdvobjpriv); -+ -+ #if 0 -+#ifdef RTK_DMP_PLATFORM -+ padapter->bSurpriseRemoved = _FALSE; // always trate as device exists -+ // this will let the driver to disable it's interrupt -+#else -+ if(pci_drvpriv.drv_registered == _TRUE) -+ { -+ //DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == _TRUE\n"); -+ padapter->bSurpriseRemoved = _TRUE; -+ } -+ /*else -+ { -+ //DBG_871X("r871xu_dev_remove():module removed\n"); -+ padapter->hw_init_completed = _FALSE; -+ }*/ -+#endif -+ #endif -+ -+#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) -+ rtw_unregister_early_suspend(&padapter->pwrctrlpriv); -+#endif -+ -+ rtw_pm_set_ips(padapter, IPS_NONE); -+ rtw_pm_set_lps(padapter, PS_MODE_ACTIVE); -+ -+ LeaveAllPowerSaveMode(padapter); -+ -+ rtw_hal_disable_interrupt(padapter); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ rtw_drv_if2_stop(pdvobjpriv->if2); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ rtw_pci_if1_deinit(padapter); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+ rtw_drv_if2_free(pdvobjpriv->if2); -+#endif -+ -+ pci_dvobj_deinit(pdev); -+ -+ DBG_871X("-r871xu_dev_remove, done\n"); -+ -+_func_exit_; -+ return; -+} -+ -+ -+static int __init rtw_drv_entry(void) -+{ -+ int ret = 0; -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); -+ DBG_871X("rtw driver version=%s\n", DRIVERVERSION); -+ DBG_871X("Build at: %s %s\n", __DATE__, __TIME__); -+ pci_drvpriv.drv_registered = _TRUE; -+ -+ rtw_suspend_lock_init(); -+ -+ ret = pci_register_driver(&pci_drvpriv.rtw_pci_drv); -+ if (ret) { -+ RT_TRACE(_module_hci_intfs_c_, _drv_err_, (": No device found\n")); -+ } -+ -+ return ret; -+} -+ -+static void __exit rtw_drv_halt(void) -+{ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n")); -+ DBG_871X("+rtw_drv_halt\n"); -+ -+ pci_drvpriv.drv_registered = _FALSE; -+ -+ pci_unregister_driver(&pci_drvpriv.rtw_pci_drv); -+ -+ rtw_suspend_lock_uninit(); -+ DBG_871X("-rtw_drv_halt\n"); -+ -+ rtw_mstat_dump(); -+} -+ -+ -+module_init(rtw_drv_entry); -+module_exit(rtw_drv_halt); -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c -@@ -0,0 +1,24 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ *******************************************************************************/ -+#define _PCI_OPS_LINUX_C_ -+ -+#include -+ -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c -@@ -0,0 +1,461 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _RECV_OSDEP_C_ -+ -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+#include -+ -+#ifdef CONFIG_USB_HCI -+#include -+#endif -+ -+//init os related resource in struct recv_priv -+int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter) -+{ -+ int res=_SUCCESS; -+ -+ return res; -+} -+ -+//alloc os related resource in union recv_frame -+int rtw_os_recv_resource_alloc(_adapter *padapter, union recv_frame *precvframe) -+{ -+ int res=_SUCCESS; -+ -+ precvframe->u.hdr.pkt_newalloc = precvframe->u.hdr.pkt = NULL; -+ -+ return res; -+ -+} -+ -+//free os related resource in union recv_frame -+void rtw_os_recv_resource_free(struct recv_priv *precvpriv) -+{ -+ -+} -+ -+ -+//alloc os related resource in struct recv_buf -+int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf) -+{ -+ int res=_SUCCESS; -+ -+#ifdef CONFIG_USB_HCI -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct usb_device *pusbd = pdvobjpriv->pusbdev; -+ -+ precvbuf->irp_pending = _FALSE; -+ precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL); -+ if(precvbuf->purb == NULL){ -+ res = _FAIL; -+ } -+ -+ precvbuf->pskb = NULL; -+ -+ precvbuf->reuse = _FALSE; -+ -+ precvbuf->pallocated_buf = precvbuf->pbuf = NULL; -+ -+ precvbuf->pdata = precvbuf->phead = precvbuf->ptail = precvbuf->pend = NULL; -+ -+ precvbuf->transfer_len = 0; -+ -+ precvbuf->len = 0; -+ -+ #ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -+ precvbuf->pallocated_buf = rtw_usb_buffer_alloc(pusbd, (size_t)precvbuf->alloc_sz, &precvbuf->dma_transfer_addr); -+ precvbuf->pbuf = precvbuf->pallocated_buf; -+ if(precvbuf->pallocated_buf == NULL) -+ return _FAIL; -+ #endif //CONFIG_USE_USB_BUFFER_ALLOC_RX -+ -+#endif //CONFIG_USB_HCI -+ -+ return res; -+} -+ -+//free os related resource in struct recv_buf -+int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf) -+{ -+ int ret = _SUCCESS; -+ -+#ifdef CONFIG_USB_HCI -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -+ -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct usb_device *pusbd = pdvobjpriv->pusbdev; -+ -+ rtw_usb_buffer_free(pusbd, (size_t)precvbuf->alloc_sz, precvbuf->pallocated_buf, precvbuf->dma_transfer_addr); -+ precvbuf->pallocated_buf = NULL; -+ precvbuf->dma_transfer_addr = 0; -+ -+#endif //CONFIG_USE_USB_BUFFER_ALLOC_RX -+ -+ if(precvbuf->purb) -+ { -+ //usb_kill_urb(precvbuf->purb); -+ usb_free_urb(precvbuf->purb); -+ } -+ -+#endif //CONFIG_USB_HCI -+ -+ -+ if(precvbuf->pskb) -+ rtw_skb_free(precvbuf->pskb); -+ -+ -+ return ret; -+ -+} -+ -+void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup) -+{ -+#ifdef CONFIG_IOCTL_CFG80211 -+ enum nl80211_key_type key_type = 0; -+#endif -+ union iwreq_data wrqu; -+ struct iw_michaelmicfailure ev; -+ struct mlme_priv* pmlmepriv = &padapter->mlmepriv; -+ struct security_priv *psecuritypriv = &padapter->securitypriv; -+ u32 cur_time = 0; -+ -+ if( psecuritypriv->last_mic_err_time == 0 ) -+ { -+ psecuritypriv->last_mic_err_time = rtw_get_current_time(); -+ } -+ else -+ { -+ cur_time = rtw_get_current_time(); -+ -+ if( cur_time - psecuritypriv->last_mic_err_time < 60*HZ ) -+ { -+ psecuritypriv->btkip_countermeasure = _TRUE; -+ psecuritypriv->last_mic_err_time = 0; -+ psecuritypriv->btkip_countermeasure_time = cur_time; -+ } -+ else -+ { -+ psecuritypriv->last_mic_err_time = rtw_get_current_time(); -+ } -+ } -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if ( bgroup ) -+ { -+ key_type |= NL80211_KEYTYPE_GROUP; -+ } -+ else -+ { -+ key_type |= NL80211_KEYTYPE_PAIRWISE; -+ } -+ -+ cfg80211_michael_mic_failure(padapter->pnetdev, (u8 *)&pmlmepriv->assoc_bssid[ 0 ], key_type, -1, -+ NULL, GFP_ATOMIC); -+#endif -+ -+ _rtw_memset( &ev, 0x00, sizeof( ev ) ); -+ if ( bgroup ) -+ { -+ ev.flags |= IW_MICFAILURE_GROUP; -+ } -+ else -+ { -+ ev.flags |= IW_MICFAILURE_PAIRWISE; -+ } -+ -+ ev.src_addr.sa_family = ARPHRD_ETHER; -+ _rtw_memcpy( ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); -+ -+ _rtw_memset( &wrqu, 0x00, sizeof( wrqu ) ); -+ wrqu.data.length = sizeof( ev ); -+ -+ wireless_send_event( padapter->pnetdev, IWEVMICHAELMICFAILURE, &wrqu, (char*) &ev ); -+} -+ -+void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame) -+{ -+#ifdef CONFIG_HOSTAPD_MLME -+ _pkt *skb; -+ struct hostapd_priv *phostapdpriv = padapter->phostapdpriv; -+ struct net_device *pmgnt_netdev = phostapdpriv->pmgnt_netdev; -+ -+ RT_TRACE(_module_recv_osdep_c_, _drv_info_, ("+rtw_hostapd_mlme_rx\n")); -+ -+ skb = precv_frame->u.hdr.pkt; -+ -+ if (skb == NULL) -+ return; -+ -+ skb->data = precv_frame->u.hdr.rx_data; -+ skb->tail = precv_frame->u.hdr.rx_tail; -+ skb->len = precv_frame->u.hdr.len; -+ -+ //pskb_copy = rtw_skb_copy(skb); -+// if(skb == NULL) goto _exit; -+ -+ skb->dev = pmgnt_netdev; -+ skb->ip_summed = CHECKSUM_NONE; -+ skb->pkt_type = PACKET_OTHERHOST; -+ //skb->protocol = __constant_htons(0x0019); /*ETH_P_80211_RAW*/ -+ skb->protocol = __constant_htons(0x0003); /*ETH_P_80211_RAW*/ -+ -+ //DBG_871X("(1)data=0x%x, head=0x%x, tail=0x%x, mac_header=0x%x, len=%d\n", skb->data, skb->head, skb->tail, skb->mac_header, skb->len); -+ -+ //skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); -+ -+ //skb_pull(skb, 24); -+ _rtw_memset(skb->cb, 0, sizeof(skb->cb)); -+ -+ rtw_netif_rx(pmgnt_netdev, skb); -+ -+ precv_frame->u.hdr.pkt = NULL; // set pointer to NULL before rtw_free_recvframe() if call rtw_netif_rx() -+#endif -+} -+ -+int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame) -+{ -+ struct recv_priv *precvpriv; -+ _queue *pfree_recv_queue; -+ _pkt *skb; -+ struct mlme_priv*pmlmepriv = &padapter->mlmepriv; -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+#endif -+ -+#ifdef CONFIG_BR_EXT -+ void *br_port = NULL; -+#endif -+ -+_func_enter_; -+ -+ precvpriv = &(padapter->recvpriv); -+ pfree_recv_queue = &(precvpriv->free_recv_queue); -+ -+#ifdef CONFIG_DRVEXT_MODULE -+ if (drvext_rx_handler(padapter, precv_frame->u.hdr.rx_data, precv_frame->u.hdr.len) == _SUCCESS) -+ { -+ goto _recv_indicatepkt_drop; -+ } -+#endif -+ -+ skb = precv_frame->u.hdr.pkt; -+ if(skb == NULL) -+ { -+ RT_TRACE(_module_recv_osdep_c_,_drv_err_,("rtw_recv_indicatepkt():skb==NULL something wrong!!!!\n")); -+ goto _recv_indicatepkt_drop; -+ } -+ -+ RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():skb != NULL !!!\n")); -+ RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():precv_frame->u.hdr.rx_head=%p precv_frame->hdr.rx_data=%p\n", precv_frame->u.hdr.rx_head, precv_frame->u.hdr.rx_data)); -+ RT_TRACE(_module_recv_osdep_c_,_drv_info_,("precv_frame->hdr.rx_tail=%p precv_frame->u.hdr.rx_end=%p precv_frame->hdr.len=%d \n", precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end, precv_frame->u.hdr.len)); -+ -+ skb->data = precv_frame->u.hdr.rx_data; -+ -+ skb_set_tail_pointer(skb, precv_frame->u.hdr.len); -+ -+ skb->len = precv_frame->u.hdr.len; -+ -+ RT_TRACE(_module_recv_osdep_c_,_drv_info_,("\n skb->head=%p skb->data=%p skb->tail=%p skb->end=%p skb->len=%d\n", skb->head, skb->data, skb->tail, skb->end, skb->len)); -+ -+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) -+ { -+ _pkt *pskb2=NULL; -+ struct sta_info *psta = NULL; -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; -+ int bmcast = IS_MCAST(pattrib->dst); -+ -+ //DBG_871X("bmcast=%d\n", bmcast); -+ -+ if(_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==_FALSE) -+ { -+ //DBG_871X("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); -+ -+ if(bmcast) -+ { -+ psta = rtw_get_bcmc_stainfo(padapter); -+ pskb2 = rtw_skb_clone(skb); -+ } else { -+ psta = rtw_get_stainfo(pstapriv, pattrib->dst); -+ } -+ -+ if(psta) -+ { -+ struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; -+ -+ //DBG_871X("directly forwarding to the rtw_xmit_entry\n"); -+ -+ //skb->ip_summed = CHECKSUM_NONE; -+ skb->dev = pnetdev; -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ skb_set_queue_mapping(skb, rtw_recv_select_queue(skb)); -+#endif //LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35) -+ -+ _rtw_xmit_entry(skb, pnetdev); -+ -+ if(bmcast) -+ skb = pskb2; -+ else -+ goto _recv_indicatepkt_end; -+ } -+ -+ -+ } -+ else// to APself -+ { -+ //DBG_871X("to APSelf\n"); -+ } -+ } -+ -+ -+#ifdef CONFIG_BR_EXT -+ -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ br_port = padapter->pnetdev->br_port; -+#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ rcu_read_lock(); -+ br_port = rcu_dereference(padapter->pnetdev->rx_handler_data); -+ rcu_read_unlock(); -+#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) -+ -+ if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) -+ { -+ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb); -+ if (nat25_handle_frame(padapter, skb) == -1) { -+ //priv->ext_stats.rx_data_drops++; -+ //DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n"); -+ //return FAIL; -+#if 1 -+ // bypass this frame to upper layer!! -+#else -+ goto _recv_indicatepkt_drop; -+#endif -+ } -+ } -+ -+#endif // CONFIG_BR_EXT -+ -+ -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX -+ if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) { -+ skb->ip_summed = CHECKSUM_UNNECESSARY; -+ //DBG_871X("CHECKSUM_UNNECESSARY \n"); -+ } else { -+ skb->ip_summed = CHECKSUM_NONE; -+ //DBG_871X("CHECKSUM_NONE(%d, %d) \n", pattrib->tcpchk_valid, pattrib->tcp_chkrpt); -+ } -+#else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */ -+ -+ skb->ip_summed = CHECKSUM_NONE; -+ -+#endif -+ -+ skb->dev = padapter->pnetdev; -+ skb->protocol = eth_type_trans(skb, padapter->pnetdev); -+ -+ rtw_netif_rx(padapter->pnetdev, skb); -+ -+_recv_indicatepkt_end: -+ -+ precv_frame->u.hdr.pkt = NULL; // pointers to NULL before rtw_free_recvframe() -+ -+ rtw_free_recvframe(precv_frame, pfree_recv_queue); -+ -+ RT_TRACE(_module_recv_osdep_c_,_drv_info_,("\n rtw_recv_indicatepkt :after rtw_netif_rx!!!!\n")); -+ -+_func_exit_; -+ -+ return _SUCCESS; -+ -+_recv_indicatepkt_drop: -+ -+ //enqueue back to free_recv_queue -+ if(precv_frame) -+ rtw_free_recvframe(precv_frame, pfree_recv_queue); -+ -+ return _FAIL; -+ -+_func_exit_; -+ -+} -+ -+void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf) -+{ -+ struct recv_priv *precvpriv = &padapter->recvpriv; -+ -+#ifdef CONFIG_USB_HCI -+ -+ precvbuf->ref_cnt--; -+ -+ //free skb in recv_buf -+ rtw_skb_free(precvbuf->pskb); -+ -+ precvbuf->pskb = NULL; -+ precvbuf->reuse = _FALSE; -+ -+ if(precvbuf->irp_pending == _FALSE) -+ { -+ rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); -+ } -+ -+ -+#endif -+#ifdef CONFIG_SDIO_HCI -+ precvbuf->pskb = NULL; -+#endif -+ -+} -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext); -+void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext) -+#else -+void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t); -+void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t) -+#endif -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)FunctionContext; -+#else -+ struct recv_reorder_ctrl *preorder_ctrl = from_timer(preorder_ctrl, t, reordering_ctrl_timer); -+#endif -+ rtw_reordering_ctrl_timeout_handler(preorder_ctrl); -+} -+ -+void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -+ _adapter *padapter = preorder_ctrl->padapter; -+ -+ _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl); -+#else -+ timer_setup(&preorder_ctrl->reordering_ctrl_timer, _rtw_reordering_ctrl_timeout_handler, 0); -+#endif -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c -@@ -0,0 +1,839 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#if defined(RTW_ENABLE_WIFI_CONTROL_FUNC) -+#include -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) -+#include -+#else -+#include -+#endif -+#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ -+ -+const char *android_wifi_cmd_str[ANDROID_WIFI_CMD_MAX] = { -+ "START", -+ "STOP", -+ "SCAN-ACTIVE", -+ "SCAN-PASSIVE", -+ "RSSI", -+ "LINKSPEED", -+ "RXFILTER-START", -+ "RXFILTER-STOP", -+ "RXFILTER-ADD", -+ "RXFILTER-REMOVE", -+ "BTCOEXSCAN-START", -+ "BTCOEXSCAN-STOP", -+ "BTCOEXMODE", -+ "SETSUSPENDOPT", -+ "P2P_DEV_ADDR", -+ "SETFWPATH", -+ "SETBAND", -+ "GETBAND", -+ "COUNTRY", -+ "P2P_SET_NOA", -+ "P2P_GET_NOA", -+ "P2P_SET_PS", -+ "SET_AP_WPS_P2P_IE", -+#ifdef PNO_SUPPORT -+ "PNOSSIDCLR", -+ "PNOSETUP ", -+ "PNOFORCE", -+ "PNODEBUG", -+#endif -+ -+ "MACADDR", -+ -+ "BLOCK", -+ "WFD-ENABLE", -+ "WFD-DISABLE", -+ "WFD-SET-TCPPORT", -+ "WFD-SET-MAXTPUT", -+ "WFD-SET-DEVTYPE", -+}; -+ -+#ifdef PNO_SUPPORT -+#define PNO_TLV_PREFIX 'S' -+#define PNO_TLV_VERSION '1' -+#define PNO_TLV_SUBVERSION '2' -+#define PNO_TLV_RESERVED '0' -+#define PNO_TLV_TYPE_SSID_IE 'S' -+#define PNO_TLV_TYPE_TIME 'T' -+#define PNO_TLV_FREQ_REPEAT 'R' -+#define PNO_TLV_FREQ_EXPO_MAX 'M' -+ -+typedef struct cmd_tlv { -+ char prefix; -+ char version; -+ char subver; -+ char reserved; -+} cmd_tlv_t; -+#endif /* PNO_SUPPORT */ -+ -+typedef struct android_wifi_priv_cmd { -+ -+#ifdef CONFIG_COMPAT -+ compat_uptr_t buf; -+#else -+ char *buf; -+#endif -+ -+ int used_len; -+ int total_len; -+} android_wifi_priv_cmd; -+ -+/** -+ * Local (static) functions and variables -+ */ -+ -+/* Initialize g_wifi_on to 1 so dhd_bus_start will be called for the first -+ * time (only) in dhd_open, subsequential wifi on will be handled by -+ * wl_android_wifi_on -+ */ -+static int g_wifi_on = _TRUE; -+ -+ -+#ifdef PNO_SUPPORT -+static int wl_android_set_pno_setup(struct net_device *dev, char *command, int total_len) -+{ -+ wlc_ssid_t ssids_local[MAX_PFN_LIST_COUNT]; -+ int res = -1; -+ int nssid = 0; -+ cmd_tlv_t *cmd_tlv_temp; -+ char *str_ptr; -+ int tlv_size_left; -+ int pno_time = 0; -+ int pno_repeat = 0; -+ int pno_freq_expo_max = 0; -+ -+#ifdef PNO_SET_DEBUG -+ int i; -+ char pno_in_example[] = { -+ 'P', 'N', 'O', 'S', 'E', 'T', 'U', 'P', ' ', -+ 'S', '1', '2', '0', -+ 'S', -+ 0x05, -+ 'd', 'l', 'i', 'n', 'k', -+ 'S', -+ 0x04, -+ 'G', 'O', 'O', 'G', -+ 'T', -+ '0', 'B', -+ 'R', -+ '2', -+ 'M', -+ '2', -+ 0x00 -+ }; -+#endif /* PNO_SET_DEBUG */ -+ -+ DHD_INFO(("%s: command=%s, len=%d\n", __FUNCTION__, command, total_len)); -+ -+ if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) { -+ DBG_871X("%s argument=%d less min size\n", __FUNCTION__, total_len); -+ goto exit_proc; -+ } -+ -+#ifdef PNO_SET_DEBUG -+ memcpy(command, pno_in_example, sizeof(pno_in_example)); -+ for (i = 0; i < sizeof(pno_in_example); i++) -+ printf("%02X ", command[i]); -+ printf("\n"); -+ total_len = sizeof(pno_in_example); -+#endif -+ -+ str_ptr = command + strlen(CMD_PNOSETUP_SET); -+ tlv_size_left = total_len - strlen(CMD_PNOSETUP_SET); -+ -+ cmd_tlv_temp = (cmd_tlv_t *)str_ptr; -+ memset(ssids_local, 0, sizeof(ssids_local)); -+ -+ if ((cmd_tlv_temp->prefix == PNO_TLV_PREFIX) && -+ (cmd_tlv_temp->version == PNO_TLV_VERSION) && -+ (cmd_tlv_temp->subver == PNO_TLV_SUBVERSION)) { -+ -+ str_ptr += sizeof(cmd_tlv_t); -+ tlv_size_left -= sizeof(cmd_tlv_t); -+ -+ if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local, -+ MAX_PFN_LIST_COUNT, &tlv_size_left)) <= 0) { -+ DBG_871X("SSID is not presented or corrupted ret=%d\n", nssid); -+ goto exit_proc; -+ } else { -+ if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) { -+ DBG_871X("%s scan duration corrupted field size %d\n", -+ __FUNCTION__, tlv_size_left); -+ goto exit_proc; -+ } -+ str_ptr++; -+ pno_time = simple_strtoul(str_ptr, &str_ptr, 16); -+ DHD_INFO(("%s: pno_time=%d\n", __FUNCTION__, pno_time)); -+ -+ if (str_ptr[0] != 0) { -+ if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) { -+ DBG_871X("%s pno repeat : corrupted field\n", -+ __FUNCTION__); -+ goto exit_proc; -+ } -+ str_ptr++; -+ pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16); -+ DHD_INFO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat)); -+ if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) { -+ DBG_871X("%s FREQ_EXPO_MAX corrupted field size\n", -+ __FUNCTION__); -+ goto exit_proc; -+ } -+ str_ptr++; -+ pno_freq_expo_max = simple_strtoul(str_ptr, &str_ptr, 16); -+ DHD_INFO(("%s: pno_freq_expo_max=%d\n", -+ __FUNCTION__, pno_freq_expo_max)); -+ } -+ } -+ } else { -+ DBG_871X("%s get wrong TLV command\n", __FUNCTION__); -+ goto exit_proc; -+ } -+ -+ res = dhd_dev_pno_set(dev, ssids_local, nssid, pno_time, pno_repeat, pno_freq_expo_max); -+ -+exit_proc: -+ return res; -+} -+#endif /* PNO_SUPPORT */ -+ -+int rtw_android_cmdstr_to_num(char *cmdstr) -+{ -+ int cmd_num; -+ for(cmd_num=0 ; cmd_nummlmepriv); -+ struct wlan_network *pcur_network = &pmlmepriv->cur_network; -+ int bytes_written = 0; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { -+ bytes_written += snprintf(&command[bytes_written], total_len, "%s rssi %d", -+ pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi); -+ } -+ -+ return bytes_written; -+} -+ -+int rtw_android_get_link_speed(struct net_device *net, char *command, int total_len) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(net); -+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -+ struct wlan_network *pcur_network = &pmlmepriv->cur_network; -+ int bytes_written = 0; -+ u16 link_speed = 0; -+ -+ link_speed = rtw_get_cur_max_rate(padapter)/10; -+ bytes_written = snprintf(command, total_len, "LinkSpeed %d", link_speed); -+ -+ return bytes_written; -+} -+ -+int rtw_android_get_macaddr(struct net_device *net, char *command, int total_len) -+{ -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(net); -+ int bytes_written = 0; -+ -+ bytes_written = snprintf(command, total_len, "Macaddr = "MAC_FMT, MAC_ARG(net->dev_addr)); -+ return bytes_written; -+} -+ -+int rtw_android_set_country(struct net_device *net, char *command, int total_len) -+{ -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(net); -+ char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1; -+ int ret = _FAIL; -+ -+ ret = rtw_set_country(adapter, country_code); -+ -+ return (ret==_SUCCESS)?0:-1; -+} -+ -+int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, int total_len) -+{ -+ int bytes_written = 0; -+ -+ //We use the same address as our HW MAC address -+ _rtw_memcpy(command, net->dev_addr, ETH_ALEN); -+ -+ bytes_written = ETH_ALEN; -+ return bytes_written; -+} -+ -+int rtw_android_set_block(struct net_device *net, char *command, int total_len) -+{ -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(net); -+ char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1; -+ -+ #ifdef CONFIG_IOCTL_CFG80211 -+ wdev_to_priv(adapter->rtw_wdev)->block = (*block_value=='0')?_FALSE:_TRUE; -+ #endif -+ -+ return 0; -+} -+ -+int rtw_android_setband(struct net_device *net, char *command, int total_len) -+{ -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(net); -+ char *arg = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_SETBAND]) + 1; -+ u32 band = GHZ_MAX; -+ int ret = _FAIL; -+ -+ sscanf(arg, "%u", &band); -+ ret = rtw_set_band(adapter, band); -+ -+ return (ret==_SUCCESS)?0:-1; -+} -+ -+int rtw_android_getband(struct net_device *net, char *command, int total_len) -+{ -+ _adapter *adapter = (_adapter *)rtw_netdev_priv(net); -+ int bytes_written = 0; -+ -+ bytes_written = snprintf(command, total_len, "%u", adapter->setband); -+ -+ return bytes_written; -+} -+ -+int get_int_from_command( char* pcmd ) -+{ -+ int i = 0; -+ -+ for( i = 0; i < strlen( pcmd ); i++ ) -+ { -+ if ( pcmd[ i ] == '=' ) -+ { -+ // Skip the '=' and space characters. -+ i += 2; -+ break; -+ } -+ } -+ return ( rtw_atoi( pcmd + i ) ); -+} -+ -+int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) -+{ -+ int ret = 0; -+ char *command = NULL; -+ int cmd_num; -+ int bytes_written = 0; -+ android_wifi_priv_cmd priv_cmd; -+ -+ rtw_lock_suspend(); -+ -+ if (!ifr->ifr_data) { -+ ret = -EINVAL; -+ goto exit; -+ } -+ if (copy_from_user(&priv_cmd, ifr->ifr_data, sizeof(android_wifi_priv_cmd))) { -+ ret = -EFAULT; -+ goto exit; -+ } -+ -+ command = rtw_zmalloc(priv_cmd.total_len); -+ if (!command) -+ { -+ DBG_871X("%s: failed to allocate memory\n", __FUNCTION__); -+ ret = -ENOMEM; -+ goto exit; -+ } -+ -+ if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){ -+ DBG_871X("%s: failed to access memory\n", __FUNCTION__); -+ ret = -EFAULT; -+ goto exit; -+ } -+ if (copy_from_user(command, (void *)priv_cmd.buf, priv_cmd.total_len)) { -+ ret = -EFAULT; -+ goto exit; -+ } -+ -+ DBG_871X("%s: Android private cmd \"%s\" on %s\n" -+ , __FUNCTION__, command, ifr->ifr_name); -+ -+ cmd_num = rtw_android_cmdstr_to_num(command); -+ -+ switch(cmd_num) { -+ case ANDROID_WIFI_CMD_START: -+ //bytes_written = wl_android_wifi_on(net); -+ goto response; -+ case ANDROID_WIFI_CMD_SETFWPATH: -+ goto response; -+ } -+ -+ if (!g_wifi_on) { -+ DBG_871X("%s: Ignore private cmd \"%s\" - iface %s is down\n" -+ ,__FUNCTION__, command, ifr->ifr_name); -+ ret = 0; -+ goto exit; -+ } -+ -+ switch(cmd_num) { -+ -+ case ANDROID_WIFI_CMD_STOP: -+ //bytes_written = wl_android_wifi_off(net); -+ break; -+ -+ case ANDROID_WIFI_CMD_SCAN_ACTIVE: -+ //rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_ACTIVE); -+#ifdef CONFIG_PLATFORM_MSTAR -+#ifdef CONFIG_IOCTL_CFG80211 -+ (wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = _TRUE; -+#endif //CONFIG_IOCTL_CFG80211 -+#endif //CONFIG_PLATFORM_MSTAR -+ break; -+ case ANDROID_WIFI_CMD_SCAN_PASSIVE: -+ //rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_PASSIVE); -+ break; -+ -+ case ANDROID_WIFI_CMD_RSSI: -+ bytes_written = rtw_android_get_rssi(net, command, priv_cmd.total_len); -+ break; -+ case ANDROID_WIFI_CMD_LINKSPEED: -+ bytes_written = rtw_android_get_link_speed(net, command, priv_cmd.total_len); -+ break; -+ -+ case ANDROID_WIFI_CMD_MACADDR: -+ bytes_written = rtw_android_get_macaddr(net, command, priv_cmd.total_len); -+ break; -+ -+ case ANDROID_WIFI_CMD_BLOCK: -+ bytes_written = rtw_android_set_block(net, command, priv_cmd.total_len); -+ break; -+ -+ case ANDROID_WIFI_CMD_RXFILTER_START: -+ //bytes_written = net_os_set_packet_filter(net, 1); -+ break; -+ case ANDROID_WIFI_CMD_RXFILTER_STOP: -+ //bytes_written = net_os_set_packet_filter(net, 0); -+ break; -+ case ANDROID_WIFI_CMD_RXFILTER_ADD: -+ //int filter_num = *(command + strlen(CMD_RXFILTER_ADD) + 1) - '0'; -+ //bytes_written = net_os_rxfilter_add_remove(net, TRUE, filter_num); -+ break; -+ case ANDROID_WIFI_CMD_RXFILTER_REMOVE: -+ //int filter_num = *(command + strlen(CMD_RXFILTER_REMOVE) + 1) - '0'; -+ //bytes_written = net_os_rxfilter_add_remove(net, FALSE, filter_num); -+ break; -+ -+ case ANDROID_WIFI_CMD_BTCOEXSCAN_START: -+ /* TBD: BTCOEXSCAN-START */ -+ break; -+ case ANDROID_WIFI_CMD_BTCOEXSCAN_STOP: -+ /* TBD: BTCOEXSCAN-STOP */ -+ break; -+ case ANDROID_WIFI_CMD_BTCOEXMODE: -+ #if 0 -+ uint mode = *(command + strlen(CMD_BTCOEXMODE) + 1) - '0'; -+ if (mode == 1) -+ net_os_set_packet_filter(net, 0); /* DHCP starts */ -+ else -+ net_os_set_packet_filter(net, 1); /* DHCP ends */ -+#ifdef WL_CFG80211 -+ bytes_written = wl_cfg80211_set_btcoex_dhcp(net, command); -+#endif -+ #endif -+ break; -+ -+ case ANDROID_WIFI_CMD_SETSUSPENDOPT: -+ //bytes_written = wl_android_set_suspendopt(net, command, priv_cmd.total_len); -+ break; -+ -+ case ANDROID_WIFI_CMD_SETBAND: -+ bytes_written = rtw_android_setband(net, command, priv_cmd.total_len); -+ break; -+ -+ case ANDROID_WIFI_CMD_GETBAND: -+ bytes_written = rtw_android_getband(net, command, priv_cmd.total_len); -+ break; -+ -+ case ANDROID_WIFI_CMD_COUNTRY: -+ bytes_written = rtw_android_set_country(net, command, priv_cmd.total_len); -+ break; -+ -+#ifdef PNO_SUPPORT -+ case ANDROID_WIFI_CMD_PNOSSIDCLR_SET: -+ //bytes_written = dhd_dev_pno_reset(net); -+ break; -+ case ANDROID_WIFI_CMD_PNOSETUP_SET: -+ //bytes_written = wl_android_set_pno_setup(net, command, priv_cmd.total_len); -+ break; -+ case ANDROID_WIFI_CMD_PNOENABLE_SET: -+ //uint pfn_enabled = *(command + strlen(CMD_PNOENABLE_SET) + 1) - '0'; -+ //bytes_written = dhd_dev_pno_enable(net, pfn_enabled); -+ break; -+#endif -+ -+ case ANDROID_WIFI_CMD_P2P_DEV_ADDR: -+ bytes_written = rtw_android_get_p2p_dev_addr(net, command, priv_cmd.total_len); -+ break; -+ case ANDROID_WIFI_CMD_P2P_SET_NOA: -+ //int skip = strlen(CMD_P2P_SET_NOA) + 1; -+ //bytes_written = wl_cfg80211_set_p2p_noa(net, command + skip, priv_cmd.total_len - skip); -+ break; -+ case ANDROID_WIFI_CMD_P2P_GET_NOA: -+ //bytes_written = wl_cfg80211_get_p2p_noa(net, command, priv_cmd.total_len); -+ break; -+ case ANDROID_WIFI_CMD_P2P_SET_PS: -+ //int skip = strlen(CMD_P2P_SET_PS) + 1; -+ //bytes_written = wl_cfg80211_set_p2p_ps(net, command + skip, priv_cmd.total_len - skip); -+ break; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ case ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE: -+ { -+ int skip = strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE]) + 3; -+ bytes_written = rtw_cfg80211_set_mgnt_wpsp2pie(net, command + skip, priv_cmd.total_len - skip, *(command + skip - 2) - '0'); -+ break; -+ } -+#endif //CONFIG_IOCTL_CFG80211 -+ -+#ifdef CONFIG_WFD -+ case ANDROID_WIFI_CMD_WFD_ENABLE: -+ { -+ // Commented by Albert 2012/07/24 -+ // We can enable the WFD function by using the following command: -+ // wpa_cli driver wfd-enable -+ -+ struct wifi_display_info *pwfd_info; -+ _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); -+ -+ pwfd_info = &padapter->wfd_info; -+ if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ pwfd_info->wfd_enable = _TRUE; -+ break; -+ } -+ -+ case ANDROID_WIFI_CMD_WFD_DISABLE: -+ { -+ // Commented by Albert 2012/07/24 -+ // We can disable the WFD function by using the following command: -+ // wpa_cli driver wfd-disable -+ -+ struct wifi_display_info *pwfd_info; -+ _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); -+ -+ pwfd_info = &padapter->wfd_info; -+ if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ pwfd_info->wfd_enable = _FALSE; -+ break; -+ } -+ case ANDROID_WIFI_CMD_WFD_SET_TCPPORT: -+ { -+ // Commented by Albert 2012/07/24 -+ // We can set the tcp port number by using the following command: -+ // wpa_cli driver wfd-set-tcpport = 554 -+ -+ struct wifi_display_info *pwfd_info; -+ _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); -+ -+ pwfd_info = &padapter->wfd_info; -+ if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ pwfd_info->rtsp_ctrlport = ( u16 ) get_int_from_command( priv_cmd.buf ); -+ break; -+ } -+ case ANDROID_WIFI_CMD_WFD_SET_MAX_TPUT: -+ { -+ -+ -+ break; -+ } -+ case ANDROID_WIFI_CMD_WFD_SET_DEVTYPE: -+ { -+ // Commented by Albert 2012/08/28 -+ // Specify the WFD device type ( WFD source/primary sink ) -+ -+ struct wifi_display_info *pwfd_info; -+ _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); -+ -+ pwfd_info = &padapter->wfd_info; -+ if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) -+ { -+ pwfd_info->wfd_device_type = ( u8 ) get_int_from_command( priv_cmd.buf ); -+ -+ pwfd_info->wfd_device_type &= WFD_DEVINFO_DUAL; -+ } -+ break; -+ } -+#endif -+ default: -+ DBG_871X("Unknown PRIVATE command %s - ignored\n", command); -+ snprintf(command, 3, "OK"); -+ bytes_written = strlen("OK"); -+ } -+ -+response: -+ if (bytes_written >= 0) { -+ if ((bytes_written == 0) && (priv_cmd.total_len > 0)) -+ command[0] = '\0'; -+ if (bytes_written >= priv_cmd.total_len) { -+ DBG_871X("%s: bytes_written = %d\n", __FUNCTION__, bytes_written); -+ bytes_written = priv_cmd.total_len; -+ } else { -+ bytes_written++; -+ } -+ priv_cmd.used_len = bytes_written; -+ if (copy_to_user((void *)priv_cmd.buf, command, bytes_written)) { -+ DBG_871X("%s: failed to copy data to user buffer\n", __FUNCTION__); -+ ret = -EFAULT; -+ } -+ } -+ else { -+ ret = bytes_written; -+ } -+ -+exit: -+ rtw_unlock_suspend(); -+ if (command) { -+ rtw_mfree(command, priv_cmd.total_len); -+ } -+ -+ return ret; -+} -+ -+ -+/** -+ * Functions for Android WiFi card detection -+ */ -+#if defined(RTW_ENABLE_WIFI_CONTROL_FUNC) -+ -+static int g_wifidev_registered = 0; -+static struct semaphore wifi_control_sem; -+static struct wifi_platform_data *wifi_control_data = NULL; -+static struct resource *wifi_irqres = NULL; -+ -+static int wifi_add_dev(void); -+static void wifi_del_dev(void); -+ -+int rtw_android_wifictrl_func_add(void) -+{ -+ int ret = 0; -+ sema_init(&wifi_control_sem, 0); -+ -+ ret = wifi_add_dev(); -+ if (ret) { -+ DBG_871X("%s: platform_driver_register failed\n", __FUNCTION__); -+ return ret; -+ } -+ g_wifidev_registered = 1; -+ -+ /* Waiting callback after platform_driver_register is done or exit with error */ -+ if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) { -+ ret = -EINVAL; -+ DBG_871X("%s: platform_driver_register timeout\n", __FUNCTION__); -+ } -+ -+ return ret; -+} -+ -+void rtw_android_wifictrl_func_del(void) -+{ -+ if (g_wifidev_registered) -+ { -+ wifi_del_dev(); -+ g_wifidev_registered = 0; -+ } -+} -+ -+void *wl_android_prealloc(int section, unsigned long size) -+{ -+ void *alloc_ptr = NULL; -+ if (wifi_control_data && wifi_control_data->mem_prealloc) { -+ alloc_ptr = wifi_control_data->mem_prealloc(section, size); -+ if (alloc_ptr) { -+ DBG_871X("success alloc section %d\n", section); -+ if (size != 0L) -+ memset(alloc_ptr, 0, size); -+ return alloc_ptr; -+ } -+ } -+ -+ DBG_871X("can't alloc section %d\n", section); -+ return NULL; -+} -+ -+int wifi_get_irq_number(unsigned long *irq_flags_ptr) -+{ -+ if (wifi_irqres) { -+ *irq_flags_ptr = wifi_irqres->flags & IRQF_TRIGGER_MASK; -+ return (int)wifi_irqres->start; -+ } -+#ifdef CUSTOM_OOB_GPIO_NUM -+ return CUSTOM_OOB_GPIO_NUM; -+#else -+ return -1; -+#endif -+} -+ -+int wifi_set_power(int on, unsigned long msec) -+{ -+ DBG_871X("%s = %d\n", __FUNCTION__, on); -+ if (wifi_control_data && wifi_control_data->set_power) { -+ wifi_control_data->set_power(on); -+ } -+ if (msec) -+ msleep(msec); -+ return 0; -+} -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) -+int wifi_get_mac_addr(unsigned char *buf) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ if (!buf) -+ return -EINVAL; -+ if (wifi_control_data && wifi_control_data->get_mac_addr) { -+ return wifi_control_data->get_mac_addr(buf); -+ } -+ return -EOPNOTSUPP; -+} -+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) */ -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE) -+void *wifi_get_country_code(char *ccode) -+{ -+ DBG_871X("%s\n", __FUNCTION__); -+ if (!ccode) -+ return NULL; -+ if (wifi_control_data && wifi_control_data->get_country_code) { -+ return wifi_control_data->get_country_code(ccode); -+ } -+ return NULL; -+} -+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) */ -+ -+static int wifi_set_carddetect(int on) -+{ -+ DBG_871X("%s = %d\n", __FUNCTION__, on); -+ if (wifi_control_data && wifi_control_data->set_carddetect) { -+ wifi_control_data->set_carddetect(on); -+ } -+ return 0; -+} -+ -+static int wifi_probe(struct platform_device *pdev) -+{ -+ struct wifi_platform_data *wifi_ctrl = -+ (struct wifi_platform_data *)(pdev->dev.platform_data); -+ -+ DBG_871X("## %s\n", __FUNCTION__); -+ wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq"); -+ if (wifi_irqres == NULL) -+ wifi_irqres = platform_get_resource_byname(pdev, -+ IORESOURCE_IRQ, "bcm4329_wlan_irq"); -+ wifi_control_data = wifi_ctrl; -+ -+ wifi_set_power(1, 0); /* Power On */ -+ wifi_set_carddetect(1); /* CardDetect (0->1) */ -+ -+ up(&wifi_control_sem); -+ return 0; -+} -+ -+static int wifi_remove(struct platform_device *pdev) -+{ -+ struct wifi_platform_data *wifi_ctrl = -+ (struct wifi_platform_data *)(pdev->dev.platform_data); -+ -+ DBG_871X("## %s\n", __FUNCTION__); -+ wifi_control_data = wifi_ctrl; -+ -+ wifi_set_power(0, 0); /* Power Off */ -+ wifi_set_carddetect(0); /* CardDetect (1->0) */ -+ -+ up(&wifi_control_sem); -+ return 0; -+} -+ -+static int wifi_suspend(struct platform_device *pdev, pm_message_t state) -+{ -+ DBG_871X("##> %s\n", __FUNCTION__); -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) -+ bcmsdh_oob_intr_set(0); -+#endif -+ return 0; -+} -+ -+static int wifi_resume(struct platform_device *pdev) -+{ -+ DBG_871X("##> %s\n", __FUNCTION__); -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) -+ if (dhd_os_check_if_up(bcmsdh_get_drvdata())) -+ bcmsdh_oob_intr_set(1); -+#endif -+ return 0; -+} -+ -+/* temporarily use these two */ -+static struct platform_driver wifi_device = { -+ .probe = wifi_probe, -+ .remove = wifi_remove, -+ .suspend = wifi_suspend, -+ .resume = wifi_resume, -+ .driver = { -+ .name = "bcmdhd_wlan", -+ } -+}; -+ -+static struct platform_driver wifi_device_legacy = { -+ .probe = wifi_probe, -+ .remove = wifi_remove, -+ .suspend = wifi_suspend, -+ .resume = wifi_resume, -+ .driver = { -+ .name = "bcm4329_wlan", -+ } -+}; -+ -+static int wifi_add_dev(void) -+{ -+ DBG_871X("## Calling platform_driver_register\n"); -+ platform_driver_register(&wifi_device); -+ platform_driver_register(&wifi_device_legacy); -+ return 0; -+} -+ -+static void wifi_del_dev(void) -+{ -+ DBG_871X("## Unregister platform_driver_register\n"); -+ platform_driver_unregister(&wifi_device); -+ platform_driver_unregister(&wifi_device_legacy); -+} -+#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c -@@ -0,0 +1,1662 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _HCI_INTF_C_ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef CONFIG_USB_HCI -+ -+#error "CONFIG_USB_HCI shall be on!\n" -+ -+#endif -+ -+#include -+#include -+#include -+#include -+#ifdef CONFIG_PLATFORM_RTK_DMP -+#include -+#endif -+ -+#if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -+ -+#error "Shall be Linux or Windows, but not both!\n" -+ -+#endif -+ -+#ifdef CONFIG_80211N_HT -+extern int rtw_ht_enable; -+extern int rtw_cbw40_enable; -+extern int rtw_ampdu_enable;//for enable tx_ampdu -+#endif -+ -+#ifdef CONFIG_GLOBAL_UI_PID -+int ui_pid[3] = {0, 0, 0}; -+#endif -+ -+ -+extern int pm_netdev_open(struct net_device *pnetdev,u8 bnormal); -+static int rtw_suspend(struct usb_interface *intf, pm_message_t message); -+static int rtw_resume(struct usb_interface *intf); -+int rtw_resume_process(_adapter *padapter); -+ -+ -+static int rtw_drv_init(struct usb_interface *pusb_intf,const struct usb_device_id *pdid); -+static void rtw_dev_remove(struct usb_interface *pusb_intf); -+ -+#define USB_VENDER_ID_REALTEK 0x0BDA -+ -+/* DID_USB_v915_20121224 */ -+#define RTL8192C_USB_IDS \ -+ /*=== Realtek demoboard ===*/ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8191)},/* Default ID */ \ -+ /****** 8188CUS ********/ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8176)},/* 8188cu 1*1 dongole */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8170)},/* 8188CE-VAU USB minCard */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817E)},/* 8188CE-VAU USB minCard */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817A)},/* 8188cu Slim Solo */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817B)},/* 8188cu Slim Combo */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817D)},/* 8188RU High-power USB Dongle */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754)},/* 8188 Combo for BC4 */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817F)},/* 8188RU */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818A)},/* RTL8188CUS-VL */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x018A)},/* RTL8188CTV */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x17C0)}, /* RTK demoboard - USB-N10E */ \ -+ /****** 8192CUS ********/ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8177)},/* 8191cu 1*2 */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8178)},/* 8192cu 2*2 */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817C)},/* 8192CE-VAU USB minCard */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8191)},/* 8192CU 2*2 */ \ -+ {USB_DEVICE(0x1058, 0x0631)},/* Alpha, 8192CU */ \ -+ /*=== Customer ID ===*/ \ -+ /****** 8188CUS Dongle ********/ \ -+ {USB_DEVICE(0x2019, 0xED17)},/* PCI - Edimax */ \ -+ {USB_DEVICE(0x0DF6, 0x0052)},/* Sitecom - Edimax */ \ -+ {USB_DEVICE(0x7392, 0x7811)},/* Edimax - Edimax */ \ -+ {USB_DEVICE(0x07B8, 0x8188)},/* Abocom - Abocom */ \ -+ {USB_DEVICE(0x07B8, 0x8189)},/* Abocom - Abocom */ \ -+ {USB_DEVICE(0x0EB0, 0x9071)},/* NO Brand - Etop */ \ -+ {USB_DEVICE(0x06F8, 0xE033)},/* Hercules - Edimax */ \ -+ {USB_DEVICE(0x103C, 0x1629)},/* HP - Lite-On ,8188CUS Slim Combo */ \ -+ {USB_DEVICE(0x2001, 0x3308)},/* D-Link - Alpha */ \ -+ {USB_DEVICE(0x050D, 0x1102)},/* Belkin - Edimax */ \ -+ {USB_DEVICE(0x050D, 0x11F2)},/* ISY - Edimax */ \ -+ {USB_DEVICE(0x2019, 0xAB2A)},/* Planex - Abocom */ \ -+ {USB_DEVICE(0x20F4, 0x648B)},/* TRENDnet - Cameo */ \ -+ {USB_DEVICE(0x4855, 0x0090)},/* - Feixun */ \ -+ {USB_DEVICE(0x13D3, 0x3357)},/* - AzureWave */ \ -+ {USB_DEVICE(0x0DF6, 0x005C)},/* Sitecom - Edimax */ \ -+ {USB_DEVICE(0x0BDA, 0x5088)},/* Thinkware - CC&C */ \ -+ {USB_DEVICE(0x4856, 0x0091)},/* NetweeN - Feixun */ \ -+ {USB_DEVICE(0x0846, 0x9041)}, /* Netgear - Cameo */ \ -+ {USB_DEVICE(0x0846, 0x9042)}, /* On Networks - N150MA */ \ -+ {USB_DEVICE(0x0846, 0x9043)}, /* Netgear N150 -WNA1000M */ \ -+ {USB_DEVICE(0x2019, 0x4902)},/* Planex - Etop */ \ -+ {USB_DEVICE(0x2019, 0xAB2E)},/* SW-WF02-AD15 -Abocom */ \ -+ {USB_DEVICE(0x2001, 0x330B)}, /* D-LINK - T&W */ \ -+ {USB_DEVICE(0xCDAB, 0x8010)}, /* - - compare */ \ -+ {USB_DEVICE(0x0B05, 0x17BA)}, /* ASUS - Edimax */ \ -+ {USB_DEVICE(0x0BDA, 0x1E1E)}, /* Intel - - */ \ -+ {USB_DEVICE(0x04BB, 0x094c)}, /* I-O DATA - Edimax */ \ -+ /****** 8188CTV ********/ \ -+ {USB_DEVICE(0xCDAB, 0x8011)}, /* - - compare */ \ -+ {USB_DEVICE(0x0BDA, 0x0A8A)}, /* Sony - Foxconn */ \ -+ /****** 8188 RU ********/ \ -+ {USB_DEVICE(0x0BDA, 0x317F)},/* Netcore,Netcore */ \ -+ /****** 8188CE-VAU ********/ \ -+ {USB_DEVICE(0x13D3, 0x3359)},/* - Azwave */ \ -+ {USB_DEVICE(0x13D3, 0x3358)},/* - Azwave */ \ -+ /****** 8188CUS Slim Solo********/ \ -+ {USB_DEVICE(0x04F2, 0xAFF7)},/* XAVI - XAVI */ \ -+ {USB_DEVICE(0x04F2, 0xAFF9)},/* XAVI - XAVI */ \ -+ {USB_DEVICE(0x04F2, 0xAFFA)},/* XAVI - XAVI */ \ -+ /****** 8188CUS Slim Combo ********/ \ -+ {USB_DEVICE(0x04F2, 0xAFF8)},/* XAVI - XAVI */ \ -+ {USB_DEVICE(0x04F2, 0xAFFB)},/* XAVI - XAVI */ \ -+ {USB_DEVICE(0x04F2, 0xAFFC)},/* XAVI - XAVI */ \ -+ {USB_DEVICE(0x2019, 0x1201)},/* Planex - Vencer */ \ -+ /****** 8192CUS Dongle ********/ \ -+ {USB_DEVICE(0x2001, 0x3307)},/* D-Link - Cameo */ \ -+ {USB_DEVICE(0x2001, 0x330A)},/* D-Link - Alpha */ \ -+ {USB_DEVICE(0x2001, 0x3309)},/* D-Link - Alpha */ \ -+ {USB_DEVICE(0x2001, 0x330D)},/* D-Link DWA-131 (H/W Ver. B1) */ \ -+ {USB_DEVICE(0x0586, 0x341F)},/* Zyxel - Abocom */ \ -+ {USB_DEVICE(0x7392, 0x7822)},/* Edimax - Edimax */ \ -+ {USB_DEVICE(0x2019, 0xAB2B)},/* Planex - Abocom */ \ -+ {USB_DEVICE(0x07B8, 0x8178)},/* Abocom - Abocom */ \ -+ {USB_DEVICE(0x07AA, 0x0056)},/* ATKK - Gemtek */ \ -+ {USB_DEVICE(0x4855, 0x0091)},/* - Feixun */ \ -+ {USB_DEVICE(0x050D, 0x2102)},/* Belkin - Sercomm */ \ -+ {USB_DEVICE(0x050D, 0x2103)},/* Belkin - Edimax */ \ -+ {USB_DEVICE(0x050D, 0x21F2)},/* Belkin - Edimax */ \ -+ {USB_DEVICE(0x20F4, 0x624D)},/* TRENDnet */ \ -+ {USB_DEVICE(0x0DF6, 0x0061)},/* Sitecom - Edimax */ \ -+ {USB_DEVICE(0x0B05, 0x17AB)},/* ASUS - Edimax */ \ -+ {USB_DEVICE(0x0846, 0x9021)},/* Netgear - Sercomm */ \ -+ {USB_DEVICE(0x0846, 0xF001)}, /* Netgear - Sercomm */ \ -+ {USB_DEVICE(0x0E66, 0x0019)},/* Hawking,Edimax */ \ -+ {USB_DEVICE(0x0E66, 0x0020)}, /* Hawking - Edimax */ \ -+ {USB_DEVICE(0x050D, 0x1004)}, /* Belkin - Edimax */ \ -+ {USB_DEVICE(0x0BDA, 0x2E2E)}, /* Intel - - */ \ -+ {USB_DEVICE(0x2357, 0x0100)}, /* TP-Link - TP-Link */ \ -+ {USB_DEVICE(0x06F8, 0xE035)}, /* Hercules - Edimax */ \ -+ {USB_DEVICE(0x04BB, 0x0950)}, /* IO-DATA - Edimax */ \ -+ {USB_DEVICE(0x0DF6, 0x0070)}, /* Sitecom - Edimax */ \ -+ {USB_DEVICE(0x0789, 0x016D)}, /* LOGITEC - Edimax */ \ -+ /****** 8192CE-VAU ********/ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8186)},/* Intel-Xavi( Azwave) */ -+ -+#define RTL8192D_USB_IDS \ -+ /*=== Realtek demoboard ===*/ \ -+ /****** 8192DU ********/ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8193)},/* 8192DU-VC */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8194)},/* 8192DU-VS */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8111)},/* Realtek 5G dongle for WiFi Display */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0193)},/* 8192DE-VAU */ \ -+ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8171)},/* 8192DU-VC */ \ -+ /*=== Customer ID ===*/ \ -+ /****** 8192DU-VC ********/ \ -+ {USB_DEVICE(0x2019, 0xAB2C)},/* PCI - Abocm */ \ -+ {USB_DEVICE(0x2019, 0x4903)},/* PCI - ETOP */ \ -+ {USB_DEVICE(0x2019, 0x4904)},/* PCI - ETOP */ \ -+ {USB_DEVICE(0x07B8, 0x8193)},/* Abocom - Abocom */ \ -+ /****** 8192DU-VS ********/ \ -+ {USB_DEVICE(0x20F4, 0x664B)}, /* TRENDnet - Cameo */ \ -+ {USB_DEVICE(0x04DD, 0x954F)}, /* Sharp */ \ -+ {USB_DEVICE(0x04DD, 0x96A6)}, /* Sharp */ \ -+ {USB_DEVICE(0x050D, 0x110A)}, /* Belkin - Edimax */ \ -+ {USB_DEVICE(0x050D, 0x1105)}, /* Belkin - Edimax */ \ -+ {USB_DEVICE(0x050D, 0x120A)}, /* Belkin - Edimax */ \ -+ {USB_DEVICE(0x1668, 0x8102)}, /* - */ \ -+ {USB_DEVICE(0x0BDA, 0xE194)}, /* - Edimax */ \ -+ /****** 8192DU-WiFi Display Dongle ********/ \ -+ {USB_DEVICE(0x2019, 0xAB2D)},/* Planex - Abocom ,5G dongle for WiFi Display */ -+ -+#ifndef CONFIG_RTL8192C -+ #undef RTL8192C_USB_IDS -+ #define RTL8192C_USB_IDS -+#endif -+#ifndef CONFIG_RTL8192D -+ #undef RTL8192D_USB_IDS -+ #define RTL8192D_USB_IDS -+#endif -+ -+ -+static struct usb_device_id rtw_usb_id_tbl[] ={ -+ RTL8192C_USB_IDS -+ RTL8192D_USB_IDS -+ {} /* Terminating entry */ -+}; -+MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl); -+ -+int const rtw_usb_id_len = sizeof(rtw_usb_id_tbl) / sizeof(struct usb_device_id); -+ -+static struct specific_device_id specific_device_id_tbl[] = { -+ {.idVendor=USB_VENDER_ID_REALTEK, .idProduct=0x8177, .flags=SPEC_DEV_ID_DISABLE_HT},//8188cu 1*1 dongole, (b/g mode only) -+ {.idVendor=USB_VENDER_ID_REALTEK, .idProduct=0x817E, .flags=SPEC_DEV_ID_DISABLE_HT},//8188CE-VAU USB minCard (b/g mode only) -+ {.idVendor=0x0b05, .idProduct=0x1791, .flags=SPEC_DEV_ID_DISABLE_HT}, -+ {.idVendor=0x13D3, .idProduct=0x3311, .flags=SPEC_DEV_ID_DISABLE_HT}, -+ {.idVendor=0x13D3, .idProduct=0x3359, .flags=SPEC_DEV_ID_DISABLE_HT},//Russian customer -Azwave (8188CE-VAU g mode) -+#ifdef RTK_DMP_PLATFORM -+ {.idVendor=USB_VENDER_ID_REALTEK, .idProduct=0x8111, .flags=SPEC_DEV_ID_ASSIGN_IFNAME}, // Realtek 5G dongle for WiFi Display -+ {.idVendor=0x2019, .idProduct=0xAB2D, .flags=SPEC_DEV_ID_ASSIGN_IFNAME}, // PCI-Abocom 5G dongle for WiFi Display -+#endif /* RTK_DMP_PLATFORM */ -+ {} -+}; -+ -+struct rtw_usb_drv { -+ struct usb_driver usbdrv; -+ int drv_registered; -+}; -+ -+static void rtw_dev_shutdown(struct device *dev) -+{ -+ struct usb_interface *usb_intf = container_of(dev, struct usb_interface, dev); -+ struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf); -+ _adapter *adapter = dvobj->if1; -+ int i; -+ -+ DBG_871X("%s\n", __func__); -+ -+ for (i = 0; iiface_nums; i++) { -+ adapter = dvobj->padapters[i]; -+ adapter->bSurpriseRemoved = _TRUE; -+ } -+ -+ ATOMIC_SET(&dvobj->continual_urb_error, MAX_CONTINUAL_URB_ERR+1); -+} -+ -+#ifdef CONFIG_RTL8192C -+static struct usb_device_id rtl8192c_usb_id_tbl[] ={ -+ RTL8192C_USB_IDS -+ {} /* Terminating entry */ -+}; -+ -+struct rtw_usb_drv rtl8192c_usb_drv = { -+ .usbdrv.name = (char*)"rtl8192cu", -+ .usbdrv.probe = rtw_drv_init, -+ .usbdrv.disconnect = rtw_dev_remove, -+ .usbdrv.id_table = rtl8192c_usb_id_tbl, -+ .usbdrv.suspend = rtw_suspend, -+ .usbdrv.resume = rtw_resume, -+ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) -+ .usbdrv.reset_resume = rtw_resume, -+ #endif -+ #ifdef CONFIG_AUTOSUSPEND -+ .usbdrv.supports_autosuspend = 1, -+ #endif -+ -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)) -+ .usbdrv.drvwrap.driver.shutdown = rtw_dev_shutdown, -+ #else -+ .usbdrv.driver.shutdown = rtw_dev_shutdown, -+ #endif -+}; -+ -+static struct rtw_usb_drv *usb_drv = &rtl8192c_usb_drv; -+#endif /* CONFIG_RTL8192C */ -+ -+#ifdef CONFIG_RTL8192D -+static struct usb_device_id rtl8192d_usb_id_tbl[] ={ -+ RTL8192D_USB_IDS -+ {} /* Terminating entry */ -+}; -+ -+struct rtw_usb_drv rtl8192d_usb_drv = { -+ .usbdrv.name = (char*)"rtl8192du", -+ .usbdrv.probe = rtw_drv_init, -+ .usbdrv.disconnect = rtw_dev_remove, -+ .usbdrv.id_table = rtl8192d_usb_id_tbl, -+ .usbdrv.suspend = rtw_suspend, -+ .usbdrv.resume = rtw_resume, -+ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) -+ .usbdrv.reset_resume = rtw_resume, -+ #endif -+ #ifdef CONFIG_AUTOSUSPEND -+ .usbdrv.supports_autosuspend = 1, -+ #endif -+ -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)) -+ .usbdrv.drvwrap.driver.shutdown = rtw_dev_shutdown, -+ #else -+ .usbdrv.driver.shutdown = rtw_dev_shutdown, -+ #endif -+}; -+static struct rtw_usb_drv *usb_drv = &rtl8192d_usb_drv; -+#endif /* CONFIG_RTL8192D */ -+ -+static inline int RT_usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd) -+{ -+ return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN); -+} -+ -+static inline int RT_usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd) -+{ -+ return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT); -+} -+ -+static inline int RT_usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd) -+{ -+ return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT); -+} -+ -+static inline int RT_usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd) -+{ -+ return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK); -+} -+ -+static inline int RT_usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd) -+{ -+ return (RT_usb_endpoint_xfer_bulk(epd) && RT_usb_endpoint_dir_in(epd)); -+} -+ -+static inline int RT_usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd) -+{ -+ return (RT_usb_endpoint_xfer_bulk(epd) && RT_usb_endpoint_dir_out(epd)); -+} -+ -+static inline int RT_usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd) -+{ -+ return (RT_usb_endpoint_xfer_int(epd) && RT_usb_endpoint_dir_in(epd)); -+} -+ -+static inline int RT_usb_endpoint_num(const struct usb_endpoint_descriptor *epd) -+{ -+ return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; -+} -+ -+static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj) -+{ -+ u8 rst = _SUCCESS; -+ -+ #ifdef CONFIG_USB_VENDOR_REQ_MUTEX -+ _rtw_mutex_init(&dvobj->usb_vendor_req_mutex); -+ #endif -+ -+ -+ #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC -+ dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); -+ if (dvobj->usb_alloc_vendor_req_buf == NULL) { -+ DBG_871X("alloc usb_vendor_req_buf failed... /n"); -+ rst = _FAIL; -+ goto exit; -+ } -+ dvobj->usb_vendor_req_buf = -+ (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(dvobj->usb_alloc_vendor_req_buf ), ALIGNMENT_UNIT); -+exit: -+ #endif -+ -+ return rst; -+ -+} -+ -+static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj) -+{ -+ u8 rst = _SUCCESS; -+ -+ #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC -+ if(dvobj->usb_vendor_req_buf) -+ rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE); -+ #endif -+ -+ #ifdef CONFIG_USB_VENDOR_REQ_MUTEX -+ _rtw_mutex_free(&dvobj->usb_vendor_req_mutex); -+ #endif -+ -+ return rst; -+} -+ -+static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) -+{ -+ int i; -+ u8 val8; -+ int status = _FAIL; -+ struct dvobj_priv *pdvobjpriv = NULL; -+ struct usb_device *pusbd; -+ struct usb_device_descriptor *pdev_desc; -+ struct usb_host_config *phost_conf; -+ struct usb_config_descriptor *pconf_desc; -+ struct usb_host_interface *phost_iface; -+ struct usb_interface_descriptor *piface_desc; -+ struct usb_host_endpoint *phost_endp; -+ struct usb_endpoint_descriptor *pendp_desc; -+ -+_func_enter_; -+ -+ if((pdvobjpriv = devobj_init()) == NULL) { -+ goto exit; -+ } -+ -+ pdvobjpriv->pusbintf = usb_intf ; -+ pusbd = pdvobjpriv->pusbdev = interface_to_usbdev(usb_intf); -+ usb_set_intfdata(usb_intf, pdvobjpriv); -+ -+ pdvobjpriv->RtNumInPipes = 0; -+ pdvobjpriv->RtNumOutPipes = 0; -+ -+ -+ pdev_desc = &pusbd->descriptor; -+#if 0 -+ DBG_871X("\n8712_usb_device_descriptor:\n"); -+ DBG_871X("bLength=%x\n", pdev_desc->bLength); -+ DBG_871X("bDescriptorType=%x\n", pdev_desc->bDescriptorType); -+ DBG_871X("bcdUSB=%x\n", pdev_desc->bcdUSB); -+ DBG_871X("bDeviceClass=%x\n", pdev_desc->bDeviceClass); -+ DBG_871X("bDeviceSubClass=%x\n", pdev_desc->bDeviceSubClass); -+ DBG_871X("bDeviceProtocol=%x\n", pdev_desc->bDeviceProtocol); -+ DBG_871X("bMaxPacketSize0=%x\n", pdev_desc->bMaxPacketSize0); -+ DBG_871X("idVendor=%x\n", pdev_desc->idVendor); -+ DBG_871X("idProduct=%x\n", pdev_desc->idProduct); -+ DBG_871X("bcdDevice=%x\n", pdev_desc->bcdDevice); -+ DBG_871X("iManufacturer=%x\n", pdev_desc->iManufacturer); -+ DBG_871X("iProduct=%x\n", pdev_desc->iProduct); -+ DBG_871X("iSerialNumber=%x\n", pdev_desc->iSerialNumber); -+ DBG_871X("bNumConfigurations=%x\n", pdev_desc->bNumConfigurations); -+#endif -+ -+ phost_conf = pusbd->actconfig; -+ pconf_desc = &phost_conf->desc; -+ -+#if 0 -+ DBG_871X("\n8712_usb_configuration_descriptor:\n"); -+ DBG_871X("bLength=%x\n", pconf_desc->bLength); -+ DBG_871X("bDescriptorType=%x\n", pconf_desc->bDescriptorType); -+ DBG_871X("wTotalLength=%x\n", pconf_desc->wTotalLength); -+ DBG_871X("bNumInterfaces=%x\n", pconf_desc->bNumInterfaces); -+ DBG_871X("bConfigurationValue=%x\n", pconf_desc->bConfigurationValue); -+ DBG_871X("iConfiguration=%x\n", pconf_desc->iConfiguration); -+ DBG_871X("bmAttributes=%x\n", pconf_desc->bmAttributes); -+ DBG_871X("bMaxPower=%x\n", pconf_desc->bMaxPower); -+#endif -+ -+ //DBG_871X("\n/****** num of altsetting = (%d) ******/\n", usb_intf->num_altsetting); -+ -+ phost_iface = &usb_intf->altsetting[0]; -+ piface_desc = &phost_iface->desc; -+ -+#if 0 -+ DBG_871X("\n8712_usb_interface_descriptor:\n"); -+ DBG_871X("bLength=%x\n", piface_desc->bLength); -+ DBG_871X("bDescriptorType=%x\n", piface_desc->bDescriptorType); -+ DBG_871X("bInterfaceNumber=%x\n", piface_desc->bInterfaceNumber); -+ DBG_871X("bAlternateSetting=%x\n", piface_desc->bAlternateSetting); -+ DBG_871X("bNumEndpoints=%x\n", piface_desc->bNumEndpoints); -+ DBG_871X("bInterfaceClass=%x\n", piface_desc->bInterfaceClass); -+ DBG_871X("bInterfaceSubClass=%x\n", piface_desc->bInterfaceSubClass); -+ DBG_871X("bInterfaceProtocol=%x\n", piface_desc->bInterfaceProtocol); -+ DBG_871X("iInterface=%x\n", piface_desc->iInterface); -+#endif -+ -+ pdvobjpriv->NumInterfaces = pconf_desc->bNumInterfaces; -+ pdvobjpriv->InterfaceNumber = piface_desc->bInterfaceNumber; -+ pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints; -+ -+ //DBG_871X("\ndump usb_endpoint_descriptor:\n"); -+ -+ for (i = 0; i < pdvobjpriv->nr_endpoint; i++) -+ { -+ phost_endp = phost_iface->endpoint + i; -+ if (phost_endp) -+ { -+ pendp_desc = &phost_endp->desc; -+ -+ DBG_871X("\nusb_endpoint_descriptor(%d):\n", i); -+ DBG_871X("bLength=%x\n",pendp_desc->bLength); -+ DBG_871X("bDescriptorType=%x\n",pendp_desc->bDescriptorType); -+ DBG_871X("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress); -+ //DBG_871X("bmAttributes=%x\n",pendp_desc->bmAttributes); -+ //DBG_871X("wMaxPacketSize=%x\n",pendp_desc->wMaxPacketSize); -+ DBG_871X("wMaxPacketSize=%x\n",le16_to_cpu(pendp_desc->wMaxPacketSize)); -+ DBG_871X("bInterval=%x\n",pendp_desc->bInterval); -+ //DBG_871X("bRefresh=%x\n",pendp_desc->bRefresh); -+ //DBG_871X("bSynchAddress=%x\n",pendp_desc->bSynchAddress); -+ -+ if (RT_usb_endpoint_is_bulk_in(pendp_desc)) -+ { -+ DBG_871X("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(pendp_desc)); -+ pdvobjpriv->RtNumInPipes++; -+ } -+ else if (RT_usb_endpoint_is_int_in(pendp_desc)) -+ { -+ DBG_871X("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(pendp_desc),pendp_desc->bInterval); -+ pdvobjpriv->RtNumInPipes++; -+ } -+ else if (RT_usb_endpoint_is_bulk_out(pendp_desc)) -+ { -+ DBG_871X("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(pendp_desc)); -+ pdvobjpriv->RtNumOutPipes++; -+ } -+ pdvobjpriv->ep_num[i] = RT_usb_endpoint_num(pendp_desc); -+ } -+ } -+ -+ DBG_871X("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes); -+ -+ if (pusbd->speed == USB_SPEED_HIGH) { -+ pdvobjpriv->ishighspeed = _TRUE; -+ DBG_871X("USB_SPEED_HIGH\n"); -+ } else { -+ pdvobjpriv->ishighspeed = _FALSE; -+ DBG_871X("NON USB_SPEED_HIGH\n"); -+ } -+ -+ if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) { -+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't INIT rtw_init_intf_priv\n")); -+ goto free_dvobj; -+ } -+ -+ //.3 misc -+ _rtw_init_sema(&(pdvobjpriv->usb_suspend_sema), 0); -+ -+ rtw_reset_continual_urb_error(pdvobjpriv); -+ -+ usb_get_dev(pusbd); -+ -+ //DBG_871X("%s %d\n", __func__, ATOMIC_READ(&usb_intf->dev.kobj.kref.refcount)); -+ -+ status = _SUCCESS; -+ -+free_dvobj: -+ if (status != _SUCCESS && pdvobjpriv) { -+ usb_set_intfdata(usb_intf, NULL); -+ devobj_deinit(pdvobjpriv); -+ pdvobjpriv = NULL; -+ } -+exit: -+_func_exit_; -+ return pdvobjpriv; -+} -+ -+static void usb_dvobj_deinit(struct usb_interface *usb_intf) -+{ -+ struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf); -+ -+_func_enter_; -+ -+ usb_set_intfdata(usb_intf, NULL); -+ if (dvobj) { -+ //Modify condition for 92DU DMDP 2010.11.18, by Thomas -+ /*if ((dvobj->NumInterfaces == 1) -+ || ((dvobj->InterfaceNumber == 1) && (dvobj->DualMacMode == _TRUE))) { -+ if (interface_to_usbdev(usb_intf)->state != USB_STATE_NOTATTACHED) { -+ //If we didn't unplug usb dongle and remove/insert modlue, driver fails on sitesurvey for the first time when device is up . -+ //Reset usb port for sitesurvey fail issue. 2009.8.13, by Thomas -+ DBG_871X("usb attached..., try to reset usb device\n"); -+ usb_reset_device(interface_to_usbdev(usb_intf)); -+ } -+ }*/ -+ rtw_deinit_intf_priv(dvobj); -+ devobj_deinit(dvobj); -+ } -+ -+ //DBG_871X("%s %d\n", __func__, ATOMIC_READ(&usb_intf->dev.kobj.kref.refcount)); -+ usb_put_dev(interface_to_usbdev(usb_intf)); -+ -+_func_exit_; -+} -+ -+static void decide_chip_type_by_usb_device_id(_adapter *padapter, const struct usb_device_id *pdid) -+{ -+ padapter->chip_type = NULL_CHIP_TYPE; -+#ifdef CONFIG_RTL8192C -+ padapter->chip_type = RTL8188C_8192C; -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192CU; -+ DBG_871X("CHIP TYPE: RTL8188C_8192C\n"); -+#endif -+ -+#ifdef CONFIG_RTL8192D -+ padapter->chip_type = RTL8192D; -+ padapter->HardwareType = HARDWARE_TYPE_RTL8192DU; -+ DBG_871X("CHIP TYPE: RTL8192D\n"); -+#endif -+} -+ -+static void usb_intf_start(_adapter *padapter) -+{ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_start\n")); -+ rtw_hal_inirp_init(padapter); -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-usb_intf_start\n")); -+} -+ -+static void usb_intf_stop(_adapter *padapter) -+{ -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n")); -+ -+ //disabel_hw_interrupt -+ if(padapter->bSurpriseRemoved == _FALSE) -+ { -+ //device still exists, so driver can do i/o operation -+ //TODO: -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("SurpriseRemoved==_FALSE\n")); -+ } -+ -+ //cancel in irp -+ rtw_hal_inirp_deinit(padapter); -+ -+ //cancel out irp -+ rtw_write_port_cancel(padapter); -+ -+ //todo:cancel other irps -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-usb_intf_stop\n")); -+ -+} -+ -+static void rtw_dev_unload(_adapter *padapter) -+{ -+ struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; -+ u8 val8; -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_dev_unload\n")); -+ -+ if(padapter->bup == _TRUE) -+ { -+ DBG_871X("===> rtw_dev_unload\n"); -+ -+ padapter->bDriverStopped = _TRUE; -+ #ifdef CONFIG_XMIT_ACK -+ if (padapter->xmitpriv.ack_tx) -+ rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); -+ #endif -+ -+ //s3. -+ if(padapter->intf_stop) -+ { -+ padapter->intf_stop(padapter); -+ } -+ -+ //s4. -+ if(!padapter->pwrctrlpriv.bInternalAutoSuspend ) -+ rtw_stop_drv_threads(padapter); -+ -+ -+ //s5. -+ if(padapter->bSurpriseRemoved == _FALSE) -+ { -+ //DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n"); -+#ifdef CONFIG_WOWLAN -+ if((padapter->pwrctrlpriv.bSupportRemoteWakeup==_TRUE)&&(padapter->pwrctrlpriv.wowlan_mode==_TRUE)){ -+ DBG_871X("%s bSupportWakeOnWlan==_TRUE do not run rtw_hal_deinit()\n",__FUNCTION__); -+ } -+ else -+#endif //CONFIG_WOWLAN -+ { -+ rtw_hal_deinit(padapter); -+ } -+ padapter->bSurpriseRemoved = _TRUE; -+ } -+ -+ padapter->bup = _FALSE; -+#ifdef CONFIG_WOWLAN -+ padapter->hw_init_completed=_FALSE; -+#endif //CONFIG_WOWLAN -+ } -+ else -+ { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == _FALSE\n" )); -+ } -+ -+ DBG_871X("<=== rtw_dev_unload\n"); -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-rtw_dev_unload\n")); -+ -+} -+ -+static void process_spec_devid(const struct usb_device_id *pdid) -+{ -+ u16 vid, pid; -+ u32 flags; -+ int i; -+ int num = sizeof(specific_device_id_tbl)/sizeof(struct specific_device_id); -+ -+ for(i=0; iidVendor==vid) && (pdid->idProduct==pid) && (flags&SPEC_DEV_ID_DISABLE_HT)) -+ { -+ rtw_ht_enable = 0; -+ rtw_cbw40_enable = 0; -+ rtw_ampdu_enable = 0; -+ } -+#endif -+ -+#ifdef RTK_DMP_PLATFORM -+ // Change the ifname to wlan10 when PC side WFD dongle plugin on DMP platform. -+ // It is used to distinguish between normal and PC-side wifi dongle/module. -+ if((pdid->idVendor==vid) && (pdid->idProduct==pid) && (flags&SPEC_DEV_ID_ASSIGN_IFNAME)) -+ { -+ extern char* ifname; -+ strncpy(ifname, "wlan10", 6); -+ //DBG_871X("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __FUNCTION__, __LINE__, ifname, vid, pid); -+ } -+#endif /* RTK_DMP_PLATFORM */ -+ -+ } -+} -+ -+#ifdef SUPPORT_HW_RFOFF_DETECTED -+int rtw_hw_suspend(_adapter *padapter ) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf; -+ struct net_device *pnetdev = padapter->pnetdev; -+ -+ _func_enter_; -+ -+ if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) -+ { -+ DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", -+ padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved); -+ goto error_exit; -+ } -+ -+ if(padapter)//system suspend -+ { -+ LeaveAllPowerSaveMode(padapter); -+ -+ DBG_871X("==> rtw_hw_suspend\n"); -+ _enter_pwrlock(&pwrpriv->lock); -+ pwrpriv->bips_processing = _TRUE; -+ //padapter->net_closed = _TRUE; -+ //s1. -+ if(pnetdev) -+ { -+ netif_carrier_off(pnetdev); -+ rtw_netif_stop_queue(pnetdev); -+ } -+ -+ //s2. -+ rtw_disassoc_cmd(padapter, 500, _FALSE); -+ -+ //s2-2. indicate disconnect to os -+ //rtw_indicate_disconnect(padapter); -+ { -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED)) -+ { -+ _clr_fwstate_(pmlmepriv, _FW_LINKED); -+ -+ rtw_led_control(padapter, LED_CTL_NO_LINK); -+ -+ rtw_os_indicate_disconnect(padapter); -+ -+ #ifdef CONFIG_LPS -+ //donnot enqueue cmd -+ rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0); -+ #endif -+ } -+ -+ } -+ //s2-3. -+ rtw_free_assoc_resources(padapter, 1); -+ -+ //s2-4. -+ rtw_free_network_queue(padapter,_TRUE); -+ #ifdef CONFIG_IPS -+ rtw_ips_dev_unload(padapter); -+ #endif -+ pwrpriv->rf_pwrstate = rf_off; -+ pwrpriv->bips_processing = _FALSE; -+ -+ _exit_pwrlock(&pwrpriv->lock); -+ } -+ else -+ goto error_exit; -+ -+ _func_exit_; -+ return 0; -+ -+error_exit: -+ DBG_871X("%s, failed \n",__FUNCTION__); -+ return (-1); -+ -+} -+ -+int rtw_hw_resume(_adapter *padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf; -+ struct net_device *pnetdev = padapter->pnetdev; -+ -+ _func_enter_; -+ -+ if(padapter)//system resume -+ { -+ DBG_871X("==> rtw_hw_resume\n"); -+ _enter_pwrlock(&pwrpriv->lock); -+ pwrpriv->bips_processing = _TRUE; -+ rtw_reset_drv_sw(padapter); -+ -+ if(pm_netdev_open(pnetdev,_FALSE) != 0) -+ { -+ _exit_pwrlock(&pwrpriv->lock); -+ goto error_exit; -+ } -+ -+ netif_device_attach(pnetdev); -+ netif_carrier_on(pnetdev); -+ -+ if(!rtw_netif_queue_stopped(pnetdev)) -+ rtw_netif_start_queue(pnetdev); -+ else -+ rtw_netif_wake_queue(pnetdev); -+ -+ pwrpriv->bkeepfwalive = _FALSE; -+ pwrpriv->brfoffbyhw = _FALSE; -+ -+ pwrpriv->rf_pwrstate = rf_on; -+ pwrpriv->bips_processing = _FALSE; -+ -+ _exit_pwrlock(&pwrpriv->lock); -+ } -+ else -+ { -+ goto error_exit; -+ } -+ -+ _func_exit_; -+ -+ return 0; -+error_exit: -+ DBG_871X("%s, Open net dev failed \n",__FUNCTION__); -+ return (-1); -+} -+#endif -+ -+static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) -+{ -+ struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); -+ _adapter *padapter = dvobj->if1; -+ struct net_device *pnetdev = padapter->pnetdev; -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct usb_device *usb_dev = interface_to_usbdev(pusb_intf); -+#ifdef CONFIG_WOWLAN -+ struct wowlan_ioctl_param poidparam; -+#endif // CONFIG_WOWLAN -+ int ret = 0; -+ u32 start_time = rtw_get_current_time(); -+ _func_enter_; -+ -+ DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); -+ -+ if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) -+ { -+ DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", -+ padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved); -+ goto exit; -+ } -+ -+ if(pwrpriv->bInternalAutoSuspend ) -+ { -+ #ifdef CONFIG_AUTOSUSPEND -+ #ifdef SUPPORT_HW_RFOFF_DETECTED -+ // The FW command register update must after MAC and FW init ready. -+ if((padapter->bFWReady) && ( padapter->pwrctrlpriv.bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) -+ { -+ u8 bOpen = _TRUE; -+ rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); -+ //rtl8192c_set_FwSelectSuspend_cmd(padapter,_TRUE ,500);//note fw to support hw power down ping detect -+ } -+ #endif -+ #endif -+ } -+ pwrpriv->bInSuspend = _TRUE; -+ rtw_cancel_all_timer(padapter); -+ LeaveAllPowerSaveMode(padapter); -+ -+ rtw_stop_cmd_thread(padapter); -+ -+ _enter_pwrlock(&pwrpriv->lock); -+ //padapter->net_closed = _TRUE; -+ //s1. -+ if(pnetdev) -+ { -+ netif_carrier_off(pnetdev); -+ rtw_netif_stop_queue(pnetdev); -+ } -+#ifdef CONFIG_WOWLAN -+ if(padapter->pwrctrlpriv.bSupportRemoteWakeup==_TRUE&&padapter->pwrctrlpriv.wowlan_mode==_TRUE){ -+ u8 ps_mode=PS_MODE_MIN; -+ //set H2C command -+ poidparam.subcode=WOWLAN_ENABLE; -+ rtw_hal_set_hwreg(padapter,HW_VAR_WOWLAN,(u8 *)&poidparam); -+ //rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, &ps_mode); -+ //rtw_set_rpwm(padapter, PS_STATE_S2); -+ } -+ else -+#endif //CONFIG_WOWLAN -+ { -+ //s2. -+ rtw_disassoc_cmd(padapter, 0, _FALSE); -+ } -+ -+#ifdef CONFIG_LAYER2_ROAMING_RESUME -+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) ) -+ { -+ //printk("%s:%d assoc_ssid:%s\n", __FUNCTION__, __LINE__, pmlmepriv->assoc_ssid.Ssid); -+ DBG_871X("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__, __LINE__, -+ pmlmepriv->cur_network.network.Ssid.Ssid, -+ MAC_ARG(pmlmepriv->cur_network.network.MacAddress), -+ pmlmepriv->cur_network.network.Ssid.SsidLength, -+ pmlmepriv->assoc_ssid.SsidLength); -+ rtw_set_roaming(padapter, 1); -+ } -+#endif -+ //s2-2. indicate disconnect to os -+ rtw_indicate_disconnect(padapter); -+ //s2-3. -+ rtw_free_assoc_resources(padapter, 1); -+#ifdef CONFIG_AUTOSUSPEND -+ if(!pwrpriv->bInternalAutoSuspend ) -+#endif -+ //s2-4. -+ rtw_free_network_queue(padapter, _TRUE); -+ -+ rtw_dev_unload(padapter); -+#ifdef CONFIG_AUTOSUSPEND -+ pwrpriv->rf_pwrstate = rf_off; -+ pwrpriv->bips_processing = _FALSE; -+#endif -+ _exit_pwrlock(&pwrpriv->lock); -+ -+ if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) -+ rtw_indicate_scan_done(padapter, 1); -+ -+ if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) -+ rtw_indicate_disconnect(padapter); -+ -+exit: -+ DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ -+ , ret, rtw_get_passing_time_ms(start_time)); -+ -+ _func_exit_; -+ return ret; -+} -+ -+static int rtw_resume(struct usb_interface *pusb_intf) -+{ -+ struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); -+ _adapter *padapter = dvobj->if1; -+ struct net_device *pnetdev = padapter->pnetdev; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ int ret = 0; -+ -+ if(pwrpriv->bInternalAutoSuspend ){ -+ ret = rtw_resume_process(padapter); -+ } else { -+#ifdef CONFIG_RESUME_IN_WORKQUEUE -+ rtw_resume_in_workqueue(pwrpriv); -+#else -+ if (rtw_is_earlysuspend_registered(pwrpriv) -+ #ifdef CONFIG_WOWLAN -+ && !padapter->pwrctrlpriv.wowlan_mode -+ #endif /* CONFIG_WOWLAN */ -+ ) { -+ /* jeff: bypass resume here, do in late_resume */ -+ rtw_set_do_late_resume(pwrpriv, _TRUE); -+ } else { -+ ret = rtw_resume_process(padapter); -+ } -+#endif /* CONFIG_RESUME_IN_WORKQUEUE */ -+ } -+ -+ return ret; -+ -+} -+ -+int rtw_resume_process(_adapter *padapter) -+{ -+ struct net_device *pnetdev; -+ struct pwrctrl_priv *pwrpriv=NULL; -+ int ret = -1; -+ u32 start_time = rtw_get_current_time(); -+ _func_enter_; -+ -+ DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); -+ -+ if(padapter) { -+ pnetdev= padapter->pnetdev; -+ pwrpriv = &padapter->pwrctrlpriv; -+ } else { -+ goto exit; -+ } -+ -+ _enter_pwrlock(&pwrpriv->lock); -+ rtw_reset_drv_sw(padapter); -+ pwrpriv->bkeepfwalive = _FALSE; -+ -+ DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive); -+ if(pm_netdev_open(pnetdev,_TRUE) != 0) { -+ _exit_pwrlock(&pwrpriv->lock); -+ goto exit; -+ } -+ -+ netif_device_attach(pnetdev); -+ netif_carrier_on(pnetdev); -+ -+#ifdef CONFIG_AUTOSUSPEND -+ if(pwrpriv->bInternalAutoSuspend ) -+ { -+ #ifdef CONFIG_AUTOSUSPEND -+ #ifdef SUPPORT_HW_RFOFF_DETECTED -+ // The FW command register update must after MAC and FW init ready. -+ if((padapter->bFWReady) && ( padapter->pwrctrlpriv.bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable )) -+ { -+ //rtl8192c_set_FwSelectSuspend_cmd(padapter,_FALSE ,500);//note fw to support hw power down ping detect -+ u8 bOpen = _FALSE; -+ rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen); -+ } -+ #endif -+ #endif -+ -+ pwrpriv->bInternalAutoSuspend = _FALSE; -+ pwrpriv->brfoffbyhw = _FALSE; -+ } -+#endif -+ _exit_pwrlock(&pwrpriv->lock); -+ -+ if( padapter->pid[1]!=0) { -+ DBG_871X("pid[1]:%d\n",padapter->pid[1]); -+ rtw_signal_process(padapter->pid[1], SIGUSR2); -+ } -+ -+ #ifdef CONFIG_LAYER2_ROAMING_RESUME -+ rtw_roaming(padapter, NULL); -+ #endif -+ -+ ret = 0; -+exit: -+ #ifdef CONFIG_RESUME_IN_WORKQUEUE -+ rtw_unlock_suspend(); -+ #endif //CONFIG_RESUME_IN_WORKQUEUE -+ -+ if (pwrpriv) -+ pwrpriv->bInSuspend = _FALSE; -+ DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ -+ , ret, rtw_get_passing_time_ms(start_time)); -+ -+ _func_exit_; -+ -+ return ret; -+} -+ -+#ifdef CONFIG_AUTOSUSPEND -+void autosuspend_enter(_adapter* padapter) -+{ -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); -+ -+ pwrpriv->bInternalAutoSuspend = _TRUE; -+ pwrpriv->bips_processing = _TRUE; -+ -+ DBG_871X("==>autosuspend_enter...........\n"); -+ -+ if(rf_off == pwrpriv->change_rfpwrstate ) -+ { -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ usb_enable_autosuspend(dvobj->pusbdev); -+ #else -+ dvobj->pusbdev->autosuspend_disabled = 0;//autosuspend disabled by the user -+ #endif -+ -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) -+ usb_autopm_put_interface(dvobj->pusbintf); -+ #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20)) -+ usb_autopm_enable(dvobj->pusbintf); -+ #else -+ usb_autosuspend_device(dvobj->pusbdev, 1); -+ #endif -+ } -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) -+ DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); -+ #else -+ DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); -+ #endif -+ -+} -+int autoresume_enter(_adapter* padapter) -+{ -+ int result = _SUCCESS; -+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -+ struct security_priv* psecuritypriv=&(padapter->securitypriv); -+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -+ struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); -+ -+ -+ DBG_871X("====> autoresume_enter \n"); -+ -+ if(rf_off == pwrpriv->rf_pwrstate ) -+ { -+ pwrpriv->ps_flag = _FALSE; -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) -+ if (usb_autopm_get_interface(dvobj->pusbintf) < 0) -+ { -+ DBG_871X( "can't get autopm: %d\n", result); -+ result = _FAIL; -+ goto error_exit; -+ } -+ #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20)) -+ usb_autopm_disable(dvobj->pusbintf); -+ #else -+ usb_autoresume_device(dvobj->pusbdev, 1); -+ #endif -+ -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) -+ DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); -+ #else -+ DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); -+ #endif -+ } -+ DBG_871X("<==== autoresume_enter \n"); -+error_exit: -+ -+ return result; -+} -+#endif -+ -+#ifdef CONFIG_PLATFORM_RTD2880B -+extern void rtd2885_wlan_netlink_sendMsg(char *action_string, char *name); -+#endif -+ -+#ifdef CONFIG_PLATFORM_ARM_SUNxI -+#include -+extern int sw_usb_disable_hcd(__u32 usbc_no); -+extern int sw_usb_enable_hcd(__u32 usbc_no); -+static int usb_wifi_host = 2; -+#endif -+ -+#ifdef CONFIG_PLATFORM_ARM_SUN6I -+#include -+extern int sw_usb_disable_hcd(__u32 usbc_no); -+extern int sw_usb_enable_hcd(__u32 usbc_no); -+extern void wifi_pm_power(int on); -+static script_item_u item; -+#endif -+ -+_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, -+ struct usb_interface *pusb_intf, const struct usb_device_id *pdid) -+{ -+ _adapter *padapter = NULL; -+ struct net_device *pnetdev = NULL; -+ int status = _FAIL; -+ -+ if ((padapter = (_adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) { -+ goto exit; -+ } -+ padapter->dvobj = dvobj; -+ dvobj->if1 = padapter; -+ -+ padapter->bDriverStopped=_TRUE; -+ -+ dvobj->padapters[dvobj->iface_nums++] = padapter; -+ padapter->iface_id = IFACE_ID0; -+ -+#if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) -+ //set adapter_type/iface type for primary padapter -+ padapter->isprimary = _TRUE; -+ padapter->adapter_type = PRIMARY_ADAPTER; -+ #ifndef CONFIG_HWPORT_SWAP -+ padapter->iface_type = IFACE_PORT0; -+ #else -+ padapter->iface_type = IFACE_PORT1; -+ #endif -+#endif -+ -+ #ifndef RTW_DVOBJ_CHIP_HW_TYPE -+ //step 1-1., decide the chip_type via vid/pid -+ padapter->interface_type = RTW_USB; -+ decide_chip_type_by_usb_device_id(padapter, pdid); -+ #endif -+ -+ if((pnetdev = rtw_init_netdev(padapter)) == NULL) { -+ goto free_adapter; -+ } -+ SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj)); -+ padapter = rtw_netdev_priv(pnetdev); -+ -+ //step 2. hook HalFunc, allocate HalData -+ if(padapter->chip_type == RTL8188C_8192C) { -+ #ifdef CONFIG_RTL8192C -+ rtl8192cu_set_hal_ops(padapter); -+ #endif -+ } else if(padapter->chip_type == RTL8192D) { -+ #ifdef CONFIG_RTL8192D -+ rtl8192du_set_hal_ops(padapter); -+ #endif -+ } else { -+ DBG_871X("Detect NULL_CHIP_TYPE\n"); -+ goto free_hal_data; -+ } -+ -+ //step 3. -+ padapter->intf_start=&usb_intf_start; -+ padapter->intf_stop=&usb_intf_stop; -+ -+ //.2 -+ if ((rtw_init_io_priv(padapter, usb_set_intf_ops)) == _FAIL) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,(" \n Can't init io_reqs\n")); -+ goto free_hal_data; -+ } -+ -+ rtw_hal_read_chip_version(padapter); -+ -+ //.4 usb endpoint mapping -+ rtw_hal_chip_configure(padapter); -+ -+ //step 4. read efuse/eeprom data and get mac_addr -+ rtw_hal_read_chip_info(padapter); -+ -+ if (rtw_handle_dualmac(padapter, 1) != _SUCCESS) -+ goto free_hal_data; -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if(rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)) != 0) { -+ goto handle_dualmac; -+ } -+#endif -+ -+ //step 5. -+ if (rtw_init_drv_sw(padapter) == _FAIL) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("Initialize driver software resource Failed!\n")); -+ goto free_wdev; -+ } -+ -+#ifdef CONFIG_PM -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) -+ if(padapter->pwrctrlpriv.bSupportRemoteWakeup) -+ { -+ dvobj->pusbdev->do_remote_wakeup=1; -+ pusb_intf->needs_remote_wakeup = 1; -+ device_init_wakeup(&pusb_intf->dev, 1); -+ DBG_871X("\n padapter->pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n"); -+ DBG_871X("\n padapter->pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev)); -+ } -+#endif -+#endif -+ -+#ifdef CONFIG_AUTOSUSPEND -+ if( padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE ) -+ { -+ if(padapter->registrypriv.usbss_enable ){ /* autosuspend (2s delay) */ -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,38)) -+ dvobj->pusbdev->dev.power.autosuspend_delay = 0 * HZ;//15 * HZ; idle-delay time -+ #else -+ dvobj->pusbdev->autosuspend_delay = 0 * HZ;//15 * HZ; idle-delay time -+ #endif -+ -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ usb_enable_autosuspend(dvobj->pusbdev); -+ #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,34)) -+ padapter->bDisableAutosuspend = dvobj->pusbdev->autosuspend_disabled ; -+ dvobj->pusbdev->autosuspend_disabled = 0;//autosuspend disabled by the user -+ #endif -+ -+ usb_autopm_get_interface(dvobj->pusbintf );//init pm_usage_cnt ,let it start from 1 -+ -+ #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) -+ DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__, atomic_read(&(dvobj->pusbintf ->pm_usage_cnt))); -+ #else -+ DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__, dvobj->pusbintf ->pm_usage_cnt); -+ #endif -+ } -+ } -+#endif -+ -+ // set mac addr -+ rtw_macaddr_cfg(padapter->eeprompriv.mac_addr); -+ rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); -+ -+ DBG_871X("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n" -+ ,padapter->bDriverStopped -+ ,padapter->bSurpriseRemoved -+ ,padapter->bup -+ ,padapter->hw_init_completed -+ ); -+ -+ status = _SUCCESS; -+ -+free_wdev: -+ if(status != _SUCCESS) { -+ #ifdef CONFIG_IOCTL_CFG80211 -+ rtw_wdev_unregister(padapter->rtw_wdev); -+ rtw_wdev_free(padapter->rtw_wdev); -+ #endif -+ } -+handle_dualmac: -+ if (status != _SUCCESS) -+ rtw_handle_dualmac(padapter, 0); -+free_hal_data: -+ if(status != _SUCCESS && padapter->HalData) -+ rtw_mfree(padapter->HalData, sizeof(*(padapter->HalData))); -+free_adapter: -+ if (status != _SUCCESS) { -+ if (pnetdev) -+ rtw_free_netdev(pnetdev); -+ else if (padapter) -+ rtw_vmfree((u8*)padapter, sizeof(*padapter)); -+ padapter = NULL; -+ } -+exit: -+ return padapter; -+} -+ -+static void rtw_usb_if1_deinit(_adapter *if1) -+{ -+ struct net_device *pnetdev = if1->pnetdev; -+ struct mlme_priv *pmlmepriv= &if1->mlmepriv; -+ -+ if(check_fwstate(pmlmepriv, _FW_LINKED)) -+ rtw_disassoc_cmd(if1, 0, _FALSE); -+ -+#ifdef CONFIG_AP_MODE -+ free_mlme_ap_info(if1); -+ #ifdef CONFIG_HOSTAPD_MLME -+ hostapd_mode_unload(if1); -+ #endif -+#endif -+ -+ rtw_cancel_all_timer(if1); -+#ifdef CONFIG_WOWLAN -+ if1->pwrctrlpriv.wowlan_mode=_FALSE; -+#endif //CONFIG_WOWLAN -+ rtw_dev_unload(if1); -+ -+ DBG_871X("%s, hw_init_completed=%d\n", __func__, if1->hw_init_completed); -+ -+ //s6. -+ rtw_handle_dualmac(if1, 0); -+ -+#ifdef CONFIG_IOCTL_CFG80211 -+ if (if1->rtw_wdev) -+ rtw_wdev_free(if1->rtw_wdev); -+#endif //CONFIG_IOCTL_CFG80211 -+ -+ rtw_free_drv_sw(if1); -+ -+ if(pnetdev) -+ rtw_free_netdev(pnetdev); -+ -+#ifdef CONFIG_PLATFORM_RTD2880B -+ DBG_871X("wlan link down\n"); -+ rtd2885_wlan_netlink_sendMsg("linkdown", "8712"); -+#endif -+ -+} -+ -+/* -+ * drv_init() - a device potentially for us -+ * -+ * notes: drv_init() is called when the bus driver has located a card for us to support. -+ * We accept the new device by returning 0. -+*/ -+ -+_adapter *rtw_sw_export = NULL; -+ -+static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *did) -+{ -+ int i; -+ uint status = _FAIL; -+ _adapter *if1 = NULL, *if2 = NULL; -+ struct dvobj_priv *dvobj = NULL; -+ -+ -+ RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_init\n")); -+ -+ -+ //step 0. -+ process_spec_devid(did); -+ -+ /* Initialize dvobj_priv */ -+ if ((dvobj = usb_dvobj_init(pusb_intf)) == NULL) { -+ RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("initialize device object priv Failed!\n")); -+ goto exit; -+ } -+ -+ /* Initialize if1 */ -+ if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, did)) == NULL) { -+ DBG_871X("rtw_usb_if1_init Failed!\n"); -+ goto free_dvobj; -+ } -+ -+ /* Initialize if2 */ -+#ifdef CONFIG_CONCURRENT_MODE -+ if((if2 = rtw_drv_if2_init(if1, usb_set_intf_ops)) == NULL) { -+ goto free_if1; -+ } -+#ifdef CONFIG_MULTI_VIR_IFACES -+ for(i=0; iregistrypriv.ext_iface_num;i++) -+ { -+ if(rtw_drv_add_vir_if(if1, usb_set_intf_ops) == NULL) -+ { -+ DBG_871X("rtw_drv_add_iface failed! (%d)\n", i); -+ goto free_if1; -+ } -+ } -+#endif //CONFIG_MULTI_VIR_IFACES -+#endif -+ -+#ifdef CONFIG_INTEL_PROXIM -+ rtw_sw_export=if1; -+#endif -+ -+#ifdef CONFIG_GLOBAL_UI_PID -+ if (ui_pid[1]!=0) { -+ DBG_871X("ui_pid[1]:%d\n",ui_pid[1]); -+ rtw_signal_process(ui_pid[1], SIGUSR2); -+ } -+#endif -+ -+ //dev_alloc_name && register_netdev -+ if((status = rtw_drv_register_netdev(if1)) != _SUCCESS) { -+ goto free_if1; -+ } -+ -+#ifdef CONFIG_HOSTAPD_MLME -+ hostapd_mode_init(if1); -+#endif -+ -+#ifdef CONFIG_PLATFORM_RTD2880B -+ DBG_871X("wlan link up\n"); -+ rtd2885_wlan_netlink_sendMsg("linkup", "8712"); -+#endif -+ -+#ifdef RTK_DMP_PLATFORM -+ rtw_proc_init_one(if1->pnetdev); -+#endif -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-871x_drv - drv_init, success!\n")); -+ -+ status = _SUCCESS; -+ -+free_if1: -+ if (status != _SUCCESS && if1) { -+ rtw_usb_if1_deinit(if1); -+ } -+free_dvobj: -+ if (status != _SUCCESS) -+ usb_dvobj_deinit(pusb_intf); -+exit: -+ return status == _SUCCESS?0:-ENODEV; -+} -+ -+/* -+ * dev_remove() - our device is being removed -+*/ -+//rmmod module & unplug(SurpriseRemoved) will call r871xu_dev_remove() => how to recognize both -+static void rtw_dev_remove(struct usb_interface *pusb_intf) -+{ -+ struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); -+ _adapter *padapter = dvobj->if1; -+ -+_func_exit_; -+ -+ DBG_871X("+rtw_dev_remove\n"); -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n")); -+ -+ dvobj->processing_dev_remove = _TRUE; -+ -+ rtw_unregister_netdevs(dvobj); -+ -+ if(usb_drv->drv_registered == _TRUE) -+ { -+ //DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == _TRUE\n"); -+ padapter->bSurpriseRemoved = _TRUE; -+ } -+ /*else -+ { -+ //DBG_871X("r871xu_dev_remove():module removed\n"); -+ padapter->hw_init_completed = _FALSE; -+ }*/ -+ -+#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) -+ rtw_unregister_early_suspend(&padapter->pwrctrlpriv); -+#endif -+ -+ rtw_pm_set_ips(padapter, IPS_NONE); -+ rtw_pm_set_lps(padapter, PS_MODE_ACTIVE); -+ -+ LeaveAllPowerSaveMode(padapter); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+#ifdef CONFIG_MULTI_VIR_IFACES -+ rtw_drv_stop_vir_ifaces(dvobj); -+#endif //CONFIG_MULTI_VIR_IFACES -+ rtw_drv_if2_stop(dvobj->if2); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ rtw_usb_if1_deinit(padapter); -+ -+#ifdef CONFIG_CONCURRENT_MODE -+#ifdef CONFIG_MULTI_VIR_IFACES -+ rtw_drv_free_vir_ifaces(dvobj); -+#endif //CONFIG_MULTI_VIR_IFACES -+ rtw_drv_if2_free(dvobj->if2); -+#endif //CONFIG_CONCURRENT_MODE -+ -+ usb_dvobj_deinit(pusb_intf); -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n")); -+ DBG_871X("-r871xu_dev_remove, done\n"); -+ -+ -+#ifdef CONFIG_INTEL_PROXIM -+ rtw_sw_export=NULL; -+#endif -+ -+_func_exit_; -+ -+ return; -+ -+} -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) -+extern int console_suspend_enabled; -+#endif -+ -+static int __init rtw_drv_entry(void) -+{ -+#ifdef CONFIG_PLATFORM_RTK_DMP -+ u32 tmp; -+ tmp=readl((volatile unsigned int*)0xb801a608); -+ tmp &= 0xffffff00; -+ tmp |= 0x55; -+ writel(tmp,(volatile unsigned int*)0xb801a608);//write dummy register for 1055 -+#endif -+#ifdef CONFIG_PLATFORM_ARM_SUNxI -+#ifndef CONFIG_RTL8723A -+ int ret = 0; -+ /* ----------get usb_wifi_usbc_num------------- */ -+ ret = script_parser_fetch("usb_wifi_para", "usb_wifi_usbc_num", (int *)&usb_wifi_host, 64); -+ if(ret != 0){ -+ printk("ERR: script_parser_fetch usb_wifi_usbc_num failed\n"); -+ ret = -ENOMEM; -+ return ret; -+ } -+ printk("sw_usb_enable_hcd: usbc_num = %d\n", usb_wifi_host); -+ sw_usb_enable_hcd(usb_wifi_host); -+#endif //CONFIG_RTL8723A -+#endif //CONFIG_PLATFORM_ARM_SUNxI -+ -+#ifdef CONFIG_PLATFORM_ARM_SUN6I -+ script_item_value_type_e type; -+ -+ type = script_get_item("wifi_para", "wifi_usbc_id", &item); -+ if(SCIRPT_ITEM_VALUE_TYPE_INT != type){ -+ printk("ERR: script_get_item wifi_usbc_id failed\n"); -+ return -ENOMEM; -+ } -+ -+ printk("sw_usb_enable_hcd: usbc_num = %d\n", item.val); -+ wifi_pm_power(1); -+ mdelay(10); -+ sw_usb_enable_hcd(item.val); -+#endif //CONFIG_PLATFORM_ARM_SUN6I -+ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); -+ -+ DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION); -+ DBG_871X("build time: %s %s\n", __DATE__, __TIME__); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) -+ //console_suspend_enabled=0; -+#endif -+ -+ rtw_suspend_lock_init(); -+ -+ usb_drv->drv_registered = _TRUE; -+ return usb_register(&usb_drv->usbdrv); -+} -+ -+static void __exit rtw_drv_halt(void) -+{ -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n")); -+ DBG_871X("+rtw_drv_halt\n"); -+ -+ usb_drv->drv_registered = _FALSE; -+ usb_deregister(&usb_drv->usbdrv); -+ -+#ifdef CONFIG_PLATFORM_ARM_SUNxI -+#ifndef CONFIG_RTL8723A -+ printk("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host); -+ sw_usb_disable_hcd(usb_wifi_host); -+#endif //ifndef CONFIG_RTL8723A -+#endif //CONFIG_PLATFORM_ARM_SUNxI -+#ifdef CONFIG_PLATFORM_ARM_SUN6I -+ sw_usb_disable_hcd(item.val); -+ wifi_pm_power(0); -+#endif -+ -+ rtw_suspend_lock_uninit(); -+ DBG_871X("-rtw_drv_halt\n"); -+ -+ rtw_mstat_dump(); -+} -+ -+ -+module_init(rtw_drv_entry); -+module_exit(rtw_drv_halt); -+ -+#ifdef CONFIG_WOWLAN -+#ifdef CONFIG_WOWLAN_MANUAL -+ -+int rtw_resume_toshiba(PADAPTER Adapter) -+{ -+ struct dvobj_priv *pdvobjpriv; -+ pdvobjpriv = adapter_to_dvobj(Adapter); -+ -+ rtw_resume(pdvobjpriv->pusbintf); -+ return 0; -+} -+ -+int rtw_suspend_toshiba(PADAPTER Adapter) -+{ -+ pm_message_t msg; -+ struct dvobj_priv *pdvobjpriv; -+ pdvobjpriv = adapter_to_dvobj(Adapter); -+ msg.event=0; -+ //for Toshiba only, they should call rtw_suspend before suspend -+ rtw_suspend(pdvobjpriv->pusbintf, msg); -+ return 0; -+} -+EXPORT_SYMBOL(rtw_suspend_toshiba); -+EXPORT_SYMBOL(rtw_resume_toshiba); -+#endif //CONFIG_WOWLAN_MANUAL -+#endif //CONFIG_WOWLAN -+ -+#ifdef CONFIG_INTEL_PROXIM -+_adapter *rtw_usb_get_sw_pointer(void) -+{ -+ return rtw_sw_export; -+} -+EXPORT_SYMBOL(rtw_usb_get_sw_pointer); -+#endif //CONFIG_INTEL_PROXIM -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c -@@ -0,0 +1,649 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ *******************************************************************************/ -+#define _USB_OPS_LINUX_C_ -+ -+#include -+#include -+#include -+ -+#ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ -+static void _usbctrl_vendorreq_async_callback(struct urb *urb, struct pt_regs *regs) -+{ -+ if (urb) { -+ if (urb->context) { -+ rtw_mfree(urb->context); -+ } -+ usb_free_urb(urb); -+ } -+} -+ -+static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request, -+ u16 value, u16 index, void *pdata, u16 len, u8 requesttype) -+{ -+ int rc; -+ unsigned int pipe; -+ u8 reqtype; -+ struct usb_ctrlrequest *dr; -+ struct urb *urb; -+ struct rtl819x_async_write_data { -+ u8 data[VENDOR_CMD_MAX_DATA_LEN]; -+ struct usb_ctrlrequest dr; -+ } *buf; -+ -+ -+ if (requesttype == VENDOR_READ) { -+ pipe = usb_rcvctrlpipe(udev, 0);//read_in -+ reqtype = REALTEK_USB_VENQT_READ; -+ } -+ else { -+ pipe = usb_sndctrlpipe(udev, 0);//write_out -+ reqtype = REALTEK_USB_VENQT_WRITE; -+ } -+ -+ buf = (struct rtl819x_async_write_data *)rtw_zmalloc(sizeof(*buf)); -+ if (!buf) { -+ rc = -ENOMEM; -+ goto exit; -+ } -+ -+ urb = usb_alloc_urb(0, GFP_ATOMIC); -+ if (!urb) { -+ rtw_mfree((u8*)buf, sizeof(*buf)); -+ rc = -ENOMEM; -+ goto exit; -+ } -+ -+ dr = &buf->dr; -+ -+ dr->bRequestType = reqtype; -+ dr->bRequest = request; -+ dr->wValue = cpu_to_le16(value); -+ dr->wIndex = cpu_to_le16(index); -+ dr->wLength = cpu_to_le16(len); -+ -+ _rtw_memcpy(buf, pdata, len); -+ -+ usb_fill_control_urb(urb, udev, pipe, (unsigned char *)dr, buf, len, -+ _usbctrl_vendorreq_async_callback, buf); -+ -+ rc = usb_submit_urb(urb, GFP_ATOMIC); -+ if (rc < 0) { -+ rtw_mfree((u8*)buf, sizeof(*buf)); -+ usb_free_urb(urb); -+ } -+ -+exit: -+ return rc; -+} -+ -+int usb_write_async(struct usb_device *udev, u32 addr, void *pdata, u16 len) -+{ -+ u8 request; -+ u8 requesttype; -+ u16 wvalue; -+ u16 index; -+ -+ int ret; -+ -+ requesttype = VENDOR_WRITE;//write_out -+ request = REALTEK_USB_VENQT_CMD_REQ; -+ index = REALTEK_USB_VENQT_CMD_IDX;//n/a -+ -+ wvalue = (u16)(addr&0x0000ffff); -+ -+ ret = _usbctrl_vendorreq_async_write(udev, request, wvalue, index, pdata, len, requesttype); -+ -+ return ret; -+} -+ -+int usb_async_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val) -+{ -+ u8 data; -+ int ret; -+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)pintfhdl->pintf_dev; -+ struct usb_device *udev=pdvobjpriv->pusbdev; -+ -+ _func_enter_; -+ data = val; -+ ret = usb_write_async(udev, addr, &data, 1); -+ _func_exit_; -+ -+ return ret; -+} -+ -+int usb_async_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val) -+{ -+ u16 data; -+ int ret; -+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)pintfhdl->pintf_dev; -+ struct usb_device *udev=pdvobjpriv->pusbdev; -+ -+ _func_enter_; -+ data = val; -+ ret = usb_write_async(udev, addr, &data, 2); -+ _func_exit_; -+ -+ return ret; -+} -+ -+int usb_async_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val) -+{ -+ u32 data; -+ int ret; -+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)pintfhdl->pintf_dev; -+ struct usb_device *udev=pdvobjpriv->pusbdev; -+ -+ _func_enter_; -+ data = val; -+ ret = usb_write_async(udev, addr, &data, 4); -+ _func_exit_; -+ -+ return ret; -+} -+#endif /* CONFIG_USB_SUPPORT_ASYNC_VDN_REQ */ -+ -+unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr) -+{ -+ unsigned int pipe=0; -+ int ep_num=0; -+ _adapter *padapter = pdvobj->if1; -+ struct usb_device *pusbd = pdvobj->pusbdev; -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ -+ if (addr == RECV_BULK_IN_ADDR) { -+ pipe=usb_rcvbulkpipe(pusbd, pHalData->RtBulkInPipe); -+ -+ } else if (addr == RECV_INT_IN_ADDR) { -+ pipe=usb_rcvbulkpipe(pusbd, pHalData->RtIntInPipe); -+ -+ } else if (addr < HW_QUEUE_ENTRY) { -+ ep_num = pHalData->Queue2EPNum[addr]; -+ pipe = usb_sndbulkpipe(pusbd, ep_num); -+ } -+ -+ return pipe; -+} -+ -+struct zero_bulkout_context{ -+ void *pbuf; -+ void *purb; -+ void *pirp; -+ void *padapter; -+}; -+ -+static void usb_bulkout_zero_complete(struct urb *purb, struct pt_regs *regs) -+{ -+ struct zero_bulkout_context *pcontext = (struct zero_bulkout_context *)purb->context; -+ -+ //DBG_8192C("+usb_bulkout_zero_complete\n"); -+ -+ if(pcontext) -+ { -+ if(pcontext->pbuf) -+ { -+ rtw_mfree(pcontext->pbuf, sizeof(int)); -+ } -+ -+ if(pcontext->purb && (pcontext->purb==purb)) -+ { -+ usb_free_urb(pcontext->purb); -+ } -+ -+ -+ rtw_mfree((u8*)pcontext, sizeof(struct zero_bulkout_context)); -+ } -+ -+ -+} -+ -+static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr) -+{ -+ int pipe, status, len; -+ u32 ret; -+ unsigned char *pbuf; -+ struct zero_bulkout_context *pcontext; -+ PURB purb = NULL; -+ _adapter *padapter = (_adapter *)pintfhdl->padapter; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); -+ struct usb_device *pusbd = pdvobj->pusbdev; -+ -+ //DBG_871X("%s\n", __func__); -+ -+ -+ if((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) -+ { -+ return _FAIL; -+ } -+ -+ -+ pcontext = (struct zero_bulkout_context *)rtw_zmalloc(sizeof(struct zero_bulkout_context)); -+ -+ pbuf = (unsigned char *)rtw_zmalloc(sizeof(int)); -+ purb = usb_alloc_urb(0, GFP_ATOMIC); -+ -+ len = 0; -+ pcontext->pbuf = pbuf; -+ pcontext->purb = purb; -+ pcontext->pirp = NULL; -+ pcontext->padapter = padapter; -+ -+ -+ //translate DMA FIFO addr to pipehandle -+ //pipe = ffaddr2pipehdl(pdvobj, addr); -+ -+ usb_fill_bulk_urb(purb, pusbd, pipe, -+ pbuf, -+ len, -+ usb_bulkout_zero_complete, -+ pcontext);//context is pcontext -+ -+ status = usb_submit_urb(purb, GFP_ATOMIC); -+ -+ if (!status) -+ { -+ ret= _SUCCESS; -+ } -+ else -+ { -+ ret= _FAIL; -+ } -+ -+ -+ return _SUCCESS; -+ -+} -+ -+void usb_read_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) -+{ -+ -+} -+ -+void usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) -+{ -+ -+} -+ -+ -+void usb_read_port_cancel(struct intf_hdl *pintfhdl) -+{ -+ int i; -+ struct recv_buf *precvbuf; -+ _adapter *padapter = pintfhdl->padapter; -+ precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; -+ -+ DBG_871X("%s\n", __func__); -+ -+ padapter->bReadPortCancel = _TRUE; -+ -+ for (i=0; i < NR_RECVBUFF ; i++) { -+ -+ precvbuf->reuse = _TRUE; -+ if (precvbuf->purb) { -+ //DBG_8192C("usb_read_port_cancel : usb_kill_urb \n"); -+ usb_kill_urb(precvbuf->purb); -+ } -+ precvbuf++; -+ } -+ -+#ifdef CONFIG_USB_INTERRUPT_IN_PIPE -+ usb_kill_urb(padapter->recvpriv.int_in_urb); -+#endif -+} -+ -+static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) -+{ -+ _irqL irqL; -+ int i; -+ struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context; -+ //struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; -+ //_adapter *padapter = pxmitframe->padapter; -+ _adapter *padapter = pxmitbuf->padapter; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ //struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ -+_func_enter_; -+ -+ switch(pxmitbuf->flags) -+ { -+ case VO_QUEUE_INX: -+ pxmitpriv->voq_cnt--; -+ break; -+ case VI_QUEUE_INX: -+ pxmitpriv->viq_cnt--; -+ break; -+ case BE_QUEUE_INX: -+ pxmitpriv->beq_cnt--; -+ break; -+ case BK_QUEUE_INX: -+ pxmitpriv->bkq_cnt--; -+ break; -+ case HIGH_QUEUE_INX: -+#ifdef CONFIG_AP_MODE -+ rtw_chk_hi_queue_cmd(padapter); -+#endif -+ break; -+ default: -+ break; -+ } -+ -+ -+/* -+ _enter_critical(&pxmitpriv->lock, &irqL); -+ -+ pxmitpriv->txirp_cnt--; -+ -+ switch(pattrib->priority) -+ { -+ case 1: -+ case 2: -+ pxmitpriv->bkq_cnt--; -+ //DBG_8192C("pxmitpriv->bkq_cnt=%d\n", pxmitpriv->bkq_cnt); -+ break; -+ case 4: -+ case 5: -+ pxmitpriv->viq_cnt--; -+ //DBG_8192C("pxmitpriv->viq_cnt=%d\n", pxmitpriv->viq_cnt); -+ break; -+ case 6: -+ case 7: -+ pxmitpriv->voq_cnt--; -+ //DBG_8192C("pxmitpriv->voq_cnt=%d\n", pxmitpriv->voq_cnt); -+ break; -+ case 0: -+ case 3: -+ default: -+ pxmitpriv->beq_cnt--; -+ //DBG_8192C("pxmitpriv->beq_cnt=%d\n", pxmitpriv->beq_cnt); -+ break; -+ -+ } -+ -+ _exit_critical(&pxmitpriv->lock, &irqL); -+ -+ -+ if(pxmitpriv->txirp_cnt==0) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: txirp_cnt== 0, set allrxreturnevt!\n")); -+ _rtw_up_sema(&(pxmitpriv->tx_retevt)); -+ } -+*/ -+ //rtw_free_xmitframe(pxmitpriv, pxmitframe); -+ -+ if(padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel) -+ { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); -+ DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x) \n", -+ __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag); -+ -+ goto check_completion; -+ } -+ -+ -+ if (purb->status==0) { -+ -+ } else { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0 \n", purb->status)); -+ DBG_871X("###=> urb_write_port_complete status(%d)\n",purb->status); -+ if((purb->status==-EPIPE)||(purb->status==-EPROTO)) -+ { -+ //usb_clear_halt(pusbdev, purb->pipe); -+ //msleep(10); -+ sreset_set_wifi_error_status(padapter, USB_WRITE_PORT_FAIL); -+ } else if (purb->status == -EINPROGRESS) { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: EINPROGESS\n")); -+ goto check_completion; -+ -+ } else if (purb->status == -ENOENT) { -+ DBG_871X("%s: -ENOENT\n", __func__); -+ goto check_completion; -+ -+ } else if (purb->status == -ECONNRESET) { -+ DBG_871X("%s: -ECONNRESET\n", __func__); -+ goto check_completion; -+ -+ } else if (purb->status == -ESHUTDOWN) { -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete: ESHUTDOWN\n")); -+ padapter->bDriverStopped=_TRUE; -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped=TRUE\n")); -+ -+ goto check_completion; -+ } -+ else -+ { -+ padapter->bSurpriseRemoved=_TRUE; -+ DBG_8192C("bSurpriseRemoved=TRUE\n"); -+ //rtl8192cu_trigger_gpio_0(padapter); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bSurpriseRemoved=TRUE\n")); -+ -+ goto check_completion; -+ } -+ } -+ -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ { -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.last_tx_complete_time = rtw_get_current_time(); -+ } -+ #endif -+ -+check_completion: -+ _enter_critical(&pxmitpriv->lock_sctx, &irqL); -+ rtw_sctx_done_err(&pxmitbuf->sctx, -+ purb->status ? RTW_SCTX_DONE_WRITE_PORT_ERR : RTW_SCTX_DONE_SUCCESS); -+ _exit_critical(&pxmitpriv->lock_sctx, &irqL); -+ -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+ -+ //if(rtw_txframes_pending(padapter)) -+ { -+ tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); -+ } -+ -+_func_exit_; -+ -+} -+ -+u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) -+{ -+ _irqL irqL; -+ unsigned int pipe; -+ int status; -+ u32 ret = _FAIL, bwritezero = _FALSE; -+ PURB purb = NULL; -+ _adapter *padapter = (_adapter *)pintfhdl->padapter; -+ struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem; -+ struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; -+ struct usb_device *pusbd = pdvobj->pusbdev; -+ struct pkt_attrib *pattrib = &pxmitframe->attrib; -+ -+_func_enter_; -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("+usb_write_port\n")); -+ -+ if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) { -+ #ifdef DBG_TX -+ DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__ -+ ,padapter->bDriverStopped, padapter->bSurpriseRemoved, padapter->pwrctrlpriv.pnp_bstop_trx ); -+ #endif -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); -+ rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_TX_DENY); -+ goto exit; -+ } -+ -+ _enter_critical(&pxmitpriv->lock, &irqL); -+ -+ switch(addr) -+ { -+ case VO_QUEUE_INX: -+ pxmitpriv->voq_cnt++; -+ pxmitbuf->flags = VO_QUEUE_INX; -+ break; -+ case VI_QUEUE_INX: -+ pxmitpriv->viq_cnt++; -+ pxmitbuf->flags = VI_QUEUE_INX; -+ break; -+ case BE_QUEUE_INX: -+ pxmitpriv->beq_cnt++; -+ pxmitbuf->flags = BE_QUEUE_INX; -+ break; -+ case BK_QUEUE_INX: -+ pxmitpriv->bkq_cnt++; -+ pxmitbuf->flags = BK_QUEUE_INX; -+ break; -+ case HIGH_QUEUE_INX: -+ pxmitbuf->flags = HIGH_QUEUE_INX; -+ break; -+ default: -+ pxmitbuf->flags = MGT_QUEUE_INX; -+ break; -+ } -+ -+ _exit_critical(&pxmitpriv->lock, &irqL); -+ -+ purb = pxmitbuf->pxmit_urb[0]; -+ -+#if 0 -+ if(pdvobj->ishighspeed) -+ { -+ if(cnt> 0 && cnt%512 == 0) -+ { -+ //DBG_8192C("ishighspeed, cnt=%d\n", cnt); -+ bwritezero = _TRUE; -+ } -+ } -+ else -+ { -+ if(cnt > 0 && cnt%64 == 0) -+ { -+ //DBG_8192C("cnt=%d\n", cnt); -+ bwritezero = _TRUE; -+ } -+ } -+#endif -+ -+ //translate DMA FIFO addr to pipehandle -+ pipe = ffaddr2pipehdl(pdvobj, addr); -+ -+#ifdef CONFIG_REDUCE_USB_TX_INT -+ if ( (pxmitpriv->free_xmitbuf_cnt%NR_XMITBUFF == 0) -+ || (pxmitbuf->ext_tag == _TRUE) ) -+ { -+ purb->transfer_flags &= (~URB_NO_INTERRUPT); -+ } else { -+ purb->transfer_flags |= URB_NO_INTERRUPT; -+ //DBG_8192C("URB_NO_INTERRUPT "); -+ } -+#endif -+ -+ -+ usb_fill_bulk_urb(purb, pusbd, pipe, -+ pxmitframe->buf_addr, //= pxmitbuf->pbuf -+ cnt, -+ usb_write_port_complete, -+ pxmitbuf);//context is pxmitbuf -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_TX -+ purb->transfer_dma = pxmitbuf->dma_transfer_addr; -+ purb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; -+ purb->transfer_flags |= URB_ZERO_PACKET; -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ -+#if 0 -+ if (bwritezero) -+ { -+ purb->transfer_flags |= URB_ZERO_PACKET; -+ } -+#endif -+ -+ status = usb_submit_urb(purb, GFP_ATOMIC); -+ if (!status) { -+ #ifdef DBG_CONFIG_ERROR_DETECT -+ { -+ HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); -+ pHalData->srestpriv.last_tx_time = rtw_get_current_time(); -+ } -+ #endif -+ } else { -+ rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR); -+ DBG_871X("usb_write_port, status=%d\n", status); -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port(): usb_submit_urb, status=%x\n", status)); -+ -+ switch (status) { -+ case -ENODEV: -+ padapter->bDriverStopped=_TRUE; -+ break; -+ default: -+ break; -+ } -+ goto exit; -+ } -+ -+ ret= _SUCCESS; -+ -+// Commented by Albert 2009/10/13 -+// We add the URB_ZERO_PACKET flag to urb so that the host will send the zero packet automatically. -+/* -+ if(bwritezero == _TRUE) -+ { -+ usb_bulkout_zero(pintfhdl, addr); -+ } -+*/ -+ -+ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("-usb_write_port\n")); -+ -+exit: -+ if (ret != _SUCCESS) -+ rtw_free_xmitbuf(pxmitpriv, pxmitbuf); -+_func_exit_; -+ return ret; -+ -+} -+ -+void usb_write_port_cancel(struct intf_hdl *pintfhdl) -+{ -+ int i, j; -+ _adapter *padapter = pintfhdl->padapter; -+ struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; -+ -+ DBG_871X("%s \n", __func__); -+ -+ padapter->bWritePortCancel = _TRUE; -+ -+ for (i=0; ipxmit_urb[j]) { -+ usb_kill_urb(pxmitbuf->pxmit_urb[j]); -+ } -+ } -+ pxmitbuf++; -+ } -+ -+ pxmitbuf = (struct xmit_buf*)padapter->xmitpriv.pxmit_extbuf; -+ for (i = 0; i < NR_XMIT_EXTBUFF; i++) { -+ for (j=0; j<8; j++) { -+ if(pxmitbuf->pxmit_urb[j]) { -+ usb_kill_urb(pxmitbuf->pxmit_urb[j]); -+ } -+ } -+ pxmitbuf++; -+ } -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c -@@ -0,0 +1,421 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+#define _XMIT_OSDEP_C_ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+ -+uint rtw_remainder_len(struct pkt_file *pfile) -+{ -+ return (pfile->buf_len - ((SIZE_PTR)(pfile->cur_addr) - (SIZE_PTR)(pfile->buf_start))); -+} -+ -+void _rtw_open_pktfile (_pkt *pktptr, struct pkt_file *pfile) -+{ -+_func_enter_; -+ -+ pfile->pkt = pktptr; -+ pfile->cur_addr = pfile->buf_start = pktptr->data; -+ pfile->pkt_len = pfile->buf_len = pktptr->len; -+ -+ pfile->cur_buffer = pfile->buf_start ; -+ -+_func_exit_; -+} -+ -+uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen) -+{ -+ uint len = 0; -+ -+_func_enter_; -+ -+ len = rtw_remainder_len(pfile); -+ len = (rlen > len)? len: rlen; -+ -+ if(rmem) -+ skb_copy_bits(pfile->pkt, pfile->buf_len-pfile->pkt_len, rmem, len); -+ -+ pfile->cur_addr += len; -+ pfile->pkt_len -= len; -+ -+_func_exit_; -+ -+ return len; -+} -+ -+sint rtw_endofpktfile(struct pkt_file *pfile) -+{ -+_func_enter_; -+ -+ if (pfile->pkt_len == 0) { -+_func_exit_; -+ return _TRUE; -+ } -+ -+_func_exit_; -+ -+ return _FALSE; -+} -+ -+void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib) -+{ -+ -+#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX -+ struct sk_buff *skb = (struct sk_buff *)pkt; -+ pattrib->hw_tcp_csum = 0; -+ -+ if (skb->ip_summed == CHECKSUM_PARTIAL) { -+ if (skb_shinfo(skb)->nr_frags == 0) -+ { -+ const struct iphdr *ip = ip_hdr(skb); -+ if (ip->protocol == IPPROTO_TCP) { -+ // TCP checksum offload by HW -+ DBG_871X("CHECKSUM_PARTIAL TCP\n"); -+ pattrib->hw_tcp_csum = 1; -+ //skb_checksum_help(skb); -+ } else if (ip->protocol == IPPROTO_UDP) { -+ //DBG_871X("CHECKSUM_PARTIAL UDP\n"); -+#if 1 -+ skb_checksum_help(skb); -+#else -+ // Set UDP checksum = 0 to skip checksum check -+ struct udphdr *udp = skb_transport_header(skb); -+ udp->check = 0; -+#endif -+ } else { -+ DBG_871X("%s-%d TCP CSUM offload Error!!\n", __FUNCTION__, __LINE__); -+ WARN_ON(1); /* we need a WARN() */ -+ } -+ } -+ else { // IP fragmentation case -+ DBG_871X("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __FUNCTION__, __LINE__); -+ skb_checksum_help(skb); -+ } -+ } -+#endif -+ -+} -+ -+int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz) -+{ -+#ifdef CONFIG_USB_HCI -+ int i; -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct usb_device *pusbd = pdvobjpriv->pusbdev; -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_TX -+ pxmitbuf->pallocated_buf = rtw_usb_buffer_alloc(pusbd, (size_t)alloc_sz, &pxmitbuf->dma_transfer_addr); -+ pxmitbuf->pbuf = pxmitbuf->pallocated_buf; -+ if(pxmitbuf->pallocated_buf == NULL) -+ return _FAIL; -+#else // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ -+ pxmitbuf->pallocated_buf = rtw_zmalloc(alloc_sz); -+ if (pxmitbuf->pallocated_buf == NULL) -+ { -+ return _FAIL; -+ } -+ -+ pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ); -+ pxmitbuf->dma_transfer_addr = 0; -+ -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ -+ for(i=0; i<8; i++) -+ { -+ pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL); -+ if(pxmitbuf->pxmit_urb[i] == NULL) -+ { -+ DBG_871X("pxmitbuf->pxmit_urb[i]==NULL"); -+ return _FAIL; -+ } -+ -+ } -+#endif -+#if defined(CONFIG_PCI_HCI) || defined(CONFIG_SDIO_HCI) -+ pxmitbuf->pallocated_buf = rtw_zmalloc(alloc_sz); -+ if (pxmitbuf->pallocated_buf == NULL) -+ { -+ return _FAIL; -+ } -+ -+ pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ); -+#endif -+ -+ return _SUCCESS; -+} -+ -+void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz) -+{ -+#ifdef CONFIG_USB_HCI -+ int i; -+ struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); -+ struct usb_device *pusbd = pdvobjpriv->pusbdev; -+ -+ -+ for(i=0; i<8; i++) -+ { -+ if(pxmitbuf->pxmit_urb[i]) -+ { -+ //usb_kill_urb(pxmitbuf->pxmit_urb[i]); -+ usb_free_urb(pxmitbuf->pxmit_urb[i]); -+ } -+ } -+ -+#ifdef CONFIG_USE_USB_BUFFER_ALLOC_TX -+ rtw_usb_buffer_free(pusbd, (size_t)free_sz, pxmitbuf->pallocated_buf, pxmitbuf->dma_transfer_addr); -+ pxmitbuf->pallocated_buf = NULL; -+ pxmitbuf->dma_transfer_addr = 0; -+#else // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ if(pxmitbuf->pallocated_buf) -+ rtw_mfree(pxmitbuf->pallocated_buf, free_sz); -+#endif // CONFIG_USE_USB_BUFFER_ALLOC_TX -+ -+#endif -+#if defined(CONFIG_PCI_HCI) || defined(CONFIG_SDIO_HCI) -+ if(pxmitbuf->pallocated_buf) -+ rtw_mfree(pxmitbuf->pallocated_buf, free_sz); -+#endif -+} -+ -+void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt) -+{ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ u16 queue; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ -+ queue = skb_get_queue_mapping(pkt); -+ if(__netif_subqueue_stopped(padapter->pnetdev, queue) && -+ (pxmitpriv->hwxmits[queue].accnt < NR_XMITFRAME/2)) -+ { -+ netif_wake_subqueue(padapter->pnetdev, queue); -+ } -+#else -+ if (netif_queue_stopped(padapter->pnetdev)) -+ netif_wake_queue(padapter->pnetdev); -+#endif -+ -+ rtw_skb_free(pkt); -+} -+ -+void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe) -+{ -+ if(pxframe->pkt) -+ rtw_os_pkt_complete(padapter, pxframe->pkt); -+ -+ pxframe->pkt = NULL; -+} -+ -+void rtw_os_xmit_schedule(_adapter *padapter) -+{ -+#ifdef CONFIG_SDIO_HCI -+ if(!padapter) -+ return; -+ -+ if (rtw_txframes_pending(padapter)) -+ _rtw_up_sema(&padapter->xmitpriv.xmit_sema); -+#else -+ _irqL irqL; -+ struct xmit_priv *pxmitpriv; -+ -+ if(!padapter) -+ return; -+ -+ pxmitpriv = &padapter->xmitpriv; -+ -+ _enter_critical_bh(&pxmitpriv->lock, &irqL); -+ -+ if(rtw_txframes_pending(padapter)) -+ { -+ tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); -+ } -+ -+ _exit_critical_bh(&pxmitpriv->lock, &irqL); -+#endif -+} -+ -+ -+ -+#ifdef CONFIG_TX_MCAST2UNI -+int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb) -+{ -+ struct sta_priv *pstapriv = &padapter->stapriv; -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+ _irqL irqL; -+ _list *phead, *plist; -+ struct sk_buff *newskb; -+ struct sta_info *psta = NULL; -+ u8 chk_alive_num = 0; -+ char chk_alive_list[NUM_STA]; -+ u8 bc_addr[6]={0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -+ u8 null_addr[6]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+ -+ int i; -+ s32 res; -+ -+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ phead = &pstapriv->asoc_list; -+ plist = get_next(phead); -+ -+ //free sta asoc_queue -+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) { -+ int stainfo_offset; -+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); -+ plist = get_next(plist); -+ -+ stainfo_offset = rtw_stainfo_offset(pstapriv, psta); -+ if (stainfo_offset_valid(stainfo_offset)) { -+ chk_alive_list[chk_alive_num++] = stainfo_offset; -+ } -+ } -+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -+ -+ for (i = 0; i < chk_alive_num; i++) { -+ psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); -+ -+ /* avoid come from STA1 and send back STA1 */ -+ if (_rtw_memcmp(psta->hwaddr, &skb->data[6], 6) == _TRUE -+ || _rtw_memcmp(psta->hwaddr, null_addr, 6) == _TRUE -+ || _rtw_memcmp(psta->hwaddr, bc_addr, 6) == _TRUE -+ ) -+ continue; -+ -+ newskb = rtw_skb_copy(skb); -+ -+ if (newskb) { -+ _rtw_memcpy(newskb->data, psta->hwaddr, 6); -+ res = rtw_xmit(padapter, &newskb); -+ if (res < 0) { -+ DBG_871X("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__); -+ pxmitpriv->tx_drop++; -+ rtw_skb_free(newskb); -+ } else -+ pxmitpriv->tx_pkts++; -+ } else { -+ DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__); -+ pxmitpriv->tx_drop++; -+ //rtw_skb_free(skb); -+ return _FALSE; // Caller shall tx this multicast frame via normal way. -+ } -+ } -+ -+ rtw_skb_free(skb); -+ return _TRUE; -+} -+#endif // CONFIG_TX_MCAST2UNI -+ -+ -+int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) -+{ -+ _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); -+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -+#ifdef CONFIG_TX_MCAST2UNI -+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -+ extern int rtw_mc2u_disable; -+#endif // CONFIG_TX_MCAST2UNI -+ s32 res = 0; -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ u16 queue; -+#endif -+ -+_func_enter_; -+ -+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); -+ -+ if (rtw_if_up(padapter) == _FALSE) { -+ RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__); -+ #endif -+ goto drop_packet; -+ } -+ -+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) -+ queue = skb_get_queue_mapping(pkt); -+ /* No free space for Tx, tx_worker is too slow */ -+ if (pxmitpriv->hwxmits[queue].accnt > NR_XMITFRAME/2) { -+ //DBG_871X("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue); -+ netif_stop_subqueue(padapter->pnetdev, queue); -+ return NETDEV_TX_BUSY; -+ } -+#endif -+ -+#ifdef CONFIG_TX_MCAST2UNI -+ if ( !rtw_mc2u_disable -+ && check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE -+ && ( IP_MCAST_MAC(pkt->data) -+ || ICMPV6_MCAST_MAC(pkt->data) ) -+ && (padapter->registrypriv.wifi_spec == 0) -+ ) -+ { -+ if ( pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME/4) ) { -+ res = rtw_mlcst2unicst(padapter, pkt); -+ if (res == _TRUE) { -+ goto exit; -+ } -+ } else { -+ //DBG_871X("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt); -+ //DBG_871X("!m2u ); -+ } -+ } -+#endif // CONFIG_TX_MCAST2UNI -+ -+ res = rtw_xmit(padapter, &pkt); -+ if (res < 0) { -+ #ifdef DBG_TX_DROP_FRAME -+ DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__); -+ #endif -+ goto drop_packet; -+ } -+ -+ pxmitpriv->tx_pkts++; -+ RT_TRACE(_module_xmit_osdep_c_, _drv_info_, ("rtw_xmit_entry: tx_pkts=%d\n", (u32)pxmitpriv->tx_pkts)); -+ goto exit; -+ -+drop_packet: -+ pxmitpriv->tx_drop++; -+ rtw_skb_free(pkt); -+ RT_TRACE(_module_xmit_osdep_c_, _drv_notice_, ("rtw_xmit_entry: drop, tx_drop=%d\n", (u32)pxmitpriv->tx_drop)); -+ -+exit: -+ -+_func_exit_; -+ -+ return 0; -+} -+ -+int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) -+{ -+ if (pkt) -+ rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, pkt->truesize); -+ return _rtw_xmit_entry(pkt, pnetdev); -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c -@@ -0,0 +1,2300 @@ -+/****************************************************************************** -+ * -+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ ******************************************************************************/ -+ -+ -+#define _OSDEP_SERVICE_C_ -+ -+#include -+#include -+#include -+#include -+#ifdef PLATFORM_LINUX -+#include -+#endif -+#ifdef PLATFORM_FREEBSD -+#include -+#include -+#endif /* PLATFORM_FREEBSD */ -+#ifdef RTK_DMP_PLATFORM -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) -+#include -+#endif -+#endif -+ -+#define RT_TAG '1178' -+ -+#ifdef DBG_MEMORY_LEAK -+#ifdef PLATFORM_LINUX -+#include -+atomic_t _malloc_cnt = ATOMIC_INIT(0); -+atomic_t _malloc_size = ATOMIC_INIT(0); -+#endif -+#endif /* DBG_MEMORY_LEAK */ -+ -+ -+#if defined(PLATFORM_LINUX) -+/* -+* Translate the OS dependent @param error_code to OS independent RTW_STATUS_CODE -+* @return: one of RTW_STATUS_CODE -+*/ -+inline int RTW_STATUS_CODE(int error_code){ -+ if(error_code >=0) -+ return _SUCCESS; -+ -+ switch(error_code) { -+ //case -ETIMEDOUT: -+ // return RTW_STATUS_TIMEDOUT; -+ default: -+ return _FAIL; -+ } -+} -+#else -+inline int RTW_STATUS_CODE(int error_code){ -+ return error_code; -+} -+#endif -+ -+u32 rtw_atoi(u8* s) -+{ -+ -+ int num=0,flag=0; -+ int i; -+ for(i=0;i<=strlen(s);i++) -+ { -+ if(s[i] >= '0' && s[i] <= '9') -+ num = num * 10 + s[i] -'0'; -+ else if(s[0] == '-' && i==0) -+ flag =1; -+ else -+ break; -+ } -+ -+ if(flag == 1) -+ num = num * -1; -+ -+ return(num); -+ -+} -+ -+inline u8* _rtw_vmalloc(u32 sz) -+{ -+ u8 *pbuf; -+#ifdef PLATFORM_LINUX -+ pbuf = vmalloc(sz); -+#endif -+#ifdef PLATFORM_FREEBSD -+ pbuf = malloc(sz,M_DEVBUF,M_NOWAIT); -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ NdisAllocateMemoryWithTag(&pbuf,sz, RT_TAG); -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+#ifdef PLATFORM_LINUX -+ if ( pbuf != NULL) { -+ atomic_inc(&_malloc_cnt); -+ atomic_add(sz, &_malloc_size); -+ } -+#endif -+#endif /* DBG_MEMORY_LEAK */ -+ -+ return pbuf; -+} -+ -+inline u8* _rtw_zvmalloc(u32 sz) -+{ -+ u8 *pbuf; -+#ifdef PLATFORM_LINUX -+ pbuf = _rtw_vmalloc(sz); -+ if (pbuf != NULL) -+ memset(pbuf, 0, sz); -+#endif -+#ifdef PLATFORM_FREEBSD -+ pbuf = malloc(sz,M_DEVBUF,M_ZERO|M_NOWAIT); -+#endif -+#ifdef PLATFORM_WINDOWS -+ NdisAllocateMemoryWithTag(&pbuf,sz, RT_TAG); -+ if (pbuf != NULL) -+ NdisFillMemory(pbuf, sz, 0); -+#endif -+ -+ return pbuf; -+} -+ -+inline void _rtw_vmfree(u8 *pbuf, u32 sz) -+{ -+#ifdef PLATFORM_LINUX -+ vfree(pbuf); -+#endif -+#ifdef PLATFORM_FREEBSD -+ free(pbuf,M_DEVBUF); -+#endif -+#ifdef PLATFORM_WINDOWS -+ NdisFreeMemory(pbuf,sz, 0); -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+#ifdef PLATFORM_LINUX -+ atomic_dec(&_malloc_cnt); -+ atomic_sub(sz, &_malloc_size); -+#endif -+#endif /* DBG_MEMORY_LEAK */ -+} -+ -+u8* _rtw_malloc(u32 sz) -+{ -+ -+ u8 *pbuf=NULL; -+ -+#ifdef PLATFORM_LINUX -+#ifdef RTK_DMP_PLATFORM -+ if(sz > 0x4000) -+ pbuf = (u8 *)dvr_malloc(sz); -+ else -+#endif -+ pbuf = kmalloc(sz,in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ pbuf = malloc(sz,M_DEVBUF,M_NOWAIT); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisAllocateMemoryWithTag(&pbuf,sz, RT_TAG); -+ -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+#ifdef PLATFORM_LINUX -+ if ( pbuf != NULL) { -+ atomic_inc(&_malloc_cnt); -+ atomic_add(sz, &_malloc_size); -+ } -+#endif -+#endif /* DBG_MEMORY_LEAK */ -+ -+ return pbuf; -+ -+} -+ -+ -+u8* _rtw_zmalloc(u32 sz) -+{ -+#ifdef PLATFORM_FREEBSD -+ return malloc(sz,M_DEVBUF,M_ZERO|M_NOWAIT); -+#else // PLATFORM_FREEBSD -+ u8 *pbuf = _rtw_malloc(sz); -+ -+ if (pbuf != NULL) { -+ -+#ifdef PLATFORM_LINUX -+ memset(pbuf, 0, sz); -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ NdisFillMemory(pbuf, sz, 0); -+#endif -+ -+ } -+ -+ return pbuf; -+#endif // PLATFORM_FREEBSD -+} -+ -+void _rtw_mfree(u8 *pbuf, u32 sz) -+{ -+ -+#ifdef PLATFORM_LINUX -+#ifdef RTK_DMP_PLATFORM -+ if(sz > 0x4000) -+ dvr_free(pbuf); -+ else -+#endif -+ kfree(pbuf); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ free(pbuf,M_DEVBUF); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisFreeMemory(pbuf,sz, 0); -+ -+#endif -+ -+#ifdef DBG_MEMORY_LEAK -+#ifdef PLATFORM_LINUX -+ atomic_dec(&_malloc_cnt); -+ atomic_sub(sz, &_malloc_size); -+#endif -+#endif /* DBG_MEMORY_LEAK */ -+ -+} -+ -+#ifdef PLATFORM_FREEBSD -+//review again -+struct sk_buff * dev_alloc_skb(unsigned int size) -+{ -+ struct sk_buff *skb=NULL; -+ u8 *data=NULL; -+ -+ //skb = (struct sk_buff *)_rtw_zmalloc(sizeof(struct sk_buff)); // for skb->len, etc. -+ skb = (struct sk_buff *)_rtw_malloc(sizeof(struct sk_buff)); -+ if(!skb) -+ goto out; -+ data = _rtw_malloc(size); -+ if(!data) -+ goto nodata; -+ -+ skb->head = (unsigned char*)data; -+ skb->data = (unsigned char*)data; -+ skb->tail = (unsigned char*)data; -+ skb->end = (unsigned char*)data + size; -+ skb->len = 0; -+ //printf("%s()-%d: skb=%p, skb->head = %p\n", __FUNCTION__, __LINE__, skb, skb->head); -+ -+out: -+ return skb; -+nodata: -+ _rtw_mfree((u8 *)skb, sizeof(struct sk_buff)); -+ skb = NULL; -+goto out; -+ -+} -+ -+void dev_kfree_skb_any(struct sk_buff *skb) -+{ -+ //printf("%s()-%d: skb->head = %p\n", __FUNCTION__, __LINE__, skb->head); -+ if(skb->head) -+ _rtw_mfree(skb->head, 0); -+ //printf("%s()-%d: skb = %p\n", __FUNCTION__, __LINE__, skb); -+ if(skb) -+ _rtw_mfree((u8 *)skb, 0); -+} -+struct sk_buff *skb_clone(const struct sk_buff *skb) -+{ -+ return NULL; -+} -+ -+#endif /* PLATFORM_FREEBSD */ -+ -+inline struct sk_buff *_rtw_skb_alloc(u32 sz) -+{ -+#ifdef PLATFORM_LINUX -+ return __dev_alloc_skb(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -+#endif /* PLATFORM_LINUX */ -+ -+#ifdef PLATFORM_FREEBSD -+ return dev_alloc_skb(sz); -+#endif /* PLATFORM_FREEBSD */ -+} -+ -+inline void _rtw_skb_free(struct sk_buff *skb) -+{ -+ dev_kfree_skb_any(skb); -+} -+ -+inline struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb) -+{ -+#ifdef PLATFORM_LINUX -+ return skb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -+#endif /* PLATFORM_LINUX */ -+ -+#ifdef PLATFORM_FREEBSD -+ return NULL; -+#endif /* PLATFORM_FREEBSD */ -+} -+ -+inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb) -+{ -+#ifdef PLATFORM_LINUX -+ return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); -+#endif /* PLATFORM_LINUX */ -+ -+#ifdef PLATFORM_FREEBSD -+ return skb_clone(skb); -+#endif /* PLATFORM_FREEBSD */ -+} -+ -+inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb) -+{ -+#ifdef PLATFORM_LINUX -+ skb->dev = ndev; -+ return netif_rx(skb); -+#endif /* PLATFORM_LINUX */ -+ -+#ifdef PLATFORM_FREEBSD -+ return (*ndev->if_input)(ndev, skb); -+#endif /* PLATFORM_FREEBSD */ -+} -+ -+void _rtw_skb_queue_purge(struct sk_buff_head *list) -+{ -+ struct sk_buff *skb; -+ -+ while ((skb = skb_dequeue(list)) != NULL) -+ _rtw_skb_free(skb); -+} -+ -+#ifdef CONFIG_USB_HCI -+inline void *_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma) -+{ -+#ifdef PLATFORM_LINUX -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ return usb_alloc_coherent(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma); -+#else -+ return usb_buffer_alloc(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma); -+#endif -+#endif /* PLATFORM_LINUX */ -+ -+#ifdef PLATFORM_FREEBSD -+ return (malloc(size, M_USBDEV, M_NOWAIT | M_ZERO)); -+#endif /* PLATFORM_FREEBSD */ -+} -+inline void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma) -+{ -+#ifdef PLATFORM_LINUX -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ usb_free_coherent(dev, size, addr, dma); -+#else -+ usb_buffer_free(dev, size, addr, dma); -+#endif -+#endif /* PLATFORM_LINUX */ -+ -+#ifdef PLATFORM_FREEBSD -+ free(addr, M_USBDEV); -+#endif /* PLATFORM_FREEBSD */ -+} -+#endif /* CONFIG_USB_HCI */ -+ -+#ifdef DBG_MEM_ALLOC -+ -+struct rtw_mem_stat { -+ ATOMIC_T alloc; // the memory bytes we allocate currently -+ ATOMIC_T peak; // the peak memory bytes we allocate -+ ATOMIC_T alloc_cnt; // the alloc count for alloc currently -+ ATOMIC_T alloc_err_cnt; // the error times we fail to allocate memory -+}; -+ -+struct rtw_mem_stat rtw_mem_type_stat[mstat_tf_idx(MSTAT_TYPE_MAX)]; -+struct rtw_mem_stat rtw_mem_func_stat[mstat_ff_idx(MSTAT_FUNC_MAX)]; -+ -+char *MSTAT_TYPE_str[] = { -+ "VIR", -+ "PHY", -+ "SKB", -+ "USB", -+}; -+ -+char *MSTAT_FUNC_str[] = { -+ "UNSP", -+ "IO", -+ "TXIO", -+ "RXIO", -+ "TX", -+ "RX", -+}; -+ -+int _rtw_mstat_dump(char *buf, int len) -+{ -+ int cnt = 0; -+ int i; -+ int value_t[4][mstat_tf_idx(MSTAT_TYPE_MAX)]; -+ int value_f[4][mstat_ff_idx(MSTAT_FUNC_MAX)]; -+ -+ int vir_alloc, vir_peak, vir_alloc_err, phy_alloc, phy_peak, phy_alloc_err; -+ int tx_alloc, tx_peak, tx_alloc_err, rx_alloc, rx_peak, rx_alloc_err; -+ -+ for(i=0;i 5000) { -+ // rtw_mstat_dump(); -+ update_time=rtw_get_current_time(); -+ //} -+} -+ -+ -+ -+inline u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line) -+{ -+ u8 *p; -+ //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ p=_rtw_vmalloc((sz)); -+ -+ rtw_mstat_update( -+ flags -+ , p ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , sz -+ ); -+ -+ return p; -+} -+ -+inline u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line) -+{ -+ u8 *p; -+ //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ p=_rtw_zvmalloc((sz)); -+ -+ rtw_mstat_update( -+ flags -+ , p ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , sz -+ ); -+ -+ return p; -+} -+ -+inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line) -+{ -+ //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); -+ -+ _rtw_vmfree((pbuf), (sz)); -+ -+ rtw_mstat_update( -+ flags -+ , MSTAT_FREE -+ , sz -+ ); -+} -+ -+inline u8* dbg_rtw_malloc(u32 sz, const enum mstat_f flags, const char *func, const int line) -+{ -+ u8 *p; -+ -+ //if(sz>=153 && sz<=306) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ //if((sz)>4096) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ p=_rtw_malloc((sz)); -+ -+ rtw_mstat_update( -+ flags -+ , p ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , sz -+ ); -+ -+ return p; -+} -+ -+inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line) -+{ -+ u8 *p; -+ -+ //if(sz>=153 && sz<=306) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ //if((sz)>4096) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ p = _rtw_zmalloc((sz)); -+ -+ rtw_mstat_update( -+ flags -+ , p ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , sz -+ ); -+ -+ return p; -+} -+ -+inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line) -+{ -+ //if(sz>=153 && sz<=306) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); -+ -+ //if((sz)>4096) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); -+ -+ _rtw_mfree((pbuf), (sz)); -+ -+ rtw_mstat_update( -+ flags -+ , MSTAT_FREE -+ , sz -+ ); -+} -+ -+inline struct sk_buff * dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f flags, const char *func, int line) -+{ -+ struct sk_buff *skb; -+ unsigned int truesize = 0; -+ -+ skb = _rtw_skb_alloc(size); -+ -+ if(skb) -+ truesize = skb->truesize; -+ -+ if(!skb || truesize < size /*|| size > 4096*/) -+ DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize); -+ -+ rtw_mstat_update( -+ flags -+ , skb ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , truesize -+ ); -+ -+ return skb; -+} -+ -+inline void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, const char *func, int line) -+{ -+ unsigned int truesize = skb->truesize; -+ -+ //if(truesize > 4096) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); -+ -+ _rtw_skb_free(skb); -+ -+ rtw_mstat_update( -+ flags -+ , MSTAT_FREE -+ , truesize -+ ); -+} -+ -+inline struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line) -+{ -+ struct sk_buff *skb_cp; -+ unsigned int truesize = skb->truesize; -+ unsigned int cp_truesize = 0; -+ -+ skb_cp = _rtw_skb_copy(skb); -+ if(skb_cp) -+ cp_truesize = skb_cp->truesize; -+ -+ if(!skb_cp || cp_truesize != truesize /*||cp_truesize > 4096*/) -+ DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize); -+ -+ rtw_mstat_update( -+ flags -+ , skb_cp ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , truesize -+ ); -+ -+ return skb_cp; -+} -+ -+inline struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line) -+{ -+ struct sk_buff *skb_cl; -+ unsigned int truesize = skb->truesize; -+ unsigned int cl_truesize = 0; -+ -+ skb_cl = _rtw_skb_clone(skb); -+ if(skb_cl) -+ cl_truesize = skb_cl->truesize; -+ -+ if(!skb_cl || cl_truesize != truesize /*|| cl_truesize > 4096*/) -+ DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize); -+ -+ rtw_mstat_update( -+ flags -+ , skb_cl ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , truesize -+ ); -+ -+ return skb_cl; -+} -+ -+inline int dbg_rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line) -+{ -+ int ret; -+ unsigned int truesize = skb->truesize; -+ -+ //if(truesize > 4096) -+ // DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); -+ -+ ret = _rtw_netif_rx(ndev, skb); -+ -+ rtw_mstat_update( -+ flags -+ , MSTAT_FREE -+ , truesize -+ ); -+ -+ return ret; -+} -+ -+inline void dbg_rtw_skb_queue_purge(struct sk_buff_head *list, enum mstat_f flags, const char *func, int line) -+{ -+ struct sk_buff *skb; -+ -+ while ((skb = skb_dequeue(list)) != NULL) -+ dbg_rtw_skb_free(skb, flags, func, line); -+} -+ -+#ifdef CONFIG_USB_HCI -+inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma, const enum mstat_f flags, const char *func, int line) -+{ -+ void *p; -+ //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); -+ -+ p = _rtw_usb_buffer_alloc(dev, size, dma); -+ -+ rtw_mstat_update( -+ flags -+ , p ? MSTAT_ALLOC_SUCCESS : MSTAT_ALLOC_FAIL -+ , size -+ ); -+ -+ return p; -+} -+ -+inline void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma, const enum mstat_f flags, const char *func, int line) -+{ -+ //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); -+ -+ _rtw_usb_buffer_free(dev, size, addr, dma); -+ -+ rtw_mstat_update( -+ flags -+ , MSTAT_FREE -+ , size -+ ); -+} -+#endif /* CONFIG_USB_HCI */ -+#endif /* DBG_MEM_ALLOC */ -+ -+void* rtw_malloc2d(int h, int w, int size) -+{ -+ int j; -+ -+ void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size ); -+ if(a == NULL) -+ { -+ DBG_871X("%s: alloc memory fail!\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ for( j=0; jprev = pnew; -+ pnew->next = pnext; -+ pnew->prev = pprev; -+ pprev->next = pnew; -+} -+#endif /* PLATFORM_FREEBSD */ -+ -+void _rtw_init_listhead(_list *list) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ INIT_LIST_HEAD(list); -+ -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+ list->next = list; -+ list->prev = list; -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisInitializeListHead(list); -+ -+#endif -+ -+} -+ -+ -+/* -+For the following list_xxx operations, -+caller must guarantee the atomic context. -+Otherwise, there will be racing condition. -+*/ -+u32 rtw_is_list_empty(_list *phead) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ if (list_empty(phead)) -+ return _TRUE; -+ else -+ return _FALSE; -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ -+ if (phead->next == phead) -+ return _TRUE; -+ else -+ return _FALSE; -+ -+#endif -+ -+ -+#ifdef PLATFORM_WINDOWS -+ -+ if (IsListEmpty(phead)) -+ return _TRUE; -+ else -+ return _FALSE; -+ -+#endif -+ -+ -+} -+ -+void rtw_list_insert_head(_list *plist, _list *phead) -+{ -+ -+#ifdef PLATFORM_LINUX -+ list_add(plist, phead); -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+ __list_add(plist, phead, phead->next); -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ InsertHeadList(phead, plist); -+#endif -+} -+ -+void rtw_list_insert_tail(_list *plist, _list *phead) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ list_add_tail(plist, phead); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ -+ __list_add(plist, phead->prev, phead); -+ -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ InsertTailList(phead, plist); -+ -+#endif -+ -+} -+ -+ -+/* -+ -+Caller must check if the list is empty before calling rtw_list_delete -+ -+*/ -+ -+ -+void _rtw_init_sema(_sema *sema, int init_val) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ sema_init(sema, init_val); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ sema_init(sema, init_val, "rtw_drv"); -+#endif -+#ifdef PLATFORM_OS_XP -+ -+ KeInitializeSemaphore(sema, init_val, SEMA_UPBND); // count=0; -+ -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ if(*sema == NULL) -+ *sema = CreateSemaphore(NULL, init_val, SEMA_UPBND, NULL); -+#endif -+ -+} -+ -+void _rtw_free_sema(_sema *sema) -+{ -+#ifdef PLATFORM_FREEBSD -+ sema_destroy(sema); -+#endif -+#ifdef PLATFORM_OS_CE -+ CloseHandle(*sema); -+#endif -+ -+} -+ -+void _rtw_up_sema(_sema *sema) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ up(sema); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ sema_post(sema); -+#endif -+#ifdef PLATFORM_OS_XP -+ -+ KeReleaseSemaphore(sema, IO_NETWORK_INCREMENT, 1, FALSE ); -+ -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ ReleaseSemaphore(*sema, 1, NULL ); -+#endif -+} -+ -+u32 _rtw_down_sema(_sema *sema) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ if (down_interruptible(sema)) -+ return _FAIL; -+ else -+ return _SUCCESS; -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ sema_wait(sema); -+ return _SUCCESS; -+#endif -+#ifdef PLATFORM_OS_XP -+ -+ if(STATUS_SUCCESS == KeWaitForSingleObject(sema, Executive, KernelMode, TRUE, NULL)) -+ return _SUCCESS; -+ else -+ return _FAIL; -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ if(WAIT_OBJECT_0 == WaitForSingleObject(*sema, INFINITE )) -+ return _SUCCESS; -+ else -+ return _FAIL; -+#endif -+} -+ -+ -+ -+void _rtw_mutex_init(_mutex *pmutex) -+{ -+#ifdef PLATFORM_LINUX -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ mutex_init(pmutex); -+#else -+ init_MUTEX(pmutex); -+#endif -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ mtx_init(pmutex, "", NULL, MTX_DEF|MTX_RECURSE); -+#endif -+#ifdef PLATFORM_OS_XP -+ -+ KeInitializeMutex(pmutex, 0); -+ -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ *pmutex = CreateMutex( NULL, _FALSE, NULL); -+#endif -+} -+ -+void _rtw_mutex_free(_mutex *pmutex); -+void _rtw_mutex_free(_mutex *pmutex) -+{ -+#ifdef PLATFORM_LINUX -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -+ mutex_destroy(pmutex); -+#else -+#endif -+ -+#ifdef PLATFORM_FREEBSD -+ sema_destroy(pmutex); -+#endif -+ -+#endif -+ -+#ifdef PLATFORM_OS_XP -+ -+#endif -+ -+#ifdef PLATFORM_OS_CE -+ -+#endif -+} -+ -+void _rtw_spinlock_init(_lock *plock) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ spin_lock_init(plock); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ mtx_init(plock, "", NULL, MTX_DEF|MTX_RECURSE); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisAllocateSpinLock(plock); -+ -+#endif -+ -+} -+ -+void _rtw_spinlock_free(_lock *plock) -+{ -+#ifdef PLATFORM_FREEBSD -+ mtx_destroy(plock); -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+ NdisFreeSpinLock(plock); -+ -+#endif -+ -+} -+#ifdef PLATFORM_FREEBSD -+extern PADAPTER prtw_lock; -+ -+void rtw_mtx_lock(_lock *plock){ -+ if(prtw_lock){ -+ mtx_lock(&prtw_lock->glock); -+ } -+ else{ -+ printf("%s prtw_lock==NULL",__FUNCTION__); -+ } -+} -+void rtw_mtx_unlock(_lock *plock){ -+ if(prtw_lock){ -+ mtx_unlock(&prtw_lock->glock); -+ } -+ else{ -+ printf("%s prtw_lock==NULL",__FUNCTION__); -+ } -+ -+} -+#endif //PLATFORM_FREEBSD -+ -+ -+void _rtw_spinlock(_lock *plock) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ spin_lock(plock); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ mtx_lock(plock); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisAcquireSpinLock(plock); -+ -+#endif -+ -+} -+ -+void _rtw_spinunlock(_lock *plock) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ spin_unlock(plock); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ mtx_unlock(plock); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisReleaseSpinLock(plock); -+ -+#endif -+} -+ -+ -+void _rtw_spinlock_ex(_lock *plock) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ spin_lock(plock); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ mtx_lock(plock); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisDprAcquireSpinLock(plock); -+ -+#endif -+ -+} -+ -+void _rtw_spinunlock_ex(_lock *plock) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ spin_unlock(plock); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ mtx_unlock(plock); -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisDprReleaseSpinLock(plock); -+ -+#endif -+} -+ -+ -+ -+void _rtw_init_queue(_queue *pqueue) -+{ -+ -+ _rtw_init_listhead(&(pqueue->queue)); -+ -+ _rtw_spinlock_init(&(pqueue->lock)); -+ -+} -+ -+u32 _rtw_queue_empty(_queue *pqueue) -+{ -+ return (rtw_is_list_empty(&(pqueue->queue))); -+} -+ -+ -+u32 rtw_end_of_queue_search(_list *head, _list *plist) -+{ -+ if (head == plist) -+ return _TRUE; -+ else -+ return _FALSE; -+} -+ -+ -+u32 rtw_get_current_time(void) -+{ -+ -+#ifdef PLATFORM_LINUX -+ return jiffies; -+#endif -+#ifdef PLATFORM_FREEBSD -+ struct timeval tvp; -+ getmicrotime(&tvp); -+ return tvp.tv_sec; -+#endif -+#ifdef PLATFORM_WINDOWS -+ LARGE_INTEGER SystemTime; -+ NdisGetCurrentSystemTime(&SystemTime); -+ return (u32)(SystemTime.LowPart);// count of 100-nanosecond intervals -+#endif -+} -+ -+inline u32 rtw_systime_to_ms(u32 systime) -+{ -+#ifdef PLATFORM_LINUX -+ return systime * 1000 / HZ; -+#endif -+#ifdef PLATFORM_FREEBSD -+ return systime * 1000; -+#endif -+#ifdef PLATFORM_WINDOWS -+ return systime / 10000 ; -+#endif -+} -+ -+inline u32 rtw_ms_to_systime(u32 ms) -+{ -+#ifdef PLATFORM_LINUX -+ return ms * HZ / 1000; -+#endif -+#ifdef PLATFORM_FREEBSD -+ return ms /1000; -+#endif -+#ifdef PLATFORM_WINDOWS -+ return ms * 10000 ; -+#endif -+} -+ -+// the input parameter start use the same unit as returned by rtw_get_current_time -+inline s32 rtw_get_passing_time_ms(u32 start) -+{ -+#ifdef PLATFORM_LINUX -+ return rtw_systime_to_ms(jiffies-start); -+#endif -+#ifdef PLATFORM_FREEBSD -+ return rtw_systime_to_ms(rtw_get_current_time()); -+#endif -+#ifdef PLATFORM_WINDOWS -+ LARGE_INTEGER SystemTime; -+ NdisGetCurrentSystemTime(&SystemTime); -+ return rtw_systime_to_ms((u32)(SystemTime.LowPart) - start) ; -+#endif -+} -+ -+inline s32 rtw_get_time_interval_ms(u32 start, u32 end) -+{ -+#ifdef PLATFORM_LINUX -+ return rtw_systime_to_ms(end-start); -+#endif -+#ifdef PLATFORM_FREEBSD -+ return rtw_systime_to_ms(rtw_get_current_time()); -+#endif -+#ifdef PLATFORM_WINDOWS -+ return rtw_systime_to_ms(end-start); -+#endif -+} -+ -+ -+void rtw_sleep_schedulable(int ms) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ u32 delta; -+ -+ delta = (ms * HZ)/1000;//(ms) -+ if (delta == 0) { -+ delta = 1;// 1 ms -+ } -+ set_current_state(TASK_INTERRUPTIBLE); -+ if (schedule_timeout(delta) != 0) { -+ return ; -+ } -+ return; -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ DELAY(ms*1000); -+ return ; -+#endif -+ -+#ifdef PLATFORM_WINDOWS -+ -+ NdisMSleep(ms*1000); //(us)*1000=(ms) -+ -+#endif -+ -+} -+ -+ -+void rtw_msleep_os(int ms) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ msleep((unsigned int)ms); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ //Delay for delay microseconds -+ DELAY(ms*1000); -+ return ; -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisMSleep(ms*1000); //(us)*1000=(ms) -+ -+#endif -+ -+ -+} -+void rtw_usleep_os(int us) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ // msleep((unsigned int)us); -+ if ( 1 < (us/1000) ) -+ msleep(1); -+ else -+ msleep( (us/1000) + 1); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ //Delay for delay microseconds -+ DELAY(us); -+ -+ return ; -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisMSleep(us); //(us) -+ -+#endif -+ -+ -+} -+ -+ -+#ifdef DBG_DELAY_OS -+void _rtw_mdelay_os(int ms, const char *func, const int line) -+{ -+ #if 0 -+ if(ms>10) -+ DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); -+ rtw_msleep_os(ms); -+ return; -+ #endif -+ -+ -+ DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); -+ -+#if defined(PLATFORM_LINUX) -+ -+ mdelay((unsigned long)ms); -+ -+#elif defined(PLATFORM_WINDOWS) -+ -+ NdisStallExecution(ms*1000); //(us)*1000=(ms) -+ -+#endif -+ -+ -+} -+void _rtw_udelay_os(int us, const char *func, const int line) -+{ -+ -+ #if 0 -+ if(us > 1000) { -+ DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); -+ rtw_usleep_os(us); -+ return; -+ } -+ #endif -+ -+ -+ DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); -+ -+ -+#if defined(PLATFORM_LINUX) -+ -+ udelay((unsigned long)us); -+ -+#elif defined(PLATFORM_WINDOWS) -+ -+ NdisStallExecution(us); //(us) -+ -+#endif -+ -+} -+#else -+void rtw_mdelay_os(int ms) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ mdelay((unsigned long)ms); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ DELAY(ms*1000); -+ return ; -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisStallExecution(ms*1000); //(us)*1000=(ms) -+ -+#endif -+ -+ -+} -+void rtw_udelay_os(int us) -+{ -+ -+#ifdef PLATFORM_LINUX -+ -+ udelay((unsigned long)us); -+ -+#endif -+#ifdef PLATFORM_FREEBSD -+ //Delay for delay microseconds -+ DELAY(us); -+ return ; -+#endif -+#ifdef PLATFORM_WINDOWS -+ -+ NdisStallExecution(us); //(us) -+ -+#endif -+ -+} -+#endif -+ -+void rtw_yield_os() -+{ -+#ifdef PLATFORM_LINUX -+ yield(); -+#endif -+#ifdef PLATFORM_FREEBSD -+ yield(); -+#endif -+#ifdef PLATFORM_WINDOWS -+ SwitchToThread(); -+#endif -+} -+ -+#define RTW_SUSPEND_LOCK_NAME "rtw_wifi" -+ -+#ifdef CONFIG_WAKELOCK -+static struct wake_lock rtw_suspend_lock; -+#elif defined(CONFIG_ANDROID_POWER) -+static android_suspend_lock_t rtw_suspend_lock ={ -+ .name = RTW_SUSPEND_LOCK_NAME -+}; -+#endif -+ -+inline void rtw_suspend_lock_init() -+{ -+ #ifdef CONFIG_WAKELOCK -+ wake_lock_init(&rtw_suspend_lock, WAKE_LOCK_SUSPEND, RTW_SUSPEND_LOCK_NAME); -+ #elif defined(CONFIG_ANDROID_POWER) -+ android_init_suspend_lock(&rtw_suspend_lock); -+ #endif -+} -+ -+inline void rtw_suspend_lock_uninit() -+{ -+ #ifdef CONFIG_WAKELOCK -+ wake_lock_destroy(&rtw_suspend_lock); -+ #elif defined(CONFIG_ANDROID_POWER) -+ android_uninit_suspend_lock(&rtw_suspend_lock); -+ #endif -+} -+ -+inline void rtw_lock_suspend() -+{ -+ #ifdef CONFIG_WAKELOCK -+ wake_lock(&rtw_suspend_lock); -+ #elif defined(CONFIG_ANDROID_POWER) -+ android_lock_suspend(&rtw_suspend_lock); -+ #endif -+} -+ -+inline void rtw_unlock_suspend() -+{ -+ #ifdef CONFIG_WAKELOCK -+ wake_unlock(&rtw_suspend_lock); -+ #elif defined(CONFIG_ANDROID_POWER) -+ android_unlock_suspend(&rtw_suspend_lock); -+ #endif -+} -+ -+inline void rtw_lock_suspend_timeout(u32 timeout_ms) -+{ -+ #ifdef CONFIG_WAKELOCK -+ wake_lock_timeout(&rtw_suspend_lock, rtw_ms_to_systime(timeout_ms)); -+ #elif defined(CONFIG_ANDROID_POWER) -+ android_lock_suspend_auto_expire(&rtw_suspend_lock, rtw_ms_to_systime(timeout_ms)); -+ #endif -+} -+ -+inline void ATOMIC_SET(ATOMIC_T *v, int i) -+{ -+ #ifdef PLATFORM_LINUX -+ atomic_set(v,i); -+ #elif defined(PLATFORM_WINDOWS) -+ *v=i;// other choice???? -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_set_int(v,i); -+ #endif -+} -+ -+inline int ATOMIC_READ(ATOMIC_T *v) -+{ -+ #ifdef PLATFORM_LINUX -+ return atomic_read(v); -+ #elif defined(PLATFORM_WINDOWS) -+ return *v; // other choice???? -+ #elif defined(PLATFORM_FREEBSD) -+ return atomic_load_acq_32(v); -+ #endif -+} -+ -+inline void ATOMIC_ADD(ATOMIC_T *v, int i) -+{ -+ #ifdef PLATFORM_LINUX -+ atomic_add(i,v); -+ #elif defined(PLATFORM_WINDOWS) -+ InterlockedAdd(v,i); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_add_int(v,i); -+ #endif -+} -+inline void ATOMIC_SUB(ATOMIC_T *v, int i) -+{ -+ #ifdef PLATFORM_LINUX -+ atomic_sub(i,v); -+ #elif defined(PLATFORM_WINDOWS) -+ InterlockedAdd(v,-i); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_subtract_int(v,i); -+ #endif -+} -+ -+inline void ATOMIC_INC(ATOMIC_T *v) -+{ -+ #ifdef PLATFORM_LINUX -+ atomic_inc(v); -+ #elif defined(PLATFORM_WINDOWS) -+ InterlockedIncrement(v); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_add_int(v,1); -+ #endif -+} -+ -+inline void ATOMIC_DEC(ATOMIC_T *v) -+{ -+ #ifdef PLATFORM_LINUX -+ atomic_dec(v); -+ #elif defined(PLATFORM_WINDOWS) -+ InterlockedDecrement(v); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_subtract_int(v,1); -+ #endif -+} -+ -+inline int ATOMIC_ADD_RETURN(ATOMIC_T *v, int i) -+{ -+ #ifdef PLATFORM_LINUX -+ return atomic_add_return(i,v); -+ #elif defined(PLATFORM_WINDOWS) -+ return InterlockedAdd(v,i); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_add_int(v,i); -+ return atomic_load_acq_32(v); -+ #endif -+} -+ -+inline int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i) -+{ -+ #ifdef PLATFORM_LINUX -+ return atomic_sub_return(i,v); -+ #elif defined(PLATFORM_WINDOWS) -+ return InterlockedAdd(v,-i); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_subtract_int(v,i); -+ return atomic_load_acq_32(v); -+ #endif -+} -+ -+inline int ATOMIC_INC_RETURN(ATOMIC_T *v) -+{ -+ #ifdef PLATFORM_LINUX -+ return atomic_inc_return(v); -+ #elif defined(PLATFORM_WINDOWS) -+ return InterlockedIncrement(v); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_add_int(v,1); -+ return atomic_load_acq_32(v); -+ #endif -+} -+ -+inline int ATOMIC_DEC_RETURN(ATOMIC_T *v) -+{ -+ #ifdef PLATFORM_LINUX -+ return atomic_dec_return(v); -+ #elif defined(PLATFORM_WINDOWS) -+ return InterlockedDecrement(v); -+ #elif defined(PLATFORM_FREEBSD) -+ atomic_subtract_int(v,1); -+ return atomic_load_acq_32(v); -+ #endif -+} -+ -+ -+#ifdef PLATFORM_LINUX -+/* -+* Open a file with the specific @param path, @param flag, @param mode -+* @param fpp the pointer of struct file pointer to get struct file pointer while file opening is success -+* @param path the path of the file to open -+* @param flag file operation flags, please refer to linux document -+* @param mode please refer to linux document -+* @return Linux specific error code -+*/ -+static int openFile(struct file **fpp, char *path, int flag, int mode) -+{ -+ struct file *fp; -+ -+ fp=filp_open(path, flag, mode); -+ if(IS_ERR(fp)) { -+ *fpp=NULL; -+ return PTR_ERR(fp); -+ } -+ else { -+ *fpp=fp; -+ return 0; -+ } -+} -+ -+/* -+* Close the file with the specific @param fp -+* @param fp the pointer of struct file to close -+* @return always 0 -+*/ -+static int closeFile(struct file *fp) -+{ -+ filp_close(fp,NULL); -+ return 0; -+} -+ -+static int readFile(struct file *fp,char *buf,int len) -+{ -+ int rlen=0, sum=0; -+ -+ if (!fp->f_op || !fp->f_op->read) -+ return -EPERM; -+ -+ while(sumf_op->read(fp,buf+sum,len-sum, &fp->f_pos); -+ if(rlen>0) -+ sum+=rlen; -+ else if(0 != rlen) -+ return rlen; -+ else -+ break; -+ } -+ -+ return sum; -+ -+} -+ -+static int writeFile(struct file *fp,char *buf,int len) -+{ -+ int wlen=0, sum=0; -+ -+ if (!fp->f_op || !fp->f_op->write) -+ return -EPERM; -+ -+ while(sumf_op->write(fp,buf+sum,len-sum, &fp->f_pos); -+ if(wlen>0) -+ sum+=wlen; -+ else if(0 != wlen) -+ return wlen; -+ else -+ break; -+ } -+ -+ return sum; -+ -+} -+ -+/* -+* Test if the specifi @param path is a file and readable -+* @param path the path of the file to test -+* @return Linux specific error code -+*/ -+static int isFileReadable(char *path) -+{ -+ struct file *fp; -+ int ret = 0; -+ mm_segment_t oldfs; -+ char buf; -+ -+ fp=filp_open(path, O_RDONLY, 0); -+ if(IS_ERR(fp)) { -+ ret = PTR_ERR(fp); -+ } -+ else { -+ oldfs = get_fs(); set_fs(get_ds()); -+ -+ if(1!=readFile(fp, &buf, 1)) -+ ret = PTR_ERR(fp); -+ -+ set_fs(oldfs); -+ filp_close(fp,NULL); -+ } -+ return ret; -+} -+ -+/* -+* Open the file with @param path and retrive the file content into memory starting from @param buf for @param sz at most -+* @param path the path of the file to open and read -+* @param buf the starting address of the buffer to store file content -+* @param sz how many bytes to read at most -+* @return the byte we've read, or Linux specific error code -+*/ -+static int retriveFromFile(char *path, u8* buf, u32 sz) -+{ -+ int ret =-1; -+ mm_segment_t oldfs; -+ struct file *fp; -+ -+ if(path && buf) { -+ if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){ -+ DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); -+ -+ oldfs = get_fs(); set_fs(get_ds()); -+ ret=readFile(fp, buf, sz); -+ set_fs(oldfs); -+ closeFile(fp); -+ -+ DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret); -+ -+ } else { -+ DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret); -+ } -+ } else { -+ DBG_871X("%s NULL pointer\n",__FUNCTION__); -+ ret = -EINVAL; -+ } -+ return ret; -+} -+ -+/* -+* Open the file with @param path and wirte @param sz byte of data starting from @param buf into the file -+* @param path the path of the file to open and write -+* @param buf the starting address of the data to write into file -+* @param sz how many bytes to write at most -+* @return the byte we've written, or Linux specific error code -+*/ -+static int storeToFile(char *path, u8* buf, u32 sz) -+{ -+ int ret =0; -+ mm_segment_t oldfs; -+ struct file *fp; -+ -+ if(path && buf) { -+ if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { -+ DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); -+ -+ oldfs = get_fs(); set_fs(get_ds()); -+ ret=writeFile(fp, buf, sz); -+ set_fs(oldfs); -+ closeFile(fp); -+ -+ DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret); -+ -+ } else { -+ DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret); -+ } -+ } else { -+ DBG_871X("%s NULL pointer\n",__FUNCTION__); -+ ret = -EINVAL; -+ } -+ return ret; -+} -+#endif //PLATFORM_LINUX -+ -+/* -+* Test if the specifi @param path is a file and readable -+* @param path the path of the file to test -+* @return _TRUE or _FALSE -+*/ -+int rtw_is_file_readable(char *path) -+{ -+#ifdef PLATFORM_LINUX -+ if(isFileReadable(path) == 0) -+ return _TRUE; -+ else -+ return _FALSE; -+#else -+ //Todo... -+ return _FALSE; -+#endif -+} -+ -+/* -+* Open the file with @param path and retrive the file content into memory starting from @param buf for @param sz at most -+* @param path the path of the file to open and read -+* @param buf the starting address of the buffer to store file content -+* @param sz how many bytes to read at most -+* @return the byte we've read -+*/ -+int rtw_retrive_from_file(char *path, u8* buf, u32 sz) -+{ -+#ifdef PLATFORM_LINUX -+ int ret =retriveFromFile(path, buf, sz); -+ return ret>=0?ret:0; -+#else -+ //Todo... -+ return 0; -+#endif -+} -+ -+/* -+* Open the file with @param path and wirte @param sz byte of data starting from @param buf into the file -+* @param path the path of the file to open and write -+* @param buf the starting address of the data to write into file -+* @param sz how many bytes to write at most -+* @return the byte we've written -+*/ -+int rtw_store_to_file(char *path, u8* buf, u32 sz) -+{ -+#ifdef PLATFORM_LINUX -+ int ret =storeToFile(path, buf, sz); -+ return ret>=0?ret:0; -+#else -+ //Todo... -+ return 0; -+#endif -+} -+ -+#if 1 //#ifdef MEM_ALLOC_REFINE_ADAPTOR -+#ifdef PLATFORM_LINUX -+struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_priv) -+{ -+ struct net_device *pnetdev; -+ struct rtw_netdev_priv_indicator *pnpi; -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ pnetdev = alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4); -+#else -+ pnetdev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator)); -+#endif -+ if (!pnetdev) -+ goto RETURN; -+ -+ pnpi = netdev_priv(pnetdev); -+ pnpi->priv=old_priv; -+ pnpi->sizeof_priv=sizeof_priv; -+ -+RETURN: -+ return pnetdev; -+} -+ -+struct net_device *rtw_alloc_etherdev(int sizeof_priv) -+{ -+ struct net_device *pnetdev; -+ struct rtw_netdev_priv_indicator *pnpi; -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) -+ pnetdev = alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4); -+#else -+ pnetdev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator)); -+#endif -+ if (!pnetdev) -+ goto RETURN; -+ -+ pnpi = netdev_priv(pnetdev); -+ -+ pnpi->priv = rtw_zvmalloc(sizeof_priv); -+ if (!pnpi->priv) { -+ free_netdev(pnetdev); -+ pnetdev = NULL; -+ goto RETURN; -+ } -+ -+ pnpi->sizeof_priv=sizeof_priv; -+RETURN: -+ return pnetdev; -+} -+ -+void rtw_free_netdev(struct net_device * netdev) -+{ -+ struct rtw_netdev_priv_indicator *pnpi; -+ -+ if(!netdev) -+ goto RETURN; -+ -+ pnpi = netdev_priv(netdev); -+ -+ if(!pnpi->priv) -+ goto RETURN; -+ -+ rtw_vmfree(pnpi->priv, pnpi->sizeof_priv); -+ free_netdev(netdev); -+ -+RETURN: -+ return; -+} -+ -+/* -+* Jeff: this function should be called under ioctl (rtnl_lock is accquired) while -+* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) -+*/ -+int rtw_change_ifname(_adapter *padapter, const char *ifname) -+{ -+ struct net_device *pnetdev; -+ struct net_device *cur_pnetdev = padapter->pnetdev; -+ struct rereg_nd_name_data *rereg_priv; -+ int ret; -+ -+ if(!padapter) -+ goto error; -+ -+ rereg_priv = &padapter->rereg_nd_name_priv; -+ -+ //free the old_pnetdev -+ if(rereg_priv->old_pnetdev) { -+ free_netdev(rereg_priv->old_pnetdev); -+ rereg_priv->old_pnetdev = NULL; -+ } -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) -+ if(!rtnl_is_locked()) -+ unregister_netdev(cur_pnetdev); -+ else -+#endif -+ unregister_netdevice(cur_pnetdev); -+ -+ rtw_proc_remove_one(cur_pnetdev); -+ -+ rereg_priv->old_pnetdev=cur_pnetdev; -+ -+ pnetdev = rtw_init_netdev(padapter); -+ if (!pnetdev) { -+ ret = -1; -+ goto error; -+ } -+ -+ SET_NETDEV_DEV(pnetdev, dvobj_to_dev(adapter_to_dvobj(padapter))); -+ -+ rtw_init_netdev_name(pnetdev, ifname); -+ -+ _rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) -+ if(!rtnl_is_locked()) -+ ret = register_netdev(pnetdev); -+ else -+#endif -+ ret = register_netdevice(pnetdev); -+ -+ if ( ret != 0) { -+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,("register_netdev() failed\n")); -+ goto error; -+ } -+ -+ rtw_proc_init_one(pnetdev); -+ -+ return 0; -+ -+error: -+ -+ return -1; -+ -+} -+#endif -+#endif //MEM_ALLOC_REFINE_ADAPTOR -+ -+#ifdef PLATFORM_FREEBSD -+/* -+ * Copy a buffer from userspace and write into kernel address -+ * space. -+ * -+ * This emulation just calls the FreeBSD copyin function (to -+ * copy data from user space buffer into a kernel space buffer) -+ * and is designed to be used with the above io_write_wrapper. -+ * -+ * This function should return the number of bytes not copied. -+ * I.e. success results in a zero value. -+ * Negative error values are not returned. -+ */ -+unsigned long -+copy_from_user(void *to, const void *from, unsigned long n) -+{ -+ if ( copyin(from, to, n) != 0 ) { -+ /* Any errors will be treated as a failure -+ to copy any of the requested bytes */ -+ return n; -+ } -+ -+ return 0; -+} -+ -+unsigned long -+copy_to_user(void *to, const void *from, unsigned long n) -+{ -+ if ( copyout(from, to, n) != 0 ) { -+ /* Any errors will be treated as a failure -+ to copy any of the requested bytes */ -+ return n; -+ } -+ -+ return 0; -+} -+ -+ -+/* -+ * The usb_register and usb_deregister functions are used to register -+ * usb drivers with the usb subsystem. In this compatibility layer -+ * emulation a list of drivers (struct usb_driver) is maintained -+ * and is used for probing/attaching etc. -+ * -+ * usb_register and usb_deregister simply call these functions. -+ */ -+int -+usb_register(struct usb_driver *driver) -+{ -+ rtw_usb_linux_register(driver); -+ return 0; -+} -+ -+ -+int -+usb_deregister(struct usb_driver *driver) -+{ -+ rtw_usb_linux_deregister(driver); -+ return 0; -+} -+ -+void module_init_exit_wrapper(void *arg) -+{ -+ int (*func)(void) = arg; -+ func(); -+ return; -+} -+ -+#endif //PLATFORM_FREEBSD -+u64 rtw_modular64(u64 x, u64 y) -+{ -+#ifdef PLATFORM_LINUX -+ return do_div(x, y); -+#elif defined(PLATFORM_WINDOWS) -+ return (x % y); -+#elif defined(PLATFORM_FREEBSD) -+ return (x %y); -+#endif -+} -+ -+u64 rtw_division64(u64 x, u64 y) -+{ -+#ifdef PLATFORM_LINUX -+ do_div(x, y); -+ return x; -+#elif defined(PLATFORM_WINDOWS) -+ return (x / y); -+#elif defined(PLATFORM_FREEBSD) -+ return (x / y); -+#endif -+} -+ -+void rtw_buf_free(u8 **buf, u32 *buf_len) -+{ -+ u32 ori_len; -+ -+ if (!buf || !buf_len) -+ return; -+ -+ ori_len = *buf_len; -+ -+ if (*buf) { -+ u32 tmp_buf_len = *buf_len; -+ *buf_len = 0; -+ rtw_mfree(*buf, tmp_buf_len); -+ *buf = NULL; -+ } -+} -+ -+void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len) -+{ -+ u32 ori_len = 0, dup_len = 0; -+ u8 *ori = NULL; -+ u8 *dup = NULL; -+ -+ if (!buf || !buf_len) -+ return; -+ -+ if (!src || !src_len) -+ goto keep_ori; -+ -+ /* duplicate src */ -+ dup = rtw_malloc(src_len); -+ if (dup) { -+ dup_len = src_len; -+ _rtw_memcpy(dup, src, dup_len); -+ } -+ -+keep_ori: -+ ori = *buf; -+ ori_len = *buf_len; -+ -+ /* replace buf with dup */ -+ *buf_len = 0; -+ *buf = dup; -+ *buf_len = dup_len; -+ -+ /* free ori */ -+ if (ori && ori_len > 0) -+ rtw_mfree(ori, ori_len); -+} -+ -+ -+/** -+ * rtw_cbuf_full - test if cbuf is full -+ * @cbuf: pointer of struct rtw_cbuf -+ * -+ * Returns: _TRUE if cbuf is full -+ */ -+inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf) -+{ -+ return (cbuf->write == cbuf->read-1)? _TRUE : _FALSE; -+} -+ -+/** -+ * rtw_cbuf_empty - test if cbuf is empty -+ * @cbuf: pointer of struct rtw_cbuf -+ * -+ * Returns: _TRUE if cbuf is empty -+ */ -+inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf) -+{ -+ return (cbuf->write == cbuf->read)? _TRUE : _FALSE; -+} -+ -+/** -+ * rtw_cbuf_push - push a pointer into cbuf -+ * @cbuf: pointer of struct rtw_cbuf -+ * @buf: pointer to push in -+ * -+ * Lock free operation, be careful of the use scheme -+ * Returns: _TRUE push success -+ */ -+bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf) -+{ -+ if (rtw_cbuf_full(cbuf)) -+ return _FAIL; -+ -+ if (0) -+ DBG_871X("%s on %u\n", __func__, cbuf->write); -+ cbuf->bufs[cbuf->write] = buf; -+ cbuf->write = (cbuf->write+1)%cbuf->size; -+ -+ return _SUCCESS; -+} -+ -+/** -+ * rtw_cbuf_pop - pop a pointer from cbuf -+ * @cbuf: pointer of struct rtw_cbuf -+ * -+ * Lock free operation, be careful of the use scheme -+ * Returns: pointer popped out -+ */ -+void *rtw_cbuf_pop(struct rtw_cbuf *cbuf) -+{ -+ void *buf; -+ if (rtw_cbuf_empty(cbuf)) -+ return NULL; -+ -+ if (0) -+ DBG_871X("%s on %u\n", __func__, cbuf->read); -+ buf = cbuf->bufs[cbuf->read]; -+ cbuf->read = (cbuf->read+1)%cbuf->size; -+ -+ return buf; -+} -+ -+/** -+ * rtw_cbuf_alloc - allocte a rtw_cbuf with given size and do initialization -+ * @size: size of pointer -+ * -+ * Returns: pointer of srtuct rtw_cbuf, NULL for allocation failure -+ */ -+struct rtw_cbuf *rtw_cbuf_alloc(u32 size) -+{ -+ struct rtw_cbuf *cbuf; -+ -+ cbuf = (struct rtw_cbuf *)rtw_malloc(sizeof(*cbuf) + sizeof(void*)*size); -+ -+ if (cbuf) { -+ cbuf->write = cbuf->read = 0; -+ cbuf->size = size; -+ } -+ -+ return cbuf; -+} -+ -+/** -+ * rtw_cbuf_free - free the given rtw_cbuf -+ * @cbuf: pointer of struct rtw_cbuf to free -+ */ -+void rtw_cbuf_free(struct rtw_cbuf *cbuf) -+{ -+ rtw_mfree((u8*)cbuf, sizeof(*cbuf) + sizeof(void*)*cbuf->size); -+} -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/runwpa -@@ -0,0 +1,20 @@ -+#!/bin/bash -+ -+if [ "`which iwconfig`" = "" ] ; then -+ echo "WARNING:Wireless tool not exist!" -+ echo " Please install it!" -+ exit -+else -+ if [ `uname -r | cut -d. -f2` -eq 4 ]; then -+ wpa_supplicant -D ipw -c wpa1.conf -i wlan0 -+ else -+ if [ `iwconfig -v |awk '{print $4}' | head -n 1` -lt 18 ] ; then -+ wpa_supplicant -D ipw -c wpa1.conf -i wlan0 -+ else -+ wpa_supplicant -D wext -c wpa1.conf -i wlan0 -+ fi -+ -+ fi -+fi -+ -+ ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp -@@ -0,0 +1,15 @@ -+#!/bin/bash -+ -+var0=`ps aux|awk '/dhclient wlan0/'|awk '$11!="awk"{print $2}'` -+ -+kill $var0 -+cp ifcfg-wlan0 /etc/sysconfig/network-scripts/ -+ -+dhclient wlan0 -+ -+var1=`ifconfig wlan0 |awk '/inet/{print $2}'|awk -F: '{print $2}'` -+ -+ -+rm -f /etc/sysconfig/network-scripts/ifcfg-wlan0 -+ -+echo "get ip: $var1" diff --git a/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch b/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch deleted file mode 100644 index 4251ecafef..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 9342f107a9655adf067ac603e4ba4161e4e85cab Mon Sep 17 00:00:00 2001 -From: Cheong2K -Date: Fri, 26 Feb 2016 18:20:10 +0800 -Subject: [PATCH 093/806] brcm: adds support for BCM43341 wifi - -brcmfmac: Disable power management - -Disable wireless power saving in the brcmfmac WLAN driver. This is a -temporary measure until the connectivity loss resulting from power -saving is resolved. - -Signed-off-by: Phil Elwell - -brcmfmac: Use original country code as a fallback - -Commit 73345fd212980d2e28a5c6d83801c903bd773680: - - brcmfmac: Configure country code using device specific settings - -prevents region codes from working on devices that lack a region code -translation table. In the event of an absent table, preserve the old -behaviour of using the provided code as-is. - -Signed-off-by: Phil Elwell - -brcmfmac: Plug memory leak in brcmf_fill_bss_param - -See: https://github.com/raspberrypi/linux/issues/1471 - -Signed-off-by: Phil Elwell - -brcmfmac: do not use internal roaming engine by default - -Some evidence of curing disconnects with this disabled, so make it a default. -Can be overridden with module parameter roamoff=0 -See: http://projectable.me/optimize-my-pi-wi-fi/ - -brcmfmac: Change stop_ap sequence - -Patch from Broadcom/Cypress to resolve a customer error - -Signed-off-by: Phil Elwell ---- - .../broadcom/brcm80211/brcmfmac/cfg80211.c | 22 ++++++++++++++----- - .../broadcom/brcm80211/brcmfmac/common.c | 2 +- - .../broadcom/brcm80211/brcmfmac/sdio.c | 3 ++- - 3 files changed, 20 insertions(+), 7 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -2697,6 +2697,8 @@ brcmf_cfg80211_set_power_mgmt(struct wip - * preference in cfg struct to apply this to - * FW later while initializing the dongle - */ -+ pr_info("power management disabled\n"); -+ enabled = false; - cfg->pwr_save = enabled; - if (!check_vif_up(ifp->vif)) { - -@@ -6786,12 +6788,18 @@ static s32 brcmf_translate_country_code( - struct brcmfmac_pd_cc *country_codes; - struct brcmfmac_pd_cc_entry *cc; - s32 found_index; -+ char ccode[BRCMF_COUNTRY_BUF_SZ]; -+ int rev; - int i; - -+ memcpy(ccode, alpha2, sizeof(ccode)); -+ rev = -1; -+ - country_codes = drvr->settings->country_codes; - if (!country_codes) { -- brcmf_dbg(TRACE, "No country codes configured for device\n"); -- return -EINVAL; -+ brcmf_dbg(TRACE, "No country codes configured for device" -+ " - use requested value\n"); -+ goto use_input_value; - } - - if ((alpha2[0] == ccreq->country_abbrev[0]) && -@@ -6815,10 +6823,14 @@ static s32 brcmf_translate_country_code( - brcmf_dbg(TRACE, "No country code match found\n"); - return -EINVAL; - } -- memset(ccreq, 0, sizeof(*ccreq)); -- ccreq->rev = cpu_to_le32(country_codes->table[found_index].rev); -- memcpy(ccreq->ccode, country_codes->table[found_index].cc, -+ rev = country_codes->table[found_index].rev; -+ memcpy(ccode, country_codes->table[found_index].cc, - BRCMF_COUNTRY_BUF_SZ); -+ -+use_input_value: -+ memset(ccreq, 0, sizeof(*ccreq)); -+ ccreq->rev = cpu_to_le32(rev); -+ memcpy(ccreq->ccode, ccode, sizeof(ccode)); - ccreq->country_abbrev[0] = alpha2[0]; - ccreq->country_abbrev[1] = alpha2[1]; - ccreq->country_abbrev[2] = 0; ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -@@ -70,7 +70,7 @@ static int brcmf_fcmode; - module_param_named(fcmode, brcmf_fcmode, int, 0); - MODULE_PARM_DESC(fcmode, "Mode of firmware signalled flow control"); - --static int brcmf_roamoff; -+static int brcmf_roamoff = 1; - module_param_named(roamoff, brcmf_roamoff, int, 0400); - MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine"); - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -614,6 +614,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); - BRCMF_FW_DEF(4330, "brcmfmac4330-sdio"); - BRCMF_FW_DEF(4334, "brcmfmac4334-sdio"); - BRCMF_FW_DEF(43340, "brcmfmac43340-sdio"); -+BRCMF_FW_DEF(43341, "brcmfmac43341-sdio"); - BRCMF_FW_DEF(4335, "brcmfmac4335-sdio"); - BRCMF_FW_DEF(43362, "brcmfmac43362-sdio"); - BRCMF_FW_DEF(4339, "brcmfmac4339-sdio"); -@@ -634,7 +635,7 @@ static const struct brcmf_firmware_mappi - BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330), - BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334), - BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340), -- BRCMF_FW_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43340), -+ BRCMF_FW_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43341), - BRCMF_FW_ENTRY(BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, 4335), - BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362), - BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), diff --git a/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch b/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch deleted file mode 100644 index 8111f9d42c..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8d9a78040bcdbed7dc146038f031ef9cf08e258d Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 17 Feb 2017 15:26:13 +0000 -Subject: [PATCH 094/806] brcmfmac: Mute expected startup 'errors' - -The brcmfmac WiFi driver always complains about the '00' country code. -Modify the driver to ignore '00' silently. - -Signed-off-by: Phil Elwell ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6854,6 +6854,8 @@ static void brcmf_cfg80211_reg_notifier( - /* ignore non-ISO3166 country codes */ - for (i = 0; i < 2; i++) - if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { -+ if (req->alpha2[0] == '0' && req->alpha2[1] == '0') -+ return; - brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n", - req->alpha2[0], req->alpha2[1]); - return; diff --git a/target/linux/brcm2708/patches-4.19/950-0096-config-Add-default-configs.patch b/target/linux/brcm2708/patches-4.19/950-0096-config-Add-default-configs.patch deleted file mode 100644 index c17804415e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0096-config-Add-default-configs.patch +++ /dev/null @@ -1,2731 +0,0 @@ -From 8846b0f807a20157e5065bf3d8ba2270dc4ae377 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 13 Apr 2015 17:16:29 +0100 -Subject: [PATCH 096/806] config: Add default configs - ---- - arch/arm/configs/bcm2709_defconfig | 1360 ++++++++++++++++++++++++++++ - arch/arm/configs/bcmrpi_defconfig | 1353 +++++++++++++++++++++++++++ - 2 files changed, 2713 insertions(+) - create mode 100644 arch/arm/configs/bcm2709_defconfig - create mode 100644 arch/arm/configs/bcmrpi_defconfig - ---- /dev/null -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -0,0 +1,1360 @@ -+CONFIG_LOCALVERSION="-v7" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_GENERIC_IRQ_DEBUGFS=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=m -+CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CPUSETS=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_NAMESPACES=y -+CONFIG_USER_NS=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_PROFILING=y -+CONFIG_ARCH_BCM=y -+CONFIG_ARCH_BCM2835=y -+# CONFIG_CACHE_L2X0 is not set -+CONFIG_SMP=y -+CONFIG_VMSPLIT_2G=y -+# CONFIG_CPU_SW_DOMAIN_PAN is not set -+CONFIG_UACCESS_WITH_MEMCPY=y -+CONFIG_SECCOMP=y -+# CONFIG_ATAGS is not set -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_STAT=y -+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -+CONFIG_CPU_FREQ_GOV_USERSPACE=y -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_VFP=y -+CONFIG_NEON=y -+CONFIG_KERNEL_MODE_NEON=y -+# CONFIG_SUSPEND is not set -+CONFIG_PM=y -+CONFIG_RASPBERRYPI_FIRMWARE=y -+CONFIG_ARM_CRYPTO=y -+CONFIG_CRYPTO_SHA1_ARM_NEON=m -+CONFIG_CRYPTO_AES_ARM=m -+CONFIG_CRYPTO_AES_ARM_BS=m -+CONFIG_OPROFILE=m -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_BINFMT_MISC=m -+CONFIG_CLEANCACHE=y -+CONFIG_FRONTSWAP=y -+CONFIG_CMA=y -+CONFIG_ZSMALLOC=m -+CONFIG_PGTABLE_MAPPING=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE_DEMUX=m -+CONFIG_NET_IPGRE=m -+CONFIG_IP_MROUTE=y -+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IP_PIMSM_V1=y -+CONFIG_IP_PIMSM_V2=y -+CONFIG_SYN_COOKIES=y -+CONFIG_NET_IPVTI=m -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_DIAG=m -+CONFIG_TCP_CONG_ADVANCED=y -+CONFIG_TCP_CONG_BBR=m -+CONFIG_IPV6=m -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_IPV6_ROUTE_INFO=y -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+CONFIG_IPV6_SIT_6RD=y -+CONFIG_IPV6_TUNNEL=m -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_IPV6_SUBTREES=y -+CONFIG_IPV6_MROUTE=y -+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IPV6_PIMSM_V2=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CONNTRACK_ZONES=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_TIMESTAMP=y -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_SNMP=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NF_CT_NETLINK=m -+CONFIG_NETFILTER_XT_SET=m -+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HMARK=m -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_LOG=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_TEE=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -+CONFIG_NETFILTER_XT_MATCH_BPF=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_CPU=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_IPVS=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_NFACCT=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_IP_SET=m -+CONFIG_IP_SET_BITMAP_IP=m -+CONFIG_IP_SET_BITMAP_IPMAC=m -+CONFIG_IP_SET_BITMAP_PORT=m -+CONFIG_IP_SET_HASH_IP=m -+CONFIG_IP_SET_HASH_IPPORT=m -+CONFIG_IP_SET_HASH_IPPORTIP=m -+CONFIG_IP_SET_HASH_IPPORTNET=m -+CONFIG_IP_SET_HASH_NET=m -+CONFIG_IP_SET_HASH_NETPORT=m -+CONFIG_IP_SET_HASH_NETIFACE=m -+CONFIG_IP_SET_LIST_SET=m -+CONFIG_IP_VS=m -+CONFIG_IP_VS_PROTO_TCP=y -+CONFIG_IP_VS_PROTO_UDP=y -+CONFIG_IP_VS_PROTO_ESP=y -+CONFIG_IP_VS_PROTO_AH=y -+CONFIG_IP_VS_PROTO_SCTP=y -+CONFIG_IP_VS_RR=m -+CONFIG_IP_VS_WRR=m -+CONFIG_IP_VS_LC=m -+CONFIG_IP_VS_WLC=m -+CONFIG_IP_VS_LBLC=m -+CONFIG_IP_VS_LBLCR=m -+CONFIG_IP_VS_DH=m -+CONFIG_IP_VS_SH=m -+CONFIG_IP_VS_SED=m -+CONFIG_IP_VS_NQ=m -+CONFIG_IP_VS_FTP=m -+CONFIG_IP_VS_PE_SIP=m -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_RPFILTER=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_NAT=m -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_IP_NF_MANGLE=m -+CONFIG_IP_NF_TARGET_CLUSTERIP=m -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RPFILTER=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_IP6_NF_NAT=m -+CONFIG_IP6_NF_TARGET_MASQUERADE=m -+CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+CONFIG_SCTP_COOKIE_HMAC_SHA1=y -+CONFIG_ATM=m -+CONFIG_L2TP=m -+CONFIG_L2TP_V3=y -+CONFIG_L2TP_IP=m -+CONFIG_L2TP_ETH=m -+CONFIG_BRIDGE=m -+CONFIG_VLAN_8021Q=m -+CONFIG_VLAN_8021Q_GVRP=y -+CONFIG_ATALK=m -+CONFIG_6LOWPAN=m -+CONFIG_IEEE802154=m -+CONFIG_IEEE802154_6LOWPAN=m -+CONFIG_MAC802154=m -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_ATM=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFB=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+CONFIG_NET_SCH_MQPRIO=m -+CONFIG_NET_SCH_CHOKE=m -+CONFIG_NET_SCH_QFQ=m -+CONFIG_NET_SCH_CODEL=m -+CONFIG_NET_SCH_FQ_CODEL=m -+CONFIG_NET_SCH_FQ=m -+CONFIG_NET_SCH_HHF=m -+CONFIG_NET_SCH_PIE=m -+CONFIG_NET_SCH_INGRESS=m -+CONFIG_NET_SCH_PLUG=m -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_CLS_CGROUP=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_EMATCH_IPSET=m -+CONFIG_NET_CLS_ACT=y -+CONFIG_NET_ACT_POLICE=m -+CONFIG_NET_ACT_GACT=m -+CONFIG_GACT_PROB=y -+CONFIG_NET_ACT_MIRRED=m -+CONFIG_NET_ACT_IPT=m -+CONFIG_NET_ACT_NAT=m -+CONFIG_NET_ACT_PEDIT=m -+CONFIG_NET_ACT_SIMP=m -+CONFIG_NET_ACT_SKBEDIT=m -+CONFIG_NET_ACT_CSUM=m -+CONFIG_BATMAN_ADV=m -+CONFIG_OPENVSWITCH=m -+CONFIG_NET_PKTGEN=m -+CONFIG_HAMRADIO=y -+CONFIG_AX25=m -+CONFIG_NETROM=m -+CONFIG_ROSE=m -+CONFIG_MKISS=m -+CONFIG_6PACK=m -+CONFIG_BPQETHER=m -+CONFIG_BAYCOM_SER_FDX=m -+CONFIG_BAYCOM_SER_HDX=m -+CONFIG_YAM=m -+CONFIG_CAN=m -+CONFIG_CAN_VCAN=m -+CONFIG_CAN_SLCAN=m -+CONFIG_CAN_MCP251X=m -+CONFIG_CAN_GS_USB=m -+CONFIG_BT=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+CONFIG_BT_BNEP_MC_FILTER=y -+CONFIG_BT_BNEP_PROTO_FILTER=y -+CONFIG_BT_HIDP=m -+CONFIG_BT_6LOWPAN=m -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIUART=m -+CONFIG_BT_HCIUART_3WIRE=y -+CONFIG_BT_HCIUART_BCM=y -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+CONFIG_BT_ATH3K=m -+CONFIG_BT_WILINK=m -+CONFIG_CFG80211=m -+CONFIG_MAC80211=m -+CONFIG_MAC80211_MESH=y -+CONFIG_WIMAX=m -+CONFIG_RFKILL=m -+CONFIG_RFKILL_INPUT=y -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_DEVTMPFS=y -+CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_DMA_CMA=y -+CONFIG_CMA_SIZE_MBYTES=5 -+CONFIG_MTD=m -+CONFIG_MTD_BLOCK=m -+CONFIG_MTD_M25P80=m -+CONFIG_MTD_BLOCK2MTD=m -+CONFIG_MTD_NAND=m -+CONFIG_MTD_SPI_NOR=m -+CONFIG_MTD_UBI=m -+CONFIG_OF_CONFIGFS=y -+CONFIG_ZRAM=m -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_DRBD=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_ATA_OVER_ETH=m -+CONFIG_EEPROM_AT24=m -+CONFIG_TI_ST=m -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_CHR_DEV_ST=m -+CONFIG_CHR_DEV_OSST=m -+CONFIG_BLK_DEV_SR=m -+CONFIG_CHR_DEV_SG=m -+CONFIG_SCSI_ISCSI_ATTRS=y -+CONFIG_ISCSI_TCP=m -+CONFIG_ISCSI_BOOT_SYSFS=m -+CONFIG_MD=y -+CONFIG_MD_LINEAR=m -+CONFIG_BLK_DEV_DM=m -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_THIN_PROVISIONING=m -+CONFIG_DM_CACHE=m -+CONFIG_DM_MIRROR=m -+CONFIG_DM_LOG_USERSPACE=m -+CONFIG_DM_RAID=m -+CONFIG_DM_ZERO=m -+CONFIG_DM_DELAY=m -+CONFIG_NETDEVICES=y -+CONFIG_BONDING=m -+CONFIG_DUMMY=m -+CONFIG_IFB=m -+CONFIG_MACVLAN=m -+CONFIG_IPVLAN=m -+CONFIG_VXLAN=m -+CONFIG_NETCONSOLE=m -+CONFIG_TUN=m -+CONFIG_VETH=m -+CONFIG_ENC28J60=m -+CONFIG_QCA7000_SPI=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_PPP=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_MPPE=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPPOATM=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+CONFIG_SLIP_SMART=y -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_RTL8152=m -+CONFIG_USB_LAN78XX=y -+CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX8817X=m -+CONFIG_USB_NET_AX88179_178A=m -+CONFIG_USB_NET_CDCETHER=m -+CONFIG_USB_NET_CDC_EEM=m -+CONFIG_USB_NET_CDC_NCM=m -+CONFIG_USB_NET_HUAWEI_CDC_NCM=m -+CONFIG_USB_NET_CDC_MBIM=m -+CONFIG_USB_NET_DM9601=m -+CONFIG_USB_NET_SR9700=m -+CONFIG_USB_NET_SR9800=m -+CONFIG_USB_NET_SMSC75XX=m -+CONFIG_USB_NET_SMSC95XX=y -+CONFIG_USB_NET_GL620A=m -+CONFIG_USB_NET_NET1080=m -+CONFIG_USB_NET_PLUSB=m -+CONFIG_USB_NET_MCS7830=m -+CONFIG_USB_NET_CDC_SUBSET=m -+CONFIG_USB_ALI_M5632=y -+CONFIG_USB_AN2720=y -+CONFIG_USB_EPSON2888=y -+CONFIG_USB_KC2190=y -+CONFIG_USB_NET_ZAURUS=m -+CONFIG_USB_NET_CX82310_ETH=m -+CONFIG_USB_NET_KALMIA=m -+CONFIG_USB_NET_QMI_WWAN=m -+CONFIG_USB_HSO=m -+CONFIG_USB_NET_INT51X1=m -+CONFIG_USB_IPHETH=m -+CONFIG_USB_SIERRA_NET=m -+CONFIG_USB_VL600=m -+CONFIG_ATH9K=m -+CONFIG_ATH9K_HTC=m -+CONFIG_CARL9170=m -+CONFIG_ATH6KL=m -+CONFIG_ATH6KL_USB=m -+CONFIG_AR5523=m -+CONFIG_AT76C50X_USB=m -+CONFIG_B43=m -+# CONFIG_B43_PHY_N is not set -+CONFIG_B43LEGACY=m -+CONFIG_BRCMFMAC=m -+CONFIG_BRCMFMAC_USB=y -+CONFIG_BRCMDBG=y -+CONFIG_HOSTAP=m -+CONFIG_P54_COMMON=m -+CONFIG_P54_USB=m -+CONFIG_LIBERTAS=m -+CONFIG_LIBERTAS_USB=m -+CONFIG_LIBERTAS_SDIO=m -+CONFIG_LIBERTAS_THINFIRM=m -+CONFIG_LIBERTAS_THINFIRM_USB=m -+CONFIG_MWIFIEX=m -+CONFIG_MWIFIEX_SDIO=m -+CONFIG_MT7601U=m -+CONFIG_RT2X00=m -+CONFIG_RT2500USB=m -+CONFIG_RT73USB=m -+CONFIG_RT2800USB=m -+CONFIG_RT2800USB_RT3573=y -+CONFIG_RT2800USB_RT53XX=y -+CONFIG_RT2800USB_RT55XX=y -+CONFIG_RT2800USB_UNKNOWN=y -+CONFIG_RTL8187=m -+CONFIG_RTL8192CU=m -+CONFIG_RTL8XXXU=m -+CONFIG_USB_ZD1201=m -+CONFIG_ZD1211RW=m -+CONFIG_MAC80211_HWSIM=m -+CONFIG_USB_NET_RNDIS_WLAN=m -+CONFIG_WIMAX_I2400M_USB=m -+CONFIG_IEEE802154_AT86RF230=m -+CONFIG_IEEE802154_MRF24J40=m -+CONFIG_IEEE802154_CC2520=m -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_JOYDEV=m -+CONFIG_INPUT_EVDEV=m -+# CONFIG_KEYBOARD_ATKBD is not set -+CONFIG_KEYBOARD_GPIO=m -+CONFIG_KEYBOARD_MATRIX=m -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_IFORCE=m -+CONFIG_JOYSTICK_IFORCE_USB=y -+CONFIG_JOYSTICK_XPAD=m -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_JOYSTICK_PSXPAD_SPI=m -+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y -+CONFIG_JOYSTICK_RPISENSE=m -+CONFIG_INPUT_TOUCHSCREEN=y -+CONFIG_TOUCHSCREEN_ADS7846=m -+CONFIG_TOUCHSCREEN_EGALAX=m -+CONFIG_TOUCHSCREEN_EXC3000=m -+CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_EDT_FT5X06=m -+CONFIG_TOUCHSCREEN_RPI_FT5406=m -+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -+CONFIG_TOUCHSCREEN_STMPE=m -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_AD714X=m -+CONFIG_INPUT_ATI_REMOTE2=m -+CONFIG_INPUT_KEYSPAN_REMOTE=m -+CONFIG_INPUT_POWERMATE=m -+CONFIG_INPUT_YEALINK=m -+CONFIG_INPUT_CM109=m -+CONFIG_INPUT_UINPUT=m -+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -+CONFIG_INPUT_ADXL34X=m -+CONFIG_INPUT_CMA3000=m -+CONFIG_SERIO=m -+CONFIG_SERIO_RAW=m -+CONFIG_GAMEPORT=m -+CONFIG_GAMEPORT_NS558=m -+CONFIG_GAMEPORT_L4=m -+CONFIG_BRCM_CHAR_DRIVERS=y -+CONFIG_BCM_VCIO=y -+CONFIG_BCM_VC_SM=y -+CONFIG_BCM2835_DEVGPIOMEM=y -+# CONFIG_LEGACY_PTYS is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_DMA is not set -+CONFIG_SERIAL_8250_NR_UARTS=1 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=0 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_BCM2835AUX=y -+CONFIG_SERIAL_OF_PLATFORM=y -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_SERIAL_SC16IS7XX=m -+CONFIG_SERIAL_SC16IS7XX_SPI=y -+CONFIG_SERIAL_DEV_BUS=m -+CONFIG_TTY_PRINTK=y -+CONFIG_HW_RANDOM=y -+CONFIG_RAW_DRIVER=y -+CONFIG_I2C=y -+CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_MUX=m -+CONFIG_I2C_MUX_GPMUX=m -+CONFIG_I2C_MUX_PCA954x=m -+CONFIG_I2C_BCM2708=m -+CONFIG_I2C_BCM2835=m -+CONFIG_I2C_GPIO=m -+CONFIG_I2C_ROBOTFUZZ_OSIF=m -+CONFIG_I2C_TINY_USB=m -+CONFIG_SPI=y -+CONFIG_SPI_BCM2835=m -+CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_GPIO=m -+CONFIG_SPI_SPIDEV=m -+CONFIG_SPI_SLAVE=y -+CONFIG_PPS=m -+CONFIG_PPS_CLIENT_LDISC=m -+CONFIG_PPS_CLIENT_GPIO=m -+CONFIG_PINCTRL_MCP23S08=m -+CONFIG_GPIO_BCM_VIRT=y -+CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCF857X=m -+CONFIG_GPIO_ARIZONA=m -+CONFIG_GPIO_STMPE=y -+CONFIG_W1=m -+CONFIG_W1_MASTER_DS2490=m -+CONFIG_W1_MASTER_DS2482=m -+CONFIG_W1_MASTER_DS1WM=m -+CONFIG_W1_MASTER_GPIO=m -+CONFIG_W1_SLAVE_THERM=m -+CONFIG_W1_SLAVE_SMEM=m -+CONFIG_W1_SLAVE_DS2408=m -+CONFIG_W1_SLAVE_DS2413=m -+CONFIG_W1_SLAVE_DS2406=m -+CONFIG_W1_SLAVE_DS2423=m -+CONFIG_W1_SLAVE_DS2431=m -+CONFIG_W1_SLAVE_DS2433=m -+CONFIG_W1_SLAVE_DS2438=m -+CONFIG_W1_SLAVE_DS2780=m -+CONFIG_W1_SLAVE_DS2781=m -+CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_POWER_RESET=y -+CONFIG_POWER_RESET_GPIO=y -+CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_GAUGE_LTC2941=m -+CONFIG_HWMON=m -+CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_JC42=m -+CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_SHT21=m -+CONFIG_SENSORS_SHT3x=m -+CONFIG_SENSORS_SHTC1=m -+CONFIG_SENSORS_ADS1015=m -+CONFIG_SENSORS_INA2XX=m -+CONFIG_SENSORS_TMP102=m -+CONFIG_THERMAL=y -+CONFIG_BCM2835_THERMAL=y -+CONFIG_WATCHDOG=y -+CONFIG_GPIO_WATCHDOG=m -+CONFIG_BCM2835_WDT=y -+CONFIG_MFD_STMPE=y -+CONFIG_STMPE_SPI=y -+CONFIG_MFD_ARIZONA_I2C=m -+CONFIG_MFD_ARIZONA_SPI=m -+CONFIG_MFD_WM5102=y -+CONFIG_REGULATOR=y -+CONFIG_REGULATOR_FIXED_VOLTAGE=m -+CONFIG_REGULATOR_ARIZONA_LDO1=m -+CONFIG_REGULATOR_ARIZONA_MICSUPP=m -+CONFIG_RC_CORE=y -+CONFIG_LIRC=y -+CONFIG_RC_DECODERS=y -+CONFIG_IR_NEC_DECODER=m -+CONFIG_IR_RC5_DECODER=m -+CONFIG_IR_RC6_DECODER=m -+CONFIG_IR_JVC_DECODER=m -+CONFIG_IR_SONY_DECODER=m -+CONFIG_IR_SANYO_DECODER=m -+CONFIG_IR_SHARP_DECODER=m -+CONFIG_IR_MCE_KBD_DECODER=m -+CONFIG_IR_XMP_DECODER=m -+CONFIG_IR_IMON_DECODER=m -+CONFIG_RC_DEVICES=y -+CONFIG_RC_ATI_REMOTE=m -+CONFIG_IR_IMON=m -+CONFIG_IR_MCEUSB=m -+CONFIG_IR_REDRAT3=m -+CONFIG_IR_STREAMZAP=m -+CONFIG_IR_IGUANA=m -+CONFIG_IR_TTUSBIR=m -+CONFIG_RC_LOOPBACK=m -+CONFIG_IR_GPIO_CIR=m -+CONFIG_IR_GPIO_TX=m -+CONFIG_IR_PWM_TX=m -+CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y -+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -+CONFIG_MEDIA_RADIO_SUPPORT=y -+CONFIG_MEDIA_CONTROLLER=y -+CONFIG_MEDIA_USB_SUPPORT=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_BENQ=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_CPIA1=m -+CONFIG_USB_GSPCA_DTCS033=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_JL2005BCD=m -+CONFIG_USB_GSPCA_KINECT=m -+CONFIG_USB_GSPCA_KONICA=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_NW80X=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_OV534_9=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SE401=m -+CONFIG_USB_GSPCA_SN9C2028=m -+CONFIG_USB_GSPCA_SN9C20X=m -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SPCA1528=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_SQ930X=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STK1135=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TOPRO=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_VICAM=m -+CONFIG_USB_GSPCA_XIRLINK_CIT=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_USB_PWC=m -+CONFIG_VIDEO_CPIA2=m -+CONFIG_USB_ZR364XX=m -+CONFIG_USB_STKWEBCAM=m -+CONFIG_USB_S2255=m -+CONFIG_VIDEO_USBTV=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_HDPVR=m -+CONFIG_VIDEO_USBVISION=m -+CONFIG_VIDEO_STK1160_COMMON=m -+CONFIG_VIDEO_GO7007=m -+CONFIG_VIDEO_GO7007_USB=m -+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -+CONFIG_VIDEO_AU0828=m -+CONFIG_VIDEO_AU0828_RC=y -+CONFIG_VIDEO_CX231XX=m -+CONFIG_VIDEO_CX231XX_ALSA=m -+CONFIG_VIDEO_CX231XX_DVB=m -+CONFIG_VIDEO_TM6000=m -+CONFIG_VIDEO_TM6000_ALSA=m -+CONFIG_VIDEO_TM6000_DVB=m -+CONFIG_DVB_USB=m -+CONFIG_DVB_USB_A800=m -+CONFIG_DVB_USB_DIBUSB_MB=m -+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -+CONFIG_DVB_USB_DIBUSB_MC=m -+CONFIG_DVB_USB_DIB0700=m -+CONFIG_DVB_USB_UMT_010=m -+CONFIG_DVB_USB_CXUSB=m -+CONFIG_DVB_USB_M920X=m -+CONFIG_DVB_USB_DIGITV=m -+CONFIG_DVB_USB_VP7045=m -+CONFIG_DVB_USB_VP702X=m -+CONFIG_DVB_USB_GP8PSK=m -+CONFIG_DVB_USB_NOVA_T_USB2=m -+CONFIG_DVB_USB_TTUSB2=m -+CONFIG_DVB_USB_DTT200U=m -+CONFIG_DVB_USB_OPERA1=m -+CONFIG_DVB_USB_AF9005=m -+CONFIG_DVB_USB_AF9005_REMOTE=m -+CONFIG_DVB_USB_PCTV452E=m -+CONFIG_DVB_USB_DW2102=m -+CONFIG_DVB_USB_CINERGY_T2=m -+CONFIG_DVB_USB_DTV5100=m -+CONFIG_DVB_USB_AZ6027=m -+CONFIG_DVB_USB_TECHNISAT_USB2=m -+CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9015=m -+CONFIG_DVB_USB_AF9035=m -+CONFIG_DVB_USB_ANYSEE=m -+CONFIG_DVB_USB_AU6610=m -+CONFIG_DVB_USB_AZ6007=m -+CONFIG_DVB_USB_CE6230=m -+CONFIG_DVB_USB_EC168=m -+CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_LME2510=m -+CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_RTL28XXU=m -+CONFIG_DVB_USB_DVBSKY=m -+CONFIG_SMS_USB_DRV=m -+CONFIG_DVB_B2C2_FLEXCOP_USB=m -+CONFIG_DVB_AS102=m -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_V4L2=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_RADIO_SI470X=m -+CONFIG_USB_SI470X=m -+CONFIG_I2C_SI470X=m -+CONFIG_RADIO_SI4713=m -+CONFIG_I2C_SI4713=m -+CONFIG_USB_MR800=m -+CONFIG_USB_DSBR=m -+CONFIG_RADIO_SHARK=m -+CONFIG_RADIO_SHARK2=m -+CONFIG_USB_KEENE=m -+CONFIG_USB_MA901=m -+CONFIG_RADIO_TEA5764=m -+CONFIG_RADIO_SAA7706H=m -+CONFIG_RADIO_TEF6862=m -+CONFIG_RADIO_WL1273=m -+CONFIG_RADIO_WL128X=m -+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -+CONFIG_VIDEO_UDA1342=m -+CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_TW2804=m -+CONFIG_VIDEO_TW9903=m -+CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV7640=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_DRM=m -+CONFIG_DRM_LOAD_EDID_FIRMWARE=y -+CONFIG_DRM_UDL=m -+CONFIG_DRM_PANEL_SIMPLE=m -+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -+CONFIG_DRM_VC4=m -+CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_MI0283QT=m -+CONFIG_TINYDRM_REPAPER=m -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_FB_UDL=m -+CONFIG_FB_SSD1307=m -+CONFIG_FB_RPISENSE=m -+# CONFIG_BACKLIGHT_GENERIC is not set -+CONFIG_BACKLIGHT_RPI=m -+CONFIG_BACKLIGHT_GPIO=m -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+CONFIG_SND=m -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQUENCER=m -+CONFIG_SND_SEQ_DUMMY=m -+CONFIG_SND_DUMMY=m -+CONFIG_SND_ALOOP=m -+CONFIG_SND_VIRMIDI=m -+CONFIG_SND_MTPAV=m -+CONFIG_SND_SERIAL_U16550=m -+CONFIG_SND_MPU401=m -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_UA101=m -+CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_CAIAQ_INPUT=y -+CONFIG_SND_USB_6FIRE=m -+CONFIG_SND_USB_HIFACE=m -+CONFIG_SND_SOC=m -+CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m -+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -+CONFIG_SND_BCM2708_SOC_RPI_DAC=m -+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m -+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m -+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_DIGIDAC1_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m -+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m -+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m -+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m -+CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_ADAU1701=m -+CONFIG_SND_SOC_ADAU7002=m -+CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_SPDIF=m -+CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SIMPLE_CARD=m -+CONFIG_HID_BATTERY_STRENGTH=y -+CONFIG_HIDRAW=y -+CONFIG_UHID=m -+CONFIG_HID_A4TECH=m -+CONFIG_HID_ACRUX=m -+CONFIG_HID_APPLE=m -+CONFIG_HID_ASUS=m -+CONFIG_HID_BELKIN=m -+CONFIG_HID_BETOP_FF=m -+CONFIG_HID_CHERRY=m -+CONFIG_HID_CHICONY=m -+CONFIG_HID_CYPRESS=m -+CONFIG_HID_DRAGONRISE=m -+CONFIG_HID_EMS_FF=m -+CONFIG_HID_ELECOM=m -+CONFIG_HID_ELO=m -+CONFIG_HID_EZKEY=m -+CONFIG_HID_GEMBIRD=m -+CONFIG_HID_HOLTEK=m -+CONFIG_HID_KEYTOUCH=m -+CONFIG_HID_KYE=m -+CONFIG_HID_UCLOGIC=m -+CONFIG_HID_WALTOP=m -+CONFIG_HID_GYRATION=m -+CONFIG_HID_TWINHAN=m -+CONFIG_HID_KENSINGTON=m -+CONFIG_HID_LCPOWER=m -+CONFIG_HID_LOGITECH=m -+CONFIG_HID_LOGITECH_DJ=m -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=m -+CONFIG_HID_MICROSOFT=m -+CONFIG_HID_MONTEREY=m -+CONFIG_HID_MULTITOUCH=m -+CONFIG_HID_NTRIG=m -+CONFIG_HID_ORTEK=m -+CONFIG_HID_PANTHERLORD=m -+CONFIG_HID_PETALYNX=m -+CONFIG_HID_PICOLCD=m -+CONFIG_HID_ROCCAT=m -+CONFIG_HID_SAMSUNG=m -+CONFIG_HID_SONY=m -+CONFIG_SONY_FF=y -+CONFIG_HID_SPEEDLINK=m -+CONFIG_HID_SUNPLUS=m -+CONFIG_HID_GREENASIA=m -+CONFIG_HID_SMARTJOYPLUS=m -+CONFIG_HID_TOPSEED=m -+CONFIG_HID_THINGM=m -+CONFIG_HID_THRUSTMASTER=m -+CONFIG_HID_WACOM=m -+CONFIG_HID_WIIMOTE=m -+CONFIG_HID_XINMO=m -+CONFIG_HID_ZEROPLUS=m -+CONFIG_HID_ZYDACRON=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_MON=m -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_PRINTER=m -+CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE_REALTEK=m -+CONFIG_USB_STORAGE_DATAFAB=m -+CONFIG_USB_STORAGE_FREECOM=m -+CONFIG_USB_STORAGE_ISD200=m -+CONFIG_USB_STORAGE_USBAT=m -+CONFIG_USB_STORAGE_SDDR09=m -+CONFIG_USB_STORAGE_SDDR55=m -+CONFIG_USB_STORAGE_JUMPSHOT=m -+CONFIG_USB_STORAGE_ALAUDA=m -+CONFIG_USB_STORAGE_ONETOUCH=m -+CONFIG_USB_STORAGE_KARMA=m -+CONFIG_USB_STORAGE_CYPRESS_ATACB=m -+CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_MDC800=m -+CONFIG_USB_MICROTEK=m -+CONFIG_USBIP_CORE=m -+CONFIG_USBIP_VHCI_HCD=m -+CONFIG_USBIP_HOST=m -+CONFIG_USB_DWC2=m -+CONFIG_USB_SERIAL=m -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_F81232=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_METRO=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QCAUX=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_SAFE=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_XSENS_MT=m -+CONFIG_USB_SERIAL_WISHBONE=m -+CONFIG_USB_SERIAL_SSU100=m -+CONFIG_USB_SERIAL_QT2=m -+CONFIG_USB_SERIAL_DEBUG=m -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+CONFIG_USB_ADUTUX=m -+CONFIG_USB_SEVSEG=m -+CONFIG_USB_RIO500=m -+CONFIG_USB_LEGOTOWER=m -+CONFIG_USB_LCD=m -+CONFIG_USB_CYPRESS_CY7C63=m -+CONFIG_USB_CYTHERM=m -+CONFIG_USB_IDMOUSE=m -+CONFIG_USB_FTDI_ELAN=m -+CONFIG_USB_APPLEDISPLAY=m -+CONFIG_USB_LD=m -+CONFIG_USB_TRANCEVIBRATOR=m -+CONFIG_USB_IOWARRIOR=m -+CONFIG_USB_TEST=m -+CONFIG_USB_ISIGHTFW=m -+CONFIG_USB_YUREX=m -+CONFIG_USB_ATM=m -+CONFIG_USB_SPEEDTOUCH=m -+CONFIG_USB_CXACRU=m -+CONFIG_USB_UEAGLEATM=m -+CONFIG_USB_XUSBATM=m -+CONFIG_USB_GADGET=m -+CONFIG_USB_ZERO=m -+CONFIG_USB_AUDIO=m -+CONFIG_USB_ETH=m -+CONFIG_USB_GADGETFS=m -+CONFIG_USB_MASS_STORAGE=m -+CONFIG_USB_G_SERIAL=m -+CONFIG_USB_MIDI_GADGET=m -+CONFIG_USB_G_PRINTER=m -+CONFIG_USB_CDC_COMPOSITE=m -+CONFIG_USB_G_ACM_MS=m -+CONFIG_USB_G_MULTI=m -+CONFIG_USB_G_HID=m -+CONFIG_USB_G_WEBCAM=m -+CONFIG_MMC=y -+CONFIG_MMC_BLOCK_MINORS=32 -+CONFIG_MMC_BCM2835_MMC=y -+CONFIG_MMC_BCM2835_DMA=y -+CONFIG_MMC_BCM2835_SDHOST=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SPI=m -+CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_ONESHOT=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+CONFIG_LEDS_TRIGGER_BACKLIGHT=y -+CONFIG_LEDS_TRIGGER_CPU=y -+CONFIG_LEDS_TRIGGER_GPIO=y -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+CONFIG_LEDS_TRIGGER_TRANSIENT=m -+CONFIG_LEDS_TRIGGER_CAMERA=m -+CONFIG_LEDS_TRIGGER_INPUT=y -+CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+CONFIG_RTC_DRV_ABX80X=m -+CONFIG_RTC_DRV_DS1307=m -+CONFIG_RTC_DRV_DS1374=m -+CONFIG_RTC_DRV_DS1672=m -+CONFIG_RTC_DRV_MAX6900=m -+CONFIG_RTC_DRV_RS5C372=m -+CONFIG_RTC_DRV_ISL1208=m -+CONFIG_RTC_DRV_ISL12022=m -+CONFIG_RTC_DRV_X1205=m -+CONFIG_RTC_DRV_PCF8523=m -+CONFIG_RTC_DRV_PCF8563=m -+CONFIG_RTC_DRV_PCF8583=m -+CONFIG_RTC_DRV_M41T80=m -+CONFIG_RTC_DRV_BQ32K=m -+CONFIG_RTC_DRV_S35390A=m -+CONFIG_RTC_DRV_FM3130=m -+CONFIG_RTC_DRV_RX8581=m -+CONFIG_RTC_DRV_RX8025=m -+CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_M41T93=m -+CONFIG_RTC_DRV_M41T94=m -+CONFIG_RTC_DRV_DS1302=m -+CONFIG_RTC_DRV_DS1305=m -+CONFIG_RTC_DRV_DS1390=m -+CONFIG_RTC_DRV_R9701=m -+CONFIG_RTC_DRV_RX4581=m -+CONFIG_RTC_DRV_RS5C348=m -+CONFIG_RTC_DRV_MAX6902=m -+CONFIG_RTC_DRV_PCF2123=m -+CONFIG_RTC_DRV_DS3232=m -+CONFIG_RTC_DRV_PCF2127=m -+CONFIG_RTC_DRV_RV3029C2=m -+CONFIG_DMADEVICES=y -+CONFIG_DMA_BCM2835=y -+CONFIG_DMA_BCM2708=y -+CONFIG_UIO=m -+CONFIG_UIO_PDRV_GENIRQ=m -+CONFIG_STAGING=y -+CONFIG_PRISM2_USB=m -+CONFIG_R8712U=m -+CONFIG_R8188EU=m -+CONFIG_VT6656=m -+CONFIG_SPEAKUP=m -+CONFIG_SPEAKUP_SYNTH_SOFT=m -+CONFIG_STAGING_MEDIA=y -+CONFIG_FB_TFT=m -+CONFIG_FB_TFT_AGM1264K_FL=m -+CONFIG_FB_TFT_BD663474=m -+CONFIG_FB_TFT_HX8340BN=m -+CONFIG_FB_TFT_HX8347D=m -+CONFIG_FB_TFT_HX8353D=m -+CONFIG_FB_TFT_HX8357D=m -+CONFIG_FB_TFT_ILI9163=m -+CONFIG_FB_TFT_ILI9320=m -+CONFIG_FB_TFT_ILI9325=m -+CONFIG_FB_TFT_ILI9340=m -+CONFIG_FB_TFT_ILI9341=m -+CONFIG_FB_TFT_ILI9481=m -+CONFIG_FB_TFT_ILI9486=m -+CONFIG_FB_TFT_PCD8544=m -+CONFIG_FB_TFT_RA8875=m -+CONFIG_FB_TFT_S6D02A1=m -+CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SSD1289=m -+CONFIG_FB_TFT_SSD1306=m -+CONFIG_FB_TFT_SSD1331=m -+CONFIG_FB_TFT_SSD1351=m -+CONFIG_FB_TFT_ST7735R=m -+CONFIG_FB_TFT_ST7789V=m -+CONFIG_FB_TFT_TINYLCD=m -+CONFIG_FB_TFT_TLS8204=m -+CONFIG_FB_TFT_UC1701=m -+CONFIG_FB_TFT_UPD161704=m -+CONFIG_FB_TFT_WATTEROTT=m -+CONFIG_FB_FLEX=m -+CONFIG_FB_TFT_FBTFT_DEVICE=m -+CONFIG_BCM2835_VCHIQ=y -+CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m -+CONFIG_MAILBOX=y -+CONFIG_BCM2835_MBOX=y -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_RASPBERRYPI_POWER=y -+CONFIG_EXTCON=m -+CONFIG_EXTCON_ARIZONA=m -+CONFIG_IIO=m -+CONFIG_IIO_BUFFER_CB=m -+CONFIG_MCP320X=m -+CONFIG_MCP3422=m -+CONFIG_DHT11=m -+CONFIG_HDC100X=m -+CONFIG_HTU21=m -+CONFIG_INV_MPU6050_I2C=m -+CONFIG_TSL4531=m -+CONFIG_VEML6070=m -+CONFIG_BMP280=m -+CONFIG_PWM_BCM2835=m -+CONFIG_PWM_PCA9685=m -+CONFIG_RPI_AXIPERF=m -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_REISERFS_FS=m -+CONFIG_REISERFS_FS_XATTR=y -+CONFIG_REISERFS_FS_POSIX_ACL=y -+CONFIG_REISERFS_FS_SECURITY=y -+CONFIG_JFS_FS=m -+CONFIG_JFS_POSIX_ACL=y -+CONFIG_JFS_SECURITY=y -+CONFIG_JFS_STATISTICS=y -+CONFIG_XFS_FS=m -+CONFIG_XFS_QUOTA=y -+CONFIG_XFS_POSIX_ACL=y -+CONFIG_XFS_RT=y -+CONFIG_GFS2_FS=m -+CONFIG_OCFS2_FS=m -+CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS_POSIX_ACL=y -+CONFIG_NILFS2_FS=m -+CONFIG_F2FS_FS=y -+CONFIG_FANOTIFY=y -+CONFIG_QFMT_V1=m -+CONFIG_QFMT_V2=m -+CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m -+CONFIG_OVERLAY_FS=m -+CONFIG_FSCACHE=y -+CONFIG_FSCACHE_STATS=y -+CONFIG_FSCACHE_HISTOGRAM=y -+CONFIG_CACHEFILES=y -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -+CONFIG_NTFS_FS=m -+CONFIG_NTFS_RW=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_ECRYPT_FS=m -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+CONFIG_JFFS2_FS=m -+CONFIG_JFFS2_SUMMARY=y -+CONFIG_UBIFS_FS=m -+CONFIG_SQUASHFS=m -+CONFIG_SQUASHFS_XATTR=y -+CONFIG_SQUASHFS_LZO=y -+CONFIG_SQUASHFS_XZ=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3_ACL=y -+CONFIG_NFS_V4=y -+CONFIG_NFS_SWAP=y -+CONFIG_NFS_V4_1=y -+CONFIG_ROOT_NFS=y -+CONFIG_NFS_FSCACHE=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3_ACL=y -+CONFIG_NFSD_V4=y -+CONFIG_CIFS=m -+CONFIG_CIFS_WEAK_PW_HASH=y -+CONFIG_CIFS_UPCALL=y -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+CONFIG_CIFS_ACL=y -+CONFIG_CIFS_DFS_UPCALL=y -+CONFIG_CIFS_FSCACHE=y -+CONFIG_9P_FS=m -+CONFIG_9P_FS_POSIX_ACL=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_737=m -+CONFIG_NLS_CODEPAGE_775=m -+CONFIG_NLS_CODEPAGE_850=m -+CONFIG_NLS_CODEPAGE_852=m -+CONFIG_NLS_CODEPAGE_855=m -+CONFIG_NLS_CODEPAGE_857=m -+CONFIG_NLS_CODEPAGE_860=m -+CONFIG_NLS_CODEPAGE_861=m -+CONFIG_NLS_CODEPAGE_862=m -+CONFIG_NLS_CODEPAGE_863=m -+CONFIG_NLS_CODEPAGE_864=m -+CONFIG_NLS_CODEPAGE_865=m -+CONFIG_NLS_CODEPAGE_866=m -+CONFIG_NLS_CODEPAGE_869=m -+CONFIG_NLS_CODEPAGE_936=m -+CONFIG_NLS_CODEPAGE_950=m -+CONFIG_NLS_CODEPAGE_932=m -+CONFIG_NLS_CODEPAGE_949=m -+CONFIG_NLS_CODEPAGE_874=m -+CONFIG_NLS_ISO8859_8=m -+CONFIG_NLS_CODEPAGE_1250=m -+CONFIG_NLS_CODEPAGE_1251=m -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+CONFIG_NLS_ISO8859_2=m -+CONFIG_NLS_ISO8859_3=m -+CONFIG_NLS_ISO8859_4=m -+CONFIG_NLS_ISO8859_5=m -+CONFIG_NLS_ISO8859_6=m -+CONFIG_NLS_ISO8859_7=m -+CONFIG_NLS_ISO8859_9=m -+CONFIG_NLS_ISO8859_13=m -+CONFIG_NLS_ISO8859_14=m -+CONFIG_NLS_ISO8859_15=m -+CONFIG_NLS_KOI8_R=m -+CONFIG_NLS_KOI8_U=m -+CONFIG_DLM=m -+CONFIG_CRYPTO_USER=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_XTS=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_SHA512=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_LZ4=m -+CONFIG_CRYPTO_USER_API_SKCIPHER=m -+# CONFIG_CRYPTO_HW is not set -+CONFIG_CRC_ITU_T=y -+CONFIG_LIBCRC32C=y -+CONFIG_PRINTK_TIME=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DETECT_HUNG_TASK=y -+# CONFIG_RCU_TRACE is not set -+CONFIG_LATENCYTOP=y -+CONFIG_IRQSOFF_TRACER=y -+CONFIG_SCHED_TRACER=y -+CONFIG_STACK_TRACER=y -+CONFIG_BLK_DEV_IO_TRACE=y -+# CONFIG_UPROBE_EVENTS is not set -+CONFIG_FUNCTION_PROFILER=y -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y ---- /dev/null -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -0,0 +1,1353 @@ -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_GENERIC_IRQ_DEBUGFS=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=m -+CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_NAMESPACES=y -+CONFIG_USER_NS=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_PROFILING=y -+CONFIG_ARCH_MULTI_V6=y -+# CONFIG_ARCH_MULTI_V7 is not set -+CONFIG_ARCH_BCM=y -+CONFIG_ARCH_BCM2835=y -+# CONFIG_CACHE_L2X0 is not set -+# CONFIG_CPU_SW_DOMAIN_PAN is not set -+CONFIG_UACCESS_WITH_MEMCPY=y -+CONFIG_SECCOMP=y -+# CONFIG_ATAGS is not set -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_STAT=y -+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -+CONFIG_CPU_FREQ_GOV_USERSPACE=y -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+CONFIG_VFP=y -+# CONFIG_SUSPEND is not set -+CONFIG_PM=y -+CONFIG_RASPBERRYPI_FIRMWARE=y -+CONFIG_ARM_CRYPTO=y -+CONFIG_CRYPTO_SHA1_ARM=m -+CONFIG_CRYPTO_AES_ARM=m -+CONFIG_OPROFILE=m -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_BINFMT_MISC=m -+CONFIG_CLEANCACHE=y -+CONFIG_FRONTSWAP=y -+CONFIG_CMA=y -+CONFIG_ZSMALLOC=m -+CONFIG_PGTABLE_MAPPING=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE_DEMUX=m -+CONFIG_NET_IPGRE=m -+CONFIG_IP_MROUTE=y -+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IP_PIMSM_V1=y -+CONFIG_IP_PIMSM_V2=y -+CONFIG_SYN_COOKIES=y -+CONFIG_NET_IPVTI=m -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_DIAG=m -+CONFIG_TCP_CONG_ADVANCED=y -+CONFIG_TCP_CONG_BBR=m -+CONFIG_IPV6=m -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_IPV6_ROUTE_INFO=y -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+CONFIG_IPV6_SIT_6RD=y -+CONFIG_IPV6_TUNNEL=m -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_IPV6_SUBTREES=y -+CONFIG_IPV6_MROUTE=y -+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IPV6_PIMSM_V2=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CONNTRACK_ZONES=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_TIMESTAMP=y -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_SNMP=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NF_CT_NETLINK=m -+CONFIG_NETFILTER_XT_SET=m -+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HMARK=m -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_LOG=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_TEE=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -+CONFIG_NETFILTER_XT_MATCH_BPF=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_CPU=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_IPVS=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_NFACCT=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_IP_SET=m -+CONFIG_IP_SET_BITMAP_IP=m -+CONFIG_IP_SET_BITMAP_IPMAC=m -+CONFIG_IP_SET_BITMAP_PORT=m -+CONFIG_IP_SET_HASH_IP=m -+CONFIG_IP_SET_HASH_IPPORT=m -+CONFIG_IP_SET_HASH_IPPORTIP=m -+CONFIG_IP_SET_HASH_IPPORTNET=m -+CONFIG_IP_SET_HASH_NET=m -+CONFIG_IP_SET_HASH_NETPORT=m -+CONFIG_IP_SET_HASH_NETIFACE=m -+CONFIG_IP_SET_LIST_SET=m -+CONFIG_IP_VS=m -+CONFIG_IP_VS_PROTO_TCP=y -+CONFIG_IP_VS_PROTO_UDP=y -+CONFIG_IP_VS_PROTO_ESP=y -+CONFIG_IP_VS_PROTO_AH=y -+CONFIG_IP_VS_PROTO_SCTP=y -+CONFIG_IP_VS_RR=m -+CONFIG_IP_VS_WRR=m -+CONFIG_IP_VS_LC=m -+CONFIG_IP_VS_WLC=m -+CONFIG_IP_VS_LBLC=m -+CONFIG_IP_VS_LBLCR=m -+CONFIG_IP_VS_DH=m -+CONFIG_IP_VS_SH=m -+CONFIG_IP_VS_SED=m -+CONFIG_IP_VS_NQ=m -+CONFIG_IP_VS_FTP=m -+CONFIG_IP_VS_PE_SIP=m -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_RPFILTER=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_NAT=m -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_IP_NF_MANGLE=m -+CONFIG_IP_NF_TARGET_CLUSTERIP=m -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RPFILTER=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_IP6_NF_NAT=m -+CONFIG_IP6_NF_TARGET_MASQUERADE=m -+CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+CONFIG_SCTP_COOKIE_HMAC_SHA1=y -+CONFIG_ATM=m -+CONFIG_L2TP=m -+CONFIG_L2TP_V3=y -+CONFIG_L2TP_IP=m -+CONFIG_L2TP_ETH=m -+CONFIG_BRIDGE=m -+CONFIG_VLAN_8021Q=m -+CONFIG_VLAN_8021Q_GVRP=y -+CONFIG_ATALK=m -+CONFIG_6LOWPAN=m -+CONFIG_IEEE802154=m -+CONFIG_IEEE802154_6LOWPAN=m -+CONFIG_MAC802154=m -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_ATM=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFB=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+CONFIG_NET_SCH_MQPRIO=m -+CONFIG_NET_SCH_CHOKE=m -+CONFIG_NET_SCH_QFQ=m -+CONFIG_NET_SCH_CODEL=m -+CONFIG_NET_SCH_FQ_CODEL=m -+CONFIG_NET_SCH_FQ=m -+CONFIG_NET_SCH_HHF=m -+CONFIG_NET_SCH_PIE=m -+CONFIG_NET_SCH_INGRESS=m -+CONFIG_NET_SCH_PLUG=m -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_CLS_CGROUP=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_EMATCH_IPSET=m -+CONFIG_NET_CLS_ACT=y -+CONFIG_NET_ACT_POLICE=m -+CONFIG_NET_ACT_GACT=m -+CONFIG_GACT_PROB=y -+CONFIG_NET_ACT_MIRRED=m -+CONFIG_NET_ACT_IPT=m -+CONFIG_NET_ACT_NAT=m -+CONFIG_NET_ACT_PEDIT=m -+CONFIG_NET_ACT_SIMP=m -+CONFIG_NET_ACT_SKBEDIT=m -+CONFIG_NET_ACT_CSUM=m -+CONFIG_BATMAN_ADV=m -+CONFIG_OPENVSWITCH=m -+CONFIG_NET_PKTGEN=m -+CONFIG_HAMRADIO=y -+CONFIG_AX25=m -+CONFIG_NETROM=m -+CONFIG_ROSE=m -+CONFIG_MKISS=m -+CONFIG_6PACK=m -+CONFIG_BPQETHER=m -+CONFIG_BAYCOM_SER_FDX=m -+CONFIG_BAYCOM_SER_HDX=m -+CONFIG_YAM=m -+CONFIG_CAN=m -+CONFIG_CAN_VCAN=m -+CONFIG_CAN_SLCAN=m -+CONFIG_CAN_MCP251X=m -+CONFIG_CAN_GS_USB=m -+CONFIG_BT=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+CONFIG_BT_BNEP_MC_FILTER=y -+CONFIG_BT_BNEP_PROTO_FILTER=y -+CONFIG_BT_HIDP=m -+CONFIG_BT_6LOWPAN=m -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIUART=m -+CONFIG_BT_HCIUART_3WIRE=y -+CONFIG_BT_HCIUART_BCM=y -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+CONFIG_BT_ATH3K=m -+CONFIG_BT_WILINK=m -+CONFIG_CFG80211=m -+CONFIG_MAC80211=m -+CONFIG_MAC80211_MESH=y -+CONFIG_WIMAX=m -+CONFIG_RFKILL=m -+CONFIG_RFKILL_INPUT=y -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_DEVTMPFS=y -+CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_DMA_CMA=y -+CONFIG_CMA_SIZE_MBYTES=5 -+CONFIG_MTD=m -+CONFIG_MTD_BLOCK=m -+CONFIG_MTD_M25P80=m -+CONFIG_MTD_BLOCK2MTD=m -+CONFIG_MTD_NAND=m -+CONFIG_MTD_SPI_NOR=m -+CONFIG_MTD_UBI=m -+CONFIG_OF_CONFIGFS=y -+CONFIG_ZRAM=m -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_DRBD=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_ATA_OVER_ETH=m -+CONFIG_EEPROM_AT24=m -+CONFIG_TI_ST=m -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_CHR_DEV_ST=m -+CONFIG_CHR_DEV_OSST=m -+CONFIG_BLK_DEV_SR=m -+CONFIG_CHR_DEV_SG=m -+CONFIG_SCSI_ISCSI_ATTRS=y -+CONFIG_ISCSI_TCP=m -+CONFIG_ISCSI_BOOT_SYSFS=m -+CONFIG_MD=y -+CONFIG_MD_LINEAR=m -+CONFIG_BLK_DEV_DM=m -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_THIN_PROVISIONING=m -+CONFIG_DM_CACHE=m -+CONFIG_DM_MIRROR=m -+CONFIG_DM_LOG_USERSPACE=m -+CONFIG_DM_RAID=m -+CONFIG_DM_ZERO=m -+CONFIG_DM_DELAY=m -+CONFIG_NETDEVICES=y -+CONFIG_BONDING=m -+CONFIG_DUMMY=m -+CONFIG_IFB=m -+CONFIG_MACVLAN=m -+CONFIG_IPVLAN=m -+CONFIG_VXLAN=m -+CONFIG_NETCONSOLE=m -+CONFIG_TUN=m -+CONFIG_VETH=m -+CONFIG_ENC28J60=m -+CONFIG_QCA7000_SPI=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_PPP=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_MPPE=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPPOATM=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+CONFIG_SLIP_SMART=y -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_RTL8152=m -+CONFIG_USB_LAN78XX=m -+CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX8817X=m -+CONFIG_USB_NET_AX88179_178A=m -+CONFIG_USB_NET_CDCETHER=m -+CONFIG_USB_NET_CDC_EEM=m -+CONFIG_USB_NET_CDC_NCM=m -+CONFIG_USB_NET_HUAWEI_CDC_NCM=m -+CONFIG_USB_NET_CDC_MBIM=m -+CONFIG_USB_NET_DM9601=m -+CONFIG_USB_NET_SR9700=m -+CONFIG_USB_NET_SR9800=m -+CONFIG_USB_NET_SMSC75XX=m -+CONFIG_USB_NET_SMSC95XX=y -+CONFIG_USB_NET_GL620A=m -+CONFIG_USB_NET_NET1080=m -+CONFIG_USB_NET_PLUSB=m -+CONFIG_USB_NET_MCS7830=m -+CONFIG_USB_NET_CDC_SUBSET=m -+CONFIG_USB_ALI_M5632=y -+CONFIG_USB_AN2720=y -+CONFIG_USB_EPSON2888=y -+CONFIG_USB_KC2190=y -+CONFIG_USB_NET_ZAURUS=m -+CONFIG_USB_NET_CX82310_ETH=m -+CONFIG_USB_NET_KALMIA=m -+CONFIG_USB_NET_QMI_WWAN=m -+CONFIG_USB_HSO=m -+CONFIG_USB_NET_INT51X1=m -+CONFIG_USB_IPHETH=m -+CONFIG_USB_SIERRA_NET=m -+CONFIG_USB_VL600=m -+CONFIG_ATH9K=m -+CONFIG_ATH9K_HTC=m -+CONFIG_CARL9170=m -+CONFIG_ATH6KL=m -+CONFIG_ATH6KL_USB=m -+CONFIG_AR5523=m -+CONFIG_AT76C50X_USB=m -+CONFIG_B43=m -+# CONFIG_B43_PHY_N is not set -+CONFIG_B43LEGACY=m -+CONFIG_BRCMFMAC=m -+CONFIG_BRCMFMAC_USB=y -+CONFIG_BRCMDBG=y -+CONFIG_HOSTAP=m -+CONFIG_P54_COMMON=m -+CONFIG_P54_USB=m -+CONFIG_LIBERTAS=m -+CONFIG_LIBERTAS_USB=m -+CONFIG_LIBERTAS_SDIO=m -+CONFIG_LIBERTAS_THINFIRM=m -+CONFIG_LIBERTAS_THINFIRM_USB=m -+CONFIG_MWIFIEX=m -+CONFIG_MWIFIEX_SDIO=m -+CONFIG_MT7601U=m -+CONFIG_RT2X00=m -+CONFIG_RT2500USB=m -+CONFIG_RT73USB=m -+CONFIG_RT2800USB=m -+CONFIG_RT2800USB_RT3573=y -+CONFIG_RT2800USB_RT53XX=y -+CONFIG_RT2800USB_RT55XX=y -+CONFIG_RT2800USB_UNKNOWN=y -+CONFIG_RTL8187=m -+CONFIG_RTL8192CU=m -+CONFIG_RTL8XXXU=m -+CONFIG_USB_ZD1201=m -+CONFIG_ZD1211RW=m -+CONFIG_MAC80211_HWSIM=m -+CONFIG_USB_NET_RNDIS_WLAN=m -+CONFIG_WIMAX_I2400M_USB=m -+CONFIG_IEEE802154_AT86RF230=m -+CONFIG_IEEE802154_MRF24J40=m -+CONFIG_IEEE802154_CC2520=m -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_JOYDEV=m -+CONFIG_INPUT_EVDEV=m -+# CONFIG_KEYBOARD_ATKBD is not set -+CONFIG_KEYBOARD_GPIO=m -+CONFIG_KEYBOARD_MATRIX=m -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_IFORCE=m -+CONFIG_JOYSTICK_IFORCE_USB=y -+CONFIG_JOYSTICK_XPAD=m -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_JOYSTICK_PSXPAD_SPI=m -+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y -+CONFIG_JOYSTICK_RPISENSE=m -+CONFIG_INPUT_TOUCHSCREEN=y -+CONFIG_TOUCHSCREEN_ADS7846=m -+CONFIG_TOUCHSCREEN_EGALAX=m -+CONFIG_TOUCHSCREEN_EXC3000=m -+CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_EDT_FT5X06=m -+CONFIG_TOUCHSCREEN_RPI_FT5406=m -+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -+CONFIG_TOUCHSCREEN_STMPE=m -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_AD714X=m -+CONFIG_INPUT_ATI_REMOTE2=m -+CONFIG_INPUT_KEYSPAN_REMOTE=m -+CONFIG_INPUT_POWERMATE=m -+CONFIG_INPUT_YEALINK=m -+CONFIG_INPUT_CM109=m -+CONFIG_INPUT_UINPUT=m -+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -+CONFIG_INPUT_ADXL34X=m -+CONFIG_INPUT_CMA3000=m -+CONFIG_SERIO=m -+CONFIG_SERIO_RAW=m -+CONFIG_GAMEPORT=m -+CONFIG_GAMEPORT_NS558=m -+CONFIG_GAMEPORT_L4=m -+CONFIG_BRCM_CHAR_DRIVERS=y -+CONFIG_BCM_VCIO=y -+CONFIG_BCM_VC_SM=y -+CONFIG_BCM2835_DEVGPIOMEM=y -+# CONFIG_LEGACY_PTYS is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_DMA is not set -+CONFIG_SERIAL_8250_NR_UARTS=1 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=0 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_BCM2835AUX=y -+CONFIG_SERIAL_OF_PLATFORM=y -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_SERIAL_SC16IS7XX=m -+CONFIG_SERIAL_SC16IS7XX_SPI=y -+CONFIG_SERIAL_DEV_BUS=m -+CONFIG_TTY_PRINTK=y -+CONFIG_HW_RANDOM=y -+CONFIG_RAW_DRIVER=y -+CONFIG_I2C=y -+CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_MUX=m -+CONFIG_I2C_MUX_GPMUX=m -+CONFIG_I2C_MUX_PCA954x=m -+CONFIG_I2C_BCM2708=m -+CONFIG_I2C_BCM2835=m -+CONFIG_I2C_GPIO=m -+CONFIG_I2C_ROBOTFUZZ_OSIF=m -+CONFIG_I2C_TINY_USB=m -+CONFIG_SPI=y -+CONFIG_SPI_BCM2835=m -+CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_GPIO=m -+CONFIG_SPI_SPIDEV=m -+CONFIG_SPI_SLAVE=y -+CONFIG_PPS=m -+CONFIG_PPS_CLIENT_LDISC=m -+CONFIG_PPS_CLIENT_GPIO=m -+CONFIG_PINCTRL_MCP23S08=m -+CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCF857X=m -+CONFIG_GPIO_ARIZONA=m -+CONFIG_GPIO_STMPE=y -+CONFIG_W1=m -+CONFIG_W1_MASTER_DS2490=m -+CONFIG_W1_MASTER_DS2482=m -+CONFIG_W1_MASTER_DS1WM=m -+CONFIG_W1_MASTER_GPIO=m -+CONFIG_W1_SLAVE_THERM=m -+CONFIG_W1_SLAVE_SMEM=m -+CONFIG_W1_SLAVE_DS2408=m -+CONFIG_W1_SLAVE_DS2413=m -+CONFIG_W1_SLAVE_DS2406=m -+CONFIG_W1_SLAVE_DS2423=m -+CONFIG_W1_SLAVE_DS2431=m -+CONFIG_W1_SLAVE_DS2433=m -+CONFIG_W1_SLAVE_DS2438=m -+CONFIG_W1_SLAVE_DS2780=m -+CONFIG_W1_SLAVE_DS2781=m -+CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_POWER_RESET=y -+CONFIG_POWER_RESET_GPIO=y -+CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_GAUGE_LTC2941=m -+CONFIG_HWMON=m -+CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_JC42=m -+CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_SHT21=m -+CONFIG_SENSORS_SHT3x=m -+CONFIG_SENSORS_SHTC1=m -+CONFIG_SENSORS_ADS1015=m -+CONFIG_SENSORS_INA2XX=m -+CONFIG_SENSORS_TMP102=m -+CONFIG_THERMAL=y -+CONFIG_BCM2835_THERMAL=y -+CONFIG_WATCHDOG=y -+CONFIG_GPIO_WATCHDOG=m -+CONFIG_BCM2835_WDT=y -+CONFIG_MFD_STMPE=y -+CONFIG_STMPE_SPI=y -+CONFIG_MFD_ARIZONA_I2C=m -+CONFIG_MFD_ARIZONA_SPI=m -+CONFIG_MFD_WM5102=y -+CONFIG_REGULATOR=y -+CONFIG_REGULATOR_FIXED_VOLTAGE=m -+CONFIG_REGULATOR_ARIZONA_LDO1=m -+CONFIG_REGULATOR_ARIZONA_MICSUPP=m -+CONFIG_RC_CORE=y -+CONFIG_LIRC=y -+CONFIG_RC_DECODERS=y -+CONFIG_IR_NEC_DECODER=m -+CONFIG_IR_RC5_DECODER=m -+CONFIG_IR_RC6_DECODER=m -+CONFIG_IR_JVC_DECODER=m -+CONFIG_IR_SONY_DECODER=m -+CONFIG_IR_SANYO_DECODER=m -+CONFIG_IR_SHARP_DECODER=m -+CONFIG_IR_MCE_KBD_DECODER=m -+CONFIG_IR_XMP_DECODER=m -+CONFIG_IR_IMON_DECODER=m -+CONFIG_RC_DEVICES=y -+CONFIG_RC_ATI_REMOTE=m -+CONFIG_IR_IMON=m -+CONFIG_IR_MCEUSB=m -+CONFIG_IR_REDRAT3=m -+CONFIG_IR_STREAMZAP=m -+CONFIG_IR_IGUANA=m -+CONFIG_IR_TTUSBIR=m -+CONFIG_RC_LOOPBACK=m -+CONFIG_IR_GPIO_CIR=m -+CONFIG_IR_GPIO_TX=m -+CONFIG_IR_PWM_TX=m -+CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y -+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -+CONFIG_MEDIA_RADIO_SUPPORT=y -+CONFIG_MEDIA_CONTROLLER=y -+CONFIG_MEDIA_USB_SUPPORT=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_BENQ=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_CPIA1=m -+CONFIG_USB_GSPCA_DTCS033=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_JL2005BCD=m -+CONFIG_USB_GSPCA_KINECT=m -+CONFIG_USB_GSPCA_KONICA=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_NW80X=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_OV534_9=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SE401=m -+CONFIG_USB_GSPCA_SN9C2028=m -+CONFIG_USB_GSPCA_SN9C20X=m -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SPCA1528=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_SQ930X=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STK1135=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TOPRO=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_VICAM=m -+CONFIG_USB_GSPCA_XIRLINK_CIT=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_USB_PWC=m -+CONFIG_VIDEO_CPIA2=m -+CONFIG_USB_ZR364XX=m -+CONFIG_USB_STKWEBCAM=m -+CONFIG_USB_S2255=m -+CONFIG_VIDEO_USBTV=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_HDPVR=m -+CONFIG_VIDEO_USBVISION=m -+CONFIG_VIDEO_STK1160_COMMON=m -+CONFIG_VIDEO_GO7007=m -+CONFIG_VIDEO_GO7007_USB=m -+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -+CONFIG_VIDEO_AU0828=m -+CONFIG_VIDEO_AU0828_RC=y -+CONFIG_VIDEO_CX231XX=m -+CONFIG_VIDEO_CX231XX_ALSA=m -+CONFIG_VIDEO_CX231XX_DVB=m -+CONFIG_VIDEO_TM6000=m -+CONFIG_VIDEO_TM6000_ALSA=m -+CONFIG_VIDEO_TM6000_DVB=m -+CONFIG_DVB_USB=m -+CONFIG_DVB_USB_A800=m -+CONFIG_DVB_USB_DIBUSB_MB=m -+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -+CONFIG_DVB_USB_DIBUSB_MC=m -+CONFIG_DVB_USB_DIB0700=m -+CONFIG_DVB_USB_UMT_010=m -+CONFIG_DVB_USB_CXUSB=m -+CONFIG_DVB_USB_M920X=m -+CONFIG_DVB_USB_DIGITV=m -+CONFIG_DVB_USB_VP7045=m -+CONFIG_DVB_USB_VP702X=m -+CONFIG_DVB_USB_GP8PSK=m -+CONFIG_DVB_USB_NOVA_T_USB2=m -+CONFIG_DVB_USB_TTUSB2=m -+CONFIG_DVB_USB_DTT200U=m -+CONFIG_DVB_USB_OPERA1=m -+CONFIG_DVB_USB_AF9005=m -+CONFIG_DVB_USB_AF9005_REMOTE=m -+CONFIG_DVB_USB_PCTV452E=m -+CONFIG_DVB_USB_DW2102=m -+CONFIG_DVB_USB_CINERGY_T2=m -+CONFIG_DVB_USB_DTV5100=m -+CONFIG_DVB_USB_AZ6027=m -+CONFIG_DVB_USB_TECHNISAT_USB2=m -+CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9015=m -+CONFIG_DVB_USB_AF9035=m -+CONFIG_DVB_USB_ANYSEE=m -+CONFIG_DVB_USB_AU6610=m -+CONFIG_DVB_USB_AZ6007=m -+CONFIG_DVB_USB_CE6230=m -+CONFIG_DVB_USB_EC168=m -+CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_LME2510=m -+CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_RTL28XXU=m -+CONFIG_DVB_USB_DVBSKY=m -+CONFIG_SMS_USB_DRV=m -+CONFIG_DVB_B2C2_FLEXCOP_USB=m -+CONFIG_DVB_AS102=m -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_V4L2=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_RADIO_SI470X=m -+CONFIG_USB_SI470X=m -+CONFIG_I2C_SI470X=m -+CONFIG_RADIO_SI4713=m -+CONFIG_I2C_SI4713=m -+CONFIG_USB_MR800=m -+CONFIG_USB_DSBR=m -+CONFIG_RADIO_SHARK=m -+CONFIG_RADIO_SHARK2=m -+CONFIG_USB_KEENE=m -+CONFIG_USB_MA901=m -+CONFIG_RADIO_TEA5764=m -+CONFIG_RADIO_SAA7706H=m -+CONFIG_RADIO_TEF6862=m -+CONFIG_RADIO_WL1273=m -+CONFIG_RADIO_WL128X=m -+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -+CONFIG_VIDEO_UDA1342=m -+CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_TW2804=m -+CONFIG_VIDEO_TW9903=m -+CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV7640=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_DRM=m -+CONFIG_DRM_LOAD_EDID_FIRMWARE=y -+CONFIG_DRM_UDL=m -+CONFIG_DRM_PANEL_SIMPLE=m -+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -+CONFIG_DRM_VC4=m -+CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_MI0283QT=m -+CONFIG_TINYDRM_REPAPER=m -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_FB_UDL=m -+CONFIG_FB_SSD1307=m -+CONFIG_FB_RPISENSE=m -+# CONFIG_BACKLIGHT_GENERIC is not set -+CONFIG_BACKLIGHT_RPI=m -+CONFIG_BACKLIGHT_GPIO=m -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+CONFIG_SND=m -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQUENCER=m -+CONFIG_SND_SEQ_DUMMY=m -+CONFIG_SND_DUMMY=m -+CONFIG_SND_ALOOP=m -+CONFIG_SND_VIRMIDI=m -+CONFIG_SND_MTPAV=m -+CONFIG_SND_SERIAL_U16550=m -+CONFIG_SND_MPU401=m -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_UA101=m -+CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_CAIAQ_INPUT=y -+CONFIG_SND_USB_6FIRE=m -+CONFIG_SND_USB_HIFACE=m -+CONFIG_SND_SOC=m -+CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m -+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -+CONFIG_SND_BCM2708_SOC_RPI_DAC=m -+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m -+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m -+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_DIGIDAC1_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m -+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m -+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m -+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m -+CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_ADAU1701=m -+CONFIG_SND_SOC_ADAU7002=m -+CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_SPDIF=m -+CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SIMPLE_CARD=m -+CONFIG_HID_BATTERY_STRENGTH=y -+CONFIG_HIDRAW=y -+CONFIG_UHID=m -+CONFIG_HID_A4TECH=m -+CONFIG_HID_ACRUX=m -+CONFIG_HID_APPLE=m -+CONFIG_HID_ASUS=m -+CONFIG_HID_BELKIN=m -+CONFIG_HID_BETOP_FF=m -+CONFIG_HID_CHERRY=m -+CONFIG_HID_CHICONY=m -+CONFIG_HID_CYPRESS=m -+CONFIG_HID_DRAGONRISE=m -+CONFIG_HID_EMS_FF=m -+CONFIG_HID_ELECOM=m -+CONFIG_HID_ELO=m -+CONFIG_HID_EZKEY=m -+CONFIG_HID_GEMBIRD=m -+CONFIG_HID_HOLTEK=m -+CONFIG_HID_KEYTOUCH=m -+CONFIG_HID_KYE=m -+CONFIG_HID_UCLOGIC=m -+CONFIG_HID_WALTOP=m -+CONFIG_HID_GYRATION=m -+CONFIG_HID_TWINHAN=m -+CONFIG_HID_KENSINGTON=m -+CONFIG_HID_LCPOWER=m -+CONFIG_HID_LOGITECH=m -+CONFIG_HID_LOGITECH_DJ=m -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=m -+CONFIG_HID_MICROSOFT=m -+CONFIG_HID_MONTEREY=m -+CONFIG_HID_MULTITOUCH=m -+CONFIG_HID_NTRIG=m -+CONFIG_HID_ORTEK=m -+CONFIG_HID_PANTHERLORD=m -+CONFIG_HID_PETALYNX=m -+CONFIG_HID_PICOLCD=m -+CONFIG_HID_ROCCAT=m -+CONFIG_HID_SAMSUNG=m -+CONFIG_HID_SONY=m -+CONFIG_SONY_FF=y -+CONFIG_HID_SPEEDLINK=m -+CONFIG_HID_SUNPLUS=m -+CONFIG_HID_GREENASIA=m -+CONFIG_HID_SMARTJOYPLUS=m -+CONFIG_HID_TOPSEED=m -+CONFIG_HID_THINGM=m -+CONFIG_HID_THRUSTMASTER=m -+CONFIG_HID_WACOM=m -+CONFIG_HID_WIIMOTE=m -+CONFIG_HID_XINMO=m -+CONFIG_HID_ZEROPLUS=m -+CONFIG_HID_ZYDACRON=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_MON=m -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_PRINTER=m -+CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE_REALTEK=m -+CONFIG_USB_STORAGE_DATAFAB=m -+CONFIG_USB_STORAGE_FREECOM=m -+CONFIG_USB_STORAGE_ISD200=m -+CONFIG_USB_STORAGE_USBAT=m -+CONFIG_USB_STORAGE_SDDR09=m -+CONFIG_USB_STORAGE_SDDR55=m -+CONFIG_USB_STORAGE_JUMPSHOT=m -+CONFIG_USB_STORAGE_ALAUDA=m -+CONFIG_USB_STORAGE_ONETOUCH=m -+CONFIG_USB_STORAGE_KARMA=m -+CONFIG_USB_STORAGE_CYPRESS_ATACB=m -+CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_MDC800=m -+CONFIG_USB_MICROTEK=m -+CONFIG_USBIP_CORE=m -+CONFIG_USBIP_VHCI_HCD=m -+CONFIG_USBIP_HOST=m -+CONFIG_USB_DWC2=m -+CONFIG_USB_SERIAL=m -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_F81232=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_METRO=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QCAUX=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_SAFE=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_XSENS_MT=m -+CONFIG_USB_SERIAL_WISHBONE=m -+CONFIG_USB_SERIAL_SSU100=m -+CONFIG_USB_SERIAL_QT2=m -+CONFIG_USB_SERIAL_DEBUG=m -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+CONFIG_USB_ADUTUX=m -+CONFIG_USB_SEVSEG=m -+CONFIG_USB_RIO500=m -+CONFIG_USB_LEGOTOWER=m -+CONFIG_USB_LCD=m -+CONFIG_USB_CYPRESS_CY7C63=m -+CONFIG_USB_CYTHERM=m -+CONFIG_USB_IDMOUSE=m -+CONFIG_USB_FTDI_ELAN=m -+CONFIG_USB_APPLEDISPLAY=m -+CONFIG_USB_LD=m -+CONFIG_USB_TRANCEVIBRATOR=m -+CONFIG_USB_IOWARRIOR=m -+CONFIG_USB_TEST=m -+CONFIG_USB_ISIGHTFW=m -+CONFIG_USB_YUREX=m -+CONFIG_USB_ATM=m -+CONFIG_USB_SPEEDTOUCH=m -+CONFIG_USB_CXACRU=m -+CONFIG_USB_UEAGLEATM=m -+CONFIG_USB_XUSBATM=m -+CONFIG_USB_GADGET=m -+CONFIG_USB_ZERO=m -+CONFIG_USB_AUDIO=m -+CONFIG_USB_ETH=m -+CONFIG_USB_GADGETFS=m -+CONFIG_USB_MASS_STORAGE=m -+CONFIG_USB_G_SERIAL=m -+CONFIG_USB_MIDI_GADGET=m -+CONFIG_USB_G_PRINTER=m -+CONFIG_USB_CDC_COMPOSITE=m -+CONFIG_USB_G_ACM_MS=m -+CONFIG_USB_G_MULTI=m -+CONFIG_USB_G_HID=m -+CONFIG_USB_G_WEBCAM=m -+CONFIG_MMC=y -+CONFIG_MMC_BLOCK_MINORS=32 -+CONFIG_MMC_BCM2835_MMC=y -+CONFIG_MMC_BCM2835_DMA=y -+CONFIG_MMC_BCM2835_SDHOST=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SPI=m -+CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_ONESHOT=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+CONFIG_LEDS_TRIGGER_BACKLIGHT=y -+CONFIG_LEDS_TRIGGER_CPU=y -+CONFIG_LEDS_TRIGGER_GPIO=y -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+CONFIG_LEDS_TRIGGER_TRANSIENT=m -+CONFIG_LEDS_TRIGGER_CAMERA=m -+CONFIG_LEDS_TRIGGER_INPUT=y -+CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+CONFIG_RTC_DRV_ABX80X=m -+CONFIG_RTC_DRV_DS1307=m -+CONFIG_RTC_DRV_DS1374=m -+CONFIG_RTC_DRV_DS1672=m -+CONFIG_RTC_DRV_MAX6900=m -+CONFIG_RTC_DRV_RS5C372=m -+CONFIG_RTC_DRV_ISL1208=m -+CONFIG_RTC_DRV_ISL12022=m -+CONFIG_RTC_DRV_X1205=m -+CONFIG_RTC_DRV_PCF8523=m -+CONFIG_RTC_DRV_PCF8563=m -+CONFIG_RTC_DRV_PCF8583=m -+CONFIG_RTC_DRV_M41T80=m -+CONFIG_RTC_DRV_BQ32K=m -+CONFIG_RTC_DRV_S35390A=m -+CONFIG_RTC_DRV_FM3130=m -+CONFIG_RTC_DRV_RX8581=m -+CONFIG_RTC_DRV_RX8025=m -+CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_M41T93=m -+CONFIG_RTC_DRV_M41T94=m -+CONFIG_RTC_DRV_DS1302=m -+CONFIG_RTC_DRV_DS1305=m -+CONFIG_RTC_DRV_DS1390=m -+CONFIG_RTC_DRV_R9701=m -+CONFIG_RTC_DRV_RX4581=m -+CONFIG_RTC_DRV_RS5C348=m -+CONFIG_RTC_DRV_MAX6902=m -+CONFIG_RTC_DRV_PCF2123=m -+CONFIG_RTC_DRV_DS3232=m -+CONFIG_RTC_DRV_PCF2127=m -+CONFIG_RTC_DRV_RV3029C2=m -+CONFIG_DMADEVICES=y -+CONFIG_DMA_BCM2835=y -+CONFIG_DMA_BCM2708=y -+CONFIG_UIO=m -+CONFIG_UIO_PDRV_GENIRQ=m -+CONFIG_STAGING=y -+CONFIG_PRISM2_USB=m -+CONFIG_R8712U=m -+CONFIG_R8188EU=m -+CONFIG_VT6656=m -+CONFIG_SPEAKUP=m -+CONFIG_SPEAKUP_SYNTH_SOFT=m -+CONFIG_STAGING_MEDIA=y -+CONFIG_FB_TFT=m -+CONFIG_FB_TFT_AGM1264K_FL=m -+CONFIG_FB_TFT_BD663474=m -+CONFIG_FB_TFT_HX8340BN=m -+CONFIG_FB_TFT_HX8347D=m -+CONFIG_FB_TFT_HX8353D=m -+CONFIG_FB_TFT_HX8357D=m -+CONFIG_FB_TFT_ILI9163=m -+CONFIG_FB_TFT_ILI9320=m -+CONFIG_FB_TFT_ILI9325=m -+CONFIG_FB_TFT_ILI9340=m -+CONFIG_FB_TFT_ILI9341=m -+CONFIG_FB_TFT_ILI9481=m -+CONFIG_FB_TFT_ILI9486=m -+CONFIG_FB_TFT_PCD8544=m -+CONFIG_FB_TFT_RA8875=m -+CONFIG_FB_TFT_S6D02A1=m -+CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SSD1289=m -+CONFIG_FB_TFT_SSD1306=m -+CONFIG_FB_TFT_SSD1331=m -+CONFIG_FB_TFT_SSD1351=m -+CONFIG_FB_TFT_ST7735R=m -+CONFIG_FB_TFT_ST7789V=m -+CONFIG_FB_TFT_TINYLCD=m -+CONFIG_FB_TFT_TLS8204=m -+CONFIG_FB_TFT_UC1701=m -+CONFIG_FB_TFT_UPD161704=m -+CONFIG_FB_TFT_WATTEROTT=m -+CONFIG_FB_FLEX=m -+CONFIG_FB_TFT_FBTFT_DEVICE=m -+CONFIG_BCM2835_VCHIQ=y -+CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m -+CONFIG_MAILBOX=y -+CONFIG_BCM2835_MBOX=y -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_RASPBERRYPI_POWER=y -+CONFIG_EXTCON=m -+CONFIG_EXTCON_ARIZONA=m -+CONFIG_IIO=m -+CONFIG_IIO_BUFFER_CB=m -+CONFIG_MCP320X=m -+CONFIG_MCP3422=m -+CONFIG_DHT11=m -+CONFIG_HDC100X=m -+CONFIG_HTU21=m -+CONFIG_INV_MPU6050_I2C=m -+CONFIG_TSL4531=m -+CONFIG_VEML6070=m -+CONFIG_BMP280=m -+CONFIG_PWM_BCM2835=m -+CONFIG_PWM_PCA9685=m -+CONFIG_RPI_AXIPERF=m -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_REISERFS_FS=m -+CONFIG_REISERFS_FS_XATTR=y -+CONFIG_REISERFS_FS_POSIX_ACL=y -+CONFIG_REISERFS_FS_SECURITY=y -+CONFIG_JFS_FS=m -+CONFIG_JFS_POSIX_ACL=y -+CONFIG_JFS_SECURITY=y -+CONFIG_JFS_STATISTICS=y -+CONFIG_XFS_FS=m -+CONFIG_XFS_QUOTA=y -+CONFIG_XFS_POSIX_ACL=y -+CONFIG_XFS_RT=y -+CONFIG_GFS2_FS=m -+CONFIG_OCFS2_FS=m -+CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS_POSIX_ACL=y -+CONFIG_NILFS2_FS=m -+CONFIG_F2FS_FS=y -+CONFIG_FANOTIFY=y -+CONFIG_QFMT_V1=m -+CONFIG_QFMT_V2=m -+CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m -+CONFIG_OVERLAY_FS=m -+CONFIG_FSCACHE=y -+CONFIG_FSCACHE_STATS=y -+CONFIG_FSCACHE_HISTOGRAM=y -+CONFIG_CACHEFILES=y -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -+CONFIG_NTFS_FS=m -+CONFIG_NTFS_RW=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_ECRYPT_FS=m -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+CONFIG_JFFS2_FS=m -+CONFIG_JFFS2_SUMMARY=y -+CONFIG_UBIFS_FS=m -+CONFIG_SQUASHFS=m -+CONFIG_SQUASHFS_XATTR=y -+CONFIG_SQUASHFS_LZO=y -+CONFIG_SQUASHFS_XZ=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3_ACL=y -+CONFIG_NFS_V4=y -+CONFIG_NFS_SWAP=y -+CONFIG_NFS_V4_1=y -+CONFIG_ROOT_NFS=y -+CONFIG_NFS_FSCACHE=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3_ACL=y -+CONFIG_NFSD_V4=y -+CONFIG_CIFS=m -+CONFIG_CIFS_WEAK_PW_HASH=y -+CONFIG_CIFS_UPCALL=y -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+CONFIG_CIFS_ACL=y -+CONFIG_CIFS_DFS_UPCALL=y -+CONFIG_CIFS_FSCACHE=y -+CONFIG_9P_FS=m -+CONFIG_9P_FS_POSIX_ACL=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_737=m -+CONFIG_NLS_CODEPAGE_775=m -+CONFIG_NLS_CODEPAGE_850=m -+CONFIG_NLS_CODEPAGE_852=m -+CONFIG_NLS_CODEPAGE_855=m -+CONFIG_NLS_CODEPAGE_857=m -+CONFIG_NLS_CODEPAGE_860=m -+CONFIG_NLS_CODEPAGE_861=m -+CONFIG_NLS_CODEPAGE_862=m -+CONFIG_NLS_CODEPAGE_863=m -+CONFIG_NLS_CODEPAGE_864=m -+CONFIG_NLS_CODEPAGE_865=m -+CONFIG_NLS_CODEPAGE_866=m -+CONFIG_NLS_CODEPAGE_869=m -+CONFIG_NLS_CODEPAGE_936=m -+CONFIG_NLS_CODEPAGE_950=m -+CONFIG_NLS_CODEPAGE_932=m -+CONFIG_NLS_CODEPAGE_949=m -+CONFIG_NLS_CODEPAGE_874=m -+CONFIG_NLS_ISO8859_8=m -+CONFIG_NLS_CODEPAGE_1250=m -+CONFIG_NLS_CODEPAGE_1251=m -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+CONFIG_NLS_ISO8859_2=m -+CONFIG_NLS_ISO8859_3=m -+CONFIG_NLS_ISO8859_4=m -+CONFIG_NLS_ISO8859_5=m -+CONFIG_NLS_ISO8859_6=m -+CONFIG_NLS_ISO8859_7=m -+CONFIG_NLS_ISO8859_9=m -+CONFIG_NLS_ISO8859_13=m -+CONFIG_NLS_ISO8859_14=m -+CONFIG_NLS_ISO8859_15=m -+CONFIG_NLS_KOI8_R=m -+CONFIG_NLS_KOI8_U=m -+CONFIG_DLM=m -+CONFIG_CRYPTO_USER=m -+CONFIG_CRYPTO_CRYPTD=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_XTS=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_SHA512=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_LZ4=m -+CONFIG_CRYPTO_USER_API_SKCIPHER=m -+# CONFIG_CRYPTO_HW is not set -+CONFIG_CRC_ITU_T=y -+CONFIG_LIBCRC32C=y -+CONFIG_PRINTK_TIME=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DETECT_HUNG_TASK=y -+CONFIG_LATENCYTOP=y -+CONFIG_IRQSOFF_TRACER=y -+CONFIG_SCHED_TRACER=y -+CONFIG_STACK_TRACER=y -+CONFIG_BLK_DEV_IO_TRACE=y -+# CONFIG_UPROBE_EVENTS is not set -+CONFIG_FUNCTION_PROFILER=y -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y diff --git a/target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch b/target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch index 9c5e644683..695f9a5d25 100644 --- a/target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch +++ b/target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch @@ -41,13 +41,11 @@ Enable bbr module for arm64 .../boot/dts/broadcom/bcm2710-rpi-3-b.dts | 3 + .../dts/broadcom/bcm283x-rpi-lan7515.dtsi | 1 + arch/arm64/boot/dts/overlays | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1289 +++++++++++++++++ 8 files changed, 1302 insertions(+), 6 deletions(-) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi create mode 120000 arch/arm64/boot/dts/overlays - create mode 100644 arch/arm64/configs/bcmrpi3_defconfig diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 393d2b524284..e9bdec0ead72 100644 @@ -55,7 +53,7 @@ index 393d2b524284..e9bdec0ead72 100644 +++ b/arch/arm64/Kconfig.platforms @@ -1,11 +1,5 @@ menu "Platform selection" - + -config ARCH_ACTIONS - bool "Actions Semi Platforms" - select OWL_TIMER @@ -86,7 +84,7 @@ index 1193a9e34bbb..78d23305bc31 100644 +dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb +dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb +dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb - + subdir-y += northstar2 subdir-y += stingray diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts @@ -123,1301 +121,5 @@ index 000000000000..ded08646b6f6 @@ -0,0 +1 @@ +../../../arm/boot/dts/overlays \ No newline at end of file -diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -new file mode 100644 -index 000000000000..ffd9d4cbb4c1 ---- /dev/null -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -0,0 +1,1289 @@ -+CONFIG_LOCALVERSION="-v8" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=m -+CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CPUSETS=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_NAMESPACES=y -+CONFIG_USER_NS=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_PROFILING=y -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_ARCH_BCM2835=y -+# CONFIG_CAVIUM_ERRATUM_22375 is not set -+# CONFIG_CAVIUM_ERRATUM_23154 is not set -+# CONFIG_CAVIUM_ERRATUM_27456 is not set -+CONFIG_SCHED_MC=y -+CONFIG_NR_CPUS=4 -+CONFIG_PREEMPT=y -+CONFIG_HZ_1000=y -+CONFIG_CLEANCACHE=y -+CONFIG_FRONTSWAP=y -+CONFIG_CMA=y -+CONFIG_ZSMALLOC=m -+CONFIG_PGTABLE_MAPPING=y -+CONFIG_SECCOMP=y -+CONFIG_ARMV8_DEPRECATED=y -+CONFIG_SWP_EMULATION=y -+CONFIG_CP15_BARRIER_EMULATION=y -+CONFIG_SETEND_EMULATION=y -+CONFIG_RANDOMIZE_BASE=y -+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" -+CONFIG_BINFMT_MISC=y -+CONFIG_COMPAT=y -+# CONFIG_SUSPEND is not set -+CONFIG_PM=y -+CONFIG_CPU_IDLE=y -+CONFIG_ARM_CPUIDLE=y -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_STAT=y -+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -+CONFIG_CPU_FREQ_GOV_USERSPACE=y -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE_DEMUX=m -+CONFIG_NET_IPGRE=m -+CONFIG_IP_MROUTE=y -+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IP_PIMSM_V1=y -+CONFIG_IP_PIMSM_V2=y -+CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_DIAG=m -+CONFIG_IPV6=m -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+CONFIG_IPV6_TUNNEL=m -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_IPV6_SUBTREES=y -+CONFIG_IPV6_MROUTE=y -+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IPV6_PIMSM_V2=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CONNTRACK_ZONES=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_TIMESTAMP=y -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_SNMP=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NF_CT_NETLINK=m -+CONFIG_NETFILTER_XT_SET=m -+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HMARK=m -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_LOG=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_TEE=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -+CONFIG_NETFILTER_XT_MATCH_BPF=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_CPU=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_IPVS=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_NFACCT=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_IP_SET=m -+CONFIG_IP_SET_BITMAP_IP=m -+CONFIG_IP_SET_BITMAP_IPMAC=m -+CONFIG_IP_SET_BITMAP_PORT=m -+CONFIG_IP_SET_HASH_IP=m -+CONFIG_IP_SET_HASH_IPPORT=m -+CONFIG_IP_SET_HASH_IPPORTIP=m -+CONFIG_IP_SET_HASH_IPPORTNET=m -+CONFIG_IP_SET_HASH_NET=m -+CONFIG_IP_SET_HASH_NETPORT=m -+CONFIG_IP_SET_HASH_NETIFACE=m -+CONFIG_IP_SET_LIST_SET=m -+CONFIG_IP_VS=m -+CONFIG_IP_VS_PROTO_TCP=y -+CONFIG_IP_VS_PROTO_UDP=y -+CONFIG_IP_VS_PROTO_ESP=y -+CONFIG_IP_VS_PROTO_AH=y -+CONFIG_IP_VS_PROTO_SCTP=y -+CONFIG_IP_VS_RR=m -+CONFIG_IP_VS_WRR=m -+CONFIG_IP_VS_LC=m -+CONFIG_IP_VS_WLC=m -+CONFIG_IP_VS_LBLC=m -+CONFIG_IP_VS_LBLCR=m -+CONFIG_IP_VS_DH=m -+CONFIG_IP_VS_SH=m -+CONFIG_IP_VS_SED=m -+CONFIG_IP_VS_NQ=m -+CONFIG_IP_VS_FTP=m -+CONFIG_IP_VS_PE_SIP=m -+CONFIG_NF_CONNTRACK_IPV4=m -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_RPFILTER=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_NAT=m -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_IP_NF_MANGLE=m -+CONFIG_IP_NF_TARGET_CLUSTERIP=m -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_NF_CONNTRACK_IPV6=m -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RPFILTER=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_IP6_NF_NAT=m -+CONFIG_IP6_NF_TARGET_MASQUERADE=m -+CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+CONFIG_SCTP_COOKIE_HMAC_SHA1=y -+CONFIG_ATM=m -+CONFIG_L2TP=m -+CONFIG_L2TP_V3=y -+CONFIG_L2TP_IP=m -+CONFIG_L2TP_ETH=m -+CONFIG_BRIDGE=m -+CONFIG_VLAN_8021Q=m -+CONFIG_VLAN_8021Q_GVRP=y -+CONFIG_ATALK=m -+CONFIG_6LOWPAN=m -+CONFIG_IEEE802154=m -+CONFIG_IEEE802154_6LOWPAN=m -+CONFIG_MAC802154=m -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFB=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+CONFIG_NET_SCH_MQPRIO=m -+CONFIG_NET_SCH_CHOKE=m -+CONFIG_NET_SCH_QFQ=m -+CONFIG_NET_SCH_CODEL=m -+CONFIG_NET_SCH_FQ_CODEL=m -+CONFIG_NET_SCH_INGRESS=m -+CONFIG_NET_SCH_PLUG=m -+CONFIG_NET_SCH_FQ=m -+CONFIG_TCP_CONG_ADVANCED=y -+CONFIG_TCP_CONG_BBR=m -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_CLS_CGROUP=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_EMATCH_IPSET=m -+CONFIG_NET_CLS_ACT=y -+CONFIG_NET_ACT_POLICE=m -+CONFIG_NET_ACT_GACT=m -+CONFIG_GACT_PROB=y -+CONFIG_NET_ACT_MIRRED=m -+CONFIG_NET_ACT_IPT=m -+CONFIG_NET_ACT_NAT=m -+CONFIG_NET_ACT_PEDIT=m -+CONFIG_NET_ACT_SIMP=m -+CONFIG_NET_ACT_SKBEDIT=m -+CONFIG_NET_ACT_CSUM=m -+CONFIG_BATMAN_ADV=m -+CONFIG_OPENVSWITCH=m -+CONFIG_NET_PKTGEN=m -+CONFIG_HAMRADIO=y -+CONFIG_AX25=m -+CONFIG_NETROM=m -+CONFIG_ROSE=m -+CONFIG_MKISS=m -+CONFIG_6PACK=m -+CONFIG_BPQETHER=m -+CONFIG_BAYCOM_SER_FDX=m -+CONFIG_BAYCOM_SER_HDX=m -+CONFIG_YAM=m -+CONFIG_CAN=m -+CONFIG_CAN_VCAN=m -+CONFIG_CAN_MCP251X=m -+CONFIG_BT=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+CONFIG_BT_BNEP_MC_FILTER=y -+CONFIG_BT_BNEP_PROTO_FILTER=y -+CONFIG_BT_HIDP=m -+CONFIG_BT_6LOWPAN=m -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIUART=m -+CONFIG_BT_HCIUART_3WIRE=y -+CONFIG_BT_HCIUART_BCM=y -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+CONFIG_BT_ATH3K=m -+CONFIG_BT_WILINK=m -+CONFIG_CFG80211=m -+CONFIG_MAC80211=m -+CONFIG_MAC80211_MESH=y -+CONFIG_WIMAX=m -+CONFIG_RFKILL=m -+CONFIG_RFKILL_INPUT=y -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_DEVTMPFS=y -+CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_DMA_CMA=y -+CONFIG_CMA_SIZE_MBYTES=5 -+CONFIG_MTD=m -+CONFIG_MTD_BLOCK=m -+CONFIG_MTD_NAND=m -+CONFIG_MTD_UBI=m -+CONFIG_OF_CONFIGFS=y -+CONFIG_ZRAM=m -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_DRBD=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_ATA_OVER_ETH=m -+CONFIG_EEPROM_AT24=m -+CONFIG_TI_ST=m -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_CHR_DEV_ST=m -+CONFIG_CHR_DEV_OSST=m -+CONFIG_BLK_DEV_SR=m -+CONFIG_CHR_DEV_SG=m -+CONFIG_SCSI_ISCSI_ATTRS=y -+CONFIG_ISCSI_TCP=m -+CONFIG_ISCSI_BOOT_SYSFS=m -+CONFIG_MD=y -+CONFIG_MD_LINEAR=m -+CONFIG_BLK_DEV_DM=m -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_THIN_PROVISIONING=m -+CONFIG_DM_CACHE=m -+CONFIG_DM_MIRROR=m -+CONFIG_DM_LOG_USERSPACE=m -+CONFIG_DM_RAID=m -+CONFIG_DM_ZERO=m -+CONFIG_DM_DELAY=m -+CONFIG_NETDEVICES=y -+CONFIG_BONDING=m -+CONFIG_DUMMY=m -+CONFIG_IFB=m -+CONFIG_MACVLAN=m -+CONFIG_VXLAN=m -+CONFIG_NETCONSOLE=m -+CONFIG_TUN=m -+CONFIG_VETH=m -+CONFIG_ENC28J60=m -+CONFIG_QCA7000_SPI=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_PPP=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_MPPE=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPPOATM=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+CONFIG_SLIP_SMART=y -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_RTL8152=m -+CONFIG_USB_LAN78XX=y -+CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX8817X=m -+CONFIG_USB_NET_AX88179_178A=m -+CONFIG_USB_NET_CDCETHER=m -+CONFIG_USB_NET_CDC_EEM=m -+CONFIG_USB_NET_CDC_NCM=m -+CONFIG_USB_NET_HUAWEI_CDC_NCM=m -+CONFIG_USB_NET_CDC_MBIM=m -+CONFIG_USB_NET_DM9601=m -+CONFIG_USB_NET_SR9700=m -+CONFIG_USB_NET_SR9800=m -+CONFIG_USB_NET_SMSC75XX=m -+CONFIG_USB_NET_SMSC95XX=y -+CONFIG_USB_LAN78XX=y -+CONFIG_USB_NET_GL620A=m -+CONFIG_USB_NET_NET1080=m -+CONFIG_USB_NET_PLUSB=m -+CONFIG_USB_NET_MCS7830=m -+CONFIG_USB_NET_CDC_SUBSET=m -+CONFIG_USB_ALI_M5632=y -+CONFIG_USB_AN2720=y -+CONFIG_USB_EPSON2888=y -+CONFIG_USB_KC2190=y -+CONFIG_USB_NET_ZAURUS=m -+CONFIG_USB_NET_CX82310_ETH=m -+CONFIG_USB_NET_KALMIA=m -+CONFIG_USB_NET_QMI_WWAN=m -+CONFIG_USB_HSO=m -+CONFIG_USB_NET_INT51X1=m -+CONFIG_USB_IPHETH=m -+CONFIG_USB_SIERRA_NET=m -+CONFIG_USB_VL600=m -+CONFIG_ATH9K=m -+CONFIG_ATH9K_HTC=m -+CONFIG_CARL9170=m -+CONFIG_ATH6KL=m -+CONFIG_ATH6KL_USB=m -+CONFIG_AR5523=m -+CONFIG_AT76C50X_USB=m -+CONFIG_B43=m -+# CONFIG_B43_PHY_N is not set -+CONFIG_B43LEGACY=m -+CONFIG_BRCMFMAC=m -+CONFIG_BRCMFMAC_USB=y -+CONFIG_HOSTAP=m -+CONFIG_P54_COMMON=m -+CONFIG_P54_USB=m -+CONFIG_LIBERTAS=m -+CONFIG_LIBERTAS_USB=m -+CONFIG_LIBERTAS_SDIO=m -+CONFIG_LIBERTAS_THINFIRM=m -+CONFIG_LIBERTAS_THINFIRM_USB=m -+CONFIG_MWIFIEX=m -+CONFIG_MWIFIEX_SDIO=m -+CONFIG_MT7601U=m -+CONFIG_RT2X00=m -+CONFIG_RT2500USB=m -+CONFIG_RT73USB=m -+CONFIG_RT2800USB=m -+CONFIG_RT2800USB_RT3573=y -+CONFIG_RT2800USB_RT53XX=y -+CONFIG_RT2800USB_RT55XX=y -+CONFIG_RT2800USB_UNKNOWN=y -+CONFIG_RTL8187=m -+CONFIG_RTL8192CU=m -+CONFIG_USB_ZD1201=m -+CONFIG_ZD1211RW=m -+CONFIG_MAC80211_HWSIM=m -+CONFIG_USB_NET_RNDIS_WLAN=m -+CONFIG_WIMAX_I2400M_USB=m -+CONFIG_IEEE802154_AT86RF230=m -+CONFIG_IEEE802154_MRF24J40=m -+CONFIG_IEEE802154_CC2520=m -+CONFIG_INPUT_POLLDEV=m -+CONFIG_INPUT_JOYDEV=m -+CONFIG_INPUT_EVDEV=m -+# CONFIG_KEYBOARD_ATKBD is not set -+CONFIG_KEYBOARD_GPIO=m -+CONFIG_KEYBOARD_MATRIX=m -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_IFORCE=m -+CONFIG_JOYSTICK_IFORCE_USB=y -+CONFIG_JOYSTICK_XPAD=m -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_JOYSTICK_RPISENSE=m -+CONFIG_INPUT_TOUCHSCREEN=y -+CONFIG_TOUCHSCREEN_ADS7846=m -+CONFIG_TOUCHSCREEN_EGALAX=m -+CONFIG_TOUCHSCREEN_EKTF2127=m -+CONFIG_TOUCHSCREEN_RPI_FT5406=m -+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -+CONFIG_TOUCHSCREEN_STMPE=m -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_AD714X=m -+CONFIG_INPUT_ATI_REMOTE2=m -+CONFIG_INPUT_KEYSPAN_REMOTE=m -+CONFIG_INPUT_POWERMATE=m -+CONFIG_INPUT_YEALINK=m -+CONFIG_INPUT_CM109=m -+CONFIG_INPUT_UINPUT=m -+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -+CONFIG_INPUT_ADXL34X=m -+CONFIG_INPUT_CMA3000=m -+CONFIG_SERIO=m -+CONFIG_SERIO_RAW=m -+CONFIG_GAMEPORT=m -+CONFIG_GAMEPORT_NS558=m -+CONFIG_GAMEPORT_L4=m -+CONFIG_BRCM_CHAR_DRIVERS=y -+CONFIG_BCM_VCIO=y -+CONFIG_BCM2835_DEVGPIOMEM=y -+# CONFIG_BCM2835_SMI_DEV is not set -+# CONFIG_LEGACY_PTYS is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_DMA is not set -+CONFIG_SERIAL_8250_NR_UARTS=1 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=0 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_BCM2835AUX=y -+CONFIG_SERIAL_OF_PLATFORM=y -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_SERIAL_SC16IS7XX=m -+CONFIG_SERIAL_SC16IS7XX_SPI=y -+CONFIG_SERIAL_DEV_BUS=m -+CONFIG_TTY_PRINTK=y -+CONFIG_HW_RANDOM=y -+CONFIG_RAW_DRIVER=y -+CONFIG_I2C=y -+CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_MUX_PCA954x=m -+CONFIG_I2C_BCM2708=m -+CONFIG_I2C_BCM2835=m -+CONFIG_I2C_GPIO=m -+CONFIG_SPI=y -+CONFIG_SPI_BCM2835=m -+CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_SPIDEV=y -+CONFIG_PPS=m -+CONFIG_PPS_CLIENT_LDISC=m -+CONFIG_PPS_CLIENT_GPIO=m -+CONFIG_GPIO_SYSFS=y -+CONFIG_GPIO_BCM_EXP=y -+CONFIG_GPIO_BCM_VIRT=y -+CONFIG_GPIO_ARIZONA=m -+CONFIG_GPIO_STMPE=y -+CONFIG_W1=m -+CONFIG_W1_MASTER_DS2490=m -+CONFIG_W1_MASTER_DS2482=m -+CONFIG_W1_MASTER_DS1WM=m -+CONFIG_W1_MASTER_GPIO=m -+CONFIG_W1_SLAVE_THERM=m -+CONFIG_W1_SLAVE_SMEM=m -+CONFIG_W1_SLAVE_DS2408=m -+CONFIG_W1_SLAVE_DS2413=m -+CONFIG_W1_SLAVE_DS2406=m -+CONFIG_W1_SLAVE_DS2423=m -+CONFIG_W1_SLAVE_DS2431=m -+CONFIG_W1_SLAVE_DS2433=m -+CONFIG_W1_SLAVE_DS2760=m -+CONFIG_W1_SLAVE_DS2780=m -+CONFIG_W1_SLAVE_DS2781=m -+CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_POWER_RESET_GPIO=y -+CONFIG_BATTERY_DS2760=m -+CONFIG_HWMON=m -+CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_SHT21=m -+CONFIG_SENSORS_SHTC1=m -+CONFIG_SENSORS_INA2XX=m -+CONFIG_THERMAL=y -+CONFIG_BCM2835_THERMAL=y -+CONFIG_WATCHDOG=y -+CONFIG_BCM2835_WDT=y -+CONFIG_MFD_STMPE=y -+CONFIG_STMPE_SPI=y -+CONFIG_MFD_ARIZONA_I2C=m -+CONFIG_MFD_ARIZONA_SPI=m -+CONFIG_MFD_WM5102=y -+CONFIG_LIRC=m -+CONFIG_RC_DEVICES=y -+CONFIG_RC_ATI_REMOTE=m -+CONFIG_IR_IMON=m -+CONFIG_IR_MCEUSB=m -+CONFIG_IR_REDRAT3=m -+CONFIG_IR_STREAMZAP=m -+CONFIG_IR_IGUANA=m -+CONFIG_IR_TTUSBIR=m -+CONFIG_RC_LOOPBACK=m -+CONFIG_IR_GPIO_CIR=m -+CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y -+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -+CONFIG_MEDIA_RADIO_SUPPORT=y -+CONFIG_MEDIA_CONTROLLER=y -+CONFIG_MEDIA_USB_SUPPORT=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_BENQ=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_CPIA1=m -+CONFIG_USB_GSPCA_DTCS033=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_JL2005BCD=m -+CONFIG_USB_GSPCA_KINECT=m -+CONFIG_USB_GSPCA_KONICA=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_NW80X=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_OV534_9=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SE401=m -+CONFIG_USB_GSPCA_SN9C2028=m -+CONFIG_USB_GSPCA_SN9C20X=m -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SPCA1528=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_SQ930X=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STK1135=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TOPRO=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_VICAM=m -+CONFIG_USB_GSPCA_XIRLINK_CIT=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_USB_PWC=m -+CONFIG_VIDEO_CPIA2=m -+CONFIG_USB_ZR364XX=m -+CONFIG_USB_STKWEBCAM=m -+CONFIG_USB_S2255=m -+CONFIG_VIDEO_USBTV=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_HDPVR=m -+CONFIG_VIDEO_USBVISION=m -+CONFIG_VIDEO_STK1160_COMMON=m -+CONFIG_VIDEO_GO7007=m -+CONFIG_VIDEO_GO7007_USB=m -+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -+CONFIG_VIDEO_AU0828=m -+CONFIG_VIDEO_AU0828_RC=y -+CONFIG_VIDEO_CX231XX=m -+CONFIG_VIDEO_CX231XX_ALSA=m -+CONFIG_VIDEO_CX231XX_DVB=m -+CONFIG_VIDEO_TM6000=m -+CONFIG_VIDEO_TM6000_ALSA=m -+CONFIG_VIDEO_TM6000_DVB=m -+CONFIG_DVB_USB=m -+CONFIG_DVB_USB_A800=m -+CONFIG_DVB_USB_DIBUSB_MB=m -+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -+CONFIG_DVB_USB_DIBUSB_MC=m -+CONFIG_DVB_USB_DIB0700=m -+CONFIG_DVB_USB_UMT_010=m -+CONFIG_DVB_USB_CXUSB=m -+CONFIG_DVB_USB_M920X=m -+CONFIG_DVB_USB_DIGITV=m -+CONFIG_DVB_USB_VP7045=m -+CONFIG_DVB_USB_VP702X=m -+CONFIG_DVB_USB_GP8PSK=m -+CONFIG_DVB_USB_NOVA_T_USB2=m -+CONFIG_DVB_USB_TTUSB2=m -+CONFIG_DVB_USB_DTT200U=m -+CONFIG_DVB_USB_OPERA1=m -+CONFIG_DVB_USB_AF9005=m -+CONFIG_DVB_USB_AF9005_REMOTE=m -+CONFIG_DVB_USB_PCTV452E=m -+CONFIG_DVB_USB_DW2102=m -+CONFIG_DVB_USB_CINERGY_T2=m -+CONFIG_DVB_USB_DTV5100=m -+CONFIG_DVB_USB_FRIIO=m -+CONFIG_DVB_USB_AZ6027=m -+CONFIG_DVB_USB_TECHNISAT_USB2=m -+CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9015=m -+CONFIG_DVB_USB_AF9035=m -+CONFIG_DVB_USB_ANYSEE=m -+CONFIG_DVB_USB_AU6610=m -+CONFIG_DVB_USB_AZ6007=m -+CONFIG_DVB_USB_CE6230=m -+CONFIG_DVB_USB_EC168=m -+CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_LME2510=m -+CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_RTL28XXU=m -+CONFIG_DVB_USB_DVBSKY=m -+CONFIG_SMS_USB_DRV=m -+CONFIG_DVB_B2C2_FLEXCOP_USB=m -+CONFIG_DVB_AS102=m -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_V4L2=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_RADIO_SI470X=y -+CONFIG_USB_SI470X=m -+CONFIG_I2C_SI470X=m -+CONFIG_RADIO_SI4713=m -+CONFIG_I2C_SI4713=m -+CONFIG_USB_MR800=m -+CONFIG_USB_DSBR=m -+CONFIG_RADIO_SHARK=m -+CONFIG_RADIO_SHARK2=m -+CONFIG_USB_KEENE=m -+CONFIG_USB_MA901=m -+CONFIG_RADIO_TEA5764=m -+CONFIG_RADIO_SAA7706H=m -+CONFIG_RADIO_TEF6862=m -+CONFIG_RADIO_WL1273=m -+CONFIG_RADIO_WL128X=m -+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -+CONFIG_VIDEO_UDA1342=m -+CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_TW2804=m -+CONFIG_VIDEO_TW9903=m -+CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV7640=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_DRM=m -+CONFIG_DRM_LOAD_EDID_FIRMWARE=y -+CONFIG_DRM_UDL=m -+CONFIG_DRM_PANEL_SIMPLE=m -+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -+CONFIG_DRM_VC4=m -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_FB_UDL=m -+CONFIG_FB_SSD1307=m -+CONFIG_FB_RPISENSE=m -+# CONFIG_BACKLIGHT_GENERIC is not set -+CONFIG_BACKLIGHT_RPI=m -+CONFIG_BACKLIGHT_GPIO=m -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+CONFIG_SND=m -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQUENCER=m -+CONFIG_SND_SEQ_DUMMY=m -+CONFIG_SND_DUMMY=m -+CONFIG_SND_ALOOP=m -+CONFIG_SND_VIRMIDI=m -+CONFIG_SND_MTPAV=m -+CONFIG_SND_SERIAL_U16550=m -+CONFIG_SND_MPU401=m -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_UA101=m -+CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_CAIAQ_INPUT=y -+CONFIG_SND_USB_6FIRE=m -+CONFIG_SND_SOC=m -+CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m -+CONFIG_SND_BCM2708_SOC_RPI_DAC=m -+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m -+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m -+CONFIG_SND_DIGIDAC1_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m -+CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_ADAU1701=m -+CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SIMPLE_CARD=m -+CONFIG_HIDRAW=y -+CONFIG_UHID=m -+CONFIG_HID_A4TECH=m -+CONFIG_HID_ACRUX=m -+CONFIG_HID_APPLE=m -+CONFIG_HID_BELKIN=m -+CONFIG_HID_BETOP_FF=m -+CONFIG_HID_CHERRY=m -+CONFIG_HID_CHICONY=m -+CONFIG_HID_CYPRESS=m -+CONFIG_HID_DRAGONRISE=m -+CONFIG_HID_EMS_FF=m -+CONFIG_HID_ELECOM=m -+CONFIG_HID_ELO=m -+CONFIG_HID_EZKEY=m -+CONFIG_HID_GEMBIRD=m -+CONFIG_HID_HOLTEK=m -+CONFIG_HID_KEYTOUCH=m -+CONFIG_HID_KYE=m -+CONFIG_HID_UCLOGIC=m -+CONFIG_HID_WALTOP=m -+CONFIG_HID_GYRATION=m -+CONFIG_HID_TWINHAN=m -+CONFIG_HID_KENSINGTON=m -+CONFIG_HID_LCPOWER=m -+CONFIG_HID_LOGITECH=m -+CONFIG_HID_LOGITECH_DJ=m -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=m -+CONFIG_HID_MICROSOFT=m -+CONFIG_HID_MONTEREY=m -+CONFIG_HID_MULTITOUCH=m -+CONFIG_HID_NTRIG=m -+CONFIG_HID_ORTEK=m -+CONFIG_HID_PANTHERLORD=m -+CONFIG_HID_PETALYNX=m -+CONFIG_HID_PICOLCD=m -+CONFIG_HID_ROCCAT=m -+CONFIG_HID_SAMSUNG=m -+CONFIG_HID_SONY=m -+CONFIG_HID_SPEEDLINK=m -+CONFIG_HID_SUNPLUS=m -+CONFIG_HID_GREENASIA=m -+CONFIG_HID_SMARTJOYPLUS=m -+CONFIG_HID_TOPSEED=m -+CONFIG_HID_THINGM=m -+CONFIG_HID_THRUSTMASTER=m -+CONFIG_HID_WACOM=m -+CONFIG_HID_WIIMOTE=m -+CONFIG_HID_XINMO=m -+CONFIG_HID_ZEROPLUS=m -+CONFIG_HID_ZYDACRON=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_MON=m -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_PRINTER=m -+CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE_REALTEK=m -+CONFIG_USB_STORAGE_DATAFAB=m -+CONFIG_USB_STORAGE_FREECOM=m -+CONFIG_USB_STORAGE_ISD200=m -+CONFIG_USB_STORAGE_USBAT=m -+CONFIG_USB_STORAGE_SDDR09=m -+CONFIG_USB_STORAGE_SDDR55=m -+CONFIG_USB_STORAGE_JUMPSHOT=m -+CONFIG_USB_STORAGE_ALAUDA=m -+CONFIG_USB_STORAGE_ONETOUCH=m -+CONFIG_USB_STORAGE_KARMA=m -+CONFIG_USB_STORAGE_CYPRESS_ATACB=m -+CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_MDC800=m -+CONFIG_USB_MICROTEK=m -+CONFIG_USBIP_CORE=m -+CONFIG_USBIP_VHCI_HCD=m -+CONFIG_USBIP_HOST=m -+CONFIG_USB_DWC2=y -+CONFIG_USB_SERIAL=m -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_F81232=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_METRO=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QCAUX=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_SAFE=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_XSENS_MT=m -+CONFIG_USB_SERIAL_WISHBONE=m -+CONFIG_USB_SERIAL_SSU100=m -+CONFIG_USB_SERIAL_QT2=m -+CONFIG_USB_SERIAL_DEBUG=m -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+CONFIG_USB_ADUTUX=m -+CONFIG_USB_SEVSEG=m -+CONFIG_USB_RIO500=m -+CONFIG_USB_LEGOTOWER=m -+CONFIG_USB_LCD=m -+CONFIG_USB_CYPRESS_CY7C63=m -+CONFIG_USB_CYTHERM=m -+CONFIG_USB_IDMOUSE=m -+CONFIG_USB_FTDI_ELAN=m -+CONFIG_USB_APPLEDISPLAY=m -+CONFIG_USB_LD=m -+CONFIG_USB_TRANCEVIBRATOR=m -+CONFIG_USB_IOWARRIOR=m -+CONFIG_USB_TEST=m -+CONFIG_USB_ISIGHTFW=m -+CONFIG_USB_YUREX=m -+CONFIG_USB_ATM=m -+CONFIG_USB_SPEEDTOUCH=m -+CONFIG_USB_CXACRU=m -+CONFIG_USB_UEAGLEATM=m -+CONFIG_USB_XUSBATM=m -+CONFIG_MMC=y -+CONFIG_MMC_BLOCK_MINORS=32 -+CONFIG_MMC_BCM2835_MMC=y -+CONFIG_MMC_BCM2835_DMA=y -+CONFIG_MMC_BCM2835_SDHOST=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SDHCI_IPROC=m -+CONFIG_MMC_SPI=m -+CONFIG_MMC_BCM2835=y -+CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_ONESHOT=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+CONFIG_LEDS_TRIGGER_BACKLIGHT=y -+CONFIG_LEDS_TRIGGER_CPU=y -+CONFIG_LEDS_TRIGGER_GPIO=y -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+CONFIG_LEDS_TRIGGER_TRANSIENT=m -+CONFIG_LEDS_TRIGGER_CAMERA=m -+CONFIG_LEDS_TRIGGER_INPUT=y -+CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+CONFIG_RTC_DRV_ABX80X=m -+CONFIG_RTC_DRV_DS1307=m -+CONFIG_RTC_DRV_DS1374=m -+CONFIG_RTC_DRV_DS1672=m -+CONFIG_RTC_DRV_MAX6900=m -+CONFIG_RTC_DRV_RS5C372=m -+CONFIG_RTC_DRV_ISL1208=m -+CONFIG_RTC_DRV_ISL12022=m -+CONFIG_RTC_DRV_X1205=m -+CONFIG_RTC_DRV_PCF8523=m -+CONFIG_RTC_DRV_PCF8563=m -+CONFIG_RTC_DRV_PCF8583=m -+CONFIG_RTC_DRV_M41T80=m -+CONFIG_RTC_DRV_BQ32K=m -+CONFIG_RTC_DRV_S35390A=m -+CONFIG_RTC_DRV_FM3130=m -+CONFIG_RTC_DRV_RX8581=m -+CONFIG_RTC_DRV_RX8025=m -+CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_M41T93=m -+CONFIG_RTC_DRV_M41T94=m -+CONFIG_RTC_DRV_DS1302=m -+CONFIG_RTC_DRV_DS1305=m -+CONFIG_RTC_DRV_DS1390=m -+CONFIG_RTC_DRV_R9701=m -+CONFIG_RTC_DRV_RX4581=m -+CONFIG_RTC_DRV_RS5C348=m -+CONFIG_RTC_DRV_MAX6902=m -+CONFIG_RTC_DRV_PCF2123=m -+CONFIG_RTC_DRV_DS3232=m -+CONFIG_RTC_DRV_PCF2127=m -+CONFIG_RTC_DRV_RV3029C2=m -+CONFIG_DMADEVICES=y -+CONFIG_DMA_BCM2835=y -+CONFIG_DMA_BCM2708=y -+CONFIG_UIO=m -+CONFIG_UIO_PDRV_GENIRQ=m -+CONFIG_STAGING=y -+CONFIG_IRDA=m -+CONFIG_IRLAN=m -+CONFIG_IRNET=m -+CONFIG_IRCOMM=m -+CONFIG_IRDA_ULTRA=y -+CONFIG_IRDA_CACHE_LAST_LSAP=y -+CONFIG_IRDA_FAST_RR=y -+CONFIG_IRTTY_SIR=m -+CONFIG_KINGSUN_DONGLE=m -+CONFIG_KSDAZZLE_DONGLE=m -+CONFIG_KS959_DONGLE=m -+CONFIG_USB_IRDA=m -+CONFIG_SIGMATEL_FIR=m -+CONFIG_MCS_FIR=m -+CONFIG_PRISM2_USB=m -+CONFIG_R8712U=m -+CONFIG_R8188EU=m -+CONFIG_VT6656=m -+CONFIG_SPEAKUP=m -+CONFIG_SPEAKUP_SYNTH_SOFT=m -+CONFIG_STAGING_MEDIA=y -+CONFIG_LIRC_STAGING=y -+CONFIG_LIRC_RPI=m -+CONFIG_FB_TFT=m -+CONFIG_FB_TFT_AGM1264K_FL=m -+CONFIG_FB_TFT_BD663474=m -+CONFIG_FB_TFT_HX8340BN=m -+CONFIG_FB_TFT_HX8347D=m -+CONFIG_FB_TFT_HX8353D=m -+CONFIG_FB_TFT_HX8357D=m -+CONFIG_FB_TFT_ILI9163=m -+CONFIG_FB_TFT_ILI9320=m -+CONFIG_FB_TFT_ILI9325=m -+CONFIG_FB_TFT_ILI9340=m -+CONFIG_FB_TFT_ILI9341=m -+CONFIG_FB_TFT_ILI9481=m -+CONFIG_FB_TFT_ILI9486=m -+CONFIG_FB_TFT_PCD8544=m -+CONFIG_FB_TFT_RA8875=m -+CONFIG_FB_TFT_S6D02A1=m -+CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SSD1289=m -+CONFIG_FB_TFT_SSD1306=m -+CONFIG_FB_TFT_SSD1331=m -+CONFIG_FB_TFT_SSD1351=m -+CONFIG_FB_TFT_ST7735R=m -+CONFIG_FB_TFT_TINYLCD=m -+CONFIG_FB_TFT_TLS8204=m -+CONFIG_FB_TFT_UC1701=m -+CONFIG_FB_TFT_UPD161704=m -+CONFIG_FB_TFT_WATTEROTT=m -+CONFIG_FB_FLEX=m -+CONFIG_FB_TFT_FBTFT_DEVICE=m -+CONFIG_SND_BCM2835=m -+CONFIG_MAILBOX=y -+CONFIG_BCM2835_MBOX=y -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_RASPBERRYPI_POWER=y -+CONFIG_EXTCON=m -+CONFIG_EXTCON_ARIZONA=m -+CONFIG_IIO=m -+CONFIG_IIO_BUFFER=y -+CONFIG_IIO_BUFFER_CB=m -+CONFIG_IIO_KFIFO_BUF=m -+CONFIG_MCP320X=m -+CONFIG_MCP3422=m -+CONFIG_DHT11=m -+CONFIG_HTU21=m -+CONFIG_PWM_BCM2835=m -+CONFIG_PWM_PCA9685=m -+CONFIG_RASPBERRYPI_FIRMWARE=y -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_REISERFS_FS=m -+CONFIG_REISERFS_FS_XATTR=y -+CONFIG_REISERFS_FS_POSIX_ACL=y -+CONFIG_REISERFS_FS_SECURITY=y -+CONFIG_JFS_FS=m -+CONFIG_JFS_POSIX_ACL=y -+CONFIG_JFS_SECURITY=y -+CONFIG_JFS_STATISTICS=y -+CONFIG_XFS_FS=m -+CONFIG_XFS_QUOTA=y -+CONFIG_XFS_POSIX_ACL=y -+CONFIG_XFS_RT=y -+CONFIG_GFS2_FS=m -+CONFIG_OCFS2_FS=m -+CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS_POSIX_ACL=y -+CONFIG_NILFS2_FS=m -+CONFIG_F2FS_FS=y -+CONFIG_FANOTIFY=y -+CONFIG_QFMT_V1=m -+CONFIG_QFMT_V2=m -+CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m -+CONFIG_OVERLAY_FS=m -+CONFIG_FSCACHE=y -+CONFIG_FSCACHE_STATS=y -+CONFIG_FSCACHE_HISTOGRAM=y -+CONFIG_CACHEFILES=y -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -+CONFIG_NTFS_FS=m -+CONFIG_NTFS_RW=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_ECRYPT_FS=m -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+CONFIG_JFFS2_FS=m -+CONFIG_JFFS2_SUMMARY=y -+CONFIG_UBIFS_FS=m -+CONFIG_SQUASHFS=m -+CONFIG_SQUASHFS_XATTR=y -+CONFIG_SQUASHFS_LZO=y -+CONFIG_SQUASHFS_XZ=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3_ACL=y -+CONFIG_NFS_V4=y -+CONFIG_NFS_SWAP=y -+CONFIG_ROOT_NFS=y -+CONFIG_NFS_FSCACHE=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3_ACL=y -+CONFIG_NFSD_V4=y -+CONFIG_CIFS=m -+CONFIG_CIFS_WEAK_PW_HASH=y -+CONFIG_CIFS_UPCALL=y -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+CONFIG_CIFS_ACL=y -+CONFIG_CIFS_DFS_UPCALL=y -+CONFIG_CIFS_FSCACHE=y -+CONFIG_9P_FS=m -+CONFIG_9P_FS_POSIX_ACL=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_737=m -+CONFIG_NLS_CODEPAGE_775=m -+CONFIG_NLS_CODEPAGE_850=m -+CONFIG_NLS_CODEPAGE_852=m -+CONFIG_NLS_CODEPAGE_855=m -+CONFIG_NLS_CODEPAGE_857=m -+CONFIG_NLS_CODEPAGE_860=m -+CONFIG_NLS_CODEPAGE_861=m -+CONFIG_NLS_CODEPAGE_862=m -+CONFIG_NLS_CODEPAGE_863=m -+CONFIG_NLS_CODEPAGE_864=m -+CONFIG_NLS_CODEPAGE_865=m -+CONFIG_NLS_CODEPAGE_866=m -+CONFIG_NLS_CODEPAGE_869=m -+CONFIG_NLS_CODEPAGE_936=m -+CONFIG_NLS_CODEPAGE_950=m -+CONFIG_NLS_CODEPAGE_932=m -+CONFIG_NLS_CODEPAGE_949=m -+CONFIG_NLS_CODEPAGE_874=m -+CONFIG_NLS_ISO8859_8=m -+CONFIG_NLS_CODEPAGE_1250=m -+CONFIG_NLS_CODEPAGE_1251=m -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+CONFIG_NLS_ISO8859_2=m -+CONFIG_NLS_ISO8859_3=m -+CONFIG_NLS_ISO8859_4=m -+CONFIG_NLS_ISO8859_5=m -+CONFIG_NLS_ISO8859_6=m -+CONFIG_NLS_ISO8859_7=m -+CONFIG_NLS_ISO8859_9=m -+CONFIG_NLS_ISO8859_13=m -+CONFIG_NLS_ISO8859_14=m -+CONFIG_NLS_ISO8859_15=m -+CONFIG_NLS_KOI8_R=m -+CONFIG_NLS_KOI8_U=m -+CONFIG_DLM=m -+CONFIG_PRINTK_TIME=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DETECT_HUNG_TASK=y -+CONFIG_LATENCYTOP=y -+CONFIG_IRQSOFF_TRACER=y -+CONFIG_SCHED_TRACER=y -+CONFIG_STACK_TRACER=y -+CONFIG_BLK_DEV_IO_TRACE=y -+CONFIG_FUNCTION_PROFILER=y -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y -+CONFIG_CRYPTO_USER=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_XTS=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_LZ4=m -+CONFIG_CRYPTO_USER_API_SKCIPHER=m -+CONFIG_ARM64_CRYPTO=y -+CONFIG_CRYPTO_AES_ARM64=m -+CONFIG_CRYPTO_AES_ARM64_BS=m -+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m -+CONFIG_CRC_ITU_T=y -+CONFIG_LIBCRC32C=y -+CONFIG_MMC_BCM2835_MMC=y -+CONFIG_MMC_SDHCI_IPROC=m --- +-- 2.20.1 - diff --git a/target/linux/brcm2708/patches-4.19/950-0135-brcmfmac-Re-enable-firmware-roaming-support.patch b/target/linux/brcm2708/patches-4.19/950-0135-brcmfmac-Re-enable-firmware-roaming-support.patch deleted file mode 100644 index e14c0bbe50..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0135-brcmfmac-Re-enable-firmware-roaming-support.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dbc2eb2f83607315c19b06fd23edec07a01d83db Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 20 Jun 2018 12:20:01 +0100 -Subject: [PATCH 135/806] brcmfmac: Re-enable firmware roaming support - -As of 4.18, a firmware that implements the update_connect_params -method but doesn't claim to support roaming causes an error. We -disabled firmware roaming in 4.4 [1] because it appeared to -prevent disconnects, but let's try with the current firmware to see -if things have improved. - -[1] https://github.com/raspberrypi/linux/commit/dd9188011786fb62a7960922f31e8e086fb2009b - -Signed-off-by: Phil Elwell ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -@@ -70,7 +70,7 @@ static int brcmf_fcmode; - module_param_named(fcmode, brcmf_fcmode, int, 0); - MODULE_PARM_DESC(fcmode, "Mode of firmware signalled flow control"); - --static int brcmf_roamoff = 1; -+static int brcmf_roamoff; - module_param_named(roamoff, brcmf_roamoff, int, 0400); - MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine"); - diff --git a/target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch b/target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch index d2e63910a9..c007b25389 100644 --- a/target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch @@ -25,8 +25,6 @@ Signed-off-by: Serge Schneider arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 6 + .../arm/boot/dts/overlays/rpi-poe-overlay.dts | 61 +++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + drivers/hwmon/Kconfig | 11 + drivers/hwmon/Makefile | 1 + drivers/hwmon/rpi-poe-fan.c | 436 ++++++++++++++++++ @@ -202,26 +200,6 @@ Signed-off-by: Serge Schneider + }; + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -659,6 +659,7 @@ CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RPI_POE_FAN=m - CONFIG_SENSORS_SHT21=m - CONFIG_SENSORS_SHT3x=m - CONFIG_SENSORS_SHTC1=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -652,6 +652,7 @@ CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RPI_POE_FAN=m - CONFIG_SENSORS_SHT21=m - CONFIG_SENSORS_SHT3x=m - CONFIG_SENSORS_SHTC1=m --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1330,6 +1330,17 @@ config SENSORS_RASPBERRYPI_HWMON diff --git a/target/linux/brcm2708/patches-4.19/950-0145-config-Enable-Raspberry-Pi-voltage-monitor.patch b/target/linux/brcm2708/patches-4.19/950-0145-config-Enable-Raspberry-Pi-voltage-monitor.patch deleted file mode 100644 index e3cee3b41c..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0145-config-Enable-Raspberry-Pi-voltage-monitor.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0c40bb7d88b385b31462bcdb9b9555791763b8a0 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Sat, 6 Oct 2018 16:45:41 +0200 -Subject: [PATCH 145/806] config: Enable Raspberry Pi voltage monitor - -This enables the Raspberry Pi voltage monitor as a replacement -for the get_trottled sysfs approach in the firmware driver. - -Signed-off-by: Stefan Wahren ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -659,6 +659,7 @@ CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RASPBERRYPI_HWMON=m - CONFIG_SENSORS_RPI_POE_FAN=m - CONFIG_SENSORS_SHT21=m - CONFIG_SENSORS_SHT3x=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -652,6 +652,7 @@ CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RASPBERRYPI_HWMON=m - CONFIG_SENSORS_RPI_POE_FAN=m - CONFIG_SENSORS_SHT21=m - CONFIG_SENSORS_SHT3x=m diff --git a/target/linux/brcm2708/patches-4.19/950-0150-configs-Rebuild-bcmrpi3_defconfig-to-fix-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0150-configs-Rebuild-bcmrpi3_defconfig-to-fix-warnings.patch deleted file mode 100644 index bc7e0d2adc..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0150-configs-Rebuild-bcmrpi3_defconfig-to-fix-warnings.patch +++ /dev/null @@ -1,326 +0,0 @@ -From 4e5178b323d2710d9cf8b0fcabfabc48400a3797 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 12 Nov 2018 21:42:00 +0000 -Subject: [PATCH 150/806] configs: Rebuild bcmrpi3_defconfig to fix warnings - -Also disable CONFIG_MMC_BCM2835 to avoid a runtime conflict. - -Signed-off-by: Phil Elwell ---- - arch/arm64/configs/bcmrpi3_defconfig | 148 +++++++-------------------- - 1 file changed, 37 insertions(+), 111 deletions(-) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y - CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT=y - CONFIG_BSD_PROCESS_ACCT=y - CONFIG_BSD_PROCESS_ACCT_V3=y - CONFIG_TASKSTATS=y -@@ -25,29 +26,13 @@ CONFIG_BLK_DEV_INITRD=y - CONFIG_EMBEDDED=y - # CONFIG_COMPAT_BRK is not set - CONFIG_PROFILING=y --CONFIG_KPROBES=y --CONFIG_JUMP_LABEL=y --CONFIG_MODULES=y --CONFIG_MODULE_UNLOAD=y --CONFIG_MODVERSIONS=y --CONFIG_MODULE_SRCVERSION_ALL=y --CONFIG_BLK_DEV_THROTTLING=y --CONFIG_PARTITION_ADVANCED=y --CONFIG_MAC_PARTITION=y --CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_ARCH_BCM2835=y - # CONFIG_CAVIUM_ERRATUM_22375 is not set - # CONFIG_CAVIUM_ERRATUM_23154 is not set - # CONFIG_CAVIUM_ERRATUM_27456 is not set - CONFIG_SCHED_MC=y - CONFIG_NR_CPUS=4 --CONFIG_PREEMPT=y - CONFIG_HZ_1000=y --CONFIG_CLEANCACHE=y --CONFIG_FRONTSWAP=y --CONFIG_CMA=y --CONFIG_ZSMALLOC=m --CONFIG_PGTABLE_MAPPING=y - CONFIG_SECCOMP=y - CONFIG_ARMV8_DEPRECATED=y - CONFIG_SWP_EMULATION=y -@@ -55,7 +40,6 @@ CONFIG_CP15_BARRIER_EMULATION=y - CONFIG_SETEND_EMULATION=y - CONFIG_RANDOMIZE_BASE=y - CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" --CONFIG_BINFMT_MISC=y - CONFIG_COMPAT=y - # CONFIG_SUSPEND is not set - CONFIG_PM=y -@@ -69,6 +53,25 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y - CONFIG_CPU_FREQ_GOV_ONDEMAND=y - CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y - CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_RASPBERRYPI_FIRMWARE=y -+CONFIG_ARM64_CRYPTO=y -+CONFIG_CRYPTO_AES_ARM64_BS=m -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_BINFMT_MISC=y -+CONFIG_CLEANCACHE=y -+CONFIG_FRONTSWAP=y -+CONFIG_CMA=y -+CONFIG_ZSMALLOC=m -+CONFIG_PGTABLE_MAPPING=y - CONFIG_NET=y - CONFIG_PACKET=y - CONFIG_UNIX=y -@@ -98,6 +101,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m - CONFIG_INET_XFRM_MODE_TUNNEL=m - CONFIG_INET_XFRM_MODE_BEET=m - CONFIG_INET_DIAG=m -+CONFIG_TCP_CONG_ADVANCED=y -+CONFIG_TCP_CONG_BBR=m - CONFIG_IPV6=m - CONFIG_IPV6_ROUTER_PREF=y - CONFIG_INET6_AH=m -@@ -212,7 +217,6 @@ CONFIG_IP_VS_SED=m - CONFIG_IP_VS_NQ=m - CONFIG_IP_VS_FTP=m - CONFIG_IP_VS_PE_SIP=m --CONFIG_NF_CONNTRACK_IPV4=m - CONFIG_IP_NF_IPTABLES=m - CONFIG_IP_NF_MATCH_AH=m - CONFIG_IP_NF_MATCH_ECN=m -@@ -232,7 +236,6 @@ CONFIG_IP_NF_RAW=m - CONFIG_IP_NF_ARPTABLES=m - CONFIG_IP_NF_ARPFILTER=m - CONFIG_IP_NF_ARP_MANGLE=m --CONFIG_NF_CONNTRACK_IPV6=m - CONFIG_IP6_NF_IPTABLES=m - CONFIG_IP6_NF_MATCH_AH=m - CONFIG_IP6_NF_MATCH_EUI64=m -@@ -306,11 +309,9 @@ CONFIG_NET_SCH_CHOKE=m - CONFIG_NET_SCH_QFQ=m - CONFIG_NET_SCH_CODEL=m - CONFIG_NET_SCH_FQ_CODEL=m -+CONFIG_NET_SCH_FQ=m - CONFIG_NET_SCH_INGRESS=m - CONFIG_NET_SCH_PLUG=m --CONFIG_NET_SCH_FQ=m --CONFIG_TCP_CONG_ADVANCED=y --CONFIG_TCP_CONG_BBR=m - CONFIG_NET_CLS_BASIC=m - CONFIG_NET_CLS_TCINDEX=m - CONFIG_NET_CLS_ROUTE4=m -@@ -469,7 +470,6 @@ CONFIG_USB_NET_SR9700=m - CONFIG_USB_NET_SR9800=m - CONFIG_USB_NET_SMSC75XX=m - CONFIG_USB_NET_SMSC95XX=y --CONFIG_USB_LAN78XX=y - CONFIG_USB_NET_GL620A=m - CONFIG_USB_NET_NET1080=m - CONFIG_USB_NET_PLUSB=m -@@ -591,7 +591,6 @@ CONFIG_HW_RANDOM=y - CONFIG_RAW_DRIVER=y - CONFIG_I2C=y - CONFIG_I2C_CHARDEV=m --CONFIG_I2C_MUX_PCA954x=m - CONFIG_I2C_BCM2708=m - CONFIG_I2C_BCM2835=m - CONFIG_I2C_GPIO=m -@@ -603,7 +602,6 @@ CONFIG_PPS=m - CONFIG_PPS_CLIENT_LDISC=m - CONFIG_PPS_CLIENT_GPIO=m - CONFIG_GPIO_SYSFS=y --CONFIG_GPIO_BCM_EXP=y - CONFIG_GPIO_BCM_VIRT=y - CONFIG_GPIO_ARIZONA=m - CONFIG_GPIO_STMPE=y -@@ -620,7 +618,6 @@ CONFIG_W1_SLAVE_DS2406=m - CONFIG_W1_SLAVE_DS2423=m - CONFIG_W1_SLAVE_DS2431=m - CONFIG_W1_SLAVE_DS2433=m --CONFIG_W1_SLAVE_DS2760=m - CONFIG_W1_SLAVE_DS2780=m - CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m -@@ -640,17 +637,6 @@ CONFIG_STMPE_SPI=y - CONFIG_MFD_ARIZONA_I2C=m - CONFIG_MFD_ARIZONA_SPI=m - CONFIG_MFD_WM5102=y --CONFIG_LIRC=m --CONFIG_RC_DEVICES=y --CONFIG_RC_ATI_REMOTE=m --CONFIG_IR_IMON=m --CONFIG_IR_MCEUSB=m --CONFIG_IR_REDRAT3=m --CONFIG_IR_STREAMZAP=m --CONFIG_IR_IGUANA=m --CONFIG_IR_TTUSBIR=m --CONFIG_RC_LOOPBACK=m --CONFIG_IR_GPIO_CIR=m - CONFIG_MEDIA_SUPPORT=m - CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -@@ -721,41 +707,7 @@ CONFIG_VIDEO_GO7007=m - CONFIG_VIDEO_GO7007_USB=m - CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - CONFIG_VIDEO_AU0828=m --CONFIG_VIDEO_AU0828_RC=y --CONFIG_VIDEO_CX231XX=m --CONFIG_VIDEO_CX231XX_ALSA=m --CONFIG_VIDEO_CX231XX_DVB=m --CONFIG_VIDEO_TM6000=m --CONFIG_VIDEO_TM6000_ALSA=m --CONFIG_VIDEO_TM6000_DVB=m --CONFIG_DVB_USB=m --CONFIG_DVB_USB_A800=m --CONFIG_DVB_USB_DIBUSB_MB=m --CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y --CONFIG_DVB_USB_DIBUSB_MC=m --CONFIG_DVB_USB_DIB0700=m --CONFIG_DVB_USB_UMT_010=m --CONFIG_DVB_USB_CXUSB=m --CONFIG_DVB_USB_M920X=m --CONFIG_DVB_USB_DIGITV=m --CONFIG_DVB_USB_VP7045=m --CONFIG_DVB_USB_VP702X=m --CONFIG_DVB_USB_GP8PSK=m --CONFIG_DVB_USB_NOVA_T_USB2=m --CONFIG_DVB_USB_TTUSB2=m --CONFIG_DVB_USB_DTT200U=m --CONFIG_DVB_USB_OPERA1=m --CONFIG_DVB_USB_AF9005=m --CONFIG_DVB_USB_AF9005_REMOTE=m --CONFIG_DVB_USB_PCTV452E=m --CONFIG_DVB_USB_DW2102=m --CONFIG_DVB_USB_CINERGY_T2=m --CONFIG_DVB_USB_DTV5100=m --CONFIG_DVB_USB_FRIIO=m --CONFIG_DVB_USB_AZ6027=m --CONFIG_DVB_USB_TECHNISAT_USB2=m - CONFIG_DVB_USB_V2=m --CONFIG_DVB_USB_AF9015=m - CONFIG_DVB_USB_AF9035=m - CONFIG_DVB_USB_ANYSEE=m - CONFIG_DVB_USB_AU6610=m -@@ -763,9 +715,7 @@ CONFIG_DVB_USB_AZ6007=m - CONFIG_DVB_USB_CE6230=m - CONFIG_DVB_USB_EC168=m - CONFIG_DVB_USB_GL861=m --CONFIG_DVB_USB_LME2510=m - CONFIG_DVB_USB_MXL111SF=m --CONFIG_DVB_USB_RTL28XXU=m - CONFIG_DVB_USB_DVBSKY=m - CONFIG_SMS_USB_DRV=m - CONFIG_DVB_B2C2_FLEXCOP_USB=m -@@ -775,7 +725,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m - CONFIG_VIDEO_EM28XX_ALSA=m - CONFIG_VIDEO_EM28XX_DVB=m - CONFIG_V4L_PLATFORM_DRIVERS=y --CONFIG_RADIO_SI470X=y -+CONFIG_RADIO_SI470X=m - CONFIG_USB_SI470X=m - CONFIG_I2C_SI470X=m - CONFIG_RADIO_SI4713=m -@@ -1019,7 +969,6 @@ CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SDHCI_IPROC=m - CONFIG_MMC_SPI=m --CONFIG_MMC_BCM2835=y - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_TRIGGER_TIMER=y -@@ -1073,20 +1022,6 @@ CONFIG_DMA_BCM2708=y - CONFIG_UIO=m - CONFIG_UIO_PDRV_GENIRQ=m - CONFIG_STAGING=y --CONFIG_IRDA=m --CONFIG_IRLAN=m --CONFIG_IRNET=m --CONFIG_IRCOMM=m --CONFIG_IRDA_ULTRA=y --CONFIG_IRDA_CACHE_LAST_LSAP=y --CONFIG_IRDA_FAST_RR=y --CONFIG_IRTTY_SIR=m --CONFIG_KINGSUN_DONGLE=m --CONFIG_KSDAZZLE_DONGLE=m --CONFIG_KS959_DONGLE=m --CONFIG_USB_IRDA=m --CONFIG_SIGMATEL_FIR=m --CONFIG_MCS_FIR=m - CONFIG_PRISM2_USB=m - CONFIG_R8712U=m - CONFIG_R8188EU=m -@@ -1094,8 +1029,6 @@ CONFIG_VT6656=m - CONFIG_SPEAKUP=m - CONFIG_SPEAKUP_SYNTH_SOFT=m - CONFIG_STAGING_MEDIA=y --CONFIG_LIRC_STAGING=y --CONFIG_LIRC_RPI=m - CONFIG_FB_TFT=m - CONFIG_FB_TFT_AGM1264K_FL=m - CONFIG_FB_TFT_BD663474=m -@@ -1143,7 +1076,6 @@ CONFIG_DHT11=m - CONFIG_HTU21=m - CONFIG_PWM_BCM2835=m - CONFIG_PWM_PCA9685=m --CONFIG_RASPBERRYPI_FIRMWARE=y - CONFIG_EXT4_FS=y - CONFIG_EXT4_FS_POSIX_ACL=y - CONFIG_EXT4_FS_SECURITY=y -@@ -1255,19 +1187,6 @@ CONFIG_NLS_ISO8859_15=m - CONFIG_NLS_KOI8_R=m - CONFIG_NLS_KOI8_U=m - CONFIG_DLM=m --CONFIG_PRINTK_TIME=y --CONFIG_BOOT_PRINTK_DELAY=y --CONFIG_DEBUG_MEMORY_INIT=y --CONFIG_DETECT_HUNG_TASK=y --CONFIG_LATENCYTOP=y --CONFIG_IRQSOFF_TRACER=y --CONFIG_SCHED_TRACER=y --CONFIG_STACK_TRACER=y --CONFIG_BLK_DEV_IO_TRACE=y --CONFIG_FUNCTION_PROFILER=y --CONFIG_KGDB=y --CONFIG_KGDB_KDB=y --CONFIG_KDB_KEYBOARD=y - CONFIG_CRYPTO_USER=m - CONFIG_CRYPTO_CBC=y - CONFIG_CRYPTO_CTS=m -@@ -1279,11 +1198,18 @@ CONFIG_CRYPTO_CAST5=m - CONFIG_CRYPTO_DES=y - CONFIG_CRYPTO_LZ4=m - CONFIG_CRYPTO_USER_API_SKCIPHER=m --CONFIG_ARM64_CRYPTO=y --CONFIG_CRYPTO_AES_ARM64=m --CONFIG_CRYPTO_AES_ARM64_BS=m --CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m - CONFIG_CRC_ITU_T=y - CONFIG_LIBCRC32C=y --CONFIG_MMC_BCM2835_MMC=y --CONFIG_MMC_SDHCI_IPROC=m -+CONFIG_PRINTK_TIME=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DETECT_HUNG_TASK=y -+CONFIG_LATENCYTOP=y -+CONFIG_IRQSOFF_TRACER=y -+CONFIG_SCHED_TRACER=y -+CONFIG_STACK_TRACER=y -+CONFIG_BLK_DEV_IO_TRACE=y -+CONFIG_FUNCTION_PROFILER=y -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y diff --git a/target/linux/brcm2708/patches-4.19/950-0151-brcmfmac-Disable-ARP-offloading-when-promiscuous.patch b/target/linux/brcm2708/patches-4.19/950-0151-brcmfmac-Disable-ARP-offloading-when-promiscuous.patch deleted file mode 100644 index 037700bfe6..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0151-brcmfmac-Disable-ARP-offloading-when-promiscuous.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 87b707ed572548b3d332c327df5df9455dd98ca7 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Thu, 24 Aug 2017 16:16:16 +0100 -Subject: [PATCH 151/806] brcmfmac: Disable ARP offloading when promiscuous - -This is a test patch for brcmfmac from Franky Lin at Broadcom to disable -ARP offloading when in promiscuous mode, re-enabling the ability to -sniff ARP packets over WiFi. - -See: https://github.com/raspberrypi/linux/issues/2171 - -Signed-off-by: Phil Elwell ---- - .../net/wireless/broadcom/brcm80211/brcmfmac/core.c | 11 ++++++----- - .../net/wireless/broadcom/brcm80211/brcmfmac/core.h | 1 + - 2 files changed, 7 insertions(+), 5 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -88,25 +88,25 @@ void brcmf_configure_arp_nd_offload(stru - if (err) { - brcmf_dbg(TRACE, "failed to set ARP offload mode to 0x%x, err = %d\n", - mode, err); -+ err = 0; - } else { - err = brcmf_fil_iovar_int_set(ifp, "arpoe", enable); - if (err) { - brcmf_dbg(TRACE, "failed to configure (%d) ARP offload err = %d\n", - enable, err); -- } else { -+ err = 0; -+ } else - brcmf_dbg(TRACE, "successfully configured (%d) ARP offload to 0x%x\n", - enable, mode); -- } - } - - err = brcmf_fil_iovar_int_set(ifp, "ndoe", enable); -- if (err) { -+ if (err) - brcmf_dbg(TRACE, "failed to configure (%d) ND offload err = %d\n", - enable, err); -- } else { -+ else - brcmf_dbg(TRACE, "successfully configured (%d) ND offload to 0x%x\n", - enable, mode); -- } - } - - static void _brcmf_set_multicast_list(struct work_struct *work) -@@ -172,6 +172,7 @@ static void _brcmf_set_multicast_list(st - if (err < 0) - brcmf_err("Setting BRCMF_C_SET_PROMISC failed, %d\n", - err); -+ - brcmf_configure_arp_nd_offload(ifp, !cmd_value); - } - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h -@@ -210,6 +210,7 @@ char *brcmf_ifname(struct brcmf_if *ifp) - struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx); - void brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable); - int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked); -+void brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable); - struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, - bool is_p2pdev, const char *name, u8 *mac_addr); - void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked); diff --git a/target/linux/brcm2708/patches-4.19/950-0152-config-enable-Audio-Graph-Card-module.patch b/target/linux/brcm2708/patches-4.19/950-0152-config-enable-Audio-Graph-Card-module.patch deleted file mode 100644 index 045c1198f2..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0152-config-enable-Audio-Graph-Card-module.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 13ce1407d4c433a569f03edf732515311bdf20e0 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Tue, 6 Feb 2018 15:37:22 +0100 -Subject: [PATCH 152/806] config: enable Audio Graph Card module - -Signed-off-by: Matthias Reichl ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -926,6 +926,7 @@ CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m -+CONFIG_SND_AUDIO_GRAPH_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y - CONFIG_UHID=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -919,6 +919,7 @@ CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m -+CONFIG_SND_AUDIO_GRAPH_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y - CONFIG_UHID=m diff --git a/target/linux/brcm2708/patches-4.19/950-0153-config-Add-IPVLAN-module.patch b/target/linux/brcm2708/patches-4.19/950-0153-config-Add-IPVLAN-module.patch deleted file mode 100644 index 69c2be6130..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0153-config-Add-IPVLAN-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 30bd0664d2209b641c0e8f01f151c35f6964882e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 29 Mar 2018 16:05:28 +0100 -Subject: [PATCH 153/806] config: Add IPVLAN module - ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -350,6 +350,7 @@ CONFIG_NET_ACT_SKBEDIT=m - CONFIG_NET_ACT_CSUM=m - CONFIG_BATMAN_ADV=m - CONFIG_OPENVSWITCH=m -+CONFIG_NET_L3_MASTER_DEV=y - CONFIG_NET_PKTGEN=m - CONFIG_HAMRADIO=y - CONFIG_AX25=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -344,6 +344,7 @@ CONFIG_NET_ACT_SKBEDIT=m - CONFIG_NET_ACT_CSUM=m - CONFIG_BATMAN_ADV=m - CONFIG_OPENVSWITCH=m -+CONFIG_NET_L3_MASTER_DEV=y - CONFIG_NET_PKTGEN=m - CONFIG_HAMRADIO=y - CONFIG_AX25=m diff --git a/target/linux/brcm2708/patches-4.19/950-0154-config-Add-I2C_TINY_USB-m.patch b/target/linux/brcm2708/patches-4.19/950-0154-config-Add-I2C_TINY_USB-m.patch deleted file mode 100644 index fd5e9effdf..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0154-config-Add-I2C_TINY_USB-m.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2112bcb0bdbc42581c2017c017277146a1297ec3 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 27 Apr 2018 16:21:33 +0100 -Subject: [PATCH 154/806] config: Add I2C_TINY_USB=m - -Enable the I2C Tiny USB module. - -See: https://github.com/raspberrypi/linux/issues/2535 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 - - arch/arm/configs/bcmrpi_defconfig | 1 - - 2 files changed, 2 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -927,7 +927,6 @@ CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m --CONFIG_SND_AUDIO_GRAPH_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y - CONFIG_UHID=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -920,7 +920,6 @@ CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m --CONFIG_SND_AUDIO_GRAPH_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y - CONFIG_UHID=m diff --git a/target/linux/brcm2708/patches-4.19/950-0156-Add-hd44780-module-to-defconfig.patch b/target/linux/brcm2708/patches-4.19/950-0156-Add-hd44780-module-to-defconfig.patch deleted file mode 100644 index 0a1d0a7d0c..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0156-Add-hd44780-module-to-defconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5dbc1ccbc52f57d98e193c496538e3a12c2c120c Mon Sep 17 00:00:00 2001 -From: Jasper Boomer -Date: Mon, 2 Jul 2018 13:16:22 -0400 -Subject: [PATCH 156/806] Add hd44780 module to defconfig - ---- - arch/arm/configs/bcm2709_defconfig | 2 ++ - arch/arm/configs/bcmrpi_defconfig | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1155,6 +1155,8 @@ CONFIG_RTC_DRV_RV3029C2=m - CONFIG_DMADEVICES=y - CONFIG_DMA_BCM2835=y - CONFIG_DMA_BCM2708=y -+CONFIG_AUXDISPLAY=y -+CONFIG_HD44780=m - CONFIG_UIO=m - CONFIG_UIO_PDRV_GENIRQ=m - CONFIG_STAGING=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1148,6 +1148,8 @@ CONFIG_RTC_DRV_RV3029C2=m - CONFIG_DMADEVICES=y - CONFIG_DMA_BCM2835=y - CONFIG_DMA_BCM2708=y -+CONFIG_AUXDISPLAY=y -+CONFIG_HD44780=m - CONFIG_UIO=m - CONFIG_UIO_PDRV_GENIRQ=m - CONFIG_STAGING=y diff --git a/target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch b/target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch index 5e436392be..8e5f84efdc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch +++ b/target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch @@ -15,8 +15,6 @@ Signed-off-by: Matt Flax arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 6 ++ .../overlays/audioinjector-ultra-overlay.dts | 71 +++++++++++++++++++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + 5 files changed, 80 insertions(+) create mode 100644 arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts @@ -119,23 +117,3 @@ Signed-off-by: Matt Flax + }; + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -926,6 +926,7 @@ CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SIMPLE_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -919,6 +919,7 @@ CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SIMPLE_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y diff --git a/target/linux/brcm2708/patches-4.19/950-0166-configs-Add-SENSOR_GPIO_FAN-m.patch b/target/linux/brcm2708/patches-4.19/950-0166-configs-Add-SENSOR_GPIO_FAN-m.patch deleted file mode 100644 index 629ad5dc32..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0166-configs-Add-SENSOR_GPIO_FAN-m.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 29c48a0c6b2a552fa0649b7049c67c66d1be326c Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Tue, 18 Sep 2018 11:03:20 +0100 -Subject: [PATCH 166/806] configs: Add SENSOR_GPIO_FAN=m - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 3 ++- - arch/arm/configs/bcmrpi_defconfig | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -658,6 +658,7 @@ CONFIG_BATTERY_DS2760=m - CONFIG_BATTERY_GAUGE_LTC2941=m - CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_GPIO_FAN=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m - CONFIG_SENSORS_RASPBERRYPI_HWMON=m -@@ -923,10 +924,10 @@ CONFIG_SND_PISOUND=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m --CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SIMPLE_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -651,6 +651,7 @@ CONFIG_BATTERY_DS2760=m - CONFIG_BATTERY_GAUGE_LTC2941=m - CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_GPIO_FAN=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m - CONFIG_SENSORS_RASPBERRYPI_HWMON=m -@@ -916,10 +917,10 @@ CONFIG_SND_PISOUND=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m --CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SIMPLE_CARD=m - CONFIG_HID_BATTERY_STRENGTH=y - CONFIG_HIDRAW=y diff --git a/target/linux/brcm2708/patches-4.19/950-0169-configs-Add-CONFIG_HID_BIGBEN_FF-m.patch b/target/linux/brcm2708/patches-4.19/950-0169-configs-Add-CONFIG_HID_BIGBEN_FF-m.patch deleted file mode 100644 index 40f006fb6d..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0169-configs-Add-CONFIG_HID_BIGBEN_FF-m.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e5b2be64b8a0184b60f659ceecfece572402929 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 24 Sep 2018 14:56:58 +0100 -Subject: [PATCH 169/806] configs: Add CONFIG_HID_BIGBEN_FF=m - -See: https://github.com/raspberrypi/linux/issues/2690 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -938,6 +938,7 @@ CONFIG_HID_APPLE=m - CONFIG_HID_ASUS=m - CONFIG_HID_BELKIN=m - CONFIG_HID_BETOP_FF=m -+CONFIG_HID_BIGBEN_FF=m - CONFIG_HID_CHERRY=m - CONFIG_HID_CHICONY=m - CONFIG_HID_CYPRESS=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -931,6 +931,7 @@ CONFIG_HID_APPLE=m - CONFIG_HID_ASUS=m - CONFIG_HID_BELKIN=m - CONFIG_HID_BETOP_FF=m -+CONFIG_HID_BIGBEN_FF=m - CONFIG_HID_CHERRY=m - CONFIG_HID_CHICONY=m - CONFIG_HID_CYPRESS=m diff --git a/target/linux/brcm2708/patches-4.19/950-0178-config-Add-CONFIG_USBIP_VUDC.patch b/target/linux/brcm2708/patches-4.19/950-0178-config-Add-CONFIG_USBIP_VUDC.patch deleted file mode 100644 index 94bf9b81e1..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0178-config-Add-CONFIG_USBIP_VUDC.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 375887ef7eb31dad988dd1fd97aa134d9b948b92 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 25 Oct 2018 14:08:43 +0100 -Subject: [PATCH 178/806] config: Add CONFIG_USBIP_VUDC - -See: https://github.com/raspberrypi/firmware/issues/353 ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1013,6 +1013,7 @@ CONFIG_USB_MICROTEK=m - CONFIG_USBIP_CORE=m - CONFIG_USBIP_VHCI_HCD=m - CONFIG_USBIP_HOST=m -+CONFIG_USBIP_VUDC=m - CONFIG_USB_DWC2=m - CONFIG_USB_SERIAL=m - CONFIG_USB_SERIAL_GENERIC=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1006,6 +1006,7 @@ CONFIG_USB_MICROTEK=m - CONFIG_USBIP_CORE=m - CONFIG_USBIP_VHCI_HCD=m - CONFIG_USBIP_HOST=m -+CONFIG_USBIP_VUDC=m - CONFIG_USB_DWC2=m - CONFIG_USB_SERIAL=m - CONFIG_USB_SERIAL_GENERIC=y diff --git a/target/linux/brcm2708/patches-4.19/950-0182-Update-issue-templates-2736.patch b/target/linux/brcm2708/patches-4.19/950-0182-Update-issue-templates-2736.patch deleted file mode 100644 index 0f40bdc244..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0182-Update-issue-templates-2736.patch +++ /dev/null @@ -1,47 +0,0 @@ -From af0a35f5aef1c4e945be56b06df59c560e1b4502 Mon Sep 17 00:00:00 2001 -From: James Hughes -Date: Fri, 2 Nov 2018 11:55:49 +0000 -Subject: [PATCH 182/806] Update issue templates (#2736) - ---- - .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md - ---- /dev/null -+++ b/.github/ISSUE_TEMPLATE/bug_report.md -@@ -0,0 +1,34 @@ -+--- -+name: Bug report -+about: Create a report to help us fix your issue -+ -+--- -+ -+**Is this the right place for my bug report?** -+This repository contains the Linux kernel used on the Raspberry Pi. If you believe that the issue you are seeing is kernel-related, this is the right place. If not, we have other repositories for the GPU firmware at [github.com/raspberrypi/firmware](https://github.com/raspberrypi/firmware) and Raspberry Pi userland applications at [github.com/raspberrypi/userland](https://github.com/raspberrypi/userland). If you have problems with the Raspbian distribution packages, report them in the [github.com/RPi-Distro/repo](https://github.com/RPi-Distro/repo). If you simply have a question, then [the Raspberry Pi forums](https://www.raspberrypi.org/forums) are the best place to ask it. -+ -+**Describe the bug** -+Add a clear and concise description of what you think the bug is. -+ -+**To reproduce** -+List the steps required to reproduce the issue. -+ -+**Expected behaviour** -+Add a clear and concise description of what you expected to happen. -+ -+**Actual behaviour** -+Add a clear and concise description of what actually happened. -+ -+**System** -+ Copy and paste the results of the raspinfo command in to this section. Alternatively, copy and paste a pastebin link, or add answers to the following questions: -+ -+* Which model of Raspberry Pi? e.g. Pi3B+, PiZeroW -+* Which OS and version (`cat /etc/rpi-issue`)? -+* Which firmware version (`vcgencmd version`)? -+* Which kernel version (`uname -a`)? -+ -+**Logs** -+If applicable, add the relevant output from `dmesg` or similar. -+ -+**Additional context** -+Add any other relevant context for the problem. diff --git a/target/linux/brcm2708/patches-4.19/950-0199-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch b/target/linux/brcm2708/patches-4.19/950-0199-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch deleted file mode 100644 index e7ea9e78c5..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0199-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9e8b9e994d529140d8491543dfd82d83f536ef42 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Wed, 31 Oct 2018 14:59:40 +0000 -Subject: [PATCH 199/806] MAINTAINERS: Add entry for BCM2835 Unicam driver - -Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver - -Signed-off-by: Dave Stevenson ---- - MAINTAINERS | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -2873,6 +2873,13 @@ S: Maintained - N: bcm2835 - F: drivers/staging/vc04_services - -+BROADCOM BCM2835 CAMERA DRIVER -+M: Dave Stevenson -+L: linux-media@vger.kernel.org -+S: Maintained -+F: drivers/media/platform/bcm2835/ -+F: Documentation/devicetree/bindings/media/bcm2835-unicam.txt -+ - BROADCOM BCM47XX MIPS ARCHITECTURE - M: Hauke Mehrtens - M: Rafał Miłecki diff --git a/target/linux/brcm2708/patches-4.19/950-0200-defconfig-Enable-Unicam-driver-and-various-sources-o.patch b/target/linux/brcm2708/patches-4.19/950-0200-defconfig-Enable-Unicam-driver-and-various-sources-o.patch deleted file mode 100644 index ce78a42c88..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0200-defconfig-Enable-Unicam-driver-and-various-sources-o.patch +++ /dev/null @@ -1,84 +0,0 @@ -From fe104e5cee14d09641c68343e5f56430f7ebec05 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Wed, 31 Oct 2018 14:59:51 +0000 -Subject: [PATCH 200/806] defconfig: Enable Unicam driver and various sources - on Pi platforms. - -Enable: - VIDEO_V4L2_SUBDEV_API=y - VIDEO_BCM2835_UNICAM=m - VIDEO_TC358743=m - VIDEO_ADV7180=m - VIDEO_OV5647=m -so that we can receive CSI data from these devices. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2709_defconfig | 5 +++++ - arch/arm/configs/bcmrpi_defconfig | 5 +++++ - 2 files changed, 10 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -714,6 +714,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y - CONFIG_MEDIA_RADIO_SUPPORT=y - CONFIG_MEDIA_CONTROLLER=y -+CONFIG_VIDEO_V4L2_SUBDEV_API=y - CONFIG_MEDIA_USB_SUPPORT=y - CONFIG_USB_VIDEO_CLASS=m - CONFIG_USB_M5602=m -@@ -831,6 +832,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m - CONFIG_VIDEO_EM28XX_ALSA=m - CONFIG_VIDEO_EM28XX_DVB=m - CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_BCM2835_UNICAM=m - CONFIG_RADIO_SI470X=m - CONFIG_USB_SI470X=m - CONFIG_I2C_SI470X=m -@@ -850,10 +852,13 @@ CONFIG_RADIO_WL128X=m - # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set - CONFIG_VIDEO_UDA1342=m - CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_ADV7180=m -+CONFIG_VIDEO_TC358743=m - CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m - CONFIG_DRM=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -707,6 +707,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y - CONFIG_MEDIA_RADIO_SUPPORT=y - CONFIG_MEDIA_CONTROLLER=y -+CONFIG_VIDEO_V4L2_SUBDEV_API=y - CONFIG_MEDIA_USB_SUPPORT=y - CONFIG_USB_VIDEO_CLASS=m - CONFIG_USB_M5602=m -@@ -824,6 +825,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m - CONFIG_VIDEO_EM28XX_ALSA=m - CONFIG_VIDEO_EM28XX_DVB=m - CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_BCM2835_UNICAM=m - CONFIG_RADIO_SI470X=m - CONFIG_USB_SI470X=m - CONFIG_I2C_SI470X=m -@@ -843,10 +845,13 @@ CONFIG_RADIO_WL128X=m - # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set - CONFIG_VIDEO_UDA1342=m - CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_ADV7180=m -+CONFIG_VIDEO_TC358743=m - CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m - CONFIG_DRM=m diff --git a/target/linux/brcm2708/patches-4.19/950-0257-ARM-bcm2835_defconfig-Enable-bcm2835-camera.patch b/target/linux/brcm2708/patches-4.19/950-0257-ARM-bcm2835_defconfig-Enable-bcm2835-camera.patch deleted file mode 100644 index 96f43571cc..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0257-ARM-bcm2835_defconfig-Enable-bcm2835-camera.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0e706e956ec3974a08cefec00e7c411bd6dee03b Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 29 Oct 2018 15:50:50 +0000 -Subject: [PATCH 257/806] ARM: bcm2835_defconfig: Enable bcm2835-camera - -Enables the V4L2 camera driver as a module. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2835_defconfig | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/arch/arm/configs/bcm2835_defconfig -+++ b/arch/arm/configs/bcm2835_defconfig -@@ -91,6 +91,8 @@ CONFIG_THERMAL=y - CONFIG_BCM2835_THERMAL=y - CONFIG_WATCHDOG=y - CONFIG_BCM2835_WDT=y -+CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_DRM=y - CONFIG_DRM_VC4=y - CONFIG_FB_SIMPLE=y -@@ -128,7 +130,8 @@ CONFIG_LEDS_TRIGGER_CAMERA=y - CONFIG_DMADEVICES=y - CONFIG_DMA_BCM2835=y - CONFIG_STAGING=y --CONFIG_BCM2835_VCHIQ=m -+CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0279-ARM-bcm2835_defconfig-Enable-bcm2835-codec.patch b/target/linux/brcm2708/patches-4.19/950-0279-ARM-bcm2835_defconfig-Enable-bcm2835-codec.patch deleted file mode 100644 index 1cd87c31fc..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0279-ARM-bcm2835_defconfig-Enable-bcm2835-codec.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8692aec0c7dd04fd36c94e6d4ad8b4f3626d17ce Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 29 Oct 2018 17:49:04 +0000 -Subject: [PATCH 279/806] ARM: bcm2835_defconfig: Enable bcm2835-codec - -Enables the V4L2 M2M codec driver as a module. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2835_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm/configs/bcm2835_defconfig -+++ b/arch/arm/configs/bcm2835_defconfig -@@ -132,6 +132,7 @@ CONFIG_DMA_BCM2835=y - CONFIG_STAGING=y - CONFIG_SND_BCM2835=m - CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0280-config-Add-bcm2835-codec-to-Pi-defconfigs.patch b/target/linux/brcm2708/patches-4.19/950-0280-config-Add-bcm2835-codec-to-Pi-defconfigs.patch deleted file mode 100644 index 7e8db03d8c..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0280-config-Add-bcm2835-codec-to-Pi-defconfigs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dd25f103ae7cc51299f360edc1c7b3984fb38d09 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Tue, 30 Oct 2018 12:23:26 +0000 -Subject: [PATCH 280/806] config: Add bcm2835-codec to Pi defconfigs. - -Adds the V4L2 M2M codec driver to the config. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1210,6 +1210,7 @@ CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_BCM2835_VCHIQ=y - CONFIG_SND_BCM2835=m - CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1203,6 +1203,7 @@ CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_BCM2835_VCHIQ=y - CONFIG_SND_BCM2835=m - CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0284-Enable-TPM-TIS-SPI-support-for-TPM1.2-and-TPM2.0-chi.patch b/target/linux/brcm2708/patches-4.19/950-0284-Enable-TPM-TIS-SPI-support-for-TPM1.2-and-TPM2.0-chi.patch deleted file mode 100644 index 3ff807832f..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0284-Enable-TPM-TIS-SPI-support-for-TPM1.2-and-TPM2.0-chi.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 17e1d4d6f8ce88fccc25c1e900eb985635737959 Mon Sep 17 00:00:00 2001 -From: Peter Huewe -Date: Thu, 14 Jun 2018 22:42:18 +0200 -Subject: [PATCH 284/806] Enable TPM TIS SPI support for TPM1.2 and TPM2.0 - chips - -This patch enables the support for SPI TPMs which follow the TCG TIS -FIFO/PTP specification like the SLB9670. -In order to decrease ram usage the weak dependency on CONFIG_SECURITFS -is explictly set to 'n'. - -Signed-off-by: Peter Huewe ---- - arch/arm/configs/bcm2709_defconfig | 5 +++-- - arch/arm/configs/bcmrpi_defconfig | 5 +++-- - arch/arm64/configs/bcmrpi3_defconfig | 3 +++ - 3 files changed, 9 insertions(+), 4 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -350,7 +350,6 @@ CONFIG_NET_ACT_SKBEDIT=m - CONFIG_NET_ACT_CSUM=m - CONFIG_BATMAN_ADV=m - CONFIG_OPENVSWITCH=m --CONFIG_NET_L3_MASTER_DEV=y - CONFIG_NET_PKTGEN=m - CONFIG_HAMRADIO=y - CONFIG_AX25=m -@@ -610,6 +609,8 @@ CONFIG_SERIAL_DEV_BUS=m - CONFIG_TTY_PRINTK=y - CONFIG_HW_RANDOM=y - CONFIG_RAW_DRIVER=y -+CONFIG_TCG_TPM=m -+CONFIG_TCG_TIS_SPI=m - CONFIG_I2C=y - CONFIG_I2C_CHARDEV=m - CONFIG_I2C_MUX=m -@@ -1343,12 +1344,12 @@ CONFIG_NLS_ISO8859_15=m - CONFIG_NLS_KOI8_R=m - CONFIG_NLS_KOI8_U=m - CONFIG_DLM=m -+# CONFIG_SECURITYFS is not set - CONFIG_CRYPTO_USER=m - CONFIG_CRYPTO_CBC=y - CONFIG_CRYPTO_CTS=m - CONFIG_CRYPTO_XTS=m - CONFIG_CRYPTO_XCBC=m --CONFIG_CRYPTO_SHA512=m - CONFIG_CRYPTO_TGR192=m - CONFIG_CRYPTO_WP512=m - CONFIG_CRYPTO_CAST5=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -344,7 +344,6 @@ CONFIG_NET_ACT_SKBEDIT=m - CONFIG_NET_ACT_CSUM=m - CONFIG_BATMAN_ADV=m - CONFIG_OPENVSWITCH=m --CONFIG_NET_L3_MASTER_DEV=y - CONFIG_NET_PKTGEN=m - CONFIG_HAMRADIO=y - CONFIG_AX25=m -@@ -604,6 +603,8 @@ CONFIG_SERIAL_DEV_BUS=m - CONFIG_TTY_PRINTK=y - CONFIG_HW_RANDOM=y - CONFIG_RAW_DRIVER=y -+CONFIG_TCG_TPM=m -+CONFIG_TCG_TIS_SPI=m - CONFIG_I2C=y - CONFIG_I2C_CHARDEV=m - CONFIG_I2C_MUX=m -@@ -1336,13 +1337,13 @@ CONFIG_NLS_ISO8859_15=m - CONFIG_NLS_KOI8_R=m - CONFIG_NLS_KOI8_U=m - CONFIG_DLM=m -+# CONFIG_SECURITYFS is not set - CONFIG_CRYPTO_USER=m - CONFIG_CRYPTO_CRYPTD=m - CONFIG_CRYPTO_CBC=y - CONFIG_CRYPTO_CTS=m - CONFIG_CRYPTO_XTS=m - CONFIG_CRYPTO_XCBC=m --CONFIG_CRYPTO_SHA512=m - CONFIG_CRYPTO_TGR192=m - CONFIG_CRYPTO_WP512=m - CONFIG_CRYPTO_CAST5=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -589,6 +589,8 @@ CONFIG_SERIAL_DEV_BUS=m - CONFIG_TTY_PRINTK=y - CONFIG_HW_RANDOM=y - CONFIG_RAW_DRIVER=y -+CONFIG_TCG_TPM=m -+CONFIG_TCG_TIS_SPI=m - CONFIG_I2C=y - CONFIG_I2C_CHARDEV=m - CONFIG_I2C_BCM2708=m -@@ -1187,6 +1189,7 @@ CONFIG_NLS_ISO8859_15=m - CONFIG_NLS_KOI8_R=m - CONFIG_NLS_KOI8_U=m - CONFIG_DLM=m -+# CONFIG_SECURITYFS is not set - CONFIG_CRYPTO_USER=m - CONFIG_CRYPTO_CBC=y - CONFIG_CRYPTO_CTS=m diff --git a/target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch b/target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch index b9df446845..c54b5af7a1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch +++ b/target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch @@ -8,8 +8,6 @@ Signed-off-by: GT .../overlays/3dlab-nano-player-overlay.dts | 32 ++ arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 6 + - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + sound/soc/bcm/3dlab-nano-player.c | 370 ++++++++++++++++++ sound/soc/bcm/Kconfig | 6 + sound/soc/bcm/Makefile | 2 + @@ -77,26 +75,6 @@ Signed-off-by: GT Name: adau1977-adc Info: Overlay for activation of ADAU1977 ADC codec over I2C for control and I2S for data. ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -902,6 +902,7 @@ CONFIG_SND_USB_6FIRE=m - CONFIG_SND_USB_HIFACE=m - CONFIG_SND_SOC=m - CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -895,6 +895,7 @@ CONFIG_SND_USB_6FIRE=m - CONFIG_SND_USB_HIFACE=m - CONFIG_SND_SOC=m - CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m --- /dev/null +++ b/sound/soc/bcm/3dlab-nano-player.c @@ -0,0 +1,370 @@ diff --git a/target/linux/brcm2708/patches-4.19/950-0301-configs-Add-CONFIG_SND_AUDIOSENSE_PI-m.patch b/target/linux/brcm2708/patches-4.19/950-0301-configs-Add-CONFIG_SND_AUDIOSENSE_PI-m.patch deleted file mode 100644 index 79fce63480..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0301-configs-Add-CONFIG_SND_AUDIOSENSE_PI-m.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fe1c38cdd947ffb68a006286d89e4eea32ccc451 Mon Sep 17 00:00:00 2001 -From: b-ak -Date: Fri, 4 Jan 2019 00:12:51 +0530 -Subject: [PATCH 301/806] configs: Add CONFIG_SND_AUDIOSENSE_PI=m - -AudioSense-Pi add on soundcard configuration definitions - -Signed-off-by: b-ak ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -918,6 +918,7 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_AUDIOSENSE_PI=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -911,6 +911,7 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_AUDIOSENSE_PI=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -800,6 +800,7 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m -+CONFIG_SND_AUDIOSENSE_PI=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m - CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m diff --git a/target/linux/brcm2708/patches-4.19/950-0302-configs-Add-CONFIG_USB_TMC-m.patch b/target/linux/brcm2708/patches-4.19/950-0302-configs-Add-CONFIG_USB_TMC-m.patch deleted file mode 100644 index 70fa002857..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0302-configs-Add-CONFIG_USB_TMC-m.patch +++ /dev/null @@ -1,70 +0,0 @@ -From acbecc9a9a803bd580e6717f217cac1a13afa837 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 14 Jan 2019 08:50:55 +0000 -Subject: [PATCH 302/806] configs: Add CONFIG_USB_TMC=m - -Enable the Test & Measurement Class USB driver module. - -See: https://github.com/raspberrypi/linux/firmware/issues/929 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 2 +- - arch/arm/configs/bcmrpi_defconfig | 2 +- - arch/arm64/configs/bcmrpi3_defconfig | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1002,6 +1002,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - CONFIG_USB_MON=m - CONFIG_USB_DWCOTG=y - CONFIG_USB_PRINTER=m -+CONFIG_USB_TMC=m - CONFIG_USB_STORAGE=y - CONFIG_USB_STORAGE_REALTEK=m - CONFIG_USB_STORAGE_DATAFAB=m -@@ -1301,7 +1302,6 @@ CONFIG_CIFS=m - CONFIG_CIFS_WEAK_PW_HASH=y - CONFIG_CIFS_UPCALL=y - CONFIG_CIFS_XATTR=y --CONFIG_CIFS_POSIX=y - CONFIG_CIFS_ACL=y - CONFIG_CIFS_DFS_UPCALL=y - CONFIG_CIFS_FSCACHE=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -995,6 +995,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - CONFIG_USB_MON=m - CONFIG_USB_DWCOTG=y - CONFIG_USB_PRINTER=m -+CONFIG_USB_TMC=m - CONFIG_USB_STORAGE=y - CONFIG_USB_STORAGE_REALTEK=m - CONFIG_USB_STORAGE_DATAFAB=m -@@ -1294,7 +1295,6 @@ CONFIG_CIFS=m - CONFIG_CIFS_WEAK_PW_HASH=y - CONFIG_CIFS_UPCALL=y - CONFIG_CIFS_XATTR=y --CONFIG_CIFS_POSIX=y - CONFIG_CIFS_ACL=y - CONFIG_CIFS_DFS_UPCALL=y - CONFIG_CIFS_FSCACHE=y ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -871,6 +871,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - CONFIG_USB_MON=m - CONFIG_USB_DWCOTG=y - CONFIG_USB_PRINTER=m -+CONFIG_USB_TMC=m - CONFIG_USB_STORAGE=y - CONFIG_USB_STORAGE_REALTEK=m - CONFIG_USB_STORAGE_DATAFAB=m -@@ -1145,7 +1146,6 @@ CONFIG_CIFS=m - CONFIG_CIFS_WEAK_PW_HASH=y - CONFIG_CIFS_UPCALL=y - CONFIG_CIFS_XATTR=y --CONFIG_CIFS_POSIX=y - CONFIG_CIFS_ACL=y - CONFIG_CIFS_DFS_UPCALL=y - CONFIG_CIFS_FSCACHE=y diff --git a/target/linux/brcm2708/patches-4.19/950-0305-configs-Add-CONFIG_USB_UAS-m.patch b/target/linux/brcm2708/patches-4.19/950-0305-configs-Add-CONFIG_USB_UAS-m.patch deleted file mode 100644 index f5643daf55..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0305-configs-Add-CONFIG_USB_UAS-m.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 18a1208318d6ad321950aaed6d4a977c3dbacebd Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 16 Jan 2019 21:26:13 +0000 -Subject: [PATCH 305/806] configs: Add CONFIG_USB_UAS=m - -Enable support for USB-attached-SCSI devicess. - -See: https://github.com/raspberrypi/linux/issues/2813 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1017,6 +1017,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m - CONFIG_USB_STORAGE_KARMA=m - CONFIG_USB_STORAGE_CYPRESS_ATACB=m - CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=m - CONFIG_USB_MDC800=m - CONFIG_USB_MICROTEK=m - CONFIG_USBIP_CORE=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1010,6 +1010,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m - CONFIG_USB_STORAGE_KARMA=m - CONFIG_USB_STORAGE_CYPRESS_ATACB=m - CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=m - CONFIG_USB_MDC800=m - CONFIG_USB_MICROTEK=m - CONFIG_USBIP_CORE=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -886,6 +886,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m - CONFIG_USB_STORAGE_KARMA=m - CONFIG_USB_STORAGE_CYPRESS_ATACB=m - CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=m - CONFIG_USB_MDC800=m - CONFIG_USB_MICROTEK=m - CONFIG_USBIP_CORE=m diff --git a/target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch b/target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch index 136b7aa30f..f06f4cd96b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch +++ b/target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch @@ -8,8 +8,6 @@ Signed-off-by: Daniel Matuschek arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 21 + .../overlays/hifiberry-dacplusadc-overlay.dts | 71 +++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + sound/soc/bcm/Kconfig | 8 + sound/soc/bcm/Makefile | 2 + sound/soc/bcm/hifiberry_dacplusadc.c | 407 ++++++++++++++++++ @@ -131,26 +129,6 @@ Signed-off-by: Daniel Matuschek + slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?"; + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -905,6 +905,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m - CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -898,6 +898,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m - CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -46,6 +46,14 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS diff --git a/target/linux/brcm2708/patches-4.19/950-0342-configs-Add-Unicam-and-subdevices-to-bcmrpi3_defconf.patch b/target/linux/brcm2708/patches-4.19/950-0342-configs-Add-Unicam-and-subdevices-to-bcmrpi3_defconf.patch deleted file mode 100644 index c4e668a6e8..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0342-configs-Add-Unicam-and-subdevices-to-bcmrpi3_defconf.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9e9600b345cfb1f5c15ed2425e711e08bb4e0b19 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 4 Feb 2019 12:35:06 +0000 -Subject: [PATCH 342/806] configs: Add Unicam and subdevices to - bcmrpi3_defconfig - -The bcm2835-unicam, tc358743, adv7180 (for adv7282m) and ov5647 -have been tested on a 64bit kernel and shown to work. -Add them to the config. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcmrpi3_defconfig | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -645,6 +645,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y - CONFIG_MEDIA_RADIO_SUPPORT=y - CONFIG_MEDIA_CONTROLLER=y -+CONFIG_VIDEO_V4L2_SUBDEV_API=y - CONFIG_MEDIA_USB_SUPPORT=y - CONFIG_USB_VIDEO_CLASS=m - CONFIG_USB_M5602=m -@@ -727,6 +728,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m - CONFIG_VIDEO_EM28XX_ALSA=m - CONFIG_VIDEO_EM28XX_DVB=m - CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_BCM2835_UNICAM=m - CONFIG_RADIO_SI470X=m - CONFIG_USB_SI470X=m - CONFIG_I2C_SI470X=m -@@ -746,10 +748,13 @@ CONFIG_RADIO_WL128X=m - # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set - CONFIG_VIDEO_UDA1342=m - CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_ADV7180=m -+CONFIG_VIDEO_TC358743=m - CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m - CONFIG_DRM=m diff --git a/target/linux/brcm2708/patches-4.19/950-0343-configs-Add-VIDEO_BCM2835-to-bcmrpi3_defconfig.patch b/target/linux/brcm2708/patches-4.19/950-0343-configs-Add-VIDEO_BCM2835-to-bcmrpi3_defconfig.patch deleted file mode 100644 index 3af3ad044e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0343-configs-Add-VIDEO_BCM2835-to-bcmrpi3_defconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 07a1355117f3e1feb5e0b117b9f7cbe7205a40ee Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 4 Feb 2019 12:45:25 +0000 -Subject: [PATCH 343/806] configs: Add VIDEO_BCM2835 to bcmrpi3_defconfig - -This is now shown to work with 64 bit kernels, so add it to -the defconfig. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1070,6 +1070,7 @@ CONFIG_FB_TFT_WATTEROTT=m - CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0344-configs-Add-V4L2-codec-driver-to-bcmrpi3_defconfig.patch b/target/linux/brcm2708/patches-4.19/950-0344-configs-Add-V4L2-codec-driver-to-bcmrpi3_defconfig.patch deleted file mode 100644 index 1c807ac18b..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0344-configs-Add-V4L2-codec-driver-to-bcmrpi3_defconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 61a7807530c66312174b7088b4570491291592f8 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 4 Feb 2019 13:42:51 +0000 -Subject: [PATCH 344/806] configs: Add V4L2 codec driver to bcmrpi3_defconfig - -As this is now fixed to work with 64bit kernels, add it to the -defconfig. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1071,6 +1071,7 @@ CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_SND_BCM2835=m - CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0345-config-Add-IPVLAN-module-to-bcmrpi3_defconfig.patch b/target/linux/brcm2708/patches-4.19/950-0345-config-Add-IPVLAN-module-to-bcmrpi3_defconfig.patch deleted file mode 100644 index 9086326ebb..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0345-config-Add-IPVLAN-module-to-bcmrpi3_defconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 03d555e309627080adf8ba8f4eb28093f5d8e2ee Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Tue, 5 Feb 2019 12:31:23 +0000 -Subject: [PATCH 345/806] config: Add IPVLAN module to bcmrpi3_defconfig - -It's built for the 32bit kernels, but not for the 64bit ones. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -430,6 +430,7 @@ CONFIG_BONDING=m - CONFIG_DUMMY=m - CONFIG_IFB=m - CONFIG_MACVLAN=m -+CONFIG_IPVLAN=m - CONFIG_VXLAN=m - CONFIG_NETCONSOLE=m - CONFIG_TUN=m diff --git a/target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch b/target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch index f660d8f721..c6db4c6f2a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch @@ -7,45 +7,9 @@ See: https://github.com/raspberrypi/linux/issues/2850 Signed-off-by: Phil Elwell --- - arch/arm/configs/bcm2709_defconfig | 2 ++ - arch/arm/configs/bcmrpi_defconfig | 2 ++ - arch/arm64/configs/bcmrpi3_defconfig | 2 ++ sound/soc/codecs/Kconfig | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -930,6 +930,8 @@ CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m - CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m - CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m - CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_AD193X_SPI=m -+CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -923,6 +923,8 @@ CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m - CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m - CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m - CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_AD193X_SPI=m -+CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -811,6 +811,8 @@ CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m - CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m - CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_AD193X_SPI=m -+CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4271_I2C=m --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -295,11 +295,11 @@ config SND_SOC_AD193X diff --git a/target/linux/brcm2708/patches-4.19/950-0348-configs-Add-CONFIG_LEDS_PCA963X-m.patch b/target/linux/brcm2708/patches-4.19/950-0348-configs-Add-CONFIG_LEDS_PCA963X-m.patch deleted file mode 100644 index 0777476f53..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0348-configs-Add-CONFIG_LEDS_PCA963X-m.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 850add91653a4f9f467b8d7ec0cc7633d8252c77 Mon Sep 17 00:00:00 2001 -From: Zahari Petkov -Date: Fri, 8 Feb 2019 13:33:47 +0200 -Subject: [PATCH 348/806] configs: Add CONFIG_LEDS_PCA963X=m - -Enable support for PCA963x I2C chip. - -Needed for the balenaFin v1.1.0 carrier board for the -Raspberry Pi Compute Module 3/3+ Lite. - -Signed-off-by: Zahari Petkov ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1124,6 +1124,7 @@ CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1117,6 +1117,7 @@ CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -984,6 +984,7 @@ CONFIG_MMC_SDHCI_IPROC=m - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y diff --git a/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch b/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch deleted file mode 100644 index 97073abff4..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5d84bc88f90406e9db501dabc1bc519ae8b34d88 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 18 Feb 2019 15:43:30 +0000 -Subject: [PATCH 349/806] Revert "brcmfmac: Mute expected startup 'errors'" - -This reverts commit 34eba9138ccf8d84552ab9dae37d8f348640e663. - -Upstream patch 26e537884a ("brcmfmac: Do not complain about country code "00") -fixes the same issue, so drop this downstream patch. - -Signed-off-by: Phil Elwell ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6854,8 +6854,6 @@ static void brcmf_cfg80211_reg_notifier( - /* ignore non-ISO3166 country codes */ - for (i = 0; i < 2; i++) - if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { -- if (req->alpha2[0] == '0' && req->alpha2[1] == '0') -- return; - brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n", - req->alpha2[0], req->alpha2[1]); - return; diff --git a/target/linux/brcm2708/patches-4.19/950-0363-config-Add-CONFIG_FB_TFT_SH1106-m.patch b/target/linux/brcm2708/patches-4.19/950-0363-config-Add-CONFIG_FB_TFT_SH1106-m.patch deleted file mode 100644 index ee2e359771..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0363-config-Add-CONFIG_FB_TFT_SH1106-m.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5b904ae953179183256cee266fed3aa2ae638b75 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 27 Feb 2019 20:08:48 +0000 -Subject: [PATCH 363/806] config: Add CONFIG_FB_TFT_SH1106=m - -See: https://github.com/raspberrypi/linux/issues/2876 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 3 ++- - arch/arm/configs/bcmrpi_defconfig | 3 ++- - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 5 insertions(+), 2 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -905,8 +905,8 @@ CONFIG_SND_BCM2835_SOC_I2S=m - CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m --CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -@@ -1203,6 +1203,7 @@ CONFIG_FB_TFT_PCD8544=m - CONFIG_FB_TFT_RA8875=m - CONFIG_FB_TFT_S6D02A1=m - CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SH1106=m - CONFIG_FB_TFT_SSD1289=m - CONFIG_FB_TFT_SSD1306=m - CONFIG_FB_TFT_SSD1331=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -898,8 +898,8 @@ CONFIG_SND_BCM2835_SOC_I2S=m - CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m --CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -@@ -1196,6 +1196,7 @@ CONFIG_FB_TFT_PCD8544=m - CONFIG_FB_TFT_RA8875=m - CONFIG_FB_TFT_S6D02A1=m - CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SH1106=m - CONFIG_FB_TFT_SSD1289=m - CONFIG_FB_TFT_SSD1306=m - CONFIG_FB_TFT_SSD1331=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1061,6 +1061,7 @@ CONFIG_FB_TFT_PCD8544=m - CONFIG_FB_TFT_RA8875=m - CONFIG_FB_TFT_S6D02A1=m - CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SH1106=m - CONFIG_FB_TFT_SSD1289=m - CONFIG_FB_TFT_SSD1306=m - CONFIG_FB_TFT_SSD1331=m diff --git a/target/linux/brcm2708/patches-4.19/950-0377-configs-Enable-MT76-USB-wifi.patch b/target/linux/brcm2708/patches-4.19/950-0377-configs-Enable-MT76-USB-wifi.patch deleted file mode 100644 index 2885ce8c8c..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0377-configs-Enable-MT76-USB-wifi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ff3653c152198b260d6fbbfa0bad6b2b225c2337 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Thu, 7 Mar 2019 19:27:05 +0100 -Subject: [PATCH 377/806] configs: Enable MT76 USB wifi - -Signed-off-by: Stefan Wahren ---- - arch/arm/configs/bcm2709_defconfig | 2 ++ - arch/arm/configs/bcmrpi_defconfig | 2 ++ - arch/arm64/configs/bcmrpi3_defconfig | 2 ++ - 3 files changed, 6 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -526,6 +526,8 @@ CONFIG_LIBERTAS_THINFIRM_USB=m - CONFIG_MWIFIEX=m - CONFIG_MWIFIEX_SDIO=m - CONFIG_MT7601U=m -+CONFIG_MT76x0U=m -+CONFIG_MT76x2U=m - CONFIG_RT2X00=m - CONFIG_RT2500USB=m - CONFIG_RT73USB=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -520,6 +520,8 @@ CONFIG_LIBERTAS_THINFIRM_USB=m - CONFIG_MWIFIEX=m - CONFIG_MWIFIEX_SDIO=m - CONFIG_MT7601U=m -+CONFIG_MT76x0U=m -+CONFIG_MT76x2U=m - CONFIG_RT2X00=m - CONFIG_RT2500USB=m - CONFIG_RT73USB=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -512,6 +512,8 @@ CONFIG_LIBERTAS_THINFIRM_USB=m - CONFIG_MWIFIEX=m - CONFIG_MWIFIEX_SDIO=m - CONFIG_MT7601U=m -+CONFIG_MT76x0U=m -+CONFIG_MT76x2U=m - CONFIG_RT2X00=m - CONFIG_RT2500USB=m - CONFIG_RT73USB=m diff --git a/target/linux/brcm2708/patches-4.19/950-0381-configs-Re-enable-CONFIG_NETFILTER_XT_MATCH_SOCKET.patch b/target/linux/brcm2708/patches-4.19/950-0381-configs-Re-enable-CONFIG_NETFILTER_XT_MATCH_SOCKET.patch deleted file mode 100644 index 2708ee5673..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0381-configs-Re-enable-CONFIG_NETFILTER_XT_MATCH_SOCKET.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f17c7a2c574468870256cb5e9c087c1856530018 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Sun, 24 Mar 2019 20:54:25 +0000 -Subject: [PATCH 381/806] configs: Re-enable CONFIG_NETFILTER_XT_MATCH_SOCKET - -A Kconfig change in 4.10 caused the xt_socket module to no-longer be -included in Raspbian builds. Fix the defconfigs to re-enable it. - -See: https://github.com/raspberrypi/linux/issues/2905 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -186,6 +186,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m - CONFIG_NETFILTER_XT_MATCH_RATEEST=m - CONFIG_NETFILTER_XT_MATCH_REALM=m - CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m - CONFIG_NETFILTER_XT_MATCH_STATE=m - CONFIG_NETFILTER_XT_MATCH_STATISTIC=m - CONFIG_NETFILTER_XT_MATCH_STRING=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -180,6 +180,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m - CONFIG_NETFILTER_XT_MATCH_RATEEST=m - CONFIG_NETFILTER_XT_MATCH_REALM=m - CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m - CONFIG_NETFILTER_XT_MATCH_STATE=m - CONFIG_NETFILTER_XT_MATCH_STATISTIC=m - CONFIG_NETFILTER_XT_MATCH_STRING=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -181,6 +181,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m - CONFIG_NETFILTER_XT_MATCH_RATEEST=m - CONFIG_NETFILTER_XT_MATCH_REALM=m - CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m - CONFIG_NETFILTER_XT_MATCH_STATE=m - CONFIG_NETFILTER_XT_MATCH_STATISTIC=m - CONFIG_NETFILTER_XT_MATCH_STRING=m diff --git a/target/linux/brcm2708/patches-4.19/950-0387-configs-Add-CONFIG_BATTERY_MAX17040.patch b/target/linux/brcm2708/patches-4.19/950-0387-configs-Add-CONFIG_BATTERY_MAX17040.patch deleted file mode 100644 index 618df8e610..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0387-configs-Add-CONFIG_BATTERY_MAX17040.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0e31734e44b3a55d58356aa9756c855f54661556 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 25 Mar 2019 17:54:05 +0000 -Subject: [PATCH 387/806] configs: Add CONFIG_BATTERY_MAX17040 - -See: https://github.com/raspberrypi/linux/issues/2906 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -659,6 +659,7 @@ CONFIG_W1_SLAVE_DS28E04=m - CONFIG_POWER_RESET=y - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_MAX17040=m - CONFIG_BATTERY_GAUGE_LTC2941=m - CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -652,6 +652,7 @@ CONFIG_W1_SLAVE_DS28E04=m - CONFIG_POWER_RESET=y - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_MAX17040=m - CONFIG_BATTERY_GAUGE_LTC2941=m - CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -629,6 +629,7 @@ CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_MAX17040=m - CONFIG_HWMON=m - CONFIG_SENSORS_LM75=m - CONFIG_SENSORS_SHT21=m diff --git a/target/linux/brcm2708/patches-4.19/950-0389-defconfigs-disable-memory-and-IO-cgroups-2908.patch b/target/linux/brcm2708/patches-4.19/950-0389-defconfigs-disable-memory-and-IO-cgroups-2908.patch deleted file mode 100644 index d201046258..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0389-defconfigs-disable-memory-and-IO-cgroups-2908.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d8c3886387714f69359e2fce74b114f44a9b79f8 Mon Sep 17 00:00:00 2001 -From: P33M -Date: Tue, 26 Mar 2019 09:48:25 +0000 -Subject: [PATCH 389/806] defconfigs: disable memory and IO cgroups (#2908) - -Due to an upstream bug, memory is leaked in the inode cache when cgroups -are enabled. Disable as this is causing crashes. - -See: https://github.com/raspberrypi/linux/issues/2829 ---- - arch/arm/configs/bcm2709_defconfig | 4 ---- - arch/arm/configs/bcmrpi_defconfig | 4 ---- - arch/arm64/configs/bcmrpi3_defconfig | 4 ---- - 3 files changed, 12 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -14,8 +14,6 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y --CONFIG_MEMCG=y --CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y -@@ -64,10 +62,8 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y --CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y --CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=m - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -13,8 +13,6 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y --CONFIG_MEMCG=y --CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CGROUP_DEVICE=y - CONFIG_CGROUP_CPUACCT=y -@@ -58,10 +56,8 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y --CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y --CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=m - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -13,8 +13,6 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y --CONFIG_MEMCG=y --CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y -@@ -62,10 +60,8 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y --CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y --CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=y - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y diff --git a/target/linux/brcm2708/patches-4.19/950-0394-configs-Add-RTC_DRV_RV3028-m.patch b/target/linux/brcm2708/patches-4.19/950-0394-configs-Add-RTC_DRV_RV3028-m.patch deleted file mode 100644 index 4dedc0e3d9..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0394-configs-Add-RTC_DRV_RV3028-m.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 76c91a0db681bda7dfa62da4b9a6c0a550e45bb5 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Thu, 28 Mar 2019 13:13:52 +0000 -Subject: [PATCH 394/806] configs: Add RTC_DRV_RV3028=m - -See: https://github.com/raspberrypi/linux/issues/2912 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1157,6 +1157,7 @@ CONFIG_RTC_DRV_FM3130=m - CONFIG_RTC_DRV_RX8581=m - CONFIG_RTC_DRV_RX8025=m - CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_RV3028=m - CONFIG_RTC_DRV_M41T93=m - CONFIG_RTC_DRV_M41T94=m - CONFIG_RTC_DRV_DS1302=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1150,6 +1150,7 @@ CONFIG_RTC_DRV_FM3130=m - CONFIG_RTC_DRV_RX8581=m - CONFIG_RTC_DRV_RX8025=m - CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_RV3028=m - CONFIG_RTC_DRV_M41T93=m - CONFIG_RTC_DRV_M41T94=m - CONFIG_RTC_DRV_DS1302=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1017,6 +1017,7 @@ CONFIG_RTC_DRV_FM3130=m - CONFIG_RTC_DRV_RX8581=m - CONFIG_RTC_DRV_RX8025=m - CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_RV3028=m - CONFIG_RTC_DRV_M41T93=m - CONFIG_RTC_DRV_M41T94=m - CONFIG_RTC_DRV_DS1302=m diff --git a/target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch index 48d6c85e5a..1532461cdb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch @@ -8,9 +8,6 @@ Signed-off-by: Audiophonics arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 6 + .../boot/dts/overlays/i-sabre-q2m-overlay.dts | 39 ++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + sound/soc/bcm/Kconfig | 7 + sound/soc/bcm/Makefile | 2 + sound/soc/bcm/i-sabre-q2m.c | 157 +++++++ @@ -91,36 +88,6 @@ Signed-off-by: Audiophonics + }; + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -916,6 +916,7 @@ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -909,6 +909,7 @@ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -804,6 +804,7 @@ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOSENSE_PI=m --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -123,6 +123,13 @@ config SND_BCM2708_SOC_IQAUDIO_DIGI diff --git a/target/linux/brcm2708/patches-4.19/950-0419-configs-Add-TOUCHSCREEN_ILI210X-m.patch b/target/linux/brcm2708/patches-4.19/950-0419-configs-Add-TOUCHSCREEN_ILI210X-m.patch deleted file mode 100644 index c9218e9302..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0419-configs-Add-TOUCHSCREEN_ILI210X-m.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b3ab4206dbc0f85248fac08e950c427922020e4d Mon Sep 17 00:00:00 2001 -From: Samuel Hsu -Date: Mon, 8 Apr 2019 16:54:34 +0200 -Subject: [PATCH 419/806] configs: Add TOUCHSCREEN_ILI210X=m - -Signed-off-by: Samuel Hsu ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -565,6 +565,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m - CONFIG_TOUCHSCREEN_EGALAX=m - CONFIG_TOUCHSCREEN_EXC3000=m - CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_ILI210X=m - CONFIG_TOUCHSCREEN_EDT_FT5X06=m - CONFIG_TOUCHSCREEN_RPI_FT5406=m - CONFIG_TOUCHSCREEN_USB_COMPOSITE=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -559,6 +559,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m - CONFIG_TOUCHSCREEN_EGALAX=m - CONFIG_TOUCHSCREEN_EXC3000=m - CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_ILI210X=m - CONFIG_TOUCHSCREEN_EDT_FT5X06=m - CONFIG_TOUCHSCREEN_RPI_FT5406=m - CONFIG_TOUCHSCREEN_USB_COMPOSITE=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -547,6 +547,7 @@ CONFIG_INPUT_TOUCHSCREEN=y - CONFIG_TOUCHSCREEN_ADS7846=m - CONFIG_TOUCHSCREEN_EGALAX=m - CONFIG_TOUCHSCREEN_EKTF2127=m -+CONFIG_TOUCHSCREEN_ILI210X=m - CONFIG_TOUCHSCREEN_RPI_FT5406=m - CONFIG_TOUCHSCREEN_USB_COMPOSITE=m - CONFIG_TOUCHSCREEN_STMPE=m diff --git a/target/linux/brcm2708/patches-4.19/950-0428-Revert-defconfigs-disable-memory-and-IO-cgroups-2908.patch b/target/linux/brcm2708/patches-4.19/950-0428-Revert-defconfigs-disable-memory-and-IO-cgroups-2908.patch deleted file mode 100644 index e68ebf2007..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0428-Revert-defconfigs-disable-memory-and-IO-cgroups-2908.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d4de8d2873994b22855d57ccdc21b52d2c7bbd7b Mon Sep 17 00:00:00 2001 -From: P33M -Date: Wed, 24 Apr 2019 14:25:41 +0100 -Subject: [PATCH 428/806] Revert "defconfigs: disable memory and IO cgroups - (#2908)" - -This reverts commit 9881cdbf446081f71c62f39f4c56a21001baea73. ---- - arch/arm/configs/bcm2709_defconfig | 4 ++++ - arch/arm/configs/bcmrpi_defconfig | 4 ++++ - arch/arm64/configs/bcmrpi3_defconfig | 4 ++++ - 3 files changed, 12 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -14,6 +14,8 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y -@@ -62,8 +64,10 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=m - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CGROUP_DEVICE=y - CONFIG_CGROUP_CPUACCT=y -@@ -56,8 +58,10 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=m - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y -@@ -60,8 +62,10 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=y - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y diff --git a/target/linux/brcm2708/patches-4.19/950-0430-configs-enable-LED-driver-for-PiGlow.patch b/target/linux/brcm2708/patches-4.19/950-0430-configs-enable-LED-driver-for-PiGlow.patch deleted file mode 100644 index 15873d11fc..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0430-configs-enable-LED-driver-for-PiGlow.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c9f47471ab4a4a1d9d96eaca2260cad7dfefa371 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Mon, 29 Apr 2019 19:28:51 +0200 -Subject: [PATCH 430/806] configs: enable LED driver for PiGlow - -Signed-off-by: Stefan Wahren ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 3 ++- - 3 files changed, 4 insertions(+), 1 deletion(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1131,6 +1131,7 @@ CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_PCA963X=m -+CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1124,6 +1124,7 @@ CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_PCA963X=m -+CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -550,8 +550,8 @@ CONFIG_JOYSTICK_RPISENSE=m - CONFIG_INPUT_TOUCHSCREEN=y - CONFIG_TOUCHSCREEN_ADS7846=m - CONFIG_TOUCHSCREEN_EGALAX=m --CONFIG_TOUCHSCREEN_EKTF2127=m - CONFIG_TOUCHSCREEN_ILI210X=m -+CONFIG_TOUCHSCREEN_EKTF2127=m - CONFIG_TOUCHSCREEN_RPI_FT5406=m - CONFIG_TOUCHSCREEN_USB_COMPOSITE=m - CONFIG_TOUCHSCREEN_STMPE=m -@@ -991,6 +991,7 @@ CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_PCA963X=m -+CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y diff --git a/target/linux/brcm2708/patches-4.19/950-0477-configs-Enable-netdev-LED-trigger.patch b/target/linux/brcm2708/patches-4.19/950-0477-configs-Enable-netdev-LED-trigger.patch deleted file mode 100644 index 012f483f36..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0477-configs-Enable-netdev-LED-trigger.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 989bb04dc3a1c0819c715566e465b9b28a4878fb Mon Sep 17 00:00:00 2001 -From: Russell Joyce -Date: Wed, 1 May 2019 16:43:27 +0100 -Subject: [PATCH 477/806] configs: Enable netdev LED trigger - -Signed-off-by: Russell Joyce ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1143,6 +1143,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m - CONFIG_LEDS_TRIGGER_CAMERA=m - CONFIG_LEDS_TRIGGER_INPUT=y - CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_LEDS_TRIGGER_NETDEV=m - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - CONFIG_RTC_DRV_ABX80X=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1136,6 +1136,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m - CONFIG_LEDS_TRIGGER_CAMERA=m - CONFIG_LEDS_TRIGGER_INPUT=y - CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_LEDS_TRIGGER_NETDEV=m - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - CONFIG_RTC_DRV_ABX80X=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1003,6 +1003,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m - CONFIG_LEDS_TRIGGER_CAMERA=m - CONFIG_LEDS_TRIGGER_INPUT=y - CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_LEDS_TRIGGER_NETDEV=m - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - CONFIG_RTC_DRV_ABX80X=m diff --git a/target/linux/brcm2708/patches-4.19/950-0484-configs-Enable-ICS-43432-I2S-microphone-module.patch b/target/linux/brcm2708/patches-4.19/950-0484-configs-Enable-ICS-43432-I2S-microphone-module.patch deleted file mode 100644 index e431e2ec55..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0484-configs-Enable-ICS-43432-I2S-microphone-module.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 812fee9b653e50fec627349dc69480a31c2a5e21 Mon Sep 17 00:00:00 2001 -From: Russell Joyce -Date: Thu, 2 May 2019 15:18:36 +0100 -Subject: [PATCH 484/806] configs: Enable ICS-43432 I2S microphone module - -Signed-off-by: Russell Joyce ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -943,6 +943,7 @@ CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_ICS43432=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -936,6 +936,7 @@ CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_ICS43432=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -822,6 +822,7 @@ CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_ICS43432=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m - CONFIG_HIDRAW=y diff --git a/target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch b/target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch index 41ccda0486..1666b3f507 100644 --- a/target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch +++ b/target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch @@ -10,9 +10,6 @@ Signed-off-by: Gordon arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 6 + .../dts/overlays/iqaudio-codec-overlay.dts | 42 +++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + sound/soc/bcm/Kconfig | 7 + sound/soc/bcm/Makefile | 2 + sound/soc/bcm/iqaudio-codec.c | 250 ++++++++++++++++++ @@ -90,36 +87,6 @@ Signed-off-by: Gordon + __overrides__ { + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -919,6 +919,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m - CONFIG_SND_BCM2708_SOC_RPI_PROTO=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m - CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -912,6 +912,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m - CONFIG_SND_BCM2708_SOC_RPI_PROTO=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m - CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -807,6 +807,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m - CONFIG_SND_BCM2708_SOC_RPI_PROTO=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m - CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -108,6 +108,13 @@ config SND_BCM2708_SOC_JUSTBOOM_DIGI diff --git a/target/linux/brcm2708/patches-4.19/950-0491-configs-Enable-PIDs-cgroup.patch b/target/linux/brcm2708/patches-4.19/950-0491-configs-Enable-PIDs-cgroup.patch deleted file mode 100644 index ce3fec1d70..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0491-configs-Enable-PIDs-cgroup.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 28b2ce05cbdac453fee235983d090783313d0111 Mon Sep 17 00:00:00 2001 -From: Henrique Gontijo -Date: Sun, 12 May 2019 17:11:02 -0700 -Subject: [PATCH 491/806] configs: Enable PIDs cgroup - -My use case to is to allow Kubernetes master to run on Raspberry Pi 3. -Kubernetes introduced [Pid limiting](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/20190129-pid-limiting.md), -on v.1.14.0 which includes [Pod Pids Limit](https://github.com/kubernetes/kubernetes/commit/bce9d5f2043bd86964c9fec80d466e47776071bc) -and [Node Pids Limit](https://github.com/kubernetes/kubernetes/commit/2597a1d97ef4d8f54b1ca661453e32794b756909#diff-fa76bb6ae2d9b4bb3d023737fe5e6029R333) -that requires pids cgroup. - -See: https://github.com/raspberrypi/linux/pull/2968 ---- - arch/arm/configs/bcm2709_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -20,6 +20,7 @@ CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y - CONFIG_CGROUP_CPUACCT=y -+CONFIG_CGROUP_PIDS=y - CONFIG_NAMESPACES=y - CONFIG_USER_NS=y - CONFIG_SCHED_AUTOGROUP=y diff --git a/target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch index ea8cbfe786..e33173a557 100644 --- a/target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch +++ b/target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch @@ -7,8 +7,6 @@ Subject: [PATCH 495/806] ASoC: decommissioning driver for 3Dlab Nano soundcard .../overlays/3dlab-nano-player-overlay.dts | 32 -- arch/arm/boot/dts/overlays/Makefile | 1 - arch/arm/boot/dts/overlays/README | 6 - - arch/arm/configs/bcm2709_defconfig | 1 - - arch/arm/configs/bcmrpi_defconfig | 1 - sound/soc/bcm/3dlab-nano-player.c | 370 ------------------ sound/soc/bcm/Kconfig | 6 - sound/soc/bcm/Makefile | 6 +- @@ -76,26 +74,6 @@ Subject: [PATCH 495/806] ASoC: decommissioning driver for 3Dlab Nano soundcard Name: adau1977-adc Info: Overlay for activation of ADAU1977 ADC codec over I2C for control and I2S for data. ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -908,7 +908,6 @@ CONFIG_SND_USB_6FIRE=m - CONFIG_SND_USB_HIFACE=m - CONFIG_SND_SOC=m - CONFIG_SND_BCM2835_SOC_I2S=m --CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -900,7 +900,6 @@ CONFIG_SND_USB_6FIRE=m - CONFIG_SND_USB_HIFACE=m - CONFIG_SND_SOC=m - CONFIG_SND_BCM2835_SOC_I2S=m --CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m --- a/sound/soc/bcm/3dlab-nano-player.c +++ /dev/null @@ -1,370 +0,0 @@ diff --git a/target/linux/brcm2708/patches-4.19/950-0510-config-Add-NF_TABLES-support.patch b/target/linux/brcm2708/patches-4.19/950-0510-config-Add-NF_TABLES-support.patch deleted file mode 100644 index 02de3919e2..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0510-config-Add-NF_TABLES-support.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 9d96c80ddbea92f8aaba3a90980e6afb25e5016a Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 3 Jun 2019 14:57:56 +0100 -Subject: [PATCH 510/806] config: Add NF_TABLES support - ---- - arch/arm/configs/bcm2709_defconfig | 48 ++++++++++++++++++++++++++++++ - arch/arm/configs/bcmrpi_defconfig | 48 ++++++++++++++++++++++++++++++ - 2 files changed, 96 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -136,6 +136,36 @@ CONFIG_NF_CONNTRACK_SANE=m - CONFIG_NF_CONNTRACK_SIP=m - CONFIG_NF_CONNTRACK_TFTP=m - CONFIG_NF_CT_NETLINK=m -+CONFIG_NF_TABLES=m -+CONFIG_NF_TABLES_SET=m -+CONFIG_NF_TABLES_INET=y -+CONFIG_NF_TABLES_NETDEV=y -+CONFIG_NFT_NUMGEN=m -+CONFIG_NFT_CT=m -+CONFIG_NFT_FLOW_OFFLOAD=m -+CONFIG_NFT_COUNTER=m -+CONFIG_NFT_CONNLIMIT=m -+CONFIG_NFT_LOG=m -+CONFIG_NFT_LIMIT=m -+CONFIG_NFT_MASQ=m -+CONFIG_NFT_REDIR=m -+CONFIG_NFT_NAT=m -+CONFIG_NFT_TUNNEL=m -+CONFIG_NFT_OBJREF=m -+CONFIG_NFT_QUEUE=m -+CONFIG_NFT_QUOTA=m -+CONFIG_NFT_REJECT=m -+CONFIG_NFT_COMPAT=m -+CONFIG_NFT_HASH=m -+CONFIG_NFT_FIB_INET=m -+CONFIG_NFT_SOCKET=m -+CONFIG_NFT_OSF=m -+CONFIG_NFT_TPROXY=m -+CONFIG_NFT_DUP_NETDEV=m -+CONFIG_NFT_FWD_NETDEV=m -+CONFIG_NFT_FIB_NETDEV=m -+CONFIG_NF_FLOW_TABLE_INET=m -+CONFIG_NF_FLOW_TABLE=m - CONFIG_NETFILTER_XT_SET=m - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -@@ -224,6 +254,14 @@ CONFIG_IP_VS_SED=m - CONFIG_IP_VS_NQ=m - CONFIG_IP_VS_FTP=m - CONFIG_IP_VS_PE_SIP=m -+CONFIG_NFT_CHAIN_ROUTE_IPV4=m -+CONFIG_NFT_DUP_IPV4=m -+CONFIG_NFT_FIB_IPV4=m -+CONFIG_NF_TABLES_ARP=y -+CONFIG_NF_FLOW_TABLE_IPV4=m -+CONFIG_NFT_CHAIN_NAT_IPV4=m -+CONFIG_NFT_MASQ_IPV4=m -+CONFIG_NFT_REDIR_IPV4=m - CONFIG_IP_NF_IPTABLES=m - CONFIG_IP_NF_MATCH_AH=m - CONFIG_IP_NF_MATCH_ECN=m -@@ -243,6 +281,13 @@ CONFIG_IP_NF_RAW=m - CONFIG_IP_NF_ARPTABLES=m - CONFIG_IP_NF_ARPFILTER=m - CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_NFT_CHAIN_ROUTE_IPV6=m -+CONFIG_NFT_CHAIN_NAT_IPV6=m -+CONFIG_NFT_MASQ_IPV6=m -+CONFIG_NFT_REDIR_IPV6=m -+CONFIG_NFT_DUP_IPV6=m -+CONFIG_NFT_FIB_IPV6=m -+CONFIG_NF_FLOW_TABLE_IPV6=m - CONFIG_IP6_NF_IPTABLES=m - CONFIG_IP6_NF_MATCH_AH=m - CONFIG_IP6_NF_MATCH_EUI64=m -@@ -261,6 +306,9 @@ CONFIG_IP6_NF_RAW=m - CONFIG_IP6_NF_NAT=m - CONFIG_IP6_NF_TARGET_MASQUERADE=m - CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_NF_TABLES_BRIDGE=y -+CONFIG_NFT_BRIDGE_REJECT=m -+CONFIG_NF_LOG_BRIDGE=m - CONFIG_BRIDGE_NF_EBTABLES=m - CONFIG_BRIDGE_EBT_BROUTE=m - CONFIG_BRIDGE_EBT_T_FILTER=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -129,6 +129,36 @@ CONFIG_NF_CONNTRACK_SANE=m - CONFIG_NF_CONNTRACK_SIP=m - CONFIG_NF_CONNTRACK_TFTP=m - CONFIG_NF_CT_NETLINK=m -+CONFIG_NF_TABLES=m -+CONFIG_NF_TABLES_SET=m -+CONFIG_NF_TABLES_INET=y -+CONFIG_NF_TABLES_NETDEV=y -+CONFIG_NFT_NUMGEN=m -+CONFIG_NFT_CT=m -+CONFIG_NFT_FLOW_OFFLOAD=m -+CONFIG_NFT_COUNTER=m -+CONFIG_NFT_CONNLIMIT=m -+CONFIG_NFT_LOG=m -+CONFIG_NFT_LIMIT=m -+CONFIG_NFT_MASQ=m -+CONFIG_NFT_REDIR=m -+CONFIG_NFT_NAT=m -+CONFIG_NFT_TUNNEL=m -+CONFIG_NFT_OBJREF=m -+CONFIG_NFT_QUEUE=m -+CONFIG_NFT_QUOTA=m -+CONFIG_NFT_REJECT=m -+CONFIG_NFT_COMPAT=m -+CONFIG_NFT_HASH=m -+CONFIG_NFT_FIB_INET=m -+CONFIG_NFT_SOCKET=m -+CONFIG_NFT_OSF=m -+CONFIG_NFT_TPROXY=m -+CONFIG_NFT_DUP_NETDEV=m -+CONFIG_NFT_FWD_NETDEV=m -+CONFIG_NFT_FIB_NETDEV=m -+CONFIG_NF_FLOW_TABLE_INET=m -+CONFIG_NF_FLOW_TABLE=m - CONFIG_NETFILTER_XT_SET=m - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -@@ -217,6 +247,14 @@ CONFIG_IP_VS_SED=m - CONFIG_IP_VS_NQ=m - CONFIG_IP_VS_FTP=m - CONFIG_IP_VS_PE_SIP=m -+CONFIG_NFT_CHAIN_ROUTE_IPV4=m -+CONFIG_NFT_DUP_IPV4=m -+CONFIG_NFT_FIB_IPV4=m -+CONFIG_NF_TABLES_ARP=y -+CONFIG_NF_FLOW_TABLE_IPV4=m -+CONFIG_NFT_CHAIN_NAT_IPV4=m -+CONFIG_NFT_MASQ_IPV4=m -+CONFIG_NFT_REDIR_IPV4=m - CONFIG_IP_NF_IPTABLES=m - CONFIG_IP_NF_MATCH_AH=m - CONFIG_IP_NF_MATCH_ECN=m -@@ -236,6 +274,13 @@ CONFIG_IP_NF_RAW=m - CONFIG_IP_NF_ARPTABLES=m - CONFIG_IP_NF_ARPFILTER=m - CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_NFT_CHAIN_ROUTE_IPV6=m -+CONFIG_NFT_CHAIN_NAT_IPV6=m -+CONFIG_NFT_MASQ_IPV6=m -+CONFIG_NFT_REDIR_IPV6=m -+CONFIG_NFT_DUP_IPV6=m -+CONFIG_NFT_FIB_IPV6=m -+CONFIG_NF_FLOW_TABLE_IPV6=m - CONFIG_IP6_NF_IPTABLES=m - CONFIG_IP6_NF_MATCH_AH=m - CONFIG_IP6_NF_MATCH_EUI64=m -@@ -254,6 +299,9 @@ CONFIG_IP6_NF_RAW=m - CONFIG_IP6_NF_NAT=m - CONFIG_IP6_NF_TARGET_MASQUERADE=m - CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_NF_TABLES_BRIDGE=y -+CONFIG_NFT_BRIDGE_REJECT=m -+CONFIG_NF_LOG_BRIDGE=m - CONFIG_BRIDGE_NF_EBTABLES=m - CONFIG_BRIDGE_EBT_BROUTE=m - CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/target/linux/brcm2708/patches-4.19/950-0637-configs-Add-bcm2711_defconfig.patch b/target/linux/brcm2708/patches-4.19/950-0637-configs-Add-bcm2711_defconfig.patch deleted file mode 100644 index ecd329b977..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0637-configs-Add-bcm2711_defconfig.patch +++ /dev/null @@ -1,1343 +0,0 @@ -From dd6d7c3408eadd9e7ffe899d6ba2c751fd7ef0d5 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 29 May 2019 15:40:21 +0100 -Subject: [PATCH 637/806] configs: Add bcm2711_defconfig - ---- - arch/arm/configs/bcm2711_defconfig | 1330 ++++++++++++++++++++++++++++ - 1 file changed, 1330 insertions(+) - create mode 100644 arch/arm/configs/bcm2711_defconfig - ---- /dev/null -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -0,0 +1,1330 @@ -+CONFIG_LOCALVERSION="-v7l" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_GENERIC_IRQ_DEBUGFS=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=m -+CONFIG_IKCONFIG_PROC=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CPUSETS=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_NAMESPACES=y -+CONFIG_USER_NS=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_PROFILING=y -+CONFIG_ARCH_BCM=y -+CONFIG_ARCH_BCM2835=y -+CONFIG_ARM_LPAE=y -+# CONFIG_CACHE_L2X0 is not set -+CONFIG_PCI=y -+CONFIG_PCI_MSI=y -+CONFIG_PCIE_BRCMSTB=y -+CONFIG_SMP=y -+CONFIG_HIGHMEM=y -+CONFIG_UACCESS_WITH_MEMCPY=y -+CONFIG_SECCOMP=y -+# CONFIG_ATAGS is not set -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_STAT=y -+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -+CONFIG_CPU_FREQ_GOV_USERSPACE=y -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_VFP=y -+CONFIG_NEON=y -+CONFIG_KERNEL_MODE_NEON=y -+# CONFIG_SUSPEND is not set -+CONFIG_PM=y -+CONFIG_RASPBERRYPI_FIRMWARE=y -+CONFIG_ARM_CRYPTO=y -+CONFIG_CRYPTO_SHA1_ARM_NEON=m -+CONFIG_CRYPTO_AES_ARM=m -+CONFIG_CRYPTO_AES_ARM_BS=m -+CONFIG_OPROFILE=m -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_BINFMT_MISC=m -+CONFIG_CLEANCACHE=y -+CONFIG_FRONTSWAP=y -+CONFIG_CMA=y -+CONFIG_ZSMALLOC=m -+CONFIG_PGTABLE_MAPPING=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE_DEMUX=m -+CONFIG_NET_IPGRE=m -+CONFIG_IP_MROUTE=y -+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IP_PIMSM_V1=y -+CONFIG_IP_PIMSM_V2=y -+CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_DIAG=m -+CONFIG_TCP_CONG_ADVANCED=y -+CONFIG_TCP_CONG_BBR=m -+CONFIG_IPV6=m -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_IPV6_ROUTE_INFO=y -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+CONFIG_IPV6_SIT_6RD=y -+CONFIG_IPV6_TUNNEL=m -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_IPV6_SUBTREES=y -+CONFIG_IPV6_MROUTE=y -+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IPV6_PIMSM_V2=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CONNTRACK_ZONES=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_TIMESTAMP=y -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_SNMP=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NF_CT_NETLINK=m -+CONFIG_NETFILTER_XT_SET=m -+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HMARK=m -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_LOG=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_TEE=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -+CONFIG_NETFILTER_XT_MATCH_BPF=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_CPU=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_IPVS=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_NFACCT=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_IP_SET=m -+CONFIG_IP_SET_BITMAP_IP=m -+CONFIG_IP_SET_BITMAP_IPMAC=m -+CONFIG_IP_SET_BITMAP_PORT=m -+CONFIG_IP_SET_HASH_IP=m -+CONFIG_IP_SET_HASH_IPPORT=m -+CONFIG_IP_SET_HASH_IPPORTIP=m -+CONFIG_IP_SET_HASH_IPPORTNET=m -+CONFIG_IP_SET_HASH_NET=m -+CONFIG_IP_SET_HASH_NETPORT=m -+CONFIG_IP_SET_HASH_NETIFACE=m -+CONFIG_IP_SET_LIST_SET=m -+CONFIG_IP_VS=m -+CONFIG_IP_VS_PROTO_TCP=y -+CONFIG_IP_VS_PROTO_UDP=y -+CONFIG_IP_VS_PROTO_ESP=y -+CONFIG_IP_VS_PROTO_AH=y -+CONFIG_IP_VS_PROTO_SCTP=y -+CONFIG_IP_VS_RR=m -+CONFIG_IP_VS_WRR=m -+CONFIG_IP_VS_LC=m -+CONFIG_IP_VS_WLC=m -+CONFIG_IP_VS_LBLC=m -+CONFIG_IP_VS_LBLCR=m -+CONFIG_IP_VS_DH=m -+CONFIG_IP_VS_SH=m -+CONFIG_IP_VS_SED=m -+CONFIG_IP_VS_NQ=m -+CONFIG_IP_VS_FTP=m -+CONFIG_IP_VS_PE_SIP=m -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_RPFILTER=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_NAT=m -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_IP_NF_MANGLE=m -+CONFIG_IP_NF_TARGET_CLUSTERIP=m -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RPFILTER=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_IP6_NF_NAT=m -+CONFIG_IP6_NF_TARGET_MASQUERADE=m -+CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+CONFIG_SCTP_COOKIE_HMAC_SHA1=y -+CONFIG_ATM=m -+CONFIG_L2TP=m -+CONFIG_L2TP_V3=y -+CONFIG_L2TP_IP=m -+CONFIG_L2TP_ETH=m -+CONFIG_BRIDGE=m -+CONFIG_VLAN_8021Q=m -+CONFIG_VLAN_8021Q_GVRP=y -+CONFIG_ATALK=m -+CONFIG_6LOWPAN=m -+CONFIG_IEEE802154=m -+CONFIG_IEEE802154_6LOWPAN=m -+CONFIG_MAC802154=m -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_ATM=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFB=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+CONFIG_NET_SCH_MQPRIO=m -+CONFIG_NET_SCH_CHOKE=m -+CONFIG_NET_SCH_QFQ=m -+CONFIG_NET_SCH_CODEL=m -+CONFIG_NET_SCH_FQ_CODEL=m -+CONFIG_NET_SCH_FQ=m -+CONFIG_NET_SCH_HHF=m -+CONFIG_NET_SCH_PIE=m -+CONFIG_NET_SCH_INGRESS=m -+CONFIG_NET_SCH_PLUG=m -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_CLS_CGROUP=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_EMATCH_IPSET=m -+CONFIG_NET_CLS_ACT=y -+CONFIG_NET_ACT_POLICE=m -+CONFIG_NET_ACT_GACT=m -+CONFIG_GACT_PROB=y -+CONFIG_NET_ACT_MIRRED=m -+CONFIG_NET_ACT_IPT=m -+CONFIG_NET_ACT_NAT=m -+CONFIG_NET_ACT_PEDIT=m -+CONFIG_NET_ACT_SIMP=m -+CONFIG_NET_ACT_SKBEDIT=m -+CONFIG_NET_ACT_CSUM=m -+CONFIG_BATMAN_ADV=m -+CONFIG_OPENVSWITCH=m -+CONFIG_NET_PKTGEN=m -+CONFIG_HAMRADIO=y -+CONFIG_AX25=m -+CONFIG_NETROM=m -+CONFIG_ROSE=m -+CONFIG_MKISS=m -+CONFIG_6PACK=m -+CONFIG_BPQETHER=m -+CONFIG_BAYCOM_SER_FDX=m -+CONFIG_BAYCOM_SER_HDX=m -+CONFIG_YAM=m -+CONFIG_CAN=m -+CONFIG_CAN_VCAN=m -+CONFIG_CAN_SLCAN=m -+CONFIG_CAN_MCP251X=m -+CONFIG_CAN_GS_USB=m -+CONFIG_BT=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+CONFIG_BT_BNEP_MC_FILTER=y -+CONFIG_BT_BNEP_PROTO_FILTER=y -+CONFIG_BT_HIDP=m -+CONFIG_BT_6LOWPAN=m -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIUART=m -+CONFIG_BT_HCIUART_3WIRE=y -+CONFIG_BT_HCIUART_BCM=y -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+CONFIG_BT_ATH3K=m -+CONFIG_BT_WILINK=m -+CONFIG_CFG80211=m -+CONFIG_MAC80211=m -+CONFIG_MAC80211_MESH=y -+CONFIG_WIMAX=m -+CONFIG_RFKILL=m -+CONFIG_RFKILL_INPUT=y -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_DEVTMPFS=y -+CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_DMA_CMA=y -+CONFIG_CMA_SIZE_MBYTES=5 -+CONFIG_MTD=m -+CONFIG_MTD_BLOCK=m -+CONFIG_MTD_M25P80=m -+CONFIG_MTD_BLOCK2MTD=m -+CONFIG_MTD_NAND=m -+CONFIG_MTD_SPI_NOR=m -+CONFIG_MTD_UBI=m -+CONFIG_OF_CONFIGFS=y -+CONFIG_ZRAM=m -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_DRBD=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_ATA_OVER_ETH=m -+CONFIG_EEPROM_AT24=m -+CONFIG_TI_ST=m -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_CHR_DEV_ST=m -+CONFIG_CHR_DEV_OSST=m -+CONFIG_BLK_DEV_SR=m -+CONFIG_CHR_DEV_SG=m -+CONFIG_SCSI_ISCSI_ATTRS=y -+CONFIG_ISCSI_TCP=m -+CONFIG_ISCSI_BOOT_SYSFS=m -+CONFIG_MD=y -+CONFIG_MD_LINEAR=m -+CONFIG_BLK_DEV_DM=m -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_THIN_PROVISIONING=m -+CONFIG_DM_CACHE=m -+CONFIG_DM_MIRROR=m -+CONFIG_DM_LOG_USERSPACE=m -+CONFIG_DM_RAID=m -+CONFIG_DM_ZERO=m -+CONFIG_DM_DELAY=m -+CONFIG_NETDEVICES=y -+CONFIG_BONDING=m -+CONFIG_DUMMY=m -+CONFIG_IFB=m -+CONFIG_MACVLAN=m -+CONFIG_IPVLAN=m -+CONFIG_VXLAN=m -+CONFIG_NETCONSOLE=m -+CONFIG_TUN=m -+CONFIG_VETH=m -+CONFIG_BCMGENET=y -+CONFIG_ENC28J60=m -+CONFIG_QCA7000_SPI=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_BROADCOM_PHY=y -+CONFIG_PPP=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_MPPE=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPPOATM=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+CONFIG_SLIP_SMART=y -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_RTL8152=y -+CONFIG_USB_LAN78XX=y -+CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX88179_178A=m -+CONFIG_USB_NET_CDCETHER=m -+CONFIG_USB_NET_CDC_EEM=m -+CONFIG_USB_NET_CDC_NCM=m -+CONFIG_USB_NET_HUAWEI_CDC_NCM=m -+CONFIG_USB_NET_CDC_MBIM=m -+CONFIG_USB_NET_DM9601=m -+CONFIG_USB_NET_SR9700=m -+CONFIG_USB_NET_SR9800=m -+CONFIG_USB_NET_SMSC75XX=m -+CONFIG_USB_NET_SMSC95XX=y -+CONFIG_USB_NET_GL620A=m -+CONFIG_USB_NET_NET1080=m -+CONFIG_USB_NET_PLUSB=m -+CONFIG_USB_NET_MCS7830=m -+CONFIG_USB_NET_CDC_SUBSET=m -+CONFIG_USB_ALI_M5632=y -+CONFIG_USB_AN2720=y -+CONFIG_USB_EPSON2888=y -+CONFIG_USB_KC2190=y -+CONFIG_USB_NET_ZAURUS=m -+CONFIG_USB_NET_CX82310_ETH=m -+CONFIG_USB_NET_KALMIA=m -+CONFIG_USB_NET_QMI_WWAN=m -+CONFIG_USB_HSO=m -+CONFIG_USB_NET_INT51X1=m -+CONFIG_USB_IPHETH=m -+CONFIG_USB_SIERRA_NET=m -+CONFIG_USB_VL600=m -+CONFIG_ATH9K=m -+CONFIG_ATH9K_HTC=m -+CONFIG_CARL9170=m -+CONFIG_ATH6KL=m -+CONFIG_ATH6KL_USB=m -+CONFIG_AR5523=m -+CONFIG_AT76C50X_USB=m -+CONFIG_B43=m -+# CONFIG_B43_PHY_N is not set -+CONFIG_B43LEGACY=m -+CONFIG_BRCMFMAC=m -+CONFIG_BRCMFMAC_USB=y -+CONFIG_BRCMDBG=y -+CONFIG_HOSTAP=m -+CONFIG_P54_COMMON=m -+CONFIG_P54_USB=m -+CONFIG_LIBERTAS=m -+CONFIG_LIBERTAS_USB=m -+CONFIG_LIBERTAS_SDIO=m -+CONFIG_LIBERTAS_THINFIRM=m -+CONFIG_LIBERTAS_THINFIRM_USB=m -+CONFIG_MWIFIEX=m -+CONFIG_MWIFIEX_SDIO=m -+CONFIG_MT7601U=m -+CONFIG_RT2X00=m -+CONFIG_RT2500USB=m -+CONFIG_RT73USB=m -+CONFIG_RT2800USB=m -+CONFIG_RT2800USB_RT3573=y -+CONFIG_RT2800USB_RT53XX=y -+CONFIG_RT2800USB_RT55XX=y -+CONFIG_RT2800USB_UNKNOWN=y -+CONFIG_RTL8187=m -+CONFIG_RTL8192CU=m -+CONFIG_RTL8XXXU=m -+CONFIG_USB_ZD1201=m -+CONFIG_ZD1211RW=m -+CONFIG_MAC80211_HWSIM=m -+CONFIG_USB_NET_RNDIS_WLAN=m -+CONFIG_WIMAX_I2400M_USB=m -+CONFIG_IEEE802154_AT86RF230=m -+CONFIG_IEEE802154_MRF24J40=m -+CONFIG_IEEE802154_CC2520=m -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_JOYDEV=m -+CONFIG_INPUT_EVDEV=m -+# CONFIG_KEYBOARD_ATKBD is not set -+CONFIG_KEYBOARD_GPIO=m -+CONFIG_KEYBOARD_MATRIX=m -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_IFORCE=m -+CONFIG_JOYSTICK_IFORCE_USB=y -+CONFIG_JOYSTICK_XPAD=m -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_JOYSTICK_PSXPAD_SPI=m -+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y -+CONFIG_JOYSTICK_RPISENSE=m -+CONFIG_INPUT_TOUCHSCREEN=y -+CONFIG_TOUCHSCREEN_ADS7846=m -+CONFIG_TOUCHSCREEN_EGALAX=m -+CONFIG_TOUCHSCREEN_EXC3000=m -+CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_EDT_FT5X06=m -+CONFIG_TOUCHSCREEN_RPI_FT5406=m -+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -+CONFIG_TOUCHSCREEN_STMPE=m -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_AD714X=m -+CONFIG_INPUT_ATI_REMOTE2=m -+CONFIG_INPUT_KEYSPAN_REMOTE=m -+CONFIG_INPUT_POWERMATE=m -+CONFIG_INPUT_YEALINK=m -+CONFIG_INPUT_CM109=m -+CONFIG_INPUT_UINPUT=m -+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -+CONFIG_INPUT_ADXL34X=m -+CONFIG_INPUT_CMA3000=m -+CONFIG_SERIO=m -+CONFIG_SERIO_RAW=m -+CONFIG_GAMEPORT=m -+CONFIG_GAMEPORT_NS558=m -+CONFIG_GAMEPORT_L4=m -+CONFIG_BRCM_CHAR_DRIVERS=y -+CONFIG_BCM_VCIO=y -+CONFIG_BCM_VC_SM=y -+CONFIG_BCM2835_DEVGPIOMEM=y -+CONFIG_ARGON_MEM=m -+# CONFIG_LEGACY_PTYS is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_DMA is not set -+CONFIG_SERIAL_8250_NR_UARTS=1 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=0 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_BCM2835AUX=y -+CONFIG_SERIAL_OF_PLATFORM=y -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_SERIAL_SC16IS7XX=m -+CONFIG_SERIAL_SC16IS7XX_SPI=y -+CONFIG_SERIAL_DEV_BUS=m -+CONFIG_TTY_PRINTK=y -+CONFIG_HW_RANDOM=y -+CONFIG_RAW_DRIVER=y -+CONFIG_I2C=y -+CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_BCM2708=m -+CONFIG_I2C_BCM2835=m -+CONFIG_I2C_GPIO=m -+CONFIG_I2C_ROBOTFUZZ_OSIF=m -+CONFIG_I2C_TINY_USB=m -+CONFIG_SPI=y -+CONFIG_SPI_BCM2835=m -+CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_SPIDEV=m -+CONFIG_SPI_SLAVE=y -+CONFIG_PPS=m -+CONFIG_PPS_CLIENT_LDISC=m -+CONFIG_PPS_CLIENT_GPIO=m -+CONFIG_PINCTRL_MCP23S08=m -+CONFIG_GPIO_BCM_VIRT=y -+CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCF857X=m -+CONFIG_GPIO_ARIZONA=m -+CONFIG_GPIO_STMPE=y -+CONFIG_W1=m -+CONFIG_W1_MASTER_DS2490=m -+CONFIG_W1_MASTER_DS2482=m -+CONFIG_W1_MASTER_DS1WM=m -+CONFIG_W1_MASTER_GPIO=m -+CONFIG_W1_SLAVE_THERM=m -+CONFIG_W1_SLAVE_SMEM=m -+CONFIG_W1_SLAVE_DS2408=m -+CONFIG_W1_SLAVE_DS2413=m -+CONFIG_W1_SLAVE_DS2406=m -+CONFIG_W1_SLAVE_DS2423=m -+CONFIG_W1_SLAVE_DS2431=m -+CONFIG_W1_SLAVE_DS2433=m -+CONFIG_W1_SLAVE_DS2438=m -+CONFIG_W1_SLAVE_DS2780=m -+CONFIG_W1_SLAVE_DS2781=m -+CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_POWER_RESET=y -+CONFIG_POWER_RESET_GPIO=y -+CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_GAUGE_LTC2941=m -+CONFIG_HWMON=m -+CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_JC42=m -+CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RPI_POE_FAN=m -+CONFIG_SENSORS_SHT21=m -+CONFIG_SENSORS_SHT3x=m -+CONFIG_SENSORS_SHTC1=m -+CONFIG_SENSORS_ADS1015=m -+CONFIG_SENSORS_INA2XX=m -+CONFIG_SENSORS_TMP102=m -+CONFIG_THERMAL=y -+CONFIG_BCM2835_THERMAL=y -+CONFIG_BRCMSTB_THERMAL=y -+CONFIG_WATCHDOG=y -+CONFIG_GPIO_WATCHDOG=m -+CONFIG_BCM2835_WDT=y -+CONFIG_MFD_STMPE=y -+CONFIG_STMPE_SPI=y -+CONFIG_MFD_ARIZONA_I2C=m -+CONFIG_MFD_ARIZONA_SPI=m -+CONFIG_MFD_WM5102=y -+CONFIG_REGULATOR=y -+CONFIG_REGULATOR_FIXED_VOLTAGE=m -+CONFIG_REGULATOR_ARIZONA_LDO1=m -+CONFIG_REGULATOR_ARIZONA_MICSUPP=m -+CONFIG_REGULATOR_GPIO=y -+CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y -+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -+CONFIG_MEDIA_RADIO_SUPPORT=y -+CONFIG_MEDIA_CONTROLLER=y -+CONFIG_VIDEO_V4L2_SUBDEV_API=y -+CONFIG_MEDIA_USB_SUPPORT=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_BENQ=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_CPIA1=m -+CONFIG_USB_GSPCA_DTCS033=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_JL2005BCD=m -+CONFIG_USB_GSPCA_KINECT=m -+CONFIG_USB_GSPCA_KONICA=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_NW80X=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_OV534_9=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SE401=m -+CONFIG_USB_GSPCA_SN9C2028=m -+CONFIG_USB_GSPCA_SN9C20X=m -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SPCA1528=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_SQ930X=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STK1135=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TOPRO=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_VICAM=m -+CONFIG_USB_GSPCA_XIRLINK_CIT=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_USB_PWC=m -+CONFIG_VIDEO_CPIA2=m -+CONFIG_USB_ZR364XX=m -+CONFIG_USB_STKWEBCAM=m -+CONFIG_USB_S2255=m -+CONFIG_VIDEO_USBTV=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_HDPVR=m -+CONFIG_VIDEO_USBVISION=m -+CONFIG_VIDEO_STK1160_COMMON=m -+CONFIG_VIDEO_GO7007=m -+CONFIG_VIDEO_GO7007_USB=m -+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -+CONFIG_VIDEO_AU0828=m -+CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9035=m -+CONFIG_DVB_USB_ANYSEE=m -+CONFIG_DVB_USB_AU6610=m -+CONFIG_DVB_USB_AZ6007=m -+CONFIG_DVB_USB_CE6230=m -+CONFIG_DVB_USB_EC168=m -+CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_DVBSKY=m -+CONFIG_SMS_USB_DRV=m -+CONFIG_DVB_B2C2_FLEXCOP_USB=m -+CONFIG_DVB_AS102=m -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_V4L2=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_BCM2835_UNICAM=m -+CONFIG_RADIO_SI470X=m -+CONFIG_USB_SI470X=m -+CONFIG_I2C_SI470X=m -+CONFIG_RADIO_SI4713=m -+CONFIG_I2C_SI4713=m -+CONFIG_USB_MR800=m -+CONFIG_USB_DSBR=m -+CONFIG_RADIO_SHARK=m -+CONFIG_RADIO_SHARK2=m -+CONFIG_USB_KEENE=m -+CONFIG_USB_MA901=m -+CONFIG_RADIO_TEA5764=m -+CONFIG_RADIO_SAA7706H=m -+CONFIG_RADIO_TEF6862=m -+CONFIG_RADIO_WL1273=m -+CONFIG_RADIO_WL128X=m -+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -+CONFIG_VIDEO_UDA1342=m -+CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_ADV7180=m -+CONFIG_VIDEO_TC358743=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_TW2804=m -+CONFIG_VIDEO_TW9903=m -+CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV5647=m -+CONFIG_VIDEO_OV7640=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_DRM=m -+CONFIG_DRM_LOAD_EDID_FIRMWARE=y -+CONFIG_DRM_UDL=m -+CONFIG_DRM_PANEL_SIMPLE=m -+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -+CONFIG_DRM_V3D=m -+CONFIG_DRM_VC4=m -+CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_MI0283QT=m -+CONFIG_TINYDRM_REPAPER=m -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_FB_UDL=m -+CONFIG_FB_SIMPLE=y -+CONFIG_FB_SSD1307=m -+CONFIG_FB_RPISENSE=m -+# CONFIG_BACKLIGHT_GENERIC is not set -+CONFIG_BACKLIGHT_RPI=m -+CONFIG_BACKLIGHT_GPIO=m -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+CONFIG_SND=m -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQUENCER=m -+CONFIG_SND_SEQ_DUMMY=m -+CONFIG_SND_DUMMY=m -+CONFIG_SND_ALOOP=m -+CONFIG_SND_VIRMIDI=m -+CONFIG_SND_MTPAV=m -+CONFIG_SND_SERIAL_U16550=m -+CONFIG_SND_MPU401=m -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_UA101=m -+CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_CAIAQ_INPUT=y -+CONFIG_SND_USB_6FIRE=m -+CONFIG_SND_USB_HIFACE=m -+CONFIG_SND_SOC=m -+CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m -+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -+CONFIG_SND_BCM2708_SOC_RPI_DAC=m -+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m -+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m -+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_DIGIDAC1_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m -+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m -+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m -+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m -+CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_ADAU1701=m -+CONFIG_SND_SOC_ADAU7002=m -+CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_SPDIF=m -+CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SIMPLE_CARD=m -+CONFIG_HID_BATTERY_STRENGTH=y -+CONFIG_HIDRAW=y -+CONFIG_UHID=m -+CONFIG_HID_A4TECH=m -+CONFIG_HID_ACRUX=m -+CONFIG_HID_APPLE=m -+CONFIG_HID_ASUS=m -+CONFIG_HID_BELKIN=m -+CONFIG_HID_BETOP_FF=m -+CONFIG_HID_CHERRY=m -+CONFIG_HID_CHICONY=m -+CONFIG_HID_CYPRESS=m -+CONFIG_HID_DRAGONRISE=m -+CONFIG_HID_EMS_FF=m -+CONFIG_HID_ELECOM=m -+CONFIG_HID_ELO=m -+CONFIG_HID_EZKEY=m -+CONFIG_HID_GEMBIRD=m -+CONFIG_HID_HOLTEK=m -+CONFIG_HID_KEYTOUCH=m -+CONFIG_HID_KYE=m -+CONFIG_HID_UCLOGIC=m -+CONFIG_HID_WALTOP=m -+CONFIG_HID_GYRATION=m -+CONFIG_HID_TWINHAN=m -+CONFIG_HID_KENSINGTON=m -+CONFIG_HID_LCPOWER=m -+CONFIG_HID_LOGITECH=m -+CONFIG_HID_LOGITECH_DJ=m -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=m -+CONFIG_HID_MICROSOFT=m -+CONFIG_HID_MONTEREY=m -+CONFIG_HID_MULTITOUCH=m -+CONFIG_HID_NTRIG=m -+CONFIG_HID_ORTEK=m -+CONFIG_HID_PANTHERLORD=m -+CONFIG_HID_PETALYNX=m -+CONFIG_HID_PICOLCD=m -+CONFIG_HID_ROCCAT=m -+CONFIG_HID_SAMSUNG=m -+CONFIG_HID_SONY=m -+CONFIG_SONY_FF=y -+CONFIG_HID_SPEEDLINK=m -+CONFIG_HID_SUNPLUS=m -+CONFIG_HID_GREENASIA=m -+CONFIG_HID_SMARTJOYPLUS=m -+CONFIG_HID_TOPSEED=m -+CONFIG_HID_THINGM=m -+CONFIG_HID_THRUSTMASTER=m -+CONFIG_HID_WACOM=m -+CONFIG_HID_WIIMOTE=m -+CONFIG_HID_XINMO=m -+CONFIG_HID_ZEROPLUS=m -+CONFIG_HID_ZYDACRON=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_MON=m -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_PRINTER=m -+CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE_REALTEK=m -+CONFIG_USB_STORAGE_DATAFAB=m -+CONFIG_USB_STORAGE_FREECOM=m -+CONFIG_USB_STORAGE_ISD200=m -+CONFIG_USB_STORAGE_USBAT=m -+CONFIG_USB_STORAGE_SDDR09=m -+CONFIG_USB_STORAGE_SDDR55=m -+CONFIG_USB_STORAGE_JUMPSHOT=m -+CONFIG_USB_STORAGE_ALAUDA=m -+CONFIG_USB_STORAGE_ONETOUCH=m -+CONFIG_USB_STORAGE_KARMA=m -+CONFIG_USB_STORAGE_CYPRESS_ATACB=m -+CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=y -+CONFIG_USB_MDC800=m -+CONFIG_USB_MICROTEK=m -+CONFIG_USBIP_CORE=m -+CONFIG_USBIP_VHCI_HCD=m -+CONFIG_USBIP_HOST=m -+CONFIG_USB_DWC2=m -+CONFIG_USB_SERIAL=m -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_F81232=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_METRO=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QCAUX=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_SAFE=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_XSENS_MT=m -+CONFIG_USB_SERIAL_WISHBONE=m -+CONFIG_USB_SERIAL_SSU100=m -+CONFIG_USB_SERIAL_QT2=m -+CONFIG_USB_SERIAL_DEBUG=m -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+CONFIG_USB_ADUTUX=m -+CONFIG_USB_SEVSEG=m -+CONFIG_USB_RIO500=m -+CONFIG_USB_LEGOTOWER=m -+CONFIG_USB_LCD=m -+CONFIG_USB_CYPRESS_CY7C63=m -+CONFIG_USB_CYTHERM=m -+CONFIG_USB_IDMOUSE=m -+CONFIG_USB_FTDI_ELAN=m -+CONFIG_USB_APPLEDISPLAY=m -+CONFIG_USB_LD=m -+CONFIG_USB_TRANCEVIBRATOR=m -+CONFIG_USB_IOWARRIOR=m -+CONFIG_USB_TEST=m -+CONFIG_USB_ISIGHTFW=m -+CONFIG_USB_YUREX=m -+CONFIG_USB_ATM=m -+CONFIG_USB_SPEEDTOUCH=m -+CONFIG_USB_CXACRU=m -+CONFIG_USB_UEAGLEATM=m -+CONFIG_USB_XUSBATM=m -+CONFIG_USB_GADGET=m -+CONFIG_USB_CONFIGFS=m -+CONFIG_USB_CONFIGFS_SERIAL=y -+CONFIG_USB_CONFIGFS_ACM=y -+CONFIG_USB_CONFIGFS_OBEX=y -+CONFIG_USB_CONFIGFS_NCM=y -+CONFIG_USB_CONFIGFS_ECM=y -+CONFIG_USB_CONFIGFS_ECM_SUBSET=y -+CONFIG_USB_CONFIGFS_RNDIS=y -+CONFIG_USB_CONFIGFS_EEM=y -+CONFIG_USB_CONFIGFS_MASS_STORAGE=y -+CONFIG_USB_CONFIGFS_F_LB_SS=y -+CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_UAC1=y -+CONFIG_USB_CONFIGFS_F_UAC2=y -+CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_USB_CONFIGFS_F_HID=y -+CONFIG_USB_CONFIGFS_F_UVC=y -+CONFIG_USB_CONFIGFS_F_PRINTER=y -+CONFIG_USB_ZERO=m -+CONFIG_USB_AUDIO=m -+CONFIG_USB_ETH=m -+CONFIG_USB_GADGETFS=m -+CONFIG_USB_MASS_STORAGE=m -+CONFIG_USB_G_SERIAL=m -+CONFIG_USB_MIDI_GADGET=m -+CONFIG_USB_G_PRINTER=m -+CONFIG_USB_CDC_COMPOSITE=m -+CONFIG_USB_G_ACM_MS=m -+CONFIG_USB_G_MULTI=m -+CONFIG_USB_G_HID=m -+CONFIG_USB_G_WEBCAM=m -+CONFIG_MMC=y -+CONFIG_MMC_BLOCK_MINORS=32 -+CONFIG_MMC_BCM2835_MMC=y -+CONFIG_MMC_BCM2835_DMA=y -+CONFIG_MMC_BCM2835_SDHOST=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SDHCI_IPROC=y -+CONFIG_MMC_SPI=m -+CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_ONESHOT=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+CONFIG_LEDS_TRIGGER_BACKLIGHT=y -+CONFIG_LEDS_TRIGGER_CPU=y -+CONFIG_LEDS_TRIGGER_GPIO=y -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+CONFIG_LEDS_TRIGGER_TRANSIENT=m -+CONFIG_LEDS_TRIGGER_CAMERA=m -+CONFIG_LEDS_TRIGGER_INPUT=y -+CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+CONFIG_RTC_DRV_ABX80X=m -+CONFIG_RTC_DRV_DS1307=m -+CONFIG_RTC_DRV_DS1374=m -+CONFIG_RTC_DRV_DS1672=m -+CONFIG_RTC_DRV_MAX6900=m -+CONFIG_RTC_DRV_RS5C372=m -+CONFIG_RTC_DRV_ISL1208=m -+CONFIG_RTC_DRV_ISL12022=m -+CONFIG_RTC_DRV_X1205=m -+CONFIG_RTC_DRV_PCF8523=m -+CONFIG_RTC_DRV_PCF8563=m -+CONFIG_RTC_DRV_PCF8583=m -+CONFIG_RTC_DRV_M41T80=m -+CONFIG_RTC_DRV_BQ32K=m -+CONFIG_RTC_DRV_S35390A=m -+CONFIG_RTC_DRV_FM3130=m -+CONFIG_RTC_DRV_RX8581=m -+CONFIG_RTC_DRV_RX8025=m -+CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_M41T93=m -+CONFIG_RTC_DRV_M41T94=m -+CONFIG_RTC_DRV_DS1302=m -+CONFIG_RTC_DRV_DS1305=m -+CONFIG_RTC_DRV_DS1390=m -+CONFIG_RTC_DRV_R9701=m -+CONFIG_RTC_DRV_RX4581=m -+CONFIG_RTC_DRV_RS5C348=m -+CONFIG_RTC_DRV_MAX6902=m -+CONFIG_RTC_DRV_PCF2123=m -+CONFIG_RTC_DRV_DS3232=m -+CONFIG_RTC_DRV_PCF2127=m -+CONFIG_RTC_DRV_RV3029C2=m -+CONFIG_DMADEVICES=y -+CONFIG_DMA_BCM2835=y -+CONFIG_DMA_BCM2708=y -+CONFIG_UIO=m -+CONFIG_UIO_PDRV_GENIRQ=m -+CONFIG_STAGING=y -+CONFIG_PRISM2_USB=m -+CONFIG_R8712U=m -+CONFIG_R8188EU=m -+CONFIG_VT6656=m -+CONFIG_SPEAKUP=m -+CONFIG_SPEAKUP_SYNTH_SOFT=m -+CONFIG_STAGING_MEDIA=y -+CONFIG_FB_TFT=m -+CONFIG_FB_TFT_AGM1264K_FL=m -+CONFIG_FB_TFT_BD663474=m -+CONFIG_FB_TFT_HX8340BN=m -+CONFIG_FB_TFT_HX8347D=m -+CONFIG_FB_TFT_HX8353D=m -+CONFIG_FB_TFT_HX8357D=m -+CONFIG_FB_TFT_ILI9163=m -+CONFIG_FB_TFT_ILI9320=m -+CONFIG_FB_TFT_ILI9325=m -+CONFIG_FB_TFT_ILI9340=m -+CONFIG_FB_TFT_ILI9341=m -+CONFIG_FB_TFT_ILI9481=m -+CONFIG_FB_TFT_ILI9486=m -+CONFIG_FB_TFT_PCD8544=m -+CONFIG_FB_TFT_RA8875=m -+CONFIG_FB_TFT_S6D02A1=m -+CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SSD1289=m -+CONFIG_FB_TFT_SSD1306=m -+CONFIG_FB_TFT_SSD1331=m -+CONFIG_FB_TFT_SSD1351=m -+CONFIG_FB_TFT_ST7735R=m -+CONFIG_FB_TFT_ST7789V=m -+CONFIG_FB_TFT_TINYLCD=m -+CONFIG_FB_TFT_TLS8204=m -+CONFIG_FB_TFT_UC1701=m -+CONFIG_FB_TFT_UPD161704=m -+CONFIG_FB_TFT_WATTEROTT=m -+CONFIG_FB_FLEX=m -+CONFIG_FB_TFT_FBTFT_DEVICE=m -+CONFIG_BCM2835_VCHIQ=y -+CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m -+CONFIG_MAILBOX=y -+CONFIG_BCM2835_MBOX=y -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_BCM2835_POWER=y -+CONFIG_RASPBERRYPI_POWER=y -+CONFIG_EXTCON=m -+CONFIG_EXTCON_ARIZONA=m -+CONFIG_IIO=m -+CONFIG_IIO_BUFFER_CB=m -+CONFIG_MCP320X=m -+CONFIG_MCP3422=m -+CONFIG_DHT11=m -+CONFIG_HDC100X=m -+CONFIG_HTU21=m -+CONFIG_TSL4531=m -+CONFIG_VEML6070=m -+CONFIG_BMP280=m -+CONFIG_PWM_BCM2835=m -+CONFIG_PWM_PCA9685=m -+CONFIG_GENERIC_PHY=y -+CONFIG_RPI_AXIPERF=m -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_REISERFS_FS=m -+CONFIG_REISERFS_FS_XATTR=y -+CONFIG_REISERFS_FS_POSIX_ACL=y -+CONFIG_REISERFS_FS_SECURITY=y -+CONFIG_JFS_FS=m -+CONFIG_JFS_POSIX_ACL=y -+CONFIG_JFS_SECURITY=y -+CONFIG_JFS_STATISTICS=y -+CONFIG_XFS_FS=m -+CONFIG_XFS_QUOTA=y -+CONFIG_XFS_POSIX_ACL=y -+CONFIG_XFS_RT=y -+CONFIG_GFS2_FS=m -+CONFIG_OCFS2_FS=m -+CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS_POSIX_ACL=y -+CONFIG_NILFS2_FS=m -+CONFIG_F2FS_FS=y -+CONFIG_FANOTIFY=y -+CONFIG_QFMT_V1=m -+CONFIG_QFMT_V2=m -+CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m -+CONFIG_OVERLAY_FS=m -+CONFIG_FSCACHE=y -+CONFIG_FSCACHE_STATS=y -+CONFIG_FSCACHE_HISTOGRAM=y -+CONFIG_CACHEFILES=y -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -+CONFIG_NTFS_FS=m -+CONFIG_NTFS_RW=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_ECRYPT_FS=m -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+CONFIG_JFFS2_FS=m -+CONFIG_JFFS2_SUMMARY=y -+CONFIG_UBIFS_FS=m -+CONFIG_SQUASHFS=m -+CONFIG_SQUASHFS_XATTR=y -+CONFIG_SQUASHFS_LZO=y -+CONFIG_SQUASHFS_XZ=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3_ACL=y -+CONFIG_NFS_V4=y -+CONFIG_NFS_SWAP=y -+CONFIG_NFS_V4_1=y -+CONFIG_ROOT_NFS=y -+CONFIG_NFS_FSCACHE=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3_ACL=y -+CONFIG_NFSD_V4=y -+CONFIG_CIFS=m -+CONFIG_CIFS_WEAK_PW_HASH=y -+CONFIG_CIFS_UPCALL=y -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+CONFIG_CIFS_ACL=y -+CONFIG_CIFS_DFS_UPCALL=y -+CONFIG_CIFS_FSCACHE=y -+CONFIG_9P_FS=m -+CONFIG_9P_FS_POSIX_ACL=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_737=m -+CONFIG_NLS_CODEPAGE_775=m -+CONFIG_NLS_CODEPAGE_850=m -+CONFIG_NLS_CODEPAGE_852=m -+CONFIG_NLS_CODEPAGE_855=m -+CONFIG_NLS_CODEPAGE_857=m -+CONFIG_NLS_CODEPAGE_860=m -+CONFIG_NLS_CODEPAGE_861=m -+CONFIG_NLS_CODEPAGE_862=m -+CONFIG_NLS_CODEPAGE_863=m -+CONFIG_NLS_CODEPAGE_864=m -+CONFIG_NLS_CODEPAGE_865=m -+CONFIG_NLS_CODEPAGE_866=m -+CONFIG_NLS_CODEPAGE_869=m -+CONFIG_NLS_CODEPAGE_936=m -+CONFIG_NLS_CODEPAGE_950=m -+CONFIG_NLS_CODEPAGE_932=m -+CONFIG_NLS_CODEPAGE_949=m -+CONFIG_NLS_CODEPAGE_874=m -+CONFIG_NLS_ISO8859_8=m -+CONFIG_NLS_CODEPAGE_1250=m -+CONFIG_NLS_CODEPAGE_1251=m -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+CONFIG_NLS_ISO8859_2=m -+CONFIG_NLS_ISO8859_3=m -+CONFIG_NLS_ISO8859_4=m -+CONFIG_NLS_ISO8859_5=m -+CONFIG_NLS_ISO8859_6=m -+CONFIG_NLS_ISO8859_7=m -+CONFIG_NLS_ISO8859_9=m -+CONFIG_NLS_ISO8859_13=m -+CONFIG_NLS_ISO8859_14=m -+CONFIG_NLS_ISO8859_15=m -+CONFIG_NLS_KOI8_R=m -+CONFIG_NLS_KOI8_U=m -+CONFIG_DLM=m -+CONFIG_CRYPTO_USER=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_XTS=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_LZ4=m -+CONFIG_CRYPTO_USER_API_SKCIPHER=m -+# CONFIG_CRYPTO_HW is not set -+CONFIG_CRC_ITU_T=y -+CONFIG_LIBCRC32C=y -+CONFIG_PRINTK_TIME=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DETECT_HUNG_TASK=y -+# CONFIG_RCU_TRACE is not set -+CONFIG_LATENCYTOP=y -+CONFIG_IRQSOFF_TRACER=y -+CONFIG_SCHED_TRACER=y -+CONFIG_STACK_TRACER=y -+CONFIG_BLK_DEV_IO_TRACE=y -+# CONFIG_UPROBE_EVENTS is not set -+CONFIG_FUNCTION_PROFILER=y -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y diff --git a/target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch b/target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch index 5ab55241e8..9cd94de352 100644 --- a/target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch @@ -12,10 +12,8 @@ Signed-off-by: Phil Elwell --- arch/arm64/boot/dts/broadcom/Makefile | 1 + .../boot/dts/broadcom/bcm2711-rpi-4-b.dts | 3 + - arch/arm64/configs/bcm2711_defconfig | 1291 +++++++++++++++++ 3 files changed, 1295 insertions(+) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts - create mode 100644 arch/arm64/configs/bcm2711_defconfig --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -33,1297 +31,3 @@ Signed-off-by: Phil Elwell +#define RPI364 + +#include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts" ---- /dev/null -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -0,0 +1,1291 @@ -+CONFIG_LOCALVERSION="-v8" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_GENERIC_IRQ_DEBUGFS=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=m -+CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CPUSETS=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_NAMESPACES=y -+CONFIG_USER_NS=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_PROFILING=y -+CONFIG_ARCH_BCM2835=y -+CONFIG_PCI=y -+CONFIG_PCIE_BRCMSTB=y -+# CONFIG_CAVIUM_ERRATUM_22375 is not set -+# CONFIG_CAVIUM_ERRATUM_23154 is not set -+# CONFIG_CAVIUM_ERRATUM_27456 is not set -+CONFIG_SECCOMP=y -+CONFIG_ARMV8_DEPRECATED=y -+CONFIG_SWP_EMULATION=y -+CONFIG_CP15_BARRIER_EMULATION=y -+CONFIG_SETEND_EMULATION=y -+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" -+CONFIG_COMPAT=y -+# CONFIG_SUSPEND is not set -+CONFIG_PM=y -+CONFIG_CPU_IDLE=y -+CONFIG_ARM_CPUIDLE=y -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_STAT=y -+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -+CONFIG_CPU_FREQ_GOV_USERSPACE=y -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_RASPBERRYPI_FIRMWARE=y -+CONFIG_ARM64_CRYPTO=y -+CONFIG_CRYPTO_AES_ARM64_BS=m -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_BINFMT_MISC=m -+CONFIG_CLEANCACHE=y -+CONFIG_FRONTSWAP=y -+CONFIG_CMA=y -+CONFIG_ZSMALLOC=m -+CONFIG_PGTABLE_MAPPING=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE_DEMUX=m -+CONFIG_NET_IPGRE=m -+CONFIG_IP_MROUTE=y -+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IP_PIMSM_V1=y -+CONFIG_IP_PIMSM_V2=y -+CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_DIAG=m -+CONFIG_TCP_CONG_ADVANCED=y -+CONFIG_TCP_CONG_BBR=m -+CONFIG_IPV6=m -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_IPV6_ROUTE_INFO=y -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+CONFIG_IPV6_SIT_6RD=y -+CONFIG_IPV6_TUNNEL=m -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_IPV6_SUBTREES=y -+CONFIG_IPV6_MROUTE=y -+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -+CONFIG_IPV6_PIMSM_V2=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CONNTRACK_ZONES=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_TIMESTAMP=y -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_SNMP=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NF_CT_NETLINK=m -+CONFIG_NETFILTER_XT_SET=m -+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HMARK=m -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_LOG=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_TEE=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -+CONFIG_NETFILTER_XT_MATCH_BPF=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_CPU=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_IPVS=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_NFACCT=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_IP_SET=m -+CONFIG_IP_SET_BITMAP_IP=m -+CONFIG_IP_SET_BITMAP_IPMAC=m -+CONFIG_IP_SET_BITMAP_PORT=m -+CONFIG_IP_SET_HASH_IP=m -+CONFIG_IP_SET_HASH_IPPORT=m -+CONFIG_IP_SET_HASH_IPPORTIP=m -+CONFIG_IP_SET_HASH_IPPORTNET=m -+CONFIG_IP_SET_HASH_NET=m -+CONFIG_IP_SET_HASH_NETPORT=m -+CONFIG_IP_SET_HASH_NETIFACE=m -+CONFIG_IP_SET_LIST_SET=m -+CONFIG_IP_VS=m -+CONFIG_IP_VS_PROTO_TCP=y -+CONFIG_IP_VS_PROTO_UDP=y -+CONFIG_IP_VS_PROTO_ESP=y -+CONFIG_IP_VS_PROTO_AH=y -+CONFIG_IP_VS_PROTO_SCTP=y -+CONFIG_IP_VS_RR=m -+CONFIG_IP_VS_WRR=m -+CONFIG_IP_VS_LC=m -+CONFIG_IP_VS_WLC=m -+CONFIG_IP_VS_LBLC=m -+CONFIG_IP_VS_LBLCR=m -+CONFIG_IP_VS_DH=m -+CONFIG_IP_VS_SH=m -+CONFIG_IP_VS_SED=m -+CONFIG_IP_VS_NQ=m -+CONFIG_IP_VS_FTP=m -+CONFIG_IP_VS_PE_SIP=m -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_RPFILTER=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_NAT=m -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_IP_NF_MANGLE=m -+CONFIG_IP_NF_TARGET_CLUSTERIP=m -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RPFILTER=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_IP6_NF_NAT=m -+CONFIG_IP6_NF_TARGET_MASQUERADE=m -+CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+CONFIG_SCTP_COOKIE_HMAC_SHA1=y -+CONFIG_ATM=m -+CONFIG_L2TP=m -+CONFIG_L2TP_V3=y -+CONFIG_L2TP_IP=m -+CONFIG_L2TP_ETH=m -+CONFIG_BRIDGE=m -+CONFIG_VLAN_8021Q=m -+CONFIG_VLAN_8021Q_GVRP=y -+CONFIG_ATALK=m -+CONFIG_6LOWPAN=m -+CONFIG_IEEE802154=m -+CONFIG_IEEE802154_6LOWPAN=m -+CONFIG_MAC802154=m -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_ATM=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFB=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+CONFIG_NET_SCH_MQPRIO=m -+CONFIG_NET_SCH_CHOKE=m -+CONFIG_NET_SCH_QFQ=m -+CONFIG_NET_SCH_CODEL=m -+CONFIG_NET_SCH_FQ_CODEL=m -+CONFIG_NET_SCH_FQ=m -+CONFIG_NET_SCH_HHF=m -+CONFIG_NET_SCH_PIE=m -+CONFIG_NET_SCH_INGRESS=m -+CONFIG_NET_SCH_PLUG=m -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_CLS_CGROUP=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_EMATCH_IPSET=m -+CONFIG_NET_CLS_ACT=y -+CONFIG_NET_ACT_POLICE=m -+CONFIG_NET_ACT_GACT=m -+CONFIG_GACT_PROB=y -+CONFIG_NET_ACT_MIRRED=m -+CONFIG_NET_ACT_IPT=m -+CONFIG_NET_ACT_NAT=m -+CONFIG_NET_ACT_PEDIT=m -+CONFIG_NET_ACT_SIMP=m -+CONFIG_NET_ACT_SKBEDIT=m -+CONFIG_NET_ACT_CSUM=m -+CONFIG_BATMAN_ADV=m -+CONFIG_OPENVSWITCH=m -+CONFIG_NET_PKTGEN=m -+CONFIG_HAMRADIO=y -+CONFIG_AX25=m -+CONFIG_NETROM=m -+CONFIG_ROSE=m -+CONFIG_MKISS=m -+CONFIG_6PACK=m -+CONFIG_BPQETHER=m -+CONFIG_BAYCOM_SER_FDX=m -+CONFIG_BAYCOM_SER_HDX=m -+CONFIG_YAM=m -+CONFIG_CAN=m -+CONFIG_CAN_VCAN=m -+CONFIG_CAN_SLCAN=m -+CONFIG_CAN_MCP251X=m -+CONFIG_CAN_GS_USB=m -+CONFIG_BT=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+CONFIG_BT_BNEP_MC_FILTER=y -+CONFIG_BT_BNEP_PROTO_FILTER=y -+CONFIG_BT_HIDP=m -+CONFIG_BT_6LOWPAN=m -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIUART=m -+CONFIG_BT_HCIUART_3WIRE=y -+CONFIG_BT_HCIUART_BCM=y -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+CONFIG_BT_ATH3K=m -+CONFIG_BT_WILINK=m -+CONFIG_CFG80211=m -+CONFIG_MAC80211=m -+CONFIG_MAC80211_MESH=y -+CONFIG_WIMAX=m -+CONFIG_RFKILL=m -+CONFIG_RFKILL_INPUT=y -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_DEVTMPFS=y -+CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_DMA_CMA=y -+CONFIG_CMA_SIZE_MBYTES=5 -+CONFIG_MTD=m -+CONFIG_MTD_BLOCK=m -+CONFIG_MTD_M25P80=m -+CONFIG_MTD_BLOCK2MTD=m -+CONFIG_MTD_NAND=m -+CONFIG_MTD_SPI_NOR=m -+CONFIG_MTD_UBI=m -+CONFIG_OF_CONFIGFS=y -+CONFIG_ZRAM=m -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_DRBD=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_ATA_OVER_ETH=m -+CONFIG_EEPROM_AT24=m -+CONFIG_TI_ST=m -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_CHR_DEV_ST=m -+CONFIG_CHR_DEV_OSST=m -+CONFIG_BLK_DEV_SR=m -+CONFIG_CHR_DEV_SG=m -+CONFIG_SCSI_ISCSI_ATTRS=y -+CONFIG_ISCSI_TCP=m -+CONFIG_ISCSI_BOOT_SYSFS=m -+CONFIG_MD=y -+CONFIG_MD_LINEAR=m -+CONFIG_BLK_DEV_DM=m -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_THIN_PROVISIONING=m -+CONFIG_DM_CACHE=m -+CONFIG_DM_MIRROR=m -+CONFIG_DM_LOG_USERSPACE=m -+CONFIG_DM_RAID=m -+CONFIG_DM_ZERO=m -+CONFIG_DM_DELAY=m -+CONFIG_NETDEVICES=y -+CONFIG_BONDING=m -+CONFIG_DUMMY=m -+CONFIG_IFB=m -+CONFIG_MACVLAN=m -+CONFIG_IPVLAN=m -+CONFIG_VXLAN=m -+CONFIG_NETCONSOLE=m -+CONFIG_TUN=m -+CONFIG_VETH=m -+CONFIG_BCMGENET=y -+CONFIG_ENC28J60=m -+CONFIG_QCA7000_SPI=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_BROADCOM_PHY=y -+CONFIG_PPP=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_MPPE=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPPOATM=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+CONFIG_SLIP_SMART=y -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_RTL8152=y -+CONFIG_USB_LAN78XX=y -+CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX88179_178A=m -+CONFIG_USB_NET_CDCETHER=m -+CONFIG_USB_NET_CDC_EEM=m -+CONFIG_USB_NET_CDC_NCM=m -+CONFIG_USB_NET_HUAWEI_CDC_NCM=m -+CONFIG_USB_NET_CDC_MBIM=m -+CONFIG_USB_NET_DM9601=m -+CONFIG_USB_NET_SR9700=m -+CONFIG_USB_NET_SR9800=m -+CONFIG_USB_NET_SMSC75XX=m -+CONFIG_USB_NET_SMSC95XX=y -+CONFIG_USB_NET_GL620A=m -+CONFIG_USB_NET_NET1080=m -+CONFIG_USB_NET_PLUSB=m -+CONFIG_USB_NET_MCS7830=m -+CONFIG_USB_NET_CDC_SUBSET=m -+CONFIG_USB_ALI_M5632=y -+CONFIG_USB_AN2720=y -+CONFIG_USB_EPSON2888=y -+CONFIG_USB_KC2190=y -+CONFIG_USB_NET_ZAURUS=m -+CONFIG_USB_NET_CX82310_ETH=m -+CONFIG_USB_NET_KALMIA=m -+CONFIG_USB_NET_QMI_WWAN=m -+CONFIG_USB_HSO=m -+CONFIG_USB_NET_INT51X1=m -+CONFIG_USB_IPHETH=m -+CONFIG_USB_SIERRA_NET=m -+CONFIG_USB_VL600=m -+CONFIG_ATH9K=m -+CONFIG_ATH9K_HTC=m -+CONFIG_CARL9170=m -+CONFIG_ATH6KL=m -+CONFIG_ATH6KL_USB=m -+CONFIG_AR5523=m -+CONFIG_AT76C50X_USB=m -+CONFIG_B43=m -+# CONFIG_B43_PHY_N is not set -+CONFIG_B43LEGACY=m -+CONFIG_BRCMFMAC=m -+CONFIG_BRCMFMAC_USB=y -+CONFIG_BRCMDBG=y -+CONFIG_HOSTAP=m -+CONFIG_P54_COMMON=m -+CONFIG_P54_USB=m -+CONFIG_LIBERTAS=m -+CONFIG_LIBERTAS_USB=m -+CONFIG_LIBERTAS_SDIO=m -+CONFIG_LIBERTAS_THINFIRM=m -+CONFIG_LIBERTAS_THINFIRM_USB=m -+CONFIG_MWIFIEX=m -+CONFIG_MWIFIEX_SDIO=m -+CONFIG_MT7601U=m -+CONFIG_RT2X00=m -+CONFIG_RT2500USB=m -+CONFIG_RT73USB=m -+CONFIG_RT2800USB=m -+CONFIG_RT2800USB_RT3573=y -+CONFIG_RT2800USB_RT53XX=y -+CONFIG_RT2800USB_RT55XX=y -+CONFIG_RT2800USB_UNKNOWN=y -+CONFIG_RTL8187=m -+CONFIG_RTL8192CU=m -+CONFIG_RTL8XXXU=m -+CONFIG_USB_ZD1201=m -+CONFIG_ZD1211RW=m -+CONFIG_MAC80211_HWSIM=m -+CONFIG_USB_NET_RNDIS_WLAN=m -+CONFIG_WIMAX_I2400M_USB=m -+CONFIG_IEEE802154_AT86RF230=m -+CONFIG_IEEE802154_MRF24J40=m -+CONFIG_IEEE802154_CC2520=m -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_JOYDEV=m -+CONFIG_INPUT_EVDEV=m -+# CONFIG_KEYBOARD_ATKBD is not set -+CONFIG_KEYBOARD_GPIO=m -+CONFIG_KEYBOARD_MATRIX=m -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_IFORCE=m -+CONFIG_JOYSTICK_IFORCE_USB=y -+CONFIG_JOYSTICK_XPAD=m -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_JOYSTICK_PSXPAD_SPI=m -+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y -+CONFIG_JOYSTICK_RPISENSE=m -+CONFIG_INPUT_TOUCHSCREEN=y -+CONFIG_TOUCHSCREEN_ADS7846=m -+CONFIG_TOUCHSCREEN_EGALAX=m -+CONFIG_TOUCHSCREEN_EXC3000=m -+CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_EDT_FT5X06=m -+CONFIG_TOUCHSCREEN_RPI_FT5406=m -+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -+CONFIG_TOUCHSCREEN_STMPE=m -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_AD714X=m -+CONFIG_INPUT_ATI_REMOTE2=m -+CONFIG_INPUT_KEYSPAN_REMOTE=m -+CONFIG_INPUT_POWERMATE=m -+CONFIG_INPUT_YEALINK=m -+CONFIG_INPUT_CM109=m -+CONFIG_INPUT_UINPUT=m -+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -+CONFIG_INPUT_ADXL34X=m -+CONFIG_INPUT_CMA3000=m -+CONFIG_SERIO=m -+CONFIG_SERIO_RAW=m -+CONFIG_GAMEPORT=m -+CONFIG_GAMEPORT_NS558=m -+CONFIG_GAMEPORT_L4=m -+CONFIG_BRCM_CHAR_DRIVERS=y -+CONFIG_BCM_VCIO=y -+CONFIG_BCM2835_DEVGPIOMEM=y -+# CONFIG_BCM2835_SMI_DEV is not set -+# CONFIG_LEGACY_PTYS is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_DMA is not set -+CONFIG_SERIAL_8250_NR_UARTS=1 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=0 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_BCM2835AUX=y -+CONFIG_SERIAL_OF_PLATFORM=y -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_SERIAL_SC16IS7XX=m -+CONFIG_SERIAL_SC16IS7XX_SPI=y -+CONFIG_SERIAL_DEV_BUS=m -+CONFIG_TTY_PRINTK=y -+CONFIG_HW_RANDOM=y -+# CONFIG_HW_RANDOM_BCM2835 is not set -+CONFIG_RAW_DRIVER=y -+CONFIG_I2C=y -+CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_BCM2708=m -+CONFIG_I2C_BCM2835=m -+CONFIG_I2C_GPIO=m -+CONFIG_I2C_ROBOTFUZZ_OSIF=m -+CONFIG_I2C_TINY_USB=m -+CONFIG_SPI=y -+CONFIG_SPI_BCM2835=m -+CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_SPIDEV=m -+CONFIG_SPI_SLAVE=y -+CONFIG_PPS_CLIENT_LDISC=m -+CONFIG_PPS_CLIENT_GPIO=m -+CONFIG_PINCTRL_MCP23S08=m -+CONFIG_GPIO_BCM_VIRT=y -+CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCF857X=m -+CONFIG_GPIO_ARIZONA=m -+CONFIG_GPIO_STMPE=y -+CONFIG_W1=m -+CONFIG_W1_MASTER_DS2490=m -+CONFIG_W1_MASTER_DS2482=m -+CONFIG_W1_MASTER_DS1WM=m -+CONFIG_W1_MASTER_GPIO=m -+CONFIG_W1_SLAVE_THERM=m -+CONFIG_W1_SLAVE_SMEM=m -+CONFIG_W1_SLAVE_DS2408=m -+CONFIG_W1_SLAVE_DS2413=m -+CONFIG_W1_SLAVE_DS2406=m -+CONFIG_W1_SLAVE_DS2423=m -+CONFIG_W1_SLAVE_DS2431=m -+CONFIG_W1_SLAVE_DS2433=m -+CONFIG_W1_SLAVE_DS2438=m -+CONFIG_W1_SLAVE_DS2780=m -+CONFIG_W1_SLAVE_DS2781=m -+CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_POWER_RESET_GPIO=y -+CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_GAUGE_LTC2941=m -+CONFIG_HWMON=m -+CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_JC42=m -+CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_SHT21=m -+CONFIG_SENSORS_SHT3x=m -+CONFIG_SENSORS_SHTC1=m -+CONFIG_SENSORS_ADS1015=m -+CONFIG_SENSORS_INA2XX=m -+CONFIG_SENSORS_TMP102=m -+CONFIG_THERMAL=y -+CONFIG_BCM2835_THERMAL=y -+CONFIG_WATCHDOG=y -+CONFIG_GPIO_WATCHDOG=m -+CONFIG_BCM2835_WDT=y -+CONFIG_MFD_STMPE=y -+CONFIG_STMPE_SPI=y -+CONFIG_MFD_ARIZONA_I2C=m -+CONFIG_MFD_ARIZONA_SPI=m -+CONFIG_MFD_WM5102=y -+CONFIG_REGULATOR=y -+CONFIG_REGULATOR_FIXED_VOLTAGE=m -+CONFIG_REGULATOR_ARIZONA_LDO1=m -+CONFIG_REGULATOR_ARIZONA_MICSUPP=m -+CONFIG_REGULATOR_GPIO=y -+CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y -+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -+CONFIG_MEDIA_RADIO_SUPPORT=y -+CONFIG_MEDIA_CONTROLLER=y -+CONFIG_MEDIA_USB_SUPPORT=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_BENQ=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_CPIA1=m -+CONFIG_USB_GSPCA_DTCS033=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_JL2005BCD=m -+CONFIG_USB_GSPCA_KINECT=m -+CONFIG_USB_GSPCA_KONICA=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_NW80X=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_OV534_9=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SE401=m -+CONFIG_USB_GSPCA_SN9C2028=m -+CONFIG_USB_GSPCA_SN9C20X=m -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SPCA1528=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_SQ930X=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STK1135=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TOPRO=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_VICAM=m -+CONFIG_USB_GSPCA_XIRLINK_CIT=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_USB_PWC=m -+CONFIG_VIDEO_CPIA2=m -+CONFIG_USB_ZR364XX=m -+CONFIG_USB_STKWEBCAM=m -+CONFIG_USB_S2255=m -+CONFIG_VIDEO_USBTV=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_HDPVR=m -+CONFIG_VIDEO_USBVISION=m -+CONFIG_VIDEO_STK1160_COMMON=m -+CONFIG_VIDEO_GO7007=m -+CONFIG_VIDEO_GO7007_USB=m -+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -+CONFIG_VIDEO_AU0828=m -+CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9035=m -+CONFIG_DVB_USB_ANYSEE=m -+CONFIG_DVB_USB_AU6610=m -+CONFIG_DVB_USB_AZ6007=m -+CONFIG_DVB_USB_CE6230=m -+CONFIG_DVB_USB_EC168=m -+CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_DVBSKY=m -+CONFIG_SMS_USB_DRV=m -+CONFIG_DVB_B2C2_FLEXCOP_USB=m -+CONFIG_DVB_AS102=m -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_V4L2=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_RADIO_SI470X=m -+CONFIG_USB_SI470X=m -+CONFIG_I2C_SI470X=m -+CONFIG_RADIO_SI4713=m -+CONFIG_I2C_SI4713=m -+CONFIG_USB_MR800=m -+CONFIG_USB_DSBR=m -+CONFIG_RADIO_SHARK=m -+CONFIG_RADIO_SHARK2=m -+CONFIG_USB_KEENE=m -+CONFIG_USB_MA901=m -+CONFIG_RADIO_TEA5764=m -+CONFIG_RADIO_SAA7706H=m -+CONFIG_RADIO_TEF6862=m -+CONFIG_RADIO_WL1273=m -+CONFIG_RADIO_WL128X=m -+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -+CONFIG_VIDEO_UDA1342=m -+CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_TW2804=m -+CONFIG_VIDEO_TW9903=m -+CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_OV7640=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_DRM=m -+CONFIG_DRM_LOAD_EDID_FIRMWARE=y -+CONFIG_DRM_UDL=m -+CONFIG_DRM_PANEL_SIMPLE=m -+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -+CONFIG_DRM_VC4=m -+CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_MI0283QT=m -+CONFIG_TINYDRM_REPAPER=m -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_FB_UDL=m -+CONFIG_FB_SSD1307=m -+CONFIG_FB_RPISENSE=m -+# CONFIG_BACKLIGHT_GENERIC is not set -+CONFIG_BACKLIGHT_RPI=m -+CONFIG_BACKLIGHT_GPIO=m -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+CONFIG_SND=m -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQUENCER=m -+CONFIG_SND_SEQ_DUMMY=m -+CONFIG_SND_DUMMY=m -+CONFIG_SND_ALOOP=m -+CONFIG_SND_VIRMIDI=m -+CONFIG_SND_MTPAV=m -+CONFIG_SND_SERIAL_U16550=m -+CONFIG_SND_MPU401=m -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_UA101=m -+CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_CAIAQ_INPUT=y -+CONFIG_SND_USB_6FIRE=m -+CONFIG_SND_USB_HIFACE=m -+CONFIG_SND_SOC=m -+CONFIG_SND_BCM2835_SOC_I2S=m -+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m -+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -+CONFIG_SND_BCM2708_SOC_RPI_DAC=m -+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m -+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m -+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m -+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_DIGIDAC1_SOUNDCARD=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m -+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m -+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m -+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m -+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m -+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m -+CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_ADAU1701=m -+CONFIG_SND_SOC_ADAU7002=m -+CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_SPDIF=m -+CONFIG_SND_SOC_WM8804_I2C=m -+CONFIG_SND_SIMPLE_CARD=m -+CONFIG_HID_BATTERY_STRENGTH=y -+CONFIG_HIDRAW=y -+CONFIG_UHID=m -+CONFIG_HID_A4TECH=m -+CONFIG_HID_ACRUX=m -+CONFIG_HID_APPLE=m -+CONFIG_HID_ASUS=m -+CONFIG_HID_BELKIN=m -+CONFIG_HID_BETOP_FF=m -+CONFIG_HID_CHERRY=m -+CONFIG_HID_CHICONY=m -+CONFIG_HID_CYPRESS=m -+CONFIG_HID_DRAGONRISE=m -+CONFIG_HID_EMS_FF=m -+CONFIG_HID_ELECOM=m -+CONFIG_HID_ELO=m -+CONFIG_HID_EZKEY=m -+CONFIG_HID_GEMBIRD=m -+CONFIG_HID_HOLTEK=m -+CONFIG_HID_KEYTOUCH=m -+CONFIG_HID_KYE=m -+CONFIG_HID_UCLOGIC=m -+CONFIG_HID_WALTOP=m -+CONFIG_HID_GYRATION=m -+CONFIG_HID_TWINHAN=m -+CONFIG_HID_KENSINGTON=m -+CONFIG_HID_LCPOWER=m -+CONFIG_HID_LOGITECH=m -+CONFIG_HID_LOGITECH_DJ=m -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=m -+CONFIG_HID_MICROSOFT=m -+CONFIG_HID_MONTEREY=m -+CONFIG_HID_MULTITOUCH=m -+CONFIG_HID_NTRIG=m -+CONFIG_HID_ORTEK=m -+CONFIG_HID_PANTHERLORD=m -+CONFIG_HID_PETALYNX=m -+CONFIG_HID_PICOLCD=m -+CONFIG_HID_ROCCAT=m -+CONFIG_HID_SAMSUNG=m -+CONFIG_HID_SONY=m -+CONFIG_SONY_FF=y -+CONFIG_HID_SPEEDLINK=m -+CONFIG_HID_SUNPLUS=m -+CONFIG_HID_GREENASIA=m -+CONFIG_HID_SMARTJOYPLUS=m -+CONFIG_HID_TOPSEED=m -+CONFIG_HID_THINGM=m -+CONFIG_HID_THRUSTMASTER=m -+CONFIG_HID_WACOM=m -+CONFIG_HID_WIIMOTE=m -+CONFIG_HID_XINMO=m -+CONFIG_HID_ZEROPLUS=m -+CONFIG_HID_ZYDACRON=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_MON=m -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_PRINTER=m -+CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE_REALTEK=m -+CONFIG_USB_STORAGE_DATAFAB=m -+CONFIG_USB_STORAGE_FREECOM=m -+CONFIG_USB_STORAGE_ISD200=m -+CONFIG_USB_STORAGE_USBAT=m -+CONFIG_USB_STORAGE_SDDR09=m -+CONFIG_USB_STORAGE_SDDR55=m -+CONFIG_USB_STORAGE_JUMPSHOT=m -+CONFIG_USB_STORAGE_ALAUDA=m -+CONFIG_USB_STORAGE_ONETOUCH=m -+CONFIG_USB_STORAGE_KARMA=m -+CONFIG_USB_STORAGE_CYPRESS_ATACB=m -+CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_MDC800=m -+CONFIG_USB_MICROTEK=m -+CONFIG_USBIP_CORE=m -+CONFIG_USBIP_VHCI_HCD=m -+CONFIG_USBIP_HOST=m -+CONFIG_USB_DWC2=m -+CONFIG_USB_SERIAL=m -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_F81232=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_METRO=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QCAUX=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_SAFE=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_XSENS_MT=m -+CONFIG_USB_SERIAL_WISHBONE=m -+CONFIG_USB_SERIAL_SSU100=m -+CONFIG_USB_SERIAL_QT2=m -+CONFIG_USB_SERIAL_DEBUG=m -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+CONFIG_USB_ADUTUX=m -+CONFIG_USB_SEVSEG=m -+CONFIG_USB_RIO500=m -+CONFIG_USB_LEGOTOWER=m -+CONFIG_USB_LCD=m -+CONFIG_USB_CYPRESS_CY7C63=m -+CONFIG_USB_CYTHERM=m -+CONFIG_USB_IDMOUSE=m -+CONFIG_USB_FTDI_ELAN=m -+CONFIG_USB_APPLEDISPLAY=m -+CONFIG_USB_LD=m -+CONFIG_USB_TRANCEVIBRATOR=m -+CONFIG_USB_IOWARRIOR=m -+CONFIG_USB_TEST=m -+CONFIG_USB_ISIGHTFW=m -+CONFIG_USB_YUREX=m -+CONFIG_USB_ATM=m -+CONFIG_USB_SPEEDTOUCH=m -+CONFIG_USB_CXACRU=m -+CONFIG_USB_UEAGLEATM=m -+CONFIG_USB_XUSBATM=m -+CONFIG_USB_GADGET=m -+CONFIG_USB_ZERO=m -+CONFIG_USB_AUDIO=m -+CONFIG_USB_ETH=m -+CONFIG_USB_GADGETFS=m -+CONFIG_USB_MASS_STORAGE=m -+CONFIG_USB_G_SERIAL=m -+CONFIG_USB_MIDI_GADGET=m -+CONFIG_USB_G_PRINTER=m -+CONFIG_USB_CDC_COMPOSITE=m -+CONFIG_USB_G_ACM_MS=m -+CONFIG_USB_G_MULTI=m -+CONFIG_USB_G_HID=m -+CONFIG_USB_G_WEBCAM=m -+CONFIG_MMC=y -+CONFIG_MMC_BLOCK_MINORS=32 -+CONFIG_MMC_SDHCI_BCM2711=y -+CONFIG_MMC_BCM2835_MMC=y -+CONFIG_MMC_BCM2835_DMA=y -+CONFIG_MMC_BCM2835_SDHOST=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SPI=m -+CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_ONESHOT=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+CONFIG_LEDS_TRIGGER_BACKLIGHT=y -+CONFIG_LEDS_TRIGGER_CPU=y -+CONFIG_LEDS_TRIGGER_GPIO=y -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+CONFIG_LEDS_TRIGGER_TRANSIENT=m -+CONFIG_LEDS_TRIGGER_CAMERA=m -+CONFIG_LEDS_TRIGGER_INPUT=y -+CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+CONFIG_RTC_DRV_ABX80X=m -+CONFIG_RTC_DRV_DS1307=m -+CONFIG_RTC_DRV_DS1374=m -+CONFIG_RTC_DRV_DS1672=m -+CONFIG_RTC_DRV_MAX6900=m -+CONFIG_RTC_DRV_RS5C372=m -+CONFIG_RTC_DRV_ISL1208=m -+CONFIG_RTC_DRV_ISL12022=m -+CONFIG_RTC_DRV_X1205=m -+CONFIG_RTC_DRV_PCF8523=m -+CONFIG_RTC_DRV_PCF8563=m -+CONFIG_RTC_DRV_PCF8583=m -+CONFIG_RTC_DRV_M41T80=m -+CONFIG_RTC_DRV_BQ32K=m -+CONFIG_RTC_DRV_S35390A=m -+CONFIG_RTC_DRV_FM3130=m -+CONFIG_RTC_DRV_RX8581=m -+CONFIG_RTC_DRV_RX8025=m -+CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_M41T93=m -+CONFIG_RTC_DRV_M41T94=m -+CONFIG_RTC_DRV_DS1302=m -+CONFIG_RTC_DRV_DS1305=m -+CONFIG_RTC_DRV_DS1390=m -+CONFIG_RTC_DRV_R9701=m -+CONFIG_RTC_DRV_RX4581=m -+CONFIG_RTC_DRV_RS5C348=m -+CONFIG_RTC_DRV_MAX6902=m -+CONFIG_RTC_DRV_PCF2123=m -+CONFIG_RTC_DRV_DS3232=m -+CONFIG_RTC_DRV_PCF2127=m -+CONFIG_RTC_DRV_RV3029C2=m -+CONFIG_DMADEVICES=y -+CONFIG_DMA_BCM2835=y -+CONFIG_DMA_BCM2708=y -+CONFIG_UIO=m -+CONFIG_UIO_PDRV_GENIRQ=m -+CONFIG_STAGING=y -+CONFIG_PRISM2_USB=m -+CONFIG_R8712U=m -+CONFIG_R8188EU=m -+CONFIG_VT6656=m -+CONFIG_SPEAKUP=m -+CONFIG_SPEAKUP_SYNTH_SOFT=m -+CONFIG_STAGING_MEDIA=y -+CONFIG_FB_TFT=m -+CONFIG_FB_TFT_AGM1264K_FL=m -+CONFIG_FB_TFT_BD663474=m -+CONFIG_FB_TFT_HX8340BN=m -+CONFIG_FB_TFT_HX8347D=m -+CONFIG_FB_TFT_HX8353D=m -+CONFIG_FB_TFT_HX8357D=m -+CONFIG_FB_TFT_ILI9163=m -+CONFIG_FB_TFT_ILI9320=m -+CONFIG_FB_TFT_ILI9325=m -+CONFIG_FB_TFT_ILI9340=m -+CONFIG_FB_TFT_ILI9341=m -+CONFIG_FB_TFT_ILI9481=m -+CONFIG_FB_TFT_ILI9486=m -+CONFIG_FB_TFT_PCD8544=m -+CONFIG_FB_TFT_RA8875=m -+CONFIG_FB_TFT_S6D02A1=m -+CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SSD1289=m -+CONFIG_FB_TFT_SSD1306=m -+CONFIG_FB_TFT_SSD1331=m -+CONFIG_FB_TFT_SSD1351=m -+CONFIG_FB_TFT_ST7735R=m -+CONFIG_FB_TFT_ST7789V=m -+CONFIG_FB_TFT_TINYLCD=m -+CONFIG_FB_TFT_TLS8204=m -+CONFIG_FB_TFT_UC1701=m -+CONFIG_FB_TFT_UPD161704=m -+CONFIG_FB_TFT_WATTEROTT=m -+CONFIG_FB_FLEX=m -+CONFIG_FB_TFT_FBTFT_DEVICE=m -+CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m -+CONFIG_MAILBOX=y -+CONFIG_BCM2835_MBOX=y -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_RASPBERRYPI_POWER=y -+CONFIG_EXTCON=m -+CONFIG_EXTCON_ARIZONA=m -+CONFIG_IIO=m -+CONFIG_IIO_BUFFER_CB=m -+CONFIG_MCP320X=m -+CONFIG_MCP3422=m -+CONFIG_DHT11=m -+CONFIG_HDC100X=m -+CONFIG_HTU21=m -+CONFIG_TSL4531=m -+CONFIG_VEML6070=m -+CONFIG_BMP280=m -+CONFIG_PWM_BCM2835=m -+CONFIG_PWM_PCA9685=m -+CONFIG_GENERIC_PHY=y -+CONFIG_RPI_AXIPERF=m -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_REISERFS_FS=m -+CONFIG_REISERFS_FS_XATTR=y -+CONFIG_REISERFS_FS_POSIX_ACL=y -+CONFIG_REISERFS_FS_SECURITY=y -+CONFIG_JFS_FS=m -+CONFIG_JFS_POSIX_ACL=y -+CONFIG_JFS_SECURITY=y -+CONFIG_JFS_STATISTICS=y -+CONFIG_XFS_FS=m -+CONFIG_XFS_QUOTA=y -+CONFIG_XFS_POSIX_ACL=y -+CONFIG_XFS_RT=y -+CONFIG_GFS2_FS=m -+CONFIG_OCFS2_FS=m -+CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS_POSIX_ACL=y -+CONFIG_NILFS2_FS=m -+CONFIG_F2FS_FS=y -+CONFIG_FANOTIFY=y -+CONFIG_QFMT_V1=m -+CONFIG_QFMT_V2=m -+CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m -+CONFIG_OVERLAY_FS=m -+CONFIG_FSCACHE=y -+CONFIG_FSCACHE_STATS=y -+CONFIG_FSCACHE_HISTOGRAM=y -+CONFIG_CACHEFILES=y -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -+CONFIG_NTFS_FS=m -+CONFIG_NTFS_RW=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_ECRYPT_FS=m -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+CONFIG_JFFS2_FS=m -+CONFIG_JFFS2_SUMMARY=y -+CONFIG_UBIFS_FS=m -+CONFIG_SQUASHFS=m -+CONFIG_SQUASHFS_XATTR=y -+CONFIG_SQUASHFS_LZO=y -+CONFIG_SQUASHFS_XZ=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3_ACL=y -+CONFIG_NFS_V4=y -+CONFIG_NFS_SWAP=y -+CONFIG_NFS_V4_1=y -+CONFIG_ROOT_NFS=y -+CONFIG_NFS_FSCACHE=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3_ACL=y -+CONFIG_NFSD_V4=y -+CONFIG_CIFS=m -+CONFIG_CIFS_WEAK_PW_HASH=y -+CONFIG_CIFS_UPCALL=y -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+CONFIG_CIFS_ACL=y -+CONFIG_CIFS_DFS_UPCALL=y -+CONFIG_CIFS_FSCACHE=y -+CONFIG_9P_FS=m -+CONFIG_9P_FS_POSIX_ACL=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_737=m -+CONFIG_NLS_CODEPAGE_775=m -+CONFIG_NLS_CODEPAGE_850=m -+CONFIG_NLS_CODEPAGE_852=m -+CONFIG_NLS_CODEPAGE_855=m -+CONFIG_NLS_CODEPAGE_857=m -+CONFIG_NLS_CODEPAGE_860=m -+CONFIG_NLS_CODEPAGE_861=m -+CONFIG_NLS_CODEPAGE_862=m -+CONFIG_NLS_CODEPAGE_863=m -+CONFIG_NLS_CODEPAGE_864=m -+CONFIG_NLS_CODEPAGE_865=m -+CONFIG_NLS_CODEPAGE_866=m -+CONFIG_NLS_CODEPAGE_869=m -+CONFIG_NLS_CODEPAGE_936=m -+CONFIG_NLS_CODEPAGE_950=m -+CONFIG_NLS_CODEPAGE_932=m -+CONFIG_NLS_CODEPAGE_949=m -+CONFIG_NLS_CODEPAGE_874=m -+CONFIG_NLS_ISO8859_8=m -+CONFIG_NLS_CODEPAGE_1250=m -+CONFIG_NLS_CODEPAGE_1251=m -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+CONFIG_NLS_ISO8859_2=m -+CONFIG_NLS_ISO8859_3=m -+CONFIG_NLS_ISO8859_4=m -+CONFIG_NLS_ISO8859_5=m -+CONFIG_NLS_ISO8859_6=m -+CONFIG_NLS_ISO8859_7=m -+CONFIG_NLS_ISO8859_9=m -+CONFIG_NLS_ISO8859_13=m -+CONFIG_NLS_ISO8859_14=m -+CONFIG_NLS_ISO8859_15=m -+CONFIG_NLS_KOI8_R=m -+CONFIG_NLS_KOI8_U=m -+CONFIG_DLM=m -+CONFIG_CRYPTO_USER=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_XTS=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_LZ4=m -+CONFIG_CRYPTO_USER_API_SKCIPHER=m -+CONFIG_CRC_ITU_T=y -+CONFIG_LIBCRC32C=y -+CONFIG_PRINTK_TIME=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DETECT_HUNG_TASK=y -+CONFIG_LATENCYTOP=y -+CONFIG_IRQSOFF_TRACER=y -+CONFIG_SCHED_TRACER=y -+CONFIG_STACK_TRACER=y -+CONFIG_BLK_DEV_IO_TRACE=y -+CONFIG_FUNCTION_PROFILER=y -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y diff --git a/target/linux/brcm2708/patches-4.19/950-0639-config-Add-NF_TABLES-support.patch b/target/linux/brcm2708/patches-4.19/950-0639-config-Add-NF_TABLES-support.patch deleted file mode 100644 index 7e6a34494a..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0639-config-Add-NF_TABLES-support.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 668cc6c966616bdbb5b497d7f3868fc7e0b8821f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 3 Jun 2019 14:57:56 +0100 -Subject: [PATCH 639/806] config: Add NF_TABLES support - ---- - arch/arm/configs/bcm2711_defconfig | 48 ++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) - ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -133,6 +133,36 @@ CONFIG_NF_CONNTRACK_SANE=m - CONFIG_NF_CONNTRACK_SIP=m - CONFIG_NF_CONNTRACK_TFTP=m - CONFIG_NF_CT_NETLINK=m -+CONFIG_NF_TABLES=m -+CONFIG_NF_TABLES_SET=m -+CONFIG_NF_TABLES_INET=y -+CONFIG_NF_TABLES_NETDEV=y -+CONFIG_NFT_NUMGEN=m -+CONFIG_NFT_CT=m -+CONFIG_NFT_FLOW_OFFLOAD=m -+CONFIG_NFT_COUNTER=m -+CONFIG_NFT_CONNLIMIT=m -+CONFIG_NFT_LOG=m -+CONFIG_NFT_LIMIT=m -+CONFIG_NFT_MASQ=m -+CONFIG_NFT_REDIR=m -+CONFIG_NFT_NAT=m -+CONFIG_NFT_TUNNEL=m -+CONFIG_NFT_OBJREF=m -+CONFIG_NFT_QUEUE=m -+CONFIG_NFT_QUOTA=m -+CONFIG_NFT_REJECT=m -+CONFIG_NFT_COMPAT=m -+CONFIG_NFT_HASH=m -+CONFIG_NFT_FIB_INET=m -+CONFIG_NFT_SOCKET=m -+CONFIG_NFT_OSF=m -+CONFIG_NFT_TPROXY=m -+CONFIG_NFT_DUP_NETDEV=m -+CONFIG_NFT_FWD_NETDEV=m -+CONFIG_NFT_FIB_NETDEV=m -+CONFIG_NF_FLOW_TABLE_INET=m -+CONFIG_NF_FLOW_TABLE=m - CONFIG_NETFILTER_XT_SET=m - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -@@ -220,6 +250,14 @@ CONFIG_IP_VS_SED=m - CONFIG_IP_VS_NQ=m - CONFIG_IP_VS_FTP=m - CONFIG_IP_VS_PE_SIP=m -+CONFIG_NFT_CHAIN_ROUTE_IPV4=m -+CONFIG_NFT_DUP_IPV4=m -+CONFIG_NFT_FIB_IPV4=m -+CONFIG_NF_TABLES_ARP=y -+CONFIG_NF_FLOW_TABLE_IPV4=m -+CONFIG_NFT_CHAIN_NAT_IPV4=m -+CONFIG_NFT_MASQ_IPV4=m -+CONFIG_NFT_REDIR_IPV4=m - CONFIG_IP_NF_IPTABLES=m - CONFIG_IP_NF_MATCH_AH=m - CONFIG_IP_NF_MATCH_ECN=m -@@ -239,6 +277,13 @@ CONFIG_IP_NF_RAW=m - CONFIG_IP_NF_ARPTABLES=m - CONFIG_IP_NF_ARPFILTER=m - CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_NFT_CHAIN_ROUTE_IPV6=m -+CONFIG_NFT_CHAIN_NAT_IPV6=m -+CONFIG_NFT_MASQ_IPV6=m -+CONFIG_NFT_REDIR_IPV6=m -+CONFIG_NFT_DUP_IPV6=m -+CONFIG_NFT_FIB_IPV6=m -+CONFIG_NF_FLOW_TABLE_IPV6=m - CONFIG_IP6_NF_IPTABLES=m - CONFIG_IP6_NF_MATCH_AH=m - CONFIG_IP6_NF_MATCH_EUI64=m -@@ -257,6 +302,9 @@ CONFIG_IP6_NF_RAW=m - CONFIG_IP6_NF_NAT=m - CONFIG_IP6_NF_TARGET_MASQUERADE=m - CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_NF_TABLES_BRIDGE=y -+CONFIG_NFT_BRIDGE_REJECT=m -+CONFIG_NF_LOG_BRIDGE=m - CONFIG_BRIDGE_NF_EBTABLES=m - CONFIG_BRIDGE_EBT_BROUTE=m - CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/target/linux/brcm2708/patches-4.19/950-0640-bcm2711_defconfig-add-xhci-platform-support.patch b/target/linux/brcm2708/patches-4.19/950-0640-bcm2711_defconfig-add-xhci-platform-support.patch deleted file mode 100644 index 44501fe1a5..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0640-bcm2711_defconfig-add-xhci-platform-support.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 8ffeba7588263f956501cc461e8c515cc02a848d Mon Sep 17 00:00:00 2001 -From: Jonathan Bell -Date: Mon, 3 Jun 2019 15:33:02 +0100 -Subject: [PATCH 640/806] bcm2711_defconfig: add xhci platform support - -Signed-off-by: Jonathan Bell ---- - arch/arm/configs/bcm2711_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -983,6 +983,7 @@ CONFIG_USB=y - CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - CONFIG_USB_MON=m - CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_PLATFORM=y - CONFIG_USB_DWCOTG=y - CONFIG_USB_PRINTER=m - CONFIG_USB_STORAGE=y diff --git a/target/linux/brcm2708/patches-4.19/950-0646-defconfig-Update-bcm2711-to-match-bcm2709-on-extra-m.patch b/target/linux/brcm2708/patches-4.19/950-0646-defconfig-Update-bcm2711-to-match-bcm2709-on-extra-m.patch deleted file mode 100644 index 871b82833e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0646-defconfig-Update-bcm2711-to-match-bcm2709-on-extra-m.patch +++ /dev/null @@ -1,300 +0,0 @@ -From 42722b9ed2d2ba6648501df269bc337ca931a8c8 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Thu, 6 Jun 2019 15:22:29 +0100 -Subject: [PATCH 646/806] defconfig: Update bcm2711 to match bcm2709 on extra - modules - -Lots of things like USB DVB tuners were missing from the -defconfig. -Resync it with bcm2709_defconfig - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2711_defconfig | 97 ++++++++++++++++++++++++++++++ - 1 file changed, 97 insertions(+) - ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -14,6 +14,9 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y -+CONFIG_MEMCG=y -+CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y -@@ -65,8 +68,10 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y - CONFIG_MODULE_SRCVERSION_ALL=y -+CONFIG_BLK_DEV_THROTTLING=y - CONFIG_PARTITION_ADVANCED=y - CONFIG_MAC_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_BINFMT_MISC=m - CONFIG_CLEANCACHE=y - CONFIG_FRONTSWAP=y -@@ -95,6 +100,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y - CONFIG_IP_PIMSM_V1=y - CONFIG_IP_PIMSM_V2=y - CONFIG_SYN_COOKIES=y -+CONFIG_NET_IPVTI=m - CONFIG_INET_AH=m - CONFIG_INET_ESP=m - CONFIG_INET_IPCOMP=m -@@ -214,6 +220,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m - CONFIG_NETFILTER_XT_MATCH_RATEEST=m - CONFIG_NETFILTER_XT_MATCH_REALM=m - CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m - CONFIG_NETFILTER_XT_MATCH_STATE=m - CONFIG_NETFILTER_XT_MATCH_STATISTIC=m - CONFIG_NETFILTER_XT_MATCH_STRING=m -@@ -520,6 +527,7 @@ CONFIG_USB_RTL8150=m - CONFIG_USB_RTL8152=y - CONFIG_USB_LAN78XX=y - CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX8817X=m - CONFIG_USB_NET_AX88179_178A=m - CONFIG_USB_NET_CDCETHER=m - CONFIG_USB_NET_CDC_EEM=m -@@ -573,6 +581,8 @@ CONFIG_LIBERTAS_THINFIRM_USB=m - CONFIG_MWIFIEX=m - CONFIG_MWIFIEX_SDIO=m - CONFIG_MT7601U=m -+CONFIG_MT76x0U=m -+CONFIG_MT76x2U=m - CONFIG_RT2X00=m - CONFIG_RT2500USB=m - CONFIG_RT73USB=m -@@ -613,6 +623,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m - CONFIG_TOUCHSCREEN_EGALAX=m - CONFIG_TOUCHSCREEN_EXC3000=m - CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_ILI210X=m - CONFIG_TOUCHSCREEN_EDT_FT5X06=m - CONFIG_TOUCHSCREEN_RPI_FT5406=m - CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -@@ -657,8 +668,13 @@ CONFIG_SERIAL_DEV_BUS=m - CONFIG_TTY_PRINTK=y - CONFIG_HW_RANDOM=y - CONFIG_RAW_DRIVER=y -+CONFIG_TCG_TPM=m -+CONFIG_TCG_TIS_SPI=m - CONFIG_I2C=y - CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_MUX=m -+CONFIG_I2C_MUX_GPMUX=m -+CONFIG_I2C_MUX_PCA954x=m - CONFIG_I2C_BCM2708=m - CONFIG_I2C_BCM2835=m - CONFIG_I2C_GPIO=m -@@ -667,6 +683,7 @@ CONFIG_I2C_TINY_USB=m - CONFIG_SPI=y - CONFIG_SPI_BCM2835=m - CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_GPIO=m - CONFIG_SPI_SPIDEV=m - CONFIG_SPI_SLAVE=y - CONFIG_PPS=m -@@ -698,11 +715,14 @@ CONFIG_W1_SLAVE_DS28E04=m - CONFIG_POWER_RESET=y - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_MAX17040=m - CONFIG_BATTERY_GAUGE_LTC2941=m - CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_GPIO_FAN=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RASPBERRYPI_HWMON=m - CONFIG_SENSORS_RPI_POE_FAN=m - CONFIG_SENSORS_SHT21=m - CONFIG_SENSORS_SHT3x=m -@@ -726,6 +746,31 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m - CONFIG_REGULATOR_ARIZONA_LDO1=m - CONFIG_REGULATOR_ARIZONA_MICSUPP=m - CONFIG_REGULATOR_GPIO=y -+CONFIG_RC_CORE=y -+CONFIG_LIRC=y -+CONFIG_RC_DECODERS=y -+CONFIG_IR_NEC_DECODER=m -+CONFIG_IR_RC5_DECODER=m -+CONFIG_IR_RC6_DECODER=m -+CONFIG_IR_JVC_DECODER=m -+CONFIG_IR_SONY_DECODER=m -+CONFIG_IR_SANYO_DECODER=m -+CONFIG_IR_SHARP_DECODER=m -+CONFIG_IR_MCE_KBD_DECODER=m -+CONFIG_IR_XMP_DECODER=m -+CONFIG_IR_IMON_DECODER=m -+CONFIG_RC_DEVICES=y -+CONFIG_RC_ATI_REMOTE=m -+CONFIG_IR_IMON=m -+CONFIG_IR_MCEUSB=m -+CONFIG_IR_REDRAT3=m -+CONFIG_IR_STREAMZAP=m -+CONFIG_IR_IGUANA=m -+CONFIG_IR_TTUSBIR=m -+CONFIG_RC_LOOPBACK=m -+CONFIG_IR_GPIO_CIR=m -+CONFIG_IR_GPIO_TX=m -+CONFIG_IR_PWM_TX=m - CONFIG_MEDIA_SUPPORT=m - CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -@@ -797,7 +842,40 @@ CONFIG_VIDEO_GO7007=m - CONFIG_VIDEO_GO7007_USB=m - CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - CONFIG_VIDEO_AU0828=m -+CONFIG_VIDEO_AU0828_RC=y -+CONFIG_VIDEO_CX231XX=m -+CONFIG_VIDEO_CX231XX_ALSA=m -+CONFIG_VIDEO_CX231XX_DVB=m -+CONFIG_VIDEO_TM6000=m -+CONFIG_VIDEO_TM6000_ALSA=m -+CONFIG_VIDEO_TM6000_DVB=m -+CONFIG_DVB_USB=m -+CONFIG_DVB_USB_A800=m -+CONFIG_DVB_USB_DIBUSB_MB=m -+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -+CONFIG_DVB_USB_DIBUSB_MC=m -+CONFIG_DVB_USB_DIB0700=m -+CONFIG_DVB_USB_UMT_010=m -+CONFIG_DVB_USB_CXUSB=m -+CONFIG_DVB_USB_M920X=m -+CONFIG_DVB_USB_DIGITV=m -+CONFIG_DVB_USB_VP7045=m -+CONFIG_DVB_USB_VP702X=m -+CONFIG_DVB_USB_GP8PSK=m -+CONFIG_DVB_USB_NOVA_T_USB2=m -+CONFIG_DVB_USB_TTUSB2=m -+CONFIG_DVB_USB_DTT200U=m -+CONFIG_DVB_USB_OPERA1=m -+CONFIG_DVB_USB_AF9005=m -+CONFIG_DVB_USB_AF9005_REMOTE=m -+CONFIG_DVB_USB_PCTV452E=m -+CONFIG_DVB_USB_DW2102=m -+CONFIG_DVB_USB_CINERGY_T2=m -+CONFIG_DVB_USB_DTV5100=m -+CONFIG_DVB_USB_AZ6027=m -+CONFIG_DVB_USB_TECHNISAT_USB2=m - CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9015=m - CONFIG_DVB_USB_AF9035=m - CONFIG_DVB_USB_ANYSEE=m - CONFIG_DVB_USB_AU6610=m -@@ -805,7 +883,9 @@ CONFIG_DVB_USB_AZ6007=m - CONFIG_DVB_USB_CE6230=m - CONFIG_DVB_USB_EC168=m - CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_LME2510=m - CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_RTL28XXU=m - CONFIG_DVB_USB_DVBSKY=m - CONFIG_SMS_USB_DRV=m - CONFIG_DVB_B2C2_FLEXCOP_USB=m -@@ -900,9 +980,11 @@ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_AUDIOSENSE_PI=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m -@@ -913,10 +995,14 @@ CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m - CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m - CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m - CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_AD193X_SPI=m -+CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_ICS43432=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m -@@ -929,6 +1015,7 @@ CONFIG_HID_APPLE=m - CONFIG_HID_ASUS=m - CONFIG_HID_BELKIN=m - CONFIG_HID_BETOP_FF=m -+CONFIG_HID_BIGBEN_FF=m - CONFIG_HID_CHERRY=m - CONFIG_HID_CHICONY=m - CONFIG_HID_CYPRESS=m -@@ -986,6 +1073,7 @@ CONFIG_USB_XHCI_HCD=y - CONFIG_USB_XHCI_PLATFORM=y - CONFIG_USB_DWCOTG=y - CONFIG_USB_PRINTER=m -+CONFIG_USB_TMC=m - CONFIG_USB_STORAGE=y - CONFIG_USB_STORAGE_REALTEK=m - CONFIG_USB_STORAGE_DATAFAB=m -@@ -1006,6 +1094,7 @@ CONFIG_USB_MICROTEK=m - CONFIG_USBIP_CORE=m - CONFIG_USBIP_VHCI_HCD=m - CONFIG_USBIP_HOST=m -+CONFIG_USBIP_VUDC=m - CONFIG_USB_DWC2=m - CONFIG_USB_SERIAL=m - CONFIG_USB_SERIAL_GENERIC=y -@@ -1122,6 +1211,8 @@ CONFIG_MMC_SDHCI_IPROC=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA963X=m -+CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y -@@ -1133,6 +1224,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m - CONFIG_LEDS_TRIGGER_CAMERA=m - CONFIG_LEDS_TRIGGER_INPUT=y - CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_LEDS_TRIGGER_NETDEV=m - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - CONFIG_RTC_DRV_ABX80X=m -@@ -1154,6 +1246,7 @@ CONFIG_RTC_DRV_FM3130=m - CONFIG_RTC_DRV_RX8581=m - CONFIG_RTC_DRV_RX8025=m - CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_RV3028=m - CONFIG_RTC_DRV_M41T93=m - CONFIG_RTC_DRV_M41T94=m - CONFIG_RTC_DRV_DS1302=m -@@ -1170,6 +1263,8 @@ CONFIG_RTC_DRV_RV3029C2=m - CONFIG_DMADEVICES=y - CONFIG_DMA_BCM2835=y - CONFIG_DMA_BCM2708=y -+CONFIG_AUXDISPLAY=y -+CONFIG_HD44780=m - CONFIG_UIO=m - CONFIG_UIO_PDRV_GENIRQ=m - CONFIG_STAGING=y -@@ -1198,6 +1293,7 @@ CONFIG_FB_TFT_PCD8544=m - CONFIG_FB_TFT_RA8875=m - CONFIG_FB_TFT_S6D02A1=m - CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SH1106=m - CONFIG_FB_TFT_SSD1289=m - CONFIG_FB_TFT_SSD1306=m - CONFIG_FB_TFT_SSD1331=m -@@ -1229,6 +1325,7 @@ CONFIG_MCP3422=m - CONFIG_DHT11=m - CONFIG_HDC100X=m - CONFIG_HTU21=m -+CONFIG_INV_MPU6050_I2C=m - CONFIG_TSL4531=m - CONFIG_VEML6070=m - CONFIG_BMP280=m diff --git a/target/linux/brcm2708/patches-4.19/950-0649-defconfigs-Add-FB_SIMPLE-to-both-bcmrpi-and-bcm2709-.patch b/target/linux/brcm2708/patches-4.19/950-0649-defconfigs-Add-FB_SIMPLE-to-both-bcmrpi-and-bcm2709-.patch deleted file mode 100644 index bf602aca93..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0649-defconfigs-Add-FB_SIMPLE-to-both-bcmrpi-and-bcm2709-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c487813250414cac0337987b668d180b7380b474 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Fri, 7 Jun 2019 11:35:01 +0100 -Subject: [PATCH 649/806] defconfigs: Add FB_SIMPLE to both bcmrpi and bcm2709 - configs - -The firmware sets up simple fb should one of the KMS drivers -be enabled, but the driver isn't being built. -Add it to the build. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -928,6 +928,7 @@ CONFIG_TINYDRM_REPAPER=m - CONFIG_FB=y - CONFIG_FB_BCM2708=y - CONFIG_FB_UDL=m -+CONFIG_FB_SIMPLE=y - CONFIG_FB_SSD1307=m - CONFIG_FB_RPISENSE=m - # CONFIG_BACKLIGHT_GENERIC is not set ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -920,6 +920,7 @@ CONFIG_TINYDRM_REPAPER=m - CONFIG_FB=y - CONFIG_FB_BCM2708=y - CONFIG_FB_UDL=m -+CONFIG_FB_SIMPLE=y - CONFIG_FB_SSD1307=m - CONFIG_FB_RPISENSE=m - # CONFIG_BACKLIGHT_GENERIC is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0676-configs-Drop-V4L2-camera-and-codec-drivers-from-bcmr.patch b/target/linux/brcm2708/patches-4.19/950-0676-configs-Drop-V4L2-camera-and-codec-drivers-from-bcmr.patch deleted file mode 100644 index c1034b7955..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0676-configs-Drop-V4L2-camera-and-codec-drivers-from-bcmr.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 21d3c0d88bc64c91b2be082360cb0a319d412dc8 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Fri, 28 Jun 2019 16:05:25 +0100 -Subject: [PATCH 676/806] configs: Drop V4L2 camera and codec drivers from - bcmrpi3_defconfig - -They rely on mmal_vchiq, which in turn wants vc-sm-cma. -vc-sm-cma needs some attention for 64 bit, so drop it for now. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcmrpi3_defconfig | 2 -- - 1 file changed, 2 deletions(-) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1086,8 +1086,6 @@ CONFIG_FB_TFT_WATTEROTT=m - CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_SND_BCM2835=m --CONFIG_VIDEO_BCM2835=m --CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0677-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM2835.patch b/target/linux/brcm2708/patches-4.19/950-0677-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM2835.patch deleted file mode 100644 index e283d880dc..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0677-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM2835.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bc411a220205eeb29ed8130451c67927e88a30b9 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 28 Jun 2019 22:44:09 +0100 -Subject: [PATCH 677/806] configs: arm64/bcm2711: Remove CONFIG_VIDEO_BCM2835 - -Undefine CONFIG_VIDEO_BCM2835 until it builds for arm64. - -See: https://github.com/raspberrypi/linux/issues/3024 -See: https://github.com/raspberrypi/linux/pull/3030 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 2 +- - arch/arm64/configs/bcm2711_defconfig | 2 -- - 2 files changed, 1 insertion(+), 3 deletions(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -16,11 +16,11 @@ CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y - CONFIG_MEMCG=y - CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y - CONFIG_CGROUP_CPUACCT=y --CONFIG_CGROUP_PIDS=y - CONFIG_NAMESPACES=y - CONFIG_USER_NS=y - CONFIG_SCHED_AUTOGROUP=y ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -1031,7 +1031,6 @@ CONFIG_USB_G_HID=m - CONFIG_USB_G_WEBCAM=m - CONFIG_MMC=y - CONFIG_MMC_BLOCK_MINORS=32 --CONFIG_MMC_SDHCI_BCM2711=y - CONFIG_MMC_BCM2835_MMC=y - CONFIG_MMC_BCM2835_DMA=y - CONFIG_MMC_BCM2835_SDHOST=y -@@ -1130,7 +1129,6 @@ CONFIG_FB_TFT_WATTEROTT=m - CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_SND_BCM2835=m --CONFIG_VIDEO_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0679-configs-Enable-USB_CONFIGFS-m-in-bcmrpi_defconfig.patch b/target/linux/brcm2708/patches-4.19/950-0679-configs-Enable-USB_CONFIGFS-m-in-bcmrpi_defconfig.patch deleted file mode 100644 index bb0dc8637d..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0679-configs-Enable-USB_CONFIGFS-m-in-bcmrpi_defconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 18d077b0d146f452a89da52994b8fb6a673ea4ce Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Tue, 2 Jul 2019 21:25:59 +0100 -Subject: [PATCH 679/806] configs: Enable USB_CONFIGFS=m in bcmrpi_defconfig - -See: https://github.com/raspberrypi/linux/issues/3042 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcmrpi_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1150,6 +1150,7 @@ CONFIG_USB_CXACRU=m - CONFIG_USB_UEAGLEATM=m - CONFIG_USB_XUSBATM=m - CONFIG_USB_GADGET=m -+CONFIG_USB_CONFIGFS=m - CONFIG_USB_ZERO=m - CONFIG_USB_AUDIO=m - CONFIG_USB_ETH=m diff --git a/target/linux/brcm2708/patches-4.19/950-0680-configs-And-all-the-other-USB_CONFIGFS-options.patch b/target/linux/brcm2708/patches-4.19/950-0680-configs-And-all-the-other-USB_CONFIGFS-options.patch deleted file mode 100644 index bafc986bbd..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0680-configs-And-all-the-other-USB_CONFIGFS-options.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aad75b3a551071c69f94d0c04f75d01599d85039 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Tue, 2 Jul 2019 21:43:13 +0100 -Subject: [PATCH 680/806] configs: And all the other USB_CONFIGFS options - -And all Rabbit's friends-and-relations. - -See: https://github.com/raspberrypi/linux/issues/3042 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcmrpi_defconfig | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1151,6 +1151,23 @@ CONFIG_USB_UEAGLEATM=m - CONFIG_USB_XUSBATM=m - CONFIG_USB_GADGET=m - CONFIG_USB_CONFIGFS=m -+CONFIG_USB_CONFIGFS_SERIAL=y -+CONFIG_USB_CONFIGFS_ACM=y -+CONFIG_USB_CONFIGFS_OBEX=y -+CONFIG_USB_CONFIGFS_NCM=y -+CONFIG_USB_CONFIGFS_ECM=y -+CONFIG_USB_CONFIGFS_ECM_SUBSET=y -+CONFIG_USB_CONFIGFS_RNDIS=y -+CONFIG_USB_CONFIGFS_EEM=y -+CONFIG_USB_CONFIGFS_MASS_STORAGE=y -+CONFIG_USB_CONFIGFS_F_LB_SS=y -+CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_UAC1=y -+CONFIG_USB_CONFIGFS_F_UAC2=y -+CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_USB_CONFIGFS_F_HID=y -+CONFIG_USB_CONFIGFS_F_UVC=y -+CONFIG_USB_CONFIGFS_F_PRINTER=y - CONFIG_USB_ZERO=m - CONFIG_USB_AUDIO=m - CONFIG_USB_ETH=m diff --git a/target/linux/brcm2708/patches-4.19/950-0681-configs-arm64-bcm2711-Add-MMC_SDHCI_IPROC.patch b/target/linux/brcm2708/patches-4.19/950-0681-configs-arm64-bcm2711-Add-MMC_SDHCI_IPROC.patch deleted file mode 100644 index 835a69b1a7..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0681-configs-arm64-bcm2711-Add-MMC_SDHCI_IPROC.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a4978d43b829c144cb795ba092655d9713ed7438 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Wed, 3 Jul 2019 13:53:29 +0100 -Subject: [PATCH 681/806] configs: arm64/bcm2711: Add MMC_SDHCI_IPROC - -This driver is used in the device tree for the emmc2 node. - -See #3032 - -Signed-off-by: Andrei Gherzan ---- - arch/arm64/configs/bcm2711_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -1036,6 +1036,7 @@ CONFIG_MMC_BCM2835_DMA=y - CONFIG_MMC_BCM2835_SDHOST=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SDHCI_IPROC=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y - CONFIG_LEDS_GPIO=y diff --git a/target/linux/brcm2708/patches-4.19/950-0685-Revert-configs-Drop-V4L2-camera-and-codec-drivers-fr.patch b/target/linux/brcm2708/patches-4.19/950-0685-Revert-configs-Drop-V4L2-camera-and-codec-drivers-fr.patch deleted file mode 100644 index 00e9ec7631..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0685-Revert-configs-Drop-V4L2-camera-and-codec-drivers-fr.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c47b7c02d7977a0490cdcbfec7e0d3cede0766e9 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 1 Jul 2019 12:00:27 +0100 -Subject: [PATCH 685/806] Revert "configs: Drop V4L2 camera and codec drivers - from bcmrpi3_defconfig" - -This reverts commit e8a66b4f610b3a20bae8f706256d230135916c26. - -The issues are now resolved. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcmrpi3_defconfig | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1086,6 +1086,8 @@ CONFIG_FB_TFT_WATTEROTT=m - CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0686-Revert-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM.patch b/target/linux/brcm2708/patches-4.19/950-0686-Revert-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM.patch deleted file mode 100644 index 64227fce55..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0686-Revert-configs-arm64-bcm2711-Remove-CONFIG_VIDEO_BCM.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5db1c2a6358d855a3dbda77980c0f4f08ddfd9f2 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 1 Jul 2019 12:06:54 +0100 -Subject: [PATCH 686/806] Revert "configs: arm64/bcm2711: Remove - CONFIG_VIDEO_BCM2835" - -This reverts commit 9d1deec93fa8b1b4953ff5e9210349f3c85b9a8d. - -The issues are resolved, so reenable. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2709_defconfig | 2 +- - arch/arm64/configs/bcm2711_defconfig | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -16,11 +16,11 @@ CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y - CONFIG_MEMCG=y - CONFIG_BLK_CGROUP=y --CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y - CONFIG_CGROUP_CPUACCT=y -+CONFIG_CGROUP_PIDS=y - CONFIG_NAMESPACES=y - CONFIG_USER_NS=y - CONFIG_SCHED_AUTOGROUP=y ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -1031,6 +1031,7 @@ CONFIG_USB_G_HID=m - CONFIG_USB_G_WEBCAM=m - CONFIG_MMC=y - CONFIG_MMC_BLOCK_MINORS=32 -+CONFIG_MMC_SDHCI_BCM2711=y - CONFIG_MMC_BCM2835_MMC=y - CONFIG_MMC_BCM2835_DMA=y - CONFIG_MMC_BCM2835_SDHOST=y -@@ -1130,6 +1131,7 @@ CONFIG_FB_TFT_WATTEROTT=m - CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m - CONFIG_SND_BCM2835=m -+CONFIG_VIDEO_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0688-configs-Drop-MMC_SDHCI_BCM2711-from-arm64-bcm2711_de.patch b/target/linux/brcm2708/patches-4.19/950-0688-configs-Drop-MMC_SDHCI_BCM2711-from-arm64-bcm2711_de.patch deleted file mode 100644 index c8e68bdadb..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0688-configs-Drop-MMC_SDHCI_BCM2711-from-arm64-bcm2711_de.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0388e7d5e95a193c4e223cbbab5fd5de27b50d9f Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Thu, 4 Jul 2019 11:52:43 +0100 -Subject: [PATCH 688/806] configs: Drop MMC_SDHCI_BCM2711 from - arm64/bcm2711_defconfig - -Apparently this is a vestigial setting and should be removed. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcm2711_defconfig | 1 - - 1 file changed, 1 deletion(-) - ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -1031,7 +1031,6 @@ CONFIG_USB_G_HID=m - CONFIG_USB_G_WEBCAM=m - CONFIG_MMC=y - CONFIG_MMC_BLOCK_MINORS=32 --CONFIG_MMC_SDHCI_BCM2711=y - CONFIG_MMC_BCM2835_MMC=y - CONFIG_MMC_BCM2835_DMA=y - CONFIG_MMC_BCM2835_SDHOST=y diff --git a/target/linux/brcm2708/patches-4.19/950-0703-configs-arm64-bcm2711-Use-CONFIG_BRCMSTB_THERMAL-ins.patch b/target/linux/brcm2708/patches-4.19/950-0703-configs-arm64-bcm2711-Use-CONFIG_BRCMSTB_THERMAL-ins.patch deleted file mode 100644 index 8d587cf191..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0703-configs-arm64-bcm2711-Use-CONFIG_BRCMSTB_THERMAL-ins.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 55eb88a80c9bdda3a54a3f9a05ec89509edeb40f Mon Sep 17 00:00:00 2001 -From: Allen Wild -Date: Sat, 13 Jul 2019 11:14:02 -0400 -Subject: [PATCH 703/806] configs: arm64/bcm2711: Use CONFIG_BRCMSTB_THERMAL - instead of CONFIG_BCM2835_THERMAL - -The Raspberry Pi 4 uses the brcmstb thermal driver rather than brcm2835, -based on the device tree compatible string 'brcm,avs-tmon-bcm2838'. With -CONFIG_BRCMSTB_THERMAL enabled, reading temperature from -/sys/class/thermal/thermal_zone0/temp works as expected instead of -returning EINVAL. - -Fixes: https://github.com/raspberrypi/linux/issues/3071 -Signed-off-by: Allen Wild ---- - arch/arm64/configs/bcm2711_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -658,7 +658,7 @@ CONFIG_SENSORS_ADS1015=m - CONFIG_SENSORS_INA2XX=m - CONFIG_SENSORS_TMP102=m - CONFIG_THERMAL=y --CONFIG_BCM2835_THERMAL=y -+CONFIG_BRCMSTB_THERMAL=y - CONFIG_WATCHDOG=y - CONFIG_GPIO_WATCHDOG=m - CONFIG_BCM2835_WDT=y diff --git a/target/linux/brcm2708/patches-4.19/950-0708-configs-Enable-iio-driver-for-TI-ADS1015.patch b/target/linux/brcm2708/patches-4.19/950-0708-configs-Enable-iio-driver-for-TI-ADS1015.patch deleted file mode 100644 index 93d187439d..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0708-configs-Enable-iio-driver-for-TI-ADS1015.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8a6a26418999cc7eacc411bf0aa0c9681da7afb0 Mon Sep 17 00:00:00 2001 -From: Aapo Vienamo -Date: Wed, 17 Jul 2019 11:05:20 +0300 -Subject: [PATCH 708/806] configs: Enable iio driver for TI ADS1015 - -Signed-off-by: Aapo Vienamo ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcm2711_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1291,6 +1291,7 @@ CONFIG_IIO=m - CONFIG_IIO_BUFFER_CB=m - CONFIG_MCP320X=m - CONFIG_MCP3422=m -+CONFIG_TI_ADS1015=m - CONFIG_DHT11=m - CONFIG_HDC100X=m - CONFIG_HTU21=m ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -1322,6 +1322,7 @@ CONFIG_IIO=m - CONFIG_IIO_BUFFER_CB=m - CONFIG_MCP320X=m - CONFIG_MCP3422=m -+CONFIG_TI_ADS1015=m - CONFIG_DHT11=m - CONFIG_HDC100X=m - CONFIG_HTU21=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1301,6 +1301,7 @@ CONFIG_IIO=m - CONFIG_IIO_BUFFER_CB=m - CONFIG_MCP320X=m - CONFIG_MCP3422=m -+CONFIG_TI_ADS1015=m - CONFIG_DHT11=m - CONFIG_HDC100X=m - CONFIG_HTU21=m diff --git a/target/linux/brcm2708/patches-4.19/950-0709-bcm2711_defconfig-enable-PCI-portbus-support-and-imp.patch b/target/linux/brcm2708/patches-4.19/950-0709-bcm2711_defconfig-enable-PCI-portbus-support-and-imp.patch deleted file mode 100644 index e8459e799a..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0709-bcm2711_defconfig-enable-PCI-portbus-support-and-imp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5a3c042a92632f661e3ca4688d60bcca6b8cc2da Mon Sep 17 00:00:00 2001 -From: Jonathan Bell -Date: Thu, 18 Jul 2019 13:05:35 +0100 -Subject: [PATCH 709/806] bcm2711_defconfig: enable PCI portbus support (and - implicitly, PCIe AER) - -PCIe advanced error reporting is supported by the root complex, so make -use of it. - -Signed-off-by: Jonathan Bell ---- - arch/arm/configs/bcm2711_defconfig | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -33,6 +33,8 @@ CONFIG_ARCH_BCM2835=y - CONFIG_ARM_LPAE=y - # CONFIG_CACHE_L2X0 is not set - CONFIG_PCI=y -+CONFIG_PCIEPORTBUS=y -+# CONFIG_PCIEASPM is not set - CONFIG_PCI_MSI=y - CONFIG_PCIE_BRCMSTB=y - CONFIG_SMP=y diff --git a/target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch b/target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch index dd12319d32..2e52e9c0eb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch +++ b/target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch @@ -9,9 +9,6 @@ Signed-off-by: Joerg Schambacher joerg@i2audio.com arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 21 + .../hifiberry-dacplusadcpro-overlay.dts | 64 +++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcm2711_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + sound/soc/bcm/Kconfig | 8 + sound/soc/bcm/Makefile | 2 + sound/soc/bcm/hifiberry_dacplusadcpro.c | 538 ++++++++++++++++++ @@ -126,36 +123,6 @@ Signed-off-by: Joerg Schambacher joerg@i2audio.com + slave = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,slave?"; + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -961,6 +961,7 @@ CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SO - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -972,6 +972,7 @@ CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SO - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -953,6 +953,7 @@ CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SO - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -48,6 +48,14 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS diff --git a/target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch b/target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch index dde8c347ad..1436038cf8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch +++ b/target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch @@ -9,7 +9,6 @@ Replace the old code name with a more appropriate name - RPiVid. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2838.dtsi | 10 +- - arch/arm/configs/bcm2711_defconfig | 2 +- drivers/char/broadcom/Kconfig | 8 +- drivers/char/broadcom/Makefile | 2 +- .../broadcom/{argon-mem.c => rpivid-mem.c} | 105 +++++++++--------- @@ -53,17 +52,6 @@ Signed-off-by: Phil Elwell reg = <0x0 0x7eb30000 0x10000>; status = "okay"; }; ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -650,7 +650,7 @@ CONFIG_BRCM_CHAR_DRIVERS=y - CONFIG_BCM_VCIO=y - CONFIG_BCM_VC_SM=y - CONFIG_BCM2835_DEVGPIOMEM=y --CONFIG_ARGON_MEM=m -+CONFIG_RPIVID_MEM=m - # CONFIG_LEGACY_PTYS is not set - CONFIG_SERIAL_8250=y - # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -50,10 +50,10 @@ config BCM2835_SMI_DEV diff --git a/target/linux/brcm2708/patches-4.19/950-0742-configs-Add-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION-to-P.patch b/target/linux/brcm2708/patches-4.19/950-0742-configs-Add-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION-to-P.patch deleted file mode 100644 index a9d7de51b9..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0742-configs-Add-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION-to-P.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a88a2374eba11050b26408c793f54cc786663f7f Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Tue, 23 Jul 2019 14:14:05 +0100 -Subject: [PATCH 742/806] configs: Add CONFIG_FRAMEBUFFER_CONSOLE_ROTATION to - Pi configs - -To allow for console rotation under DRM (where the firmware -can't lie about geometry), add FRAMEBUFFER_CONSOLE_ROTATION -so that the kernel can do it. - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcm2711_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - 3 files changed, 3 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -935,6 +935,7 @@ CONFIG_FB_RPISENSE=m - CONFIG_BACKLIGHT_RPI=m - CONFIG_BACKLIGHT_GPIO=m - CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y - CONFIG_LOGO=y - # CONFIG_LOGO_LINUX_MONO is not set - # CONFIG_LOGO_LINUX_VGA16 is not set ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -946,6 +946,7 @@ CONFIG_FB_RPISENSE=m - CONFIG_BACKLIGHT_RPI=m - CONFIG_BACKLIGHT_GPIO=m - CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y - CONFIG_LOGO=y - # CONFIG_LOGO_LINUX_MONO is not set - # CONFIG_LOGO_LINUX_VGA16 is not set ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -927,6 +927,7 @@ CONFIG_FB_RPISENSE=m - CONFIG_BACKLIGHT_RPI=m - CONFIG_BACKLIGHT_GPIO=m - CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y - CONFIG_LOGO=y - # CONFIG_LOGO_LINUX_MONO is not set - # CONFIG_LOGO_LINUX_VGA16 is not set diff --git a/target/linux/brcm2708/patches-4.19/950-0762-configs-Regenerate-the-defconfigs.patch b/target/linux/brcm2708/patches-4.19/950-0762-configs-Regenerate-the-defconfigs.patch deleted file mode 100644 index 5c33d7a859..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0762-configs-Regenerate-the-defconfigs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ad010fe745475896b3251e1e8132a21d8f9df1a5 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Sun, 11 Aug 2019 21:31:46 +0100 -Subject: [PATCH 762/806] configs: Regenerate the defconfigs - -Update bcm2709_defconfig to match the output from savedefconfig. - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -16,11 +16,11 @@ CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y - CONFIG_MEMCG=y - CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y - CONFIG_CGROUP_CPUACCT=y --CONFIG_CGROUP_PIDS=y - CONFIG_NAMESPACES=y - CONFIG_USER_NS=y - CONFIG_SCHED_AUTOGROUP=y diff --git a/target/linux/brcm2708/patches-4.19/950-0763-configs-Enable-building-the-DS28E17-driver-module.patch b/target/linux/brcm2708/patches-4.19/950-0763-configs-Enable-building-the-DS28E17-driver-module.patch deleted file mode 100644 index e81b4a9af4..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0763-configs-Enable-building-the-DS28E17-driver-module.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a1358ca295698dcbcf284e4859756d7cbeaac59b Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Sun, 11 Aug 2019 21:34:43 +0100 -Subject: [PATCH 763/806] configs: Enable building the DS28E17 driver module - -See: https://github.com/raspberrypi/linux/issues/3141 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcm2711_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcm2711_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 5 files changed, 5 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -706,6 +706,7 @@ CONFIG_W1_SLAVE_DS2438=m - CONFIG_W1_SLAVE_DS2780=m - CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_W1_SLAVE_DS28E17=m - CONFIG_POWER_RESET=y - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -714,6 +714,7 @@ CONFIG_W1_SLAVE_DS2438=m - CONFIG_W1_SLAVE_DS2780=m - CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_W1_SLAVE_DS28E17=m - CONFIG_POWER_RESET=y - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -698,6 +698,7 @@ CONFIG_W1_SLAVE_DS2438=m - CONFIG_W1_SLAVE_DS2780=m - CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_W1_SLAVE_DS28E17=m - CONFIG_POWER_RESET=y - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -644,6 +644,7 @@ CONFIG_W1_SLAVE_DS2438=m - CONFIG_W1_SLAVE_DS2780=m - CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_W1_SLAVE_DS28E17=m - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m - CONFIG_BATTERY_GAUGE_LTC2941=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -628,6 +628,7 @@ CONFIG_W1_SLAVE_DS2433=m - CONFIG_W1_SLAVE_DS2780=m - CONFIG_W1_SLAVE_DS2781=m - CONFIG_W1_SLAVE_DS28E04=m -+CONFIG_W1_SLAVE_DS28E17=m - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m - CONFIG_BATTERY_MAX17040=m diff --git a/target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch b/target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch index fdd7710afb..339ba31a39 100644 --- a/target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch +++ b/target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch @@ -12,28 +12,9 @@ See: https://github.com/raspberrypi/linux/pull/3063 Signed-off-by: Phil Elwell --- - arch/arm64/configs/bcm2711_defconfig | 2 ++ drivers/gpu/drm/v3d/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -791,6 +791,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y - CONFIG_DRM_UDL=m - CONFIG_DRM_PANEL_SIMPLE=m - CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -+CONFIG_DRM_V3D=m - CONFIG_DRM_VC4=m - CONFIG_DRM_TINYDRM=m - CONFIG_TINYDRM_MI0283QT=m -@@ -1135,6 +1136,7 @@ CONFIG_VIDEO_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set -+CONFIG_BCM2835_POWER=y - CONFIG_RASPBERRYPI_POWER=y - CONFIG_EXTCON=m - CONFIG_EXTCON_ARIZONA=m --- a/drivers/gpu/drm/v3d/Kconfig +++ b/drivers/gpu/drm/v3d/Kconfig @@ -1,6 +1,6 @@ diff --git a/target/linux/brcm2708/patches-4.19/950-0771-configs-Add-TINYDRM-modules.patch b/target/linux/brcm2708/patches-4.19/950-0771-configs-Add-TINYDRM-modules.patch deleted file mode 100644 index 87be4e1177..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0771-configs-Add-TINYDRM-modules.patch +++ /dev/null @@ -1,56 +0,0 @@ -From cf0c78c1e5dfe21f3912a7a9958c9e3978b1f1cb Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 22 Aug 2019 17:20:58 +0100 -Subject: [PATCH 771/806] configs: Add TINYDRM modules - ---- - arch/arm/configs/bcm2709_defconfig | 4 ++++ - arch/arm/configs/bcm2711_defconfig | 4 ++++ - arch/arm/configs/bcmrpi_defconfig | 4 ++++ - 3 files changed, 12 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -924,8 +924,12 @@ CONFIG_DRM_PANEL_SIMPLE=m - CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m - CONFIG_DRM_VC4=m - CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_ILI9225=m -+CONFIG_TINYDRM_ILI9341=m - CONFIG_TINYDRM_MI0283QT=m - CONFIG_TINYDRM_REPAPER=m -+CONFIG_TINYDRM_ST7586=m -+CONFIG_TINYDRM_ST7735R=m - CONFIG_FB=y - CONFIG_FB_BCM2708=y - CONFIG_FB_UDL=m ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -935,8 +935,12 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN - CONFIG_DRM_V3D=m - CONFIG_DRM_VC4=m - CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_ILI9225=m -+CONFIG_TINYDRM_ILI9341=m - CONFIG_TINYDRM_MI0283QT=m - CONFIG_TINYDRM_REPAPER=m -+CONFIG_TINYDRM_ST7586=m -+CONFIG_TINYDRM_ST7735R=m - CONFIG_FB=y - CONFIG_FB_BCM2708=y - CONFIG_FB_UDL=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -916,8 +916,12 @@ CONFIG_DRM_PANEL_SIMPLE=m - CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m - CONFIG_DRM_VC4=m - CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_ILI9225=m -+CONFIG_TINYDRM_ILI9341=m - CONFIG_TINYDRM_MI0283QT=m - CONFIG_TINYDRM_REPAPER=m -+CONFIG_TINYDRM_ST7586=m -+CONFIG_TINYDRM_ST7735R=m - CONFIG_FB=y - CONFIG_FB_BCM2708=y - CONFIG_FB_UDL=m diff --git a/target/linux/brcm2708/patches-4.19/950-0775-Add-support-for-the-Audio-Injector-Ultra-in-64-bit-l.patch b/target/linux/brcm2708/patches-4.19/950-0775-Add-support-for-the-Audio-Injector-Ultra-in-64-bit-l.patch deleted file mode 100644 index 210f63068e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0775-Add-support-for-the-Audio-Injector-Ultra-in-64-bit-l.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0f7c79b7c3dc3a10dcbb0f52b29bccf63f8f2d8d Mon Sep 17 00:00:00 2001 -From: Trevor Stiles -Date: Wed, 28 Aug 2019 15:07:18 -0700 -Subject: [PATCH 775/806] Add support for the Audio Injector Ultra in 64-bit - land. - -Signed-off-by: Trevor Stiles ---- - arch/arm64/configs/bcm2711_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -856,6 +856,7 @@ CONFIG_SND_PISOUND=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -823,6 +823,7 @@ CONFIG_SND_SOC_AD193X_SPI=m - CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_AK4554=m -+CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m - CONFIG_SND_SOC_ICS43432=m - CONFIG_SND_SOC_WM8804_I2C=m diff --git a/target/linux/brcm2708/patches-4.19/950-0780-defconfigs-Add-Sony-IMX219-driver-to-RPi-defconfigs.patch b/target/linux/brcm2708/patches-4.19/950-0780-defconfigs-Add-Sony-IMX219-driver-to-RPi-defconfigs.patch deleted file mode 100644 index 6c0dd45332..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0780-defconfigs-Add-Sony-IMX219-driver-to-RPi-defconfigs.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e1eef315ef4a9400777289e86fc613a9e132959f Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Wed, 28 Aug 2019 13:35:10 +0100 -Subject: [PATCH 780/806] defconfigs: Add Sony IMX219 driver to RPi defconfigs - -Signed-off-by: Dave Stevenson ---- - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcm2711_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + - arch/arm64/configs/bcm2711_defconfig | 1 + - arch/arm64/configs/bcmrpi3_defconfig | 1 + - 5 files changed, 5 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -914,6 +914,7 @@ CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -924,6 +924,7 @@ CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -906,6 +906,7 @@ CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -784,6 +784,7 @@ CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m - CONFIG_DRM=m ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -761,6 +761,7 @@ CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m -+CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m diff --git a/target/linux/brcm2708/patches-4.19/950-0795-configs-Add-GPIO_PCA953X-LEDS_PCA9532-PCA955X.patch b/target/linux/brcm2708/patches-4.19/950-0795-configs-Add-GPIO_PCA953X-LEDS_PCA9532-PCA955X.patch deleted file mode 100644 index 4b22f97771..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0795-configs-Add-GPIO_PCA953X-LEDS_PCA9532-PCA955X.patch +++ /dev/null @@ -1,116 +0,0 @@ -From d86c0634fb27fdb6c01e93d93aeea2703e66c791 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 6 Sep 2019 17:31:51 +0100 -Subject: [PATCH 795/806] configs: Add GPIO_PCA953X, LEDS_PCA9532/PCA955X - -See: https://github.com/raspberrypi/linux/issues/3182 - -Signed-off-by: Phil Elwell ---- - arch/arm/configs/bcm2709_defconfig | 3 +++ - arch/arm/configs/bcm2711_defconfig | 3 +++ - arch/arm/configs/bcmrpi_defconfig | 3 +++ - arch/arm64/configs/bcm2711_defconfig | 3 +++ - arch/arm64/configs/bcmrpi3_defconfig | 3 +++ - 5 files changed, 15 insertions(+) - ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -686,6 +686,7 @@ CONFIG_PPS_CLIENT_GPIO=m - CONFIG_PINCTRL_MCP23S08=m - CONFIG_GPIO_BCM_VIRT=y - CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCA953X=m - CONFIG_GPIO_PCF857X=m - CONFIG_GPIO_ARIZONA=m - CONFIG_GPIO_STMPE=y -@@ -1188,7 +1189,9 @@ CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_PCA9532=m - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA955X=m - CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -694,6 +694,7 @@ CONFIG_PPS_CLIENT_GPIO=m - CONFIG_PINCTRL_MCP23S08=m - CONFIG_GPIO_BCM_VIRT=y - CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCA953X=m - CONFIG_GPIO_PCF857X=m - CONFIG_GPIO_ARIZONA=m - CONFIG_GPIO_STMPE=y -@@ -1220,7 +1221,9 @@ CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SDHCI_IPROC=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_PCA9532=m - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA955X=m - CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -678,6 +678,7 @@ CONFIG_PPS_CLIENT_LDISC=m - CONFIG_PPS_CLIENT_GPIO=m - CONFIG_PINCTRL_MCP23S08=m - CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCA953X=m - CONFIG_GPIO_PCF857X=m - CONFIG_GPIO_ARIZONA=m - CONFIG_GPIO_STMPE=y -@@ -1198,7 +1199,9 @@ CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_PCA9532=m - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA955X=m - CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -624,6 +624,7 @@ CONFIG_PPS_CLIENT_GPIO=m - CONFIG_PINCTRL_MCP23S08=m - CONFIG_GPIO_BCM_VIRT=y - CONFIG_GPIO_MOCKUP=m -+CONFIG_GPIO_PCA953X=m - CONFIG_GPIO_PCF857X=m - CONFIG_GPIO_ARIZONA=m - CONFIG_GPIO_STMPE=y -@@ -1043,7 +1044,9 @@ CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SDHCI_IPROC=y - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_PCA9532=m - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA955X=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -610,6 +610,7 @@ CONFIG_PPS_CLIENT_LDISC=m - CONFIG_PPS_CLIENT_GPIO=m - CONFIG_GPIO_SYSFS=y - CONFIG_GPIO_BCM_VIRT=y -+CONFIG_GPIO_PCA953X=m - CONFIG_GPIO_ARIZONA=m - CONFIG_GPIO_STMPE=y - CONFIG_W1=m -@@ -994,7 +995,9 @@ CONFIG_MMC_SDHCI_PLTFM=y - CONFIG_MMC_SDHCI_IPROC=m - CONFIG_MMC_SPI=m - CONFIG_LEDS_CLASS=y -+CONFIG_LEDS_PCA9532=m - CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_PCA955X=m - CONFIG_LEDS_PCA963X=m - CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y diff --git a/target/linux/brcm2708/patches-4.19/950-0796-configs-Set-VIDEO_V4L2_SUBDEV_API-y-on-arm64-bcm2711.patch b/target/linux/brcm2708/patches-4.19/950-0796-configs-Set-VIDEO_V4L2_SUBDEV_API-y-on-arm64-bcm2711.patch deleted file mode 100644 index 08cbabcab5..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0796-configs-Set-VIDEO_V4L2_SUBDEV_API-y-on-arm64-bcm2711.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9b35b30efe4161dfb345c449e14fc827edbc757f Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 6 Sep 2019 17:48:25 +0100 -Subject: [PATCH 796/806] configs: Set VIDEO_V4L2_SUBDEV_API=y on arm64/bcm2711 - -This one got missed. - -Signed-off-by: Phil Elwell ---- - arch/arm64/configs/bcm2711_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -680,6 +680,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y - CONFIG_MEDIA_RADIO_SUPPORT=y - CONFIG_MEDIA_CONTROLLER=y -+CONFIG_VIDEO_V4L2_SUBDEV_API=y - CONFIG_MEDIA_USB_SUPPORT=y - CONFIG_USB_VIDEO_CLASS=m - CONFIG_USB_M5602=m diff --git a/target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch b/target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch index 52b3bca434..9a5ef9ceb5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch +++ b/target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch @@ -12,9 +12,6 @@ Signed-off-by: Joerg Schambacher arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 6 ++ .../overlays/hifiberry-dacplusdsp-overlay.dts | 34 +++++++ - arch/arm/configs/bcm2709_defconfig | 1 + - arch/arm/configs/bcm2711_defconfig | 1 + - arch/arm/configs/bcmrpi_defconfig | 1 + sound/soc/bcm/Kconfig | 7 ++ sound/soc/bcm/Makefile | 2 + sound/soc/bcm/hifiberry_dacplusdsp.c | 90 +++++++++++++++++++ @@ -85,36 +82,6 @@ Signed-off-by: Joerg Schambacher + }; + }; +}; ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -970,6 +970,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -981,6 +981,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -962,6 +962,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -56,6 +56,13 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS diff --git a/target/linux/brcm2708/patches-4.19/950-0805-configs-Update-arm64-bcm2711_defconfig-based-on-the-.patch b/target/linux/brcm2708/patches-4.19/950-0805-configs-Update-arm64-bcm2711_defconfig-based-on-the-.patch deleted file mode 100644 index 4f04fa137e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0805-configs-Update-arm64-bcm2711_defconfig-based-on-the-.patch +++ /dev/null @@ -1,483 +0,0 @@ -From 9ca67a7287b97dd17216923fae42365488cc49ec Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 17 Sep 2019 21:23:44 +0200 -Subject: [PATCH 805/806] configs: Update arm64/bcm2711_defconfig based on the - arm version (#3239) - -The arm64 and arm configs had diverged in the extra modules that -were being built. - -Resync the two for the obvious modules. - -Signed-off-by: Dave Stevenson ---- - arch/arm64/configs/bcm2711_defconfig | 179 ++++++++++++++++++++++++++- - 1 file changed, 177 insertions(+), 2 deletions(-) - ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -16,6 +16,7 @@ CONFIG_IKCONFIG=m - CONFIG_IKCONFIG_PROC=y - CONFIG_MEMCG=y - CONFIG_BLK_CGROUP=y -+CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y - CONFIG_CGROUP_DEVICE=y -@@ -93,6 +94,7 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y - CONFIG_IP_PIMSM_V1=y - CONFIG_IP_PIMSM_V2=y - CONFIG_SYN_COOKIES=y -+CONFIG_NET_IPVTI=m - CONFIG_INET_AH=m - CONFIG_INET_ESP=m - CONFIG_INET_IPCOMP=m -@@ -131,6 +133,36 @@ CONFIG_NF_CONNTRACK_SANE=m - CONFIG_NF_CONNTRACK_SIP=m - CONFIG_NF_CONNTRACK_TFTP=m - CONFIG_NF_CT_NETLINK=m -+CONFIG_NF_TABLES=m -+CONFIG_NF_TABLES_SET=m -+CONFIG_NF_TABLES_INET=y -+CONFIG_NF_TABLES_NETDEV=y -+CONFIG_NFT_NUMGEN=m -+CONFIG_NFT_CT=m -+CONFIG_NFT_FLOW_OFFLOAD=m -+CONFIG_NFT_COUNTER=m -+CONFIG_NFT_CONNLIMIT=m -+CONFIG_NFT_LOG=m -+CONFIG_NFT_LIMIT=m -+CONFIG_NFT_MASQ=m -+CONFIG_NFT_REDIR=m -+CONFIG_NFT_NAT=m -+CONFIG_NFT_TUNNEL=m -+CONFIG_NFT_OBJREF=m -+CONFIG_NFT_QUEUE=m -+CONFIG_NFT_QUOTA=m -+CONFIG_NFT_REJECT=m -+CONFIG_NFT_COMPAT=m -+CONFIG_NFT_HASH=m -+CONFIG_NFT_FIB_INET=m -+CONFIG_NFT_SOCKET=m -+CONFIG_NFT_OSF=m -+CONFIG_NFT_TPROXY=m -+CONFIG_NFT_DUP_NETDEV=m -+CONFIG_NFT_FWD_NETDEV=m -+CONFIG_NFT_FIB_NETDEV=m -+CONFIG_NF_FLOW_TABLE_INET=m -+CONFIG_NF_FLOW_TABLE=m - CONFIG_NETFILTER_XT_SET=m - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -@@ -182,6 +214,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m - CONFIG_NETFILTER_XT_MATCH_RATEEST=m - CONFIG_NETFILTER_XT_MATCH_REALM=m - CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m - CONFIG_NETFILTER_XT_MATCH_STATE=m - CONFIG_NETFILTER_XT_MATCH_STATISTIC=m - CONFIG_NETFILTER_XT_MATCH_STRING=m -@@ -218,6 +251,14 @@ CONFIG_IP_VS_SED=m - CONFIG_IP_VS_NQ=m - CONFIG_IP_VS_FTP=m - CONFIG_IP_VS_PE_SIP=m -+CONFIG_NFT_CHAIN_ROUTE_IPV4=m -+CONFIG_NFT_DUP_IPV4=m -+CONFIG_NFT_FIB_IPV4=m -+CONFIG_NF_TABLES_ARP=y -+CONFIG_NF_FLOW_TABLE_IPV4=m -+CONFIG_NFT_CHAIN_NAT_IPV4=m -+CONFIG_NFT_MASQ_IPV4=m -+CONFIG_NFT_REDIR_IPV4=m - CONFIG_IP_NF_IPTABLES=m - CONFIG_IP_NF_MATCH_AH=m - CONFIG_IP_NF_MATCH_ECN=m -@@ -237,6 +278,13 @@ CONFIG_IP_NF_RAW=m - CONFIG_IP_NF_ARPTABLES=m - CONFIG_IP_NF_ARPFILTER=m - CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_NFT_CHAIN_ROUTE_IPV6=m -+CONFIG_NFT_CHAIN_NAT_IPV6=m -+CONFIG_NFT_MASQ_IPV6=m -+CONFIG_NFT_REDIR_IPV6=m -+CONFIG_NFT_DUP_IPV6=m -+CONFIG_NFT_FIB_IPV6=m -+CONFIG_NF_FLOW_TABLE_IPV6=m - CONFIG_IP6_NF_IPTABLES=m - CONFIG_IP6_NF_MATCH_AH=m - CONFIG_IP6_NF_MATCH_EUI64=m -@@ -255,6 +303,9 @@ CONFIG_IP6_NF_RAW=m - CONFIG_IP6_NF_NAT=m - CONFIG_IP6_NF_TARGET_MASQUERADE=m - CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_NF_TABLES_BRIDGE=y -+CONFIG_NFT_BRIDGE_REJECT=m -+CONFIG_NF_LOG_BRIDGE=m - CONFIG_BRIDGE_NF_EBTABLES=m - CONFIG_BRIDGE_EBT_BROUTE=m - CONFIG_BRIDGE_EBT_T_FILTER=m -@@ -470,6 +521,7 @@ CONFIG_USB_RTL8150=m - CONFIG_USB_RTL8152=y - CONFIG_USB_LAN78XX=y - CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX8817X=m - CONFIG_USB_NET_AX88179_178A=m - CONFIG_USB_NET_CDCETHER=m - CONFIG_USB_NET_CDC_EEM=m -@@ -523,6 +575,8 @@ CONFIG_LIBERTAS_THINFIRM_USB=m - CONFIG_MWIFIEX=m - CONFIG_MWIFIEX_SDIO=m - CONFIG_MT7601U=m -+CONFIG_MT76x0U=m -+CONFIG_MT76x2U=m - CONFIG_RT2X00=m - CONFIG_RT2500USB=m - CONFIG_RT73USB=m -@@ -563,6 +617,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m - CONFIG_TOUCHSCREEN_EGALAX=m - CONFIG_TOUCHSCREEN_EXC3000=m - CONFIG_TOUCHSCREEN_GOODIX=m -+CONFIG_TOUCHSCREEN_ILI210X=m - CONFIG_TOUCHSCREEN_EDT_FT5X06=m - CONFIG_TOUCHSCREEN_RPI_FT5406=m - CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -@@ -586,7 +641,7 @@ CONFIG_GAMEPORT_L4=m - CONFIG_BRCM_CHAR_DRIVERS=y - CONFIG_BCM_VCIO=y - CONFIG_BCM2835_DEVGPIOMEM=y --# CONFIG_BCM2835_SMI_DEV is not set -+CONFIG_RPIVID_MEM=m - # CONFIG_LEGACY_PTYS is not set - CONFIG_SERIAL_8250=y - # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -@@ -605,10 +660,14 @@ CONFIG_SERIAL_SC16IS7XX_SPI=y - CONFIG_SERIAL_DEV_BUS=m - CONFIG_TTY_PRINTK=y - CONFIG_HW_RANDOM=y --# CONFIG_HW_RANDOM_BCM2835 is not set - CONFIG_RAW_DRIVER=y -+CONFIG_TCG_TPM=m -+CONFIG_TCG_TIS_SPI=m - CONFIG_I2C=y - CONFIG_I2C_CHARDEV=m -+CONFIG_I2C_MUX=m -+CONFIG_I2C_MUX_GPMUX=m -+CONFIG_I2C_MUX_PCA954x=m - CONFIG_I2C_BCM2708=m - CONFIG_I2C_BCM2835=m - CONFIG_I2C_GPIO=m -@@ -617,6 +676,7 @@ CONFIG_I2C_TINY_USB=m - CONFIG_SPI=y - CONFIG_SPI_BCM2835=m - CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_GPIO=m - CONFIG_SPI_SPIDEV=m - CONFIG_SPI_SLAVE=y - CONFIG_PPS_CLIENT_LDISC=m -@@ -648,11 +708,15 @@ CONFIG_W1_SLAVE_DS28E04=m - CONFIG_W1_SLAVE_DS28E17=m - CONFIG_POWER_RESET_GPIO=y - CONFIG_BATTERY_DS2760=m -+CONFIG_BATTERY_MAX17040=m - CONFIG_BATTERY_GAUGE_LTC2941=m - CONFIG_HWMON=m - CONFIG_SENSORS_DS1621=m -+CONFIG_SENSORS_GPIO_FAN=m - CONFIG_SENSORS_JC42=m - CONFIG_SENSORS_LM75=m -+CONFIG_SENSORS_RASPBERRYPI_HWMON=m -+CONFIG_SENSORS_RPI_POE_FAN=m - CONFIG_SENSORS_SHT21=m - CONFIG_SENSORS_SHT3x=m - CONFIG_SENSORS_SHTC1=m -@@ -660,6 +724,7 @@ CONFIG_SENSORS_ADS1015=m - CONFIG_SENSORS_INA2XX=m - CONFIG_SENSORS_TMP102=m - CONFIG_THERMAL=y -+CONFIG_BCM2835_THERMAL=y - CONFIG_BRCMSTB_THERMAL=y - CONFIG_WATCHDOG=y - CONFIG_GPIO_WATCHDOG=m -@@ -674,6 +739,31 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m - CONFIG_REGULATOR_ARIZONA_LDO1=m - CONFIG_REGULATOR_ARIZONA_MICSUPP=m - CONFIG_REGULATOR_GPIO=y -+CONFIG_RC_CORE=y -+CONFIG_LIRC=y -+CONFIG_RC_DECODERS=y -+CONFIG_IR_NEC_DECODER=m -+CONFIG_IR_RC5_DECODER=m -+CONFIG_IR_RC6_DECODER=m -+CONFIG_IR_JVC_DECODER=m -+CONFIG_IR_SONY_DECODER=m -+CONFIG_IR_SANYO_DECODER=m -+CONFIG_IR_SHARP_DECODER=m -+CONFIG_IR_MCE_KBD_DECODER=m -+CONFIG_IR_XMP_DECODER=m -+CONFIG_IR_IMON_DECODER=m -+CONFIG_RC_DEVICES=y -+CONFIG_RC_ATI_REMOTE=m -+CONFIG_IR_IMON=m -+CONFIG_IR_MCEUSB=m -+CONFIG_IR_REDRAT3=m -+CONFIG_IR_STREAMZAP=m -+CONFIG_IR_IGUANA=m -+CONFIG_IR_TTUSBIR=m -+CONFIG_RC_LOOPBACK=m -+CONFIG_IR_GPIO_CIR=m -+CONFIG_IR_GPIO_TX=m -+CONFIG_IR_PWM_TX=m - CONFIG_MEDIA_SUPPORT=m - CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -@@ -745,7 +835,40 @@ CONFIG_VIDEO_GO7007=m - CONFIG_VIDEO_GO7007_USB=m - CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - CONFIG_VIDEO_AU0828=m -+CONFIG_VIDEO_AU0828_RC=y -+CONFIG_VIDEO_CX231XX=m -+CONFIG_VIDEO_CX231XX_ALSA=m -+CONFIG_VIDEO_CX231XX_DVB=m -+CONFIG_VIDEO_TM6000=m -+CONFIG_VIDEO_TM6000_ALSA=m -+CONFIG_VIDEO_TM6000_DVB=m -+CONFIG_DVB_USB=m -+CONFIG_DVB_USB_A800=m -+CONFIG_DVB_USB_DIBUSB_MB=m -+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -+CONFIG_DVB_USB_DIBUSB_MC=m -+CONFIG_DVB_USB_DIB0700=m -+CONFIG_DVB_USB_UMT_010=m -+CONFIG_DVB_USB_CXUSB=m -+CONFIG_DVB_USB_M920X=m -+CONFIG_DVB_USB_DIGITV=m -+CONFIG_DVB_USB_VP7045=m -+CONFIG_DVB_USB_VP702X=m -+CONFIG_DVB_USB_GP8PSK=m -+CONFIG_DVB_USB_NOVA_T_USB2=m -+CONFIG_DVB_USB_TTUSB2=m -+CONFIG_DVB_USB_DTT200U=m -+CONFIG_DVB_USB_OPERA1=m -+CONFIG_DVB_USB_AF9005=m -+CONFIG_DVB_USB_AF9005_REMOTE=m -+CONFIG_DVB_USB_PCTV452E=m -+CONFIG_DVB_USB_DW2102=m -+CONFIG_DVB_USB_CINERGY_T2=m -+CONFIG_DVB_USB_DTV5100=m -+CONFIG_DVB_USB_AZ6027=m -+CONFIG_DVB_USB_TECHNISAT_USB2=m - CONFIG_DVB_USB_V2=m -+CONFIG_DVB_USB_AF9015=m - CONFIG_DVB_USB_AF9035=m - CONFIG_DVB_USB_ANYSEE=m - CONFIG_DVB_USB_AU6610=m -@@ -753,7 +876,9 @@ CONFIG_DVB_USB_AZ6007=m - CONFIG_DVB_USB_CE6230=m - CONFIG_DVB_USB_EC168=m - CONFIG_DVB_USB_GL861=m -+CONFIG_DVB_USB_LME2510=m - CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_RTL28XXU=m - CONFIG_DVB_USB_DVBSKY=m - CONFIG_SMS_USB_DRV=m - CONFIG_DVB_B2C2_FLEXCOP_USB=m -@@ -763,6 +888,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m - CONFIG_VIDEO_EM28XX_ALSA=m - CONFIG_VIDEO_EM28XX_DVB=m - CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_BCM2835_UNICAM=m - CONFIG_RADIO_SI470X=m - CONFIG_USB_SI470X=m - CONFIG_I2C_SI470X=m -@@ -782,11 +908,14 @@ CONFIG_RADIO_WL128X=m - # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set - CONFIG_VIDEO_UDA1342=m - CONFIG_VIDEO_SONY_BTF_MPX=m -+CONFIG_VIDEO_ADV7180=m -+CONFIG_VIDEO_TC358743=m - CONFIG_VIDEO_TVP5150=m - CONFIG_VIDEO_TW2804=m - CONFIG_VIDEO_TW9903=m - CONFIG_VIDEO_TW9906=m - CONFIG_VIDEO_IMX219=m -+CONFIG_VIDEO_OV5647=m - CONFIG_VIDEO_OV7640=m - CONFIG_VIDEO_MT9V011=m - CONFIG_DRM=m -@@ -797,17 +926,23 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN - CONFIG_DRM_V3D=m - CONFIG_DRM_VC4=m - CONFIG_DRM_TINYDRM=m -+CONFIG_TINYDRM_ILI9225=m -+CONFIG_TINYDRM_ILI9341=m - CONFIG_TINYDRM_MI0283QT=m - CONFIG_TINYDRM_REPAPER=m -+CONFIG_TINYDRM_ST7586=m -+CONFIG_TINYDRM_ST7735R=m - CONFIG_FB=y - CONFIG_FB_BCM2708=y - CONFIG_FB_UDL=m -+CONFIG_FB_SIMPLE=y - CONFIG_FB_SSD1307=m - CONFIG_FB_RPISENSE=m - # CONFIG_BACKLIGHT_GENERIC is not set - CONFIG_BACKLIGHT_RPI=m - CONFIG_BACKLIGHT_GPIO=m - CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y - CONFIG_LOGO=y - # CONFIG_LOGO_LINUX_MONO is not set - # CONFIG_LOGO_LINUX_VGA16 is not set -@@ -834,6 +969,8 @@ CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SO - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m -+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m - CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m - CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m -@@ -841,11 +978,14 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m - CONFIG_SND_BCM2708_SOC_RPI_PROTO=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m - CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m -+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m - CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m -+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m - CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m - CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m - CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m -+CONFIG_SND_AUDIOSENSE_PI=m - CONFIG_SND_DIGIDAC1_SOUNDCARD=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m - CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m -@@ -856,11 +996,14 @@ CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m - CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m - CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m - CONFIG_SND_PISOUND=m -+CONFIG_SND_SOC_AD193X_SPI=m -+CONFIG_SND_SOC_AD193X_I2C=m - CONFIG_SND_SOC_ADAU1701=m - CONFIG_SND_SOC_ADAU7002=m - CONFIG_SND_SOC_AK4554=m - CONFIG_SND_SOC_CS4265=m - CONFIG_SND_SOC_CS4271_I2C=m -+CONFIG_SND_SOC_ICS43432=m - CONFIG_SND_SOC_SPDIF=m - CONFIG_SND_SOC_WM8804_I2C=m - CONFIG_SND_SIMPLE_CARD=m -@@ -873,6 +1016,7 @@ CONFIG_HID_APPLE=m - CONFIG_HID_ASUS=m - CONFIG_HID_BELKIN=m - CONFIG_HID_BETOP_FF=m -+CONFIG_HID_BIGBEN_FF=m - CONFIG_HID_CHERRY=m - CONFIG_HID_CHICONY=m - CONFIG_HID_CYPRESS=m -@@ -1022,6 +1166,24 @@ CONFIG_USB_CXACRU=m - CONFIG_USB_UEAGLEATM=m - CONFIG_USB_XUSBATM=m - CONFIG_USB_GADGET=m -+CONFIG_USB_CONFIGFS=m -+CONFIG_USB_CONFIGFS_SERIAL=y -+CONFIG_USB_CONFIGFS_ACM=y -+CONFIG_USB_CONFIGFS_OBEX=y -+CONFIG_USB_CONFIGFS_NCM=y -+CONFIG_USB_CONFIGFS_ECM=y -+CONFIG_USB_CONFIGFS_ECM_SUBSET=y -+CONFIG_USB_CONFIGFS_RNDIS=y -+CONFIG_USB_CONFIGFS_EEM=y -+CONFIG_USB_CONFIGFS_MASS_STORAGE=y -+CONFIG_USB_CONFIGFS_F_LB_SS=y -+CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_UAC1=y -+CONFIG_USB_CONFIGFS_F_UAC2=y -+CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_USB_CONFIGFS_F_HID=y -+CONFIG_USB_CONFIGFS_F_UVC=y -+CONFIG_USB_CONFIGFS_F_PRINTER=y - CONFIG_USB_ZERO=m - CONFIG_USB_AUDIO=m - CONFIG_USB_ETH=m -@@ -1048,6 +1210,8 @@ CONFIG_LEDS_CLASS=y - CONFIG_LEDS_PCA9532=m - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_PCA955X=m -+CONFIG_LEDS_PCA963X=m -+CONFIG_LEDS_IS31FL32XX=m - CONFIG_LEDS_TRIGGER_TIMER=y - CONFIG_LEDS_TRIGGER_ONESHOT=y - CONFIG_LEDS_TRIGGER_HEARTBEAT=y -@@ -1059,6 +1223,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m - CONFIG_LEDS_TRIGGER_CAMERA=m - CONFIG_LEDS_TRIGGER_INPUT=y - CONFIG_LEDS_TRIGGER_PANIC=y -+CONFIG_LEDS_TRIGGER_NETDEV=m - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - CONFIG_RTC_DRV_ABX80X=m -@@ -1080,6 +1245,7 @@ CONFIG_RTC_DRV_FM3130=m - CONFIG_RTC_DRV_RX8581=m - CONFIG_RTC_DRV_RX8025=m - CONFIG_RTC_DRV_EM3027=m -+CONFIG_RTC_DRV_RV3028=m - CONFIG_RTC_DRV_M41T93=m - CONFIG_RTC_DRV_M41T94=m - CONFIG_RTC_DRV_DS1302=m -@@ -1096,6 +1262,8 @@ CONFIG_RTC_DRV_RV3029C2=m - CONFIG_DMADEVICES=y - CONFIG_DMA_BCM2835=y - CONFIG_DMA_BCM2708=y -+CONFIG_AUXDISPLAY=y -+CONFIG_HD44780=m - CONFIG_UIO=m - CONFIG_UIO_PDRV_GENIRQ=m - CONFIG_STAGING=y -@@ -1124,6 +1292,7 @@ CONFIG_FB_TFT_PCD8544=m - CONFIG_FB_TFT_RA8875=m - CONFIG_FB_TFT_S6D02A1=m - CONFIG_FB_TFT_S6D1121=m -+CONFIG_FB_TFT_SH1106=m - CONFIG_FB_TFT_SSD1289=m - CONFIG_FB_TFT_SSD1306=m - CONFIG_FB_TFT_SSD1331=m -@@ -1137,8 +1306,10 @@ CONFIG_FB_TFT_UPD161704=m - CONFIG_FB_TFT_WATTEROTT=m - CONFIG_FB_FLEX=m - CONFIG_FB_TFT_FBTFT_DEVICE=m -+CONFIG_BCM2835_VCHIQ=y - CONFIG_SND_BCM2835=m - CONFIG_VIDEO_BCM2835=m -+CONFIG_VIDEO_CODEC_BCM2835=m - CONFIG_MAILBOX=y - CONFIG_BCM2835_MBOX=y - # CONFIG_IOMMU_SUPPORT is not set -@@ -1150,9 +1321,11 @@ CONFIG_IIO=m - CONFIG_IIO_BUFFER_CB=m - CONFIG_MCP320X=m - CONFIG_MCP3422=m -+CONFIG_TI_ADS1015=m - CONFIG_DHT11=m - CONFIG_HDC100X=m - CONFIG_HTU21=m -+CONFIG_INV_MPU6050_I2C=m - CONFIG_TSL4531=m - CONFIG_VEML6070=m - CONFIG_BMP280=m -@@ -1283,6 +1456,7 @@ CONFIG_CRYPTO_CAST5=m - CONFIG_CRYPTO_DES=y - CONFIG_CRYPTO_LZ4=m - CONFIG_CRYPTO_USER_API_SKCIPHER=m -+# CONFIG_CRYPTO_HW is not set - CONFIG_CRC_ITU_T=y - CONFIG_LIBCRC32C=y - CONFIG_PRINTK_TIME=y -@@ -1294,6 +1468,7 @@ CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_STACK_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y -+# CONFIG_UPROBE_EVENTS is not set - CONFIG_FUNCTION_PROFILER=y - CONFIG_KGDB=y - CONFIG_KGDB_KDB=y From b0b1d4aaf0b646ba352e2bd446f7074d210b0f01 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 23 Dec 2019 15:21:57 +0100 Subject: [PATCH 107/480] ath79: Do not build dlink_dir-615-e4 by default The factory image for the dlink_dir-615-e4 is getting too big which makes the full ath79 tiny build fail, deactivate it by default. Signed-off-by: Hauke Mehrtens --- target/linux/ath79/image/tiny.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index b974777c61..54b20b6089 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -30,6 +30,7 @@ define Device/dlink_dir-615-e4 check-size $$$$(FACTORY_IMAGE_SIZE) | pad-to $$$$(FACTORY_IMAGE_SIZE) | \ append-string "AP99-AR7240-RT-091105-05" SUPPORTED_DEVICES += dir-615-e4 + DEFAULT := n endef TARGET_DEVICES += dlink_dir-615-e4 From 729d7bc7517288c2c8c5a00f918878d3828594b2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 23 Dec 2019 15:23:09 +0100 Subject: [PATCH 108/480] kernel: Deactivate CONFIG_SFP in generic config Deactivate CONFIG_SFP for kernel 4.19 in the generic configuration. The CONFIG_SFP configuration option was not set to anything in the ath79 build for me, set it to deactivated by default. Signed-off-by: Hauke Mehrtens --- target/linux/gemini/config-4.19 | 1 - target/linux/generic/config-4.19 | 1 + target/linux/imx6/config-4.19 | 1 - target/linux/ipq40xx/config-4.19 | 1 - target/linux/ipq806x/config-4.19 | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/target/linux/gemini/config-4.19 b/target/linux/gemini/config-4.19 index ac295f0857..b23e6a56d4 100644 --- a/target/linux/gemini/config-4.19 +++ b/target/linux/gemini/config-4.19 @@ -431,7 +431,6 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIO=y CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_SERPORT=y -# CONFIG_SFP is not set CONFIG_SG_POOL=y CONFIG_SLUB_DEBUG=y CONFIG_SPARSE_IRQ=y diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index eb6cf46e95..4cbef51ee1 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -4548,6 +4548,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SFC is not set # CONFIG_SFC_FALCON is not set # CONFIG_SFI is not set +# CONFIG_SFP is not set # CONFIG_SGETMASK_SYSCALL is not set # CONFIG_SGI_IOC4 is not set # CONFIG_SGI_IP22 is not set diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19 index 94865f96e2..9ba1d02b93 100644 --- a/target/linux/imx6/config-4.19 +++ b/target/linux/imx6/config-4.19 @@ -462,7 +462,6 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_MCTRL_GPIO=y -# CONFIG_SFP is not set CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SMP=y diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19 index 8948b73ff7..e9c1bcd199 100644 --- a/target/linux/ipq40xx/config-4.19 +++ b/target/linux/ipq40xx/config-4.19 @@ -441,7 +441,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SFP is not set CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 index 68de994370..7a06ab9081 100644 --- a/target/linux/ipq806x/config-4.19 +++ b/target/linux/ipq806x/config-4.19 @@ -454,7 +454,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SFP is not set CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y From 46c5880b0f64c82d7ca2395a72f8a7757446e7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 23 Dec 2019 17:48:22 +0100 Subject: [PATCH 109/480] brcm2708-gpu-fw: update to latest firmware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- package/kernel/brcm2708-gpu-fw/Makefile | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile index 6445ed3626..fd2f7cb504 100644 --- a/package/kernel/brcm2708-gpu-fw/Makefile +++ b/package/kernel/brcm2708-gpu-fw/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=brcm2708-gpu-fw -PKG_VERSION:=2019-09-17 -PKG_RELEASE:=f8e05108dbb3b5640f48b6b301296e979876836b +PKG_VERSION:=2019-12-11 +PKG_RELEASE:=0c01dbefba45a08c47f8538d5a071a0fba6b7e83 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/rpi-firmware-$(PKG_RELEASE) @@ -25,7 +25,7 @@ define Download/LICENCE_broadcom FILE:=$(RPI_FIRMWARE_FILE)-LICENCE.broadcom URL:=$(RPI_FIRMWARE_URL) URL_FILE:=LICENCE.broadcom - HASH:=ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add + HASH:=c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b endef $(eval $(call Download,LICENCE_broadcom)) @@ -33,7 +33,7 @@ define Download/bootcode_bin FILE:=$(RPI_FIRMWARE_FILE)-bootcode.bin URL:=$(RPI_FIRMWARE_URL) URL_FILE:=bootcode.bin - HASH:=2c7e8ee3f5b268e6d13dba11d970fa49f9e8a82e548d4471892e53e6628a98f1 + HASH:=6505bbc8798698bd8f1dff30789b22289ebb865ccba7833b87705264525cbe46 endef $(eval $(call Download,bootcode_bin)) @@ -41,7 +41,7 @@ define Download/fixup_dat FILE:=$(RPI_FIRMWARE_FILE)-fixup.dat URL:=$(RPI_FIRMWARE_URL) URL_FILE:=fixup.dat - HASH:=ae76b623dea688033b39034284d463fe37ba489283634ec35f4426deb93810e2 + HASH:=85a54bf460aa3ff0d04ee54bc606bf3af39a2c5194e519ab278cf74ecf75f7a8 endef $(eval $(call Download,fixup_dat)) @@ -49,7 +49,7 @@ define Download/fixup_cd_dat FILE:=$(RPI_FIRMWARE_FILE)-fixup_cd.dat URL:=$(RPI_FIRMWARE_URL) URL_FILE:=fixup_cd.dat - HASH:=380549cf6c28280ebea7c6e54c2060dea2e4bd79ea8491263668c7895cbc107b + HASH:=4d9ffff3719fff6b14f142cbb4b3f62df175e59be4ad382b0f39830dab18d760 endef $(eval $(call Download,fixup_cd_dat)) @@ -57,7 +57,7 @@ define Download/fixup_x_dat FILE:=$(RPI_FIRMWARE_FILE)-fixup_x.dat URL:=$(RPI_FIRMWARE_URL) URL_FILE:=fixup_x.dat - HASH:=cda6d8719a3b044046ad7b10a40dd629bb3ba3e5fe4b5f7521ccf8ebc74488a6 + HASH:=81aae9581c120fbbf5020fa6b84b355ed342ead7185db0916cbce7a7849307eb endef $(eval $(call Download,fixup_x_dat)) @@ -65,7 +65,7 @@ define Download/fixup4_dat FILE:=$(RPI_FIRMWARE_FILE)-fixup4.dat URL:=$(RPI_FIRMWARE_URL) URL_FILE:=fixup4.dat - HASH:=0c9e2b079a11def55083d8366fe243f145dbb8f09aab05e4e0f8e8225b8f28fb + HASH:=611ea1ec1384931c785687e78a50369aae3a0a29e37bed354862cf5fe6d23ade endef $(eval $(call Download,fixup4_dat)) @@ -73,7 +73,7 @@ define Download/fixup4cd_dat FILE:=$(RPI_FIRMWARE_FILE)-fixup4cd.dat URL:=$(RPI_FIRMWARE_URL) URL_FILE:=fixup4cd.dat - HASH:=24ae560fa1630787409e4d1ba918636728ae6968ab75b1644e75738ed5ffa5ed + HASH:=f82da018c2d9fe1ec54fcfe76514dbc3b9f27f53712bb5f5b90f0d38124370eb endef $(eval $(call Download,fixup4cd_dat)) @@ -81,7 +81,7 @@ define Download/fixup4x_dat FILE:=$(RPI_FIRMWARE_FILE)-fixup4x.dat URL:=$(RPI_FIRMWARE_URL) URL_FILE:=fixup4x.dat - HASH:=9858225026a3ce02018d2813f913634d11ebd34db2564bb5faaacdf25e2eb95b + HASH:=36c1cdb7b5ff8c39c1c0cd962ea1095f79c5c290fc11813869cbb662240386d7 endef $(eval $(call Download,fixup4x_dat)) @@ -89,7 +89,7 @@ define Download/start_elf FILE:=$(RPI_FIRMWARE_FILE)-start.elf URL:=$(RPI_FIRMWARE_URL) URL_FILE:=start.elf - HASH:=ca6225e593dc5c5fa8004405f85bfd3f2b3ba1ac5c6b215227fcab09a399c795 + HASH:=442919907e4b7d8f007b79df1aa1e12f98e09ab393da65b48cd2b2af04301b7d endef $(eval $(call Download,start_elf)) @@ -97,7 +97,7 @@ define Download/start_cd_elf FILE:=$(RPI_FIRMWARE_FILE)-start_cd.elf URL:=$(RPI_FIRMWARE_URL) URL_FILE:=start_cd.elf - HASH:=31ab1b1694d619096d25054f0f9d509edf58d781b5b323231791fbd4ad4cd5e8 + HASH:=0942b6ab8eec7e6116a3fc366cb0d4a94b5869c429292da600f92a37e361ec8d endef $(eval $(call Download,start_cd_elf)) @@ -105,7 +105,7 @@ define Download/start_x_elf FILE:=$(RPI_FIRMWARE_FILE)-start_x.elf URL:=$(RPI_FIRMWARE_URL) URL_FILE:=start_x.elf - HASH:=b76e8f08643d30ac01402c457f369468a386240ea1022d3a6448cdbfd1257ee2 + HASH:=e83dc1fbb5a9cb29e1db5f9ca0f9bd847f5b57a1e421cc79e39640a865456fe6 endef $(eval $(call Download,start_x_elf)) @@ -113,7 +113,7 @@ define Download/start4_elf FILE:=$(RPI_FIRMWARE_FILE)-start4.elf URL:=$(RPI_FIRMWARE_URL) URL_FILE:=start4.elf - HASH:=c19b943fe0fed7dbee5a4743f68ba4b9882c241cbcde1d9328718bcb300571a2 + HASH:=550b55577075f4056a71b0faa2b1150290b2e8d61e5bc330a54452f28cc1b2d8 endef $(eval $(call Download,start4_elf)) @@ -121,7 +121,7 @@ define Download/start4cd_elf FILE:=$(RPI_FIRMWARE_FILE)-start4cd.elf URL:=$(RPI_FIRMWARE_URL) URL_FILE:=start4cd.elf - HASH:=890cf686984924fa65a80766322a96f2520eb6736563f010d63dfa24d67c3c12 + HASH:=1c8206a854fba486b7996aa3735aaca8aaeee7bf20fdbf190acdea4516794f1c endef $(eval $(call Download,start4cd_elf)) @@ -129,7 +129,7 @@ define Download/start4x_elf FILE:=$(RPI_FIRMWARE_FILE)-start4x.elf URL:=$(RPI_FIRMWARE_URL) URL_FILE:=start4x.elf - HASH:=2c61e4def4fb088e5f9a6c70478b0ea4cb11107f6af2e1c754e5c0ddd50e9d33 + HASH:=3ca2e259861fd31b77a536ccb33637e5305ec44b9e0c62e898e7e1d97e776f22 endef $(eval $(call Download,start4x_elf)) From c715f71bcee8cd9ec949ebb9f8d173983755f216 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 21 Dec 2019 13:05:52 -0800 Subject: [PATCH 110/480] treewide: Remove self from MAINTAINER entries Signed-off-by: Florian Fainelli --- package/boot/kexec-tools/Makefile | 1 - package/kernel/acx-mac80211/Makefile | 1 - package/kernel/ar7-atm/Makefile | 1 - package/utils/spidev_test/Makefile | 1 - target/linux/ar7/Makefile | 1 - target/linux/armvirt/Makefile | 3 +-- target/linux/malta/Makefile | 1 - target/linux/uml/Makefile | 1 - 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package/boot/kexec-tools/Makefile b/package/boot/kexec-tools/Makefile index dcd745e6c5..269345aa9d 100644 --- a/package/boot/kexec-tools/Makefile +++ b/package/boot/kexec-tools/Makefile @@ -25,7 +25,6 @@ define Package/kexec-tools/Default SECTION:=utils CATEGORY:=Utilities URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/ - MAINTAINER:=Florian Fainelli endef define Package/kexec-tools diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile index 1fec2eb73c..52c8914947 100644 --- a/package/kernel/acx-mac80211/Makefile +++ b/package/kernel/acx-mac80211/Makefile @@ -29,7 +29,6 @@ define KernelPackage/acx-mac80211 DEPENDS:=@(PCI_SUPPORT||TARGET_ar7) @mipsel +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko AUTOLOAD:=$(call AutoProbe,acx-mac80211) - MAINTAINER:=Florian Fainelli MENU:=1 endef diff --git a/package/kernel/ar7-atm/Makefile b/package/kernel/ar7-atm/Makefile index 82d6f61a7d..88ffb52c65 100644 --- a/package/kernel/ar7-atm/Makefile +++ b/package/kernel/ar7-atm/Makefile @@ -44,7 +44,6 @@ define KernelPackage/sangam-atm/Default TITLE:=AR7 ADSL driver FILES:=$(PKG_BUILD_DIR)/tiatm.ko AUTOLOAD:=$(call AutoLoad,50,tiatm) - MAINTAINER:=Florian Fainelli MENU:=1 endef diff --git a/package/utils/spidev_test/Makefile b/package/utils/spidev_test/Makefile index 29c6a90dc8..0f288ad010 100644 --- a/package/utils/spidev_test/Makefile +++ b/package/utils/spidev_test/Makefile @@ -23,7 +23,6 @@ define Package/spidev-test TITLE:=SPI testing utility VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org - MAINTAINER:=Florian Fainelli endef define Package/spidev-test/description diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 1f789ca71f..ba40e508fc 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -10,7 +10,6 @@ ARCH:=mipsel BOARD:=ar7 BOARDNAME:=TI AR7 FEATURES:=squashfs atm low_mem -MAINTAINER:=Florian Fainelli SUBTARGETS:=generic ac49x KERNEL_PATCHVER:=4.9 diff --git a/target/linux/armvirt/Makefile b/target/linux/armvirt/Makefile index 44d4ece224..89a37c63dc 100644 --- a/target/linux/armvirt/Makefile +++ b/target/linux/armvirt/Makefile @@ -10,8 +10,7 @@ BOARD:=armvirt BOARDNAME:=QEMU ARM Virtual Machine FEATURES:=fpu pci rtc usb FEATURES+=cpiogz ext4 ramdisk squashfs targz -MAINTAINER:=Florian Fainelli , \ - Yousong Zhou +MAINTAINER:=Yousong Zhou KERNEL_PATCHVER:=4.19 diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 6d520e4a52..05969c8bff 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -11,7 +11,6 @@ BOARDNAME:=MIPS Malta CoreLV board (qemu) CPU_TYPE:=24kc SUBTARGETS:=le be le64 be64 INITRAMFS_EXTRA_FILES:= -MAINTAINER:=Florian Fainelli FEATURES:=cpiogz ext4 ramdisk squashfs targz KERNEL_PATCHVER:=4.19 diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 1962249c48..f8b8c8f7e1 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -20,7 +20,6 @@ ARCH:=$(shell uname -m | sed \ BOARD:=uml BOARDNAME:=User Mode Linux FEATURES:=squashfs ext4 audio source-only -MAINTAINER:=Florian Fainelli KERNEL_PATCHVER:=4.14 From 1ac627024de916eb157659caf49f93fa89d3b19a Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 22 Dec 2019 21:20:57 +0300 Subject: [PATCH 111/480] kernel: ath10k-ct: provide a build variant for small RAM devices According to many bugreports [0][1][2] the default ath10k-ct kernel module is unusable on devices with just 64 MiB RAM or with 128 MiB and dual ath10k cards. The target boards boot but eventually oom-killer starts to interfere with normal operation, so the current state is effectively broken. Since the two patches in question have a performance impact (and possibly some other unexpected side-effects) a dedicated build variant is added so that users of the low RAM devices can still benefit from all the ath10k-ct advantages. According to testing [3] results, the issue can be experienced even with "a 256MB device with three radios". Measured performance impact of implementing small buffers was lowering "the maximum 5 GHz throughput on an IPQ40xx device without RPS/XPS optimizations from 494/432 Mbit/s for TCP transfers (download/upload) to 438/343 Mbit/s" The patches were apparently inspired by QSDK tweaks used by ODMs for the affected devices. [0] http://lists.infradead.org/pipermail/openwrt-devel/2019-December/020573.html [1] https://github.com/openwrt/openwrt/pull/1077 [2] https://bugs.openwrt.org/index.php?do=details&task_id=2664 [3] https://github.com/freifunk-gluon/gluon/pull/1440#issue-195607701 Signed-off-by: Paul Fertser [Remove double CONFIG_ATH10K-CT_LEDS entry] Signed-off-by: Hauke Mehrtens --- package/kernel/ath10k-ct/Makefile | 14 ++- ...0-0010-ath10k-limit-htt-rx-ring-size.patch | 28 +++++ ...60-0011-ath10k-limit-pci-buffer-size.patch | 100 ++++++++++++++++++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch create mode 100644 package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile index dbf75fe174..c29d28f41a 100644 --- a/package/kernel/ath10k-ct/Makefile +++ b/package/kernel/ath10k-ct/Makefile @@ -35,6 +35,7 @@ define KernelPackage/ath10k-ct $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko AUTOLOAD:=$(call AutoProbe,ath10k_pci) PROVIDES:=kmod-ath10k + VARIANT:=regular endef define KernelPackage/ath10k-ct/config @@ -42,7 +43,13 @@ define KernelPackage/ath10k-ct/config config ATH10K-CT_LEDS bool "Enable LED support" default y - depends on PACKAGE_kmod-ath10k-ct + depends on PACKAGE_kmod-ath10k-ct || PACKAGE_kmod-ath10k-ct-smallbuffers +endef + +define KernelPackage/ath10k-ct-smallbuffers +$(call KernelPackage/ath10k-ct) + TITLE+= (small buffers for low-RAM devices) + VARIANT:=smallbuffers endef NOSTDINC_FLAGS = \ @@ -90,6 +97,10 @@ ifeq ($(CONFIG_ATH10K-CT_LEDS),y) NOSTDINC_FLAGS += -DCONFIG_ATH10K_LEDS endif +ifeq ($(BUILD_VARIANT),smallbuffers) + NOSTDINC_FLAGS += -DCONFIG_ATH10K_SMALLBUFFERS +endif + define Build/Configure cp $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR) endef @@ -107,3 +118,4 @@ define Build/Compile endef $(eval $(call KernelPackage,ath10k-ct)) +$(eval $(call KernelPackage,ath10k-ct-smallbuffers)) diff --git a/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch b/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch new file mode 100644 index 0000000000..a3a939440a --- /dev/null +++ b/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch @@ -0,0 +1,28 @@ +--- a/ath10k-4.19/htt.h ++++ b/ath10k-4.19/htt.h +@@ -237,7 +237,11 @@ enum htt_rx_ring_flags { + }; + + #define HTT_RX_RING_SIZE_MIN 128 ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + #define HTT_RX_RING_SIZE_MAX 2048 ++#else ++#define HTT_RX_RING_SIZE_MAX 512 ++#endif + #define HTT_RX_RING_SIZE HTT_RX_RING_SIZE_MAX + #define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1) + #define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1) +--- a/ath10k-5.2/htt.h ++++ b/ath10k-5.2/htt.h +@@ -225,7 +225,11 @@ enum htt_rx_ring_flags { + }; + + #define HTT_RX_RING_SIZE_MIN 128 ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + #define HTT_RX_RING_SIZE_MAX 2048 ++#else ++#define HTT_RX_RING_SIZE_MAX 512 ++#endif + #define HTT_RX_RING_SIZE HTT_RX_RING_SIZE_MAX + #define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1) + #define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1) diff --git a/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch b/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch new file mode 100644 index 0000000000..517be89dab --- /dev/null +++ b/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch @@ -0,0 +1,100 @@ +--- a/ath10k-4.19/pci.c ++++ b/ath10k-4.19/pci.c +@@ -142,7 +142,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 512, ++#else ++ .dest_nentries = 128, ++#endif + .recv_cb = ath10k_pci_htt_htc_rx_cb, + }, + +@@ -151,7 +155,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 128, ++#else ++ .dest_nentries = 64, ++#endif + .recv_cb = ath10k_pci_htc_rx_cb, + }, + +@@ -178,7 +186,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 512, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 512, ++#else ++ .dest_nentries = 128, ++#endif + .recv_cb = ath10k_pci_htt_rx_cb, + }, + +@@ -203,7 +215,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 128, ++#else ++ .dest_nentries = 96, ++#endif + .recv_cb = ath10k_pci_pktlog_rx_cb, + }, + +--- a/ath10k-5.2/pci.c ++++ b/ath10k-5.2/pci.c +@@ -131,7 +131,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 512, ++#else ++ .dest_nentries = 128, ++#endif + .recv_cb = ath10k_pci_htt_htc_rx_cb, + }, + +@@ -140,7 +144,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 128, ++#else ++ .dest_nentries = 64, ++#endif + .recv_cb = ath10k_pci_htc_rx_cb, + }, + +@@ -167,7 +175,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 512, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 512, ++#else ++ .dest_nentries = 128, ++#endif + .recv_cb = ath10k_pci_htt_rx_cb, + }, + +@@ -192,7 +204,11 @@ static struct ce_attr host_ce_config_wla + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, ++#ifndef CONFIG_ATH10K_SMALLBUFFERS + .dest_nentries = 128, ++#else ++ .dest_nentries = 96, ++#endif + .recv_cb = ath10k_pci_pktlog_rx_cb, + }, + From 80f06cb601160534f20e61d476dcedba77d5a47d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 24 Dec 2019 00:46:51 +0100 Subject: [PATCH 112/480] ath10k-firmware: Add kmod-ath10k-ct-smallbuffers to depends Only select ath10k-ct-regular when smallbuffers version was not selected. Signed-off-by: Hauke Mehrtens --- package/firmware/ath10k-firmware/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index 1ae813023c..394580549b 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -174,7 +174,7 @@ $(Package/ath10k-firmware-default) SECTION:=firmware CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca988x - DEPENDS:=+kmod-ath10k-ct + DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct endef define Package/ath10k-firmware-qca9887-ct @@ -190,7 +190,7 @@ $(Package/ath10k-firmware-default) SECTION:=firmware CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca9887 - DEPENDS:=+kmod-ath10k-ct + DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct endef define Package/ath10k-firmware-qca988x-ct/description @@ -308,7 +308,7 @@ $(Package/ath10k-firmware-default) SECTION:=firmware CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca99x0 - DEPENDS:=+kmod-ath10k-ct + DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct endef define Package/ath10k-firmware-qca9984-ct @@ -324,7 +324,7 @@ $(Package/ath10k-firmware-default) SECTION:=firmware CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca9984 - DEPENDS:=+kmod-ath10k-ct + DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct endef define Package/ath10k-firmware-qca4019-ct @@ -340,7 +340,7 @@ $(Package/ath10k-firmware-default) SECTION:=firmware CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca4019 - DEPENDS:=+kmod-ath10k-ct + DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct endef define Package/ath10k-firmware-qca9888-ct @@ -356,7 +356,7 @@ $(Package/ath10k-firmware-default) SECTION:=firmware CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca9888 - DEPENDS:=+kmod-ath10k-ct + DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct endef From db992e7b53f5a3b614c27f9f2d589128c570a821 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 22 Dec 2019 23:05:13 +0300 Subject: [PATCH 113/480] ath79: use ath10k-ct-smallbuffers for 64 MiB devices Signed-off-by: Paul Fertser --- target/linux/ath79/image/generic-tp-link.mk | 10 +++++----- target/linux/ath79/image/generic-ubnt.mk | 10 +++++----- target/linux/ath79/image/generic.mk | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index cc5c13b919..8a030492c5 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -20,7 +20,7 @@ define Device/tplink_archer-c2-v3 IMAGE_SIZE := 7808k DEVICE_MODEL := Archer C2 DEVICE_VARIANT := v3 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct TPLINK_BOARD_ID := ARCHER-C2-V3 endef TARGET_DEVICES += tplink_archer-c2-v3 @@ -32,7 +32,7 @@ define Device/tplink_archer-c25-v1 DEVICE_MODEL := Archer C25 DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C25-V1 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct SUPPORTED_DEVICES += archer-c25-v1 endef TARGET_DEVICES += tplink_archer-c25-v1 @@ -56,7 +56,7 @@ define Device/tplink_archer-c58-v1 DEVICE_MODEL := Archer C58 DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C58-V1 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c58-v1 endef TARGET_DEVICES += tplink_archer-c58-v1 @@ -119,7 +119,7 @@ define Device/tplink_archer-c60-v1 DEVICE_MODEL := Archer C60 DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C60-V1 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c60-v1 endef TARGET_DEVICES += tplink_archer-c60-v1 @@ -131,7 +131,7 @@ define Device/tplink_archer-c60-v2 DEVICE_MODEL := Archer C60 DEVICE_VARIANT := v2 TPLINK_BOARD_ID := ARCHER-C60-V2 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c60-v2 endef TARGET_DEVICES += tplink_archer-c60-v2 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 760d5be196..8a45fb09d1 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -122,7 +122,7 @@ define Device/ubnt_lap-120 $(Device/ubnt-wa) DEVICE_MODEL := LiteAP ac DEVICE_VARIANT := LAP-120 - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct endef TARGET_DEVICES += ubnt_lap-120 @@ -130,28 +130,28 @@ define Device/ubnt_litebeam-ac-gen2 $(Device/ubnt-wa) DEVICE_MODEL := LiteBeam AC DEVICE_VARIANT := Gen2 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct endef TARGET_DEVICES += ubnt_litebeam-ac-gen2 define Device/ubnt_nanobeam-ac $(Device/ubnt-wa) DEVICE_MODEL := NanoBeam AC - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct rssileds + DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct rssileds endef TARGET_DEVICES += ubnt_nanobeam-ac define Device/ubnt_nanostation-ac $(Device/ubnt-wa) DEVICE_MODEL := Nanostation AC - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct rssileds + DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct rssileds endef TARGET_DEVICES += ubnt_nanostation-ac define Device/ubnt_nanostation-ac-loco $(Device/ubnt-wa) DEVICE_MODEL := Nanostation AC loco - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct endef TARGET_DEVICES += ubnt_nanostation-ac-loco diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 10bd40abc1..18dad80d5d 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -273,7 +273,7 @@ define Device/comfast_cf-e313ac SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E313AC - DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct \ + DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct-smallbuffers \ ath10k-firmware-qca9888-ct -swconfig -uboot-envtools IMAGE_SIZE := 7936k endef @@ -473,7 +473,7 @@ define Device/dlink_dir-859-a1 DEVICE_MODEL := DIR-859 DEVICE_VARIANT := A1 IMAGE_SIZE := 15872k - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct SEAMA_SIGNATURE := wrgac37_dlink.2013gui_dir859 SUPPORTED_DEVICES += dir-859-a1 endef @@ -719,7 +719,7 @@ define Device/nec_wg800hp IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ xor-image -p 6A57190601121E4C004C1E1201061957 -x | nec-fw LASER_ATERM - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct-htt + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct-htt endef TARGET_DEVICES += nec_wg800hp @@ -917,7 +917,7 @@ define Device/phicomm_k2t IMAGE_SIZE := 15744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9888-ct endef TARGET_DEVICES += phicomm_k2t From 7604e53d5f593120449cdaf059bfaf66ec07607e Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 18 Dec 2019 16:34:37 +0100 Subject: [PATCH 114/480] kernel: bump 4.14 to 4.14.159 Refreshed all patches. Remove upstreamed: - 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 +- ...-remove-unused-definitions-and-write.patch | 2 +- ...-set-CRYPTO_ALG_KERN_DRIVER_ONLY-fla.patch | 2 +- ...-remove-double-assignment-of-pd_uinf.patch | 2 +- ...-enable-AES-RFC3686-ECB-CFB-and-OFB-.patch | 2 +- ...x-refactor-crypto4xx_copy_pkt_to_dst.patch | 2 +- ...-replace-crypto4xx_dev-s-scatter_buf.patch | 8 +- ...rypto4xx-pointer-arithmetic-overhaul.patch | 18 +-- ...pto-crypto4xx-fix-off-by-one-AES-OFB.patch | 2 +- ...-crypto4xx-add-backlog-queue-support.patch | 12 +- ...-use-the-correct-LE32-format-for-IV-.patch | 4 +- ...rypto4xx-overhaul-crypto4xx_build_pd.patch | 20 +-- ...rypto-crypto4xx-fix-various-warnings.patch | 2 +- ...rypto4xx-fix-stalls-under-heavy-load.patch | 4 +- ...-simplify-sa-and-state-context-acqui.patch | 4 +- ...o-crypto4xx-prepare-for-AEAD-support.patch | 34 ++--- ...crypto-crypto4xx-add-aes-ccm-support.patch | 2 +- ...crypto-crypto4xx-add-aes-gcm-support.patch | 2 +- ...-shuffle-iomap-in-front-of-request_i.patch | 8 +- ...o-crypto4xx-support-Revision-B-parts.patch | 10 +- ...to-crypto4xx-fix-missing-irq-devname.patch | 2 +- ...04-crypto-crypto4xx-kill-MODULE_NAME.patch | 2 +- ...-perform-aead-icv-check-in-the-drive.patch | 4 +- ...-crypto4xx-performance-optimizations.patch | 14 +- ...crypto-crypto4xx-convert-to-skcipher.patch | 16 +-- ...crypto-crypto4xx-add-aes-ctr-support.patch | 6 +- ...-put-temporary-dst-sg-into-request-c.patch | 4 +- ...remove-useless-setting-of-type-flags.patch | 12 +- ...4xx_core-don-t-abuse-__dma_sync_page.patch | 2 +- ...to-crypto4xx-add-prng-crypto-support.patch | 12 +- ...rypto4xx-fix-AES-CTR-blocksize-value.patch | 4 +- ...pto4xx-fix-blocksize-for-cfb-and-ofb.patch | 4 +- ...-block-ciphers-should-only-accept-co.patch | 8 +- ...lement-per-channel-protection-contro.patch | 128 ------------------ .../patches-4.14/500-MIPS-fw-myloader.patch | 2 +- .../generic/hack-4.14/204-module_strip.patch | 16 +-- .../301-mips_image_cmdline_hack.patch | 2 +- .../generic/hack-4.14/902-debloat_proc.patch | 2 +- .../300-mips_expose_boot_raw.patch | 4 +- .../pending-4.14/304-mips_disable_fpu.patch | 2 +- ...ove-no-op-dma_map_ops-where-possible.patch | 8 +- ...e-scm_call-to-route-GPIO-irq-to-Apps.patch | 6 +- .../804-i2c-support-layerscape.patch | 4 +- .../807-usb-support-layerscape.patch | 4 +- 44 files changed, 142 insertions(+), 270 deletions(-) delete mode 100644 target/linux/apm821xx/patches-4.14/302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 1bb0fe9911..5b4fe2c533 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .206 -LINUX_VERSION-4.14 = .158 +LINUX_VERSION-4.14 = .159 LINUX_VERSION-4.19 = .88 LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 -LINUX_KERNEL_HASH-4.14.158 = 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3 +LINUX_KERNEL_HASH-4.14.159 = e8d42d3a1b85d180141e9bc11c4a0e87f8a413c0e989b0f24c1b7c40f8a826f2 LINUX_KERNEL_HASH-4.19.88 = c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch b/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch index b49bcaf88c..6cae1eaa3e 100644 --- a/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch +++ b/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch @@ -67,7 +67,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -973,7 +973,7 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -969,7 +969,7 @@ u32 crypto4xx_build_pd(struct crypto_asy sa->sa_command_1.bf.hash_crypto_offset = 0; pd->pd_ctl.w = ctx->pd_ctl; diff --git a/target/linux/apm821xx/patches-4.14/020-0003-crypto-crypto4xx-set-CRYPTO_ALG_KERN_DRIVER_ONLY-fla.patch b/target/linux/apm821xx/patches-4.14/020-0003-crypto-crypto4xx-set-CRYPTO_ALG_KERN_DRIVER_ONLY-fla.patch index ab2e730530..5b0a5df9e9 100644 --- a/target/linux/apm821xx/patches-4.14/020-0003-crypto-crypto4xx-set-CRYPTO_ALG_KERN_DRIVER_ONLY-fla.patch +++ b/target/linux/apm821xx/patches-4.14/020-0003-crypto-crypto4xx-set-CRYPTO_ALG_KERN_DRIVER_ONLY-fla.patch @@ -18,7 +18,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1125,7 +1125,9 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1121,7 +1121,9 @@ struct crypto4xx_alg_common crypto4xx_al .cra_name = "cbc(aes)", .cra_driver_name = "cbc-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, diff --git a/target/linux/apm821xx/patches-4.14/020-0005-crypto-crypto4xx-remove-double-assignment-of-pd_uinf.patch b/target/linux/apm821xx/patches-4.14/020-0005-crypto-crypto4xx-remove-double-assignment-of-pd_uinf.patch index 6f173ea6dc..802bef756e 100644 --- a/target/linux/apm821xx/patches-4.14/020-0005-crypto-crypto4xx-remove-double-assignment-of-pd_uinf.patch +++ b/target/linux/apm821xx/patches-4.14/020-0005-crypto-crypto4xx-remove-double-assignment-of-pd_uinf.patch @@ -14,7 +14,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1090,7 +1090,6 @@ static void crypto4xx_bh_tasklet_cb(unsi +@@ -1086,7 +1086,6 @@ static void crypto4xx_bh_tasklet_cb(unsi pd->pd_ctl.bf.pe_done = 0; crypto4xx_pd_done(core_dev->dev, tail); crypto4xx_put_pd_to_pdr(core_dev->dev, tail); diff --git a/target/linux/apm821xx/patches-4.14/020-0008-crypto-crypto4xx-enable-AES-RFC3686-ECB-CFB-and-OFB-.patch b/target/linux/apm821xx/patches-4.14/020-0008-crypto-crypto4xx-enable-AES-RFC3686-ECB-CFB-and-OFB-.patch index db1a718825..0a8da95cbd 100644 --- a/target/linux/apm821xx/patches-4.14/020-0008-crypto-crypto4xx-enable-AES-RFC3686-ECB-CFB-and-OFB-.patch +++ b/target/linux/apm821xx/patches-4.14/020-0008-crypto-crypto4xx-enable-AES-RFC3686-ECB-CFB-and-OFB-.patch @@ -109,7 +109,7 @@ Signed-off-by: Herbert Xu #include #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" -@@ -1144,6 +1145,103 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1140,6 +1141,103 @@ struct crypto4xx_alg_common crypto4xx_al } } }}, diff --git a/target/linux/apm821xx/patches-4.14/020-0009-crypto-crypto4xx-refactor-crypto4xx_copy_pkt_to_dst.patch b/target/linux/apm821xx/patches-4.14/020-0009-crypto-crypto4xx-refactor-crypto4xx_copy_pkt_to_dst.patch index e74ed7f56b..829c560be7 100644 --- a/target/linux/apm821xx/patches-4.14/020-0009-crypto-crypto4xx-refactor-crypto4xx_copy_pkt_to_dst.patch +++ b/target/linux/apm821xx/patches-4.14/020-0009-crypto-crypto4xx-refactor-crypto4xx_copy_pkt_to_dst.patch @@ -27,7 +27,7 @@ Signed-off-by: Herbert Xu #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" #include "crypto4xx_sa.h" -@@ -483,111 +484,44 @@ static inline struct ce_sd *crypto4xx_ge +@@ -479,111 +480,44 @@ static inline struct ce_sd *crypto4xx_ge return (struct ce_sd *)(dev->sdr + sizeof(struct ce_sd) * idx); } diff --git a/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch b/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch index 5ca3faa4dc..1a8f9c59e5 100644 --- a/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch +++ b/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch @@ -27,9 +27,9 @@ Signed-off-by: Herbert Xu - dev->scatter_buffer_size * PPC4XX_NUM_SD, + PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD, &dev->scatter_buffer_pa, GFP_ATOMIC); - if (!dev->scatter_buffer_va) { - dma_free_coherent(dev->core_dev->device, -@@ -412,7 +411,7 @@ static u32 crypto4xx_build_sdr(struct cr + if (!dev->scatter_buffer_va) + return -ENOMEM; +@@ -408,7 +407,7 @@ static u32 crypto4xx_build_sdr(struct cr for (i = 0; i < PPC4XX_NUM_SD; i++) { sd_array[i].ptr = dev->scatter_buffer_pa + @@ -38,7 +38,7 @@ Signed-off-by: Herbert Xu } return 0; -@@ -427,7 +426,7 @@ static void crypto4xx_destroy_sdr(struct +@@ -423,7 +422,7 @@ static void crypto4xx_destroy_sdr(struct if (dev->scatter_buffer_va) dma_free_coherent(dev->core_dev->device, diff --git a/target/linux/apm821xx/patches-4.14/020-0012-crypto-crypto4xx-pointer-arithmetic-overhaul.patch b/target/linux/apm821xx/patches-4.14/020-0012-crypto-crypto4xx-pointer-arithmetic-overhaul.patch index 3d445f537b..ff768c2b74 100644 --- a/target/linux/apm821xx/patches-4.14/020-0012-crypto-crypto4xx-pointer-arithmetic-overhaul.patch +++ b/target/linux/apm821xx/patches-4.14/020-0012-crypto-crypto4xx-pointer-arithmetic-overhaul.patch @@ -171,9 +171,9 @@ Signed-off-by: Herbert Xu /* alloc memory for scatter descriptor ring */ dev->sdr = dma_alloc_coherent(dev->core_dev->device, -@@ -407,10 +403,8 @@ static u32 crypto4xx_build_sdr(struct cr +@@ -403,10 +399,8 @@ static u32 crypto4xx_build_sdr(struct cr + if (!dev->scatter_buffer_va) return -ENOMEM; - } - sd_array = dev->sdr; - @@ -183,7 +183,7 @@ Signed-off-by: Herbert Xu PPC4XX_SD_BUFFER_SIZE * i; } -@@ -480,7 +474,7 @@ static inline struct ce_sd *crypto4xx_ge +@@ -476,7 +470,7 @@ static inline struct ce_sd *crypto4xx_ge { *sd_dma = dev->sdr_pa + sizeof(struct ce_sd) * idx; @@ -192,7 +192,7 @@ Signed-off-by: Herbert Xu } static void crypto4xx_copy_pkt_to_dst(struct crypto4xx_device *dev, -@@ -529,11 +523,10 @@ static u32 crypto4xx_copy_digest_to_dst( +@@ -525,11 +519,10 @@ static u32 crypto4xx_copy_digest_to_dst( struct crypto4xx_ctx *ctx) { struct dynamic_sa_ctl *sa = (struct dynamic_sa_ctl *) ctx->sa_in; @@ -206,7 +206,7 @@ Signed-off-by: Herbert Xu SA_HASH_ALG_SHA1_DIGEST_SIZE); } -@@ -616,11 +609,9 @@ static u32 crypto4xx_ahash_done(struct c +@@ -612,11 +605,9 @@ static u32 crypto4xx_ahash_done(struct c static u32 crypto4xx_pd_done(struct crypto4xx_device *dev, u32 idx) { @@ -220,7 +220,7 @@ Signed-off-by: Herbert Xu if (crypto_tfm_alg_type(pd_uinfo->async_req->tfm) == CRYPTO_ALG_TYPE_ABLKCIPHER) return crypto4xx_ablkcipher_done(dev, pd_uinfo, pd); -@@ -721,7 +712,6 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -717,7 +708,6 @@ u32 crypto4xx_build_pd(struct crypto_asy unsigned long flags; struct pd_uinfo *pd_uinfo = NULL; unsigned int nbytes = datalen, idx; @@ -228,7 +228,7 @@ Signed-off-by: Herbert Xu u32 gd_idx = 0; /* figure how many gd is needed */ -@@ -780,17 +770,15 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -776,17 +766,15 @@ u32 crypto4xx_build_pd(struct crypto_asy } spin_unlock_irqrestore(&dev->core_dev->lock, flags); @@ -248,7 +248,7 @@ Signed-off-by: Herbert Xu if (ctx->direction == DIR_INBOUND) memcpy(sa, ctx->sa_in, ctx->sa_len * 4); else -@@ -800,14 +788,15 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -796,14 +784,15 @@ u32 crypto4xx_build_pd(struct crypto_asy &pd_uinfo->sr_pa, 4); if (iv_len) @@ -267,7 +267,7 @@ Signed-off-by: Herbert Xu } } pd->sa_len = ctx->sa_len; -@@ -1015,9 +1004,8 @@ static void crypto4xx_bh_tasklet_cb(unsi +@@ -1011,9 +1000,8 @@ static void crypto4xx_bh_tasklet_cb(unsi while (core_dev->dev->pdr_head != core_dev->dev->pdr_tail) { tail = core_dev->dev->pdr_tail; diff --git a/target/linux/apm821xx/patches-4.14/020-0014-crypto-crypto4xx-fix-off-by-one-AES-OFB.patch b/target/linux/apm821xx/patches-4.14/020-0014-crypto-crypto4xx-fix-off-by-one-AES-OFB.patch index b1786a2015..98c584dbc8 100644 --- a/target/linux/apm821xx/patches-4.14/020-0014-crypto-crypto4xx-fix-off-by-one-AES-OFB.patch +++ b/target/linux/apm821xx/patches-4.14/020-0014-crypto-crypto4xx-fix-off-by-one-AES-OFB.patch @@ -38,7 +38,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1157,7 +1157,7 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1153,7 +1153,7 @@ struct crypto4xx_alg_common crypto4xx_al .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, diff --git a/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch b/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch index 4e644cf627..cc88baecb4 100644 --- a/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch +++ b/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch @@ -56,7 +56,7 @@ Signed-off-by: Herbert Xu #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" #include "crypto4xx_sa.h" -@@ -582,8 +583,10 @@ static u32 crypto4xx_ablkcipher_done(str +@@ -578,8 +579,10 @@ static u32 crypto4xx_ablkcipher_done(str } crypto4xx_ret_sg_desc(dev, pd_uinfo); @@ -69,7 +69,7 @@ Signed-off-by: Herbert Xu return 0; } -@@ -600,9 +603,10 @@ static u32 crypto4xx_ahash_done(struct c +@@ -596,9 +599,10 @@ static u32 crypto4xx_ahash_done(struct c crypto4xx_copy_digest_to_dst(pd_uinfo, crypto_tfm_ctx(ahash_req->base.tfm)); crypto4xx_ret_sg_desc(dev, pd_uinfo); @@ -83,7 +83,7 @@ Signed-off-by: Herbert Xu return 0; } -@@ -713,6 +717,7 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -709,6 +713,7 @@ u32 crypto4xx_build_pd(struct crypto_asy struct pd_uinfo *pd_uinfo = NULL; unsigned int nbytes = datalen, idx; u32 gd_idx = 0; @@ -91,7 +91,7 @@ Signed-off-by: Herbert Xu /* figure how many gd is needed */ num_gd = sg_nents_for_len(src, datalen); -@@ -743,6 +748,31 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -739,6 +744,31 @@ u32 crypto4xx_build_pd(struct crypto_asy * already got must be return the original place. */ spin_lock_irqsave(&dev->core_dev->lock, flags); @@ -123,7 +123,7 @@ Signed-off-by: Herbert Xu if (num_gd) { fst_gd = crypto4xx_get_n_gd(dev, num_gd); if (fst_gd == ERING_WAS_FULL) { -@@ -897,11 +927,12 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -893,11 +923,12 @@ u32 crypto4xx_build_pd(struct crypto_asy sa->sa_command_1.bf.hash_crypto_offset = 0; pd->pd_ctl.w = ctx->pd_ctl; pd->pd_ctl_len.w = 0x00400000 | datalen; @@ -138,7 +138,7 @@ Signed-off-by: Herbert Xu } /** -@@ -1006,7 +1037,7 @@ static void crypto4xx_bh_tasklet_cb(unsi +@@ -1002,7 +1033,7 @@ static void crypto4xx_bh_tasklet_cb(unsi tail = core_dev->dev->pdr_tail; pd_uinfo = &core_dev->dev->pdr_uinfo[tail]; pd = &core_dev->dev->pdr[tail]; diff --git a/target/linux/apm821xx/patches-4.14/020-0018-crypto-crypto4xx-use-the-correct-LE32-format-for-IV-.patch b/target/linux/apm821xx/patches-4.14/020-0018-crypto-crypto4xx-use-the-correct-LE32-format-for-IV-.patch index 347cea5010..c3b58f78bd 100644 --- a/target/linux/apm821xx/patches-4.14/020-0018-crypto-crypto4xx-use-the-correct-LE32-format-for-IV-.patch +++ b/target/linux/apm821xx/patches-4.14/020-0018-crypto-crypto4xx-use-the-correct-LE32-format-for-IV-.patch @@ -45,7 +45,7 @@ Signed-off-by: Herbert Xu ctx->is_hash = 0; --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -623,42 +623,6 @@ static u32 crypto4xx_pd_done(struct cryp +@@ -619,42 +619,6 @@ static u32 crypto4xx_pd_done(struct cryp return crypto4xx_ahash_done(dev, pd_uinfo); } @@ -88,7 +88,7 @@ Signed-off-by: Herbert Xu static void crypto4xx_stop_all(struct crypto4xx_core_device *core_dev) { crypto4xx_destroy_pdr(core_dev->dev); -@@ -818,8 +782,8 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -814,8 +778,8 @@ u32 crypto4xx_build_pd(struct crypto_asy &pd_uinfo->sr_pa, 4); if (iv_len) diff --git a/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch b/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch index 023f63638f..7efb0e699f 100644 --- a/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch +++ b/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch @@ -263,7 +263,7 @@ Signed-off-by: Herbert Xu /** * alloc memory for the gather ring * no need to alloc buf for the ring -@@ -520,18 +514,16 @@ static void crypto4xx_copy_pkt_to_dst(st +@@ -516,18 +510,16 @@ static void crypto4xx_copy_pkt_to_dst(st } } @@ -285,7 +285,7 @@ Signed-off-by: Herbert Xu } static void crypto4xx_ret_sg_desc(struct crypto4xx_device *dev, -@@ -600,7 +592,7 @@ static u32 crypto4xx_ahash_done(struct c +@@ -596,7 +588,7 @@ static u32 crypto4xx_ahash_done(struct c ahash_req = ahash_request_cast(pd_uinfo->async_req); ctx = crypto_tfm_ctx(ahash_req->base.tfm); @@ -294,7 +294,7 @@ Signed-off-by: Herbert Xu crypto_tfm_ctx(ahash_req->base.tfm)); crypto4xx_ret_sg_desc(dev, pd_uinfo); -@@ -660,17 +652,17 @@ static u32 get_next_sd(u32 current) +@@ -656,17 +648,17 @@ static u32 get_next_sd(u32 current) return 0; } @@ -317,7 +317,7 @@ Signed-off-by: Herbert Xu struct ce_gd *gd; struct ce_pd *pd; u32 num_gd, num_sd; -@@ -678,8 +670,9 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -674,8 +666,9 @@ u32 crypto4xx_build_pd(struct crypto_asy u32 fst_sd = 0xffffffff; u32 pd_entry; unsigned long flags; @@ -329,7 +329,7 @@ Signed-off-by: Herbert Xu u32 gd_idx = 0; bool is_busy; -@@ -693,7 +686,7 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -689,7 +682,7 @@ u32 crypto4xx_build_pd(struct crypto_asy num_gd = 0; /* figure how many sd is needed */ @@ -338,7 +338,7 @@ Signed-off-by: Herbert Xu num_sd = 0; } else { if (datalen > PPC4XX_SD_BUFFER_SIZE) { -@@ -764,37 +757,27 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -760,37 +753,27 @@ u32 crypto4xx_build_pd(struct crypto_asy } spin_unlock_irqrestore(&dev->core_dev->lock, flags); @@ -389,7 +389,7 @@ Signed-off-by: Herbert Xu /* get first gd we are going to use */ gd_idx = fst_gd; pd_uinfo->first_gd = fst_gd; -@@ -803,27 +786,30 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -799,27 +782,30 @@ u32 crypto4xx_build_pd(struct crypto_asy pd->src = gd_dma; /* enable gather */ sa->sa_command_0.bf.gather = 1; @@ -430,7 +430,7 @@ Signed-off-by: Herbert Xu /* * Disable gather in sa command */ -@@ -834,25 +820,24 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -830,25 +816,24 @@ u32 crypto4xx_build_pd(struct crypto_asy pd_uinfo->first_gd = 0xffffffff; pd_uinfo->num_gd = 0; } @@ -463,7 +463,7 @@ Signed-off-by: Herbert Xu u32 sd_idx = fst_sd; nbytes = datalen; sa->sa_command_0.bf.scatter = 1; -@@ -866,7 +851,6 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -862,7 +847,6 @@ u32 crypto4xx_build_pd(struct crypto_asy sd->ctl.done = 0; sd->ctl.rdy = 1; /* sd->ptr should be setup by sd_init routine*/ @@ -471,7 +471,7 @@ Signed-off-by: Herbert Xu if (nbytes >= PPC4XX_SD_BUFFER_SIZE) nbytes -= PPC4XX_SD_BUFFER_SIZE; else -@@ -877,19 +861,23 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -873,19 +857,23 @@ u32 crypto4xx_build_pd(struct crypto_asy /* setup scatter descriptor */ sd->ctl.done = 0; sd->ctl.rdy = 1; diff --git a/target/linux/apm821xx/patches-4.14/020-0020-crypto-crypto4xx-fix-various-warnings.patch b/target/linux/apm821xx/patches-4.14/020-0020-crypto-crypto4xx-fix-various-warnings.patch index c58026d32a..b37438d06c 100644 --- a/target/linux/apm821xx/patches-4.14/020-0020-crypto-crypto4xx-fix-various-warnings.patch +++ b/target/linux/apm821xx/patches-4.14/020-0020-crypto-crypto4xx-fix-various-warnings.patch @@ -42,7 +42,7 @@ Signed-off-by: Herbert Xu if (n >= PPC4XX_NUM_GD) return ERING_WAS_FULL; -@@ -625,17 +626,6 @@ static void crypto4xx_stop_all(struct cr +@@ -621,17 +622,6 @@ static void crypto4xx_stop_all(struct cr kfree(core_dev); } diff --git a/target/linux/apm821xx/patches-4.14/020-0021-crypto-crypto4xx-fix-stalls-under-heavy-load.patch b/target/linux/apm821xx/patches-4.14/020-0021-crypto-crypto4xx-fix-stalls-under-heavy-load.patch index 5e8ac96e16..a9d6ddced2 100644 --- a/target/linux/apm821xx/patches-4.14/020-0021-crypto-crypto4xx-fix-stalls-under-heavy-load.patch +++ b/target/linux/apm821xx/patches-4.14/020-0021-crypto-crypto4xx-fix-stalls-under-heavy-load.patch @@ -44,7 +44,7 @@ Signed-off-by: Herbert Xu } /** -@@ -863,16 +866,16 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -859,16 +862,16 @@ int crypto4xx_build_pd(struct crypto_asy } } @@ -66,7 +66,7 @@ Signed-off-by: Herbert Xu writel(1, dev->ce_base + CRYPTO4XX_INT_DESCR_RD); return is_busy ? -EBUSY : -EINPROGRESS; } -@@ -973,23 +976,23 @@ static void crypto4xx_bh_tasklet_cb(unsi +@@ -969,23 +972,23 @@ static void crypto4xx_bh_tasklet_cb(unsi struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev); struct pd_uinfo *pd_uinfo; struct ce_pd *pd; diff --git a/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch b/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch index 55c85005af..2ac1e5a1d6 100644 --- a/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch +++ b/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch @@ -167,7 +167,7 @@ Signed-off-by: Herbert Xu /** * alloc memory for the gather ring * no need to alloc buf for the ring -@@ -892,8 +861,6 @@ static int crypto4xx_alg_init(struct cry +@@ -888,8 +857,6 @@ static int crypto4xx_alg_init(struct cry ctx->dev = amcc_alg->dev; ctx->sa_in = NULL; ctx->sa_out = NULL; @@ -176,7 +176,7 @@ Signed-off-by: Herbert Xu ctx->sa_len = 0; switch (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) { -@@ -914,7 +881,6 @@ static void crypto4xx_alg_exit(struct cr +@@ -910,7 +877,6 @@ static void crypto4xx_alg_exit(struct cr struct crypto4xx_ctx *ctx = crypto_tfm_ctx(tfm); crypto4xx_free_sa(ctx); diff --git a/target/linux/apm821xx/patches-4.14/020-0023-crypto-crypto4xx-prepare-for-AEAD-support.patch b/target/linux/apm821xx/patches-4.14/020-0023-crypto-crypto4xx-prepare-for-AEAD-support.patch index f883e5a995..aa99b17801 100644 --- a/target/linux/apm821xx/patches-4.14/020-0023-crypto-crypto4xx-prepare-for-AEAD-support.patch +++ b/target/linux/apm821xx/patches-4.14/020-0023-crypto-crypto4xx-prepare-for-AEAD-support.patch @@ -116,7 +116,7 @@ Signed-off-by: Herbert Xu #include #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" -@@ -518,7 +520,7 @@ static void crypto4xx_ret_sg_desc(struct +@@ -514,7 +516,7 @@ static void crypto4xx_ret_sg_desc(struct } } @@ -125,7 +125,7 @@ Signed-off-by: Herbert Xu struct pd_uinfo *pd_uinfo, struct ce_pd *pd) { -@@ -552,11 +554,9 @@ static u32 crypto4xx_ablkcipher_done(str +@@ -548,11 +550,9 @@ static u32 crypto4xx_ablkcipher_done(str if (pd_uinfo->state & PD_ENTRY_BUSY) ablkcipher_request_complete(ablk_req, -EINPROGRESS); ablkcipher_request_complete(ablk_req, 0); @@ -138,7 +138,7 @@ Signed-off-by: Herbert Xu struct pd_uinfo *pd_uinfo) { struct crypto4xx_ctx *ctx; -@@ -572,20 +572,88 @@ static u32 crypto4xx_ahash_done(struct c +@@ -568,20 +568,88 @@ static u32 crypto4xx_ahash_done(struct c if (pd_uinfo->state & PD_ENTRY_BUSY) ahash_request_complete(ahash_req, -EINPROGRESS); ahash_request_complete(ahash_req, 0); @@ -234,7 +234,7 @@ Signed-off-by: Herbert Xu } static void crypto4xx_stop_all(struct crypto4xx_core_device *core_dev) -@@ -621,8 +689,10 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -617,8 +685,10 @@ int crypto4xx_build_pd(struct crypto_asy const unsigned int datalen, const __le32 *iv, const u32 iv_len, const struct dynamic_sa_ctl *req_sa, @@ -246,7 +246,7 @@ Signed-off-by: Herbert Xu struct crypto4xx_device *dev = ctx->dev; struct dynamic_sa_ctl *sa; struct ce_gd *gd; -@@ -636,18 +706,25 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -632,18 +702,25 @@ int crypto4xx_build_pd(struct crypto_asy unsigned int nbytes = datalen; size_t offset_to_sr_ptr; u32 gd_idx = 0; @@ -279,7 +279,7 @@ Signed-off-by: Herbert Xu if (sg_is_last(dst)) { num_sd = 0; } else { -@@ -733,6 +810,7 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -729,6 +806,7 @@ int crypto4xx_build_pd(struct crypto_asy sa = pd_uinfo->sa_va; memcpy(sa, req_sa, sa_len * 4); @@ -287,7 +287,7 @@ Signed-off-by: Herbert Xu offset_to_sr_ptr = get_dynamic_sa_offset_state_ptr_field(sa); *(u32 *)((unsigned long)sa + offset_to_sr_ptr) = pd_uinfo->sr_pa; -@@ -839,7 +917,7 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -835,7 +913,7 @@ int crypto4xx_build_pd(struct crypto_asy ((crypto_tfm_alg_type(req->tfm) == CRYPTO_ALG_TYPE_AHASH) | (crypto_tfm_alg_type(req->tfm) == CRYPTO_ALG_TYPE_AEAD) ? PD_CTL_HASH_FINAL : 0); @@ -296,7 +296,7 @@ Signed-off-by: Herbert Xu pd_uinfo->state = PD_ENTRY_INUSE | (is_busy ? PD_ENTRY_BUSY : 0); wmb(); -@@ -852,40 +930,68 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -848,40 +926,68 @@ int crypto4xx_build_pd(struct crypto_asy /** * Algorithm Registration Functions */ @@ -385,7 +385,7 @@ Signed-off-by: Herbert Xu { struct crypto4xx_alg *alg; int i; -@@ -900,6 +1006,10 @@ int crypto4xx_register_alg(struct crypto +@@ -896,6 +1002,10 @@ int crypto4xx_register_alg(struct crypto alg->dev = sec_dev; switch (alg->alg.type) { @@ -396,7 +396,7 @@ Signed-off-by: Herbert Xu case CRYPTO_ALG_TYPE_AHASH: rc = crypto_register_ahash(&alg->alg.u.hash); break; -@@ -929,6 +1039,10 @@ static void crypto4xx_unregister_alg(str +@@ -925,6 +1035,10 @@ static void crypto4xx_unregister_alg(str crypto_unregister_ahash(&alg->alg.u.hash); break; @@ -407,7 +407,7 @@ Signed-off-by: Herbert Xu default: crypto_unregister_alg(&alg->alg.u.cipher); } -@@ -982,7 +1096,7 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -978,7 +1092,7 @@ static irqreturn_t crypto4xx_ce_interrup /** * Supported Crypto Algorithms */ @@ -416,7 +416,7 @@ Signed-off-by: Herbert Xu /* Crypto AES modes */ { .type = CRYPTO_ALG_TYPE_ABLKCIPHER, .u.cipher = { .cra_name = "cbc(aes)", -@@ -994,8 +1108,8 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -990,8 +1104,8 @@ struct crypto4xx_alg_common crypto4xx_al .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_type = &crypto_ablkcipher_type, @@ -427,7 +427,7 @@ Signed-off-by: Herbert Xu .cra_module = THIS_MODULE, .cra_u = { .ablkcipher = { -@@ -1018,8 +1132,8 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1014,8 +1128,8 @@ struct crypto4xx_alg_common crypto4xx_al .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_type = &crypto_ablkcipher_type, @@ -438,7 +438,7 @@ Signed-off-by: Herbert Xu .cra_module = THIS_MODULE, .cra_u = { .ablkcipher = { -@@ -1042,8 +1156,8 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1038,8 +1152,8 @@ struct crypto4xx_alg_common crypto4xx_al .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_type = &crypto_ablkcipher_type, @@ -449,7 +449,7 @@ Signed-off-by: Herbert Xu .cra_module = THIS_MODULE, .cra_u = { .ablkcipher = { -@@ -1068,8 +1182,8 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1064,8 +1178,8 @@ struct crypto4xx_alg_common crypto4xx_al .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_type = &crypto_ablkcipher_type, @@ -460,7 +460,7 @@ Signed-off-by: Herbert Xu .cra_module = THIS_MODULE, .cra_u = { .ablkcipher = { -@@ -1091,8 +1205,8 @@ struct crypto4xx_alg_common crypto4xx_al +@@ -1087,8 +1201,8 @@ struct crypto4xx_alg_common crypto4xx_al .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_type = &crypto_ablkcipher_type, @@ -471,7 +471,7 @@ Signed-off-by: Herbert Xu .cra_module = THIS_MODULE, .cra_u = { .ablkcipher = { -@@ -1158,6 +1272,7 @@ static int crypto4xx_probe(struct platfo +@@ -1154,6 +1268,7 @@ static int crypto4xx_probe(struct platfo core_dev->device = dev; spin_lock_init(&core_dev->lock); INIT_LIST_HEAD(&core_dev->dev->alg_list); diff --git a/target/linux/apm821xx/patches-4.14/020-0024-crypto-crypto4xx-add-aes-ccm-support.patch b/target/linux/apm821xx/patches-4.14/020-0024-crypto-crypto4xx-add-aes-ccm-support.patch index 8f78f51cd8..c3d4a07a80 100644 --- a/target/linux/apm821xx/patches-4.14/020-0024-crypto-crypto4xx-add-aes-ccm-support.patch +++ b/target/linux/apm821xx/patches-4.14/020-0024-crypto-crypto4xx-add-aes-ccm-support.patch @@ -209,7 +209,7 @@ Signed-off-by: Herbert Xu */ --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1219,6 +1219,29 @@ static struct crypto4xx_alg_common crypt +@@ -1215,6 +1215,29 @@ static struct crypto4xx_alg_common crypt } } } }, diff --git a/target/linux/apm821xx/patches-4.14/020-0025-crypto-crypto4xx-add-aes-gcm-support.patch b/target/linux/apm821xx/patches-4.14/020-0025-crypto-crypto4xx-add-aes-gcm-support.patch index 888f7b68d0..d56f838262 100644 --- a/target/linux/apm821xx/patches-4.14/020-0025-crypto-crypto4xx-add-aes-gcm-support.patch +++ b/target/linux/apm821xx/patches-4.14/020-0025-crypto-crypto4xx-add-aes-gcm-support.patch @@ -178,7 +178,7 @@ Signed-off-by: Herbert Xu #include #include #include -@@ -1236,6 +1237,27 @@ static struct crypto4xx_alg_common crypt +@@ -1232,6 +1233,27 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK | diff --git a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch index 1b13c345cc..9c3b9fe705 100644 --- a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch +++ b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1084,9 +1084,6 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1080,9 +1080,6 @@ static irqreturn_t crypto4xx_ce_interrup struct device *dev = (struct device *)data; struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev); @@ -27,7 +27,7 @@ Signed-off-by: Christian Lamparter writel(PPC4XX_INTERRUPT_CLR, core_dev->dev->ce_base + CRYPTO4XX_INT_CLR); tasklet_schedule(&core_dev->tasklet); -@@ -1334,13 +1331,6 @@ static int crypto4xx_probe(struct platfo +@@ -1330,13 +1327,6 @@ static int crypto4xx_probe(struct platfo tasklet_init(&core_dev->tasklet, crypto4xx_bh_tasklet_cb, (unsigned long) dev); @@ -41,7 +41,7 @@ Signed-off-by: Christian Lamparter core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0); if (!core_dev->dev->ce_base) { dev_err(dev, "failed to of_iomap\n"); -@@ -1348,6 +1338,13 @@ static int crypto4xx_probe(struct platfo +@@ -1344,6 +1334,13 @@ static int crypto4xx_probe(struct platfo goto err_iomap; } @@ -55,7 +55,7 @@ Signed-off-by: Christian Lamparter /* need to setup pdr, rdr, gdr and sdr before this */ crypto4xx_hw_init(core_dev->dev); -@@ -1361,11 +1358,11 @@ static int crypto4xx_probe(struct platfo +@@ -1357,11 +1354,11 @@ static int crypto4xx_probe(struct platfo return 0; err_start_dev: diff --git a/target/linux/apm821xx/patches-4.14/021-0002-crypto-crypto4xx-support-Revision-B-parts.patch b/target/linux/apm821xx/patches-4.14/021-0002-crypto-crypto4xx-support-Revision-B-parts.patch index 453602a5aa..1aaf7920b8 100644 --- a/target/linux/apm821xx/patches-4.14/021-0002-crypto-crypto4xx-support-Revision-B-parts.patch +++ b/target/linux/apm821xx/patches-4.14/021-0002-crypto-crypto4xx-support-Revision-B-parts.patch @@ -35,7 +35,7 @@ Signed-off-by: Christian Lamparter } int crypto4xx_alloc_sa(struct crypto4xx_ctx *ctx, u32 size) -@@ -1079,18 +1086,29 @@ static void crypto4xx_bh_tasklet_cb(unsi +@@ -1075,18 +1082,29 @@ static void crypto4xx_bh_tasklet_cb(unsi /** * Top Half of isr. */ @@ -68,7 +68,7 @@ Signed-off-by: Christian Lamparter /** * Supported Crypto Algorithms */ -@@ -1272,6 +1290,8 @@ static int crypto4xx_probe(struct platfo +@@ -1268,6 +1286,8 @@ static int crypto4xx_probe(struct platfo struct resource res; struct device *dev = &ofdev->dev; struct crypto4xx_core_device *core_dev; @@ -77,7 +77,7 @@ Signed-off-by: Christian Lamparter rc = of_address_to_resource(ofdev->dev.of_node, 0, &res); if (rc) -@@ -1288,6 +1308,7 @@ static int crypto4xx_probe(struct platfo +@@ -1284,6 +1304,7 @@ static int crypto4xx_probe(struct platfo mfdcri(SDR0, PPC405EX_SDR0_SRST) | PPC405EX_CE_RESET); mtdcri(SDR0, PPC405EX_SDR0_SRST, mfdcri(SDR0, PPC405EX_SDR0_SRST) & ~PPC405EX_CE_RESET); @@ -85,7 +85,7 @@ Signed-off-by: Christian Lamparter } else if (of_find_compatible_node(NULL, NULL, "amcc,ppc460sx-crypto")) { mtdcri(SDR0, PPC460SX_SDR0_SRST, -@@ -1310,7 +1331,22 @@ static int crypto4xx_probe(struct platfo +@@ -1306,7 +1327,22 @@ static int crypto4xx_probe(struct platfo if (!core_dev->dev) goto err_alloc_dev; @@ -108,7 +108,7 @@ Signed-off-by: Christian Lamparter core_dev->device = dev; spin_lock_init(&core_dev->lock); INIT_LIST_HEAD(&core_dev->dev->alg_list); -@@ -1340,7 +1376,9 @@ static int crypto4xx_probe(struct platfo +@@ -1336,7 +1372,9 @@ static int crypto4xx_probe(struct platfo /* Register for Crypto isr, Crypto Engine IRQ */ core_dev->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); diff --git a/target/linux/apm821xx/patches-4.14/021-0003-crypto-crypto4xx-fix-missing-irq-devname.patch b/target/linux/apm821xx/patches-4.14/021-0003-crypto-crypto4xx-fix-missing-irq-devname.patch index ae82acc747..0b1652820b 100644 --- a/target/linux/apm821xx/patches-4.14/021-0003-crypto-crypto4xx-fix-missing-irq-devname.patch +++ b/target/linux/apm821xx/patches-4.14/021-0003-crypto-crypto4xx-fix-missing-irq-devname.patch @@ -16,7 +16,7 @@ Signed-off-by: Christian Lamparter --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1379,7 +1379,7 @@ static int crypto4xx_probe(struct platfo +@@ -1375,7 +1375,7 @@ static int crypto4xx_probe(struct platfo rc = request_irq(core_dev->irq, is_revb ? crypto4xx_ce_interrupt_handler_revb : crypto4xx_ce_interrupt_handler, 0, diff --git a/target/linux/apm821xx/patches-4.14/021-0004-crypto-crypto4xx-kill-MODULE_NAME.patch b/target/linux/apm821xx/patches-4.14/021-0004-crypto-crypto4xx-kill-MODULE_NAME.patch index d5e1a056ea..3dd35ba975 100644 --- a/target/linux/apm821xx/patches-4.14/021-0004-crypto-crypto4xx-kill-MODULE_NAME.patch +++ b/target/linux/apm821xx/patches-4.14/021-0004-crypto-crypto4xx-kill-MODULE_NAME.patch @@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1441,7 +1441,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match) +@@ -1437,7 +1437,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match) static struct platform_driver crypto4xx_driver = { .driver = { diff --git a/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch b/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch index 5470602bb1..2107f2dc59 100644 --- a/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch +++ b/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch @@ -62,7 +62,7 @@ Signed-off-by: Christian Lamparter SA_CIPHER_ALG_AES, --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -586,15 +586,14 @@ static void crypto4xx_aead_done(struct c +@@ -582,15 +582,14 @@ static void crypto4xx_aead_done(struct c struct pd_uinfo *pd_uinfo, struct ce_pd *pd) { @@ -83,7 +83,7 @@ Signed-off-by: Christian Lamparter if (pd_uinfo->using_sd) { crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo, pd->pd_ctl_len.bf.pkt_len, -@@ -606,38 +605,39 @@ static void crypto4xx_aead_done(struct c +@@ -602,38 +601,39 @@ static void crypto4xx_aead_done(struct c if (pd_uinfo->sa_va->sa_command_0.bf.dir == DIR_OUTBOUND) { /* append icv at the end */ diff --git a/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch b/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch index 74d5ab2f60..4872f44d16 100644 --- a/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch +++ b/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch @@ -71,7 +71,7 @@ Signed-off-by: Herbert Xu /** --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -589,7 +589,7 @@ static void crypto4xx_aead_done(struct c +@@ -585,7 +585,7 @@ static void crypto4xx_aead_done(struct c struct scatterlist *dst = pd_uinfo->dest_va; size_t cp_len = crypto_aead_authsize( crypto_aead_reqtfm(aead_req)); @@ -80,7 +80,7 @@ Signed-off-by: Herbert Xu int err = 0; if (pd_uinfo->using_sd) { -@@ -604,7 +604,7 @@ static void crypto4xx_aead_done(struct c +@@ -600,7 +600,7 @@ static void crypto4xx_aead_done(struct c if (pd_uinfo->sa_va->sa_command_0.bf.dir == DIR_OUTBOUND) { /* append icv at the end */ crypto4xx_memcpy_from_le32(icv, pd_uinfo->sr_va->save_digest, @@ -89,7 +89,7 @@ Signed-off-by: Herbert Xu scatterwalk_map_and_copy(icv, dst, aead_req->cryptlen, cp_len, 1); -@@ -614,7 +614,7 @@ static void crypto4xx_aead_done(struct c +@@ -610,7 +610,7 @@ static void crypto4xx_aead_done(struct c aead_req->assoclen + aead_req->cryptlen - cp_len, cp_len, 0); @@ -98,7 +98,7 @@ Signed-off-by: Herbert Xu if (crypto_memneq(icv, pd_uinfo->sr_va->save_digest, cp_len)) err = -EBADMSG; -@@ -1131,8 +1131,8 @@ static struct crypto4xx_alg_common crypt +@@ -1127,8 +1127,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cbc, @@ -109,7 +109,7 @@ Signed-off-by: Herbert Xu } } }}, -@@ -1155,8 +1155,8 @@ static struct crypto4xx_alg_common crypt +@@ -1151,8 +1151,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cfb, @@ -120,7 +120,7 @@ Signed-off-by: Herbert Xu } } } }, -@@ -1204,8 +1204,8 @@ static struct crypto4xx_alg_common crypt +@@ -1200,8 +1200,8 @@ static struct crypto4xx_alg_common crypt .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, .setkey = crypto4xx_setkey_aes_ecb, @@ -131,7 +131,7 @@ Signed-off-by: Herbert Xu } } } }, -@@ -1228,8 +1228,8 @@ static struct crypto4xx_alg_common crypt +@@ -1224,8 +1224,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_ofb, diff --git a/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch b/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch index 64c07d7127..439f78ae5c 100644 --- a/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch +++ b/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch @@ -196,7 +196,7 @@ Signed-off-by: Herbert Xu #include #include #include "crypto4xx_reg_def.h" -@@ -526,21 +527,19 @@ static void crypto4xx_ret_sg_desc(struct +@@ -522,21 +523,19 @@ static void crypto4xx_ret_sg_desc(struct } } @@ -223,7 +223,7 @@ Signed-off-by: Herbert Xu } else { dst = pd_uinfo->dest_va; addr = dma_map_page(dev->core_dev->device, sg_page(dst), -@@ -558,8 +557,8 @@ static void crypto4xx_ablkcipher_done(st +@@ -554,8 +553,8 @@ static void crypto4xx_ablkcipher_done(st crypto4xx_ret_sg_desc(dev, pd_uinfo); if (pd_uinfo->state & PD_ENTRY_BUSY) @@ -234,7 +234,7 @@ Signed-off-by: Herbert Xu } static void crypto4xx_ahash_done(struct crypto4xx_device *dev, -@@ -650,8 +649,8 @@ static void crypto4xx_pd_done(struct cry +@@ -646,8 +645,8 @@ static void crypto4xx_pd_done(struct cry struct pd_uinfo *pd_uinfo = &dev->pdr_uinfo[idx]; switch (crypto_tfm_alg_type(pd_uinfo->async_req->tfm)) { @@ -245,7 +245,7 @@ Signed-off-by: Herbert Xu break; case CRYPTO_ALG_TYPE_AEAD: crypto4xx_aead_done(dev, pd_uinfo, pd); -@@ -945,15 +944,14 @@ static void crypto4xx_ctx_init(struct cr +@@ -941,15 +940,14 @@ static void crypto4xx_ctx_init(struct cr ctx->sa_len = 0; } @@ -264,7 +264,7 @@ Signed-off-by: Herbert Xu return 0; } -@@ -962,9 +960,11 @@ static void crypto4xx_common_exit(struct +@@ -958,9 +956,11 @@ static void crypto4xx_common_exit(struct crypto4xx_free_sa(ctx); } @@ -278,7 +278,7 @@ Signed-off-by: Herbert Xu } static int crypto4xx_aead_init(struct crypto_aead *tfm) -@@ -1021,7 +1021,7 @@ static int crypto4xx_register_alg(struct +@@ -1017,7 +1017,7 @@ static int crypto4xx_register_alg(struct break; default: @@ -287,7 +287,7 @@ Signed-off-by: Herbert Xu break; } -@@ -1050,7 +1050,7 @@ static void crypto4xx_unregister_alg(str +@@ -1046,7 +1046,7 @@ static void crypto4xx_unregister_alg(str break; default: @@ -296,7 +296,7 @@ Signed-off-by: Herbert Xu } kfree(alg); } -@@ -1112,126 +1112,109 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1108,126 +1108,109 @@ static irqreturn_t crypto4xx_ce_interrup */ static struct crypto4xx_alg_common crypto4xx_alg[] = { /* Crypto AES modes */ diff --git a/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch b/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch index c916d5a212..7f4220feb3 100644 --- a/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch +++ b/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch @@ -160,7 +160,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -950,6 +950,19 @@ static int crypto4xx_sk_init(struct cryp +@@ -946,6 +946,19 @@ static int crypto4xx_sk_init(struct cryp struct crypto4xx_alg *amcc_alg; struct crypto4xx_ctx *ctx = crypto_skcipher_ctx(sk); @@ -180,7 +180,7 @@ Signed-off-by: Herbert Xu amcc_alg = container_of(alg, struct crypto4xx_alg, alg.u.cipher); crypto4xx_ctx_init(amcc_alg, ctx); return 0; -@@ -965,6 +978,8 @@ static void crypto4xx_sk_exit(struct cry +@@ -961,6 +974,8 @@ static void crypto4xx_sk_exit(struct cry struct crypto4xx_ctx *ctx = crypto_skcipher_ctx(sk); crypto4xx_common_exit(ctx); @@ -189,7 +189,7 @@ Signed-off-by: Herbert Xu } static int crypto4xx_aead_init(struct crypto_aead *tfm) -@@ -1154,6 +1169,28 @@ static struct crypto4xx_alg_common crypt +@@ -1150,6 +1165,28 @@ static struct crypto4xx_alg_common crypt .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, diff --git a/target/linux/apm821xx/patches-4.14/022-0008-crypto-crypto4xx-put-temporary-dst-sg-into-request-c.patch b/target/linux/apm821xx/patches-4.14/022-0008-crypto-crypto4xx-put-temporary-dst-sg-into-request-c.patch index b83cacc98f..30ff1a3d93 100644 --- a/target/linux/apm821xx/patches-4.14/022-0008-crypto-crypto4xx-put-temporary-dst-sg-into-request-c.patch +++ b/target/linux/apm821xx/patches-4.14/022-0008-crypto-crypto4xx-put-temporary-dst-sg-into-request-c.patch @@ -107,7 +107,7 @@ Signed-off-by: Herbert Xu /** --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -695,9 +695,9 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -691,9 +691,9 @@ int crypto4xx_build_pd(struct crypto_asy const __le32 *iv, const u32 iv_len, const struct dynamic_sa_ctl *req_sa, const unsigned int sa_len, @@ -119,7 +119,7 @@ Signed-off-by: Herbert Xu struct crypto4xx_device *dev = ctx->dev; struct dynamic_sa_ctl *sa; struct ce_gd *gd; -@@ -996,9 +996,9 @@ static int crypto4xx_aead_init(struct cr +@@ -992,9 +992,9 @@ static int crypto4xx_aead_init(struct cr amcc_alg = container_of(alg, struct crypto4xx_alg, alg.u.aead); crypto4xx_ctx_init(amcc_alg, ctx); diff --git a/target/linux/apm821xx/patches-4.14/023-0002-crypto-skcipher-remove-useless-setting-of-type-flags.patch b/target/linux/apm821xx/patches-4.14/023-0002-crypto-skcipher-remove-useless-setting-of-type-flags.patch index 75f0db2391..25542c80bf 100644 --- a/target/linux/apm821xx/patches-4.14/023-0002-crypto-skcipher-remove-useless-setting-of-type-flags.patch +++ b/target/linux/apm821xx/patches-4.14/023-0002-crypto-skcipher-remove-useless-setting-of-type-flags.patch @@ -22,7 +22,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1132,8 +1132,7 @@ static struct crypto4xx_alg_common crypt +@@ -1128,8 +1128,7 @@ static struct crypto4xx_alg_common crypt .cra_name = "cbc(aes)", .cra_driver_name = "cbc-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, @@ -32,7 +32,7 @@ Signed-off-by: Herbert Xu CRYPTO_ALG_KERN_DRIVER_ONLY, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), -@@ -1153,8 +1152,7 @@ static struct crypto4xx_alg_common crypt +@@ -1149,8 +1148,7 @@ static struct crypto4xx_alg_common crypt .cra_name = "cfb(aes)", .cra_driver_name = "cfb-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, @@ -42,7 +42,7 @@ Signed-off-by: Herbert Xu CRYPTO_ALG_KERN_DRIVER_ONLY, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), -@@ -1174,8 +1172,7 @@ static struct crypto4xx_alg_common crypt +@@ -1170,8 +1168,7 @@ static struct crypto4xx_alg_common crypt .cra_name = "ctr(aes)", .cra_driver_name = "ctr-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, @@ -52,7 +52,7 @@ Signed-off-by: Herbert Xu CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, .cra_blocksize = AES_BLOCK_SIZE, -@@ -1196,8 +1193,7 @@ static struct crypto4xx_alg_common crypt +@@ -1192,8 +1189,7 @@ static struct crypto4xx_alg_common crypt .cra_name = "rfc3686(ctr(aes))", .cra_driver_name = "rfc3686-ctr-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, @@ -62,7 +62,7 @@ Signed-off-by: Herbert Xu CRYPTO_ALG_KERN_DRIVER_ONLY, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), -@@ -1217,8 +1213,7 @@ static struct crypto4xx_alg_common crypt +@@ -1213,8 +1209,7 @@ static struct crypto4xx_alg_common crypt .cra_name = "ecb(aes)", .cra_driver_name = "ecb-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, @@ -72,7 +72,7 @@ Signed-off-by: Herbert Xu CRYPTO_ALG_KERN_DRIVER_ONLY, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto4xx_ctx), -@@ -1237,8 +1232,7 @@ static struct crypto4xx_alg_common crypt +@@ -1233,8 +1228,7 @@ static struct crypto4xx_alg_common crypt .cra_name = "ofb(aes)", .cra_driver_name = "ofb-aes-ppc4xx", .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, diff --git a/target/linux/apm821xx/patches-4.14/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch b/target/linux/apm821xx/patches-4.14/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch index 635ab0037e..d1849aefbb 100644 --- a/target/linux/apm821xx/patches-4.14/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch +++ b/target/linux/apm821xx/patches-4.14/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch @@ -19,7 +19,7 @@ Signed-off-by: Michael Ellerman --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -596,7 +596,7 @@ static void crypto4xx_aead_done(struct c +@@ -592,7 +592,7 @@ static void crypto4xx_aead_done(struct c pd->pd_ctl_len.bf.pkt_len, dst); } else { diff --git a/target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch b/target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch index b20049c83e..b06a8f9893 100644 --- a/target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch +++ b/target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch @@ -31,7 +31,7 @@ Signed-off-by: Herbert Xu #include #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" -@@ -1035,6 +1037,10 @@ static int crypto4xx_register_alg(struct +@@ -1031,6 +1033,10 @@ static int crypto4xx_register_alg(struct rc = crypto_register_ahash(&alg->alg.u.hash); break; @@ -42,7 +42,7 @@ Signed-off-by: Herbert Xu default: rc = crypto_register_skcipher(&alg->alg.u.cipher); break; -@@ -1064,6 +1070,10 @@ static void crypto4xx_unregister_alg(str +@@ -1060,6 +1066,10 @@ static void crypto4xx_unregister_alg(str crypto_unregister_aead(&alg->alg.u.aead); break; @@ -53,7 +53,7 @@ Signed-off-by: Herbert Xu default: crypto_unregister_skcipher(&alg->alg.u.cipher); } -@@ -1122,6 +1132,69 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1118,6 +1128,69 @@ static irqreturn_t crypto4xx_ce_interrup PPC4XX_TMO_ERR_INT); } @@ -123,7 +123,7 @@ Signed-off-by: Herbert Xu /** * Supported Crypto Algorithms */ -@@ -1291,6 +1364,18 @@ static struct crypto4xx_alg_common crypt +@@ -1287,6 +1360,18 @@ static struct crypto4xx_alg_common crypt .cra_module = THIS_MODULE, }, } }, @@ -142,7 +142,7 @@ Signed-off-by: Herbert Xu }; /** -@@ -1360,6 +1445,7 @@ static int crypto4xx_probe(struct platfo +@@ -1356,6 +1441,7 @@ static int crypto4xx_probe(struct platfo core_dev->dev->core_dev = core_dev; core_dev->dev->is_revb = is_revb; core_dev->device = dev; @@ -150,7 +150,7 @@ Signed-off-by: Herbert Xu spin_lock_init(&core_dev->lock); INIT_LIST_HEAD(&core_dev->dev->alg_list); ratelimit_default_init(&core_dev->dev->aead_ratelimit); -@@ -1439,6 +1525,7 @@ static int crypto4xx_remove(struct platf +@@ -1435,6 +1521,7 @@ static int crypto4xx_remove(struct platf tasklet_kill(&core_dev->tasklet); /* Un-register with Linux CryptoAPI */ crypto4xx_unregister_alg(core_dev->dev); diff --git a/target/linux/apm821xx/patches-4.14/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch b/target/linux/apm821xx/patches-4.14/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch index eebcd0067a..9c78fd0603 100644 --- a/target/linux/apm821xx/patches-4.14/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch +++ b/target/linux/apm821xx/patches-4.14/023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch @@ -40,7 +40,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1248,7 +1248,7 @@ static struct crypto4xx_alg_common crypt +@@ -1244,7 +1244,7 @@ static struct crypto4xx_alg_common crypt .cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, @@ -49,7 +49,7 @@ Signed-off-by: Herbert Xu .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_module = THIS_MODULE, }, -@@ -1268,7 +1268,7 @@ static struct crypto4xx_alg_common crypt +@@ -1264,7 +1264,7 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, diff --git a/target/linux/apm821xx/patches-4.14/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch b/target/linux/apm821xx/patches-4.14/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch index 046fa6702a..ac280b90b3 100644 --- a/target/linux/apm821xx/patches-4.14/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch +++ b/target/linux/apm821xx/patches-4.14/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch @@ -24,7 +24,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1227,7 +1227,7 @@ static struct crypto4xx_alg_common crypt +@@ -1223,7 +1223,7 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, @@ -33,7 +33,7 @@ Signed-off-by: Herbert Xu .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_module = THIS_MODULE, }, -@@ -1307,7 +1307,7 @@ static struct crypto4xx_alg_common crypt +@@ -1303,7 +1303,7 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, diff --git a/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch b/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch index 2bb4741efd..324a7406b0 100644 --- a/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch +++ b/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch @@ -107,7 +107,7 @@ Signed-off-by: Herbert Xu static int crypto4xx_sk_setup_fallback(struct crypto4xx_ctx *ctx, --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1215,8 +1215,8 @@ static struct crypto4xx_alg_common crypt +@@ -1211,8 +1211,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cbc, @@ -118,7 +118,7 @@ Signed-off-by: Herbert Xu .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, -@@ -1235,8 +1235,8 @@ static struct crypto4xx_alg_common crypt +@@ -1231,8 +1231,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cfb, @@ -129,7 +129,7 @@ Signed-off-by: Herbert Xu .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, -@@ -1295,8 +1295,8 @@ static struct crypto4xx_alg_common crypt +@@ -1291,8 +1291,8 @@ static struct crypto4xx_alg_common crypt .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, .setkey = crypto4xx_setkey_aes_ecb, @@ -140,7 +140,7 @@ Signed-off-by: Herbert Xu .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, -@@ -1315,8 +1315,8 @@ static struct crypto4xx_alg_common crypt +@@ -1311,8 +1311,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_ofb, diff --git a/target/linux/apm821xx/patches-4.14/302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch b/target/linux/apm821xx/patches-4.14/302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch deleted file mode 100644 index b7e282cbb9..0000000000 --- a/target/linux/apm821xx/patches-4.14/302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 2aad36357bbc73bc88ebab35a59a70a8f4ae6ecb Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Wed, 31 Oct 2018 22:27:27 +0100 -Subject: [PATCH 2/2] dmaengine: dw: implement per-channel protection control - setting - -This patch adds a new device-tree property that allows to -specify the protection control bits for each DMA channel -individually. - -Setting the "correct" bits can have a huge impact on the -PPC460EX and APM82181 that use this DMA engine in combination -with a DesignWare' SATA-II core (sata_dwc_460ex driver). - -In the OpenWrt Forum, the user takimata reported that: -|It seems your patch unleashed the full power of the SATA port. -|Where I was previously hitting a really hard limit at around -|82 MB/s for reading and 27 MB/s for writing, I am now getting this: -| -|root@OpenWrt:/mnt# time dd if=/dev/zero of=tempfile bs=1M count=1024 -|1024+0 records in -|1024+0 records out -|real 0m 13.65s -|user 0m 0.01s -|sys 0m 11.89s -| -|root@OpenWrt:/mnt# time dd if=tempfile of=/dev/null bs=1M count=1024 -|1024+0 records in -|1024+0 records out -|real 0m 8.41s -|user 0m 0.01s -|sys 0m 4.70s -| -|This means: 121 MB/s reading and 75 MB/s writing! -| -|The drive is a WD Green WD10EARX taken from an older MBL Single. -|I repeated the test a few times with even larger files to rule out -|any caching, I'm still seeing the same great performance. OpenWrt is -|now completely on par with the original MBL firmware's performance. - -Another user And.short reported: -|I can report that your fix worked! Boots up fine with two -|drives even with more partitions, and no more reboot on -|concurrent disk access! - -A closer look into the sata_dwc_460ex code revealed that -the driver did initally set the correct protection control -bits. However, this feature was lost when the sata_dwc_460ex -driver was converted to the generic DMA driver framework. - -BugLink: https://forum.openwrt.org/t/wd-mybook-live-duo-two-disks/16195/55 -BugLink: https://forum.openwrt.org/t/wd-mybook-live-duo-two-disks/16195/50 -Fixes: 8b3444852a2b ("sata_dwc_460ex: move to generic DMA driver") -Signed-off-by: Christian Lamparter ---- - drivers/dma/dw/core.c | 2 ++ - drivers/dma/dw/platform.c | 12 +++++++++--- - drivers/dma/dw/regs.h | 4 ++++ - include/linux/platform_data/dma-dw.h | 6 ++++++ - 4 files changed, 21 insertions(+), 3 deletions(-) - ---- a/drivers/dma/dw/core.c -+++ b/drivers/dma/dw/core.c -@@ -160,12 +160,14 @@ static void dwc_initialize_chan_idma32(s - - static void dwc_initialize_chan_dw(struct dw_dma_chan *dwc) - { -+ struct dw_dma *dw = to_dw_dma(dwc->chan.device); - u32 cfghi = DWC_CFGH_FIFO_MODE; - u32 cfglo = DWC_CFGL_CH_PRIOR(dwc->priority); - bool hs_polarity = dwc->dws.hs_polarity; - - cfghi |= DWC_CFGH_DST_PER(dwc->dws.dst_id); - cfghi |= DWC_CFGH_SRC_PER(dwc->dws.src_id); -+ cfghi |= DWC_CFGH_PROTCTL(dw->pdata->protctl); - - /* Set polarity of handshake interface */ - cfglo |= hs_polarity ? DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL : 0; ---- a/drivers/dma/dw/platform.c -+++ b/drivers/dma/dw/platform.c -@@ -162,6 +162,12 @@ dw_dma_parse_dt(struct platform_device * - pdata->multi_block[tmp] = 1; - } - -+ if (!of_property_read_u32(np, "snps,dma-protection-control", &tmp)) { -+ if (tmp > CHAN_PROTCTL_MASK) -+ return NULL; -+ pdata->protctl = tmp; -+ } -+ - return pdata; - } - #else ---- a/drivers/dma/dw/regs.h -+++ b/drivers/dma/dw/regs.h -@@ -200,6 +200,10 @@ enum dw_dma_msize { - #define DWC_CFGH_FCMODE (1 << 0) - #define DWC_CFGH_FIFO_MODE (1 << 1) - #define DWC_CFGH_PROTCTL(x) ((x) << 2) -+#define DWC_CFGH_PROTCTL_DATA (0 << 2) /* data access - always set */ -+#define DWC_CFGH_PROTCTL_PRIV (1 << 2) /* privileged -> AHB HPROT[1] */ -+#define DWC_CFGH_PROTCTL_BUFFER (2 << 2) /* bufferable -> AHB HPROT[2] */ -+#define DWC_CFGH_PROTCTL_CACHE (4 << 2) /* cacheable -> AHB HPROT[3] */ - #define DWC_CFGH_DS_UPD_EN (1 << 5) - #define DWC_CFGH_SS_UPD_EN (1 << 6) - #define DWC_CFGH_SRC_PER(x) ((x) << 7) ---- a/include/linux/platform_data/dma-dw.h -+++ b/include/linux/platform_data/dma-dw.h -@@ -49,6 +49,7 @@ struct dw_dma_slave { - * @data_width: Maximum data width supported by hardware per AHB master - * (in bytes, power of 2) - * @multi_block: Multi block transfers supported by hardware per channel. -+ * @protctl: Protection control signals setting per channel. - */ - struct dw_dma_platform_data { - unsigned int nr_channels; -@@ -65,6 +66,11 @@ struct dw_dma_platform_data { - unsigned char nr_masters; - unsigned char data_width[DW_DMA_MAX_NR_MASTERS]; - unsigned char multi_block[DW_DMA_MAX_NR_CHANNELS]; -+#define CHAN_PROTCTL_PRIVILEGED BIT(0) -+#define CHAN_PROTCTL_BUFFERABLE BIT(1) -+#define CHAN_PROTCTL_CACHEABLE BIT(2) -+#define CHAN_PROTCTL_MASK GENMASK(2, 0) -+ unsigned char protctl; - }; - - #endif /* _PLATFORM_DATA_DMA_DW_H */ diff --git a/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch b/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch index 866dc5e86e..1fdd05a4d9 100644 --- a/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch +++ b/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch @@ -10,7 +10,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1152,6 +1152,9 @@ config MIPS_MSC +@@ -1153,6 +1153,9 @@ config MIPS_MSC config MIPS_NILE4 bool diff --git a/target/linux/generic/hack-4.14/204-module_strip.patch b/target/linux/generic/hack-4.14/204-module_strip.patch index d847adf054..81a672b0fd 100644 --- a/target/linux/generic/hack-4.14/204-module_strip.patch +++ b/target/linux/generic/hack-4.14/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3020,9 +3020,11 @@ static struct module *setup_load_info(st +@@ -3022,9 +3022,11 @@ static struct module *setup_load_info(st static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3043,6 +3045,7 @@ static int check_modinfo(struct module * +@@ -3045,6 +3047,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1984,7 +1984,9 @@ static void read_symbols(char *modname) +@@ -1996,7 +1996,9 @@ static void read_symbols(char *modname) symname = remove_dot(info.strtab + sym->st_name); handle_modversions(mod, &info, sym, symname); @@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau } if (!is_vmlinux(modname) || (is_vmlinux(modname) && vmlinux_section_warnings)) -@@ -2145,8 +2147,10 @@ static void add_header(struct buffer *b, +@@ -2157,8 +2159,10 @@ static void add_header(struct buffer *b, buf_printf(b, "#include \n"); buf_printf(b, "#include \n"); buf_printf(b, "\n"); @@ -158,7 +158,7 @@ Signed-off-by: Felix Fietkau buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); -@@ -2163,8 +2167,10 @@ static void add_header(struct buffer *b, +@@ -2175,8 +2179,10 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -169,7 +169,7 @@ Signed-off-by: Felix Fietkau } /* Cannot check for assembler */ -@@ -2177,10 +2183,12 @@ static void add_retpoline(struct buffer +@@ -2189,10 +2195,12 @@ static void add_retpoline(struct buffer static void add_staging_flag(struct buffer *b, const char *name) { @@ -182,7 +182,7 @@ Signed-off-by: Felix Fietkau } /** -@@ -2279,11 +2287,13 @@ static void add_depends(struct buffer *b +@@ -2291,11 +2299,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau } static void write_if_changed(struct buffer *b, const char *fname) -@@ -2520,7 +2530,9 @@ int main(int argc, char **argv) +@@ -2532,7 +2542,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod, modules); diff --git a/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch index eb6011e813..9bcd2a4401 100644 --- a/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch +++ b/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1158,6 +1158,10 @@ config SYNC_R4K +@@ -1159,6 +1159,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index a776997faf..1c5e93d73b 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau } --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -1950,10 +1950,12 @@ void __init init_mm_internals(void) +@@ -1951,10 +1951,12 @@ void __init init_mm_internals(void) start_shepherd_timer(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch index 5384be15ca..71dff9b930 100644 --- a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch +++ b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch @@ -9,7 +9,7 @@ Acked-by: Rob Landley --- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1067,9 +1067,6 @@ config FW_ARC +@@ -1068,9 +1068,6 @@ config FW_ARC config ARCH_MAY_HAVE_PC_FDC bool @@ -19,7 +19,7 @@ Acked-by: Rob Landley config CEVT_BCM1480 bool -@@ -2967,6 +2964,18 @@ choice +@@ -2968,6 +2965,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice diff --git a/target/linux/generic/pending-4.14/304-mips_disable_fpu.patch b/target/linux/generic/pending-4.14/304-mips_disable_fpu.patch index 22e2e86206..0b5852dff8 100644 --- a/target/linux/generic/pending-4.14/304-mips_disable_fpu.patch +++ b/target/linux/generic/pending-4.14/304-mips_disable_fpu.patch @@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT +@@ -2892,6 +2892,20 @@ config MIPS_O32_FP64_SUPPORT If unsure, say N. diff --git a/target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch b/target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch index de2dd65b17..6f5f11350a 100644 --- a/target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch +++ b/target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau select HAVE_PCSPKR_PLATFORM select IRQ_MIPS_CPU select I8253 -@@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT +@@ -1129,6 +1131,9 @@ config DMA_NONCOHERENT bool select NEED_DMA_MAP_STATE @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau config NEED_DMA_MAP_STATE bool -@@ -1652,6 +1657,7 @@ config CPU_R10000 +@@ -1653,6 +1658,7 @@ config CPU_R10000 select CPU_SUPPORTS_64BIT_KERNEL select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_HUGEPAGES @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau help MIPS Technologies R10000-series processors. -@@ -1900,9 +1906,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 +@@ -1901,9 +1907,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 bool config SYS_HAS_CPU_MIPS32_R5 @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau bool config SYS_HAS_CPU_MIPS64_R1 -@@ -1912,6 +1920,7 @@ config SYS_HAS_CPU_MIPS64_R2 +@@ -1913,6 +1921,7 @@ config SYS_HAS_CPU_MIPS64_R2 bool config SYS_HAS_CPU_MIPS64_R6 diff --git a/target/linux/ipq806x/patches-4.14/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch b/target/linux/ipq806x/patches-4.14/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch index 1507686456..f57773ef48 100644 --- a/target/linux/ipq806x/patches-4.14/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch +++ b/target/linux/ipq806x/patches-4.14/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch @@ -171,9 +171,9 @@ Signed-off-by: Ajay Kishore +extern s32 qcom_scm_pinmux_read(u32 arg1); +extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2); #else - static inline - int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) -@@ -73,5 +75,7 @@ qcom_scm_set_remote_state(u32 state,u32 + + #include +@@ -76,5 +78,7 @@ qcom_scm_set_remote_state(u32 state,u32 static inline int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) { return -ENODEV; } static inline int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) { return -ENODEV; } static inline int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) { return -ENODEV; } diff --git a/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch b/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch index e0dbffe303..31c686d561 100644 --- a/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch @@ -336,7 +336,7 @@ Signed-off-by: Zhang Ying-22455 /* Get I2C clock */ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) { -@@ -1103,7 +1301,8 @@ static int i2c_imx_probe(struct platform +@@ -1104,7 +1302,8 @@ static int i2c_imx_probe(struct platform pdev->name, i2c_imx); if (ret) { dev_err(&pdev->dev, "can't claim irq %d\n", irq); @@ -346,7 +346,7 @@ Signed-off-by: Zhang Ying-22455 } /* Init queue */ -@@ -1150,25 +1349,31 @@ static int i2c_imx_probe(struct platform +@@ -1151,25 +1350,31 @@ static int i2c_imx_probe(struct platform pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index ab43bc49fc..3d8de1e516 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -382,7 +382,7 @@ Signed-off-by: Zhao Chenhui dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -1367,12 +1532,14 @@ static int dwc3_resume_common(struct dwc +@@ -1368,12 +1533,14 @@ static int dwc3_resume_common(struct dwc switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: @@ -1340,7 +1340,7 @@ Signed-off-by: Zhao Chenhui while (ep_ring->dequeue != td->last_trb) --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1607,13 +1607,38 @@ static int xhci_urb_dequeue(struct usb_h +@@ -1604,13 +1604,38 @@ static int xhci_urb_dequeue(struct usb_h ret = -ENOMEM; goto done; } From e115fa478fb3914db2f414d642254ff09f04bc09 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 18 Dec 2019 16:38:57 +0100 Subject: [PATCH 115/480] kernel: bump 4.19 to 4.19.90 Refreshed all patches. Remove upstreamed: - 010-dmaengine-dw-dmac-implement-dma-prot.patch - 950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch - 950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch - 402-leds-trigger-netdev-fix-handling-on-interface-rename.patch Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte [Add 010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch] Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 +- ...dmaengine-dw-dmac-implement-dma-prot.patch | 141 ------------------ ...ngine-dw-dmac-add-protection-control.patch | 74 +++++++++ ...4xx_core-don-t-abuse-__dma_sync_page.patch | 2 +- ...to-crypto4xx-add-prng-crypto-support.patch | 12 +- ...-get-rid-of-redundant-using_sd-varia.patch | 8 +- ...1-Don-t-use-DT-aliases-for-numbering.patch | 2 +- ...0035-amba_pl011-Round-input-clock-up.patch | 10 +- ...-Insert-mb-for-correct-FIFO-handling.patch | 2 +- ...Add-cts-event-workaround-DT-property.patch | 2 +- ...irmware-bcm2835-Support-ARCH_BCM270x.patch | 10 +- ...BCM2708-Add-core-Device-Tree-support.patch | 2 +- ...o_user-and-__copy_from_user-performa.patch | 2 +- ...ware-Export-the-general-transaction-.patch | 4 +- ...pberrypi-Notify-firmware-of-a-reboot.patch | 6 +- ...rypi-Add-backward-compatible-get_thr.patch | 12 +- ...irmware-call-buffer-size-to-48-bytes.patch | 28 ---- ...-firmware-calls-now-use-kmalloc-2749.patch | 89 ----------- ...ty-amba-pl011-allow-shared-interrupt.patch | 2 +- ...ci_urb_enqueue-to-support-hid.mousep.patch | 4 +- ...hack-xhci_urb_enqueue-to-support-hid.patch | 4 +- ...hci_fixup_endpoint-for-interval-adju.patch | 4 +- ...011-Make-TX-optimisation-conditional.patch | 18 +-- ...ore-event-ring-segment-table-entries.patch | 4 +- ...dev-fix-handling-on-interface-rename.patch | 49 ------ .../generic/hack-4.19/204-module_strip.patch | 16 +- .../hack-4.19/230-openwrt_lzma_options.patch | 2 +- .../301-mips_image_cmdline_hack.patch | 2 +- .../generic/hack-4.19/902-debloat_proc.patch | 2 +- .../300-mips_expose_boot_raw.patch | 4 +- .../pending-4.19/304-mips_disable_fpu.patch | 2 +- ...ove-no-op-dma_map_ops-where-possible.patch | 10 +- ...w_table-add-hardware-offload-support.patch | 6 +- .../lantiq/patches-4.19/0152-lantiq-VPE.patch | 2 +- .../patches-4.19/011-tune_lzma_options.patch | 2 +- 35 files changed, 155 insertions(+), 388 deletions(-) delete mode 100644 target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch create mode 100644 target/linux/apm821xx/patches-4.19/010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch delete mode 100644 target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 5b4fe2c533..8ccd5f0d77 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .206 LINUX_VERSION-4.14 = .159 -LINUX_VERSION-4.19 = .88 +LINUX_VERSION-4.19 = .90 LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 LINUX_KERNEL_HASH-4.14.159 = e8d42d3a1b85d180141e9bc11c4a0e87f8a413c0e989b0f24c1b7c40f8a826f2 -LINUX_KERNEL_HASH-4.19.88 = c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe +LINUX_KERNEL_HASH-4.19.90 = 29d86c0a6daf169ec0b4b42a12f8d55dc894c52bd901f876f52a05906a5cf7fd remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch b/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch deleted file mode 100644 index 86da6fcd89..0000000000 --- a/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 7b0c03ecc42fb223baf015877fee9d517c2c8af1 Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Sat, 17 Nov 2018 17:17:21 +0100 -Subject: dmaengine: dw-dmac: implement dma protection control setting - -This patch adds a new device-tree property that allows to -specify the dma protection control bits for the all of the -DMA controller's channel uniformly. - -Setting the "correct" bits can have a huge impact on the -PPC460EX and APM82181 that use this DMA engine in combination -with a DesignWare' SATA-II core (sata_dwc_460ex driver). - -In the OpenWrt Forum, the user takimata reported that: -|It seems your patch unleashed the full power of the SATA port. -|Where I was previously hitting a really hard limit at around -|82 MB/s for reading and 27 MB/s for writing, I am now getting this: -| -|root@OpenWrt:/mnt# time dd if=/dev/zero of=tempfile bs=1M count=1024 -|1024+0 records in -|1024+0 records out -|real 0m 13.65s -|user 0m 0.01s -|sys 0m 11.89s -| -|root@OpenWrt:/mnt# time dd if=tempfile of=/dev/null bs=1M count=1024 -|1024+0 records in -|1024+0 records out -|real 0m 8.41s -|user 0m 0.01s -|sys 0m 4.70s -| -|This means: 121 MB/s reading and 75 MB/s writing! -| -|The drive is a WD Green WD10EARX taken from an older MBL Single. -|I repeated the test a few times with even larger files to rule out -|any caching, I'm still seeing the same great performance. OpenWrt is -|now completely on par with the original MBL firmware's performance. - -Another user And.short reported: -|I can report that your fix worked! Boots up fine with two -|drives even with more partitions, and no more reboot on -|concurrent disk access! - -A closer look into the sata_dwc_460ex code revealed that -the driver did initally set the correct protection control -bits. However, this feature was lost when the sata_dwc_460ex -driver was converted to the generic DMA driver framework. - -BugLink: https://forum.openwrt.org/t/wd-mybook-live-duo-two-disks/16195/55 -BugLink: https://forum.openwrt.org/t/wd-mybook-live-duo-two-disks/16195/50 -Fixes: 8b3444852a2b ("sata_dwc_460ex: move to generic DMA driver") -Reviewed-by: Andy Shevchenko -Signed-off-by: Christian Lamparter -Signed-off-by: Vinod Koul ---- - ---- a/drivers/dma/dw/core.c -+++ b/drivers/dma/dw/core.c -@@ -160,12 +160,14 @@ static void dwc_initialize_chan_idma32(s - - static void dwc_initialize_chan_dw(struct dw_dma_chan *dwc) - { -+ struct dw_dma *dw = to_dw_dma(dwc->chan.device); - u32 cfghi = DWC_CFGH_FIFO_MODE; - u32 cfglo = DWC_CFGL_CH_PRIOR(dwc->priority); - bool hs_polarity = dwc->dws.hs_polarity; - - cfghi |= DWC_CFGH_DST_PER(dwc->dws.dst_id); - cfghi |= DWC_CFGH_SRC_PER(dwc->dws.src_id); -+ cfghi |= DWC_CFGH_PROTCTL(dw->pdata->protctl); - - /* Set polarity of handshake interface */ - cfglo |= hs_polarity ? DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL : 0; ---- a/drivers/dma/dw/platform.c -+++ b/drivers/dma/dw/platform.c -@@ -162,6 +162,12 @@ dw_dma_parse_dt(struct platform_device * - pdata->multi_block[tmp] = 1; - } - -+ if (!of_property_read_u32(np, "snps,dma-protection-control", &tmp)) { -+ if (tmp > CHAN_PROTCTL_MASK) -+ return NULL; -+ pdata->protctl = tmp; -+ } -+ - return pdata; - } - #else ---- a/drivers/dma/dw/regs.h -+++ b/drivers/dma/dw/regs.h -@@ -200,6 +200,10 @@ enum dw_dma_msize { - #define DWC_CFGH_FCMODE (1 << 0) - #define DWC_CFGH_FIFO_MODE (1 << 1) - #define DWC_CFGH_PROTCTL(x) ((x) << 2) -+#define DWC_CFGH_PROTCTL_DATA (0 << 2) /* data access - always set */ -+#define DWC_CFGH_PROTCTL_PRIV (1 << 2) /* privileged -> AHB HPROT[1] */ -+#define DWC_CFGH_PROTCTL_BUFFER (2 << 2) /* bufferable -> AHB HPROT[2] */ -+#define DWC_CFGH_PROTCTL_CACHE (4 << 2) /* cacheable -> AHB HPROT[3] */ - #define DWC_CFGH_DS_UPD_EN (1 << 5) - #define DWC_CFGH_SS_UPD_EN (1 << 6) - #define DWC_CFGH_SRC_PER(x) ((x) << 7) ---- a/include/linux/platform_data/dma-dw.h -+++ b/include/linux/platform_data/dma-dw.h -@@ -49,6 +49,7 @@ struct dw_dma_slave { - * @data_width: Maximum data width supported by hardware per AHB master - * (in bytes, power of 2) - * @multi_block: Multi block transfers supported by hardware per channel. -+ * @protctl: Protection control signals setting per channel. - */ - struct dw_dma_platform_data { - unsigned int nr_channels; -@@ -65,6 +66,11 @@ struct dw_dma_platform_data { - unsigned char nr_masters; - unsigned char data_width[DW_DMA_MAX_NR_MASTERS]; - unsigned char multi_block[DW_DMA_MAX_NR_CHANNELS]; -+#define CHAN_PROTCTL_PRIVILEGED BIT(0) -+#define CHAN_PROTCTL_BUFFERABLE BIT(1) -+#define CHAN_PROTCTL_CACHEABLE BIT(2) -+#define CHAN_PROTCTL_MASK GENMASK(2, 0) -+ unsigned char protctl; - }; - - #endif /* _PLATFORM_DATA_DMA_DW_H */ ---- /dev/null -+++ b/include/dt-bindings/dma/dw-dmac.h -@@ -0,0 +1,14 @@ -+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ -+ -+#ifndef __DT_BINDINGS_DMA_DW_DMAC_H__ -+#define __DT_BINDINGS_DMA_DW_DMAC_H__ -+ -+/* -+ * Protection Control bits provide protection against illegal transactions. -+ * The protection bits[0:2] are one-to-one mapped to AHB HPROT[3:1] signals. -+ */ -+#define DW_DMAC_HPROT1_PRIVILEGED_MODE (1 << 0) /* Privileged Mode */ -+#define DW_DMAC_HPROT2_BUFFERABLE (1 << 1) /* DMA is bufferable */ -+#define DW_DMAC_HPROT3_CACHEABLE (1 << 2) /* DMA is cacheable */ -+ -+#endif /* __DT_BINDINGS_DMA_DW_DMAC_H__ */ diff --git a/target/linux/apm821xx/patches-4.19/010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch b/target/linux/apm821xx/patches-4.19/010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch new file mode 100644 index 0000000000..572b8b6522 --- /dev/null +++ b/target/linux/apm821xx/patches-4.19/010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch @@ -0,0 +1,74 @@ +From 538098281ce884a51d2aa4ab445056a41741c6ad Mon Sep 17 00:00:00 2001 +From: Christian Lamparter +Date: Sat, 17 Nov 2018 17:17:20 +0100 +Subject: [PATCH] dt-bindings: dmaengine: dw-dmac: add protection control + property + +This patch for the DesignWare AHB Central +Direct Memory Access Controller adds the dma +protection control property: + "snps,dma-protection-control" + +as well as the properties specific values defines into +a new include file: include/dt-bindings/dma/dw-dmac.h + +Note: The protection control signals are one-to-one +mapped to the AHB HPROT[1:3] signals for this controller. +The HPROT0 (Data Access) is always hardwired to 1. + +Reviewed-by: Andy Shevchenko +Reviewed-by: Rob Herring +Signed-off-by: Christian Lamparter +Signed-off-by: Vinod Koul +--- + Documentation/devicetree/bindings/dma/snps-dma.txt | 4 ++++ + MAINTAINERS | 4 +++- + include/dt-bindings/dma/dw-dmac.h | 14 ++++++++++++++ + 3 files changed, 21 insertions(+), 1 deletion(-) + create mode 100644 include/dt-bindings/dma/dw-dmac.h + +--- a/Documentation/devicetree/bindings/dma/snps-dma.txt ++++ b/Documentation/devicetree/bindings/dma/snps-dma.txt +@@ -27,6 +27,10 @@ Optional properties: + general purpose DMA channel allocator. False if not passed. + - multi-block: Multi block transfers supported by hardware. Array property with + one cell per channel. 0: not supported, 1 (default): supported. ++- snps,dma-protection-control: AHB HPROT[3:1] protection setting. ++ The default value is 0 (for non-cacheable, non-buffered, ++ unprivileged data access). ++ Refer to include/dt-bindings/dma/dw-dmac.h for possible values. + + Example: + +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -14075,9 +14075,11 @@ SYNOPSYS DESIGNWARE DMAC DRIVER + M: Viresh Kumar + R: Andy Shevchenko + S: Maintained ++F: Documentation/devicetree/bindings/dma/snps-dma.txt ++F: drivers/dma/dw/ ++F: include/dt-bindings/dma/dw-dmac.h + F: include/linux/dma/dw.h + F: include/linux/platform_data/dma-dw.h +-F: drivers/dma/dw/ + + SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER + M: Jose Abreu +--- /dev/null ++++ b/include/dt-bindings/dma/dw-dmac.h +@@ -0,0 +1,14 @@ ++/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ ++ ++#ifndef __DT_BINDINGS_DMA_DW_DMAC_H__ ++#define __DT_BINDINGS_DMA_DW_DMAC_H__ ++ ++/* ++ * Protection Control bits provide protection against illegal transactions. ++ * The protection bits[0:2] are one-to-one mapped to AHB HPROT[3:1] signals. ++ */ ++#define DW_DMAC_HPROT1_PRIVILEGED_MODE (1 << 0) /* Privileged Mode */ ++#define DW_DMAC_HPROT2_BUFFERABLE (1 << 1) /* DMA is bufferable */ ++#define DW_DMAC_HPROT3_CACHEABLE (1 << 2) /* DMA is cacheable */ ++ ++#endif /* __DT_BINDINGS_DMA_DW_DMAC_H__ */ diff --git a/target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch b/target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch index 635ab0037e..d1849aefbb 100644 --- a/target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch +++ b/target/linux/apm821xx/patches-4.19/023-0004-crypto4xx_core-don-t-abuse-__dma_sync_page.patch @@ -19,7 +19,7 @@ Signed-off-by: Michael Ellerman --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -596,7 +596,7 @@ static void crypto4xx_aead_done(struct c +@@ -592,7 +592,7 @@ static void crypto4xx_aead_done(struct c pd->pd_ctl_len.bf.pkt_len, dst); } else { diff --git a/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch b/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch index ba4419787c..cf7f92c2d0 100644 --- a/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch +++ b/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch @@ -31,7 +31,7 @@ Signed-off-by: Herbert Xu #include #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" -@@ -1046,6 +1048,10 @@ static int crypto4xx_register_alg(struct +@@ -1042,6 +1044,10 @@ static int crypto4xx_register_alg(struct rc = crypto_register_ahash(&alg->alg.u.hash); break; @@ -42,7 +42,7 @@ Signed-off-by: Herbert Xu default: rc = crypto_register_skcipher(&alg->alg.u.cipher); break; -@@ -1075,6 +1081,10 @@ static void crypto4xx_unregister_alg(str +@@ -1071,6 +1077,10 @@ static void crypto4xx_unregister_alg(str crypto_unregister_aead(&alg->alg.u.aead); break; @@ -53,7 +53,7 @@ Signed-off-by: Herbert Xu default: crypto_unregister_skcipher(&alg->alg.u.cipher); } -@@ -1133,6 +1143,69 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1129,6 +1139,69 @@ static irqreturn_t crypto4xx_ce_interrup PPC4XX_TMO_ERR_INT); } @@ -123,7 +123,7 @@ Signed-off-by: Herbert Xu /** * Supported Crypto Algorithms */ -@@ -1302,6 +1375,18 @@ static struct crypto4xx_alg_common crypt +@@ -1298,6 +1371,18 @@ static struct crypto4xx_alg_common crypt .cra_module = THIS_MODULE, }, } }, @@ -142,7 +142,7 @@ Signed-off-by: Herbert Xu }; /** -@@ -1371,6 +1456,7 @@ static int crypto4xx_probe(struct platfo +@@ -1367,6 +1452,7 @@ static int crypto4xx_probe(struct platfo core_dev->dev->core_dev = core_dev; core_dev->dev->is_revb = is_revb; core_dev->device = dev; @@ -150,7 +150,7 @@ Signed-off-by: Herbert Xu spin_lock_init(&core_dev->lock); INIT_LIST_HEAD(&core_dev->dev->alg_list); ratelimit_default_init(&core_dev->dev->aead_ratelimit); -@@ -1450,6 +1536,7 @@ static int crypto4xx_remove(struct platf +@@ -1446,6 +1532,7 @@ static int crypto4xx_remove(struct platf tasklet_kill(&core_dev->tasklet); /* Un-register with Linux CryptoAPI */ crypto4xx_unregister_alg(core_dev->dev); diff --git a/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch b/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch index 4b246a793d..24e34edd58 100644 --- a/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch +++ b/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch @@ -17,7 +17,7 @@ Signed-off-by: Herbert Xu --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -539,7 +539,7 @@ static void crypto4xx_cipher_done(struct +@@ -535,7 +535,7 @@ static void crypto4xx_cipher_done(struct req = skcipher_request_cast(pd_uinfo->async_req); @@ -26,7 +26,7 @@ Signed-off-by: Herbert Xu crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo, req->cryptlen, req->dst); } else { -@@ -593,7 +593,7 @@ static void crypto4xx_aead_done(struct c +@@ -589,7 +589,7 @@ static void crypto4xx_aead_done(struct c u32 icv[AES_BLOCK_SIZE]; int err = 0; @@ -35,7 +35,7 @@ Signed-off-by: Herbert Xu crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo, pd->pd_ctl_len.bf.pkt_len, dst); -@@ -887,7 +887,6 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -883,7 +883,6 @@ int crypto4xx_build_pd(struct crypto_asy * we know application give us dst a whole piece of memory * no need to use scatter ring. */ @@ -43,7 +43,7 @@ Signed-off-by: Herbert Xu pd_uinfo->first_sd = 0xffffffff; sa->sa_command_0.bf.scatter = 0; pd->dest = (u32)dma_map_page(dev->core_dev->device, -@@ -901,7 +900,6 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -897,7 +896,6 @@ int crypto4xx_build_pd(struct crypto_asy u32 sd_idx = fst_sd; nbytes = datalen; sa->sa_command_0.bf.scatter = 1; diff --git a/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch index 8b70d80e15..61ab7095fb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ b/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch @@ -14,7 +14,7 @@ use the same logic. --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct devic +@@ -2576,7 +2576,12 @@ static int pl011_setup_port(struct devic if (IS_ERR(base)) return PTR_ERR(base); diff --git a/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch b/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch index 82ef72b280..d5e9f3174c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1652,6 +1652,23 @@ static void pl011_put_poll_char(struct u +@@ -1650,6 +1650,23 @@ static void pl011_put_poll_char(struct u #endif /* CONFIG_CONSOLE_POLL */ @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell static int pl011_hwinit(struct uart_port *port) { struct uart_amba_port *uap = -@@ -1668,7 +1685,7 @@ static int pl011_hwinit(struct uart_port +@@ -1666,7 +1683,7 @@ static int pl011_hwinit(struct uart_port if (retval) return retval; @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* Clear pending error and receive interrupts */ pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | -@@ -2324,7 +2341,7 @@ static int __init pl011_console_setup(st +@@ -2322,7 +2339,7 @@ static int __init pl011_console_setup(st plat->init(); } @@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell if (uap->vendor->fixed_options) { baud = uap->fixed_baud; -@@ -2509,6 +2526,7 @@ static struct uart_driver amba_reg = { +@@ -2507,6 +2524,7 @@ static struct uart_driver amba_reg = { .cons = AMBA_CONSOLE, }; @@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell static int pl011_probe_dt_alias(int index, struct device *dev) { struct device_node *np; -@@ -2540,6 +2558,7 @@ static int pl011_probe_dt_alias(int inde +@@ -2538,6 +2556,7 @@ static int pl011_probe_dt_alias(int inde return ret; } diff --git a/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch index 7fdedd2bff..eef29187ae 100644 --- a/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch +++ b/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1385,6 +1385,7 @@ static bool pl011_tx_char(struct uart_am +@@ -1383,6 +1383,7 @@ static bool pl011_tx_char(struct uart_am return false; /* unable to transmit character */ pl011_write(c, uap, REG_DR); diff --git a/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch index c23f6dd6c3..e5a3c39b3f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch @@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2661,6 +2661,11 @@ static int pl011_probe(struct amba_devic +@@ -2659,6 +2659,11 @@ static int pl011_probe(struct amba_devic if (IS_ERR(uap->clk)) return PTR_ERR(uap->clk); diff --git a/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch b/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch index 3cba92983b..a47be248a2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch +++ b/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch @@ -27,7 +27,7 @@ Signed-off-by: Noralf Trønnes --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c -@@ -32,6 +32,8 @@ struct rpi_firmware { +@@ -31,6 +31,8 @@ struct rpi_firmware { u32 enabled; }; @@ -36,7 +36,7 @@ Signed-off-by: Noralf Trønnes static DEFINE_MUTEX(transaction_lock); static void response_callback(struct mbox_client *cl, void *msg) -@@ -229,6 +231,7 @@ static int rpi_firmware_probe(struct pla +@@ -230,6 +232,7 @@ static int rpi_firmware_probe(struct pla init_completion(&fw->c); platform_set_drvdata(pdev, fw); @@ -44,7 +44,7 @@ Signed-off-by: Noralf Trønnes rpi_firmware_print_firmware_revision(fw); rpi_register_hwmon_driver(dev, fw); -@@ -243,6 +246,7 @@ static int rpi_firmware_remove(struct pl +@@ -244,6 +247,7 @@ static int rpi_firmware_remove(struct pl platform_device_unregister(rpi_hwmon); rpi_hwmon = NULL; mbox_free_channel(fw->chan); @@ -52,7 +52,7 @@ Signed-off-by: Noralf Trønnes return 0; } -@@ -255,7 +259,7 @@ static int rpi_firmware_remove(struct pl +@@ -256,7 +260,7 @@ static int rpi_firmware_remove(struct pl */ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) { @@ -61,7 +61,7 @@ Signed-off-by: Noralf Trønnes if (!pdev) return NULL; -@@ -278,7 +282,18 @@ static struct platform_driver rpi_firmwa +@@ -279,7 +283,18 @@ static struct platform_driver rpi_firmwa .probe = rpi_firmware_probe, .remove = rpi_firmware_remove, }; diff --git a/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch index fd251d6f8f..f2ad9710fd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch @@ -15890,7 +15890,7 @@ Signed-off-by: Phil Elwell -Wno-avoid_unnecessary_addr_size \ -Wno-alias_paths \ -Wno-graph_child_address \ -@@ -292,6 +293,18 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ +@@ -293,6 +294,18 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE $(call if_changed_dep,dtc) diff --git a/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch index 0c3634d0c8..4335ff9560 100644 --- a/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch @@ -56,7 +56,7 @@ Signed-off-by: Phil Elwell #endif --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h -@@ -496,6 +496,9 @@ do { \ +@@ -514,6 +514,9 @@ do { \ extern unsigned long __must_check arm_copy_from_user(void *to, const void __user *from, unsigned long n); diff --git a/target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch b/target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch index 9f5405334d..945ba536eb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch @@ -13,7 +13,7 @@ Signed-off-by: Eric Anholt --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c -@@ -46,7 +46,7 @@ static void response_callback(struct mbo +@@ -45,7 +45,7 @@ static void response_callback(struct mbo * Sends a request to the firmware through the BCM2835 mailbox driver, * and synchronously waits for the reply. */ @@ -22,7 +22,7 @@ Signed-off-by: Eric Anholt rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data) { u32 message = MBOX_MSG(chan, data); -@@ -67,6 +67,7 @@ rpi_firmware_transaction(struct rpi_firm +@@ -66,6 +66,7 @@ rpi_firmware_transaction(struct rpi_firm return ret; } diff --git a/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch index 34d2a8a241..ffe679fcf2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch +++ b/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch @@ -18,10 +18,10 @@ Signed-off-by: Phil Elwell #include #include +#include + #include #include - #define MBOX_MSG(chan, data28) (((data28) & ~0xf) | ((chan) & 0xf)) -@@ -174,6 +175,26 @@ int rpi_firmware_property(struct rpi_fir +@@ -175,6 +176,26 @@ int rpi_firmware_property(struct rpi_fir } EXPORT_SYMBOL_GPL(rpi_firmware_property); @@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell static void rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) { -@@ -284,15 +305,32 @@ static struct platform_driver rpi_firmwa +@@ -285,15 +306,32 @@ static struct platform_driver rpi_firmwa .remove = rpi_firmware_remove, }; diff --git a/target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch b/target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch index dea72e690e..1a74f9c1fa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch @@ -16,7 +16,7 @@ Signed-off-by: Stefan Wahren --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c -@@ -31,6 +31,7 @@ struct rpi_firmware { +@@ -30,6 +30,7 @@ struct rpi_firmware { struct mbox_chan *chan; /* The property channel. */ struct completion c; u32 enabled; @@ -24,9 +24,9 @@ Signed-off-by: Stefan Wahren }; static struct platform_device *g_pdev; -@@ -171,6 +172,12 @@ int rpi_firmware_property(struct rpi_fir - data + sizeof(struct rpi_firmware_property_tag_header), - buf_size); +@@ -172,6 +173,12 @@ int rpi_firmware_property(struct rpi_fir + + kfree(data); + if ((tag == RPI_FIRMWARE_GET_THROTTLED) && + memcmp(&fw->get_throttled, tag_data, sizeof(fw->get_throttled))) { @@ -37,7 +37,7 @@ Signed-off-by: Stefan Wahren return ret; } EXPORT_SYMBOL_GPL(rpi_firmware_property); -@@ -195,6 +202,27 @@ static int rpi_firmware_notify_reboot(st +@@ -196,6 +203,27 @@ static int rpi_firmware_notify_reboot(st return 0; } @@ -65,7 +65,7 @@ Signed-off-by: Stefan Wahren static void rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) { -@@ -227,6 +255,11 @@ rpi_register_hwmon_driver(struct device +@@ -228,6 +256,11 @@ rpi_register_hwmon_driver(struct device rpi_hwmon = platform_device_register_data(dev, "raspberrypi-hwmon", -1, NULL, 0); diff --git a/target/linux/brcm2708/patches-4.19/950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch b/target/linux/brcm2708/patches-4.19/950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch deleted file mode 100644 index 99e1679cdf..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3118f1a2f29ae802a334963c2aded87d60bddd56 Mon Sep 17 00:00:00 2001 -From: James Hughes -Date: Wed, 31 Oct 2018 13:00:46 +0000 -Subject: [PATCH 148/806] Increase firmware call buffer size to 48 bytes - -An assumption was made in commit a1547e0bc that 32 bytes -would be enough data buffer size for all firmware calls. However, -the axi performance monitor driver uses a call with 44 bytes -(RPI_FIRMWARE_GET_PERIPH_REG) to get the VC registers values. - -Increase value to 48 to take this in to account. - -Signed-off-by: James Hughes ---- - drivers/firmware/raspberrypi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/firmware/raspberrypi.c -+++ b/drivers/firmware/raspberrypi.c -@@ -22,7 +22,7 @@ - #define MBOX_DATA28(msg) ((msg) & ~0xf) - #define MBOX_CHAN_PROPERTY 8 - --#define MAX_RPI_FW_PROP_BUF_SIZE 32 -+#define MAX_RPI_FW_PROP_BUF_SIZE 48 - - static struct platform_device *rpi_hwmon; - diff --git a/target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch b/target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch deleted file mode 100644 index aeb74b0741..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 01995961823e4185f687c02cf326d78ba1b6b7bf Mon Sep 17 00:00:00 2001 -From: James Hughes -Date: Tue, 13 Nov 2018 17:27:00 +0000 -Subject: [PATCH 206/806] Mailbox firmware calls now use kmalloc (#2749) - -A previous change moved away from variable stack -allocation of a data buffer to a fixed maximum size. -However, some mailbox calls use larger data buffers -than the maximum allowed. This change moves from -stack storage to kmalloc to ensure all sizes are -catered for. - -Signed-off-by: James Hughes ---- - drivers/firmware/raspberrypi.c | 35 +++++++++++++++++----------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - ---- a/drivers/firmware/raspberrypi.c -+++ b/drivers/firmware/raspberrypi.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - - #define MBOX_MSG(chan, data28) (((data28) & ~0xf) | ((chan) & 0xf)) -@@ -22,8 +23,6 @@ - #define MBOX_DATA28(msg) ((msg) & ~0xf) - #define MBOX_CHAN_PROPERTY 8 - --#define MAX_RPI_FW_PROP_BUF_SIZE 48 -- - static struct platform_device *rpi_hwmon; - - struct rpi_firmware { -@@ -149,28 +148,28 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property_ - int rpi_firmware_property(struct rpi_firmware *fw, - u32 tag, void *tag_data, size_t buf_size) - { -- /* Single tags are very small (generally 8 bytes), so the -- * stack should be safe. -- */ -- u8 data[sizeof(struct rpi_firmware_property_tag_header) + -- MAX_RPI_FW_PROP_BUF_SIZE]; -- struct rpi_firmware_property_tag_header *header = -- (struct rpi_firmware_property_tag_header *)data; - int ret; -+ struct rpi_firmware_property_tag_header *header; - -- if (WARN_ON(buf_size > sizeof(data) - sizeof(*header))) -- return -EINVAL; -+ /* Some mailboxes can use over 1k bytes. Rather than checking -+ * size and using stack or kmalloc depending on requirements, -+ * just use kmalloc. Mailboxes don't get called enough to worry -+ * too much about the time taken in the allocation. -+ */ -+ void *data = kmalloc(sizeof(*header) + buf_size, GFP_KERNEL); - -+ if (!data) -+ return -ENOMEM; -+ -+ header = data; - header->tag = tag; - header->buf_size = buf_size; - header->req_resp_size = 0; -- memcpy(data + sizeof(struct rpi_firmware_property_tag_header), -- tag_data, buf_size); -+ memcpy(data + sizeof(*header), tag_data, buf_size); - -- ret = rpi_firmware_property_list(fw, &data, buf_size + sizeof(*header)); -- memcpy(tag_data, -- data + sizeof(struct rpi_firmware_property_tag_header), -- buf_size); -+ ret = rpi_firmware_property_list(fw, data, buf_size + sizeof(*header)); -+ -+ memcpy(tag_data, data + sizeof(*header), buf_size); - - if ((tag == RPI_FIRMWARE_GET_THROTTLED) && - memcmp(&fw->get_throttled, tag_data, sizeof(fw->get_throttled))) { -@@ -178,6 +177,8 @@ int rpi_firmware_property(struct rpi_fir - sysfs_notify(&fw->cl.dev->kobj, NULL, "get_throttled"); - } - -+ kfree(data); -+ - return ret; - } - EXPORT_SYMBOL_GPL(rpi_firmware_property); diff --git a/target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch b/target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch index ae9036755f..7d79ed0f05 100644 --- a/target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch +++ b/target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch @@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1735,7 +1735,8 @@ static int pl011_allocate_irq(struct uar +@@ -1733,7 +1733,8 @@ static int pl011_allocate_irq(struct uar { pl011_write(uap->im, uap, REG_IMSC); diff --git a/target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch b/target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch index d5e37d87db..bd332715fc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch +++ b/target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch @@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1428,6 +1428,87 @@ command_cleanup: +@@ -1425,6 +1425,87 @@ command_cleanup: } /* @@ -108,7 +108,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -1495,6 +1576,11 @@ static int xhci_urb_enqueue(struct usb_h +@@ -1492,6 +1573,11 @@ static int xhci_urb_enqueue(struct usb_h } } diff --git a/target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch b/target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch index 10b0a5b921..6ea178b5be 100644 --- a/target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch +++ b/target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch @@ -11,7 +11,7 @@ This reverts commit 1cf1071a79f320bc4497a3ade77431f04442eb17. --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1428,87 +1428,6 @@ command_cleanup: +@@ -1425,87 +1425,6 @@ command_cleanup: } /* @@ -99,7 +99,7 @@ This reverts commit 1cf1071a79f320bc4497a3ade77431f04442eb17. * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -1576,11 +1495,6 @@ static int xhci_urb_enqueue(struct usb_h +@@ -1573,11 +1492,6 @@ static int xhci_urb_enqueue(struct usb_h } } diff --git a/target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index 48b556735a..ffcb9ba41f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1428,6 +1428,103 @@ command_cleanup: +@@ -1425,6 +1425,103 @@ command_cleanup: } /* @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5220,6 +5317,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5217,6 +5314,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch index d6a9cdde35..6b7ab56859 100644 --- a/target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch +++ b/target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch @@ -42,15 +42,15 @@ Signed-off-by: Phil Elwell #ifdef CONFIG_DMA_ENGINE /* DMA stuff */ bool using_tx_dma; -@@ -814,6 +815,7 @@ __acquires(&uap->port.lock) +@@ -813,6 +814,7 @@ __acquires(&uap->port.lock) + if (!uap->using_tx_dma) return; - /* Avoid deadlock with the DMA engine callback */ + uap->irq_locked = 0; - spin_unlock(&uap->port.lock); - dmaengine_terminate_all(uap->dmatx.chan); - spin_lock(&uap->port.lock); -@@ -941,6 +943,7 @@ static void pl011_dma_rx_chars(struct ua + dmaengine_terminate_async(uap->dmatx.chan); + + if (uap->dmatx.queued) { +@@ -939,6 +941,7 @@ static void pl011_dma_rx_chars(struct ua fifotaken = pl011_fifo_to_tty(uap); } @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell spin_unlock(&uap->port.lock); dev_vdbg(uap->port.dev, "Took %d chars from DMA buffer and %d chars from the FIFO\n", -@@ -1349,6 +1352,7 @@ __acquires(&uap->port.lock) +@@ -1347,6 +1350,7 @@ __acquires(&uap->port.lock) { pl011_fifo_to_tty(uap); @@ -66,7 +66,7 @@ Signed-off-by: Phil Elwell spin_unlock(&uap->port.lock); tty_flip_buffer_push(&uap->port.state->port); /* -@@ -1484,6 +1488,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1482,6 +1486,7 @@ static irqreturn_t pl011_int(int irq, vo int handled = 0; spin_lock_irqsave(&uap->port.lock, flags); @@ -74,7 +74,7 @@ Signed-off-by: Phil Elwell status = pl011_read(uap, REG_RIS) & uap->im; if (status) { do { -@@ -1503,7 +1508,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1501,7 +1506,7 @@ static irqreturn_t pl011_int(int irq, vo UART011_CTSMIS|UART011_RIMIS)) pl011_modem_status(uap); if (status & UART011_TXIS) diff --git a/target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch index ef1349153e..e2bc7469fc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch +++ b/target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2491,9 +2491,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2495,9 +2495,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, * Event ring setup: Allocate a normal ring, but also setup * the event ring segment table (ERST). Section 4.9.3. */ @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell if (!xhci->event_ring) goto fail; if (xhci_check_trb_in_td_math(xhci) < 0) -@@ -2506,7 +2508,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2510,7 +2512,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, /* set ERST count with the number of entries in the segment table */ val = readl(&xhci->ir_set->erst_size); val &= ERST_SIZE_MASK; diff --git a/target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch b/target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch deleted file mode 100644 index c40ca42471..0000000000 --- a/target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0ff035231edca3713c3d0839c44e64a4ac41ef38 Mon Sep 17 00:00:00 2001 -From: Martin Schiller -Date: Thu, 24 Oct 2019 15:09:23 +0200 -Subject: [PATCH] leds: trigger: netdev: fix handling on interface rename - -The NETDEV_CHANGENAME code is not "unneeded" like it is stated in commit -4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface -rename"). - -The event was accidentally misinterpreted equivalent to -NETDEV_UNREGISTER, but should be equivalent to NETDEV_REGISTER. - -This was the case in the original code from the openwrt project. - -Otherwise, you are unable to set netdev led triggers for (non-existent) -netdevices, which has to be renamed. This is the case, for example, for -ppp interfaces in openwrt. - -Fixes: 06f502f57d0d ("leds: trigger: Introduce a NETDEV trigger") -Fixes: 4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface rename") -Signed-off-by: Martin Schiller ---- - drivers/leds/trigger/ledtrig-netdev.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/leds/trigger/ledtrig-netdev.c -+++ b/drivers/leds/trigger/ledtrig-netdev.c -@@ -302,10 +302,12 @@ static int netdev_trig_notify(struct not - container_of(nb, struct led_netdev_data, notifier); - - if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE -- && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) -+ && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER -+ && evt != NETDEV_CHANGENAME) - return NOTIFY_DONE; - - if (!(dev == trigger_data->net_dev || -+ (evt == NETDEV_CHANGENAME && !strcmp(dev->name, trigger_data->device_name)) || - (evt == NETDEV_REGISTER && !strcmp(dev->name, trigger_data->device_name)))) - return NOTIFY_DONE; - -@@ -315,6 +317,7 @@ static int netdev_trig_notify(struct not - - clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); - switch (evt) { -+ case NETDEV_CHANGENAME: - case NETDEV_REGISTER: - if (trigger_data->net_dev) - dev_put(trigger_data->net_dev); diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch index b218e3b6a8..b9d7c886ae 100644 --- a/target/linux/generic/hack-4.19/204-module_strip.patch +++ b/target/linux/generic/hack-4.19/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3025,9 +3025,11 @@ static int setup_load_info(struct load_i +@@ -3027,9 +3027,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3048,6 +3050,7 @@ static int check_modinfo(struct module * +@@ -3050,6 +3052,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1971,7 +1971,9 @@ static void read_symbols(const char *mod +@@ -1983,7 +1983,9 @@ static void read_symbols(const char *mod symname = remove_dot(info.strtab + sym->st_name); handle_modversions(mod, &info, sym, symname); @@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau } if (!is_vmlinux(modname) || vmlinux_section_warnings) check_sec_ref(mod, modname, &info); -@@ -2134,8 +2136,10 @@ static void add_header(struct buffer *b, +@@ -2146,8 +2148,10 @@ static void add_header(struct buffer *b, buf_printf(b, "\n"); buf_printf(b, "BUILD_SALT;\n"); buf_printf(b, "\n"); @@ -158,7 +158,7 @@ Signed-off-by: Felix Fietkau buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); -@@ -2152,8 +2156,10 @@ static void add_header(struct buffer *b, +@@ -2164,8 +2168,10 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -169,7 +169,7 @@ Signed-off-by: Felix Fietkau } /* Cannot check for assembler */ -@@ -2166,8 +2172,10 @@ static void add_retpoline(struct buffer +@@ -2178,8 +2184,10 @@ static void add_retpoline(struct buffer static void add_staging_flag(struct buffer *b, const char *name) { @@ -180,7 +180,7 @@ Signed-off-by: Felix Fietkau } /** -@@ -2266,11 +2274,13 @@ static void add_depends(struct buffer *b +@@ -2278,11 +2286,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -194,7 +194,7 @@ Signed-off-by: Felix Fietkau } static void write_if_changed(struct buffer *b, const char *fname) -@@ -2507,7 +2517,9 @@ int main(int argc, char **argv) +@@ -2519,7 +2529,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod, modules); diff --git a/target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch b/target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch index b45ed1184f..1e945cd4c1 100644 --- a/target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch +++ b/target/linux/generic/hack-4.19/230-openwrt_lzma_options.patch @@ -23,7 +23,7 @@ Signed-off-by: Imre Kaloz { {0x02, 0x21}, "lz4", unlz4 }, --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -324,7 +324,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) +@@ -325,7 +325,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ diff --git a/target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch index 7a6948d481..da7d1fdbe0 100644 --- a/target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch +++ b/target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1143,6 +1143,10 @@ config SYNC_R4K +@@ -1144,6 +1144,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index 4bd4d22168..f562c9f2e1 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau &vmalloc_op, --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -1971,10 +1971,12 @@ void __init init_mm_internals(void) +@@ -1972,10 +1972,12 @@ void __init init_mm_internals(void) start_shepherd_timer(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch index 5d10cae86c..e19cec1400 100644 --- a/target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch +++ b/target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch @@ -9,7 +9,7 @@ Acked-by: Rob Landley --- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1062,9 +1062,6 @@ config FW_ARC +@@ -1063,9 +1063,6 @@ config FW_ARC config ARCH_MAY_HAVE_PC_FDC bool @@ -19,7 +19,7 @@ Acked-by: Rob Landley config CEVT_BCM1480 bool -@@ -2968,6 +2965,18 @@ choice +@@ -2969,6 +2966,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice diff --git a/target/linux/generic/pending-4.19/304-mips_disable_fpu.patch b/target/linux/generic/pending-4.19/304-mips_disable_fpu.patch index 2278576d21..332bb71e22 100644 --- a/target/linux/generic/pending-4.19/304-mips_disable_fpu.patch +++ b/target/linux/generic/pending-4.19/304-mips_disable_fpu.patch @@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -2892,6 +2892,20 @@ config MIPS_O32_FP64_SUPPORT +@@ -2893,6 +2893,20 @@ config MIPS_O32_FP64_SUPPORT If unsure, say N. diff --git a/target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch b/target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch index d28bc7ba99..07a6da453f 100644 --- a/target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch +++ b/target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch @@ -19,7 +19,7 @@ Signed-off-by: Hauke Mehrtens --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1116,7 +1116,6 @@ config DMA_PERDEV_COHERENT +@@ -1117,7 +1117,6 @@ config DMA_PERDEV_COHERENT config DMA_NONCOHERENT bool select ARCH_HAS_SYNC_DMA_FOR_DEVICE @@ -27,7 +27,7 @@ Signed-off-by: Hauke Mehrtens select NEED_DMA_MAP_STATE select DMA_NONCOHERENT_MMAP select DMA_NONCOHERENT_CACHE_SYNC -@@ -1897,9 +1896,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 +@@ -1898,9 +1897,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 config SYS_HAS_CPU_MIPS32_R5 bool @@ -39,7 +39,7 @@ Signed-off-by: Hauke Mehrtens config SYS_HAS_CPU_MIPS64_R1 bool -@@ -1909,6 +1910,7 @@ config SYS_HAS_CPU_MIPS64_R2 +@@ -1910,6 +1911,7 @@ config SYS_HAS_CPU_MIPS64_R2 config SYS_HAS_CPU_MIPS64_R6 bool @@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens config SYS_HAS_CPU_R3000 bool -@@ -1945,6 +1947,7 @@ config SYS_HAS_CPU_R8000 +@@ -1946,6 +1948,7 @@ config SYS_HAS_CPU_R8000 config SYS_HAS_CPU_R10000 bool @@ -55,7 +55,7 @@ Signed-off-by: Hauke Mehrtens config SYS_HAS_CPU_RM7000 bool -@@ -1973,6 +1976,7 @@ config SYS_HAS_CPU_BMIPS4380 +@@ -1974,6 +1977,7 @@ config SYS_HAS_CPU_BMIPS4380 config SYS_HAS_CPU_BMIPS5000 bool select SYS_HAS_CPU_BMIPS diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index dcd9b187c3..0a1e017f89 100644 --- a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5473,6 +5473,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5470,6 +5470,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5604,10 +5611,19 @@ static int nf_tables_newflowtable(struct +@@ -5601,10 +5608,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5733,7 +5749,8 @@ static int nf_tables_fill_flowtable_info +@@ -5730,7 +5746,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch b/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch index d40dcef509..9e39427c6a 100644 --- a/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch +++ b/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -2317,6 +2317,12 @@ config MIPS_VPE_LOADER +@@ -2318,6 +2318,12 @@ config MIPS_VPE_LOADER Includes a loader for loading an elf relocatable object onto another VPE and running it. diff --git a/target/linux/x86/patches-4.19/011-tune_lzma_options.patch b/target/linux/x86/patches-4.19/011-tune_lzma_options.patch index e680f9c484..09d3c6c7ce 100644 --- a/target/linux/x86/patches-4.19/011-tune_lzma_options.patch +++ b/target/linux/x86/patches-4.19/011-tune_lzma_options.patch @@ -1,6 +1,6 @@ --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -324,7 +324,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) +@@ -325,7 +325,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ From f0df0d6a1472d8d3692998de6b42bd17287d04e9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 23 Dec 2019 20:48:13 +0100 Subject: [PATCH 116/480] kernel: bump 4.19 to 4.19.91 Refreshed all patches. Compile-tested on: ipq40xx, apm821xx Runtime-tested on: ipq40xx Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 ++-- .../950-0044-MMC-added-alternative-MMC-driver.patch | 6 +++--- ...mware-raspberrypi-Notify-firmware-of-a-reboot.patch | 4 ++-- target/linux/generic/hack-4.19/721-phy_packets.patch | 2 +- ...et-bridge-support-hardware-flow-table-offload.patch | 4 ++-- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 4 ++-- .../patches-4.19/0063-3-tsens-fix-kernel-4_19.patch | 2 +- ...-generic-Mangle-bootloader-s-kernel-arguments.patch | 4 ++-- .../0071-6-PCI-qcom-Force-GEN1-support.patch | 10 +++++----- .../0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch | 4 ++-- .../patches-4.19/0072-add-ipq806x-with-no-clocks.patch | 2 +- .../080-ARM-dts-qcom-add-gpio-ranges-property.patch | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 8ccd5f0d77..6cae8d8555 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .206 LINUX_VERSION-4.14 = .159 -LINUX_VERSION-4.19 = .90 +LINUX_VERSION-4.19 = .91 LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 LINUX_KERNEL_HASH-4.14.159 = e8d42d3a1b85d180141e9bc11c4a0e87f8a413c0e989b0f24c1b7c40f8a826f2 -LINUX_KERNEL_HASH-4.19.90 = 29d86c0a6daf169ec0b4b42a12f8d55dc894c52bd901f876f52a05906a5cf7fd +LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch index 25f587b2d7..3caebb8943 100644 --- a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch @@ -125,7 +125,7 @@ Signed-off-by: Phil Elwell static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2913,6 +2920,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2876,6 +2883,7 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -133,7 +133,7 @@ Signed-off-by: Phil Elwell /* * Check that the card supports the command class(es) we need. -@@ -2920,7 +2928,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2883,7 +2891,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -151,7 +151,7 @@ Signed-off-by: Phil Elwell card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2935,9 +2952,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2898,9 +2915,14 @@ static int mmc_blk_probe(struct mmc_card string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); diff --git a/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch index ffe679fcf2..f74f75e769 100644 --- a/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch +++ b/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch @@ -13,10 +13,10 @@ Signed-off-by: Phil Elwell --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c -@@ -14,6 +14,7 @@ - #include +@@ -15,6 +15,7 @@ #include #include + #include +#include #include #include diff --git a/target/linux/generic/hack-4.19/721-phy_packets.patch b/target/linux/generic/hack-4.19/721-phy_packets.patch index 39bb364d08..e9c09302e3 100644 --- a/target/linux/generic/hack-4.19/721-phy_packets.patch +++ b/target/linux/generic/hack-4.19/721-phy_packets.patch @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau const struct header_ops *header_ops; unsigned int flags; -@@ -1919,6 +1926,10 @@ struct net_device { +@@ -1924,6 +1931,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch index 7d9c8abe9c..8b09fabf12 100644 --- a/target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.19/643-net-bridge-support-hardware-flow-table-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #include #include "br_private.h" -@@ -370,6 +374,28 @@ static const struct ethtool_ops br_ethto +@@ -376,6 +380,28 @@ static const struct ethtool_ops br_ethto .get_link = ethtool_op_get_link, }; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau static const struct net_device_ops br_netdev_ops = { .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, -@@ -397,6 +423,9 @@ static const struct net_device_ops br_ne +@@ -403,6 +429,9 @@ static const struct net_device_ops br_ne .ndo_bridge_setlink = br_setlink, .ndo_bridge_dellink = br_dellink, .ndo_features_check = passthru_features_check, diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 5ce652ba50..1e52d2f2a7 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1882,6 +1882,8 @@ struct net_device { +@@ -1887,6 +1887,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); } -@@ -7732,6 +7779,7 @@ int dev_set_mac_address(struct net_devic +@@ -7733,6 +7780,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch b/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch index 19afe8c212..a870692906 100644 --- a/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch +++ b/target/linux/ipq806x/patches-4.19/0063-3-tsens-fix-kernel-4_19.patch @@ -1,6 +1,6 @@ --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c -@@ -128,6 +128,7 @@ +@@ -128,6 +128,7 @@ int __init init_common(struct tsens_devi { void __iomem *base; struct resource *res; diff --git a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index 947eb08d75..b7b9c991e0 100644 --- a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1925,6 +1925,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1926,6 +1926,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. @@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella static int kernel_init(void *); extern void init_IRQ(void); -@@ -594,6 +598,18 @@ asmlinkage __visible void __init start_k +@@ -593,6 +597,18 @@ asmlinkage __visible void __init start_k pr_notice("Kernel command line: %s\n", boot_command_line); /* parameters may set static keys */ jump_label_init(); diff --git a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch index 90b232f8b7..c1461e68c2 100644 --- a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch +++ b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch @@ -38,7 +38,7 @@ Signed-off-by: Sham Muthayyan /* Set the Max TLP size to 2K, instead of using default of 4K */ -@@ -1369,6 +1377,8 @@ static int qcom_pcie_probe(struct platfo +@@ -1367,6 +1375,8 @@ static int qcom_pcie_probe(struct platfo struct dw_pcie *pci; struct qcom_pcie *pcie; int ret; @@ -47,13 +47,13 @@ Signed-off-by: Sham Muthayyan pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); if (!pcie) -@@ -1391,6 +1401,9 @@ static int qcom_pcie_probe(struct platfo - if (IS_ERR(pcie->reset)) - return PTR_ERR(pcie->reset); +@@ -1397,6 +1407,9 @@ static int qcom_pcie_probe(struct platfo + goto err_pm_runtime_put; + } + of_property_read_u32(np, "force_gen1", &force_gen1); + pcie->force_gen1 = force_gen1; + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "parf"); pcie->parf = devm_ioremap_resource(dev, res); - if (IS_ERR(pcie->parf)) + if (IS_ERR(pcie->parf)) { diff --git a/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch b/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch index 78120d3e38..e7b5b6f9af 100644 --- a/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch +++ b/target/linux/ipq806x/patches-4.19/0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B.patch @@ -31,8 +31,8 @@ Signed-off-by: Gokul Sriram Palanisamy #define QCOM_PCIE_2_1_0_MAX_SUPPLY 3 struct qcom_pcie_resources_2_1_0 { struct clk *iface_clk; -@@ -1453,6 +1461,35 @@ static int qcom_pcie_probe(struct platfo - return 0; +@@ -1475,6 +1483,35 @@ err_pm_runtime_put: + return ret; } +static void qcom_pcie_fixup_final(struct pci_dev *dev) diff --git a/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch b/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch index ecd9672d1b..76c7cfd568 100644 --- a/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch +++ b/target/linux/ipq806x/patches-4.19/0072-add-ipq806x-with-no-clocks.patch @@ -1,6 +1,6 @@ --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c -@@ -606,6 +606,9 @@ static const struct of_device_id qcom_sc +@@ -609,6 +609,9 @@ static const struct of_device_id qcom_sc { .compatible = "qcom,scm-ipq4019", .data = NULL, /* no clocks */ }, diff --git a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch index 500930cfe9..04cb9b3bb7 100644 --- a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch +++ b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch @@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl. --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -653,6 +653,7 @@ +@@ -625,6 +625,7 @@ reg = <0x800000 0x4000>; gpio-controller; From 25b422a0412d88345c911875fd4413c46c913d4e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 23 Dec 2019 21:46:17 +0100 Subject: [PATCH 117/480] kernel: bump 4.14 to 4.14.160 Refreshed all patches. Compile-tested on: ipq40xx, apm821xx Runtime-tested on: ipq40xx Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 ++-- .../025-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 4 ++-- ...74-flow_dissector-Parse-batman-adv-unicast-headers.patch | 2 +- target/linux/generic/hack-4.14/721-phy_packets.patch | 2 +- ...643-net-bridge-support-hardware-flow-table-offload.patch | 4 ++-- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 4 ++-- .../patches-4.14/202-core-linux-support-layerscape.patch | 6 +++--- .../patches-4.14/807-usb-support-layerscape.patch | 4 ++-- .../patches-4.14/816-pcie-support-layerscape.patch | 2 +- ...p-move-module-eeprom-ethtool-access-into-netdev-co.patch | 2 +- ...t-thunderx-add-support-for-rgmii-internal-delay-mo.patch | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 6cae8d8555..97dcd0296b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .206 -LINUX_VERSION-4.14 = .159 +LINUX_VERSION-4.14 = .160 LINUX_VERSION-4.19 = .91 LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 -LINUX_KERNEL_HASH-4.14.159 = e8d42d3a1b85d180141e9bc11c4a0e87f8a413c0e989b0f24c1b7c40f8a826f2 +LINUX_KERNEL_HASH-4.14.160 = c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 484093d55a..b851799824 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin * Before updating sk_refcnt, we must commit prior changes to memory --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1696,7 +1696,7 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1697,7 +1697,7 @@ u32 tcp_tso_autosize(const struct sock * { u32 bytes, segs; @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); /* Goal is to send at least one packet per ms, -@@ -2214,7 +2214,7 @@ static bool tcp_small_queue_check(struct +@@ -2215,7 +2215,7 @@ static bool tcp_small_queue_check(struct { unsigned int limit; diff --git a/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch b/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch index b0b2823cc9..a9b2fc40a3 100644 --- a/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch +++ b/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch @@ -94,7 +94,7 @@ Signed-off-by: David S. Miller static void __skb_flow_dissect_tcp(const struct sk_buff *skb, struct flow_dissector *flow_dissector, -@@ -717,6 +769,11 @@ proto_again: +@@ -718,6 +770,11 @@ proto_again: nhoff, hlen); break; diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index 9e1c57d92d..2c59e837af 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau const struct header_ops *header_ops; unsigned int flags; -@@ -1797,6 +1804,10 @@ struct net_device { +@@ -1802,6 +1809,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch index a070fe1636..b54d3cb48f 100644 --- a/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #include #include "br_private.h" -@@ -340,6 +344,28 @@ static const struct ethtool_ops br_ethto +@@ -346,6 +350,28 @@ static const struct ethtool_ops br_ethto .get_link = ethtool_op_get_link, }; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau static const struct net_device_ops br_netdev_ops = { .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, -@@ -367,6 +393,9 @@ static const struct net_device_ops br_ne +@@ -373,6 +399,9 @@ static const struct net_device_ops br_ne .ndo_bridge_setlink = br_setlink, .ndo_bridge_dellink = br_dellink, .ndo_features_check = passthru_features_check, diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index f76c39ac18..8919ea34ec 100644 --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1766,6 +1766,8 @@ struct net_device { +@@ -1771,6 +1771,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6969,6 +7016,7 @@ int dev_set_mac_address(struct net_devic +@@ -6970,6 +7017,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 7be95d49e4..63d12e688e 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -539,7 +539,7 @@ Signed-off-by: Yangbo Lu --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2344,7 +2344,8 @@ int register_netdevice_notifier(struct n +@@ -2349,7 +2349,8 @@ int register_netdevice_notifier(struct n int unregister_netdevice_notifier(struct notifier_block *nb); struct netdev_notifier_info { @@ -549,7 +549,7 @@ Signed-off-by: Yangbo Lu }; struct netdev_notifier_info_ext { -@@ -2376,6 +2377,7 @@ static inline void netdev_notifier_info_ +@@ -2381,6 +2382,7 @@ static inline void netdev_notifier_info_ struct net_device *dev) { info->dev = dev; @@ -557,7 +557,7 @@ Signed-off-by: Yangbo Lu } static inline struct net_device * -@@ -2384,6 +2386,12 @@ netdev_notifier_info_to_dev(const struct +@@ -2389,6 +2391,12 @@ netdev_notifier_info_to_dev(const struct return info->dev; } diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 3d8de1e516..a569dff7d6 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -1289,7 +1289,7 @@ Signed-off-by: Zhao Chenhui xhci->quirks |= XHCI_BROKEN_PORT_PED; --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -1976,10 +1976,12 @@ static int finish_td(struct xhci_hcd *xh +@@ -1972,10 +1972,12 @@ static int finish_td(struct xhci_hcd *xh union xhci_trb *ep_trb, struct xhci_transfer_event *event, struct xhci_virt_ep *ep, int *status) { @@ -1302,7 +1302,7 @@ Signed-off-by: Zhao Chenhui u32 trb_comp_code; int ep_index; -@@ -2002,14 +2004,30 @@ static int finish_td(struct xhci_hcd *xh +@@ -1998,14 +2000,30 @@ static int finish_td(struct xhci_hcd *xh if (trb_comp_code == COMP_STALL_ERROR || xhci_requires_manual_halt_cleanup(xhci, ep_ctx, trb_comp_code)) { diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index f3f09989a7..216bef0c3f 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -5618,7 +5618,7 @@ Signed-off-by: Yangbo Lu static void quirk_no_pm_reset(struct pci_dev *dev) { /* -@@ -4878,3 +4885,11 @@ static void quirk_no_ats(struct pci_dev +@@ -4884,3 +4891,11 @@ static void quirk_no_ats(struct pci_dev DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_no_ats); #endif /* CONFIG_PCI_ATS */ diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch index 2e4be1bc48..19f8f1e632 100644 --- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch +++ b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch @@ -129,7 +129,7 @@ Signed-off-by: Russell King /* 802.11 specific */ struct wireless_dev; /* 802.15.4 specific */ -@@ -1935,6 +1936,7 @@ struct net_device { +@@ -1940,6 +1941,7 @@ struct net_device { struct netprio_map __rcu *priomap; #endif struct phy_device *phydev; diff --git a/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch b/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch index efd13da5ec..cf0f96dce3 100644 --- a/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch +++ b/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch @@ -51,7 +51,7 @@ Signed-off-by: Tim Harvey + lmac->lmac_type))) return -ENODEV; - phy_start_aneg(lmac->phydev); + phy_start(lmac->phydev); @@ -1287,6 +1289,8 @@ static int bgx_init_of_phy(struct bgx *b bgx->lmac[lmac].lmacid = lmac; From 47a93a810f78adce5a130d287f82b28e9b54313c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 23 Dec 2019 21:49:48 +0100 Subject: [PATCH 118/480] kernel: bump 4.9 to 4.9.207 Refreshed all patches. Compile-tested on: ar7 Runtime-tested on: none Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 ++-- .../ar7/patches-4.9/300-add-ac49x-platform.patch | 2 +- .../024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch | 6 +++--- ...-remove-one-locked-operation-in-tcp_wfree.patch | 4 ++-- ...-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch | 6 +++--- ...4-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch | 4 ++-- ...q-add-a-shortcut-in-tcp_small_queue_check.patch | 2 +- ...tcp-tcp_mtu_probe-is-likely-to-exit-early.patch | 2 +- ...tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch | 14 +++++++------- ...add-a-missing-barrier-in-tcp_tasklet_func.patch | 2 +- .../025-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 4 ++-- ...002-mtd-introduce-function-max_bad_blocks.patch | 2 +- .../090-net-generalize-napi_complete_done.patch | 2 +- .../linux/generic/hack-4.9/204-module_strip.patch | 14 +++++++------- .../hack-4.9/301-mips_image_cmdline_hack.patch | 2 +- .../linux/generic/hack-4.9/721-phy_packets.patch | 2 +- .../pending-4.9/300-mips_expose_boot_raw.patch | 4 ++-- .../generic/pending-4.9/304-mips_disable_fpu.patch | 2 +- ...m-remove-no-op-dma_map_ops-where-possible.patch | 8 ++++---- ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 4 ++-- ...b-Remove-annoying-warning-about-bogus-URB.patch | 4 ++-- .../pending-4.9/890-uart_optional_sysrq.patch | 2 +- .../ixp4xx/patches-4.9/160-delayed_uart_io.patch | 2 +- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 97dcd0296b..bc2373d7a9 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .206 +LINUX_VERSION-4.9 = .207 LINUX_VERSION-4.14 = .160 LINUX_VERSION-4.19 = .91 -LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 +LINUX_KERNEL_HASH-4.9.207 = ca86637e7b5bec65eeb7da695824e0e8aca5ba52eb742885f0b7241977400124 LINUX_KERNEL_HASH-4.14.160 = c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447 diff --git a/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch b/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch index 8773ef98bb..49c2cfbe6a 100644 --- a/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch +++ b/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch @@ -46,7 +46,7 @@ config ATH25 bool "Atheros AR231x/AR531x SoC support" -@@ -1006,6 +1006,7 @@ config MIPS_PARAVIRT +@@ -1007,6 +1007,7 @@ config MIPS_PARAVIRT endchoice source "arch/mips/alchemy/Kconfig" diff --git a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch b/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch index 172e714c5d..853b7d6cc0 100644 --- a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch +++ b/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch @@ -45,7 +45,7 @@ Signed-off-by: David S. Miller return (struct tcp_sock *)sk; --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -789,10 +789,10 @@ static void tcp_tasklet_func(unsigned lo +@@ -790,10 +790,10 @@ static void tcp_tasklet_func(unsigned lo } } @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller /** * tcp_release_cb - tcp release_sock() callback * @sk: socket -@@ -813,7 +813,7 @@ void tcp_release_cb(struct sock *sk) +@@ -814,7 +814,7 @@ void tcp_release_cb(struct sock *sk) nflags = flags & ~TCP_DEFERRED_ALL; } while (cmpxchg(&tp->tsq_flags, flags, nflags) != flags); @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller tcp_tsq_handler(sk); /* Here begins the tricky part : -@@ -827,15 +827,15 @@ void tcp_release_cb(struct sock *sk) +@@ -828,15 +828,15 @@ void tcp_release_cb(struct sock *sk) */ sock_release_ownership(sk); diff --git a/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch b/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch index af194b2bed..dfd9abf943 100644 --- a/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch +++ b/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -865,6 +865,7 @@ void tcp_wfree(struct sk_buff *skb) +@@ -866,6 +866,7 @@ void tcp_wfree(struct sk_buff *skb) { struct sock *sk = skb->sk; struct tcp_sock *tp = tcp_sk(sk); @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller int wmem; /* Keep one reference on sk_wmem_alloc. -@@ -882,11 +883,17 @@ void tcp_wfree(struct sk_buff *skb) +@@ -883,11 +884,17 @@ void tcp_wfree(struct sk_buff *skb) if (wmem >= SKB_TRUESIZE(1) && this_cpu_ksoftirqd() == current) goto out; diff --git a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch index 80b2c3db1c..90979c48b8 100644 --- a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch +++ b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch @@ -22,7 +22,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -772,19 +772,19 @@ static void tcp_tasklet_func(unsigned lo +@@ -773,19 +773,19 @@ static void tcp_tasklet_func(unsigned lo list_for_each_safe(q, n, &list) { tp = list_entry(q, struct tcp_sock, tsq_node); list_del(&tp->tsq_node); @@ -51,7 +51,7 @@ Signed-off-by: David S. Miller sk_free(sk); } } -@@ -889,7 +889,7 @@ void tcp_wfree(struct sk_buff *skb) +@@ -890,7 +890,7 @@ void tcp_wfree(struct sk_buff *skb) if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED)) goto out; @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller nval = cmpxchg(&tp->tsq_flags, oval, nval); if (nval != oval) continue; -@@ -2236,6 +2236,8 @@ static bool tcp_write_xmit(struct sock * +@@ -2237,6 +2237,8 @@ static bool tcp_write_xmit(struct sock * unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) break; diff --git a/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch b/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch index 87452ac853..2b5ef932de 100644 --- a/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch +++ b/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch @@ -16,7 +16,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -885,6 +885,7 @@ void tcp_wfree(struct sk_buff *skb) +@@ -886,6 +886,7 @@ void tcp_wfree(struct sk_buff *skb) for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) { struct tsq_tasklet *tsq; @@ -24,7 +24,7 @@ Signed-off-by: David S. Miller if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED)) goto out; -@@ -897,8 +898,10 @@ void tcp_wfree(struct sk_buff *skb) +@@ -898,8 +899,10 @@ void tcp_wfree(struct sk_buff *skb) /* queue this socket to tasklet queue */ local_irq_save(flags); tsq = this_cpu_ptr(&tsq_tasklet); diff --git a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch index 7cfc819ecc..0156efa65e 100644 --- a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch +++ b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -2141,6 +2141,15 @@ static bool tcp_small_queue_check(struct +@@ -2142,6 +2142,15 @@ static bool tcp_small_queue_check(struct limit <<= factor; if (atomic_read(&sk->sk_wmem_alloc) > limit) { diff --git a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch index f74556912e..5669b897e7 100644 --- a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch +++ b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1973,26 +1973,26 @@ static bool tcp_can_coalesce_send_queue_ +@@ -1974,26 +1974,26 @@ static bool tcp_can_coalesce_send_queue_ */ static int tcp_mtu_probe(struct sock *sk) { diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch index eef1a1cc89..8beceff0fa 100644 --- a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch +++ b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch @@ -58,7 +58,7 @@ Signed-off-by: David S. Miller goto out; --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -772,14 +772,15 @@ static void tcp_tasklet_func(unsigned lo +@@ -773,14 +773,15 @@ static void tcp_tasklet_func(unsigned lo list_for_each_safe(q, n, &list) { tp = list_entry(q, struct tcp_sock, tsq_node); list_del(&tp->tsq_node); @@ -77,7 +77,7 @@ Signed-off-by: David S. Miller tcp_tsq_handler(sk); } bh_unlock_sock(sk); -@@ -802,16 +803,15 @@ static void tcp_tasklet_func(unsigned lo +@@ -803,16 +804,15 @@ static void tcp_tasklet_func(unsigned lo */ void tcp_release_cb(struct sock *sk) { @@ -96,7 +96,7 @@ Signed-off-by: David S. Miller if (flags & TCPF_TSQ_DEFERRED) tcp_tsq_handler(sk); -@@ -883,7 +883,7 @@ void tcp_wfree(struct sk_buff *skb) +@@ -884,7 +884,7 @@ void tcp_wfree(struct sk_buff *skb) if (wmem >= SKB_TRUESIZE(1) && this_cpu_ksoftirqd() == current) goto out; @@ -105,7 +105,7 @@ Signed-off-by: David S. Miller struct tsq_tasklet *tsq; bool empty; -@@ -891,7 +891,7 @@ void tcp_wfree(struct sk_buff *skb) +@@ -892,7 +892,7 @@ void tcp_wfree(struct sk_buff *skb) goto out; nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED | TCPF_TSQ_DEFERRED; @@ -114,7 +114,7 @@ Signed-off-by: David S. Miller if (nval != oval) continue; -@@ -2150,7 +2150,7 @@ static bool tcp_small_queue_check(struct +@@ -2151,7 +2151,7 @@ static bool tcp_small_queue_check(struct skb->prev == sk->sk_write_queue.next) return false; @@ -123,7 +123,7 @@ Signed-off-by: David S. Miller /* It is possible TX completion already happened * before we set TSQ_THROTTLED, so we must * test again the condition. -@@ -2248,8 +2248,8 @@ static bool tcp_write_xmit(struct sock * +@@ -2249,8 +2249,8 @@ static bool tcp_write_xmit(struct sock * unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) break; @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller if (tcp_small_queue_check(sk, skb, 0)) break; -@@ -3560,8 +3560,6 @@ void __tcp_send_ack(struct sock *sk, u32 +@@ -3561,8 +3561,6 @@ void __tcp_send_ack(struct sock *sk, u32 /* We do not want pure acks influencing TCP Small Queues or fq/pacing * too much. * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 diff --git a/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch index bd74303266..bcdbe8ce39 100644 --- a/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch +++ b/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch @@ -30,7 +30,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -774,6 +774,7 @@ static void tcp_tasklet_func(unsigned lo +@@ -775,6 +775,7 @@ static void tcp_tasklet_func(unsigned lo list_del(&tp->tsq_node); sk = (struct sock *)tp; diff --git a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 8eef72c9c4..11f1cd565d 100644 --- a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin * Before updating sk_refcnt, we must commit prior changes to memory --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1606,7 +1606,7 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1607,7 +1607,7 @@ u32 tcp_tso_autosize(const struct sock * { u32 bytes, segs; @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); /* Goal is to send at least one packet per ms, -@@ -2137,7 +2137,7 @@ static bool tcp_small_queue_check(struct +@@ -2138,7 +2138,7 @@ static bool tcp_small_queue_check(struct { unsigned int limit; diff --git a/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch b/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch index d2e582ef5b..b2549ca3c4 100644 --- a/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch +++ b/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch @@ -52,7 +52,7 @@ Signed-off-by: Brian Norris int (*_suspend) (struct mtd_info *mtd); void (*_resume) (struct mtd_info *mtd); void (*_reboot) (struct mtd_info *mtd); -@@ -397,6 +398,18 @@ static inline int mtd_oobavail(struct mt +@@ -397,6 +398,18 @@ static inline u32 mtd_oobavail(struct mt return ops->mode == MTD_OPS_AUTO_OOB ? mtd->oobavail : mtd->oobsize; } diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index d8d8ad5ea4..308dd0f194 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -1346,7 +1346,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c -@@ -2803,7 +2803,7 @@ static int ath10k_pci_napi_poll(struct n +@@ -2804,7 +2804,7 @@ static int ath10k_pci_napi_poll(struct n done = ath10k_htt_txrx_compl_task(ar, budget); if (done < budget) { diff --git a/target/linux/generic/hack-4.9/204-module_strip.patch b/target/linux/generic/hack-4.9/204-module_strip.patch index fcca6bd02c..2f34791cd9 100644 --- a/target/linux/generic/hack-4.9/204-module_strip.patch +++ b/target/linux/generic/hack-4.9/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -2968,9 +2968,11 @@ static struct module *setup_load_info(st +@@ -2970,9 +2970,11 @@ static struct module *setup_load_info(st static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -2991,6 +2993,7 @@ static int check_modinfo(struct module * +@@ -2993,6 +2995,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1967,7 +1967,9 @@ static void read_symbols(char *modname) +@@ -1979,7 +1979,9 @@ static void read_symbols(char *modname) symname = remove_dot(info.strtab + sym->st_name); handle_modversions(mod, &info, sym, symname); @@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau } if (!is_vmlinux(modname) || (is_vmlinux(modname) && vmlinux_section_warnings)) -@@ -2111,7 +2113,9 @@ static void add_header(struct buffer *b, +@@ -2123,7 +2125,9 @@ static void add_header(struct buffer *b, buf_printf(b, "#include \n"); buf_printf(b, "#include \n"); buf_printf(b, "\n"); @@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); -@@ -2128,24 +2132,30 @@ static void add_header(struct buffer *b, +@@ -2140,24 +2144,30 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -188,7 +188,7 @@ Signed-off-by: Felix Fietkau } /* In kernel, this size is defined in linux/module.h; -@@ -2249,11 +2259,13 @@ static void add_depends(struct buffer *b +@@ -2261,11 +2271,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -202,7 +202,7 @@ Signed-off-by: Felix Fietkau } static void write_if_changed(struct buffer *b, const char *fname) -@@ -2488,7 +2500,9 @@ int main(int argc, char **argv) +@@ -2500,7 +2512,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod, modules); diff --git a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch index 01caff5b89..eb6011e813 100644 --- a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch +++ b/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1157,6 +1157,10 @@ config SYNC_R4K +@@ -1158,6 +1158,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch index feb3569f04..e1ad675a76 100644 --- a/target/linux/generic/hack-4.9/721-phy_packets.patch +++ b/target/linux/generic/hack-4.9/721-phy_packets.patch @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau const struct header_ops *header_ops; unsigned int flags; -@@ -1783,6 +1790,10 @@ struct net_device { +@@ -1788,6 +1795,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch index f826bf557e..b52b4cd660 100644 --- a/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch +++ b/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch @@ -9,7 +9,7 @@ Acked-by: Rob Landley --- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1066,9 +1066,6 @@ config FW_ARC +@@ -1067,9 +1067,6 @@ config FW_ARC config ARCH_MAY_HAVE_PC_FDC bool @@ -19,7 +19,7 @@ Acked-by: Rob Landley config CEVT_BCM1480 bool -@@ -2965,6 +2962,18 @@ choice +@@ -2966,6 +2963,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice diff --git a/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch b/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch index 4765da72de..b59b9feee9 100644 --- a/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch +++ b/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch @@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -2889,6 +2889,20 @@ config MIPS_O32_FP64_SUPPORT +@@ -2890,6 +2890,20 @@ config MIPS_O32_FP64_SUPPORT If unsure, say N. diff --git a/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch b/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch index 19f5d294c8..0f47f79c68 100644 --- a/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch +++ b/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau select HAVE_PCSPKR_PLATFORM select IRQ_MIPS_CPU select I8253 -@@ -1127,6 +1129,9 @@ config DMA_NONCOHERENT +@@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT bool select NEED_DMA_MAP_STATE @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau config NEED_DMA_MAP_STATE bool -@@ -1651,6 +1656,7 @@ config CPU_R10000 +@@ -1652,6 +1657,7 @@ config CPU_R10000 select CPU_SUPPORTS_64BIT_KERNEL select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_HUGEPAGES @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau help MIPS Technologies R10000-series processors. -@@ -1896,9 +1902,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 +@@ -1897,9 +1903,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 bool config SYS_HAS_CPU_MIPS32_R5 @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau bool config SYS_HAS_CPU_MIPS64_R1 -@@ -1908,6 +1916,7 @@ config SYS_HAS_CPU_MIPS64_R2 +@@ -1909,6 +1917,7 @@ config SYS_HAS_CPU_MIPS64_R2 bool config SYS_HAS_CPU_MIPS64_R6 diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index cccd364f6c..e7e1a3a3bc 100644 --- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1752,6 +1752,8 @@ struct net_device { +@@ -1757,6 +1757,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6667,6 +6714,7 @@ int dev_set_mac_address(struct net_devic +@@ -6668,6 +6715,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch b/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch index dc60557f4e..5fac5e0e4f 100644 --- a/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch +++ b/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch @@ -52,7 +52,7 @@ Signed-off-by: Alexey Brodkin --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c -@@ -321,9 +321,6 @@ EXPORT_SYMBOL_GPL(usb_unanchor_urb); +@@ -322,9 +322,6 @@ EXPORT_SYMBOL_GPL(usb_unanchor_urb); */ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) { @@ -62,7 +62,7 @@ Signed-off-by: Alexey Brodkin int xfertype, max; struct usb_device *dev; struct usb_host_endpoint *ep; -@@ -441,11 +438,6 @@ int usb_submit_urb(struct urb *urb, gfp_ +@@ -442,11 +439,6 @@ int usb_submit_urb(struct urb *urb, gfp_ * cause problems in HCDs if they get it wrong. */ diff --git a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch index d80246db99..8941571329 100644 --- a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch +++ b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h -@@ -456,7 +456,7 @@ extern void uart_handle_cts_change(struc +@@ -457,7 +457,7 @@ extern void uart_handle_cts_change(struc extern void uart_insert_char(struct uart_port *port, unsigned int status, unsigned int overrun, unsigned int ch, unsigned int flag); diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch index 3b94280179..95cc5680cd 100644 --- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch @@ -54,7 +54,7 @@ unsigned int read_status_mask; /* driver specific */ unsigned int ignore_status_mask; /* driver specific */ -@@ -233,6 +234,7 @@ struct uart_port { +@@ -234,6 +235,7 @@ struct uart_port { int hw_stopped; /* sw-assisted CTS flow state */ unsigned int mctrl; /* current modem ctrl settings */ unsigned int timeout; /* character-based timeout */ From 67dcc43f3a22dc3a7ac07a7065971b426feeb043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 23 Dec 2019 13:42:55 +0100 Subject: [PATCH 119/480] brcm2708: organize kernel patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- ...1-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch | 2 +- .../950-0002-smsx95xx-fix-crimes-against-truesize.patch | 2 +- ...3-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch | 2 +- .../950-0004-Allow-mac-address-to-be-set-in-smsc95xx.patch | 2 +- ...5-Protect-__release_resource-against-resources-without.patch | 2 +- ...6-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch | 2 +- .../950-0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch | 2 +- .../patches-4.19/950-0008-irqchip-bcm2835-Add-FIQ-support.patch | 2 +- .../950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch | 2 +- ...0-spidev-Add-spidev-compatible-string-to-silence-warni.patch | 2 +- ...50-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch | 2 +- .../950-0012-spi-bcm2835-Disable-forced-software-CS.patch | 2 +- .../patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch | 2 +- ...4-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch | 2 +- .../patches-4.19/950-0015-firmware-Updated-mailbox-header.patch | 2 +- .../950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch | 2 +- ...0017-watchdog-bcm2835-Support-setting-reboot-partition.patch | 2 +- ...8-reboot-Use-power-off-rather-than-busy-spinning-when-.patch | 2 +- .../950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch | 2 +- ...0-Register-the-clocks-early-during-the-boot-process-so.patch | 2 +- ...0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch | 2 +- ...0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch | 2 +- ...-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch | 2 +- .../950-0024-clk-bcm2835-Add-claim-clocks-property.patch | 2 +- ...950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch | 2 +- ...6-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch | 2 +- .../950-0027-sound-Demote-deferral-errors-to-INFO-level.patch | 2 +- .../brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch | 2 +- .../patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch | 2 +- .../patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch | 2 +- .../950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch | 2 +- ...-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch | 2 +- .../950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch | 2 +- ...950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch | 2 +- .../patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch | 2 +- ...50-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch | 2 +- ...0-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch | 2 +- ...8-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch | 2 +- .../patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch | 2 +- .../brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch | 2 +- .../patches-4.19/950-0041-bcm2708-framebuffer-driver.patch | 2 +- ...0-0042-Speed-up-console-framebuffer-imageblit-function.patch | 2 +- .../950-0043-dmaengine-Add-support-for-BCM2708.patch | 2 +- .../950-0044-MMC-added-alternative-MMC-driver.patch | 2 +- ...5-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch | 2 +- ...6-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch | 2 +- ...-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch | 2 +- ...8-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch | 2 +- .../linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch | 2 +- ...0-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch | 2 +- .../brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch | 2 +- .../brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch | 2 +- .../patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch | 2 +- .../patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch | 2 +- .../950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch | 2 +- ...6-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch | 2 +- .../950-0057-BCM2708-Add-core-Device-Tree-support.patch | 2 +- ...8-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch | 2 +- .../patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch | 2 +- .../950-0060-Added-Device-IDs-for-August-DVB-T-205.patch | 2 +- ...1-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch | 2 +- ...2-Improve-__copy_to_user-and-__copy_from_user-performa.patch | 2 +- ...50-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch | 2 +- .../950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch | 2 +- ...950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch | 2 +- .../patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch | 2 +- ...0-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch | 2 +- .../patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch | 2 +- ...9-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch | 2 +- .../patches-4.19/950-0070-Add-driver-for-rpi-proto.patch | 2 +- .../950-0071-Add-Support-for-JustBoom-Audio-boards.patch | 2 +- ...2-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch | 2 +- ...3-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch | 2 +- .../950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch | 2 +- ...5-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch | 2 +- ...6-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch | 2 +- ...7-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch | 2 +- .../950-0078-Support-for-Blokas-Labs-pisound-board.patch | 2 +- .../950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch | 2 +- ...-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch | 2 +- .../950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch | 2 +- ...2-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch | 2 +- .../950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch | 2 +- .../950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch | 2 +- ...950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch | 2 +- ...0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch | 2 +- ...0-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch | 2 +- .../950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch | 2 +- .../950-0089-rpi_display-add-backlight-driver-and-overlay.patch | 2 +- .../950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch | 2 +- ...ce.patch => 950-0091-OF-DT-Overlay-configfs-interface.patch} | 2 +- ...ch => 950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch} | 2 +- ...-Add-arm64-configuration-and-device-tree-differences..patch} | 2 +- ...> 950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch} | 2 +- ...950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch} | 2 +- ...-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch} | 2 +- ...-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch} | 2 +- ...e.patch => 950-0098-cache-export-clean-and-invalidate.patch} | 2 +- ...patch => 950-0099-AXI-performance-monitor-driver-2222.patch} | 2 +- ...h => 950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch} | 2 +- ... 950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch} | 2 +- ...h => 950-0102-cgroup-Disable-cgroup-memory-by-default.patch} | 2 +- ...> 950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch} | 2 +- ...104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch} | 2 +- ...950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch} | 2 +- ...-raspberrypi-firmware-Export-the-general-transaction-.patch} | 2 +- ...-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch} | 2 +- ...08-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch} | 2 +- ...-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch} | 2 +- ...-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch} | 2 +- ...1-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch} | 2 +- ...0-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch} | 2 +- ...-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch} | 2 +- ...-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch} | 2 +- ...-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch} | 2 +- ...-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch} | 2 +- ...-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch} | 2 +- ...ix-build.patch => 950-0118-vc4_firmware_kms-fix-build.patch} | 2 +- ...r-error.patch => 950-0119-hack-cache-Fix-linker-error.patch} | 2 +- ...-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch} | 2 +- ... => 950-0121-sound-bcm-Fix-memset-dereference-warning.patch} | 2 +- ...-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch} | 2 +- ...h => 950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch} | 2 +- ...124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch} | 2 +- ...-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch} | 2 +- ...0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch} | 2 +- ...0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch} | 2 +- ...0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch} | 2 +- ...50-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch} | 2 +- ...0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch} | 2 +- ...-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch} | 2 +- ...0-0132-staging-vc04_services-Derive-g_cache_line_size.patch} | 2 +- ...e-fan-driver.patch => 950-0133-Add-rpi-poe-fan-driver.patch} | 2 +- ...-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch} | 2 +- ...lay.patch => 950-0135-bcm2835-interpolate-audio-delay.patch} | 2 +- ...-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch} | 2 +- ...0-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch} | 2 +- ...ngs.patch => 950-0138-overlays-Fix-a-few-dtc-warnings.patch} | 2 +- ...-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch} | 2 +- ...-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch} | 2 +- ...-firmware-raspberrypi-Add-backward-compatible-get_thr.patch} | 2 +- ... => 950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch} | 2 +- ...patch => 950-0143-Add-device-tree-overlay-for-HD44780.patch} | 2 +- ... 950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch} | 2 +- ...-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch} | 2 +- ...-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch} | 2 +- ...-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch} | 2 +- ... 950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch} | 2 +- ...-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch} | 2 +- ...-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch} | 2 +- ...ch => 950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch} | 2 +- ...> 950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch} | 2 +- ...lay.patch => 950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch} | 2 +- ...-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch} | 2 +- ...tch => 950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch} | 2 +- ...11.patch => 950-0156-Update-gpio-fan-overlay.dts-2711.patch} | 2 +- ...-drivers-thermal-step_wise-add-support-for-hysteresis.patch} | 2 +- ...-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch} | 2 +- ...950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch} | 2 +- ...0-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch} | 2 +- ...ch => 950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch} | 2 +- ...50-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch} | 2 +- ...0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch} | 2 +- ...0-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch} | 2 +- ...-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch} | 2 +- ...-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch} | 2 +- ... => 950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch} | 2 +- ...and.patch => 950-0168-Fix-warning-in-bcm2835-smi-nand.patch} | 2 +- ...> 950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch} | 2 +- ...-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch} | 2 +- ...ch => 950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch} | 2 +- ...-media-ov5647-Add-support-for-non-continuous-clock-mo.patch} | 2 +- ...=> 950-0173-media-tc358743-Increase-FIFO-level-to-374.patch} | 2 +- ...-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch} | 2 +- ...75-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch} | 2 +- ...-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch} | 2 +- ...0-0177-media-adv7180-Default-to-the-first-valid-input.patch} | 2 +- ...950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch} | 2 +- ...-media-videodev2-Add-helper-defines-for-printing-FOUR.patch} | 2 +- ...-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch} | 2 +- ...-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch} | 2 +- ...182-media-adv7180-Nasty-hack-to-allow-input-selection.patch} | 2 +- ... 950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch} | 2 +- ...-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch} | 2 +- ...-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch} | 2 +- ...-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch} | 2 +- ...-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch} | 2 +- ...date-README-2750.patch => 950-0188-Update-README-2750.patch} | 2 +- ...0-0189-overlays-Remove-superfluous-address-size-cells.patch} | 2 +- ...-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch} | 2 +- ...-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch} | 2 +- ...-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch} | 2 +- ...-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch} | 2 +- ...ay.patch => 950-0194-overlays-Update-upstream-overlay.patch} | 2 +- ...h => 950-0195-BCM2708_DT-update-firmware-node-binding.patch} | 2 +- ...tch => 950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch} | 2 +- ...0-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch} | 2 +- ...50-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch} | 2 +- ...0-0199-dt-bindings-Document-microchip-downshift-after.patch} | 2 +- ...50-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch} | 2 +- ...=> 950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch} | 2 +- ...202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch} | 2 +- ...0-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch} | 2 +- ...atch => 950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch} | 2 +- ...-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch} | 2 +- ...-media-tc358743-Return-an-appropriate-colorspace-from.patch} | 2 +- ...50-0207-staging-bcm2835-camera-fix-module-autoloading.patch} | 2 +- ...08-staging-bcm2835-camera-Move-module-info-to-the-end.patch} | 2 +- ...-staging-vchiq_arm-Fix-platform-device-unregistration.patch} | 2 +- ...0210-staging-vchiq_arm-Fix-camera-device-registration.patch} | 2 +- ...-staging-vchiq_arm-Register-a-platform-device-for-the.patch} | 2 +- ...=> 950-0212-staging-bcm2835-audio-Enable-compile-test.patch} | 2 +- ...-staging-bcm2835-audio-use-module_platform_driver-mac.patch} | 2 +- ... => 950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch} | 2 +- ...-staging-bcm2835-camera-Provide-more-specific-probe-e.patch} | 2 +- ...-staging-bcm2835-camera-Add-hint-about-possible-fault.patch} | 2 +- ...-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch} | 2 +- ...-staging-vchiq_arm-Improve-error-handling-on-loading-.patch} | 2 +- ...-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch} | 2 +- ...-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch} | 2 +- ...-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch} | 2 +- ...50-0222-staging-bcm2835-camera-Return-early-on-errors.patch} | 2 +- ...23-staging-bcm2835-camera-Remove-dead-email-addresses.patch} | 2 +- ...4-staging-bcm2835-camera-Fix-comment-style-violations.patch} | 2 +- ...5-staging-bcm2835-camera-Fix-spacing-around-operators.patch} | 2 +- ...26-staging-bcm2835-camera-Reduce-length-of-enum-names.patch} | 2 +- ...-staging-bcm2835-camera-Fix-multiple-line-dereference.patch} | 2 +- ...50-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch} | 2 +- ...-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch} | 2 +- ...-staging-bcm2835-camera-Fix-logical-continuation-spli.patch} | 2 +- ...-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch} | 2 +- ...-staging-bcm2835-camera-Set-sequence-number-correctly.patch} | 2 +- ...-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch} | 2 +- ...-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch} | 2 +- ...-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch} | 2 +- ...-staging-bcm2835-camera-Unify-header-inclusion-define.patch} | 2 +- ...-staging-bcm2835-camera-Fix-alignment-should-match-op.patch} | 2 +- ...-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch} | 2 +- ...-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch} | 2 +- ...-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch} | 2 +- ...-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch} | 2 +- ...-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch} | 2 +- ...-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch} | 2 +- ...-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch} | 2 +- ...45-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch} | 2 +- ...6-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch} | 2 +- ...-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch} | 2 +- ...48-staging-mmal-vchiq-Add-support-for-event-callbacks.patch} | 2 +- ...-staging-vc04_services-Support-sending-data-to-MMAL-p.patch} | 2 +- ...-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch} | 2 +- ...0-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch} | 2 +- ...52-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch} | 2 +- ...-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch} | 2 +- ...54-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch} | 2 +- ...255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch} | 2 +- ...-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch} | 2 +- ...-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch} | 2 +- ...-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch} | 2 +- ...59-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch} | 2 +- ...tch => 950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch} | 2 +- ...50-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch} | 2 +- ...-Revert-staging-vchiq_arm-Register-a-platform-device-.patch} | 2 +- ...-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch} | 2 +- ...50-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch} | 2 +- ...-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch} | 2 +- ...-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch} | 2 +- ...-0267-gpio-ir-change-default-pull-configuration-to-up.patch} | 2 +- ...-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch} | 2 +- ...-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch} | 2 +- ...50-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch} | 2 +- ...-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch} | 2 +- ...2-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch} | 2 +- ...3-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch} | 2 +- ...4-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch} | 2 +- ...-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch} | 2 +- ... => 950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch} | 2 +- ...-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch} | 2 +- ... 950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch} | 2 +- ...-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch} | 2 +- ...50-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch} | 2 +- ...ch => 950-0281-overlays-mcp23017-Support-the-MCP23008.patch} | 2 +- ...verlay.patch => 950-0282-overlays-Add-mcp342x-overlay.patch} | 2 +- ...patch => 950-0283-char-vcio-Add-compat-ioctl-handling.patch} | 2 +- ...284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch} | 2 +- ...-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch} | 2 +- ...-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch} | 2 +- ...-staging-bcm2835-camera-Set-the-field-value-within-ea.patch} | 2 +- ...288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch} | 2 +- ...h => 950-0289-char-vc_mem-Fix-all-coding-style-issues.patch} | 2 +- ... 950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch} | 2 +- ... 950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch} | 2 +- ...2-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch} | 2 +- ...-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch} | 2 +- ... 950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch} | 2 +- ...=> 950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch} | 2 +- ...-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch} | 2 +- ... 950-0297-audioinjector-octo-revert-to-dummy-supplies.patch} | 2 +- ...-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch} | 2 +- ...-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch} | 2 +- ...-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch} | 2 +- ...=> 950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch} | 2 +- ...0-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch} | 2 +- ...50-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch} | 2 +- ...50-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch} | 2 +- ...0-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch} | 2 +- ...306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch} | 2 +- ...-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch} | 2 +- ...-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch} | 2 +- ...-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch} | 2 +- ...-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch} | 2 +- ... 950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch} | 2 +- ...-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch} | 2 +- ...=> 950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch} | 2 +- ...cs.patch => 950-0314-configs-Enable-the-AD193x-codecs.patch} | 2 +- ...0-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch} | 2 +- ...0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch} | 2 +- ...-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch} | 2 +- ...-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch} | 2 +- ...-staging-mmal-vchiq-Always-return-the-param-size-from.patch} | 2 +- ...-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch} | 2 +- ...-staging-bcm2835_codec-Query-supported-formats-from-t.patch} | 2 +- ...-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch} | 2 +- ...-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch} | 2 +- ...-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch} | 2 +- ...-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch} | 2 +- ...-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch} | 2 +- ...-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch} | 2 +- ...-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch} | 2 +- ...-stream-func.patch => 950-0329-Added-mute-stream-func.patch} | 2 +- ...=> 950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch} | 2 +- ...-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch} | 2 +- ...32-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch} | 2 +- ...-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch} | 2 +- ...patch => 950-0334-vcsm-Remove-set-but-unused-variable.patch} | 2 +- ...atch => 950-0335-vcsm-Reduce-scope-of-local-functions.patch} | 2 +- ...-staging-bcm2835-codec-NULL-component-handle-on-queue.patch} | 2 +- ...-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch} | 2 +- ...-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch} | 2 +- ...39-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch} | 2 +- ...-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch} | 2 +- ...-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch} | 2 +- ...-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch} | 2 +- ...-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch} | 2 +- ...0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch} | 2 +- ...ak.patch => 950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch} | 2 +- ...50-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch} | 2 +- ...950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch} | 2 +- ...ch => 950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch} | 2 +- ...-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch} | 2 +- ... 950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch} | 2 +- ...-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch} | 2 +- ...-staging-bcm2835-codec-Refactor-default-resolution-co.patch} | 2 +- ...-attribute.patch => 950-0353-nvmem-add-type-attribute.patch} | 2 +- ...ew-driver.patch => 950-0354-rtc-rv3028-add-new-driver.patch} | 2 +- ...-rtc.patch => 950-0355-overlays-Add-rv3028-to-i2c-rtc.patch} | 2 +- ...-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch} | 2 +- ...-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch} | 2 +- ...358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch} | 2 +- ...patch => 950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch} | 2 +- ... 950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch} | 2 +- ...0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch} | 2 +- ...950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch} | 2 +- ...0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch} | 2 +- ...-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch} | 2 +- ...365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch} | 2 +- ...50-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch} | 2 +- ...=> 950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch} | 2 +- ... 950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch} | 2 +- ...0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch} | 2 +- ...h => 950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch} | 2 +- ...h => 950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch} | 2 +- ...-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch} | 2 +- ...-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch} | 2 +- ...74-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch} | 2 +- ...=> 950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch} | 2 +- ...-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch} | 2 +- ...0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch} | 2 +- ...tch => 950-0378-Input-ili210x-add-DT-binding-document.patch} | 2 +- ...-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch} | 2 +- ...-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch} | 2 +- ...50-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch} | 2 +- ...950-0382-dt-bindings-rv3028-backup-switchover-support.patch} | 2 +- ...-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch} | 2 +- ...atch => 950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch} | 2 +- ...50-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch} | 2 +- ...0-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch} | 2 +- ...overlay.patch => 950-0387-overlays-Add-PiGlow-overlay.patch} | 2 +- ...ch => 950-0388-Revert-bcm2835-interpolate-audio-delay.patch} | 2 +- ...0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch} | 2 +- ...-Revert-staging-bcm2835-audio-use-module_platform_dri.patch} | 2 +- ...> 950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch} | 2 +- ...-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch} | 2 +- ...-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch} | 2 +- ...-staging-bcm2835-audio-Remove-redundant-substream-mas.patch} | 2 +- ...-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch} | 2 +- ...-staging-bcm2835-audio-Remove-redundant-function-call.patch} | 2 +- ...97-staging-bcm2835-audio-Remove-superfluous-open-flag.patch} | 2 +- ...-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch} | 2 +- ...-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch} | 2 +- ...> 950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch} | 2 +- ...-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch} | 2 +- ...-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch} | 2 +- ...50-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch} | 2 +- ...-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch} | 2 +- ...-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch} | 2 +- ...-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch} | 2 +- ...0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch} | 2 +- ...50-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch} | 2 +- ...-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch} | 2 +- ...0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch} | 2 +- ... 950-0411-staging-bcm2835-audio-Use-card-private_data.patch} | 2 +- ...-staging-bcm2835-audio-Use-standard-error-print-helpe.patch} | 2 +- ...-staging-bcm2835-audio-Remove-unnecessary-header-file.patch} | 2 +- ...-staging-bcm2835-audio-Move-module-parameter-descript.patch} | 2 +- ...415-staging-bcm2835-audio-Use-coherent-device-buffers.patch} | 2 +- ...-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch} | 2 +- ...7-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch} | 2 +- ...-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch} | 2 +- ...-staging-bcm2835-audio-Simplify-card-object-managemen.patch} | 2 +- ...-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch} | 2 +- ...1-staging-bcm2835-audio-don-t-initialize-memory-twice.patch} | 2 +- ...-staging-bcm2835-audio-reorder-variable-declarations-.patch} | 2 +- ...-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch} | 2 +- ...-staging-bcm2835-audio-more-generic-probe-function-na.patch} | 2 +- ...-staging-bcm2835-audio-rename-platform_driver-structu.patch} | 2 +- ...O.patch => 950-0426-staging-bcm2835-audio-update-TODO.patch} | 2 +- ...50-0427-staging-bcm2835-audio-interpolate-audio-delay.patch} | 2 +- ...=> 950-0428-staging-bcm2835-audio-Enable-compile-test.patch} | 2 +- ...-staging-bcm2835-audio-use-module_platform_driver-mac.patch} | 2 +- ... => 950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch} | 2 +- ...-staging-bcm2835-audio-double-free-in-init-error-path.patch} | 2 +- ...h => 950-0432-dts-Increase-default-coherent-pool-size.patch} | 2 +- ...-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch} | 2 +- ...-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch} | 2 +- ...950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch} | 2 +- ...-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch} | 2 +- ...-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch} | 2 +- ...-staging-mmal-vchiq-Free-the-event-context-for-contro.patch} | 2 +- ...-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch} | 2 +- ...-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch} | 2 +- ...0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch} | 2 +- ...-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch} | 2 +- ...-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch} | 2 +- ...=> 950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch} | 2 +- ...-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch} | 2 +- ...6-w1-ds2408-reset-on-output_write-retry-with-readback.patch} | 2 +- ... 950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch} | 2 +- ...-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch} | 2 +- ...-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch} | 2 +- ...tly.patch => 950-0450-.gitignore-Add-.dtbo-explicitly.patch} | 2 +- ...-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch} | 2 +- ...950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch} | 2 +- ...0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch} | 2 +- ...0-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch} | 2 +- ...-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch} | 2 +- ...ch => 950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch} | 2 +- ...0-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch} | 2 +- ... => 950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch} | 2 +- ...ay.patch => 950-0459-overlays-Update-upstream-overlay.patch} | 2 +- ...-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch} | 2 +- ...atch => 950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch} | 2 +- ...ch => 950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch} | 2 +- ...0463-overlays-Fix-mmc-related-overlays-after-refactor.patch} | 2 +- ...timing-issue.patch => 950-0464-Fixed-48k-timing-issue.patch} | 2 +- ...-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch} | 2 +- ...-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch} | 2 +- ...0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch} | 2 +- ...> 950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch} | 2 +- ...9-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch} | 2 +- ...CF.patch => 950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch} | 2 +- ...471-staging-vc04_services-Use-correct-cache-line-size.patch} | 2 +- ...tch => 950-0472-tty-amba-pl011-allow-shared-interrupt.patch} | 2 +- ...-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch} | 2 +- ...-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch} | 2 +- ...NG.patch => 950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch} | 2 +- ... 950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch} | 2 +- ...or-tidy-up.patch => 950-0477-BCM270X_DT-Minor-tidy-up.patch} | 2 +- ...p.patch => 950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch} | 2 +- ... 950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch} | 2 +- ...-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch} | 2 +- ...-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch} | 2 +- ...lity.patch => 950-0482-PCI-brcmstb-Add-MSI-capability.patch} | 2 +- ...3-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch} | 2 +- ...11.patch => 950-0484-pcie-brcmstb-Changes-for-BCM2711.patch} | 2 +- ...atch => 950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch} | 2 +- ...-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch} | 2 +- ....patch => 950-0487-mmc-sdhci-Mask-spurious-interrupts.patch} | 2 +- ...-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch} | 2 +- ...ch => 950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch} | 2 +- ... 950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch} | 2 +- ...rt.patch => 950-0491-vchiq-Add-36-bit-address-support.patch} | 2 +- ... => 950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch} | 2 +- ...h => 950-0493-bcmgenet-constrain-max-DMA-burst-length.patch} | 2 +- ...50-0494-bcmgenet-Better-coalescing-parameter-defaults.patch} | 2 +- ...-net-genet-enable-link-energy-detect-powerdown-for-ex.patch} | 2 +- ...-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch} | 2 +- ...-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch} | 2 +- ...0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch} | 2 +- ...> 950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch} | 2 +- ...50-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch} | 2 +- ...-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch} | 2 +- ...h => 950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch} | 2 +- ... 950-0503-spi-bcm2835-enable-shared-interrupt-support.patch} | 2 +- ...-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch} | 2 +- ...atch => 950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch} | 2 +- ...-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch} | 2 +- ...-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch} | 2 +- ...-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch} | 2 +- ...-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch} | 2 +- ...h => 950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch} | 2 +- ...-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch} | 2 +- ...-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch} | 2 +- ...-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch} | 2 +- ...-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch} | 2 +- ...50-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch} | 2 +- ...16-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch} | 2 +- ...-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch} | 2 +- ...-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch} | 2 +- ...19-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch} | 2 +- ...atch => 950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch} | 2 +- ...-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch} | 2 +- ...-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch} | 2 +- ... 950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch} | 2 +- ...524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch} | 2 +- ...-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch} | 2 +- ...-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch} | 2 +- ...527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch} | 2 +- ...-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch} | 2 +- ....2.patch => 950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch} | 2 +- ...50-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch} | 2 +- ...-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch} | 2 +- ...r-2711.patch => 950-0532-drm-v3d-Add-support-for-2711.patch} | 2 +- ...-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch} | 2 +- ....patch => 950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch} | 2 +- ...patch => 950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch} | 2 +- ...patch => 950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch} | 2 +- ...-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch} | 2 +- ...ent.patch => 950-0538-drm-v3d-Refactor-job-management.patch} | 2 +- ...950-0539-drm-v3d-Add-missing-implicit-synchronization.patch} | 2 +- ...-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch} | 2 +- ...-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch} | 2 +- ...-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch} | 2 +- ...-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch} | 2 +- ...-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch} | 2 +- ...0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch} | 2 +- ...50-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch} | 2 +- ...547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch} | 2 +- ...d-warning.patch => 950-0548-drm-vc4-Fix-build-warning.patch} | 2 +- ...-drm-vc4-Select-display-to-blank-during-initialisatio.patch} | 2 +- ...patch => 950-0550-drm-vc4-Remove-now-unused-structure.patch} | 2 +- ...-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch} | 2 +- ...-drm-vc4-Set-the-display-number-when-querying-the-dis.patch} | 2 +- ...-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch} | 2 +- ...-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch} | 2 +- ...-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch} | 2 +- ...-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch} | 2 +- ...-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch} | 2 +- ...=> 950-0558-drm-vc4-Increase-max_width-height-to-7680.patch} | 2 +- ...-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch} | 2 +- ...-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch} | 2 +- ...-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch} | 2 +- ...-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch} | 2 +- ...ch => 950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch} | 2 +- ...0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch} | 2 +- ...-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch} | 2 +- ....patch => 950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch} | 2 +- ...950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch} | 2 +- ...-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch} | 2 +- ...-drm-vc4-handle-the-case-where-there-are-no-available.patch} | 2 +- ...KMS.patch => 950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch} | 2 +- ...571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch} | 2 +- ...tch => 950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch} | 2 +- ...3-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch} | 2 +- ...-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch} | 2 +- ...-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch} | 2 +- ...-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch} | 2 +- ...-TODO.patch => 950-0577-staging-vc-sm-cma-Update-TODO.patch} | 2 +- ...578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch} | 2 +- ...=> 950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch} | 2 +- ...0-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch} | 2 +- ...-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch} | 2 +- ...-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch} | 2 +- ...-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch} | 2 +- ...-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch} | 2 +- ...0-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch} | 2 +- ... => 950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch} | 2 +- ...> 950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch} | 2 +- ...ch => 950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch} | 2 +- ...0-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch} | 2 +- ...pport.patch => 950-0590-2711-Add-basic-64-bit-support.patch} | 2 +- ...-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch} | 2 +- ...592-arm-dts-Change-downstream-vchiq-compatible-string.patch} | 2 +- ...=> 950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch} | 2 +- ...594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch} | 2 +- ...patch => 950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch} | 2 +- ...atch => 950-0596-dts-Include-CSI-lane-config-for-csi1.patch} | 2 +- ...ch => 950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch} | 2 +- ... 950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch} | 2 +- ...-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch} | 2 +- ...-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch} | 2 +- ...-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch} | 2 +- ...-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch} | 2 +- ...-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch} | 2 +- ...-drm-vc4-Add-status-of-which-display-is-updated-throu.patch} | 2 +- ...-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch} | 2 +- ...tch => 950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch} | 2 +- ...607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch} | 2 +- ...-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch} | 2 +- ...Hz.patch => 950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch} | 2 +- ...=> 950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch} | 2 +- ...-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch} | 2 +- ...h => 950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch} | 2 +- ...50-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch} | 2 +- ...950-0614-overlays-Fix-further-maxim-ds1307-references.patch} | 2 +- ...950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch} | 2 +- ...616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch} | 2 +- ...0-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch} | 2 +- ...=> 950-0618-w1-ds2413-add-retry-support-to-state_read.patch} | 2 +- ...-w1-ds2413-when-the-slave-is-not-responding-during-re.patch} | 2 +- ...atch => 950-0620-w1-ds2413-fix-state-byte-comparision.patch} | 2 +- ...-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch} | 2 +- ...0-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch} | 2 +- ...-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch} | 2 +- ...50-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch} | 2 +- ...50-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch} | 2 +- ...-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch} | 2 +- ...-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch} | 2 +- ...-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch} | 2 +- ...-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch} | 2 +- ...-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch} | 2 +- ...0-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch} | 2 +- ...32-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch} | 2 +- ...3-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch} | 2 +- ...-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch} | 2 +- ...-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch} | 2 +- ...950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch} | 2 +- ...h => 950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch} | 2 +- ...-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch} | 2 +- ...-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch} | 2 +- ...50-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch} | 2 +- ...0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch} | 2 +- ...CF2129-RTC.patch => 950-0642-overlays-Add-PCF2129-RTC.patch} | 2 +- ...> 950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch} | 2 +- ...=> 950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch} | 2 +- ...50-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch} | 2 +- ...tch => 950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch} | 2 +- ... 950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch} | 2 +- ...-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch} | 2 +- ...tch => 950-0649-overlays-audremap-Support-GPIOs-18-19.patch} | 2 +- ...0-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch} | 2 +- ...950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch} | 2 +- ...52-drm-connector-Allow-creation-of-margin-props-alone.patch} | 2 +- ...-drm-vc4-Take-margin-setup-into-account-when-updating.patch} | 2 +- ...654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch} | 2 +- ...h => 950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch} | 2 +- ...=> 950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch} | 2 +- ...-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch} | 2 +- ...ch => 950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch} | 2 +- ...atch => 950-0659-codecs-Correct-Katana-minimum-volume.patch} | 2 +- ...-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch} | 2 +- ... 950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch} | 2 +- ...atch => 950-0662-overlays-Update-the-upstream-overlay.patch} | 2 +- ...-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch} | 2 +- ...-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch} | 2 +- ... 950-0665-driver-char-rpivid-also-support-legacy-name.patch} | 2 +- ...-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch} | 2 +- ...950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch} | 2 +- ...-drm-connector-Add-documentation-for-drm_cmdline_mode.patch} | 2 +- ...=> 950-0669-drm-modes-Rewrite-the-command-line-parser.patch} | 2 +- ...670-drm-modes-Support-modes-names-on-the-command-line.patch} | 2 +- ...-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch} | 2 +- ...0-0672-drm-connector-Introduce-a-TV-margins-structure.patch} | 2 +- ...patch => 950-0673-drm-modes-Parse-overscan-properties.patch} | 2 +- ...-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch} | 2 +- ...0-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch} | 2 +- ...0-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch} | 2 +- ...-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch} | 2 +- ...0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch} | 2 +- ...-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch} | 2 +- ...-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch} | 2 +- ...er.patch => 950-0681-Add-HDMI1-facility-to-the-driver.patch} | 2 +- ...950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch} | 2 +- ...-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch} | 2 +- ...patch => 950-0684-drm-vc4-Remove-unused-mode-variable.patch} | 2 +- ...-staging-bcm2835-codec-Expand-logging-on-format-setti.patch} | 2 +- ...-staging-bcm2835-codec-Correct-bytesperline-on-format.patch} | 2 +- ...-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch} | 2 +- ...-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch} | 2 +- ...tch => 950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch} | 2 +- ...950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch} | 2 +- ...-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch} | 2 +- ...-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch} | 2 +- ...-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch} | 2 +- ...-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch} | 2 +- ...50-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch} | 2 +- ...0-0696-xhci-Use-more-event-ring-segment-table-entries.patch} | 2 +- ...-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch} | 2 +- ...-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch} | 2 +- ...3D.patch => 950-0699-configs-arm64-vcm2711-Enable-V3D.patch} | 2 +- ...=> 950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch} | 2 +- ...l.patch => 950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch} | 2 +- ...-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch} | 2 +- ...-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch} | 2 +- ...950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch} | 2 +- ...atch => 950-0705-arch-arm-Add-model-string-to-cpuinfo.patch} | 2 +- ...-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch} | 2 +- ...-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch} | 2 +- ... 950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch} | 2 +- ...-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch} | 2 +- ...-staging-bcm2835-codec-Fix-non-documentation-comment-.patch} | 2 +- ...0-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch} | 2 +- ...50-0712-staging-bcm2835-codec-Add-role-to-device-name.patch} | 2 +- ...-staging-bcm2835-codec-Pass-driver-context-to-create-.patch} | 2 +- ...14-staging-bcm2835-codec-add-media-controller-support.patch} | 2 +- ...5-media-bcm2835-unicam-Reduce-scope-of-local-function.patch} | 2 +- ...716-media-bcm2835-unicam-add-media-controller-support.patch} | 2 +- ...-Limit-max_req_size-under-arm64-or-any-other-platform.patch} | 2 +- ...-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch} | 2 +- ...-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch} | 2 +- ...-overlays-mcp23017-Add-option-for-not-connecting-the-.patch} | 2 +- ...-mode.patch => 950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch} | 2 +- ...50-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch} | 2 +- ...patch => 950-0723-PCI-brcmstb-Fix-compilation-warning.patch} | 2 +- ...4-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch} | 2 +- ... 950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch} | 2 +- ...> 950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch} | 2 +- ...-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch} | 2 +- ...50-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch} | 2 +- ...50-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch} | 2 +- ...8.patch => 950-0730-Fix-poll-rate-on-touchscreen-3238.patch} | 2 +- ...-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch} | 2 +- 731 files changed, 731 insertions(+), 731 deletions(-) rename target/linux/brcm2708/patches-4.19/{950-0092-OF-DT-Overlay-configfs-interface.patch => 950-0091-OF-DT-Overlay-configfs-interface.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0095-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch => 950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0097-Add-arm64-configuration-and-device-tree-differences..patch => 950-0093-Add-arm64-configuration-and-device-tree-differences..patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0098-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch => 950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch => 950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch => 950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0101-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch => 950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0102-cache-export-clean-and-invalidate.patch => 950-0098-cache-export-clean-and-invalidate.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0103-AXI-performance-monitor-driver-2222.patch => 950-0099-AXI-performance-monitor-driver-2222.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0104-mcp2515-Use-DT-supplied-interrupt-flags.patch => 950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0105-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch => 950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0106-cgroup-Disable-cgroup-memory-by-default.patch => 950-0102-cgroup-Disable-cgroup-memory-by-default.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0107-ARM-bcm2835-Set-Serial-number-and-Revision.patch => 950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0108-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch => 950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0109-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch => 950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch => 950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0111-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch => 950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0112-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch => 950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0113-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch => 950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0114-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch => 950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0115-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch => 950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0116-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch => 950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0117-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch => 950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0118-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch => 950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0119-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch => 950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0120-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch => 950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0121-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch => 950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0122-vc4_firmware_kms-fix-build.patch => 950-0118-vc4_firmware_kms-fix-build.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0123-hack-cache-Fix-linker-error.patch => 950-0119-hack-cache-Fix-linker-error.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0124-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch => 950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0125-sound-bcm-Fix-memset-dereference-warning.patch => 950-0121-sound-bcm-Fix-memset-dereference-warning.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0126-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch => 950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch} (88%) rename target/linux/brcm2708/patches-4.19/{950-0127-lan78xx-Read-initial-EEE-status-from-DT.patch => 950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0128-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch => 950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch => 950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0130-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch => 950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch => 950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0132-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch => 950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0133-of-configfs-Use-of_overlay_fdt_apply-API-call.patch => 950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch => 950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0136-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch => 950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0137-staging-vc04_services-Derive-g_cache_line_size.patch => 950-0132-staging-vc04_services-Derive-g_cache_line_size.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0138-Add-rpi-poe-fan-driver.patch => 950-0133-Add-rpi-poe-fan-driver.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0139-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch => 950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0140-bcm2835-interpolate-audio-delay.patch => 950-0135-bcm2835-interpolate-audio-delay.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0141-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch => 950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0142-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch => 950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0143-overlays-Fix-a-few-dtc-warnings.patch => 950-0138-overlays-Fix-a-few-dtc-warnings.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0144-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch => 950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0146-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch => 950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch => 950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch => 950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0155-Add-device-tree-overlay-for-HD44780.patch => 950-0143-Add-device-tree-overlay-for-HD44780.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0157-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch => 950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0158-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch => 950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0159-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch => 950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0160-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch => 950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0161-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch => 950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0162-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch => 950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch => 950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0164-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch => 950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0165-ASoC-cs4265-Add-native-32bit-I2S-transport.patch => 950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0167-BCM270X_DT-Add-gpio-fan-overlay.patch => 950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0168-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch => 950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0170-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch => 950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0171-Update-gpio-fan-overlay.dts-2711.patch => 950-0156-Update-gpio-fan-overlay.dts-2711.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0172-drivers-thermal-step_wise-add-support-for-hysteresis.patch => 950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0173-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch => 950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0174-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch => 950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0175-overlays-add-overrides-for-PoE-HAT-fan-control.patch => 950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0176-overlays-Add-gpio-no-bank0-irq-overlay.patch => 950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0177-Add-hy28b-2017-model-device-tree-overlay-2721.patch => 950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0179-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch => 950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0180-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch => 950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch => 950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0183-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch => 950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0184-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch => 950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0185-Fix-warning-in-bcm2835-smi-nand.patch => 950-0168-Fix-warning-in-bcm2835-smi-nand.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0186-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch => 950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0187-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch => 950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0188-media-ov5647-Add-support-for-PWDN-GPIO.patch => 950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0189-media-ov5647-Add-support-for-non-continuous-clock-mo.patch => 950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0190-media-tc358743-Increase-FIFO-level-to-374.patch => 950-0173-media-tc358743-Increase-FIFO-level-to-374.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0191-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch => 950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0192-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch => 950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0193-media-tc358743-Check-I2C-succeeded-during-probe.patch => 950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0194-media-adv7180-Default-to-the-first-valid-input.patch => 950-0177-media-adv7180-Default-to-the-first-valid-input.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0195-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch => 950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0196-media-videodev2-Add-helper-defines-for-printing-FOUR.patch => 950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0197-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch => 950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0198-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch => 950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0201-media-adv7180-Nasty-hack-to-allow-input-selection.patch => 950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0202-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch => 950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0203-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch => 950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0204-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch => 950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0205-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch => 950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0207-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch => 950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0208-Update-README-2750.patch => 950-0188-Update-README-2750.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0209-overlays-Remove-superfluous-address-size-cells.patch => 950-0189-overlays-Remove-superfluous-address-size-cells.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0210-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch => 950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0211-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch => 950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0212-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch => 950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0213-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch => 950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0214-overlays-Update-upstream-overlay.patch => 950-0194-overlays-Update-upstream-overlay.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0215-BCM2708_DT-update-firmware-node-binding.patch => 950-0195-BCM2708_DT-update-firmware-node-binding.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0216-BCM2710_DT-fix-gpio-expander-bindings.patch => 950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0217-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch => 950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0218-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch => 950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0219-dt-bindings-Document-microchip-downshift-after.patch => 950-0199-dt-bindings-Document-microchip-downshift-after.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0220-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch => 950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0221-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch => 950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0222-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch => 950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0223-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch => 950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0224-lirc-rpi-Remove-in-favour-of-gpio-ir.patch => 950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0225-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch => 950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0226-media-tc358743-Return-an-appropriate-colorspace-from.patch => 950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0227-staging-bcm2835-camera-fix-module-autoloading.patch => 950-0207-staging-bcm2835-camera-fix-module-autoloading.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0228-staging-bcm2835-camera-Move-module-info-to-the-end.patch => 950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch => 950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0230-staging-vchiq_arm-Fix-camera-device-registration.patch => 950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0231-staging-vchiq_arm-Register-a-platform-device-for-the.patch => 950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0232-staging-bcm2835-audio-Enable-compile-test.patch => 950-0212-staging-bcm2835-audio-Enable-compile-test.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0233-staging-bcm2835-audio-use-module_platform_driver-mac.patch => 950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0234-staging-bcm2835-audio-Drop-DT-dependency.patch => 950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch => 950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0236-staging-bcm2835-camera-Add-hint-about-possible-fault.patch => 950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0237-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch => 950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0238-staging-vchiq_arm-Improve-error-handling-on-loading-.patch => 950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0239-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch => 950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch => 950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0241-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch => 950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0242-staging-bcm2835-camera-Return-early-on-errors.patch => 950-0222-staging-bcm2835-camera-Return-early-on-errors.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0243-staging-bcm2835-camera-Remove-dead-email-addresses.patch => 950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0244-staging-bcm2835-camera-Fix-comment-style-violations.patch => 950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0245-staging-bcm2835-camera-Fix-spacing-around-operators.patch => 950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0246-staging-bcm2835-camera-Reduce-length-of-enum-names.patch => 950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch => 950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0248-staging-bcm2835-camera-Fix-brace-style-issues.patch => 950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0249-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch => 950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch => 950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch => 950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0252-staging-bcm2835-camera-Set-sequence-number-correctly.patch => 950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0253-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch => 950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0254-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch => 950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0255-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch => 950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0256-staging-bcm2835-camera-Unify-header-inclusion-define.patch => 950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0258-staging-bcm2835-camera-Fix-alignment-should-match-op.patch => 950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0259-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch => 950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0260-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch => 950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0261-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch => 950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0262-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch => 950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0263-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch => 950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0264-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch => 950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0265-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch => 950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0266-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch => 950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0267-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch => 950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0268-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch => 950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0269-staging-mmal-vchiq-Add-support-for-event-callbacks.patch => 950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0270-staging-vc04_services-Support-sending-data-to-MMAL-p.patch => 950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0271-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch => 950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0272-staging-vc04_services-Add-new-vc-sm-cma-driver.patch => 950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0273-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch => 950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0274-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch => 950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0275-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch => 950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0276-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch => 950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0277-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch => 950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0278-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch => 950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0281-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch => 950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0282-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch => 950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0283-tpm-Make-SECURITYFS-a-weak-dependency.patch => 950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0285-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch => 950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0286-Revert-staging-vchiq_arm-Register-a-platform-device-.patch => 950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0287-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch => 950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch => 950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0289-overlays-Update-README-with-removal-of-lirc-rpi.patch => 950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0290-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch => 950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0291-gpio-ir-change-default-pull-configuration-to-up.patch => 950-0267-gpio-ir-change-default-pull-configuration-to-up.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0292-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch => 950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0293-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch => 950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0294-arm64-dts-broadcom-Enable-fixups-for-overlays.patch => 950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0296-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch => 950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0297-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch => 950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch} (87%) rename target/linux/brcm2708/patches-4.19/{950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch => 950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0299-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch => 950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0300-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch => 950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0303-overlays-sdio-Add-enhanced-1-bit-support.patch => 950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0304-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch => 950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch => 950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0307-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch => 950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0308-overlays-Add-ssd1306-overlay-for-OLED-display.patch => 950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0309-overlays-mcp23017-Support-the-MCP23008.patch => 950-0281-overlays-mcp23017-Support-the-MCP23008.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0310-overlays-Add-mcp342x-overlay.patch => 950-0282-overlays-Add-mcp342x-overlay.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0311-char-vcio-Add-compat-ioctl-handling.patch => 950-0283-char-vcio-Add-compat-ioctl-handling.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0312-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch => 950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0313-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch => 950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0314-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch => 950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0315-staging-bcm2835-camera-Set-the-field-value-within-ea.patch => 950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0316-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch => 950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0317-char-vc_mem-Fix-all-coding-style-issues.patch => 950-0289-char-vc_mem-Fix-all-coding-style-issues.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0318-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch => 950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0319-mfd-Add-rpi_sense_core-of-compatible-string.patch => 950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0320-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch => 950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0321-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch => 950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0322-dtoverlays-Correct-DT-handling-camera-GPIOs.patch => 950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0323-media-ov5647-Use-gpiod_set_value_cansleep.patch => 950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0324-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch => 950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0325-audioinjector-octo-revert-to-dummy-supplies.patch => 950-0297-audioinjector-octo-revert-to-dummy-supplies.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0326-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch => 950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0327-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch => 950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0328-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch => 950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0329-video-bcm2708_fb-Add-compat_ioctl-support.patch => 950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0330-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch => 950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0331-video-bcm2708_fb-Clean-up-coding-style-issues.patch => 950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0332-bcm2835-dma-Add-support-for-per-channel-flags.patch => 950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0333-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch => 950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0334-ASoC-pcm512x-Implement-the-digital_mute-interface.patch => 950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0335-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch => 950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0336-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch => 950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0337-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch => 950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0338-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch => 950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0339-staging-vc-sm-cma-Correct-DMA-configuration.patch => 950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0340-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch => 950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0341-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch => 950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0346-configs-Enable-the-AD193x-codecs.patch => 950-0314-configs-Enable-the-AD193x-codecs.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0347-overlays-balenaFin-v1.1.0-carrier-board-update.patch => 950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0350-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch => 950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0351-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch => 950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0352-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch => 950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0353-staging-mmal-vchiq-Always-return-the-param-size-from.patch => 950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0354-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch => 950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0355-staging-bcm2835_codec-Query-supported-formats-from-t.patch => 950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0356-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch => 950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0357-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch => 950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0358-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch => 950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0359-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch => 950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0360-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch => 950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0361-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch => 950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0362-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch => 950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0364-Added-mute-stream-func.patch => 950-0329-Added-mute-stream-func.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0365-lan78xx-EEE-support-is-now-a-PHY-property.patch => 950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0366-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch => 950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch => 950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0368-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch => 950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0369-vcsm-Remove-set-but-unused-variable.patch => 950-0334-vcsm-Remove-set-but-unused-variable.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0370-vcsm-Reduce-scope-of-local-functions.patch => 950-0335-vcsm-Reduce-scope-of-local-functions.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0371-staging-bcm2835-codec-NULL-component-handle-on-queue.patch => 950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0372-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch => 950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0373-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch => 950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0374-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch => 950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0375-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch => 950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0376-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch => 950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0378-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch => 950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0379-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch => 950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0380-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch => 950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch => 950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0383-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch => 950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0384-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch => 950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0385-bcm2835-mmc-Handle-mmc_add_host-errors.patch => 950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0386-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch => 950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0388-overlays-Add-max17040-support-to-i2c-sensor.patch => 950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0390-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch => 950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0391-staging-bcm2835-codec-Refactor-default-resolution-co.patch => 950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0392-nvmem-add-type-attribute.patch => 950-0353-nvmem-add-type-attribute.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0393-rtc-rv3028-add-new-driver.patch => 950-0354-rtc-rv3028-add-new-driver.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0395-overlays-Add-rv3028-to-i2c-rtc.patch => 950-0355-overlays-Add-rv3028-to-i2c-rtc.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0396-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch => 950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0397-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch => 950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0398-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch => 950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0399-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch => 950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0400-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch => 950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0401-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch => 950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0402-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch => 950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0403-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch => 950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0404-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch => 950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0405-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch => 950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0406-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch => 950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0407-ASoC-tlv320aic32x4-Remove-mclk-references.patch => 950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0408-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch => 950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0409-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch => 950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch => 950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0411-ASoC-tlv320aic32x4-Change-author-s-name.patch => 950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0412-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch => 950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0413-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch => 950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0414-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch => 950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0415-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch => 950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0416-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch => 950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0417-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch => 950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0418-Input-ili210x-add-DT-binding-document.patch => 950-0378-Input-ili210x-add-DT-binding-document.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0420-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch => 950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0421-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch => 950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0422-rtc-rv3028-Add-backup-switchover-mode-support.patch => 950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0423-dt-bindings-rv3028-backup-switchover-support.patch => 950-0382-dt-bindings-rv3028-backup-switchover-support.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0424-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch => 950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0425-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch => 950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0426-sound-Fixes-for-audioinjector-octo-under-4.19.patch => 950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0427-Revert-cgroup-Disable-cgroup-memory-by-default.patch => 950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0429-overlays-Add-PiGlow-overlay.patch => 950-0387-overlays-Add-PiGlow-overlay.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0431-Revert-bcm2835-interpolate-audio-delay.patch => 950-0388-Revert-bcm2835-interpolate-audio-delay.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0432-Revert-staging-bcm2835-audio-Enable-compile-test.patch => 950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0433-Revert-staging-bcm2835-audio-use-module_platform_dri.patch => 950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0434-staging-bcm2835-audio-Clean-up-mutex-locks.patch => 950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0435-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch => 950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0436-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch => 950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0437-staging-bcm2835-audio-Remove-redundant-substream-mas.patch => 950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0438-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch => 950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0439-staging-bcm2835-audio-Remove-redundant-function-call.patch => 950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0440-staging-bcm2835-audio-Remove-superfluous-open-flag.patch => 950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0441-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch => 950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0442-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch => 950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0443-staging-bcm2835-audio-Kill-unused-spinlock.patch => 950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0444-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch => 950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0445-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch => 950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0446-staging-bcm2835-audio-Drop-useless-NULL-check.patch => 950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0447-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch => 950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0448-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch => 950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0449-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch => 950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0450-staging-bcm2835-audio-Add-10ms-period-constraint.patch => 950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0451-staging-bcm2835-audio-Make-single-vchi-handle.patch => 950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0452-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch => 950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0453-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch => 950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0454-staging-bcm2835-audio-Use-card-private_data.patch => 950-0411-staging-bcm2835-audio-Use-card-private_data.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0455-staging-bcm2835-audio-Use-standard-error-print-helpe.patch => 950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0456-staging-bcm2835-audio-Remove-unnecessary-header-file.patch => 950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0457-staging-bcm2835-audio-Move-module-parameter-descript.patch => 950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0458-staging-bcm2835-audio-Use-coherent-device-buffers.patch => 950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0459-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch => 950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0460-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch => 950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0461-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch => 950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0462-staging-bcm2835-audio-Simplify-card-object-managemen.patch => 950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0463-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch => 950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0464-staging-bcm2835-audio-don-t-initialize-memory-twice.patch => 950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0465-staging-bcm2835-audio-reorder-variable-declarations-.patch => 950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0466-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch => 950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0467-staging-bcm2835-audio-more-generic-probe-function-na.patch => 950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0468-staging-bcm2835-audio-rename-platform_driver-structu.patch => 950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0469-staging-bcm2835-audio-update-TODO.patch => 950-0426-staging-bcm2835-audio-update-TODO.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0470-staging-bcm2835-audio-interpolate-audio-delay.patch => 950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0471-staging-bcm2835-audio-Enable-compile-test.patch => 950-0428-staging-bcm2835-audio-Enable-compile-test.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0472-staging-bcm2835-audio-use-module_platform_driver-mac.patch => 950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0473-staging-bcm2835-audio-Drop-DT-dependency.patch => 950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0474-staging-bcm2835-audio-double-free-in-init-error-path.patch => 950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0475-dts-Increase-default-coherent-pool-size.patch => 950-0432-dts-Increase-default-coherent-pool-size.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0476-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch => 950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0478-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch => 950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch => 950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0480-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch => 950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0481-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch => 950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0482-staging-mmal-vchiq-Free-the-event-context-for-contro.patch => 950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0483-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch => 950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0485-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch => 950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0486-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch => 950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0487-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch => 950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0488-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch => 950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch => 950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0490-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch => 950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0492-w1-ds2408-reset-on-output_write-retry-with-readback.patch => 950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0493-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch => 950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0494-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch => 950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch => 950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0496-.gitignore-Add-.dtbo-explicitly.patch => 950-0450-.gitignore-Add-.dtbo-explicitly.patch} (87%) rename target/linux/brcm2708/patches-4.19/{950-0497-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch => 950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0498-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch => 950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0499-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch => 950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0500-overlays-Remove-upstream-aux-interrupt-overlay.patch => 950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0501-overlays-Standardise-on-compatible-brcm-bcm2835.patch => 950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0502-vc4-Remove-interrupt-and-DMA-trampling.patch => 950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0503-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch => 950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0504-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch => 950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0505-overlays-Update-upstream-overlay.patch => 950-0459-overlays-Update-upstream-overlay.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0506-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch => 950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0507-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch => 950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0508-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch => 950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0509-overlays-Fix-mmc-related-overlays-after-refactor.patch => 950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0511-Fixed-48k-timing-issue.patch => 950-0464-Fixed-48k-timing-issue.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0512-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch => 950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0513-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch => 950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0514-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch => 950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0515-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch => 950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0516-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch => 950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0517-i2c-bcm2835-Model-Divider-in-CCF.patch => 950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0518-staging-vc04_services-Use-correct-cache-line-size.patch => 950-0471-staging-vc04_services-Use-correct-cache-line-size.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0519-tty-amba-pl011-allow-shared-interrupt.patch => 950-0472-tty-amba-pl011-allow-shared-interrupt.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0520-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch => 950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0521-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch => 950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0522-ARM-dts-Add-label-to-bcm2835-RNG.patch => 950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0523-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch => 950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0524-BCM270X_DT-Minor-tidy-up.patch => 950-0477-BCM270X_DT-Minor-tidy-up.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0525-arm-bcm2835-Fix-FIQ-early-ioremap.patch => 950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0526-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch => 950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0527-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch => 950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0528-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch => 950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0529-PCI-brcmstb-Add-MSI-capability.patch => 950-0482-PCI-brcmstb-Add-MSI-capability.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0530-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch => 950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0531-pcie-brcmstb-Changes-for-BCM2711.patch => 950-0484-pcie-brcmstb-Changes-for-BCM2711.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0532-arm-bcm2835-DMA-can-only-address-1GB.patch => 950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0533-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch => 950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0534-mmc-sdhci-Mask-spurious-interrupts.patch => 950-0487-mmc-sdhci-Mask-spurious-interrupts.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0535-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch => 950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0536-hwrng-iproc-rng200-Add-BCM2838-support.patch => 950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0537-thermal-brcmstb_thermal-Add-BCM2838-support.patch => 950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0538-vchiq-Add-36-bit-address-support.patch => 950-0491-vchiq-Add-36-bit-address-support.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0539-bcm2835-pcm.c-Support-multichannel-audio.patch => 950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0540-bcmgenet-constrain-max-DMA-burst-length.patch => 950-0493-bcmgenet-constrain-max-DMA-burst-length.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch => 950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch => 950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0543-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch => 950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0544-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch => 950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0545-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch => 950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0546-usb-xhci-Disable-the-XHCI-5-second-timeout.patch => 950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0547-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch => 950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch => 950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch => 950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0550-spi-bcm2835-enable-shared-interrupt-support.patch => 950-0503-spi-bcm2835-enable-shared-interrupt-support.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0551-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch => 950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0552-clk-bcm2835-Don-t-wait-for-pllh-lock.patch => 950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0553-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch => 950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0554-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch => 950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch => 950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0556-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch => 950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0557-soc-bcm-bcm2835-pm-Add-support-for-2711.patch => 950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0558-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch => 950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0559-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch => 950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0560-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch => 950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0561-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch => 950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0562-drm-v3d-Clean-up-the-reservation-object-setup.patch => 950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0563-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch => 950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0564-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch => 950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0565-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch => 950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0566-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch => 950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0567-drm-v3d-Drop-unused-v3d_flush_caches.patch => 950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0568-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch => 950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0569-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch => 950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0570-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch => 950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0571-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch => 950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0572-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch => 950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0573-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch => 950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch => 950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0575-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch => 950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0576-drm-v3d-Add-support-for-V3D-v4.2.patch => 950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch => 950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0578-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch => 950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0579-drm-v3d-Add-support-for-2711.patch => 950-0532-drm-v3d-Add-support-for-2711.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0580-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch => 950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0581-drm-v3d-Hook-up-the-runtime-PM-ops.patch => 950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0582-drm-v3d-HACK-gut-runtime-pm-for-now.patch => 950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0583-drm-v3d-Update-to-upstream-IRQ-code.patch => 950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0584-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch => 950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0585-drm-v3d-Refactor-job-management.patch => 950-0538-drm-v3d-Refactor-job-management.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0586-drm-v3d-Add-missing-implicit-synchronization.patch => 950-0539-drm-v3d-Add-missing-implicit-synchronization.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0587-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch => 950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0588-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch => 950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0589-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch => 950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0590-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch => 950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0591-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch => 950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0592-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch => 950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0593-drm-vc4-Increase-max-screen-size-to-4096x4096.patch => 950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0594-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch => 950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0595-drm-vc4-Fix-build-warning.patch => 950-0548-drm-vc4-Fix-build-warning.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0596-drm-vc4-Select-display-to-blank-during-initialisatio.patch => 950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0597-drm-vc4-Remove-now-unused-structure.patch => 950-0550-drm-vc4-Remove-now-unused-structure.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0598-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch => 950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0599-drm-vc4-Set-the-display-number-when-querying-the-dis.patch => 950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0600-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch => 950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0601-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch => 950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0602-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch => 950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0603-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch => 950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0604-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch => 950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0605-drm-vc4-Increase-max_width-height-to-7680.patch => 950-0558-drm-vc4-Increase-max_width-height-to-7680.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0606-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch => 950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0607-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch => 950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0608-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch => 950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0609-drm-v3d-Add-support-for-compute-shader-dispatch.patch => 950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0610-drm-v3d-Clock-V3D-down-when-not-in-use.patch => 950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0611-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch => 950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0612-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch => 950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0613-drm-vc4-Log-flags-in-fkms-mode-set.patch => 950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0614-drm-vc4-firmware-kms-Fix-DSI-display-support.patch => 950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0615-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch => 950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0616-drm-vc4-handle-the-case-where-there-are-no-available.patch => 950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0617-drm-vc4-Support-the-VEC-in-FKMS.patch => 950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0618-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch => 950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0619-drm-vc4-Correct-SAND-support-for-FKMS.patch => 950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0620-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch => 950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0621-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch => 950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0622-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch => 950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0623-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch => 950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0624-staging-vc-sm-cma-Update-TODO.patch => 950-0577-staging-vc-sm-cma-Update-TODO.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0625-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch => 950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0626-staging-vcsm-cma-Add-cache-control-ioctls.patch => 950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0627-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch => 950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0628-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch => 950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0629-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch => 950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0630-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch => 950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0631-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch => 950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0632-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch => 950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0633-overlays-Add-i2c3-6-and-uart2-5-overlays.patch => 950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0634-spi-devicetree-add-overlays-for-spi-3-to-6.patch => 950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0635-overlays-Add-the-spi-gpio40-45-overlay.patch => 950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch => 950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0638-2711-Add-basic-64-bit-support.patch => 950-0590-2711-Add-basic-64-bit-support.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0641-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch => 950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0642-arm-dts-Change-downstream-vchiq-compatible-string.patch => 950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0643-bcm2835-dma-Add-proper-40-bit-DMA-support.patch => 950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0644-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch => 950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch} (89%) rename target/linux/brcm2708/patches-4.19/{950-0645-SQUASH-bcm2835-dma-Remove-debugging.patch => 950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0647-dts-Include-CSI-lane-config-for-csi1.patch => 950-0596-dts-Include-CSI-lane-config-for-csi1.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0648-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch => 950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0650-bcm2711-dts-Disable-the-v3d-node-by-default.patch => 950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch} (87%) rename target/linux/brcm2708/patches-4.19/{950-0651-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch => 950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch => 950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0653-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch => 950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch => 950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0655-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch => 950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0656-drm-vc4-Add-status-of-which-display-is-updated-throu.patch => 950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0657-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch => 950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0658-arm-dts-Fix-Pi4-PWR-LED-configuration.patch => 950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0659-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch => 950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch} (90%) rename target/linux/brcm2708/patches-4.19/{950-0660-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch => 950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0661-drm-vc4-Limit-fkms-to-modes-85Hz.patch => 950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0662-arm-bcm2835-Add-bcm2838-compatible-string.patch => 950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch} (88%) rename target/linux/brcm2708/patches-4.19/{950-0663-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch => 950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0664-arm-dts-First-draft-of-upstream-Pi4-DTS.patch => 950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0665-overlays-Fix-compatible-string-for-ds1307-RTC.patch => 950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0666-overlays-Fix-further-maxim-ds1307-references.patch => 950-0614-overlays-Fix-further-maxim-ds1307-references.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0667-overlays-Cosmetic-change-to-upstream-overlay.patch => 950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0668-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch => 950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0669-w1-ds2413-output_write-cosmetic-fixes-simplify.patch => 950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0670-w1-ds2413-add-retry-support-to-state_read.patch => 950-0618-w1-ds2413-add-retry-support-to-state_read.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0671-w1-ds2413-when-the-slave-is-not-responding-during-re.patch => 950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0672-w1-ds2413-fix-state-byte-comparision.patch => 950-0620-w1-ds2413-fix-state-byte-comparision.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0673-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch => 950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0674-video-bcm2708_fb-Revert-cma-allocation-attempt.patch => 950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0675-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch => 950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0678-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch => 950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0682-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch => 950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0683-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch => 950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0684-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch => 950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0687-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch => 950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0689-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch => 950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0690-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch => 950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0691-media-vb2-set-reqbufs-create_bufs-capabilities.patch => 950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0692-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch => 950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0693-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch => 950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0694-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch => 950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0695-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch => 950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0696-i2c-bcm2835-Ensure-clock-exists-when-probing.patch => 950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0697-overlays-i2c-gpio-Fix-the-bus-parameter.patch => 950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch => 950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0699-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch => 950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0700-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch => 950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0701-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch => 950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0702-overlays-Add-PCF2129-RTC.patch => 950-0642-overlays-Add-PCF2129-RTC.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0704-overlays-dpi18-and-dpi24-vc4-compatibility.patch => 950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0705-overlays-Add-i2c0-and-i2c1-for-regularity.patch => 950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0706-Pisound-Remove-spinlock-usage-around-spi_sync.patch => 950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0707-arm64-mm-Limit-the-DMA-zone-for-arm64.patch => 950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0710-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch => 950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0711-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch => 950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0712-overlays-audremap-Support-GPIOs-18-19.patch => 950-0649-overlays-audremap-Support-GPIOs-18-19.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0713-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch => 950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0714-drm-connector-Clarify-the-unit-of-TV-margins.patch => 950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0715-drm-connector-Allow-creation-of-margin-props-alone.patch => 950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0716-drm-vc4-Take-margin-setup-into-account-when-updating.patch => 950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0717-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch => 950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0718-drm-vc4-Add-support-for-margins-to-fkms.patch => 950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0719-drm-vc4-Ensure-zpos-is-always-initialised.patch => 950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0720-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch => 950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch => 950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0722-codecs-Correct-Katana-minimum-volume.patch => 950-0659-codecs-Correct-Katana-minimum-volume.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0723-drm-vc4-A-present-but-empty-dmas-disables-audio.patch => 950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0724-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch => 950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0725-overlays-Update-the-upstream-overlay.patch => 950-0662-overlays-Update-the-upstream-overlay.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0727-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch => 950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch => 950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0729-driver-char-rpivid-also-support-legacy-name.patch => 950-0665-driver-char-rpivid-also-support-legacy-name.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch => 950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0731-drm-vc4-Add-Broadcast-RGB-connector-property.patch => 950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0732-drm-connector-Add-documentation-for-drm_cmdline_mode.patch => 950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0733-drm-modes-Rewrite-the-command-line-parser.patch => 950-0669-drm-modes-Rewrite-the-command-line-parser.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0734-drm-modes-Support-modes-names-on-the-command-line.patch => 950-0670-drm-modes-Support-modes-names-on-the-command-line.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0735-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch => 950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0736-drm-connector-Introduce-a-TV-margins-structure.patch => 950-0672-drm-connector-Introduce-a-TV-margins-structure.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0737-drm-modes-Parse-overscan-properties.patch => 950-0673-drm-modes-Parse-overscan-properties.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0738-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch => 950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0739-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch => 950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0740-drm-vc4-fkms-Set-default-state-margin-at-reset.patch => 950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0741-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch => 950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0743-staging-bcm2835-codec-switch-to-multi-planar-API.patch => 950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0744-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch => 950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0745-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch => 950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0746-Add-HDMI1-facility-to-the-driver.patch => 950-0681-Add-HDMI1-facility-to-the-driver.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0747-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch => 950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0749-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch => 950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0750-drm-vc4-Remove-unused-mode-variable.patch => 950-0684-drm-vc4-Remove-unused-mode-variable.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0751-staging-bcm2835-codec-Expand-logging-on-format-setti.patch => 950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0752-staging-bcm2835-codec-Correct-bytesperline-on-format.patch => 950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0753-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch => 950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0755-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch => 950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0756-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch => 950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0757-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch => 950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0758-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch => 950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0759-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch => 950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0760-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch => 950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0761-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch => 950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0764-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch => 950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0765-xhci-Use-more-event-ring-segment-table-entries.patch => 950-0696-xhci-Use-more-event-ring-segment-table-entries.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0766-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch => 950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0767-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch => 950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0768-configs-arm64-vcm2711-Enable-V3D.patch => 950-0699-configs-arm64-vcm2711-Enable-V3D.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0769-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch => 950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0770-vc-sm-cma-Fix-compatibility-ioctl.patch => 950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0772-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch => 950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch} (96%) rename target/linux/brcm2708/patches-4.19/{950-0773-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch => 950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0774-arm-dts-add-missing-Raspberry-Pi-model-names.patch => 950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0776-arch-arm-Add-model-string-to-cpuinfo.patch => 950-0705-arch-arm-Add-model-string-to-cpuinfo.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0777-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch => 950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0778-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch => 950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0779-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch => 950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0781-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch => 950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0782-staging-bcm2835-codec-Fix-non-documentation-comment-.patch => 950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0783-staging-bcm2835-codec-Fix-declaration-of-roles.patch => 950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch} (91%) rename target/linux/brcm2708/patches-4.19/{950-0784-staging-bcm2835-codec-Add-role-to-device-name.patch => 950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0785-staging-bcm2835-codec-Pass-driver-context-to-create-.patch => 950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0786-staging-bcm2835-codec-add-media-controller-support.patch => 950-0714-staging-bcm2835-codec-add-media-controller-support.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0787-media-bcm2835-unicam-Reduce-scope-of-local-function.patch => 950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0788-media-bcm2835-unicam-add-media-controller-support.patch => 950-0716-media-bcm2835-unicam-add-media-controller-support.patch} (98%) rename target/linux/brcm2708/patches-4.19/{950-0789-Limit-max_req_size-under-arm64-or-any-other-platform.patch => 950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0790-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch => 950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0791-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch => 950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0792-overlays-mcp23017-Add-option-for-not-connecting-the-.patch => 950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0793-v4l2-Add-a-Greyworld-AWB-mode.patch => 950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0794-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch => 950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch} (95%) rename target/linux/brcm2708/patches-4.19/{950-0797-PCI-brcmstb-Fix-compilation-warning.patch => 950-0723-PCI-brcmstb-Fix-compilation-warning.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0798-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch => 950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch => 950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch} (99%) rename target/linux/brcm2708/patches-4.19/{950-0800-staging-bcm2835-codec-Allow-height-of-1920.patch => 950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch} (92%) rename target/linux/brcm2708/patches-4.19/{950-0801-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch => 950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch => 950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch} (97%) rename target/linux/brcm2708/patches-4.19/{950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch => 950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch} (94%) rename target/linux/brcm2708/patches-4.19/{950-0804-Fix-poll-rate-on-touchscreen-3238.patch => 950-0730-Fix-poll-rate-on-touchscreen-3238.patch} (93%) rename target/linux/brcm2708/patches-4.19/{950-0806-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch => 950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch} (98%) diff --git a/target/linux/brcm2708/patches-4.19/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch b/target/linux/brcm2708/patches-4.19/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch index acaec70930..38ef7b310d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch +++ b/target/linux/brcm2708/patches-4.19/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch @@ -1,7 +1,7 @@ From 2096cda971fed28cbc822d8c7d489bf85af22f34 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 21 Sep 2017 09:55:42 -0500 -Subject: [PATCH 001/806] arm: partially revert +Subject: [PATCH] arm: partially revert 702b94bff3c50542a6e4ab9a4f4cef093262fe65 * Re-expose some dmi APIs for use in VCSM diff --git a/target/linux/brcm2708/patches-4.19/950-0002-smsx95xx-fix-crimes-against-truesize.patch b/target/linux/brcm2708/patches-4.19/950-0002-smsx95xx-fix-crimes-against-truesize.patch index b06fe3d0de..248601cb7f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0002-smsx95xx-fix-crimes-against-truesize.patch +++ b/target/linux/brcm2708/patches-4.19/950-0002-smsx95xx-fix-crimes-against-truesize.patch @@ -1,7 +1,7 @@ From 26bb49317b44d0927ed7b4be1d72aa11853a01f7 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Thu, 19 Feb 2015 18:47:12 +0000 -Subject: [PATCH 002/806] smsx95xx: fix crimes against truesize +Subject: [PATCH] smsx95xx: fix crimes against truesize smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings. diff --git a/target/linux/brcm2708/patches-4.19/950-0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/brcm2708/patches-4.19/950-0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch index 862d898cbc..7b165cb900 100644 --- a/target/linux/brcm2708/patches-4.19/950-0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch @@ -1,7 +1,7 @@ From ac6edc14a931f10413d4586c2d0d1f2ddc1a416a Mon Sep 17 00:00:00 2001 From: Sam Nazarko Date: Fri, 1 Apr 2016 17:27:21 +0100 -Subject: [PATCH 003/806] smsc95xx: Experimental: Enable turbo_mode and +Subject: [PATCH] smsc95xx: Experimental: Enable turbo_mode and packetsize=2560 by default See: http://forum.kodi.tv/showthread.php?tid=285288 diff --git a/target/linux/brcm2708/patches-4.19/950-0004-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/brcm2708/patches-4.19/950-0004-Allow-mac-address-to-be-set-in-smsc95xx.patch index 7c8a109464..4ada237162 100644 --- a/target/linux/brcm2708/patches-4.19/950-0004-Allow-mac-address-to-be-set-in-smsc95xx.patch +++ b/target/linux/brcm2708/patches-4.19/950-0004-Allow-mac-address-to-be-set-in-smsc95xx.patch @@ -1,7 +1,7 @@ From fa1451d655f59916aec1c1e4fb17f19a78005066 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Mar 2013 17:26:38 +0000 -Subject: [PATCH 004/806] Allow mac address to be set in smsc95xx +Subject: [PATCH] Allow mac address to be set in smsc95xx Signed-off-by: popcornmix --- diff --git a/target/linux/brcm2708/patches-4.19/950-0005-Protect-__release_resource-against-resources-without.patch b/target/linux/brcm2708/patches-4.19/950-0005-Protect-__release_resource-against-resources-without.patch index 38fc5d8a4d..96ab329c9e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0005-Protect-__release_resource-against-resources-without.patch +++ b/target/linux/brcm2708/patches-4.19/950-0005-Protect-__release_resource-against-resources-without.patch @@ -1,7 +1,7 @@ From 6209e42d384cfe873123b411a9bd170de027d4b5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 13 Mar 2015 12:43:36 +0000 -Subject: [PATCH 005/806] Protect __release_resource against resources without +Subject: [PATCH] Protect __release_resource against resources without parents Without this patch, removing a device tree overlay can crash here. diff --git a/target/linux/brcm2708/patches-4.19/950-0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch b/target/linux/brcm2708/patches-4.19/950-0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch index 8dd46f2508..1331c13374 100644 --- a/target/linux/brcm2708/patches-4.19/950-0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch +++ b/target/linux/brcm2708/patches-4.19/950-0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch @@ -1,7 +1,7 @@ From 5e9082be2fca137fe13b8af15aa0b9d178cd99c1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 4 Dec 2015 17:41:50 +0000 -Subject: [PATCH 006/806] irq-bcm2836: Prevent spurious interrupts, and trap +Subject: [PATCH] irq-bcm2836: Prevent spurious interrupts, and trap them early The old arch-specific IRQ macros included a dsb to ensure the diff --git a/target/linux/brcm2708/patches-4.19/950-0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch b/target/linux/brcm2708/patches-4.19/950-0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch index bf78731b15..8d1feee2be 100644 --- a/target/linux/brcm2708/patches-4.19/950-0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch @@ -1,7 +1,7 @@ From b8a56e2dbae7dbcc0537b03f8a99eb5ba638876b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:33:30 +0000 -Subject: [PATCH 007/806] irq-bcm2836: Avoid "Invalid trigger warning" +Subject: [PATCH] irq-bcm2836: Avoid "Invalid trigger warning" Initialise the level for each IRQ to avoid a warning from the arm arch timer code. diff --git a/target/linux/brcm2708/patches-4.19/950-0008-irqchip-bcm2835-Add-FIQ-support.patch b/target/linux/brcm2708/patches-4.19/950-0008-irqchip-bcm2835-Add-FIQ-support.patch index f1cc3c86c1..ea2b54075d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0008-irqchip-bcm2835-Add-FIQ-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0008-irqchip-bcm2835-Add-FIQ-support.patch @@ -1,7 +1,7 @@ From 9334b65d3020bca44aa2695b84eda865ecc340e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 12 Jun 2015 19:01:05 +0200 -Subject: [PATCH 008/806] irqchip: bcm2835: Add FIQ support +Subject: [PATCH] irqchip: bcm2835: Add FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch b/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch index f701116afb..56dd9429fa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch @@ -1,7 +1,7 @@ From a2416a2926904e3a07bdb10b9cf3c7871e87583c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 23 Oct 2015 16:26:55 +0200 -Subject: [PATCH 009/806] irqchip: irq-bcm2835: Add 2836 FIQ support +Subject: [PATCH] irqchip: irq-bcm2835: Add 2836 FIQ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch b/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch index 4575bdfc41..91e27c36cc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch +++ b/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch @@ -1,7 +1,7 @@ From e21d0b86f4a9c2c1f61e183e5dfcc1cf37058ca1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 10:26:09 +0100 -Subject: [PATCH 010/806] spidev: Add "spidev" compatible string to silence +Subject: [PATCH] spidev: Add "spidev" compatible string to silence warning See: https://github.com/raspberrypi/linux/issues/1054 diff --git a/target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch b/target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch index db658bcf2e..0517999883 100644 --- a/target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch +++ b/target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch @@ -1,7 +1,7 @@ From 61ca6adb1fc93622bb85acc18b6ce4f620c8c690 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 24 Jun 2015 14:10:44 +0100 -Subject: [PATCH 011/806] spi-bcm2835: Support pin groups other than 7-11 +Subject: [PATCH] spi-bcm2835: Support pin groups other than 7-11 The spi-bcm2835 driver automatically uses GPIO chip-selects due to some unreliability of the native ones. In doing so it chooses the diff --git a/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch b/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch index 1df35981fd..30a65ff35e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch @@ -1,7 +1,7 @@ From 2610aceda837370048f86b4af27852463c3b5a47 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 Jul 2016 22:09:24 +0100 -Subject: [PATCH 012/806] spi-bcm2835: Disable forced software CS +Subject: [PATCH] spi-bcm2835: Disable forced software CS Select software CS in bcm2708_common.dtsi, and disable the automatic conversion in the driver to allow hardware CS to be re-enabled with an diff --git a/target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch b/target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch index db4bb49527..41d6c8d363 100644 --- a/target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch +++ b/target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch @@ -1,7 +1,7 @@ From 80dc41f5617db0dbe3e17a399603a50b91997c5b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 8 Nov 2016 21:35:38 +0000 -Subject: [PATCH 013/806] spi-bcm2835: Remove unused code +Subject: [PATCH] spi-bcm2835: Remove unused code --- drivers/spi/spi-bcm2835.c | 61 --------------------------------------- diff --git a/target/linux/brcm2708/patches-4.19/950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/brcm2708/patches-4.19/950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch index b43e7a0451..05bc4a0f4d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch +++ b/target/linux/brcm2708/patches-4.19/950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch @@ -1,7 +1,7 @@ From 10d11b6b5410b9d31845efd23147fd08477a5151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sat, 3 Oct 2015 22:22:55 +0200 -Subject: [PATCH 014/806] dmaengine: bcm2835: Load driver early and support +Subject: [PATCH] dmaengine: bcm2835: Load driver early and support legacy API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/target/linux/brcm2708/patches-4.19/950-0015-firmware-Updated-mailbox-header.patch b/target/linux/brcm2708/patches-4.19/950-0015-firmware-Updated-mailbox-header.patch index d6921a6e88..1eca3a9265 100644 --- a/target/linux/brcm2708/patches-4.19/950-0015-firmware-Updated-mailbox-header.patch +++ b/target/linux/brcm2708/patches-4.19/950-0015-firmware-Updated-mailbox-header.patch @@ -1,7 +1,7 @@ From e00fde59167c31cf376c74b333b58f011b244dfa Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 25 Jan 2016 17:25:12 +0000 -Subject: [PATCH 015/806] firmware: Updated mailbox header +Subject: [PATCH] firmware: Updated mailbox header --- include/soc/bcm2835/raspberrypi-firmware.h | 5 +++++ diff --git a/target/linux/brcm2708/patches-4.19/950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch b/target/linux/brcm2708/patches-4.19/950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch index 29119dd676..a08cd13456 100644 --- a/target/linux/brcm2708/patches-4.19/950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch @@ -1,7 +1,7 @@ From 3c8282fa8f1a50bf5ff5b83e83d97b37433bbdd9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 15 Jun 2016 16:48:41 +0100 -Subject: [PATCH 016/806] rtc: Add SPI alias for pcf2123 driver +Subject: [PATCH] rtc: Add SPI alias for pcf2123 driver Without this alias, Device Tree won't cause the driver to be loaded. diff --git a/target/linux/brcm2708/patches-4.19/950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch b/target/linux/brcm2708/patches-4.19/950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch index 6db6881888..ce3bf61911 100644 --- a/target/linux/brcm2708/patches-4.19/950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch +++ b/target/linux/brcm2708/patches-4.19/950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch @@ -1,7 +1,7 @@ From 8018869c6c8590018c1cd272475eda0dbf72a7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 7 Oct 2016 16:50:59 +0200 -Subject: [PATCH 017/806] watchdog: bcm2835: Support setting reboot partition +Subject: [PATCH] watchdog: bcm2835: Support setting reboot partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/target/linux/brcm2708/patches-4.19/950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch index 62a8b13f11..dc83b7f8ef 100644 --- a/target/linux/brcm2708/patches-4.19/950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch @@ -1,7 +1,7 @@ From c296f60b7a5b3c4f82aa0768030ebf64ab64792b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 Apr 2016 19:40:12 +0100 -Subject: [PATCH 018/806] reboot: Use power off rather than busy spinning when +Subject: [PATCH] reboot: Use power off rather than busy spinning when halt is requested --- diff --git a/target/linux/brcm2708/patches-4.19/950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch b/target/linux/brcm2708/patches-4.19/950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch index e33e4ee517..e1f6950156 100644 --- a/target/linux/brcm2708/patches-4.19/950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch +++ b/target/linux/brcm2708/patches-4.19/950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch @@ -1,7 +1,7 @@ From f54671cb165da1c13d33777cd59329a464f9863b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Nov 2016 13:02:52 +0000 -Subject: [PATCH 019/806] bcm: Make RASPBERRYPI_POWER depend on PM +Subject: [PATCH] bcm: Make RASPBERRYPI_POWER depend on PM --- drivers/soc/bcm/Kconfig | 1 + diff --git a/target/linux/brcm2708/patches-4.19/950-0020-Register-the-clocks-early-during-the-boot-process-so.patch b/target/linux/brcm2708/patches-4.19/950-0020-Register-the-clocks-early-during-the-boot-process-so.patch index f77e14fc0f..6665d4d112 100644 --- a/target/linux/brcm2708/patches-4.19/950-0020-Register-the-clocks-early-during-the-boot-process-so.patch +++ b/target/linux/brcm2708/patches-4.19/950-0020-Register-the-clocks-early-during-the-boot-process-so.patch @@ -1,7 +1,7 @@ From 05caac5f388bf0b821d4a75e480a74ae40fc8478 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Fri, 2 Sep 2016 16:45:27 +0100 -Subject: [PATCH 020/806] Register the clocks early during the boot process, so +Subject: [PATCH] Register the clocks early during the boot process, so that special/critical clocks can get enabled early on in the boot process avoiding the risk of disabling a clock, pll_divider or pll when a claiming driver fails to install propperly - maybe it needs to defer. diff --git a/target/linux/brcm2708/patches-4.19/950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/target/linux/brcm2708/patches-4.19/950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch index 4b33ad22b2..30ab0504ae 100644 --- a/target/linux/brcm2708/patches-4.19/950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch +++ b/target/linux/brcm2708/patches-4.19/950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch @@ -1,7 +1,7 @@ From d5df60f32f3c3b2f7f6d758ac08de6acb9fd947f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 6 Dec 2016 17:05:39 +0000 -Subject: [PATCH 021/806] bcm2835-rng: Avoid initialising if already enabled +Subject: [PATCH] bcm2835-rng: Avoid initialising if already enabled Avoids the 0x40000 cycles of warmup again if firmware has already used it --- diff --git a/target/linux/brcm2708/patches-4.19/950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch b/target/linux/brcm2708/patches-4.19/950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch index c968717e31..6d5d7d4d8b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch +++ b/target/linux/brcm2708/patches-4.19/950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch @@ -1,7 +1,7 @@ From 3437db6e19e29ff9b6d2eef9a5ee703f04ca1d41 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 24 Aug 2016 16:28:44 +0100 -Subject: [PATCH 022/806] kbuild: Ignore dtco targets when filtering symbols +Subject: [PATCH] kbuild: Ignore dtco targets when filtering symbols --- scripts/Kbuild.include | 2 +- diff --git a/target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch index 83451a9954..e4a1d7f660 100644 --- a/target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch +++ b/target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch @@ -1,7 +1,7 @@ From f1f199b682e258674137105f49d033cb81612ab7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 023/806] clk-bcm2835: Mark used PLLs and dividers CRITICAL +Subject: [PATCH] clk-bcm2835: Mark used PLLs and dividers CRITICAL The VPU configures and relies on several PLLs and dividers. Mark all enabled dividers and their PLLs as CRITICAL to prevent the kernel from diff --git a/target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Add-claim-clocks-property.patch index 9b58d00460..63f1f9f74a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Add-claim-clocks-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Add-claim-clocks-property.patch @@ -1,7 +1,7 @@ From 787234827719aa1d44b079969419d91b665a491d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Feb 2017 17:20:08 +0000 -Subject: [PATCH 024/806] clk-bcm2835: Add claim-clocks property +Subject: [PATCH] clk-bcm2835: Add claim-clocks property The claim-clocks property can be used to prevent PLLs and dividers from being marked as critical. It contains a vector of clock IDs, diff --git a/target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch index 5a38d8c6ce..2838360a00 100644 --- a/target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch +++ b/target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch @@ -1,7 +1,7 @@ From f8e7e4a65b3f99452db67cfb7e21afc80b8af7f2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 6 Mar 2017 09:06:18 +0000 -Subject: [PATCH 025/806] clk-bcm2835: Read max core clock from firmware +Subject: [PATCH] clk-bcm2835: Read max core clock from firmware The VPU is responsible for managing the core clock, usually under direction from the bcm2835-cpufreq driver but not via the clk-bcm2835 diff --git a/target/linux/brcm2708/patches-4.19/950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch b/target/linux/brcm2708/patches-4.19/950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch index 327546eddd..2df0d37b8d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch +++ b/target/linux/brcm2708/patches-4.19/950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch @@ -1,7 +1,7 @@ From 6272fd1e55945522b156a28c1f605b69ae6e05b7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 9 May 2016 17:28:18 -0700 -Subject: [PATCH 026/806] clk: bcm2835: Mark GPIO clocks enabled at boot as +Subject: [PATCH] clk: bcm2835: Mark GPIO clocks enabled at boot as critical. These divide off of PLLD_PER and are used for the ethernet and wifi diff --git a/target/linux/brcm2708/patches-4.19/950-0027-sound-Demote-deferral-errors-to-INFO-level.patch b/target/linux/brcm2708/patches-4.19/950-0027-sound-Demote-deferral-errors-to-INFO-level.patch index 3a78d7196a..fcb401c090 100644 --- a/target/linux/brcm2708/patches-4.19/950-0027-sound-Demote-deferral-errors-to-INFO-level.patch +++ b/target/linux/brcm2708/patches-4.19/950-0027-sound-Demote-deferral-errors-to-INFO-level.patch @@ -1,7 +1,7 @@ From fd613a5d5dc7f023d7d983aee9d854fd3a41d669 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 9 Feb 2017 14:36:44 +0000 -Subject: [PATCH 027/806] sound: Demote deferral errors to INFO level +Subject: [PATCH] sound: Demote deferral errors to INFO level At present there is no mechanism to specify driver load order, which can lead to deferrals and repeated retries until successful. diff --git a/target/linux/brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch b/target/linux/brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch index f589cf4b1d..7fd6024715 100644 --- a/target/linux/brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch +++ b/target/linux/brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch @@ -1,7 +1,7 @@ From 0eb679e4b41dab1e421415917feae44d00e1687f Mon Sep 17 00:00:00 2001 From: Claggy3 Date: Sat, 11 Feb 2017 14:00:30 +0000 -Subject: [PATCH 028/806] Update vfpmodule.c +Subject: [PATCH] Update vfpmodule.c Christopher Alexander Tobias Schulze - May 2, 2015, 11:57 a.m. This patch fixes a problem with VFP state save and restore related diff --git a/target/linux/brcm2708/patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch b/target/linux/brcm2708/patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch index 4f7e2238d9..d6372ec7cb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch @@ -1,7 +1,7 @@ From b6494e2070983020d56f82d9d0be74d11b001823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Tue, 1 Nov 2016 15:15:41 +0100 -Subject: [PATCH 029/806] i2c: bcm2835: Add debug support +Subject: [PATCH] i2c: bcm2835: Add debug support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch b/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch index f08379057f..76a53fea0d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch @@ -1,7 +1,7 @@ From a8a5ad555b7168ce90263395dc5f26b99af9bf4e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 18 Dec 2014 16:07:15 -0800 -Subject: [PATCH 030/806] mm: Remove the PFN busy warning +Subject: [PATCH] mm: Remove the PFN busy warning See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is expected sometimes when using CMA. However, that commit still spams diff --git a/target/linux/brcm2708/patches-4.19/950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch b/target/linux/brcm2708/patches-4.19/950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch index 88148a68a1..9007aba3f0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch +++ b/target/linux/brcm2708/patches-4.19/950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch @@ -1,7 +1,7 @@ From e4cd2b482eadc7f7901ba6c0df3080f792c4d655 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 Mar 2017 10:06:56 +0000 -Subject: [PATCH 031/806] ASoC: Add prompt for ICS43432 codec +Subject: [PATCH] ASoC: Add prompt for ICS43432 codec Without a prompt string, a config setting can't be included in a defconfig. Give CONFIG_SND_SOC_ICS43432 a prompt so that Pi soundcards diff --git a/target/linux/brcm2708/patches-4.19/950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch b/target/linux/brcm2708/patches-4.19/950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch index 010eff83a2..0881053ab2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch +++ b/target/linux/brcm2708/patches-4.19/950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch @@ -1,7 +1,7 @@ From f1905bc5137db49ef155f835d52d68cb86c4c9a9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Jan 2018 16:52:45 +0000 -Subject: [PATCH 032/806] irqchip: irq-bcm2836: Remove regmap and syscon use +Subject: [PATCH] irqchip: irq-bcm2836: Remove regmap and syscon use The syscon node defines a register range that duplicates that used by the local_intc node on bcm2836/7. Since irq-bcm2835 and irq-bcm2836 are diff --git a/target/linux/brcm2708/patches-4.19/950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/brcm2708/patches-4.19/950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch index 48939f8484..847d8f5102 100644 --- a/target/linux/brcm2708/patches-4.19/950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/brcm2708/patches-4.19/950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch @@ -1,7 +1,7 @@ From 645eb2cf211c04496c9f5daca23ab16ce796b0df Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 17 Oct 2017 15:04:29 +0100 -Subject: [PATCH 033/806] lan78xx: Enable LEDs and auto-negotiation +Subject: [PATCH] lan78xx: Enable LEDs and auto-negotiation For applications of the LAN78xx that don't have valid programmed EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default diff --git a/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch index 61ab7095fb..1d6fdacfa8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ b/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch @@ -1,7 +1,7 @@ From c048d8c7b1ae0d56d9ee1bca2be8cc9da5a43bba Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Feb 2016 17:26:48 +0000 -Subject: [PATCH 034/806] amba_pl011: Don't use DT aliases for numbering +Subject: [PATCH] amba_pl011: Don't use DT aliases for numbering The pl011 driver looks for DT aliases of the form "serial", and if found uses as the device ID. This can cause diff --git a/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch b/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch index d5e9f3174c..8768351034 100644 --- a/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch @@ -1,7 +1,7 @@ From 610cb34f3d7c5fdffb0db82538731714a2df1d13 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Mar 2017 16:07:39 +0000 -Subject: [PATCH 035/806] amba_pl011: Round input clock up +Subject: [PATCH] amba_pl011: Round input clock up The UART clock is initialised to be as close to the requested frequency as possible without exceeding it. Now that there is a diff --git a/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch index eef29187ae..30ac2a883c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch +++ b/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch @@ -1,7 +1,7 @@ From 76627df3e5f0513118dac20710766f97fc5ca32d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 036/806] amba_pl011: Insert mb() for correct FIFO handling +Subject: [PATCH] amba_pl011: Insert mb() for correct FIFO handling The pl011 register accessor functions use the _relaxed versions of the standard readl() and writel() functions, meaning that there are no diff --git a/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch index e5a3c39b3f..d7514a5525 100644 --- a/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch @@ -1,7 +1,7 @@ From 17a4507175ca6018ea40e91c9d753bc39f043d99 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 29 Sep 2017 10:32:19 +0100 -Subject: [PATCH 037/806] amba_pl011: Add cts-event-workaround DT property +Subject: [PATCH] amba_pl011: Add cts-event-workaround DT property The BCM2835 PL011 implementation seems to have a bug that can lead to a transmission lockup if CTS changes frequently. A workaround was added to diff --git a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch index 307e82ede4..26c08cd1a2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch +++ b/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch @@ -1,7 +1,7 @@ From 491316e4e140152fb6c66fa99716450bb13ea49a Mon Sep 17 00:00:00 2001 From: notro Date: Thu, 10 Jul 2014 13:59:47 +0200 -Subject: [PATCH 038/806] pinctrl-bcm2835: Set base to 0 give expected gpio +Subject: [PATCH] pinctrl-bcm2835: Set base to 0 give expected gpio numbering Signed-off-by: Noralf Tronnes diff --git a/target/linux/brcm2708/patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/brcm2708/patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch index 4f14c4c18a..a553d5a854 100644 --- a/target/linux/brcm2708/patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch +++ b/target/linux/brcm2708/patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch @@ -1,7 +1,7 @@ From b37c8c275b90b3730ad99b0e96ae5e36895b26e8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 12 May 2013 12:24:19 +0100 -Subject: [PATCH 039/806] Main bcm2708/bcm2709 linux port +Subject: [PATCH] Main bcm2708/bcm2709 linux port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch index fe8f9fb66b..346a575050 100644 --- a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch @@ -1,7 +1,7 @@ From e30ea17381a5381b1d764da094a56d5cb0c9d636 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 May 2013 19:46:17 +0100 -Subject: [PATCH 040/806] Add dwc_otg driver +Subject: [PATCH] Add dwc_otg driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0041-bcm2708-framebuffer-driver.patch b/target/linux/brcm2708/patches-4.19/950-0041-bcm2708-framebuffer-driver.patch index 7135ff3fcf..f77b3fd8e0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0041-bcm2708-framebuffer-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0041-bcm2708-framebuffer-driver.patch @@ -1,7 +1,7 @@ From 7be9aaefa159fe6e59064e2a90195a63cc88352a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 17:06:34 +0100 -Subject: [PATCH 041/806] bcm2708 framebuffer driver +Subject: [PATCH] bcm2708 framebuffer driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0042-Speed-up-console-framebuffer-imageblit-function.patch b/target/linux/brcm2708/patches-4.19/950-0042-Speed-up-console-framebuffer-imageblit-function.patch index b404ee5366..17d6137728 100644 --- a/target/linux/brcm2708/patches-4.19/950-0042-Speed-up-console-framebuffer-imageblit-function.patch +++ b/target/linux/brcm2708/patches-4.19/950-0042-Speed-up-console-framebuffer-imageblit-function.patch @@ -1,7 +1,7 @@ From f4489532d7a73ded68e1b8a815a71b0fe25e9e21 Mon Sep 17 00:00:00 2001 From: Harm Hanemaaijer Date: Thu, 20 Jun 2013 20:21:39 +0200 -Subject: [PATCH 042/806] Speed up console framebuffer imageblit function +Subject: [PATCH] Speed up console framebuffer imageblit function Especially on platforms with a slower CPU but a relatively high framebuffer fill bandwidth, like current ARM devices, the existing diff --git a/target/linux/brcm2708/patches-4.19/950-0043-dmaengine-Add-support-for-BCM2708.patch b/target/linux/brcm2708/patches-4.19/950-0043-dmaengine-Add-support-for-BCM2708.patch index c7c1b98b6c..46bcb45e01 100644 --- a/target/linux/brcm2708/patches-4.19/950-0043-dmaengine-Add-support-for-BCM2708.patch +++ b/target/linux/brcm2708/patches-4.19/950-0043-dmaengine-Add-support-for-BCM2708.patch @@ -1,7 +1,7 @@ From 9405d98a5b9ad11e9be2dc1247de3e26896a00d9 Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Fri, 22 Nov 2013 14:22:53 +0100 -Subject: [PATCH 043/806] dmaengine: Add support for BCM2708 +Subject: [PATCH] dmaengine: Add support for BCM2708 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch index 3caebb8943..b154d6ee75 100644 --- a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch @@ -1,7 +1,7 @@ From 74f3233f6ed4298983348b2ba5a500f955703953 Mon Sep 17 00:00:00 2001 From: gellert Date: Fri, 15 Aug 2014 16:35:06 +0100 -Subject: [PATCH 044/806] MMC: added alternative MMC driver +Subject: [PATCH] MMC: added alternative MMC driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch b/target/linux/brcm2708/patches-4.19/950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch index 4ede44e796..b3b73b8073 100644 --- a/target/linux/brcm2708/patches-4.19/950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch +++ b/target/linux/brcm2708/patches-4.19/950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch @@ -1,7 +1,7 @@ From 5fcaebde5b5cd58630ea70bbfe0c62f8229469c5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 25 Mar 2015 17:49:47 +0000 -Subject: [PATCH 045/806] Adding bcm2835-sdhost driver, and an overlay to +Subject: [PATCH] Adding bcm2835-sdhost driver, and an overlay to enable it BCM2835 has two SD card interfaces. This driver uses the other one. diff --git a/target/linux/brcm2708/patches-4.19/950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch b/target/linux/brcm2708/patches-4.19/950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch index a696f57f75..17663b294f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch +++ b/target/linux/brcm2708/patches-4.19/950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch @@ -1,7 +1,7 @@ From cfdf39199781b73840dfdfb7d1281b398c1334cf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 28 Oct 2016 15:36:43 +0100 -Subject: [PATCH 046/806] vc_mem: Add vc_mem driver for querying firmware +Subject: [PATCH] vc_mem: Add vc_mem driver for querying firmware memory addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/target/linux/brcm2708/patches-4.19/950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch b/target/linux/brcm2708/patches-4.19/950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch index 5ae45368a9..1916ac6944 100644 --- a/target/linux/brcm2708/patches-4.19/950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch +++ b/target/linux/brcm2708/patches-4.19/950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch @@ -1,7 +1,7 @@ From 6f27d1904c3f46e00388b1603ceed359387349d2 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 22 Jul 2014 15:41:04 +0100 -Subject: [PATCH 047/806] vcsm: VideoCore shared memory service for BCM2835 +Subject: [PATCH] vcsm: VideoCore shared memory service for BCM2835 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch index 1760012e3e..6afffd2a16 100644 --- a/target/linux/brcm2708/patches-4.19/950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch +++ b/target/linux/brcm2708/patches-4.19/950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch @@ -1,7 +1,7 @@ From cff179ff275e8f7849384ad2876c9a3237eeac79 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Fri, 21 Aug 2015 23:14:48 +0100 -Subject: [PATCH 048/806] Add /dev/gpiomem device for rootless user GPIO access +Subject: [PATCH] Add /dev/gpiomem device for rootless user GPIO access Signed-off-by: Luke Wren diff --git a/target/linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch b/target/linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch index 73f0b70264..a947f27654 100644 --- a/target/linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch @@ -1,7 +1,7 @@ From 9c81a1d5224e50e6ec45b8d0c97026a5dc800853 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sat, 5 Sep 2015 01:14:45 +0100 -Subject: [PATCH 049/806] Add SMI driver +Subject: [PATCH] Add SMI driver Signed-off-by: Luke Wren --- diff --git a/target/linux/brcm2708/patches-4.19/950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch b/target/linux/brcm2708/patches-4.19/950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch index a1c327459e..c7cb1e6d86 100644 --- a/target/linux/brcm2708/patches-4.19/950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch +++ b/target/linux/brcm2708/patches-4.19/950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch @@ -1,7 +1,7 @@ From f7cccb2e66f0187f69a432536f227b32a458f94b Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Tue, 26 Apr 2016 14:59:21 +0000 -Subject: [PATCH 050/806] MISC: bcm2835: smi: use clock manager and fix reload +Subject: [PATCH] MISC: bcm2835: smi: use clock manager and fix reload issues Use clock manager instead of self-made clockmanager. diff --git a/target/linux/brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch b/target/linux/brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch index ddcc19d0d6..8688431a11 100644 --- a/target/linux/brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch @@ -1,7 +1,7 @@ From 06d1fce502f478f7e554c591a68cd42cc861e976 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sat, 5 Sep 2015 01:16:10 +0100 -Subject: [PATCH 051/806] Add SMI NAND driver +Subject: [PATCH] Add SMI NAND driver Signed-off-by: Luke Wren --- diff --git a/target/linux/brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch b/target/linux/brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch index cac3399e6d..b9cf14453c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch @@ -1,7 +1,7 @@ From 0a248af6e18d7f1ad57fffa7f588bc8a5851832e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:49:20 +0100 -Subject: [PATCH 052/806] Add cpufreq driver +Subject: [PATCH] Add cpufreq driver Signed-off-by: popcornmix diff --git a/target/linux/brcm2708/patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch b/target/linux/brcm2708/patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch index cec00dc330..cf26302f71 100644 --- a/target/linux/brcm2708/patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch @@ -1,7 +1,7 @@ From 1f72dfe2738305c57605a8192176117e1641779c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jun 2015 15:44:08 +0100 -Subject: [PATCH 053/806] Add Chris Boot's i2c driver +Subject: [PATCH] Add Chris Boot's i2c driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch b/target/linux/brcm2708/patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch index 6489100d67..e55c04ac2d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch +++ b/target/linux/brcm2708/patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch @@ -1,7 +1,7 @@ From 6e169c17c0de4503264186d90aa51639924c6e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 26 Jun 2015 14:27:06 +0200 -Subject: [PATCH 054/806] char: broadcom: Add vcio module +Subject: [PATCH] char: broadcom: Add vcio module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch b/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch index a47be248a2..2851cebfb2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch +++ b/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch @@ -1,7 +1,7 @@ From 6f190ee10a1d3276450e6190bb6d75a03040dcef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 26 Jun 2015 14:25:01 +0200 -Subject: [PATCH 055/806] firmware: bcm2835: Support ARCH_BCM270x +Subject: [PATCH] firmware: bcm2835: Support ARCH_BCM270x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch b/target/linux/brcm2708/patches-4.19/950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch index 6aba53ffdc..e6bb9fa388 100644 --- a/target/linux/brcm2708/patches-4.19/950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch @@ -1,7 +1,7 @@ From 28951ab97e67b20640b183364d2396e91e8a6148 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 May 2015 09:00:42 +0100 -Subject: [PATCH 056/806] scripts: Add mkknlimg and knlinfo scripts from tools +Subject: [PATCH] scripts: Add mkknlimg and knlinfo scripts from tools repo The Raspberry Pi firmware looks for a trailer on the kernel image to diff --git a/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch index f2ad9710fd..72b9cfc131 100644 --- a/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch @@ -1,7 +1,7 @@ From d04105f6d48f160f4b7ab874ed7f878c2b84b466 Mon Sep 17 00:00:00 2001 From: notro Date: Wed, 9 Jul 2014 14:46:08 +0200 -Subject: [PATCH 057/806] BCM2708: Add core Device Tree support +Subject: [PATCH] BCM2708: Add core Device Tree support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch b/target/linux/brcm2708/patches-4.19/950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch index 6eb9b54ed9..b3839f6ad7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch +++ b/target/linux/brcm2708/patches-4.19/950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch @@ -1,7 +1,7 @@ From 7181db1685aa67e127f80fe9607270d3c87aa3b9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 6 Feb 2015 13:50:57 +0000 -Subject: [PATCH 058/806] BCM270x_DT: Add pwr_led, and the required "input" +Subject: [PATCH] BCM270x_DT: Add pwr_led, and the required "input" trigger The "input" trigger makes the associated GPIO an input. This is to support diff --git a/target/linux/brcm2708/patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/brcm2708/patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch index 5a3f910429..16c15d59f2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/brcm2708/patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -1,7 +1,7 @@ From 5269119dadfc6874aec51fed4468c73f1b0187a2 Mon Sep 17 00:00:00 2001 From: Siarhei Siamashka Date: Mon, 17 Jun 2013 13:32:11 +0300 -Subject: [PATCH 059/806] fbdev: add FBIOCOPYAREA ioctl +Subject: [PATCH] fbdev: add FBIOCOPYAREA ioctl Based on the patch authored by Ali Gholami Rudi at https://lkml.org/lkml/2009/7/13/153 diff --git a/target/linux/brcm2708/patches-4.19/950-0060-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/brcm2708/patches-4.19/950-0060-Added-Device-IDs-for-August-DVB-T-205.patch index ec8489a108..409b289416 100644 --- a/target/linux/brcm2708/patches-4.19/950-0060-Added-Device-IDs-for-August-DVB-T-205.patch +++ b/target/linux/brcm2708/patches-4.19/950-0060-Added-Device-IDs-for-August-DVB-T-205.patch @@ -1,7 +1,7 @@ From 298368d476283829d222cb974491ac313605ed69 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 3 Jul 2013 00:54:08 +0100 -Subject: [PATCH 060/806] Added Device IDs for August DVB-T 205 +Subject: [PATCH] Added Device IDs for August DVB-T 205 --- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++ diff --git a/target/linux/brcm2708/patches-4.19/950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch b/target/linux/brcm2708/patches-4.19/950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch index fdea2ab19f..6f7b31e4d0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch +++ b/target/linux/brcm2708/patches-4.19/950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch @@ -1,7 +1,7 @@ From 8137201823bd2ed1b3951220f29fdc9555c3c6de Mon Sep 17 00:00:00 2001 From: Gordon Hollingworth Date: Tue, 12 May 2015 14:47:56 +0100 -Subject: [PATCH 061/806] rpi-ft5406: Add touchscreen driver for pi LCD display +Subject: [PATCH] rpi-ft5406: Add touchscreen driver for pi LCD display Fix driver detection failure Check that the buffer response is non-zero meaning the touchscreen was detected diff --git a/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch index 4335ff9560..430059cddf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch @@ -1,7 +1,7 @@ From e4d81adf1f2c84b229901cddb403d00010524b28 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Nov 2016 16:50:04 +0000 -Subject: [PATCH 062/806] Improve __copy_to_user and __copy_from_user +Subject: [PATCH] Improve __copy_to_user and __copy_from_user performance Provide a __copy_from_user that uses memcpy. On BCM2708, use diff --git a/target/linux/brcm2708/patches-4.19/950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch index 60f4066d50..0278156959 100644 --- a/target/linux/brcm2708/patches-4.19/950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch @@ -1,7 +1,7 @@ From 84cd61bdf5fe5ecf70ad88e60e07879cbde2d4a6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 25 Jun 2015 12:16:11 +0100 -Subject: [PATCH 063/806] gpio-poweroff: Allow it to work on Raspberry Pi +Subject: [PATCH] gpio-poweroff: Allow it to work on Raspberry Pi The Raspberry Pi firmware manages the power-down and reboot process. To do this it installs a pm_power_off handler, causing diff --git a/target/linux/brcm2708/patches-4.19/950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch b/target/linux/brcm2708/patches-4.19/950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch index 1a8ab6c44e..a6d04a90b5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch @@ -1,7 +1,7 @@ From 0d63b8a00c925eb02093e9ed4866c4a0d9209a00 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Jul 2015 14:32:47 +0100 -Subject: [PATCH 064/806] mfd: Add Raspberry Pi Sense HAT core driver +Subject: [PATCH] mfd: Add Raspberry Pi Sense HAT core driver --- drivers/input/joystick/Kconfig | 8 + diff --git a/target/linux/brcm2708/patches-4.19/950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch b/target/linux/brcm2708/patches-4.19/950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch index 36284a6b98..e656c05a55 100644 --- a/target/linux/brcm2708/patches-4.19/950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch +++ b/target/linux/brcm2708/patches-4.19/950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch @@ -1,7 +1,7 @@ From 5fd7bb26ef791a7da1c0573b980ab4fe6b9c2641 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 22 Feb 2018 11:55:06 +0100 -Subject: [PATCH 065/806] ASoC: pcm512x: implement set_tdm_slot interface +Subject: [PATCH] ASoC: pcm512x: implement set_tdm_slot interface PCM512x can accept data padded with additional BCLK cycles but the driver currently lacks an interface to configure this. diff --git a/target/linux/brcm2708/patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch b/target/linux/brcm2708/patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch index fcabe55f80..6eab0b5944 100644 --- a/target/linux/brcm2708/patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch +++ b/target/linux/brcm2708/patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch @@ -1,7 +1,7 @@ From 13ddc845b271d7cc79bcbdd288f95c03ea927b89 Mon Sep 17 00:00:00 2001 From: Florian Meier Date: Mon, 25 Jan 2016 15:48:59 +0000 -Subject: [PATCH 066/806] ASoC: Add support for Rpi-DAC +Subject: [PATCH] ASoC: Add support for Rpi-DAC --- sound/soc/codecs/Kconfig | 5 +++ diff --git a/target/linux/brcm2708/patches-4.19/950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch index 88aa003849..eb21558df6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch @@ -1,7 +1,7 @@ From 76c252645ad542bd35ce52230635f36e3c0f730d Mon Sep 17 00:00:00 2001 From: Gordon Garrity Date: Sat, 8 Mar 2014 16:56:57 +0000 -Subject: [PATCH 067/806] Add IQaudIO Sound Card support for Raspberry Pi +Subject: [PATCH] Add IQaudIO Sound Card support for Raspberry Pi Set a limit of 0dB on Digital Volume Control diff --git a/target/linux/brcm2708/patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch b/target/linux/brcm2708/patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch index f54ea259a8..a335e2dcba 100644 --- a/target/linux/brcm2708/patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch +++ b/target/linux/brcm2708/patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch @@ -1,7 +1,7 @@ From 86d09076abd36ad87477c21f7b33c90cb696e196 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 10:06:56 +0200 -Subject: [PATCH 068/806] Added support for HiFiBerry DAC+ +Subject: [PATCH] Added support for HiFiBerry DAC+ The driver is based on the HiFiBerry DAC driver. However HiFiBerry DAC+ uses a different codec chip (PCM5122), therefore a new driver is necessary. diff --git a/target/linux/brcm2708/patches-4.19/950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch b/target/linux/brcm2708/patches-4.19/950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch index 22dbd89a8b..edb1703200 100644 --- a/target/linux/brcm2708/patches-4.19/950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch +++ b/target/linux/brcm2708/patches-4.19/950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch @@ -1,7 +1,7 @@ From a1344150b31e3b9592f76df8f453a15565a8390a Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Mon, 4 Aug 2014 11:09:58 +0200 -Subject: [PATCH 069/806] Added driver for HiFiBerry Amp amplifier add-on board +Subject: [PATCH] Added driver for HiFiBerry Amp amplifier add-on board The driver contains a low-level hardware driver for the TAS5713 and the drivers for the Raspberry Pi I2S subsystem. diff --git a/target/linux/brcm2708/patches-4.19/950-0070-Add-driver-for-rpi-proto.patch b/target/linux/brcm2708/patches-4.19/950-0070-Add-driver-for-rpi-proto.patch index 0741db969a..0cfe2583b3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0070-Add-driver-for-rpi-proto.patch +++ b/target/linux/brcm2708/patches-4.19/950-0070-Add-driver-for-rpi-proto.patch @@ -1,7 +1,7 @@ From bf4dee727fc7c72e250784e8e3e681f9d11bbdc1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Mar 2015 09:26:17 +0100 -Subject: [PATCH 070/806] Add driver for rpi-proto +Subject: [PATCH] Add driver for rpi-proto Forward port of 3.10.x driver from https://github.com/koalo We are using a custom board and would like to use rpi 3.18.x diff --git a/target/linux/brcm2708/patches-4.19/950-0071-Add-Support-for-JustBoom-Audio-boards.patch b/target/linux/brcm2708/patches-4.19/950-0071-Add-Support-for-JustBoom-Audio-boards.patch index b34d195c5c..68957f35db 100644 --- a/target/linux/brcm2708/patches-4.19/950-0071-Add-Support-for-JustBoom-Audio-boards.patch +++ b/target/linux/brcm2708/patches-4.19/950-0071-Add-Support-for-JustBoom-Audio-boards.patch @@ -1,7 +1,7 @@ From 0435c03e212129e384cd49b19fca7a55dbf1ec50 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Thu, 7 Apr 2016 21:26:21 +0100 -Subject: [PATCH 071/806] Add Support for JustBoom Audio boards +Subject: [PATCH] Add Support for JustBoom Audio boards justboom-dac: Adjust for ALSA API change diff --git a/target/linux/brcm2708/patches-4.19/950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch b/target/linux/brcm2708/patches-4.19/950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch index 68118a175c..b4a67473dc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch +++ b/target/linux/brcm2708/patches-4.19/950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch @@ -1,7 +1,7 @@ From 3f06b2f7c04d263a3bb0569e6f2c341549c21154 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Mon, 16 May 2016 21:36:31 +1000 -Subject: [PATCH 072/806] New AudioInjector.net Pi soundcard with low jitter +Subject: [PATCH] New AudioInjector.net Pi soundcard with low jitter audio in and out. Contains the sound/soc/bcm ALSA machine driver and necessary alterations to the Kconfig and Makefile. diff --git a/target/linux/brcm2708/patches-4.19/950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch b/target/linux/brcm2708/patches-4.19/950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch index ecca124177..1316727f46 100644 --- a/target/linux/brcm2708/patches-4.19/950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch +++ b/target/linux/brcm2708/patches-4.19/950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch @@ -1,7 +1,7 @@ From 13efe81b4ab9321290d6973e90d00b7caf37b47f Mon Sep 17 00:00:00 2001 From: escalator2015 Date: Tue, 24 May 2016 16:20:09 +0100 -Subject: [PATCH 073/806] New driver for RRA DigiDAC1 soundcard using WM8741 + +Subject: [PATCH] New driver for RRA DigiDAC1 soundcard using WM8741 + WM8804 --- diff --git a/target/linux/brcm2708/patches-4.19/950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch b/target/linux/brcm2708/patches-4.19/950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch index fdd54193d8..de72049435 100644 --- a/target/linux/brcm2708/patches-4.19/950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch +++ b/target/linux/brcm2708/patches-4.19/950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch @@ -1,7 +1,7 @@ From 234b6a3cfd5bc1fb341c01f8ac773956f5af42cd Mon Sep 17 00:00:00 2001 From: DigitalDreamtime Date: Sat, 2 Jul 2016 16:26:19 +0100 -Subject: [PATCH 074/806] Add support for Dion Audio LOCO DAC-AMP HAT +Subject: [PATCH] Add support for Dion Audio LOCO DAC-AMP HAT Using dedicated machine driver and pcm5102a codec driver. diff --git a/target/linux/brcm2708/patches-4.19/950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch b/target/linux/brcm2708/patches-4.19/950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch index 0a6228e685..fa1d346702 100644 --- a/target/linux/brcm2708/patches-4.19/950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch @@ -1,7 +1,7 @@ From 4c4b1a565322382b927927d6066735c7cd1ea188 Mon Sep 17 00:00:00 2001 From: Clive Messer Date: Mon, 19 Sep 2016 14:01:04 +0100 -Subject: [PATCH 075/806] Allo Piano DAC boards: Initial 2 channel (stereo) +Subject: [PATCH] Allo Piano DAC boards: Initial 2 channel (stereo) support (#1645) Add initial 2 channel (stereo) support for Allo Piano DAC (2.0/2.1) boards, diff --git a/target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch b/target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch index c940d4dc40..0c7e218fc3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch +++ b/target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch @@ -1,7 +1,7 @@ From 7603d4cf7fb47afc19641b518250ee52852470f6 Mon Sep 17 00:00:00 2001 From: Raashid Muhammed Date: Mon, 27 Mar 2017 12:35:00 +0530 -Subject: [PATCH 076/806] Add support for Allo Piano DAC 2.1 plus add-on board +Subject: [PATCH] Add support for Allo Piano DAC 2.1 plus add-on board for Raspberry Pi. The Piano DAC 2.1 has support for 4 channels with subwoofer. diff --git a/target/linux/brcm2708/patches-4.19/950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch b/target/linux/brcm2708/patches-4.19/950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch index f2a5997c30..9b0750f24b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch +++ b/target/linux/brcm2708/patches-4.19/950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch @@ -1,7 +1,7 @@ From 77dce745cd500cbe65e4cbb613c27c23e26f5bbb Mon Sep 17 00:00:00 2001 From: BabuSubashChandar Date: Tue, 28 Mar 2017 20:04:42 +0530 -Subject: [PATCH 077/806] Add support for Allo Boss DAC add-on board for +Subject: [PATCH] Add support for Allo Boss DAC add-on board for Raspberry Pi. (#1924) Signed-off-by: Baswaraj K diff --git a/target/linux/brcm2708/patches-4.19/950-0078-Support-for-Blokas-Labs-pisound-board.patch b/target/linux/brcm2708/patches-4.19/950-0078-Support-for-Blokas-Labs-pisound-board.patch index c996ea395d..5e9e34b73e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0078-Support-for-Blokas-Labs-pisound-board.patch +++ b/target/linux/brcm2708/patches-4.19/950-0078-Support-for-Blokas-Labs-pisound-board.patch @@ -1,7 +1,7 @@ From 85ef9efcc598bff1d783620e23c09aed873e7aee Mon Sep 17 00:00:00 2001 From: gtrainavicius Date: Sun, 23 Oct 2016 12:06:53 +0300 -Subject: [PATCH 078/806] Support for Blokas Labs pisound board +Subject: [PATCH] Support for Blokas Labs pisound board Pisound dynamic overlay (#1760) diff --git a/target/linux/brcm2708/patches-4.19/950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch b/target/linux/brcm2708/patches-4.19/950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch index 2ee7690e7f..363fd90df2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch +++ b/target/linux/brcm2708/patches-4.19/950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch @@ -1,7 +1,7 @@ From 2c3e4f06b7e7d34a03e747367c26805fbf89a4ac Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 22 Jan 2017 12:49:37 +0100 -Subject: [PATCH 079/806] ASoC: Add driver for Cirrus Logic Audio Card +Subject: [PATCH] ASoC: Add driver for Cirrus Logic Audio Card Note: due to problems with deferred probing of regulators the following softdep should be added to a modprobe.d file diff --git a/target/linux/brcm2708/patches-4.19/950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch b/target/linux/brcm2708/patches-4.19/950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch index 1eb9e539ec..046fe436bc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch +++ b/target/linux/brcm2708/patches-4.19/950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch @@ -1,7 +1,7 @@ From 858a3bbbf274ffcecca558f66aaab146c11fdfe9 Mon Sep 17 00:00:00 2001 From: Miquel Date: Fri, 24 Feb 2017 20:51:06 +0100 -Subject: [PATCH 080/806] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT +Subject: [PATCH] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT Signed-off-by: Miquel Blauw diff --git a/target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch b/target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch index 3f913d9193..4d5c4a747a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch +++ b/target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch @@ -1,7 +1,7 @@ From 8ed265197d7a8f9c1a328d262bfe91050716ad76 Mon Sep 17 00:00:00 2001 From: Fe-Pi Date: Wed, 1 Mar 2017 04:42:43 -0700 -Subject: [PATCH 081/806] Add support for Fe-Pi audio sound card. (#1867) +Subject: [PATCH] Add support for Fe-Pi audio sound card. (#1867) Fe-Pi Audio Sound Card is based on NXP SGTL5000 codec. Mechanical specification of the board is the same the Raspberry Pi Zero. diff --git a/target/linux/brcm2708/patches-4.19/950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch b/target/linux/brcm2708/patches-4.19/950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch index f6bc9e2a2b..36784e9b41 100644 --- a/target/linux/brcm2708/patches-4.19/950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch +++ b/target/linux/brcm2708/patches-4.19/950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch @@ -1,7 +1,7 @@ From 846864bceccdafbed86c1b1766500861547b0da9 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 8 Mar 2017 20:04:13 +1100 -Subject: [PATCH 082/806] Add support for the AudioInjector.net Octo sound card +Subject: [PATCH] Add support for the AudioInjector.net Octo sound card AudioInjector Octo: sample rates, regulators, reset diff --git a/target/linux/brcm2708/patches-4.19/950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch index 23abeca917..a9605818c9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch +++ b/target/linux/brcm2708/patches-4.19/950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch @@ -1,7 +1,7 @@ From ae0077658c007643020b88e233150cf1eca6cea8 Mon Sep 17 00:00:00 2001 From: Peter Malkin Date: Mon, 27 Mar 2017 16:38:21 -0700 -Subject: [PATCH 083/806] Driver support for Google voiceHAT soundcard. +Subject: [PATCH] Driver support for Google voiceHAT soundcard. ASoC: googlevoicehat-codec: Use correct device when grabbing GPIO diff --git a/target/linux/brcm2708/patches-4.19/950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch b/target/linux/brcm2708/patches-4.19/950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch index 7a12e7e4d9..d742e6d988 100644 --- a/target/linux/brcm2708/patches-4.19/950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch +++ b/target/linux/brcm2708/patches-4.19/950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch @@ -1,7 +1,7 @@ From e37c55733587a312181a12a8f15b8f35497c828e Mon Sep 17 00:00:00 2001 From: allocom Date: Thu, 19 Apr 2018 12:12:26 +0530 -Subject: [PATCH 084/806] Driver and overlay for Allo Katana DAC +Subject: [PATCH] Driver and overlay for Allo Katana DAC Allo Katana DAC: Updated default values diff --git a/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch b/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch index 5eca1abe85..9c4462c1b4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch +++ b/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch @@ -1,7 +1,7 @@ From f77d4bf8ea9217d57be6982a6fdfa9f5f9c9b927 Mon Sep 17 00:00:00 2001 From: Daniel Matuschek Date: Wed, 15 Jan 2014 21:41:23 +0100 -Subject: [PATCH 085/806] ASoC: wm8804: MCLK configuration options, 32-bit +Subject: [PATCH] ASoC: wm8804: MCLK configuration options, 32-bit WM8804 can run with PLL frequencies of 256xfs and 128xfs for most sample rates. At 192kHz only 128xfs is supported. The existing driver selects diff --git a/target/linux/brcm2708/patches-4.19/950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch b/target/linux/brcm2708/patches-4.19/950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch index a609782901..ea2c91164f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch +++ b/target/linux/brcm2708/patches-4.19/950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch @@ -1,7 +1,7 @@ From 8cf85a58066800ed638b4e4fca6f704275e0f588 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Wed, 27 Jun 2018 15:59:12 +0100 -Subject: [PATCH 086/806] ASoC: Add generic RPI driver for simple soundcards. +Subject: [PATCH] ASoC: Add generic RPI driver for simple soundcards. The RPI simple sound card driver provides a generic ALSA SOC card driver supporting a variety of Pi HAT soundcards. The intention is to avoid diff --git a/target/linux/brcm2708/patches-4.19/950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch b/target/linux/brcm2708/patches-4.19/950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch index 6b0ffe038f..db8af937b7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch +++ b/target/linux/brcm2708/patches-4.19/950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch @@ -1,7 +1,7 @@ From 42dfc383b7d7100350c357b0381a2800b5bf3c27 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Sep 2018 17:00:36 +0100 -Subject: [PATCH 087/806] ASoC: Add Kconfig and Makefile for sound/soc/bcm +Subject: [PATCH] ASoC: Add Kconfig and Makefile for sound/soc/bcm Signed-off-by: popcornmix --- diff --git a/target/linux/brcm2708/patches-4.19/950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch b/target/linux/brcm2708/patches-4.19/950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch index 0a8d1de940..1ba0b774b4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch @@ -1,7 +1,7 @@ From 6af5a0adda5b782ad2e134b405ca168895c89b0c Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Sat, 21 Jul 2018 20:07:46 +0100 -Subject: [PATCH 088/806] ASoC: Create a generic Pi Hat WM8804 driver +Subject: [PATCH] ASoC: Create a generic Pi Hat WM8804 driver Reduce the amount of duplicated code by creating a generic driver for Pi Hat digi cards using the WM8804 codec. diff --git a/target/linux/brcm2708/patches-4.19/950-0089-rpi_display-add-backlight-driver-and-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0089-rpi_display-add-backlight-driver-and-overlay.patch index f790af77be..f3c06f4fff 100644 --- a/target/linux/brcm2708/patches-4.19/950-0089-rpi_display-add-backlight-driver-and-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0089-rpi_display-add-backlight-driver-and-overlay.patch @@ -1,7 +1,7 @@ From 5dcbf6d1aa6e33987082e9c8ac64e74f7b6bad58 Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 21 Oct 2015 14:55:21 +0100 -Subject: [PATCH 089/806] rpi_display: add backlight driver and overlay +Subject: [PATCH] rpi_display: add backlight driver and overlay Add a mailbox-driven backlight controller for the Raspberry Pi DSI touchscreen display. Requires updated GPU firmware to recognise the diff --git a/target/linux/brcm2708/patches-4.19/950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch b/target/linux/brcm2708/patches-4.19/950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch index af8d219530..6259fdc101 100644 --- a/target/linux/brcm2708/patches-4.19/950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch @@ -1,7 +1,7 @@ From 0f05af4c96c0272bb431ace33dd284a891e4fe41 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 23 Feb 2016 19:56:04 +0000 -Subject: [PATCH 090/806] bcm2835-virtgpio: Virtual GPIO driver +Subject: [PATCH] bcm2835-virtgpio: Virtual GPIO driver Add a virtual GPIO driver that uses the firmware mailbox interface to request that the VPU toggles LEDs. diff --git a/target/linux/brcm2708/patches-4.19/950-0092-OF-DT-Overlay-configfs-interface.patch b/target/linux/brcm2708/patches-4.19/950-0091-OF-DT-Overlay-configfs-interface.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0092-OF-DT-Overlay-configfs-interface.patch rename to target/linux/brcm2708/patches-4.19/950-0091-OF-DT-Overlay-configfs-interface.patch index 7226269614..e3caf880ea 100644 --- a/target/linux/brcm2708/patches-4.19/950-0092-OF-DT-Overlay-configfs-interface.patch +++ b/target/linux/brcm2708/patches-4.19/950-0091-OF-DT-Overlay-configfs-interface.patch @@ -1,7 +1,7 @@ From dc0f4681729e9bfe506ab8b15852363cb59bdaf5 Mon Sep 17 00:00:00 2001 From: Pantelis Antoniou Date: Wed, 3 Dec 2014 13:23:28 +0200 -Subject: [PATCH 092/806] OF: DT-Overlay configfs interface +Subject: [PATCH] OF: DT-Overlay configfs interface This is a port of Pantelis Antoniou's v3 port that makes use of the new upstreamed configfs support for binary attributes. diff --git a/target/linux/brcm2708/patches-4.19/950-0095-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch b/target/linux/brcm2708/patches-4.19/950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0095-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch rename to target/linux/brcm2708/patches-4.19/950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch index 597c90a182..756fd3a507 100644 --- a/target/linux/brcm2708/patches-4.19/950-0095-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch +++ b/target/linux/brcm2708/patches-4.19/950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch @@ -1,7 +1,7 @@ From b81157e1b8640fe332eb5edd3f62ef3de1c786a3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 17 Dec 2015 13:37:07 +0000 -Subject: [PATCH 095/806] hci_h5: Don't send conf_req when ACTIVE +Subject: [PATCH] hci_h5: Don't send conf_req when ACTIVE Without this patch, a modem and kernel can continuously bombard each other with conf_req and conf_rsp messages, in a demented game of tag. diff --git a/target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch b/target/linux/brcm2708/patches-4.19/950-0093-Add-arm64-configuration-and-device-tree-differences..patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch rename to target/linux/brcm2708/patches-4.19/950-0093-Add-arm64-configuration-and-device-tree-differences..patch index 695f9a5d25..4e49856630 100644 --- a/target/linux/brcm2708/patches-4.19/950-0097-Add-arm64-configuration-and-device-tree-differences..patch +++ b/target/linux/brcm2708/patches-4.19/950-0093-Add-arm64-configuration-and-device-tree-differences..patch @@ -1,7 +1,7 @@ From 9731e002f651c0b386137105c8d91d198b73b721 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Wed, 24 Aug 2016 03:35:56 -0700 -Subject: [PATCH 097/806] Add arm64 configuration and device tree differences. +Subject: [PATCH] Add arm64 configuration and device tree differences. Disable MMC_BCM2835_SDHOST and MMC_BCM2835 since these drivers are crashing at the moment. diff --git a/target/linux/brcm2708/patches-4.19/950-0098-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch b/target/linux/brcm2708/patches-4.19/950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0098-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch rename to target/linux/brcm2708/patches-4.19/950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch index f370f694e9..85b8edb15e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0098-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch +++ b/target/linux/brcm2708/patches-4.19/950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch @@ -1,7 +1,7 @@ From 1ab2bc7fb6de19bcf4da83f4f0f384d93db48711 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 14 Jan 2017 21:33:51 -0800 -Subject: [PATCH 098/806] ARM64/DWC_OTG: Port dwc_otg driver to ARM64 +Subject: [PATCH] ARM64/DWC_OTG: Port dwc_otg driver to ARM64 In ARM64, the FIQ mechanism used by this driver is not current implemented. As a workaround, reqular IRQ is used instead diff --git a/target/linux/brcm2708/patches-4.19/950-0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch b/target/linux/brcm2708/patches-4.19/950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch rename to target/linux/brcm2708/patches-4.19/950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch index 60d80e99e1..235a72fe25 100644 --- a/target/linux/brcm2708/patches-4.19/950-0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch @@ -1,7 +1,7 @@ From 3a9f3c695a95d3c34a360e9a95bccce37806c952 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 14 Jan 2017 21:43:57 -0800 -Subject: [PATCH 099/806] ARM64: Round-Robin dispatch IRQs between CPUs. +Subject: [PATCH] ARM64: Round-Robin dispatch IRQs between CPUs. IRQ-CPU mapping is round robined on ARM64 to increase concurrency and allow multiple interrupts to be serviced diff --git a/target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/target/linux/brcm2708/patches-4.19/950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch rename to target/linux/brcm2708/patches-4.19/950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch index 912ab3fc09..53506d1475 100644 --- a/target/linux/brcm2708/patches-4.19/950-0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch +++ b/target/linux/brcm2708/patches-4.19/950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch @@ -1,7 +1,7 @@ From 61f4a666499f781e6441dab84993a635c43ddb58 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Sat, 11 Feb 2017 01:18:31 -0800 -Subject: [PATCH 100/806] ARM64: Force hardware emulation of deprecated +Subject: [PATCH] ARM64: Force hardware emulation of deprecated instructions. --- diff --git a/target/linux/brcm2708/patches-4.19/950-0101-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch b/target/linux/brcm2708/patches-4.19/950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0101-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch rename to target/linux/brcm2708/patches-4.19/950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch index c69287d051..bd7a3a04e1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0101-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch +++ b/target/linux/brcm2708/patches-4.19/950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch @@ -1,7 +1,7 @@ From 8333b8d6ed55d08e410afb7c9036f8a8e9186e69 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Feb 2017 17:57:08 -0800 -Subject: [PATCH 101/806] build/arm64: Add rules for .dtbo files for dts +Subject: [PATCH] build/arm64: Add rules for .dtbo files for dts overlays We now create overlays as .dtbo files. diff --git a/target/linux/brcm2708/patches-4.19/950-0102-cache-export-clean-and-invalidate.patch b/target/linux/brcm2708/patches-4.19/950-0098-cache-export-clean-and-invalidate.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0102-cache-export-clean-and-invalidate.patch rename to target/linux/brcm2708/patches-4.19/950-0098-cache-export-clean-and-invalidate.patch index 1b368ce6a2..dad88e1728 100644 --- a/target/linux/brcm2708/patches-4.19/950-0102-cache-export-clean-and-invalidate.patch +++ b/target/linux/brcm2708/patches-4.19/950-0098-cache-export-clean-and-invalidate.patch @@ -1,7 +1,7 @@ From a7ca69081e7d0e1c5d84352c219b454a7977a2a4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 25 Aug 2017 19:18:13 +0100 -Subject: [PATCH 102/806] cache: export clean and invalidate +Subject: [PATCH] cache: export clean and invalidate --- arch/arm/mm/cache-v6.S | 4 ++-- diff --git a/target/linux/brcm2708/patches-4.19/950-0103-AXI-performance-monitor-driver-2222.patch b/target/linux/brcm2708/patches-4.19/950-0099-AXI-performance-monitor-driver-2222.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0103-AXI-performance-monitor-driver-2222.patch rename to target/linux/brcm2708/patches-4.19/950-0099-AXI-performance-monitor-driver-2222.patch index e39279679f..02de46bdc2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0103-AXI-performance-monitor-driver-2222.patch +++ b/target/linux/brcm2708/patches-4.19/950-0099-AXI-performance-monitor-driver-2222.patch @@ -1,7 +1,7 @@ From b683c668fef086a8c723d55e88364405047d2196 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 14 Nov 2017 15:13:15 +0000 -Subject: [PATCH 103/806] AXI performance monitor driver (#2222) +Subject: [PATCH] AXI performance monitor driver (#2222) Uses the debugfs I/F to provide access to the AXI bus performance monitors. diff --git a/target/linux/brcm2708/patches-4.19/950-0104-mcp2515-Use-DT-supplied-interrupt-flags.patch b/target/linux/brcm2708/patches-4.19/950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0104-mcp2515-Use-DT-supplied-interrupt-flags.patch rename to target/linux/brcm2708/patches-4.19/950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch index 5a7dc4f93d..13f97962f9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0104-mcp2515-Use-DT-supplied-interrupt-flags.patch +++ b/target/linux/brcm2708/patches-4.19/950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch @@ -1,7 +1,7 @@ From 612a3f0adcf98854dcbe8228551b941b76c6af2c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 Nov 2017 11:03:22 +0000 -Subject: [PATCH 104/806] mcp2515: Use DT-supplied interrupt flags +Subject: [PATCH] mcp2515: Use DT-supplied interrupt flags The MCP2515 datasheet clearly describes a level-triggered interrupt pin. Therefore the receiving interrupt controller must also be diff --git a/target/linux/brcm2708/patches-4.19/950-0105-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch b/target/linux/brcm2708/patches-4.19/950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0105-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch rename to target/linux/brcm2708/patches-4.19/950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch index fce6b864ec..1709d4d959 100644 --- a/target/linux/brcm2708/patches-4.19/950-0105-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch +++ b/target/linux/brcm2708/patches-4.19/950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch @@ -1,7 +1,7 @@ From 67acc12c996ef55038206de9e4220e69bf8dd517 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 16 Nov 2017 15:56:17 +0000 -Subject: [PATCH 105/806] Tidy up of the ft5406 driver to use DT (#2189) +Subject: [PATCH] Tidy up of the ft5406 driver to use DT (#2189) Driver was using a fixed resolution, this commit adds touchscreen size, and coordinate flip and swap diff --git a/target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch rename to target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch index 9650b6040c..f08cbebc47 100644 --- a/target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch @@ -1,7 +1,7 @@ From 7ae6ba03434344f90403936ae79bfd7ba005b49c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 27 Nov 2017 17:14:54 +0000 -Subject: [PATCH 106/806] cgroup: Disable cgroup "memory" by default +Subject: [PATCH] cgroup: Disable cgroup "memory" by default Some Raspberry Pis have limited RAM and most users won't use the cgroup memory support so it is disabled by default. Enable with: diff --git a/target/linux/brcm2708/patches-4.19/950-0107-ARM-bcm2835-Set-Serial-number-and-Revision.patch b/target/linux/brcm2708/patches-4.19/950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0107-ARM-bcm2835-Set-Serial-number-and-Revision.patch rename to target/linux/brcm2708/patches-4.19/950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch index 2ea61494cc..b0e4152fc4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0107-ARM-bcm2835-Set-Serial-number-and-Revision.patch +++ b/target/linux/brcm2708/patches-4.19/950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch @@ -1,7 +1,7 @@ From 6eb5a426229447a1045507fb63afdb11ddc5eda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Wed, 3 Jun 2015 12:26:13 +0200 -Subject: [PATCH 107/806] ARM: bcm2835: Set Serial number and Revision +Subject: [PATCH] ARM: bcm2835: Set Serial number and Revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0108-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0108-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch rename to target/linux/brcm2708/patches-4.19/950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch index 0ec0751a02..545be8004e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0108-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch +++ b/target/linux/brcm2708/patches-4.19/950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch @@ -1,7 +1,7 @@ From ffa437377a6121234cd85d3bd2a8d8c43f0bedd5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 11 Dec 2017 09:18:32 +0000 -Subject: [PATCH 108/806] ARM: Activate FIQs to avoid __irq_startup warnings +Subject: [PATCH] ARM: Activate FIQs to avoid __irq_startup warnings There is a new test in __irq_startup that the IRQ is activated, which hasn't been the case for FIQs since they bypass some of the usual setup. diff --git a/target/linux/brcm2708/patches-4.19/950-0109-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch b/target/linux/brcm2708/patches-4.19/950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0109-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch rename to target/linux/brcm2708/patches-4.19/950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch index 5557b9d85d..3e60981b89 100644 --- a/target/linux/brcm2708/patches-4.19/950-0109-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch +++ b/target/linux/brcm2708/patches-4.19/950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch @@ -1,7 +1,7 @@ From f12549c9f3aed64fae5fe2ebbc2e8568a78829a2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 22 Jan 2018 17:26:38 +0000 -Subject: [PATCH 109/806] serial: 8250: bcm2835aux - suppress EPROBE_DEFER +Subject: [PATCH] serial: 8250: bcm2835aux - suppress EPROBE_DEFER Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch b/target/linux/brcm2708/patches-4.19/950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch rename to target/linux/brcm2708/patches-4.19/950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch index 945ba536eb..8f574a3226 100644 --- a/target/linux/brcm2708/patches-4.19/950-0110-raspberrypi-firmware-Export-the-general-transaction-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch @@ -1,7 +1,7 @@ From 79d09be78f74e3c81ff25f1f78fb17a2f112e3cd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 09:16:19 +0100 -Subject: [PATCH 110/806] raspberrypi-firmware: Export the general transaction +Subject: [PATCH] raspberrypi-firmware: Export the general transaction function. The vc4-firmware-kms module is going to be doing the MBOX FB call. diff --git a/target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch b/target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch rename to target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch index 14d4ac9803..b4db1d7c60 100644 --- a/target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch +++ b/target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch @@ -1,7 +1,7 @@ From 3ddc9f2dc424c085ca646e92b40d156bb5318295 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 14 Sep 2016 08:39:33 +0100 -Subject: [PATCH 111/806] drm/vc4: Add a mode for using the closed firmware for +Subject: [PATCH] drm/vc4: Add a mode for using the closed firmware for display. Signed-off-by: Eric Anholt diff --git a/target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch index 70b8aa22d7..a61a137cb6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch @@ -1,7 +1,7 @@ From 15920eb72774682674a1e318146c1c009fd69e91 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:09:18 -0800 -Subject: [PATCH 112/806] drm/vc4: Name the primary and cursor planes in fkms. +Subject: [PATCH] drm/vc4: Name the primary and cursor planes in fkms. This makes debugging nicer, compared to trying to remember what the IDs are. diff --git a/target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch index 32e966c29d..be69fe72c7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch @@ -1,7 +1,7 @@ From 90094103eaa17e147e30d910eb3ebdad663271be Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 1 Feb 2017 17:10:09 -0800 -Subject: [PATCH 113/806] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of +Subject: [PATCH] drm/vc4: Add DRM_DEBUG_ATOMIC for the insides of fkms. Trying to debug weston on fkms involved figuring out what calls I was diff --git a/target/linux/brcm2708/patches-4.19/950-0114-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch b/target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0114-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch rename to target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch index 1074decad3..c916ebfa96 100644 --- a/target/linux/brcm2708/patches-4.19/950-0114-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch +++ b/target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch @@ -1,7 +1,7 @@ From 562e0c66203a4f679c6adf6c0df91f7233df53b1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 Feb 2017 09:42:18 -0800 -Subject: [PATCH 114/806] drm/vc4: Fix sending of page flip completion events +Subject: [PATCH] drm/vc4: Fix sending of page flip completion events in FKMS mode. In the rewrite of vc4_crtc.c for fkms, I dropped the part of the diff --git a/target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch b/target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch rename to target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch index 82bcbb396f..2a52b0f98a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch @@ -1,7 +1,7 @@ From c95479213d28d9866e617a54b0435c974874ce9d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 6 Jul 2017 11:45:48 -0700 -Subject: [PATCH 115/806] drm/vc4: Add support for setting DPMS in firmwarekms. +Subject: [PATCH] drm/vc4: Add support for setting DPMS in firmwarekms. This ensures that the screen goes blank during DPMS (screensaver), including the cursor. Planes don't necessarily get disabled during diff --git a/target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch b/target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch rename to target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch index af931a64d5..94a180f061 100644 --- a/target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch @@ -1,7 +1,7 @@ From 94db315153c83753aded66cf3ea1de2b95d37628 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Jun 2017 14:39:49 -0700 -Subject: [PATCH 116/806] drm/vc4: Add FB modifier support to firmwarekms. +Subject: [PATCH] drm/vc4: Add FB modifier support to firmwarekms. Signed-off-by: Eric Anholt (cherry picked from commit 11752d73488e08aaeb65fe8289a9c016acde26c2) diff --git a/target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch b/target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch rename to target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch index 9bc4a24416..fbccc12e8f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch +++ b/target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch @@ -1,7 +1,7 @@ From 10d8194f8415a69d3ea049450e86e14572591a71 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 30 Jan 2018 14:21:02 -0800 -Subject: [PATCH 117/806] drm/vc4: Add missing enable/disable vblank handlers +Subject: [PATCH] drm/vc4: Add missing enable/disable vblank handlers in fkms. Fixes hang at boot in 4.14. diff --git a/target/linux/brcm2708/patches-4.19/950-0118-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch b/target/linux/brcm2708/patches-4.19/950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0118-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch rename to target/linux/brcm2708/patches-4.19/950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch index 8594c6c9c7..764edb66ff 100644 --- a/target/linux/brcm2708/patches-4.19/950-0118-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch @@ -1,7 +1,7 @@ From 5ef3d566615961b75f85868b028193bb54727140 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Apr 2017 21:43:46 +0100 -Subject: [PATCH 118/806] vc4_fkms: Apply firmware overscan offset to hardware +Subject: [PATCH] vc4_fkms: Apply firmware overscan offset to hardware cursor --- diff --git a/target/linux/brcm2708/patches-4.19/950-0119-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch b/target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0119-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch rename to target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch index fcfbccc4ce..43b200db16 100644 --- a/target/linux/brcm2708/patches-4.19/950-0119-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch +++ b/target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch @@ -1,7 +1,7 @@ From 36e1081459121883f9881a579c809c7b87895146 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:01:02 +0000 -Subject: [PATCH 119/806] drm/vc4: Fix warning about vblank interrupts before +Subject: [PATCH] drm/vc4: Fix warning about vblank interrupts before DRM core is ready. The SMICS interrupt fires continuously, but since it's 1/100 the rate diff --git a/target/linux/brcm2708/patches-4.19/950-0120-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch b/target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0120-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch rename to target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch index 6810169603..0b9398fda7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0120-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch +++ b/target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch @@ -1,7 +1,7 @@ From a87af130d6feadfea3146a78c58408a8be9a0635 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:02:30 +0000 -Subject: [PATCH 120/806] drm/vc4: Skip SET_CURSOR_INFO when the cursor +Subject: [PATCH] drm/vc4: Skip SET_CURSOR_INFO when the cursor contents didn't change. Signed-off-by: Eric Anholt diff --git a/target/linux/brcm2708/patches-4.19/950-0121-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch b/target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0121-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch rename to target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch index c6e5abde8e..cf3b876537 100644 --- a/target/linux/brcm2708/patches-4.19/950-0121-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch @@ -1,7 +1,7 @@ From 9326eeda8a0ec622c94b063fe2aaee642a932cfa Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:22:03 +0000 -Subject: [PATCH 121/806] drm/vc4: Remove duplicate primary/cursor fields from +Subject: [PATCH] drm/vc4: Remove duplicate primary/cursor fields from FKMS driver. The CRTC has those fields and we can just use them. diff --git a/target/linux/brcm2708/patches-4.19/950-0122-vc4_firmware_kms-fix-build.patch b/target/linux/brcm2708/patches-4.19/950-0118-vc4_firmware_kms-fix-build.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0122-vc4_firmware_kms-fix-build.patch rename to target/linux/brcm2708/patches-4.19/950-0118-vc4_firmware_kms-fix-build.patch index 43dc0c2d35..65fc0978a8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0122-vc4_firmware_kms-fix-build.patch +++ b/target/linux/brcm2708/patches-4.19/950-0118-vc4_firmware_kms-fix-build.patch @@ -1,7 +1,7 @@ From 8b9843afd665a52df07cc804d6fcb624b22cd85e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 17 Jun 2018 13:22:07 +0100 -Subject: [PATCH 122/806] vc4_firmware_kms: fix build +Subject: [PATCH] vc4_firmware_kms: fix build --- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 6 ++++-- diff --git a/target/linux/brcm2708/patches-4.19/950-0123-hack-cache-Fix-linker-error.patch b/target/linux/brcm2708/patches-4.19/950-0119-hack-cache-Fix-linker-error.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0123-hack-cache-Fix-linker-error.patch rename to target/linux/brcm2708/patches-4.19/950-0119-hack-cache-Fix-linker-error.patch index bd9c838ef1..ed4e65f11c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0123-hack-cache-Fix-linker-error.patch +++ b/target/linux/brcm2708/patches-4.19/950-0119-hack-cache-Fix-linker-error.patch @@ -1,7 +1,7 @@ From 7e26ec509af7279406042ecb776f173c487ffddc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 20 Feb 2018 20:53:46 +0000 -Subject: [PATCH 123/806] hack: cache: Fix linker error +Subject: [PATCH] hack: cache: Fix linker error --- arch/arm/mm/cache-v7.S | 2 ++ diff --git a/target/linux/brcm2708/patches-4.19/950-0124-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch b/target/linux/brcm2708/patches-4.19/950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0124-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch rename to target/linux/brcm2708/patches-4.19/950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch index 873f0d9bda..6103e82d88 100644 --- a/target/linux/brcm2708/patches-4.19/950-0124-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch @@ -1,7 +1,7 @@ From b7e22249959b8111e3d8fe7a78afa6a7b0420350 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 20 Feb 2018 10:07:27 +0000 -Subject: [PATCH 124/806] i2c-gpio: Also set bus numbers from reg property +Subject: [PATCH] i2c-gpio: Also set bus numbers from reg property I2C busses can be assigned specific bus numbers using aliases in Device Tree - string properties where the name is the alias and the diff --git a/target/linux/brcm2708/patches-4.19/950-0125-sound-bcm-Fix-memset-dereference-warning.patch b/target/linux/brcm2708/patches-4.19/950-0121-sound-bcm-Fix-memset-dereference-warning.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0125-sound-bcm-Fix-memset-dereference-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0121-sound-bcm-Fix-memset-dereference-warning.patch index d803335300..9c5e9138a5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0125-sound-bcm-Fix-memset-dereference-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0121-sound-bcm-Fix-memset-dereference-warning.patch @@ -1,7 +1,7 @@ From b6258886ad6bd69b3d51b9c79ea6ada0e01b2db9 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sun, 4 Mar 2018 17:20:25 -0700 -Subject: [PATCH 125/806] sound: bcm: Fix memset dereference warning +Subject: [PATCH] sound: bcm: Fix memset dereference warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0126-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch b/target/linux/brcm2708/patches-4.19/950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch similarity index 88% rename from target/linux/brcm2708/patches-4.19/950-0126-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch rename to target/linux/brcm2708/patches-4.19/950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch index 9a9df8276d..1b734b56ac 100644 --- a/target/linux/brcm2708/patches-4.19/950-0126-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch @@ -1,7 +1,7 @@ From 8e3577ac67382beda74437cb6f6bff5dbdb83fc9 Mon Sep 17 00:00:00 2001 From: hdoverobinson Date: Tue, 13 Mar 2018 06:58:39 -0400 -Subject: [PATCH 126/806] added capture_clear option to pps-gpio via dtoverlay +Subject: [PATCH] added capture_clear option to pps-gpio via dtoverlay (#2433) --- diff --git a/target/linux/brcm2708/patches-4.19/950-0127-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/brcm2708/patches-4.19/950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0127-lan78xx-Read-initial-EEE-status-from-DT.patch rename to target/linux/brcm2708/patches-4.19/950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch index 2b9670e2c6..a1a9fa6c88 100644 --- a/target/linux/brcm2708/patches-4.19/950-0127-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/brcm2708/patches-4.19/950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch @@ -1,7 +1,7 @@ From 26c3806ff17c6a7ed61ba127af36271390e86c89 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Mar 2018 12:01:00 +0000 -Subject: [PATCH 127/806] lan78xx: Read initial EEE status from DT +Subject: [PATCH] lan78xx: Read initial EEE status from DT Add two new DT properties: * microchip,eee-enabled - a boolean to enable EEE diff --git a/target/linux/brcm2708/patches-4.19/950-0128-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch b/target/linux/brcm2708/patches-4.19/950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0128-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch rename to target/linux/brcm2708/patches-4.19/950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch index 360657fa1d..4851e066ac 100644 --- a/target/linux/brcm2708/patches-4.19/950-0128-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch +++ b/target/linux/brcm2708/patches-4.19/950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch @@ -1,7 +1,7 @@ From 119f98cc4c860085809584b7504ca61bac70586e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 14 Jul 2014 22:02:09 +0100 -Subject: [PATCH 128/806] hid: Reduce default mouse polling interval to 60Hz +Subject: [PATCH] hid: Reduce default mouse polling interval to 60Hz Reduces overhead when using X --- diff --git a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch rename to target/linux/brcm2708/patches-4.19/950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index c28ce4081f..17867c330a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -1,7 +1,7 @@ From 1929780cf2cc997f990085bd878112b28f4175c9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 24 Apr 2018 14:42:27 +0100 -Subject: [PATCH 129/806] gpiolib: Don't prevent IRQ usage of output GPIOs +Subject: [PATCH] gpiolib: Don't prevent IRQ usage of output GPIOs Upstream Linux deems using output GPIOs to generate IRQs as a bogus use case, even though the BCM2835 GPIO controller is capable of doing diff --git a/target/linux/brcm2708/patches-4.19/950-0130-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch b/target/linux/brcm2708/patches-4.19/950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0130-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch rename to target/linux/brcm2708/patches-4.19/950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch index f38cdce1b3..60e7294c05 100644 --- a/target/linux/brcm2708/patches-4.19/950-0130-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch +++ b/target/linux/brcm2708/patches-4.19/950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch @@ -1,7 +1,7 @@ From 3e060982d93902bcca8503df4e33d6cd1e41e21b Mon Sep 17 00:00:00 2001 From: Nick Bulleid Date: Thu, 10 May 2018 21:57:02 +0100 -Subject: [PATCH 130/806] Add ability to export gpio used by gpio-poweroff +Subject: [PATCH] Add ability to export gpio used by gpio-poweroff Signed-off-by: Nick Bulleid diff --git a/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/brcm2708/patches-4.19/950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch rename to target/linux/brcm2708/patches-4.19/950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch index f74f75e769..8e06168f06 100644 --- a/target/linux/brcm2708/patches-4.19/950-0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch +++ b/target/linux/brcm2708/patches-4.19/950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch @@ -1,7 +1,7 @@ From 68aaa2f653c83f8fda6032153566b4f895dff524 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 12 May 2018 21:35:43 +0100 -Subject: [PATCH 131/806] firmware/raspberrypi: Notify firmware of a reboot +Subject: [PATCH] firmware/raspberrypi: Notify firmware of a reboot Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT over the mailbox interface on reception. diff --git a/target/linux/brcm2708/patches-4.19/950-0132-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch b/target/linux/brcm2708/patches-4.19/950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0132-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch rename to target/linux/brcm2708/patches-4.19/950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch index 16145fed34..281f273e8d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0132-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch +++ b/target/linux/brcm2708/patches-4.19/950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch @@ -1,7 +1,7 @@ From 3166f055a568c4fe127b70b81a878ab59070a6f5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 11:21:04 +0100 -Subject: [PATCH 132/806] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time +Subject: [PATCH] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time ad83c7cb2f37 ("irqchip/irq-bcm2836: Add support for DT interrupt polarity") changed the way that the BCM2836/7 local interrupts are mapped; instead diff --git a/target/linux/brcm2708/patches-4.19/950-0133-of-configfs-Use-of_overlay_fdt_apply-API-call.patch b/target/linux/brcm2708/patches-4.19/950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0133-of-configfs-Use-of_overlay_fdt_apply-API-call.patch rename to target/linux/brcm2708/patches-4.19/950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch index 7dbf51cb0f..d3e91be8db 100644 --- a/target/linux/brcm2708/patches-4.19/950-0133-of-configfs-Use-of_overlay_fdt_apply-API-call.patch +++ b/target/linux/brcm2708/patches-4.19/950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch @@ -1,7 +1,7 @@ From fe78e259c356ef883528c5ec3527c714a5966c0c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Jun 2018 15:07:26 +0100 -Subject: [PATCH 133/806] of: configfs: Use of_overlay_fdt_apply API call +Subject: [PATCH] of: configfs: Use of_overlay_fdt_apply API call The published API to the dynamic overlay application mechanism now takes a Flattened Device Tree blob as input so that it can manage the diff --git a/target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.19/950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch rename to target/linux/brcm2708/patches-4.19/950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index b33c4f4374..1e3944b859 100644 --- a/target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -1,7 +1,7 @@ From 59555269e09f06ae0ded9007c4aa02fa55ce71ca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Jun 2018 15:21:10 +0100 -Subject: [PATCH 134/806] net: lan78xx: Disable TCP Segmentation Offload (TSO) +Subject: [PATCH] net: lan78xx: Disable TCP Segmentation Offload (TSO) TSO seems to be having issues when packets are dropped and the remote end uses Selective Acknowledge (SACK) to denote that diff --git a/target/linux/brcm2708/patches-4.19/950-0136-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/brcm2708/patches-4.19/950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0136-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch rename to target/linux/brcm2708/patches-4.19/950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 0d9f8b6569..a1dfb00af7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0136-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/brcm2708/patches-4.19/950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -1,7 +1,7 @@ From 75ec78040e02200dfc2ad4e35c289086334fbee2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Apr 2018 14:46:11 +0100 -Subject: [PATCH 136/806] lan78xx: Move enabling of EEE into PHY init code +Subject: [PATCH] lan78xx: Move enabling of EEE into PHY init code Enable EEE mode as soon as possible after connecting to the PHY, and before phy_start. This avoids a second link negotiation, which speeds diff --git a/target/linux/brcm2708/patches-4.19/950-0137-staging-vc04_services-Derive-g_cache_line_size.patch b/target/linux/brcm2708/patches-4.19/950-0132-staging-vc04_services-Derive-g_cache_line_size.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0137-staging-vc04_services-Derive-g_cache_line_size.patch rename to target/linux/brcm2708/patches-4.19/950-0132-staging-vc04_services-Derive-g_cache_line_size.patch index c611322b8a..f7bc93fdb8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0137-staging-vc04_services-Derive-g_cache_line_size.patch +++ b/target/linux/brcm2708/patches-4.19/950-0132-staging-vc04_services-Derive-g_cache_line_size.patch @@ -1,7 +1,7 @@ From 6bc13b1a867a5fd769f2be713ce9c9d863534bff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 28 Aug 2018 10:40:40 +0100 -Subject: [PATCH 137/806] staging/vc04_services: Derive g_cache_line_size +Subject: [PATCH] staging/vc04_services: Derive g_cache_line_size The ARM coprocessor registers include dcache line size, but there is no function to expose this value. Rather than create a new one, use the diff --git a/target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch b/target/linux/brcm2708/patches-4.19/950-0133-Add-rpi-poe-fan-driver.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0133-Add-rpi-poe-fan-driver.patch index c007b25389..b393306408 100644 --- a/target/linux/brcm2708/patches-4.19/950-0138-Add-rpi-poe-fan-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0133-Add-rpi-poe-fan-driver.patch @@ -1,7 +1,7 @@ From e6528f67b96f52ea77d95a59e75d8270bb53aade Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 9 Jul 2018 12:54:25 +0100 -Subject: [PATCH 138/806] Add rpi-poe-fan driver +Subject: [PATCH] Add rpi-poe-fan driver Signed-off-by: Serge Schneider diff --git a/target/linux/brcm2708/patches-4.19/950-0139-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch b/target/linux/brcm2708/patches-4.19/950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0139-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch rename to target/linux/brcm2708/patches-4.19/950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch index 7125b19e61..d67c9381ed 100644 --- a/target/linux/brcm2708/patches-4.19/950-0139-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch @@ -1,7 +1,7 @@ From a54bad2a438d7c67b1e012cf31fd2a112bc90e2a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 17 Sep 2018 17:31:18 +0100 -Subject: [PATCH 139/806] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 +Subject: [PATCH] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT --- diff --git a/target/linux/brcm2708/patches-4.19/950-0140-bcm2835-interpolate-audio-delay.patch b/target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0140-bcm2835-interpolate-audio-delay.patch rename to target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch index 5a54adda12..55cd26b25b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0140-bcm2835-interpolate-audio-delay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch @@ -1,7 +1,7 @@ From 652b0ec2ab2d2e2af7bb4f7d62a4020a20720677 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 13 Jan 2016 19:44:47 +0100 -Subject: [PATCH 140/806] bcm2835: interpolate audio delay +Subject: [PATCH] bcm2835: interpolate audio delay It appears the GPU only sends us a message all 10ms to update the playback progress. Other than this, the playback position diff --git a/target/linux/brcm2708/patches-4.19/950-0141-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch b/target/linux/brcm2708/patches-4.19/950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0141-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch rename to target/linux/brcm2708/patches-4.19/950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch index dd128a1618..e6836b5066 100644 --- a/target/linux/brcm2708/patches-4.19/950-0141-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch +++ b/target/linux/brcm2708/patches-4.19/950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch @@ -1,7 +1,7 @@ From 75fdebcf15e8023b9640d9fc2e3ed227e5563968 Mon Sep 17 00:00:00 2001 From: detule Date: Tue, 2 Oct 2018 04:10:08 -0400 -Subject: [PATCH 141/806] vchiq_2835_arm: Implement a DMA pool for small bulk +Subject: [PATCH] vchiq_2835_arm: Implement a DMA pool for small bulk transfers (#2699) During a bulk transfer we request a DMA allocation to hold the diff --git a/target/linux/brcm2708/patches-4.19/950-0142-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch b/target/linux/brcm2708/patches-4.19/950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0142-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch index cc2fa3b792..3fcd3d9344 100644 --- a/target/linux/brcm2708/patches-4.19/950-0142-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch @@ -1,7 +1,7 @@ From b44b364b2762579776addb7371f71b77fce62eb8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 8 Oct 2018 12:20:36 +0100 -Subject: [PATCH 142/806] BCM2708_DT: Use upstreamed GPIO expander driver +Subject: [PATCH] BCM2708_DT: Use upstreamed GPIO expander driver The upstreamed driver for the GPIO expander has a different compatible string. Change the relevant Device Tree files to match. diff --git a/target/linux/brcm2708/patches-4.19/950-0143-overlays-Fix-a-few-dtc-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0138-overlays-Fix-a-few-dtc-warnings.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0143-overlays-Fix-a-few-dtc-warnings.patch rename to target/linux/brcm2708/patches-4.19/950-0138-overlays-Fix-a-few-dtc-warnings.patch index 5ed3a8fe36..b4c4f5aab4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0143-overlays-Fix-a-few-dtc-warnings.patch +++ b/target/linux/brcm2708/patches-4.19/950-0138-overlays-Fix-a-few-dtc-warnings.patch @@ -1,7 +1,7 @@ From 13abcbfdc76f1a40c36367fe28b76e29742b2d05 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 8 Oct 2018 17:16:28 +0100 -Subject: [PATCH 143/806] overlays: Fix a few dtc warnings +Subject: [PATCH] overlays: Fix a few dtc warnings Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0144-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch b/target/linux/brcm2708/patches-4.19/950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0144-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch rename to target/linux/brcm2708/patches-4.19/950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch index e4cead3b14..40a6652527 100644 --- a/target/linux/brcm2708/patches-4.19/950-0144-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch +++ b/target/linux/brcm2708/patches-4.19/950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch @@ -1,7 +1,7 @@ From 44b80e04ec619a2e28ff150c3e09123399002d6d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Oct 2018 16:32:52 +0100 -Subject: [PATCH 144/806] bcm2708-rpi: Disable txp interrupt unless using +Subject: [PATCH] bcm2708-rpi: Disable txp interrupt unless using vc4-kms-v3d overlay Signed-off-by: popcornmix diff --git a/target/linux/brcm2708/patches-4.19/950-0146-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch b/target/linux/brcm2708/patches-4.19/950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0146-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch rename to target/linux/brcm2708/patches-4.19/950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch index 33ef6af085..ea9846d099 100644 --- a/target/linux/brcm2708/patches-4.19/950-0146-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch @@ -1,7 +1,7 @@ From e7056be388c7bbc6f0211f587643ff795ce30814 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 6 Oct 2018 16:46:18 +0200 -Subject: [PATCH 146/806] hwmon: raspberrypi: Prevent voltage low warnings from +Subject: [PATCH] hwmon: raspberrypi: Prevent voltage low warnings from filling log Although the correct fix for low voltage warnings is to diff --git a/target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch b/target/linux/brcm2708/patches-4.19/950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch rename to target/linux/brcm2708/patches-4.19/950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch index 1a74f9c1fa..24803abb29 100644 --- a/target/linux/brcm2708/patches-4.19/950-0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch @@ -1,7 +1,7 @@ From 4c26452ecee989e1f43a80654a0d5cd8ce64e49e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 13:31:21 +0200 -Subject: [PATCH 147/806] firmware: raspberrypi: Add backward compatible +Subject: [PATCH] firmware: raspberrypi: Add backward compatible get_throttled Avoid a hard userspace ABI change by adding a compatible get_throttled diff --git a/target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch b/target/linux/brcm2708/patches-4.19/950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch rename to target/linux/brcm2708/patches-4.19/950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch index cfbc59e619..6f22881731 100644 --- a/target/linux/brcm2708/patches-4.19/950-0149-sc16is7xx-Don-t-spin-if-no-data-received.patch +++ b/target/linux/brcm2708/patches-4.19/950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch @@ -1,7 +1,7 @@ From 3f8c7542e12f23f6be2cd7206fbf808409db2848 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 6 Nov 2018 12:57:48 +0000 -Subject: [PATCH 149/806] sc16is7xx: Don't spin if no data received +Subject: [PATCH] sc16is7xx: Don't spin if no data received See: https://github.com/raspberrypi/linux/issues/2676 diff --git a/target/linux/brcm2708/patches-4.19/950-0155-Add-device-tree-overlay-for-HD44780.patch b/target/linux/brcm2708/patches-4.19/950-0143-Add-device-tree-overlay-for-HD44780.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0155-Add-device-tree-overlay-for-HD44780.patch rename to target/linux/brcm2708/patches-4.19/950-0143-Add-device-tree-overlay-for-HD44780.patch index 5d5fd92825..f48b8eab99 100644 --- a/target/linux/brcm2708/patches-4.19/950-0155-Add-device-tree-overlay-for-HD44780.patch +++ b/target/linux/brcm2708/patches-4.19/950-0143-Add-device-tree-overlay-for-HD44780.patch @@ -1,7 +1,7 @@ From b5ec75dab38af2429278df48121642cb5605e318 Mon Sep 17 00:00:00 2001 From: Jasper Boomer Date: Sun, 24 Jun 2018 12:20:27 -0400 -Subject: [PATCH 155/806] Add device tree overlay for HD44780 +Subject: [PATCH] Add device tree overlay for HD44780 --- arch/arm/boot/dts/overlays/Makefile | 1 + diff --git a/target/linux/brcm2708/patches-4.19/950-0157-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch b/target/linux/brcm2708/patches-4.19/950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0157-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch rename to target/linux/brcm2708/patches-4.19/950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch index 8d8742e251..ef8e1eaaa8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0157-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch @@ -1,7 +1,7 @@ From 20dbf906033167e7c4296eee07437d52627d8ccf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Jul 2018 21:11:32 +0100 -Subject: [PATCH 157/806] overlays: Add addr parameter to i2c-rtc (& -gpio) +Subject: [PATCH] overlays: Add addr parameter to i2c-rtc (& -gpio) See: https://github.com/raspberrypi/linux/issues/2611 diff --git a/target/linux/brcm2708/patches-4.19/950-0158-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch b/target/linux/brcm2708/patches-4.19/950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0158-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch rename to target/linux/brcm2708/patches-4.19/950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch index 7875a374b3..7e5286eaac 100644 --- a/target/linux/brcm2708/patches-4.19/950-0158-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch @@ -1,7 +1,7 @@ From 8a9c6862c6010b4500cb08c62ac4aea6897cf485 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 9 Mar 2018 14:24:05 -0800 -Subject: [PATCH 158/806] ARM: BCM270X: Add the 18-bit DPI pinmux to the RPI +Subject: [PATCH] ARM: BCM270X: Add the 18-bit DPI pinmux to the RPI DTs. This doesn't do anything by default, but trying to put the node in an diff --git a/target/linux/brcm2708/patches-4.19/950-0159-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch b/target/linux/brcm2708/patches-4.19/950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0159-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch rename to target/linux/brcm2708/patches-4.19/950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch index 775a69ee7f..56d9d9aca1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0159-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch +++ b/target/linux/brcm2708/patches-4.19/950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch @@ -1,7 +1,7 @@ From 467e9cb87261c27b6c70ec714ae3cb58b48d0f6b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 9 Mar 2018 13:20:21 -0800 -Subject: [PATCH 159/806] overlays: Add an overlay for the Adafruit Kippah with +Subject: [PATCH] overlays: Add an overlay for the Adafruit Kippah with their 7" panel Signed-off-by: Eric Anholt diff --git a/target/linux/brcm2708/patches-4.19/950-0160-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch b/target/linux/brcm2708/patches-4.19/950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0160-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch rename to target/linux/brcm2708/patches-4.19/950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch index 6a97f4dec9..cd188a7170 100644 --- a/target/linux/brcm2708/patches-4.19/950-0160-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch +++ b/target/linux/brcm2708/patches-4.19/950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch @@ -1,7 +1,7 @@ From a90677b7610230ed88bd1866684e05ac2a0321f6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 9 Mar 2018 13:26:33 -0800 -Subject: [PATCH 160/806] overlays: Remove stale notes about vc4's CMA +Subject: [PATCH] overlays: Remove stale notes about vc4's CMA alignment in the README. We haven't needed alignment since diff --git a/target/linux/brcm2708/patches-4.19/950-0161-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch b/target/linux/brcm2708/patches-4.19/950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0161-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch rename to target/linux/brcm2708/patches-4.19/950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch index 05b255dc8c..727624086a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0161-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch +++ b/target/linux/brcm2708/patches-4.19/950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch @@ -1,7 +1,7 @@ From d7aa9d52b7f9b2d600f9b2479767c24d438a2c68 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Jul 2018 14:23:47 +0100 -Subject: [PATCH 161/806] spi: Make GPIO CSs honour the SPI_NO_CS flag +Subject: [PATCH] spi: Make GPIO CSs honour the SPI_NO_CS flag The SPI configuration state includes an SPI_NO_CS flag that disables all CS line manipulation, for applications that want to manage their diff --git a/target/linux/brcm2708/patches-4.19/950-0162-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch b/target/linux/brcm2708/patches-4.19/950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0162-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch rename to target/linux/brcm2708/patches-4.19/950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch index 2ab50965bc..567052f0fb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0162-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch +++ b/target/linux/brcm2708/patches-4.19/950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch @@ -1,7 +1,7 @@ From 120cbbc17c917790fe523ee67a32e877e5592b93 Mon Sep 17 00:00:00 2001 From: Steve Pavao Date: Fri, 10 Aug 2018 17:09:50 -0400 -Subject: [PATCH 162/806] devicetree: add RPi CM3 dts to arm64; mimic the RPi +Subject: [PATCH] devicetree: add RPi CM3 dts to arm64; mimic the RPi 3B arm64 dts implementation, by referring to the actual dts file in the arm directory diff --git a/target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch b/target/linux/brcm2708/patches-4.19/950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch rename to target/linux/brcm2708/patches-4.19/950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch index 8e5f84efdc..583b2c8b5d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch +++ b/target/linux/brcm2708/patches-4.19/950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch @@ -1,7 +1,7 @@ From e2516e3a7d2244f74c3267be8bdc143448c278be Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Tue, 28 Aug 2018 18:42:13 +1000 -Subject: [PATCH 163/806] Add support for audioinjector.net ultra soundcard. +Subject: [PATCH] Add support for audioinjector.net ultra soundcard. (#2664) Uses the simple-audio-card ALSA machine driver. Sets up the machine diff --git a/target/linux/brcm2708/patches-4.19/950-0164-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch b/target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0164-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch rename to target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch index b8c17b83fc..642bd2b39d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0164-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch +++ b/target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch @@ -1,7 +1,7 @@ From 92d32a3a11bc8c290370ba37bf792996ce3da8bc Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Thu, 30 Aug 2018 09:38:02 +1000 -Subject: [PATCH 164/806] ASoC: cs4265: Add a S/PDIF enable switch +Subject: [PATCH] ASoC: cs4265: Add a S/PDIF enable switch commit f853d6b3ba345297974d877d8ed0f4a91eaca739 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0165-ASoC-cs4265-Add-native-32bit-I2S-transport.patch b/target/linux/brcm2708/patches-4.19/950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0165-ASoC-cs4265-Add-native-32bit-I2S-transport.patch rename to target/linux/brcm2708/patches-4.19/950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch index 8e32928cf9..cedc79284b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0165-ASoC-cs4265-Add-native-32bit-I2S-transport.patch +++ b/target/linux/brcm2708/patches-4.19/950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch @@ -1,7 +1,7 @@ From 8b81eec1fab393a4f0df4a77788aaaccb39e55dd Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Thu, 30 Aug 2018 09:38:01 +1000 -Subject: [PATCH 165/806] ASoC: cs4265: Add native 32bit I2S transport +Subject: [PATCH] ASoC: cs4265: Add native 32bit I2S transport commit be47e75eb1419ffc1d9c26230963fd5fa3055097 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0167-BCM270X_DT-Add-gpio-fan-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0167-BCM270X_DT-Add-gpio-fan-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch index f0cd000a2e..f252490382 100644 --- a/target/linux/brcm2708/patches-4.19/950-0167-BCM270X_DT-Add-gpio-fan-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch @@ -1,7 +1,7 @@ From 9762b3a015886c42941f535e688ffac1f56e35aa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Sep 2018 11:08:07 +0100 -Subject: [PATCH 167/806] BCM270X_DT: Add gpio-fan overlay +Subject: [PATCH] BCM270X_DT: Add gpio-fan overlay Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0168-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch b/target/linux/brcm2708/patches-4.19/950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0168-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch rename to target/linux/brcm2708/patches-4.19/950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch index 693afc1818..52bd49af5e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0168-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch @@ -1,7 +1,7 @@ From 08e33d99152acc5e35fd94f9b443f38baaac93e1 Mon Sep 17 00:00:00 2001 From: Hanno Zulla Date: Thu, 23 Aug 2018 17:03:38 +0200 -Subject: [PATCH 168/806] HID: hid-bigbenff: driver for BigBen Interactive +Subject: [PATCH] HID: hid-bigbenff: driver for BigBen Interactive PS3OFMINIPAD gamepad commit 256a90ed9e46b270bbc4e15ef05216ff049c3721 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0170-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch b/target/linux/brcm2708/patches-4.19/950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0170-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch rename to target/linux/brcm2708/patches-4.19/950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch index 9f67d8a1ff..8e35113fdc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0170-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch +++ b/target/linux/brcm2708/patches-4.19/950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch @@ -1,7 +1,7 @@ From f78b69873eb4839dd836b4a681ccce90aa8188f1 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Fri, 28 Sep 2018 15:13:28 +1000 -Subject: [PATCH 170/806] ASoC: cs4265: Add a MIC pre. route (#2696) +Subject: [PATCH] ASoC: cs4265: Add a MIC pre. route (#2696) Commit b0ef5011b981ece1fde8063243a56d3038b87adb upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0171-Update-gpio-fan-overlay.dts-2711.patch b/target/linux/brcm2708/patches-4.19/950-0156-Update-gpio-fan-overlay.dts-2711.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0171-Update-gpio-fan-overlay.dts-2711.patch rename to target/linux/brcm2708/patches-4.19/950-0156-Update-gpio-fan-overlay.dts-2711.patch index b95b2b92d0..c8f375942e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0171-Update-gpio-fan-overlay.dts-2711.patch +++ b/target/linux/brcm2708/patches-4.19/950-0156-Update-gpio-fan-overlay.dts-2711.patch @@ -1,7 +1,7 @@ From 4a2be174938ac115beac4f07fa8b7ee33406cde8 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 11 Oct 2018 12:17:20 +0300 -Subject: [PATCH 171/806] Update gpio-fan-overlay.dts (#2711) +Subject: [PATCH] Update gpio-fan-overlay.dts (#2711) Add references, links, clear details, some typo correction. --- diff --git a/target/linux/brcm2708/patches-4.19/950-0172-drivers-thermal-step_wise-add-support-for-hysteresis.patch b/target/linux/brcm2708/patches-4.19/950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0172-drivers-thermal-step_wise-add-support-for-hysteresis.patch rename to target/linux/brcm2708/patches-4.19/950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch index 3043559c0f..af447c1704 100644 --- a/target/linux/brcm2708/patches-4.19/950-0172-drivers-thermal-step_wise-add-support-for-hysteresis.patch +++ b/target/linux/brcm2708/patches-4.19/950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch @@ -1,7 +1,7 @@ From 05a13bbd7fbb76b4f690042173749a55d85de831 Mon Sep 17 00:00:00 2001 From: Ram Chandrasekar Date: Mon, 7 May 2018 11:54:08 -0600 -Subject: [PATCH 172/806] drivers: thermal: step_wise: add support for +Subject: [PATCH] drivers: thermal: step_wise: add support for hysteresis From: Ram Chandrasekar diff --git a/target/linux/brcm2708/patches-4.19/950-0173-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch b/target/linux/brcm2708/patches-4.19/950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0173-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch rename to target/linux/brcm2708/patches-4.19/950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch index 8a07a46d24..8547b4fdde 100644 --- a/target/linux/brcm2708/patches-4.19/950-0173-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch +++ b/target/linux/brcm2708/patches-4.19/950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch @@ -1,7 +1,7 @@ From c7c358c1ac991887b6d2c9193139f9f35a36e985 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 2 Oct 2018 11:14:15 +0100 -Subject: [PATCH 173/806] drivers: thermal: step_wise: avoid throttling at +Subject: [PATCH] drivers: thermal: step_wise: avoid throttling at hysteresis temperature after dropping below it Signed-off-by: Serge Schneider diff --git a/target/linux/brcm2708/patches-4.19/950-0174-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch b/target/linux/brcm2708/patches-4.19/950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0174-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch rename to target/linux/brcm2708/patches-4.19/950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch index 37331d3aa3..ae35e8b7db 100644 --- a/target/linux/brcm2708/patches-4.19/950-0174-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch +++ b/target/linux/brcm2708/patches-4.19/950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch @@ -1,7 +1,7 @@ From 018b90a28a06e351dc67db043e9889eeed33120c Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 26 Sep 2018 19:44:59 +0100 -Subject: [PATCH 174/806] hwmon: adjust rpi-poe-fan overlay trip points +Subject: [PATCH] hwmon: adjust rpi-poe-fan overlay trip points Signed-off-by: Serge Schneider --- diff --git a/target/linux/brcm2708/patches-4.19/950-0175-overlays-add-overrides-for-PoE-HAT-fan-control.patch b/target/linux/brcm2708/patches-4.19/950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0175-overlays-add-overrides-for-PoE-HAT-fan-control.patch rename to target/linux/brcm2708/patches-4.19/950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch index e795df16fd..0ea76db503 100644 --- a/target/linux/brcm2708/patches-4.19/950-0175-overlays-add-overrides-for-PoE-HAT-fan-control.patch +++ b/target/linux/brcm2708/patches-4.19/950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch @@ -1,7 +1,7 @@ From a6593a1bc8708f73c424c05c64d49d3868e1bdd5 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 2 Oct 2018 17:13:48 +0100 -Subject: [PATCH 175/806] overlays: add overrides for PoE HAT fan control +Subject: [PATCH] overlays: add overrides for PoE HAT fan control Signed-off-by: Serge Schneider --- diff --git a/target/linux/brcm2708/patches-4.19/950-0176-overlays-Add-gpio-no-bank0-irq-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0176-overlays-Add-gpio-no-bank0-irq-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch index 06026de969..7a93d2fd23 100644 --- a/target/linux/brcm2708/patches-4.19/950-0176-overlays-Add-gpio-no-bank0-irq-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch @@ -1,7 +1,7 @@ From afe88750090d60d94b365250968e116ec88448c1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Jul 2018 17:25:00 +0100 -Subject: [PATCH 176/806] overlays: Add gpio-no-bank0-irq overlay +Subject: [PATCH] overlays: Add gpio-no-bank0-irq overlay See: https://github.com/raspberrypi/linux/issues/2590 diff --git a/target/linux/brcm2708/patches-4.19/950-0177-Add-hy28b-2017-model-device-tree-overlay-2721.patch b/target/linux/brcm2708/patches-4.19/950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0177-Add-hy28b-2017-model-device-tree-overlay-2721.patch rename to target/linux/brcm2708/patches-4.19/950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch index a5914a5a77..2c0493777b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0177-Add-hy28b-2017-model-device-tree-overlay-2721.patch +++ b/target/linux/brcm2708/patches-4.19/950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch @@ -1,7 +1,7 @@ From a64595c1bc19752dca712c6cd90692a2a0e7397b Mon Sep 17 00:00:00 2001 From: Hans-Wilhelm Warlo <5417271+hanswilw@users.noreply.github.com> Date: Tue, 16 Oct 2018 18:20:48 +0200 -Subject: [PATCH 177/806] Add hy28b 2017 model device tree overlay (#2721) +Subject: [PATCH] Add hy28b 2017 model device tree overlay (#2721) The 2017 version of the hy28b display requires a different initialisation sequence. diff --git a/target/linux/brcm2708/patches-4.19/950-0179-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch b/target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0179-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch rename to target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch index 1b1f6da04c..c6a9e355c5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0179-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch +++ b/target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch @@ -1,7 +1,7 @@ From 5010dba0e3f6f2c9d623e265276d9b6993fa96b0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 26 Oct 2018 17:29:51 +0100 -Subject: [PATCH 179/806] mmc/bcm2835-sdhost: Recover from MMC_SEND_EXT_CSD +Subject: [PATCH] mmc/bcm2835-sdhost: Recover from MMC_SEND_EXT_CSD If the user issues an "mmc extcsd read", the SD controller receives what it thinks is a SEND_IF_COND command with an unexpected data block. diff --git a/target/linux/brcm2708/patches-4.19/950-0180-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch b/target/linux/brcm2708/patches-4.19/950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0180-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch rename to target/linux/brcm2708/patches-4.19/950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch index 73e69c69c9..c7c4fa86df 100644 --- a/target/linux/brcm2708/patches-4.19/950-0180-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch +++ b/target/linux/brcm2708/patches-4.19/950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch @@ -1,7 +1,7 @@ From c0c9a631e7ca58cc31aafb14920c559552d3b810 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Oct 2018 10:38:31 +0000 -Subject: [PATCH 180/806] overlays: pi3-disable-bt: Clear out bt_pins node +Subject: [PATCH] overlays: pi3-disable-bt: Clear out bt_pins node The pi3-disable-bt overlay does not (and cannot) delete the bt_pins node, but emptying its properties (including brcm,pins) is a way of diff --git a/target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch b/target/linux/brcm2708/patches-4.19/950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch rename to target/linux/brcm2708/patches-4.19/950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch index 3809a7a9cb..b9a4f52e5a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch +++ b/target/linux/brcm2708/patches-4.19/950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch @@ -1,7 +1,7 @@ From 0557d41d861b8c214b3472749482efdc71363dbb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Oct 2018 14:45:45 +0000 -Subject: [PATCH 181/806] Revert "rtc: pcf8523: properly handle oscillator stop +Subject: [PATCH] Revert "rtc: pcf8523: properly handle oscillator stop bit" This reverts commit ede44c908d44b166a5b6bd7caacd105c2ff5a70f. diff --git a/target/linux/brcm2708/patches-4.19/950-0183-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch b/target/linux/brcm2708/patches-4.19/950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0183-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch rename to target/linux/brcm2708/patches-4.19/950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch index 5519a06936..6e81c149d8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0183-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch @@ -1,7 +1,7 @@ From 627f981e148bb9f7dc01df97fa20fe6124f417f7 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 7 Nov 2018 17:43:10 +0000 -Subject: [PATCH 183/806] overlays: uart0 - return GPIOs 14 and 15 to inputs +Subject: [PATCH] overlays: uart0 - return GPIOs 14 and 15 to inputs In the event that alternate pins are used (only useful on Compute Modules), return the standard pins to inputs to avoid double-mapping diff --git a/target/linux/brcm2708/patches-4.19/950-0184-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch b/target/linux/brcm2708/patches-4.19/950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0184-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch rename to target/linux/brcm2708/patches-4.19/950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch index 8964a5905d..12e1289734 100644 --- a/target/linux/brcm2708/patches-4.19/950-0184-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch +++ b/target/linux/brcm2708/patches-4.19/950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch @@ -1,7 +1,7 @@ From c961f0534bdf659108eaf3352989683411767611 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 12 Nov 2018 22:54:40 +0000 -Subject: [PATCH 184/806] mmc: bcm2835-sdhost: Fix warnings on arm64 +Subject: [PATCH] mmc: bcm2835-sdhost: Fix warnings on arm64 Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0185-Fix-warning-in-bcm2835-smi-nand.patch b/target/linux/brcm2708/patches-4.19/950-0168-Fix-warning-in-bcm2835-smi-nand.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0185-Fix-warning-in-bcm2835-smi-nand.patch rename to target/linux/brcm2708/patches-4.19/950-0168-Fix-warning-in-bcm2835-smi-nand.patch index 65eef5e448..ca363a1344 100644 --- a/target/linux/brcm2708/patches-4.19/950-0185-Fix-warning-in-bcm2835-smi-nand.patch +++ b/target/linux/brcm2708/patches-4.19/950-0168-Fix-warning-in-bcm2835-smi-nand.patch @@ -1,7 +1,7 @@ From 2f4524681c940887bc1e7d98b960719c731c85df Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 12 Nov 2018 22:56:35 +0000 -Subject: [PATCH 185/806] Fix warning in bcm2835-smi-nand +Subject: [PATCH] Fix warning in bcm2835-smi-nand Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0186-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch b/target/linux/brcm2708/patches-4.19/950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0186-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch rename to target/linux/brcm2708/patches-4.19/950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch index 2ae108d079..00e852d7f1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0186-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch +++ b/target/linux/brcm2708/patches-4.19/950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch @@ -1,7 +1,7 @@ From 5796bf25ff928fef204c7f53572f0fc5b8f79d45 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:37 +0000 -Subject: [PATCH 186/806] media: ov5647: Add set_fmt and get_fmt calls. +Subject: [PATCH] media: ov5647: Add set_fmt and get_fmt calls. There's no way to query the subdevice for the supported resolutions. diff --git a/target/linux/brcm2708/patches-4.19/950-0187-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch b/target/linux/brcm2708/patches-4.19/950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0187-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch rename to target/linux/brcm2708/patches-4.19/950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch index 09fc61157d..42dc7e1bc7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0187-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch +++ b/target/linux/brcm2708/patches-4.19/950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch @@ -1,7 +1,7 @@ From 1c643cbdcfaa7e8b4a52bb8555cce60b48d822a2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:55:59 +0000 -Subject: [PATCH 187/806] [media] Documentation: DT: add device tree for PWDN +Subject: [PATCH] Documentation: DT: add device tree for PWDN control Add optional GPIO pwdn to connect to the PWDN line on the sensor. diff --git a/target/linux/brcm2708/patches-4.19/950-0188-media-ov5647-Add-support-for-PWDN-GPIO.patch b/target/linux/brcm2708/patches-4.19/950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0188-media-ov5647-Add-support-for-PWDN-GPIO.patch rename to target/linux/brcm2708/patches-4.19/950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch index e758221d02..80a5d900d6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0188-media-ov5647-Add-support-for-PWDN-GPIO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch @@ -1,7 +1,7 @@ From f41fdda9ca98e675d7467cc352c678bbcdca2df1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:33 +0000 -Subject: [PATCH 188/806] media: ov5647: Add support for PWDN GPIO. +Subject: [PATCH] media: ov5647: Add support for PWDN GPIO. Add support for an optional GPIO connected to PWDN on the sensor. diff --git a/target/linux/brcm2708/patches-4.19/950-0189-media-ov5647-Add-support-for-non-continuous-clock-mo.patch b/target/linux/brcm2708/patches-4.19/950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0189-media-ov5647-Add-support-for-non-continuous-clock-mo.patch rename to target/linux/brcm2708/patches-4.19/950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch index 082a161443..edbc12081d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0189-media-ov5647-Add-support-for-non-continuous-clock-mo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch @@ -1,7 +1,7 @@ From 79bbd278272416aa61c29bda88e79f8f6dd35903 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:47 +0000 -Subject: [PATCH 189/806] media: ov5647: Add support for non-continuous clock +Subject: [PATCH] media: ov5647: Add support for non-continuous clock mode The driver was only supporting continuous clock mode diff --git a/target/linux/brcm2708/patches-4.19/950-0190-media-tc358743-Increase-FIFO-level-to-374.patch b/target/linux/brcm2708/patches-4.19/950-0173-media-tc358743-Increase-FIFO-level-to-374.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0190-media-tc358743-Increase-FIFO-level-to-374.patch rename to target/linux/brcm2708/patches-4.19/950-0173-media-tc358743-Increase-FIFO-level-to-374.patch index d7438ef492..937ac1a65c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0190-media-tc358743-Increase-FIFO-level-to-374.patch +++ b/target/linux/brcm2708/patches-4.19/950-0173-media-tc358743-Increase-FIFO-level-to-374.patch @@ -1,7 +1,7 @@ From 4f1be827b5873b2aaa9003a2d38ba6b941ceb66d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:56:59 +0000 -Subject: [PATCH 190/806] media: tc358743: Increase FIFO level to 374. +Subject: [PATCH] media: tc358743: Increase FIFO level to 374. The existing fixed value of 16 worked for UYVY 720P60 over 2 lanes at 594MHz, or UYVY 1080P60 over 4 lanes. (RGB888 diff --git a/target/linux/brcm2708/patches-4.19/950-0191-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch b/target/linux/brcm2708/patches-4.19/950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0191-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch rename to target/linux/brcm2708/patches-4.19/950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch index 999ad5f41a..26d36ea43c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0191-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch +++ b/target/linux/brcm2708/patches-4.19/950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch @@ -1,7 +1,7 @@ From f0a4354bf8d99532577a21bb99da792fe2691626 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 21 Sep 2017 17:30:24 +0200 -Subject: [PATCH 191/806] media: tc358743: fix connected/active CSI-2 lane +Subject: [PATCH] media: tc358743: fix connected/active CSI-2 lane reporting g_mbus_config was supposed to indicate all supported lane numbers, not diff --git a/target/linux/brcm2708/patches-4.19/950-0192-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/target/linux/brcm2708/patches-4.19/950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0192-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch rename to target/linux/brcm2708/patches-4.19/950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch index 451be8ec5d..89d389c9c1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0192-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch +++ b/target/linux/brcm2708/patches-4.19/950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch @@ -1,7 +1,7 @@ From 745b0fc9c914437695c6098daecd311b2cd88204 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:21 +0000 -Subject: [PATCH 192/806] media: tc358743: Add support for 972Mbit/s link freq. +Subject: [PATCH] media: tc358743: Add support for 972Mbit/s link freq. Adds register setups for running the CSI lanes at 972Mbit/s, which allows 1080P50 UYVY down 2 lanes. diff --git a/target/linux/brcm2708/patches-4.19/950-0193-media-tc358743-Check-I2C-succeeded-during-probe.patch b/target/linux/brcm2708/patches-4.19/950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0193-media-tc358743-Check-I2C-succeeded-during-probe.patch rename to target/linux/brcm2708/patches-4.19/950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch index 4df51feb64..6cb1134b9d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0193-media-tc358743-Check-I2C-succeeded-during-probe.patch +++ b/target/linux/brcm2708/patches-4.19/950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch @@ -1,7 +1,7 @@ From 6e089b7c2526037b0eaf9ecaed4d38957f33c19c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:34 +0000 -Subject: [PATCH 193/806] media: tc358743: Check I2C succeeded during probe. +Subject: [PATCH] media: tc358743: Check I2C succeeded during probe. The probe for the TC358743 reads the CHIPID register from the device and compares it to the expected value of 0. diff --git a/target/linux/brcm2708/patches-4.19/950-0194-media-adv7180-Default-to-the-first-valid-input.patch b/target/linux/brcm2708/patches-4.19/950-0177-media-adv7180-Default-to-the-first-valid-input.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0194-media-adv7180-Default-to-the-first-valid-input.patch rename to target/linux/brcm2708/patches-4.19/950-0177-media-adv7180-Default-to-the-first-valid-input.patch index 332fc77e82..65108f9710 100644 --- a/target/linux/brcm2708/patches-4.19/950-0194-media-adv7180-Default-to-the-first-valid-input.patch +++ b/target/linux/brcm2708/patches-4.19/950-0177-media-adv7180-Default-to-the-first-valid-input.patch @@ -1,7 +1,7 @@ From 1d6cba1999607bc911ee8d16323914058b06e8d8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:46 +0000 -Subject: [PATCH 194/806] media: adv7180: Default to the first valid input +Subject: [PATCH] media: adv7180: Default to the first valid input The hardware default is differential CVBS on AIN1 & 2, which isn't very useful. diff --git a/target/linux/brcm2708/patches-4.19/950-0195-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch b/target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0195-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch rename to target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch index 563eb7ab11..0dcd6771d0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0195-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch +++ b/target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch @@ -1,7 +1,7 @@ From b8a3ce970a70543aadd4b49a102b5cdaf2a62ed7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:57:56 +0000 -Subject: [PATCH 195/806] media: adv7180: Add YPrPb support for ADV7282M +Subject: [PATCH] media: adv7180: Add YPrPb support for ADV7282M The ADV7282M can support YPbPr on AIN1-3, but this was not selectable from the driver. Add it to the list of diff --git a/target/linux/brcm2708/patches-4.19/950-0196-media-videodev2-Add-helper-defines-for-printing-FOUR.patch b/target/linux/brcm2708/patches-4.19/950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0196-media-videodev2-Add-helper-defines-for-printing-FOUR.patch rename to target/linux/brcm2708/patches-4.19/950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch index 2ff08e7556..5f394a9bd1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0196-media-videodev2-Add-helper-defines-for-printing-FOUR.patch +++ b/target/linux/brcm2708/patches-4.19/950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch @@ -1,7 +1,7 @@ From a7b5d64ec5cb63b6cf5f3eb8fd3bfa22f86d36c4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:58:08 +0000 -Subject: [PATCH 196/806] media: videodev2: Add helper defines for printing +Subject: [PATCH] media: videodev2: Add helper defines for printing FOURCCs New helper defines that allow printing of a FOURCC using diff --git a/target/linux/brcm2708/patches-4.19/950-0197-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch b/target/linux/brcm2708/patches-4.19/950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0197-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch rename to target/linux/brcm2708/patches-4.19/950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch index 63d3b3dce9..77fdd348d9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0197-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch @@ -1,7 +1,7 @@ From 8299df54f2016290eed7a2bece3885aad36d13e2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:06 +0000 -Subject: [PATCH 197/806] dt-bindings: Document BCM283x CSI2/CCP2 receiver +Subject: [PATCH] dt-bindings: Document BCM283x CSI2/CCP2 receiver Document the DT bindings for the CSI2/CCP2 receiver peripheral (known as Unicam) on BCM283x SoCs. diff --git a/target/linux/brcm2708/patches-4.19/950-0198-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/target/linux/brcm2708/patches-4.19/950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0198-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch rename to target/linux/brcm2708/patches-4.19/950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch index 31ede702b7..7c857c4631 100644 --- a/target/linux/brcm2708/patches-4.19/950-0198-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch +++ b/target/linux/brcm2708/patches-4.19/950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch @@ -1,7 +1,7 @@ From 7b7027a39b981e3d72a5876274e857615d5149e1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 14:59:22 +0000 -Subject: [PATCH 198/806] media: bcm2835-unicam: Driver for CCP2/CSI2 camera +Subject: [PATCH] media: bcm2835-unicam: Driver for CCP2/CSI2 camera interface Add driver for the Unicam camera receiver block on diff --git a/target/linux/brcm2708/patches-4.19/950-0201-media-adv7180-Nasty-hack-to-allow-input-selection.patch b/target/linux/brcm2708/patches-4.19/950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0201-media-adv7180-Nasty-hack-to-allow-input-selection.patch rename to target/linux/brcm2708/patches-4.19/950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch index 1f039f1f83..b48db8b0d1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0201-media-adv7180-Nasty-hack-to-allow-input-selection.patch +++ b/target/linux/brcm2708/patches-4.19/950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch @@ -1,7 +1,7 @@ From 34c4ee6f5d7143f6c8be604715f9b52b7540e38d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 15:00:04 +0000 -Subject: [PATCH 201/806] media: adv7180: Nasty hack to allow input selection. +Subject: [PATCH] media: adv7180: Nasty hack to allow input selection. Whilst the adv7180 driver support s_routing, nothing else does, and there is a missing lump of framework code to diff --git a/target/linux/brcm2708/patches-4.19/950-0202-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch b/target/linux/brcm2708/patches-4.19/950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0202-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch rename to target/linux/brcm2708/patches-4.19/950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch index d0e8915a3b..551a60ce9e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0202-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch +++ b/target/linux/brcm2708/patches-4.19/950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch @@ -1,7 +1,7 @@ From 32282fb05466e5d5767b598e60136ef584847dc4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 15:00:20 +0000 -Subject: [PATCH 202/806] BCM283x DT: Add CSI nodes to the device tree. +Subject: [PATCH] BCM283x DT: Add CSI nodes to the device tree. Adds CSI nodes to all the upstream device tree configs diff --git a/target/linux/brcm2708/patches-4.19/950-0203-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0203-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch index 585fdc61aa..a78a9f3157 100644 --- a/target/linux/brcm2708/patches-4.19/950-0203-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch @@ -1,7 +1,7 @@ From 831423a9f14d46f69c78136d37c2ab0cdaa5bdb1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 15:00:45 +0000 -Subject: [PATCH 203/806] BCM270X_DT: Add CSI defines for all the downstream Pi +Subject: [PATCH] BCM270X_DT: Add CSI defines for all the downstream Pi platforms Adds the CSI device includes for the bcm27xx platform DTS files diff --git a/target/linux/brcm2708/patches-4.19/950-0204-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch b/target/linux/brcm2708/patches-4.19/950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0204-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch rename to target/linux/brcm2708/patches-4.19/950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch index a39a7cee08..a5f0c76dd1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0204-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch +++ b/target/linux/brcm2708/patches-4.19/950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch @@ -1,7 +1,7 @@ From c3ea5332de058ee7b9139133f2f8103b6dff2478 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 15:01:59 +0000 -Subject: [PATCH 204/806] arm: dt: Add DT overlays for ADV7282M, OV5647, and +Subject: [PATCH] arm: dt: Add DT overlays for ADV7282M, OV5647, and TC358743 DT overlays to setup the above devices via i2c_arm and csi1. diff --git a/target/linux/brcm2708/patches-4.19/950-0205-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch b/target/linux/brcm2708/patches-4.19/950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0205-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch rename to target/linux/brcm2708/patches-4.19/950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch index c52a54758c..9348af8350 100644 --- a/target/linux/brcm2708/patches-4.19/950-0205-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch +++ b/target/linux/brcm2708/patches-4.19/950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch @@ -1,7 +1,7 @@ From 8ea13a43a77dfb45c836de2d6c747f630dd75275 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 15:02:18 +0000 -Subject: [PATCH 205/806] dtoverlays: Add support for ADV7280-M, ADV7281-M and +Subject: [PATCH] dtoverlays: Add support for ADV7280-M, ADV7281-M and ADV7281-MA chips. The driver that supports the ADV7282-M also supports the ADV7280-M, diff --git a/target/linux/brcm2708/patches-4.19/950-0207-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch b/target/linux/brcm2708/patches-4.19/950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0207-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch rename to target/linux/brcm2708/patches-4.19/950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch index 900b53ffca..8a71d944ea 100644 --- a/target/linux/brcm2708/patches-4.19/950-0207-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch +++ b/target/linux/brcm2708/patches-4.19/950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch @@ -1,7 +1,7 @@ From 654ca15f2234ce3677ed7c9eef5de588285b529a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 14 Nov 2018 11:54:46 +0000 -Subject: [PATCH 207/806] vcsm: Fix an NULL dereference in the import_dmabuf +Subject: [PATCH] vcsm: Fix an NULL dereference in the import_dmabuf error path resource was dereferenced even though it was NULL. diff --git a/target/linux/brcm2708/patches-4.19/950-0208-Update-README-2750.patch b/target/linux/brcm2708/patches-4.19/950-0188-Update-README-2750.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0208-Update-README-2750.patch rename to target/linux/brcm2708/patches-4.19/950-0188-Update-README-2750.patch index e9d7677401..cc9af044e0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0208-Update-README-2750.patch +++ b/target/linux/brcm2708/patches-4.19/950-0188-Update-README-2750.patch @@ -1,7 +1,7 @@ From 5b4c913a00ac41766ba70104749aa1533a370996 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 13 Nov 2018 16:51:21 +0000 -Subject: [PATCH 208/806] Update README (#2750) +Subject: [PATCH] Update README (#2750) Small update to the DT blob docs to include the axiperf option. diff --git a/target/linux/brcm2708/patches-4.19/950-0209-overlays-Remove-superfluous-address-size-cells.patch b/target/linux/brcm2708/patches-4.19/950-0189-overlays-Remove-superfluous-address-size-cells.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0209-overlays-Remove-superfluous-address-size-cells.patch rename to target/linux/brcm2708/patches-4.19/950-0189-overlays-Remove-superfluous-address-size-cells.patch index 594cef583a..1a660d608b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0209-overlays-Remove-superfluous-address-size-cells.patch +++ b/target/linux/brcm2708/patches-4.19/950-0189-overlays-Remove-superfluous-address-size-cells.patch @@ -1,7 +1,7 @@ From 1648c72369a617b27193534f28fd86a1bdabd7b3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 14 Nov 2018 09:53:25 +0000 -Subject: [PATCH 209/806] overlays: Remove superfluous #address/size-cells +Subject: [PATCH] overlays: Remove superfluous #address/size-cells Newer versions of dtc warn about unnecessary usage of #address-cells and #size-cells, so remove them. diff --git a/target/linux/brcm2708/patches-4.19/950-0210-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch b/target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0210-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch rename to target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch index 545d4d1c14..583b95bf89 100644 --- a/target/linux/brcm2708/patches-4.19/950-0210-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch +++ b/target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch @@ -1,7 +1,7 @@ From 7c62d38653565e900504f821586e1b1d47f25594 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 18 Nov 2018 13:21:26 +0100 -Subject: [PATCH 210/806] Revert "ASoC: wm8804: MCLK configuration options, +Subject: [PATCH] Revert "ASoC: wm8804: MCLK configuration options, 32-bit" This reverts commit 3b12dcf797f5a4635aecd7f5c090dc507b124ffd. diff --git a/target/linux/brcm2708/patches-4.19/950-0211-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch b/target/linux/brcm2708/patches-4.19/950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0211-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch rename to target/linux/brcm2708/patches-4.19/950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch index c662d3fbdd..f73d9c9617 100644 --- a/target/linux/brcm2708/patches-4.19/950-0211-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch @@ -1,7 +1,7 @@ From 31b533207610f0f703cfdcba3baf404d000f1363 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 18 Nov 2018 15:24:16 +0100 -Subject: [PATCH 211/806] rpi-wm8804-soundcard: drop PWRDN register writes +Subject: [PATCH] rpi-wm8804-soundcard: drop PWRDN register writes Since kernel 4.0 the PWRDN register bits are under DAPM control from the wm8804 driver. diff --git a/target/linux/brcm2708/patches-4.19/950-0212-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch b/target/linux/brcm2708/patches-4.19/950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0212-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch rename to target/linux/brcm2708/patches-4.19/950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch index 6f4d3a9195..7edd25f9eb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0212-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch +++ b/target/linux/brcm2708/patches-4.19/950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch @@ -1,7 +1,7 @@ From f6b133a056e8fde7f4707e2874e204c7d5d671a2 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 18 Nov 2018 15:32:28 +0100 -Subject: [PATCH 212/806] rpi-wm8804-soundcard: configure wm8804 clocks only on +Subject: [PATCH] rpi-wm8804-soundcard: configure wm8804 clocks only on rate change This should avoid clicks when stopping and immediately afterwards diff --git a/target/linux/brcm2708/patches-4.19/950-0213-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch b/target/linux/brcm2708/patches-4.19/950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0213-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch rename to target/linux/brcm2708/patches-4.19/950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch index c7c3dc1c30..cb89142dff 100644 --- a/target/linux/brcm2708/patches-4.19/950-0213-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch +++ b/target/linux/brcm2708/patches-4.19/950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch @@ -1,7 +1,7 @@ From 83b839b8b3a599336c2d48ab22ed919a77666476 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 26 Nov 2018 17:02:15 +0000 -Subject: [PATCH 213/806] dtoverlays: Add i2c on 0&1 option to TC358743, +Subject: [PATCH] dtoverlays: Add i2c on 0&1 option to TC358743, ADV7282 and OV5647 Adds the option of configuring i2c0 to be on GPIOs 0&1 as diff --git a/target/linux/brcm2708/patches-4.19/950-0214-overlays-Update-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0194-overlays-Update-upstream-overlay.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0214-overlays-Update-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0194-overlays-Update-upstream-overlay.patch index 1b0a805dd5..f7749ed553 100644 --- a/target/linux/brcm2708/patches-4.19/950-0214-overlays-Update-upstream-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0194-overlays-Update-upstream-overlay.patch @@ -1,7 +1,7 @@ From e62fed2c6b825e4b9d688dab7b7603fc95bb49cb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 20:15:16 +0000 -Subject: [PATCH 214/806] overlays: Update upstream overlay +Subject: [PATCH] overlays: Update upstream overlay The vc4-kms-v3d overlay gained an extra fragment enabling the txp node, so rebuild the upstream overlay to match. diff --git a/target/linux/brcm2708/patches-4.19/950-0215-BCM2708_DT-update-firmware-node-binding.patch b/target/linux/brcm2708/patches-4.19/950-0195-BCM2708_DT-update-firmware-node-binding.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0215-BCM2708_DT-update-firmware-node-binding.patch rename to target/linux/brcm2708/patches-4.19/950-0195-BCM2708_DT-update-firmware-node-binding.patch index 781032c48b..b55e89f492 100644 --- a/target/linux/brcm2708/patches-4.19/950-0215-BCM2708_DT-update-firmware-node-binding.patch +++ b/target/linux/brcm2708/patches-4.19/950-0195-BCM2708_DT-update-firmware-node-binding.patch @@ -1,7 +1,7 @@ From e07c078b68e1776fa10818a1586c23a98a21ebdd Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 28 Nov 2018 10:36:01 +0100 -Subject: [PATCH 215/806] BCM2708_DT: update firmware node binding +Subject: [PATCH] BCM2708_DT: update firmware node binding The upstreamed version of the firmware node has been updated to present it as a "simple-bus". We need to get this in order to accomodate other diff --git a/target/linux/brcm2708/patches-4.19/950-0216-BCM2710_DT-fix-gpio-expander-bindings.patch b/target/linux/brcm2708/patches-4.19/950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0216-BCM2710_DT-fix-gpio-expander-bindings.patch rename to target/linux/brcm2708/patches-4.19/950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch index 3ca3340097..53d055893d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0216-BCM2710_DT-fix-gpio-expander-bindings.patch +++ b/target/linux/brcm2708/patches-4.19/950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch @@ -1,7 +1,7 @@ From d5a4fa7ba39e4f9e41271023e1be417204b8a2b7 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Tue, 27 Nov 2018 16:59:10 +0100 -Subject: [PATCH 216/806] BCM2710_DT: fix gpio expander bindings +Subject: [PATCH] BCM2710_DT: fix gpio expander bindings The upstreamed driver for the GPIO expander expects to be a children of the "firmware" node. diff --git a/target/linux/brcm2708/patches-4.19/950-0217-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch b/target/linux/brcm2708/patches-4.19/950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0217-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch rename to target/linux/brcm2708/patches-4.19/950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch index 4f7f451c45..63f3911434 100644 --- a/target/linux/brcm2708/patches-4.19/950-0217-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch +++ b/target/linux/brcm2708/patches-4.19/950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch @@ -1,7 +1,7 @@ From eb6864f9dc059e86d057822b493feb8b4a9684ba Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Nov 2018 16:33:31 +0000 -Subject: [PATCH 217/806] ARM: dts: bcm283x: The lan7515 PHY node has moved +Subject: [PATCH] ARM: dts: bcm283x: The lan7515 PHY node has moved The DT node describing the LAN7800s PHY has now moved inside an "mdio" node. Update the DT declarations accordingly. diff --git a/target/linux/brcm2708/patches-4.19/950-0218-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/target/linux/brcm2708/patches-4.19/950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0218-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch rename to target/linux/brcm2708/patches-4.19/950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch index ab6c83db8c..c67acaa50d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0218-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch +++ b/target/linux/brcm2708/patches-4.19/950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch @@ -1,7 +1,7 @@ From a3c59bad71de2b3c09a25fd6ce5e3632c33c4bba Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 26 Nov 2018 19:46:58 +0000 -Subject: [PATCH 218/806] net: lan78xx: Support auto-downshift to 100Mb/s +Subject: [PATCH] net: lan78xx: Support auto-downshift to 100Mb/s Ethernet cables with faulty or missing pairs (specifically pairs C and D) allow auto-negotiation to 1000Mbs, but do not support the successful diff --git a/target/linux/brcm2708/patches-4.19/950-0219-dt-bindings-Document-microchip-downshift-after.patch b/target/linux/brcm2708/patches-4.19/950-0199-dt-bindings-Document-microchip-downshift-after.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0219-dt-bindings-Document-microchip-downshift-after.patch rename to target/linux/brcm2708/patches-4.19/950-0199-dt-bindings-Document-microchip-downshift-after.patch index 2096f389db..f9c1daa212 100644 --- a/target/linux/brcm2708/patches-4.19/950-0219-dt-bindings-Document-microchip-downshift-after.patch +++ b/target/linux/brcm2708/patches-4.19/950-0199-dt-bindings-Document-microchip-downshift-after.patch @@ -1,7 +1,7 @@ From 1654bdce95bd9a99e237b75fdcc0081b232c46b5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 28 Nov 2018 15:51:41 +0000 -Subject: [PATCH 219/806] dt-bindings: Document microchip,downshift-after +Subject: [PATCH] dt-bindings: Document microchip,downshift-after Document the optional downshift-after property of the lan78xx's PHY. diff --git a/target/linux/brcm2708/patches-4.19/950-0220-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch b/target/linux/brcm2708/patches-4.19/950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0220-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch rename to target/linux/brcm2708/patches-4.19/950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch index c5d7d6cd93..b0613d2ade 100644 --- a/target/linux/brcm2708/patches-4.19/950-0220-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch +++ b/target/linux/brcm2708/patches-4.19/950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch @@ -1,7 +1,7 @@ From 036c72ed4475afb757af568d40db0973a5dafcc8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Nov 2018 16:55:14 +0000 -Subject: [PATCH 220/806] ARM: dts: bcm283x: Set downshift-after for Pi 3B+ +Subject: [PATCH] ARM: dts: bcm283x: Set downshift-after for Pi 3B+ Enable the auto-downshift feature on Raspberry Pi 3B+ so that a link can eventually be established using a cable with pairs C and/or D diff --git a/target/linux/brcm2708/patches-4.19/950-0221-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch b/target/linux/brcm2708/patches-4.19/950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0221-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch rename to target/linux/brcm2708/patches-4.19/950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch index b4b2d28ce9..340f60dd88 100644 --- a/target/linux/brcm2708/patches-4.19/950-0221-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch +++ b/target/linux/brcm2708/patches-4.19/950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch @@ -1,7 +1,7 @@ From 18867d71460b80385146e8d91a23cfb1729858f8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 27 Nov 2018 16:56:50 +0000 -Subject: [PATCH 221/806] BCM270X_DT: Add new Ethernet DT parameters +Subject: [PATCH] BCM270X_DT: Add new Ethernet DT parameters Add "eth_downshift_after" DT parameter to allow the delay before the downshift to be specified. The default is 2 auto-negotiation cycles, diff --git a/target/linux/brcm2708/patches-4.19/950-0222-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch b/target/linux/brcm2708/patches-4.19/950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0222-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch rename to target/linux/brcm2708/patches-4.19/950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch index 2489597359..8faa68c19e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0222-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch +++ b/target/linux/brcm2708/patches-4.19/950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch @@ -1,7 +1,7 @@ From 3cc51f4d633b33f732a52d1ec2b041a28b55c7d5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 29 Nov 2018 16:00:22 +0000 -Subject: [PATCH 222/806] BCM270X_DT: Mark eth_downshift_after as an integer +Subject: [PATCH] BCM270X_DT: Mark eth_downshift_after as an integer Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0223-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch b/target/linux/brcm2708/patches-4.19/950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0223-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch rename to target/linux/brcm2708/patches-4.19/950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch index 56230e14ed..51c7732beb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0223-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch +++ b/target/linux/brcm2708/patches-4.19/950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch @@ -1,7 +1,7 @@ From f36b3119d83e03c9d0c684b8712b66a979c48124 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 16 Jul 2018 14:40:13 +0100 -Subject: [PATCH 223/806] dwc-otg: FIQ: Fix "bad mode in data abort handler" +Subject: [PATCH] dwc-otg: FIQ: Fix "bad mode in data abort handler" Create a semi-static mapping for the USB registers early in the boot process, before additional kernel threads are started, so all threads diff --git a/target/linux/brcm2708/patches-4.19/950-0224-lirc-rpi-Remove-in-favour-of-gpio-ir.patch b/target/linux/brcm2708/patches-4.19/950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0224-lirc-rpi-Remove-in-favour-of-gpio-ir.patch rename to target/linux/brcm2708/patches-4.19/950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch index 75a6d004ae..0c6e627993 100644 --- a/target/linux/brcm2708/patches-4.19/950-0224-lirc-rpi-Remove-in-favour-of-gpio-ir.patch +++ b/target/linux/brcm2708/patches-4.19/950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch @@ -1,7 +1,7 @@ From 28b591dadb504861cdc535d5705aa4c8c3d3420f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 Nov 2018 18:55:23 +0000 -Subject: [PATCH 224/806] lirc-rpi: Remove in favour of gpio-ir +Subject: [PATCH] lirc-rpi: Remove in favour of gpio-ir --- arch/arm/boot/dts/overlays/Makefile | 1 - diff --git a/target/linux/brcm2708/patches-4.19/950-0225-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch b/target/linux/brcm2708/patches-4.19/950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0225-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch rename to target/linux/brcm2708/patches-4.19/950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch index f5c9827151..8d9848a7e6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0225-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch @@ -1,7 +1,7 @@ From f1ab5c7dc1328f0baad2a437a80c792f725c455f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 22 Nov 2018 17:28:02 +0000 -Subject: [PATCH 225/806] media: bcm2835-unicam: Pass through the colorspace on +Subject: [PATCH] media: bcm2835-unicam: Pass through the colorspace on try_fmt The current colorspace was always returned from try_fmt for no diff --git a/target/linux/brcm2708/patches-4.19/950-0226-media-tc358743-Return-an-appropriate-colorspace-from.patch b/target/linux/brcm2708/patches-4.19/950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0226-media-tc358743-Return-an-appropriate-colorspace-from.patch rename to target/linux/brcm2708/patches-4.19/950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch index f193d79f67..28ee4e7f44 100644 --- a/target/linux/brcm2708/patches-4.19/950-0226-media-tc358743-Return-an-appropriate-colorspace-from.patch +++ b/target/linux/brcm2708/patches-4.19/950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch @@ -1,7 +1,7 @@ From c7a3697a4d4c2199f05ab3cd321138d464ca62db Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 22 Nov 2018 17:31:06 +0000 -Subject: [PATCH 226/806] media: tc358743: Return an appropriate colorspace +Subject: [PATCH] media: tc358743: Return an appropriate colorspace from tc358743_set_fmt When calling tc358743_set_fmt, the code was calling tc358743_get_fmt diff --git a/target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-fix-module-autoloading.patch b/target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-fix-module-autoloading.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-fix-module-autoloading.patch rename to target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-fix-module-autoloading.patch index 85dd3fede3..161949da18 100644 --- a/target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-fix-module-autoloading.patch +++ b/target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-fix-module-autoloading.patch @@ -1,7 +1,7 @@ From 8b6e9f2a951b38becf5b8a1e99ba1993f7751aac Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 20 Oct 2018 19:26:18 +0200 -Subject: [PATCH 227/806] staging: bcm2835-camera: fix module autoloading +Subject: [PATCH] staging: bcm2835-camera: fix module autoloading In order to make the module bcm2835-camera load automatically, we need to add a module alias. diff --git a/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Move-module-info-to-the-end.patch b/target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Move-module-info-to-the-end.patch rename to target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch index b4d1969ed9..19c59f6077 100644 --- a/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Move-module-info-to-the-end.patch +++ b/target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch @@ -1,7 +1,7 @@ From 3e8dfb23cfab3003ff83f4d32568ae4e38536572 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 20 Oct 2018 19:31:00 +0200 -Subject: [PATCH 228/806] staging: bcm2835-camera: Move module info to the end +Subject: [PATCH] staging: bcm2835-camera: Move module info to the end In order to have this more consistent between the vc04 services move the module information to the end of the file. diff --git a/target/linux/brcm2708/patches-4.19/950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch b/target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch rename to target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch index 69bd520461..b32699d09f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch +++ b/target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch @@ -1,7 +1,7 @@ From 1ada615db1b97faec9c4625ccfd2cc35d54d850a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 20:51:23 +0200 -Subject: [PATCH 229/806] staging: vchiq_arm: Fix platform device +Subject: [PATCH] staging: vchiq_arm: Fix platform device unregistration In error case platform_device_register_data would return an ERR_PTR diff --git a/target/linux/brcm2708/patches-4.19/950-0230-staging-vchiq_arm-Fix-camera-device-registration.patch b/target/linux/brcm2708/patches-4.19/950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0230-staging-vchiq_arm-Fix-camera-device-registration.patch rename to target/linux/brcm2708/patches-4.19/950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch index cb7edc4b11..9cf02e9ab9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0230-staging-vchiq_arm-Fix-camera-device-registration.patch +++ b/target/linux/brcm2708/patches-4.19/950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch @@ -1,7 +1,7 @@ From 58ed78a70c3c3ef1ae99aefdd2c28ac81f66df85 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 22 Oct 2018 15:16:51 +0200 -Subject: [PATCH 230/806] staging: vchiq_arm: Fix camera device registration +Subject: [PATCH] staging: vchiq_arm: Fix camera device registration Since the camera driver isn't probed via DT, we need to properly setup DMA. diff --git a/target/linux/brcm2708/patches-4.19/950-0231-staging-vchiq_arm-Register-a-platform-device-for-the.patch b/target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0231-staging-vchiq_arm-Register-a-platform-device-for-the.patch rename to target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch index 511dee0b59..793fc21396 100644 --- a/target/linux/brcm2708/patches-4.19/950-0231-staging-vchiq_arm-Register-a-platform-device-for-the.patch +++ b/target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch @@ -1,7 +1,7 @@ From 0ca486925a32b7c95752ff250afdd59bcf6c8574 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 20 Oct 2018 20:25:41 +0200 -Subject: [PATCH 231/806] staging: vchiq_arm: Register a platform device for +Subject: [PATCH] staging: vchiq_arm: Register a platform device for the audio driver Signed-off-by: Stefan Wahren diff --git a/target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-audio-Enable-compile-test.patch b/target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-audio-Enable-compile-test.patch rename to target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch index c85e6bbe12..3c6bfd4db2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-audio-Enable-compile-test.patch +++ b/target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch @@ -1,7 +1,7 @@ From d08cc93a489df7707afaaa693afd2e7a153c85a3 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 13 Oct 2018 20:19:13 +0200 -Subject: [PATCH 232/806] staging: bcm2835-audio: Enable compile test +Subject: [PATCH] staging: bcm2835-audio: Enable compile test Enable the compilation test for bcm2835-audio. diff --git a/target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-audio-use-module_platform_driver-mac.patch b/target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-audio-use-module_platform_driver-mac.patch rename to target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch index 5920a012dc..a9f077675c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-audio-use-module_platform_driver-mac.patch +++ b/target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch @@ -1,7 +1,7 @@ From f1aada1b4c974fa756e299c15b62c76e478e652e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 18 Oct 2018 19:47:29 +0200 -Subject: [PATCH 233/806] staging: bcm2835-audio: use module_platform_driver() +Subject: [PATCH] staging: bcm2835-audio: use module_platform_driver() macro There is not much value behind this boilerplate, so use diff --git a/target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-audio-Drop-DT-dependency.patch rename to target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch index 62b4282efe..62b2c88875 100644 --- a/target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-audio-Drop-DT-dependency.patch +++ b/target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch @@ -1,7 +1,7 @@ From ba833c9b912d2ca6fe23d700c4bd6f61742d5e04 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 18 Oct 2018 19:54:01 +0200 -Subject: [PATCH 234/806] staging: bcm2835-audio: Drop DT dependency +Subject: [PATCH] staging: bcm2835-audio: Drop DT dependency Just like the bcm2835-video make this a platform driver which is probed by vchiq. In order to change the number of channels use a module diff --git a/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch b/target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch rename to target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch index 678dcc52fd..a568366855 100644 --- a/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch +++ b/target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch @@ -1,7 +1,7 @@ From 94a174095f29c77574548eea17aacaed5c540757 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 21 Oct 2018 18:40:07 +0200 -Subject: [PATCH 235/806] staging: bcm2835-camera: Provide more specific probe +Subject: [PATCH] staging: bcm2835-camera: Provide more specific probe error messages Currently there is only a catch-all info message which print the diff --git a/target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Add-hint-about-possible-fault.patch b/target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Add-hint-about-possible-fault.patch rename to target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch index 939fe99a0d..38409de017 100644 --- a/target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Add-hint-about-possible-fault.patch +++ b/target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch @@ -1,7 +1,7 @@ From 17eaf7c6e8dfcd76b4ed28587b07892e2a5a4ff5 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 21 Oct 2018 19:08:29 +0200 -Subject: [PATCH 236/806] staging: bcm2835-camera: Add hint about possible +Subject: [PATCH] staging: bcm2835-camera: Add hint about possible faulty GPU mem config As per default the GPU memory config of the Raspberry Pi isn't sufficient diff --git a/target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch b/target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch rename to target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch index bd313cc9ff..96236f36d5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch +++ b/target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch @@ -1,7 +1,7 @@ From b0ebcf556b543b0b509ad071584ca6b41076a2da Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 22 Oct 2018 11:09:18 +0200 -Subject: [PATCH 237/806] staging: bcm2835: Don't probe if no camera is +Subject: [PATCH] staging: bcm2835: Don't probe if no camera is detected It is a waste of resources to load the camera driver in case there isn't diff --git a/target/linux/brcm2708/patches-4.19/950-0238-staging-vchiq_arm-Improve-error-handling-on-loading-.patch b/target/linux/brcm2708/patches-4.19/950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0238-staging-vchiq_arm-Improve-error-handling-on-loading-.patch rename to target/linux/brcm2708/patches-4.19/950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch index 574e550bf2..81328b2cdc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0238-staging-vchiq_arm-Improve-error-handling-on-loading-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch @@ -1,7 +1,7 @@ From 73979b06255c3b7b536a53d09ea095aec8ed37aa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 3 Dec 2018 12:50:38 +0000 -Subject: [PATCH 238/806] staging: vchiq_arm: Improve error handling on loading +Subject: [PATCH] staging: vchiq_arm: Improve error handling on loading drivers The handling of loading platform drivers requires checking IS_ERR diff --git a/target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch b/target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch rename to target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch index 9bc9da01f9..9d2ae1bb3a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch +++ b/target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch @@ -1,7 +1,7 @@ From 522f1499310d389e663a4e8dd0ccbb916b768766 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 14 Feb 2018 17:04:26 +0000 -Subject: [PATCH 239/806] staging: bcm2835-camera: Do not bulk receive from +Subject: [PATCH] staging: bcm2835-camera: Do not bulk receive from service thread vchi_bulk_queue_receive will queue up to a default of 4 diff --git a/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch b/target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch rename to target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch index b70a20e8ff..12afc4a1f8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch @@ -1,7 +1,7 @@ From bf5bbfec3cb99c469eb59f2b19411146c47feb73 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 14:21:04 +0000 -Subject: [PATCH 240/806] staging: bcm2835-camera: Ensure H264 header bytes get +Subject: [PATCH] staging: bcm2835-camera: Ensure H264 header bytes get a sensible timestamp H264 header come from VC with 0 timestamps, which means they get a diff --git a/target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch b/target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch rename to target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch index 4342338c2c..96116cb8d5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch +++ b/target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch @@ -1,7 +1,7 @@ From 6c70a89ac19b1ead96be68002affcd1821014d52 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 13 Feb 2017 13:11:41 +0000 -Subject: [PATCH 241/806] staging: bcm2835-camera: Correctly denote key frames +Subject: [PATCH] staging: bcm2835-camera: Correctly denote key frames in encoded data Forward MMAL key frame flags to the V4L2 buffers. diff --git a/target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Return-early-on-errors.patch b/target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Return-early-on-errors.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Return-early-on-errors.patch rename to target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Return-early-on-errors.patch index 2fd821b2cc..616cacefa2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Return-early-on-errors.patch +++ b/target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Return-early-on-errors.patch @@ -1,7 +1,7 @@ From 3cb19cb6b4d6dc86582abef6200c0fc663ae3f2a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 Mar 2017 17:27:56 +0000 -Subject: [PATCH 242/806] staging: bcm2835-camera: Return early on errors +Subject: [PATCH] staging: bcm2835-camera: Return early on errors Fix several instances where it is easier to return early on error conditions than handle it as an else diff --git a/target/linux/brcm2708/patches-4.19/950-0243-staging-bcm2835-camera-Remove-dead-email-addresses.patch b/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0243-staging-bcm2835-camera-Remove-dead-email-addresses.patch rename to target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch index da9f4b33db..2041ebbd72 100644 --- a/target/linux/brcm2708/patches-4.19/950-0243-staging-bcm2835-camera-Remove-dead-email-addresses.patch +++ b/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch @@ -1,7 +1,7 @@ From b1d4e377b4a8c73396d50c45106f3d3a710b11f5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 Mar 2017 17:35:38 +0000 -Subject: [PATCH 243/806] staging: bcm2835-camera: Remove dead email addresses +Subject: [PATCH] staging: bcm2835-camera: Remove dead email addresses None of the listed author email addresses were valid. Keep list of authors and the companies they represented. diff --git a/target/linux/brcm2708/patches-4.19/950-0244-staging-bcm2835-camera-Fix-comment-style-violations.patch b/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0244-staging-bcm2835-camera-Fix-comment-style-violations.patch rename to target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch index 023871ca64..4788eebc68 100644 --- a/target/linux/brcm2708/patches-4.19/950-0244-staging-bcm2835-camera-Fix-comment-style-violations.patch +++ b/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch @@ -1,7 +1,7 @@ From 4fb0df1b29feafacc244ca512b152dd3b96c224c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 13:49:32 +0000 -Subject: [PATCH 244/806] staging: bcm2835-camera: Fix comment style +Subject: [PATCH] staging: bcm2835-camera: Fix comment style violations. Fix comment style violations in the header files. diff --git a/target/linux/brcm2708/patches-4.19/950-0245-staging-bcm2835-camera-Fix-spacing-around-operators.patch b/target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0245-staging-bcm2835-camera-Fix-spacing-around-operators.patch rename to target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch index 0fb8fc34fb..38bcbbd2d9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0245-staging-bcm2835-camera-Fix-spacing-around-operators.patch +++ b/target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch @@ -1,7 +1,7 @@ From 54fde7601287891754bef85efbbc9b5648d043f4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 14:13:03 +0000 -Subject: [PATCH 245/806] staging: bcm2835-camera: Fix spacing around operators +Subject: [PATCH] staging: bcm2835-camera: Fix spacing around operators Fix checkpatch warnings over spaces around operators. Many were around operations that can be replaced with the diff --git a/target/linux/brcm2708/patches-4.19/950-0246-staging-bcm2835-camera-Reduce-length-of-enum-names.patch b/target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0246-staging-bcm2835-camera-Reduce-length-of-enum-names.patch rename to target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch index f6fa4ae3d6..e6d5875341 100644 --- a/target/linux/brcm2708/patches-4.19/950-0246-staging-bcm2835-camera-Reduce-length-of-enum-names.patch +++ b/target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch @@ -1,7 +1,7 @@ From 75aca02c1449e3a97ec32de9974ad410f5d34463 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:23:35 +0000 -Subject: [PATCH 246/806] staging: bcm2835-camera: Reduce length of enum names +Subject: [PATCH] staging: bcm2835-camera: Reduce length of enum names We have numerous lines over 80 chars, or oddly split. Many of these are due to using long enum names such as diff --git a/target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch b/target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch rename to target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch index dd0e05029d..7797510096 100644 --- a/target/linux/brcm2708/patches-4.19/950-0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch +++ b/target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch @@ -1,7 +1,7 @@ From 2730c4538b6edbe1e9d4071a8a64aa62f655eeaa Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:28:07 +0000 -Subject: [PATCH 247/806] staging: bcm2835-camera: Fix multiple line +Subject: [PATCH] staging: bcm2835-camera: Fix multiple line dereference errors Fix checkpatch errors "Avoid multiple line dereference" diff --git a/target/linux/brcm2708/patches-4.19/950-0248-staging-bcm2835-camera-Fix-brace-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0248-staging-bcm2835-camera-Fix-brace-style-issues.patch rename to target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch index 93a1041394..6aa8e93118 100644 --- a/target/linux/brcm2708/patches-4.19/950-0248-staging-bcm2835-camera-Fix-brace-style-issues.patch +++ b/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch @@ -1,7 +1,7 @@ From a023ee926b7e923058203e82edc5405c1e82842c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:37:11 +0000 -Subject: [PATCH 248/806] staging: bcm2835-camera: Fix brace style issues. +Subject: [PATCH] staging: bcm2835-camera: Fix brace style issues. Fix mismatched or missing brace issues flagged by checkpatch. diff --git a/target/linux/brcm2708/patches-4.19/950-0249-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch b/target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0249-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch rename to target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch index 6cef86b4d4..2780112b39 100644 --- a/target/linux/brcm2708/patches-4.19/950-0249-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch +++ b/target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch @@ -1,7 +1,7 @@ From 6974c0c97b821c30af9f6f4ff9b4b6989cb5a573 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:39:26 +0000 -Subject: [PATCH 249/806] staging: bcm2835-camera: Fix missing lines between +Subject: [PATCH] staging: bcm2835-camera: Fix missing lines between items Fix checkpatch errors for missing blank lines after variable diff --git a/target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch b/target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch rename to target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch index 88770c555c..8d6b7a931b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch +++ b/target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch @@ -1,7 +1,7 @@ From 5056b62708ac730f36114e1d792d0cc878b43561 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:48:54 +0000 -Subject: [PATCH 250/806] staging: bcm2835-camera: Fix logical continuation +Subject: [PATCH] staging: bcm2835-camera: Fix logical continuation splits Fix checkpatch errors for "Logical continuations should be diff --git a/target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch b/target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch rename to target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch index 2cbf11064d..85c7f1ea3b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch +++ b/target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch @@ -1,7 +1,7 @@ From 4ed895c5c9f55f565d5ecc19e799e109673db44f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 21 Feb 2018 15:53:59 +0000 -Subject: [PATCH 251/806] staging: bcm2835-camera: Fix open parenthesis +Subject: [PATCH] staging: bcm2835-camera: Fix open parenthesis alignment Fix checkpatch "Alignment should match open parenthesis" diff --git a/target/linux/brcm2708/patches-4.19/950-0252-staging-bcm2835-camera-Set-sequence-number-correctly.patch b/target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0252-staging-bcm2835-camera-Set-sequence-number-correctly.patch rename to target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch index 7bffc3cd65..dbfa67cfe6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0252-staging-bcm2835-camera-Set-sequence-number-correctly.patch +++ b/target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch @@ -1,7 +1,7 @@ From ba37d62e7bbdf42c2fa9ac3655354992da199a4b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 21 Jun 2018 17:02:14 +0100 -Subject: [PATCH 252/806] staging: bcm2835-camera: Set sequence number +Subject: [PATCH] staging: bcm2835-camera: Set sequence number correctly Set the sequence number in vb2_v4l2_buffer mainly so the diff --git a/target/linux/brcm2708/patches-4.19/950-0253-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch b/target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0253-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch rename to target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch index 90433b732d..802ff8b33f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0253-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch +++ b/target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch @@ -1,7 +1,7 @@ From 0d0b7a58ab065f72ffa55fbc7ab5436628694919 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 24 Jul 2018 12:08:29 +0100 -Subject: [PATCH 253/806] staging: bcm2835-camera: Ensure timestamps never go +Subject: [PATCH] staging: bcm2835-camera: Ensure timestamps never go backwards. There is an awkward situation with H264 header bytes. Currently diff --git a/target/linux/brcm2708/patches-4.19/950-0254-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch b/target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0254-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch rename to target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch index 1a83c3d128..11e6f1fb1a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0254-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch +++ b/target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch @@ -1,7 +1,7 @@ From f658f48d662c5ecd84af235f47cc48636b9a55e2 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Thu, 27 Sep 2018 17:50:39 -0700 -Subject: [PATCH 254/806] staging: bcm2835-camera: Avoid unneeded internal +Subject: [PATCH] staging: bcm2835-camera: Avoid unneeded internal declaration warning Clang warns: diff --git a/target/linux/brcm2708/patches-4.19/950-0255-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch b/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0255-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch rename to target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch index 7af89b14ca..0feb273566 100644 --- a/target/linux/brcm2708/patches-4.19/950-0255-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch +++ b/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch @@ -1,7 +1,7 @@ From c37e8c9137e4858ed86e211f3fddbb9d9af08532 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:21:06 +0100 -Subject: [PATCH 255/806] staging: bcm2835-camera: Add multiple inclusion +Subject: [PATCH] staging: bcm2835-camera: Add multiple inclusion protection to headers mmal-common.h and mmal-msg.h didn't have the normal diff --git a/target/linux/brcm2708/patches-4.19/950-0256-staging-bcm2835-camera-Unify-header-inclusion-define.patch b/target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0256-staging-bcm2835-camera-Unify-header-inclusion-define.patch rename to target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch index a218295683..56d62f5d4f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0256-staging-bcm2835-camera-Unify-header-inclusion-define.patch +++ b/target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch @@ -1,7 +1,7 @@ From 925b969a16a2e3503803c47a87f093f88d1b2060 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 3 Dec 2018 13:15:20 +0000 -Subject: [PATCH 256/806] staging: bcm2835-camera: Unify header inclusion +Subject: [PATCH] staging: bcm2835-camera: Unify header inclusion defines Most of the headers use ifndef FOO_H, whilst mmal-parameters.h diff --git a/target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-alignment-should-match-op.patch b/target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-alignment-should-match-op.patch rename to target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch index 4409708982..53fb95d793 100644 --- a/target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-alignment-should-match-op.patch +++ b/target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch @@ -1,7 +1,7 @@ From 11129d36669a3efee5dd0d49f969f11c42764f9d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 15:55:42 +0000 -Subject: [PATCH 258/806] staging: bcm2835-camera: Fix alignment should match +Subject: [PATCH] staging: bcm2835-camera: Fix alignment should match open parenthesis Fix up checkpatch "Alignment should match open parenthesis" errors diff --git a/target/linux/brcm2708/patches-4.19/950-0259-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch b/target/linux/brcm2708/patches-4.19/950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0259-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch rename to target/linux/brcm2708/patches-4.19/950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch index c9f9e043a3..34bbe82a5d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0259-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch +++ b/target/linux/brcm2708/patches-4.19/950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch @@ -1,7 +1,7 @@ From d1f9d21346c642fadb2676077b050106afaf7579 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 15:58:14 +0000 -Subject: [PATCH 259/806] staging: bcm2835-camera: Fix multiple assignments +Subject: [PATCH] staging: bcm2835-camera: Fix multiple assignments should be avoided Clear checkpatch complaints of "multiple assignments should be avoided" diff --git a/target/linux/brcm2708/patches-4.19/950-0260-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch b/target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0260-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch rename to target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch index c497890344..254664b0b7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0260-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch +++ b/target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch @@ -1,7 +1,7 @@ From be10ef41af683e175521f80b49b99d7ddeac2f2c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 16:08:41 +0000 -Subject: [PATCH 260/806] staging: bcm2835-camera: Fix up all formatting in +Subject: [PATCH] staging: bcm2835-camera: Fix up all formatting in mmal-paramters.h Fixes up all checkpatch errors in mmal-parameters.h diff --git a/target/linux/brcm2708/patches-4.19/950-0261-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch b/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0261-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch rename to target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch index ca4f0470bb..2d3b5408a5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0261-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch +++ b/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch @@ -1,7 +1,7 @@ From 316725374b7c221f5d43b31ee9cbe738d3df4709 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 28 Sep 2018 10:17:11 +0100 -Subject: [PATCH 261/806] staging: bcm2835-camera: Use enums for max value in +Subject: [PATCH] staging: bcm2835-camera: Use enums for max value in controls Controls of type MMAL_CONTROL_TYPE_STD_MENU call v4l2_ctrl_new_std_menu diff --git a/target/linux/brcm2708/patches-4.19/950-0262-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch b/target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0262-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch rename to target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch index 21cbfca0a4..02723056cf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0262-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch +++ b/target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch @@ -1,7 +1,7 @@ From f07147faddeb0e99bfe181af78fcda9ea7f06c3d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 8 Oct 2018 18:26:15 +0100 -Subject: [PATCH 262/806] staging: bcm2835-camera: Correct +Subject: [PATCH] staging: bcm2835-camera: Correct V4L2_CID_COLORFX_CBCR behaviour With V4L2_CID_COLORFX_CBCR calling ctrl_set_colfx it was incorrectly diff --git a/target/linux/brcm2708/patches-4.19/950-0263-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch b/target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0263-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch rename to target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch index 7645cffac0..920249e6b4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0263-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch +++ b/target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch @@ -1,7 +1,7 @@ From 37ede4f6a1771b09dea6e8b2fc4d2c5f085a33f3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 28 Sep 2018 10:22:26 +0100 -Subject: [PATCH 263/806] staging: bcm2835-camera: Remove/amend some obsolete +Subject: [PATCH] staging: bcm2835-camera: Remove/amend some obsolete comments Remove a todo which has been done. diff --git a/target/linux/brcm2708/patches-4.19/950-0264-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch b/target/linux/brcm2708/patches-4.19/950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0264-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch rename to target/linux/brcm2708/patches-4.19/950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch index bbf5d36c2f..1cd23da288 100644 --- a/target/linux/brcm2708/patches-4.19/950-0264-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch +++ b/target/linux/brcm2708/patches-4.19/950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch @@ -1,7 +1,7 @@ From e7723c6bcf31a440b8762e9e22497ff3fbbb7056 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:30:37 +0100 -Subject: [PATCH 264/806] staging: vc04_services: Split vchiq-mmal into a +Subject: [PATCH] staging: vc04_services: Split vchiq-mmal into a module In preparation for adding a video codec V4L2 module which also diff --git a/target/linux/brcm2708/patches-4.19/950-0265-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch b/target/linux/brcm2708/patches-4.19/950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0265-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch rename to target/linux/brcm2708/patches-4.19/950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch index ce0b682849..7e4100f96a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0265-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch +++ b/target/linux/brcm2708/patches-4.19/950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch @@ -1,7 +1,7 @@ From f94642597f63c71b2ccffddd4f447190c131af56 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:51:13 +0100 -Subject: [PATCH 265/806] staging: mmal-vchiq: Allocate and free components as +Subject: [PATCH] staging: mmal-vchiq: Allocate and free components as required The existing code assumed that there would only ever be 4 components, diff --git a/target/linux/brcm2708/patches-4.19/950-0266-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch b/target/linux/brcm2708/patches-4.19/950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0266-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch rename to target/linux/brcm2708/patches-4.19/950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch index 6d2f7fd560..401b8bfa09 100644 --- a/target/linux/brcm2708/patches-4.19/950-0266-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch +++ b/target/linux/brcm2708/patches-4.19/950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch @@ -1,7 +1,7 @@ From 3789c3b08b56f471878c493fd80a2eee776b527c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 16:20:46 +0000 -Subject: [PATCH 266/806] staging: mmal-vchiq: Avoid use of bool in structures +Subject: [PATCH] staging: mmal-vchiq: Avoid use of bool in structures Fixes up a checkpatch error "Avoid using bool structure members because of possible alignment issues". diff --git a/target/linux/brcm2708/patches-4.19/950-0267-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0267-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch rename to target/linux/brcm2708/patches-4.19/950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch index b9d1699c72..dd6554142d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0267-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch +++ b/target/linux/brcm2708/patches-4.19/950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch @@ -1,7 +1,7 @@ From 301a6a16ec8a8b1a7b89c0cc6df30e79a460214a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 16:57:09 +0100 -Subject: [PATCH 267/806] staging: mmal-vchiq: Make timeout a defined parameter +Subject: [PATCH] staging: mmal-vchiq: Make timeout a defined parameter The timeout period for VPU communications is a useful thing to extend when debugging. diff --git a/target/linux/brcm2708/patches-4.19/950-0268-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch b/target/linux/brcm2708/patches-4.19/950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0268-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch rename to target/linux/brcm2708/patches-4.19/950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch index b3c8c2ad0e..468f036982 100644 --- a/target/linux/brcm2708/patches-4.19/950-0268-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch @@ -1,7 +1,7 @@ From 862ee4fbd8c6b984f920b88908e33951e51134ca Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 17:33:37 +0100 -Subject: [PATCH 268/806] staging: mmal-vchiq: Make a mmal_buf struct for +Subject: [PATCH] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters The callback from vchi_mmal to the client was growing lots of extra diff --git a/target/linux/brcm2708/patches-4.19/950-0269-staging-mmal-vchiq-Add-support-for-event-callbacks.patch b/target/linux/brcm2708/patches-4.19/950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0269-staging-mmal-vchiq-Add-support-for-event-callbacks.patch rename to target/linux/brcm2708/patches-4.19/950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch index 00b85e4388..b79bdb8412 100644 --- a/target/linux/brcm2708/patches-4.19/950-0269-staging-mmal-vchiq-Add-support-for-event-callbacks.patch +++ b/target/linux/brcm2708/patches-4.19/950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch @@ -1,7 +1,7 @@ From adab474d1f91594d6d96d44054586ba36d7f26d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:15:38 +0100 -Subject: [PATCH 269/806] staging: mmal-vchiq: Add support for event callbacks. +Subject: [PATCH] staging: mmal-vchiq: Add support for event callbacks. (Preparation for the codec driver). The codec uses the event mechanism to report things such as diff --git a/target/linux/brcm2708/patches-4.19/950-0270-staging-vc04_services-Support-sending-data-to-MMAL-p.patch b/target/linux/brcm2708/patches-4.19/950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0270-staging-vc04_services-Support-sending-data-to-MMAL-p.patch rename to target/linux/brcm2708/patches-4.19/950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch index b414b32285..9688bc868a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0270-staging-vc04_services-Support-sending-data-to-MMAL-p.patch +++ b/target/linux/brcm2708/patches-4.19/950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch @@ -1,7 +1,7 @@ From 483bef9dcddc4bcb9f4e250d91b31361a919b7ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Sep 2018 18:26:02 +0100 -Subject: [PATCH 270/806] staging: vc04_services: Support sending data to MMAL +Subject: [PATCH] staging: vc04_services: Support sending data to MMAL ports Add the ability to send data to ports. This only supports diff --git a/target/linux/brcm2708/patches-4.19/950-0271-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch b/target/linux/brcm2708/patches-4.19/950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0271-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch rename to target/linux/brcm2708/patches-4.19/950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch index 31301e4ad3..6c54743645 100644 --- a/target/linux/brcm2708/patches-4.19/950-0271-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch +++ b/target/linux/brcm2708/patches-4.19/950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch @@ -1,7 +1,7 @@ From 2a5a03926a8c6ae7375355de00814234e4e303ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:57:40 +0100 -Subject: [PATCH 271/806] staging: vc04_services: Fixup vchiq-mmal include +Subject: [PATCH] staging: vc04_services: Fixup vchiq-mmal include ordering There were dependencies on including the headers in the correct diff --git a/target/linux/brcm2708/patches-4.19/950-0272-staging-vc04_services-Add-new-vc-sm-cma-driver.patch b/target/linux/brcm2708/patches-4.19/950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0272-staging-vc04_services-Add-new-vc-sm-cma-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch index 749fb9714b..9e9af47a37 100644 --- a/target/linux/brcm2708/patches-4.19/950-0272-staging-vc04_services-Add-new-vc-sm-cma-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch @@ -1,7 +1,7 @@ From 2994fdc0a9d48be68d6e403bc8ddadecfc8d8796 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 10:27:11 +0100 -Subject: [PATCH 272/806] staging: vc04_services: Add new vc-sm-cma driver +Subject: [PATCH] staging: vc04_services: Add new vc-sm-cma driver This new driver allows contiguous memory blocks to be imported into the VideoCore VPU memory map, and manages the lifetime of diff --git a/target/linux/brcm2708/patches-4.19/950-0273-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch b/target/linux/brcm2708/patches-4.19/950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0273-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch rename to target/linux/brcm2708/patches-4.19/950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch index 7356e611f5..4f16e0bfda 100644 --- a/target/linux/brcm2708/patches-4.19/950-0273-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch @@ -1,7 +1,7 @@ From 9eb40722f3ef0d338ed97667a7391f3d74812332 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 30 Oct 2018 11:42:48 +0000 -Subject: [PATCH 273/806] staging: vc-sm-cma: Fixup driver for older VCHI APIs +Subject: [PATCH] staging: vc-sm-cma: Fixup driver for older VCHI APIs Original patch was based off staging which included some cleanups of the VCHI APIs. Those aren't present here, so switch back to diff --git a/target/linux/brcm2708/patches-4.19/950-0274-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch b/target/linux/brcm2708/patches-4.19/950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0274-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch rename to target/linux/brcm2708/patches-4.19/950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch index 22ca1de657..8c69f65cc2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0274-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch @@ -1,7 +1,7 @@ From bcb0dccc1f02ed3dd01834ca0e35c4043df8988e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 16:07:55 +0100 -Subject: [PATCH 274/806] staging: vc04_services: Use vc-sm-cma to support zero +Subject: [PATCH] staging: vc04_services: Use vc-sm-cma to support zero copy With the vc-sm-cma driver we can support zero copy of buffers between diff --git a/target/linux/brcm2708/patches-4.19/950-0275-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/brcm2708/patches-4.19/950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0275-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch rename to target/linux/brcm2708/patches-4.19/950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch index 5ef425ca9c..fbaa3c2d40 100644 --- a/target/linux/brcm2708/patches-4.19/950-0275-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch +++ b/target/linux/brcm2708/patches-4.19/950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch @@ -1,7 +1,7 @@ From 0b2a62596d0e6efe17bb87a3a5ebd91cee60c64b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Oct 2018 17:57:45 +0000 -Subject: [PATCH 275/806] media: videobuf2: Allow exporting of a struct dmabuf +Subject: [PATCH] media: videobuf2: Allow exporting of a struct dmabuf videobuf2 only allowed exporting a dmabuf as a file descriptor, but there are instances where having the struct dma_buf is diff --git a/target/linux/brcm2708/patches-4.19/950-0276-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch b/target/linux/brcm2708/patches-4.19/950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0276-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch index 192e7d9db6..0a6552b7fd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0276-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch @@ -1,7 +1,7 @@ From 2758fab4321519446fe5444769b6257dd18e794b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Sep 2018 14:53:49 +0100 -Subject: [PATCH 276/806] staging: vc04_services: Add a V4L2 M2M codec driver +Subject: [PATCH] staging: vc04_services: Add a V4L2 M2M codec driver This adds a V4L2 memory to memory device that wraps the MMAL video decode and video_encode components for H264 and MJPEG encode diff --git a/target/linux/brcm2708/patches-4.19/950-0277-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/target/linux/brcm2708/patches-4.19/950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0277-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch rename to target/linux/brcm2708/patches-4.19/950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch index 2325697c85..c9461eb59d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0277-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch @@ -1,7 +1,7 @@ From b28dac3003b4c756b72201bb1d83647e33e2f4f1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Oct 2018 15:14:16 +0100 -Subject: [PATCH 277/806] staging: vchiq_arm: Register bcm2835-codec as a +Subject: [PATCH] staging: vchiq_arm: Register bcm2835-codec as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, diff --git a/target/linux/brcm2708/patches-4.19/950-0278-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/brcm2708/patches-4.19/950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0278-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch rename to target/linux/brcm2708/patches-4.19/950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch index a34e5d7f17..d04e261b45 100644 --- a/target/linux/brcm2708/patches-4.19/950-0278-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch @@ -1,7 +1,7 @@ From 69c5c6d62b457ee88e55c4090dc09c0441b059f2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 26 Oct 2018 15:19:40 +0100 -Subject: [PATCH 278/806] staging: vchiq_arm: Register vcsm-cma as a platform +Subject: [PATCH] staging: vchiq_arm: Register vcsm-cma as a platform driver Following the same pattern as bcm2835-camera and bcm2835-audio, diff --git a/target/linux/brcm2708/patches-4.19/950-0281-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch b/target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0281-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch rename to target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch index c4ef974a8c..9659b10956 100644 --- a/target/linux/brcm2708/patches-4.19/950-0281-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch +++ b/target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch @@ -1,7 +1,7 @@ From 69e42b6209062b9cd3fc9aea8fb53ed703509e51 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 30 Nov 2018 16:00:54 +0000 -Subject: [PATCH 281/806] staging: bcm2835-camera: Fix stride on RGB3/BGR3 +Subject: [PATCH] staging: bcm2835-camera: Fix stride on RGB3/BGR3 formats RGB3/BGR3 end up being 3 bytes per pixel, which meant that diff --git a/target/linux/brcm2708/patches-4.19/950-0282-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0282-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch index b8bb7e23c0..8bc16911ca 100644 --- a/target/linux/brcm2708/patches-4.19/950-0282-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch @@ -1,7 +1,7 @@ From cf6f8129b6af78116e00b1d781e0bcc8c4b73890 Mon Sep 17 00:00:00 2001 From: John Sheu Date: Thu, 15 Oct 2015 18:05:25 +0900 -Subject: [PATCH 282/806] media: vb2: Allow reqbufs(0) with "in use" MMAP +Subject: [PATCH] media: vb2: Allow reqbufs(0) with "in use" MMAP buffers Videobuf2 presently does not allow VIDIOC_REQBUFS to destroy outstanding diff --git a/target/linux/brcm2708/patches-4.19/950-0283-tpm-Make-SECURITYFS-a-weak-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0283-tpm-Make-SECURITYFS-a-weak-dependency.patch rename to target/linux/brcm2708/patches-4.19/950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch index 03dca98835..7e86b09840 100644 --- a/target/linux/brcm2708/patches-4.19/950-0283-tpm-Make-SECURITYFS-a-weak-dependency.patch +++ b/target/linux/brcm2708/patches-4.19/950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch @@ -1,7 +1,7 @@ From 38e82adecd1b7ae790a827c29e954d35a2bbee98 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Mon, 3 Sep 2018 21:51:51 +0200 -Subject: [PATCH 283/806] tpm: Make SECURITYFS a weak dependency +Subject: [PATCH] tpm: Make SECURITYFS a weak dependency commit 2f7d8dbb11287cbe9da6380ca14ed5d38c9ed91f upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0285-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch b/target/linux/brcm2708/patches-4.19/950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0285-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch rename to target/linux/brcm2708/patches-4.19/950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch index 5867455529..16539aa305 100644 --- a/target/linux/brcm2708/patches-4.19/950-0285-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch +++ b/target/linux/brcm2708/patches-4.19/950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch @@ -1,7 +1,7 @@ From 82298c670f768f392f48526fe7c8a93682e83998 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Thu, 14 Jun 2018 22:51:24 +0200 -Subject: [PATCH 285/806] Add overlay for SLB9760 Iridium /LetsTrust TPM +Subject: [PATCH] Add overlay for SLB9760 Iridium /LetsTrust TPM Device Tree overlay for the Infineon SLB9670 Trusted Platform Module add-on boards, which can be used as a secure key storage and hwrng. diff --git a/target/linux/brcm2708/patches-4.19/950-0286-Revert-staging-vchiq_arm-Register-a-platform-device-.patch b/target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0286-Revert-staging-vchiq_arm-Register-a-platform-device-.patch rename to target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch index fe7f0d98b8..aeaf8bf1a7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0286-Revert-staging-vchiq_arm-Register-a-platform-device-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch @@ -1,7 +1,7 @@ From d679d6ff3fd138f55b8bbeaf7750c3c980944295 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Dec 2018 19:40:12 +0000 -Subject: [PATCH 286/806] Revert "staging: vchiq_arm: Register a platform +Subject: [PATCH] Revert "staging: vchiq_arm: Register a platform device for the audio driver" This reverts commit ab59590ed562b89db51fe46cee5db96b9bc5abd8. diff --git a/target/linux/brcm2708/patches-4.19/950-0287-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0287-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch rename to target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch index d7e7ac71d0..ea5d5d2949 100644 --- a/target/linux/brcm2708/patches-4.19/950-0287-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch +++ b/target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch @@ -1,7 +1,7 @@ From 28e06d43dd44a45d307848bed588fc65d7c79d83 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Dec 2018 20:41:19 +0000 -Subject: [PATCH 287/806] Revert "staging: bcm2835-audio: Drop DT dependency" +Subject: [PATCH] Revert "staging: bcm2835-audio: Drop DT dependency" This reverts commit 933bc853bb764e476b0b0f633588f46d20f1f76a. diff --git a/target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch b/target/linux/brcm2708/patches-4.19/950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch rename to target/linux/brcm2708/patches-4.19/950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch index c54b5af7a1..e33553625d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0288-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch +++ b/target/linux/brcm2708/patches-4.19/950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch @@ -1,7 +1,7 @@ From e740bd2cc3fcd632fcd6c8881b1fc671bcde5914 Mon Sep 17 00:00:00 2001 From: dev-3Dlab <45081440+dev-3Dlab@users.noreply.github.com> Date: Wed, 5 Dec 2018 10:59:11 +0100 -Subject: [PATCH 288/806] ASoC: add driver for 3Dlab Nano soundcard (#2758) +Subject: [PATCH] ASoC: add driver for 3Dlab Nano soundcard (#2758) Signed-off-by: GT --- diff --git a/target/linux/brcm2708/patches-4.19/950-0289-overlays-Update-README-with-removal-of-lirc-rpi.patch b/target/linux/brcm2708/patches-4.19/950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0289-overlays-Update-README-with-removal-of-lirc-rpi.patch rename to target/linux/brcm2708/patches-4.19/950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch index 9886c85ac5..02162129b4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0289-overlays-Update-README-with-removal-of-lirc-rpi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch @@ -1,7 +1,7 @@ From f2c24ce7e03d059fa9f674d8ebf6286e8f0c38b6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Dec 2018 11:56:40 +0000 -Subject: [PATCH 289/806] overlays: Update README with removal of lirc-rpi +Subject: [PATCH] overlays: Update README with removal of lirc-rpi Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0290-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch b/target/linux/brcm2708/patches-4.19/950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0290-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch rename to target/linux/brcm2708/patches-4.19/950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch index b781c9eb36..40260a6573 100644 --- a/target/linux/brcm2708/patches-4.19/950-0290-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch +++ b/target/linux/brcm2708/patches-4.19/950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch @@ -1,7 +1,7 @@ From 81f6d4e84fd127cf0b31c9822a2beb9b298aa7bb Mon Sep 17 00:00:00 2001 From: 6by9 <6by9@users.noreply.github.com> Date: Tue, 11 Dec 2018 15:18:02 +0000 -Subject: [PATCH 290/806] staging: bcm2835-camera: Check the error for +Subject: [PATCH] staging: bcm2835-camera: Check the error for REPEAT_SEQ_HEADER (#2782) When handling for V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER was added diff --git a/target/linux/brcm2708/patches-4.19/950-0291-gpio-ir-change-default-pull-configuration-to-up.patch b/target/linux/brcm2708/patches-4.19/950-0267-gpio-ir-change-default-pull-configuration-to-up.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0291-gpio-ir-change-default-pull-configuration-to-up.patch rename to target/linux/brcm2708/patches-4.19/950-0267-gpio-ir-change-default-pull-configuration-to-up.patch index d68ea95e58..40bfc01441 100644 --- a/target/linux/brcm2708/patches-4.19/950-0291-gpio-ir-change-default-pull-configuration-to-up.patch +++ b/target/linux/brcm2708/patches-4.19/950-0267-gpio-ir-change-default-pull-configuration-to-up.patch @@ -1,7 +1,7 @@ From d1cf5fb57ee5ee4512a93614d67d15af9c8070b2 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 9 Jan 2019 14:51:01 +0100 -Subject: [PATCH 291/806] gpio-ir: change default pull configuration to up +Subject: [PATCH] gpio-ir: change default pull configuration to up IR receivers like the TSOP series from Vishay and compatible ones have active-low open collector outputs with an internal pull up of diff --git a/target/linux/brcm2708/patches-4.19/950-0292-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch b/target/linux/brcm2708/patches-4.19/950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0292-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch rename to target/linux/brcm2708/patches-4.19/950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch index 36e57e825f..a41e46b1e8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0292-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch @@ -1,7 +1,7 @@ From dfd66230d2d538e7f290436d2952124d6eadeb3d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 10 Jan 2019 17:58:06 +0000 -Subject: [PATCH 292/806] firmware: raspberrypi: Report the fw variant during +Subject: [PATCH] firmware: raspberrypi: Report the fw variant during probe The driver already reported the firmware build date during probe. diff --git a/target/linux/brcm2708/patches-4.19/950-0293-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch b/target/linux/brcm2708/patches-4.19/950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0293-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch rename to target/linux/brcm2708/patches-4.19/950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch index 90fa066e32..84d8a89659 100644 --- a/target/linux/brcm2708/patches-4.19/950-0293-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch +++ b/target/linux/brcm2708/patches-4.19/950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch @@ -1,7 +1,7 @@ From 9abde0ff52268580501b3120629f3c92f0e5d589 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 10 Jan 2019 18:48:54 +0000 -Subject: [PATCH 293/806] firmware: raspberrypi: Report the fw git hash during +Subject: [PATCH] firmware: raspberrypi: Report the fw git hash during probe The firmware can now report the git hash from which it was built diff --git a/target/linux/brcm2708/patches-4.19/950-0294-arm64-dts-broadcom-Enable-fixups-for-overlays.patch b/target/linux/brcm2708/patches-4.19/950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0294-arm64-dts-broadcom-Enable-fixups-for-overlays.patch rename to target/linux/brcm2708/patches-4.19/950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch index 44c3429c8c..96d2ad4699 100644 --- a/target/linux/brcm2708/patches-4.19/950-0294-arm64-dts-broadcom-Enable-fixups-for-overlays.patch +++ b/target/linux/brcm2708/patches-4.19/950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch @@ -1,7 +1,7 @@ From bb8f38337d08dc1ac78ab251aa0b515eea45a79e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 15 Jan 2019 09:56:41 +0000 -Subject: [PATCH 294/806] arm64: dts: broadcom: Enable fixups for overlays +Subject: [PATCH] arm64: dts: broadcom: Enable fixups for overlays See: https://github.com/raspberrypi/linux/pull/2733 diff --git a/target/linux/brcm2708/patches-4.19/950-0296-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch b/target/linux/brcm2708/patches-4.19/950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0296-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch rename to target/linux/brcm2708/patches-4.19/950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch index 7e7dcd028e..09ff03e81b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0296-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch @@ -1,7 +1,7 @@ From 1d26e4d72f2d0563cc6455e682a5d4c491de178c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 9 Dec 2018 16:46:00 -0500 -Subject: [PATCH 296/806] dtoverlays: fe-pi-audio: fix sgtl5000 compatible +Subject: [PATCH] dtoverlays: fe-pi-audio: fix sgtl5000 compatible string The compatible string was set to "fepi,sgtl5000", which worked for some diff --git a/target/linux/brcm2708/patches-4.19/950-0297-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch b/target/linux/brcm2708/patches-4.19/950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch similarity index 87% rename from target/linux/brcm2708/patches-4.19/950-0297-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch rename to target/linux/brcm2708/patches-4.19/950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch index 1c1f5e6e73..37f1cb53fc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0297-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch @@ -1,7 +1,7 @@ From e5111d81c8efc17d8d585510980d3fe49c998741 Mon Sep 17 00:00:00 2001 From: Ezekiel Bethel Date: Wed, 12 Dec 2018 19:11:13 +0000 -Subject: [PATCH 297/806] bcm2835_smi: re-add dereference to fix DMA transfers +Subject: [PATCH] bcm2835_smi: re-add dereference to fix DMA transfers --- drivers/misc/bcm2835_smi.c | 2 +- diff --git a/target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.19/950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch rename to target/linux/brcm2708/patches-4.19/950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index bff441c5e0..761b6dcfcf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.19/950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -1,7 +1,7 @@ From 020ee4d0d438b830ee40da8d9d3414de156a11e7 Mon Sep 17 00:00:00 2001 From: Joshua Emele Date: Wed, 7 Nov 2018 16:07:40 -0800 -Subject: [PATCH 298/806] lan78xx: Debounce link events to minimize poll storm +Subject: [PATCH] lan78xx: Debounce link events to minimize poll storm The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit that the driver pays attention to is "link was reset". If there's a diff --git a/target/linux/brcm2708/patches-4.19/950-0299-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0299-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch rename to target/linux/brcm2708/patches-4.19/950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch index 400e38cba7..1ab87d5a54 100644 --- a/target/linux/brcm2708/patches-4.19/950-0299-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch +++ b/target/linux/brcm2708/patches-4.19/950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch @@ -1,7 +1,7 @@ From 5705594ae56861cb63e7a3de1854e29ad1e830fd Mon Sep 17 00:00:00 2001 From: b-ak Date: Thu, 3 Jan 2019 00:01:08 +0530 -Subject: [PATCH 299/806] ASoC: Add support for AudioSense-Pi add-on soundcard +Subject: [PATCH] ASoC: Add support for AudioSense-Pi add-on soundcard AudioSense-Pi is a RPi HAT based on a TI's TLV320AIC32x4 stereo codec diff --git a/target/linux/brcm2708/patches-4.19/950-0300-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0300-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch index 4f64bd207c..1e85d9f23c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0300-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch @@ -1,7 +1,7 @@ From 0d2a0f4f4c00c958fb6e7a2673adbe51c2a932f2 Mon Sep 17 00:00:00 2001 From: b-ak Date: Thu, 3 Jan 2019 00:29:14 +0530 -Subject: [PATCH 300/806] BCM270X: Adding device tree support for AudioSense-Pi +Subject: [PATCH] BCM270X: Adding device tree support for AudioSense-Pi add-on soundcard Device tree overlay for AudioSense-Pi card. diff --git a/target/linux/brcm2708/patches-4.19/950-0303-overlays-sdio-Add-enhanced-1-bit-support.patch b/target/linux/brcm2708/patches-4.19/950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0303-overlays-sdio-Add-enhanced-1-bit-support.patch rename to target/linux/brcm2708/patches-4.19/950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch index 35ebd59053..42a9f112e9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0303-overlays-sdio-Add-enhanced-1-bit-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch @@ -1,7 +1,7 @@ From 788109b357ddb30a95be72ce46dc22e2335131af Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 10 Jan 2019 15:27:56 +0000 -Subject: [PATCH 303/806] overlays: sdio: Add enhanced 1-bit support +Subject: [PATCH] overlays: sdio: Add enhanced 1-bit support "dtoverlay=sdio,bus_width=1,gpios_22_25" is equivalent to the sdio-1bit overlay, which is now deprecated. diff --git a/target/linux/brcm2708/patches-4.19/950-0304-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch b/target/linux/brcm2708/patches-4.19/950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0304-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch rename to target/linux/brcm2708/patches-4.19/950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch index c80a2133e4..fd5f88ff03 100644 --- a/target/linux/brcm2708/patches-4.19/950-0304-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch +++ b/target/linux/brcm2708/patches-4.19/950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch @@ -1,7 +1,7 @@ From 6e56da00afdf11416045213552514d10bab845cc Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 16 Jan 2019 10:17:52 +0000 -Subject: [PATCH 304/806] dwc_otg: fix bug with port_addr assignment for +Subject: [PATCH] dwc_otg: fix bug with port_addr assignment for single-TT hubs See https://github.com/raspberrypi/linux/issues/2734 diff --git a/target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch b/target/linux/brcm2708/patches-4.19/950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch rename to target/linux/brcm2708/patches-4.19/950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch index f06f4cd96b..9cd839e045 100644 --- a/target/linux/brcm2708/patches-4.19/950-0306-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch +++ b/target/linux/brcm2708/patches-4.19/950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch @@ -1,7 +1,7 @@ From dde0ec6b9fd5755de3a8962489cde9c0ce5e5005 Mon Sep 17 00:00:00 2001 From: HiFiBerry Date: Mon, 8 Oct 2018 18:10:12 +0200 -Subject: [PATCH 306/806] Added driver for the HiFiBerry DAC+ ADC (#2694) +Subject: [PATCH] Added driver for the HiFiBerry DAC+ ADC (#2694) Signed-off-by: Daniel Matuschek --- diff --git a/target/linux/brcm2708/patches-4.19/950-0307-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch b/target/linux/brcm2708/patches-4.19/950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0307-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch rename to target/linux/brcm2708/patches-4.19/950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch index a7f526a038..8136e3ffa0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0307-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch +++ b/target/linux/brcm2708/patches-4.19/950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch @@ -1,7 +1,7 @@ From 20a5b38305df30e25b4429e0e34e35235dd57228 Mon Sep 17 00:00:00 2001 From: Fabrice Gasnier Date: Mon, 1 Oct 2018 15:23:57 +0200 -Subject: [PATCH 307/806] pwm: Send a uevent on the pwmchip device upon channel +Subject: [PATCH] pwm: Send a uevent on the pwmchip device upon channel sysfs (un)export MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/target/linux/brcm2708/patches-4.19/950-0308-overlays-Add-ssd1306-overlay-for-OLED-display.patch b/target/linux/brcm2708/patches-4.19/950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0308-overlays-Add-ssd1306-overlay-for-OLED-display.patch rename to target/linux/brcm2708/patches-4.19/950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch index 703d3feb1f..967cc76442 100644 --- a/target/linux/brcm2708/patches-4.19/950-0308-overlays-Add-ssd1306-overlay-for-OLED-display.patch +++ b/target/linux/brcm2708/patches-4.19/950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch @@ -1,7 +1,7 @@ From d8eac0d3e4f6c6f9e5f789c8e2288699b2afebcb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Jan 2019 21:17:27 +0000 -Subject: [PATCH 308/806] overlays: Add ssd1306 overlay for OLED display +Subject: [PATCH] overlays: Add ssd1306 overlay for OLED display See: https://github.com/raspberrypi/firmware/issues/1098 diff --git a/target/linux/brcm2708/patches-4.19/950-0309-overlays-mcp23017-Support-the-MCP23008.patch b/target/linux/brcm2708/patches-4.19/950-0281-overlays-mcp23017-Support-the-MCP23008.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0309-overlays-mcp23017-Support-the-MCP23008.patch rename to target/linux/brcm2708/patches-4.19/950-0281-overlays-mcp23017-Support-the-MCP23008.patch index 94fc8ad55e..44f295a89e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0309-overlays-mcp23017-Support-the-MCP23008.patch +++ b/target/linux/brcm2708/patches-4.19/950-0281-overlays-mcp23017-Support-the-MCP23008.patch @@ -1,7 +1,7 @@ From c85a1ccbc6b1cab51a5fe5b916bcaf40bcd9096c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Jan 2019 12:19:57 +0000 -Subject: [PATCH 309/806] overlays: mcp23017: Support the MCP23008 +Subject: [PATCH] overlays: mcp23017: Support the MCP23008 Add an 'mcp23008' parameter to enable support for the MCP23008 device. diff --git a/target/linux/brcm2708/patches-4.19/950-0310-overlays-Add-mcp342x-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0282-overlays-Add-mcp342x-overlay.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0310-overlays-Add-mcp342x-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0282-overlays-Add-mcp342x-overlay.patch index 3e4a4108cd..d104c65cc3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0310-overlays-Add-mcp342x-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0282-overlays-Add-mcp342x-overlay.patch @@ -1,7 +1,7 @@ From b71f1fd962c66ba3fa46483f193cc2263146c5bf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 21 Jan 2019 12:23:55 +0000 -Subject: [PATCH 310/806] overlays: Add mcp342x overlay +Subject: [PATCH] overlays: Add mcp342x overlay Support the MCP342x family of ADCs from Microchip. diff --git a/target/linux/brcm2708/patches-4.19/950-0311-char-vcio-Add-compat-ioctl-handling.patch b/target/linux/brcm2708/patches-4.19/950-0283-char-vcio-Add-compat-ioctl-handling.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0311-char-vcio-Add-compat-ioctl-handling.patch rename to target/linux/brcm2708/patches-4.19/950-0283-char-vcio-Add-compat-ioctl-handling.patch index 3f49bfed83..a9b55722e5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0311-char-vcio-Add-compat-ioctl-handling.patch +++ b/target/linux/brcm2708/patches-4.19/950-0283-char-vcio-Add-compat-ioctl-handling.patch @@ -1,7 +1,7 @@ From 70194b474d22974cd46356e5b3d3b0582abd02da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 13:56:30 +0000 -Subject: [PATCH 311/806] char: vcio: Add compat ioctl handling +Subject: [PATCH] char: vcio: Add compat ioctl handling There was no compat ioctl handler, so 32 bit userspace on a 64 bit kernel failed as IOCTL_MBOX_PROPERTY used the size diff --git a/target/linux/brcm2708/patches-4.19/950-0312-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch b/target/linux/brcm2708/patches-4.19/950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0312-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch rename to target/linux/brcm2708/patches-4.19/950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch index 2aadb3472e..0ec06ca246 100644 --- a/target/linux/brcm2708/patches-4.19/950-0312-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch +++ b/target/linux/brcm2708/patches-4.19/950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch @@ -1,7 +1,7 @@ From 6880e5c73b75be683299debf391eba4f521cc20f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 14:03:28 +0000 -Subject: [PATCH 312/806] char: vcio: Fail probe if rpi_firmware is not found. +Subject: [PATCH] char: vcio: Fail probe if rpi_firmware is not found. Device Tree is now the only supported config mechanism, therefore uncomment the block of code that fails the probe if the diff --git a/target/linux/brcm2708/patches-4.19/950-0313-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch b/target/linux/brcm2708/patches-4.19/950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0313-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch rename to target/linux/brcm2708/patches-4.19/950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch index 02a5c62d86..2e20c64b8b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0313-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch +++ b/target/linux/brcm2708/patches-4.19/950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch @@ -1,7 +1,7 @@ From 18511b66fee5967ed5631e7cbe2c263f07e956f9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 22 Jan 2019 12:04:09 +0000 -Subject: [PATCH 313/806] staging: mmal-vchiq: Fix client_component for 64 bit +Subject: [PATCH] staging: mmal-vchiq: Fix client_component for 64 bit kernel The MMAL client_component field is used with the event diff --git a/target/linux/brcm2708/patches-4.19/950-0314-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch b/target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0314-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch rename to target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch index fadb149367..c4e78a1e21 100644 --- a/target/linux/brcm2708/patches-4.19/950-0314-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch +++ b/target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch @@ -1,7 +1,7 @@ From 6b3fde1207785584dbd1fdf65110cf60bd29b409 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 15 Jan 2019 15:35:24 +0000 -Subject: [PATCH 314/806] staging: bcm2835-camera: Add sanity checks for +Subject: [PATCH] staging: bcm2835-camera: Add sanity checks for queue_setup/CREATE_BUFS Fixes a v4l2-compliance failure when passed a buffer that is diff --git a/target/linux/brcm2708/patches-4.19/950-0315-staging-bcm2835-camera-Set-the-field-value-within-ea.patch b/target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0315-staging-bcm2835-camera-Set-the-field-value-within-ea.patch rename to target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch index 46cbbba5e3..e562e1cffe 100644 --- a/target/linux/brcm2708/patches-4.19/950-0315-staging-bcm2835-camera-Set-the-field-value-within-ea.patch +++ b/target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch @@ -1,7 +1,7 @@ From 7f67e8ed8ae17ddca0748975de0c0efad6a5e6bb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 15 Jan 2019 16:32:33 +0000 -Subject: [PATCH 315/806] staging: bcm2835-camera: Set the field value within +Subject: [PATCH] staging: bcm2835-camera: Set the field value within each buffer Fixes a v4l2-compliance failure diff --git a/target/linux/brcm2708/patches-4.19/950-0316-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch b/target/linux/brcm2708/patches-4.19/950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0316-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch rename to target/linux/brcm2708/patches-4.19/950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch index 866512859e..b0beb6d5c8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0316-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch +++ b/target/linux/brcm2708/patches-4.19/950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch @@ -1,7 +1,7 @@ From 966ff2b4c758eb8c8c04f26422cd183e6aa8eda5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 23 Jan 2019 18:25:50 +0000 -Subject: [PATCH 316/806] char: vc_mem: Fix up compat ioctls for 64bit kernel +Subject: [PATCH] char: vc_mem: Fix up compat ioctls for 64bit kernel compat_ioctl wasn't defined, so 32bit user/64bit kernel always failed. diff --git a/target/linux/brcm2708/patches-4.19/950-0317-char-vc_mem-Fix-all-coding-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0289-char-vc_mem-Fix-all-coding-style-issues.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0317-char-vc_mem-Fix-all-coding-style-issues.patch rename to target/linux/brcm2708/patches-4.19/950-0289-char-vc_mem-Fix-all-coding-style-issues.patch index 815900409d..e0b6adf2ae 100644 --- a/target/linux/brcm2708/patches-4.19/950-0317-char-vc_mem-Fix-all-coding-style-issues.patch +++ b/target/linux/brcm2708/patches-4.19/950-0289-char-vc_mem-Fix-all-coding-style-issues.patch @@ -1,7 +1,7 @@ From 8d64f178c3568d212f3ddf05ea1ad7f103beeb86 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 23 Jan 2019 18:37:29 +0000 -Subject: [PATCH 317/806] char: vc_mem: Fix all coding style issues. +Subject: [PATCH] char: vc_mem: Fix all coding style issues. Cleans up all checkpatch errors in vc_mem.c and vc_mem.h No functional change to the code. diff --git a/target/linux/brcm2708/patches-4.19/950-0318-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch b/target/linux/brcm2708/patches-4.19/950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0318-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch rename to target/linux/brcm2708/patches-4.19/950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch index bb7c5b0173..ee4fbbda2d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0318-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch +++ b/target/linux/brcm2708/patches-4.19/950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch @@ -1,7 +1,7 @@ From 83a7175c91133a3e7a746693847b447bf6297094 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 15:09:28 +0000 -Subject: [PATCH 318/806] clk: clk-bcm2835: Use %zd when printing size_t +Subject: [PATCH] clk: clk-bcm2835: Use %zd when printing size_t The debug text for how many clocks have been registered uses "%d" with a size_t. Correct it to "%zd". diff --git a/target/linux/brcm2708/patches-4.19/950-0319-mfd-Add-rpi_sense_core-of-compatible-string.patch b/target/linux/brcm2708/patches-4.19/950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0319-mfd-Add-rpi_sense_core-of-compatible-string.patch rename to target/linux/brcm2708/patches-4.19/950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch index 8d51d63eee..0647b0532a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0319-mfd-Add-rpi_sense_core-of-compatible-string.patch +++ b/target/linux/brcm2708/patches-4.19/950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch @@ -1,7 +1,7 @@ From 3e1371cc80a8153885cf87b06053ab2a2f1a1e66 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 29 Jan 2019 12:05:49 +0000 -Subject: [PATCH 319/806] mfd: Add rpi_sense_core of compatible string +Subject: [PATCH] mfd: Add rpi_sense_core of compatible string --- drivers/mfd/rpisense-core.c | 8 ++++++++ diff --git a/target/linux/brcm2708/patches-4.19/950-0320-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0320-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch rename to target/linux/brcm2708/patches-4.19/950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch index 14116258da..cadf49ebc8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0320-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch +++ b/target/linux/brcm2708/patches-4.19/950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch @@ -1,7 +1,7 @@ From 32e0a9e2549c43d9abc03427ba6f3b7b8c2e1407 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 28 Jan 2019 14:40:16 +0000 -Subject: [PATCH 320/806] gpu: vc4_firmware_kms: Fix up 64 bit compile +Subject: [PATCH] gpu: vc4_firmware_kms: Fix up 64 bit compile warnings. Resolve two build warnings with regard using incorrectly diff --git a/target/linux/brcm2708/patches-4.19/950-0321-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch b/target/linux/brcm2708/patches-4.19/950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0321-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch rename to target/linux/brcm2708/patches-4.19/950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch index de03d141d2..d014697a3a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0321-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch +++ b/target/linux/brcm2708/patches-4.19/950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch @@ -1,7 +1,7 @@ From 61ce13e4ab846aa035037217c5eec6aff229e539 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 28 Jan 2019 14:42:34 +0000 -Subject: [PATCH 321/806] input: rpi-ft5406: Clear build warning on 64 bit +Subject: [PATCH] input: rpi-ft5406: Clear build warning on 64 bit builds. Resolve 64 bit build warning over using %x with a dma_addr_t. diff --git a/target/linux/brcm2708/patches-4.19/950-0322-dtoverlays-Correct-DT-handling-camera-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0322-dtoverlays-Correct-DT-handling-camera-GPIOs.patch rename to target/linux/brcm2708/patches-4.19/950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch index 3b8ccffa22..9d6471052d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0322-dtoverlays-Correct-DT-handling-camera-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch @@ -1,7 +1,7 @@ From 5c0dfdba54fdaeb813d8535283aa8f75080e1055 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Sep 2018 10:47:38 +0100 -Subject: [PATCH 322/806] dtoverlays: Correct DT handling camera GPIOs +Subject: [PATCH] dtoverlays: Correct DT handling camera GPIOs The firmware has support for updating overrides with the correct GPIO settings for the camera GPIOs, but the wrong device tree diff --git a/target/linux/brcm2708/patches-4.19/950-0323-media-ov5647-Use-gpiod_set_value_cansleep.patch b/target/linux/brcm2708/patches-4.19/950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0323-media-ov5647-Use-gpiod_set_value_cansleep.patch rename to target/linux/brcm2708/patches-4.19/950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch index 84c09bb37f..e88afb0550 100644 --- a/target/linux/brcm2708/patches-4.19/950-0323-media-ov5647-Use-gpiod_set_value_cansleep.patch +++ b/target/linux/brcm2708/patches-4.19/950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch @@ -1,7 +1,7 @@ From 3be30ee1b3aafd7c6cc45bcea77f25c9613732f4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Sep 2018 11:08:51 +0100 -Subject: [PATCH 323/806] media: ov5647: Use gpiod_set_value_cansleep +Subject: [PATCH] media: ov5647: Use gpiod_set_value_cansleep All calls to the gpio library are in contexts that can sleep, therefore there is no issue with having those GPIOs controlled diff --git a/target/linux/brcm2708/patches-4.19/950-0324-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch b/target/linux/brcm2708/patches-4.19/950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0324-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch rename to target/linux/brcm2708/patches-4.19/950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch index f7488593e2..0946b77037 100644 --- a/target/linux/brcm2708/patches-4.19/950-0324-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch +++ b/target/linux/brcm2708/patches-4.19/950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch @@ -1,7 +1,7 @@ From bf1805e0c8c4fc05e2a13b0a03b510ff4e523418 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 15:56:10 +0000 -Subject: [PATCH 324/806] media:bcm2835-unicam: Power on subdev on +Subject: [PATCH] media:bcm2835-unicam: Power on subdev on open/release, not streaming The driver was powering on the source subdevice as part of STREAMON, diff --git a/target/linux/brcm2708/patches-4.19/950-0325-audioinjector-octo-revert-to-dummy-supplies.patch b/target/linux/brcm2708/patches-4.19/950-0297-audioinjector-octo-revert-to-dummy-supplies.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0325-audioinjector-octo-revert-to-dummy-supplies.patch rename to target/linux/brcm2708/patches-4.19/950-0297-audioinjector-octo-revert-to-dummy-supplies.patch index 8b8842fd23..760a7bfdc8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0325-audioinjector-octo-revert-to-dummy-supplies.patch +++ b/target/linux/brcm2708/patches-4.19/950-0297-audioinjector-octo-revert-to-dummy-supplies.patch @@ -1,7 +1,7 @@ From 0e69aceab4e7615cf631a8c7bdb25093cbba240a Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Tue, 29 Jan 2019 14:56:03 +1100 -Subject: [PATCH 325/806] audioinjector-octo: revert to dummy supplies +Subject: [PATCH] audioinjector-octo: revert to dummy supplies The Audio Injector Octo has had a lot of reports of not coming up on power cycles. By reverting to dummy supplies, the card comes up reliably. --- diff --git a/target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch b/target/linux/brcm2708/patches-4.19/950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch rename to target/linux/brcm2708/patches-4.19/950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch index 62d37c5e88..c1e5bb355b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch +++ b/target/linux/brcm2708/patches-4.19/950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch @@ -1,7 +1,7 @@ From 8c420772ef0f15ebbc3f13ebcc340d34bbdfad71 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:20:38 +0000 -Subject: [PATCH 326/806] staging: bcm2835-camera: Correct ctrl +Subject: [PATCH] staging: bcm2835-camera: Correct ctrl min/max/step/def to 64bit The V4L2 control API was expanded to take 64 bit values in commit diff --git a/target/linux/brcm2708/patches-4.19/950-0327-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch b/target/linux/brcm2708/patches-4.19/950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0327-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch rename to target/linux/brcm2708/patches-4.19/950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch index 92796e7140..24a332fa60 100644 --- a/target/linux/brcm2708/patches-4.19/950-0327-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch +++ b/target/linux/brcm2708/patches-4.19/950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch @@ -1,7 +1,7 @@ From 8920ce80058cfa3d18dc8bc7535119e9986dbad7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:40:01 +0000 -Subject: [PATCH 327/806] staging: bcm2835-codec: variable vb2 may be used +Subject: [PATCH] staging: bcm2835-codec: variable vb2 may be used uninitialised In op_buffer_cb, the failure path checked whether there was diff --git a/target/linux/brcm2708/patches-4.19/950-0328-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch b/target/linux/brcm2708/patches-4.19/950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0328-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch rename to target/linux/brcm2708/patches-4.19/950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch index 8d6cfda397..c8e3e221ce 100644 --- a/target/linux/brcm2708/patches-4.19/950-0328-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch @@ -1,7 +1,7 @@ From 7e3cada9dae5d030256605a28df9537b26e776a8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 24 Jan 2019 16:36:19 +0000 -Subject: [PATCH 328/806] staging: bcm2835-codec: Fix potentially uninitialised +Subject: [PATCH] staging: bcm2835-codec: Fix potentially uninitialised vars src_m2m_buf and dst_m2m_buf were printed in log messages diff --git a/target/linux/brcm2708/patches-4.19/950-0329-video-bcm2708_fb-Add-compat_ioctl-support.patch b/target/linux/brcm2708/patches-4.19/950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0329-video-bcm2708_fb-Add-compat_ioctl-support.patch rename to target/linux/brcm2708/patches-4.19/950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch index 9f3ea3015c..eb53480080 100644 --- a/target/linux/brcm2708/patches-4.19/950-0329-video-bcm2708_fb-Add-compat_ioctl-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch @@ -1,7 +1,7 @@ From b5bd7b621f6ab2f29e9f18ec2a2720d702b9727c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 25 Jan 2019 17:12:54 +0000 -Subject: [PATCH 329/806] video: bcm2708_fb: Add compat_ioctl support. +Subject: [PATCH] video: bcm2708_fb: Add compat_ioctl support. When using a 64 bit kernel with 32 bit userspace we need compat ioctl handling for FBIODMACOPY as one of the diff --git a/target/linux/brcm2708/patches-4.19/950-0330-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch b/target/linux/brcm2708/patches-4.19/950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0330-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch rename to target/linux/brcm2708/patches-4.19/950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch index 7001c94953..3c6dc09f09 100644 --- a/target/linux/brcm2708/patches-4.19/950-0330-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch +++ b/target/linux/brcm2708/patches-4.19/950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch @@ -1,7 +1,7 @@ From ca128febc6abc040d747ddc0808fd203c135668e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 25 Jan 2019 17:11:39 +0000 -Subject: [PATCH 330/806] video: bcm2708_fb: Fix warnings on 64 bit builds +Subject: [PATCH] video: bcm2708_fb: Fix warnings on 64 bit builds Fix up logging lines where the wrong format specifiers were being used. diff --git a/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Clean-up-coding-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Clean-up-coding-style-issues.patch rename to target/linux/brcm2708/patches-4.19/950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch index 0ee91bf15e..43bb8cee3a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Clean-up-coding-style-issues.patch +++ b/target/linux/brcm2708/patches-4.19/950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch @@ -1,7 +1,7 @@ From 47f7687efaf3873fe8c0e47653515e9ada1b86da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 25 Jan 2019 17:32:54 +0000 -Subject: [PATCH 331/806] video: bcm2708_fb: Clean up coding style issues +Subject: [PATCH] video: bcm2708_fb: Clean up coding style issues Now checkpatch clean except for 2 long lines, missing SPDX header, and no DT documentation. diff --git a/target/linux/brcm2708/patches-4.19/950-0332-bcm2835-dma-Add-support-for-per-channel-flags.patch b/target/linux/brcm2708/patches-4.19/950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0332-bcm2835-dma-Add-support-for-per-channel-flags.patch rename to target/linux/brcm2708/patches-4.19/950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch index 566e67c4fe..ff564390cf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0332-bcm2835-dma-Add-support-for-per-channel-flags.patch +++ b/target/linux/brcm2708/patches-4.19/950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch @@ -1,7 +1,7 @@ From 4ebec374d97c0bba1e41558071bfa062894b07a0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Jul 2018 22:03:41 +0100 -Subject: [PATCH 332/806] bcm2835-dma: Add support for per-channel flags +Subject: [PATCH] bcm2835-dma: Add support for per-channel flags Add the ability to interpret the high bits of the dreq specifier as flags to be included in the DMA_CS register. The motivation for this diff --git a/target/linux/brcm2708/patches-4.19/950-0333-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch b/target/linux/brcm2708/patches-4.19/950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0333-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch rename to target/linux/brcm2708/patches-4.19/950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch index 0aab4b67c1..ec0d0d882b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0333-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch @@ -1,7 +1,7 @@ From 18a739ba2e76a5e2bb3a02d9083faeabdee93777 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 20 Jul 2018 22:08:05 +0100 -Subject: [PATCH 333/806] bcm283x: Set the DISDEBUG flag for SD transfers +Subject: [PATCH] bcm283x: Set the DISDEBUG flag for SD transfers Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0334-ASoC-pcm512x-Implement-the-digital_mute-interface.patch b/target/linux/brcm2708/patches-4.19/950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0334-ASoC-pcm512x-Implement-the-digital_mute-interface.patch rename to target/linux/brcm2708/patches-4.19/950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch index 3b9d93164d..e68cf7b2f9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0334-ASoC-pcm512x-Implement-the-digital_mute-interface.patch +++ b/target/linux/brcm2708/patches-4.19/950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch @@ -1,7 +1,7 @@ From 4a15efde52bb79bf44e63b998cd84f896404d728 Mon Sep 17 00:00:00 2001 From: Dimitris Papavasiliou Date: Sat, 24 Nov 2018 22:05:42 +0200 -Subject: [PATCH 334/806] ASoC: pcm512x: Implement the digital_mute interface +Subject: [PATCH] ASoC: pcm512x: Implement the digital_mute interface [ Upstream commit 3500f1c589e92e0b6b1f8d31b4084fbde08d49cb ] diff --git a/target/linux/brcm2708/patches-4.19/950-0335-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch b/target/linux/brcm2708/patches-4.19/950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0335-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch rename to target/linux/brcm2708/patches-4.19/950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch index 7674de284b..f1a09c4922 100644 --- a/target/linux/brcm2708/patches-4.19/950-0335-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch +++ b/target/linux/brcm2708/patches-4.19/950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch @@ -1,7 +1,7 @@ From 26001d54a7f803258b161f25f457ce11523695d7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 21 Dec 2018 12:11:20 +0300 -Subject: [PATCH 335/806] ASoC: pcm512x: Fix a double unlock in +Subject: [PATCH] ASoC: pcm512x: Fix a double unlock in pcm512x_digital_mute() [ Upstream commit 28b698b7342c7d5300cfe217cd77ff7d2a55e03d ] diff --git a/target/linux/brcm2708/patches-4.19/950-0336-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch b/target/linux/brcm2708/patches-4.19/950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0336-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch rename to target/linux/brcm2708/patches-4.19/950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch index 4e30ab8881..cc99a11c94 100644 --- a/target/linux/brcm2708/patches-4.19/950-0336-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch +++ b/target/linux/brcm2708/patches-4.19/950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch @@ -1,7 +1,7 @@ From d2536830d8f1ef06afdc84c5ac6e1a70b3a2bc40 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 25 Jan 2019 16:03:31 +0000 -Subject: [PATCH 336/806] usb: dwc_otg: Clean up build warnings on 64bit +Subject: [PATCH] usb: dwc_otg: Clean up build warnings on 64bit kernels No functional changes. Almost all are changes to logging lines. diff --git a/target/linux/brcm2708/patches-4.19/950-0337-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch b/target/linux/brcm2708/patches-4.19/950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0337-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch rename to target/linux/brcm2708/patches-4.19/950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch index 49fb4d7dde..edc9336804 100644 --- a/target/linux/brcm2708/patches-4.19/950-0337-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch +++ b/target/linux/brcm2708/patches-4.19/950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch @@ -1,7 +1,7 @@ From f0d93c5098283f88ea1de3af152a190177da8f36 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 30 Jan 2019 17:47:51 +0000 -Subject: [PATCH 337/806] usb: dwc_otg: Use dma allocation for mphi dummy_send +Subject: [PATCH] usb: dwc_otg: Use dma allocation for mphi dummy_send buffer The FIQ driver used a kzalloc'ed buffer for dummy_send, diff --git a/target/linux/brcm2708/patches-4.19/950-0338-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/target/linux/brcm2708/patches-4.19/950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0338-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch rename to target/linux/brcm2708/patches-4.19/950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch index 02cb74d9fa..31e050aa55 100644 --- a/target/linux/brcm2708/patches-4.19/950-0338-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch +++ b/target/linux/brcm2708/patches-4.19/950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch @@ -1,7 +1,7 @@ From f03f60a51efdf7fbc1f7d2c5b120a7de93ea6d9e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:13:25 +0000 -Subject: [PATCH 338/806] staging: vchiq_arm: Set up dma ranges on child +Subject: [PATCH] staging: vchiq_arm: Set up dma ranges on child devices The VCHIQ driver now loads the audio, camera, codec, and vc-sm diff --git a/target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Correct-DMA-configuration.patch b/target/linux/brcm2708/patches-4.19/950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Correct-DMA-configuration.patch rename to target/linux/brcm2708/patches-4.19/950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch index fc5ffbd30b..8709eef289 100644 --- a/target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Correct-DMA-configuration.patch +++ b/target/linux/brcm2708/patches-4.19/950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch @@ -1,7 +1,7 @@ From ea000a969afa022776bdf8050aaa501b2679e028 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:24:41 +0000 -Subject: [PATCH 339/806] staging: vc-sm-cma: Correct DMA configuration. +Subject: [PATCH] staging: vc-sm-cma: Correct DMA configuration. Now that VCHIQ is setting up the DMA configuration as our parent device, don't try to configure it during probe. diff --git a/target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch b/target/linux/brcm2708/patches-4.19/950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch rename to target/linux/brcm2708/patches-4.19/950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch index 13aba4f303..6a43d94d1a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch +++ b/target/linux/brcm2708/patches-4.19/950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch @@ -1,7 +1,7 @@ From df84621e5bd5cc206d1039ce0880ccd0b325525b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:29:00 +0000 -Subject: [PATCH 340/806] staging: vc-sm-cma: Use a void* pointer as the handle +Subject: [PATCH] staging: vc-sm-cma: Use a void* pointer as the handle within the kernel The driver was using an unsigned int as the handle to the outside world, diff --git a/target/linux/brcm2708/patches-4.19/950-0341-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch b/target/linux/brcm2708/patches-4.19/950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0341-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch rename to target/linux/brcm2708/patches-4.19/950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch index 7907a7ad5f..521641434b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0341-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch +++ b/target/linux/brcm2708/patches-4.19/950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch @@ -1,7 +1,7 @@ From 696aa66a971b20e4f00431cb53747f0e4b92bb03 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 29 Jan 2019 16:32:57 +0000 -Subject: [PATCH 341/806] staging: vc-sm-cma: Fix up for 64bit builds +Subject: [PATCH] staging: vc-sm-cma: Fix up for 64bit builds There were a number of logging lines that were using inappropriate formatting under 64bit kernels. diff --git a/target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch b/target/linux/brcm2708/patches-4.19/950-0314-configs-Enable-the-AD193x-codecs.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch rename to target/linux/brcm2708/patches-4.19/950-0314-configs-Enable-the-AD193x-codecs.patch index c6db4c6f2a..29f7ee3984 100644 --- a/target/linux/brcm2708/patches-4.19/950-0346-configs-Enable-the-AD193x-codecs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0314-configs-Enable-the-AD193x-codecs.patch @@ -1,7 +1,7 @@ From 3ffbec3df726c6d36ef728d476cb3ff3fcc17c81 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 7 Feb 2019 18:16:25 +0000 -Subject: [PATCH 346/806] configs: Enable the AD193x codecs +Subject: [PATCH] configs: Enable the AD193x codecs See: https://github.com/raspberrypi/linux/issues/2850 diff --git a/target/linux/brcm2708/patches-4.19/950-0347-overlays-balenaFin-v1.1.0-carrier-board-update.patch b/target/linux/brcm2708/patches-4.19/950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0347-overlays-balenaFin-v1.1.0-carrier-board-update.patch rename to target/linux/brcm2708/patches-4.19/950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch index e07a005d6e..4dc414119b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0347-overlays-balenaFin-v1.1.0-carrier-board-update.patch +++ b/target/linux/brcm2708/patches-4.19/950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch @@ -1,7 +1,7 @@ From 6cafe647492605d21c2418b6261bf3182b9229f2 Mon Sep 17 00:00:00 2001 From: Zahari Petkov Date: Fri, 8 Feb 2019 13:03:38 +0200 -Subject: [PATCH 347/806] overlays: balenaFin v1.1.0 carrier board update +Subject: [PATCH] overlays: balenaFin v1.1.0 carrier board update A backward compatible update for the balenaFin carrier board for the Raspberry Pi Compute Module 3/3+ Lite. diff --git a/target/linux/brcm2708/patches-4.19/950-0350-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch b/target/linux/brcm2708/patches-4.19/950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0350-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch rename to target/linux/brcm2708/patches-4.19/950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch index d2089d7ca3..b4567d8fdc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0350-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch +++ b/target/linux/brcm2708/patches-4.19/950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch @@ -1,7 +1,7 @@ From e5285033e0fbfb6750d7d39e7edebf67a16c8434 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:06:31 +0000 -Subject: [PATCH 350/806] gpu:vc4-fkms: Update driver to not use plane->crtc. +Subject: [PATCH] gpu:vc4-fkms: Update driver to not use plane->crtc. Following on from commit 2f958af7fc248 ("drm/vc4: Stop updating plane->fb/crtc") diff --git a/target/linux/brcm2708/patches-4.19/950-0351-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch b/target/linux/brcm2708/patches-4.19/950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0351-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch rename to target/linux/brcm2708/patches-4.19/950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch index 956b8107c1..6690dfcd42 100644 --- a/target/linux/brcm2708/patches-4.19/950-0351-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch @@ -1,7 +1,7 @@ From bb8e85deab20dd38c26d354452e1ac42add37530 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:18:25 +0000 -Subject: [PATCH 351/806] drm: vc4: Programming the CTM is conditional on +Subject: [PATCH] drm: vc4: Programming the CTM is conditional on running full KMS vc4_ctm_commit writes to HVS registers, so this is only applicable diff --git a/target/linux/brcm2708/patches-4.19/950-0352-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch b/target/linux/brcm2708/patches-4.19/950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0352-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch rename to target/linux/brcm2708/patches-4.19/950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch index d7d2ae0d00..1280251403 100644 --- a/target/linux/brcm2708/patches-4.19/950-0352-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch +++ b/target/linux/brcm2708/patches-4.19/950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch @@ -1,7 +1,7 @@ From 39c4b77533bee8d88d2f4c9be9463041ec1dd483 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:33:29 +0000 -Subject: [PATCH 352/806] staging: mmal_vchiq: Add in the Bayer encoding +Subject: [PATCH] staging: mmal_vchiq: Add in the Bayer encoding formats The list of formats was copied before Bayer support was added. diff --git a/target/linux/brcm2708/patches-4.19/950-0353-staging-mmal-vchiq-Always-return-the-param-size-from.patch b/target/linux/brcm2708/patches-4.19/950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0353-staging-mmal-vchiq-Always-return-the-param-size-from.patch rename to target/linux/brcm2708/patches-4.19/950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch index d43c638fdc..121f855f1c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0353-staging-mmal-vchiq-Always-return-the-param-size-from.patch +++ b/target/linux/brcm2708/patches-4.19/950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch @@ -1,7 +1,7 @@ From 0c0e55d9b04868733f30c348df7400fa5e6d30e2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:36:56 +0000 -Subject: [PATCH 353/806] staging: mmal-vchiq: Always return the param size +Subject: [PATCH] staging: mmal-vchiq: Always return the param size from param_get mmal-vchiq is a reimplementation of the userland library for MMAL. diff --git a/target/linux/brcm2708/patches-4.19/950-0354-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch b/target/linux/brcm2708/patches-4.19/950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0354-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch rename to target/linux/brcm2708/patches-4.19/950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch index 04157a816e..603b394b0f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0354-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch +++ b/target/linux/brcm2708/patches-4.19/950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch @@ -1,7 +1,7 @@ From 78c34cf60b9ae8bf8aa797c72d2f1abdc0a0bb9d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 12:51:03 +0000 -Subject: [PATCH 354/806] staging: mmal-vchiq: If the VPU returns an error, +Subject: [PATCH] staging: mmal-vchiq: If the VPU returns an error, don't negate it There is an enum for the errors that the VPU can return. diff --git a/target/linux/brcm2708/patches-4.19/950-0355-staging-bcm2835_codec-Query-supported-formats-from-t.patch b/target/linux/brcm2708/patches-4.19/950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0355-staging-bcm2835_codec-Query-supported-formats-from-t.patch rename to target/linux/brcm2708/patches-4.19/950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch index cee550272c..5eec74e42a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0355-staging-bcm2835_codec-Query-supported-formats-from-t.patch +++ b/target/linux/brcm2708/patches-4.19/950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch @@ -1,7 +1,7 @@ From ce8cc7a85839af588b753ce4af0832db9c467f45 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 13:44:00 +0000 -Subject: [PATCH 355/806] staging: bcm2835_codec: Query supported formats from +Subject: [PATCH] staging: bcm2835_codec: Query supported formats from the component The driver was previously working with hard coded tables of diff --git a/target/linux/brcm2708/patches-4.19/950-0356-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch b/target/linux/brcm2708/patches-4.19/950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0356-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch rename to target/linux/brcm2708/patches-4.19/950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch index 30d99a0343..df59acd249 100644 --- a/target/linux/brcm2708/patches-4.19/950-0356-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch @@ -1,7 +1,7 @@ From 7afce6566802bcaa468f92b9e06da8b899161128 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 13 Feb 2019 14:07:52 +0000 -Subject: [PATCH 356/806] staging: bcm2835_codec: Add support for the ISP as an +Subject: [PATCH] staging: bcm2835_codec: Add support for the ISP as an M2M device The MMAL ISP component can also use this same V4L2 wrapper to diff --git a/target/linux/brcm2708/patches-4.19/950-0357-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch b/target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0357-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch rename to target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch index f46d05c59e..fcdcc4ab48 100644 --- a/target/linux/brcm2708/patches-4.19/950-0357-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch @@ -1,7 +1,7 @@ From a126fcc4ff38718e2e714fbb78db3ca1c4f8e564 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:36:14 +0000 -Subject: [PATCH 357/806] staging: bcm2835_codec: Add an option for ignoring +Subject: [PATCH] staging: bcm2835_codec: Add an option for ignoring Bayer formats. This is a workaround for GStreamer currently not identifying Bayer diff --git a/target/linux/brcm2708/patches-4.19/950-0358-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch b/target/linux/brcm2708/patches-4.19/950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0358-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch rename to target/linux/brcm2708/patches-4.19/950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch index 1fd4db3bfd..7e3373e489 100644 --- a/target/linux/brcm2708/patches-4.19/950-0358-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch +++ b/target/linux/brcm2708/patches-4.19/950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch @@ -1,7 +1,7 @@ From 0df32e2f563123166c20677f022d4a0f825c5df2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 15 Feb 2019 11:38:45 +0000 -Subject: [PATCH 358/806] staging: bcm2835_codec: Fix handling of +Subject: [PATCH] staging: bcm2835_codec: Fix handling of VB2_MEMORY_DMABUF buffers If the queue is configured as VB2_MEMORY_DMABUF then vb2_core_expbuf diff --git a/target/linux/brcm2708/patches-4.19/950-0359-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch b/target/linux/brcm2708/patches-4.19/950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0359-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch rename to target/linux/brcm2708/patches-4.19/950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch index 52ade9d575..98162a0e80 100644 --- a/target/linux/brcm2708/patches-4.19/950-0359-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch +++ b/target/linux/brcm2708/patches-4.19/950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch @@ -1,7 +1,7 @@ From f51a6ed76f6a59e65fe06d1f2e06e824f38ae604 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:52:29 +0000 -Subject: [PATCH 359/806] staging: mmal-vchiq: Update mmal_parameters.h with +Subject: [PATCH] staging: mmal-vchiq: Update mmal_parameters.h with recently defined params mmal_parameters.h hasn't been updated to reflect additions made diff --git a/target/linux/brcm2708/patches-4.19/950-0360-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch b/target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0360-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch rename to target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch index 33cd761a84..5e5f1a7bf8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0360-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch +++ b/target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch @@ -1,7 +1,7 @@ From 7f9fd2338e3a9d7b46b6904bbd7f97851e9b3f52 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 18 Feb 2019 15:56:42 +0000 -Subject: [PATCH 360/806] staging: bcm2835_codec: Include timing info in SPS +Subject: [PATCH] staging: bcm2835_codec: Include timing info in SPS headers Inserting timing information into the VUI block of the SPS is diff --git a/target/linux/brcm2708/patches-4.19/950-0361-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch b/target/linux/brcm2708/patches-4.19/950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0361-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch rename to target/linux/brcm2708/patches-4.19/950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch index cbaffb4648..545541f105 100644 --- a/target/linux/brcm2708/patches-4.19/950-0361-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch +++ b/target/linux/brcm2708/patches-4.19/950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch @@ -1,7 +1,7 @@ From dd5fa07672eb01a4d90dfa39a4c54eaa0e086386 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 5 Feb 2018 18:53:18 +0000 -Subject: [PATCH 361/806] drm/vc4: Don't wait for vblank on fkms cursor +Subject: [PATCH] drm/vc4: Don't wait for vblank on fkms cursor updates. We don't use the same async update path between fkms and normal kms, diff --git a/target/linux/brcm2708/patches-4.19/950-0362-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch b/target/linux/brcm2708/patches-4.19/950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0362-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch rename to target/linux/brcm2708/patches-4.19/950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch index ce36179bc3..657d70d82a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0362-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch +++ b/target/linux/brcm2708/patches-4.19/950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch @@ -1,7 +1,7 @@ From c93b0344d24ba63e0e4caeb693a9fcb7320aae3a Mon Sep 17 00:00:00 2001 From: Giedrius Date: Wed, 27 Feb 2019 14:27:28 +0000 -Subject: [PATCH 362/806] Fix for Pisound kernel module in Real Time kernel +Subject: [PATCH] Fix for Pisound kernel module in Real Time kernel configuration. When handler of data_available interrupt is fired, queue_work ends up diff --git a/target/linux/brcm2708/patches-4.19/950-0364-Added-mute-stream-func.patch b/target/linux/brcm2708/patches-4.19/950-0329-Added-mute-stream-func.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0364-Added-mute-stream-func.patch rename to target/linux/brcm2708/patches-4.19/950-0329-Added-mute-stream-func.patch index d700348551..7ab46e82fe 100644 --- a/target/linux/brcm2708/patches-4.19/950-0364-Added-mute-stream-func.patch +++ b/target/linux/brcm2708/patches-4.19/950-0329-Added-mute-stream-func.patch @@ -1,7 +1,7 @@ From 193dc2529db3cfee676aae2b18f059363e151e09 Mon Sep 17 00:00:00 2001 From: Jaikumar Date: Thu, 7 Jun 2018 21:22:45 +0530 -Subject: [PATCH 364/806] Added mute stream func +Subject: [PATCH] Added mute stream func Signed-off-by: Jaikumar --- diff --git a/target/linux/brcm2708/patches-4.19/950-0365-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/brcm2708/patches-4.19/950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0365-lan78xx-EEE-support-is-now-a-PHY-property.patch rename to target/linux/brcm2708/patches-4.19/950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch index bfefa39508..7d4bab5222 100644 --- a/target/linux/brcm2708/patches-4.19/950-0365-lan78xx-EEE-support-is-now-a-PHY-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch @@ -1,7 +1,7 @@ From 5917a0b0e56928aecd1270c85a79fce77a404629 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 5 Mar 2019 09:51:22 +0000 -Subject: [PATCH 365/806] lan78xx: EEE support is now a PHY property +Subject: [PATCH] lan78xx: EEE support is now a PHY property Now that EEE support is a property of the PHY, use the PHY's DT node when querying the EEE-related properties. diff --git a/target/linux/brcm2708/patches-4.19/950-0366-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch b/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0366-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch rename to target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch index 476f2b8b1c..d709214664 100644 --- a/target/linux/brcm2708/patches-4.19/950-0366-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch @@ -1,7 +1,7 @@ From a9a47ea599c12d29526138cd6e48f6c9eac19358 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 27 Feb 2019 17:30:33 +0000 -Subject: [PATCH 366/806] video: bcm2708_fb: Try allocating on the ARM and +Subject: [PATCH] video: bcm2708_fb: Try allocating on the ARM and passing to VPU Currently the VPU allocates the contiguous buffer for the diff --git a/target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch b/target/linux/brcm2708/patches-4.19/950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch rename to target/linux/brcm2708/patches-4.19/950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch index b1e0a83602..4f49925d97 100644 --- a/target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch +++ b/target/linux/brcm2708/patches-4.19/950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch @@ -1,7 +1,7 @@ From 7b2fac96ce48939e399707c4b8bd9905d6274a05 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 10:38:59 +0000 -Subject: [PATCH 367/806] staging: vc_sm_cma: Remove erroneous misc_deregister +Subject: [PATCH] staging: vc_sm_cma: Remove erroneous misc_deregister Code from the misc /dev node was still present in bcm2835_vc_sm_cma_remove, which caused a NULL deref. diff --git a/target/linux/brcm2708/patches-4.19/950-0368-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch b/target/linux/brcm2708/patches-4.19/950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0368-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch rename to target/linux/brcm2708/patches-4.19/950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch index 0f0a6a873e..962c3deafb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0368-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch +++ b/target/linux/brcm2708/patches-4.19/950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch @@ -1,7 +1,7 @@ From d36a5a94156ebe7e9906574fa8b01b200a15c11d Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 18 Mar 2019 17:14:51 +0000 -Subject: [PATCH 368/806] vcsm: Fix makefile include on out-of-tree builds +Subject: [PATCH] vcsm: Fix makefile include on out-of-tree builds The vc_sm module tries to include the 'fs' directory from the $(srctree). $(srctree) is already provided by the build system, and diff --git a/target/linux/brcm2708/patches-4.19/950-0369-vcsm-Remove-set-but-unused-variable.patch b/target/linux/brcm2708/patches-4.19/950-0334-vcsm-Remove-set-but-unused-variable.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0369-vcsm-Remove-set-but-unused-variable.patch rename to target/linux/brcm2708/patches-4.19/950-0334-vcsm-Remove-set-but-unused-variable.patch index cf6d0101fa..267cad41a6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0369-vcsm-Remove-set-but-unused-variable.patch +++ b/target/linux/brcm2708/patches-4.19/950-0334-vcsm-Remove-set-but-unused-variable.patch @@ -1,7 +1,7 @@ From 5a58b2bb907d57dc2b1cc2619bd5f1d948509e3e Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 18 Mar 2019 17:16:41 +0000 -Subject: [PATCH 369/806] vcsm: Remove set but unused variable +Subject: [PATCH] vcsm: Remove set but unused variable The 'success' variable is set by the call to vchi_service_close() but never checked. Remove it, keeping the call in place. diff --git a/target/linux/brcm2708/patches-4.19/950-0370-vcsm-Reduce-scope-of-local-functions.patch b/target/linux/brcm2708/patches-4.19/950-0335-vcsm-Reduce-scope-of-local-functions.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0370-vcsm-Reduce-scope-of-local-functions.patch rename to target/linux/brcm2708/patches-4.19/950-0335-vcsm-Reduce-scope-of-local-functions.patch index 14b1c8bc7d..311ae66770 100644 --- a/target/linux/brcm2708/patches-4.19/950-0370-vcsm-Reduce-scope-of-local-functions.patch +++ b/target/linux/brcm2708/patches-4.19/950-0335-vcsm-Reduce-scope-of-local-functions.patch @@ -1,7 +1,7 @@ From 2a1fd1a32b7355c6ae8c5fc1654a96fa42e00586 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 18 Mar 2019 17:17:40 +0000 -Subject: [PATCH 370/806] vcsm: Reduce scope of local functions +Subject: [PATCH] vcsm: Reduce scope of local functions The functions: diff --git a/target/linux/brcm2708/patches-4.19/950-0371-staging-bcm2835-codec-NULL-component-handle-on-queue.patch b/target/linux/brcm2708/patches-4.19/950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0371-staging-bcm2835-codec-NULL-component-handle-on-queue.patch rename to target/linux/brcm2708/patches-4.19/950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch index 9f87092656..ee5d01d3aa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0371-staging-bcm2835-codec-NULL-component-handle-on-queue.patch +++ b/target/linux/brcm2708/patches-4.19/950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch @@ -1,7 +1,7 @@ From 140c118a9886b0386d748e6aa7cbd8ba9f9b0ede Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Mar 2019 17:55:09 +0000 -Subject: [PATCH 371/806] staging: bcm2835-codec: NULL component handle on +Subject: [PATCH] staging: bcm2835-codec: NULL component handle on queue_setup failure queue_setup tries creating the relevant MMAL component and configures diff --git a/target/linux/brcm2708/patches-4.19/950-0372-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch b/target/linux/brcm2708/patches-4.19/950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0372-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch rename to target/linux/brcm2708/patches-4.19/950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch index 4d16388828..aeea6c88ae 100644 --- a/target/linux/brcm2708/patches-4.19/950-0372-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch +++ b/target/linux/brcm2708/patches-4.19/950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch @@ -1,7 +1,7 @@ From 4857371a7cc5d371b1e4221fa38848716a779eb1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 10:49:17 +0000 -Subject: [PATCH 372/806] staging: vc-sm-cma: Remove the debugfs directory on +Subject: [PATCH] staging: vc-sm-cma: Remove the debugfs directory on remove Without removing that, reloading the driver fails. diff --git a/target/linux/brcm2708/patches-4.19/950-0373-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch b/target/linux/brcm2708/patches-4.19/950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0373-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch rename to target/linux/brcm2708/patches-4.19/950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch index 3043111ead..70b73dd714 100644 --- a/target/linux/brcm2708/patches-4.19/950-0373-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch +++ b/target/linux/brcm2708/patches-4.19/950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch @@ -1,7 +1,7 @@ From 6214831525192a9eb665c67fe8c93006c17acbad Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:06:41 +0000 -Subject: [PATCH 373/806] staging: vc-sm-cma: Use devm_ allocs for sm_state. +Subject: [PATCH] staging: vc-sm-cma: Use devm_ allocs for sm_state. Use managed allocations for sm_state, removing reliance on manual management. diff --git a/target/linux/brcm2708/patches-4.19/950-0374-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch b/target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0374-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch rename to target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch index 6ad01d26a5..f8b7ca28ad 100644 --- a/target/linux/brcm2708/patches-4.19/950-0374-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch +++ b/target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch @@ -1,7 +1,7 @@ From 13572df6bba85d8fc91a212faa89b5b6147bdf94 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:09:49 +0000 -Subject: [PATCH 374/806] staging: vc-sm-cma: Don't fail if debugfs calls fail. +Subject: [PATCH] staging: vc-sm-cma: Don't fail if debugfs calls fail. Return codes from debugfs calls should never alter the flow of the main code. diff --git a/target/linux/brcm2708/patches-4.19/950-0375-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch b/target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0375-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch rename to target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch index 000248a4e2..6133840b71 100644 --- a/target/linux/brcm2708/patches-4.19/950-0375-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch +++ b/target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch @@ -1,7 +1,7 @@ From 4027b08d96c68919f51c768a23877283ef5aefb9 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:11:46 +0000 -Subject: [PATCH 375/806] staging: vc-sm-cma: Ensure mutex and idr are +Subject: [PATCH] staging: vc-sm-cma: Ensure mutex and idr are destroyed map_lock and kernelid_map are created in probe, but not released diff --git a/target/linux/brcm2708/patches-4.19/950-0376-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch b/target/linux/brcm2708/patches-4.19/950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0376-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch rename to target/linux/brcm2708/patches-4.19/950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch index c1a89ebf49..4bf0c78222 100644 --- a/target/linux/brcm2708/patches-4.19/950-0376-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch @@ -1,7 +1,7 @@ From c42ae04bb6ed5be61d3b3e2e2c6004ae252ee34a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 8 Mar 2019 11:26:00 +0000 -Subject: [PATCH 376/806] staging: bcm2835_codec: Clean up logging on unloading +Subject: [PATCH] staging: bcm2835_codec: Clean up logging on unloading the driver The log line was missing a closing \n, so wasn't added to the diff --git a/target/linux/brcm2708/patches-4.19/950-0378-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch b/target/linux/brcm2708/patches-4.19/950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0378-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch rename to target/linux/brcm2708/patches-4.19/950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch index 15ac5ac229..e16e12da3c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0378-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch +++ b/target/linux/brcm2708/patches-4.19/950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch @@ -1,7 +1,7 @@ From 44db7882be675cdf2d89741af5bbeba41b3e25af Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 13 Mar 2019 14:19:11 +0000 -Subject: [PATCH 378/806] bcm2835-sdhost: Allow for sg entries that cross pages +Subject: [PATCH] bcm2835-sdhost: Allow for sg entries that cross pages The dma_complete handling code calculates a virtual address for a page then adds an offset, but if the offset is more than a page and HIGHMEM diff --git a/target/linux/brcm2708/patches-4.19/950-0379-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch b/target/linux/brcm2708/patches-4.19/950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0379-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch rename to target/linux/brcm2708/patches-4.19/950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch index 3de9197d60..f823f670e4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0379-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch +++ b/target/linux/brcm2708/patches-4.19/950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch @@ -1,7 +1,7 @@ From 7c23c772289fa31960b9e6969499aa93c92d842b Mon Sep 17 00:00:00 2001 From: Adrien RICCIARDI Date: Fri, 22 Mar 2019 11:35:30 +0100 -Subject: [PATCH 379/806] overlays: sdio: Added 4-bit support on GPIOs 34-39. +Subject: [PATCH] overlays: sdio: Added 4-bit support on GPIOs 34-39. (#2903) --- diff --git a/target/linux/brcm2708/patches-4.19/950-0380-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch b/target/linux/brcm2708/patches-4.19/950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0380-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch rename to target/linux/brcm2708/patches-4.19/950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch index 95455d7cc7..86fd110342 100644 --- a/target/linux/brcm2708/patches-4.19/950-0380-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch +++ b/target/linux/brcm2708/patches-4.19/950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch @@ -1,7 +1,7 @@ From 649efe5db3900ed3bbfd3c3daa3b96d8fc0b9d68 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Mar 2019 16:44:47 +0000 -Subject: [PATCH 380/806] overlays: Fix multiple-instantiation of sc16is7xx* +Subject: [PATCH] overlays: Fix multiple-instantiation of sc16is7xx* The registration of the fixed clocks uses the node name as the clock name, causing a clash if two clock nodes have the same name, regardless diff --git a/target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch b/target/linux/brcm2708/patches-4.19/950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch rename to target/linux/brcm2708/patches-4.19/950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch index 3c62a9d10c..1122e3c3e2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0382-bcm2835-mmc-Fix-DMA-channel-leak.patch +++ b/target/linux/brcm2708/patches-4.19/950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch @@ -1,7 +1,7 @@ From 7458efc95816cc9d716d94a4894172c2a9d9fba7 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Wed, 16 Jan 2019 12:22:32 +0100 -Subject: [PATCH 382/806] bcm2835-mmc: Fix DMA channel leak +Subject: [PATCH] bcm2835-mmc: Fix DMA channel leak The BCM2835 MMC host driver requests a DMA channel on probe but neglects to release the channel in the probe error path and on driver unbind. diff --git a/target/linux/brcm2708/patches-4.19/950-0383-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch b/target/linux/brcm2708/patches-4.19/950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0383-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch rename to target/linux/brcm2708/patches-4.19/950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch index b54374dfcd..9ec4404bef 100644 --- a/target/linux/brcm2708/patches-4.19/950-0383-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch +++ b/target/linux/brcm2708/patches-4.19/950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch @@ -1,7 +1,7 @@ From 82ced13dc5805f6e49e2182269e672b20d8394bc Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Sat, 19 Jan 2019 08:06:48 +0100 -Subject: [PATCH 383/806] bcm2835-mmc: Fix struct mmc_host leak on probe +Subject: [PATCH] bcm2835-mmc: Fix struct mmc_host leak on probe The BCM2835 MMC host driver requests the bus address of the host's register map on probe. If that fails, the driver leaks the struct diff --git a/target/linux/brcm2708/patches-4.19/950-0384-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch b/target/linux/brcm2708/patches-4.19/950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0384-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch rename to target/linux/brcm2708/patches-4.19/950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch index ecbffb4665..0ca7c11822 100644 --- a/target/linux/brcm2708/patches-4.19/950-0384-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch +++ b/target/linux/brcm2708/patches-4.19/950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch @@ -1,7 +1,7 @@ From 4a15e086fa9531f808c15b8fb8d7ed1fdb411b74 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Sat, 19 Jan 2019 09:00:26 +0100 -Subject: [PATCH 384/806] bcm2835-mmc: Fix duplicate free_irq() on remove +Subject: [PATCH] bcm2835-mmc: Fix duplicate free_irq() on remove The BCM2835 MMC host driver requests its interrupt as a device-managed resource, so the interrupt is automatically freed after the driver is diff --git a/target/linux/brcm2708/patches-4.19/950-0385-bcm2835-mmc-Handle-mmc_add_host-errors.patch b/target/linux/brcm2708/patches-4.19/950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0385-bcm2835-mmc-Handle-mmc_add_host-errors.patch rename to target/linux/brcm2708/patches-4.19/950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch index 2635cf2dc4..3762f4b70a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0385-bcm2835-mmc-Handle-mmc_add_host-errors.patch +++ b/target/linux/brcm2708/patches-4.19/950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch @@ -1,7 +1,7 @@ From 2e2f57e09e1ace18ae01a87d9fc4378c96c54370 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Tue, 22 Jan 2019 12:29:45 +0100 -Subject: [PATCH 385/806] bcm2835-mmc: Handle mmc_add_host() errors +Subject: [PATCH] bcm2835-mmc: Handle mmc_add_host() errors The BCM2835 MMC host driver calls mmc_add_host() but doesn't check its return value. Errors occurring in that function are therefore not diff --git a/target/linux/brcm2708/patches-4.19/950-0386-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch b/target/linux/brcm2708/patches-4.19/950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0386-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch rename to target/linux/brcm2708/patches-4.19/950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch index dfe2e81c2f..ed3910d7a1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0386-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch @@ -1,7 +1,7 @@ From 3f6e190df3989e10a9baf591a7bf67d754842533 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Sat, 19 Jan 2019 08:42:40 +0100 -Subject: [PATCH 386/806] bcm2835-mmc: Deduplicate reset of driver data on +Subject: [PATCH] bcm2835-mmc: Deduplicate reset of driver data on remove The BCM2835 MMC host driver sets the device's driver data pointer to diff --git a/target/linux/brcm2708/patches-4.19/950-0388-overlays-Add-max17040-support-to-i2c-sensor.patch b/target/linux/brcm2708/patches-4.19/950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0388-overlays-Add-max17040-support-to-i2c-sensor.patch rename to target/linux/brcm2708/patches-4.19/950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch index 385363a012..e87cf1a95f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0388-overlays-Add-max17040-support-to-i2c-sensor.patch +++ b/target/linux/brcm2708/patches-4.19/950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch @@ -1,7 +1,7 @@ From fe6ccc8df700133615716df211f183c9c27d1e2e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 25 Mar 2019 18:03:48 +0000 -Subject: [PATCH 388/806] overlays: Add max17040 support to i2c-sensor +Subject: [PATCH] overlays: Add max17040 support to i2c-sensor See: https://github.com/raspberrypi/linux/issues/2906 diff --git a/target/linux/brcm2708/patches-4.19/950-0390-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch b/target/linux/brcm2708/patches-4.19/950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0390-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch rename to target/linux/brcm2708/patches-4.19/950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch index 9d1e9469d3..c1686f55cd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0390-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch @@ -1,7 +1,7 @@ From 7c876909bc0a6d23124689d5fca89657a4fcb5a5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 5 Mar 2019 15:43:27 +0000 -Subject: [PATCH 390/806] media: bcm2835-unicam: Add support for enum +Subject: [PATCH] media: bcm2835-unicam: Add support for enum framesizes and frameintervals vidioc_enum_framesizes and vidioc_enum_frameintervals weren't implemented, diff --git a/target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-codec-Refactor-default-resolution-co.patch b/target/linux/brcm2708/patches-4.19/950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-codec-Refactor-default-resolution-co.patch rename to target/linux/brcm2708/patches-4.19/950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch index 65ddac97de..cd592e27da 100644 --- a/target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-codec-Refactor-default-resolution-co.patch +++ b/target/linux/brcm2708/patches-4.19/950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch @@ -1,7 +1,7 @@ From a97baa799a8069fe965a4d194935c025e21acf8e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 20 Mar 2019 10:06:51 +0000 -Subject: [PATCH 391/806] staging: bcm2835-codec: Refactor default resolution +Subject: [PATCH] staging: bcm2835-codec: Refactor default resolution code The default resolution code was different for each role diff --git a/target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch b/target/linux/brcm2708/patches-4.19/950-0353-nvmem-add-type-attribute.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch rename to target/linux/brcm2708/patches-4.19/950-0353-nvmem-add-type-attribute.patch index 7e343f4dc7..661ba8e33d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0392-nvmem-add-type-attribute.patch +++ b/target/linux/brcm2708/patches-4.19/950-0353-nvmem-add-type-attribute.patch @@ -1,7 +1,7 @@ From c9e76146066660a2884e61216c1ce227cf509bf8 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Fri, 30 Nov 2018 11:53:20 +0000 -Subject: [PATCH 392/806] nvmem: add type attribute +Subject: [PATCH] nvmem: add type attribute commit 16688453661b6d5159be558a1f8c1f54463a420f upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0393-rtc-rv3028-add-new-driver.patch b/target/linux/brcm2708/patches-4.19/950-0354-rtc-rv3028-add-new-driver.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0393-rtc-rv3028-add-new-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0354-rtc-rv3028-add-new-driver.patch index 72392512b3..6a00e82300 100644 --- a/target/linux/brcm2708/patches-4.19/950-0393-rtc-rv3028-add-new-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0354-rtc-rv3028-add-new-driver.patch @@ -1,7 +1,7 @@ From bb0e317bfc453877805a12f975490ad38b6413f1 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 13 Feb 2019 00:21:36 +0100 -Subject: [PATCH 393/806] rtc: rv3028: add new driver +Subject: [PATCH] rtc: rv3028: add new driver upstream commit e6e7376cfd7b3f9b63de3a22792f64d9bfb2ab53. diff --git a/target/linux/brcm2708/patches-4.19/950-0395-overlays-Add-rv3028-to-i2c-rtc.patch b/target/linux/brcm2708/patches-4.19/950-0355-overlays-Add-rv3028-to-i2c-rtc.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0395-overlays-Add-rv3028-to-i2c-rtc.patch rename to target/linux/brcm2708/patches-4.19/950-0355-overlays-Add-rv3028-to-i2c-rtc.patch index de637b3b27..22280224f1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0395-overlays-Add-rv3028-to-i2c-rtc.patch +++ b/target/linux/brcm2708/patches-4.19/950-0355-overlays-Add-rv3028-to-i2c-rtc.patch @@ -1,7 +1,7 @@ From 67dd8e4c8ccf5d331960c7e936e5b03a9f92496d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 28 Mar 2019 13:26:59 +0000 -Subject: [PATCH 395/806] overlays: Add rv3028 to i2c-rtc +Subject: [PATCH] overlays: Add rv3028 to i2c-rtc See: https://github.com/raspberrypi/linux/issues/2912 diff --git a/target/linux/brcm2708/patches-4.19/950-0396-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch b/target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0396-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch rename to target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch index 4b9d629e81..aa5f12a5ca 100644 --- a/target/linux/brcm2708/patches-4.19/950-0396-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch +++ b/target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch @@ -1,7 +1,7 @@ From 053938f67f73773152f70d89aa32e7893ee19694 Mon Sep 17 00:00:00 2001 From: b-ak Date: Wed, 9 Jan 2019 22:41:21 +0530 -Subject: [PATCH 396/806] ASoC: tlv320aic32x4: SND_SOC_DAPM_MICBIAS is +Subject: [PATCH] ASoC: tlv320aic32x4: SND_SOC_DAPM_MICBIAS is deprecated commit 04d979d7a7bac2f645cd827ea37e5ffa5b4e1f97 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0397-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch b/target/linux/brcm2708/patches-4.19/950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0397-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch rename to target/linux/brcm2708/patches-4.19/950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch index 1b069f6f1c..3a63be1784 100644 --- a/target/linux/brcm2708/patches-4.19/950-0397-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch @@ -1,7 +1,7 @@ From 95b3311cbcd29e07af1ee96b6b37c9089567bcff Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Mon, 18 Mar 2019 20:37:44 -0700 -Subject: [PATCH 397/806] ASoC: tlv320aic32x4: Break out clock setting into +Subject: [PATCH] ASoC: tlv320aic32x4: Break out clock setting into separate function commit bf31cbfbe25001036e1e096b1c260bf871766ea5 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0398-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch b/target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0398-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch rename to target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch index b405fd67b2..cae096bd95 100644 --- a/target/linux/brcm2708/patches-4.19/950-0398-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch +++ b/target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch @@ -1,7 +1,7 @@ From 6cc882cf38b62fce2a07640413b05b43b420c77a Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Wed, 20 Mar 2019 19:38:44 -0700 -Subject: [PATCH 398/806] ASoC: tlv320aic32x4: Properly Set Processing Blocks +Subject: [PATCH] ASoC: tlv320aic32x4: Properly Set Processing Blocks commit c95e3a4b96293403a427b5185e60fad28af51fdd upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0399-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0399-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch index fb6ab5db8e..4e0ddb9124 100644 --- a/target/linux/brcm2708/patches-4.19/950-0399-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch @@ -1,7 +1,7 @@ From 957ccf05060d65da074d019679ec7f486477e412 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:45 -0700 -Subject: [PATCH 399/806] ASoC: tlv320aic32x4: Model PLL in CCF +Subject: [PATCH] ASoC: tlv320aic32x4: Model PLL in CCF commit 514b044cba667e4b7c383ec79b42b997e624b91d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch index 3074140a6d..928d05a1d0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch @@ -1,7 +1,7 @@ From c5f9d78ec34de15732bcbff52bedba7a840e42b2 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:46 -0700 -Subject: [PATCH 400/806] ASoC: tlv320aic32x4: Model CODEC_CLKIN in CCF +Subject: [PATCH] ASoC: tlv320aic32x4: Model CODEC_CLKIN in CCF commit fd2df3aeafa4b4cc468d58e147e0822967034b71 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0401-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0401-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch index 6d9069323f..fc671a4705 100644 --- a/target/linux/brcm2708/patches-4.19/950-0401-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch @@ -1,7 +1,7 @@ From 3bf2e5984ab7acb4469ab0f3dfee8b7392001bbf Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:47 -0700 -Subject: [PATCH 401/806] ASoC: tlv320aic32x4: Model DAC/ADC dividers in CCF +Subject: [PATCH] ASoC: tlv320aic32x4: Model DAC/ADC dividers in CCF commit a51b50062091619915c5155085bbe13a7aca6903 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0402-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0402-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch index 3bcc52e3e5..708e449275 100644 --- a/target/linux/brcm2708/patches-4.19/950-0402-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch @@ -1,7 +1,7 @@ From 69f3f8c51077d0f3dc7f46c2c9a94da899d8eb7c Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:48 -0700 -Subject: [PATCH 402/806] ASoC: tlv320aic32x4: Model BDIV divider in CCF +Subject: [PATCH] ASoC: tlv320aic32x4: Model BDIV divider in CCF commit 9b484124ebd906c4d6bc826cc0d417e80cc1105c upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0403-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0403-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch index e601d8fb02..c056c34ad7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0403-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch @@ -1,7 +1,7 @@ From f844ea32cba0c4030594a0f590725477a5751f32 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:49 -0700 -Subject: [PATCH 403/806] ASoC: tlv320aic32x4: Control clock gating with CCF +Subject: [PATCH] ASoC: tlv320aic32x4: Control clock gating with CCF commit d25970b5fd51e9fcf0afbe190908ea4049454da4 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0404-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch b/target/linux/brcm2708/patches-4.19/950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0404-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch rename to target/linux/brcm2708/patches-4.19/950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch index 2a37d65abb..85b008e5a4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0404-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch +++ b/target/linux/brcm2708/patches-4.19/950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch @@ -1,7 +1,7 @@ From a2d8d212b986e4a4ae52c748d246e4c28ebaf1bc Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:50 -0700 -Subject: [PATCH 404/806] ASoC: tlv320aic32x4: Move aosr and dosr setting to +Subject: [PATCH] ASoC: tlv320aic32x4: Move aosr and dosr setting to separate functions commit fbafbf6517274a797e6e6508c18dd8dba5920c89 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch b/target/linux/brcm2708/patches-4.19/950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch rename to target/linux/brcm2708/patches-4.19/950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch index 173af094d4..94552065eb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch +++ b/target/linux/brcm2708/patches-4.19/950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch @@ -1,7 +1,7 @@ From 3e62c56daa1c799bb2a1d954ecfb88e8d37421bb Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:51 -0700 -Subject: [PATCH 405/806] ASoC: tlv320aic32x4: Dynamically Determine Clocking +Subject: [PATCH] ASoC: tlv320aic32x4: Dynamically Determine Clocking commit 96c3bb00239de4fb5f4ddca42c1f90d6d9b3c697 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0406-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch b/target/linux/brcm2708/patches-4.19/950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0406-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch rename to target/linux/brcm2708/patches-4.19/950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch index 1f26a578db..5caebcb27d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0406-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch +++ b/target/linux/brcm2708/patches-4.19/950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch @@ -1,7 +1,7 @@ From 5ec6ed3e423878cf975a955c8796c2cdb10b5ca7 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:52 -0700 -Subject: [PATCH 406/806] ASoC: tlv320aic32x4: Restructure set_dai_sysclk +Subject: [PATCH] ASoC: tlv320aic32x4: Restructure set_dai_sysclk commit aa6a60f7be925210d5156f0e8025f3afe1f4f54d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0407-ASoC-tlv320aic32x4-Remove-mclk-references.patch b/target/linux/brcm2708/patches-4.19/950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0407-ASoC-tlv320aic32x4-Remove-mclk-references.patch rename to target/linux/brcm2708/patches-4.19/950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch index 7f3e708191..bee58524cd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0407-ASoC-tlv320aic32x4-Remove-mclk-references.patch +++ b/target/linux/brcm2708/patches-4.19/950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch @@ -1,7 +1,7 @@ From 3c7bf08e6b6bdc2e6005aaa5e6aa6d12ce40d406 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:53 -0700 -Subject: [PATCH 407/806] ASoC: tlv320aic32x4: Remove mclk references +Subject: [PATCH] ASoC: tlv320aic32x4: Remove mclk references commit 78f2d58a289302e56a7def96a783a7686ebf27e2 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0408-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch b/target/linux/brcm2708/patches-4.19/950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0408-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch rename to target/linux/brcm2708/patches-4.19/950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch index c4673249c5..15ded09f36 100644 --- a/target/linux/brcm2708/patches-4.19/950-0408-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch +++ b/target/linux/brcm2708/patches-4.19/950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch @@ -1,7 +1,7 @@ From e54269cdeb78beb5131594de702daeecc2b05ec2 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Thu, 21 Mar 2019 17:58:54 -0700 -Subject: [PATCH 408/806] ASoC: tlv320aic32x4: Allow 192000 Sample Rate +Subject: [PATCH] ASoC: tlv320aic32x4: Allow 192000 Sample Rate commit 6d56ee1550b8a81bc63c80051ff78d8d704b09ba upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0409-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch b/target/linux/brcm2708/patches-4.19/950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0409-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch rename to target/linux/brcm2708/patches-4.19/950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch index a27e720b82..d995353ef4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0409-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch +++ b/target/linux/brcm2708/patches-4.19/950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch @@ -1,7 +1,7 @@ From 0ef20f96802fac1ce888a1e0b56e14b6b3fd4f72 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 26 Mar 2019 13:10:13 +0000 -Subject: [PATCH 409/806] ASoC: tlv320aic32x4: Only enable with common clock +Subject: [PATCH] ASoC: tlv320aic32x4: Only enable with common clock commit 64f01d2b5ccc621c3aa66b82daf9154f5581f36a upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch index 1532461cdb..ba10100241 100644 --- a/target/linux/brcm2708/patches-4.19/950-0410-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch @@ -1,7 +1,7 @@ From c667b06f616d5dec68469ac73764abd5bcb1d694 Mon Sep 17 00:00:00 2001 From: FERHAT Nicolas Date: Fri, 5 Apr 2019 13:06:42 +0100 -Subject: [PATCH 410/806] Audiophonics I-Sabre 9038Q2M DAC driver +Subject: [PATCH] Audiophonics I-Sabre 9038Q2M DAC driver Signed-off-by: Audiophonics --- diff --git a/target/linux/brcm2708/patches-4.19/950-0411-ASoC-tlv320aic32x4-Change-author-s-name.patch b/target/linux/brcm2708/patches-4.19/950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0411-ASoC-tlv320aic32x4-Change-author-s-name.patch rename to target/linux/brcm2708/patches-4.19/950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch index 558fddae57..8c4cdd568b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0411-ASoC-tlv320aic32x4-Change-author-s-name.patch +++ b/target/linux/brcm2708/patches-4.19/950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch @@ -1,7 +1,7 @@ From 5942d9e650ce419236d5a7dc53c2513889ed3453 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Wed, 3 Apr 2019 21:17:15 -0700 -Subject: [PATCH 411/806] ASoC: tlv320aic32x4: Change author's name +Subject: [PATCH] ASoC: tlv320aic32x4: Change author's name commit 7297ba6c74c5b9e78d8e936af82eecfcf7d32dfb upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0412-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch b/target/linux/brcm2708/patches-4.19/950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0412-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch rename to target/linux/brcm2708/patches-4.19/950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch index 6341948129..b967edafa0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0412-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch +++ b/target/linux/brcm2708/patches-4.19/950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch @@ -1,7 +1,7 @@ From 1ed86adfa457ecd9668f2541dabfebd3ee82d035 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Wed, 3 Apr 2019 21:17:16 -0700 -Subject: [PATCH 412/806] ASoC: tlv320aic32x4: Update copyright and use SPDX +Subject: [PATCH] ASoC: tlv320aic32x4: Update copyright and use SPDX identifier commit 8a1d95c393d971e624fc28f11516b0bc3a7fa706 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0413-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch b/target/linux/brcm2708/patches-4.19/950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0413-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch rename to target/linux/brcm2708/patches-4.19/950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch index af7ff04a73..1d57237059 100644 --- a/target/linux/brcm2708/patches-4.19/950-0413-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch +++ b/target/linux/brcm2708/patches-4.19/950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch @@ -1,7 +1,7 @@ From 0962637c67a56c1ae42ccb14c9e71c62f4aa1403 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Wed, 3 Apr 2019 21:01:54 -0700 -Subject: [PATCH 413/806] ASoC: tlv320aic32x4: Add Switch for Setting Common +Subject: [PATCH] ASoC: tlv320aic32x4: Add Switch for Setting Common Mode Voltage commit 44ceee847e27c828f2f1ef4e400e6bc0c8d04de3 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0414-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch b/target/linux/brcm2708/patches-4.19/950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0414-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch rename to target/linux/brcm2708/patches-4.19/950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch index ed99515eb2..98514255df 100644 --- a/target/linux/brcm2708/patches-4.19/950-0414-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch +++ b/target/linux/brcm2708/patches-4.19/950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch @@ -1,7 +1,7 @@ From 6e5099288c946037476abd1488e4c7ab6b818e2b Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Wed, 3 Apr 2019 21:01:55 -0700 -Subject: [PATCH 414/806] ASoC: tlv320aic32x4: Add Playback PowerTune Controls +Subject: [PATCH] ASoC: tlv320aic32x4: Add Playback PowerTune Controls commit d3e6e374566e1154820a9a3dc82f7eef646fcf95 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0415-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch b/target/linux/brcm2708/patches-4.19/950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0415-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch rename to target/linux/brcm2708/patches-4.19/950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch index b244fec143..ecc637c3a2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0415-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch @@ -1,7 +1,7 @@ From 1d3aeba25b10d1ed2b5ae4cf0b535d821539a531 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sun, 17 Mar 2019 16:48:36 -0700 -Subject: [PATCH 415/806] dtoverlays: Add Support for the UDRC/DRAWS +Subject: [PATCH] dtoverlays: Add Support for the UDRC/DRAWS Adds a new overlay to support the Northwest Digital Radio DRAWS and UDRC HATs. See http://nwdigitalradio.com. diff --git a/target/linux/brcm2708/patches-4.19/950-0416-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch b/target/linux/brcm2708/patches-4.19/950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0416-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch rename to target/linux/brcm2708/patches-4.19/950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch index 6b72edb0b3..d2a9973fa8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0416-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch @@ -1,7 +1,7 @@ From 0c988aed71773be4481b886ccf03c40a52f57cdb Mon Sep 17 00:00:00 2001 From: P33M Date: Mon, 8 Apr 2019 12:45:23 +0100 -Subject: [PATCH 416/806] dwc_otg: only do_split when we actually need to do a +Subject: [PATCH] dwc_otg: only do_split when we actually need to do a split The previous test would fail if the root port was in fullspeed mode diff --git a/target/linux/brcm2708/patches-4.19/950-0417-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch b/target/linux/brcm2708/patches-4.19/950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0417-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch rename to target/linux/brcm2708/patches-4.19/950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch index abe176ee1a..84c99ffa5a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0417-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch +++ b/target/linux/brcm2708/patches-4.19/950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch @@ -1,7 +1,7 @@ From 9c823e2ee1ec1b815b8ec29c231b112c5e397202 Mon Sep 17 00:00:00 2001 From: Samuel Hsu Date: Mon, 8 Apr 2019 16:42:17 +0200 -Subject: [PATCH 417/806] Input: ili210x - fetch touchscreen geometry from DT +Subject: [PATCH] Input: ili210x - fetch touchscreen geometry from DT commit f67cc3e927d8414ad3872e046764534ea1f5db0d upstream diff --git a/target/linux/brcm2708/patches-4.19/950-0418-Input-ili210x-add-DT-binding-document.patch b/target/linux/brcm2708/patches-4.19/950-0378-Input-ili210x-add-DT-binding-document.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0418-Input-ili210x-add-DT-binding-document.patch rename to target/linux/brcm2708/patches-4.19/950-0378-Input-ili210x-add-DT-binding-document.patch index 2d968fde69..5eb3703b78 100644 --- a/target/linux/brcm2708/patches-4.19/950-0418-Input-ili210x-add-DT-binding-document.patch +++ b/target/linux/brcm2708/patches-4.19/950-0378-Input-ili210x-add-DT-binding-document.patch @@ -1,7 +1,7 @@ From 9ee66e1acf33fd1dcf4beb8a6fce4fdade01ab05 Mon Sep 17 00:00:00 2001 From: Samuel Hsu Date: Mon, 8 Apr 2019 16:49:51 +0200 -Subject: [PATCH 418/806] Input: ili210x - add DT binding document +Subject: [PATCH] Input: ili210x - add DT binding document commit 41a852e002e65ab7a1e6841b485d72d022e95df2 upstream diff --git a/target/linux/brcm2708/patches-4.19/950-0420-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch b/target/linux/brcm2708/patches-4.19/950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0420-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch rename to target/linux/brcm2708/patches-4.19/950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch index b1c0b6ff4e..0967821a4c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0420-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch +++ b/target/linux/brcm2708/patches-4.19/950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch @@ -1,7 +1,7 @@ From c0dfc87e355a7c6e434122e1a4fcc69729970610 Mon Sep 17 00:00:00 2001 From: Samuel Hsu Date: Mon, 8 Apr 2019 17:06:44 +0200 -Subject: [PATCH 420/806] BCM2708: Add core Device Tree support, ilitek251x +Subject: [PATCH] BCM2708: Add core Device Tree support, ilitek251x Signed-off-by: Samuel Hsu --- diff --git a/target/linux/brcm2708/patches-4.19/950-0421-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch b/target/linux/brcm2708/patches-4.19/950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0421-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch rename to target/linux/brcm2708/patches-4.19/950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch index dbf383f6c3..53e2c98ce5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0421-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch +++ b/target/linux/brcm2708/patches-4.19/950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch @@ -1,7 +1,7 @@ From ea7ff2070d564858c445cfdbd883ea00927c0ada Mon Sep 17 00:00:00 2001 From: P33M Date: Tue, 9 Apr 2019 16:40:48 +0100 -Subject: [PATCH 421/806] dwc_otg: fix locking around dequeueing and killing +Subject: [PATCH] dwc_otg: fix locking around dequeueing and killing URBs kill_urbs_in_qh_list() is practically only ever called with the fiq lock diff --git a/target/linux/brcm2708/patches-4.19/950-0422-rtc-rv3028-Add-backup-switchover-mode-support.patch b/target/linux/brcm2708/patches-4.19/950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0422-rtc-rv3028-Add-backup-switchover-mode-support.patch rename to target/linux/brcm2708/patches-4.19/950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch index 2b78e0bee4..7eac71099d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0422-rtc-rv3028-Add-backup-switchover-mode-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch @@ -1,7 +1,7 @@ From fb4e195012c405a04b1a7a86e240ceada0c8aa65 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:53:14 +0000 -Subject: [PATCH 422/806] rtc: rv3028: Add backup switchover mode support +Subject: [PATCH] rtc: rv3028: Add backup switchover mode support Signed-off-by: Phil Howard --- diff --git a/target/linux/brcm2708/patches-4.19/950-0423-dt-bindings-rv3028-backup-switchover-support.patch b/target/linux/brcm2708/patches-4.19/950-0382-dt-bindings-rv3028-backup-switchover-support.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0423-dt-bindings-rv3028-backup-switchover-support.patch rename to target/linux/brcm2708/patches-4.19/950-0382-dt-bindings-rv3028-backup-switchover-support.patch index 1482dc06bd..040bd60339 100644 --- a/target/linux/brcm2708/patches-4.19/950-0423-dt-bindings-rv3028-backup-switchover-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0382-dt-bindings-rv3028-backup-switchover-support.patch @@ -1,7 +1,7 @@ From 48598900ebd06f5880b01fcc60e240ea4a04858c Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:57:07 +0000 -Subject: [PATCH 423/806] dt-bindings: rv3028 backup switchover support +Subject: [PATCH] dt-bindings: rv3028 backup switchover support Signed-off-by: Phil Howard --- diff --git a/target/linux/brcm2708/patches-4.19/950-0424-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch b/target/linux/brcm2708/patches-4.19/950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0424-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch rename to target/linux/brcm2708/patches-4.19/950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch index 034d3fb493..769f2461a0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0424-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch +++ b/target/linux/brcm2708/patches-4.19/950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch @@ -1,7 +1,7 @@ From a2fdc7a590566d99d5261badeecb644664ff0fb3 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 29 Mar 2019 10:59:55 +0000 -Subject: [PATCH 424/806] overlays: Add rv3028 backup switchover support to +Subject: [PATCH] overlays: Add rv3028 backup switchover support to i2c-rtc Signed-off-by: Phil Howard diff --git a/target/linux/brcm2708/patches-4.19/950-0425-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch b/target/linux/brcm2708/patches-4.19/950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0425-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch rename to target/linux/brcm2708/patches-4.19/950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch index 7fa37cb7b2..e149912edb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0425-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch +++ b/target/linux/brcm2708/patches-4.19/950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch @@ -1,7 +1,7 @@ From 5962d99b5efed4297ed5c1807d21b406ab86aef1 Mon Sep 17 00:00:00 2001 From: wavelet2 <20504977+wavelet2@users.noreply.github.com> Date: Mon, 15 Apr 2019 10:00:20 +0100 -Subject: [PATCH 425/806] Maxim MAX98357A I2S DAC overlay (#2935) +Subject: [PATCH] Maxim MAX98357A I2S DAC overlay (#2935) Add overlay for Maxim MAX98357A I2S DAC. diff --git a/target/linux/brcm2708/patches-4.19/950-0426-sound-Fixes-for-audioinjector-octo-under-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0426-sound-Fixes-for-audioinjector-octo-under-4.19.patch rename to target/linux/brcm2708/patches-4.19/950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch index 63c71221a1..27c81bc123 100644 --- a/target/linux/brcm2708/patches-4.19/950-0426-sound-Fixes-for-audioinjector-octo-under-4.19.patch +++ b/target/linux/brcm2708/patches-4.19/950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch @@ -1,7 +1,7 @@ From d003eff5bc4d19902867ad585292780a94746705 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 21 Mar 2019 11:19:46 +0000 -Subject: [PATCH 426/806] sound: Fixes for audioinjector-octo under 4.19 +Subject: [PATCH] sound: Fixes for audioinjector-octo under 4.19 1. Move the DT alias declaration to the I2C shim in the cases where the shim is enabled. This works around a problem caused by a diff --git a/target/linux/brcm2708/patches-4.19/950-0427-Revert-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0427-Revert-cgroup-Disable-cgroup-memory-by-default.patch rename to target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch index 3a0539fc51..36d3ee1ac3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0427-Revert-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch @@ -1,7 +1,7 @@ From 49b6bb41655247c123cdc46dd49276a107c8b1d2 Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 24 Apr 2019 14:25:09 +0100 -Subject: [PATCH 427/806] Revert "cgroup: Disable cgroup "memory" by default" +Subject: [PATCH] Revert "cgroup: Disable cgroup "memory" by default" This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b. --- diff --git a/target/linux/brcm2708/patches-4.19/950-0429-overlays-Add-PiGlow-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0387-overlays-Add-PiGlow-overlay.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0429-overlays-Add-PiGlow-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0387-overlays-Add-PiGlow-overlay.patch index ee04fc7d80..4c3e76a512 100644 --- a/target/linux/brcm2708/patches-4.19/950-0429-overlays-Add-PiGlow-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0387-overlays-Add-PiGlow-overlay.patch @@ -1,7 +1,7 @@ From 615467f56356a2054d3a86854d391b7a2e0d5811 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Mon, 29 Apr 2019 19:35:33 +0200 -Subject: [PATCH 429/806] overlays: Add PiGlow overlay +Subject: [PATCH] overlays: Add PiGlow overlay The PiGlow is a small add-on board for the Raspberry Pi that provides 18 individually controllable LEDs (SN3218) and uses the following pins: diff --git a/target/linux/brcm2708/patches-4.19/950-0431-Revert-bcm2835-interpolate-audio-delay.patch b/target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0431-Revert-bcm2835-interpolate-audio-delay.patch rename to target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch index ec87a5b397..9b4f6d741b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0431-Revert-bcm2835-interpolate-audio-delay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch @@ -1,7 +1,7 @@ From 83251570f16ec848694dac016cbdb55b1d28496d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Apr 2019 19:16:14 +0100 -Subject: [PATCH 431/806] Revert "bcm2835: interpolate audio delay" +Subject: [PATCH] Revert "bcm2835: interpolate audio delay" commit fb4b9f02986fcb5ae751106ef9b027806b5dd750 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0432-Revert-staging-bcm2835-audio-Enable-compile-test.patch b/target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0432-Revert-staging-bcm2835-audio-Enable-compile-test.patch rename to target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch index d5d74f1854..841768b718 100644 --- a/target/linux/brcm2708/patches-4.19/950-0432-Revert-staging-bcm2835-audio-Enable-compile-test.patch +++ b/target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch @@ -1,7 +1,7 @@ From e276e2d7b80259819e399eb3956ca92e5ddafbc3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Apr 2019 19:16:15 +0100 -Subject: [PATCH 432/806] Revert "staging: bcm2835-audio: Enable compile test" +Subject: [PATCH] Revert "staging: bcm2835-audio: Enable compile test" commit 4eae66777a262ac9707980ea0cfe902afadfb577 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-use-module_platform_dri.patch b/target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-use-module_platform_dri.patch rename to target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch index e211161496..6a28d80b7e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-use-module_platform_dri.patch +++ b/target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch @@ -1,7 +1,7 @@ From 576521feaa6a03f45839c28f1ce0588e4e49b0ca Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Apr 2019 19:16:16 +0100 -Subject: [PATCH 433/806] Revert "staging: bcm2835-audio: use +Subject: [PATCH] Revert "staging: bcm2835-audio: use module_platform_driver() macro" commit ed4c2e5dc4216d5dded502bfcf594d3984e6bccd upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0434-staging-bcm2835-audio-Clean-up-mutex-locks.patch b/target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0434-staging-bcm2835-audio-Clean-up-mutex-locks.patch rename to target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch index b102e1c36d..531fe9e818 100644 --- a/target/linux/brcm2708/patches-4.19/950-0434-staging-bcm2835-audio-Clean-up-mutex-locks.patch +++ b/target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch @@ -1,7 +1,7 @@ From 96588b9ccaddd69a832a07e2e3f2f3299e6d6c3a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:30 +0200 -Subject: [PATCH 434/806] staging: bcm2835-audio: Clean up mutex locks +Subject: [PATCH] staging: bcm2835-audio: Clean up mutex locks commit ce4bb1aa271a97047b80ac917a5d91b54925913b upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0435-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch b/target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0435-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch rename to target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch index 9b5ff7a762..ac5c0a0d75 100644 --- a/target/linux/brcm2708/patches-4.19/950-0435-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch @@ -1,7 +1,7 @@ From a1a77a925422be3f0c48002c2aa6c6d898a37f95 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:31 +0200 -Subject: [PATCH 435/806] staging: bcm2835-audio: Remove redundant spdif stream +Subject: [PATCH] staging: bcm2835-audio: Remove redundant spdif stream ctls commit ab91e26229eaca2832df51e13c1285aea3be33ab upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch b/target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch rename to target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch index ab61997c74..e1cf501f37 100644 --- a/target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch +++ b/target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch @@ -1,7 +1,7 @@ From 8eb8e04a27188f6abc22d09b4a1fffbec10d45f4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:32 +0200 -Subject: [PATCH 436/806] staging: bcm2835-audio: Clean up include files in +Subject: [PATCH] staging: bcm2835-audio: Clean up include files in bcm2835-ctl.c commit 821950d3da4bf97bcfedcb812176a0f26b833db0 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-audio-Remove-redundant-substream-mas.patch b/target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-audio-Remove-redundant-substream-mas.patch rename to target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch index 2c052b16bc..b2af97443c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-audio-Remove-redundant-substream-mas.patch +++ b/target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch @@ -1,7 +1,7 @@ From 1120b4699738a3ee748314c433a96e45182a3411 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:33 +0200 -Subject: [PATCH 437/806] staging: bcm2835-audio: Remove redundant substream +Subject: [PATCH] staging: bcm2835-audio: Remove redundant substream mask checks commit 14b1f4cba853a11c7b381ad919622f38eb194bd7 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0438-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch b/target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0438-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch rename to target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch index 4a478fce42..de29b17d21 100644 --- a/target/linux/brcm2708/patches-4.19/950-0438-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch +++ b/target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch @@ -1,7 +1,7 @@ From 31e4f118a750f4ddb2aeaaf02c5f3630fb50a176 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:34 +0200 -Subject: [PATCH 438/806] staging: bcm2835-audio: Fix mute controls, volume +Subject: [PATCH] staging: bcm2835-audio: Fix mute controls, volume handling cleanup commit 495e5a0d83d3902c741771f267a702ae19da8ab6 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0439-staging-bcm2835-audio-Remove-redundant-function-call.patch b/target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0439-staging-bcm2835-audio-Remove-redundant-function-call.patch rename to target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch index acae9e896e..482c9ba5cc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0439-staging-bcm2835-audio-Remove-redundant-function-call.patch +++ b/target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch @@ -1,7 +1,7 @@ From 79a3c1a4419b2bf04f6ff5ef84cd74b0456fdd9a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:35 +0200 -Subject: [PATCH 439/806] staging: bcm2835-audio: Remove redundant function +Subject: [PATCH] staging: bcm2835-audio: Remove redundant function calls commit 124950ebe9fa8547c59e8d4acc8d6c59e6278ed6 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0440-staging-bcm2835-audio-Remove-superfluous-open-flag.patch b/target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0440-staging-bcm2835-audio-Remove-superfluous-open-flag.patch rename to target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch index b471e3bc89..121846d802 100644 --- a/target/linux/brcm2708/patches-4.19/950-0440-staging-bcm2835-audio-Remove-superfluous-open-flag.patch +++ b/target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch @@ -1,7 +1,7 @@ From af2fe52ef43c1aa6a24d1c51ad3ccddc39a12c51 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:36 +0200 -Subject: [PATCH 440/806] staging: bcm2835-audio: Remove superfluous open flag +Subject: [PATCH] staging: bcm2835-audio: Remove superfluous open flag commit ad13924de6b07cb52714ea1809c57b2e72a24504 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0441-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch b/target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0441-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch rename to target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch index d690ee1b98..2a8197c68d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0441-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch @@ -1,7 +1,7 @@ From e8a202b4d06a07ba42b91a1dd3c2d9e9cedff32d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:37 +0200 -Subject: [PATCH 441/806] staging: bcm2835-audio: Drop useless running flag and +Subject: [PATCH] staging: bcm2835-audio: Drop useless running flag and check commit 02f2376321d75e78117f39ff81f215254ee6b4ef upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0442-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch b/target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0442-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch rename to target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch index ab305096aa..fe308694d7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0442-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch @@ -1,7 +1,7 @@ From e5414b543a330c64b2e0b5e96d604cf580c2b9b7 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:38 +0200 -Subject: [PATCH 442/806] staging: bcm2835-audio: Fix incorrect draining +Subject: [PATCH] staging: bcm2835-audio: Fix incorrect draining handling commit 7d2a91f5f1bcf08ca257bcf1ed9721fcd341f834 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0443-staging-bcm2835-audio-Kill-unused-spinlock.patch b/target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0443-staging-bcm2835-audio-Kill-unused-spinlock.patch rename to target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch index bdd8f2aa98..f337c61b4b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0443-staging-bcm2835-audio-Kill-unused-spinlock.patch +++ b/target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch @@ -1,7 +1,7 @@ From d9aef1329c29c20d8e0db9929a3235bfb1d718d3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:39 +0200 -Subject: [PATCH 443/806] staging: bcm2835-audio: Kill unused spinlock +Subject: [PATCH] staging: bcm2835-audio: Kill unused spinlock commit 5332f6f012c0bf3a45c77dbc0f79814443a884d4 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0444-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch b/target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0444-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch rename to target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch index 2912998f6a..ffe06fef60 100644 --- a/target/linux/brcm2708/patches-4.19/950-0444-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch +++ b/target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch @@ -1,7 +1,7 @@ From 4efb059f297f8234bc188b6bc1e4af673ce9f9e3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:40 +0200 -Subject: [PATCH 444/806] staging: bcm2835-audio: Use PCM runtime values +Subject: [PATCH] staging: bcm2835-audio: Use PCM runtime values instead commit b8f7fdd50890b848e085c0519469aed4ff4d9b54 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0445-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch b/target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0445-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch rename to target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch index 8ae584c0af..8012631bd4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0445-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch @@ -1,7 +1,7 @@ From a08260154f88b0b97e3c8de6b3cdb7187e8c3d8a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:41 +0200 -Subject: [PATCH 445/806] staging: bcm2835-audio: Drop unnecessary pcm indirect +Subject: [PATCH] staging: bcm2835-audio: Drop unnecessary pcm indirect setup commit 7318ec896f4856fae2bb013858e422fa078201e1 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0446-staging-bcm2835-audio-Drop-useless-NULL-check.patch b/target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0446-staging-bcm2835-audio-Drop-useless-NULL-check.patch rename to target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch index 5c00d52f16..ab5a0ed8a2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0446-staging-bcm2835-audio-Drop-useless-NULL-check.patch +++ b/target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch @@ -1,7 +1,7 @@ From 9f3956e7bbf868894b5aee41110dbe28f117918c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:42 +0200 -Subject: [PATCH 446/806] staging: bcm2835-audio: Drop useless NULL check +Subject: [PATCH] staging: bcm2835-audio: Drop useless NULL check commit 8bcf9f252c29c2d5bcce3db605c0ebf1ef230f9c upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0447-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch b/target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0447-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch rename to target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch index 8132a5a799..dc6525089c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0447-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch +++ b/target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch @@ -1,7 +1,7 @@ From 2ab24bca59da765a12f4617527e671170230bf3a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:43 +0200 -Subject: [PATCH 447/806] staging: bcm2835-audio: Propagate parameter setup +Subject: [PATCH] staging: bcm2835-audio: Propagate parameter setup error commit fee5638fe552ff8222c3a5bdcc4a34255e248d8c upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0448-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch b/target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0448-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch rename to target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch index ac3c922402..96a4d732c1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0448-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch +++ b/target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch @@ -1,7 +1,7 @@ From e109804fa00a139a05626c1b8ceebcfe3577fc6d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:44 +0200 -Subject: [PATCH 448/806] staging: bcm2835-audio: Drop debug messages in +Subject: [PATCH] staging: bcm2835-audio: Drop debug messages in bcm2835-pcm.c commit 055e1c330d04df87d4730a5db837161c11ddaafc upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0449-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch b/target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0449-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch rename to target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch index e32c0b014d..a70081159f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0449-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch +++ b/target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch @@ -1,7 +1,7 @@ From 3c7663a9b1763f64250db4b975a3ce246ef32e0f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:45 +0200 -Subject: [PATCH 449/806] staging: bcm2835-audio: Drop superfluous mutex lock +Subject: [PATCH] staging: bcm2835-audio: Drop superfluous mutex lock during prepare commit f0eb15d055380ff127e5f12c8fad2b36bdb3c006 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0450-staging-bcm2835-audio-Add-10ms-period-constraint.patch b/target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0450-staging-bcm2835-audio-Add-10ms-period-constraint.patch rename to target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch index 2c294b54df..07e96f61ed 100644 --- a/target/linux/brcm2708/patches-4.19/950-0450-staging-bcm2835-audio-Add-10ms-period-constraint.patch +++ b/target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch @@ -1,7 +1,7 @@ From daa78c198ece1ec901ee565c869ee1a60a95061d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:46 +0200 -Subject: [PATCH 450/806] staging: bcm2835-audio: Add 10ms period constraint +Subject: [PATCH] staging: bcm2835-audio: Add 10ms period constraint commit 93c66acaf68b5247c3121a46a71ff6a70fc1d492 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0451-staging-bcm2835-audio-Make-single-vchi-handle.patch b/target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0451-staging-bcm2835-audio-Make-single-vchi-handle.patch rename to target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch index e2cc298f4a..eb6538dff3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0451-staging-bcm2835-audio-Make-single-vchi-handle.patch +++ b/target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch @@ -1,7 +1,7 @@ From 98a1612b199cb3060306c05d1a6d7ca18ef08475 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:47 +0200 -Subject: [PATCH 451/806] staging: bcm2835-audio: Make single vchi handle +Subject: [PATCH] staging: bcm2835-audio: Make single vchi handle commit 326a6edcb2ada56375bd7d3fc24c83f58e8da7f3 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0452-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch b/target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0452-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch rename to target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch index 38fcd39cd3..37ebd8b673 100644 --- a/target/linux/brcm2708/patches-4.19/950-0452-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch +++ b/target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch @@ -1,7 +1,7 @@ From 43f89ac74f3f221e3036a1ec311b24016860d15e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:48 +0200 -Subject: [PATCH 452/806] staging: bcm2835-audio: Code refactoring of vchiq +Subject: [PATCH] staging: bcm2835-audio: Code refactoring of vchiq accessor codes commit 769a8e9bf5cf39813f52962fdafdf7e4d52ad585 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0453-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch b/target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0453-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch rename to target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch index e12d29bbb4..722804ff63 100644 --- a/target/linux/brcm2708/patches-4.19/950-0453-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch +++ b/target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch @@ -1,7 +1,7 @@ From 87ba8310e9f0882e85926ac1ef91333f8906b303 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:49 +0200 -Subject: [PATCH 453/806] staging: bcm2835-audio: Operate non-atomic PCM ops +Subject: [PATCH] staging: bcm2835-audio: Operate non-atomic PCM ops commit 5c7883e5f27e829f3f3a2ba174d4a724bfd5f026 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0454-staging-bcm2835-audio-Use-card-private_data.patch b/target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Use-card-private_data.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0454-staging-bcm2835-audio-Use-card-private_data.patch rename to target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Use-card-private_data.patch index ba6a5b58b0..d4d61ce0fb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0454-staging-bcm2835-audio-Use-card-private_data.patch +++ b/target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Use-card-private_data.patch @@ -1,7 +1,7 @@ From af0ded6e9dd38f08a9ee621066e583b5cf972926 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:50 +0200 -Subject: [PATCH 454/806] staging: bcm2835-audio: Use card->private_data +Subject: [PATCH] staging: bcm2835-audio: Use card->private_data commit 898001a0c845cefe5d47d133485712412853f0a8 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0455-staging-bcm2835-audio-Use-standard-error-print-helpe.patch b/target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0455-staging-bcm2835-audio-Use-standard-error-print-helpe.patch rename to target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch index 14dd044d1c..63cd0b01b8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0455-staging-bcm2835-audio-Use-standard-error-print-helpe.patch +++ b/target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch @@ -1,7 +1,7 @@ From ec788d7c115d3ec59b39b6aac17d57ad86b7fbfe Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:51 +0200 -Subject: [PATCH 455/806] staging: bcm2835-audio: Use standard error print +Subject: [PATCH] staging: bcm2835-audio: Use standard error print helpers commit b7584b64168208ebc14160770c0966b8b12fc16b upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0456-staging-bcm2835-audio-Remove-unnecessary-header-file.patch b/target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0456-staging-bcm2835-audio-Remove-unnecessary-header-file.patch rename to target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch index 171bca11fe..989e0e43d6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0456-staging-bcm2835-audio-Remove-unnecessary-header-file.patch +++ b/target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch @@ -1,7 +1,7 @@ From 8deead340379eeb09571476e0412ce50036c08d1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:52 +0200 -Subject: [PATCH 456/806] staging: bcm2835-audio: Remove unnecessary header +Subject: [PATCH] staging: bcm2835-audio: Remove unnecessary header file includes commit 7e46fff5f19ce2b8a9891e4c08631c64d06e9e17 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0457-staging-bcm2835-audio-Move-module-parameter-descript.patch b/target/linux/brcm2708/patches-4.19/950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0457-staging-bcm2835-audio-Move-module-parameter-descript.patch rename to target/linux/brcm2708/patches-4.19/950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch index b29639be8a..5db4daa5cd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0457-staging-bcm2835-audio-Move-module-parameter-descript.patch +++ b/target/linux/brcm2708/patches-4.19/950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch @@ -1,7 +1,7 @@ From fb05aeb91f3e94e89ad2d9aa68104e6e4cc97239 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:53 +0200 -Subject: [PATCH 457/806] staging: bcm2835-audio: Move module parameter +Subject: [PATCH] staging: bcm2835-audio: Move module parameter description commit b876f2075808e95e244053caa53fa7e86e929a99 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0458-staging-bcm2835-audio-Use-coherent-device-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0458-staging-bcm2835-audio-Use-coherent-device-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch index e794a65354..dfd4b975f9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0458-staging-bcm2835-audio-Use-coherent-device-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch @@ -1,7 +1,7 @@ From 8a01a25d0ad7e9d06f64fddae871deb91c3988ac Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:54 +0200 -Subject: [PATCH 458/806] staging: bcm2835-audio: Use coherent device buffers +Subject: [PATCH] staging: bcm2835-audio: Use coherent device buffers commit ad29c6e6cbf6f2af7362b043adad51a3be3d39c7 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0459-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch b/target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0459-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch rename to target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch index 29567f59e3..5b38ca5e31 100644 --- a/target/linux/brcm2708/patches-4.19/950-0459-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch +++ b/target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch @@ -1,7 +1,7 @@ From 27417ac1fa4894dc46d71cc34af17fe6a5186f2f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:55 +0200 -Subject: [PATCH 459/806] staging: bcm2835-audio: Set +Subject: [PATCH] staging: bcm2835-audio: Set SNDRV_PCM_INFO_SYNC_APPLPTR commit b59d6a5f73501f74848d6700101e7736afe3d54a upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0460-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch b/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0460-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch rename to target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch index 8da7d94162..6ead1b4ccf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0460-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch @@ -1,7 +1,7 @@ From 706f9b2b95a2fff44f92deada99545036c249658 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:56 +0200 -Subject: [PATCH 460/806] staging: bcm2835-audio: Simplify PCM creation helpers +Subject: [PATCH] staging: bcm2835-audio: Simplify PCM creation helpers commit 74470ffeb9aed5548654cfca881bf1d7469fe9c4 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0461-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch b/target/linux/brcm2708/patches-4.19/950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0461-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch rename to target/linux/brcm2708/patches-4.19/950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch index aeb0c3f0d6..ec0530ba2a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0461-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch @@ -1,7 +1,7 @@ From c4766c1589a25608ffe6848722632be2f65d0951 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:57 +0200 -Subject: [PATCH 461/806] staging: bcm2835-audio: Simplify kctl creation +Subject: [PATCH] staging: bcm2835-audio: Simplify kctl creation helpers commit dc5c0eb1e8601206dffbfc302cbd190f89dcd040 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0462-staging-bcm2835-audio-Simplify-card-object-managemen.patch b/target/linux/brcm2708/patches-4.19/950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0462-staging-bcm2835-audio-Simplify-card-object-managemen.patch rename to target/linux/brcm2708/patches-4.19/950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch index 9fe519586f..523e54361d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0462-staging-bcm2835-audio-Simplify-card-object-managemen.patch +++ b/target/linux/brcm2708/patches-4.19/950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch @@ -1,7 +1,7 @@ From b19ed31a1ced7b6d4c4c04967a509d91a134e5bb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 4 Sep 2018 17:58:58 +0200 -Subject: [PATCH 462/806] staging: bcm2835-audio: Simplify card object +Subject: [PATCH] staging: bcm2835-audio: Simplify card object management commit 872ae2d63d516a2a3b9c833d8685afcfa7814542 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0463-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch b/target/linux/brcm2708/patches-4.19/950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0463-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch rename to target/linux/brcm2708/patches-4.19/950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch index 367a3214fa..fa24932b1b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0463-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch @@ -1,7 +1,7 @@ From 26693d4d1239b8239644ce6da50b8ce06ff18ae5 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:50 +0200 -Subject: [PATCH 463/806] staging: bcm2835-audio: unify FOURCC command +Subject: [PATCH] staging: bcm2835-audio: unify FOURCC command definitions commit a90d8f49cc7fd7220aa24b85fc74ef3cfd62b96f upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0464-staging-bcm2835-audio-don-t-initialize-memory-twice.patch b/target/linux/brcm2708/patches-4.19/950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0464-staging-bcm2835-audio-don-t-initialize-memory-twice.patch rename to target/linux/brcm2708/patches-4.19/950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch index 239712fac7..f5c7781c20 100644 --- a/target/linux/brcm2708/patches-4.19/950-0464-staging-bcm2835-audio-don-t-initialize-memory-twice.patch +++ b/target/linux/brcm2708/patches-4.19/950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch @@ -1,7 +1,7 @@ From 7250c9d3d3f1b861d8f0c6220a81a465e45d70eb Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:51 +0200 -Subject: [PATCH 464/806] staging: bcm2835-audio: don't initialize memory twice +Subject: [PATCH] staging: bcm2835-audio: don't initialize memory twice commit 2e5f59fb77397cab3bc3d156e8be4164a67d32ef upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-audio-reorder-variable-declarations-.patch b/target/linux/brcm2708/patches-4.19/950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-audio-reorder-variable-declarations-.patch rename to target/linux/brcm2708/patches-4.19/950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch index b00e632124..6b9ac81b97 100644 --- a/target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-audio-reorder-variable-declarations-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch @@ -1,7 +1,7 @@ From 604f0019cc1eaed6a316d7875fe697e53f5f105c Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:52 +0200 -Subject: [PATCH 465/806] staging: bcm2835-audio: reorder variable declarations +Subject: [PATCH] staging: bcm2835-audio: reorder variable declarations & remove trivial comments commit d048385a070552ae819f99f05bd03ec41072783d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch b/target/linux/brcm2708/patches-4.19/950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch rename to target/linux/brcm2708/patches-4.19/950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch index b41a233e04..e212a942ec 100644 --- a/target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch @@ -1,7 +1,7 @@ From 23b89436030e64196a1bc317901d08edd54fb772 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:53 +0200 -Subject: [PATCH 466/806] staging: bcm2835-audio: use anonymous union in struct +Subject: [PATCH] staging: bcm2835-audio: use anonymous union in struct vc_audio_msg commit 9c2eaf7da855d314a369d48b9cbf8ac80717a1d0 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0467-staging-bcm2835-audio-more-generic-probe-function-na.patch b/target/linux/brcm2708/patches-4.19/950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0467-staging-bcm2835-audio-more-generic-probe-function-na.patch rename to target/linux/brcm2708/patches-4.19/950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch index 510d2b5f2a..6b03e1e43a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0467-staging-bcm2835-audio-more-generic-probe-function-na.patch +++ b/target/linux/brcm2708/patches-4.19/950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch @@ -1,7 +1,7 @@ From 0b7d959b0d0c18959c66696844a1c9956370ab99 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:54 +0200 -Subject: [PATCH 467/806] staging: bcm2835-audio: more generic probe function +Subject: [PATCH] staging: bcm2835-audio: more generic probe function name commit 96f3bd8ae6516898c7b411ecb87064bb0dd25415 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0468-staging-bcm2835-audio-rename-platform_driver-structu.patch b/target/linux/brcm2708/patches-4.19/950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0468-staging-bcm2835-audio-rename-platform_driver-structu.patch rename to target/linux/brcm2708/patches-4.19/950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch index a25b5923c8..05128020f7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0468-staging-bcm2835-audio-rename-platform_driver-structu.patch +++ b/target/linux/brcm2708/patches-4.19/950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch @@ -1,7 +1,7 @@ From b06f01038711efc5182267cfc68e358a89ee2502 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:55 +0200 -Subject: [PATCH 468/806] staging: bcm2835-audio: rename platform_driver +Subject: [PATCH] staging: bcm2835-audio: rename platform_driver structure commit 82cdc0c6b6faf877e2aecb957cffa9cb578cc572 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0469-staging-bcm2835-audio-update-TODO.patch b/target/linux/brcm2708/patches-4.19/950-0426-staging-bcm2835-audio-update-TODO.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0469-staging-bcm2835-audio-update-TODO.patch rename to target/linux/brcm2708/patches-4.19/950-0426-staging-bcm2835-audio-update-TODO.patch index da2a032deb..8f24d154cb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0469-staging-bcm2835-audio-update-TODO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0426-staging-bcm2835-audio-update-TODO.patch @@ -1,7 +1,7 @@ From 56b704581afbd8d9ccd73cfa7935b6178749a3e9 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Wed, 17 Oct 2018 21:01:56 +0200 -Subject: [PATCH 469/806] staging: bcm2835-audio: update TODO +Subject: [PATCH] staging: bcm2835-audio: update TODO commit 01ec7398c56e8f1b903ecb3c5c75400e263eef43 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0470-staging-bcm2835-audio-interpolate-audio-delay.patch b/target/linux/brcm2708/patches-4.19/950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0470-staging-bcm2835-audio-interpolate-audio-delay.patch rename to target/linux/brcm2708/patches-4.19/950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch index d5da293593..cf5f11c091 100644 --- a/target/linux/brcm2708/patches-4.19/950-0470-staging-bcm2835-audio-interpolate-audio-delay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch @@ -1,7 +1,7 @@ From 2ba82d9516203ce41f33e98adb667bedee3622bc Mon Sep 17 00:00:00 2001 From: Mike Brady Date: Mon, 22 Oct 2018 20:17:08 +0100 -Subject: [PATCH 470/806] staging: bcm2835-audio: interpolate audio delay +Subject: [PATCH] staging: bcm2835-audio: interpolate audio delay commit a105a3a72824e0ac685a0711a67e4dbe29de62d0 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0471-staging-bcm2835-audio-Enable-compile-test.patch b/target/linux/brcm2708/patches-4.19/950-0428-staging-bcm2835-audio-Enable-compile-test.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0471-staging-bcm2835-audio-Enable-compile-test.patch rename to target/linux/brcm2708/patches-4.19/950-0428-staging-bcm2835-audio-Enable-compile-test.patch index 086f9e4c68..3605c41fa8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0471-staging-bcm2835-audio-Enable-compile-test.patch +++ b/target/linux/brcm2708/patches-4.19/950-0428-staging-bcm2835-audio-Enable-compile-test.patch @@ -1,7 +1,7 @@ From b338fbb56955b74b5f41a623aceab4d74ba7c173 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 6 Dec 2018 19:28:56 +0100 -Subject: [PATCH 471/806] staging: bcm2835-audio: Enable compile test +Subject: [PATCH] staging: bcm2835-audio: Enable compile test commit 458d4866a34d0c129ffc3bd56345b2166ba46d77 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0472-staging-bcm2835-audio-use-module_platform_driver-mac.patch b/target/linux/brcm2708/patches-4.19/950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0472-staging-bcm2835-audio-use-module_platform_driver-mac.patch rename to target/linux/brcm2708/patches-4.19/950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch index da783a5d77..a0a5f765e8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0472-staging-bcm2835-audio-use-module_platform_driver-mac.patch +++ b/target/linux/brcm2708/patches-4.19/950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch @@ -1,7 +1,7 @@ From 72c059360457babd76009697e652c96cb282856e Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 6 Dec 2018 19:28:57 +0100 -Subject: [PATCH 472/806] staging: bcm2835-audio: use module_platform_driver() +Subject: [PATCH] staging: bcm2835-audio: use module_platform_driver() macro commit 1e55d56344b0777d6cee9b9e4a813d53728ee798 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0473-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0473-staging-bcm2835-audio-Drop-DT-dependency.patch rename to target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch index b2668283e1..f9369565bd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0473-staging-bcm2835-audio-Drop-DT-dependency.patch +++ b/target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch @@ -1,7 +1,7 @@ From 1ddeeda8208bc269c90aad4bd8bb878f7436f62d Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 6 Dec 2018 19:28:58 +0100 -Subject: [PATCH 473/806] staging: bcm2835-audio: Drop DT dependency +Subject: [PATCH] staging: bcm2835-audio: Drop DT dependency commit 438fc48260a0afc4cee733e5bc20234ff2bbef56 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0474-staging-bcm2835-audio-double-free-in-init-error-path.patch b/target/linux/brcm2708/patches-4.19/950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0474-staging-bcm2835-audio-double-free-in-init-error-path.patch rename to target/linux/brcm2708/patches-4.19/950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch index 8c350f74de..95b9d7a1d1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0474-staging-bcm2835-audio-double-free-in-init-error-path.patch +++ b/target/linux/brcm2708/patches-4.19/950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch @@ -1,7 +1,7 @@ From 360a1982333c8e8f583663155479115d6eb7cd14 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 17 Dec 2018 10:08:54 +0300 -Subject: [PATCH 474/806] staging: bcm2835-audio: double free in init error +Subject: [PATCH] staging: bcm2835-audio: double free in init error path commit 136ff5e49271c4c8fceeca5491c48e66b961564b upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0475-dts-Increase-default-coherent-pool-size.patch b/target/linux/brcm2708/patches-4.19/950-0432-dts-Increase-default-coherent-pool-size.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0475-dts-Increase-default-coherent-pool-size.patch rename to target/linux/brcm2708/patches-4.19/950-0432-dts-Increase-default-coherent-pool-size.patch index a8bd364465..e39aeb089d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0475-dts-Increase-default-coherent-pool-size.patch +++ b/target/linux/brcm2708/patches-4.19/950-0432-dts-Increase-default-coherent-pool-size.patch @@ -1,7 +1,7 @@ From e13c663bfc75a628ba25afdf3f3b4a40a2c0250e Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 1 May 2019 15:00:05 +0100 -Subject: [PATCH 475/806] dts: Increase default coherent pool size +Subject: [PATCH] dts: Increase default coherent pool size dwc_otg allocates DMA-coherent buffers in atomic context for misaligned transfer buffers. The pool that these allocations come from is set up diff --git a/target/linux/brcm2708/patches-4.19/950-0476-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0476-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch rename to target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch index 5cb6d061cf..c831dc8139 100644 --- a/target/linux/brcm2708/patches-4.19/950-0476-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch +++ b/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch @@ -1,7 +1,7 @@ From 369f591ee78af2d53c67f561daeb963cc4aa60aa Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 May 2019 14:23:39 +0100 -Subject: [PATCH 476/806] Revert "staging: bcm2835-audio: Drop DT dependency" +Subject: [PATCH] Revert "staging: bcm2835-audio: Drop DT dependency" This reverts commit 60a2e557a4f81480216066f22b84c3dda31b3470. --- diff --git a/target/linux/brcm2708/patches-4.19/950-0478-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch b/target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0478-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch rename to target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch index 149e2c035f..6891ec28a0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0478-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch +++ b/target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch @@ -1,7 +1,7 @@ From 26c79197da4b2911e10c600d79839a82a43a06ff Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 1 May 2019 17:04:32 +0100 -Subject: [PATCH 478/806] smsc95xx: dynamically fix up TX buffer alignment with +Subject: [PATCH] smsc95xx: dynamically fix up TX buffer alignment with padding bytes dwc_otg requires a 32-bit aligned buffer start address, otherwise diff --git a/target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch index d8cf36f1ea..9608504500 100644 --- a/target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch @@ -1,7 +1,7 @@ From fdbe849f960ee92befd781cff14d9b76142b0981 Mon Sep 17 00:00:00 2001 From: P33M Date: Thu, 2 May 2019 11:53:45 +0100 -Subject: [PATCH 479/806] lan78xx: use default alignment for rx buffers +Subject: [PATCH] lan78xx: use default alignment for rx buffers The lan78xx uses a 12-byte hardware rx header, so there is no need to allocate SKBs with NET_IP_ALIGN set. Removes alignment faults diff --git a/target/linux/brcm2708/patches-4.19/950-0480-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch b/target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0480-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch rename to target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch index 5f73a1ef91..9e25fe1016 100644 --- a/target/linux/brcm2708/patches-4.19/950-0480-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch @@ -1,7 +1,7 @@ From 453caa19909edf2de1add80b369fb30570a440ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:30:24 +0100 -Subject: [PATCH 480/806] staging: bcm2835-codec: Correct port width calc for +Subject: [PATCH] staging: bcm2835-codec: Correct port width calc for truncation The calculation converting from V4L2 bytesperline to MMAL diff --git a/target/linux/brcm2708/patches-4.19/950-0481-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch b/target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0481-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch rename to target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch index cdb57e12e3..6f99736d6a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0481-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch @@ -1,7 +1,7 @@ From 52e50b0f5017e823428849c42c1029306d790939 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 14:32:21 +0100 -Subject: [PATCH 481/806] staging: bcm2835-codec: Remove height padding for ISP +Subject: [PATCH] staging: bcm2835-codec: Remove height padding for ISP role The ISP has no need for heights to be a multiple of macroblock diff --git a/target/linux/brcm2708/patches-4.19/950-0482-staging-mmal-vchiq-Free-the-event-context-for-contro.patch b/target/linux/brcm2708/patches-4.19/950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0482-staging-mmal-vchiq-Free-the-event-context-for-contro.patch rename to target/linux/brcm2708/patches-4.19/950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch index f3cf64b554..edd4c7864b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0482-staging-mmal-vchiq-Free-the-event-context-for-contro.patch +++ b/target/linux/brcm2708/patches-4.19/950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch @@ -1,7 +1,7 @@ From 6737574b4d3af54a56d2f9c49f516fb75d06a556 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 May 2019 13:27:23 +0100 -Subject: [PATCH 482/806] staging: mmal-vchiq: Free the event context for +Subject: [PATCH] staging: mmal-vchiq: Free the event context for control ports vchiq_mmal_component_init calls init_event_context for the diff --git a/target/linux/brcm2708/patches-4.19/950-0483-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch b/target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0483-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch rename to target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch index 7808301963..6b67955ee3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0483-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch +++ b/target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch @@ -1,7 +1,7 @@ From f9c0f8057ffee5c039fe20c3e2dcd7fea70222e9 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 2 May 2019 22:14:34 +0100 -Subject: [PATCH 483/806] BCM270X_DT: Also set coherent_pool=1M for BT Pis +Subject: [PATCH] BCM270X_DT: Also set coherent_pool=1M for BT Pis See: https://github.com/raspberrypi/linux/issues/2924 diff --git a/target/linux/brcm2708/patches-4.19/950-0485-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch b/target/linux/brcm2708/patches-4.19/950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0485-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch rename to target/linux/brcm2708/patches-4.19/950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch index ced476fa69..568cd82e56 100644 --- a/target/linux/brcm2708/patches-4.19/950-0485-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch +++ b/target/linux/brcm2708/patches-4.19/950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch @@ -1,7 +1,7 @@ From 50d3f15ea5d6ca2705a009722dd7d4108c9f75d9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 5 May 2019 21:07:12 +0100 -Subject: [PATCH 485/806] arm: dts: overlays: rpi-sense: add upstream humidity +Subject: [PATCH] arm: dts: overlays: rpi-sense: add upstream humidity compatible The upstream humidiity driver uses "st,hts221" for the compatible diff --git a/target/linux/brcm2708/patches-4.19/950-0486-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch b/target/linux/brcm2708/patches-4.19/950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0486-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch rename to target/linux/brcm2708/patches-4.19/950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch index d973c56985..bfa88dd4f7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0486-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch +++ b/target/linux/brcm2708/patches-4.19/950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch @@ -1,7 +1,7 @@ From 250db0df9643d122e00313313102c642f1adac72 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 2 May 2019 15:50:01 +0100 -Subject: [PATCH 486/806] staging: mmal-vchiq: Fix memory leak in error path +Subject: [PATCH] staging: mmal-vchiq: Fix memory leak in error path On error, vchiq_mmal_component_init could leave the event context allocated for ports. diff --git a/target/linux/brcm2708/patches-4.19/950-0487-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch b/target/linux/brcm2708/patches-4.19/950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0487-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch rename to target/linux/brcm2708/patches-4.19/950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch index e354ddb6ba..f761ad7872 100644 --- a/target/linux/brcm2708/patches-4.19/950-0487-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch +++ b/target/linux/brcm2708/patches-4.19/950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch @@ -1,7 +1,7 @@ From 3e246d402582c6f19e5e636f89952d11e18e6442 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 May 2019 13:27:51 +0100 -Subject: [PATCH 487/806] staging: vchiq-mmal: Fix memory leak of vchiq +Subject: [PATCH] staging: vchiq-mmal: Fix memory leak of vchiq instance The vchiq instance was allocated from vchiq_mmal_init via diff --git a/target/linux/brcm2708/patches-4.19/950-0488-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch b/target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0488-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch rename to target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch index 924e863a45..2ad3299595 100644 --- a/target/linux/brcm2708/patches-4.19/950-0488-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch +++ b/target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch @@ -1,7 +1,7 @@ From 71a27bf49d7a64959b7e60d780a1f899ead34f5f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 13 May 2019 17:34:29 +0100 -Subject: [PATCH 488/806] Revert "video: bcm2708_fb: Try allocating on the ARM +Subject: [PATCH] Revert "video: bcm2708_fb: Try allocating on the ARM and passing to VPU" This reverts commit ca36c709fce57e8023d2b8b354376bf161601a49. diff --git a/target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch b/target/linux/brcm2708/patches-4.19/950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch rename to target/linux/brcm2708/patches-4.19/950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch index 1666b3f507..b063e38854 100644 --- a/target/linux/brcm2708/patches-4.19/950-0489-Added-IQaudIO-Pi-Codec-board-support-2969.patch +++ b/target/linux/brcm2708/patches-4.19/950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch @@ -1,7 +1,7 @@ From 930c49de8674acda0f143f7bc182ed2fad8c4f9d Mon Sep 17 00:00:00 2001 From: IQaudIO Date: Mon, 13 May 2019 21:53:05 +0100 -Subject: [PATCH 489/806] Added IQaudIO Pi-Codec board support (#2969) +Subject: [PATCH] Added IQaudIO Pi-Codec board support (#2969) Add support for the IQaudIO Pi-Codec board. diff --git a/target/linux/brcm2708/patches-4.19/950-0490-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch b/target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0490-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch rename to target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch index 7eea87d0dc..8da9deaa6e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0490-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch +++ b/target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch @@ -1,7 +1,7 @@ From 89bb75e008adf061e3e396de76020b00ea0d6123 Mon Sep 17 00:00:00 2001 From: P33M Date: Tue, 14 May 2019 14:55:19 +0100 -Subject: [PATCH 490/806] Revert "smsc95xx: dynamically fix up TX buffer +Subject: [PATCH] Revert "smsc95xx: dynamically fix up TX buffer alignment with padding bytes" As reported in https://github.com/raspberrypi/linux/issues/2964 this diff --git a/target/linux/brcm2708/patches-4.19/950-0492-w1-ds2408-reset-on-output_write-retry-with-readback.patch b/target/linux/brcm2708/patches-4.19/950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0492-w1-ds2408-reset-on-output_write-retry-with-readback.patch rename to target/linux/brcm2708/patches-4.19/950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch index e6978b7409..afdc22e2d1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0492-w1-ds2408-reset-on-output_write-retry-with-readback.patch +++ b/target/linux/brcm2708/patches-4.19/950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch @@ -1,7 +1,7 @@ From 714580d7c11f81afb5e08c71f79a03a1ed4ae44e Mon Sep 17 00:00:00 2001 From: Jean-Francois Dagenais Date: Thu, 28 Mar 2019 12:41:11 -0400 -Subject: [PATCH 492/806] w1: ds2408: reset on output_write retry with readback +Subject: [PATCH] w1: ds2408: reset on output_write retry with readback commit 49695ac46861180baf2b2b92c62da8619b6bf28f upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0493-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch b/target/linux/brcm2708/patches-4.19/950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0493-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch rename to target/linux/brcm2708/patches-4.19/950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch index c58b2bf8e5..3766707063 100644 --- a/target/linux/brcm2708/patches-4.19/950-0493-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch +++ b/target/linux/brcm2708/patches-4.19/950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch @@ -1,7 +1,7 @@ From 2bf6a79fb6555b5ebf21d03b1295e017804474c4 Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Mon, 4 Mar 2019 12:23:36 +0100 -Subject: [PATCH 493/806] w1: ds2482: cosmetic fixes after 54865314f5a1 +Subject: [PATCH] w1: ds2482: cosmetic fixes after 54865314f5a1 commit 5cb27d30fc3a281e830a2099d520b469e2b82008 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0494-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch b/target/linux/brcm2708/patches-4.19/950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0494-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch rename to target/linux/brcm2708/patches-4.19/950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch index 1c58b9cd93..346cda887f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0494-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch @@ -1,7 +1,7 @@ From 2c1e36e477550ea66824433c132fdff03b4ee020 Mon Sep 17 00:00:00 2001 From: Klaus Schulz Date: Thu, 16 May 2019 13:35:32 +0200 -Subject: [PATCH 494/806] sound: pcm512x-codec: Adding 352.8kHz samplerate +Subject: [PATCH] sound: pcm512x-codec: Adding 352.8kHz samplerate support --- diff --git a/target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch rename to target/linux/brcm2708/patches-4.19/950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch index e33173a557..97d69c695b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0495-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch +++ b/target/linux/brcm2708/patches-4.19/950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch @@ -1,7 +1,7 @@ From 3150326498ba9388b85e5af2c8fcfeafc46eeaad Mon Sep 17 00:00:00 2001 From: GT Date: Sat, 6 Apr 2019 21:16:39 +0100 -Subject: [PATCH 495/806] ASoC: decommissioning driver for 3Dlab Nano soundcard +Subject: [PATCH] ASoC: decommissioning driver for 3Dlab Nano soundcard --- .../overlays/3dlab-nano-player-overlay.dts | 32 -- diff --git a/target/linux/brcm2708/patches-4.19/950-0496-.gitignore-Add-.dtbo-explicitly.patch b/target/linux/brcm2708/patches-4.19/950-0450-.gitignore-Add-.dtbo-explicitly.patch similarity index 87% rename from target/linux/brcm2708/patches-4.19/950-0496-.gitignore-Add-.dtbo-explicitly.patch rename to target/linux/brcm2708/patches-4.19/950-0450-.gitignore-Add-.dtbo-explicitly.patch index 524c7d2361..6a4566abd8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0496-.gitignore-Add-.dtbo-explicitly.patch +++ b/target/linux/brcm2708/patches-4.19/950-0450-.gitignore-Add-.dtbo-explicitly.patch @@ -1,7 +1,7 @@ From bd4e0a6ad64c1211094776923bf61bd6ede3f043 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 21 May 2019 15:17:33 +0100 -Subject: [PATCH 496/806] .gitignore: Add *.dtbo explicitly +Subject: [PATCH] .gitignore: Add *.dtbo explicitly Signed-off-by: popcornmix --- diff --git a/target/linux/brcm2708/patches-4.19/950-0497-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch b/target/linux/brcm2708/patches-4.19/950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0497-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch rename to target/linux/brcm2708/patches-4.19/950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch index d80b0e3551..28c7450564 100644 --- a/target/linux/brcm2708/patches-4.19/950-0497-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch @@ -1,7 +1,7 @@ From 83f0a8986ae42e33bc16acda0451dce2cf4dfb55 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 22 May 2019 09:05:40 +0200 -Subject: [PATCH 497/806] Bluetooth: Check key sizes only when Secure Simple +Subject: [PATCH] Bluetooth: Check key sizes only when Secure Simple Pairing is enabled The encryption is only mandatory to be enforced when both sides are using diff --git a/target/linux/brcm2708/patches-4.19/950-0498-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch b/target/linux/brcm2708/patches-4.19/950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0498-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch rename to target/linux/brcm2708/patches-4.19/950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch index 3f6bb4e97d..ba021f1e22 100644 --- a/target/linux/brcm2708/patches-4.19/950-0498-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch +++ b/target/linux/brcm2708/patches-4.19/950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch @@ -1,7 +1,7 @@ From efb54d0f0445f3d279a7eae7395b566c96d080de Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 May 2019 17:23:41 +0100 -Subject: [PATCH 498/806] usb: dwc_otg: Clean up interrupt claiming code +Subject: [PATCH] usb: dwc_otg: Clean up interrupt claiming code The FIQ/IRQ interrupt number identification code is scattered through the dwc_otg driver. Rationalise it, simplifying the code and solving diff --git a/target/linux/brcm2708/patches-4.19/950-0499-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0499-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch index b9fa9fa7da..dac4386448 100644 --- a/target/linux/brcm2708/patches-4.19/950-0499-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch @@ -1,7 +1,7 @@ From 5edb8789ba5f9694698386683f2e4e97c70e765a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 May 2019 14:27:35 +0100 -Subject: [PATCH 499/806] overlays: Delete the deprecated sdio-1bit overlay +Subject: [PATCH] overlays: Delete the deprecated sdio-1bit overlay Use dtoverlay=sdio,bus_width=1,gpios_22_25 instead. diff --git a/target/linux/brcm2708/patches-4.19/950-0500-overlays-Remove-upstream-aux-interrupt-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0500-overlays-Remove-upstream-aux-interrupt-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch index e44967a9c6..c6e54f3fda 100644 --- a/target/linux/brcm2708/patches-4.19/950-0500-overlays-Remove-upstream-aux-interrupt-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch @@ -1,7 +1,7 @@ From 2b584d25f295e07ef58efc2a60057be58015d693 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 May 2019 10:06:04 +0100 -Subject: [PATCH 500/806] overlays: Remove upstream-aux-interrupt overlay +Subject: [PATCH] overlays: Remove upstream-aux-interrupt overlay We no longer have a downstream-specific auxilliary interrupt driver, so the overlay to disable it is no longer needed. diff --git a/target/linux/brcm2708/patches-4.19/950-0501-overlays-Standardise-on-compatible-brcm-bcm2835.patch b/target/linux/brcm2708/patches-4.19/950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0501-overlays-Standardise-on-compatible-brcm-bcm2835.patch rename to target/linux/brcm2708/patches-4.19/950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch index 1a49b1ff44..b1f95e3445 100644 --- a/target/linux/brcm2708/patches-4.19/950-0501-overlays-Standardise-on-compatible-brcm-bcm2835.patch +++ b/target/linux/brcm2708/patches-4.19/950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch @@ -1,7 +1,7 @@ From ba6646d6bc62108f33a7a3e95367534a0a634beb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 14 May 2019 13:33:05 +0100 -Subject: [PATCH 501/806] overlays: Standardise on compatible="brcm,bcm2835" +Subject: [PATCH] overlays: Standardise on compatible="brcm,bcm2835" Curb the proliferation of compatible string combinations by standardising on "brcm,bcm2835" to denote BCM2835 and its descendants. diff --git a/target/linux/brcm2708/patches-4.19/950-0502-vc4-Remove-interrupt-and-DMA-trampling.patch b/target/linux/brcm2708/patches-4.19/950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0502-vc4-Remove-interrupt-and-DMA-trampling.patch rename to target/linux/brcm2708/patches-4.19/950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch index 8417a2ebdc..34fe856ee0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0502-vc4-Remove-interrupt-and-DMA-trampling.patch +++ b/target/linux/brcm2708/patches-4.19/950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch @@ -1,7 +1,7 @@ From 343e24f4a112e1118e955fd58316e71b208a22f3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 May 2019 12:58:47 +0100 -Subject: [PATCH 502/806] vc4: Remove interrupt and DMA trampling +Subject: [PATCH] vc4: Remove interrupt and DMA trampling As part of the effort to clean up the overlays, remove the interrupt and DMA mask declarations from the vc4 overlays which just duplicate diff --git a/target/linux/brcm2708/patches-4.19/950-0503-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch b/target/linux/brcm2708/patches-4.19/950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0503-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch rename to target/linux/brcm2708/patches-4.19/950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch index b4a0b4c9f0..8e854bdbc8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0503-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch +++ b/target/linux/brcm2708/patches-4.19/950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch @@ -1,7 +1,7 @@ From c63b13bddf317347ba0b69807c1591526d50ba47 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 7 May 2019 14:29:38 +0100 -Subject: [PATCH 503/806] BCM270X_DT: Add non-removable clone of mmc node +Subject: [PATCH] BCM270X_DT: Add non-removable clone of mmc node non-removable is a boolean property, and as such can't be unset by an overlay if it is set in a base DTB. Until now the workaround for this diff --git a/target/linux/brcm2708/patches-4.19/950-0504-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch b/target/linux/brcm2708/patches-4.19/950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0504-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch rename to target/linux/brcm2708/patches-4.19/950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch index 7e207842b3..162c28ee84 100644 --- a/target/linux/brcm2708/patches-4.19/950-0504-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch +++ b/target/linux/brcm2708/patches-4.19/950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch @@ -1,7 +1,7 @@ From 61c44e24ea212b92bf6a420b94070ee6fc715811 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 8 May 2019 10:08:31 +0100 -Subject: [PATCH 504/806] BCM270X_DT: usb: Refactor DTS and overlays +Subject: [PATCH] BCM270X_DT: usb: Refactor DTS and overlays Move the IRQ interrupt declaration in the usb node before the FIQ declaration, so that the dwc2 driver will find it. Name the diff --git a/target/linux/brcm2708/patches-4.19/950-0505-overlays-Update-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0459-overlays-Update-upstream-overlay.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0505-overlays-Update-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0459-overlays-Update-upstream-overlay.patch index 066c6898d0..45476681e1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0505-overlays-Update-upstream-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0459-overlays-Update-upstream-overlay.patch @@ -1,7 +1,7 @@ From 61c487e6a1985e52307d6df5834b610a50219819 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 May 2019 13:29:56 +0100 -Subject: [PATCH 505/806] overlays: Update upstream overlay +Subject: [PATCH] overlays: Update upstream overlay The recent DT/overlay changes have had a corresponding effect on the upstream overlay, which is a composite of the vc4-kms-v3d and dwc2 diff --git a/target/linux/brcm2708/patches-4.19/950-0506-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch b/target/linux/brcm2708/patches-4.19/950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0506-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch rename to target/linux/brcm2708/patches-4.19/950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch index d7b3ed560d..c3d32ee648 100644 --- a/target/linux/brcm2708/patches-4.19/950-0506-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch +++ b/target/linux/brcm2708/patches-4.19/950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch @@ -1,7 +1,7 @@ From f74fe07cab3e8816c029de25029b71c80004619c Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Thu, 16 May 2019 14:39:21 +0200 -Subject: [PATCH 506/806] w1: ds2408: Fix typo after 49695ac46861 (reset on +Subject: [PATCH] w1: ds2408: Fix typo after 49695ac46861 (reset on output_write retry with readback) commit 6660a04feb7ef648e50c792e19084d675fa6f3a2 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0507-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch b/target/linux/brcm2708/patches-4.19/950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0507-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch rename to target/linux/brcm2708/patches-4.19/950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch index 1156325aa8..37bb4fd61e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0507-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch +++ b/target/linux/brcm2708/patches-4.19/950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch @@ -1,7 +1,7 @@ From 9542646d9211ab4305beb75da97f61cc1968ae6c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 28 May 2019 16:36:04 +0100 -Subject: [PATCH 507/806] BCM270X_DT: Rename Pi Zero W DT files +Subject: [PATCH] BCM270X_DT: Rename Pi Zero W DT files The downtream Pi Zero W dts file uses the digit 0, whereas upstream chose to spell it out - "zero-w". The firmware has, for a long time, diff --git a/target/linux/brcm2708/patches-4.19/950-0508-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch b/target/linux/brcm2708/patches-4.19/950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0508-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch rename to target/linux/brcm2708/patches-4.19/950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch index ff74b418fa..fa60926439 100644 --- a/target/linux/brcm2708/patches-4.19/950-0508-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch +++ b/target/linux/brcm2708/patches-4.19/950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch @@ -1,7 +1,7 @@ From e819b50b0c384f11f4eaf6e1ea76030c320f4511 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 28 May 2019 16:23:51 +0100 -Subject: [PATCH 508/806] BCM270X_DT: Create bcm2708-rpi-zero.dts +Subject: [PATCH] BCM270X_DT: Create bcm2708-rpi-zero.dts The Pi Zero deserves a dedicated .dtb file - sharing the b-plus .dtb has been observed to cause an issue with the MAC address of some diff --git a/target/linux/brcm2708/patches-4.19/950-0509-overlays-Fix-mmc-related-overlays-after-refactor.patch b/target/linux/brcm2708/patches-4.19/950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0509-overlays-Fix-mmc-related-overlays-after-refactor.patch rename to target/linux/brcm2708/patches-4.19/950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch index 3b5b562568..468aa30608 100644 --- a/target/linux/brcm2708/patches-4.19/950-0509-overlays-Fix-mmc-related-overlays-after-refactor.patch +++ b/target/linux/brcm2708/patches-4.19/950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch @@ -1,7 +1,7 @@ From dadcb33e1f4ee70bc77da7fa7054b8571a22d5ea Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 May 2019 12:25:29 +0100 -Subject: [PATCH 509/806] overlays: Fix mmc-related overlays after refactor +Subject: [PATCH] overlays: Fix mmc-related overlays after refactor The addition of the mmcnr node to the base dtbs caused some overlays to not work as they should. Patch up pi3-disable-wifi, balena-fin and diff --git a/target/linux/brcm2708/patches-4.19/950-0511-Fixed-48k-timing-issue.patch b/target/linux/brcm2708/patches-4.19/950-0464-Fixed-48k-timing-issue.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0511-Fixed-48k-timing-issue.patch rename to target/linux/brcm2708/patches-4.19/950-0464-Fixed-48k-timing-issue.patch index ab4b1f0b26..541e18ac06 100644 --- a/target/linux/brcm2708/patches-4.19/950-0511-Fixed-48k-timing-issue.patch +++ b/target/linux/brcm2708/patches-4.19/950-0464-Fixed-48k-timing-issue.patch @@ -1,7 +1,7 @@ From 539e2eef7dbfb58ab028a5530430611973dd4c84 Mon Sep 17 00:00:00 2001 From: IQaudIO Date: Thu, 6 Jun 2019 10:20:55 +0100 -Subject: [PATCH 511/806] Fixed 48k timing issue +Subject: [PATCH] Fixed 48k timing issue --- sound/soc/bcm/iqaudio-codec.c | 33 ++++++++++++++++++++++++++++----- diff --git a/target/linux/brcm2708/patches-4.19/950-0512-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch b/target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0512-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch rename to target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch index 63eae876d6..48bb146741 100644 --- a/target/linux/brcm2708/patches-4.19/950-0512-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch +++ b/target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch @@ -1,7 +1,7 @@ From 3da653227926705fe0dcb7b6057be1ca811f47b8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:11:58 +0100 -Subject: [PATCH 512/806] staging: bcm2835-codec: Convert V4L2 nsec timestamps +Subject: [PATCH] staging: bcm2835-codec: Convert V4L2 nsec timestamps to MMAL usec V4L2 uses nsecs, whilst MMAL uses usecs, but the code wasn't converting diff --git a/target/linux/brcm2708/patches-4.19/950-0513-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch b/target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0513-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch rename to target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch index aea33ff02e..ac75d4768f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0513-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch +++ b/target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch @@ -1,7 +1,7 @@ From 67c1f9dd0253a1175f77e801b19bd9d923225f9c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2019 14:13:11 +0100 -Subject: [PATCH 513/806] staging: bcm2835-codec: Add support for setting +Subject: [PATCH] staging: bcm2835-codec: Add support for setting S_PARM and G_PARM Video encode can use the frame rate for rate control calculations, diff --git a/target/linux/brcm2708/patches-4.19/950-0514-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch b/target/linux/brcm2708/patches-4.19/950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0514-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch rename to target/linux/brcm2708/patches-4.19/950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch index 64e670b710..6229fdc38d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0514-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch +++ b/target/linux/brcm2708/patches-4.19/950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch @@ -1,7 +1,7 @@ From afea1f84cbda94c47ba4a8f84d16c4330e145a0a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 17:15:05 +0100 -Subject: [PATCH 514/806] w1: w1-gpio: Make GPIO an output for strong pullup +Subject: [PATCH] w1: w1-gpio: Make GPIO an output for strong pullup The logic to drive the data line high to implement a strong pullup assumed that the pin was already an output - setting a value does diff --git a/target/linux/brcm2708/patches-4.19/950-0515-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch b/target/linux/brcm2708/patches-4.19/950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0515-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch rename to target/linux/brcm2708/patches-4.19/950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch index fed2149355..f19a6380ce 100644 --- a/target/linux/brcm2708/patches-4.19/950-0515-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch +++ b/target/linux/brcm2708/patches-4.19/950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch @@ -1,7 +1,7 @@ From 531ae7af75b2be2867814693f069fb51e3155341 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 17:32:11 +0100 -Subject: [PATCH 515/806] overlays: Update w1-gpio and w1-gpio-pullup +Subject: [PATCH] overlays: Update w1-gpio and w1-gpio-pullup The parasitic power (power on data) feature is now enabled by default in the w1-gpio driver, so update the README and make the diff --git a/target/linux/brcm2708/patches-4.19/950-0516-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch b/target/linux/brcm2708/patches-4.19/950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0516-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch rename to target/linux/brcm2708/patches-4.19/950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch index 47e236916e..13ea94a130 100644 --- a/target/linux/brcm2708/patches-4.19/950-0516-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch +++ b/target/linux/brcm2708/patches-4.19/950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch @@ -1,7 +1,7 @@ From 73623c76c8bc8c41a4afefc1eee84dfc5979d652 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 20:45:17 +0100 -Subject: [PATCH 516/806] bcm2835-sdhost: Fix DMA channel leak on error/remove +Subject: [PATCH] bcm2835-sdhost: Fix DMA channel leak on error/remove Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0517-i2c-bcm2835-Model-Divider-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0517-i2c-bcm2835-Model-Divider-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch index f584989598..dc251a60c4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0517-i2c-bcm2835-Model-Divider-in-CCF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch @@ -1,7 +1,7 @@ From ffbb6cc14b8fb1876b249048284a5fe30f48c693 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Sat, 8 Jun 2019 10:14:43 -0700 -Subject: [PATCH 517/806] i2c: bcm2835: Model Divider in CCF +Subject: [PATCH] i2c: bcm2835: Model Divider in CCF Commit bebff81fb8b9216eb4fba22cf910553621ae3477 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0518-staging-vc04_services-Use-correct-cache-line-size.patch b/target/linux/brcm2708/patches-4.19/950-0471-staging-vc04_services-Use-correct-cache-line-size.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0518-staging-vc04_services-Use-correct-cache-line-size.patch rename to target/linux/brcm2708/patches-4.19/950-0471-staging-vc04_services-Use-correct-cache-line-size.patch index e9b4825bb3..c6b0606087 100644 --- a/target/linux/brcm2708/patches-4.19/950-0518-staging-vc04_services-Use-correct-cache-line-size.patch +++ b/target/linux/brcm2708/patches-4.19/950-0471-staging-vc04_services-Use-correct-cache-line-size.patch @@ -1,7 +1,7 @@ From 63079fbe20c954140f8eb61f858b0774890f301c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 17 Sep 2018 09:22:21 +0100 -Subject: [PATCH 518/806] staging/vc04_services: Use correct cache line size +Subject: [PATCH] staging/vc04_services: Use correct cache line size Use the compatible string in the DTB to select the correct cache line size for the SoC - 32 for BCM2835, and 64 for BCM2836 and BCM2837. diff --git a/target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch b/target/linux/brcm2708/patches-4.19/950-0472-tty-amba-pl011-allow-shared-interrupt.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch rename to target/linux/brcm2708/patches-4.19/950-0472-tty-amba-pl011-allow-shared-interrupt.patch index 7d79ed0f05..5d316bd314 100644 --- a/target/linux/brcm2708/patches-4.19/950-0519-tty-amba-pl011-allow-shared-interrupt.patch +++ b/target/linux/brcm2708/patches-4.19/950-0472-tty-amba-pl011-allow-shared-interrupt.patch @@ -1,7 +1,7 @@ From ea75a716955e85ad076dd2861ca9e41def406a1b Mon Sep 17 00:00:00 2001 From: Doug Berger Date: Mon, 13 May 2019 20:59:45 +0200 -Subject: [PATCH 519/806] tty: amba-pl011: allow shared interrupt +Subject: [PATCH] tty: amba-pl011: allow shared interrupt The PL011 register space includes all necessary status bits to determine whether a device instance requires handling in response diff --git a/target/linux/brcm2708/patches-4.19/950-0520-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch b/target/linux/brcm2708/patches-4.19/950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0520-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch rename to target/linux/brcm2708/patches-4.19/950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch index ce9409e36a..53fc19c0f2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0520-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch @@ -1,7 +1,7 @@ From 3f6fe9da303fc01fb754a0a639ec3cdb813e8780 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 19 May 2019 12:20:00 +0200 -Subject: [PATCH 520/806] ARM: bcm283x: Reduce register ranges for UART, SPI +Subject: [PATCH] ARM: bcm283x: Reduce register ranges for UART, SPI and I2C The assigned register ranges for UART, SPI and I2C were too wasteful. diff --git a/target/linux/brcm2708/patches-4.19/950-0521-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch b/target/linux/brcm2708/patches-4.19/950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0521-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch rename to target/linux/brcm2708/patches-4.19/950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch index ac3adb9492..84a691343f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0521-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch @@ -1,7 +1,7 @@ From 9f889edf282d1d9a21c921e6cd33cebe22bcc4d4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 12 Dec 2018 15:51:49 -0800 -Subject: [PATCH 521/806] ARM: bcm283x: Extend the WDT DT node out to cover the +Subject: [PATCH] ARM: bcm283x: Extend the WDT DT node out to cover the whole PM block. (v4) It was covering part of the PM block's range, up to the WDT regs. To diff --git a/target/linux/brcm2708/patches-4.19/950-0522-ARM-dts-Add-label-to-bcm2835-RNG.patch b/target/linux/brcm2708/patches-4.19/950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0522-ARM-dts-Add-label-to-bcm2835-RNG.patch rename to target/linux/brcm2708/patches-4.19/950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch index b9d29b7454..3d35540bda 100644 --- a/target/linux/brcm2708/patches-4.19/950-0522-ARM-dts-Add-label-to-bcm2835-RNG.patch +++ b/target/linux/brcm2708/patches-4.19/950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch @@ -1,7 +1,7 @@ From 1297aac31942e596e6888d772ba49393a9f59417 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 4 May 2019 17:06:54 +0200 -Subject: [PATCH 522/806] ARM: dts: Add label to bcm2835 RNG +Subject: [PATCH] ARM: dts: Add label to bcm2835 RNG --- arch/arm/boot/dts/bcm283x.dtsi | 2 +- diff --git a/target/linux/brcm2708/patches-4.19/950-0523-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0523-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch index 0d79d9047e..9c7d073b5a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0523-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch @@ -1,7 +1,7 @@ From 4a09c51bc328b2b83ffa20a6db02ac18139a963d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 12 Oct 2017 18:11:32 +0100 -Subject: [PATCH 523/806] dts: Use fb rather than leds for dpi overlay +Subject: [PATCH] dts: Use fb rather than leds for dpi overlay --- arch/arm/boot/dts/overlays/dpi18-overlay.dts | 2 +- diff --git a/target/linux/brcm2708/patches-4.19/950-0524-BCM270X_DT-Minor-tidy-up.patch b/target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0524-BCM270X_DT-Minor-tidy-up.patch rename to target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch index b6f801de3b..70325f7768 100644 --- a/target/linux/brcm2708/patches-4.19/950-0524-BCM270X_DT-Minor-tidy-up.patch +++ b/target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch @@ -1,7 +1,7 @@ From 021d54e3ae67e2b02310b9e3e871876a2c3b7eee Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 15:19:21 +0100 -Subject: [PATCH 524/806] BCM270X_DT: Minor tidy up +Subject: [PATCH] BCM270X_DT: Minor tidy up Move arm_pmu out of soc on bcm2710, and labels aren't aliases. diff --git a/target/linux/brcm2708/patches-4.19/950-0525-arm-bcm2835-Fix-FIQ-early-ioremap.patch b/target/linux/brcm2708/patches-4.19/950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0525-arm-bcm2835-Fix-FIQ-early-ioremap.patch rename to target/linux/brcm2708/patches-4.19/950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch index 4d472eb3f9..d320e40c41 100644 --- a/target/linux/brcm2708/patches-4.19/950-0525-arm-bcm2835-Fix-FIQ-early-ioremap.patch +++ b/target/linux/brcm2708/patches-4.19/950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch @@ -1,7 +1,7 @@ From 51d6e1924fd0e9d075bcef61bea5a475a0ad6634 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 20 Feb 2019 08:49:39 +0000 -Subject: [PATCH 525/806] arm: bcm2835: Fix FIQ early ioremap +Subject: [PATCH] arm: bcm2835: Fix FIQ early ioremap The ioremapping creates mappings within the vmalloc area. The equivalent early function, create_mapping, now checks that the diff --git a/target/linux/brcm2708/patches-4.19/950-0526-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch b/target/linux/brcm2708/patches-4.19/950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0526-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch rename to target/linux/brcm2708/patches-4.19/950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch index 932d9eb004..b06b21404e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0526-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch +++ b/target/linux/brcm2708/patches-4.19/950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch @@ -1,7 +1,7 @@ From ab2695d38f4ffadde05c2275ac68f4aad68ef336 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 14 Mar 2019 10:16:02 +0000 -Subject: [PATCH 526/806] Fix copy_from_user if BCM2835_FAST_MEMCPY=n +Subject: [PATCH] Fix copy_from_user if BCM2835_FAST_MEMCPY=n The change which introduced CONFIG_BCM2835_FAST_MEMCPY unconditionally changed the behaviour of arm_copy_from_user. The page pinning code diff --git a/target/linux/brcm2708/patches-4.19/950-0527-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch b/target/linux/brcm2708/patches-4.19/950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0527-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch rename to target/linux/brcm2708/patches-4.19/950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch index 3d9cc8c660..88431e2aca 100644 --- a/target/linux/brcm2708/patches-4.19/950-0527-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch @@ -1,7 +1,7 @@ From ac1212c0f8b611be6df28f252ebbad80b775ee0f Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 527/806] PCI: brcmstb: Add Broadcom STB PCIe host controller +Subject: [PATCH] PCI: brcmstb: Add Broadcom STB PCIe host controller driver This commit adds the basic Broadcom STB PCIe controller. Missing is diff --git a/target/linux/brcm2708/patches-4.19/950-0528-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch b/target/linux/brcm2708/patches-4.19/950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0528-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch rename to target/linux/brcm2708/patches-4.19/950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch index 804432d48d..75615e372f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0528-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch @@ -1,7 +1,7 @@ From d3cc1c713b9436a7dc72788caa1d8de63ac3a01b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 528/806] PCI: brcmstb: Add dma-range mapping for inbound +Subject: [PATCH] PCI: brcmstb: Add dma-range mapping for inbound traffic The Broadcom STB PCIe host controller is intimately related to the diff --git a/target/linux/brcm2708/patches-4.19/950-0529-PCI-brcmstb-Add-MSI-capability.patch b/target/linux/brcm2708/patches-4.19/950-0482-PCI-brcmstb-Add-MSI-capability.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0529-PCI-brcmstb-Add-MSI-capability.patch rename to target/linux/brcm2708/patches-4.19/950-0482-PCI-brcmstb-Add-MSI-capability.patch index b8b61aa614..856bf2bdf4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0529-PCI-brcmstb-Add-MSI-capability.patch +++ b/target/linux/brcm2708/patches-4.19/950-0482-PCI-brcmstb-Add-MSI-capability.patch @@ -1,7 +1,7 @@ From cd3af4fa73ab25353f0865ebe8e0d2af1fd2a50b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 529/806] PCI: brcmstb: Add MSI capability +Subject: [PATCH] PCI: brcmstb: Add MSI capability This commit adds MSI to the Broadcom STB PCIe host controller. It does not add MSIX since that functionality is not in the HW. The MSI diff --git a/target/linux/brcm2708/patches-4.19/950-0530-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch b/target/linux/brcm2708/patches-4.19/950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0530-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch rename to target/linux/brcm2708/patches-4.19/950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch index 8cd51b7961..632e986e50 100644 --- a/target/linux/brcm2708/patches-4.19/950-0530-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch +++ b/target/linux/brcm2708/patches-4.19/950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch @@ -1,7 +1,7 @@ From cb1acabb459677efbf95c54ce1dc5252be30a018 Mon Sep 17 00:00:00 2001 From: Jim Quinlan Date: Mon, 15 Jan 2018 18:28:39 -0500 -Subject: [PATCH 530/806] dt-bindings: pci: Add DT docs for Brcmstb PCIe device +Subject: [PATCH] dt-bindings: pci: Add DT docs for Brcmstb PCIe device The DT bindings description of the Brcmstb PCIe device is described. This node can be used by almost all Broadcom settop box chips, using diff --git a/target/linux/brcm2708/patches-4.19/950-0531-pcie-brcmstb-Changes-for-BCM2711.patch b/target/linux/brcm2708/patches-4.19/950-0484-pcie-brcmstb-Changes-for-BCM2711.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0531-pcie-brcmstb-Changes-for-BCM2711.patch rename to target/linux/brcm2708/patches-4.19/950-0484-pcie-brcmstb-Changes-for-BCM2711.patch index 58803a8bdd..b44ec4c4e2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0531-pcie-brcmstb-Changes-for-BCM2711.patch +++ b/target/linux/brcm2708/patches-4.19/950-0484-pcie-brcmstb-Changes-for-BCM2711.patch @@ -1,7 +1,7 @@ From 545951be6cabac8b1df85771c44335a0eaaa3c5d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 19 Feb 2019 22:06:59 +0000 -Subject: [PATCH 531/806] pcie-brcmstb: Changes for BCM2711 +Subject: [PATCH] pcie-brcmstb: Changes for BCM2711 The initial brcmstb PCIe driver - originally taken from the V3(?) patch set - has been modified significantly for the BCM2711. diff --git a/target/linux/brcm2708/patches-4.19/950-0532-arm-bcm2835-DMA-can-only-address-1GB.patch b/target/linux/brcm2708/patches-4.19/950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0532-arm-bcm2835-DMA-can-only-address-1GB.patch rename to target/linux/brcm2708/patches-4.19/950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch index 29942be1f5..89919c1d79 100644 --- a/target/linux/brcm2708/patches-4.19/950-0532-arm-bcm2835-DMA-can-only-address-1GB.patch +++ b/target/linux/brcm2708/patches-4.19/950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch @@ -1,7 +1,7 @@ From 9334afe7293b3a78b7e070a70880b2db7aa98365 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 15:47:42 +0100 -Subject: [PATCH 532/806] arm: bcm2835: DMA can only address 1GB +Subject: [PATCH] arm: bcm2835: DMA can only address 1GB The legacy peripherals can only address the first gigabyte of RAM, so ensure that DMA allocations are restricted to that region. diff --git a/target/linux/brcm2708/patches-4.19/950-0533-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch b/target/linux/brcm2708/patches-4.19/950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0533-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch rename to target/linux/brcm2708/patches-4.19/950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch index bf0b19b30e..a2aeeea2dd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0533-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch +++ b/target/linux/brcm2708/patches-4.19/950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch @@ -1,7 +1,7 @@ From 8a58288d710a817b5dc7747f0bec1fb167368e7e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 Aug 2018 09:05:15 +0100 -Subject: [PATCH 533/806] mmc: bcm2835-sdhost: Support 64-bit physical +Subject: [PATCH] mmc: bcm2835-sdhost: Support 64-bit physical addresses Signed-off-by: Phil Elwell diff --git a/target/linux/brcm2708/patches-4.19/950-0534-mmc-sdhci-Mask-spurious-interrupts.patch b/target/linux/brcm2708/patches-4.19/950-0487-mmc-sdhci-Mask-spurious-interrupts.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0534-mmc-sdhci-Mask-spurious-interrupts.patch rename to target/linux/brcm2708/patches-4.19/950-0487-mmc-sdhci-Mask-spurious-interrupts.patch index b55c153997..1aa0a17965 100644 --- a/target/linux/brcm2708/patches-4.19/950-0534-mmc-sdhci-Mask-spurious-interrupts.patch +++ b/target/linux/brcm2708/patches-4.19/950-0487-mmc-sdhci-Mask-spurious-interrupts.patch @@ -1,7 +1,7 @@ From be309b7db77215610d5ac15bf0aacd47ea5b3433 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 28 Sep 2018 16:24:05 +0100 -Subject: [PATCH 534/806] mmc: sdhci: Mask "spurious" interrupts +Subject: [PATCH] mmc: sdhci: Mask "spurious" interrupts Add a filter for "spurious" Transfer Complete interrupts, attempting to make it as specific as possible: diff --git a/target/linux/brcm2708/patches-4.19/950-0535-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch b/target/linux/brcm2708/patches-4.19/950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0535-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch rename to target/linux/brcm2708/patches-4.19/950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch index 14b4289696..d960766911 100644 --- a/target/linux/brcm2708/patches-4.19/950-0535-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch +++ b/target/linux/brcm2708/patches-4.19/950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch @@ -1,7 +1,7 @@ From 0a1c3ff378e60f2a59153cfc1c7529bfe05eb115 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 27 Apr 2019 12:33:57 +0200 -Subject: [PATCH 535/806] mmc: sdhci-iproc: Add support for emmc2 of the +Subject: [PATCH] mmc: sdhci-iproc: Add support for emmc2 of the BCM2838 The emmc2 interface of the BCM2838 should be integrated in sdhci-iproc diff --git a/target/linux/brcm2708/patches-4.19/950-0536-hwrng-iproc-rng200-Add-BCM2838-support.patch b/target/linux/brcm2708/patches-4.19/950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0536-hwrng-iproc-rng200-Add-BCM2838-support.patch rename to target/linux/brcm2708/patches-4.19/950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch index daa10d10be..c2a29a01ca 100644 --- a/target/linux/brcm2708/patches-4.19/950-0536-hwrng-iproc-rng200-Add-BCM2838-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch @@ -1,7 +1,7 @@ From e9c0fd87b6169baf5bd10293a85675d505086191 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 4 May 2019 17:06:15 +0200 -Subject: [PATCH 536/806] hwrng: iproc-rng200: Add BCM2838 support +Subject: [PATCH] hwrng: iproc-rng200: Add BCM2838 support The HWRNG on the BCM2838 is compatible to iproc-rng200, so add the support to this driver instead of bcm2835-rng. diff --git a/target/linux/brcm2708/patches-4.19/950-0537-thermal-brcmstb_thermal-Add-BCM2838-support.patch b/target/linux/brcm2708/patches-4.19/950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0537-thermal-brcmstb_thermal-Add-BCM2838-support.patch rename to target/linux/brcm2708/patches-4.19/950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch index 5a59adc788..6bc76ed6e6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0537-thermal-brcmstb_thermal-Add-BCM2838-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch @@ -1,7 +1,7 @@ From d49649e2dcf0d5775e92677d37e229e0387fe82a Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 18 May 2019 12:26:11 +0200 -Subject: [PATCH 537/806] thermal: brcmstb_thermal: Add BCM2838 support +Subject: [PATCH] thermal: brcmstb_thermal: Add BCM2838 support The BCM2838 has an AVS TMON hardware block. This adds the necessary support to the brcmstb_thermal driver ( no trip handling ). diff --git a/target/linux/brcm2708/patches-4.19/950-0538-vchiq-Add-36-bit-address-support.patch b/target/linux/brcm2708/patches-4.19/950-0491-vchiq-Add-36-bit-address-support.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0538-vchiq-Add-36-bit-address-support.patch rename to target/linux/brcm2708/patches-4.19/950-0491-vchiq-Add-36-bit-address-support.patch index 871ab1effd..e1eec5d9d9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0538-vchiq-Add-36-bit-address-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0491-vchiq-Add-36-bit-address-support.patch @@ -1,7 +1,7 @@ From d5c6191cc94b358de183cc8c88a5722a79445202 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 1 Nov 2018 17:31:37 +0000 -Subject: [PATCH 538/806] vchiq: Add 36-bit address support +Subject: [PATCH] vchiq: Add 36-bit address support Conditional on a new compatible string, change the pagelist encoding such that the top 24 bits are the pfn, leaving 8 bits for run length diff --git a/target/linux/brcm2708/patches-4.19/950-0539-bcm2835-pcm.c-Support-multichannel-audio.patch b/target/linux/brcm2708/patches-4.19/950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0539-bcm2835-pcm.c-Support-multichannel-audio.patch rename to target/linux/brcm2708/patches-4.19/950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch index 781d372630..47898dbd94 100644 --- a/target/linux/brcm2708/patches-4.19/950-0539-bcm2835-pcm.c-Support-multichannel-audio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch @@ -1,7 +1,7 @@ From 69d7e7d0f958186a0f7667ebeefdb50d1c5c3bd3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 30 Apr 2019 19:15:30 +0100 -Subject: [PATCH 539/806] bcm2835-pcm.c: Support multichannel audio +Subject: [PATCH] bcm2835-pcm.c: Support multichannel audio --- .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 17 +++++++++-------- diff --git a/target/linux/brcm2708/patches-4.19/950-0540-bcmgenet-constrain-max-DMA-burst-length.patch b/target/linux/brcm2708/patches-4.19/950-0493-bcmgenet-constrain-max-DMA-burst-length.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0540-bcmgenet-constrain-max-DMA-burst-length.patch rename to target/linux/brcm2708/patches-4.19/950-0493-bcmgenet-constrain-max-DMA-burst-length.patch index 55af70e98f..54ead878b0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0540-bcmgenet-constrain-max-DMA-burst-length.patch +++ b/target/linux/brcm2708/patches-4.19/950-0493-bcmgenet-constrain-max-DMA-burst-length.patch @@ -1,7 +1,7 @@ From 12865021c91e21ca7189c6a84688459d400de204 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 12 Sep 2018 14:44:53 +0100 -Subject: [PATCH 540/806] bcmgenet: constrain max DMA burst length +Subject: [PATCH] bcmgenet: constrain max DMA burst length --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- diff --git a/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/brcm2708/patches-4.19/950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch rename to target/linux/brcm2708/patches-4.19/950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch index f91643342f..e045886c78 100644 --- a/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/brcm2708/patches-4.19/950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -1,7 +1,7 @@ From bb3075a2edb5c55d0ea7470da8bb44cc9f36aa02 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 27 Mar 2019 13:45:46 +0000 -Subject: [PATCH 541/806] bcmgenet: Better coalescing parameter defaults +Subject: [PATCH] bcmgenet: Better coalescing parameter defaults Set defaults for TX and RX packet coalescing to be equivalent to: diff --git a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/brcm2708/patches-4.19/950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch rename to target/linux/brcm2708/patches-4.19/950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch index 02b5701099..2c0557b65b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch +++ b/target/linux/brcm2708/patches-4.19/950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch @@ -1,7 +1,7 @@ From d8b59e9245f8b2a231eeaa35b4a42f30cdbd5304 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:17:59 +0100 -Subject: [PATCH 542/806] net: genet: enable link energy detect powerdown for +Subject: [PATCH] net: genet: enable link energy detect powerdown for external PHYs There are several warts surrounding bcmgenet_mii_probe() as this diff --git a/target/linux/brcm2708/patches-4.19/950-0543-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/brcm2708/patches-4.19/950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0543-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch rename to target/linux/brcm2708/patches-4.19/950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch index 633ec4714c..354cd08f22 100644 --- a/target/linux/brcm2708/patches-4.19/950-0543-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch +++ b/target/linux/brcm2708/patches-4.19/950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch @@ -1,7 +1,7 @@ From 8eb54bbd5e6ebb929d390432163589f4c3dc0c14 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 14 May 2019 17:00:41 +0100 -Subject: [PATCH 543/806] phy: broadcom: split out the BCM54213PE from the +Subject: [PATCH] phy: broadcom: split out the BCM54213PE from the BCM54210E IDs The last nibble is a revision ID, and the 54213pe is a later rev diff --git a/target/linux/brcm2708/patches-4.19/950-0544-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch b/target/linux/brcm2708/patches-4.19/950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0544-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch rename to target/linux/brcm2708/patches-4.19/950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch index 8c620803db..15af5a7ca4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0544-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch @@ -1,7 +1,7 @@ From dc2550fdfd0a46c3ec67e5003b3d69c29141406b Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Fri, 17 May 2019 13:31:21 +0100 -Subject: [PATCH 544/806] phy: bcm54213pe: configure the LED outputs to be more +Subject: [PATCH] phy: bcm54213pe: configure the LED outputs to be more user-friendly The default state was both LEDs indicating link speed. diff --git a/target/linux/brcm2708/patches-4.19/950-0545-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch b/target/linux/brcm2708/patches-4.19/950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0545-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch rename to target/linux/brcm2708/patches-4.19/950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch index db66e84a38..083e0c7f1e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0545-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch +++ b/target/linux/brcm2708/patches-4.19/950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch @@ -1,7 +1,7 @@ From 856c8fdf68e589c89ed0518aab727c54fdff5afa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 21 May 2019 13:36:52 +0100 -Subject: [PATCH 545/806] dwc_otg: Choose appropriate IRQ handover strategy +Subject: [PATCH] dwc_otg: Choose appropriate IRQ handover strategy 2711 has no MPHI peripheral, but the ARM Control block can fake interrupts. Use the size of the DTB "mphi" reg block to determine diff --git a/target/linux/brcm2708/patches-4.19/950-0546-usb-xhci-Disable-the-XHCI-5-second-timeout.patch b/target/linux/brcm2708/patches-4.19/950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0546-usb-xhci-Disable-the-XHCI-5-second-timeout.patch rename to target/linux/brcm2708/patches-4.19/950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch index f7c2ad866a..abc576d690 100644 --- a/target/linux/brcm2708/patches-4.19/950-0546-usb-xhci-Disable-the-XHCI-5-second-timeout.patch +++ b/target/linux/brcm2708/patches-4.19/950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch @@ -1,7 +1,7 @@ From ff7222c0771a5e28666335663571058e560ad32b Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 22 Mar 2019 09:47:14 +0000 -Subject: [PATCH 546/806] usb: xhci: Disable the XHCI 5 second timeout +Subject: [PATCH] usb: xhci: Disable the XHCI 5 second timeout If the VL805 EEPROM has not been programmed then boot will hang for five seconds. The timeout seems to be arbitrary and is an unecessary diff --git a/target/linux/brcm2708/patches-4.19/950-0547-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/brcm2708/patches-4.19/950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0547-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch rename to target/linux/brcm2708/patches-4.19/950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index 496fb61525..239e142eda 100644 --- a/target/linux/brcm2708/patches-4.19/950-0547-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/brcm2708/patches-4.19/950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch @@ -1,7 +1,7 @@ From 94a960e8933fb94b979f88c319aa54c304004b35 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 23 May 2019 15:08:30 +0100 -Subject: [PATCH 547/806] usb: xhci: Show that the VIA VL805 supports LPM +Subject: [PATCH] usb: xhci: Show that the VIA VL805 supports LPM Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch b/target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch rename to target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch index bd332715fc..c48d16db91 100644 --- a/target/linux/brcm2708/patches-4.19/950-0548-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch +++ b/target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch @@ -1,7 +1,7 @@ From fa776ef749c924cd3ff3ffa257d7a63a27224399 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 30 May 2019 10:38:40 +0100 -Subject: [PATCH 548/806] usb: xhci: hack xhci_urb_enqueue to support +Subject: [PATCH] usb: xhci: hack xhci_urb_enqueue to support hid.mousepoll behaviour xHCI creates endpoint contexts directly from the device's endpoint diff --git a/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch b/target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch rename to target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch index 655937e303..cb4fc3b708 100644 --- a/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch +++ b/target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch @@ -1,7 +1,7 @@ From 9fdab9bd6324314cbdfe96a6da5edef6c29ed5e6 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Wed, 9 Jan 2019 14:43:36 +0000 -Subject: [PATCH 549/806] pinctrl-bcm2835: Add support for BCM2838 +Subject: [PATCH] pinctrl-bcm2835: Add support for BCM2838 GPIO configuration on BCM2838 is largely the same as BCM2835 except for the pull up/down configuration. The old mechanism has been replaced diff --git a/target/linux/brcm2708/patches-4.19/950-0550-spi-bcm2835-enable-shared-interrupt-support.patch b/target/linux/brcm2708/patches-4.19/950-0503-spi-bcm2835-enable-shared-interrupt-support.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0550-spi-bcm2835-enable-shared-interrupt-support.patch rename to target/linux/brcm2708/patches-4.19/950-0503-spi-bcm2835-enable-shared-interrupt-support.patch index 9c0a956215..f929b3a969 100644 --- a/target/linux/brcm2708/patches-4.19/950-0550-spi-bcm2835-enable-shared-interrupt-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0503-spi-bcm2835-enable-shared-interrupt-support.patch @@ -1,7 +1,7 @@ From 21dd7cd6dc231287b92a8c8b9ecf9d0844c2d325 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Mon, 13 May 2019 11:05:27 +0000 -Subject: [PATCH 550/806] spi: bcm2835: enable shared interrupt support +Subject: [PATCH] spi: bcm2835: enable shared interrupt support Add shared interrupt support for this driver. diff --git a/target/linux/brcm2708/patches-4.19/950-0551-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch b/target/linux/brcm2708/patches-4.19/950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0551-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch rename to target/linux/brcm2708/patches-4.19/950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch index 0601ecb872..fb358aa45f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0551-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch @@ -1,7 +1,7 @@ From 0be0d6439128366a8d2ac0afaf88f19209171e51 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 9 May 2019 14:30:37 +0100 -Subject: [PATCH 551/806] drivers: char: add chardev for mmap'ing Argon control +Subject: [PATCH] drivers: char: add chardev for mmap'ing Argon control registers Based on the gpiomem driver, allow mapping of the decoder register diff --git a/target/linux/brcm2708/patches-4.19/950-0552-clk-bcm2835-Don-t-wait-for-pllh-lock.patch b/target/linux/brcm2708/patches-4.19/950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0552-clk-bcm2835-Don-t-wait-for-pllh-lock.patch rename to target/linux/brcm2708/patches-4.19/950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch index ef5d5dfacf..e8ab380b5d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0552-clk-bcm2835-Don-t-wait-for-pllh-lock.patch +++ b/target/linux/brcm2708/patches-4.19/950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch @@ -1,7 +1,7 @@ From 3924edc9bd3c55d48c383c1046d75e163ce3cddb Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 23 Jan 2019 16:11:50 +0000 -Subject: [PATCH 552/806] clk-bcm2835: Don't wait for pllh lock +Subject: [PATCH] clk-bcm2835: Don't wait for pllh lock Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0553-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch b/target/linux/brcm2708/patches-4.19/950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0553-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch rename to target/linux/brcm2708/patches-4.19/950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch index de360d28cd..ff15427b5c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0553-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch +++ b/target/linux/brcm2708/patches-4.19/950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch @@ -1,7 +1,7 @@ From 90964ab2d00546a59086ffd08964da3d2a5cefc9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 12 Dec 2018 15:51:47 -0800 -Subject: [PATCH 553/806] bcm2835-pm: Move bcm2835-watchdog's DT probe to an +Subject: [PATCH] bcm2835-pm: Move bcm2835-watchdog's DT probe to an MFD. The PM block that the wdt driver was binding to actually has multiple diff --git a/target/linux/brcm2708/patches-4.19/950-0554-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch b/target/linux/brcm2708/patches-4.19/950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0554-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch rename to target/linux/brcm2708/patches-4.19/950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch index 2c046a75c1..229dbe520c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0554-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch +++ b/target/linux/brcm2708/patches-4.19/950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch @@ -1,7 +1,7 @@ From fd8ca458728baabe9cae37836088a33c8642d420 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 12 Dec 2018 15:51:48 -0800 -Subject: [PATCH 554/806] soc: bcm: bcm2835-pm: Add support for power domains +Subject: [PATCH] soc: bcm: bcm2835-pm: Add support for power domains under a new binding. This provides a free software alternative to raspberrypi-power.c's diff --git a/target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch b/target/linux/brcm2708/patches-4.19/950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch rename to target/linux/brcm2708/patches-4.19/950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch index 5c6f027745..05ae67aeee 100644 --- a/target/linux/brcm2708/patches-4.19/950-0555-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch +++ b/target/linux/brcm2708/patches-4.19/950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch @@ -1,7 +1,7 @@ From ea44a81b7daf511788aecaee7575feff359c5d19 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Jan 2019 17:29:10 -0800 -Subject: [PATCH 555/806] soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain +Subject: [PATCH] soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain support. We don't have ASB master/slave regs for this domain, so just skip that diff --git a/target/linux/brcm2708/patches-4.19/950-0556-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch b/target/linux/brcm2708/patches-4.19/950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0556-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch rename to target/linux/brcm2708/patches-4.19/950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch index d873ec6335..0f3ea9a9f2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0556-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch +++ b/target/linux/brcm2708/patches-4.19/950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch @@ -1,7 +1,7 @@ From 8d9f3526529d857376c661c21820a0049c2e62de Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 12 Jan 2019 08:07:43 -0800 -Subject: [PATCH 556/806] soc: bcm: bcm2835-pm: Fix error paths of +Subject: [PATCH] soc: bcm: bcm2835-pm: Fix error paths of initialization. The clock driver may probe after ours and so we need to pass the diff --git a/target/linux/brcm2708/patches-4.19/950-0557-soc-bcm-bcm2835-pm-Add-support-for-2711.patch b/target/linux/brcm2708/patches-4.19/950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0557-soc-bcm-bcm2835-pm-Add-support-for-2711.patch rename to target/linux/brcm2708/patches-4.19/950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch index 5f547fddfe..4c87289455 100644 --- a/target/linux/brcm2708/patches-4.19/950-0557-soc-bcm-bcm2835-pm-Add-support-for-2711.patch +++ b/target/linux/brcm2708/patches-4.19/950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch @@ -1,7 +1,7 @@ From f3470769d4e64084fc7f3060d634aff8fdf8f75d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Jan 2019 17:31:07 -0800 -Subject: [PATCH 557/806] soc: bcm: bcm2835-pm: Add support for 2711. +Subject: [PATCH] soc: bcm: bcm2835-pm: Add support for 2711. Without the actual power management part any more, there's a lot less to set up for V3D. We just need to clear the RSTN field for the power diff --git a/target/linux/brcm2708/patches-4.19/950-0558-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch b/target/linux/brcm2708/patches-4.19/950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0558-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch rename to target/linux/brcm2708/patches-4.19/950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch index 1dc154ba47..2b4d34e3fe 100644 --- a/target/linux/brcm2708/patches-4.19/950-0558-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch @@ -1,7 +1,7 @@ From 7e891cb1f9f57c87706b1292f186d65e1640e0e7 Mon Sep 17 00:00:00 2001 From: Chunming Zhou Date: Thu, 30 Aug 2018 14:48:29 +0800 -Subject: [PATCH 558/806] drm: expand drm_syncobj_find_fence to support +Subject: [PATCH] drm: expand drm_syncobj_find_fence to support timeline point v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/target/linux/brcm2708/patches-4.19/950-0559-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch b/target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0559-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch rename to target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch index 1692bac2a0..126452f974 100644 --- a/target/linux/brcm2708/patches-4.19/950-0559-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch +++ b/target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch @@ -1,7 +1,7 @@ From f5f3df2b1746a9ba9420ae11988fc37a7b93691d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 28 Sep 2018 16:21:23 -0700 -Subject: [PATCH 559/806] drm/v3d: Fix a use-after-free race accessing the +Subject: [PATCH] drm/v3d: Fix a use-after-free race accessing the scheduler's fences. Once we push the job, the scheduler could run it and free it. So, if diff --git a/target/linux/brcm2708/patches-4.19/950-0560-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch b/target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0560-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch rename to target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch index 0daf48360c..847bb2089b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0560-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch +++ b/target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch @@ -1,7 +1,7 @@ From 18f93916e42ea25fc77cab20d1e038620e33d741 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 28 Sep 2018 16:21:24 -0700 -Subject: [PATCH 560/806] drm/v3d: Add a little debugfs entry for measuring the +Subject: [PATCH] drm/v3d: Add a little debugfs entry for measuring the core clock. This adds just enough performance counter support to measure the diff --git a/target/linux/brcm2708/patches-4.19/950-0561-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch b/target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0561-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch rename to target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch index 2401885e26..e5068090ab 100644 --- a/target/linux/brcm2708/patches-4.19/950-0561-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch +++ b/target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch @@ -1,7 +1,7 @@ From 6351d93a0f1a18c45c4407c472195d957da5d3d0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 8 Nov 2018 08:16:52 -0800 -Subject: [PATCH 561/806] drm/v3d: Update a comment about what uses +Subject: [PATCH] drm/v3d: Update a comment about what uses v3d_job_dependency(). I merged bin and render's paths in a late refactoring. diff --git a/target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Clean-up-the-reservation-object-setup.patch b/target/linux/brcm2708/patches-4.19/950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Clean-up-the-reservation-object-setup.patch rename to target/linux/brcm2708/patches-4.19/950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch index ec26c53997..94156e72b4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Clean-up-the-reservation-object-setup.patch +++ b/target/linux/brcm2708/patches-4.19/950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch @@ -1,7 +1,7 @@ From 5ca5bd799b4f4a065b969461fa7852415bfb8c6f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 8 Nov 2018 08:16:53 -0800 -Subject: [PATCH 562/806] drm/v3d: Clean up the reservation object setup. +Subject: [PATCH] drm/v3d: Clean up the reservation object setup. The extra to_v3d_bo() calls came from copying this from the vc4 driver, which stored the cma gem object in the structs. diff --git a/target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch b/target/linux/brcm2708/patches-4.19/950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch rename to target/linux/brcm2708/patches-4.19/950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch index 095a4c8962..99b1a69c09 100644 --- a/target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch +++ b/target/linux/brcm2708/patches-4.19/950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch @@ -1,7 +1,7 @@ From ba1e90b6c3b3bf0e88ab01c824c4f8fde582e878 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 28 Nov 2018 15:09:25 -0800 -Subject: [PATCH 563/806] drm/v3d: Add support for submitting jobs to the TFU. +Subject: [PATCH] drm/v3d: Add support for submitting jobs to the TFU. The TFU can copy from raster, UIF, and SAND input images to UIF output images, with optional mipmap generation. This will certainly be diff --git a/target/linux/brcm2708/patches-4.19/950-0564-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch b/target/linux/brcm2708/patches-4.19/950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0564-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch rename to target/linux/brcm2708/patches-4.19/950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch index 83ee5e3cae..e39c19190e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0564-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch +++ b/target/linux/brcm2708/patches-4.19/950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch @@ -1,7 +1,7 @@ From c95a4208ef87c56349d35480e68304562c7612bd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 28 Nov 2018 15:09:26 -0800 -Subject: [PATCH 564/806] drm/v3d: Drop the "dev" argument to lock/unlock of BO +Subject: [PATCH] drm/v3d: Drop the "dev" argument to lock/unlock of BO reservations. They were unused, as Dave Emett noticed in TFU review. diff --git a/target/linux/brcm2708/patches-4.19/950-0565-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch b/target/linux/brcm2708/patches-4.19/950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0565-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch rename to target/linux/brcm2708/patches-4.19/950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch index 12e00cbd53..d56e04547f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0565-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch +++ b/target/linux/brcm2708/patches-4.19/950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch @@ -1,7 +1,7 @@ From 49281ec9b6f3c7bda94c798133dd35d50eb69649 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 30 Nov 2018 16:57:59 -0800 -Subject: [PATCH 565/806] drm/v3d: Add missing fence timeline name for TFU. +Subject: [PATCH] drm/v3d: Add missing fence timeline name for TFU. We shouldn't be returning v3d-render for our new queue. diff --git a/target/linux/brcm2708/patches-4.19/950-0566-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch b/target/linux/brcm2708/patches-4.19/950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0566-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch rename to target/linux/brcm2708/patches-4.19/950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch index b3bb3c7848..0b54645107 100644 --- a/target/linux/brcm2708/patches-4.19/950-0566-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch +++ b/target/linux/brcm2708/patches-4.19/950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch @@ -1,7 +1,7 @@ From 128adbc39c9826ca137ca3627cff17644e786fdb Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 30 Nov 2018 16:57:58 -0800 -Subject: [PATCH 566/806] drm/v3d: Add more tracepoints for V3D GPU rendering. +Subject: [PATCH] drm/v3d: Add more tracepoints for V3D GPU rendering. The core scheduler tells us when the job is pushed to the scheduler's queue, and I had the job_run functions saying when they actually queue diff --git a/target/linux/brcm2708/patches-4.19/950-0567-drm-v3d-Drop-unused-v3d_flush_caches.patch b/target/linux/brcm2708/patches-4.19/950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0567-drm-v3d-Drop-unused-v3d_flush_caches.patch rename to target/linux/brcm2708/patches-4.19/950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch index e238f32a98..aba98eb97f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0567-drm-v3d-Drop-unused-v3d_flush_caches.patch +++ b/target/linux/brcm2708/patches-4.19/950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch @@ -1,7 +1,7 @@ From 065c8947cb7c40bfb3e76dcbb9d901b5e8fe0ea4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 3 Dec 2018 14:24:34 -0800 -Subject: [PATCH 567/806] drm/v3d: Drop unused v3d_flush_caches(). +Subject: [PATCH] drm/v3d: Drop unused v3d_flush_caches(). Now that I've specified how the end-of-pipeline flushing should work, we're never going to use this function. diff --git a/target/linux/brcm2708/patches-4.19/950-0568-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch b/target/linux/brcm2708/patches-4.19/950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0568-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch rename to target/linux/brcm2708/patches-4.19/950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch index f7195c4d23..164e29f673 100644 --- a/target/linux/brcm2708/patches-4.19/950-0568-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch +++ b/target/linux/brcm2708/patches-4.19/950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch @@ -1,7 +1,7 @@ From 4a6410a53059d6505680b70fc438b7cfbf8939ca Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 3 Dec 2018 14:24:35 -0800 -Subject: [PATCH 568/806] drm/v3d: Don't bother flushing L1TD at job start. +Subject: [PATCH] drm/v3d: Don't bother flushing L1TD at job start. This is the write combiner for TMU writes. You're supposed to flush that at job end if you had dirtied any cachelines. Flushing it at job diff --git a/target/linux/brcm2708/patches-4.19/950-0569-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch b/target/linux/brcm2708/patches-4.19/950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0569-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch rename to target/linux/brcm2708/patches-4.19/950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch index 70c14f1826..5a72f9c71f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0569-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch +++ b/target/linux/brcm2708/patches-4.19/950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch @@ -1,7 +1,7 @@ From 9d8fa62500ae52348d36766e70b49c7508addaf3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 3 Dec 2018 14:24:36 -0800 -Subject: [PATCH 569/806] drm/v3d: Drop the wait for L2T flush to complete. +Subject: [PATCH] drm/v3d: Drop the wait for L2T flush to complete. According to Dave, once you've started an L2T flush, all L2T accesses will be blocked until the flush completes. This fixes a consistent diff --git a/target/linux/brcm2708/patches-4.19/950-0570-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch b/target/linux/brcm2708/patches-4.19/950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0570-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch rename to target/linux/brcm2708/patches-4.19/950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch index 442eb63c54..b1094778b5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0570-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch +++ b/target/linux/brcm2708/patches-4.19/950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch @@ -1,7 +1,7 @@ From abee30ca29ec11b62842934de04b5a0033bff21b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 3 Dec 2018 14:24:37 -0800 -Subject: [PATCH 570/806] drm/v3d: Stop trying to flush L2C on V3D 3.3+ +Subject: [PATCH] drm/v3d: Stop trying to flush L2C on V3D 3.3+ This cache was replaced with the slice accessing the L2T in the newer generations. Noted by Dave during review. diff --git a/target/linux/brcm2708/patches-4.19/950-0571-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch b/target/linux/brcm2708/patches-4.19/950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0571-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch rename to target/linux/brcm2708/patches-4.19/950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch index 3348f43d2a..7682ab677e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0571-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch +++ b/target/linux/brcm2708/patches-4.19/950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch @@ -1,7 +1,7 @@ From 514653cd51ff6bc14268dc0f98ebb37daa8f0e88 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 3 Dec 2018 14:24:38 -0800 -Subject: [PATCH 571/806] drm/v3d: Invalidate the caches from the outside in. +Subject: [PATCH] drm/v3d: Invalidate the caches from the outside in. This would be a fairly obscure race, but let's make sure we don't ever lose it. diff --git a/target/linux/brcm2708/patches-4.19/950-0572-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch b/target/linux/brcm2708/patches-4.19/950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0572-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch rename to target/linux/brcm2708/patches-4.19/950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch index 6dd89a9ed3..fc2b566357 100644 --- a/target/linux/brcm2708/patches-4.19/950-0572-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch +++ b/target/linux/brcm2708/patches-4.19/950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch @@ -1,7 +1,7 @@ From f91d0382b735a3d7711f6b160d80627cd4be54af Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 7 Feb 2019 15:26:13 -0800 -Subject: [PATCH 572/806] drm/v3d: Fix BO stats accounting for dma-buf-imported +Subject: [PATCH] drm/v3d: Fix BO stats accounting for dma-buf-imported buffers. We always decrement at GEM free, so make sure we increment at GEM diff --git a/target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch b/target/linux/brcm2708/patches-4.19/950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch rename to target/linux/brcm2708/patches-4.19/950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch index 99a7680e06..df8cc1a352 100644 --- a/target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch @@ -1,7 +1,7 @@ From 752f66d4482db75db81e5255f5071de1e47ac121 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 7 Feb 2019 12:09:58 -0800 -Subject: [PATCH 573/806] drm/v3d: Update top-level kerneldoc for the addition +Subject: [PATCH] drm/v3d: Update top-level kerneldoc for the addition of TFU. Signed-off-by: Eric Anholt diff --git a/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch rename to target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch index 34e10fdd42..aaeeb944fc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch +++ b/target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch @@ -1,7 +1,7 @@ From ec551e663ddd1be9140cc23f1eff33b8d270ed60 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 4 Mar 2019 11:59:34 -0800 -Subject: [PATCH 574/806] drm/vc4: Fix oops at boot with firmwarekms on 4.19. +Subject: [PATCH] drm/vc4: Fix oops at boot with firmwarekms on 4.19. Signed-off-by: Eric Anholt --- diff --git a/target/linux/brcm2708/patches-4.19/950-0575-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch b/target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0575-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch rename to target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch index eec645b2b3..2adc642492 100644 --- a/target/linux/brcm2708/patches-4.19/950-0575-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch +++ b/target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch @@ -1,7 +1,7 @@ From f69f2b1354e0a548d2cb6dfdc07d37efb426eee0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 20 Feb 2019 13:03:41 -0800 -Subject: [PATCH 575/806] drm/vc4: Disable V3D interactions if the v3d +Subject: [PATCH] drm/vc4: Disable V3D interactions if the v3d component didn't probe. One might want to use the VC4 display stack without using Mesa. diff --git a/target/linux/brcm2708/patches-4.19/950-0576-drm-v3d-Add-support-for-V3D-v4.2.patch b/target/linux/brcm2708/patches-4.19/950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0576-drm-v3d-Add-support-for-V3D-v4.2.patch rename to target/linux/brcm2708/patches-4.19/950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch index 0873dbad63..35fc072d8a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0576-drm-v3d-Add-support-for-V3D-v4.2.patch +++ b/target/linux/brcm2708/patches-4.19/950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch @@ -1,7 +1,7 @@ From b0e7b8814e74be0559e07f737ef18cc3709d4ac4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 4 Oct 2018 17:22:43 -0700 -Subject: [PATCH 576/806] drm/v3d: Add support for V3D v4.2. +Subject: [PATCH] drm/v3d: Add support for V3D v4.2. No compatible string for it yet, just the version-dependent changes. They've now tied the hub and the core interrupt lines into a single diff --git a/target/linux/brcm2708/patches-4.19/950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch b/target/linux/brcm2708/patches-4.19/950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch rename to target/linux/brcm2708/patches-4.19/950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch index 3feec5f58d..a6d0d26b47 100644 --- a/target/linux/brcm2708/patches-4.19/950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch +++ b/target/linux/brcm2708/patches-4.19/950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch @@ -1,7 +1,7 @@ From 8011a92f6eabd682e62e268bcd80b45ce3f06af4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 16 Oct 2018 10:13:41 -0700 -Subject: [PATCH 577/806] drm/v3d: Don't try to set OVRTMUOUT on V3D 4.x. +Subject: [PATCH] drm/v3d: Don't try to set OVRTMUOUT on V3D 4.x. The old field is gone and the register now has a different field, QRMAXCNT for how many TMU requests get serviced before thread switch. diff --git a/target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch b/target/linux/brcm2708/patches-4.19/950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch rename to target/linux/brcm2708/patches-4.19/950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch index a7840c97ca..30cb228964 100644 --- a/target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch +++ b/target/linux/brcm2708/patches-4.19/950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch @@ -1,7 +1,7 @@ From 19846d53c32be7c9d8d46b369910374c5ea9b9d5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 17:26:04 -0800 -Subject: [PATCH 578/806] drm/v3d: Make sure the GPU is on when measuring +Subject: [PATCH] drm/v3d: Make sure the GPU is on when measuring clocks. You'll get garbage measurements if the registers always read back diff --git a/target/linux/brcm2708/patches-4.19/950-0579-drm-v3d-Add-support-for-2711.patch b/target/linux/brcm2708/patches-4.19/950-0532-drm-v3d-Add-support-for-2711.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0579-drm-v3d-Add-support-for-2711.patch rename to target/linux/brcm2708/patches-4.19/950-0532-drm-v3d-Add-support-for-2711.patch index d6fa8cb1a0..1d723db61d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0579-drm-v3d-Add-support-for-2711.patch +++ b/target/linux/brcm2708/patches-4.19/950-0532-drm-v3d-Add-support-for-2711.patch @@ -1,7 +1,7 @@ From ffd9543f2d74e9215996ce6500fc34dcf7976462 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 4 Oct 2018 17:22:43 -0700 -Subject: [PATCH 579/806] drm/v3d: Add support for 2711. +Subject: [PATCH] drm/v3d: Add support for 2711. Signed-off-by: Eric Anholt --- diff --git a/target/linux/brcm2708/patches-4.19/950-0580-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch b/target/linux/brcm2708/patches-4.19/950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0580-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch rename to target/linux/brcm2708/patches-4.19/950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch index ea5044c1f7..57f8e508c6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0580-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch +++ b/target/linux/brcm2708/patches-4.19/950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch @@ -1,7 +1,7 @@ From f389abea861f9bd3165f98a8d3a1f3407e9fc01a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 12:35:43 -0800 -Subject: [PATCH 580/806] drm/v3d: Skip MMU flush if the device is currently +Subject: [PATCH] drm/v3d: Skip MMU flush if the device is currently off. If it's off, we know it will be reset on poweron, so the MMU won't diff --git a/target/linux/brcm2708/patches-4.19/950-0581-drm-v3d-Hook-up-the-runtime-PM-ops.patch b/target/linux/brcm2708/patches-4.19/950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0581-drm-v3d-Hook-up-the-runtime-PM-ops.patch rename to target/linux/brcm2708/patches-4.19/950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch index 55ad2b5f3b..3286cd0fbd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0581-drm-v3d-Hook-up-the-runtime-PM-ops.patch +++ b/target/linux/brcm2708/patches-4.19/950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch @@ -1,7 +1,7 @@ From 30dd82d785715b2ed52a5079595ffcd2ec1f728d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 14:47:57 -0800 -Subject: [PATCH 581/806] drm/v3d: Hook up the runtime PM ops. +Subject: [PATCH] drm/v3d: Hook up the runtime PM ops. In translating the runtime PM code from vc4, I missed the ".pm" assignment to actually connect them up. Fixes missing MMU setup if diff --git a/target/linux/brcm2708/patches-4.19/950-0582-drm-v3d-HACK-gut-runtime-pm-for-now.patch b/target/linux/brcm2708/patches-4.19/950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0582-drm-v3d-HACK-gut-runtime-pm-for-now.patch rename to target/linux/brcm2708/patches-4.19/950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch index 6b2db7306e..654ef432f3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0582-drm-v3d-HACK-gut-runtime-pm-for-now.patch +++ b/target/linux/brcm2708/patches-4.19/950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch @@ -1,7 +1,7 @@ From 2d4f38abdc2a919d8002fbec7bc0be7c1312786a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 Jan 2019 15:13:17 -0800 -Subject: [PATCH 582/806] drm/v3d: HACK: gut runtime pm for now. +Subject: [PATCH] drm/v3d: HACK: gut runtime pm for now. Something is still unstable -- on starting a new glxgears from an idle X11, I get an MMU violation in high addresses. The CTS also failed diff --git a/target/linux/brcm2708/patches-4.19/950-0583-drm-v3d-Update-to-upstream-IRQ-code.patch b/target/linux/brcm2708/patches-4.19/950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0583-drm-v3d-Update-to-upstream-IRQ-code.patch rename to target/linux/brcm2708/patches-4.19/950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch index c3e547aa3d..3c15cc1915 100644 --- a/target/linux/brcm2708/patches-4.19/950-0583-drm-v3d-Update-to-upstream-IRQ-code.patch +++ b/target/linux/brcm2708/patches-4.19/950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch @@ -1,7 +1,7 @@ From 50088003d803f04e536eb09ac2635df35b5c8ae4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 12 Mar 2019 09:08:10 -0700 -Subject: [PATCH 583/806] drm/v3d: Update to upstream IRQ code. +Subject: [PATCH] drm/v3d: Update to upstream IRQ code. --- drivers/gpu/drm/v3d/v3d_irq.c | 25 +++++++++++++++---------- diff --git a/target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch b/target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch rename to target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch index 3cb72bdefa..55408a0042 100644 --- a/target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch +++ b/target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch @@ -1,7 +1,7 @@ From 0d00e0340c1aa9ce36bdff46f927916fe4903cee Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 27 Dec 2018 14:04:44 -0800 -Subject: [PATCH 584/806] drm/v3d: Rename the fence signaled from IRQs to +Subject: [PATCH] drm/v3d: Rename the fence signaled from IRQs to "irq_fence". We have another thing called the "done fence" that tracks when the diff --git a/target/linux/brcm2708/patches-4.19/950-0585-drm-v3d-Refactor-job-management.patch b/target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Refactor-job-management.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0585-drm-v3d-Refactor-job-management.patch rename to target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Refactor-job-management.patch index 64be2b080d..1192b166d4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0585-drm-v3d-Refactor-job-management.patch +++ b/target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Refactor-job-management.patch @@ -1,7 +1,7 @@ From ccf319a0265bfdb4a622a52645f159461bc88079 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 27 Dec 2018 12:11:52 -0800 -Subject: [PATCH 585/806] drm/v3d: Refactor job management. +Subject: [PATCH] drm/v3d: Refactor job management. The CL submission had two jobs embedded in an exec struct. When I added TFU support, I had to replicate some of the exec stuff and some diff --git a/target/linux/brcm2708/patches-4.19/950-0586-drm-v3d-Add-missing-implicit-synchronization.patch b/target/linux/brcm2708/patches-4.19/950-0539-drm-v3d-Add-missing-implicit-synchronization.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0586-drm-v3d-Add-missing-implicit-synchronization.patch rename to target/linux/brcm2708/patches-4.19/950-0539-drm-v3d-Add-missing-implicit-synchronization.patch index f9c49fc517..9c902c64d3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0586-drm-v3d-Add-missing-implicit-synchronization.patch +++ b/target/linux/brcm2708/patches-4.19/950-0539-drm-v3d-Add-missing-implicit-synchronization.patch @@ -1,7 +1,7 @@ From 7713f79b0a5473eb0b8456d36b99ae00815dd8a1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 27 Mar 2019 17:44:40 -0700 -Subject: [PATCH 586/806] drm/v3d: Add missing implicit synchronization. +Subject: [PATCH] drm/v3d: Add missing implicit synchronization. It is the expectation of existing userspace (X11 + Mesa, in particular) that jobs submitted to the kernel against a shared BO will diff --git a/target/linux/brcm2708/patches-4.19/950-0587-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch b/target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0587-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch rename to target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch index 27f0d8f707..6a3a6b142d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0587-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch +++ b/target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch @@ -1,7 +1,7 @@ From b0fedd829bb6725fef7b2667c85badc6b4a8e5e0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 28 Mar 2019 11:58:51 -0700 -Subject: [PATCH 587/806] drm/vc4: Fix synchronization firmwarekms against GL +Subject: [PATCH] drm/vc4: Fix synchronization firmwarekms against GL rendering. We would present the framebuffer immediately without waiting for diff --git a/target/linux/brcm2708/patches-4.19/950-0588-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch b/target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0588-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch rename to target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch index bb0c8552a2..32eba1c885 100644 --- a/target/linux/brcm2708/patches-4.19/950-0588-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch +++ b/target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch @@ -1,7 +1,7 @@ From 561918ec5e668f9d940051737d861ee0592816f6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 29 Mar 2019 12:04:36 -0700 -Subject: [PATCH 588/806] drm/vc4: Make sure that vblank waits work without v3d +Subject: [PATCH] drm/vc4: Make sure that vblank waits work without v3d loaded. This flag exists to protect legacy drivers, but when vc4's v3d doesn't diff --git a/target/linux/brcm2708/patches-4.19/950-0589-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch b/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0589-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch rename to target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch index a25c567645..7eb5a95f68 100644 --- a/target/linux/brcm2708/patches-4.19/950-0589-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch @@ -1,7 +1,7 @@ From c7fc1e1cf922bd548ac983ef48b883b6f83e35ae Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 18 Mar 2019 16:38:32 -0700 -Subject: [PATCH 589/806] drm/vc4: Expose the format modifiers for firmware +Subject: [PATCH] drm/vc4: Expose the format modifiers for firmware kms. This should technically not expose VC4_T_TILED on pi4. However, if we diff --git a/target/linux/brcm2708/patches-4.19/950-0590-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch b/target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0590-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch rename to target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch index 2ad88a4b39..4fb6f66625 100644 --- a/target/linux/brcm2708/patches-4.19/950-0590-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch @@ -1,7 +1,7 @@ From c0041a9fe33d6031267d9f3e2372833908e97337 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Apr 2019 13:29:00 -0700 -Subject: [PATCH 590/806] drm/vc4: Fix vblank timestamping for firmwarekms. +Subject: [PATCH] drm/vc4: Fix vblank timestamping for firmwarekms. The core doesn't expect a false return from the scanoutpos function in normal usage, so we were doing the precise vblank timestamping path diff --git a/target/linux/brcm2708/patches-4.19/950-0591-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch b/target/linux/brcm2708/patches-4.19/950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0591-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch rename to target/linux/brcm2708/patches-4.19/950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch index 0b2e2d7d47..ad729c54aa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0591-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch +++ b/target/linux/brcm2708/patches-4.19/950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch @@ -1,7 +1,7 @@ From 3819888738de087ba726ceaa2ab20503f164f1ed Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 26 Mar 2019 14:43:06 +0000 -Subject: [PATCH 591/806] gpu: vc4-fkms: Switch to the newer mailbox frame +Subject: [PATCH] gpu: vc4-fkms: Switch to the newer mailbox frame buffer API. The old mailbox FB API was ideally deprecated but still used by diff --git a/target/linux/brcm2708/patches-4.19/950-0592-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch b/target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0592-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch rename to target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch index f374c2a0a4..f3e2851087 100644 --- a/target/linux/brcm2708/patches-4.19/950-0592-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch @@ -1,7 +1,7 @@ From 953d85d97f59691dccbbca743c478a8b01f92b59 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 27 Mar 2019 17:45:01 +0000 -Subject: [PATCH 592/806] drm: vc4: Add an overlay plane to vc4-firmware-kms +Subject: [PATCH] drm: vc4: Add an overlay plane to vc4-firmware-kms This uses a new API that is exposed via the mailbox service to stick an element straight on the screen using DispmanX. diff --git a/target/linux/brcm2708/patches-4.19/950-0593-drm-vc4-Increase-max-screen-size-to-4096x4096.patch b/target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0593-drm-vc4-Increase-max-screen-size-to-4096x4096.patch rename to target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch index 844bdcbb6b..c81e7fc919 100644 --- a/target/linux/brcm2708/patches-4.19/950-0593-drm-vc4-Increase-max-screen-size-to-4096x4096.patch +++ b/target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch @@ -1,7 +1,7 @@ From 7c4a99448be56e288a5845f3de77b7eef006a450 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 15:20:05 +0100 -Subject: [PATCH 593/806] drm: vc4: Increase max screen size to 4096x4096. +Subject: [PATCH] drm: vc4: Increase max screen size to 4096x4096. We now should support 4k screens, therefore this limit needs to be increased. diff --git a/target/linux/brcm2708/patches-4.19/950-0594-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0594-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch index b93fa8e121..06f8cf4148 100644 --- a/target/linux/brcm2708/patches-4.19/950-0594-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch @@ -1,7 +1,7 @@ From 4817db177a74ac58671e1fe84d98d584375d9697 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Apr 2019 17:15:45 +0100 -Subject: [PATCH 594/806] drm: vc4: Add support for multiple displays to fkms +Subject: [PATCH] drm: vc4: Add support for multiple displays to fkms There is a slightly nasty hack in that all crtcs share the same SMI interrupt from the firmware. This seems to currently diff --git a/target/linux/brcm2708/patches-4.19/950-0595-drm-vc4-Fix-build-warning.patch b/target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Fix-build-warning.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0595-drm-vc4-Fix-build-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Fix-build-warning.patch index 837141c8e1..3e6273afd3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0595-drm-vc4-Fix-build-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Fix-build-warning.patch @@ -1,7 +1,7 @@ From 52d2903959ff9a1d68701a04884e18b31d051f30 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:21:56 +0100 -Subject: [PATCH 595/806] drm: vc4: Fix build warning +Subject: [PATCH] drm: vc4: Fix build warning Signed-off-by: Dave Stevenson --- diff --git a/target/linux/brcm2708/patches-4.19/950-0596-drm-vc4-Select-display-to-blank-during-initialisatio.patch b/target/linux/brcm2708/patches-4.19/950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0596-drm-vc4-Select-display-to-blank-during-initialisatio.patch rename to target/linux/brcm2708/patches-4.19/950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch index 7a20bff629..0391767e48 100644 --- a/target/linux/brcm2708/patches-4.19/950-0596-drm-vc4-Select-display-to-blank-during-initialisatio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch @@ -1,7 +1,7 @@ From a267031f384a4433fdcd662a97bce7c4949d3fd6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:23:15 +0100 -Subject: [PATCH 596/806] drm: vc4: Select display to blank during +Subject: [PATCH] drm: vc4: Select display to blank during initialisation Otherwise the rainbow splash screen remained in the display list diff --git a/target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Remove-now-unused-structure.patch b/target/linux/brcm2708/patches-4.19/950-0550-drm-vc4-Remove-now-unused-structure.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Remove-now-unused-structure.patch rename to target/linux/brcm2708/patches-4.19/950-0550-drm-vc4-Remove-now-unused-structure.patch index 2e0655b858..08c0995138 100644 --- a/target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Remove-now-unused-structure.patch +++ b/target/linux/brcm2708/patches-4.19/950-0550-drm-vc4-Remove-now-unused-structure.patch @@ -1,7 +1,7 @@ From 0bbbf4f4a618072e6987f439784f2d24a81b8f2d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 5 Apr 2019 17:24:20 +0100 -Subject: [PATCH 597/806] drm: vc4: Remove now unused structure. +Subject: [PATCH] drm: vc4: Remove now unused structure. Cleaning up structure that was unused after fbb59a2 drm: vc4: Add an overlay plane to vc4-firmware-kms diff --git a/target/linux/brcm2708/patches-4.19/950-0598-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch b/target/linux/brcm2708/patches-4.19/950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0598-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch rename to target/linux/brcm2708/patches-4.19/950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch index d37b2d1695..1c349449c5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0598-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch +++ b/target/linux/brcm2708/patches-4.19/950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch @@ -1,7 +1,7 @@ From 13723c680a129d79a7872ee131c0201374ba62ce Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 12:37:28 +0100 -Subject: [PATCH 598/806] drm: vc4: Query the display ID for each display in +Subject: [PATCH] drm: vc4: Query the display ID for each display in FKMS Replace the hard coded list of display IDs for a mailbox call diff --git a/target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Set-the-display-number-when-querying-the-dis.patch b/target/linux/brcm2708/patches-4.19/950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Set-the-display-number-when-querying-the-dis.patch rename to target/linux/brcm2708/patches-4.19/950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch index 9f09809f1e..236caaf32f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Set-the-display-number-when-querying-the-dis.patch +++ b/target/linux/brcm2708/patches-4.19/950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch @@ -1,7 +1,7 @@ From 1b9eb8d557c692e5f1dd831b5e7134e6d07a4dd4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 14:00:07 +0100 -Subject: [PATCH 599/806] drm/vc4: Set the display number when querying the +Subject: [PATCH] drm/vc4: Set the display number when querying the display resolution Without this the two displays got set to the same resolution. diff --git a/target/linux/brcm2708/patches-4.19/950-0600-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch b/target/linux/brcm2708/patches-4.19/950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0600-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch rename to target/linux/brcm2708/patches-4.19/950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch index 50f893413e..c9ce67fba5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0600-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch +++ b/target/linux/brcm2708/patches-4.19/950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch @@ -1,7 +1,7 @@ From fe2432615ecc3500cc265d6b84334950b9cbd4bf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:14:44 +0100 -Subject: [PATCH 600/806] drm: vc4: Need to call drm_crtc_vblank_[on|off] from +Subject: [PATCH] from vc4_crtc_[en|dis]able vblank needs to be enabled and disabled by the driver to avoid the diff --git a/target/linux/brcm2708/patches-4.19/950-0601-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch b/target/linux/brcm2708/patches-4.19/950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0601-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch rename to target/linux/brcm2708/patches-4.19/950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch index 2322a66f51..c3f48ecbde 100644 --- a/target/linux/brcm2708/patches-4.19/950-0601-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch @@ -1,7 +1,7 @@ From 129100bd38125bef5fe237ab867349dbe8b210ba Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 17:19:51 +0100 -Subject: [PATCH 601/806] drm: vc4: Add support for H & V flips on each plane +Subject: [PATCH] drm: vc4: Add support for H & V flips on each plane for FKMS They are near zero cost options for the HVS, therefore they diff --git a/target/linux/brcm2708/patches-4.19/950-0602-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch b/target/linux/brcm2708/patches-4.19/950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0602-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch rename to target/linux/brcm2708/patches-4.19/950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch index 0da4923729..4b6cb39850 100644 --- a/target/linux/brcm2708/patches-4.19/950-0602-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch +++ b/target/linux/brcm2708/patches-4.19/950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch @@ -1,7 +1,7 @@ From 6885af169f6eeb386f410e556029c6518c6b67b2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:35:05 +0100 -Subject: [PATCH 602/806] drm: vc4: Remove unused vc4_fkms_cancel_page_flip +Subject: [PATCH] drm: vc4: Remove unused vc4_fkms_cancel_page_flip function "32a3dbe drm/vc4: Nuke preclose hook" removed vc4_cancel_page_flip, diff --git a/target/linux/brcm2708/patches-4.19/950-0603-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch b/target/linux/brcm2708/patches-4.19/950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0603-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch rename to target/linux/brcm2708/patches-4.19/950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch index d7b3a50c54..ca1b777b4b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0603-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch @@ -1,7 +1,7 @@ From 501dabdd480e2da1b3b1395b5ebf9d5306fec689 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:42:37 +0100 -Subject: [PATCH 603/806] drm: vc4: Iterate over all planes in +Subject: [PATCH] drm: vc4: Iterate over all planes in vc4_crtc_[dis|en]able Fixes a FIXME where the overlay plane wouldn't be restored. diff --git a/target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch b/target/linux/brcm2708/patches-4.19/950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch rename to target/linux/brcm2708/patches-4.19/950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch index 8ced2a2b2d..af29bdab81 100644 --- a/target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch +++ b/target/linux/brcm2708/patches-4.19/950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch @@ -1,7 +1,7 @@ From d4df2766945e0410d1975434f34e647e7e13b992 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:43:57 +0100 -Subject: [PATCH 604/806] drm: vc4: Bring fkms into line with kms in blocking +Subject: [PATCH] drm: vc4: Bring fkms into line with kms in blocking doublescan modes Implement vc4_crtc_mode_valid so that it blocks doublescan modes diff --git a/target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-Increase-max_width-height-to-7680.patch b/target/linux/brcm2708/patches-4.19/950-0558-drm-vc4-Increase-max_width-height-to-7680.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-Increase-max_width-height-to-7680.patch rename to target/linux/brcm2708/patches-4.19/950-0558-drm-vc4-Increase-max_width-height-to-7680.patch index 3f05bc1138..f2c97479ae 100644 --- a/target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-Increase-max_width-height-to-7680.patch +++ b/target/linux/brcm2708/patches-4.19/950-0558-drm-vc4-Increase-max_width-height-to-7680.patch @@ -1,7 +1,7 @@ From b4ed0c4f55542b642f16ee6376b69968d6bafc3b Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 29 Apr 2019 18:45:00 +0100 -Subject: [PATCH 605/806] drm: vc4: Increase max_width/height to 7680. +Subject: [PATCH] drm: vc4: Increase max_width/height to 7680. There are some limits still being investigated that stop us going up to 8192, but 7680 is sufficient for dual 4k diff --git a/target/linux/brcm2708/patches-4.19/950-0606-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch b/target/linux/brcm2708/patches-4.19/950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0606-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch rename to target/linux/brcm2708/patches-4.19/950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch index b56f97005d..db83c12f59 100644 --- a/target/linux/brcm2708/patches-4.19/950-0606-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch +++ b/target/linux/brcm2708/patches-4.19/950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch @@ -1,7 +1,7 @@ From 9536044338d9c341e805e288a58090c49a793638 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 9 Apr 2019 18:23:41 +0100 -Subject: [PATCH 606/806] drm: vc4: FKMS reads the EDID from fw, and supports +Subject: [PATCH] drm: vc4: FKMS reads the EDID from fw, and supports mode setting This extends FKMS to read the EDID from the display, and support diff --git a/target/linux/brcm2708/patches-4.19/950-0607-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch b/target/linux/brcm2708/patches-4.19/950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0607-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch rename to target/linux/brcm2708/patches-4.19/950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch index e47071c0f8..ca70b9ddbf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0607-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch +++ b/target/linux/brcm2708/patches-4.19/950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch @@ -1,7 +1,7 @@ From bf85b92a97a95161d98874571c520fb1395c5aa2 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:11:05 -0700 -Subject: [PATCH 607/806] clk: bcm2835: Add support for setting leaf clock +Subject: [PATCH] clk: bcm2835: Add support for setting leaf clock rates while running. As long as you wait for !BUSY, you can do glitch-free updates of clock diff --git a/target/linux/brcm2708/patches-4.19/950-0608-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/target/linux/brcm2708/patches-4.19/950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0608-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch rename to target/linux/brcm2708/patches-4.19/950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch index 71b7b07b30..490466d7da 100644 --- a/target/linux/brcm2708/patches-4.19/950-0608-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch +++ b/target/linux/brcm2708/patches-4.19/950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch @@ -1,7 +1,7 @@ From d46285327ba5961c992643d468b2862c70f4c7e5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 15:24:04 -0700 -Subject: [PATCH 608/806] clk: bcm2835: Allow reparenting leaf clocks while +Subject: [PATCH] clk: bcm2835: Allow reparenting leaf clocks while they're running. This falls under the same "we can reprogram glitch-free as long as we diff --git a/target/linux/brcm2708/patches-4.19/950-0609-drm-v3d-Add-support-for-compute-shader-dispatch.patch b/target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0609-drm-v3d-Add-support-for-compute-shader-dispatch.patch rename to target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch index dc230621dc..6db0729839 100644 --- a/target/linux/brcm2708/patches-4.19/950-0609-drm-v3d-Add-support-for-compute-shader-dispatch.patch +++ b/target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch @@ -1,7 +1,7 @@ From 22dbf1420a552d1952d22b92d8c30f8162b026b5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 16 Apr 2019 15:58:54 -0700 -Subject: [PATCH 609/806] drm/v3d: Add support for compute shader dispatch. +Subject: [PATCH] drm/v3d: Add support for compute shader dispatch. The compute shader dispatch interface is pretty simple -- just pass in the regs that userspace has passed us, with no CLs to run. However, diff --git a/target/linux/brcm2708/patches-4.19/950-0610-drm-v3d-Clock-V3D-down-when-not-in-use.patch b/target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0610-drm-v3d-Clock-V3D-down-when-not-in-use.patch rename to target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch index d44f76cb39..b4c2c3b5e2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0610-drm-v3d-Clock-V3D-down-when-not-in-use.patch +++ b/target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch @@ -1,7 +1,7 @@ From 3e6b687bae81bdf5a430ffaa04aa04ee195a866c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 2 May 2019 13:22:53 -0700 -Subject: [PATCH 610/806] drm/v3d: Clock V3D down when not in use. +Subject: [PATCH] drm/v3d: Clock V3D down when not in use. My various attempts at re-enabling runtime PM have failed, so just crank the clock down when V3D is idle to reduce power consumption. diff --git a/target/linux/brcm2708/patches-4.19/950-0611-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch b/target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0611-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch rename to target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch index 8313799f53..3a9fa5e715 100644 --- a/target/linux/brcm2708/patches-4.19/950-0611-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch @@ -1,7 +1,7 @@ From e5cefebc24b7684f4f84a539259612c8f5a4975b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Thu, 2 May 2019 23:42:29 +0200 -Subject: [PATCH 611/806] HACK: clk-bcm2835: Add BCM2838_CLOCK_EMMC2 support +Subject: [PATCH] HACK: clk-bcm2835: Add BCM2838_CLOCK_EMMC2 support The new BCM2838 supports an additional emmc2 clock. So add a new compatible to register this clock only for BCM2838. diff --git a/target/linux/brcm2708/patches-4.19/950-0612-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch b/target/linux/brcm2708/patches-4.19/950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0612-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch rename to target/linux/brcm2708/patches-4.19/950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch index 9119ce1ef3..db3f195c45 100644 --- a/target/linux/brcm2708/patches-4.19/950-0612-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch @@ -1,7 +1,7 @@ From 3cd15f787b391db5224a27715fe9dc6fc8559bee Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 3 May 2019 13:58:03 +0100 -Subject: [PATCH 612/806] drm: vc4-firmware-kms: Remove incorrect overscan +Subject: [PATCH] drm: vc4-firmware-kms: Remove incorrect overscan support. The overscan support was required for the old mailbox API diff --git a/target/linux/brcm2708/patches-4.19/950-0613-drm-vc4-Log-flags-in-fkms-mode-set.patch b/target/linux/brcm2708/patches-4.19/950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0613-drm-vc4-Log-flags-in-fkms-mode-set.patch rename to target/linux/brcm2708/patches-4.19/950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch index ae6f69267f..59f6f797c8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0613-drm-vc4-Log-flags-in-fkms-mode-set.patch +++ b/target/linux/brcm2708/patches-4.19/950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch @@ -1,7 +1,7 @@ From 07288c2bd9733dc9317c5f9b02980a59a05ce3af Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 12:13:34 +0100 -Subject: [PATCH 613/806] drm: vc4: Log flags in fkms mode set +Subject: [PATCH] drm: vc4: Log flags in fkms mode set The flags contain info such as limited/full range RGB, aspect ratio, and a fwe other useful things. diff --git a/target/linux/brcm2708/patches-4.19/950-0614-drm-vc4-firmware-kms-Fix-DSI-display-support.patch b/target/linux/brcm2708/patches-4.19/950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0614-drm-vc4-firmware-kms-Fix-DSI-display-support.patch rename to target/linux/brcm2708/patches-4.19/950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch index 9ed0c6f48c..b45df39e4f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0614-drm-vc4-firmware-kms-Fix-DSI-display-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch @@ -1,7 +1,7 @@ From d66b1d056d07b27803ba0756ecdb0d4419bcaaa2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 May 2019 17:49:42 +0100 -Subject: [PATCH 614/806] drm: vc4-firmware-kms: Fix DSI display support +Subject: [PATCH] drm: vc4-firmware-kms: Fix DSI display support The mode was incorrectly listed as interlaced, which was then rejected. diff --git a/target/linux/brcm2708/patches-4.19/950-0615-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch b/target/linux/brcm2708/patches-4.19/950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0615-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch rename to target/linux/brcm2708/patches-4.19/950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch index 0440bd7fc3..1a27777ac7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0615-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch +++ b/target/linux/brcm2708/patches-4.19/950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch @@ -1,7 +1,7 @@ From b4ffa49d762a4af832d0d8660caf59722c0ff75a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 21 May 2019 11:50:00 +0100 -Subject: [PATCH 615/806] drm: vc4: Probe DPI/DSI timings from the firmware +Subject: [PATCH] drm: vc4: Probe DPI/DSI timings from the firmware For DPI and DSI displays query the firmware as to the configuration and add it as the only mode for DRM. diff --git a/target/linux/brcm2708/patches-4.19/950-0616-drm-vc4-handle-the-case-where-there-are-no-available.patch b/target/linux/brcm2708/patches-4.19/950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0616-drm-vc4-handle-the-case-where-there-are-no-available.patch rename to target/linux/brcm2708/patches-4.19/950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch index 4de134efb0..346d32e2d6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0616-drm-vc4-handle-the-case-where-there-are-no-available.patch +++ b/target/linux/brcm2708/patches-4.19/950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch @@ -1,7 +1,7 @@ From dd99aa50a3ea7f7fe1ddfd59b1a2e969c744b8a0 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 28 May 2019 13:56:06 +0100 -Subject: [PATCH 616/806] drm: vc4: handle the case where there are no +Subject: [PATCH] drm: vc4: handle the case where there are no available displays It's reasonable for the firmware to return zero as the number of diff --git a/target/linux/brcm2708/patches-4.19/950-0617-drm-vc4-Support-the-VEC-in-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0617-drm-vc4-Support-the-VEC-in-FKMS.patch rename to target/linux/brcm2708/patches-4.19/950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch index 80f9c81d48..29db708769 100644 --- a/target/linux/brcm2708/patches-4.19/950-0617-drm-vc4-Support-the-VEC-in-FKMS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch @@ -1,7 +1,7 @@ From 82ef7a95f5ae86df811253d58d93ca4fb2cbd45a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 24 May 2019 17:59:01 +0100 -Subject: [PATCH 617/806] drm/vc4: Support the VEC in FKMS +Subject: [PATCH] drm/vc4: Support the VEC in FKMS Extends the DPI/DSI support to also report the VEC output which supports interlacing too. diff --git a/target/linux/brcm2708/patches-4.19/950-0618-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch b/target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0618-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch rename to target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch index 19ac6cb4e0..69320e89fd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0618-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch @@ -1,7 +1,7 @@ From 2d35ddcd988499ac7bfd08997086cecfc6b5acb3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 7 May 2019 15:00:02 +0100 -Subject: [PATCH 618/806] drm: vc4: Fixup typo when setting HDMI aspect ratio +Subject: [PATCH] drm: vc4: Fixup typo when setting HDMI aspect ratio Assignment was to the wrong structure. diff --git a/target/linux/brcm2708/patches-4.19/950-0619-drm-vc4-Correct-SAND-support-for-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0619-drm-vc4-Correct-SAND-support-for-FKMS.patch rename to target/linux/brcm2708/patches-4.19/950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch index 07ecf6ef8e..4299928ab3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0619-drm-vc4-Correct-SAND-support-for-FKMS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch @@ -1,7 +1,7 @@ From 0dbdeb9e76e956df275e162224e12eacb0cc8b02 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 29 May 2019 15:44:11 +0100 -Subject: [PATCH 619/806] drm/vc4: Correct SAND support for FKMS. +Subject: [PATCH] drm/vc4: Correct SAND support for FKMS. It was accepting NV21 which doesn't map through, but also wasn't advertising the modifier so nothing would know diff --git a/target/linux/brcm2708/patches-4.19/950-0620-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch b/target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0620-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch rename to target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch index a228910d24..7f917bdd45 100644 --- a/target/linux/brcm2708/patches-4.19/950-0620-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch +++ b/target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch @@ -1,7 +1,7 @@ From 23e6a2c2d33050255c76a499ea080e5279d6edfc Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 13:56:15 +0100 -Subject: [PATCH 620/806] drm/vc4: fkms to query the VPU for HDMI clock limits +Subject: [PATCH] drm/vc4: fkms to query the VPU for HDMI clock limits The VPU has configured clocks for 4k (or not) via config.txt, and will limit the choice of video modes based on that. diff --git a/target/linux/brcm2708/patches-4.19/950-0621-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch b/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0621-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch rename to target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch index 0b45bb1ae7..83e1845ff9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0621-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch +++ b/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch @@ -1,7 +1,7 @@ From bce8c3dc146e3287519d5f6bb965dc2458e6684d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 30 May 2019 15:55:15 +0100 -Subject: [PATCH 621/806] drm/vc4: Max resolution of 7680 is conditional on +Subject: [PATCH] drm/vc4: Max resolution of 7680 is conditional on being Pi4 The max resolution had been increased from 2048 to 7680 for all diff --git a/target/linux/brcm2708/patches-4.19/950-0622-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch b/target/linux/brcm2708/patches-4.19/950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0622-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch rename to target/linux/brcm2708/patches-4.19/950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch index 468b21e939..86c86afb75 100644 --- a/target/linux/brcm2708/patches-4.19/950-0622-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch +++ b/target/linux/brcm2708/patches-4.19/950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch @@ -1,7 +1,7 @@ From 84b54ee2ff01005f0201c51f50985faf4e79edc6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 10 Dec 2018 17:35:58 +0000 -Subject: [PATCH 622/806] staging: vc-sm-cma: Remove obsolete comment and make +Subject: [PATCH] staging: vc-sm-cma: Remove obsolete comment and make function static Removes obsolete comment about wanting to pass a function diff --git a/target/linux/brcm2708/patches-4.19/950-0623-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch b/target/linux/brcm2708/patches-4.19/950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0623-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch rename to target/linux/brcm2708/patches-4.19/950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch index f7501a184c..105309b439 100644 --- a/target/linux/brcm2708/patches-4.19/950-0623-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch +++ b/target/linux/brcm2708/patches-4.19/950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch @@ -1,7 +1,7 @@ From 275f4673d8c0601e5dbb16e743187d264e7dbed6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 21 Dec 2018 16:50:53 +0000 -Subject: [PATCH 623/806] staging: vc-sm-cma: Add in allocation for VPU +Subject: [PATCH] staging: vc-sm-cma: Add in allocation for VPU requests. Module has to change from tristate to bool as all CMA functions diff --git a/target/linux/brcm2708/patches-4.19/950-0624-staging-vc-sm-cma-Update-TODO.patch b/target/linux/brcm2708/patches-4.19/950-0577-staging-vc-sm-cma-Update-TODO.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0624-staging-vc-sm-cma-Update-TODO.patch rename to target/linux/brcm2708/patches-4.19/950-0577-staging-vc-sm-cma-Update-TODO.patch index 658fda4887..c4d303a57d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0624-staging-vc-sm-cma-Update-TODO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0577-staging-vc-sm-cma-Update-TODO.patch @@ -1,7 +1,7 @@ From 753e73267994a88505b6883cdf463d1d0bacf090 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 11 Mar 2019 16:38:32 +0000 -Subject: [PATCH 624/806] staging: vc-sm-cma: Update TODO. +Subject: [PATCH] staging: vc-sm-cma: Update TODO. The driver is already a platform driver, so that can be deleted from the TODO. diff --git a/target/linux/brcm2708/patches-4.19/950-0625-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch b/target/linux/brcm2708/patches-4.19/950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0625-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch rename to target/linux/brcm2708/patches-4.19/950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch index 4ab944eec9..53a936e993 100644 --- a/target/linux/brcm2708/patches-4.19/950-0625-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch +++ b/target/linux/brcm2708/patches-4.19/950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch @@ -1,7 +1,7 @@ From 549c0266e570da686f19e4435d76411cd7137954 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 11 Mar 2019 16:35:23 +0000 -Subject: [PATCH 625/806] staging: vc-sm-cma: Add in userspace allocation API +Subject: [PATCH] staging: vc-sm-cma: Add in userspace allocation API Replacing the functionality from the older vc-sm driver, add in a userspace API that allows allocation of buffers, diff --git a/target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Add-cache-control-ioctls.patch b/target/linux/brcm2708/patches-4.19/950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Add-cache-control-ioctls.patch rename to target/linux/brcm2708/patches-4.19/950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch index 35d1e49e5e..500ec5f0bc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Add-cache-control-ioctls.patch +++ b/target/linux/brcm2708/patches-4.19/950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch @@ -1,7 +1,7 @@ From b17f6dc1d79ae057294ac2d8d824aa2258ab09a8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 20 Mar 2019 10:40:00 +0000 -Subject: [PATCH 626/806] staging: vcsm-cma: Add cache control ioctls +Subject: [PATCH] staging: vcsm-cma: Add cache control ioctls The old driver allowed for direct cache manipulation and that was used by various clients. Replicate here. diff --git a/target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch b/target/linux/brcm2708/patches-4.19/950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch rename to target/linux/brcm2708/patches-4.19/950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch index 3acfe65b52..ee3d1de7d2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch +++ b/target/linux/brcm2708/patches-4.19/950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch @@ -1,7 +1,7 @@ From 4b78daea312bd39e892eb94f8c7905e2d5b682b4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 13 May 2019 16:47:54 +0100 -Subject: [PATCH 627/806] staging: vcsm-cma: Alter dev node permissions to 0666 +Subject: [PATCH] staging: vcsm-cma: Alter dev node permissions to 0666 Until the udev rules are updated, open up access to this node by default. diff --git a/target/linux/brcm2708/patches-4.19/950-0628-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch b/target/linux/brcm2708/patches-4.19/950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0628-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch rename to target/linux/brcm2708/patches-4.19/950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch index e237407081..320552e6c8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0628-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch +++ b/target/linux/brcm2708/patches-4.19/950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch @@ -1,7 +1,7 @@ From c38256621d4dffbbc0c19737d724724f04b0df9a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 16 May 2019 15:17:19 +0100 -Subject: [PATCH 628/806] staging: vcsm-cma: Drop logging level on messages in +Subject: [PATCH] staging: vcsm-cma: Drop logging level on messages in vc_sm_release_resource They weren't errors but were logged as such. diff --git a/target/linux/brcm2708/patches-4.19/950-0629-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch b/target/linux/brcm2708/patches-4.19/950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0629-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch rename to target/linux/brcm2708/patches-4.19/950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch index 24c4fe8044..5e5c6bc2de 100644 --- a/target/linux/brcm2708/patches-4.19/950-0629-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch +++ b/target/linux/brcm2708/patches-4.19/950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch @@ -1,7 +1,7 @@ From 52f881e3afa89bb1ca9e8b037f7600bcc97626e8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 22 May 2019 15:40:37 +0100 -Subject: [PATCH 629/806] staging: vcsm-cma: Fixup the alloc code handling of +Subject: [PATCH] staging: vcsm-cma: Fixup the alloc code handling of kernel_id The allocation code had been copied in from an old branch prior diff --git a/target/linux/brcm2708/patches-4.19/950-0630-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0630-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch index eb07457cb2..883d947c22 100644 --- a/target/linux/brcm2708/patches-4.19/950-0630-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch @@ -1,7 +1,7 @@ From 3e33fb46eb8791ba39fe4781f278487bcc2c3356 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 14 Mar 2019 13:27:54 +0000 -Subject: [PATCH 630/806] Pulled in the multi frame buffer support from the Pi3 +Subject: [PATCH] Pulled in the multi frame buffer support from the Pi3 repo --- diff --git a/target/linux/brcm2708/patches-4.19/950-0631-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch b/target/linux/brcm2708/patches-4.19/950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0631-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch rename to target/linux/brcm2708/patches-4.19/950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch index 6a10e58288..e3ee39abba 100644 --- a/target/linux/brcm2708/patches-4.19/950-0631-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch +++ b/target/linux/brcm2708/patches-4.19/950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch @@ -1,7 +1,7 @@ From 545c00748a070340e9669740e45afc2672e1fcb6 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sun, 19 May 2019 12:26:21 +0200 -Subject: [PATCH 631/806] ARM: dts: bcm283x: Move BCM2835/6/7 specific to +Subject: [PATCH] ARM: dts: bcm283x: Move BCM2835/6/7 specific to bcm2835-common.dtsi We want all common BCM2835/6/7/8 functions in bcm283x.dtsi and all diff --git a/target/linux/brcm2708/patches-4.19/950-0632-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch b/target/linux/brcm2708/patches-4.19/950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0632-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch rename to target/linux/brcm2708/patches-4.19/950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch index 9be01fb6bf..16980a8ba3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0632-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch +++ b/target/linux/brcm2708/patches-4.19/950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch @@ -1,7 +1,7 @@ From ff78cbcd8d7d656a5f43abd2c744e610b8c6c740 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 29 May 2019 13:54:21 +0100 -Subject: [PATCH 632/806] ARM: dts: Add bcm2711-rpi-4-b.dts and components +Subject: [PATCH] ARM: dts: Add bcm2711-rpi-4-b.dts and components Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-i2c3-6-and-uart2-5-overlays.patch b/target/linux/brcm2708/patches-4.19/950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-i2c3-6-and-uart2-5-overlays.patch rename to target/linux/brcm2708/patches-4.19/950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch index 84e015aa67..d1d8f72a0a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-i2c3-6-and-uart2-5-overlays.patch +++ b/target/linux/brcm2708/patches-4.19/950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch @@ -1,7 +1,7 @@ From 13be2bbd1a22f1b4d9fd260d80b561698f623ac1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 30 May 2019 16:44:24 +0100 -Subject: [PATCH 633/806] overlays: Add i2c3-6 and uart2-5 overlays +Subject: [PATCH] overlays: Add i2c3-6 and uart2-5 overlays Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0634-spi-devicetree-add-overlays-for-spi-3-to-6.patch b/target/linux/brcm2708/patches-4.19/950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0634-spi-devicetree-add-overlays-for-spi-3-to-6.patch rename to target/linux/brcm2708/patches-4.19/950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch index a59cd5cecf..27de73d301 100644 --- a/target/linux/brcm2708/patches-4.19/950-0634-spi-devicetree-add-overlays-for-spi-3-to-6.patch +++ b/target/linux/brcm2708/patches-4.19/950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch @@ -1,7 +1,7 @@ From a4ea446a07d7ba010c3c32286a22dc89cffa1e54 Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Sun, 12 May 2019 16:17:08 +0000 -Subject: [PATCH 634/806] spi: devicetree: add overlays for spi 3 to 6 +Subject: [PATCH] spi: devicetree: add overlays for spi 3 to 6 Signed-off-by: Martin Sperl --- diff --git a/target/linux/brcm2708/patches-4.19/950-0635-overlays-Add-the-spi-gpio40-45-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0635-overlays-Add-the-spi-gpio40-45-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch index 7315658408..26930baadd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0635-overlays-Add-the-spi-gpio40-45-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch @@ -1,7 +1,7 @@ From 726da40b8c272d181a41686195f91b914363167b Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 22 Jan 2019 10:49:41 +0000 -Subject: [PATCH 635/806] overlays: Add the spi-gpio40-45 overlay +Subject: [PATCH] overlays: Add the spi-gpio40-45 overlay The 2711 B0 boot EEPROM is programmed via SPI0 on GPIO pins 40-43 CS0. Add a device tree overlay to optionally diff --git a/target/linux/brcm2708/patches-4.19/950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch b/target/linux/brcm2708/patches-4.19/950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch rename to target/linux/brcm2708/patches-4.19/950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch index 8f990e1eef..a38cc6537e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0636-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch +++ b/target/linux/brcm2708/patches-4.19/950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch @@ -1,7 +1,7 @@ From 0e8ed7a892a510383017cdddee7b772473f1f7c8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Sep 2018 11:50:25 +0100 -Subject: [PATCH 636/806] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 +Subject: [PATCH] config: Permit LPAE and PCIE_BRCMSTB on BCM2835 --- arch/arm/mach-bcm/Kconfig | 4 ++++ diff --git a/target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch b/target/linux/brcm2708/patches-4.19/950-0590-2711-Add-basic-64-bit-support.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch rename to target/linux/brcm2708/patches-4.19/950-0590-2711-Add-basic-64-bit-support.patch index 9cd94de352..892914befa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0638-2711-Add-basic-64-bit-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0590-2711-Add-basic-64-bit-support.patch @@ -1,7 +1,7 @@ From 0e7db01b8ce2c2fb5596e7a9b7104e9947e5c269 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 8 Mar 2019 21:12:39 +0000 -Subject: [PATCH 638/806] 2711: Add basic 64-bit support +Subject: [PATCH] 2711: Add basic 64-bit support This commit adds initial support for 64-bit 2711 builds. However, it will only work as much as it does if the Pi4 RAM is limited to diff --git a/target/linux/brcm2708/patches-4.19/950-0641-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch b/target/linux/brcm2708/patches-4.19/950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0641-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch rename to target/linux/brcm2708/patches-4.19/950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch index fd0fce1db8..29f3cdb32a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0641-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch +++ b/target/linux/brcm2708/patches-4.19/950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch @@ -1,7 +1,7 @@ From 91aa97cc3a193cfd29962e328f9d1da0d8e0aaff Mon Sep 17 00:00:00 2001 From: 6by9 <6by9@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:22:03 +0000 -Subject: [PATCH 641/806] ARM: dts: bcm283x: Correct vchiq compatible string +Subject: [PATCH] ARM: dts: bcm283x: Correct vchiq compatible string (#2840) commit 499770ede3f829e80539f46b59b5f460dc327aa6 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0642-arm-dts-Change-downstream-vchiq-compatible-string.patch b/target/linux/brcm2708/patches-4.19/950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0642-arm-dts-Change-downstream-vchiq-compatible-string.patch rename to target/linux/brcm2708/patches-4.19/950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch index a4e4da5e96..4fda05ef6d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0642-arm-dts-Change-downstream-vchiq-compatible-string.patch +++ b/target/linux/brcm2708/patches-4.19/950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch @@ -1,7 +1,7 @@ From 00d8817ab207a9f60e94e87acf4f170155aecd48 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 6 Feb 2019 20:45:16 +0000 -Subject: [PATCH 642/806] arm: dts: Change downstream vchiq compatible string +Subject: [PATCH] arm: dts: Change downstream vchiq compatible string The new cache line size mechanism requires a different vchiq compatible string on BCM2836 and BCM2837, but the downstream dts files didn't diff --git a/target/linux/brcm2708/patches-4.19/950-0643-bcm2835-dma-Add-proper-40-bit-DMA-support.patch b/target/linux/brcm2708/patches-4.19/950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0643-bcm2835-dma-Add-proper-40-bit-DMA-support.patch rename to target/linux/brcm2708/patches-4.19/950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch index 94d2c9a9b2..7ca14c805e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0643-bcm2835-dma-Add-proper-40-bit-DMA-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch @@ -1,7 +1,7 @@ From 621fb1606217c3e72feda69255ae6cb6a7ccfec2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 4 Apr 2019 13:33:47 +0100 -Subject: [PATCH 643/806] bcm2835-dma: Add proper 40-bit DMA support +Subject: [PATCH] bcm2835-dma: Add proper 40-bit DMA support The 40-bit additions are not fully tested, but it should be capable of supporting both 40-bit memcpy on BCM2711 and regular diff --git a/target/linux/brcm2708/patches-4.19/950-0644-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch b/target/linux/brcm2708/patches-4.19/950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch similarity index 89% rename from target/linux/brcm2708/patches-4.19/950-0644-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch rename to target/linux/brcm2708/patches-4.19/950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch index 157566aef2..20d08ba26c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0644-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch +++ b/target/linux/brcm2708/patches-4.19/950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch @@ -1,7 +1,7 @@ From db81536216256cdd4b8a17879e6628be47c74414 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 5 Jun 2019 21:32:03 +0100 -Subject: [PATCH 644/806] BCM270X_DT: Leave bulk channel in dma channel mask +Subject: [PATCH] BCM270X_DT: Leave bulk channel in dma channel mask The updated bcm2835-dma driver does not require the BULK channel to be removed from the set of available channels, as provided by diff --git a/target/linux/brcm2708/patches-4.19/950-0645-SQUASH-bcm2835-dma-Remove-debugging.patch b/target/linux/brcm2708/patches-4.19/950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0645-SQUASH-bcm2835-dma-Remove-debugging.patch rename to target/linux/brcm2708/patches-4.19/950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch index 11b4805b06..f8d988067d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0645-SQUASH-bcm2835-dma-Remove-debugging.patch +++ b/target/linux/brcm2708/patches-4.19/950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch @@ -1,7 +1,7 @@ From eecf4b8568f0a0d6b90364299eed6b12ce63c245 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 6 Jun 2019 09:35:08 +0100 -Subject: [PATCH 645/806] SQUASH: bcm2835-dma: Remove debugging +Subject: [PATCH] SQUASH: bcm2835-dma: Remove debugging Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0647-dts-Include-CSI-lane-config-for-csi1.patch b/target/linux/brcm2708/patches-4.19/950-0596-dts-Include-CSI-lane-config-for-csi1.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0647-dts-Include-CSI-lane-config-for-csi1.patch rename to target/linux/brcm2708/patches-4.19/950-0596-dts-Include-CSI-lane-config-for-csi1.patch index 0bca2ae787..74cb946313 100644 --- a/target/linux/brcm2708/patches-4.19/950-0647-dts-Include-CSI-lane-config-for-csi1.patch +++ b/target/linux/brcm2708/patches-4.19/950-0596-dts-Include-CSI-lane-config-for-csi1.patch @@ -1,7 +1,7 @@ From 2fcb94a04778708b13b6d36390000e97063460e6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 31 May 2019 17:57:26 +0100 -Subject: [PATCH 647/806] dts: Include CSI lane config for csi1 +Subject: [PATCH] dts: Include CSI lane config for csi1 Without the include the peripheral is configured to have 0 data lanes, which doesn't allow much data to be passed. diff --git a/target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch rename to target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch index 4098d15e9b..6d3da8da8d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch @@ -1,7 +1,7 @@ From ba21a5129def696c154c84df087f07bc748abe7d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 7 Jun 2019 11:31:21 +0100 -Subject: [PATCH 648/806] drm/vc4: Fix T-format modifiers in FKMS. +Subject: [PATCH] drm/vc4: Fix T-format modifiers in FKMS. The wrong vc_image formats were being checked for in the switch statement. Correct these. diff --git a/target/linux/brcm2708/patches-4.19/950-0650-bcm2711-dts-Disable-the-v3d-node-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch similarity index 87% rename from target/linux/brcm2708/patches-4.19/950-0650-bcm2711-dts-Disable-the-v3d-node-by-default.patch rename to target/linux/brcm2708/patches-4.19/950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch index 935aa157a4..eec00db56a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0650-bcm2711-dts-Disable-the-v3d-node-by-default.patch +++ b/target/linux/brcm2708/patches-4.19/950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch @@ -1,7 +1,7 @@ From 27fc1dbeee2a58abcb80ffc1c8f161d3abfeac9a Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 10 Jun 2019 17:22:44 +0100 -Subject: [PATCH 650/806] bcm2711 dts: Disable the v3d node by default +Subject: [PATCH] bcm2711 dts: Disable the v3d node by default Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0651-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch b/target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0651-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch rename to target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch index 44e63de562..3e3d0704d6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0651-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch +++ b/target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch @@ -1,7 +1,7 @@ From d4a180e5b67c3ca9b8559d4f926f22b6c6705082 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 10 Jun 2019 16:32:51 +0100 -Subject: [PATCH 651/806] drm/vc4: Remove 340MHz clock limit from FKMS now +Subject: [PATCH] drm/vc4: Remove 340MHz clock limit from FKMS now scrambling issues resolved Firmware TMDS scrambling is now being correctly configured, so diff --git a/target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch b/target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch rename to target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch index 6ea178b5be..0ad70eb1e0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0652-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch +++ b/target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch @@ -1,7 +1,7 @@ From 5f6feeaf528cf922a82f11e5b0711f5fe9d7538d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 7 Jun 2019 14:50:12 +0100 -Subject: [PATCH 652/806] Revert "usb: xhci: hack xhci_urb_enqueue to support +Subject: [PATCH] Revert "usb: xhci: hack xhci_urb_enqueue to support hid.mousepoll behaviour" This reverts commit 1cf1071a79f320bc4497a3ade77431f04442eb17. diff --git a/target/linux/brcm2708/patches-4.19/950-0653-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/brcm2708/patches-4.19/950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0653-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch rename to target/linux/brcm2708/patches-4.19/950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch index 25faf7a7b5..99c4e4df3f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0653-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch +++ b/target/linux/brcm2708/patches-4.19/950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch @@ -1,7 +1,7 @@ From f9c01b35ec7ea3f981c414af38c92c508487671a Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 10:55:00 +0100 -Subject: [PATCH 653/806] usb: add plumbing for updating interrupt endpoint +Subject: [PATCH] usb: add plumbing for updating interrupt endpoint interval state xHCI caches device and endpoint data after the interface is configured, diff --git a/target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/brcm2708/patches-4.19/950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch rename to target/linux/brcm2708/patches-4.19/950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index ffcb9ba41f..d66b9716a1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0654-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/brcm2708/patches-4.19/950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -1,7 +1,7 @@ From 903af89ac9a9b82b6e736ab04e3848672a0ab364 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:33:39 +0100 -Subject: [PATCH 654/806] xhci: implement xhci_fixup_endpoint for interval +Subject: [PATCH] xhci: implement xhci_fixup_endpoint for interval adjustments Must be called in a non-atomic context, after the endpoint diff --git a/target/linux/brcm2708/patches-4.19/950-0655-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch b/target/linux/brcm2708/patches-4.19/950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0655-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch rename to target/linux/brcm2708/patches-4.19/950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch index 2fa7e317dc..59263196c8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0655-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch +++ b/target/linux/brcm2708/patches-4.19/950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch @@ -1,7 +1,7 @@ From f2c46d48d1aa0f7b87b179434162eac6624122f7 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 11 Jun 2019 11:42:03 +0100 -Subject: [PATCH 655/806] usbhid: call usb_fixup_endpoint after mangling +Subject: [PATCH] usbhid: call usb_fixup_endpoint after mangling intervals Lets the mousepoll override mechanism work with xhci. diff --git a/target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Add-status-of-which-display-is-updated-throu.patch b/target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Add-status-of-which-display-is-updated-throu.patch rename to target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch index c477a3c50d..dd5b284ccd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Add-status-of-which-display-is-updated-throu.patch +++ b/target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch @@ -1,7 +1,7 @@ From 77ae227664bc2460a5341be765044d0b8fb184ac Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 4 Jun 2019 12:14:30 +0100 -Subject: [PATCH 656/806] drm: vc4: Add status of which display is updated +Subject: [PATCH] drm: vc4: Add status of which display is updated through vblank Previously multiple displays were slaved off the same SMI diff --git a/target/linux/brcm2708/patches-4.19/950-0657-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch b/target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0657-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch rename to target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch index 8434033b32..a72f1420df 100644 --- a/target/linux/brcm2708/patches-4.19/950-0657-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch @@ -1,7 +1,7 @@ From 5643e47700d3c1b2a8a1aca56629f12e90df407c Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 12 Jun 2019 17:13:21 +0100 -Subject: [PATCH 657/806] drm/vc4: In FKMS look at the modifiers correctly for +Subject: [PATCH] drm/vc4: In FKMS look at the modifiers correctly for SAND Incorrect masking was used in the switch for the modifier, diff --git a/target/linux/brcm2708/patches-4.19/950-0658-arm-dts-Fix-Pi4-PWR-LED-configuration.patch b/target/linux/brcm2708/patches-4.19/950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0658-arm-dts-Fix-Pi4-PWR-LED-configuration.patch rename to target/linux/brcm2708/patches-4.19/950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch index 8abb4db634..34772d59b1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0658-arm-dts-Fix-Pi4-PWR-LED-configuration.patch +++ b/target/linux/brcm2708/patches-4.19/950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch @@ -1,7 +1,7 @@ From 4d4d714061ee6f54dc5feeaeda4389e2346386aa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 17 Jun 2019 10:06:55 +0100 -Subject: [PATCH 658/806] arm: dts: Fix Pi4 PWR LED configuration +Subject: [PATCH] arm: dts: Fix Pi4 PWR LED configuration Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0659-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch b/target/linux/brcm2708/patches-4.19/950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch similarity index 90% rename from target/linux/brcm2708/patches-4.19/950-0659-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch rename to target/linux/brcm2708/patches-4.19/950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch index cb76771149..75999d02a6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0659-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch +++ b/target/linux/brcm2708/patches-4.19/950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch @@ -1,7 +1,7 @@ From 43420c9bb90d4290e02bbcaa40c19e00fb347615 Mon Sep 17 00:00:00 2001 From: dp111 Date: Sat, 15 Jun 2019 18:19:50 +0100 -Subject: [PATCH 659/806] bcm2838.dtsi : Correct gic400 memory address ranges +Subject: [PATCH] bcm2838.dtsi : Correct gic400 memory address ranges It appears to me the addresses for the gic400 are slightly wrong . See section 3.2 https://static.docs.arm.com/ddi0471/a/DDI0471A_gic400_r0p0_trm.pdf --- diff --git a/target/linux/brcm2708/patches-4.19/950-0660-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch b/target/linux/brcm2708/patches-4.19/950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0660-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch rename to target/linux/brcm2708/patches-4.19/950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch index 59e9ebdb40..808fdaf0ca 100644 --- a/target/linux/brcm2708/patches-4.19/950-0660-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch +++ b/target/linux/brcm2708/patches-4.19/950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch @@ -1,7 +1,7 @@ From 65a5b304668ed6cb4568ac1a0ffbeabb28208b38 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 12:15:50 +0100 -Subject: [PATCH 660/806] staging: vchiq: Use the old dma controller for OF +Subject: [PATCH] staging: vchiq: Use the old dma controller for OF config on platform devices vchiq on Pi4 is no longer under the soc node, therefore it diff --git a/target/linux/brcm2708/patches-4.19/950-0661-drm-vc4-Limit-fkms-to-modes-85Hz.patch b/target/linux/brcm2708/patches-4.19/950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0661-drm-vc4-Limit-fkms-to-modes-85Hz.patch rename to target/linux/brcm2708/patches-4.19/950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch index a2bed490d1..b95a4db6d3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0661-drm-vc4-Limit-fkms-to-modes-85Hz.patch +++ b/target/linux/brcm2708/patches-4.19/950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch @@ -1,7 +1,7 @@ From 06a0e398e7dcd6ba0a61713596c32ec6d43b47c8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 18 Jun 2019 21:37:45 +0100 -Subject: [PATCH 661/806] drm/vc4: Limit fkms to modes <= 85Hz +Subject: [PATCH] drm/vc4: Limit fkms to modes <= 85Hz Selecting 1080p100 and 120 has very limited gain, but don't want to block VGA85 and similar. diff --git a/target/linux/brcm2708/patches-4.19/950-0662-arm-bcm2835-Add-bcm2838-compatible-string.patch b/target/linux/brcm2708/patches-4.19/950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch similarity index 88% rename from target/linux/brcm2708/patches-4.19/950-0662-arm-bcm2835-Add-bcm2838-compatible-string.patch rename to target/linux/brcm2708/patches-4.19/950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch index 14d289660a..1099608c75 100644 --- a/target/linux/brcm2708/patches-4.19/950-0662-arm-bcm2835-Add-bcm2838-compatible-string.patch +++ b/target/linux/brcm2708/patches-4.19/950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch @@ -1,7 +1,7 @@ From aca60a3944ff6a4da66e96d9ae54f4bca271b600 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 11 Jun 2019 17:38:28 +0100 -Subject: [PATCH 662/806] arm: bcm2835: Add bcm2838 compatible string. +Subject: [PATCH] arm: bcm2835: Add bcm2838 compatible string. Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0663-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch b/target/linux/brcm2708/patches-4.19/950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0663-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch rename to target/linux/brcm2708/patches-4.19/950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch index cf364e05d9..875d8917c2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0663-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch +++ b/target/linux/brcm2708/patches-4.19/950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch @@ -1,7 +1,7 @@ From d27f2b90df0b787859c2f5665feaecbe87e6b1ff Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 4 Jun 2019 16:22:22 +0100 -Subject: [PATCH 663/806] arm: dts: Improve the bcm27xx inclusion hierarchy +Subject: [PATCH] arm: dts: Improve the bcm27xx inclusion hierarchy 1) The top-level .dts files now include parallel chains of bcm27xx.dtsi and bcm27xx-rpi.dtsi files, with no cross-inclusion between the two diff --git a/target/linux/brcm2708/patches-4.19/950-0664-arm-dts-First-draft-of-upstream-Pi4-DTS.patch b/target/linux/brcm2708/patches-4.19/950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0664-arm-dts-First-draft-of-upstream-Pi4-DTS.patch rename to target/linux/brcm2708/patches-4.19/950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch index af5e22da11..0fa4cf338d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0664-arm-dts-First-draft-of-upstream-Pi4-DTS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch @@ -1,7 +1,7 @@ From 5216bb8a1257a8216362affe4757a96a36b60b32 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 11 Jun 2019 18:08:05 +0100 -Subject: [PATCH 664/806] arm: dts: First draft of upstream Pi4 DTS +Subject: [PATCH] arm: dts: First draft of upstream Pi4 DTS I've attempted to follow the upstream conventions in the DT commits, but this is just presented here initially as a talking point. diff --git a/target/linux/brcm2708/patches-4.19/950-0665-overlays-Fix-compatible-string-for-ds1307-RTC.patch b/target/linux/brcm2708/patches-4.19/950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0665-overlays-Fix-compatible-string-for-ds1307-RTC.patch rename to target/linux/brcm2708/patches-4.19/950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch index f1279f6ca0..220cd5e092 100644 --- a/target/linux/brcm2708/patches-4.19/950-0665-overlays-Fix-compatible-string-for-ds1307-RTC.patch +++ b/target/linux/brcm2708/patches-4.19/950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch @@ -1,7 +1,7 @@ From 4a5715f95d8865c817c9a747f28f38b234f5df42 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 17 Jun 2019 14:36:12 +0100 -Subject: [PATCH 665/806] overlays: Fix compatible string for ds1307 RTC +Subject: [PATCH] overlays: Fix compatible string for ds1307 RTC Kernels since 4.19 have required the correct manufacture name in the compatible string for I2C devices, and unfortunately the one for the diff --git a/target/linux/brcm2708/patches-4.19/950-0666-overlays-Fix-further-maxim-ds1307-references.patch b/target/linux/brcm2708/patches-4.19/950-0614-overlays-Fix-further-maxim-ds1307-references.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0666-overlays-Fix-further-maxim-ds1307-references.patch rename to target/linux/brcm2708/patches-4.19/950-0614-overlays-Fix-further-maxim-ds1307-references.patch index 703d92dcc7..30dcaf4000 100644 --- a/target/linux/brcm2708/patches-4.19/950-0666-overlays-Fix-further-maxim-ds1307-references.patch +++ b/target/linux/brcm2708/patches-4.19/950-0614-overlays-Fix-further-maxim-ds1307-references.patch @@ -1,7 +1,7 @@ From ff25f8c70fd995e4f76a3c1245556cc0ec3db19d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Jun 2019 11:16:13 +0100 -Subject: [PATCH 666/806] overlays: Fix further maxim,ds1307 references +Subject: [PATCH] overlays: Fix further maxim,ds1307 references See: https://github.com/raspberrypi/linux/issues/3013 diff --git a/target/linux/brcm2708/patches-4.19/950-0667-overlays-Cosmetic-change-to-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0667-overlays-Cosmetic-change-to-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch index 34272ca87f..51db874675 100644 --- a/target/linux/brcm2708/patches-4.19/950-0667-overlays-Cosmetic-change-to-upstream-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch @@ -1,7 +1,7 @@ From ce7469a397da34a19112b8d14eb283e02088755b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Jun 2019 11:19:59 +0100 -Subject: [PATCH 667/806] overlays: Cosmetic change to upstream overlay +Subject: [PATCH] overlays: Cosmetic change to upstream overlay The dwc2 overlay no longer uses the dwc2_usb label, and the latest ovmerge (which generates the upstream overlay) removes unused labels. diff --git a/target/linux/brcm2708/patches-4.19/950-0668-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch b/target/linux/brcm2708/patches-4.19/950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0668-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch rename to target/linux/brcm2708/patches-4.19/950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch index 353a71d66a..2f33f638c2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0668-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch @@ -1,7 +1,7 @@ From 4f1fd30b76c1bec76069483b88747783a0654f38 Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Sat, 25 May 2019 10:45:38 +0200 -Subject: [PATCH 668/806] w1: ds2805: rename w1_family struct, fixing c-p typo +Subject: [PATCH] w1: ds2805: rename w1_family struct, fixing c-p typo commit 0e3743d870711ae4daf1e7170c8d9381564e244d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0669-w1-ds2413-output_write-cosmetic-fixes-simplify.patch b/target/linux/brcm2708/patches-4.19/950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0669-w1-ds2413-output_write-cosmetic-fixes-simplify.patch rename to target/linux/brcm2708/patches-4.19/950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch index f158d5def1..6c0a304f1c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0669-w1-ds2413-output_write-cosmetic-fixes-simplify.patch +++ b/target/linux/brcm2708/patches-4.19/950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch @@ -1,7 +1,7 @@ From 3280ce5f5483a351f49e84b48ad98df87989346a Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Mon, 20 May 2019 09:05:55 +0200 -Subject: [PATCH 669/806] w1: ds2413: output_write() cosmetic fixes / simplify +Subject: [PATCH] w1: ds2413: output_write() cosmetic fixes / simplify commit ae2ee27aa985232f66421d7cd1c7f4b87c7dba7d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0670-w1-ds2413-add-retry-support-to-state_read.patch b/target/linux/brcm2708/patches-4.19/950-0618-w1-ds2413-add-retry-support-to-state_read.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0670-w1-ds2413-add-retry-support-to-state_read.patch rename to target/linux/brcm2708/patches-4.19/950-0618-w1-ds2413-add-retry-support-to-state_read.patch index 4e532df12d..07c6157ca5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0670-w1-ds2413-add-retry-support-to-state_read.patch +++ b/target/linux/brcm2708/patches-4.19/950-0618-w1-ds2413-add-retry-support-to-state_read.patch @@ -1,7 +1,7 @@ From 91e443597cdd8f89d2b68ea5bf0f0823d1853ab7 Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Mon, 20 May 2019 09:05:56 +0200 -Subject: [PATCH 670/806] w1: ds2413: add retry support to state_read() +Subject: [PATCH] w1: ds2413: add retry support to state_read() commit c50d09a86172073f55ebac0b92ad5a75907d64e7 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0671-w1-ds2413-when-the-slave-is-not-responding-during-re.patch b/target/linux/brcm2708/patches-4.19/950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0671-w1-ds2413-when-the-slave-is-not-responding-during-re.patch rename to target/linux/brcm2708/patches-4.19/950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch index 43d4a5e859..9d7a94159e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0671-w1-ds2413-when-the-slave-is-not-responding-during-re.patch +++ b/target/linux/brcm2708/patches-4.19/950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch @@ -1,7 +1,7 @@ From c84676e57896fedb47a69739fb82bb9941f624c4 Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Wed, 22 May 2019 12:40:53 +0200 -Subject: [PATCH 671/806] w1: ds2413: when the slave is not responding during +Subject: [PATCH] w1: ds2413: when the slave is not responding during read, select it again commit 3856032a0628e6b94badb9131a706dda185e071d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch b/target/linux/brcm2708/patches-4.19/950-0620-w1-ds2413-fix-state-byte-comparision.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch rename to target/linux/brcm2708/patches-4.19/950-0620-w1-ds2413-fix-state-byte-comparision.patch index dc99ef9ea6..3d3b74efc2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch +++ b/target/linux/brcm2708/patches-4.19/950-0620-w1-ds2413-fix-state-byte-comparision.patch @@ -1,7 +1,7 @@ From 38ca046063ee6fcef66c9c3bec5844a65f9d48d9 Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Thu, 30 May 2019 09:51:25 +0200 -Subject: [PATCH 672/806] w1: ds2413: fix state byte comparision +Subject: [PATCH] w1: ds2413: fix state byte comparision commit aacd152ecd7b18af5d2d96dea9e7284c1c93abea upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0673-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch b/target/linux/brcm2708/patches-4.19/950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0673-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch rename to target/linux/brcm2708/patches-4.19/950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch index 6414ceb062..63b8e8bdb3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0673-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch +++ b/target/linux/brcm2708/patches-4.19/950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch @@ -1,7 +1,7 @@ From 496b26b154da9a962a5310641d8f4b73200fe590 Mon Sep 17 00:00:00 2001 From: Chris Miller Date: Wed, 26 Jun 2019 10:40:30 +0100 -Subject: [PATCH 673/806] drm: vc4_dsi: Fix DMA channel and memory leak in vc4 +Subject: [PATCH] drm: vc4_dsi: Fix DMA channel and memory leak in vc4 (#3012) Signed-off-by: Chris G Miller diff --git a/target/linux/brcm2708/patches-4.19/950-0674-video-bcm2708_fb-Revert-cma-allocation-attempt.patch b/target/linux/brcm2708/patches-4.19/950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0674-video-bcm2708_fb-Revert-cma-allocation-attempt.patch rename to target/linux/brcm2708/patches-4.19/950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch index dd2c150d01..1eed4f7277 100644 --- a/target/linux/brcm2708/patches-4.19/950-0674-video-bcm2708_fb-Revert-cma-allocation-attempt.patch +++ b/target/linux/brcm2708/patches-4.19/950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch @@ -1,7 +1,7 @@ From b3fe618a47d770f6c9808ade14360fd81a599789 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 19 Jun 2019 03:55:50 +0100 -Subject: [PATCH 674/806] video/bcm2708_fb: Revert cma allocation attempt +Subject: [PATCH] video/bcm2708_fb: Revert cma allocation attempt "4600e91 Pulled in the multi frame buffer support from the Pi3 repo" pulled back in the code for allocating the framebuffer from the CMA diff --git a/target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch b/target/linux/brcm2708/patches-4.19/950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch rename to target/linux/brcm2708/patches-4.19/950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch index aa430490fc..ad3732d484 100644 --- a/target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch @@ -1,7 +1,7 @@ From ee96684cb2f528ad1036ae9a9126c9118a80dfbe Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 24 Jun 2019 02:29:40 +0100 -Subject: [PATCH 675/806] drm/vc4: Add support for color encoding on YUV planes +Subject: [PATCH] drm/vc4: Add support for color encoding on YUV planes Adds signalling for BT601/709/2020, and limited/full range (on BT601). diff --git a/target/linux/brcm2708/patches-4.19/950-0678-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch b/target/linux/brcm2708/patches-4.19/950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0678-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch rename to target/linux/brcm2708/patches-4.19/950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch index 1ef5063079..222de5bafb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0678-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch @@ -1,7 +1,7 @@ From f9dfd577dcc8e3173ddce79bca535eeee0fad1a4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Jul 2019 17:13:05 +0100 -Subject: [PATCH 678/806] arm: dts: Add coherent_pool=1M to Pi 4 bootargs +Subject: [PATCH] arm: dts: Add coherent_pool=1M to Pi 4 bootargs Downstream Raspberry Pi dts files add "coherent_pool=1M" to the kernel command line to aid the dwc_otg driver, but this excluded Pi 4 which diff --git a/target/linux/brcm2708/patches-4.19/950-0682-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0682-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch rename to target/linux/brcm2708/patches-4.19/950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch index 0e4a020e54..765874ef29 100644 --- a/target/linux/brcm2708/patches-4.19/950-0682-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch +++ b/target/linux/brcm2708/patches-4.19/950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch @@ -1,7 +1,7 @@ From 21e4c9306bd20ab4e02f90cd452d90bc4e4a0a98 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 3 Jul 2019 20:37:14 +0100 -Subject: [PATCH 682/806] overlays: Correct gpio-fan gpio flags for 4.19 +Subject: [PATCH] overlays: Correct gpio-fan gpio flags for 4.19 The gpio-fan overlay was submitted for the 4.14 kernel where the second value in the Device Tree gpios declaration was ignored (thanks to an diff --git a/target/linux/brcm2708/patches-4.19/950-0683-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch b/target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0683-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch rename to target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch index 7463d0750c..38bff7a7f6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0683-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch +++ b/target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch @@ -1,7 +1,7 @@ From b30537425b4bf90311b8d43c95484d9d339be25f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 25 Jun 2019 00:29:44 +0100 -Subject: [PATCH 683/806] staging: vcsm-cma: Remove cache manipulation ioctl +Subject: [PATCH] staging: vcsm-cma: Remove cache manipulation ioctl from ARM64 The cache flushing ioctls are used by the Pi3 HEVC hw-assisted diff --git a/target/linux/brcm2708/patches-4.19/950-0684-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch b/target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0684-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch rename to target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch index f0f51ef1f3..e8896c09a0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0684-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch +++ b/target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch @@ -1,7 +1,7 @@ From e4cb138abe457a6ab9b98458660a1c8e548fab7f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 1 Jul 2019 11:57:25 +0100 -Subject: [PATCH 684/806] staging: vcsm-cma: Rework to use dma APIs, not CMA +Subject: [PATCH] staging: vcsm-cma: Rework to use dma APIs, not CMA Due to a misunderstanding of the DMA mapping APIs, I made the wrong decision on how to implement this. diff --git a/target/linux/brcm2708/patches-4.19/950-0687-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch b/target/linux/brcm2708/patches-4.19/950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0687-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch rename to target/linux/brcm2708/patches-4.19/950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch index 1f2878eaf6..6c61023cad 100644 --- a/target/linux/brcm2708/patches-4.19/950-0687-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch +++ b/target/linux/brcm2708/patches-4.19/950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch @@ -1,7 +1,7 @@ From 38ae4957840ff9578a497422a8ca758549f734d5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 2 Jul 2019 17:19:04 +0100 -Subject: [PATCH 687/806] staging: vc-sm-cma: Fix the few remaining coding +Subject: [PATCH] staging: vc-sm-cma: Fix the few remaining coding style issues Fix a few minor checkpatch complaints to make the driver clean diff --git a/target/linux/brcm2708/patches-4.19/950-0689-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch b/target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0689-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch rename to target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch index 4c05cc3978..8161bb2659 100644 --- a/target/linux/brcm2708/patches-4.19/950-0689-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch +++ b/target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch @@ -1,7 +1,7 @@ From 768ab361410487b05561de854a994a2888cd430a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 28 Jun 2019 11:30:49 +0100 -Subject: [PATCH 689/806] Revert "media: vb2: Allow reqbufs(0) with "in use" +Subject: [PATCH] Revert "media: vb2: Allow reqbufs(0) with "in use" MMAP buffers" This reverts commit a2c73e18c1f657de6d654f51effa0a94863abbd8. diff --git a/target/linux/brcm2708/patches-4.19/950-0690-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch b/target/linux/brcm2708/patches-4.19/950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0690-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch rename to target/linux/brcm2708/patches-4.19/950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch index ffe6237bce..8f3e72c447 100644 --- a/target/linux/brcm2708/patches-4.19/950-0690-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch +++ b/target/linux/brcm2708/patches-4.19/950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch @@ -1,7 +1,7 @@ From ebd995296afa99a5c53f164e595f7a6d41d32a01 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 23 Aug 2018 09:56:22 -0400 -Subject: [PATCH 690/806] media: videodev2.h: add new capabilities for buffer +Subject: [PATCH] media: videodev2.h: add new capabilities for buffer types Upstream commit f35f5d72e70e6b91389eb98fcabf43b79f40587f diff --git a/target/linux/brcm2708/patches-4.19/950-0691-media-vb2-set-reqbufs-create_bufs-capabilities.patch b/target/linux/brcm2708/patches-4.19/950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0691-media-vb2-set-reqbufs-create_bufs-capabilities.patch rename to target/linux/brcm2708/patches-4.19/950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch index 233857f5d1..52f999ec14 100644 --- a/target/linux/brcm2708/patches-4.19/950-0691-media-vb2-set-reqbufs-create_bufs-capabilities.patch +++ b/target/linux/brcm2708/patches-4.19/950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch @@ -1,7 +1,7 @@ From 7410e35a4936b89f2e227c52058c11f1574bbfca Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 23 Aug 2018 10:18:35 -0400 -Subject: [PATCH 691/806] media: vb2: set reqbufs/create_bufs capabilities +Subject: [PATCH] media: vb2: set reqbufs/create_bufs capabilities Upstream commit e5079cf11373e4cc98be8b1072aece429eb2d4d2. diff --git a/target/linux/brcm2708/patches-4.19/950-0692-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0692-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch index 0a6f540145..755ca34440 100644 --- a/target/linux/brcm2708/patches-4.19/950-0692-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch @@ -1,7 +1,7 @@ From 16cf378051d7fff6772a7acaecbacddec7822330 Mon Sep 17 00:00:00 2001 From: John Sheu Date: Thu, 15 Nov 2018 10:57:16 -0500 -Subject: [PATCH 692/806] media: vb2: Allow reqbufs(0) with "in use" MMAP +Subject: [PATCH] media: vb2: Allow reqbufs(0) with "in use" MMAP buffers Upstream commit d644cca50f366cd109845ae92e37c09ed79adf81 diff --git a/target/linux/brcm2708/patches-4.19/950-0693-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0693-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch index efc5964afc..51dd1d7661 100644 --- a/target/linux/brcm2708/patches-4.19/950-0693-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch @@ -1,7 +1,7 @@ From a11b6221e69ba4177ee428e2cb6fb4e4bd68c5f4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jul 2019 09:22:10 +0100 -Subject: [PATCH 693/806] overlays: Add real parameters to the rpi-poe overlay +Subject: [PATCH] overlays: Add real parameters to the rpi-poe overlay As a result of being loaded by the POE HAT EEPROM, the rpi-poe overlay doesn't expose parameters in the usual way; instead it adds them to diff --git a/target/linux/brcm2708/patches-4.19/950-0694-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch b/target/linux/brcm2708/patches-4.19/950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0694-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch rename to target/linux/brcm2708/patches-4.19/950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch index f4137bbdd9..669306d15b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0694-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch +++ b/target/linux/brcm2708/patches-4.19/950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch @@ -1,7 +1,7 @@ From c46811a3b0e0fb76015ac956172e40bce4e6d9b3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 5 Jul 2019 14:49:22 +0100 -Subject: [PATCH 694/806] overlays: Rename pi3- overlays to be less +Subject: [PATCH] overlays: Rename pi3- overlays to be less model-specific (#3052) Rename the various pi3- overlays to be more generic, listing diff --git a/target/linux/brcm2708/patches-4.19/950-0695-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch b/target/linux/brcm2708/patches-4.19/950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0695-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch rename to target/linux/brcm2708/patches-4.19/950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch index ef556367f3..b363e753ea 100644 --- a/target/linux/brcm2708/patches-4.19/950-0695-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch +++ b/target/linux/brcm2708/patches-4.19/950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch @@ -1,7 +1,7 @@ From 614cade3a68f7214939e1c72acd5fcc9d49beeef Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Fri, 21 Jun 2019 03:52:49 -0700 -Subject: [PATCH 695/806] i2c: bcm2835: Move IRQ request after clock code in +Subject: [PATCH] i2c: bcm2835: Move IRQ request after clock code in probe Commit 4a5cfa39465cad25dd736d7ceba8a5d32eea4ecc upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0696-i2c-bcm2835-Ensure-clock-exists-when-probing.patch b/target/linux/brcm2708/patches-4.19/950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0696-i2c-bcm2835-Ensure-clock-exists-when-probing.patch rename to target/linux/brcm2708/patches-4.19/950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch index 3cd1d376b1..4a468f0291 100644 --- a/target/linux/brcm2708/patches-4.19/950-0696-i2c-bcm2835-Ensure-clock-exists-when-probing.patch +++ b/target/linux/brcm2708/patches-4.19/950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch @@ -1,7 +1,7 @@ From 1a5122f1756ef4fc5779324ad26b6a04142166b5 Mon Sep 17 00:00:00 2001 From: Annaliese McDermond Date: Fri, 21 Jun 2019 03:52:50 -0700 -Subject: [PATCH 696/806] i2c: bcm2835: Ensure clock exists when probing +Subject: [PATCH] i2c: bcm2835: Ensure clock exists when probing Commit 9de93b04df16b055824e3f1f13fedb90fbcf2e4f upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0697-overlays-i2c-gpio-Fix-the-bus-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0697-overlays-i2c-gpio-Fix-the-bus-parameter.patch rename to target/linux/brcm2708/patches-4.19/950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch index 32c19a5412..9a6d15506e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0697-overlays-i2c-gpio-Fix-the-bus-parameter.patch +++ b/target/linux/brcm2708/patches-4.19/950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch @@ -1,7 +1,7 @@ From d562b2187263b40aacc1a50d3f25db2cf28696d6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 9 Jul 2019 10:32:40 +0100 -Subject: [PATCH 697/806] overlays: i2c-gpio: Fix the "bus" parameter +Subject: [PATCH] overlays: i2c-gpio: Fix the "bus" parameter The "bus" parameter has two functions - providing unique names for multiple instances of the overlay, and allowing the number of the bus diff --git a/target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/brcm2708/patches-4.19/950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch rename to target/linux/brcm2708/patches-4.19/950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch index 6b7ab56859..8d40afb444 100644 --- a/target/linux/brcm2708/patches-4.19/950-0698-tty-amba-pl011-Make-TX-optimisation-conditional.patch +++ b/target/linux/brcm2708/patches-4.19/950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch @@ -1,7 +1,7 @@ From 3e3c13488e4efa0236c47a98ee5e759bf1f7c757 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jul 2019 13:13:39 +0100 -Subject: [PATCH 698/806] tty: amba-pl011: Make TX optimisation conditional +Subject: [PATCH] tty: amba-pl011: Make TX optimisation conditional pl011_tx_chars takes a "from_irq" parameter to reduce the number of register accesses. When from_irq is true the function assumes that the diff --git a/target/linux/brcm2708/patches-4.19/950-0699-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/brcm2708/patches-4.19/950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0699-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch rename to target/linux/brcm2708/patches-4.19/950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index becbe1502e..3e413c7d00 100644 --- a/target/linux/brcm2708/patches-4.19/950-0699-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/brcm2708/patches-4.19/950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -1,7 +1,7 @@ From 705bc230789927f96d6c9c70dc5475ebaf08aa54 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 11 Jul 2019 17:55:43 +0100 -Subject: [PATCH 699/806] xhci: add quirk for host controllers that don't +Subject: [PATCH] xhci: add quirk for host controllers that don't update endpoint DCS Seen on a VLI VL805 PCIe to USB controller. For non-stream endpoints diff --git a/target/linux/brcm2708/patches-4.19/950-0700-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch b/target/linux/brcm2708/patches-4.19/950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0700-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch rename to target/linux/brcm2708/patches-4.19/950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch index cd2394d23e..280cddf9f2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0700-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch @@ -1,7 +1,7 @@ From 8d453e2193951057db696e37b9c10e7e35c18cb0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Jul 2019 15:38:35 +0100 -Subject: [PATCH 700/806] i2c: bcm2835: Set clock-stretch timeout to 35ms +Subject: [PATCH] i2c: bcm2835: Set clock-stretch timeout to 35ms The BCM2835 I2C blocks have a register to set the clock-stretch timeout - how long the device is allowed to hold SCL low - in bus diff --git a/target/linux/brcm2708/patches-4.19/950-0701-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch b/target/linux/brcm2708/patches-4.19/950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0701-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch rename to target/linux/brcm2708/patches-4.19/950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch index f6befd75aa..c82ac8d61d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0701-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch +++ b/target/linux/brcm2708/patches-4.19/950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch @@ -1,7 +1,7 @@ From 39964e4a3a2ea18b48be5c31d7980895f0bdd99c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 8 Mar 2019 13:02:16 -0800 -Subject: [PATCH 701/806] arm64: bcm2835: Add missing dependency on MFD_CORE. +Subject: [PATCH] arm64: bcm2835: Add missing dependency on MFD_CORE. commit 7a9b6be9fe58194d9a349159176e8cc0d8f10ef8 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0702-overlays-Add-PCF2129-RTC.patch b/target/linux/brcm2708/patches-4.19/950-0642-overlays-Add-PCF2129-RTC.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0702-overlays-Add-PCF2129-RTC.patch rename to target/linux/brcm2708/patches-4.19/950-0642-overlays-Add-PCF2129-RTC.patch index 9eaa75ac50..7bddfdc6aa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0702-overlays-Add-PCF2129-RTC.patch +++ b/target/linux/brcm2708/patches-4.19/950-0642-overlays-Add-PCF2129-RTC.patch @@ -1,7 +1,7 @@ From 2308f60bb68de69306c542de3983be0007cad37b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 15 Jul 2019 10:39:05 +0100 -Subject: [PATCH 702/806] overlays: Add PCF2129 RTC +Subject: [PATCH] overlays: Add PCF2129 RTC Add support for the PCF2129 RTC to i2c-rtc and i2c-rtc-gpio overlays. Also add rv3028 to i2c-rtc-gpio (it was missed previously), and don't diff --git a/target/linux/brcm2708/patches-4.19/950-0704-overlays-dpi18-and-dpi24-vc4-compatibility.patch b/target/linux/brcm2708/patches-4.19/950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0704-overlays-dpi18-and-dpi24-vc4-compatibility.patch rename to target/linux/brcm2708/patches-4.19/950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch index 8b3c75c4de..0b3e8ec079 100644 --- a/target/linux/brcm2708/patches-4.19/950-0704-overlays-dpi18-and-dpi24-vc4-compatibility.patch +++ b/target/linux/brcm2708/patches-4.19/950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch @@ -1,7 +1,7 @@ From a5e0d604116189331d5608c9d128f37df17db2e3 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 16 Jul 2019 15:24:12 +0100 -Subject: [PATCH 704/806] overlays: dpi18 and dpi24 vc4 compatibility +Subject: [PATCH] overlays: dpi18 and dpi24 vc4 compatibility The dpi overlays use the fb device tree node as a place to hang the necessary pinctrl changes. With one of the VC4 overlays loaded, the diff --git a/target/linux/brcm2708/patches-4.19/950-0705-overlays-Add-i2c0-and-i2c1-for-regularity.patch b/target/linux/brcm2708/patches-4.19/950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0705-overlays-Add-i2c0-and-i2c1-for-regularity.patch rename to target/linux/brcm2708/patches-4.19/950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch index ba5383c86b..5b2c17bed7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0705-overlays-Add-i2c0-and-i2c1-for-regularity.patch +++ b/target/linux/brcm2708/patches-4.19/950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch @@ -1,7 +1,7 @@ From 9c0f4b3e3b197d5c81f4bd6679f2c2456ab45c9e Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 17 Jul 2019 10:08:55 +0100 -Subject: [PATCH 705/806] overlays: Add i2c0 and i2c1 for regularity +Subject: [PATCH] overlays: Add i2c0 and i2c1 for regularity The new i2c overlays for pi4 (i2c3, i2c4, i2c5, i2c6) have a standardised interface that allows pin groups to be chosen diff --git a/target/linux/brcm2708/patches-4.19/950-0706-Pisound-Remove-spinlock-usage-around-spi_sync.patch b/target/linux/brcm2708/patches-4.19/950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0706-Pisound-Remove-spinlock-usage-around-spi_sync.patch rename to target/linux/brcm2708/patches-4.19/950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch index 50803008e6..5dee4cb1d1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0706-Pisound-Remove-spinlock-usage-around-spi_sync.patch +++ b/target/linux/brcm2708/patches-4.19/950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch @@ -1,7 +1,7 @@ From ace4e8240d581e6053f0165b2682a2db745d49dc Mon Sep 17 00:00:00 2001 From: Giedrius Date: Fri, 12 Jul 2019 17:45:55 +0300 -Subject: [PATCH 706/806] Pisound: Remove spinlock usage around spi_sync +Subject: [PATCH] Pisound: Remove spinlock usage around spi_sync --- sound/soc/bcm/pisound.c | 5 ----- diff --git a/target/linux/brcm2708/patches-4.19/950-0707-arm64-mm-Limit-the-DMA-zone-for-arm64.patch b/target/linux/brcm2708/patches-4.19/950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0707-arm64-mm-Limit-the-DMA-zone-for-arm64.patch rename to target/linux/brcm2708/patches-4.19/950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch index 1715165b68..41261cd0d1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0707-arm64-mm-Limit-the-DMA-zone-for-arm64.patch +++ b/target/linux/brcm2708/patches-4.19/950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch @@ -1,7 +1,7 @@ From 2722f08c4c59901bd506184e2dcbbbd532aef0b3 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 16 Jul 2019 13:28:22 +0100 -Subject: [PATCH 707/806] arm64/mm: Limit the DMA zone for arm64 +Subject: [PATCH] arm64/mm: Limit the DMA zone for arm64 On RaspberryPi, only the first 1Gb can be used for DMA[1]. diff --git a/target/linux/brcm2708/patches-4.19/950-0710-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch b/target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0710-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch rename to target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch index af49437cc2..00d0252deb 100644 --- a/target/linux/brcm2708/patches-4.19/950-0710-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch +++ b/target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch @@ -1,7 +1,7 @@ From 5620f5eda349027a6e00e23391bc59617d25b449 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 3 Jul 2019 17:44:53 +0100 -Subject: [PATCH 710/806] drm/vc4: Query firmware for custom HDMI mode +Subject: [PATCH] drm/vc4: Query firmware for custom HDMI mode Allow custom HDMI modes to be specified from config.txt, and these then override EDID parsing. diff --git a/target/linux/brcm2708/patches-4.19/950-0711-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch b/target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0711-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch rename to target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch index ec8a468d63..9f5b9e14a0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0711-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch +++ b/target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch @@ -1,7 +1,7 @@ From 2c0bfade955e4e660941db287020d06c9e22267f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 15:12:05 +0100 -Subject: [PATCH 711/806] drm/vc4: Pass the drm vrefresh to the firmware on +Subject: [PATCH] drm/vc4: Pass the drm vrefresh to the firmware on mode set More for completeness than need, but use drm_mode_vrefresh diff --git a/target/linux/brcm2708/patches-4.19/950-0712-overlays-audremap-Support-GPIOs-18-19.patch b/target/linux/brcm2708/patches-4.19/950-0649-overlays-audremap-Support-GPIOs-18-19.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0712-overlays-audremap-Support-GPIOs-18-19.patch rename to target/linux/brcm2708/patches-4.19/950-0649-overlays-audremap-Support-GPIOs-18-19.patch index a14a603f8c..667e104b47 100644 --- a/target/linux/brcm2708/patches-4.19/950-0712-overlays-audremap-Support-GPIOs-18-19.patch +++ b/target/linux/brcm2708/patches-4.19/950-0649-overlays-audremap-Support-GPIOs-18-19.patch @@ -1,7 +1,7 @@ From f42cc245e1f3e586f1a26550e5760489b6c329ab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Jul 2019 12:55:07 +0100 -Subject: [PATCH 712/806] overlays: audremap: Support GPIOs 18 & 19 +Subject: [PATCH] overlays: audremap: Support GPIOs 18 & 19 PWM audio can also be used on GPIOs 18 and 19, so add the pins_18_19 parameter to select that location. pins_12_13 explicitly chooses GPIOs diff --git a/target/linux/brcm2708/patches-4.19/950-0713-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch b/target/linux/brcm2708/patches-4.19/950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0713-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch rename to target/linux/brcm2708/patches-4.19/950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch index 7ab0f36c3b..8cc04b78d9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0713-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch +++ b/target/linux/brcm2708/patches-4.19/950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch @@ -1,7 +1,7 @@ From ce5c3d732efb5e3da50119ed876f0d6661f08b84 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 6 Dec 2018 15:24:35 +0100 -Subject: [PATCH 713/806] drm/connector: Fix drm_mode_create_tv_properties() +Subject: [PATCH] drm/connector: Fix drm_mode_create_tv_properties() doc Commit eda6887f1961e0d2fb866b1a520b2de5b3828de5 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0714-drm-connector-Clarify-the-unit-of-TV-margins.patch b/target/linux/brcm2708/patches-4.19/950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0714-drm-connector-Clarify-the-unit-of-TV-margins.patch rename to target/linux/brcm2708/patches-4.19/950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch index 04d022ab11..85b56a3511 100644 --- a/target/linux/brcm2708/patches-4.19/950-0714-drm-connector-Clarify-the-unit-of-TV-margins.patch +++ b/target/linux/brcm2708/patches-4.19/950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch @@ -1,7 +1,7 @@ From 4589a8a086094061e7476d41578e31349accc190 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 6 Dec 2018 15:24:36 +0100 -Subject: [PATCH 714/806] drm/connector: Clarify the unit of TV margins +Subject: [PATCH] drm/connector: Clarify the unit of TV margins Commit 56406e15b5e83256151ef74eb1a219cbf13d91c8 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0715-drm-connector-Allow-creation-of-margin-props-alone.patch b/target/linux/brcm2708/patches-4.19/950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0715-drm-connector-Allow-creation-of-margin-props-alone.patch rename to target/linux/brcm2708/patches-4.19/950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch index c048f26241..1b242f46e3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0715-drm-connector-Allow-creation-of-margin-props-alone.patch +++ b/target/linux/brcm2708/patches-4.19/950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch @@ -1,7 +1,7 @@ From 4f2277b18d6bbb6fac50b751c4e513619849b23c Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 6 Dec 2018 15:24:37 +0100 -Subject: [PATCH 715/806] drm/connector: Allow creation of margin props alone +Subject: [PATCH] drm/connector: Allow creation of margin props alone Commit 6c4f52dca36f5e3e2354c30591d38e92f4657ed9 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0716-drm-vc4-Take-margin-setup-into-account-when-updating.patch b/target/linux/brcm2708/patches-4.19/950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0716-drm-vc4-Take-margin-setup-into-account-when-updating.patch rename to target/linux/brcm2708/patches-4.19/950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch index 22b909efe8..a50be7a986 100644 --- a/target/linux/brcm2708/patches-4.19/950-0716-drm-vc4-Take-margin-setup-into-account-when-updating.patch +++ b/target/linux/brcm2708/patches-4.19/950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch @@ -1,7 +1,7 @@ From 0d592a7685e41d0bb1816a4fedb11d3570474417 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 6 Dec 2018 15:24:38 +0100 -Subject: [PATCH 716/806] drm/vc4: Take margin setup into account when updating +Subject: [PATCH] drm/vc4: Take margin setup into account when updating planes Commit 666e73587f90f42d90385c1bea1009a650bf73f4 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0717-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch b/target/linux/brcm2708/patches-4.19/950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0717-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch rename to target/linux/brcm2708/patches-4.19/950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch index 4aa19c59c7..906caba71e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0717-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch +++ b/target/linux/brcm2708/patches-4.19/950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch @@ -1,7 +1,7 @@ From efd1df5cd92e4436f863730f666117494613693b Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 6 Dec 2018 15:24:39 +0100 -Subject: [PATCH 717/806] drm/vc4: Attach margin props to the HDMI connector +Subject: [PATCH] drm/vc4: Attach margin props to the HDMI connector Commit db999538fdb0679629d90652f8a1437df1e85a7d upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0718-drm-vc4-Add-support-for-margins-to-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0718-drm-vc4-Add-support-for-margins-to-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch index 1e937cdd89..12f1606db0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0718-drm-vc4-Add-support-for-margins-to-fkms.patch +++ b/target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch @@ -1,7 +1,7 @@ From a4e8051901a5d858a69732a3f9734835afc00af5 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 15:35:13 +0100 -Subject: [PATCH 718/806] drm/vc4: Add support for margins to fkms +Subject: [PATCH] drm/vc4: Add support for margins to fkms Allows for overscan to be configured under FKMS. NB This is rescaling the planes, not reducing the size of the diff --git a/target/linux/brcm2708/patches-4.19/950-0719-drm-vc4-Ensure-zpos-is-always-initialised.patch b/target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0719-drm-vc4-Ensure-zpos-is-always-initialised.patch rename to target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch index 2eba1bdd42..bd13a32d2f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0719-drm-vc4-Ensure-zpos-is-always-initialised.patch +++ b/target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch @@ -1,7 +1,7 @@ From cf80e05ebb55c121c1567ac42b9e1a885fc346a3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 19 Jul 2019 17:49:00 +0100 -Subject: [PATCH 719/806] drm/vc4: Ensure zpos is always initialised +Subject: [PATCH] drm/vc4: Ensure zpos is always initialised The compiler is warning that default_zpos can be used uninitialised as there is no default case to catch all plane diff --git a/target/linux/brcm2708/patches-4.19/950-0720-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch b/target/linux/brcm2708/patches-4.19/950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0720-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch rename to target/linux/brcm2708/patches-4.19/950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch index d850ca7512..553c16c9dd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0720-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch +++ b/target/linux/brcm2708/patches-4.19/950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch @@ -1,7 +1,7 @@ From a78d4d81c585a5de61e7fc7d574e6e3f769c18a6 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 24 Jul 2019 14:36:53 +0100 -Subject: [PATCH 720/806] dts: bcm2838: add missing properties for pmu and gic +Subject: [PATCH] dts: bcm2838: add missing properties for pmu and gic nodes The GIC has a virtual interface maintenance interrupt and the PMU diff --git a/target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch b/target/linux/brcm2708/patches-4.19/950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch rename to target/linux/brcm2708/patches-4.19/950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch index 2e52e9c0eb..427053d2dc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0721-adds-the-Hifiberry-DAC-ADC-PRO-version.patch +++ b/target/linux/brcm2708/patches-4.19/950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch @@ -1,7 +1,7 @@ From bab5f8832c6b2859caea1cb5af1ffcb6276c2f74 Mon Sep 17 00:00:00 2001 From: Joerg Schambacher Date: Tue, 23 Jul 2019 16:57:35 +0200 -Subject: [PATCH 721/806] adds the Hifiberry DAC+ADC PRO version +Subject: [PATCH] adds the Hifiberry DAC+ADC PRO version This adds the driver for the DAC+ADC PRO version of the Hifiberry soundcard with software controlled PCM1863 ADC Signed-off-by: Joerg Schambacher joerg@i2audio.com diff --git a/target/linux/brcm2708/patches-4.19/950-0722-codecs-Correct-Katana-minimum-volume.patch b/target/linux/brcm2708/patches-4.19/950-0659-codecs-Correct-Katana-minimum-volume.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0722-codecs-Correct-Katana-minimum-volume.patch rename to target/linux/brcm2708/patches-4.19/950-0659-codecs-Correct-Katana-minimum-volume.patch index 0ec68610dc..fca281014e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0722-codecs-Correct-Katana-minimum-volume.patch +++ b/target/linux/brcm2708/patches-4.19/950-0659-codecs-Correct-Katana-minimum-volume.patch @@ -1,7 +1,7 @@ From 43866e3396623775215943f3062a98c642fcae95 Mon Sep 17 00:00:00 2001 From: allo-com Date: Mon, 29 Jul 2019 15:06:57 +0530 -Subject: [PATCH 722/806] codecs: Correct Katana minimum volume +Subject: [PATCH] codecs: Correct Katana minimum volume Update Katana minimum volume to get the exact 0.5 dB value in each step. diff --git a/target/linux/brcm2708/patches-4.19/950-0723-drm-vc4-A-present-but-empty-dmas-disables-audio.patch b/target/linux/brcm2708/patches-4.19/950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0723-drm-vc4-A-present-but-empty-dmas-disables-audio.patch rename to target/linux/brcm2708/patches-4.19/950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch index b84ed733a7..2d38456ae6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0723-drm-vc4-A-present-but-empty-dmas-disables-audio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch @@ -1,7 +1,7 @@ From 8befbf55f2668a4dae739588ed3c0b0d06fccacd Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:36:34 +0100 -Subject: [PATCH 723/806] drm/vc4: A present but empty dmas disables audio +Subject: [PATCH] drm/vc4: A present but empty dmas disables audio Overlays are unable to remove properties in the base DTB, but they can overwrite them. Allow a present but empty 'dmas' property diff --git a/target/linux/brcm2708/patches-4.19/950-0724-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch b/target/linux/brcm2708/patches-4.19/950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0724-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch rename to target/linux/brcm2708/patches-4.19/950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch index 5394faa1cc..a70d50eecd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0724-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch +++ b/target/linux/brcm2708/patches-4.19/950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch @@ -1,7 +1,7 @@ From 418ca5973ad807f9d7f99e68af2bd21c7e8baa4d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:39:37 +0100 -Subject: [PATCH 724/806] overlays: Add audio parameter to vc4-kms-v3d +Subject: [PATCH] overlays: Add audio parameter to vc4-kms-v3d The audio parameter to the vc4-kms-v3d overlay allows audio support to be disabled (it defaults to on) by adding "audio=off" to the diff --git a/target/linux/brcm2708/patches-4.19/950-0725-overlays-Update-the-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0662-overlays-Update-the-upstream-overlay.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0725-overlays-Update-the-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0662-overlays-Update-the-upstream-overlay.patch index 7bd6f9cfc1..6cec8140f0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0725-overlays-Update-the-upstream-overlay.patch +++ b/target/linux/brcm2708/patches-4.19/950-0662-overlays-Update-the-upstream-overlay.patch @@ -1,7 +1,7 @@ From a14162d8da62fb570df916d7386febe51d6ed2bc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 31 Jul 2019 17:41:47 +0100 -Subject: [PATCH 725/806] overlays: Update the upstream overlay +Subject: [PATCH] overlays: Update the upstream overlay The recent vc4-kms-v3d commit has changed the content of the upstream overlay (even though the extra fragment is disabled). diff --git a/target/linux/brcm2708/patches-4.19/950-0727-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch b/target/linux/brcm2708/patches-4.19/950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0727-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch rename to target/linux/brcm2708/patches-4.19/950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch index cf29f5b4dc..2626658d16 100644 --- a/target/linux/brcm2708/patches-4.19/950-0727-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch @@ -1,7 +1,7 @@ From c2957d7709a43c81e5345d537feaa6980ffcc1a4 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Mon, 29 Jul 2019 12:02:59 +0100 -Subject: [PATCH 727/806] Fixup FKMS interrupt handing for non-existent display +Subject: [PATCH] Fixup FKMS interrupt handing for non-existent display If an errant interrupt flag was received from a non-existent display, a NULL pointer access was made. Protect against this by checking if a diff --git a/target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch b/target/linux/brcm2708/patches-4.19/950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch rename to target/linux/brcm2708/patches-4.19/950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch index 1436038cf8..92ecf120ba 100644 --- a/target/linux/brcm2708/patches-4.19/950-0728-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch +++ b/target/linux/brcm2708/patches-4.19/950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch @@ -1,7 +1,7 @@ From 6c8c9ca56ce6039ade09d26c069132538e4de9f0 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sun, 28 Jul 2019 22:22:36 +0100 -Subject: [PATCH 728/806] drivers: char: Use correct name for the Raspberry Pi +Subject: [PATCH] drivers: char: Use correct name for the Raspberry Pi video decoder Replace the old code name with a more appropriate name - RPiVid. diff --git a/target/linux/brcm2708/patches-4.19/950-0729-driver-char-rpivid-also-support-legacy-name.patch b/target/linux/brcm2708/patches-4.19/950-0665-driver-char-rpivid-also-support-legacy-name.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0729-driver-char-rpivid-also-support-legacy-name.patch rename to target/linux/brcm2708/patches-4.19/950-0665-driver-char-rpivid-also-support-legacy-name.patch index cffd29eda1..34dd24208c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0729-driver-char-rpivid-also-support-legacy-name.patch +++ b/target/linux/brcm2708/patches-4.19/950-0665-driver-char-rpivid-also-support-legacy-name.patch @@ -1,7 +1,7 @@ From 80c20ff00542b050733780ae6088e50663ee8d78 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 29 Jul 2019 12:03:21 +0100 -Subject: [PATCH 729/806] driver: char: rpivid - also support legacy name +Subject: [PATCH] driver: char: rpivid - also support legacy name Provide transitional support for the previous names of the character devices. diff --git a/target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/brcm2708/patches-4.19/950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch rename to target/linux/brcm2708/patches-4.19/950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 051399fc04..8c00945122 100644 --- a/target/linux/brcm2708/patches-4.19/950-0730-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/brcm2708/patches-4.19/950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -1,7 +1,7 @@ From 16c1e20b50e121f836f434bb6c22c73e2f51d29f Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Thu, 1 Aug 2019 16:41:20 +0100 -Subject: [PATCH 730/806] hid: usb: Add device quirks for Freeway Airmouse T3 +Subject: [PATCH] hid: usb: Add device quirks for Freeway Airmouse T3 and MX3 These wireless mouse/keyboard combo remote control devices specify diff --git a/target/linux/brcm2708/patches-4.19/950-0731-drm-vc4-Add-Broadcast-RGB-connector-property.patch b/target/linux/brcm2708/patches-4.19/950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0731-drm-vc4-Add-Broadcast-RGB-connector-property.patch rename to target/linux/brcm2708/patches-4.19/950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch index 2d1f9b9643..26da5d94f2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0731-drm-vc4-Add-Broadcast-RGB-connector-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch @@ -1,7 +1,7 @@ From b96e24487cc48a2cb593f27c24074087a21de848 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 14 Jun 2019 10:12:07 +0100 -Subject: [PATCH 731/806] drm/vc4: Add "Broadcast RGB" connector property +Subject: [PATCH] drm/vc4: Add "Broadcast RGB" connector property Some HDMI monitors do not abide by the full or limited (16-235) range RGB flags in the AVI infoframe. This can diff --git a/target/linux/brcm2708/patches-4.19/950-0732-drm-connector-Add-documentation-for-drm_cmdline_mode.patch b/target/linux/brcm2708/patches-4.19/950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0732-drm-connector-Add-documentation-for-drm_cmdline_mode.patch rename to target/linux/brcm2708/patches-4.19/950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch index 215b944d59..16b84bc037 100644 --- a/target/linux/brcm2708/patches-4.19/950-0732-drm-connector-Add-documentation-for-drm_cmdline_mode.patch +++ b/target/linux/brcm2708/patches-4.19/950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch @@ -1,7 +1,7 @@ From 7c0f4f4d81958f63abf696e71b342e8b75a6e530 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:48 +0200 -Subject: [PATCH 732/806] drm/connector: Add documentation for drm_cmdline_mode +Subject: [PATCH] drm/connector: Add documentation for drm_cmdline_mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0733-drm-modes-Rewrite-the-command-line-parser.patch b/target/linux/brcm2708/patches-4.19/950-0669-drm-modes-Rewrite-the-command-line-parser.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0733-drm-modes-Rewrite-the-command-line-parser.patch rename to target/linux/brcm2708/patches-4.19/950-0669-drm-modes-Rewrite-the-command-line-parser.patch index 1c0e2d372c..24c25d6944 100644 --- a/target/linux/brcm2708/patches-4.19/950-0733-drm-modes-Rewrite-the-command-line-parser.patch +++ b/target/linux/brcm2708/patches-4.19/950-0669-drm-modes-Rewrite-the-command-line-parser.patch @@ -1,7 +1,7 @@ From 3508a8548f13be68b6d098ad99a7bc1fc1810f76 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:49 +0200 -Subject: [PATCH 733/806] drm/modes: Rewrite the command line parser +Subject: [PATCH] drm/modes: Rewrite the command line parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0734-drm-modes-Support-modes-names-on-the-command-line.patch b/target/linux/brcm2708/patches-4.19/950-0670-drm-modes-Support-modes-names-on-the-command-line.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0734-drm-modes-Support-modes-names-on-the-command-line.patch rename to target/linux/brcm2708/patches-4.19/950-0670-drm-modes-Support-modes-names-on-the-command-line.patch index 0ab7cd2abb..aee684a955 100644 --- a/target/linux/brcm2708/patches-4.19/950-0734-drm-modes-Support-modes-names-on-the-command-line.patch +++ b/target/linux/brcm2708/patches-4.19/950-0670-drm-modes-Support-modes-names-on-the-command-line.patch @@ -1,7 +1,7 @@ From 2cea4924c69b6be5cfe8d976810ccf76a3991230 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:50 +0200 -Subject: [PATCH 734/806] drm/modes: Support modes names on the command line +Subject: [PATCH] drm/modes: Support modes names on the command line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0735-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch b/target/linux/brcm2708/patches-4.19/950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0735-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch rename to target/linux/brcm2708/patches-4.19/950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch index aeb60d182b..f9ba856c44 100644 --- a/target/linux/brcm2708/patches-4.19/950-0735-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch +++ b/target/linux/brcm2708/patches-4.19/950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch @@ -1,7 +1,7 @@ From 5a8ccd79b6bad32e52620a94199bf1af2e19708e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:51 +0200 -Subject: [PATCH 735/806] drm/modes: Allow to specify rotation and reflection +Subject: [PATCH] drm/modes: Allow to specify rotation and reflection on the commandline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/target/linux/brcm2708/patches-4.19/950-0736-drm-connector-Introduce-a-TV-margins-structure.patch b/target/linux/brcm2708/patches-4.19/950-0672-drm-connector-Introduce-a-TV-margins-structure.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0736-drm-connector-Introduce-a-TV-margins-structure.patch rename to target/linux/brcm2708/patches-4.19/950-0672-drm-connector-Introduce-a-TV-margins-structure.patch index ee4cc20b92..7c6f415402 100644 --- a/target/linux/brcm2708/patches-4.19/950-0736-drm-connector-Introduce-a-TV-margins-structure.patch +++ b/target/linux/brcm2708/patches-4.19/950-0672-drm-connector-Introduce-a-TV-margins-structure.patch @@ -1,7 +1,7 @@ From 6261047a83258900e57a0a699ec7954360c6e7f3 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:51 +0200 -Subject: [PATCH 736/806] drm/connector: Introduce a TV margins structure +Subject: [PATCH] drm/connector: Introduce a TV margins structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0737-drm-modes-Parse-overscan-properties.patch b/target/linux/brcm2708/patches-4.19/950-0673-drm-modes-Parse-overscan-properties.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0737-drm-modes-Parse-overscan-properties.patch rename to target/linux/brcm2708/patches-4.19/950-0673-drm-modes-Parse-overscan-properties.patch index 9077034af6..f8de9b5fc3 100644 --- a/target/linux/brcm2708/patches-4.19/950-0737-drm-modes-Parse-overscan-properties.patch +++ b/target/linux/brcm2708/patches-4.19/950-0673-drm-modes-Parse-overscan-properties.patch @@ -1,7 +1,7 @@ From 99b367ee521e48beae92bea59515dd0f08f2e55b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:51 +0200 -Subject: [PATCH 737/806] drm/modes: Parse overscan properties +Subject: [PATCH] drm/modes: Parse overscan properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0738-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch b/target/linux/brcm2708/patches-4.19/950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0738-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch rename to target/linux/brcm2708/patches-4.19/950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch index cc02184516..9f509437d8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0738-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch +++ b/target/linux/brcm2708/patches-4.19/950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch @@ -1,7 +1,7 @@ From 8dd1e4d73fdbc4a533a58c2c74a72877257c558c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:52 +0200 -Subject: [PATCH 738/806] drm/atomic: Add a function to reset connector TV +Subject: [PATCH] drm/atomic: Add a function to reset connector TV properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/target/linux/brcm2708/patches-4.19/950-0739-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch b/target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0739-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch rename to target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch index 9ee07712f5..b1b554ed52 100644 --- a/target/linux/brcm2708/patches-4.19/950-0739-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch +++ b/target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch @@ -1,7 +1,7 @@ From 1adef5f9443f148db0817099504df0a7fb7350dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 19 Jun 2019 12:17:53 +0200 -Subject: [PATCH 739/806] drm/vc4: hdmi: Set default state margin at reset +Subject: [PATCH] drm/vc4: hdmi: Set default state margin at reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0740-drm-vc4-fkms-Set-default-state-margin-at-reset.patch b/target/linux/brcm2708/patches-4.19/950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0740-drm-vc4-fkms-Set-default-state-margin-at-reset.patch rename to target/linux/brcm2708/patches-4.19/950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch index 649f36c3ea..c9e095f6e5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0740-drm-vc4-fkms-Set-default-state-margin-at-reset.patch +++ b/target/linux/brcm2708/patches-4.19/950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch @@ -1,7 +1,7 @@ From 2cf6bd979b0a5fdb179842308b1670691f6a2ce4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jul 2019 11:09:26 +0100 -Subject: [PATCH 740/806] drm/vc4: fkms: Set default state margin at reset +Subject: [PATCH] drm/vc4: fkms: Set default state margin at reset Now that the TV margins are properly parsed and filled into drm_cmdline_mode, we just need to initialise the first state at reset to diff --git a/target/linux/brcm2708/patches-4.19/950-0741-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch b/target/linux/brcm2708/patches-4.19/950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0741-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch rename to target/linux/brcm2708/patches-4.19/950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch index b7691f1b35..4cb0a543c0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0741-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch @@ -1,7 +1,7 @@ From 6eb9a89c28590203658c0ebcbf29d5b41eb8596a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 23 Jul 2019 14:10:31 +0100 -Subject: [PATCH 741/806] drm/modes: Don't apply cmdline's rotation if it +Subject: [PATCH] drm/modes: Don't apply cmdline's rotation if it wasn't specified Taken from the dri-devel mailing list (11/7/2019) to fixup the cmdline diff --git a/target/linux/brcm2708/patches-4.19/950-0743-staging-bcm2835-codec-switch-to-multi-planar-API.patch b/target/linux/brcm2708/patches-4.19/950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0743-staging-bcm2835-codec-switch-to-multi-planar-API.patch rename to target/linux/brcm2708/patches-4.19/950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch index f45dd0bb79..ce590c9645 100644 --- a/target/linux/brcm2708/patches-4.19/950-0743-staging-bcm2835-codec-switch-to-multi-planar-API.patch +++ b/target/linux/brcm2708/patches-4.19/950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch @@ -1,7 +1,7 @@ From cb053a15c5c23e775647d6b65fef4c378bf34b5b Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 18 Jul 2019 17:07:05 +0800 -Subject: [PATCH 743/806] staging: bcm2835-codec: switch to multi-planar API +Subject: [PATCH] staging: bcm2835-codec: switch to multi-planar API There are two APIs for mem2mem devices, the older single-planar API and the newer multi-planar one. Without making things overly complex, the diff --git a/target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch b/target/linux/brcm2708/patches-4.19/950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch rename to target/linux/brcm2708/patches-4.19/950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch index 372d17a812..cd19bc2573 100644 --- a/target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch +++ b/target/linux/brcm2708/patches-4.19/950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch @@ -1,7 +1,7 @@ From 1f524b04b040978e2d96380ff40c3e80feba49a5 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:13:30 +0800 -Subject: [PATCH 744/806] staging: bcm2835-codec: implement +Subject: [PATCH] staging: bcm2835-codec: implement V4L2_CID_MIN_BUFFERS_FOR_CAPTURE The stateful decoder specification shows an optional step for retrieving diff --git a/target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch b/target/linux/brcm2708/patches-4.19/950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch rename to target/linux/brcm2708/patches-4.19/950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch index a5202e826f..f7243f34b1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch +++ b/target/linux/brcm2708/patches-4.19/950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch @@ -1,7 +1,7 @@ From c369e173f9ff254ed3c3b9062e04917122e3536e Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 22 Jul 2019 22:20:55 +0800 -Subject: [PATCH 745/806] staging: bcm2835-codec: set device_caps in struct +Subject: [PATCH] staging: bcm2835-codec: set device_caps in struct video_device Instead of filling in the struct v4l2_capability device_caps diff --git a/target/linux/brcm2708/patches-4.19/950-0746-Add-HDMI1-facility-to-the-driver.patch b/target/linux/brcm2708/patches-4.19/950-0681-Add-HDMI1-facility-to-the-driver.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0746-Add-HDMI1-facility-to-the-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0681-Add-HDMI1-facility-to-the-driver.patch index eaa6318d3d..7594d16a41 100644 --- a/target/linux/brcm2708/patches-4.19/950-0746-Add-HDMI1-facility-to-the-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0681-Add-HDMI1-facility-to-the-driver.patch @@ -1,7 +1,7 @@ From 0a37470a112260ef1c9a016a400fdf1f8792eadc Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 16 Jul 2019 12:18:21 +0100 -Subject: [PATCH 746/806] Add HDMI1 facility to the driver. +Subject: [PATCH] Add HDMI1 facility to the driver. For generic ALSA, all you need is the bcm2835.h change, but have also added structures for IEC958 HDMI. Not sure how to diff --git a/target/linux/brcm2708/patches-4.19/950-0747-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch b/target/linux/brcm2708/patches-4.19/950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0747-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch rename to target/linux/brcm2708/patches-4.19/950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch index 6d8a803524..5ec631f7fd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0747-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch +++ b/target/linux/brcm2708/patches-4.19/950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch @@ -1,7 +1,7 @@ From 114845b6010b6e6a320804f2d86ab4d5dc5a06de Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 5 Aug 2019 14:17:14 +0100 -Subject: [PATCH 747/806] overlays: Add baudrate parameter to i2c3-i2c6 +Subject: [PATCH] overlays: Add baudrate parameter to i2c3-i2c6 The overlays for enabling the new BCM2711 I2C interfaces were lacking the means to configure the baud/clock rate. diff --git a/target/linux/brcm2708/patches-4.19/950-0749-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch b/target/linux/brcm2708/patches-4.19/950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0749-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch rename to target/linux/brcm2708/patches-4.19/950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch index a80cfba3e4..e88bfc6be8 100644 --- a/target/linux/brcm2708/patches-4.19/950-0749-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch @@ -1,7 +1,7 @@ From df276f0a5aa865c7926d9d148605d1a59d1d4fbb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:27:44 +0100 -Subject: [PATCH 749/806] drm/vc4: Resolve the vblank warnings on mode +Subject: [PATCH] drm/vc4: Resolve the vblank warnings on mode switching The details over when and how a driver is to service the diff --git a/target/linux/brcm2708/patches-4.19/950-0750-drm-vc4-Remove-unused-mode-variable.patch b/target/linux/brcm2708/patches-4.19/950-0684-drm-vc4-Remove-unused-mode-variable.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0750-drm-vc4-Remove-unused-mode-variable.patch rename to target/linux/brcm2708/patches-4.19/950-0684-drm-vc4-Remove-unused-mode-variable.patch index af6109b511..e12cac2c85 100644 --- a/target/linux/brcm2708/patches-4.19/950-0750-drm-vc4-Remove-unused-mode-variable.patch +++ b/target/linux/brcm2708/patches-4.19/950-0684-drm-vc4-Remove-unused-mode-variable.patch @@ -1,7 +1,7 @@ From b2f463facb358b917380683b5e86c5d1cb3db123 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jul 2019 17:34:29 +0100 -Subject: [PATCH 750/806] drm/vc4: Remove unused mode variable +Subject: [PATCH] drm/vc4: Remove unused mode variable "89d1376 drm/vc4: Add support for margins to fkms" removed the requirement for having the mode structure from vc4_plane_to_mb, diff --git a/target/linux/brcm2708/patches-4.19/950-0751-staging-bcm2835-codec-Expand-logging-on-format-setti.patch b/target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0751-staging-bcm2835-codec-Expand-logging-on-format-setti.patch rename to target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch index d36226a6b7..f74fc4b730 100644 --- a/target/linux/brcm2708/patches-4.19/950-0751-staging-bcm2835-codec-Expand-logging-on-format-setti.patch +++ b/target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch @@ -1,7 +1,7 @@ From 9a9ef8123467579c431ced1e98827364d66c615f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:57:09 +0100 -Subject: [PATCH 751/806] staging:bcm2835-codec: Expand logging on format +Subject: [PATCH] staging:bcm2835-codec: Expand logging on format setting Adds some more useful logging during format changed events and diff --git a/target/linux/brcm2708/patches-4.19/950-0752-staging-bcm2835-codec-Correct-bytesperline-on-format.patch b/target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0752-staging-bcm2835-codec-Correct-bytesperline-on-format.patch rename to target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch index 9625f9604d..96f3351c04 100644 --- a/target/linux/brcm2708/patches-4.19/950-0752-staging-bcm2835-codec-Correct-bytesperline-on-format.patch +++ b/target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch @@ -1,7 +1,7 @@ From bcb6e267ca61ce685ed2debc0cee327527cea20d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 11 Jul 2019 14:58:35 +0100 -Subject: [PATCH 752/806] staging: bcm2835-codec: Correct bytesperline on +Subject: [PATCH] staging: bcm2835-codec: Correct bytesperline on format changed The handling of format changed events incorrectly set bytesperline diff --git a/target/linux/brcm2708/patches-4.19/950-0753-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch b/target/linux/brcm2708/patches-4.19/950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0753-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch rename to target/linux/brcm2708/patches-4.19/950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch index 8d4effacdb..8a97747e17 100644 --- a/target/linux/brcm2708/patches-4.19/950-0753-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch +++ b/target/linux/brcm2708/patches-4.19/950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch @@ -1,7 +1,7 @@ From cbe5c2a67fb145b210652be20a84690e09e4eb25 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 7 Aug 2019 11:31:08 +0100 -Subject: [PATCH 753/806] drm/vc4: Add missing NULL check to +Subject: [PATCH] drm/vc4: Add missing NULL check to vc4_crtc_consume_event vc4_crtc_consume_event wasn't checking crtc->state->event was diff --git a/target/linux/brcm2708/patches-4.19/950-0755-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/brcm2708/patches-4.19/950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0755-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch rename to target/linux/brcm2708/patches-4.19/950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch index fbce45ed20..beeeb2f9f1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0755-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch +++ b/target/linux/brcm2708/patches-4.19/950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch @@ -1,7 +1,7 @@ From 103afc4641ab8d6587e981a5e3fda27427a8bf4b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 9 Aug 2019 08:51:43 +0100 -Subject: [PATCH 755/806] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail +Subject: [PATCH] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail Some combinations of Pi 4Bs and Ethernet switches don't reliably get a DCHP-assigned IP address, leaving the unit with a self=assigned 169.254 diff --git a/target/linux/brcm2708/patches-4.19/950-0756-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch b/target/linux/brcm2708/patches-4.19/950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0756-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch rename to target/linux/brcm2708/patches-4.19/950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch index 5854d1f51f..bffed9e856 100644 --- a/target/linux/brcm2708/patches-4.19/950-0756-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch +++ b/target/linux/brcm2708/patches-4.19/950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch @@ -1,7 +1,7 @@ From c1fffc2a7dbf7e59aaef36378fb14d1c3dc016a6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 3 Aug 2018 11:22:27 +0200 -Subject: [PATCH 756/806] drm/vc4: Fix TILE_Y_OFFSET definitions +Subject: [PATCH] drm/vc4: Fix TILE_Y_OFFSET definitions Y_OFFSET field starts at bit 8 not 7. diff --git a/target/linux/brcm2708/patches-4.19/950-0757-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch b/target/linux/brcm2708/patches-4.19/950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0757-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch rename to target/linux/brcm2708/patches-4.19/950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch index 34eb57c4d2..b1be6322f1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0757-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch +++ b/target/linux/brcm2708/patches-4.19/950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch @@ -1,7 +1,7 @@ From d0b90f9c68a96f2bee66d796cb33367d205e586a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 3 Aug 2018 11:22:28 +0200 -Subject: [PATCH 757/806] drm/vc4: Define missing PITCH0_SINK_PIX field +Subject: [PATCH] drm/vc4: Define missing PITCH0_SINK_PIX field This is needed to support X/Y negative placement of planes using T-format buffers. diff --git a/target/linux/brcm2708/patches-4.19/950-0758-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch b/target/linux/brcm2708/patches-4.19/950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0758-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch rename to target/linux/brcm2708/patches-4.19/950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch index fa0fa6b208..3ead02cbbf 100644 --- a/target/linux/brcm2708/patches-4.19/950-0758-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch +++ b/target/linux/brcm2708/patches-4.19/950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch @@ -1,7 +1,7 @@ From 2a98dc34696c6510a49a684eb56d3a9c2a150571 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 3 Aug 2018 11:22:29 +0200 -Subject: [PATCH 758/806] drm/vc4: Use drm_atomic_helper_check_plane_state() to +Subject: [PATCH] drm/vc4: Use drm_atomic_helper_check_plane_state() to simplify the logic drm_atomic_helper_check_plane_state() takes care of checking the diff --git a/target/linux/brcm2708/patches-4.19/950-0759-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch b/target/linux/brcm2708/patches-4.19/950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0759-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch rename to target/linux/brcm2708/patches-4.19/950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch index 20a543d762..9820c91d60 100644 --- a/target/linux/brcm2708/patches-4.19/950-0759-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch +++ b/target/linux/brcm2708/patches-4.19/950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch @@ -1,7 +1,7 @@ From 58a92eae6ed463c294381e72eefec701d23fcdaf Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 3 Aug 2018 11:22:30 +0200 -Subject: [PATCH 759/806] drm/vc4: Move ->offsets[] adjustment out of +Subject: [PATCH] adjustment out of setup_clipping_and_scaling() The offset adjustment depends on the framebuffer modified, so let's diff --git a/target/linux/brcm2708/patches-4.19/950-0760-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch b/target/linux/brcm2708/patches-4.19/950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0760-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch rename to target/linux/brcm2708/patches-4.19/950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch index 765ace65bb..6197d9076a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0760-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch @@ -1,7 +1,7 @@ From 010e3665babdf589e26e2fb098ac1f39e519c0f6 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 3 Aug 2018 11:22:31 +0200 -Subject: [PATCH 760/806] drm/vc4: Fix X/Y positioning of planes using T_TILES +Subject: [PATCH] drm/vc4: Fix X/Y positioning of planes using T_TILES modifier X/Y positioning of T-format buffers is quite tricky and the current diff --git a/target/linux/brcm2708/patches-4.19/950-0761-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch b/target/linux/brcm2708/patches-4.19/950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0761-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch rename to target/linux/brcm2708/patches-4.19/950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch index ef4da86e14..c9e779878b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0761-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch +++ b/target/linux/brcm2708/patches-4.19/950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch @@ -1,7 +1,7 @@ From 0e81807e647c5e12fd897f3d520252ea60de3ff9 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 15 Nov 2018 11:58:51 +0100 -Subject: [PATCH 761/806] drm/vc4: Fix NULL pointer dereference in the async +Subject: [PATCH] drm/vc4: Fix NULL pointer dereference in the async update path vc4_plane_atomic_async_update() calls vc4_plane_atomic_check() diff --git a/target/linux/brcm2708/patches-4.19/950-0764-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch b/target/linux/brcm2708/patches-4.19/950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0764-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch rename to target/linux/brcm2708/patches-4.19/950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch index 3434aec44d..daae20c0d5 100644 --- a/target/linux/brcm2708/patches-4.19/950-0764-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch +++ b/target/linux/brcm2708/patches-4.19/950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch @@ -1,7 +1,7 @@ From 188bd7c0085ac5b3d966aa899c6be644907157ea Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 12 Aug 2019 15:48:39 +0100 -Subject: [PATCH 764/806] ARM: dts: bcm2711-rpi-4-b: I2C aliases and pulls +Subject: [PATCH] ARM: dts: bcm2711-rpi-4-b: I2C aliases and pulls The I2C interface nodes need aliases to give them fixed bus numbers, and setting the pulls on the GPIOs (particularly 9-13) increases the diff --git a/target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/brcm2708/patches-4.19/950-0696-xhci-Use-more-event-ring-segment-table-entries.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch rename to target/linux/brcm2708/patches-4.19/950-0696-xhci-Use-more-event-ring-segment-table-entries.patch index e2bc7469fc..0949f97f62 100644 --- a/target/linux/brcm2708/patches-4.19/950-0765-xhci-Use-more-event-ring-segment-table-entries.patch +++ b/target/linux/brcm2708/patches-4.19/950-0696-xhci-Use-more-event-ring-segment-table-entries.patch @@ -1,7 +1,7 @@ From c2e02902a3b75b24306dac06cb6f75b683fa0267 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Tue, 13 Aug 2019 15:53:29 +0100 -Subject: [PATCH 765/806] xhci: Use more event ring segment table entries +Subject: [PATCH] xhci: Use more event ring segment table entries Users have reported log spam created by "Event Ring Full" xHC event TRBs. These are caused by interrupt latency in conjunction with a very diff --git a/target/linux/brcm2708/patches-4.19/950-0766-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch b/target/linux/brcm2708/patches-4.19/950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0766-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch rename to target/linux/brcm2708/patches-4.19/950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch index a2065c8261..fbfef019b0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0766-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch @@ -1,7 +1,7 @@ From 0c6190fa3cfeafd773b51b751a473d6775c23309 Mon Sep 17 00:00:00 2001 From: P33M <2474547+P33M@users.noreply.github.com> Date: Wed, 14 Aug 2019 14:35:50 +0100 -Subject: [PATCH 766/806] dwc_otg: use align_buf for small IN control transfers +Subject: [PATCH] dwc_otg: use align_buf for small IN control transfers (#3150) The hardware will do a 4-byte write to memory on any IN packet received diff --git a/target/linux/brcm2708/patches-4.19/950-0767-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch b/target/linux/brcm2708/patches-4.19/950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0767-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch rename to target/linux/brcm2708/patches-4.19/950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch index a8f0b0186b..c69a8ca16e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0767-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch @@ -1,7 +1,7 @@ From ccd23ce562e8223ba7c6acf7dcb7058ff89ff7ec Mon Sep 17 00:00:00 2001 From: yaroslavros Date: Wed, 14 Aug 2019 15:22:55 +0100 -Subject: [PATCH 767/806] Ported pcie-brcmstb bounce buffer implementation to +Subject: [PATCH] Ported pcie-brcmstb bounce buffer implementation to ARM64. (#3144) Ported pcie-brcmstb bounce buffer implementation to ARM64. diff --git a/target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch b/target/linux/brcm2708/patches-4.19/950-0699-configs-arm64-vcm2711-Enable-V3D.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch rename to target/linux/brcm2708/patches-4.19/950-0699-configs-arm64-vcm2711-Enable-V3D.patch index 339ba31a39..e09e57b6c4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0768-configs-arm64-vcm2711-Enable-V3D.patch +++ b/target/linux/brcm2708/patches-4.19/950-0699-configs-arm64-vcm2711-Enable-V3D.patch @@ -1,7 +1,7 @@ From 709962264bec8f8483df374da5e946c982348e87 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 15 Aug 2019 12:02:34 +0100 -Subject: [PATCH 768/806] configs: arm64/vcm2711: Enable V3D +Subject: [PATCH] configs: arm64/vcm2711: Enable V3D Enable the V3D driver, which depends on BCM2835_POWER. diff --git a/target/linux/brcm2708/patches-4.19/950-0769-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0769-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch rename to target/linux/brcm2708/patches-4.19/950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch index 1e3147f00e..d148696640 100644 --- a/target/linux/brcm2708/patches-4.19/950-0769-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch +++ b/target/linux/brcm2708/patches-4.19/950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch @@ -1,7 +1,7 @@ From ee24998ecaed3d03890a7a5e04dddb8c5d073e97 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Sat, 17 Aug 2019 19:47:30 +0100 -Subject: [PATCH 769/806] overlays: sc16ic752-i2c: Fix xtal parameter +Subject: [PATCH] overlays: sc16ic752-i2c: Fix xtal parameter The xtal parameter is targetting the wrong node - fix it. diff --git a/target/linux/brcm2708/patches-4.19/950-0770-vc-sm-cma-Fix-compatibility-ioctl.patch b/target/linux/brcm2708/patches-4.19/950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0770-vc-sm-cma-Fix-compatibility-ioctl.patch rename to target/linux/brcm2708/patches-4.19/950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch index fe67ab1e06..af453ec307 100644 --- a/target/linux/brcm2708/patches-4.19/950-0770-vc-sm-cma-Fix-compatibility-ioctl.patch +++ b/target/linux/brcm2708/patches-4.19/950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch @@ -1,7 +1,7 @@ From a24a0a621486b36bcdf5c5e0afb05a5d1dd30003 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 19 Aug 2019 15:45:20 +0100 -Subject: [PATCH 770/806] vc-sm-cma: Fix compatibility ioctl +Subject: [PATCH] vc-sm-cma: Fix compatibility ioctl This code path hasn't been used previously. Fixed up after testing with kodi on 32-bit userland and 64-bit kernel diff --git a/target/linux/brcm2708/patches-4.19/950-0772-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch b/target/linux/brcm2708/patches-4.19/950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch similarity index 96% rename from target/linux/brcm2708/patches-4.19/950-0772-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch rename to target/linux/brcm2708/patches-4.19/950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch index 01795ba0db..aabb005703 100644 --- a/target/linux/brcm2708/patches-4.19/950-0772-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch +++ b/target/linux/brcm2708/patches-4.19/950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch @@ -1,7 +1,7 @@ From ae6dba510ac29ef7b0e6c838fb1bcc8b9eb474b7 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Thu, 22 Aug 2019 22:31:37 +0000 -Subject: [PATCH 772/806] staging: bcm2835-codec: add support for +Subject: [PATCH] staging: bcm2835-codec: add support for V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME fixes #3171 diff --git a/target/linux/brcm2708/patches-4.19/950-0773-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch b/target/linux/brcm2708/patches-4.19/950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0773-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch rename to target/linux/brcm2708/patches-4.19/950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch index bf1b347aa1..3bdbb0b3aa 100644 --- a/target/linux/brcm2708/patches-4.19/950-0773-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch @@ -1,7 +1,7 @@ From 9a2eab654b11d27bcc5a32ebd374f6c9acc38ce4 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Fri, 23 Aug 2019 16:29:07 -0700 -Subject: [PATCH 773/806] staging: bcm2835-codec: remove unnecessary padding on +Subject: [PATCH] staging: bcm2835-codec: remove unnecessary padding on encoder input The ISP and ENCODE roles have the same underlying hardware. Neither requires vertical alignment. diff --git a/target/linux/brcm2708/patches-4.19/950-0774-arm-dts-add-missing-Raspberry-Pi-model-names.patch b/target/linux/brcm2708/patches-4.19/950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0774-arm-dts-add-missing-Raspberry-Pi-model-names.patch rename to target/linux/brcm2708/patches-4.19/950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch index e4593e8371..516e2a5147 100644 --- a/target/linux/brcm2708/patches-4.19/950-0774-arm-dts-add-missing-Raspberry-Pi-model-names.patch +++ b/target/linux/brcm2708/patches-4.19/950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch @@ -1,7 +1,7 @@ From ac6c4a17f6f7aeb977b04dd4dc7e801b7776499f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 29 Aug 2019 16:26:22 +0200 -Subject: [PATCH 774/806] arm: dts: add missing Raspberry Pi model names +Subject: [PATCH] arm: dts: add missing Raspberry Pi model names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/target/linux/brcm2708/patches-4.19/950-0776-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/brcm2708/patches-4.19/950-0705-arch-arm-Add-model-string-to-cpuinfo.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0776-arch-arm-Add-model-string-to-cpuinfo.patch rename to target/linux/brcm2708/patches-4.19/950-0705-arch-arm-Add-model-string-to-cpuinfo.patch index e298f85db1..cd33961de1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0776-arch-arm-Add-model-string-to-cpuinfo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0705-arch-arm-Add-model-string-to-cpuinfo.patch @@ -1,7 +1,7 @@ From d9f55647637be79ff42cb85497e43ca8b9a69a7b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:16:56 +0100 -Subject: [PATCH 776/806] arch/arm: Add model string to cpuinfo +Subject: [PATCH] arch/arm: Add model string to cpuinfo Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0777-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch b/target/linux/brcm2708/patches-4.19/950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0777-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch rename to target/linux/brcm2708/patches-4.19/950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch index 6ec99e3529..5e29b47e57 100644 --- a/target/linux/brcm2708/patches-4.19/950-0777-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch @@ -1,7 +1,7 @@ From aabfcb0abbc34ca5f3c4b4f872123166eca2e100 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 3 Sep 2019 18:17:25 +0100 -Subject: [PATCH 777/806] arch/arm64: Add Revision, Serial, Model to cpuinfo +Subject: [PATCH] arch/arm64: Add Revision, Serial, Model to cpuinfo Signed-off-by: Phil Elwell --- diff --git a/target/linux/brcm2708/patches-4.19/950-0778-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch b/target/linux/brcm2708/patches-4.19/950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0778-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch rename to target/linux/brcm2708/patches-4.19/950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch index 5aecde540a..30fa9b3081 100644 --- a/target/linux/brcm2708/patches-4.19/950-0778-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch +++ b/target/linux/brcm2708/patches-4.19/950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch @@ -1,7 +1,7 @@ From 2d8a780a994098f7c532b712abd7298e0bca5a12 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:30 +0100 -Subject: [PATCH 778/806] media: dt-bindings: Add binding for the Sony IMX219 +Subject: [PATCH] media: dt-bindings: Add binding for the Sony IMX219 sensor The IMX219 is an 8MPix CSI2 sensor, supporting 2 or 4 data lanes. diff --git a/target/linux/brcm2708/patches-4.19/950-0779-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch b/target/linux/brcm2708/patches-4.19/950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0779-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch rename to target/linux/brcm2708/patches-4.19/950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch index be6430ea5e..70b9d54c4e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0779-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch +++ b/target/linux/brcm2708/patches-4.19/950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch @@ -1,7 +1,7 @@ From 2186344c6d83ccd169e16c048c8b43aff95545e2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:34:49 +0100 -Subject: [PATCH 779/806] media: i2c: Add driver for Sony IMX219 sensor +Subject: [PATCH] media: i2c: Add driver for Sony IMX219 sensor Adds a driver for the 8MPix Sony IMX219 CSI2 sensor. Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver diff --git a/target/linux/brcm2708/patches-4.19/950-0781-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch b/target/linux/brcm2708/patches-4.19/950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0781-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch rename to target/linux/brcm2708/patches-4.19/950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch index dca8481ec4..9be42a6a24 100644 --- a/target/linux/brcm2708/patches-4.19/950-0781-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch +++ b/target/linux/brcm2708/patches-4.19/950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch @@ -1,7 +1,7 @@ From 7a4d12054b24c8cb980be4c6466b50c14beb78d3 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 28 Aug 2019 13:35:19 +0100 -Subject: [PATCH 781/806] dtoverlays: Add overlay for the Sony IMX219 image +Subject: [PATCH] dtoverlays: Add overlay for the Sony IMX219 image sensor. Adds an overlay for the IMX219 image sensor, connected to the diff --git a/target/linux/brcm2708/patches-4.19/950-0782-staging-bcm2835-codec-Fix-non-documentation-comment-.patch b/target/linux/brcm2708/patches-4.19/950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0782-staging-bcm2835-codec-Fix-non-documentation-comment-.patch rename to target/linux/brcm2708/patches-4.19/950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch index 2f9cc38d01..116d16899c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0782-staging-bcm2835-codec-Fix-non-documentation-comment-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch @@ -1,7 +1,7 @@ From d4fc8b1d50522b416baeb1d1f5e5498000af5a7f Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Sun, 28 Apr 2019 12:15:35 +0200 -Subject: [PATCH 782/806] staging: bcm2835-codec: Fix non-documentation comment +Subject: [PATCH] staging: bcm2835-codec: Fix non-documentation comment block The job_ready comment is incorrectly using the documentation prefix diff --git a/target/linux/brcm2708/patches-4.19/950-0783-staging-bcm2835-codec-Fix-declaration-of-roles.patch b/target/linux/brcm2708/patches-4.19/950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch similarity index 91% rename from target/linux/brcm2708/patches-4.19/950-0783-staging-bcm2835-codec-Fix-declaration-of-roles.patch rename to target/linux/brcm2708/patches-4.19/950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch index 98bc159bc7..05ea839e00 100644 --- a/target/linux/brcm2708/patches-4.19/950-0783-staging-bcm2835-codec-Fix-declaration-of-roles.patch +++ b/target/linux/brcm2708/patches-4.19/950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch @@ -1,7 +1,7 @@ From 2d17824e8e5b2b6a6b830b8fe26c71a7d396f760 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:42:39 +0000 -Subject: [PATCH 783/806] staging: bcm2835-codec: Fix declaration of roles +Subject: [PATCH] staging: bcm2835-codec: Fix declaration of roles The static role text is declared incorrectly. The static should be first, and the roles should also be constified. diff --git a/target/linux/brcm2708/patches-4.19/950-0784-staging-bcm2835-codec-Add-role-to-device-name.patch b/target/linux/brcm2708/patches-4.19/950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0784-staging-bcm2835-codec-Add-role-to-device-name.patch rename to target/linux/brcm2708/patches-4.19/950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch index de7263ba64..4afdf8c698 100644 --- a/target/linux/brcm2708/patches-4.19/950-0784-staging-bcm2835-codec-Add-role-to-device-name.patch +++ b/target/linux/brcm2708/patches-4.19/950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch @@ -1,7 +1,7 @@ From ca613ed735fc52e68189d2ad0880f1007b931d78 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:55:43 +0000 -Subject: [PATCH 784/806] staging: bcm2835-codec: Add role to device name +Subject: [PATCH] staging: bcm2835-codec: Add role to device name Three entities are created, Decode, Encode and ISP but all of the video nodes use the same video name string "bcm2835-codec" which makes it diff --git a/target/linux/brcm2708/patches-4.19/950-0785-staging-bcm2835-codec-Pass-driver-context-to-create-.patch b/target/linux/brcm2708/patches-4.19/950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0785-staging-bcm2835-codec-Pass-driver-context-to-create-.patch rename to target/linux/brcm2708/patches-4.19/950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch index 514d1cc731..083e75b21f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0785-staging-bcm2835-codec-Pass-driver-context-to-create-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch @@ -1,7 +1,7 @@ From 9243f7de67345adfcac52198f78bd12cfebb6867 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 11:35:26 +0000 -Subject: [PATCH 785/806] staging: bcm2835-codec: Pass driver context to create +Subject: [PATCH] staging: bcm2835-codec: Pass driver context to create entities Pass the bcm2835_codec_driver driver context directly into the diff --git a/target/linux/brcm2708/patches-4.19/950-0786-staging-bcm2835-codec-add-media-controller-support.patch b/target/linux/brcm2708/patches-4.19/950-0714-staging-bcm2835-codec-add-media-controller-support.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0786-staging-bcm2835-codec-add-media-controller-support.patch rename to target/linux/brcm2708/patches-4.19/950-0714-staging-bcm2835-codec-add-media-controller-support.patch index c910bf1a87..a42fa7dfe1 100644 --- a/target/linux/brcm2708/patches-4.19/950-0786-staging-bcm2835-codec-add-media-controller-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0714-staging-bcm2835-codec-add-media-controller-support.patch @@ -1,7 +1,7 @@ From d1ceb85b7c6c7c3eec8b424e0172c29e93a570f2 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 12:54:15 +0000 -Subject: [PATCH 786/806] staging: bcm2835-codec: add media controller support +Subject: [PATCH] staging: bcm2835-codec: add media controller support Provide a single media device to contain all of the bcm2835_codec devices created. diff --git a/target/linux/brcm2708/patches-4.19/950-0787-media-bcm2835-unicam-Reduce-scope-of-local-function.patch b/target/linux/brcm2708/patches-4.19/950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0787-media-bcm2835-unicam-Reduce-scope-of-local-function.patch rename to target/linux/brcm2708/patches-4.19/950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch index 31567c0fce..1e9d4b445f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0787-media-bcm2835-unicam-Reduce-scope-of-local-function.patch +++ b/target/linux/brcm2708/patches-4.19/950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch @@ -1,7 +1,7 @@ From 4924b7b5517c9c334cf5faa3c7a29adf9a0c0ba1 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 28 Aug 2019 15:54:19 +0100 -Subject: [PATCH 787/806] media: bcm2835: unicam: Reduce scope of local +Subject: [PATCH] media: bcm2835: unicam: Reduce scope of local function unicam_start_rx() is not used outside of the unicam module. Its current diff --git a/target/linux/brcm2708/patches-4.19/950-0788-media-bcm2835-unicam-add-media-controller-support.patch b/target/linux/brcm2708/patches-4.19/950-0716-media-bcm2835-unicam-add-media-controller-support.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0788-media-bcm2835-unicam-add-media-controller-support.patch rename to target/linux/brcm2708/patches-4.19/950-0716-media-bcm2835-unicam-add-media-controller-support.patch index 2209841dc6..e84721258d 100644 --- a/target/linux/brcm2708/patches-4.19/950-0788-media-bcm2835-unicam-add-media-controller-support.patch +++ b/target/linux/brcm2708/patches-4.19/950-0716-media-bcm2835-unicam-add-media-controller-support.patch @@ -1,7 +1,7 @@ From 06cd9857f8faa63321506a75988c475906a32970 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 20 Mar 2019 12:54:47 +0000 -Subject: [PATCH 788/806] media: bcm2835: unicam: add media controller support +Subject: [PATCH] media: bcm2835: unicam: add media controller support Add a media controller device node to represent the Unicam device. The attached sensor will be automatically added to the media graph by diff --git a/target/linux/brcm2708/patches-4.19/950-0789-Limit-max_req_size-under-arm64-or-any-other-platform.patch b/target/linux/brcm2708/patches-4.19/950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0789-Limit-max_req_size-under-arm64-or-any-other-platform.patch rename to target/linux/brcm2708/patches-4.19/950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch index 9bb869fe8a..87b4e9b58a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0789-Limit-max_req_size-under-arm64-or-any-other-platform.patch +++ b/target/linux/brcm2708/patches-4.19/950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch @@ -1,7 +1,7 @@ From 7bfcb31431f06efc233e4cc4d7ab65e10a6522cd Mon Sep 17 00:00:00 2001 From: Yaroslav Rosomakho Date: Fri, 23 Aug 2019 11:02:22 +0200 -Subject: [PATCH 789/806] Limit max_req_size under arm64 (or any other platform +Subject: [PATCH] Limit max_req_size under arm64 (or any other platform that uses swiotlb) to prevent potential buffer overflow due to bouncing. Signed-off-by: Yaroslav Rosomakho diff --git a/target/linux/brcm2708/patches-4.19/950-0790-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch b/target/linux/brcm2708/patches-4.19/950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0790-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch rename to target/linux/brcm2708/patches-4.19/950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch index f4413c8fd9..0a14126fbd 100644 --- a/target/linux/brcm2708/patches-4.19/950-0790-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch +++ b/target/linux/brcm2708/patches-4.19/950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch @@ -1,7 +1,7 @@ From f8554985b77df2dac55f2d7c85e0f0cc3497a1fd Mon Sep 17 00:00:00 2001 From: Yaroslav Rosomakho Date: Fri, 23 Aug 2019 11:05:51 +0200 -Subject: [PATCH 790/806] Add missing dma_unmap_sg calls to free relevant +Subject: [PATCH] Add missing dma_unmap_sg calls to free relevant swiotlb bounce buffers. This prevents DMA leaks. Signed-off-by: Yaroslav Rosomakho diff --git a/target/linux/brcm2708/patches-4.19/950-0791-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch b/target/linux/brcm2708/patches-4.19/950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0791-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch rename to target/linux/brcm2708/patches-4.19/950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch index e72d775cc9..09dbf4a021 100644 --- a/target/linux/brcm2708/patches-4.19/950-0791-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch +++ b/target/linux/brcm2708/patches-4.19/950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch @@ -1,7 +1,7 @@ From 9802671acf4250d6541d175ba599da03cee8acc1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 5 Sep 2019 17:36:38 +0100 -Subject: [PATCH 791/806] overlays: mcp23017: rename the GPIO pins node with +Subject: [PATCH] overlays: mcp23017: rename the GPIO pins node with the device In order to allow the overlay to be loaded multiple times the diff --git a/target/linux/brcm2708/patches-4.19/950-0792-overlays-mcp23017-Add-option-for-not-connecting-the-.patch b/target/linux/brcm2708/patches-4.19/950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0792-overlays-mcp23017-Add-option-for-not-connecting-the-.patch rename to target/linux/brcm2708/patches-4.19/950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch index f9a1208dca..e6376d7f68 100644 --- a/target/linux/brcm2708/patches-4.19/950-0792-overlays-mcp23017-Add-option-for-not-connecting-the-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch @@ -1,7 +1,7 @@ From b37ac8c50684c3517fb9c6f737e7ea444a7d7405 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 5 Sep 2019 17:41:46 +0100 -Subject: [PATCH 792/806] overlays: mcp23017: Add option for not connecting the +Subject: [PATCH] overlays: mcp23017: Add option for not connecting the int GPIO The interrupt GPIO is optional to the driver, therefore add an diff --git a/target/linux/brcm2708/patches-4.19/950-0793-v4l2-Add-a-Greyworld-AWB-mode.patch b/target/linux/brcm2708/patches-4.19/950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0793-v4l2-Add-a-Greyworld-AWB-mode.patch rename to target/linux/brcm2708/patches-4.19/950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch index 6f8ba62b4d..aca98372a2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0793-v4l2-Add-a-Greyworld-AWB-mode.patch +++ b/target/linux/brcm2708/patches-4.19/950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch @@ -1,7 +1,7 @@ From c8f63d006ff5f84ad629f4c06cdc9fee34fdfe3d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:04:51 +0100 -Subject: [PATCH 793/806] v4l2: Add a Greyworld AWB mode. +Subject: [PATCH] v4l2: Add a Greyworld AWB mode. Adds a simple greyworld white balance preset, mainly for use with cameras without an IR filter (eg Raspberry Pi NoIR) diff --git a/target/linux/brcm2708/patches-4.19/950-0794-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch b/target/linux/brcm2708/patches-4.19/950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch similarity index 95% rename from target/linux/brcm2708/patches-4.19/950-0794-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch rename to target/linux/brcm2708/patches-4.19/950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch index 241875d67f..a1e4149771 100644 --- a/target/linux/brcm2708/patches-4.19/950-0794-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch +++ b/target/linux/brcm2708/patches-4.19/950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch @@ -1,7 +1,7 @@ From b5ec436637af67f37efad1550945b750101527d4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 15:13:06 +0100 -Subject: [PATCH 794/806] staging: bcm2835-camera: Add greyworld AWB mode +Subject: [PATCH] staging: bcm2835-camera: Add greyworld AWB mode This is mainly used for the NoIR camera which has no IR filter and can completely confuse normal AWB presets. diff --git a/target/linux/brcm2708/patches-4.19/950-0797-PCI-brcmstb-Fix-compilation-warning.patch b/target/linux/brcm2708/patches-4.19/950-0723-PCI-brcmstb-Fix-compilation-warning.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0797-PCI-brcmstb-Fix-compilation-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0723-PCI-brcmstb-Fix-compilation-warning.patch index 71a1c1ad70..978a656100 100644 --- a/target/linux/brcm2708/patches-4.19/950-0797-PCI-brcmstb-Fix-compilation-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0723-PCI-brcmstb-Fix-compilation-warning.patch @@ -1,7 +1,7 @@ From 2245d8c6d0feaa94ca55fa8ecfe3ca9c0c05c566 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Sep 2019 10:16:08 +0100 -Subject: [PATCH 797/806] PCI: brcmstb: Fix compilation warning +Subject: [PATCH] PCI: brcmstb: Fix compilation warning Fixes: ea2c11a187c0e248343452846457b94715e04969 Fixes: https://github.com/raspberrypi/linux/issues/3216 diff --git a/target/linux/brcm2708/patches-4.19/950-0798-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch b/target/linux/brcm2708/patches-4.19/950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0798-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch rename to target/linux/brcm2708/patches-4.19/950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch index 7f7d3d2334..203804df6f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0798-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch +++ b/target/linux/brcm2708/patches-4.19/950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch @@ -1,7 +1,7 @@ From 1e37bc9f0ea83fa4b3f1714b4382edb7b256a251 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 11 Sep 2019 14:57:18 +0100 -Subject: [PATCH 798/806] drm/vc4: Fix for margins in composite/SDTV mode +Subject: [PATCH] drm/vc4: Fix for margins in composite/SDTV mode (#3223) Margins were incorrectly assumed to be setup in SDTV mode, but were diff --git a/target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch b/target/linux/brcm2708/patches-4.19/950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch similarity index 99% rename from target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch rename to target/linux/brcm2708/patches-4.19/950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch index 9a5ef9ceb5..0ff97759d9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0799-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch +++ b/target/linux/brcm2708/patches-4.19/950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch @@ -2,7 +2,7 @@ From f0715f5e178f2f7c0afb719a3a35c8ac250b7586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?= Date: Thu, 12 Sep 2019 14:57:32 +0200 -Subject: [PATCH 799/806] Add Hifiberry DAC+DSP soundcard driver (#3224) +Subject: [PATCH] Add Hifiberry DAC+DSP soundcard driver (#3224) Adds the driver for the Hifiberry DAC+DSP. It supports capture and playback depending on the DSP firmware. diff --git a/target/linux/brcm2708/patches-4.19/950-0800-staging-bcm2835-codec-Allow-height-of-1920.patch b/target/linux/brcm2708/patches-4.19/950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch similarity index 92% rename from target/linux/brcm2708/patches-4.19/950-0800-staging-bcm2835-codec-Allow-height-of-1920.patch rename to target/linux/brcm2708/patches-4.19/950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch index 44b1ccd123..3004f89c9a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0800-staging-bcm2835-codec-Allow-height-of-1920.patch +++ b/target/linux/brcm2708/patches-4.19/950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch @@ -1,7 +1,7 @@ From b25d17959484972a6585d6e1f7cb2cfb93d1540e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 6 Sep 2019 17:24:55 +0100 -Subject: [PATCH 800/806] staging: bcm2835-codec: Allow height of 1920. +Subject: [PATCH] staging: bcm2835-codec: Allow height of 1920. The codec is happy with video up to 1920 high if the width is suitably reduced to stay within level limits. eg 1080x1920 diff --git a/target/linux/brcm2708/patches-4.19/950-0801-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch b/target/linux/brcm2708/patches-4.19/950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0801-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch rename to target/linux/brcm2708/patches-4.19/950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch index 5eb5068538..36c5d1c23a 100644 --- a/target/linux/brcm2708/patches-4.19/950-0801-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch +++ b/target/linux/brcm2708/patches-4.19/950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch @@ -1,7 +1,7 @@ From 956fd55c1071c48f00285d82507698c501633e7a Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 13 Sep 2019 15:11:47 +0100 -Subject: [PATCH 801/806] staging: bcm2835-codec: Correct g/s_selection API +Subject: [PATCH] staging: bcm2835-codec: Correct g/s_selection API MPLANE support The g_selection and s_selection API is messed up and requires diff --git a/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch similarity index 97% rename from target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch rename to target/linux/brcm2708/patches-4.19/950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch index 6276642997..e0ffaae209 100644 --- a/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch +++ b/target/linux/brcm2708/patches-4.19/950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch @@ -1,7 +1,7 @@ From f6d983b7bc9ae79d0eb4dea7bc30a1ad5ff428a7 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 12 Oct 2018 14:54:12 +0200 -Subject: [PATCH 802/806] regulator/gpio: Allow nonexclusive GPIO access +Subject: [PATCH] regulator/gpio: Allow nonexclusive GPIO access commit b0ce7b29bfcd090ddba476f45a75ec0a797b048a upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch b/target/linux/brcm2708/patches-4.19/950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch similarity index 94% rename from target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch rename to target/linux/brcm2708/patches-4.19/950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch index d8e87919cf..e8e63a2798 100644 --- a/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch @@ -1,7 +1,7 @@ From 76870d237adff4c8e419064e7d4f5a8ef87c1085 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 6 Dec 2018 13:43:44 +0100 -Subject: [PATCH 803/806] gpio: Enable nonexclusive gpiods from DT nodes +Subject: [PATCH] gpio: Enable nonexclusive gpiods from DT nodes commit ec757001c818c175e6b610e8ef80c2a25d1ed1a5 upstream. diff --git a/target/linux/brcm2708/patches-4.19/950-0804-Fix-poll-rate-on-touchscreen-3238.patch b/target/linux/brcm2708/patches-4.19/950-0730-Fix-poll-rate-on-touchscreen-3238.patch similarity index 93% rename from target/linux/brcm2708/patches-4.19/950-0804-Fix-poll-rate-on-touchscreen-3238.patch rename to target/linux/brcm2708/patches-4.19/950-0730-Fix-poll-rate-on-touchscreen-3238.patch index 5dbbd846c9..b47c8190fc 100644 --- a/target/linux/brcm2708/patches-4.19/950-0804-Fix-poll-rate-on-touchscreen-3238.patch +++ b/target/linux/brcm2708/patches-4.19/950-0730-Fix-poll-rate-on-touchscreen-3238.patch @@ -1,7 +1,7 @@ From a37a706547897d77b3194fc507b2546197def430 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Tue, 17 Sep 2019 16:22:09 +0100 -Subject: [PATCH 804/806] Fix poll rate on touchscreen (#3238) +Subject: [PATCH] Fix poll rate on touchscreen (#3238) Was running at 25Hz, rather than he expected 60. Only been doing it for the last 5 years.... diff --git a/target/linux/brcm2708/patches-4.19/950-0806-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch b/target/linux/brcm2708/patches-4.19/950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch similarity index 98% rename from target/linux/brcm2708/patches-4.19/950-0806-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch rename to target/linux/brcm2708/patches-4.19/950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch index abb9fcc300..1f690a2582 100644 --- a/target/linux/brcm2708/patches-4.19/950-0806-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch +++ b/target/linux/brcm2708/patches-4.19/950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch @@ -1,7 +1,7 @@ From 75967d69ea58555d12a7d9058653a69210d2ba86 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 18 Sep 2019 09:02:10 +0100 -Subject: [PATCH 806/806] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) +Subject: [PATCH] dts: Add DTS for Pi 2B rev 1.2 with BCM2837 (#3235) Signed-off-by: Phil Elwell --- From c2308a7e4adbb2acc8ff149f91d1ca46801c135e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 23 Dec 2019 17:25:19 +0100 Subject: [PATCH 120/480] brcm2708: update to latest patches from RPi Foundation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also removes reverted patches. Signed-off-by: Álvaro Fernández Rojas --- target/linux/brcm2708/bcm2711/config-4.19 | 9 +- ...-Support-pin-groups-other-than-7-11.patch} | 0 ...v-compatible-string-to-silence-warni.patch | 21 - ...-bcm2835-Disable-forced-software-CS.patch} | 0 ...0012-spi-bcm2835-Remove-unused-code.patch} | 0 ...-Load-driver-early-and-support-lega.patch} | 0 ...014-firmware-Updated-mailbox-header.patch} | 0 ...tc-Add-SPI-alias-for-pcf2123-driver.patch} | 0 ...35-Support-setting-reboot-partition.patch} | 0 ...off-rather-than-busy-spinning-when-.patch} | 0 ...Make-RASPBERRYPI_POWER-depend-on-PM.patch} | 0 ...ks-early-during-the-boot-process-so.patch} | 0 ...oid-initialising-if-already-enabled.patch} | 0 ...dtco-targets-when-filtering-symbols.patch} | 0 ...ark-used-PLLs-and-dividers-CRITICAL.patch} | 0 ...k-bcm2835-Add-claim-clocks-property.patch} | 0 ...5-Read-max-core-clock-from-firmware.patch} | 0 ...GPIO-clocks-enabled-at-boot-as-crit.patch} | 0 ...emote-deferral-errors-to-INFO-level.patch} | 0 ...atch => 950-0027-Update-vfpmodule.c.patch} | 0 ...-0028-i2c-bcm2835-Add-debug-support.patch} | 0 ...0029-mm-Remove-the-PFN-busy-warning.patch} | 0 ...-ASoC-Add-prompt-for-ICS43432-codec.patch} | 0 ...cm2836-Remove-regmap-and-syscon-use.patch} | 0 ...xx-Enable-LEDs-and-auto-negotiation.patch} | 0 ...-Don-t-use-DT-aliases-for-numbering.patch} | 0 ...034-amba_pl011-Round-input-clock-up.patch} | 0 ...Insert-mb-for-correct-FIFO-handling.patch} | 0 ...dd-cts-event-workaround-DT-property.patch} | 0 ...et-base-to-0-give-expected-gpio-num.patch} | 0 ...038-Main-bcm2708-bcm2709-linux-port.patch} | 0 ...atch => 950-0039-Add-dwc_otg-driver.patch} | 0 ...950-0040-bcm2708-framebuffer-driver.patch} | 0 ...sole-framebuffer-imageblit-function.patch} | 0 ...2-dmaengine-Add-support-for-BCM2708.patch} | 0 ...43-MMC-added-alternative-MMC-driver.patch} | 0 ...host-driver-and-an-overlay-to-enabl.patch} | 0 ...-driver-for-querying-firmware-memor.patch} | 0 ...e-shared-memory-service-for-BCM2835.patch} | 0 ...evice-for-rootless-user-GPIO-access.patch} | 0 ...er.patch => 950-0048-Add-SMI-driver.patch} | 0 ...use-clock-manager-and-fix-reload-is.patch} | 0 ...tch => 950-0050-Add-SMI-NAND-driver.patch} | 0 ...atch => 950-0051-Add-cpufreq-driver.patch} | 0 ...50-0052-Add-Chris-Boot-s-i2c-driver.patch} | 0 ...-0053-char-broadcom-Add-vcio-module.patch} | 0 ...rmware-bcm2835-Support-ARCH_BCM270x.patch} | 0 ...img-and-knlinfo-scripts-from-tools-.patch} | 0 ...CM2708-Add-core-Device-Tree-support.patch} | 0 ...r_led-and-the-required-input-trigge.patch} | 0 ...0-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch} | 0 ...ded-Device-IDs-for-August-DVB-T-205.patch} | 0 ...uchscreen-driver-for-pi-LCD-display.patch} | 0 ..._user-and-__copy_from_user-performa.patch} | 0 ...ff-Allow-it-to-work-on-Raspberry-Pi.patch} | 0 ...-Raspberry-Pi-Sense-HAT-core-driver.patch} | 0 ...2x-implement-set_tdm_slot-interface.patch} | 0 ...0-0065-ASoC-Add-support-for-Rpi-DAC.patch} | 0 ...Sound-Card-support-for-Raspberry-Pi.patch} | 0 ...067-Added-support-for-HiFiBerry-DAC.patch} | 0 ...HiFiBerry-Amp-amplifier-add-on-boar.patch} | 0 ...> 950-0069-Add-driver-for-rpi-proto.patch} | 0 ...d-Support-for-JustBoom-Audio-boards.patch} | 0 ....net-Pi-soundcard-with-low-jitter-a.patch} | 0 ...A-DigiDAC1-soundcard-using-WM8741-W.patch} | 0 ...ort-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch} | 0 ...ards-Initial-2-channel-stereo-suppo.patch} | 0 ...llo-Piano-DAC-2.1-plus-add-on-board.patch} | 0 ...llo-Boss-DAC-add-on-board-for-Raspb.patch} | 0 ...pport-for-Blokas-Labs-pisound-board.patch} | 0 ...-driver-for-Cirrus-Logic-Audio-Card.patch} | 0 ...-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch} | 0 ...rt-for-Fe-Pi-audio-sound-card.-1867.patch} | 0 ...he-AudioInjector.net-Octo-sound-car.patch} | 0 ...pport-for-Google-voiceHAT-soundcard.patch} | 0 ...ver-and-overlay-for-Allo-Katana-DAC.patch} | 0 ...ic-RPI-driver-for-simple-soundcards.patch} | 0 ...nfig-and-Makefile-for-sound-soc-bcm.patch} | 0 ...04-MCLK-configuration-options-32-bit.patch | 32 - ...eate-a-generic-Pi-Hat-WM8804-driver.patch} | 0 ...ay-add-backlight-driver-and-overlay.patch} | 0 ...cm2835-virtgpio-Virtual-GPIO-driver.patch} | 0 ...89-OF-DT-Overlay-configfs-interface.patch} | 0 ..._h5-Don-t-send-conf_req-when-ACTIVE.patch} | 0 ...ration-and-device-tree-differences..patch} | 0 ...WC_OTG-Port-dwc_otg-driver-to-ARM64.patch} | 0 ...nd-Robin-dispatch-IRQs-between-CPUs.patch} | 0 ...are-emulation-of-deprecated-instruc.patch} | 0 ...ules-for-.dtbo-files-for-dts-overla.patch} | 0 ...6-cache-export-clean-and-invalidate.patch} | 0 ...AXI-performance-monitor-driver-2222.patch} | 0 ...515-Use-DT-supplied-interrupt-flags.patch} | 0 ...of-the-ft5406-driver-to-use-DT-2189.patch} | 0 ...2835-Set-Serial-number-and-Revision.patch} | 0 ...IQs-to-avoid-__irq_startup-warnings.patch} | 0 ...oup-Disable-cgroup-memory-by-default.patch | 70 - ...50-bcm2835aux-suppress-EPROBE_DEFER.patch} | 0 ...are-Export-the-general-transaction-.patch} | 0 ...e-for-using-the-closed-firmware-for.patch} | 0 ...e-primary-and-cursor-planes-in-fkms.patch} | 0 ...EBUG_ATOMIC-for-the-insides-of-fkms.patch} | 0 ...ng-of-page-flip-completion-events-i.patch} | 0 ...ort-for-setting-DPMS-in-firmwarekms.patch} | 0 ...-FB-modifier-support-to-firmwarekms.patch} | 0 ...ng-enable-disable-vblank-handlers-i.patch} | 0 ...rmware-overscan-offset-to-hardware-.patch} | 0 ...ng-about-vblank-interrupts-before-D.patch} | 0 ...CURSOR_INFO-when-the-cursor-content.patch} | 0 ...plicate-primary-cursor-fields-from-.patch} | 0 ...950-0115-vc4_firmware_kms-fix-build.patch} | 0 ...50-0116-hack-cache-Fix-linker-error.patch} | 0 ...o-set-bus-numbers-from-reg-property.patch} | 0 ...-bcm-Fix-memset-dereference-warning.patch} | 0 ...ar-option-to-pps-gpio-via-dtoverlay.patch} | 0 ...8xx-Read-initial-EEE-status-from-DT.patch} | 0 ...ault-mouse-polling-interval-to-60Hz.patch} | 0 ...t-prevent-IRQ-usage-of-output-GPIOs.patch} | 0 ...o-export-gpio-used-by-gpio-poweroff.patch} | 0 ...berrypi-Notify-firmware-of-a-reboot.patch} | 0 ...cm2835-Calc.-FIQ_START-at-boot-time.patch} | 0 ...s-Use-of_overlay_fdt_apply-API-call.patch} | 0 ...isable-TCP-Segmentation-Offload-TSO.patch} | 0 ...-enabling-of-EEE-into-PHY-init-code.patch} | 0 ...4_services-Derive-g_cache_line_size.patch} | 0 ... => 950-0130-Add-rpi-poe-fan-driver.patch} | 0 ...PI_DRV-should-select-DVB_CXD2880-wi.patch} | 0 ...plement-a-DMA-pool-for-small-bulk-t.patch} | 0 ...Use-upstreamed-GPIO-expander-driver.patch} | 0 ...134-overlays-Fix-a-few-dtc-warnings.patch} | 0 ...le-txp-interrupt-unless-using-vc4-k.patch} | 0 ...0135-bcm2835-interpolate-audio-delay.patch | 89 -- ...-Prevent-voltage-low-warnings-from-.patch} | 0 ...ypi-Add-backward-compatible-get_thr.patch} | 0 ...s7xx-Don-t-spin-if-no-data-received.patch} | 0 ...Add-device-tree-overlay-for-HD44780.patch} | 0 ...-Add-addr-parameter-to-i2c-rtc-gpio.patch} | 0 ...he-18-bit-DPI-pinmux-to-the-RPI-DTs.patch} | 0 ...verlay-for-the-Adafruit-Kippah-with.patch} | 0 ...tale-notes-about-vc4-s-CMA-alignmen.patch} | 0 ...-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch} | 0 ...i-CM3-dts-to-arm64-mimic-the-RPi-3B.patch} | 0 ...udioinjector.net-ultra-soundcard.-2.patch} | 0 ...C-cs4265-Add-a-S-PDIF-enable-switch.patch} | 0 ...4265-Add-native-32bit-I2S-transport.patch} | 0 ...149-BCM270X_DT-Add-gpio-fan-overlay.patch} | 0 ...driver-for-BigBen-Interactive-PS3OF.patch} | 0 ...oC-cs4265-Add-a-MIC-pre.-route-2696.patch} | 0 ...52-Update-gpio-fan-overlay.dts-2711.patch} | 0 ...tep_wise-add-support-for-hysteresis.patch} | 0 ...tep_wise-avoid-throttling-at-hyster.patch} | 0 ...ust-rpi-poe-fan-overlay-trip-points.patch} | 0 ...d-overrides-for-PoE-HAT-fan-control.patch} | 0 ...rlays-Add-gpio-no-bank0-irq-overlay.patch} | 0 ...2017-model-device-tree-overlay-2721.patch} | 0 ...dhost-Recover-from-MMC_SEND_EXT_CSD.patch} | 0 ...3-disable-bt-Clear-out-bt_pins-node.patch} | 0 ...3-properly-handle-oscillator-stop-b.patch} | 0 ...t0-return-GPIOs-14-and-15-to-inputs.patch} | 0 ...cm2835-sdhost-Fix-warnings-on-arm64.patch} | 0 ...164-Fix-warning-in-bcm2835-smi-nand.patch} | 0 ...v5647-Add-set_fmt-and-get_fmt-calls.patch} | 0 ...on-DT-add-device-tree-for-PWDN-cont.patch} | 0 ...ia-ov5647-Add-support-for-PWDN-GPIO.patch} | 0 ...support-for-non-continuous-clock-mo.patch} | 0 ...tc358743-Increase-FIFO-level-to-374.patch} | 0 ...x-connected-active-CSI-2-lane-repor.patch} | 0 ...Add-support-for-972Mbit-s-link-freq.patch} | 0 ...43-Check-I2C-succeeded-during-probe.patch} | 0 ...80-Default-to-the-first-valid-input.patch} | 0 ...7180-Add-YPrPb-support-for-ADV7282M.patch} | 0 ...dd-helper-defines-for-printing-FOUR.patch} | 0 ...Document-BCM283x-CSI2-CCP2-receiver.patch} | 0 ...cam-Driver-for-CCP2-CSI2-camera-int.patch} | 0 ...Nasty-hack-to-allow-input-selection.patch} | 0 ...DT-Add-CSI-nodes-to-the-device-tree.patch} | 0 ...I-defines-for-all-the-downstream-Pi.patch} | 0 ...rlays-for-ADV7282M-OV5647-and-TC358.patch} | 0 ...pport-for-ADV7280-M-ADV7281-M-and-A.patch} | 0 ...dereference-in-the-import_dmabuf-er.patch} | 0 ...atch => 950-0184-Update-README-2750.patch} | 0 ...move-superfluous-address-size-cells.patch} | 0 ...oundcard-drop-PWRDN-register-writes.patch} | 0 ...ard-configure-wm8804-clocks-only-on.patch} | 0 ...c-on-0-1-option-to-TC358743-ADV7282.patch} | 0 ...89-overlays-Update-upstream-overlay.patch} | 0 ...708_DT-update-firmware-node-binding.patch} | 0 ...04-MCLK-configuration-options-32-bit.patch | 29 - ...M2710_DT-fix-gpio-expander-bindings.patch} | 0 ...283x-The-lan7515-PHY-node-has-moved.patch} | 0 ...x-Support-auto-downshift-to-100Mb-s.patch} | 0 ...-Document-microchip-downshift-after.patch} | 0 ...m283x-Set-downshift-after-for-Pi-3B.patch} | 0 ...X_DT-Add-new-Ethernet-DT-parameters.patch} | 0 ...k-eth_downshift_after-as-an-integer.patch} | 0 ...-Fix-bad-mode-in-data-abort-handler.patch} | 0 ...irc-rpi-Remove-in-favour-of-gpio-ir.patch} | 0 ...cam-Pass-through-the-colorspace-on-.patch} | 0 ...turn-an-appropriate-colorspace-from.patch} | 0 ...m2835-camera-fix-module-autoloading.patch} | 0 ...-camera-Move-module-info-to-the-end.patch} | 0 ...-Fix-platform-device-unregistration.patch} | 0 ..._arm-Fix-camera-device-registration.patch} | 0 ...amera-Provide-more-specific-probe-e.patch} | 0 ...amera-Add-hint-about-possible-fault.patch} | 0 ...on-t-probe-if-no-camera-is-detected.patch} | 0 ...-Improve-error-handling-on-loading-.patch} | 10 +- ...amera-Do-not-bulk-receive-from-serv.patch} | 0 ...amera-Ensure-H264-header-bytes-get-.patch} | 0 ...m-Register-a-platform-device-for-the.patch | 38 - ...ng-bcm2835-audio-Enable-compile-test.patch | 22 - ...amera-Correctly-denote-key-frames-i.patch} | 0 ...audio-use-module_platform_driver-mac.patch | 43 - ...m2835-camera-Return-early-on-errors.patch} | 0 ...ing-bcm2835-audio-Drop-DT-dependency.patch | 116 -- ...-camera-Remove-dead-email-addresses.patch} | 0 ...camera-Fix-comment-style-violations.patch} | 0 ...camera-Fix-spacing-around-operators.patch} | 0 ...-camera-Reduce-length-of-enum-names.patch} | 0 ...amera-Fix-multiple-line-dereference.patch} | 0 ...m2835-camera-Fix-brace-style-issues.patch} | 0 ...amera-Fix-missing-lines-between-ite.patch} | 0 ...amera-Fix-logical-continuation-spli.patch} | 0 ...amera-Fix-open-parenthesis-alignmen.patch} | 0 ...amera-Set-sequence-number-correctly.patch} | 0 ...amera-Ensure-timestamps-never-go-ba.patch} | 0 ...amera-Avoid-unneeded-internal-decla.patch} | 0 ...amera-Add-multiple-inclusion-protec.patch} | 0 ...amera-Unify-header-inclusion-define.patch} | 0 ...amera-Fix-alignment-should-match-op.patch} | 0 ...amera-Fix-multiple-assignments-shou.patch} | 0 ...amera-Fix-up-all-formatting-in-mmal.patch} | 0 ...amera-Use-enums-for-max-value-in-co.patch} | 0 ...amera-Correct-V4L2_CID_COLORFX_CBCR.patch} | 0 ...amera-Remove-amend-some-obsolete-co.patch} | 0 ...ices-Split-vchiq-mmal-into-a-module.patch} | 0 ...q-Allocate-and-free-components-as-r.patch} | 0 ...hiq-Avoid-use-of-bool-in-structures.patch} | 0 ...iq-Make-timeout-a-defined-parameter.patch} | 0 ...q-Make-a-mmal_buf-struct-for-passin.patch} | 0 ...hiq-Add-support-for-event-callbacks.patch} | 0 ...ices-Support-sending-data-to-MMAL-p.patch} | 0 ...ices-Fixup-vchiq-mmal-include-order.patch} | 0 ...4_services-Add-new-vc-sm-cma-driver.patch} | 0 ...ma-Fixup-driver-for-older-VCHI-APIs.patch} | 0 ...ices-Use-vc-sm-cma-to-support-zero-.patch} | 0 ...-Allow-exporting-of-a-struct-dmabuf.patch} | 0 ...ervices-Add-a-V4L2-M2M-codec-driver.patch} | 0 ...-Register-bcm2835-codec-as-a-platfo.patch} | 12 +- ...-Register-vcsm-cma-as-a-platform-dr.patch} | 6 +- ...amera-Fix-stride-on-RGB3-BGR3-forma.patch} | 0 ...m-Make-SECURITYFS-a-weak-dependency.patch} | 0 ...y-for-SLB9760-Iridium-LetsTrust-TPM.patch} | 0 ...river-for-3Dlab-Nano-soundcard-2758.patch} | 0 ...ate-README-with-removal-of-lirc-rpi.patch} | 0 ...amera-Check-the-error-for-REPEAT_SE.patch} | 0 ...ge-default-pull-configuration-to-up.patch} | 0 ...ypi-Report-the-fw-variant-during-pr.patch} | 0 ...ypi-Report-the-fw-git-hash-during-p.patch} | 0 ...broadcom-Enable-fixups-for-overlays.patch} | 0 ...audio-fix-sgtl5000-compatible-strin.patch} | 0 ...w-reqbufs-0-with-in-use-MMAP-buffers.patch | 76 - ...dd-dereference-to-fix-DMA-transfers.patch} | 0 ...-link-events-to-minimize-poll-storm.patch} | 0 ...-for-AudioSense-Pi-add-on-soundcard.patch} | 0 ...chiq_arm-Register-a-platform-device-.patch | 48 - ...vice-tree-support-for-AudioSense-Pi.patch} | 0 ...ing-bcm2835-audio-Drop-DT-dependency.patch | 114 -- ...ays-sdio-Add-enhanced-1-bit-support.patch} | 0 ...ith-port_addr-assignment-for-single.patch} | 0 ...iver-for-the-HiFiBerry-DAC-ADC-2694.patch} | 0 ...-on-the-pwmchip-device-upon-channel.patch} | 0 ...dd-ssd1306-overlay-for-OLED-display.patch} | 0 ...rlays-mcp23017-Support-the-MCP23008.patch} | 0 ...0-0270-overlays-Add-mcp342x-overlay.patch} | 0 ...char-vcio-Add-compat-ioctl-handling.patch} | 0 ...-probe-if-rpi_firmware-is-not-found.patch} | 0 ...q-Fix-client_component-for-64-bit-k.patch} | 0 ...amera-Add-sanity-checks-for-queue_s.patch} | 0 ...amera-Set-the-field-value-within-ea.patch} | 0 ...x-up-compat-ioctls-for-64bit-kernel.patch} | 0 ...-vc_mem-Fix-all-coding-style-issues.patch} | 0 ...bcm2835-Use-zd-when-printing-size_t.patch} | 0 ...rpi_sense_core-of-compatible-string.patch} | 0 ..._kms-Fix-up-64-bit-compile-warnings.patch} | 0 ...Clear-build-warning-on-64-bit-build.patch} | 0 ...ys-Correct-DT-handling-camera-GPIOs.patch} | 0 ...ov5647-Use-gpiod_set_value_cansleep.patch} | 0 ...cam-Power-on-subdev-on-open-release.patch} | 0 ...ector-octo-revert-to-dummy-supplies.patch} | 0 ...amera-Correct-ctrl-min-max-step-def.patch} | 0 ...odec-variable-vb2-may-be-used-unini.patch} | 0 ...odec-Fix-potentially-uninitialised-.patch} | 0 ...bcm2708_fb-Add-compat_ioctl-support.patch} | 0 ...08_fb-Fix-warnings-on-64-bit-builds.patch} | 0 ...708_fb-Clean-up-coding-style-issues.patch} | 0 ...a-Add-support-for-per-channel-flags.patch} | 0 ...-the-DISDEBUG-flag-for-SD-transfers.patch} | 0 ...mplement-the-digital_mute-interface.patch} | 0 ...a-double-unlock-in-pcm512x_digital_.patch} | 0 ...-up-build-warnings-on-64bit-kernels.patch} | 0 ...ma-allocation-for-mphi-dummy_send-b.patch} | 0 ...-Set-up-dma-ranges-on-child-devices.patch} | 0 ...vc-sm-cma-Correct-DMA-configuration.patch} | 0 ...-Use-a-void-pointer-as-the-handle-w.patch} | 0 ...g-vc-sm-cma-Fix-up-for-64bit-builds.patch} | 0 ...02-configs-Enable-the-AD193x-codecs.patch} | 0 ...lenaFin-v1.1.0-carrier-board-update.patch} | 0 ...Update-driver-to-not-use-plane-crtc.patch} | 0 ...ng-the-CTM-is-conditional-on-runnin.patch} | 0 ...q-Add-in-the-Bayer-encoding-formats.patch} | 0 ...q-Always-return-the-param-size-from.patch} | 0 ...q-If-the-VPU-returns-an-error-don-t.patch} | 0 ...odec-Query-supported-formats-from-t.patch} | 0 ...odec-Add-support-for-the-ISP-as-an-.patch} | 0 ...odec-Add-an-option-for-ignoring-Bay.patch} | 0 ...odec-Fix-handling-of-VB2_MEMORY_DMA.patch} | 0 ...q-Update-mmal_parameters.h-with-rec.patch} | 0 ...odec-Include-timing-info-in-SPS-hea.patch} | 0 ...t-for-vblank-on-fkms-cursor-updates.patch} | 0 ...ernel-module-in-Real-Time-kernel-co.patch} | 0 ... => 950-0317-Added-mute-stream-func.patch} | 0 ...x-EEE-support-is-now-a-PHY-property.patch} | 0 ...ma-Remove-erroneous-misc_deregister.patch} | 0 ...efile-include-on-out-of-tree-builds.patch} | 0 ...vcsm-Remove-set-but-unused-variable.patch} | 0 ...csm-Reduce-scope-of-local-functions.patch} | 0 ...odec-NULL-component-handle-on-queue.patch} | 0 ...-Remove-the-debugfs-directory-on-re.patch} | 0 ...m-cma-Use-devm_-allocs-for-sm_state.patch} | 0 ...ma-Don-t-fail-if-debugfs-calls-fail.patch} | 0 ...-Ensure-mutex-and-idr-are-destroyed.patch} | 0 ...odec-Clean-up-logging-on-unloading-.patch} | 0 ...low-for-sg-entries-that-cross-pages.patch} | 0 ...ed-4-bit-support-on-GPIOs-34-39.-29.patch} | 0 ...multiple-instantiation-of-sc16is7xx.patch} | 0 ...-Try-allocating-on-the-ARM-and-passi.patch | 162 --- ...32-bcm2835-mmc-Fix-DMA-channel-leak.patch} | 0 ...c-Fix-struct-mmc_host-leak-on-probe.patch} | 0 ...mc-Fix-duplicate-free_irq-on-remove.patch} | 0 ...2835-mmc-Handle-mmc_add_host-errors.patch} | 0 ...licate-reset-of-driver-data-on-remo.patch} | 0 ...-Add-max17040-support-to-i2c-sensor.patch} | 0 ...cam-Add-support-for-enum-framesizes.patch} | 0 ...odec-Refactor-default-resolution-co.patch} | 0 ...> 950-0340-nvmem-add-type-attribute.patch} | 0 ... 950-0341-rtc-rv3028-add-new-driver.patch} | 0 ...0342-overlays-Add-rv3028-to-i2c-rtc.patch} | 0 ...4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch} | 0 ...4-Break-out-clock-setting-into-sepa.patch} | 0 ...32x4-Properly-Set-Processing-Blocks.patch} | 0 ...ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch} | 0 ...320aic32x4-Model-CODEC_CLKIN-in-CCF.patch} | 0 ...c32x4-Model-DAC-ADC-dividers-in-CCF.patch} | 0 ...20aic32x4-Model-BDIV-divider-in-CCF.patch} | 0 ...c32x4-Control-clock-gating-with-CCF.patch} | 0 ...4-Move-aosr-and-dosr-setting-to-sep.patch} | 0 ...32x4-Dynamically-Determine-Clocking.patch} | 0 ...0aic32x4-Restructure-set_dai_sysclk.patch} | 0 ...lv320aic32x4-Remove-mclk-references.patch} | 0 ...320aic32x4-Allow-192000-Sample-Rate.patch} | 0 ...c32x4-Only-enable-with-common-clock.patch} | 0 ...ophonics-I-Sabre-9038Q2M-DAC-driver.patch} | 0 ...-tlv320aic32x4-Change-author-s-name.patch} | 0 ...4-Update-copyright-and-use-SPDX-ide.patch} | 0 ...4-Add-Switch-for-Setting-Common-Mod.patch} | 0 ...2x4-Add-Playback-PowerTune-Controls.patch} | 0 ...lays-Add-Support-for-the-UDRC-DRAWS.patch} | 0 ...plit-when-we-actually-need-to-do-a-.patch} | 0 ...-fetch-touchscreen-geometry-from-DT.patch} | 0 ...put-ili210x-add-DT-binding-document.patch} | 0 ...core-Device-Tree-support-ilitek251x.patch} | 0 ...ng-around-dequeueing-and-killing-UR.patch} | 0 ...-Add-backup-switchover-mode-support.patch} | 0 ...gs-rv3028-backup-switchover-support.patch} | 0 ...28-backup-switchover-support-to-i2c.patch} | 0 ...axim-MAX98357A-I2S-DAC-overlay-2935.patch} | 0 ...s-for-audioinjector-octo-under-4.19.patch} | 0 ...50-0373-overlays-Add-PiGlow-overlay.patch} | 0 ...-bcm2835-audio-Clean-up-mutex-locks.patch} | 0 ...udio-Remove-redundant-spdif-stream-.patch} | 0 ...udio-Clean-up-include-files-in-bcm2.patch} | 0 ...udio-Remove-redundant-substream-mas.patch} | 0 ...udio-Fix-mute-controls-volume-handl.patch} | 0 ...udio-Remove-redundant-function-call.patch} | 0 ...-audio-Remove-superfluous-open-flag.patch} | 0 ...udio-Drop-useless-running-flag-and-.patch} | 0 ...udio-Fix-incorrect-draining-handlin.patch} | 0 ...-bcm2835-audio-Kill-unused-spinlock.patch} | 0 ...udio-Use-PCM-runtime-values-instead.patch} | 0 ...udio-Drop-unnecessary-pcm-indirect-.patch} | 0 ...oup-Disable-cgroup-memory-by-default.patch | 63 - ...m2835-audio-Drop-useless-NULL-check.patch} | 0 ...udio-Propagate-parameter-setup-erro.patch} | 0 ...vert-bcm2835-interpolate-audio-delay.patch | 71 - ...udio-Drop-debug-messages-in-bcm2835.patch} | 0 ...ng-bcm2835-audio-Enable-compile-test.patch | 22 - ...udio-Drop-superfluous-mutex-lock-du.patch} | 0 ...cm2835-audio-use-module_platform_dri.patch | 42 - ...35-audio-Add-10ms-period-constraint.patch} | 0 ...m2835-audio-Make-single-vchi-handle.patch} | 0 ...udio-Code-refactoring-of-vchiq-acce.patch} | 0 ...35-audio-Operate-non-atomic-PCM-ops.patch} | 0 ...bcm2835-audio-Use-card-private_data.patch} | 0 ...udio-Use-standard-error-print-helpe.patch} | 0 ...udio-Remove-unnecessary-header-file.patch} | 0 ...udio-Move-module-parameter-descript.patch} | 0 ...5-audio-Use-coherent-device-buffers.patch} | 0 ...udio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch} | 0 ...audio-Simplify-PCM-creation-helpers.patch} | 0 ...udio-Simplify-kctl-creation-helpers.patch} | 0 ...udio-Simplify-card-object-managemen.patch} | 0 ...udio-unify-FOURCC-command-definitio.patch} | 0 ...audio-don-t-initialize-memory-twice.patch} | 0 ...udio-reorder-variable-declarations-.patch} | 0 ...udio-use-anonymous-union-in-struct-.patch} | 0 ...udio-more-generic-probe-function-na.patch} | 0 ...udio-rename-platform_driver-structu.patch} | 0 ...9-staging-bcm2835-audio-update-TODO.patch} | 0 ...m2835-audio-interpolate-audio-delay.patch} | 0 ...g-bcm2835-audio-Enable-compile-test.patch} | 0 ...udio-use-module_platform_driver-mac.patch} | 0 ...udio-double-free-in-init-error-path.patch} | 0 ...Increase-default-coherent-pool-size.patch} | 0 ...se-default-alignment-for-rx-buffers.patch} | 0 ...odec-Correct-port-width-calc-for-tr.patch} | 0 ...odec-Remove-height-padding-for-ISP-.patch} | 0 ...q-Free-the-event-context-for-contro.patch} | 0 ...lso-set-coherent_pool-1M-for-BT-Pis.patch} | 0 ...rpi-sense-add-upstream-humidity-com.patch} | 0 ...vchiq-Fix-memory-leak-in-error-path.patch} | 0 ...l-Fix-memory-leak-of-vchiq-instance.patch} | 0 ...IQaudIO-Pi-Codec-board-support-2969.patch} | 0 ...on-output_write-retry-with-readback.patch} | 0 ...2-cosmetic-fixes-after-54865314f5a1.patch} | 0 ...ec-Adding-352.8kHz-samplerate-suppo.patch} | 0 ...ing-driver-for-3Dlab-Nano-soundcard.patch} | 0 ...428-.gitignore-Add-.dtbo-explicitly.patch} | 0 ...ey-sizes-only-when-Secure-Simple-Pa.patch} | 0 ...ing-bcm2835-audio-Drop-DT-dependency.patch | 105 -- ...tg-Clean-up-interrupt-claiming-code.patch} | 0 ...te-the-deprecated-sdio-1bit-overlay.patch} | 0 ...move-upstream-aux-interrupt-overlay.patch} | 0 ...ing-bcm2835-audio-Drop-DT-dependency.patch | 96 -- ...ndardise-on-compatible-brcm-bcm2835.patch} | 0 ...ally-fix-up-TX-buffer-alignment-with.patch | 62 - ...-Remove-interrupt-and-DMA-trampling.patch} | 0 ...Add-non-removable-clone-of-mmc-node.patch} | 0 ...0X_DT-usb-Refactor-DTS-and-overlays.patch} | 0 ...37-overlays-Update-upstream-overlay.patch} | 0 ...o-after-49695ac46861-reset-on-outpu.patch} | 0 ...CM270X_DT-Rename-Pi-Zero-W-DT-files.patch} | 0 ...270X_DT-Create-bcm2708-rpi-zero.dts.patch} | 0 ...mmc-related-overlays-after-refactor.patch} | 0 ... => 950-0442-Fixed-48k-timing-issue.patch} | 0 ...2708_fb-Try-allocating-on-the-ARM-an.patch | 164 --- ...odec-Convert-V4L2-nsec-timestamps-t.patch} | 0 ...odec-Add-support-for-setting-S_PARM.patch} | 0 ...dynamically-fix-up-TX-buffer-alignme.patch | 60 - ...ke-GPIO-an-output-for-strong-pullup.patch} | 0 ...s-Update-w1-gpio-and-w1-gpio-pullup.patch} | 0 ...ix-DMA-channel-leak-on-error-remove.patch} | 0 ...48-i2c-bcm2835-Model-Divider-in-CCF.patch} | 0 ...ervices-Use-correct-cache-line-size.patch} | 0 ...y-amba-pl011-allow-shared-interrupt.patch} | 0 ...e-register-ranges-for-UART-SPI-and-.patch} | 0 ...d-the-WDT-DT-node-out-to-cover-the-.patch} | 0 ...53-ARM-dts-Add-label-to-bcm2835-RNG.patch} | 0 ...fb-rather-than-leds-for-dpi-overlay.patch} | 0 ...> 950-0455-BCM270X_DT-Minor-tidy-up.patch} | 0 ...6-arm-bcm2835-Fix-FIQ-early-ioremap.patch} | 0 ..._from_user-if-BCM2835_FAST_MEMCPY-n.patch} | 0 ...roadcom-STB-PCIe-host-controller-dr.patch} | 0 ...ma-range-mapping-for-inbound-traffi.patch} | 0 ...0460-PCI-brcmstb-Add-MSI-capability.patch} | 0 ...Add-DT-docs-for-Brcmstb-PCIe-device.patch} | 0 ...62-pcie-brcmstb-Changes-for-BCM2711.patch} | 0 ...rm-bcm2835-DMA-can-only-address-1GB.patch} | 0 ...t-Support-64-bit-physical-addresses.patch} | 0 ...-mmc-sdhci-Mask-spurious-interrupts.patch} | 0 ...dd-support-for-emmc2-of-the-BCM2838.patch} | 0 ...ng-iproc-rng200-Add-BCM2838-support.patch} | 0 ...brcmstb_thermal-Add-BCM2838-support.patch} | 0 ...69-vchiq-Add-36-bit-address-support.patch} | 0 ...35-pcm.c-Support-multichannel-audio.patch} | 0 ...enet-constrain-max-DMA-burst-length.patch} | 0 ...etter-coalescing-parameter-defaults.patch} | 0 ...link-energy-detect-powerdown-for-ex.patch} | 0 ...t-out-the-BCM54213PE-from-the-BCM54.patch} | 0 ...nfigure-the-LED-outputs-to-be-more-.patch} | 0 ...e-appropriate-IRQ-handover-strategy.patch} | 0 ...i-Disable-the-XHCI-5-second-timeout.patch} | 0 ...how-that-the-VIA-VL805-supports-LPM.patch} | 0 ...835-enable-shared-interrupt-support.patch} | 0 ...chardev-for-mmap-ing-Argon-control-.patch} | 0 ...lk-bcm2835-Don-t-wait-for-pllh-lock.patch} | 0 ...cm2835-watchdog-s-DT-probe-to-an-MF.patch} | 0 ...m-Add-support-for-power-domains-und.patch} | 0 ...m-Fix-PM_IMAGE_PERI-power-domain-su.patch} | 0 ...m-Fix-error-paths-of-initialization.patch} | 0 ...bcm-bcm2835-pm-Add-support-for-2711.patch} | 0 ...ncobj_find_fence-to-support-timelin.patch} | 0 ...-after-free-race-accessing-the-sche.patch} | 0 ...tle-debugfs-entry-for-measuring-the.patch} | 0 ...comment-about-what-uses-v3d_job_dep.patch} | 0 ...ean-up-the-reservation-object-setup.patch} | 0 ...port-for-submitting-jobs-to-the-TFU.patch} | 0 ...dev-argument-to-lock-unlock-of-BO-r.patch} | 0 ...missing-fence-timeline-name-for-TFU.patch} | 0 ...e-tracepoints-for-V3D-GPU-rendering.patch} | 0 ...rm-v3d-Drop-unused-v3d_flush_caches.patch} | 0 ...t-bother-flushing-L1TD-at-job-start.patch} | 0 ...-the-wait-for-L2T-flush-to-complete.patch} | 0 ...Stop-trying-to-flush-L2C-on-V3D-3.3.patch} | 0 ...date-the-caches-from-the-outside-in.patch} | 0 ...ats-accounting-for-dma-buf-imported.patch} | 0 ...ci_urb_enqueue-to-support-hid.mousep.patch | 122 -- ...p-level-kerneldoc-for-the-addition-.patch} | 0 ...ctrl-bcm2835-Add-support-for-BCM2838.patch | 90 -- ...ps-at-boot-with-firmwarekms-on-4.19.patch} | 0 ...04-drm-v3d-Add-support-for-V3D-v4.2.patch} | 0 ...n-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch} | 0 ...-the-GPU-is-on-when-measuring-clock.patch} | 0 ...0-0507-drm-v3d-Add-support-for-2711.patch} | 0 ...flush-if-the-device-is-currently-of.patch} | 0 ...-drm-v3d-Hook-up-the-runtime-PM-ops.patch} | 0 ...drm-v3d-HACK-gut-runtime-pm-for-now.patch} | 0 ...drm-v3d-Update-to-upstream-IRQ-code.patch} | 0 ...e-fence-signaled-from-IRQs-to-irq_f.patch} | 0 ...513-drm-v3d-Refactor-job-management.patch} | 0 ...dd-missing-implicit-synchronization.patch} | 0 ...ronization-firmwarekms-against-GL-r.patch} | 0 ...-that-vblank-waits-work-without-v3d.patch} | 0 ...e-format-modifiers-for-firmware-kms.patch} | 0 ...vblank-timestamping-for-firmwarekms.patch} | 0 ...ch-to-the-newer-mailbox-frame-buffe.patch} | 0 ...n-overlay-plane-to-vc4-firmware-kms.patch} | 0 ...crease-max-screen-size-to-4096x4096.patch} | 0 ...pport-for-multiple-displays-to-fkms.patch} | 0 ... 950-0523-drm-vc4-Fix-build-warning.patch} | 0 ...splay-to-blank-during-initialisatio.patch} | 0 ...drm-vc4-Remove-now-unused-structure.patch} | 0 ...-display-ID-for-each-display-in-FKM.patch} | 0 ...isplay-number-when-querying-the-dis.patch} | 0 ...all-drm_crtc_vblank_-on-off-from-vc.patch} | 0 ...rt-for-H-V-flips-on-each-plane-for-.patch} | 0 ...used-vc4_fkms_cancel_page_flip-func.patch} | 0 ...ver-all-planes-in-vc4_crtc_-dis-en-.patch} | 0 ...s-into-line-with-kms-in-blocking-do.patch} | 0 ...4-Increase-max_width-height-to-7680.patch} | 0 ...s-the-EDID-from-fw-and-supports-mod.patch} | 0 ...upport-for-setting-leaf-clock-rates.patch} | 0 ...-reparenting-leaf-clocks-while-they.patch} | 0 ...support-for-compute-shader-dispatch.patch} | 0 ...-v3d-Clock-V3D-down-when-not-in-use.patch} | 0 ...kms-Remove-incorrect-overscan-suppo.patch} | 0 ...-drm-vc4-Log-flags-in-fkms-mode-set.patch} | 0 ...irmware-kms-Fix-DSI-display-support.patch} | 0 ...e-DPI-DSI-timings-from-the-firmware.patch} | 0 ...e-case-where-there-are-no-available.patch} | 0 ...544-drm-vc4-Support-the-VEC-in-FKMS.patch} | 0 ...typo-when-setting-HDMI-aspect-ratio.patch} | 0 ...m-vc4-Correct-SAND-support-for-FKMS.patch} | 0 ...query-the-VPU-for-HDMI-clock-limits.patch} | 0 ...ution-of-7680-is-conditional-on-bei.patch} | 0 ...-Remove-obsolete-comment-and-make-f.patch} | 0 ...-Add-in-allocation-for-VPU-requests.patch} | 0 ...-0551-staging-vc-sm-cma-Update-TODO.patch} | 0 ...cma-Add-in-userspace-allocation-API.patch} | 0 ...g-vcsm-cma-Add-cache-control-ioctls.patch} | 0 ...-Alter-dev-node-permissions-to-0666.patch} | 0 ...Drop-logging-level-on-messages-in-v.patch} | 0 ...Fixup-the-alloc-code-handling-of-ke.patch} | 0 ...ti-frame-buffer-support-from-the-Pi.patch} | 0 ...ove-BCM2835-6-7-specific-to-bcm2835.patch} | 0 ...-bcm2711-rpi-4-b.dts-and-components.patch} | 0 ...ays-Add-i2c3-6-and-uart2-5-overlays.patch} | 0 ...icetree-add-overlays-for-spi-3-to-6.patch} | 0 ...rlays-Add-the-spi-gpio40-45-overlay.patch} | 0 ...it-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch} | 0 ...-0564-2711-Add-basic-64-bit-support.patch} | 0 ...2835-Add-BCM2838_CLOCK_EMMC2-support.patch | 72 - ...orrect-vchiq-compatible-string-2840.patch} | 0 ...-downstream-vchiq-compatible-string.patch} | 0 ...5-dma-Add-proper-40-bit-DMA-support.patch} | 0 ...ve-bulk-channel-in-dma-channel-mask.patch} | 0 ...SQUASH-bcm2835-dma-Remove-debugging.patch} | 0 ...ts-Include-CSI-lane-config-for-csi1.patch} | 0 ...-vc4-Fix-T-format-modifiers-in-FKMS.patch} | 0 ...dts-Disable-the-v3d-node-by-default.patch} | 0 ...0MHz-clock-limit-from-FKMS-now-scra.patch} | 0 ...for-updating-interrupt-endpoint-int.patch} | 0 ...ci_fixup_endpoint-for-interval-adju.patch} | 0 ...ixup_endpoint-after-mangling-interv.patch} | 0 ...s-of-which-display-is-updated-throu.patch} | 0 ...ook-at-the-modifiers-correctly-for-.patch} | 0 ...m-dts-Fix-Pi4-PWR-LED-configuration.patch} | 0 ...orrect-gic400-memory-address-ranges.patch} | 0 ...-the-old-dma-controller-for-OF-conf.patch} | 0 ...82-drm-vc4-Limit-fkms-to-modes-85Hz.patch} | 0 ...m2835-Add-bcm2838-compatible-string.patch} | 0 ...ove-the-bcm27xx-inclusion-hierarchy.patch} | 0 ...dts-First-draft-of-upstream-Pi4-DTS.patch} | 0 ...ix-compatible-string-for-ds1307-RTC.patch} | 0 ...Fix-further-maxim-ds1307-references.patch} | 0 ...Cosmetic-change-to-upstream-overlay.patch} | 0 ...me-w1_family-struct-fixing-c-p-typo.patch} | 0 ...utput_write-cosmetic-fixes-simplify.patch} | 0 ...413-add-retry-support-to-state_read.patch} | 0 ...e-slave-is-not-responding-during-re.patch} | 0 ...1-ds2413-fix-state-byte-comparision.patch} | 0 ...MA-channel-and-memory-leak-in-vc4-3.patch} | 0 ...08_fb-Revert-cma-allocation-attempt.patch} | 0 ...rt-for-color-encoding-on-YUV-planes.patch} | 0 ...d-coherent_pool-1M-to-Pi-4-bootargs.patch} | 0 ...orrect-gpio-fan-gpio-flags-for-4.19.patch} | 0 ...Remove-cache-manipulation-ioctl-fro.patch} | 0 ...hack-xhci_urb_enqueue-to-support-hid.patch | 113 -- ...-cma-Rework-to-use-dma-APIs-not-CMA.patch} | 0 ...-Fix-the-few-remaining-coding-style.patch} | 0 ...-add-new-capabilities-for-buffer-ty.patch} | 0 ...et-reqbufs-create_bufs-capabilities.patch} | 0 ...-reqbufs-0-with-in-use-MMAP-buffers.patch} | 0 ...l-parameters-to-the-rpi-poe-overlay.patch} | 0 ...i3-overlays-to-be-less-model-specif.patch} | 0 ...IRQ-request-after-clock-code-in-pro.patch} | 0 ...35-Ensure-clock-exists-when-probing.patch} | 0 ...lays-i2c-gpio-Fix-the-bus-parameter.patch} | 0 ...11-Make-TX-optimisation-conditional.patch} | 0 ...r-host-controllers-that-don-t-updat.patch} | 0 ...5-Set-clock-stretch-timeout-to-35ms.patch} | 0 ...-Add-missing-dependency-on-MFD_CORE.patch} | 0 ...> 950-0614-overlays-Add-PCF2129-RTC.patch} | 0 ...s-dpi18-and-dpi24-vc4-compatibility.patch} | 0 ...ys-Add-i2c0-and-i2c1-for-regularity.patch} | 0 ...move-spinlock-usage-around-spi_sync.patch} | 0 ...m64-mm-Limit-the-DMA-zone-for-arm64.patch} | 0 ...Query-firmware-for-custom-HDMI-mode.patch} | 0 ...drm-vrefresh-to-the-firmware-on-mod.patch} | 0 ...erlays-audremap-Support-GPIOs-18-19.patch} | 0 ...x-drm_mode_create_tv_properties-doc.patch} | 0 ...ctor-Clarify-the-unit-of-TV-margins.patch} | 0 ...llow-creation-of-margin-props-alone.patch} | 0 ...in-setup-into-account-when-updating.patch} | 0 ...-margin-props-to-the-HDMI-connector.patch} | 0 ...vc4-Add-support-for-margins-to-fkms.patch} | 0 ...4-Ensure-zpos-is-always-initialised.patch} | 0 ...-Allow-reqbufs-0-with-in-use-MMAP-bu.patch | 55 - ...issing-properties-for-pmu-and-gic-n.patch} | 0 ...s-the-Hifiberry-DAC-ADC-PRO-version.patch} | 0 ...odecs-Correct-Katana-minimum-volume.patch} | 0 ...esent-but-empty-dmas-disables-audio.patch} | 0 ...-Add-audio-parameter-to-vc4-kms-v3d.patch} | 0 ...verlays-Update-the-upstream-overlay.patch} | 0 ...upt-handing-for-non-existent-displa.patch} | 0 ...correct-name-for-the-Raspberry-Pi-v.patch} | 0 ...har-rpivid-also-support-legacy-name.patch} | 0 ...e-quirks-for-Freeway-Airmouse-T3-an.patch} | 0 ...dd-Broadcast-RGB-connector-property.patch} | 0 ...-documentation-for-drm_cmdline_mode.patch} | 0 ...des-Rewrite-the-command-line-parser.patch} | 0 ...ort-modes-names-on-the-command-line.patch} | 0 ...o-specify-rotation-and-reflection-o.patch} | 0 ...or-Introduce-a-TV-margins-structure.patch} | 0 ...drm-modes-Parse-overscan-properties.patch} | 0 ...function-to-reset-connector-TV-prop.patch} | 0 ...i-Set-default-state-margin-at-reset.patch} | 0 ...s-Set-default-state-margin-at-reset.patch} | 0 ...pply-cmdline-s-rotation-if-it-wasn-.patch} | 0 ...35-codec-switch-to-multi-planar-API.patch} | 0 ...odec-implement-V4L2_CID_MIN_BUFFERS.patch} | 0 ...odec-set-device_caps-in-struct-vide.patch} | 0 ...53-Add-HDMI1-facility-to-the-driver.patch} | 0 ...Add-baudrate-parameter-to-i2c3-i2c6.patch} | 0 ...he-vblank-warnings-on-mode-switchin.patch} | 0 ...drm-vc4-Remove-unused-mode-variable.patch} | 0 ...odec-Expand-logging-on-format-setti.patch} | 0 ...odec-Correct-bytesperline-on-format.patch} | 0 ...ng-NULL-check-to-vc4_crtc_consume_e.patch} | 0 ...-Workaround-2-for-Pi4-Ethernet-fail.patch} | 0 ...m-vc4-Fix-TILE_Y_OFFSET-definitions.patch} | 0 ...efine-missing-PITCH0_SINK_PIX-field.patch} | 0 ...tomic_helper_check_plane_state-to-s.patch} | 0 ...ets-adjustment-out-of-setup_clippin.patch} | 0 ...ositioning-of-planes-using-T_TILES-.patch} | 0 ...pointer-dereference-in-the-async-up.patch} | 0 ...m2711-rpi-4-b-I2C-aliases-and-pulls.patch} | 0 ...re-event-ring-segment-table-entries.patch} | 0 ..._buf-for-small-IN-control-transfers.patch} | 0 ...tb-bounce-buffer-implementation-to-.patch} | 0 ...71-configs-arm64-vcm2711-Enable-V3D.patch} | 0 ...ys-sc16ic752-i2c-Fix-xtal-parameter.patch} | 0 ...3-vc-sm-cma-Fix-compatibility-ioctl.patch} | 0 ...odec-add-support-for-V4L2_CID_MPEG_.patch} | 0 ...odec-remove-unnecessary-padding-on-.patch} | 0 ...dd-missing-Raspberry-Pi-model-names.patch} | 0 ...rch-arm-Add-model-string-to-cpuinfo.patch} | 0 ...dd-Revision-Serial-Model-to-cpuinfo.patch} | 0 ...-Add-binding-for-the-Sony-IMX219-se.patch} | 0 ...c-Add-driver-for-Sony-IMX219-sensor.patch} | 0 ...erlay-for-the-Sony-IMX219-image-sen.patch} | 0 ...odec-Fix-non-documentation-comment-.patch} | 0 ...2835-codec-Fix-declaration-of-roles.patch} | 0 ...m2835-codec-Add-role-to-device-name.patch} | 0 ...odec-Pass-driver-context-to-create-.patch} | 0 ...-codec-add-media-controller-support.patch} | 0 ...icam-Reduce-scope-of-local-function.patch} | 0 ...unicam-add-media-controller-support.patch} | 0 ...e-under-arm64-or-any-other-platform.patch} | 0 ...nmap_sg-calls-to-free-relevant-swio.patch} | 0 ...-rename-the-GPIO-pins-node-with-the.patch} | 0 ...-Add-option-for-not-connecting-the-.patch} | 0 ...-0693-v4l2-Add-a-Greyworld-AWB-mode.patch} | 0 ...m2835-camera-Add-greyworld-AWB-mode.patch} | 0 ...PCI-brcmstb-Fix-compilation-warning.patch} | 0 ...margins-in-composite-SDTV-mode-3223.patch} | 0 ...berry-DAC-DSP-soundcard-driver-3224.patch} | 0 ...-bcm2835-codec-Allow-height-of-1920.patch} | 0 ...odec-Correct-g-s_selection-API-MPLA.patch} | 0 ...gpio-Allow-nonexclusive-GPIO-access.patch} | 0 ...e-nonexclusive-gpiods-from-DT-nodes.patch} | 0 ...2-Fix-poll-rate-on-touchscreen-3238.patch} | 0 ...for-Pi-2B-rev-1.2-with-BCM2837-3235.patch} | 0 ...ches-at-the-end-of-render-jobs-on-re.patch | 177 +++ ...audio-Fix-draining-behavior-regressi.patch | 56 + ...ayout-of-struct-vc4_display_settings.patch | 34 + ...283x-Fix-DTC-warning-for-memory-node.patch | 68 + ...27xx-Fix-DTC-warning-for-memory-node.patch | 52 + ...nable-DMA-support-for-SPI-controller.patch | 42 + ...rpi-Drop-unnecessary-address-cells-s.patch | 30 + ...rpi-Define-the-downstream-MMC-interf.patch | 40 + ...Define-MMC-interfaces-at-board-level.patch | 194 +++ ...35-rpi-zero-w-Fix-bus-width-of-sdhci.patch | 28 + ...rpi-Define-the-downstream-HDMI-power.patch | 24 + ...s-bcm283x-Enable-HDMI-at-board-level.patch | 163 +++ ...oduce-SoC-specific-clock-registratio.patch | 597 ++++++++ ...2835-Add-BCM2711_CLOCK_EMMC2-support.patch | 91 ++ ...oard-clk-and-pinctrl-to-bcm2711-comp.patch | 71 + ...rl-bcm2835-Switch-to-SPDX-identifier.patch | 62 + ...cm2835-declare-pin-config-as-generic.patch | 27 + ...Direct-GPIO-config-changes-to-generi.patch | 37 + ...Add-support-for-BCM2711-pull-up-func.patch | 183 +++ ...-device-names-check-for-enable-state.patch | 139 ++ ...nce64.c-dev_err-dev_info-for-info-me.patch | 25 + ...gpio-shutdown-Add-debounce-parameter.patch | 48 + ...726-overlays-fix-compatible-for-RPi4.patch | 204 +++ ...-bcm2711-Retain-support-for-old-dtbs.patch | 55 + ...unicam-Add-support-for-raw14-formats.patch | 49 + ...icam-Rework-to-not-cache-the-list-of.patch | 387 ++++++ ...icam-Support-unpacking-CSI-format-to.patch | 254 ++++ ...icam-Add-support-for-luma-greyscale-.patch | 50 + ...ort-for-YUV-color-encodings-and-rang.patch | 138 ++ ...ative-X-Y-positioning-on-SAND-planes.patch | 68 + ...34-drm-vc4-Add-support-for-H-V-flips.patch | 135 ++ ...handling-of-rotation-parameter-in-fk.patch | 87 ++ .../950-0736-overlays-Add-w5500-overlay.patch | 113 ++ ...icam-Replace-hard-coded-loop-limit-w.patch | 44 + ...icam-Fix-one-to-many-mapping-for-YUY.patch | 144 ++ ...binding-for-the-Infineon-IRS1125-sen.patch | 66 + ...driver-for-the-Infineon-IRS1125-dept.patch | 1231 +++++++++++++++++ ...-an-overlay-for-the-Infineon-IRS1125.patch | 149 ++ ...dcard-Fixed-MCLKDIV-for-Allo-Digione.patch | 42 + ...838-Disable-DWC-OTG-block-by-default.patch | 23 + ...codec-Add-support-for-ENUM_FRAMESIZE.patch | 98 ++ ...codec-Correct-buffer-type-check-on-G.patch | 25 + ...codec-Set-default-and-error-check-ti.patch | 37 + ...codec-Fix-imbalance-in-dma_buf_get-d.patch | 30 + ...lls-for-firmware-display-blank-unbla.patch | 87 ++ ...0749-rpi-poe-fan-fix-def_pwm1-writes.patch | 21 + ...Encode-link-speed-and-activity-into-.patch | 67 + ...ow-ethernet-LED-mode-to-be-set-via-d.patch | 119 ++ ...verlays-smi-fix-typo-in-comment-3320.patch | 23 + ...nge-the-default-ethernet-LED-actions.patch | 33 + ...ys-README-Remove-trailing-whitespace.patch | 21 + ...0-0755-overlays-Add-apds9960-overlay.patch | 103 ++ ...-pitft35-resistive-add-upstream-comp.patch | 27 + ...bcm2835-Avoid-null-pointer-exception.patch | 29 + ...Handle-missing-clock-more-gracefully.patch | 25 + ...cpi-scmi-Fix-freeing-of-dynamic-OPPs.patch | 197 +++ ...driver-interfacing-with-Raspberry-Pi.patch | 349 +++++ ...-cpufreq-add-driver-for-Raspberry-Pi.patch | 161 +++ ...ware-raspberrypi-register-clk-device.patch | 57 + ...register-platform-device-for-raspber.patch | 65 + .../950-0764-clk-bcm2835-remove-pllb.patch | 56 + ...3d_drv-Allow-clock-retrieval-by-name.patch | 23 + ...-clock-so-firmware-knows-we-are-usin.patch | 27 + ...Allow-cpufreq-driver-to-also-adjust-.patch | 25 + ...k-raspberrypi-Also-support-v3d-clock.patch | 640 +++++++++ ...0-0769-clk-bcm2835-Disable-v3d-clock.patch | 58 + ...k-raspberrypi-Also-support-v3d-clock.patch | 29 + ...k-raspberrypi-Also-support-v3d-clock.patch | 36 + ...req-Only-report-integer-pll-divisor-.patch | 40 + ...k-raspberrypi-Also-support-v3d-clock.patch | 54 + ...774-arm-dts-Correct-Pi-4B-LED-values.patch | 39 + ...ma_mask-as-well-as-coherent_dma_mask.patch | 25 + ...50-0776-arm-dts-2711-Add-pcie0-alias.patch | 24 + ...ev-Completely-disable-the-DT-warning.patch | 32 + ...3D-interactions-if-the-v3d-componen.patch} | 60 +- ...irst-codec-is-master-in-multicodec-s.patch | 34 + ...taneous-use-of-JustBoom-DAC-and-Digi.patch | 435 ++++++ ...-the-urb-transfer_buffer-too-early-3.patch | 59 + ...ays-Make-mcp342x-run-time-compatible.patch | 209 +++ ...s-dht11-Allow-multiple-instantiation.patch | 34 + ...verlays-i2c-rtc-Add-pcf85363-support.patch | 56 + 803 files changed, 8999 insertions(+), 2031 deletions(-) rename target/linux/brcm2708/patches-4.19/{950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch => 950-0010-spi-bcm2835-Support-pin-groups-other-than-7-11.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch rename target/linux/brcm2708/patches-4.19/{950-0012-spi-bcm2835-Disable-forced-software-CS.patch => 950-0011-spi-bcm2835-Disable-forced-software-CS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0013-spi-bcm2835-Remove-unused-code.patch => 950-0012-spi-bcm2835-Remove-unused-code.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch => 950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0015-firmware-Updated-mailbox-header.patch => 950-0014-firmware-Updated-mailbox-header.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch => 950-0015-rtc-Add-SPI-alias-for-pcf2123-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch => 950-0016-watchdog-bcm2835-Support-setting-reboot-partition.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch => 950-0017-reboot-Use-power-off-rather-than-busy-spinning-when-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch => 950-0018-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0020-Register-the-clocks-early-during-the-boot-process-so.patch => 950-0019-Register-the-clocks-early-during-the-boot-process-so.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch => 950-0020-bcm2835-rng-Avoid-initialising-if-already-enabled.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch => 950-0021-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch => 950-0022-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0024-clk-bcm2835-Add-claim-clocks-property.patch => 950-0023-clk-bcm2835-Add-claim-clocks-property.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch => 950-0024-clk-bcm2835-Read-max-core-clock-from-firmware.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch => 950-0025-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0027-sound-Demote-deferral-errors-to-INFO-level.patch => 950-0026-sound-Demote-deferral-errors-to-INFO-level.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0028-Update-vfpmodule.c.patch => 950-0027-Update-vfpmodule.c.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0029-i2c-bcm2835-Add-debug-support.patch => 950-0028-i2c-bcm2835-Add-debug-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0030-mm-Remove-the-PFN-busy-warning.patch => 950-0029-mm-Remove-the-PFN-busy-warning.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch => 950-0030-ASoC-Add-prompt-for-ICS43432-codec.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch => 950-0031-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch => 950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch => 950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0035-amba_pl011-Round-input-clock-up.patch => 950-0034-amba_pl011-Round-input-clock-up.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch => 950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch => 950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch => 950-0037-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0039-Main-bcm2708-bcm2709-linux-port.patch => 950-0038-Main-bcm2708-bcm2709-linux-port.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0040-Add-dwc_otg-driver.patch => 950-0039-Add-dwc_otg-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0041-bcm2708-framebuffer-driver.patch => 950-0040-bcm2708-framebuffer-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0042-Speed-up-console-framebuffer-imageblit-function.patch => 950-0041-Speed-up-console-framebuffer-imageblit-function.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0043-dmaengine-Add-support-for-BCM2708.patch => 950-0042-dmaengine-Add-support-for-BCM2708.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0044-MMC-added-alternative-MMC-driver.patch => 950-0043-MMC-added-alternative-MMC-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch => 950-0044-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch => 950-0045-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch => 950-0046-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch => 950-0047-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0049-Add-SMI-driver.patch => 950-0048-Add-SMI-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch => 950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0051-Add-SMI-NAND-driver.patch => 950-0050-Add-SMI-NAND-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0052-Add-cpufreq-driver.patch => 950-0051-Add-cpufreq-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0053-Add-Chris-Boot-s-i2c-driver.patch => 950-0052-Add-Chris-Boot-s-i2c-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0054-char-broadcom-Add-vcio-module.patch => 950-0053-char-broadcom-Add-vcio-module.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch => 950-0054-firmware-bcm2835-Support-ARCH_BCM270x.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch => 950-0055-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0057-BCM2708-Add-core-Device-Tree-support.patch => 950-0056-BCM2708-Add-core-Device-Tree-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch => 950-0057-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch => 950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0060-Added-Device-IDs-for-August-DVB-T-205.patch => 950-0059-Added-Device-IDs-for-August-DVB-T-205.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch => 950-0060-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch => 950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch => 950-0062-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch => 950-0063-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch => 950-0064-ASoC-pcm512x-implement-set_tdm_slot-interface.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0066-ASoC-Add-support-for-Rpi-DAC.patch => 950-0065-ASoC-Add-support-for-Rpi-DAC.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch => 950-0066-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0068-Added-support-for-HiFiBerry-DAC.patch => 950-0067-Added-support-for-HiFiBerry-DAC.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch => 950-0068-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0070-Add-driver-for-rpi-proto.patch => 950-0069-Add-driver-for-rpi-proto.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0071-Add-Support-for-JustBoom-Audio-boards.patch => 950-0070-Add-Support-for-JustBoom-Audio-boards.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch => 950-0071-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch => 950-0072-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch => 950-0073-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch => 950-0074-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch => 950-0075-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch => 950-0076-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0078-Support-for-Blokas-Labs-pisound-board.patch => 950-0077-Support-for-Blokas-Labs-pisound-board.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch => 950-0078-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch => 950-0079-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch => 950-0080-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch => 950-0081-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch => 950-0082-Driver-support-for-Google-voiceHAT-soundcard.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch => 950-0083-Driver-and-overlay-for-Allo-Katana-DAC.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch => 950-0084-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch => 950-0085-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch rename target/linux/brcm2708/patches-4.19/{950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch => 950-0086-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0089-rpi_display-add-backlight-driver-and-overlay.patch => 950-0087-rpi_display-add-backlight-driver-and-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch => 950-0088-bcm2835-virtgpio-Virtual-GPIO-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0091-OF-DT-Overlay-configfs-interface.patch => 950-0089-OF-DT-Overlay-configfs-interface.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch => 950-0090-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0093-Add-arm64-configuration-and-device-tree-differences..patch => 950-0091-Add-arm64-configuration-and-device-tree-differences..patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch => 950-0092-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch => 950-0093-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch => 950-0094-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch => 950-0095-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0098-cache-export-clean-and-invalidate.patch => 950-0096-cache-export-clean-and-invalidate.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0099-AXI-performance-monitor-driver-2222.patch => 950-0097-AXI-performance-monitor-driver-2222.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch => 950-0098-mcp2515-Use-DT-supplied-interrupt-flags.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch => 950-0099-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch => 950-0100-ARM-bcm2835-Set-Serial-number-and-Revision.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch => 950-0101-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch rename target/linux/brcm2708/patches-4.19/{950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch => 950-0102-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch => 950-0103-raspberrypi-firmware-Export-the-general-transaction-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch => 950-0104-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch => 950-0105-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch => 950-0106-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch => 950-0107-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch => 950-0108-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch => 950-0109-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch => 950-0110-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch => 950-0111-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch => 950-0112-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch => 950-0113-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch => 950-0114-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0118-vc4_firmware_kms-fix-build.patch => 950-0115-vc4_firmware_kms-fix-build.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0119-hack-cache-Fix-linker-error.patch => 950-0116-hack-cache-Fix-linker-error.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch => 950-0117-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0121-sound-bcm-Fix-memset-dereference-warning.patch => 950-0118-sound-bcm-Fix-memset-dereference-warning.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch => 950-0119-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch => 950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch => 950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch => 950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch => 950-0123-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch => 950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch => 950-0125-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch => 950-0126-of-configfs-Use-of_overlay_fdt_apply-API-call.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch => 950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch => 950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0132-staging-vc04_services-Derive-g_cache_line_size.patch => 950-0129-staging-vc04_services-Derive-g_cache_line_size.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0133-Add-rpi-poe-fan-driver.patch => 950-0130-Add-rpi-poe-fan-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch => 950-0131-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch => 950-0132-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch => 950-0133-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0138-overlays-Fix-a-few-dtc-warnings.patch => 950-0134-overlays-Fix-a-few-dtc-warnings.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch => 950-0135-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch rename target/linux/brcm2708/patches-4.19/{950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch => 950-0136-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch => 950-0137-firmware-raspberrypi-Add-backward-compatible-get_thr.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch => 950-0138-sc16is7xx-Don-t-spin-if-no-data-received.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0143-Add-device-tree-overlay-for-HD44780.patch => 950-0139-Add-device-tree-overlay-for-HD44780.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch => 950-0140-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch => 950-0141-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch => 950-0142-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch => 950-0143-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch => 950-0144-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch => 950-0145-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch => 950-0146-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch => 950-0147-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch => 950-0148-ASoC-cs4265-Add-native-32bit-I2S-transport.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch => 950-0149-BCM270X_DT-Add-gpio-fan-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch => 950-0150-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch => 950-0151-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0156-Update-gpio-fan-overlay.dts-2711.patch => 950-0152-Update-gpio-fan-overlay.dts-2711.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch => 950-0153-drivers-thermal-step_wise-add-support-for-hysteresis.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch => 950-0154-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch => 950-0155-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch => 950-0156-overlays-add-overrides-for-PoE-HAT-fan-control.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch => 950-0157-overlays-Add-gpio-no-bank0-irq-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch => 950-0158-Add-hy28b-2017-model-device-tree-overlay-2721.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch => 950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch => 950-0160-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch => 950-0161-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch => 950-0162-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch => 950-0163-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0168-Fix-warning-in-bcm2835-smi-nand.patch => 950-0164-Fix-warning-in-bcm2835-smi-nand.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch => 950-0165-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch => 950-0166-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch => 950-0167-media-ov5647-Add-support-for-PWDN-GPIO.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch => 950-0168-media-ov5647-Add-support-for-non-continuous-clock-mo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0173-media-tc358743-Increase-FIFO-level-to-374.patch => 950-0169-media-tc358743-Increase-FIFO-level-to-374.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch => 950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch => 950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch => 950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0177-media-adv7180-Default-to-the-first-valid-input.patch => 950-0173-media-adv7180-Default-to-the-first-valid-input.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch => 950-0174-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch => 950-0175-media-videodev2-Add-helper-defines-for-printing-FOUR.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch => 950-0176-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch => 950-0177-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch => 950-0178-media-adv7180-Nasty-hack-to-allow-input-selection.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch => 950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch => 950-0180-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch => 950-0181-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch => 950-0182-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch => 950-0183-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0188-Update-README-2750.patch => 950-0184-Update-README-2750.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0189-overlays-Remove-superfluous-address-size-cells.patch => 950-0185-overlays-Remove-superfluous-address-size-cells.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch => 950-0186-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch => 950-0187-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch => 950-0188-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0194-overlays-Update-upstream-overlay.patch => 950-0189-overlays-Update-upstream-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0195-BCM2708_DT-update-firmware-node-binding.patch => 950-0190-BCM2708_DT-update-firmware-node-binding.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch rename target/linux/brcm2708/patches-4.19/{950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch => 950-0191-BCM2710_DT-fix-gpio-expander-bindings.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch => 950-0192-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch => 950-0193-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0199-dt-bindings-Document-microchip-downshift-after.patch => 950-0194-dt-bindings-Document-microchip-downshift-after.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch => 950-0195-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch => 950-0196-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch => 950-0197-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch => 950-0198-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch => 950-0199-lirc-rpi-Remove-in-favour-of-gpio-ir.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch => 950-0200-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch => 950-0201-media-tc358743-Return-an-appropriate-colorspace-from.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0207-staging-bcm2835-camera-fix-module-autoloading.patch => 950-0202-staging-bcm2835-camera-fix-module-autoloading.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch => 950-0203-staging-bcm2835-camera-Move-module-info-to-the-end.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch => 950-0204-staging-vchiq_arm-Fix-platform-device-unregistration.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch => 950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch => 950-0206-staging-bcm2835-camera-Provide-more-specific-probe-e.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch => 950-0207-staging-bcm2835-camera-Add-hint-about-possible-fault.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch => 950-0208-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch => 950-0209-staging-vchiq_arm-Improve-error-handling-on-loading-.patch} (79%) rename target/linux/brcm2708/patches-4.19/{950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch => 950-0210-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch => 950-0211-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch delete mode 100644 target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch rename target/linux/brcm2708/patches-4.19/{950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch => 950-0212-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch rename target/linux/brcm2708/patches-4.19/{950-0222-staging-bcm2835-camera-Return-early-on-errors.patch => 950-0213-staging-bcm2835-camera-Return-early-on-errors.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch rename target/linux/brcm2708/patches-4.19/{950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch => 950-0214-staging-bcm2835-camera-Remove-dead-email-addresses.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch => 950-0215-staging-bcm2835-camera-Fix-comment-style-violations.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch => 950-0216-staging-bcm2835-camera-Fix-spacing-around-operators.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch => 950-0217-staging-bcm2835-camera-Reduce-length-of-enum-names.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch => 950-0218-staging-bcm2835-camera-Fix-multiple-line-dereference.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch => 950-0219-staging-bcm2835-camera-Fix-brace-style-issues.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch => 950-0220-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch => 950-0221-staging-bcm2835-camera-Fix-logical-continuation-spli.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch => 950-0222-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch => 950-0223-staging-bcm2835-camera-Set-sequence-number-correctly.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch => 950-0224-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch => 950-0225-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch => 950-0226-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch => 950-0227-staging-bcm2835-camera-Unify-header-inclusion-define.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch => 950-0228-staging-bcm2835-camera-Fix-alignment-should-match-op.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch => 950-0229-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch => 950-0230-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch => 950-0231-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch => 950-0232-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch => 950-0233-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch => 950-0234-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch => 950-0235-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch => 950-0236-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch => 950-0237-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch => 950-0238-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch => 950-0239-staging-mmal-vchiq-Add-support-for-event-callbacks.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch => 950-0240-staging-vc04_services-Support-sending-data-to-MMAL-p.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch => 950-0241-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch => 950-0242-staging-vc04_services-Add-new-vc-sm-cma-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch => 950-0243-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch => 950-0244-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch => 950-0245-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch => 950-0246-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch => 950-0247-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch} (78%) rename target/linux/brcm2708/patches-4.19/{950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch => 950-0248-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch} (87%) rename target/linux/brcm2708/patches-4.19/{950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch => 950-0249-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch => 950-0250-tpm-Make-SECURITYFS-a-weak-dependency.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch => 950-0251-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch => 950-0252-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch => 950-0253-overlays-Update-README-with-removal-of-lirc-rpi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch => 950-0254-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0267-gpio-ir-change-default-pull-configuration-to-up.patch => 950-0255-gpio-ir-change-default-pull-configuration-to-up.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch => 950-0256-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch => 950-0257-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch => 950-0258-arm64-dts-broadcom-Enable-fixups-for-overlays.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch => 950-0259-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch rename target/linux/brcm2708/patches-4.19/{950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch => 950-0260-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch => 950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch => 950-0262-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch rename target/linux/brcm2708/patches-4.19/{950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch => 950-0263-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch rename target/linux/brcm2708/patches-4.19/{950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch => 950-0264-overlays-sdio-Add-enhanced-1-bit-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch => 950-0265-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch => 950-0266-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch => 950-0267-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch => 950-0268-overlays-Add-ssd1306-overlay-for-OLED-display.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0281-overlays-mcp23017-Support-the-MCP23008.patch => 950-0269-overlays-mcp23017-Support-the-MCP23008.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0282-overlays-Add-mcp342x-overlay.patch => 950-0270-overlays-Add-mcp342x-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0283-char-vcio-Add-compat-ioctl-handling.patch => 950-0271-char-vcio-Add-compat-ioctl-handling.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch => 950-0272-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch => 950-0273-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch => 950-0274-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch => 950-0275-staging-bcm2835-camera-Set-the-field-value-within-ea.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch => 950-0276-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0289-char-vc_mem-Fix-all-coding-style-issues.patch => 950-0277-char-vc_mem-Fix-all-coding-style-issues.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch => 950-0278-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch => 950-0279-mfd-Add-rpi_sense_core-of-compatible-string.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch => 950-0280-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch => 950-0281-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch => 950-0282-dtoverlays-Correct-DT-handling-camera-GPIOs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch => 950-0283-media-ov5647-Use-gpiod_set_value_cansleep.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch => 950-0284-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0297-audioinjector-octo-revert-to-dummy-supplies.patch => 950-0285-audioinjector-octo-revert-to-dummy-supplies.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch => 950-0286-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch => 950-0287-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch => 950-0288-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch => 950-0289-video-bcm2708_fb-Add-compat_ioctl-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch => 950-0290-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch => 950-0291-video-bcm2708_fb-Clean-up-coding-style-issues.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch => 950-0292-bcm2835-dma-Add-support-for-per-channel-flags.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch => 950-0293-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch => 950-0294-ASoC-pcm512x-Implement-the-digital_mute-interface.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch => 950-0295-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch => 950-0296-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch => 950-0297-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch => 950-0298-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch => 950-0299-staging-vc-sm-cma-Correct-DMA-configuration.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch => 950-0300-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch => 950-0301-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0314-configs-Enable-the-AD193x-codecs.patch => 950-0302-configs-Enable-the-AD193x-codecs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch => 950-0303-overlays-balenaFin-v1.1.0-carrier-board-update.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch => 950-0304-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch => 950-0305-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch => 950-0306-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch => 950-0307-staging-mmal-vchiq-Always-return-the-param-size-from.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch => 950-0308-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch => 950-0309-staging-bcm2835_codec-Query-supported-formats-from-t.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch => 950-0310-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch => 950-0311-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch => 950-0312-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch => 950-0313-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch => 950-0314-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch => 950-0315-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch => 950-0316-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0329-Added-mute-stream-func.patch => 950-0317-Added-mute-stream-func.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch => 950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch => 950-0319-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch => 950-0320-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0334-vcsm-Remove-set-but-unused-variable.patch => 950-0321-vcsm-Remove-set-but-unused-variable.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0335-vcsm-Reduce-scope-of-local-functions.patch => 950-0322-vcsm-Reduce-scope-of-local-functions.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch => 950-0323-staging-bcm2835-codec-NULL-component-handle-on-queue.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch => 950-0324-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch => 950-0325-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch => 950-0326-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch => 950-0327-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch => 950-0328-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch => 950-0329-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch => 950-0330-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch => 950-0331-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch rename target/linux/brcm2708/patches-4.19/{950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch => 950-0332-bcm2835-mmc-Fix-DMA-channel-leak.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch => 950-0333-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch => 950-0334-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch => 950-0335-bcm2835-mmc-Handle-mmc_add_host-errors.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch => 950-0336-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch => 950-0337-overlays-Add-max17040-support-to-i2c-sensor.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch => 950-0338-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch => 950-0339-staging-bcm2835-codec-Refactor-default-resolution-co.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0353-nvmem-add-type-attribute.patch => 950-0340-nvmem-add-type-attribute.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0354-rtc-rv3028-add-new-driver.patch => 950-0341-rtc-rv3028-add-new-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0355-overlays-Add-rv3028-to-i2c-rtc.patch => 950-0342-overlays-Add-rv3028-to-i2c-rtc.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch => 950-0343-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch => 950-0344-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch => 950-0345-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch => 950-0346-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch => 950-0347-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch => 950-0348-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch => 950-0349-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch => 950-0350-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch => 950-0351-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch => 950-0352-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch => 950-0353-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch => 950-0354-ASoC-tlv320aic32x4-Remove-mclk-references.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch => 950-0355-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch => 950-0356-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch => 950-0357-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch => 950-0358-ASoC-tlv320aic32x4-Change-author-s-name.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch => 950-0359-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch => 950-0360-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch => 950-0361-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch => 950-0362-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch => 950-0363-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch => 950-0364-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0378-Input-ili210x-add-DT-binding-document.patch => 950-0365-Input-ili210x-add-DT-binding-document.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch => 950-0366-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch => 950-0367-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch => 950-0368-rtc-rv3028-Add-backup-switchover-mode-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0382-dt-bindings-rv3028-backup-switchover-support.patch => 950-0369-dt-bindings-rv3028-backup-switchover-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch => 950-0370-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch => 950-0371-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch => 950-0372-sound-Fixes-for-audioinjector-octo-under-4.19.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0387-overlays-Add-PiGlow-overlay.patch => 950-0373-overlays-Add-PiGlow-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch => 950-0374-staging-bcm2835-audio-Clean-up-mutex-locks.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch => 950-0375-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch => 950-0376-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch => 950-0377-staging-bcm2835-audio-Remove-redundant-substream-mas.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch => 950-0378-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch => 950-0379-staging-bcm2835-audio-Remove-redundant-function-call.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch => 950-0380-staging-bcm2835-audio-Remove-superfluous-open-flag.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch => 950-0381-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch => 950-0382-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch => 950-0383-staging-bcm2835-audio-Kill-unused-spinlock.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch => 950-0384-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch => 950-0385-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch rename target/linux/brcm2708/patches-4.19/{950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch => 950-0386-staging-bcm2835-audio-Drop-useless-NULL-check.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch => 950-0387-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch rename target/linux/brcm2708/patches-4.19/{950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch => 950-0388-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch rename target/linux/brcm2708/patches-4.19/{950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch => 950-0389-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch rename target/linux/brcm2708/patches-4.19/{950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch => 950-0390-staging-bcm2835-audio-Add-10ms-period-constraint.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch => 950-0391-staging-bcm2835-audio-Make-single-vchi-handle.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch => 950-0392-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch => 950-0393-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0411-staging-bcm2835-audio-Use-card-private_data.patch => 950-0394-staging-bcm2835-audio-Use-card-private_data.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch => 950-0395-staging-bcm2835-audio-Use-standard-error-print-helpe.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch => 950-0396-staging-bcm2835-audio-Remove-unnecessary-header-file.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch => 950-0397-staging-bcm2835-audio-Move-module-parameter-descript.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch => 950-0398-staging-bcm2835-audio-Use-coherent-device-buffers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch => 950-0399-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch => 950-0400-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch => 950-0401-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch => 950-0402-staging-bcm2835-audio-Simplify-card-object-managemen.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch => 950-0403-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch => 950-0404-staging-bcm2835-audio-don-t-initialize-memory-twice.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch => 950-0405-staging-bcm2835-audio-reorder-variable-declarations-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch => 950-0406-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch => 950-0407-staging-bcm2835-audio-more-generic-probe-function-na.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch => 950-0408-staging-bcm2835-audio-rename-platform_driver-structu.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0426-staging-bcm2835-audio-update-TODO.patch => 950-0409-staging-bcm2835-audio-update-TODO.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch => 950-0410-staging-bcm2835-audio-interpolate-audio-delay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0428-staging-bcm2835-audio-Enable-compile-test.patch => 950-0411-staging-bcm2835-audio-Enable-compile-test.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch => 950-0412-staging-bcm2835-audio-use-module_platform_driver-mac.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch => 950-0413-staging-bcm2835-audio-double-free-in-init-error-path.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0432-dts-Increase-default-coherent-pool-size.patch => 950-0414-dts-Increase-default-coherent-pool-size.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch => 950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch => 950-0416-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch => 950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch => 950-0418-staging-mmal-vchiq-Free-the-event-context-for-contro.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch => 950-0419-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch => 950-0420-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch => 950-0421-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch => 950-0422-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch => 950-0423-Added-IQaudIO-Pi-Codec-board-support-2969.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch => 950-0424-w1-ds2408-reset-on-output_write-retry-with-readback.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch => 950-0425-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch => 950-0426-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch => 950-0427-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0450-.gitignore-Add-.dtbo-explicitly.patch => 950-0428-.gitignore-Add-.dtbo-explicitly.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch => 950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch rename target/linux/brcm2708/patches-4.19/{950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch => 950-0430-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch => 950-0431-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch => 950-0432-overlays-Remove-upstream-aux-interrupt-overlay.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch rename target/linux/brcm2708/patches-4.19/{950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch => 950-0433-overlays-Standardise-on-compatible-brcm-bcm2835.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch rename target/linux/brcm2708/patches-4.19/{950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch => 950-0434-vc4-Remove-interrupt-and-DMA-trampling.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch => 950-0435-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch => 950-0436-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0459-overlays-Update-upstream-overlay.patch => 950-0437-overlays-Update-upstream-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch => 950-0438-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch => 950-0439-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch => 950-0440-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch => 950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0464-Fixed-48k-timing-issue.patch => 950-0442-Fixed-48k-timing-issue.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch rename target/linux/brcm2708/patches-4.19/{950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch => 950-0443-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch => 950-0444-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch rename target/linux/brcm2708/patches-4.19/{950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch => 950-0445-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch => 950-0446-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch => 950-0447-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch => 950-0448-i2c-bcm2835-Model-Divider-in-CCF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0471-staging-vc04_services-Use-correct-cache-line-size.patch => 950-0449-staging-vc04_services-Use-correct-cache-line-size.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0472-tty-amba-pl011-allow-shared-interrupt.patch => 950-0450-tty-amba-pl011-allow-shared-interrupt.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch => 950-0451-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch => 950-0452-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch => 950-0453-ARM-dts-Add-label-to-bcm2835-RNG.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch => 950-0454-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0477-BCM270X_DT-Minor-tidy-up.patch => 950-0455-BCM270X_DT-Minor-tidy-up.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch => 950-0456-arm-bcm2835-Fix-FIQ-early-ioremap.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch => 950-0457-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch => 950-0458-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch => 950-0459-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0482-PCI-brcmstb-Add-MSI-capability.patch => 950-0460-PCI-brcmstb-Add-MSI-capability.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch => 950-0461-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0484-pcie-brcmstb-Changes-for-BCM2711.patch => 950-0462-pcie-brcmstb-Changes-for-BCM2711.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch => 950-0463-arm-bcm2835-DMA-can-only-address-1GB.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch => 950-0464-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0487-mmc-sdhci-Mask-spurious-interrupts.patch => 950-0465-mmc-sdhci-Mask-spurious-interrupts.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch => 950-0466-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch => 950-0467-hwrng-iproc-rng200-Add-BCM2838-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch => 950-0468-thermal-brcmstb_thermal-Add-BCM2838-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0491-vchiq-Add-36-bit-address-support.patch => 950-0469-vchiq-Add-36-bit-address-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch => 950-0470-bcm2835-pcm.c-Support-multichannel-audio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0493-bcmgenet-constrain-max-DMA-burst-length.patch => 950-0471-bcmgenet-constrain-max-DMA-burst-length.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch => 950-0472-bcmgenet-Better-coalescing-parameter-defaults.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch => 950-0473-net-genet-enable-link-energy-detect-powerdown-for-ex.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch => 950-0474-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch => 950-0475-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch => 950-0476-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch => 950-0477-usb-xhci-Disable-the-XHCI-5-second-timeout.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch => 950-0478-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0503-spi-bcm2835-enable-shared-interrupt-support.patch => 950-0479-spi-bcm2835-enable-shared-interrupt-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch => 950-0480-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch => 950-0481-clk-bcm2835-Don-t-wait-for-pllh-lock.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch => 950-0482-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch => 950-0483-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch => 950-0484-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch => 950-0485-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch => 950-0486-soc-bcm-bcm2835-pm-Add-support-for-2711.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch => 950-0487-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch => 950-0488-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch => 950-0489-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch => 950-0490-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch => 950-0491-drm-v3d-Clean-up-the-reservation-object-setup.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch => 950-0492-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch => 950-0493-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch => 950-0494-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch => 950-0495-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch => 950-0496-drm-v3d-Drop-unused-v3d_flush_caches.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch => 950-0497-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch => 950-0498-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch => 950-0499-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch => 950-0500-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch => 950-0501-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch rename target/linux/brcm2708/patches-4.19/{950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch => 950-0502-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch rename target/linux/brcm2708/patches-4.19/{950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch => 950-0503-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch => 950-0504-drm-v3d-Add-support-for-V3D-v4.2.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch => 950-0505-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch => 950-0506-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0532-drm-v3d-Add-support-for-2711.patch => 950-0507-drm-v3d-Add-support-for-2711.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch => 950-0508-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch => 950-0509-drm-v3d-Hook-up-the-runtime-PM-ops.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch => 950-0510-drm-v3d-HACK-gut-runtime-pm-for-now.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch => 950-0511-drm-v3d-Update-to-upstream-IRQ-code.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch => 950-0512-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0538-drm-v3d-Refactor-job-management.patch => 950-0513-drm-v3d-Refactor-job-management.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0539-drm-v3d-Add-missing-implicit-synchronization.patch => 950-0514-drm-v3d-Add-missing-implicit-synchronization.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch => 950-0515-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch => 950-0516-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch => 950-0517-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch => 950-0518-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch => 950-0519-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch => 950-0520-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch => 950-0521-drm-vc4-Increase-max-screen-size-to-4096x4096.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch => 950-0522-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0548-drm-vc4-Fix-build-warning.patch => 950-0523-drm-vc4-Fix-build-warning.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch => 950-0524-drm-vc4-Select-display-to-blank-during-initialisatio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0550-drm-vc4-Remove-now-unused-structure.patch => 950-0525-drm-vc4-Remove-now-unused-structure.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch => 950-0526-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch => 950-0527-drm-vc4-Set-the-display-number-when-querying-the-dis.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch => 950-0528-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch => 950-0529-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch => 950-0530-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch => 950-0531-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch => 950-0532-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0558-drm-vc4-Increase-max_width-height-to-7680.patch => 950-0533-drm-vc4-Increase-max_width-height-to-7680.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch => 950-0534-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch => 950-0535-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch => 950-0536-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch => 950-0537-drm-v3d-Add-support-for-compute-shader-dispatch.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch => 950-0538-drm-v3d-Clock-V3D-down-when-not-in-use.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch => 950-0539-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch => 950-0540-drm-vc4-Log-flags-in-fkms-mode-set.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch => 950-0541-drm-vc4-firmware-kms-Fix-DSI-display-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch => 950-0542-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch => 950-0543-drm-vc4-handle-the-case-where-there-are-no-available.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch => 950-0544-drm-vc4-Support-the-VEC-in-FKMS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch => 950-0545-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch => 950-0546-drm-vc4-Correct-SAND-support-for-FKMS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch => 950-0547-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch => 950-0548-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch => 950-0549-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch => 950-0550-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0577-staging-vc-sm-cma-Update-TODO.patch => 950-0551-staging-vc-sm-cma-Update-TODO.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch => 950-0552-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch => 950-0553-staging-vcsm-cma-Add-cache-control-ioctls.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch => 950-0554-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch => 950-0555-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch => 950-0556-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch => 950-0557-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch => 950-0558-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch => 950-0559-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch => 950-0560-overlays-Add-i2c3-6-and-uart2-5-overlays.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch => 950-0561-spi-devicetree-add-overlays-for-spi-3-to-6.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch => 950-0562-overlays-Add-the-spi-gpio40-45-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch => 950-0563-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0590-2711-Add-basic-64-bit-support.patch => 950-0564-2711-Add-basic-64-bit-support.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch rename target/linux/brcm2708/patches-4.19/{950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch => 950-0565-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch => 950-0566-arm-dts-Change-downstream-vchiq-compatible-string.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch => 950-0567-bcm2835-dma-Add-proper-40-bit-DMA-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch => 950-0568-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch => 950-0569-SQUASH-bcm2835-dma-Remove-debugging.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0596-dts-Include-CSI-lane-config-for-csi1.patch => 950-0570-dts-Include-CSI-lane-config-for-csi1.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch => 950-0571-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch => 950-0572-bcm2711-dts-Disable-the-v3d-node-by-default.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch => 950-0573-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch => 950-0574-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch => 950-0575-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch => 950-0576-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch => 950-0577-drm-vc4-Add-status-of-which-display-is-updated-throu.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch => 950-0578-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch => 950-0579-arm-dts-Fix-Pi4-PWR-LED-configuration.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch => 950-0580-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch => 950-0581-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch => 950-0582-drm-vc4-Limit-fkms-to-modes-85Hz.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch => 950-0583-arm-bcm2835-Add-bcm2838-compatible-string.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch => 950-0584-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch => 950-0585-arm-dts-First-draft-of-upstream-Pi4-DTS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch => 950-0586-overlays-Fix-compatible-string-for-ds1307-RTC.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0614-overlays-Fix-further-maxim-ds1307-references.patch => 950-0587-overlays-Fix-further-maxim-ds1307-references.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch => 950-0588-overlays-Cosmetic-change-to-upstream-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch => 950-0589-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch => 950-0590-w1-ds2413-output_write-cosmetic-fixes-simplify.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0618-w1-ds2413-add-retry-support-to-state_read.patch => 950-0591-w1-ds2413-add-retry-support-to-state_read.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch => 950-0592-w1-ds2413-when-the-slave-is-not-responding-during-re.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0620-w1-ds2413-fix-state-byte-comparision.patch => 950-0593-w1-ds2413-fix-state-byte-comparision.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch => 950-0594-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch => 950-0595-video-bcm2708_fb-Revert-cma-allocation-attempt.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch => 950-0596-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch => 950-0597-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch => 950-0598-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch => 950-0599-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch rename target/linux/brcm2708/patches-4.19/{950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch => 950-0600-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch => 950-0601-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch => 950-0602-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch => 950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch => 950-0604-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch => 950-0605-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch => 950-0606-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch => 950-0607-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch => 950-0608-i2c-bcm2835-Ensure-clock-exists-when-probing.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch => 950-0609-overlays-i2c-gpio-Fix-the-bus-parameter.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch => 950-0610-tty-amba-pl011-Make-TX-optimisation-conditional.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch => 950-0611-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch => 950-0612-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch => 950-0613-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0642-overlays-Add-PCF2129-RTC.patch => 950-0614-overlays-Add-PCF2129-RTC.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch => 950-0615-overlays-dpi18-and-dpi24-vc4-compatibility.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch => 950-0616-overlays-Add-i2c0-and-i2c1-for-regularity.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch => 950-0617-Pisound-Remove-spinlock-usage-around-spi_sync.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch => 950-0618-arm64-mm-Limit-the-DMA-zone-for-arm64.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch => 950-0619-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch => 950-0620-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0649-overlays-audremap-Support-GPIOs-18-19.patch => 950-0621-overlays-audremap-Support-GPIOs-18-19.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch => 950-0622-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch => 950-0623-drm-connector-Clarify-the-unit-of-TV-margins.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch => 950-0624-drm-connector-Allow-creation-of-margin-props-alone.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch => 950-0625-drm-vc4-Take-margin-setup-into-account-when-updating.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch => 950-0626-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch => 950-0627-drm-vc4-Add-support-for-margins-to-fkms.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch => 950-0628-drm-vc4-Ensure-zpos-is-always-initialised.patch} (100%) delete mode 100644 target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch rename target/linux/brcm2708/patches-4.19/{950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch => 950-0629-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch => 950-0630-adds-the-Hifiberry-DAC-ADC-PRO-version.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0659-codecs-Correct-Katana-minimum-volume.patch => 950-0631-codecs-Correct-Katana-minimum-volume.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch => 950-0632-drm-vc4-A-present-but-empty-dmas-disables-audio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch => 950-0633-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0662-overlays-Update-the-upstream-overlay.patch => 950-0634-overlays-Update-the-upstream-overlay.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch => 950-0635-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch => 950-0636-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0665-driver-char-rpivid-also-support-legacy-name.patch => 950-0637-driver-char-rpivid-also-support-legacy-name.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch => 950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch => 950-0639-drm-vc4-Add-Broadcast-RGB-connector-property.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch => 950-0640-drm-connector-Add-documentation-for-drm_cmdline_mode.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0669-drm-modes-Rewrite-the-command-line-parser.patch => 950-0641-drm-modes-Rewrite-the-command-line-parser.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0670-drm-modes-Support-modes-names-on-the-command-line.patch => 950-0642-drm-modes-Support-modes-names-on-the-command-line.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch => 950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0672-drm-connector-Introduce-a-TV-margins-structure.patch => 950-0644-drm-connector-Introduce-a-TV-margins-structure.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0673-drm-modes-Parse-overscan-properties.patch => 950-0645-drm-modes-Parse-overscan-properties.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch => 950-0646-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch => 950-0647-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch => 950-0648-drm-vc4-fkms-Set-default-state-margin-at-reset.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch => 950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch => 950-0650-staging-bcm2835-codec-switch-to-multi-planar-API.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch => 950-0651-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch => 950-0652-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0681-Add-HDMI1-facility-to-the-driver.patch => 950-0653-Add-HDMI1-facility-to-the-driver.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch => 950-0654-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch => 950-0655-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0684-drm-vc4-Remove-unused-mode-variable.patch => 950-0656-drm-vc4-Remove-unused-mode-variable.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch => 950-0657-staging-bcm2835-codec-Expand-logging-on-format-setti.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch => 950-0658-staging-bcm2835-codec-Correct-bytesperline-on-format.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch => 950-0659-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch => 950-0660-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch => 950-0661-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch => 950-0662-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch => 950-0663-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch => 950-0664-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch => 950-0665-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch => 950-0666-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch => 950-0667-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0696-xhci-Use-more-event-ring-segment-table-entries.patch => 950-0668-xhci-Use-more-event-ring-segment-table-entries.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch => 950-0669-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch => 950-0670-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0699-configs-arm64-vcm2711-Enable-V3D.patch => 950-0671-configs-arm64-vcm2711-Enable-V3D.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch => 950-0672-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch => 950-0673-vc-sm-cma-Fix-compatibility-ioctl.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch => 950-0674-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch => 950-0675-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch => 950-0676-arm-dts-add-missing-Raspberry-Pi-model-names.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0705-arch-arm-Add-model-string-to-cpuinfo.patch => 950-0677-arch-arm-Add-model-string-to-cpuinfo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch => 950-0678-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch => 950-0679-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch => 950-0680-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch => 950-0681-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch => 950-0682-staging-bcm2835-codec-Fix-non-documentation-comment-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch => 950-0683-staging-bcm2835-codec-Fix-declaration-of-roles.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch => 950-0684-staging-bcm2835-codec-Add-role-to-device-name.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch => 950-0685-staging-bcm2835-codec-Pass-driver-context-to-create-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0714-staging-bcm2835-codec-add-media-controller-support.patch => 950-0686-staging-bcm2835-codec-add-media-controller-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch => 950-0687-media-bcm2835-unicam-Reduce-scope-of-local-function.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0716-media-bcm2835-unicam-add-media-controller-support.patch => 950-0688-media-bcm2835-unicam-add-media-controller-support.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch => 950-0689-Limit-max_req_size-under-arm64-or-any-other-platform.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch => 950-0690-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch => 950-0691-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch => 950-0692-overlays-mcp23017-Add-option-for-not-connecting-the-.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch => 950-0693-v4l2-Add-a-Greyworld-AWB-mode.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch => 950-0694-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0723-PCI-brcmstb-Fix-compilation-warning.patch => 950-0695-PCI-brcmstb-Fix-compilation-warning.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch => 950-0696-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch => 950-0697-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch => 950-0698-staging-bcm2835-codec-Allow-height-of-1920.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch => 950-0699-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch => 950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch => 950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0730-Fix-poll-rate-on-touchscreen-3238.patch => 950-0702-Fix-poll-rate-on-touchscreen-3238.patch} (100%) rename target/linux/brcm2708/patches-4.19/{950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch => 950-0703-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch} (100%) create mode 100644 target/linux/brcm2708/patches-4.19/950-0704-drm-v3d-clean-caches-at-the-end-of-render-jobs-on-re.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0705-staging-bcm2835-audio-Fix-draining-behavior-regressi.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0706-bcm2708_fb-Fix-layout-of-struct-vc4_display_settings.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0707-ARM-dts-bcm283x-Fix-DTC-warning-for-memory-node.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0708-ARM-dts-bcm27xx-Fix-DTC-warning-for-memory-node.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0709-ARM-bcm283x-Enable-DMA-support-for-SPI-controller.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0710-ARM-dts-bcm2835-rpi-Drop-unnecessary-address-cells-s.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0711-ARM-dts-bcm2708-rpi-Define-the-downstream-MMC-interf.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0712-ARM-dts-bcm283x-Define-MMC-interfaces-at-board-level.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0713-ARM-dts-bcm2835-rpi-zero-w-Fix-bus-width-of-sdhci.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0714-ARM-dts-bcm2708-rpi-Define-the-downstream-HDMI-power.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0715-ARM-dts-bcm283x-Enable-HDMI-at-board-level.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0716-clk-bcm2835-Introduce-SoC-specific-clock-registratio.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0717-clk-bcm2835-Add-BCM2711_CLOCK_EMMC2-support.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0718-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0719-pinctrl-bcm2835-Switch-to-SPDX-identifier.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0720-pinctrl-bcm2835-declare-pin-config-as-generic.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0721-pinctrl-bcm2835-Direct-GPIO-config-changes-to-generi.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0722-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0723-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0724-pcie-brcmstb-bounce64.c-dev_err-dev_info-for-info-me.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0725-overlays-gpio-shutdown-Add-debounce-parameter.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0726-overlays-fix-compatible-for-RPi4.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0727-bcm2711-Retain-support-for-old-dtbs.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0728-media-bcm2835-unicam-Add-support-for-raw14-formats.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0729-media-bcm2835-unicam-Rework-to-not-cache-the-list-of.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0730-media-bcm2835-unicam-Support-unpacking-CSI-format-to.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0731-media-bcm2835-unicam-Add-support-for-luma-greyscale-.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0732-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0734-drm-vc4-Add-support-for-H-V-flips.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0735-drm-vc4-Correct-handling-of-rotation-parameter-in-fk.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0736-overlays-Add-w5500-overlay.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0737-media-bcm2835-unicam-Replace-hard-coded-loop-limit-w.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0738-media-bcm2835-unicam-Fix-one-to-many-mapping-for-YUY.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0739-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0740-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0741-dtoverlays-Add-an-overlay-for-the-Infineon-IRS1125.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0742-rpi-wm8804-soundcard-Fixed-MCLKDIV-for-Allo-Digione.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0743-dts-bcm2838-Disable-DWC-OTG-block-by-default.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-Add-support-for-ENUM_FRAMESIZE.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-Correct-buffer-type-check-on-G.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0746-staging-bcm2835-codec-Set-default-and-error-check-ti.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0747-staging-bcm2835-codec-Fix-imbalance-in-dma_buf_get-d.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0748-drm-vc4-Added-calls-for-firmware-display-blank-unbla.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0749-rpi-poe-fan-fix-def_pwm1-writes.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0750-net-phy-bcm54xx-Encode-link-speed-and-activity-into-.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0751-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0752-overlays-smi-fix-typo-in-comment-3320.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0753-net-phy-2711-Change-the-default-ethernet-LED-actions.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0754-overlays-README-Remove-trailing-whitespace.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0755-overlays-Add-apds9960-overlay.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0756-arm-dts-overlays-pitft35-resistive-add-upstream-comp.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0757-clk-bcm2835-Avoid-null-pointer-exception.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0758-v3d_drv-Handle-missing-clock-more-gracefully.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0759-cpufreq-scpi-scmi-Fix-freeing-of-dynamic-OPPs.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0760-clk-bcm283x-add-driver-interfacing-with-Raspberry-Pi.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0761-cpufreq-add-driver-for-Raspberry-Pi.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0762-firmware-raspberrypi-register-clk-device.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0763-clk-raspberrypi-register-platform-device-for-raspber.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0764-clk-bcm2835-remove-pllb.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0765-v3d_drv-Allow-clock-retrieval-by-name.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0766-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0767-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0768-clk-raspberrypi-Also-support-v3d-clock.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0769-clk-bcm2835-Disable-v3d-clock.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0770-fixup-clk-raspberrypi-Also-support-v3d-clock.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0771-fixup-clk-raspberrypi-Also-support-v3d-clock.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0772-raspberrypi-cpufreq-Only-report-integer-pll-divisor-.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0773-fixup-clk-raspberrypi-Also-support-v3d-clock.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0774-arm-dts-Correct-Pi-4B-LED-values.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0775-drm-v3d-Set-dma_mask-as-well-as-coherent_dma_mask.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0776-arm-dts-2711-Add-pcie0-alias.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch rename target/linux/brcm2708/patches-4.19/{950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch => 950-0778-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch} (71%) create mode 100644 target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0780-Allow-simultaneous-use-of-JustBoom-DAC-and-Digi.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0781-dwc_otg-checking-the-urb-transfer_buffer-too-early-3.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0782-overlays-Make-mcp342x-run-time-compatible.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0783-overlays-dht11-Allow-multiple-instantiation.patch create mode 100644 target/linux/brcm2708/patches-4.19/950-0784-overlays-i2c-rtc-Add-pcf85363-support.patch diff --git a/target/linux/brcm2708/bcm2711/config-4.19 b/target/linux/brcm2708/bcm2711/config-4.19 index 3c7d005fba..9d4671de8d 100644 --- a/target/linux/brcm2708/bcm2711/config-4.19 +++ b/target/linux/brcm2708/bcm2711/config-4.19 @@ -102,13 +102,14 @@ CONFIG_ARM_AMBA=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y -CONFIG_ARM_BCM2835_CPUFREQ=y +# CONFIG_ARM_BCM2835_CPUFREQ is not set CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3_ITS_PCI=y CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=y # CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ARM_TIMER_SP804=y @@ -148,6 +149,7 @@ CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y +CONFIG_CLK_RASPBERRYPI=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=8 @@ -163,7 +165,8 @@ CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_XGENE=y CONFIG_CONFIGFS_FS=y CONFIG_CONSOLE_TRANSLATIONS=y -# CONFIG_CPUFREQ_DT is not set +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -253,6 +256,7 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y @@ -461,6 +465,7 @@ CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y CONFIG_PM_GENERIC_DOMAINS_OF=y CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_OPP=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y CONFIG_POWER_RESET=y diff --git a/target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch b/target/linux/brcm2708/patches-4.19/950-0010-spi-bcm2835-Support-pin-groups-other-than-7-11.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch rename to target/linux/brcm2708/patches-4.19/950-0010-spi-bcm2835-Support-pin-groups-other-than-7-11.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch b/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch deleted file mode 100644 index 91e27c36cc..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e21d0b86f4a9c2c1f61e183e5dfcc1cf37058ca1 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Tue, 14 Jul 2015 10:26:09 +0100 -Subject: [PATCH] spidev: Add "spidev" compatible string to silence - warning - -See: https://github.com/raspberrypi/linux/issues/1054 ---- - drivers/spi/spidev.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/spi/spidev.c -+++ b/drivers/spi/spidev.c -@@ -670,6 +670,7 @@ static const struct of_device_id spidev_ - { .compatible = "ge,achc" }, - { .compatible = "semtech,sx1301" }, - { .compatible = "siliconlabs,si3210" }, -+ { .compatible = "spidev" }, - {}, - }; - MODULE_DEVICE_TABLE(of, spidev_dt_ids); diff --git a/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch b/target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Disable-forced-software-CS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Disable-forced-software-CS.patch rename to target/linux/brcm2708/patches-4.19/950-0011-spi-bcm2835-Disable-forced-software-CS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch b/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Remove-unused-code.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0013-spi-bcm2835-Remove-unused-code.patch rename to target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Remove-unused-code.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/brcm2708/patches-4.19/950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch rename to target/linux/brcm2708/patches-4.19/950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0015-firmware-Updated-mailbox-header.patch b/target/linux/brcm2708/patches-4.19/950-0014-firmware-Updated-mailbox-header.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0015-firmware-Updated-mailbox-header.patch rename to target/linux/brcm2708/patches-4.19/950-0014-firmware-Updated-mailbox-header.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch b/target/linux/brcm2708/patches-4.19/950-0015-rtc-Add-SPI-alias-for-pcf2123-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0015-rtc-Add-SPI-alias-for-pcf2123-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch b/target/linux/brcm2708/patches-4.19/950-0016-watchdog-bcm2835-Support-setting-reboot-partition.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0017-watchdog-bcm2835-Support-setting-reboot-partition.patch rename to target/linux/brcm2708/patches-4.19/950-0016-watchdog-bcm2835-Support-setting-reboot-partition.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/target/linux/brcm2708/patches-4.19/950-0017-reboot-Use-power-off-rather-than-busy-spinning-when-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch rename to target/linux/brcm2708/patches-4.19/950-0017-reboot-Use-power-off-rather-than-busy-spinning-when-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch b/target/linux/brcm2708/patches-4.19/950-0018-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch rename to target/linux/brcm2708/patches-4.19/950-0018-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0020-Register-the-clocks-early-during-the-boot-process-so.patch b/target/linux/brcm2708/patches-4.19/950-0019-Register-the-clocks-early-during-the-boot-process-so.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0020-Register-the-clocks-early-during-the-boot-process-so.patch rename to target/linux/brcm2708/patches-4.19/950-0019-Register-the-clocks-early-during-the-boot-process-so.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/target/linux/brcm2708/patches-4.19/950-0020-bcm2835-rng-Avoid-initialising-if-already-enabled.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch rename to target/linux/brcm2708/patches-4.19/950-0020-bcm2835-rng-Avoid-initialising-if-already-enabled.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch b/target/linux/brcm2708/patches-4.19/950-0021-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch rename to target/linux/brcm2708/patches-4.19/950-0021-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/target/linux/brcm2708/patches-4.19/950-0022-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch rename to target/linux/brcm2708/patches-4.19/950-0022-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Add-claim-clocks-property.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Add-claim-clocks-property.patch rename to target/linux/brcm2708/patches-4.19/950-0023-clk-bcm2835-Add-claim-clocks-property.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Read-max-core-clock-from-firmware.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch rename to target/linux/brcm2708/patches-4.19/950-0024-clk-bcm2835-Read-max-core-clock-from-firmware.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch b/target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch rename to target/linux/brcm2708/patches-4.19/950-0025-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0027-sound-Demote-deferral-errors-to-INFO-level.patch b/target/linux/brcm2708/patches-4.19/950-0026-sound-Demote-deferral-errors-to-INFO-level.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0027-sound-Demote-deferral-errors-to-INFO-level.patch rename to target/linux/brcm2708/patches-4.19/950-0026-sound-Demote-deferral-errors-to-INFO-level.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch b/target/linux/brcm2708/patches-4.19/950-0027-Update-vfpmodule.c.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0028-Update-vfpmodule.c.patch rename to target/linux/brcm2708/patches-4.19/950-0027-Update-vfpmodule.c.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch b/target/linux/brcm2708/patches-4.19/950-0028-i2c-bcm2835-Add-debug-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0029-i2c-bcm2835-Add-debug-support.patch rename to target/linux/brcm2708/patches-4.19/950-0028-i2c-bcm2835-Add-debug-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch b/target/linux/brcm2708/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch b/target/linux/brcm2708/patches-4.19/950-0030-ASoC-Add-prompt-for-ICS43432-codec.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0031-ASoC-Add-prompt-for-ICS43432-codec.patch rename to target/linux/brcm2708/patches-4.19/950-0030-ASoC-Add-prompt-for-ICS43432-codec.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch b/target/linux/brcm2708/patches-4.19/950-0031-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch rename to target/linux/brcm2708/patches-4.19/950-0031-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/brcm2708/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch rename to target/linux/brcm2708/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/brcm2708/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch rename to target/linux/brcm2708/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch b/target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Round-input-clock-up.patch rename to target/linux/brcm2708/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch rename to target/linux/brcm2708/patches-4.19/950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0037-amba_pl011-Add-cts-event-workaround-DT-property.patch rename to target/linux/brcm2708/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/target/linux/brcm2708/patches-4.19/950-0037-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch rename to target/linux/brcm2708/patches-4.19/950-0037-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/brcm2708/patches-4.19/950-0038-Main-bcm2708-bcm2709-linux-port.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0039-Main-bcm2708-bcm2709-linux-port.patch rename to target/linux/brcm2708/patches-4.19/950-0038-Main-bcm2708-bcm2709-linux-port.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.19/950-0039-Add-dwc_otg-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0039-Add-dwc_otg-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0041-bcm2708-framebuffer-driver.patch b/target/linux/brcm2708/patches-4.19/950-0040-bcm2708-framebuffer-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0041-bcm2708-framebuffer-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0040-bcm2708-framebuffer-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0042-Speed-up-console-framebuffer-imageblit-function.patch b/target/linux/brcm2708/patches-4.19/950-0041-Speed-up-console-framebuffer-imageblit-function.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0042-Speed-up-console-framebuffer-imageblit-function.patch rename to target/linux/brcm2708/patches-4.19/950-0041-Speed-up-console-framebuffer-imageblit-function.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0043-dmaengine-Add-support-for-BCM2708.patch b/target/linux/brcm2708/patches-4.19/950-0042-dmaengine-Add-support-for-BCM2708.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0043-dmaengine-Add-support-for-BCM2708.patch rename to target/linux/brcm2708/patches-4.19/950-0042-dmaengine-Add-support-for-BCM2708.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0043-MMC-added-alternative-MMC-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0043-MMC-added-alternative-MMC-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch b/target/linux/brcm2708/patches-4.19/950-0044-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch rename to target/linux/brcm2708/patches-4.19/950-0044-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch b/target/linux/brcm2708/patches-4.19/950-0045-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch rename to target/linux/brcm2708/patches-4.19/950-0045-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch b/target/linux/brcm2708/patches-4.19/950-0046-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch rename to target/linux/brcm2708/patches-4.19/950-0046-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0047-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch rename to target/linux/brcm2708/patches-4.19/950-0047-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch b/target/linux/brcm2708/patches-4.19/950-0048-Add-SMI-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0049-Add-SMI-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0048-Add-SMI-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch b/target/linux/brcm2708/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch rename to target/linux/brcm2708/patches-4.19/950-0049-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch b/target/linux/brcm2708/patches-4.19/950-0050-Add-SMI-NAND-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0051-Add-SMI-NAND-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0050-Add-SMI-NAND-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch b/target/linux/brcm2708/patches-4.19/950-0051-Add-cpufreq-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0052-Add-cpufreq-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0051-Add-cpufreq-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch b/target/linux/brcm2708/patches-4.19/950-0052-Add-Chris-Boot-s-i2c-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0053-Add-Chris-Boot-s-i2c-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0052-Add-Chris-Boot-s-i2c-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch b/target/linux/brcm2708/patches-4.19/950-0053-char-broadcom-Add-vcio-module.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0054-char-broadcom-Add-vcio-module.patch rename to target/linux/brcm2708/patches-4.19/950-0053-char-broadcom-Add-vcio-module.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch b/target/linux/brcm2708/patches-4.19/950-0054-firmware-bcm2835-Support-ARCH_BCM270x.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0055-firmware-bcm2835-Support-ARCH_BCM270x.patch rename to target/linux/brcm2708/patches-4.19/950-0054-firmware-bcm2835-Support-ARCH_BCM270x.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch b/target/linux/brcm2708/patches-4.19/950-0055-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch rename to target/linux/brcm2708/patches-4.19/950-0055-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/brcm2708/patches-4.19/950-0056-BCM2708-Add-core-Device-Tree-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0057-BCM2708-Add-core-Device-Tree-support.patch rename to target/linux/brcm2708/patches-4.19/950-0056-BCM2708-Add-core-Device-Tree-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch b/target/linux/brcm2708/patches-4.19/950-0057-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch rename to target/linux/brcm2708/patches-4.19/950-0057-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/brcm2708/patches-4.19/950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0059-fbdev-add-FBIOCOPYAREA-ioctl.patch rename to target/linux/brcm2708/patches-4.19/950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0060-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/brcm2708/patches-4.19/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0060-Added-Device-IDs-for-August-DVB-T-205.patch rename to target/linux/brcm2708/patches-4.19/950-0059-Added-Device-IDs-for-August-DVB-T-205.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch b/target/linux/brcm2708/patches-4.19/950-0060-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch rename to target/linux/brcm2708/patches-4.19/950-0060-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/brcm2708/patches-4.19/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch rename to target/linux/brcm2708/patches-4.19/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0062-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0062-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch b/target/linux/brcm2708/patches-4.19/950-0063-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0063-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch b/target/linux/brcm2708/patches-4.19/950-0064-ASoC-pcm512x-implement-set_tdm_slot-interface.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch rename to target/linux/brcm2708/patches-4.19/950-0064-ASoC-pcm512x-implement-set_tdm_slot-interface.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch b/target/linux/brcm2708/patches-4.19/950-0065-ASoC-Add-support-for-Rpi-DAC.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0066-ASoC-Add-support-for-Rpi-DAC.patch rename to target/linux/brcm2708/patches-4.19/950-0065-ASoC-Add-support-for-Rpi-DAC.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0066-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0066-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch b/target/linux/brcm2708/patches-4.19/950-0067-Added-support-for-HiFiBerry-DAC.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0068-Added-support-for-HiFiBerry-DAC.patch rename to target/linux/brcm2708/patches-4.19/950-0067-Added-support-for-HiFiBerry-DAC.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch b/target/linux/brcm2708/patches-4.19/950-0068-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch rename to target/linux/brcm2708/patches-4.19/950-0068-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0070-Add-driver-for-rpi-proto.patch b/target/linux/brcm2708/patches-4.19/950-0069-Add-driver-for-rpi-proto.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0070-Add-driver-for-rpi-proto.patch rename to target/linux/brcm2708/patches-4.19/950-0069-Add-driver-for-rpi-proto.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0071-Add-Support-for-JustBoom-Audio-boards.patch b/target/linux/brcm2708/patches-4.19/950-0070-Add-Support-for-JustBoom-Audio-boards.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0071-Add-Support-for-JustBoom-Audio-boards.patch rename to target/linux/brcm2708/patches-4.19/950-0070-Add-Support-for-JustBoom-Audio-boards.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch b/target/linux/brcm2708/patches-4.19/950-0071-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch rename to target/linux/brcm2708/patches-4.19/950-0071-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch b/target/linux/brcm2708/patches-4.19/950-0072-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch rename to target/linux/brcm2708/patches-4.19/950-0072-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch b/target/linux/brcm2708/patches-4.19/950-0073-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch rename to target/linux/brcm2708/patches-4.19/950-0073-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch b/target/linux/brcm2708/patches-4.19/950-0074-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch rename to target/linux/brcm2708/patches-4.19/950-0074-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch b/target/linux/brcm2708/patches-4.19/950-0075-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch rename to target/linux/brcm2708/patches-4.19/950-0075-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch b/target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch rename to target/linux/brcm2708/patches-4.19/950-0076-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0078-Support-for-Blokas-Labs-pisound-board.patch b/target/linux/brcm2708/patches-4.19/950-0077-Support-for-Blokas-Labs-pisound-board.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0078-Support-for-Blokas-Labs-pisound-board.patch rename to target/linux/brcm2708/patches-4.19/950-0077-Support-for-Blokas-Labs-pisound-board.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch b/target/linux/brcm2708/patches-4.19/950-0078-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch rename to target/linux/brcm2708/patches-4.19/950-0078-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch b/target/linux/brcm2708/patches-4.19/950-0079-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch rename to target/linux/brcm2708/patches-4.19/950-0079-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch b/target/linux/brcm2708/patches-4.19/950-0080-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch rename to target/linux/brcm2708/patches-4.19/950-0080-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch b/target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch rename to target/linux/brcm2708/patches-4.19/950-0081-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0082-Driver-support-for-Google-voiceHAT-soundcard.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0083-Driver-support-for-Google-voiceHAT-soundcard.patch rename to target/linux/brcm2708/patches-4.19/950-0082-Driver-support-for-Google-voiceHAT-soundcard.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch b/target/linux/brcm2708/patches-4.19/950-0083-Driver-and-overlay-for-Allo-Katana-DAC.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0084-Driver-and-overlay-for-Allo-Katana-DAC.patch rename to target/linux/brcm2708/patches-4.19/950-0083-Driver-and-overlay-for-Allo-Katana-DAC.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch b/target/linux/brcm2708/patches-4.19/950-0084-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch rename to target/linux/brcm2708/patches-4.19/950-0084-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch b/target/linux/brcm2708/patches-4.19/950-0085-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch rename to target/linux/brcm2708/patches-4.19/950-0085-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch b/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch deleted file mode 100644 index 9c4462c1b4..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f77d4bf8ea9217d57be6982a6fdfa9f5f9c9b927 Mon Sep 17 00:00:00 2001 -From: Daniel Matuschek -Date: Wed, 15 Jan 2014 21:41:23 +0100 -Subject: [PATCH] ASoC: wm8804: MCLK configuration options, 32-bit - -WM8804 can run with PLL frequencies of 256xfs and 128xfs for most sample -rates. At 192kHz only 128xfs is supported. The existing driver selects -128xfs automatically for some lower samples rates. By using an -additional mclk_div divider, it is now possible to control the -behaviour. This allows using 256xfs PLL frequency on all sample rates up -to 96kHz. It should allow lower jitter and better signal quality. The -behavior has to be controlled by the sound card driver, because some -sample frequency share the same setting. e.g. 192kHz and 96kHz use -24.576MHz master clock. The only difference is the MCLK divider. - -This also added support for 32bit data. - -Signed-off-by: Daniel Matuschek ---- - sound/soc/codecs/wm8804.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/wm8804.c -+++ b/sound/soc/codecs/wm8804.c -@@ -550,6 +550,7 @@ static const struct snd_soc_component_dr - .use_pmdown_time = 1, - .endianness = 1, - .non_legacy_dai_naming = 1, -+ .idle_bias_on = true, - }; - - const struct regmap_config wm8804_regmap_config = { diff --git a/target/linux/brcm2708/patches-4.19/950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch b/target/linux/brcm2708/patches-4.19/950-0086-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0086-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0089-rpi_display-add-backlight-driver-and-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0087-rpi_display-add-backlight-driver-and-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0089-rpi_display-add-backlight-driver-and-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0087-rpi_display-add-backlight-driver-and-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch b/target/linux/brcm2708/patches-4.19/950-0088-bcm2835-virtgpio-Virtual-GPIO-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0088-bcm2835-virtgpio-Virtual-GPIO-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0091-OF-DT-Overlay-configfs-interface.patch b/target/linux/brcm2708/patches-4.19/950-0089-OF-DT-Overlay-configfs-interface.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0091-OF-DT-Overlay-configfs-interface.patch rename to target/linux/brcm2708/patches-4.19/950-0089-OF-DT-Overlay-configfs-interface.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch b/target/linux/brcm2708/patches-4.19/950-0090-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0092-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch rename to target/linux/brcm2708/patches-4.19/950-0090-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0093-Add-arm64-configuration-and-device-tree-differences..patch b/target/linux/brcm2708/patches-4.19/950-0091-Add-arm64-configuration-and-device-tree-differences..patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0093-Add-arm64-configuration-and-device-tree-differences..patch rename to target/linux/brcm2708/patches-4.19/950-0091-Add-arm64-configuration-and-device-tree-differences..patch diff --git a/target/linux/brcm2708/patches-4.19/950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch b/target/linux/brcm2708/patches-4.19/950-0092-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0094-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch rename to target/linux/brcm2708/patches-4.19/950-0092-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch b/target/linux/brcm2708/patches-4.19/950-0093-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0095-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch rename to target/linux/brcm2708/patches-4.19/950-0093-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/target/linux/brcm2708/patches-4.19/950-0094-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0096-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch rename to target/linux/brcm2708/patches-4.19/950-0094-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch b/target/linux/brcm2708/patches-4.19/950-0095-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0097-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch rename to target/linux/brcm2708/patches-4.19/950-0095-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0098-cache-export-clean-and-invalidate.patch b/target/linux/brcm2708/patches-4.19/950-0096-cache-export-clean-and-invalidate.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0098-cache-export-clean-and-invalidate.patch rename to target/linux/brcm2708/patches-4.19/950-0096-cache-export-clean-and-invalidate.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0099-AXI-performance-monitor-driver-2222.patch b/target/linux/brcm2708/patches-4.19/950-0097-AXI-performance-monitor-driver-2222.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0099-AXI-performance-monitor-driver-2222.patch rename to target/linux/brcm2708/patches-4.19/950-0097-AXI-performance-monitor-driver-2222.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch b/target/linux/brcm2708/patches-4.19/950-0098-mcp2515-Use-DT-supplied-interrupt-flags.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0100-mcp2515-Use-DT-supplied-interrupt-flags.patch rename to target/linux/brcm2708/patches-4.19/950-0098-mcp2515-Use-DT-supplied-interrupt-flags.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch b/target/linux/brcm2708/patches-4.19/950-0099-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0101-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch rename to target/linux/brcm2708/patches-4.19/950-0099-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch b/target/linux/brcm2708/patches-4.19/950-0100-ARM-bcm2835-Set-Serial-number-and-Revision.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch rename to target/linux/brcm2708/patches-4.19/950-0100-ARM-bcm2835-Set-Serial-number-and-Revision.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0101-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0104-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch rename to target/linux/brcm2708/patches-4.19/950-0101-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch deleted file mode 100644 index f08cbebc47..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0102-cgroup-Disable-cgroup-memory-by-default.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7ae6ba03434344f90403936ae79bfd7ba005b49c Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 27 Nov 2017 17:14:54 +0000 -Subject: [PATCH] cgroup: Disable cgroup "memory" by default - -Some Raspberry Pis have limited RAM and most users won't use the -cgroup memory support so it is disabled by default. Enable with: - - cgroup_enable=memory - -See: https://github.com/raspberrypi/linux/issues/1950 - -Signed-off-by: Phil Elwell ---- - kernel/cgroup/cgroup.c | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - ---- a/kernel/cgroup/cgroup.c -+++ b/kernel/cgroup/cgroup.c -@@ -5334,6 +5334,8 @@ int __init cgroup_init_early(void) - } - - static u16 cgroup_disable_mask __initdata; -+static u16 cgroup_enable_mask __initdata; -+static int __init cgroup_disable(char *str); - - /** - * cgroup_init - cgroup initialization -@@ -5374,6 +5376,12 @@ int __init cgroup_init(void) - - mutex_unlock(&cgroup_mutex); - -+ /* Apply an implicit disable... */ -+ cgroup_disable("memory"); -+ -+ /* ...knowing that an explicit enable will override it. */ -+ cgroup_disable_mask &= ~cgroup_enable_mask; -+ - for_each_subsys(ss, ssid) { - if (ss->early_init) { - struct cgroup_subsys_state *css = -@@ -5765,6 +5773,28 @@ static int __init cgroup_disable(char *s - } - __setup("cgroup_disable=", cgroup_disable); - -+static int __init cgroup_enable(char *str) -+{ -+ struct cgroup_subsys *ss; -+ char *token; -+ int i; -+ -+ while ((token = strsep(&str, ",")) != NULL) { -+ if (!*token) -+ continue; -+ -+ for_each_subsys(ss, i) { -+ if (strcmp(token, ss->name) && -+ strcmp(token, ss->legacy_name)) -+ continue; -+ -+ cgroup_enable_mask |= 1 << i; -+ } -+ } -+ return 1; -+} -+__setup("cgroup_enable=", cgroup_enable); -+ - /** - * css_tryget_online_from_dir - get corresponding css from a cgroup dentry - * @dentry: directory dentry of interest diff --git a/target/linux/brcm2708/patches-4.19/950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch b/target/linux/brcm2708/patches-4.19/950-0102-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0105-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch rename to target/linux/brcm2708/patches-4.19/950-0102-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch b/target/linux/brcm2708/patches-4.19/950-0103-raspberrypi-firmware-Export-the-general-transaction-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0106-raspberrypi-firmware-Export-the-general-transaction-.patch rename to target/linux/brcm2708/patches-4.19/950-0103-raspberrypi-firmware-Export-the-general-transaction-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch b/target/linux/brcm2708/patches-4.19/950-0104-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch rename to target/linux/brcm2708/patches-4.19/950-0104-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0105-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0105-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0106-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0106-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch b/target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch rename to target/linux/brcm2708/patches-4.19/950-0107-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch b/target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0111-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch rename to target/linux/brcm2708/patches-4.19/950-0108-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch b/target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch rename to target/linux/brcm2708/patches-4.19/950-0109-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch b/target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch rename to target/linux/brcm2708/patches-4.19/950-0110-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch b/target/linux/brcm2708/patches-4.19/950-0111-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch rename to target/linux/brcm2708/patches-4.19/950-0111-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch b/target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0115-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch rename to target/linux/brcm2708/patches-4.19/950-0112-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch b/target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0116-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch rename to target/linux/brcm2708/patches-4.19/950-0113-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch b/target/linux/brcm2708/patches-4.19/950-0114-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0117-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch rename to target/linux/brcm2708/patches-4.19/950-0114-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0118-vc4_firmware_kms-fix-build.patch b/target/linux/brcm2708/patches-4.19/950-0115-vc4_firmware_kms-fix-build.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0118-vc4_firmware_kms-fix-build.patch rename to target/linux/brcm2708/patches-4.19/950-0115-vc4_firmware_kms-fix-build.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0119-hack-cache-Fix-linker-error.patch b/target/linux/brcm2708/patches-4.19/950-0116-hack-cache-Fix-linker-error.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0119-hack-cache-Fix-linker-error.patch rename to target/linux/brcm2708/patches-4.19/950-0116-hack-cache-Fix-linker-error.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch b/target/linux/brcm2708/patches-4.19/950-0117-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0120-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch rename to target/linux/brcm2708/patches-4.19/950-0117-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0121-sound-bcm-Fix-memset-dereference-warning.patch b/target/linux/brcm2708/patches-4.19/950-0118-sound-bcm-Fix-memset-dereference-warning.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0121-sound-bcm-Fix-memset-dereference-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0118-sound-bcm-Fix-memset-dereference-warning.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch b/target/linux/brcm2708/patches-4.19/950-0119-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0122-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch rename to target/linux/brcm2708/patches-4.19/950-0119-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/brcm2708/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0123-lan78xx-Read-initial-EEE-status-from-DT.patch rename to target/linux/brcm2708/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch b/target/linux/brcm2708/patches-4.19/950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0124-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch rename to target/linux/brcm2708/patches-4.19/950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0125-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch rename to target/linux/brcm2708/patches-4.19/950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch b/target/linux/brcm2708/patches-4.19/950-0123-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0126-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch rename to target/linux/brcm2708/patches-4.19/950-0123-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/brcm2708/patches-4.19/950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0127-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch rename to target/linux/brcm2708/patches-4.19/950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch b/target/linux/brcm2708/patches-4.19/950-0125-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0128-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch rename to target/linux/brcm2708/patches-4.19/950-0125-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch b/target/linux/brcm2708/patches-4.19/950-0126-of-configfs-Use-of_overlay_fdt_apply-API-call.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0129-of-configfs-Use-of_overlay_fdt_apply-API-call.patch rename to target/linux/brcm2708/patches-4.19/950-0126-of-configfs-Use-of_overlay_fdt_apply-API-call.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0130-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch rename to target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/brcm2708/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0131-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch rename to target/linux/brcm2708/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0132-staging-vc04_services-Derive-g_cache_line_size.patch b/target/linux/brcm2708/patches-4.19/950-0129-staging-vc04_services-Derive-g_cache_line_size.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0132-staging-vc04_services-Derive-g_cache_line_size.patch rename to target/linux/brcm2708/patches-4.19/950-0129-staging-vc04_services-Derive-g_cache_line_size.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0133-Add-rpi-poe-fan-driver.patch b/target/linux/brcm2708/patches-4.19/950-0130-Add-rpi-poe-fan-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0133-Add-rpi-poe-fan-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0130-Add-rpi-poe-fan-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch b/target/linux/brcm2708/patches-4.19/950-0131-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0134-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch rename to target/linux/brcm2708/patches-4.19/950-0131-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch b/target/linux/brcm2708/patches-4.19/950-0132-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0136-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch rename to target/linux/brcm2708/patches-4.19/950-0132-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch b/target/linux/brcm2708/patches-4.19/950-0133-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0137-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0133-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0138-overlays-Fix-a-few-dtc-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0134-overlays-Fix-a-few-dtc-warnings.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0138-overlays-Fix-a-few-dtc-warnings.patch rename to target/linux/brcm2708/patches-4.19/950-0134-overlays-Fix-a-few-dtc-warnings.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch b/target/linux/brcm2708/patches-4.19/950-0135-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0139-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch rename to target/linux/brcm2708/patches-4.19/950-0135-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch b/target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch deleted file mode 100644 index 55cd26b25b..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0135-bcm2835-interpolate-audio-delay.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 652b0ec2ab2d2e2af7bb4f7d62a4020a20720677 Mon Sep 17 00:00:00 2001 -From: wm4 -Date: Wed, 13 Jan 2016 19:44:47 +0100 -Subject: [PATCH] bcm2835: interpolate audio delay - -It appears the GPU only sends us a message all 10ms to update -the playback progress. Other than this, the playback position -(what SNDRV_PCM_IOCTL_DELAY will return) is not updated at all. -Userspace will see jitter up to 10ms in the audio position. - -Make this a bit nicer for userspace by interpolating the -position using the CPU clock. - -I'm not sure if setting snd_pcm_runtime.delay is the right -approach for this. Or if there is maybe an already existing -mechanism for position interpolation in the ALSA core. - -I only set SNDRV_PCM_INFO_BATCH because this appears to remove -at least one situation snd_pcm_runtime.delay is used, so I have -to worry less in which place I have to update this field, or -how it interacts with the rest of ALSA. - -In the future, it might be nice to use VC_AUDIO_MSG_TYPE_LATENCY. -One problem is that it requires sending a videocore message, and -waiting for a reply, which could make the implementation much -harder due to locking and synchronization requirements. ---- - .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 12 +++++++++++- - .../staging/vc04_services/bcm2835-audio/bcm2835.h | 1 + - 2 files changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -@@ -11,7 +11,7 @@ - /* hardware definition */ - static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { - .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | -- SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID), -+ SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BATCH), - .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - .rate_min = 8000, -@@ -81,6 +81,8 @@ void bcm2835_playback_fifo(struct bcm283 - alsa_stream->pos %= alsa_stream->buffer_size; - } - -+ alsa_stream->interpolate_start = ktime_get_ns(); -+ - if (alsa_stream->substream) { - if (new_period) - snd_pcm_period_elapsed(alsa_stream->substream); -@@ -306,6 +308,7 @@ static int snd_bcm2835_pcm_prepare(struc - alsa_stream->buffer_size = snd_pcm_lib_buffer_bytes(substream); - alsa_stream->period_size = snd_pcm_lib_period_bytes(substream); - alsa_stream->pos = 0; -+ alsa_stream->interpolate_start = ktime_get_ns(); - - audio_debug("buffer_size=%d, period_size=%d pos=%d frame_bits=%d\n", - alsa_stream->buffer_size, alsa_stream->period_size, -@@ -397,12 +400,19 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_s - { - struct snd_pcm_runtime *runtime = substream->runtime; - struct bcm2835_alsa_stream *alsa_stream = runtime->private_data; -+ u64 now = ktime_get_ns(); - - audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0, - frames_to_bytes(runtime, runtime->status->hw_ptr), - frames_to_bytes(runtime, runtime->control->appl_ptr), - alsa_stream->pos); - -+ /* Give userspace better delay reporting by interpolating between GPU -+ * notifications, assuming audio speed is close enough to the clock -+ * used for ktime */ -+ if (alsa_stream->interpolate_start && alsa_stream->interpolate_start < now) -+ runtime->delay = -(int)div_u64((now - alsa_stream->interpolate_start) * runtime->rate, 1000000000); -+ - return snd_pcm_indirect_playback_pointer(substream, - &alsa_stream->pcm_indirect, - alsa_stream->pos); ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h -@@ -133,6 +133,7 @@ struct bcm2835_alsa_stream { - unsigned int pos; - unsigned int buffer_size; - unsigned int period_size; -+ u64 interpolate_start; - - atomic_t retrieved; - struct bcm2835_audio_instance *instance; diff --git a/target/linux/brcm2708/patches-4.19/950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch b/target/linux/brcm2708/patches-4.19/950-0136-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0140-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch rename to target/linux/brcm2708/patches-4.19/950-0136-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch b/target/linux/brcm2708/patches-4.19/950-0137-firmware-raspberrypi-Add-backward-compatible-get_thr.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0141-firmware-raspberrypi-Add-backward-compatible-get_thr.patch rename to target/linux/brcm2708/patches-4.19/950-0137-firmware-raspberrypi-Add-backward-compatible-get_thr.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch b/target/linux/brcm2708/patches-4.19/950-0138-sc16is7xx-Don-t-spin-if-no-data-received.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0142-sc16is7xx-Don-t-spin-if-no-data-received.patch rename to target/linux/brcm2708/patches-4.19/950-0138-sc16is7xx-Don-t-spin-if-no-data-received.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0143-Add-device-tree-overlay-for-HD44780.patch b/target/linux/brcm2708/patches-4.19/950-0139-Add-device-tree-overlay-for-HD44780.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0143-Add-device-tree-overlay-for-HD44780.patch rename to target/linux/brcm2708/patches-4.19/950-0139-Add-device-tree-overlay-for-HD44780.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch b/target/linux/brcm2708/patches-4.19/950-0140-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0144-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch rename to target/linux/brcm2708/patches-4.19/950-0140-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch b/target/linux/brcm2708/patches-4.19/950-0141-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0145-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch rename to target/linux/brcm2708/patches-4.19/950-0141-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch b/target/linux/brcm2708/patches-4.19/950-0142-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0146-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch rename to target/linux/brcm2708/patches-4.19/950-0142-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch b/target/linux/brcm2708/patches-4.19/950-0143-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0147-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch rename to target/linux/brcm2708/patches-4.19/950-0143-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch b/target/linux/brcm2708/patches-4.19/950-0144-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0148-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch rename to target/linux/brcm2708/patches-4.19/950-0144-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch b/target/linux/brcm2708/patches-4.19/950-0145-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0149-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch rename to target/linux/brcm2708/patches-4.19/950-0145-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch b/target/linux/brcm2708/patches-4.19/950-0146-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0150-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch rename to target/linux/brcm2708/patches-4.19/950-0146-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch b/target/linux/brcm2708/patches-4.19/950-0147-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch rename to target/linux/brcm2708/patches-4.19/950-0147-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch b/target/linux/brcm2708/patches-4.19/950-0148-ASoC-cs4265-Add-native-32bit-I2S-transport.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0152-ASoC-cs4265-Add-native-32bit-I2S-transport.patch rename to target/linux/brcm2708/patches-4.19/950-0148-ASoC-cs4265-Add-native-32bit-I2S-transport.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0149-BCM270X_DT-Add-gpio-fan-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0153-BCM270X_DT-Add-gpio-fan-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0149-BCM270X_DT-Add-gpio-fan-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch b/target/linux/brcm2708/patches-4.19/950-0150-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0154-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch rename to target/linux/brcm2708/patches-4.19/950-0150-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch b/target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0155-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch rename to target/linux/brcm2708/patches-4.19/950-0151-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0156-Update-gpio-fan-overlay.dts-2711.patch b/target/linux/brcm2708/patches-4.19/950-0152-Update-gpio-fan-overlay.dts-2711.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0156-Update-gpio-fan-overlay.dts-2711.patch rename to target/linux/brcm2708/patches-4.19/950-0152-Update-gpio-fan-overlay.dts-2711.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch b/target/linux/brcm2708/patches-4.19/950-0153-drivers-thermal-step_wise-add-support-for-hysteresis.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0157-drivers-thermal-step_wise-add-support-for-hysteresis.patch rename to target/linux/brcm2708/patches-4.19/950-0153-drivers-thermal-step_wise-add-support-for-hysteresis.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch b/target/linux/brcm2708/patches-4.19/950-0154-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0158-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch rename to target/linux/brcm2708/patches-4.19/950-0154-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch b/target/linux/brcm2708/patches-4.19/950-0155-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0159-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch rename to target/linux/brcm2708/patches-4.19/950-0155-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch b/target/linux/brcm2708/patches-4.19/950-0156-overlays-add-overrides-for-PoE-HAT-fan-control.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0160-overlays-add-overrides-for-PoE-HAT-fan-control.patch rename to target/linux/brcm2708/patches-4.19/950-0156-overlays-add-overrides-for-PoE-HAT-fan-control.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0157-overlays-Add-gpio-no-bank0-irq-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0161-overlays-Add-gpio-no-bank0-irq-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0157-overlays-Add-gpio-no-bank0-irq-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch b/target/linux/brcm2708/patches-4.19/950-0158-Add-hy28b-2017-model-device-tree-overlay-2721.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0162-Add-hy28b-2017-model-device-tree-overlay-2721.patch rename to target/linux/brcm2708/patches-4.19/950-0158-Add-hy28b-2017-model-device-tree-overlay-2721.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch b/target/linux/brcm2708/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch rename to target/linux/brcm2708/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch b/target/linux/brcm2708/patches-4.19/950-0160-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0164-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch rename to target/linux/brcm2708/patches-4.19/950-0160-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch b/target/linux/brcm2708/patches-4.19/950-0161-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0165-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch rename to target/linux/brcm2708/patches-4.19/950-0161-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch b/target/linux/brcm2708/patches-4.19/950-0162-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0166-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch rename to target/linux/brcm2708/patches-4.19/950-0162-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch b/target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0167-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch rename to target/linux/brcm2708/patches-4.19/950-0163-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0168-Fix-warning-in-bcm2835-smi-nand.patch b/target/linux/brcm2708/patches-4.19/950-0164-Fix-warning-in-bcm2835-smi-nand.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0168-Fix-warning-in-bcm2835-smi-nand.patch rename to target/linux/brcm2708/patches-4.19/950-0164-Fix-warning-in-bcm2835-smi-nand.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch b/target/linux/brcm2708/patches-4.19/950-0165-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0169-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch rename to target/linux/brcm2708/patches-4.19/950-0165-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch b/target/linux/brcm2708/patches-4.19/950-0166-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0170-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch rename to target/linux/brcm2708/patches-4.19/950-0166-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch b/target/linux/brcm2708/patches-4.19/950-0167-media-ov5647-Add-support-for-PWDN-GPIO.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0171-media-ov5647-Add-support-for-PWDN-GPIO.patch rename to target/linux/brcm2708/patches-4.19/950-0167-media-ov5647-Add-support-for-PWDN-GPIO.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch b/target/linux/brcm2708/patches-4.19/950-0168-media-ov5647-Add-support-for-non-continuous-clock-mo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0172-media-ov5647-Add-support-for-non-continuous-clock-mo.patch rename to target/linux/brcm2708/patches-4.19/950-0168-media-ov5647-Add-support-for-non-continuous-clock-mo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0173-media-tc358743-Increase-FIFO-level-to-374.patch b/target/linux/brcm2708/patches-4.19/950-0169-media-tc358743-Increase-FIFO-level-to-374.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0173-media-tc358743-Increase-FIFO-level-to-374.patch rename to target/linux/brcm2708/patches-4.19/950-0169-media-tc358743-Increase-FIFO-level-to-374.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch b/target/linux/brcm2708/patches-4.19/950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0174-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch rename to target/linux/brcm2708/patches-4.19/950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/target/linux/brcm2708/patches-4.19/950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0175-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch rename to target/linux/brcm2708/patches-4.19/950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch b/target/linux/brcm2708/patches-4.19/950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0176-media-tc358743-Check-I2C-succeeded-during-probe.patch rename to target/linux/brcm2708/patches-4.19/950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0177-media-adv7180-Default-to-the-first-valid-input.patch b/target/linux/brcm2708/patches-4.19/950-0173-media-adv7180-Default-to-the-first-valid-input.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0177-media-adv7180-Default-to-the-first-valid-input.patch rename to target/linux/brcm2708/patches-4.19/950-0173-media-adv7180-Default-to-the-first-valid-input.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch b/target/linux/brcm2708/patches-4.19/950-0174-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch rename to target/linux/brcm2708/patches-4.19/950-0174-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch b/target/linux/brcm2708/patches-4.19/950-0175-media-videodev2-Add-helper-defines-for-printing-FOUR.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0179-media-videodev2-Add-helper-defines-for-printing-FOUR.patch rename to target/linux/brcm2708/patches-4.19/950-0175-media-videodev2-Add-helper-defines-for-printing-FOUR.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch b/target/linux/brcm2708/patches-4.19/950-0176-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0180-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch rename to target/linux/brcm2708/patches-4.19/950-0176-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/target/linux/brcm2708/patches-4.19/950-0177-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0181-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch rename to target/linux/brcm2708/patches-4.19/950-0177-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch b/target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Nasty-hack-to-allow-input-selection.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0182-media-adv7180-Nasty-hack-to-allow-input-selection.patch rename to target/linux/brcm2708/patches-4.19/950-0178-media-adv7180-Nasty-hack-to-allow-input-selection.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch b/target/linux/brcm2708/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0183-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch rename to target/linux/brcm2708/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0180-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0184-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0180-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch b/target/linux/brcm2708/patches-4.19/950-0181-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0185-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch rename to target/linux/brcm2708/patches-4.19/950-0181-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch b/target/linux/brcm2708/patches-4.19/950-0182-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0186-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch rename to target/linux/brcm2708/patches-4.19/950-0182-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch b/target/linux/brcm2708/patches-4.19/950-0183-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0187-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch rename to target/linux/brcm2708/patches-4.19/950-0183-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0188-Update-README-2750.patch b/target/linux/brcm2708/patches-4.19/950-0184-Update-README-2750.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0188-Update-README-2750.patch rename to target/linux/brcm2708/patches-4.19/950-0184-Update-README-2750.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0189-overlays-Remove-superfluous-address-size-cells.patch b/target/linux/brcm2708/patches-4.19/950-0185-overlays-Remove-superfluous-address-size-cells.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0189-overlays-Remove-superfluous-address-size-cells.patch rename to target/linux/brcm2708/patches-4.19/950-0185-overlays-Remove-superfluous-address-size-cells.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch b/target/linux/brcm2708/patches-4.19/950-0186-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0191-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch rename to target/linux/brcm2708/patches-4.19/950-0186-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch b/target/linux/brcm2708/patches-4.19/950-0187-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0192-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch rename to target/linux/brcm2708/patches-4.19/950-0187-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch b/target/linux/brcm2708/patches-4.19/950-0188-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0193-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch rename to target/linux/brcm2708/patches-4.19/950-0188-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0194-overlays-Update-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0189-overlays-Update-upstream-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0194-overlays-Update-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0189-overlays-Update-upstream-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0195-BCM2708_DT-update-firmware-node-binding.patch b/target/linux/brcm2708/patches-4.19/950-0190-BCM2708_DT-update-firmware-node-binding.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0195-BCM2708_DT-update-firmware-node-binding.patch rename to target/linux/brcm2708/patches-4.19/950-0190-BCM2708_DT-update-firmware-node-binding.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch b/target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch deleted file mode 100644 index 583b95bf89..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0190-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7c62d38653565e900504f821586e1b1d47f25594 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sun, 18 Nov 2018 13:21:26 +0100 -Subject: [PATCH] Revert "ASoC: wm8804: MCLK configuration options, - 32-bit" - -This reverts commit 3b12dcf797f5a4635aecd7f5c090dc507b124ffd. - -Despite the commit message being wrong idle_bias changes -were already reverted in the 4.14 tree. - -So drop the commit to bring the wm8804 driver back in line with -the rpi-4.14.y and upstream linux trees. - -Signed-off-by: Matthias Reichl ---- - sound/soc/codecs/wm8804.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/sound/soc/codecs/wm8804.c -+++ b/sound/soc/codecs/wm8804.c -@@ -550,7 +550,6 @@ static const struct snd_soc_component_dr - .use_pmdown_time = 1, - .endianness = 1, - .non_legacy_dai_naming = 1, -- .idle_bias_on = true, - }; - - const struct regmap_config wm8804_regmap_config = { diff --git a/target/linux/brcm2708/patches-4.19/950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch b/target/linux/brcm2708/patches-4.19/950-0191-BCM2710_DT-fix-gpio-expander-bindings.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0196-BCM2710_DT-fix-gpio-expander-bindings.patch rename to target/linux/brcm2708/patches-4.19/950-0191-BCM2710_DT-fix-gpio-expander-bindings.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch b/target/linux/brcm2708/patches-4.19/950-0192-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0197-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch rename to target/linux/brcm2708/patches-4.19/950-0192-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/target/linux/brcm2708/patches-4.19/950-0193-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0198-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch rename to target/linux/brcm2708/patches-4.19/950-0193-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0199-dt-bindings-Document-microchip-downshift-after.patch b/target/linux/brcm2708/patches-4.19/950-0194-dt-bindings-Document-microchip-downshift-after.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0199-dt-bindings-Document-microchip-downshift-after.patch rename to target/linux/brcm2708/patches-4.19/950-0194-dt-bindings-Document-microchip-downshift-after.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch b/target/linux/brcm2708/patches-4.19/950-0195-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0200-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch rename to target/linux/brcm2708/patches-4.19/950-0195-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch b/target/linux/brcm2708/patches-4.19/950-0196-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0201-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch rename to target/linux/brcm2708/patches-4.19/950-0196-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch b/target/linux/brcm2708/patches-4.19/950-0197-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0202-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch rename to target/linux/brcm2708/patches-4.19/950-0197-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch b/target/linux/brcm2708/patches-4.19/950-0198-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0203-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch rename to target/linux/brcm2708/patches-4.19/950-0198-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch b/target/linux/brcm2708/patches-4.19/950-0199-lirc-rpi-Remove-in-favour-of-gpio-ir.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0204-lirc-rpi-Remove-in-favour-of-gpio-ir.patch rename to target/linux/brcm2708/patches-4.19/950-0199-lirc-rpi-Remove-in-favour-of-gpio-ir.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch b/target/linux/brcm2708/patches-4.19/950-0200-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0205-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch rename to target/linux/brcm2708/patches-4.19/950-0200-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch b/target/linux/brcm2708/patches-4.19/950-0201-media-tc358743-Return-an-appropriate-colorspace-from.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0206-media-tc358743-Return-an-appropriate-colorspace-from.patch rename to target/linux/brcm2708/patches-4.19/950-0201-media-tc358743-Return-an-appropriate-colorspace-from.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-fix-module-autoloading.patch b/target/linux/brcm2708/patches-4.19/950-0202-staging-bcm2835-camera-fix-module-autoloading.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-fix-module-autoloading.patch rename to target/linux/brcm2708/patches-4.19/950-0202-staging-bcm2835-camera-fix-module-autoloading.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch b/target/linux/brcm2708/patches-4.19/950-0203-staging-bcm2835-camera-Move-module-info-to-the-end.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-camera-Move-module-info-to-the-end.patch rename to target/linux/brcm2708/patches-4.19/950-0203-staging-bcm2835-camera-Move-module-info-to-the-end.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch b/target/linux/brcm2708/patches-4.19/950-0204-staging-vchiq_arm-Fix-platform-device-unregistration.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Fix-platform-device-unregistration.patch rename to target/linux/brcm2708/patches-4.19/950-0204-staging-vchiq_arm-Fix-platform-device-unregistration.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch b/target/linux/brcm2708/patches-4.19/950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0210-staging-vchiq_arm-Fix-camera-device-registration.patch rename to target/linux/brcm2708/patches-4.19/950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch b/target/linux/brcm2708/patches-4.19/950-0206-staging-bcm2835-camera-Provide-more-specific-probe-e.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Provide-more-specific-probe-e.patch rename to target/linux/brcm2708/patches-4.19/950-0206-staging-bcm2835-camera-Provide-more-specific-probe-e.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch b/target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-Add-hint-about-possible-fault.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Add-hint-about-possible-fault.patch rename to target/linux/brcm2708/patches-4.19/950-0207-staging-bcm2835-camera-Add-hint-about-possible-fault.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch b/target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch rename to target/linux/brcm2708/patches-4.19/950-0208-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch b/target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Improve-error-handling-on-loading-.patch similarity index 79% rename from target/linux/brcm2708/patches-4.19/950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch rename to target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Improve-error-handling-on-loading-.patch index 81328b2cdc..087e3e5025 100644 --- a/target/linux/brcm2708/patches-4.19/950-0218-staging-vchiq_arm-Improve-error-handling-on-loading-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0209-staging-vchiq_arm-Improve-error-handling-on-loading-.patch @@ -16,28 +16,22 @@ Signed-off-by: Dave Stevenson --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -3655,7 +3655,11 @@ static int vchiq_probe(struct platform_d +@@ -3654,6 +3654,8 @@ static int vchiq_probe(struct platform_d MAJOR(vchiq_devid), MINOR(vchiq_devid)); bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); + if (IS_ERR(bcm2835_camera)) + bcm2835_camera = NULL; - bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); -+ if (IS_ERR(bcm2835_audio)) -+ bcm2835_audio = NULL; return 0; -@@ -3672,10 +3676,10 @@ failed_platform_init: +@@ -3670,8 +3672,9 @@ failed_platform_init: static int vchiq_remove(struct platform_device *pdev) { -- if (!IS_ERR(bcm2835_audio)) -- platform_device_unregister(bcm2835_audio); - if (!IS_ERR(bcm2835_camera)) - platform_device_unregister(bcm2835_camera); + platform_device_unregister(bcm2835_codec); -+ platform_device_unregister(bcm2835_audio); + platform_device_unregister(bcm2835_camera); + platform_device_unregister(vcsm_cma); vchiq_debugfs_deinit(); diff --git a/target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch b/target/linux/brcm2708/patches-4.19/950-0210-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch rename to target/linux/brcm2708/patches-4.19/950-0210-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch b/target/linux/brcm2708/patches-4.19/950-0211-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch rename to target/linux/brcm2708/patches-4.19/950-0211-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch b/target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch deleted file mode 100644 index 793fc21396..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0211-staging-vchiq_arm-Register-a-platform-device-for-the.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0ca486925a32b7c95752ff250afdd59bcf6c8574 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Sat, 20 Oct 2018 20:25:41 +0200 -Subject: [PATCH] staging: vchiq_arm: Register a platform device for - the audio driver - -Signed-off-by: Stefan Wahren ---- - drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -170,6 +170,7 @@ static struct class *vchiq_class; - static struct device *vchiq_dev; - static DEFINE_SPINLOCK(msg_queue_spinlock); - static struct platform_device *bcm2835_camera; -+static struct platform_device *bcm2835_audio; - - static const char *const ioctl_names[] = { - "CONNECT", -@@ -3654,6 +3655,7 @@ static int vchiq_probe(struct platform_d - MAJOR(vchiq_devid), MINOR(vchiq_devid)); - - bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); -+ bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); - - return 0; - -@@ -3670,6 +3672,8 @@ failed_platform_init: - - static int vchiq_remove(struct platform_device *pdev) - { -+ if (!IS_ERR(bcm2835_audio)) -+ platform_device_unregister(bcm2835_audio); - if (!IS_ERR(bcm2835_camera)) - platform_device_unregister(bcm2835_camera); - vchiq_debugfs_deinit(); diff --git a/target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch b/target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch deleted file mode 100644 index 3c6bfd4db2..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-audio-Enable-compile-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d08cc93a489df7707afaaa693afd2e7a153c85a3 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Sat, 13 Oct 2018 20:19:13 +0200 -Subject: [PATCH] staging: bcm2835-audio: Enable compile test - -Enable the compilation test for bcm2835-audio. - -Signed-off-by: Stefan Wahren ---- - drivers/staging/vc04_services/bcm2835-audio/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/Kconfig -+++ b/drivers/staging/vc04_services/bcm2835-audio/Kconfig -@@ -1,6 +1,6 @@ - config SND_BCM2835 - tristate "BCM2835 Audio" -- depends on ARCH_BCM2835 && SND -+ depends on (ARCH_BCM2835 || COMPILE_TEST) && SND - select SND_PCM - select BCM2835_VCHIQ - help diff --git a/target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch b/target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch rename to target/linux/brcm2708/patches-4.19/950-0212-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch b/target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch deleted file mode 100644 index a9f077675c..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-audio-use-module_platform_driver-mac.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f1aada1b4c974fa756e299c15b62c76e478e652e Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Thu, 18 Oct 2018 19:47:29 +0200 -Subject: [PATCH] staging: bcm2835-audio: use module_platform_driver() - macro - -There is not much value behind this boilerplate, so use -module_platform_driver() instead. - -Signed-off-by: Stefan Wahren ---- - .../vc04_services/bcm2835-audio/bcm2835.c | 20 +------------------ - 1 file changed, 1 insertion(+), 19 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -@@ -470,25 +470,7 @@ static struct platform_driver bcm2835_al - .of_match_table = snd_bcm2835_of_match_table, - }, - }; -- --static int bcm2835_alsa_device_init(void) --{ -- int retval; -- -- retval = platform_driver_register(&bcm2835_alsa0_driver); -- if (retval) -- pr_err("Error registering bcm2835_audio driver %d .\n", retval); -- -- return retval; --} -- --static void bcm2835_alsa_device_exit(void) --{ -- platform_driver_unregister(&bcm2835_alsa0_driver); --} -- --late_initcall(bcm2835_alsa_device_init); --module_exit(bcm2835_alsa_device_exit); -+module_platform_driver(bcm2835_alsa0_driver); - - MODULE_AUTHOR("Dom Cobley"); - MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); diff --git a/target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Return-early-on-errors.patch b/target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-camera-Return-early-on-errors.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Return-early-on-errors.patch rename to target/linux/brcm2708/patches-4.19/950-0213-staging-bcm2835-camera-Return-early-on-errors.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch deleted file mode 100644 index 62b2c88875..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-audio-Drop-DT-dependency.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ba833c9b912d2ca6fe23d700c4bd6f61742d5e04 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Thu, 18 Oct 2018 19:54:01 +0200 -Subject: [PATCH] staging: bcm2835-audio: Drop DT dependency - -Just like the bcm2835-video make this a platform driver which is probed -by vchiq. In order to change the number of channels use a module -parameter instead, but use the maximum as default. - -Signed-off-by: Stefan Wahren ---- - .../vc04_services/bcm2835-audio/bcm2835.c | 41 +++++++++---------- - 1 file changed, 19 insertions(+), 22 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -@@ -4,15 +4,17 @@ - #include - - #include -+#include -+#include - #include - #include --#include - - #include "bcm2835.h" - - static bool enable_hdmi; - static bool enable_headphones; - static bool enable_compat_alsa = true; -+static int num_channels = MAX_SUBSTREAMS; - - module_param(enable_hdmi, bool, 0444); - MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device"); -@@ -21,6 +23,8 @@ MODULE_PARM_DESC(enable_headphones, "Ena - module_param(enable_compat_alsa, bool, 0444); - MODULE_PARM_DESC(enable_compat_alsa, - "Enables ALSA compatibility virtual audio device"); -+module_param(num_channels, int, 0644); -+MODULE_PARM_DESC(num_channels, "Number of audio channels (default: 8)"); - - static void snd_devm_unregister_child(struct device *dev, void *res) - { -@@ -407,31 +411,30 @@ static int snd_add_child_devices(struct - return 0; - } - --static int snd_bcm2835_alsa_probe_dt(struct platform_device *pdev) -+static int snd_bcm2835_alsa_probe(struct platform_device *pdev) - { - struct device *dev = &pdev->dev; -- u32 numchans; - int err; - -- err = of_property_read_u32(dev->of_node, "brcm,pwm-channels", -- &numchans); -- if (err) { -- dev_err(dev, "Failed to get DT property 'brcm,pwm-channels'"); -- return err; -+ if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { -+ num_channels = MAX_SUBSTREAMS; -+ dev_warn(dev, "Illegal num_channels value, will use %u\n", -+ num_channels); - } - -- if (numchans == 0 || numchans > MAX_SUBSTREAMS) { -- numchans = MAX_SUBSTREAMS; -- dev_warn(dev, -- "Illegal 'brcm,pwm-channels' value, will use %u\n", -- numchans); -+ dev->coherent_dma_mask = DMA_BIT_MASK(32); -+ dev->dma_mask = &dev->coherent_dma_mask; -+ err = of_dma_configure(dev, NULL, true); -+ if (err) { -+ dev_err(dev, "Unable to setup DMA: %d\n", err); -+ return err; - } - - err = bcm2835_devm_add_vchi_ctx(dev); - if (err) - return err; - -- err = snd_add_child_devices(dev, numchans); -+ err = snd_add_child_devices(dev, num_channels); - if (err) - return err; - -@@ -453,21 +456,14 @@ static int snd_bcm2835_alsa_resume(struc - - #endif - --static const struct of_device_id snd_bcm2835_of_match_table[] = { -- { .compatible = "brcm,bcm2835-audio",}, -- {}, --}; --MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table); -- - static struct platform_driver bcm2835_alsa0_driver = { -- .probe = snd_bcm2835_alsa_probe_dt, -+ .probe = snd_bcm2835_alsa_probe, - #ifdef CONFIG_PM - .suspend = snd_bcm2835_alsa_suspend, - .resume = snd_bcm2835_alsa_resume, - #endif - .driver = { - .name = "bcm2835_audio", -- .of_match_table = snd_bcm2835_of_match_table, - }, - }; - module_platform_driver(bcm2835_alsa0_driver); -@@ -475,3 +471,4 @@ module_platform_driver(bcm2835_alsa0_dri - MODULE_AUTHOR("Dom Cobley"); - MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); - MODULE_LICENSE("GPL"); -+MODULE_ALIAS("platform:bcm2835_audio"); diff --git a/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch b/target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-camera-Remove-dead-email-addresses.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Remove-dead-email-addresses.patch rename to target/linux/brcm2708/patches-4.19/950-0214-staging-bcm2835-camera-Remove-dead-email-addresses.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch b/target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Fix-comment-style-violations.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Fix-comment-style-violations.patch rename to target/linux/brcm2708/patches-4.19/950-0215-staging-bcm2835-camera-Fix-comment-style-violations.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch b/target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Fix-spacing-around-operators.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch rename to target/linux/brcm2708/patches-4.19/950-0216-staging-bcm2835-camera-Fix-spacing-around-operators.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch b/target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-camera-Reduce-length-of-enum-names.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Reduce-length-of-enum-names.patch rename to target/linux/brcm2708/patches-4.19/950-0217-staging-bcm2835-camera-Reduce-length-of-enum-names.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch b/target/linux/brcm2708/patches-4.19/950-0218-staging-bcm2835-camera-Fix-multiple-line-dereference.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Fix-multiple-line-dereference.patch rename to target/linux/brcm2708/patches-4.19/950-0218-staging-bcm2835-camera-Fix-multiple-line-dereference.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Fix-brace-style-issues.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch rename to target/linux/brcm2708/patches-4.19/950-0219-staging-bcm2835-camera-Fix-brace-style-issues.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch b/target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch rename to target/linux/brcm2708/patches-4.19/950-0220-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch b/target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Fix-logical-continuation-spli.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-logical-continuation-spli.patch rename to target/linux/brcm2708/patches-4.19/950-0221-staging-bcm2835-camera-Fix-logical-continuation-spli.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch b/target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch rename to target/linux/brcm2708/patches-4.19/950-0222-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch b/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Set-sequence-number-correctly.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Set-sequence-number-correctly.patch rename to target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Set-sequence-number-correctly.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch b/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch rename to target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch b/target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0234-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch rename to target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch b/target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0235-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch rename to target/linux/brcm2708/patches-4.19/950-0226-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch b/target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Unify-header-inclusion-define.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0236-staging-bcm2835-camera-Unify-header-inclusion-define.patch rename to target/linux/brcm2708/patches-4.19/950-0227-staging-bcm2835-camera-Unify-header-inclusion-define.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch b/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-alignment-should-match-op.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0237-staging-bcm2835-camera-Fix-alignment-should-match-op.patch rename to target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-alignment-should-match-op.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch b/target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0238-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch rename to target/linux/brcm2708/patches-4.19/950-0229-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch b/target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0239-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch rename to target/linux/brcm2708/patches-4.19/950-0230-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch b/target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch rename to target/linux/brcm2708/patches-4.19/950-0231-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch b/target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0241-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch rename to target/linux/brcm2708/patches-4.19/950-0232-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch b/target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0242-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch rename to target/linux/brcm2708/patches-4.19/950-0233-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch b/target/linux/brcm2708/patches-4.19/950-0234-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0243-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch rename to target/linux/brcm2708/patches-4.19/950-0234-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch b/target/linux/brcm2708/patches-4.19/950-0235-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0244-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch rename to target/linux/brcm2708/patches-4.19/950-0235-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch b/target/linux/brcm2708/patches-4.19/950-0236-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0245-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch rename to target/linux/brcm2708/patches-4.19/950-0236-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0237-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0246-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch rename to target/linux/brcm2708/patches-4.19/950-0237-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch b/target/linux/brcm2708/patches-4.19/950-0238-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0247-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch rename to target/linux/brcm2708/patches-4.19/950-0238-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch b/target/linux/brcm2708/patches-4.19/950-0239-staging-mmal-vchiq-Add-support-for-event-callbacks.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0248-staging-mmal-vchiq-Add-support-for-event-callbacks.patch rename to target/linux/brcm2708/patches-4.19/950-0239-staging-mmal-vchiq-Add-support-for-event-callbacks.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch b/target/linux/brcm2708/patches-4.19/950-0240-staging-vc04_services-Support-sending-data-to-MMAL-p.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0249-staging-vc04_services-Support-sending-data-to-MMAL-p.patch rename to target/linux/brcm2708/patches-4.19/950-0240-staging-vc04_services-Support-sending-data-to-MMAL-p.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch b/target/linux/brcm2708/patches-4.19/950-0241-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0250-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch rename to target/linux/brcm2708/patches-4.19/950-0241-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch b/target/linux/brcm2708/patches-4.19/950-0242-staging-vc04_services-Add-new-vc-sm-cma-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0251-staging-vc04_services-Add-new-vc-sm-cma-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0242-staging-vc04_services-Add-new-vc-sm-cma-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch b/target/linux/brcm2708/patches-4.19/950-0243-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0252-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch rename to target/linux/brcm2708/patches-4.19/950-0243-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch b/target/linux/brcm2708/patches-4.19/950-0244-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0253-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch rename to target/linux/brcm2708/patches-4.19/950-0244-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/brcm2708/patches-4.19/950-0245-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0254-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch rename to target/linux/brcm2708/patches-4.19/950-0245-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch b/target/linux/brcm2708/patches-4.19/950-0246-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0255-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0246-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/target/linux/brcm2708/patches-4.19/950-0247-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch similarity index 78% rename from target/linux/brcm2708/patches-4.19/950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch rename to target/linux/brcm2708/patches-4.19/950-0247-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch index c9461eb59d..51cc4a4632 100644 --- a/target/linux/brcm2708/patches-4.19/950-0256-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch +++ b/target/linux/brcm2708/patches-4.19/950-0247-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch @@ -14,18 +14,18 @@ Signed-off-by: Dave Stevenson --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -171,6 +171,7 @@ static struct device *vchiq_dev; +@@ -170,6 +170,7 @@ static struct class *vchiq_class; + static struct device *vchiq_dev; static DEFINE_SPINLOCK(msg_queue_spinlock); static struct platform_device *bcm2835_camera; - static struct platform_device *bcm2835_audio; +static struct platform_device *bcm2835_codec; static const char *const ioctl_names[] = { "CONNECT", -@@ -3660,6 +3661,9 @@ static int vchiq_probe(struct platform_d - bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); - if (IS_ERR(bcm2835_audio)) - bcm2835_audio = NULL; +@@ -3656,6 +3657,9 @@ static int vchiq_probe(struct platform_d + bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); + if (IS_ERR(bcm2835_camera)) + bcm2835_camera = NULL; + bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec"); + if (IS_ERR(bcm2835_codec)) + bcm2835_codec = NULL; diff --git a/target/linux/brcm2708/patches-4.19/950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/brcm2708/patches-4.19/950-0248-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch similarity index 87% rename from target/linux/brcm2708/patches-4.19/950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch rename to target/linux/brcm2708/patches-4.19/950-0248-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch index d04e261b45..6bfa52dfe6 100644 --- a/target/linux/brcm2708/patches-4.19/950-0257-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch +++ b/target/linux/brcm2708/patches-4.19/950-0248-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch @@ -14,15 +14,15 @@ Signed-off-by: Dave Stevenson --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -172,6 +172,7 @@ static DEFINE_SPINLOCK(msg_queue_spinloc +@@ -171,6 +171,7 @@ static struct device *vchiq_dev; + static DEFINE_SPINLOCK(msg_queue_spinlock); static struct platform_device *bcm2835_camera; - static struct platform_device *bcm2835_audio; static struct platform_device *bcm2835_codec; +static struct platform_device *vcsm_cma; static const char *const ioctl_names[] = { "CONNECT", -@@ -3655,6 +3656,9 @@ static int vchiq_probe(struct platform_d +@@ -3654,6 +3655,9 @@ static int vchiq_probe(struct platform_d VCHIQ_VERSION, VCHIQ_VERSION_MIN, MAJOR(vchiq_devid), MINOR(vchiq_devid)); diff --git a/target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch b/target/linux/brcm2708/patches-4.19/950-0249-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0258-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch rename to target/linux/brcm2708/patches-4.19/950-0249-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0250-tpm-Make-SECURITYFS-a-weak-dependency.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0260-tpm-Make-SECURITYFS-a-weak-dependency.patch rename to target/linux/brcm2708/patches-4.19/950-0250-tpm-Make-SECURITYFS-a-weak-dependency.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch b/target/linux/brcm2708/patches-4.19/950-0251-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0261-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch rename to target/linux/brcm2708/patches-4.19/950-0251-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch b/target/linux/brcm2708/patches-4.19/950-0252-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0264-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch rename to target/linux/brcm2708/patches-4.19/950-0252-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch b/target/linux/brcm2708/patches-4.19/950-0253-overlays-Update-README-with-removal-of-lirc-rpi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0265-overlays-Update-README-with-removal-of-lirc-rpi.patch rename to target/linux/brcm2708/patches-4.19/950-0253-overlays-Update-README-with-removal-of-lirc-rpi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch b/target/linux/brcm2708/patches-4.19/950-0254-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0266-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch rename to target/linux/brcm2708/patches-4.19/950-0254-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0267-gpio-ir-change-default-pull-configuration-to-up.patch b/target/linux/brcm2708/patches-4.19/950-0255-gpio-ir-change-default-pull-configuration-to-up.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0267-gpio-ir-change-default-pull-configuration-to-up.patch rename to target/linux/brcm2708/patches-4.19/950-0255-gpio-ir-change-default-pull-configuration-to-up.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch b/target/linux/brcm2708/patches-4.19/950-0256-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0268-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch rename to target/linux/brcm2708/patches-4.19/950-0256-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch b/target/linux/brcm2708/patches-4.19/950-0257-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0269-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch rename to target/linux/brcm2708/patches-4.19/950-0257-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch b/target/linux/brcm2708/patches-4.19/950-0258-arm64-dts-broadcom-Enable-fixups-for-overlays.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0270-arm64-dts-broadcom-Enable-fixups-for-overlays.patch rename to target/linux/brcm2708/patches-4.19/950-0258-arm64-dts-broadcom-Enable-fixups-for-overlays.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch b/target/linux/brcm2708/patches-4.19/950-0259-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0271-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch rename to target/linux/brcm2708/patches-4.19/950-0259-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch deleted file mode 100644 index 8bc16911ca..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0259-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch +++ /dev/null @@ -1,76 +0,0 @@ -From cf6f8129b6af78116e00b1d781e0bcc8c4b73890 Mon Sep 17 00:00:00 2001 -From: John Sheu -Date: Thu, 15 Oct 2015 18:05:25 +0900 -Subject: [PATCH] media: vb2: Allow reqbufs(0) with "in use" MMAP - buffers - -Videobuf2 presently does not allow VIDIOC_REQBUFS to destroy outstanding -buffers if the queue is of type V4L2_MEMORY_MMAP, and if the buffers are -considered "in use". This is different behavior than for other memory -types and prevents us from deallocating buffers in following two cases: - -1) There are outstanding mmap()ed views on the buffer. However even if - we put the buffer in reqbufs(0), there will be remaining references, - due to vma .open/close() adjusting vb2 buffer refcount appropriately. - This means that the buffer will be in fact freed only when the last - mmap()ed view is unmapped. - -2) Buffer has been exported as a DMABUF. Refcount of the vb2 buffer - is managed properly by VB2 DMABUF ops, i.e. incremented on DMABUF - get and decremented on DMABUF release. This means that the buffer - will be alive until all importers release it. - -Considering both cases above, there does not seem to be any need to -prevent reqbufs(0) operation, because buffer lifetime is already -properly managed by both mmap() and DMABUF code paths. Let's remove it -and allow userspace freeing the queue (and potentially allocating a new -one) even though old buffers might be still in processing. - -Signed-off-by: John Sheu -Reviewed-by: Pawel Osciak -Reviewed-by: Tomasz Figa -Signed-off-by: Tomasz Figa ---- - .../media/common/videobuf2/videobuf2-core.c | 23 ------------------- - 1 file changed, 23 deletions(-) - ---- a/drivers/media/common/videobuf2/videobuf2-core.c -+++ b/drivers/media/common/videobuf2/videobuf2-core.c -@@ -554,20 +554,6 @@ bool vb2_buffer_in_use(struct vb2_queue - } - EXPORT_SYMBOL(vb2_buffer_in_use); - --/* -- * __buffers_in_use() - return true if any buffers on the queue are in use and -- * the queue cannot be freed (by the means of REQBUFS(0)) call -- */ --static bool __buffers_in_use(struct vb2_queue *q) --{ -- unsigned int buffer; -- for (buffer = 0; buffer < q->num_buffers; ++buffer) { -- if (vb2_buffer_in_use(q, q->bufs[buffer])) -- return true; -- } -- return false; --} -- - void vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb) - { - call_void_bufop(q, fill_user_buffer, q->bufs[index], pb); -@@ -679,16 +665,7 @@ int vb2_core_reqbufs(struct vb2_queue *q - - if (*count == 0 || q->num_buffers != 0 || - (q->memory != VB2_MEMORY_UNKNOWN && q->memory != memory)) { -- /* -- * We already have buffers allocated, so first check if they -- * are not in use and can be freed. -- */ - mutex_lock(&q->mmap_lock); -- if (q->memory == VB2_MEMORY_MMAP && __buffers_in_use(q)) { -- mutex_unlock(&q->mmap_lock); -- dprintk(1, "memory in use, cannot free\n"); -- return -EBUSY; -- } - - /* - * Call queue_cancel to clean up any buffers in the PREPARED or diff --git a/target/linux/brcm2708/patches-4.19/950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch b/target/linux/brcm2708/patches-4.19/950-0260-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0272-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch rename to target/linux/brcm2708/patches-4.19/950-0260-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0273-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch rename to target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0262-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0274-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch rename to target/linux/brcm2708/patches-4.19/950-0262-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch b/target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch deleted file mode 100644 index aeaf8bf1a7..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0262-Revert-staging-vchiq_arm-Register-a-platform-device-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d679d6ff3fd138f55b8bbeaf7750c3c980944295 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Tue, 4 Dec 2018 19:40:12 +0000 -Subject: [PATCH] Revert "staging: vchiq_arm: Register a platform - device for the audio driver" - -This reverts commit ab59590ed562b89db51fe46cee5db96b9bc5abd8. - -Issues have been observed in LibreElec as this was unconditionally -loading the audio driver instead of having the DT parameter to -enable it. - -Includes a partial revert of 2147700eb7a1b9e55e0684f0749114ce35d61571 -which fixed up the error handling. - -Signed-off-by: Dave Stevenson ---- - .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -170,7 +170,6 @@ static struct class *vchiq_class; - static struct device *vchiq_dev; - static DEFINE_SPINLOCK(msg_queue_spinlock); - static struct platform_device *bcm2835_camera; --static struct platform_device *bcm2835_audio; - static struct platform_device *bcm2835_codec; - static struct platform_device *vcsm_cma; - -@@ -3662,9 +3661,6 @@ static int vchiq_probe(struct platform_d - bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); - if (IS_ERR(bcm2835_camera)) - bcm2835_camera = NULL; -- bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); -- if (IS_ERR(bcm2835_audio)) -- bcm2835_audio = NULL; - bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec"); - if (IS_ERR(bcm2835_codec)) - bcm2835_codec = NULL; -@@ -3685,7 +3681,6 @@ failed_platform_init: - static int vchiq_remove(struct platform_device *pdev) - { - platform_device_unregister(bcm2835_codec); -- platform_device_unregister(bcm2835_audio); - platform_device_unregister(bcm2835_camera); - platform_device_unregister(vcsm_cma); - vchiq_debugfs_deinit(); diff --git a/target/linux/brcm2708/patches-4.19/950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0263-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0275-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0263-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch deleted file mode 100644 index ea5d5d2949..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0263-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 28e06d43dd44a45d307848bed588fc65d7c79d83 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Tue, 4 Dec 2018 20:41:19 +0000 -Subject: [PATCH] Revert "staging: bcm2835-audio: Drop DT dependency" - -This reverts commit 933bc853bb764e476b0b0f633588f46d20f1f76a. - -Signed-off-by: Dave Stevenson ---- - .../vc04_services/bcm2835-audio/bcm2835.c | 41 ++++++++++--------- - 1 file changed, 22 insertions(+), 19 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -@@ -4,17 +4,15 @@ - #include - - #include --#include --#include - #include - #include -+#include - - #include "bcm2835.h" - - static bool enable_hdmi; - static bool enable_headphones; - static bool enable_compat_alsa = true; --static int num_channels = MAX_SUBSTREAMS; - - module_param(enable_hdmi, bool, 0444); - MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device"); -@@ -23,8 +21,6 @@ MODULE_PARM_DESC(enable_headphones, "Ena - module_param(enable_compat_alsa, bool, 0444); - MODULE_PARM_DESC(enable_compat_alsa, - "Enables ALSA compatibility virtual audio device"); --module_param(num_channels, int, 0644); --MODULE_PARM_DESC(num_channels, "Number of audio channels (default: 8)"); - - static void snd_devm_unregister_child(struct device *dev, void *res) - { -@@ -411,30 +407,31 @@ static int snd_add_child_devices(struct - return 0; - } - --static int snd_bcm2835_alsa_probe(struct platform_device *pdev) -+static int snd_bcm2835_alsa_probe_dt(struct platform_device *pdev) - { - struct device *dev = &pdev->dev; -+ u32 numchans; - int err; - -- if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { -- num_channels = MAX_SUBSTREAMS; -- dev_warn(dev, "Illegal num_channels value, will use %u\n", -- num_channels); -- } -- -- dev->coherent_dma_mask = DMA_BIT_MASK(32); -- dev->dma_mask = &dev->coherent_dma_mask; -- err = of_dma_configure(dev, NULL, true); -+ err = of_property_read_u32(dev->of_node, "brcm,pwm-channels", -+ &numchans); - if (err) { -- dev_err(dev, "Unable to setup DMA: %d\n", err); -+ dev_err(dev, "Failed to get DT property 'brcm,pwm-channels'"); - return err; - } - -+ if (numchans == 0 || numchans > MAX_SUBSTREAMS) { -+ numchans = MAX_SUBSTREAMS; -+ dev_warn(dev, -+ "Illegal 'brcm,pwm-channels' value, will use %u\n", -+ numchans); -+ } -+ - err = bcm2835_devm_add_vchi_ctx(dev); - if (err) - return err; - -- err = snd_add_child_devices(dev, num_channels); -+ err = snd_add_child_devices(dev, numchans); - if (err) - return err; - -@@ -456,14 +453,21 @@ static int snd_bcm2835_alsa_resume(struc - - #endif - -+static const struct of_device_id snd_bcm2835_of_match_table[] = { -+ { .compatible = "brcm,bcm2835-audio",}, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table); -+ - static struct platform_driver bcm2835_alsa0_driver = { -- .probe = snd_bcm2835_alsa_probe, -+ .probe = snd_bcm2835_alsa_probe_dt, - #ifdef CONFIG_PM - .suspend = snd_bcm2835_alsa_suspend, - .resume = snd_bcm2835_alsa_resume, - #endif - .driver = { - .name = "bcm2835_audio", -+ .of_match_table = snd_bcm2835_of_match_table, - }, - }; - module_platform_driver(bcm2835_alsa0_driver); -@@ -471,4 +475,3 @@ module_platform_driver(bcm2835_alsa0_dri - MODULE_AUTHOR("Dom Cobley"); - MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); - MODULE_LICENSE("GPL"); --MODULE_ALIAS("platform:bcm2835_audio"); diff --git a/target/linux/brcm2708/patches-4.19/950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch b/target/linux/brcm2708/patches-4.19/950-0264-overlays-sdio-Add-enhanced-1-bit-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0276-overlays-sdio-Add-enhanced-1-bit-support.patch rename to target/linux/brcm2708/patches-4.19/950-0264-overlays-sdio-Add-enhanced-1-bit-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch b/target/linux/brcm2708/patches-4.19/950-0265-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0277-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch rename to target/linux/brcm2708/patches-4.19/950-0265-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch b/target/linux/brcm2708/patches-4.19/950-0266-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0278-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch rename to target/linux/brcm2708/patches-4.19/950-0266-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch b/target/linux/brcm2708/patches-4.19/950-0267-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0279-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch rename to target/linux/brcm2708/patches-4.19/950-0267-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch b/target/linux/brcm2708/patches-4.19/950-0268-overlays-Add-ssd1306-overlay-for-OLED-display.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0280-overlays-Add-ssd1306-overlay-for-OLED-display.patch rename to target/linux/brcm2708/patches-4.19/950-0268-overlays-Add-ssd1306-overlay-for-OLED-display.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0281-overlays-mcp23017-Support-the-MCP23008.patch b/target/linux/brcm2708/patches-4.19/950-0269-overlays-mcp23017-Support-the-MCP23008.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0281-overlays-mcp23017-Support-the-MCP23008.patch rename to target/linux/brcm2708/patches-4.19/950-0269-overlays-mcp23017-Support-the-MCP23008.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0282-overlays-Add-mcp342x-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0270-overlays-Add-mcp342x-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0282-overlays-Add-mcp342x-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0270-overlays-Add-mcp342x-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0283-char-vcio-Add-compat-ioctl-handling.patch b/target/linux/brcm2708/patches-4.19/950-0271-char-vcio-Add-compat-ioctl-handling.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0283-char-vcio-Add-compat-ioctl-handling.patch rename to target/linux/brcm2708/patches-4.19/950-0271-char-vcio-Add-compat-ioctl-handling.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch b/target/linux/brcm2708/patches-4.19/950-0272-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0284-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch rename to target/linux/brcm2708/patches-4.19/950-0272-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch b/target/linux/brcm2708/patches-4.19/950-0273-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0285-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch rename to target/linux/brcm2708/patches-4.19/950-0273-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch b/target/linux/brcm2708/patches-4.19/950-0274-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch rename to target/linux/brcm2708/patches-4.19/950-0274-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch b/target/linux/brcm2708/patches-4.19/950-0275-staging-bcm2835-camera-Set-the-field-value-within-ea.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-camera-Set-the-field-value-within-ea.patch rename to target/linux/brcm2708/patches-4.19/950-0275-staging-bcm2835-camera-Set-the-field-value-within-ea.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch b/target/linux/brcm2708/patches-4.19/950-0276-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0288-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch rename to target/linux/brcm2708/patches-4.19/950-0276-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0289-char-vc_mem-Fix-all-coding-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0277-char-vc_mem-Fix-all-coding-style-issues.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0289-char-vc_mem-Fix-all-coding-style-issues.patch rename to target/linux/brcm2708/patches-4.19/950-0277-char-vc_mem-Fix-all-coding-style-issues.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch b/target/linux/brcm2708/patches-4.19/950-0278-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0290-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch rename to target/linux/brcm2708/patches-4.19/950-0278-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch b/target/linux/brcm2708/patches-4.19/950-0279-mfd-Add-rpi_sense_core-of-compatible-string.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0291-mfd-Add-rpi_sense_core-of-compatible-string.patch rename to target/linux/brcm2708/patches-4.19/950-0279-mfd-Add-rpi_sense_core-of-compatible-string.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0280-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0292-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch rename to target/linux/brcm2708/patches-4.19/950-0280-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch b/target/linux/brcm2708/patches-4.19/950-0281-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0293-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch rename to target/linux/brcm2708/patches-4.19/950-0281-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0282-dtoverlays-Correct-DT-handling-camera-GPIOs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0294-dtoverlays-Correct-DT-handling-camera-GPIOs.patch rename to target/linux/brcm2708/patches-4.19/950-0282-dtoverlays-Correct-DT-handling-camera-GPIOs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch b/target/linux/brcm2708/patches-4.19/950-0283-media-ov5647-Use-gpiod_set_value_cansleep.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0295-media-ov5647-Use-gpiod_set_value_cansleep.patch rename to target/linux/brcm2708/patches-4.19/950-0283-media-ov5647-Use-gpiod_set_value_cansleep.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch b/target/linux/brcm2708/patches-4.19/950-0284-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0296-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch rename to target/linux/brcm2708/patches-4.19/950-0284-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0297-audioinjector-octo-revert-to-dummy-supplies.patch b/target/linux/brcm2708/patches-4.19/950-0285-audioinjector-octo-revert-to-dummy-supplies.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0297-audioinjector-octo-revert-to-dummy-supplies.patch rename to target/linux/brcm2708/patches-4.19/950-0285-audioinjector-octo-revert-to-dummy-supplies.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch b/target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0298-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch rename to target/linux/brcm2708/patches-4.19/950-0286-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch b/target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0299-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch rename to target/linux/brcm2708/patches-4.19/950-0287-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch b/target/linux/brcm2708/patches-4.19/950-0288-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0300-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch rename to target/linux/brcm2708/patches-4.19/950-0288-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch b/target/linux/brcm2708/patches-4.19/950-0289-video-bcm2708_fb-Add-compat_ioctl-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0301-video-bcm2708_fb-Add-compat_ioctl-support.patch rename to target/linux/brcm2708/patches-4.19/950-0289-video-bcm2708_fb-Add-compat_ioctl-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch b/target/linux/brcm2708/patches-4.19/950-0290-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0302-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch rename to target/linux/brcm2708/patches-4.19/950-0290-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0291-video-bcm2708_fb-Clean-up-coding-style-issues.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0303-video-bcm2708_fb-Clean-up-coding-style-issues.patch rename to target/linux/brcm2708/patches-4.19/950-0291-video-bcm2708_fb-Clean-up-coding-style-issues.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch b/target/linux/brcm2708/patches-4.19/950-0292-bcm2835-dma-Add-support-for-per-channel-flags.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0304-bcm2835-dma-Add-support-for-per-channel-flags.patch rename to target/linux/brcm2708/patches-4.19/950-0292-bcm2835-dma-Add-support-for-per-channel-flags.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch b/target/linux/brcm2708/patches-4.19/950-0293-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0305-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch rename to target/linux/brcm2708/patches-4.19/950-0293-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch b/target/linux/brcm2708/patches-4.19/950-0294-ASoC-pcm512x-Implement-the-digital_mute-interface.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0306-ASoC-pcm512x-Implement-the-digital_mute-interface.patch rename to target/linux/brcm2708/patches-4.19/950-0294-ASoC-pcm512x-Implement-the-digital_mute-interface.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch b/target/linux/brcm2708/patches-4.19/950-0295-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0307-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch rename to target/linux/brcm2708/patches-4.19/950-0295-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch b/target/linux/brcm2708/patches-4.19/950-0296-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0308-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch rename to target/linux/brcm2708/patches-4.19/950-0296-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch b/target/linux/brcm2708/patches-4.19/950-0297-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0309-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch rename to target/linux/brcm2708/patches-4.19/950-0297-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/target/linux/brcm2708/patches-4.19/950-0298-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0310-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch rename to target/linux/brcm2708/patches-4.19/950-0298-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch b/target/linux/brcm2708/patches-4.19/950-0299-staging-vc-sm-cma-Correct-DMA-configuration.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0311-staging-vc-sm-cma-Correct-DMA-configuration.patch rename to target/linux/brcm2708/patches-4.19/950-0299-staging-vc-sm-cma-Correct-DMA-configuration.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch b/target/linux/brcm2708/patches-4.19/950-0300-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0312-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch rename to target/linux/brcm2708/patches-4.19/950-0300-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch b/target/linux/brcm2708/patches-4.19/950-0301-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0313-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch rename to target/linux/brcm2708/patches-4.19/950-0301-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0314-configs-Enable-the-AD193x-codecs.patch b/target/linux/brcm2708/patches-4.19/950-0302-configs-Enable-the-AD193x-codecs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0314-configs-Enable-the-AD193x-codecs.patch rename to target/linux/brcm2708/patches-4.19/950-0302-configs-Enable-the-AD193x-codecs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch b/target/linux/brcm2708/patches-4.19/950-0303-overlays-balenaFin-v1.1.0-carrier-board-update.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0315-overlays-balenaFin-v1.1.0-carrier-board-update.patch rename to target/linux/brcm2708/patches-4.19/950-0303-overlays-balenaFin-v1.1.0-carrier-board-update.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch b/target/linux/brcm2708/patches-4.19/950-0304-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0316-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch rename to target/linux/brcm2708/patches-4.19/950-0304-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch b/target/linux/brcm2708/patches-4.19/950-0305-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0317-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch rename to target/linux/brcm2708/patches-4.19/950-0305-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch b/target/linux/brcm2708/patches-4.19/950-0306-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0318-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch rename to target/linux/brcm2708/patches-4.19/950-0306-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch b/target/linux/brcm2708/patches-4.19/950-0307-staging-mmal-vchiq-Always-return-the-param-size-from.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0319-staging-mmal-vchiq-Always-return-the-param-size-from.patch rename to target/linux/brcm2708/patches-4.19/950-0307-staging-mmal-vchiq-Always-return-the-param-size-from.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch b/target/linux/brcm2708/patches-4.19/950-0308-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0320-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch rename to target/linux/brcm2708/patches-4.19/950-0308-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch b/target/linux/brcm2708/patches-4.19/950-0309-staging-bcm2835_codec-Query-supported-formats-from-t.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0321-staging-bcm2835_codec-Query-supported-formats-from-t.patch rename to target/linux/brcm2708/patches-4.19/950-0309-staging-bcm2835_codec-Query-supported-formats-from-t.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch b/target/linux/brcm2708/patches-4.19/950-0310-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0322-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch rename to target/linux/brcm2708/patches-4.19/950-0310-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch b/target/linux/brcm2708/patches-4.19/950-0311-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch rename to target/linux/brcm2708/patches-4.19/950-0311-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch b/target/linux/brcm2708/patches-4.19/950-0312-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0324-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch rename to target/linux/brcm2708/patches-4.19/950-0312-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch b/target/linux/brcm2708/patches-4.19/950-0313-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0325-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch rename to target/linux/brcm2708/patches-4.19/950-0313-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch b/target/linux/brcm2708/patches-4.19/950-0314-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0326-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch rename to target/linux/brcm2708/patches-4.19/950-0314-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch b/target/linux/brcm2708/patches-4.19/950-0315-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0327-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch rename to target/linux/brcm2708/patches-4.19/950-0315-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch b/target/linux/brcm2708/patches-4.19/950-0316-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0328-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch rename to target/linux/brcm2708/patches-4.19/950-0316-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0329-Added-mute-stream-func.patch b/target/linux/brcm2708/patches-4.19/950-0317-Added-mute-stream-func.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0329-Added-mute-stream-func.patch rename to target/linux/brcm2708/patches-4.19/950-0317-Added-mute-stream-func.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/brcm2708/patches-4.19/950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0330-lan78xx-EEE-support-is-now-a-PHY-property.patch rename to target/linux/brcm2708/patches-4.19/950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch b/target/linux/brcm2708/patches-4.19/950-0319-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0332-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch rename to target/linux/brcm2708/patches-4.19/950-0319-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch b/target/linux/brcm2708/patches-4.19/950-0320-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0333-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch rename to target/linux/brcm2708/patches-4.19/950-0320-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0334-vcsm-Remove-set-but-unused-variable.patch b/target/linux/brcm2708/patches-4.19/950-0321-vcsm-Remove-set-but-unused-variable.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0334-vcsm-Remove-set-but-unused-variable.patch rename to target/linux/brcm2708/patches-4.19/950-0321-vcsm-Remove-set-but-unused-variable.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0335-vcsm-Reduce-scope-of-local-functions.patch b/target/linux/brcm2708/patches-4.19/950-0322-vcsm-Reduce-scope-of-local-functions.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0335-vcsm-Reduce-scope-of-local-functions.patch rename to target/linux/brcm2708/patches-4.19/950-0322-vcsm-Reduce-scope-of-local-functions.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch b/target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835-codec-NULL-component-handle-on-queue.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0336-staging-bcm2835-codec-NULL-component-handle-on-queue.patch rename to target/linux/brcm2708/patches-4.19/950-0323-staging-bcm2835-codec-NULL-component-handle-on-queue.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch b/target/linux/brcm2708/patches-4.19/950-0324-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0337-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch rename to target/linux/brcm2708/patches-4.19/950-0324-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch b/target/linux/brcm2708/patches-4.19/950-0325-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0338-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch rename to target/linux/brcm2708/patches-4.19/950-0325-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch b/target/linux/brcm2708/patches-4.19/950-0326-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0339-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch rename to target/linux/brcm2708/patches-4.19/950-0326-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch b/target/linux/brcm2708/patches-4.19/950-0327-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0340-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch rename to target/linux/brcm2708/patches-4.19/950-0327-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch b/target/linux/brcm2708/patches-4.19/950-0328-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0341-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch rename to target/linux/brcm2708/patches-4.19/950-0328-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch b/target/linux/brcm2708/patches-4.19/950-0329-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0342-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch rename to target/linux/brcm2708/patches-4.19/950-0329-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch b/target/linux/brcm2708/patches-4.19/950-0330-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0343-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch rename to target/linux/brcm2708/patches-4.19/950-0330-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch b/target/linux/brcm2708/patches-4.19/950-0331-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0344-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch rename to target/linux/brcm2708/patches-4.19/950-0331-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch b/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch deleted file mode 100644 index d709214664..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0331-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch +++ /dev/null @@ -1,162 +0,0 @@ -From a9a47ea599c12d29526138cd6e48f6c9eac19358 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Wed, 27 Feb 2019 17:30:33 +0000 -Subject: [PATCH] video: bcm2708_fb: Try allocating on the ARM and - passing to VPU - -Currently the VPU allocates the contiguous buffer for the -framebuffer. -Try an alternate path first where we use dma_alloc_coherent -and pass the buffer to the VPU. Should the VPU firmware not -support that path, then free the buffer and revert to the -old behaviour of using the VPU allocation. - -Signed-off-by: Dave Stevenson ---- - drivers/video/fbdev/bcm2708_fb.c | 102 ++++++++++++++++++--- - include/soc/bcm2835/raspberrypi-firmware.h | 1 + - 2 files changed, 91 insertions(+), 12 deletions(-) - ---- a/drivers/video/fbdev/bcm2708_fb.c -+++ b/drivers/video/fbdev/bcm2708_fb.c -@@ -98,6 +98,11 @@ struct bcm2708_fb { - struct bcm2708_fb_stats stats; - unsigned long fb_bus_address; - struct { u32 base, length; } gpu; -+ -+ bool disable_arm_alloc; -+ unsigned int image_size; -+ dma_addr_t dma_addr; -+ void *cpuaddr; - }; - - #define to_bcm2708(info) container_of(info, struct bcm2708_fb, fb) -@@ -283,23 +288,88 @@ static int bcm2708_fb_set_par(struct fb_ - .xoffset = info->var.xoffset, - .yoffset = info->var.yoffset, - .tag5 = { RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE, 8, 0 }, -- .base = 0, -- .screen_size = 0, -- .tag6 = { RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH, 4, 0 }, -- .pitch = 0, -+ /* base and screen_size will be initialised later */ -+ .tag6 = { RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH, 4, 0 }, -+ /* pitch will be initialised later */ - }; -- int ret; -+ int ret, image_size; -+ - - print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n", __func__, info, - info->var.xres, info->var.yres, info->var.xres_virtual, - info->var.yres_virtual, (int)info->screen_size, - info->var.bits_per_pixel); - -- ret = rpi_firmware_property_list(fb->fw, &fbinfo, sizeof(fbinfo)); -+ /* Try allocating our own buffer. We can specify all the parameters */ -+ image_size = ((info->var.xres * info->var.yres) * -+ info->var.bits_per_pixel) >> 3; -+ -+ if (!fb->disable_arm_alloc && -+ (image_size != fb->image_size || !fb->dma_addr)) { -+ if (fb->dma_addr) { -+ dma_free_coherent(info->device, fb->image_size, -+ fb->cpuaddr, fb->dma_addr); -+ fb->image_size = 0; -+ fb->cpuaddr = NULL; -+ fb->dma_addr = 0; -+ } -+ -+ fb->cpuaddr = dma_alloc_coherent(info->device, image_size, -+ &fb->dma_addr, GFP_KERNEL); -+ -+ if (!fb->cpuaddr) { -+ fb->dma_addr = 0; -+ fb->disable_arm_alloc = true; -+ } else { -+ fb->image_size = image_size; -+ } -+ } -+ -+ if (fb->cpuaddr) { -+ fbinfo.base = fb->dma_addr; -+ fbinfo.screen_size = image_size; -+ fbinfo.pitch = (info->var.xres * info->var.bits_per_pixel) >> 3; -+ -+ ret = rpi_firmware_property_list(fb->fw, &fbinfo, -+ sizeof(fbinfo)); -+ if (ret || fbinfo.base != fb->dma_addr) { -+ /* Firmware either failed, or assigned a different base -+ * address (ie it doesn't support being passed an FB -+ * allocation). -+ * Destroy the allocation, and don't try again. -+ */ -+ dma_free_coherent(info->device, fb->image_size, -+ fb->cpuaddr, fb->dma_addr); -+ fb->image_size = 0; -+ fb->cpuaddr = NULL; -+ fb->dma_addr = 0; -+ fb->disable_arm_alloc = true; -+ } -+ } else { -+ /* Our allocation failed - drop into the old scheme of -+ * allocation by the VPU. -+ */ -+ ret = -ENOMEM; -+ } -+ - if (ret) { -- dev_err(info->device, -- "Failed to allocate GPU framebuffer (%d)\n", ret); -- return ret; -+ /* Old scheme: -+ * - FRAMEBUFFER_ALLOCATE passes 0 for base and screen_size. -+ * - GET_PITCH instead of SET_PITCH. -+ */ -+ fbinfo.base = 0; -+ fbinfo.screen_size = 0; -+ fbinfo.tag6.tag = RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH; -+ fbinfo.pitch = 0; -+ -+ ret = rpi_firmware_property_list(fb->fw, &fbinfo, -+ sizeof(fbinfo)); -+ if (ret) { -+ dev_err(info->device, -+ "Failed to allocate GPU framebuffer (%d)\n", -+ ret); -+ return ret; -+ } - } - - if (info->var.bits_per_pixel <= 8) -@@ -314,9 +384,17 @@ static int bcm2708_fb_set_par(struct fb_ - fb->fb.fix.smem_start = fbinfo.base; - fb->fb.fix.smem_len = fbinfo.pitch * fbinfo.yres_virtual; - fb->fb.screen_size = fbinfo.screen_size; -- if (fb->fb.screen_base) -- iounmap(fb->fb.screen_base); -- fb->fb.screen_base = ioremap_wc(fbinfo.base, fb->fb.screen_size); -+ -+ if (!fb->dma_addr) { -+ if (fb->fb.screen_base) -+ iounmap(fb->fb.screen_base); -+ -+ fb->fb.screen_base = ioremap_wc(fbinfo.base, -+ fb->fb.screen_size); -+ } else { -+ fb->fb.screen_base = fb->cpuaddr; -+ } -+ - if (!fb->fb.screen_base) { - /* the console may currently be locked */ - console_trylock(); ---- a/include/soc/bcm2835/raspberrypi-firmware.h -+++ b/include/soc/bcm2835/raspberrypi-firmware.h -@@ -128,6 +128,7 @@ enum rpi_firmware_property_tag { - RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH = 0x00048005, - RPI_FIRMWARE_FRAMEBUFFER_SET_PIXEL_ORDER = 0x00048006, - RPI_FIRMWARE_FRAMEBUFFER_SET_ALPHA_MODE = 0x00048007, -+ RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH = 0x00048008, - RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET = 0x00048009, - RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN = 0x0004800a, - RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE = 0x0004800b, diff --git a/target/linux/brcm2708/patches-4.19/950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch b/target/linux/brcm2708/patches-4.19/950-0332-bcm2835-mmc-Fix-DMA-channel-leak.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0345-bcm2835-mmc-Fix-DMA-channel-leak.patch rename to target/linux/brcm2708/patches-4.19/950-0332-bcm2835-mmc-Fix-DMA-channel-leak.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch b/target/linux/brcm2708/patches-4.19/950-0333-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0346-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch rename to target/linux/brcm2708/patches-4.19/950-0333-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch b/target/linux/brcm2708/patches-4.19/950-0334-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0347-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch rename to target/linux/brcm2708/patches-4.19/950-0334-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch b/target/linux/brcm2708/patches-4.19/950-0335-bcm2835-mmc-Handle-mmc_add_host-errors.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0348-bcm2835-mmc-Handle-mmc_add_host-errors.patch rename to target/linux/brcm2708/patches-4.19/950-0335-bcm2835-mmc-Handle-mmc_add_host-errors.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch b/target/linux/brcm2708/patches-4.19/950-0336-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0349-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch rename to target/linux/brcm2708/patches-4.19/950-0336-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch b/target/linux/brcm2708/patches-4.19/950-0337-overlays-Add-max17040-support-to-i2c-sensor.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0350-overlays-Add-max17040-support-to-i2c-sensor.patch rename to target/linux/brcm2708/patches-4.19/950-0337-overlays-Add-max17040-support-to-i2c-sensor.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch b/target/linux/brcm2708/patches-4.19/950-0338-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0351-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch rename to target/linux/brcm2708/patches-4.19/950-0338-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch b/target/linux/brcm2708/patches-4.19/950-0339-staging-bcm2835-codec-Refactor-default-resolution-co.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0352-staging-bcm2835-codec-Refactor-default-resolution-co.patch rename to target/linux/brcm2708/patches-4.19/950-0339-staging-bcm2835-codec-Refactor-default-resolution-co.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0353-nvmem-add-type-attribute.patch b/target/linux/brcm2708/patches-4.19/950-0340-nvmem-add-type-attribute.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0353-nvmem-add-type-attribute.patch rename to target/linux/brcm2708/patches-4.19/950-0340-nvmem-add-type-attribute.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0354-rtc-rv3028-add-new-driver.patch b/target/linux/brcm2708/patches-4.19/950-0341-rtc-rv3028-add-new-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0354-rtc-rv3028-add-new-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0341-rtc-rv3028-add-new-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0355-overlays-Add-rv3028-to-i2c-rtc.patch b/target/linux/brcm2708/patches-4.19/950-0342-overlays-Add-rv3028-to-i2c-rtc.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0355-overlays-Add-rv3028-to-i2c-rtc.patch rename to target/linux/brcm2708/patches-4.19/950-0342-overlays-Add-rv3028-to-i2c-rtc.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch b/target/linux/brcm2708/patches-4.19/950-0343-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch rename to target/linux/brcm2708/patches-4.19/950-0343-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch b/target/linux/brcm2708/patches-4.19/950-0344-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0357-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch rename to target/linux/brcm2708/patches-4.19/950-0344-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch b/target/linux/brcm2708/patches-4.19/950-0345-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch rename to target/linux/brcm2708/patches-4.19/950-0345-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0346-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0346-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0347-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0347-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0348-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0348-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0349-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0362-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0349-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0350-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0363-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0350-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch b/target/linux/brcm2708/patches-4.19/950-0351-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0364-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch rename to target/linux/brcm2708/patches-4.19/950-0351-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch b/target/linux/brcm2708/patches-4.19/950-0352-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0365-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch rename to target/linux/brcm2708/patches-4.19/950-0352-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch b/target/linux/brcm2708/patches-4.19/950-0353-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0366-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch rename to target/linux/brcm2708/patches-4.19/950-0353-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch b/target/linux/brcm2708/patches-4.19/950-0354-ASoC-tlv320aic32x4-Remove-mclk-references.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0367-ASoC-tlv320aic32x4-Remove-mclk-references.patch rename to target/linux/brcm2708/patches-4.19/950-0354-ASoC-tlv320aic32x4-Remove-mclk-references.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch b/target/linux/brcm2708/patches-4.19/950-0355-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0368-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch rename to target/linux/brcm2708/patches-4.19/950-0355-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch b/target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0369-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch rename to target/linux/brcm2708/patches-4.19/950-0356-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0357-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0370-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0357-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch b/target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Change-author-s-name.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0371-ASoC-tlv320aic32x4-Change-author-s-name.patch rename to target/linux/brcm2708/patches-4.19/950-0358-ASoC-tlv320aic32x4-Change-author-s-name.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch b/target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0372-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch rename to target/linux/brcm2708/patches-4.19/950-0359-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch b/target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0373-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch rename to target/linux/brcm2708/patches-4.19/950-0360-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch b/target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0374-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch rename to target/linux/brcm2708/patches-4.19/950-0361-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch b/target/linux/brcm2708/patches-4.19/950-0362-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0375-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch rename to target/linux/brcm2708/patches-4.19/950-0362-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch b/target/linux/brcm2708/patches-4.19/950-0363-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0376-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch rename to target/linux/brcm2708/patches-4.19/950-0363-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch b/target/linux/brcm2708/patches-4.19/950-0364-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0377-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch rename to target/linux/brcm2708/patches-4.19/950-0364-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0378-Input-ili210x-add-DT-binding-document.patch b/target/linux/brcm2708/patches-4.19/950-0365-Input-ili210x-add-DT-binding-document.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0378-Input-ili210x-add-DT-binding-document.patch rename to target/linux/brcm2708/patches-4.19/950-0365-Input-ili210x-add-DT-binding-document.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch b/target/linux/brcm2708/patches-4.19/950-0366-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0379-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch rename to target/linux/brcm2708/patches-4.19/950-0366-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch b/target/linux/brcm2708/patches-4.19/950-0367-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0380-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch rename to target/linux/brcm2708/patches-4.19/950-0367-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch b/target/linux/brcm2708/patches-4.19/950-0368-rtc-rv3028-Add-backup-switchover-mode-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0381-rtc-rv3028-Add-backup-switchover-mode-support.patch rename to target/linux/brcm2708/patches-4.19/950-0368-rtc-rv3028-Add-backup-switchover-mode-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0382-dt-bindings-rv3028-backup-switchover-support.patch b/target/linux/brcm2708/patches-4.19/950-0369-dt-bindings-rv3028-backup-switchover-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0382-dt-bindings-rv3028-backup-switchover-support.patch rename to target/linux/brcm2708/patches-4.19/950-0369-dt-bindings-rv3028-backup-switchover-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch b/target/linux/brcm2708/patches-4.19/950-0370-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0383-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch rename to target/linux/brcm2708/patches-4.19/950-0370-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch b/target/linux/brcm2708/patches-4.19/950-0371-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0384-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch rename to target/linux/brcm2708/patches-4.19/950-0371-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0372-sound-Fixes-for-audioinjector-octo-under-4.19.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0385-sound-Fixes-for-audioinjector-octo-under-4.19.patch rename to target/linux/brcm2708/patches-4.19/950-0372-sound-Fixes-for-audioinjector-octo-under-4.19.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0387-overlays-Add-PiGlow-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0373-overlays-Add-PiGlow-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0387-overlays-Add-PiGlow-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0373-overlays-Add-PiGlow-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch b/target/linux/brcm2708/patches-4.19/950-0374-staging-bcm2835-audio-Clean-up-mutex-locks.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Clean-up-mutex-locks.patch rename to target/linux/brcm2708/patches-4.19/950-0374-staging-bcm2835-audio-Clean-up-mutex-locks.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch b/target/linux/brcm2708/patches-4.19/950-0375-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch rename to target/linux/brcm2708/patches-4.19/950-0375-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch b/target/linux/brcm2708/patches-4.19/950-0376-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch rename to target/linux/brcm2708/patches-4.19/950-0376-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch b/target/linux/brcm2708/patches-4.19/950-0377-staging-bcm2835-audio-Remove-redundant-substream-mas.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Remove-redundant-substream-mas.patch rename to target/linux/brcm2708/patches-4.19/950-0377-staging-bcm2835-audio-Remove-redundant-substream-mas.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch b/target/linux/brcm2708/patches-4.19/950-0378-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch rename to target/linux/brcm2708/patches-4.19/950-0378-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch b/target/linux/brcm2708/patches-4.19/950-0379-staging-bcm2835-audio-Remove-redundant-function-call.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-redundant-function-call.patch rename to target/linux/brcm2708/patches-4.19/950-0379-staging-bcm2835-audio-Remove-redundant-function-call.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch b/target/linux/brcm2708/patches-4.19/950-0380-staging-bcm2835-audio-Remove-superfluous-open-flag.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Remove-superfluous-open-flag.patch rename to target/linux/brcm2708/patches-4.19/950-0380-staging-bcm2835-audio-Remove-superfluous-open-flag.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch b/target/linux/brcm2708/patches-4.19/950-0381-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch rename to target/linux/brcm2708/patches-4.19/950-0381-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch b/target/linux/brcm2708/patches-4.19/950-0382-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch rename to target/linux/brcm2708/patches-4.19/950-0382-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch b/target/linux/brcm2708/patches-4.19/950-0383-staging-bcm2835-audio-Kill-unused-spinlock.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Kill-unused-spinlock.patch rename to target/linux/brcm2708/patches-4.19/950-0383-staging-bcm2835-audio-Kill-unused-spinlock.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch b/target/linux/brcm2708/patches-4.19/950-0384-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch rename to target/linux/brcm2708/patches-4.19/950-0384-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch b/target/linux/brcm2708/patches-4.19/950-0385-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch rename to target/linux/brcm2708/patches-4.19/950-0385-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch deleted file mode 100644 index 36d3ee1ac3..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 49b6bb41655247c123cdc46dd49276a107c8b1d2 Mon Sep 17 00:00:00 2001 -From: P33M -Date: Wed, 24 Apr 2019 14:25:09 +0100 -Subject: [PATCH] Revert "cgroup: Disable cgroup "memory" by default" - -This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b. ---- - kernel/cgroup/cgroup.c | 30 ------------------------------ - 1 file changed, 30 deletions(-) - ---- a/kernel/cgroup/cgroup.c -+++ b/kernel/cgroup/cgroup.c -@@ -5334,8 +5334,6 @@ int __init cgroup_init_early(void) - } - - static u16 cgroup_disable_mask __initdata; --static u16 cgroup_enable_mask __initdata; --static int __init cgroup_disable(char *str); - - /** - * cgroup_init - cgroup initialization -@@ -5376,12 +5374,6 @@ int __init cgroup_init(void) - - mutex_unlock(&cgroup_mutex); - -- /* Apply an implicit disable... */ -- cgroup_disable("memory"); -- -- /* ...knowing that an explicit enable will override it. */ -- cgroup_disable_mask &= ~cgroup_enable_mask; -- - for_each_subsys(ss, ssid) { - if (ss->early_init) { - struct cgroup_subsys_state *css = -@@ -5773,28 +5765,6 @@ static int __init cgroup_disable(char *s - } - __setup("cgroup_disable=", cgroup_disable); - --static int __init cgroup_enable(char *str) --{ -- struct cgroup_subsys *ss; -- char *token; -- int i; -- -- while ((token = strsep(&str, ",")) != NULL) { -- if (!*token) -- continue; -- -- for_each_subsys(ss, i) { -- if (strcmp(token, ss->name) && -- strcmp(token, ss->legacy_name)) -- continue; -- -- cgroup_enable_mask |= 1 << i; -- } -- } -- return 1; --} --__setup("cgroup_enable=", cgroup_enable); -- - /** - * css_tryget_online_from_dir - get corresponding css from a cgroup dentry - * @dentry: directory dentry of interest diff --git a/target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch b/target/linux/brcm2708/patches-4.19/950-0386-staging-bcm2835-audio-Drop-useless-NULL-check.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-Drop-useless-NULL-check.patch rename to target/linux/brcm2708/patches-4.19/950-0386-staging-bcm2835-audio-Drop-useless-NULL-check.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch b/target/linux/brcm2708/patches-4.19/950-0387-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch rename to target/linux/brcm2708/patches-4.19/950-0387-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch b/target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch deleted file mode 100644 index 9b4f6d741b..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0388-Revert-bcm2835-interpolate-audio-delay.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 83251570f16ec848694dac016cbdb55b1d28496d Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 29 Apr 2019 19:16:14 +0100 -Subject: [PATCH] Revert "bcm2835: interpolate audio delay" - -commit fb4b9f02986fcb5ae751106ef9b027806b5dd750 upstream. - -This reverts commit fb8cc99f05687ca5565dc53a7ee0dd86aefad952. ---- - .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 12 +----------- - .../staging/vc04_services/bcm2835-audio/bcm2835.h | 1 - - 2 files changed, 1 insertion(+), 12 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -@@ -11,7 +11,7 @@ - /* hardware definition */ - static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { - .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | -- SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BATCH), -+ SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID), - .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - .rate_min = 8000, -@@ -81,8 +81,6 @@ void bcm2835_playback_fifo(struct bcm283 - alsa_stream->pos %= alsa_stream->buffer_size; - } - -- alsa_stream->interpolate_start = ktime_get_ns(); -- - if (alsa_stream->substream) { - if (new_period) - snd_pcm_period_elapsed(alsa_stream->substream); -@@ -308,7 +306,6 @@ static int snd_bcm2835_pcm_prepare(struc - alsa_stream->buffer_size = snd_pcm_lib_buffer_bytes(substream); - alsa_stream->period_size = snd_pcm_lib_period_bytes(substream); - alsa_stream->pos = 0; -- alsa_stream->interpolate_start = ktime_get_ns(); - - audio_debug("buffer_size=%d, period_size=%d pos=%d frame_bits=%d\n", - alsa_stream->buffer_size, alsa_stream->period_size, -@@ -400,19 +397,12 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_s - { - struct snd_pcm_runtime *runtime = substream->runtime; - struct bcm2835_alsa_stream *alsa_stream = runtime->private_data; -- u64 now = ktime_get_ns(); - - audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0, - frames_to_bytes(runtime, runtime->status->hw_ptr), - frames_to_bytes(runtime, runtime->control->appl_ptr), - alsa_stream->pos); - -- /* Give userspace better delay reporting by interpolating between GPU -- * notifications, assuming audio speed is close enough to the clock -- * used for ktime */ -- if (alsa_stream->interpolate_start && alsa_stream->interpolate_start < now) -- runtime->delay = -(int)div_u64((now - alsa_stream->interpolate_start) * runtime->rate, 1000000000); -- - return snd_pcm_indirect_playback_pointer(substream, - &alsa_stream->pcm_indirect, - alsa_stream->pos); ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h -@@ -133,7 +133,6 @@ struct bcm2835_alsa_stream { - unsigned int pos; - unsigned int buffer_size; - unsigned int period_size; -- u64 interpolate_start; - - atomic_t retrieved; - struct bcm2835_audio_instance *instance; diff --git a/target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch b/target/linux/brcm2708/patches-4.19/950-0388-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch rename to target/linux/brcm2708/patches-4.19/950-0388-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch b/target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch deleted file mode 100644 index 841768b718..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0389-Revert-staging-bcm2835-audio-Enable-compile-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e276e2d7b80259819e399eb3956ca92e5ddafbc3 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 29 Apr 2019 19:16:15 +0100 -Subject: [PATCH] Revert "staging: bcm2835-audio: Enable compile test" - -commit 4eae66777a262ac9707980ea0cfe902afadfb577 upstream. - -This reverts commit 02d205a57c4c943fc2a5b1ac7c912ce01944f700. ---- - drivers/staging/vc04_services/bcm2835-audio/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/Kconfig -+++ b/drivers/staging/vc04_services/bcm2835-audio/Kconfig -@@ -1,6 +1,6 @@ - config SND_BCM2835 - tristate "BCM2835 Audio" -- depends on (ARCH_BCM2835 || COMPILE_TEST) && SND -+ depends on ARCH_BCM2835 && SND - select SND_PCM - select BCM2835_VCHIQ - help diff --git a/target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch b/target/linux/brcm2708/patches-4.19/950-0389-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch rename to target/linux/brcm2708/patches-4.19/950-0389-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch b/target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch deleted file mode 100644 index 6a28d80b7e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0390-Revert-staging-bcm2835-audio-use-module_platform_dri.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 576521feaa6a03f45839c28f1ce0588e4e49b0ca Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 29 Apr 2019 19:16:16 +0100 -Subject: [PATCH] Revert "staging: bcm2835-audio: use - module_platform_driver() macro" - -commit ed4c2e5dc4216d5dded502bfcf594d3984e6bccd upstream. - -This reverts commit 786ced30fec053b27248ed5b24dcde61ed3f47f6. ---- - .../vc04_services/bcm2835-audio/bcm2835.c | 20 ++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -@@ -470,7 +470,25 @@ static struct platform_driver bcm2835_al - .of_match_table = snd_bcm2835_of_match_table, - }, - }; --module_platform_driver(bcm2835_alsa0_driver); -+ -+static int bcm2835_alsa_device_init(void) -+{ -+ int retval; -+ -+ retval = platform_driver_register(&bcm2835_alsa0_driver); -+ if (retval) -+ pr_err("Error registering bcm2835_audio driver %d .\n", retval); -+ -+ return retval; -+} -+ -+static void bcm2835_alsa_device_exit(void) -+{ -+ platform_driver_unregister(&bcm2835_alsa0_driver); -+} -+ -+late_initcall(bcm2835_alsa_device_init); -+module_exit(bcm2835_alsa_device_exit); - - MODULE_AUTHOR("Dom Cobley"); - MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); diff --git a/target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch b/target/linux/brcm2708/patches-4.19/950-0390-staging-bcm2835-audio-Add-10ms-period-constraint.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-Add-10ms-period-constraint.patch rename to target/linux/brcm2708/patches-4.19/950-0390-staging-bcm2835-audio-Add-10ms-period-constraint.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch b/target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Make-single-vchi-handle.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-Make-single-vchi-handle.patch rename to target/linux/brcm2708/patches-4.19/950-0391-staging-bcm2835-audio-Make-single-vchi-handle.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch b/target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch rename to target/linux/brcm2708/patches-4.19/950-0392-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch b/target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch rename to target/linux/brcm2708/patches-4.19/950-0393-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Use-card-private_data.patch b/target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Use-card-private_data.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Use-card-private_data.patch rename to target/linux/brcm2708/patches-4.19/950-0394-staging-bcm2835-audio-Use-card-private_data.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch b/target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Use-standard-error-print-helpe.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-Use-standard-error-print-helpe.patch rename to target/linux/brcm2708/patches-4.19/950-0395-staging-bcm2835-audio-Use-standard-error-print-helpe.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch b/target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-unnecessary-header-file.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-Remove-unnecessary-header-file.patch rename to target/linux/brcm2708/patches-4.19/950-0396-staging-bcm2835-audio-Remove-unnecessary-header-file.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch b/target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Move-module-parameter-descript.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0414-staging-bcm2835-audio-Move-module-parameter-descript.patch rename to target/linux/brcm2708/patches-4.19/950-0397-staging-bcm2835-audio-Move-module-parameter-descript.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Use-coherent-device-buffers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0415-staging-bcm2835-audio-Use-coherent-device-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0398-staging-bcm2835-audio-Use-coherent-device-buffers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch b/target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch rename to target/linux/brcm2708/patches-4.19/950-0399-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch b/target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch rename to target/linux/brcm2708/patches-4.19/950-0400-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch b/target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0418-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch rename to target/linux/brcm2708/patches-4.19/950-0401-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch b/target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Simplify-card-object-managemen.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0419-staging-bcm2835-audio-Simplify-card-object-managemen.patch rename to target/linux/brcm2708/patches-4.19/950-0402-staging-bcm2835-audio-Simplify-card-object-managemen.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch b/target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0420-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch rename to target/linux/brcm2708/patches-4.19/950-0403-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch b/target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-don-t-initialize-memory-twice.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0421-staging-bcm2835-audio-don-t-initialize-memory-twice.patch rename to target/linux/brcm2708/patches-4.19/950-0404-staging-bcm2835-audio-don-t-initialize-memory-twice.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch b/target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-reorder-variable-declarations-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0422-staging-bcm2835-audio-reorder-variable-declarations-.patch rename to target/linux/brcm2708/patches-4.19/950-0405-staging-bcm2835-audio-reorder-variable-declarations-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch b/target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0423-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch rename to target/linux/brcm2708/patches-4.19/950-0406-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch b/target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-more-generic-probe-function-na.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0424-staging-bcm2835-audio-more-generic-probe-function-na.patch rename to target/linux/brcm2708/patches-4.19/950-0407-staging-bcm2835-audio-more-generic-probe-function-na.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch b/target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-rename-platform_driver-structu.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0425-staging-bcm2835-audio-rename-platform_driver-structu.patch rename to target/linux/brcm2708/patches-4.19/950-0408-staging-bcm2835-audio-rename-platform_driver-structu.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0426-staging-bcm2835-audio-update-TODO.patch b/target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-update-TODO.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0426-staging-bcm2835-audio-update-TODO.patch rename to target/linux/brcm2708/patches-4.19/950-0409-staging-bcm2835-audio-update-TODO.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch b/target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-interpolate-audio-delay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0427-staging-bcm2835-audio-interpolate-audio-delay.patch rename to target/linux/brcm2708/patches-4.19/950-0410-staging-bcm2835-audio-interpolate-audio-delay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0428-staging-bcm2835-audio-Enable-compile-test.patch b/target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Enable-compile-test.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0428-staging-bcm2835-audio-Enable-compile-test.patch rename to target/linux/brcm2708/patches-4.19/950-0411-staging-bcm2835-audio-Enable-compile-test.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch b/target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-use-module_platform_driver-mac.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0429-staging-bcm2835-audio-use-module_platform_driver-mac.patch rename to target/linux/brcm2708/patches-4.19/950-0412-staging-bcm2835-audio-use-module_platform_driver-mac.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch b/target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-double-free-in-init-error-path.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0431-staging-bcm2835-audio-double-free-in-init-error-path.patch rename to target/linux/brcm2708/patches-4.19/950-0413-staging-bcm2835-audio-double-free-in-init-error-path.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0432-dts-Increase-default-coherent-pool-size.patch b/target/linux/brcm2708/patches-4.19/950-0414-dts-Increase-default-coherent-pool-size.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0432-dts-Increase-default-coherent-pool-size.patch rename to target/linux/brcm2708/patches-4.19/950-0414-dts-Increase-default-coherent-pool-size.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0435-lan78xx-use-default-alignment-for-rx-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch b/target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0436-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch rename to target/linux/brcm2708/patches-4.19/950-0416-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch b/target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0437-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch rename to target/linux/brcm2708/patches-4.19/950-0417-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch b/target/linux/brcm2708/patches-4.19/950-0418-staging-mmal-vchiq-Free-the-event-context-for-contro.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0438-staging-mmal-vchiq-Free-the-event-context-for-contro.patch rename to target/linux/brcm2708/patches-4.19/950-0418-staging-mmal-vchiq-Free-the-event-context-for-contro.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch b/target/linux/brcm2708/patches-4.19/950-0419-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch rename to target/linux/brcm2708/patches-4.19/950-0419-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch b/target/linux/brcm2708/patches-4.19/950-0420-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0440-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch rename to target/linux/brcm2708/patches-4.19/950-0420-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch b/target/linux/brcm2708/patches-4.19/950-0421-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0441-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch rename to target/linux/brcm2708/patches-4.19/950-0421-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch b/target/linux/brcm2708/patches-4.19/950-0422-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0442-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch rename to target/linux/brcm2708/patches-4.19/950-0422-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch b/target/linux/brcm2708/patches-4.19/950-0423-Added-IQaudIO-Pi-Codec-board-support-2969.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0444-Added-IQaudIO-Pi-Codec-board-support-2969.patch rename to target/linux/brcm2708/patches-4.19/950-0423-Added-IQaudIO-Pi-Codec-board-support-2969.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch b/target/linux/brcm2708/patches-4.19/950-0424-w1-ds2408-reset-on-output_write-retry-with-readback.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0446-w1-ds2408-reset-on-output_write-retry-with-readback.patch rename to target/linux/brcm2708/patches-4.19/950-0424-w1-ds2408-reset-on-output_write-retry-with-readback.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch b/target/linux/brcm2708/patches-4.19/950-0425-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0447-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch rename to target/linux/brcm2708/patches-4.19/950-0425-w1-ds2482-cosmetic-fixes-after-54865314f5a1.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch b/target/linux/brcm2708/patches-4.19/950-0426-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0448-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch rename to target/linux/brcm2708/patches-4.19/950-0426-sound-pcm512x-codec-Adding-352.8kHz-samplerate-suppo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch b/target/linux/brcm2708/patches-4.19/950-0427-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0449-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch rename to target/linux/brcm2708/patches-4.19/950-0427-ASoC-decommissioning-driver-for-3Dlab-Nano-soundcard.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0450-.gitignore-Add-.dtbo-explicitly.patch b/target/linux/brcm2708/patches-4.19/950-0428-.gitignore-Add-.dtbo-explicitly.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0450-.gitignore-Add-.dtbo-explicitly.patch rename to target/linux/brcm2708/patches-4.19/950-0428-.gitignore-Add-.dtbo-explicitly.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch b/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0451-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch rename to target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch deleted file mode 100644 index f9369565bd..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0430-staging-bcm2835-audio-Drop-DT-dependency.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 1ddeeda8208bc269c90aad4bd8bb878f7436f62d Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Thu, 6 Dec 2018 19:28:58 +0100 -Subject: [PATCH] staging: bcm2835-audio: Drop DT dependency - -commit 438fc48260a0afc4cee733e5bc20234ff2bbef56 upstream. - -Just like the bcm2835-video make this a platform driver which is probed -by vchiq. In order to change the number of channels use a module -parameter instead, but use the maximum as default. - -Signed-off-by: Stefan Wahren -Reviewed-by: Nicolas Saenz Julienne -Reviewed-by: Dan Carpenter -Signed-off-by: Greg Kroah-Hartman ---- - .../vc04_services/bcm2835-audio/bcm2835.c | 31 ++++++------------- - 1 file changed, 9 insertions(+), 22 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -@@ -6,13 +6,13 @@ - #include - #include - #include --#include - - #include "bcm2835.h" - - static bool enable_hdmi; - static bool enable_headphones; - static bool enable_compat_alsa = true; -+static int num_channels = MAX_SUBSTREAMS; - - module_param(enable_hdmi, bool, 0444); - MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device"); -@@ -21,6 +21,8 @@ MODULE_PARM_DESC(enable_headphones, "Ena - module_param(enable_compat_alsa, bool, 0444); - MODULE_PARM_DESC(enable_compat_alsa, - "Enables ALSA compatibility virtual audio device"); -+module_param(num_channels, int, 0644); -+MODULE_PARM_DESC(num_channels, "Number of audio channels (default: 8)"); - - static void bcm2835_devm_free_vchi_ctx(struct device *dev, void *res) - { -@@ -294,28 +296,19 @@ static int snd_add_child_devices(struct - static int snd_bcm2835_alsa_probe(struct platform_device *pdev) - { - struct device *dev = &pdev->dev; -- u32 numchans; - int err; - -- err = of_property_read_u32(dev->of_node, "brcm,pwm-channels", -- &numchans); -- if (err) { -- dev_err(dev, "Failed to get DT property 'brcm,pwm-channels'"); -- return err; -- } -- -- if (numchans == 0 || numchans > MAX_SUBSTREAMS) { -- numchans = MAX_SUBSTREAMS; -- dev_warn(dev, -- "Illegal 'brcm,pwm-channels' value, will use %u\n", -- numchans); -+ if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { -+ num_channels = MAX_SUBSTREAMS; -+ dev_warn(dev, "Illegal num_channels value, will use %u\n", -+ num_channels); - } - - err = bcm2835_devm_add_vchi_ctx(dev); - if (err) - return err; - -- err = snd_add_child_devices(dev, numchans); -+ err = snd_add_child_devices(dev, num_channels); - if (err) - return err; - -@@ -337,12 +330,6 @@ static int snd_bcm2835_alsa_resume(struc - - #endif - --static const struct of_device_id snd_bcm2835_of_match_table[] = { -- { .compatible = "brcm,bcm2835-audio",}, -- {}, --}; --MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table); -- - static struct platform_driver bcm2835_alsa_driver = { - .probe = snd_bcm2835_alsa_probe, - #ifdef CONFIG_PM -@@ -351,7 +338,6 @@ static struct platform_driver bcm2835_al - #endif - .driver = { - .name = "bcm2835_audio", -- .of_match_table = snd_bcm2835_of_match_table, - }, - }; - module_platform_driver(bcm2835_alsa_driver); -@@ -359,3 +345,4 @@ module_platform_driver(bcm2835_alsa_driv - MODULE_AUTHOR("Dom Cobley"); - MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); - MODULE_LICENSE("GPL"); -+MODULE_ALIAS("platform:bcm2835_audio"); diff --git a/target/linux/brcm2708/patches-4.19/950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch b/target/linux/brcm2708/patches-4.19/950-0430-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0452-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch rename to target/linux/brcm2708/patches-4.19/950-0430-usb-dwc_otg-Clean-up-interrupt-claiming-code.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0431-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0453-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0431-overlays-Delete-the-deprecated-sdio-1bit-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0432-overlays-Remove-upstream-aux-interrupt-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0454-overlays-Remove-upstream-aux-interrupt-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0432-overlays-Remove-upstream-aux-interrupt-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch b/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch deleted file mode 100644 index c831dc8139..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0433-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 369f591ee78af2d53c67f561daeb963cc4aa60aa Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 1 May 2019 14:23:39 +0100 -Subject: [PATCH] Revert "staging: bcm2835-audio: Drop DT dependency" - -This reverts commit 60a2e557a4f81480216066f22b84c3dda31b3470. ---- - .../vc04_services/bcm2835-audio/bcm2835.c | 31 +++++++++++++------ - 1 file changed, 22 insertions(+), 9 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -@@ -6,13 +6,13 @@ - #include - #include - #include -+#include - - #include "bcm2835.h" - - static bool enable_hdmi; - static bool enable_headphones; - static bool enable_compat_alsa = true; --static int num_channels = MAX_SUBSTREAMS; - - module_param(enable_hdmi, bool, 0444); - MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device"); -@@ -21,8 +21,6 @@ MODULE_PARM_DESC(enable_headphones, "Ena - module_param(enable_compat_alsa, bool, 0444); - MODULE_PARM_DESC(enable_compat_alsa, - "Enables ALSA compatibility virtual audio device"); --module_param(num_channels, int, 0644); --MODULE_PARM_DESC(num_channels, "Number of audio channels (default: 8)"); - - static void bcm2835_devm_free_vchi_ctx(struct device *dev, void *res) - { -@@ -296,19 +294,28 @@ static int snd_add_child_devices(struct - static int snd_bcm2835_alsa_probe(struct platform_device *pdev) - { - struct device *dev = &pdev->dev; -+ u32 numchans; - int err; - -- if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { -- num_channels = MAX_SUBSTREAMS; -- dev_warn(dev, "Illegal num_channels value, will use %u\n", -- num_channels); -+ err = of_property_read_u32(dev->of_node, "brcm,pwm-channels", -+ &numchans); -+ if (err) { -+ dev_err(dev, "Failed to get DT property 'brcm,pwm-channels'"); -+ return err; -+ } -+ -+ if (numchans == 0 || numchans > MAX_SUBSTREAMS) { -+ numchans = MAX_SUBSTREAMS; -+ dev_warn(dev, -+ "Illegal 'brcm,pwm-channels' value, will use %u\n", -+ numchans); - } - - err = bcm2835_devm_add_vchi_ctx(dev); - if (err) - return err; - -- err = snd_add_child_devices(dev, num_channels); -+ err = snd_add_child_devices(dev, numchans); - if (err) - return err; - -@@ -330,6 +337,12 @@ static int snd_bcm2835_alsa_resume(struc - - #endif - -+static const struct of_device_id snd_bcm2835_of_match_table[] = { -+ { .compatible = "brcm,bcm2835-audio",}, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table); -+ - static struct platform_driver bcm2835_alsa_driver = { - .probe = snd_bcm2835_alsa_probe, - #ifdef CONFIG_PM -@@ -338,6 +351,7 @@ static struct platform_driver bcm2835_al - #endif - .driver = { - .name = "bcm2835_audio", -+ .of_match_table = snd_bcm2835_of_match_table, - }, - }; - module_platform_driver(bcm2835_alsa_driver); -@@ -345,4 +359,3 @@ module_platform_driver(bcm2835_alsa_driv - MODULE_AUTHOR("Dom Cobley"); - MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); - MODULE_LICENSE("GPL"); --MODULE_ALIAS("platform:bcm2835_audio"); diff --git a/target/linux/brcm2708/patches-4.19/950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch b/target/linux/brcm2708/patches-4.19/950-0433-overlays-Standardise-on-compatible-brcm-bcm2835.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0455-overlays-Standardise-on-compatible-brcm-bcm2835.patch rename to target/linux/brcm2708/patches-4.19/950-0433-overlays-Standardise-on-compatible-brcm-bcm2835.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch b/target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch deleted file mode 100644 index 6891ec28a0..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0434-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 26c79197da4b2911e10c600d79839a82a43a06ff Mon Sep 17 00:00:00 2001 -From: P33M -Date: Wed, 1 May 2019 17:04:32 +0100 -Subject: [PATCH] smsc95xx: dynamically fix up TX buffer alignment with - padding bytes - -dwc_otg requires a 32-bit aligned buffer start address, otherwise -expensive bounce buffers are used. The LAN951x hardware can skip up to -3 bytes between the TX header and the start of frame data, which can -be used to force alignment of the URB passed to dwc_otg. - -As found in https://github.com/raspberrypi/linux/issues/2924 ---- - drivers/net/usb/smsc95xx.c | 12 +++++++----- - drivers/net/usb/smsc95xx.h | 2 +- - 2 files changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -2082,7 +2082,9 @@ static struct sk_buff *smsc95xx_tx_fixup - struct sk_buff *skb, gfp_t flags) - { - bool csum = skb->ip_summed == CHECKSUM_PARTIAL; -- int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM : SMSC95XX_TX_OVERHEAD; -+ unsigned int align_bytes = -((uintptr_t)skb->data) & 0x3; -+ int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM + align_bytes -+ : SMSC95XX_TX_OVERHEAD + align_bytes; - u32 tx_cmd_a, tx_cmd_b; - - /* We do not advertise SG, so skbs should be already linearized */ -@@ -2116,16 +2118,16 @@ static struct sk_buff *smsc95xx_tx_fixup - } - } - -- skb_push(skb, 4); -- tx_cmd_b = (u32)(skb->len - 4); -+ skb_push(skb, 4 + align_bytes); -+ tx_cmd_b = (u32)(skb->len - 4 - align_bytes); - if (csum) - tx_cmd_b |= TX_CMD_B_CSUM_ENABLE; - cpu_to_le32s(&tx_cmd_b); - memcpy(skb->data, &tx_cmd_b, 4); - - skb_push(skb, 4); -- tx_cmd_a = (u32)(skb->len - 8) | TX_CMD_A_FIRST_SEG_ | -- TX_CMD_A_LAST_SEG_; -+ tx_cmd_a = (u32)(skb->len - 8 - align_bytes) | TX_CMD_A_FIRST_SEG_ | -+ (align_bytes << 16) | TX_CMD_A_LAST_SEG_; - cpu_to_le32s(&tx_cmd_a); - memcpy(skb->data, &tx_cmd_a, 4); - ---- a/drivers/net/usb/smsc95xx.h -+++ b/drivers/net/usb/smsc95xx.h -@@ -21,7 +21,7 @@ - #define _SMSC95XX_H - - /* Tx command words */ --#define TX_CMD_A_DATA_OFFSET_ (0x001F0000) /* Data Start Offset */ -+#define TX_CMD_A_DATA_OFFSET_ (0x00030000) /* Data Start Offset */ - #define TX_CMD_A_FIRST_SEG_ (0x00002000) /* First Segment */ - #define TX_CMD_A_LAST_SEG_ (0x00001000) /* Last Segment */ - #define TX_CMD_A_BUF_SIZE_ (0x000007FF) /* Buffer Size */ diff --git a/target/linux/brcm2708/patches-4.19/950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch b/target/linux/brcm2708/patches-4.19/950-0434-vc4-Remove-interrupt-and-DMA-trampling.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0456-vc4-Remove-interrupt-and-DMA-trampling.patch rename to target/linux/brcm2708/patches-4.19/950-0434-vc4-Remove-interrupt-and-DMA-trampling.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch b/target/linux/brcm2708/patches-4.19/950-0435-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0457-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch rename to target/linux/brcm2708/patches-4.19/950-0435-BCM270X_DT-Add-non-removable-clone-of-mmc-node.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch b/target/linux/brcm2708/patches-4.19/950-0436-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0458-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch rename to target/linux/brcm2708/patches-4.19/950-0436-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0459-overlays-Update-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0437-overlays-Update-upstream-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0459-overlays-Update-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0437-overlays-Update-upstream-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch b/target/linux/brcm2708/patches-4.19/950-0438-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0460-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch rename to target/linux/brcm2708/patches-4.19/950-0438-w1-ds2408-Fix-typo-after-49695ac46861-reset-on-outpu.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch b/target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0461-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch rename to target/linux/brcm2708/patches-4.19/950-0439-BCM270X_DT-Rename-Pi-Zero-W-DT-files.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch b/target/linux/brcm2708/patches-4.19/950-0440-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0462-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch rename to target/linux/brcm2708/patches-4.19/950-0440-BCM270X_DT-Create-bcm2708-rpi-zero.dts.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch b/target/linux/brcm2708/patches-4.19/950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0463-overlays-Fix-mmc-related-overlays-after-refactor.patch rename to target/linux/brcm2708/patches-4.19/950-0441-overlays-Fix-mmc-related-overlays-after-refactor.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0464-Fixed-48k-timing-issue.patch b/target/linux/brcm2708/patches-4.19/950-0442-Fixed-48k-timing-issue.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0464-Fixed-48k-timing-issue.patch rename to target/linux/brcm2708/patches-4.19/950-0442-Fixed-48k-timing-issue.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch b/target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch deleted file mode 100644 index 2ad3299595..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0443-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 71a27bf49d7a64959b7e60d780a1f899ead34f5f Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Mon, 13 May 2019 17:34:29 +0100 -Subject: [PATCH] Revert "video: bcm2708_fb: Try allocating on the ARM - and passing to VPU" - -This reverts commit ca36c709fce57e8023d2b8b354376bf161601a49. - -The driver tries a cma_alloc to avoid using gpu_mem, but should -that fail the core code is logging an error with no easy way to -test whether it will succeed or fail first. - -Revert until we either totally give up on gpu_mem and increase -CMA always, or find a way to try an allocation. - -Signed-off-by: Dave Stevenson ---- - drivers/video/fbdev/bcm2708_fb.c | 102 +++------------------ - include/soc/bcm2835/raspberrypi-firmware.h | 1 - - 2 files changed, 12 insertions(+), 91 deletions(-) - ---- a/drivers/video/fbdev/bcm2708_fb.c -+++ b/drivers/video/fbdev/bcm2708_fb.c -@@ -98,11 +98,6 @@ struct bcm2708_fb { - struct bcm2708_fb_stats stats; - unsigned long fb_bus_address; - struct { u32 base, length; } gpu; -- -- bool disable_arm_alloc; -- unsigned int image_size; -- dma_addr_t dma_addr; -- void *cpuaddr; - }; - - #define to_bcm2708(info) container_of(info, struct bcm2708_fb, fb) -@@ -288,88 +283,23 @@ static int bcm2708_fb_set_par(struct fb_ - .xoffset = info->var.xoffset, - .yoffset = info->var.yoffset, - .tag5 = { RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE, 8, 0 }, -- /* base and screen_size will be initialised later */ -- .tag6 = { RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH, 4, 0 }, -- /* pitch will be initialised later */ -+ .base = 0, -+ .screen_size = 0, -+ .tag6 = { RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH, 4, 0 }, -+ .pitch = 0, - }; -- int ret, image_size; -- -+ int ret; - - print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n", __func__, info, - info->var.xres, info->var.yres, info->var.xres_virtual, - info->var.yres_virtual, (int)info->screen_size, - info->var.bits_per_pixel); - -- /* Try allocating our own buffer. We can specify all the parameters */ -- image_size = ((info->var.xres * info->var.yres) * -- info->var.bits_per_pixel) >> 3; -- -- if (!fb->disable_arm_alloc && -- (image_size != fb->image_size || !fb->dma_addr)) { -- if (fb->dma_addr) { -- dma_free_coherent(info->device, fb->image_size, -- fb->cpuaddr, fb->dma_addr); -- fb->image_size = 0; -- fb->cpuaddr = NULL; -- fb->dma_addr = 0; -- } -- -- fb->cpuaddr = dma_alloc_coherent(info->device, image_size, -- &fb->dma_addr, GFP_KERNEL); -- -- if (!fb->cpuaddr) { -- fb->dma_addr = 0; -- fb->disable_arm_alloc = true; -- } else { -- fb->image_size = image_size; -- } -- } -- -- if (fb->cpuaddr) { -- fbinfo.base = fb->dma_addr; -- fbinfo.screen_size = image_size; -- fbinfo.pitch = (info->var.xres * info->var.bits_per_pixel) >> 3; -- -- ret = rpi_firmware_property_list(fb->fw, &fbinfo, -- sizeof(fbinfo)); -- if (ret || fbinfo.base != fb->dma_addr) { -- /* Firmware either failed, or assigned a different base -- * address (ie it doesn't support being passed an FB -- * allocation). -- * Destroy the allocation, and don't try again. -- */ -- dma_free_coherent(info->device, fb->image_size, -- fb->cpuaddr, fb->dma_addr); -- fb->image_size = 0; -- fb->cpuaddr = NULL; -- fb->dma_addr = 0; -- fb->disable_arm_alloc = true; -- } -- } else { -- /* Our allocation failed - drop into the old scheme of -- * allocation by the VPU. -- */ -- ret = -ENOMEM; -- } -- -+ ret = rpi_firmware_property_list(fb->fw, &fbinfo, sizeof(fbinfo)); - if (ret) { -- /* Old scheme: -- * - FRAMEBUFFER_ALLOCATE passes 0 for base and screen_size. -- * - GET_PITCH instead of SET_PITCH. -- */ -- fbinfo.base = 0; -- fbinfo.screen_size = 0; -- fbinfo.tag6.tag = RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH; -- fbinfo.pitch = 0; -- -- ret = rpi_firmware_property_list(fb->fw, &fbinfo, -- sizeof(fbinfo)); -- if (ret) { -- dev_err(info->device, -- "Failed to allocate GPU framebuffer (%d)\n", -- ret); -- return ret; -- } -+ dev_err(info->device, -+ "Failed to allocate GPU framebuffer (%d)\n", ret); -+ return ret; - } - - if (info->var.bits_per_pixel <= 8) -@@ -384,17 +314,9 @@ static int bcm2708_fb_set_par(struct fb_ - fb->fb.fix.smem_start = fbinfo.base; - fb->fb.fix.smem_len = fbinfo.pitch * fbinfo.yres_virtual; - fb->fb.screen_size = fbinfo.screen_size; -- -- if (!fb->dma_addr) { -- if (fb->fb.screen_base) -- iounmap(fb->fb.screen_base); -- -- fb->fb.screen_base = ioremap_wc(fbinfo.base, -- fb->fb.screen_size); -- } else { -- fb->fb.screen_base = fb->cpuaddr; -- } -- -+ if (fb->fb.screen_base) -+ iounmap(fb->fb.screen_base); -+ fb->fb.screen_base = ioremap_wc(fbinfo.base, fb->fb.screen_size); - if (!fb->fb.screen_base) { - /* the console may currently be locked */ - console_trylock(); ---- a/include/soc/bcm2835/raspberrypi-firmware.h -+++ b/include/soc/bcm2835/raspberrypi-firmware.h -@@ -128,7 +128,6 @@ enum rpi_firmware_property_tag { - RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH = 0x00048005, - RPI_FIRMWARE_FRAMEBUFFER_SET_PIXEL_ORDER = 0x00048006, - RPI_FIRMWARE_FRAMEBUFFER_SET_ALPHA_MODE = 0x00048007, -- RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH = 0x00048008, - RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET = 0x00048009, - RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN = 0x0004800a, - RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE = 0x0004800b, diff --git a/target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch b/target/linux/brcm2708/patches-4.19/950-0443-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0465-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch rename to target/linux/brcm2708/patches-4.19/950-0443-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch b/target/linux/brcm2708/patches-4.19/950-0444-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0466-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch rename to target/linux/brcm2708/patches-4.19/950-0444-staging-bcm2835-codec-Add-support-for-setting-S_PARM.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch b/target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch deleted file mode 100644 index 8da9deaa6e..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0445-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 89bb75e008adf061e3e396de76020b00ea0d6123 Mon Sep 17 00:00:00 2001 -From: P33M -Date: Tue, 14 May 2019 14:55:19 +0100 -Subject: [PATCH] Revert "smsc95xx: dynamically fix up TX buffer - alignment with padding bytes" - -As reported in https://github.com/raspberrypi/linux/issues/2964 this -commit causes a regression corrupting non-option TCP ack packets. - -This reverts commit 96b972dc736d943f371a16ccca452a053d83c65b. ---- - drivers/net/usb/smsc95xx.c | 12 +++++------- - drivers/net/usb/smsc95xx.h | 2 +- - 2 files changed, 6 insertions(+), 8 deletions(-) - ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -2082,9 +2082,7 @@ static struct sk_buff *smsc95xx_tx_fixup - struct sk_buff *skb, gfp_t flags) - { - bool csum = skb->ip_summed == CHECKSUM_PARTIAL; -- unsigned int align_bytes = -((uintptr_t)skb->data) & 0x3; -- int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM + align_bytes -- : SMSC95XX_TX_OVERHEAD + align_bytes; -+ int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM : SMSC95XX_TX_OVERHEAD; - u32 tx_cmd_a, tx_cmd_b; - - /* We do not advertise SG, so skbs should be already linearized */ -@@ -2118,16 +2116,16 @@ static struct sk_buff *smsc95xx_tx_fixup - } - } - -- skb_push(skb, 4 + align_bytes); -- tx_cmd_b = (u32)(skb->len - 4 - align_bytes); -+ skb_push(skb, 4); -+ tx_cmd_b = (u32)(skb->len - 4); - if (csum) - tx_cmd_b |= TX_CMD_B_CSUM_ENABLE; - cpu_to_le32s(&tx_cmd_b); - memcpy(skb->data, &tx_cmd_b, 4); - - skb_push(skb, 4); -- tx_cmd_a = (u32)(skb->len - 8 - align_bytes) | TX_CMD_A_FIRST_SEG_ | -- (align_bytes << 16) | TX_CMD_A_LAST_SEG_; -+ tx_cmd_a = (u32)(skb->len - 8) | TX_CMD_A_FIRST_SEG_ | -+ TX_CMD_A_LAST_SEG_; - cpu_to_le32s(&tx_cmd_a); - memcpy(skb->data, &tx_cmd_a, 4); - ---- a/drivers/net/usb/smsc95xx.h -+++ b/drivers/net/usb/smsc95xx.h -@@ -21,7 +21,7 @@ - #define _SMSC95XX_H - - /* Tx command words */ --#define TX_CMD_A_DATA_OFFSET_ (0x00030000) /* Data Start Offset */ -+#define TX_CMD_A_DATA_OFFSET_ (0x001F0000) /* Data Start Offset */ - #define TX_CMD_A_FIRST_SEG_ (0x00002000) /* First Segment */ - #define TX_CMD_A_LAST_SEG_ (0x00001000) /* Last Segment */ - #define TX_CMD_A_BUF_SIZE_ (0x000007FF) /* Buffer Size */ diff --git a/target/linux/brcm2708/patches-4.19/950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch b/target/linux/brcm2708/patches-4.19/950-0445-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0467-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch rename to target/linux/brcm2708/patches-4.19/950-0445-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch b/target/linux/brcm2708/patches-4.19/950-0446-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0468-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch rename to target/linux/brcm2708/patches-4.19/950-0446-overlays-Update-w1-gpio-and-w1-gpio-pullup.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch b/target/linux/brcm2708/patches-4.19/950-0447-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0469-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch rename to target/linux/brcm2708/patches-4.19/950-0447-bcm2835-sdhost-Fix-DMA-channel-leak-on-error-remove.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch b/target/linux/brcm2708/patches-4.19/950-0448-i2c-bcm2835-Model-Divider-in-CCF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0470-i2c-bcm2835-Model-Divider-in-CCF.patch rename to target/linux/brcm2708/patches-4.19/950-0448-i2c-bcm2835-Model-Divider-in-CCF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0471-staging-vc04_services-Use-correct-cache-line-size.patch b/target/linux/brcm2708/patches-4.19/950-0449-staging-vc04_services-Use-correct-cache-line-size.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0471-staging-vc04_services-Use-correct-cache-line-size.patch rename to target/linux/brcm2708/patches-4.19/950-0449-staging-vc04_services-Use-correct-cache-line-size.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0472-tty-amba-pl011-allow-shared-interrupt.patch b/target/linux/brcm2708/patches-4.19/950-0450-tty-amba-pl011-allow-shared-interrupt.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0472-tty-amba-pl011-allow-shared-interrupt.patch rename to target/linux/brcm2708/patches-4.19/950-0450-tty-amba-pl011-allow-shared-interrupt.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch b/target/linux/brcm2708/patches-4.19/950-0451-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0473-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch rename to target/linux/brcm2708/patches-4.19/950-0451-ARM-bcm283x-Reduce-register-ranges-for-UART-SPI-and-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch b/target/linux/brcm2708/patches-4.19/950-0452-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0474-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch rename to target/linux/brcm2708/patches-4.19/950-0452-ARM-bcm283x-Extend-the-WDT-DT-node-out-to-cover-the-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch b/target/linux/brcm2708/patches-4.19/950-0453-ARM-dts-Add-label-to-bcm2835-RNG.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0475-ARM-dts-Add-label-to-bcm2835-RNG.patch rename to target/linux/brcm2708/patches-4.19/950-0453-ARM-dts-Add-label-to-bcm2835-RNG.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0454-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0476-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0454-dts-Use-fb-rather-than-leds-for-dpi-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch b/target/linux/brcm2708/patches-4.19/950-0455-BCM270X_DT-Minor-tidy-up.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch rename to target/linux/brcm2708/patches-4.19/950-0455-BCM270X_DT-Minor-tidy-up.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch b/target/linux/brcm2708/patches-4.19/950-0456-arm-bcm2835-Fix-FIQ-early-ioremap.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0478-arm-bcm2835-Fix-FIQ-early-ioremap.patch rename to target/linux/brcm2708/patches-4.19/950-0456-arm-bcm2835-Fix-FIQ-early-ioremap.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch b/target/linux/brcm2708/patches-4.19/950-0457-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0479-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch rename to target/linux/brcm2708/patches-4.19/950-0457-Fix-copy_from_user-if-BCM2835_FAST_MEMCPY-n.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch b/target/linux/brcm2708/patches-4.19/950-0458-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0480-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch rename to target/linux/brcm2708/patches-4.19/950-0458-PCI-brcmstb-Add-Broadcom-STB-PCIe-host-controller-dr.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch b/target/linux/brcm2708/patches-4.19/950-0459-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0481-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch rename to target/linux/brcm2708/patches-4.19/950-0459-PCI-brcmstb-Add-dma-range-mapping-for-inbound-traffi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0482-PCI-brcmstb-Add-MSI-capability.patch b/target/linux/brcm2708/patches-4.19/950-0460-PCI-brcmstb-Add-MSI-capability.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0482-PCI-brcmstb-Add-MSI-capability.patch rename to target/linux/brcm2708/patches-4.19/950-0460-PCI-brcmstb-Add-MSI-capability.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch b/target/linux/brcm2708/patches-4.19/950-0461-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0483-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch rename to target/linux/brcm2708/patches-4.19/950-0461-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0484-pcie-brcmstb-Changes-for-BCM2711.patch b/target/linux/brcm2708/patches-4.19/950-0462-pcie-brcmstb-Changes-for-BCM2711.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0484-pcie-brcmstb-Changes-for-BCM2711.patch rename to target/linux/brcm2708/patches-4.19/950-0462-pcie-brcmstb-Changes-for-BCM2711.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch b/target/linux/brcm2708/patches-4.19/950-0463-arm-bcm2835-DMA-can-only-address-1GB.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0485-arm-bcm2835-DMA-can-only-address-1GB.patch rename to target/linux/brcm2708/patches-4.19/950-0463-arm-bcm2835-DMA-can-only-address-1GB.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch b/target/linux/brcm2708/patches-4.19/950-0464-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0486-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch rename to target/linux/brcm2708/patches-4.19/950-0464-mmc-bcm2835-sdhost-Support-64-bit-physical-addresses.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0487-mmc-sdhci-Mask-spurious-interrupts.patch b/target/linux/brcm2708/patches-4.19/950-0465-mmc-sdhci-Mask-spurious-interrupts.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0487-mmc-sdhci-Mask-spurious-interrupts.patch rename to target/linux/brcm2708/patches-4.19/950-0465-mmc-sdhci-Mask-spurious-interrupts.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch b/target/linux/brcm2708/patches-4.19/950-0466-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0488-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch rename to target/linux/brcm2708/patches-4.19/950-0466-mmc-sdhci-iproc-Add-support-for-emmc2-of-the-BCM2838.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch b/target/linux/brcm2708/patches-4.19/950-0467-hwrng-iproc-rng200-Add-BCM2838-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0489-hwrng-iproc-rng200-Add-BCM2838-support.patch rename to target/linux/brcm2708/patches-4.19/950-0467-hwrng-iproc-rng200-Add-BCM2838-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch b/target/linux/brcm2708/patches-4.19/950-0468-thermal-brcmstb_thermal-Add-BCM2838-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0490-thermal-brcmstb_thermal-Add-BCM2838-support.patch rename to target/linux/brcm2708/patches-4.19/950-0468-thermal-brcmstb_thermal-Add-BCM2838-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0491-vchiq-Add-36-bit-address-support.patch b/target/linux/brcm2708/patches-4.19/950-0469-vchiq-Add-36-bit-address-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0491-vchiq-Add-36-bit-address-support.patch rename to target/linux/brcm2708/patches-4.19/950-0469-vchiq-Add-36-bit-address-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch b/target/linux/brcm2708/patches-4.19/950-0470-bcm2835-pcm.c-Support-multichannel-audio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0492-bcm2835-pcm.c-Support-multichannel-audio.patch rename to target/linux/brcm2708/patches-4.19/950-0470-bcm2835-pcm.c-Support-multichannel-audio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0493-bcmgenet-constrain-max-DMA-burst-length.patch b/target/linux/brcm2708/patches-4.19/950-0471-bcmgenet-constrain-max-DMA-burst-length.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0493-bcmgenet-constrain-max-DMA-burst-length.patch rename to target/linux/brcm2708/patches-4.19/950-0471-bcmgenet-constrain-max-DMA-burst-length.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/brcm2708/patches-4.19/950-0472-bcmgenet-Better-coalescing-parameter-defaults.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0494-bcmgenet-Better-coalescing-parameter-defaults.patch rename to target/linux/brcm2708/patches-4.19/950-0472-bcmgenet-Better-coalescing-parameter-defaults.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/brcm2708/patches-4.19/950-0473-net-genet-enable-link-energy-detect-powerdown-for-ex.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0495-net-genet-enable-link-energy-detect-powerdown-for-ex.patch rename to target/linux/brcm2708/patches-4.19/950-0473-net-genet-enable-link-energy-detect-powerdown-for-ex.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/brcm2708/patches-4.19/950-0474-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0496-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch rename to target/linux/brcm2708/patches-4.19/950-0474-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch b/target/linux/brcm2708/patches-4.19/950-0475-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0497-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch rename to target/linux/brcm2708/patches-4.19/950-0475-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch b/target/linux/brcm2708/patches-4.19/950-0476-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0498-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch rename to target/linux/brcm2708/patches-4.19/950-0476-dwc_otg-Choose-appropriate-IRQ-handover-strategy.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch b/target/linux/brcm2708/patches-4.19/950-0477-usb-xhci-Disable-the-XHCI-5-second-timeout.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0499-usb-xhci-Disable-the-XHCI-5-second-timeout.patch rename to target/linux/brcm2708/patches-4.19/950-0477-usb-xhci-Disable-the-XHCI-5-second-timeout.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/brcm2708/patches-4.19/950-0478-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0500-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch rename to target/linux/brcm2708/patches-4.19/950-0478-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0503-spi-bcm2835-enable-shared-interrupt-support.patch b/target/linux/brcm2708/patches-4.19/950-0479-spi-bcm2835-enable-shared-interrupt-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0503-spi-bcm2835-enable-shared-interrupt-support.patch rename to target/linux/brcm2708/patches-4.19/950-0479-spi-bcm2835-enable-shared-interrupt-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch b/target/linux/brcm2708/patches-4.19/950-0480-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0504-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch rename to target/linux/brcm2708/patches-4.19/950-0480-drivers-char-add-chardev-for-mmap-ing-Argon-control-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch b/target/linux/brcm2708/patches-4.19/950-0481-clk-bcm2835-Don-t-wait-for-pllh-lock.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0505-clk-bcm2835-Don-t-wait-for-pllh-lock.patch rename to target/linux/brcm2708/patches-4.19/950-0481-clk-bcm2835-Don-t-wait-for-pllh-lock.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch b/target/linux/brcm2708/patches-4.19/950-0482-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0506-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch rename to target/linux/brcm2708/patches-4.19/950-0482-bcm2835-pm-Move-bcm2835-watchdog-s-DT-probe-to-an-MF.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch b/target/linux/brcm2708/patches-4.19/950-0483-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0507-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch rename to target/linux/brcm2708/patches-4.19/950-0483-soc-bcm-bcm2835-pm-Add-support-for-power-domains-und.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch b/target/linux/brcm2708/patches-4.19/950-0484-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0508-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch rename to target/linux/brcm2708/patches-4.19/950-0484-soc-bcm-bcm2835-pm-Fix-PM_IMAGE_PERI-power-domain-su.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch b/target/linux/brcm2708/patches-4.19/950-0485-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0509-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch rename to target/linux/brcm2708/patches-4.19/950-0485-soc-bcm-bcm2835-pm-Fix-error-paths-of-initialization.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch b/target/linux/brcm2708/patches-4.19/950-0486-soc-bcm-bcm2835-pm-Add-support-for-2711.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0510-soc-bcm-bcm2835-pm-Add-support-for-2711.patch rename to target/linux/brcm2708/patches-4.19/950-0486-soc-bcm-bcm2835-pm-Add-support-for-2711.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch b/target/linux/brcm2708/patches-4.19/950-0487-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0511-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch rename to target/linux/brcm2708/patches-4.19/950-0487-drm-expand-drm_syncobj_find_fence-to-support-timelin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch b/target/linux/brcm2708/patches-4.19/950-0488-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch rename to target/linux/brcm2708/patches-4.19/950-0488-drm-v3d-Fix-a-use-after-free-race-accessing-the-sche.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch b/target/linux/brcm2708/patches-4.19/950-0489-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch rename to target/linux/brcm2708/patches-4.19/950-0489-drm-v3d-Add-a-little-debugfs-entry-for-measuring-the.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch b/target/linux/brcm2708/patches-4.19/950-0490-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch rename to target/linux/brcm2708/patches-4.19/950-0490-drm-v3d-Update-a-comment-about-what-uses-v3d_job_dep.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch b/target/linux/brcm2708/patches-4.19/950-0491-drm-v3d-Clean-up-the-reservation-object-setup.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0515-drm-v3d-Clean-up-the-reservation-object-setup.patch rename to target/linux/brcm2708/patches-4.19/950-0491-drm-v3d-Clean-up-the-reservation-object-setup.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch b/target/linux/brcm2708/patches-4.19/950-0492-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0516-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch rename to target/linux/brcm2708/patches-4.19/950-0492-drm-v3d-Add-support-for-submitting-jobs-to-the-TFU.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch b/target/linux/brcm2708/patches-4.19/950-0493-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0517-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch rename to target/linux/brcm2708/patches-4.19/950-0493-drm-v3d-Drop-the-dev-argument-to-lock-unlock-of-BO-r.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch b/target/linux/brcm2708/patches-4.19/950-0494-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0518-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch rename to target/linux/brcm2708/patches-4.19/950-0494-drm-v3d-Add-missing-fence-timeline-name-for-TFU.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch b/target/linux/brcm2708/patches-4.19/950-0495-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0519-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch rename to target/linux/brcm2708/patches-4.19/950-0495-drm-v3d-Add-more-tracepoints-for-V3D-GPU-rendering.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch b/target/linux/brcm2708/patches-4.19/950-0496-drm-v3d-Drop-unused-v3d_flush_caches.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0520-drm-v3d-Drop-unused-v3d_flush_caches.patch rename to target/linux/brcm2708/patches-4.19/950-0496-drm-v3d-Drop-unused-v3d_flush_caches.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch b/target/linux/brcm2708/patches-4.19/950-0497-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0521-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch rename to target/linux/brcm2708/patches-4.19/950-0497-drm-v3d-Don-t-bother-flushing-L1TD-at-job-start.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch b/target/linux/brcm2708/patches-4.19/950-0498-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0522-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch rename to target/linux/brcm2708/patches-4.19/950-0498-drm-v3d-Drop-the-wait-for-L2T-flush-to-complete.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch b/target/linux/brcm2708/patches-4.19/950-0499-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0523-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch rename to target/linux/brcm2708/patches-4.19/950-0499-drm-v3d-Stop-trying-to-flush-L2C-on-V3D-3.3.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch b/target/linux/brcm2708/patches-4.19/950-0500-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0524-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch rename to target/linux/brcm2708/patches-4.19/950-0500-drm-v3d-Invalidate-the-caches-from-the-outside-in.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch b/target/linux/brcm2708/patches-4.19/950-0501-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0525-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch rename to target/linux/brcm2708/patches-4.19/950-0501-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch b/target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch deleted file mode 100644 index c48d16db91..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0501-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.mousep.patch +++ /dev/null @@ -1,122 +0,0 @@ -From fa776ef749c924cd3ff3ffa257d7a63a27224399 Mon Sep 17 00:00:00 2001 -From: Jonathan Bell -Date: Thu, 30 May 2019 10:38:40 +0100 -Subject: [PATCH] usb: xhci: hack xhci_urb_enqueue to support - hid.mousepoll behaviour - -xHCI creates endpoint contexts directly from the device's endpoint -data, so submitting URBs with urb->interval different from the hardware -interval has no effect. - -Add an explicit reconfiguration of the endpoint context when requested, -which will happen only when the interval is different from the cached -value. In practice, the reconfiguration only happens on the first URB -submitted for the endpoint. - -Signed-off-by: Jonathan Bell ---- - drivers/usb/host/xhci.c | 86 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 86 insertions(+) - ---- a/drivers/usb/host/xhci.c -+++ b/drivers/usb/host/xhci.c -@@ -1425,6 +1425,87 @@ command_cleanup: - } - - /* -+ * RPI: Fixup endpoint intervals when requested -+ * - Check interval versus the (cached) endpoint context -+ * - set the endpoint interval to the new value -+ * - force an endpoint configure command -+ */ -+static void xhci_fixup_interval(struct xhci_hcd *xhci, struct urb *urb, -+ unsigned int slot_id, unsigned int ep_index) -+{ -+ struct xhci_ep_ctx *ep_ctx_out, *ep_ctx_in; -+ struct xhci_command *command; -+ struct xhci_input_control_ctx *ctrl_ctx; -+ struct xhci_virt_device *vdev; -+ int xhci_interval, ep_interval; -+ int ret; -+ unsigned long flags; -+ u32 ep_info_tmp; -+ -+ spin_lock_irqsave(&xhci->lock, flags); -+ -+ vdev = xhci->devs[slot_id]; -+ /* Get context-derived endpoint interval */ -+ ep_ctx_out = xhci_get_ep_ctx(xhci, vdev->out_ctx, ep_index); -+ ep_ctx_in = xhci_get_ep_ctx(xhci, vdev->in_ctx, ep_index); -+ xhci_interval = EP_INTERVAL_TO_UFRAMES(le32_to_cpu(ep_ctx_out->ep_info)); -+ ep_interval = urb->interval * 8; -+ -+ if (ep_interval == xhci_interval) { -+ spin_unlock_irqrestore(&xhci->lock, flags); -+ return; -+ } -+ -+ xhci_dbg(xhci, "Fixup interval ep_interval=%d xhci_interval=%d\n", -+ ep_interval, xhci_interval); -+ command = xhci_alloc_command_with_ctx(xhci, true, GFP_ATOMIC); -+ if (!command) { -+ /* Failure here is benign, poll at the original rate */ -+ spin_unlock_irqrestore(&xhci->lock, flags); -+ return; -+ } -+ -+ /* xHCI uses exponents for intervals... */ -+ xhci_interval = fls(ep_interval) - 1; -+ xhci_interval = clamp_val(xhci_interval, 3, 10); -+ ep_info_tmp = le32_to_cpu(ep_ctx_out->ep_info); -+ ep_info_tmp &= ~EP_INTERVAL(255); -+ ep_info_tmp |= EP_INTERVAL(xhci_interval); -+ -+ /* Keep the endpoint context up-to-date while issuing the command. */ -+ xhci_endpoint_copy(xhci, vdev->in_ctx, -+ vdev->out_ctx, ep_index); -+ ep_ctx_in->ep_info = cpu_to_le32(ep_info_tmp); -+ -+ /* -+ * We need to drop the lock, so take an explicit copy -+ * of the ep context. -+ */ -+ xhci_endpoint_copy(xhci, command->in_ctx, vdev->in_ctx, ep_index); -+ -+ ctrl_ctx = xhci_get_input_control_ctx(command->in_ctx); -+ if (!ctrl_ctx) { -+ xhci_warn(xhci, -+ "%s: Could not get input context, bad type.\n", -+ __func__); -+ spin_unlock_irqrestore(&xhci->lock, flags); -+ xhci_free_command(xhci, command); -+ return; -+ } -+ ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index); -+ ctrl_ctx->drop_flags = 0; -+ -+ spin_unlock_irqrestore(&xhci->lock, flags); -+ -+ ret = xhci_configure_endpoint(xhci, urb->dev, command, -+ false, false); -+ if (ret) -+ xhci_warn(xhci, "%s: Configure endpoint failed: %d\n", -+ __func__, ret); -+ xhci_free_command(xhci, command); -+} -+ -+/* - * non-error returns are a promise to giveback() the urb later - * we drop ownership so next owner (or urb unlink) can get it - */ -@@ -1492,6 +1573,11 @@ static int xhci_urb_enqueue(struct usb_h - } - } - -+ if (usb_endpoint_xfer_int(&urb->ep->desc) && -+ (urb->dev->speed == USB_SPEED_FULL || -+ urb->dev->speed == USB_SPEED_LOW)) -+ xhci_fixup_interval(xhci, urb, slot_id, ep_index); -+ - spin_lock_irqsave(&xhci->lock, flags); - - if (xhci->xhc_state & XHCI_STATE_DYING) { diff --git a/target/linux/brcm2708/patches-4.19/950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch b/target/linux/brcm2708/patches-4.19/950-0502-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0526-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch rename to target/linux/brcm2708/patches-4.19/950-0502-drm-v3d-Update-top-level-kerneldoc-for-the-addition-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch b/target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch deleted file mode 100644 index cb4fc3b708..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0502-pinctrl-bcm2835-Add-support-for-BCM2838.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9fdab9bd6324314cbdfe96a6da5edef6c29ed5e6 Mon Sep 17 00:00:00 2001 -From: Tim Gover -Date: Wed, 9 Jan 2019 14:43:36 +0000 -Subject: [PATCH] pinctrl-bcm2835: Add support for BCM2838 - -GPIO configuration on BCM2838 is largely the same as BCM2835 except for -the pull up/down configuration. The old mechanism has been replaced -by new registers which don't require the fixed delay. - -Detect BCN2838 at run-time and use the new mechanism. Backwards -compatibility for the device-tree configuration has been retained. ---- - drivers/pinctrl/bcm/pinctrl-bcm2835.c | 58 ++++++++++++++++++++------- - 1 file changed, 44 insertions(+), 14 deletions(-) - ---- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c -+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -@@ -67,6 +67,12 @@ - #define GPPUD 0x94 /* Pin Pull-up/down Enable */ - #define GPPUDCLK0 0x98 /* Pin Pull-up/down Enable Clock */ - -+/* 2711 has a different mechanism for pin pull-up/down/enable */ -+#define GPPUPPDN0 0xe4 /* Pin pull-up/down for pins 15:0 */ -+#define GPPUPPDN1 0xe8 /* Pin pull-up/down for pins 31:16 */ -+#define GPPUPPDN2 0xec /* Pin pull-up/down for pins 47:32 */ -+#define GPPUPPDN3 0xf0 /* Pin pull-up/down for pins 57:48 */ -+ - #define FSEL_REG(p) (GPFSEL0 + (((p) / 10) * 4)) - #define FSEL_SHIFT(p) (((p) % 10) * 3) - #define GPIO_REG_OFFSET(p) ((p) / 32) -@@ -915,21 +921,45 @@ static void bcm2835_pull_config_set(stru - unsigned int pin, unsigned int arg) - { - u32 off, bit; -+ /* BCM2835, BCM2836 & BCM2837 return 'gpio' for this unused register */ -+ int is_2835 = bcm2835_gpio_rd(pc, GPPUPPDN3) == 0x6770696f; - -- off = GPIO_REG_OFFSET(pin); -- bit = GPIO_REG_SHIFT(pin); -- -- bcm2835_gpio_wr(pc, GPPUD, arg & 3); -- /* -- * BCM2835 datasheet say to wait 150 cycles, but not of what. -- * But the VideoCore firmware delay for this operation -- * based nearly on the same amount of VPU cycles and this clock -- * runs at 250 MHz. -- */ -- udelay(1); -- bcm2835_gpio_wr(pc, GPPUDCLK0 + (off * 4), BIT(bit)); -- udelay(1); -- bcm2835_gpio_wr(pc, GPPUDCLK0 + (off * 4), 0); -+ if (is_2835) { -+ off = GPIO_REG_OFFSET(pin); -+ bit = GPIO_REG_SHIFT(pin); -+ /* -+ * BCM2835 datasheet say to wait 150 cycles, but not of what. -+ * But the VideoCore firmware delay for this operation -+ * based nearly on the same amount of VPU cycles and this clock -+ * runs at 250 MHz. -+ */ -+ bcm2835_gpio_wr(pc, GPPUD, arg & 3); -+ udelay(1); -+ bcm2835_gpio_wr(pc, GPPUDCLK0 + (off * 4), BIT(bit)); -+ udelay(1); -+ bcm2835_gpio_wr(pc, GPPUDCLK0 + (off * 4), 0); -+ } else { -+ u32 reg; -+ int lsb; -+ -+ off = (pin >> 4); -+ if (off > 3) -+ return; -+ lsb = (pin & 0xf) << 1; -+ -+ /* The up/down semantics are reversed compared to BCM2835. -+ * Instead of updating all the device tree files, translate the -+ * values here. -+ */ -+ if (arg == 2) -+ arg = 1; -+ else if (arg == 1) -+ arg = 2; -+ reg = bcm2835_gpio_rd(pc, GPPUPPDN0 + (off *4)); -+ reg &= ~(0x3 << lsb); -+ reg |= (arg & 3) << lsb; -+ bcm2835_gpio_wr(pc, GPPUPPDN0 + (off * 4), reg); -+ } - } - - static int bcm2835_pinconf_set(struct pinctrl_dev *pctldev, diff --git a/target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0503-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch rename to target/linux/brcm2708/patches-4.19/950-0503-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch b/target/linux/brcm2708/patches-4.19/950-0504-drm-v3d-Add-support-for-V3D-v4.2.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0529-drm-v3d-Add-support-for-V3D-v4.2.patch rename to target/linux/brcm2708/patches-4.19/950-0504-drm-v3d-Add-support-for-V3D-v4.2.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch b/target/linux/brcm2708/patches-4.19/950-0505-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0530-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch rename to target/linux/brcm2708/patches-4.19/950-0505-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch b/target/linux/brcm2708/patches-4.19/950-0506-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0531-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch rename to target/linux/brcm2708/patches-4.19/950-0506-drm-v3d-Make-sure-the-GPU-is-on-when-measuring-clock.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0532-drm-v3d-Add-support-for-2711.patch b/target/linux/brcm2708/patches-4.19/950-0507-drm-v3d-Add-support-for-2711.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0532-drm-v3d-Add-support-for-2711.patch rename to target/linux/brcm2708/patches-4.19/950-0507-drm-v3d-Add-support-for-2711.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch b/target/linux/brcm2708/patches-4.19/950-0508-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0533-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch rename to target/linux/brcm2708/patches-4.19/950-0508-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch b/target/linux/brcm2708/patches-4.19/950-0509-drm-v3d-Hook-up-the-runtime-PM-ops.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0534-drm-v3d-Hook-up-the-runtime-PM-ops.patch rename to target/linux/brcm2708/patches-4.19/950-0509-drm-v3d-Hook-up-the-runtime-PM-ops.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch b/target/linux/brcm2708/patches-4.19/950-0510-drm-v3d-HACK-gut-runtime-pm-for-now.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0535-drm-v3d-HACK-gut-runtime-pm-for-now.patch rename to target/linux/brcm2708/patches-4.19/950-0510-drm-v3d-HACK-gut-runtime-pm-for-now.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch b/target/linux/brcm2708/patches-4.19/950-0511-drm-v3d-Update-to-upstream-IRQ-code.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0536-drm-v3d-Update-to-upstream-IRQ-code.patch rename to target/linux/brcm2708/patches-4.19/950-0511-drm-v3d-Update-to-upstream-IRQ-code.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch b/target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch rename to target/linux/brcm2708/patches-4.19/950-0512-drm-v3d-Rename-the-fence-signaled-from-IRQs-to-irq_f.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Refactor-job-management.patch b/target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Refactor-job-management.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Refactor-job-management.patch rename to target/linux/brcm2708/patches-4.19/950-0513-drm-v3d-Refactor-job-management.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0539-drm-v3d-Add-missing-implicit-synchronization.patch b/target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Add-missing-implicit-synchronization.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0539-drm-v3d-Add-missing-implicit-synchronization.patch rename to target/linux/brcm2708/patches-4.19/950-0514-drm-v3d-Add-missing-implicit-synchronization.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch b/target/linux/brcm2708/patches-4.19/950-0515-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch rename to target/linux/brcm2708/patches-4.19/950-0515-drm-vc4-Fix-synchronization-firmwarekms-against-GL-r.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch b/target/linux/brcm2708/patches-4.19/950-0516-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch rename to target/linux/brcm2708/patches-4.19/950-0516-drm-vc4-Make-sure-that-vblank-waits-work-without-v3d.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch b/target/linux/brcm2708/patches-4.19/950-0517-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch rename to target/linux/brcm2708/patches-4.19/950-0517-drm-vc4-Expose-the-format-modifiers-for-firmware-kms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch b/target/linux/brcm2708/patches-4.19/950-0518-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch rename to target/linux/brcm2708/patches-4.19/950-0518-drm-vc4-Fix-vblank-timestamping-for-firmwarekms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch b/target/linux/brcm2708/patches-4.19/950-0519-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0544-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch rename to target/linux/brcm2708/patches-4.19/950-0519-gpu-vc4-fkms-Switch-to-the-newer-mailbox-frame-buffe.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch b/target/linux/brcm2708/patches-4.19/950-0520-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch rename to target/linux/brcm2708/patches-4.19/950-0520-drm-vc4-Add-an-overlay-plane-to-vc4-firmware-kms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch b/target/linux/brcm2708/patches-4.19/950-0521-drm-vc4-Increase-max-screen-size-to-4096x4096.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Increase-max-screen-size-to-4096x4096.patch rename to target/linux/brcm2708/patches-4.19/950-0521-drm-vc4-Increase-max-screen-size-to-4096x4096.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0522-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0522-drm-vc4-Add-support-for-multiple-displays-to-fkms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Fix-build-warning.patch b/target/linux/brcm2708/patches-4.19/950-0523-drm-vc4-Fix-build-warning.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Fix-build-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0523-drm-vc4-Fix-build-warning.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch b/target/linux/brcm2708/patches-4.19/950-0524-drm-vc4-Select-display-to-blank-during-initialisatio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0549-drm-vc4-Select-display-to-blank-during-initialisatio.patch rename to target/linux/brcm2708/patches-4.19/950-0524-drm-vc4-Select-display-to-blank-during-initialisatio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0550-drm-vc4-Remove-now-unused-structure.patch b/target/linux/brcm2708/patches-4.19/950-0525-drm-vc4-Remove-now-unused-structure.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0550-drm-vc4-Remove-now-unused-structure.patch rename to target/linux/brcm2708/patches-4.19/950-0525-drm-vc4-Remove-now-unused-structure.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch b/target/linux/brcm2708/patches-4.19/950-0526-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0551-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch rename to target/linux/brcm2708/patches-4.19/950-0526-drm-vc4-Query-the-display-ID-for-each-display-in-FKM.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch b/target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Set-the-display-number-when-querying-the-dis.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0552-drm-vc4-Set-the-display-number-when-querying-the-dis.patch rename to target/linux/brcm2708/patches-4.19/950-0527-drm-vc4-Set-the-display-number-when-querying-the-dis.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch b/target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0553-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch rename to target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Need-to-call-drm_crtc_vblank_-on-off-from-vc.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch b/target/linux/brcm2708/patches-4.19/950-0529-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0554-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch rename to target/linux/brcm2708/patches-4.19/950-0529-drm-vc4-Add-support-for-H-V-flips-on-each-plane-for-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch b/target/linux/brcm2708/patches-4.19/950-0530-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0555-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch rename to target/linux/brcm2708/patches-4.19/950-0530-drm-vc4-Remove-unused-vc4_fkms_cancel_page_flip-func.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch b/target/linux/brcm2708/patches-4.19/950-0531-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0556-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch rename to target/linux/brcm2708/patches-4.19/950-0531-drm-vc4-Iterate-over-all-planes-in-vc4_crtc_-dis-en-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch b/target/linux/brcm2708/patches-4.19/950-0532-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0557-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch rename to target/linux/brcm2708/patches-4.19/950-0532-drm-vc4-Bring-fkms-into-line-with-kms-in-blocking-do.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0558-drm-vc4-Increase-max_width-height-to-7680.patch b/target/linux/brcm2708/patches-4.19/950-0533-drm-vc4-Increase-max_width-height-to-7680.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0558-drm-vc4-Increase-max_width-height-to-7680.patch rename to target/linux/brcm2708/patches-4.19/950-0533-drm-vc4-Increase-max_width-height-to-7680.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch b/target/linux/brcm2708/patches-4.19/950-0534-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0559-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch rename to target/linux/brcm2708/patches-4.19/950-0534-drm-vc4-FKMS-reads-the-EDID-from-fw-and-supports-mod.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch b/target/linux/brcm2708/patches-4.19/950-0535-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0560-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch rename to target/linux/brcm2708/patches-4.19/950-0535-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/target/linux/brcm2708/patches-4.19/950-0536-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0561-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch rename to target/linux/brcm2708/patches-4.19/950-0536-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch b/target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Add-support-for-compute-shader-dispatch.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0562-drm-v3d-Add-support-for-compute-shader-dispatch.patch rename to target/linux/brcm2708/patches-4.19/950-0537-drm-v3d-Add-support-for-compute-shader-dispatch.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch b/target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Clock-V3D-down-when-not-in-use.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0563-drm-v3d-Clock-V3D-down-when-not-in-use.patch rename to target/linux/brcm2708/patches-4.19/950-0538-drm-v3d-Clock-V3D-down-when-not-in-use.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch b/target/linux/brcm2708/patches-4.19/950-0539-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0565-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch rename to target/linux/brcm2708/patches-4.19/950-0539-drm-vc4-firmware-kms-Remove-incorrect-overscan-suppo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch b/target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Log-flags-in-fkms-mode-set.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0566-drm-vc4-Log-flags-in-fkms-mode-set.patch rename to target/linux/brcm2708/patches-4.19/950-0540-drm-vc4-Log-flags-in-fkms-mode-set.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch b/target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-firmware-kms-Fix-DSI-display-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0567-drm-vc4-firmware-kms-Fix-DSI-display-support.patch rename to target/linux/brcm2708/patches-4.19/950-0541-drm-vc4-firmware-kms-Fix-DSI-display-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch b/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0568-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch rename to target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Probe-DPI-DSI-timings-from-the-firmware.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch b/target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-handle-the-case-where-there-are-no-available.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0569-drm-vc4-handle-the-case-where-there-are-no-available.patch rename to target/linux/brcm2708/patches-4.19/950-0543-drm-vc4-handle-the-case-where-there-are-no-available.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0544-drm-vc4-Support-the-VEC-in-FKMS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0570-drm-vc4-Support-the-VEC-in-FKMS.patch rename to target/linux/brcm2708/patches-4.19/950-0544-drm-vc4-Support-the-VEC-in-FKMS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch b/target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch rename to target/linux/brcm2708/patches-4.19/950-0545-drm-vc4-Fixup-typo-when-setting-HDMI-aspect-ratio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Correct-SAND-support-for-FKMS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0572-drm-vc4-Correct-SAND-support-for-FKMS.patch rename to target/linux/brcm2708/patches-4.19/950-0546-drm-vc4-Correct-SAND-support-for-FKMS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch b/target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch rename to target/linux/brcm2708/patches-4.19/950-0547-drm-vc4-fkms-to-query-the-VPU-for-HDMI-clock-limits.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch b/target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch rename to target/linux/brcm2708/patches-4.19/950-0548-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch b/target/linux/brcm2708/patches-4.19/950-0549-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0575-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch rename to target/linux/brcm2708/patches-4.19/950-0549-staging-vc-sm-cma-Remove-obsolete-comment-and-make-f.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch b/target/linux/brcm2708/patches-4.19/950-0550-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0576-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch rename to target/linux/brcm2708/patches-4.19/950-0550-staging-vc-sm-cma-Add-in-allocation-for-VPU-requests.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0577-staging-vc-sm-cma-Update-TODO.patch b/target/linux/brcm2708/patches-4.19/950-0551-staging-vc-sm-cma-Update-TODO.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0577-staging-vc-sm-cma-Update-TODO.patch rename to target/linux/brcm2708/patches-4.19/950-0551-staging-vc-sm-cma-Update-TODO.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch b/target/linux/brcm2708/patches-4.19/950-0552-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0578-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch rename to target/linux/brcm2708/patches-4.19/950-0552-staging-vc-sm-cma-Add-in-userspace-allocation-API.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch b/target/linux/brcm2708/patches-4.19/950-0553-staging-vcsm-cma-Add-cache-control-ioctls.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0579-staging-vcsm-cma-Add-cache-control-ioctls.patch rename to target/linux/brcm2708/patches-4.19/950-0553-staging-vcsm-cma-Add-cache-control-ioctls.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch b/target/linux/brcm2708/patches-4.19/950-0554-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0580-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch rename to target/linux/brcm2708/patches-4.19/950-0554-staging-vcsm-cma-Alter-dev-node-permissions-to-0666.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch b/target/linux/brcm2708/patches-4.19/950-0555-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0581-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch rename to target/linux/brcm2708/patches-4.19/950-0555-staging-vcsm-cma-Drop-logging-level-on-messages-in-v.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch b/target/linux/brcm2708/patches-4.19/950-0556-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0582-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch rename to target/linux/brcm2708/patches-4.19/950-0556-staging-vcsm-cma-Fixup-the-alloc-code-handling-of-ke.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0557-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0583-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch rename to target/linux/brcm2708/patches-4.19/950-0557-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch b/target/linux/brcm2708/patches-4.19/950-0558-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0584-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch rename to target/linux/brcm2708/patches-4.19/950-0558-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch b/target/linux/brcm2708/patches-4.19/950-0559-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0585-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch rename to target/linux/brcm2708/patches-4.19/950-0559-ARM-dts-Add-bcm2711-rpi-4-b.dts-and-components.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch b/target/linux/brcm2708/patches-4.19/950-0560-overlays-Add-i2c3-6-and-uart2-5-overlays.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0586-overlays-Add-i2c3-6-and-uart2-5-overlays.patch rename to target/linux/brcm2708/patches-4.19/950-0560-overlays-Add-i2c3-6-and-uart2-5-overlays.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch b/target/linux/brcm2708/patches-4.19/950-0561-spi-devicetree-add-overlays-for-spi-3-to-6.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0587-spi-devicetree-add-overlays-for-spi-3-to-6.patch rename to target/linux/brcm2708/patches-4.19/950-0561-spi-devicetree-add-overlays-for-spi-3-to-6.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0562-overlays-Add-the-spi-gpio40-45-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0588-overlays-Add-the-spi-gpio40-45-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0562-overlays-Add-the-spi-gpio40-45-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch b/target/linux/brcm2708/patches-4.19/950-0563-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0589-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch rename to target/linux/brcm2708/patches-4.19/950-0563-config-Permit-LPAE-and-PCIE_BRCMSTB-on-BCM2835.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0590-2711-Add-basic-64-bit-support.patch b/target/linux/brcm2708/patches-4.19/950-0564-2711-Add-basic-64-bit-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0590-2711-Add-basic-64-bit-support.patch rename to target/linux/brcm2708/patches-4.19/950-0564-2711-Add-basic-64-bit-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch b/target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch deleted file mode 100644 index 3a9fa5e715..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0564-HACK-clk-bcm2835-Add-BCM2838_CLOCK_EMMC2-support.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e5cefebc24b7684f4f84a539259612c8f5a4975b Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Thu, 2 May 2019 23:42:29 +0200 -Subject: [PATCH] HACK: clk-bcm2835: Add BCM2838_CLOCK_EMMC2 support - -The new BCM2838 supports an additional emmc2 clock. So add a new -compatible to register this clock only for BCM2838. - -Signed-off-by: Stefan Wahren ---- - drivers/clk/bcm/clk-bcm2835.c | 20 ++++++++++++++++++-- - include/dt-bindings/clock/bcm2835.h | 2 ++ - 2 files changed, 20 insertions(+), 2 deletions(-) - ---- a/drivers/clk/bcm/clk-bcm2835.c -+++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -124,6 +124,8 @@ - #define CM_AVEODIV 0x1bc - #define CM_EMMCCTL 0x1c0 - #define CM_EMMCDIV 0x1c4 -+#define CM_EMMC2CTL 0x1d0 -+#define CM_EMMC2DIV 0x1d4 - - /* General bits for the CM_*CTL regs */ - # define CM_ENABLE BIT(4) -@@ -2047,6 +2049,15 @@ static const struct bcm2835_clk_desc clk - .frac_bits = 8, - .tcnt_mux = 39), - -+ /* EMMC2 clock (only available for BCM2838) */ -+ [BCM2838_CLOCK_EMMC2] = REGISTER_PER_CLK( -+ .name = "emmc2", -+ .ctl_reg = CM_EMMC2CTL, -+ .div_reg = CM_EMMC2DIV, -+ .int_bits = 4, -+ .frac_bits = 8, -+ .tcnt_mux = 42), -+ - /* General purpose (GPIO) clocks */ - [BCM2835_CLOCK_GP0] = REGISTER_PER_CLK( - .name = "gp0", -@@ -2276,8 +2287,12 @@ static int bcm2835_clk_probe(struct plat - - for (i = 0; i < asize; i++) { - desc = &clk_desc_array[i]; -- if (desc->clk_register && desc->data) -- hws[i] = desc->clk_register(cprman, desc->data); -+ if (desc->clk_register && desc->data) { -+ if ((i != BCM2838_CLOCK_EMMC2) || -+ of_device_is_compatible(fw_node, "brcm,bcm2838-cprman")) { -+ hws[i] = desc->clk_register(cprman, desc->data); -+ } -+ } - } - - ret = bcm2835_mark_sdc_parent_critical(hws[BCM2835_CLOCK_SDRAM]->clk); -@@ -2297,6 +2312,7 @@ static int bcm2835_clk_probe(struct plat - - static const struct of_device_id bcm2835_clk_of_match[] = { - { .compatible = "brcm,bcm2835-cprman", }, -+ { .compatible = "brcm,bcm2838-cprman", }, - {} - }; - MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); ---- a/include/dt-bindings/clock/bcm2835.h -+++ b/include/dt-bindings/clock/bcm2835.h -@@ -66,3 +66,5 @@ - #define BCM2835_CLOCK_DSI1E 48 - #define BCM2835_CLOCK_DSI0P 49 - #define BCM2835_CLOCK_DSI1P 50 -+ -+#define BCM2838_CLOCK_EMMC2 51 diff --git a/target/linux/brcm2708/patches-4.19/950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch b/target/linux/brcm2708/patches-4.19/950-0565-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0591-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch rename to target/linux/brcm2708/patches-4.19/950-0565-ARM-dts-bcm283x-Correct-vchiq-compatible-string-2840.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch b/target/linux/brcm2708/patches-4.19/950-0566-arm-dts-Change-downstream-vchiq-compatible-string.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0592-arm-dts-Change-downstream-vchiq-compatible-string.patch rename to target/linux/brcm2708/patches-4.19/950-0566-arm-dts-Change-downstream-vchiq-compatible-string.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch b/target/linux/brcm2708/patches-4.19/950-0567-bcm2835-dma-Add-proper-40-bit-DMA-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0593-bcm2835-dma-Add-proper-40-bit-DMA-support.patch rename to target/linux/brcm2708/patches-4.19/950-0567-bcm2835-dma-Add-proper-40-bit-DMA-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch b/target/linux/brcm2708/patches-4.19/950-0568-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0594-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch rename to target/linux/brcm2708/patches-4.19/950-0568-BCM270X_DT-Leave-bulk-channel-in-dma-channel-mask.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch b/target/linux/brcm2708/patches-4.19/950-0569-SQUASH-bcm2835-dma-Remove-debugging.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0595-SQUASH-bcm2835-dma-Remove-debugging.patch rename to target/linux/brcm2708/patches-4.19/950-0569-SQUASH-bcm2835-dma-Remove-debugging.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0596-dts-Include-CSI-lane-config-for-csi1.patch b/target/linux/brcm2708/patches-4.19/950-0570-dts-Include-CSI-lane-config-for-csi1.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0596-dts-Include-CSI-lane-config-for-csi1.patch rename to target/linux/brcm2708/patches-4.19/950-0570-dts-Include-CSI-lane-config-for-csi1.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0597-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch rename to target/linux/brcm2708/patches-4.19/950-0571-drm-vc4-Fix-T-format-modifiers-in-FKMS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0572-bcm2711-dts-Disable-the-v3d-node-by-default.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0598-bcm2711-dts-Disable-the-v3d-node-by-default.patch rename to target/linux/brcm2708/patches-4.19/950-0572-bcm2711-dts-Disable-the-v3d-node-by-default.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch b/target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0599-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch rename to target/linux/brcm2708/patches-4.19/950-0573-drm-vc4-Remove-340MHz-clock-limit-from-FKMS-now-scra.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/brcm2708/patches-4.19/950-0574-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0601-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch rename to target/linux/brcm2708/patches-4.19/950-0574-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/brcm2708/patches-4.19/950-0575-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0602-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch rename to target/linux/brcm2708/patches-4.19/950-0575-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch b/target/linux/brcm2708/patches-4.19/950-0576-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0603-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch rename to target/linux/brcm2708/patches-4.19/950-0576-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch b/target/linux/brcm2708/patches-4.19/950-0577-drm-vc4-Add-status-of-which-display-is-updated-throu.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0604-drm-vc4-Add-status-of-which-display-is-updated-throu.patch rename to target/linux/brcm2708/patches-4.19/950-0577-drm-vc4-Add-status-of-which-display-is-updated-throu.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch b/target/linux/brcm2708/patches-4.19/950-0578-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0605-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch rename to target/linux/brcm2708/patches-4.19/950-0578-drm-vc4-In-FKMS-look-at-the-modifiers-correctly-for-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch b/target/linux/brcm2708/patches-4.19/950-0579-arm-dts-Fix-Pi4-PWR-LED-configuration.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0606-arm-dts-Fix-Pi4-PWR-LED-configuration.patch rename to target/linux/brcm2708/patches-4.19/950-0579-arm-dts-Fix-Pi4-PWR-LED-configuration.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch b/target/linux/brcm2708/patches-4.19/950-0580-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0607-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch rename to target/linux/brcm2708/patches-4.19/950-0580-bcm2838.dtsi-Correct-gic400-memory-address-ranges.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch b/target/linux/brcm2708/patches-4.19/950-0581-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0608-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch rename to target/linux/brcm2708/patches-4.19/950-0581-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch b/target/linux/brcm2708/patches-4.19/950-0582-drm-vc4-Limit-fkms-to-modes-85Hz.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0609-drm-vc4-Limit-fkms-to-modes-85Hz.patch rename to target/linux/brcm2708/patches-4.19/950-0582-drm-vc4-Limit-fkms-to-modes-85Hz.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch b/target/linux/brcm2708/patches-4.19/950-0583-arm-bcm2835-Add-bcm2838-compatible-string.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0610-arm-bcm2835-Add-bcm2838-compatible-string.patch rename to target/linux/brcm2708/patches-4.19/950-0583-arm-bcm2835-Add-bcm2838-compatible-string.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch b/target/linux/brcm2708/patches-4.19/950-0584-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0611-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch rename to target/linux/brcm2708/patches-4.19/950-0584-arm-dts-Improve-the-bcm27xx-inclusion-hierarchy.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch b/target/linux/brcm2708/patches-4.19/950-0585-arm-dts-First-draft-of-upstream-Pi4-DTS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0612-arm-dts-First-draft-of-upstream-Pi4-DTS.patch rename to target/linux/brcm2708/patches-4.19/950-0585-arm-dts-First-draft-of-upstream-Pi4-DTS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch b/target/linux/brcm2708/patches-4.19/950-0586-overlays-Fix-compatible-string-for-ds1307-RTC.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0613-overlays-Fix-compatible-string-for-ds1307-RTC.patch rename to target/linux/brcm2708/patches-4.19/950-0586-overlays-Fix-compatible-string-for-ds1307-RTC.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0614-overlays-Fix-further-maxim-ds1307-references.patch b/target/linux/brcm2708/patches-4.19/950-0587-overlays-Fix-further-maxim-ds1307-references.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0614-overlays-Fix-further-maxim-ds1307-references.patch rename to target/linux/brcm2708/patches-4.19/950-0587-overlays-Fix-further-maxim-ds1307-references.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0588-overlays-Cosmetic-change-to-upstream-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0615-overlays-Cosmetic-change-to-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0588-overlays-Cosmetic-change-to-upstream-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch b/target/linux/brcm2708/patches-4.19/950-0589-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0616-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch rename to target/linux/brcm2708/patches-4.19/950-0589-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch b/target/linux/brcm2708/patches-4.19/950-0590-w1-ds2413-output_write-cosmetic-fixes-simplify.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0617-w1-ds2413-output_write-cosmetic-fixes-simplify.patch rename to target/linux/brcm2708/patches-4.19/950-0590-w1-ds2413-output_write-cosmetic-fixes-simplify.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0618-w1-ds2413-add-retry-support-to-state_read.patch b/target/linux/brcm2708/patches-4.19/950-0591-w1-ds2413-add-retry-support-to-state_read.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0618-w1-ds2413-add-retry-support-to-state_read.patch rename to target/linux/brcm2708/patches-4.19/950-0591-w1-ds2413-add-retry-support-to-state_read.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch b/target/linux/brcm2708/patches-4.19/950-0592-w1-ds2413-when-the-slave-is-not-responding-during-re.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0619-w1-ds2413-when-the-slave-is-not-responding-during-re.patch rename to target/linux/brcm2708/patches-4.19/950-0592-w1-ds2413-when-the-slave-is-not-responding-during-re.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0620-w1-ds2413-fix-state-byte-comparision.patch b/target/linux/brcm2708/patches-4.19/950-0593-w1-ds2413-fix-state-byte-comparision.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0620-w1-ds2413-fix-state-byte-comparision.patch rename to target/linux/brcm2708/patches-4.19/950-0593-w1-ds2413-fix-state-byte-comparision.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch b/target/linux/brcm2708/patches-4.19/950-0594-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0621-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch rename to target/linux/brcm2708/patches-4.19/950-0594-drm-vc4_dsi-Fix-DMA-channel-and-memory-leak-in-vc4-3.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch b/target/linux/brcm2708/patches-4.19/950-0595-video-bcm2708_fb-Revert-cma-allocation-attempt.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0622-video-bcm2708_fb-Revert-cma-allocation-attempt.patch rename to target/linux/brcm2708/patches-4.19/950-0595-video-bcm2708_fb-Revert-cma-allocation-attempt.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch b/target/linux/brcm2708/patches-4.19/950-0596-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0623-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch rename to target/linux/brcm2708/patches-4.19/950-0596-drm-vc4-Add-support-for-color-encoding-on-YUV-planes.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch b/target/linux/brcm2708/patches-4.19/950-0597-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0624-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch rename to target/linux/brcm2708/patches-4.19/950-0597-arm-dts-Add-coherent_pool-1M-to-Pi-4-bootargs.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0598-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0625-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch rename to target/linux/brcm2708/patches-4.19/950-0598-overlays-Correct-gpio-fan-gpio-flags-for-4.19.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch b/target/linux/brcm2708/patches-4.19/950-0599-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0626-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch rename to target/linux/brcm2708/patches-4.19/950-0599-staging-vcsm-cma-Remove-cache-manipulation-ioctl-fro.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch b/target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch deleted file mode 100644 index 0ad70eb1e0..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0600-Revert-usb-xhci-hack-xhci_urb_enqueue-to-support-hid.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 5f6feeaf528cf922a82f11e5b0711f5fe9d7538d Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 7 Jun 2019 14:50:12 +0100 -Subject: [PATCH] Revert "usb: xhci: hack xhci_urb_enqueue to support - hid.mousepoll behaviour" - -This reverts commit 1cf1071a79f320bc4497a3ade77431f04442eb17. ---- - drivers/usb/host/xhci.c | 86 ----------------------------------------- - 1 file changed, 86 deletions(-) - ---- a/drivers/usb/host/xhci.c -+++ b/drivers/usb/host/xhci.c -@@ -1425,87 +1425,6 @@ command_cleanup: - } - - /* -- * RPI: Fixup endpoint intervals when requested -- * - Check interval versus the (cached) endpoint context -- * - set the endpoint interval to the new value -- * - force an endpoint configure command -- */ --static void xhci_fixup_interval(struct xhci_hcd *xhci, struct urb *urb, -- unsigned int slot_id, unsigned int ep_index) --{ -- struct xhci_ep_ctx *ep_ctx_out, *ep_ctx_in; -- struct xhci_command *command; -- struct xhci_input_control_ctx *ctrl_ctx; -- struct xhci_virt_device *vdev; -- int xhci_interval, ep_interval; -- int ret; -- unsigned long flags; -- u32 ep_info_tmp; -- -- spin_lock_irqsave(&xhci->lock, flags); -- -- vdev = xhci->devs[slot_id]; -- /* Get context-derived endpoint interval */ -- ep_ctx_out = xhci_get_ep_ctx(xhci, vdev->out_ctx, ep_index); -- ep_ctx_in = xhci_get_ep_ctx(xhci, vdev->in_ctx, ep_index); -- xhci_interval = EP_INTERVAL_TO_UFRAMES(le32_to_cpu(ep_ctx_out->ep_info)); -- ep_interval = urb->interval * 8; -- -- if (ep_interval == xhci_interval) { -- spin_unlock_irqrestore(&xhci->lock, flags); -- return; -- } -- -- xhci_dbg(xhci, "Fixup interval ep_interval=%d xhci_interval=%d\n", -- ep_interval, xhci_interval); -- command = xhci_alloc_command_with_ctx(xhci, true, GFP_ATOMIC); -- if (!command) { -- /* Failure here is benign, poll at the original rate */ -- spin_unlock_irqrestore(&xhci->lock, flags); -- return; -- } -- -- /* xHCI uses exponents for intervals... */ -- xhci_interval = fls(ep_interval) - 1; -- xhci_interval = clamp_val(xhci_interval, 3, 10); -- ep_info_tmp = le32_to_cpu(ep_ctx_out->ep_info); -- ep_info_tmp &= ~EP_INTERVAL(255); -- ep_info_tmp |= EP_INTERVAL(xhci_interval); -- -- /* Keep the endpoint context up-to-date while issuing the command. */ -- xhci_endpoint_copy(xhci, vdev->in_ctx, -- vdev->out_ctx, ep_index); -- ep_ctx_in->ep_info = cpu_to_le32(ep_info_tmp); -- -- /* -- * We need to drop the lock, so take an explicit copy -- * of the ep context. -- */ -- xhci_endpoint_copy(xhci, command->in_ctx, vdev->in_ctx, ep_index); -- -- ctrl_ctx = xhci_get_input_control_ctx(command->in_ctx); -- if (!ctrl_ctx) { -- xhci_warn(xhci, -- "%s: Could not get input context, bad type.\n", -- __func__); -- spin_unlock_irqrestore(&xhci->lock, flags); -- xhci_free_command(xhci, command); -- return; -- } -- ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index); -- ctrl_ctx->drop_flags = 0; -- -- spin_unlock_irqrestore(&xhci->lock, flags); -- -- ret = xhci_configure_endpoint(xhci, urb->dev, command, -- false, false); -- if (ret) -- xhci_warn(xhci, "%s: Configure endpoint failed: %d\n", -- __func__, ret); -- xhci_free_command(xhci, command); --} -- --/* - * non-error returns are a promise to giveback() the urb later - * we drop ownership so next owner (or urb unlink) can get it - */ -@@ -1573,11 +1492,6 @@ static int xhci_urb_enqueue(struct usb_h - } - } - -- if (usb_endpoint_xfer_int(&urb->ep->desc) && -- (urb->dev->speed == USB_SPEED_FULL || -- urb->dev->speed == USB_SPEED_LOW)) -- xhci_fixup_interval(xhci, urb, slot_id, ep_index); -- - spin_lock_irqsave(&xhci->lock, flags); - - if (xhci->xhc_state & XHCI_STATE_DYING) { diff --git a/target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch b/target/linux/brcm2708/patches-4.19/950-0600-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0627-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch rename to target/linux/brcm2708/patches-4.19/950-0600-staging-vcsm-cma-Rework-to-use-dma-APIs-not-CMA.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch b/target/linux/brcm2708/patches-4.19/950-0601-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0628-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch rename to target/linux/brcm2708/patches-4.19/950-0601-staging-vc-sm-cma-Fix-the-few-remaining-coding-style.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch b/target/linux/brcm2708/patches-4.19/950-0602-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0630-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch rename to target/linux/brcm2708/patches-4.19/950-0602-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch b/target/linux/brcm2708/patches-4.19/950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0631-media-vb2-set-reqbufs-create_bufs-capabilities.patch rename to target/linux/brcm2708/patches-4.19/950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0604-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0632-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch rename to target/linux/brcm2708/patches-4.19/950-0604-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0605-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0605-overlays-Add-real-parameters-to-the-rpi-poe-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch b/target/linux/brcm2708/patches-4.19/950-0606-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0634-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch rename to target/linux/brcm2708/patches-4.19/950-0606-overlays-Rename-pi3-overlays-to-be-less-model-specif.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch b/target/linux/brcm2708/patches-4.19/950-0607-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0635-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch rename to target/linux/brcm2708/patches-4.19/950-0607-i2c-bcm2835-Move-IRQ-request-after-clock-code-in-pro.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch b/target/linux/brcm2708/patches-4.19/950-0608-i2c-bcm2835-Ensure-clock-exists-when-probing.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0636-i2c-bcm2835-Ensure-clock-exists-when-probing.patch rename to target/linux/brcm2708/patches-4.19/950-0608-i2c-bcm2835-Ensure-clock-exists-when-probing.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0609-overlays-i2c-gpio-Fix-the-bus-parameter.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0637-overlays-i2c-gpio-Fix-the-bus-parameter.patch rename to target/linux/brcm2708/patches-4.19/950-0609-overlays-i2c-gpio-Fix-the-bus-parameter.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/brcm2708/patches-4.19/950-0610-tty-amba-pl011-Make-TX-optimisation-conditional.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0638-tty-amba-pl011-Make-TX-optimisation-conditional.patch rename to target/linux/brcm2708/patches-4.19/950-0610-tty-amba-pl011-Make-TX-optimisation-conditional.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/brcm2708/patches-4.19/950-0611-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0639-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch rename to target/linux/brcm2708/patches-4.19/950-0611-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch b/target/linux/brcm2708/patches-4.19/950-0612-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0640-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch rename to target/linux/brcm2708/patches-4.19/950-0612-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch b/target/linux/brcm2708/patches-4.19/950-0613-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0641-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch rename to target/linux/brcm2708/patches-4.19/950-0613-arm64-bcm2835-Add-missing-dependency-on-MFD_CORE.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0642-overlays-Add-PCF2129-RTC.patch b/target/linux/brcm2708/patches-4.19/950-0614-overlays-Add-PCF2129-RTC.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0642-overlays-Add-PCF2129-RTC.patch rename to target/linux/brcm2708/patches-4.19/950-0614-overlays-Add-PCF2129-RTC.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch b/target/linux/brcm2708/patches-4.19/950-0615-overlays-dpi18-and-dpi24-vc4-compatibility.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0643-overlays-dpi18-and-dpi24-vc4-compatibility.patch rename to target/linux/brcm2708/patches-4.19/950-0615-overlays-dpi18-and-dpi24-vc4-compatibility.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch b/target/linux/brcm2708/patches-4.19/950-0616-overlays-Add-i2c0-and-i2c1-for-regularity.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0644-overlays-Add-i2c0-and-i2c1-for-regularity.patch rename to target/linux/brcm2708/patches-4.19/950-0616-overlays-Add-i2c0-and-i2c1-for-regularity.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch b/target/linux/brcm2708/patches-4.19/950-0617-Pisound-Remove-spinlock-usage-around-spi_sync.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0645-Pisound-Remove-spinlock-usage-around-spi_sync.patch rename to target/linux/brcm2708/patches-4.19/950-0617-Pisound-Remove-spinlock-usage-around-spi_sync.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch b/target/linux/brcm2708/patches-4.19/950-0618-arm64-mm-Limit-the-DMA-zone-for-arm64.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0646-arm64-mm-Limit-the-DMA-zone-for-arm64.patch rename to target/linux/brcm2708/patches-4.19/950-0618-arm64-mm-Limit-the-DMA-zone-for-arm64.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch b/target/linux/brcm2708/patches-4.19/950-0619-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch rename to target/linux/brcm2708/patches-4.19/950-0619-drm-vc4-Query-firmware-for-custom-HDMI-mode.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch b/target/linux/brcm2708/patches-4.19/950-0620-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch rename to target/linux/brcm2708/patches-4.19/950-0620-drm-vc4-Pass-the-drm-vrefresh-to-the-firmware-on-mod.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0649-overlays-audremap-Support-GPIOs-18-19.patch b/target/linux/brcm2708/patches-4.19/950-0621-overlays-audremap-Support-GPIOs-18-19.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0649-overlays-audremap-Support-GPIOs-18-19.patch rename to target/linux/brcm2708/patches-4.19/950-0621-overlays-audremap-Support-GPIOs-18-19.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch b/target/linux/brcm2708/patches-4.19/950-0622-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0650-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch rename to target/linux/brcm2708/patches-4.19/950-0622-drm-connector-Fix-drm_mode_create_tv_properties-doc.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch b/target/linux/brcm2708/patches-4.19/950-0623-drm-connector-Clarify-the-unit-of-TV-margins.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0651-drm-connector-Clarify-the-unit-of-TV-margins.patch rename to target/linux/brcm2708/patches-4.19/950-0623-drm-connector-Clarify-the-unit-of-TV-margins.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch b/target/linux/brcm2708/patches-4.19/950-0624-drm-connector-Allow-creation-of-margin-props-alone.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0652-drm-connector-Allow-creation-of-margin-props-alone.patch rename to target/linux/brcm2708/patches-4.19/950-0624-drm-connector-Allow-creation-of-margin-props-alone.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch b/target/linux/brcm2708/patches-4.19/950-0625-drm-vc4-Take-margin-setup-into-account-when-updating.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0653-drm-vc4-Take-margin-setup-into-account-when-updating.patch rename to target/linux/brcm2708/patches-4.19/950-0625-drm-vc4-Take-margin-setup-into-account-when-updating.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch b/target/linux/brcm2708/patches-4.19/950-0626-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0654-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch rename to target/linux/brcm2708/patches-4.19/950-0626-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch b/target/linux/brcm2708/patches-4.19/950-0627-drm-vc4-Add-support-for-margins-to-fkms.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Add-support-for-margins-to-fkms.patch rename to target/linux/brcm2708/patches-4.19/950-0627-drm-vc4-Add-support-for-margins-to-fkms.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch b/target/linux/brcm2708/patches-4.19/950-0628-drm-vc4-Ensure-zpos-is-always-initialised.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Ensure-zpos-is-always-initialised.patch rename to target/linux/brcm2708/patches-4.19/950-0628-drm-vc4-Ensure-zpos-is-always-initialised.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch b/target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch deleted file mode 100644 index 8161bb2659..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0629-Revert-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-bu.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 768ab361410487b05561de854a994a2888cd430a Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Fri, 28 Jun 2019 11:30:49 +0100 -Subject: [PATCH] Revert "media: vb2: Allow reqbufs(0) with "in use" - MMAP buffers" - -This reverts commit a2c73e18c1f657de6d654f51effa0a94863abbd8. -An alternative version was accepted upstream. Revert this patch to -apply that one. - -Signed-off-by: Dave Stevenson ---- - .../media/common/videobuf2/videobuf2-core.c | 23 +++++++++++++++++++ - 1 file changed, 23 insertions(+) - ---- a/drivers/media/common/videobuf2/videobuf2-core.c -+++ b/drivers/media/common/videobuf2/videobuf2-core.c -@@ -554,6 +554,20 @@ bool vb2_buffer_in_use(struct vb2_queue - } - EXPORT_SYMBOL(vb2_buffer_in_use); - -+/* -+ * __buffers_in_use() - return true if any buffers on the queue are in use and -+ * the queue cannot be freed (by the means of REQBUFS(0)) call -+ */ -+static bool __buffers_in_use(struct vb2_queue *q) -+{ -+ unsigned int buffer; -+ for (buffer = 0; buffer < q->num_buffers; ++buffer) { -+ if (vb2_buffer_in_use(q, q->bufs[buffer])) -+ return true; -+ } -+ return false; -+} -+ - void vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb) - { - call_void_bufop(q, fill_user_buffer, q->bufs[index], pb); -@@ -665,7 +679,16 @@ int vb2_core_reqbufs(struct vb2_queue *q - - if (*count == 0 || q->num_buffers != 0 || - (q->memory != VB2_MEMORY_UNKNOWN && q->memory != memory)) { -+ /* -+ * We already have buffers allocated, so first check if they -+ * are not in use and can be freed. -+ */ - mutex_lock(&q->mmap_lock); -+ if (q->memory == VB2_MEMORY_MMAP && __buffers_in_use(q)) { -+ mutex_unlock(&q->mmap_lock); -+ dprintk(1, "memory in use, cannot free\n"); -+ return -EBUSY; -+ } - - /* - * Call queue_cancel to clean up any buffers in the PREPARED or diff --git a/target/linux/brcm2708/patches-4.19/950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch b/target/linux/brcm2708/patches-4.19/950-0629-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0657-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch rename to target/linux/brcm2708/patches-4.19/950-0629-dts-bcm2838-add-missing-properties-for-pmu-and-gic-n.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch b/target/linux/brcm2708/patches-4.19/950-0630-adds-the-Hifiberry-DAC-ADC-PRO-version.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0658-adds-the-Hifiberry-DAC-ADC-PRO-version.patch rename to target/linux/brcm2708/patches-4.19/950-0630-adds-the-Hifiberry-DAC-ADC-PRO-version.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0659-codecs-Correct-Katana-minimum-volume.patch b/target/linux/brcm2708/patches-4.19/950-0631-codecs-Correct-Katana-minimum-volume.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0659-codecs-Correct-Katana-minimum-volume.patch rename to target/linux/brcm2708/patches-4.19/950-0631-codecs-Correct-Katana-minimum-volume.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch b/target/linux/brcm2708/patches-4.19/950-0632-drm-vc4-A-present-but-empty-dmas-disables-audio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0660-drm-vc4-A-present-but-empty-dmas-disables-audio.patch rename to target/linux/brcm2708/patches-4.19/950-0632-drm-vc4-A-present-but-empty-dmas-disables-audio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch b/target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0661-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch rename to target/linux/brcm2708/patches-4.19/950-0633-overlays-Add-audio-parameter-to-vc4-kms-v3d.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0662-overlays-Update-the-upstream-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0634-overlays-Update-the-upstream-overlay.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0662-overlays-Update-the-upstream-overlay.patch rename to target/linux/brcm2708/patches-4.19/950-0634-overlays-Update-the-upstream-overlay.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch b/target/linux/brcm2708/patches-4.19/950-0635-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0663-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch rename to target/linux/brcm2708/patches-4.19/950-0635-Fixup-FKMS-interrupt-handing-for-non-existent-displa.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch b/target/linux/brcm2708/patches-4.19/950-0636-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0664-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch rename to target/linux/brcm2708/patches-4.19/950-0636-drivers-char-Use-correct-name-for-the-Raspberry-Pi-v.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0665-driver-char-rpivid-also-support-legacy-name.patch b/target/linux/brcm2708/patches-4.19/950-0637-driver-char-rpivid-also-support-legacy-name.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0665-driver-char-rpivid-also-support-legacy-name.patch rename to target/linux/brcm2708/patches-4.19/950-0637-driver-char-rpivid-also-support-legacy-name.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/brcm2708/patches-4.19/950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0666-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch rename to target/linux/brcm2708/patches-4.19/950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch b/target/linux/brcm2708/patches-4.19/950-0639-drm-vc4-Add-Broadcast-RGB-connector-property.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0667-drm-vc4-Add-Broadcast-RGB-connector-property.patch rename to target/linux/brcm2708/patches-4.19/950-0639-drm-vc4-Add-Broadcast-RGB-connector-property.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch b/target/linux/brcm2708/patches-4.19/950-0640-drm-connector-Add-documentation-for-drm_cmdline_mode.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0668-drm-connector-Add-documentation-for-drm_cmdline_mode.patch rename to target/linux/brcm2708/patches-4.19/950-0640-drm-connector-Add-documentation-for-drm_cmdline_mode.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0669-drm-modes-Rewrite-the-command-line-parser.patch b/target/linux/brcm2708/patches-4.19/950-0641-drm-modes-Rewrite-the-command-line-parser.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0669-drm-modes-Rewrite-the-command-line-parser.patch rename to target/linux/brcm2708/patches-4.19/950-0641-drm-modes-Rewrite-the-command-line-parser.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0670-drm-modes-Support-modes-names-on-the-command-line.patch b/target/linux/brcm2708/patches-4.19/950-0642-drm-modes-Support-modes-names-on-the-command-line.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0670-drm-modes-Support-modes-names-on-the-command-line.patch rename to target/linux/brcm2708/patches-4.19/950-0642-drm-modes-Support-modes-names-on-the-command-line.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch b/target/linux/brcm2708/patches-4.19/950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0671-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch rename to target/linux/brcm2708/patches-4.19/950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0672-drm-connector-Introduce-a-TV-margins-structure.patch b/target/linux/brcm2708/patches-4.19/950-0644-drm-connector-Introduce-a-TV-margins-structure.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0672-drm-connector-Introduce-a-TV-margins-structure.patch rename to target/linux/brcm2708/patches-4.19/950-0644-drm-connector-Introduce-a-TV-margins-structure.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0673-drm-modes-Parse-overscan-properties.patch b/target/linux/brcm2708/patches-4.19/950-0645-drm-modes-Parse-overscan-properties.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0673-drm-modes-Parse-overscan-properties.patch rename to target/linux/brcm2708/patches-4.19/950-0645-drm-modes-Parse-overscan-properties.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch b/target/linux/brcm2708/patches-4.19/950-0646-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0674-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch rename to target/linux/brcm2708/patches-4.19/950-0646-drm-atomic-Add-a-function-to-reset-connector-TV-prop.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch b/target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0675-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch rename to target/linux/brcm2708/patches-4.19/950-0647-drm-vc4-hdmi-Set-default-state-margin-at-reset.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch b/target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-fkms-Set-default-state-margin-at-reset.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0676-drm-vc4-fkms-Set-default-state-margin-at-reset.patch rename to target/linux/brcm2708/patches-4.19/950-0648-drm-vc4-fkms-Set-default-state-margin-at-reset.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch b/target/linux/brcm2708/patches-4.19/950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0677-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch rename to target/linux/brcm2708/patches-4.19/950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch b/target/linux/brcm2708/patches-4.19/950-0650-staging-bcm2835-codec-switch-to-multi-planar-API.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0678-staging-bcm2835-codec-switch-to-multi-planar-API.patch rename to target/linux/brcm2708/patches-4.19/950-0650-staging-bcm2835-codec-switch-to-multi-planar-API.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch b/target/linux/brcm2708/patches-4.19/950-0651-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0679-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch rename to target/linux/brcm2708/patches-4.19/950-0651-staging-bcm2835-codec-implement-V4L2_CID_MIN_BUFFERS.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch b/target/linux/brcm2708/patches-4.19/950-0652-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0680-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch rename to target/linux/brcm2708/patches-4.19/950-0652-staging-bcm2835-codec-set-device_caps-in-struct-vide.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0681-Add-HDMI1-facility-to-the-driver.patch b/target/linux/brcm2708/patches-4.19/950-0653-Add-HDMI1-facility-to-the-driver.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0681-Add-HDMI1-facility-to-the-driver.patch rename to target/linux/brcm2708/patches-4.19/950-0653-Add-HDMI1-facility-to-the-driver.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch b/target/linux/brcm2708/patches-4.19/950-0654-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0682-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch rename to target/linux/brcm2708/patches-4.19/950-0654-overlays-Add-baudrate-parameter-to-i2c3-i2c6.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch b/target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0683-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch rename to target/linux/brcm2708/patches-4.19/950-0655-drm-vc4-Resolve-the-vblank-warnings-on-mode-switchin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0684-drm-vc4-Remove-unused-mode-variable.patch b/target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Remove-unused-mode-variable.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0684-drm-vc4-Remove-unused-mode-variable.patch rename to target/linux/brcm2708/patches-4.19/950-0656-drm-vc4-Remove-unused-mode-variable.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch b/target/linux/brcm2708/patches-4.19/950-0657-staging-bcm2835-codec-Expand-logging-on-format-setti.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Expand-logging-on-format-setti.patch rename to target/linux/brcm2708/patches-4.19/950-0657-staging-bcm2835-codec-Expand-logging-on-format-setti.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch b/target/linux/brcm2708/patches-4.19/950-0658-staging-bcm2835-codec-Correct-bytesperline-on-format.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-Correct-bytesperline-on-format.patch rename to target/linux/brcm2708/patches-4.19/950-0658-staging-bcm2835-codec-Correct-bytesperline-on-format.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch b/target/linux/brcm2708/patches-4.19/950-0659-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0687-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch rename to target/linux/brcm2708/patches-4.19/950-0659-drm-vc4-Add-missing-NULL-check-to-vc4_crtc_consume_e.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/brcm2708/patches-4.19/950-0660-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0688-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch rename to target/linux/brcm2708/patches-4.19/950-0660-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch b/target/linux/brcm2708/patches-4.19/950-0661-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0689-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch rename to target/linux/brcm2708/patches-4.19/950-0661-drm-vc4-Fix-TILE_Y_OFFSET-definitions.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch b/target/linux/brcm2708/patches-4.19/950-0662-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0690-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch rename to target/linux/brcm2708/patches-4.19/950-0662-drm-vc4-Define-missing-PITCH0_SINK_PIX-field.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch b/target/linux/brcm2708/patches-4.19/950-0663-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0691-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch rename to target/linux/brcm2708/patches-4.19/950-0663-drm-vc4-Use-drm_atomic_helper_check_plane_state-to-s.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch b/target/linux/brcm2708/patches-4.19/950-0664-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0692-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch rename to target/linux/brcm2708/patches-4.19/950-0664-drm-vc4-Move-offsets-adjustment-out-of-setup_clippin.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch b/target/linux/brcm2708/patches-4.19/950-0665-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0693-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch rename to target/linux/brcm2708/patches-4.19/950-0665-drm-vc4-Fix-X-Y-positioning-of-planes-using-T_TILES-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch b/target/linux/brcm2708/patches-4.19/950-0666-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0694-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch rename to target/linux/brcm2708/patches-4.19/950-0666-drm-vc4-Fix-NULL-pointer-dereference-in-the-async-up.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch b/target/linux/brcm2708/patches-4.19/950-0667-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0695-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch rename to target/linux/brcm2708/patches-4.19/950-0667-ARM-dts-bcm2711-rpi-4-b-I2C-aliases-and-pulls.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0696-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/brcm2708/patches-4.19/950-0668-xhci-Use-more-event-ring-segment-table-entries.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0696-xhci-Use-more-event-ring-segment-table-entries.patch rename to target/linux/brcm2708/patches-4.19/950-0668-xhci-Use-more-event-ring-segment-table-entries.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch b/target/linux/brcm2708/patches-4.19/950-0669-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0697-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch rename to target/linux/brcm2708/patches-4.19/950-0669-dwc_otg-use-align_buf-for-small-IN-control-transfers.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch b/target/linux/brcm2708/patches-4.19/950-0670-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0698-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch rename to target/linux/brcm2708/patches-4.19/950-0670-Ported-pcie-brcmstb-bounce-buffer-implementation-to-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0699-configs-arm64-vcm2711-Enable-V3D.patch b/target/linux/brcm2708/patches-4.19/950-0671-configs-arm64-vcm2711-Enable-V3D.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0699-configs-arm64-vcm2711-Enable-V3D.patch rename to target/linux/brcm2708/patches-4.19/950-0671-configs-arm64-vcm2711-Enable-V3D.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0672-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0700-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch rename to target/linux/brcm2708/patches-4.19/950-0672-overlays-sc16ic752-i2c-Fix-xtal-parameter.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch b/target/linux/brcm2708/patches-4.19/950-0673-vc-sm-cma-Fix-compatibility-ioctl.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0701-vc-sm-cma-Fix-compatibility-ioctl.patch rename to target/linux/brcm2708/patches-4.19/950-0673-vc-sm-cma-Fix-compatibility-ioctl.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch b/target/linux/brcm2708/patches-4.19/950-0674-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0702-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch rename to target/linux/brcm2708/patches-4.19/950-0674-staging-bcm2835-codec-add-support-for-V4L2_CID_MPEG_.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch b/target/linux/brcm2708/patches-4.19/950-0675-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0703-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch rename to target/linux/brcm2708/patches-4.19/950-0675-staging-bcm2835-codec-remove-unnecessary-padding-on-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch b/target/linux/brcm2708/patches-4.19/950-0676-arm-dts-add-missing-Raspberry-Pi-model-names.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0704-arm-dts-add-missing-Raspberry-Pi-model-names.patch rename to target/linux/brcm2708/patches-4.19/950-0676-arm-dts-add-missing-Raspberry-Pi-model-names.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0705-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/brcm2708/patches-4.19/950-0677-arch-arm-Add-model-string-to-cpuinfo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0705-arch-arm-Add-model-string-to-cpuinfo.patch rename to target/linux/brcm2708/patches-4.19/950-0677-arch-arm-Add-model-string-to-cpuinfo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch b/target/linux/brcm2708/patches-4.19/950-0678-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0706-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch rename to target/linux/brcm2708/patches-4.19/950-0678-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch b/target/linux/brcm2708/patches-4.19/950-0679-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0707-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch rename to target/linux/brcm2708/patches-4.19/950-0679-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch b/target/linux/brcm2708/patches-4.19/950-0680-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0708-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch rename to target/linux/brcm2708/patches-4.19/950-0680-media-i2c-Add-driver-for-Sony-IMX219-sensor.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch b/target/linux/brcm2708/patches-4.19/950-0681-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0709-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch rename to target/linux/brcm2708/patches-4.19/950-0681-dtoverlays-Add-overlay-for-the-Sony-IMX219-image-sen.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch b/target/linux/brcm2708/patches-4.19/950-0682-staging-bcm2835-codec-Fix-non-documentation-comment-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0710-staging-bcm2835-codec-Fix-non-documentation-comment-.patch rename to target/linux/brcm2708/patches-4.19/950-0682-staging-bcm2835-codec-Fix-non-documentation-comment-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch b/target/linux/brcm2708/patches-4.19/950-0683-staging-bcm2835-codec-Fix-declaration-of-roles.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0711-staging-bcm2835-codec-Fix-declaration-of-roles.patch rename to target/linux/brcm2708/patches-4.19/950-0683-staging-bcm2835-codec-Fix-declaration-of-roles.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch b/target/linux/brcm2708/patches-4.19/950-0684-staging-bcm2835-codec-Add-role-to-device-name.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0712-staging-bcm2835-codec-Add-role-to-device-name.patch rename to target/linux/brcm2708/patches-4.19/950-0684-staging-bcm2835-codec-Add-role-to-device-name.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch b/target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Pass-driver-context-to-create-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0713-staging-bcm2835-codec-Pass-driver-context-to-create-.patch rename to target/linux/brcm2708/patches-4.19/950-0685-staging-bcm2835-codec-Pass-driver-context-to-create-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0714-staging-bcm2835-codec-add-media-controller-support.patch b/target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-add-media-controller-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0714-staging-bcm2835-codec-add-media-controller-support.patch rename to target/linux/brcm2708/patches-4.19/950-0686-staging-bcm2835-codec-add-media-controller-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch b/target/linux/brcm2708/patches-4.19/950-0687-media-bcm2835-unicam-Reduce-scope-of-local-function.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0715-media-bcm2835-unicam-Reduce-scope-of-local-function.patch rename to target/linux/brcm2708/patches-4.19/950-0687-media-bcm2835-unicam-Reduce-scope-of-local-function.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0716-media-bcm2835-unicam-add-media-controller-support.patch b/target/linux/brcm2708/patches-4.19/950-0688-media-bcm2835-unicam-add-media-controller-support.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0716-media-bcm2835-unicam-add-media-controller-support.patch rename to target/linux/brcm2708/patches-4.19/950-0688-media-bcm2835-unicam-add-media-controller-support.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch b/target/linux/brcm2708/patches-4.19/950-0689-Limit-max_req_size-under-arm64-or-any-other-platform.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0717-Limit-max_req_size-under-arm64-or-any-other-platform.patch rename to target/linux/brcm2708/patches-4.19/950-0689-Limit-max_req_size-under-arm64-or-any-other-platform.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch b/target/linux/brcm2708/patches-4.19/950-0690-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0718-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch rename to target/linux/brcm2708/patches-4.19/950-0690-Add-missing-dma_unmap_sg-calls-to-free-relevant-swio.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch b/target/linux/brcm2708/patches-4.19/950-0691-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0719-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch rename to target/linux/brcm2708/patches-4.19/950-0691-overlays-mcp23017-rename-the-GPIO-pins-node-with-the.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch b/target/linux/brcm2708/patches-4.19/950-0692-overlays-mcp23017-Add-option-for-not-connecting-the-.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0720-overlays-mcp23017-Add-option-for-not-connecting-the-.patch rename to target/linux/brcm2708/patches-4.19/950-0692-overlays-mcp23017-Add-option-for-not-connecting-the-.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch b/target/linux/brcm2708/patches-4.19/950-0693-v4l2-Add-a-Greyworld-AWB-mode.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0721-v4l2-Add-a-Greyworld-AWB-mode.patch rename to target/linux/brcm2708/patches-4.19/950-0693-v4l2-Add-a-Greyworld-AWB-mode.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch b/target/linux/brcm2708/patches-4.19/950-0694-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0722-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch rename to target/linux/brcm2708/patches-4.19/950-0694-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0723-PCI-brcmstb-Fix-compilation-warning.patch b/target/linux/brcm2708/patches-4.19/950-0695-PCI-brcmstb-Fix-compilation-warning.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0723-PCI-brcmstb-Fix-compilation-warning.patch rename to target/linux/brcm2708/patches-4.19/950-0695-PCI-brcmstb-Fix-compilation-warning.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch b/target/linux/brcm2708/patches-4.19/950-0696-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0724-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch rename to target/linux/brcm2708/patches-4.19/950-0696-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch b/target/linux/brcm2708/patches-4.19/950-0697-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0725-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch rename to target/linux/brcm2708/patches-4.19/950-0697-Add-Hifiberry-DAC-DSP-soundcard-driver-3224.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch b/target/linux/brcm2708/patches-4.19/950-0698-staging-bcm2835-codec-Allow-height-of-1920.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0726-staging-bcm2835-codec-Allow-height-of-1920.patch rename to target/linux/brcm2708/patches-4.19/950-0698-staging-bcm2835-codec-Allow-height-of-1920.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch b/target/linux/brcm2708/patches-4.19/950-0699-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0727-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch rename to target/linux/brcm2708/patches-4.19/950-0699-staging-bcm2835-codec-Correct-g-s_selection-API-MPLA.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0728-regulator-gpio-Allow-nonexclusive-GPIO-access.patch rename to target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch b/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0729-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch rename to target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0730-Fix-poll-rate-on-touchscreen-3238.patch b/target/linux/brcm2708/patches-4.19/950-0702-Fix-poll-rate-on-touchscreen-3238.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0730-Fix-poll-rate-on-touchscreen-3238.patch rename to target/linux/brcm2708/patches-4.19/950-0702-Fix-poll-rate-on-touchscreen-3238.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch b/target/linux/brcm2708/patches-4.19/950-0703-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch similarity index 100% rename from target/linux/brcm2708/patches-4.19/950-0731-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch rename to target/linux/brcm2708/patches-4.19/950-0703-dts-Add-DTS-for-Pi-2B-rev-1.2-with-BCM2837-3235.patch diff --git a/target/linux/brcm2708/patches-4.19/950-0704-drm-v3d-clean-caches-at-the-end-of-render-jobs-on-re.patch b/target/linux/brcm2708/patches-4.19/950-0704-drm-v3d-clean-caches-at-the-end-of-render-jobs-on-re.patch new file mode 100644 index 0000000000..ff7c346f5f --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0704-drm-v3d-clean-caches-at-the-end-of-render-jobs-on-re.patch @@ -0,0 +1,177 @@ +From bc4661703d132ae1fb91d66641c64851eae44959 Mon Sep 17 00:00:00 2001 +From: Iago Toral Quiroga +Date: Tue, 3 Sep 2019 08:45:24 +0200 +Subject: [PATCH] drm/v3d: clean caches at the end of render jobs on + request from user space + +Extends the user space ioctl for CL submissions so it can include a request +to flush the cache once the CL execution has completed. Fixes memory +write violation messages reported by the kernel in workloads involving +shader memory writes (SSBOs, shader images, scratch, etc) which sometimes +also lead to GPU resets during Piglit and CTS workloads. + +v2: if v3d_job_init() fails we need to kfree() the job instead of + v3d_job_put() it (Eric Anholt). + +v3 (Eric Anholt): + - Drop _FLAG suffix from the new flag name. + - Add a new param so userspace can tell whether cache flushing is + implemented in the kernel. + +Signed-off-by: Iago Toral Quiroga +--- + drivers/gpu/drm/v3d/v3d_drv.c | 3 ++ + drivers/gpu/drm/v3d/v3d_gem.c | 54 +++++++++++++++++++++++++++++------ + include/uapi/drm/v3d_drm.h | 6 ++-- + 3 files changed, 53 insertions(+), 10 deletions(-) + +--- a/drivers/gpu/drm/v3d/v3d_drv.c ++++ b/drivers/gpu/drm/v3d/v3d_drv.c +@@ -117,6 +117,9 @@ static int v3d_get_param_ioctl(struct dr + case DRM_V3D_PARAM_SUPPORTS_CSD: + args->value = v3d_has_csd(v3d); + return 0; ++ case DRM_V3D_PARAM_SUPPORTS_CACHE_FLUSH: ++ args->value = 1; ++ return 0; + default: + DRM_DEBUG("Unknown parameter %d\n", args->param); + return -EINVAL; +--- a/drivers/gpu/drm/v3d/v3d_gem.c ++++ b/drivers/gpu/drm/v3d/v3d_gem.c +@@ -709,13 +709,16 @@ v3d_submit_cl_ioctl(struct drm_device *d + struct drm_v3d_submit_cl *args = data; + struct v3d_bin_job *bin = NULL; + struct v3d_render_job *render; ++ struct v3d_job *clean_job = NULL; ++ struct v3d_job *last_job; + struct ww_acquire_ctx acquire_ctx; + int ret = 0; + + trace_v3d_submit_cl_ioctl(&v3d->drm, args->rcl_start, args->rcl_end); + +- if (args->pad != 0) { +- DRM_INFO("pad must be zero: %d\n", args->pad); ++ if (args->flags != 0 && ++ args->flags != DRM_V3D_SUBMIT_CL_FLUSH_CACHE) { ++ DRM_INFO("invalid flags: %d\n", args->flags); + return -EINVAL; + } + +@@ -755,12 +758,31 @@ v3d_submit_cl_ioctl(struct drm_device *d + bin->render = render; + } + +- ret = v3d_lookup_bos(dev, file_priv, &render->base, ++ if (args->flags & DRM_V3D_SUBMIT_CL_FLUSH_CACHE) { ++ clean_job = kcalloc(1, sizeof(*clean_job), GFP_KERNEL); ++ if (!clean_job) { ++ ret = -ENOMEM; ++ goto fail; ++ } ++ ++ ret = v3d_job_init(v3d, file_priv, clean_job, v3d_job_free, 0); ++ if (ret) { ++ kfree(clean_job); ++ clean_job = NULL; ++ goto fail; ++ } ++ ++ last_job = clean_job; ++ } else { ++ last_job = &render->base; ++ } ++ ++ ret = v3d_lookup_bos(dev, file_priv, last_job, + args->bo_handles, args->bo_handle_count); + if (ret) + goto fail; + +- ret = v3d_lock_bo_reservations(&render->base, &acquire_ctx); ++ ret = v3d_lock_bo_reservations(last_job, &acquire_ctx); + if (ret) + goto fail; + +@@ -772,33 +794,49 @@ v3d_submit_cl_ioctl(struct drm_device *d + + ret = v3d_add_dep(&render->base, + dma_fence_get(bin->base.done_fence)); ++ if (ret) ++ goto fail_unreserve; + } + + ret = v3d_push_job(v3d_priv, &render->base, V3D_RENDER); + if (ret) + goto fail_unreserve; ++ ++ if (clean_job) { ++ ret = v3d_add_dep(clean_job, ++ dma_fence_get(render->base.done_fence)); ++ if (ret) ++ goto fail_unreserve; ++ ret = v3d_push_job(v3d_priv, clean_job, V3D_CACHE_CLEAN); ++ if (ret) ++ goto fail_unreserve; ++ } + mutex_unlock(&v3d->sched_lock); + + v3d_attach_fences_and_unlock_reservation(file_priv, +- &render->base, ++ last_job, + &acquire_ctx, + args->out_sync, +- render->base.done_fence); ++ last_job->done_fence); + + if (bin) + v3d_job_put(&bin->base); + v3d_job_put(&render->base); ++ if (clean_job) ++ v3d_job_put(clean_job); + + return 0; + + fail_unreserve: + mutex_unlock(&v3d->sched_lock); +- v3d_unlock_bo_reservations(render->base.bo, +- render->base.bo_count, &acquire_ctx); ++ v3d_unlock_bo_reservations(last_job->bo, ++ last_job->bo_count, &acquire_ctx); + fail: + if (bin) + v3d_job_put(&bin->base); + v3d_job_put(&render->base); ++ if (clean_job) ++ v3d_job_put(clean_job); + + return ret; + } +--- a/include/uapi/drm/v3d_drm.h ++++ b/include/uapi/drm/v3d_drm.h +@@ -48,6 +48,8 @@ extern "C" { + #define DRM_IOCTL_V3D_SUBMIT_TFU DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_TFU, struct drm_v3d_submit_tfu) + #define DRM_IOCTL_V3D_SUBMIT_CSD DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CSD, struct drm_v3d_submit_csd) + ++#define DRM_V3D_SUBMIT_CL_FLUSH_CACHE 0x01 ++ + /** + * struct drm_v3d_submit_cl - ioctl argument for submitting commands to the 3D + * engine. +@@ -106,8 +108,7 @@ struct drm_v3d_submit_cl { + /* Number of BO handles passed in (size is that times 4). */ + __u32 bo_handle_count; + +- /* Pad, must be zero-filled. */ +- __u32 pad; ++ __u32 flags; + }; + + /** +@@ -175,6 +176,7 @@ enum drm_v3d_param { + DRM_V3D_PARAM_V3D_CORE0_IDENT2, + DRM_V3D_PARAM_SUPPORTS_TFU, + DRM_V3D_PARAM_SUPPORTS_CSD, ++ DRM_V3D_PARAM_SUPPORTS_CACHE_FLUSH, + }; + + struct drm_v3d_get_param { diff --git a/target/linux/brcm2708/patches-4.19/950-0705-staging-bcm2835-audio-Fix-draining-behavior-regressi.patch b/target/linux/brcm2708/patches-4.19/950-0705-staging-bcm2835-audio-Fix-draining-behavior-regressi.patch new file mode 100644 index 0000000000..76279ec813 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0705-staging-bcm2835-audio-Fix-draining-behavior-regressi.patch @@ -0,0 +1,56 @@ +From 9dd926d29051324d8621ca2a18bbdd568523ac93 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Sat, 14 Sep 2019 17:24:05 +0200 +Subject: [PATCH] staging: bcm2835-audio: Fix draining behavior + regression + +The PCM draining behavior got broken since the recent refactoring, and +this turned out to be the incorrect expectation of the firmware +behavior regarding "draining". While I expected the "drain" flag at +the stop operation would do processing the queued samples, it seems +rather dropping the samples. + +As a quick fix, just drop the SNDRV_PCM_INFO_DRAIN_TRIGGER flag, so +that the driver uses the normal PCM draining procedure. Also, put +some caution comment to the function for future readers not to fall +into the same pitfall. + +Fixes: d7ca3a71545b ("staging: bcm2835-audio: Operate non-atomic PCM ops") +BugLink: https://github.com/raspberrypi/linux/issues/2983 +Cc: stable@vger.kernel.org +Signed-off-by: Takashi Iwai +--- + drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 ++-- + drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c ++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +@@ -12,7 +12,7 @@ + static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { + .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | +- SNDRV_PCM_INFO_DRAIN_TRIGGER | SNDRV_PCM_INFO_SYNC_APPLPTR), ++ SNDRV_PCM_INFO_SYNC_APPLPTR), + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_192000, + .rate_min = 8000, +@@ -29,7 +29,7 @@ static const struct snd_pcm_hardware snd + static const struct snd_pcm_hardware snd_bcm2835_playback_spdif_hw = { + .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | +- SNDRV_PCM_INFO_DRAIN_TRIGGER | SNDRV_PCM_INFO_SYNC_APPLPTR), ++ SNDRV_PCM_INFO_SYNC_APPLPTR), + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | +--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c ++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +@@ -297,6 +297,7 @@ int bcm2835_audio_stop(struct bcm2835_al + VC_AUDIO_MSG_TYPE_STOP, false); + } + ++/* FIXME: this doesn't seem working as expected for "draining" */ + int bcm2835_audio_drain(struct bcm2835_alsa_stream *alsa_stream) + { + struct vc_audio_msg m = { diff --git a/target/linux/brcm2708/patches-4.19/950-0706-bcm2708_fb-Fix-layout-of-struct-vc4_display_settings.patch b/target/linux/brcm2708/patches-4.19/950-0706-bcm2708_fb-Fix-layout-of-struct-vc4_display_settings.patch new file mode 100644 index 0000000000..adb14fb710 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0706-bcm2708_fb-Fix-layout-of-struct-vc4_display_settings.patch @@ -0,0 +1,34 @@ +From c6be127c2f4d5f75c60d3778594093ff51593a6e Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sun, 22 Sep 2019 21:51:29 +0100 +Subject: [PATCH] bcm2708_fb: Fix layout of struct + vc4_display_settings_t + +The display parameters returned by the VC4 firmware in response to the +RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_SETTINGS tag do not match the +layout of struct vc4_display_settings_t: the colour depth and row +pitch are erroneously swapped in the kernel definition. This can +trigger a kernel warning from pixel_to_pat(), such as: + + pixel_to_pat(): unsupported pixelformat 7296 + +Fix by adjusting the layout of struct vc4_display_settings_t to match +the layout as used by the VC4 firmware. + +Signed-off-by: Michael Brown +--- + drivers/video/fbdev/bcm2708_fb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/fbdev/bcm2708_fb.c ++++ b/drivers/video/fbdev/bcm2708_fb.c +@@ -89,8 +89,8 @@ struct vc4_display_settings_t { + u32 display_num; + u32 width; + u32 height; +- u32 pitch; + u32 depth; ++ u32 pitch; + u32 virtual_width; + u32 virtual_height; + u32 virtual_width_offset; diff --git a/target/linux/brcm2708/patches-4.19/950-0707-ARM-dts-bcm283x-Fix-DTC-warning-for-memory-node.patch b/target/linux/brcm2708/patches-4.19/950-0707-ARM-dts-bcm283x-Fix-DTC-warning-for-memory-node.patch new file mode 100644 index 0000000000..b593d7fb0c --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0707-ARM-dts-bcm283x-Fix-DTC-warning-for-memory-node.patch @@ -0,0 +1,68 @@ +From b640129382a37105cf2577f251103e550381b797 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Mon, 23 Sep 2019 18:56:37 +0200 +Subject: [PATCH] ARM: dts: bcm283x: Fix DTC warning for memory node + +commit f090e1bd7b05f17d35b6e2d0e946d8a8085d264f upstream. + +Compiling the bcm283x DTS with W=1 leads to the following warning: + +Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, +but no unit name + +Fix this by adding the unit address. + +Signed-off-by: Stefan Wahren +Tested-by: Peter Robinson +Reviewed-by: Eric Anholt +--- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi +@@ -1,7 +1,7 @@ + #include + + / { +- memory { ++ memory@0 { + device_type = "memory"; + reg = <0 0x10000000>; + }; +--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +@@ -10,7 +10,7 @@ + compatible = "raspberrypi,2-model-b", "brcm,bcm2836"; + model = "Raspberry Pi 2 Model B"; + +- memory { ++ memory@0 { + reg = <0 0x40000000>; + }; + +--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +@@ -14,7 +14,7 @@ + stdout-path = "serial1:115200n8"; + }; + +- memory { ++ memory@0 { + reg = <0 0x40000000>; + }; + +--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts ++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +@@ -15,7 +15,7 @@ + stdout-path = "serial1:115200n8"; + }; + +- memory { ++ memory@0 { + reg = <0 0x40000000>; + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0708-ARM-dts-bcm27xx-Fix-DTC-warning-for-memory-node.patch b/target/linux/brcm2708/patches-4.19/950-0708-ARM-dts-bcm27xx-Fix-DTC-warning-for-memory-node.patch new file mode 100644 index 0000000000..3a424b3a67 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0708-ARM-dts-bcm27xx-Fix-DTC-warning-for-memory-node.patch @@ -0,0 +1,52 @@ +From 10524e83179ad016a379ea99364d6912812a9aa5 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Mon, 23 Sep 2019 20:09:12 +0200 +Subject: [PATCH] ARM: dts: bcm27xx: Fix DTC warning for memory node + +Compiling the bcm27xx DTS with W=1 leads to the following warning: + +Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, +but no unit name + +Fix this by adding the unit address. + +Signed-off-by: Stefan Wahren +--- + arch/arm/boot/dts/bcm2708-rpi.dtsi | 2 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +- + arch/arm/boot/dts/bcm2838-rpi-4-b.dts | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi +@@ -3,7 +3,7 @@ + #include "bcm2835-rpi.dtsi" + + / { +- memory { ++ memory@0 { + device_type = "memory"; + reg = <0x0 0x0>; + }; +--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +@@ -8,7 +8,7 @@ + compatible = "raspberrypi,4-model-b", "brcm,bcm2838"; + model = "Raspberry Pi 4 Model B"; + +- memory { ++ memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0>; + }; +--- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts +@@ -13,7 +13,7 @@ + stdout-path = "serial1:115200n8"; + }; + +- memory { ++ memory@0 { + reg = <0 0 0x40000000>; + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0709-ARM-bcm283x-Enable-DMA-support-for-SPI-controller.patch b/target/linux/brcm2708/patches-4.19/950-0709-ARM-bcm283x-Enable-DMA-support-for-SPI-controller.patch new file mode 100644 index 0000000000..27cd2aff50 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0709-ARM-bcm283x-Enable-DMA-support-for-SPI-controller.patch @@ -0,0 +1,42 @@ +From cce15c51f1afbb1aa9d5f7779c9f7c0a17b39701 Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Thu, 9 May 2019 19:03:00 +0200 +Subject: [PATCH] ARM: bcm283x: Enable DMA support for SPI controller +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without this, the driver for the BCM2835 SPI controller uses interrupt +mode instead of DMA mode, incurring a significant performance penalty. +The Foundation's device tree has had these attributes for years, but for +some reason they were never upstreamed. + +They were originally contributed by Noralf Trønnes and Martin Sperl: +https://github.com/raspberrypi/linux/commit/25f3e064afc8 +https://github.com/raspberrypi/linux/commit/e0edb52b47e6 + +The DREQ numbers 6 and 7 are documented in section 4.2.1.3 of: +https://www.raspberrypi.org/app/uploads/2012/02/BCM2835-ARM-Peripherals.pdf + +Tested-by: Nicolas Saenz Julienne +Signed-off-by: Lukas Wunner +Reviewed-by: Eric Anholt +Reviewed-by: Martin Sperl +Signed-off-by: Stefan Wahren +Cc: Martin Sperl +Cc: Noralf Trønnes +--- + arch/arm/boot/dts/bcm283x.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/boot/dts/bcm283x.dtsi ++++ b/arch/arm/boot/dts/bcm283x.dtsi +@@ -403,6 +403,8 @@ + reg = <0x7e204000 0x200>; + interrupts = <2 22>; + clocks = <&clocks BCM2835_CLOCK_VPU>; ++ dmas = <&dma 6>, <&dma 7>; ++ dma-names = "tx", "rx"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; diff --git a/target/linux/brcm2708/patches-4.19/950-0710-ARM-dts-bcm2835-rpi-Drop-unnecessary-address-cells-s.patch b/target/linux/brcm2708/patches-4.19/950-0710-ARM-dts-bcm2835-rpi-Drop-unnecessary-address-cells-s.patch new file mode 100644 index 0000000000..6986ae9289 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0710-ARM-dts-bcm2835-rpi-Drop-unnecessary-address-cells-s.patch @@ -0,0 +1,30 @@ +From de002983174698762ecd3e42ab5a4b1bceb80af1 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sun, 30 Dec 2018 12:07:16 +0100 +Subject: [PATCH] ARM: dts: bcm2835-rpi: Drop unnecessary + #address-cells/#size-cells + +Compiling the bcm2835-rpi.dtsi with W=1 leads to the following warning: + +Warning (avoid_unnecessary_addr_size): /soc/firmware: unnecessary + #address-cells/#size-cells without "ranges" or child "reg" property + +Fix this by removing these unnecessary properties. + +Signed-off-by: Stefan Wahren +Reviewed-by: Eric Anholt +--- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 -- + 1 file changed, 2 deletions(-) + +--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi +@@ -19,8 +19,6 @@ + soc { + firmware: firmware { + compatible = "raspberrypi,bcm2835-firmware", "simple-bus"; +- #address-cells = <0>; +- #size-cells = <0>; + mboxes = <&mailbox>; + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0711-ARM-dts-bcm2708-rpi-Define-the-downstream-MMC-interf.patch b/target/linux/brcm2708/patches-4.19/950-0711-ARM-dts-bcm2708-rpi-Define-the-downstream-MMC-interf.patch new file mode 100644 index 0000000000..184d397ed9 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0711-ARM-dts-bcm2708-rpi-Define-the-downstream-MMC-interf.patch @@ -0,0 +1,40 @@ +From c31c8018e7cef83c827c913a10ac06b465813b22 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sat, 21 Sep 2019 15:29:33 +0200 +Subject: [PATCH] ARM: dts: bcm2708-rpi: Define the downstream MMC + interfaces at one place + +In order to keep downstream definition of the MMC interfaces separate +and independent from upstream changes, add them to bcm2708-rpi.dtsi. + +Signed-off-by: Stefan Wahren +--- + arch/arm/boot/dts/bcm2708-rpi.dtsi | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi +@@ -125,13 +125,23 @@ + firmware = <&firmware>; + }; + ++&sdhci { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_gpio48>; ++ bus-width = <4>; ++}; ++ + sdhost_pins: &sdhost_gpio48 { + /* Add alias */ + }; + + &sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; + brcm,overclock-50 = <0>; + brcm,pio-limit = <1>; ++ status = "okay"; + }; + + &cpu_thermal { diff --git a/target/linux/brcm2708/patches-4.19/950-0712-ARM-dts-bcm283x-Define-MMC-interfaces-at-board-level.patch b/target/linux/brcm2708/patches-4.19/950-0712-ARM-dts-bcm283x-Define-MMC-interfaces-at-board-level.patch new file mode 100644 index 0000000000..7ad61b65fb --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0712-ARM-dts-bcm283x-Define-MMC-interfaces-at-board-level.patch @@ -0,0 +1,194 @@ +From a1905aed89ee45f6662f03b77dc604ff1a169671 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Tue, 17 Sep 2019 19:16:17 +0200 +Subject: [PATCH] ARM: dts: bcm283x: Define MMC interfaces at board + level + +commit e7774049ff255c8ba72bcee9c7ab307a95e8d7bc upstream. + +Starting with RPi 4 this is the first board, which doesn't use sdhost +as default SD interface. So the MMC interfaces should be defined finally at +board level. Since all boards using sdhci already does this, we can drop the +pinctrl part from bcm2835-rpi.dtsi. + +Signed-off-by: Stefan Wahren +Acked-by: Eric Anholt +--- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 13 ------------- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 7 +++++++ + 10 files changed, 63 insertions(+), 13 deletions(-) + +--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +@@ -108,6 +108,13 @@ + status = "okay"; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts +@@ -103,6 +103,13 @@ + status = "okay"; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +@@ -110,6 +110,13 @@ + status = "okay"; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +@@ -103,6 +103,13 @@ + status = "okay"; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts +@@ -98,6 +98,13 @@ + status = "okay"; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +@@ -81,6 +81,13 @@ + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +@@ -129,6 +129,13 @@ + }; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>; +--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts +@@ -105,6 +105,13 @@ + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; +--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi +@@ -84,19 +84,6 @@ + status = "okay"; + }; + +-&sdhci { +- pinctrl-names = "default"; +- pinctrl-0 = <&emmc_gpio48>; +- bus-width = <4>; +-}; +- +-&sdhost { +- pinctrl-names = "default"; +- pinctrl-0 = <&sdhost_gpio48>; +- status = "okay"; +- bus-width = <4>; +-}; +- + &usb { + power-domains = <&power RPI_POWER_DOMAIN_USB>; + }; +--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +@@ -48,6 +48,13 @@ + status = "okay"; + }; + ++&sdhost { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdhost_gpio48>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; diff --git a/target/linux/brcm2708/patches-4.19/950-0713-ARM-dts-bcm2835-rpi-zero-w-Fix-bus-width-of-sdhci.patch b/target/linux/brcm2708/patches-4.19/950-0713-ARM-dts-bcm2835-rpi-zero-w-Fix-bus-width-of-sdhci.patch new file mode 100644 index 0000000000..06dd01329f --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0713-ARM-dts-bcm2835-rpi-zero-w-Fix-bus-width-of-sdhci.patch @@ -0,0 +1,28 @@ +From c60d699be1eb26a14157cfa5b1ac0cf8afce0dcb Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Mon, 23 Sep 2019 19:41:33 +0200 +Subject: [PATCH] ARM: dts: bcm2835-rpi-zero-w: Fix bus-width of sdhci + +The commit e7774049ff25 ("ARM: dts: bcm283x: Define MMC interfaces at +board level") accidently dropped the bus width for the sdhci on the +RPi Zero W, because the board file was relying on the defaults +from bcm2835-rpi.dtsi. So fix this performance regression by adding +the bus width to the board file. + +Fixes: e7774049ff25 ("ARM: dts: bcm283x: Define MMC interfaces at board level") +Reported-by: Phil Elwell +Signed-off-by: Stefan Wahren +--- + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +@@ -119,6 +119,7 @@ + #address-cells = <1>; + #size-cells = <0>; + pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; ++ bus-width = <4>; + mmc-pwrseq = <&wifi_pwrseq>; + non-removable; + status = "okay"; diff --git a/target/linux/brcm2708/patches-4.19/950-0714-ARM-dts-bcm2708-rpi-Define-the-downstream-HDMI-power.patch b/target/linux/brcm2708/patches-4.19/950-0714-ARM-dts-bcm2708-rpi-Define-the-downstream-HDMI-power.patch new file mode 100644 index 0000000000..764169fc62 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0714-ARM-dts-bcm2708-rpi-Define-the-downstream-HDMI-power.patch @@ -0,0 +1,24 @@ +From 51908b138907d25df02687c514d59373b2a32f18 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sat, 21 Sep 2019 15:55:19 +0200 +Subject: [PATCH] ARM: dts: bcm2708-rpi: Define the downstream HDMI + power at one place + +In order to keep downstream definition of the HDMI power domain separate +and independent from upstream changes, add them to bcm2708-rpi.dtsi. + +Signed-off-by: Stefan Wahren +--- + arch/arm/boot/dts/bcm2708-rpi.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi +@@ -102,6 +102,7 @@ + }; + + &hdmi { ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; + status = "disabled"; + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0715-ARM-dts-bcm283x-Enable-HDMI-at-board-level.patch b/target/linux/brcm2708/patches-4.19/950-0715-ARM-dts-bcm283x-Enable-HDMI-at-board-level.patch new file mode 100644 index 0000000000..82e126e8ff --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0715-ARM-dts-bcm283x-Enable-HDMI-at-board-level.patch @@ -0,0 +1,163 @@ +From a3cbeaaee57b7bda4e921bb2cff649fb56c0292d Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Tue, 17 Sep 2019 19:31:19 +0200 +Subject: [PATCH] ARM: dts: bcm283x: Enable HDMI at board level + +commit 60c833d5664e1b3f71c4471233469790adf505ca upstream. + +There might be headless setups of the Compute Module without HDMI, +so better enable HDMI at board level. Btw this allows moving HDMI +base definition into upcoming bcm2835-common.dtsi. + +Signed-off-by: Stefan Wahren +Reviewed-by: Eric Anholt +--- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 ++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 ----- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 ++ + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 ++ + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 ++ + 12 files changed, 22 insertions(+), 5 deletions(-) + +--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +@@ -100,6 +100,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts +@@ -95,6 +95,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +@@ -102,6 +102,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +@@ -95,6 +95,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts +@@ -90,6 +90,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +@@ -79,6 +79,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &sdhost { +--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +@@ -113,6 +113,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &sdhci { +--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts +@@ -103,6 +103,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &sdhost { +--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi +@@ -92,11 +92,6 @@ + power-domains = <&power RPI_POWER_DOMAIN_V3D>; + }; + +-&hdmi { +- power-domains = <&power RPI_POWER_DOMAIN_HDMI>; +- status = "okay"; +-}; +- + &vec { + power-domains = <&power RPI_POWER_DOMAIN_VEC>; + status = "okay"; +--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +@@ -40,6 +40,8 @@ + + &hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +@@ -54,6 +54,8 @@ + + &hdmi { + hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + &pwm { +--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts ++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +@@ -56,6 +56,8 @@ + + &hdmi { + hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>; ++ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; ++ status = "okay"; + }; + + /* uart0 communicates with the BT module */ diff --git a/target/linux/brcm2708/patches-4.19/950-0716-clk-bcm2835-Introduce-SoC-specific-clock-registratio.patch b/target/linux/brcm2708/patches-4.19/950-0716-clk-bcm2835-Introduce-SoC-specific-clock-registratio.patch new file mode 100644 index 0000000000..52f716e74d --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0716-clk-bcm2835-Introduce-SoC-specific-clock-registratio.patch @@ -0,0 +1,597 @@ +From 125afc5cf080b29e9114d89f6052fa4a936a3f19 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Thu, 19 Sep 2019 20:12:15 +0200 +Subject: [PATCH] clk: bcm2835: Introduce SoC specific clock + registration + +commit ee0a5a9013b2b2502571a763c3093d400d18191f upstream. + +In order to support SoC specific clocks (e.g. emmc2 for BCM2711), we +extend the description with a SoC support flag. This approach avoids long +and mostly redundant lists of clock IDs. Since PLLH is specific to +BCM2835, we register only rest of the clocks as common to all SoC. + +Suggested-by: Florian Fainelli +Signed-off-by: Stefan Wahren +Reviewed-by: Matthias Brugger +Acked-by: Eric Anholt +Reviewed-by: Eric Anholt +--- + drivers/clk/bcm/clk-bcm2835.c | 115 +++++++++++++++++++++++++++++----- + 1 file changed, 98 insertions(+), 17 deletions(-) + +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -40,7 +40,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -301,6 +301,9 @@ + + #define VCMSG_ID_CORE_CLOCK 4 + ++#define SOC_BCM2835 BIT(0) ++#define SOC_ALL (SOC_BCM2835) ++ + /* + * Names of clocks used within the driver that need to be replaced + * with an external parent's name. This array is in the order that +@@ -333,6 +336,10 @@ struct bcm2835_cprman { + struct clk_hw_onecell_data onecell; + }; + ++struct cprman_plat_data { ++ unsigned int soc; ++}; ++ + static inline void cprman_write(struct bcm2835_cprman *cprman, u32 reg, u32 val) + { + writel(CM_PASSWORD | val, cprman->regs + reg); +@@ -1528,22 +1535,28 @@ typedef struct clk_hw *(*bcm2835_clk_reg + const void *data); + struct bcm2835_clk_desc { + bcm2835_clk_register clk_register; ++ unsigned int supported; + const void *data; + }; + + /* assignment helper macros for different clock types */ +-#define _REGISTER(f, ...) { .clk_register = (bcm2835_clk_register)f, \ +- .data = __VA_ARGS__ } +-#define REGISTER_PLL(...) _REGISTER(&bcm2835_register_pll, \ ++#define _REGISTER(f, s, ...) { .clk_register = (bcm2835_clk_register)f, \ ++ .supported = s, \ ++ .data = __VA_ARGS__ } ++#define REGISTER_PLL(s, ...) _REGISTER(&bcm2835_register_pll, \ ++ s, \ + &(struct bcm2835_pll_data) \ + {__VA_ARGS__}) +-#define REGISTER_PLL_DIV(...) _REGISTER(&bcm2835_register_pll_divider, \ +- &(struct bcm2835_pll_divider_data) \ +- {__VA_ARGS__}) +-#define REGISTER_CLK(...) _REGISTER(&bcm2835_register_clock, \ ++#define REGISTER_PLL_DIV(s, ...) _REGISTER(&bcm2835_register_pll_divider, \ ++ s, \ ++ &(struct bcm2835_pll_divider_data) \ ++ {__VA_ARGS__}) ++#define REGISTER_CLK(s, ...) _REGISTER(&bcm2835_register_clock, \ ++ s, \ + &(struct bcm2835_clock_data) \ + {__VA_ARGS__}) +-#define REGISTER_GATE(...) _REGISTER(&bcm2835_register_gate, \ ++#define REGISTER_GATE(s, ...) _REGISTER(&bcm2835_register_gate, \ ++ s, \ + &(struct bcm2835_gate_data) \ + {__VA_ARGS__}) + +@@ -1557,7 +1570,8 @@ static const char *const bcm2835_clock_o + "testdebug1" + }; + +-#define REGISTER_OSC_CLK(...) REGISTER_CLK( \ ++#define REGISTER_OSC_CLK(s, ...) REGISTER_CLK( \ ++ s, \ + .num_mux_parents = ARRAY_SIZE(bcm2835_clock_osc_parents), \ + .parents = bcm2835_clock_osc_parents, \ + __VA_ARGS__) +@@ -1574,7 +1588,8 @@ static const char *const bcm2835_clock_p + "pllh_aux", + }; + +-#define REGISTER_PER_CLK(...) REGISTER_CLK( \ ++#define REGISTER_PER_CLK(s, ...) REGISTER_CLK( \ ++ s, \ + .num_mux_parents = ARRAY_SIZE(bcm2835_clock_per_parents), \ + .parents = bcm2835_clock_per_parents, \ + __VA_ARGS__) +@@ -1599,7 +1614,8 @@ static const char *const bcm2835_pcm_per + "-", + }; + +-#define REGISTER_PCM_CLK(...) REGISTER_CLK( \ ++#define REGISTER_PCM_CLK(s, ...) REGISTER_CLK( \ ++ s, \ + .num_mux_parents = ARRAY_SIZE(bcm2835_pcm_per_parents), \ + .parents = bcm2835_pcm_per_parents, \ + __VA_ARGS__) +@@ -1618,7 +1634,8 @@ static const char *const bcm2835_clock_v + "pllc_core2", + }; + +-#define REGISTER_VPU_CLK(...) REGISTER_CLK( \ ++#define REGISTER_VPU_CLK(s, ...) REGISTER_CLK( \ ++ s, \ + .num_mux_parents = ARRAY_SIZE(bcm2835_clock_vpu_parents), \ + .parents = bcm2835_clock_vpu_parents, \ + __VA_ARGS__) +@@ -1654,12 +1671,14 @@ static const char *const bcm2835_clock_d + "dsi1_byte_inv", + }; + +-#define REGISTER_DSI0_CLK(...) REGISTER_CLK( \ ++#define REGISTER_DSI0_CLK(s, ...) REGISTER_CLK( \ ++ s, \ + .num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi0_parents), \ + .parents = bcm2835_clock_dsi0_parents, \ + __VA_ARGS__) + +-#define REGISTER_DSI1_CLK(...) REGISTER_CLK( \ ++#define REGISTER_DSI1_CLK(s, ...) REGISTER_CLK( \ ++ s, \ + .num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi1_parents), \ + .parents = bcm2835_clock_dsi1_parents, \ + __VA_ARGS__) +@@ -1679,6 +1698,7 @@ static const struct bcm2835_clk_desc clk + * AUDIO domain is on. + */ + [BCM2835_PLLA] = REGISTER_PLL( ++ SOC_ALL, + .name = "plla", + .cm_ctrl_reg = CM_PLLA, + .a2w_ctrl_reg = A2W_PLLA_CTRL, +@@ -1693,6 +1713,7 @@ static const struct bcm2835_clk_desc clk + .max_rate = 2400000000u, + .max_fb_rate = BCM2835_MAX_FB_RATE), + [BCM2835_PLLA_CORE] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plla_core", + .source_pll = "plla", + .cm_reg = CM_PLLA, +@@ -1702,6 +1723,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLA_PER] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plla_per", + .source_pll = "plla", + .cm_reg = CM_PLLA, +@@ -1711,6 +1733,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plla_dsi0", + .source_pll = "plla", + .cm_reg = CM_PLLA, +@@ -1719,6 +1742,7 @@ static const struct bcm2835_clk_desc clk + .hold_mask = CM_PLLA_HOLDDSI0, + .fixed_divider = 1), + [BCM2835_PLLA_CCP2] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plla_ccp2", + .source_pll = "plla", + .cm_reg = CM_PLLA, +@@ -1730,6 +1754,7 @@ static const struct bcm2835_clk_desc clk + + /* PLLB is used for the ARM's clock. */ + [BCM2835_PLLB] = REGISTER_PLL( ++ SOC_ALL, + .name = "pllb", + .cm_ctrl_reg = CM_PLLB, + .a2w_ctrl_reg = A2W_PLLB_CTRL, +@@ -1744,6 +1769,7 @@ static const struct bcm2835_clk_desc clk + .max_rate = 3000000000u, + .max_fb_rate = BCM2835_MAX_FB_RATE), + [BCM2835_PLLB_ARM] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "pllb_arm", + .source_pll = "pllb", + .cm_reg = CM_PLLB, +@@ -1760,6 +1786,7 @@ static const struct bcm2835_clk_desc clk + * AUDIO domain is on. + */ + [BCM2835_PLLC] = REGISTER_PLL( ++ SOC_ALL, + .name = "pllc", + .cm_ctrl_reg = CM_PLLC, + .a2w_ctrl_reg = A2W_PLLC_CTRL, +@@ -1774,6 +1801,7 @@ static const struct bcm2835_clk_desc clk + .max_rate = 3000000000u, + .max_fb_rate = BCM2835_MAX_FB_RATE), + [BCM2835_PLLC_CORE0] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "pllc_core0", + .source_pll = "pllc", + .cm_reg = CM_PLLC, +@@ -1783,6 +1811,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLC_CORE1] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "pllc_core1", + .source_pll = "pllc", + .cm_reg = CM_PLLC, +@@ -1792,6 +1821,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLC_CORE2] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "pllc_core2", + .source_pll = "pllc", + .cm_reg = CM_PLLC, +@@ -1801,6 +1831,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLC_PER] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "pllc_per", + .source_pll = "pllc", + .cm_reg = CM_PLLC, +@@ -1817,6 +1848,7 @@ static const struct bcm2835_clk_desc clk + * AUDIO domain is on. + */ + [BCM2835_PLLD] = REGISTER_PLL( ++ SOC_ALL, + .name = "plld", + .cm_ctrl_reg = CM_PLLD, + .a2w_ctrl_reg = A2W_PLLD_CTRL, +@@ -1831,6 +1863,7 @@ static const struct bcm2835_clk_desc clk + .max_rate = 2400000000u, + .max_fb_rate = BCM2835_MAX_FB_RATE), + [BCM2835_PLLD_CORE] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plld_core", + .source_pll = "plld", + .cm_reg = CM_PLLD, +@@ -1840,6 +1873,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLD_PER] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plld_per", + .source_pll = "plld", + .cm_reg = CM_PLLD, +@@ -1849,6 +1883,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLD_DSI0] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plld_dsi0", + .source_pll = "plld", + .cm_reg = CM_PLLD, +@@ -1857,6 +1892,7 @@ static const struct bcm2835_clk_desc clk + .hold_mask = CM_PLLD_HOLDDSI0, + .fixed_divider = 1), + [BCM2835_PLLD_DSI1] = REGISTER_PLL_DIV( ++ SOC_ALL, + .name = "plld_dsi1", + .source_pll = "plld", + .cm_reg = CM_PLLD, +@@ -1872,6 +1908,7 @@ static const struct bcm2835_clk_desc clk + * It is in the HDMI power domain. + */ + [BCM2835_PLLH] = REGISTER_PLL( ++ SOC_BCM2835, + "pllh", + .cm_ctrl_reg = CM_PLLH, + .a2w_ctrl_reg = A2W_PLLH_CTRL, +@@ -1886,6 +1923,7 @@ static const struct bcm2835_clk_desc clk + .max_rate = 3000000000u, + .max_fb_rate = BCM2835_MAX_FB_RATE), + [BCM2835_PLLH_RCAL] = REGISTER_PLL_DIV( ++ SOC_BCM2835, + .name = "pllh_rcal", + .source_pll = "pllh", + .cm_reg = CM_PLLH, +@@ -1895,6 +1933,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 10, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLH_AUX] = REGISTER_PLL_DIV( ++ SOC_BCM2835, + .name = "pllh_aux", + .source_pll = "pllh", + .cm_reg = CM_PLLH, +@@ -1904,6 +1943,7 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + [BCM2835_PLLH_PIX] = REGISTER_PLL_DIV( ++ SOC_BCM2835, + .name = "pllh_pix", + .source_pll = "pllh", + .cm_reg = CM_PLLH, +@@ -1919,6 +1959,7 @@ static const struct bcm2835_clk_desc clk + + /* One Time Programmable Memory clock. Maximum 10Mhz. */ + [BCM2835_CLOCK_OTP] = REGISTER_OSC_CLK( ++ SOC_ALL, + .name = "otp", + .ctl_reg = CM_OTPCTL, + .div_reg = CM_OTPDIV, +@@ -1930,6 +1971,7 @@ static const struct bcm2835_clk_desc clk + * bythe watchdog timer and the camera pulse generator. + */ + [BCM2835_CLOCK_TIMER] = REGISTER_OSC_CLK( ++ SOC_ALL, + .name = "timer", + .ctl_reg = CM_TIMERCTL, + .div_reg = CM_TIMERDIV, +@@ -1940,12 +1982,14 @@ static const struct bcm2835_clk_desc clk + * Generally run at 2Mhz, max 5Mhz. + */ + [BCM2835_CLOCK_TSENS] = REGISTER_OSC_CLK( ++ SOC_ALL, + .name = "tsens", + .ctl_reg = CM_TSENSCTL, + .div_reg = CM_TSENSDIV, + .int_bits = 5, + .frac_bits = 0), + [BCM2835_CLOCK_TEC] = REGISTER_OSC_CLK( ++ SOC_ALL, + .name = "tec", + .ctl_reg = CM_TECCTL, + .div_reg = CM_TECDIV, +@@ -1954,6 +1998,7 @@ static const struct bcm2835_clk_desc clk + + /* clocks with vpu parent mux */ + [BCM2835_CLOCK_H264] = REGISTER_VPU_CLK( ++ SOC_ALL, + .name = "h264", + .ctl_reg = CM_H264CTL, + .div_reg = CM_H264DIV, +@@ -1961,6 +2006,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 1), + [BCM2835_CLOCK_ISP] = REGISTER_VPU_CLK( ++ SOC_ALL, + .name = "isp", + .ctl_reg = CM_ISPCTL, + .div_reg = CM_ISPDIV, +@@ -1973,6 +2019,7 @@ static const struct bcm2835_clk_desc clk + * in the SDRAM controller can't be used. + */ + [BCM2835_CLOCK_SDRAM] = REGISTER_VPU_CLK( ++ SOC_ALL, + .name = "sdram", + .ctl_reg = CM_SDCCTL, + .div_reg = CM_SDCDIV, +@@ -1980,6 +2027,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 0, + .tcnt_mux = 3), + [BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK( ++ SOC_ALL, + .name = "v3d", + .ctl_reg = CM_V3DCTL, + .div_reg = CM_V3DDIV, +@@ -1993,6 +2041,7 @@ static const struct bcm2835_clk_desc clk + * in various hardware documentation. + */ + [BCM2835_CLOCK_VPU] = REGISTER_VPU_CLK( ++ SOC_ALL, + .name = "vpu", + .ctl_reg = CM_VPUCTL, + .div_reg = CM_VPUDIV, +@@ -2004,6 +2053,7 @@ static const struct bcm2835_clk_desc clk + + /* clocks with per parent mux */ + [BCM2835_CLOCK_AVEO] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "aveo", + .ctl_reg = CM_AVEOCTL, + .div_reg = CM_AVEODIV, +@@ -2011,6 +2061,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 0, + .tcnt_mux = 38), + [BCM2835_CLOCK_CAM0] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "cam0", + .ctl_reg = CM_CAM0CTL, + .div_reg = CM_CAM0DIV, +@@ -2018,6 +2069,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 14), + [BCM2835_CLOCK_CAM1] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "cam1", + .ctl_reg = CM_CAM1CTL, + .div_reg = CM_CAM1DIV, +@@ -2025,12 +2077,14 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 15), + [BCM2835_CLOCK_DFT] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "dft", + .ctl_reg = CM_DFTCTL, + .div_reg = CM_DFTDIV, + .int_bits = 5, + .frac_bits = 0), + [BCM2835_CLOCK_DPI] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "dpi", + .ctl_reg = CM_DPICTL, + .div_reg = CM_DPIDIV, +@@ -2040,6 +2094,7 @@ static const struct bcm2835_clk_desc clk + + /* Arasan EMMC clock */ + [BCM2835_CLOCK_EMMC] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "emmc", + .ctl_reg = CM_EMMCCTL, + .div_reg = CM_EMMCDIV, +@@ -2049,6 +2104,7 @@ static const struct bcm2835_clk_desc clk + + /* General purpose (GPIO) clocks */ + [BCM2835_CLOCK_GP0] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "gp0", + .ctl_reg = CM_GP0CTL, + .div_reg = CM_GP0DIV, +@@ -2057,6 +2113,7 @@ static const struct bcm2835_clk_desc clk + .is_mash_clock = true, + .tcnt_mux = 20), + [BCM2835_CLOCK_GP1] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "gp1", + .ctl_reg = CM_GP1CTL, + .div_reg = CM_GP1DIV, +@@ -2066,6 +2123,7 @@ static const struct bcm2835_clk_desc clk + .is_mash_clock = true, + .tcnt_mux = 21), + [BCM2835_CLOCK_GP2] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "gp2", + .ctl_reg = CM_GP2CTL, + .div_reg = CM_GP2DIV, +@@ -2075,6 +2133,7 @@ static const struct bcm2835_clk_desc clk + + /* HDMI state machine */ + [BCM2835_CLOCK_HSM] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "hsm", + .ctl_reg = CM_HSMCTL, + .div_reg = CM_HSMDIV, +@@ -2082,6 +2141,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 22), + [BCM2835_CLOCK_PCM] = REGISTER_PCM_CLK( ++ SOC_ALL, + .name = "pcm", + .ctl_reg = CM_PCMCTL, + .div_reg = CM_PCMDIV, +@@ -2091,6 +2151,7 @@ static const struct bcm2835_clk_desc clk + .low_jitter = true, + .tcnt_mux = 23), + [BCM2835_CLOCK_PWM] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "pwm", + .ctl_reg = CM_PWMCTL, + .div_reg = CM_PWMDIV, +@@ -2099,6 +2160,7 @@ static const struct bcm2835_clk_desc clk + .is_mash_clock = true, + .tcnt_mux = 24), + [BCM2835_CLOCK_SLIM] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "slim", + .ctl_reg = CM_SLIMCTL, + .div_reg = CM_SLIMDIV, +@@ -2107,6 +2169,7 @@ static const struct bcm2835_clk_desc clk + .is_mash_clock = true, + .tcnt_mux = 25), + [BCM2835_CLOCK_SMI] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "smi", + .ctl_reg = CM_SMICTL, + .div_reg = CM_SMIDIV, +@@ -2114,6 +2177,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 27), + [BCM2835_CLOCK_UART] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "uart", + .ctl_reg = CM_UARTCTL, + .div_reg = CM_UARTDIV, +@@ -2123,6 +2187,7 @@ static const struct bcm2835_clk_desc clk + + /* TV encoder clock. Only operating frequency is 108Mhz. */ + [BCM2835_CLOCK_VEC] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "vec", + .ctl_reg = CM_VECCTL, + .div_reg = CM_VECDIV, +@@ -2137,6 +2202,7 @@ static const struct bcm2835_clk_desc clk + + /* dsi clocks */ + [BCM2835_CLOCK_DSI0E] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "dsi0e", + .ctl_reg = CM_DSI0ECTL, + .div_reg = CM_DSI0EDIV, +@@ -2144,6 +2210,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 18), + [BCM2835_CLOCK_DSI1E] = REGISTER_PER_CLK( ++ SOC_ALL, + .name = "dsi1e", + .ctl_reg = CM_DSI1ECTL, + .div_reg = CM_DSI1EDIV, +@@ -2151,6 +2218,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 19), + [BCM2835_CLOCK_DSI0P] = REGISTER_DSI0_CLK( ++ SOC_ALL, + .name = "dsi0p", + .ctl_reg = CM_DSI0PCTL, + .div_reg = CM_DSI0PDIV, +@@ -2158,6 +2226,7 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 0, + .tcnt_mux = 12), + [BCM2835_CLOCK_DSI1P] = REGISTER_DSI1_CLK( ++ SOC_ALL, + .name = "dsi1p", + .ctl_reg = CM_DSI1PCTL, + .div_reg = CM_DSI1PDIV, +@@ -2174,6 +2243,7 @@ static const struct bcm2835_clk_desc clk + * non-stop vpu clock. + */ + [BCM2835_CLOCK_PERI_IMAGE] = REGISTER_GATE( ++ SOC_ALL, + .name = "peri_image", + .parent = "vpu", + .ctl_reg = CM_PERIICTL), +@@ -2221,11 +2291,16 @@ static int bcm2835_clk_probe(struct plat + struct resource *res; + const struct bcm2835_clk_desc *desc; + const size_t asize = ARRAY_SIZE(clk_desc_array); ++ const struct cprman_plat_data *pdata; + struct device_node *fw_node; + size_t i; + u32 clk_id; + int ret; + ++ pdata = of_device_get_match_data(&pdev->dev); ++ if (!pdata) ++ return -ENODEV; ++ + cprman = devm_kzalloc(dev, + struct_size(cprman, onecell.hws, asize), + GFP_KERNEL); +@@ -2276,8 +2351,10 @@ static int bcm2835_clk_probe(struct plat + + for (i = 0; i < asize; i++) { + desc = &clk_desc_array[i]; +- if (desc->clk_register && desc->data) ++ if (desc->clk_register && desc->data && ++ (desc->supported & pdata->soc)) { + hws[i] = desc->clk_register(cprman, desc->data); ++ } + } + + ret = bcm2835_mark_sdc_parent_critical(hws[BCM2835_CLOCK_SDRAM]->clk); +@@ -2295,8 +2372,12 @@ static int bcm2835_clk_probe(struct plat + return 0; + } + ++static const struct cprman_plat_data cprman_bcm2835_plat_data = { ++ .soc = SOC_BCM2835, ++}; ++ + static const struct of_device_id bcm2835_clk_of_match[] = { +- { .compatible = "brcm,bcm2835-cprman", }, ++ { .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data }, + {} + }; + MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); diff --git a/target/linux/brcm2708/patches-4.19/950-0717-clk-bcm2835-Add-BCM2711_CLOCK_EMMC2-support.patch b/target/linux/brcm2708/patches-4.19/950-0717-clk-bcm2835-Add-BCM2711_CLOCK_EMMC2-support.patch new file mode 100644 index 0000000000..8d4b7c9e0b --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0717-clk-bcm2835-Add-BCM2711_CLOCK_EMMC2-support.patch @@ -0,0 +1,91 @@ +From b4c6046e1c55ddf211215191be9ea6316238889b Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Fri, 20 Sep 2019 07:27:03 +0200 +Subject: [PATCH] clk: bcm2835: Add BCM2711_CLOCK_EMMC2 support + +commit 42de9ad400afadd41ee027b5feef234a2d2918b9 upstream. + +The new BCM2711 supports an additional clock for the emmc2 block. +So add a new compatible and register this clock only for BCM2711. + +Signed-off-by: Stefan Wahren +Reviewed-by: Matthias Brugger +Acked-by: Eric Anholt +Reviewed-by: Eric Anholt +--- + arch/arm/boot/dts/bcm2838.dtsi | 1 + + drivers/clk/bcm/clk-bcm2835.c | 20 +++++++++++++++++++- + include/dt-bindings/clock/bcm2835.h | 2 ++ + 3 files changed, 22 insertions(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/bcm2838.dtsi ++++ b/arch/arm/boot/dts/bcm2838.dtsi +@@ -210,7 +210,7 @@ + compatible = "brcm,bcm2711-emmc2"; + status = "okay"; + interrupts = ; +- clocks = <&clocks BCM2838_CLOCK_EMMC2>; ++ clocks = <&clocks BCM2711_CLOCK_EMMC2>; + reg = <0x7e340000 0x100>; + }; + +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -124,6 +124,8 @@ + #define CM_AVEODIV 0x1bc + #define CM_EMMCCTL 0x1c0 + #define CM_EMMCDIV 0x1c4 ++#define CM_EMMC2CTL 0x1d0 ++#define CM_EMMC2DIV 0x1d4 + + /* General bits for the CM_*CTL regs */ + # define CM_ENABLE BIT(4) +@@ -302,7 +304,8 @@ + #define VCMSG_ID_CORE_CLOCK 4 + + #define SOC_BCM2835 BIT(0) +-#define SOC_ALL (SOC_BCM2835) ++#define SOC_BCM2711 BIT(1) ++#define SOC_ALL (SOC_BCM2835 | SOC_BCM2711) + + /* + * Names of clocks used within the driver that need to be replaced +@@ -2102,6 +2105,16 @@ static const struct bcm2835_clk_desc clk + .frac_bits = 8, + .tcnt_mux = 39), + ++ /* EMMC2 clock (only available for BCM2711) */ ++ [BCM2711_CLOCK_EMMC2] = REGISTER_PER_CLK( ++ SOC_BCM2711, ++ .name = "emmc2", ++ .ctl_reg = CM_EMMC2CTL, ++ .div_reg = CM_EMMC2DIV, ++ .int_bits = 4, ++ .frac_bits = 8, ++ .tcnt_mux = 42), ++ + /* General purpose (GPIO) clocks */ + [BCM2835_CLOCK_GP0] = REGISTER_PER_CLK( + SOC_ALL, +@@ -2376,8 +2389,13 @@ static const struct cprman_plat_data cpr + .soc = SOC_BCM2835, + }; + ++static const struct cprman_plat_data cprman_bcm2711_plat_data = { ++ .soc = SOC_BCM2711, ++}; ++ + static const struct of_device_id bcm2835_clk_of_match[] = { + { .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data }, ++ { .compatible = "brcm,bcm2711-cprman", .data = &cprman_bcm2711_plat_data }, + {} + }; + MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); +--- a/include/dt-bindings/clock/bcm2835.h ++++ b/include/dt-bindings/clock/bcm2835.h +@@ -66,3 +66,5 @@ + #define BCM2835_CLOCK_DSI1E 48 + #define BCM2835_CLOCK_DSI0P 49 + #define BCM2835_CLOCK_DSI1P 50 ++ ++#define BCM2711_CLOCK_EMMC2 51 diff --git a/target/linux/brcm2708/patches-4.19/950-0718-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch b/target/linux/brcm2708/patches-4.19/950-0718-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch new file mode 100644 index 0000000000..eac69b44ac --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0718-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch @@ -0,0 +1,71 @@ +From 30972497979c65781bb8170743447b45b6dfd3cd Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Thu, 19 Sep 2019 20:45:30 +0200 +Subject: [PATCH] ARM: bcm: Switch board, clk and pinctrl to bcm2711 + compatible + +After the decision to use bcm2711 compatible for upstream, we should +switch all accepted compatibles to bcm2711. So we can boot with +one DTB the down- and the upstream kernel. + +Signed-off-by: Stefan Wahren +--- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +- + arch/arm/boot/dts/bcm2838-rpi-4-b.dts | 2 +- + arch/arm/boot/dts/bcm2838.dtsi | 4 ++-- + arch/arm/mach-bcm/board_bcm2835.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +@@ -5,7 +5,7 @@ + #include "bcm283x-rpi-csi1-2lane.dtsi" + + / { +- compatible = "raspberrypi,4-model-b", "brcm,bcm2838"; ++ compatible = "raspberrypi,4-model-b", "brcm,bcm2711"; + model = "Raspberry Pi 4 Model B"; + + memory@0 { +--- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts +@@ -5,7 +5,7 @@ + #include "bcm2838-rpi.dtsi" + + / { +- compatible = "raspberrypi,4-model-b", "brcm,bcm2838"; ++ compatible = "raspberrypi,4-model-b", "brcm,bcm2711"; + model = "Raspberry Pi 4 Model B"; + + chosen { +--- a/arch/arm/boot/dts/bcm2838.dtsi ++++ b/arch/arm/boot/dts/bcm2838.dtsi +@@ -440,7 +440,7 @@ + }; + + &clocks { +- compatible = "brcm,bcm2838-cprman"; ++ compatible = "brcm,bcm2711-cprman"; + }; + + &cpu_thermal { +@@ -456,7 +456,7 @@ + }; + + &gpio { +- compatible = "brcm,bcm2838-gpio", "brcm,bcm2835-gpio"; ++ compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio"; + + gpclk0_gpio49: gpclk0_gpio49 { + brcm,pins = <49>; +--- a/arch/arm/mach-bcm/board_bcm2835.c ++++ b/arch/arm/mach-bcm/board_bcm2835.c +@@ -118,7 +118,7 @@ static const char * const bcm2835_compat + #ifdef CONFIG_ARCH_MULTI_V7 + "brcm,bcm2836", + "brcm,bcm2837", +- "brcm,bcm2838", ++ "brcm,bcm2711", + #endif + NULL + }; diff --git a/target/linux/brcm2708/patches-4.19/950-0719-pinctrl-bcm2835-Switch-to-SPDX-identifier.patch b/target/linux/brcm2708/patches-4.19/950-0719-pinctrl-bcm2835-Switch-to-SPDX-identifier.patch new file mode 100644 index 0000000000..e45c65724a --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0719-pinctrl-bcm2835-Switch-to-SPDX-identifier.patch @@ -0,0 +1,62 @@ +From e60428993b9ba03e2389eeb61c4b5efaa80b9e05 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sat, 10 Nov 2018 17:15:11 +0100 +Subject: [PATCH] pinctrl: bcm2835: Switch to SPDX identifier + +commit a62c36775ba873611b00b82ce7ebcd4ff2126111 upstream. + +Adopt the SPDX license identifier headers to ease license compliance +management. + +Cc: Simon Arlott +Cc: Stephen Warren +Signed-off-by: Stefan Wahren +Reviewed-by: Eric Anholt +Signed-off-by: Linus Walleij +--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 11 +---------- + include/dt-bindings/pinctrl/bcm2835.h | 8 +------- + 2 files changed, 2 insertions(+), 17 deletions(-) + +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -1,3 +1,4 @@ ++// SPDX-License-Identifier: GPL-2.0+ + /* + * Driver for Broadcom BCM2835 GPIO unit (pinctrl + GPIO) + * +@@ -6,16 +7,6 @@ + * This driver is inspired by: + * pinctrl-nomadik.c, please see original file for copyright information + * pinctrl-tegra.c, please see original file for copyright information +- * +- * 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. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. + */ + + #include +--- a/include/dt-bindings/pinctrl/bcm2835.h ++++ b/include/dt-bindings/pinctrl/bcm2835.h +@@ -1,14 +1,8 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ + /* + * Header providing constants for bcm2835 pinctrl bindings. + * + * Copyright (C) 2015 Stefan Wahren +- * +- * The code contained herein is licensed under the GNU General Public +- * License. You may obtain a copy of the GNU General Public License +- * Version 2 at the following locations: +- * +- * http://www.opensource.org/licenses/gpl-license.html +- * http://www.gnu.org/copyleft/gpl.html + */ + + #ifndef __DT_BINDINGS_PINCTRL_BCM2835_H__ diff --git a/target/linux/brcm2708/patches-4.19/950-0720-pinctrl-bcm2835-declare-pin-config-as-generic.patch b/target/linux/brcm2708/patches-4.19/950-0720-pinctrl-bcm2835-declare-pin-config-as-generic.patch new file mode 100644 index 0000000000..d1ffc9b877 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0720-pinctrl-bcm2835-declare-pin-config-as-generic.patch @@ -0,0 +1,27 @@ +From 2729832886181a4f8bfe1e2c028a7bdb92004ce7 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sun, 3 Feb 2019 14:02:33 +0100 +Subject: [PATCH] pinctrl: bcm2835: declare pin config as generic + +commit 1cb66f080c27349fbf87fb327d587b4b0b624fa3 upstream. + +Since commit 0de704955ee44 ("pinctrl: bcm2835: Add support for +generic pinctrl binding") this driver is capable to use the generic +interface. So declare this accordingly. + +Signed-off-by: Stefan Wahren +Signed-off-by: Linus Walleij +--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -969,6 +969,7 @@ static int bcm2835_pinconf_set(struct pi + } + + static const struct pinconf_ops bcm2835_pinconf_ops = { ++ .is_generic = true, + .pin_config_get = bcm2835_pinconf_get, + .pin_config_set = bcm2835_pinconf_set, + }; diff --git a/target/linux/brcm2708/patches-4.19/950-0721-pinctrl-bcm2835-Direct-GPIO-config-changes-to-generi.patch b/target/linux/brcm2708/patches-4.19/950-0721-pinctrl-bcm2835-Direct-GPIO-config-changes-to-generi.patch new file mode 100644 index 0000000000..e3d23010b9 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0721-pinctrl-bcm2835-Direct-GPIO-config-changes-to-generi.patch @@ -0,0 +1,37 @@ +From 289685a9b369bda990c4f22bbc7659ad492e6dbb Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sun, 3 Feb 2019 14:02:34 +0100 +Subject: [PATCH] pinctrl: bcm2835: Direct GPIO config changes to + generic pinctrl + +commit b6e5531c0f80de2779c87d0235b4fde5310a83b5 upstream. + +In order to support GPIO config changes direct these to the generic pinctrl. +This also requires an adjust of the return code for unsupported parameter +otherwise gpiod_configure_flags wont work as expected. + +Signed-off-by: Stefan Wahren +Signed-off-by: Linus Walleij +--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -342,6 +342,7 @@ static const struct gpio_chip bcm2835_gp + .get = bcm2835_gpio_get, + .set = bcm2835_gpio_set, + .base = 0, ++ .set_config = gpiochip_generic_config, + .ngpio = BCM2835_NUM_GPIOS, + .can_sleep = false, + }; +@@ -960,7 +961,7 @@ static int bcm2835_pinconf_set(struct pi + break; + + default: +- return -EINVAL; ++ return -ENOTSUPP; + + } /* switch param type */ + } /* for each config */ diff --git a/target/linux/brcm2708/patches-4.19/950-0722-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch b/target/linux/brcm2708/patches-4.19/950-0722-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch new file mode 100644 index 0000000000..e06247753d --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0722-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch @@ -0,0 +1,183 @@ +From 268bd5b5557ccb0ac4eae998ad7c6261c240b89b Mon Sep 17 00:00:00 2001 +From: Stefan Wahren +Date: Sun, 21 Jul 2019 16:01:36 +0200 +Subject: [PATCH] pinctrl: bcm2835: Add support for BCM2711 pull-up + functionality + +commit e38a9a437fb93ddafab5030165e4c6a3a5021669 upstream. + +The BCM2711 has a new way of selecting the pull-up/pull-down setting +for a GPIO pin. The registers used for the BCM2835, GP_PUD and +GP_PUDCLKn0, are no longer connected. A new set of registers, +GP_GPIO_PUP_PDN_CNTRL_REGx must be used. This commit will add +a new compatible string "brcm,bcm2711-gpio" and the kernel +driver will use it to select which method is used to select +pull-up/pull-down. + +This patch based on a patch by Al Cooper which was intended for the +BCM7211. This is a bugfixed and improved version. + +Signed-off-by: Stefan Wahren +Acked-by: Eric Anholt +--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 105 ++++++++++++++++++++++++-- + 1 file changed, 100 insertions(+), 5 deletions(-) + +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -57,15 +57,24 @@ + #define GPAFEN0 0x88 /* Pin Async Falling Edge Detect */ + #define GPPUD 0x94 /* Pin Pull-up/down Enable */ + #define GPPUDCLK0 0x98 /* Pin Pull-up/down Enable Clock */ ++#define GP_GPIO_PUP_PDN_CNTRL_REG0 0xe4 /* 2711 Pin Pull-up/down select */ + + #define FSEL_REG(p) (GPFSEL0 + (((p) / 10) * 4)) + #define FSEL_SHIFT(p) (((p) % 10) * 3) + #define GPIO_REG_OFFSET(p) ((p) / 32) + #define GPIO_REG_SHIFT(p) ((p) % 32) + ++#define PUD_2711_MASK 0x3 ++#define PUD_2711_REG_OFFSET(p) ((p) / 16) ++#define PUD_2711_REG_SHIFT(p) (((p) % 16) * 2) ++ + /* argument: bcm2835_pinconf_pull */ + #define BCM2835_PINCONF_PARAM_PULL (PIN_CONFIG_END + 1) + ++#define BCM2711_PULL_NONE 0x0 ++#define BCM2711_PULL_UP 0x1 ++#define BCM2711_PULL_DOWN 0x2 ++ + struct bcm2835_pinctrl { + struct device *dev; + void __iomem *base; +@@ -975,6 +984,77 @@ static const struct pinconf_ops bcm2835_ + .pin_config_set = bcm2835_pinconf_set, + }; + ++static void bcm2711_pull_config_set(struct bcm2835_pinctrl *pc, ++ unsigned int pin, unsigned int arg) ++{ ++ u32 shifter; ++ u32 value; ++ u32 off; ++ ++ off = PUD_2711_REG_OFFSET(pin); ++ shifter = PUD_2711_REG_SHIFT(pin); ++ ++ value = bcm2835_gpio_rd(pc, GP_GPIO_PUP_PDN_CNTRL_REG0 + (off * 4)); ++ value &= ~(PUD_2711_MASK << shifter); ++ value |= (arg << shifter); ++ bcm2835_gpio_wr(pc, GP_GPIO_PUP_PDN_CNTRL_REG0 + (off * 4), value); ++} ++ ++static int bcm2711_pinconf_set(struct pinctrl_dev *pctldev, ++ unsigned int pin, unsigned long *configs, ++ unsigned int num_configs) ++{ ++ struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev); ++ u32 param, arg; ++ int i; ++ ++ for (i = 0; i < num_configs; i++) { ++ param = pinconf_to_config_param(configs[i]); ++ arg = pinconf_to_config_argument(configs[i]); ++ ++ switch (param) { ++ /* convert legacy brcm,pull */ ++ case BCM2835_PINCONF_PARAM_PULL: ++ if (arg == BCM2835_PUD_UP) ++ arg = BCM2711_PULL_UP; ++ else if (arg == BCM2835_PUD_DOWN) ++ arg = BCM2711_PULL_DOWN; ++ else ++ arg = BCM2711_PULL_NONE; ++ ++ bcm2711_pull_config_set(pc, pin, arg); ++ break; ++ ++ /* Set pull generic bindings */ ++ case PIN_CONFIG_BIAS_DISABLE: ++ bcm2711_pull_config_set(pc, pin, BCM2711_PULL_NONE); ++ break; ++ case PIN_CONFIG_BIAS_PULL_DOWN: ++ bcm2711_pull_config_set(pc, pin, BCM2711_PULL_DOWN); ++ break; ++ case PIN_CONFIG_BIAS_PULL_UP: ++ bcm2711_pull_config_set(pc, pin, BCM2711_PULL_UP); ++ break; ++ ++ /* Set output-high or output-low */ ++ case PIN_CONFIG_OUTPUT: ++ bcm2835_gpio_set_bit(pc, arg ? GPSET0 : GPCLR0, pin); ++ break; ++ ++ default: ++ return -ENOTSUPP; ++ } ++ } /* for each config */ ++ ++ return 0; ++} ++ ++static const struct pinconf_ops bcm2711_pinconf_ops = { ++ .is_generic = true, ++ .pin_config_get = bcm2835_pinconf_get, ++ .pin_config_set = bcm2711_pinconf_set, ++}; ++ + static struct pinctrl_desc bcm2835_pinctrl_desc = { + .name = MODULE_NAME, + .pins = bcm2835_gpio_pins, +@@ -990,6 +1070,18 @@ static struct pinctrl_gpio_range bcm2835 + .npins = BCM2835_NUM_GPIOS, + }; + ++static const struct of_device_id bcm2835_pinctrl_match[] = { ++ { ++ .compatible = "brcm,bcm2835-gpio", ++ .data = &bcm2835_pinconf_ops, ++ }, ++ { ++ .compatible = "brcm,bcm2711-gpio", ++ .data = &bcm2711_pinconf_ops, ++ }, ++ {} ++}; ++ + static int bcm2835_pinctrl_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; +@@ -997,6 +1089,8 @@ static int bcm2835_pinctrl_probe(struct + struct bcm2835_pinctrl *pc; + struct resource iomem; + int err, i; ++ const struct of_device_id *match; ++ + BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_pins) != BCM2835_NUM_GPIOS); + BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_groups) != BCM2835_NUM_GPIOS); + +@@ -1073,6 +1167,12 @@ static int bcm2835_pinctrl_probe(struct + bcm2835_gpio_irq_handler); + } + ++ match = of_match_node(bcm2835_pinctrl_match, pdev->dev.of_node); ++ if (match) { ++ bcm2835_pinctrl_desc.confops = ++ (const struct pinconf_ops *)match->data; ++ } ++ + pc->pctl_dev = devm_pinctrl_register(dev, &bcm2835_pinctrl_desc, pc); + if (IS_ERR(pc->pctl_dev)) { + gpiochip_remove(&pc->gpio_chip); +@@ -1087,11 +1187,6 @@ static int bcm2835_pinctrl_probe(struct + return 0; + } + +-static const struct of_device_id bcm2835_pinctrl_match[] = { +- { .compatible = "brcm,bcm2835-gpio" }, +- {} +-}; +- + static struct platform_driver bcm2835_pinctrl_driver = { + .probe = bcm2835_pinctrl_probe, + .driver = { diff --git a/target/linux/brcm2708/patches-4.19/950-0723-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch b/target/linux/brcm2708/patches-4.19/950-0723-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch new file mode 100644 index 0000000000..fa3c3a6339 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0723-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch @@ -0,0 +1,139 @@ +From 1ed6ab5bf2180bd96a78f27fde848f57f4d6b636 Mon Sep 17 00:00:00 2001 +From: James Hughes +Date: Tue, 24 Sep 2019 18:26:55 +0100 +Subject: [PATCH] Rename HDMI ALSA device names, check for enable state + +HDMI Alsa devices renamed to match names used by DRM, to +HDMI 1 and HDMI 2 + +Check for which HDMI devices are connected and only create +devices for those that are present. + +The rename of the devices might cause some backwards compatibility +issues, but since this particular part of the driver needs to be +specifically enabled, I suspect the number of people who will see +the problem will be very small. + +Signed-off-by: James Hughes +--- + .../vc04_services/bcm2835-audio/bcm2835.c | 70 +++++++++++++++++-- + 1 file changed, 63 insertions(+), 7 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c ++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +@@ -9,8 +9,9 @@ + #include + + #include "bcm2835.h" ++#include + +-static bool enable_hdmi; ++static bool enable_hdmi, enable_hdmi0, enable_hdmi1; + static bool enable_headphones; + static bool enable_compat_alsa = true; + +@@ -115,8 +116,8 @@ static struct bcm2835_audio_driver bcm28 + .name = "bcm2835_hdmi", + .owner = THIS_MODULE, + }, +- .shortname = "bcm2835 HDMI", +- .longname = "bcm2835 HDMI", ++ .shortname = "bcm2835 HDMI 1", ++ .longname = "bcm2835 HDMI 1", + .minchannels = 1, + .newpcm = bcm2835_audio_simple_newpcm, + .newctl = snd_bcm2835_new_hdmi_ctl, +@@ -128,8 +129,8 @@ static struct bcm2835_audio_driver bcm28 + .name = "bcm2835_hdmi", + .owner = THIS_MODULE, + }, +- .shortname = "bcm2835 HDMI 1", +- .longname = "bcm2835 HDMI 1", ++ .shortname = "bcm2835 HDMI 2", ++ .longname = "bcm2835 HDMI 2", + .minchannels = 1, + .newpcm = bcm2835_audio_simple_newpcm, + .newctl = snd_bcm2835_new_hdmi_ctl, +@@ -161,11 +162,11 @@ static struct bcm2835_audio_drivers chil + }, + { + .audio_driver = &bcm2835_audio_hdmi0, +- .is_enabled = &enable_hdmi, ++ .is_enabled = &enable_hdmi0, + }, + { + .audio_driver = &bcm2835_audio_hdmi1, +- .is_enabled = &enable_hdmi, ++ .is_enabled = &enable_hdmi1, + }, + { + .audio_driver = &bcm2835_audio_headphones, +@@ -312,6 +313,53 @@ static int snd_add_child_devices(struct + return 0; + } + ++static void set_hdmi_enables(struct device *dev) ++{ ++ struct device_node *firmware_node; ++ struct rpi_firmware *firmware; ++ u32 num_displays, i, display_id; ++ int ret; ++ ++ firmware_node = of_parse_phandle(dev->of_node, "brcm,firmware", 0); ++ firmware = rpi_firmware_get(firmware_node); ++ ++ if (!firmware) ++ return; ++ ++ of_node_put(firmware_node); ++ ++ ret = rpi_firmware_property(firmware, ++ RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS, ++ &num_displays, sizeof(u32)); ++ ++ if (ret) ++ return; ++ ++ for (i = 0; i < num_displays; i++) { ++ display_id = i; ++ ret = rpi_firmware_property(firmware, ++ RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID, ++ &display_id, sizeof(display_id)); ++ if (!ret) { ++ if (display_id == 2) ++ enable_hdmi0 = true; ++ if (display_id == 7) ++ enable_hdmi1 = true; ++ } ++ } ++ ++ if (!enable_hdmi0 && enable_hdmi1) { ++ /* Swap them over and reassign route. This means ++ * that if we only have one connected, it is always named ++ * HDMI1, irrespective of if its on port HDMI0 or HDMI1. ++ * This should match with the naming of HDMI ports in DRM ++ */ ++ enable_hdmi0 = true; ++ enable_hdmi1 = false; ++ bcm2835_audio_hdmi0.route = AUDIO_DEST_HDMI1; ++ } ++} ++ + static int snd_bcm2835_alsa_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; +@@ -332,6 +380,14 @@ static int snd_bcm2835_alsa_probe(struct + numchans); + } + ++ if (!enable_compat_alsa) { ++ set_hdmi_enables(dev); ++ // In this mode, always enable analog output ++ enable_headphones = true; ++ } else { ++ enable_hdmi0 = enable_hdmi; ++ } ++ + err = bcm2835_devm_add_vchi_ctx(dev); + if (err) + return err; diff --git a/target/linux/brcm2708/patches-4.19/950-0724-pcie-brcmstb-bounce64.c-dev_err-dev_info-for-info-me.patch b/target/linux/brcm2708/patches-4.19/950-0724-pcie-brcmstb-bounce64.c-dev_err-dev_info-for-info-me.patch new file mode 100644 index 0000000000..aefa3b856b --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0724-pcie-brcmstb-bounce64.c-dev_err-dev_info-for-info-me.patch @@ -0,0 +1,25 @@ +From 592f7ebf2755acc81cd794b73916f3b2bcccaa68 Mon Sep 17 00:00:00 2001 +From: Floris Bos +Date: Fri, 4 Oct 2019 16:41:30 +0200 +Subject: [PATCH] pcie-brcmstb-bounce64.c: dev_err() -> dev_info() for + info messages + +"dmabounce: initialised" is not an error, so do not log it as such. +Prevents screen polution on OS with "quiet" as kernel parameter. + +Closes #3266 +--- + drivers/pci/controller/pcie-brcmstb-bounce64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/pci/controller/pcie-brcmstb-bounce64.c ++++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c +@@ -524,7 +524,7 @@ int brcm_pcie_bounce_init(struct device + + g_dmabounce_device_info = device_info; + +- dev_err(dev, "dmabounce: initialised - %ld kB, threshold %pad\n", ++ dev_info(dev, "dmabounce: initialised - %ld kB, threshold %pad\n", + buffer_size / 1024, &threshold); + + return 0; diff --git a/target/linux/brcm2708/patches-4.19/950-0725-overlays-gpio-shutdown-Add-debounce-parameter.patch b/target/linux/brcm2708/patches-4.19/950-0725-overlays-gpio-shutdown-Add-debounce-parameter.patch new file mode 100644 index 0000000000..d928458b78 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0725-overlays-gpio-shutdown-Add-debounce-parameter.patch @@ -0,0 +1,48 @@ +From 499e28e3a38f0de843b07bf4bbf7692b07c5e3ba Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 7 Oct 2019 13:51:07 +0100 +Subject: [PATCH] overlays: gpio-shutdown: Add debounce parameter + +Give the gpio-shutdown overlay a debounce parameter that requires +the GPIO to be held at the relevant level for a specified number +of milliseconds. The default value is 100 - higher than the driver +default of 5ms to avoid unfortunate glitches. + +See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=253680 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 3 +++ + arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts | 2 ++ + 2 files changed, 5 insertions(+) + +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -803,6 +803,9 @@ Params: gpio_pin GPIO pin + Note that the default pin (GPIO3) has an + external pullup. + ++ debounce Specify the debounce interval in milliseconds ++ (default 100) ++ + + Name: hd44780-lcd + Info: Configures an HD44780 compatible LCD display. Uses 4 gpio pins for +--- a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts ++++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts +@@ -53,6 +53,7 @@ + label = "shutdown"; + linux,code = <116>; // KEY_POWER + gpios = <&gpio 3 1>; ++ debounce-interval = <100>; // ms + }; + }; + }; +@@ -75,6 +76,7 @@ + + // Allow setting the active_low flag. 0 = active high, 1 = active low + active_low = <&button>,"gpios:8"; ++ debounce = <&button>,"debounce-interval:0"; + }; + + }; diff --git a/target/linux/brcm2708/patches-4.19/950-0726-overlays-fix-compatible-for-RPi4.patch b/target/linux/brcm2708/patches-4.19/950-0726-overlays-fix-compatible-for-RPi4.patch new file mode 100644 index 0000000000..f11066f622 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0726-overlays-fix-compatible-for-RPi4.patch @@ -0,0 +1,204 @@ +From 8ad712b22e410a5d13bc6678fbee4a5b0ec9b518 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Wed, 2 Oct 2019 18:41:32 +0200 +Subject: [PATCH] overlays: fix compatible for RPi4 + +RPi4 compatible is now bcm2711, but some overlays refer to the SoC as +bcm2838. Fix this overlays as they otherwise won't apply. + +Signed-off-by: Matthias Brugger +--- + arch/arm/boot/dts/overlays/i2c3-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/i2c4-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/i2c5-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/i2c6-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/uart2-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/uart3-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/uart4-overlay.dts | 2 +- + arch/arm/boot/dts/overlays/uart5-overlay.dts | 2 +- + 16 files changed, 16 insertions(+), 16 deletions(-) + +--- a/arch/arm/boot/dts/overlays/i2c3-overlay.dts ++++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&i2c3>; +--- a/arch/arm/boot/dts/overlays/i2c4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&i2c4>; +--- a/arch/arm/boot/dts/overlays/i2c5-overlay.dts ++++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&i2c5>; +--- a/arch/arm/boot/dts/overlays/i2c6-overlay.dts ++++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&i2c6>; +--- a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi3_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi3_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi4_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi4_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi5_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi5_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi6_cs_pins>; +--- a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts ++++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts +@@ -3,7 +3,7 @@ + + + / { +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&spi6_cs_pins>; +--- a/arch/arm/boot/dts/overlays/uart2-overlay.dts ++++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&uart2>; +--- a/arch/arm/boot/dts/overlays/uart3-overlay.dts ++++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&uart3>; +--- a/arch/arm/boot/dts/overlays/uart4-overlay.dts ++++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&uart4>; +--- a/arch/arm/boot/dts/overlays/uart5-overlay.dts ++++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts +@@ -2,7 +2,7 @@ + /plugin/; + + /{ +- compatible = "brcm,bcm2838"; ++ compatible = "brcm,bcm2711"; + + fragment@0 { + target = <&uart5>; diff --git a/target/linux/brcm2708/patches-4.19/950-0727-bcm2711-Retain-support-for-old-dtbs.patch b/target/linux/brcm2708/patches-4.19/950-0727-bcm2711-Retain-support-for-old-dtbs.patch new file mode 100644 index 0000000000..14f086c5c8 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0727-bcm2711-Retain-support-for-old-dtbs.patch @@ -0,0 +1,55 @@ +From 7d7f6a80f12fb6e7ba903d070512970e304bcd02 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 9 Oct 2019 17:22:07 +0100 +Subject: [PATCH] bcm2711: Retain support for old dtbs + +The recent series switching to bcm2711 as the DT identifier broke Pis +running with old DTBs. Add some bcm2838 compatible strings as a +temporary measure, at least until the next full Raspbian image with +bcm2711 DTBs. + +See: https://github.com/raspberrypi/linux/pull/3244 + +Signed-off-by: Phil Elwell +--- + arch/arm/mach-bcm/board_bcm2835.c | 2 ++ + drivers/clk/bcm/clk-bcm2835.c | 2 ++ + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 5 +++++ + 3 files changed, 9 insertions(+) + +--- a/arch/arm/mach-bcm/board_bcm2835.c ++++ b/arch/arm/mach-bcm/board_bcm2835.c +@@ -119,6 +119,8 @@ static const char * const bcm2835_compat + "brcm,bcm2836", + "brcm,bcm2837", + "brcm,bcm2711", ++ // Temporary, for backwards-compatibility with old DTBs ++ "brcm,bcm2838", + #endif + NULL + }; +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -2396,6 +2396,8 @@ static const struct cprman_plat_data cpr + static const struct of_device_id bcm2835_clk_of_match[] = { + { .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data }, + { .compatible = "brcm,bcm2711-cprman", .data = &cprman_bcm2711_plat_data }, ++ // Temporary, for backwards-compatibility with old DTBs ++ { .compatible = "brcm,bcm2838-cprman", .data = &cprman_bcm2711_plat_data }, + {} + }; + MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -1079,6 +1079,11 @@ static const struct of_device_id bcm2835 + .compatible = "brcm,bcm2711-gpio", + .data = &bcm2711_pinconf_ops, + }, ++ // Temporary, for backwards-compatibility with old DTBs ++ { ++ .compatible = "brcm,bcm2838-gpio", ++ .data = &bcm2711_pinconf_ops, ++ }, + {} + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0728-media-bcm2835-unicam-Add-support-for-raw14-formats.patch b/target/linux/brcm2708/patches-4.19/950-0728-media-bcm2835-unicam-Add-support-for-raw14-formats.patch new file mode 100644 index 0000000000..f7fe151a2d --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0728-media-bcm2835-unicam-Add-support-for-raw14-formats.patch @@ -0,0 +1,49 @@ +From 13b916fa2b8a99c9953073316e102e9d027dd708 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Wed, 2 Oct 2019 16:09:24 +0100 +Subject: [PATCH] media: bcm2835-unicam: Add support for raw14 formats + +The V4L2 has gained defines for V4L2_PIX_FMT_Sxxxx14P, +therefore add support for it to bcm2835-unicam. + +Signed-off-by: Dave Stevenson +--- + .../media/platform/bcm2835/bcm2835-unicam.c | 25 +++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -273,10 +273,31 @@ static const struct unicam_fmt formats[] + .code = MEDIA_BUS_FMT_SRGGB12_1X12, + .depth = 12, + .csi_dt = 0x2c, ++ }, { ++ .fourcc = V4L2_PIX_FMT_SBGGR14P, ++ .code = MEDIA_BUS_FMT_SBGGR14_1X14, ++ .depth = 14, ++ .csi_dt = 0x2d, ++ }, { ++ .fourcc = V4L2_PIX_FMT_SGBRG14P, ++ .code = MEDIA_BUS_FMT_SGBRG14_1X14, ++ .depth = 14, ++ .csi_dt = 0x2d, ++ }, { ++ .fourcc = V4L2_PIX_FMT_SGRBG14P, ++ .code = MEDIA_BUS_FMT_SGRBG14_1X14, ++ .depth = 14, ++ .csi_dt = 0x2d, ++ }, { ++ .fourcc = V4L2_PIX_FMT_SRGGB14P, ++ .code = MEDIA_BUS_FMT_SRGGB14_1X14, ++ .depth = 14, ++ .csi_dt = 0x2d, + }, + /* +- * 14 and 16 bit Bayer formats could be supported, but there are no V4L2 +- * defines for 14bit packed Bayer, and no CSI2 data_type for raw 16. ++ * 16 bit Bayer formats could be supported, but there is no CSI2 ++ * data_type defined for raw 16, and no sensors that produce it at ++ * present. + */ + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0729-media-bcm2835-unicam-Rework-to-not-cache-the-list-of.patch b/target/linux/brcm2708/patches-4.19/950-0729-media-bcm2835-unicam-Rework-to-not-cache-the-list-of.patch new file mode 100644 index 0000000000..3a638710f7 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0729-media-bcm2835-unicam-Rework-to-not-cache-the-list-of.patch @@ -0,0 +1,387 @@ +From 2c51b8e533a8b43bde18072c9dbbd0fc5084bbe7 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Wed, 2 Oct 2019 17:40:38 +0100 +Subject: [PATCH] media: bcm2835-unicam: Rework to not cache the list + of active fmts + +Some sensors will change Bayer order based on H & V flips, +therefore collecting the list of formats at async_bound has +problems. + +Enumerate the formats from the sensor every time. + +Signed-off-by: Dave Stevenson +--- + .../media/platform/bcm2835/bcm2835-unicam.c | 246 ++++++++++-------- + 1 file changed, 136 insertions(+), 110 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -363,8 +363,6 @@ struct unicam_device { + /* Used to store current mbus frame format */ + struct v4l2_mbus_framefmt m_fmt; + +- struct unicam_fmt active_fmts[MAX_POSSIBLE_PIX_FMTS]; +- int num_active_fmt; + unsigned int virtual_channel; + enum v4l2_mbus_type bus_type; + /* +@@ -455,48 +453,30 @@ static int find_mbus_depth_by_code(u32 c + return 0; + } + +-static const struct unicam_fmt *find_format_by_code(struct unicam_device *dev, +- u32 code) ++static const struct unicam_fmt *find_format_by_code(u32 code) + { +- const struct unicam_fmt *fmt; + unsigned int k; + +- for (k = 0; k < dev->num_active_fmt; k++) { +- fmt = &dev->active_fmts[k]; +- if (fmt->code == code) +- return fmt; ++ for (k = 0; k < ARRAY_SIZE(formats); k++) { ++ if (formats[k].code == code) ++ return &formats[k]; + } + + return NULL; + } + +-static const struct unicam_fmt *find_format_by_pix(struct unicam_device *dev, +- u32 pixelformat) ++static const struct unicam_fmt *find_format_by_pix(u32 pixelformat) + { +- const struct unicam_fmt *fmt; + unsigned int k; + +- for (k = 0; k < dev->num_active_fmt; k++) { +- fmt = &dev->active_fmts[k]; +- if (fmt->fourcc == pixelformat) +- return fmt; ++ for (k = 0; k < ARRAY_SIZE(formats); k++) { ++ if (formats[k].fourcc == pixelformat) ++ return &formats[k]; + } + + return NULL; + } + +-static void dump_active_formats(struct unicam_device *dev) +-{ +- int i; +- +- for (i = 0; i < dev->num_active_fmt; i++) { +- unicam_dbg(3, dev, "active_fmt[%d] (%p) is code %04x, fourcc " V4L2_FOURCC_CONV ", depth %d\n", +- i, &dev->active_fmts[i], dev->active_fmts[i].code, +- V4L2_FOURCC_CONV_ARGS(dev->active_fmts[i].fourcc), +- dev->active_fmts[i].depth); +- } +-} +- + static inline unsigned int bytes_per_line(u32 width, + const struct unicam_fmt *fmt) + { +@@ -726,14 +706,40 @@ static int unicam_enum_fmt_vid_cap(struc + struct v4l2_fmtdesc *f) + { + struct unicam_device *dev = video_drvdata(file); ++ struct v4l2_subdev_mbus_code_enum mbus_code; + const struct unicam_fmt *fmt = NULL; ++ int index = 0; ++ int ret = 0; ++ int i; + +- if (f->index >= dev->num_active_fmt) +- return -EINVAL; ++ /* Loop whilst the sensor driver says it has more formats, but add a ++ * failsafe against a dodgy driver at 128 (more than any sensor will ++ * ever sensibly advertise) ++ */ ++ for (i = 0; !ret && i < 128 ; i++) { ++ memset(&mbus_code, 0, sizeof(mbus_code)); ++ mbus_code.index = i; + +- fmt = &dev->active_fmts[f->index]; ++ ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code, ++ NULL, &mbus_code); ++ if (ret < 0) { ++ unicam_dbg(2, dev, ++ "subdev->enum_mbus_code idx %d returned %d - index invalid\n", ++ i, ret); ++ return -EINVAL; ++ } + +- f->pixelformat = fmt->fourcc; ++ fmt = find_format_by_code(mbus_code.code); ++ if (fmt) { ++ if (fmt->fourcc) { ++ if (index == f->index) { ++ f->pixelformat = fmt->fourcc; ++ break; ++ } ++ index++; ++ } ++ } ++ } + + return 0; + } +@@ -748,6 +754,39 @@ static int unicam_g_fmt_vid_cap(struct f + return 0; + } + ++static ++const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev) ++{ ++ struct v4l2_subdev_mbus_code_enum mbus_code; ++ const struct unicam_fmt *fmt = NULL; ++ int ret; ++ int j; ++ ++ for (j = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++j) { ++ memset(&mbus_code, 0, sizeof(mbus_code)); ++ mbus_code.index = j; ++ ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code, NULL, ++ &mbus_code); ++ if (ret < 0) { ++ unicam_dbg(2, dev, ++ "subdev->enum_mbus_code idx %d returned %d - continue\n", ++ j, ret); ++ continue; ++ } ++ ++ unicam_dbg(2, dev, "subdev %s: code: %04x idx: %d\n", ++ dev->sensor->name, mbus_code.code, j); ++ ++ fmt = find_format_by_code(mbus_code.code); ++ unicam_dbg(2, dev, "fmt %04x returned as %p, V4L2 FOURCC %04x, csi_dt %02X\n", ++ mbus_code.code, fmt, fmt ? fmt->fourcc : 0, ++ fmt ? fmt->csi_dt : 0); ++ if (fmt) ++ return fmt; ++ } ++ ++ return NULL; ++} + static int unicam_try_fmt_vid_cap(struct file *file, void *priv, + struct v4l2_format *f) + { +@@ -759,13 +798,15 @@ static int unicam_try_fmt_vid_cap(struct + struct v4l2_mbus_framefmt *mbus_fmt = &sd_fmt.format; + int ret; + +- fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat); ++ fmt = find_format_by_pix(f->fmt.pix.pixelformat); + if (!fmt) { +- unicam_dbg(3, dev, "Fourcc format (0x%08x) not found. Use default of %08X\n", +- f->fmt.pix.pixelformat, dev->active_fmts[0].fourcc); ++ /* Pixel format not supported by unicam. Choose the first ++ * supported format, and let the sensor choose something else. ++ */ ++ unicam_dbg(3, dev, "Fourcc format (0x%08x) not found. Use first format.\n", ++ f->fmt.pix.pixelformat); + +- /* Just get the first one enumerated */ +- fmt = &dev->active_fmts[0]; ++ fmt = &formats[0]; + f->fmt.pix.pixelformat = fmt->fourcc; + } + +@@ -785,6 +826,40 @@ static int unicam_try_fmt_vid_cap(struct + unicam_info(dev, "Sensor trying to send interlaced video - results may be unpredictable\n"); + + v4l2_fill_pix_format(&f->fmt.pix, &sd_fmt.format); ++ if (mbus_fmt->code != fmt->code) { ++ /* Sensor has returned an alternate format */ ++ fmt = find_format_by_code(mbus_fmt->code); ++ if (!fmt) { ++ /* The alternate format is one unicam can't support. ++ * Find the first format that is supported by both, and ++ * then set that. ++ */ ++ fmt = get_first_supported_format(dev); ++ mbus_fmt->code = fmt->code; ++ ++ ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, ++ dev->sensor_config, &sd_fmt); ++ if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) ++ return ret; ++ ++ if (mbus_fmt->field != V4L2_FIELD_NONE) ++ unicam_info(dev, "Sensor trying to send interlaced video - results may be unpredictable\n"); ++ ++ v4l2_fill_pix_format(&f->fmt.pix, &sd_fmt.format); ++ ++ if (mbus_fmt->code != fmt->code) { ++ /* We've set a format that the sensor reports ++ * as being supported, but it refuses to set it. ++ * Not much else we can do. ++ * Assume that the sensor driver may accept the ++ * format when it is set (rather than tried). ++ */ ++ unicam_err(dev, "Sensor won't accept default format, and Unicam can't support sensor default\n"); ++ } ++ } ++ ++ f->fmt.pix.pixelformat = fmt->fourcc; ++ } + + return unicam_calc_format_size_bpl(dev, fmt, f); + } +@@ -805,10 +880,18 @@ static int unicam_s_fmt_vid_cap(struct f + if (ret < 0) + return ret; + +- fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat); ++ fmt = find_format_by_pix(f->fmt.pix.pixelformat); + if (!fmt) { +- /* Unknown pixel format - adopt a default */ +- fmt = &dev->active_fmts[0]; ++ /* Unknown pixel format - adopt a default. ++ * This shouldn't happen as try_fmt should have resolved any ++ * issues first. ++ */ ++ fmt = get_first_supported_format(dev); ++ if (!fmt) ++ /* It shouldn't be possible to get here with no ++ * supported formats ++ */ ++ return -EINVAL; + f->fmt.pix.pixelformat = fmt->fourcc; + return -EINVAL; + } +@@ -944,6 +1027,7 @@ static void unicam_set_packing_config(st + unpack = UNICAM_PUM_NONE; + break; + } ++ + switch (v4l2_depth) { + case 8: + pack = UNICAM_PPM_PACK8; +@@ -1439,7 +1523,7 @@ static int unicam_enum_framesizes(struct + int ret; + + /* check for valid format */ +- fmt = find_format_by_pix(dev, fsize->pixel_format); ++ fmt = find_format_by_pix(fsize->pixel_format); + if (!fmt) { + unicam_dbg(3, dev, "Invalid pixel code: %x\n", + fsize->pixel_format); +@@ -1478,7 +1562,7 @@ static int unicam_enum_frameintervals(st + }; + int ret; + +- fmt = find_format_by_pix(dev, fival->pixel_format); ++ fmt = find_format_by_pix(fival->pixel_format); + if (!fmt) + return -EINVAL; + +@@ -1742,27 +1826,6 @@ static const struct v4l2_ioctl_ops unica + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, + }; + +-/* +- * Adds an entry to the active_fmts array +- * Returns non-zero if attempting to write off the end of the array. +- */ +-static int unicam_add_active_format(struct unicam_device *unicam, +- const struct unicam_fmt *fmt) +-{ +- //Ensure we don't run off the end of the array. +- if (unicam->num_active_fmt >= MAX_POSSIBLE_PIX_FMTS) +- return 1; +- +- unicam->active_fmts[unicam->num_active_fmt] = *fmt; +- unicam_dbg(2, unicam, +- "matched fourcc: " V4L2_FOURCC_CONV ": code: %04x idx: %d\n", +- V4L2_FOURCC_CONV_ARGS(fmt->fourcc), +- fmt->code, unicam->num_active_fmt); +- unicam->num_active_fmt++; +- +- return 0; +-} +- + static int + unicam_async_bound(struct v4l2_async_notifier *notifier, + struct v4l2_subdev *subdev, +@@ -1770,9 +1833,6 @@ unicam_async_bound(struct v4l2_async_not + { + struct unicam_device *unicam = container_of(notifier->v4l2_dev, + struct unicam_device, v4l2_dev); +- struct v4l2_subdev_mbus_code_enum mbus_code; +- int ret = 0; +- int j; + + if (unicam->sensor) { + unicam_info(unicam, "Rejecting subdev %s (Already set!!)", +@@ -1783,47 +1843,6 @@ unicam_async_bound(struct v4l2_async_not + unicam->sensor = subdev; + unicam_dbg(1, unicam, "Using sensor %s for capture\n", subdev->name); + +- /* Enumerate sub device formats and enable all matching local formats */ +- unicam->num_active_fmt = 0; +- unicam_dbg(2, unicam, "Get supported formats...\n"); +- for (j = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++j) { +- const struct unicam_fmt *fmt = NULL; +- int k; +- +- memset(&mbus_code, 0, sizeof(mbus_code)); +- mbus_code.index = j; +- ret = v4l2_subdev_call(subdev, pad, enum_mbus_code, +- NULL, &mbus_code); +- if (ret < 0) { +- unicam_dbg(2, unicam, +- "subdev->enum_mbus_code idx %d returned %d - continue\n", +- j, ret); +- continue; +- } +- +- unicam_dbg(2, unicam, "subdev %s: code: %04x idx: %d\n", +- subdev->name, mbus_code.code, j); +- +- for (k = 0; k < ARRAY_SIZE(formats); k++) { +- if (mbus_code.code == formats[k].code) { +- fmt = &formats[k]; +- break; +- } +- } +- unicam_dbg(2, unicam, "fmt %04x returned as %p, V4L2 FOURCC %04x, csi_dt %02X\n", +- mbus_code.code, fmt, fmt ? fmt->fourcc : 0, +- fmt ? fmt->csi_dt : 0); +- if (fmt) { +- if (unicam_add_active_format(unicam, fmt)) { +- unicam_dbg(1, unicam, "Active fmt list truncated\n"); +- break; +- } +- } +- } +- unicam_dbg(2, unicam, +- "Done all formats\n"); +- dump_active_formats(unicam); +- + return 0; + } + +@@ -1849,10 +1868,17 @@ static int unicam_probe_complete(struct + return ret; + } + +- fmt = find_format_by_code(unicam, mbus_fmt.code); ++ fmt = find_format_by_code(mbus_fmt.code); + if (!fmt) { +- /* Default image format not valid. Choose first active fmt. */ +- fmt = &unicam->active_fmts[0]; ++ /* Find the first format that the sensor and unicam both ++ * support ++ */ ++ fmt = get_first_supported_format(unicam); ++ ++ if (!fmt) ++ /* No compatible formats */ ++ return -EINVAL; ++ + mbus_fmt.code = fmt->code; + ret = __subdev_set_format(unicam, &mbus_fmt); + if (ret) diff --git a/target/linux/brcm2708/patches-4.19/950-0730-media-bcm2835-unicam-Support-unpacking-CSI-format-to.patch b/target/linux/brcm2708/patches-4.19/950-0730-media-bcm2835-unicam-Support-unpacking-CSI-format-to.patch new file mode 100644 index 0000000000..199c4961e8 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0730-media-bcm2835-unicam-Support-unpacking-CSI-format-to.patch @@ -0,0 +1,254 @@ +From 5ae0488f5fc682877ae2a5d454f70884e62120ef Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Thu, 3 Oct 2019 13:35:01 +0100 +Subject: [PATCH] media: bcm2835-unicam: Support unpacking CSI format + to 16bpp + +The CSI packed formats are not the easiest to work with, and +the peripheral supports unpacking them to 16bpp (but NOT +shifting the data up into the MSBs). +Where V4L2 exposes a pixfmt for both packed and unpacked +formats advertise both as being supported, and unpack the +data in the peripheral. + +Signed-off-by: Dave Stevenson +--- + .../media/platform/bcm2835/bcm2835-unicam.c | 102 +++++++++--------- + 1 file changed, 51 insertions(+), 51 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -15,12 +15,15 @@ + * + * This driver directly controls the Unicam peripheral - there is no + * involvement with the VideoCore firmware. Unicam receives CSI-2 or +- * CCP2 data and writes it into SDRAM. The only potential processing options are +- * to repack Bayer data into an alternate format, and applying windowing. +- * The repacking does not shift the data, so could repack V4L2_PIX_FMT_Sxxxx10P ++ * CCP2 data and writes it into SDRAM. ++ * The only potential processing options are to repack Bayer data into an ++ * alternate format, and applying windowing. ++ * The repacking does not shift the data, so can repack V4L2_PIX_FMT_Sxxxx10P + * to V4L2_PIX_FMT_Sxxxx10, or V4L2_PIX_FMT_Sxxxx12P to V4L2_PIX_FMT_Sxxxx12, +- * but not generically up to V4L2_PIX_FMT_Sxxxx16. +- * Adding support for repacking and windowing may be added later. ++ * but not generically up to V4L2_PIX_FMT_Sxxxx16. The driver will add both ++ * formats where the relevant formats are defined, and will automatically ++ * configure the repacking as required. ++ * Support for windowing may be added later. + * + * It should be possible to connect this driver to any sensor with a + * suitable output interface and V4L2 subdevice driver. +@@ -122,13 +125,16 @@ MODULE_PARM_DESC(debug, "Debug level 0-3 + + /* + * struct unicam_fmt - Unicam media bus format information +- * @pixelformat: V4L2 pixel format FCC identifier. ++ * @pixelformat: V4L2 pixel format FCC identifier. 0 if n/a. ++ * @repacked_fourcc: V4L2 pixel format FCC identifier if the data is expanded ++ * out to 16bpp. 0 if n/a. + * @code: V4L2 media bus format code. +- * @depth: Bits per pixel (when stored in memory). ++ * @depth: Bits per pixel as delivered from the source. + * @csi_dt: CSI data type. + */ + struct unicam_fmt { + u32 fourcc; ++ u32 repacked_fourcc; + u32 code; + u8 depth; + u8 csi_dt; +@@ -235,41 +241,49 @@ static const struct unicam_fmt formats[] + .csi_dt = 0x2a, + }, { + .fourcc = V4L2_PIX_FMT_SBGGR10P, ++ .repacked_fourcc = V4L2_PIX_FMT_SBGGR10, + .code = MEDIA_BUS_FMT_SBGGR10_1X10, + .depth = 10, + .csi_dt = 0x2b, + }, { + .fourcc = V4L2_PIX_FMT_SGBRG10P, ++ .repacked_fourcc = V4L2_PIX_FMT_SGBRG10, + .code = MEDIA_BUS_FMT_SGBRG10_1X10, + .depth = 10, + .csi_dt = 0x2b, + }, { + .fourcc = V4L2_PIX_FMT_SGRBG10P, ++ .repacked_fourcc = V4L2_PIX_FMT_SGRBG10, + .code = MEDIA_BUS_FMT_SGRBG10_1X10, + .depth = 10, + .csi_dt = 0x2b, + }, { + .fourcc = V4L2_PIX_FMT_SRGGB10P, ++ .repacked_fourcc = V4L2_PIX_FMT_SRGGB10, + .code = MEDIA_BUS_FMT_SRGGB10_1X10, + .depth = 10, + .csi_dt = 0x2b, + }, { + .fourcc = V4L2_PIX_FMT_SBGGR12P, ++ .repacked_fourcc = V4L2_PIX_FMT_SBGGR12, + .code = MEDIA_BUS_FMT_SBGGR12_1X12, + .depth = 12, + .csi_dt = 0x2c, + }, { + .fourcc = V4L2_PIX_FMT_SGBRG12P, ++ .repacked_fourcc = V4L2_PIX_FMT_SGBRG12, + .code = MEDIA_BUS_FMT_SGBRG12_1X12, + .depth = 12, + .csi_dt = 0x2c, + }, { + .fourcc = V4L2_PIX_FMT_SGRBG12P, ++ .repacked_fourcc = V4L2_PIX_FMT_SGRBG12, + .code = MEDIA_BUS_FMT_SGRBG12_1X12, + .depth = 12, + .csi_dt = 0x2c, + }, { + .fourcc = V4L2_PIX_FMT_SRGGB12P, ++ .repacked_fourcc = V4L2_PIX_FMT_SRGGB12, + .code = MEDIA_BUS_FMT_SRGGB12_1X12, + .depth = 12, + .csi_dt = 0x2c, +@@ -439,20 +453,6 @@ static inline void unicam_runtime_put(st + } + + /* Format setup functions */ +-static int find_mbus_depth_by_code(u32 code) +-{ +- const struct unicam_fmt *fmt; +- unsigned int k; +- +- for (k = 0; k < ARRAY_SIZE(formats); k++) { +- fmt = &formats[k]; +- if (fmt->code == code) +- return fmt->depth; +- } +- +- return 0; +-} +- + static const struct unicam_fmt *find_format_by_code(u32 code) + { + unsigned int k; +@@ -470,7 +470,8 @@ static const struct unicam_fmt *find_for + unsigned int k; + + for (k = 0; k < ARRAY_SIZE(formats); k++) { +- if (formats[k].fourcc == pixelformat) ++ if (formats[k].fourcc == pixelformat || ++ formats[k].repacked_fourcc == pixelformat) + return &formats[k]; + } + +@@ -478,9 +479,14 @@ static const struct unicam_fmt *find_for + } + + static inline unsigned int bytes_per_line(u32 width, +- const struct unicam_fmt *fmt) ++ const struct unicam_fmt *fmt, ++ u32 v4l2_fourcc) + { +- return ALIGN((width * fmt->depth) >> 3, BPL_ALIGNMENT); ++ if (v4l2_fourcc == fmt->repacked_fourcc) ++ /* Repacking always goes to 16bpp */ ++ return ALIGN(width << 1, BPL_ALIGNMENT); ++ else ++ return ALIGN((width * fmt->depth) >> 3, BPL_ALIGNMENT); + } + + static int __subdev_get_format(struct unicam_device *dev, +@@ -538,7 +544,8 @@ static int unicam_calc_format_size_bpl(s + &f->fmt.pix.height, MIN_HEIGHT, MAX_HEIGHT, 0, + 0); + +- min_bytesperline = bytes_per_line(f->fmt.pix.width, fmt); ++ min_bytesperline = bytes_per_line(f->fmt.pix.width, fmt, ++ f->fmt.pix.pixelformat); + + if (f->fmt.pix.bytesperline > min_bytesperline && + f->fmt.pix.bytesperline <= MAX_BYTESPERLINE) +@@ -738,6 +745,13 @@ static int unicam_enum_fmt_vid_cap(struc + } + index++; + } ++ if (fmt->repacked_fourcc) { ++ if (index == f->index) { ++ f->pixelformat = fmt->repacked_fourcc; ++ break; ++ } ++ index++; ++ } + } + } + +@@ -858,7 +872,10 @@ static int unicam_try_fmt_vid_cap(struct + } + } + +- f->fmt.pix.pixelformat = fmt->fourcc; ++ if (fmt->fourcc) ++ f->fmt.pix.pixelformat = fmt->fourcc; ++ else ++ f->fmt.pix.pixelformat = fmt->repacked_fourcc; + } + + return unicam_calc_format_size_bpl(dev, fmt, f); +@@ -998,16 +1015,14 @@ static void unicam_wr_dma_config(struct + + static void unicam_set_packing_config(struct unicam_device *dev) + { +- int mbus_depth = find_mbus_depth_by_code(dev->fmt->code); +- int v4l2_depth = dev->fmt->depth; + int pack, unpack; + u32 val; + +- if (mbus_depth == v4l2_depth) { ++ if (dev->v_fmt.fmt.pix.pixelformat == dev->fmt->fourcc) { + unpack = UNICAM_PUM_NONE; + pack = UNICAM_PPM_NONE; + } else { +- switch (mbus_depth) { ++ switch (dev->fmt->depth) { + case 8: + unpack = UNICAM_PUM_UNPACK8; + break; +@@ -1028,26 +1043,8 @@ static void unicam_set_packing_config(st + break; + } + +- switch (v4l2_depth) { +- case 8: +- pack = UNICAM_PPM_PACK8; +- break; +- case 10: +- pack = UNICAM_PPM_PACK10; +- break; +- case 12: +- pack = UNICAM_PPM_PACK12; +- break; +- case 14: +- pack = UNICAM_PPM_PACK14; +- break; +- case 16: +- pack = UNICAM_PPM_PACK16; +- break; +- default: +- pack = UNICAM_PPM_NONE; +- break; +- } ++ /* Repacking is always to 16bpp */ ++ pack = UNICAM_PPM_PACK16; + } + + val = 0; +@@ -1893,7 +1890,10 @@ static int unicam_probe_complete(struct + } + + unicam->fmt = fmt; +- unicam->v_fmt.fmt.pix.pixelformat = fmt->fourcc; ++ if (fmt->fourcc) ++ unicam->v_fmt.fmt.pix.pixelformat = fmt->fourcc; ++ else ++ unicam->v_fmt.fmt.pix.pixelformat = fmt->repacked_fourcc; + + /* Read current subdev format */ + unicam_reset_format(unicam); diff --git a/target/linux/brcm2708/patches-4.19/950-0731-media-bcm2835-unicam-Add-support-for-luma-greyscale-.patch b/target/linux/brcm2708/patches-4.19/950-0731-media-bcm2835-unicam-Add-support-for-luma-greyscale-.patch new file mode 100644 index 0000000000..61a817ab6b --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0731-media-bcm2835-unicam-Add-support-for-luma-greyscale-.patch @@ -0,0 +1,50 @@ +From 253dd469e6403b6c2afd25d4f8338a0c1588583f Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Thu, 3 Oct 2019 13:45:51 +0100 +Subject: [PATCH] media: bcm2835-unicam: Add support for luma/greyscale + formats + +Add support for V4L2_PIX_FMT_GREY, V4L2_PIX_FMT_Y10P, +V4L2_PIX_FMT_Y10, and V4L2_PIX_FMT_Y12 image formats from the +appropriate mediabus formats advertised by sensors. + +Signed-off-by: Dave Stevenson +--- + .../media/platform/bcm2835/bcm2835-unicam.c | 21 ++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -307,12 +307,31 @@ static const struct unicam_fmt formats[] + .code = MEDIA_BUS_FMT_SRGGB14_1X14, + .depth = 14, + .csi_dt = 0x2d, +- }, ++ }, { + /* + * 16 bit Bayer formats could be supported, but there is no CSI2 + * data_type defined for raw 16, and no sensors that produce it at + * present. + */ ++ ++ /* Greyscale formats */ ++ .fourcc = V4L2_PIX_FMT_GREY, ++ .code = MEDIA_BUS_FMT_Y8_1X8, ++ .depth = 8, ++ .csi_dt = 0x2a, ++ }, { ++ .fourcc = V4L2_PIX_FMT_Y10P, ++ .repacked_fourcc = V4L2_PIX_FMT_Y10, ++ .code = MEDIA_BUS_FMT_Y10_1X10, ++ .depth = 10, ++ .csi_dt = 0x2b, ++ }, { ++ /* NB There is no packed V4L2 fourcc for this format. */ ++ .repacked_fourcc = V4L2_PIX_FMT_Y12, ++ .code = MEDIA_BUS_FMT_Y12_1X12, ++ .depth = 12, ++ .csi_dt = 0x2c, ++ }, + }; + + struct unicam_dmaqueue { diff --git a/target/linux/brcm2708/patches-4.19/950-0732-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch b/target/linux/brcm2708/patches-4.19/950-0732-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch new file mode 100644 index 0000000000..76129fec22 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0732-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch @@ -0,0 +1,138 @@ +From 799c83fb9b72bcd473099e3da1395c92a5a581ff Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Tue, 17 Sep 2019 18:28:17 +0100 +Subject: [PATCH] drm/vc4: Add support for YUV color encodings and + ranges + +The BT601/BT709 color encoding and limited vs full +range properties were not being exposed, defaulting +always to BT601 limited range. + +Expose the parameters and set the registers appropriately. + +Signed-off-by: Dave Stevenson +--- + drivers/gpu/drm/vc4/vc4_plane.c | 72 +++++++++++++++++++++++++++++++-- + drivers/gpu/drm/vc4/vc4_regs.h | 3 ++ + 2 files changed, 72 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -500,6 +500,53 @@ static void vc4_write_scaling_parameters + } + } + ++/* The colorspace conversion matrices are held in 3 entries in the dlist. ++ * Create an array of them, with entries for each full and limited mode, and ++ * each supported colorspace. ++ */ ++#define VC4_LIMITED_RANGE 0 ++#define VC4_FULL_RANGE 1 ++ ++static const u32 colorspace_coeffs[2][DRM_COLOR_ENCODING_MAX][3] = { ++ { ++ /* Limited range */ ++ { ++ /* BT601 */ ++ SCALER_CSC0_ITR_R_601_5, ++ SCALER_CSC1_ITR_R_601_5, ++ SCALER_CSC2_ITR_R_601_5, ++ }, { ++ /* BT709 */ ++ SCALER_CSC0_ITR_R_709_3, ++ SCALER_CSC1_ITR_R_709_3, ++ SCALER_CSC2_ITR_R_709_3, ++ }, { ++ /* BT2020. Not supported yet - copy 601 */ ++ SCALER_CSC0_ITR_R_601_5, ++ SCALER_CSC1_ITR_R_601_5, ++ SCALER_CSC2_ITR_R_601_5, ++ } ++ }, { ++ /* Full range */ ++ { ++ /* JFIF */ ++ SCALER_CSC0_JPEG_JFIF, ++ SCALER_CSC1_JPEG_JFIF, ++ SCALER_CSC2_JPEG_JFIF, ++ }, { ++ /* BT709 */ ++ SCALER_CSC0_ITR_R_709_3_FR, ++ SCALER_CSC1_ITR_R_709_3_FR, ++ SCALER_CSC2_ITR_R_709_3_FR, ++ }, { ++ /* BT2020. Not supported yet - copy JFIF */ ++ SCALER_CSC0_JPEG_JFIF, ++ SCALER_CSC1_JPEG_JFIF, ++ SCALER_CSC2_JPEG_JFIF, ++ } ++ } ++}; ++ + /* Writes out a full display list for an active plane to the plane's + * private dlist state. + */ +@@ -760,9 +807,20 @@ static int vc4_plane_mode_set(struct drm + + /* Colorspace conversion words */ + if (vc4_state->is_yuv) { +- vc4_dlist_write(vc4_state, SCALER_CSC0_ITR_R_601_5); +- vc4_dlist_write(vc4_state, SCALER_CSC1_ITR_R_601_5); +- vc4_dlist_write(vc4_state, SCALER_CSC2_ITR_R_601_5); ++ enum drm_color_encoding color_encoding = state->color_encoding; ++ enum drm_color_range color_range = state->color_range; ++ const u32 *ccm; ++ ++ if (color_encoding >= DRM_COLOR_ENCODING_MAX) ++ color_encoding = DRM_COLOR_YCBCR_BT601; ++ if (color_range >= DRM_COLOR_RANGE_MAX) ++ color_range = DRM_COLOR_YCBCR_LIMITED_RANGE; ++ ++ ccm = colorspace_coeffs[color_range][color_encoding]; ++ ++ vc4_dlist_write(vc4_state, ccm[0]); ++ vc4_dlist_write(vc4_state, ccm[1]); ++ vc4_dlist_write(vc4_state, ccm[2]); + } + + if (vc4_state->x_scaling[0] != VC4_SCALING_NONE || +@@ -1116,5 +1174,13 @@ struct drm_plane *vc4_plane_init(struct + + drm_plane_create_alpha_property(plane); + ++ drm_plane_create_color_properties(plane, ++ BIT(DRM_COLOR_YCBCR_BT601) | ++ BIT(DRM_COLOR_YCBCR_BT709), ++ BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | ++ BIT(DRM_COLOR_YCBCR_FULL_RANGE), ++ DRM_COLOR_YCBCR_BT709, ++ DRM_COLOR_YCBCR_LIMITED_RANGE); ++ + return plane; + } +--- a/drivers/gpu/drm/vc4/vc4_regs.h ++++ b/drivers/gpu/drm/vc4/vc4_regs.h +@@ -972,6 +972,7 @@ enum hvs_pixel_format { + #define SCALER_CSC0_ITR_R_601_5 0x00f00000 + #define SCALER_CSC0_ITR_R_709_3 0x00f00000 + #define SCALER_CSC0_JPEG_JFIF 0x00000000 ++#define SCALER_CSC0_ITR_R_709_3_FR 0x00000000 + + /* S2.8 contribution of Cb to Green */ + #define SCALER_CSC1_COEF_CB_GRN_MASK VC4_MASK(31, 22) +@@ -988,6 +989,7 @@ enum hvs_pixel_format { + #define SCALER_CSC1_ITR_R_601_5 0xe73304a8 + #define SCALER_CSC1_ITR_R_709_3 0xf2b784a8 + #define SCALER_CSC1_JPEG_JFIF 0xea34a400 ++#define SCALER_CSC1_ITR_R_709_3_FR 0xe23d0400 + + /* S2.8 contribution of Cb to Red */ + #define SCALER_CSC2_COEF_CB_RED_MASK VC4_MASK(29, 20) +@@ -1001,6 +1003,7 @@ enum hvs_pixel_format { + #define SCALER_CSC2_ITR_R_601_5 0x00066204 + #define SCALER_CSC2_ITR_R_709_3 0x00072a1c + #define SCALER_CSC2_JPEG_JFIF 0x000599c5 ++#define SCALER_CSC2_ITR_R_709_3_FR 0x00064ddb + + #define SCALER_TPZ0_VERT_RECALC BIT(31) + #define SCALER_TPZ0_SCALE_MASK VC4_MASK(28, 8) diff --git a/target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch b/target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch new file mode 100644 index 0000000000..8c8bb69e77 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch @@ -0,0 +1,68 @@ +From a8af2085e26bcefad8fb65e2b44d12777a84e219 Mon Sep 17 00:00:00 2001 +From: Boris Brezillon +Date: Fri, 7 Dec 2018 09:36:05 +0100 +Subject: [PATCH] drm/vc4: Fix negative X/Y positioning on SAND planes + +Commit 8e75d582db02bcb171d65ec71eecbd3072a5fd3a upstream. + +Commit 3e407417b192 ("drm/vc4: Fix X/Y positioning of planes using +T_TILES modifier") fixed the problem with T_TILES format, but left +things in a non-working state for SAND formats. Address that now. + +Signed-off-by: Boris Brezillon +Reviewed-by: Eric Anholt +Link: https://patchwork.freedesktop.org/patch/msgid/20181207083606.15449-1-boris.brezillon@bootlin.com +--- + drivers/gpu/drm/vc4/vc4_plane.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -684,6 +684,7 @@ static int vc4_plane_mode_set(struct drm + case DRM_FORMAT_MOD_BROADCOM_SAND128: + case DRM_FORMAT_MOD_BROADCOM_SAND256: { + uint32_t param = fourcc_mod_broadcom_param(fb->modifier); ++ u32 tile_w, tile, x_off, pix_per_tile; + + /* Column-based NV12 or RGBA. + */ +@@ -703,12 +704,15 @@ static int vc4_plane_mode_set(struct drm + switch (base_format_mod) { + case DRM_FORMAT_MOD_BROADCOM_SAND64: + tiling = SCALER_CTL0_TILING_64B; ++ tile_w = 64; + break; + case DRM_FORMAT_MOD_BROADCOM_SAND128: + tiling = SCALER_CTL0_TILING_128B; ++ tile_w = 128; + break; + case DRM_FORMAT_MOD_BROADCOM_SAND256: + tiling = SCALER_CTL0_TILING_256B_OR_T; ++ tile_w = 256; + break; + default: + break; +@@ -719,6 +723,23 @@ static int vc4_plane_mode_set(struct drm + return -EINVAL; + } + ++ pix_per_tile = tile_w / fb->format->cpp[0]; ++ tile = vc4_state->src_x / pix_per_tile; ++ x_off = vc4_state->src_x % pix_per_tile; ++ ++ /* Adjust the base pointer to the first pixel to be scanned ++ * out. ++ */ ++ for (i = 0; i < num_planes; i++) { ++ vc4_state->offsets[i] += param * tile_w * tile; ++ vc4_state->offsets[i] += vc4_state->src_y / ++ (i ? v_subsample : 1) * ++ tile_w; ++ vc4_state->offsets[i] += x_off / ++ (i ? h_subsample : 1) * ++ fb->format->cpp[i]; ++ } ++ + pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT); + break; + } diff --git a/target/linux/brcm2708/patches-4.19/950-0734-drm-vc4-Add-support-for-H-V-flips.patch b/target/linux/brcm2708/patches-4.19/950-0734-drm-vc4-Add-support-for-H-V-flips.patch new file mode 100644 index 0000000000..4c9cb7699e --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0734-drm-vc4-Add-support-for-H-V-flips.patch @@ -0,0 +1,135 @@ +From 1246d16c393a2f5790e5492053f26e6b0b62cec8 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Tue, 17 Sep 2019 18:36:32 +0100 +Subject: [PATCH] drm/vc4: Add support for H & V flips + +The HVS supports horizontal and vertical flips whilst composing. + +Expose these through the standard DRM rotation property. + +Signed-off-by: Dave Stevenson +--- + drivers/gpu/drm/vc4/vc4_plane.c | 54 +++++++++++++++++++++++++++------ + 1 file changed, 45 insertions(+), 9 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -560,7 +560,9 @@ static int vc4_plane_mode_set(struct drm + const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); + u64 base_format_mod = fourcc_mod_broadcom_mod(fb->modifier); + int num_planes = drm_format_num_planes(format->drm); ++ bool hflip = false, vflip = false; + u32 h_subsample, v_subsample; ++ unsigned int rotation; + bool mix_plane_alpha; + bool covers_screen; + u32 scl0, scl1, pitch0; +@@ -568,11 +570,26 @@ static int vc4_plane_mode_set(struct drm + unsigned long irqflags; + u32 hvs_format = format->hvs; + int ret, i; ++ u32 src_y; + + ret = vc4_plane_setup_clipping_and_scaling(state); + if (ret) + return ret; + ++ rotation = drm_rotation_simplify(state->rotation, ++ DRM_MODE_ROTATE_0 | ++ DRM_MODE_REFLECT_X | ++ DRM_MODE_REFLECT_Y); ++ ++ if ((rotation & DRM_MODE_ROTATE_MASK) == DRM_MODE_ROTATE_180) { ++ hflip = true; ++ vflip = true; ++ } ++ if (rotation & DRM_MODE_REFLECT_X) ++ hflip ^= true; ++ if (rotation & DRM_MODE_REFLECT_Y) ++ vflip ^= true; ++ + /* Allocate the LBM memory that the HVS will use for temporary + * storage due to our scaling/format conversion. + */ +@@ -609,6 +626,16 @@ static int vc4_plane_mode_set(struct drm + h_subsample = drm_format_horz_chroma_subsampling(format->drm); + v_subsample = drm_format_vert_chroma_subsampling(format->drm); + ++ if (!vflip) ++ src_y = vc4_state->src_y; ++ else ++ /* When vflipped the image offset needs to be ++ * the start of the last line of the image, and ++ * the pitch will be subtracted from the offset. ++ */ ++ src_y = vc4_state->src_y + ++ vc4_state->src_h[0] - 1; ++ + switch (base_format_mod) { + case DRM_FORMAT_MOD_LINEAR: + tiling = SCALER_CTL0_TILING_LINEAR; +@@ -618,12 +645,13 @@ static int vc4_plane_mode_set(struct drm + * out. + */ + for (i = 0; i < num_planes; i++) { +- vc4_state->offsets[i] += vc4_state->src_y / ++ vc4_state->offsets[i] += src_y / + (i ? v_subsample : 1) * + fb->pitches[i]; ++ + vc4_state->offsets[i] += vc4_state->src_x / +- (i ? h_subsample : 1) * +- fb->format->cpp[i]; ++ (i ? h_subsample : 1) * ++ fb->format->cpp[i]; + } + + break; +@@ -651,11 +679,11 @@ static int vc4_plane_mode_set(struct drm + * SCALER_PITCH0_TILE_Y_OFFSET tells HVS how to walk from that + * base address). + */ +- u32 tile_y = (vc4_state->src_y >> 4) & 1; +- u32 subtile_y = (vc4_state->src_y >> 2) & 3; +- u32 utile_y = vc4_state->src_y & 3; ++ u32 tile_y = (src_y >> 4) & 1; ++ u32 subtile_y = (src_y >> 2) & 3; ++ u32 utile_y = src_y & 3; + u32 x_off = vc4_state->src_x & tile_w_mask; +- u32 y_off = vc4_state->src_y & tile_h_mask; ++ u32 y_off = src_y & tile_h_mask; + + tiling = SCALER_CTL0_TILING_256B_OR_T; + pitch0 = (VC4_SET_FIELD(x_off, SCALER_PITCH0_SINK_PIX) | +@@ -732,7 +760,7 @@ static int vc4_plane_mode_set(struct drm + */ + for (i = 0; i < num_planes; i++) { + vc4_state->offsets[i] += param * tile_w * tile; +- vc4_state->offsets[i] += vc4_state->src_y / ++ vc4_state->offsets[i] += src_y / + (i ? v_subsample : 1) * + tile_w; + vc4_state->offsets[i] += x_off / +@@ -759,7 +787,9 @@ static int vc4_plane_mode_set(struct drm + VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) | + (vc4_state->is_unity ? SCALER_CTL0_UNITY : 0) | + VC4_SET_FIELD(scl0, SCALER_CTL0_SCL0) | +- VC4_SET_FIELD(scl1, SCALER_CTL0_SCL1)); ++ VC4_SET_FIELD(scl1, SCALER_CTL0_SCL1) | ++ (vflip ? SCALER_CTL0_VFLIP : 0) | ++ (hflip ? SCALER_CTL0_HFLIP : 0)); + + /* Position Word 0: Image Positions and Alpha Value */ + vc4_state->pos0_offset = vc4_state->dlist_count; +@@ -1203,5 +1233,11 @@ struct drm_plane *vc4_plane_init(struct + DRM_COLOR_YCBCR_BT709, + DRM_COLOR_YCBCR_LIMITED_RANGE); + ++ drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0, ++ DRM_MODE_ROTATE_0 | ++ DRM_MODE_ROTATE_180 | ++ DRM_MODE_REFLECT_X | ++ DRM_MODE_REFLECT_Y); ++ + return plane; + } diff --git a/target/linux/brcm2708/patches-4.19/950-0735-drm-vc4-Correct-handling-of-rotation-parameter-in-fk.patch b/target/linux/brcm2708/patches-4.19/950-0735-drm-vc4-Correct-handling-of-rotation-parameter-in-fk.patch new file mode 100644 index 0000000000..d08b7f00c7 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0735-drm-vc4-Correct-handling-of-rotation-parameter-in-fk.patch @@ -0,0 +1,87 @@ +From e99a60f018524bf7b1ba382e3994c22ebcdbafe6 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Wed, 18 Sep 2019 15:49:13 +0100 +Subject: [PATCH] drm/vc4: Correct handling of rotation parameter in + fkms + +One bit within DRM_MODE_ROTATE_MASK will always be set to +determine the base rotation 0/90/180/270, and then REFLECT_X +and REFLECT_Y are on top. + +Correct the handling which was assuming that REFLECT_[X|Y] +was instead of ROTATE_x. + +Signed-off-by: Dave Stevenson +--- + drivers/gpu/drm/vc4/vc4_firmware_kms.c | 37 ++++++++++---------------- + 1 file changed, 14 insertions(+), 23 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c +@@ -79,11 +79,6 @@ struct set_plane { + #define TRANSFORM_FLIP_HRIZ BIT(16) + #define TRANSFORM_FLIP_VERT BIT(17) + +-#define SUPPORTED_ROTATIONS (DRM_MODE_ROTATE_0 | \ +- DRM_MODE_ROTATE_180 | \ +- DRM_MODE_REFLECT_X | \ +- DRM_MODE_REFLECT_Y) +- + struct mailbox_set_plane { + struct rpi_firmware_property_tag_header tag; + struct set_plane plane; +@@ -523,7 +518,7 @@ static int vc4_plane_to_mb(struct drm_pl + const struct vc_image_format *vc_fmt = + vc4_get_vc_image_fmt(drm_fmt->format); + int num_planes = fb->format->num_planes; +- unsigned int rotation = SUPPORTED_ROTATIONS; ++ unsigned int rotation; + + mb->plane.vc_image_type = vc_fmt->vc_image; + mb->plane.width = fb->width; +@@ -544,23 +539,16 @@ static int vc4_plane_to_mb(struct drm_pl + mb->plane.is_vu = vc_fmt->is_vu; + mb->plane.planes[0] = bo->paddr + fb->offsets[0]; + +- rotation = drm_rotation_simplify(state->rotation, rotation); +- +- switch (rotation) { +- default: +- case DRM_MODE_ROTATE_0: +- mb->plane.transform = TRANSFORM_NO_ROTATE; +- break; +- case DRM_MODE_ROTATE_180: +- mb->plane.transform = TRANSFORM_ROTATE_180; +- break; +- case DRM_MODE_REFLECT_X: +- mb->plane.transform = TRANSFORM_FLIP_HRIZ; +- break; +- case DRM_MODE_REFLECT_Y: +- mb->plane.transform = TRANSFORM_FLIP_VERT; +- break; +- } ++ rotation = drm_rotation_simplify(state->rotation, ++ DRM_MODE_ROTATE_0 | ++ DRM_MODE_REFLECT_X | ++ DRM_MODE_REFLECT_Y); ++ ++ mb->plane.transform = TRANSFORM_NO_ROTATE; ++ if (rotation & DRM_MODE_REFLECT_X) ++ mb->plane.transform |= TRANSFORM_FLIP_HRIZ; ++ if (rotation & DRM_MODE_REFLECT_Y) ++ mb->plane.transform |= TRANSFORM_FLIP_VERT; + + vc4_fkms_margins_adj(state, &mb->plane); + +@@ -772,7 +760,10 @@ static struct drm_plane *vc4_fkms_plane_ + + drm_plane_create_alpha_property(plane); + drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0, +- SUPPORTED_ROTATIONS); ++ DRM_MODE_ROTATE_0 | ++ DRM_MODE_ROTATE_180 | ++ DRM_MODE_REFLECT_X | ++ DRM_MODE_REFLECT_Y); + drm_plane_create_color_properties(plane, + BIT(DRM_COLOR_YCBCR_BT601) | + BIT(DRM_COLOR_YCBCR_BT709) | diff --git a/target/linux/brcm2708/patches-4.19/950-0736-overlays-Add-w5500-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0736-overlays-Add-w5500-overlay.patch new file mode 100644 index 0000000000..2641a5b0b1 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0736-overlays-Add-w5500-overlay.patch @@ -0,0 +1,113 @@ +From cb9a896a799393b3cb5947bef3c95eb5ffb44776 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Thu, 10 Oct 2019 09:08:47 +0100 +Subject: [PATCH] overlays: Add w5500 overlay + +Add an overlay to configure the Wiznet W5500 Ethernet controller on +SPI0. The 'cs' parameter chooses the Chip Select (default 0). + +See: https://github.com/raspberrypi/linux/issues/3276 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 10 ++++ + arch/arm/boot/dts/overlays/w5500-overlay.dts | 63 ++++++++++++++++++++ + 3 files changed, 74 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/w5500-overlay.dts + +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -183,6 +183,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + vga666.dtbo \ + w1-gpio.dtbo \ + w1-gpio-pullup.dtbo \ ++ w5500.dtbo \ + wittypi.dtbo + + targets += dtbs dtbs_install +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -2538,6 +2538,16 @@ Params: gpiopin GPIO for + pullup Now enabled by default (ignored) + + ++Name: w5500 ++Info: Overlay for the Wiznet W5500 Ethernet Controller on SPI0 ++Load: dtoverlay=w5500,= ++Params: int_pin GPIO used for INT (default 25) ++ ++ speed SPI bus speed (default 30000000) ++ ++ cs SPI bus Chip Select (default 0) ++ ++ + Name: wittypi + Info: Configures the wittypi RTC module. + Load: dtoverlay=wittypi,= +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts +@@ -0,0 +1,63 @@ ++// Overlay for the Wiznet w5500 Ethernet Controller ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target = <&spidev0>; ++ __overlay__ { ++ status = "disabled"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&spidev1>; ++ __dormant__ { ++ status = "disabled"; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&spi0>; ++ __overlay__ { ++ /* needed to avoid dtc warning */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ eth1: w5500@0{ ++ compatible = "wiznet,w5500"; ++ reg = <0>; /* CE0 */ ++ pinctrl-names = "default"; ++ pinctrl-0 = <ð1_pins>; ++ interrupt-parent = <&gpio>; ++ interrupts = <25 0x8>; ++ spi-max-frequency = <30000000>; ++// local-mac-address = [aa bb cc dd ee ff]; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@3 { ++ target = <&gpio>; ++ __overlay__ { ++ eth1_pins: eth1_pins { ++ brcm,pins = <25>; ++ brcm,function = <0>; /* in */ ++ brcm,pull = <0>; /* none */ ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ int_pin = <ð1>, "interrupts:0", ++ <ð1_pins>, "brcm,pins:0"; ++ speed = <ð1>, "spi-max-frequency:0"; ++ cs = <ð1>, "reg:0", ++ <0>, "!0=1"; ++ }; ++}; diff --git a/target/linux/brcm2708/patches-4.19/950-0737-media-bcm2835-unicam-Replace-hard-coded-loop-limit-w.patch b/target/linux/brcm2708/patches-4.19/950-0737-media-bcm2835-unicam-Replace-hard-coded-loop-limit-w.patch new file mode 100644 index 0000000000..cb9a82b127 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0737-media-bcm2835-unicam-Replace-hard-coded-loop-limit-w.patch @@ -0,0 +1,44 @@ +From 1a013467030ffd6f1958b8a4db1b5312213fb9bd Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Thu, 17 Oct 2019 10:16:16 +0100 +Subject: [PATCH] media: bcm2835-unicam: Replace hard coded loop limit + with a define + +In order to protect against a dodgy sensor driver never returning +an error from enum_mbus_code there was a hardcoded value of 128 +that aborted the loop. +There is a need to call enum_mbus_code from elsewhere, so move that +number to a define so it is common across calls. + +Signed-off-by: Dave Stevenson +--- + drivers/media/platform/bcm2835/bcm2835-unicam.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -97,6 +97,11 @@ MODULE_PARM_DESC(debug, "Debug level 0-3 + #define unicam_err(dev, fmt, arg...) \ + v4l2_err(&(dev)->v4l2_dev, fmt, ##arg) + ++/* To protect against a dodgy sensor driver never returning an error from ++ * enum_mbus_code, set a maximum index value to be used. ++ */ ++#define MAX_ENUM_MBUS_CODE 128 ++ + /* + * Stride is a 16 bit register, but also has to be a multiple of 16. + */ +@@ -738,11 +743,7 @@ static int unicam_enum_fmt_vid_cap(struc + int ret = 0; + int i; + +- /* Loop whilst the sensor driver says it has more formats, but add a +- * failsafe against a dodgy driver at 128 (more than any sensor will +- * ever sensibly advertise) +- */ +- for (i = 0; !ret && i < 128 ; i++) { ++ for (i = 0; !ret && i < MAX_ENUM_MBUS_CODE; i++) { + memset(&mbus_code, 0, sizeof(mbus_code)); + mbus_code.index = i; + diff --git a/target/linux/brcm2708/patches-4.19/950-0738-media-bcm2835-unicam-Fix-one-to-many-mapping-for-YUY.patch b/target/linux/brcm2708/patches-4.19/950-0738-media-bcm2835-unicam-Fix-one-to-many-mapping-for-YUY.patch new file mode 100644 index 0000000000..3c881a1bfc --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0738-media-bcm2835-unicam-Fix-one-to-many-mapping-for-YUY.patch @@ -0,0 +1,144 @@ +From 94d77466473f3abcf799ac44b8038766ab32f27c Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Wed, 16 Oct 2019 18:53:06 +0100 +Subject: [PATCH] media: bcm2835-unicam: Fix one-to-many mapping for + YUYV formats + +V4L2 format V4L2_PIX_FMT_YUYV maps to both MEDIA_BUS_FMT_YUYV8_2X8 +and MEDIA_BUS_FMT_YUYV8_1X16. The change to not cache the active +formats also meant that we only ever found the first variant of +the mediabus format when trying to setup the device. + +Flag the formats that have other representations, and ensure +that the format conversion checks whether the found format +matches one supported by the sensor before returning it. + +Signed-off-by: Dave Stevenson +--- + .../media/platform/bcm2835/bcm2835-unicam.c | 45 ++++++++++++++++--- + 1 file changed, 39 insertions(+), 6 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c ++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c +@@ -136,6 +136,8 @@ MODULE_PARM_DESC(debug, "Debug level 0-3 + * @code: V4L2 media bus format code. + * @depth: Bits per pixel as delivered from the source. + * @csi_dt: CSI data type. ++ * @check_variants: Flag to denote that there are multiple mediabus formats ++ * still in the list that could match this V4L2 format. + */ + struct unicam_fmt { + u32 fourcc; +@@ -143,6 +145,7 @@ struct unicam_fmt { + u32 code; + u8 depth; + u8 csi_dt; ++ u8 check_variants; + }; + + static const struct unicam_fmt formats[] = { +@@ -152,21 +155,25 @@ static const struct unicam_fmt formats[] + .code = MEDIA_BUS_FMT_YUYV8_2X8, + .depth = 16, + .csi_dt = 0x1e, ++ .check_variants = 1, + }, { + .fourcc = V4L2_PIX_FMT_UYVY, + .code = MEDIA_BUS_FMT_UYVY8_2X8, + .depth = 16, + .csi_dt = 0x1e, ++ .check_variants = 1, + }, { + .fourcc = V4L2_PIX_FMT_YVYU, + .code = MEDIA_BUS_FMT_YVYU8_2X8, + .depth = 16, + .csi_dt = 0x1e, ++ .check_variants = 1, + }, { + .fourcc = V4L2_PIX_FMT_VYUY, + .code = MEDIA_BUS_FMT_VYUY8_2X8, + .depth = 16, + .csi_dt = 0x1e, ++ .check_variants = 1, + }, { + .fourcc = V4L2_PIX_FMT_YUYV, + .code = MEDIA_BUS_FMT_YUYV8_1X16, +@@ -489,14 +496,40 @@ static const struct unicam_fmt *find_for + return NULL; + } + +-static const struct unicam_fmt *find_format_by_pix(u32 pixelformat) ++static int check_mbus_format(struct unicam_device *dev, ++ const struct unicam_fmt *format) ++{ ++ struct v4l2_subdev_mbus_code_enum mbus_code; ++ int ret = 0; ++ int i; ++ ++ for (i = 0; !ret && i < MAX_ENUM_MBUS_CODE; i++) { ++ memset(&mbus_code, 0, sizeof(mbus_code)); ++ mbus_code.index = i; ++ ++ ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code, ++ NULL, &mbus_code); ++ ++ if (!ret && mbus_code.code == format->code) ++ return 1; ++ } ++ ++ return 0; ++} ++ ++static const struct unicam_fmt *find_format_by_pix(struct unicam_device *dev, ++ u32 pixelformat) + { + unsigned int k; + + for (k = 0; k < ARRAY_SIZE(formats); k++) { + if (formats[k].fourcc == pixelformat || +- formats[k].repacked_fourcc == pixelformat) ++ formats[k].repacked_fourcc == pixelformat) { ++ if (formats[k].check_variants && ++ !check_mbus_format(dev, &formats[k])) ++ continue; + return &formats[k]; ++ } + } + + return NULL; +@@ -832,7 +865,7 @@ static int unicam_try_fmt_vid_cap(struct + struct v4l2_mbus_framefmt *mbus_fmt = &sd_fmt.format; + int ret; + +- fmt = find_format_by_pix(f->fmt.pix.pixelformat); ++ fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat); + if (!fmt) { + /* Pixel format not supported by unicam. Choose the first + * supported format, and let the sensor choose something else. +@@ -917,7 +950,7 @@ static int unicam_s_fmt_vid_cap(struct f + if (ret < 0) + return ret; + +- fmt = find_format_by_pix(f->fmt.pix.pixelformat); ++ fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat); + if (!fmt) { + /* Unknown pixel format - adopt a default. + * This shouldn't happen as try_fmt should have resolved any +@@ -1540,7 +1573,7 @@ static int unicam_enum_framesizes(struct + int ret; + + /* check for valid format */ +- fmt = find_format_by_pix(fsize->pixel_format); ++ fmt = find_format_by_pix(dev, fsize->pixel_format); + if (!fmt) { + unicam_dbg(3, dev, "Invalid pixel code: %x\n", + fsize->pixel_format); +@@ -1579,7 +1612,7 @@ static int unicam_enum_frameintervals(st + }; + int ret; + +- fmt = find_format_by_pix(fival->pixel_format); ++ fmt = find_format_by_pix(dev, fival->pixel_format); + if (!fmt) + return -EINVAL; + diff --git a/target/linux/brcm2708/patches-4.19/950-0739-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch b/target/linux/brcm2708/patches-4.19/950-0739-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch new file mode 100644 index 0000000000..4291f9fee5 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0739-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch @@ -0,0 +1,66 @@ +From b4f8b92cdfd8ad2e04cdd3f0a73aa4e95d172fb1 Mon Sep 17 00:00:00 2001 +From: Markus Proeller +Date: Thu, 10 Oct 2019 19:12:08 +0200 +Subject: [PATCH] dt-bindings: Add binding for the Infineon IRS1125 + sensor + +Adds a binding for the Infineon IRS1125 time-of-flight depth +sensor. + +Signed-off-by: Markus Proeller +--- + .../devicetree/bindings/media/i2c/irs1125.txt | 48 +++++++++++++++++++ + 1 file changed, 48 insertions(+) + create mode 100644 Documentation/devicetree/bindings/media/i2c/irs1125.txt + +--- /dev/null ++++ b/Documentation/devicetree/bindings/media/i2c/irs1125.txt +@@ -0,0 +1,48 @@ ++* Infineon irs1125 time of flight sensor ++ ++The Infineon irs1125 is a time of flight digital image sensor with ++an active array size of 352H x 286V. It is programmable through I2C ++interface. The I2C address defaults to 0x3D, but can be reconfigured ++to address 0x3C or 0x41 via I2C commands. Image data is sent through ++MIPI CSI-2, which is configured as either 1 or 2 data lanes. ++ ++Required Properties: ++- compatible: value should be "infineon,irs1125" for irs1125 sensor ++- reg: I2C bus address of the device ++- clocks: reference to the xclk input clock. ++- pwdn-gpios: reference to the GPIO connected to the reset pin. ++ This is an active low signal to the iirs1125. ++ ++The irs1125 device node should contain one 'port' child node with ++an 'endpoint' subnode. For further reading on port node refer to ++Documentation/devicetree/bindings/media/video-interfaces.txt. ++ ++Endpoint node required properties for CSI-2 connection are: ++- remote-endpoint: a phandle to the bus receiver's endpoint node. ++- clock-lanes: should be set to <0> (clock lane on hardware lane 0) ++- data-lanes: should be set to <1> or <1 2> (one or two lane CSI-2 ++ supported) ++ ++Example: ++ sensor@10 { ++ compatible = "infineon,irs1125"; ++ reg = <0x3D>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ clocks = <&irs1125_clk>; ++ pwdn-gpios = <&gpio 5 0>; ++ ++ irs1125_clk: camera-clk { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <26000000>; ++ }; ++ ++ port { ++ sensor_out: endpoint { ++ remote-endpoint = <&csiss_in>; ++ clock-lanes = <0>; ++ data-lanes = <1 2>; ++ }; ++ }; ++ }; diff --git a/target/linux/brcm2708/patches-4.19/950-0740-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch b/target/linux/brcm2708/patches-4.19/950-0740-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch new file mode 100644 index 0000000000..9b882fc8f8 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0740-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch @@ -0,0 +1,1231 @@ +From c09b42cb057ddf8bd20d57c6b0ffd94f3e15ea7c Mon Sep 17 00:00:00 2001 +From: Markus Proeller +Date: Thu, 10 Oct 2019 19:12:36 +0200 +Subject: [PATCH] media: i2c: Add a driver for the Infineon IRS1125 + depth sensor + +The Infineon IRS1125 is a time of flight depth sensor that +has a CSI-2 interface. + +Add a V4L2 subdevice driver for this device. + +Signed-off-by: Markus Proeller +--- + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/irs1125.c | 1112 +++++++++++++++++++++++++++++++++++ + drivers/media/i2c/irs1125.h | 61 ++ + 4 files changed, 1186 insertions(+) + create mode 100644 drivers/media/i2c/irs1125.c + create mode 100644 drivers/media/i2c/irs1125.h + +--- a/drivers/media/i2c/Kconfig ++++ b/drivers/media/i2c/Kconfig +@@ -813,6 +813,18 @@ config VIDEO_OV13858 + This is a Video4Linux2 sensor driver for the OmniVision + OV13858 camera. + ++config VIDEO_IRS1125 ++ tristate "Infineon IRS1125 sensor support" ++ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API ++ depends on MEDIA_CAMERA_SUPPORT ++ select V4L2_FWNODE ++ help ++ This is a Video4Linux2 sensor-level driver for the Infineon ++ IRS1125 camera. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called irs1125. ++ + config VIDEO_VS6624 + tristate "ST VS6624 sensor support" + depends on VIDEO_V4L2 && I2C +--- a/drivers/media/i2c/Makefile ++++ b/drivers/media/i2c/Makefile +@@ -80,6 +80,7 @@ obj-$(CONFIG_VIDEO_OV772X) += ov772x.o + obj-$(CONFIG_VIDEO_OV7740) += ov7740.o + obj-$(CONFIG_VIDEO_OV9650) += ov9650.o + obj-$(CONFIG_VIDEO_OV13858) += ov13858.o ++obj-$(CONFIG_VIDEO_IRS1125) += irs1125.o + obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o + obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o + obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o +--- /dev/null ++++ b/drivers/media/i2c/irs1125.c +@@ -0,0 +1,1112 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * A V4L2 driver for Infineon IRS1125 TOF cameras. ++ * Copyright (C) 2018, pieye GmbH ++ * ++ * Based on V4L2 OmniVision OV5647 Image Sensor driver ++ * Copyright (C) 2016 Ramiro Oliveira ++ * ++ * DT / fwnode changes, and GPIO control taken from ov5640.c ++ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. ++ * Copyright (C) 2014-2017 Mentor Graphics Inc. ++ * ++ */ ++ ++#include "irs1125.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define CHECK_BIT(val, pos) ((val) & BIT(pos)) ++ ++#define SENSOR_NAME "irs1125" ++ ++#define RESET_ACTIVE_DELAY_MS 20 ++ ++#define IRS1125_ALTERNATE_FW "irs1125_af.bin" ++ ++#define IRS1125_REG_CSICFG 0xA882 ++#define IRS1125_REG_DESIGN_STEP 0xB0AD ++#define IRS1125_REG_EFUSEVAL2 0xB09F ++#define IRS1125_REG_EFUSEVAL3 0xB0A0 ++#define IRS1125_REG_EFUSEVAL4 0xB0A1 ++#define IRS1125_REG_DMEM_SHADOW 0xC320 ++ ++#define IRS1125_DESIGN_STEP_EXPECTED 0x0a12 ++ ++#define IRS1125_ROW_START_DEF 0 ++#define IRS1125_COLUMN_START_DEF 0 ++#define IRS1125_WINDOW_HEIGHT_DEF 288 ++#define IRS1125_WINDOW_WIDTH_DEF 352 ++ ++struct regval_list { ++ u16 addr; ++ u16 data; ++}; ++ ++struct irs1125 { ++ struct v4l2_subdev sd; ++ struct media_pad pad; ++ /* the parsed DT endpoint info */ ++ struct v4l2_fwnode_endpoint ep; ++ ++ struct clk *xclk; ++ struct v4l2_ctrl_handler ctrl_handler; ++ ++ /* To serialize asynchronus callbacks */ ++ struct mutex lock; ++ ++ /* image data layout */ ++ unsigned int num_seq; ++ ++ /* reset pin */ ++ struct gpio_desc *reset; ++ ++ /* V4l2 Controls to grab */ ++ struct v4l2_ctrl *ctrl_modplls; ++ struct v4l2_ctrl *ctrl_numseq; ++ ++ int power_count; ++}; ++ ++static inline struct irs1125 *to_state(struct v4l2_subdev *sd) ++{ ++ return container_of(sd, struct irs1125, sd); ++} ++ ++static struct regval_list irs1125_26MHz[] = { ++ {0xB017, 0x0413}, ++ {0xB086, 0x3535}, ++ {0xB0AE, 0xEF02}, ++ {0xA000, 0x0004}, ++ {0xFFFF, 100}, ++ ++ {0xB062, 0x6383}, ++ {0xB063, 0x55A8}, ++ {0xB068, 0x7628}, ++ {0xB069, 0x03E2}, ++ ++ {0xFFFF, 100}, ++ {0xB05A, 0x01C5}, ++ {0xB05C, 0x0206}, ++ {0xB05D, 0x01C5}, ++ {0xB05F, 0x0206}, ++ {0xB016, 0x1335}, ++ {0xFFFF, 100}, ++ {0xA893, 0x8261}, ++ {0xA894, 0x89d8}, ++ {0xA895, 0x131d}, ++ {0xA896, 0x4251}, ++ {0xA897, 0x9D8A}, ++ {0xA898, 0x0BD8}, ++ {0xA899, 0x2245}, ++ {0xA89A, 0xAB9B}, ++ {0xA89B, 0x03B9}, ++ {0xA89C, 0x8041}, ++ {0xA89D, 0xE07E}, ++ {0xA89E, 0x0307}, ++ {0xFFFF, 100}, ++ {0xA88D, 0x0004}, ++ {0xA800, 0x0E68}, ++ {0xA801, 0x0000}, ++ {0xA802, 0x000C}, ++ {0xA803, 0x0000}, ++ {0xA804, 0x0E68}, ++ {0xA805, 0x0000}, ++ {0xA806, 0x0440}, ++ {0xA807, 0x0000}, ++ {0xA808, 0x0E68}, ++ {0xA809, 0x0000}, ++ {0xA80A, 0x0884}, ++ {0xA80B, 0x0000}, ++ {0xA80C, 0x0E68}, ++ {0xA80D, 0x0000}, ++ {0xA80E, 0x0CC8}, ++ {0xA80F, 0x0000}, ++ {0xA810, 0x0E68}, ++ {0xA811, 0x0000}, ++ {0xA812, 0x2000}, ++ {0xA813, 0x0000}, ++ {0xA882, 0x0081}, ++ {0xA88C, 0x403A}, ++ {0xA88F, 0x031E}, ++ {0xA892, 0x0351}, ++ {0x9813, 0x13FF}, ++ {0x981B, 0x7608}, ++ ++ {0xB008, 0x0000}, ++ {0xB015, 0x1513}, ++ ++ {0xFFFF, 100} ++}; ++ ++static struct regval_list irs1125_seq_cfg[] = { ++ {0xC3A0, 0x823D}, ++ {0xC3A1, 0xB13B}, ++ {0xC3A2, 0x0313}, ++ {0xC3A3, 0x4659}, ++ {0xC3A4, 0xC4EC}, ++ {0xC3A5, 0x03CE}, ++ {0xC3A6, 0x4259}, ++ {0xC3A7, 0xC4EC}, ++ {0xC3A8, 0x03CE}, ++ {0xC3A9, 0x8839}, ++ {0xC3AA, 0x89D8}, ++ {0xC3AB, 0x031D}, ++ ++ {0xC24C, 0x5529}, ++ {0xC24D, 0x0000}, ++ {0xC24E, 0x1200}, ++ {0xC24F, 0x6CB2}, ++ {0xC250, 0x0000}, ++ {0xC251, 0x5529}, ++ {0xC252, 0x42F4}, ++ {0xC253, 0xD1AF}, ++ {0xC254, 0x8A18}, ++ {0xC255, 0x0002}, ++ {0xC256, 0x5529}, ++ {0xC257, 0x6276}, ++ {0xC258, 0x11A7}, ++ {0xC259, 0xD907}, ++ {0xC25A, 0x0000}, ++ {0xC25B, 0x5529}, ++ {0xC25C, 0x07E0}, ++ {0xC25D, 0x7BFE}, ++ {0xC25E, 0x6402}, ++ {0xC25F, 0x0019}, ++ ++ {0xC3AC, 0x0007}, ++ {0xC3AD, 0xED88}, ++ {0xC320, 0x003E}, ++ {0xC321, 0x0000}, ++ {0xC322, 0x2000}, ++ {0xC323, 0x0000}, ++ {0xC324, 0x0271}, ++ {0xC325, 0x0000}, ++ {0xC326, 0x000C}, ++ {0xC327, 0x0000}, ++ {0xC328, 0x0271}, ++ {0xC329, 0x0000}, ++ {0xC32A, 0x0440}, ++ {0xC32B, 0x0000}, ++ {0xC32C, 0x0271}, ++ {0xC32D, 0x0000}, ++ {0xC32E, 0x0884}, ++ {0xC32F, 0x0000}, ++ {0xC330, 0x0271}, ++ {0xC331, 0x0000}, ++ {0xC332, 0x0CC8}, ++ {0xC333, 0x0000}, ++ {0xA88D, 0x0004}, ++ ++ {0xA890, 0x0000}, ++ {0xC219, 0x0002}, ++ {0xC21A, 0x0000}, ++ {0xC21B, 0x0000}, ++ {0xC21C, 0x00CD}, ++ {0xC21D, 0x0009}, ++ {0xC21E, 0x00CD}, ++ {0xC21F, 0x0009}, ++ ++ {0xA87C, 0x0000}, ++ {0xC032, 0x0001}, ++ {0xC034, 0x0000}, ++ {0xC035, 0x0001}, ++ {0xC039, 0x0000}, ++ {0xC401, 0x0002}, ++ ++ {0xFFFF, 1}, ++ {0xA87C, 0x0001} ++}; ++ ++static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val) ++{ ++ int ret; ++ unsigned char data[4] = { reg >> 8, reg & 0xff, val >> 8, val & 0xff}; ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ ++ ret = i2c_master_send(client, data, 4); ++ if (ret < 0) ++ dev_err(&client->dev, "%s: i2c write error, reg: %x\n", ++ __func__, reg); ++ ++ return ret; ++} ++ ++static int irs1125_read(struct v4l2_subdev *sd, u16 reg, u16 *val) ++{ ++ int ret; ++ unsigned char data_w[2] = { reg >> 8, reg & 0xff }; ++ char rdval[2]; ++ ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ ++ ret = i2c_master_send(client, data_w, 2); ++ if (ret < 0) { ++ dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n", ++ __func__, reg); ++ return ret; ++ } ++ ++ ret = i2c_master_recv(client, rdval, 2); ++ if (ret < 0) ++ dev_err(&client->dev, "%s: i2c read error, reg: %x\n", ++ __func__, reg); ++ ++ *val = rdval[1] | (rdval[0] << 8); ++ ++ return ret; ++} ++ ++static int irs1125_write_array(struct v4l2_subdev *sd, ++ struct regval_list *regs, int array_size) ++{ ++ int i, ret; ++ ++ for (i = 0; i < array_size; i++) { ++ if (regs[i].addr == 0xFFFF) { ++ msleep(regs[i].data); ++ } else { ++ ret = irs1125_write(sd, regs[i].addr, regs[i].data); ++ if (ret < 0) ++ return ret; ++ } ++ } ++ ++ return 0; ++} ++ ++static int irs1125_stream_on(struct v4l2_subdev *sd) ++{ ++ int ret; ++ struct irs1125 *irs1125 = to_state(sd); ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ ++ v4l2_ctrl_grab(irs1125->ctrl_numseq, 1); ++ v4l2_ctrl_grab(irs1125->ctrl_modplls, 1); ++ ++ ret = irs1125_write(sd, 0xC400, 0x0001); ++ if (ret < 0) { ++ dev_err(&client->dev, "error enabling firmware: %d", ret); ++ return ret; ++ } ++ ++ msleep(100); ++ ++ return irs1125_write(sd, 0xA87C, 0x0001); ++} ++ ++static int irs1125_stream_off(struct v4l2_subdev *sd) ++{ ++ int ret; ++ struct irs1125 *irs1125 = to_state(sd); ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ ++ v4l2_ctrl_grab(irs1125->ctrl_numseq, 0); ++ v4l2_ctrl_grab(irs1125->ctrl_modplls, 0); ++ ++ ret = irs1125_write(sd, 0xA87C, 0x0000); ++ if (ret < 0) { ++ dev_err(&client->dev, "error disabling trigger: %d", ret); ++ return ret; ++ } ++ ++ msleep(100); ++ ++ return irs1125_write(sd, 0xC400, 0x0002); ++} ++ ++static int __sensor_init(struct v4l2_subdev *sd) ++{ ++ unsigned int cnt, idx; ++ int ret; ++ u16 val; ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ struct irs1125 *irs1125 = to_state(sd); ++ const struct firmware *fw; ++ struct regval_list *reg_data; ++ ++ cnt = 0; ++ while (1) { ++ ret = irs1125_read(sd, 0xC40F, &val); ++ if (ret < 0) { ++ dev_err(&client->dev, "read register 0xC40F failed\n"); ++ return ret; ++ } ++ if (CHECK_BIT(val, 14) == 0) ++ break; ++ ++ if (cnt >= 5) { ++ dev_err(&client->dev, "timeout waiting for 0xC40F\n"); ++ return -EAGAIN; ++ } ++ ++ cnt++; ++ } ++ ++ ret = irs1125_write_array(sd, irs1125_26MHz, ++ ARRAY_SIZE(irs1125_26MHz)); ++ if (ret < 0) { ++ dev_err(&client->dev, "write sensor default regs error\n"); ++ return ret; ++ } ++ ++ /* set CSI-2 number of data lanes */ ++ if (irs1125->ep.bus.mipi_csi2.num_data_lanes == 1) { ++ val = 0x0001; ++ } else if (irs1125->ep.bus.mipi_csi2.num_data_lanes == 2) { ++ val = 0x0081; ++ } else { ++ dev_err(&client->dev, "invalid number of data lanes %d\n", ++ irs1125->ep.bus.mipi_csi2.num_data_lanes); ++ return -EINVAL; ++ } ++ ++ ret = irs1125_write(sd, IRS1125_REG_CSICFG, val); ++ if (ret < 0) { ++ dev_err(&client->dev, "write sensor csi2 config error\n"); ++ return ret; ++ } ++ ++ /* request the firmware, this will block and timeout */ ++ ret = request_firmware(&fw, IRS1125_ALTERNATE_FW, &client->dev); ++ if (ret) { ++ dev_err(&client->dev, ++ "did not find the firmware file '%s' (status %d)\n", ++ IRS1125_ALTERNATE_FW, ret); ++ return ret; ++ } ++ ++ if (fw->size % 4) { ++ dev_err(&client->dev, "firmware file '%s' invalid\n", ++ IRS1125_ALTERNATE_FW); ++ release_firmware(fw); ++ return -EINVAL; ++ } ++ ++ for (idx = 0; idx < fw->size; idx += 4) { ++ reg_data = (struct regval_list *)&fw->data[idx]; ++ ret = irs1125_write(sd, reg_data->addr, reg_data->data); ++ if (ret < 0) { ++ dev_err(&client->dev, "firmware write error\n"); ++ release_firmware(fw); ++ return ret; ++ } ++ } ++ release_firmware(fw); ++ ++ ret = irs1125_write_array(sd, irs1125_seq_cfg, ++ ARRAY_SIZE(irs1125_seq_cfg)); ++ if (ret < 0) { ++ dev_err(&client->dev, "write default sequence failed\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int irs1125_sensor_power(struct v4l2_subdev *sd, int on) ++{ ++ int ret = 0; ++ struct irs1125 *irs1125 = to_state(sd); ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ ++ mutex_lock(&irs1125->lock); ++ ++ if (on && !irs1125->power_count) { ++ gpiod_set_value_cansleep(irs1125->reset, 1); ++ msleep(RESET_ACTIVE_DELAY_MS); ++ ++ ret = clk_prepare_enable(irs1125->xclk); ++ if (ret < 0) { ++ dev_err(&client->dev, "clk prepare enable failed\n"); ++ goto out; ++ } ++ ++ ret = __sensor_init(sd); ++ if (ret < 0) { ++ clk_disable_unprepare(irs1125->xclk); ++ dev_err(&client->dev, ++ "Camera not available, check Power\n"); ++ goto out; ++ } ++ } else if (!on && irs1125->power_count == 1) { ++ gpiod_set_value_cansleep(irs1125->reset, 0); ++ } ++ ++ /* Update the power count. */ ++ irs1125->power_count += on ? 1 : -1; ++ WARN_ON(irs1125->power_count < 0); ++ ++out: ++ mutex_unlock(&irs1125->lock); ++ ++ return ret; ++} ++ ++#ifdef CONFIG_VIDEO_ADV_DEBUG ++static int irs1125_sensor_get_register(struct v4l2_subdev *sd, ++ struct v4l2_dbg_register *reg) ++{ ++ u16 val; ++ int ret; ++ ++ ret = irs1125_read(sd, reg->reg & 0xffff, &val); ++ if (ret < 0) ++ return ret; ++ ++ reg->val = val; ++ reg->size = 1; ++ ++ return 0; ++} ++ ++static int irs1125_sensor_set_register(struct v4l2_subdev *sd, ++ const struct v4l2_dbg_register *reg) ++{ ++ return irs1125_write(sd, reg->reg & 0xffff, reg->val & 0xffff); ++} ++#endif ++ ++static const struct v4l2_subdev_core_ops irs1125_subdev_core_ops = { ++ .s_power = irs1125_sensor_power, ++#ifdef CONFIG_VIDEO_ADV_DEBUG ++ .g_register = irs1125_sensor_get_register, ++ .s_register = irs1125_sensor_set_register, ++#endif ++}; ++ ++static int irs1125_s_stream(struct v4l2_subdev *sd, int enable) ++{ ++ if (enable) ++ return irs1125_stream_on(sd); ++ else ++ return irs1125_stream_off(sd); ++} ++ ++static const struct v4l2_subdev_video_ops irs1125_subdev_video_ops = { ++ .s_stream = irs1125_s_stream, ++}; ++ ++static int irs1125_enum_mbus_code(struct v4l2_subdev *sd, ++ struct v4l2_subdev_pad_config *cfg, ++ struct v4l2_subdev_mbus_code_enum *code) ++{ ++ if (code->index > 0) ++ return -EINVAL; ++ ++ code->code = MEDIA_BUS_FMT_Y12_1X12; ++ ++ return 0; ++} ++ ++static int irs1125_set_get_fmt(struct v4l2_subdev *sd, ++ struct v4l2_subdev_pad_config *cfg, ++ struct v4l2_subdev_format *format) ++{ ++ struct v4l2_mbus_framefmt *fmt = &format->format; ++ struct irs1125 *irs1125 = to_state(sd); ++ ++ if (format->pad != 0) ++ return -EINVAL; ++ ++ /* Only one format is supported, so return that */ ++ memset(fmt, 0, sizeof(*fmt)); ++ fmt->code = MEDIA_BUS_FMT_Y12_1X12; ++ fmt->colorspace = V4L2_COLORSPACE_RAW; ++ fmt->field = V4L2_FIELD_NONE; ++ fmt->width = IRS1125_WINDOW_WIDTH_DEF; ++ fmt->height = IRS1125_WINDOW_HEIGHT_DEF * irs1125->num_seq; ++ ++ return 0; ++} ++ ++static const struct v4l2_subdev_pad_ops irs1125_subdev_pad_ops = { ++ .enum_mbus_code = irs1125_enum_mbus_code, ++ .set_fmt = irs1125_set_get_fmt, ++ .get_fmt = irs1125_set_get_fmt, ++}; ++ ++static const struct v4l2_subdev_ops irs1125_subdev_ops = { ++ .core = &irs1125_subdev_core_ops, ++ .video = &irs1125_subdev_video_ops, ++ .pad = &irs1125_subdev_pad_ops, ++}; ++ ++static int irs1125_s_ctrl(struct v4l2_ctrl *ctrl) ++{ ++ struct irs1125 *dev = container_of(ctrl->handler, ++ struct irs1125, ctrl_handler); ++ struct i2c_client *client = v4l2_get_subdevdata(&dev->sd); ++ int err, i; ++ struct irs1125_mod_pll *mod_cur, *mod_new; ++ struct irs1125_seq_cfg *cfg_cur, *cfg_new; ++ u16 addr, val; ++ ++ err = 0; ++ ++ switch (ctrl->id) { ++ case IRS1125_CID_SAFE_RECONFIG: ++ { ++ struct irs1125_illu *illu_cur, *illu_new; ++ ++ illu_new = (struct irs1125_illu *)ctrl->p_new.p; ++ illu_cur = (struct irs1125_illu *)ctrl->p_cur.p; ++ for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) { ++ if (illu_cur[i].exposure != illu_new[i].exposure) { ++ addr = 0xA850 + i * 2; ++ val = illu_new[i].exposure; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (illu_cur[i].framerate != illu_new[i].framerate) { ++ addr = 0xA851 + i * 2; ++ val = illu_new[i].framerate; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ } ++ break; ++ } ++ case IRS1125_CID_MOD_PLL: ++ mod_new = (struct irs1125_mod_pll *)ctrl->p_new.p; ++ mod_cur = (struct irs1125_mod_pll *)ctrl->p_cur.p; ++ for (i = 0; i < IRS1125_NUM_MOD_PLLS; i++) { ++ if (mod_cur[i].pllcfg1 != mod_new[i].pllcfg1) { ++ addr = 0xC3A0 + i * 3; ++ val = mod_new[i].pllcfg1; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg2 != mod_new[i].pllcfg2) { ++ addr = 0xC3A1 + i * 3; ++ val = mod_new[i].pllcfg2; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg3 != mod_new[i].pllcfg3) { ++ addr = 0xC3A2 + i * 3; ++ val = mod_new[i].pllcfg3; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg4 != mod_new[i].pllcfg4) { ++ addr = 0xC24C + i * 5; ++ val = mod_new[i].pllcfg4; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg5 != mod_new[i].pllcfg5) { ++ addr = 0xC24D + i * 5; ++ val = mod_new[i].pllcfg5; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg6 != mod_new[i].pllcfg6) { ++ addr = 0xC24E + i * 5; ++ val = mod_new[i].pllcfg6; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg7 != mod_new[i].pllcfg7) { ++ addr = 0xC24F + i * 5; ++ val = mod_new[i].pllcfg7; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (mod_cur[i].pllcfg8 != mod_new[i].pllcfg8) { ++ addr = 0xC250 + i * 5; ++ val = mod_new[i].pllcfg8; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ } ++ break; ++ case IRS1125_CID_SEQ_CONFIG: ++ cfg_new = (struct irs1125_seq_cfg *)ctrl->p_new.p; ++ cfg_cur = (struct irs1125_seq_cfg *)ctrl->p_cur.p; ++ for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) { ++ if (cfg_cur[i].exposure != cfg_new[i].exposure) { ++ addr = IRS1125_REG_DMEM_SHADOW + i * 4; ++ val = cfg_new[i].exposure; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (cfg_cur[i].framerate != cfg_new[i].framerate) { ++ addr = IRS1125_REG_DMEM_SHADOW + 1 + i * 4; ++ val = cfg_new[i].framerate; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (cfg_cur[i].ps != cfg_new[i].ps) { ++ addr = IRS1125_REG_DMEM_SHADOW + 2 + i * 4; ++ val = cfg_new[i].ps; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ if (cfg_cur[i].pll != cfg_new[i].pll) { ++ addr = IRS1125_REG_DMEM_SHADOW + 3 + i * 4; ++ val = cfg_new[i].pll; ++ err = irs1125_write(&dev->sd, addr, val); ++ if (err < 0) ++ break; ++ } ++ } ++ break; ++ case IRS1125_CID_NUM_SEQS: ++ err = irs1125_write(&dev->sd, 0xA88D, ctrl->val - 1); ++ if (err >= 0) ++ dev->num_seq = ctrl->val; ++ break; ++ case IRS1125_CID_CONTINUOUS_TRIG: ++ if (ctrl->val == 0) ++ err = irs1125_write(&dev->sd, 0xA87C, 0); ++ else ++ err = irs1125_write(&dev->sd, 0xA87C, 1); ++ break; ++ case IRS1125_CID_TRIGGER: ++ if (ctrl->val != 0) { ++ err = irs1125_write(&dev->sd, 0xA87C, 1); ++ if (err >= 0) ++ err = irs1125_write(&dev->sd, 0xA87C, 0); ++ } ++ break; ++ case IRS1125_CID_RECONFIG: ++ if (ctrl->val != 0) ++ err = irs1125_write(&dev->sd, 0xA87A, 1); ++ break; ++ case IRS1125_CID_ILLU_ON: ++ if (ctrl->val == 0) ++ err = irs1125_write(&dev->sd, 0xA892, 0x377); ++ else ++ err = irs1125_write(&dev->sd, 0xA892, 0x355); ++ break; ++ default: ++ break; ++ } ++ ++ if (err < 0) ++ dev_err(&client->dev, "Error executing control ID: %d, val %d, err %d", ++ ctrl->id, ctrl->val, err); ++ else ++ err = 0; ++ ++ return err; ++} ++ ++static const struct v4l2_ctrl_ops irs1125_ctrl_ops = { ++ .s_ctrl = irs1125_s_ctrl, ++}; ++ ++static const struct v4l2_ctrl_config irs1125_custom_ctrls[] = { ++ { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_NUM_SEQS, ++ .name = "Change number of sequences", ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .flags = V4L2_CTRL_FLAG_MODIFY_LAYOUT, ++ .min = 1, ++ .max = 20, ++ .step = 1, ++ .def = 5, ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_MOD_PLL, ++ .name = "Reconfigure modulation PLLs", ++ .type = V4L2_CTRL_TYPE_U16, ++ .flags = V4L2_CTRL_FLAG_HAS_PAYLOAD, ++ .min = 0, ++ .max = U16_MAX, ++ .step = 1, ++ .def = 0, ++ .elem_size = sizeof(u16), ++ .dims = {sizeof(struct irs1125_mod_pll) / sizeof(u16), ++ IRS1125_NUM_MOD_PLLS} ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_SAFE_RECONFIG, ++ .name = "Change exposure and pause of single seq", ++ .type = V4L2_CTRL_TYPE_U16, ++ .flags = V4L2_CTRL_FLAG_HAS_PAYLOAD, ++ .min = 0, ++ .max = U16_MAX, ++ .step = 1, ++ .def = 0, ++ .elem_size = sizeof(u16), ++ .dims = {sizeof(struct irs1125_illu) / sizeof(u16), ++ IRS1125_NUM_SEQ_ENTRIES} ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_SEQ_CONFIG, ++ .name = "Change sequence settings", ++ .type = V4L2_CTRL_TYPE_U16, ++ .flags = V4L2_CTRL_FLAG_HAS_PAYLOAD, ++ .min = 0, ++ .max = U16_MAX, ++ .step = 1, ++ .def = 0, ++ .elem_size = sizeof(u16), ++ .dims = {sizeof(struct irs1125_seq_cfg) / sizeof(u16), ++ IRS1125_NUM_SEQ_ENTRIES} ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_CONTINUOUS_TRIG, ++ .name = "Enable/disable continuous trigger", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 0 ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_TRIGGER, ++ .name = "Capture a single sequence", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 0 ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_RECONFIG, ++ .name = "Trigger imager reconfiguration", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 0 ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_ILLU_ON, ++ .name = "Turn illu on or off", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 1 ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_IDENT0, ++ .name = "Get ident 0 information", ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .flags = V4L2_CTRL_FLAG_READ_ONLY, ++ .min = S32_MIN, ++ .max = S32_MAX, ++ .step = 1, ++ .def = 0 ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_IDENT1, ++ .name = "Get ident 1 information", ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .flags = V4L2_CTRL_FLAG_READ_ONLY, ++ .min = S32_MIN, ++ .max = S32_MAX, ++ .step = 1, ++ .def = 0 ++ }, { ++ .ops = &irs1125_ctrl_ops, ++ .id = IRS1125_CID_IDENT2, ++ .name = "Get ident 2 information", ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .flags = V4L2_CTRL_FLAG_READ_ONLY, ++ .min = S32_MIN, ++ .max = S32_MAX, ++ .step = 1, ++ .def = 0 ++ } ++}; ++ ++static int irs1125_detect(struct v4l2_subdev *sd) ++{ ++ u16 read; ++ int ret; ++ struct i2c_client *client = v4l2_get_subdevdata(sd); ++ ++ ret = irs1125_read(sd, IRS1125_REG_DESIGN_STEP, &read); ++ if (ret < 0) { ++ dev_err(&client->dev, "error reading from i2c\n"); ++ return ret; ++ } ++ ++ if (read != IRS1125_DESIGN_STEP_EXPECTED) { ++ dev_err(&client->dev, "Design step expected 0x%x got 0x%x", ++ IRS1125_DESIGN_STEP_EXPECTED, read); ++ return -ENODEV; ++ } ++ ++ return 0; ++} ++ ++static int irs1125_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ struct v4l2_mbus_framefmt *format = ++ v4l2_subdev_get_try_format(sd, fh->pad, 0); ++ ++ format->code = MEDIA_BUS_FMT_Y12_1X12; ++ format->width = IRS1125_WINDOW_WIDTH_DEF; ++ format->height = IRS1125_WINDOW_HEIGHT_DEF; ++ format->field = V4L2_FIELD_NONE; ++ format->colorspace = V4L2_COLORSPACE_RAW; ++ ++ return 0; ++} ++ ++static const struct v4l2_subdev_internal_ops irs1125_subdev_internal_ops = { ++ .open = irs1125_open, ++}; ++ ++static int irs1125_ctrls_init(struct irs1125 *sensor, struct device *dev) ++{ ++ struct v4l2_ctrl *ctrl; ++ int err, i; ++ struct v4l2_ctrl_handler *hdl; ++ ++ hdl = &sensor->ctrl_handler; ++ v4l2_ctrl_handler_init(hdl, ARRAY_SIZE(irs1125_custom_ctrls)); ++ ++ for (i = 0; i < ARRAY_SIZE(irs1125_custom_ctrls); i++) { ++ ctrl = v4l2_ctrl_new_custom(hdl, &irs1125_custom_ctrls[i], ++ NULL); ++ if (!ctrl) ++ dev_err(dev, "Failed to init custom control %s\n", ++ irs1125_custom_ctrls[i].name); ++ else if (irs1125_custom_ctrls[i].id == IRS1125_CID_NUM_SEQS) ++ sensor->ctrl_numseq = ctrl; ++ else if (irs1125_custom_ctrls[i].id == IRS1125_CID_MOD_PLL) ++ sensor->ctrl_modplls = ctrl; ++ } ++ ++ if (hdl->error) { ++ dev_err(dev, "Error %d adding controls\n", hdl->error); ++ err = hdl->error; ++ goto error_ctrls; ++ } ++ ++ sensor->sd.ctrl_handler = hdl; ++ return 0; ++ ++error_ctrls: ++ v4l2_ctrl_handler_free(&sensor->ctrl_handler); ++ return -err; ++} ++ ++static int irs1125_ident_setup(struct irs1125 *sensor, struct device *dev) ++{ ++ int ret; ++ struct v4l2_ctrl *ctrl; ++ struct v4l2_subdev *sd; ++ u16 read; ++ ++ sd = &sensor->sd; ++ ++ ctrl = v4l2_ctrl_find(&sensor->ctrl_handler, IRS1125_CID_IDENT0); ++ if (!ctrl) { ++ dev_err(dev, "could not find device ctrl.\n"); ++ return -EINVAL; ++ } ++ ++ ret = irs1125_read(sd, IRS1125_REG_EFUSEVAL2, &read); ++ if (ret < 0) { ++ dev_err(dev, "error reading from i2c\n"); ++ return -EIO; ++ } ++ ++ v4l2_ctrl_s_ctrl(ctrl, read); ++ ++ ctrl = v4l2_ctrl_find(&sensor->ctrl_handler, IRS1125_CID_IDENT1); ++ if (!ctrl) { ++ dev_err(dev, "could not find device ctrl.\n"); ++ return -EINVAL; ++ } ++ ++ ret = irs1125_read(sd, IRS1125_REG_EFUSEVAL3, &read); ++ if (ret < 0) { ++ dev_err(dev, "error reading from i2c\n"); ++ return -EIO; ++ } ++ ++ v4l2_ctrl_s_ctrl(ctrl, read); ++ ++ ctrl = v4l2_ctrl_find(&sensor->ctrl_handler, IRS1125_CID_IDENT2); ++ if (!ctrl) { ++ dev_err(dev, "could not find device ctrl.\n"); ++ return -EINVAL; ++ } ++ ++ ret = irs1125_read(sd, IRS1125_REG_EFUSEVAL4, &read); ++ if (ret < 0) { ++ dev_err(dev, "error reading from i2c\n"); ++ return -EIO; ++ } ++ v4l2_ctrl_s_ctrl(ctrl, read & 0xFFFC); ++ ++ return 0; ++} ++ ++static int irs1125_probe(struct i2c_client *client, ++ const struct i2c_device_id *id) ++{ ++ struct device *dev = &client->dev; ++ struct irs1125 *sensor; ++ int ret; ++ struct fwnode_handle *endpoint; ++ u32 xclk_freq; ++ int gpio_num; ++ ++ sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL); ++ if (!sensor) ++ return -ENOMEM; ++ ++ v4l2_i2c_subdev_init(&sensor->sd, client, &irs1125_subdev_ops); ++ ++ /* Get CSI2 bus config */ ++ endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), ++ NULL); ++ if (!endpoint) { ++ dev_err(dev, "endpoint node not found\n"); ++ return -EINVAL; ++ } ++ ++ ret = v4l2_fwnode_endpoint_parse(endpoint, &sensor->ep); ++ fwnode_handle_put(endpoint); ++ if (ret) { ++ dev_err(dev, "Could not parse endpoint\n"); ++ return ret; ++ } ++ ++ /* get system clock (xclk) */ ++ sensor->xclk = devm_clk_get(dev, NULL); ++ if (IS_ERR(sensor->xclk)) { ++ dev_err(dev, "could not get xclk"); ++ return PTR_ERR(sensor->xclk); ++ } ++ ++ xclk_freq = clk_get_rate(sensor->xclk); ++ if (xclk_freq != 26000000) { ++ dev_err(dev, "Unsupported clock frequency: %u\n", xclk_freq); ++ return -EINVAL; ++ } ++ ++ sensor->num_seq = 5; ++ ++ /* Request the power down GPIO */ ++ sensor->reset = devm_gpiod_get(&client->dev, "pwdn", ++ GPIOD_OUT_LOW); ++ ++ if (IS_ERR(sensor->reset)) { ++ dev_err(dev, "could not get reset"); ++ return PTR_ERR(sensor->reset); ++ } ++ ++ gpio_num = desc_to_gpio(sensor->reset); ++ ++ mutex_init(&sensor->lock); ++ ++ ret = irs1125_ctrls_init(sensor, dev); ++ if (ret < 0) ++ goto mutex_remove; ++ ++ sensor->sd.internal_ops = &irs1125_subdev_internal_ops; ++ sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ sensor->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; ++ sensor->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_pads_init(&sensor->sd.entity, 1, &sensor->pad); ++ if (ret < 0) ++ goto mutex_remove; ++ ++ gpiod_set_value_cansleep(sensor->reset, 1); ++ msleep(RESET_ACTIVE_DELAY_MS); ++ ++ ret = irs1125_detect(&sensor->sd); ++ if (ret < 0) ++ goto error; ++ ++ ret = irs1125_ident_setup(sensor, dev); ++ if (ret < 0) ++ goto error; ++ ++ gpiod_set_value_cansleep(sensor->reset, 0); ++ ++ ret = v4l2_async_register_subdev(&sensor->sd); ++ if (ret < 0) ++ goto error; ++ ++ dev_dbg(dev, "Infineon IRS1125 camera driver probed\n"); ++ ++ return 0; ++ ++error: ++ media_entity_cleanup(&sensor->sd.entity); ++mutex_remove: ++ mutex_destroy(&sensor->lock); ++ return ret; ++} ++ ++static int irs1125_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *sd = i2c_get_clientdata(client); ++ struct irs1125 *irs1125 = to_state(sd); ++ ++ v4l2_async_unregister_subdev(&irs1125->sd); ++ media_entity_cleanup(&irs1125->sd.entity); ++ v4l2_device_unregister_subdev(sd); ++ mutex_destroy(&irs1125->lock); ++ v4l2_ctrl_handler_free(&irs1125->ctrl_handler); ++ ++ return 0; ++} ++ ++#if IS_ENABLED(CONFIG_OF) ++static const struct of_device_id irs1125_of_match[] = { ++ { .compatible = "infineon,irs1125" }, ++ { /* sentinel */ }, ++}; ++MODULE_DEVICE_TABLE(of, irs1125_of_match); ++#endif ++ ++static struct i2c_driver irs1125_driver = { ++ .driver = { ++ .of_match_table = of_match_ptr(irs1125_of_match), ++ .name = SENSOR_NAME, ++ }, ++ .probe = irs1125_probe, ++ .remove = irs1125_remove, ++}; ++ ++module_i2c_driver(irs1125_driver); ++ ++MODULE_AUTHOR("Markus Proeller "); ++MODULE_DESCRIPTION("Infineon irs1125 sensor driver"); ++MODULE_LICENSE("GPL v2"); ++ +--- /dev/null ++++ b/drivers/media/i2c/irs1125.h +@@ -0,0 +1,61 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * A V4L2 driver for Infineon IRS1125 TOF cameras. ++ * Copyright (C) 2018, pieye GmbH ++ * ++ * Based on V4L2 OmniVision OV5647 Image Sensor driver ++ * Copyright (C) 2016 Ramiro Oliveira ++ * ++ * DT / fwnode changes, and GPIO control taken from ov5640.c ++ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. ++ * Copyright (C) 2014-2017 Mentor Graphics Inc. ++ * ++ */ ++ ++#ifndef IRS1125_H ++#define IRS1125_H ++ ++#include ++#include ++ ++#define IRS1125_NUM_SEQ_ENTRIES 20 ++#define IRS1125_NUM_MOD_PLLS 4 ++ ++#define IRS1125_CID_CUSTOM_BASE (V4L2_CID_USER_BASE | 0xf000) ++#define IRS1125_CID_SAFE_RECONFIG (IRS1125_CID_CUSTOM_BASE + 0) ++#define IRS1125_CID_CONTINUOUS_TRIG (IRS1125_CID_CUSTOM_BASE + 1) ++#define IRS1125_CID_TRIGGER (IRS1125_CID_CUSTOM_BASE + 2) ++#define IRS1125_CID_RECONFIG (IRS1125_CID_CUSTOM_BASE + 3) ++#define IRS1125_CID_ILLU_ON (IRS1125_CID_CUSTOM_BASE + 4) ++#define IRS1125_CID_NUM_SEQS (IRS1125_CID_CUSTOM_BASE + 5) ++#define IRS1125_CID_MOD_PLL (IRS1125_CID_CUSTOM_BASE + 6) ++#define IRS1125_CID_SEQ_CONFIG (IRS1125_CID_CUSTOM_BASE + 7) ++#define IRS1125_CID_IDENT0 (IRS1125_CID_CUSTOM_BASE + 8) ++#define IRS1125_CID_IDENT1 (IRS1125_CID_CUSTOM_BASE + 9) ++#define IRS1125_CID_IDENT2 (IRS1125_CID_CUSTOM_BASE + 10) ++ ++struct irs1125_seq_cfg { ++ __u16 exposure; ++ __u16 framerate; ++ __u16 ps; ++ __u16 pll; ++}; ++ ++struct irs1125_illu { ++ __u16 exposure; ++ __u16 framerate; ++}; ++ ++struct irs1125_mod_pll { ++ __u16 pllcfg1; ++ __u16 pllcfg2; ++ __u16 pllcfg3; ++ __u16 pllcfg4; ++ __u16 pllcfg5; ++ __u16 pllcfg6; ++ __u16 pllcfg7; ++ __u16 pllcfg8; ++}; ++ ++#endif /* IRS1125 */ ++ diff --git a/target/linux/brcm2708/patches-4.19/950-0741-dtoverlays-Add-an-overlay-for-the-Infineon-IRS1125.patch b/target/linux/brcm2708/patches-4.19/950-0741-dtoverlays-Add-an-overlay-for-the-Infineon-IRS1125.patch new file mode 100644 index 0000000000..1202d10d31 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0741-dtoverlays-Add-an-overlay-for-the-Infineon-IRS1125.patch @@ -0,0 +1,149 @@ +From 89af5d7df7f548744bd675d96295c0f45e24b31f Mon Sep 17 00:00:00 2001 +From: Markus Proeller +Date: Thu, 10 Oct 2019 19:13:02 +0200 +Subject: [PATCH] dtoverlays: Add an overlay for the Infineon IRS1125 + +The Infineon IRS1125 is a CSI2 time of flight depth sensor +which has a suitable V4L2 subdevice driver. + +Add an overlay for configuring it. + +Signed-off-by: Markus Proeller +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 12 +++ + .../arm/boot/dts/overlays/irs1125-overlay.dts | 97 +++++++++++++++++++ + 3 files changed, 110 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/irs1125-overlay.dts + +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -83,6 +83,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + iqaudio-dac.dtbo \ + iqaudio-dacplus.dtbo \ + iqaudio-digi-wm8804-audio.dtbo \ ++ irs1125.dtbo \ + jedec-spi-nor.dtbo \ + justboom-dac.dtbo \ + justboom-digi.dtbo \ +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1347,6 +1347,18 @@ Params: card_name Override + dai stream name. + + ++Name: irs1125 ++Info: Infineon irs1125 TOF camera module. ++ Uses Unicam 1, which is the standard camera connector on most Pi ++ variants. ++Load: dtoverlay=irs1125,= ++Params: i2c_pins_0_1 Use pins 0&1 for the I2C instead of 44&45. ++ Useful on Compute Modules. ++ ++ i2c_pins_28_29 Use pins 28&29 for the I2C instead of 44&45. ++ This is required for Pi B+, 2, 0, and 0W. ++ ++ + Name: jedec-spi-nor + Info: Adds support for JEDEC-compliant SPI NOR flash devices. (Note: The + "jedec,spi-nor" kernel driver was formerly known as "m25p80".) +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts +@@ -0,0 +1,97 @@ ++// SPDX-License-Identifier: GPL-2.0-only ++// Definitions for IRS1125 camera module on VC I2C bus ++/dts-v1/; ++/plugin/; ++ ++/{ ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target = <&i2c_vc>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ irs1125: irs1125@3D { ++ compatible = "infineon,irs1125"; ++ reg = <0x3D>; ++ status = "okay"; ++ ++ pwdn-gpios = <&gpio 5 0>; ++ clocks = <&irs1125_clk>; ++ ++ irs1125_clk: camera-clk { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <26000000>; ++ }; ++ ++ port { ++ irs1125_0: endpoint { ++ remote-endpoint = <&csi1_ep>; ++ clock-lanes = <0>; ++ data-lanes = <1 2>; ++ clock-noncontinuous; ++ link-frequencies = ++ /bits/ 64 <297000000>; ++ }; ++ }; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&csi1>; ++ __overlay__ { ++ status = "okay"; ++ ++ port { ++ csi1_ep: endpoint { ++ remote-endpoint = <&irs1125_0>; ++ }; ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&i2c0_pins>; ++ __dormant__ { ++ brcm,pins = <28 29>; ++ brcm,function = <4>; /* alt0 */ ++ }; ++ }; ++ fragment@3 { ++ target = <&i2c0_pins>; ++ __overlay__ { ++ brcm,pins = <44 45>; ++ brcm,function = <5>; /* alt1 */ ++ }; ++ }; ++ fragment@4 { ++ target = <&i2c0_pins>; ++ __dormant__ { ++ brcm,pins = <0 1>; ++ brcm,function = <4>; /* alt0 */ ++ }; ++ }; ++ fragment@5 { ++ target = <&i2c_vc>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@6 { ++ target-path="/__overrides__"; ++ __overlay__ { ++ cam0-pwdn-ctrl = <&irs1125>,"pwdn-gpios:0"; ++ cam0-pwdn = <&irs1125>,"pwdn-gpios:4"; ++ }; ++ }; ++ ++ __overrides__ { ++ i2c_pins_0_1 = <0>,"-2-3+4"; ++ i2c_pins_28_29 = <0>,"+2-3-4"; ++ }; ++}; diff --git a/target/linux/brcm2708/patches-4.19/950-0742-rpi-wm8804-soundcard-Fixed-MCLKDIV-for-Allo-Digione.patch b/target/linux/brcm2708/patches-4.19/950-0742-rpi-wm8804-soundcard-Fixed-MCLKDIV-for-Allo-Digione.patch new file mode 100644 index 0000000000..952e26664c --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0742-rpi-wm8804-soundcard-Fixed-MCLKDIV-for-Allo-Digione.patch @@ -0,0 +1,42 @@ +From 09ad53f0267e4b5433c27c77b3945d584ac0a6ba Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Tue, 22 Oct 2019 08:47:29 +0100 +Subject: [PATCH] rpi-wm8804-soundcard: Fixed MCLKDIV for Allo Digione + +The Allo Digione board wants a fixed MCLKDIV of 256. + +See: https://github.com/raspberrypi/linux/issues/3296 + +Signed-off-by: Phil Elwell +--- + sound/soc/bcm/rpi-wm8804-soundcard.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/sound/soc/bcm/rpi-wm8804-soundcard.c ++++ b/sound/soc/bcm/rpi-wm8804-soundcard.c +@@ -66,6 +66,11 @@ static struct gpio_desc *snd_clk44gpio; + static struct gpio_desc *snd_clk48gpio; + static int wm8804_samplerate = 0; + ++/* Forward declarations */ ++static struct snd_soc_dai_link snd_allo_digione_dai[]; ++static struct snd_soc_card snd_rpi_wm8804; ++ ++ + #define CLK_44EN_RATE 22579200UL + #define CLK_48EN_RATE 24576000UL + +@@ -90,11 +95,10 @@ static unsigned int snd_rpi_wm8804_enabl + static void snd_rpi_wm8804_clk_cfg(unsigned int samplerate, + struct wm8804_clk_cfg *clk_cfg) + { +- clk_cfg->mclk_freq = 0; +- clk_cfg->mclk_div = 1; + clk_cfg->sysclk_freq = 27000000; + +- if (samplerate <= 96000) { ++ if (samplerate <= 96000 || ++ snd_rpi_wm8804.dai_link == snd_allo_digione_dai) { + clk_cfg->mclk_freq = samplerate * 256; + clk_cfg->mclk_div = WM8804_MCLKDIV_256FS; + } else { diff --git a/target/linux/brcm2708/patches-4.19/950-0743-dts-bcm2838-Disable-DWC-OTG-block-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0743-dts-bcm2838-Disable-DWC-OTG-block-by-default.patch new file mode 100644 index 0000000000..83cd3397e9 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0743-dts-bcm2838-Disable-DWC-OTG-block-by-default.patch @@ -0,0 +1,23 @@ +From 2e3db17d59143bfaf15423feb7eed68893e04f66 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Thu, 24 Oct 2019 14:31:00 +0100 +Subject: [PATCH] dts: bcm2838: Disable DWC OTG block by default + +Turning off the OTG USB block saves power. Since it requires the use of +the dwc2 overlay to make use of it, we can disable it by default. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2838.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/boot/dts/bcm2838.dtsi ++++ b/arch/arm/boot/dts/bcm2838.dtsi +@@ -647,6 +647,7 @@ + + &usb { + interrupts = ; ++ status = "disabled"; + }; + + &hdmi { diff --git a/target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-Add-support-for-ENUM_FRAMESIZE.patch b/target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-Add-support-for-ENUM_FRAMESIZE.patch new file mode 100644 index 0000000000..9c9a0bf6bb --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0744-staging-bcm2835-codec-Add-support-for-ENUM_FRAMESIZE.patch @@ -0,0 +1,98 @@ +From 9894906ad424f266853b61a6996b2da8b119c6e6 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Fri, 13 Sep 2019 17:19:33 +0100 +Subject: [PATCH] staging:bcm2835-codec: Add support for + ENUM_FRAMESIZES + +Required for compliance testing for the encoder. + +Signed-off-by: Dave Stevenson +--- + .../bcm2835-codec/bcm2835-v4l2-codec.c | 48 +++++++++++++++++-- + 1 file changed, 44 insertions(+), 4 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -496,9 +496,10 @@ struct bcm2835_codec_fmt *get_default_fo + return &dev->supported_fmts[capture ? 1 : 0].list[0]; + } + +-static struct bcm2835_codec_fmt *find_format(struct v4l2_format *f, +- struct bcm2835_codec_dev *dev, +- bool capture) ++static ++struct bcm2835_codec_fmt *find_format_pix_fmt(u32 pix_fmt, ++ struct bcm2835_codec_dev *dev, ++ bool capture) + { + struct bcm2835_codec_fmt *fmt; + unsigned int k; +@@ -507,7 +508,7 @@ static struct bcm2835_codec_fmt *find_fo + + for (k = 0; k < fmts->num_entries; k++) { + fmt = &fmts->list[k]; +- if (fmt->fourcc == f->fmt.pix_mp.pixelformat) ++ if (fmt->fourcc == pix_fmt) + break; + } + if (k == fmts->num_entries) +@@ -516,6 +517,14 @@ static struct bcm2835_codec_fmt *find_fo + return &fmts->list[k]; + } + ++static inline ++struct bcm2835_codec_fmt *find_format(struct v4l2_format *f, ++ struct bcm2835_codec_dev *dev, ++ bool capture) ++{ ++ return find_format_pix_fmt(f->fmt.pix_mp.pixelformat, dev, capture); ++} ++ + static inline struct bcm2835_codec_ctx *file2ctx(struct file *file) + { + return container_of(file->private_data, struct bcm2835_codec_ctx, fh); +@@ -1792,6 +1801,36 @@ static int vidioc_encoder_cmd(struct fil + return 0; + } + ++static int vidioc_enum_framesizes(struct file *file, void *fh, ++ struct v4l2_frmsizeenum *fsize) ++{ ++ struct bcm2835_codec_fmt *fmt; ++ ++ fmt = find_format_pix_fmt(fsize->pixel_format, file2ctx(file)->dev, ++ true); ++ if (!fmt) ++ fmt = find_format_pix_fmt(fsize->pixel_format, ++ file2ctx(file)->dev, ++ false); ++ ++ if (!fmt) ++ return -EINVAL; ++ ++ if (fsize->index) ++ return -EINVAL; ++ ++ fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE; ++ ++ fsize->stepwise.min_width = MIN_W; ++ fsize->stepwise.max_width = MAX_W; ++ fsize->stepwise.step_width = 1; ++ fsize->stepwise.min_height = MIN_H; ++ fsize->stepwise.max_height = MAX_H; ++ fsize->stepwise.step_height = 1; ++ ++ return 0; ++} ++ + static const struct v4l2_ioctl_ops bcm2835_codec_ioctl_ops = { + .vidioc_querycap = vidioc_querycap, + +@@ -1829,6 +1868,7 @@ static const struct v4l2_ioctl_ops bcm28 + .vidioc_try_decoder_cmd = vidioc_try_decoder_cmd, + .vidioc_encoder_cmd = vidioc_encoder_cmd, + .vidioc_try_encoder_cmd = vidioc_try_encoder_cmd, ++ .vidioc_enum_framesizes = vidioc_enum_framesizes, + }; + + static int bcm2835_codec_set_ctrls(struct bcm2835_codec_ctx *ctx) diff --git a/target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-Correct-buffer-type-check-on-G.patch b/target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-Correct-buffer-type-check-on-G.patch new file mode 100644 index 0000000000..1049a4d12d --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0745-staging-bcm2835-codec-Correct-buffer-type-check-on-G.patch @@ -0,0 +1,25 @@ +From 9783756bf18033f321161393814dc1dd99c1704a Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Fri, 13 Sep 2019 17:22:08 +0100 +Subject: [PATCH] staging: bcm2835-codec: Correct buffer type check on + G_PARM + +The output queue buffer type is now OUTPUT_MPLANE. + +Fixes: 5e484a3 staging: bcm2835-codec: switch to multi-planar API +Signed-off-by: Dave Stevenson +--- + .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -1438,7 +1438,7 @@ static int vidioc_g_parm(struct file *fi + { + struct bcm2835_codec_ctx *ctx = file2ctx(file); + +- if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) ++ if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + return -EINVAL; + + parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME; diff --git a/target/linux/brcm2708/patches-4.19/950-0746-staging-bcm2835-codec-Set-default-and-error-check-ti.patch b/target/linux/brcm2708/patches-4.19/950-0746-staging-bcm2835-codec-Set-default-and-error-check-ti.patch new file mode 100644 index 0000000000..896149fb1e --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0746-staging-bcm2835-codec-Set-default-and-error-check-ti.patch @@ -0,0 +1,37 @@ +From 4d6c40ebfe10dd2fdc64bd7607e51275d5524e47 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Fri, 13 Sep 2019 17:23:26 +0100 +Subject: [PATCH] staging: bcm2835-codec: Set default and error check + timeperframe + +G_PARM default was invalid as 0/0, and the driver didn't check +the value set in S_PARM wasn't 0/0. + +Signed-off-by: Dave Stevenson +--- + .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -1423,6 +1423,10 @@ static int vidioc_s_parm(struct file *fi + if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + return -EINVAL; + ++ if (!parm->parm.output.timeperframe.denominator || ++ !parm->parm.output.timeperframe.numerator) ++ return -EINVAL; ++ + ctx->framerate_num = + parm->parm.output.timeperframe.denominator; + ctx->framerate_denom = +@@ -2390,6 +2394,9 @@ static int bcm2835_codec_open(struct fil + ctx->colorspace = V4L2_COLORSPACE_REC709; + ctx->bitrate = 10 * 1000 * 1000; + ++ ctx->framerate_num = 30; ++ ctx->framerate_denom = 1; ++ + /* Initialise V4L2 contexts */ + v4l2_fh_init(&ctx->fh, video_devdata(file)); + file->private_data = &ctx->fh; diff --git a/target/linux/brcm2708/patches-4.19/950-0747-staging-bcm2835-codec-Fix-imbalance-in-dma_buf_get-d.patch b/target/linux/brcm2708/patches-4.19/950-0747-staging-bcm2835-codec-Fix-imbalance-in-dma_buf_get-d.patch new file mode 100644 index 0000000000..20550d4cb1 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0747-staging-bcm2835-codec-Fix-imbalance-in-dma_buf_get-d.patch @@ -0,0 +1,30 @@ +From 4542b5d7b4e00b11dd37d93986b624c58b198765 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Mon, 7 Oct 2019 14:02:57 +0100 +Subject: [PATCH] staging: bcm2835-codec: Fix imbalance in + dma_buf_get/dma_buf_put + +When represented with a dmabuf buffer that had previously been +imported, there was a call to dma_buf_get without a matching +dma_buf_put. This left dmabufs in limbo after all users had +supposedly released them. + +Signed-off-by: Dave Stevenson +--- + .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -2112,6 +2112,11 @@ static int bcm2835_codec_buf_prepare(str + } + + buf->mmal.dma_buf = dma_buf; ++ } else { ++ /* We already have a reference count on the dmabuf, so ++ * release the one we acquired above. ++ */ ++ dma_buf_put(dma_buf); + } + ret = 0; + break; diff --git a/target/linux/brcm2708/patches-4.19/950-0748-drm-vc4-Added-calls-for-firmware-display-blank-unbla.patch b/target/linux/brcm2708/patches-4.19/950-0748-drm-vc4-Added-calls-for-firmware-display-blank-unbla.patch new file mode 100644 index 0000000000..fbfcd747cd --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0748-drm-vc4-Added-calls-for-firmware-display-blank-unbla.patch @@ -0,0 +1,87 @@ +From ebb8a4e93e242311d319098ea56e4ef4d92c4d19 Mon Sep 17 00:00:00 2001 +From: James Hughes +Date: Wed, 16 Oct 2019 14:49:23 +0100 +Subject: [PATCH] drm:vc4 Added calls for firmware display + blank/unblank + +Requires new display power mailbox call to be present. + +Signed-off-by: James Hughes +--- + drivers/gpu/drm/vc4/vc4_firmware_kms.c | 25 ++++++++++++++++++++++ + include/soc/bcm2835/raspberrypi-firmware.h | 2 +- + 2 files changed, 26 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c +@@ -91,6 +91,12 @@ struct mailbox_blank_display { + u32 blank; + }; + ++struct mailbox_display_pwr { ++ struct rpi_firmware_property_tag_header tag1; ++ u32 display; ++ u32 state; ++}; ++ + struct mailbox_get_edid { + struct rpi_firmware_property_tag_header tag1; + u32 block; +@@ -272,6 +278,7 @@ struct vc4_fkms_encoder { + struct drm_encoder base; + bool hdmi_monitor; + bool rgb_range_selectable; ++ int display_num; + }; + + static inline struct vc4_fkms_encoder * +@@ -1613,13 +1620,29 @@ static const struct drm_encoder_funcs vc + .destroy = vc4_fkms_encoder_destroy, + }; + ++static void vc4_fkms_display_power(struct drm_encoder *encoder, bool power) ++{ ++ struct vc4_fkms_encoder *vc4_encoder = to_vc4_fkms_encoder(encoder); ++ struct vc4_dev *vc4 = to_vc4_dev(encoder->dev); ++ ++ struct mailbox_display_pwr pwr = { ++ .tag1 = {RPI_FIRMWARE_SET_DISPLAY_POWER, 8, 0, }, ++ .display = vc4_encoder->display_num, ++ .state = power ? 1 : 0, ++ }; ++ ++ rpi_firmware_property_list(vc4->firmware, &pwr, sizeof(pwr)); ++} ++ + static void vc4_fkms_encoder_enable(struct drm_encoder *encoder) + { ++ vc4_fkms_display_power(encoder, true); + DRM_DEBUG_KMS("Encoder_enable\n"); + } + + static void vc4_fkms_encoder_disable(struct drm_encoder *encoder) + { ++ vc4_fkms_display_power(encoder, false); + DRM_DEBUG_KMS("Encoder_disable\n"); + } + +@@ -1695,6 +1718,8 @@ static int vc4_fkms_create_screen(struct + if (!vc4_encoder) + return -ENOMEM; + vc4_crtc->encoder = &vc4_encoder->base; ++ ++ vc4_encoder->display_num = display_ref; + vc4_encoder->base.possible_crtcs |= drm_crtc_mask(crtc) ; + + drm_encoder_init(drm, &vc4_encoder->base, &vc4_fkms_encoder_funcs, +--- a/include/soc/bcm2835/raspberrypi-firmware.h ++++ b/include/soc/bcm2835/raspberrypi-firmware.h +@@ -155,7 +155,7 @@ enum rpi_firmware_property_tag { + RPI_FIRMWARE_GET_DISPLAY_TIMING = 0x00040017, + RPI_FIRMWARE_SET_TIMING = 0x00048017, + RPI_FIRMWARE_GET_DISPLAY_CFG = 0x00040018, +- ++ RPI_FIRMWARE_SET_DISPLAY_POWER = 0x00048019, + RPI_FIRMWARE_GET_COMMAND_LINE = 0x00050001, + RPI_FIRMWARE_GET_DMA_CHANNELS = 0x00060001, + }; diff --git a/target/linux/brcm2708/patches-4.19/950-0749-rpi-poe-fan-fix-def_pwm1-writes.patch b/target/linux/brcm2708/patches-4.19/950-0749-rpi-poe-fan-fix-def_pwm1-writes.patch new file mode 100644 index 0000000000..bf5975edef --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0749-rpi-poe-fan-fix-def_pwm1-writes.patch @@ -0,0 +1,21 @@ +From 633c64173636b2f6acebfddb3d2b69c92bbbcd07 Mon Sep 17 00:00:00 2001 +From: Serge Schneider +Date: Thu, 31 Oct 2019 13:37:16 +0000 +Subject: [PATCH] rpi-poe-fan: fix def_pwm1 writes + +Signed-off-by: Serge Schneider +--- + drivers/hwmon/rpi-poe-fan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/hwmon/rpi-poe-fan.c ++++ b/drivers/hwmon/rpi-poe-fan.c +@@ -110,7 +110,7 @@ static int __set_def_pwm(struct rpi_poe + if (ctx->def_pwm_value == def_pwm) + goto exit_set_def_pwm_err; + +- ret = write_reg(ctx->fw, POE_CUR_PWM, &def_pwm); ++ ret = write_reg(ctx->fw, POE_DEF_PWM, &def_pwm); + if (!ret) + ctx->def_pwm_value = def_pwm; + exit_set_def_pwm_err: diff --git a/target/linux/brcm2708/patches-4.19/950-0750-net-phy-bcm54xx-Encode-link-speed-and-activity-into-.patch b/target/linux/brcm2708/patches-4.19/950-0750-net-phy-bcm54xx-Encode-link-speed-and-activity-into-.patch new file mode 100644 index 0000000000..9a5e29c208 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0750-net-phy-bcm54xx-Encode-link-speed-and-activity-into-.patch @@ -0,0 +1,67 @@ +From b1e290ec968186530ec59479adfba89d2cfe21c8 Mon Sep 17 00:00:00 2001 +From: Vladimir Oltean +Date: Sun, 24 Mar 2019 00:18:46 +0200 +Subject: [PATCH] net: phy: bcm54xx: Encode link speed and activity + into LEDs + +Previously the green and amber LEDs on this quad PHY were solid, to +indicate an encoding of the link speed (10/100/1000). + +This keeps the LEDs always on just as before, but now they flash on +Rx/Tx activity. + +Signed-off-by: Vladimir Oltean +Reviewed-by: Florian Fainelli +Signed-off-by: David S. Miller +--- + drivers/net/phy/broadcom.c | 13 +++++++++++++ + include/linux/brcmphy.h | 16 ++++++++++++++++ + 2 files changed, 29 insertions(+) + +--- a/drivers/net/phy/broadcom.c ++++ b/drivers/net/phy/broadcom.c +@@ -345,6 +345,19 @@ static int bcm54xx_config_init(struct ph + + bcm54xx_phydsp_config(phydev); + ++ /* Encode link speed into LED1 and LED3 pair (green/amber). ++ * Also flash these two LEDs on activity. This means configuring ++ * them for MULTICOLOR and encoding link/activity into them. ++ */ ++ val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) | ++ BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); ++ bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); ++ ++ val = BCM_LED_MULTICOLOR_IN_PHASE | ++ BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) | ++ BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT); ++ bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val); ++ + return 0; + } + +--- a/include/linux/brcmphy.h ++++ b/include/linux/brcmphy.h +@@ -148,6 +148,22 @@ + #define BCM_LED_SRC_OFF 0xe /* Tied high */ + #define BCM_LED_SRC_ON 0xf /* Tied low */ + ++/* ++ * Broadcom Multicolor LED configurations (expansion register 4) ++ */ ++#define BCM_EXP_MULTICOLOR (MII_BCM54XX_EXP_SEL_ER + 0x04) ++#define BCM_LED_MULTICOLOR_IN_PHASE BIT(8) ++#define BCM_LED_MULTICOLOR_LINK_ACT 0x0 ++#define BCM_LED_MULTICOLOR_SPEED 0x1 ++#define BCM_LED_MULTICOLOR_ACT_FLASH 0x2 ++#define BCM_LED_MULTICOLOR_FDX 0x3 ++#define BCM_LED_MULTICOLOR_OFF 0x4 ++#define BCM_LED_MULTICOLOR_ON 0x5 ++#define BCM_LED_MULTICOLOR_ALT 0x6 ++#define BCM_LED_MULTICOLOR_FLASH 0x7 ++#define BCM_LED_MULTICOLOR_LINK 0x8 ++#define BCM_LED_MULTICOLOR_ACT 0x9 ++#define BCM_LED_MULTICOLOR_PROGRAM 0xa + + /* + * BCM5482: Shadow registers diff --git a/target/linux/brcm2708/patches-4.19/950-0751-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch b/target/linux/brcm2708/patches-4.19/950-0751-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch new file mode 100644 index 0000000000..1b922420c0 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0751-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch @@ -0,0 +1,119 @@ +From 2679834327b5b8db8a7b0c90b632b81c35f9e271 Mon Sep 17 00:00:00 2001 +From: James Hughes +Date: Thu, 31 Oct 2019 14:39:44 +0000 +Subject: [PATCH] net:phy:2711 Allow ethernet LED mode to be set via + device tree + +Add device tree entries and code to allow the specification of +the lighting modes for the LED's on the ethernet connector. + +Signed-off-by: James Hughes +--- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 3 +++ + arch/arm/boot/dts/bcm2838.dtsi | 1 + + arch/arm/boot/dts/overlays/README | 28 +++++++++++++++++++-------- + drivers/net/phy/broadcom.c | 9 +++++++-- + 4 files changed, 31 insertions(+), 10 deletions(-) + +--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +@@ -334,5 +334,8 @@ + pwr_led_gpio = <&pwr_led>,"gpios:4"; + pwr_led_activelow = <&pwr_led>,"gpios:8"; + pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; ++ ++ eth_led0 = <&phy1>,"led-modes:0"; ++ eth_led1 = <&phy1>,"led-modes:4"; + }; + }; +--- a/arch/arm/boot/dts/bcm2838.dtsi ++++ b/arch/arm/boot/dts/bcm2838.dtsi +@@ -380,6 +380,7 @@ + /* No interrupts - use PHY_POLL */ + max-speed = <1000>; + reg = <0x1>; ++ led-modes = <0x02 0x02>; + }; + }; + }; +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -102,26 +102,38 @@ Params: + + eee Enable Energy Efficient Ethernet support for + compatible devices (default "on"). See also +- "tx_lpi_timer". ++ "tx_lpi_timer". Pi3B+ only. + + eth_downshift_after Set the number of auto-negotiation failures + after which the 1000Mbps modes are disabled. + Legal values are 2, 3, 4, 5 and 0, where +- 0 means never downshift (default 2). ++ 0 means never downshift (default 2). Pi3B+ only. + +- eth_led0 Set mode of LED0 (usually orange) (default +- "1"). The legal values are: +- 0=link/activity 1=link1000/activity ++ eth_led0 Set mode of LED0 (usually orange). The legal ++ values are: ++ ++ Pi3B+ ++ ++ 0=link/activity 1=link1000/activity (default) + 2=link100/activity 3=link10/activity + 4=link100/1000/activity 5=link10/1000/activity + 6=link10/100/activity 14=off 15=on + +- eth_led1 Set mode of LED1 (usually green) (default +- "6"). See eth_led0 for legal values. ++ Pi4 ++ ++ 0=Speed/Activity (default) 1=Speed ++ 2=Speed/Flash activity 3=FDX ++ 4=Off 5=On ++ 6=Alt 7=Speed/Flash ++ 8=Link 9=Activity ++ ++ eth_led1 Set mode of LED1 (usually green) (Pi3B+ default ++ "6", Pi4 default "0"). See eth_led0 for legal ++ values. + + eth_max_speed Set the maximum speed a link is allowed + to negotiate. Legal values are 10, 100 and +- 1000 (default 1000). ++ 1000 (default 1000). Pi3B+ only. + + i2c_arm Set to "on" to enable the ARM's i2c interface + (default "off") +--- a/drivers/net/phy/broadcom.c ++++ b/drivers/net/phy/broadcom.c +@@ -292,6 +292,9 @@ static void bcm54xx_adjust_rxrefclk(stru + static int bcm54xx_config_init(struct phy_device *phydev) + { + int reg, err, val; ++ u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT, ++ BCM_LED_MULTICOLOR_LINK_ACT}; ++ struct device_node *np = phydev->mdio.dev.of_node; + + reg = phy_read(phydev, MII_BCM54XX_ECR); + if (reg < 0) +@@ -345,6 +348,8 @@ static int bcm54xx_config_init(struct ph + + bcm54xx_phydsp_config(phydev); + ++ of_property_read_u32_array(np, "led-modes", led_modes, 2); ++ + /* Encode link speed into LED1 and LED3 pair (green/amber). + * Also flash these two LEDs on activity. This means configuring + * them for MULTICOLOR and encoding link/activity into them. +@@ -354,8 +359,8 @@ static int bcm54xx_config_init(struct ph + bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); + + val = BCM_LED_MULTICOLOR_IN_PHASE | +- BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) | +- BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT); ++ BCM5482_SHD_LEDS1_LED1(led_modes[0]) | ++ BCM5482_SHD_LEDS1_LED3(led_modes[1]); + bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val); + + return 0; diff --git a/target/linux/brcm2708/patches-4.19/950-0752-overlays-smi-fix-typo-in-comment-3320.patch b/target/linux/brcm2708/patches-4.19/950-0752-overlays-smi-fix-typo-in-comment-3320.patch new file mode 100644 index 0000000000..6b388e0579 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0752-overlays-smi-fix-typo-in-comment-3320.patch @@ -0,0 +1,23 @@ +From f12c4ba9fd01e17bd79b461b203674e92dd253e9 Mon Sep 17 00:00:00 2001 +From: Pierre-jean Texier +Date: Wed, 6 Nov 2019 10:00:43 +0100 +Subject: [PATCH] overlays: smi: fix typo in comment (#3320) + +5 represent alt1 function not alt0. + +Signed-off-by: Pierre-Jean Texier +--- + arch/arm/boot/dts/overlays/smi-overlay.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/overlays/smi-overlay.dts ++++ b/arch/arm/boot/dts/overlays/smi-overlay.dts +@@ -24,7 +24,7 @@ + these are already used as ID_SD and ID_SC */ + brcm,pins = <2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 16 17 18 19 20 21 22 23 24 25>; +- /* Alt 0: SMI */ ++ /* Alt 1: SMI */ + brcm,function = <5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 + 5 5 5 5 5 5 5 5 5>; + /* /CS, /WE and /OE are pulled high, as they are diff --git a/target/linux/brcm2708/patches-4.19/950-0753-net-phy-2711-Change-the-default-ethernet-LED-actions.patch b/target/linux/brcm2708/patches-4.19/950-0753-net-phy-2711-Change-the-default-ethernet-LED-actions.patch new file mode 100644 index 0000000000..b00afccd00 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0753-net-phy-2711-Change-the-default-ethernet-LED-actions.patch @@ -0,0 +1,33 @@ +From 7d9c69b325c94d59de94cb699a8314ba2c83ab1d Mon Sep 17 00:00:00 2001 +From: James Hughes +Date: Thu, 7 Nov 2019 14:59:59 +0000 +Subject: [PATCH] net:phy:2711 Change the default ethernet LED actions + +This should return default behaviour back to that of previous +releases. +--- + drivers/net/phy/broadcom.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- a/drivers/net/phy/broadcom.c ++++ b/drivers/net/phy/broadcom.c +@@ -293,7 +293,7 @@ static int bcm54xx_config_init(struct ph + { + int reg, err, val; + u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT, +- BCM_LED_MULTICOLOR_LINK_ACT}; ++ BCM_LED_MULTICOLOR_LINK}; + struct device_node *np = phydev->mdio.dev.of_node; + + reg = phy_read(phydev, MII_BCM54XX_ECR); +@@ -350,10 +350,6 @@ static int bcm54xx_config_init(struct ph + + of_property_read_u32_array(np, "led-modes", led_modes, 2); + +- /* Encode link speed into LED1 and LED3 pair (green/amber). +- * Also flash these two LEDs on activity. This means configuring +- * them for MULTICOLOR and encoding link/activity into them. +- */ + val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) | + BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); + bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); diff --git a/target/linux/brcm2708/patches-4.19/950-0754-overlays-README-Remove-trailing-whitespace.patch b/target/linux/brcm2708/patches-4.19/950-0754-overlays-README-Remove-trailing-whitespace.patch new file mode 100644 index 0000000000..099c44497b --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0754-overlays-README-Remove-trailing-whitespace.patch @@ -0,0 +1,21 @@ +From f5505e5d9fbfd11921c39cd55a433877d6d0d6e4 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Thu, 7 Nov 2019 15:24:32 +0000 +Subject: [PATCH] overlays: README: Remove trailing whitespace + +A stray space slipped through the net. +--- + arch/arm/boot/dts/overlays/README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -109,7 +109,7 @@ Params: + Legal values are 2, 3, 4, 5 and 0, where + 0 means never downshift (default 2). Pi3B+ only. + +- eth_led0 Set mode of LED0 (usually orange). The legal ++ eth_led0 Set mode of LED0 (usually orange). The legal + values are: + + Pi3B+ diff --git a/target/linux/brcm2708/patches-4.19/950-0755-overlays-Add-apds9960-overlay.patch b/target/linux/brcm2708/patches-4.19/950-0755-overlays-Add-apds9960-overlay.patch new file mode 100644 index 0000000000..0848a23c88 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0755-overlays-Add-apds9960-overlay.patch @@ -0,0 +1,103 @@ +From c1e8593fd7fc6a8e7745a6c82c1c19a8fceee70f Mon Sep 17 00:00:00 2001 +From: Michael Kaplan +Date: Fri, 8 Nov 2019 10:35:57 +0100 +Subject: [PATCH] overlays: Add apds9960 overlay + +Add an overlay for the AVAGO APDS9960 digital proximity, ambient light, rgb and gesture sensor. +Also update overlay README and Makefile. + +Signed-off-by: Michael Kaplan +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 8 +++ + .../boot/dts/overlays/apds9960-overlay.dts | 57 +++++++++++++++++++ + 3 files changed, 66 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/apds9960-overlay.dts + +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -15,6 +15,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + allo-katana-dac-audio.dtbo \ + allo-piano-dac-pcm512x-audio.dtbo \ + allo-piano-dac-plus-pcm512x-audio.dtbo \ ++ apds9960.dtbo \ + applepi-dac.dtbo \ + at86rf233.dtbo \ + audioinjector-addons.dtbo \ +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -441,6 +441,14 @@ Params: 24db_digital_gain Allow ga + better voice quality. (default Off) + + ++Name: apds9960 ++Info: Configures the AVAGO APDS9960 digital proximity, ambient light, RGB and ++ gesture sensor ++Load: dtoverlay=apds9960,= ++Params: gpiopin GPIO used for INT (default 4) ++ noints Disable the interrupt GPIO line. ++ ++ + Name: applepi-dac + Info: Configures the Orchard Audio ApplePi-DAC audio card + Load: dtoverlay=applepi-dac +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts +@@ -0,0 +1,57 @@ ++// Definitions for APDS-9960 ambient light and gesture sensor ++ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target = <&i2c1>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ apds9960_pins: apds9960_pins@39 { ++ brcm,pins = <4>; ++ brcm,function = <0>; ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ apds9960: apds@39 { ++ compatible = "avago,apds9960"; ++ reg = <0x39>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@3 { ++ target = <&i2c1>; ++ __overlay__ { ++ apds9960_irq: apds@39 { ++ #interrupt-cells=<2>; ++ interrupt-parent = <&gpio>; ++ interrupts = <4 1>; ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ gpiopin = <&apds9960_pins>,"brcm,pins:0", ++ <&apds9960_irq>,"interrupts:0"; ++ noints = <0>,"!1!3"; ++ }; ++}; ++ diff --git a/target/linux/brcm2708/patches-4.19/950-0756-arm-dts-overlays-pitft35-resistive-add-upstream-comp.patch b/target/linux/brcm2708/patches-4.19/950-0756-arm-dts-overlays-pitft35-resistive-add-upstream-comp.patch new file mode 100644 index 0000000000..e80205bd04 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0756-arm-dts-overlays-pitft35-resistive-add-upstream-comp.patch @@ -0,0 +1,27 @@ +From 49a4a7e355452ce4372c99b2219d7ff8ff613f3f Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sun, 17 Nov 2019 16:20:24 +0000 +Subject: [PATCH] arm: dts: overlays: pitft35-resistive: add upstream + compatible + +The upstream hx8357d driver uses "adafruit,yx350hv15" for the compatible +string explicitly for this screen config and not a hx8357d generic for +the controller so add that in as well so it will work with an unmodified +upstream kernel driver. We leave the downstream as the priority. + +Signed-off-by: Peter Robinson +--- + arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts ++++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts +@@ -49,7 +49,7 @@ + #size-cells = <0>; + + pitft: pitft@0{ +- compatible = "himax,hx8357d"; ++ compatible = "himax,hx8357d", "adafruit,yx350hv15"; + reg = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pitft_pins>; diff --git a/target/linux/brcm2708/patches-4.19/950-0757-clk-bcm2835-Avoid-null-pointer-exception.patch b/target/linux/brcm2708/patches-4.19/950-0757-clk-bcm2835-Avoid-null-pointer-exception.patch new file mode 100644 index 0000000000..a0939d77a0 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0757-clk-bcm2835-Avoid-null-pointer-exception.patch @@ -0,0 +1,29 @@ +From 5b8a217fe818bc038592b8a5284ba0c18948fabf Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 6 Aug 2019 15:23:14 +0100 +Subject: [PATCH] clk-bcm2835: Avoid null pointer exception + +clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating + +Signed-off-by: popcornmix +--- + drivers/clk/bcm/clk-bcm2835.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -2288,9 +2288,11 @@ static bool bcm2835_clk_is_claimed(const + int i; + + for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) { +- const char *clk_name = *(const char **)(clk_desc_array[i].data); +- if (!strcmp(name, clk_name)) +- return bcm2835_clk_claimed[i]; ++ if (clk_desc_array[i].data) { ++ const char *clk_name = *(const char **)(clk_desc_array[i].data); ++ if (!strcmp(name, clk_name)) ++ return bcm2835_clk_claimed[i]; ++ } + } + + return false; diff --git a/target/linux/brcm2708/patches-4.19/950-0758-v3d_drv-Handle-missing-clock-more-gracefully.patch b/target/linux/brcm2708/patches-4.19/950-0758-v3d_drv-Handle-missing-clock-more-gracefully.patch new file mode 100644 index 0000000000..292773ffe9 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0758-v3d_drv-Handle-missing-clock-more-gracefully.patch @@ -0,0 +1,25 @@ +From 9048bbff0eca6d74d41fa58875f31560381b3ca3 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Fri, 23 Aug 2019 16:34:38 +0100 +Subject: [PATCH] v3d_drv: Handle missing clock more gracefully + +Signed-off-by: popcornmix +--- + drivers/gpu/drm/v3d/v3d_drv.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/v3d/v3d_drv.c ++++ b/drivers/gpu/drm/v3d/v3d_drv.c +@@ -301,9 +301,9 @@ static int v3d_platform_drm_probe(struct + } + + v3d->clk = devm_clk_get(dev, NULL); +- if (IS_ERR(v3d->clk)) { +- if (ret != -EPROBE_DEFER) +- dev_err(dev, "Failed to get clock\n"); ++ if (IS_ERR_OR_NULL(v3d->clk)) { ++ if (PTR_ERR(v3d->clk) != -EPROBE_DEFER) ++ dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); + goto dev_free; + } + v3d->clk_up_rate = clk_get_rate(v3d->clk); diff --git a/target/linux/brcm2708/patches-4.19/950-0759-cpufreq-scpi-scmi-Fix-freeing-of-dynamic-OPPs.patch b/target/linux/brcm2708/patches-4.19/950-0759-cpufreq-scpi-scmi-Fix-freeing-of-dynamic-OPPs.patch new file mode 100644 index 0000000000..45c0594c53 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0759-cpufreq-scpi-scmi-Fix-freeing-of-dynamic-OPPs.patch @@ -0,0 +1,197 @@ +From 84a8cbf64731568c0750137ec38091a46b81d502 Mon Sep 17 00:00:00 2001 +From: Viresh Kumar +Date: Fri, 4 Jan 2019 15:14:33 +0530 +Subject: [PATCH] cpufreq: scpi/scmi: Fix freeing of dynamic OPPs + +Commit 1690d8bb91e370ab772062b79bd434ce815c4729 upstream + +Since the commit 2a4eb7358aba "OPP: Don't remove dynamic OPPs from +_dev_pm_opp_remove_table()", dynamically created OPP aren't +automatically removed anymore by dev_pm_opp_cpumask_remove_table(). This +affects the scpi and scmi cpufreq drivers which no longer free OPPs on +failures or on invocations of the policy->exit() callback. + +Create a generic OPP helper dev_pm_opp_remove_all_dynamic() which can be +called from these drivers instead of dev_pm_opp_cpumask_remove_table(). + +In dev_pm_opp_remove_all_dynamic(), we need to make sure that the +opp_list isn't getting accessed simultaneously from other parts of the +OPP core while the helper is freeing dynamic OPPs, i.e. we can't drop +the opp_table->lock while traversing through the OPP list. And to +accomplish that, this patch also creates _opp_kref_release_unlocked() +which can be called from this new helper with the opp_table lock already +held. + +Cc: 4.20 # v4.20 +Reported-by: Valentin Schneider +Fixes: 2a4eb7358aba "OPP: Don't remove dynamic OPPs from _dev_pm_opp_remove_table()" +Signed-off-by: Viresh Kumar +Tested-by: Valentin Schneider +Reviewed-by: Sudeep Holla +Signed-off-by: Rafael J. Wysocki +--- + drivers/cpufreq/scmi-cpufreq.c | 4 +-- + drivers/cpufreq/scpi-cpufreq.c | 4 +-- + drivers/opp/core.c | 63 +++++++++++++++++++++++++++++++--- + include/linux/pm_opp.h | 5 +++ + 4 files changed, 67 insertions(+), 9 deletions(-) + +--- a/drivers/cpufreq/scmi-cpufreq.c ++++ b/drivers/cpufreq/scmi-cpufreq.c +@@ -176,7 +176,7 @@ static int scmi_cpufreq_init(struct cpuf + out_free_priv: + kfree(priv); + out_free_opp: +- dev_pm_opp_cpumask_remove_table(policy->cpus); ++ dev_pm_opp_remove_all_dynamic(cpu_dev); + + return ret; + } +@@ -188,7 +188,7 @@ static int scmi_cpufreq_exit(struct cpuf + cpufreq_cooling_unregister(priv->cdev); + dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table); + kfree(priv); +- dev_pm_opp_cpumask_remove_table(policy->related_cpus); ++ dev_pm_opp_remove_all_dynamic(priv->cpu_dev); + + return 0; + } +--- a/drivers/cpufreq/scpi-cpufreq.c ++++ b/drivers/cpufreq/scpi-cpufreq.c +@@ -177,7 +177,7 @@ out_free_cpufreq_table: + out_free_priv: + kfree(priv); + out_free_opp: +- dev_pm_opp_cpumask_remove_table(policy->cpus); ++ dev_pm_opp_remove_all_dynamic(cpu_dev); + + return ret; + } +@@ -190,7 +190,7 @@ static int scpi_cpufreq_exit(struct cpuf + clk_put(priv->clk); + dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table); + kfree(priv); +- dev_pm_opp_cpumask_remove_table(policy->related_cpus); ++ dev_pm_opp_remove_all_dynamic(priv->cpu_dev); + + return 0; + } +--- a/drivers/opp/core.c ++++ b/drivers/opp/core.c +@@ -881,11 +881,9 @@ void _opp_free(struct dev_pm_opp *opp) + kfree(opp); + } + +-static void _opp_kref_release(struct kref *kref) ++static void _opp_kref_release(struct dev_pm_opp *opp, ++ struct opp_table *opp_table) + { +- struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref); +- struct opp_table *opp_table = opp->opp_table; +- + /* + * Notify the changes in the availability of the operable + * frequency/voltage list. +@@ -894,7 +892,22 @@ static void _opp_kref_release(struct kre + opp_debug_remove_one(opp); + list_del(&opp->node); + kfree(opp); ++} ++ ++static void _opp_kref_release_unlocked(struct kref *kref) ++{ ++ struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref); ++ struct opp_table *opp_table = opp->opp_table; ++ ++ _opp_kref_release(opp, opp_table); ++} + ++static void _opp_kref_release_locked(struct kref *kref) ++{ ++ struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref); ++ struct opp_table *opp_table = opp->opp_table; ++ ++ _opp_kref_release(opp, opp_table); + mutex_unlock(&opp_table->lock); + dev_pm_opp_put_opp_table(opp_table); + } +@@ -906,10 +919,16 @@ void dev_pm_opp_get(struct dev_pm_opp *o + + void dev_pm_opp_put(struct dev_pm_opp *opp) + { +- kref_put_mutex(&opp->kref, _opp_kref_release, &opp->opp_table->lock); ++ kref_put_mutex(&opp->kref, _opp_kref_release_locked, ++ &opp->opp_table->lock); + } + EXPORT_SYMBOL_GPL(dev_pm_opp_put); + ++static void dev_pm_opp_put_unlocked(struct dev_pm_opp *opp) ++{ ++ kref_put(&opp->kref, _opp_kref_release_unlocked); ++} ++ + /** + * dev_pm_opp_remove() - Remove an OPP from OPP table + * @dev: device for which we do this operation +@@ -949,6 +968,40 @@ void dev_pm_opp_remove(struct device *de + } + EXPORT_SYMBOL_GPL(dev_pm_opp_remove); + ++/** ++ * dev_pm_opp_remove_all_dynamic() - Remove all dynamically created OPPs ++ * @dev: device for which we do this operation ++ * ++ * This function removes all dynamically created OPPs from the opp table. ++ */ ++void dev_pm_opp_remove_all_dynamic(struct device *dev) ++{ ++ struct opp_table *opp_table; ++ struct dev_pm_opp *opp, *temp; ++ int count = 0; ++ ++ opp_table = _find_opp_table(dev); ++ if (IS_ERR(opp_table)) ++ return; ++ ++ mutex_lock(&opp_table->lock); ++ list_for_each_entry_safe(opp, temp, &opp_table->opp_list, node) { ++ if (opp->dynamic) { ++ dev_pm_opp_put_unlocked(opp); ++ count++; ++ } ++ } ++ mutex_unlock(&opp_table->lock); ++ ++ /* Drop the references taken by dev_pm_opp_add() */ ++ while (count--) ++ dev_pm_opp_put_opp_table(opp_table); ++ ++ /* Drop the reference taken by _find_opp_table() */ ++ dev_pm_opp_put_opp_table(opp_table); ++} ++EXPORT_SYMBOL_GPL(dev_pm_opp_remove_all_dynamic); ++ + struct dev_pm_opp *_opp_allocate(struct opp_table *table) + { + struct dev_pm_opp *opp; +--- a/include/linux/pm_opp.h ++++ b/include/linux/pm_opp.h +@@ -107,6 +107,7 @@ void dev_pm_opp_put(struct dev_pm_opp *o + int dev_pm_opp_add(struct device *dev, unsigned long freq, + unsigned long u_volt); + void dev_pm_opp_remove(struct device *dev, unsigned long freq); ++void dev_pm_opp_remove_all_dynamic(struct device *dev); + + int dev_pm_opp_enable(struct device *dev, unsigned long freq); + +@@ -208,6 +209,10 @@ static inline void dev_pm_opp_remove(str + { + } + ++static inline void dev_pm_opp_remove_all_dynamic(struct device *dev) ++{ ++} ++ + static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq) + { + return 0; diff --git a/target/linux/brcm2708/patches-4.19/950-0760-clk-bcm283x-add-driver-interfacing-with-Raspberry-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0760-clk-bcm283x-add-driver-interfacing-with-Raspberry-Pi.patch new file mode 100644 index 0000000000..53428fcbda --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0760-clk-bcm283x-add-driver-interfacing-with-Raspberry-Pi.patch @@ -0,0 +1,349 @@ +From 35306211392a8c17ba6cde2a6b5d1beb61ca7d54 Mon Sep 17 00:00:00 2001 +From: Nicolas Saenz Julienne +Date: Wed, 12 Jun 2019 20:24:54 +0200 +Subject: [PATCH] clk: bcm283x: add driver interfacing with Raspberry + Pi's firmware + +Commit 4e85e535e6cc6e8a96350e8ee684d0f22eb8629e upstream. + +Raspberry Pi's firmware offers an interface though which update it's +clock's frequencies. This is specially useful in order to change the CPU +clock (pllb_arm) which is 'owned' by the firmware and we're unable to +scale using the register interface provided by clk-bcm2835. + +Signed-off-by: Nicolas Saenz Julienne +Acked-by: Eric Anholt +Signed-off-by: Stephen Boyd +--- + drivers/clk/bcm/Kconfig | 7 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-raspberrypi.c | 300 ++++++++++++++++++++++++++++++ + 3 files changed, 308 insertions(+) + create mode 100644 drivers/clk/bcm/clk-raspberrypi.c + +--- a/drivers/clk/bcm/Kconfig ++++ b/drivers/clk/bcm/Kconfig +@@ -63,3 +63,10 @@ config CLK_BCM_SR + default ARCH_BCM_IPROC + help + Enable common clock framework support for the Broadcom Stingray SoC ++ ++config CLK_RASPBERRYPI ++ tristate "Raspberry Pi firmware based clock support" ++ depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE) ++ help ++ Enable common clock framework support for Raspberry Pi's firmware ++ dependent clocks +--- a/drivers/clk/bcm/Makefile ++++ b/drivers/clk/bcm/Makefile +@@ -7,6 +7,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm216 + obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o + obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o + obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835-aux.o ++obj-$(CONFIG_CLK_RASPBERRYPI) += clk-raspberrypi.o + obj-$(CONFIG_ARCH_BCM_53573) += clk-bcm53573-ilp.o + obj-$(CONFIG_CLK_BCM_CYGNUS) += clk-cygnus.o + obj-$(CONFIG_CLK_BCM_HR2) += clk-hr2.o +--- /dev/null ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -0,0 +1,300 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Raspberry Pi driver for firmware controlled clocks ++ * ++ * Even though clk-bcm2835 provides an interface to the hardware registers for ++ * the system clocks we've had to factor out 'pllb' as the firmware 'owns' it. ++ * We're not allowed to change it directly as we might race with the ++ * over-temperature and under-voltage protections provided by the firmware. ++ * ++ * Copyright (C) 2019 Nicolas Saenz Julienne ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#define RPI_FIRMWARE_ARM_CLK_ID 0x00000003 ++ ++#define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0) ++#define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1) ++ ++/* ++ * Even though the firmware interface alters 'pllb' the frequencies are ++ * provided as per 'pllb_arm'. We need to scale before passing them trough. ++ */ ++#define RPI_FIRMWARE_PLLB_ARM_DIV_RATE 2 ++ ++#define A2W_PLL_FRAC_BITS 20 ++ ++struct raspberrypi_clk { ++ struct device *dev; ++ struct rpi_firmware *firmware; ++ ++ unsigned long min_rate; ++ unsigned long max_rate; ++ ++ struct clk_hw pllb; ++ struct clk_hw *pllb_arm; ++ struct clk_lookup *pllb_arm_lookup; ++}; ++ ++/* ++ * Structure of the message passed to Raspberry Pi's firmware in order to ++ * change clock rates. The 'disable_turbo' option is only available to the ARM ++ * clock (pllb) which we enable by default as turbo mode will alter multiple ++ * clocks at once. ++ * ++ * Even though we're able to access the clock registers directly we're bound to ++ * use the firmware interface as the firmware ultimately takes care of ++ * mitigating overheating/undervoltage situations and we would be changing ++ * frequencies behind his back. ++ * ++ * For more information on the firmware interface check: ++ * https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface ++ */ ++struct raspberrypi_firmware_prop { ++ __le32 id; ++ __le32 val; ++ __le32 disable_turbo; ++} __packed; ++ ++static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag, ++ u32 clk, u32 *val) ++{ ++ struct raspberrypi_firmware_prop msg = { ++ .id = cpu_to_le32(clk), ++ .val = cpu_to_le32(*val), ++ .disable_turbo = cpu_to_le32(1), ++ }; ++ int ret; ++ ++ ret = rpi_firmware_property(firmware, tag, &msg, sizeof(msg)); ++ if (ret) ++ return ret; ++ ++ *val = le32_to_cpu(msg.val); ++ ++ return 0; ++} ++ ++static int raspberrypi_fw_pll_is_on(struct clk_hw *hw) ++{ ++ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, ++ pllb); ++ u32 val = 0; ++ int ret; ++ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_GET_CLOCK_STATE, ++ RPI_FIRMWARE_ARM_CLK_ID, &val); ++ if (ret) ++ return 0; ++ ++ return !!(val & RPI_FIRMWARE_STATE_ENABLE_BIT); ++} ++ ++ ++static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, ++ pllb); ++ u32 val = 0; ++ int ret; ++ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_GET_CLOCK_RATE, ++ RPI_FIRMWARE_ARM_CLK_ID, ++ &val); ++ if (ret) ++ return ret; ++ ++ return val * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; ++} ++ ++static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, ++ pllb); ++ u32 new_rate = rate / RPI_FIRMWARE_PLLB_ARM_DIV_RATE; ++ int ret; ++ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_SET_CLOCK_RATE, ++ RPI_FIRMWARE_ARM_CLK_ID, ++ &new_rate); ++ if (ret) ++ dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d", ++ clk_hw_get_name(hw), ret); ++ ++ return ret; ++} ++ ++/* ++ * Sadly there is no firmware rate rounding interface. We borrowed it from ++ * clk-bcm2835. ++ */ ++static int raspberrypi_pll_determine_rate(struct clk_hw *hw, ++ struct clk_rate_request *req) ++{ ++ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, ++ pllb); ++ u64 div, final_rate; ++ u32 ndiv, fdiv; ++ ++ /* We can't use req->rate directly as it would overflow */ ++ final_rate = clamp(req->rate, rpi->min_rate, rpi->max_rate); ++ ++ div = (u64)final_rate << A2W_PLL_FRAC_BITS; ++ do_div(div, req->best_parent_rate); ++ ++ ndiv = div >> A2W_PLL_FRAC_BITS; ++ fdiv = div & ((1 << A2W_PLL_FRAC_BITS) - 1); ++ ++ final_rate = ((u64)req->best_parent_rate * ++ ((ndiv << A2W_PLL_FRAC_BITS) + fdiv)); ++ ++ req->rate = final_rate >> A2W_PLL_FRAC_BITS; ++ ++ return 0; ++} ++ ++static const struct clk_ops raspberrypi_firmware_pll_clk_ops = { ++ .is_prepared = raspberrypi_fw_pll_is_on, ++ .recalc_rate = raspberrypi_fw_pll_get_rate, ++ .set_rate = raspberrypi_fw_pll_set_rate, ++ .determine_rate = raspberrypi_pll_determine_rate, ++}; ++ ++static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) ++{ ++ u32 min_rate = 0, max_rate = 0; ++ struct clk_init_data init; ++ int ret; ++ ++ memset(&init, 0, sizeof(init)); ++ ++ /* All of the PLLs derive from the external oscillator. */ ++ init.parent_names = (const char *[]){ "osc" }; ++ init.num_parents = 1; ++ init.name = "pllb"; ++ init.ops = &raspberrypi_firmware_pll_clk_ops; ++ init.flags = CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED; ++ ++ /* Get min & max rates set by the firmware */ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_GET_MIN_CLOCK_RATE, ++ RPI_FIRMWARE_ARM_CLK_ID, ++ &min_rate); ++ if (ret) { ++ dev_err(rpi->dev, "Failed to get %s min freq: %d\n", ++ init.name, ret); ++ return ret; ++ } ++ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_GET_MAX_CLOCK_RATE, ++ RPI_FIRMWARE_ARM_CLK_ID, ++ &max_rate); ++ if (ret) { ++ dev_err(rpi->dev, "Failed to get %s max freq: %d\n", ++ init.name, ret); ++ return ret; ++ } ++ ++ if (!min_rate || !max_rate) { ++ dev_err(rpi->dev, "Unexpected frequency range: min %u, max %u\n", ++ min_rate, max_rate); ++ return -EINVAL; ++ } ++ ++ dev_info(rpi->dev, "CPU frequency range: min %u, max %u\n", ++ min_rate, max_rate); ++ ++ rpi->min_rate = min_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; ++ rpi->max_rate = max_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; ++ ++ rpi->pllb.init = &init; ++ ++ return devm_clk_hw_register(rpi->dev, &rpi->pllb); ++} ++ ++static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi) ++{ ++ rpi->pllb_arm = clk_hw_register_fixed_factor(rpi->dev, ++ "pllb_arm", "pllb", ++ CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE, ++ 1, 2); ++ if (IS_ERR(rpi->pllb_arm)) { ++ dev_err(rpi->dev, "Failed to initialize pllb_arm\n"); ++ return PTR_ERR(rpi->pllb_arm); ++ } ++ ++ rpi->pllb_arm_lookup = clkdev_hw_create(rpi->pllb_arm, NULL, "cpu0"); ++ if (!rpi->pllb_arm_lookup) { ++ dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n"); ++ clk_hw_unregister_fixed_factor(rpi->pllb_arm); ++ return -ENOMEM; ++ } ++ ++ return 0; ++} ++ ++static int raspberrypi_clk_probe(struct platform_device *pdev) ++{ ++ struct device_node *firmware_node; ++ struct device *dev = &pdev->dev; ++ struct rpi_firmware *firmware; ++ struct raspberrypi_clk *rpi; ++ int ret; ++ ++ firmware_node = of_find_compatible_node(NULL, NULL, ++ "raspberrypi,bcm2835-firmware"); ++ if (!firmware_node) { ++ dev_err(dev, "Missing firmware node\n"); ++ return -ENOENT; ++ } ++ ++ firmware = rpi_firmware_get(firmware_node); ++ of_node_put(firmware_node); ++ if (!firmware) ++ return -EPROBE_DEFER; ++ ++ rpi = devm_kzalloc(dev, sizeof(*rpi), GFP_KERNEL); ++ if (!rpi) ++ return -ENOMEM; ++ ++ rpi->dev = dev; ++ rpi->firmware = firmware; ++ ++ ret = raspberrypi_register_pllb(rpi); ++ if (ret) { ++ dev_err(dev, "Failed to initialize pllb, %d\n", ret); ++ return ret; ++ } ++ ++ ret = raspberrypi_register_pllb_arm(rpi); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static struct platform_driver raspberrypi_clk_driver = { ++ .driver = { ++ .name = "raspberrypi-clk", ++ }, ++ .probe = raspberrypi_clk_probe, ++}; ++module_platform_driver(raspberrypi_clk_driver); ++ ++MODULE_AUTHOR("Nicolas Saenz Julienne "); ++MODULE_DESCRIPTION("Raspberry Pi firmware clock driver"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("platform:raspberrypi-clk"); diff --git a/target/linux/brcm2708/patches-4.19/950-0761-cpufreq-add-driver-for-Raspberry-Pi.patch b/target/linux/brcm2708/patches-4.19/950-0761-cpufreq-add-driver-for-Raspberry-Pi.patch new file mode 100644 index 0000000000..7785caf129 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0761-cpufreq-add-driver-for-Raspberry-Pi.patch @@ -0,0 +1,161 @@ +From 1c0d3626312369837bc18051ed6c9611323fce87 Mon Sep 17 00:00:00 2001 +From: Nicolas Saenz Julienne +Date: Wed, 12 Jun 2019 20:24:56 +0200 +Subject: [PATCH] cpufreq: add driver for Raspberry Pi + +Commit d3df18a97e586702920337056540267807b23f8e upstream. + +Raspberry Pi's firmware offers and interface though which update it's +performance requirements. It allows us to request for specific runtime +frequencies, which the firmware might or might not respect, depending on +the firmware configuration and thermals. + +As the maximum and minimum frequencies are configurable in the firmware +there is no way to know in advance their values. So the Raspberry Pi +cpufreq driver queries them, builds an opp frequency table to then +launch cpufreq-dt. + +Also, as the firmware interface might be configured as a module, making +the cpu clock unavailable during init, this implements a full fledged +driver, as opposed to most drivers registering cpufreq-dt, which only +make use of an init routine. + +Signed-off-by: Nicolas Saenz Julienne +Acked-by: Eric Anholt +Reviewed-by: Stephen Boyd +Acked-by: Stefan Wahren +Signed-off-by: Viresh Kumar +--- + drivers/cpufreq/Kconfig.arm | 8 +++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/raspberrypi-cpufreq.c | 97 +++++++++++++++++++++++++++ + 3 files changed, 106 insertions(+) + create mode 100644 drivers/cpufreq/raspberrypi-cpufreq.c + +--- a/drivers/cpufreq/Kconfig.arm ++++ b/drivers/cpufreq/Kconfig.arm +@@ -121,6 +121,14 @@ config ARM_QCOM_CPUFREQ_KRYO + + If in doubt, say N. + ++config ARM_RASPBERRYPI_CPUFREQ ++ tristate "Raspberry Pi cpufreq support" ++ depends on CLK_RASPBERRYPI || COMPILE_TEST ++ help ++ This adds the CPUFreq driver for Raspberry Pi ++ ++ If in doubt, say N. ++ + config ARM_S3C_CPUFREQ + bool + help +--- a/drivers/cpufreq/Makefile ++++ b/drivers/cpufreq/Makefile +@@ -65,6 +65,7 @@ obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += o + obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o + obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o + obj-$(CONFIG_ARM_QCOM_CPUFREQ_KRYO) += qcom-cpufreq-kryo.o ++obj-$(CONFIG_ARM_RASPBERRYPI_CPUFREQ) += raspberrypi-cpufreq.o + obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o + obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o + obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +--- /dev/null ++++ b/drivers/cpufreq/raspberrypi-cpufreq.c +@@ -0,0 +1,97 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Raspberry Pi cpufreq driver ++ * ++ * Copyright (C) 2019, Nicolas Saenz Julienne ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define RASPBERRYPI_FREQ_INTERVAL 100000000 ++ ++static struct platform_device *cpufreq_dt; ++ ++static int raspberrypi_cpufreq_probe(struct platform_device *pdev) ++{ ++ struct device *cpu_dev; ++ unsigned long min, max; ++ unsigned long rate; ++ struct clk *clk; ++ int ret; ++ ++ cpu_dev = get_cpu_device(0); ++ if (!cpu_dev) { ++ pr_err("Cannot get CPU for cpufreq driver\n"); ++ return -ENODEV; ++ } ++ ++ clk = clk_get(cpu_dev, NULL); ++ if (IS_ERR(clk)) { ++ dev_err(cpu_dev, "Cannot get clock for CPU0\n"); ++ return PTR_ERR(clk); ++ } ++ ++ /* ++ * The max and min frequencies are configurable in the Raspberry Pi ++ * firmware, so we query them at runtime. ++ */ ++ min = roundup(clk_round_rate(clk, 0), RASPBERRYPI_FREQ_INTERVAL); ++ max = roundup(clk_round_rate(clk, ULONG_MAX), RASPBERRYPI_FREQ_INTERVAL); ++ clk_put(clk); ++ ++ for (rate = min; rate <= max; rate += RASPBERRYPI_FREQ_INTERVAL) { ++ ret = dev_pm_opp_add(cpu_dev, rate, 0); ++ if (ret) ++ goto remove_opp; ++ } ++ ++ cpufreq_dt = platform_device_register_simple("cpufreq-dt", -1, NULL, 0); ++ ret = PTR_ERR_OR_ZERO(cpufreq_dt); ++ if (ret) { ++ dev_err(cpu_dev, "Failed to create platform device, %d\n", ret); ++ goto remove_opp; ++ } ++ ++ return 0; ++ ++remove_opp: ++ dev_pm_opp_remove_all_dynamic(cpu_dev); ++ ++ return ret; ++} ++ ++static int raspberrypi_cpufreq_remove(struct platform_device *pdev) ++{ ++ struct device *cpu_dev; ++ ++ cpu_dev = get_cpu_device(0); ++ if (cpu_dev) ++ dev_pm_opp_remove_all_dynamic(cpu_dev); ++ ++ platform_device_unregister(cpufreq_dt); ++ ++ return 0; ++} ++ ++/* ++ * Since the driver depends on clk-raspberrypi, which may return EPROBE_DEFER, ++ * all the activity is performed in the probe, which may be defered as well. ++ */ ++static struct platform_driver raspberrypi_cpufreq_driver = { ++ .driver = { ++ .name = "raspberrypi-cpufreq", ++ }, ++ .probe = raspberrypi_cpufreq_probe, ++ .remove = raspberrypi_cpufreq_remove, ++}; ++module_platform_driver(raspberrypi_cpufreq_driver); ++ ++MODULE_AUTHOR("Nicolas Saenz Julienne +Date: Wed, 12 Jun 2019 20:24:55 +0200 +Subject: [PATCH] firmware: raspberrypi: register clk device + +Commit 91f2cf4a6b2131016b1ae9c9500245f0572112c7 upstream. + +Since clk-raspberrypi is tied to the VC4 firmware instead of particular +hardware it's registration should be performed by the firmware driver. + +Signed-off-by: Nicolas Saenz Julienne +Acked-by: Eric Anholt +Signed-off-by: Stephen Boyd +--- + drivers/firmware/raspberrypi.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/firmware/raspberrypi.c ++++ b/drivers/firmware/raspberrypi.c +@@ -24,6 +24,7 @@ + #define MBOX_CHAN_PROPERTY 8 + + static struct platform_device *rpi_hwmon; ++static struct platform_device *rpi_clk; + + struct rpi_firmware { + struct mbox_client cl; +@@ -297,6 +298,12 @@ rpi_register_hwmon_driver(struct device + } + } + ++static void rpi_register_clk_driver(struct device *dev) ++{ ++ rpi_clk = platform_device_register_data(dev, "raspberrypi-clk", ++ -1, NULL, 0); ++} ++ + static int rpi_firmware_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; +@@ -326,6 +333,7 @@ static int rpi_firmware_probe(struct pla + rpi_firmware_print_firmware_revision(fw); + rpi_firmware_print_firmware_hash(fw); + rpi_register_hwmon_driver(dev, fw); ++ rpi_register_clk_driver(dev); + + return 0; + } +@@ -336,6 +344,8 @@ static int rpi_firmware_remove(struct pl + + platform_device_unregister(rpi_hwmon); + rpi_hwmon = NULL; ++ platform_device_unregister(rpi_clk); ++ rpi_clk = NULL; + mbox_free_channel(fw->chan); + g_pdev = NULL; + diff --git a/target/linux/brcm2708/patches-4.19/950-0763-clk-raspberrypi-register-platform-device-for-raspber.patch b/target/linux/brcm2708/patches-4.19/950-0763-clk-raspberrypi-register-platform-device-for-raspber.patch new file mode 100644 index 0000000000..be4d83485f --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0763-clk-raspberrypi-register-platform-device-for-raspber.patch @@ -0,0 +1,65 @@ +From b39d5caa499559be6c309b9fd8f8b2f992504e18 Mon Sep 17 00:00:00 2001 +From: Nicolas Saenz Julienne +Date: Wed, 12 Jun 2019 20:24:57 +0200 +Subject: [PATCH] clk: raspberrypi: register platform device for + raspberrypi-cpufreq + +Commit e2bb18347c8e5c4187831f3700c380e3c759601a upstream. + +As 'clk-raspberrypi' depends on RPi's firmware interface, which might be +configured as a module, the cpu clock might not be available for the +cpufreq driver during it's init process. So we register the +'raspberrypi-cpufreq' platform device after the probe sequence succeeds. + +Signed-off-by: Nicolas Saenz Julienne +Acked-by: Eric Anholt +Signed-off-by: Stephen Boyd +--- + drivers/clk/bcm/clk-raspberrypi.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +--- a/drivers/clk/bcm/clk-raspberrypi.c ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -34,6 +34,7 @@ + struct raspberrypi_clk { + struct device *dev; + struct rpi_firmware *firmware; ++ struct platform_device *cpufreq; + + unsigned long min_rate; + unsigned long max_rate; +@@ -272,6 +273,7 @@ static int raspberrypi_clk_probe(struct + + rpi->dev = dev; + rpi->firmware = firmware; ++ platform_set_drvdata(pdev, rpi); + + ret = raspberrypi_register_pllb(rpi); + if (ret) { +@@ -283,6 +285,18 @@ static int raspberrypi_clk_probe(struct + if (ret) + return ret; + ++ rpi->cpufreq = platform_device_register_data(dev, "raspberrypi-cpufreq", ++ -1, NULL, 0); ++ ++ return 0; ++} ++ ++static int raspberrypi_clk_remove(struct platform_device *pdev) ++{ ++ struct raspberrypi_clk *rpi = platform_get_drvdata(pdev); ++ ++ platform_device_unregister(rpi->cpufreq); ++ + return 0; + } + +@@ -291,6 +305,7 @@ static struct platform_driver raspberryp + .name = "raspberrypi-clk", + }, + .probe = raspberrypi_clk_probe, ++ .remove = raspberrypi_clk_remove, + }; + module_platform_driver(raspberrypi_clk_driver); + diff --git a/target/linux/brcm2708/patches-4.19/950-0764-clk-bcm2835-remove-pllb.patch b/target/linux/brcm2708/patches-4.19/950-0764-clk-bcm2835-remove-pllb.patch new file mode 100644 index 0000000000..af9dde3362 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0764-clk-bcm2835-remove-pllb.patch @@ -0,0 +1,56 @@ +From 04ebfc3e25eaa3dd77544b4b950497990b1a327e Mon Sep 17 00:00:00 2001 +From: Nicolas Saenz Julienne +Date: Wed, 12 Jun 2019 20:24:53 +0200 +Subject: [PATCH] clk: bcm2835: remove pllb + +Commit 2256d89333bd17b8b56b42734a7e1046d52f7fc3 upstream. + +Raspberry Pi's firmware controls this pll, we should use the firmware +interface to access it. + +Signed-off-by: Nicolas Saenz Julienne +Acked-by: Eric Anholt +Signed-off-by: Stephen Boyd +--- + drivers/clk/bcm/clk-bcm2835.c | 30 ++++-------------------------- + 1 file changed, 4 insertions(+), 26 deletions(-) + +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -1755,32 +1755,10 @@ static const struct bcm2835_clk_desc clk + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), + +- /* PLLB is used for the ARM's clock. */ +- [BCM2835_PLLB] = REGISTER_PLL( +- SOC_ALL, +- .name = "pllb", +- .cm_ctrl_reg = CM_PLLB, +- .a2w_ctrl_reg = A2W_PLLB_CTRL, +- .frac_reg = A2W_PLLB_FRAC, +- .ana_reg_base = A2W_PLLB_ANA0, +- .reference_enable_mask = A2W_XOSC_CTRL_PLLB_ENABLE, +- .lock_mask = CM_LOCK_FLOCKB, +- +- .ana = &bcm2835_ana_default, +- +- .min_rate = 600000000u, +- .max_rate = 3000000000u, +- .max_fb_rate = BCM2835_MAX_FB_RATE), +- [BCM2835_PLLB_ARM] = REGISTER_PLL_DIV( +- SOC_ALL, +- .name = "pllb_arm", +- .source_pll = "pllb", +- .cm_reg = CM_PLLB, +- .a2w_reg = A2W_PLLB_ARM, +- .load_mask = CM_PLLB_LOADARM, +- .hold_mask = CM_PLLB_HOLDARM, +- .fixed_divider = 1, +- .flags = CLK_SET_RATE_PARENT), ++ /* ++ * PLLB is used for the ARM's clock. Controlled by firmware, see ++ * clk-raspberrypi.c. ++ */ + + /* + * PLLC is the core PLL, used to drive the core VPU clock. diff --git a/target/linux/brcm2708/patches-4.19/950-0765-v3d_drv-Allow-clock-retrieval-by-name.patch b/target/linux/brcm2708/patches-4.19/950-0765-v3d_drv-Allow-clock-retrieval-by-name.patch new file mode 100644 index 0000000000..b5ce5bd4ac --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0765-v3d_drv-Allow-clock-retrieval-by-name.patch @@ -0,0 +1,23 @@ +From 2b08d751023fcdf3c37317dc769ce199ba361415 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 9 Sep 2019 23:50:44 +0100 +Subject: [PATCH] v3d_drv: Allow clock retrieval by name + +Signed-off-by: Phil Elwell +--- + drivers/gpu/drm/v3d/v3d_drv.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/v3d/v3d_drv.c ++++ b/drivers/gpu/drm/v3d/v3d_drv.c +@@ -300,7 +300,9 @@ static int v3d_platform_drm_probe(struct + } + } + +- v3d->clk = devm_clk_get(dev, NULL); ++ v3d->clk = devm_clk_get(dev, "v3d"); ++ if (!v3d->clk) ++ v3d->clk = devm_clk_get(dev, NULL); + if (IS_ERR_OR_NULL(v3d->clk)) { + if (PTR_ERR(v3d->clk) != -EPROBE_DEFER) + dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); diff --git a/target/linux/brcm2708/patches-4.19/950-0766-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch b/target/linux/brcm2708/patches-4.19/950-0766-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch new file mode 100644 index 0000000000..f10e2465f4 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0766-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch @@ -0,0 +1,27 @@ +From ccf2b80332ba86e5a69f7e3a0f097d9558ad5c95 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Thu, 5 Sep 2019 17:59:14 +0100 +Subject: [PATCH] v3d_gem: Kick the clock so firmware knows we are + using firmware clock interface + +Setting the v3d clock to low value allows firmware to handle dvfs in case +where v3d hardware is not being actively used (e.g. console use). + +Signed-off-by: popcornmix +--- + drivers/gpu/drm/v3d/v3d_gem.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/gpu/drm/v3d/v3d_gem.c ++++ b/drivers/gpu/drm/v3d/v3d_gem.c +@@ -1050,6 +1050,10 @@ v3d_gem_init(struct drm_device *dev) + mutex_init(&v3d->clk_lock); + INIT_DELAYED_WORK(&v3d->clk_down_work, v3d_clock_down_work); + ++ /* kick the clock so firmware knows we are using firmware clock interface */ ++ v3d_clock_up_get(v3d); ++ v3d_clock_up_put(v3d); ++ + /* Note: We don't allocate address 0. Various bits of HW + * treat 0 as special, such as the occlusion query counters + * where 0 means "disabled". diff --git a/target/linux/brcm2708/patches-4.19/950-0767-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch b/target/linux/brcm2708/patches-4.19/950-0767-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch new file mode 100644 index 0000000000..419902ae9c --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0767-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch @@ -0,0 +1,25 @@ +From 801156c2f2d2d074a1d966f59fc63d8056b3cef9 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 9 Sep 2019 15:49:56 +0100 +Subject: [PATCH] clk-raspberrypi: Allow cpufreq driver to also adjust + gpu clocks + +For performance/power it is beneficial to adjust gpu clocks with arm clock. +This is how the downstream cpufreq driver works + +Signed-off-by: popcornmix +--- + drivers/clk/bcm/clk-raspberrypi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clk/bcm/clk-raspberrypi.c ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -70,7 +70,7 @@ static int raspberrypi_clock_property(st + struct raspberrypi_firmware_prop msg = { + .id = cpu_to_le32(clk), + .val = cpu_to_le32(*val), +- .disable_turbo = cpu_to_le32(1), ++ .disable_turbo = cpu_to_le32(0), + }; + int ret; + diff --git a/target/linux/brcm2708/patches-4.19/950-0768-clk-raspberrypi-Also-support-v3d-clock.patch b/target/linux/brcm2708/patches-4.19/950-0768-clk-raspberrypi-Also-support-v3d-clock.patch new file mode 100644 index 0000000000..c145f2faa6 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0768-clk-raspberrypi-Also-support-v3d-clock.patch @@ -0,0 +1,640 @@ +From 679f68410271a32f200e48b501027f68bd114d5c Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Wed, 21 Aug 2019 14:55:56 +0100 +Subject: [PATCH] clk-raspberrypi: Also support v3d clock + +Signed-off-by: popcornmix +--- + drivers/clk/bcm/clk-raspberrypi.c | 497 ++++++++++++++++++++++++------ + 1 file changed, 408 insertions(+), 89 deletions(-) + +--- a/drivers/clk/bcm/clk-raspberrypi.c ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -15,33 +15,103 @@ + #include + #include + #include +- ++#include + #include + + #define RPI_FIRMWARE_ARM_CLK_ID 0x00000003 ++#define RPI_FIRMWARE_V3D_CLK_ID 0x00000005 + + #define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0) + #define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1) + +-/* +- * Even though the firmware interface alters 'pllb' the frequencies are +- * provided as per 'pllb_arm'. We need to scale before passing them trough. +- */ +-#define RPI_FIRMWARE_PLLB_ARM_DIV_RATE 2 +- + #define A2W_PLL_FRAC_BITS 20 + ++#define SOC_BCM2835 BIT(0) ++#define SOC_BCM2711 BIT(1) ++#define SOC_ALL (SOC_BCM2835 | SOC_BCM2711) ++ + struct raspberrypi_clk { + struct device *dev; + struct rpi_firmware *firmware; + struct platform_device *cpufreq; ++}; ++ ++typedef int (*raspberrypi_clk_register)(struct raspberrypi_clk *rpi, ++ const void *data); ++ ++ ++/* assignment helper macros for different clock types */ ++#define _REGISTER(f, s, ...) { .clk_register = (raspberrypi_clk_register)f, \ ++ .supported = s, \ ++ .data = __VA_ARGS__ } ++#define REGISTER_PLL(s, ...) _REGISTER(&raspberrypi_register_pll, \ ++ s, \ ++ &(struct raspberrypi_pll_data) \ ++ {__VA_ARGS__}) ++#define REGISTER_PLL_DIV(s, ...) _REGISTER(&raspberrypi_register_pll_divider, \ ++ s, \ ++ &(struct raspberrypi_pll_divider_data) \ ++ {__VA_ARGS__}) ++#define REGISTER_CLK(s, ...) _REGISTER(&raspberrypi_register_clock, \ ++ s, \ ++ &(struct raspberrypi_clock_data) \ ++ {__VA_ARGS__}) ++ ++ ++struct raspberrypi_pll_data { ++ const char *name; ++ const char *const *parents; ++ int num_parents; ++ u32 clock_id; ++}; ++ ++struct raspberrypi_clock_data { ++ const char *name; ++ const char *const *parents; ++ int num_parents; ++ u32 flags; ++ u32 clock_id; ++}; ++ ++struct raspberrypi_pll_divider_data { ++ const char *name; ++ const char *divider_name; ++ const char *lookup; ++ const char *source_pll; ++ ++ u32 fixed_divider; ++ u32 flags; ++ u32 clock_id; ++}; + +- unsigned long min_rate; +- unsigned long max_rate; ++struct raspberrypi_clk_desc { ++ raspberrypi_clk_register clk_register; ++ unsigned int supported; ++ const void *data; ++}; + +- struct clk_hw pllb; +- struct clk_hw *pllb_arm; +- struct clk_lookup *pllb_arm_lookup; ++struct raspberrypi_clock { ++ struct clk_hw hw; ++ struct raspberrypi_clk *rpi; ++ u32 min_rate; ++ u32 max_rate; ++ const struct raspberrypi_clock_data *data; ++}; ++ ++struct raspberrypi_pll { ++ struct clk_hw hw; ++ struct raspberrypi_clk *rpi; ++ u32 min_rate; ++ u32 max_rate; ++ const struct raspberrypi_pll_data *data; ++}; ++ ++struct raspberrypi_pll_divider { ++ struct clk_divider div; ++ struct raspberrypi_clk *rpi; ++ u32 min_rate; ++ u32 max_rate; ++ const struct raspberrypi_pll_divider_data *data; + }; + + /* +@@ -83,56 +153,49 @@ static int raspberrypi_clock_property(st + return 0; + } + +-static int raspberrypi_fw_pll_is_on(struct clk_hw *hw) ++static int raspberrypi_fw_is_on(struct raspberrypi_clk *rpi, u32 clock_id, const char *name) + { +- struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, +- pllb); + u32 val = 0; + int ret; + + ret = raspberrypi_clock_property(rpi->firmware, + RPI_FIRMWARE_GET_CLOCK_STATE, +- RPI_FIRMWARE_ARM_CLK_ID, &val); ++ clock_id, &val); + if (ret) + return 0; + + return !!(val & RPI_FIRMWARE_STATE_ENABLE_BIT); + } + +- +-static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw, +- unsigned long parent_rate) ++static unsigned long raspberrypi_fw_get_rate(struct raspberrypi_clk *rpi, ++ u32 clock_id, const char *name, unsigned long parent_rate) + { +- struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, +- pllb); + u32 val = 0; + int ret; + + ret = raspberrypi_clock_property(rpi->firmware, + RPI_FIRMWARE_GET_CLOCK_RATE, +- RPI_FIRMWARE_ARM_CLK_ID, ++ clock_id, + &val); + if (ret) +- return ret; +- +- return val * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; ++ dev_err_ratelimited(rpi->dev, "Failed to get %s frequency: %d", ++ name, ret); ++ return val; + } + +-static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate, +- unsigned long parent_rate) ++static int raspberrypi_fw_set_rate(struct raspberrypi_clk *rpi, ++ u32 clock_id, const char *name, u32 rate, ++ unsigned long parent_rate) + { +- struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, +- pllb); +- u32 new_rate = rate / RPI_FIRMWARE_PLLB_ARM_DIV_RATE; + int ret; + + ret = raspberrypi_clock_property(rpi->firmware, + RPI_FIRMWARE_SET_CLOCK_RATE, +- RPI_FIRMWARE_ARM_CLK_ID, +- &new_rate); ++ clock_id, ++ &rate); + if (ret) + dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d", +- clk_hw_get_name(hw), ret); ++ name, ret); + + return ret; + } +@@ -141,16 +204,15 @@ static int raspberrypi_fw_pll_set_rate(s + * Sadly there is no firmware rate rounding interface. We borrowed it from + * clk-bcm2835. + */ +-static int raspberrypi_pll_determine_rate(struct clk_hw *hw, ++static int raspberrypi_determine_rate(struct raspberrypi_clk *rpi, ++ u32 clock_id, const char *name, unsigned long min_rate, unsigned long max_rate, + struct clk_rate_request *req) + { +- struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk, +- pllb); + u64 div, final_rate; + u32 ndiv, fdiv; + + /* We can't use req->rate directly as it would overflow */ +- final_rate = clamp(req->rate, rpi->min_rate, rpi->max_rate); ++ final_rate = clamp(req->rate, min_rate, max_rate); + + div = (u64)final_rate << A2W_PLL_FRAC_BITS; + do_div(div, req->best_parent_rate); +@@ -166,6 +228,125 @@ static int raspberrypi_pll_determine_rat + return 0; + } + ++static int raspberrypi_fw_clock_is_on(struct clk_hw *hw) ++{ ++ struct raspberrypi_clock *pll = container_of(hw, struct raspberrypi_clock, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_clock_data *data = pll->data; ++ ++ return raspberrypi_fw_is_on(rpi, data->clock_id, data->name); ++} ++ ++static unsigned long raspberrypi_fw_clock_get_rate(struct clk_hw *hw, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_clock *pll = container_of(hw, struct raspberrypi_clock, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_clock_data *data = pll->data; ++ ++ return raspberrypi_fw_get_rate(rpi, data->clock_id, data->name, parent_rate); ++} ++ ++static int raspberrypi_fw_clock_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_clock *pll = container_of(hw, struct raspberrypi_clock, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_clock_data *data = pll->data; ++ ++ return raspberrypi_fw_set_rate(rpi, data->clock_id, data->name, rate, parent_rate); ++} ++ ++static int raspberrypi_clock_determine_rate(struct clk_hw *hw, ++ struct clk_rate_request *req) ++{ ++ struct raspberrypi_clock *pll = container_of(hw, struct raspberrypi_clock, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_clock_data *data = pll->data; ++ ++ return raspberrypi_determine_rate(rpi, data->clock_id, data->name, pll->min_rate, pll->max_rate, req); ++} ++ ++static int raspberrypi_fw_pll_is_on(struct clk_hw *hw) ++{ ++ struct raspberrypi_pll *pll = container_of(hw, struct raspberrypi_pll, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_data *data = pll->data; ++ ++ return raspberrypi_fw_is_on(rpi, data->clock_id, data->name); ++} ++ ++static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_pll *pll = container_of(hw, struct raspberrypi_pll, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_data *data = pll->data; ++ ++ return raspberrypi_fw_get_rate(rpi, data->clock_id, data->name, parent_rate); ++} ++ ++static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_pll *pll = container_of(hw, struct raspberrypi_pll, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_data *data = pll->data; ++ ++ return raspberrypi_fw_set_rate(rpi, data->clock_id, data->name, rate, parent_rate); ++} ++ ++static int raspberrypi_pll_determine_rate(struct clk_hw *hw, ++ struct clk_rate_request *req) ++{ ++ struct raspberrypi_pll *pll = container_of(hw, struct raspberrypi_pll, hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_data *data = pll->data; ++ ++ return raspberrypi_determine_rate(rpi, data->clock_id, data->name, pll->min_rate, pll->max_rate, req); ++} ++ ++ ++static int raspberrypi_fw_pll_div_is_on(struct clk_hw *hw) ++{ ++ struct raspberrypi_pll_divider *pll = container_of(hw, struct raspberrypi_pll_divider, div.hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_divider_data *data = pll->data; ++ ++ return raspberrypi_fw_is_on(rpi, data->clock_id, data->name); ++} ++ ++static unsigned long raspberrypi_fw_pll_div_get_rate(struct clk_hw *hw, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_pll_divider *pll = container_of(hw, struct raspberrypi_pll_divider, div.hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_divider_data *data = pll->data; ++ ++ return raspberrypi_fw_get_rate(rpi, data->clock_id, data->name, parent_rate); ++} ++ ++static int raspberrypi_fw_pll_div_set_rate(struct clk_hw *hw, unsigned long rate, ++ unsigned long parent_rate) ++{ ++ struct raspberrypi_pll_divider *pll = container_of(hw, struct raspberrypi_pll_divider, div.hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_divider_data *data = pll->data; ++ ++ return raspberrypi_fw_set_rate(rpi, data->clock_id, data->name, rate, parent_rate); ++} ++ ++static int raspberrypi_pll_div_determine_rate(struct clk_hw *hw, ++ struct clk_rate_request *req) ++{ ++ struct raspberrypi_pll_divider *pll = container_of(hw, struct raspberrypi_pll_divider, div.hw); ++ struct raspberrypi_clk *rpi = pll->rpi; ++ const struct raspberrypi_pll_divider_data *data = pll->data; ++ ++ return raspberrypi_determine_rate(rpi, data->clock_id, data->name, pll->min_rate, pll->max_rate, req); ++} ++ ++ + static const struct clk_ops raspberrypi_firmware_pll_clk_ops = { + .is_prepared = raspberrypi_fw_pll_is_on, + .recalc_rate = raspberrypi_fw_pll_get_rate, +@@ -173,87 +354,225 @@ static const struct clk_ops raspberrypi_ + .determine_rate = raspberrypi_pll_determine_rate, + }; + +-static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) ++static const struct clk_ops raspberrypi_firmware_pll_divider_clk_ops = { ++ .is_prepared = raspberrypi_fw_pll_div_is_on, ++ .recalc_rate = raspberrypi_fw_pll_div_get_rate, ++ .set_rate = raspberrypi_fw_pll_div_set_rate, ++ .determine_rate = raspberrypi_pll_div_determine_rate, ++}; ++ ++static const struct clk_ops raspberrypi_firmware_clk_ops = { ++ .is_prepared = raspberrypi_fw_clock_is_on, ++ .recalc_rate = raspberrypi_fw_clock_get_rate, ++ .set_rate = raspberrypi_fw_clock_set_rate, ++ .determine_rate = raspberrypi_clock_determine_rate, ++}; ++ ++ ++static int raspberrypi_get_clock_range(struct raspberrypi_clk *rpi, u32 clock_id, u32 *min_rate, u32 *max_rate) + { +- u32 min_rate = 0, max_rate = 0; ++ int ret; ++ ++ /* Get min & max rates set by the firmware */ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_GET_MIN_CLOCK_RATE, ++ clock_id, ++ min_rate); ++ if (ret) { ++ dev_err(rpi->dev, "Failed to get clock %d min freq: %d (%d)\n", ++ clock_id, *min_rate, ret); ++ return ret; ++ } ++ ++ ret = raspberrypi_clock_property(rpi->firmware, ++ RPI_FIRMWARE_GET_MAX_CLOCK_RATE, ++ clock_id, ++ max_rate); ++ if (ret) { ++ dev_err(rpi->dev, "Failed to get clock %d max freq: %d (%d)\n", ++ clock_id, *max_rate, ret); ++ return ret; ++ } ++ return 0; ++} ++ ++ ++static int raspberrypi_register_pll(struct raspberrypi_clk *rpi, ++ const struct raspberrypi_pll_data *data) ++{ ++ struct raspberrypi_pll *pll; + struct clk_init_data init; + int ret; + + memset(&init, 0, sizeof(init)); + + /* All of the PLLs derive from the external oscillator. */ +- init.parent_names = (const char *[]){ "osc" }; +- init.num_parents = 1; +- init.name = "pllb"; ++ init.parent_names = data->parents; ++ init.num_parents = data->num_parents; ++ init.name = data->name; + init.ops = &raspberrypi_firmware_pll_clk_ops; + init.flags = CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED; + +- /* Get min & max rates set by the firmware */ +- ret = raspberrypi_clock_property(rpi->firmware, +- RPI_FIRMWARE_GET_MIN_CLOCK_RATE, +- RPI_FIRMWARE_ARM_CLK_ID, +- &min_rate); ++ pll = kzalloc(sizeof(*pll), GFP_KERNEL); ++ if (!pll) ++ return -ENOMEM; ++ pll->rpi = rpi; ++ pll->data = data; ++ pll->hw.init = &init; ++ ++ ret = raspberrypi_get_clock_range(rpi, data->clock_id, &pll->min_rate, &pll->max_rate); + if (ret) { +- dev_err(rpi->dev, "Failed to get %s min freq: %d\n", +- init.name, ret); ++ dev_err(rpi->dev, "%s: raspberrypi_get_clock_range(%s) failed: %d\n", __func__, init.name, ret); + return ret; + } + +- ret = raspberrypi_clock_property(rpi->firmware, +- RPI_FIRMWARE_GET_MAX_CLOCK_RATE, +- RPI_FIRMWARE_ARM_CLK_ID, +- &max_rate); ++ ret = devm_clk_hw_register(rpi->dev, &pll->hw); + if (ret) { +- dev_err(rpi->dev, "Failed to get %s max freq: %d\n", +- init.name, ret); ++ dev_err(rpi->dev, "%s: devm_clk_hw_register(%s) failed: %d\n", __func__, init.name, ret); + return ret; + } ++ return 0; ++} + +- if (!min_rate || !max_rate) { +- dev_err(rpi->dev, "Unexpected frequency range: min %u, max %u\n", +- min_rate, max_rate); +- return -EINVAL; +- } ++static int ++raspberrypi_register_pll_divider(struct raspberrypi_clk *rpi, ++ const struct raspberrypi_pll_divider_data *data) ++{ ++ struct raspberrypi_pll_divider *divider; ++ struct clk_init_data init; ++ int ret; ++ ++ memset(&init, 0, sizeof(init)); ++ ++ init.parent_names = &data->source_pll; ++ init.num_parents = 1; ++ init.name = data->name; ++ init.ops = &raspberrypi_firmware_pll_divider_clk_ops; ++ init.flags = data->flags | CLK_IGNORE_UNUSED; + +- dev_info(rpi->dev, "CPU frequency range: min %u, max %u\n", +- min_rate, max_rate); ++ divider = devm_kzalloc(rpi->dev, sizeof(*divider), GFP_KERNEL); ++ if (!divider) ++ return -ENOMEM; ++ ++ divider->div.hw.init = &init; ++ divider->rpi = rpi; ++ divider->data = data; ++ ++ ret = raspberrypi_get_clock_range(rpi, data->clock_id, ÷r->min_rate, ÷r->max_rate); ++ if (ret) { ++ dev_err(rpi->dev, "%s: raspberrypi_get_clock_range(%s) failed: %d\n", __func__, init.name, ret); ++ return ret; ++ } + +- rpi->min_rate = min_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; +- rpi->max_rate = max_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; ++ ret = devm_clk_hw_register(rpi->dev, ÷r->div.hw); ++ if (ret) { ++ dev_err(rpi->dev, "%s: devm_clk_hw_register(%s) failed: %d\n", __func__, init.name, ret); ++ return ret; ++ } + +- rpi->pllb.init = &init; ++ /* ++ * PLLH's channels have a fixed divide by 10 afterwards, which ++ * is what our consumers are actually using. ++ */ ++ if (data->fixed_divider != 1) { ++ struct clk_lookup *lookup; ++ struct clk_hw *clk = clk_hw_register_fixed_factor(rpi->dev, ++ data->divider_name, ++ data->name, ++ CLK_SET_RATE_PARENT, ++ 1, ++ data->fixed_divider); ++ if (IS_ERR(clk)) { ++ dev_err(rpi->dev, "%s: clk_hw_register_fixed_factor(%s) failed: %ld\n", __func__, init.name, PTR_ERR(clk)); ++ return PTR_ERR(clk); ++ } ++ if (data->lookup) { ++ lookup = clkdev_hw_create(clk, NULL, data->lookup); ++ if (IS_ERR(lookup)) { ++ dev_err(rpi->dev, "%s: clk_hw_register_fixed_factor(%s) failed: %ld\n", __func__, init.name, PTR_ERR(lookup)); ++ return PTR_ERR(lookup); ++ } ++ } ++ } + +- return devm_clk_hw_register(rpi->dev, &rpi->pllb); ++ return 0; + } + +-static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi) ++static int raspberrypi_register_clock(struct raspberrypi_clk *rpi, ++ const struct raspberrypi_clock_data *data) + { +- rpi->pllb_arm = clk_hw_register_fixed_factor(rpi->dev, +- "pllb_arm", "pllb", +- CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE, +- 1, 2); +- if (IS_ERR(rpi->pllb_arm)) { +- dev_err(rpi->dev, "Failed to initialize pllb_arm\n"); +- return PTR_ERR(rpi->pllb_arm); +- } ++ struct raspberrypi_clock *clock; ++ struct clk_init_data init; ++ struct clk *clk; ++ int ret; ++ ++ memset(&init, 0, sizeof(init)); ++ init.parent_names = data->parents; ++ init.num_parents = data->num_parents; ++ init.name = data->name; ++ init.flags = data->flags | CLK_IGNORE_UNUSED; + +- rpi->pllb_arm_lookup = clkdev_hw_create(rpi->pllb_arm, NULL, "cpu0"); +- if (!rpi->pllb_arm_lookup) { +- dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n"); +- clk_hw_unregister_fixed_factor(rpi->pllb_arm); ++ init.ops = &raspberrypi_firmware_clk_ops; ++ ++ clock = devm_kzalloc(rpi->dev, sizeof(*clock), GFP_KERNEL); ++ if (!clock) + return -ENOMEM; +- } + ++ clock->rpi = rpi; ++ clock->data = data; ++ clock->hw.init = &init; ++ ++ ret = raspberrypi_get_clock_range(rpi, data->clock_id, &clock->min_rate, &clock->max_rate); ++ if (ret) { ++ dev_err(rpi->dev, "%s: raspberrypi_get_clock_range(%s) failed: %d\n", __func__, init.name, ret); ++ return ret; ++ } ++ clk = devm_clk_register(rpi->dev, &clock->hw); ++ if (IS_ERR(clk)) { ++ dev_err(rpi->dev, "%s: devm_clk_register(%s) failed: %ld\n", __func__, init.name, PTR_ERR(clk)); ++ return PTR_ERR(clk); ++ } ++ ret = clk_register_clkdev(clk, init.name, NULL); ++ if (ret) { ++ dev_err(rpi->dev, "%s: clk_register_clkdev(%s) failed: %d\n", __func__, init.name, ret); ++ return ret; ++ } + return 0; + } + ++ ++/* ++ * the real definition of all the pll, pll_dividers and clocks ++ * these make use of the above REGISTER_* macros ++ */ ++static const struct raspberrypi_clk_desc clk_desc_array[] = { ++ /* the PLL + PLL dividers */ ++ [BCM2835_CLOCK_V3D] = REGISTER_CLK( ++ SOC_ALL, ++ .name = "v3d", ++ .parents = (const char *[]){ "osc" }, ++ .num_parents = 1, ++ .clock_id = RPI_FIRMWARE_V3D_CLK_ID), ++ [BCM2835_PLLB_ARM] = REGISTER_PLL_DIV( ++ SOC_ALL, ++ .name = "pllb", ++ .source_pll = "osc", ++ .divider_name = "pllb_arm", ++ .lookup = "cpu0", ++ .fixed_divider = 2, ++ .clock_id = RPI_FIRMWARE_ARM_CLK_ID, ++ .flags = CLK_SET_RATE_PARENT), ++}; ++ + static int raspberrypi_clk_probe(struct platform_device *pdev) + { + struct device_node *firmware_node; + struct device *dev = &pdev->dev; + struct rpi_firmware *firmware; + struct raspberrypi_clk *rpi; +- int ret; ++ const struct raspberrypi_clk_desc *desc; ++ const size_t asize = ARRAY_SIZE(clk_desc_array); ++ int i; + + firmware_node = of_find_compatible_node(NULL, NULL, + "raspberrypi,bcm2835-firmware"); +@@ -275,16 +594,16 @@ static int raspberrypi_clk_probe(struct + rpi->firmware = firmware; + platform_set_drvdata(pdev, rpi); + +- ret = raspberrypi_register_pllb(rpi); +- if (ret) { +- dev_err(dev, "Failed to initialize pllb, %d\n", ret); +- return ret; ++ for (i = 0; i < asize; i++) { ++ desc = &clk_desc_array[i]; ++ if (desc->clk_register && desc->data /*&& ++ (desc->supported & pdata->soc)*/) { ++ int ret = desc->clk_register(rpi, desc->data); ++ if (ret) ++ return ret; ++ } + } + +- ret = raspberrypi_register_pllb_arm(rpi); +- if (ret) +- return ret; +- + rpi->cpufreq = platform_device_register_data(dev, "raspberrypi-cpufreq", + -1, NULL, 0); + diff --git a/target/linux/brcm2708/patches-4.19/950-0769-clk-bcm2835-Disable-v3d-clock.patch b/target/linux/brcm2708/patches-4.19/950-0769-clk-bcm2835-Disable-v3d-clock.patch new file mode 100644 index 0000000000..34de4de8aa --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0769-clk-bcm2835-Disable-v3d-clock.patch @@ -0,0 +1,58 @@ +From e8e99169991da84d59f1ed70de9621e31b67d505 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 3 Sep 2019 20:28:00 +0100 +Subject: [PATCH] clk-bcm2835: Disable v3d clock + +This is controlled by firmware, see clk-raspberrypi.c + +Signed-off-by: popcornmix +--- + drivers/clk/bcm/clk-bcm2835.c | 30 ++++++++++++------------------ + 1 file changed, 12 insertions(+), 18 deletions(-) + +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -1725,16 +1725,12 @@ static const struct bcm2835_clk_desc clk + .hold_mask = CM_PLLA_HOLDCORE, + .fixed_divider = 1, + .flags = CLK_SET_RATE_PARENT), +- [BCM2835_PLLA_PER] = REGISTER_PLL_DIV( +- SOC_ALL, +- .name = "plla_per", +- .source_pll = "plla", +- .cm_reg = CM_PLLA, +- .a2w_reg = A2W_PLLA_PER, +- .load_mask = CM_PLLA_LOADPER, +- .hold_mask = CM_PLLA_HOLDPER, +- .fixed_divider = 1, +- .flags = CLK_SET_RATE_PARENT), ++ ++ /* ++ * PLLA_PER is used for gpu clocks. Controlled by firmware, see ++ * clk-raspberrypi.c. ++ */ ++ + [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( + SOC_ALL, + .name = "plla_dsi0", +@@ -2007,14 +2003,12 @@ static const struct bcm2835_clk_desc clk + .int_bits = 6, + .frac_bits = 0, + .tcnt_mux = 3), +- [BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK( +- SOC_ALL, +- .name = "v3d", +- .ctl_reg = CM_V3DCTL, +- .div_reg = CM_V3DDIV, +- .int_bits = 4, +- .frac_bits = 8, +- .tcnt_mux = 4), ++ ++ /* ++ * CLOCK_V3D is used for v3d clock. Controlled by firmware, see ++ * clk-raspberrypi.c. ++ */ ++ + /* + * VPU clock. This doesn't have an enable bit, since it drives + * the bus for everything else, and is special so it doesn't need diff --git a/target/linux/brcm2708/patches-4.19/950-0770-fixup-clk-raspberrypi-Also-support-v3d-clock.patch b/target/linux/brcm2708/patches-4.19/950-0770-fixup-clk-raspberrypi-Also-support-v3d-clock.patch new file mode 100644 index 0000000000..64efff7754 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0770-fixup-clk-raspberrypi-Also-support-v3d-clock.patch @@ -0,0 +1,29 @@ +From c4374e446b6957234432d5c3f5d5f89f1acb807d Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Thu, 7 Nov 2019 12:25:27 +0000 +Subject: [PATCH] fixup! clk-raspberrypi: Also support v3d clock + +--- + drivers/clk/bcm/clk-raspberrypi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/clk/bcm/clk-raspberrypi.c ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -474,7 +474,7 @@ raspberrypi_register_pll_divider(struct + * PLLH's channels have a fixed divide by 10 afterwards, which + * is what our consumers are actually using. + */ +- if (data->fixed_divider != 1) { ++ if (data->fixed_divider != 0) { + struct clk_lookup *lookup; + struct clk_hw *clk = clk_hw_register_fixed_factor(rpi->dev, + data->divider_name, +@@ -559,7 +559,7 @@ static const struct raspberrypi_clk_desc + .source_pll = "osc", + .divider_name = "pllb_arm", + .lookup = "cpu0", +- .fixed_divider = 2, ++ .fixed_divider = 1, + .clock_id = RPI_FIRMWARE_ARM_CLK_ID, + .flags = CLK_SET_RATE_PARENT), + }; diff --git a/target/linux/brcm2708/patches-4.19/950-0771-fixup-clk-raspberrypi-Also-support-v3d-clock.patch b/target/linux/brcm2708/patches-4.19/950-0771-fixup-clk-raspberrypi-Also-support-v3d-clock.patch new file mode 100644 index 0000000000..a15f41f45a --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0771-fixup-clk-raspberrypi-Also-support-v3d-clock.patch @@ -0,0 +1,36 @@ +From 05c745c001c8c82bbba8a6d953ad77ad25c92c5f Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Thu, 7 Nov 2019 14:11:08 +0000 +Subject: [PATCH] fixup! clk-raspberrypi: Also support v3d clock + +--- + drivers/clk/bcm/clk-raspberrypi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/clk/bcm/clk-raspberrypi.c ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -351,21 +351,21 @@ static const struct clk_ops raspberrypi_ + .is_prepared = raspberrypi_fw_pll_is_on, + .recalc_rate = raspberrypi_fw_pll_get_rate, + .set_rate = raspberrypi_fw_pll_set_rate, +- .determine_rate = raspberrypi_pll_determine_rate, ++ //.determine_rate = raspberrypi_pll_determine_rate, + }; + + static const struct clk_ops raspberrypi_firmware_pll_divider_clk_ops = { + .is_prepared = raspberrypi_fw_pll_div_is_on, + .recalc_rate = raspberrypi_fw_pll_div_get_rate, + .set_rate = raspberrypi_fw_pll_div_set_rate, +- .determine_rate = raspberrypi_pll_div_determine_rate, ++ //.determine_rate = raspberrypi_pll_div_determine_rate, + }; + + static const struct clk_ops raspberrypi_firmware_clk_ops = { + .is_prepared = raspberrypi_fw_clock_is_on, + .recalc_rate = raspberrypi_fw_clock_get_rate, + .set_rate = raspberrypi_fw_clock_set_rate, +- .determine_rate = raspberrypi_clock_determine_rate, ++ //.determine_rate = raspberrypi_clock_determine_rate, + }; + + diff --git a/target/linux/brcm2708/patches-4.19/950-0772-raspberrypi-cpufreq-Only-report-integer-pll-divisor-.patch b/target/linux/brcm2708/patches-4.19/950-0772-raspberrypi-cpufreq-Only-report-integer-pll-divisor-.patch new file mode 100644 index 0000000000..04406c8026 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0772-raspberrypi-cpufreq-Only-report-integer-pll-divisor-.patch @@ -0,0 +1,40 @@ +From 1c038a58f4183602fc1699d68b21f5e22a12176d Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Fri, 13 Sep 2019 13:45:11 +0100 +Subject: [PATCH] raspberrypi-cpufreq: Only report integer pll divisor + frequencies + +--- + drivers/cpufreq/raspberrypi-cpufreq.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/cpufreq/raspberrypi-cpufreq.c ++++ b/drivers/cpufreq/raspberrypi-cpufreq.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -22,6 +23,7 @@ static int raspberrypi_cpufreq_probe(str + unsigned long min, max; + unsigned long rate; + struct clk *clk; ++ int div; + int ret; + + cpu_dev = get_cpu_device(0); +@@ -44,7 +46,10 @@ static int raspberrypi_cpufreq_probe(str + max = roundup(clk_round_rate(clk, ULONG_MAX), RASPBERRYPI_FREQ_INTERVAL); + clk_put(clk); + +- for (rate = min; rate <= max; rate += RASPBERRYPI_FREQ_INTERVAL) { ++ for (div = 2; ; div++) { ++ rate = div_u64((u64)max * 2, div); ++ if (rate < min) ++ break; + ret = dev_pm_opp_add(cpu_dev, rate, 0); + if (ret) + goto remove_opp; diff --git a/target/linux/brcm2708/patches-4.19/950-0773-fixup-clk-raspberrypi-Also-support-v3d-clock.patch b/target/linux/brcm2708/patches-4.19/950-0773-fixup-clk-raspberrypi-Also-support-v3d-clock.patch new file mode 100644 index 0000000000..0239b19ff2 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0773-fixup-clk-raspberrypi-Also-support-v3d-clock.patch @@ -0,0 +1,54 @@ +From afb2cfe3056fc643cee8ae25991f4b9c22d48bef Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Thu, 7 Nov 2019 14:23:38 +0000 +Subject: [PATCH] fixup! clk-raspberrypi: Also support v3d clock + +--- + drivers/clk/bcm/clk-raspberrypi.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/drivers/clk/bcm/clk-raspberrypi.c ++++ b/drivers/clk/bcm/clk-raspberrypi.c +@@ -208,6 +208,9 @@ static int raspberrypi_determine_rate(st + u32 clock_id, const char *name, unsigned long min_rate, unsigned long max_rate, + struct clk_rate_request *req) + { ++#if 1 ++ req->rate = clamp(req->rate, min_rate, max_rate); ++#else + u64 div, final_rate; + u32 ndiv, fdiv; + +@@ -225,6 +228,7 @@ static int raspberrypi_determine_rate(st + + req->rate = final_rate >> A2W_PLL_FRAC_BITS; + ++#endif + return 0; + } + +@@ -351,21 +355,21 @@ static const struct clk_ops raspberrypi_ + .is_prepared = raspberrypi_fw_pll_is_on, + .recalc_rate = raspberrypi_fw_pll_get_rate, + .set_rate = raspberrypi_fw_pll_set_rate, +- //.determine_rate = raspberrypi_pll_determine_rate, ++ .determine_rate = raspberrypi_pll_determine_rate, + }; + + static const struct clk_ops raspberrypi_firmware_pll_divider_clk_ops = { + .is_prepared = raspberrypi_fw_pll_div_is_on, + .recalc_rate = raspberrypi_fw_pll_div_get_rate, + .set_rate = raspberrypi_fw_pll_div_set_rate, +- //.determine_rate = raspberrypi_pll_div_determine_rate, ++ .determine_rate = raspberrypi_pll_div_determine_rate, + }; + + static const struct clk_ops raspberrypi_firmware_clk_ops = { + .is_prepared = raspberrypi_fw_clock_is_on, + .recalc_rate = raspberrypi_fw_clock_get_rate, + .set_rate = raspberrypi_fw_clock_set_rate, +- //.determine_rate = raspberrypi_clock_determine_rate, ++ .determine_rate = raspberrypi_clock_determine_rate, + }; + + diff --git a/target/linux/brcm2708/patches-4.19/950-0774-arm-dts-Correct-Pi-4B-LED-values.patch b/target/linux/brcm2708/patches-4.19/950-0774-arm-dts-Correct-Pi-4B-LED-values.patch new file mode 100644 index 0000000000..4f2e46b71a --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0774-arm-dts-Correct-Pi-4B-LED-values.patch @@ -0,0 +1,39 @@ +From ea1e25b4c0a055b31a0217ffbfd6972c28643912 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Fri, 22 Nov 2019 15:08:25 +0000 +Subject: [PATCH] arm/dts: Correct Pi 4B LED values + +The initial PHY LED settings are wrong Pi 4B (the correct values got +dropped somewhere along the way). The PHY declaration should arguably +go in a separate file included by bcm2711-rpi-4-b.dts, but we can +fix that as we switch over to using more of the upstream BCM2711 +support in 5.4 and later. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2838.dtsi | 2 +- + arch/arm/boot/dts/overlays/README | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/bcm2838.dtsi ++++ b/arch/arm/boot/dts/bcm2838.dtsi +@@ -380,7 +380,7 @@ + /* No interrupts - use PHY_POLL */ + max-speed = <1000>; + reg = <0x1>; +- led-modes = <0x02 0x02>; ++ led-modes = <0x00 0x08>; /* link/activity link */ + }; + }; + }; +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -128,7 +128,7 @@ Params: + 8=Link 9=Activity + + eth_led1 Set mode of LED1 (usually green) (Pi3B+ default +- "6", Pi4 default "0"). See eth_led0 for legal ++ "6", Pi4 default "8"). See eth_led0 for legal + values. + + eth_max_speed Set the maximum speed a link is allowed diff --git a/target/linux/brcm2708/patches-4.19/950-0775-drm-v3d-Set-dma_mask-as-well-as-coherent_dma_mask.patch b/target/linux/brcm2708/patches-4.19/950-0775-drm-v3d-Set-dma_mask-as-well-as-coherent_dma_mask.patch new file mode 100644 index 0000000000..313aa8c3ae --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0775-drm-v3d-Set-dma_mask-as-well-as-coherent_dma_mask.patch @@ -0,0 +1,25 @@ +From 75e50217c8c8d9ab8dc84547fd149d9bfe32ae5d Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Fri, 22 Nov 2019 16:23:32 +0000 +Subject: [PATCH] drm/v3d: Set dma_mask as well as coherent_dma_mask + +Both coherent_dma_mask and dma_mask act as constraints on allocations +and bounce buffer usage, so be sure to set dma_mask to the appropriate +value otherwise the effective mask could be incorrect. + +Signed-off-by: Phil Elwell +--- + drivers/gpu/drm/v3d/v3d_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/v3d/v3d_drv.c ++++ b/drivers/gpu/drm/v3d/v3d_drv.c +@@ -261,7 +261,7 @@ static int v3d_platform_drm_probe(struct + int ret; + u32 ident1; + +- dev->coherent_dma_mask = DMA_BIT_MASK(36); ++ dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36)); + + v3d = kzalloc(sizeof(*v3d), GFP_KERNEL); + if (!v3d) diff --git a/target/linux/brcm2708/patches-4.19/950-0776-arm-dts-2711-Add-pcie0-alias.patch b/target/linux/brcm2708/patches-4.19/950-0776-arm-dts-2711-Add-pcie0-alias.patch new file mode 100644 index 0000000000..1f86f9d7fa --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0776-arm-dts-2711-Add-pcie0-alias.patch @@ -0,0 +1,24 @@ +From 11febee7b0326ade03f45238f136b7830d317e2e Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Thu, 28 Nov 2019 15:49:08 +0000 +Subject: [PATCH] arm/dts: 2711: Add 'pcie0' alias + +It is useful for the firmware to be able to locate the pcie DT node, +so add an alias pointing to it in the same way that "ethernet0" +points to the genet. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +@@ -30,6 +30,7 @@ + /delete-property/ ethernet; + /delete-property/ intc; + ethernet0 = &genet; ++ pcie0 = &pcie_0; + }; + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch b/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch new file mode 100644 index 0000000000..70959de2bc --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch @@ -0,0 +1,32 @@ +From ce0e4cf60033eb7e15266b329183f945f2a82c61 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 2 Dec 2019 10:28:44 +0000 +Subject: [PATCH] spidev: Completely disable the DT warning + +The upstream SPI and DT maintainers are completely opposed to declaring +in Device Tree that an SPI CS line is to be managed by the spidev +driver, even though the facility is useful on a hobbyist device like a +Raspberry Pi where arbitrary devices can be attached, and the +alternative to DT declaration (spi_board_info) has been almost entirely +rendered obsolete by DT. + +Continue to override their objections by disabling the warning. + +See: https://github.com/raspberrypi/linux/issues/3361 + https://github.com/raspberrypi/linux/issues/1054 + +Signed-off-by: Phil Elwell +--- + drivers/spi/spidev.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/spi/spidev.c ++++ b/drivers/spi/spidev.c +@@ -725,6 +725,7 @@ static int spidev_probe(struct spi_devic + * compatible string, it is a Linux implementation thing + * rather than a description of the hardware. + */ ++ if (0) /* Disable the warning - this feature is too useful */ + WARN(spi->dev.of_node && + of_device_is_compatible(spi->dev.of_node, "spidev"), + "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node); diff --git a/target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch b/target/linux/brcm2708/patches-4.19/950-0778-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch similarity index 71% rename from target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch rename to target/linux/brcm2708/patches-4.19/950-0778-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch index 2adc642492..afc94da40b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0528-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch +++ b/target/linux/brcm2708/patches-4.19/950-0778-drm-vc4-Disable-V3D-interactions-if-the-v3d-componen.patch @@ -1,21 +1,31 @@ -From f69f2b1354e0a548d2cb6dfdc07d37efb426eee0 Mon Sep 17 00:00:00 2001 +From 7140cf0d83c10f93ca8212edb17697baf9cafb45 Mon Sep 17 00:00:00 2001 From: Eric Anholt -Date: Wed, 20 Feb 2019 13:03:41 -0800 +Date: Mon, 1 Apr 2019 11:35:59 -0700 Subject: [PATCH] drm/vc4: Disable V3D interactions if the v3d component didn't probe. +Commit ffc26740714962e3e8801dca7ef32b636b3781db upstream. + One might want to use the VC4 display stack without using Mesa. Similar to the debugfs fixes for not having all of the possible display bits enabled, make sure you can't oops in vc4 if v3d isn't enabled. +v2: Fix matching against other v3d variants (review by Paul), don't + forget to set irq_enabled so that the vblank uapi works +v3: Use -ENODEV instead of -EINVAL on Paul's suggestion. + Signed-off-by: Eric Anholt +Link: https://patchwork.freedesktop.org/patch/msgid/20190401183559.3823-2-eric@anholt.net +Reviewed-by: Paul Kocialkowski --- - drivers/gpu/drm/vc4/vc4_drv.c | 11 +++++++++++ + drivers/gpu/drm/vc4/vc4_drv.c | 10 ++++++++++ + drivers/gpu/drm/vc4/vc4_drv.h | 1 + drivers/gpu/drm/vc4/vc4_gem.c | 10 ++++++++++ drivers/gpu/drm/vc4/vc4_irq.c | 9 +++++++++ drivers/gpu/drm/vc4/vc4_perfmon.c | 18 ++++++++++++++++++ - 4 files changed, 48 insertions(+) + drivers/gpu/drm/vc4/vc4_v3d.c | 2 +- + 6 files changed, 49 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -24,7 +34,7 @@ Signed-off-by: Eric Anholt return -EINVAL; + if (!vc4->v3d) -+ return -EINVAL; ++ return -ENODEV; + switch (args->param) { case DRM_VC4_PARAM_V3D_IDENT0: @@ -37,20 +47,29 @@ Signed-off-by: Eric Anholt int ret = 0; dev->coherent_dma_mask = DMA_BIT_MASK(32); -@@ -279,6 +283,13 @@ static int vc4_drm_bind(struct device *d +@@ -279,6 +283,12 @@ static int vc4_drm_bind(struct device *d if (!vc4) return -ENOMEM; + /* If VC4 V3D is missing, don't advertise render nodes. */ -+ node = of_find_compatible_node(NULL, NULL, "brcm,bcm2835-v3d"); -+ if (node) -+ of_node_put(node); -+ else ++ node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL); ++ if (!node || !of_device_is_available(node)) + vc4_drm_driver.driver_features &= ~DRIVER_RENDER; ++ of_node_put(node); + drm = drm_dev_alloc(&vc4_drm_driver, dev); if (IS_ERR(drm)) return PTR_ERR(drm); +--- a/drivers/gpu/drm/vc4/vc4_drv.h ++++ b/drivers/gpu/drm/vc4/vc4_drv.h +@@ -787,6 +787,7 @@ void vc4_plane_async_set_fb(struct drm_p + + /* vc4_v3d.c */ + extern struct platform_driver vc4_v3d_driver; ++extern const struct of_device_id vc4_v3d_dt_match[]; + int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused); + int vc4_v3d_debugfs_regs(struct seq_file *m, void *unused); + int vc4_v3d_get_bin_slot(struct vc4_dev *vc4); --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -74,6 +74,11 @@ vc4_get_hang_state_ioctl(struct drm_devi @@ -59,7 +78,7 @@ Signed-off-by: Eric Anholt + if (!vc4->v3d) { + DRM_DEBUG("VC4_GET_HANG_STATE with no VC4 V3D probed\n"); -+ return -EINVAL; ++ return -ENODEV; + } + spin_lock_irqsave(&vc4->job_lock, irqflags); @@ -71,7 +90,7 @@ Signed-off-by: Eric Anholt + if (!vc4->v3d) { + DRM_DEBUG("VC4_SUBMIT_CL with no VC4 V3D probed\n"); -+ return -EINVAL; ++ return -ENODEV; + } + if ((args->flags & ~(VC4_SUBMIT_CL_USE_CLEAR_COLOR | @@ -124,7 +143,7 @@ Signed-off-by: Eric Anholt + if (!vc4->v3d) { + DRM_DEBUG("Creating perfmon no VC4 V3D probed\n"); -+ return -EINVAL; ++ return -ENODEV; + } + /* Number of monitored counters cannot exceed HW limits. */ @@ -141,7 +160,7 @@ Signed-off-by: Eric Anholt + if (!vc4->v3d) { + DRM_DEBUG("Destroying perfmon no VC4 V3D probed\n"); -+ return -EINVAL; ++ return -ENODEV; + } + mutex_lock(&vc4file->perfmon.lock); @@ -159,9 +178,20 @@ Signed-off-by: Eric Anholt + if (!vc4->v3d) { + DRM_DEBUG("Getting perfmon no VC4 V3D probed\n"); -+ return -EINVAL; ++ return -ENODEV; + } + mutex_lock(&vc4file->perfmon.lock); perfmon = idr_find(&vc4file->perfmon.idr, req->id); vc4_perfmon_get(perfmon); +--- a/drivers/gpu/drm/vc4/vc4_v3d.c ++++ b/drivers/gpu/drm/vc4/vc4_v3d.c +@@ -452,7 +452,7 @@ static int vc4_v3d_dev_remove(struct pla + return 0; + } + +-static const struct of_device_id vc4_v3d_dt_match[] = { ++const struct of_device_id vc4_v3d_dt_match[] = { + { .compatible = "brcm,bcm2835-v3d" }, + { .compatible = "brcm,cygnus-v3d" }, + { .compatible = "brcm,vc4-v3d" }, diff --git a/target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch b/target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch new file mode 100644 index 0000000000..dcfbb9dd1a --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0779-sound-soc-only-first-codec-is-master-in-multicodec-s.patch @@ -0,0 +1,34 @@ +From 4ca89eb8570cb86314a5a7b55a15d15f53ce5757 Mon Sep 17 00:00:00 2001 +From: Johannes Krude +Date: Sat, 16 Nov 2019 12:41:06 +0100 +Subject: [PATCH] sound/soc: only first codec is master in multicodec + setup + +When using multiple codecs, at most one codec should generate the master +clock. All codecs except the first are therefore configured for slave +mode. + +Signed-off-by: Johannes Krude +--- + sound/soc/soc-core.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -1688,8 +1688,15 @@ int snd_soc_runtime_set_dai_fmt(struct s + + for (i = 0; i < rtd->num_codecs; i++) { + struct snd_soc_dai *codec_dai = codec_dais[i]; ++ unsigned int codec_dai_fmt = dai_fmt; + +- ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt); ++ // there can only be one master when using multiple codecs ++ if (i && (codec_dai_fmt & SND_SOC_DAIFMT_MASTER_MASK)) { ++ codec_dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK; ++ codec_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; ++ } ++ ++ ret = snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + if (ret != 0 && ret != -ENOTSUPP) { + dev_warn(codec_dai->dev, + "ASoC: Failed to set DAI format: %d\n", ret); diff --git a/target/linux/brcm2708/patches-4.19/950-0780-Allow-simultaneous-use-of-JustBoom-DAC-and-Digi.patch b/target/linux/brcm2708/patches-4.19/950-0780-Allow-simultaneous-use-of-JustBoom-DAC-and-Digi.patch new file mode 100644 index 0000000000..c8b4820c93 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0780-Allow-simultaneous-use-of-JustBoom-DAC-and-Digi.patch @@ -0,0 +1,435 @@ +From 8f11db84e124da59b8a717d66fc424ef070f4be0 Mon Sep 17 00:00:00 2001 +From: Johannes Krude +Date: Sat, 16 Nov 2019 13:14:43 +0100 +Subject: [PATCH] Allow simultaneous use of JustBoom DAC and Digi + +Signed-off-by: Johannes Krude +--- + arch/arm/boot/dts/overlays/Makefile | 1 + + arch/arm/boot/dts/overlays/README | 20 ++ + .../dts/overlays/justboom-both-overlay.dts | 65 +++++ + sound/soc/bcm/Kconfig | 12 + + sound/soc/bcm/Makefile | 2 + + sound/soc/bcm/justboom-both.c | 269 ++++++++++++++++++ + 11 files changed, 374 insertions(+) + create mode 100644 arch/arm/boot/dts/overlays/justboom-both-overlay.dts + create mode 100644 sound/soc/bcm/justboom-both.c + +--- a/arch/arm/boot/dts/overlays/Makefile ++++ b/arch/arm/boot/dts/overlays/Makefile +@@ -86,6 +86,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ + iqaudio-digi-wm8804-audio.dtbo \ + irs1125.dtbo \ + jedec-spi-nor.dtbo \ ++ justboom-both.dtbo \ + justboom-dac.dtbo \ + justboom-digi.dtbo \ + ltc294x.dtbo \ +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1388,6 +1388,26 @@ Params: flash-spi- Enables + on SPI, CS#. + + ++Name: justboom-both ++Info: Simultaneous usage of an justboom-dac and justboom-digi based ++ card ++Load: dtoverlay=justboom-both,= ++Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec ++ Digital volume control. Enable with ++ "dtoverlay=justboom-dac,24db_digital_gain" ++ (The default behaviour is that the Digital ++ volume control is limited to a maximum of ++ 0dB. ie. it can attenuate but not provide ++ gain. For most users, this will be desired ++ as it will prevent clipping. By appending ++ the 24dB_digital_gain parameter, the Digital ++ volume control will allow up to 24dB of ++ gain. If this parameter is enabled, it is the ++ responsibility of the user to ensure that ++ the Digital volume control is set to a value ++ that does not result in clipping/distortion!) ++ ++ + Name: justboom-dac + Info: Configures the JustBoom DAC HAT, Amp HAT, DAC Zero and Amp Zero audio + cards +--- /dev/null ++++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts +@@ -0,0 +1,65 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Definitions for JustBoom Both (Digi+DAC) ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835"; ++ ++ fragment@0 { ++ target = <&i2s>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ wm8804@3b { ++ #sound-dai-cells = <0>; ++ compatible = "wlf,wm8804"; ++ reg = <0x3b>; ++ PVDD-supply = <&vdd_3v3_reg>; ++ DVDD-supply = <&vdd_3v3_reg>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ pcm5122@4d { ++ #sound-dai-cells = <0>; ++ compatible = "ti,pcm5122"; ++ reg = <0x4d>; ++ AVDD-supply = <&vdd_3v3_reg>; ++ DVDD-supply = <&vdd_3v3_reg>; ++ CPVDD-supply = <&vdd_3v3_reg>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@3 { ++ target = <&sound>; ++ frag3: __overlay__ { ++ compatible = "justboom,justboom-both"; ++ i2s-controller = <&i2s>; ++ status = "okay"; ++ }; ++ }; ++ ++ __overrides__ { ++ 24db_digital_gain = <&frag3>,"justboom,24db_digital_gain?"; ++ }; ++}; +--- a/sound/soc/bcm/Kconfig ++++ b/sound/soc/bcm/Kconfig +@@ -102,6 +102,18 @@ config SND_BCM2708_SOC_RPI_PROTO + help + Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731). + ++config SND_BCM2708_SOC_JUSTBOOM_BOTH ++ tristate "Support for simultaneous JustBoom Digi and JustBoom DAC" ++ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S ++ select SND_SOC_WM8804 ++ select SND_SOC_PCM512x ++ help ++ Say Y or M if you want to add support for simultaneous ++ JustBoom Digi and JustBoom DAC. ++ ++ This is not the right choice if you only have one but both of ++ these cards. ++ + config SND_BCM2708_SOC_JUSTBOOM_DAC + tristate "Support for JustBoom DAC" + depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S +--- a/sound/soc/bcm/Makefile ++++ b/sound/soc/bcm/Makefile +@@ -16,6 +16,7 @@ snd-soc-hifiberry-dacplus-objs := hifibe + snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o + snd-soc-hifiberry-dacplusadcpro-objs := hifiberry_dacplusadcpro.o + snd-soc-hifiberry-dacplusdsp-objs := hifiberry_dacplusdsp.o ++snd-soc-justboom-both-objs := justboom-both.o + snd-soc-justboom-dac-objs := justboom-dac.o + snd-soc-rpi-cirrus-objs := rpi-cirrus.o + snd-soc-rpi-proto-objs := rpi-proto.o +@@ -42,6 +43,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_D + obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC) += snd-soc-hifiberry-dacplusadc.o + obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO) += snd-soc-hifiberry-dacplusadcpro.o + obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP) += snd-soc-hifiberry-dacplusdsp.o ++obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH) += snd-soc-justboom-both.o + obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o + obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o + obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o +--- /dev/null ++++ b/sound/soc/bcm/justboom-both.c +@@ -0,0 +1,269 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * rpi--wm8804.c -- ALSA SoC Raspberry Pi soundcard. ++ * ++ * Authors: Johannes Krude ++ * justboom-dac.c ++ * by Milan Neskovic ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "../codecs/wm8804.h" ++#include "../codecs/pcm512x.h" ++ ++ ++static bool digital_gain_0db_limit = true; ++ ++static int snd_rpi_justboom_both_init(struct snd_soc_pcm_runtime *rtd) ++{ ++ struct snd_soc_component *digi = rtd->codec_dais[0]->component; ++ struct snd_soc_component *dac = rtd->codec_dais[1]->component; ++ ++ /* enable TX output */ ++ snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x4, 0x0); ++ ++ snd_soc_component_update_bits(dac, PCM512x_GPIO_EN, 0x08, 0x08); ++ snd_soc_component_update_bits(dac, PCM512x_GPIO_OUTPUT_4, 0xf, 0x02); ++ snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x08); ++ ++ if (digital_gain_0db_limit) { ++ int ret; ++ struct snd_soc_card *card = rtd->card; ++ ++ ret = snd_soc_limit_volume(card, "Digital Playback Volume", ++ 207); ++ if (ret < 0) ++ dev_warn(card->dev, "Failed to set volume limit: %d\n", ++ ret); ++ } ++ ++ return 0; ++} ++ ++static int snd_rpi_justboom_both_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *codec_dai = rtd->codec_dai; ++ struct snd_soc_component *digi = rtd->codec_dais[0]->component; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ ++ int sysclk = 27000000; /* This is fixed on this board */ ++ ++ long mclk_freq = 0; ++ int mclk_div = 1; ++ int sampling_freq = 1; ++ ++ int ret; ++ ++ int samplerate = params_rate(params); ++ ++ if (samplerate <= 96000) { ++ mclk_freq = samplerate*256; ++ mclk_div = WM8804_MCLKDIV_256FS; ++ } else { ++ mclk_freq = samplerate*128; ++ mclk_div = WM8804_MCLKDIV_128FS; ++ } ++ ++ switch (samplerate) { ++ case 32000: ++ sampling_freq = 0x03; ++ break; ++ case 44100: ++ sampling_freq = 0x00; ++ break; ++ case 48000: ++ sampling_freq = 0x02; ++ break; ++ case 88200: ++ sampling_freq = 0x08; ++ break; ++ case 96000: ++ sampling_freq = 0x0a; ++ break; ++ case 176400: ++ sampling_freq = 0x0c; ++ break; ++ case 192000: ++ sampling_freq = 0x0e; ++ break; ++ default: ++ dev_err(rtd->card->dev, ++ "Failed to set WM8804 SYSCLK, unsupported samplerate %d\n", ++ samplerate); ++ } ++ ++ snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div); ++ snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq); ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL, ++ sysclk, SND_SOC_CLOCK_OUT); ++ if (ret < 0) { ++ dev_err(rtd->card->dev, ++ "Failed to set WM8804 SYSCLK: %d\n", ret); ++ return ret; ++ } ++ ++ /* Enable TX output */ ++ snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x4, 0x0); ++ ++ /* Power on */ ++ snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x9, 0); ++ ++ /* set sampling frequency status bits */ ++ snd_soc_component_update_bits(digi, WM8804_SPDTX4, 0x0f, sampling_freq); ++ ++ return snd_soc_dai_set_bclk_ratio(cpu_dai, 64); ++} ++ ++static int snd_rpi_justboom_both_startup(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_component *digi = rtd->codec_dais[0]->component; ++ struct snd_soc_component *dac = rtd->codec_dais[1]->component; ++ ++ /* turn on digital output */ ++ snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x3c, 0x00); ++ ++ snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x08); ++ ++ return 0; ++} ++ ++static void snd_rpi_justboom_both_shutdown(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_component *digi = rtd->codec_dais[0]->component; ++ struct snd_soc_component *dac = rtd->codec_dais[1]->component; ++ ++ snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x00); ++ ++ /* turn off output */ ++ snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x3c, 0x3c); ++} ++ ++/* machine stream operations */ ++static struct snd_soc_ops snd_rpi_justboom_both_ops = { ++ .hw_params = snd_rpi_justboom_both_hw_params, ++ .startup = snd_rpi_justboom_both_startup, ++ .shutdown = snd_rpi_justboom_both_shutdown, ++}; ++ ++static struct snd_soc_dai_link_component justboom_both_codecs[] = { ++{ ++ .dai_name = "wm8804-spdif", ++ .name = "wm8804.1-003b", ++}, ++{ ++ .dai_name = "pcm512x-hifi", ++ .name = "pcm512x.1-004d", ++}, ++}; ++ ++static struct snd_soc_dai_link snd_rpi_justboom_both_dai[] = { ++{ ++ .name = "JustBoom Digi", ++ .stream_name = "JustBoom Digi HiFi", ++ .cpu_dai_name = "bcm2708-i2s.0", ++ .platform_name = "bcm2708-i2s.0", ++ .codecs = justboom_both_codecs, ++ .num_codecs = ARRAY_SIZE(justboom_both_codecs), ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM, ++ .ops = &snd_rpi_justboom_both_ops, ++ .init = snd_rpi_justboom_both_init, ++}, ++}; ++ ++/* audio machine driver */ ++static struct snd_soc_card snd_rpi_justboom_both = { ++ .name = "snd_rpi_justboom_both", ++ .driver_name = "JustBoomBoth", ++ .owner = THIS_MODULE, ++ .dai_link = snd_rpi_justboom_both_dai, ++ .num_links = ARRAY_SIZE(snd_rpi_justboom_both_dai), ++}; ++ ++static int snd_rpi_justboom_both_probe(struct platform_device *pdev) ++{ ++ int ret = 0; ++ ++ snd_rpi_justboom_both.dev = &pdev->dev; ++ ++ if (pdev->dev.of_node) { ++ struct device_node *i2s_node; ++ struct snd_soc_dai_link *dai = &snd_rpi_justboom_both_dai[0]; ++ ++ i2s_node = of_parse_phandle(pdev->dev.of_node, ++ "i2s-controller", 0); ++ ++ if (i2s_node) { ++ dai->cpu_dai_name = NULL; ++ dai->cpu_of_node = i2s_node; ++ dai->platform_name = NULL; ++ dai->platform_of_node = i2s_node; ++ } ++ ++ digital_gain_0db_limit = !of_property_read_bool( ++ pdev->dev.of_node, "justboom,24db_digital_gain"); ++ } ++ ++ ret = snd_soc_register_card(&snd_rpi_justboom_both); ++ if (ret && ret != -EPROBE_DEFER) { ++ dev_err(&pdev->dev, ++ "snd_soc_register_card() failed: %d\n", ret); ++ } ++ ++ return ret; ++} ++ ++static int snd_rpi_justboom_both_remove(struct platform_device *pdev) ++{ ++ return snd_soc_unregister_card(&snd_rpi_justboom_both); ++} ++ ++static const struct of_device_id snd_rpi_justboom_both_of_match[] = { ++ { .compatible = "justboom,justboom-both", }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, snd_rpi_justboom_both_of_match); ++ ++static struct platform_driver snd_rpi_justboom_both_driver = { ++ .driver = { ++ .name = "snd-rpi-justboom-both", ++ .owner = THIS_MODULE, ++ .of_match_table = snd_rpi_justboom_both_of_match, ++ }, ++ .probe = snd_rpi_justboom_both_probe, ++ .remove = snd_rpi_justboom_both_remove, ++}; ++ ++module_platform_driver(snd_rpi_justboom_both_driver); ++ ++MODULE_AUTHOR("Johannes Krude "); ++MODULE_DESCRIPTION("ASoC Driver for simultaneous use of JustBoom PI Digi & DAC HAT Sound Cards"); ++MODULE_LICENSE("GPL v2"); diff --git a/target/linux/brcm2708/patches-4.19/950-0781-dwc_otg-checking-the-urb-transfer_buffer-too-early-3.patch b/target/linux/brcm2708/patches-4.19/950-0781-dwc_otg-checking-the-urb-transfer_buffer-too-early-3.patch new file mode 100644 index 0000000000..8a28f73029 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0781-dwc_otg-checking-the-urb-transfer_buffer-too-early-3.patch @@ -0,0 +1,59 @@ +From 2a15e634d80f78cf2d8aa16ecf0f3cf930e277b4 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Sun, 17 Nov 2019 10:31:46 +0800 +Subject: [PATCH] dwc_otg: checking the urb->transfer_buffer too early + (#3332) + +After enable the HIGHMEM and VMSPLIT_3G, the dwc_otg driver doesn't +work well on Pi2/3 boards with 1G physical ram. Users experience +the failure when copying a file of 600M size to the USB stick. And +at the same time, the dmesg shows: +usb 1-1.1.2: reset high-speed USB device number 8 using dwc_otg +sd 0:0:0:0: [sda] tag#0 FAILED Result: hostbyte=DID_ERROR driverbyte=DRIVER_OK +blk_update_request: I/O error, dev sda, sector 3024048 op 0x1:(WRITE) flags 0x4000 phys_seg 15 prio class 0 + +When this happens, the sg_buf sent to the driver is located in the +highmem region, the usb_sg_init() in the core/message.c will leave +transfer_buffer to NULL if the sg_buf is in highmem, but in the +dwc_otg driver, it returns -EINVAL unconditionally if transfer_buffer +is NULL. + +The driver can handle the situation of buffer to be NULL, if it is in +DMA mode, it will convert an address from transfer_dma. + +But if the conversion fails or it is in the PIO mode, we should check +buffer and return -EINVAL if it is NULL. + +BugLink: https://bugs.launchpad.net/bugs/1852510 +Signed-off-by: Hui Wang +--- + drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ++++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +@@ -821,10 +821,6 @@ static int dwc_otg_urb_enqueue(struct us + dump_urb_info(urb, "dwc_otg_urb_enqueue"); + } + #endif +- +- if (!urb->transfer_buffer && urb->transfer_buffer_length) +- return -EINVAL; +- + if ((usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) + || (usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) { + if (!dwc_otg_hcd_is_bandwidth_allocated +@@ -881,6 +877,13 @@ static int dwc_otg_urb_enqueue(struct us + &urb->transfer_dma, buf); + } + ++ if (!buf && urb->transfer_buffer_length) { ++ DWC_FREE(dwc_otg_urb); ++ DWC_ERROR("transfer_buffer is NULL in PIO mode or both " ++ "transfer_buffer and transfer_dma are NULL in DMA mode\n"); ++ return -EINVAL; ++ } ++ + if (!(urb->transfer_flags & URB_NO_INTERRUPT)) + flags |= URB_GIVEBACK_ASAP; + if (urb->transfer_flags & URB_ZERO_PACKET) diff --git a/target/linux/brcm2708/patches-4.19/950-0782-overlays-Make-mcp342x-run-time-compatible.patch b/target/linux/brcm2708/patches-4.19/950-0782-overlays-Make-mcp342x-run-time-compatible.patch new file mode 100644 index 0000000000..900cbb2ca8 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0782-overlays-Make-mcp342x-run-time-compatible.patch @@ -0,0 +1,209 @@ +From e650f4bfbe9a09e5b75d702884a8ba8d9df6ccdf Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Mon, 9 Dec 2019 12:32:20 +0000 +Subject: [PATCH] overlays: Make mcp342x run-time compatible + +The order of processing of run-time overlays differs from that done by +the firmware. This means that certain parameter processing techniques +are not compatible with run-time use. The mcp342x overlay is one such +overlay, but it is easy to change the implementation without changing +the interface. + +See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=258294 + +Signed-off-by: Phil Elwell +--- + .../arm/boot/dts/overlays/mcp342x-overlay.dts | 133 ++++++++++++++---- + 1 file changed, 102 insertions(+), 31 deletions(-) + +--- a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts ++++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts +@@ -8,14 +8,15 @@ + + fragment@0 { + target = <&i2c1>; +- __overlay__ { ++ __dormant__ { + #address-cells = <1>; + #size-cells = <0>; + + status = "okay"; + +- mcp342x: mcp@68 { ++ mcp3421: mcp@68 { + reg = <0x68>; ++ compatible = "microchip,mcp3421"; + + status = "okay"; + }; +@@ -23,71 +24,141 @@ + }; + + fragment@1 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3421"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ mcp3422: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3422"; ++ ++ status = "okay"; ++ }; + }; + }; + + fragment@2 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3422"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ mcp3423: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3423"; ++ ++ status = "okay"; ++ }; + }; + }; + + fragment@3 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3423"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ mcp3424: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3424"; ++ ++ status = "okay"; ++ }; + }; + }; + + fragment@4 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3424"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ mcp3425: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3425","mcp3425"; ++ ++ status = "okay"; ++ }; + }; + }; + + fragment@5 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3425"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ mcp3426: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3426"; ++ ++ status = "okay"; ++ }; + }; + }; + + fragment@6 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3426"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "okay"; ++ ++ mcp3427: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3427"; ++ ++ status = "okay"; ++ }; + }; + }; + + fragment@7 { +- target = <&mcp342x>; ++ target = <&i2c1>; + __dormant__ { +- compatible = "microchip,mcp3427"; +- }; +- }; ++ #address-cells = <1>; ++ #size-cells = <0>; + +- fragment@8 { +- target = <&mcp342x>; +- __dormant__ { +- compatible = "microchip,mcp3428"; ++ status = "okay"; ++ ++ mcp3428: mcp@68 { ++ reg = <0x68>; ++ compatible = "microchip,mcp3428"; ++ ++ status = "okay"; ++ }; + }; + }; + + __overrides__ { +- addr = <&mcp342x>,"reg:0"; +- mcp3421 = <0>,"=1"; +- mcp3422 = <0>,"=2"; +- mcp3423 = <0>,"=3"; +- mcp3424 = <0>,"=4"; +- mcp3425 = <0>,"=5"; +- mcp3426 = <0>,"=6"; +- mcp3427 = <0>,"=7"; +- mcp3428 = <0>,"=8"; ++ addr = <&mcp3421>,"reg:0", ++ <&mcp3422>,"reg:0", ++ <&mcp3423>,"reg:0", ++ <&mcp3424>,"reg:0", ++ <&mcp3425>,"reg:0", ++ <&mcp3426>,"reg:0", ++ <&mcp3427>,"reg:0", ++ <&mcp3428>,"reg:0"; ++ mcp3421 = <0>,"=0"; ++ mcp3422 = <0>,"=1"; ++ mcp3423 = <0>,"=2"; ++ mcp3424 = <0>,"=3"; ++ mcp3425 = <0>,"=4"; ++ mcp3426 = <0>,"=5"; ++ mcp3427 = <0>,"=6"; ++ mcp3428 = <0>,"=7"; + }; + }; + diff --git a/target/linux/brcm2708/patches-4.19/950-0783-overlays-dht11-Allow-multiple-instantiation.patch b/target/linux/brcm2708/patches-4.19/950-0783-overlays-dht11-Allow-multiple-instantiation.patch new file mode 100644 index 0000000000..5eed1baff8 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0783-overlays-dht11-Allow-multiple-instantiation.patch @@ -0,0 +1,34 @@ +From 26e95c876831692f28894041c5a1db5934715939 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Wed, 18 Dec 2019 10:41:33 +0000 +Subject: [PATCH] overlays: dht11: Allow multiple instantiation + +Add addresses to the dht11 and dht11_pins nodes to allow unique names +to be generated by assigning to the "reg" property. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/dht11-overlay.dts | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/overlays/dht11-overlay.dts ++++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts +@@ -24,7 +24,7 @@ + fragment@1 { + target = <&gpio>; + __overlay__ { +- dht11_pins: dht11_pins { ++ dht11_pins: dht11_pins@0 { + brcm,pins = <4>; + brcm,function = <0>; // in + brcm,pull = <0>; // off +@@ -34,6 +34,8 @@ + + __overrides__ { + gpiopin = <&dht11_pins>,"brcm,pins:0", +- <&dht11>,"gpios:4"; ++ <&dht11_pins>, "reg:0", ++ <&dht11>,"gpios:4", ++ <&dht11>,"reg:0"; + }; + }; diff --git a/target/linux/brcm2708/patches-4.19/950-0784-overlays-i2c-rtc-Add-pcf85363-support.patch b/target/linux/brcm2708/patches-4.19/950-0784-overlays-i2c-rtc-Add-pcf85363-support.patch new file mode 100644 index 0000000000..af040962f2 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0784-overlays-i2c-rtc-Add-pcf85363-support.patch @@ -0,0 +1,56 @@ +From b85f76a63d5f1b13220c61244469d55487db84f1 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Sun, 22 Dec 2019 15:29:40 +0000 +Subject: [PATCH] overlays: i2c-rtc: Add pcf85363 support + +See: https://github.com/raspberrypi/firmware/issues/1309 + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/overlays/README | 2 ++ + arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts | 16 ++++++++++++++++ + 2 files changed, 18 insertions(+) + +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -1078,6 +1078,8 @@ Params: abx80x Select o + + pcf8523 Select the PCF8523 device + ++ pcf85363 Select the PCF85363 device ++ + pcf8563 Select the PCF8563 device + + rv3028 Select the Micro Crystal RV3028 device +--- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts ++++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +@@ -188,6 +188,21 @@ + }; + }; + ++ fragment@12 { ++ target = <&i2c_arm>; ++ __dormant__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ pcf85363@51 { ++ compatible = "nxp,pcf85363"; ++ reg = <0x51>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ + __overrides__ { + abx80x = <0>,"+0"; + ds1307 = <0>,"+1"; +@@ -201,6 +216,7 @@ + m41t62 = <0>,"+9"; + rv3028 = <0>,"+10"; + pcf2129 = <0>,"+11"; ++ pcf85363 = <0>,"+12"; + + addr = <&abx80x>, "reg:0", + <&ds1307>, "reg:0", From 9cf9f903a3cd421000691979deca054ff36216db Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Tue, 24 Dec 2019 20:43:20 +0000 Subject: [PATCH 121/480] wireguard: bump to 20191219 edad0d6 version: bump snapshot 0e38a3c compat: ipv6_dst_lookup_flow was backported to 5.3 and 5.4 2e52c41 wg-quick: linux: use already configured addresses instead of in-memory 3721521 tools: adjust wg.8 syntax for consistency in COMMANDS section 21a1498 wg-quick: linux: try both iptables(8) and nft(8) on teardown Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/wireguard/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 075f416408..2849361733 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20191212 +PKG_VERSION:=0.0.20191219 PKG_RELEASE:=1 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ -PKG_HASH:=b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071 +PKG_HASH:=5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7 PKG_LICENSE:=GPL-2.0 Apache-2.0 PKG_LICENSE_FILES:=COPYING @@ -35,8 +35,7 @@ define Package/wireguard/Default CATEGORY:=Network SUBMENU:=VPN URL:=https://www.wireguard.com - MAINTAINER:=Jason A. Donenfeld \ - Kevin Darbyshire-Bryant + MAINTAINER:=Jason A. Donenfeld endef define Package/wireguard/Default/description From 1579599079e8c4478278f16805899799e30a0c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 25 Dec 2019 02:48:25 +0100 Subject: [PATCH 122/480] brcm2708: fix malformed patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- ...124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm2708/patches-4.19/950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/brcm2708/patches-4.19/950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch index 8e06168f06..8539d84421 100644 --- a/target/linux/brcm2708/patches-4.19/950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch +++ b/target/linux/brcm2708/patches-4.19/950-0124-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch @@ -13,10 +13,10 @@ Signed-off-by: Phil Elwell --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c -@@ -15,6 +15,7 @@ +@@ -14,6 +14,7 @@ + #include #include #include - #include +#include #include #include From 3e51cb7820091c3fe6f7bf50d07466545b6eee15 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Wed, 25 Dec 2019 00:02:24 +0300 Subject: [PATCH 123/480] ath79: tp-link: use ath10k-ct-smallbuffers for 64 MiB devices Signed-off-by: Paul Fertser --- target/linux/ath79/image/generic-tp-link.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 8a030492c5..97c4bb9441 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -195,8 +195,8 @@ define Device/tplink_archer-d50-v1 DEVICE_VENDOR := TP-Link DEVICE_MODEL := Archer D50 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ - ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-D50-V1 IMAGE_SIZE := 7808k TPLINK_HWID := 0xC1200001 @@ -366,7 +366,7 @@ define Device/tplink_re450-v2 IMAGE_SIZE := 6016k DEVICE_MODEL := RE450 DEVICE_VARIANT := v2 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct TPLINK_HWID := 0x0 TPLINK_HWREV := 0 TPLINK_BOARD_ID := RE450-V2 @@ -576,8 +576,9 @@ define Device/tplink_tl-wr902ac-v1 SOC := qca9531 DEVICE_MODEL := TL-WR902AC DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ - ath10k-firmware-qca9887-ct -swconfig -uboot-envtools + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct \ + -swconfig -uboot-envtools TPLINK_BOARD_ID := TL-WR902AC-V1 IMAGE_SIZE := 7360k TPLINK_HWID := 0x0 From 5ab9c0b388e9cf2537ef23d6e9baaf5730a14a1c Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 02:25:04 +0100 Subject: [PATCH 124/480] ipq806x: fix bug in L2 cache scaling It has been notice a buf in L2 cache scaling where the scaling is not done proprely if the frequency is set to the initial state before the new frequency. From: https://patchwork.kernel.org/patch/10565443/ * The clocks are set to aux clock rate first to make sure the * secondary mux is not sourcing off of QSB. The rate is then set to * two different rates to force a HFPLL reinit under all * circumstances. In the initial stage of boot to force a new frequency to apply, is needed to first set the frequency back to the lowest one (aux_rate) and then to the target one. This force and make sure the controller actually switch the frequency to the right one. Apply the same mechanism to L2 frequency scaling. Before scaling to the target frequency, first set the frequency to the aux_rate to force the transition, then scale it to the target frequency. Doing the wrong way can produce unexpected results and could lock the scaling mechanism until a full reboot is done (Causing a full reset by the krait-cc driver) From: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=77612720a2362230af726baa4149c40ec7a7fb05 When the Hfplls are reprogrammed during the rate change, the primary muxes which are sourced from the same hfpll for higher frequencies, needs to be switched to the 'safe secondary mux' as the parent for that small window. This is done by registering a clk notifier for the muxes and switching to the safe parent in the PRE_RATE_CHANGE notifier and back to the original parent in the POST_RATE_CHANGE notifier. This should apply also to L2 scaling... as we can't relly use the notifier, we manually do this on L2 scaling. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- .../0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch index bf4935a7c9..fa9aa3fff0 100644 --- a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -11,7 +11,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -49,11 +49,39 @@ static int set_target(struct cpufreq_pol +@@ -49,11 +49,40 @@ static int set_target(struct cpufreq_pol struct private_data *priv = policy->driver_data; unsigned long freq = policy->freq_table[index].frequency; int ret; @@ -43,6 +43,7 @@ Signed-off-by: Georgi Djakov + l2_freq = clk_get_rate(l2_clk); + + if (l2_freq != new_l2_freq) { ++ ret = clk_set_rate(l2_clk, policy->l2_rate[0]); + /* scale l2 with the core */ + ret = clk_set_rate(l2_clk, new_l2_freq); + } From 456ab9a912089f41aa8dd8490b944c74225df9ae Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 02:26:23 +0100 Subject: [PATCH 125/480] ipq806x: opp/core: update patch allowing adjusting of OPP voltages at runtime Update 0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime with upstream version. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- ...rt-adjusting-OPP-voltages-at-runtime.patch | 136 ++++++++++-------- 1 file changed, 73 insertions(+), 63 deletions(-) diff --git a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch index 1a0e50d3d3..9181d94901 100644 --- a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch +++ b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -1,7 +1,17 @@ -From c949f08cf20fe82971fbdb4015daa38210da492e Mon Sep 17 00:00:00 2001 +From: Sylwester Nawrocki +To: krzk@kernel.org, vireshk@kernel.org, robh+dt@kernel.org +Cc: sboyd@kernel.org, roger.lu@mediatek.com, + linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, + linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, + b.zolnierkie@samsung.com, m.szyprowski@samsung.com, + Stephen Boyd , + Sylwester Nawrocki +Subject: [PATCH v5 1/4] PM / OPP: Support adjusting OPP voltages at runtime +Date: Wed, 16 Oct 2019 16:57:53 +0200 +Message-ID: <20191016145756.16004-2-s.nawrocki@samsung.com> (raw) +In-Reply-To: <20191016145756.16004-1-s.nawrocki@samsung.com> + From: Stephen Boyd -Date: Fri, 18 Sep 2015 17:52:06 -0700 -Subject: [PATCH 49/69] PM / OPP: Support adjusting OPP voltages at runtime On some SoCs the Adaptive Voltage Scaling (AVS) technique is employed to optimize the operating voltage of a device. At a @@ -15,61 +25,57 @@ change. The assumption is that drivers like CPUfreq or devfreq will register for the OPP notifiers and adjust the voltage according to suggestions that AVS makes. -Cc: Nishanth Menon -Acked-by: Viresh Kumar -Signed-off-by: Stephen Boyd -Acked-by: Viresh Kumar -Signed-off-by: Georgi Djakov ---- - drivers/opp/core.c | 77 +++++++++++++++++++++++++++++++++++++++++++ - include/linux/pm_opp.h | 11 +++++++ - 2 files changed, 88 insertions(+) +This patch is derived from [1] submitted by Stephen. +[1] https://lore.kernel.org/patchwork/patch/599279/ +Signed-off-by: Stephen Boyd +Signed-off-by: Roger Lu +[s.nawrocki@samsung.com: added handling of OPP min/max voltage] +Signed-off-by: Sylwester Nawrocki +--- + drivers/opp/core.c | 69 ++++++++++++++++++++++++++++++++++++++++++ + include/linux/pm_opp.h | 13 ++++++++ + 2 files changed, 82 insertions(+) + +diff --git a/drivers/opp/core.c b/drivers/opp/core.c +index 3b7ffd0234e9..f38b3be85072 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c -@@ -1625,6 +1625,83 @@ put_table: +@@ -2112,6 +2112,75 @@ static int _opp_set_availability(struct device *dev, unsigned long freq, + return r; } - - /** + ++/** + * dev_pm_opp_adjust_voltage() - helper to change the voltage of an OPP + * @dev: device for which we do this operation + * @freq: OPP frequency to adjust voltage of -+ * @u_volt: new OPP voltage -+ * -+ * Change the voltage of an OPP with an RCU operation. ++ * @u_volt: new OPP target voltage ++ * @u_volt_min: new OPP min voltage ++ * @u_volt_max: new OPP max voltage + * + * Return: -EINVAL for bad pointers, -ENOMEM if no memory available for the + * copy operation, returns 0 if no modifcation was done OR modification was + * successful. -+ * -+ * Locking: The internal device_opp and opp structures are RCU protected. -+ * Hence this function internally uses RCU updater strategy with mutex locks to -+ * keep the integrity of the internal data structures. Callers should ensure -+ * that this function is *NOT* called under RCU protection or in contexts where -+ * mutex locking or synchronize_rcu() blocking calls cannot be used. + */ +int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, -+ unsigned long u_volt) ++ unsigned long u_volt, unsigned long u_volt_min, ++ unsigned long u_volt_max) ++ +{ + struct opp_table *opp_table; -+ struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); ++ struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV); + int r = 0; + -+ /* keep the node allocated */ -+ new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); -+ if (!new_opp) -+ return -ENOMEM; -+ -+ mutex_lock(&opp_table_lock); -+ + /* Find the opp_table */ + opp_table = _find_opp_table(dev); + if (IS_ERR(opp_table)) { + r = PTR_ERR(opp_table); + dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r); -+ goto unlock; ++ return r; + } + ++ mutex_lock(&opp_table->lock); ++ + /* Do we have the frequency? */ + list_for_each_entry(tmp_opp, &opp_table->opp_list, node) { + if (tmp_opp->rate == freq) { @@ -77,67 +83,71 @@ Signed-off-by: Georgi Djakov + break; + } + } ++ + if (IS_ERR(opp)) { + r = PTR_ERR(opp); -+ goto unlock; ++ goto adjust_unlock; + } + + /* Is update really needed? */ -+ if (opp->supplies[0].u_volt == u_volt) -+ goto unlock; -+ /* copy the old data over */ -+ *new_opp = *opp; ++ if (opp->supplies->u_volt == u_volt) ++ goto adjust_unlock; + -+ /* plug in new node */ -+ new_opp->supplies[0].u_volt = u_volt; ++ opp->supplies->u_volt = u_volt; ++ opp->supplies->u_volt_min = u_volt_min; ++ opp->supplies->u_volt_max = u_volt_max; + -+ list_replace(&opp->node, &new_opp->node); -+ mutex_unlock(&opp_table_lock); -+ kfree(opp); ++ dev_pm_opp_get(opp); ++ mutex_unlock(&opp_table->lock); + -+ /* Notify the change of the OPP */ ++ /* Notify the voltage change of the OPP */ + blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ADJUST_VOLTAGE, -+ new_opp); ++ opp); + -+ return 0; ++ dev_pm_opp_put(opp); ++ goto adjust_put_table; + -+unlock: -+ mutex_unlock(&opp_table_lock); -+ kfree(new_opp); ++adjust_unlock: ++ mutex_unlock(&opp_table->lock); ++adjust_put_table: ++ dev_pm_opp_put_opp_table(opp_table); + return r; +} + -+/** + /** * dev_pm_opp_enable() - Enable a specific OPP * @dev: device for which we do this operation - * @freq: OPP frequency to enable +diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h +index b8197ab014f2..747861816f4f 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h -@@ -25,6 +25,7 @@ struct opp_table; - +@@ -22,6 +22,7 @@ struct opp_table; + enum dev_pm_opp_event { OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, + OPP_EVENT_ADJUST_VOLTAGE, }; - + /** -@@ -108,6 +109,9 @@ int dev_pm_opp_add(struct device *dev, u - unsigned long u_volt); +@@ -113,6 +114,10 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, void dev_pm_opp_remove(struct device *dev, unsigned long freq); - + void dev_pm_opp_remove_all_dynamic(struct device *dev); + +int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, -+ unsigned long u_volt); ++ unsigned long u_volt, unsigned long u_volt_min, ++ unsigned long u_volt_max); + int dev_pm_opp_enable(struct device *dev, unsigned long freq); - + int dev_pm_opp_disable(struct device *dev, unsigned long freq); -@@ -208,6 +212,13 @@ static inline void dev_pm_opp_remove(str +@@ -242,6 +247,14 @@ static inline void dev_pm_opp_remove_all_dynamic(struct device *dev) { } - + +static inline int +dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, -+ unsigned long u_volt) ++ unsigned long u_volt, unsigned long u_volt_min, ++ unsigned long u_volt_max) +{ + return 0; +} From e9a982e1d9e0bd1ae33cfe11d679475d02656e62 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 03:01:29 +0100 Subject: [PATCH 126/480] ipq806x: opp/core: update patch updating voltage tolerance on voltage adjust Rework 0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t to reflect changes upstream. - Skip unnecessary allocation of buffer to set u_volt - Change opp u_volt directly Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- ...e-voltage-tolerance-when-adjusting-t.patch | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch index 2882f505d9..f940d8ca62 100644 --- a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch +++ b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -17,22 +17,31 @@ Signed-off-by: Georgi Djakov --- a/drivers/opp/core.c +++ b/drivers/opp/core.c -@@ -1669,6 +1669,7 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -1663,6 +1663,7 @@ struct opp_table *opp_table; - struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); + struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV); int r = 0; + unsigned long tol; - /* keep the node allocated */ - new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); -@@ -1705,6 +1706,10 @@ int dev_pm_opp_adjust_voltage(struct dev + /* Find the opp_table */ + opp_table = _find_opp_table(dev); +@@ -1692,8 +1693,17 @@ + goto adjust_unlock; - /* plug in new node */ - new_opp->supplies[0].u_volt = u_volt; + opp->supplies->u_volt = u_volt; +- opp->supplies->u_volt_min = u_volt_min; +- opp->supplies->u_volt_max = u_volt_max; ++ + tol = u_volt * opp_table->voltage_tolerance_v1 / 100; -+ new_opp->supplies[0].u_volt = u_volt; -+ new_opp->supplies[0].u_volt_min = u_volt - tol; -+ new_opp->supplies[0].u_volt_max = u_volt + tol; ++ if ( u_volt_min == u_volt ) ++ opp->supplies->u_volt_min = u_volt - tol; ++ else ++ opp->supplies->u_volt_min = u_volt_min; ++ ++ if ( u_volt_max == u_volt ) ++ opp->supplies->u_volt_max = u_volt + tol; ++ else ++ opp->supplies->u_volt_max = u_volt_max; - list_replace(&opp->node, &new_opp->node); - mutex_unlock(&opp_table_lock); + dev_pm_opp_get(opp); + mutex_unlock(&opp_table->lock); From 4165f2340eae4a83ed1c7074e2c8910cc7e5f622 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 02:39:38 +0100 Subject: [PATCH 127/480] ipq806x: drop old cpufreq patch Drop old cpufreq as now we have new driver that can use normal kernel opp definition Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- ...le-to-register-cpufreq-on-Krait-CPUs.patch | 307 ------------------ ...cpufreq-qcom-independent-core-clocks.patch | 66 ---- ...ow-to-set-regulator-without-opp_list.patch | 26 -- 3 files changed, 399 deletions(-) delete mode 100644 target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch delete mode 100644 target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch delete mode 100644 target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch diff --git a/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch b/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch deleted file mode 100644 index 5b081feac7..0000000000 --- a/target/linux/ipq806x/patches-4.19/0045-cpufreq-Add-module-to-register-cpufreq-on-Krait-CPUs.patch +++ /dev/null @@ -1,307 +0,0 @@ -From patchwork Fri Dec 8 09:42:29 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,11/12] cpufreq: Add module to register cpufreq on Krait CPUs -From: Sricharan R -X-Patchwork-Id: 10102075 -Message-Id: <1512726150-7204-12-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:29 +0530 - -From: Stephen Boyd - -Register a cpufreq-generic device whenever we detect that a -"qcom,krait" compatible CPU is present in DT. - -Cc: -Signed-off-by: Stephen Boyd ---- - .../devicetree/bindings/arm/msm/qcom,pvs.txt | 38 ++++ - drivers/cpufreq/Kconfig.arm | 9 + - drivers/cpufreq/Makefile | 1 + - drivers/cpufreq/qcom-cpufreq.c | 204 +++++++++++++++++++++ - 4 files changed, 252 insertions(+) - create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,pvs.txt - create mode 100644 drivers/cpufreq/qcom-cpufreq.c - ---- /dev/null -+++ b/Documentation/devicetree/bindings/arm/msm/qcom,pvs.txt -@@ -0,0 +1,38 @@ -+Qualcomm Process Voltage Scaling Tables -+ -+The node name is required to be "qcom,pvs". There shall only be one -+such node present in the root of the tree. -+ -+PROPERTIES -+ -+- qcom,pvs-format-a or qcom,pvs-format-b: -+ Usage: required -+ Value type: -+ Definition: Indicates the format of qcom,speedX-pvsY-bin-vZ properties. -+ If qcom,pvs-format-a is used the table is two columns -+ (frequency and voltage in that order). If qcom,pvs-format-b is used the table is three columns (frequency, voltage, -+ and current in that order). -+ -+- qcom,speedX-pvsY-bin-vZ: -+ Usage: required -+ Value type: -+ Definition: The PVS table corresponding to the speed bin X, pvs bin Y, -+ and version Z. -+Example: -+ -+ qcom,pvs { -+ qcom,pvs-format-a; -+ qcom,speed0-pvs0-bin-v0 = -+ < 384000000 950000 >, -+ < 486000000 975000 >, -+ < 594000000 1000000 >, -+ < 702000000 1025000 >, -+ < 810000000 1075000 >, -+ < 918000000 1100000 >, -+ < 1026000000 1125000 >, -+ < 1134000000 1175000 >, -+ < 1242000000 1200000 >, -+ < 1350000000 1225000 >, -+ < 1458000000 1237500 >, -+ < 1512000000 1250000 >; -+ }; ---- a/drivers/cpufreq/Kconfig.arm -+++ b/drivers/cpufreq/Kconfig.arm -@@ -121,6 +121,15 @@ config ARM_QCOM_CPUFREQ_KRYO - - If in doubt, say N. - -+config ARM_QCOM_CPUFREQ -+ tristate "Qualcomm based" -+ depends on ARCH_QCOM -+ select PM_OPP -+ help -+ This adds the CPUFreq driver for Qualcomm SoC based boards. -+ -+ If in doubt, say N. -+ - config ARM_S3C_CPUFREQ - bool - help ---- a/drivers/cpufreq/Makefile -+++ b/drivers/cpufreq/Makefile -@@ -64,6 +64,7 @@ obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cp - obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o - obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o - obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o -+obj-$(CONFIG_ARM_QCOM_CPUFREQ) += qcom-cpufreq.o - obj-$(CONFIG_ARM_QCOM_CPUFREQ_KRYO) += qcom-cpufreq-kryo.o - obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o - obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o ---- /dev/null -+++ b/drivers/cpufreq/qcom-cpufreq.c -@@ -0,0 +1,204 @@ -+/* Copyright (c) 2014, The Linux Foundation. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 and -+ * only version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "cpufreq-dt.h" -+ -+static void __init get_krait_bin_format_a(int *speed, int *pvs, int *pvs_ver) -+{ -+ void __iomem *base; -+ u32 pte_efuse; -+ -+ *speed = *pvs = *pvs_ver = 0; -+ -+ base = ioremap(0x007000c0, 4); -+ if (!base) { -+ pr_warn("Unable to read efuse data. Defaulting to 0!\n"); -+ return; -+ } -+ -+ pte_efuse = readl_relaxed(base); -+ iounmap(base); -+ -+ *speed = pte_efuse & 0xf; -+ if (*speed == 0xf) -+ *speed = (pte_efuse >> 4) & 0xf; -+ -+ if (*speed == 0xf) { -+ *speed = 0; -+ pr_warn("Speed bin: Defaulting to %d\n", *speed); -+ } else { -+ pr_info("Speed bin: %d\n", *speed); -+ } -+ -+ *pvs = (pte_efuse >> 10) & 0x7; -+ if (*pvs == 0x7) -+ *pvs = (pte_efuse >> 13) & 0x7; -+ -+ if (*pvs == 0x7) { -+ *pvs = 0; -+ pr_warn("PVS bin: Defaulting to %d\n", *pvs); -+ } else { -+ pr_info("PVS bin: %d\n", *pvs); -+ } -+} -+ -+static void __init get_krait_bin_format_b(int *speed, int *pvs, int *pvs_ver) -+{ -+ u32 pte_efuse, redundant_sel; -+ void __iomem *base; -+ -+ *speed = 0; -+ *pvs = 0; -+ *pvs_ver = 0; -+ -+ base = ioremap(0xfc4b80b0, 8); -+ if (!base) { -+ pr_warn("Unable to read efuse data. Defaulting to 0!\n"); -+ return; -+ } -+ -+ pte_efuse = readl_relaxed(base); -+ redundant_sel = (pte_efuse >> 24) & 0x7; -+ *speed = pte_efuse & 0x7; -+ /* 4 bits of PVS are in efuse register bits 31, 8-6. */ -+ *pvs = ((pte_efuse >> 28) & 0x8) | ((pte_efuse >> 6) & 0x7); -+ *pvs_ver = (pte_efuse >> 4) & 0x3; -+ -+ switch (redundant_sel) { -+ case 1: -+ *speed = (pte_efuse >> 27) & 0xf; -+ break; -+ case 2: -+ *pvs = (pte_efuse >> 27) & 0xf; -+ break; -+ } -+ -+ /* Check SPEED_BIN_BLOW_STATUS */ -+ if (pte_efuse & BIT(3)) { -+ pr_info("Speed bin: %d\n", *speed); -+ } else { -+ pr_warn("Speed bin not set. Defaulting to 0!\n"); -+ *speed = 0; -+ } -+ -+ /* Check PVS_BLOW_STATUS */ -+ pte_efuse = readl_relaxed(base + 0x4) & BIT(21); -+ if (pte_efuse) { -+ pr_info("PVS bin: %d\n", *pvs); -+ } else { -+ pr_warn("PVS bin not set. Defaulting to 0!\n"); -+ *pvs = 0; -+ } -+ -+ pr_info("PVS version: %d\n", *pvs_ver); -+ iounmap(base); -+} -+ -+static int __init qcom_cpufreq_populate_opps(void) -+{ -+ int len, rows, cols, i, k, speed, pvs, pvs_ver; -+ char table_name[] = "qcom,speedXX-pvsXX-bin-vXX"; -+ struct device_node *np; -+ struct device *dev; -+ int cpu = 0; -+ -+ np = of_find_node_by_name(NULL, "qcom,pvs"); -+ if (!np) -+ return -ENODEV; -+ -+ if (of_property_read_bool(np, "qcom,pvs-format-a")) { -+ get_krait_bin_format_a(&speed, &pvs, &pvs_ver); -+ cols = 2; -+ } else if (of_property_read_bool(np, "qcom,pvs-format-b")) { -+ get_krait_bin_format_b(&speed, &pvs, &pvs_ver); -+ cols = 3; -+ } else { -+ return -ENODEV; -+ } -+ -+ snprintf(table_name, sizeof(table_name), -+ "qcom,speed%d-pvs%d-bin-v%d", speed, pvs, pvs_ver); -+ -+ if (!of_find_property(np, table_name, &len)) -+ return -EINVAL; -+ -+ len /= sizeof(u32); -+ if (len % cols || len == 0) -+ return -EINVAL; -+ -+ rows = len / cols; -+ -+ for (i = 0, k = 0; i < rows; i++) { -+ u32 freq, volt; -+ -+ of_property_read_u32_index(np, table_name, k++, &freq); -+ of_property_read_u32_index(np, table_name, k++, &volt); -+ while (k % cols) -+ k++; /* Skip uA entries if present */ -+ for (cpu = 0; cpu < num_possible_cpus(); cpu++) { -+ dev = get_cpu_device(cpu); -+ if (!dev) -+ return -ENODEV; -+ if (dev_pm_opp_add(dev, freq, volt)) -+ pr_warn("failed to add OPP %u\n", freq); -+ } -+ } -+ -+ return 0; -+} -+ -+static int __init qcom_cpufreq_driver_init(void) -+{ -+ struct cpufreq_dt_platform_data pdata = { .independent_clocks = true }; -+ struct platform_device_info devinfo = { -+ .name = "cpufreq-dt", -+ .data = &pdata, -+ .size_data = sizeof(pdata), -+ }; -+ struct device *cpu_dev; -+ struct device_node *np; -+ int ret; -+ -+ cpu_dev = get_cpu_device(0); -+ if (!cpu_dev) -+ return -ENODEV; -+ -+ np = of_node_get(cpu_dev->of_node); -+ if (!np) -+ return -ENOENT; -+ -+ if (!of_device_is_compatible(np, "qcom,krait")) { -+ of_node_put(np); -+ return -ENODEV; -+ } -+ of_node_put(np); -+ -+ ret = qcom_cpufreq_populate_opps(); -+ if (ret) -+ return ret; -+ -+ return PTR_ERR_OR_ZERO(platform_device_register_full(&devinfo)); -+} -+module_init(qcom_cpufreq_driver_init); -+ -+MODULE_DESCRIPTION("Qualcomm CPUfreq driver"); -+MODULE_LICENSE("GPL v2"); diff --git a/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch b/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch deleted file mode 100644 index 7743dd1c4f..0000000000 --- a/target/linux/ipq806x/patches-4.19/0046-cpufreq-qcom-independent-core-clocks.patch +++ /dev/null @@ -1,66 +0,0 @@ -From patchwork Fri Dec 8 09:42:30 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v4,12/12] cpufreq: dt: Reintroduce independent_clocks platform data -From: Sricharan R -X-Patchwork-Id: 10102073 -Message-Id: <1512726150-7204-13-git-send-email-sricharan@codeaurora.org> -To: mturquette@baylibre.com, sboyd@codeaurora.org, - devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, - viresh.kumar@linaro.org, linux-arm-kernel@lists.infradead.org -Cc: sricharan@codeaurora.org -Date: Fri, 8 Dec 2017 15:12:30 +0530 - -The Platform data was removed earlier by, -'commit eb96924acddc ("cpufreq: dt: Kill platform-data")' -since there were no users at that time. -Now this is required when the each of the cpu clocks -can be scaled independently, which is the case -for krait cores. So reintroduce it. - -Signed-off-by: Sricharan R ---- - drivers/cpufreq/cpufreq-dt.c | 7 ++++++- - drivers/cpufreq/cpufreq-dt.h | 6 ++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/cpufreq/cpufreq-dt.c -+++ b/drivers/cpufreq/cpufreq-dt.c -@@ -239,7 +239,10 @@ static int cpufreq_init(struct cpufreq_p - } - - if (fallback) { -- cpumask_setall(policy->cpus); -+ struct cpufreq_dt_platform_data *pd = cpufreq_get_driver_data(); -+ -+ if (!pd || !pd->independent_clocks) -+ cpumask_setall(policy->cpus); - - /* - * OPP tables are initialized only for policy->cpu, do it for -@@ -359,6 +362,8 @@ static int dt_cpufreq_probe(struct platf - dt_cpufreq_driver.suspend = data->suspend; - } - -+ dt_cpufreq_driver.driver_data = data; -+ - ret = cpufreq_register_driver(&dt_cpufreq_driver); - if (ret) - dev_err(&pdev->dev, "failed register driver: %d\n", ret); ---- a/drivers/cpufreq/cpufreq-dt.h -+++ b/drivers/cpufreq/cpufreq-dt.h -@@ -15,6 +15,12 @@ - struct cpufreq_policy; - - struct cpufreq_dt_platform_data { -+ /* -+ * True when each CPU has its own clock to control its -+ * frequency, false when all CPUs are controlled by a single -+ * clock. -+ */ -+ bool independent_clocks; - bool have_governor_per_policy; - - int (*suspend)(struct cpufreq_policy *policy); diff --git a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch deleted file mode 100644 index d415f7b744..0000000000 --- a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5c294df1715d673f94f3b0a6e1ea3a426ca35e6e Mon Sep 17 00:00:00 2001 -From: Georgi Djakov -Date: Thu, 28 Apr 2016 16:20:12 +0300 -Subject: [PATCH 48/69] PM / OPP: HACK: Allow to set regulator without opp_list - -Signed-off-by: Georgi Djakov ---- - drivers/base/power/opp/core.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/opp/core.c -+++ b/drivers/opp/core.c -@@ -1317,11 +1317,13 @@ struct opp_table *dev_pm_opp_set_regulat - if (!opp_table) - return ERR_PTR(-ENOMEM); - -+#if 0 - /* This should be called before OPPs are initialized */ - if (WARN_ON(!list_empty(&opp_table->opp_list))) { - ret = -EBUSY; - goto err; - } -+#endif - - /* Another CPU that shares the OPP table has set the regulators ? */ - if (opp_table->regulators) From a37f787162ee2279d8b3896b3a9146369131c27a Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 02:28:46 +0100 Subject: [PATCH 128/480] ipq806x: backport qcom-cpufreq-kryo patch Backport patch applied to qcom-cpufreq-kryo driver as krait cpu will base on this driver. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- ...-qcm-kyrp_make_Some_variables_static.patch | 27 ++ ...vmem-Re-organise-kryo-cpufreq-driver.patch | 281 ++++++++++++++++++ ...om-cpufreq-nvmem-Refactor-the-driver.patch | 243 +++++++++++++++ 3 files changed, 551 insertions(+) create mode 100644 target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch create mode 100644 target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch create mode 100644 target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch diff --git a/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch b/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch new file mode 100644 index 0000000000..d445c0e190 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch @@ -0,0 +1,27 @@ +From 50c0b12f098fb3cfac7abcc0f2b5409f6bac5fa2 Mon Sep 17 00:00:00 2001 +From: Yangtao Li +Date: Mon, 4 Feb 2019 01:13:10 -0500 +Subject: [PATCH] cpufreq: qcom-kryo: make some variables static + +The variables are local to the source and do not +need to be in global scope, so make them static. + +Signed-off-by: Yangtao Li +Signed-off-by: Viresh Kumar +--- + drivers/cpufreq/qcom-cpufreq-kryo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c +index 2a3675c24032b..1c8583cc06a2a 100644 +--- a/drivers/cpufreq/qcom-cpufreq-kryo.c ++++ b/drivers/cpufreq/qcom-cpufreq-kryo.c +@@ -42,7 +42,7 @@ enum _msm8996_version { + NUM_OF_MSM8996_VERSIONS, + }; + +-struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev; ++static struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev; + + static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void) + { diff --git a/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch b/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch new file mode 100644 index 0000000000..ab6a37ba37 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch @@ -0,0 +1,281 @@ +From 7d12709544b8b3fb9727a34a664b8380e1e3493a Mon Sep 17 00:00:00 2001 +From: Sricharan R +Date: Thu, 25 Jul 2019 12:41:31 +0200 +Subject: [PATCH] cpufreq: qcom: Re-organise kryo cpufreq to use it for other + nvmem based qcom socs + +The kryo cpufreq driver reads the nvmem cell and uses that data to +populate the opps. There are other qcom cpufreq socs like krait which +does similar thing. Except for the interpretation of the read data, +rest of the driver is same for both the cases. So pull the common things +out for reuse. + +Signed-off-by: Sricharan R +[niklas.cassel@linaro.org: split dt-binding into a separate patch and +do not rename the compatible string. Update MAINTAINERS file.] +Signed-off-by: Niklas Cassel +Reviewed-by: Ilia Lin +Reviewed-by: Stephen Boyd +Signed-off-by: Viresh Kumar +--- + MAINTAINERS | 4 +- + drivers/cpufreq/Kconfig.arm | 4 +- + drivers/cpufreq/Makefile | 2 +- + ...om-cpufreq-kryo.c => qcom-cpufreq-nvmem.c} | 122 +++++++++++------- + 4 files changed, 78 insertions(+), 54 deletions(-) + rename drivers/cpufreq/{qcom-cpufreq-kryo.c => qcom-cpufreq-nvmem.c} (69%) + +diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm +index 56c31a78c6920..b1aa485a28dde 100644 +--- a/drivers/cpufreq/Kconfig.arm ++++ b/drivers/cpufreq/Kconfig.arm +@@ -120,8 +120,8 @@ config ARM_OMAP2PLUS_CPUFREQ + depends on ARCH_OMAP2PLUS + default ARCH_OMAP2PLUS + +-config ARM_QCOM_CPUFREQ_KRYO +- tristate "Qualcomm Kryo based CPUFreq" ++config ARM_QCOM_CPUFREQ_NVMEM ++ tristate "Qualcomm nvmem based CPUFreq" + depends on ARM64 + depends on QCOM_QFPROM + depends on QCOM_SMEM +diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile +index 5a6c70d26c985..8572a918aa755 100644 +--- a/drivers/cpufreq/Makefile ++++ b/drivers/cpufreq/Makefile +@@ -64,7 +64,7 @@ obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cpufreq.o + obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o + obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o + obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o +-obj-$(CONFIG_ARM_QCOM_CPUFREQ_KRYO) += qcom-cpufreq-kryo.o ++obj-$(CONFIG_ARM_QCOM_CPUFREQ_NVMEM) += qcom-cpufreq-nvmem.o + obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o + obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o + obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c +similarity index 69% +rename from drivers/cpufreq/qcom-cpufreq-kryo.c +rename to drivers/cpufreq/qcom-cpufreq-nvmem.c +index dd64dcf89c74c..fd08120768af2 100644 +--- a/drivers/cpufreq/qcom-cpufreq-kryo.c ++++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c +@@ -9,7 +9,7 @@ + * based on the silicon variant in use. Qualcomm Process Voltage Scaling Tables + * defines the voltage and frequency value based on the msm-id in SMEM + * and speedbin blown in the efuse combination. +- * The qcom-cpufreq-kryo driver reads the msm-id and efuse value from the SoC ++ * The qcom-cpufreq-nvmem driver reads the msm-id and efuse value from the SoC + * to provide the OPP framework with required information. + * This is used to determine the voltage and frequency value for each OPP of + * operating-points-v2 table when it is parsed by the OPP framework. +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -42,9 +43,9 @@ enum _msm8996_version { + NUM_OF_MSM8996_VERSIONS, + }; + +-static struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev; ++static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; + +-static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void) ++static enum _msm8996_version qcom_cpufreq_get_msm_id(void) + { + size_t len; + u32 *msm_id; +@@ -73,28 +74,62 @@ static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void) + return version; + } + +-static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) ++static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, ++ struct nvmem_cell *speedbin_nvmem, ++ u32 *versions) + { +- struct opp_table **opp_tables; ++ size_t len; ++ u8 *speedbin; + enum _msm8996_version msm8996_version; ++ ++ msm8996_version = qcom_cpufreq_get_msm_id(); ++ if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { ++ dev_err(cpu_dev, "Not Snapdragon 820/821!"); ++ return -ENODEV; ++ } ++ ++ speedbin = nvmem_cell_read(speedbin_nvmem, &len); ++ if (IS_ERR(speedbin)) ++ return PTR_ERR(speedbin); ++ ++ switch (msm8996_version) { ++ case MSM8996_V3: ++ *versions = 1 << (unsigned int)(*speedbin); ++ break; ++ case MSM8996_SG: ++ *versions = 1 << ((unsigned int)(*speedbin) + 4); ++ break; ++ default: ++ BUG(); ++ break; ++ } ++ ++ kfree(speedbin); ++ return 0; ++} ++ ++static int qcom_cpufreq_probe(struct platform_device *pdev) ++{ ++ struct opp_table **opp_tables; ++ int (*get_version)(struct device *cpu_dev, ++ struct nvmem_cell *speedbin_nvmem, ++ u32 *versions); + struct nvmem_cell *speedbin_nvmem; + struct device_node *np; + struct device *cpu_dev; + unsigned cpu; +- u8 *speedbin; + u32 versions; +- size_t len; ++ const struct of_device_id *match; + int ret; + + cpu_dev = get_cpu_device(0); + if (!cpu_dev) + return -ENODEV; + +- msm8996_version = qcom_cpufreq_kryo_get_msm_id(); +- if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { +- dev_err(cpu_dev, "Not Snapdragon 820/821!"); ++ match = pdev->dev.platform_data; ++ get_version = match->data; ++ if (!get_version) + return -ENODEV; +- } + + np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); + if (!np) +@@ -115,23 +150,10 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) + return PTR_ERR(speedbin_nvmem); + } + +- speedbin = nvmem_cell_read(speedbin_nvmem, &len); ++ ret = get_version(cpu_dev, speedbin_nvmem, &versions); + nvmem_cell_put(speedbin_nvmem); +- if (IS_ERR(speedbin)) +- return PTR_ERR(speedbin); +- +- switch (msm8996_version) { +- case MSM8996_V3: +- versions = 1 << (unsigned int)(*speedbin); +- break; +- case MSM8996_SG: +- versions = 1 << ((unsigned int)(*speedbin) + 4); +- break; +- default: +- BUG(); +- break; +- } +- kfree(speedbin); ++ if (ret) ++ return ret; + + opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL); + if (!opp_tables) +@@ -174,7 +196,7 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) + return ret; + } + +-static int qcom_cpufreq_kryo_remove(struct platform_device *pdev) ++static int qcom_cpufreq_remove(struct platform_device *pdev) + { + struct opp_table **opp_tables = platform_get_drvdata(pdev); + unsigned int cpu; +@@ -189,18 +211,20 @@ static int qcom_cpufreq_kryo_remove(struct platform_device *pdev) + return 0; + } + +-static struct platform_driver qcom_cpufreq_kryo_driver = { +- .probe = qcom_cpufreq_kryo_probe, +- .remove = qcom_cpufreq_kryo_remove, ++static struct platform_driver qcom_cpufreq_driver = { ++ .probe = qcom_cpufreq_probe, ++ .remove = qcom_cpufreq_remove, + .driver = { +- .name = "qcom-cpufreq-kryo", ++ .name = "qcom-cpufreq-nvmem", + }, + }; + +-static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = { +- { .compatible = "qcom,apq8096", }, +- { .compatible = "qcom,msm8996", }, +- {} ++static const struct of_device_id qcom_cpufreq_match_list[] __initconst = { ++ { .compatible = "qcom,apq8096", ++ .data = qcom_cpufreq_kryo_name_version }, ++ { .compatible = "qcom,msm8996", ++ .data = qcom_cpufreq_kryo_name_version }, ++ {}, + }; + + /* +@@ -209,7 +233,7 @@ static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = { + * which may be defered as well. The init here is only registering + * the driver and the platform device. + */ +-static int __init qcom_cpufreq_kryo_init(void) ++static int __init qcom_cpufreq_init(void) + { + struct device_node *np = of_find_node_by_path("/"); + const struct of_device_id *match; +@@ -218,32 +242,32 @@ static int __init qcom_cpufreq_kryo_init(void) + if (!np) + return -ENODEV; + +- match = of_match_node(qcom_cpufreq_kryo_match_list, np); ++ match = of_match_node(qcom_cpufreq_match_list, np); + of_node_put(np); + if (!match) + return -ENODEV; + +- ret = platform_driver_register(&qcom_cpufreq_kryo_driver); ++ ret = platform_driver_register(&qcom_cpufreq_driver); + if (unlikely(ret < 0)) + return ret; + +- kryo_cpufreq_pdev = platform_device_register_simple( +- "qcom-cpufreq-kryo", -1, NULL, 0); +- ret = PTR_ERR_OR_ZERO(kryo_cpufreq_pdev); ++ cpufreq_pdev = platform_device_register_data(NULL, "qcom-cpufreq-nvmem", ++ -1, match, sizeof(*match)); ++ ret = PTR_ERR_OR_ZERO(cpufreq_pdev); + if (0 == ret) + return 0; + +- platform_driver_unregister(&qcom_cpufreq_kryo_driver); ++ platform_driver_unregister(&qcom_cpufreq_driver); + return ret; + } +-module_init(qcom_cpufreq_kryo_init); ++module_init(qcom_cpufreq_init); + +-static void __exit qcom_cpufreq_kryo_exit(void) ++static void __exit qcom_cpufreq_exit(void) + { +- platform_device_unregister(kryo_cpufreq_pdev); +- platform_driver_unregister(&qcom_cpufreq_kryo_driver); ++ platform_device_unregister(cpufreq_pdev); ++ platform_driver_unregister(&qcom_cpufreq_driver); + } +-module_exit(qcom_cpufreq_kryo_exit); ++module_exit(qcom_cpufreq_exit); + +-MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Kryo CPUfreq driver"); ++MODULE_DESCRIPTION("Qualcomm Technologies, Inc. CPUfreq driver"); + MODULE_LICENSE("GPL v2"); diff --git a/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch b/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch new file mode 100644 index 0000000000..6c519c2c27 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch @@ -0,0 +1,243 @@ +From 57f2f8b4aa0c6b41a284da82bfa40dc3b2abe9a5 Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Thu, 25 Jul 2019 12:41:33 +0200 +Subject: [PATCH] cpufreq: qcom: Refactor the driver to make it easier to + extend + +Refactor the driver to make it easier to extend in a later commit. + +Create a driver struct to collect all common resources, in order to make +it easier to free up all common resources. +Create a driver match_data struct to make it easier to extend the driver +with support for new features that might only be supported on certain SoCs. + +Co-developed-by: Jorge Ramirez-Ortiz +Signed-off-by: Jorge Ramirez-Ortiz +Signed-off-by: Niklas Cassel +Reviewed-by: Ilia Lin +Signed-off-by: Viresh Kumar +--- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 123 +++++++++++++++++---------- + 1 file changed, 79 insertions(+), 44 deletions(-) + +diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c +index fd08120768af2..2d798a1685c5d 100644 +--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c ++++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c +@@ -43,6 +43,20 @@ enum _msm8996_version { + NUM_OF_MSM8996_VERSIONS, + }; + ++struct qcom_cpufreq_drv; ++ ++struct qcom_cpufreq_match_data { ++ int (*get_version)(struct device *cpu_dev, ++ struct nvmem_cell *speedbin_nvmem, ++ struct qcom_cpufreq_drv *drv); ++}; ++ ++struct qcom_cpufreq_drv { ++ struct opp_table **opp_tables; ++ u32 versions; ++ const struct qcom_cpufreq_match_data *data; ++}; ++ + static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; + + static enum _msm8996_version qcom_cpufreq_get_msm_id(void) +@@ -76,7 +90,7 @@ static enum _msm8996_version qcom_cpufreq_get_msm_id(void) + + static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, + struct nvmem_cell *speedbin_nvmem, +- u32 *versions) ++ struct qcom_cpufreq_drv *drv) + { + size_t len; + u8 *speedbin; +@@ -94,10 +108,10 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, + + switch (msm8996_version) { + case MSM8996_V3: +- *versions = 1 << (unsigned int)(*speedbin); ++ drv->versions = 1 << (unsigned int)(*speedbin); + break; + case MSM8996_SG: +- *versions = 1 << ((unsigned int)(*speedbin) + 4); ++ drv->versions = 1 << ((unsigned int)(*speedbin) + 4); + break; + default: + BUG(); +@@ -108,17 +122,17 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, + return 0; + } + ++static const struct qcom_cpufreq_match_data match_data_kryo = { ++ .get_version = qcom_cpufreq_kryo_name_version, ++}; ++ + static int qcom_cpufreq_probe(struct platform_device *pdev) + { +- struct opp_table **opp_tables; +- int (*get_version)(struct device *cpu_dev, +- struct nvmem_cell *speedbin_nvmem, +- u32 *versions); ++ struct qcom_cpufreq_drv *drv; + struct nvmem_cell *speedbin_nvmem; + struct device_node *np; + struct device *cpu_dev; + unsigned cpu; +- u32 versions; + const struct of_device_id *match; + int ret; + +@@ -126,11 +140,6 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) + if (!cpu_dev) + return -ENODEV; + +- match = pdev->dev.platform_data; +- get_version = match->data; +- if (!get_version) +- return -ENODEV; +- + np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); + if (!np) + return -ENOENT; +@@ -141,23 +150,43 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) + return -ENOENT; + } + +- speedbin_nvmem = of_nvmem_cell_get(np, NULL); +- of_node_put(np); +- if (IS_ERR(speedbin_nvmem)) { +- if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER) +- dev_err(cpu_dev, "Could not get nvmem cell: %ld\n", +- PTR_ERR(speedbin_nvmem)); +- return PTR_ERR(speedbin_nvmem); ++ drv = kzalloc(sizeof(*drv), GFP_KERNEL); ++ if (!drv) ++ return -ENOMEM; ++ ++ match = pdev->dev.platform_data; ++ drv->data = match->data; ++ if (!drv->data) { ++ ret = -ENODEV; ++ goto free_drv; + } + +- ret = get_version(cpu_dev, speedbin_nvmem, &versions); +- nvmem_cell_put(speedbin_nvmem); +- if (ret) +- return ret; ++ if (drv->data->get_version) { ++ speedbin_nvmem = of_nvmem_cell_get(np, NULL); ++ if (IS_ERR(speedbin_nvmem)) { ++ if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER) ++ dev_err(cpu_dev, ++ "Could not get nvmem cell: %ld\n", ++ PTR_ERR(speedbin_nvmem)); ++ ret = PTR_ERR(speedbin_nvmem); ++ goto free_drv; ++ } + +- opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL); +- if (!opp_tables) +- return -ENOMEM; ++ ret = drv->data->get_version(cpu_dev, speedbin_nvmem, drv); ++ if (ret) { ++ nvmem_cell_put(speedbin_nvmem); ++ goto free_drv; ++ } ++ nvmem_cell_put(speedbin_nvmem); ++ } ++ of_node_put(np); ++ ++ drv->opp_tables = kcalloc(num_possible_cpus(), sizeof(*drv->opp_tables), ++ GFP_KERNEL); ++ if (!drv->opp_tables) { ++ ret = -ENOMEM; ++ goto free_drv; ++ } + + for_each_possible_cpu(cpu) { + cpu_dev = get_cpu_device(cpu); +@@ -166,19 +195,23 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) + goto free_opp; + } + +- opp_tables[cpu] = dev_pm_opp_set_supported_hw(cpu_dev, +- &versions, 1); +- if (IS_ERR(opp_tables[cpu])) { +- ret = PTR_ERR(opp_tables[cpu]); +- dev_err(cpu_dev, "Failed to set supported hardware\n"); +- goto free_opp; ++ if (drv->data->get_version) { ++ drv->opp_tables[cpu] = ++ dev_pm_opp_set_supported_hw(cpu_dev, ++ &drv->versions, 1); ++ if (IS_ERR(drv->opp_tables[cpu])) { ++ ret = PTR_ERR(drv->opp_tables[cpu]); ++ dev_err(cpu_dev, ++ "Failed to set supported hardware\n"); ++ goto free_opp; ++ } + } + } + + cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1, + NULL, 0); + if (!IS_ERR(cpufreq_dt_pdev)) { +- platform_set_drvdata(pdev, opp_tables); ++ platform_set_drvdata(pdev, drv); + return 0; + } + +@@ -187,26 +220,30 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) + + free_opp: + for_each_possible_cpu(cpu) { +- if (IS_ERR_OR_NULL(opp_tables[cpu])) ++ if (IS_ERR_OR_NULL(drv->opp_tables[cpu])) + break; +- dev_pm_opp_put_supported_hw(opp_tables[cpu]); ++ dev_pm_opp_put_supported_hw(drv->opp_tables[cpu]); + } +- kfree(opp_tables); ++ kfree(drv->opp_tables); ++free_drv: ++ kfree(drv); + + return ret; + } + + static int qcom_cpufreq_remove(struct platform_device *pdev) + { +- struct opp_table **opp_tables = platform_get_drvdata(pdev); ++ struct qcom_cpufreq_drv *drv = platform_get_drvdata(pdev); + unsigned int cpu; + + platform_device_unregister(cpufreq_dt_pdev); + + for_each_possible_cpu(cpu) +- dev_pm_opp_put_supported_hw(opp_tables[cpu]); ++ if (drv->opp_tables[cpu]) ++ dev_pm_opp_put_supported_hw(drv->opp_tables[cpu]); + +- kfree(opp_tables); ++ kfree(drv->opp_tables); ++ kfree(drv); + + return 0; + } +@@ -220,10 +257,8 @@ static struct platform_driver qcom_cpufreq_driver = { + }; + + static const struct of_device_id qcom_cpufreq_match_list[] __initconst = { +- { .compatible = "qcom,apq8096", +- .data = qcom_cpufreq_kryo_name_version }, +- { .compatible = "qcom,msm8996", +- .data = qcom_cpufreq_kryo_name_version }, ++ { .compatible = "qcom,apq8096", .data = &match_data_kryo }, ++ { .compatible = "qcom,msm8996", .data = &match_data_kryo }, + {}, + }; + From e18f8e417fd1a5145940cd763f182d641aa62c56 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 15 Dec 2019 02:30:48 +0100 Subject: [PATCH 129/480] ipq806x: add patch to support krait cpu scaling driver This patch has been proposed but never actually merged to mainline. It was accepted but never re proposed by the creator. Rework it, fix kernel panic cause by double kfree. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- ...mem-Add-support-for-krait-based-socs.patch | 351 ++++++++++++++++++ 1 file changed, 351 insertions(+) create mode 100644 target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch diff --git a/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch b/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch new file mode 100644 index 0000000000..13e8ead471 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch @@ -0,0 +1,351 @@ +Subject: [PATCH v12 14/14] cpufreq: qcom: Add support for krait based socs +Date: Tue, 14 Aug 2018 17:42:33 +0530 +Message-Id: <1534248753-2440-15-git-send-email-sricharan@codeaurora.org> +X-Mailer: git-send-email 1.9.1 +In-Reply-To: <1534248753-2440-1-git-send-email-sricharan@codeaurora.org> +References: <1534248753-2440-1-git-send-email-sricharan@codeaurora.org> +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +In Certain QCOM SoCs like ipq8064, apq8064, msm8960, msm8974 +that has KRAIT processors the voltage/current value of each OPP +varies based on the silicon variant in use. + +The required OPP related data is determined based on +the efuse value. This is similar to the existing code for +kryo cores. So adding support for krait cores here. + +Signed-off-by: Sricharan R +--- + .../devicetree/bindings/opp/qcom-nvmem-cpufreq.txt | 3 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 + + drivers/cpufreq/qcom-cpufreq-nvmem.c | 151 +++++++++++++++++++-- + 4 files changed, 149 insertions(+), 12 deletions(-) + +# diff --git a/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt b/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt +# index 6dcdfcd..7bc0f1a 100644 +# --- a/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt +# +++ b/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt +# @@ -19,7 +19,8 @@ In 'cpus' nodes: + +# In 'operating-points-v2' table: +# - compatible: Should be +# - - 'operating-points-v2-qcom-cpu' for apq8096 and msm8996. +# + - 'operating-points-v2-qcom-cpu' for apq8096, msm8996, msm8974, +# + apq8064, msm8960 and ipq8074. +# - nvmem-cells: A phandle pointing to a nvmem-cells node representing the +# efuse registers that has information about the +# speedbin that is used to select the right frequency/voltage +diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm +index 13fbd97..497ae89 100644 +--- a/drivers/cpufreq/Kconfig.arm ++++ b/drivers/cpufreq/Kconfig.arm +@@ -126,7 +126,7 @@ config ARM_OMAP2PLUS_CPUFREQ + + config ARM_QCOM_CPUFREQ_NVMEM + tristate "Qualcomm nvmem based CPUFreq" +- depends on ARM64 ++ depends on ARCH_QCOM + depends on QCOM_QFPROM + depends on QCOM_SMEM + select PM_OPP +diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c +index fe14c57..917cdc2 100644 +--- a/drivers/cpufreq/cpufreq-dt-platdev.c ++++ b/drivers/cpufreq/cpufreq-dt-platdev.c +@@ -128,6 +128,11 @@ + { .compatible = "ti,am43", }, + { .compatible = "ti,dra7", }, + ++ { .compatible = "qcom,ipq8064", }, ++ { .compatible = "qcom,apq8064", }, ++ { .compatible = "qcom,msm8974", }, ++ { .compatible = "qcom,msm8960", }, ++ + { } + }; + +diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c +index 0ad8e5b..5f2add0 100644 +--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c ++++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c +@@ -48,17 +48,92 @@ + struct qcom_cpufreq_match_data { + int (*get_version)(struct device *cpu_dev, + struct nvmem_cell *speedbin_nvmem, ++ char **pvs_name, + struct qcom_cpufreq_drv *drv); + }; + + struct qcom_cpufreq_drv { +- struct opp_table **opp_tables; ++ struct opp_table **opp_tables1; ++ struct opp_table **opp_tables2; + u32 versions; + const struct qcom_cpufreq_match_data *data; + }; + + static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; + ++static void get_krait_bin_format_a(int *speed, int *pvs, int *pvs_ver, ++ struct nvmem_cell *pvs_nvmem, u8 *buf) ++{ ++ u32 pte_efuse; ++ ++ pte_efuse = *((u32 *)buf); ++ ++ *speed = pte_efuse & 0xf; ++ if (*speed == 0xf) ++ *speed = (pte_efuse >> 4) & 0xf; ++ ++ if (*speed == 0xf) { ++ *speed = 0; ++ pr_warn("Speed bin: Defaulting to %d\n", *speed); ++ } else { ++ pr_info("Speed bin: %d\n", *speed); ++ } ++ ++ *pvs = (pte_efuse >> 10) & 0x7; ++ if (*pvs == 0x7) ++ *pvs = (pte_efuse >> 13) & 0x7; ++ ++ if (*pvs == 0x7) { ++ *pvs = 0; ++ pr_warn("PVS bin: Defaulting to %d\n", *pvs); ++ } else { ++ pr_info("PVS bin: %d\n", *pvs); ++ } ++} ++ ++static void get_krait_bin_format_b(int *speed, int *pvs, int *pvs_ver, ++ struct nvmem_cell *pvs_nvmem, u8 *buf) ++{ ++ u32 pte_efuse, redundant_sel; ++ ++ pte_efuse = *((u32 *)buf); ++ redundant_sel = (pte_efuse >> 24) & 0x7; ++ *speed = pte_efuse & 0x7; ++ ++ /* 4 bits of PVS are in efuse register bits 31, 8-6. */ ++ *pvs = ((pte_efuse >> 28) & 0x8) | ((pte_efuse >> 6) & 0x7); ++ *pvs_ver = (pte_efuse >> 4) & 0x3; ++ ++ switch (redundant_sel) { ++ case 1: ++ *speed = (pte_efuse >> 27) & 0xf; ++ break; ++ case 2: ++ *pvs = (pte_efuse >> 27) & 0xf; ++ break; ++ } ++ ++ /* Check SPEED_BIN_BLOW_STATUS */ ++ if (pte_efuse & BIT(3)) { ++ pr_info("Speed bin: %d\n", *speed); ++ } else { ++ pr_warn("Speed bin not set. Defaulting to 0!\n"); ++ *speed = 0; ++ } ++ ++ /* Check PVS_BLOW_STATUS */ ++ pte_efuse = *(((u32 *)buf) + 4); ++ pte_efuse &= BIT(21); ++ if (pte_efuse) { ++ pr_info("PVS bin: %d\n", *pvs); ++ } else { ++ pr_warn("PVS bin not set. Defaulting to 0!\n"); ++ *pvs = 0; ++ } ++ ++ pr_info("PVS version: %d\n", *pvs_ver); ++} ++ + static enum _msm8996_version qcom_cpufreq_get_msm_id(void) + { + size_t len; +@@ -90,11 +165,13 @@ + + static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, + struct nvmem_cell *speedbin_nvmem, ++ char **pvs_name, + struct qcom_cpufreq_drv *drv) + { + size_t len; + u8 *speedbin; + enum _msm8996_version msm8996_version; ++ *pvs_name = NULL; + + msm8996_version = qcom_cpufreq_get_msm_id(); + if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { +@@ -122,16 +199,51 @@ + return 0; + } + ++static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, ++ struct nvmem_cell *speedbin_nvmem, ++ char **pvs_name, ++ struct qcom_cpufreq_drv *drv) ++{ ++ int speed = 0, pvs = 0, pvs_ver = 0; ++ u8 *speedbin; ++ size_t len; ++ ++ speedbin = nvmem_cell_read(speedbin_nvmem, &len); ++ if (len == 4) { ++ get_krait_bin_format_a(&speed, &pvs, &pvs_ver, ++ speedbin_nvmem, speedbin); ++ } else if (len == 8) { ++ get_krait_bin_format_b(&speed, &pvs, &pvs_ver, ++ speedbin_nvmem, speedbin); ++ } else { ++ dev_err(cpu_dev, "Unable to read nvmem data. Defaulting to 0!\n"); ++ return -ENODEV; ++ } ++ ++ snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d", ++ speed, pvs, pvs_ver); ++ ++ drv->versions = (1 << speed); ++ ++ kfree(speedbin); ++ return 0; ++} ++ + static const struct qcom_cpufreq_match_data match_data_kryo = { + .get_version = qcom_cpufreq_kryo_name_version, + }; + ++static const struct qcom_cpufreq_match_data match_data_krait = { ++ .get_version = qcom_cpufreq_krait_name_version, ++}; ++ + static int qcom_cpufreq_probe(struct platform_device *pdev) + { + struct qcom_cpufreq_drv *drv; + struct nvmem_cell *speedbin_nvmem; + struct device_node *np; + struct device *cpu_dev; ++ char *pvs_name = "speedXX-pvsXX-vXX"; + unsigned cpu; + const struct of_device_id *match; + int ret; +@@ -144,7 +256,7 @@ + if (!np) + return -ENOENT; + +- ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu"); ++ ret = of_device_is_compatible(np, "operating-points-v2-qcom-cpu"); + if (!ret) { + of_node_put(np); + return -ENOENT; +@@ -172,7 +284,7 @@ + goto free_drv; + } + +- ret = drv->data->get_version(cpu_dev, speedbin_nvmem, drv); ++ ret = drv->data->get_version(cpu_dev, speedbin_nvmem, &pvs_name, drv); + if (ret) { + nvmem_cell_put(speedbin_nvmem); + goto free_drv; +@@ -181,12 +293,18 @@ + } + of_node_put(np); + +- drv->opp_tables = kcalloc(num_possible_cpus(), sizeof(*drv->opp_tables), ++ drv->opp_tables1 = kcalloc(num_possible_cpus(), sizeof(*drv->opp_tables1), + GFP_KERNEL); +- if (!drv->opp_tables) { ++ if (!drv->opp_tables1) { + ret = -ENOMEM; + goto free_drv; + } ++ drv->opp_tables2 = kcalloc(num_possible_cpus(), sizeof(*drv->opp_tables2), ++ GFP_KERNEL); ++ if (!drv->opp_tables2) { ++ ret = -ENOMEM; ++ goto free_opp1; ++ } + + for_each_possible_cpu(cpu) { + cpu_dev = get_cpu_device(cpu); +@@ -196,11 +314,22 @@ + } + + if (drv->data->get_version) { +- drv->opp_tables[cpu] = +- dev_pm_opp_set_supported_hw(cpu_dev, ++ ++ if (pvs_name) { ++ drv->opp_tables1[cpu] = dev_pm_opp_set_prop_name(cpu_dev, ++ pvs_name); ++ if (IS_ERR(drv->opp_tables1[cpu])) { ++ ret = PTR_ERR(drv->opp_tables1[cpu]); ++ dev_err(cpu_dev, "Failed to add OPP name %s\n", ++ pvs_name); ++ goto free_opp; ++ } ++ } ++ ++ drv->opp_tables2[cpu] = dev_pm_opp_set_supported_hw(cpu_dev, + &drv->versions, 1); +- if (IS_ERR(drv->opp_tables[cpu])) { +- ret = PTR_ERR(drv->opp_tables[cpu]); ++ if (IS_ERR(drv->opp_tables2[cpu])) { ++ ret = PTR_ERR(drv->opp_tables2[cpu]); + dev_err(cpu_dev, + "Failed to set supported hardware\n"); + goto free_opp; +@@ -220,11 +349,18 @@ + + free_opp: + for_each_possible_cpu(cpu) { +- if (IS_ERR_OR_NULL(drv->opp_tables[cpu])) ++ if (IS_ERR_OR_NULL(drv->opp_tables1[cpu])) + break; +- dev_pm_opp_put_supported_hw(drv->opp_tables[cpu]); ++ dev_pm_opp_put_prop_name(drv->opp_tables1[cpu]); + } +- kfree(drv->opp_tables); ++ for_each_possible_cpu(cpu) { ++ if (IS_ERR_OR_NULL(drv->opp_tables2[cpu])) ++ break; ++ dev_pm_opp_put_supported_hw(drv->opp_tables2[cpu]); ++ } ++ kfree(drv->opp_tables2); ++free_opp1: ++ kfree(drv->opp_tables1); + free_drv: + kfree(drv); + +@@ -239,10 +375,14 @@ + platform_device_unregister(cpufreq_dt_pdev); + + for_each_possible_cpu(cpu) +- if (drv->opp_tables[cpu]) +- dev_pm_opp_put_supported_hw(drv->opp_tables[cpu]); ++ if (drv->opp_tables1[cpu]) ++ dev_pm_opp_put_prop_name(drv->opp_tables1[cpu]); ++ for_each_possible_cpu(cpu) ++ if (drv->opp_tables2[cpu]) ++ dev_pm_opp_put_supported_hw(drv->opp_tables2[cpu]); + +- kfree(drv->opp_tables); ++ kfree(drv->opp_tables1); ++ kfree(drv->opp_tables2); + kfree(drv); + + return 0; +@@ -259,6 +399,10 @@ + static const struct of_device_id qcom_cpufreq_match_list[] __initconst = { + { .compatible = "qcom,apq8096", .data = &match_data_kryo }, + { .compatible = "qcom,msm8996", .data = &match_data_kryo }, ++ { .compatible = "qcom,ipq8064", .data = &match_data_krait }, ++ { .compatible = "qcom,apq8064", .data = &match_data_krait }, ++ { .compatible = "qcom,msm8974", .data = &match_data_krait }, ++ { .compatible = "qcom,msm8960", .data = &match_data_krait }, + {}, + }; + From adc0bebd87404542bd4dc4b718a06b6afe6e642c Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Wed, 25 Dec 2019 17:14:03 +0100 Subject: [PATCH 130/480] ipq8064: update dtsi with new opp table The new driver use opp table to register frequency. Drop psv bindings as they are not used anymore. Adds speedbin definition for nvmem driver Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 124 +++++++++++------- 1 file changed, 80 insertions(+), 44 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index 5cb4a5e78a..6074a507b8 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -25,12 +25,13 @@ device_type = "cpu"; reg = <0>; next-level-cache = <&L2>; - qcom,acc = <&acc0>; + qcom,acc = <&acpu0_aux>; qcom,saw = <&saw0>; clocks = <&kraitcc 0>, <&kraitcc 4>; clock-names = "cpu", "l2"; clock-latency = <100000>; cpu-supply = <&smb208_s2a>; + operating-points-v2 = <&opp_table0>; voltage-tolerance = <5>; cooling-min-state = <0>; cooling-max-state = <10>; @@ -44,12 +45,13 @@ device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; - qcom,acc = <&acc1>; + qcom,acc = <&acpu1_aux>; qcom,saw = <&saw1>; clocks = <&kraitcc 1>, <&kraitcc 4>; clock-names = "cpu", "l2"; clock-latency = <100000>; cpu-supply = <&smb208_s2b>; + operating-points-v2 = <&opp_table0>; voltage-tolerance = <5>; cooling-min-state = <0>; cooling-max-state = <10>; @@ -79,6 +81,72 @@ }; }; + opp_table0: opp_table0 { + compatible = "operating-points-v2-qcom-cpu"; + nvmem-cells = <&speedbin_efuse>; + + opp-384000000 { + opp-hz = /bits/ 64 <384000000>; + opp-microvolt-speed0-pvs0-v0 = <1000000>; + opp-microvolt-speed0-pvs1-v0 = <925000>; + opp-microvolt-speed0-pvs2-v0 = <875000>; + opp-microvolt-speed0-pvs3-v0 = <800000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-600000000 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt-speed0-pvs0-v0 = <1050000>; + opp-microvolt-speed0-pvs1-v0 = <975000>; + opp-microvolt-speed0-pvs2-v0 = <925000>; + opp-microvolt-speed0-pvs3-v0 = <850000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-800000000 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt-speed0-pvs0-v0 = <1100000>; + opp-microvolt-speed0-pvs1-v0 = <1025000>; + opp-microvolt-speed0-pvs2-v0 = <995000>; + opp-microvolt-speed0-pvs3-v0 = <900000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-1000000000 { + opp-hz = /bits/ 64 <1000000000>; + opp-microvolt-speed0-pvs0-v0 = <1150000>; + opp-microvolt-speed0-pvs1-v0 = <1075000>; + opp-microvolt-speed0-pvs2-v0 = <1025000>; + opp-microvolt-speed0-pvs3-v0 = <950000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt-speed0-pvs0-v0 = <1200000>; + opp-microvolt-speed0-pvs1-v0 = <1125000>; + opp-microvolt-speed0-pvs2-v0 = <1075000>; + opp-microvolt-speed0-pvs3-v0 = <1000000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-1400000000 { + opp-hz = /bits/ 64 <1400000000>; + opp-microvolt-speed0-pvs0-v0 = <1250000>; + opp-microvolt-speed0-pvs1-v0 = <1175000>; + opp-microvolt-speed0-pvs2-v0 = <1125000>; + opp-microvolt-speed0-pvs3-v0 = <1050000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + }; + thermal-zones { tsens_tz_sensor0 { polling-delay-passive = <0>; @@ -481,46 +549,6 @@ }; }; - kraitcc: clock-controller { - compatible = "qcom,krait-cc-v1"; - #clock-cells = <1>; - }; - - qcom,pvs { - qcom,pvs-format-a; - qcom,speed0-pvs0-bin-v0 = - < 1400000000 1250000 >, - < 1200000000 1200000 >, - < 1000000000 1150000 >, - < 800000000 1100000 >, - < 600000000 1050000 >, - < 384000000 1000000 >; - - qcom,speed0-pvs1-bin-v0 = - < 1400000000 1175000 >, - < 1200000000 1125000 >, - < 1000000000 1075000 >, - < 800000000 1025000 >, - < 600000000 975000 >, - < 384000000 925000 >; - - qcom,speed0-pvs2-bin-v0 = - < 1400000000 1125000 >, - < 1200000000 1075000 >, - < 1000000000 1025000 >, - < 800000000 995000 >, - < 600000000 925000 >, - < 384000000 875000 >; - - qcom,speed0-pvs3-bin-v0 = - < 1400000000 1050000 >, - < 1200000000 1000000 >, - < 1000000000 950000 >, - < 800000000 900000 >, - < 600000000 850000 >, - < 384000000 800000 >; - }; - soc: soc { #address-cells = <1>; #size-cells = <1>; @@ -554,6 +582,9 @@ tsens_backup: backup@410 { reg = <0x410 0x10>; }; + speedbin_efuse: speedbin@0c0 { + reg = <0x0c0 0x4>; + }; }; rpm@108000 { @@ -716,13 +747,13 @@ cpu-offset = <0x80000>; }; - acc0: clock-controller@2088000 { + acpu0_aux: clock-controller@2088000 { compatible = "qcom,kpss-acc-v1"; reg = <0x02088000 0x1000>, <0x02008000 0x1000>; clock-output-names = "acpu0_aux"; }; - acc1: clock-controller@2098000 { + acpu1_aux: clock-controller@2098000 { compatible = "qcom,kpss-acc-v1"; reg = <0x02098000 0x1000>, <0x02008000 0x1000>; clock-output-names = "acpu1_aux"; @@ -734,6 +765,11 @@ clock-output-names = "acpu_l2_aux"; }; + kraitcc: clock-controller { + compatible = "qcom,krait-cc-v1"; + #clock-cells = <1>; + }; + saw0: regulator@2089000 { compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; reg = <0x02089000 0x1000>, <0x02009000 0x1000>; From 62a4e4b31929ccfc370238e71a572a2aee1e47e2 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Wed, 25 Dec 2019 15:02:46 +0100 Subject: [PATCH 131/480] ipq8065: update dtsi with new opp table The new driver use opp table to register frequency. Drop psv bindings as they are not used anymore. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8065.dtsi | 144 +++++++++++------- 1 file changed, 91 insertions(+), 53 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi index d18aea4c54..ae9e4a2e8e 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi @@ -4,59 +4,6 @@ model = "Qualcomm IPQ8065"; compatible = "qcom,ipq8065", "qcom,ipq8064"; - qcom,pvs { - qcom,pvs-format-a; - qcom,speed0-pvs0-bin-v0 = - < 1725000000 1262500 >, - < 1400000000 1175000 >, - < 1000000000 1100000 >, - < 800000000 1050000 >, - < 600000000 1000000 >, - < 384000000 975000 >; - qcom,speed0-pvs1-bin-v0 = - < 1725000000 1225000 >, - < 1400000000 1150000 >, - < 1000000000 1075000 >, - < 800000000 1025000 >, - < 600000000 975000 >, - < 384000000 950000 >; - qcom,speed0-pvs2-bin-v0 = - < 1725000000 1200000 >, - < 1400000000 1125000 >, - < 1000000000 1050000 >, - < 800000000 1000000 >, - < 600000000 950000 >, - < 384000000 925000 >; - qcom,speed0-pvs3-bin-v0 = - < 1725000000 1175000 >, - < 1400000000 1100000 >, - < 1000000000 1025000 >, - < 800000000 975000 >, - < 600000000 925000 >, - < 384000000 900000 >; - qcom,speed0-pvs4-bin-v0 = - < 1725000000 1150000 >, - < 1400000000 1075000 >, - < 1000000000 1000000 >, - < 800000000 950000 >, - < 600000000 900000 >, - < 384000000 875000 >; - qcom,speed0-pvs5-bin-v0 = - < 1725000000 1100000 >, - < 1400000000 1025000 >, - < 1000000000 950000 >, - < 800000000 900000 >, - < 600000000 850000 >, - < 384000000 825000 >; - qcom,speed0-pvs6-bin-v0 = - < 1725000000 1050000 >, - < 1400000000 975000 >, - < 1000000000 900000 >, - < 800000000 850000 >, - < 600000000 800000 >, - < 384000000 775000 >; - }; - soc: soc { rpm@108000 { @@ -84,3 +31,94 @@ }; }; }; + +&opp_table0 { + compatible = "operating-points-v2-qcom-cpu"; + nvmem-cells = <&speedbin_efuse>; + + /* + * On ipq8065 1.2 ghz freq is not present + * Remove it to make cpufreq work and not + * complain for missing definition + */ + + /delete-node/opp-1200000000; + + opp-384000000 { + opp-hz = /bits/ 64 <384000000>; + opp-microvolt-speed0-pvs0-v0 = <975000>; + opp-microvolt-speed0-pvs1-v0 = <950000>; + opp-microvolt-speed0-pvs2-v0 = <925000>; + opp-microvolt-speed0-pvs3-v0 = <900000>; + opp-microvolt-speed0-pvs4-v0 = <875000>; + opp-microvolt-speed0-pvs5-v0 = <825000>; + opp-microvolt-speed0-pvs6-v0 = <775000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-600000000 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt-speed0-pvs0-v0 = <1000000>; + opp-microvolt-speed0-pvs1-v0 = <975000>; + opp-microvolt-speed0-pvs2-v0 = <950000>; + opp-microvolt-speed0-pvs3-v0 = <925000>; + opp-microvolt-speed0-pvs4-v0 = <900000>; + opp-microvolt-speed0-pvs5-v0 = <850000>; + opp-microvolt-speed0-pvs6-v0 = <800000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-800000000 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt-speed0-pvs0-v0 = <1050000>; + opp-microvolt-speed0-pvs1-v0 = <1025000>; + opp-microvolt-speed0-pvs2-v0 = <1000000>; + opp-microvolt-speed0-pvs3-v0 = <975000>; + opp-microvolt-speed0-pvs4-v0 = <950000>; + opp-microvolt-speed0-pvs5-v0 = <900000>; + opp-microvolt-speed0-pvs6-v0 = <850000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-1000000000 { + opp-hz = /bits/ 64 <1000000000>; + opp-microvolt-speed0-pvs0-v0 = <1100000>; + opp-microvolt-speed0-pvs1-v0 = <1075000>; + opp-microvolt-speed0-pvs2-v0 = <1050000>; + opp-microvolt-speed0-pvs3-v0 = <1025000>; + opp-microvolt-speed0-pvs4-v0 = <1000000>; + opp-microvolt-speed0-pvs5-v0 = <950000>; + opp-microvolt-speed0-pvs6-v0 = <900000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-1400000000 { + opp-hz = /bits/ 64 <1400000000>; + opp-microvolt-speed0-pvs0-v0 = <1175000>; + opp-microvolt-speed0-pvs1-v0 = <1150000>; + opp-microvolt-speed0-pvs2-v0 = <1125000>; + opp-microvolt-speed0-pvs3-v0 = <1100000>; + opp-microvolt-speed0-pvs4-v0 = <1075000>; + opp-microvolt-speed0-pvs5-v0 = <1025000>; + opp-microvolt-speed0-pvs6-v0 = <975000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; + + opp-1725000000 { + opp-hz = /bits/ 64 <1725000000>; + opp-microvolt-speed0-pvs0-v0 = <1262500>; + opp-microvolt-speed0-pvs1-v0 = <1225000>; + opp-microvolt-speed0-pvs2-v0 = <1200000>; + opp-microvolt-speed0-pvs3-v0 = <1175000>; + opp-microvolt-speed0-pvs4-v0 = <1150000>; + opp-microvolt-speed0-pvs5-v0 = <1100000>; + opp-microvolt-speed0-pvs6-v0 = <1050000>; + opp-supported-hw = <0x1>; + clock-latency-ns = <100000>; + }; +}; From c8086c7d2d1948493c45c5bd9748051c906153b5 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Mon, 16 Dec 2019 20:26:25 +0100 Subject: [PATCH 132/480] ipq806x: refresh new and changed patches Refresh patches to remove fuzz Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- ...-qcm-kyrp_make_Some_variables_static.patch | 2 - ...vmem-Re-organise-kryo-cpufreq-driver.patch | 614 +++++++++++++----- ...om-cpufreq-nvmem-Refactor-the-driver.patch | 18 +- ...mem-Add-support-for-krait-based-socs.patch | 30 +- ...rt-adjusting-OPP-voltages-at-runtime.patch | 32 +- ...e-voltage-tolerance-when-adjusting-t.patch | 4 +- ...-dt-Handle-OPP-voltage-adjust-events.patch | 4 +- ...-dt-Add-L2-frequency-scaling-support.patch | 4 +- ...056-cpufreq-dt-Add-missing-rcu-locks.patch | 2 +- 9 files changed, 497 insertions(+), 213 deletions(-) diff --git a/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch b/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch index d445c0e190..a51153b2aa 100644 --- a/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch +++ b/target/linux/ipq806x/patches-4.19/0035-qcom-cpufreq-nvmem-qcm-kyrp_make_Some_variables_static.patch @@ -12,8 +12,6 @@ Signed-off-by: Viresh Kumar drivers/cpufreq/qcom-cpufreq-kryo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c -index 2a3675c24032b..1c8583cc06a2a 100644 --- a/drivers/cpufreq/qcom-cpufreq-kryo.c +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c @@ -42,7 +42,7 @@ enum _msm8996_version { diff --git a/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch b/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch index ab6a37ba37..c7e4569616 100644 --- a/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0036-qcom-cpufreq-nvmem-Re-organise-kryo-cpufreq-driver.patch @@ -25,11 +25,9 @@ Signed-off-by: Viresh Kumar 4 files changed, 78 insertions(+), 54 deletions(-) rename drivers/cpufreq/{qcom-cpufreq-kryo.c => qcom-cpufreq-nvmem.c} (69%) -diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 56c31a78c6920..b1aa485a28dde 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm -@@ -120,8 +120,8 @@ config ARM_OMAP2PLUS_CPUFREQ +@@ -110,8 +110,8 @@ config ARM_OMAP2PLUS_CPUFREQ depends on ARCH_OMAP2PLUS default ARCH_OMAP2PLUS @@ -40,11 +38,9 @@ index 56c31a78c6920..b1aa485a28dde 100644 depends on ARM64 depends on QCOM_QFPROM depends on QCOM_SMEM -diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index 5a6c70d26c985..8572a918aa755 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile -@@ -64,7 +64,7 @@ obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cpufreq.o +@@ -64,7 +64,7 @@ obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cp obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o @@ -53,55 +49,344 @@ index 5a6c70d26c985..8572a918aa755 100644 obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o -diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c -similarity index 69% -rename from drivers/cpufreq/qcom-cpufreq-kryo.c -rename to drivers/cpufreq/qcom-cpufreq-nvmem.c -index dd64dcf89c74c..fd08120768af2 100644 --- a/drivers/cpufreq/qcom-cpufreq-kryo.c -+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c -@@ -9,7 +9,7 @@ - * based on the silicon variant in use. Qualcomm Process Voltage Scaling Tables - * defines the voltage and frequency value based on the msm-id in SMEM - * and speedbin blown in the efuse combination. ++++ /dev/null +@@ -1,249 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0 +-/* +- * Copyright (c) 2018, The Linux Foundation. All rights reserved. +- */ +- +-/* +- * In Certain QCOM SoCs like apq8096 and msm8996 that have KRYO processors, +- * the CPU frequency subset and voltage value of each OPP varies +- * based on the silicon variant in use. Qualcomm Process Voltage Scaling Tables +- * defines the voltage and frequency value based on the msm-id in SMEM +- * and speedbin blown in the efuse combination. - * The qcom-cpufreq-kryo driver reads the msm-id and efuse value from the SoC -+ * The qcom-cpufreq-nvmem driver reads the msm-id and efuse value from the SoC - * to provide the OPP framework with required information. - * This is used to determine the voltage and frequency value for each OPP of - * operating-points-v2 table when it is parsed by the OPP framework. -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -42,9 +43,9 @@ enum _msm8996_version { - NUM_OF_MSM8996_VERSIONS, - }; - +- * to provide the OPP framework with required information. +- * This is used to determine the voltage and frequency value for each OPP of +- * operating-points-v2 table when it is parsed by the OPP framework. +- */ +- +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +- +-#define MSM_ID_SMEM 137 +- +-enum _msm_id { +- MSM8996V3 = 0xF6ul, +- APQ8096V3 = 0x123ul, +- MSM8996SG = 0x131ul, +- APQ8096SG = 0x138ul, +-}; +- +-enum _msm8996_version { +- MSM8996_V3, +- MSM8996_SG, +- NUM_OF_MSM8996_VERSIONS, +-}; +- -static struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev; -+static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; - +- -static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void) -+static enum _msm8996_version qcom_cpufreq_get_msm_id(void) - { - size_t len; - u32 *msm_id; -@@ -73,28 +74,62 @@ static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void) - return version; - } - +-{ +- size_t len; +- u32 *msm_id; +- enum _msm8996_version version; +- +- msm_id = qcom_smem_get(QCOM_SMEM_HOST_ANY, MSM_ID_SMEM, &len); +- if (IS_ERR(msm_id)) +- return NUM_OF_MSM8996_VERSIONS; +- +- /* The first 4 bytes are format, next to them is the actual msm-id */ +- msm_id++; +- +- switch ((enum _msm_id)*msm_id) { +- case MSM8996V3: +- case APQ8096V3: +- version = MSM8996_V3; +- break; +- case MSM8996SG: +- case APQ8096SG: +- version = MSM8996_SG; +- break; +- default: +- version = NUM_OF_MSM8996_VERSIONS; +- } +- +- return version; +-} +- -static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) +-{ +- struct opp_table **opp_tables; +- enum _msm8996_version msm8996_version; +- struct nvmem_cell *speedbin_nvmem; +- struct device_node *np; +- struct device *cpu_dev; +- unsigned cpu; +- u8 *speedbin; +- u32 versions; +- size_t len; +- int ret; +- +- cpu_dev = get_cpu_device(0); +- if (!cpu_dev) +- return -ENODEV; +- +- msm8996_version = qcom_cpufreq_kryo_get_msm_id(); +- if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { +- dev_err(cpu_dev, "Not Snapdragon 820/821!"); +- return -ENODEV; +- } +- +- np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); +- if (!np) +- return -ENOENT; +- +- ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu"); +- if (!ret) { +- of_node_put(np); +- return -ENOENT; +- } +- +- speedbin_nvmem = of_nvmem_cell_get(np, NULL); +- of_node_put(np); +- if (IS_ERR(speedbin_nvmem)) { +- if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER) +- dev_err(cpu_dev, "Could not get nvmem cell: %ld\n", +- PTR_ERR(speedbin_nvmem)); +- return PTR_ERR(speedbin_nvmem); +- } +- +- speedbin = nvmem_cell_read(speedbin_nvmem, &len); +- nvmem_cell_put(speedbin_nvmem); +- if (IS_ERR(speedbin)) +- return PTR_ERR(speedbin); +- +- switch (msm8996_version) { +- case MSM8996_V3: +- versions = 1 << (unsigned int)(*speedbin); +- break; +- case MSM8996_SG: +- versions = 1 << ((unsigned int)(*speedbin) + 4); +- break; +- default: +- BUG(); +- break; +- } +- kfree(speedbin); +- +- opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL); +- if (!opp_tables) +- return -ENOMEM; +- +- for_each_possible_cpu(cpu) { +- cpu_dev = get_cpu_device(cpu); +- if (NULL == cpu_dev) { +- ret = -ENODEV; +- goto free_opp; +- } +- +- opp_tables[cpu] = dev_pm_opp_set_supported_hw(cpu_dev, +- &versions, 1); +- if (IS_ERR(opp_tables[cpu])) { +- ret = PTR_ERR(opp_tables[cpu]); +- dev_err(cpu_dev, "Failed to set supported hardware\n"); +- goto free_opp; +- } +- } +- +- cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1, +- NULL, 0); +- if (!IS_ERR(cpufreq_dt_pdev)) { +- platform_set_drvdata(pdev, opp_tables); +- return 0; +- } +- +- ret = PTR_ERR(cpufreq_dt_pdev); +- dev_err(cpu_dev, "Failed to register platform device\n"); +- +-free_opp: +- for_each_possible_cpu(cpu) { +- if (IS_ERR_OR_NULL(opp_tables[cpu])) +- break; +- dev_pm_opp_put_supported_hw(opp_tables[cpu]); +- } +- kfree(opp_tables); +- +- return ret; +-} +- +-static int qcom_cpufreq_kryo_remove(struct platform_device *pdev) +-{ +- struct opp_table **opp_tables = platform_get_drvdata(pdev); +- unsigned int cpu; +- +- platform_device_unregister(cpufreq_dt_pdev); +- +- for_each_possible_cpu(cpu) +- dev_pm_opp_put_supported_hw(opp_tables[cpu]); +- +- kfree(opp_tables); +- +- return 0; +-} +- +-static struct platform_driver qcom_cpufreq_kryo_driver = { +- .probe = qcom_cpufreq_kryo_probe, +- .remove = qcom_cpufreq_kryo_remove, +- .driver = { +- .name = "qcom-cpufreq-kryo", +- }, +-}; +- +-static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = { +- { .compatible = "qcom,apq8096", }, +- { .compatible = "qcom,msm8996", }, +- {} +-}; +- +-/* +- * Since the driver depends on smem and nvmem drivers, which may +- * return EPROBE_DEFER, all the real activity is done in the probe, +- * which may be defered as well. The init here is only registering +- * the driver and the platform device. +- */ +-static int __init qcom_cpufreq_kryo_init(void) +-{ +- struct device_node *np = of_find_node_by_path("/"); +- const struct of_device_id *match; +- int ret; +- +- if (!np) +- return -ENODEV; +- +- match = of_match_node(qcom_cpufreq_kryo_match_list, np); +- of_node_put(np); +- if (!match) +- return -ENODEV; +- +- ret = platform_driver_register(&qcom_cpufreq_kryo_driver); +- if (unlikely(ret < 0)) +- return ret; +- +- kryo_cpufreq_pdev = platform_device_register_simple( +- "qcom-cpufreq-kryo", -1, NULL, 0); +- ret = PTR_ERR_OR_ZERO(kryo_cpufreq_pdev); +- if (0 == ret) +- return 0; +- +- platform_driver_unregister(&qcom_cpufreq_kryo_driver); +- return ret; +-} +-module_init(qcom_cpufreq_kryo_init); +- +-static void __exit qcom_cpufreq_kryo_exit(void) +-{ +- platform_device_unregister(kryo_cpufreq_pdev); +- platform_driver_unregister(&qcom_cpufreq_kryo_driver); +-} +-module_exit(qcom_cpufreq_kryo_exit); +- +-MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Kryo CPUfreq driver"); +-MODULE_LICENSE("GPL v2"); +--- /dev/null ++++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c +@@ -0,0 +1,273 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (c) 2018, The Linux Foundation. All rights reserved. ++ */ ++ ++/* ++ * In Certain QCOM SoCs like apq8096 and msm8996 that have KRYO processors, ++ * the CPU frequency subset and voltage value of each OPP varies ++ * based on the silicon variant in use. Qualcomm Process Voltage Scaling Tables ++ * defines the voltage and frequency value based on the msm-id in SMEM ++ * and speedbin blown in the efuse combination. ++ * The qcom-cpufreq-nvmem driver reads the msm-id and efuse value from the SoC ++ * to provide the OPP framework with required information. ++ * This is used to determine the voltage and frequency value for each OPP of ++ * operating-points-v2 table when it is parsed by the OPP framework. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define MSM_ID_SMEM 137 ++ ++enum _msm_id { ++ MSM8996V3 = 0xF6ul, ++ APQ8096V3 = 0x123ul, ++ MSM8996SG = 0x131ul, ++ APQ8096SG = 0x138ul, ++}; ++ ++enum _msm8996_version { ++ MSM8996_V3, ++ MSM8996_SG, ++ NUM_OF_MSM8996_VERSIONS, ++}; ++ ++static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; ++ ++static enum _msm8996_version qcom_cpufreq_get_msm_id(void) ++{ ++ size_t len; ++ u32 *msm_id; ++ enum _msm8996_version version; ++ ++ msm_id = qcom_smem_get(QCOM_SMEM_HOST_ANY, MSM_ID_SMEM, &len); ++ if (IS_ERR(msm_id)) ++ return NUM_OF_MSM8996_VERSIONS; ++ ++ /* The first 4 bytes are format, next to them is the actual msm-id */ ++ msm_id++; ++ ++ switch ((enum _msm_id)*msm_id) { ++ case MSM8996V3: ++ case APQ8096V3: ++ version = MSM8996_V3; ++ break; ++ case MSM8996SG: ++ case APQ8096SG: ++ version = MSM8996_SG; ++ break; ++ default: ++ version = NUM_OF_MSM8996_VERSIONS; ++ } ++ ++ return version; ++} ++ +static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, + struct nvmem_cell *speedbin_nvmem, + u32 *versions) - { -- struct opp_table **opp_tables; ++{ + size_t len; + u8 *speedbin; - enum _msm8996_version msm8996_version; ++ enum _msm8996_version msm8996_version; + + msm8996_version = qcom_cpufreq_get_msm_id(); + if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { @@ -135,147 +420,160 @@ index dd64dcf89c74c..fd08120768af2 100644 + int (*get_version)(struct device *cpu_dev, + struct nvmem_cell *speedbin_nvmem, + u32 *versions); - struct nvmem_cell *speedbin_nvmem; - struct device_node *np; - struct device *cpu_dev; - unsigned cpu; -- u8 *speedbin; - u32 versions; -- size_t len; ++ struct nvmem_cell *speedbin_nvmem; ++ struct device_node *np; ++ struct device *cpu_dev; ++ unsigned cpu; ++ u32 versions; + const struct of_device_id *match; - int ret; - - cpu_dev = get_cpu_device(0); - if (!cpu_dev) - return -ENODEV; - -- msm8996_version = qcom_cpufreq_kryo_get_msm_id(); -- if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { -- dev_err(cpu_dev, "Not Snapdragon 820/821!"); ++ int ret; ++ ++ cpu_dev = get_cpu_device(0); ++ if (!cpu_dev) ++ return -ENODEV; ++ + match = pdev->dev.platform_data; + get_version = match->data; + if (!get_version) - return -ENODEV; -- } - - np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); - if (!np) -@@ -115,23 +150,10 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) - return PTR_ERR(speedbin_nvmem); - } - -- speedbin = nvmem_cell_read(speedbin_nvmem, &len); ++ return -ENODEV; ++ ++ np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); ++ if (!np) ++ return -ENOENT; ++ ++ ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu"); ++ if (!ret) { ++ of_node_put(np); ++ return -ENOENT; ++ } ++ ++ speedbin_nvmem = of_nvmem_cell_get(np, NULL); ++ of_node_put(np); ++ if (IS_ERR(speedbin_nvmem)) { ++ if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER) ++ dev_err(cpu_dev, "Could not get nvmem cell: %ld\n", ++ PTR_ERR(speedbin_nvmem)); ++ return PTR_ERR(speedbin_nvmem); ++ } ++ + ret = get_version(cpu_dev, speedbin_nvmem, &versions); - nvmem_cell_put(speedbin_nvmem); -- if (IS_ERR(speedbin)) -- return PTR_ERR(speedbin); -- -- switch (msm8996_version) { -- case MSM8996_V3: -- versions = 1 << (unsigned int)(*speedbin); -- break; -- case MSM8996_SG: -- versions = 1 << ((unsigned int)(*speedbin) + 4); -- break; -- default: -- BUG(); -- break; -- } -- kfree(speedbin); ++ nvmem_cell_put(speedbin_nvmem); + if (ret) + return ret; - - opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL); - if (!opp_tables) -@@ -174,7 +196,7 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) - return ret; - } - --static int qcom_cpufreq_kryo_remove(struct platform_device *pdev) ++ ++ opp_tables = kcalloc(num_possible_cpus(), sizeof(*opp_tables), GFP_KERNEL); ++ if (!opp_tables) ++ return -ENOMEM; ++ ++ for_each_possible_cpu(cpu) { ++ cpu_dev = get_cpu_device(cpu); ++ if (NULL == cpu_dev) { ++ ret = -ENODEV; ++ goto free_opp; ++ } ++ ++ opp_tables[cpu] = dev_pm_opp_set_supported_hw(cpu_dev, ++ &versions, 1); ++ if (IS_ERR(opp_tables[cpu])) { ++ ret = PTR_ERR(opp_tables[cpu]); ++ dev_err(cpu_dev, "Failed to set supported hardware\n"); ++ goto free_opp; ++ } ++ } ++ ++ cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1, ++ NULL, 0); ++ if (!IS_ERR(cpufreq_dt_pdev)) { ++ platform_set_drvdata(pdev, opp_tables); ++ return 0; ++ } ++ ++ ret = PTR_ERR(cpufreq_dt_pdev); ++ dev_err(cpu_dev, "Failed to register platform device\n"); ++ ++free_opp: ++ for_each_possible_cpu(cpu) { ++ if (IS_ERR_OR_NULL(opp_tables[cpu])) ++ break; ++ dev_pm_opp_put_supported_hw(opp_tables[cpu]); ++ } ++ kfree(opp_tables); ++ ++ return ret; ++} ++ +static int qcom_cpufreq_remove(struct platform_device *pdev) - { - struct opp_table **opp_tables = platform_get_drvdata(pdev); - unsigned int cpu; -@@ -189,18 +211,20 @@ static int qcom_cpufreq_kryo_remove(struct platform_device *pdev) - return 0; - } - --static struct platform_driver qcom_cpufreq_kryo_driver = { -- .probe = qcom_cpufreq_kryo_probe, -- .remove = qcom_cpufreq_kryo_remove, ++{ ++ struct opp_table **opp_tables = platform_get_drvdata(pdev); ++ unsigned int cpu; ++ ++ platform_device_unregister(cpufreq_dt_pdev); ++ ++ for_each_possible_cpu(cpu) ++ dev_pm_opp_put_supported_hw(opp_tables[cpu]); ++ ++ kfree(opp_tables); ++ ++ return 0; ++} ++ +static struct platform_driver qcom_cpufreq_driver = { + .probe = qcom_cpufreq_probe, + .remove = qcom_cpufreq_remove, - .driver = { -- .name = "qcom-cpufreq-kryo", ++ .driver = { + .name = "qcom-cpufreq-nvmem", - }, - }; - --static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = { -- { .compatible = "qcom,apq8096", }, -- { .compatible = "qcom,msm8996", }, -- {} ++ }, ++}; ++ +static const struct of_device_id qcom_cpufreq_match_list[] __initconst = { + { .compatible = "qcom,apq8096", + .data = qcom_cpufreq_kryo_name_version }, + { .compatible = "qcom,msm8996", + .data = qcom_cpufreq_kryo_name_version }, + {}, - }; - - /* -@@ -209,7 +233,7 @@ static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = { - * which may be defered as well. The init here is only registering - * the driver and the platform device. - */ --static int __init qcom_cpufreq_kryo_init(void) ++}; ++ ++/* ++ * Since the driver depends on smem and nvmem drivers, which may ++ * return EPROBE_DEFER, all the real activity is done in the probe, ++ * which may be defered as well. The init here is only registering ++ * the driver and the platform device. ++ */ +static int __init qcom_cpufreq_init(void) - { - struct device_node *np = of_find_node_by_path("/"); - const struct of_device_id *match; -@@ -218,32 +242,32 @@ static int __init qcom_cpufreq_kryo_init(void) - if (!np) - return -ENODEV; - -- match = of_match_node(qcom_cpufreq_kryo_match_list, np); ++{ ++ struct device_node *np = of_find_node_by_path("/"); ++ const struct of_device_id *match; ++ int ret; ++ ++ if (!np) ++ return -ENODEV; ++ + match = of_match_node(qcom_cpufreq_match_list, np); - of_node_put(np); - if (!match) - return -ENODEV; - -- ret = platform_driver_register(&qcom_cpufreq_kryo_driver); ++ of_node_put(np); ++ if (!match) ++ return -ENODEV; ++ + ret = platform_driver_register(&qcom_cpufreq_driver); - if (unlikely(ret < 0)) - return ret; - -- kryo_cpufreq_pdev = platform_device_register_simple( -- "qcom-cpufreq-kryo", -1, NULL, 0); -- ret = PTR_ERR_OR_ZERO(kryo_cpufreq_pdev); ++ if (unlikely(ret < 0)) ++ return ret; ++ + cpufreq_pdev = platform_device_register_data(NULL, "qcom-cpufreq-nvmem", + -1, match, sizeof(*match)); + ret = PTR_ERR_OR_ZERO(cpufreq_pdev); - if (0 == ret) - return 0; - -- platform_driver_unregister(&qcom_cpufreq_kryo_driver); ++ if (0 == ret) ++ return 0; ++ + platform_driver_unregister(&qcom_cpufreq_driver); - return ret; - } --module_init(qcom_cpufreq_kryo_init); ++ return ret; ++} +module_init(qcom_cpufreq_init); - --static void __exit qcom_cpufreq_kryo_exit(void) ++ +static void __exit qcom_cpufreq_exit(void) - { -- platform_device_unregister(kryo_cpufreq_pdev); -- platform_driver_unregister(&qcom_cpufreq_kryo_driver); ++{ + platform_device_unregister(cpufreq_pdev); + platform_driver_unregister(&qcom_cpufreq_driver); - } --module_exit(qcom_cpufreq_kryo_exit); ++} +module_exit(qcom_cpufreq_exit); - --MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Kryo CPUfreq driver"); ++ +MODULE_DESCRIPTION("Qualcomm Technologies, Inc. CPUfreq driver"); - MODULE_LICENSE("GPL v2"); ++MODULE_LICENSE("GPL v2"); diff --git a/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch b/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch index 6c519c2c27..d00b2ccfcb 100644 --- a/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0037-qcom-cpufreq-nvmem-Refactor-the-driver.patch @@ -20,8 +20,6 @@ Signed-off-by: Viresh Kumar drivers/cpufreq/qcom-cpufreq-nvmem.c | 123 +++++++++++++++++---------- 1 file changed, 79 insertions(+), 44 deletions(-) -diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c -index fd08120768af2..2d798a1685c5d 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -43,6 +43,20 @@ enum _msm8996_version { @@ -45,7 +43,7 @@ index fd08120768af2..2d798a1685c5d 100644 static struct platform_device *cpufreq_dt_pdev, *cpufreq_pdev; static enum _msm8996_version qcom_cpufreq_get_msm_id(void) -@@ -76,7 +90,7 @@ static enum _msm8996_version qcom_cpufreq_get_msm_id(void) +@@ -76,7 +90,7 @@ static enum _msm8996_version qcom_cpufre static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, struct nvmem_cell *speedbin_nvmem, @@ -54,7 +52,7 @@ index fd08120768af2..2d798a1685c5d 100644 { size_t len; u8 *speedbin; -@@ -94,10 +108,10 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, +@@ -94,10 +108,10 @@ static int qcom_cpufreq_kryo_name_versio switch (msm8996_version) { case MSM8996_V3: @@ -67,7 +65,7 @@ index fd08120768af2..2d798a1685c5d 100644 break; default: BUG(); -@@ -108,17 +122,17 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, +@@ -108,17 +122,17 @@ static int qcom_cpufreq_kryo_name_versio return 0; } @@ -90,7 +88,7 @@ index fd08120768af2..2d798a1685c5d 100644 const struct of_device_id *match; int ret; -@@ -126,11 +140,6 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) +@@ -126,11 +140,6 @@ static int qcom_cpufreq_probe(struct pla if (!cpu_dev) return -ENODEV; @@ -102,7 +100,7 @@ index fd08120768af2..2d798a1685c5d 100644 np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); if (!np) return -ENOENT; -@@ -141,23 +150,43 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) +@@ -141,23 +150,43 @@ static int qcom_cpufreq_probe(struct pla return -ENOENT; } @@ -160,7 +158,7 @@ index fd08120768af2..2d798a1685c5d 100644 for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); -@@ -166,19 +195,23 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) +@@ -166,19 +195,23 @@ static int qcom_cpufreq_probe(struct pla goto free_opp; } @@ -191,7 +189,7 @@ index fd08120768af2..2d798a1685c5d 100644 return 0; } -@@ -187,26 +220,30 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) +@@ -187,26 +220,30 @@ static int qcom_cpufreq_probe(struct pla free_opp: for_each_possible_cpu(cpu) { @@ -228,7 +226,7 @@ index fd08120768af2..2d798a1685c5d 100644 return 0; } -@@ -220,10 +257,8 @@ static struct platform_driver qcom_cpufreq_driver = { +@@ -220,10 +257,8 @@ static struct platform_driver qcom_cpufr }; static const struct of_device_id qcom_cpufreq_match_list[] __initconst = { diff --git a/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch b/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch index 13e8ead471..b8895231d8 100644 --- a/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch +++ b/target/linux/ipq806x/patches-4.19/0038-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch @@ -39,11 +39,9 @@ Signed-off-by: Sricharan R # - nvmem-cells: A phandle pointing to a nvmem-cells node representing the # efuse registers that has information about the # speedbin that is used to select the right frequency/voltage -diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 13fbd97..497ae89 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm -@@ -126,7 +126,7 @@ config ARM_OMAP2PLUS_CPUFREQ +@@ -112,7 +112,7 @@ config ARM_OMAP2PLUS_CPUFREQ config ARM_QCOM_CPUFREQ_NVMEM tristate "Qualcomm nvmem based CPUFreq" @@ -52,11 +50,9 @@ index 13fbd97..497ae89 100644 depends on QCOM_QFPROM depends on QCOM_SMEM select PM_OPP -diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index fe14c57..917cdc2 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c -@@ -128,6 +128,11 @@ +@@ -128,6 +128,11 @@ static const struct of_device_id blackli { .compatible = "ti,am43", }, { .compatible = "ti,dra7", }, @@ -68,11 +64,9 @@ index fe14c57..917cdc2 100644 { } }; -diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c -index 0ad8e5b..5f2add0 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c -@@ -48,17 +48,92 @@ +@@ -48,17 +48,92 @@ struct qcom_cpufreq_drv; struct qcom_cpufreq_match_data { int (*get_version)(struct device *cpu_dev, struct nvmem_cell *speedbin_nvmem, @@ -166,7 +160,7 @@ index 0ad8e5b..5f2add0 100644 static enum _msm8996_version qcom_cpufreq_get_msm_id(void) { size_t len; -@@ -90,11 +165,13 @@ +@@ -90,11 +165,13 @@ static enum _msm8996_version qcom_cpufre static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev, struct nvmem_cell *speedbin_nvmem, @@ -180,7 +174,7 @@ index 0ad8e5b..5f2add0 100644 msm8996_version = qcom_cpufreq_get_msm_id(); if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { -@@ -122,16 +199,51 @@ +@@ -122,16 +199,51 @@ static int qcom_cpufreq_kryo_name_versio return 0; } @@ -232,7 +226,7 @@ index 0ad8e5b..5f2add0 100644 unsigned cpu; const struct of_device_id *match; int ret; -@@ -144,7 +256,7 @@ +@@ -144,7 +256,7 @@ static int qcom_cpufreq_probe(struct pla if (!np) return -ENOENT; @@ -241,7 +235,7 @@ index 0ad8e5b..5f2add0 100644 if (!ret) { of_node_put(np); return -ENOENT; -@@ -172,7 +284,7 @@ +@@ -172,7 +284,7 @@ static int qcom_cpufreq_probe(struct pla goto free_drv; } @@ -250,7 +244,7 @@ index 0ad8e5b..5f2add0 100644 if (ret) { nvmem_cell_put(speedbin_nvmem); goto free_drv; -@@ -181,12 +293,18 @@ +@@ -181,12 +293,18 @@ static int qcom_cpufreq_probe(struct pla } of_node_put(np); @@ -271,7 +265,7 @@ index 0ad8e5b..5f2add0 100644 for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); -@@ -196,11 +314,22 @@ +@@ -196,11 +314,22 @@ static int qcom_cpufreq_probe(struct pla } if (drv->data->get_version) { @@ -298,7 +292,7 @@ index 0ad8e5b..5f2add0 100644 dev_err(cpu_dev, "Failed to set supported hardware\n"); goto free_opp; -@@ -220,11 +349,18 @@ +@@ -220,11 +349,18 @@ static int qcom_cpufreq_probe(struct pla free_opp: for_each_possible_cpu(cpu) { @@ -320,7 +314,7 @@ index 0ad8e5b..5f2add0 100644 free_drv: kfree(drv); -@@ -239,10 +375,14 @@ +@@ -239,10 +375,14 @@ static int qcom_cpufreq_remove(struct pl platform_device_unregister(cpufreq_dt_pdev); for_each_possible_cpu(cpu) @@ -338,7 +332,7 @@ index 0ad8e5b..5f2add0 100644 kfree(drv); return 0; -@@ -259,6 +399,10 @@ +@@ -259,6 +399,10 @@ static struct platform_driver qcom_cpufr static const struct of_device_id qcom_cpufreq_match_list[] __initconst = { { .compatible = "qcom,apq8096", .data = &match_data_kryo }, { .compatible = "qcom,msm8996", .data = &match_data_kryo }, diff --git a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch index 9181d94901..bb82251bfd 100644 --- a/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch +++ b/target/linux/ipq806x/patches-4.19/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -37,15 +37,12 @@ Signed-off-by: Sylwester Nawrocki include/linux/pm_opp.h | 13 ++++++++ 2 files changed, 82 insertions(+) -diff --git a/drivers/opp/core.c b/drivers/opp/core.c -index 3b7ffd0234e9..f38b3be85072 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c -@@ -2112,6 +2112,75 @@ static int _opp_set_availability(struct device *dev, unsigned long freq, - return r; +@@ -1623,6 +1623,75 @@ put_table: } - -+/** + + /** + * dev_pm_opp_adjust_voltage() - helper to change the voltage of an OPP + * @dev: device for which we do this operation + * @freq: OPP frequency to adjust voltage of @@ -114,36 +111,35 @@ index 3b7ffd0234e9..f38b3be85072 100644 + return r; +} + - /** ++/** * dev_pm_opp_enable() - Enable a specific OPP * @dev: device for which we do this operation -diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h -index b8197ab014f2..747861816f4f 100644 + * @freq: OPP frequency to enable --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h -@@ -22,6 +22,7 @@ struct opp_table; - +@@ -25,6 +25,7 @@ struct opp_table; + enum dev_pm_opp_event { OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, + OPP_EVENT_ADJUST_VOLTAGE, }; - + /** -@@ -113,6 +114,10 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, +@@ -108,6 +109,10 @@ int dev_pm_opp_add(struct device *dev, u + unsigned long u_volt); void dev_pm_opp_remove(struct device *dev, unsigned long freq); - void dev_pm_opp_remove_all_dynamic(struct device *dev); - + +int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, + unsigned long u_volt, unsigned long u_volt_min, + unsigned long u_volt_max); + int dev_pm_opp_enable(struct device *dev, unsigned long freq); - + int dev_pm_opp_disable(struct device *dev, unsigned long freq); -@@ -242,6 +247,14 @@ static inline void dev_pm_opp_remove_all_dynamic(struct device *dev) +@@ -208,6 +213,14 @@ static inline void dev_pm_opp_remove(str { } - + +static inline int +dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, + unsigned long u_volt, unsigned long u_volt_min, diff --git a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch index f940d8ca62..8ba2369ddd 100644 --- a/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch +++ b/target/linux/ipq806x/patches-4.19/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/opp/core.c +++ b/drivers/opp/core.c -@@ -1663,6 +1663,7 @@ +@@ -1663,6 +1663,7 @@ int dev_pm_opp_adjust_voltage(struct dev struct opp_table *opp_table; struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV); int r = 0; @@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov /* Find the opp_table */ opp_table = _find_opp_table(dev); -@@ -1692,8 +1693,17 @@ +@@ -1692,8 +1693,17 @@ int dev_pm_opp_adjust_voltage(struct dev goto adjust_unlock; opp->supplies->u_volt = u_volt; diff --git a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch index 5a4232ded3..f60fe3fe2f 100644 --- a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch +++ b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch @@ -99,7 +99,7 @@ Signed-off-by: Georgi Djakov cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { -@@ -254,10 +294,13 @@ static int cpufreq_init(struct cpufreq_p +@@ -251,10 +291,13 @@ static int cpufreq_init(struct cpufreq_p __func__, ret); } @@ -114,7 +114,7 @@ Signed-off-by: Georgi Djakov } priv->cpu_dev = cpu_dev; -@@ -287,6 +330,8 @@ static int cpufreq_init(struct cpufreq_p +@@ -284,6 +327,8 @@ static int cpufreq_init(struct cpufreq_p out_free_cpufreq_table: dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch index fa9aa3fff0..f27f88f892 100644 --- a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -52,7 +52,7 @@ Signed-off-by: Georgi Djakov priv->opp_freq = freq * 1000; arch_set_freq_scale(policy->related_cpus, freq, policy->cpuinfo.max_freq); -@@ -201,6 +229,8 @@ static int cpufreq_init(struct cpufreq_p +@@ -201,6 +230,8 @@ static int cpufreq_init(struct cpufreq_p const char *name; int ret; struct srcu_notifier_head *opp_srcu_head; @@ -61,7 +61,7 @@ Signed-off-by: Georgi Djakov cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { -@@ -310,6 +340,13 @@ static int cpufreq_init(struct cpufreq_p +@@ -307,6 +338,13 @@ static int cpufreq_init(struct cpufreq_p policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000; diff --git a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch index 4925efabee..6a98c3303c 100644 --- a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch +++ b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch @@ -10,7 +10,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -146,8 +146,10 @@ static int opp_notifier(struct notifier_ +@@ -147,8 +147,10 @@ static int opp_notifier(struct notifier_ ret = PTR_ERR(cpu_reg); goto out; } From a666f817a27c01adb9d4e5d5a25367254b556a44 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Mon, 16 Dec 2019 23:51:50 +0100 Subject: [PATCH 133/480] ipq806x: update kernel config with new driver The config name for cpufreq driver has changed. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- target/linux/ipq806x/config-4.19 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 index 7a06ab9081..56f3d1a526 100644 --- a/target/linux/ipq806x/config-4.19 +++ b/target/linux/ipq806x/config-4.19 @@ -56,7 +56,7 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y # CONFIG_ARM_LPAE is not set CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARM_QCOM_CPUFREQ=y +CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y CONFIG_ARM_QCOM_CPUIDLE=y # CONFIG_ARM_SMMU is not set # CONFIG_ARM_SP805_WATCHDOG is not set From 77f4d5c6bb8323ec67248176a5a2907475041a79 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Thu, 19 Dec 2019 04:01:28 +0100 Subject: [PATCH 134/480] ipq806x: rework ipq806x specific tsense temp driver Tsense driver for ipq806x have various problem. - Emit wrong error. On probing of this driver, nvmem driver can be not ready and this cause a EDEFER error. Actually this is not an error as the kernel will retry to probe the driver after the nvmem driver is loaded. - Use uninitialized value on trigger of critical temp - Doesn't free allocated memory Because of this, rework the driver and improve it by removing extra load of data. Change the logic of loading data. Use the backup calib data only when the calib data is not present. As the calibration is only needed to set the temp offset, we don't really need to read both calib data and set the offset based only on the backup one. Also change how the notifier function work. At times when we output the trigger message, we already have read the temp so remove the extra read and the wrong uninitialized data that probably caused a kernel panic for null pointer exception. (Think we never experience this bug because the router never reached that temp ever... So just lucky) Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- .../0063-4-ip806x-tsense-rework-driver.patch | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch diff --git a/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch b/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch new file mode 100644 index 0000000000..7092552559 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch @@ -0,0 +1,107 @@ +--- a/drivers/thermal/qcom/tsens-ipq8064.c ++++ b/drivers/thermal/qcom/tsens-ipq8064.c +@@ -13,10 +13,12 @@ + */ + + #include ++#include + #include + #include + #include + #include ++#include + #include + #include + #include +@@ -210,9 +212,8 @@ + struct tsens_device *tmdev = container_of(work, struct tsens_device, + tsens_work); + unsigned int threshold, threshold_low, code, reg, sensor, mask; +- unsigned int sensor_addr; + bool upper_th_x, lower_th_x; +- int adc_code, ret; ++ int ret; + + ret = regmap_read(tmdev->map, STATUS_CNTL_8064, ®); + if (ret) +@@ -261,9 +262,8 @@ + if (upper_th_x || lower_th_x) { + /* Notify user space */ + schedule_work(&tmdev->sensor[0].notify_work); +- regmap_read(tmdev->map, sensor_addr, &adc_code); + pr_debug("Trigger (%d degrees) for sensor %d\n", +- code_to_degC(adc_code, &tmdev->sensor[0]), 0); ++ code_to_degC(code, &tmdev->sensor[0]), 0); + } + } + regmap_write(tmdev->map, STATUS_CNTL_8064, reg & mask); +@@ -372,40 +372,55 @@ + static int calibrate_ipq8064(struct tsens_device *tmdev) + { + int i; +- char *data, *data_backup; +- ++ int ret = 0; ++ u8 *data, *data_backup; ++ struct device *dev = tmdev->dev; + ssize_t num_read = tmdev->num_sensors; + struct tsens_sensor *s = tmdev->sensor; + +- data = qfprom_read(tmdev->dev, "calib"); ++ data = qfprom_read(dev, "calib"); + if (IS_ERR(data)) { +- pr_err("Calibration not found.\n"); +- return PTR_ERR(data); ++ ret = PTR_ERR(data); ++ if (ret != -EPROBE_DEFER) ++ dev_err(dev, "Calibration not found."); ++ goto exit; + } + +- data_backup = qfprom_read(tmdev->dev, "calib_backup"); ++ data_backup = qfprom_read(dev, "calib_backup"); + if (IS_ERR(data_backup)) { +- pr_err("Backup calibration not found.\n"); +- return PTR_ERR(data_backup); ++ ret = PTR_ERR(data_backup); ++ if (ret != -EPROBE_DEFER) ++ dev_err(dev, "Backup Calibration not found."); ++ goto free_data; + } + + for (i = 0; i < num_read; i++) { + s[i].calib_data = readb_relaxed(data + i); +- s[i].calib_data_backup = readb_relaxed(data_backup + i); ++ ++ if (!s[i].calib_data) { ++ s[i].calib_data_backup = readb_relaxed(data_backup + i); ++ ++ if (!s[i].calib_data_backup) { ++ dev_err(dev, "QFPROM TSENS calibration data not present"); ++ ret = -ENODEV; ++ goto free_backup; ++ } + +- if (s[i].calib_data_backup) + s[i].calib_data = s[i].calib_data_backup; +- if (!s[i].calib_data) { +- pr_err("QFPROM TSENS calibration data not present\n"); +- return -ENODEV; + } ++ + s[i].slope = tsens_8064_slope[i]; + s[i].offset = CAL_MDEGC - (s[i].calib_data * s[i].slope); + } + + hw_init(tmdev); + +- return 0; ++free_backup: ++ kfree(data_backup); ++free_data: ++ kfree(data); ++exit: ++ return ret; + } + + static int get_temp_ipq8064(struct tsens_device *tmdev, int id, int *temp) From b04ccdb1e8f8458da80b2b5993124d0cee9f7bd6 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Wed, 25 Dec 2019 15:06:14 +0100 Subject: [PATCH 135/480] ipq806x: fix wrong definition for tsense calib We have only 11 sensors on ipq806x. Fix the reg property to load the right amount of data instead of the entire space. Tested-by: Stefan Lippers-Hollmann [nbg6817/ipq8065] Signed-off-by: Ansuel Smith --- .../ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index 6074a507b8..e6066024f6 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -577,10 +577,10 @@ #size-cells = <1>; status = "okay"; tsens_calib: calib@400 { - reg = <0x400 0x10>; + reg = <0x400 0xb>; }; tsens_backup: backup@410 { - reg = <0x410 0x10>; + reg = <0x410 0xb>; }; speedbin_efuse: speedbin@0c0 { reg = <0x0c0 0x4>; From b9f3af7c890e76baa9869f51384c0dbd96c3b704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 11 Dec 2019 21:08:15 +0100 Subject: [PATCH 136/480] libubox: update to version 2019-12-26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contains following changes: eb7eb6393d47 blobmsg: fix array out of bounds GCC 10 warning 86f6a5b8d1f1 blobmsg: reuse blobmsg_namelen in blobmsg_data 586ce031eaa0 tests: fuzz: fuzz _len variants of checking methods b0e21553ae8c blobmsg: add _len variants for all attribute checking methods cd3059796a57 Replace use of blobmsg_check_attr by blobmsg_check_attr_len 143303149c8b Ensure blob_attr length check does not perform out of bounds reads f2b2ee441adb blobmsg: fix heap buffer overflow in blobmsg_parse 4dfd24ed88c4 blobmsg: make blobmsg_len and blobmsg_data_len return unsigned value 2df6d35e3299 tests: add test cases for blobmsg parsing 8a34788b46c4 test: fuzz: add blobmsg_check_attr crashes 478597b9f9ae blob: fix OOB access in blob_check_type 325418a7a3c0 tests: use blob_parse_untrusted variant 0b24e24b93e1 blob: introduce blob_parse_untrusted 6d27336e4a8b blob: refactor attr parsing into separate function 833d25797b16 test: fuzz: add blob_parse crashes 09ee90f8d6ed tests: add test cases for blob parsing 436d6363a10b tests: add libFuzzer based tests bf680707acfd tests: add unit tests covered with Clang sanitizers f804578847de cmake: add more hardening compiler flags 46f8268b4b5b blobmsg/ulog: fix format string compiler warnings eb216a952407 cmake: use extra compiler warnings only on gcc6+ and bumps ABI_VERSION to 20191226. Signed-off-by: Petr Štetiar --- package/libs/libubox/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index d0009ab3de..0e3a433806 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=e7ef39ffe693d6f106aa320268d90a68aebd0a0aa1baa0051d70b3bb1f8a64fc -PKG_SOURCE_DATE:=2019-11-24 -PKG_SOURCE_VERSION:=07413cce72e19520af55dfcbc765484f5ab41dd9 +PKG_MIRROR_HASH:=8072cf0ca0b4de23ad91bffae95a1e3a243ca2e4736e114992d5a7ebc2185235 +PKG_SOURCE_DATE:=2019-12-26 +PKG_SOURCE_VERSION:=eb7eb6393d47a918c420f5b287946dbd6c0d5f57 CMAKE_INSTALL:=1 PKG_LICENSE:=ISC @@ -27,7 +27,7 @@ define Package/libubox SECTION:=libs CATEGORY:=Libraries TITLE:=Basic utility library - ABI_VERSION:=20170601 + ABI_VERSION:=20191226 DEPENDS:= endef From 2544cb1ba377149a8663c7ac4a625d5399993e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 19 Dec 2019 13:25:03 +0100 Subject: [PATCH 137/480] ucert: update to version 2019-12-19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 14a279411cff fix certificate blob parsing vulnerability by using blob_parse_untrusted 19a7225ac018 fix leaking memory in cert_dump_blob 9dba44ddd4f5 fix possibly garbage value returned in cert_process_revoker 4462ff9dedfa add cram based unit tests 5fe64b5606aa cmake: split usign bits into static library 5d7626a2b6d8 cmake: reindent the file e284ed941972 cmake: enable hardening compiler flags and fix the reported issues 7e5390666347 add initial GitLab CI support fa0bf4ef45b1 cmake: add proper include and library dependencies Signed-off-by: Petr Štetiar --- package/system/ucert/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ucert/Makefile b/package/system/ucert/Makefile index 3e8935c9a0..bb095c0f51 100644 --- a/package/system/ucert/Makefile +++ b/package/system/ucert/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ucert.git -PKG_SOURCE_DATE:=2019-11-29 -PKG_SOURCE_VERSION:=e4bd927cc7c756de5f3005824b63a7a6d827e1ee -PKG_MIRROR_HASH:=cc6853e861110dd89cc8bd909c5f02150c2c3f9a77de66017393515644a7ac36 +PKG_SOURCE_DATE:=2019-12-19 +PKG_SOURCE_VERSION:=14a279411cff06f9b1363711df4ec3b5db73f042 +PKG_MIRROR_HASH:=797f35138c6e1099a839e768d9e01db022223884d9e0a6d09965e625caf0ae79 CMAKE_INSTALL:=1 PKG_CHECK_FORMAT_SECURITY:=1 From 7cb018c591453848a50ef7737bdbe5d90aa7a18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 19 Dec 2019 13:29:20 +0100 Subject: [PATCH 138/480] ubus: update to version 2019-12-19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contains following changes: a1523d76b016 fix blob parsing vulnerability by using blob_parse_untrusted c60583743ccf ubus_monitor: workaround possibly false positive uses of memory after it is freed dac6c7c575ac ubusd_monitor: fix possible null pointer dereference 060dfbb26da3 ubus_common: remove duplicate ARRAY_SIZE and add missing include c5f2053dfcfd workaround possibly false positive uses of memory after it is freed 72be8e93f07d lua: ubus_lua_do_subscribe: fix copy&paste error a995b1e68129 lua: workaround false positive dereference of null pointer 08f17c87a000 add fuzzer and cram based unit tests c413be9b376c refactor ubusd.c into reusable ubusd_library afd47189e864 examples: remove dead increments b2e544238672 add initial GitLab CI support 058f4e9526ed libubus: fix incompatible pointer types assigment d2e026a33df8 iron out all extra compiler warnings 5d7ca8309d0a ubusd/libubus-io: fix variable sized struct position warning d61282db5640 ubusd: fix comparison of integers of different signs 90fb16234c22 cmake: enable extra compiler checks and bumps ABI_VERSION to 20191219. Signed-off-by: Petr Štetiar --- package/system/ubus/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index 6653132351..56e17ea83b 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git -PKG_SOURCE_DATE:=2018-10-06 -PKG_SOURCE_VERSION:=221ce7e7ff1bd1a0c9995fa9d32f58e865f7207f -PKG_MIRROR_HASH:=e6ab3f009688740eb6d7a1857df59a6ba10ae8ae0fac78ae0fd6672f71c02dce +PKG_SOURCE_DATE:=2019-12-19 +PKG_SOURCE_VERSION:=a1523d76b016ed46501f61e38ad38999d6c66f52 +PKG_MIRROR_HASH:=f0d46cac85d60e24e3f835c729ee17bb29f0e75c8bd831a86fb3456debd9ad62 CMAKE_INSTALL:=1 PKG_LICENSE:=LGPL-2.1 @@ -36,7 +36,7 @@ define Package/libubus SECTION:=libs CATEGORY:=Libraries DEPENDS:=+libubox - ABI_VERSION:=20170705 + ABI_VERSION:=20191219 TITLE:=OpenWrt RPC client library endef From 0b7d779dcfc57507ab1d06ce6f1052d25e9de017 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 24 Dec 2019 20:49:10 +0300 Subject: [PATCH 139/480] ipq40xx: use ath10k-ct-smallbuffers for 128 MiB devices Signed-off-by: Paul Fertser --- target/linux/ipq40xx/image/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index fada35a49d..1fe563c7a5 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -128,7 +128,8 @@ define Device/asus_rt-ac58u # string and call it a day.... Yeah, we do the latter! UIMAGE_NAME:=$(shell echo -e '\03\01\01\01RT-AC58U') IMAGES := sysupgrade.bin - DEVICE_PACKAGES := kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += asus_rt-ac58u @@ -494,6 +495,7 @@ define Device/zyxel_wre6606 DEVICE_DTS := qcom-ipq4018-wre6606 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata + DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers endef TARGET_DEVICES += zyxel_wre6606 From 3018c4c02f2acc7ed7450fb29851ebf010a49dc9 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 26 Dec 2019 15:14:09 -0300 Subject: [PATCH 140/480] curl: rename cyassl->wolfssl The old name was dropped and no longer works. Signed-off-by: Eneas U de Queiroz --- package/network/utils/curl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 830d5a7192..8ccfaedc46 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.67.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS += \ \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ \ - $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \ + $(if $(CONFIG_LIBCURL_WOLFSSL),--with-wolfssl="$(STAGING_DIR)/usr",--without-wolfssl) \ $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \ $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \ $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \ From d5ede68f8b67f8fa2b4102b90e5dd3722172299a Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 26 Dec 2019 15:11:31 -0300 Subject: [PATCH 141/480] wolfssl: bump to 4.3.0-stable This update fixes many bugs, and six security vulnerabilities, including CVE-2019-18840. Signed-off-by: Eneas U de Queiroz --- package/libs/wolfssl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 3d2a56a97f..cb1ab1b64c 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl -PKG_VERSION:=4.2.0-stable +PKG_VERSION:=4.3.0-stable PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) -PKG_HASH:=3562af485c26cd7abe94d9404fbfc0c5c9bceb4aab29b81ebf5e6c2467507e12 +PKG_HASH:=6896f8ad6c44aff3e583006eeee839600848a0e37118ebbb7514eca9409ae08b PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -44,7 +44,7 @@ define Package/libwolfssl MENU:=1 PROVIDES:=libcyassl DEPENDS:=+WOLFSSL_HAS_DEVCRYPTO:kmod-cryptodev +WOLFSSL_HAS_AFALG:kmod-crypto-user - ABI_VERSION:=23 + ABI_VERSION:=24 endef define Package/libwolfssl/description From 441052f44a19fab38b13c4c31f413bb8a467113f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 6 Nov 2019 16:38:43 +0100 Subject: [PATCH 142/480] kernel: fix kmemleak warnings introduced in 305-mips_module_reloc.patch Physically allocated memory for modules needs to be registered with kmemleak, so it can track it as object. Signed-off-by: Felix Fietkau --- .../pending-4.14/305-mips_module_reloc.patch | 15 +++++++++------ .../pending-4.19/305-mips_module_reloc.patch | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/target/linux/generic/pending-4.14/305-mips_module_reloc.patch b/target/linux/generic/pending-4.14/305-mips_module_reloc.patch index 609a96db49..f1e07e1726 100644 --- a/target/linux/generic/pending-4.14/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.14/305-mips_module_reloc.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -44,14 +44,221 @@ struct mips_hi16 { +@@ -44,14 +44,224 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -187,6 +187,7 @@ Signed-off-by: Felix Fietkau + if (!ptr) + return vmalloc(size); + ++ kmemleak_alloc(ptr, size, 1, GFP_KERNEL); + return ptr; +#endif } @@ -203,10 +204,12 @@ Signed-off-by: Felix Fietkau +/* Free memory returned from module_alloc */ +void module_memfree(void *module_region) +{ -+ if (is_phys_addr(module_region)) ++ if (is_phys_addr(module_region)) { ++ kmemleak_free(module_region); + free_phys(module_region); -+ else ++ } else { + vfree(module_region); ++ } +} + +static void *__module_alloc(int size, bool phys) @@ -269,7 +272,7 @@ Signed-off-by: Felix Fietkau static int apply_r_mips_none(struct module *me, u32 *location, u32 base, Elf_Addr v, bool rela) -@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module +@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module return 0; } @@ -310,7 +313,7 @@ Signed-off-by: Felix Fietkau if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module +@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -332,7 +335,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } diff --git a/target/linux/generic/pending-4.19/305-mips_module_reloc.patch b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch index a8e4e78c91..1f98dfd8ef 100644 --- a/target/linux/generic/pending-4.19/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -44,14 +44,221 @@ struct mips_hi16 { +@@ -44,14 +44,224 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -187,6 +187,7 @@ Signed-off-by: Felix Fietkau + if (!ptr) + return vmalloc(size); + ++ kmemleak_alloc(ptr, size, 1, GFP_KERNEL); + return ptr; +#endif } @@ -203,10 +204,12 @@ Signed-off-by: Felix Fietkau +/* Free memory returned from module_alloc */ +void module_memfree(void *module_region) +{ -+ if (is_phys_addr(module_region)) ++ if (is_phys_addr(module_region)) { ++ kmemleak_free(module_region); + free_phys(module_region); -+ else ++ } else { + vfree(module_region); ++ } +} + +static void *__module_alloc(int size, bool phys) @@ -269,7 +272,7 @@ Signed-off-by: Felix Fietkau static int apply_r_mips_none(struct module *me, u32 *location, u32 base, Elf_Addr v, bool rela) -@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module +@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module return 0; } @@ -310,7 +313,7 @@ Signed-off-by: Felix Fietkau if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module +@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -332,7 +335,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } From ba164533e20e743720502d7abdc76839844c49e6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 27 Dec 2019 15:34:14 +0100 Subject: [PATCH 143/480] mt76: update to the latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2a0a19168dce mt7603: remove vif sta from poll list on interface remove dc14ac64e7f3 mt7615: remove vif sta from poll list on interface remove d868638fdd96 mt76: remove obsolete .add_buf() from struct mt76_queue_ops 50b1e9bd25cd mt76: refactor cc_lock locking scheme 1987b741dac2 mt76: mt76x0: remove 350ms delay in mt76x0_phy_calibrate c93a2d1c1304 mt76: mt76x02u: update ewma pkt len in mt76x02u_tx_prepare_skb 58e1e969f03e mt76: mt7615: remove unneeded semicolon c14d6563c492 mt76: mt76x2e: disable pcie_aspm by default f2be00b1011a mt76: dma: fix buffer unmap with non-linear skbs 20f05897873a mt76: mt76u: rely on usb_interface instead of usb_dev 3cbaf81a185e mt76: mt76u: rely on a dedicated stats workqueue ea19cd7ac6c6 mt76: Remove set but not used variable 'idx' a85c06cec844 mt76: use mt76_dev in mt76_is_{mmio,usb} e0731a82a14f mt76: move SUPPORTS_REORDERING_BUFFER hw property in mt76_register_device cfdb75124e7c mt76: mt7615: add ibss support e2f90adcc3b1 mt76: move interface_modes definition in mt76_core module 5dfb0ec9c6d1 mt76: mt7615: disable radar pattern detector during scanning 7121e163c068 mt76: fix possible out-of-bound access in mt7615_fill_txs/mt7603_fill_txs db78ee08d95e mt76: move mt76_get_antenna in mt76_core module faf5e6fedd7e mt76: mt7615: read {tx,rx} mask from eeprom 44825e88a42d mt76: use rcu_read_lock_bh in mt76_dma_rx_poll af83ee8de928 mt76: move initialization of some struct members to mt76_alloc_device 6493e234b40d mt76: introduce struct mt76_phy ea46624355ec mt76: add support for an extra wiphy in the rx path c5f1e83e30d4 mt76: add support for an extra wiphy in the main tx path 1d8011871458 mt76: add support for an extra wiphy in the tx status path e5e755a7a6b0 mt76: add support for an extra wiphy in mt76_sta_state() ee36c8e2170f mt76: move channel state to struct mt76_phy d246beb23350 mt76: keep a set of software tx queues per phy a3e88bcf17e8 mt76: move state from struct mt76_dev to mt76_phy 9cda51d195db mt76: move chainmask back to driver specific structs df74d6993383 mt76: move txpower_conf back to driver specific structs 9e95fa6208a2 mt76: move txpower and antenna mask to struct mt76_phy 502d09a6e806 mt76: add multiple wiphy support to mt76_get_min_avg_rssi 842cae558b82 mt76: add priv pointer to struct mt76_phy 8ca04846857b mt76: add function for allocating an external wiphy 04cd17a64520 mt76: add ext_phy field to struct mt76_wcid 1c8d69e7d666 mt76: move ampdu_ref from mt76_dev to driver struct e6659d12d01e mt76: mt7615: add dual-phy support for mac80211 ops e5ea72ac7158 mt76: mt7615: add multiple wiphy support for smart carrier sense bdcd45dd04e0 mt76: mt7615: add missing register init for dual-wiphy support 0954c37d015f mt76: mt7615: remove useless MT_HW_RDD0/1 enum 705a0fcdc3a5 mt76: mt7615: add multiple wiphy support to the dfs support code 849fefacc48a mt76: mt7615: rework chainmask handling caa47af1d6f2 mt76: mt7615: add multiple wiphy support to the rx path c5585a735864 mt76: mt7615: initialize dbdc settings on interface add 6265fd1954d7 mt76: mt7615: move radio/mac initialization to .start/stop callbacks 5725d1f919ff mt76: mt7615: select the correct tx queue for frames sent to the second phy 993683d62fb7 mt76: mt7615: add support for registering a second wiphy via debugfs 1456a53ddeb3 mt76: mt7615: update beacon contents on BSS_CHANGED_BEACON ea41ad8bdb36 mt76: mt7615: defer mcu initialization via workqueue 59de6c9447a7 mt7615: replace sta_state callback with sta_add/sta_remove 88db676f8517 mt76: fix rx dma ring descriptor state on reset fff2c07193bb Revert "mt76: use rcu_read_lock_bh in mt76_dma_rx_poll" b3bf83d6da1c mt76: disable bh in mt76_dma_rx_poll efcbee1d8bfc mt76: mt76x0u: do not reset radio on resume 5dc6f6fcc027 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 84554a1fbb9a kernel: fix typos and some coding style in comments a116b0a6afe9 mt76: fix possible undetected invalid MAC address becdec318fce mt76: Off by one in mt76_calc_rx_airtime() 683eb244fa55 mt76: mt7603: reset STA_CCA counter setting the channel 812692db171c mt76: eeprom: add support for big endian eeprom partition 8b362382b10c mt76: mt7615: Fix build with older compilers fc24815a2cb4 mt76: mt7615: report firmware version using ethtool 5cec93d57e6d mt76: mt76x02: fix coverage_class type 9354f0f41d1c mt76: mt7603: set 0 as min coverage_class value a589d095eeb6 mt76: mt7615: add set_coverage class support 257c19f5b56f mt76: clear skb pointers from rx aggregation reorder buffer during cleanup 05c87a33831f mt76: do not overwrite max_tx_fragments if it has been set 05fa07c667f3 mt76: use AC specific reorder timeout 3ef5f3444a94 mt76: mt7615: measure channel noise and report it via survey 726fd501651a mt76: mt7615: increase MCU command timeout 99d8cd03edfa mt76: mt7603: fix input validation issues for powersave-filtered frames 32129af2604d net/wireless: Delete unnecessary checks before the macro call “dev_kfree_skb” 85a8abf80385 mt76: mt76x02: omit beacon slot clearing 8b5d3615e1c8 mt76: mt76x02: split beaconing dc364547d91a mt76: mt76x02: add check for invalid vif idx 462a16e185e4 mt76: mt76x02: remove a copy call for usb speedup fa24aba4c280 mt76: speed up usb bulk copy 6a84ad21306e mt76: mt76x02: add channel switch support for usb interfaces 09fcbc214b10 mt76: usb: use max packet length for m76u_copy 584c0784e019 mt76: mt76x02u: do not set NULL beacons ca17e5657e8a mt76: mt76x02: minor mt76x02_mac_set_beacon optimization d5fdd2e7ced8 mt76: mt7615: fix MT7615_CFEND_RATE_DEFAULT value ae25a4bf99a9 mt76: mt7615: introduce LED support cd759b00cc06 mt76: mt76x02: simplify led reg definitions cf00467c5de4 mt76: mt7603: simplify led reg definitions 1c8e76f4de3e mt76: fix compilation warning in mt76_eeprom_override() 960f5cc2390b mt76: mt76u: fix endpoint definition order 15e1c29ed8e3 mt76: mt7615: add missing settings for simultaneous dual-band support e09b9f61eeb3 mt76: mt7615: rework set_channel function 4cb1195a1530 mt76: mt7615: add set_antenna callback Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 04c1761d88..7de2d42868 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2019-10-10 -PKG_SOURCE_VERSION:=d3a589586d1b1d9e1422e31f642a500ff0195f20 -PKG_MIRROR_HASH:=46df12037db0d3438cb0ae97cded24a6562502d5cbd2d6d6d4e72ca807b0407e +PKG_SOURCE_DATE:=2019-12-27 +PKG_SOURCE_VERSION:=4cb1195a153087d84995f410285c8ecb587b1456 +PKG_MIRROR_HASH:=921533be9935155cdde6aaa71cd6f0de2b03948da432c5be11b33756dcffb0c9 PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 From ea980fb9c6de24350976dcc6c20da2bed5fc8cb8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 27 Dec 2019 15:41:12 +0100 Subject: [PATCH 144/480] wireguard: bump to 20191226 As announced on the mailing list, WireGuard will be in Linux 5.6. As a result, the wg(8) tool, used by OpenWRT in the same manner as ip(8), is moving to its own wireguard-tools repo. Meanwhile, the out-of-tree kernel module for kernels 3.10 - 5.5 moved to its own wireguard-linux- compat repo. Yesterday, releases were cut out of these repos, so this commit bumps packages to match. Since wg(8) and the compat kernel module are versioned and released separately, we create a wireguard-tools Makefile to contain the source for the new tools repo. Later, when OpenWRT moves permanently to Linux 5.6, we'll drop the original module package, leaving only the tools. So this commit shuffles the build definition around a bit but is basically the same idea as before. Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 41 +++----------- .../network/utils/wireguard-tools/Makefile | 54 +++++++++++++++++++ .../wireguard-tools}/files/wireguard.sh | 0 .../wireguard-tools}/files/wireguard_watchdog | 0 4 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 package/network/utils/wireguard-tools/Makefile rename package/network/{services/wireguard => utils/wireguard-tools}/files/wireguard.sh (100%) rename package/network/{services/wireguard => utils/wireguard-tools}/files/wireguard_watchdog (100%) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 2849361733..c379b712dd 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2016-2018 Jason A. Donenfeld +# Copyright (C) 2016-2019 Jason A. Donenfeld # Copyright (C) 2016 Baptiste Jonglez # Copyright (C) 2016-2017 Dan Luedtke # @@ -11,17 +11,17 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20191219 +PKG_VERSION:=0.0.20191226 PKG_RELEASE:=1 -PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ -PKG_HASH:=5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7 +PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ +PKG_HASH:=7c0e576459c6337bcdea692bdbec561719a15da207dc739e0e3e60ff821a5491 -PKG_LICENSE:=GPL-2.0 Apache-2.0 +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/WireGuard-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/wireguard-linux-compat-$(PKG_VERSION) PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 @@ -56,13 +56,8 @@ endef include $(INCLUDE_DIR)/kernel-defaults.mk include $(INCLUDE_DIR)/package-defaults.mk -# Used by Build/Compile/Default -MAKE_PATH:=src/tools -MAKE_VARS += PLATFORM=linux - define Build/Compile $(MAKE) $(KERNEL_MAKEOPTS) M="$(PKG_BUILD_DIR)/src" modules - $(call Build/Compile/Default) endef define Package/wireguard/install @@ -73,27 +68,6 @@ define Package/wireguard/description $(call Package/wireguard/Default/description) endef -define Package/wireguard-tools - $(call Package/wireguard/Default) - TITLE:=WireGuard userspace control program (wg) - DEPENDS:=+libmnl +ip -endef - -define Package/wireguard-tools/description - $(call Package/wireguard/Default/description) - - This package provides the userspace control program for WireGuard, - `wg(8)`, a netifd protocol helper, and a re-resolve watchdog script. -endef - -define Package/wireguard-tools/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/wg $(1)/usr/bin/ - $(INSTALL_BIN) ./files/wireguard_watchdog $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/lib/netifd/proto/ - $(INSTALL_BIN) ./files/wireguard.sh $(1)/lib/netifd/proto/ -endef - define KernelPackage/wireguard SECTION:=kernel CATEGORY:=Kernel modules @@ -111,5 +85,4 @@ define KernelPackage/wireguard/description endef $(eval $(call BuildPackage,wireguard)) -$(eval $(call BuildPackage,wireguard-tools)) $(eval $(call KernelPackage,wireguard)) diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile new file mode 100644 index 0000000000..2f6d307094 --- /dev/null +++ b/package/network/utils/wireguard-tools/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2016-2019 Jason A. Donenfeld +# Copyright (C) 2016 Baptiste Jonglez +# Copyright (C) 2016-2017 Dan Luedtke +# +# 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:=wireguard-tools + +PKG_VERSION:=1.0.20191226 +PKG_RELEASE:=1 + +PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ +PKG_HASH:=aa8af0fdc9872d369d8c890a84dbc2a2466b55795dccd5b47721b2d97644b04f + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING + +PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/package-defaults.mk + +MAKE_PATH:=src +MAKE_VARS += PLATFORM=linux + +define Package/wireguard-tools + $(call Package/wireguard/Default) + TITLE:=WireGuard userspace control program (wg) + DEPENDS:=+libmnl +ip +endef + +define Package/wireguard-tools/description + $(call Package/wireguard/Default/description) + + This package provides the userspace control program for WireGuard, + `wg(8)`, a netifd protocol helper, and a re-resolve watchdog script. +endef + +define Package/wireguard-tools/install + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wg $(1)/usr/bin/ + $(INSTALL_BIN) ./files/wireguard_watchdog $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/lib/netifd/proto/ + $(INSTALL_BIN) ./files/wireguard.sh $(1)/lib/netifd/proto/ +endef + +$(eval $(call BuildPackage,wireguard-tools)) diff --git a/package/network/services/wireguard/files/wireguard.sh b/package/network/utils/wireguard-tools/files/wireguard.sh similarity index 100% rename from package/network/services/wireguard/files/wireguard.sh rename to package/network/utils/wireguard-tools/files/wireguard.sh diff --git a/package/network/services/wireguard/files/wireguard_watchdog b/package/network/utils/wireguard-tools/files/wireguard_watchdog similarity index 100% rename from package/network/services/wireguard/files/wireguard_watchdog rename to package/network/utils/wireguard-tools/files/wireguard_watchdog From 09d38a3bc328d122b0d84fcf6bb53d2bce7373b6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 22 Dec 2019 16:51:19 +0100 Subject: [PATCH 145/480] ramips: remove bogus ralink,mtd-eeprom with offset 0x4 Several devices in mt76x8 subtarget use the following line to set up wmac in their DTS(I) files: ralink,mtd-eeprom = <&factory 0x4> This is strange for several reasons: - They should use mediatek,mtd-eeprom on this SOC - The caldata is supposed to start at 0x0 - The parent DTSI mt7628an.dtsi specifies mediatek,mtd-eeprom anyway, starting from 0x0 - The offset coincides with the default location of the MAC address in caldata Based on the comment in b28e94d4bfa1 ("ramips: MiWiFi Nano fixes"), it looks like the author for this device wanted to actually use mtd-mac-address instead of ralink,mtd-eeprom. A check on the same device revealed that actually the MAC address start at offset 4 there, so the correct caldata offset is 0x0. Based on these findings, and the fact that the expected location on this SOC is 0x0, we remove the "ralink,mtd-eeprom = <&factory 0x4>" statement from all devices in ramips (being only mt7628an anyway). Thanks to Sungbo Eo for finding and researching this. Reported-by: Sungbo Eo Fixes: b28e94d4bfa1 ("ramips: MiWiFi Nano fixes") Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7628an_cudy_wr1000.dts | 1 - target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts | 1 - target/linux/ramips/dts/mt7628an_totolink_lr1200.dts | 1 - target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi | 1 - target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts | 1 - target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts | 1 - target/linux/ramips/mt76x8/base-files/etc/board.d/02_network | 4 ++-- 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index 2d70e1225b..acaffecf8d 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -132,7 +132,6 @@ &wmac { status = "okay"; - ralink,mtd-eeprom = <&factory 0x4>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts index 66e6c94b31..01fe7025bb 100644 --- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts +++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts @@ -93,5 +93,4 @@ &wmac { status = "okay"; - ralink,mtd-eeprom = <&factory 0x4>; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts index 1e99ba368a..55c1ff03e3 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts @@ -108,7 +108,6 @@ &wmac { status = "okay"; - ralink,mtd-eeprom = <&factory 0x4>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi index 918951c35f..a0056dcedb 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi @@ -21,7 +21,6 @@ &wmac { status = "okay"; - ralink,mtd-eeprom = <&factory 0x4>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index bd3fc967f1..92bb8b7288 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -68,7 +68,6 @@ &wmac { status = "okay"; - ralink,mtd-eeprom = <&factory 0x4>; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index e537be0a80..b558a0057f 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -103,7 +103,6 @@ &wmac { status = "okay"; - ralink,mtd-eeprom = <&factory 0x4>; }; ðernet { diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index df795e5a36..90eec9c8a0 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -134,7 +134,7 @@ ramips_setup_macs() ;; cudy,wr1000) wan_mac=$(mtd_get_mac_binary factory 0x2e) - label_mac=$(mtd_get_mac_binary factory 0x8) + label_mac=$(mtd_get_mac_binary factory 0x4) ;; duzun,dm06|\ netgear,r6120|\ @@ -193,7 +193,7 @@ ramips_setup_macs() ;; vocore,vocore2|\ vocore,vocore2-lite) - label_mac=$(mtd_get_mac_binary factory 0x8) + label_mac=$(mtd_get_mac_binary factory 0x4) ;; wavlink,wl-wn570ha1|\ zbtlink,zbt-we1226) From 9c7025b7794ae06774632499547f78d827d13499 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 21 Dec 2019 01:07:06 +0100 Subject: [PATCH 146/480] ipq40xx: build DEVICE_DTS based on SOC and device name This patch uses the SOC variable to calculate DTS names automatically based on the SOC and the device definition node name. This reduces redundancy and (by having to choose DTS name appropriately) will unify the naming of a device in different places (image/Makefile, DTS name, compatible, image name). This is supposed to make life easier for developers and reviewers. Since the kernel uses a "soc-device.dts" scheme for this target, we use this for the derivation of DEVICE_DTS, too, and rename the files not having followed it so far. Note that for some devices the kernel itself is inconsistent, leaving us with a manual overwrite for ap.dk01.1-c1 and ap.dk04.1-c1. Signed-off-by: Adrian Schmutzler --- ...040.dts => qcom-ipq4018-fritzbox-4040.dts} | 0 ...0ac-c1.dts => qcom-ipq4019-e2600ac-c1.dts} | 2 +- ...0ac-c2.dts => qcom-ipq4019-e2600ac-c2.dts} | 2 +- ...e2600ac.dtsi => qcom-ipq4019-e2600ac.dtsi} | 0 ...sys_ea8300.dts => qcom-ipq4019-ea8300.dts} | 0 ...040.dts => qcom-ipq4018-fritzbox-4040.dts} | 0 ...0ac-c1.dts => qcom-ipq4019-e2600ac-c1.dts} | 2 +- ...0ac-c2.dts => qcom-ipq4019-e2600ac-c2.dts} | 2 +- ...e2600ac.dtsi => qcom-ipq4019-e2600ac.dtsi} | 0 ...sys_ea8300.dts => qcom-ipq4019-ea8300.dts} | 0 ...019-32m.dts => qcom-ipq4019-u4019-32m.dts} | 2 +- ...lec-u4019.dtsi => qcom-ipq4019-u4019.dtsi} | 0 target/linux/ipq40xx/image/Makefile | 55 ++++++++++--------- .../901-arm-boot-add-dts-files.patch | 8 +-- .../901-arm-boot-add-dts-files.patch | 10 ++-- 15 files changed, 42 insertions(+), 41 deletions(-) rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4018-fritz4040.dts => qcom-ipq4018-fritzbox-4040.dts} (100%) rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4019-qxwlan-e2600ac-c1.dts => qcom-ipq4019-e2600ac-c1.dts} (97%) rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4019-qxwlan-e2600ac-c2.dts => qcom-ipq4019-e2600ac-c2.dts} (97%) rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4019-qxwlan-e2600ac.dtsi => qcom-ipq4019-e2600ac.dtsi} (100%) rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4019-linksys_ea8300.dts => qcom-ipq4019-ea8300.dts} (100%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4018-fritz4040.dts => qcom-ipq4018-fritzbox-4040.dts} (100%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4019-qxwlan-e2600ac-c1.dts => qcom-ipq4019-e2600ac-c1.dts} (97%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4019-qxwlan-e2600ac-c2.dts => qcom-ipq4019-e2600ac-c2.dts} (97%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4019-qxwlan-e2600ac.dtsi => qcom-ipq4019-e2600ac.dtsi} (100%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4019-linksys_ea8300.dts => qcom-ipq4019-ea8300.dts} (100%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4019-unielec-u4019-32m.dts => qcom-ipq4019-u4019-32m.dts} (97%) rename target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/{qcom-ipq4019-unielec-u4019.dtsi => qcom-ipq4019-u4019.dtsi} (100%) diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts similarity index 100% rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts similarity index 97% rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts index d5ee068c9f..8db5588492 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts @@ -4,7 +4,7 @@ * */ -#include "qcom-ipq4019-qxwlan-e2600ac.dtsi" +#include "qcom-ipq4019-e2600ac.dtsi" #include #include diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts similarity index 97% rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts index 09ebde99ca..d88de61379 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts @@ -4,7 +4,7 @@ * */ -#include "qcom-ipq4019-qxwlan-e2600ac.dtsi" +#include "qcom-ipq4019-e2600ac.dtsi" #include #include diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi similarity index 100% rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts similarity index 100% rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts similarity index 100% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts similarity index 97% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts index ab0ec76f16..df1df2529a 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c1.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts @@ -4,7 +4,7 @@ * */ -#include "qcom-ipq4019-qxwlan-e2600ac.dtsi" +#include "qcom-ipq4019-e2600ac.dtsi" #include #include diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts similarity index 97% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts index 1c6e859951..9348ef4eec 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac-c2.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts @@ -4,7 +4,7 @@ * */ -#include "qcom-ipq4019-qxwlan-e2600ac.dtsi" +#include "qcom-ipq4019-e2600ac.dtsi" #include #include diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi similarity index 100% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-qxwlan-e2600ac.dtsi rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts similarity index 100% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-linksys_ea8300.dts rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019-32m.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019-32m.dts similarity index 97% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019-32m.dts rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019-32m.dts index 606ac165ba..63fbfb65c1 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019-32m.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019-32m.dts @@ -2,7 +2,7 @@ /dts-v1/; -#include "qcom-ipq4019-unielec-u4019.dtsi" +#include "qcom-ipq4019-u4019.dtsi" #include #include diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi similarity index 100% rename from target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-unielec-u4019.dtsi rename to target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 1fe563c7a5..f68a8d5288 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -9,6 +9,7 @@ define Device/Default KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_LOADADDR := 0x80208000 + DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin/squashfs := @@ -65,13 +66,13 @@ define Device/8dev_jalapeno-common $(call Device/UbiFit) BLOCKSIZE := 128k PAGESIZE := 2048 + SOC := qcom-ipq4018 endef define Device/8dev_jalapeno $(call Device/8dev_jalapeno-common) DEVICE_VENDOR := 8devices DEVICE_MODEL := Jalapeno - DEVICE_DTS := qcom-ipq4018-jalapeno endef TARGET_DEVICES += 8dev_jalapeno @@ -80,7 +81,7 @@ define Device/alfa-network_ap120c-ac $(call Device/UbiFit) DEVICE_VENDOR := ALFA Network DEVICE_MODEL := AP120C-AC - DEVICE_DTS := qcom-ipq4018-ap120c-ac + SOC := qcom-ipq4018 DEVICE_PACKAGES := kmod-usb-acm \ kmod-tpm-i2c-atmel uboot-envtools BLOCKSIZE := 128k @@ -95,7 +96,7 @@ define Device/aruba_ap-303 $(call Device/FitImageLzma) DEVICE_VENDOR := Aruba DEVICE_MODEL := AP-303 - DEVICE_DTS := qcom-ipq4029-ap-303 + SOC := qcom-ipq4029 DEVICE_PACKAGES := ipq-wifi-aruba_ap-303 IMAGES := sysupgrade.bin endef @@ -105,7 +106,7 @@ define Device/asus_map-ac2200 $(call Device/FitImageLzma) DEVICE_VENDOR := ASUS DEVICE_MODEL := Lyra (MAP-AC2200) - DEVICE_DTS := qcom-ipq4019-map-ac2200 + SOC := qcom-ipq4019 IMAGES := sysupgrade.bin DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-ath3k endef @@ -115,7 +116,7 @@ define Device/asus_rt-ac58u $(call Device/FitImageLzma) DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC58U - DEVICE_DTS := qcom-ipq4018-rt-ac58u + SOC := qcom-ipq4018 BLOCKSIZE := 128k PAGESIZE := 2048 DTB_SIZE := 65536 @@ -137,7 +138,7 @@ define Device/avm_fritzbox-4040 $(call Device/FitImageLzma) DEVICE_VENDOR := AVM DEVICE_MODEL := FRITZ!Box 4040 - DEVICE_DTS := qcom-ipq4018-fritz4040 + SOC := qcom-ipq4018 BOARD_NAME := fritz4040 IMAGE_SIZE := 29056k UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-fritz4040.bin @@ -153,7 +154,7 @@ define Device/avm_fritzbox-7530 $(call Device/FitImageLzma) DEVICE_VENDOR := AVM DEVICE_MODEL := FRITZ!Box 7530 - DEVICE_DTS := qcom-ipq4019-fritzbox-7530 + SOC := qcom-ipq4019 DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand IMAGES := sysupgrade.bin endef @@ -163,7 +164,7 @@ define Device/avm_fritzrepeater-1200 $(call Device/FitImageLzma) DEVICE_VENDOR := AVM DEVICE_MODEL := FRITZ!Repeater 1200 - DEVICE_DTS := qcom-ipq4019-fritzrepeater-1200 + SOC := qcom-ipq4019 DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand ipq-wifi-avm_fritzrepeater-1200 IMAGES := sysupgrade.bin endef @@ -173,7 +174,7 @@ define Device/avm_fritzrepeater-3000 $(call Device/FitImageLzma) DEVICE_VENDOR := AVM DEVICE_MODEL := FRITZ!Repeater 3000 - DEVICE_DTS := qcom-ipq4019-fritzrepeater-3000 + SOC := qcom-ipq4019 DEVICE_PACKAGES := ath10k-firmware-qca9984-ct fritz-caldata fritz-tffs-nand IMAGES := sysupgrade.bin endef @@ -181,7 +182,6 @@ TARGET_DEVICES += avm_fritzrepeater-3000 define Device/cilab_meshpoint-one $(call Device/8dev_jalapeno-common) - DEVICE_DTS := qcom-ipq4018-meshpoint-one DEVICE_VENDOR := Crisis Innovation Lab DEVICE_MODEL := MeshPoint.One DEVICE_PACKAGES := kmod-i2c-gpio kmod-iio-bmp280-i2c kmod-hwmon-ina2xx kmod-rtc-pcf2127 @@ -193,7 +193,7 @@ define Device/compex_wpj419 $(call Device/UbiFit) DEVICE_VENDOR := Compex DEVICE_MODEL := WPJ419 - DEVICE_DTS := qcom-ipq4019-wpj419 + SOC := qcom-ipq4019 DEVICE_DTS_CONFIG := config@12 KERNEL_INSTALL := 1 BLOCKSIZE := 128k @@ -206,7 +206,7 @@ define Device/compex_wpj428 $(call Device/FitImage) DEVICE_VENDOR := Compex DEVICE_MODEL := WPJ428 - DEVICE_DTS := qcom-ipq4028-wpj428 + SOC := qcom-ipq4028 DEVICE_DTS_CONFIG := config@4 BLOCKSIZE := 64k IMAGE_SIZE := 31232k @@ -223,7 +223,7 @@ define Device/engenius_eap1300 DEVICE_MODEL := EAP1300 DEVICE_DTS_CONFIG := config@4 BOARD_NAME := eap1300 - DEVICE_DTS := qcom-ipq4018-eap1300 + SOC := qcom-ipq4018 KERNEL_SIZE := 5120k IMAGE_SIZE := 25344k IMAGES := sysupgrade.bin @@ -235,7 +235,7 @@ define Device/engenius_ens620ext $(call Device/FitImage) DEVICE_VENDOR := EnGenius DEVICE_MODEL := ENS620EXT - DEVICE_DTS := qcom-ipq4018-ens620ext + SOC := qcom-ipq4018 DEVICE_DTS_CONFIG := config@4 BLOCKSIZE := 64k PAGESIZE := 256 @@ -262,7 +262,7 @@ define Device/glinet_gl-b1300 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-B1300 BOARD_NAME := gl-b1300 - DEVICE_DTS := qcom-ipq4029-gl-b1300 + SOC := qcom-ipq4029 KERNEL_SIZE := 4096k IMAGE_SIZE := 26624k IMAGES := sysupgrade.bin @@ -295,7 +295,7 @@ define Device/linksys_ea6350v3 DEVICE_VENDOR := Linksys DEVICE_MODEL := EA6350 DEVICE_VARIANT := v3 - DEVICE_DTS := qcom-ipq4018-ea6350v3 + SOC := qcom-ipq4018 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 3072k @@ -311,7 +311,7 @@ define Device/linksys_ea8300 $(call Device/FitzImage) DEVICE_VENDOR := Linksys DEVICE_MODEL := EA8300 - DEVICE_DTS := qcom-ipq4019-linksys_ea8300 + SOC := qcom-ipq4019 KERNEL_SIZE := 3072k IMAGE_SIZE := 87040k BLOCKSIZE := 128k @@ -327,7 +327,7 @@ define Device/meraki_mr33 $(call Device/FitImage) DEVICE_VENDOR := Cisco Meraki DEVICE_MODEL := MR33 - DEVICE_DTS := qcom-ipq4029-mr33 + SOC := qcom-ipq4029 BLOCKSIZE := 128k PAGESIZE := 2048 IMAGES = sysupgrade.bin @@ -340,6 +340,7 @@ define Device/netgear_ex61x0v2 DEVICE_DTS_CONFIG := config@4 NETGEAR_BOARD_ID := EX6150v2series NETGEAR_HW_ID := 29765285+16+0+128+2x2 + SOC := qcom-ipq4018 endef define Device/netgear_ex6100v2 @@ -347,7 +348,6 @@ define Device/netgear_ex6100v2 DEVICE_VENDOR := Netgear DEVICE_MODEL := EX6100 DEVICE_VARIANT := v2 - DEVICE_DTS := qcom-ipq4018-ex6100v2 endef TARGET_DEVICES += netgear_ex6100v2 @@ -356,7 +356,6 @@ define Device/netgear_ex6150v2 DEVICE_VENDOR := Netgear DEVICE_MODEL := EX6150 DEVICE_VARIANT := v2 - DEVICE_DTS := qcom-ipq4018-ex6150v2 endef TARGET_DEVICES += netgear_ex6150v2 @@ -364,7 +363,7 @@ define Device/openmesh_a42 $(call Device/FitImageLzma) DEVICE_VENDOR := OpenMesh DEVICE_MODEL := A42 - DEVICE_DTS := qcom-ipq4018-a42 + SOC := qcom-ipq4018 DEVICE_DTS_CONFIG := config@om.a42 BLOCKSIZE := 64k KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) @@ -380,7 +379,7 @@ define Device/openmesh_a62 $(call Device/FitImageLzma) DEVICE_VENDOR := OpenMesh DEVICE_MODEL := A62 - DEVICE_DTS := qcom-ipq4019-a62 + SOC := qcom-ipq4019 DEVICE_DTS_CONFIG := config@om.a62 BLOCKSIZE := 64k KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) @@ -398,6 +397,7 @@ define Device/qcom_ap-dk01.1-c1 DEVICE_MODEL := AP-DK01.1 DEVICE_VARIANT := C1 BOARD_NAME := ap-dk01.1-c1 + SOC := qcom-ipq4019 DEVICE_DTS := qcom-ipq4019-ap.dk01.1-c1 KERNEL_INSTALL := 1 KERNEL_SIZE := 4096k @@ -414,6 +414,7 @@ define Device/qcom_ap-dk04.1-c1 DEVICE_VENDOR := Qualcomm Atheros DEVICE_MODEL := AP-DK04.1 DEVICE_VARIANT := C1 + SOC := qcom-ipq4019 DEVICE_DTS := qcom-ipq4019-ap.dk04.1-c1 KERNEL_INSTALL := 1 KERNEL_SIZE := 4048k @@ -429,7 +430,7 @@ define Device/qxwlan_e2600ac-c1 DEVICE_MODEL := E2600AC DEVICE_VARIANT := C1 BOARD_NAME := e2600ac-c1 - DEVICE_DTS := qcom-ipq4019-qxwlan-e2600ac-c1 + SOC := qcom-ipq4019 KERNEL_SIZE := 4096k IMAGE_SIZE := 31232k IMAGES := sysupgrade.bin @@ -444,7 +445,7 @@ define Device/qxwlan_e2600ac-c2 DEVICE_VENDOR := Qxwlan DEVICE_MODEL := E2600AC DEVICE_VARIANT := C2 - DEVICE_DTS := qcom-ipq4019-qxwlan-e2600ac-c2 + SOC := qcom-ipq4019 KERNEL_INSTALL := 1 BLOCKSIZE := 128k PAGESIZE := 2048 @@ -458,7 +459,7 @@ define Device/unielec_u4019-32m DEVICE_MODEL := U4019 DEVICE_VARIANT := 32M BOARD_NAME := u4019-32m - DEVICE_DTS := qcom-ipq4019-unielec-u4019-32m + SOC := qcom-ipq4019 KERNEL_SIZE := 4096k IMAGE_SIZE := 31232k IMAGES := sysupgrade.bin @@ -470,7 +471,7 @@ define Device/zyxel_nbg6617 $(call Device/FitImageLzma) DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG6617 - DEVICE_DTS := qcom-ipq4018-nbg6617 + SOC := qcom-ipq4018 ROOTFS_SIZE := 24960k RAS_BOARD := NBG6617 RAS_ROOTFS_SIZE := 19840k @@ -492,7 +493,7 @@ define Device/zyxel_wre6606 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := WRE6606 DEVICE_DTS_CONFIG := config@4 - DEVICE_DTS := qcom-ipq4018-wre6606 + SOC := qcom-ipq4018 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers diff --git a/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch index f7efd415f1..6c1ed49cde 100644 --- a/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch @@ -21,7 +21,7 @@ Signed-off-by: John Crispin + qcom-ipq4018-ens620ext.dtb \ + qcom-ipq4018-ex6100v2.dtb \ + qcom-ipq4018-ex6150v2.dtb \ -+ qcom-ipq4018-fritz4040.dtb \ ++ qcom-ipq4018-fritzbox-4040.dtb \ + qcom-ipq4018-jalapeno.dtb \ + qcom-ipq4018-nbg6617.dtb \ + qcom-ipq4018-rt-ac58u.dtb \ @@ -32,10 +32,10 @@ Signed-off-by: John Crispin + qcom-ipq4019-fritzbox-7530.dtb \ + qcom-ipq4019-fritzrepeater-1200.dtb \ + qcom-ipq4019-fritzrepeater-3000.dtb \ -+ qcom-ipq4019-linksys_ea8300.dtb \ ++ qcom-ipq4019-ea8300.dtb \ + qcom-ipq4019-map-ac2200.dtb \ -+ qcom-ipq4019-qxwlan-e2600ac-c1.dtb \ -+ qcom-ipq4019-qxwlan-e2600ac-c2.dtb \ ++ qcom-ipq4019-e2600ac-c1.dtb \ ++ qcom-ipq4019-e2600ac-c2.dtb \ + qcom-ipq4028-wpj428.dtb \ + qcom-ipq4029-gl-b1300.dtb \ + qcom-ipq4029-mr33.dtb \ diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch index 52484b3dd3..8e97b3b51b 100644 --- a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch @@ -21,7 +21,7 @@ Signed-off-by: John Crispin + qcom-ipq4018-ens620ext.dtb \ + qcom-ipq4018-ex6100v2.dtb \ + qcom-ipq4018-ex6150v2.dtb \ -+ qcom-ipq4018-fritz4040.dtb \ ++ qcom-ipq4018-fritzbox-4040.dtb \ + qcom-ipq4018-jalapeno.dtb \ + qcom-ipq4018-meshpoint-one.dtb \ + qcom-ipq4018-nbg6617.dtb \ @@ -36,11 +36,11 @@ Signed-off-by: John Crispin + qcom-ipq4019-fritzbox-7530.dtb \ + qcom-ipq4019-fritzrepeater-1200.dtb \ + qcom-ipq4019-fritzrepeater-3000.dtb \ -+ qcom-ipq4019-linksys_ea8300.dtb \ ++ qcom-ipq4019-ea8300.dtb \ + qcom-ipq4019-map-ac2200.dtb \ -+ qcom-ipq4019-qxwlan-e2600ac-c1.dtb \ -+ qcom-ipq4019-qxwlan-e2600ac-c2.dtb \ -+ qcom-ipq4019-unielec-u4019-32m.dtb \ ++ qcom-ipq4019-e2600ac-c1.dtb \ ++ qcom-ipq4019-e2600ac-c2.dtb \ ++ qcom-ipq4019-u4019-32m.dtb \ + qcom-ipq4019-wpj419.dtb \ + qcom-ipq4028-wpj428.dtb \ + qcom-ipq4029-ap-303.dtb \ From e0382e88a919d342dd6fbf07971ceab15d0b6aaf Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 21 Dec 2019 01:16:49 +0100 Subject: [PATCH 147/480] ipq806x: build DEVICE_DTS based on SOC and device name This patch uses the SOC variable to calculate DTS names automatically based on the SOC and the device definition node name. This reduces redundancy and (by having to choose DTS name appropriately) will unify the naming of a device in different places (image/Makefile, DTS name, compatible, image name). This is supposed to make life easier for developers and reviewers. Since the kernel uses a "soc-device.dts" scheme for this target, we use this for the derivation of DEVICE_DTS, too, leaving the DTS names unchanged for this target. Note that for some devices the kernel itself uses inconsistent names (DTS naming scheme vs. compatible), leaving us with a manual overwrite of DEVICE_DTS for those cases. Signed-off-by: Adrian Schmutzler --- target/linux/ipq806x/image/Makefile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 81f14b4756..33f68b7a60 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -16,6 +16,7 @@ define Device/Default KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_LOADADDR = 0x42208000 + DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin/squashfs := @@ -81,7 +82,7 @@ endef define Device/buffalo_wxr-2533dhp $(call Device/LegacyImage) - DEVICE_DTS := qcom-ipq8064-wxr-2533dhp + SOC := qcom-ipq8064 DEVICE_VENDOR := Buffalo DEVICE_MODEL := WXR-2533DHP BLOCKSIZE := 128k @@ -102,7 +103,7 @@ define Device/compex_wpq864 DEVICE_MODEL := WPQ864 BLOCKSIZE := 128k PAGESIZE := 2048 - DEVICE_DTS := qcom-ipq8064-wpq864 + SOC := qcom-ipq8064 DEVICE_PACKAGES := kmod-gpio-beeper endef TARGET_DEVICES += compex_wpq864 @@ -111,7 +112,7 @@ define Device/linksys_ea8500 $(call Device/LegacyImage) DEVICE_VENDOR := Linksys DEVICE_MODEL := EA8500 - DEVICE_DTS := qcom-ipq8064-ea8500 + SOC := qcom-ipq8064 PAGESIZE := 2048 BLOCKSIZE := 128k KERNEL_SIZE := 3072k @@ -129,7 +130,7 @@ define Device/nec_wg2600hp $(call Device/LegacyImage) DEVICE_VENDOR := NEC DEVICE_MODEL := Aterm WG2600HP - DEVICE_DTS := qcom-ipq8064-wg2600hp + SOC := qcom-ipq8064 BLOCKSIZE := 64k BOARD_NAME := wg2600hp IMAGES := sysupgrade.bin @@ -142,7 +143,7 @@ define Device/netgear_d7800 $(call Device/DniImage) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := Nighthawk X4 D7800 - DEVICE_DTS := qcom-ipq8064-d7800 + SOC := qcom-ipq8064 KERNEL_SIZE := 4096k NETGEAR_BOARD_ID := D7800 NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4 @@ -159,7 +160,7 @@ define Device/netgear_r7500 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := Nighthawk X4 R7500 DEVICE_VARIANT := v1 - DEVICE_DTS := qcom-ipq8064-r7500 + SOC := qcom-ipq8064 KERNEL_SIZE := 4096k NETGEAR_BOARD_ID := R7500 NETGEAR_HW_ID := 29764841+0+128+256+3x3+4x4 @@ -176,7 +177,7 @@ define Device/netgear_r7500v2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := Nighthawk X4 R7500 DEVICE_VARIANT := v2 - DEVICE_DTS := qcom-ipq8064-r7500v2 + SOC := qcom-ipq8064 KERNEL_SIZE := 4096k NETGEAR_BOARD_ID := R7500v2 NETGEAR_HW_ID := 29764958+0+128+512+3x3+4x4 @@ -192,7 +193,7 @@ define Device/netgear_r7800 $(call Device/DniImage) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := Nighthawk X4S R7800 - DEVICE_DTS := qcom-ipq8065-r7800 + SOC := qcom-ipq8065 KERNEL_SIZE := 4096k NETGEAR_BOARD_ID := R7800 NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4+cascade @@ -210,6 +211,7 @@ define Device/qcom_ipq8064-ap148 DEVICE_VENDOR := Qualcomm DEVICE_MODEL := AP148 DEVICE_VARIANT := standard + SOC := qcom-ipq8064 DEVICE_DTS := qcom-ipq8064-ap148 KERNEL_INSTALL := 1 BLOCKSIZE := 128k @@ -226,6 +228,7 @@ define Device/qcom_ipq8064-ap148-legacy DEVICE_VENDOR := Qualcomm DEVICE_MODEL := AP148 DEVICE_VARIANT := legacy + SOC := qcom-ipq8064 DEVICE_DTS := qcom-ipq8064-ap148 BLOCKSIZE := 128k PAGESIZE := 2048 @@ -240,6 +243,7 @@ define Device/qcom_ipq8064-ap161 $(call Device/UbiFit) DEVICE_VENDOR := Qualcomm DEVICE_MODEL := AP161 + SOC := qcom-ipq8064 DEVICE_DTS := qcom-ipq8064-ap161 KERNEL_INSTALL := 1 BLOCKSIZE := 128k @@ -253,6 +257,7 @@ define Device/qcom_ipq8064-db149 $(call Device/FitImage) DEVICE_VENDOR := Qualcomm DEVICE_MODEL := DB149 + SOC := qcom-ipq8064 DEVICE_DTS := qcom-ipq8064-db149 KERNEL_INSTALL := 1 BOARD_NAME := db149 @@ -265,7 +270,7 @@ define Device/tplink_c2600 DEVICE_VENDOR := TP-Link DEVICE_MODEL := Archer C2600 DEVICE_VARIANT := v1 - DEVICE_DTS := qcom-ipq8064-c2600 + SOC := qcom-ipq8064 BLOCKSIZE := 128k PAGESIZE := 2048 BOARD_NAME := c2600 @@ -283,7 +288,7 @@ define Device/tplink_vr2600v KERNEL = kernel-bin | append-dtb | uImage none KERNEL_NAME := zImage KERNEL_SIZE := 3072k - DEVICE_DTS := qcom-ipq8064-vr2600v + SOC := qcom-ipq8064 BLOCKSIZE := 128k PAGESIZE := 2048 BOARD_NAME := vr2600v @@ -297,7 +302,7 @@ TARGET_DEVICES += tplink_vr2600v define Device/zyxel_nbg6817 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG6817 - DEVICE_DTS := qcom-ipq8065-nbg6817 + SOC := qcom-ipq8065 KERNEL_SIZE := 4096k BLOCKSIZE := 64k BOARD_NAME := nbg6817 From b2d10977a860f34e003ed158d6d208f431a14579 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 27 Dec 2019 19:46:02 +0100 Subject: [PATCH 148/480] Revert "kernel: fix kmemleak warnings introduced in 305-mips_module_reloc.patch" This reverts commit a03afef7f2e8ae363a97357ec75ffbfef372a9ea. Signed-off-by: Felix Fietkau --- .../pending-4.14/305-mips_module_reloc.patch | 15 ++++++--------- .../pending-4.19/305-mips_module_reloc.patch | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/target/linux/generic/pending-4.14/305-mips_module_reloc.patch b/target/linux/generic/pending-4.14/305-mips_module_reloc.patch index f1e07e1726..609a96db49 100644 --- a/target/linux/generic/pending-4.14/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.14/305-mips_module_reloc.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -44,14 +44,224 @@ struct mips_hi16 { +@@ -44,14 +44,221 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -187,7 +187,6 @@ Signed-off-by: Felix Fietkau + if (!ptr) + return vmalloc(size); + -+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL); + return ptr; +#endif } @@ -204,12 +203,10 @@ Signed-off-by: Felix Fietkau +/* Free memory returned from module_alloc */ +void module_memfree(void *module_region) +{ -+ if (is_phys_addr(module_region)) { -+ kmemleak_free(module_region); ++ if (is_phys_addr(module_region)) + free_phys(module_region); -+ } else { ++ else + vfree(module_region); -+ } +} + +static void *__module_alloc(int size, bool phys) @@ -272,7 +269,7 @@ Signed-off-by: Felix Fietkau static int apply_r_mips_none(struct module *me, u32 *location, u32 base, Elf_Addr v, bool rela) -@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module +@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module return 0; } @@ -313,7 +310,7 @@ Signed-off-by: Felix Fietkau if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module +@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -335,7 +332,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } diff --git a/target/linux/generic/pending-4.19/305-mips_module_reloc.patch b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch index 1f98dfd8ef..a8e4e78c91 100644 --- a/target/linux/generic/pending-4.19/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -44,14 +44,224 @@ struct mips_hi16 { +@@ -44,14 +44,221 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -187,7 +187,6 @@ Signed-off-by: Felix Fietkau + if (!ptr) + return vmalloc(size); + -+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL); + return ptr; +#endif } @@ -204,12 +203,10 @@ Signed-off-by: Felix Fietkau +/* Free memory returned from module_alloc */ +void module_memfree(void *module_region) +{ -+ if (is_phys_addr(module_region)) { -+ kmemleak_free(module_region); ++ if (is_phys_addr(module_region)) + free_phys(module_region); -+ } else { ++ else + vfree(module_region); -+ } +} + +static void *__module_alloc(int size, bool phys) @@ -272,7 +269,7 @@ Signed-off-by: Felix Fietkau static int apply_r_mips_none(struct module *me, u32 *location, u32 base, Elf_Addr v, bool rela) -@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module +@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module return 0; } @@ -313,7 +310,7 @@ Signed-off-by: Felix Fietkau if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module +@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -335,7 +332,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } From 36bace78b78738841f4da6c2833c58107a4a2901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 28 Dec 2019 08:00:47 +0100 Subject: [PATCH 149/480] ubus: update to version 2019-12-27 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes socket descriptor passing and bumps ABI_VERSION to 20191227. Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-December/020840.html Signed-off-by: Petr Štetiar --- package/system/ubus/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index 56e17ea83b..d3fe452252 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git -PKG_SOURCE_DATE:=2019-12-19 -PKG_SOURCE_VERSION:=a1523d76b016ed46501f61e38ad38999d6c66f52 -PKG_MIRROR_HASH:=f0d46cac85d60e24e3f835c729ee17bb29f0e75c8bd831a86fb3456debd9ad62 +PKG_SOURCE_DATE:=2019-12-27 +PKG_SOURCE_VERSION:=041c9d1c052bb4936fd03240f7d0dd64aedda972 +PKG_MIRROR_HASH:=7febbe78dd178d8d7ccacff54c00fb2d19a53624005920db8cd85236f54f8324 CMAKE_INSTALL:=1 PKG_LICENSE:=LGPL-2.1 @@ -36,7 +36,7 @@ define Package/libubus SECTION:=libs CATEGORY:=Libraries DEPENDS:=+libubox - ABI_VERSION:=20191219 + ABI_VERSION:=20191227 TITLE:=OpenWrt RPC client library endef From 5c06657e42b06623390e7e2cb4d2009fdcbd2926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 27 Dec 2019 17:23:41 +0100 Subject: [PATCH 150/480] brcm2708: switch to upstream cpufreq driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- target/linux/brcm2708/bcm2708/config-4.19 | 1 + target/linux/brcm2708/bcm2709/config-4.19 | 9 ++++++--- target/linux/brcm2708/bcm2710/config-4.19 | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/target/linux/brcm2708/bcm2708/config-4.19 b/target/linux/brcm2708/bcm2708/config-4.19 index f657944a70..b09afa21e8 100644 --- a/target/linux/brcm2708/bcm2708/config-4.19 +++ b/target/linux/brcm2708/bcm2708/config-4.19 @@ -74,6 +74,7 @@ CONFIG_BUILD_BIN2C=y # CONFIG_CACHE_L2X0 is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y +# CONFIG_CLK_RASPBERRYPI is not set CONFIG_CLONE_BACKWARDS=y CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=8 diff --git a/target/linux/brcm2708/bcm2709/config-4.19 b/target/linux/brcm2708/bcm2709/config-4.19 index 06357d97fb..c51fa3b835 100644 --- a/target/linux/brcm2708/bcm2709/config-4.19 +++ b/target/linux/brcm2708/bcm2709/config-4.19 @@ -39,7 +39,7 @@ CONFIG_ARM=y CONFIG_ARM_AMBA=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_ARM_BCM2835_CPUFREQ=y +# CONFIG_ARM_BCM2835_CPUFREQ is not set CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_GIC=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -48,6 +48,7 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_LPAE=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=y # CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ARM_THUMB=y @@ -91,6 +92,7 @@ CONFIG_BUILD_BIN2C=y # CONFIG_CACHE_L2X0 is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y +CONFIG_CLK_RASPBERRYPI=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=8 @@ -105,7 +107,8 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y CONFIG_COMMON_CLK=y CONFIG_CONFIGFS_FS=y CONFIG_CONSOLE_TRANSLATIONS=y -# CONFIG_CPUFREQ_DT is not set +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y @@ -390,7 +393,6 @@ CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y -# CONFIG_PCI_V3_SEMI is not set CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYLIB=y @@ -403,6 +405,7 @@ CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y CONFIG_PM_GENERIC_DOMAINS_OF=y CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_OPP=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y CONFIG_POWER_SUPPLY=y diff --git a/target/linux/brcm2708/bcm2710/config-4.19 b/target/linux/brcm2708/bcm2710/config-4.19 index 6a33308f35..22698986a8 100644 --- a/target/linux/brcm2708/bcm2710/config-4.19 +++ b/target/linux/brcm2708/bcm2710/config-4.19 @@ -102,13 +102,14 @@ CONFIG_ARM_AMBA=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y -CONFIG_ARM_BCM2835_CPUFREQ=y +# CONFIG_ARM_BCM2835_CPUFREQ is not set CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3_ITS_PCI=y CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=y # CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ARM_TIMER_SP804=y @@ -144,6 +145,7 @@ CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y +CONFIG_CLK_RASPBERRYPI=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=8 @@ -159,7 +161,8 @@ CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_XGENE=y CONFIG_CONFIGFS_FS=y CONFIG_CONSOLE_TRANSLATIONS=y -# CONFIG_CPUFREQ_DT is not set +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -249,6 +252,7 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y @@ -453,6 +457,7 @@ CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y CONFIG_PM_GENERIC_DOMAINS_OF=y CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_OPP=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y CONFIG_POWER_RESET=y From 9941edc7240a5e340444e7b72ef3fe85e430fcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 27 Dec 2019 17:24:14 +0100 Subject: [PATCH 151/480] brcm2708: image: stop using mkknlimg script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- target/linux/brcm2708/image/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index e5b8c8aa0b..421a89263d 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -16,11 +16,6 @@ define Build/Compile endef ### Image scripts ### -define Build/kernel-img - perl $(LINUX_DIR)/scripts/mkknlimg $@ $@.tmp - mv $@.tmp $@ -endef - define Build/boot-common rm -f $@.boot mkfs.fat -C $@.boot $(FAT32_BLOCKS) @@ -63,7 +58,7 @@ endef ### Devices ### define Device/Default DEVICE_VENDOR := Raspberry Pi - KERNEL := kernel-bin | kernel-img + KERNEL := kernel-bin KERNEL_IMG := kernel.img IMAGES := factory.img.gz sysupgrade.img.gz IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | sdcard-img | gzip | append-metadata From f8424b1b26820badaf149213027c61c437d4b180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 28 Dec 2019 15:18:27 +0100 Subject: [PATCH 152/480] brcm2708-userland: add new package with RPi utils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- package/utils/brcm2708-userland/Makefile | 64 +++++++++++++++++++ .../001-interface-vcms_host-cmake-fixes.patch | 11 ++++ 2 files changed, 75 insertions(+) create mode 100644 package/utils/brcm2708-userland/Makefile create mode 100644 package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch diff --git a/package/utils/brcm2708-userland/Makefile b/package/utils/brcm2708-userland/Makefile new file mode 100644 index 0000000000..7fea952974 --- /dev/null +++ b/package/utils/brcm2708-userland/Makefile @@ -0,0 +1,64 @@ +# +# Copyright (C) 2019 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=brcm2708-userland +PKG_VERSION:=42ec119e03eb8dffc7c83e2ac0e665e333abbef6 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? +PKG_HASH:=cb0f1d653fdb9975783f30359277d9de2868607381e081796eac68745e3e8324 + +PKG_FLAGS:=nonshared + +PKG_MAINTAINER:=Álvaro Fernández Rojas + +CMAKE_INSTALL:=1 +CMAKE_OPTIONS+=-DVMCS_INSTALL_PREFIX=/usr + +ifeq ($(ARCH),aarch64) + CMAKE_OPTIONS+=-DARM64=ON +else + CMAKE_OPTIONS+=-DARM64=OFF +endif + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +define Package/brcm2708-userland + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=@TARGET_brcm2708 + TITLE:=BCM2708 userland tools + DEFAULT:=y if TARGET_brcm2708 +endef + +define Package/brcm2708-userland/description + BCM2708 userland tools including vcgencmd and tvservice. +endef + +define Package/brcm2708-userland/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtparam $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtoverlay $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tvservice $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin + + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ $(1)/usr/ +endef + +$(eval $(call BuildPackage,brcm2708-userland)) diff --git a/package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch b/package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch new file mode 100644 index 0000000000..cb73512af9 --- /dev/null +++ b/package/utils/brcm2708-userland/patches/001-interface-vcms_host-cmake-fixes.patch @@ -0,0 +1,11 @@ +--- a/interface/vmcs_host/CMakeLists.txt ++++ b/interface/vmcs_host/CMakeLists.txt +@@ -24,7 +24,7 @@ if(NOT ARM64) + + # ILCS pulls in EGL for the ILCS/EGL surface API support + target_link_libraries(vcilcs brcmEGL brcmGLESv2 khrn_client vchiq_arm vcos) +- set(INSTALL_TARGETS "${INSTALL_TARGETS} vcilcs") ++ set(INSTALL_TARGETS ${INSTALL_TARGETS} vcilcs) + endif() + + # vchostif needs ilcore as well (vmcs_main pulls it in) From 3fe29ffa7b80f57de7547f2104e05e3be9eb9501 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sat, 28 Dec 2019 21:23:53 +0100 Subject: [PATCH 153/480] ubox: update to latest git HEAD b30e0df kmodloader: print an error when no kernel module dir can be found 17689b6 logread: add option to filter for facilities c9ffeac kmodloader: added -v arg to modeprobe Signed-off-by: Hans Dedecker --- package/system/ubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 6e67951929..a43012977b 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git -PKG_SOURCE_DATE:=2019-06-16 -PKG_SOURCE_VERSION:=4df34a4d0d5183135217fc8280faae8e697147bc -PKG_MIRROR_HASH:=a4064a1aa29cf612735b0da180f5bdee62304e907f57730482cad97b04f2b189 +PKG_SOURCE_DATE:=2019-12-18 +PKG_SOURCE_VERSION:=b30e0df358bdf8f4f0a5a0858852ca613e3117b8 +PKG_MIRROR_HASH:=02d70cfbd69c5c4bb06ede93dc708403150f2cbcb7342fd58f43079572db042c CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From e3e939d8e624290d14471d913154f4febf3a160b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 28 Dec 2019 21:22:04 +0100 Subject: [PATCH 154/480] libubox: update to version 2019-12-28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes startup issues of some services in procd and bumps ABI_VERSION to 20191228. Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-December/020840.html Signed-off-by: Petr Štetiar --- package/libs/libubox/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 0e3a433806..24b5b45068 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=8072cf0ca0b4de23ad91bffae95a1e3a243ca2e4736e114992d5a7ebc2185235 -PKG_SOURCE_DATE:=2019-12-26 -PKG_SOURCE_VERSION:=eb7eb6393d47a918c420f5b287946dbd6c0d5f57 +PKG_MIRROR_HASH:=90511058f49a178a816d520944cddba421f9eb50c319ef1623bed7aa22f94a3a +PKG_SOURCE_DATE:=2019-12-28 +PKG_SOURCE_VERSION:=cd75136b1342e1e9dabf921be13240c6653640ed CMAKE_INSTALL:=1 PKG_LICENSE:=ISC @@ -27,7 +27,7 @@ define Package/libubox SECTION:=libs CATEGORY:=Libraries TITLE:=Basic utility library - ABI_VERSION:=20191226 + ABI_VERSION:=20191228 DEPENDS:= endef From 985ec835aea100e9245baaef8ebb15628601fe5e Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 30 Dec 2019 01:52:59 +0100 Subject: [PATCH 155/480] rt2x00: add throughput LED trigger This adds a (currently missing) throughput LED trigger for the rt2x00 driver. Previously, LED triggers had to be assigned to the netdev, which was limited to a single VAP. Signed-off-by: David Bauer Tested-by: Christoph Krapp --- .../612-rt2x00-led-tpt-trigger-support.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch diff --git a/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch b/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch new file mode 100644 index 0000000000..25d15b617f --- /dev/null +++ b/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch @@ -0,0 +1,44 @@ +From: David Bauer +Date: Mon, 16 Dec 2019 20:47:06 +0100 +Subject: [PATCH] rt2x00: add throughput LED trigger + +This adds a (currently missing) throughput LED trigger for the rt2x00 +driver. Previously, LED triggers had to be assigned to the netdev, which +was limited to a single VAP. + +Signed-off-by: David Bauer +Tested-by: Christoph Krapp + +--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c ++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +@@ -1129,6 +1129,19 @@ static void rt2x00lib_remove_hw(struct r + kfree(rt2x00dev->spec.channels_info); + } + ++static const struct ieee80211_tpt_blink rt2x00_tpt_blink[] = { ++ { .throughput = 0 * 1024, .blink_time = 334 }, ++ { .throughput = 1 * 1024, .blink_time = 260 }, ++ { .throughput = 2 * 1024, .blink_time = 220 }, ++ { .throughput = 5 * 1024, .blink_time = 190 }, ++ { .throughput = 10 * 1024, .blink_time = 170 }, ++ { .throughput = 25 * 1024, .blink_time = 150 }, ++ { .throughput = 54 * 1024, .blink_time = 130 }, ++ { .throughput = 120 * 1024, .blink_time = 110 }, ++ { .throughput = 265 * 1024, .blink_time = 80 }, ++ { .throughput = 586 * 1024, .blink_time = 50 }, ++}; ++ + static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) + { + struct hw_mode_spec *spec = &rt2x00dev->spec; +@@ -1211,6 +1225,10 @@ static int rt2x00lib_probe_hw(struct rt2 + + #undef RT2X00_TASKLET_INIT + ++ ieee80211_create_tpt_led_trigger(rt2x00dev->hw, ++ IEEE80211_TPT_LEDTRIG_FL_RADIO, rt2x00_tpt_blink, ++ ARRAY_SIZE(rt2x00_tpt_blink)); ++ + /* + * Register HW. + */ From 3026cfe172355f1d700e58ec279a208ca265dbf1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 27 Dec 2019 13:49:13 +0100 Subject: [PATCH 156/480] iwinfo: update to 2019-12-27 a6f6c05 nl80211: properly handle netdev names starting with "radio" 31dcef3 iwinfo: add several QC/A device ids Signed-off-by: David Bauer --- package/network/utils/iwinfo/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index cee7253a3a..735c11bf41 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git -PKG_SOURCE_DATE:=2019-10-16 -PKG_SOURCE_VERSION:=07315b6fdb2566a8626d8a1e4de76eb30456fe17 -PKG_MIRROR_HASH:=924914a51b8a668779e41dc2f40adfc1ae51846ea8b013de3e45999b4d04eecd +PKG_SOURCE_DATE:=2019-12-27 +PKG_SOURCE_VERSION:=a6f6c053481fb5bb29fc8357fb107400100a0658 +PKG_MIRROR_HASH:=221f569d415c5f6c332aacecedeb69a02b21cfe8ee3dc25dec4b80cc59404f55 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 From c48b571ad708b9f66efb0c2942291c2d8f1d7780 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 30 Dec 2019 15:06:42 +0100 Subject: [PATCH 157/480] ramips: add LED trigger for TL-WR902AC v3 WAN LED This adds an LED trigger for the WAN LED on top of the TP-Link TL-WR902AC v3. Currently, only the LED on the port itself shows the link state, while the LED on top of the device stays dark. The WAN port of the device is a hybrid LAN/WAN one, hence why the LED at the port was labled LAN. Signed-off-by: David Bauer --- target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds index f397da14a3..f410c47eac 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds @@ -98,6 +98,7 @@ tplink,tl-wr841n-v14) tplink,tl-wr902ac-v3) ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x10" + ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" ;; unielec,u7628-01-16m) ucidef_set_led_switch "lan1" "lan1" "u7628-01:green:lan1" "switch0" "0x2" From 37929ddb7087199d6bac2568268eca6b302b27a2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 30 Dec 2019 20:26:24 +0200 Subject: [PATCH 158/480] procd: fix running jailed non-root process Setting user and group for a jailed process caused the jail not to come up. Fix this by passing user and group to ujail and change user only once the jail has been setup. This allows jailing services which refuse to run as root user. Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 641a85915a..73a704bc80 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=4 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_MIRROR_HASH:=3452cd65ca5765fb9df828f3dba35c5e51ce8c1f4f83c49875e72a5931a9fef5 -PKG_SOURCE_DATE:=2019-11-04 -PKG_SOURCE_VERSION:=3aa051b44177fc1403acab295f9f833451c4b9f0 +PKG_MIRROR_HASH:=ebf1ee3ff0587428cf6b972c0551372c8ccc8982cfa63cbe00b13dfd482859ec +PKG_SOURCE_DATE:=2019-12-30 +PKG_SOURCE_VERSION:=5ed190aae1b3985719046f4c744e311fc9ef18e3 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 10cbc896c0a26aecff37261450c21f29fb5b99db Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Mon, 30 Dec 2019 13:49:51 +0800 Subject: [PATCH 159/480] iptables: update to 1.8.4 Update iptables to 1.8.4 ChangeLog: https://netfilter.org/projects/iptables/files/changes-iptables-1.8.4.txt Signed-off-by: DENG Qingfang --- package/network/utils/iptables/Makefile | 6 +++--- .../utils/iptables/patches/600-shared-libext.patch | 12 ++++++------ .../patches/700-disable-legacy-revisions.patch | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index 7e8e6f7eaa..12efa94355 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.8.3 -PKG_RELEASE:=2 +PKG_VERSION:=1.8.4 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://netfilter.org/projects/iptables/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80 +PKG_HASH:=993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c PKG_FIXUP:=autoreconf PKG_FLAGS:=nonshared diff --git a/package/network/utils/iptables/patches/600-shared-libext.patch b/package/network/utils/iptables/patches/600-shared-libext.patch index f5c9c9d779..7b798b7fda 100644 --- a/package/network/utils/iptables/patches/600-shared-libext.patch +++ b/package/network/utils/iptables/patches/600-shared-libext.patch @@ -54,7 +54,7 @@ initextb_func := $(addprefix ebt_,${pfb_build_static}) --- a/iptables/Makefile.am +++ b/iptables/Makefile.am -@@ -8,19 +8,22 @@ BUILT_SOURCES = +@@ -7,19 +7,22 @@ BUILT_SOURCES = xtables_legacy_multi_SOURCES = xtables-legacy-multi.c iptables-xml.c xtables_legacy_multi_CFLAGS = ${AM_CFLAGS} @@ -80,8 +80,8 @@ endif xtables_legacy_multi_SOURCES += xshared.c iptables-restore.c iptables-save.c xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm -@@ -30,7 +33,8 @@ if ENABLE_NFTABLES - BUILT_SOURCES += xtables-config-parser.h +@@ -28,7 +31,8 @@ xtables_legacy_multi_LDADD += ../libxt + if ENABLE_NFTABLES xtables_nft_multi_SOURCES = xtables-nft-multi.c iptables-xml.c xtables_nft_multi_CFLAGS = ${AM_CFLAGS} -xtables_nft_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a @@ -90,13 +90,13 @@ if ENABLE_STATIC xtables_nft_multi_CFLAGS += -DALL_INCLUSIVE endif -@@ -45,7 +49,8 @@ xtables_nft_multi_SOURCES += xtables-sav +@@ -42,7 +46,8 @@ xtables_nft_multi_SOURCES += xtables-sav xtables-eb-standalone.c xtables-eb.c \ xtables-eb-translate.c \ xtables-translate.c -xtables_nft_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} ../extensions/libext4.a ../extensions/libext6.a ../extensions/libext_ebt.a ../extensions/libext_arpt.a +xtables_nft_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} +xtables_nft_multi_LDFLAGS += -liptext4 -liptext6 -liptext_arpt - # yacc and lex generate dirty code - xtables_nft_multi-xtables-config-parser.o xtables_nft_multi-xtables-config-syntax.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls xtables_nft_multi_SOURCES += xshared.c + xtables_nft_multi_LDADD += ../libxtables/libxtables.la -lm + endif diff --git a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch index 328f3af18d..86715fc8e7 100644 --- a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch +++ b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch @@ -1,6 +1,6 @@ --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c -@@ -1389,6 +1389,7 @@ static int conntrack3_mt6_xlate(struct x +@@ -1387,6 +1387,7 @@ static int conntrack3_mt6_xlate(struct x } static struct xtables_match conntrack_mt_reg[] = { @@ -8,7 +8,7 @@ { .version = XTABLES_VERSION, .name = "conntrack", -@@ -1464,6 +1465,7 @@ static struct xtables_match conntrack_mt +@@ -1462,6 +1463,7 @@ static struct xtables_match conntrack_mt .alias = conntrack_print_name_alias, .x6_options = conntrack2_mt_opts, }, @@ -16,7 +16,7 @@ { .version = XTABLES_VERSION, .name = "conntrack", -@@ -1496,6 +1498,7 @@ static struct xtables_match conntrack_mt +@@ -1494,6 +1496,7 @@ static struct xtables_match conntrack_mt .x6_options = conntrack3_mt_opts, .xlate = conntrack3_mt6_xlate, }, @@ -24,7 +24,7 @@ { .family = NFPROTO_UNSPEC, .name = "state", -@@ -1526,6 +1529,8 @@ static struct xtables_match conntrack_mt +@@ -1524,6 +1527,8 @@ static struct xtables_match conntrack_mt .x6_parse = state_ct23_parse, .x6_options = state_opts, }, @@ -33,7 +33,7 @@ { .family = NFPROTO_UNSPEC, .name = "state", -@@ -1555,6 +1560,7 @@ static struct xtables_match conntrack_mt +@@ -1553,6 +1558,7 @@ static struct xtables_match conntrack_mt .x6_parse = state_parse, .x6_options = state_opts, }, From 0590d74db2a47ed254810f0e2e00bc7cf1c9e3ef Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 30 Dec 2019 23:06:21 +0100 Subject: [PATCH 160/480] Revert "iptables: update to 1.8.4" This reverts commit 10cbc896c0a26aecff37261450c21f29fb5b99db. The updated iptables package does not build due to the following error encountered on the buildbots: cp: cannot stat '.../iptables-1.8.4/ipkg-install/usr/lib/libiptc.so.*': No such file or directory The changelog mentions "build: remove -Wl,--no-as-needed and libiptc.so" so it appears as if further packaging changes are needed beyond a simple version bump. Signed-off-by: Jo-Philipp Wich --- package/network/utils/iptables/Makefile | 6 +++--- .../utils/iptables/patches/600-shared-libext.patch | 12 ++++++------ .../patches/700-disable-legacy-revisions.patch | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index 12efa94355..7e8e6f7eaa 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.8.4 -PKG_RELEASE:=1 +PKG_VERSION:=1.8.3 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://netfilter.org/projects/iptables/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c +PKG_HASH:=a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80 PKG_FIXUP:=autoreconf PKG_FLAGS:=nonshared diff --git a/package/network/utils/iptables/patches/600-shared-libext.patch b/package/network/utils/iptables/patches/600-shared-libext.patch index 7b798b7fda..f5c9c9d779 100644 --- a/package/network/utils/iptables/patches/600-shared-libext.patch +++ b/package/network/utils/iptables/patches/600-shared-libext.patch @@ -54,7 +54,7 @@ initextb_func := $(addprefix ebt_,${pfb_build_static}) --- a/iptables/Makefile.am +++ b/iptables/Makefile.am -@@ -7,19 +7,22 @@ BUILT_SOURCES = +@@ -8,19 +8,22 @@ BUILT_SOURCES = xtables_legacy_multi_SOURCES = xtables-legacy-multi.c iptables-xml.c xtables_legacy_multi_CFLAGS = ${AM_CFLAGS} @@ -80,8 +80,8 @@ endif xtables_legacy_multi_SOURCES += xshared.c iptables-restore.c iptables-save.c xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm -@@ -28,7 +31,8 @@ xtables_legacy_multi_LDADD += ../libxt - if ENABLE_NFTABLES +@@ -30,7 +33,8 @@ if ENABLE_NFTABLES + BUILT_SOURCES += xtables-config-parser.h xtables_nft_multi_SOURCES = xtables-nft-multi.c iptables-xml.c xtables_nft_multi_CFLAGS = ${AM_CFLAGS} -xtables_nft_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a @@ -90,13 +90,13 @@ if ENABLE_STATIC xtables_nft_multi_CFLAGS += -DALL_INCLUSIVE endif -@@ -42,7 +46,8 @@ xtables_nft_multi_SOURCES += xtables-sav +@@ -45,7 +49,8 @@ xtables_nft_multi_SOURCES += xtables-sav xtables-eb-standalone.c xtables-eb.c \ xtables-eb-translate.c \ xtables-translate.c -xtables_nft_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} ../extensions/libext4.a ../extensions/libext6.a ../extensions/libext_ebt.a ../extensions/libext_arpt.a +xtables_nft_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} +xtables_nft_multi_LDFLAGS += -liptext4 -liptext6 -liptext_arpt + # yacc and lex generate dirty code + xtables_nft_multi-xtables-config-parser.o xtables_nft_multi-xtables-config-syntax.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls xtables_nft_multi_SOURCES += xshared.c - xtables_nft_multi_LDADD += ../libxtables/libxtables.la -lm - endif diff --git a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch index 86715fc8e7..328f3af18d 100644 --- a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch +++ b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch @@ -1,6 +1,6 @@ --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c -@@ -1387,6 +1387,7 @@ static int conntrack3_mt6_xlate(struct x +@@ -1389,6 +1389,7 @@ static int conntrack3_mt6_xlate(struct x } static struct xtables_match conntrack_mt_reg[] = { @@ -8,7 +8,7 @@ { .version = XTABLES_VERSION, .name = "conntrack", -@@ -1462,6 +1463,7 @@ static struct xtables_match conntrack_mt +@@ -1464,6 +1465,7 @@ static struct xtables_match conntrack_mt .alias = conntrack_print_name_alias, .x6_options = conntrack2_mt_opts, }, @@ -16,7 +16,7 @@ { .version = XTABLES_VERSION, .name = "conntrack", -@@ -1494,6 +1496,7 @@ static struct xtables_match conntrack_mt +@@ -1496,6 +1498,7 @@ static struct xtables_match conntrack_mt .x6_options = conntrack3_mt_opts, .xlate = conntrack3_mt6_xlate, }, @@ -24,7 +24,7 @@ { .family = NFPROTO_UNSPEC, .name = "state", -@@ -1524,6 +1527,8 @@ static struct xtables_match conntrack_mt +@@ -1526,6 +1529,8 @@ static struct xtables_match conntrack_mt .x6_parse = state_ct23_parse, .x6_options = state_opts, }, @@ -33,7 +33,7 @@ { .family = NFPROTO_UNSPEC, .name = "state", -@@ -1553,6 +1558,7 @@ static struct xtables_match conntrack_mt +@@ -1555,6 +1560,7 @@ static struct xtables_match conntrack_mt .x6_parse = state_parse, .x6_options = state_opts, }, From 927210a828ddb15b05b873a8c65dc51fff560846 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:46 -0800 Subject: [PATCH 161/480] mvebu: gen_mvebu_sdcard_img.sh: replace let with $(()) let is a bashism. Found with shellcheck. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/mvebu/image/gen_mvebu_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh b/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh index 100a9a96e5..c93a2bd6e2 100755 --- a/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh +++ b/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh @@ -79,6 +79,6 @@ while [ "$#" -ge 2 ]; do ) | dd of="$OUTFILE" bs=512 seek=$(($1 / 512)) conv=notrunc 2>/dev/null printf "Done\n" - let i=i+1 + i=$((i+1)) shift; shift done From 9edf808e350b0cd7fb153ae4a27589ef013d01cf Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:47 -0800 Subject: [PATCH 162/480] mvebu: gen_mvebu_sdcard_img.sh: don't use format directly in printf Enables proper checking. Matches printf behavior in C. Found with shellcheck. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/mvebu/image/gen_mvebu_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh b/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh index c93a2bd6e2..277c9377c1 100755 --- a/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh +++ b/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh @@ -41,7 +41,7 @@ if [ -n "$BOOTLOADER" ]; then fi # generate image file -printf "Creating $OUTFILE from /dev/zero: " +printf "Creating %s from /dev/zero: " "$OUTFILE" dd if=/dev/zero of="$OUTFILE" bs=512 count=1 >/dev/null printf "Done\n" From 19be55aa37f593066039d27c41735200d477f62b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Dec 2019 19:41:16 -0800 Subject: [PATCH 163/480] toolchain/wrapper: replace legacy backticks with $() This replaces deprecated backticks by more versatile $(...) syntax. Found with shellcheck. Signed-off-by: Rosen Penev [alter commit title, extend commit message] Signed-off-by: Adrian Schmutzler --- target/toolchain/files/wrapper.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/toolchain/files/wrapper.sh b/target/toolchain/files/wrapper.sh index 4452128382..bd4996cac2 100755 --- a/target/toolchain/files/wrapper.sh +++ b/target/toolchain/files/wrapper.sh @@ -15,10 +15,10 @@ # PROGNAME=$0 -REALNAME=`readlink -f $0` +REALNAME=$(readlink -f $0) -REALNAME_BASE=`basename $REALNAME` -REALNAME_DIR=`dirname $REALNAME` +REALNAME_BASE=$(basename $REALNAME) +REALNAME_DIR=$(dirname $REALNAME) TARGET_FUNDAMENTAL_ASFLAGS='' TARGET_FUNDAMENTAL_CFLAGS='' From 2e14dd23c9fddaae9d75f211c57e792f2839c85a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Dec 2019 21:07:54 -0800 Subject: [PATCH 164/480] scripts/gen_image_generic.sh: remove $ in arithmetic Fixes shellcheck warning: SC2004: $/${} is unnecessary on arithmetic variables. Signed-off-by: Rosen Penev --- scripts/gen_image_generic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh index 2d2fb120ce..7b642c00d6 100755 --- a/scripts/gen_image_generic.sh +++ b/scripts/gen_image_generic.sh @@ -17,7 +17,7 @@ rm -f "$OUTPUT" head=16 sect=63 -cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512))) +cyl=$(( (KERNELSIZE + ROOTFSSIZE) * 1024 * 1024 / (head * sect * 512))) # create partition table set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}` From 3f65fe5d62052747f08c5f661a2b7793e4510372 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Dec 2019 21:07:55 -0800 Subject: [PATCH 165/480] scripts/gen_image_generic.sh: replace deprecated backticks with $() This replaces deprecated backticks by more versatile $(...) syntax. Found with shellcheck. Signed-off-by: Rosen Penev [adjust commit title and message] Signed-off-by: Adrian Schmutzler --- scripts/gen_image_generic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh index 7b642c00d6..2c57d56f07 100755 --- a/scripts/gen_image_generic.sh +++ b/scripts/gen_image_generic.sh @@ -20,7 +20,7 @@ sect=63 cyl=$(( (KERNELSIZE + ROOTFSSIZE) * 1024 * 1024 / (head * sect * 512))) # create partition table -set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}` +set $(ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}) KERNELOFFSET="$(($1 / 512))" KERNELSIZE="$2" From b2e12de339f2a7bde8b41fba0e12b0b7f15b1d1e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:48 -0800 Subject: [PATCH 166/480] mvebu: gen_mvebu_sdcard_img.sh: use /bin/sh There is nothing that needs bash anymore. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/mvebu/image/gen_mvebu_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh b/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh index 277c9377c1..842e591026 100755 --- a/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh +++ b/target/linux/mvebu/image/gen_mvebu_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2016 Josua Mayer # From 3c8d95209f6ce2a91772a3d6deeb1067094bdc5d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:49 -0800 Subject: [PATCH 167/480] zynq: gen_zynq_sdcard_img.sh: switch to /bin/sh This has nothing that needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/zynq/image/gen_zynq_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/zynq/image/gen_zynq_sdcard_img.sh b/target/linux/zynq/image/gen_zynq_sdcard_img.sh index 460a336e69..9afe18713e 100755 --- a/target/linux/zynq/image/gen_zynq_sdcard_img.sh +++ b/target/linux/zynq/image/gen_zynq_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh set -ex [ $# -eq 5 ] || { From 0713afd298def6f4d149b83888433696c72dfa79 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:50 -0800 Subject: [PATCH 168/480] sunxi: gen_sunxi_sdcard_img.sh: switch to /bin/sh This has nothing that needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/sunxi/image/gen_sunxi_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh b/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh index 0d4a56d0d2..7dc22761dd 100755 --- a/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh +++ b/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2013 OpenWrt.org # From 4fb4cc537a88a617bfd121b4296f04a29e8b3570 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:51 -0800 Subject: [PATCH 169/480] rb532: gen_image.sh: use /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [slightly adjust commit title] Signed-off-by: Adrian Schmutzler --- target/linux/rb532/image/gen_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/rb532/image/gen_image.sh b/target/linux/rb532/image/gen_image.sh index a9d48d86ca..e46539fd85 100755 --- a/target/linux/rb532/image/gen_image.sh +++ b/target/linux/rb532/image/gen_image.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh OUTPUT="$1" KERNELSIZE="$2" KERNELIMAGE="$3" From 646e811b076d8b117cacf225e0d89a1032a36e64 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:52 -0800 Subject: [PATCH 170/480] omap: gen_omap_sdcard_img.sh: use /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/omap/image/gen_omap_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh b/target/linux/omap/image/gen_omap_sdcard_img.sh index 881df9a05d..dbb50cbff4 100755 --- a/target/linux/omap/image/gen_omap_sdcard_img.sh +++ b/target/linux/omap/image/gen_omap_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2013 OpenWrt.org From 5ce2f3dc1501948d42ab6a995740dbade7e5f6a4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:53 -0800 Subject: [PATCH 171/480] mxs: gen_sdcard_vfat_ext4.sh: use /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [change prefix of commit title] Signed-off-by: Adrian Schmutzler --- target/linux/mxs/image/gen_sdcard_vfat_ext4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mxs/image/gen_sdcard_vfat_ext4.sh b/target/linux/mxs/image/gen_sdcard_vfat_ext4.sh index bca664c780..9d2b7c46a8 100755 --- a/target/linux/mxs/image/gen_sdcard_vfat_ext4.sh +++ b/target/linux/mxs/image/gen_sdcard_vfat_ext4.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2015 OpenWrt.org # From c7382cccd803db5f04a7f6b58b283f89af7ab708 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:54 -0800 Subject: [PATCH 172/480] mxs: gen_sdcard_ext4_ext4.sh: use /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [adjust prefix of commit title] Signed-off-by: Adrian Schmutzler --- target/linux/mxs/image/gen_sdcard_ext4_ext4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mxs/image/gen_sdcard_ext4_ext4.sh b/target/linux/mxs/image/gen_sdcard_ext4_ext4.sh index 99bd3bf573..20f3331bed 100755 --- a/target/linux/mxs/image/gen_sdcard_ext4_ext4.sh +++ b/target/linux/mxs/image/gen_sdcard_ext4_ext4.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2015 OpenWrt.org # From c0ca9f90a86a51f077dd8d878679de781e95e99b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:55 -0800 Subject: [PATCH 173/480] mediatek: gen_mt7623_emmc_img.sh: use /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/mediatek/image/gen_mt7623_emmc_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/image/gen_mt7623_emmc_img.sh b/target/linux/mediatek/image/gen_mt7623_emmc_img.sh index 1cb0883fb0..a5f296ef14 100755 --- a/target/linux/mediatek/image/gen_mt7623_emmc_img.sh +++ b/target/linux/mediatek/image/gen_mt7623_emmc_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh OUTPUT_FILE=$1 KERNEL_FILE=$2 From 2b2985fe6bf4d9f239a7e5523c9a0af79f04f311 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:56 -0800 Subject: [PATCH 174/480] layerscape: gen_sdcard_head_img.sh: switch to /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/layerscape/image/gen_sdcard_head_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/layerscape/image/gen_sdcard_head_img.sh b/target/linux/layerscape/image/gen_sdcard_head_img.sh index c7ecbb6883..08ab4497d5 100755 --- a/target/linux/layerscape/image/gen_sdcard_head_img.sh +++ b/target/linux/layerscape/image/gen_sdcard_head_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright 2018 NXP # From 454339b533b188d6837ad4d82b70ac629787d392 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:57 -0800 Subject: [PATCH 175/480] gemini: dns313_gen_hdd_img.sh: switch to /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/gemini/image/dns313_gen_hdd_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/gemini/image/dns313_gen_hdd_img.sh b/target/linux/gemini/image/dns313_gen_hdd_img.sh index 6e899ec840..813852232f 100755 --- a/target/linux/gemini/image/dns313_gen_hdd_img.sh +++ b/target/linux/gemini/image/dns313_gen_hdd_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh set -x [ $# -eq 5 ] || { From de8e51c06f598f35ad5ad4739e65028462c6540e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:58 -0800 Subject: [PATCH 176/480] brcm2708: gen_rpi_sdcard_img.sh: use /bin/sh Nothing here needs bash. While at it, remove trailing whitespace. Signed-off-by: Rosen Penev [add prefix to commit title, add whitespace comment] Signed-off-by: Adrian Schmutzler --- target/linux/brcm2708/image/gen_rpi_sdcard_img.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm2708/image/gen_rpi_sdcard_img.sh b/target/linux/brcm2708/image/gen_rpi_sdcard_img.sh index 60b66c3724..5e8fb2769c 100755 --- a/target/linux/brcm2708/image/gen_rpi_sdcard_img.sh +++ b/target/linux/brcm2708/image/gen_rpi_sdcard_img.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/bin/sh -set -x +set -x [ $# -eq 5 ] || { echo "SYNTAX: $0 " exit 1 From 55383a9a7a77faf5eaa8cbbd29f25a95c36937af Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:44:59 -0800 Subject: [PATCH 177/480] at91: gen_at91_sdcard_img.sh: switch to /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/at91/image/gen_at91_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/at91/image/gen_at91_sdcard_img.sh b/target/linux/at91/image/gen_at91_sdcard_img.sh index 4eb30fa790..5171b6723e 100755 --- a/target/linux/at91/image/gen_at91_sdcard_img.sh +++ b/target/linux/at91/image/gen_at91_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2017 OpenWrt.org From e95c4d2f5028dd31faebea0a25b30b172c366ec0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:45:00 -0800 Subject: [PATCH 178/480] archs38: gen_axs10x_sdcard_img.sh: switch to /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/archs38/image/gen_axs10x_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/archs38/image/gen_axs10x_sdcard_img.sh b/target/linux/archs38/image/gen_axs10x_sdcard_img.sh index 3cbd2caceb..87c2bba92c 100755 --- a/target/linux/archs38/image/gen_axs10x_sdcard_img.sh +++ b/target/linux/archs38/image/gen_axs10x_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2016 OpenWrt.org From 5422db7e27808cc81459d79c0ccb5f65fd63380b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:45:01 -0800 Subject: [PATCH 179/480] arc770: gen_axs10x_sdcard_img.sh: switch to /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/arc770/image/gen_axs10x_sdcard_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/arc770/image/gen_axs10x_sdcard_img.sh b/target/linux/arc770/image/gen_axs10x_sdcard_img.sh index 3cbd2caceb..87c2bba92c 100755 --- a/target/linux/arc770/image/gen_axs10x_sdcard_img.sh +++ b/target/linux/arc770/image/gen_axs10x_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2016 OpenWrt.org From 3c42293937395f5cd47d67a5e50d27d4b1035112 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Nov 2019 14:45:02 -0800 Subject: [PATCH 180/480] apm821xx: mbl_gen_hdd_img.sh: switch to /bin/sh Nothing here needs bash. Signed-off-by: Rosen Penev [add prefix to commit title] Signed-off-by: Adrian Schmutzler --- target/linux/apm821xx/image/mbl_gen_hdd_img.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/apm821xx/image/mbl_gen_hdd_img.sh b/target/linux/apm821xx/image/mbl_gen_hdd_img.sh index 1fb868b5b3..0e11e10226 100755 --- a/target/linux/apm821xx/image/mbl_gen_hdd_img.sh +++ b/target/linux/apm821xx/image/mbl_gen_hdd_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh set -x [ $# -eq 5 ] || { From ac42b916bccb609817fee69172b5902254a3c3c8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Dec 2019 19:41:18 -0800 Subject: [PATCH 181/480] toolchain: wrapper.sh: use /bin/sh instead of bash No bash features are actually used here. Signed-off-by: Rosen Penev [slightly adjust commit title] Signed-off-by: Adrian Schmutzler --- target/toolchain/files/wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/toolchain/files/wrapper.sh b/target/toolchain/files/wrapper.sh index bd4996cac2..51c8879a76 100755 --- a/target/toolchain/files/wrapper.sh +++ b/target/toolchain/files/wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # 2009 (C) Copyright Industrie Dial Face S.p.A. # Luigi 'Comio' Mantellini From 836d5395a556f345fce8ffee933ec8d967f86930 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 31 Dec 2019 01:33:28 +0100 Subject: [PATCH 182/480] toolchain: wrapper.sh: harmonize leading whitespaces Convert leading spaces to tabs and generally harmonize leading whitespace indent in the file. Signed-off-by: Adrian Schmutzler --- target/toolchain/files/wrapper.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/toolchain/files/wrapper.sh b/target/toolchain/files/wrapper.sh index 51c8879a76..2cbcc8c1e6 100755 --- a/target/toolchain/files/wrapper.sh +++ b/target/toolchain/files/wrapper.sh @@ -48,22 +48,22 @@ export GCC_HONOUR_COPTS TOOLCHAIN_SYSROOT="$TOOLCHAIN_BIN_DIR/../.." if [ ! -d "$TOOLCHAIN_SYSROOT" ]; then - echo "Error: Unable to determine sysroot (looking for $TOOLCHAIN_SYSROOT)!" >&2 - exit 1 + echo "Error: Unable to determine sysroot (looking for $TOOLCHAIN_SYSROOT)!" >&2 + exit 1 fi # -Wl,--dynamic-linker=$TOOLCHAIN_SYSROOT/lib/ld-uClibc.so.0 # --dynamic-linker=$TOOLCHAIN_SYSROOT/lib/ld-uClibc.so.0 case $TOOLCHAIN_PLATFORM in - gnu|glibc|uclibc|musl) - GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib" - LD_SYSROOT_FLAGS="-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib" - ;; - *) - GCC_SYSROOT_FLAGS="" - LD_SYSROOT_FLAGS="" - ;; + gnu|glibc|uclibc|musl) + GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib" + LD_SYSROOT_FLAGS="-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib" + ;; + *) + GCC_SYSROOT_FLAGS="" + LD_SYSROOT_FLAGS="" + ;; esac # From 5e5e92b7c3e751affa067a365f1787cd8e5ffb10 Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Wed, 11 Dec 2019 14:40:24 +0100 Subject: [PATCH 183/480] ath79: generate firmware image for aircube-isp This adds a "factory" image for the aircube-isp devices. Note that the firmware can't be uploaded without prior special preparation. For the most recent instructions on how to do that, visit the OpenWRT wiki page of the Ubiquiti airCube ISP for details: https://openwrt.org/toh/ubiquiti/ubiquiti_aircube_isp Current procedure: With the original firmware 2.5.0 it is possible to upload and execute a script via the configuration. To do that download and unpack the original configuration, adapt uhttpd config to execute another lua handler (placed in the config directory) and pack and upload it again. The lua handler can call a script that mounts an overlayfs and modifies the "fwupdate.real" binary so that an unsigned image is accepted. The overlayfs is necessary because a security system (called tomoyo) doesn't allow binaries in other locations than /sbin/fwupdate.real (and maybe some more) to access the flash when executed via network. A big thanks to Torvald Menningen (Snap) from the OpenWRT forum for finding out how to patch the binary so that it accepts an unsigned image. The current step-by-step procedure is: - Use a version 2.5.0 of the original firmware. This is important because a binary file will be modified. - Download a configuration. - Unpack it (it's just a tar gz file without an ending). - Add the following to uhttpd: `````` config 'uhttpd' 'other' list listen_http 0.0.0.0:8080 list listen_http [::]:8080 option 'home' '/tmp/persistent/config/patch/www' option lua_prefix '/lua' option lua_handler '/tmp/persistent/config/patch/handler.lua' `````` - Create a `patch` subfolder. - Create a `patch/www` subfolder. - Create a `patch/handler.lua` with the following content: `````` function handle_request(env) uhttpd.send("Status: 200 OK\r\n") uhttpd.send("Content-Type: text/plain\r\n\r\n") local command = "/bin/sh /tmp/persistent/config/patch/patch.sh 2>&1" local proc = assert(io.popen(command)) for line in proc:lines() do uhttpd.send(line.."\r\n") end proc:close() end `````` - Create a `patch/patch.sh` with the following content: `````` #!/bin/sh -x set -e set -u set -x UBNTBOX_PATCHED="/tmp/fwupdate.real" MD5FILE="/tmp/patchmd5" cat < ${MD5FILE} c33235322da5baca5a7b237c09bc8df1 /sbin/fwupdate.real EOF # check md5 of files that will be patched if ! md5sum -c ${MD5FILE} then echo "******** Error when checking files. Refuse to do anything. ********" exit 0 fi # prepare some overlay functionality LOWERDIR="/tmp/lower_root" mkdir -p ${LOWERDIR} mount -t squashfs -oro /dev/mtdblock3 ${LOWERDIR} overlay_some_path() { PATH_TO_OVERLAY=$1 ALIAS=$2 UPPERDIR="/tmp/over_${ALIAS}" WORKDIR="/tmp/over_${ALIAS}_work" mkdir -p ${UPPERDIR} mkdir -p ${WORKDIR} mount -t overlay -o lowerdir=${LOWERDIR}${PATH_TO_OVERLAY},upperdir=${UPPERDIR},workdir=${WORKDIR} overlay ${PATH_TO_OVERLAY} } # patch the ubntbox binary. overlay_some_path "/sbin" "sbin" echo -en '\x10' | dd of=/sbin/fwupdate.real conv=notrunc bs=1 count=1 seek=24598 echo "******** Done ********" `````` - Repack the configuration. - Upload it via the normal web interface. - Wait about a minute. The webserver should restart. - Now there is a second web server at port 8080 which can call the lua script. Visit the page with a web browser. Link is for example http://192.168.1.1:8080/lua - You should see the output of the script with a "*** Done ***" at the end. Note that the patches are not permanent. If you restart the router you have to re-visit the link (but not re-upload the config). - Now you can upload an unsigned binary via the normal web interface. Signed-off-by: Christian Mauderer --- target/linux/ath79/image/generic-ubnt.mk | 3 +-- tools/firmware-utils/src/mkfwimage.c | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 8a45fb09d1..05847cc3a2 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -90,8 +90,7 @@ define Device/ubnt_acb-isp UBNT_BOARD := ACB-ISP UBNT_CHIP := qca9533 UBNT_TYPE := ACB - UBNT_VERSION := 6.0.0 - IMAGES := sysupgrade.bin + UBNT_VERSION := 2.5.0 endef TARGET_DEVICES += ubnt_acb-isp diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c index c8737386a2..c9d838a2e1 100644 --- a/tools/firmware-utils/src/mkfwimage.c +++ b/tools/firmware-utils/src/mkfwimage.c @@ -128,6 +128,15 @@ struct fw_info fw_info[] = { }, .sign = true, }, + { + .name = "ACB-ISP", + .fw_layout = { + .kern_start = 0x9f050000, + .kern_entry = 0x80002000, + .firmware_max_length= 0x00F60000, + }, + .sign = true, + }, { .name = "", }, From 12795ec9f16ba79cdde052f2e20f4a1bddc6235d Mon Sep 17 00:00:00 2001 From: Josua Mayer Date: Thu, 26 Dec 2019 15:25:04 +0100 Subject: [PATCH 184/480] mvebu: split interface configuration for clearfog pro and base Handle both variants separately. This removes the need for calling swconfig to detect the switch, and simplifies future changes. Signed-off-by: Josua Mayer --- .../mvebu/base-files/etc/board.d/02_network | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network index 69c63e3791..283a856258 100755 --- a/target/linux/mvebu/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/base-files/etc/board.d/02_network @@ -52,17 +52,21 @@ marvell,axp-gp) methode,udpu) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; -solidrun,clearfog*a1) +solidrun,clearfog-a1|solidrun,clearfog-pro-a1) # eth0 is standalone ethernet - # eth1 is switch (-pro) or standalone ethernet (-base) + # eth1 is switch # eth2 is SFP ucidef_set_interfaces_lan_wan "eth1" "eth0 eth2" - # if switch exists (clearfog-pro) # switch port 5 is connected to eth1 - swconfig list 2>&1 | grep -q switch0 && \ - ucidef_add_switch "switch0" \ - "0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5u@eth1" "6:lan:6" + ucidef_add_switch "switch0" \ + "0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5u@eth1" "6:lan:6" + ;; +solidrun,clearfog-base-a1) + # eth0 is standalone ethernet + # eth1 is standalone ethernet + # eth2 is SFP + ucidef_set_interfaces_lan_wan "eth1" "eth0 eth2" ;; *) ucidef_set_interface_lan "eth0" From eae889b8f2c9c732ed86d77b189f4c19c182de77 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Dec 2019 18:18:03 -0800 Subject: [PATCH 185/480] scripts/strip-kmod.sh: replace legacy backticks with $() This replaces deprecated backticks by more versatile $(...) syntax. Found with shellcheck. Signed-off-by: Rosen Penev [slightly adjusted commit title, added commit message] Signed-off-by: Adrian Schmutzler --- scripts/strip-kmod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/strip-kmod.sh b/scripts/strip-kmod.sh index 313015b909..7886cd907f 100755 --- a/scripts/strip-kmod.sh +++ b/scripts/strip-kmod.sh @@ -50,6 +50,6 @@ $3 && $2 ~ /[brtd]/ && $3 !~ /\$LC/ && !def[$3] { } ' > "$MODULE.tmp1" -${CROSS}objcopy `cat ${MODULE}.tmp1` ${MODULE}.tmp ${MODULE}.out +${CROSS}objcopy $(cat ${MODULE}.tmp1) ${MODULE}.tmp ${MODULE}.out mv "${MODULE}.out" "${MODULE}" rm -f "${MODULE}".t* From f4b812dac11844311f5fb64a4e1e9209411449dc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Dec 2019 18:18:04 -0800 Subject: [PATCH 186/480] scripts/strip-kmod.sh: use sh instead of bash There's nothing bash specific here. Signed-off-by: Rosen Penev --- scripts/strip-kmod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/strip-kmod.sh b/scripts/strip-kmod.sh index 7886cd907f..28be35ea7c 100755 --- a/scripts/strip-kmod.sh +++ b/scripts/strip-kmod.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh [ -n "$CROSS" ] || { echo "The variable CROSS must be set to point to the cross-compiler prefix" exit 1 From ec0fb23a410b7a12c8625f7328ebab5cdfda0201 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 31 Dec 2019 11:41:07 +0100 Subject: [PATCH 187/480] scripts/strip-kmod.sh: harmonize leading whitespaces Convert leading spaces to tabs for consistency in the file. Signed-off-by: Adrian Schmutzler --- scripts/strip-kmod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/strip-kmod.sh b/scripts/strip-kmod.sh index 28be35ea7c..e5b2868f5d 100755 --- a/scripts/strip-kmod.sh +++ b/scripts/strip-kmod.sh @@ -19,7 +19,7 @@ else fi if [ -z "$KEEP_BUILD_ID" ]; then - ARGS="$ARGS -R .note.gnu.build-id" + ARGS="$ARGS -R .note.gnu.build-id" fi ${CROSS}objcopy \ From 543d945f07ec439388cbe3a9ea1b193e910bb824 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Dec 2019 18:19:29 -0800 Subject: [PATCH 188/480] scripts/symlink-tree.sh: use /bin/sh This uses nothing bash specific. Signed-off-by: Rosen Penev --- scripts/symlink-tree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/symlink-tree.sh b/scripts/symlink-tree.sh index aa169e2455..6ed91dfb5a 100755 --- a/scripts/symlink-tree.sh +++ b/scripts/symlink-tree.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # Create a new openwrt tree with symlinks pointing at the current tree # Usage: ./scripts/symlink-tree.sh From 9a8ba44f9c386f0c51280932b5756ffcdb20cc25 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Dec 2019 18:21:36 -0800 Subject: [PATCH 189/480] scripts/mkits.sh: replace legacy backticks with $() This replaces deprecated backticks by more versatile $(...) syntax. Found with shellcheck. Signed-off-by: Rosen Penev [adjust commit title and message] Signed-off-by: Adrian Schmutzler --- scripts/mkits.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mkits.sh b/scripts/mkits.sh index 93c8cedaed..32a978e18d 100755 --- a/scripts/mkits.sh +++ b/scripts/mkits.sh @@ -15,7 +15,7 @@ # usage() { - echo "Usage: `basename $0` -A arch -C comp -a addr -e entry" \ + echo "Usage: $(basename $0) -A arch -C comp -a addr -e entry" \ "-v version -k kernel [-D name -d dtb] -o its_file" echo -e "\t-A ==> set architecture to 'arch'" echo -e "\t-C ==> set compression type 'comp'" @@ -55,7 +55,7 @@ if [ -z "${ARCH}" ] || [ -z "${COMPRESS}" ] || [ -z "${LOAD_ADDR}" ] || \ usage fi -ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'` +ARCH_UPPER=$(echo $ARCH | tr '[:lower:]' '[:upper:]') # Conditionally create fdt information if [ -n "${DTB}" ]; then From 7a3c9e557a61d6687aaea42ba82d249db166fb4e Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Mon, 23 Dec 2019 01:25:39 +0900 Subject: [PATCH 190/480] ramips: fix switch setup for Xiaomi MiWiFi Nano MiWiFi Nano has two LAN ports, which are in reverse order. Add port numbers to them, and disable unused ports. Signed-off-by: Sungbo Eo --- target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts | 5 +++++ .../linux/ramips/mt76x8/base-files/etc/board.d/02_network | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index 92bb8b7288..e502f273af 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -66,6 +66,11 @@ status = "disabled"; }; +&esw { + mediatek,portmap = <0x2f>; + mediatek,portdisable = <0x2a>; +}; + &wmac { status = "okay"; }; diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 90eec9c8a0..a733353f71 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -61,8 +61,7 @@ ramips_setup_interfaces() mercury,mac1200r-v2|\ totolink,lr1200|\ wavlink,wl-wn570ha1|\ - wavlink,wl-wn575a3|\ - xiaomi,miwifi-nano) + wavlink,wl-wn575a3) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" ;; @@ -109,6 +108,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "4:lan:1" "2:lan:2" "0:wan" "6@eth0" ;; + xiaomi,miwifi-nano) + ucidef_add_switch "switch0" \ + "0:lan:2" "2:lan:1" "4:wan" "6@eth0" + ;; zbtlink,zbt-we1226) ucidef_add_switch "switch0" \ "0:lan:2" "1:lan:1" "4:wan" "6@eth0" From a3010a7f8dbe04972efef16ed7d81b5fd72e9a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Thu, 19 Dec 2019 10:29:14 +0100 Subject: [PATCH 191/480] ramips: add support for TP-Link RE200 v1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TP-Link RE200 v1 is a wireless range extender with Ethernet and 2.4G and 5G WiFi with internal antennas. It's based on MediaTek MT7620A+MT7610EN. Specifications -------------- - MediaTek MT7620A (580 Mhz) - 64 MB of RAM - 8 MB of FLASH - 2T2R 2.4 GHz and 1T1R 5 GHz - 1x 10/100 Mbps Ethernet - UART header on PCB (57600 8n1) - 8x LED (GPIO-controlled; only 6 supported), 2x button There are 2.4G and 5G LEDs in red and green which are controlled separately. The 5G LED is currently not supported, since the GPIOs couldn't be determined. Installation ------------ Web Interface ------------- It is possible to upgrade to OpenWrt via the web interface. However, the OEM firmware upgrade file is required and a tool to fix the MD5 sum of the header. This procedure overwrites U-Boot and there is not failsafe / recovery mode present! To prepare an image, you need to take the header and U-Boot (i.e. 0x200 + 0x20000 bytes) from an OEM firmware file and attach the factory image to it. Then fix the header MD5Sum1. Serial console -------------- Opening the case is quite hard, since it is welded together. Rename the OpenWrt factory image to "test.bin", then plug in the device and quickly press "2" to enter flash mode (no line feed). Follow the prompts until OpenWrt is installed. Unfortunately, this devices does not offer a recovery mode or a tftp installation method. If the web interface upgrade fails, you have to open your device and attach serial console. Since the web upgrade overwrites the boot loader, you might also brick your device. Additional notes ---------------- MAC address assignment is based on stock-firmware. For me, the device assigns the MAC on the label to Ethernet and the 2.4G WiFi, while the 5G WiFi has a separate MAC with +2. *:88 Ethernet/2.4G label, uboot 0x1fc00, userconfig 0x0158 *:89 unused userconfig 0x0160 *:8A 5G not present in flash This seems to be the first ramips device with a TP-Link v1 header. The original firmware has the string "EU" embedded, there might be some region- checking going on during the firmware upgrade process. The original firmware also contains U-Boot and thus overwrites the boot loader during upgrade. In order to flash back to stock, the first header and U-Boot need to be stripped from the original firmware. Signed-off-by: Andreas Böhler --- .../ramips/dts/mt7620a_tplink_re200-v1.dts | 158 ++++++++++++++++++ target/linux/ramips/image/mt7620.mk | 36 ++++ .../mt7620/base-files/etc/board.d/01_leds | 3 + .../mt7620/base-files/etc/board.d/02_network | 1 + tools/firmware-utils/src/mktplinkfw.c | 6 + 5 files changed, 204 insertions(+) create mode 100644 target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts diff --git a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts new file mode 100644 index 0000000000..39fdc0af53 --- /dev/null +++ b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7620a.dtsi" + +#include +#include + +/ { + compatible = "tplink,re200-v1", "ralink,mt7620a-soc"; + model = "TP-Link RE200 v1"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = ðernet; + }; + + chosen { + bootargs = "console=ttyS0,57600n8"; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "re200-v1:green:power"; + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "re200-v1:green:lan"; + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "re200-v1:green:wlan"; + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + }; + + qss { + label = "re200-v1:green:qss"; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + + wlan2g_red { + label = "re200-v1:red:wlan2g"; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + }; + + wlan2g_green { + label = "re200-v1:green:wlan2g"; + gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1radio"; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + + +&state_default { + gpio { + ralink,group = "i2c", "uartf", "ephy", "wled", "rgmii1", "spi refclk"; + ralink,function = "gpio"; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + label = "firmware"; + reg = <0x20000 0x7c0000>; + }; + + partition@7e0000 { + label = "userconfig"; + reg = <0x7e0000 0x10000>; + read-only; + }; + + radio: partition@7f0000 { + label = "radio"; + reg = <0x7f0000 0x10000>; + read-only; + }; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&gpio2 { + status = "okay"; +}; + +&gpio3 { + status = "okay"; +}; + +ðernet { + mtd-mac-address = <&uboot 0x1fc00>; +}; + +&wmac { + ralink,mtd-eeprom = <&radio 0x0>; + mtd-mac-address = <&uboot 0x1fc00>; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&radio 0x8000>; + mtd-mac-address = <&uboot 0x1fc00>; + mtd-mac-address-increment = <2>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 291495ec0d..cbf35f804a 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -16,6 +16,23 @@ define Build/elecom-header --owner=0 --group=0 -f $@ -C $(KDIR) v_0.0.0.bin v_0.0.0.md5 endef +# combine kernel and rootfs into one image +# mktplinkfw +# is "sysupgrade" or "factory" +# +# -a align the rootfs start on an bytes boundary +# -j add jffs2 end-of-filesystem markers +# -s strip padding from end of the image +# -X reserve bytes in the firmware image (hexval prefixed with 0x) +define Build/mktplinkfw + -$(STAGING_DIR_HOST)/bin/mktplinkfw \ + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ + -N OpenWrt -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \ + -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new -j -X 0x40000 -a 0x4 \ + $(wordlist 2,$(words $(1)),$(1)) \ + $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ +endef + define Device/aigale_ai-br100 SOC := mt7620a IMAGE_SIZE := 7936k @@ -938,6 +955,25 @@ define Device/tplink_archer-mr200 endef TARGET_DEVICES += tplink_archer-mr200 +define Device/tplink_re200-v1 + SOC := mt7620a + DEVICE_VENDOR := TP-Link + DEVICE_MODEL := RE200 + DEVICE_VARIANT := v1 + DEVICE_PACKAGES := kmod-mt76x0e + IMAGES += factory.bin + IMAGE/sysupgrade.bin := mktplinkfw sysupgrade -e -O + IMAGE/factory.bin := mktplinkfw factory -e -O + IMAGE_SIZE := 7936k + KERNEL := $(KERNEL_DTB) + KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v1-header -e -O + TPLINK_HWID := 0x02000001 + TPLINK_HWREV := 0x1 + TPLINK_HEADER_VERSION := 1 + TPLINK_FLASHLAYOUT := 8Mmtk +endef +TARGET_DEVICES += tplink_re200-v1 + define Device/vonets_var11n-300 SOC := mt7620n IMAGE_SIZE := 3776k diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index d88fdfb043..77a98fa095 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -198,6 +198,9 @@ tplink,archer-mr200) ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "usb0" set_wifi_led "$boardname:white:wlan" ;; +tplink,re200-v1) + ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" + ;; youku,yk1) set_wifi_led "$boardname:blue:air" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10" diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index 852336f811..7397ddcc2c 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -50,6 +50,7 @@ ramips_setup_interfaces() planex,mzk-ex300np|\ planex,mzk-ex750np|\ ravpower,wd03|\ + tplink,re200-v1|\ sercomm,na930) ucidef_set_interface_lan "eth0" ;; diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index ce2acc20c9..ed785b48e5 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -144,6 +144,12 @@ static struct flash_layout layouts[] = { .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x100000, + }, { + .id = "8Mmtk", + .fw_max_len = 0x7c0000, + .kernel_la = 0x80000000, + .kernel_ep = 0x8000c310, + .rootfs_ofs = 0x100000, }, { .id = "16M", .fw_max_len = 0xf80000, From 051b9a144f3c003b1053a7e44e2eb3580907d9a0 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Tue, 31 Dec 2019 14:33:01 +0100 Subject: [PATCH 192/480] ubox: update to version 2019-12-31 0e34af1 kmodloader: added -a arg to modprobe Signed-off-by: Hans Dedecker --- package/system/ubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index a43012977b..cfa0b594e4 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git -PKG_SOURCE_DATE:=2019-12-18 -PKG_SOURCE_VERSION:=b30e0df358bdf8f4f0a5a0858852ca613e3117b8 -PKG_MIRROR_HASH:=02d70cfbd69c5c4bb06ede93dc708403150f2cbcb7342fd58f43079572db042c +PKG_SOURCE_DATE:=2019-12-31 +PKG_SOURCE_VERSION:=0e34af143373126fc62b43612233a158694ec643 +PKG_MIRROR_HASH:=8ad36b252419a88d1018addec84900f9601ef5aece39bd0171c918d0817688c9 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 415cc83da6c9296b47aea30c6cbcd2c1eddb0221 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Tue, 31 Dec 2019 22:30:44 +0800 Subject: [PATCH 193/480] ramips: remove HiWiFi HC5661 non-existent 5GHz LED HC5661 does not have 5GHz WiFi or LED. Fixes: e6e373d3480e ("ramips: Add DTS files for HiWiFi HC5x61 models") Signed-off-by: DENG Qingfang --- target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts index 185e045de1..074257ab86 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts @@ -30,10 +30,5 @@ label = "hc5661:blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; - - wlan5g { - label = "hc5661:blue:wlan5g"; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - }; }; }; From a176f8d3ecf09df9d40aaff8271284699695d450 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Tue, 31 Dec 2019 22:35:41 +0800 Subject: [PATCH 194/480] ramips: mt7620: use throughput trigger on HiWiFi HC5x61 Throughput trigger support for MT7620 has been added, so switch to it Signed-off-by: DENG Qingfang --- target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts | 1 + target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts | 2 ++ target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts | 2 ++ .../linux/ramips/mt7620/base-files/etc/board.d/01_leds | 9 +-------- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts index 074257ab86..452541137a 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts @@ -29,6 +29,7 @@ wlan2g { label = "hc5661:blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts index 265f7d9bb1..33ef8dd2aa 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts @@ -29,11 +29,13 @@ wlan2g { label = "hc5761:blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; wlan5g { label = "hc5761:blue:wlan5g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts index 73f1a4079a..83a3a67ed0 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts @@ -24,6 +24,7 @@ wlan2g { label = "hc5861:blue:wlan2g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; internet { @@ -34,6 +35,7 @@ wlan5g { label = "hc5861:blue:wlan5g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; turbo { diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index 77a98fa095..02899d646d 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -111,19 +111,12 @@ glinet,gl-mt300n|\ glinet,gl-mt750) set_wifi_led "$boardname:wlan" ;; -hiwifi,hc5661) - ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x01" - set_wifi_led "$boardname:blue:wlan2g" - ;; +hiwifi,hc5661|\ hiwifi,hc5761) ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x01" - ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0" - ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1" ;; hiwifi,hc5861) ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x20" - ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0" - ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1" ;; hnet,c108) ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" From 1f8ab1c6406451641c05e8cb1e72f7c173a114a3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 19:37:34 -0800 Subject: [PATCH 195/480] libcxx: Build with the libsupc++ ABI Allows proper exception handling. This includes removing unimplemented warnings. File size increased as a result: Before: 182874 After: 211006 On mipsel_24kc. Note that this requires libsupc++ anyway. It's specified in g++-libcxx. Signed-off-by: Rosen Penev --- package/libs/libcxx/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile index 695b0398fe..60978bdc31 100644 --- a/package/libs/libcxx/Makefile +++ b/package/libs/libcxx/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcxx PKG_VERSION:=9.0.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.llvm.org/git/libcxx @@ -37,6 +37,7 @@ define Package/libcxx/description endef CMAKE_OPTIONS += \ + -DLIBCXX_CXX_ABI="libsupc++" \ -DLIBCXX_ENABLE_ASSERTIONS=OFF \ -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \ -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ From 9f7d36d1a995c03a8eaccf10f06f57332bc5c1c0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 19:37:35 -0800 Subject: [PATCH 196/480] libcxx: Add size optimizations Changed standard to 2a. 2a (as well as 17) contain more constexpr functions, which are evaluated at compile time. This saves space. Added --gc-sections. With the CXXABI change, this now makes the package smaller. With these, size went down to 210845 on mipsel_24kc. Also fixed two small compiler warnings. No real change in behavior. Signed-off-by: Rosen Penev --- package/libs/libcxx/Makefile | 2 +- package/libs/libcxx/patches/010-cxx17.patch | 14 ++++++++++++ package/libs/libcxx/patches/020-fixes.patch | 24 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 package/libs/libcxx/patches/010-cxx17.patch create mode 100644 package/libs/libcxx/patches/020-fixes.patch diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile index 60978bdc31..1d8e502221 100644 --- a/package/libs/libcxx/Makefile +++ b/package/libs/libcxx/Makefile @@ -47,7 +47,7 @@ CMAKE_OPTIONS += \ -DLIBCXX_HAS_MUSL_LIBC=$(if $(CONFIG_USE_MUSL),ON,OFF) TARGET_CXXFLAGS += -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -Wno-attributes -flto -TARGET_LDFLAGS += -Wl,--as-needed +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -flto=jobserver define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) diff --git a/package/libs/libcxx/patches/010-cxx17.patch b/package/libs/libcxx/patches/010-cxx17.patch new file mode 100644 index 0000000000..c313c47611 --- /dev/null +++ b/package/libs/libcxx/patches/010-cxx17.patch @@ -0,0 +1,14 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -524,9 +524,9 @@ remove_flags(-Wno-pedantic -pedantic-errors -pedantic) + if (LIBCXX_HAS_MUSL_LIBC OR LIBCXX_TARGETING_CLANG_CL) + # musl's pthread implementations uses volatile types in their structs which is + # not a constexpr in C++11 but is in C++14, so we use C++14 with musl. +- set(LIBCXX_STANDARD_VER c++14 CACHE STRING "internal option to change build dialect") ++ set(LIBCXX_STANDARD_VER c++2a CACHE STRING "internal option to change build dialect") + else() +- set(LIBCXX_STANDARD_VER c++11 CACHE STRING "internal option to change build dialect") ++ set(LIBCXX_STANDARD_VER c++2a CACHE STRING "internal option to change build dialect") + endif() + add_compile_flags_if_supported(-std=${LIBCXX_STANDARD_VER}) + add_compile_flags_if_supported("/std:${LIBCXX_STANDARD_VER}") diff --git a/package/libs/libcxx/patches/020-fixes.patch b/package/libs/libcxx/patches/020-fixes.patch new file mode 100644 index 0000000000..abc630d42f --- /dev/null +++ b/package/libs/libcxx/patches/020-fixes.patch @@ -0,0 +1,24 @@ +--- a/include/memory ++++ b/include/memory +@@ -1696,7 +1696,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits + ptrdiff_t _Np = __end1 - __begin1; + __end2 -= _Np; + if (_Np > 0) +- _VSTD::memcpy(__end2, __begin1, _Np * sizeof(_Tp)); ++ __end2 = __begin1; + } + + private: +--- a/src/filesystem/filesystem_common.h ++++ b/src/filesystem/filesystem_common.h +@@ -197,8 +197,8 @@ private: + using chrono::duration; + using chrono::duration_cast; + +-using TimeSpec = struct ::timespec; +-using StatT = struct ::stat; ++using TimeSpec = struct timespec; ++using StatT = struct stat; + + template ::value> From dec46a9ea0935f5f3a24626581c44ec4f1fbd676 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 18:06:27 -0800 Subject: [PATCH 197/480] scripts/gen-dependencies.sh: replace backticks with $() Found with shellcheck. Signed-off-by: Rosen Penev --- scripts/gen-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gen-dependencies.sh b/scripts/gen-dependencies.sh index 0aa01b78ec..01bb5ac037 100755 --- a/scripts/gen-dependencies.sh +++ b/scripts/gen-dependencies.sh @@ -24,8 +24,8 @@ find $TARGETS -type f -a -exec file {} \; | \ awk '$2 ~ /NEEDED/ && $NF !~ /interpreter/ && $NF ~ /^\[?lib.*\.so/ { gsub(/[\[\]]/, "", $NF); print $NF }' | \ sort -u -tmp=`mktemp $TMP_DIR/dep.XXXXXXXX` -for kmod in `find $TARGETS -type f -name \*.ko`; do +tmp=$(mktemp $TMP_DIR/dep.XXXXXXXX) +for kmod in $(find $TARGETS -type f -name \*.ko); do $OBJCOPY -O binary -j .modinfo $kmod $tmp sed -e 's,\x00,\n,g' $tmp | \ sed -ne '/^depends=.\+/ { s/^depends=//; s/,/.ko\n/g; s/$/.ko/p; q }' From 33f87d2ef6c729c077e923673d2af28ec0ddb7da Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 18:06:28 -0800 Subject: [PATCH 198/480] scripts/gen-dependencies.sh: use /bin/sh This uses no special bash stuff. Signed-off-by: Rosen Penev --- scripts/gen-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen-dependencies.sh b/scripts/gen-dependencies.sh index 01bb5ac037..4beff74bb0 100755 --- a/scripts/gen-dependencies.sh +++ b/scripts/gen-dependencies.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2012 OpenWrt.org # From 1e7c6381f0058e49caab8de54eaad4862732f95d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 2 Jan 2020 03:11:39 +0100 Subject: [PATCH 199/480] ramips: convert TP-Link MT7620 boards to tpt trigger This converts all MediaTek MT7620 boards from TP-Link to use the now supported WiFi throughput LED trigger. This way, the LED state now covers all VAPs regardless of their name. Also align all single-WiFi LEDs to represent the state of the 2.4GHz radio. This was not always the case previously, as later-added support for the MT7610 altered the phy probing order. Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts | 1 + target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts | 2 ++ target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts | 1 + target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts | 2 ++ target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts | 1 + target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts | 2 +- target/linux/ramips/mt7620/base-files/etc/board.d/01_leds | 6 ------ 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts index 45752c095d..58e4b39b55 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts @@ -48,6 +48,7 @@ wlan { label = "archer-c2-v1:green:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts index 59e109c8a2..b1d3e23450 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts @@ -47,11 +47,13 @@ wlan5g { label = "archer-c20-v1:blue:wlan5g"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; wlan2g { label = "archer-c20-v1:blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; wps { diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index 707453d2b5..694528d749 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts @@ -38,6 +38,7 @@ wlan { label = "archer-c20i:blue:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts index ed2b00836e..ca03d2ed78 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts @@ -47,11 +47,13 @@ wlan5g { label = "archer-c50-v1:green:wlan5g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; wlan2g { label = "archer-c50-v1:green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; wps { diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts index bc7825df00..dccced0f18 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts @@ -71,6 +71,7 @@ wlan { label = "archer-mr200:white:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts index 39fdc0af53..afc94c538c 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts @@ -53,7 +53,7 @@ wlan2g_green { label = "re200-v1:green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1radio"; + linux,default-trigger = "phy1tpt"; }; }; diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index 02899d646d..fe6dfac50e 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -168,28 +168,22 @@ zbtlink,zbt-we826-e) tplink,archer-c2-v1) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch1" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch1" "0x01" - set_wifi_led "$boardname:green:wlan" ;; tplink,archer-c20-v1) ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01" - ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:blue:wlan2g" "wlan0" ;; tplink,archer-c20i) ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01" - ucidef_set_led_wlan "wlan" "wlan" "$boardname:blue:wlan" "phy0radio" ;; tplink,archer-c50-v1) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" - ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" wlan1 - set_wifi_led "$boardname:green:wlan5g" ;; tplink,archer-mr200) ucidef_set_led_netdev "lan" "lan" "$boardname:white:lan" "eth0.1" ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "usb0" - set_wifi_led "$boardname:white:wlan" ;; tplink,re200-v1) ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" From a272fafc9c507820cc62aa12464588bac45f250a Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 2 Jan 2020 19:10:50 +0100 Subject: [PATCH 200/480] ramips: add system LED indicators for TP-Link C20i Use the WPS LED to indicate system status like it is done for the TP-Link Archer C2 v1 and many other boards. Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index 694528d749..a363af96cd 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts @@ -7,6 +7,10 @@ model = "TP-Link Archer C20i"; aliases { + led-boot = &led_wps; + led-failsafe = &led_wps; + led-running = &led_wps; + led-upgrade = &led_wps; label-mac-device = ðernet; }; @@ -25,7 +29,7 @@ linux,default-trigger = "usbport"; }; - wps { + led_wps: wps { label = "archer-c20i:blue:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; From dcc923a4c45b48fcbef4f3964f74fbcaabad335e Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 2 Jan 2020 19:25:26 +0100 Subject: [PATCH 201/480] ramips: fix Archer C2 v1 5GHz MAC address The TP-Link Archer C2 v1 previously had a generic Ralink MAC address set for the 5GHz radio (MT7610), as the caldata does only contain a generic MAC address. Set the MAC address from the vendor firmware for the 5GHz radio to assign unique MAC addresses to every device. Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts index 58e4b39b55..efa83eb16d 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts @@ -185,5 +185,7 @@ mt76@0,0 { reg = <0x0000 0 0 0 0>; mediatek,mtd-eeprom = <&radio 0x8000>; + mtd-mac-address = <&rom 0xf100>; + mtd-mac-address-increment = <(-1)>; }; }; From 3b013dcdf8d8aa0e3601e3aac30342318025e32a Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 2 Jan 2020 19:27:54 +0100 Subject: [PATCH 202/480] ramips: fix Archer C20i wireless MAC address The TP-Link Archer C20i previously had a generic Ralink MAC address set for both radios, as the caldata does only contain a generic MAC address. Set the MAC address from the vendor firmware for both radios to assign unique MAC addresses to every device. Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index a363af96cd..7e05a2e1ea 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts @@ -53,3 +53,12 @@ ralink,function = "gpio"; }; }; + +&wmac { + mtd-mac-address = <&rom 0xf100>; +}; + +&wifi { + mtd-mac-address = <&rom 0xf100>; + mtd-mac-address-increment = <(-1)>; +}; From 2fe5319d587c9c66ecbd7acbd5efbc1ff6fac8a8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 18:01:42 -0800 Subject: [PATCH 203/480] scripts/env: use explicit find location Some find binaries do not imply the current directory. Found with shellcheck. Signed-off-by: Rosen Penev --- scripts/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/env b/scripts/env index 84166ae5fe..f93a587894 100755 --- a/scripts/env +++ b/scripts/env @@ -136,7 +136,7 @@ env_clear() { env_init [ -L "$BASEDIR/.config" ] && rm -f "$BASEDIR/.config" [ -L "$BASEDIR/files" ] && rm -f "$BASEDIR/files" - [ -f "$ENVDIR/.config" ] || ( cd "$ENVDIR/files" && find | grep -vE '^\.$' > /dev/null ) + [ -f "$ENVDIR/.config" ] || ( cd "$ENVDIR/files" && find . | grep -vE '^\.$' > /dev/null ) env_sync_data if ask_bool 1 "Do you want to keep your current config and files"; then mkdir -p "$BASEDIR/files" From 995378a2a56d132594834a31c370d877c7d46d5c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 18:01:43 -0800 Subject: [PATCH 204/480] scripts/env: replace -a and -o with &&/|| The former are not well defined. Found with shellcheck. Signed-off-by: Rosen Penev --- scripts/env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/env b/scripts/env index f93a587894..7bfca58c5d 100755 --- a/scripts/env +++ b/scripts/env @@ -73,7 +73,7 @@ env_init() { } env_sync_data() { - [ \! -L "$BASEDIR/.config" -a -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR" + [ \! -L "$BASEDIR/.config" ] && [ -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR" git add . git add -u } @@ -185,7 +185,7 @@ env_new() { env_init 1 branch="$(git branch | grep '^\* ' | awk '{print $2}')" - if [ -n "$branch" -a "$branch" != "master" ]; then + if [ -n "$branch" ] && [ "$branch" != "master" ]; then env_ask_sync if ask_bool 0 "Do you want to clone the current environment?"; then from="$branch" @@ -193,15 +193,15 @@ env_new() { rm -f "$BASEDIR/.config" "$BASEDIR/files" fi git checkout -b "$1" "$from" - if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then + if [ -f "$BASEDIR/.config" ] || [ -d "$BASEDIR/files" ]; then if ask_bool 1 "Do you want to start your configuration repository with the current configuration?"; then - [ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && { + if [ -d "$BASEDIR/files" ] && [ \! -L "$BASEDIR/files" ]; then mkdir -p "$ENVDIR/files" shopt -s dotglob mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null shopt -u dotglob rmdir "$BASEDIR/files" - } + fi env_sync else rm -rf "$BASEDIR/.config" "$BASEDIR/files" From e37e2f0cf1be1d31d4e056de1a9177221b6a78f0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 31 Dec 2019 18:07:05 -0800 Subject: [PATCH 205/480] scripts/arm-magic.sh: switch to /bin/sh This does not use any special bash stuff. Signed-off-by: Rosen Penev --- scripts/arm-magic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/arm-magic.sh b/scripts/arm-magic.sh index 29ec88ab2f..b4b0fa94f5 100755 --- a/scripts/arm-magic.sh +++ b/scripts/arm-magic.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Empty/wrong machtype-workaround generator # From 6e70e4a071b233da83486414e65d15756ede63d2 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 28 Dec 2019 16:04:48 +0100 Subject: [PATCH 206/480] samsung: use soc_vendor_model scheme for DTS file name This patch changes the samsung target to calculate the DTS file name from vendor and device name and the SOC (i.e. subtarget) following the common scheme: soc_vendor_model.dts This also updates the device definition name to make compatible, image name, menuconfig name and DTS name consistent. Signed-off-by: Adrian Schmutzler --- .../dts/{TQ210.dts => s5pv210_embedsky_tq210.dts} | 0 target/linux/samsung/image/Makefile | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) rename target/linux/samsung/dts/{TQ210.dts => s5pv210_embedsky_tq210.dts} (100%) diff --git a/target/linux/samsung/dts/TQ210.dts b/target/linux/samsung/dts/s5pv210_embedsky_tq210.dts similarity index 100% rename from target/linux/samsung/dts/TQ210.dts rename to target/linux/samsung/dts/s5pv210_embedsky_tq210.dts diff --git a/target/linux/samsung/image/Makefile b/target/linux/samsung/image/Makefile index 697d317c9f..53509ef137 100644 --- a/target/linux/samsung/image/Makefile +++ b/target/linux/samsung/image/Makefile @@ -13,14 +13,15 @@ define Device/Default PROFILES = Default KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none + DEVICE_DTS_DIR := ../dts + DEVICE_DTS = $$(SOC)_$(1) endef -define Device/tq210 - DEVICE_VENDOR := Samsung +define Device/embedsky_tq210 + DEVICE_VENDOR := EmbedSky DEVICE_MODEL := TQ210 - DEVICE_DTS_DIR := ../dts - DEVICE_DTS := TQ210 + SOC := s5pv210 endef -TARGET_DEVICES += tq210 +TARGET_DEVICES += embedsky_tq210 $(eval $(call BuildImage)) From 1b44ecc2d71606bf9faf45361deef398849e2c4f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 28 Dec 2019 16:08:38 +0100 Subject: [PATCH 207/480] samsung: add subtarget condition for device The only device in samsung target is meant to be built with s5pv210 subtarget. Thus, though this won't make a difference for a one-subtarget target, already add the condition to the Makefile to make the assignment obvious. Signed-off-by: Adrian Schmutzler --- target/linux/samsung/image/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/samsung/image/Makefile b/target/linux/samsung/image/Makefile index 53509ef137..3648562704 100644 --- a/target/linux/samsung/image/Makefile +++ b/target/linux/samsung/image/Makefile @@ -17,6 +17,8 @@ define Device/Default DEVICE_DTS = $$(SOC)_$(1) endef +ifeq ($(SUBTARGET),s5pv210) + define Device/embedsky_tq210 DEVICE_VENDOR := EmbedSky DEVICE_MODEL := TQ210 @@ -24,4 +26,6 @@ define Device/embedsky_tq210 endef TARGET_DEVICES += embedsky_tq210 +endif + $(eval $(call BuildImage)) From ed3e1bd2cc8191c056e041184519f80bae192a20 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 17 Dec 2019 17:50:58 +0100 Subject: [PATCH 208/480] lantiq: remove includes of non-existent /lib/functions/lantiq.sh lantiq.sh is still included in files which do not use it anymore. Remove the includes. Signed-off-by: Adrian Schmutzler --- .../lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface | 1 - .../lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq | 2 -- 2 files changed, 3 deletions(-) diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface b/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface index 3b0313d1aa..dd57ca6d39 100644 --- a/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface +++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface @@ -1,7 +1,6 @@ #!/bin/sh . /lib/functions.sh -. /lib/functions/lantiq.sh IFNAME_CHANGED=0 diff --git a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq index 7ed0fabcf7..4f7dc6673c 100644 --- a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq +++ b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq @@ -1,7 +1,5 @@ #!/bin/sh -. /lib/functions/lantiq.sh - set_preinit_iface() { ifname=eth0 } From f943d846154c5297228511a83f1e13edba039e57 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 17 Dec 2019 01:30:22 +0100 Subject: [PATCH 209/480] lantiq: use shared code for LED migration Shared base-files package contains functions for LED migration that are already used by several targets. Apply those also to lantiq and drop the (redundant) local code. While at it, reorder board names in file. Signed-off-by: Adrian Schmutzler --- .../etc/uci-defaults/01_led_migration | 51 +++---------------- 1 file changed, 6 insertions(+), 45 deletions(-) diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration index dc594e35e9..b1e7be6bd2 100644 --- a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration +++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration @@ -3,37 +3,7 @@ # Copyright (C) 2013 OpenWrt.org # -LED_OPTIONS_CHANGED=0 - -. /lib/functions.sh - -do_led_update_sysfs() -{ - local cfg=$1; shift - local tuples="$@" - local sysfs - local name - - config_get sysfs $cfg sysfs - config_get name $cfg name - - [ -z "$sysfs" ] && return - - for tuple in $tuples; do - local old=${tuple%=*} - local new=${tuple#*=} - local new_sysfs - - new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/") - - [ "$new_sysfs" = "$sysfs" ] && continue - - uci set system.${cfg}.sysfs="${new_sysfs}" - LED_OPTIONS_CHANGED=1 - - logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}" - done; -} +. /lib/functions/migrations.sh do_internet_led_rename() { @@ -45,38 +15,29 @@ do_internet_led_rename() uci rename system.led_internet=led_dsl uci set system.led_dsl.name=dsl - LED_OPTIONS_CHANGED=1 logger -t led-migration "internet led renamed to dsl" } -migrate_leds() -{ - config_load system - config_foreach do_led_update_sysfs led "$@" -} - case "$(board_name)" in +alphanetworks,asl56026|\ arcadyan,arv452cqw|\ arcadyan,arv7510pw22|\ arcadyan,arv7519rw22|\ arcadyan,arv752dpw|\ arcadyan,arv752dpw22|\ -alphanetworks,asl56026|\ +arcadyan,vg3503j|\ +avm,fritz7360sl|\ bt,homehub-v2b|\ bt,homehub-v3a|\ -bt,homehub-v5a|\ -avm,fritz7360sl|\ -arcadyan,vg3503j) +bt,homehub-v5a) do_internet_led_rename ;; netgear,dgn3500|\ netgear,dgn3500b) migrate_leds "dgn3500:blue:wireless=dgn3500:green:wireless" ;; -*) - ;; esac -[ "$LED_OPTIONS_CHANGED" = "1" ] && uci commit system +migrations_apply system exit 0 From 113e51f79aa4bb44b436f1f103f9bb934806eff9 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Sat, 14 Dec 2019 00:24:39 +0800 Subject: [PATCH 210/480] ramips: move set-irq-affinity script to mt7621 subtarget Move the set-irq-affinity script to mt7621 because it is the only SMP subtarget. Signed-off-by: DENG Qingfang --- .../ramips/{ => mt7621}/base-files/etc/init.d/set-irq-affinity | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename target/linux/ramips/{ => mt7621}/base-files/etc/init.d/set-irq-affinity (100%) diff --git a/target/linux/ramips/base-files/etc/init.d/set-irq-affinity b/target/linux/ramips/mt7621/base-files/etc/init.d/set-irq-affinity similarity index 100% rename from target/linux/ramips/base-files/etc/init.d/set-irq-affinity rename to target/linux/ramips/mt7621/base-files/etc/init.d/set-irq-affinity From 3e1325b219fced91f01d5594503f61d326a93b90 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Tue, 3 Dec 2019 23:36:13 +0100 Subject: [PATCH 211/480] ramips: fix inverted reset button for Ravpower WD03 The button events "pressed" and "released" were switched. Tested with v18.06.4. Signed-off-by: Moritz Warning --- target/linux/ramips/dts/mt7620n_ravpower_wd03.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts index ee92860b9f..1740de16eb 100644 --- a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts +++ b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts @@ -32,7 +32,7 @@ reset { label = "reset"; - gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; linux,code = ; }; }; From 1de8fc93ca449942a0fc28234aac8d372542a7b5 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 3 Jan 2020 17:22:40 +0100 Subject: [PATCH 212/480] mt76: update to the latest version 38f4c57 mt76: mt76x0: fix default mac address overwrite Signed-off-by: David Bauer --- package/kernel/mt76/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 7de2d42868..c64a1384f6 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2019-12-27 -PKG_SOURCE_VERSION:=4cb1195a153087d84995f410285c8ecb587b1456 -PKG_MIRROR_HASH:=921533be9935155cdde6aaa71cd6f0de2b03948da432c5be11b33756dcffb0c9 +PKG_SOURCE_DATE:=2020-01-03 +PKG_SOURCE_VERSION:=38f4c579898d799657b227831a7b4bab156f785d +PKG_MIRROR_HASH:=375e065c66dcd424cc31426f4c9cfb2824d2e94091c8e1d2168e9a2ee1064c95 PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 From 32e4eaef1b4c2a7fa44787813fdf715b2ba500d9 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 3 Jan 2020 14:58:58 -0800 Subject: [PATCH 213/480] sunxi: Turn on CONFIG_PINCTRL_SUN4I_A10 for A20 CONFIG_PINCTRL_SUN4I_A10 controls both the A10 and the A20 enablong of the pinctrl driver, this is necessary since upstream commit 5d8d349618a9464714c07414c5888bfd9416638f ("pinctrl: sunxi: add A20 support to A10 driver") which has been included in v4.13 and onwards. Fixes: ad2b3bf310f7 ("sunxi: Add support for kernel 4.14") Signed-off-by: Florian Fainelli --- target/linux/sunxi/cortexa7/config-4.14 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/sunxi/cortexa7/config-4.14 b/target/linux/sunxi/cortexa7/config-4.14 index ee8873e081..f0b6a7a861 100644 --- a/target/linux/sunxi/cortexa7/config-4.14 +++ b/target/linux/sunxi/cortexa7/config-4.14 @@ -3,7 +3,7 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_MACH_SUN4I is not set # CONFIG_MACH_SUN5I is not set # CONFIG_PINCTRL_GR8 is not set -# CONFIG_PINCTRL_SUN4I_A10 is not set +CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN5I_A10S is not set # CONFIG_PINCTRL_SUN5I_A13 is not set CONFIG_MDIO_BUS_MUX=y From 9a417fbd0d61cf01d36df0b91ed0490c06dbe5eb Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 2 Jan 2020 20:27:55 +0100 Subject: [PATCH 214/480] kernel: bump 4.14 to 4.14.161 Refreshed all patches. Compile-tested on: ipq40xx, ramips Runtime-tested on: ipq40xx Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 +- ...0-add-linux-spidev-compatible-si3210.patch | 2 +- .../pending-4.14/630-packet_socket_type.patch | 16 ++++---- .../819-sdhc-support-layerscape.patch | 34 ++++++++--------- ...ediatek-add-support-of-mt2701-mt2712.patch | 20 +++++----- ...e-hs400_tune_response-only-for-mt817.patch | 8 ++-- ...3-mmc-mediatek-add-pad_tune0-support.patch | 38 +++++++++---------- ...add-async-fifo-and-data-tune-support.patch | 24 ++++++------ ...-mmc-mediatek-add-busy_check-support.patch | 12 +++--- ...-stop_clk-fix-and-enhance_rx-support.patch | 26 ++++++------- ...iatek-add-support-of-source_cg-clock.patch | 12 +++--- ...58-mmc-mediatek-add-latch-ck-support.patch | 6 +-- ...rove-eMMC-hs400-mode-read-performanc.patch | 10 ++--- ...fer-to-use-rise-edge-latching-for-cm.patch | 2 +- ...-mediatek-add-support-for-MT7622-SoC.patch | 2 +- 15 files changed, 108 insertions(+), 108 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index bc2373d7a9..adc15b3d8c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .207 -LINUX_VERSION-4.14 = .160 +LINUX_VERSION-4.14 = .161 LINUX_VERSION-4.19 = .91 LINUX_KERNEL_HASH-4.9.207 = ca86637e7b5bec65eeb7da695824e0e8aca5ba52eb742885f0b7241977400124 -LINUX_KERNEL_HASH-4.14.160 = c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c +LINUX_KERNEL_HASH-4.14.161 = 9d23629f50e6c7313c4f1277455137b7727a6117df931c4c4fb7fab7e98f81c9 LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch index b00fb8ee2e..3a42182c97 100644 --- a/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch +++ b/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch @@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -669,6 +669,7 @@ static const struct of_device_id spidev_ +@@ -672,6 +672,7 @@ static const struct of_device_id spidev_ { .compatible = "lineartechnology,ltc2488" }, { .compatible = "ge,achc" }, { .compatible = "semtech,sx1301" }, diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch index 8dbe06023e..1c9af3f2b2 100644 --- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.14/630-packet_socket_type.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1829,6 +1829,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1830,6 +1830,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1836,6 +1837,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1837,6 +1838,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1848,7 +1850,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1849,7 +1851,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2075,12 +2077,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2076,12 +2078,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2206,12 +2208,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2207,12 +2209,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3294,6 +3296,7 @@ static int packet_create(struct net *net +@@ -3295,6 +3297,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3907,6 +3910,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3908,6 +3911,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3959,6 +3972,13 @@ static int packet_getsockopt(struct sock +@@ -3960,6 +3973,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch index 60d0c889e5..02688c74cd 100644 --- a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch @@ -265,7 +265,7 @@ Signed-off-by: Yinbo Zhu u32 val; sdhci_reset(host, mask); -@@ -622,6 +713,12 @@ static void esdhc_reset(struct sdhci_hos +@@ -619,6 +710,12 @@ static void esdhc_reset(struct sdhci_hos val = sdhci_readl(host, ESDHC_TBCTL); val &= ~ESDHC_TB_EN; sdhci_writel(host, val, ESDHC_TBCTL); @@ -278,7 +278,7 @@ Signed-off-by: Yinbo Zhu } } -@@ -633,6 +730,7 @@ static void esdhc_reset(struct sdhci_hos +@@ -630,6 +727,7 @@ static void esdhc_reset(struct sdhci_hos static const struct of_device_id scfg_device_ids[] = { { .compatible = "fsl,t1040-scfg", }, { .compatible = "fsl,ls1012a-scfg", }, @@ -286,7 +286,7 @@ Signed-off-by: Yinbo Zhu { .compatible = "fsl,ls1046a-scfg", }, {} }; -@@ -695,23 +793,91 @@ static int esdhc_signal_voltage_switch(s +@@ -692,23 +790,91 @@ static int esdhc_signal_voltage_switch(s } } @@ -383,7 +383,7 @@ Signed-off-by: Yinbo Zhu } #ifdef CONFIG_PM_SLEEP -@@ -760,7 +926,7 @@ static const struct sdhci_ops sdhci_esdh +@@ -757,7 +923,7 @@ static const struct sdhci_ops sdhci_esdh .adma_workaround = esdhc_of_adma_workaround, .set_bus_width = esdhc_pltfm_set_bus_width, .reset = esdhc_reset, @@ -392,7 +392,7 @@ Signed-off-by: Yinbo Zhu }; static const struct sdhci_ops sdhci_esdhc_le_ops = { -@@ -777,7 +943,7 @@ static const struct sdhci_ops sdhci_esdh +@@ -774,7 +940,7 @@ static const struct sdhci_ops sdhci_esdh .adma_workaround = esdhc_of_adma_workaround, .set_bus_width = esdhc_pltfm_set_bus_width, .reset = esdhc_reset, @@ -401,7 +401,7 @@ Signed-off-by: Yinbo Zhu }; static const struct sdhci_pltfm_data sdhci_esdhc_be_pdata = { -@@ -803,8 +969,20 @@ static struct soc_device_attribute soc_i +@@ -800,8 +966,20 @@ static struct soc_device_attribute soc_i { }, }; @@ -422,7 +422,7 @@ Signed-off-by: Yinbo Zhu struct sdhci_pltfm_host *pltfm_host; struct sdhci_esdhc *esdhc; struct device_node *np; -@@ -824,6 +1002,24 @@ static void esdhc_init(struct platform_d +@@ -821,6 +999,24 @@ static void esdhc_init(struct platform_d else esdhc->quirk_incorrect_hostver = false; @@ -447,7 +447,7 @@ Signed-off-by: Yinbo Zhu np = pdev->dev.of_node; clk = of_clk_get(np, 0); if (!IS_ERR(clk)) { -@@ -851,6 +1047,12 @@ static void esdhc_init(struct platform_d +@@ -848,6 +1044,12 @@ static void esdhc_init(struct platform_d } } @@ -460,7 +460,7 @@ Signed-off-by: Yinbo Zhu static int sdhci_esdhc_probe(struct platform_device *pdev) { struct sdhci_host *host; -@@ -874,6 +1076,7 @@ static int sdhci_esdhc_probe(struct plat +@@ -871,6 +1073,7 @@ static int sdhci_esdhc_probe(struct plat host->mmc_host_ops.start_signal_voltage_switch = esdhc_signal_voltage_switch; host->mmc_host_ops.execute_tuning = esdhc_execute_tuning; @@ -468,7 +468,7 @@ Signed-off-by: Yinbo Zhu host->tuning_delay = 1; esdhc_init(pdev, host); -@@ -882,6 +1085,11 @@ static int sdhci_esdhc_probe(struct plat +@@ -879,6 +1082,11 @@ static int sdhci_esdhc_probe(struct plat pltfm_host = sdhci_priv(host); esdhc = sdhci_pltfm_priv(pltfm_host); @@ -480,7 +480,7 @@ Signed-off-by: Yinbo Zhu if (esdhc->vendor_ver == VENDOR_V_22) host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; -@@ -928,14 +1136,6 @@ static int sdhci_esdhc_probe(struct plat +@@ -925,14 +1133,6 @@ static int sdhci_esdhc_probe(struct plat return ret; } @@ -497,7 +497,7 @@ Signed-off-by: Yinbo Zhu .name = "sdhci-esdhc", --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -2150,7 +2150,7 @@ static void sdhci_send_tuning(struct sdh +@@ -2148,7 +2148,7 @@ static void sdhci_send_tuning(struct sdh } @@ -506,9 +506,9 @@ Signed-off-by: Yinbo Zhu { int i; -@@ -2167,13 +2167,13 @@ static void __sdhci_execute_tuning(struc - pr_info("%s: Tuning timeout, falling back to fixed sampling clock\n", - mmc_hostname(host->mmc)); +@@ -2165,13 +2165,13 @@ static void __sdhci_execute_tuning(struc + pr_debug("%s: Tuning timeout, falling back to fixed sampling clock\n", + mmc_hostname(host->mmc)); sdhci_abort_tuning(host, opcode); - return; + return -ETIMEDOUT; @@ -522,7 +522,7 @@ Signed-off-by: Yinbo Zhu break; } -@@ -2185,6 +2185,7 @@ static void __sdhci_execute_tuning(struc +@@ -2183,6 +2183,7 @@ static void __sdhci_execute_tuning(struc pr_info("%s: Tuning failed, falling back to fixed sampling clock\n", mmc_hostname(host->mmc)); sdhci_reset_tuning(host); @@ -530,7 +530,7 @@ Signed-off-by: Yinbo Zhu } int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) -@@ -2246,7 +2247,7 @@ int sdhci_execute_tuning(struct mmc_host +@@ -2244,7 +2245,7 @@ int sdhci_execute_tuning(struct mmc_host sdhci_start_tuning(host); diff --git a/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch b/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch index 9b43df80e0..c06cf73a78 100644 --- a/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch +++ b/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch @@ -26,7 +26,7 @@ Signed-off-by: Ulf Hansson /* MSDC_IOCON mask */ #define MSDC_IOCON_SDR104CKS (0x1 << 0) /* RW */ -@@ -295,6 +298,10 @@ struct msdc_save_para { +@@ -297,6 +300,10 @@ struct msdc_save_para { u32 emmc50_cfg0; }; @@ -37,7 +37,7 @@ Signed-off-by: Ulf Hansson struct msdc_tune_para { u32 iocon; u32 pad_tune; -@@ -309,6 +316,7 @@ struct msdc_delay_phase { +@@ -311,6 +318,7 @@ struct msdc_delay_phase { struct msdc_host { struct device *dev; @@ -45,7 +45,7 @@ Signed-off-by: Ulf Hansson struct mmc_host *mmc; /* mmc structure */ int cmd_rsp; -@@ -350,6 +358,31 @@ struct msdc_host { +@@ -352,6 +360,31 @@ struct msdc_host { struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */ }; @@ -77,7 +77,7 @@ Signed-off-by: Ulf Hansson static void sdr_set_bits(void __iomem *reg, u32 bs) { u32 val = readl(reg); -@@ -509,7 +542,12 @@ static void msdc_set_timeout(struct msdc +@@ -511,7 +544,12 @@ static void msdc_set_timeout(struct msdc timeout = (ns + clk_ns - 1) / clk_ns + clks; /* in 1048576 sclk cycle unit */ timeout = (timeout + (0x1 << 20) - 1) >> 20; @@ -91,7 +91,7 @@ Signed-off-by: Ulf Hansson /*DDR mode will double the clk cycles for data timeout */ timeout = mode >= 2 ? timeout * 2 : timeout; timeout = timeout > 1 ? timeout - 1 : 0; -@@ -548,7 +586,11 @@ static void msdc_set_mclk(struct msdc_ho +@@ -550,7 +588,11 @@ static void msdc_set_mclk(struct msdc_ho flags = readl(host->base + MSDC_INTEN); sdr_clr_bits(host->base + MSDC_INTEN, flags); @@ -104,7 +104,7 @@ Signed-off-by: Ulf Hansson if (timing == MMC_TIMING_UHS_DDR50 || timing == MMC_TIMING_MMC_DDR52 || timing == MMC_TIMING_MMC_HS400) { -@@ -568,8 +610,12 @@ static void msdc_set_mclk(struct msdc_ho +@@ -570,8 +612,12 @@ static void msdc_set_mclk(struct msdc_ho if (timing == MMC_TIMING_MMC_HS400 && hz >= (host->src_clk_freq >> 1)) { @@ -119,7 +119,7 @@ Signed-off-by: Ulf Hansson sclk = host->src_clk_freq >> 1; div = 0; /* div is ignore when bit18 is set */ } -@@ -587,8 +633,15 @@ static void msdc_set_mclk(struct msdc_ho +@@ -589,8 +635,15 @@ static void msdc_set_mclk(struct msdc_ho sclk = (host->src_clk_freq >> 2) / div; } } @@ -137,7 +137,7 @@ Signed-off-by: Ulf Hansson sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN); while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB)) cpu_relax(); -@@ -1617,12 +1670,17 @@ static int msdc_drv_probe(struct platfor +@@ -1620,12 +1673,17 @@ static int msdc_drv_probe(struct platfor struct mmc_host *mmc; struct msdc_host *host; struct resource *res; @@ -155,7 +155,7 @@ Signed-off-by: Ulf Hansson /* Allocate MMC host for this device */ mmc = mmc_alloc_host(sizeof(struct msdc_host), &pdev->dev); if (!mmc) -@@ -1686,11 +1744,15 @@ static int msdc_drv_probe(struct platfor +@@ -1689,11 +1747,15 @@ static int msdc_drv_probe(struct platfor msdc_of_property_parse(pdev, host); host->dev = &pdev->dev; @@ -172,7 +172,7 @@ Signed-off-by: Ulf Hansson mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23; /* MMC core transfer sizes tunable parameters */ -@@ -1839,12 +1901,6 @@ static const struct dev_pm_ops msdc_dev_ +@@ -1842,12 +1904,6 @@ static const struct dev_pm_ops msdc_dev_ SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL) }; diff --git a/target/linux/mediatek/patches-4.14/0152-mmc-mediatek-make-hs400_tune_response-only-for-mt817.patch b/target/linux/mediatek/patches-4.14/0152-mmc-mediatek-make-hs400_tune_response-only-for-mt817.patch index cb7f8ffb2b..b74c3f52dc 100644 --- a/target/linux/mediatek/patches-4.14/0152-mmc-mediatek-make-hs400_tune_response-only-for-mt817.patch +++ b/target/linux/mediatek/patches-4.14/0152-mmc-mediatek-make-hs400_tune_response-only-for-mt817.patch @@ -17,7 +17,7 @@ Signed-off-by: Ulf Hansson --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c -@@ -300,6 +300,7 @@ struct msdc_save_para { +@@ -302,6 +302,7 @@ struct msdc_save_para { struct mtk_mmc_compatible { u8 clk_div_bits; @@ -25,7 +25,7 @@ Signed-off-by: Ulf Hansson }; struct msdc_tune_para { -@@ -360,18 +361,22 @@ struct msdc_host { +@@ -362,18 +363,22 @@ struct msdc_host { static const struct mtk_mmc_compatible mt8135_compat = { .clk_div_bits = 8, @@ -48,7 +48,7 @@ Signed-off-by: Ulf Hansson }; static const struct of_device_id msdc_of_ids[] = { -@@ -666,7 +671,8 @@ static void msdc_set_mclk(struct msdc_ho +@@ -668,7 +673,8 @@ static void msdc_set_mclk(struct msdc_ho host->base + PAD_CMD_TUNE); } @@ -58,7 +58,7 @@ Signed-off-by: Ulf Hansson sdr_set_field(host->base + PAD_CMD_TUNE, MSDC_PAD_TUNE_CMDRRDLY, host->hs400_cmd_int_delay); -@@ -1594,7 +1600,8 @@ static int msdc_execute_tuning(struct mm +@@ -1597,7 +1603,8 @@ static int msdc_execute_tuning(struct mm struct msdc_host *host = mmc_priv(mmc); int ret; diff --git a/target/linux/mediatek/patches-4.14/0153-mmc-mediatek-add-pad_tune0-support.patch b/target/linux/mediatek/patches-4.14/0153-mmc-mediatek-add-pad_tune0-support.patch index 8c4bbd261e..c8a442195f 100644 --- a/target/linux/mediatek/patches-4.14/0153-mmc-mediatek-add-pad_tune0-support.patch +++ b/target/linux/mediatek/patches-4.14/0153-mmc-mediatek-add-pad_tune0-support.patch @@ -23,7 +23,7 @@ Signed-off-by: Ulf Hansson #define PAD_DS_TUNE 0x188 #define PAD_CMD_TUNE 0x18c #define EMMC50_CFG0 0x208 -@@ -301,6 +302,7 @@ struct msdc_save_para { +@@ -303,6 +304,7 @@ struct msdc_save_para { struct mtk_mmc_compatible { u8 clk_div_bits; bool hs400_tune; /* only used for MT8173 */ @@ -31,7 +31,7 @@ Signed-off-by: Ulf Hansson }; struct msdc_tune_para { -@@ -362,21 +364,25 @@ struct msdc_host { +@@ -364,21 +366,25 @@ struct msdc_host { static const struct mtk_mmc_compatible mt8135_compat = { .clk_div_bits = 8, .hs400_tune = false, @@ -57,7 +57,7 @@ Signed-off-by: Ulf Hansson }; static const struct of_device_id msdc_of_ids[] = { -@@ -581,6 +587,7 @@ static void msdc_set_mclk(struct msdc_ho +@@ -583,6 +589,7 @@ static void msdc_set_mclk(struct msdc_ho u32 flags; u32 div; u32 sclk; @@ -65,7 +65,7 @@ Signed-off-by: Ulf Hansson if (!hz) { dev_dbg(host->dev, "set mclk to 0\n"); -@@ -663,10 +670,10 @@ static void msdc_set_mclk(struct msdc_ho +@@ -665,10 +672,10 @@ static void msdc_set_mclk(struct msdc_ho */ if (host->sclk <= 52000000) { writel(host->def_tune_para.iocon, host->base + MSDC_IOCON); @@ -78,7 +78,7 @@ Signed-off-by: Ulf Hansson writel(host->saved_tune_para.pad_cmd_tune, host->base + PAD_CMD_TUNE); } -@@ -1224,6 +1231,7 @@ static irqreturn_t msdc_irq(int irq, voi +@@ -1226,6 +1233,7 @@ static irqreturn_t msdc_irq(int irq, voi static void msdc_init_hw(struct msdc_host *host) { u32 val; @@ -86,7 +86,7 @@ Signed-off-by: Ulf Hansson /* Configure to MMC/SD mode, clock free running */ sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_MODE | MSDC_CFG_CKPDN); -@@ -1239,7 +1247,7 @@ static void msdc_init_hw(struct msdc_hos +@@ -1241,7 +1249,7 @@ static void msdc_init_hw(struct msdc_hos val = readl(host->base + MSDC_INT); writel(val, host->base + MSDC_INT); @@ -95,7 +95,7 @@ Signed-off-by: Ulf Hansson writel(0, host->base + MSDC_IOCON); sdr_set_field(host->base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 0); writel(0x403c0046, host->base + MSDC_PATCH_BIT); -@@ -1259,7 +1267,7 @@ static void msdc_init_hw(struct msdc_hos +@@ -1261,7 +1269,7 @@ static void msdc_init_hw(struct msdc_hos sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, 3); host->def_tune_para.iocon = readl(host->base + MSDC_IOCON); @@ -104,7 +104,7 @@ Signed-off-by: Ulf Hansson dev_dbg(host->dev, "init hardware done!"); } -@@ -1402,18 +1410,19 @@ static int msdc_tune_response(struct mmc +@@ -1404,18 +1412,19 @@ static int msdc_tune_response(struct mmc struct msdc_delay_phase internal_delay_phase; u8 final_delay, final_maxlen; u32 internal_delay = 0; @@ -126,7 +126,7 @@ Signed-off-by: Ulf Hansson MSDC_PAD_TUNE_CMDRDLY, i); /* * Using the same parameters, it may sometimes pass the test, -@@ -1437,7 +1446,7 @@ static int msdc_tune_response(struct mmc +@@ -1439,7 +1448,7 @@ static int msdc_tune_response(struct mmc sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_RSPL); for (i = 0; i < PAD_DELAY_MAX; i++) { @@ -135,7 +135,7 @@ Signed-off-by: Ulf Hansson MSDC_PAD_TUNE_CMDRDLY, i); /* * Using the same parameters, it may sometimes pass the test, -@@ -1462,12 +1471,12 @@ skip_fall: +@@ -1464,12 +1473,12 @@ skip_fall: final_maxlen = final_fall_delay.maxlen; if (final_maxlen == final_rise_delay.maxlen) { sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_RSPL); @@ -150,7 +150,7 @@ Signed-off-by: Ulf Hansson final_fall_delay.final_phase); final_delay = final_fall_delay.final_phase; } -@@ -1475,7 +1484,7 @@ skip_fall: +@@ -1477,7 +1486,7 @@ skip_fall: goto skip_internal; for (i = 0; i < PAD_DELAY_MAX; i++) { @@ -159,7 +159,7 @@ Signed-off-by: Ulf Hansson MSDC_PAD_TUNE_CMDRRDLY, i); mmc_send_tuning(mmc, opcode, &cmd_err); if (!cmd_err) -@@ -1483,7 +1492,7 @@ skip_fall: +@@ -1485,7 +1494,7 @@ skip_fall: } dev_dbg(host->dev, "Final internal delay: 0x%x\n", internal_delay); internal_delay_phase = get_best_delay(host, internal_delay); @@ -168,7 +168,7 @@ Signed-off-by: Ulf Hansson internal_delay_phase.final_phase); skip_internal: dev_dbg(host->dev, "Final cmd pad delay: %x\n", final_delay); -@@ -1545,12 +1554,13 @@ static int msdc_tune_data(struct mmc_hos +@@ -1548,12 +1557,13 @@ static int msdc_tune_data(struct mmc_hos u32 rise_delay = 0, fall_delay = 0; struct msdc_delay_phase final_rise_delay, final_fall_delay = { 0,}; u8 final_delay, final_maxlen; @@ -183,7 +183,7 @@ Signed-off-by: Ulf Hansson MSDC_PAD_TUNE_DATRRDLY, i); ret = mmc_send_tuning(mmc, opcode, NULL); if (!ret) -@@ -1565,7 +1575,7 @@ static int msdc_tune_data(struct mmc_hos +@@ -1568,7 +1578,7 @@ static int msdc_tune_data(struct mmc_hos sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL); sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL); for (i = 0; i < PAD_DELAY_MAX; i++) { @@ -192,7 +192,7 @@ Signed-off-by: Ulf Hansson MSDC_PAD_TUNE_DATRRDLY, i); ret = mmc_send_tuning(mmc, opcode, NULL); if (!ret) -@@ -1578,14 +1588,14 @@ skip_fall: +@@ -1581,14 +1591,14 @@ skip_fall: if (final_maxlen == final_rise_delay.maxlen) { sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL); sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL); @@ -209,7 +209,7 @@ Signed-off-by: Ulf Hansson MSDC_PAD_TUNE_DATRRDLY, final_fall_delay.final_phase); final_delay = final_fall_delay.final_phase; -@@ -1599,6 +1609,7 @@ static int msdc_execute_tuning(struct mm +@@ -1602,6 +1612,7 @@ static int msdc_execute_tuning(struct mm { struct msdc_host *host = mmc_priv(mmc); int ret; @@ -217,7 +217,7 @@ Signed-off-by: Ulf Hansson if (host->hs400_mode && host->dev_comp->hs400_tune) -@@ -1616,7 +1627,7 @@ static int msdc_execute_tuning(struct mm +@@ -1619,7 +1630,7 @@ static int msdc_execute_tuning(struct mm } host->saved_tune_para.iocon = readl(host->base + MSDC_IOCON); @@ -226,7 +226,7 @@ Signed-off-by: Ulf Hansson host->saved_tune_para.pad_cmd_tune = readl(host->base + PAD_CMD_TUNE); return ret; } -@@ -1857,10 +1868,12 @@ static int msdc_drv_remove(struct platfo +@@ -1860,10 +1871,12 @@ static int msdc_drv_remove(struct platfo #ifdef CONFIG_PM static void msdc_save_reg(struct msdc_host *host) { @@ -240,7 +240,7 @@ Signed-off-by: Ulf Hansson host->save_para.patch_bit0 = readl(host->base + MSDC_PATCH_BIT); host->save_para.patch_bit1 = readl(host->base + MSDC_PATCH_BIT1); host->save_para.pad_ds_tune = readl(host->base + PAD_DS_TUNE); -@@ -1870,10 +1883,12 @@ static void msdc_save_reg(struct msdc_ho +@@ -1873,10 +1886,12 @@ static void msdc_save_reg(struct msdc_ho static void msdc_restore_reg(struct msdc_host *host) { diff --git a/target/linux/mediatek/patches-4.14/0154-mmc-mediatek-add-async-fifo-and-data-tune-support.patch b/target/linux/mediatek/patches-4.14/0154-mmc-mediatek-add-async-fifo-and-data-tune-support.patch index abb263b712..fab917bcee 100644 --- a/target/linux/mediatek/patches-4.14/0154-mmc-mediatek-add-async-fifo-and-data-tune-support.patch +++ b/target/linux/mediatek/patches-4.14/0154-mmc-mediatek-add-async-fifo-and-data-tune-support.patch @@ -23,9 +23,9 @@ Signed-off-by: Ulf Hansson #define MSDC_PAD_TUNE 0xec #define MSDC_PAD_TUNE0 0xf0 #define PAD_DS_TUNE 0x188 -@@ -216,11 +217,20 @@ - #define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */ - #define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */ +@@ -218,11 +219,20 @@ + + #define MSDC_PATCH_BIT1_CMDTA (0x7 << 3) /* RW */ +#define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15) /* RW */ +#define MSDC_PATCH_BIT2_CFGCRCSTS (0x1 << 28) /* RW */ @@ -44,7 +44,7 @@ Signed-off-by: Ulf Hansson #define PAD_DS_TUNE_DLY1 (0x1f << 2) /* RW */ #define PAD_DS_TUNE_DLY2 (0x1f << 7) /* RW */ -@@ -294,6 +304,7 @@ struct msdc_save_para { +@@ -296,6 +306,7 @@ struct msdc_save_para { u32 pad_tune; u32 patch_bit0; u32 patch_bit1; @@ -52,7 +52,7 @@ Signed-off-by: Ulf Hansson u32 pad_ds_tune; u32 pad_cmd_tune; u32 emmc50_cfg0; -@@ -303,6 +314,8 @@ struct mtk_mmc_compatible { +@@ -305,6 +316,8 @@ struct mtk_mmc_compatible { u8 clk_div_bits; bool hs400_tune; /* only used for MT8173 */ u32 pad_tune_reg; @@ -61,7 +61,7 @@ Signed-off-by: Ulf Hansson }; struct msdc_tune_para { -@@ -365,24 +378,32 @@ static const struct mtk_mmc_compatible m +@@ -367,24 +380,32 @@ static const struct mtk_mmc_compatible m .clk_div_bits = 8, .hs400_tune = false, .pad_tune_reg = MSDC_PAD_TUNE, @@ -94,7 +94,7 @@ Signed-off-by: Ulf Hansson }; static const struct of_device_id msdc_of_ids[] = { -@@ -1252,8 +1273,29 @@ static void msdc_init_hw(struct msdc_hos +@@ -1254,8 +1275,29 @@ static void msdc_init_hw(struct msdc_hos sdr_set_field(host->base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 0); writel(0x403c0046, host->base + MSDC_PATCH_BIT); sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_CKGEN_MSDC_DLY_SEL, 1); @@ -125,7 +125,7 @@ Signed-off-by: Ulf Hansson /* Configure to enable SDIO mode. * it's must otherwise sdio cmd5 failed -@@ -1268,6 +1310,8 @@ static void msdc_init_hw(struct msdc_hos +@@ -1270,6 +1312,8 @@ static void msdc_init_hw(struct msdc_hos host->def_tune_para.iocon = readl(host->base + MSDC_IOCON); host->def_tune_para.pad_tune = readl(host->base + tune_reg); @@ -134,7 +134,7 @@ Signed-off-by: Ulf Hansson dev_dbg(host->dev, "init hardware done!"); } -@@ -1480,7 +1524,7 @@ skip_fall: +@@ -1482,7 +1526,7 @@ skip_fall: final_fall_delay.final_phase); final_delay = final_fall_delay.final_phase; } @@ -143,7 +143,7 @@ Signed-off-by: Ulf Hansson goto skip_internal; for (i = 0; i < PAD_DELAY_MAX; i++) { -@@ -1638,6 +1682,8 @@ static int msdc_prepare_hs400_tuning(str +@@ -1641,6 +1685,8 @@ static int msdc_prepare_hs400_tuning(str host->hs400_mode = true; writel(host->hs400_ds_delay, host->base + PAD_DS_TUNE); @@ -152,7 +152,7 @@ Signed-off-by: Ulf Hansson return 0; } -@@ -1876,6 +1922,7 @@ static void msdc_save_reg(struct msdc_ho +@@ -1879,6 +1925,7 @@ static void msdc_save_reg(struct msdc_ho host->save_para.pad_tune = readl(host->base + tune_reg); host->save_para.patch_bit0 = readl(host->base + MSDC_PATCH_BIT); host->save_para.patch_bit1 = readl(host->base + MSDC_PATCH_BIT1); @@ -160,7 +160,7 @@ Signed-off-by: Ulf Hansson host->save_para.pad_ds_tune = readl(host->base + PAD_DS_TUNE); host->save_para.pad_cmd_tune = readl(host->base + PAD_CMD_TUNE); host->save_para.emmc50_cfg0 = readl(host->base + EMMC50_CFG0); -@@ -1891,6 +1938,7 @@ static void msdc_restore_reg(struct msdc +@@ -1894,6 +1941,7 @@ static void msdc_restore_reg(struct msdc writel(host->save_para.pad_tune, host->base + tune_reg); writel(host->save_para.patch_bit0, host->base + MSDC_PATCH_BIT); writel(host->save_para.patch_bit1, host->base + MSDC_PATCH_BIT1); diff --git a/target/linux/mediatek/patches-4.14/0155-mmc-mediatek-add-busy_check-support.patch b/target/linux/mediatek/patches-4.14/0155-mmc-mediatek-add-busy_check-support.patch index 3bb2df6b5b..5735f1a251 100644 --- a/target/linux/mediatek/patches-4.14/0155-mmc-mediatek-add-busy_check-support.patch +++ b/target/linux/mediatek/patches-4.14/0155-mmc-mediatek-add-busy_check-support.patch @@ -16,7 +16,7 @@ Signed-off-by: Ulf Hansson --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c -@@ -316,6 +316,7 @@ struct mtk_mmc_compatible { +@@ -318,6 +318,7 @@ struct mtk_mmc_compatible { u32 pad_tune_reg; bool async_fifo; bool data_tune; @@ -24,7 +24,7 @@ Signed-off-by: Ulf Hansson }; struct msdc_tune_para { -@@ -380,6 +381,7 @@ static const struct mtk_mmc_compatible m +@@ -382,6 +383,7 @@ static const struct mtk_mmc_compatible m .pad_tune_reg = MSDC_PAD_TUNE, .async_fifo = false, .data_tune = false, @@ -32,7 +32,7 @@ Signed-off-by: Ulf Hansson }; static const struct mtk_mmc_compatible mt8173_compat = { -@@ -388,6 +390,7 @@ static const struct mtk_mmc_compatible m +@@ -390,6 +392,7 @@ static const struct mtk_mmc_compatible m .pad_tune_reg = MSDC_PAD_TUNE, .async_fifo = false, .data_tune = false, @@ -40,7 +40,7 @@ Signed-off-by: Ulf Hansson }; static const struct mtk_mmc_compatible mt2701_compat = { -@@ -396,6 +399,7 @@ static const struct mtk_mmc_compatible m +@@ -398,6 +401,7 @@ static const struct mtk_mmc_compatible m .pad_tune_reg = MSDC_PAD_TUNE0, .async_fifo = true, .data_tune = true, @@ -48,7 +48,7 @@ Signed-off-by: Ulf Hansson }; static const struct mtk_mmc_compatible mt2712_compat = { -@@ -404,6 +408,7 @@ static const struct mtk_mmc_compatible m +@@ -406,6 +410,7 @@ static const struct mtk_mmc_compatible m .pad_tune_reg = MSDC_PAD_TUNE0, .async_fifo = true, .data_tune = true, @@ -56,7 +56,7 @@ Signed-off-by: Ulf Hansson }; static const struct of_device_id msdc_of_ids[] = { -@@ -1275,6 +1280,8 @@ static void msdc_init_hw(struct msdc_hos +@@ -1277,6 +1282,8 @@ static void msdc_init_hw(struct msdc_hos sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_CKGEN_MSDC_DLY_SEL, 1); writel(0xffff4089, host->base + MSDC_PATCH_BIT1); sdr_set_bits(host->base + EMMC50_CFG0, EMMC50_CFG_CFCSTS_SEL); diff --git a/target/linux/mediatek/patches-4.14/0156-mmc-mediatek-add-stop_clk-fix-and-enhance_rx-support.patch b/target/linux/mediatek/patches-4.14/0156-mmc-mediatek-add-stop_clk-fix-and-enhance_rx-support.patch index 8db0a279e9..044cc021fc 100644 --- a/target/linux/mediatek/patches-4.14/0156-mmc-mediatek-add-stop_clk-fix-and-enhance_rx-support.patch +++ b/target/linux/mediatek/patches-4.14/0156-mmc-mediatek-add-stop_clk-fix-and-enhance_rx-support.patch @@ -42,16 +42,16 @@ Signed-off-by: Ulf Hansson /* MSDC_DMA_CTRL mask */ #define MSDC_DMA_CTRL_START (0x1 << 0) /* W */ #define MSDC_DMA_CTRL_STOP (0x1 << 1) /* W */ -@@ -217,6 +222,8 @@ - #define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */ - #define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */ +@@ -219,6 +224,8 @@ + + #define MSDC_PATCH_BIT1_CMDTA (0x7 << 3) /* RW */ +#define MSDC_PATCH_BIT1_STOP_DLY (0xf << 8) /* RW */ + #define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15) /* RW */ #define MSDC_PATCH_BIT2_CFGCRCSTS (0x1 << 28) /* RW */ #define MSDC_PB2_RESPWAIT (0x3 << 2) /* RW */ -@@ -242,6 +249,9 @@ +@@ -244,6 +251,9 @@ #define EMMC50_CFG_CRCSTS_EDGE (0x1 << 3) /* RW */ #define EMMC50_CFG_CFCSTS_SEL (0x1 << 4) /* RW */ @@ -61,7 +61,7 @@ Signed-off-by: Ulf Hansson #define REQ_CMD_EIO (0x1 << 0) #define REQ_CMD_TMO (0x1 << 1) #define REQ_DAT_ERR (0x1 << 2) -@@ -308,6 +318,7 @@ struct msdc_save_para { +@@ -310,6 +320,7 @@ struct msdc_save_para { u32 pad_ds_tune; u32 pad_cmd_tune; u32 emmc50_cfg0; @@ -69,7 +69,7 @@ Signed-off-by: Ulf Hansson }; struct mtk_mmc_compatible { -@@ -317,6 +328,8 @@ struct mtk_mmc_compatible { +@@ -319,6 +330,8 @@ struct mtk_mmc_compatible { bool async_fifo; bool data_tune; bool busy_check; @@ -78,7 +78,7 @@ Signed-off-by: Ulf Hansson }; struct msdc_tune_para { -@@ -382,6 +395,8 @@ static const struct mtk_mmc_compatible m +@@ -384,6 +397,8 @@ static const struct mtk_mmc_compatible m .async_fifo = false, .data_tune = false, .busy_check = false, @@ -87,7 +87,7 @@ Signed-off-by: Ulf Hansson }; static const struct mtk_mmc_compatible mt8173_compat = { -@@ -391,6 +406,8 @@ static const struct mtk_mmc_compatible m +@@ -393,6 +408,8 @@ static const struct mtk_mmc_compatible m .async_fifo = false, .data_tune = false, .busy_check = false, @@ -96,7 +96,7 @@ Signed-off-by: Ulf Hansson }; static const struct mtk_mmc_compatible mt2701_compat = { -@@ -400,6 +417,8 @@ static const struct mtk_mmc_compatible m +@@ -402,6 +419,8 @@ static const struct mtk_mmc_compatible m .async_fifo = true, .data_tune = true, .busy_check = false, @@ -105,7 +105,7 @@ Signed-off-by: Ulf Hansson }; static const struct mtk_mmc_compatible mt2712_compat = { -@@ -409,6 +428,8 @@ static const struct mtk_mmc_compatible m +@@ -411,6 +430,8 @@ static const struct mtk_mmc_compatible m .async_fifo = true, .data_tune = true, .busy_check = true, @@ -114,7 +114,7 @@ Signed-off-by: Ulf Hansson }; static const struct of_device_id msdc_of_ids[] = { -@@ -1280,15 +1301,31 @@ static void msdc_init_hw(struct msdc_hos +@@ -1282,15 +1303,31 @@ static void msdc_init_hw(struct msdc_hos sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_CKGEN_MSDC_DLY_SEL, 1); writel(0xffff4089, host->base + MSDC_PATCH_BIT1); sdr_set_bits(host->base + EMMC50_CFG0, EMMC50_CFG_CFCSTS_SEL); @@ -150,7 +150,7 @@ Signed-off-by: Ulf Hansson /* use async fifo, then no need tune internal delay */ sdr_clr_bits(host->base + MSDC_PATCH_BIT2, MSDC_PATCH_BIT2_CFGRESP); -@@ -1933,6 +1970,7 @@ static void msdc_save_reg(struct msdc_ho +@@ -1936,6 +1973,7 @@ static void msdc_save_reg(struct msdc_ho host->save_para.pad_ds_tune = readl(host->base + PAD_DS_TUNE); host->save_para.pad_cmd_tune = readl(host->base + PAD_CMD_TUNE); host->save_para.emmc50_cfg0 = readl(host->base + EMMC50_CFG0); @@ -158,7 +158,7 @@ Signed-off-by: Ulf Hansson } static void msdc_restore_reg(struct msdc_host *host) -@@ -1949,6 +1987,7 @@ static void msdc_restore_reg(struct msdc +@@ -1952,6 +1990,7 @@ static void msdc_restore_reg(struct msdc writel(host->save_para.pad_ds_tune, host->base + PAD_DS_TUNE); writel(host->save_para.pad_cmd_tune, host->base + PAD_CMD_TUNE); writel(host->save_para.emmc50_cfg0, host->base + EMMC50_CFG0); diff --git a/target/linux/mediatek/patches-4.14/0157-mmc-mediatek-add-support-of-source_cg-clock.patch b/target/linux/mediatek/patches-4.14/0157-mmc-mediatek-add-support-of-source_cg-clock.patch index 8a183ceb54..b02a9c1617 100644 --- a/target/linux/mediatek/patches-4.14/0157-mmc-mediatek-add-support-of-source_cg-clock.patch +++ b/target/linux/mediatek/patches-4.14/0157-mmc-mediatek-add-support-of-source_cg-clock.patch @@ -15,7 +15,7 @@ Signed-off-by: Ulf Hansson --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c -@@ -372,6 +372,7 @@ struct msdc_host { +@@ -374,6 +374,7 @@ struct msdc_host { struct clk *src_clk; /* msdc source clock */ struct clk *h_clk; /* msdc h_clk */ @@ -23,7 +23,7 @@ Signed-off-by: Ulf Hansson u32 mclk; /* mmc subsystem clock frequency */ u32 src_clk_freq; /* source clock frequency */ u32 sclk; /* SD/MS bus clock frequency */ -@@ -616,6 +617,7 @@ static void msdc_set_timeout(struct msdc +@@ -618,6 +619,7 @@ static void msdc_set_timeout(struct msdc static void msdc_gate_clock(struct msdc_host *host) { @@ -31,7 +31,7 @@ Signed-off-by: Ulf Hansson clk_disable_unprepare(host->src_clk); clk_disable_unprepare(host->h_clk); } -@@ -624,6 +626,7 @@ static void msdc_ungate_clock(struct msd +@@ -626,6 +628,7 @@ static void msdc_ungate_clock(struct msd { clk_prepare_enable(host->h_clk); clk_prepare_enable(host->src_clk); @@ -39,7 +39,7 @@ Signed-off-by: Ulf Hansson while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB)) cpu_relax(); } -@@ -692,6 +695,15 @@ static void msdc_set_mclk(struct msdc_ho +@@ -694,6 +697,15 @@ static void msdc_set_mclk(struct msdc_ho sclk = (host->src_clk_freq >> 2) / div; } } @@ -55,7 +55,7 @@ Signed-off-by: Ulf Hansson if (host->dev_comp->clk_div_bits == 8) sdr_set_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD | MSDC_CFG_CKDIV, -@@ -700,10 +712,14 @@ static void msdc_set_mclk(struct msdc_ho +@@ -702,10 +714,14 @@ static void msdc_set_mclk(struct msdc_ho sdr_set_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD_EXTRA | MSDC_CFG_CKDIV_EXTRA, (mode << 12) | div); @@ -71,7 +71,7 @@ Signed-off-by: Ulf Hansson host->sclk = sclk; host->mclk = hz; host->timing = timing; -@@ -1822,6 +1838,11 @@ static int msdc_drv_probe(struct platfor +@@ -1825,6 +1841,11 @@ static int msdc_drv_probe(struct platfor goto host_free; } diff --git a/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch b/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch index cad45f6cf8..bd86ab53a7 100644 --- a/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch +++ b/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch @@ -16,7 +16,7 @@ Signed-off-by: Ulf Hansson --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c -@@ -378,6 +378,7 @@ struct msdc_host { +@@ -380,6 +380,7 @@ struct msdc_host { u32 sclk; /* SD/MS bus clock frequency */ unsigned char timing; bool vqmmc_enabled; @@ -24,7 +24,7 @@ Signed-off-by: Ulf Hansson u32 hs400_ds_delay; u32 hs200_cmd_int_delay; /* cmd internal delay for HS200/SDR104 */ u32 hs400_cmd_int_delay; /* cmd internal delay for HS400 */ -@@ -1661,6 +1662,8 @@ static int msdc_tune_data(struct mmc_hos +@@ -1664,6 +1665,8 @@ static int msdc_tune_data(struct mmc_hos u32 tune_reg = host->dev_comp->pad_tune_reg; int i, ret; @@ -33,7 +33,7 @@ Signed-off-by: Ulf Hansson sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL); sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL); for (i = 0 ; i < PAD_DELAY_MAX; i++) { -@@ -1773,6 +1776,9 @@ static const struct mmc_host_ops mt_msdc +@@ -1776,6 +1779,9 @@ static const struct mmc_host_ops mt_msdc static void msdc_of_property_parse(struct platform_device *pdev, struct msdc_host *host) { diff --git a/target/linux/mediatek/patches-4.14/0159-mmc-mediatek-improve-eMMC-hs400-mode-read-performanc.patch b/target/linux/mediatek/patches-4.14/0159-mmc-mediatek-improve-eMMC-hs400-mode-read-performanc.patch index 63aef198c2..21a0c90486 100644 --- a/target/linux/mediatek/patches-4.14/0159-mmc-mediatek-improve-eMMC-hs400-mode-read-performanc.patch +++ b/target/linux/mediatek/patches-4.14/0159-mmc-mediatek-improve-eMMC-hs400-mode-read-performanc.patch @@ -23,7 +23,7 @@ Signed-off-by: Ulf Hansson #define SDC_FIFO_CFG 0x228 /*--------------------------------------------------------------------------*/ -@@ -249,6 +250,8 @@ +@@ -251,6 +252,8 @@ #define EMMC50_CFG_CRCSTS_EDGE (0x1 << 3) /* RW */ #define EMMC50_CFG_CFCSTS_SEL (0x1 << 4) /* RW */ @@ -32,7 +32,7 @@ Signed-off-by: Ulf Hansson #define SDC_FIFO_CFG_WRVALIDSEL (0x1 << 24) /* RW */ #define SDC_FIFO_CFG_RDVALIDSEL (0x1 << 25) /* RW */ -@@ -318,6 +321,7 @@ struct msdc_save_para { +@@ -320,6 +323,7 @@ struct msdc_save_para { u32 pad_ds_tune; u32 pad_cmd_tune; u32 emmc50_cfg0; @@ -40,7 +40,7 @@ Signed-off-by: Ulf Hansson u32 sdc_fifo_cfg; }; -@@ -1747,6 +1751,9 @@ static int msdc_prepare_hs400_tuning(str +@@ -1750,6 +1754,9 @@ static int msdc_prepare_hs400_tuning(str writel(host->hs400_ds_delay, host->base + PAD_DS_TUNE); /* hs400 mode must set it to 0 */ sdr_clr_bits(host->base + MSDC_PATCH_BIT2, MSDC_PATCH_BIT2_CFGCRCSTS); @@ -50,7 +50,7 @@ Signed-off-by: Ulf Hansson return 0; } -@@ -1997,6 +2004,7 @@ static void msdc_save_reg(struct msdc_ho +@@ -2000,6 +2007,7 @@ static void msdc_save_reg(struct msdc_ho host->save_para.pad_ds_tune = readl(host->base + PAD_DS_TUNE); host->save_para.pad_cmd_tune = readl(host->base + PAD_CMD_TUNE); host->save_para.emmc50_cfg0 = readl(host->base + EMMC50_CFG0); @@ -58,7 +58,7 @@ Signed-off-by: Ulf Hansson host->save_para.sdc_fifo_cfg = readl(host->base + SDC_FIFO_CFG); } -@@ -2014,6 +2022,7 @@ static void msdc_restore_reg(struct msdc +@@ -2017,6 +2025,7 @@ static void msdc_restore_reg(struct msdc writel(host->save_para.pad_ds_tune, host->base + PAD_DS_TUNE); writel(host->save_para.pad_cmd_tune, host->base + PAD_CMD_TUNE); writel(host->save_para.emmc50_cfg0, host->base + EMMC50_CFG0); diff --git a/target/linux/mediatek/patches-4.14/0160-mmc-mediatek-perfer-to-use-rise-edge-latching-for-cm.patch b/target/linux/mediatek/patches-4.14/0160-mmc-mediatek-perfer-to-use-rise-edge-latching-for-cm.patch index 6da13bec6e..756797b74e 100644 --- a/target/linux/mediatek/patches-4.14/0160-mmc-mediatek-perfer-to-use-rise-edge-latching-for-cm.patch +++ b/target/linux/mediatek/patches-4.14/0160-mmc-mediatek-perfer-to-use-rise-edge-latching-for-cm.patch @@ -16,7 +16,7 @@ Signed-off-by: Ulf Hansson --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c -@@ -1550,7 +1550,8 @@ static int msdc_tune_response(struct mmc +@@ -1552,7 +1552,8 @@ static int msdc_tune_response(struct mmc } final_rise_delay = get_best_delay(host, rise_delay); /* if rising edge has enough margin, then do not scan falling edge */ diff --git a/target/linux/mediatek/patches-4.14/0203-mmc-mediatek-add-support-for-MT7622-SoC.patch b/target/linux/mediatek/patches-4.14/0203-mmc-mediatek-add-support-for-MT7622-SoC.patch index 613adbc897..39ecd8786a 100644 --- a/target/linux/mediatek/patches-4.14/0203-mmc-mediatek-add-support-for-MT7622-SoC.patch +++ b/target/linux/mediatek/patches-4.14/0203-mmc-mediatek-add-support-for-MT7622-SoC.patch @@ -16,7 +16,7 @@ Tested-by: Jumin Li --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c -@@ -438,11 +438,23 @@ static const struct mtk_mmc_compatible m +@@ -440,11 +440,23 @@ static const struct mtk_mmc_compatible m .enhance_rx = true, }; From e98e046f06f388e49c12e52b3a333a7e77c008cd Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 3 Jan 2020 20:29:05 -0800 Subject: [PATCH 215/480] iperf: Allow enabling multicast support iperf2 is useful for testing UDP over multicast, add an option to permit the enabling/disabling of multicast support. Signed-off-by: Florian Fainelli --- package/network/utils/iperf/Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile index 3a235fadc7..5c84e1617d 100644 --- a/package/network/utils/iperf/Makefile +++ b/package/network/utils/iperf/Makefile @@ -20,6 +20,8 @@ PKG_LICENSE:=BSD-3-Clause PKG_BUILD_PARALLEL:=1 +PGK_CONFIG_DEPENDS:=IPERF_ENABLE_MULTICAST + include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk @@ -37,8 +39,19 @@ define Package/iperf/description characteristics. endef +define Package/iperf/config + config IPERF_ENABLE_MULTICAST + depends on PACKAGE_iperf + bool "Enable multicast support" +endef + + TARGET_CFLAGS += -D_GNU_SOURCE +ifeq ($(CONFIG_IPERF_ENABLE_MULTICAST),y) +CONFIGURE_ARGS += --enable-multicast +else CONFIGURE_ARGS += --disable-multicast +endif ifeq ($(CONFIG_IPV6),) CONFIGURE_ARGS += --disable-ipv6 From f64c64a91c86e07a9d34ff268df77b9625e11bd1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 4 Jan 2020 11:47:50 +0200 Subject: [PATCH 216/480] generic: fix compiler error in OpenWrt's kexec patch 330-MIPS-kexec-Accept-command-line-parameters-from-users.patch causes problems when building with -Werror=unused-result. arch/mips/kernel/machine_kexec.c: In function 'machine_kexec_init_argv': arch/mips/kernel/machine_kexec.c:76:2: error: ignoring return value of 'copy_from_user', declared with attribute warn_unused_result [-Werror=unused-result] copy_from_user(kexec_argv_buf, buf, size); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Fix this by handling the return value in an appropriate way. Signed-off-by: Daniel Golle --- ...Accept-command-line-parameters-from-users.patch | 14 ++++++++------ ...Accept-command-line-parameters-from-users.patch | 14 ++++++++------ ...Accept-command-line-parameters-from-users.patch | 12 +++++++----- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/target/linux/generic/pending-4.14/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.14/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index 1187543a46..44d85b5b86 100644 --- a/target/linux/generic/pending-4.14/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/pending-4.14/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -29,7 +29,7 @@ Signed-off-by: Yousong Zhou int (*_machine_kexec_prepare)(struct kimage *) = NULL; void (*_machine_kexec_shutdown)(void) = NULL; -@@ -28,6 +25,99 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ +@@ -28,6 +25,101 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ void (*_crash_smp_send_stop)(void) = NULL; #endif @@ -81,7 +81,9 @@ Signed-off-by: Yousong Zhou + pr_warn("kexec command line truncated to %zd bytes\n", size); + + /* Copy to kernel space */ -+ copy_from_user(kexec_argv_buf, buf, size); ++ if (copy_from_user(kexec_argv_buf, buf, size)) ++ pr_warn("kexec command line copy to kernel space failed\n"); ++ + kexec_argv_buf[size - 1] = 0; +} + @@ -129,7 +131,7 @@ Signed-off-by: Yousong Zhou static void kexec_image_info(const struct kimage *kimage) { unsigned long i; -@@ -52,6 +142,18 @@ int +@@ -52,6 +144,18 @@ int machine_kexec_prepare(struct kimage *kimage) { kexec_image_info(kimage); @@ -148,7 +150,7 @@ Signed-off-by: Yousong Zhou if (_machine_kexec_prepare) return _machine_kexec_prepare(kimage); -@@ -89,10 +191,12 @@ machine_kexec(struct kimage *image) +@@ -89,10 +193,12 @@ machine_kexec(struct kimage *image) unsigned long *ptr; reboot_code_buffer = @@ -162,7 +164,7 @@ Signed-off-by: Yousong Zhou if (image->type == KEXEC_TYPE_DEFAULT) { kexec_indirection_page = -@@ -100,9 +204,19 @@ machine_kexec(struct kimage *image) +@@ -100,9 +206,19 @@ machine_kexec(struct kimage *image) } else { kexec_indirection_page = (unsigned long)&image->head; } @@ -184,7 +186,7 @@ Signed-off-by: Yousong Zhou /* * The generic kexec code builds a page list with physical -@@ -124,15 +238,16 @@ machine_kexec(struct kimage *image) +@@ -124,15 +240,16 @@ machine_kexec(struct kimage *image) /* * we do not want to be bothered. */ diff --git a/target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index 1187543a46..44d85b5b86 100644 --- a/target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/pending-4.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -29,7 +29,7 @@ Signed-off-by: Yousong Zhou int (*_machine_kexec_prepare)(struct kimage *) = NULL; void (*_machine_kexec_shutdown)(void) = NULL; -@@ -28,6 +25,99 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ +@@ -28,6 +25,101 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ void (*_crash_smp_send_stop)(void) = NULL; #endif @@ -81,7 +81,9 @@ Signed-off-by: Yousong Zhou + pr_warn("kexec command line truncated to %zd bytes\n", size); + + /* Copy to kernel space */ -+ copy_from_user(kexec_argv_buf, buf, size); ++ if (copy_from_user(kexec_argv_buf, buf, size)) ++ pr_warn("kexec command line copy to kernel space failed\n"); ++ + kexec_argv_buf[size - 1] = 0; +} + @@ -129,7 +131,7 @@ Signed-off-by: Yousong Zhou static void kexec_image_info(const struct kimage *kimage) { unsigned long i; -@@ -52,6 +142,18 @@ int +@@ -52,6 +144,18 @@ int machine_kexec_prepare(struct kimage *kimage) { kexec_image_info(kimage); @@ -148,7 +150,7 @@ Signed-off-by: Yousong Zhou if (_machine_kexec_prepare) return _machine_kexec_prepare(kimage); -@@ -89,10 +191,12 @@ machine_kexec(struct kimage *image) +@@ -89,10 +193,12 @@ machine_kexec(struct kimage *image) unsigned long *ptr; reboot_code_buffer = @@ -162,7 +164,7 @@ Signed-off-by: Yousong Zhou if (image->type == KEXEC_TYPE_DEFAULT) { kexec_indirection_page = -@@ -100,9 +204,19 @@ machine_kexec(struct kimage *image) +@@ -100,9 +206,19 @@ machine_kexec(struct kimage *image) } else { kexec_indirection_page = (unsigned long)&image->head; } @@ -184,7 +186,7 @@ Signed-off-by: Yousong Zhou /* * The generic kexec code builds a page list with physical -@@ -124,15 +238,16 @@ machine_kexec(struct kimage *image) +@@ -124,15 +240,16 @@ machine_kexec(struct kimage *image) /* * we do not want to be bothered. */ diff --git a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index c7abd99b3b..8d50208d5b 100644 --- a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -29,7 +29,7 @@ Signed-off-by: Yousong Zhou int (*_machine_kexec_prepare)(struct kimage *) = NULL; void (*_machine_kexec_shutdown)(void) = NULL; -@@ -28,9 +25,115 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ +@@ -28,9 +25,117 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ void (*_crash_smp_send_stop)(void) = NULL; #endif @@ -81,7 +81,9 @@ Signed-off-by: Yousong Zhou + pr_warn("kexec command line truncated to %zd bytes\n", size); + + /* Copy to kernel space */ -+ copy_from_user(kexec_argv_buf, buf, size); ++ if (copy_from_user(kexec_argv_buf, buf, size)) ++ pr_warn("kexec command line copy to kernel space failed\n"); ++ + kexec_argv_buf[size - 1] = 0; +} + @@ -145,7 +147,7 @@ Signed-off-by: Yousong Zhou if (_machine_kexec_prepare) return _machine_kexec_prepare(kimage); return 0; -@@ -67,10 +170,12 @@ machine_kexec(struct kimage *image) +@@ -67,10 +172,12 @@ machine_kexec(struct kimage *image) unsigned long *ptr; reboot_code_buffer = @@ -159,7 +161,7 @@ Signed-off-by: Yousong Zhou if (image->type == KEXEC_TYPE_DEFAULT) { kexec_indirection_page = -@@ -78,9 +183,19 @@ machine_kexec(struct kimage *image) +@@ -78,9 +185,19 @@ machine_kexec(struct kimage *image) } else { kexec_indirection_page = (unsigned long)&image->head; } @@ -181,7 +183,7 @@ Signed-off-by: Yousong Zhou /* * The generic kexec code builds a page list with physical -@@ -102,15 +217,16 @@ machine_kexec(struct kimage *image) +@@ -102,15 +219,16 @@ machine_kexec(struct kimage *image) /* * we do not want to be bothered. */ From 663b1a14e59074a23b86237e0b13dc6e78a6e50b Mon Sep 17 00:00:00 2001 From: Maksym Medvedev Date: Fri, 15 Nov 2019 23:21:22 +0100 Subject: [PATCH 217/480] ramips: add support for Edimax RA21S Edimax RA21S is a dual band 11ac router, based on MediaTek MT7621A and MT7615N chips. Specification: - SoC: MediaTek MT7621A dual-core @ 880MHz - RAM: 256M (Nanya NT5CC128M16IP) - FLASH: 16MB (Macronix MX25L12835F) - WiFi: 2.4/5 GHz 4T4R - 2.4GHz MediaTek MT7615N bgn - 5GHz MediaTek MT7615N nac - Switch: SoC integrated Gigabit Switch (4 x LAN, 1 x WAN) - USB: No - BTN: Reset, WPS - LED: 4 red LEDs, indistinguishable when case closed - UART: through-hole on PCB. J1: 3.3V - RX - GND - TX / 57600-8N1. 3.3V is the square pad Installation: Update the factory image via the OEM web-interface (by default: http://192.168.2.1/) User: admin Password: 1234 The sysupgrade image can be installed via TFTP from the U-Boot bootloader. Connect via ethernet port 2. Tested on device by @UAb5eSMn Signed-off-by: Maksym Medvedev [split DTS and take over improvements from RG21S, extend commit message] Signed-off-by: Adrian Schmutzler --- .../linux/ramips/dts/mt7621_edimax_ra21s.dts | 40 ++++++ .../linux/ramips/dts/mt7621_edimax_rg21s.dts | 108 +--------------- .../linux/ramips/dts/mt7621_edimax_rx21s.dtsi | 115 ++++++++++++++++++ target/linux/ramips/image/mt7621.mk | 14 +++ .../mt7621/base-files/etc/board.d/02_network | 2 + 5 files changed, 172 insertions(+), 107 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_edimax_ra21s.dts create mode 100644 target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi diff --git a/target/linux/ramips/dts/mt7621_edimax_ra21s.dts b/target/linux/ramips/dts/mt7621_edimax_ra21s.dts new file mode 100644 index 0000000000..ad0eee0d18 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_edimax_ra21s.dts @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621_edimax_rx21s.dtsi" + +/ { + compatible = "edimax,ra21s", "mediatek,mt7621-soc"; + model = "Edimax RA21S"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + leds { + compatible = "gpio-leds"; + + led_power: led_1 { + label = "ra21s:red:led1"; + gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + }; + + led_2 { + label = "ra21s:red:led2"; + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + }; + + led_3 { + label = "ra21s:red:led3"; + gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + }; + + led_4 { + label = "ra21s:red:led4"; + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; + }; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index ce28e8e04d..4325e98132 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -1,10 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7621.dtsi" - -#include -#include +#include "mt7621_edimax_rx21s.dtsi" / { compatible = "edimax,rg21s", "mediatek,mt7621-soc"; @@ -15,27 +12,6 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - label-mac-device = ðernet; - }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; }; leds { @@ -62,85 +38,3 @@ }; }; }; - -&spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <40000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x50000 0xfb0000>; - }; - }; - }; -}; - -&pcie { - status = "okay"; -}; - -&pcie0 { - wifi0: wifi@0,0 { - compatible = "mediatek,mt76"; - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0000>; - ieee80211-freq-limit = <2400000 2500000>; - }; -}; - -&pcie1 { - wifi1: wifi@0,0 { - compatible = "mediatek,mt76"; - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; - }; -}; - -ðernet { - mtd-mac-address = <&factory 0x4>; - - mediatek,portmap = "wllll"; - port@5 { - status = "disabled"; - }; -}; - -&state_default { - gpio { - ralink,group = "uart3", "uart2", "jtag", "wdt"; - ralink,function = "gpio"; - }; -}; - -&xhci { - status = "disabled"; -}; diff --git a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi new file mode 100644 index 0000000000..31498a5340 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + aliases { + label-mac-device = ðernet; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x50000 0xfb0000>; + }; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi0: wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + ieee80211-freq-limit = <2400000 2500000>; + }; +}; + +&pcie1 { + wifi1: wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; + + mediatek,portmap = "wllll"; + port@5 { + status = "disabled"; + }; +}; + +&state_default { + gpio { + ralink,group = "uart3", "uart2", "jtag", "wdt"; + ralink,function = "gpio"; + }; +}; + +&xhci { + status = "disabled"; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index c0706f7998..b33c2c5bc0 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -224,6 +224,20 @@ define Device/d-team_pbr-m1 endef TARGET_DEVICES += d-team_pbr-m1 +define Device/edimax_ra21s + SOC := mt7621 + IMAGE_SIZE := 16064k + DEVICE_VENDOR := Edimax + DEVICE_MODEL := RA21S + DEVICE_ALT0_VENDOR := Edimax + DEVICE_ALT0_MODEL := Gemini RA21S + IMAGES += factory.bin + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 02020040 8844A2D168B45A2D + DEVICE_PACKAGES := kmod-mt7615e wpad-basic +endef +TARGET_DEVICES += edimax_ra21s + define Device/edimax_rg21s SOC := mt7621 IMAGE_SIZE := 16064k diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index a3b9c079a6..4e8e2cb9ed 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -87,6 +87,7 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0" ;; + edimax,ra21s|\ edimax,rg21s) ucidef_add_switch "switch0" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" @@ -198,6 +199,7 @@ ramips_setup_macs() wan_mac=$(mtd_get_mac_ascii factory wanmac) label_mac=$(mtd_get_mac_binary radio 0x4) ;; + edimax,ra21s|\ edimax,rg21s) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) From 1bb90a28e47ce7cf3ae76f46b43a6f5e0da2a055 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 4 Jan 2020 23:52:01 +0100 Subject: [PATCH 218/480] kernel: bump 4.14 to 4.14.162 Refreshed all patches. Compile-tested on: ramips Runtime-tested on: ramips Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 ++-- .../910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 2 +- ...e-size-of-hook-entry-point-locations.patch | 2 +- .../generic/hack-4.14/721-phy_packets.patch | 4 ++-- .../generic/hack-4.14/902-debloat_proc.patch | 2 +- .../203-kallsyms_uncompressed.patch | 6 ++--- .../pending-4.14/655-increase_skb_pad.patch | 2 +- ...ng-with-source-address-failed-policy.patch | 24 +++++++++---------- .../202-core-linux-support-layerscape.patch | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index adc15b3d8c..60acf6173a 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .207 -LINUX_VERSION-4.14 = .161 +LINUX_VERSION-4.14 = .162 LINUX_VERSION-4.19 = .91 LINUX_KERNEL_HASH-4.9.207 = ca86637e7b5bec65eeb7da695824e0e8aca5ba52eb742885f0b7241977400124 -LINUX_KERNEL_HASH-4.14.161 = 9d23629f50e6c7313c4f1277455137b7727a6117df931c4c4fb7fab7e98f81c9 +LINUX_KERNEL_HASH-4.14.162 = f65170224cd4359ce8b2793b492bd8127abdd0b91350484e001bce13f0c98b4b LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 9d1e4e524e..a3d4ef2853 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -325,7 +325,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look +@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index 17ee82fe79..a3a9dcad93 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -316,7 +316,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look +@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch index aad588f19b..4b889120bf 100644 --- a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch +++ b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch @@ -92,7 +92,7 @@ Signed-off-by: Pablo Neira Ayuso #endif --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c -@@ -988,7 +988,7 @@ int br_nf_hook_thresh(unsigned int hook, +@@ -991,7 +991,7 @@ int br_nf_hook_thresh(unsigned int hook, unsigned int i; int ret; diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index 2c59e837af..52910fceeb 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2530,6 +2530,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2532,6 +2532,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2661,16 +2665,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2663,16 +2667,6 @@ static inline struct sk_buff *dev_alloc_ } diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index 1c5e93d73b..c5f6397be1 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -427,6 +427,9 @@ static struct pernet_operations ip_rt_pr +@@ -428,6 +428,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch index b0cd863be4..1f5c83e94f 100644 --- a/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -519,6 +523,9 @@ static void *find_token(unsigned char *s +@@ -521,6 +525,9 @@ static void *find_token(unsigned char *s { int i; @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -591,6 +598,9 @@ static void optimize_result(void) +@@ -593,6 +600,9 @@ static void optimize_result(void) { int i, best; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -779,6 +789,8 @@ int main(int argc, char **argv) +@@ -781,6 +791,8 @@ int main(int argc, char **argv) symbol_prefix_char = *p; } else if (strcmp(argv[i], "--base-relative") == 0) base_relative = 1; diff --git a/target/linux/generic/pending-4.14/655-increase_skb_pad.patch b/target/linux/generic/pending-4.14/655-increase_skb_pad.patch index 4bb1c58bbc..fa47fe62a8 100644 --- a/target/linux/generic/pending-4.14/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-4.14/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2494,7 +2494,7 @@ static inline int pskb_network_may_pull( +@@ -2496,7 +2496,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index e4fdd6c58b..e6b0940a0b 100644 --- a/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -118,8 +118,8 @@ Signed-off-by: Jonas Gorski +static int ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb); static void ip6_link_failure(struct sk_buff *skb); static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, - struct sk_buff *skb, u32 mtu); -@@ -321,6 +323,21 @@ static const struct rt6_info ip6_prohibi + struct sk_buff *skb, u32 mtu, +@@ -323,6 +325,21 @@ static const struct rt6_info ip6_prohibi .rt6i_ref = ATOMIC_INIT(1), }; @@ -141,7 +141,7 @@ Signed-off-by: Jonas Gorski static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -2046,6 +2063,11 @@ static struct rt6_info *ip6_route_info_c +@@ -2054,6 +2071,11 @@ static struct rt6_info *ip6_route_info_c rt->dst.output = ip6_pkt_prohibit_out; rt->dst.input = ip6_pkt_prohibit; break; @@ -153,7 +153,7 @@ Signed-off-by: Jonas Gorski case RTN_THROW: case RTN_UNREACHABLE: default: -@@ -2771,6 +2793,17 @@ static int ip6_pkt_prohibit_out(struct n +@@ -2779,6 +2801,17 @@ static int ip6_pkt_prohibit_out(struct n return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski /* * Allocate a dst for local (unicast / anycast) address. */ -@@ -3007,7 +3040,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -3015,7 +3048,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -3506,6 +3540,9 @@ static int rt6_fill_node(struct net *net +@@ -3514,6 +3548,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -3824,6 +3861,8 @@ static int ip6_route_dev_notify(struct n +@@ -3832,6 +3869,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -3835,6 +3874,7 @@ static int ip6_route_dev_notify(struct n +@@ -3843,6 +3882,7 @@ static int ip6_route_dev_notify(struct n in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); @@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); #endif } -@@ -4051,6 +4091,17 @@ static int __net_init ip6_route_net_init +@@ -4059,6 +4099,17 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski #endif net->ipv6.sysctl.flush_delay = 0; -@@ -4069,6 +4120,8 @@ out: +@@ -4077,6 +4128,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -4086,6 +4139,7 @@ static void __net_exit ip6_route_net_exi +@@ -4094,6 +4147,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -4159,6 +4213,9 @@ void __init ip6_route_init_special_entri +@@ -4167,6 +4221,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 63d12e688e..f0926d088d 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -580,7 +580,7 @@ Signed-off-by: Yangbo Lu void __kfree_skb(struct sk_buff *skb); extern struct kmem_cache *skbuff_head_cache; -@@ -3313,6 +3314,7 @@ static inline void skb_free_datagram_loc +@@ -3315,6 +3316,7 @@ static inline void skb_free_datagram_loc } int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); From b6cdc042af3451c82562a3310fd8f70b925b475f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 4 Jan 2020 23:45:20 +0100 Subject: [PATCH 219/480] kernel: bump 4.19 to 4.19.93 Refreshed all patches. The patch hack-4.19/550-loop-better-discard-for-block-devices.patch was replaced with an new version of the patch from: https://lore.kernel.org/patchwork/patch/1153625/ https://lore.kernel.org/patchwork/patch/1153626/ Compile-tested on: ipq40xx, lantiq Runtime-tested on: ipq40xx, lantiq Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 +- .../910-unaligned_access_hacks.patch | 8 +- ...8xx-Enable-LEDs-and-auto-negotiation.patch | 6 +- ...78xx-Read-initial-EEE-status-from-DT.patch | 2 +- ...Disable-TCP-Segmentation-Offload-TSO.patch | 2 +- ...e-enabling-of-EEE-into-PHY-init-code.patch | 4 +- ...e-link-events-to-minimize-poll-storm.patch | 2 +- ...xx-EEE-support-is-now-a-PHY-property.patch | 2 +- ...use-default-alignment-for-rx-buffers.patch | 2 +- ...key-sizes-only-when-Secure-Simple-Pa.patch | 2 +- ...5-mmc-sdhci-Mask-spurious-interrupts.patch | 2 +- ...set-reqbufs-create_bufs-capabilities.patch | 4 +- ...ce-quirks-for-Freeway-Airmouse-T3-an.patch | 4 +- ...ev-Completely-disable-the-DT-warning.patch | 2 +- .../550-loop-Report-EOPNOTSUPP-properly.patch | 41 +++++ ...oop-better-discard-for-block-devices.patch | 164 ------------------ ...er-discard-support-for-block-devices.patch | 101 +++++++++++ .../generic/hack-4.19/721-phy_packets.patch | 4 +- .../generic/hack-4.19/902-debloat_proc.patch | 2 +- ...0-add-linux-spidev-compatible-si3210.patch | 2 +- .../203-kallsyms_uncompressed.patch | 6 +- .../pending-4.19/630-packet_socket_type.patch | 16 +- .../pending-4.19/655-increase_skb_pad.patch | 2 +- ...ng-with-source-address-failed-policy.patch | 24 +-- .../0063-4-ip806x-tsense-rework-driver.patch | 6 +- ...RM-dts-qcom-add-gpio-ranges-property.patch | 2 +- 26 files changed, 197 insertions(+), 219 deletions(-) create mode 100644 target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch delete mode 100644 target/linux/generic/hack-4.19/550-loop-better-discard-for-block-devices.patch create mode 100644 target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 60acf6173a..40b5f5c2eb 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .207 LINUX_VERSION-4.14 = .162 -LINUX_VERSION-4.19 = .91 +LINUX_VERSION-4.19 = .93 LINUX_KERNEL_HASH-4.9.207 = ca86637e7b5bec65eeb7da695824e0e8aca5ba52eb742885f0b7241977400124 LINUX_KERNEL_HASH-4.14.162 = f65170224cd4359ce8b2793b492bd8127abdd0b91350484e001bce13f0c98b4b -LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447 +LINUX_KERNEL_HASH-4.19.93 = 2af5d23f82a8bf69a6e4d8407579293b7beeebd3054dc464d48bdb5d2d7f5834 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index 7784801c8c..dba7df5f3a 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -316,7 +316,7 @@ list_for_each_entry(p, head, list) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -448,7 +448,7 @@ static struct neighbour *ipv4_neigh_look +@@ -449,7 +449,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; @@ -327,7 +327,7 @@ return neigh_create(&arp_tbl, pkey, dev); --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -444,48 +444,53 @@ static void tcp_options_write(__be32 *pt +@@ -447,48 +447,53 @@ static void tcp_options_write(__be32 *pt u16 options = opts->options; /* mungable copy */ if (unlikely(OPTION_MD5 & options)) { @@ -404,7 +404,7 @@ } if (unlikely(opts->num_sack_blocks)) { -@@ -493,16 +498,17 @@ static void tcp_options_write(__be32 *pt +@@ -496,16 +501,17 @@ static void tcp_options_write(__be32 *pt tp->duplicate_sack : tp->selective_acks; int this_sack; @@ -428,7 +428,7 @@ } tp->rx_opt.dsack = 0; -@@ -515,13 +521,14 @@ static void tcp_options_write(__be32 *pt +@@ -518,13 +524,14 @@ static void tcp_options_write(__be32 *pt if (foc->exp) { len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len; diff --git a/target/linux/brcm2708/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/brcm2708/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch index 847d8f5102..e635ca6d31 100644 --- a/target/linux/brcm2708/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/brcm2708/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2475,6 +2475,11 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2476,6 +2476,11 @@ static int lan78xx_reset(struct lan78xx_ int ret = 0; unsigned long timeout; u8 sig; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_LRST_; -@@ -2528,6 +2533,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2529,6 +2534,9 @@ static int lan78xx_reset(struct lan78xx_ ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_MEF_; @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell ret = lan78xx_write_reg(dev, HW_CFG, buf); ret = lan78xx_read_reg(dev, USB_CFG0, &buf); -@@ -2583,6 +2591,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2584,6 +2592,9 @@ static int lan78xx_reset(struct lan78xx_ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; } } diff --git a/target/linux/brcm2708/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/brcm2708/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch index a1a9fa6c88..01dc3554ff 100644 --- a/target/linux/brcm2708/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/brcm2708/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2657,6 +2657,22 @@ static int lan78xx_open(struct net_devic +@@ -2658,6 +2658,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index 1e3944b859..ef1bbaac69 100644 --- a/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3011,8 +3020,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -3012,8 +3021,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/brcm2708/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/brcm2708/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index a1dfb00af7..9b5e492c9b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/brcm2708/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2189,6 +2189,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2190,6 +2190,22 @@ static int lan78xx_phy_init(struct lan78 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control); phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell if (phydev->mdio.dev.of_node) { u32 reg; int len; -@@ -2666,22 +2682,6 @@ static int lan78xx_open(struct net_devic +@@ -2667,22 +2683,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index 761b6dcfcf..b552cc0b97 100644 --- a/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3824,7 +3829,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3825,7 +3830,12 @@ static int lan78xx_probe(struct usb_inte dev->pipe_intr = usb_rcvintpipe(dev->udev, dev->ep_intr->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); diff --git a/target/linux/brcm2708/patches-4.19/950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/brcm2708/patches-4.19/950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch index 7d4bab5222..d147ce9eec 100644 --- a/target/linux/brcm2708/patches-4.19/950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch +++ b/target/linux/brcm2708/patches-4.19/950-0318-lan78xx-EEE-support-is-now-a-PHY-property.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2194,7 +2194,7 @@ static int lan78xx_phy_init(struct lan78 +@@ -2195,7 +2195,7 @@ static int lan78xx_phy_init(struct lan78 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control); phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv); diff --git a/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch index 9608504500..f5313aec37 100644 --- a/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch @@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing. --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -3258,7 +3258,7 @@ static int rx_submit(struct lan78xx_net +@@ -3259,7 +3259,7 @@ static int rx_submit(struct lan78xx_net size_t size = dev->rx_urb_size; int ret = 0; diff --git a/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch b/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch index 28c7450564..7bbee63f41 100644 --- a/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch @@ -21,7 +21,7 @@ Cc: stable@vger.kernel.org --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c -@@ -1272,8 +1272,13 @@ int hci_conn_check_link_mode(struct hci_ +@@ -1280,8 +1280,13 @@ int hci_conn_check_link_mode(struct hci_ return 0; } diff --git a/target/linux/brcm2708/patches-4.19/950-0465-mmc-sdhci-Mask-spurious-interrupts.patch b/target/linux/brcm2708/patches-4.19/950-0465-mmc-sdhci-Mask-spurious-interrupts.patch index 1aa0a17965..fd5cb5277c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0465-mmc-sdhci-Mask-spurious-interrupts.patch +++ b/target/linux/brcm2708/patches-4.19/950-0465-mmc-sdhci-Mask-spurious-interrupts.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -2937,6 +2937,10 @@ static irqreturn_t sdhci_irq(int irq, vo +@@ -2935,6 +2935,10 @@ static irqreturn_t sdhci_irq(int irq, vo result = IRQ_WAKE_THREAD; } diff --git a/target/linux/brcm2708/patches-4.19/950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch b/target/linux/brcm2708/patches-4.19/950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch index 52f999ec14..bd99cba5ac 100644 --- a/target/linux/brcm2708/patches-4.19/950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch +++ b/target/linux/brcm2708/patches-4.19/950-0603-media-vb2-set-reqbufs-create_bufs-capabilities.patch @@ -152,7 +152,7 @@ Minor modifications required on the backport return __put_v4l2_format32(&p64->format, &p32->format); --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c -@@ -1879,7 +1879,7 @@ static int v4l_reqbufs(const struct v4l2 +@@ -1882,7 +1882,7 @@ static int v4l_reqbufs(const struct v4l2 if (ret) return ret; @@ -161,7 +161,7 @@ Minor modifications required on the backport return ops->vidioc_reqbufs(file, fh, p); } -@@ -1920,7 +1920,7 @@ static int v4l_create_bufs(const struct +@@ -1923,7 +1923,7 @@ static int v4l_create_bufs(const struct if (ret) return ret; diff --git a/target/linux/brcm2708/patches-4.19/950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/brcm2708/patches-4.19/950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 8c00945122..3320097b10 100644 --- a/target/linux/brcm2708/patches-4.19/950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/brcm2708/patches-4.19/950-0638-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1192,6 +1195,9 @@ +@@ -1193,6 +1196,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -174,6 +175,7 @@ static const struct hid_device_id hid_qu +@@ -175,6 +176,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, diff --git a/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch b/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch index 70959de2bc..c320527625 100644 --- a/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0777-spidev-Completely-disable-the-DT-warning.patch @@ -22,7 +22,7 @@ Signed-off-by: Phil Elwell --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -725,6 +725,7 @@ static int spidev_probe(struct spi_devic +@@ -728,6 +728,7 @@ static int spidev_probe(struct spi_devic * compatible string, it is a Linux implementation thing * rather than a description of the hardware. */ diff --git a/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch b/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch new file mode 100644 index 0000000000..023de0078d --- /dev/null +++ b/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch @@ -0,0 +1,41 @@ +From 2e864386e62e702a343be2507062ee08d5dfc810 Mon Sep 17 00:00:00 2001 +From: Evan Green +Date: Thu, 14 Nov 2019 15:50:07 -0800 +Subject: loop: Report EOPNOTSUPP properly + +Properly plumb out EOPNOTSUPP from loop driver operations, which may +get returned when for instance a discard operation is attempted but not +supported by the underlying block device. Before this change, everything +was reported in the log as an I/O error, which is scary and not +helpful in debugging. + +Signed-off-by: Evan Green +Reviewed-by: Gwendal Grignou +Reviewed-by: Bart Van Assche +--- + drivers/block/loop.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -460,7 +460,7 @@ static void lo_complete_rq(struct reques + if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || + req_op(rq) != REQ_OP_READ) { + if (cmd->ret < 0) +- ret = BLK_STS_IOERR; ++ ret = errno_to_blk_status(cmd->ret); + goto end_io; + } + +@@ -1904,7 +1904,10 @@ static void loop_handle_cmd(struct loop_ + failed: + /* complete non-aio request */ + if (!cmd->use_aio || ret) { +- cmd->ret = ret ? -EIO : 0; ++ if (ret == -EOPNOTSUPP) ++ cmd->ret = ret; ++ else ++ cmd->ret = ret ? -EIO : 0; + blk_mq_complete_request(rq); + } + } diff --git a/target/linux/generic/hack-4.19/550-loop-better-discard-for-block-devices.patch b/target/linux/generic/hack-4.19/550-loop-better-discard-for-block-devices.patch deleted file mode 100644 index 9701d945e6..0000000000 --- a/target/linux/generic/hack-4.19/550-loop-better-discard-for-block-devices.patch +++ /dev/null @@ -1,164 +0,0 @@ -From: Evan Green -Subject: [PATCH v5 0/2] loop: Better discard for block devices -Date: Mon, 6 May 2019 11:27:35 -0700 -Message-Id: <20190506182736.21064-2-evgreen@chromium.org> - -This series addresses some errors seen when using the loop -device directly backed by a block device. - -The first change titled "loop: Better discard for block devices" -plumbs out the correct error message, and the second change prevents -the error from occurring in many cases. - -The errors look like this: -[ 90.880875] print_req_error: I/O error, dev loop5, sector 0 - -The errors occur when trying to do a discard or write zeroes operation -on a loop device backed by a block device that does not support write zeroes. -Firstly, the error itself is incorrectly reported as I/O error, but is -actually EOPNOTSUPP. The first patch plumbs out EOPNOTSUPP to properly -report the error. - -The second patch called "loop: Better discard support for block devices" -prevents these errors from occurring by mirroring the zeroing capabilities -of the underlying block device into the loop device. -Before this change, discard was always reported as being supported, and -the loop device simply turns around and does an fallocate operation on the -backing device. After this change, backing block devices that do support -zeroing will continue to work as before, and continue to get all the -benefits of doing that. Backing devices that do not support zeroing will -fail earlier, avoiding hitting the loop device at all and ultimately -avoiding this error in the logs. - -I can also confirm that this fixes test block/003 in the blktests, when -running blktests on a loop device backed by a block device. - -Signed-off-by: Evan Green -Reviewed-by: Ming Lei -Reviewed-by: Bart Van Assche -Reviewed-by: Martin K. Petersen -Reviewed-by: Gwendal Grignou -Reviewed-by: Chaitanya Kulkarni ---- - ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -416,19 +416,14 @@ out_free_page: - return ret; - } - --static int lo_discard(struct loop_device *lo, struct request *rq, loff_t pos) -+static int lo_discard(struct loop_device *lo, struct request *rq, -+ int mode, loff_t pos) - { -- /* -- * We use punch hole to reclaim the free space used by the -- * image a.k.a. discard. However we do not support discard if -- * encryption is enabled, because it may give an attacker -- * useful information. -- */ - struct file *file = lo->lo_backing_file; -- int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE; -+ struct request_queue *q = lo->lo_queue; - int ret; - -- if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { -+ if (!blk_queue_discard(q)) { - ret = -EOPNOTSUPP; - goto out; - } -@@ -457,7 +452,9 @@ static void lo_complete_rq(struct reques - - if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || - req_op(rq) != REQ_OP_READ) { -- if (cmd->ret < 0) -+ if (cmd->ret == -EOPNOTSUPP) -+ ret = BLK_STS_NOTSUPP; -+ else if (cmd->ret < 0) - ret = BLK_STS_IOERR; - goto end_io; - } -@@ -597,8 +594,13 @@ static int do_req_filebacked(struct loop - case REQ_OP_FLUSH: - return lo_req_flush(lo, rq); - case REQ_OP_DISCARD: -+ return lo_discard(lo, rq, -+ FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, pos); -+ - case REQ_OP_WRITE_ZEROES: -- return lo_discard(lo, rq, pos); -+ return lo_discard(lo, rq, -+ FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, pos); -+ - case REQ_OP_WRITE: - if (lo->transfer) - return lo_write_transfer(lo, rq, pos); -@@ -853,6 +855,21 @@ static void loop_config_discard(struct l - struct file *file = lo->lo_backing_file; - struct inode *inode = file->f_mapping->host; - struct request_queue *q = lo->lo_queue; -+ struct request_queue *backingq; -+ -+ /* -+ * If the backing device is a block device, mirror its zeroing -+ * capability. REQ_OP_DISCARD translates to a zero-out even when backed -+ * by block devices to keep consistent behavior with file-backed loop -+ * devices. -+ */ -+ if (S_ISBLK(inode->i_mode) && !lo->lo_encrypt_key_size) { -+ backingq = bdev_get_queue(inode->i_bdev); -+ blk_queue_max_discard_sectors(q, -+ backingq->limits.max_write_zeroes_sectors); -+ -+ blk_queue_max_write_zeroes_sectors(q, -+ backingq->limits.max_write_zeroes_sectors); - - /* - * We use punch hole to reclaim the free space used by the -@@ -860,22 +877,24 @@ static void loop_config_discard(struct l - * encryption is enabled, because it may give an attacker - * useful information. - */ -- if ((!file->f_op->fallocate) || -- lo->lo_encrypt_key_size) { -+ } else if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { - q->limits.discard_granularity = 0; - q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, 0); - blk_queue_max_write_zeroes_sectors(q, 0); -- blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); -- return; -- } - -- q->limits.discard_granularity = inode->i_sb->s_blocksize; -- q->limits.discard_alignment = 0; -+ } else { -+ q->limits.discard_granularity = inode->i_sb->s_blocksize; -+ q->limits.discard_alignment = 0; - -- blk_queue_max_discard_sectors(q, UINT_MAX >> 9); -- blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); -- blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); -+ blk_queue_max_discard_sectors(q, UINT_MAX >> 9); -+ blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); -+ } -+ -+ if (q->limits.max_write_zeroes_sectors) -+ blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); -+ else -+ blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); - } - - static void loop_unprepare_queue(struct loop_device *lo) -@@ -1894,7 +1913,10 @@ static void loop_handle_cmd(struct loop_ - failed: - /* complete non-aio request */ - if (!cmd->use_aio || ret) { -- cmd->ret = ret ? -EIO : 0; -+ if (ret == -EOPNOTSUPP) -+ cmd->ret = ret; -+ else -+ cmd->ret = ret ? -EIO : 0; - blk_mq_complete_request(rq); - } - } diff --git a/target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch b/target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch new file mode 100644 index 0000000000..ac393e5f13 --- /dev/null +++ b/target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch @@ -0,0 +1,101 @@ +From 3117c3f45edbcc269baaebd3d13f39b7bf884aa6 Mon Sep 17 00:00:00 2001 +From: Evan Green +Date: Thu, 14 Nov 2019 15:50:08 -0800 +Subject: loop: Better discard support for block devices + +If the backing device for a loop device is itself a block device, +then mirror the "write zeroes" capabilities of the underlying +block device into the loop device. Copy this capability into both +max_write_zeroes_sectors and max_discard_sectors of the loop device. + +The reason for this is that REQ_OP_DISCARD on a loop device translates +into blkdev_issue_zeroout(), rather than blkdev_issue_discard(). This +presents a consistent interface for loop devices (that discarded data +is zeroed), regardless of the backing device type of the loop device. +There should be no behavior change for loop devices backed by regular +files. + +This change fixes blktest block/003, and removes an extraneous +error print in block/013 when testing on a loop device backed +by a block device that does not support discard. + +Signed-off-by: Evan Green +Reviewed-by: Gwendal Grignou +Reviewed-by: Chaitanya Kulkarni +--- + drivers/block/loop.c | 40 +++++++++++++++++++++++++++++----------- + 1 file changed, 29 insertions(+), 11 deletions(-) + +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -426,11 +426,12 @@ static int lo_fallocate(struct loop_devi + * information. + */ + struct file *file = lo->lo_backing_file; ++ struct request_queue *q = lo->lo_queue; + int ret; + + mode |= FALLOC_FL_KEEP_SIZE; + +- if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { ++ if (!blk_queue_discard(q)) { + ret = -EOPNOTSUPP; + goto out; + } +@@ -863,6 +864,21 @@ static void loop_config_discard(struct l + struct file *file = lo->lo_backing_file; + struct inode *inode = file->f_mapping->host; + struct request_queue *q = lo->lo_queue; ++ struct request_queue *backingq; ++ ++ /* ++ * If the backing device is a block device, mirror its zeroing ++ * capability. REQ_OP_DISCARD translates to a zero-out even when backed ++ * by block devices to keep consistent behavior with file-backed loop ++ * devices. ++ */ ++ if (S_ISBLK(inode->i_mode) && !lo->lo_encrypt_key_size) { ++ backingq = bdev_get_queue(inode->i_bdev); ++ blk_queue_max_discard_sectors(q, ++ backingq->limits.max_write_zeroes_sectors); ++ ++ blk_queue_max_write_zeroes_sectors(q, ++ backingq->limits.max_write_zeroes_sectors); + + /* + * We use punch hole to reclaim the free space used by the +@@ -870,22 +886,24 @@ static void loop_config_discard(struct l + * encryption is enabled, because it may give an attacker + * useful information. + */ +- if ((!file->f_op->fallocate) || +- lo->lo_encrypt_key_size) { ++ } else if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { + q->limits.discard_granularity = 0; + q->limits.discard_alignment = 0; + blk_queue_max_discard_sectors(q, 0); + blk_queue_max_write_zeroes_sectors(q, 0); +- blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); +- return; +- } + +- q->limits.discard_granularity = inode->i_sb->s_blocksize; +- q->limits.discard_alignment = 0; ++ } else { ++ q->limits.discard_granularity = inode->i_sb->s_blocksize; ++ q->limits.discard_alignment = 0; + +- blk_queue_max_discard_sectors(q, UINT_MAX >> 9); +- blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); +- blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); ++ blk_queue_max_discard_sectors(q, UINT_MAX >> 9); ++ blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); ++ } ++ ++ if (q->limits.max_write_zeroes_sectors) ++ blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); ++ else ++ blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); + } + + static void loop_unprepare_queue(struct loop_device *lo) diff --git a/target/linux/generic/hack-4.19/721-phy_packets.patch b/target/linux/generic/hack-4.19/721-phy_packets.patch index e9c09302e3..b6cbef1e49 100644 --- a/target/linux/generic/hack-4.19/721-phy_packets.patch +++ b/target/linux/generic/hack-4.19/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2545,6 +2545,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2547,6 +2547,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2676,16 +2680,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2678,16 +2682,6 @@ static inline struct sk_buff *dev_alloc_ } diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index f562c9f2e1..3ee7fdafd0 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau } --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -410,6 +410,9 @@ static struct pernet_operations ip_rt_pr +@@ -411,6 +411,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch index b00fb8ee2e..3a42182c97 100644 --- a/target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch +++ b/target/linux/generic/pending-4.19/130-add-linux-spidev-compatible-si3210.patch @@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -669,6 +669,7 @@ static const struct of_device_id spidev_ +@@ -672,6 +672,7 @@ static const struct of_device_id spidev_ { .compatible = "lineartechnology,ltc2488" }, { .compatible = "ge,achc" }, { .compatible = "semtech,sx1301" }, diff --git a/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch index 6f0adb5ce5..9230279fca 100644 --- a/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -500,6 +504,9 @@ static void *find_token(unsigned char *s +@@ -502,6 +506,9 @@ static void *find_token(unsigned char *s { int i; @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -572,6 +579,9 @@ static void optimize_result(void) +@@ -574,6 +581,9 @@ static void optimize_result(void) { int i, best; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -754,6 +764,8 @@ int main(int argc, char **argv) +@@ -756,6 +766,8 @@ int main(int argc, char **argv) absolute_percpu = 1; else if (strcmp(argv[i], "--base-relative") == 0) base_relative = 1; diff --git a/target/linux/generic/pending-4.19/630-packet_socket_type.patch b/target/linux/generic/pending-4.19/630-packet_socket_type.patch index 70cf88ddfa..7c4ab32fa2 100644 --- a/target/linux/generic/pending-4.19/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.19/630-packet_socket_type.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1789,6 +1789,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1790,6 +1790,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1796,6 +1797,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1797,6 +1798,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1808,7 +1810,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1809,7 +1811,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2036,12 +2038,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2037,12 +2039,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2167,12 +2169,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2168,12 +2170,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3258,6 +3260,7 @@ static int packet_create(struct net *net +@@ -3259,6 +3261,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3869,6 +3872,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3870,6 +3873,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3921,6 +3934,13 @@ static int packet_getsockopt(struct sock +@@ -3922,6 +3935,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-4.19/655-increase_skb_pad.patch b/target/linux/generic/pending-4.19/655-increase_skb_pad.patch index b5f7fadbe7..94e325b0cc 100644 --- a/target/linux/generic/pending-4.19/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-4.19/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2509,7 +2509,7 @@ static inline int pskb_network_may_pull( +@@ -2511,7 +2511,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 114595b3f5..c35aca8a18 100644 --- a/target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -118,8 +118,8 @@ Signed-off-by: Jonas Gorski +static int ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb); static void ip6_link_failure(struct sk_buff *skb); static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, - struct sk_buff *skb, u32 mtu); -@@ -326,6 +328,18 @@ static const struct rt6_info ip6_prohibi + struct sk_buff *skb, u32 mtu, +@@ -328,6 +330,18 @@ static const struct rt6_info ip6_prohibi .rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP), }; @@ -138,7 +138,7 @@ Signed-off-by: Jonas Gorski static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -904,6 +918,7 @@ static const int fib6_prop[RTN_MAX + 1] +@@ -906,6 +920,7 @@ static const int fib6_prop[RTN_MAX + 1] [RTN_BLACKHOLE] = -EINVAL, [RTN_UNREACHABLE] = -EHOSTUNREACH, [RTN_PROHIBIT] = -EACCES, @@ -146,7 +146,7 @@ Signed-off-by: Jonas Gorski [RTN_THROW] = -EAGAIN, [RTN_NAT] = -EINVAL, [RTN_XRESOLVE] = -EINVAL, -@@ -941,6 +956,10 @@ static void ip6_rt_init_dst_reject(struc +@@ -943,6 +958,10 @@ static void ip6_rt_init_dst_reject(struc rt->dst.output = ip6_pkt_prohibit_out; rt->dst.input = ip6_pkt_prohibit; break; @@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski case RTN_THROW: case RTN_UNREACHABLE: default: -@@ -3781,6 +3800,17 @@ static int ip6_pkt_prohibit_out(struct n +@@ -3789,6 +3808,17 @@ static int ip6_pkt_prohibit_out(struct n return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski /* * Allocate a dst for local (unicast / anycast) address. */ -@@ -4228,7 +4258,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -4236,7 +4266,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -5076,6 +5107,8 @@ static int ip6_route_dev_notify(struct n +@@ -5084,6 +5115,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -5087,6 +5120,7 @@ static int ip6_route_dev_notify(struct n +@@ -5095,6 +5128,7 @@ static int ip6_route_dev_notify(struct n in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); #endif } -@@ -5281,6 +5315,15 @@ static int __net_init ip6_route_net_init +@@ -5289,6 +5323,15 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski #endif net->ipv6.sysctl.flush_delay = 0; -@@ -5299,6 +5342,8 @@ out: +@@ -5307,6 +5350,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -5319,6 +5364,7 @@ static void __net_exit ip6_route_net_exi +@@ -5327,6 +5372,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); @@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -5395,6 +5441,9 @@ void __init ip6_route_init_special_entri +@@ -5403,6 +5449,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); diff --git a/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch b/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch index 7092552559..951145b3de 100644 --- a/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0063-4-ip806x-tsense-rework-driver.patch @@ -13,7 +13,7 @@ #include #include #include -@@ -210,9 +212,8 @@ +@@ -210,9 +212,8 @@ static void tsens_scheduler_fn(struct wo struct tsens_device *tmdev = container_of(work, struct tsens_device, tsens_work); unsigned int threshold, threshold_low, code, reg, sensor, mask; @@ -24,7 +24,7 @@ ret = regmap_read(tmdev->map, STATUS_CNTL_8064, ®); if (ret) -@@ -261,9 +262,8 @@ +@@ -261,9 +262,8 @@ static void tsens_scheduler_fn(struct wo if (upper_th_x || lower_th_x) { /* Notify user space */ schedule_work(&tmdev->sensor[0].notify_work); @@ -35,7 +35,7 @@ } } regmap_write(tmdev->map, STATUS_CNTL_8064, reg & mask); -@@ -372,40 +372,55 @@ +@@ -372,40 +372,55 @@ static int init_ipq8064(struct tsens_dev static int calibrate_ipq8064(struct tsens_device *tmdev) { int i; diff --git a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch index 04cb9b3bb7..06d29e8af8 100644 --- a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch +++ b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch @@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl. --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -625,6 +625,7 @@ +@@ -656,6 +656,7 @@ reg = <0x800000 0x4000>; gpio-controller; From fba8083540cecf87c3e320b7c3c084542de19af2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 00:47:25 +0100 Subject: [PATCH 220/480] kernel: bump 4.9 to 4.9.208 Refreshed all patches. Compile-tested on: none Runtime-tested on: none Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 ++-- ...q-move-tsq_flags-close-to-sk_wmem_alloc.patch | 2 +- .../090-net-generalize-napi_complete_done.patch | 2 +- .../130-add-linux-spidev-compatible-si3210.patch | 2 +- .../pending-4.9/203-kallsyms_uncompressed.patch | 6 +++--- .../pending-4.9/630-packet_socket_type.patch | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 40b5f5c2eb..50cd4db2d9 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .207 +LINUX_VERSION-4.9 = .208 LINUX_VERSION-4.14 = .162 LINUX_VERSION-4.19 = .93 -LINUX_KERNEL_HASH-4.9.207 = ca86637e7b5bec65eeb7da695824e0e8aca5ba52eb742885f0b7241977400124 +LINUX_KERNEL_HASH-4.9.208 = b7ad1c9841d671d026c55a4c91c77205f8b488ca5f980f838591c68662e0525a LINUX_KERNEL_HASH-4.14.162 = f65170224cd4359ce8b2793b492bd8127abdd0b91350484e001bce13f0c98b4b LINUX_KERNEL_HASH-4.19.93 = 2af5d23f82a8bf69a6e4d8407579293b7beeebd3054dc464d48bdb5d2d7f5834 diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch index 8beceff0fa..4ac95d3ee4 100644 --- a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch +++ b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller if (tcp_small_queue_check(sk, skb, 0)) break; -@@ -3561,8 +3561,6 @@ void __tcp_send_ack(struct sock *sk, u32 +@@ -3569,8 +3569,6 @@ void __tcp_send_ack(struct sock *sk, u32 /* We do not want pure acks influencing TCP Small Queues or fq/pacing * too much. * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 308dd0f194..433788e075 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -1293,7 +1293,7 @@ Signed-off-by: David S. Miller } --- a/drivers/net/fjes/fjes_main.c +++ b/drivers/net/fjes/fjes_main.c -@@ -1122,7 +1122,7 @@ static int fjes_poll(struct napi_struct +@@ -1125,7 +1125,7 @@ static int fjes_poll(struct napi_struct } if (work_done < budget) { diff --git a/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch index b3de75fbbe..e815976855 100644 --- a/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch +++ b/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch @@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -696,6 +696,7 @@ static struct class *spidev_class; +@@ -699,6 +699,7 @@ static struct class *spidev_class; static const struct of_device_id spidev_dt_ids[] = { { .compatible = "rohm,dh2228fv" }, { .compatible = "lineartechnology,ltc2488" }, diff --git a/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch index 759357549b..9bc8055039 100644 --- a/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -507,6 +511,9 @@ static void *find_token(unsigned char *s +@@ -509,6 +513,9 @@ static void *find_token(unsigned char *s { int i; @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -579,6 +586,9 @@ static void optimize_result(void) +@@ -581,6 +588,9 @@ static void optimize_result(void) { int i, best; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -767,6 +777,8 @@ int main(int argc, char **argv) +@@ -769,6 +779,8 @@ int main(int argc, char **argv) symbol_prefix_char = *p; } else if (strcmp(argv[i], "--base-relative") == 0) base_relative = 1; diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch index e61bde0774..e89bf0cfaa 100644 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.9/630-packet_socket_type.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1780,6 +1780,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1781,6 +1781,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1787,6 +1788,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1788,6 +1789,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1799,7 +1801,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1800,7 +1802,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2037,12 +2039,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2038,12 +2040,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2168,12 +2170,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2169,12 +2171,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3291,6 +3293,7 @@ static int packet_create(struct net *net +@@ -3292,6 +3294,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3904,6 +3907,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3905,6 +3908,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3956,6 +3969,13 @@ static int packet_getsockopt(struct sock +@@ -3957,6 +3970,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; From 411a666df279eb44488be4c3a6d59228b87e3957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Sun, 5 Jan 2020 11:13:55 +0100 Subject: [PATCH 221/480] ramips: fix sysupgrade image for TP-Link RE200v1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Images generated for the TP-Link RE200v1 cannot be updated using sysupgrade, because a necessary call to append-metadata was missing. Signed-off-by: Andreas Böhler --- target/linux/ramips/image/mt7620.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index cbf35f804a..698d1b5da2 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -962,7 +962,7 @@ define Device/tplink_re200-v1 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-mt76x0e IMAGES += factory.bin - IMAGE/sysupgrade.bin := mktplinkfw sysupgrade -e -O + IMAGE/sysupgrade.bin := mktplinkfw sysupgrade -e -O | append-metadata IMAGE/factory.bin := mktplinkfw factory -e -O IMAGE_SIZE := 7936k KERNEL := $(KERNEL_DTB) From cf3da66d2ce11a30ae2993b56276ade10c9bddb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 31 Dec 2019 10:34:29 +0100 Subject: [PATCH 222/480] base-files: sysupgrade: exit if the firmware download failed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sysupgrade process shouldn't continue if the firmware image couldn't be downloaded. Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-December/020940.html Reported-by: Petr Novák Signed-off-by: Petr Štetiar --- package/base-files/Makefile | 2 +- package/base-files/files/sbin/sysupgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index cf5166772d..f203c29e95 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=210 +PKG_RELEASE:=211 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 935d08048e..6c518b780e 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -294,7 +294,7 @@ type platform_check_image >/dev/null 2>/dev/null || { case "$IMAGE" in http://*|\ https://*) - wget -O/tmp/sysupgrade.img "$IMAGE" + wget -O/tmp/sysupgrade.img "$IMAGE" || exit 1 IMAGE=/tmp/sysupgrade.img ;; esac From 059505d6146d2fc12ce0e9e2b9491f18d5723a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 1 Jan 2020 12:43:45 +0100 Subject: [PATCH 223/480] procd: update to version 2020-01-04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a5af33ce9a16 instance: strdup string attributes d2e8bf6ef7cf system: watchdog_set: fix misleading indentation 9814807bd71c system: sysupgrade: fix possibly misleading error c7a2db3c1eb6 system: sysupgrade: rework firmware validation ea45c4a0f07c system: fix failing image validation due to EINTR 4fde95506243 cmake: fix lookup of external libraries Signed-off-by: Petr Štetiar --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 73a704bc80..03afbadf3a 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_MIRROR_HASH:=ebf1ee3ff0587428cf6b972c0551372c8ccc8982cfa63cbe00b13dfd482859ec -PKG_SOURCE_DATE:=2019-12-30 -PKG_SOURCE_VERSION:=5ed190aae1b3985719046f4c744e311fc9ef18e3 +PKG_MIRROR_HASH:=036a42aa87741fa5e587195255c01b6b561bcb7b3858be12e8781949ecb1bda0 +PKG_SOURCE_DATE:=2020-01-04 +PKG_SOURCE_VERSION:=a5af33ce9a16f6aa599f19cc7161e067fab9495d CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 22a178e89282c7bd5bb181fc5c2c5cb6ff2403c8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 5 Jan 2020 18:40:22 +0100 Subject: [PATCH 224/480] fstools: update to latest Git HEAD 823faa0 block: re-discover mtd devices on extroot mount retry Signed-off-by: Jo-Philipp Wich --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 5bd31d7c00..d1bc704b3e 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=8cb1187b129a91537ff8f5b2751226e206f073742bd5c3673a0025f713d08203 -PKG_SOURCE_DATE:=2019-12-22 -PKG_SOURCE_VERSION:=b4e25d54035c5092e8e9b46ab63500e95ac8c730 +PKG_MIRROR_HASH:=7077c90f3938c7316ff7c8c353a178c4de61ef107b08b79209b93916a67c951d +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=823faa0f3edb93fac528bc35588cea81f0a77146 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 80c8a9aeedcfec8956dd8bdc6bbaa724c79b2dc3 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 21 Dec 2019 17:39:19 +0100 Subject: [PATCH 225/480] ipq806x: remove CONFIG_MDIO_IPQ8064 symbol This driver is not available on upstream. Signed-off-by: Christian Lamparter --- target/linux/ipq806x/config-4.19 | 1 - 1 file changed, 1 deletion(-) diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 index 56f3d1a526..f4c27d7ae8 100644 --- a/target/linux/ipq806x/config-4.19 +++ b/target/linux/ipq806x/config-4.19 @@ -268,7 +268,6 @@ CONFIG_MDIO_BITBANG=y CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y CONFIG_MDIO_GPIO=y -# CONFIG_MDIO_IPQ8064 is not set # CONFIG_MDM_GCC_9615 is not set # CONFIG_MDM_LCC_9615 is not set CONFIG_MEMFD_CREATE=y From 1e27befe63ff4c69f110c7310316f4af75ee63e9 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Tue, 24 Dec 2019 12:11:59 +0100 Subject: [PATCH 226/480] mac80211: remove ath10k_pci memory hacks These two hacks are no longer necessary as they've been moved to a special variant of kmod-ath10k-ct. So, if you have a device suffering from low-memory situation and getting applications crashes due to the OOM reaper or kernel panics with ath10k, please use the "kmod-ath10k-ct-smallbuffers" package from now on. Signed-off-by: Christian Lamparter --- ...0-0010-ath10k-limit-htt-rx-ring-size.patch | 11 ------ ...60-0011-ath10k-limit-pci-buffer-size.patch | 38 ------------------- 2 files changed, 49 deletions(-) delete mode 100644 package/kernel/mac80211/patches/ath/960-0010-ath10k-limit-htt-rx-ring-size.patch delete mode 100644 package/kernel/mac80211/patches/ath/960-0011-ath10k-limit-pci-buffer-size.patch diff --git a/package/kernel/mac80211/patches/ath/960-0010-ath10k-limit-htt-rx-ring-size.patch b/package/kernel/mac80211/patches/ath/960-0010-ath10k-limit-htt-rx-ring-size.patch deleted file mode 100644 index 05fce6a168..0000000000 --- a/package/kernel/mac80211/patches/ath/960-0010-ath10k-limit-htt-rx-ring-size.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/net/wireless/ath/ath10k/htt.h -+++ b/drivers/net/wireless/ath/ath10k/htt.h -@@ -226,7 +226,7 @@ enum htt_rx_ring_flags { - }; - - #define HTT_RX_RING_SIZE_MIN 128 --#define HTT_RX_RING_SIZE_MAX 2048 -+#define HTT_RX_RING_SIZE_MAX 512 - #define HTT_RX_RING_SIZE HTT_RX_RING_SIZE_MAX - #define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1) - #define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1) diff --git a/package/kernel/mac80211/patches/ath/960-0011-ath10k-limit-pci-buffer-size.patch b/package/kernel/mac80211/patches/ath/960-0011-ath10k-limit-pci-buffer-size.patch deleted file mode 100644 index 0c25fb3f04..0000000000 --- a/package/kernel/mac80211/patches/ath/960-0011-ath10k-limit-pci-buffer-size.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/drivers/net/wireless/ath/ath10k/pci.c -+++ b/drivers/net/wireless/ath/ath10k/pci.c -@@ -131,7 +131,7 @@ static struct ce_attr host_ce_config_wla - .flags = CE_ATTR_FLAGS, - .src_nentries = 0, - .src_sz_max = 2048, -- .dest_nentries = 512, -+ .dest_nentries = 128, - .recv_cb = ath10k_pci_htt_htc_rx_cb, - }, - -@@ -140,7 +140,7 @@ static struct ce_attr host_ce_config_wla - .flags = CE_ATTR_FLAGS, - .src_nentries = 0, - .src_sz_max = 2048, -- .dest_nentries = 128, -+ .dest_nentries = 64, - .recv_cb = ath10k_pci_htc_rx_cb, - }, - -@@ -167,7 +167,7 @@ static struct ce_attr host_ce_config_wla - .flags = CE_ATTR_FLAGS, - .src_nentries = 0, - .src_sz_max = 512, -- .dest_nentries = 512, -+ .dest_nentries = 128, - .recv_cb = ath10k_pci_htt_rx_cb, - }, - -@@ -192,7 +192,7 @@ static struct ce_attr host_ce_config_wla - .flags = CE_ATTR_FLAGS, - .src_nentries = 0, - .src_sz_max = 2048, -- .dest_nentries = 128, -+ .dest_nentries = 96, - .recv_cb = ath10k_pci_pktlog_rx_cb, - }, - From dd15ffbf6b7760b21cab16ad2ef7ed4b36d55a57 Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Sun, 5 Jan 2020 17:13:02 +0900 Subject: [PATCH 227/480] ar71xx: Remove mtd cfi_cmdset_0002 status check patch Currently the patch only changes break to use goto statement instead. But not necessary acutually since the ret value checked after the for loop. So it is okay for the break case before changed by the patch also. This patch only reverts the following commit partially. https://github.com/openwrt/openwrt/commit/ddc11c3932c7b7b7df7d5fbd48f207e77619eaa7 Note: The changes are mainly applied into the linux kernel upstream. Signed-off-by: Tokunori Ikegami Cc: Koen Vandeputte --- ...mtd_fix_cfi_cmdset_0002_status_check.patch | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch diff --git a/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch deleted file mode 100644 index 4ef2303769..0000000000 --- a/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1641,7 +1641,7 @@ static int __xipram do_write_oneword(str - } - - if (chip_good(map, adr, datum)) -- break; -+ goto enable_xip; - - /* Latency issues. Drop the lock, wait a while and retry */ - UDELAY(map, chip, adr, 1); -@@ -1658,6 +1658,8 @@ static int __xipram do_write_oneword(str - goto retry; - } - } -+ -+ enable_xip: - xip_enable(map, chip, adr); - op_done: - if (mode == FL_OTP_WRITE) -@@ -2236,7 +2238,6 @@ static int cfi_amdstd_panic_write(struct - return 0; - } - -- - /* - * Handle devices with one erase region, that only implement - * the chip erase command. -@@ -2304,7 +2305,7 @@ static int __xipram do_erase_chip(struct - } - - if (chip_good(map, adr, map_word_ff(map))) -- break; -+ goto op_done; - - if (time_after(jiffies, timeo)) { - printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -2328,6 +2329,7 @@ static int __xipram do_erase_chip(struct - } - } - -+ op_done: - chip->state = FL_READY; - xip_enable(map, chip, adr); - DISABLE_VPP(map); -@@ -2401,7 +2403,7 @@ static int __xipram do_erase_oneblock(st - - if (chip_good(map, adr, map_word_ff(map))) { - xip_enable(map, chip, adr); -- break; -+ goto op_done; - } - - if (time_after(jiffies, timeo)) { -@@ -2427,6 +2429,7 @@ static int __xipram do_erase_oneblock(st - } - } - -+ op_done: - chip->state = FL_READY; - DISABLE_VPP(map); - put_chip(map, chip, adr); From 946eba9a92ab42aa0a32d5bba51f76dd53ca5fcf Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Sun, 5 Jan 2020 17:13:03 +0900 Subject: [PATCH 228/480] ath79: Remove mtd cfi_cmdset_0002 status check patches Currently the patch only changes break to use goto statement instead. But not necessary acutually since the ret value checked after the for loop. So it is okay for the break case before changed by the patch also. This patch only reverts the following commit partially. https://github.com/openwrt/openwrt/commit/ddc11c3932c7b7b7df7d5fbd48f207e7 Note: The changes are mainly applied into the linux kernel upstream. Signed-off-by: Tokunori Ikegami Cc: Koen Vandeputte --- ...mtd_fix_cfi_cmdset_0002_status_check.patch | 62 ------------------- ...mtd_fix_cfi_cmdset_0002_status_check.patch | 62 ------------------- 2 files changed, 124 deletions(-) delete mode 100644 target/linux/ath79/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch delete mode 100644 target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch diff --git a/target/linux/ath79/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ath79/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch deleted file mode 100644 index 4ef2303769..0000000000 --- a/target/linux/ath79/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1641,7 +1641,7 @@ static int __xipram do_write_oneword(str - } - - if (chip_good(map, adr, datum)) -- break; -+ goto enable_xip; - - /* Latency issues. Drop the lock, wait a while and retry */ - UDELAY(map, chip, adr, 1); -@@ -1658,6 +1658,8 @@ static int __xipram do_write_oneword(str - goto retry; - } - } -+ -+ enable_xip: - xip_enable(map, chip, adr); - op_done: - if (mode == FL_OTP_WRITE) -@@ -2236,7 +2238,6 @@ static int cfi_amdstd_panic_write(struct - return 0; - } - -- - /* - * Handle devices with one erase region, that only implement - * the chip erase command. -@@ -2304,7 +2305,7 @@ static int __xipram do_erase_chip(struct - } - - if (chip_good(map, adr, map_word_ff(map))) -- break; -+ goto op_done; - - if (time_after(jiffies, timeo)) { - printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -2328,6 +2329,7 @@ static int __xipram do_erase_chip(struct - } - } - -+ op_done: - chip->state = FL_READY; - xip_enable(map, chip, adr); - DISABLE_VPP(map); -@@ -2401,7 +2403,7 @@ static int __xipram do_erase_oneblock(st - - if (chip_good(map, adr, map_word_ff(map))) { - xip_enable(map, chip, adr); -- break; -+ goto op_done; - } - - if (time_after(jiffies, timeo)) { -@@ -2427,6 +2429,7 @@ static int __xipram do_erase_oneblock(st - } - } - -+ op_done: - chip->state = FL_READY; - DISABLE_VPP(map); - put_chip(map, chip, adr); diff --git a/target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch deleted file mode 100644 index 702e2a5b09..0000000000 --- a/target/linux/ath79/patches-4.19/403-mtd_fix_cfi_cmdset_0002_status_check.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1640,7 +1640,7 @@ static int __xipram do_write_oneword(str - } - - if (chip_good(map, adr, datum)) -- break; -+ goto enable_xip; - - /* Latency issues. Drop the lock, wait a while and retry */ - UDELAY(map, chip, adr, 1); -@@ -1657,6 +1657,8 @@ static int __xipram do_write_oneword(str - goto retry; - } - } -+ -+ enable_xip: - xip_enable(map, chip, adr); - op_done: - if (mode == FL_OTP_WRITE) -@@ -2235,7 +2237,6 @@ static int cfi_amdstd_panic_write(struct - return 0; - } - -- - /* - * Handle devices with one erase region, that only implement - * the chip erase command. -@@ -2303,7 +2304,7 @@ static int __xipram do_erase_chip(struct - } - - if (chip_good(map, adr, map_word_ff(map))) -- break; -+ goto op_done; - - if (time_after(jiffies, timeo)) { - printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -2327,6 +2328,7 @@ static int __xipram do_erase_chip(struct - } - } - -+ op_done: - chip->state = FL_READY; - xip_enable(map, chip, adr); - DISABLE_VPP(map); -@@ -2399,7 +2401,7 @@ static int __xipram do_erase_oneblock(st - } - - if (chip_good(map, adr, map_word_ff(map))) -- break; -+ goto op_done; - - if (time_after(jiffies, timeo)) { - printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -2423,6 +2425,7 @@ static int __xipram do_erase_oneblock(st - } - } - -+ op_done: - chip->state = FL_READY; - xip_enable(map, chip, adr); - DISABLE_VPP(map); From 9a3b10b449a38f88def3a9ccbfcadea111338346 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 4 Jan 2020 10:18:50 +0100 Subject: [PATCH 229/480] strace: update to version 5.4 Changelog: https://strace.io/files/5.4/ Signed-off-by: Josef Schlehofer --- package/devel/strace/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index 950dafc5d9..0d22b0bb23 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=5.3 +PKG_VERSION:=5.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) -PKG_HASH:=6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047 +PKG_HASH:=f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=LGPL-2.1-or-later From c84a3458aaee23b6cc6a6ace039596dccb6b7a12 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 3 Jan 2020 18:31:01 -0800 Subject: [PATCH 230/480] libcxx: Remove -flto from LDFLAGS It seems the buildbots can't handle it. Added a cmake option to find the cxxabi files as they are part of the toolchain and not in the normal path. It doesn't seem to make a difference, just gets rid of cmake warnings. Added another small GCC warning fix. It's fairly minor. This has no change in compiled size, and most likely no change in behavior. Bumped the PKG_RELEASE anyway. Signed-off-by: Rosen Penev --- package/libs/libcxx/Makefile | 6 ++++-- package/libs/libcxx/patches/010-cxx17.patch | 2 +- package/libs/libcxx/patches/020-fixes.patch | 13 ++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile index 1d8e502221..53b7f1eaab 100644 --- a/package/libs/libcxx/Makefile +++ b/package/libs/libcxx/Makefile @@ -1,3 +1,4 @@ + # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcxx PKG_VERSION:=9.0.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.llvm.org/git/libcxx @@ -38,6 +39,7 @@ endef CMAKE_OPTIONS += \ -DLIBCXX_CXX_ABI="libsupc++" \ + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/include/c++/$(CONFIG_GCC_VERSION);$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/include/c++/$(CONFIG_GCC_VERSION)/$(REAL_GNU_TARGET_NAME)" \ -DLIBCXX_ENABLE_ASSERTIONS=OFF \ -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \ -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ @@ -47,7 +49,7 @@ CMAKE_OPTIONS += \ -DLIBCXX_HAS_MUSL_LIBC=$(if $(CONFIG_USE_MUSL),ON,OFF) TARGET_CXXFLAGS += -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -Wno-attributes -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -flto=jobserver +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) diff --git a/package/libs/libcxx/patches/010-cxx17.patch b/package/libs/libcxx/patches/010-cxx17.patch index c313c47611..dceec9d4f3 100644 --- a/package/libs/libcxx/patches/010-cxx17.patch +++ b/package/libs/libcxx/patches/010-cxx17.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -524,9 +524,9 @@ remove_flags(-Wno-pedantic -pedantic-errors -pedantic) +@@ -524,9 +524,9 @@ remove_flags(-Wno-pedantic -pedantic-err if (LIBCXX_HAS_MUSL_LIBC OR LIBCXX_TARGETING_CLANG_CL) # musl's pthread implementations uses volatile types in their structs which is # not a constexpr in C++11 but is in C++14, so we use C++14 with musl. diff --git a/package/libs/libcxx/patches/020-fixes.patch b/package/libs/libcxx/patches/020-fixes.patch index abc630d42f..22ac494c04 100644 --- a/package/libs/libcxx/patches/020-fixes.patch +++ b/package/libs/libcxx/patches/020-fixes.patch @@ -1,6 +1,17 @@ +--- a/include/cmath ++++ b/include/cmath +@@ -615,7 +615,7 @@ _Fp __lerp(_Fp __a, _Fp __b, _Fp __t) no + + if (__t == 1) return __b; + const _Fp __x = __a + __t * (__b - __a); +- if (__t > 1 == __b > __a) ++ if ((__t > 1) == (__b > __a)) + return __b < __x ? __x : __b; + else + return __x < __b ? __x : __b; --- a/include/memory +++ b/include/memory -@@ -1696,7 +1696,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits +@@ -1696,7 +1696,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_tr ptrdiff_t _Np = __end1 - __begin1; __end2 -= _Np; if (_Np > 0) From 43eb93441fa33822cb1871a758cad892baeb8cce Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 1 Jan 2020 17:22:01 +0100 Subject: [PATCH 231/480] e2fsprogs: update to version 1.45.4 Removed backported patch Release notes: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.4 Signed-off-by: Josef Schlehofer --- package/utils/e2fsprogs/Makefile | 6 +- .../100-CVE-2019-5094-libsupport.patch | 203 ------------------ 2 files changed, 3 insertions(+), 206 deletions(-) delete mode 100644 package/utils/e2fsprogs/patches/100-CVE-2019-5094-libsupport.patch diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index b2b6ea31ea..3ba77abc7a 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.44.5 -PKG_RELEASE:=2 +PKG_VERSION:=1.45.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ -PKG_HASH:=ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9 +PKG_HASH:=65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=NOTICE diff --git a/package/utils/e2fsprogs/patches/100-CVE-2019-5094-libsupport.patch b/package/utils/e2fsprogs/patches/100-CVE-2019-5094-libsupport.patch deleted file mode 100644 index c69f465052..0000000000 --- a/package/utils/e2fsprogs/patches/100-CVE-2019-5094-libsupport.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 09fe1fd2a1f9efc3091b4fc61f1876d0785956a8 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Sun, 1 Sep 2019 00:59:16 -0400 -Subject: libsupport: add checks to prevent buffer overrun bugs in quota code - -A maliciously corrupted file systems can trigger buffer overruns in -the quota code used by e2fsck. To fix this, add sanity checks to the -quota header fields as well as to block number references in the quota -tree. - -Addresses: CVE-2019-5094 -Addresses: TALOS-2019-0887 -Signed-off-by: Theodore Ts'o -(cherry picked from commit 8dbe7b475ec5e91ed767239f0e85880f416fc384) ---- - lib/support/mkquota.c | 1 + - lib/support/quotaio_tree.c | 71 ++++++++++++++++++++++++++++++---------------- - lib/support/quotaio_v2.c | 28 ++++++++++++++++++ - 3 files changed, 76 insertions(+), 24 deletions(-) - ---- a/lib/support/mkquota.c -+++ b/lib/support/mkquota.c -@@ -671,6 +671,7 @@ errcode_t quota_compare_and_update(quota - err = qh.qh_ops->scan_dquots(&qh, scan_dquots_callback, &scan_data); - if (err) { - log_debug("Error scanning dquots"); -+ *usage_inconsistent = 1; - goto out_close_qh; - } - ---- a/lib/support/quotaio_tree.c -+++ b/lib/support/quotaio_tree.c -@@ -540,6 +540,17 @@ struct dquot *qtree_read_dquot(struct qu - return dquot; - } - -+static int check_reference(struct quota_handle *h, unsigned int blk) -+{ -+ if (blk >= h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks) { -+ log_err("Illegal reference (%u >= %u) in %s quota file", -+ blk, h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks, -+ quota_type2name(h->qh_type)); -+ return -1; -+ } -+ return 0; -+} -+ - /* - * Scan all dquots in file and call callback on each - */ -@@ -558,7 +569,7 @@ static int report_block(struct dquot *dq - int entries, i; - - if (!buf) -- return 0; -+ return -1; - - set_bit(bitmap, blk); - read_blk(dquot->dq_h, blk, buf); -@@ -580,23 +591,12 @@ static int report_block(struct dquot *dq - return entries; - } - --static void check_reference(struct quota_handle *h, unsigned int blk) --{ -- if (blk >= h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks) -- log_err("Illegal reference (%u >= %u) in %s quota file. " -- "Quota file is probably corrupted.\n" -- "Please run e2fsck (8) to fix it.", -- blk, -- h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks, -- quota_type2name(h->qh_type)); --} -- - static int report_tree(struct dquot *dquot, unsigned int blk, int depth, - char *bitmap, - int (*process_dquot) (struct dquot *, void *), - void *data) - { -- int entries = 0, i; -+ int entries = 0, ret, i; - dqbuf_t buf = getdqbuf(); - __le32 *ref = (__le32 *) buf; - -@@ -607,22 +607,40 @@ static int report_tree(struct dquot *dqu - if (depth == QT_TREEDEPTH - 1) { - for (i = 0; i < QT_BLKSIZE >> 2; i++) { - blk = ext2fs_le32_to_cpu(ref[i]); -- check_reference(dquot->dq_h, blk); -- if (blk && !get_bit(bitmap, blk)) -- entries += report_block(dquot, blk, bitmap, -- process_dquot, data); -+ if (check_reference(dquot->dq_h, blk)) { -+ entries = -1; -+ goto errout; -+ } -+ if (blk && !get_bit(bitmap, blk)) { -+ ret = report_block(dquot, blk, bitmap, -+ process_dquot, data); -+ if (ret < 0) { -+ entries = ret; -+ goto errout; -+ } -+ entries += ret; -+ } - } - } else { - for (i = 0; i < QT_BLKSIZE >> 2; i++) { - blk = ext2fs_le32_to_cpu(ref[i]); - if (blk) { -- check_reference(dquot->dq_h, blk); -- entries += report_tree(dquot, blk, depth + 1, -- bitmap, process_dquot, -- data); -+ if (check_reference(dquot->dq_h, blk)) { -+ entries = -1; -+ goto errout; -+ } -+ ret = report_tree(dquot, blk, depth + 1, -+ bitmap, process_dquot, -+ data); -+ if (ret < 0) { -+ entries = ret; -+ goto errout; -+ } -+ entries += ret; - } - } - } -+errout: - freedqbuf(buf); - return entries; - } -@@ -642,6 +660,7 @@ int qtree_scan_dquots(struct quota_handl - int (*process_dquot) (struct dquot *, void *), - void *data) - { -+ int ret; - char *bitmap; - struct v2_mem_dqinfo *v2info = &h->qh_info.u.v2_mdqi; - struct qtree_mem_dqinfo *info = &v2info->dqi_qtree; -@@ -655,10 +674,14 @@ int qtree_scan_dquots(struct quota_handl - ext2fs_free_mem(&dquot); - return -1; - } -- v2info->dqi_used_entries = report_tree(dquot, QT_TREEOFF, 0, bitmap, -- process_dquot, data); -+ ret = report_tree(dquot, QT_TREEOFF, 0, bitmap, process_dquot, data); -+ if (ret < 0) -+ goto errout; -+ v2info->dqi_used_entries = ret; - v2info->dqi_data_blocks = find_set_bits(bitmap, info->dqi_blocks); -+ ret = 0; -+errout: - ext2fs_free_mem(&bitmap); - ext2fs_free_mem(&dquot); -- return 0; -+ return ret; - } ---- a/lib/support/quotaio_v2.c -+++ b/lib/support/quotaio_v2.c -@@ -175,6 +175,8 @@ static int v2_check_file(struct quota_ha - static int v2_init_io(struct quota_handle *h) - { - struct v2_disk_dqinfo ddqinfo; -+ struct v2_mem_dqinfo *info; -+ __u64 filesize; - - h->qh_info.u.v2_mdqi.dqi_qtree.dqi_entry_size = - sizeof(struct v2r1_disk_dqblk); -@@ -185,6 +187,32 @@ static int v2_init_io(struct quota_handl - sizeof(ddqinfo)) != sizeof(ddqinfo)) - return -1; - v2_disk2memdqinfo(&h->qh_info, &ddqinfo); -+ -+ /* Check to make sure quota file info is sane */ -+ info = &h->qh_info.u.v2_mdqi; -+ if (ext2fs_file_get_lsize(h->qh_qf.e2_file, &filesize)) -+ return -1; -+ if ((filesize > (1U << 31)) || -+ (info->dqi_qtree.dqi_blocks > -+ (filesize + QT_BLKSIZE - 1) >> QT_BLKSIZE_BITS)) { -+ log_err("Quota inode %u corrupted: file size %llu; " -+ "dqi_blocks %u", h->qh_qf.ino, -+ filesize, info->dqi_qtree.dqi_blocks); -+ return -1; -+ } -+ if (info->dqi_qtree.dqi_free_blk >= info->dqi_qtree.dqi_blocks) { -+ log_err("Quota inode %u corrupted: free_blk %u; dqi_blocks %u", -+ h->qh_qf.ino, info->dqi_qtree.dqi_free_blk, -+ info->dqi_qtree.dqi_blocks); -+ return -1; -+ } -+ if (info->dqi_qtree.dqi_free_entry >= info->dqi_qtree.dqi_blocks) { -+ log_err("Quota inode %u corrupted: free_entry %u; " -+ "dqi_blocks %u", h->qh_qf.ino, -+ info->dqi_qtree.dqi_free_entry, -+ info->dqi_qtree.dqi_blocks); -+ return -1; -+ } - return 0; - } - From 121ad10601a072959c02e6f4c139169333fc2200 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Dec 2019 19:26:55 -0800 Subject: [PATCH 232/480] lldpd: Fix compilation without fortify-headers Upstream backport. Signed-off-by: Rosen Penev --- package/network/services/lldpd/Makefile | 2 +- .../lldpd/patches/001-disable_libcap.patch | 6 +++--- .../services/lldpd/patches/010-limits.patch | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 package/network/services/lldpd/patches/010-limits.patch diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 5b36155b71..eb1fe6539d 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd PKG_VERSION:=1.0.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://media.luffy.cx/files/lldpd diff --git a/package/network/services/lldpd/patches/001-disable_libcap.patch b/package/network/services/lldpd/patches/001-disable_libcap.patch index 850d493c6f..9b03d84381 100644 --- a/package/network/services/lldpd/patches/001-disable_libcap.patch +++ b/package/network/services/lldpd/patches/001-disable_libcap.patch @@ -1,6 +1,6 @@ ---- a/configure.ac 2019-04-30 17:04:53.542449926 +0300 -+++ b/configure.ac 2019-04-30 17:06:26.974453867 +0300 -@@ -244,7 +244,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -244,7 +244,13 @@ PKG_CHECK_MODULES([check], [check >= 0.9 # Third-party libraries lldp_CHECK_LIBEVENT diff --git a/package/network/services/lldpd/patches/010-limits.patch b/package/network/services/lldpd/patches/010-limits.patch new file mode 100644 index 0000000000..1672145384 --- /dev/null +++ b/package/network/services/lldpd/patches/010-limits.patch @@ -0,0 +1,19 @@ +From b2eebb31fc21b5ce12ef8944b50088119f1b9427 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= +Date: Mon, 25 Mar 2019 18:43:03 +0100 +Subject: [PATCH] priv: include limits.h for PATH_MAX + +--- + src/daemon/priv.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/daemon/priv.c ++++ b/src/daemon/priv.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include From d040851a6f5ccf47a05de139a56e781996a47ba4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 30 Dec 2019 19:24:01 -0800 Subject: [PATCH 233/480] trace-cmd: Fix compilation without fortify-headers Upstream backport. Signed-off-by: Rosen Penev --- package/devel/trace-cmd/Makefile | 2 +- .../devel/trace-cmd/patches/120-limits.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 package/devel/trace-cmd/patches/120-limits.patch diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index 6d3fe53758..25831d8b1b 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd PKG_VERSION:=v2.6.1 -PKG_RELEASE=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/ diff --git a/package/devel/trace-cmd/patches/120-limits.patch b/package/devel/trace-cmd/patches/120-limits.patch new file mode 100644 index 0000000000..b9d91cc03e --- /dev/null +++ b/package/devel/trace-cmd/patches/120-limits.patch @@ -0,0 +1,24 @@ +From 293ff6d5bc9d3b8bfbc3c57d20d3d2d00986c168 Mon Sep 17 00:00:00 2001 +From: Alexander Couzens +Date: Sun, 26 Nov 2017 05:22:51 +0100 +Subject: [PATCH] trace-cmd listen: Include limits.h to define PATH_MAX + +PATH_MAX is defined by limits.h. On some system it's also +defined by dirent.h but not on musl. + +Signed-off-by: Alexander Couzens +Signed-off-by: Steven Rostedt (VMware) +--- + trace-listen.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/trace-listen.c ++++ b/trace-listen.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 0bd322861ca0e96a323e27f2b5d39022b65c0aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Mon, 30 Dec 2019 22:10:27 +0100 Subject: [PATCH 234/480] ath79: drop obsolete ehci hacks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's nothing enabling these hacks in ath79, so drop the redundant patches. Signed-off-by: Bjørn Mork --- ...490-usb-ehci-add-quirks-for-qca-socs.patch | 103 ------------------ ...490-usb-ehci-add-quirks-for-qca-socs.patch | 103 ------------------ 2 files changed, 206 deletions(-) delete mode 100644 target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch delete mode 100644 target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch diff --git a/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch b/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch deleted file mode 100644 index 1d1979cd6e..0000000000 --- a/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -252,6 +252,37 @@ int ehci_reset(struct ehci_hcd *ehci) - command |= CMD_RESET; - dbg_cmd (ehci, "reset", command); - ehci_writel(ehci, command, &ehci->regs->command); -+ -+ if (ehci->qca_force_host_mode) { -+ u32 usbmode; -+ -+ udelay(1000); -+ -+ usbmode = ehci_readl(ehci, &ehci->regs->usbmode); -+ usbmode |= USBMODE_CM_HC | (1 << 4); -+ ehci_writel(ehci, usbmode, &ehci->regs->usbmode); -+ -+ ehci_dbg(ehci, "forced host mode, usbmode: %08x\n", -+ ehci_readl(ehci, &ehci->regs->usbmode)); -+ } -+ -+ if (ehci->qca_force_16bit_ptw) { -+ u32 port_status; -+ -+ udelay(1000); -+ -+ /* enable 16-bit UTMI interface */ -+ port_status = ehci_readl(ehci, &ehci->regs->port_status[0]); -+ port_status |= BIT(28); -+ ehci_writel(ehci, port_status, &ehci->regs->port_status[0]); -+ -+ ehci_dbg(ehci, "16-bit UTMI interface enabled, status: %08x\n", -+ ehci_readl(ehci, &ehci->regs->port_status[0])); -+ } -+ -+ if (ehci->reset_notifier) -+ ehci->reset_notifier(ehci_to_hcd(ehci)); -+ - ehci->rh_state = EHCI_RH_HALTED; - ehci->next_statechange = jiffies; - retval = ehci_handshake(ehci, &ehci->regs->command, ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -232,6 +232,10 @@ struct ehci_hcd { /* one per controlle - unsigned need_oc_pp_cycle:1; /* MPC834X port power */ - unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ - unsigned ignore_oc:1; -+ unsigned qca_force_host_mode:1; -+ unsigned qca_force_16bit_ptw:1; /* force 16 bit UTMI */ -+ -+ void (*reset_notifier)(struct usb_hcd *hcd); - - /* required for usb32 quirk */ - #define OHCI_CTRL_HCFS (3 << 6) ---- a/include/linux/usb/ehci_pdriver.h -+++ b/include/linux/usb/ehci_pdriver.h -@@ -50,6 +50,8 @@ struct usb_ehci_pdata { - unsigned reset_on_resume:1; - unsigned dma_mask_64:1; - unsigned ignore_oc:1; -+ unsigned qca_force_host_mode:1; -+ unsigned qca_force_16bit_ptw:1; - - /* Turn on all power and clocks */ - int (*power_on)(struct platform_device *pdev); -@@ -59,6 +61,7 @@ struct usb_ehci_pdata { - * turn off everything else */ - void (*power_suspend)(struct platform_device *pdev); - int (*pre_setup)(struct usb_hcd *hcd); -+ void (*reset_notifier)(struct platform_device *pdev); - }; - - #endif /* __USB_CORE_EHCI_PDRIVER_H */ ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -53,6 +53,14 @@ struct ehci_platform_priv { - - static const char hcd_name[] = "ehci-platform"; - -+static void ehci_platform_reset_notifier(struct usb_hcd *hcd) -+{ -+ struct platform_device *pdev = to_platform_device(hcd->self.controller); -+ struct usb_ehci_pdata *pdata = pdev->dev.platform_data; -+ -+ pdata->reset_notifier(pdev); -+} -+ - static int ehci_platform_reset(struct usb_hcd *hcd) - { - struct platform_device *pdev = to_platform_device(hcd->self.controller); -@@ -270,6 +278,13 @@ static int ehci_platform_probe(struct pl - priv->reset_on_resume = true; - if (pdata->ignore_oc) - ehci->ignore_oc = 1; -+ if (pdata->qca_force_host_mode) -+ ehci->qca_force_host_mode = 1; -+ if (pdata->qca_force_16bit_ptw) -+ ehci->qca_force_16bit_ptw = 1; -+ -+ if (pdata->reset_notifier) -+ ehci->reset_notifier = ehci_platform_reset_notifier; - - #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO - if (ehci->big_endian_mmio) { diff --git a/target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch b/target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch deleted file mode 100644 index 4e2a6fecee..0000000000 --- a/target/linux/ath79/patches-4.19/490-usb-ehci-add-quirks-for-qca-socs.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -239,6 +239,37 @@ int ehci_reset(struct ehci_hcd *ehci) - command |= CMD_RESET; - dbg_cmd (ehci, "reset", command); - ehci_writel(ehci, command, &ehci->regs->command); -+ -+ if (ehci->qca_force_host_mode) { -+ u32 usbmode; -+ -+ udelay(1000); -+ -+ usbmode = ehci_readl(ehci, &ehci->regs->usbmode); -+ usbmode |= USBMODE_CM_HC | (1 << 4); -+ ehci_writel(ehci, usbmode, &ehci->regs->usbmode); -+ -+ ehci_dbg(ehci, "forced host mode, usbmode: %08x\n", -+ ehci_readl(ehci, &ehci->regs->usbmode)); -+ } -+ -+ if (ehci->qca_force_16bit_ptw) { -+ u32 port_status; -+ -+ udelay(1000); -+ -+ /* enable 16-bit UTMI interface */ -+ port_status = ehci_readl(ehci, &ehci->regs->port_status[0]); -+ port_status |= BIT(28); -+ ehci_writel(ehci, port_status, &ehci->regs->port_status[0]); -+ -+ ehci_dbg(ehci, "16-bit UTMI interface enabled, status: %08x\n", -+ ehci_readl(ehci, &ehci->regs->port_status[0])); -+ } -+ -+ if (ehci->reset_notifier) -+ ehci->reset_notifier(ehci_to_hcd(ehci)); -+ - ehci->rh_state = EHCI_RH_HALTED; - ehci->next_statechange = jiffies; - retval = ehci_handshake(ehci, &ehci->regs->command, ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -219,6 +219,10 @@ struct ehci_hcd { /* one per controlle - unsigned need_oc_pp_cycle:1; /* MPC834X port power */ - unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ - unsigned ignore_oc:1; -+ unsigned qca_force_host_mode:1; -+ unsigned qca_force_16bit_ptw:1; /* force 16 bit UTMI */ -+ -+ void (*reset_notifier)(struct usb_hcd *hcd); - - /* required for usb32 quirk */ - #define OHCI_CTRL_HCFS (3 << 6) ---- a/include/linux/usb/ehci_pdriver.h -+++ b/include/linux/usb/ehci_pdriver.h -@@ -51,6 +51,8 @@ struct usb_ehci_pdata { - unsigned reset_on_resume:1; - unsigned dma_mask_64:1; - unsigned ignore_oc:1; -+ unsigned qca_force_host_mode:1; -+ unsigned qca_force_16bit_ptw:1; - - /* Turn on all power and clocks */ - int (*power_on)(struct platform_device *pdev); -@@ -60,6 +62,7 @@ struct usb_ehci_pdata { - * turn off everything else */ - void (*power_suspend)(struct platform_device *pdev); - int (*pre_setup)(struct usb_hcd *hcd); -+ void (*reset_notifier)(struct platform_device *pdev); - }; - - #endif /* __USB_CORE_EHCI_PDRIVER_H */ ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -48,6 +48,14 @@ struct ehci_platform_priv { - - static const char hcd_name[] = "ehci-platform"; - -+static void ehci_platform_reset_notifier(struct usb_hcd *hcd) -+{ -+ struct platform_device *pdev = to_platform_device(hcd->self.controller); -+ struct usb_ehci_pdata *pdata = pdev->dev.platform_data; -+ -+ pdata->reset_notifier(pdev); -+} -+ - static int ehci_platform_reset(struct usb_hcd *hcd) - { - struct platform_device *pdev = to_platform_device(hcd->self.controller); -@@ -215,6 +223,13 @@ static int ehci_platform_probe(struct pl - priv->reset_on_resume = true; - if (pdata->ignore_oc) - ehci->ignore_oc = 1; -+ if (pdata->qca_force_host_mode) -+ ehci->qca_force_host_mode = 1; -+ if (pdata->qca_force_16bit_ptw) -+ ehci->qca_force_16bit_ptw = 1; -+ -+ if (pdata->reset_notifier) -+ ehci->reset_notifier = ehci_platform_reset_notifier; - - #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO - if (ehci->big_endian_mmio) { From c2ef6c2148079eeed4076de9062e86c5e0ba9c3e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 27 Dec 2019 22:51:42 -0800 Subject: [PATCH 235/480] nettle: Disable ARMEB assembly It's broken for ARMv5, which is the only armeb target in OpenWrt. Signed-off-by: Rosen Penev --- package/libs/nettle/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libs/nettle/Makefile b/package/libs/nettle/Makefile index 62c39702ed..b9324e4793 100644 --- a/package/libs/nettle/Makefile +++ b/package/libs/nettle/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nettle PKG_VERSION:=3.5.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -55,6 +55,11 @@ CONFIGURE_ARGS += \ --enable-arm-neon endif +ifeq ($(ARCH),armeb) +CONFIGURE_ARGS += \ + --disable-assembler +endif + define Build/Compile $(call Build/Compile/Default, \ DESTDIR="$(PKG_INSTALL_DIR)" \ From 7bef62de79fefae588a970bedab5c18a159b5539 Mon Sep 17 00:00:00 2001 From: Christoph Krapp Date: Thu, 2 Jan 2020 10:30:37 +0100 Subject: [PATCH 236/480] ath79: use ath10k-ct-smallbuffers for TP-Link RE355/RE450 v1 Both devices are available in 64M and 128M RAM configurations but there is no visial indication which configuration one might get. So just to be sure we properly support both configurations switch to kmod-atk10k-ct-smallbuffers. Signed-off-by: Christoph Krapp --- target/linux/ath79/image/generic-tp-link.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 97c4bb9441..603cacdaf2 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -337,7 +337,7 @@ define Device/tplink_rex5x-v1 $(Device/tplink-safeloader) SOC := qca9558 IMAGE_SIZE := 6016k - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct TPLINK_HWID := 0x0 TPLINK_HWREV := 0 endef From 3d7f76383f87f490ba611aa18af89d33170997ff Mon Sep 17 00:00:00 2001 From: Matt Merhar Date: Wed, 1 Jan 2020 02:58:34 -0500 Subject: [PATCH 237/480] dropbear: add missing zlib dependency for dropbearconvert If CONFIG_DROPBEAR_ZLIB is set, building fails at the packaging stage due to an undeclared dependency on libz.so.1. As is already done for the main dropbear package, conditionally add a dependency on zlib. Signed-off-by: Matt Merhar --- package/network/services/dropbear/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 75a3264ebb..c55af45428 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -72,6 +72,7 @@ define Package/dropbearconvert SECTION:=utils CATEGORY:=Utilities TITLE:=Utility for converting SSH keys + DEPENDS:= +DROPBEAR_ZLIB:zlib endef CONFIGURE_ARGS += \ From 983605e61f16b76e173fa62092f1b37c3a8e3859 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Wed, 1 Jan 2020 15:23:32 +0800 Subject: [PATCH 238/480] pppd: update to 2.4.8 78cd384 Update README and patchlevel.h for 2.4.8 release 5d03403 pppd: Avoid use of strnlen (and strlen) in vslprintf a1e950a pppd: Fix IPv6 default route code for Solaris ca5e61b plugins/rp-pppoe: Make tag parsing loop condition more accurate c10c3c7 pppd: Make sure word read from options file is null-terminated b311e98 pppd: Limit memory accessed by string formats with max length specified 3ea9de9 pppd: Eliminate some more compiler warnings 57edb1a pppd: Include time.h header before using time_t 09f695f pppd: Don't free static string 03104ba pppd.h: Add missing headers 388597e pppd: Add defaultroute6 and related options 66ce4ba pppd: Avoid declarations within statements in main.c 5637180 pppd: Fix `ifname` option in case of multilink (#105) d00f8a0 pppd: Fix variable reference syntax in Makefile.linux b6b4d28 pppd: Check tdb pointer before closing Signed-off-by: DENG Qingfang --- package/network/services/ppp/Makefile | 11 ++++---- .../ppp/patches/100-debian_ip-ip_option.patch | 2 +- .../patches/101-debian_close_dev_ppp.patch | 2 +- .../patches/103-debian_fix_link_pidfile.patch | 2 +- .../ppp/patches/105-debian_demand.patch | 8 +++--- .../ppp/patches/110-debian_defaultroute.patch | 26 +++++++++---------- .../120-debian_ipv6_updown_option.patch | 8 +++--- .../121-debian_adaptive_lcp_echo.patch | 2 +- .../ppp/patches/133-fix_sha1_include.patch | 4 +-- .../services/ppp/patches/200-makefile.patch | 4 +-- .../patches/206-compensate_time_change.patch | 6 ++--- .../ppp/patches/208-fix_status_code.patch | 2 +- .../ppp/patches/310-precompile_filter.patch | 2 +- ...multilink_support_custom_iface_names.patch | 8 +++--- .../330-retain_foreign_default_routes.patch | 2 +- .../340-populate_default_gateway.patch | 4 +-- .../patches/400-simplify_kernel_checks.patch | 18 ++++++------- .../ppp/patches/401-no_record_file.patch | 2 +- .../services/ppp/patches/403-no_wtmp.patch | 4 +-- .../404-remove_obsolete_protocol_names.patch | 16 ++++++------ ...openssl-for-the-DES-instead-of-the-l.patch | 2 +- 21 files changed, 67 insertions(+), 68 deletions(-) diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 6b87f20145..451fdb04db 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -9,19 +9,18 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/paulusmack/ppp -PKG_SOURCE_DATE:=2019-10-04 -PKG_SOURCE_VERSION:=0d004db25edd42f6720f48eedc51f68a781278db -PKG_MIRROR_HASH:=93f66ee06d58c447288c88ac1c17453c2b12a8af7f16ef132b31529b1955b7a2 +PKG_SOURCE_VERSION:=78cd384ce0f48bb5edb84e4fe9a574eab4a4ad14 +PKG_MIRROR_HASH:=cf284c312b0c90974d11f8aeece173bcac8475f5b810911f4feb2c5a4db263fe PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-4-Clause PKG_CPE_ID:=cpe:/a:samba:ppp -PKG_RELEASE_VERSION:=2.4.7 -PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE) +PKG_RELEASE_VERSION:=2.4.8 +PKG_VERSION:=$(PKG_RELEASE_VERSION) PKG_BUILD_DEPENDS:=libpcap diff --git a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch index c9ff869bb1..335ce72b0a 100644 --- a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch +++ b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch @@ -85,7 +85,7 @@ Signed-off-by: Jo-Philipp Wich "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -332,6 +332,8 @@ extern int connect_delay; /* Time to del +@@ -334,6 +334,8 @@ extern int connect_delay; /* Time to del extern int max_data_rate; /* max bytes/sec through charshunt */ extern int req_unit; /* interface unit number to use */ extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ diff --git a/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch b/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch index 5b6ae2d39a..62830179b6 100644 --- a/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch +++ b/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch @@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -460,6 +460,13 @@ int generic_establish_ppp (int fd) +@@ -467,6 +467,13 @@ int generic_establish_ppp (int fd) if (new_style_driver) { int flags; diff --git a/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch b/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch index 854fe10168..5a764ab9b2 100644 --- a/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch +++ b/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch @@ -11,7 +11,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c -@@ -776,8 +776,7 @@ detach() +@@ -780,8 +780,7 @@ detach() /* update pid files if they have been written already */ if (pidfilename[0]) create_pidfile(pid); diff --git a/package/network/services/ppp/patches/105-debian_demand.patch b/package/network/services/ppp/patches/105-debian_demand.patch index a38e1734be..c68bafa8df 100644 --- a/package/network/services/ppp/patches/105-debian_demand.patch +++ b/package/network/services/ppp/patches/105-debian_demand.patch @@ -150,9 +150,9 @@ } else { --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c -@@ -1231,7 +1231,7 @@ ipv6cp_up(f) - } - +@@ -1252,7 +1252,7 @@ ipv6cp_up(f) + if (sif6defaultroute(f->unit, go->ourid, ho->hisid)) + default_route_set[f->unit] = 1; } - demand_rexmit(PPP_IPV6); + demand_rexmit(PPP_IPV6,0); @@ -161,7 +161,7 @@ } else { --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -599,7 +599,7 @@ void demand_conf __P((void)); /* config +@@ -601,7 +601,7 @@ void demand_conf __P((void)); /* config void demand_block __P((void)); /* set all NPs to queue up packets */ void demand_unblock __P((void)); /* set all NPs to pass packets */ void demand_discard __P((void)); /* set all NPs to discard packets */ diff --git a/package/network/services/ppp/patches/110-debian_defaultroute.patch b/package/network/services/ppp/patches/110-debian_defaultroute.patch index f90005b7e3..38739a5243 100644 --- a/package/network/services/ppp/patches/110-debian_defaultroute.patch +++ b/package/network/services/ppp/patches/110-debian_defaultroute.patch @@ -125,9 +125,9 @@ Signed-off-by: Jo-Philipp Wich bool old_vj; /* use old (short) form of VJ option? */ --- a/pppd/pppd.8 +++ b/pppd/pppd.8 -@@ -127,6 +127,11 @@ is no other default route with the same - value of -1, the route is only added if there is no default route at - all. +@@ -133,6 +133,11 @@ the gateway, when IPv6CP negotiation is + This entry is removed when the PPP connection is broken. This option + is privileged if the \fInodefaultroute6\fR option has been specified. .TP +.B replacedefaultroute +This option is a flag to the defaultroute option. If defaultroute is @@ -137,7 +137,7 @@ Signed-off-by: Jo-Philipp Wich .B disconnect \fIscript Execute the command specified by \fIscript\fR, by passing it to a shell, after -@@ -740,7 +745,12 @@ disable both forms of hardware flow cont +@@ -746,7 +751,12 @@ disable both forms of hardware flow cont .TP .B nodefaultroute Disable the \fIdefaultroute\fR option. The system administrator who @@ -150,10 +150,10 @@ Signed-off-by: Jo-Philipp Wich +wishes to prevent users from replacing a default route with pppd can do so by placing this option in the /etc/ppp/options file. .TP - .B nodeflate + .B nodefaultroute6 --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -681,7 +681,7 @@ int sif6addr __P((int, eui64_t, eui64_t +@@ -683,7 +683,7 @@ int sif6addr __P((int, eui64_t, eui64_t int cif6addr __P((int, eui64_t, eui64_t)); /* Remove an IPv6 address from i/f */ #endif @@ -164,16 +164,16 @@ Signed-off-by: Jo-Philipp Wich /* Delete default route through i/f */ --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -207,6 +207,8 @@ static unsigned char inbuf[512]; /* buff - static int if_is_up; /* Interface has been marked up */ +@@ -209,6 +209,8 @@ static int if_is_up; /* Interface has be static int if6_is_up; /* Interface has been marked up for IPv6, to help differentiate */ static int have_default_route; /* Gateway for default route added */ + static int have_default_route6; /* Gateway for default IPv6 route added */ +static struct rtentry old_def_rt; /* Old default route */ +static int default_rt_repl_rest; /* replace and restore old default rt */ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static char proxy_arp_dev[16]; /* Device for proxy arp entry */ static u_int32_t our_old_addr; /* for detecting address changes */ -@@ -1570,6 +1572,9 @@ static int read_route_table(struct rtent +@@ -1577,6 +1579,9 @@ static int read_route_table(struct rtent p = NULL; } @@ -183,7 +183,7 @@ Signed-off-by: Jo-Philipp Wich SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); -@@ -1642,20 +1647,52 @@ int have_route_to(u_int32_t addr) +@@ -1649,20 +1654,52 @@ int have_route_to(u_int32_t addr) /******************************************************************** * * sifdefaultroute - assign a default route through the address given. @@ -249,7 +249,7 @@ Signed-off-by: Jo-Philipp Wich } memset (&rt, 0, sizeof (rt)); -@@ -1671,10 +1708,16 @@ int sifdefaultroute (int unit, u_int32_t +@@ -1678,10 +1715,16 @@ int sifdefaultroute (int unit, u_int32_t rt.rt_flags = RTF_UP; if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { @@ -267,7 +267,7 @@ Signed-off-by: Jo-Philipp Wich have_default_route = 1; return 1; -@@ -1708,11 +1751,21 @@ int cifdefaultroute (int unit, u_int32_t +@@ -1715,11 +1758,21 @@ int cifdefaultroute (int unit, u_int32_t rt.rt_flags = RTF_UP; if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { if (still_ppp()) { @@ -292,7 +292,7 @@ Signed-off-by: Jo-Philipp Wich } --- a/pppd/sys-solaris.c +++ b/pppd/sys-solaris.c -@@ -2038,12 +2038,18 @@ cifaddr(u, o, h) +@@ -2119,12 +2119,18 @@ cifaddr(u, o, h) * sifdefaultroute - assign a default route through the address given. */ int diff --git a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch index 1971ac049f..4a9ca7d5e7 100644 --- a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch +++ b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch @@ -48,7 +48,7 @@ Signed-off-by: Jo-Philipp Wich "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c -@@ -1268,7 +1268,7 @@ ipv6cp_up(f) +@@ -1294,7 +1294,7 @@ ipv6cp_up(f) */ if (ipv6cp_script_state == s_down && ipv6cp_script_pid == 0) { ipv6cp_script_state = s_up; @@ -57,7 +57,7 @@ Signed-off-by: Jo-Philipp Wich } } -@@ -1320,7 +1320,7 @@ ipv6cp_down(f) +@@ -1346,7 +1346,7 @@ ipv6cp_down(f) /* Execute the ipv6-down script */ if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) { ipv6cp_script_state = s_down; @@ -66,7 +66,7 @@ Signed-off-by: Jo-Philipp Wich } } -@@ -1363,13 +1363,13 @@ ipv6cp_script_done(arg) +@@ -1389,13 +1389,13 @@ ipv6cp_script_done(arg) case s_up: if (ipv6cp_fsm[0].state != OPENED) { ipv6cp_script_state = s_down; @@ -84,7 +84,7 @@ Signed-off-by: Jo-Philipp Wich } --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -334,6 +334,8 @@ extern int req_unit; /* interface unit n +@@ -336,6 +336,8 @@ extern int req_unit; /* interface unit n extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ diff --git a/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch b/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch index 5d47952bc7..510c96ba97 100644 --- a/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch +++ b/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch @@ -42,7 +42,7 @@ */ --- a/pppd/pppd.8 +++ b/pppd/pppd.8 -@@ -569,6 +569,11 @@ to 1) if the \fIproxyarp\fR option is us +@@ -575,6 +575,11 @@ to 1) if the \fIproxyarp\fR option is us dynamic IP address option (i.e. set /proc/sys/net/ipv4/ip_dynaddr to 1) in demand mode if the local address changes. .TP diff --git a/package/network/services/ppp/patches/133-fix_sha1_include.patch b/package/network/services/ppp/patches/133-fix_sha1_include.patch index b5ccd0852d..357d951441 100644 --- a/package/network/services/ppp/patches/133-fix_sha1_include.patch +++ b/package/network/services/ppp/patches/133-fix_sha1_include.patch @@ -1,8 +1,8 @@ --- a/pppd/sha1.c +++ b/pppd/sha1.c -@@ -18,7 +18,7 @@ - +@@ -19,7 +19,7 @@ #include + #include #include /* htonl() */ -#include +#include "pppd.h" diff --git a/package/network/services/ppp/patches/200-makefile.patch b/package/network/services/ppp/patches/200-makefile.patch index c4be9f20c4..82b1cc67b9 100644 --- a/package/network/services/ppp/patches/200-makefile.patch +++ b/package/network/services/ppp/patches/200-makefile.patch @@ -38,8 +38,8 @@ Signed-off-by: Jo-Philipp Wich #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard $(shell $CC --print-sysroot)/usr/include/crypt.h),) -+#ifneq ($(wildcard $(shell $CC --print-sysroot)/usr/include/crypt.h),) +-ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) ++#ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) CFLAGS += -DHAVE_CRYPT_H=1 LIBS += -lcrypt -endif diff --git a/package/network/services/ppp/patches/206-compensate_time_change.patch b/package/network/services/ppp/patches/206-compensate_time_change.patch index 1f6b6ba44c..a1eb6a716c 100644 --- a/package/network/services/ppp/patches/206-compensate_time_change.patch +++ b/package/network/services/ppp/patches/206-compensate_time_change.patch @@ -37,7 +37,7 @@ Signed-off-by: Jo-Philipp Wich gettimeofday(&start_time, NULL); script_unsetenv("CONNECT_TIME"); script_unsetenv("BYTES_SENT"); -@@ -1270,6 +1273,36 @@ struct callout { +@@ -1274,6 +1277,36 @@ struct callout { static struct callout *callout = NULL; /* Callout list */ static struct timeval timenow; /* Current time */ @@ -74,7 +74,7 @@ Signed-off-by: Jo-Philipp Wich /* * timeout - Schedule a timeout. -@@ -1340,6 +1373,8 @@ calltimeout() +@@ -1344,6 +1377,8 @@ calltimeout() { struct callout *p; @@ -83,7 +83,7 @@ Signed-off-by: Jo-Philipp Wich while (callout != NULL) { p = callout; -@@ -1367,6 +1402,8 @@ timeleft(tvp) +@@ -1371,6 +1406,8 @@ timeleft(tvp) { if (callout == NULL) return NULL; diff --git a/package/network/services/ppp/patches/208-fix_status_code.patch b/package/network/services/ppp/patches/208-fix_status_code.patch index c0def8b4b3..31460148a4 100644 --- a/package/network/services/ppp/patches/208-fix_status_code.patch +++ b/package/network/services/ppp/patches/208-fix_status_code.patch @@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c -@@ -1051,7 +1051,8 @@ get_input() +@@ -1055,7 +1055,8 @@ get_input() } notice("Modem hangup"); hungup = 1; diff --git a/package/network/services/ppp/patches/310-precompile_filter.patch b/package/network/services/ppp/patches/310-precompile_filter.patch index 2a9370c3e1..a65c19cf1c 100644 --- a/package/network/services/ppp/patches/310-precompile_filter.patch +++ b/package/network/services/ppp/patches/310-precompile_filter.patch @@ -77,7 +77,7 @@ Signed-off-by: Jo-Philipp Wich #ifdef MAXOCTETS { "maxoctets", o_int, &maxoctets, "Set connection traffic limit", -@@ -1510,6 +1526,29 @@ callfile(argv) +@@ -1511,6 +1527,29 @@ callfile(argv) return ok; } diff --git a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch index b028df4844..75c803650f 100644 --- a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch +++ b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch @@ -41,7 +41,7 @@ Signed-off-by: George Kashperko /* make sure the string is null-terminated */ rec.dptr[rec.dsize-1] = 0; - /* parse the interface number */ -- parse_num(rec.dptr, "IFNAME=ppp", &unit); +- parse_num(rec.dptr, "UNIT=", &unit); + /* check the pid value */ if (!parse_num(rec.dptr, "PPPD_PID=", &pppd_pid) @@ -114,7 +114,7 @@ Signed-off-by: George Kashperko TDB_DATA kd, vd; int ret = 0; -- slprintf(ifkey, sizeof(ifkey), "IFNAME=ppp%d", unit); +- slprintf(ifkey, sizeof(ifkey), "UNIT=%d", unit); + slprintf(ifkey, sizeof(ifkey), "IFNAME=%s", ifname); + kd.dptr = ifkey; @@ -126,7 +126,7 @@ Signed-off-by: George Kashperko && memcmp(vd.dptr, key.dptr, vd.dsize) == 0; --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -693,6 +693,16 @@ void cfg_bundle(int mrru, int mtru, int +@@ -700,6 +700,16 @@ void cfg_bundle(int mrru, int mtru, int add_fd(ppp_dev_fd); } @@ -143,7 +143,7 @@ Signed-off-by: George Kashperko /* * make_new_bundle - create a new PPP unit (i.e. a bundle) * and connect our channel to it. This should only get called -@@ -711,6 +721,8 @@ void make_new_bundle(int mrru, int mtru, +@@ -718,6 +728,8 @@ void make_new_bundle(int mrru, int mtru, /* set the mrru and flags */ cfg_bundle(mrru, mtru, rssn, tssn); diff --git a/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch b/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch index c50d5480f4..6c0849cc6c 100644 --- a/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch +++ b/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch @@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -1760,6 +1760,7 @@ int cifdefaultroute (int unit, u_int32_t +@@ -1767,6 +1767,7 @@ int cifdefaultroute (int unit, u_int32_t SIN_ADDR(rt.rt_genmask) = 0L; } diff --git a/package/network/services/ppp/patches/340-populate_default_gateway.patch b/package/network/services/ppp/patches/340-populate_default_gateway.patch index c9a6e8796d..ae385dfc9b 100644 --- a/package/network/services/ppp/patches/340-populate_default_gateway.patch +++ b/package/network/services/ppp/patches/340-populate_default_gateway.patch @@ -13,7 +13,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -1710,6 +1710,9 @@ int sifdefaultroute (int unit, u_int32_t +@@ -1717,6 +1717,9 @@ int sifdefaultroute (int unit, u_int32_t memset (&rt, 0, sizeof (rt)); SET_SA_FAMILY (rt.rt_dst, AF_INET); @@ -23,7 +23,7 @@ Signed-off-by: Jo-Philipp Wich rt.rt_dev = ifname; rt.rt_metric = dfl_route_metric + 1; /* +1 for binary compatibility */ -@@ -1718,7 +1721,7 @@ int sifdefaultroute (int unit, u_int32_t +@@ -1725,7 +1728,7 @@ int sifdefaultroute (int unit, u_int32_t SIN_ADDR(rt.rt_genmask) = 0L; } diff --git a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch index 46246cf9e8..0754f8f4d6 100644 --- a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch +++ b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch @@ -10,7 +10,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -199,7 +199,7 @@ static int driver_is_old = 0; +@@ -200,7 +200,7 @@ static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ @@ -19,7 +19,7 @@ Signed-off-by: Jo-Philipp Wich static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ -@@ -217,8 +217,8 @@ static int looped; /* 1 if using loop +@@ -219,8 +219,8 @@ static int looped; /* 1 if using loop static int link_mtu; /* mtu for the link (not bundle) */ static struct utsname utsname; /* for the kernel version */ @@ -29,7 +29,7 @@ Signed-off-by: Jo-Philipp Wich #define MAX_IFS 100 -@@ -1446,11 +1446,12 @@ int ccp_fatal_error (int unit) +@@ -1453,11 +1453,12 @@ int ccp_fatal_error (int unit) * * path_to_procfs - find the path to the proc file system mount point */ @@ -44,7 +44,7 @@ Signed-off-by: Jo-Philipp Wich struct mntent *mntent; FILE *fp; -@@ -1472,6 +1473,7 @@ static char *path_to_procfs(const char * +@@ -1479,6 +1480,7 @@ static char *path_to_procfs(const char * fclose (fp); } } @@ -52,7 +52,7 @@ Signed-off-by: Jo-Philipp Wich strlcpy(proc_path + proc_path_len, tail, sizeof(proc_path) - proc_path_len); -@@ -2133,15 +2135,19 @@ int ppp_available(void) +@@ -2332,15 +2334,19 @@ int ppp_available(void) int my_version, my_modification, my_patch; int osmaj, osmin, ospatch; @@ -72,7 +72,7 @@ Signed-off-by: Jo-Philipp Wich /* XXX should get from driver */ driver_version = 2; -@@ -2201,6 +2207,7 @@ int ppp_available(void) +@@ -2400,6 +2406,7 @@ int ppp_available(void) if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) ok = 0; @@ -80,7 +80,7 @@ Signed-off-by: Jo-Philipp Wich /* * This is the PPP device. Validate the version of the driver at this -@@ -2737,6 +2744,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2936,6 +2943,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } #endif /* TIOCGPTN */ @@ -88,7 +88,7 @@ Signed-off-by: Jo-Philipp Wich if (sfd < 0) { /* the old way - scan through the pty name space */ for (i = 0; i < 64; ++i) { -@@ -2755,6 +2763,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2954,6 +2962,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } } } @@ -125,7 +125,7 @@ Signed-off-by: Jo-Philipp Wich char *pppd_pppoe_service = NULL; static char *acName = NULL; static char *existingSession = NULL; -@@ -392,10 +389,6 @@ PPPoEDevnameHook(char *cmd, char **argv, +@@ -394,10 +391,6 @@ PPPoEDevnameHook(char *cmd, char **argv, void plugin_init(void) { diff --git a/package/network/services/ppp/patches/401-no_record_file.patch b/package/network/services/ppp/patches/401-no_record_file.patch index cf64b990aa..56a9f02eb8 100644 --- a/package/network/services/ppp/patches/401-no_record_file.patch +++ b/package/network/services/ppp/patches/401-no_record_file.patch @@ -7,7 +7,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -323,7 +323,6 @@ extern int holdoff; /* Dead time before +@@ -325,7 +325,6 @@ extern int holdoff; /* Dead time before extern bool holdoff_specified; /* true if user gave a holdoff value */ extern bool notty; /* Stdin/out is not a tty */ extern char *pty_socket; /* Socket to connect to pty */ diff --git a/package/network/services/ppp/patches/403-no_wtmp.patch b/package/network/services/ppp/patches/403-no_wtmp.patch index 811c5faef8..537a1b0c7f 100644 --- a/package/network/services/ppp/patches/403-no_wtmp.patch +++ b/package/network/services/ppp/patches/403-no_wtmp.patch @@ -7,7 +7,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -2271,6 +2271,7 @@ int ppp_available(void) +@@ -2470,6 +2470,7 @@ int ppp_available(void) void logwtmp (const char *line, const char *name, const char *host) { @@ -15,7 +15,7 @@ Signed-off-by: Jo-Philipp Wich struct utmp ut, *utp; pid_t mypid = getpid(); #if __GLIBC__ < 2 -@@ -2336,6 +2337,7 @@ void logwtmp (const char *line, const ch +@@ -2535,6 +2536,7 @@ void logwtmp (const char *line, const ch close (wtmp); } #endif diff --git a/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch b/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch index 3b35fe0030..1d94873f35 100644 --- a/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch +++ b/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch @@ -7,7 +7,7 @@ Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c -@@ -882,14 +882,17 @@ struct protocol_list { +@@ -886,14 +886,17 @@ struct protocol_list { const char *name; } protocol_list[] = { { 0x21, "IP" }, @@ -25,7 +25,7 @@ Signed-off-by: Jo-Philipp Wich { 0x33, "Stream Protocol ST-II" }, { 0x35, "Banyan Vines" }, { 0x39, "AppleTalk EDDP" }, -@@ -903,8 +906,11 @@ struct protocol_list { +@@ -907,8 +910,11 @@ struct protocol_list { { 0x49, "Serial Data Transport Protocol (PPP-SDTP)" }, { 0x4b, "SNA over 802.2" }, { 0x4d, "SNA" }, @@ -37,7 +37,7 @@ Signed-off-by: Jo-Philipp Wich { 0x53, "Encryption" }, { 0x55, "Individual Link Encryption" }, { 0x57, "IPv6" }, -@@ -915,12 +921,15 @@ struct protocol_list { +@@ -919,12 +925,15 @@ struct protocol_list { { 0x65, "RTP IPHC Compressed non-TCP" }, { 0x67, "RTP IPHC Compressed UDP 8" }, { 0x69, "RTP IPHC Compressed RTP 8" }, @@ -53,7 +53,7 @@ Signed-off-by: Jo-Philipp Wich { 0x0203, "IBM Source Routing BPDU" }, { 0x0205, "DEC LANBridge100 Spanning Tree" }, { 0x0207, "Cisco Discovery Protocol" }, -@@ -932,15 +941,19 @@ struct protocol_list { +@@ -936,15 +945,19 @@ struct protocol_list { { 0x0231, "Luxcom" }, { 0x0233, "Sigma Network Systems" }, { 0x0235, "Apple Client Server Protocol" }, @@ -73,7 +73,7 @@ Signed-off-by: Jo-Philipp Wich { 0x4001, "Cray Communications Control Protocol" }, { 0x4003, "CDPD Mobile Network Registration Protocol" }, { 0x4005, "Expand accelerator protocol" }, -@@ -951,8 +964,10 @@ struct protocol_list { +@@ -955,8 +968,10 @@ struct protocol_list { { 0x4023, "RefTek Protocol" }, { 0x4025, "Fibre Channel" }, { 0x4027, "EMIT Protocols" }, @@ -84,7 +84,7 @@ Signed-off-by: Jo-Philipp Wich { 0x8023, "OSI Network Layer Control Protocol" }, { 0x8025, "Xerox NS IDP Control Protocol" }, { 0x8027, "DECnet Phase IV Control Protocol" }, -@@ -961,7 +976,9 @@ struct protocol_list { +@@ -965,7 +980,9 @@ struct protocol_list { { 0x8031, "Bridging NCP" }, { 0x8033, "Stream Protocol Control Protocol" }, { 0x8035, "Banyan Vines Control Protocol" }, @@ -94,7 +94,7 @@ Signed-off-by: Jo-Philipp Wich { 0x803f, "NETBIOS Framing Control Protocol" }, { 0x8041, "Cisco Systems Control Protocol" }, { 0x8043, "Ascom Timeplex" }, -@@ -970,18 +987,24 @@ struct protocol_list { +@@ -974,18 +991,24 @@ struct protocol_list { { 0x8049, "Serial Data Control Protocol (PPP-SDCP)" }, { 0x804b, "SNA over 802.2 Control Protocol" }, { 0x804d, "SNA Control Protocol" }, @@ -119,7 +119,7 @@ Signed-off-by: Jo-Philipp Wich { 0x8207, "Cisco Discovery Protocol Control" }, { 0x8209, "Netcs Twin Routing" }, { 0x820b, "STP - Control Protocol" }, -@@ -990,24 +1013,29 @@ struct protocol_list { +@@ -994,24 +1017,29 @@ struct protocol_list { { 0x8281, "MPLSCP" }, { 0x8285, "IEEE p1284.4 standard - Protocol Control" }, { 0x8287, "ETSI TETRA TNP1 Control Protocol" }, diff --git a/package/network/services/ppp/patches/600-Revert-pppd-Use-openssl-for-the-DES-instead-of-the-l.patch b/package/network/services/ppp/patches/600-Revert-pppd-Use-openssl-for-the-DES-instead-of-the-l.patch index 0a0bae92fb..9676824f5f 100644 --- a/package/network/services/ppp/patches/600-Revert-pppd-Use-openssl-for-the-DES-instead-of-the-l.patch +++ b/package/network/services/ppp/patches/600-Revert-pppd-Use-openssl-for-the-DES-instead-of-the-l.patch @@ -32,7 +32,7 @@ This reverts commit 3c7b86229f7bd2600d74db14b1fe5b3896be3875. ifdef NEEDDES ifndef USE_CRYPT --CFLAGS += -I$(shell $CC --print-sysroot)/usr/include/openssl +-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl -LIBS += -lcrypto +LIBS += -ldes $(LIBS) else From 6fba88de1913301f11163aa05298e4fb488b3640 Mon Sep 17 00:00:00 2001 From: Mason Clarke Date: Sun, 29 Dec 2019 19:03:00 +0100 Subject: [PATCH 239/480] ramips: reduce lzma dictionary size for D-Link DIR-645 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently this device fails to boot with the OpenWrt snapshot images (release images are unaffected). The error message is: "LZMA ERROR 1 - must RESET board to recover". This happens because the kernel image is too big for the bootloader to boot. This commit works around this by decreasing the lzma dictionary size option from the default 23 to 10. Before this change the current OpenWrt snapshot image (uncompressed kernel size 4875139 bytes) failed to boot, while now an even bigger image (kernel 4.19 with snapshot default config; uncompressed kernel size 5162833 bytes) boots just fine. The highest lzma dictionary size option this image booted with was 11. 10 was chosen to have a bit more room for growth. An unavoidable side-effect of this change is that the compressed kernel image will take up more space. Total image size with different dictionary size options: D23 - 3973903 bytes (base) D16 - 4113167 bytes (+3.5% - +139264 bytes) D12 - 4317967 bytes (+8.7% - +344064‬ bytes) D11 - 4383503 bytes (+10.3% - +409600 bytes) D10 - 4461327 bytes (+12.3% - +487424 bytes) Fixes: FS#1484 Signed-off-by: Mason Clarke --- target/linux/ramips/image/rt3883.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index d80909fd5a..ca6a713c4d 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -36,7 +36,7 @@ define Device/dlink_dir-645 SOC := rt3662 BLOCKSIZE := 4k IMAGE_SIZE := 7872k - KERNEL := $(KERNEL_DTB) + KERNEL := kernel-bin | append-dtb | lzma -d10 SEAMA_SIGNATURE := wrgn39_dlob.hans_dir645 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-645 From 52f0b0913d508fdbc56e5f959ece4f48779657d5 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 28 Dec 2019 21:05:16 +0100 Subject: [PATCH 240/480] ead: fix resource leak in tinysrp Add call to fclose for file pointer fp in function t_openpw. The resource leak could happen during an error handling. Signed-off-by: Andrea Dalla Costa --- package/network/services/ead/src/tinysrp/t_pw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/network/services/ead/src/tinysrp/t_pw.c b/package/network/services/ead/src/tinysrp/t_pw.c index 18e929bb79..5da5e26b78 100644 --- a/package/network/services/ead/src/tinysrp/t_pw.c +++ b/package/network/services/ead/src/tinysrp/t_pw.c @@ -94,8 +94,10 @@ t_openpw(fp) else close_flag = 0; - if((tpw = malloc(sizeof(struct t_pw))) == NULL) + if((tpw = malloc(sizeof(struct t_pw))) == NULL) { + fclose(fp); return NULL; + } tpw->instream = fp; tpw->close_on_exit = close_flag; tpw->state = FILE_ONLY; From 4be271a4867dcf57a122eeb7b42407e7a506915e Mon Sep 17 00:00:00 2001 From: Jack Chen Date: Mon, 6 Jan 2020 00:43:57 +0800 Subject: [PATCH 241/480] ramips: remove duplicate dts nodes of MediaTek LinkIt Smart 7688 There are two identical wmac nodes in the dts file of MediaTek LinkIt Smart 7688, so delete one of them. Signed-off-by: Jack Chen --- .../linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index e9cb5d1900..229843fe1c 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -82,10 +82,6 @@ }; }; -&wmac { - status = "okay"; -}; - &spi0 { status = "okay"; From 271d0c825ba5821160e4a516497796fa342c2eff Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 19:40:37 +0100 Subject: [PATCH 242/480] make_ext4fs: Update to version 2020-01-05 5c201be Add LDFLAGS when building libsparse.a ec17045 make_ext4fs: fix build on musl systems Signed-off-by: Hauke Mehrtens --- tools/make-ext4fs/Makefile | 6 +++--- tools/make-ext4fs/patches/100-add-ldflags.patch | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile index 03db1917fc..77031cdce3 100644 --- a/tools/make-ext4fs/Makefile +++ b/tools/make-ext4fs/Makefile @@ -11,9 +11,9 @@ PKG_NAME:=make-ext4fs PKG_SOURCE_URL=$(PROJECT_GIT)/project/make_ext4fs.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2017-05-29 -PKG_SOURCE_VERSION:=eebda1d55d9701ace2700d7ae461697fadf52d1f -PKG_MIRROR_HASH:=c52e14101d7de89292a0c8b30506839aca3164603a20f8e491e42103083b9d8c +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=5c201be7d72aff735da27e17c29852e0cefe3e52 +PKG_MIRROR_HASH:=a9b74b7b95acc84a5a5c33d6acf493faad8f161caca3180734d9bd383c9d823f include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/make-ext4fs/patches/100-add-ldflags.patch b/tools/make-ext4fs/patches/100-add-ldflags.patch deleted file mode 100644 index d9ce47bb80..0000000000 --- a/tools/make-ext4fs/patches/100-add-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ OBJ := \ - $(CC) $(CFLAGS) -c -o $@ $^ - - make_ext4fs: $(OBJ) libsparse/libsparse.a -- $(CC) -o $@ $^ $(ZLIB) -+ $(CC) $(LDFLAGS)-o $@ $^ $(ZLIB) - - libsparse/libsparse.a: - $(MAKE) -C libsparse/ libsparse.a From 58772804633d4ebd43fb4bb4bc93d43ed2b132fa Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 19:48:28 +0100 Subject: [PATCH 243/480] ubus: Update to version 2020-01-05 d35df8a ubus: make libubus ready for linking into C++ Signed-off-by: Hauke Mehrtens --- package/system/ubus/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index d3fe452252..aadef43af1 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git -PKG_SOURCE_DATE:=2019-12-27 -PKG_SOURCE_VERSION:=041c9d1c052bb4936fd03240f7d0dd64aedda972 -PKG_MIRROR_HASH:=7febbe78dd178d8d7ccacff54c00fb2d19a53624005920db8cd85236f54f8324 +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=d35df8adda873dc75d876f72b78e84db8cfa72ee +PKG_MIRROR_HASH:=bbe69a7b7df98310f6a6dba344b6190f4ba3ebcc6333b9c4b884feda0a7470e6 CMAKE_INSTALL:=1 PKG_LICENSE:=LGPL-2.1 From ccd7e2dfb2bca3e8d7ad07cd4fa75fc47b4aea13 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 19:51:19 +0100 Subject: [PATCH 244/480] ustream-ssl: Update to version 2020-01-05 30cebb4 ustream-ssl: mbedtls: fix ssl client verification 77de09f ustream-ssl: mbedtls: fix net_sockets.h include warning Signed-off-by: Hauke Mehrtens --- package/libs/ustream-ssl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 64256ca258..f117f063fe 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git -PKG_SOURCE_DATE:=2019-11-05 -PKG_SOURCE_VERSION:=c9b6668215a27f2346d5eedd6f29cc720985b448 -PKG_MIRROR_HASH:=28b53b7e27b68d62c8fbbc57660d915bdcb6a464157c1930f16ed67e151398e9 +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=30cebb4fc78e49e0432a404f7c9dd8c9a93b3cc3 +PKG_MIRROR_HASH:=b37b730b8fcd5186d7b194a6e90b79efad845ec89e2b9d2d49b4d347c7c4cbcb CMAKE_INSTALL:=1 PKG_LICENSE:=ISC From 05145ffbefc71a94c1692dfb8ac440bc67974ded Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 19:54:27 +0100 Subject: [PATCH 245/480] uclient: Update to version 2020-01-05 fef6d3d uclient: Add string error function Signed-off-by: Hauke Mehrtens --- package/libs/uclient/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/uclient/Makefile b/package/libs/uclient/Makefile index 38a8bad173..5865ba0140 100644 --- a/package/libs/uclient/Makefile +++ b/package/libs/uclient/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uclient.git -PKG_MIRROR_HASH:=b1127b28f98c9b45e046a76086b281b35c094fad1dc511ce0af095b733c86359 -PKG_SOURCE_DATE:=2019-05-30 -PKG_SOURCE_VERSION:=3b3e368dead01979e985cb167873fe9868b15d19 +PKG_MIRROR_HASH:=8c95a3c84b4b44308de264a90460fb01b1e7ed27b22d3c76ef16aedb9774ac7c +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=fef6d3d311ac45c662c01e0ebd9cb0f6c8d7145c CMAKE_INSTALL:=1 PKG_BUILD_DEPENDS:=ustream-ssl From 8fb6be73b552618567dcfcb1eee3ffbb7deadb7e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 20:19:37 +0100 Subject: [PATCH 246/480] iwinfo: Update to version 2020-01-05 bf2c106 nl80211: add htmode to iwinfo_ops Signed-off-by: Hauke Mehrtens --- package/network/utils/iwinfo/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 735c11bf41..c7548dee98 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git -PKG_SOURCE_DATE:=2019-12-27 -PKG_SOURCE_VERSION:=a6f6c053481fb5bb29fc8357fb107400100a0658 -PKG_MIRROR_HASH:=221f569d415c5f6c332aacecedeb69a02b21cfe8ee3dc25dec4b80cc59404f55 +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=bf2c1069a7f14d1af1e02c8edd2b7338f0355ac8 +PKG_MIRROR_HASH:=b5f370e087005783e816866eb031952c4b37f8b6c649c1ac1dacfb0b95fd61a7 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 @@ -33,7 +33,7 @@ define Package/libiwinfo CATEGORY:=Libraries TITLE:=Generalized Wireless Information Library (iwinfo) DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny +libuci +libubus - ABI_VERSION:=20181126 + ABI_VERSION:=20200105 endef define Package/libiwinfo/description From 2d80f7e836b5a04b214cc7f00c73517b959712ca Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 5 Jan 2020 20:21:48 +0100 Subject: [PATCH 247/480] rpcd: Update to version 2020-01-05 efe51f4 iwinfo: add current hw and ht mode to info call Signed-off-by: Hauke Mehrtens --- package/system/rpcd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 653c859ba1..fb0d040b0b 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -12,10 +12,10 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git -PKG_SOURCE_DATE:=2019-12-10 -PKG_SOURCE_VERSION:=aaa08366e6384d9933a405d1218b03c1b167f9e5 +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=efe51f41d6288fa8503cc4f2efb37a777767d505 PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=9b126ab4af26e5bd16e21175ccc24318e0a98afaf60f14199cebd4ec50ed2d8f +PKG_MIRROR_HASH:=cf4bd4670ce8d49f5fb97f0e74a817324c1a503c90527282e30365d8b9a2e17a PKG_LICENSE:=ISC PKG_LICENSE_FILES:= From 8fc25d8664841ff1cd0f3082b4c404cab76d6341 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 23:19:45 +0100 Subject: [PATCH 248/480] ramips: add label MAC address for Netgear EX6130 The MAC address on the label of this device corresponds to the 2.4 GHz and ethernet MAC address. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_netgear_ex6130.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts b/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts index 68dd3f65d3..f0e0861f31 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts @@ -13,6 +13,7 @@ led-failsafe = &led_power_green; led-running = &led_power_green; led-upgrade = &led_power_green; + label-mac-device = ðernet; }; leds { From 99dd2709b855baa9e68c7c7106743a7c4a91ee0c Mon Sep 17 00:00:00 2001 From: Yong-hyu Ban Date: Mon, 7 Oct 2019 05:06:31 +0900 Subject: [PATCH 249/480] ramips: add support for ipTIME A8004T ipTIME A8004T is a 2.4/5GHz band AC2600 router, based on Mediatek MT7621A. Specifications: - SoC: MT7621A - RAM: DDR3 256M - Flash: SPI NOR 16MB - WiFi: - 2.4GHz: MT7615E - 5GHz: MT7615E - Ethernet: 5x 10/100/1000Mbps - Switch: SoC internal - USB: 1 * USB3.0 port - UART: - J4: 3.3V, TX, RX, GND (3.3V is the square pad) / 57600 8N1 - Other info: - J9: Unknown unpopulated header. Installation via web interface: 1. Flash **initramfs** image through the stock web interface. 2. Boot into OpenWrt and perform sysupgrade with sysupgrade image. Revert to stock firmware: 1. Perform sysupgrade with stock image. Signed-off-by: Yong-hyu Ban [do not enable xhci node in DTS which is already enabled in DTSI] Signed-off-by: Adrian Schmutzler --- .../linux/ramips/dts/mt7621_iptime_a8004t.dts | 134 ++++++++++++++++++ target/linux/ramips/image/mt7621.mk | 10 ++ .../mt7621/base-files/etc/board.d/02_network | 6 +- 3 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_iptime_a8004t.dts diff --git a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts new file mode 100644 index 0000000000..81643e6f6a --- /dev/null +++ b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts @@ -0,0 +1,134 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "iptime,a8004t", "mediatek,mt7621-soc"; + model = "ipTIME A8004T"; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + aliases { + led-boot = &led_cpu; + led-failsafe = &led_cpu; + led-running = &led_cpu; + led-upgrade = &led_cpu; + }; + + leds { + compatible = "gpio-leds"; + + led_cpu: cpu { + label = "a8004t:orange:cpu"; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + }; + + wlan2g { + label = "a8004t:orange:wlan2g"; + gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0radio"; + }; + + wlan5g { + label = "a8004t:orange:wlan5g"; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1radio"; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <80000000>; + m25p,fast-read; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + partition@20000 { + label = "config"; + reg = <0x20000 0x10000>; + read-only; + }; + + factory: partition@30000 { + label = "factory"; + reg = <0x30000 0x10000>; + read-only; + }; + + partition@40000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x40000 0xfc0000>; + }; + }; + }; +}; + +ðernet { + mtd-mac-address = <&uboot 0x1fc20>; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + ieee80211-freq-limit = <2400000 2500000>; + }; +}; + +&pcie1 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&state_default { + gpio { + ralink,group = "wdt", "jtag", "i2c"; + ralink,function = "gpio"; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index b33c2c5bc0..2baec6aa2f 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -382,6 +382,16 @@ define Device/iptime_a6ns-m endef TARGET_DEVICES += iptime_a6ns-m +define Device/iptime_a8004t + SOC := mt7621 + IMAGE_SIZE := 16128k + UIMAGE_NAME := a8004t + DEVICE_VENDOR := ipTIME + DEVICE_MODEL := A8004T + DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 wpad-basic +endef +TARGET_DEVICES += iptime_a8004t + define Device/jcg_jhr-ac876m SOC := mt7621 IMAGE_SIZE := 16064k diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 4e8e2cb9ed..ad6d6cd5fe 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -74,7 +74,8 @@ ramips_setup_interfaces() elecom,wrc-2533gst|\ iodata,wn-ax1167gr|\ iodata,wn-gx300gr|\ - iodata,wnpr2600g) + iodata,wnpr2600g|\ + iptime,a8004t) ucidef_add_switch "switch0" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" ;; @@ -222,7 +223,8 @@ ramips_setup_macs() wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) label_mac=$wan_mac ;; - iptime,a6ns-m) + iptime,a6ns-m|\ + iptime,a8004t) wan_mac=$(mtd_get_mac_binary u-boot 0x1fc40) ;; jcg,jhr-ac876m) From 414d0541381d432e69190f394dfe2a6e8122d6bb Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 6 Jan 2020 16:21:25 +0100 Subject: [PATCH 250/480] dnsmasq: Fix potential dnsmasq crash with TCP This is a backport from the dnsmasq master which should fix a bug which could cause a crash in dnsmasq. I saw the following crashes in my log: [522413.117215] do_page_fault(): sending SIGSEGV to dnsmasq for invalid read access from 2a001450 [522413.124464] epc = 004197f1 in dnsmasq[400000+23000] [522413.129459] ra = 004197ef in dnsmasq[400000+23000] This is happening in blockdata_write() when block->next is dereferenced, but I am not sure if this is related to this problem or if this is a different problem. I am unable to reproduce this problem. Signed-off-by: Hauke Mehrtens --- package/network/services/dnsmasq/Makefile | 2 +- ...egative-SRV-response-over-TCP-gets-s.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/network/services/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index c57a837e9e..f3d9a2e07e 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.80 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=15 +PKG_RELEASE:=16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch b/package/network/services/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch new file mode 100644 index 0000000000..5b1d59566d --- /dev/null +++ b/package/network/services/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch @@ -0,0 +1,35 @@ +From e710c34469af4378c2db6fa0b0be88313adcb68f Mon Sep 17 00:00:00 2001 +From: Alin Nastac +Date: Mon, 30 Sep 2019 15:30:26 +0100 +Subject: [PATCH] Fix crash when negative SRV response over TCP gets stored in + LRU cache entry. + +Patch extended to receive side of pipe by SRK. +--- + src/cache.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/src/cache.c ++++ b/src/cache.c +@@ -665,7 +665,11 @@ void cache_end_insert(void) + if (flags & (F_IPV4 | F_IPV6 | F_DNSKEY | F_DS | F_SRV)) + read_write(daemon->pipe_to_parent, (unsigned char *)&new_chain->addr, sizeof(new_chain->addr), 0); + if (flags & F_SRV) +- blockdata_write(new_chain->addr.srv.target, new_chain->addr.srv.targetlen, daemon->pipe_to_parent); ++ { ++ /* A negative SRV entry is possible and has no data, obviously. */ ++ if (!(flags & F_NEG)) ++ blockdata_write(new_chain->addr.srv.target, new_chain->addr.srv.targetlen, daemon->pipe_to_parent); ++ } + #ifdef HAVE_DNSSEC + if (flags & F_DNSKEY) + { +@@ -737,7 +741,7 @@ int cache_recv_insert(time_t now, int fd + if (!read_write(fd, (unsigned char *)&addr, sizeof(addr), 1)) + return 0; + +- if (flags & F_SRV && !(addr.srv.target = blockdata_read(fd, addr.srv.targetlen))) ++ if ((flags & F_SRV) && !(flags & F_NEG) && !(addr.srv.target = blockdata_read(fd, addr.srv.targetlen))) + return 0; + + #ifdef HAVE_DNSSEC From fedc5d30ae0a39a7d308adae8ed918dc5b603067 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 1 Jan 2020 04:11:54 +0200 Subject: [PATCH 251/480] base-files: move /tmp/resolv.conf.auto to /tmp/resolv.conf.d/ Having it in a directory it more friendly for mount-bind. Signed-off-by: Daniel Golle --- package/base-files/Makefile | 2 +- package/base-files/files/etc/init.d/boot | 5 +++-- package/network/services/ipset-dns/files/ipset-dns.config | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f203c29e95..35ad80888f 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=211 +PKG_RELEASE:=212 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 09b7f44c79..44311c9e23 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -31,8 +31,9 @@ boot() { chmod 0700 /tmp/.uci touch /var/log/wtmp touch /var/log/lastlog - touch /tmp/resolv.conf.auto - ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf + mkdir -p /tmp/resolv.conf.d + touch /tmp/resolv.conf.d/resolv.conf.auto + ln -sf /tmp/resolv.conf.d/resolv.conf.auto /tmp/resolv.conf grep -q debugfs /proc/filesystems && /bin/mount -o noatime -t debugfs debugfs /sys/kernel/debug [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe diff --git a/package/network/services/ipset-dns/files/ipset-dns.config b/package/network/services/ipset-dns/files/ipset-dns.config index 0270366af7..538d3a01a3 100644 --- a/package/network/services/ipset-dns/files/ipset-dns.config +++ b/package/network/services/ipset-dns/files/ipset-dns.config @@ -11,6 +11,6 @@ config ipset-dns #option port '53001' # use given upstream DNS server, - # defaults to first entry in /tmp/resolv.conf.auto + # defaults to first entry in /tmp/resolv.conf.d/resolv.conf.auto #option dns '8.8.8.8' From 5e1604477ae675874892237e4c8615c4acbb83c3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 7 Jan 2020 15:33:47 +0200 Subject: [PATCH 252/480] netifd: move /tmp/resolv.conf.auto to /tmp/resolv.conf.d/ Signed-off-by: Daniel Golle --- package/network/config/netifd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 1df4d1ee09..06c1aeac49 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2019-11-20 -PKG_SOURCE_VERSION:=e45b1408284c05984b38a910a1f0a07d6c761397 -PKG_MIRROR_HASH:=5f9b96a20bef71dc42492a8eaf407276a656ff00cce18ed8d0c7391c0a52d3e8 +PKG_SOURCE_DATE:=2020-01-07 +PKG_SOURCE_VERSION:=64f4eb79fe2977320660f8940bc908fa4def807b +PKG_MIRROR_HASH:=d6c819856030118640e61bbc3abe20fdb6bca2b64b7adc437bcc2f71c8c01b64 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From cd48d8d3420dd4df03daaa548227ceb487ba7104 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 3 Jan 2020 13:39:06 +0200 Subject: [PATCH 253/480] dnsmasq: switch to /tmp/resolv.conf.d/resolv.conf.auto Mount-bind directory instead of resolv.conf.auto file in jail to avoid problems when the file is deleted/replaced. Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/files/dhcp.conf | 2 +- package/network/services/dnsmasq/files/dnsmasq.init | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/network/services/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf index 360c7d79ee..19052e2333 100644 --- a/package/network/services/dnsmasq/files/dhcp.conf +++ b/package/network/services/dnsmasq/files/dhcp.conf @@ -13,7 +13,7 @@ config dnsmasq option authoritative 1 option readethers 1 option leasefile '/tmp/dhcp.leases' - option resolvfile '/tmp/resolv.conf.auto' + option resolvfile '/tmp/resolv.conf.d/resolv.conf.auto' #list server '/mycompany.local/1.2.3.4' option nonwildcard 1 # bind to & keep track of interfaces #list interface br-lan diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 94a069f1ac..ae02f322d5 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -768,7 +768,7 @@ dnsmasq_start() { local cfg="$1" local disabled user_dhcpscript - local resolvfile localuse=0 + local resolvfile resolvdir localuse=0 config_get_bool disabled "$cfg" disabled 0 [ "$disabled" -gt 0 ] && return 0 @@ -923,10 +923,11 @@ dnsmasq_start() config_get_bool noresolv "$cfg" noresolv 0 if [ "$noresolv" != "1" ]; then - config_get resolvfile "$cfg" resolvfile /tmp/resolv.conf.auto + config_get resolvfile "$cfg" resolvfile /tmp/resolv.conf.d/resolv.conf.auto [ -n "$resolvfile" -a ! -e "$resolvfile" ] && touch "$resolvfile" xappend "--resolv-file=$resolvfile" - [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && localuse=1 + [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=1 + resolvdir="$(dirname "$resolvfile")" fi config_get_bool localuse "$cfg" localuse "$localuse" @@ -1070,7 +1071,7 @@ dnsmasq_start() procd_set_param respawn procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT + procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile procd_close_instance @@ -1084,9 +1085,9 @@ dnsmasq_stop() config_get_bool noresolv "$cfg" noresolv 0 config_get resolvfile "$cfg" "resolvfile" - [ "$noresolv" = 0 -a "$resolvfile" = "/tmp/resolv.conf.auto" ] && localuse=1 + [ "$noresolv" = 0 -a "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=1 config_get_bool localuse "$cfg" localuse "$localuse" - [ "$localuse" -gt 0 ] && ln -sf "/tmp/resolv.conf.auto" /tmp/resolv.conf + [ "$localuse" -gt 0 ] && ln -sf "/tmp/resolv.conf.d/resolv.conf.auto" /tmp/resolv.conf rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp } From 2e3cf4500befa897ae0eec6f5643312f9b3f0a01 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 7 Jan 2020 15:42:42 +0200 Subject: [PATCH 254/480] dnsmasq: bump PKG_RELEASE Previous commit should have bumped PKG_RELEASE, but git add was forgotten... Add it now. Fixes: cd48d8d342 ("dnsmasq: switch to /tmp/resolv.conf.d/resolv.conf.auto") Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index f3d9a2e07e..d1e0c34e97 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.80 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=16 +PKG_RELEASE:=17 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq From 9924db5b379722408c7343dbb3d6bf1be4cd1fec Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 7 Jan 2020 20:52:23 +0100 Subject: [PATCH 255/480] iperf: fix PKG_CONFIG_DEPENDS Fix typo in PKG_CONFIG_DEPENDS and missing CONFIG_ prefix. Fixes: e98e046f06f3 ("iperf: Allow enabling multicast support") Signed-off-by: Matthias Schiffer --- package/network/utils/iperf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile index 5c84e1617d..d739b063ca 100644 --- a/package/network/utils/iperf/Makefile +++ b/package/network/utils/iperf/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_BUILD_PARALLEL:=1 -PGK_CONFIG_DEPENDS:=IPERF_ENABLE_MULTICAST +PKG_CONFIG_DEPENDS:=CONFIG_IPERF_ENABLE_MULTICAST include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk From 41c19dd542973dbc1336ecceaa32777506933cdf Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 7 Jan 2020 20:53:31 +0100 Subject: [PATCH 256/480] ethtool: fix PKG_CONFIG_DEPENDS Add missing CONFIG_ prefix. Signed-off-by: Matthias Schiffer --- package/network/utils/ethtool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index d640930333..be9da7ff0b 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -23,7 +23,7 @@ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_CONFIG_DEPENDS:=ETHTOOL_PRETTY_DUMP +PKG_CONFIG_DEPENDS:=CONFIG_ETHTOOL_PRETTY_DUMP include $(INCLUDE_DIR)/package.mk From 5ba02d10edc2e72c063c0419cded749cf55a3607 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Wed, 25 Dec 2019 19:42:08 +0100 Subject: [PATCH 257/480] ipq806x: opp/core: fix broken patch Handle opp voltage adjust The opp_notifier introduced with patch 0054-Handle-OPP-voltage adjust for some reason missed the actual registration in the opp struct, resulting in never being registred. This was present in kernel 4.9 patchset but dropped in the transition to 4.14. Reintroduce this and fix patch 0055 about L2 cache scaling. Signed-off-by: Ansuel Smith --- ...-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch | 11 ++--------- ...-cpufreq-dt-Add-L2-frequency-scaling-support.patch | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch index f60fe3fe2f..e1dbb8791d 100644 --- a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch +++ b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch @@ -91,19 +91,12 @@ Signed-off-by: Georgi Djakov static int resources_available(void) { struct device *cpu_dev; -@@ -161,6 +200,7 @@ static int cpufreq_init(struct cpufreq_p - bool fallback = false; - const char *name; - int ret; -+ struct srcu_notifier_head *opp_srcu_head; - - cpu_dev = get_cpu_device(policy->cpu); - if (!cpu_dev) { -@@ -251,10 +291,13 @@ static int cpufreq_init(struct cpufreq_p +@@ -251,10 +291,14 @@ static int cpufreq_init(struct cpufreq_p __func__, ret); } + mutex_init(&priv->lock); ++ priv->opp_nb.notifier_call = opp_notifier; + dev_pm_opp_register_notifier(cpu_dev, &priv->opp_nb); + ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table); diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch index f27f88f892..2805f246ee 100644 --- a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -53,9 +53,9 @@ Signed-off-by: Georgi Djakov arch_set_freq_scale(policy->related_cpus, freq, policy->cpuinfo.max_freq); @@ -201,6 +230,8 @@ static int cpufreq_init(struct cpufreq_p + bool fallback = false; const char *name; int ret; - struct srcu_notifier_head *opp_srcu_head; + struct device_node *l2_np; + struct clk *l2_clk = NULL; @@ -82,7 +82,7 @@ Signed-off-by: Georgi Djakov struct clk *clk; + struct clk *l2_clk; /* L2 clock */ -+ unsigned int l2_rate[3]; /* L2 bus clock rate thresholds */ ++ unsigned int l2_rate[3]; /* L2 bus clock rate thresholds */ struct cpufreq_cpuinfo cpuinfo;/* see above */ unsigned int min; /* in kHz */ From 411ad3727a3a12042b3f6cea43b621cc2373d67e Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Wed, 25 Dec 2019 20:44:06 +0100 Subject: [PATCH 258/480] ipq806x: reorganize nand_pins mux definition It's wrong set the mux to bias-disable. The best way to do this is by creating a separate group and disable the specific pins. By documentation, any subgroup with no bias definition is ignored so the mux definition is useless. Rework the definition by sremoving the mux subgroup and set the remaining subgroup with the mux function and drive-strength Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 13 ++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 13 ++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 13 ++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 13 ++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 13 ++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 13 ++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 10 ++++++---- .../arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 11 ++++++----- .../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 13 ++++++++----- 9 files changed, 68 insertions(+), 44 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 8ef5b92b52..02f60c90ee 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -66,24 +66,27 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index 6a16167e1f..de347643dc 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -45,24 +45,27 @@ }; }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index ac1a965896..241c00962a 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -76,24 +76,27 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index 6f54e19da2..b052ca6fcb 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -76,24 +76,27 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index 8130b583d3..dd596f52b4 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -77,24 +77,27 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index 21287ef9d7..463c0abb40 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -81,24 +81,27 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts index 280dc88569..a1e7791d12 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -504,11 +504,9 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", "gpio37", - "gpio38", "gpio39", "gpio40", "gpio41", - "gpio42", "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; @@ -516,12 +514,16 @@ pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts index 12cfa3b0fc..b4770102e2 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -473,12 +473,9 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; @@ -486,6 +483,8 @@ pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; @@ -493,6 +492,8 @@ pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 6a1d016f7a..f93039f727 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -70,24 +70,27 @@ }; nand_pins: nand_pins { - mux { + disable { pins = "gpio34", "gpio35", "gpio36", - "gpio37", "gpio38", "gpio39", - "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", - "gpio46", "gpio47"; + "gpio37", "gpio38"; function = "nand"; drive-strength = <10>; bias-disable; }; + pullups { pins = "gpio39"; + function = "nand"; + drive-strength = <10>; bias-pull-up; }; + hold { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; + function = "nand"; + drive-strength = <10>; bias-bus-hold; }; }; From 0ef755b8adb351d5658c462738435ccee0baf576 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 5 Jan 2020 18:15:22 +0100 Subject: [PATCH 259/480] ipq806x: refactor l2 freq scaling patch Refactor l2 freq scaling patch to support voltage scaling and add support to base cache scaling on cpu freq scaling. Update the dtsi files with the new definition used in the new code. Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 3 + .../arch/arm/boot/dts/qcom-ipq8065.dtsi | 4 + ...-dt-Add-L2-frequency-scaling-support.patch | 153 +++++++++++++----- 3 files changed, 120 insertions(+), 40 deletions(-) diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index e6066024f6..1cf105d81e 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -67,6 +67,9 @@ qcom,l2 { qcom,l2-rates = <384000000 1000000000 1200000000>; + qcom,l2-cpufreq = <384000000 600000000 1200000000>; + qcom,l2-volt = <1100000 1100000 1150000>; + qcom,l2-supply = <&smb208_s1a>; }; idle-states { diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi index ae9e4a2e8e..fdd4697887 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065.dtsi @@ -24,6 +24,10 @@ }; cpus { + qcom,l2 { + qcom,l2-cpufreq = <384000000 600000000 1400000000>; + }; + idle-states { CPU_SPC: spc { status = "disabled"; diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch index 2805f246ee..26b7811093 100644 --- a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -1,88 +1,161 @@ -From 0759cdff49f1cf361bf503c13f7bcb33da43ab95 Mon Sep 17 00:00:00 2001 -From: Georgi Djakov -Date: Tue, 8 Sep 2015 11:24:41 +0300 -Subject: [PATCH 55/69] cpufreq-dt: Add L2 frequency scaling support - -Signed-off-by: Georgi Djakov ---- - drivers/cpufreq/cpufreq-dt.c | 41 ++++++++++++++++++++++++++++++++++++++++- - include/linux/cpufreq.h | 2 ++ - 2 files changed, 42 insertions(+), 1 deletion(-) - --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -49,11 +49,40 @@ static int set_target(struct cpufreq_pol +@@ -48,16 +48,71 @@ static int set_target(struct cpufreq_pol + { struct private_data *priv = policy->driver_data; unsigned long freq = policy->freq_table[index].frequency; - int ret; + struct clk *l2_clk = policy->l2_clk; -+ unsigned int l2_freq; -+ unsigned long new_l2_freq = 0; ++ struct regulator *l2_regulator = policy->l2_regulator; ++ unsigned long l2_freq, target_l2_freq; ++ unsigned long l2_vol, target_l2_vol; ++ unsigned long target_freq; + int ret; mutex_lock(&priv->lock); ret = dev_pm_opp_set_rate(priv->cpu_dev, freq * 1000); if (!ret) { -+ if (!IS_ERR(l2_clk) && policy->l2_rate[0] && policy->l2_rate[1] && -+ policy->l2_rate[2]) { ++ if (policy->l2_rate_set) { + static unsigned long krait_l2[CONFIG_NR_CPUS] = { }; -+ int cpu, ret = 0; -+ unsigned long target_freq = freq * 1000; ++ int cpu, l2_index, tol = 0; + -+ if (target_freq >= policy->l2_rate[2]) -+ new_l2_freq = policy->l2_rate[2]; -+ else if (target_freq >= policy->l2_rate[1]) -+ new_l2_freq = policy->l2_rate[1]; -+ else -+ new_l2_freq = policy->l2_rate[0]; ++ target_freq = freq * 1000; + -+ krait_l2[policy->cpu] = new_l2_freq; ++ krait_l2[policy->cpu] = target_freq; + for_each_present_cpu(cpu) -+ new_l2_freq = max(new_l2_freq, krait_l2[cpu]); ++ target_freq = max(target_freq, krait_l2[cpu]); ++ ++ for (l2_index = 2; l2_index >= 0; l2_index--) ++ if (target_freq >= policy->l2_cpufreq[l2_index]) ++ break; + + l2_freq = clk_get_rate(l2_clk); ++ target_l2_freq = policy->l2_rate[l2_index]; + -+ if (l2_freq != new_l2_freq) { -+ ret = clk_set_rate(l2_clk, policy->l2_rate[0]); ++ if (l2_freq != target_l2_freq) { ++ ++ /* ++ * Set to idle bin if switching from normal to high bin ++ * or vice versa ++ */ ++ if ( (l2_index == 2 && l2_freq == policy->l2_rate[1]) || ++ (l2_index == 1 && l2_freq == policy->l2_rate[2]) ) { ++ ret = clk_set_rate(l2_clk, policy->l2_rate[0]); ++ if (ret) ++ goto exit; ++ } + /* scale l2 with the core */ -+ ret = clk_set_rate(l2_clk, new_l2_freq); ++ ret = clk_set_rate(l2_clk, target_l2_freq); ++ if (ret) ++ goto exit; ++ ++ if (policy->l2_volt_set) { ++ ++ l2_vol = regulator_get_voltage(l2_regulator); ++ target_l2_vol = policy->l2_volt[l2_index]; ++ ++ if (l2_vol != target_l2_vol) { ++ tol = target_l2_vol * policy->l2_volt_tol / 100; ++ ret = regulator_set_voltage_tol(l2_regulator,target_l2_vol,tol); ++ if (ret) ++ goto exit; ++ } ++ } + } + } -+ priv->opp_freq = freq * 1000; arch_set_freq_scale(policy->related_cpus, freq, policy->cpuinfo.max_freq); -@@ -201,6 +230,8 @@ static int cpufreq_init(struct cpufreq_p - bool fallback = false; + } ++ ++exit: + mutex_unlock(&priv->lock); + + return ret; +@@ -202,6 +257,9 @@ static int cpufreq_init(struct cpufreq_p + bool fallback = false; const char *name; int ret; -+ struct device_node *l2_np; ++ struct device_node *np, *l2_np; + struct clk *l2_clk = NULL; ++ struct regulator *l2_regulator = NULL; cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { -@@ -307,6 +338,13 @@ static int cpufreq_init(struct cpufreq_p +@@ -309,6 +367,57 @@ static int cpufreq_init(struct cpufreq_p policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000; ++ policy->l2_rate_set = false; ++ policy->l2_volt_set = false; ++ + l2_clk = clk_get(cpu_dev, "l2"); + if (!IS_ERR(l2_clk)) + policy->l2_clk = l2_clk; ++ + l2_np = of_find_node_by_name(NULL, "qcom,l2"); -+ if (l2_np) ++ if (l2_np) { ++ struct device_node *vdd; ++ np = of_node_get(priv->cpu_dev->of_node); ++ ++ if (np) ++ of_property_read_u32(np, "voltage-tolerance", &policy->l2_volt_tol); ++ + of_property_read_u32_array(l2_np, "qcom,l2-rates", policy->l2_rate, 3); ++ if (policy->l2_rate[0] && policy->l2_rate[1] && policy->l2_rate[2]) { ++ policy->l2_rate_set = true; ++ of_property_read_u32_array(l2_np, "qcom,l2-cpufreq", policy->l2_cpufreq, 3); ++ of_property_read_u32_array(l2_np, "qcom,l2-volt", policy->l2_volt, 3); ++ } else ++ pr_warn("L2: failed to parse L2 rates\n"); ++ ++ if (!policy->l2_cpufreq[0] && !policy->l2_cpufreq[1] && ++ !policy->l2_cpufreq[2] && policy->l2_rate_set) { ++ int i; ++ ++ pr_warn("L2: failed to parse target cpu freq, using defaults\n"); ++ for (i = 0; i < 3; i++) ++ policy->l2_cpufreq[i] = policy->l2_rate[i]; ++ } ++ ++ if (policy->l2_volt[0] && policy->l2_volt[1] && policy->l2_volt[2] && ++ policy->l2_volt_tol && policy->l2_rate_set) { ++ vdd = of_parse_phandle(l2_np, "qcom,l2-supply", 0); ++ ++ if (vdd) { ++ l2_regulator = devm_regulator_get(cpu_dev, vdd->name); ++ if (!IS_ERR(l2_regulator)) { ++ policy->l2_regulator = l2_regulator; ++ policy->l2_volt_set = true; ++ } else { ++ pr_warn("failed to get l2 supply\n"); ++ l2_regulator = NULL; ++ } ++ ++ of_node_put(vdd); ++ } ++ } ++ } + /* Support turbo/boost mode */ if (policy_has_boost_freq(policy)) { /* This gets disabled by core on driver unregister */ --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h -@@ -73,6 +73,8 @@ struct cpufreq_policy { +@@ -72,7 +72,15 @@ struct cpufreq_policy { + should set cpufreq */ unsigned int cpu; /* cpu managing this policy, must be online */ - struct clk *clk; -+ struct clk *l2_clk; /* L2 clock */ -+ unsigned int l2_rate[3]; /* L2 bus clock rate thresholds */ +- struct clk *clk; ++ struct clk *clk; ++ struct clk *l2_clk; /* L2 clock */ ++ struct regulator *l2_regulator; /* L2 supply */ ++ unsigned int l2_rate[3]; /* L2 bus clock rate */ ++ bool l2_rate_set; ++ unsigned int l2_cpufreq[3]; /* L2 target CPU frequency */ ++ unsigned int l2_volt[3]; /* L2 voltage array */ ++ bool l2_volt_set; ++ unsigned int l2_volt_tol; /* L2 voltage tolerance */ struct cpufreq_cpuinfo cpuinfo;/* see above */ unsigned int min; /* in kHz */ From 5318a6dea3ca36b7887dd9abd589a623ff1272f9 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sat, 28 Dec 2019 17:34:36 +0100 Subject: [PATCH 260/480] ipq806x: add fab scaling support Add fab scaling support and dtsi definition Signed-off-by: Ansuel Smith --- .../arch/arm/boot/dts/qcom-ipq8064.dtsi | 9 + ...add-fab-scaling-support-with-cpufreq.patch | 243 ++++++++++++++++++ 2 files changed, 252 insertions(+) create mode 100644 target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi index 1cf105d81e..f95b0b4f95 100644 --- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -546,6 +546,15 @@ }; }; + fab-scaling { + compatible = "qcom,fab-scaling"; + clocks = <&rpmcc RPM_APPS_FABRIC_A_CLK>, <&rpmcc RPM_EBI1_A_CLK>; + clock-names = "apps-fab-clk", "ddr-fab-clk"; + fab_freq_high = <533000000>; + fab_freq_nominal = <400000000>; + cpu_freq_threshold = <1000000000>; + }; + firmware { scm { compatible = "qcom,scm-ipq806x"; diff --git a/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch b/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch new file mode 100644 index 0000000000..fa02f49526 --- /dev/null +++ b/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch @@ -0,0 +1,243 @@ +--- a/drivers/clk/qcom/Makefile ++++ b/drivers/clk/qcom/Makefile +@@ -15,6 +15,7 @@ clk-qcom-$(CONFIG_KRAIT_CLOCKS) += clk-k + clk-qcom-y += clk-hfpll.o + clk-qcom-y += reset.o + clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o ++clk-qcom-y += fab_scaling.o + + # Keep alphabetically sorted by config + obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o +--- /dev/null ++++ b/drivers/clk/qcom/fab_scaling.c +@@ -0,0 +1,172 @@ ++/* ++ * Copyright (c) 2015, The Linux Foundation. All rights reserved. ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct qcom_fab_scaling_data { ++ u32 fab_freq_high; ++ u32 fab_freq_nominal; ++ u32 cpu_freq_threshold; ++ struct clk *apps_fab_clk; ++ struct clk *ddr_fab_clk; ++}; ++ ++static struct qcom_fab_scaling_data *drv_data; ++ ++int scale_fabrics(unsigned long max_cpu_freq) ++{ ++ struct clk *apps_fab_clk = drv_data->apps_fab_clk, ++ *ddr_fab_clk = drv_data->ddr_fab_clk; ++ unsigned long target_freq, cur_freq; ++ int ret; ++ ++ /* Skip fab scaling if the driver is not ready */ ++ if (!apps_fab_clk || !ddr_fab_clk) ++ return 0; ++ ++ if (max_cpu_freq > drv_data->cpu_freq_threshold) ++ target_freq = drv_data->fab_freq_high; ++ else ++ target_freq = drv_data->fab_freq_nominal; ++ ++ cur_freq = clk_get_rate(ddr_fab_clk); ++ ++ if (target_freq != cur_freq) { ++ ret = clk_set_rate(apps_fab_clk, target_freq); ++ if (ret) ++ return ret; ++ ret = clk_set_rate(ddr_fab_clk, target_freq); ++ if (ret) ++ return ret; ++ } ++ ++ return 0; ++} ++EXPORT_SYMBOL(scale_fabrics); ++ ++static int ipq806x_fab_scaling_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct clk *apps_fab_clk, *ddr_fab_clk; ++ int ret; ++ ++ if (!np) ++ return -ENODEV; ++ ++ drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL); ++ if (!drv_data) ++ return -ENOMEM; ++ ++ if (of_property_read_u32(np, "fab_freq_high", &drv_data->fab_freq_high)) { ++ pr_err("FABRICS turbo freq not found. Using defaults...\n"); ++ drv_data->fab_freq_high = 533000000; ++ } ++ ++ if (of_property_read_u32(np, "fab_freq_nominal", &drv_data->fab_freq_nominal)) { ++ pr_err("FABRICS nominal freq not found. Using defaults...\n"); ++ drv_data->fab_freq_nominal = 400000000; ++ } ++ ++ if (of_property_read_u32(np, "cpu_freq_threshold", &drv_data->cpu_freq_threshold)) { ++ pr_err("FABRICS cpu freq threshold not found. Using defaults...\n"); ++ drv_data->cpu_freq_threshold = 1000000000; ++ } ++ ++ drv_data->apps_fab_clk = devm_clk_get(&pdev->dev, "apps-fab-clk"); ++ apps_fab_clk = drv_data->apps_fab_clk; ++ ret = PTR_ERR_OR_ZERO(apps_fab_clk); ++ if (ret) { ++ /* ++ * If apps fab clk node is present, but clock is not yet ++ * registered, we should try defering probe. ++ */ ++ if (ret != -EPROBE_DEFER) { ++ pr_err("Failed to get APPS FABRIC clock: %d\n", ret); ++ ret = -ENODEV; ++ } ++ goto err; ++ } ++ ++ clk_set_rate(apps_fab_clk, drv_data->fab_freq_high); ++ clk_prepare_enable(apps_fab_clk); ++ ++ drv_data->ddr_fab_clk = devm_clk_get(&pdev->dev, "ddr-fab-clk"); ++ ddr_fab_clk = drv_data->ddr_fab_clk; ++ ret = PTR_ERR_OR_ZERO(ddr_fab_clk); ++ if (ret) { ++ /* ++ * If ddr fab clk node is present, but clock is not yet ++ * registered, we should try defering probe. ++ */ ++ if (ret != -EPROBE_DEFER) { ++ pr_err("Failed to get DDR FABRIC clock: %d\n", ret); ++ ddr_fab_clk = NULL; ++ ret = -ENODEV; ++ } ++ goto err; ++ } ++ ++ clk_set_rate(ddr_fab_clk, drv_data->fab_freq_high); ++ clk_prepare_enable(ddr_fab_clk); ++ ++ return 0; ++err: ++ kfree(drv_data); ++ return ret; ++} ++ ++static int ipq806x_fab_scaling_remove(struct platform_device *pdev) ++{ ++ kfree(drv_data); ++ return 0; ++} ++ ++static const struct of_device_id fab_scaling_ipq806x_match_table[] = { ++ { .compatible = "qcom,fab-scaling" }, ++ { } ++}; ++ ++static struct platform_driver fab_scaling_ipq806x_driver = { ++ .probe = ipq806x_fab_scaling_probe, ++ .remove = ipq806x_fab_scaling_remove, ++ .driver = { ++ .name = "fab-scaling", ++ .of_match_table = fab_scaling_ipq806x_match_table, ++ }, ++}; ++ ++static int __init fab_scaling_ipq806x_init(void) ++{ ++ return platform_driver_register(&fab_scaling_ipq806x_driver); ++} ++late_initcall(fab_scaling_ipq806x_init); ++ ++static void __exit fab_scaling_ipq806x_exit(void) ++{ ++ platform_driver_unregister(&fab_scaling_ipq806x_driver); ++} ++module_exit(fab_scaling_ipq806x_exit); +--- /dev/null ++++ b/include/linux/fab_scaling.h +@@ -0,0 +1,31 @@ ++/* ++ * Copyright (c) 2015, The Linux Foundation. All rights reserved. ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++ ++#ifndef __FAB_SCALING_H ++#define __FAB_SCALING_H ++ ++/** ++ * scale_fabrics - Scale DDR and APPS FABRICS ++ * ++ * This function monitors all the registered clocks and does APPS ++ * and DDR FABRIC scaling based on the idle frequencies with which ++ * it was registered. ++ * ++ */ ++int scale_fabrics(unsigned long max_cpu_freq); ++ ++#endif +--- a/drivers/cpufreq/cpufreq-dt.c ++++ b/drivers/cpufreq/cpufreq-dt.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "cpufreq-dt.h" + +@@ -101,6 +102,13 @@ static int set_target(struct cpufreq_pol + } + } + } ++ ++ /* ++ * Scale fabrics with max freq across all cores ++ */ ++ ret = scale_fabrics(target_freq); ++ if (ret) ++ goto exit; + } + priv->opp_freq = freq * 1000; + arch_set_freq_scale(policy->related_cpus, freq, From 0c97f034c9c5810096b022e2decea58fd4a4fae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 8 Jan 2020 14:33:03 +0100 Subject: [PATCH 261/480] ipq806x: refresh kernel patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- .../0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch | 2 +- .../0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch | 4 ++-- .../patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch | 2 +- .../0057-add-fab-scaling-support-with-cpufreq.patch | 2 +- .../080-ARM-dts-qcom-add-gpio-ranges-property.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch index e1dbb8791d..9620891194 100644 --- a/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch +++ b/target/linux/ipq806x/patches-4.19/0054-cpufreq-dt-Handle-OPP-voltage-adjust-events.patch @@ -91,7 +91,7 @@ Signed-off-by: Georgi Djakov static int resources_available(void) { struct device *cpu_dev; -@@ -251,10 +291,14 @@ static int cpufreq_init(struct cpufreq_p +@@ -251,10 +290,14 @@ static int cpufreq_init(struct cpufreq_p __func__, ret); } diff --git a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch index 26b7811093..5f54120b3a 100644 --- a/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch +++ b/target/linux/ipq806x/patches-4.19/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch @@ -72,7 +72,7 @@ mutex_unlock(&priv->lock); return ret; -@@ -202,6 +257,9 @@ static int cpufreq_init(struct cpufreq_p +@@ -200,6 +255,9 @@ static int cpufreq_init(struct cpufreq_p bool fallback = false; const char *name; int ret; @@ -82,7 +82,7 @@ cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { -@@ -309,6 +367,57 @@ static int cpufreq_init(struct cpufreq_p +@@ -307,6 +365,57 @@ static int cpufreq_init(struct cpufreq_p policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000; diff --git a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch index 6a98c3303c..ef03ba4de8 100644 --- a/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch +++ b/target/linux/ipq806x/patches-4.19/0056-cpufreq-dt-Add-missing-rcu-locks.patch @@ -10,7 +10,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c -@@ -147,8 +147,10 @@ static int opp_notifier(struct notifier_ +@@ -173,8 +173,10 @@ static int opp_notifier(struct notifier_ ret = PTR_ERR(cpu_reg); goto out; } diff --git a/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch b/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch index fa02f49526..dc65230f47 100644 --- a/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch +++ b/target/linux/ipq806x/patches-4.19/0057-add-fab-scaling-support-with-cpufreq.patch @@ -227,7 +227,7 @@ #include "cpufreq-dt.h" -@@ -101,6 +102,13 @@ static int set_target(struct cpufreq_pol +@@ -106,6 +107,13 @@ static int set_target(struct cpufreq_pol } } } diff --git a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch index 06d29e8af8..1ab070bdab 100644 --- a/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch +++ b/target/linux/ipq806x/patches-4.19/080-ARM-dts-qcom-add-gpio-ranges-property.patch @@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl. --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -656,6 +656,7 @@ +@@ -668,6 +668,7 @@ reg = <0x800000 0x4000>; gpio-controller; From 9b0e8d0aa464f51460ff33179e247f1071564471 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 31 Dec 2019 13:57:50 +0100 Subject: [PATCH 262/480] treewide: move mktplinkfw to tplink-v1-image in image-commands.mk This move the slightly different target-specific implementations of mktplinkfw from the targets to include/image-commands.mk and renames it to tplink-v1-image. Having a common version will increase consistency between implementation and will complete the tplink build command already present in the new location. Due to the slight differences of the original implementations, this also does some adjustments to the device build commands/variables. This also moves rootfs_align as this is required as dependency. Tested on: - TL-WDR4300 v1 (ath79, factory) - TL-WDR4900 v1 (mpc85xx, sysupgrade) - RE210 v1 (ramips, see Tested-by) Signed-off-by: Adrian Schmutzler Tested-by: Christoph Krapp --- include/image-commands.mk | 22 +++++++++++++++ target/linux/ath79/image/common-tp-link.mk | 27 ++---------------- target/linux/ath79/image/generic-tp-link.mk | 8 +++--- target/linux/ath79/image/tiny-tp-link.mk | 14 +++++----- target/linux/mpc85xx/image/Makefile | 31 +++------------------ target/linux/ramips/image/mt7620.mk | 21 ++------------ 6 files changed, 41 insertions(+), 82 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 5dfd6a2c2f..3b091f26ac 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -3,6 +3,10 @@ IMAGE_KERNEL = $(word 1,$^) IMAGE_ROOTFS = $(word 2,$^) +define rootfs_align +$(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1)))))) +endef + define Build/uImage mkimage -A $(LINUX_KARCH) \ -O linux -T kernel \ @@ -335,6 +339,24 @@ define Build/tplink-v1-header @mv $@.new $@ endef +# combine kernel and rootfs into one image +# mktplinkfw +# is "sysupgrade" or "factory" +# +# -a align the rootfs start on an bytes boundary +# -j add jffs2 end-of-filesystem markers +# -s strip padding from end of the image +# -X reserve bytes in the firmware image (hexval prefixed with 0x) +define Build/tplink-v1-image + -$(STAGING_DIR_HOST)/bin/mktplinkfw \ + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ + -N "$(VERSION_DIST)" -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \ + -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new -j -X 0x40000 \ + -a $(call rootfs_align,$(FILESYSTEM)) \ + $(wordlist 2,$(words $(1)),$(1)) \ + $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ +endef + define Build/tplink-v2-header $(STAGING_DIR_HOST)/bin/mktplinkfw2 \ -c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \ diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index 0dc58191a8..1c7ff0e567 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -1,28 +1,6 @@ DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION DEVICE_VARS += TPLINK_BOARD_NAME TPLINK_BOARD_ID -define rootfs_align -$(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1)))))) -endef - -# combine kernel and rootfs into one image -# mktplinkfw -# is "sysupgrade" or "factory" -# -# -a align the rootfs start on an bytes boundary -# -j add jffs2 end-of-filesystem markers -# -s strip padding from end of the image -# -X reserve bytes in the firmware image (hexval prefixed with 0x) -define Build/mktplinkfw - -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ - -N OpenWrt -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \ - -k $(IMAGE_KERNEL) -r $@ -o $@.new -j -X 0x40000 \ - -a $(call rootfs_align,$(FILESYSTEM)) \ - $(wordlist 2,$(words $(1)),$(1)) \ - $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ -endef - # mktplinkfw-combined # # -c combined image @@ -50,9 +28,8 @@ define Device/tplink KERNEL := kernel-bin | append-dtb | lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v1-header IMAGES += factory.bin - IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | \ - append-metadata - IMAGE/factory.bin := append-rootfs | mktplinkfw factory + IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade | append-metadata + IMAGE/factory.bin := tplink-v1-image factory endef define Device/tplink-nolzma diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 603cacdaf2..a7266f05a9 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -157,8 +157,8 @@ define Device/tplink_archer-c7-v2 TPLINK_HWID := 0xc7000002 SUPPORTED_DEVICES += archer-c7 IMAGES += factory-us.bin factory-eu.bin - IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US - IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU + IMAGE/factory-us.bin := tplink-v1-image factory -C US + IMAGE/factory-eu.bin := tplink-v1-image factory -C EU endef TARGET_DEVICES += tplink_archer-c7-v2 @@ -502,9 +502,9 @@ define Device/tplink_tl-wr2543-v1 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x25430001 - IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \ + IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -v 3.13.99 | \ append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := append-rootfs | mktplinkfw factory -v 3.13.99 + IMAGE/factory.bin := tplink-v1-image factory -v 3.13.99 SUPPORTED_DEVICES += tl-wr2543-v1 endef TARGET_DEVICES += tplink_tl-wr2543-v1 diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 172f22f320..070ede9721 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -198,8 +198,8 @@ define Device/tplink_tl-wr841-v11 TPLINK_HWID := 0x08410011 SUPPORTED_DEVICES += tl-wr841n-v11 IMAGES += factory-us.bin factory-eu.bin - IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US - IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU + IMAGE/factory-us.bin := tplink-v1-image factory -C US + IMAGE/factory-eu.bin := tplink-v1-image factory -C EU endef TARGET_DEVICES += tplink_tl-wr841-v11 @@ -211,8 +211,8 @@ define Device/tplink_tl-wr841-v12 TPLINK_HWID := 0x08410012 SUPPORTED_DEVICES += tl-wr841n-v11 IMAGES += factory-us.bin factory-eu.bin - IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US - IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU + IMAGE/factory-us.bin := tplink-v1-image factory -C US + IMAGE/factory-eu.bin := tplink-v1-image factory -C EU endef TARGET_DEVICES += tplink_tl-wr841-v12 @@ -234,9 +234,9 @@ define Device/tplink_tl-wr940n-v4 TPLINK_HWID := 0x09400004 SUPPORTED_DEVICES += tl-wr940n-v4 IMAGES += factory-us.bin factory-eu.bin factory-br.bin - IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US - IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU - IMAGE/factory-br.bin := append-rootfs | mktplinkfw factory -C BR + IMAGE/factory-us.bin := tplink-v1-image factory -C US + IMAGE/factory-eu.bin := tplink-v1-image factory -C EU + IMAGE/factory-br.bin := tplink-v1-image factory -C BR endef TARGET_DEVICES += tplink_tl-wr940n-v4 diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile index 5ca16909e7..98fe51c7e9 100644 --- a/target/linux/mpc85xx/image/Makefile +++ b/target/linux/mpc85xx/image/Makefile @@ -5,36 +5,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT - -define rootfs_align -$(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1)))))) -endef +DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION define Build/copy-file cat "$(1)" > "$@" endef -# combine kernel and rootfs into one image -# mktplinkfw -# is "sysupgrade" or "factory" -# -# -a align the rootfs start on an bytes boundary -# -j add jffs2 end-of-filesystem markers -# -s strip padding from end of the image -# -X reserve bytes in the firmware image (hexval prefixed with 0x) -define Build/mktplinkfw - -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \ - -k $(IMAGE_KERNEL) \ - -r $@ \ - -o $@.new \ - -j -X 0x40000 \ - -a $(call rootfs_align,$(FILESYSTEM)) \ - $(wordlist 2,$(words $(1)),$(1)) \ - $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ -endef - define Device/Default PROFILES := Default DEVICE_DTS := $(lastword $(subst _, ,$(1))) @@ -51,6 +27,7 @@ define Device/tplink_tl-wdr4900-v1 DEVICE_VENDOR := TP-Link DEVICE_MODEL := TL-WDR4900 DEVICE_VARIANT := v1 + TPLINK_HEADER_VERSION := 1 TPLINK_HWID := 0x49000001 TPLINK_HWREV := 1 TPLINK_FLASHLAYOUT := 16Mppc @@ -64,8 +41,8 @@ define Device/tplink_tl-wdr4900-v1 ARTIFACTS := fdt.bin ARTIFACT/fdt.bin := append-dtb IMAGES := fdt.bin factory.bin sysupgrade.bin - IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata - IMAGE/factory.bin := append-rootfs | mktplinkfw factory + IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade | append-metadata + IMAGE/factory.bin := tplink-v1-image factory endef TARGET_DEVICES += tplink_tl-wdr4900-v1 diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 698d1b5da2..72310f9e7e 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -16,23 +16,6 @@ define Build/elecom-header --owner=0 --group=0 -f $@ -C $(KDIR) v_0.0.0.bin v_0.0.0.md5 endef -# combine kernel and rootfs into one image -# mktplinkfw -# is "sysupgrade" or "factory" -# -# -a align the rootfs start on an bytes boundary -# -j add jffs2 end-of-filesystem markers -# -s strip padding from end of the image -# -X reserve bytes in the firmware image (hexval prefixed with 0x) -define Build/mktplinkfw - -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ - -N OpenWrt -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \ - -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new -j -X 0x40000 -a 0x4 \ - $(wordlist 2,$(words $(1)),$(1)) \ - $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ -endef - define Device/aigale_ai-br100 SOC := mt7620a IMAGE_SIZE := 7936k @@ -962,8 +945,8 @@ define Device/tplink_re200-v1 DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-mt76x0e IMAGES += factory.bin - IMAGE/sysupgrade.bin := mktplinkfw sysupgrade -e -O | append-metadata - IMAGE/factory.bin := mktplinkfw factory -e -O + IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -e -O | append-metadata + IMAGE/factory.bin := tplink-v1-image factory -e -O IMAGE_SIZE := 7936k KERNEL := $(KERNEL_DTB) KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-v1-header -e -O From df41cc7445098b78c95e010f79ec17351cad1446 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 31 Dec 2019 14:03:57 +0100 Subject: [PATCH 263/480] ath79: remove unused Build/mktplinkfw-combined Build/mktplinkfw-combined is not used anywhere, so remove it. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/common-tp-link.mk | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index 1c7ff0e567..fa396bbb42 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -1,17 +1,6 @@ DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION DEVICE_VARS += TPLINK_BOARD_NAME TPLINK_BOARD_ID -# mktplinkfw-combined -# -# -c combined image -define Build/mktplinkfw-combined - $(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ - -N OpenWrt -V $(REVISION) $(1) -m $(TPLINK_HEADER_VERSION) \ - -k $@ -o $@.new -s -S -c - @mv $@.new $@ -endef - define Build/uImageArcher mkimage -A $(LINUX_KARCH) \ -O linux -T kernel -C $(1) -a $(KERNEL_LOADADDR) \ From 04222bc5bc1435172223a1ad68ed5d0019c367e3 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 8 Jan 2020 16:27:52 +0100 Subject: [PATCH 264/480] ramips: add label MAC address for Xiaomi MIR3G The device label shows the address currently assigned to the OpenWrt LAN interface. Current setup is: LAN *:b8 factory 0xe006 label WAN *:b7 factory 0xe000 For vendor FW bootlog we get (manually removed parts of the address): [ 7.520000] set LAN/WAN LWLLL [ 7.530000] GMAC1_MAC_ADRH -- : 0x00004031 [ 7.530000] GMAC1_MAC_ADRL -- : 0x3c****b7 [ 7.530000] GDMA2_MAC_ADRH -- : 0x00004031 [ 7.540000] GDMA2_MAC_ADRL -- : 0x3c****b8 [ 7.540000] eth1: ===> VirtualIF_open Without further information, this does not allow verification of the currently unexpected LAN/WAN assignment (we would expect 0xe000 to be LAN). Signed-off-by: Adrian Schmutzler --- .../linux/ramips/mt7621/base-files/etc/board.d/02_network | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index ad6d6cd5fe..85105c870b 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -258,17 +258,15 @@ ramips_setup_macs() wan_mac=$(mtd_get_mac_binary factory 0x2e) label_mac=$wan_mac ;; - xiaomi,mir3g) + xiaomi,mir3g|\ + xiaomi,mir3p) lan_mac=$(mtd_get_mac_binary factory 0xe006) + label_mac=$lan_mac ;; xiaomi,mir3g-v2) wan_mac=$(mtd_get_mac_binary factory 0xe006) label_mac=$wan_mac ;; - xiaomi,mir3p) - lan_mac=$(mtd_get_mac_binary factory 0xe006) - label_mac=$lan_mac - ;; zbtlink,zbt-we1326) wan_mac=$(mtd_get_mac_binary factory 0xe006) label_mac=$(mtd_get_mac_binary factory 0x4) From 08ec23f8ea9c63384e127f934bfb8086b8ab368a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 May 2019 13:47:36 +0200 Subject: [PATCH 265/480] ar7: refresh kernel configuration The configuration of the generic subtarget was used as the default configuration and then the subtarget configurations were adapted. Signed-off-by: Hauke Mehrtens --- target/linux/ar7/config-4.9 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/ar7/config-4.9 b/target/linux/ar7/config-4.9 index 95a5375bae..95ee60ac59 100644 --- a/target/linux/ar7/config-4.9 +++ b/target/linux/ar7/config-4.9 @@ -18,6 +18,8 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_BOOT_ELF32=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CEVT_R4K=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="rootfstype=squashfs,jffs2" @@ -105,6 +107,7 @@ CONFIG_KALLSYMS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_MDIO_BOARDINFO=y +CONFIG_MIGRATION=y CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 From 90740f52e9b9076d60119cfe4669366588131fe6 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 May 2019 13:47:37 +0200 Subject: [PATCH 266/480] ar7: update kernel to version 4.14 This adds support for kernel 4.14 to the target and directly make it the default kernel version to use. This patch is build-tested only, but has never been device-tested. It is only added to preserve the changes in Git history prior to removing this target. Use it with care. Signed-off-by: Hauke Mehrtens [rebased and extended commit message, refreshed patches for 4.14.162] Signed-off-by: Adrian Schmutzler --- .../patches-D7.04.03.00/270-4.14_fixes.patch | 51 +++++++++++++++++++ target/linux/ar7/Makefile | 2 +- target/linux/ar7/{config-4.9 => config-4.14} | 21 ++++++-- .../100-fix-highmem-offset.patch | 0 .../110-flash.patch | 4 +- .../160-vlynq_try_remote_first.patch | 0 .../200-free-mem-below-kernel-offset.patch | 2 +- .../300-add-ac49x-platform.patch | 4 +- .../310-ac49x-prom-support.patch | 0 .../320-ac49x-mtd-partitions.patch | 4 +- .../920-ar7part.patch | 0 .../925-actiontec_leds.patch | 6 +-- .../950-cpmac_titan.patch | 8 +-- ...R7-allow-NULL-clock-for-clk_get_rate.patch | 45 ---------------- 14 files changed, 84 insertions(+), 63 deletions(-) create mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch rename target/linux/ar7/{config-4.9 => config-4.14} (87%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/100-fix-highmem-offset.patch (100%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/110-flash.patch (85%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/160-vlynq_try_remote_first.patch (100%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/200-free-mem-below-kernel-offset.patch (89%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/300-add-ac49x-platform.patch (96%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/310-ac49x-prom-support.patch (100%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/320-ac49x-mtd-partitions.patch (90%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/920-ar7part.patch (100%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/925-actiontec_leds.patch (90%) rename target/linux/ar7/{patches-4.9 => patches-4.14}/950-cpmac_titan.patch (86%) delete mode 100644 target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch new file mode 100644 index 0000000000..32bc535d34 --- /dev/null +++ b/package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch @@ -0,0 +1,51 @@ +--- a/tn7atm.c ++++ b/tn7atm.c +@@ -1149,7 +1149,7 @@ void tn7atm_close (struct atm_vcc *vcc) + Tn7AtmPrivate *priv; + int dmachan; + spinlock_t closeLock; +- unsigned int closeFlag; ++ unsigned long closeFlag; + int rc; + + priv = (Tn7AtmPrivate *) vcc->dev->dev_data; +--- a/tn7dsl.c ++++ b/tn7dsl.c +@@ -620,7 +620,7 @@ unsigned int shim_osClockTick(void) + return jiffies; + } + +-int flags; ++unsigned long flags; + spinlock_t shimLock; + + void shim_osCriticalEnter(void) +@@ -3433,7 +3433,7 @@ struct ctl_table dslmod_table[] = { + .extra2 = (void *)DEV_DSLMOD, + } + , +- {0} ++ { } + }; + + /* Make sure that /proc/sys/dev is there */ +@@ -3447,7 +3447,7 @@ struct ctl_table dslmod_root_table[] = { + } + , + #endif /* CONFIG_PROC_FS */ +- {0} ++ { } + }; + + static struct ctl_table_header *dslmod_sysctl_header; +--- a/tn7sar.c ++++ b/tn7sar.c +@@ -1208,7 +1208,7 @@ int tn7sar_deactivate_vc(Tn7AtmPrivate * + HAL_FUNCTIONS *pHalFunc; + HAL_DEVICE *pHalDev; + int rc; +- int flags; ++ unsigned long flags; + + //dgprintf(4, "tn7sar_deactivate_vc\n"); + //printk("tn7sar_deactivate_vc entered\n"); diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index ba40e508fc..d36340d143 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI AR7 FEATURES:=squashfs atm low_mem SUBTARGETS:=generic ac49x -KERNEL_PATCHVER:=4.9 +KERNEL_PATCHVER:=4.14 define Target/Description Build firmware images for TI AR7 based routers. diff --git a/target/linux/ar7/config-4.9 b/target/linux/ar7/config-4.14 similarity index 87% rename from target/linux/ar7/config-4.9 rename to target/linux/ar7/config-4.14 index 95ee60ac59..aacdac63dc 100644 --- a/target/linux/ar7/config-4.9 +++ b/target/linux/ar7/config-4.14 @@ -10,16 +10,22 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y # CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set # CONFIG_ARCH_HAS_SG_CHAIN is not set +# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set +# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS_MAX=15 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_BOOT_ELF32=y -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CEVT_R4K=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="rootfstype=squashfs,jffs2" @@ -48,14 +54,17 @@ CONFIG_FIXED_PHY=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y +# CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y @@ -63,6 +72,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set # CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y @@ -72,6 +82,7 @@ CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y @@ -106,11 +117,13 @@ CONFIG_IRQ_WORK=y CONFIG_KALLSYMS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y CONFIG_MIGRATION=y CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 +CONFIG_MIPS_CBPF_JIT=y CONFIG_MIPS_CLOCK_VSYSCALL=y # CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y @@ -132,6 +145,7 @@ CONFIG_PCI_DRIVERS_LEGACY=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y +# CONFIG_RCU_NEED_SEGCBLIST is not set # CONFIG_RCU_STALL_COMMON is not set # CONFIG_SCHED_INFO is not set # CONFIG_SCSI_DMA is not set @@ -150,5 +164,6 @@ CONFIG_SYS_SUPPORTS_MIPS16=y CONFIG_SYS_SUPPORTS_ZBOOT=y CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TINY_SRCU=y CONFIG_VLYNQ=y # CONFIG_VLYNQ_DEBUG is not set diff --git a/target/linux/ar7/patches-4.9/100-fix-highmem-offset.patch b/target/linux/ar7/patches-4.14/100-fix-highmem-offset.patch similarity index 100% rename from target/linux/ar7/patches-4.9/100-fix-highmem-offset.patch rename to target/linux/ar7/patches-4.14/100-fix-highmem-offset.patch diff --git a/target/linux/ar7/patches-4.9/110-flash.patch b/target/linux/ar7/patches-4.14/110-flash.patch similarity index 85% rename from target/linux/ar7/patches-4.9/110-flash.patch rename to target/linux/ar7/patches-4.14/110-flash.patch index f5713bd033..e83eac9181 100644 --- a/target/linux/ar7/patches-4.9/110-flash.patch +++ b/target/linux/ar7/patches-4.14/110-flash.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile -@@ -12,7 +12,7 @@ obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o +@@ -13,7 +13,7 @@ obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o @@ -11,7 +11,7 @@ obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c -@@ -198,7 +198,7 @@ static struct resource physmap_flash_res +@@ -197,7 +197,7 @@ static struct resource physmap_flash_res .name = "mem", .flags = IORESOURCE_MEM, .start = 0x10000000, diff --git a/target/linux/ar7/patches-4.9/160-vlynq_try_remote_first.patch b/target/linux/ar7/patches-4.14/160-vlynq_try_remote_first.patch similarity index 100% rename from target/linux/ar7/patches-4.9/160-vlynq_try_remote_first.patch rename to target/linux/ar7/patches-4.14/160-vlynq_try_remote_first.patch diff --git a/target/linux/ar7/patches-4.9/200-free-mem-below-kernel-offset.patch b/target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch similarity index 89% rename from target/linux/ar7/patches-4.9/200-free-mem-below-kernel-offset.patch rename to target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch index 4011942d79..7cc3ada818 100644 --- a/target/linux/ar7/patches-4.9/200-free-mem-below-kernel-offset.patch +++ b/target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c -@@ -66,5 +66,11 @@ void __init prom_meminit(void) +@@ -65,5 +65,11 @@ void __init prom_meminit(void) void __init prom_free_prom_memory(void) { diff --git a/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch b/target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch similarity index 96% rename from target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch rename to target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch index 49c2cfbe6a..71cd471a71 100644 --- a/target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch +++ b/target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch @@ -37,7 +37,7 @@ #define AR7_IRQ_UART0 15 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -162,7 +162,7 @@ config AR7 +@@ -168,7 +168,7 @@ config AR7 select HAVE_CLK help Support for the Texas Instruments AR7 System-on-a-Chip @@ -46,7 +46,7 @@ config ATH25 bool "Atheros AR231x/AR531x SoC support" -@@ -1007,6 +1007,7 @@ config MIPS_PARAVIRT +@@ -1016,6 +1016,7 @@ config MIPS_PARAVIRT endchoice source "arch/mips/alchemy/Kconfig" diff --git a/target/linux/ar7/patches-4.9/310-ac49x-prom-support.patch b/target/linux/ar7/patches-4.14/310-ac49x-prom-support.patch similarity index 100% rename from target/linux/ar7/patches-4.9/310-ac49x-prom-support.patch rename to target/linux/ar7/patches-4.14/310-ac49x-prom-support.patch diff --git a/target/linux/ar7/patches-4.9/320-ac49x-mtd-partitions.patch b/target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch similarity index 90% rename from target/linux/ar7/patches-4.9/320-ac49x-mtd-partitions.patch rename to target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch index fafa8c77eb..7ae49b07e8 100644 --- a/target/linux/ar7/patches-4.9/320-ac49x-mtd-partitions.patch +++ b/target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch @@ -14,7 +14,7 @@ ---help--- --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile -@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_SPLIT) += mtdsplit/ +@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_SPLIT) += mtdsplit/ obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o @@ -24,7 +24,7 @@ obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c -@@ -201,7 +201,7 @@ static struct resource physmap_flash_res +@@ -200,7 +200,7 @@ static struct resource physmap_flash_res .end = 0x11ffffff, }; diff --git a/target/linux/ar7/patches-4.9/920-ar7part.patch b/target/linux/ar7/patches-4.14/920-ar7part.patch similarity index 100% rename from target/linux/ar7/patches-4.9/920-ar7part.patch rename to target/linux/ar7/patches-4.14/920-ar7part.patch diff --git a/target/linux/ar7/patches-4.9/925-actiontec_leds.patch b/target/linux/ar7/patches-4.14/925-actiontec_leds.patch similarity index 90% rename from target/linux/ar7/patches-4.9/925-actiontec_leds.patch rename to target/linux/ar7/patches-4.14/925-actiontec_leds.patch index 804dbf5c3c..d37fa70f21 100644 --- a/target/linux/ar7/patches-4.9/925-actiontec_leds.patch +++ b/target/linux/ar7/patches-4.14/925-actiontec_leds.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c -@@ -460,31 +460,22 @@ static struct gpio_led fb_fon_leds[] = { +@@ -459,31 +459,22 @@ static struct gpio_led fb_fon_leds[] = { }, }; @@ -35,7 +35,7 @@ .default_trigger = "default-on", }, { -@@ -492,6 +483,44 @@ static struct gpio_led gt701_leds[] = { +@@ -491,6 +482,44 @@ static struct gpio_led gt701_leds[] = { .gpio = 10, .active_low = 1, }, @@ -80,7 +80,7 @@ }; static struct gpio_led_platform_data ar7_led_data; -@@ -535,9 +564,9 @@ static void __init detect_leds(void) +@@ -534,9 +563,9 @@ static void __init detect_leds(void) } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) { ar7_led_data.num_leds = ARRAY_SIZE(titan_leds); ar7_led_data.leds = titan_leds; diff --git a/target/linux/ar7/patches-4.9/950-cpmac_titan.patch b/target/linux/ar7/patches-4.14/950-cpmac_titan.patch similarity index 86% rename from target/linux/ar7/patches-4.9/950-cpmac_titan.patch rename to target/linux/ar7/patches-4.14/950-cpmac_titan.patch index 158b689c98..66ed07970c 100644 --- a/target/linux/ar7/patches-4.9/950-cpmac_titan.patch +++ b/target/linux/ar7/patches-4.14/950-cpmac_titan.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c -@@ -1124,6 +1124,8 @@ static int cpmac_probe(struct platform_d +@@ -1123,6 +1123,8 @@ static int cpmac_probe(struct platform_d goto fail; } @@ -9,7 +9,7 @@ dev->irq = platform_get_irq_byname(pdev, "irq"); dev->netdev_ops = &cpmac_netdev_ops; -@@ -1203,7 +1205,7 @@ int cpmac_init(void) +@@ -1202,7 +1204,7 @@ int cpmac_init(void) cpmac_mii->write = cpmac_mdio_write; cpmac_mii->reset = cpmac_mdio_reset; @@ -18,7 +18,7 @@ if (!cpmac_mii->priv) { pr_err("Can't ioremap mdio registers\n"); -@@ -1214,10 +1216,16 @@ int cpmac_init(void) +@@ -1213,10 +1215,16 @@ int cpmac_init(void) /* FIXME: unhardcode gpio&reset bits */ ar7_gpio_disable(26); ar7_gpio_disable(27); @@ -37,7 +37,7 @@ cpmac_mii->reset(cpmac_mii); for (i = 0; i < 300; i++) { -@@ -1234,7 +1242,11 @@ int cpmac_init(void) +@@ -1233,7 +1241,11 @@ int cpmac_init(void) mask = 0; } diff --git a/target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch b/target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch deleted file mode 100644 index 74ac0d1482..0000000000 --- a/target/linux/ar7/patches-4.9/101-MIPS-AR7-allow-NULL-clock-for-clk_get_rate.patch +++ /dev/null @@ -1,45 +0,0 @@ -From patchwork Tue Jul 18 10:17:26 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [5/9] MIPS: AR7: allow NULL clock for clk_get_rate -X-Patchwork-Submitter: Jonas Gorski -X-Patchwork-Id: 16775 -Message-Id: <20170718101730.2541-6-jonas.gorski@gmail.com> -To: unlisted-recipients:; (no To-header on input) -Cc: Ralf Baechle , - Paul Gortmaker , - James Hogan , - linux-mips@linux-mips.org, linux-kernel@vger.kernel.org -Date: Tue, 18 Jul 2017 12:17:26 +0200 -From: Jonas Gorski -List-Id: linux-mips - -Make the behaviour of clk_get_rate consistent with common clk's -clk_get_rate by accepting NULL clocks as parameter. Some device -drivers rely on this, and will cause an OOPS otherwise. - -Fixes: 780019ddf02f ("MIPS: AR7: Implement clock API") -Cc: Ralf Baechle -Cc: Paul Gortmaker -Cc: James Hogan -Cc: linux-mips@linux-mips.org -Cc: linux-kernel@vger.kernel.org -Reported-by: Mathias Kresin -Signed-off-by: Jonas Gorski ---- - arch/mips/ar7/clock.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/arch/mips/ar7/clock.c -+++ b/arch/mips/ar7/clock.c -@@ -430,6 +430,9 @@ EXPORT_SYMBOL(clk_disable); - - unsigned long clk_get_rate(struct clk *clk) - { -+ if (!clk) -+ return 0; -+ - return clk->rate; - } - EXPORT_SYMBOL(clk_get_rate); From 0a85fcc627098f078b997e9b8b74d1839710bc49 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 May 2019 13:51:07 +0200 Subject: [PATCH 267/480] orion: refresh kernel configuration The configuration of the generic subtarget was used as the default configuration and then the subtarget configurations were adapted. Signed-off-by: Hauke Mehrtens --- target/linux/orion/config-4.9 | 40 +++++++++++++------ .../patches-4.9/210-wn802t_support.patch | 23 ++++++----- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/target/linux/orion/config-4.9 b/target/linux/orion/config-4.9 index 56ae5ee98a..b596274f17 100644 --- a/target/linux/orion/config-4.9 +++ b/target/linux/orion/config-4.9 @@ -1,17 +1,20 @@ CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -# CONFIG_ARCH_HAS_SG_CHAIN is not set +CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_CPU_AUTO=y # CONFIG_ARCH_MULTI_V4 is not set # CONFIG_ARCH_MULTI_V4T is not set +CONFIG_ARCH_MULTI_V4_V5=y +CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_ORION5X=y # CONFIG_ARCH_ORION5X_DT is not set -CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y @@ -23,15 +26,21 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARM=y # CONFIG_ARM_CPU_SUSPEND is not set +CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_THUMB is not set CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y +CONFIG_BLK_MQ_PCI=y # CONFIG_CACHE_L2X0 is not set +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y +CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 earlyprintk" CONFIG_CMDLINE_FORCE=y @@ -58,12 +67,14 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" CONFIG_DEBUG_LL_UART_8250=y -CONFIG_DEBUG_UART_8250=y +# CONFIG_DEBUG_MVEBU_UART0_ALTERNATE is not set +# CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set CONFIG_DEBUG_UART_8250_SHIFT=2 # CONFIG_DEBUG_UART_8250_WORD is not set CONFIG_DEBUG_UART_PHYS=0xf1012000 CONFIG_DEBUG_UART_VIRT=0xfe012000 +CONFIG_DEBUG_UNCOMPRESS=y # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y @@ -81,6 +92,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y @@ -92,7 +104,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y CONFIG_GPIO_MVEBU=y CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y @@ -109,7 +120,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -117,7 +128,6 @@ CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y @@ -126,7 +136,6 @@ CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y @@ -179,6 +188,8 @@ CONFIG_MACH_WN802T=y CONFIG_MACH_WNR854T=y CONFIG_MACH_WRT350N_V2=y CONFIG_MDIO_BOARDINFO=y +CONFIG_MIGHT_HAVE_PCI=y +CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_MVSDIO=y # CONFIG_MMC_TIFM_SD is not set @@ -203,7 +214,6 @@ CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y -CONFIG_OF_MTD=y CONFIG_OF_NET=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y @@ -213,7 +223,8 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_ORION_WATCHDOG=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PCI=y -# CONFIG_PCI_DOMAINS_GENERIC is not set +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y @@ -222,18 +233,24 @@ CONFIG_PLAT_ORION_LEGACY=y CONFIG_RATIONAL=y # CONFIG_RCU_EXPERT is not set # CONFIG_RCU_STALL_COMMON is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y CONFIG_RTC_CLASS=y +CONFIG_RTC_I2C_AND_SPI=y +CONFIG_RTC_MC146818_LIB=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SCHED_INFO is not set # CONFIG_SCSI_DMA is not set CONFIG_SERIAL_8250_FSL=y +CONFIG_SPARSE_IRQ=y CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_SRAM=y CONFIG_SRCU=y CONFIG_SWIOTLB=y +CONFIG_SWPHY=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VECTORS_BASE=0xffff0000 @@ -243,4 +260,3 @@ CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/orion/patches-4.9/210-wn802t_support.patch b/target/linux/orion/patches-4.9/210-wn802t_support.patch index a274beedc3..fc4a226e97 100644 --- a/target/linux/orion/patches-4.9/210-wn802t_support.patch +++ b/target/linux/orion/patches-4.9/210-wn802t_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -159,10 +159,13 @@ config MACH_MSS2_DT +@@ -156,10 +156,13 @@ config MACH_MSS2_DT Maxtor Shared Storage II platform. config MACH_WNR854T @@ -55,10 +55,15 @@ pci_common_init(&wnr854t_pci); return 0; -@@ -187,3 +199,15 @@ MACHINE_START(WNR854T, "Netgear WNR854T" - .fixup = tag_fixup_mem32, - .restart = orion5x_restart, - MACHINE_END +@@ -182,6 +194,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" + .init_machine = wnr854t_init, + .map_io = orion5x_map_io, + .init_early = orion5x_init_early, ++ .init_irq = orion5x_init_irq, ++ .init_time = orion5x_timer_init, ++ .fixup = tag_fixup_mem32, ++ .restart = orion5x_restart, ++MACHINE_END + +MACHINE_START(WN802T, "Netgear WN802T") + /* Maintainer: Imre Kaloz */ @@ -66,8 +71,6 @@ + .init_machine = wnr854t_init, + .map_io = orion5x_map_io, + .init_early = orion5x_init_early, -+ .init_irq = orion5x_init_irq, -+ .init_time = orion5x_timer_init, -+ .fixup = tag_fixup_mem32, -+ .restart = orion5x_restart, -+MACHINE_END + .init_irq = orion5x_init_irq, + .init_time = orion5x_timer_init, + .fixup = tag_fixup_mem32, From 2a0e0dec02accb77163d8251e1be4fdaa538d8e9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 May 2019 13:51:08 +0200 Subject: [PATCH 268/480] orion: update kernel to version 4.14 This adds support for kernel 4.14 to the target and directly make it the default kernel version to use. This patch is build-tested only, but has never been device-tested. It is only added to preserve the changes in Git history prior to removing this target. Use it with care. Signed-off-by: Hauke Mehrtens [rebased and extended commit message, refreshed patches for 4.14.162] Signed-off-by: Adrian Schmutzler --- target/linux/orion/Makefile | 2 +- .../linux/orion/{config-4.9 => config-4.14} | 28 +++++++++++++------ target/linux/orion/harddisk/config-default | 10 +++++-- .../000-arm_openwrt_machtypes.patch | 18 ++++++++++++ .../100-wrt350nv2_openwrt_partition_map.patch | 0 .../101-wnr854t_partition_map.patch | 0 .../200-dt2_board_support.patch | 13 +++------ .../210-wn802t_support.patch | 22 ++++++--------- .../000-arm_openwrt_machtypes.patch | 8 ------ 9 files changed, 59 insertions(+), 42 deletions(-) rename target/linux/orion/{config-4.9 => config-4.14} (92%) create mode 100644 target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch rename target/linux/orion/{patches-4.9 => patches-4.14}/100-wrt350nv2_openwrt_partition_map.patch (100%) rename target/linux/orion/{patches-4.9 => patches-4.14}/101-wnr854t_partition_map.patch (100%) rename target/linux/orion/{patches-4.9 => patches-4.14}/200-dt2_board_support.patch (98%) rename target/linux/orion/{patches-4.9 => patches-4.14}/210-wn802t_support.patch (72%) delete mode 100644 target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index 994c37ea6a..170f0ddb40 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -13,7 +13,7 @@ FEATURES:=broken rtc SUBTARGETS:=generic harddisk MAINTAINER:=Imre Kaloz -KERNEL_PATCHVER:=4.9 +KERNEL_PATCHVER:=4.14 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/config-4.9 b/target/linux/orion/config-4.14 similarity index 92% rename from target/linux/orion/config-4.9 rename to target/linux/orion/config-4.14 index b596274f17..63a6700642 100644 --- a/target/linux/orion/config-4.9 +++ b/target/linux/orion/config-4.14 @@ -1,8 +1,12 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -13,6 +17,8 @@ CONFIG_ARCH_MULTI_CPU_AUTO=y CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set CONFIG_ARCH_ORION5X=y # CONFIG_ARCH_ORION5X_DT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set @@ -35,12 +41,8 @@ CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_BLK_MQ_PCI=y # CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 earlyprintk" CONFIG_CMDLINE_FORCE=y @@ -55,6 +57,7 @@ CONFIG_CPU_FEROCEON=y CONFIG_CPU_FEROCEON_OLD_ID=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_FEROCEON=y CONFIG_CPU_USE_DOMAINS=y CONFIG_CRYPTO_DES=y @@ -92,6 +95,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y @@ -106,6 +110,7 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y CONFIG_GPIO_MVEBU=y CONFIG_GPIO_SYSFS=y +# CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y @@ -120,7 +125,6 @@ CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -130,6 +134,8 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y @@ -155,6 +161,7 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y +# CONFIG_INITRAMFS_FORCE is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IOMMU_HELPER=y CONFIG_IRQCHIP=y @@ -168,7 +175,6 @@ CONFIG_LIBFDT=y # CONFIG_MACH_DNS323 is not set # CONFIG_MACH_DT2 is not set # CONFIG_MACH_KUROBOX_PRO is not set -# CONFIG_MACH_LINKSTATION_LSCHL is not set # CONFIG_MACH_LINKSTATION_LS_HGL is not set # CONFIG_MACH_LINKSTATION_MINI is not set # CONFIG_MACH_LINKSTATION_PRO is not set @@ -187,7 +193,8 @@ CONFIG_MACH_TERASTATION_PRO2=y CONFIG_MACH_WN802T=y CONFIG_MACH_WNR854T=y CONFIG_MACH_WRT350N_V2=y -CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y CONFIG_MMC=y @@ -199,7 +206,6 @@ CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MV643XX_ETH=y CONFIG_MVEBU_MBUS=y CONFIG_MVMDIO=y -# CONFIG_MVNETA is not set CONFIG_MV_XOR=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_KUSER_HELPERS=y @@ -232,9 +238,11 @@ CONFIG_PLAT_ORION=y CONFIG_PLAT_ORION_LEGACY=y CONFIG_RATIONAL=y # CONFIG_RCU_EXPERT is not set +# CONFIG_RCU_NEED_SEGCBLIST is not set # CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_MMIO=y CONFIG_RTC_CLASS=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTC_MC146818_LIB=y @@ -245,11 +253,15 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SPARSE_IRQ=y CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_SRAM=y +CONFIG_SRAM_EXEC=y CONFIG_SRCU=y CONFIG_SWIOTLB=y CONFIG_SWPHY=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_TINY_SRCU=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y diff --git a/target/linux/orion/harddisk/config-default b/target/linux/orion/harddisk/config-default index bf6cee1715..c25cb6265d 100644 --- a/target/linux/orion/harddisk/config-default +++ b/target/linux/orion/harddisk/config-default @@ -1,15 +1,20 @@ CONFIG_ATA=y CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_MD=y CONFIG_BLK_DEV_SD=y +CONFIG_BLK_SCSI_REQUEST=y CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_DAX=y # CONFIG_DM_CRYPT is not set # CONFIG_DM_MIRROR is not set # CONFIG_DM_SNAPSHOT is not set CONFIG_EXT4_FS=y CONFIG_FS_MBCACHE=y +CONFIG_GENERIC_PHY=y +CONFIG_GLOB=y CONFIG_HWMON=y -CONFIG_I2C_BOARDINFO=y CONFIG_JBD2=y CONFIG_MACH_DT2=y CONFIG_MACH_NET2BIG=y @@ -25,14 +30,13 @@ CONFIG_MD_RAID1=y # CONFIG_MD_RAID10 is not set # CONFIG_MD_RAID456 is not set CONFIG_NLS=y -CONFIG_RTC_CLASS=y CONFIG_SATA_MV=y CONFIG_SCSI=y CONFIG_SCSI_DMA=y +CONFIG_SG_POOL=y CONFIG_USB=y CONFIG_USB_COMMON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_ORION=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y -# CONFIG_USB_UHCI_HCD is not set diff --git a/target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch b/target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch new file mode 100644 index 0000000000..5d52bd0afa --- /dev/null +++ b/target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch @@ -0,0 +1,18 @@ +--- a/arch/arm/tools/mach-types ++++ b/arch/arm/tools/mach-types +@@ -268,6 +268,7 @@ yl9200 MACH_YL9200 YL9200 1507 + rd88f5182 MACH_RD88F5182 RD88F5182 1508 + kurobox_pro MACH_KUROBOX_PRO KUROBOX_PRO 1509 + mx31_3ds MACH_MX31_3DS MX31_3DS 1511 ++dt2 MACH_DT2 DT2 1514 + qong MACH_QONG QONG 1524 + omap2evm MACH_OMAP2EVM OMAP2EVM 1534 + omap3evm MACH_OMAP3EVM OMAP3EVM 1535 +@@ -530,6 +531,7 @@ mx53_loco MACH_MX53_LOCO MX53_LOCO 32 + wario MACH_WARIO WARIO 3288 + cm_t3730 MACH_CM_T3730 CM_T3730 3290 + hrefv60 MACH_HREFV60 HREFV60 3293 ++wn802t MACH_WN802T WN802T 3306 + armlex4210 MACH_ARMLEX4210 ARMLEX4210 3361 + snowball MACH_SNOWBALL SNOWBALL 3363 + xilinx_ep107 MACH_XILINX_EP107 XILINX_EP107 3378 diff --git a/target/linux/orion/patches-4.9/100-wrt350nv2_openwrt_partition_map.patch b/target/linux/orion/patches-4.14/100-wrt350nv2_openwrt_partition_map.patch similarity index 100% rename from target/linux/orion/patches-4.9/100-wrt350nv2_openwrt_partition_map.patch rename to target/linux/orion/patches-4.14/100-wrt350nv2_openwrt_partition_map.patch diff --git a/target/linux/orion/patches-4.9/101-wnr854t_partition_map.patch b/target/linux/orion/patches-4.14/101-wnr854t_partition_map.patch similarity index 100% rename from target/linux/orion/patches-4.9/101-wnr854t_partition_map.patch rename to target/linux/orion/patches-4.14/101-wnr854t_partition_map.patch diff --git a/target/linux/orion/patches-4.9/200-dt2_board_support.patch b/target/linux/orion/patches-4.14/200-dt2_board_support.patch similarity index 98% rename from target/linux/orion/patches-4.9/200-dt2_board_support.patch rename to target/linux/orion/patches-4.14/200-dt2_board_support.patch index 5528069cd5..fcadabcd17 100644 --- a/target/linux/orion/patches-4.9/200-dt2_board_support.patch +++ b/target/linux/orion/patches-4.14/200-dt2_board_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -48,6 +48,13 @@ config MACH_RD88F5182_DT +@@ -49,6 +49,13 @@ config MACH_RD88F5182_DT Say 'Y' here if you want your kernel to support the Marvell Orion-NAS (88F5182) RD2, Flattened Device Tree. @@ -16,7 +16,7 @@ select I2C_BOARDINFO if I2C --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile -@@ -15,6 +15,7 @@ obj-$(CONFIG_MACH_TS78XX) += ts78xx-setu +@@ -16,6 +16,7 @@ obj-$(CONFIG_MACH_TS78XX) += ts78xx-setu obj-$(CONFIG_MACH_MV2120) += mv2120-setup.o obj-$(CONFIG_MACH_NET2BIG) += net2big-setup.o obj-$(CONFIG_MACH_WNR854T) += wnr854t-setup.o @@ -111,7 +111,7 @@ +#endif --- /dev/null +++ b/arch/arm/mach-orion5x/dt2-setup.c -@@ -0,0 +1,448 @@ +@@ -0,0 +1,443 @@ +/* + * arch/arm/mach-orion5x/dt2-setup.c + * @@ -330,11 +330,6 @@ + .port_names[5] = "lan4", +}; + -+static struct dsa_platform_data dt2_switch_plat_data = { -+ .nr_chips = 1, -+ .chip = &dt2_switch_chip_data, -+}; -+ +/***************************************************************************** + * RTC ISL1208 on I2C bus + ****************************************************************************/ @@ -436,7 +431,7 @@ + + orion5x_eth_init(&dt2_eth_data); + memcpy(dt2_eth_data.mac_addr, dt2_eeprom.gw.mac_addr[0], 6); -+ orion5x_eth_switch_init(&dt2_switch_plat_data); ++ orion5x_eth_switch_init(&dt2_switch_chip_data); + + i2c_register_board_info(0, &dt2_i2c_rtc, 1); + diff --git a/target/linux/orion/patches-4.9/210-wn802t_support.patch b/target/linux/orion/patches-4.14/210-wn802t_support.patch similarity index 72% rename from target/linux/orion/patches-4.9/210-wn802t_support.patch rename to target/linux/orion/patches-4.14/210-wn802t_support.patch index fc4a226e97..2a3393f283 100644 --- a/target/linux/orion/patches-4.9/210-wn802t_support.patch +++ b/target/linux/orion/patches-4.14/210-wn802t_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -156,10 +156,13 @@ config MACH_MSS2_DT +@@ -150,10 +150,13 @@ config MACH_MSS2_DT Maxtor Shared Storage II platform. config MACH_WNR854T @@ -18,8 +18,8 @@ bool "Marvell Orion-VoIP GE Reference Design" --- a/arch/arm/mach-orion5x/wnr854t-setup.c +++ b/arch/arm/mach-orion5x/wnr854t-setup.c -@@ -115,6 +115,15 @@ static struct dsa_platform_data __initda - .chip = &wnr854t_switch_chip_data, +@@ -110,6 +110,11 @@ static struct dsa_chip_data wnr854t_swit + .port_names[7] = "lan2", }; +static struct dsa_chip_data wn802t_switch_chip_data = { @@ -27,26 +27,22 @@ + .port_names[3] = "cpu", +}; + -+static struct dsa_platform_data wn802t_switch_plat_data = { -+ .nr_chips = 1, -+ .chip = &wn802t_switch_chip_data, -+}; static void __init wnr854t_init(void) { /* -@@ -128,7 +137,10 @@ static void __init wnr854t_init(void) +@@ -123,7 +128,10 @@ static void __init wnr854t_init(void) * Configure peripherals. */ orion5x_eth_init(&wnr854t_eth_data); -- orion5x_eth_switch_init(&wnr854t_switch_plat_data); +- orion5x_eth_switch_init(&wnr854t_switch_chip_data); + if (machine_is_wn802t()) -+ orion5x_eth_switch_init(&wn802t_switch_plat_data); ++ orion5x_eth_switch_init(&wn802t_switch_chip_data); + else -+ orion5x_eth_switch_init(&wnr854t_switch_plat_data); ++ orion5x_eth_switch_init(&wnr854t_switch_chip_data); orion5x_uart0_init(); mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET, -@@ -168,7 +180,7 @@ static struct hw_pci wnr854t_pci __initd +@@ -163,7 +171,7 @@ static struct hw_pci wnr854t_pci __initd static int __init wnr854t_pci_init(void) { @@ -55,7 +51,7 @@ pci_common_init(&wnr854t_pci); return 0; -@@ -182,6 +194,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" +@@ -177,6 +185,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" .init_machine = wnr854t_init, .map_io = orion5x_map_io, .init_early = orion5x_init_early, diff --git a/target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch b/target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch deleted file mode 100644 index 764f992288..0000000000 --- a/target/linux/orion/patches-4.9/000-arm_openwrt_machtypes.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/arch/arm/tools/mach-types -+++ b/arch/arm/tools/mach-types -@@ -1006,3 +1006,5 @@ eco5_bx2 MACH_ECO5_BX2 ECO5_BX2 4572 - eukrea_cpuimx28sd MACH_EUKREA_CPUIMX28SD EUKREA_CPUIMX28SD 4573 - domotab MACH_DOMOTAB DOMOTAB 4574 - pfla03 MACH_PFLA03 PFLA03 4575 -+dt2 MACH_DT2 DT2 1514 -+wn802t MACH_WN802T WN802T 3306 From 4bc92c1e7526ee48e04c25ec4b468e7527e18b6e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 13:49:38 +0100 Subject: [PATCH 269/480] ar7: remove unmaintained target This target seems to have been unmaintained for quite a while, and not a single tester for the (now outdated) kernel 4.14 patches has been found. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Adrian Schmutzler --- package/kernel/acx-mac80211/Makefile | 2 +- package/kernel/ar7-atm/Config.in | 22 - package/kernel/ar7-atm/Makefile | 100 - .../090-no-date-time.patch | 11 - .../patches-D7.04.03.00/100-compile_fix.patch | 768 ---- .../110-interrupt_fix.patch | 37 - .../120-no_dumb_inline.patch | 11 - .../130-powercutback.patch | 44 - .../patches-D7.04.03.00/140-debug_mode.patch | 16 - .../150-tasklet_mode.patch | 11 - .../160-module-params.patch | 589 ---- .../170-bus_id_removal.patch | 19 - .../180-git_headers_include.patch | 39 - .../190-2.6.32_proc_fixes.patch | 92 - .../patches-D7.04.03.00/200-2.6.37_args.patch | 32 - .../210-3.3-remove-smp_lock.h.patch | 33 - .../220-3.10-update_proc_code.patch | 2945 ---------------- .../230-compile_fixes.patch | 44 - .../patches-D7.04.03.00/240-3.18_fixes.patch | 38 - .../patches-D7.04.03.00/250-4.1_fixes.patch | 20 - .../260-fix_function_signatures.patch | 63 - .../patches-D7.04.03.00/270-4.14_fixes.patch | 51 - .../090-no-date-time.patch | 11 - .../patches-D7.05.01.00/100-compile_fix.patch | 808 ----- .../110-interrupt_fix.patch | 37 - .../120-no_dumb_inline.patch | 11 - .../130-powercutback.patch | 44 - .../patches-D7.05.01.00/140-debug_mode.patch | 16 - .../150-tasklet_mode.patch | 11 - .../160-module-params.patch | 675 ---- .../170-bus_id_removal.patch | 19 - .../180-git_headers_include.patch | 39 - .../190-2.6.32_proc_fixes.patch | 92 - .../patches-D7.05.01.00/200-2.6.37_args.patch | 32 - .../210-3.3-remove-smp_lock.h.patch | 33 - .../220-3.10-update_proc_code.patch | 3082 ----------------- .../patches-D7.05.01.00/240-3.18_fixes.patch | 38 - .../patches-D7.05.01.00/250-4.1_fixes.patch | 20 - .../260-fix_function_signatures.patch | 63 - target/linux/ar7/Makefile | 25 - target/linux/ar7/ac49x/config-default | 4 - target/linux/ar7/ac49x/profiles/210-None.mk | 17 - target/linux/ar7/ac49x/target.mk | 10 - target/linux/ar7/base-files.mk | 11 - .../ar7/base-files/etc/board.d/02_network | 28 - target/linux/ar7/base-files/etc/diag.sh | 32 - target/linux/ar7/base-files/etc/init.d/adam2 | 13 - target/linux/ar7/config-4.14 | 169 - .../linux/ar7/files/drivers/mtd/ac49xpart.c | 221 -- .../linux/ar7/files/drivers/mtd/titanpart.c | 234 -- target/linux/ar7/generic/config-default | 5 - .../linux/ar7/generic/profiles/100-Annex-A.mk | 18 - .../linux/ar7/generic/profiles/110-Annex-B.mk | 18 - .../linux/ar7/generic/profiles/200-Texas.mk | 18 - target/linux/ar7/generic/profiles/210-None.mk | 17 - target/linux/ar7/generic/target.mk | 12 - target/linux/ar7/image/Makefile | 137 - .../patches-4.14/100-fix-highmem-offset.patch | 11 - target/linux/ar7/patches-4.14/110-flash.patch | 22 - .../160-vlynq_try_remote_first.patch | 300 -- .../200-free-mem-below-kernel-offset.patch | 15 - .../patches-4.14/300-add-ac49x-platform.patch | 85 - .../patches-4.14/310-ac49x-prom-support.patch | 20 - .../320-ac49x-mtd-partitions.patch | 35 - .../linux/ar7/patches-4.14/920-ar7part.patch | 120 - .../ar7/patches-4.14/925-actiontec_leds.patch | 95 - .../ar7/patches-4.14/950-cpmac_titan.patch | 52 - target/linux/ar7/src/adam2patcher.c | 59 - 68 files changed, 1 insertion(+), 11820 deletions(-) delete mode 100644 package/kernel/ar7-atm/Config.in delete mode 100644 package/kernel/ar7-atm/Makefile delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/090-no-date-time.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/130-powercutback.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/160-module-params.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/220-3.10-update_proc_code.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/240-3.18_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/250-4.1_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/260-fix_function_signatures.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/090-no-date-time.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/130-powercutback.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/160-module-params.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/220-3.10-update_proc_code.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch delete mode 100644 package/kernel/ar7-atm/patches-D7.05.01.00/260-fix_function_signatures.patch delete mode 100644 target/linux/ar7/Makefile delete mode 100644 target/linux/ar7/ac49x/config-default delete mode 100644 target/linux/ar7/ac49x/profiles/210-None.mk delete mode 100644 target/linux/ar7/ac49x/target.mk delete mode 100644 target/linux/ar7/base-files.mk delete mode 100755 target/linux/ar7/base-files/etc/board.d/02_network delete mode 100644 target/linux/ar7/base-files/etc/diag.sh delete mode 100755 target/linux/ar7/base-files/etc/init.d/adam2 delete mode 100644 target/linux/ar7/config-4.14 delete mode 100644 target/linux/ar7/files/drivers/mtd/ac49xpart.c delete mode 100644 target/linux/ar7/files/drivers/mtd/titanpart.c delete mode 100644 target/linux/ar7/generic/config-default delete mode 100644 target/linux/ar7/generic/profiles/100-Annex-A.mk delete mode 100644 target/linux/ar7/generic/profiles/110-Annex-B.mk delete mode 100644 target/linux/ar7/generic/profiles/200-Texas.mk delete mode 100644 target/linux/ar7/generic/profiles/210-None.mk delete mode 100644 target/linux/ar7/generic/target.mk delete mode 100644 target/linux/ar7/image/Makefile delete mode 100644 target/linux/ar7/patches-4.14/100-fix-highmem-offset.patch delete mode 100644 target/linux/ar7/patches-4.14/110-flash.patch delete mode 100644 target/linux/ar7/patches-4.14/160-vlynq_try_remote_first.patch delete mode 100644 target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch delete mode 100644 target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch delete mode 100644 target/linux/ar7/patches-4.14/310-ac49x-prom-support.patch delete mode 100644 target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch delete mode 100644 target/linux/ar7/patches-4.14/920-ar7part.patch delete mode 100644 target/linux/ar7/patches-4.14/925-actiontec_leds.patch delete mode 100644 target/linux/ar7/patches-4.14/950-cpmac_titan.patch delete mode 100644 target/linux/ar7/src/adam2patcher.c diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile index 52c8914947..195802f5f5 100644 --- a/package/kernel/acx-mac80211/Makefile +++ b/package/kernel/acx-mac80211/Makefile @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX1xx mac80211 driver - DEPENDS:=@(PCI_SUPPORT||TARGET_ar7) @mipsel +kmod-mac80211 + DEPENDS:=@PCI_SUPPORT @mipsel +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko AUTOLOAD:=$(call AutoProbe,acx-mac80211) MENU:=1 diff --git a/package/kernel/ar7-atm/Config.in b/package/kernel/ar7-atm/Config.in deleted file mode 100644 index 479b7ad072..0000000000 --- a/package/kernel/ar7-atm/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -menu "Configuration" - depends on (PACKAGE_kmod-sangam-atm-annex-a || PACKAGE_kmod-sangam-atm-annex-b) - -choice - prompt "Firmware version" - default AR7_ATM_FW_VERSION_704 - help - This option allows you to switch between firmware/driver versions which - might improve the DSL line speed. - -config AR7_ATM_FW_VERSION_705 - bool "D7.05.01.00" - -config AR7_ATM_FW_VERSION_704 - bool "D7.04.03.00" - -config AR7_ATM_FW_VERSION_703 - bool "D7.03.01.00" - -endchoice - -endmenu diff --git a/package/kernel/ar7-atm/Makefile b/package/kernel/ar7-atm/Makefile deleted file mode 100644 index 88ffb52c65..0000000000 --- a/package/kernel/ar7-atm/Makefile +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (C) 2006-2014 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:=sangam_atm - -ifeq ($(CONFIG_AR7_ATM_FW_VERSION_705),y) -PKG_VERSION:=D7.05.01.00 -PKG_HASH:=874b5baff92159e99cef0dfb839d6fdc124a46aef7374653064d29d9eee9a3c9 -PKG_RELEASE:=R1 -PATCH_DIR:=patches-$(PKG_VERSION) -endif - -ifeq ($(CONFIG_AR7_ATM_FW_VERSION_704),y) -PKG_VERSION:=D7.04.03.00 -PKG_HASH:=af2e203e4c86f9a86cdd07d172897b07e66a25379376e8da4c1b14816f86b58f -PKG_RELEASE:=R1 -PATCH_DIR:=patches-$(PKG_VERSION) -endif - -ifeq ($(CONFIG_AR7_ATM_FW_VERSION_703),y) -PKG_VERSION:=D7.03.01.00 -PKG_HASH:=2d156164ef5abbe10ffb2400ada4cef2035df3ba2b3f866f00bdede489861c4d -PKG_RELEASE:=R2 -PATCH_DIR:=patches-D7.04.03.00 -endif - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.bz2 -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources - -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/sangam-atm/Default - SUBMENU:=Network Devices - DEPENDS:=@TARGET_ar7_generic +kmod-atm - TITLE:=AR7 ADSL driver - FILES:=$(PKG_BUILD_DIR)/tiatm.ko - AUTOLOAD:=$(call AutoLoad,50,tiatm) - MENU:=1 -endef - -define KernelPackage/sangam-atm/config - source "$(SOURCE)/Config.in" -endef - -define KernelPackage/sangam-atm-annex-a -$(call KernelPackage/sangam-atm/Default) - TITLE+= (Annex A, ADSL over POTS) -endef - -define KernelPackage/sangam-atm-annex-a/description - The AR7 ADSL driver for Annex A (ADSL over POTS). -endef - -define KernelPackage/sangam-atm-annex-a/config -$(call KernelPackage/sangam-atm/config) -endef - -define KernelPackage/sangam-atm-annex-b -$(call KernelPackage/sangam-atm/Default) - TITLE+= (Annex B, ADSL over ISDN) -endef - -define KernelPackage/sangam-atm-annex-b/description - The AR7 ADSL driver for Annex B (ADSL over ISDN). -endef - -define KernelPackage/sangam-atm-annex-a/config -$(call KernelPackage/sangam-atm/config) -endef - -define Build/Compile - $(MAKE) -C "$(LINUX_DIR)" \ - $(KERNEL_MAKE_FLAGS) \ - SUBDIRS="$(PKG_BUILD_DIR)" \ - modules -endef - -define KernelPackage/sangam-atm-annex-a/install - mkdir -p $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/ar0700mp.bin $(1)/lib/firmware/ - $(LN) ar0700mp.bin $(1)/lib/firmware/ar0700xx.bin -endef - -define KernelPackage/sangam-atm-annex-b/install - mkdir -p $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/ar0700db.bin $(1)/lib/firmware/ - $(LN) ar0700db.bin $(1)/lib/firmware/ar0700xx.bin -endef - -$(eval $(call KernelPackage,sangam-atm-annex-a)) -$(eval $(call KernelPackage,sangam-atm-annex-b)) diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/090-no-date-time.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/090-no-date-time.patch deleted file mode 100644 index 9b3abf006b..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/090-no-date-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/aal5sar.h -+++ b/aal5sar.h -@@ -19,7 +19,7 @@ - /** \namespace AAL5_Version - This documents version 01.07.2c of the AAL5 CPHAL. - */ --const char *pszVersion_CPAAL5="CPAAL5 01.07.2c "__DATE__" "__TIME__; -+const char *pszVersion_CPAAL5="CPAAL5 01.07.2c "; - - #include "cpsar_cpaal5.h" - diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch deleted file mode 100644 index df5fe53967..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch +++ /dev/null @@ -1,768 +0,0 @@ ---- a/cppi_cpaal5.c -+++ b/cppi_cpaal5.c -@@ -352,7 +352,7 @@ static int halRxReturn(HAL_RECEIVEINFO * - { - /* malloc failed, add this RCB to Needs Buffer List */ - TempRcb->FragCount = 1; /*MJH+030417*/ -- (HAL_RCB *)TempRcb->Eop = TempRcb; /* GSG +030430 */ -+ TempRcb->Eop = TempRcb; /* GSG +030430 */ - - if(HalDev->NeedsCount < MAX_NEEDS) /* +MJH 030410 */ - { /* +MJH 030410 */ ---- a/dsl_hal_api.c -+++ b/dsl_hal_api.c -@@ -254,15 +254,15 @@ - * of phyEnableDisableWord & phyControlWord to avoid changing API struct - * which may cause change required to application data structure. - ******************************************************************************/ --#include --#include --#include -+#include "dev_host_interface.h" -+#include "dsl_hal_register.h" -+#include "dsl_hal_support.h" - - #ifndef NO_ADV_STATS --#include -+#include "dsl_hal_logtable.h" - #endif - --#include -+#include "dsl_hal_version.h" - - // UR8_MERGE_START CQ11054 Jack Zhang - static unsigned int highprecision_selected = 0; //By default we use low precision for backward compt. ---- a/dsl_hal_support.c -+++ b/dsl_hal_support.c -@@ -140,9 +140,9 @@ - * oamFeature are overriden - // UR8_MERGE_END CQ10774 Ram - *******************************************************************************/ --#include --#include --#include -+#include "dev_host_interface.h" -+#include "dsl_hal_register.h" -+#include "dsl_hal_support.h" - - #define NUM_READ_RETRIES 3 - static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits); ---- a/dsl_hal_support.h -+++ b/dsl_hal_support.h -@@ -49,7 +49,7 @@ - * 04Nov05 0.11.00 CPH Fixed T1413 mode got Zero DS/US rate when DSL_BIT_TMODE is set. - *******************************************************************************/ - --#include -+#include "dsl_hal_api.h" - - #define virtual2Physical(a) (((int)a)&~0xe0000000) - /* External Function Prototype Declarations */ ---- a/Makefile -+++ b/Makefile -@@ -1,18 +1,9 @@ --# File: drivers/atm/ti_evm3/Makefile - # --# Makefile for the Texas Instruments EVM3 ADSL/ATM driver. -+# Makefile for the TIATM device driver. - # --# --# Copyright (c) 2000 Texas Instruments Incorporated. --# Jeff Harrell (jharrell@telogy.com) --# Viren Balar (vbalar@ti.com) --# Victor Wells (vwells@telogy.com) --# --include $(TOPDIR)/Rules.make -- -- -- -- -- -- - -+CONFIG_SANGAM_ATM=m -+#EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT -+EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL -+obj-$(CONFIG_SANGAM_ATM) := tiatm.o -+tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -61,7 +61,6 @@ - * UR8_MERGE_END CQ11057* - *********************************************************************************************/ - --#include - #include - #include - #include -@@ -69,11 +68,14 @@ - #include - #include - #include --#include --#include - #include - #include - #include -+ -+#include -+#include -+#include -+ - #include "dsl_hal_api.h" - #include "tn7atm.h" - #include "tn7api.h" -@@ -82,6 +84,7 @@ - #include "dsl_hal_register.h" - - #ifdef MODULE -+MODULE_LICENSE("GPL"); - MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver"); - MODULE_AUTHOR ("Zhicheng Tang"); - #endif -@@ -100,9 +103,9 @@ MODULE_AUTHOR ("Zhicheng Tang"); - - /*end of externs */ - --#ifndef TI_STATIC_ALLOCATIONS --#define TI_STATIC_ALLOCATIONS --#endif -+//#ifndef TI_STATIC_ALLOCATIONS -+//#define TI_STATIC_ALLOCATIONS -+//#endif - - #define tn7atm_kfree_skb(x) dev_kfree_skb(x) - -@@ -114,7 +117,7 @@ static int EnableQoS = FALSE; - /* prototypes */ - static int tn7atm_set_can_support_adsl2 (int can); - --static int tn7atm_open (struct atm_vcc *vcc, short vpi, int vci); -+static int tn7atm_open (struct atm_vcc *vcc); - - static void tn7atm_close (struct atm_vcc *vcc); - -@@ -257,13 +260,12 @@ static const struct atmdev_ops tn7atm_op - getsockopt: NULL, - setsockopt: NULL, - send: tn7atm_send, -- sg_send: NULL, - phy_put: NULL, - phy_get: NULL, - change_qos: tn7atm_change_qos, - }; - --const char drv_proc_root_folder[] = "avalanche/"; -+const char drv_proc_root_folder[] = "avalanche"; - static struct proc_dir_entry *root_proc_dir_entry = NULL; - #define DRV_PROC_MODE 0644 - static int proc_root_already_exists = TRUE; -@@ -559,56 +561,6 @@ static int turbodsl_check_priority_type( - - /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * -- * Function: int tn7atm_walk_vccs(struct atm_dev *dev, short *vcc, int *vci) -- * -- * Description: retrieve VPI/VCI for connection -- * -- *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ --static int tn7atm_walk_vccs (struct atm_vcc *vcc, short *vpi, int *vci) --{ -- struct atm_vcc *walk; -- -- /* -- * find a free VPI -- */ -- if (*vpi == ATM_VPI_ANY) -- { -- -- for (*vpi = 0, walk = vcc->dev->vccs; walk; walk = walk->next) -- { -- -- if ((walk->vci == *vci) && (walk->vpi == *vpi)) -- { -- (*vpi)++; -- walk = vcc->dev->vccs; -- } -- } -- } -- -- /* -- * find a free VCI -- */ -- if (*vci == ATM_VCI_ANY) -- { -- -- for (*vci = ATM_NOT_RSV_VCI, walk = vcc->dev->vccs; walk; -- walk = walk->next) -- { -- -- if ((walk->vpi = *vpi) && (walk->vci == *vci)) -- { -- *vci = walk->vci + 1; -- walk = vcc->dev->vccs; -- } -- } -- } -- -- return 0; --} -- -- --/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- * - * Function: int tn7atm_sar_irq(void) - * - * Description: tnetd73xx SAR interrupt. -@@ -693,7 +645,7 @@ static int __init tn7atm_irq_request (st - * Register SAR interrupt - */ - priv->sar_irq = LNXINTNUM (ATM_SAR_INT); /* Interrupt line # */ -- if (request_irq (priv->sar_irq, tn7atm_sar_irq, SA_INTERRUPT, "SAR ", dev)) -+ if (request_irq (priv->sar_irq, tn7atm_sar_irq, IRQF_DISABLED, "SAR ", dev)) - printk ("Could not register tn7atm_sar_irq\n"); - - /* -@@ -704,14 +656,14 @@ static int __init tn7atm_irq_request (st - { - def_sar_inter_pace = os_atoi (ptr); - } -- avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, -- def_sar_inter_pace); -+/* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, -+ def_sar_inter_pace);*/ - - /* - * Reigster Receive interrupt A - */ - priv->dsl_irq = LNXINTNUM (ATM_DSL_INT); /* Interrupt line # */ -- if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, SA_INTERRUPT, "DSL ", dev)) -+ if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, IRQF_DISABLED, "DSL ", dev)) - printk ("Could not register tn7atm_dsl_irq\n"); - - /***** VRB Tasklet Mode ****/ -@@ -875,11 +827,15 @@ static int __init tn7atm_get_ESI (struct - #define ATM_VBR_RT 5 - #endif - --int tn7atm_open (struct atm_vcc *vcc, short vpi, int vci) -+int tn7atm_open (struct atm_vcc *vcc) - { - tn7atm_activate_vc_parm_t tn7atm_activate_vc_parm; - int rc; - //int flags; -+ tn7atm_activate_vc_parm.pcr = 0x20000; -+ tn7atm_activate_vc_parm.scr = 0x20000; -+ tn7atm_activate_vc_parm.mbs = 0x20000; -+ tn7atm_activate_vc_parm.cdvt = 10000; - - dgprintf(1, "tn7atm_open()\n"); - -@@ -891,24 +847,18 @@ int tn7atm_open (struct atm_vcc *vcc, sh - return -1; - } - -- MOD_INC_USE_COUNT; -+// MOD_INC_USE_COUNT; - -- /* find a free VPI/VCI */ -- tn7atm_walk_vccs(vcc, &vpi, &vci); -- -- vcc->vpi = vpi; -- vcc->vci = vci; -- -- if ((vci == ATM_VCI_UNSPEC) || (vpi == ATM_VCI_UNSPEC)) -+ if ((vcc->vci == ATM_VCI_UNSPEC) || (vcc->vpi == ATM_VCI_UNSPEC)) - { -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - return -EBUSY; - } - -- tn7atm_activate_vc_parm.vpi = vpi; -- tn7atm_activate_vc_parm.vci = vci; -+ tn7atm_activate_vc_parm.vpi = vcc->vpi; -+ tn7atm_activate_vc_parm.vci = vcc->vci; - -- if ((vpi == CLEAR_EOC_VPI) && (vci == CLEAR_EOC_VCI)) -+ if ((vcc->vpi == CLEAR_EOC_VPI) && (vcc->vci == CLEAR_EOC_VCI)) - { - /* always use (max_dma_chan+1) for clear eoc */ - tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN; -@@ -916,7 +866,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - /* check to see whether clear eoc is opened or not */ - if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse) - { -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan); - return -EBUSY; - } -@@ -925,7 +875,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - if (rc) - { - printk("tn7atm_open: failed to setup clear_eoc\n"); -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - return -EBUSY; - } - tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan); -@@ -934,17 +884,17 @@ int tn7atm_open (struct atm_vcc *vcc, sh - } - else /* PVC channel setup */ - { -- if ((vpi==REMOTE_MGMT_VPI) && (vci==REMOTE_MGMT_VCI)) -+ if ((vcc->vpi==REMOTE_MGMT_VPI) && (vcc->vci==REMOTE_MGMT_VCI)) - { - tn7atm_activate_vc_parm.chan = 14; /* always use chan 14 for MII PVC-base romote mgmt */ - } - else - { -- rc = tn7atm_lut_find(vpi, vci); -+ rc = tn7atm_lut_find(vcc->vpi, vcc->vci); - /* check to see whether PVC is opened or not */ - if(ATM_NO_DMA_CHAN != rc) - { -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - printk("PVC already opened. dmachan = %d\n", rc); - return -EBUSY; - } -@@ -976,6 +926,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - tn7atm_activate_vc_parm.priority = 2; - break; - -+#if 0 - case ATM_VBR: /* Variable Bit Rate-Non RealTime*/ - tn7atm_activate_vc_parm.qos = 1; - tn7atm_activate_vc_parm.priority = 1; -@@ -997,6 +948,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - tn7atm_activate_vc_parm.mbs = vcc->qos.txtp.max_pcr; - tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv; - break; -+#endif - - default: - tn7atm_activate_vc_parm.qos = 2; -@@ -1024,7 +976,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - if (rc < 0) - { - printk("failed to activate hw channel\n"); -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan); - //spin_unlock_irqrestore(&chan_init_lock, flags); - return -EBUSY; -@@ -1114,7 +1066,7 @@ void tn7atm_close (struct atm_vcc *vcc) - tn7atm_lut_clear (vcc, dmachan); - //spin_unlock_irqrestore (&closeLock, closeFlag); - -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - - dgprintf (1, "Leave tn7atm_close\n"); - } -@@ -1528,8 +1480,7 @@ int tn7atm_receive (void *os_dev, int ch - * firewall is on */ - - dgprintf (3, "pushing the skb...\n"); -- -- skb->stamp = vcc->timestamp = xtime; -+ __net_timestamp(skb); - - xdump ((unsigned char *) skb->data, skb->len, 5); - -@@ -1725,8 +1676,7 @@ static void tn7atm_exit (void) - - kfree (dev->dev_data); - -- // atm_dev_deregister (dev); -- shutdown_atm_dev (dev); -+ atm_dev_deregister (dev); - - /* - * remove proc entries -@@ -1885,9 +1835,6 @@ static int __init tn7atm_detect (void) - /* - * Set up proc entry for atm stats - */ -- if (tn7atm_xlate_proc_name -- (drv_proc_root_folder, &root_proc_dir_entry, &residual)) -- { - printk ("Creating new root folder %s in the proc for the driver stats \n", - drv_proc_root_folder); - root_proc_dir_entry = proc_mkdir (drv_proc_root_folder, NULL); -@@ -1897,7 +1844,6 @@ static int __init tn7atm_detect (void) - return -ENOMEM; - } - proc_root_already_exists = FALSE; -- } - - /* - * AV: Clean-up. Moved all the definitions to the data structure. -@@ -2479,7 +2425,5 @@ static int tn7atm_proc_qos_write(struct - return count; - } - --#ifdef MODULE - module_init (tn7atm_detect); - module_exit (tn7atm_exit); --#endif /* MODULE */ ---- a/tn7atm.h -+++ b/tn7atm.h -@@ -19,7 +19,8 @@ - //#include "mips_support.h" - #include - --#include -+#define MIPS_EXCEPTION_OFFSET 8 -+#define LNXINTNUM(x)((x) + MIPS_EXCEPTION_OFFSET) - - #ifdef CONFIG_MODVERSIONS - #include ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -94,7 +94,6 @@ - * 1/02/07 JZ CQ11054: Data Precision and Range Changes for TR-069 Conformance - * UR8_MERGE_END CQ11054* - *********************************************************************************************/ --#include - #include - #include - #include -@@ -102,8 +101,6 @@ - #include - #include - #include --#include --#include - #include - #include - #include -@@ -111,6 +108,12 @@ - #include - #include - #include -+#include -+ -+#include -+#include -+#include -+ - /* Modules specific header files */ - #include "tn7atm.h" - #include "tn7api.h" -@@ -173,7 +176,7 @@ led_reg_t ledreg[2]; - static struct led_funcs ledreg[2]; - #endif - --#define DEV_DSLMOD 1 -+#define DEV_DSLMOD CTL_UNNUMBERED - #define MAX_STR_SIZE 256 - #define DSL_MOD_SIZE 256 - -@@ -299,7 +302,7 @@ static PITIDSLHW_T pIhw; - static volatile int bshutdown; - static char info[MAX_STR_SIZE]; - /* Used for DSL Polling enable */ --static DECLARE_MUTEX_LOCKED (adsl_sem_overlay); -+static struct semaphore adsl_sem_overlay; - - //kthread_t overlay_thread; - /* end of module wide declars */ -@@ -323,6 +326,14 @@ static int tn7dsl_proc_snr_print (char * - #define gDot1(a) ((a>0)?(a%10):((-a)%10)) - // UR8_MERGE_END CQ11054* - -+int avalanche_request_intr_pacing(int irq_nr, unsigned int blk_num, -+ unsigned int pace_value) -+{ -+ printk("avalanche_request_pacing(%d, %u, %u); // not implemented\n", irq_nr, blk_num, pace_value); -+ return 0; -+} -+ -+ - int os_atoi(const char *pStr) - { - int MulNeg = (*pStr == '-' ? -1 : 1); -@@ -359,39 +370,6 @@ void dprintf (int uDbgLevel, char *szFmt - #endif - } - --int strcmp(const char *s1, const char *s2) --{ -- -- int size = strlen(s1); -- -- return(strncmp(s1, s2, size)); --} -- --int strncmp(const char *s1, const char *s2, size_t size) --{ -- int i = 0; -- int max_size = (int)size; -- -- while((s1[i] != 0) && i < max_size) -- { -- if(s2[i] == 0) -- { -- return -1; -- } -- if(s1[i] != s2[i]) -- { -- return 1; -- } -- i++; -- } -- if(s2[i] != 0) -- { -- return 1; -- } -- -- return 0; --} -- - // * UR8_MERGE_START CQ10640 Jack Zhang - int tn7dsl_dump_dsp_memory(char *input_str) //cph99 - { -@@ -441,101 +419,74 @@ unsigned int shim_osGetCpuFrequency(void - return CpuFrequency; - } - --int shim_osLoadFWImage(unsigned char *ptr) -+static void avsar_release(struct device *dev) - { -- unsigned int bytesRead; -- mm_segment_t oldfs; -- static struct file *filp; -- unsigned int imageLength=0x5ffff; -- -- -- dgprintf(4, "tn7dsl_read_dsp()\n"); -- -- dgprintf(4,"open file %s\n", DSP_FIRMWARE_PATH); -- -- filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY); -- if(filp ==NULL) -- { -- printk("Failed: Could not open DSP binary file\n"); -- return -1; -- } -- -- if (filp->f_dentry != NULL) -- { -- if (filp->f_dentry->d_inode != NULL) -- { -- printk ("DSP binary filesize = %d bytes\n", -- (int) filp->f_dentry->d_inode->i_size); -- imageLength = (unsigned int)filp->f_dentry->d_inode->i_size + 0x200; -- } -- } -- -- if (filp->f_op->read==NULL) -- return -1; /* File(system) doesn't allow reads */ -- -- /* -- * Disable parameter checking -- */ -- oldfs = get_fs(); -- set_fs(KERNEL_DS); -- -- /* -- * Now read bytes from postion "StartPos" -- */ -- filp->f_pos = 0; -- -- bytesRead = filp->f_op->read(filp,ptr,imageLength,&filp->f_pos); -- -- dgprintf(4,"file length = %d\n", bytesRead); -- -- set_fs(oldfs); -- -- /* -- * Close the file -- */ -- fput(filp); -- -- return bytesRead; -+ printk(KERN_DEBUG "avsar firmware released\n"); - } - -+static struct device avsar = { -+ .bus_id = "vlynq", -+ .release = avsar_release, -+}; - --unsigned int shim_read_overlay_page (void *ptr, unsigned int secOffset, -- unsigned int secLength) -+int shim_osLoadFWImage(unsigned char *ptr) - { -- unsigned int bytesRead; -- mm_segment_t oldfs; -- struct file *filp; -- -- dgprintf(4,"shim_read_overlay_page\n"); -- //dgprintf(4,"sec offset=%d, sec length =%d\n", secOffset, secLength); -+ const struct firmware *fw_entry; -+ size_t size; - -- filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY); -- if(filp ==NULL) -- { -- printk("Failed: Could not open DSP binary file\n"); -- return -1; -- } -- -- if (filp->f_op->read==NULL) -- return -1; /* File(system) doesn't allow reads */ -- -- /* -- * Now read bytes from postion "StartPos" -- */ -- -- if(filp->f_op->llseek) -- filp->f_op->llseek(filp,secOffset, 0); -- oldfs = get_fs(); -- set_fs(KERNEL_DS); -- filp->f_pos = secOffset; -- bytesRead = filp->f_op->read(filp,ptr,secLength,&filp->f_pos); -- -- set_fs(oldfs); -- /* -- * Close the file -- */ -- fput(filp); -- return bytesRead; -+ printk("requesting firmware image \"ar0700xx.bin\"\n"); -+ if(device_register(&avsar) < 0) { -+ printk(KERN_ERR -+ "avsar: device_register fails\n"); -+ return -1; -+ } -+ -+ if(request_firmware(&fw_entry, "ar0700xx.bin", &avsar)) { -+ printk(KERN_ERR -+ "avsar: Firmware not available\n"); -+ device_unregister(&avsar); -+ return -1; -+ } -+ size = fw_entry->size; -+ device_unregister(&avsar); -+ if(size > 0x5ffff) { -+ printk(KERN_ERR -+ "avsar: Firmware too big (%d bytes)\n", size); -+ release_firmware(fw_entry); -+ return -1; -+ } -+ memcpy(ptr, fw_entry->data, size); -+ release_firmware(fw_entry); -+ return size; -+} -+ -+unsigned int shim_read_overlay_page(void *ptr, unsigned int secOffset, unsigned int secLength) -+{ -+ const struct firmware *fw_entry; -+ -+ printk("requesting firmware image \"ar0700xx.bin\"\n"); -+ if(device_register(&avsar) < 0) { -+ printk(KERN_ERR -+ "avsar: device_register fails\n"); -+ return -1; -+ } -+ -+ if(request_firmware(&fw_entry, "ar0700xx.bin", &avsar)) { -+ printk(KERN_ERR -+ "avsar: Firmware not available\n"); -+ device_unregister(&avsar); -+ return -1; -+ } -+ device_unregister(&avsar); -+ if(fw_entry->size > secLength) { -+ printk(KERN_ERR -+ "avsar: Firmware too big (%d bytes)\n", fw_entry->size); -+ release_firmware(fw_entry); -+ return -1; -+ } -+ memcpy(ptr + secOffset, fw_entry->data, secLength); -+ release_firmware(fw_entry); -+ return secLength; - } - - int shim_osLoadDebugFWImage(unsigned char *ptr) -@@ -3064,6 +3015,7 @@ int tn7dsl_init(void *priv) - int high_precision_selected = 0; - // UR8_MERGE_END CQ11054* - -+ sema_init(&adsl_sem_overlay, 0); - /* - * start dsl - */ -@@ -3442,7 +3394,7 @@ static int dslmod_sysctl(ctl_table *ctl, - */ - if(write) - { -- ret = proc_dostring(ctl, write, filp, buffer, lenp); -+ ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - - switch (ctl->ctl_name) - { -@@ -3528,14 +3480,14 @@ static int dslmod_sysctl(ctl_table *ctl, - else - { - len += sprintf(info+len, mod_req); -- ret = proc_dostring(ctl, write, filp, buffer, lenp); -+ ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - } - return ret; - } - - - ctl_table dslmod_table[] = { -- {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, &dslmod_sysctl} -+ {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string} - , - {0} - }; -@@ -3558,8 +3510,7 @@ void tn7dsl_dslmod_sysctl_register(void) - if (initialized == 1) - return; - -- dslmod_sysctl_header = register_sysctl_table(dslmod_root_table, 1); -- dslmod_root_table->child->de->owner = THIS_MODULE; -+ dslmod_sysctl_header = register_sysctl_table(dslmod_root_table); - - /* - * set the defaults -@@ -4821,4 +4772,4 @@ int tn7dsl_proc_PMDus(char* buf, char ** - } - #endif //NO_ADV_STATS - #endif //TR69_PMD_IN --// * UR8_MERGE_END CQ11057 * -\ No newline at end of file -+// * UR8_MERGE_END CQ11057 * ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -42,7 +42,6 @@ - * UR8_MERGE_END CQ10700 - *******************************************************************************/ - --#include - #include - #include - #include -@@ -50,12 +49,13 @@ - #include - #include - #include --#include --#include - #include - #include - #include - -+#include -+#include -+#include - - #define _CPHAL_AAL5 - #define _CPHAL_SAR diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch deleted file mode 100644 index 9acb862e5d..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -566,7 +566,7 @@ static int turbodsl_check_priority_type( - * Description: tnetd73xx SAR interrupt. - * - *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ --static void tn7atm_sar_irq (int irq, void *voiddev, struct pt_regs *regs) -+static irqreturn_t tn7atm_sar_irq (int irq, void *voiddev) - { - struct atm_dev *atmdev; - Tn7AtmPrivate *priv; -@@ -593,6 +593,7 @@ static void tn7atm_sar_irq (int irq, voi - #ifdef TIATM_INST_SUPP - psp_trace_par (ATM_DRV_SAR_ISR_EXIT, retval); - #endif -+ return IRQ_HANDLED; - } - - /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@@ -602,7 +603,7 @@ static void tn7atm_sar_irq (int irq, voi - * Description: tnetd73xx DSL interrupt. - * - *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ --static void tn7atm_dsl_irq (int irq, void *voiddev, struct pt_regs *regs) -+static irqreturn_t tn7atm_dsl_irq (int irq, void *voiddev) - { - struct atm_dev *atmdev; - Tn7AtmPrivate *priv; -@@ -624,6 +625,8 @@ static void tn7atm_dsl_irq (int irq, voi - #ifdef TIATM_INST_SUPP - psp_trace_par (ATM_DRV_DSL_ISR_EXIT, retval); - #endif -+ -+ return IRQ_HANDLED; - } - - /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch deleted file mode 100644 index 2968fdc166..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tn7api.h -+++ b/tn7api.h -@@ -107,7 +107,7 @@ int tn7dsl_proc_dbg_rmsgs4(char* buf, ch - - int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data); - int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count,int *eof, void *data); --inline int tn7dsl_handle_interrupt(void); -+int tn7dsl_handle_interrupt(void); - - void tn7dsl_dslmod_sysctl_register(void); - void tn7dsl_dslmod_sysctl_unregister(void); diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/130-powercutback.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/130-powercutback.patch deleted file mode 100644 index ec00df97ab..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/130-powercutback.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/dsl_hal_advcfg.c -+++ b/dsl_hal_advcfg.c -@@ -36,9 +36,9 @@ - * 05Jul05 0.00.09 CPH CQ9775: Change dslhal_advcfg_configDsTones input parameters & support for ADSL2+ - * 24Jul05 0.00.10 CPH Fixed comments in dslhal_advcfg_configDsTones function header - *******************************************************************************/ --#include --#include --#include -+#include "dev_host_interface.h" -+#include "dsl_hal_register.h" -+#include "dsl_hal_support.h" - - /*****************************************************************************/ - /* ACT API functions -- To be moved into their own independent module --RamP */ ---- a/Makefile -+++ b/Makefile -@@ -4,6 +4,7 @@ - - CONFIG_SANGAM_ATM=m - #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT --EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL -+#EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL -+EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL - obj-$(CONFIG_SANGAM_ATM) := tiatm.o --tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o -+tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -2869,6 +2869,14 @@ static int tn7dsl_set_dsl(void) - dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr)); - } - -+ // set powercutback -+ ptr = NULL; -+ ptr = prom_getenv("powercutback"); -+ if(ptr) -+ { -+ dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr)); -+ } -+ - // trellis - ptr = NULL; - ptr = prom_getenv("trellis"); diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch deleted file mode 100644 index ce3697b10d..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -103,10 +103,10 @@ enum - - #define RESERVED_OAM_CHANNEL 15 - --#define AAL5_PARM "id=aal5, base = 0x03000000, offset = 0, int_line=15, ch0=[RxBufSize=1522; RxNumBuffers = 32; RxServiceMax = 50; TxServiceMax=50; TxNumBuffers=32; CpcsUU=0x5aa5; TxVc_CellRate=0x3000; TxVc_AtmHeader=0x00000640]" --#define SAR_PARM "id=sar,base = 0x03000000, reset_bit = 9, offset = 0; UniNni = 0, PdspEnable = 1" -+#define CH0_PARM "RxBufSize=1522, RxNumBuffers=32, RxServiceMax=50, TxServiceMax=50, TxNumBuffers=32, CpcsUU=0x5aa5, TxVc_CellRate=0x3000, TxVc_AtmHeader=0x00000640" -+#define AAL5_PARM "id=aal5, base=0x03000000, offset=0, int_line=15, ch0=[" CH0_PARM "]" -+#define SAR_PARM "id=sar, base=0x03000000, reset_bit=9, offset=0; UniNni=0, PdspEnable=1, Debug=0xFFFFFFFF" - #define RESET_PARM "id=ResetControl, base=0xA8611600" --#define CH0_PARM "RxBufSize=1522, RxNumBuffers = 32, RxServiceMax = 50, TxServiceMax=50, TxNumBuffers=32, CpcsUU=0x5aa5, TxVc_CellRate=0x3000, TxVc_AtmHeader=0x00000640" - - #define MAX_PVC_TABLE_ENTRY 16 - diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch deleted file mode 100644 index 97b8cecdd9..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -5,6 +5,7 @@ - CONFIG_SANGAM_ATM=m - #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT - #EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL --EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -+#EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -+EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -DCPATM_TASKLET_MODE - obj-$(CONFIG_SANGAM_ATM) := tiatm.o - tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/160-module-params.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/160-module-params.patch deleted file mode 100644 index c3d07a9def..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/160-module-params.patch +++ /dev/null @@ -1,589 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -87,6 +87,146 @@ - MODULE_LICENSE("GPL"); - MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver"); - MODULE_AUTHOR ("Zhicheng Tang"); -+ -+int mp_sar_ipacemax = -1; -+module_param_named(ipacemax, mp_sar_ipacemax, int, 0); -+MODULE_PARM_DESC(ipacemax, "Interrupt pacing"); -+ -+char *mp_macc = NULL; -+module_param_named(macc, mp_macc, charp, 0); -+MODULE_PARM_DESC(macc, "MAC address"); -+ -+int mp_dsp_noboost = -1; -+module_param_named(dsp_noboost, mp_dsp_noboost, int, 0); -+MODULE_PARM_DESC(dsp_noboost, "Suppress DSP frequency boost"); -+ -+int mp_dsp_freq = -1; -+module_param_named(dsp_freq, mp_dsp_freq, int, 0); -+MODULE_PARM_DESC(dsp_freq, "Frequency to boost the DSP to"); -+ -+char *mp_featctl0 = NULL; -+module_param_named(featctl0, mp_featctl0, charp, 0); -+MODULE_PARM_DESC(featctl0, "DSL feature control 0"); -+ -+char *mp_featctl1 = NULL; -+module_param_named(featctl1, mp_featctl1, charp, 0); -+MODULE_PARM_DESC(featctl1, "DSL feature control 1"); -+ -+char *mp_phyctl0 = NULL; -+module_param_named(phyctl0, mp_phyctl0, charp, 0); -+MODULE_PARM_DESC(phyctl0, "DSL PHY control 0"); -+ -+char *mp_phyctl1 = NULL; -+module_param_named(phyctl1, mp_phyctl1, charp, 0); -+MODULE_PARM_DESC(phyctl1, "DSL PHY control 1"); -+ -+int mp_turbodsl = -1; -+module_param_named(turbodsl, mp_turbodsl, int, 0); -+MODULE_PARM_DESC(turbodsl, "Enable TurboDSL"); -+ -+int mp_sar_rxbuf = -1; -+module_param_named(sar_rxbuf, mp_sar_rxbuf, int, 0); -+MODULE_PARM_DESC(sar_rxbuf, "SAR RxBuf size"); -+ -+int mp_sar_rxmax = -1; -+module_param_named(sar_rxmax, mp_sar_rxmax, int, 0); -+MODULE_PARM_DESC(sar_rxmax, "SAR RxMax size"); -+ -+int mp_sar_txbuf = -1; -+module_param_named(sar_txbuf, mp_sar_txbuf, int, 0); -+MODULE_PARM_DESC(sar_txbuf, "SAR TxBuf size"); -+ -+int mp_sar_txmax = -1; -+module_param_named(sar_txmax, mp_sar_txmax, int, 0); -+MODULE_PARM_DESC(sar_txmax, "SAR TxMax size"); -+ -+char *mp_modulation = NULL; -+module_param_named(modulation, mp_modulation, charp, 0); -+MODULE_PARM_DESC(modulation, "Modulation"); -+ -+int mp_fine_gain_control = -1; -+module_param_named(fine_gain_control, mp_fine_gain_control, int, 0); -+MODULE_PARM_DESC(fine_gain_control, "Fine gain control"); -+ -+int mp_fine_gain_value = -1; -+module_param_named(fine_gain_value, mp_fine_gain_value, int, 0); -+MODULE_PARM_DESC(fine_gain_value, "Fine gain value"); -+ -+int mp_enable_margin_retrain = -1; -+module_param_named(enable_margin_retrain, mp_enable_margin_retrain, int, 0); -+MODULE_PARM_DESC(enable_margin_retrain, "Enable margin retrain"); -+ -+int mp_margin_threshold = -1; -+module_param_named(margin_threshold, mp_margin_threshold, int, 0); -+MODULE_PARM_DESC(margin_threshold, "Margin retrain treshold"); -+ -+int mp_enable_rate_adapt = -1; -+module_param_named(enable_rate_adapt, mp_enable_rate_adapt, int, 0); -+MODULE_PARM_DESC(enable_rate_adapt, "Enable rate adaption"); -+ -+int mp_powercutback = -1; -+module_param_named(powercutback, mp_powercutback, int, 0); -+MODULE_PARM_DESC(powercutback, "Enable / disable powercutback"); -+ -+int mp_trellis = -1; -+module_param_named(trellis, mp_trellis, int, 0); -+MODULE_PARM_DESC(trellis, "Enable / disable trellis coding"); -+ -+int mp_bitswap = -1; -+module_param_named(bitswap, mp_bitswap, int, 0); -+MODULE_PARM_DESC(bitswap, "Enable / disable bitswap"); -+ -+int mp_maximum_bits_per_carrier = -1; -+module_param_named(maximum_bits_per_carrier, mp_maximum_bits_per_carrier, int, 0); -+MODULE_PARM_DESC(maximum_bits_per_carrier, "Maximum bits per carrier"); -+ -+int mp_maximum_interleave_depth = -1; -+module_param_named(maximum_interleave_depth, mp_maximum_interleave_depth, int, 0); -+MODULE_PARM_DESC(maximum_interleave_depth, "Maximum interleave depth"); -+ -+int mp_pair_selection = -1; -+module_param_named(pair_selection, mp_pair_selection, int, 0); -+MODULE_PARM_DESC(pair_selection, "Pair selection"); -+ -+int mp_dgas_polarity = -1; -+module_param_named(dgas_polarity, mp_dgas_polarity, int, 0); -+MODULE_PARM_DESC(dgas_polarity, "DGAS polarity"); -+ -+int mp_los_alarm = -1; -+module_param_named(los_alarm, mp_los_alarm, int, 0); -+MODULE_PARM_DESC(los_alarm, "LOS alarm"); -+ -+char *mp_eoc_vendor_id = NULL; -+module_param_named(eoc_vendor_id, mp_eoc_vendor_id, charp, 0); -+MODULE_PARM_DESC(eoc_vendor_id, "EOC vendor id"); -+ -+int mp_eoc_vendor_revision = -1; -+module_param_named(eoc_vendor_revision, mp_eoc_vendor_revision, int, 0); -+MODULE_PARM_DESC(eoc_vendor_revision, "EOC vendor revision"); -+ -+char *mp_eoc_vendor_serialnum = NULL; -+module_param_named(eoc_vendor_serialnum, mp_eoc_vendor_serialnum, charp, 0); -+MODULE_PARM_DESC(eoc_vendor_serialnum, "EOC vendor serial number"); -+ -+char *mp_invntry_vernum = NULL; -+module_param_named(invntry_vernum, mp_invntry_vernum, charp, 0); -+MODULE_PARM_DESC(invntry_vernum, "Inventory revision number"); -+ -+int mp_dsl_bit_tmode = -1; -+module_param_named(dsl_bit_tmode, mp_dsl_bit_tmode, int, 0); -+MODULE_PARM_DESC(dsl_bit_tmode, "DSL bit training mode"); -+ -+int mp_high_precision = -1; -+module_param_named(high_precision, mp_high_precision, int, 0); -+MODULE_PARM_DESC(high_precision, "High precision"); -+ -+int mp_autopvc_enable = -1; -+module_param_named(autopvc_enable, mp_autopvc_enable, int, 0); -+MODULE_PARM_DESC(autopvc_enable, "Enable / disable automatic PVC"); -+ -+int mp_oam_lb_timeout = -1; -+module_param_named(oam_lb_timeout, mp_oam_lb_timeout, int, 0); -+MODULE_PARM_DESC(oam_lb_timeout, "OAM LB timeout"); - #endif - - #ifndef TRUE -@@ -655,9 +795,9 @@ static int __init tn7atm_irq_request (st - * interrupt pacing - */ - ptr = prom_getenv ("sar_ipacemax"); -- if (ptr) -+ if (ptr || mp_sar_ipacemax != -1) - { -- def_sar_inter_pace = os_atoi (ptr); -+ def_sar_inter_pace = mp_sar_ipacemax == -1 ? os_atoi (ptr) : mp_sar_ipacemax; - } - /* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, - def_sar_inter_pace);*/ -@@ -795,9 +935,18 @@ static int __init tn7atm_get_ESI (struct - { - int i; - char esi_addr[ESI_LEN] = { 0x00, 0x00, 0x11, 0x22, 0x33, 0x44 }; -- char *esiaddr_str = NULL; -+ char *esiaddr_str = mp_macc; - -- esiaddr_str = prom_getenv ("maca"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("macdsl"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("macc"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("HWA_1"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("macb"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("maca"); - - if (!esiaddr_str) - { -@@ -1930,15 +2079,15 @@ static int tn7atm_autoDetectDspBoost (vo - //UR8_MERGE_END CQ10450* - - cp = prom_getenv ("dsp_noboost"); -- if (cp) -+ if (cp || mp_dsp_noboost != -1) - { -- dsp_noboost = os_atoi (cp); -+ dsp_noboost = mp_dsp_noboost == -1 ? os_atoi (cp) : mp_dsp_noboost; - } - - cp = (char *) prom_getenv ("dsp_freq"); -- if (cp) -+ if (cp || mp_dsp_freq != -1) - { -- dspfreq = os_atoi (cp); -+ dspfreq = mp_dsp_freq == -1 ? os_atoi (cp) : mp_dsp_freq; - if (dspfreq == 250) - { - boostDsp = 1; -@@ -2187,8 +2336,9 @@ static int __init tn7atm_init (struct at - // Inter-Op DSL phy Control - // Note the setting of _dsl_Feature_0 and _dsl_Feature_1 must before - // dslhal_api_dslStartup (in tn7dsl_init()). -- if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL) -+ if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL || mp_featctl0 != NULL) - { -+ if (mp_featctl0 != NULL) ptr = mp_featctl0; - if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to - // os_atoh - ptr += 2; -@@ -2196,8 +2346,9 @@ static int __init tn7atm_init (struct at - _dsl_Feature_0_defined = 1; - } - -- if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL) -+ if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL || mp_featctl1 != NULL) - { -+ if (mp_featctl1 != NULL) ptr = mp_featctl1; - if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to - // os_atoh - ptr += 2; -@@ -2209,8 +2360,9 @@ static int __init tn7atm_init (struct at - // DSL phy Feature Control - // Note the setting of _dsl_PhyControl_0 and _dsl_PhyControl_1 must before - // dslhal_api_dslStartup (in tn7dsl_init()). -- if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL) -+ if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL || mp_phyctl0 != NULL) - { -+ if (mp_phyctl0 != NULL) ptr = mp_phyctl0; - if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to - // os_atoh - ptr += 2; -@@ -2218,8 +2370,9 @@ static int __init tn7atm_init (struct at - _dsl_PhyControl_0_defined = 1; - } - -- if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL) -+ if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL || mp_phyctl1 != NULL) - { -+ if (mp_phyctl1 != NULL) ptr = mp_phyctl1; - if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to - // os_atoh - ptr += 2; -@@ -2247,9 +2400,9 @@ static int __init tn7atm_init (struct at - priv->bTurboDsl = 1; - // read config for turbo dsl - ptr = prom_getenv ("TurboDSL"); -- if (ptr) -+ if (ptr || mp_turbodsl != -1) - { -- priv->bTurboDsl = os_atoi (ptr); -+ priv->bTurboDsl = mp_turbodsl == -1 ? os_atoi (ptr) : mp_turbodsl; - } - - // @Added to make Rx buffer number & Service max configurable through -@@ -2257,30 +2410,30 @@ static int __init tn7atm_init (struct at - priv->sarRxBuf = RX_BUFFER_NUM; - ptr = NULL; - ptr = prom_getenv ("SarRxBuf"); -- if (ptr) -+ if (ptr || mp_sar_rxbuf != -1) - { -- priv->sarRxBuf = os_atoi (ptr); -+ priv->sarRxBuf = mp_sar_rxbuf == -1 ? os_atoi (ptr) : mp_sar_rxbuf; - } - priv->sarRxMax = RX_SERVICE_MAX; - ptr = NULL; - ptr = prom_getenv ("SarRxMax"); -- if (ptr) -+ if (ptr || mp_sar_rxmax != -1) - { -- priv->sarRxMax = os_atoi (ptr); -+ priv->sarRxMax = mp_sar_rxmax == -1 ? os_atoi (ptr) : mp_sar_rxmax; - } - priv->sarTxBuf = TX_BUFFER_NUM; - ptr = NULL; - ptr = prom_getenv ("SarTxBuf"); -- if (ptr) -+ if (ptr || mp_sar_txbuf != -1) - { -- priv->sarTxBuf = os_atoi (ptr); -+ priv->sarTxBuf = mp_sar_txbuf == -1 ? os_atoi (ptr) : mp_sar_txbuf; - } - priv->sarTxMax = TX_SERVICE_MAX; - ptr = NULL; - ptr = prom_getenv ("SarTxMax"); -- if (ptr) -+ if (ptr || mp_sar_txmax != -1) - { -- priv->sarTxMax = os_atoi (ptr); -+ priv->sarTxMax = mp_sar_txmax == -1 ? os_atoi (ptr) : mp_sar_txmax; - } - - return 0; ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -136,6 +136,27 @@ - #define NEW_TRAINING_VAL_T1413 128 - #define NEW_TRAINING_VAL_MMODE 255 - -+extern char *mp_modulation; -+extern int mp_fine_gain_control; -+extern int mp_fine_gain_value; -+extern int mp_enable_margin_retrain; -+extern int mp_margin_threshold; -+extern int mp_enable_rate_adapt; -+extern int mp_powercutback; -+extern int mp_trellis; -+extern int mp_bitswap; -+extern int mp_maximum_bits_per_carrier; -+extern int mp_maximum_interleave_depth; -+extern int mp_pair_selection; -+extern int mp_dgas_polarity; -+extern int mp_los_alarm; -+extern char *mp_eoc_vendor_id; -+extern int mp_eoc_vendor_revision; -+extern char *mp_eoc_vendor_serialnum; -+extern char *mp_invntry_vernum; -+extern int mp_dsl_bit_tmode; -+extern int mp_high_precision; -+ - int testflag1 = 0; - extern int __guDbgLevel; - extern sar_stat_t sarStat; -@@ -2818,84 +2839,80 @@ static int tn7dsl_set_dsl(void) - - // modulation - ptr = prom_getenv("modulation"); -- if (ptr) -+ if (ptr || mp_modulation != NULL) - { -- tn7dsl_set_modulation(ptr, FALSE); -+ tn7dsl_set_modulation(mp_modulation == NULL ? ptr : mp_modulation, FALSE); - } - - // Fine Gains - ptr = prom_getenv("fine_gain_control"); -- if (ptr) -+ if (ptr || mp_fine_gain_control != -1) - { -- value = os_atoi(ptr); -+ value = mp_fine_gain_control == -1 ? os_atoi(ptr) : mp_fine_gain_control; - tn7dsl_ctrl_fineGain(value); - } - ptr = NULL; - ptr = prom_getenv("fine_gain_value"); -- if(ptr) -- tn7dsl_set_fineGainValue(os_atoh(ptr)); -+ if(ptr || mp_fine_gain_value != -1) -+ tn7dsl_set_fineGainValue(mp_fine_gain_value == -1 ? os_atoh(ptr) : mp_fine_gain_value); - - // margin retrain - ptr = NULL; - ptr = prom_getenv("enable_margin_retrain"); -- if(ptr) -+ value = mp_enable_margin_retrain == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_enable_margin_retrain; -+ -+ if (value == 1) - { -- value = os_atoi(ptr); -- if(value == 1) -+ dslhal_api_setMarginMonitorFlags(pIhw, 0, 1); -+ bMarginRetrainEnable = 1; -+ //printk("enable showtime margin monitor.\n"); -+ -+ ptr = NULL; -+ ptr = prom_getenv("margin_threshold"); -+ value = mp_margin_threshold == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_margin_threshold; -+ -+ if(value >= 0) - { -- dslhal_api_setMarginMonitorFlags(pIhw, 0, 1); -- bMarginRetrainEnable = 1; -- //printk("enable showtime margin monitor.\n"); -- ptr = NULL; -- ptr = prom_getenv("margin_threshold"); -- if(ptr) -- { -- value = os_atoi(ptr); -- //printk("Set margin threshold to %d x 0.5 db\n",value); -- if(value >= 0) -- { -- dslhal_api_setMarginThreshold(pIhw, value); -- bMarginThConfig=1; -- } -- } -+ dslhal_api_setMarginThreshold(pIhw, value); -+ bMarginThConfig=1; - } - } - - // rate adapt - ptr = NULL; - ptr = prom_getenv("enable_rate_adapt"); -- if(ptr) -+ if(ptr || mp_enable_rate_adapt != -1) - { -- dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr)); -+ dslhal_api_setRateAdaptFlag(pIhw, mp_enable_rate_adapt == -1 ? os_atoi(ptr) : mp_enable_rate_adapt); - } - - // set powercutback - ptr = NULL; - ptr = prom_getenv("powercutback"); -- if(ptr) -+ if(ptr || mp_powercutback != -1) - { -- dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr)); -+ dslhal_advcfg_onOffPcb(pIhw, mp_powercutback == -1 ? os_atoi(ptr) : mp_powercutback); - } - - // trellis - ptr = NULL; - ptr = prom_getenv("trellis"); -- if(ptr) -+ if(ptr || mp_trellis != -1) - { -- dslhal_api_setTrellisFlag(pIhw, os_atoi(ptr)); -- trellis = os_atoi(ptr); -+ trellis = mp_trellis == -1 ? os_atoi(ptr) : mp_trellis; -+ dslhal_api_setTrellisFlag(pIhw, trellis); - //printk("trellis=%d\n"); - } - - // bitswap - ptr = NULL; - ptr = prom_getenv("bitswap"); -- if(ptr) -+ if(ptr || mp_bitswap != -1) - { - int offset[2] = {33, 0}; - unsigned int bitswap; - -- bitswap = os_atoi(ptr); -+ bitswap = mp_bitswap == -1 ? os_atoi(ptr) : mp_bitswap; - - tn7dsl_generic_read(2, offset); - dslReg &= dslhal_support_byteSwap32(0xFFFFFF00); -@@ -2913,46 +2930,47 @@ static int tn7dsl_set_dsl(void) - // maximum bits per carrier - ptr = NULL; - ptr = prom_getenv("maximum_bits_per_carrier"); -- if(ptr) -+ if(ptr || mp_maximum_bits_per_carrier != -1) - { -- dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, os_atoi(ptr)); -+ dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, mp_maximum_bits_per_carrier == -1 ? os_atoi(ptr) : mp_maximum_bits_per_carrier); - } - - // maximum interleave depth - ptr = NULL; - ptr = prom_getenv("maximum_interleave_depth"); -- if(ptr) -+ if(ptr || mp_maximum_interleave_depth != -1) - { -- dslhal_api_setMaxInterleaverDepth(pIhw, os_atoi(ptr)); -+ dslhal_api_setMaxInterleaverDepth(pIhw, mp_maximum_interleave_depth == -1 ? os_atoi(ptr) : mp_maximum_interleave_depth); - } - - // inner and outer pairs - ptr = NULL; - ptr = prom_getenv("pair_selection"); -- if(ptr) -+ if(ptr || mp_pair_selection != -1) - { -- dslhal_api_selectInnerOuterPair(pIhw, os_atoi(ptr)); -+ dslhal_api_selectInnerOuterPair(pIhw, mp_pair_selection == -1 ? os_atoi(ptr) : mp_pair_selection); - } - - ptr = NULL; - ptr = prom_getenv("dgas_polarity"); -- if(ptr) -+ if(ptr || mp_dgas_polarity != -1) - { - dslhal_api_configureDgaspLpr(pIhw, 1, 1); -- dslhal_api_configureDgaspLpr(pIhw, 0, os_atoi(ptr)); -+ dslhal_api_configureDgaspLpr(pIhw, 0, mp_dgas_polarity == -1 ? os_atoi(ptr) : mp_dgas_polarity); - } - - ptr = NULL; - ptr = prom_getenv("los_alarm"); -- if(ptr) -+ if(ptr || mp_los_alarm != -1) - { -- dslhal_api_disableLosAlarm(pIhw, os_atoi(ptr)); -+ dslhal_api_disableLosAlarm(pIhw, mp_los_alarm == -1 ? os_atoi(ptr) : mp_los_alarm); - } - - ptr = NULL; - ptr = prom_getenv("eoc_vendor_id"); -- if(ptr) -+ if(ptr || mp_eoc_vendor_id != NULL) - { -+ ptr = mp_eoc_vendor_id == NULL ? ptr : mp_eoc_vendor_id; - for(i=0;i<8;i++) - { - tmp[0]=ptr[i*2]; -@@ -2977,26 +2995,26 @@ static int tn7dsl_set_dsl(void) - } - ptr = NULL; - ptr = prom_getenv("eoc_vendor_revision"); -- if(ptr) -+ if(ptr || mp_eoc_vendor_revision != -1) - { -- value = os_atoi(ptr); -+ value = mp_eoc_vendor_revision == -1 ? os_atoi(ptr) : mp_eoc_vendor_revision; - //printk("eoc rev=%d\n", os_atoi(ptr)); - dslhal_api_setEocRevisionNumber(pIhw, (char *)&value); - - } - ptr = NULL; - ptr = prom_getenv("eoc_vendor_serialnum"); -- if(ptr) -+ if(ptr || mp_eoc_vendor_serialnum != NULL) - { -- dslhal_api_setEocSerialNumber(pIhw, ptr); -+ dslhal_api_setEocSerialNumber(pIhw, mp_eoc_vendor_serialnum == NULL ? ptr : mp_eoc_vendor_serialnum); - } - - // CQ10037 Added invntry_vernum environment variable to be able to set version number in ADSL2, ADSL2+ modes. - ptr = NULL; - ptr = prom_getenv("invntry_vernum"); -- if(ptr) -+ if(ptr || mp_invntry_vernum != NULL) - { -- dslhal_api_setEocRevisionNumber(pIhw, ptr); -+ dslhal_api_setEocRevisionNumber(pIhw, mp_invntry_vernum == NULL ? ptr : mp_invntry_vernum); - } - - return 0; -@@ -3041,7 +3059,7 @@ int tn7dsl_init(void *priv) - * backward compatibility. - */ - cp = prom_getenv("DSL_BIT_TMODE"); -- if (cp) -+ if (cp || mp_dsl_bit_tmode != -1) - { - printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__); - /* -@@ -3070,9 +3088,9 @@ int tn7dsl_init(void *priv) - - // UR8_MERGE_START CQ11054 Jack Zhang - cp = prom_getenv("high_precision"); -- if (cp) -+ if (cp || mp_high_precision != -1) - { -- high_precision_selected = os_atoi(cp); -+ high_precision_selected = mp_high_precision == -1 ? os_atoi(cp) : mp_high_precision; - } - if ( high_precision_selected) - { ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -74,6 +74,8 @@ typedef void OS_SETUP; - /* PDSP Firmware files */ - #include "tnetd7300_sar_firm.h" - -+extern int mp_oam_lb_timeout; -+extern int mp_autopvc_enable; - - enum - { -@@ -817,9 +819,9 @@ int tn7sar_setup_oam_channel(Tn7AtmPriva - pHalDev = (HAL_DEVICE *)priv->pSarHalDev; - - pauto_pvc = prom_getenv("autopvc_enable"); -- if(pauto_pvc) //CQ10273 -+ if(pauto_pvc || mp_autopvc_enable != -1) //CQ10273 - { -- auto_pvc =tn7sar_strtoul(pauto_pvc, NULL, 10); -+ auto_pvc = mp_autopvc_enable == -1 ? tn7sar_strtoul(pauto_pvc, NULL, 10) : mp_autopvc_enable; - } - - memset(&chInfo, 0xff, sizeof(chInfo)); -@@ -985,9 +987,9 @@ int tn7sar_init(struct atm_dev *dev, Tn7 - - /* read in oam lb timeout value */ - pLbTimeout = prom_getenv("oam_lb_timeout"); -- if(pLbTimeout) -+ if(pLbTimeout || mp_oam_lb_timeout != -1) - { -- lbTimeout =tn7sar_strtoul(pLbTimeout, NULL, 10); -+ lbTimeout = mp_oam_lb_timeout == -1 ? tn7sar_strtoul(pLbTimeout, NULL, 10) : mp_oam_lb_timeout; - oamLbTimeout = lbTimeout; - pHalFunc->Control(pHalDev,"OamLbTimeout", "Set", &lbTimeout); - } diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch deleted file mode 100644 index a970574fe5..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -446,7 +446,6 @@ static void avsar_release(struct device - } - - static struct device avsar = { -- .bus_id = "vlynq", - .release = avsar_release, - }; - -@@ -455,6 +454,8 @@ int shim_osLoadFWImage(unsigned char *pt - const struct firmware *fw_entry; - size_t size; - -+ dev_set_name(&avsar, "avsar"); -+ - printk("requesting firmware image \"ar0700xx.bin\"\n"); - if(device_register(&avsar) < 0) { - printk(KERN_ERR diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch deleted file mode 100644 index 6d72b00544..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -73,8 +73,8 @@ - #include - - #include --#include --#include -+#include -+#include - - #include "dsl_hal_api.h" - #include "tn7atm.h" ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -111,8 +111,8 @@ - #include - - #include --#include --#include -+#include -+#include - - /* Modules specific header files */ - #include "tn7atm.h" ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -54,8 +54,8 @@ - #include - - #include --#include --#include -+#include -+#include - - #define _CPHAL_AAL5 - #define _CPHAL_SAR diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch deleted file mode 100644 index 1223604b0e..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -197,7 +197,7 @@ led_reg_t ledreg[2]; - static struct led_funcs ledreg[2]; - #endif - --#define DEV_DSLMOD CTL_UNNUMBERED -+#define DEV_DSLMOD 0 - #define MAX_STR_SIZE 256 - #define DSL_MOD_SIZE 256 - -@@ -333,8 +333,8 @@ static void tn7dsl_chng_modulation(void* - static unsigned int tn7dsl_set_modulation(void* data, int flag); - static void tn7dsl_ctrl_fineGain(int value); - static void tn7dsl_set_fineGainValue(int value); --static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp, -- void *buffer, size_t * lenp); -+static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer, -+ size_t * lenp, loff_t *ppos); - static void tn7dsl_register_dslss_led(void); - void tn7dsl_dslmod_sysctl_register(void); - void tn7dsl_dslmod_sysctl_unregister(void); -@@ -3398,8 +3398,8 @@ unsigned int tn7dsl_get_memory(unsigned - - - --static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp, -- void *buffer, size_t *lenp) -+static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer, -+ size_t *lenp, loff_t *ppos) - { - char *ptr; - int ret, len = 0; -@@ -3411,7 +3411,7 @@ static int dslmod_sysctl(ctl_table *ctl, - char mod_req[16] = { '\t' }; - char fst_byt; - -- if (!*lenp || (filp->f_pos && !write)) -+ if (!*lenp || (*ppos && !write)) - { - *lenp = 0; - return 0; -@@ -3421,9 +3421,9 @@ static int dslmod_sysctl(ctl_table *ctl, - */ - if(write) - { -- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); -+ ret = proc_dostring(ctl, write, buffer, lenp, ppos); - -- switch (ctl->ctl_name) -+ switch ((long)ctl->extra2) - { - case DEV_DSLMOD: - ptr = strpbrk(info, " \t"); -@@ -3507,14 +3507,21 @@ static int dslmod_sysctl(ctl_table *ctl, - else - { - len += sprintf(info+len, mod_req); -- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); -+ ret = proc_dostring(ctl, write, buffer, lenp, ppos); - } - return ret; - } - - - ctl_table dslmod_table[] = { -- {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string} -+ { -+ .procname = "dslmod", -+ .data = info, -+ .maxlen = DSL_MOD_SIZE, -+ .mode = 0644, -+ .proc_handler = &dslmod_sysctl, -+ .extra2 = (void *)DEV_DSLMOD, -+ } - , - {0} - }; -@@ -3522,7 +3529,12 @@ ctl_table dslmod_table[] = { - /* Make sure that /proc/sys/dev is there */ - ctl_table dslmod_root_table[] = { - #ifdef CONFIG_PROC_FS -- {CTL_DEV, "dev", NULL, 0, 0555, dslmod_table} -+ { -+ .procname = "dev", -+ .maxlen = 0, -+ .mode = 0555, -+ .child = dslmod_table, -+ } - , - #endif /* CONFIG_PROC_FS */ - {0} diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch deleted file mode 100644 index 2007b497c2..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -1870,7 +1870,7 @@ static int __init tn7atm_register (Tn7At - - dgprintf (4, "device %s being registered\n", priv->name); - -- mydev = atm_dev_register (priv->proc_name, &tn7atm_ops, -1, NULL); -+ mydev = atm_dev_register (priv->proc_name, NULL, &tn7atm_ops, -1, NULL); - - if (mydev == NULL) - { ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -453,13 +453,16 @@ int shim_osLoadFWImage(unsigned char *pt - { - const struct firmware *fw_entry; - size_t size; -+ int ret; - - dev_set_name(&avsar, "avsar"); - - printk("requesting firmware image \"ar0700xx.bin\"\n"); -- if(device_register(&avsar) < 0) { -+ dev_set_name(&avsar, "avsar"); -+ ret = device_register(&avsar); -+ if (ret < 0) { - printk(KERN_ERR -- "avsar: device_register fails\n"); -+ "avsar: device_register fails, error%i\n", ret); - return -1; - } - diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch deleted file mode 100644 index 525218c3b4..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -67,7 +67,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -48,7 +48,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -100,7 +100,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/220-3.10-update_proc_code.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/220-3.10-update_proc_code.patch deleted file mode 100644 index 7a2bbe8089..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/220-3.10-update_proc_code.patch +++ /dev/null @@ -1,2945 +0,0 @@ -From 2826b9f6aa1ad2ac4c2846bbce10eb3378014555 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 26 Sep 2013 12:28:35 +0200 -Subject: [PATCH 3/3] update proc code to fix compilation for 3.10 - -Signed-off-by: Jonas Gorski ---- - tn7api.h | 63 ++- - tn7atm.c | 330 ++++++-------- - tn7dsl.c | 1447 ++++++++++++++++++++++++++++++-------------------------------- - tn7sar.c | 91 ++-- - 4 files changed, 922 insertions(+), 1009 deletions(-) - ---- a/tn7api.h -+++ b/tn7api.h -@@ -86,27 +86,26 @@ void * tn7atm_memcpy(void * dst, void co - /* tn7dsl.h */ - void tn7dsl_exit(void); - int tn7dsl_init(void *priv); --int tn7dsl_proc_eoc(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_stats(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_eoc_fops; -+extern struct file_operations tn7dsl_proc_stats_fops; - - //#define ADV_DIAG_STATS 1 //CQ10275 To enable Adv Stats - - #ifdef ADV_DIAG_STATS --int tn7dsl_proc_adv_stats(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_adv_stats1(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_adv_stats2(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_adv_stats3(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_adv_stats_fops; -+extern struct file_operations tn7dsl_proc_adv1_stats_fops; -+extern struct file_operations tn7dsl_proc_adv2_stats_fops; -+extern struct file_operations tn7dsl_proc_adv3_stats_fops; - //UR8_MERGE_START CQ10682 Jack Zhang --int tn7dsl_proc_dbg_cmsgs(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs1(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs2(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs3(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs4(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_dbg_cmsgs_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs1_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs2_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs3_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs4_fops; - //UR8_MERGE_END CQ10682* - #endif //ADV_DIAG_STATS - --int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data); --int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_modem_fops; - int tn7dsl_handle_interrupt(void); - - void tn7dsl_dslmod_sysctl_register(void); -@@ -127,31 +126,31 @@ unsigned int tn7dsl_get_memory(unsigned - int os_atoi(const char *pStr); - int os_atoh(const char *pStr); - unsigned long os_atoul(const char *pStr); --int tn7dsl_proc_snr0(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_snr1(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_snr2(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_bit_allocation(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_ds_noise(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_generic_read_result(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_train_mode_export(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_snr0_fops; -+extern struct file_operations tn7dsl_proc_snr1_fops; -+extern struct file_operations tn7dsl_proc_snr2_fops; -+extern struct file_operations tn7dsl_proc_bit_allocation_fops; -+extern struct file_operations tn7dsl_proc_ds_noise_fops; -+extern struct file_operations tn7dsl_proc_generic_read_result_fops; -+extern struct file_operations tn7dsl_proc_train_mode_export_fops; - - #ifndef NO_ADV_STATS --int tn7dsl_proc_SNRpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_QLNpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_SNRpsds_fops; -+extern struct file_operations tn7dsl_proc_QLNpsds_fops; - // * UR8_MERGE_START CQ10979 Jack Zhang - #ifdef TR69_HLIN_IN --//int tn7dsl_proc_HLINpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds1(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds2(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds3(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds4(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+//extern struct file_operations tn7dsl_proc_HLINpsds_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds1_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds2_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds3_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds4_fops; - #endif //TR69_HLIN_IN - // * UR8_MERGE_END CQ10979* - // * UR8_MERGE_START CQ11057 Jack Zhang - #define TR69_PMD_IN - #ifdef TR69_PMD_IN --//int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+//extern struct file_operations tn7dsl_proc_PMDus_fops; -+extern struct file_operations tn7dsl_proc_PMDus_fops; - #endif //TR69_PMD_IN - // * UR8_MERGE_END CQ11057 * - #endif -@@ -168,9 +167,9 @@ void tn7sar_get_sar_version(Tn7AtmPrivat - int tn7sar_get_near_end_loopback_count(unsigned int *pF4count, unsigned int *pF5count); - int tn7sar_oam_generation(void *privContext, int chan, int type, int vpi, int vci, int timeout); - int tn7sar_get_stats(void *priv1); --int tn7sar_proc_sar_stat(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7sar_proc_sar_stat_fops; - void tn7sar_get_sar_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls); --int tn7sar_proc_oam_ping(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7sar_proc_pvc_table(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7sar_proc_oam_ping_fops; -+extern struct file_operations tn7sar_proc_pvc_table_fops; - int tn7sar_tx_flush(void *privContext, int chan, int queue, int skip); - #endif __SGAPI_H ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -271,25 +271,15 @@ static int tn7atm_change_qos (struct atm - static int tn7atm_detect (void); - static int tn7atm_init (struct atm_dev *dev); - static int tn7atm_irq_request (struct atm_dev *dev); --static int tn7atm_proc_version (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); -+ -+static struct file_operations tn7atm_proc_version_fops; - static void tn7atm_exit (void); --static int tn7atm_proc_channels (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); --static int tn7atm_proc_private (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); -+static struct file_operations tn7atm_proc_channels_fops; -+static struct file_operations tn7atm_proc_private_fops; - inline static int tn7atm_queue_packet_to_sar (void *vcc1, void *skb1, - int chan); - --static int tn7atm_xlate_proc_name (const char *name, -- struct proc_dir_entry **ret, -- const char **residual); --static int tn7atm_proc_match (int len, const char *name, -- struct proc_dir_entry *de); --static int tn7atm_proc_qos_read (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); --static int tn7atm_proc_qos_write (struct file *fp, const char *buf, -- unsigned long count, void *data); -+static struct file_operations tn7atm_proc_qos_fops; - - //CT - Added function to return chipset Id - void tn7atm_get_chipsetId (char *pVerId); -@@ -412,60 +402,59 @@ static int proc_root_already_exists = TR - static struct - { - const unsigned char name[32]; -- int (*read_func) (char* , char **, off_t , int ,int *, void *); -- int (*write_func) (struct file *, const char * , unsigned long , void *); -+ struct file_operations *fops; - - } proc_if[] = { -- {"avsar_ver", tn7atm_proc_version, NULL}, -- {"avsar_channels", tn7atm_proc_channels, NULL}, -- {"avsar_sarhal_stats", tn7sar_proc_sar_stat, NULL}, -- {"avsar_oam_ping", tn7sar_proc_oam_ping, NULL}, -- {"avsar_pvc_table", tn7sar_proc_pvc_table, NULL}, -- {"avsar_rxsnr0", tn7dsl_proc_snr0, NULL}, -- {"avsar_rxsnr1", tn7dsl_proc_snr1, NULL}, -- {"avsar_rxsnr2", tn7dsl_proc_snr2, NULL}, -- {"clear_eoc_stats", tn7dsl_proc_eoc, NULL}, -- {"avsar_bit_allocation_table", tn7dsl_proc_bit_allocation, NULL}, -- {"avsar_dsl_modulation_schemes",tn7dsl_proc_train_mode_export, NULL}, -+ {"avsar_ver", &tn7atm_proc_version_fops}, -+ {"avsar_channels", &tn7atm_proc_channels_fops}, -+ {"avsar_sarhal_stats", &tn7sar_proc_sar_stat_fops}, -+ {"avsar_oam_ping", &tn7sar_proc_oam_ping_fops}, -+ {"avsar_pvc_table", &tn7sar_proc_pvc_table_fops}, -+ {"avsar_rxsnr0", &tn7dsl_proc_snr0_fops}, -+ {"avsar_rxsnr1", &tn7dsl_proc_snr1_fops}, -+ {"avsar_rxsnr2", &tn7dsl_proc_snr2_fops}, -+ {"clear_eoc_stats", &tn7dsl_proc_eoc_fops}, -+ {"avsar_bit_allocation_table", &tn7dsl_proc_bit_allocation_fops}, -+ {"avsar_dsl_modulation_schemes",&tn7dsl_proc_train_mode_export_fops}, - #ifndef NO_ADV_STATS -- {"avsar_SNRpsds", tn7dsl_proc_SNRpsds, NULL}, -- {"avsar_QLNpsds", tn7dsl_proc_QLNpsds, NULL}, -+ {"avsar_SNRpsds", &tn7dsl_proc_SNRpsds_fops}, -+ {"avsar_QLNpsds", &tn7dsl_proc_QLNpsds_fops}, - // * UR8_MERGE_START CQ10979 Jack Zhang - #ifdef TR69_HLIN_IN --// {"avsar_HLINpsds", tn7dsl_proc_HLINpsds, NULL}, -- {"avsar_HLINpsds1", tn7dsl_proc_HLINpsds1, NULL}, -- {"avsar_HLINpsds2", tn7dsl_proc_HLINpsds2, NULL}, -- {"avsar_HLINpsds3", tn7dsl_proc_HLINpsds3, NULL}, -- {"avsar_HLINpsds4", tn7dsl_proc_HLINpsds4, NULL}, -+// {"avsar_HLINpsds", &tn7dsl_proc_HLINpsds_fops}, -+ {"avsar_HLINpsds1", &tn7dsl_proc_HLINpsds1_fops}, -+ {"avsar_HLINpsds2", &tn7dsl_proc_HLINpsds2_fops}, -+ {"avsar_HLINpsds3", &tn7dsl_proc_HLINpsds3_fops}, -+ {"avsar_HLINpsds4", &tn7dsl_proc_HLINpsds4_fops}, - #endif //TR69_HLIN_IN - // * UR8_MERGE_END CQ10979* - // * UR8_MERGE_START CQ11057 Jack Zhang - #define TR69_PMD_IN - #ifdef TR69_PMD_IN -- {"avsar_PMDTestus", tn7dsl_proc_PMDus, NULL}, --// {"avsar_PMDTestus1", tn7dsl_proc_PMDus1, NULL}, -+ {"avsar_PMDTestus", &tn7dsl_proc_PMDus_fops}, -+// {"avsar_PMDTestus1", &tn7dsl_proc_PMDus1_fops}, - #endif //TR69_PMD_IN - // * UR8_MERGE_END CQ11057 * - #endif -- {"avsar_private", tn7atm_proc_private, NULL}, -- {"avsar_modem_training", tn7dsl_proc_modem, NULL}, -- {"avsar_modem_stats", tn7dsl_proc_stats, tn7dsl_proc_write_stats}, -+ {"avsar_private", &tn7atm_proc_private_fops}, -+ {"avsar_modem_training", &tn7dsl_proc_modem_fops}, -+ {"avsar_modem_stats", &tn7dsl_proc_stats_fops}, - - #ifdef ADV_DIAG_STATS //CQ10275 --//for 2.6 {"avsar_modem_adv_stats", tn7dsl_proc_adv_stats, NULL}, -+//for 2.6 {"avsar_modem_adv_stats", &tn7dsl_proc_adv_stats_fops}, - //For 2.4 kernel, due to proc file system size limitation -- {"avsar_modem_adv_stats1", tn7dsl_proc_adv_stats1, NULL}, -- {"avsar_modem_adv_stats2", tn7dsl_proc_adv_stats2, NULL}, -- {"avsar_modem_adv_stats3", tn7dsl_proc_adv_stats3, NULL}, -+ {"avsar_modem_adv_stats1", &tn7dsl_proc_adv_stats1_fops}, -+ {"avsar_modem_adv_stats2", &tn7dsl_proc_adv_stats2_fops}, -+ {"avsar_modem_adv_stats3", &tn7dsl_proc_adv_stats3_fops}, - //UR8_MERGE_START CQ10682 Jack Zhang -- {"avsar_modem_dbg_cmsgs", tn7dsl_proc_dbg_cmsgs, NULL}, -- {"avsar_modem_dbg_rmsgs1", tn7dsl_proc_dbg_rmsgs1, NULL}, -- {"avsar_modem_dbg_rmsgs2", tn7dsl_proc_dbg_rmsgs2, NULL}, -- {"avsar_modem_dbg_rmsgs3", tn7dsl_proc_dbg_rmsgs3, NULL}, -- {"avsar_modem_dbg_rmsgs4", tn7dsl_proc_dbg_rmsgs4, NULL}, -+ {"avsar_modem_dbg_cmsgs", &tn7dsl_proc_dbg_cmsgs_fops}, -+ {"avsar_modem_dbg_rmsgs1", &tn7dsl_proc_dbg_rmsgs1_fops}, -+ {"avsar_modem_dbg_rmsgs2", &tn7dsl_proc_dbg_rmsgs2_fops}, -+ {"avsar_modem_dbg_rmsgs3", &tn7dsl_proc_dbg_rmsgs3_fops}, -+ {"avsar_modem_dbg_rmsgs4", &tn7dsl_proc_dbg_rmsgs4_fops}, - // UR8_MERGE_END CQ10682* - #endif //ADV_DIAG_STATS -- {"avsar_qos_enable", tn7atm_proc_qos_read, tn7atm_proc_qos_write} -+ {"avsar_qos_enable", &tn7atm_proc_qos_fops} - }; - - /* *INDENT-ON* */ -@@ -1703,75 +1692,81 @@ int tn7atm_receive (void *os_dev, int ch - return 0; - } - --static int tn7atm_proc_channels (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7atm_proc_channels (struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - int i; - - struct atm_dev *dev; - Tn7AtmPrivate *priv; - -- dev = (struct atm_dev *) data; -+ dev = (struct atm_dev *) m->private; - priv = (Tn7AtmPrivate *) dev->dev_data; - -- if (len <= limit) -- len += sprintf (buf + len, "Chan Inuse ChanID VPI VCI \n"); -- if (len <= limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, "Chan Inuse ChanID VPI VCI \n"); -+ seq_printf (m, - "------------------------------------------------------------------\n"); - - for (i = 0; i <= MAX_DMA_CHAN; i++) - { -- if (len <= limit) -- { -- len += sprintf (buf + len, -- " %02d %05d %05d %05d %05d \n", -- i, priv->lut[i].inuse, priv->lut[i].chanid, -- priv->lut[i].vpi, priv->lut[i].vci); -- } -+ seq_printf (m, -+ " %02d %05d %05d %05d %05d \n", -+ i, priv->lut[i].inuse, priv->lut[i].chanid, -+ priv->lut[i].vpi, priv->lut[i].vci); - } - -- if (len <= limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "------------------------------------------------------------------\n"); - -- return len; -+ return 0; - } - --static int tn7atm_proc_private (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7atm_proc_channels_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_channels, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_channels_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_channels_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+static int tn7atm_proc_private (struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - struct atm_dev *dev; - Tn7AtmPrivate *priv; - -- dev = (struct atm_dev *) data; -+ dev = (struct atm_dev *) m->private; - priv = (Tn7AtmPrivate *) dev->dev_data; - -- if (len <= limit) -- len += sprintf (buf + len, "\nPrivate Data Structure(%s):\n", priv->name); -- if (len <= limit) -- len += sprintf (buf + len, "----------------------------------------\n"); -- if (len <= limit) -- len += sprintf (buf + len, "priv: 0x%p\n", priv); -- if (len <= limit) -- len += sprintf (buf + len, "next: 0x%p", priv->next); -- if (len <= limit) -- len += sprintf (buf + len, "\tdev: 0x%p\n", priv->dev); -- -- if (len <= limit) -- len += sprintf (buf + len, "tx_irq: %02d", priv->sar_irq); -- if (len <= limit) -- len += sprintf (buf + len, "rx_irq: %02d", priv->dsl_irq); -+ seq_printf (m, "\nPrivate Data Structure(%s):\n", priv->name); -+ seq_printf (m, "----------------------------------------\n"); -+ seq_printf (m, "priv: 0x%p\n", priv); -+ seq_printf (m, "next: 0x%p", priv->next); -+ seq_printf (m, "\tdev: 0x%p\n", priv->dev); -+ -+ seq_printf (m, "tx_irq: %02d", priv->sar_irq); -+ seq_printf (m, "rx_irq: %02d", priv->dsl_irq); -+ -+ return 0; -+} - -- return len; -+static int tn7atm_proc_private_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_private, PDE_DATA(inode)); - } - -+static struct file_operations tn7atm_proc_private_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_private_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - void tn7atm_sarhal_isr_register (void *os_dev, void *hal_isr, - int interrupt_num) - { -@@ -1890,10 +1885,8 @@ static int __init tn7atm_register (Tn7At - return ATM_REG_OK; - } - --static int tn7atm_proc_version (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7atm_proc_version (struct seq_file *m, void *data) - { -- int len = 0; - char dslVer[8]; - char dspVer[10]; - char chipsetID[32]; //CT CQ10076 - Added temporary buffer to store chipset Id -@@ -1904,56 +1897,64 @@ static int tn7atm_proc_version (char *bu - - priv = mydev->dev_data; - -- len += -- sprintf (buf + len, "ATM Driver version:[%d.%02d.%02d.%02d]\n", -- LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR, -- LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM); -+ seq_printf (m, "ATM Driver version:[%d.%02d.%02d.%02d]\n", -+ LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR, -+ LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM); - - tn7dsl_get_dslhal_version (dslVer); - -- len += -- sprintf (buf + len, "DSL HAL version: [%d.%02d.%02d.%02d]\n", dslVer[0], -- dslVer[1], dslVer[2], dslVer[3]); -+ seq_printf (m, "DSL HAL version: [%d.%02d.%02d.%02d]\n", dslVer[0], -+ dslVer[1], dslVer[2], dslVer[3]); - tn7dsl_get_dsp_version (dspVer); - -- len += -- sprintf (buf + len, "DSP Datapump version: [%d.%02d.%02d.%02d] ", -- dspVer[4], dspVer[5], dspVer[6], dspVer[7]); -+ seq_printf (m, "DSP Datapump version: [%d.%02d.%02d.%02d] ", -+ dspVer[4], dspVer[5], dspVer[6], dspVer[7]); - if (dspVer[8] == 2) // annex B -- len += sprintf (buf + len, "Annex B\n"); -+ seq_printf (m, "Annex B\n"); - else if (dspVer[8] == 3) // annex c -- len += sprintf (buf + len, "Annex c\n"); -+ seq_printf (m, "Annex c\n"); - else -- len += sprintf (buf + len, "Annex A\n"); -+ seq_printf (m, "Annex A\n"); - - tn7sar_get_sar_version (priv, &pSarVer); - -- len += sprintf (buf + len, "SAR HAL version: ["); -+ seq_printf (m, "SAR HAL version: ["); - for (i = 0; i < 8; i++) - { -- len += sprintf (buf + len, "%c", pSarVer[i + 7]); -+ seq_printf (m, "%c", pSarVer[i + 7]); - } -- len += sprintf (buf + len, "]\n"); -+ seq_printf (m, "]\n"); - - tn7sar_get_sar_firmware_version (&pdspV1, &pdspV2); -- len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x]\n", -+ seq_printf (m, "PDSP Firmware version:[%01x.%02x]\n", - pdspV1, pdspV2); - - //CT CQ10076 - Added code to report chipset ID using proc file system - tn7atm_get_chipsetId(chipsetID); -- len += sprintf (buf + len, "Chipset ID: [%s]\n",chipsetID); -+ seq_printf (m, "Chipset ID: [%s]\n",chipsetID); - -- return len; -+ return 0; - } - -+static int tn7atm_proc_version_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_version, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_version_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_version_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - - /* Device detection */ - - static int __init tn7atm_detect (void) - { - Tn7AtmPrivate *priv; -- struct proc_dir_entry *dsl_wr_file = NULL; /* Only for ones with a write -- * function. */ - int ctr; - const char *residual; - -@@ -2002,24 +2003,7 @@ static int __init tn7atm_detect (void) - */ - for (ctr = 0; ctr < (NUM_ELEMS (proc_if)); ctr++) - { -- /* Only if we have a write function, we create a normal proc file. */ -- if(proc_if[ctr].write_func) -- { -- dsl_wr_file = create_proc_entry (proc_if[ctr].name, DRV_PROC_MODE, root_proc_dir_entry); -- if (dsl_wr_file) -- { -- dsl_wr_file->read_proc = proc_if[ctr].read_func; -- dsl_wr_file->write_proc = proc_if[ctr].write_func; -- dsl_wr_file->data = (void *)mydev; //UR8_MERGE_START_END CQ10700 Manjula K -- } -- dsl_wr_file = NULL; -- } -- else -- { -- /* Create a read-only entry. */ -- create_proc_read_entry (proc_if[ctr].name, 0, root_proc_dir_entry, -- proc_if[ctr].read_func, mydev); -- } -+ proc_create_data(proc_if[ctr].name, DRV_PROC_MODE, root_proc_dir_entry, proc_if[ctr].fops, (void *)mydev); - } - - tn7dsl_dslmod_sysctl_register (); -@@ -2491,63 +2475,10 @@ static int tn7atm_set_can_support_adsl2 - return TRUE; - } - --/* -- * This function matches a name such as "serial", and that specified by the -- * proc_dir_entry -- */ --static int tn7atm_proc_match (int len, const char *name, -- struct proc_dir_entry *de) -+static int tn7atm_proc_qos_read(struct seq_file *m, void *data) - { -- if (!de || !de->low_ino) -- return 0; -- if (de->namelen != len) -+ seq_printf (m, "\nEnableQoS = %d\n", EnableQoS); - return 0; -- return !strncmp (name, de->name, len); --} -- --/* -- * This function parses a name such as "tty/driver/serial", and -- * returns the struct proc_dir_entry for "/proc/tty/driver", and -- * returns "serial" in residual. -- */ --static int tn7atm_xlate_proc_name (const char *name, -- struct proc_dir_entry **ret, -- const char **residual) --{ -- const char *cp = name, *next; -- struct proc_dir_entry *de; -- int len; -- extern struct proc_dir_entry proc_root; -- -- de = &proc_root; -- while (1) -- { -- next = strchr (cp, '/'); -- if (!next) -- break; -- -- len = next - cp; -- for (de = de->subdir; de; de = de->next) -- { -- if (tn7atm_proc_match (len, cp, de)) -- break; -- } -- if (!de) -- return -ENOENT; -- cp += len + 1; -- } -- *residual = cp; -- *ret = de; -- -- return 0; --} -- --static int tn7atm_proc_qos_read(char *buf, char **start, off_t offset, int count, int *eof, void *data) --{ -- int len = 0; -- -- len += sprintf (buf + len, "\nEnableQoS = %d\n", EnableQoS); -- return len; - - } - static int tn7atm_proc_qos_write(struct file *fp, const char *buf, unsigned long count, void *data) -@@ -2581,5 +2512,19 @@ static int tn7atm_proc_qos_write(struct - return count; - } - -+static int tn7atm_proc_qos_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_qos_read, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_qos_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_qos_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+ .write = tn7atm_proc_qos_write, -+}; -+ - module_init (tn7atm_detect); - module_exit (tn7atm_exit); ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -339,7 +339,7 @@ static void tn7dsl_register_dslss_led(vo - void tn7dsl_dslmod_sysctl_register(void); - void tn7dsl_dslmod_sysctl_unregister(void); - static int tn7dsl_clear_eoc_receive(void); --static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data); -+static int tn7dsl_proc_snr_print (struct seq_file *m, int data); - /* end of internal functions */ - - // UR8_MERGE_START CQ11054 Jack Zhang -@@ -635,11 +635,9 @@ void shim_osCriticalExit(void) - spin_unlock_irqrestore(&shimLock, flags); - } - --static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data) -+static int tn7dsl_proc_snr_print (struct seq_file *m, int data) - { - -- int len = 0; -- int limit = count - 80; - int i, j; - int bin = (int) data; - unsigned short *rxSnrPerBin; -@@ -660,95 +658,128 @@ static int tn7dsl_proc_snr_print (char * - break; - - default: -- if(len<=limit) -- len += sprintf (buf + len, "\nInvalid bin selected Bin%d :\n", bin); -- return len; --} -+ seq_printf (m, "\nInvalid bin selected Bin%d :\n", bin); -+ return 0; -+ } - -- if(len<=limit) -- len += sprintf (buf + len, "\nAR7 DSL Modem Rx SNR Per Bin for Bin%d :\n", bin); -+ seq_printf (m, "\nAR7 DSL Modem Rx SNR Per Bin for Bin%d :\n", bin); - - for (i=0; iAppData.max_ds_tones/16; i++) - { - for(j=0;j<16;j++) - { -- if(len <=limit) -- len += -- sprintf (buf + len, "%04x ", -+ seq_printf (m, "%04x ", - (unsigned short) rxSnrPerBin[i * 16 + j]); -- } -- if(len <=limit) -- len += sprintf(buf+len, "\n"); - } -+ seq_printf(m, "\n"); -+ } - -- return len; -+ return 0; - } - - - //@Added SNR per bin info per customer request. 05-14-2004 --int tn7dsl_proc_snr0 (char *buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_snr0 (struct seq_file *m, void *data) - { -- return tn7dsl_proc_snr_print(buf, count, eof, 0); -+ return tn7dsl_proc_snr_print(m, 0); - } - --int tn7dsl_proc_snr1 (char *buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_snr0_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_snr_print(buf, count, eof, 1); -+ return single_open(file, tn7dsl_proc_snr0, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_snr0_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_snr0_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int tn7dsl_proc_snr1 (struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_snr_print(m, 1); - } - --int tn7dsl_proc_snr2 (char *buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_snr1_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_snr_print(buf, count, eof, 2); -+ return single_open(file, tn7dsl_proc_snr1, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_snr1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_snr1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int tn7dsl_proc_snr2 (struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_snr_print(m, 2); -+} -+ -+static int tn7dsl_proc_snr2_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_snr2, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_snr2_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_snr2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - //@Added bit allocation table per customer request. 05-14-2004 --int tn7dsl_proc_bit_allocation (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7dsl_proc_bit_allocation (struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int i, j; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 DSL Modem US Bit Allocation:"); -+ seq_printf(m, "\nAR7 DSL Modem US Bit Allocation:"); - - for(i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len <=limit) -- len += -- sprintf (buf + len, "%02x ", -- (unsigned char) pIhw->AppData.BitAllocTblUstrm[i]); -+ seq_printf (m, "%02x ", -+ (unsigned char) pIhw->AppData.BitAllocTblUstrm[i]); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\n\nAR7 DSL Modem DS Bit Allocation:\n"); -+ seq_printf(m, "\n\nAR7 DSL Modem DS Bit Allocation:\n"); - - for (i=0; iAppData.max_ds_tones/16; i++) - { - for(j=0;j<16;j++) - { -- if(len <=limit) -- len += -- sprintf (buf + len, "%02x ", -- (unsigned char) pIhw->AppData.BitAllocTblDstrm[i * 16 + -- j]); -+ seq_printf (m, "%02x ", -+ (unsigned char) pIhw->AppData.BitAllocTblDstrm[i * 16 + -+ j]); - } -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- return len; -+ return 0; -+} -+ -+int tn7dsl_proc_bit_allocation_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_bit_allocation, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_bit_allocation_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_bit_allocation_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #ifndef NO_ACT - int tn7dsl_proc_ds_noise(char* buf, char **start, off_t offset, int count, - int *eof, void *data) -@@ -811,59 +842,48 @@ static char *pUnknown= "Unknown"; - #ifdef ADV_DIAG_STATS //CQ10275, CQ10449 - //UR8_MERGE_START CQ10449 Jack Zhang - --static int proc_adv_stats_header(char* buf, int limit); -+static int proc_adv_stats_header(struct seq_file *m); - --int tn7dsl_proc_adv_stats(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_adv_stats(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - //char *cp = buf + offset; - char *cp = buf; - int i = 0; - int strt = 32; -- static int ctr = 0; - - // printk("proc_adv_stats: buf=0x%X, ctr=%d, offset=%d, count=%d, eof=%d\n", - // (unsigned int)buf, ctr, offset, count, *eof); -- if( ctr == 0) -- { -- len = proc_adv_stats_header( cp, limit); -- -- if( len<=limit) -- len += sprintf(cp+len, "\n\tBin No.\tBits:\tMargin:\tSNR\n"); -- } -- else -- { -- strt = ctr; -- } -- -+ proc_adv_stats_header(m); -+ -+ seq_printf(m, "\n\tBin No.\tBits:\tMargin:\tSNR\n"); -+ - for( i =strt; i<512; i++) - { -- if(len<=limit) -- { -- len += sprintf(cp+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -- } -- else -- { -- ctr = i; -- //*eof = 0; -- *(cp + len) = '\0'; -- printk("proc_adv_stats - return: ctr=%d, len=%d\n", ctr, len); -- return len; -- } - } -- ctr = 0; -- *eof = 1; - printk("proc_adv_stats - return: ctr=%d, len=%d\n", ctr, len); -- return len; -+ return 0; -+} -+ -+ -+static int tn7dsl_proc_adv_stats_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_adv_stats, PDE_DATA(inode)); - } - --static int proc_adv_stats_header(char* buf, int limit) -+struct file_operations tn7dsl_proc_adv_stats_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int proc_adv_stats_header(struct seq_file *m) - { - int len = 0; - int i = 0; -@@ -872,66 +892,53 @@ static int proc_adv_stats_header(char* b - */ - - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 DSL Modem Advanced Statistics:\n"); -+ seq_printf(m, "\nAR7 DSL Modem Advanced Statistics:\n"); - -- if(len<=limit) -+ if(pIhw->lConnected != 1) - { -- if(pIhw->lConnected != 1) -- { -- pIhw->AppData.USConRate = 0; -- pIhw->AppData.DSConRate = 0; -- } -- len += -- sprintf (buf + len, -+ pIhw->AppData.USConRate = 0; -+ pIhw->AppData.DSConRate = 0; -+ } -+ seq_printf (m, - "\t[Connection Rate]\tUS:\t%u\tDS:\t%u\n", - (unsigned int)pIhw->AppData.USConRate, - (unsigned int)pIhw->AppData.DSConRate ); - } -- if(len<=limit) - // UR8_MERGE_START CQ11054 Jack Zhang -+ if (dslhal_api_getHighPrecision()) - { -- if (dslhal_api_getHighPrecision()) -- { -- len += -- sprintf (buf + len, "\t[Margin]\tUS:\t%d.%u\tDS:\t\t%d.%u\n", -- gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin), -- gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin)); -- } -- else -- { -- len += -- sprintf (buf + len, "\t[Margin]\tUS:\t%u\tDS:\t\t%u\n", -- (unsigned int)pIhw->AppData.usMargin, -- (unsigned int)pIhw->AppData.dsMargin/2 ); -- } -+ seq_printf (m, "\t[Margin]\tUS:\t%d.%u\tDS:\t\t%d.%u\n", -+ gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin), -+ gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin)); -+ } -+ else -+ { -+ seq_printf (m, "\t[Margin]\tUS:\t%u\tDS:\t\t%u\n", -+ (unsigned int)pIhw->AppData.usMargin, -+ (unsigned int)pIhw->AppData.dsMargin/2 ); - } - // UR8_MERGE_END CQ11054* - - /* - * Downstream/Upstream Interleaved Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\t[Interleave path] US (TX):\tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Interleave path] US (TX):\tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.usICRC_errors, - (unsigned int)pIhw->AppData.usIFEC_errors); -- if(len<=limit) -- len += sprintf(buf+len, "\t[Interleave path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Interleave path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.dsICRC_errors, - (unsigned int)pIhw->AppData.dsIFEC_errors); - /* - * Upstream/Downstream Fast Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\t[Fast path] US (TX): \tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Fast path] US (TX): \tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.usFCRC_errors, - (unsigned int)pIhw->AppData.usFFEC_errors); -- if(len<=limit) -- len += sprintf(buf+len, "\t[Fast path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Fast path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.dsFCRC_errors, - (unsigned int)pIhw->AppData.dsFFEC_errors); -- -- return len; -+ -+ return 0; - } - - static int getDiagDisplayMode() -@@ -954,29 +961,24 @@ static int getDiagDisplayMode() - ret = 2; - return ret; - } --int tn7dsl_proc_adv_stats1(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+int tn7dsl_proc_adv_stats1(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int i; - int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+ - unsigned char SNRpsds[512]; - int n; - -- len = proc_adv_stats_header( buf+len, limit); -+ proc_adv_stats_header( m); - mode = getDiagDisplayMode(); - -- if(len<=limit) -- len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 1 of 3)\n"); -- -+ seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 1 of 3)\n"); -+ - if(mode==1) //ADSL1 - { - for( i =32; i<128; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -@@ -987,26 +989,34 @@ int tn7dsl_proc_adv_stats1(char* buf, ch - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - for( i =32; i<128; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (iAppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0); - } - } -- return len; -+ return 0; - } - --int tn7dsl_proc_adv_stats2(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_adv_stats1_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_adv_stats1, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_adv_stats1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_adv_stats2(struct seq_file *m, void *data) -+{ - int i; - int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+ - unsigned char SNRpsds[512]; -@@ -1016,12 +1026,10 @@ int tn7dsl_proc_adv_stats2(char* buf, ch - if( mode==1) //ADSL1 - { - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 2 of 3):\n"); -+ seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 2 of 3):\n"); - for( i =128; i<320; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -@@ -1032,26 +1040,35 @@ int tn7dsl_proc_adv_stats2(char* buf, ch - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - for( i =128; i<320; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (iAppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0); - } - } -- return len; -+ return 0; - } - --int tn7dsl_proc_adv_stats3(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_adv_stats2_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_adv_stats2, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_adv_stats2_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_adv_stats3(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int i; - int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+ - unsigned char SNRpsds[512]; -@@ -1061,12 +1078,10 @@ int tn7dsl_proc_adv_stats3(char* buf, ch - if( mode==1) //ADSL1 - { - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 3 of 3):\n"); -+ seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 3 of 3):\n"); - for( i =320; i<512; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -@@ -1077,283 +1092,287 @@ int tn7dsl_proc_adv_stats3(char* buf, ch - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - for( i =320; i<512; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (iAppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0); - } - } -- if(len<=limit) -- len += sprintf(buf+len, "[End of Stats]\n"); -- return len; -+ seq_printf(m, "[End of Stats]\n"); -+ return 0; - } --//UR8_MERGE_END CQ10449 --//UR8_MERGE_START CQ10682 Jack Zhang --int tn7dsl_proc_dbg_cmsgs(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+ -+static int tn7dsl_proc_adv_stats3_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_adv_stats3, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_adv_stats3_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats3_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - -+//UR8_MERGE_END CQ10449 -+//UR8_MERGE_START CQ10682 Jack Zhang -+int tn7dsl_proc_dbg_cmsgs(struct seq_file *m, void *data) -+{ - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (C-Msgs 1-5)..\n"); -+ seq_printf(m, "Training Messages (C-Msgs 1-5)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "ADSL2 DELT C-Msg1Ld \t Message Length:%d\n", -+ seq_printf(m, "ADSL2 DELT C-Msg1Ld \t Message Length:%d\n", - pIhw->adsl2DiagnosticMessages.cMsg1LdLen); - for(rc=0;rcadsl2DiagnosticMessages.cMsg1LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg1Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg1Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg2LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg2LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg2LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg2Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg2Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg3LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg3LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg3LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg3Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg3Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg4LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg4LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg4LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg4Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg4Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg5LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg5LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg5LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg5Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg5Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -- return len; -+ seq_printf(m, "\n"); -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs1(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_cmsgs_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_cmsgs, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_dbg_cmsgs_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_cmsgs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+int tn7dsl_proc_dbg_rmsgs1(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 1-3)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 1-3)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg1Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsg1LdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg1Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsg1LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.rMsg1LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg1Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg1Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg2Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg2Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg3Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg3Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -- return len; -+ seq_printf(m, "\n"); -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs2(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_rmsgs1_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_rmsgs1, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_dbg_rmsgs1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+int tn7dsl_proc_dbg_rmsgs2(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 4-5)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 4-5)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg4Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg4Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ len += sprintf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg5Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg5Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -- return len; -+ seq_printf(m, "\n"); -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs3(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_rmsgs2_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_rmsgs2, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations _fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_dbg_rmsgs3(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 6-7)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 6-7)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg6Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg6Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg6Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg6Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg7Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg7Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg7Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg7Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs4(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_rmsgs3_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_rmsgs3, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_dbg_rmsgs3_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs3_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_dbg_rmsgs4(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 8-9)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 8-9)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg8Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg8Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg8Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg8Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg9Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg9Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg9Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg9Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_dbg_rmsgs4_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_dbg_rmsgs4, PDE_DATA(inode)); - } -+ -+struct file_operations tn7dsl_proc_dbg_rmsgs4_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs4_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - //UR8_MERGE_END CQ10682* - #endif //ADV_DIAG_STATS - --int tn7dsl_proc_stats(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_stats(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int F4count, F5count; - unsigned int maxRate=0; - unsigned int us_maxRate=0; -@@ -1361,80 +1380,58 @@ int tn7dsl_proc_stats(char* buf, char ** - //UR8_MERGE_START CQ10700 Manjula K - struct atm_dev *dev; - Tn7AtmPrivate *priv; -- dev = (struct atm_dev *)data; -+ int offset[2] = { 32, 0 }; -+ unsigned int usBitswap, dsBitswap; -+ dev = (struct atm_dev *)m->private; - priv = (Tn7AtmPrivate *)dev->dev_data; - //UR8_MERGE_END CQ10700 - -+ - /* - * Read Ax5 Stats - */ - - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 DSL Modem Statistics:\n"); -- if(len<=limit) -- len += sprintf(buf+len, "--------------------------------\n"); -+ seq_printf(m, "\nAR7 DSL Modem Statistics:\n"); -+ seq_printf(m, "--------------------------------\n"); - /* - * us and ds Connection Rates - */ -- if(len<=limit) -- len += sprintf(buf+len, "[DSL Modem Stats]\n"); -+ seq_printf(m, "[DSL Modem Stats]\n"); - - -- if(len<=limit) -+ if(pIhw->lConnected != 1) - { -- if(pIhw->lConnected != 1) -- { -- pIhw->AppData.USConRate = 0; -- pIhw->AppData.DSConRate = 0; -- } -- len += -- sprintf (buf + len, -- "\tUS Connection Rate:\t%u\tDS Connection Rate:\t%u\n", -- (unsigned int)pIhw->AppData.USConRate, -- (unsigned int)pIhw->AppData.DSConRate ); -+ pIhw->AppData.USConRate = 0; -+ pIhw->AppData.DSConRate = 0; - } -- if(len<=limit) -+ seq_printf (m, -+ "\tUS Connection Rate:\t%u\tDS Connection Rate:\t%u\n", -+ (unsigned int)pIhw->AppData.USConRate, -+ (unsigned int)pIhw->AppData.DSConRate ); - // UR8_MERGE_START CQ11054 Jack Zhang -- { -- if (dslhal_api_getHighPrecision()) -- { -- len += -- sprintf (buf + len, "\tDS Line Attenuation:\t%u.%u\tDS Margin:\t\t%d.%u\n", -+ if (dslhal_api_getHighPrecision()) -+ seq_printf (m, "\tDS Line Attenuation:\t%u.%u\tDS Margin:\t\t%d.%u\n", - gInt(pIhw->AppData.dsLineAttn), gDot1(pIhw->AppData.dsLineAttn), - gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin)); -- } -- else{ -- len += -- sprintf (buf + len, "\tDS Line Attenuation:\t%u\tDS Margin:\t\t%u\n", -+ else -+ seq_printf (m, "\tDS Line Attenuation:\t%u\tDS Margin:\t\t%u\n", - (unsigned int)pIhw->AppData.dsLineAttn/2, - (unsigned int)pIhw->AppData.dsMargin/2 ); -- } -- } - // UR8_MERGE_END CQ11054* - -- if(len<=limit) - // UR8_MERGE_START CQ11054 Jack Zhang -- { -- if (dslhal_api_getHighPrecision()) -- { -- len += -- sprintf (buf + len, "\tUS Line Attenuation:\t%u.%u\tUS Margin:\t\t%d.%u\n", -+ if (dslhal_api_getHighPrecision()) -+ seq_printf (m, "\tUS Line Attenuation:\t%u.%u\tUS Margin:\t\t%d.%u\n", - gInt(pIhw->AppData.usLineAttn), gDot1(pIhw->AppData.usLineAttn), - gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin)); -- } -- else -- { -- len += -- sprintf (buf + len, "\tUS Line Attenuation:\t%u\tUS Margin:\t\t%u\n", -+ else -+ seq_printf (m, "\tUS Line Attenuation:\t%u\tUS Margin:\t\t%u\n", - (unsigned int)pIhw->AppData.usLineAttn/2, - (unsigned int)pIhw->AppData.usMargin ); -- } -- } - // UR8_MERGE_END CQ11054* - -- if(len<=limit) -- len += sprintf(buf+len, "\tUS Payload :\t\t%u\tDS Payload:\t\t%u\n", -+ seq_printf(m, "\tUS Payload :\t\t%u\tDS Payload:\t\t%u\n", - ((unsigned int) pIhw->AppData.usAtm_count[0] + - (unsigned int) pIhw->AppData.usAtm_count[1]) * 48, - ((unsigned int) pIhw->AppData.dsGood_count[0] + -@@ -1442,9 +1439,7 @@ int tn7dsl_proc_stats(char* buf, char ** - /* - * Superframe Count - */ -- if(len<=limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tUS Superframe Cnt :\t%u\tDS Superframe Cnt:\t%u\n", - (unsigned int)pIhw->AppData.usSuperFrmCnt, - (unsigned int)pIhw->AppData.dsSuperFrmCnt ); -@@ -1452,57 +1447,45 @@ int tn7dsl_proc_stats(char* buf, char ** - /* - * US and DS power - */ -- if(len<=limit) -+ if(pIhw->AppData.bState < 5) - { -- if(pIhw->AppData.bState < 5) -- { -- pIhw->AppData.usTxPower = 0; -- pIhw->AppData.dsTxPower = 0; -- } -- len += -- sprintf (buf + len, -+ pIhw->AppData.usTxPower = 0; -+ pIhw->AppData.dsTxPower = 0; -+ } -+ seq_printf (m, -+// UR8_MERGE_START - CQ11579 - Jeremy #1 - "\tUS Transmit Power :\t%u\tDS Transmit Power:\t%u\n", - (unsigned int)pIhw->AppData.usTxPower/256, - (unsigned int)pIhw->AppData.dsTxPower/256 ); -- } -+// UR8_MERGE_END - CQ11579 - /* - * DSL Stats Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\tLOS errors:\t\t%u\tSEF errors:\t\t%u\n", -+ seq_printf(m, "\tLOS errors:\t\t%u\tSEF errors:\t\t%u\n", - (unsigned int)pIhw->AppData.LOS_errors, - (unsigned int)pIhw->AppData.SEF_errors ); - - //UR8_MERGE_START Report_SES Manjula K - //CQ10369 -- if(len<=limit) -- len += sprintf(buf+len, "\tErrored Seconds:\t%u\tSeverely Err Secs:\t%u\n", -+ seq_printf(m, "\tErrored Seconds:\t%u\tSeverely Err Secs:\t%u\n", - (unsigned int)pIhw->AppData.erroredSeconds, - (unsigned int)pIhw->AppData.severelyerrsecs ); - //UR8_MERGE_END Report_SES -- -- if(len<=limit) -- len += sprintf(buf+len, "\tFrame mode:\t\t%u\tMax Frame mode:\t\t%u\n", -+ -+ seq_printf(m, "\tFrame mode:\t\t%u\tMax Frame mode:\t\t%u\n", - (unsigned int)pIhw->AppData.FrmMode, - (unsigned int)pIhw->AppData.MaxFrmMode ); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTrained Path:\t\t%u\tUS Peak Cell Rate:\t%u\n", -+ seq_printf (m, "\tTrained Path:\t\t%u\tUS Peak Cell Rate:\t%u\n", - (unsigned int)pIhw->AppData.TrainedPath, - (unsigned int)pIhw->AppData.USConRate*1000/8/53 ); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTrained Mode:\t\t%u\tSelected Mode:\t\t%u\n", -+ seq_printf (m, "\tTrained Mode:\t\t%u\tSelected Mode:\t\t%u\n", - (unsigned int) pIhw->AppData.TrainedMode, - (unsigned int) pIhw->AppData.StdMode); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tATUC Vendor Code:\t%X\tATUC Revision:\t%u\n", -+ seq_printf (m, "\tATUC Vendor Code:\t%X\tATUC Revision:\t%u\n", - (unsigned int) pIhw->AppData.atucVendorId, - pIhw->AppData.atucRevisionNum); -- if(len<=limit) -- len += sprintf(buf+len, "\tHybrid Selected:\t%u\tTrellis:\t\t%u\n", -+ seq_printf(m, "\tHybrid Selected:\t%u\tTrellis:\t\t%u\n", - (unsigned int)pIhw->AppData.currentHybridNum, trellis); - - //@Added Maximum attainable bit rate information. 05-14-2004 -@@ -1514,12 +1497,12 @@ int tn7dsl_proc_stats(char* buf, char ** - } - else - { -- int offset[2] = {5, 1}; -+ int dspOffset[2] = { 5, 1 }; - unsigned char rMsgsRA[12]; - int numPayloadBytes = 0; - - dslhal_api_dspInterfaceRead (pIhw, (unsigned int) pIhw->pmainAddr, 2, -- (unsigned int *) &offset, -+ (unsigned int *) &dspOffset, - (unsigned char *) &rMsgsRA[0], 12); - - maxRate = (unsigned int)pIhw->AppData.DSConRate; -@@ -1535,283 +1518,213 @@ int tn7dsl_proc_stats(char* buf, char ** - } - } - -- if(len<=limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tShowtime Count:\t\t%u\tDS Max Attainable Bit Rate: %u kbps\n", - (unsigned int)pIhw->AppData.showtimeCount, maxRate); - -- if(len<=limit) -- { -- int offset[2] = {32, 0}; -- unsigned int usBitswap, dsBitswap; -+ tn7dsl_generic_read(2, (unsigned int *)&offset); -+ dsBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); - -- tn7dsl_generic_read(2, (unsigned int *)&offset); -- dsBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); -+ offset[0] = 33; -+ tn7dsl_generic_read(2, (unsigned int *)&offset); -+ usBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); - -- offset[0] = 33; -- tn7dsl_generic_read(2, (unsigned int *)&offset); -- usBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); -- -- if(pIhw->AppData.dsl_modulation > 5) -- len += -- sprintf (buf + len, -+ if(pIhw->AppData.dsl_modulation > 5) -+ seq_printf (m, - "\tBitSwap:\t\t%u\tUS Max Attainable Bit Rate: %u bps\n", - (unsigned int)(usBitswap && dsBitswap), us_maxRate); -- else -- len += -- sprintf (buf + len, -+ else -+ seq_printf (m, - "\tBitSwap:\t\t%u\tUS Max Attainable Bit Rate:\tn/a\n", - (unsigned int)(usBitswap && dsBitswap)); -- } - - #if 1 // TR69 -- if(len<=limit) -- len += -- sprintf (buf + len, "\tAnnex: \t\t\t%s\tpsd_mask_qualifier: 0x%04x\n", -+ seq_printf (m, "\tAnnex: \t\t\t%s\tpsd_mask_qualifier: 0x%04x\n", - tn7dsl_AnnexFromNum(pIhw->AppData.annex_selected), - pIhw->AppData.psd_mask_qualifier); - - // UR8_MERGE_START CQ10979 Jack Zhang - // UR8_MERGE_START CQ10978 Jack Zhang -- if(len<=limit) -- len += -- sprintf (buf + len, "\tPower Management Status: L%d\tDS HLINSC: %d\n", -+ seq_printf (m, "\tPower Management Status: L%d\tDS HLINSC: %d\n", - pIhw->AppData.pwrStatus, pIhw->AppData.dsHLINSC); - // UR8_MERGE_END CQ10978* - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tUS ACTPSD: \t\t%d\tDS ACTPSD: %d\n", -+ seq_printf (m, "\tUS ACTPSD: \t\t%d\tDS ACTPSD: %d\n", - pIhw->AppData.usACTPSD, pIhw->AppData.dsACTPSD); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTotal init. errors: \t%d\tTotal init. timeouts: %d\n", -+ seq_printf (m, "\tTotal init. errors: \t%d\tTotal init. timeouts: %d\n", - pIhw->AppData.totalInitErrs, pIhw->AppData.totalInitTOs); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tShowtime init. errors: \t%d\tShowtime init. timeouts: %d\n", -+ seq_printf (m, "\tShowtime init. errors: \t%d\tShowtime init. timeouts: %d\n", - pIhw->AppData.showtimeInitErrs, pIhw->AppData.showtimeInitTOs); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tLast showtime init. errors: %ld\tLast showtime init. timeouts: %ld\n", -+ seq_printf (m, "\tLast showtime init. errors: %ld\tLast showtime init. timeouts: %ld\n", - pIhw->AppData.lastshowInitErrs, pIhw->AppData.lastshowInitTOs); - // UR8_MERGE_END CQ10979* - -- if (len<=limit) -- { -- len += sprintf(buf+len,"\tATUC ghsVid: "); -- for (i=0; i<8; i++) -- len+= sprintf(buf+len, " %02x", pIhw->AppData.ghsATUCVendorId[i]); -- } -+ seq_printf(m,"\tATUC ghsVid: "); -+ for (i=0; i<8; i++) -+ seq_printf(m, " %02x", pIhw->AppData.ghsATUCVendorId[i]); - -- if (len<=limit) -- { -- len += sprintf (buf + len, "\n"); -- } -+ seq_printf (m, "\n"); - -- if (len <= limit) -- { -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tT1413Vid: %02x %02x\t\tT1413Rev: %02x\t\tVendorRev: %02x\n", - pIhw->AppData.t1413ATUC.VendorId[0], - pIhw->AppData.t1413ATUC.VendorId[1], - pIhw->AppData.t1413ATUC.t1413Revision, - pIhw->AppData.t1413ATUC.VendorRevision); -- } - -- if (len<=limit) -- { -- len += sprintf(buf+len,"\tATUR ghsVid: "); -- for (i=0; i<8; i++) -- len+= sprintf(buf+len, " %02x", pIhw->AppData.ghsATURVendorId[i]); -- } -+ seq_printf(m,"\tATUR ghsVid: "); -+ for (i=0; i<8; i++) -+ seq_printf(m, " %02x", pIhw->AppData.ghsATURVendorId[i]); - -- if (len<=limit) -- { -- len += sprintf (buf + len, "\n"); -- } -+ seq_printf (m, "\n"); - -- if (len <= limit) -- { -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tT1413Vid: %02x %02x\tT1413Rev: %02x\tVendorRev: %02x\n", - pIhw->AppData.t1413ATUR.VendorId[0], - pIhw->AppData.t1413ATUR.VendorId[1], - pIhw->AppData.t1413ATUR.t1413Revision, - pIhw->AppData.t1413ATUR.VendorRevision); -- } - - #endif - /* - * Upstream Interleaved Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Upstream (TX) Interleave path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Upstream (TX) Interleave path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.usICRC_errors, - (unsigned int)pIhw->AppData.usIFEC_errors, - (unsigned int)pIhw->AppData.usINCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", - (unsigned int)pIhw->AppData.usILCD_errors, - (unsigned int)pIhw->AppData.usIHEC_errors); - /* - * Downstream Interleaved Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Downstream (RX) Interleave path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Downstream (RX) Interleave path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.dsICRC_errors, - (unsigned int)pIhw->AppData.dsIFEC_errors, - (unsigned int)pIhw->AppData.dsINCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", - (unsigned int)pIhw->AppData.dsILCD_errors, - (unsigned int)pIhw->AppData.dsIHEC_errors); - /* - * Upstream Fast Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Upstream (TX) Fast path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Upstream (TX) Fast path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.usFCRC_errors, - (unsigned int)pIhw->AppData.usFFEC_errors, - (unsigned int)pIhw->AppData.usFNCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", - (unsigned int)pIhw->AppData.usFLCD_errors, - (unsigned int)pIhw->AppData.usFHEC_errors); - /* - * Downstream Fast Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Downstream (RX) Fast path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Downstream (RX) Fast path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.dsFCRC_errors, - (unsigned int)pIhw->AppData.dsFFEC_errors, - (unsigned int)pIhw->AppData.dsFNCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -- (unsigned int)pIhw->AppData.dsFLCD_errors, -- (unsigned int)pIhw->AppData.dsFHEC_errors); -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", -+ (unsigned int)pIhw->AppData.dsFLCD_errors, -+ (unsigned int)pIhw->AppData.dsFHEC_errors); - - /* - * ATM stats upstream - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n[ATM Stats]"); -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Upstream/TX]\n"); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\n", -- (unsigned int) pIhw->AppData.usAtm_count[0] + -- (unsigned int) pIhw->AppData.usAtm_count[1], -- (unsigned int) pIhw->AppData.usIdle_count[0] + -- (unsigned int) pIhw->AppData.usIdle_count[1]); --//UR8_MERGE_START CQ10700 Manjula K -- if (len <= limit) -- len += -- sprintf (buf + len, -+ seq_printf(m, "\n[ATM Stats]"); -+ seq_printf(m, "\n\t[Upstream/TX]\n"); -+ seq_printf (m, "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\n", -+ (unsigned int) pIhw->AppData.usAtm_count[0] + -+ (unsigned int) pIhw->AppData.usAtm_count[1], -+ (unsigned int) pIhw->AppData.usIdle_count[0] + -+ (unsigned int) pIhw->AppData.usIdle_count[1]); -+//UR8_MERGE_START CQ10700 Manjula K -+ seq_printf (m, - "\tTx Packets Dropped Count:\t%lu\n\tTx Bad Packets Count:\t%lu\n", - priv->stats.tx_dropped, priv->stats.tx_errors); - //UR8_MERGE_END CQ10700 - /* - * ATM stats downstream - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Downstream/RX)]\n"); -- if(len<=limit) -- len += -- sprintf (buf + len, -- "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\tBad Hec Cell Cnt:\t%u\n", -- (unsigned int) pIhw->AppData.dsGood_count[0] + -- (unsigned int) pIhw->AppData.dsGood_count[1], -- (unsigned int) pIhw->AppData.dsIdle_count[0] + -- (unsigned int) pIhw->AppData.dsIdle_count[1], -- (unsigned int) pIhw->AppData.dsBadHec_count[0] + -- (unsigned int) pIhw->AppData.dsBadHec_count[1]); -- if(len<=limit) -- len += sprintf(buf+len, "\tOverflow Dropped Cell Cnt:\t%u\n", -- (unsigned int) pIhw->AppData.dsOVFDrop_count[0] + -- (unsigned int) pIhw->AppData.dsOVFDrop_count[1]); -- -- //UR8_MERGE_START CQ10700 Manjula K -- if (len <= limit) -- len += -- sprintf (buf + len, -- "\tRx Packets Dropped Count:\t%lu\n\tRx Bad Packets Count:\t%lu\n\n", -- priv->stats.rx_dropped, priv->stats.rx_errors); -+ seq_printf(m, "\n\t[Downstream/RX)]\n"); -+ seq_printf (m, -+ "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\tBad Hec Cell Cnt:\t%u\n", -+ (unsigned int) pIhw->AppData.dsGood_count[0] + -+ (unsigned int) pIhw->AppData.dsGood_count[1], -+ (unsigned int) pIhw->AppData.dsIdle_count[0] + -+ (unsigned int) pIhw->AppData.dsIdle_count[1], -+ (unsigned int) pIhw->AppData.dsBadHec_count[0] + -+ (unsigned int) pIhw->AppData.dsBadHec_count[1]); -+ seq_printf(m, "\tOverflow Dropped Cell Cnt:\t%u\n", -+ (unsigned int) pIhw->AppData.dsOVFDrop_count[0] + -+ (unsigned int) pIhw->AppData.dsOVFDrop_count[1]); -+ -+ //UR8_MERGE_START CQ10700 Manjula K -+ seq_printf (m, -+ "\tRx Packets Dropped Count:\t%lu\n\tRx Bad Packets Count:\t%lu\n\n", -+ priv->stats.rx_dropped, priv->stats.rx_errors); - //UR8_MERGE_END CQ10700 - - tn7sar_get_stats(pIhw->pOsContext); -- if(len<=limit) -- len += sprintf(buf+len, "\n[SAR AAL5 Stats]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tTx PDU's:\t%u\n\tRx PDU's:\t%u\n", -- sarStat.txPktCnt, sarStat.rxPktCnt); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTx Total Bytes:\t%u\n\tRx Total Bytes:\t%u\n", -- sarStat.txBytes, sarStat.rxBytes); -- if (len <= limit) -- len += -- sprintf (buf + len, -- "\tTx Total Error Counts:\t%u\n\tRx Total Error Counts:\t%u\n\n", -- sarStat.txErrors, sarStat.rxErrors); -+ seq_printf(m, "\n[SAR AAL5 Stats]\n"); -+ seq_printf(m, "\tTx PDU's:\t%u\n\tRx PDU's:\t%u\n", -+ sarStat.txPktCnt, sarStat.rxPktCnt); -+ seq_printf (m, "\tTx Total Bytes:\t%u\n\tRx Total Bytes:\t%u\n", -+ sarStat.txBytes, sarStat.rxBytes); -+ seq_printf (m, -+ "\tTx Total Error Counts:\t%u\n\tRx Total Error Counts:\t%u\n\n", -+ sarStat.txErrors, sarStat.rxErrors); - - /* - * oam loopback info - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n[OAM Stats]\n"); -+ seq_printf(m, "\n[OAM Stats]\n"); - - tn7sar_get_near_end_loopback_count(&F4count, &F5count); - -- if(len<=limit) -- { -- len += -- sprintf (buf + len, -- "\tNear End F5 Loop Back Count:\t%u\n\tNear End F4 Loop Back Count:\t%u\n\tFar End F5 Loop Back Count:\t%u\n\tFar End F4 Loop Back Count:\t%u\n", -+ seq_printf (m, -+ "\tNear End F5 Loop Back Count:\t%u\n\tNear End F4 Loop Back Count:\t%u\n\tFar End F5 Loop Back Count:\t%u\n\tFar End F4 Loop Back Count:\t%u\n", - F5count, F4count, oamFarLBCount[0] + oamFarLBCount[2], - oamFarLBCount[1] + oamFarLBCount[3]); -- } - - #define USE_OAM_DROP_COUNT //CQ10273 - //Read OAM ping responses count: - #ifdef USE_OAM_DROP_COUNT -- if(len<=limit) -- { -- /* len += -- sprintf (buf + len, -- "\tSAR OAM Retry in 0x%X cycles, Drop Count=%d\n", -- tn7dsl_get_memory(0xa30085cc), tn7dsl_get_memory(0xa30085c4)); */ -+/* seq_printf (m, -+ "\tSAR OAM Retry in 0x%X cycles, Drop Count=%d\n", -+ tn7dsl_get_memory(0xa30085cc), tn7dsl_get_memory(0xa30085c4)); */ - -- len += sprintf (buf + len, "\tSAR OAM Ping Response Drop Count=%d\n", -- tn7dsl_get_memory(0xa30085b0)); -- } -+ seq_printf (m, "\tSAR OAM Ping Response Drop Count=%d\n", -+ tn7dsl_get_memory(0xa30085b0)); - #endif // USE_OAM_DROP_COUNT - -- return len; -+ return 0; - } - --int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_stats_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_stats, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+int tn7dsl_proc_write_stats (struct file *fp, const char *buf, unsigned long count, void *data); -+ -+struct file_operations tn7dsl_proc_stats_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_stats_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+ .write = tn7dsl_proc_write_stats, -+}; - -+static int tn7dsl_proc_modem(struct seq_file *m, void *data) -+{ - char *state; - int tag; - -@@ -1845,16 +1758,26 @@ int tn7dsl_proc_modem(char* buf, char ** - - if(pIhw->lConnected == 1) - state = "SHOWTIME"; -- if(len<=limit) -- len += sprintf(buf+len,"%s\n",state); -- if(len<=limit) -- len += sprintf(buf+len, "%d\n", dslReg); -- if(len<=limit) -- len += sprintf(buf+len, "failTrains=%d\n", pIhw->AppData.trainFails); -+ seq_printf(m,"%s\n",state); -+ seq_printf(m, "%d\n", dslReg); -+ seq_printf(m, "failTrains=%d\n", pIhw->AppData.trainFails); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_modem_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_modem, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_modem_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_modem_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - /********************************************************************** - ** * - ** tn7dsl_hdlc_update_crc() -- Calculate CRC * -@@ -2119,11 +2042,8 @@ static int tn7dsl_hdlc_rx_process(unsign - return(ret); - } - --int tn7dsl_proc_eoc (char *buf, char **start, off_t OffSet, int count, -- int *eof, void *data) -+static int tn7dsl_proc_eoc (struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - int offset[2] = {34, 0}; // point to buffer parameter data structure - clearEocParm_t peoc; - -@@ -2132,62 +2052,49 @@ int tn7dsl_proc_eoc (char *buf, char **s - (unsigned char *) &peoc, - sizeof (clearEocParm_t)); - -- if (len <= limit) -- len += sprintf(buf+len, "\nClear EOC Channel:\n\n"); -- if (len <= limit) -- len += sprintf(buf+len, " Enabled:\t%d\n", dslhal_support_byteSwap32(peoc.clearEocEnabled)); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[0])); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[1])); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[2])); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[3])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[0])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[1])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[2])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[3])); -- if (len <= limit) -- len += sprintf(buf+len, " txRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txRdIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " txWrIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txWrIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " rxRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.rxRdIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " rxWrIndex:\t%d\n\n", dslhal_support_byteSwap32(peoc.rxWrIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " TotalTxPkts:\t%d\n", EocTxTotalPackets); -- if (len <= limit) -- len += sprintf(buf+len, " TotalRxPkts:\t%d\n", EocRxTotalPackets); -- if (len <= limit) -- len += sprintf(buf+len, " TotalTxBytes:\t%d\n", EocTxTotalBytes); -- if (len <= limit) -- len += sprintf(buf+len, " TotalRxBytes:\t%d\n\n", EocRxTotalBytes); -- if (len <= limit) -- len += sprintf(buf+len, " ErrBufFull:\t%d\n", ErrEocBufFull); -- if (len <= limit) -- len += sprintf(buf+len, " ErrBufIndx:\t%d\n", ErrEocBufIndex); -- if (len <= limit) -- len += sprintf(buf+len, " ErrBufMax:\t%d\n", ErrEocBufMax); -- if (len <= limit) -- len += sprintf(buf+len, " ErrMsgMax:\t%d\n", ErrEocMsgOversized); -- if (len <= limit) -- len += sprintf(buf+len, " ErrTxHDLC:\t%d\n", ErrEocTxHdlcCRC); -- if (len <= limit) -- len += sprintf(buf+len, " ErrRxHDLC:\t%d\n", ErrEocRxHdlcCRC); -- if (len <= limit) -- len += sprintf(buf+len, " ErrRxSnmp:\t%d\n", ErrEocRxHdlcFraming); -- if (len <= limit) -- len += sprintf(buf+len, " ErrRxPush:\t%d\n\n", ErrEocRxPush); -+ seq_printf(m, "\nClear EOC Channel:\n\n"); -+ seq_printf(m, " Enabled:\t%d\n", dslhal_support_byteSwap32(peoc.clearEocEnabled)); -+ seq_printf(m, " TxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[0])); -+ seq_printf(m, " TxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[1])); -+ seq_printf(m, " TxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[2])); -+ seq_printf(m, " TxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[3])); -+ seq_printf(m, " RxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[0])); -+ seq_printf(m, " RxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[1])); -+ seq_printf(m, " RxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[2])); -+ seq_printf(m, " RxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[3])); -+ seq_printf(m, " txRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txRdIndex)); -+ seq_printf(m, " txWrIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txWrIndex)); -+ seq_printf(m, " rxRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.rxRdIndex)); -+ seq_printf(m, " rxWrIndex:\t%d\n\n", dslhal_support_byteSwap32(peoc.rxWrIndex)); -+ seq_printf(m, " TotalTxPkts:\t%d\n", EocTxTotalPackets); -+ seq_printf(m, " TotalRxPkts:\t%d\n", EocRxTotalPackets); -+ seq_printf(m, " TotalTxBytes:\t%d\n", EocTxTotalBytes); -+ seq_printf(m, " TotalRxBytes:\t%d\n\n", EocRxTotalBytes); -+ seq_printf(m, " ErrBufFull:\t%d\n", ErrEocBufFull); -+ seq_printf(m, " ErrBufIndx:\t%d\n", ErrEocBufIndex); -+ seq_printf(m, " ErrBufMax:\t%d\n", ErrEocBufMax); -+ seq_printf(m, " ErrMsgMax:\t%d\n", ErrEocMsgOversized); -+ seq_printf(m, " ErrTxHDLC:\t%d\n", ErrEocTxHdlcCRC); -+ seq_printf(m, " ErrRxHDLC:\t%d\n", ErrEocRxHdlcCRC); -+ seq_printf(m, " ErrRxSnmp:\t%d\n", ErrEocRxHdlcFraming); -+ seq_printf(m, " ErrRxPush:\t%d\n\n", ErrEocRxPush); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_eoc_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_eoc, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_eoc_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_eoc_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - int tn7dsl_clear_eoc_setup(void) - { - int i; -@@ -4407,14 +4314,10 @@ int tn7dsl_proc_write_stats (struct file - } - - --int tn7dsl_proc_train_mode_export (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7dsl_proc_train_mode_export (struct seq_file *m, void *data) - { - -- int len = 0; -- char *cp = buf + offset; - int i = 0; -- static int ctr = 0; - - typedef struct - { -@@ -4495,197 +4398,185 @@ int tn7dsl_proc_train_mode_export (char - } - - -- if(len <= count) -+ for (i = 0; (i < num_entries) ; i++) - { -- for (i = ctr; ((i < num_entries)&& (len <= count)) ; i++) -- { -- /* -- * Write the current string only if we can fit it into the buffer -- */ -- if((strlen(dsl_modes[i].mode_name) + 6 + len) <= count) -- { -- len += snprintf(cp+len, (count - len), "%s\t\t\t%#x\n", -- dsl_modes[i].mode_name, dsl_modes[i].mode_value); -- } -- else -- break; -- } -+ seq_printf(m, "%s\t\t\t%#x\n", -+ dsl_modes[i].mode_name, dsl_modes[i].mode_value); - } - -- /* -- * Data was completely written -- */ -- if (i >= num_entries) -- { -- /* -- * We are done with this -- */ -- *eof = 1; -- ctr = 0; -- } -- else -- { -- /* -- * We have not been able to write the complete data, and we have to nul -- * terminate the buffer. -- */ -- *(cp + len) = '\0'; -- -- /* -- * Save the value of the counter for the next read for the rest of the -- * data. -- */ -- ctr = i; -- } -- -- return len; -+ return 0; - } - --#ifndef NO_ADV_STATS --int tn7dsl_proc_SNRpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_train_mode_export_open(struct inode *inode, struct file *file) - { -- int len = 0; -- -+ return single_open(file, tn7dsl_proc_train_mode_export, PDE_DATA(inode)); -+} - -+struct file_operations tn7dsl_proc_train_mode_export_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_train_mode_export_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - -- int limit = count - 80; -+#ifndef NO_ADV_STATS -+int tn7dsl_proc_SNRpsds(struct seq_file *m, void *data) -+{ - int i; - unsigned char SNRpsds[512]; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 SNRpsds:"); -+ seq_printf(m, "\nAR7 SNRpsds:"); - - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - - for (i=0; iAppData.max_ds_tones; i++) - { - if (!(i%16)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len <=limit) -- len += sprintf(buf+len, "%d ", (unsigned char)SNRpsds[i]); -+ seq_printf(m, "%d ", (unsigned char)SNRpsds[i]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - - - -- return len; -+ return 0; - } - -+static int tn7dsl_proc_SNRpsds_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_SNRpsds, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_SNRpsds_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_SNRpsds_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif - - #ifndef NO_ADV_STATS --int tn7dsl_proc_QLNpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_QLNpsds(struct seq_file *m, void *data) - { -- int len = 0; -- -- int limit = count - 80; - unsigned char QLNpsds[512]; - int i; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 QLNpsds:"); -+ seq_printf(m, "\nAR7 QLNpsds:"); - - // call API instead of access internal buf directly - if (dslhal_api_getQLNpsds(pIhw, QLNpsds, 0)) - { - dgprintf(4, "dslhal_api_getQLNpsds failed!\n"); -- return len; -+ return -EIO; - } - - for (i=0; iAppData.max_ds_tones; i++) - { - if (!(i%16)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len <=limit) -- len += sprintf(buf+len, "%d ", (unsigned char)QLNpsds[i]); -+ seq_printf(m, "%d ", (unsigned char)QLNpsds[i]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - - -- return len; -+ return 0; - } -+ -+static int tn7dsl_proc_QLNpsds_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_QLNpsds, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_QLNpsds_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_QLNpsds_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif - - // UR8_MERGE_START CQ10979 Jack Zhang - #ifdef TR69_HLIN_IN - #ifndef NO_ADV_STATS --int tn7dsl_proc_HLINpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds(struct seq_file *m, void *data) - { -- int len = 0; -- -- int limit = count - 80; - short HLINpsds[2*512]; - int i; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 HLINpsds:"); -+ seq_printf(m, "\nAR7 HLINpsds:"); - - // call API instead of access internal buf directly - if (dslhal_api_getHLINpsds(pIhw, (unsigned char *)HLINpsds, 1)) - { - dgprintf(4, "dslhal_api_getHLINpsds failed!\n"); -- return len; -+ return -EIO; - } - - for (i=0; iAppData.max_ds_tones; i++) - { - if (!(i%8)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len <=limit) -- len += sprintf(buf+len, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); -+ seq_printf(m, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - - -- return len; -+ return 0; - } - --static int tn7dsl_proc_HLINpsdsIndx(char* buf, char **start, off_t offset, int count,int *eof, void *data, int indx) -+static int tn7dsl_proc_HLINpsds_open(struct inode *inode, struct file *file) - { -- int len = 0; -+ return single_open(file, tn7dsl_proc_HLINpsds, PDE_DATA(inode)); -+} - -- int limit = count - 80; -+struct file_operations tn7dsl_proc_HLINpsds_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int tn7dsl_proc_HLINpsdsIndx(struct seq_file *m, void *data, int indx) -+{ - short HLINpsds[2*512]; - int i; - int start=0, dim=128; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 HLINpsds: (section %d)", indx); -+ seq_printf(m, "\nAR7 HLINpsds: (section %d)", indx); - - if((indx > 2) && (pIhw->AppData.max_ds_tones <= 256)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n[End of data]"); -- return len; -+ seq_printf(m, "\n[End of data]"); -+ return 0; - } - - // call API instead of access internal buf directly - if (dslhal_api_getHLINpsds(pIhw, (unsigned char *)HLINpsds, 1)) - { - dgprintf(4, "dslhal_api_getHLINpsds failed!\n"); -- return len; -+ return -EIO; - } - - start = (indx -1) * 128; -@@ -4694,39 +4585,89 @@ static int tn7dsl_proc_HLINpsdsIndx(char - { - if (!(i%8)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n%d: ", i); -+ seq_printf(m, "\n%d: ", i); - } - -- if(len <=limit) -- len += sprintf(buf+len, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); -+ seq_printf(m, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_HLINpsds1(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 1); -+} -+ -+static int tn7dsl_proc_HLINpsds2(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 2); -+} -+ -+static int tn7dsl_proc_HLINpsds3(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 3); -+} -+ -+static int tn7dsl_proc_HLINpsds4(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 4); - } - --int tn7dsl_proc_HLINpsds1(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds1_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 1); -+ return single_open(file, tn7dsl_proc_HLINpsds1, PDE_DATA(inode)); - } - --int tn7dsl_proc_HLINpsds2(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds2_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 2); -+ return single_open(file, tn7dsl_proc_HLINpsds2, PDE_DATA(inode)); - } - --int tn7dsl_proc_HLINpsds3(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds3_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 3); -+ return single_open(file, tn7dsl_proc_HLINpsds3, PDE_DATA(inode)); - } - --int tn7dsl_proc_HLINpsds4(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds4_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 4); -+ return single_open(file, tn7dsl_proc_HLINpsds4, PDE_DATA(inode)); - } -+ -+struct file_operations tn7dsl_proc_HLINpsds1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+struct file_operations tn7dsl_proc_HLINpsds2_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+struct file_operations tn7dsl_proc_HLINpsds3_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds3_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+struct file_operations tn7dsl_proc_HLINpsds4_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds4_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif - #endif //TR69_HLIN_IN - // UR8_MERGE_END CQ10979* -@@ -4734,64 +4675,48 @@ int tn7dsl_proc_HLINpsds4(char* buf, cha - // * UR8_MERGE_START CQ11057 Jack Zhang - #ifdef TR69_PMD_IN - #ifndef NO_ADV_STATS --int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_PMDus(struct seq_file *m, void *data) - { -- int len = 0; -- -- int limit = count - 80; - int i; - CoPMDTestParams_t co_pmdtest_params; -- -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 US PMD Test:\n"); -+ -+ seq_printf(m, "\nAR7 US PMD Test:\n"); - - // call API instead of access internal buf directly - if (dslhal_api_getPMDTestus(pIhw, &co_pmdtest_params, 0) != DSLHAL_ERROR_NO_ERRORS) - { - dgprintf(4, "dslhal_api_getPMDTestus failed!\n"); -- return len; -+ return -EIO; - } - -- if(len<=limit) -- len += sprintf(buf+len, "LATN=%d\n", co_pmdtest_params.co_latn); -+ seq_printf(m, "LATN=%d\n", co_pmdtest_params.co_latn); - -- if(len<=limit) -- len += sprintf(buf+len, "SATN=%d\n", co_pmdtest_params.co_satn); -+ seq_printf(m, "SATN=%d\n", co_pmdtest_params.co_satn); - -- if(len<=limit) -- len += sprintf(buf+len, "SNRM=%d\n", co_pmdtest_params.usMargin); -+ seq_printf(m, "SNRM=%d\n", co_pmdtest_params.usMargin); - -- if(len<=limit) -- len += sprintf(buf+len, "attndr=%ld\n", co_pmdtest_params.co_attndr); -+ seq_printf(m, "attndr=%ld\n", co_pmdtest_params.co_attndr); - -- if(len<=limit) -- len += sprintf(buf+len, "NearActatp=%d\n", co_pmdtest_params.co_near_actatp); -+ seq_printf(m, "NearActatp=%d\n", co_pmdtest_params.co_near_actatp); - -- if(len<=limit) -- len += sprintf(buf+len, "FarActatp=%d\n", co_pmdtest_params.co_far_actatp); -+ seq_printf(m, "FarActatp=%d\n", co_pmdtest_params.co_far_actatp); - - //HLOG - for (i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) -- { -- if(len <=limit) -- len += sprintf(buf+len, "\nHLOG(%3d):", i); -- } -- if(len <=limit) -- len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOHlogfMsg[i]); -+ seq_printf(m, "\nHLOG(%3d):", i); -+ -+ seq_printf(m, " %d", co_pmdtest_params.TestParmCOHlogfMsg[i]); - } - - //QLN - for (i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) -- { -- if(len <=limit) -- len += sprintf(buf+len, "\nQLN(%3d):", i); -- } -- if(len <=limit) -- len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOQLNfMsg[i]); -+ seq_printf(m, "\nQLN(%3d):", i); -+ -+ seq_printf(m, " %d", co_pmdtest_params.TestParmCOQLNfMsg[i]); - - } - -@@ -4799,19 +4724,28 @@ int tn7dsl_proc_PMDus(char* buf, char ** - for (i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) -- { -- if(len <=limit) -- len += sprintf(buf+len, "\nSNR(%3d):", i); -- } -- if(len <=limit) -- len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOSNRfMsg[i]); -+ seq_printf(m, "\nSNR(%3d):", i); -+ seq_printf(m, " %d", co_pmdtest_params.TestParmCOSNRfMsg[i]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_PMDus_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_PMDus, PDE_DATA(inode)); - } -+ -+struct file_operations tn7dsl_proc_PMDus_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_PMDus_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif //NO_ADV_STATS - #endif //TR69_PMD_IN - // * UR8_MERGE_END CQ11057 * ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -1395,44 +1395,66 @@ int tn7sar_oam_generation(void *privCont - return 0; - } - --int tn7sar_proc_oam_ping(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7sar_proc_oam_ping(struct seq_file *m, void *data) - { -- int len = 0; - unsigned int oam_ps = oamPingStatus; - - if( oam_ps == OAM_PING_PENDING_RECVD ) - oam_ps = OAM_PING_PENDING; //jz CQ9861: Only export the PENDING status, not internal state - -- len += sprintf(buf+len, "%d\n", oam_ps); //oamPingStatus); -+ seq_printf(m, "%d\n", oam_ps); //oamPingStatus); - -- return len; -+ return 0; - } - --int tn7sar_proc_pvc_table(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7sar_proc_oam_ping_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7sar_proc_oam_ping, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7sar_proc_oam_ping_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7sar_proc_oam_ping_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+static int tn7sar_proc_pvc_table(struct seq_file *m, void *data) - { -- int len = 0; - int i; - - for(i=0;i<16;i++) - { - if(pvc_result[i].bInUse) - { -- len += sprintf(buf+len, "%d,%d\n", pvc_result[i].vpi,pvc_result[i].vci); -+ seq_printf(m, "%d,%d\n", pvc_result[i].vpi,pvc_result[i].vci); - } - else - { -- len += sprintf(buf+len, "0,0\n"); -+ seq_printf(m, "0,0\n"); - } - } -- return len; -+ return 0; -+} -+ -+static int tn7sar_proc_pvc_table_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7sar_proc_pvc_table, PDE_DATA(inode)); - } - -+struct file_operations tn7sar_proc_pvc_table_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7sar_proc_pvc_table_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - - --int tn7sar_proc_sar_stat(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7sar_proc_sar_stat(struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - struct atm_dev *dev; - Tn7AtmPrivate *priv; - int i, j, k; -@@ -1441,21 +1463,19 @@ int tn7sar_proc_sar_stat(char* buf, char - unsigned int *pStateBase, *pSarStat; - HAL_FUNCTIONS *pHalFunc; - HAL_DEVICE *pHalDev; -- int dBytes; - -- dev = (struct atm_dev *)data; -+ dev = (struct atm_dev *)m->private; - priv = (Tn7AtmPrivate *)dev->dev_data; - - pHalFunc = (HAL_FUNCTIONS *)priv->pSarHalFunc; - pHalDev = (HAL_DEVICE *)priv->pSarHalDev; - -- len += sprintf(buf+len, "SAR HAL Statistics"); -+ seq_printf(m, "SAR HAL Statistics"); - for(i=0;ilut[i].inuse) - { -- if(len<=limit) -- len += sprintf(buf+len, "\nChannel %d:\n",priv->lut[i].chanid); -+ seq_printf(m, "\nChannel %d:\n",priv->lut[i].chanid); - k=0; - for(j=0;j<4;j++) - { -@@ -1468,26 +1488,18 @@ int tn7sar_proc_sar_stat(char* buf, char - { - if((char *)*pSarStat == NULL) - break; -- if(len<=limit) -- { -- dBytes = sprintf(buf+len, "%s: ",(char *) *pSarStat); -- len += dBytes; -- k += dBytes; -- } -+ -+ seq_printf(m, "%s: ",(char *) *pSarStat); -+ k += strlen((char *) *pSarStat) + strlen(": "); - pSarStat++; -- if(len<=limit) -- { -- dBytes = sprintf(buf+len, "%s; \n",(char *) *pSarStat); -- len += dBytes; -- k += dBytes; -- } -+ seq_printf(m, "%s; \n",(char *) *pSarStat); -+ k += strlen((char *) *pSarStat) + strlen("; \n"); - pSarStat++; - - if(k > 60) - { - k=0; -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - } - -@@ -1496,9 +1508,22 @@ int tn7sar_proc_sar_stat(char* buf, char - } - } - -- return len; -+ return 0; - } - -+static int tn7sar_proc_sar_stat_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7sar_proc_sar_stat, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7sar_proc_sar_stat_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7sar_proc_sar_stat_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - void tn7sar_get_sar_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls) - { - diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch deleted file mode 100644 index c7d9127012..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/cp_sar_reg.h -+++ b/cp_sar_reg.h -@@ -214,4 +214,4 @@ - - /* END OF FILE */ - --#endif _INC_SAR_REG -+#endif ---- a/tn7api.h -+++ b/tn7api.h -@@ -172,4 +172,4 @@ void tn7sar_get_sar_firmware_version(uns - extern struct file_operations tn7sar_proc_oam_ping_fops; - extern struct file_operations tn7sar_proc_pvc_table_fops; - int tn7sar_tx_flush(void *privContext, int chan, int queue, int skip); --#endif __SGAPI_H -+#endif ---- a/tn7atm.h -+++ b/tn7atm.h -@@ -276,4 +276,4 @@ typedef struct - #define PHYS_TO_K1(X) (PHYS_ADDR(X)|K1BASE) - #endif - --#endif __TN7ATM_H -+#endif ---- a/dsl_hal_api.h -+++ b/dsl_hal_api.h -@@ -2448,7 +2448,7 @@ unsigned int dslhal_api_getHLINpsds(tids - * - ********************************************************************************************/ - --unsigned int dslhal_api_getHighPrecision(); -+unsigned int dslhal_api_getHighPrecision(void); - - /******************************************************************************************** - * FUNCTION NAME: void dslhal_api_setHighPrecision -@@ -2459,7 +2459,7 @@ unsigned int dslhal_api_getHighPrecision - * Return: None - ********************************************************************************************/ - --void dslhal_api_setHighPrecision(); -+void dslhal_api_setHighPrecision(void); - // UR8_MERGE_END CQ11054* - - #ifdef INTERNAL_BUILD diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/240-3.18_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/240-3.18_fixes.patch deleted file mode 100644 index 2e69300147..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/240-3.18_fixes.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -333,7 +333,7 @@ static void tn7dsl_chng_modulation(void* - static unsigned int tn7dsl_set_modulation(void* data, int flag); - static void tn7dsl_ctrl_fineGain(int value); - static void tn7dsl_set_fineGainValue(int value); --static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer, -+static int dslmod_sysctl (struct ctl_table * ctl, int write, void *buffer, - size_t * lenp, loff_t *ppos); - static void tn7dsl_register_dslss_led(void); - void tn7dsl_dslmod_sysctl_register(void); -@@ -3308,7 +3308,7 @@ unsigned int tn7dsl_get_memory(unsigned - - - --static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer, -+static int dslmod_sysctl(struct ctl_table *ctl, int write, void *buffer, - size_t *lenp, loff_t *ppos) - { - char *ptr; -@@ -3423,7 +3423,7 @@ static int dslmod_sysctl(ctl_table *ctl, - } - - --ctl_table dslmod_table[] = { -+struct ctl_table dslmod_table[] = { - { - .procname = "dslmod", - .data = info, -@@ -3437,7 +3437,7 @@ ctl_table dslmod_table[] = { - }; - - /* Make sure that /proc/sys/dev is there */ --ctl_table dslmod_root_table[] = { -+struct ctl_table dslmod_root_table[] = { - #ifdef CONFIG_PROC_FS - { - .procname = "dev", diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/250-4.1_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/250-4.1_fixes.patch deleted file mode 100644 index f26b7e221c..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/250-4.1_fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -777,7 +777,7 @@ static int __init tn7atm_irq_request (st - * Register SAR interrupt - */ - priv->sar_irq = LNXINTNUM (ATM_SAR_INT); /* Interrupt line # */ -- if (request_irq (priv->sar_irq, tn7atm_sar_irq, IRQF_DISABLED, "SAR ", dev)) -+ if (request_irq (priv->sar_irq, tn7atm_sar_irq, 0, "SAR ", dev)) - printk ("Could not register tn7atm_sar_irq\n"); - - /* -@@ -795,7 +795,7 @@ static int __init tn7atm_irq_request (st - * Reigster Receive interrupt A - */ - priv->dsl_irq = LNXINTNUM (ATM_DSL_INT); /* Interrupt line # */ -- if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, IRQF_DISABLED, "DSL ", dev)) -+ if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, 0, "DSL ", dev)) - printk ("Could not register tn7atm_dsl_irq\n"); - - /***** VRB Tasklet Mode ****/ diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/260-fix_function_signatures.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/260-fix_function_signatures.patch deleted file mode 100644 index fe13fc5476..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/260-fix_function_signatures.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/cpswhal_cpsar.h -+++ b/cpswhal_cpsar.h -@@ -430,10 +430,10 @@ typedef struct - int (*DeviceFindInfo)(int Inst, const char *DeviceName, void *DeviceInfo); - int (*DeviceFindParmUint)(void *DeviceInfo, const char *Parm, bit32u *Value); - int (*DeviceFindParmValue)(void *DeviceInfo, const char *Parm, void *Value); -- void (*Free)(void *MemPtr); -+ void (*Free)(const void *MemPtr); - void (*FreeRxBuffer)(OS_RECEIVEINFO *OsReceiveInfo, void *MemPtr); -- void (*FreeDev)(void *MemPtr); -- void (*FreeDmaXfer)(void *MemPtr); -+ void (*FreeDev)(const void *MemPtr); -+ void (*FreeDmaXfer)(const void *MemPtr); - void (*IsrRegister)(OS_DEVICE *OsDev, int (*halISR)(HAL_DEVICE*, int*), int InterruptBit); - void (*IsrUnRegister)(OS_DEVICE *OsDev, int InterruptBit); - void* (*Malloc)(bit32u size); ---- a/cpswhal_cpaal5.h -+++ b/cpswhal_cpaal5.h -@@ -430,10 +430,10 @@ typedef struct - int (*DeviceFindInfo)(int Inst, const char *DeviceName, void *DeviceInfo); - int (*DeviceFindParmUint)(void *DeviceInfo, const char *Parm, bit32u *Value); - int (*DeviceFindParmValue)(void *DeviceInfo, const char *Parm, void *Value); -- void (*Free)(void *MemPtr); -+ void (*Free)(const void *MemPtr); - void (*FreeRxBuffer)(OS_RECEIVEINFO *OsReceiveInfo, void *MemPtr); -- void (*FreeDev)(void *MemPtr); -- void (*FreeDmaXfer)(void *MemPtr); -+ void (*FreeDev)(const void *MemPtr); -+ void (*FreeDmaXfer)(const void *MemPtr); - void (*IsrRegister)(OS_DEVICE *OsDev, int (*halISR)(HAL_DEVICE*, int*), int InterruptBit); - void (*IsrUnRegister)(OS_DEVICE *OsDev, int InterruptBit); - void* (*Malloc)(bit32u size); ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -2481,7 +2481,7 @@ static int tn7atm_proc_qos_read(struct s - return 0; - - } --static int tn7atm_proc_qos_write(struct file *fp, const char *buf, unsigned long count, void *data) -+static int tn7atm_proc_qos_write(struct file *fp, const char *buf, size_t count, loff_t *data) - { - char local_buf[32]; - ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -1712,7 +1712,7 @@ static int tn7dsl_proc_stats_open(struct - return single_open(file, tn7dsl_proc_stats, PDE_DATA(inode)); - } - --int tn7dsl_proc_write_stats (struct file *fp, const char *buf, unsigned long count, void *data); -+int tn7dsl_proc_write_stats (struct file *fp, const char *buf, size_t count, loff_t *data); - - struct file_operations tn7dsl_proc_stats_fops = { - .owner = THIS_MODULE, -@@ -4256,7 +4256,7 @@ int tn7dsl_generic_write( int offsetnum, - } - - int tn7dsl_proc_write_stats (struct file *fp, const char *buf, -- unsigned long count, void *data) -+ size_t count, loff_t *data) - { - char local_buf[31]; - int ret_val = 0; diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch deleted file mode 100644 index 32bc535d34..0000000000 --- a/package/kernel/ar7-atm/patches-D7.04.03.00/270-4.14_fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -1149,7 +1149,7 @@ void tn7atm_close (struct atm_vcc *vcc) - Tn7AtmPrivate *priv; - int dmachan; - spinlock_t closeLock; -- unsigned int closeFlag; -+ unsigned long closeFlag; - int rc; - - priv = (Tn7AtmPrivate *) vcc->dev->dev_data; ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -620,7 +620,7 @@ unsigned int shim_osClockTick(void) - return jiffies; - } - --int flags; -+unsigned long flags; - spinlock_t shimLock; - - void shim_osCriticalEnter(void) -@@ -3433,7 +3433,7 @@ struct ctl_table dslmod_table[] = { - .extra2 = (void *)DEV_DSLMOD, - } - , -- {0} -+ { } - }; - - /* Make sure that /proc/sys/dev is there */ -@@ -3447,7 +3447,7 @@ struct ctl_table dslmod_root_table[] = { - } - , - #endif /* CONFIG_PROC_FS */ -- {0} -+ { } - }; - - static struct ctl_table_header *dslmod_sysctl_header; ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -1208,7 +1208,7 @@ int tn7sar_deactivate_vc(Tn7AtmPrivate * - HAL_FUNCTIONS *pHalFunc; - HAL_DEVICE *pHalDev; - int rc; -- int flags; -+ unsigned long flags; - - //dgprintf(4, "tn7sar_deactivate_vc\n"); - //printk("tn7sar_deactivate_vc entered\n"); diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/090-no-date-time.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/090-no-date-time.patch deleted file mode 100644 index 9b3abf006b..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/090-no-date-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/aal5sar.h -+++ b/aal5sar.h -@@ -19,7 +19,7 @@ - /** \namespace AAL5_Version - This documents version 01.07.2c of the AAL5 CPHAL. - */ --const char *pszVersion_CPAAL5="CPAAL5 01.07.2c "__DATE__" "__TIME__; -+const char *pszVersion_CPAAL5="CPAAL5 01.07.2c "; - - #include "cpsar_cpaal5.h" - diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch deleted file mode 100644 index 7dee220256..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch +++ /dev/null @@ -1,808 +0,0 @@ ---- a/cppi_cpaal5.c -+++ b/cppi_cpaal5.c -@@ -360,7 +360,7 @@ static int halRxReturn(HAL_RECEIVEINFO * - { - /* malloc failed, add this RCB to Needs Buffer List */ - TempRcb->FragCount = 1; /*MJH+030417*/ -- (HAL_RCB *)TempRcb->Eop = TempRcb; /* GSG +030430 */ -+ TempRcb->Eop = TempRcb; /* GSG +030430 */ - - if(HalDev->NeedsCount < MAX_NEEDS) /* +MJH 030410 */ - { /* +MJH 030410 */ ---- a/dsl_hal_api.c -+++ b/dsl_hal_api.c -@@ -273,15 +273,15 @@ - * 09/15/07 CPH CQ11466 Added EFM support - * 09/27/07 EYin CQ11929: Added NFEC/INP/Lp/Rp reporting for only ADSL2/2+ mode. - ******************************************************************************/ --#include --#include --#include -+#include "dev_host_interface.h" -+#include "dsl_hal_register.h" -+#include "dsl_hal_support.h" - - #ifndef NO_ADV_STATS --#include -+#include "dsl_hal_logtable.h" - #endif - --#include -+#include "dsl_hal_version.h" - - // UR8_MERGE_START CQ11054 Jack Zhang - static unsigned int highprecision_selected = 0; //By default we use low precision for backward compt. ---- a/dsl_hal_support.c -+++ b/dsl_hal_support.c -@@ -142,9 +142,9 @@ - * UR8_MERGE_START_END CQ11922 Tim - * 04Sep07 0.14.00 Tim CQ11922: Added support for new scratchram for INP NDR tables - *******************************************************************************/ --#include --#include --#include -+#include "dev_host_interface.h" -+#include "dsl_hal_register.h" -+#include "dsl_hal_support.h" - - #define NUM_READ_RETRIES 3 - static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits); ---- a/dsl_hal_support.h -+++ b/dsl_hal_support.h -@@ -49,7 +49,7 @@ - * 04Nov05 0.11.00 CPH Fixed T1413 mode got Zero DS/US rate when DSL_BIT_TMODE is set. - *******************************************************************************/ - --#include -+#include "dsl_hal_api.h" - - #define virtual2Physical(a) (((int)a)&~0xe0000000) - /* External Function Prototype Declarations */ ---- a/Makefile -+++ b/Makefile -@@ -1,18 +1,9 @@ --# File: drivers/atm/ti_evm3/Makefile - # --# Makefile for the Texas Instruments EVM3 ADSL/ATM driver. -+# Makefile for the TIATM device driver. - # --# --# Copyright (c) 2000 Texas Instruments Incorporated. --# Jeff Harrell (jharrell@telogy.com) --# Viren Balar (vbalar@ti.com) --# Victor Wells (vwells@telogy.com) --# --include $(TOPDIR)/Rules.make -- -- -- -- -- -- - -+CONFIG_SANGAM_ATM=m -+#EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT -+EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL -+obj-$(CONFIG_SANGAM_ATM) := tiatm.o -+tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -66,7 +66,6 @@ - * 09/18/07 CPH CQ11466 Added EFM Support - *********************************************************************************************/ - --#include - #include - #include - #include -@@ -74,11 +73,14 @@ - #include - #include - #include --#include --#include - #include - #include - #include -+ -+#include -+#include -+#include -+ - #include "dsl_hal_api.h" - #ifdef AR7_EFM - #include "tn7efm.h" -@@ -90,6 +92,7 @@ - #include "dsl_hal_register.h" - - #ifdef MODULE -+MODULE_LICENSE("GPL"); - MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver"); - MODULE_AUTHOR ("Zhicheng Tang"); - #endif -@@ -108,9 +111,9 @@ MODULE_AUTHOR ("Zhicheng Tang"); - - /*end of externs */ - --#ifndef TI_STATIC_ALLOCATIONS --#define TI_STATIC_ALLOCATIONS --#endif -+//#ifndef TI_STATIC_ALLOCATIONS -+//#define TI_STATIC_ALLOCATIONS -+//#endif - - #define tn7atm_kfree_skb(x) dev_kfree_skb(x) - -@@ -135,7 +138,7 @@ static int EnableQoS = FALSE; - /* prototypes */ - static int tn7atm_set_can_support_adsl2 (int can); - --static int tn7atm_open (struct atm_vcc *vcc, short vpi, int vci); -+static int tn7atm_open (struct atm_vcc *vcc); - - void tn7atm_close (struct atm_vcc *vcc); - -@@ -298,13 +301,12 @@ static const struct atmdev_ops tn7atm_op - getsockopt: NULL, - setsockopt: NULL, - send: tn7atm_send, -- sg_send: NULL, - phy_put: NULL, - phy_get: NULL, - change_qos: tn7atm_change_qos, - }; - --const char drv_proc_root_folder[] = "avalanche/"; -+const char drv_proc_root_folder[] = "avalanche"; - static struct proc_dir_entry *root_proc_dir_entry = NULL; - #define DRV_PROC_MODE 0644 - static int proc_root_already_exists = TRUE; -@@ -626,56 +628,6 @@ static int turbodsl_check_priority_type( - - /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * -- * Function: int tn7atm_walk_vccs(struct atm_dev *dev, short *vcc, int *vci) -- * -- * Description: retrieve VPI/VCI for connection -- * -- *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ --static int tn7atm_walk_vccs (struct atm_vcc *vcc, short *vpi, int *vci) --{ -- struct atm_vcc *walk; -- -- /* -- * find a free VPI -- */ -- if (*vpi == ATM_VPI_ANY) -- { -- -- for (*vpi = 0, walk = vcc->dev->vccs; walk; walk = walk->next) -- { -- -- if ((walk->vci == *vci) && (walk->vpi == *vpi)) -- { -- (*vpi)++; -- walk = vcc->dev->vccs; -- } -- } -- } -- -- /* -- * find a free VCI -- */ -- if (*vci == ATM_VCI_ANY) -- { -- -- for (*vci = ATM_NOT_RSV_VCI, walk = vcc->dev->vccs; walk; -- walk = walk->next) -- { -- -- if ((walk->vpi = *vpi) && (walk->vci == *vci)) -- { -- *vci = walk->vci + 1; -- walk = vcc->dev->vccs; -- } -- } -- } -- -- return 0; --} -- -- --/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- * - * Function: int tn7atm_sar_irq(void) - * - * Description: tnetd73xx SAR interrupt. -@@ -766,7 +718,7 @@ static int __init tn7atm_irq_request (st - - priv->sar_irq = LNXINTNUM (ATM_SAR_INT); /* Interrupt line # */ - -- if (request_irq (priv->sar_irq, tn7atm_sar_irq, SA_INTERRUPT, "SAR ", dev)) -+ if (request_irq (priv->sar_irq, tn7atm_sar_irq, IRQF_DISABLED, "SAR ", dev)) - printk ("Could not register tn7atm_sar_irq\n"); - - /* -@@ -777,8 +729,8 @@ static int __init tn7atm_irq_request (st - { - def_sar_inter_pace = os_atoi (ptr); - } -- avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, -- def_sar_inter_pace); -+ /* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, -+ def_sar_inter_pace); */ - - - #ifdef AR7_EFM -@@ -790,7 +742,7 @@ static int __init tn7atm_irq_request (st - * Reigster Receive interrupt A - */ - priv->dsl_irq = LNXINTNUM (ATM_DSL_INT); /* Interrupt line # */ -- if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, SA_INTERRUPT, "DSL ", dev)) -+ if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, IRQF_DISABLED, "DSL ", dev)) - printk ("Could not register tn7atm_dsl_irq\n"); - - /***** VRB Tasklet Mode ****/ -@@ -958,11 +910,15 @@ static int __init tn7atm_get_ESI (struct - #define ATM_VBR_RT 5 - #endif - --int tn7atm_open (struct atm_vcc *vcc, short vpi, int vci) -+int tn7atm_open (struct atm_vcc *vcc) - { - tn7atm_activate_vc_parm_t tn7atm_activate_vc_parm; - int rc; - //int flags; -+ tn7atm_activate_vc_parm.pcr = 0x20000; -+ tn7atm_activate_vc_parm.scr = 0x20000; -+ tn7atm_activate_vc_parm.mbs = 0x20000; -+ tn7atm_activate_vc_parm.cdvt = 10000; - - dgprintf(1, "tn7atm_open()\n"); - -@@ -974,24 +930,18 @@ int tn7atm_open (struct atm_vcc *vcc, sh - return -1; - } - -- MOD_INC_USE_COUNT; -+// MOD_INC_USE_COUNT; - -- /* find a free VPI/VCI */ -- tn7atm_walk_vccs(vcc, &vpi, &vci); -- -- vcc->vpi = vpi; -- vcc->vci = vci; -- -- if ((vci == ATM_VCI_UNSPEC) || (vpi == ATM_VCI_UNSPEC)) -+ if ((vcc->vci == ATM_VCI_UNSPEC) || (vcc->vpi == ATM_VCI_UNSPEC)) - { -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - return -EBUSY; - } - -- tn7atm_activate_vc_parm.vpi = vpi; -- tn7atm_activate_vc_parm.vci = vci; -+ tn7atm_activate_vc_parm.vpi = vcc->vpi; -+ tn7atm_activate_vc_parm.vci = vcc->vci; - -- if ((vpi == CLEAR_EOC_VPI) && (vci == CLEAR_EOC_VCI)) -+ if ((vcc->vpi == CLEAR_EOC_VPI) && (vcc->vci == CLEAR_EOC_VCI)) - { - /* always use (max_dma_chan+1) for clear eoc */ - tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN; -@@ -999,7 +949,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - /* check to see whether clear eoc is opened or not */ - if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse) - { -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan); - return -EBUSY; - } -@@ -1008,7 +958,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - if (rc) - { - printk("tn7atm_open: failed to setup clear_eoc\n"); -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - return -EBUSY; - } - tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan); -@@ -1017,17 +967,17 @@ int tn7atm_open (struct atm_vcc *vcc, sh - } - else /* PVC channel setup */ - { -- if ((vpi==REMOTE_MGMT_VPI) && (vci==REMOTE_MGMT_VCI)) -+ if ((vcc->vpi==REMOTE_MGMT_VPI) && (vcc->vci==REMOTE_MGMT_VCI)) - { - tn7atm_activate_vc_parm.chan = 14; /* always use chan 14 for MII PVC-base romote mgmt */ - } - else - { -- rc = tn7atm_lut_find(vpi, vci); -+ rc = tn7atm_lut_find(vcc->vpi, vcc->vci); - /* check to see whether PVC is opened or not */ - if(ATM_NO_DMA_CHAN != rc) - { -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - printk("PVC already opened. dmachan = %d\n", rc); - return -EBUSY; - } -@@ -1059,6 +1009,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - tn7atm_activate_vc_parm.priority = 2; - break; - -+#if 0 - case ATM_VBR: /* Variable Bit Rate-Non RealTime*/ - tn7atm_activate_vc_parm.qos = 1; - tn7atm_activate_vc_parm.priority = 1; -@@ -1080,6 +1031,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - tn7atm_activate_vc_parm.mbs = vcc->qos.txtp.max_pcr; - tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv; - break; -+#endif - - default: - tn7atm_activate_vc_parm.qos = 2; -@@ -1107,7 +1059,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh - if (rc < 0) - { - printk("failed to activate hw channel\n"); -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan); - //spin_unlock_irqrestore(&chan_init_lock, flags); - return -EBUSY; -@@ -1197,7 +1149,7 @@ void tn7atm_close (struct atm_vcc *vcc) - tn7atm_lut_clear (vcc, dmachan); - //spin_unlock_irqrestore (&closeLock, closeFlag); - -- MOD_DEC_USE_COUNT; -+// MOD_DEC_USE_COUNT; - - dgprintf (1, "Leave tn7atm_close\n"); - } -@@ -1630,8 +1582,7 @@ int tn7atm_receive (void *os_dev, int ch - * firewall is on */ - - dgprintf (3, "pushing the skb...\n"); -- -- skb->stamp = vcc->timestamp = xtime; -+ __net_timestamp(skb); - - xdump ((unsigned char *) skb->data, skb->len, 5); - -@@ -1854,8 +1805,7 @@ printk("!!!free atm irq: tn7atm_exit\n") - - kfree (dev->dev_data); - -- // atm_dev_deregister (dev); -- shutdown_atm_dev (dev); -+ atm_dev_deregister (dev); - - /* - * remove proc entries -@@ -2086,9 +2036,6 @@ static int __init tn7atm_detect (void) - * Set up proc entry for atm stats - */ - -- if (tn7atm_xlate_proc_name -- (drv_proc_root_folder, &root_proc_dir_entry, &residual)) -- { - printk ("Creating new root folder %s in the proc for the driver stats \n", - drv_proc_root_folder); - root_proc_dir_entry = proc_mkdir (drv_proc_root_folder, NULL); -@@ -2098,7 +2045,6 @@ static int __init tn7atm_detect (void) - return -ENOMEM; - } - proc_root_already_exists = FALSE; -- } - - - /* -@@ -2731,7 +2677,5 @@ int tn7atm_proc_turbodsl_write(struct fi - return count; - } - --#ifdef MODULE - module_init (tn7atm_detect); - module_exit (tn7atm_exit); --#endif /* MODULE */ ---- a/tn7atm.h -+++ b/tn7atm.h -@@ -20,7 +20,8 @@ - //#include "mips_support.h" - #include - --#include -+#define MIPS_EXCEPTION_OFFSET 8 -+#define LNXINTNUM(x)((x) + MIPS_EXCEPTION_OFFSET) - - #ifdef CONFIG_MODVERSIONS - #include ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -102,7 +102,6 @@ - * UR8_MERGE_END CQ11813 - * 09/18/07 CPH CQ11466: Added EFM support. - *********************************************************************************************/ --#include - #include - #include - #include -@@ -110,8 +109,6 @@ - #include - #include - #include --#include --#include - #include - #include - #include -@@ -119,6 +116,12 @@ - #include - #include - #include -+#include -+ -+#include -+#include -+#include -+ - /* Modules specific header files */ - #ifdef AR7_EFM - #include "tn7efm.h" -@@ -185,7 +188,7 @@ led_reg_t ledreg[2]; - static struct led_funcs ledreg[2]; - #endif - --#define DEV_DSLMOD 1 -+#define DEV_DSLMOD CTL_UNNUMBERED - #define MAX_STR_SIZE 256 - #define DSL_MOD_SIZE 256 - -@@ -316,7 +319,7 @@ static PITIDSLHW_T pIhw; - static volatile int bshutdown; - static char info[MAX_STR_SIZE]; - /* Used for DSL Polling enable */ --static DECLARE_MUTEX_LOCKED (adsl_sem_overlay); -+static struct semaphore adsl_sem_overlay; - - //kthread_t overlay_thread; - /* end of module wide declars */ -@@ -369,6 +372,14 @@ int os_atoih (const char *pstr) - return val; - } - -+int avalanche_request_intr_pacing(int irq_nr, unsigned int blk_num, -+ unsigned int pace_value) -+{ -+ printk("avalanche_request_pacing(%d, %u, %u); // not implemented\n", irq_nr, blk_num, pace_value); -+ return 0; -+} -+ -+ - int os_atoi(const char *pStr) - { - int MulNeg = (*pStr == '-' ? -1 : 1); -@@ -405,39 +416,6 @@ void dprintf (int uDbgLevel, char *szFmt - #endif - } - --int strcmp(const char *s1, const char *s2) --{ -- -- int size = strlen(s1); -- -- return(strncmp(s1, s2, size)); --} -- --int strncmp(const char *s1, const char *s2, size_t size) --{ -- int i = 0; -- int max_size = (int)size; -- -- while((s1[i] != 0) && i < max_size) -- { -- if(s2[i] == 0) -- { -- return -1; -- } -- if(s1[i] != s2[i]) -- { -- return 1; -- } -- i++; -- } -- if(s2[i] != 0) -- { -- return 1; -- } -- -- return 0; --} -- - // * UR8_MERGE_START CQ10640 Jack Zhang - int tn7dsl_dump_dsp_memory(char *input_str) //cph99 - { -@@ -487,144 +465,78 @@ unsigned int shim_osGetCpuFrequency(void - return CpuFrequency; - } - --int shim_osLoadFWImage(unsigned char *ptr) -+static void avsar_release(struct device *dev) - { -- unsigned int bytesRead; -- mm_segment_t oldfs; -- static struct file *filp; -- unsigned int imageLength=0x5ffff; -- --#ifdef AR7_EFM -- int dp_alt=0; -- char *ptr1=NULL; --#ifdef EFM_DEBUG -- char *ptr2=NULL; -- char *ptr3=NULL; --#endif -- -- if ((ptr1 = prom_getenv("DSL_DP_ALT")) != NULL) -- { -- dp_alt=os_atoi(ptr1); -- if (dp_alt==1) -- { -- filp = filp_open(DSP_DEBUG_FIRMWARE_PATH,00,O_RDONLY); -- if (!IS_ERR(filp)) -- { -- strcpy (DSP_FIRMWARE_PATH, DSP_DEBUG_FIRMWARE_PATH); -- } -- } --#ifdef EFM_DEBUG -- else if (dp_alt==2) -- { -- if ((ptr2 = prom_getenv("DSL_DP")) != NULL) -- { -- if (!strncmp(ptr2, "DSL_DP", 6)) -- { // indirect naming -- if ((ptr3 = prom_getenv(ptr2)) != NULL) -- filp = filp_open(ptr3,00,O_RDONLY); -- ptr2 = ptr3; // redirect ptr2 to ptr3 -- } -- -- filp = filp_open(ptr2,00,O_RDONLY); -- if (!IS_ERR(filp)) -- { -- strcpy (DSP_FIRMWARE_PATH, ptr2); -- } -- } -- } -- printk("dp_path=%s\n", DSP_FIRMWARE_PATH); --#endif -- } --#endif -- -- dgprintf(4, "tn7dsl_read_dsp()\n"); -- -- dgprintf(4,"open file %s\n", DSP_FIRMWARE_PATH); -- -- filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY); -- if(IS_ERR(filp)) -- { -- printk("Failed: Could not open DSP binary file\n"); -- return -1; -- } -- -- if (filp->f_dentry != NULL) -- { -- if (filp->f_dentry->d_inode != NULL) -- { -- printk ("DSP binary filesize = %d bytes\n", -- (int) filp->f_dentry->d_inode->i_size); -- imageLength = (unsigned int)filp->f_dentry->d_inode->i_size + 0x200; -- } -- } -- -- if (filp->f_op->read==NULL) -- return -1; /* File(system) doesn't allow reads */ -- -- /* -- * Disable parameter checking -- */ -- oldfs = get_fs(); -- set_fs(KERNEL_DS); -- -- /* -- * Now read bytes from postion "StartPos" -- */ -- filp->f_pos = 0; -- -- bytesRead = filp->f_op->read(filp,ptr,imageLength,&filp->f_pos); -- -- dgprintf(4,"file length = %d\n", bytesRead); -- -- set_fs(oldfs); -- -- /* -- * Close the file -- */ -- fput(filp); -- -- return bytesRead; -+ printk(KERN_DEBUG "avsar firmware released\n"); - } - -+static struct device avsar = { -+ .bus_id = "vlynq", -+ .release = avsar_release, -+}; - --unsigned int shim_read_overlay_page (void *ptr, unsigned int secOffset, -- unsigned int secLength) -+int shim_osLoadFWImage(unsigned char *ptr) - { -- unsigned int bytesRead; -- mm_segment_t oldfs; -- struct file *filp; -- -- dgprintf(4,"shim_read_overlay_page\n"); -- //dgprintf(4,"sec offset=%d, sec length =%d\n", secOffset, secLength); -+ const struct firmware *fw_entry; -+ size_t size; - -- filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY); -- if(filp ==NULL) -- { -- printk("Failed: Could not open DSP binary file\n"); -- return -1; -- } -- -- if (filp->f_op->read==NULL) -- return -1; /* File(system) doesn't allow reads */ -- -- /* -- * Now read bytes from postion "StartPos" -- */ -+ printk("requesting firmware image \"ar0700xx.bin\"\n"); -+ if(device_register(&avsar) < 0) { -+ printk(KERN_ERR -+ "avsar: device_register fails\n"); -+ return -1; -+ } -+ -+ if (request_firmware(&fw_entry, "ar0700xx.bin", &avsar)) { -+ printk(KERN_ERR -+ "avsar: Firmware not available\n"); -+ device_unregister(&avsar); -+ return -1; -+ } -+ size = fw_entry->size; -+ device_unregister(&avsar); -+ if (size > 0x6ffff) { -+ printk(KERN_ERR -+ "avsar: Firmware too big (%d bytes)\n", size); -+ release_firmware(fw_entry); -+ return -1; -+ } -+ memcpy(ptr, fw_entry->data, size); -+ release_firmware(fw_entry); -+ return size; -+} -+ -+unsigned int shim_read_overlay_page(void *ptr, unsigned int secOffset, unsigned int secLength) -+{ -+ const struct firmware *fw_entry; -+ -+ printk("requesting firmware image \"ar0700xx.bin\"\n"); -+ if (device_register(&avsar) < 0) { -+ printk(KERN_ERR -+ "avsar: device_register fails\n"); -+ return -1; -+ } -+ -+ if (request_firmware(&fw_entry, "ar0700xx.bin", &avsar)) { -+ printk(KERN_ERR -+ "avsar: Firmware not available\n"); -+ device_unregister(&avsar); -+ return -1; -+ } -+ -+ device_unregister(&avsar); -+ if (fw_entry->size > secLength) { -+ printk(KERN_ERR -+ "avsar: Firmware too big (%d bytes)\n", fw_entry->size); -+ release_firmware(fw_entry); -+ return -1; -+ } -+ memcpy(ptr + secOffset, fw_entry->data, secLength); -+ release_firmware(fw_entry); -+ return secLength; -+} - -- if(filp->f_op->llseek) -- filp->f_op->llseek(filp,secOffset, 0); -- oldfs = get_fs(); -- set_fs(KERNEL_DS); -- filp->f_pos = secOffset; -- bytesRead = filp->f_op->read(filp,ptr,secLength,&filp->f_pos); - -- set_fs(oldfs); -- /* -- * Close the file -- */ -- fput(filp); -- return bytesRead; --} - - int shim_osLoadDebugFWImage(unsigned char *ptr) - { -@@ -3287,6 +3199,7 @@ int tn7dsl_init(void *priv) - int high_precision_selected = 0; - // UR8_MERGE_END CQ11054* - -+ sema_init(&adsl_sem_overlay, 0); - /* - * start dsl - */ -@@ -3665,7 +3578,7 @@ static int dslmod_sysctl(ctl_table *ctl, - */ - if(write) - { -- ret = proc_dostring(ctl, write, filp, buffer, lenp); -+ ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - - switch (ctl->ctl_name) - { -@@ -3751,14 +3664,14 @@ static int dslmod_sysctl(ctl_table *ctl, - else - { - len += sprintf(info+len, mod_req); -- ret = proc_dostring(ctl, write, filp, buffer, lenp); -+ ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - } - return ret; - } - - - ctl_table dslmod_table[] = { -- {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, &dslmod_sysctl} -+ {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string} - , - {0} - }; -@@ -3781,8 +3694,7 @@ void tn7dsl_dslmod_sysctl_register(void) - if (initialized == 1) - return; - -- dslmod_sysctl_header = register_sysctl_table(dslmod_root_table, 1); -- dslmod_root_table->child->de->owner = THIS_MODULE; -+ dslmod_sysctl_header = register_sysctl_table(dslmod_root_table); - - /* - * set the defaults ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -43,7 +43,6 @@ - * 09/18/07 CPH CQ11466: Added EFM support. - *******************************************************************************/ - --#include - #include - #include - #include -@@ -51,12 +50,13 @@ - #include - #include - #include --#include --#include - #include - #include - #include - -+#include -+#include -+#include - - #define _CPHAL_AAL5 - #define _CPHAL_SAR diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch deleted file mode 100644 index 1122457691..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -633,7 +633,7 @@ static int turbodsl_check_priority_type( - * Description: tnetd73xx SAR interrupt. - * - *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ --static void tn7atm_sar_irq (int irq, void *voiddev, struct pt_regs *regs) -+static irqreturn_t tn7atm_sar_irq (int irq, void *voiddev) - { - struct atm_dev *atmdev; - Tn7AtmPrivate *priv; -@@ -660,6 +660,7 @@ static void tn7atm_sar_irq (int irq, voi - #ifdef TIATM_INST_SUPP - psp_trace_par (ATM_DRV_SAR_ISR_EXIT, retval); - #endif -+ return IRQ_HANDLED; - } - - /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@@ -669,7 +670,7 @@ static void tn7atm_sar_irq (int irq, voi - * Description: tnetd73xx DSL interrupt. - * - *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ --static void tn7atm_dsl_irq (int irq, void *voiddev, struct pt_regs *regs) -+static irqreturn_t tn7atm_dsl_irq (int irq, void *voiddev) - { - struct atm_dev *atmdev; - Tn7AtmPrivate *priv; -@@ -691,6 +692,8 @@ static void tn7atm_dsl_irq (int irq, voi - #ifdef TIATM_INST_SUPP - psp_trace_par (ATM_DRV_DSL_ISR_EXIT, retval); - #endif -+ -+ return IRQ_HANDLED; - } - - /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch deleted file mode 100644 index e9d99dff42..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tn7api.h -+++ b/tn7api.h -@@ -118,7 +118,7 @@ int tn7dsl_proc_dbgmsg_write(struct file - int tn7dsl_proc_dbgmsg_read(char* buf, char **start, off_t offset, int count,int *eof, void *data); - #endif - //UR8_MERGE_END CQ11813 --inline int tn7dsl_handle_interrupt(void); -+int tn7dsl_handle_interrupt(void); - - void tn7dsl_dslmod_sysctl_register(void); - void tn7dsl_dslmod_sysctl_unregister(void); diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/130-powercutback.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/130-powercutback.patch deleted file mode 100644 index 415486482e..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/130-powercutback.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/dsl_hal_advcfg.c -+++ b/dsl_hal_advcfg.c -@@ -36,9 +36,9 @@ - * 05Jul05 0.00.09 CPH CQ9775: Change dslhal_advcfg_configDsTones input parameters & support for ADSL2+ - * 24Jul05 0.00.10 CPH Fixed comments in dslhal_advcfg_configDsTones function header - *******************************************************************************/ --#include --#include --#include -+#include "dev_host_interface.h" -+#include "dsl_hal_register.h" -+#include "dsl_hal_support.h" - - /*****************************************************************************/ - /* ACT API functions -- To be moved into their own independent module --RamP */ ---- a/Makefile -+++ b/Makefile -@@ -4,6 +4,7 @@ - - CONFIG_SANGAM_ATM=m - #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT --EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL -+#EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL -+EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL - obj-$(CONFIG_SANGAM_ATM) := tiatm.o --tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o -+tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -3053,6 +3053,14 @@ static int tn7dsl_set_dsl(void) - dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr)); - } - -+ // set powercutback -+ ptr = NULL; -+ ptr = prom_getenv("powercutback"); -+ if(ptr) -+ { -+ dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr)); -+ } -+ - // trellis - ptr = NULL; - ptr = prom_getenv("trellis"); diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch deleted file mode 100644 index 3873827afc..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -125,10 +125,10 @@ enum - //09/05/07: cph, move to tn7atm.h - // #define RESERVED_OAM_CHANNEL 15 - --#define AAL5_PARM "id=aal5, base = 0x03000000, offset = 0, int_line=15, ch0=[RxBufSize=1522; RxNumBuffers = 32; RxServiceMax = 50; TxServiceMax=50; TxNumBuffers=32; CpcsUU=0x5aa5; TxVc_CellRate=0x3000; TxVc_AtmHeader=0x00000640]" --#define SAR_PARM "id=sar,base = 0x03000000, reset_bit = 9, offset = 0; UniNni = 0, PdspEnable = 1" -+#define CH0_PARM "RxBufSize=1522, RxNumBuffers=32, RxServiceMax=50, TxServiceMax=50, TxNumBuffers=32, CpcsUU=0x5aa5, TxVc_CellRate=0x3000, TxVc_AtmHeader=0x00000640" -+#define AAL5_PARM "id=aal5, base=0x03000000, offset=0, int_line=15, ch0=[" CH0_PARM "]" -+#define SAR_PARM "id=sar, base=0x03000000, reset_bit=9, offset=0; UniNni=0, PdspEnable=1, Debug=0xFFFFFFFF" - #define RESET_PARM "id=ResetControl, base=0xA8611600" --#define CH0_PARM "RxBufSize=1522, RxNumBuffers = 32, RxServiceMax = 50, TxServiceMax=50, TxNumBuffers=32, CpcsUU=0x5aa5, TxVc_CellRate=0x3000, TxVc_AtmHeader=0x00000640" - - #define MAX_PVC_TABLE_ENTRY 16 - diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch deleted file mode 100644 index 97b8cecdd9..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -5,6 +5,7 @@ - CONFIG_SANGAM_ATM=m - #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT - #EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL --EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -+#EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -+EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -D__NO__VOICE_PATCH__ -DEL -DCPATM_TASKLET_MODE - obj-$(CONFIG_SANGAM_ATM) := tiatm.o - tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/160-module-params.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/160-module-params.patch deleted file mode 100644 index 9c504c0e33..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/160-module-params.patch +++ /dev/null @@ -1,675 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -95,6 +95,146 @@ - MODULE_LICENSE("GPL"); - MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver"); - MODULE_AUTHOR ("Zhicheng Tang"); -+ -+int mp_sar_ipacemax = -1; -+module_param_named(ipacemax, mp_sar_ipacemax, int, 0); -+MODULE_PARM_DESC(ipacemax, "Interrupt pacing"); -+ -+char *mp_macc = NULL; -+module_param_named(macc, mp_macc, charp, 0); -+MODULE_PARM_DESC(macc, "MAC address"); -+ -+int mp_dsp_noboost = -1; -+module_param_named(dsp_noboost, mp_dsp_noboost, int, 0); -+MODULE_PARM_DESC(dsp_noboost, "Suppress DSP frequency boost"); -+ -+int mp_dsp_freq = -1; -+module_param_named(dsp_freq, mp_dsp_freq, int, 0); -+MODULE_PARM_DESC(dsp_freq, "Frequency to boost the DSP to"); -+ -+char *mp_featctl0 = NULL; -+module_param_named(featctl0, mp_featctl0, charp, 0); -+MODULE_PARM_DESC(featctl0, "DSL feature control 0"); -+ -+char *mp_featctl1 = NULL; -+module_param_named(featctl1, mp_featctl1, charp, 0); -+MODULE_PARM_DESC(featctl1, "DSL feature control 1"); -+ -+char *mp_phyctl0 = NULL; -+module_param_named(phyctl0, mp_phyctl0, charp, 0); -+MODULE_PARM_DESC(phyctl0, "DSL PHY control 0"); -+ -+char *mp_phyctl1 = NULL; -+module_param_named(phyctl1, mp_phyctl1, charp, 0); -+MODULE_PARM_DESC(phyctl1, "DSL PHY control 1"); -+ -+int mp_turbodsl = -1; -+module_param_named(turbodsl, mp_turbodsl, int, 0); -+MODULE_PARM_DESC(turbodsl, "Enable TurboDSL"); -+ -+int mp_sar_rxbuf = -1; -+module_param_named(sar_rxbuf, mp_sar_rxbuf, int, 0); -+MODULE_PARM_DESC(sar_rxbuf, "SAR RxBuf size"); -+ -+int mp_sar_rxmax = -1; -+module_param_named(sar_rxmax, mp_sar_rxmax, int, 0); -+MODULE_PARM_DESC(sar_rxmax, "SAR RxMax size"); -+ -+int mp_sar_txbuf = -1; -+module_param_named(sar_txbuf, mp_sar_txbuf, int, 0); -+MODULE_PARM_DESC(sar_txbuf, "SAR TxBuf size"); -+ -+int mp_sar_txmax = -1; -+module_param_named(sar_txmax, mp_sar_txmax, int, 0); -+MODULE_PARM_DESC(sar_txmax, "SAR TxMax size"); -+ -+char *mp_modulation = NULL; -+module_param_named(modulation, mp_modulation, charp, 0); -+MODULE_PARM_DESC(modulation, "Modulation"); -+ -+int mp_fine_gain_control = -1; -+module_param_named(fine_gain_control, mp_fine_gain_control, int, 0); -+MODULE_PARM_DESC(fine_gain_control, "Fine gain control"); -+ -+int mp_fine_gain_value = -1; -+module_param_named(fine_gain_value, mp_fine_gain_value, int, 0); -+MODULE_PARM_DESC(fine_gain_value, "Fine gain value"); -+ -+int mp_enable_margin_retrain = -1; -+module_param_named(enable_margin_retrain, mp_enable_margin_retrain, int, 0); -+MODULE_PARM_DESC(enable_margin_retrain, "Enable margin retrain"); -+ -+int mp_margin_threshold = -1; -+module_param_named(margin_threshold, mp_margin_threshold, int, 0); -+MODULE_PARM_DESC(margin_threshold, "Margin retrain treshold"); -+ -+int mp_enable_rate_adapt = -1; -+module_param_named(enable_rate_adapt, mp_enable_rate_adapt, int, 0); -+MODULE_PARM_DESC(enable_rate_adapt, "Enable rate adaption"); -+ -+int mp_powercutback = -1; -+module_param_named(powercutback, mp_powercutback, int, 0); -+MODULE_PARM_DESC(powercutback, "Enable / disable powercutback"); -+ -+int mp_trellis = -1; -+module_param_named(trellis, mp_trellis, int, 0); -+MODULE_PARM_DESC(trellis, "Enable / disable trellis coding"); -+ -+int mp_bitswap = -1; -+module_param_named(bitswap, mp_bitswap, int, 0); -+MODULE_PARM_DESC(bitswap, "Enable / disable bitswap"); -+ -+int mp_maximum_bits_per_carrier = -1; -+module_param_named(maximum_bits_per_carrier, mp_maximum_bits_per_carrier, int, 0); -+MODULE_PARM_DESC(maximum_bits_per_carrier, "Maximum bits per carrier"); -+ -+int mp_maximum_interleave_depth = -1; -+module_param_named(maximum_interleave_depth, mp_maximum_interleave_depth, int, 0); -+MODULE_PARM_DESC(maximum_interleave_depth, "Maximum interleave depth"); -+ -+int mp_pair_selection = -1; -+module_param_named(pair_selection, mp_pair_selection, int, 0); -+MODULE_PARM_DESC(pair_selection, "Pair selection"); -+ -+int mp_dgas_polarity = -1; -+module_param_named(dgas_polarity, mp_dgas_polarity, int, 0); -+MODULE_PARM_DESC(dgas_polarity, "DGAS polarity"); -+ -+int mp_los_alarm = -1; -+module_param_named(los_alarm, mp_los_alarm, int, 0); -+MODULE_PARM_DESC(los_alarm, "LOS alarm"); -+ -+char *mp_eoc_vendor_id = NULL; -+module_param_named(eoc_vendor_id, mp_eoc_vendor_id, charp, 0); -+MODULE_PARM_DESC(eoc_vendor_id, "EOC vendor id"); -+ -+int mp_eoc_vendor_revision = -1; -+module_param_named(eoc_vendor_revision, mp_eoc_vendor_revision, int, 0); -+MODULE_PARM_DESC(eoc_vendor_revision, "EOC vendor revision"); -+ -+char *mp_eoc_vendor_serialnum = NULL; -+module_param_named(eoc_vendor_serialnum, mp_eoc_vendor_serialnum, charp, 0); -+MODULE_PARM_DESC(eoc_vendor_serialnum, "EOC vendor serial number"); -+ -+char *mp_invntry_vernum = NULL; -+module_param_named(invntry_vernum, mp_invntry_vernum, charp, 0); -+MODULE_PARM_DESC(invntry_vernum, "Inventory revision number"); -+ -+int mp_dsl_bit_tmode = -1; -+module_param_named(dsl_bit_tmode, mp_dsl_bit_tmode, int, 0); -+MODULE_PARM_DESC(dsl_bit_tmode, "DSL bit training mode"); -+ -+int mp_high_precision = -1; -+module_param_named(high_precision, mp_high_precision, int, 0); -+MODULE_PARM_DESC(high_precision, "High precision"); -+ -+int mp_autopvc_enable = -1; -+module_param_named(autopvc_enable, mp_autopvc_enable, int, 0); -+MODULE_PARM_DESC(autopvc_enable, "Enable / disable automatic PVC"); -+ -+int mp_oam_lb_timeout = -1; -+module_param_named(oam_lb_timeout, mp_oam_lb_timeout, int, 0); -+MODULE_PARM_DESC(oam_lb_timeout, "OAM LB timeout"); - #endif - - #ifndef TRUE -@@ -728,9 +868,9 @@ static int __init tn7atm_irq_request (st - * interrupt pacing - */ - ptr = prom_getenv ("sar_ipacemax"); -- if (ptr) -+ if (ptr || mp_sar_ipacemax != -1) - { -- def_sar_inter_pace = os_atoi (ptr); -+ def_sar_inter_pace = mp_sar_ipacemax == -1 ? os_atoi (ptr) : mp_sar_ipacemax; - } - /* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, - def_sar_inter_pace); */ -@@ -878,9 +1018,18 @@ static int __init tn7atm_get_ESI (struct - { - int i; - char esi_addr[ESI_LEN] = { 0x00, 0x00, 0x11, 0x22, 0x33, 0x44 }; -- char *esiaddr_str = NULL; -+ char *esiaddr_str = mp_macc; - -- esiaddr_str = prom_getenv ("macc"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("macdsl"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("macc"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("HWA_1"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("macb"); -+ if (esiaddr_str == NULL) -+ esiaddr_str = prom_getenv ("maca"); - - if (!esiaddr_str) - { -@@ -2139,15 +2288,15 @@ static int tn7atm_autoDetectDspBoost (vo - //UR8_MERGE_END CQ10450* - - cp = prom_getenv ("dsp_noboost"); -- if (cp) -+ if (cp || mp_dsp_noboost != -1) - { -- dsp_noboost = os_atoi (cp); -+ dsp_noboost = mp_dsp_noboost == -1 ? os_atoi (cp) : mp_dsp_noboost; - } - - cp = (char *) prom_getenv ("dsp_freq"); -- if (cp) -+ if (cp || mp_dsp_freq != -1) - { -- dspfreq = os_atoi (cp); -+ dspfreq = mp_dsp_freq == -1 ? os_atoi (cp) : mp_dsp_freq; - if (dspfreq == 250) - { - boostDsp = 1; -@@ -2396,15 +2545,17 @@ static int __init tn7atm_init (struct at - // Inter-Op DSL phy Control - // Note the setting of _dsl_Feature_0 and _dsl_Feature_1 must before - // dslhal_api_dslStartup (in tn7dsl_init()). -- if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL) -+ if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL || mp_featctl0 != NULL) - { -- _dsl_Feature_0 = os_atoih (ptr); -+ if (mp_featctl0 != NULL) ptr = mp_featctl0; -+ _dsl_Feature_0 = os_atoh (ptr); - _dsl_Feature_0_defined = 1; - } - -- if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL) -+ if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL || mp_featctl1 != NULL) - { -- _dsl_Feature_1 = os_atoih (ptr); -+ if (mp_featctl1 != NULL) ptr = mp_featctl1; -+ _dsl_Feature_1 = os_atoh (ptr); - _dsl_Feature_1_defined = 1; - } - -@@ -2412,15 +2563,17 @@ static int __init tn7atm_init (struct at - // DSL phy Feature Control - // Note the setting of _dsl_PhyControl_0 and _dsl_PhyControl_1 must before - // dslhal_api_dslStartup (in tn7dsl_init()). -- if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL) -+ if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL || mp_phyctl0 != NULL) - { -- _dsl_PhyControl_0 = os_atoih (ptr); -+ if (mp_phyctl0 != NULL) ptr = mp_phyctl0; -+ _dsl_PhyControl_0 = os_atoh (ptr); - _dsl_PhyControl_0_defined = 1; - } - -- if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL) -+ if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL || mp_phyctl1 != NULL) - { -- _dsl_PhyControl_1 = os_atoih (ptr); -+ if (mp_phyctl1 != NULL) ptr = mp_phyctl1; -+ _dsl_PhyControl_1 = os_atoh (ptr); - _dsl_PhyControl_1_defined = 1; - } - -@@ -2440,12 +2593,12 @@ static int __init tn7atm_init (struct at - // read config for turbo dsl - - ptr = prom_getenv ("TurboDSL"); -- if (ptr) -+ if (ptr || mp_turbodsl != -1) - { - #if 1 //[KT] - bTurboDsl = os_atoi (ptr); - #else -- priv->bTurboDsl = os_atoi (ptr); -+ priv->bTurboDsl = mp_turbodsl == -1 ? os_atoi (ptr) : mp_turbodsl; - #endif - } - else -@@ -2459,33 +2612,33 @@ static int __init tn7atm_init (struct at - priv->sarRxBuf = RX_BUFFER_NUM; - ptr = NULL; - ptr = prom_getenv ("SarRxBuf"); -- if (ptr) -+ if (ptr || mp_sar_rxbuf != -1) - { -- priv->sarRxBuf = os_atoi (ptr); -+ priv->sarRxBuf = mp_sar_rxbuf == -1 ? os_atoi (ptr) : mp_sar_rxbuf; - } - - priv->sarRxMax = RX_SERVICE_MAX; - ptr = NULL; - ptr = prom_getenv ("SarRxMax"); -- if (ptr) -+ if (ptr || mp_sar_rxmax != -1) - { -- priv->sarRxMax = os_atoi (ptr); -+ priv->sarRxMax = mp_sar_rxmax == -1 ? os_atoi (ptr) : mp_sar_rxmax; - } - - priv->sarTxBuf = TX_BUFFER_NUM; - ptr = NULL; - ptr = prom_getenv ("SarTxBuf"); -- if (ptr) -+ if (ptr || mp_sar_txbuf != -1) - { -- priv->sarTxBuf = os_atoi (ptr); -+ priv->sarTxBuf = mp_sar_txbuf == -1 ? os_atoi (ptr) : mp_sar_txbuf; - } - - priv->sarTxMax = TX_SERVICE_MAX; - ptr = NULL; - ptr = prom_getenv ("SarTxMax"); -- if (ptr) -+ if (ptr || mp_sar_txmax != -1) - { -- priv->sarTxMax = os_atoi (ptr); -+ priv->sarTxMax = mp_sar_txmax == -1 ? os_atoi (ptr) : mp_sar_txmax; - } - - #ifdef AR7_EFM ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -148,6 +148,27 @@ - #define NEW_TRAINING_VAL_T1413 128 - #define NEW_TRAINING_VAL_MMODE 255 - -+extern char *mp_modulation; -+extern int mp_fine_gain_control; -+extern int mp_fine_gain_value; -+extern int mp_enable_margin_retrain; -+extern int mp_margin_threshold; -+extern int mp_enable_rate_adapt; -+extern int mp_powercutback; -+extern int mp_trellis; -+extern int mp_bitswap; -+extern int mp_maximum_bits_per_carrier; -+extern int mp_maximum_interleave_depth; -+extern int mp_pair_selection; -+extern int mp_dgas_polarity; -+extern int mp_los_alarm; -+extern char *mp_eoc_vendor_id; -+extern int mp_eoc_vendor_revision; -+extern char *mp_eoc_vendor_serialnum; -+extern char *mp_invntry_vernum; -+extern int mp_dsl_bit_tmode; -+extern int mp_high_precision; -+ - int testflag1 = 0; - extern int __guDbgLevel; - extern sar_stat_t sarStat; -@@ -2933,24 +2954,24 @@ static int tn7dsl_set_dsl(void) - (unsigned char *) &oamFeature, 4); - - ptr = prom_getenv("DSL_FEATURE_CNTL_0"); -- if(!ptr) -- prom_setenv("DSL_FEATURE_CNTL_0", "0x00004000"); -+ //if(!ptr) -+ //prom_setenv("DSL_FEATURE_CNTL_0", "0x00004000"); - - ptr = prom_getenv("DSL_FEATURE_CNTL_1"); -- if(!ptr) -- prom_setenv("DSL_FEATURE_CNTL_1", "0x00000000"); -+ //if(!ptr) -+ //prom_setenv("DSL_FEATURE_CNTL_1", "0x00000000"); - - ptr = prom_getenv("DSL_PHY_CNTL_0"); -- if(!ptr) -- prom_setenv("DSL_PHY_CNTL_0", "0x00000400"); -+ //if(!ptr) -+ //prom_setenv("DSL_PHY_CNTL_0", "0x00000400"); - - ptr = prom_getenv("enable_margin_retrain"); -- if(!ptr) -- prom_setenv("enable_margin_retrain", "0"); -+ //if(!ptr) -+ //prom_setenv("enable_margin_retrain", "0"); - - ptr = prom_getenv("modulation"); -- if(!ptr) -- prom_setenv("modulation", "0xbf"); -+ //if(!ptr) -+ //prom_setenv("modulation", "0xbf"); - - #define EOC_VENDOR_ID "4200534153000000" - #define EOC_VENDOR_REVISION "FW370090708b1_55" -@@ -2959,25 +2980,25 @@ static int tn7dsl_set_dsl(void) - ptr = prom_getenv("eoc_vendor_id"); - if(!ptr || strcmp(ptr,EOC_VENDOR_ID) != 0 || strlen(ptr) != strlen(EOC_VENDOR_ID)) - { -- if(ptr) -- prom_unsetenv("eoc_vendor_id"); -- prom_setenv("eoc_vendor_id",EOC_VENDOR_ID); -+ //if(ptr) -+ //prom_unsetenv("eoc_vendor_id"); -+ //prom_setenv("eoc_vendor_id",EOC_VENDOR_ID); - } - - ptr = prom_getenv("eoc_vendor_revision"); - if(!ptr || strcmp(ptr,EOC_VENDOR_REVISION) != 0 || strlen(ptr) != strlen(EOC_VENDOR_REVISION)) - { -- if(ptr) -- prom_unsetenv("eoc_vendor_revision"); -- prom_setenv("eoc_vendor_revision",EOC_VENDOR_REVISION); -+ //if(ptr) -+ //prom_unsetenv("eoc_vendor_revision"); -+ //prom_setenv("eoc_vendor_revision",EOC_VENDOR_REVISION); - } - - ptr = prom_getenv("eoc_vendor_serialnum"); - if(!ptr || strcmp(ptr,EOC_VENDOR_SERIALNUM) != 0 || strlen(ptr) != strlen(EOC_VENDOR_SERIALNUM)) - { -- if(ptr) -- prom_unsetenv("eoc_vendor_serialnum"); -- prom_setenv("eoc_vendor_serialnum",EOC_VENDOR_SERIALNUM); -+ //if(ptr) -+ // prom_unsetenv("eoc_vendor_serialnum"); -+ //prom_setenv("eoc_vendor_serialnum",EOC_VENDOR_SERIALNUM); - } - - /* Do only if we are in the new Base PSP 7.4.*/ -@@ -2994,92 +3015,88 @@ static int tn7dsl_set_dsl(void) - we clear the modulation environment variable, as this could potentially - not have the same meaning in the new mode. - */ -- prom_unsetenv("modulation"); -- prom_setenv("DSL_UPG_DONE", "1"); -+ //prom_unsetenv("modulation"); -+ //prom_setenv("DSL_UPG_DONE", "1"); - } - } - #endif - - // modulation - ptr = prom_getenv("modulation"); -- if (ptr) -+ if (ptr || mp_modulation != NULL) - { -- tn7dsl_set_modulation(ptr, FALSE); -+ tn7dsl_set_modulation(mp_modulation == NULL ? ptr : mp_modulation, FALSE); - } - - // Fine Gains - ptr = prom_getenv("fine_gain_control"); -- if (ptr) -+ if (ptr || mp_fine_gain_control != -1) - { -- value = os_atoi(ptr); -+ value = mp_fine_gain_control == -1 ? os_atoi(ptr) : mp_fine_gain_control; - tn7dsl_ctrl_fineGain(value); - } - ptr = NULL; - ptr = prom_getenv("fine_gain_value"); -- if(ptr) -- tn7dsl_set_fineGainValue(os_atoh(ptr)); -+ if(ptr || mp_fine_gain_value != -1) -+ tn7dsl_set_fineGainValue(mp_fine_gain_value == -1 ? os_atoh(ptr) : mp_fine_gain_value); - - // margin retrain - ptr = NULL; - ptr = prom_getenv("enable_margin_retrain"); -- if(ptr) -+ value = mp_enable_margin_retrain == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_enable_margin_retrain; -+ -+ if (value == 1) - { -- value = os_atoi(ptr); -- if(value == 1) -+ dslhal_api_setMarginMonitorFlags(pIhw, 0, 1); -+ bMarginRetrainEnable = 1; -+ //printk("enable showtime margin monitor.\n"); -+ -+ ptr = NULL; -+ ptr = prom_getenv("margin_threshold"); -+ value = mp_margin_threshold == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_margin_threshold; -+ -+ if(value >= 0) - { -- dslhal_api_setMarginMonitorFlags(pIhw, 0, 1); -- bMarginRetrainEnable = 1; -- //printk("enable showtime margin monitor.\n"); -- ptr = NULL; -- ptr = prom_getenv("margin_threshold"); -- if(ptr) -- { -- value = os_atoi(ptr); -- //printk("Set margin threshold to %d x 0.5 db\n",value); -- if(value >= 0) -- { -- dslhal_api_setMarginThreshold(pIhw, value); -- bMarginThConfig=1; -- } -- } -+ dslhal_api_setMarginThreshold(pIhw, value); -+ bMarginThConfig=1; - } - } - - // rate adapt - ptr = NULL; - ptr = prom_getenv("enable_rate_adapt"); -- if(ptr) -+ if(ptr || mp_enable_rate_adapt != -1) - { -- dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr)); -+ dslhal_api_setRateAdaptFlag(pIhw, mp_enable_rate_adapt == -1 ? os_atoi(ptr) : mp_enable_rate_adapt); - } - - // set powercutback - ptr = NULL; - ptr = prom_getenv("powercutback"); -- if(ptr) -+ if(ptr || mp_powercutback != -1) - { -- dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr)); -+ dslhal_advcfg_onOffPcb(pIhw, mp_powercutback == -1 ? os_atoi(ptr) : mp_powercutback); - } - - // trellis - ptr = NULL; - ptr = prom_getenv("trellis"); -- if(ptr) -+ if(ptr || mp_trellis != -1) - { -- dslhal_api_setTrellisFlag(pIhw, os_atoi(ptr)); -- trellis = os_atoi(ptr); -+ trellis = mp_trellis == -1 ? os_atoi(ptr) : mp_trellis; -+ dslhal_api_setTrellisFlag(pIhw, trellis); - //printk("trellis=%d\n"); - } - - // bitswap - ptr = NULL; - ptr = prom_getenv("bitswap"); -- if(ptr) -+ if(ptr || mp_bitswap != -1) - { - int offset[2] = {33, 0}; - unsigned int bitswap; - -- bitswap = os_atoi(ptr); -+ bitswap = mp_bitswap == -1 ? os_atoi(ptr) : mp_bitswap; - - tn7dsl_generic_read(2, offset); - dslReg &= dslhal_support_byteSwap32(0xFFFFFF00); -@@ -3097,46 +3114,47 @@ static int tn7dsl_set_dsl(void) - // maximum bits per carrier - ptr = NULL; - ptr = prom_getenv("maximum_bits_per_carrier"); -- if(ptr) -+ if(ptr || mp_maximum_bits_per_carrier != -1) - { -- dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, os_atoi(ptr)); -+ dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, mp_maximum_bits_per_carrier == -1 ? os_atoi(ptr) : mp_maximum_bits_per_carrier); - } - - // maximum interleave depth - ptr = NULL; - ptr = prom_getenv("maximum_interleave_depth"); -- if(ptr) -+ if(ptr || mp_maximum_interleave_depth != -1) - { -- dslhal_api_setMaxInterleaverDepth(pIhw, os_atoi(ptr)); -+ dslhal_api_setMaxInterleaverDepth(pIhw, mp_maximum_interleave_depth == -1 ? os_atoi(ptr) : mp_maximum_interleave_depth); - } - - // inner and outer pairs - ptr = NULL; - ptr = prom_getenv("pair_selection"); -- if(ptr) -+ if(ptr || mp_pair_selection != -1) - { -- dslhal_api_selectInnerOuterPair(pIhw, os_atoi(ptr)); -+ dslhal_api_selectInnerOuterPair(pIhw, mp_pair_selection == -1 ? os_atoi(ptr) : mp_pair_selection); - } - - ptr = NULL; - ptr = prom_getenv("dgas_polarity"); -- if(ptr) -+ if(ptr || mp_dgas_polarity != -1) - { - dslhal_api_configureDgaspLpr(pIhw, 1, 1); -- dslhal_api_configureDgaspLpr(pIhw, 0, os_atoi(ptr)); -+ dslhal_api_configureDgaspLpr(pIhw, 0, mp_dgas_polarity == -1 ? os_atoi(ptr) : mp_dgas_polarity); - } - - ptr = NULL; - ptr = prom_getenv("los_alarm"); -- if(ptr) -+ if(ptr || mp_los_alarm != -1) - { -- dslhal_api_disableLosAlarm(pIhw, os_atoi(ptr)); -+ dslhal_api_disableLosAlarm(pIhw, mp_los_alarm == -1 ? os_atoi(ptr) : mp_los_alarm); - } - - ptr = NULL; - ptr = prom_getenv("eoc_vendor_id"); -- if(ptr) -+ if(ptr || mp_eoc_vendor_id != NULL) - { -+ ptr = mp_eoc_vendor_id == NULL ? ptr : mp_eoc_vendor_id; - for(i=0;i<8;i++) - { - tmp[0]=ptr[i*2]; -@@ -3161,26 +3179,26 @@ static int tn7dsl_set_dsl(void) - } - ptr = NULL; - ptr = prom_getenv("eoc_vendor_revision"); -- if(ptr) -+ if(ptr || mp_eoc_vendor_revision != -1) - { -- value = os_atoi(ptr); -+ value = mp_eoc_vendor_revision == -1 ? os_atoi(ptr) : mp_eoc_vendor_revision; - //printk("eoc rev=%d\n", os_atoi(ptr)); - dslhal_api_setEocRevisionNumber(pIhw, (char *)&value); - - } - ptr = NULL; - ptr = prom_getenv("eoc_vendor_serialnum"); -- if(ptr) -+ if(ptr || mp_eoc_vendor_serialnum != NULL) - { -- dslhal_api_setEocSerialNumber(pIhw, ptr); -+ dslhal_api_setEocSerialNumber(pIhw, mp_eoc_vendor_serialnum == NULL ? ptr : mp_eoc_vendor_serialnum); - } - - // CQ10037 Added invntry_vernum environment variable to be able to set version number in ADSL2, ADSL2+ modes. - ptr = NULL; - ptr = prom_getenv("invntry_vernum"); -- if(ptr) -+ if(ptr || mp_invntry_vernum != NULL) - { -- dslhal_api_setEocRevisionNumber(pIhw, ptr); -+ dslhal_api_setEocRevisionNumber(pIhw, mp_invntry_vernum == NULL ? ptr : mp_invntry_vernum); - } - - return 0; -@@ -3225,7 +3243,7 @@ int tn7dsl_init(void *priv) - * backward compatibility. - */ - cp = prom_getenv("DSL_BIT_TMODE"); -- if (cp) -+ if (cp || mp_dsl_bit_tmode != -1) - { - printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__); - /* -@@ -3254,9 +3272,9 @@ int tn7dsl_init(void *priv) - - // UR8_MERGE_START CQ11054 Jack Zhang - cp = prom_getenv("high_precision"); -- if (cp) -+ if (cp || mp_high_precision != -1) - { -- high_precision_selected = os_atoi(cp); -+ high_precision_selected = mp_high_precision == -1 ? os_atoi(cp) : mp_high_precision; - } - if ( high_precision_selected) - { ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -76,6 +76,8 @@ typedef void OS_SETUP; - #include "tn7atm.h" - #include "tn7api.h" - -+extern int mp_oam_lb_timeout; -+extern int mp_autopvc_enable; - - /* PDSP Firmware files */ - #include "tnetd7300_sar_firm.h" -@@ -932,9 +934,9 @@ int tn7sar_setup_oam_channel(Tn7AtmPriva - pHalDev = (HAL_DEVICE *)priv->pSarHalDev; - - pauto_pvc = prom_getenv("autopvc_enable"); -- if(pauto_pvc) //CQ10273 -+ if(pauto_pvc || mp_autopvc_enable != -1) //CQ10273 - { -- auto_pvc =tn7sar_strtoul(pauto_pvc, NULL, 10); -+ auto_pvc = mp_autopvc_enable == -1 ? tn7sar_strtoul(pauto_pvc, NULL, 10) : mp_autopvc_enable; - } - - memset(&chInfo, 0xff, sizeof(chInfo)); -@@ -1133,9 +1135,9 @@ int tn7sar_init(struct atm_dev *dev, Tn7 - - /* read in oam lb timeout value */ - pLbTimeout = prom_getenv("oam_lb_timeout"); -- if(pLbTimeout) -+ if(pLbTimeout || mp_oam_lb_timeout != -1) - { -- lbTimeout =tn7sar_strtoul(pLbTimeout, NULL, 10); -+ lbTimeout = mp_oam_lb_timeout == -1 ? tn7sar_strtoul(pLbTimeout, NULL, 10) : mp_oam_lb_timeout; - oamLbTimeout = lbTimeout; - pHalFunc->Control(pHalDev,"OamLbTimeout", "Set", &lbTimeout); - } diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch deleted file mode 100644 index 53767e45be..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -492,7 +492,6 @@ static void avsar_release(struct device - } - - static struct device avsar = { -- .bus_id = "vlynq", - .release = avsar_release, - }; - -@@ -501,6 +500,8 @@ int shim_osLoadFWImage(unsigned char *pt - const struct firmware *fw_entry; - size_t size; - -+ dev_set_name(&avsar, "avsar"); -+ - printk("requesting firmware image \"ar0700xx.bin\"\n"); - if(device_register(&avsar) < 0) { - printk(KERN_ERR diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch deleted file mode 100644 index 69b433b2b9..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -78,8 +78,8 @@ - #include - - #include --#include --#include -+#include -+#include - - #include "dsl_hal_api.h" - #ifdef AR7_EFM ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -119,8 +119,8 @@ - #include - - #include --#include --#include -+#include -+#include - - /* Modules specific header files */ - #ifdef AR7_EFM ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -55,8 +55,8 @@ - #include - - #include --#include --#include -+#include -+#include - - #define _CPHAL_AAL5 - #define _CPHAL_SAR diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch deleted file mode 100644 index 10d32d2618..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -209,7 +209,7 @@ led_reg_t ledreg[2]; - static struct led_funcs ledreg[2]; - #endif - --#define DEV_DSLMOD CTL_UNNUMBERED -+#define DEV_DSLMOD 0 - #define MAX_STR_SIZE 256 - #define DSL_MOD_SIZE 256 - -@@ -350,8 +350,8 @@ static void tn7dsl_chng_modulation(void* - static unsigned int tn7dsl_set_modulation(void* data, int flag); - static void tn7dsl_ctrl_fineGain(int value); - static void tn7dsl_set_fineGainValue(int value); --static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp, -- void *buffer, size_t * lenp); -+static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer, -+ size_t * lenp, loff_t *ppos); - static void tn7dsl_register_dslss_led(void); - void tn7dsl_dslmod_sysctl_register(void); - void tn7dsl_dslmod_sysctl_unregister(void); -@@ -3582,8 +3582,8 @@ unsigned int tn7dsl_get_memory(unsigned - - - --static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp, -- void *buffer, size_t *lenp) -+static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer, -+ size_t *lenp, loff_t *ppos) - { - char *ptr; - int ret, len = 0; -@@ -3595,7 +3595,7 @@ static int dslmod_sysctl(ctl_table *ctl, - char mod_req[16] = { '\t' }; - char fst_byt; - -- if (!*lenp || (filp->f_pos && !write)) -+ if (!*lenp || (*ppos && !write)) - { - *lenp = 0; - return 0; -@@ -3605,9 +3605,9 @@ static int dslmod_sysctl(ctl_table *ctl, - */ - if(write) - { -- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); -+ ret = proc_dostring(ctl, write, buffer, lenp, ppos); - -- switch (ctl->ctl_name) -+ switch ((long)ctl->extra2) - { - case DEV_DSLMOD: - ptr = strpbrk(info, " \t"); -@@ -3691,14 +3691,21 @@ static int dslmod_sysctl(ctl_table *ctl, - else - { - len += sprintf(info+len, mod_req); -- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); -+ ret = proc_dostring(ctl, write, buffer, lenp, ppos); - } - return ret; - } - - - ctl_table dslmod_table[] = { -- {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string} -+ { -+ .procname = "dslmod", -+ .data = info, -+ .maxlen = DSL_MOD_SIZE, -+ .mode = 0644, -+ .proc_handler = &dslmod_sysctl, -+ .extra2 = (void *)DEV_DSLMOD, -+ } - , - {0} - }; -@@ -3706,7 +3713,12 @@ ctl_table dslmod_table[] = { - /* Make sure that /proc/sys/dev is there */ - ctl_table dslmod_root_table[] = { - #ifdef CONFIG_PROC_FS -- {CTL_DEV, "dev", NULL, 0, 0555, dslmod_table} -+ { -+ .procname = "dev", -+ .maxlen = 0, -+ .mode = 0555, -+ .child = dslmod_table, -+ } - , - #endif /* CONFIG_PROC_FS */ - {0} diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch deleted file mode 100644 index 75de5a33e7..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -2003,7 +2003,7 @@ static int __init tn7atm_register (Tn7At - - dgprintf (4, "device %s being registered\n", priv->name); - -- mydev = atm_dev_register (priv->proc_name, &tn7atm_ops, -1, NULL); -+ mydev = atm_dev_register (priv->proc_name, NULL, &tn7atm_ops, -1, NULL); - - if (mydev == NULL) - { ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -499,13 +499,16 @@ int shim_osLoadFWImage(unsigned char *pt - { - const struct firmware *fw_entry; - size_t size; -+ int ret; - - dev_set_name(&avsar, "avsar"); - - printk("requesting firmware image \"ar0700xx.bin\"\n"); -- if(device_register(&avsar) < 0) { -+ dev_set_name(&avsar, "avsar"); -+ ret = device_register(&avsar); -+ if (ret < 0) { - printk(KERN_ERR -- "avsar: device_register fails\n"); -+ "avsar: device_register fails, error%i\n", ret); - return -1; - } - diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch deleted file mode 100644 index 975ebaf299..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -72,7 +72,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -49,7 +49,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -108,7 +108,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/220-3.10-update_proc_code.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/220-3.10-update_proc_code.patch deleted file mode 100644 index ef1ddd833c..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/220-3.10-update_proc_code.patch +++ /dev/null @@ -1,3082 +0,0 @@ -From 42d0f4c2f5cf0f73edd827263dc65aefc8f82192 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 26 Sep 2013 12:28:35 +0200 -Subject: [PATCH] update proc code to fix compilation for 3.10 - -Signed-off-by: Jonas Gorski - ---- - tn7api.h | 66 ++- - tn7atm.c | 395 ++++++++--------- - tn7dsl.c | 1439 ++++++++++++++++++++++++++++++-------------------------------- - tn7sar.c | 91 ++-- - 4 files changed, 951 insertions(+), 1040 deletions(-) - ---- a/tn7api.h -+++ b/tn7api.h -@@ -91,31 +91,29 @@ void * tn7atm_memcpy(void * dst, void co - /* tn7dsl.h */ - void tn7dsl_exit(void); - int tn7dsl_init(void *priv); --int tn7dsl_proc_eoc(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_stats(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_eoc_fops; -+extern struct file_operations tn7dsl_proc_stats_fops; - - //#define ADV_DIAG_STATS 1 //CQ10275 To enable Adv Stats - - #ifdef ADV_DIAG_STATS --int tn7dsl_proc_adv_stats(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_adv_stats1(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_adv_stats2(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_adv_stats3(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_adv_stats_fops; -+extern struct file_operations tn7dsl_proc_adv1_stats_fops; -+extern struct file_operations tn7dsl_proc_adv2_stats_fops; -+extern struct file_operations tn7dsl_proc_adv3_stats_fops; - //UR8_MERGE_START CQ10682 Jack Zhang --int tn7dsl_proc_dbg_cmsgs(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs1(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs2(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs3(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_dbg_rmsgs4(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_dbg_cmsgs_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs1_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs2_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs3_fops; -+extern struct file_operations tn7dsl_proc_dbg_cmsgs4_fops; - //UR8_MERGE_END CQ10682* - #endif //ADV_DIAG_STATS - --int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data); --int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_modem_fops; - //UR8_MERGE_START CQ11813 Hao-Ting - #ifdef LINUX_CLI_SUPPORT --int tn7dsl_proc_dbgmsg_write(struct file *fp, const char *buf, unsigned long count, void *data); --int tn7dsl_proc_dbgmsg_read(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_dbgmsg_fops; - #endif - //UR8_MERGE_END CQ11813 - int tn7dsl_handle_interrupt(void); -@@ -142,31 +140,31 @@ int os_atoih(const char *pStr); - #endif - - unsigned long os_atoul(const char *pStr); --int tn7dsl_proc_snr0(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_snr1(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_snr2(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_bit_allocation(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_ds_noise(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_generic_read_result(char* buf, char **start, off_t offset, int count, int *eof, void *data); --int tn7dsl_proc_train_mode_export(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_snr0_fops; -+extern struct file_operations tn7dsl_proc_snr1_fops; -+extern struct file_operations tn7dsl_proc_snr2_fops; -+extern struct file_operations tn7dsl_proc_bit_allocation_fops; -+extern struct file_operations tn7dsl_proc_ds_noise_fops; -+extern struct file_operations tn7dsl_proc_generic_read_result_fops; -+extern struct file_operations tn7dsl_proc_train_mode_export_fops; - - #ifndef NO_ADV_STATS --int tn7dsl_proc_SNRpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_QLNpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7dsl_proc_SNRpsds_fops; -+extern struct file_operations tn7dsl_proc_QLNpsds_fops; - // * UR8_MERGE_START CQ10979 Jack Zhang - #ifdef TR69_HLIN_IN --//int tn7dsl_proc_HLINpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds1(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds2(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds3(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_HLINpsds4(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+//extern struct file_operations tn7dsl_proc_HLINpsds_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds1_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds2_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds3_fops; -+extern struct file_operations tn7dsl_proc_HLINpsds4_fops; - #endif //TR69_HLIN_IN - // * UR8_MERGE_END CQ10979* - // * UR8_MERGE_START CQ11057 Jack Zhang - #define TR69_PMD_IN - #ifdef TR69_PMD_IN --//int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+//extern struct file_operations tn7dsl_proc_PMDus_fops; -+extern struct file_operations tn7dsl_proc_PMDus_fops; - #endif //TR69_PMD_IN - // * UR8_MERGE_END CQ11057 * - #endif -@@ -183,12 +181,12 @@ void tn7sar_get_sar_version(Tn7AtmPrivat - int tn7sar_get_near_end_loopback_count(unsigned int *pF4count, unsigned int *pF5count); - int tn7sar_oam_generation(void *privContext, int chan, int type, int vpi, int vci, int timeout); - int tn7sar_get_stats(void *priv1); --int tn7sar_proc_sar_stat(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7sar_proc_sar_stat_fops; - #ifdef AR7_EFM - void tn7sar_get_EFM_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls); - #endif - void tn7sar_get_sar_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls); --int tn7sar_proc_oam_ping(char* buf, char **start, off_t offset, int count,int *eof, void *data); --int tn7sar_proc_pvc_table(char* buf, char **start, off_t offset, int count,int *eof, void *data); -+extern struct file_operations tn7sar_proc_oam_ping_fops; -+extern struct file_operations tn7sar_proc_pvc_table_fops; - int tn7sar_tx_flush(void *privContext, int chan, int queue, int skip); - #endif __SGAPI_H ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -259,11 +259,9 @@ MODULE_PARM_DESC(oam_lb_timeout, "OAM LB - - #ifdef AR7_EFM - extern void tn7dsl_disable_alarm(void); --extern int tn7efm_proc_channels (char *buf, char **start, -- off_t offset, int count, int *eof, void *data); --extern int tn7efm_proc_ctrl_read (char *buf, char **start, off_t offset, int count, int *eof, void *data); --extern int tn7efm_proc_ctrl_write (struct file *fp, const char *buf, unsigned long count, void *data); --extern int tn7efm_proc_info (char *buf, char **start, off_t offset, int count, int *eof, void *data); -+extern struct file_operations tn7efm_proc_channels_fops; -+extern struct file_operations tn7efm_proc_ctrl_fops; -+extern struct file_operations tn7efm_proc_info_fops; - extern unsigned int g_efm_proc_ctl; - extern struct net_device *mydev_efm; - extern Tn7AtmPrivate *mypriv; -@@ -299,31 +297,17 @@ extern int tn7efm_register (Tn7AtmPrivat - static int tn7atm_irq_request (struct atm_dev *dev); - #endif - --static int tn7atm_proc_version (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); -+static struct file_operations tn7atm_proc_version_fops; - static void tn7atm_exit (void); --static int tn7atm_proc_channels (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); --static int tn7atm_proc_private (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); -+static struct file_operations tn7atm_proc_channels_fops; -+static struct file_operations tn7atm_proc_private_fops; - inline static int tn7atm_queue_packet_to_sar (void *vcc1, void *skb1, - int chan); - --static int tn7atm_xlate_proc_name (const char *name, -- struct proc_dir_entry **ret, -- const char **residual); --static int tn7atm_proc_match (int len, const char *name, -- struct proc_dir_entry *de); --static int tn7atm_proc_qos_read (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); --static int tn7atm_proc_qos_write (struct file *fp, const char *buf, -- unsigned long count, void *data); -+static struct file_operations tn7atm_proc_qos_fops; - - // [KT] --static int tn7atm_proc_turbodsl_read (char *buf, char **start, off_t offset, -- int count, int *eof, void *data); --static int tn7atm_proc_turbodsl_write (struct file *fp, const char *buf, -- unsigned long count, void *data); -+static struct file_operations tn7atm_proc_turbodsl_fops; - - //CT - Added function to return chipset Id - void tn7atm_get_chipsetId (char *pVerId); -@@ -453,75 +437,75 @@ static int proc_root_already_exists = TR - static struct - { - const unsigned char name[32]; -- int (*read_func) (char* , char **, off_t , int ,int *, void *); -- int (*write_func) (struct file *, const char * , unsigned long , void *); -+ struct file_operations *fops; - - } proc_if[] = { - #ifdef AR7_EFM - #ifdef EFM_DEBUG -- {"avsar_efm_channel", tn7efm_proc_channels, NULL}, -+ {"avsar_efm_channel", &tn7efm_proc_channels_fops}, - #endif -- {"avsar_efm_info", tn7efm_proc_info, NULL}, -- {"avsar_efm_ctl", tn7efm_proc_ctrl_read, tn7efm_proc_ctrl_write}, -+ {"avsar_efm_info", &tn7efm_proc_info_fops}, -+ {"avsar_efm_ctl", &tn7efm_proc_ctrl_fops}, - #endif -- {"avsar_ver", tn7atm_proc_version, NULL}, -- {"avsar_channels", tn7atm_proc_channels, NULL}, -- {"avsar_sarhal_stats", tn7sar_proc_sar_stat, NULL}, -- {"avsar_oam_ping", tn7sar_proc_oam_ping, NULL}, -- {"avsar_pvc_table", tn7sar_proc_pvc_table, NULL}, -- {"avsar_rxsnr0", tn7dsl_proc_snr0, NULL}, -- {"avsar_rxsnr1", tn7dsl_proc_snr1, NULL}, -- {"avsar_rxsnr2", tn7dsl_proc_snr2, NULL}, -- {"clear_eoc_stats", tn7dsl_proc_eoc, NULL}, -- {"avsar_bit_allocation_table", tn7dsl_proc_bit_allocation, NULL}, -- {"avsar_dsl_modulation_schemes",tn7dsl_proc_train_mode_export, NULL}, -+ {"avsar_ver", &tn7atm_proc_version_fops}, -+ {"avsar_channels", &tn7atm_proc_channels_fops}, -+ {"avsar_sarhal_stats", &tn7sar_proc_sar_stat_fops}, -+ {"avsar_oam_ping", &tn7sar_proc_oam_ping_fops}, -+ {"avsar_pvc_table", &tn7sar_proc_pvc_table_fops}, -+ {"avsar_rxsnr0", &tn7dsl_proc_snr0_fops}, -+ {"avsar_rxsnr1", &tn7dsl_proc_snr1_fops}, -+ {"avsar_rxsnr2", &tn7dsl_proc_snr2_fops}, -+ {"clear_eoc_stats", &tn7dsl_proc_eoc_fops}, -+ {"avsar_bit_allocation_table", &tn7dsl_proc_bit_allocation_fops}, -+ {"avsar_dsl_modulation_schemes",&tn7dsl_proc_train_mode_export_fops}, - #ifndef NO_ADV_STATS -- {"avsar_SNRpsds", tn7dsl_proc_SNRpsds, NULL}, -- {"avsar_QLNpsds", tn7dsl_proc_QLNpsds, NULL}, -+ {"avsar_SNRpsds", &tn7dsl_proc_SNRpsds_fops}, -+ {"avsar_QLNpsds", &tn7dsl_proc_QLNpsds_fops}, - // * UR8_MERGE_START CQ10979 Jack Zhang - #ifdef TR69_HLIN_IN --// {"avsar_HLINpsds", tn7dsl_proc_HLINpsds, NULL}, -- {"avsar_HLINpsds1", tn7dsl_proc_HLINpsds1, NULL}, -- {"avsar_HLINpsds2", tn7dsl_proc_HLINpsds2, NULL}, -- {"avsar_HLINpsds3", tn7dsl_proc_HLINpsds3, NULL}, -- {"avsar_HLINpsds4", tn7dsl_proc_HLINpsds4, NULL}, -+// {"avsar_HLINpsds", &tn7dsl_proc_HLINpsds_fops}, -+ {"avsar_HLINpsds1", &tn7dsl_proc_HLINpsds1_fops}, -+ {"avsar_HLINpsds2", &tn7dsl_proc_HLINpsds2_fops}, -+ {"avsar_HLINpsds3", &tn7dsl_proc_HLINpsds3_fops}, -+ {"avsar_HLINpsds4", &tn7dsl_proc_HLINpsds4_fops}, - #endif //TR69_HLIN_IN - // * UR8_MERGE_END CQ10979* - // * UR8_MERGE_START CQ11057 Jack Zhang - #define TR69_PMD_IN - #ifdef TR69_PMD_IN -- {"avsar_PMDTestus", tn7dsl_proc_PMDus, NULL}, --// {"avsar_PMDTestus1", tn7dsl_proc_PMDus1, NULL}, -+ {"avsar_PMDTestus", &tn7dsl_proc_PMDus_fops}, -+// {"avsar_PMDTestus1", &tn7dsl_proc_PMDus1_fops}, - #endif //TR69_PMD_IN - // * UR8_MERGE_END CQ11057 * - #endif -- {"avsar_private", tn7atm_proc_private, NULL}, -- {"avsar_modem_training", tn7dsl_proc_modem, NULL}, -- {"avsar_modem_stats", tn7dsl_proc_stats, tn7dsl_proc_write_stats}, -+ {"avsar_private", &tn7atm_proc_private_fops}, -+ {"avsar_modem_training", &tn7dsl_proc_modem_fops}, -+ {"avsar_modem_stats", &tn7dsl_proc_stats_fops}, - - #ifdef ADV_DIAG_STATS //CQ10275 --//for 2.6 {"avsar_modem_adv_stats", tn7dsl_proc_adv_stats, NULL}, -+//for 2.6 {"avsar_modem_adv_stats", &tn7dsl_proc_adv_stats_fops}, - //For 2.4 kernel, due to proc file system size limitation -- {"avsar_modem_adv_stats1", tn7dsl_proc_adv_stats1, NULL}, -- {"avsar_modem_adv_stats2", tn7dsl_proc_adv_stats2, NULL}, -- {"avsar_modem_adv_stats3", tn7dsl_proc_adv_stats3, NULL}, -+ {"avsar_modem_adv_stats1", &tn7dsl_proc_adv_stats1_fops}, -+ {"avsar_modem_adv_stats2", &tn7dsl_proc_adv_stats2_fops}, -+ {"avsar_modem_adv_stats3", &tn7dsl_proc_adv_stats3_fops}, - //UR8_MERGE_START CQ10682 Jack Zhang -- {"avsar_modem_dbg_cmsgs", tn7dsl_proc_dbg_cmsgs, NULL}, -- {"avsar_modem_dbg_rmsgs1", tn7dsl_proc_dbg_rmsgs1, NULL}, -- {"avsar_modem_dbg_rmsgs2", tn7dsl_proc_dbg_rmsgs2, NULL}, -- {"avsar_modem_dbg_rmsgs3", tn7dsl_proc_dbg_rmsgs3, NULL}, -- {"avsar_modem_dbg_rmsgs4", tn7dsl_proc_dbg_rmsgs4, NULL}, -+ {"avsar_modem_dbg_cmsgs", &tn7dsl_proc_dbg_cmsgs_fops}, -+ {"avsar_modem_dbg_rmsgs1", &tn7dsl_proc_dbg_rmsgs1_fops}, -+ {"avsar_modem_dbg_rmsgs2", &tn7dsl_proc_dbg_rmsgs2_fops}, -+ {"avsar_modem_dbg_rmsgs3", &tn7dsl_proc_dbg_rmsgs3_fops}, -+ {"avsar_modem_dbg_rmsgs4", &tn7dsl_proc_dbg_rmsgs4_fops}, - // UR8_MERGE_END CQ10682* - #endif //ADV_DIAG_STATS - //UR8_MERGE_START CQ11813 Hao-Ting - #ifdef LINUX_CLI_SUPPORT -- {"avsar_dbg_enable", tn7dsl_proc_dbgmsg_read, tn7dsl_proc_dbgmsg_write}, -+ {"avsar_dbg_enable", &tn7dsl_proc_dbgmsg_fops}, - #endif - //UR8_MERGE_END CQ11813 -- {"avsar_qos_enable", tn7atm_proc_qos_read, tn7atm_proc_qos_write}, -+ {"avsar_qos_enable", &tn7atm_proc_qos_fops}, - #if 1 /* [MS] */ -- {"avsar_turbodsl", tn7atm_proc_turbodsl_read, tn7atm_proc_turbodsl_write} -+ {"avsar_turbodsl", &tn7atm_proc_turbodsl_fops} - #endif -+ - }; - - /* *INDENT-ON* */ -@@ -1805,76 +1789,81 @@ int tn7atm_receive (void *os_dev, int ch - return 0; - } - -- --static int tn7atm_proc_channels (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7atm_proc_channels (struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - int i; - - struct atm_dev *dev; - Tn7AtmPrivate *priv; - -- dev = (struct atm_dev *) data; -+ dev = (struct atm_dev *) m->private; - priv = (Tn7AtmPrivate *) dev->dev_data; - -- if (len <= limit) -- len += sprintf (buf + len, "Chan Inuse ChanID VPI VCI \n"); -- if (len <= limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, "Chan Inuse ChanID VPI VCI \n"); -+ seq_printf (m, - "------------------------------------------------------------------\n"); - - for (i = 0; i <= MAX_DMA_CHAN; i++) - { -- if (len <= limit) -- { -- len += sprintf (buf + len, -- " %02d %05d %05d %05d %05d \n", -- i, priv->lut[i].inuse, priv->lut[i].chanid, -- priv->lut[i].vpi, priv->lut[i].vci); -- } -+ seq_printf (m, -+ " %02d %05d %05d %05d %05d \n", -+ i, priv->lut[i].inuse, priv->lut[i].chanid, -+ priv->lut[i].vpi, priv->lut[i].vci); - } - -- if (len <= limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "------------------------------------------------------------------\n"); - -- return len; -+ return 0; - } - --static int tn7atm_proc_private (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7atm_proc_channels_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_channels, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_channels_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_channels_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+static int tn7atm_proc_private (struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - struct atm_dev *dev; - Tn7AtmPrivate *priv; - -- dev = (struct atm_dev *) data; -+ dev = (struct atm_dev *) m->private; - priv = (Tn7AtmPrivate *) dev->dev_data; - -- if (len <= limit) -- len += sprintf (buf + len, "\nPrivate Data Structure(%s):\n", priv->name); -- if (len <= limit) -- len += sprintf (buf + len, "----------------------------------------\n"); -- if (len <= limit) -- len += sprintf (buf + len, "priv: 0x%p\n", priv); -- if (len <= limit) -- len += sprintf (buf + len, "next: 0x%p", priv->next); -- if (len <= limit) -- len += sprintf (buf + len, "\tdev: 0x%p\n", priv->dev); -- -- if (len <= limit) -- len += sprintf (buf + len, "tx_irq: %02d", priv->sar_irq); -- if (len <= limit) -- len += sprintf (buf + len, "rx_irq: %02d", priv->dsl_irq); -+ seq_printf (m, "\nPrivate Data Structure(%s):\n", priv->name); -+ seq_printf (m, "----------------------------------------\n"); -+ seq_printf (m, "priv: 0x%p\n", priv); -+ seq_printf (m, "next: 0x%p", priv->next); -+ seq_printf (m, "\tdev: 0x%p\n", priv->dev); -+ -+ seq_printf (m, "tx_irq: %02d", priv->sar_irq); -+ seq_printf (m, "rx_irq: %02d", priv->dsl_irq); -+ -+ return 0; -+} - -- return len; -+static int tn7atm_proc_private_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_private, PDE_DATA(inode)); - } - -+static struct file_operations tn7atm_proc_private_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_private_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - void tn7atm_sarhal_isr_register (void *os_dev, void *hal_isr, - int interrupt_num) - { -@@ -2023,10 +2012,8 @@ static int __init tn7atm_register (Tn7At - return ATM_REG_OK; - } - --static int tn7atm_proc_version (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7atm_proc_version (struct seq_file *m, void *data) - { -- int len = 0; - char dslVer[8]; - char dspVer[10]; - char chipsetID[32]; //CT CQ10076 - Added temporary buffer to store chipset Id -@@ -2041,58 +2028,52 @@ static int tn7atm_proc_version (char *bu - priv = mydev->dev_data; - - #ifdef AR7_EFM -- len += -- sprintf (buf + len, "ATM/EFM Driver version:[%d.%02d.%02d.%02d]\n", -- LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR, -- LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM); -- -+ seq_printf (m, "ATM/EFM Driver version:[%d.%02d.%02d.%02d]\n", -+ LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR, -+ LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM); - #else -- len += -- sprintf (buf + len, "ATM Driver version:[%d.%02d.%02d.%02d]\n", -- LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR, -- LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM); -+ seq_printf (m, "ATM Driver version:[%d.%02d.%02d.%02d]\n", -+ LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR, -+ LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM); - #endif - - tn7dsl_get_dslhal_version (dslVer); - -- len += -- sprintf (buf + len, "DSL HAL version: [%d.%02d.%02d.%02d]\n", dslVer[0], -- dslVer[1], dslVer[2], dslVer[3]); -+ seq_printf (m, "DSL HAL version: [%d.%02d.%02d.%02d]\n", dslVer[0], -+ dslVer[1], dslVer[2], dslVer[3]); - tn7dsl_get_dsp_version (dspVer); - - #ifdef EFM_DEBUG -- len += -- sprintf (buf + len, "DSP Datapump version: [%d.%02d.%02d.%02d(%u)] ", -- dspVer[4], dspVer[5], dspVer[6], dspVer[7], (unsigned char) dspVer[7]); -+ seq_printf (m, "DSP Datapump version: [%d.%02d.%02d.%02d(%u)] ", -+ dspVer[4], dspVer[5], dspVer[6], dspVer[7], (unsigned char) dspVer[7]); - #else -- len += -- sprintf (buf + len, "DSP Datapump version: [%d.%02d.%02d.%02d] ", -- dspVer[4], dspVer[5], dspVer[6], dspVer[7]); -+ seq_printf (m, "DSP Datapump version: [%d.%02d.%02d.%02d] ", -+ dspVer[4], dspVer[5], dspVer[6], dspVer[7]); - #endif - if (dspVer[8] == 2) // annex B -- len += sprintf (buf + len, "Annex B\n"); -+ seq_printf (m, "Annex B\n"); - else if (dspVer[8] == 3) // annex c -- len += sprintf (buf + len, "Annex c\n"); -+ seq_printf (m, "Annex c\n"); - else -- len += sprintf (buf + len, "Annex A\n"); -+ seq_printf (m, "Annex A\n"); - - tn7sar_get_sar_version (priv, &pSarVer); - -- len += sprintf (buf + len, "SAR HAL version: ["); -+ seq_printf (m, "SAR HAL version: ["); - for (i = 0; i < 8; i++) - { -- len += sprintf (buf + len, "%c", pSarVer[i + 7]); -+ seq_printf (m, "%c", pSarVer[i + 7]); - } -- len += sprintf (buf + len, "]\n"); -+ seq_printf (m, "]\n"); - - tn7sar_get_sar_firmware_version (&pdspV1, &pdspV2); - - #ifndef AR7_EFM -- len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x]\n", -+ seq_printf (m, "PDSP Firmware version:[%01x.%02x]\n", - pdspV1, pdspV2); - #else - -- len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x](ATM)%c\n", -+ seq_printf (m, "PDSP Firmware version:[%01x.%02x](ATM)%c\n", - pdspV1, pdspV2, (priv->curr_TC_mode== TC_MODE_ATM) ? '*' : ' '); - - tn7sar_get_EFM_firmware_version (&pdspV1, &pdspV2); -@@ -2104,26 +2085,37 @@ static int tn7atm_proc_version (char *bu - #endif - str = "EFM"; - -- len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x](%s)%c\n", -+ seq_printf (m, "PDSP Firmware version:[%01x.%02x](%s)%c\n", - pdspV1, pdspV2, str, (priv->curr_TC_mode== TC_MODE_PTM) ? '*' : ' '); - - #endif - - //CT CQ10076 - Added code to report chipset ID using proc file system - tn7atm_get_chipsetId(chipsetID); -- len += sprintf (buf + len, "Chipset ID: [%s]\n",chipsetID); -+ seq_printf (m, "Chipset ID: [%s]\n",chipsetID); - -- return len; -+ return 0; - } - -+static int tn7atm_proc_version_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_version, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_version_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_version_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - - /* Device detection */ - - static int __init tn7atm_detect (void) - { - Tn7AtmPrivate *priv; -- struct proc_dir_entry *dsl_wr_file = NULL; /* Only for ones with a write -- * function. */ - int ctr; - const char *residual; - -@@ -2204,24 +2196,7 @@ static int __init tn7atm_detect (void) - */ - for (ctr = 0; ctr < (NUM_ELEMS (proc_if)); ctr++) - { -- /* Only if we have a write function, we create a normal proc file. */ -- if(proc_if[ctr].write_func) -- { -- dsl_wr_file = create_proc_entry (proc_if[ctr].name, DRV_PROC_MODE, root_proc_dir_entry); -- if (dsl_wr_file) -- { -- dsl_wr_file->read_proc = proc_if[ctr].read_func; -- dsl_wr_file->write_proc = proc_if[ctr].write_func; -- dsl_wr_file->data = (void *)mydev; //UR8_MERGE_START_END CQ10700 Manjula K -- } -- dsl_wr_file = NULL; -- } -- else -- { -- /* Create a read-only entry. */ -- create_proc_read_entry (proc_if[ctr].name, 0, root_proc_dir_entry, -- proc_if[ctr].read_func, mydev); -- } -+ proc_create_data(proc_if[ctr].name, DRV_PROC_MODE, root_proc_dir_entry, proc_if[ctr].fops, (void *)mydev); - } - - tn7dsl_dslmod_sysctl_register (); -@@ -2701,73 +2676,18 @@ static int tn7atm_set_can_support_adsl2 - return TRUE; - } - --/* -- * This function matches a name such as "serial", and that specified by the -- * proc_dir_entry -- */ --static int tn7atm_proc_match (int len, const char *name, -- struct proc_dir_entry *de) -+static int tn7atm_proc_qos_read(struct seq_file *m, void *data) - { -- if (!de || !de->low_ino) -- return 0; -- if (de->namelen != len) -+ seq_printf (m, "\nEnableQoS = %d\n", EnableQoS); - return 0; -- return !strncmp (name, de->name, len); --} -- --/* -- * This function parses a name such as "tty/driver/serial", and -- * returns the struct proc_dir_entry for "/proc/tty/driver", and -- * returns "serial" in residual. -- */ --static int tn7atm_xlate_proc_name (const char *name, -- struct proc_dir_entry **ret, -- const char **residual) --{ -- const char *cp = name, *next; -- struct proc_dir_entry *de; -- int len; -- extern struct proc_dir_entry proc_root; -- -- de = &proc_root; -- while (1) -- { -- next = strchr (cp, '/'); -- if (!next) -- break; -- -- len = next - cp; -- for (de = de->subdir; de; de = de->next) -- { -- if (tn7atm_proc_match (len, cp, de)) -- break; -- } -- if (!de) -- return -ENOENT; -- cp += len + 1; -- } -- *residual = cp; -- *ret = de; -- -- return 0; --} -- --static int tn7atm_proc_qos_read(char *buf, char **start, off_t offset, int count, int *eof, void *data) --{ -- int len = 0; -- -- len += sprintf (buf + len, "\nEnableQoS = %d\n", EnableQoS); -- return len; - - } - - // [KT] --static int tn7atm_proc_turbodsl_read(char *buf, char **start, off_t offset, int count, int *eof, void *data) -+static int tn7atm_proc_turbodsl_read(struct seq_file *m, void *data) - { -- int len = 0; -- -- len += sprintf (buf + len, "%d\n", bTurboDsl); -- return len; -+ seq_printf (m, "%d\n", bTurboDsl); -+ return 0; - } - - static int tn7atm_proc_qos_write(struct file *fp, const char *buf, unsigned long count, void *data) -@@ -2802,7 +2722,7 @@ static int tn7atm_proc_qos_write(struct - } - - // [KT] --int tn7atm_proc_turbodsl_write(struct file *fp, const char *buf, unsigned long count, void *data) -+static int tn7atm_proc_turbodsl_write(struct file *fp, const char *buf, unsigned long count, void *data) - { - char local_buf[10]; - -@@ -2833,5 +2753,33 @@ int tn7atm_proc_turbodsl_write(struct fi - return count; - } - -+static int tn7atm_proc_qos_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_qos_read, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_qos_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_qos_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+ .write = tn7atm_proc_qos_write, -+}; -+ -+static int tn7atm_proc_turbodsl_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7atm_proc_turbodsl_read, PDE_DATA(inode)); -+} -+ -+static struct file_operations tn7atm_proc_turbodsl_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7atm_proc_turbodsl_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+ .write = tn7atm_proc_turbodsl_write, -+}; -+ - module_init (tn7atm_detect); - module_exit (tn7atm_exit); ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -356,7 +356,7 @@ static void tn7dsl_register_dslss_led(vo - void tn7dsl_dslmod_sysctl_register(void); - void tn7dsl_dslmod_sysctl_unregister(void); - static int tn7dsl_clear_eoc_receive(void); --static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data); -+static int tn7dsl_proc_snr_print (struct seq_file *m, int data); - /* end of internal functions */ - - // UR8_MERGE_START CQ11054 Jack Zhang -@@ -684,11 +684,9 @@ void shim_osCriticalExit(void) - spin_unlock_irqrestore(&shimLock, flags); - } - --static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data) -+static int tn7dsl_proc_snr_print (struct seq_file *m, int data) - { - -- int len = 0; -- int limit = count - 80; - int i, j; - int bin = (int) data; - unsigned short *rxSnrPerBin; -@@ -709,95 +707,128 @@ static int tn7dsl_proc_snr_print (char * - break; - - default: -- if(len<=limit) -- len += sprintf (buf + len, "\nInvalid bin selected Bin%d :\n", bin); -- return len; --} -+ seq_printf (m, "\nInvalid bin selected Bin%d :\n", bin); -+ return 0; -+ } - -- if(len<=limit) -- len += sprintf (buf + len, "\nAR7 DSL Modem Rx SNR Per Bin for Bin%d :\n", bin); -+ seq_printf (m, "\nAR7 DSL Modem Rx SNR Per Bin for Bin%d :\n", bin); - - for (i=0; iAppData.max_ds_tones/16; i++) - { - for(j=0;j<16;j++) - { -- if(len <=limit) -- len += -- sprintf (buf + len, "%04x ", -+ seq_printf (m, "%04x ", - (unsigned short) rxSnrPerBin[i * 16 + j]); -- } -- if(len <=limit) -- len += sprintf(buf+len, "\n"); - } -+ seq_printf(m, "\n"); -+ } - -- return len; -+ return 0; - } - - - //@Added SNR per bin info per customer request. 05-14-2004 --int tn7dsl_proc_snr0 (char *buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_snr0 (struct seq_file *m, void *data) - { -- return tn7dsl_proc_snr_print(buf, count, eof, 0); -+ return tn7dsl_proc_snr_print(m, 0); - } - --int tn7dsl_proc_snr1 (char *buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_snr0_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_snr_print(buf, count, eof, 1); -+ return single_open(file, tn7dsl_proc_snr0, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_snr0_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_snr0_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int tn7dsl_proc_snr1 (struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_snr_print(m, 1); - } - --int tn7dsl_proc_snr2 (char *buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_snr1_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_snr_print(buf, count, eof, 2); -+ return single_open(file, tn7dsl_proc_snr1, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_snr1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_snr1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int tn7dsl_proc_snr2 (struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_snr_print(m, 2); -+} -+ -+static int tn7dsl_proc_snr2_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_snr2, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_snr2_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_snr2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - //@Added bit allocation table per customer request. 05-14-2004 --int tn7dsl_proc_bit_allocation (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7dsl_proc_bit_allocation (struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int i, j; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 DSL Modem US Bit Allocation:"); -+ seq_printf(m, "\nAR7 DSL Modem US Bit Allocation:"); - - for(i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len <=limit) -- len += -- sprintf (buf + len, "%02x ", -- (unsigned char) pIhw->AppData.BitAllocTblUstrm[i]); -+ seq_printf (m, "%02x ", -+ (unsigned char) pIhw->AppData.BitAllocTblUstrm[i]); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\n\nAR7 DSL Modem DS Bit Allocation:\n"); -+ seq_printf(m, "\n\nAR7 DSL Modem DS Bit Allocation:\n"); - - for (i=0; iAppData.max_ds_tones/16; i++) - { - for(j=0;j<16;j++) - { -- if(len <=limit) -- len += -- sprintf (buf + len, "%02x ", -- (unsigned char) pIhw->AppData.BitAllocTblDstrm[i * 16 + -- j]); -+ seq_printf (m, "%02x ", -+ (unsigned char) pIhw->AppData.BitAllocTblDstrm[i * 16 + -+ j]); - } -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- return len; -+ return 0; -+} -+ -+int tn7dsl_proc_bit_allocation_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_bit_allocation, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_bit_allocation_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_bit_allocation_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #ifndef NO_ACT - int tn7dsl_proc_ds_noise(char* buf, char **start, off_t offset, int count, - int *eof, void *data) -@@ -860,59 +891,48 @@ static char *pUnknown= "Unknown"; - #ifdef ADV_DIAG_STATS //CQ10275, CQ10449 - //UR8_MERGE_START CQ10449 Jack Zhang - --static int proc_adv_stats_header(char* buf, int limit); -+static int proc_adv_stats_header(struct seq_file *m); - --int tn7dsl_proc_adv_stats(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_adv_stats(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - //char *cp = buf + offset; - char *cp = buf; - int i = 0; - int strt = 32; -- static int ctr = 0; - - // printk("proc_adv_stats: buf=0x%X, ctr=%d, offset=%d, count=%d, eof=%d\n", - // (unsigned int)buf, ctr, offset, count, *eof); -- if( ctr == 0) -- { -- len = proc_adv_stats_header( cp, limit); -+ proc_adv_stats_header(m); - -- if( len<=limit) -- len += sprintf(cp+len, "\n\tBin No.\tBits:\tMargin:\tSNR\n"); -- } -- else -- { -- strt = ctr; -- } -+ seq_printf(m, "\n\tBin No.\tBits:\tMargin:\tSNR\n"); - - for( i =strt; i<512; i++) - { -- if(len<=limit) -- { -- len += sprintf(cp+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -- } -- else -- { -- ctr = i; -- //*eof = 0; -- *(cp + len) = '\0'; -- printk("proc_adv_stats - return: ctr=%d, len=%d\n", ctr, len); -- return len; -- } - } -- ctr = 0; -- *eof = 1; - printk("proc_adv_stats - return: ctr=%d, len=%d\n", ctr, len); -- return len; -+ return 0; -+} -+ -+ -+static int tn7dsl_proc_adv_stats_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_adv_stats, PDE_DATA(inode)); - } - --static int proc_adv_stats_header(char* buf, int limit) -+struct file_operations tn7dsl_proc_adv_stats_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int proc_adv_stats_header(struct seq_file *m) - { - int len = 0; - int i = 0; -@@ -921,66 +941,53 @@ static int proc_adv_stats_header(char* b - */ - - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 DSL Modem Advanced Statistics:\n"); -+ seq_printf(m, "\nAR7 DSL Modem Advanced Statistics:\n"); - -- if(len<=limit) -+ if(pIhw->lConnected != 1) - { -- if(pIhw->lConnected != 1) -- { -- pIhw->AppData.USConRate = 0; -- pIhw->AppData.DSConRate = 0; -- } -- len += -- sprintf (buf + len, -+ pIhw->AppData.USConRate = 0; -+ pIhw->AppData.DSConRate = 0; -+ } -+ seq_printf (m, - "\t[Connection Rate]\tUS:\t%u\tDS:\t%u\n", - (unsigned int)pIhw->AppData.USConRate, - (unsigned int)pIhw->AppData.DSConRate ); - } -- if(len<=limit) - // UR8_MERGE_START CQ11054 Jack Zhang -+ if (dslhal_api_getHighPrecision()) - { -- if (dslhal_api_getHighPrecision()) -- { -- len += -- sprintf (buf + len, "\t[Margin]\tUS:\t%d.%u\tDS:\t\t%d.%u\n", -- gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin), -- gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin)); -- } -- else -- { -- len += -- sprintf (buf + len, "\t[Margin]\tUS:\t%u\tDS:\t\t%u\n", -- (unsigned int)pIhw->AppData.usMargin, -- (unsigned int)pIhw->AppData.dsMargin/2 ); -- } -+ seq_printf (m, "\t[Margin]\tUS:\t%d.%u\tDS:\t\t%d.%u\n", -+ gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin), -+ gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin)); -+ } -+ else -+ { -+ seq_printf (m, "\t[Margin]\tUS:\t%u\tDS:\t\t%u\n", -+ (unsigned int)pIhw->AppData.usMargin, -+ (unsigned int)pIhw->AppData.dsMargin/2 ); - } - // UR8_MERGE_END CQ11054* - - /* - * Downstream/Upstream Interleaved Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\t[Interleave path] US (TX):\tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Interleave path] US (TX):\tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.usICRC_errors, - (unsigned int)pIhw->AppData.usIFEC_errors); -- if(len<=limit) -- len += sprintf(buf+len, "\t[Interleave path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Interleave path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.dsICRC_errors, - (unsigned int)pIhw->AppData.dsIFEC_errors); - /* - * Upstream/Downstream Fast Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\t[Fast path] US (TX): \tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Fast path] US (TX): \tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.usFCRC_errors, - (unsigned int)pIhw->AppData.usFFEC_errors); -- if(len<=limit) -- len += sprintf(buf+len, "\t[Fast path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", -+ seq_printf(m, "\t[Fast path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n", - (unsigned int)pIhw->AppData.dsFCRC_errors, - (unsigned int)pIhw->AppData.dsFFEC_errors); - -- return len; -+ return 0; - } - - static int getDiagDisplayMode() -@@ -1003,29 +1010,24 @@ static int getDiagDisplayMode() - ret = 2; - return ret; - } --int tn7dsl_proc_adv_stats1(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+int tn7dsl_proc_adv_stats1(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int i; - int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+ - unsigned char SNRpsds[512]; - int n; - -- len = proc_adv_stats_header( buf+len, limit); -+ proc_adv_stats_header( m); - mode = getDiagDisplayMode(); - -- if(len<=limit) -- len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 1 of 3)\n"); -+ seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 1 of 3)\n"); - - if(mode==1) //ADSL1 - { - for( i =32; i<128; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -@@ -1036,26 +1038,34 @@ int tn7dsl_proc_adv_stats1(char* buf, ch - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - for( i =32; i<128; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (iAppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0); - } - } -- return len; -+ return 0; - } - --int tn7dsl_proc_adv_stats2(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_adv_stats1_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_adv_stats1, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_adv_stats1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_adv_stats2(struct seq_file *m, void *data) -+{ - int i; - int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+ - unsigned char SNRpsds[512]; -@@ -1065,12 +1075,10 @@ int tn7dsl_proc_adv_stats2(char* buf, ch - if( mode==1) //ADSL1 - { - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 2 of 3):\n"); -+ seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 2 of 3):\n"); - for( i =128; i<320; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -@@ -1081,26 +1089,35 @@ int tn7dsl_proc_adv_stats2(char* buf, ch - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - for( i =128; i<320; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (iAppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0); - } - } -- return len; -+ return 0; - } - --int tn7dsl_proc_adv_stats3(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_adv_stats2_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_adv_stats2, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_adv_stats2_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_adv_stats3(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int i; - int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+ - unsigned char SNRpsds[512]; -@@ -1110,12 +1127,10 @@ int tn7dsl_proc_adv_stats3(char* buf, ch - if( mode==1) //ADSL1 - { - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 3 of 3):\n"); -+ seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 3 of 3):\n"); - for( i =320; i<512; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (int)pIhw->AppData.rxSnrPerBin0[i]); -@@ -1126,283 +1141,287 @@ int tn7dsl_proc_adv_stats3(char* buf, ch - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - for( i =320; i<512; i++) - { -- if(len<=limit) -- len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i, -+ seq_printf(m, "\t%u\t%u\t%u\t%d\n", i, - (unsigned int)pIhw->AppData.BitAllocTblDstrm[i], - (unsigned int)pIhw->AppData.marginTblDstrm[i], - (iAppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0); - } - } -- if(len<=limit) -- len += sprintf(buf+len, "[End of Stats]\n"); -- return len; -+ seq_printf(m, "[End of Stats]\n"); -+ return 0; - } --//UR8_MERGE_END CQ10449 --//UR8_MERGE_START CQ10682 Jack Zhang --int tn7dsl_proc_dbg_cmsgs(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+ -+static int tn7dsl_proc_adv_stats3_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_adv_stats3, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_adv_stats3_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_adv_stats3_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - -+//UR8_MERGE_END CQ10449 -+//UR8_MERGE_START CQ10682 Jack Zhang -+int tn7dsl_proc_dbg_cmsgs(struct seq_file *m, void *data) -+{ - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (C-Msgs 1-5)..\n"); -+ seq_printf(m, "Training Messages (C-Msgs 1-5)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "ADSL2 DELT C-Msg1Ld \t Message Length:%d\n", -+ seq_printf(m, "ADSL2 DELT C-Msg1Ld \t Message Length:%d\n", - pIhw->adsl2DiagnosticMessages.cMsg1LdLen); - for(rc=0;rcadsl2DiagnosticMessages.cMsg1LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg1Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg1Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg2LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg2LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg2LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg2Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg2Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg3LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg3LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg3LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg3Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg3Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg4LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg4LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg4LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg4Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg4Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT C-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg5LdLen); -+ seq_printf(m, "\nADSL2 DELT C-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg5LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.cMsg5LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg5Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg5Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -- return len; -+ seq_printf(m, "\n"); -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs1(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_cmsgs_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_cmsgs, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_dbg_cmsgs_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_cmsgs_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+int tn7dsl_proc_dbg_rmsgs1(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 1-3)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 1-3)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg1Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsg1LdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg1Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsg1LdLen); - - for(rc=0;rcadsl2DiagnosticMessages.rMsg1LdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg1Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg1Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg2Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg2Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg3Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg3Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -- return len; -+ seq_printf(m, "\n"); -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs2(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_rmsgs1_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_rmsgs1, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_dbg_rmsgs1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - -- int len = 0; -- int limit = count - 80; -+ -+int tn7dsl_proc_dbg_rmsgs2(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 4-5)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 4-5)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg4Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg4Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ len += sprintf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg5Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg5Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -- return len; -+ seq_printf(m, "\n"); -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs3(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_rmsgs2_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_rmsgs2, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations _fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_dbg_rmsgs3(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 6-7)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 6-7)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg6Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg6Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg6Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg6Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg7Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg7Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg7Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg7Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; - } - --int tn7dsl_proc_dbg_rmsgs4(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_dbg_rmsgs3_open(struct inode *inode, struct file *file) - { -+ return single_open(file, tn7dsl_proc_dbg_rmsgs3, PDE_DATA(inode)); -+} - -- int len = 0; -- int limit = count - 80; -+struct file_operations tn7dsl_proc_dbg_rmsgs3_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs3_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+int tn7dsl_proc_dbg_rmsgs4(struct seq_file *m, void *data) -+{ - - int rc=0; - - dslhal_api_gatherStatistics(pIhw); - -- if(len<=limit) -- len += sprintf(buf+len, "Training Messages (R-Msgs 8-9)..\n"); -+ seq_printf(m, "Training Messages (R-Msgs 8-9)..\n"); - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg8Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg8Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg8Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg8Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len<=limit) -- len += sprintf(buf+len, "\nADSL2 DELT R-Msg9Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); -+ seq_printf(m, "\nADSL2 DELT R-Msg9Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen); - for(rc=0;rcadsl2DiagnosticMessages.rMsgxLdLen;rc++) - { -- if(len<=limit) -- len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg9Ld[rc]); -+ seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg9Ld[rc]); - if(rc!=0 && (rc%16==0)) -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_dbg_rmsgs4_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_dbg_rmsgs4, PDE_DATA(inode)); - } -+ -+struct file_operations tn7dsl_proc_dbg_rmsgs4_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_dbg_rmsgs4_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - //UR8_MERGE_END CQ10682* - #endif //ADV_DIAG_STATS - --int tn7dsl_proc_stats(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_stats(struct seq_file *m, void *data) - { - -- int len = 0; -- int limit = count - 80; - int F4count, F5count; - unsigned int maxRate=0; - unsigned int us_maxRate=0; -@@ -1410,80 +1429,58 @@ int tn7dsl_proc_stats(char* buf, char ** - //UR8_MERGE_START CQ10700 Manjula K - struct atm_dev *dev; - Tn7AtmPrivate *priv; -- dev = (struct atm_dev *)data; -+ int offset[2] = { 32, 0 }; -+ unsigned int usBitswap, dsBitswap; -+ dev = (struct atm_dev *)m->private; - priv = (Tn7AtmPrivate *)dev->dev_data; - //UR8_MERGE_END CQ10700 - -+ - /* - * Read Ax5 Stats - */ - - dslhal_api_gatherStatistics(pIhw); -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 DSL Modem Statistics:\n"); -- if(len<=limit) -- len += sprintf(buf+len, "--------------------------------\n"); -+ seq_printf(m, "\nAR7 DSL Modem Statistics:\n"); -+ seq_printf(m, "--------------------------------\n"); - /* - * us and ds Connection Rates - */ -- if(len<=limit) -- len += sprintf(buf+len, "[DSL Modem Stats]\n"); -+ seq_printf(m, "[DSL Modem Stats]\n"); - - -- if(len<=limit) -+ if(pIhw->lConnected != 1) - { -- if(pIhw->lConnected != 1) -- { -- pIhw->AppData.USConRate = 0; -- pIhw->AppData.DSConRate = 0; -- } -- len += -- sprintf (buf + len, -- "\tUS Connection Rate:\t%u\tDS Connection Rate:\t%u\n", -- (unsigned int)pIhw->AppData.USConRate, -- (unsigned int)pIhw->AppData.DSConRate ); -+ pIhw->AppData.USConRate = 0; -+ pIhw->AppData.DSConRate = 0; - } -- if(len<=limit) -+ seq_printf (m, -+ "\tUS Connection Rate:\t%u\tDS Connection Rate:\t%u\n", -+ (unsigned int)pIhw->AppData.USConRate, -+ (unsigned int)pIhw->AppData.DSConRate ); - // UR8_MERGE_START CQ11054 Jack Zhang -- { -- if (dslhal_api_getHighPrecision()) -- { -- len += -- sprintf (buf + len, "\tDS Line Attenuation:\t%u.%u\tDS Margin:\t\t%d.%u\n", -+ if (dslhal_api_getHighPrecision()) -+ seq_printf (m, "\tDS Line Attenuation:\t%u.%u\tDS Margin:\t\t%d.%u\n", - gInt(pIhw->AppData.dsLineAttn), gDot1(pIhw->AppData.dsLineAttn), - gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin)); -- } -- else{ -- len += -- sprintf (buf + len, "\tDS Line Attenuation:\t%u\tDS Margin:\t\t%u\n", -+ else -+ seq_printf (m, "\tDS Line Attenuation:\t%u\tDS Margin:\t\t%u\n", - (unsigned int)pIhw->AppData.dsLineAttn/2, - (unsigned int)pIhw->AppData.dsMargin/2 ); -- } -- } - // UR8_MERGE_END CQ11054* - -- if(len<=limit) - // UR8_MERGE_START CQ11054 Jack Zhang -- { -- if (dslhal_api_getHighPrecision()) -- { -- len += -- sprintf (buf + len, "\tUS Line Attenuation:\t%u.%u\tUS Margin:\t\t%d.%u\n", -+ if (dslhal_api_getHighPrecision()) -+ seq_printf (m, "\tUS Line Attenuation:\t%u.%u\tUS Margin:\t\t%d.%u\n", - gInt(pIhw->AppData.usLineAttn), gDot1(pIhw->AppData.usLineAttn), - gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin)); -- } -- else -- { -- len += -- sprintf (buf + len, "\tUS Line Attenuation:\t%u\tUS Margin:\t\t%u\n", -+ else -+ seq_printf (m, "\tUS Line Attenuation:\t%u\tUS Margin:\t\t%u\n", - (unsigned int)pIhw->AppData.usLineAttn/2, - (unsigned int)pIhw->AppData.usMargin ); -- } -- } - // UR8_MERGE_END CQ11054* - -- if(len<=limit) -- len += sprintf(buf+len, "\tUS Payload :\t\t%u\tDS Payload:\t\t%u\n", -+ seq_printf(m, "\tUS Payload :\t\t%u\tDS Payload:\t\t%u\n", - ((unsigned int) pIhw->AppData.usAtm_count[0] + - (unsigned int) pIhw->AppData.usAtm_count[1]) * 48, - ((unsigned int) pIhw->AppData.dsGood_count[0] + -@@ -1491,9 +1488,7 @@ int tn7dsl_proc_stats(char* buf, char ** - /* - * Superframe Count - */ -- if(len<=limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tUS Superframe Cnt :\t%u\tDS Superframe Cnt:\t%u\n", - (unsigned int)pIhw->AppData.usSuperFrmCnt, - (unsigned int)pIhw->AppData.dsSuperFrmCnt ); -@@ -1501,59 +1496,45 @@ int tn7dsl_proc_stats(char* buf, char ** - /* - * US and DS power - */ -- if(len<=limit) -+ if(pIhw->AppData.bState < 5) - { -- if(pIhw->AppData.bState < 5) -- { -- pIhw->AppData.usTxPower = 0; -- pIhw->AppData.dsTxPower = 0; -- } -- len += -- sprintf (buf + len, -+ pIhw->AppData.usTxPower = 0; -+ pIhw->AppData.dsTxPower = 0; -+ } -+ seq_printf (m, - // UR8_MERGE_START - CQ11579 - Jeremy #1 - "\tUS Transmit Power :\t%d\tDS Transmit Power:\t%d\n", - pIhw->AppData.usTxPower/256, - pIhw->AppData.dsTxPower/256 ); - // UR8_MERGE_END - CQ11579 -- } - /* - * DSL Stats Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\tLOS errors:\t\t%u\tSEF errors:\t\t%u\n", -+ seq_printf(m, "\tLOS errors:\t\t%u\tSEF errors:\t\t%u\n", - (unsigned int)pIhw->AppData.LOS_errors, - (unsigned int)pIhw->AppData.SEF_errors ); - - //UR8_MERGE_START Report_SES Manjula K - //CQ10369 -- if(len<=limit) -- len += sprintf(buf+len, "\tErrored Seconds:\t%u\tSeverely Err Secs:\t%u\n", -+ seq_printf(m, "\tErrored Seconds:\t%u\tSeverely Err Secs:\t%u\n", - (unsigned int)pIhw->AppData.erroredSeconds, - (unsigned int)pIhw->AppData.severelyerrsecs ); - //UR8_MERGE_END Report_SES - -- if(len<=limit) -- len += sprintf(buf+len, "\tFrame mode:\t\t%u\tMax Frame mode:\t\t%u\n", -+ seq_printf(m, "\tFrame mode:\t\t%u\tMax Frame mode:\t\t%u\n", - (unsigned int)pIhw->AppData.FrmMode, - (unsigned int)pIhw->AppData.MaxFrmMode ); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTrained Path:\t\t%u\tUS Peak Cell Rate:\t%u\n", -+ seq_printf (m, "\tTrained Path:\t\t%u\tUS Peak Cell Rate:\t%u\n", - (unsigned int)pIhw->AppData.TrainedPath, - (unsigned int)pIhw->AppData.USConRate*1000/8/53 ); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTrained Mode:\t\t%u\tSelected Mode:\t\t%u\n", -+ seq_printf (m, "\tTrained Mode:\t\t%u\tSelected Mode:\t\t%u\n", - (unsigned int) pIhw->AppData.TrainedMode, - (unsigned int) pIhw->AppData.StdMode); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tATUC Vendor Code:\t%X\tATUC Revision:\t%u\n", -+ seq_printf (m, "\tATUC Vendor Code:\t%X\tATUC Revision:\t%u\n", - (unsigned int) pIhw->AppData.atucVendorId, - pIhw->AppData.atucRevisionNum); -- if(len<=limit) -- len += sprintf(buf+len, "\tHybrid Selected:\t%u\tTrellis:\t\t%u\n", -+ seq_printf(m, "\tHybrid Selected:\t%u\tTrellis:\t\t%u\n", - (unsigned int)pIhw->AppData.currentHybridNum, trellis); - - //@Added Maximum attainable bit rate information. 05-14-2004 -@@ -1567,12 +1548,12 @@ int tn7dsl_proc_stats(char* buf, char ** - } - else - { -- int offset[2] = {5, 1}; -+ int dspOffset[2] = { 5, 1 }; - unsigned char rMsgsRA[12]; - int numPayloadBytes = 0; - - dslhal_api_dspInterfaceRead (pIhw, (unsigned int) pIhw->pmainAddr, 2, -- (unsigned int *) &offset, -+ (unsigned int *) &dspOffset, - (unsigned char *) &rMsgsRA[0], 12); - - maxRate = (unsigned int)pIhw->AppData.DSConRate; -@@ -1588,294 +1569,223 @@ int tn7dsl_proc_stats(char* buf, char ** - } - } - -- if(len<=limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tShowtime Count:\t\t%u\tDS Max Attainable Bit Rate: %u kbps\n", - (unsigned int)pIhw->AppData.showtimeCount, maxRate); - -- if(len<=limit) -- { -- int offset[2] = {32, 0}; -- unsigned int usBitswap, dsBitswap; -- -- tn7dsl_generic_read(2, (unsigned int *)&offset); -- dsBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); -+ tn7dsl_generic_read(2, (unsigned int *)&offset); -+ dsBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); - -- offset[0] = 33; -- tn7dsl_generic_read(2, (unsigned int *)&offset); -- usBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); -+ offset[0] = 33; -+ tn7dsl_generic_read(2, (unsigned int *)&offset); -+ usBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff); - - // UR8_MERGE_START - CQ11579 - Jeremy -- if((pIhw->AppData.dsl_modulation > 5) && (pIhw->AppData.dsl_modulation != 128)) -+ if((pIhw->AppData.dsl_modulation > 5) && (pIhw->AppData.dsl_modulation != 128)) - // UR8_MERGE_END - CQ11579 - Jeremy -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tBitSwap:\t\t%u\tUS Max Attainable Bit Rate: %u bps\n", - (unsigned int)(usBitswap && dsBitswap), us_maxRate); -- else -- len += -- sprintf (buf + len, -+ else -+ seq_printf (m, - "\tBitSwap:\t\t%u\tUS Max Attainable Bit Rate:\tn/a\n", - (unsigned int)(usBitswap && dsBitswap)); -- } - - #if 1 // TR69 -- if(len<=limit) -- len += -- sprintf (buf + len, "\tAnnex: \t\t\t%s\tpsd_mask_qualifier: 0x%04x\n", -+ seq_printf (m, "\tAnnex: \t\t\t%s\tpsd_mask_qualifier: 0x%04x\n", - tn7dsl_AnnexFromNum(pIhw->AppData.annex_selected), - pIhw->AppData.psd_mask_qualifier); - - // UR8_MERGE_START CQ10979 Jack Zhang - // UR8_MERGE_START CQ10978 Jack Zhang -- if(len<=limit) -- len += -- sprintf (buf + len, "\tPower Management Status: L%d\tDS HLINSC: %d\n", -+ seq_printf (m, "\tPower Management Status: L%d\tDS HLINSC: %d\n", - pIhw->AppData.pwrStatus, pIhw->AppData.dsHLINSC); - // UR8_MERGE_END CQ10978* - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tUS ACTPSD: \t\t%d\tDS ACTPSD: %d\n", -+ seq_printf (m, "\tUS ACTPSD: \t\t%d\tDS ACTPSD: %d\n", - pIhw->AppData.usACTPSD, pIhw->AppData.dsACTPSD); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTotal init. errors: \t%d\tTotal init. timeouts: %d\n", -+ seq_printf (m, "\tTotal init. errors: \t%d\tTotal init. timeouts: %d\n", - pIhw->AppData.totalInitErrs, pIhw->AppData.totalInitTOs); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tShowtime init. errors: \t%d\tShowtime init. timeouts: %d\n", -+ seq_printf (m, "\tShowtime init. errors: \t%d\tShowtime init. timeouts: %d\n", - pIhw->AppData.showtimeInitErrs, pIhw->AppData.showtimeInitTOs); - -- if(len<=limit) -- len += -- sprintf (buf + len, "\tLast showtime init. errors: %d\tLast showtime init. timeouts: %d\n", -+ seq_printf (m, "\tLast showtime init. errors: %d\tLast showtime init. timeouts: %d\n", - pIhw->AppData.lastshowInitErrs, pIhw->AppData.lastshowInitTOs); - // UR8_MERGE_END CQ10979* - -- if (len<=limit) -- { -- len += sprintf(buf+len,"\tATUC ghsVid: "); -- for (i=0; i<8; i++) -- len+= sprintf(buf+len, " %02x", pIhw->AppData.ghsATUCVendorId[i]); -- } -+ seq_printf(m,"\tATUC ghsVid: "); -+ for (i=0; i<8; i++) -+ seq_printf(m, " %02x", pIhw->AppData.ghsATUCVendorId[i]); - -- if (len<=limit) -- { -- len += sprintf (buf + len, "\n"); -- } -+ seq_printf (m, "\n"); - -- if (len <= limit) -- { -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tT1413Vid: %02x %02x\t\tT1413Rev: %02x\t\tVendorRev: %02x\n", - pIhw->AppData.t1413ATUC.VendorId[0], - pIhw->AppData.t1413ATUC.VendorId[1], - pIhw->AppData.t1413ATUC.t1413Revision, - pIhw->AppData.t1413ATUC.VendorRevision); -- } - -- if (len<=limit) -- { -- len += sprintf(buf+len,"\tATUR ghsVid: "); -- for (i=0; i<8; i++) -- len+= sprintf(buf+len, " %02x", pIhw->AppData.ghsATURVendorId[i]); -- } -+ seq_printf(m,"\tATUR ghsVid: "); -+ for (i=0; i<8; i++) -+ seq_printf(m, " %02x", pIhw->AppData.ghsATURVendorId[i]); - -- if (len<=limit) -- { -- len += sprintf (buf + len, "\n"); -- } -+ seq_printf (m, "\n"); - -- if (len <= limit) -- { -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tT1413Vid: %02x %02x\tT1413Rev: %02x\tVendorRev: %02x\n", - pIhw->AppData.t1413ATUR.VendorId[0], - pIhw->AppData.t1413ATUR.VendorId[1], - pIhw->AppData.t1413ATUR.t1413Revision, - pIhw->AppData.t1413ATUR.VendorRevision); -- } - - #ifdef AR7_EFM -- if (len <= limit) -- { -- len += sprintf(buf + len, "\tTC Mode: %s\n", -+ seq_printf(m, "\tTC Mode: %s\n", - (priv->curr_TC_mode == TC_MODE_PTM) ? "PTM" : "ATM"); -- } - #endif - - #endif - /* - * Upstream Interleaved Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Upstream (TX) Interleave path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Upstream (TX) Interleave path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.usICRC_errors, - (unsigned int)pIhw->AppData.usIFEC_errors, - (unsigned int)pIhw->AppData.usINCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", - (unsigned int)pIhw->AppData.usILCD_errors, - (unsigned int)pIhw->AppData.usIHEC_errors); - /* - * Downstream Interleaved Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Downstream (RX) Interleave path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Downstream (RX) Interleave path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.dsICRC_errors, - (unsigned int)pIhw->AppData.dsIFEC_errors, - (unsigned int)pIhw->AppData.dsINCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", - (unsigned int)pIhw->AppData.dsILCD_errors, - (unsigned int)pIhw->AppData.dsIHEC_errors); - /* - * Upstream Fast Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Upstream (TX) Fast path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Upstream (TX) Fast path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.usFCRC_errors, - (unsigned int)pIhw->AppData.usFFEC_errors, - (unsigned int)pIhw->AppData.usFNCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", - (unsigned int)pIhw->AppData.usFLCD_errors, - (unsigned int)pIhw->AppData.usFHEC_errors); - /* - * Downstream Fast Errors - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Downstream (RX) Fast path]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", -+ seq_printf(m, "\n\t[Downstream (RX) Fast path]\n"); -+ seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n", - (unsigned int)pIhw->AppData.dsFCRC_errors, - (unsigned int)pIhw->AppData.dsFFEC_errors, - (unsigned int)pIhw->AppData.dsFNCD_error); -- if(len<=limit) -- len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n", -- (unsigned int)pIhw->AppData.dsFLCD_errors, -- (unsigned int)pIhw->AppData.dsFHEC_errors); -+ seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n", -+ (unsigned int)pIhw->AppData.dsFLCD_errors, -+ (unsigned int)pIhw->AppData.dsFHEC_errors); - - /* - * ATM stats upstream - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n[ATM Stats]"); -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Upstream/TX]\n"); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\n", -- (unsigned int) pIhw->AppData.usAtm_count[0] + -- (unsigned int) pIhw->AppData.usAtm_count[1], -- (unsigned int) pIhw->AppData.usIdle_count[0] + -- (unsigned int) pIhw->AppData.usIdle_count[1]); -+ seq_printf(m, "\n[ATM Stats]"); -+ seq_printf(m, "\n\t[Upstream/TX]\n"); -+ seq_printf (m, "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\n", -+ (unsigned int) pIhw->AppData.usAtm_count[0] + -+ (unsigned int) pIhw->AppData.usAtm_count[1], -+ (unsigned int) pIhw->AppData.usIdle_count[0] + -+ (unsigned int) pIhw->AppData.usIdle_count[1]); - //UR8_MERGE_START CQ10700 Manjula K -- if (len <= limit) -- len += -- sprintf (buf + len, -+ seq_printf (m, - "\tTx Packets Dropped Count:\t%lu\n\tTx Bad Packets Count:\t%lu\n", - priv->stats.tx_dropped, priv->stats.tx_errors); - //UR8_MERGE_END CQ10700 - /* - * ATM stats downstream - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n\t[Downstream/RX)]\n"); -- if(len<=limit) -- len += -- sprintf (buf + len, -- "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\tBad Hec Cell Cnt:\t%u\n", -- (unsigned int) pIhw->AppData.dsGood_count[0] + -- (unsigned int) pIhw->AppData.dsGood_count[1], -- (unsigned int) pIhw->AppData.dsIdle_count[0] + -- (unsigned int) pIhw->AppData.dsIdle_count[1], -- (unsigned int) pIhw->AppData.dsBadHec_count[0] + -- (unsigned int) pIhw->AppData.dsBadHec_count[1]); -- if(len<=limit) -- len += sprintf(buf+len, "\tOverflow Dropped Cell Cnt:\t%u\n", -- (unsigned int) pIhw->AppData.dsOVFDrop_count[0] + -- (unsigned int) pIhw->AppData.dsOVFDrop_count[1]); -+ seq_printf(m, "\n\t[Downstream/RX)]\n"); -+ seq_printf (m, -+ "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\tBad Hec Cell Cnt:\t%u\n", -+ (unsigned int) pIhw->AppData.dsGood_count[0] + -+ (unsigned int) pIhw->AppData.dsGood_count[1], -+ (unsigned int) pIhw->AppData.dsIdle_count[0] + -+ (unsigned int) pIhw->AppData.dsIdle_count[1], -+ (unsigned int) pIhw->AppData.dsBadHec_count[0] + -+ (unsigned int) pIhw->AppData.dsBadHec_count[1]); -+ seq_printf(m, "\tOverflow Dropped Cell Cnt:\t%u\n", -+ (unsigned int) pIhw->AppData.dsOVFDrop_count[0] + -+ (unsigned int) pIhw->AppData.dsOVFDrop_count[1]); - - //UR8_MERGE_START CQ10700 Manjula K -- if (len <= limit) -- len += -- sprintf (buf + len, -- "\tRx Packets Dropped Count:\t%lu\n\tRx Bad Packets Count:\t%lu\n\n", -- priv->stats.rx_dropped, priv->stats.rx_errors); -+ seq_printf (m, -+ "\tRx Packets Dropped Count:\t%lu\n\tRx Bad Packets Count:\t%lu\n\n", -+ priv->stats.rx_dropped, priv->stats.rx_errors); - //UR8_MERGE_END CQ10700 - - tn7sar_get_stats(pIhw->pOsContext); -- if(len<=limit) -- len += sprintf(buf+len, "\n[SAR AAL5 Stats]\n"); -- if(len<=limit) -- len += sprintf(buf+len, "\tTx PDU's:\t%u\n\tRx PDU's:\t%u\n", -- sarStat.txPktCnt, sarStat.rxPktCnt); -- if(len<=limit) -- len += -- sprintf (buf + len, "\tTx Total Bytes:\t%u\n\tRx Total Bytes:\t%u\n", -- sarStat.txBytes, sarStat.rxBytes); -- if (len <= limit) -- len += -- sprintf (buf + len, -- "\tTx Total Error Counts:\t%u\n\tRx Total Error Counts:\t%u\n\n", -- sarStat.txErrors, sarStat.rxErrors); -+ seq_printf(m, "\n[SAR AAL5 Stats]\n"); -+ seq_printf(m, "\tTx PDU's:\t%u\n\tRx PDU's:\t%u\n", -+ sarStat.txPktCnt, sarStat.rxPktCnt); -+ seq_printf (m, "\tTx Total Bytes:\t%u\n\tRx Total Bytes:\t%u\n", -+ sarStat.txBytes, sarStat.rxBytes); -+ seq_printf (m, -+ "\tTx Total Error Counts:\t%u\n\tRx Total Error Counts:\t%u\n\n", -+ sarStat.txErrors, sarStat.rxErrors); - - /* - * oam loopback info - */ -- if(len<=limit) -- len += sprintf(buf+len, "\n[OAM Stats]\n"); -+ seq_printf(m, "\n[OAM Stats]\n"); - - tn7sar_get_near_end_loopback_count(&F4count, &F5count); - -- if(len<=limit) -- { -- len += -- sprintf (buf + len, -- "\tNear End F5 Loop Back Count:\t%u\n\tNear End F4 Loop Back Count:\t%u\n\tFar End F5 Loop Back Count:\t%u\n\tFar End F4 Loop Back Count:\t%u\n", -+ seq_printf (m, -+ "\tNear End F5 Loop Back Count:\t%u\n\tNear End F4 Loop Back Count:\t%u\n\tFar End F5 Loop Back Count:\t%u\n\tFar End F4 Loop Back Count:\t%u\n", - F5count, F4count, oamFarLBCount[0] + oamFarLBCount[2], - oamFarLBCount[1] + oamFarLBCount[3]); -- } - - #define USE_OAM_DROP_COUNT //CQ10273 - //Read OAM ping responses count: - #ifdef USE_OAM_DROP_COUNT -- if(len<=limit) -- { -- /* len += -- sprintf (buf + len, -- "\tSAR OAM Retry in 0x%X cycles, Drop Count=%d\n", -- tn7dsl_get_memory(0xa30085cc), tn7dsl_get_memory(0xa30085c4)); */ -+/* seq_printf (m, -+ "\tSAR OAM Retry in 0x%X cycles, Drop Count=%d\n", -+ tn7dsl_get_memory(0xa30085cc), tn7dsl_get_memory(0xa30085c4)); */ - -- len += sprintf (buf + len, "\tSAR OAM Ping Response Drop Count=%d\n", -- tn7dsl_get_memory(0xa30085b0)); -- } -+ seq_printf (m, "\tSAR OAM Ping Response Drop Count=%d\n", -+ tn7dsl_get_memory(0xa30085b0)); - #endif // USE_OAM_DROP_COUNT - -- return len; -+ return 0; - } - --int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count, -- int *eof, void *data) -+static int tn7dsl_proc_stats_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_stats, PDE_DATA(inode)); -+} -+ -+int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data); -+ -+struct file_operations tn7dsl_proc_stats_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_stats_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+ .write = tn7dsl_proc_write_stats, -+}; -+ -+static int tn7dsl_proc_modem(struct seq_file *m, void *data) - { - #ifdef AR7_EFM - extern int tn7efm_get_currTCmode(void); - #endif -- int len = 0; -- int limit = count - 80; - char *state; - int tag; - -@@ -1909,22 +1819,31 @@ extern int tn7efm_get_currTCmode(void); - - if(pIhw->lConnected == 1) - state = "SHOWTIME"; -- if(len<=limit) -- len += sprintf(buf+len,"%s\n",state); -- if(len<=limit) -- len += sprintf(buf+len, "%d\n", dslReg); -- if(len<=limit) -- len += sprintf(buf+len, "failTrains=%d\n", pIhw->AppData.trainFails); -+ seq_printf(m,"%s\n",state); -+ seq_printf(m, "%d\n", dslReg); -+ seq_printf(m, "failTrains=%d\n", pIhw->AppData.trainFails); - - #ifdef AR7_EFM -- if (len<=limit) -- len += sprintf(buf+len, "TCMODE=%s\n", -- tn7efm_get_currTCmode()== TC_MODE_PTM ? "EFM" : "ATM"); -+ seq_printf(m, "TCMODE=%s\n", -+ tn7efm_get_currTCmode()== TC_MODE_PTM ? "EFM" : "ATM"); - #endif - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_modem_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_modem, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_modem_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_modem_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - /********************************************************************** - ** * - ** tn7dsl_hdlc_update_crc() -- Calculate CRC * -@@ -2189,11 +2108,8 @@ static int tn7dsl_hdlc_rx_process(unsign - return(ret); - } - --int tn7dsl_proc_eoc (char *buf, char **start, off_t OffSet, int count, -- int *eof, void *data) -+static int tn7dsl_proc_eoc (struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - int offset[2] = {34, 0}; // point to buffer parameter data structure - clearEocParm_t peoc; - -@@ -2202,62 +2118,49 @@ int tn7dsl_proc_eoc (char *buf, char **s - (unsigned char *) &peoc, - sizeof (clearEocParm_t)); - -- if (len <= limit) -- len += sprintf(buf+len, "\nClear EOC Channel:\n\n"); -- if (len <= limit) -- len += sprintf(buf+len, " Enabled:\t%d\n", dslhal_support_byteSwap32(peoc.clearEocEnabled)); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[0])); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[1])); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[2])); -- if (len <= limit) -- len += sprintf(buf+len, " TxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[3])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[0])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[1])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[2])); -- if (len <= limit) -- len += sprintf(buf+len, " RxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[3])); -- if (len <= limit) -- len += sprintf(buf+len, " txRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txRdIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " txWrIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txWrIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " rxRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.rxRdIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " rxWrIndex:\t%d\n\n", dslhal_support_byteSwap32(peoc.rxWrIndex)); -- if (len <= limit) -- len += sprintf(buf+len, " TotalTxPkts:\t%d\n", EocTxTotalPackets); -- if (len <= limit) -- len += sprintf(buf+len, " TotalRxPkts:\t%d\n", EocRxTotalPackets); -- if (len <= limit) -- len += sprintf(buf+len, " TotalTxBytes:\t%d\n", EocTxTotalBytes); -- if (len <= limit) -- len += sprintf(buf+len, " TotalRxBytes:\t%d\n\n", EocRxTotalBytes); -- if (len <= limit) -- len += sprintf(buf+len, " ErrBufFull:\t%d\n", ErrEocBufFull); -- if (len <= limit) -- len += sprintf(buf+len, " ErrBufIndx:\t%d\n", ErrEocBufIndex); -- if (len <= limit) -- len += sprintf(buf+len, " ErrBufMax:\t%d\n", ErrEocBufMax); -- if (len <= limit) -- len += sprintf(buf+len, " ErrMsgMax:\t%d\n", ErrEocMsgOversized); -- if (len <= limit) -- len += sprintf(buf+len, " ErrTxHDLC:\t%d\n", ErrEocTxHdlcCRC); -- if (len <= limit) -- len += sprintf(buf+len, " ErrRxHDLC:\t%d\n", ErrEocRxHdlcCRC); -- if (len <= limit) -- len += sprintf(buf+len, " ErrRxSnmp:\t%d\n", ErrEocRxHdlcFraming); -- if (len <= limit) -- len += sprintf(buf+len, " ErrRxPush:\t%d\n\n", ErrEocRxPush); -+ seq_printf(m, "\nClear EOC Channel:\n\n"); -+ seq_printf(m, " Enabled:\t%d\n", dslhal_support_byteSwap32(peoc.clearEocEnabled)); -+ seq_printf(m, " TxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[0])); -+ seq_printf(m, " TxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[1])); -+ seq_printf(m, " TxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[2])); -+ seq_printf(m, " TxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[3])); -+ seq_printf(m, " RxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[0])); -+ seq_printf(m, " RxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[1])); -+ seq_printf(m, " RxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[2])); -+ seq_printf(m, " RxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[3])); -+ seq_printf(m, " txRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txRdIndex)); -+ seq_printf(m, " txWrIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txWrIndex)); -+ seq_printf(m, " rxRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.rxRdIndex)); -+ seq_printf(m, " rxWrIndex:\t%d\n\n", dslhal_support_byteSwap32(peoc.rxWrIndex)); -+ seq_printf(m, " TotalTxPkts:\t%d\n", EocTxTotalPackets); -+ seq_printf(m, " TotalRxPkts:\t%d\n", EocRxTotalPackets); -+ seq_printf(m, " TotalTxBytes:\t%d\n", EocTxTotalBytes); -+ seq_printf(m, " TotalRxBytes:\t%d\n\n", EocRxTotalBytes); -+ seq_printf(m, " ErrBufFull:\t%d\n", ErrEocBufFull); -+ seq_printf(m, " ErrBufIndx:\t%d\n", ErrEocBufIndex); -+ seq_printf(m, " ErrBufMax:\t%d\n", ErrEocBufMax); -+ seq_printf(m, " ErrMsgMax:\t%d\n", ErrEocMsgOversized); -+ seq_printf(m, " ErrTxHDLC:\t%d\n", ErrEocTxHdlcCRC); -+ seq_printf(m, " ErrRxHDLC:\t%d\n", ErrEocRxHdlcCRC); -+ seq_printf(m, " ErrRxSnmp:\t%d\n", ErrEocRxHdlcFraming); -+ seq_printf(m, " ErrRxPush:\t%d\n\n", ErrEocRxPush); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_eoc_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_eoc, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_eoc_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_eoc_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - int tn7dsl_clear_eoc_setup(void) - { - int i; -@@ -4591,14 +4494,10 @@ int tn7dsl_proc_write_stats (struct file - } - - --int tn7dsl_proc_train_mode_export (char *buf, char **start, off_t offset, -- int count, int *eof, void *data) -+static int tn7dsl_proc_train_mode_export (struct seq_file *m, void *data) - { - -- int len = 0; -- char *cp = buf + offset; - int i = 0; -- static int ctr = 0; - - typedef struct - { -@@ -4679,197 +4578,185 @@ int tn7dsl_proc_train_mode_export (char - } - - -- if(len <= count) -- { -- for (i = ctr; ((i < num_entries)&& (len <= count)) ; i++) -- { -- /* -- * Write the current string only if we can fit it into the buffer -- */ -- if((strlen(dsl_modes[i].mode_name) + 6 + len) <= count) -- { -- len += snprintf(cp+len, (count - len), "%s\t\t\t%#x\n", -- dsl_modes[i].mode_name, dsl_modes[i].mode_value); -- } -- else -- break; -- } -- } -- -- /* -- * Data was completely written -- */ -- if (i >= num_entries) -+ for (i = 0; (i < num_entries) ; i++) - { -- /* -- * We are done with this -- */ -- *eof = 1; -- ctr = 0; -+ seq_printf(m, "%s\t\t\t%#x\n", -+ dsl_modes[i].mode_name, dsl_modes[i].mode_value); - } -- else -- { -- /* -- * We have not been able to write the complete data, and we have to nul -- * terminate the buffer. -- */ -- *(cp + len) = '\0'; - -- /* -- * Save the value of the counter for the next read for the rest of the -- * data. -- */ -- ctr = i; -- } -- -- return len; -+ return 0; - } - --#ifndef NO_ADV_STATS --int tn7dsl_proc_SNRpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_train_mode_export_open(struct inode *inode, struct file *file) - { -- int len = 0; -- -+ return single_open(file, tn7dsl_proc_train_mode_export, PDE_DATA(inode)); -+} - -+struct file_operations tn7dsl_proc_train_mode_export_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_train_mode_export_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - -- int limit = count - 80; -+#ifndef NO_ADV_STATS -+int tn7dsl_proc_SNRpsds(struct seq_file *m, void *data) -+{ - int i; - unsigned char SNRpsds[512]; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 SNRpsds:"); -+ seq_printf(m, "\nAR7 SNRpsds:"); - - if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1)) - { - dgprintf(4, "dslhal_api_getSNRpsds failed!\n"); -- return len; -+ return -EIO; - } - - for (i=0; iAppData.max_ds_tones; i++) - { - if (!(i%16)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len <=limit) -- len += sprintf(buf+len, "%d ", (unsigned char)SNRpsds[i]); -+ seq_printf(m, "%d ", (unsigned char)SNRpsds[i]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - - - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_SNRpsds_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_SNRpsds, PDE_DATA(inode)); - } - -+struct file_operations tn7dsl_proc_SNRpsds_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_SNRpsds_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif - - #ifndef NO_ADV_STATS --int tn7dsl_proc_QLNpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_QLNpsds(struct seq_file *m, void *data) - { -- int len = 0; -- -- int limit = count - 80; - unsigned char QLNpsds[512]; - int i; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 QLNpsds:"); -+ seq_printf(m, "\nAR7 QLNpsds:"); - - // call API instead of access internal buf directly - if (dslhal_api_getQLNpsds(pIhw, QLNpsds, 0)) - { - dgprintf(4, "dslhal_api_getQLNpsds failed!\n"); -- return len; -+ return -EIO; - } - - for (i=0; iAppData.max_ds_tones; i++) - { - if (!(i%16)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len <=limit) -- len += sprintf(buf+len, "%d ", (unsigned char)QLNpsds[i]); -+ seq_printf(m, "%d ", (unsigned char)QLNpsds[i]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - - -- return len; -+ return 0; - } -+ -+static int tn7dsl_proc_QLNpsds_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_QLNpsds, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7dsl_proc_QLNpsds_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_QLNpsds_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif - - // UR8_MERGE_START CQ10979 Jack Zhang - #ifdef TR69_HLIN_IN - #ifndef NO_ADV_STATS --int tn7dsl_proc_HLINpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds(struct seq_file *m, void *data) - { -- int len = 0; -- -- int limit = count - 80; - short HLINpsds[2*512]; - int i; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 HLINpsds:"); -+ seq_printf(m, "\nAR7 HLINpsds:"); - - // call API instead of access internal buf directly - if (dslhal_api_getHLINpsds(pIhw, (unsigned char *)HLINpsds, 1)) - { - dgprintf(4, "dslhal_api_getHLINpsds failed!\n"); -- return len; -+ return -EIO; - } - - for (i=0; iAppData.max_ds_tones; i++) - { - if (!(i%8)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - -- if(len <=limit) -- len += sprintf(buf+len, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); -+ seq_printf(m, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - - -- return len; -+ return 0; - } - --static int tn7dsl_proc_HLINpsdsIndx(char* buf, char **start, off_t offset, int count,int *eof, void *data, int indx) -+static int tn7dsl_proc_HLINpsds_open(struct inode *inode, struct file *file) - { -- int len = 0; -+ return single_open(file, tn7dsl_proc_HLINpsds, PDE_DATA(inode)); -+} - -- int limit = count - 80; -+struct file_operations tn7dsl_proc_HLINpsds_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static int tn7dsl_proc_HLINpsdsIndx(struct seq_file *m, void *data, int indx) -+{ - short HLINpsds[2*512]; - int i; - int start=0, dim=128; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 HLINpsds: (section %d)", indx); -+ seq_printf(m, "\nAR7 HLINpsds: (section %d)", indx); - - if((indx > 2) && (pIhw->AppData.max_ds_tones <= 256)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n[End of data]"); -- return len; -+ seq_printf(m, "\n[End of data]"); -+ return 0; - } - - // call API instead of access internal buf directly - if (dslhal_api_getHLINpsds(pIhw, (unsigned char *)HLINpsds, 1)) - { - dgprintf(4, "dslhal_api_getHLINpsds failed!\n"); -- return len; -+ return -1; - } - - start = (indx -1) * 128; -@@ -4878,39 +4765,89 @@ static int tn7dsl_proc_HLINpsdsIndx(char - { - if (!(i%8)) - { -- if(len <=limit) -- len += sprintf(buf+len, "\n%d: ", i); -+ seq_printf(m, "\n%d: ", i); - } - -- if(len <=limit) -- len += sprintf(buf+len, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); -+ seq_printf(m, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_HLINpsds1(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 1); -+} -+ -+static int tn7dsl_proc_HLINpsds2(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 2); -+} -+ -+static int tn7dsl_proc_HLINpsds3(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 3); -+} -+ -+static int tn7dsl_proc_HLINpsds4(struct seq_file *m, void *data) -+{ -+ return tn7dsl_proc_HLINpsdsIndx(m, data, 4); - } - --int tn7dsl_proc_HLINpsds1(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds1_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 1); -+ return single_open(file, tn7dsl_proc_HLINpsds1, PDE_DATA(inode)); - } - --int tn7dsl_proc_HLINpsds2(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds2_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 2); -+ return single_open(file, tn7dsl_proc_HLINpsds2, PDE_DATA(inode)); - } - --int tn7dsl_proc_HLINpsds3(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds3_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 3); -+ return single_open(file, tn7dsl_proc_HLINpsds3, PDE_DATA(inode)); - } - --int tn7dsl_proc_HLINpsds4(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_HLINpsds4_open(struct inode *inode, struct file *file) - { -- return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 4); -+ return single_open(file, tn7dsl_proc_HLINpsds4, PDE_DATA(inode)); - } -+ -+struct file_operations tn7dsl_proc_HLINpsds1_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds1_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+struct file_operations tn7dsl_proc_HLINpsds2_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds2_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+struct file_operations tn7dsl_proc_HLINpsds3_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds3_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+struct file_operations tn7dsl_proc_HLINpsds4_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_HLINpsds4_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif - #endif //TR69_HLIN_IN - // UR8_MERGE_END CQ10979* -@@ -4918,64 +4855,48 @@ int tn7dsl_proc_HLINpsds4(char* buf, cha - // * UR8_MERGE_START CQ11057 Jack Zhang - #ifdef TR69_PMD_IN - #ifndef NO_ADV_STATS --int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7dsl_proc_PMDus(struct seq_file *m, void *data) - { -- int len = 0; -- -- int limit = count - 80; - int i; - CoPMDTestParams_t co_pmdtest_params; - -- if(len<=limit) -- len += sprintf(buf+len, "\nAR7 US PMD Test:\n"); -+ seq_printf(m, "\nAR7 US PMD Test:\n"); - - // call API instead of access internal buf directly - if (dslhal_api_getPMDTestus(pIhw, &co_pmdtest_params, 0) != DSLHAL_ERROR_NO_ERRORS) - { - dgprintf(4, "dslhal_api_getPMDTestus failed!\n"); -- return len; -+ return -EIO; - } - -- if(len<=limit) -- len += sprintf(buf+len, "LATN=%d\n", co_pmdtest_params.co_latn); -+ seq_printf(m, "LATN=%d\n", co_pmdtest_params.co_latn); - -- if(len<=limit) -- len += sprintf(buf+len, "SATN=%d\n", co_pmdtest_params.co_satn); -+ seq_printf(m, "SATN=%d\n", co_pmdtest_params.co_satn); - -- if(len<=limit) -- len += sprintf(buf+len, "SNRM=%d\n", co_pmdtest_params.usMargin); -+ seq_printf(m, "SNRM=%d\n", co_pmdtest_params.usMargin); - -- if(len<=limit) -- len += sprintf(buf+len, "attndr=%ld\n", co_pmdtest_params.co_attndr); -+ seq_printf(m, "attndr=%ld\n", co_pmdtest_params.co_attndr); - -- if(len<=limit) -- len += sprintf(buf+len, "NearActatp=%d\n", co_pmdtest_params.co_near_actatp); -+ seq_printf(m, "NearActatp=%d\n", co_pmdtest_params.co_near_actatp); - -- if(len<=limit) -- len += sprintf(buf+len, "FarActatp=%d\n", co_pmdtest_params.co_far_actatp); -+ seq_printf(m, "FarActatp=%d\n", co_pmdtest_params.co_far_actatp); - - //HLOG - for (i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) -- { -- if(len <=limit) -- len += sprintf(buf+len, "\nHLOG(%3d):", i); -- } -- if(len <=limit) -- len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOHlogfMsg[i]); -+ seq_printf(m, "\nHLOG(%3d):", i); -+ -+ seq_printf(m, " %d", co_pmdtest_params.TestParmCOHlogfMsg[i]); - } - - //QLN - for (i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) -- { -- if(len <=limit) -- len += sprintf(buf+len, "\nQLN(%3d):", i); -- } -- if(len <=limit) -- len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOQLNfMsg[i]); -+ seq_printf(m, "\nQLN(%3d):", i); -+ -+ seq_printf(m, " %d", co_pmdtest_params.TestParmCOQLNfMsg[i]); - - } - -@@ -4983,19 +4904,28 @@ int tn7dsl_proc_PMDus(char* buf, char ** - for (i=0; iAppData.max_us_tones; i++) - { - if (!(i%16)) -- { -- if(len <=limit) -- len += sprintf(buf+len, "\nSNR(%3d):", i); -- } -- if(len <=limit) -- len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOSNRfMsg[i]); -+ seq_printf(m, "\nSNR(%3d):", i); -+ seq_printf(m, " %d", co_pmdtest_params.TestParmCOSNRfMsg[i]); - } - -- if(len <=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - -- return len; -+ return 0; -+} -+ -+static int tn7dsl_proc_PMDus_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7dsl_proc_PMDus, PDE_DATA(inode)); - } -+ -+struct file_operations tn7dsl_proc_PMDus_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7dsl_proc_PMDus_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif //NO_ADV_STATS - #endif //TR69_PMD_IN - // * UR8_MERGE_END CQ11057 * ---- a/tn7sar.c -+++ b/tn7sar.c -@@ -1547,44 +1547,66 @@ int tn7sar_oam_generation(void *privCont - return 0; - } - --int tn7sar_proc_oam_ping(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7sar_proc_oam_ping(struct seq_file *m, void *data) - { -- int len = 0; - unsigned int oam_ps = oamPingStatus; - - if( oam_ps == OAM_PING_PENDING_RECVD ) - oam_ps = OAM_PING_PENDING; //jz CQ9861: Only export the PENDING status, not internal state - -- len += sprintf(buf+len, "%d\n", oam_ps); //oamPingStatus); -+ seq_printf(m, "%d\n", oam_ps); //oamPingStatus); - -- return len; -+ return 0; - } - --int tn7sar_proc_pvc_table(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7sar_proc_oam_ping_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7sar_proc_oam_ping, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7sar_proc_oam_ping_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7sar_proc_oam_ping_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+ -+static int tn7sar_proc_pvc_table(struct seq_file *m, void *data) - { -- int len = 0; - int i; - - for(i=0;i<16;i++) - { - if(pvc_result[i].bInUse) - { -- len += sprintf(buf+len, "%d,%d\n", pvc_result[i].vpi,pvc_result[i].vci); -+ seq_printf(m, "%d,%d\n", pvc_result[i].vpi,pvc_result[i].vci); - } - else - { -- len += sprintf(buf+len, "0,0\n"); -+ seq_printf(m, "0,0\n"); - } - } -- return len; -+ return 0; -+} -+ -+static int tn7sar_proc_pvc_table_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7sar_proc_pvc_table, PDE_DATA(inode)); - } - -+struct file_operations tn7sar_proc_pvc_table_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7sar_proc_pvc_table_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; - - --int tn7sar_proc_sar_stat(char* buf, char **start, off_t offset, int count,int *eof, void *data) -+static int tn7sar_proc_sar_stat(struct seq_file *m, void *data) - { -- int len = 0; -- int limit = count - 80; - struct atm_dev *dev; - Tn7AtmPrivate *priv; - int i, j, k; -@@ -1593,21 +1615,19 @@ int tn7sar_proc_sar_stat(char* buf, char - unsigned int *pStateBase, *pSarStat; - HAL_FUNCTIONS *pHalFunc; - HAL_DEVICE *pHalDev; -- int dBytes; - -- dev = (struct atm_dev *)data; -+ dev = (struct atm_dev *)m->private; - priv = (Tn7AtmPrivate *)dev->dev_data; - - pHalFunc = (HAL_FUNCTIONS *)priv->pSarHalFunc; - pHalDev = (HAL_DEVICE *)priv->pSarHalDev; - -- len += sprintf(buf+len, "SAR HAL Statistics"); -+ seq_printf(m, "SAR HAL Statistics"); - for(i=0;ilut[i].inuse) - { -- if(len<=limit) -- len += sprintf(buf+len, "\nChannel %d:\n",priv->lut[i].chanid); -+ seq_printf(m, "\nChannel %d:\n",priv->lut[i].chanid); - k=0; - for(j=0;j<4;j++) - { -@@ -1620,26 +1640,18 @@ int tn7sar_proc_sar_stat(char* buf, char - { - if((char *)*pSarStat == NULL) - break; -- if(len<=limit) -- { -- dBytes = sprintf(buf+len, "%s: ",(char *) *pSarStat); -- len += dBytes; -- k += dBytes; -- } -+ -+ seq_printf(m, "%s: ",(char *) *pSarStat); -+ k += strlen((char *) *pSarStat) + strlen(": "); - pSarStat++; -- if(len<=limit) -- { -- dBytes = sprintf(buf+len, "%s; \n",(char *) *pSarStat); -- len += dBytes; -- k += dBytes; -- } -+ seq_printf(m, "%s; \n",(char *) *pSarStat); -+ k += strlen((char *) *pSarStat) + strlen("; \n"); - pSarStat++; - - if(k > 60) - { - k=0; -- if(len<=limit) -- len += sprintf(buf+len, "\n"); -+ seq_printf(m, "\n"); - } - } - -@@ -1648,9 +1660,22 @@ int tn7sar_proc_sar_stat(char* buf, char - } - } - -- return len; -+ return 0; - } - -+static int tn7sar_proc_sar_stat_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, tn7sar_proc_sar_stat, PDE_DATA(inode)); -+} -+ -+struct file_operations tn7sar_proc_sar_stat_fops = { -+ .owner = THIS_MODULE, -+ .open = tn7sar_proc_sar_stat_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #ifdef AR7_EFM - void tn7sar_get_EFM_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls) - { diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch deleted file mode 100644 index c95c876c54..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -350,7 +350,7 @@ static void tn7dsl_chng_modulation(void* - static unsigned int tn7dsl_set_modulation(void* data, int flag); - static void tn7dsl_ctrl_fineGain(int value); - static void tn7dsl_set_fineGainValue(int value); --static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer, -+static int dslmod_sysctl (struct ctl_table * ctl, int write, void *buffer, - size_t * lenp, loff_t *ppos); - static void tn7dsl_register_dslss_led(void); - void tn7dsl_dslmod_sysctl_register(void); -@@ -3488,7 +3488,7 @@ unsigned int tn7dsl_get_memory(unsigned - - - --static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer, -+static int dslmod_sysctl(struct ctl_table *ctl, int write, void *buffer, - size_t *lenp, loff_t *ppos) - { - char *ptr; -@@ -3603,7 +3603,7 @@ static int dslmod_sysctl(ctl_table *ctl, - } - - --ctl_table dslmod_table[] = { -+struct ctl_table dslmod_table[] = { - { - .procname = "dslmod", - .data = info, -@@ -3617,7 +3617,7 @@ ctl_table dslmod_table[] = { - }; - - /* Make sure that /proc/sys/dev is there */ --ctl_table dslmod_root_table[] = { -+struct ctl_table dslmod_root_table[] = { - #ifdef CONFIG_PROC_FS - { - .procname = "dev", diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch deleted file mode 100644 index 426d593191..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -845,7 +845,7 @@ static int __init tn7atm_irq_request (st - - priv->sar_irq = LNXINTNUM (ATM_SAR_INT); /* Interrupt line # */ - -- if (request_irq (priv->sar_irq, tn7atm_sar_irq, IRQF_DISABLED, "SAR ", dev)) -+ if (request_irq (priv->sar_irq, tn7atm_sar_irq, 0, "SAR ", dev)) - printk ("Could not register tn7atm_sar_irq\n"); - - /* -@@ -869,7 +869,7 @@ static int __init tn7atm_irq_request (st - * Reigster Receive interrupt A - */ - priv->dsl_irq = LNXINTNUM (ATM_DSL_INT); /* Interrupt line # */ -- if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, IRQF_DISABLED, "DSL ", dev)) -+ if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, 0, "DSL ", dev)) - printk ("Could not register tn7atm_dsl_irq\n"); - - /***** VRB Tasklet Mode ****/ diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/260-fix_function_signatures.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/260-fix_function_signatures.patch deleted file mode 100644 index 61a1ff7c83..0000000000 --- a/package/kernel/ar7-atm/patches-D7.05.01.00/260-fix_function_signatures.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/cpswhal_cpsar.h -+++ b/cpswhal_cpsar.h -@@ -437,10 +437,10 @@ typedef struct - int (*DeviceFindInfo)(int Inst, const char *DeviceName, void *DeviceInfo); - int (*DeviceFindParmUint)(void *DeviceInfo, const char *Parm, bit32u *Value); - int (*DeviceFindParmValue)(void *DeviceInfo, const char *Parm, void *Value); -- void (*Free)(void *MemPtr); -+ void (*Free)(const void *MemPtr); - void (*FreeRxBuffer)(OS_RECEIVEINFO *OsReceiveInfo, void *MemPtr); -- void (*FreeDev)(void *MemPtr); -- void (*FreeDmaXfer)(void *MemPtr); -+ void (*FreeDev)(const void *MemPtr); -+ void (*FreeDmaXfer)(const void *MemPtr); - void (*IsrRegister)(OS_DEVICE *OsDev, int (*halISR)(HAL_DEVICE*, int*), int InterruptBit); - void (*IsrUnRegister)(OS_DEVICE *OsDev, int InterruptBit); - void* (*Malloc)(bit32u size); ---- a/cpswhal_cpaal5.h -+++ b/cpswhal_cpaal5.h -@@ -436,10 +436,10 @@ typedef struct - int (*DeviceFindInfo)(int Inst, const char *DeviceName, void *DeviceInfo); - int (*DeviceFindParmUint)(void *DeviceInfo, const char *Parm, bit32u *Value); - int (*DeviceFindParmValue)(void *DeviceInfo, const char *Parm, void *Value); -- void (*Free)(void *MemPtr); -+ void (*Free)(const void *MemPtr); - void (*FreeRxBuffer)(OS_RECEIVEINFO *OsReceiveInfo, void *MemPtr); -- void (*FreeDev)(void *MemPtr); -- void (*FreeDmaXfer)(void *MemPtr); -+ void (*FreeDev)(const void *MemPtr); -+ void (*FreeDmaXfer)(const void *MemPtr); - void (*IsrRegister)(OS_DEVICE *OsDev, int (*halISR)(HAL_DEVICE*, int*), int InterruptBit); - void (*IsrUnRegister)(OS_DEVICE *OsDev, int InterruptBit); - void* (*Malloc)(bit32u size); ---- a/tn7atm.c -+++ b/tn7atm.c -@@ -2690,7 +2690,7 @@ static int tn7atm_proc_turbodsl_read(str - return 0; - } - --static int tn7atm_proc_qos_write(struct file *fp, const char *buf, unsigned long count, void *data) -+static int tn7atm_proc_qos_write(struct file *fp, const char *buf, size_t count, loff_t *data) - { - char local_buf[32]; - ---- a/tn7dsl.c -+++ b/tn7dsl.c -@@ -1770,7 +1770,7 @@ static int tn7dsl_proc_stats_open(struct - return single_open(file, tn7dsl_proc_stats, PDE_DATA(inode)); - } - --int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data); -+int tn7dsl_proc_write_stats(struct file *fp, const char * buf, size_t count, loff_t * data); - - struct file_operations tn7dsl_proc_stats_fops = { - .owner = THIS_MODULE, -@@ -4436,7 +4436,7 @@ int tn7dsl_generic_write( int offsetnum, - } - - int tn7dsl_proc_write_stats (struct file *fp, const char *buf, -- unsigned long count, void *data) -+ size_t count, loff_t *data) - { - char local_buf[31]; - int ret_val = 0; diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile deleted file mode 100644 index d36340d143..0000000000 --- a/target/linux/ar7/Makefile +++ /dev/null @@ -1,25 +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. -# -include $(TOPDIR)/rules.mk - -ARCH:=mipsel -BOARD:=ar7 -BOARDNAME:=TI AR7 -FEATURES:=squashfs atm low_mem -SUBTARGETS:=generic ac49x - -KERNEL_PATCHVER:=4.14 - -define Target/Description - Build firmware images for TI AR7 based routers. -endef - -include $(INCLUDE_DIR)/target.mk - -DEFAULT_PACKAGES+= swconfig - -$(eval $(call BuildTarget)) diff --git a/target/linux/ar7/ac49x/config-default b/target/linux/ar7/ac49x/config-default deleted file mode 100644 index d56df86682..0000000000 --- a/target/linux/ar7/ac49x/config-default +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_AR7_AC49X=y -CONFIG_AR7_TYPE_AC49X=y -# CONFIG_AR7_TYPE_TI is not set -CONFIG_MTD_AC49X_PARTS=y diff --git a/target/linux/ar7/ac49x/profiles/210-None.mk b/target/linux/ar7/ac49x/profiles/210-None.mk deleted file mode 100644 index 2fcfacde9f..0000000000 --- a/target/linux/ar7/ac49x/profiles/210-None.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/None - NAME:=No WiFi - PACKAGES:= -endef - -define Profile/None/Description - Package set without WiFi support -endef -$(eval $(call Profile,None)) - diff --git a/target/linux/ar7/ac49x/target.mk b/target/linux/ar7/ac49x/target.mk deleted file mode 100644 index 47f3ab282d..0000000000 --- a/target/linux/ar7/ac49x/target.mk +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# - -SUBTARGET:=ac49x -BOARDNAME:=AudioCodes AC49x - -define Target/Description - Build firmware images for AudioCodes AC49x based routers. -endef diff --git a/target/linux/ar7/base-files.mk b/target/linux/ar7/base-files.mk deleted file mode 100644 index f21a604b83..0000000000 --- a/target/linux/ar7/base-files.mk +++ /dev/null @@ -1,11 +0,0 @@ -define Build/Compile - $(call Build/Compile/Default) - $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher $(PLATFORM_DIR)/src/adam2patcher.c -endef - -define Package/base-files/install-target - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin -endef - - diff --git a/target/linux/ar7/base-files/etc/board.d/02_network b/target/linux/ar7/base-files/etc/board.d/02_network deleted file mode 100755 index c1c2dc42fe..0000000000 --- a/target/linux/ar7/base-files/etc/board.d/02_network +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -. /lib/functions/uci-defaults.sh - -board_config_update - -if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175A/1:00" -o \ - -e "/sys/bus/mdio_bus/drivers/IC+ IP17xx/1:00" ] && \ - [ -x /sbin/swconfig ]; -then - ucidef_add_switch "eth0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - -elif [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/1:00" -o \ - -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/1:10" ]; -then - ucidef_set_interface_lan "eth0.1" - -elif [ -d "/sys/class/net/eth1" ]; then - ucidef_set_interface_lan "eth0 eth1" - -else - ucidef_set_interface_lan "eth0" -fi - -board_config_flush - -exit 0 diff --git a/target/linux/ar7/base-files/etc/diag.sh b/target/linux/ar7/base-files/etc/diag.sh deleted file mode 100644 index f9aa809405..0000000000 --- a/target/linux/ar7/base-files/etc/diag.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2013 OpenWrt.org - -. /lib/functions/leds.sh - -get_status_led() { - [ -d "/sys/class/leds/status" ] && status_led="status" - [ -d "/sys/class/leds/power:green" ] && status_led="power:green" -} - -set_state() { - get_status_led - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - done) - status_led_on - - [ "$status_led" = "power:green" ] && { - led_off "power:red" - } - ;; - esac -} diff --git a/target/linux/ar7/base-files/etc/init.d/adam2 b/target/linux/ar7/base-files/etc/init.d/adam2 deleted file mode 100755 index 6b786270ea..0000000000 --- a/target/linux/ar7/base-files/etc/init.d/adam2 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh /etc/rc.common -# ADAM2 patcher for Netgear DG834 and compatible -# Copyright (C) 2006 OpenWrt.org - -START=00 -start() { - MD5="$(md5sum /dev/mtdblock0 | awk '{print $1}')" - [ "$MD5" = "0530bfdf00ec155f4182afd70da028c1" ] && { - mtd unlock adam2 - /sbin/adam2patcher /dev/mtdblock0 - } - rm -f /etc/rc.d/S${START}adam2 /etc/init.d/adam2 /sbin/adam2patcher >&- 2>&- -} diff --git a/target/linux/ar7/config-4.14 b/target/linux/ar7/config-4.14 deleted file mode 100644 index aacdac63dc..0000000000 --- a/target/linux/ar7/config-4.14 +++ /dev/null @@ -1,169 +0,0 @@ -CONFIG_ADM6996_PHY=y -CONFIG_AR7=y -CONFIG_AR7_TI=y -# CONFIG_AR7_TYPE_AC49X is not set -CONFIG_AR7_TYPE_TI=y -CONFIG_AR7_WDT=y -CONFIG_ARCH_BINFMT_ELF_STATE=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set -# CONFIG_ARCH_HAS_SG_CHAIN is not set -# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set -# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_ARCH_MMAP_RND_BITS_MAX=15 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_QUEUED_RWLOCKS=y -CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_BOOT_ELF32=y -CONFIG_CEVT_R4K=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="rootfstype=squashfs,jffs2" -CONFIG_CMDLINE_BOOL=y -# CONFIG_CMDLINE_OVERRIDE is not set -CONFIG_CPMAC=y -CONFIG_CPU_GENERIC_DUMP_TLB=y -CONFIG_CPU_HAS_PREFETCH=y -CONFIG_CPU_HAS_SYNC=y -CONFIG_CPU_LITTLE_ENDIAN=y -CONFIG_CPU_MIPS32=y -CONFIG_CPU_MIPS32_R1=y -CONFIG_CPU_MIPSR1=y -CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y -CONFIG_CPU_R4K_CACHE_TLB=y -CONFIG_CPU_R4K_FPU=y -CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y -CONFIG_CPU_SUPPORTS_HIGHMEM=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CSRC_R4K=y -CONFIG_DMA_NONCOHERENT=y -CONFIG_EARLY_PRINTK=y -CONFIG_ETHERNET_PACKET_MANGLE=y -CONFIG_FIXED_PHY=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GPIOLIB=y -# CONFIG_GRO_CELLS is not set -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDWARE_WATCHPOINTS=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HAVE_ARCH_COMPILER_H=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_COPY_THREAD_TLS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_RANDOM=y -CONFIG_HZ_PERIODIC=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_IP17XX_PHY=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_MIPS_CPU=y -CONFIG_IRQ_WORK=y -CONFIG_KALLSYMS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_DEVICE=y -CONFIG_MIGRATION=y -CONFIG_MIPS=y -CONFIG_MIPS_ASID_BITS=8 -CONFIG_MIPS_ASID_SHIFT=0 -CONFIG_MIPS_CBPF_JIT=y -CONFIG_MIPS_CLOCK_VSYSCALL=y -# CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set -CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y -# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set -CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_MIPS_MACHINE is not set -CONFIG_MODULES_USE_ELF_REL=y -# CONFIG_MTD_AC49X_PARTS is not set -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MVSWITCH_PHY=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NO_EXCEPT_FILL=y -CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y -# CONFIG_NO_IOPORT_MAP is not set -# CONFIG_OF is not set -CONFIG_PCI_DRIVERS_LEGACY=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -# CONFIG_RCU_NEED_SEGCBLIST is not set -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250_FSL is not set -CONFIG_SRCU=y -CONFIG_SWAP_IO_SPACE=y -CONFIG_SWCONFIG=y -CONFIG_SWPHY=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_SYS_HAS_CPU_MIPS32_R1=y -CONFIG_SYS_HAS_EARLY_PRINTK=y -CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y -CONFIG_SYS_SUPPORTS_ARBIT_HZ=y -CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y -CONFIG_SYS_SUPPORTS_MIPS16=y -CONFIG_SYS_SUPPORTS_ZBOOT=y -CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TINY_SRCU=y -CONFIG_VLYNQ=y -# CONFIG_VLYNQ_DEBUG is not set diff --git a/target/linux/ar7/files/drivers/mtd/ac49xpart.c b/target/linux/ar7/files/drivers/mtd/ac49xpart.c deleted file mode 100644 index 4f8a9c1b84..0000000000 --- a/target/linux/ar7/files/drivers/mtd/ac49xpart.c +++ /dev/null @@ -1,221 +0,0 @@ -/* - * AudioCodes AC49x PSPBoot-based flash partition table - * Copyright 2012 Daniel Golle - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include -#include - -#include -#include -#include -#include -#include - -#include - -#define AC49X_MAXENVPARTS 8 - -#define AC49X_PARTTYPE_LOADER 0 -#define AC49X_PARTTYPE_BOOTENV 1 -#define AC49X_PARTTYPE_LINUX 2 -#define AC49X_PARTTYPE_ROOTFS 3 -#define AC49X_PARTTYPE_UNKNOWN 4 -#define AC49X_NUM_PARTTYPES 5 - -#define AC49X_FLASH_ADDRMASK 0x00FFFFFF - -#define AC49X_LOADER_MAGIC 0x40809000 -#define AC49X_LINUX_MAGIC 0x464c457f /* ELF */ -#define AC49X_BOOTENV_MAGIC 0x4578614d /* MaxE */ - -#define ROOTFS_MIN_OFFSET 0xC0000 - -int parse_partvar(const unsigned char *partvar, struct mtd_partition *part) -{ - unsigned int partstart, partend; - unsigned int pnum; - - pnum = sscanf(partvar, "0x%x,0x%x", &partstart, &partend); - if (pnum != 2) - return 1; - - part->offset = partstart & AC49X_FLASH_ADDRMASK; - part->size = partend - partstart; - - return 0; -} - -int detect_parttype(struct mtd_info *master, struct mtd_partition part) -{ - unsigned int magic; - size_t len; - - if (part.size < 4) - return -1; - - mtd_read(master, part.offset, sizeof(magic), &len, - (uint8_t *)&magic); - - if (len != sizeof(magic)) - return -1; - - switch (magic) { - case AC49X_LOADER_MAGIC: - return AC49X_PARTTYPE_LOADER; - case AC49X_LINUX_MAGIC: - return AC49X_PARTTYPE_LINUX; - case SQUASHFS_MAGIC: - case CRAMFS_MAGIC: - case CRAMFS_MAGIC_WEND: - return AC49X_PARTTYPE_ROOTFS; - case AC49X_BOOTENV_MAGIC: - return AC49X_PARTTYPE_BOOTENV; - default: - switch (magic & 0xFF) { - case JFFS2_SUPER_MAGIC: - return AC49X_PARTTYPE_ROOTFS; - } - switch (magic >> 8) { - case JFFS2_SUPER_MAGIC: - return AC49X_PARTTYPE_ROOTFS; - } - return AC49X_PARTTYPE_UNKNOWN; - } -} - -const char *partnames[] = { - "loader", - "config", - "linux", - "rootfs", - "data" -}; - -void gen_partname(unsigned int type, - unsigned int *typenumeration, - struct mtd_partition *part) -{ - char *s = kzalloc(sizeof(char) * 8, GFP_KERNEL); - - (typenumeration[type])++; - if (typenumeration[type] == 1) - sprintf(s, "%s", partnames[type]); - else - sprintf(s, "%s%d", partnames[type], typenumeration[type]); - - part->name = s; -} - -static int create_mtd_partitions(struct mtd_info *master, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) -{ - unsigned int envpartnum = 0, linuxpartnum = 0; - unsigned int typenumeration[5] = { 0, 0, 0, 0, 0 }; - unsigned char evn[5]; - const unsigned char *partvar = NULL; - - struct mtd_partition *ac49x_parts; - - ac49x_parts = kzalloc(sizeof(*ac49x_parts) * AC49X_MAXENVPARTS, - GFP_KERNEL); - - if (!ac49x_parts) - return -ENOMEM; - - linuxpartnum = 0; - for (envpartnum = 0; envpartnum < AC49X_MAXENVPARTS; envpartnum++) { - struct mtd_partition parsepart; - unsigned int offset, size, type; - int err; - sprintf(evn, "mtd%d", envpartnum); - partvar = prom_getenv(evn); - if (!partvar) - continue; - err = parse_partvar(partvar, &parsepart); - if (err) - continue; - offset = parsepart.offset; - size = parsepart.size; - type = detect_parttype(master, parsepart); - gen_partname(type, typenumeration, &parsepart); - /* protect loader */ - if (type == AC49X_PARTTYPE_LOADER) - parsepart.mask_flags = MTD_WRITEABLE; - else - parsepart.mask_flags = 0; - - memcpy(&(ac49x_parts[linuxpartnum]), &parsepart, - sizeof(struct mtd_partition)); - - /* scan for contained rootfs */ - if (type == AC49X_PARTTYPE_LINUX) { - parsepart.offset += ROOTFS_MIN_OFFSET & - ~(master->erasesize - 1); - parsepart.size -= ROOTFS_MIN_OFFSET & - ~(master->erasesize - 1); - do { - unsigned int size, offset; - size = parsepart.size; - offset = parsepart.offset; - - type = detect_parttype(master, parsepart); - if (type == AC49X_PARTTYPE_ROOTFS) { - gen_partname(type, typenumeration, - &parsepart); - printk(KERN_INFO - "%s %s: 0x%08x@0x%08x\n", - "detected sub-partition", - parsepart.name, - (unsigned int)parsepart.size, - (unsigned int)parsepart.offset); - linuxpartnum++; - memcpy(&(ac49x_parts[linuxpartnum]), - &parsepart, - sizeof(struct mtd_partition)); - break; - } - parsepart.offset += master->erasesize; - parsepart.size -= master->erasesize; - } while (parsepart.size >= master->erasesize); - } - linuxpartnum++; - } - - *pparts = ac49x_parts; - return linuxpartnum; -} - -static struct mtd_part_parser ac49x_parser = { - .owner = THIS_MODULE, - .parse_fn = create_mtd_partitions, - .name = "ac49xpart", -}; - -static int __init ac49x_parser_init(void) -{ - register_mtd_parser(&ac49x_parser); - return 0; -} - -module_init(ac49x_parser_init); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Daniel Golle "); -MODULE_DESCRIPTION("MTD partitioning for AudioCodes AC49x"); diff --git a/target/linux/ar7/files/drivers/mtd/titanpart.c b/target/linux/ar7/files/drivers/mtd/titanpart.c deleted file mode 100644 index a6403f6ce2..0000000000 --- a/target/linux/ar7/files/drivers/mtd/titanpart.c +++ /dev/null @@ -1,234 +0,0 @@ -#include -#include - -#include -#include -#include -#include -#include - -#define IMAGE_A_SIZE 0X3c0000 -#define WRTP_PARTS 14 -#define NSP_IMG_MAGIC_NUMBER le32_to_cpu(0x4D544443) -#define NSP_IMG_SECTION_TYPE_KERNEL (0x01) -#define NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT (0x02) -#define NSP_IMG_SECTION_TYPE_FILESYSTEM (0x03) -#define MAX_NUM_PARTITIONS 14 - -static int part_count=0; -static struct mtd_partition titan_parts[WRTP_PARTS]; - - -struct nsp_img_hdr_head -{ - unsigned int magic; /* Magic number to identify this image header */ - unsigned int boot_offset; /* Offset from start of header to kernel code. */ - unsigned int flags; /* Image flags. */ - unsigned int hdr_version; /* Version of this header. */ - unsigned int hdr_size; /* The complete size of all portions of the header */ - unsigned int prod_id; /* This product id */ - unsigned int rel_id; /* Which release this is */ - unsigned int version; /* name-MMM.nnn.ooo-rxx => 0xMMnnooxx. See comment - below */ - unsigned int image_size; /* Image size (including header) */ - unsigned int info_offset; /* Offset from start of header to info block */ - unsigned int sect_info_offset; /* Offset from start of header to section desc */ - unsigned int chksum_offset; /* Offset from start of header to chksum block */ - unsigned int pad1; -}; - -struct nsp_img_hdr_section_info -{ - unsigned int num_sects; /* Number of section (and section desc blocks) in this image */ - unsigned int sect_size; /* Size of a SINGLE section_desc block */ - unsigned int sections_offset; /* Offset to from start of header to the start of the section blocks */ -}; - -/* There will be one of more of the following stuctures in the image header. Each - section will have one of these blocks. */ -struct nsp_img_hdr_sections -{ - unsigned int offset; /* Offset of section from start of NSP_IMG_HDR_HEAD */ - unsigned int total_size; /* Size of section (including pad size.) */ - unsigned int raw_size; /* Size of section only */ - unsigned int flags; /* Section flags */ - unsigned int chksum; /* Section checksum */ - unsigned int type; /* Section type. What kind of info does this section describe */ - char name[16]; /* Reference name for this section. */ -}; - - - - - -static int titan_parse_env_address(char *env_name, unsigned int *flash_base, - unsigned int *flash_end) -{ - char image_name[30]; - char *env_ptr; - char *base_ptr; - char *end_ptr; - char * string_ptr; - /* Get the image variable */ - env_ptr = prom_getenv(env_name); - if(!env_ptr){ - printk("titan: invalid env name, %s.\n", env_name); - return -1; /* Error, no image variable */ - } - strncpy(image_name, env_ptr, 30); - image_name[29]=0; - string_ptr = image_name; - /* Extract the start and stop addresses of the partition */ - base_ptr = strsep(&string_ptr, ","); - end_ptr = strsep(&string_ptr, ","); - if ((base_ptr == NULL) || (end_ptr == NULL)) { - printk("titan: Couldn't tokenize %s start,end.\n", image_name); - return -1; - } - - *flash_base = (unsigned int) simple_strtol(base_ptr, NULL, 0); - *flash_end = (unsigned int) simple_strtol(end_ptr, NULL, 0); - if((!*flash_base) || (!*flash_end)) { - printk("titan: Unable to convert :%s: :%s: into start,end values.\n", - env_name, image_name); - return -1; - } - *flash_base &= 0x0fffffff; - *flash_end &= 0x0fffffff; - return 0; -} - - - -static int titan_get_single_image(char *bootcfg_name, unsigned int *flash_base, - unsigned int *flash_end) -{ - char *env_ptr; - char *base_ptr; - char *end_ptr; - char image_name[30]; - char * string_ptr; - - if(!bootcfg_name || !flash_base || !flash_end) - return -1; - - env_ptr = prom_getenv(bootcfg_name); - if(!env_ptr){ - printk("titan: %s variable not found.\n", bootcfg_name); - return -1; /* Error, no bootcfg variable */ - } - - string_ptr = image_name; - /* Save off the image name */ - strncpy(image_name, env_ptr, 30); - image_name[29]=0; - - end_ptr=strsep(&string_ptr, "\""); - base_ptr=strsep(&string_ptr, "\""); /* Loose the last " */ - if(!end_ptr || !base_ptr){ - printk("titan: invalid bootcfg format, %s.\n", image_name); - return -1; /* Error, invalid bootcfg variable */ - } - - /* Now, parse the addresses */ - return titan_parse_env_address(base_ptr, flash_base, flash_end); -} - - - -static void titan_add_partition(char * env_name, unsigned int flash_base, unsigned int flash_end) -{ - titan_parts[part_count].name = env_name; - titan_parts[part_count].offset = flash_base; - titan_parts[part_count].size = flash_end-flash_base; - titan_parts[part_count].mask_flags = (strcmp(env_name, "bootloader")==0|| - strcmp(env_name, "boot_env")==0 || - strcmp(env_name, "full_image")==0 )?MTD_WRITEABLE:0; - part_count++; - -} -int create_titan_partitions(struct mtd_info *master, - struct mtd_partition **pparts, - unsigned long origin) -{ - struct nsp_img_hdr_head hdr; - struct nsp_img_hdr_section_info sect_info; - struct nsp_img_hdr_sections section; - unsigned int flash_base, flash_end; - unsigned int start, end; - char *name; - int i; - int total_sects=0; - size_t len; - - /* Get the bootcfg env variable first */ - if(titan_get_single_image("BOOTCFG", &flash_base, &flash_end)) { - /* Error, fallback */ - return -1; - } - - /* Get access to the header, and do some validation checks */ - //hdr=(struct nsp_img_hdr_head*)flash_base; - mtd_read(master, flash_base, sizeof(struct nsp_img_hdr_head), &len, (uint8_t *)&hdr); - if(hdr.magic != NSP_IMG_MAGIC_NUMBER) - return -1; /* Not a single image */ - - mtd_read(master, flash_base + hdr.sect_info_offset, sizeof(struct nsp_img_hdr_section_info), &len, (uint8_t *)§_info); - - /* Look for the root fs, and add it first. This way we KNOW where the rootfs is */ - for(i=0; i< sect_info.num_sects && isize); - total_sects++; - - if (!titan_parse_env_address("BOOTLOADER", &start, &end)){ - titan_add_partition("bootloader", start, end); - total_sects++; - } - if (!titan_parse_env_address("boot_env", &start, &end)){ - titan_add_partition("boot_env", start, end); - total_sects++; - } - *pparts = titan_parts; - return total_sects; -} diff --git a/target/linux/ar7/generic/config-default b/target/linux/ar7/generic/config-default deleted file mode 100644 index 10d46e9c26..0000000000 --- a/target/linux/ar7/generic/config-default +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_AR7_TI=y -# CONFIG_AR7_TYPE_AC49X is not set -CONFIG_AR7_TYPE_TI=y -# CONFIG_MTD_AC49X_PARTS is not set -CONFIG_MTD_AR7_PARTS=y diff --git a/target/linux/ar7/generic/profiles/100-Annex-A.mk b/target/linux/ar7/generic/profiles/100-Annex-A.mk deleted file mode 100644 index d8e549ea65..0000000000 --- a/target/linux/ar7/generic/profiles/100-Annex-A.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Annex-A - NAME:=Annex-A DSL firmware (default) - PACKAGES:=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl \ - kmod-sangam-atm-annex-a -endef - -define Profile/Annex-A/Description - Package set compatible with Annex-A DSL lines (most countries). -endef -$(eval $(call Profile,Annex-A)) - diff --git a/target/linux/ar7/generic/profiles/110-Annex-B.mk b/target/linux/ar7/generic/profiles/110-Annex-B.mk deleted file mode 100644 index 55de1fc4ad..0000000000 --- a/target/linux/ar7/generic/profiles/110-Annex-B.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Annex-B - NAME:=Annex-B DSL firmware - PACKAGES:=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl \ - kmod-sangam-atm-annex-b -endef - -define Profile/Annex-B/Description - Package set compatible with Annex-B DSL lines (Germany). -endef -$(eval $(call Profile,Annex-B)) - diff --git a/target/linux/ar7/generic/profiles/200-Texas.mk b/target/linux/ar7/generic/profiles/200-Texas.mk deleted file mode 100644 index 7d868bdb08..0000000000 --- a/target/linux/ar7/generic/profiles/200-Texas.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Texas - NAME:=Texas Instruments WiFi (mac80211) - PACKAGES:=kmod-acx-mac80211 -endef - -define Profile/Texas/Description - Package set compatible with hardware using Texas Instruments WiFi cards - using the mac80211 driver. -endef -$(eval $(call Profile,Texas)) - diff --git a/target/linux/ar7/generic/profiles/210-None.mk b/target/linux/ar7/generic/profiles/210-None.mk deleted file mode 100644 index 2fcfacde9f..0000000000 --- a/target/linux/ar7/generic/profiles/210-None.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/None - NAME:=No WiFi - PACKAGES:= -endef - -define Profile/None/Description - Package set without WiFi support -endef -$(eval $(call Profile,None)) - diff --git a/target/linux/ar7/generic/target.mk b/target/linux/ar7/generic/target.mk deleted file mode 100644 index b40d2a4722..0000000000 --- a/target/linux/ar7/generic/target.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# - -SUBTARGET:=generic -BOARDNAME:=Texas Instruments AR7 boards - -DEFAULT_PACKAGES+= kmod-mac80211 kmod-acx-mac80211 wpad-basic - -define Target/Description - Build firmware images for TI AR7 based routers. -endef diff --git a/target/linux/ar7/image/Makefile b/target/linux/ar7/image/Makefile deleted file mode 100644 index d20de27113..0000000000 --- a/target/linux/ar7/image/Makefile +++ /dev/null @@ -1,137 +0,0 @@ -# -# Copyright (C) 2006-2015 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)/image.mk - -DROP_SECTIONS:=.reginfo .mdebug .comment .note .pdr .options .MIPS.options -OBJCOPY_SREC:=$(TARGET_CROSS)objcopy -S -O srec $(addprefix --remove-section=,$(DROP_SECTIONS)) - -LOADADDR:=0x94600000 -KERNEL_ENTRY:=0x94100000 -RAMSTART:=0x94000000 -RAMSIZE:=0x00100000 - -EVA_LOADADDR := 0x94100000 - -LOADER_MAKEOPTS= \ - KDIR=$(KDIR) \ - LOADADDR=$(LOADADDR) \ - KERNEL_ENTRY=$(KERNEL_ENTRY) \ - RAMSTART=$(RAMSTART) \ - RAMSIZE=$(RAMSIZE) - -CFLAGS := -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \ - -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic \ - -pipe -mlong-calls -fno-common \ - -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap \ - -DLOADADDR=$(LOADADDR) - -define Build/Clean - $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean -endef - -define Image/Prepare - cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma - $(STAGING_DIR_HOST)/bin/lzma2eva $(EVA_LOADADDR) 0x$${shell $(TARGET_CROSS)nm $(KDIR)/vmlinux | grep -w kernel_entry | cut -d' ' -f1} $(KDIR)/vmlinux.lzma $(KDIR)/loader.eva - - $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader \ - $(LOADER_MAKEOPTS) \ - clean compile - $(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/loader.srec - $(OBJCOPY_SREC) $(KDIR)/vmlinux.elf $(KDIR)/vmlinux.srec - srec2bin $(KDIR)/loader.srec $(KDIR)/loader.bin - srec2bin $(KDIR)/vmlinux.srec $(KDIR)/vmlinux.bin -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) - $(OBJCOPY_SREC) $(KDIR)/vmlinux-initramfs.elf \ - $(KDIR)/vmlinux-initramfs.srec - srec2bin $(KDIR)/vmlinux-initramfs.srec $(KDIR)/vmlinux-initramfs.bin -endif -endef - -define align/jffs2-64k -bs=65536 conv=sync -endef - -define align/jffs2-128k -bs=131072 conv=sync -endef - -define align/squashfs -endef - -define Image/Build/CyberTAN - (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin) | \ - $(STAGING_DIR_HOST)/bin/addpattern -p $(3) -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(4)-code.bin -endef - -define Image/Build/Titan - $(STAGING_DIR_HOST)/bin/mktitanimg -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(4)-code.bin -i $(KDIR)/loader.bin $(KDIR)/root.$(1) -a 0x10000 0x10000 -h 2 -p 0x4C575943 -s 0x0b010000 - $(STAGING_DIR_HOST)/bin/mktitanimg -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-na-$(4)-code.bin -i $(KDIR)/loader.bin $(KDIR)/root.$(1) -a 0x10000 0x10000 -h 2 -p 0x4D575943 -s 0x0b010000 -endef - -define Image/Build/AudioCodes - ( dd if=$(KDIR)/vmlinux.elf bs=64k conv=sync ; dd if=$(KDIR)/root.$(1) ) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).bin -endef - -#define Image/Build/sErCoMm -# cat sercomm/adam2.bin "$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin" > "$(KDIR)/dgfw.tmp" -# dd if=sercomm/$(2) of="$(KDIR)/dgfw.tmp" bs=$$$$((0x3e0000 - 80)) seek=1 conv=notrunc -# $(STAGING_DIR_HOST)/bin/dgfirmware -f -w "$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3).img" "$(KDIR)/dgfw.tmp" -# rm -f "$(KDIR)/dgfw.tmp" -#endef - -define Image/Build/EVA - dd if=$(KDIR)/loader.eva $(call align/$(1)) > $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(KERNEL)-$(1).bin - cat $(KDIR)/root.$(1) >> $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(KERNEL)-$(1).bin - $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(KERNEL)-$(1).bin) -endef - -define Image/Build/Initramfs - $(CP) $(KDIR)/vmlinux-initramfs.bin $(BIN_DIR)/$(IMG_PREFIX)-initramfs.bin -endef - -ifeq ($(CONFIG_AR7_TI),y) -define Image/Build - dd if=$(KDIR)/loader.bin $(call align/$(1)) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin - cat $(KDIR)/root.$(1) >> $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin - $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin) - $(call Image/Build/CyberTAN,$(1),AG1B,AG1B,$(1)) - $(call Image/Build/CyberTAN,$(1),AG1A,AG1A,$(1)) - $(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1)) - $(call Image/Build/CyberTAN,$(1),WA22,WA22,$(1)) - $(call Image/Build/CyberTAN,$(1),WAG2,WAG2,$(1)) - $(call Image/Build/CyberTAN,$(1),AG310,AV2A -b -r 1.0,$(1)) - $(call Image/Build/CyberTAN,$(1),AG241v2,AG3A -b -r 2.0,$(1)) - $(call Image/Build/CyberTAN,$(1),AG241v2b,AG3B -b -r 2.0,$(1)) - $(call Image/Build/CyberTAN,$(1),AG241v1,AG3A -b,$(1)) - $(call Image/Build/CyberTAN,$(1),WAG54GP2v1,ATWL -b,$(1)) - $(call Image/Build/CyberTAN,$(1),WAG54GP2v2,CTWL -b,$(1)) - $(call Image/Build/CyberTAN,$(1),WA31,WA31 -b,$(1)) - $(call Image/Build/CyberTAN,$(1),WA32,WA32 -b,$(1)) - $(call Image/Build/CyberTAN,$(1),WA7A,WA7A -b,$(1)) - $(call Image/Build/CyberTAN,$(1),WA7B,WA7B -b,$(1)) -# $(call Image/Build/sErCoMm,$(1),dg834,$(1)) -# $(call Image/Build/sErCoMm,$(1),jdr454wb,$(1)) - $(call Image/Build/EVA,$(1),EVA) - $(call Image/Build/Titan,$(1),Titan,Titan,$(1)) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - $(call Image/Build/Initramfs) -endif -endef -endif - -ifeq ($(CONFIG_AR7_AC49X),y) -define Image/Build -# $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin) - $(call Image/Build/AudioCodes,$(1),mp202,$(1)) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - $(call Image/Build/Initramfs) -endif -endef -endif - -$(eval $(call BuildImage)) diff --git a/target/linux/ar7/patches-4.14/100-fix-highmem-offset.patch b/target/linux/ar7/patches-4.14/100-fix-highmem-offset.patch deleted file mode 100644 index f1a7549786..0000000000 --- a/target/linux/ar7/patches-4.14/100-fix-highmem-offset.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/mips/include/asm/mach-ar7/spaces.h -+++ b/arch/mips/include/asm/mach-ar7/spaces.h -@@ -20,6 +20,8 @@ - #define UNCAC_BASE _AC(0xb4000000, UL) /* 0xa0000000 + PHYS_OFFSET */ - #define IO_BASE UNCAC_BASE - -+#define HIGHMEM_START _AC(0x20000000, UL) -+ - #include - - #endif /* __ASM_AR7_SPACES_H */ diff --git a/target/linux/ar7/patches-4.14/110-flash.patch b/target/linux/ar7/patches-4.14/110-flash.patch deleted file mode 100644 index e83eac9181..0000000000 --- a/target/linux/ar7/patches-4.14/110-flash.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -13,7 +13,7 @@ obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o - obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o - obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o - obj-$(CONFIG_MTD_AFS_PARTS) += afs.o --obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o -+obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o titanpart.o - obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o - obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o - obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o ---- a/arch/mips/ar7/platform.c -+++ b/arch/mips/ar7/platform.c -@@ -197,7 +197,7 @@ static struct resource physmap_flash_res - .name = "mem", - .flags = IORESOURCE_MEM, - .start = 0x10000000, -- .end = 0x107fffff, -+ .end = 0x11ffffff, - }; - - static const char *ar7_probe_types[] = { "ar7part", NULL }; diff --git a/target/linux/ar7/patches-4.14/160-vlynq_try_remote_first.patch b/target/linux/ar7/patches-4.14/160-vlynq_try_remote_first.patch deleted file mode 100644 index 1d1310d82e..0000000000 --- a/target/linux/ar7/patches-4.14/160-vlynq_try_remote_first.patch +++ /dev/null @@ -1,300 +0,0 @@ ---- a/drivers/vlynq/vlynq.c -+++ b/drivers/vlynq/vlynq.c -@@ -119,20 +119,40 @@ static int vlynq_linked(struct vlynq_dev - return 0; - } - -+static volatile int vlynq_delay_value_new = 0; -+ -+static void vlynq_delay_wait(u32 count) -+{ -+ /* Code adopted from original vlynq driver */ -+ int i = 0; -+ volatile int *ptr = &vlynq_delay_value_new; -+ *ptr = 0; -+ -+ /* We are assuming that the each cycle takes about -+ * 23 assembly instructions. */ -+ for(i = 0; i < (count + 23)/23; i++) -+ *ptr = *ptr + 1; -+} -+ - static void vlynq_reset(struct vlynq_device *dev) - { -+ u32 rtm = readl(&dev->local->revision); -+ -+ rtm = rtm < 0x00010205 || readl(&dev->local->status) & 0x800 == 0 ? -+ 0 : 0x600000; -+ - writel(readl(&dev->local->control) | VLYNQ_CTRL_RESET, - &dev->local->control); - - /* Wait for the devices to finish resetting */ -- msleep(5); -+ vlynq_delay_wait(0xffffff); - - /* Remove reset bit */ -- writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET, -+ writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET | rtm, - &dev->local->control); - - /* Give some time for the devices to settle */ -- msleep(5); -+ vlynq_delay_wait(0xffffff); - } - - static void vlynq_irq_unmask(struct irq_data *d) -@@ -379,6 +399,61 @@ void vlynq_unregister_driver(struct vlyn - } - EXPORT_SYMBOL(vlynq_unregister_driver); - -+enum vlynq_clk_src { -+ vlynq_clk_external, -+ vlynq_clk_local, -+ vlynq_clk_remote, -+ vlynq_clk_invalid, -+}; -+ -+static int __vlynq_set_clocks(struct vlynq_device *dev, -+ enum vlynq_clk_src clk_dir, -+ int lclk_div, int rclk_div) -+{ -+ u32 reg; -+ -+ if (clk_dir == vlynq_clk_invalid) { -+ printk(KERN_ERR "%s: attempt to set invalid clocking\n", -+ dev_name(&dev->dev)); -+ return -EINVAL; -+ } -+ -+ reg = readl(&dev->local->control); -+ if (readl(&dev->local->revision) < 0x00010205) { -+ if (clk_dir & vlynq_clk_local) -+ reg |= VLYNQ_CTRL_CLOCK_INT; -+ else -+ reg &= ~VLYNQ_CTRL_CLOCK_INT; -+ } -+ reg &= ~VLYNQ_CTRL_CLOCK_MASK; -+ reg |= VLYNQ_CTRL_CLOCK_DIV(lclk_div); -+ writel(reg, &dev->local->control); -+ -+ if (!vlynq_linked(dev)) -+ return -ENODEV; -+ -+ printk(KERN_INFO "%s: local VLYNQ protocol rev. is 0x%08x\n", -+ dev_name(&dev->dev), readl(&dev->local->revision)); -+ printk(KERN_INFO "%s: remote VLYNQ protocol rev. is 0x%08x\n", -+ dev_name(&dev->dev), readl(&dev->remote->revision)); -+ -+ reg = readl(&dev->remote->control); -+ if (readl(&dev->remote->revision) < 0x00010205) { -+ if (clk_dir & vlynq_clk_remote) -+ reg |= VLYNQ_CTRL_CLOCK_INT; -+ else -+ reg &= ~VLYNQ_CTRL_CLOCK_INT; -+ } -+ reg &= ~VLYNQ_CTRL_CLOCK_MASK; -+ reg |= VLYNQ_CTRL_CLOCK_DIV(rclk_div); -+ writel(reg, &dev->remote->control); -+ -+ if (!vlynq_linked(dev)) -+ return -ENODEV; -+ -+ return 0; -+} -+ - /* - * A VLYNQ remote device can clock the VLYNQ bus master - * using a dedicated clock line. In that case, both the -@@ -392,29 +467,16 @@ static int __vlynq_try_remote(struct vly - int i; - - vlynq_reset(dev); -- for (i = dev->dev_id ? vlynq_rdiv2 : vlynq_rdiv8; dev->dev_id ? -- i <= vlynq_rdiv8 : i >= vlynq_rdiv2; -- dev->dev_id ? i++ : i--) { -+ for (i = 0; i <= 7; i++) { - - if (!vlynq_linked(dev)) - break; - -- writel((readl(&dev->remote->control) & -- ~VLYNQ_CTRL_CLOCK_MASK) | -- VLYNQ_CTRL_CLOCK_INT | -- VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1), -- &dev->remote->control); -- writel((readl(&dev->local->control) -- & ~(VLYNQ_CTRL_CLOCK_INT | -- VLYNQ_CTRL_CLOCK_MASK)) | -- VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1), -- &dev->local->control); -- -- if (vlynq_linked(dev)) { -- printk(KERN_DEBUG -- "%s: using remote clock divisor %d\n", -- dev_name(&dev->dev), i - vlynq_rdiv1 + 1); -- dev->divisor = i; -+ if (!__vlynq_set_clocks(dev, vlynq_clk_remote, i, i)) { -+ printk(KERN_INFO -+ "%s: using remote clock divisor %d\n", -+ dev_name(&dev->dev), i + 1); -+ dev->divisor = i + vlynq_rdiv1; - return 0; - } else { - vlynq_reset(dev); -@@ -433,25 +495,17 @@ static int __vlynq_try_remote(struct vly - */ - static int __vlynq_try_local(struct vlynq_device *dev) - { -- int i; -+ int i, dir = !dev->dev_id; - - vlynq_reset(dev); - -- for (i = dev->dev_id ? vlynq_ldiv2 : vlynq_ldiv8; dev->dev_id ? -- i <= vlynq_ldiv8 : i >= vlynq_ldiv2; -- dev->dev_id ? i++ : i--) { -- -- writel((readl(&dev->local->control) & -- ~VLYNQ_CTRL_CLOCK_MASK) | -- VLYNQ_CTRL_CLOCK_INT | -- VLYNQ_CTRL_CLOCK_DIV(i - vlynq_ldiv1), -- &dev->local->control); -- -- if (vlynq_linked(dev)) { -- printk(KERN_DEBUG -- "%s: using local clock divisor %d\n", -- dev_name(&dev->dev), i - vlynq_ldiv1 + 1); -- dev->divisor = i; -+ for (i = dir ? 7 : 0; dir ? i >= 0 : i <= 7; dir ? i-- : i++) { -+ -+ if (!__vlynq_set_clocks(dev, vlynq_clk_local, i, 0)) { -+ printk(KERN_INFO -+ "%s: using local clock divisor %d\n", -+ dev_name(&dev->dev), i + 1); -+ dev->divisor = i + vlynq_ldiv1; - return 0; - } else { - vlynq_reset(dev); -@@ -473,18 +527,10 @@ static int __vlynq_try_external(struct v - if (!vlynq_linked(dev)) - return -ENODEV; - -- writel((readl(&dev->remote->control) & -- ~VLYNQ_CTRL_CLOCK_INT), -- &dev->remote->control); -- -- writel((readl(&dev->local->control) & -- ~VLYNQ_CTRL_CLOCK_INT), -- &dev->local->control); -- -- if (vlynq_linked(dev)) { -- printk(KERN_DEBUG "%s: using external clock\n", -- dev_name(&dev->dev)); -- dev->divisor = vlynq_div_external; -+ if (!__vlynq_set_clocks(dev, vlynq_clk_external, 0, 0)) { -+ printk(KERN_INFO "%s: using external clock\n", -+ dev_name(&dev->dev)); -+ dev->divisor = vlynq_div_external; - return 0; - } - -@@ -501,24 +547,16 @@ static int __vlynq_enable_device(struct - return result; - - switch (dev->divisor) { -- case vlynq_div_external: - case vlynq_div_auto: - /* When the device is brought from reset it should have clock - * generation negotiated by hardware. - * Check which device is generating clocks and perform setup - * accordingly */ -- if (vlynq_linked(dev) && readl(&dev->remote->control) & -- VLYNQ_CTRL_CLOCK_INT) { -- if (!__vlynq_try_remote(dev) || -- !__vlynq_try_local(dev) || -- !__vlynq_try_external(dev)) -- return 0; -- } else { -- if (!__vlynq_try_external(dev) || -- !__vlynq_try_local(dev) || -- !__vlynq_try_remote(dev)) -- return 0; -- } -+ if (!__vlynq_try_remote(dev) || !__vlynq_try_local(dev)) -+ return 0; -+ case vlynq_div_external: -+ if (!__vlynq_try_external(dev)) -+ return 0; - break; - case vlynq_ldiv1: - case vlynq_ldiv2: -@@ -528,15 +566,12 @@ static int __vlynq_enable_device(struct - case vlynq_ldiv6: - case vlynq_ldiv7: - case vlynq_ldiv8: -- writel(VLYNQ_CTRL_CLOCK_INT | -- VLYNQ_CTRL_CLOCK_DIV(dev->divisor - -- vlynq_ldiv1), &dev->local->control); -- writel(0, &dev->remote->control); -- if (vlynq_linked(dev)) { -- printk(KERN_DEBUG -- "%s: using local clock divisor %d\n", -- dev_name(&dev->dev), -- dev->divisor - vlynq_ldiv1 + 1); -+ if (!__vlynq_set_clocks(dev, vlynq_clk_local, dev->divisor - -+ vlynq_ldiv1, 0)) { -+ printk(KERN_INFO -+ "%s: using local clock divisor %d\n", -+ dev_name(&dev->dev), -+ dev->divisor - vlynq_ldiv1 + 1); - return 0; - } - break; -@@ -548,20 +583,17 @@ static int __vlynq_enable_device(struct - case vlynq_rdiv6: - case vlynq_rdiv7: - case vlynq_rdiv8: -- writel(0, &dev->local->control); -- writel(VLYNQ_CTRL_CLOCK_INT | -- VLYNQ_CTRL_CLOCK_DIV(dev->divisor - -- vlynq_rdiv1), &dev->remote->control); -- if (vlynq_linked(dev)) { -- printk(KERN_DEBUG -- "%s: using remote clock divisor %d\n", -- dev_name(&dev->dev), -- dev->divisor - vlynq_rdiv1 + 1); -+ if (!__vlynq_set_clocks(dev, vlynq_clk_remote, 0, -+ dev->divisor - vlynq_rdiv1)) { -+ printk(KERN_INFO -+ "%s: using remote clock divisor %d\n", -+ dev_name(&dev->dev), -+ dev->divisor - vlynq_rdiv1 + 1); - return 0; - } - break; - } -- -+ vlynq_reset(dev); - ops->off(dev); - return -ENODEV; - } -@@ -732,14 +764,14 @@ static int vlynq_probe(struct platform_d - platform_set_drvdata(pdev, dev); - - printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n", -- dev_name(&dev->dev), (void *)dev->regs_start, dev->irq, -- (void *)dev->mem_start); -+ dev_name(&dev->dev), (void *)dev->regs_start, -+ dev->irq, (void *)dev->mem_start); - - dev->dev_id = 0; - dev->divisor = vlynq_div_auto; -- result = __vlynq_enable_device(dev); -- if (result == 0) { -+ if (!__vlynq_enable_device(dev)) { - dev->dev_id = readl(&dev->remote->chip); -+ vlynq_reset(dev); - ((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev); - } - if (dev->dev_id) diff --git a/target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch b/target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch deleted file mode 100644 index 7cc3ada818..0000000000 --- a/target/linux/ar7/patches-4.14/200-free-mem-below-kernel-offset.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/arch/mips/ar7/memory.c -+++ b/arch/mips/ar7/memory.c -@@ -65,5 +65,11 @@ void __init prom_meminit(void) - - void __init prom_free_prom_memory(void) - { -- /* Nothing to free */ -+ /* adapted from arch/mips/txx9/generic/setup.c */ -+ unsigned long saddr = PHYS_OFFSET + PAGE_SIZE; -+ unsigned long eaddr = __pa_symbol(&_text); -+ -+ /* free memory between prom-record and kernel _text base */ -+ if (saddr < eaddr) -+ free_init_pages("prom memory", saddr, eaddr); - } diff --git a/target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch b/target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch deleted file mode 100644 index 71cd471a71..0000000000 --- a/target/linux/ar7/patches-4.14/300-add-ac49x-platform.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/arch/mips/ar7/Platform -+++ b/arch/mips/ar7/Platform -@@ -3,4 +3,9 @@ - # - platform-$(CONFIG_AR7) += ar7/ - cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 --load-$(CONFIG_AR7) += 0xffffffff94100000 -+load-$(CONFIG_AR7_TI) += 0xffffffff94100000 -+ -+# -+# AudioCodes AC49x -+# -+load-$(CONFIG_AR7_AC49X) += 0xffffffff945ca000 ---- a/arch/mips/ar7/setup.c -+++ b/arch/mips/ar7/setup.c -@@ -68,6 +68,10 @@ const char *get_system_type(void) - return "TI AR7 (TNETV1056)"; - case TITAN_CHIP_1060: - return "TI AR7 (TNETV1060)"; -+ case TITAN_CHIP_AC495: -+ return "AudioCodes AC495"; -+ case TITAN_CHIP_AC496: -+ return "AudioCodes AC496"; - } - default: - return "TI AR7 (unknown)"; ---- a/arch/mips/include/asm/mach-ar7/ar7.h -+++ b/arch/mips/include/asm/mach-ar7/ar7.h -@@ -92,6 +92,8 @@ - #define TITAN_CHIP_1055 0x0e - #define TITAN_CHIP_1056 0x0d - #define TITAN_CHIP_1060 0x07 -+#define TITAN_CHIP_AC495 0x00 -+#define TITAN_CHIP_AC496 0x02 - - /* Interrupts */ - #define AR7_IRQ_UART0 15 ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -168,7 +168,7 @@ config AR7 - select HAVE_CLK - help - Support for the Texas Instruments AR7 System-on-a-Chip -- family: TNETD7100, 7200 and 7300. -+ family: TI TNETD7100, 7200, 7300 and AudioCodes AC49x. - - config ATH25 - bool "Atheros AR231x/AR531x SoC support" -@@ -1016,6 +1016,7 @@ config MIPS_PARAVIRT - endchoice - - source "arch/mips/alchemy/Kconfig" -+source "arch/mips/ar7/Kconfig" - source "arch/mips/ath25/Kconfig" - source "arch/mips/ath79/Kconfig" - source "arch/mips/bcm47xx/Kconfig" ---- /dev/null -+++ b/arch/mips/ar7/Kconfig -@@ -0,0 +1,26 @@ -+if AR7 -+ -+config AR7_TI -+ bool -+ -+config AR7_AC49X -+ bool -+ -+choice -+ prompt "AR7 SoC family selection" -+ default AR7_TYPE_TI -+ depends on AR7 -+ help -+ Select AR7 MIPS SoC implementation. -+ -+ config AR7_TYPE_TI -+ bool "Texas Instruments AR7" -+ select AR7_TI -+ -+ config AR7_TYPE_AC49X -+ bool "AudioCodes AC49X" -+ select AR7_AC49X -+ -+endchoice -+ -+endif diff --git a/target/linux/ar7/patches-4.14/310-ac49x-prom-support.patch b/target/linux/ar7/patches-4.14/310-ac49x-prom-support.patch deleted file mode 100644 index dddf22106a..0000000000 --- a/target/linux/ar7/patches-4.14/310-ac49x-prom-support.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/arch/mips/ar7/prom.c -+++ b/arch/mips/ar7/prom.c -@@ -70,6 +70,7 @@ struct psbl_rec { - }; - - static const char psp_env_version[] __initconst = "TIENV0.8"; -+static const char psp_env_version_ac49x[] __initconst = "MaxENV0.2"; - - struct psp_env_chunk { - u8 num; -@@ -186,7 +187,8 @@ static void __init ar7_init_env(struct e - struct psbl_rec *psbl = (struct psbl_rec *)(KSEG1ADDR(0x14000300)); - void *psp_env = (void *)KSEG1ADDR(psbl->env_base); - -- if (strcmp(psp_env, psp_env_version) == 0) { -+ if (strcmp(psp_env, psp_env_version) == 0 || -+ strcmp(psp_env, psp_env_version_ac49x) == 0) { - parse_psp_env(psp_env); - } else { - for (i = 0; i < MAX_ENTRY; i++, env++) diff --git a/target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch b/target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch deleted file mode 100644 index 7ae49b07e8..0000000000 --- a/target/linux/ar7/patches-4.14/320-ac49x-mtd-partitions.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -154,6 +154,11 @@ config MTD_OF_PARTS - the partition map from the children of the flash node, - as described in Documentation/devicetree/bindings/mtd/partition.txt. - -+config MTD_AC49X_PARTS -+ tristate "AudioCodes AC49X partitioning support" -+ ---help--- -+ AudioCodes AC49X partitioning support -+ - config MTD_AR7_PARTS - tristate "TI AR7 partitioning support" - ---help--- ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_SPLIT) += mtdsplit/ - obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o - obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o - obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o -+obj-$(CONFIG_MTD_AC49X_PARTS) += ac49xpart.o - obj-$(CONFIG_MTD_AFS_PARTS) += afs.o - obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o titanpart.o - obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o ---- a/arch/mips/ar7/platform.c -+++ b/arch/mips/ar7/platform.c -@@ -200,7 +200,7 @@ static struct resource physmap_flash_res - .end = 0x11ffffff, - }; - --static const char *ar7_probe_types[] = { "ar7part", NULL }; -+static const char *ar7_probe_types[] = { "ac49xpart", "ar7part", NULL }; - - static struct physmap_flash_data physmap_flash_data = { - .width = 2, diff --git a/target/linux/ar7/patches-4.14/920-ar7part.patch b/target/linux/ar7/patches-4.14/920-ar7part.patch deleted file mode 100644 index e520af2083..0000000000 --- a/target/linux/ar7/patches-4.14/920-ar7part.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- a/drivers/mtd/ar7part.c -+++ b/drivers/mtd/ar7part.c -@@ -30,11 +30,14 @@ - - #include - -+#include -+ - #define AR7_PARTS 4 - #define ROOT_OFFSET 0xe0000 - - #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) - #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281) -+#define LOADER_MAGIC3 le32_to_cpu(0x434d4d4c) - - struct ar7_bin_rec { - unsigned int checksum; -@@ -42,12 +45,16 @@ struct ar7_bin_rec { - unsigned int address; - }; - -+int create_titan_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data); -+ - static int create_mtd_partitions(struct mtd_info *master, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) - { - struct ar7_bin_rec header; -- unsigned int offset; -+ unsigned int offset, mtd_start, mtd_end; - size_t len; - unsigned int pre_size = master->erasesize, post_size = 0; - unsigned int root_offset = ROOT_OFFSET; -@@ -55,6 +62,16 @@ static int create_mtd_partitions(struct - int retries = 10; - struct mtd_partition *ar7_parts; - -+ const char *prom_str = prom_getenv("ProductID"); -+ char mtd_name[] = "mtd1"; -+ if(prom_str && -+ (strcmp(prom_str, "CYWL")==0 || -+ strcmp(prom_str, "CYWM")==0 || -+ strcmp(prom_str, "CYLM")==0 || -+ strcmp(prom_str, "CYLL")==0)){ -+ return create_titan_partitions(master, pparts, data); -+ } -+ - ar7_parts = kzalloc(sizeof(*ar7_parts) * AR7_PARTS, GFP_KERNEL); - if (!ar7_parts) - return -ENOMEM; -@@ -83,34 +100,39 @@ static int create_mtd_partitions(struct - - pre_size = offset; - -- if (!ar7_parts[1].offset) { -- ar7_parts[1].offset = master->size - master->erasesize; -- post_size = master->erasesize; -- } -- - switch (header.checksum) { -- case LOADER_MAGIC1: -- while (header.length) { -- offset += sizeof(header) + header.length; -- mtd_read(master, offset, sizeof(header), &len, -- (uint8_t *)&header); -- } -- root_offset = offset + sizeof(header) + 4; -- break; - case LOADER_MAGIC2: -+ for (retries = 0; retries <= 9; retries++) { -+ mtd_name[3] = '0' + retries; -+ prom_str = prom_getenv(mtd_name); -+ if (prom_str == NULL) -+ continue; -+ sscanf(prom_str, "%i,%i", &mtd_start, &mtd_end); -+ if (pre_size == (mtd_start & 0x1ffffff)) { -+ ar7_parts[1].offset = mtd_end &= 0x1ffffff; -+ ar7_parts[1].size = post_size = master->size - mtd_end; -+ break; -+ } -+ } -+ case LOADER_MAGIC1: -+ root_offset = (header.checksum == LOADER_MAGIC1) ? 4 : 0; - while (header.length) { - offset += sizeof(header) + header.length; - mtd_read(master, offset, sizeof(header), &len, - (uint8_t *)&header); - } -- root_offset = offset + sizeof(header) + 4 + 0xff; -- root_offset &= ~(uint32_t)0xff; -+ root_offset += offset + sizeof(header); - break; - default: - printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum); - break; - } - -+ if (!ar7_parts[1].offset) { -+ post_size = master->erasesize; -+ ar7_parts[1].offset = master->size - post_size; -+ } -+ - mtd_read(master, root_offset, sizeof(header), &len, (u8 *)&header); - if (header.checksum != SQUASHFS_MAGIC) { - root_offset += master->erasesize - 1; ---- a/drivers/mtd/titanpart.c -+++ b/drivers/mtd/titanpart.c -@@ -148,8 +148,8 @@ static void titan_add_partition(char * e - - } - int create_titan_partitions(struct mtd_info *master, -- struct mtd_partition **pparts, -- unsigned long origin) -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) - { - struct nsp_img_hdr_head hdr; - struct nsp_img_hdr_section_info sect_info; diff --git a/target/linux/ar7/patches-4.14/925-actiontec_leds.patch b/target/linux/ar7/patches-4.14/925-actiontec_leds.patch deleted file mode 100644 index d37fa70f21..0000000000 --- a/target/linux/ar7/patches-4.14/925-actiontec_leds.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/arch/mips/ar7/platform.c -+++ b/arch/mips/ar7/platform.c -@@ -459,31 +459,22 @@ static struct gpio_led fb_fon_leds[] = { - }, - }; - --static struct gpio_led gt701_leds[] = { -+static struct gpio_led actiontec_leds[] = { - { - .name = "inet:green", - .gpio = 13, -- .active_low = 1, -- }, -- { -- .name = "usb", -- .gpio = 12, -- .active_low = 1, - }, - { - .name = "inet:red", - .gpio = 9, -- .active_low = 1, - }, - { -- .name = "power:red", -+ .name = "power:green", - .gpio = 7, -- .active_low = 1, - }, - { -- .name = "power:green", -+ .name = "power:red", - .gpio = 8, -- .active_low = 1, - .default_trigger = "default-on", - }, - { -@@ -491,6 +482,44 @@ static struct gpio_led gt701_leds[] = { - .gpio = 10, - .active_low = 1, - }, -+ { -+ .name = "wifi", -+ .gpio = 6, -+ .active_low = 1, -+ }, -+ { -+ .name = "wifi:red", -+ .gpio = 3, -+ }, -+ { -+ .name = "standby", -+ .gpio = 4, -+ }, -+ { -+ .name = "wps", -+ .gpio = 16, -+ .active_low = 1, -+ }, -+ { -+ .name = "usb", -+ .gpio = 12, -+ .active_low = 1, -+ }, -+ { -+ .name = "voip", -+ .gpio = 15, -+ .active_low = 1, -+ }, -+ { -+ .name = "line1", -+ .gpio = 23, -+ .active_low = 1, -+ }, -+ { -+ .name = "line2", -+ .gpio = 25, -+ .active_low = 1, -+ }, - }; - - static struct gpio_led_platform_data ar7_led_data; -@@ -534,9 +563,9 @@ static void __init detect_leds(void) - } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) { - ar7_led_data.num_leds = ARRAY_SIZE(titan_leds); - ar7_led_data.leds = titan_leds; -- } else if (strstr(prid, "GT701")) { -- ar7_led_data.num_leds = ARRAY_SIZE(gt701_leds); -- ar7_led_data.leds = gt701_leds; -+ } else if (strstr(prid, "GT7") || strstr(prid, "PK5000")) { -+ ar7_led_data.num_leds = ARRAY_SIZE(actiontec_leds); -+ ar7_led_data.leds = actiontec_leds; - } - } - diff --git a/target/linux/ar7/patches-4.14/950-cpmac_titan.patch b/target/linux/ar7/patches-4.14/950-cpmac_titan.patch deleted file mode 100644 index 66ed07970c..0000000000 --- a/target/linux/ar7/patches-4.14/950-cpmac_titan.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/drivers/net/ethernet/ti/cpmac.c -+++ b/drivers/net/ethernet/ti/cpmac.c -@@ -1123,6 +1123,8 @@ static int cpmac_probe(struct platform_d - goto fail; - } - -+ ar7_device_reset(pdata->reset_bit); -+ - dev->irq = platform_get_irq_byname(pdev, "irq"); - - dev->netdev_ops = &cpmac_netdev_ops; -@@ -1202,7 +1204,7 @@ int cpmac_init(void) - cpmac_mii->write = cpmac_mdio_write; - cpmac_mii->reset = cpmac_mdio_reset; - -- cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256); -+ cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256); - - if (!cpmac_mii->priv) { - pr_err("Can't ioremap mdio registers\n"); -@@ -1213,10 +1215,16 @@ int cpmac_init(void) - /* FIXME: unhardcode gpio&reset bits */ - ar7_gpio_disable(26); - ar7_gpio_disable(27); -- ar7_device_reset(AR7_RESET_BIT_CPMAC_LO); -- ar7_device_reset(AR7_RESET_BIT_CPMAC_HI); -+ -+ if (!ar7_is_titan()) { -+ ar7_device_reset(AR7_RESET_BIT_CPMAC_LO); -+ ar7_device_reset(AR7_RESET_BIT_CPMAC_HI); -+ } - ar7_device_reset(AR7_RESET_BIT_EPHY); - -+ if (ar7_is_titan()) -+ ar7_device_reset(TITAN_RESET_BIT_EPHY1); -+ - cpmac_mii->reset(cpmac_mii); - - for (i = 0; i < 300; i++) { -@@ -1233,7 +1241,11 @@ int cpmac_init(void) - mask = 0; - } - -- cpmac_mii->phy_mask = ~(mask | 0x80000000); -+ if (ar7_is_titan()) -+ cpmac_mii->phy_mask = ~(mask | 0x80000000 | 0x40000000); -+ else -+ cpmac_mii->phy_mask = ~(mask | 0x80000000); -+ - snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "cpmac-1"); - - res = mdiobus_register(cpmac_mii); diff --git a/target/linux/ar7/src/adam2patcher.c b/target/linux/ar7/src/adam2patcher.c deleted file mode 100644 index 25a78074a6..0000000000 --- a/target/linux/ar7/src/adam2patcher.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * patcher.c - ADAM2 patcher for Netgear DG834 (and compatible) - * - * Copyright (C) 2006 Felix Fietkau - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -int main(int argc, char **argv) -{ - int fd; - char *ptr; - uint32_t *i; - - if (argc != 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); - exit(1); - } - - if (((fd = open(argv[1], O_RDWR)) < 0) - || ((ptr = mmap(0, 128 * 1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1))) { - fprintf(stderr, "Can't open file\n"); - exit(1); - } - - i = (uint32_t *) &ptr[0x3944]; - if (*i == 0x0c000944) { - fprintf(stderr, "Unpatched ADAM2 detected. Patching... "); - *i = 0x00000000; - msync(i, sizeof(*i), MS_SYNC|MS_INVALIDATE); - fprintf(stderr, "done!\n"); - } else if (*i == 0x00000000) { - fprintf(stderr, "Patched ADAM2 detected.\n"); - } else { - fprintf(stderr, "Unknown ADAM2 detected. Can't patch!\n"); - } - - close(fd); -} From 89f2deb372b74f9d4bb030c31b4ec28d579ee41f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 14:06:30 +0100 Subject: [PATCH 270/480] orion: remove unmaintained target This target seems to have been unmaintained for quite a while, and not a single tester for the (now outdated) kernel 4.14 patches has been found. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Adrian Schmutzler --- target/linux/orion/Makefile | 24 - .../orion/base-files/etc/board.d/02_network | 15 - .../orion/base-files/etc/hotplug.d/usb/10-usb | 54 -- .../orion/base-files/lib/preinit/01_sysinfo | 12 - target/linux/orion/config-4.14 | 274 --------- .../base-files/etc/uci-defaults/09_hardware | 54 -- .../base-files/lib/upgrade/platform.sh | 38 -- target/linux/orion/generic/target.mk | 14 - target/linux/orion/harddisk/config-default | 42 -- target/linux/orion/harddisk/target.mk | 15 - target/linux/orion/image/Makefile | 12 - target/linux/orion/image/generic.mk | 237 -------- target/linux/orion/image/harddisk.mk | 57 -- .../000-arm_openwrt_machtypes.patch | 18 - .../100-wrt350nv2_openwrt_partition_map.patch | 32 - .../101-wnr854t_partition_map.patch | 25 - .../patches-4.14/200-dt2_board_support.patch | 557 ------------------ .../patches-4.14/210-wn802t_support.patch | 72 --- 18 files changed, 1552 deletions(-) delete mode 100644 target/linux/orion/Makefile delete mode 100755 target/linux/orion/base-files/etc/board.d/02_network delete mode 100644 target/linux/orion/base-files/etc/hotplug.d/usb/10-usb delete mode 100644 target/linux/orion/base-files/lib/preinit/01_sysinfo delete mode 100644 target/linux/orion/config-4.14 delete mode 100644 target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware delete mode 100644 target/linux/orion/generic/base-files/lib/upgrade/platform.sh delete mode 100644 target/linux/orion/generic/target.mk delete mode 100644 target/linux/orion/harddisk/config-default delete mode 100644 target/linux/orion/harddisk/target.mk delete mode 100644 target/linux/orion/image/Makefile delete mode 100644 target/linux/orion/image/generic.mk delete mode 100644 target/linux/orion/image/harddisk.mk delete mode 100644 target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch delete mode 100644 target/linux/orion/patches-4.14/100-wrt350nv2_openwrt_partition_map.patch delete mode 100644 target/linux/orion/patches-4.14/101-wnr854t_partition_map.patch delete mode 100644 target/linux/orion/patches-4.14/200-dt2_board_support.patch delete mode 100644 target/linux/orion/patches-4.14/210-wn802t_support.patch diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile deleted file mode 100644 index 170f0ddb40..0000000000 --- a/target/linux/orion/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2008-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -ARCH:=arm -BOARD:=orion -BOARDNAME:=Marvell Orion -FEATURES:=broken rtc -SUBTARGETS:=generic harddisk -MAINTAINER:=Imre Kaloz - -KERNEL_PATCHVER:=4.14 - -include $(INCLUDE_DIR)/target.mk - -KERNELNAME:=zImage - -DEFAULT_PACKAGES += kmod-ath9k wpad-basic kmod-rtc-isl1208 uboot-envtools - -$(eval $(call BuildTarget)) diff --git a/target/linux/orion/base-files/etc/board.d/02_network b/target/linux/orion/base-files/etc/board.d/02_network deleted file mode 100755 index ab74bf3713..0000000000 --- a/target/linux/orion/base-files/etc/board.d/02_network +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -. /lib/functions/uci-defaults.sh - -board_config_update - -if grep -q lan1 /proc/net/dev; then - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan" -else - ucidef_set_interface_lan "eth0" -fi - -board_config_flush - -exit 0 diff --git a/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb b/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb deleted file mode 100644 index 2ae0f73bdc..0000000000 --- a/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -usb_led='' -usb_device='' - -led_set_attr() { - [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2" -} - -usb_led_set_timer() { - led_set_attr "${usb_led}" 'trigger' 'timer' - led_set_attr "${usb_led}" 'delay_on' "$1" - led_set_attr "${usb_led}" 'delay_off' "$2" -} - -usb_led_on() { - led_set_attr "${usb_led}" 'trigger' 'none' - led_set_attr "${usb_led}" 'brightness' 255 -} - -usb_led_off() { - led_set_attr "${usb_led}" 'trigger' 'none' - led_set_attr "${usb_led}" 'brightness' 0 -} - -get_usb_led() { - . /lib/functions.sh - - case "$(board_name)" in - 'Linksys WRT350N v2') - usb_led='wrt350nv2:green:usb' - usb_device='1-1:1.0' - ;; - esac; -} - -get_usb_led - -case "${ACTION}" in - add) - # update LEDs - [ "${usb_device}" = "${DEVICENAME}" ] && usb_led_on - ;; - remove) - # update LEDs - [ "${usb_device}" = "${DEVICENAME}" ] && usb_led_off - ;; -esac diff --git a/target/linux/orion/base-files/lib/preinit/01_sysinfo b/target/linux/orion/base-files/lib/preinit/01_sysinfo deleted file mode 100644 index 1ef07d774f..0000000000 --- a/target/linux/orion/base-files/lib/preinit/01_sysinfo +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -do_sysinfo_orion() { - local name="$(sed -n /Hardware/s/.*:.//p /proc/cpuinfo)" - [ -z "$name" ] && name="unknown" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - echo "$name" > /tmp/sysinfo/board_name - echo "unknown" > /tmp/sysinfo/model -} - -boot_hook_add preinit_main do_sysinfo_orion diff --git a/target/linux/orion/config-4.14 b/target/linux/orion/config-4.14 deleted file mode 100644 index 63a6700642..0000000000 --- a/target/linux/orion/config-4.14 +++ /dev/null @@ -1,274 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_CPU_AUTO=y -# CONFIG_ARCH_MULTI_V4 is not set -# CONFIG_ARCH_MULTI_V4T is not set -CONFIG_ARCH_MULTI_V4_V5=y -CONFIG_ARCH_MULTI_V5=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set -CONFIG_ARCH_ORION5X=y -# CONFIG_ARCH_ORION5X_DT is not set -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_THUMB is not set -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y -CONFIG_ATAGS=y -CONFIG_AUTO_ZRELADDR=y -CONFIG_BLK_MQ_PCI=y -# CONFIG_CACHE_L2X0 is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKSRC_MMIO=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 earlyprintk" -CONFIG_CMDLINE_FORCE=y -CONFIG_COMMON_CLK=y -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_FEROCEON=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_FEROCEON=y -CONFIG_CPU_FEROCEON_OLD_ID=y -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_THUMB_CAPABLE=y -CONFIG_CPU_TLB_FEROCEON=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_DEV_MARVELL_CESA=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_DEBUG_LL=y -CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" -CONFIG_DEBUG_LL_UART_8250=y -# CONFIG_DEBUG_MVEBU_UART0_ALTERNATE is not set -# CONFIG_DEBUG_UART_8250 is not set -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set -CONFIG_DEBUG_UART_8250_SHIFT=2 -# CONFIG_DEBUG_UART_8250_WORD is not set -CONFIG_DEBUG_UART_PHYS=0xf1012000 -CONFIG_DEBUG_UART_VIRT=0xfe012000 -CONFIG_DEBUG_UNCOMPRESS=y -# CONFIG_DEBUG_USER is not set -CONFIG_DMADEVICES=y -CONFIG_DMA_ENGINE=y -CONFIG_DMA_ENGINE_RAID=y -CONFIG_DMA_OF=y -CONFIG_DNOTIFY=y -CONFIG_DTC=y -CONFIG_EARLY_PRINTK=y -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_FIXED_PHY=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_MVEBU=y -CONFIG_GPIO_SYSFS=y -# CONFIG_GRO_CELLS is not set -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_EBPF_JIT=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HZ_FIXED=0 -CONFIG_HZ_PERIODIC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -# CONFIG_INITRAMFS_FORCE is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_IOMMU_HELPER=y -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -CONFIG_LEDS_GPIO=y -CONFIG_LIBFDT=y -# CONFIG_MACH_D2NET_DT is not set -# CONFIG_MACH_DB88F5281 is not set -# CONFIG_MACH_DNS323 is not set -# CONFIG_MACH_DT2 is not set -# CONFIG_MACH_KUROBOX_PRO is not set -# CONFIG_MACH_LINKSTATION_LS_HGL is not set -# CONFIG_MACH_LINKSTATION_MINI is not set -# CONFIG_MACH_LINKSTATION_PRO is not set -# CONFIG_MACH_MSS2_DT is not set -# CONFIG_MACH_MV2120 is not set -# CONFIG_MACH_NET2BIG is not set -# CONFIG_MACH_RD88F5181L_FXO is not set -# CONFIG_MACH_RD88F5181L_GE is not set -# CONFIG_MACH_RD88F5182 is not set -# CONFIG_MACH_RD88F5182_DT is not set -# CONFIG_MACH_RD88F6183AP_GE is not set -CONFIG_MACH_TERASTATION_PRO2=y -# CONFIG_MACH_TS209 is not set -# CONFIG_MACH_TS409 is not set -# CONFIG_MACH_TS78XX is not set -CONFIG_MACH_WN802T=y -CONFIG_MACH_WNR854T=y -CONFIG_MACH_WRT350N_V2=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_DEVICE=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_MIGRATION=y -CONFIG_MMC=y -CONFIG_MMC_MVSDIO=y -# CONFIG_MMC_TIFM_SD is not set -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_MV643XX_ETH=y -CONFIG_MVEBU_MBUS=y -CONFIG_MVMDIO=y -CONFIG_MV_XOR=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_PER_CPU_KM=y -# CONFIG_NET_VENDOR_AURORA is not set -CONFIG_NO_BOOTMEM=y -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_ADDRESS_PCI=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_ORION_WATCHDOG=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DOMAINS_GENERIC=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -CONFIG_PLAT_ORION=y -CONFIG_PLAT_ORION_LEGACY=y -CONFIG_RATIONAL=y -# CONFIG_RCU_EXPERT is not set -# CONFIG_RCU_NEED_SEGCBLIST is not set -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_MMIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set -CONFIG_SERIAL_8250_FSL=y -CONFIG_SPARSE_IRQ=y -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SRAM=y -CONFIG_SRAM_EXEC=y -CONFIG_SRCU=y -CONFIG_SWIOTLB=y -CONFIG_SWPHY=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_TINY_SRCU=y -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_USB_SUPPORT=y -CONFIG_USE_OF=y -CONFIG_VECTORS_BASE=0xffff0000 -# CONFIG_VFP is not set -CONFIG_WATCHDOG_CORE=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware deleted file mode 100644 index 5d928b092a..0000000000 --- a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -# -# This script sets system defaults for the hardware on firstboot -# - -. /lib/functions.sh - -wrt350nv2_default() { -# leds - uci batch <<__EOF -set system.power_led=led -set system.power_led.name='Power LED (green)' -set system.power_led.sysfs='wrt350nv2:green:power' -set system.power_led.default='1' -set system.wifi_led=led -set system.wifi_led.name='Wireless LED (green)' -set system.wifi_led.sysfs='wrt350nv2:green:wireless' -set system.wifi_led.trigger='netdev' -set system.wifi_led.dev='wlan0' -set system.wifi_led.mode='link tx rx' -set system.wifi_led.default='0' -commit system -__EOF - -# add mac address from U-Boot partition to lan and wan devices - MTD=$(grep -e 'u-boot' /proc/mtd) - MTD=$(echo ${MTD} | sed 's/[a-z]*\([0-9]*\):.*/\1/') - [ -n "${MTD}" ] && { - MACADDR=$(dd if=/dev/mtdblock${MTD} bs=1 skip=262048 count=6 2>/dev/null | hexdump -e '1/1 "%02x"') - MACADDR2=$(( 0x${MACADDR} + 1)) - MACADDR2=$(printf "%012x" ${MACADDR2}) - - MACADDR=$(echo ${MACADDR} | sed 's/\(..\)/\1:/g' | sed 's/:$//') - MACADDR2=$(echo ${MACADDR2} | sed 's/\(..\)/\1:/g' | sed 's/:$//') - - uci set network.eth0.macaddr=${MACADDR} - uci set network.lan.macaddr=${MACADDR} - uci set network.wan.macaddr=${MACADDR2} - uci commit network - } -} - -case "$(board_name)" in - 'Linksys WRT350N v2') - wrt350nv2_default - ;; -esac diff --git a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh deleted file mode 100644 index cf1fad83a8..0000000000 --- a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org -# - -# use default "image" for PART_NAME -# use default for platform_do_upgrade() - -platform_check_image() { - [ "$#" -gt 1 ] && { echo 'Too many arguments. Only flash file expected.'; return 1; } - - local hardware="$(board_name)" - local magic="$(get_magic_word "$1")" - local magic_long="$(get_magic_long "$1")" - - case "${hardware}" in - # hardware with a direct uImage partition - # image header format as described in U-Boot's include/image.h - # see http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/image.h - 'Linksys WRT350N v2') - [ "${magic_long}" != '27051956' ] && { - echo "Invalid image type ${magic_long}." - return 1 - } - return 0 - ;; - # Netgear WNR854T (has uImage as file inside a JFFS2 partition) - 'Netgear WNR854T') - [ "${magic}" != '8519' ] && { - echo "Invalid image type ${magic}." - return 1 - } - return 0 - ;; - esac - - echo "Sysupgrade is not yet supported on ${hardware}." - return 1 -} diff --git a/target/linux/orion/generic/target.mk b/target/linux/orion/generic/target.mk deleted file mode 100644 index 7b054edd6b..0000000000 --- a/target/linux/orion/generic/target.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -BOARDNAME:=Generic -FEATURES+=squashfs - -define Target/Description - Build firmware images for Marvell Orion based boards that boot from internal flash. - (e.g.: Linksys WRT350N v2, Netgear WNR854T, ...) -endef diff --git a/target/linux/orion/harddisk/config-default b/target/linux/orion/harddisk/config-default deleted file mode 100644 index c25cb6265d..0000000000 --- a/target/linux/orion/harddisk/config-default +++ /dev/null @@ -1,42 +0,0 @@ -CONFIG_ATA=y -CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_MD=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_CRC16=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_DAX=y -# CONFIG_DM_CRYPT is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_SNAPSHOT is not set -CONFIG_EXT4_FS=y -CONFIG_FS_MBCACHE=y -CONFIG_GENERIC_PHY=y -CONFIG_GLOB=y -CONFIG_HWMON=y -CONFIG_JBD2=y -CONFIG_MACH_DT2=y -CONFIG_MACH_NET2BIG=y -# CONFIG_MACH_WN802T is not set -# CONFIG_MACH_WNR854T is not set -# CONFIG_MACH_WRT350N_V2 is not set -CONFIG_MD=y -CONFIG_MD_AUTODETECT=y -CONFIG_MD_LINEAR=y -# CONFIG_MD_MULTIPATH is not set -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -# CONFIG_MD_RAID10 is not set -# CONFIG_MD_RAID456 is not set -CONFIG_NLS=y -CONFIG_SATA_MV=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SG_POOL=y -CONFIG_USB=y -CONFIG_USB_COMMON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_ORION=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_STORAGE=y diff --git a/target/linux/orion/harddisk/target.mk b/target/linux/orion/harddisk/target.mk deleted file mode 100644 index 6096e69709..0000000000 --- a/target/linux/orion/harddisk/target.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -BOARDNAME:=Internal Hard-Disk -FEATURES+=targz -DEVICE_TYPE:=nas - -define Target/Description - Build firmware images for Marvell Orion based boards that boot directly from internal disk storage. - (e.g.: Freecom DataTank 2, ...) -endef diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile deleted file mode 100644 index 058519f720..0000000000 --- a/target/linux/orion/image/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2008-2010 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)/image.mk - -include $(SUBTARGET).mk - -$(eval $(call BuildImage)) diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk deleted file mode 100644 index 595f8c1f79..0000000000 --- a/target/linux/orion/image/generic.mk +++ /dev/null @@ -1,237 +0,0 @@ -# -# Copyright (C) 2008-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -### DO NOT INDENT LINES CONTAINING $(call xyz) AS THIS MAY CHANGE THE CONTEXT -### OF THE FIRST LINE IN THE CALLED VARIABLE (NOTE: variable!) -### see http://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function -### ACTUALLY IT IS A SIMPLE MACRO EXPANSION - -### use round brackets for make variables, and curly brackets for shell variables - - -## Kernel mtd partition size in KiB -KERNEL_MTD_SIZE:=1280 - -# Netgear WNR854T: erase size is 128KiB = 0x00020000 = 131072 -ERASE_SIZE_128K:=128 - -# Linksys WRT350N v2: erase size is 64KiB = 0x00010000 = 65536 -ERASE_SIZE_64K:=64 - -# define JFFS2 sizes for include/image.mk -JFFS2_BLOCKSIZE:=64k 128k - - -### -### Image/BuildKernel -### - -define Image/BuildKernel -### Dummy comment for indented calls of Image/BuildKernel - - ## Netgear WN802T: mach id 3306 (0x0cea) -$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3") -$(call Image/BuildKernel/ARM/uImage,wn802t) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) -$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3",-initramfs) -$(call Image/BuildKernel/ARM/uImage,wn802t,-initramfs) -endif - ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build -$(call Image/BuildKernel/JFFS2uImage,wn802t,$(ERASE_SIZE_64K),uImage) -$(call Image/Default/FileSizeCheck,$(KDIR)/wn802t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) - endif - - ## Netgear WNR854T: mach id 1801 (0x0709) -$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3") -$(call Image/BuildKernel/ARM/uImage,wnr854t) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) -$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3",-initramfs) -$(call Image/BuildKernel/ARM/uImage,wnr854t,-initramfs) -endif - ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build -$(call Image/BuildKernel/JFFS2uImage,wnr854t,$(ERASE_SIZE_128K),uImage) -$(call Image/Default/FileSizeCheck,$(KDIR)/wnr854t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) - endif - - ## Linksys WRT350N v2: mach id 1633 (0x0661) -$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3") -$(call Image/BuildKernel/ARM/uImage,wrt350nv2) -ifeq ($($CONFIG_TARGET_ROOTFS_INITRAMFS),y) -$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3",-initramfs) -$(call Image/BuildKernel/ARM/uImage,wrt350nv2-initramfs) -endif - ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build -$(call Image/Default/FileSizeCheck,$(KDIR)/wrt350nv2-uImage,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) - endif - - ## Buffalo Terastation Pro II/Live: mach id 1584 (0x0630) -$(call Image/BuildKernel/ARM/zImage,terastation-pro2,"\x06\x1c\xa0\xe3\x30\x10\x81\xe3") -$(call Image/BuildKernel/ARM/uImage,terastation-pro2) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) -$(call Image/BuildKernel/ARM/zImage,terastation-pro2,"\x06\x1c\xa0\xe3\x30\x10\x81\xe3",-initramfs) -$(call Image/BuildKernel/ARM/uImage,terastation-pro2,-initramfs) -endif -endef - -define Image/BuildKernel/ARM/zImage - # merge machine id and regular zImage into one file - # parameters: 1 = machine name, 2 = machine id as string in quotes - # $(BOARD) kernel zImage for $(1) - echo -en $(2) > '$(KDIR)/$(1)-zImage$(3)' - cat '$(KDIR)/zImage$(3)' >> '$(KDIR)/$(1)-zImage$(3)' -endef - -define Image/BuildKernel/ARM/uImage - # create uImage from zImage - # parameters: 1 = machine name - # $(BOARD) kernel uImage for $(1) - '$(STAGING_DIR_HOST)/bin/mkimage' -A arm -O linux -T kernel \ - -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \ - -d '$(KDIR)/$(1)-zImage$(2)' '$(KDIR)/$(1)-uImage$(2)' - ifeq ($(2),-initramfs) # only copy uImage for ramdisk build - cp '$(KDIR)/$(1)-uImage-initramfs' '$(BIN_DIR)/openwrt-$(1)-uImage-initramfs' - endif -endef - -define Image/BuildKernel/JFFS2uImage - # create JFFS2 partition with uImage file (result is already padded to erase size) - # parameters: 1 = machine name, 2 = erase size in KiB, 3 = uImage file name - # $(BOARD) kernel uImage for $(1) in JFFS2-$(2)k partition - rm -rf '$(TMP_DIR)/$(1)_jffs2_uimage' - mkdir '$(TMP_DIR)/$(1)_jffs2_uimage' - cp '$(KDIR)/$(1)-uImage' '$(TMP_DIR)/$(1)_jffs2_uimage/$(3)' - $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --compression-mode=none --pad --little-endian --squash -e $(2)KiB -o '$(KDIR)/$(1)-uImage.jffs2' -d '$(TMP_DIR)/$(1)_jffs2_uimage' - rm -rf '$(TMP_DIR)/$(1)_jffs2_uimage' -endef - -define Image/Default/FileSizeCheck - # parameters: 1 = file path, 2 = maximum size in bytes - [ $(stat -c %s '$(1)') -le $(2) ] || { echo ' ERROR: $(1) too big (> $(2) bytes)'; rm -f $(1); } -endef - - -### -### Image/Build -### - -define Image/Build -### Dummy comment for indented calls of Image/Build with $(1) - - ## Prepare rootfs -$(call Image/Build/$(1),$(1)) - - ## Netgear WN802T -$(call Image/Build/Default,$(1),wn802t,$(ERASE_SIZE_64K),$(KERNEL_MTD_SIZE),.jffs2,NG_WN802T) - - ## Netgear WNR854T -$(call Image/Build/Default,$(1),wnr854t,$(ERASE_SIZE_128K),$(KERNEL_MTD_SIZE),.jffs2,NG_WNR854T) - - ## Linksys WRT350N v2 -$(call Image/Build/Linksys/wrt350nv2,$(1),wrt350nv2,$(ERASE_SIZE_64K),$(KERNEL_MTD_SIZE),) - - ## Buffalo Terastation Pro II/Live -$(call Image/Build/Default,$(1),terastation-pro2,$(ERASE_SIZE_128K),$(KERNEL_MTD_SIZE),.jffs2,TERASTATION_PRO2) -endef - -define Image/Build/squashfs -$(call prepare_generic_squashfs,$(KDIR)/root.squashfs) -endef - -## generate defines for all JFFS2 block sizes -define Image/Build/jffs2/sub - $(eval define Image/Build/jffs2-$(1) - cp '$$(KDIR)/root.jffs2-$(1)' '$$(BIN_DIR)/$$(IMG_PREFIX)-root.jffs2-$(1)' - endef) -endef - -$(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/Build/jffs2/sub,$(SZ))) - -define Image/Build/Default - # parameters: 1 = rootfs type, 2 = machine name, 3 = erase size in KiB, 4 = kernel mtd size in KiB, 5 = kernel file suffix, 6 = header - ifeq ($(findstring jffs2-,$(1)),jffs2-) # JFFS2: build only image fitting to erase size - ifeq ($(1),jffs2-$(3)k) -$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) -$(call Image/Build/Default/factory,$(1),$(2),$(6)) - endif - else - ifeq ($(1),ext4) # EXT4: ignore - # do nothing - else # do all other images -$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) -$(call Image/Build/Default/factory,$(1),$(2),$(6)) - endif - endif -endef - -define Image/Build/Default/sysupgrade - # parameters: 1 = rootfs type, 2 = machine name, 3 = pad size in KiB (kernel mtd size or erase size), 4 = kernel file suffix - # $(BOARD) $(1) sysupgrade image for $(2) - ( \ - dd if='$(KDIR)/$(2)-uImage$(4)' bs=$(3)k conv=sync; \ - dd if='$(KDIR)/root.$(1)'; \ - ) > '$(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' -endef - -define Image/Build/Default/factory - # parameters: 1 = rootfs type, 2 = machine name, 3 = header - # $(BOARD) $(1) factory upgrade image for $(2) - '$(STAGING_DIR_HOST)/bin/add_header' $(3) '$(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img' -endef - -## -## Image/Build/Linksys -## - -define Image/Build/Linksys/wrt350nv2 - # parameters: 1 = rootfs type, 2 = machine name, 3 = erase size in KiB, 4 = kernel mtd size in KiB, 5 = kernel file suffix - ifeq ($(findstring jffs2-,$(1)),jffs2-) # JFFS2: build only image fitting to erase size - ifeq ($(1),jffs2-$(3)k) -$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) -$(call Image/Build/Linksys/wrt350nv2-builder,$(1),$(2)) - endif - else - ifeq ($(1),ext4) # EXT4: ignore - # do nothing - else # do all other images -$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) -$(call Image/Build/Linksys/wrt350nv2-builder,$(1),$(2)) - endif - endif -endef - -define Image/Build/Linksys/wrt350nv2-builder - # parameters: 1 = rootfs type, 2 = machine name - # $(BOARD) $(1) factory and recovery image for $(2) via wrt350nv2-builder - rm -rf '$(TMP_DIR)/$(2)_factory' - mkdir '$(TMP_DIR)/$(2)_factory' - # create parameter file - echo ':image 0 $(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' > '$(TMP_DIR)/$(2)_factory/$(2).par' - [ ! -f '$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin' ] || ( \ - echo ':u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin' >> '$(TMP_DIR)/$(2)_factory/$(2).par'; \ - ) - echo '#version 0x2020' >> '$(TMP_DIR)/$(2)_factory/$(2).par' - # create bin file for recovery and factory image - -( \ - cd '$(TMP_DIR)/$(2)_factory'; \ - '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -b '$(TMP_DIR)/$(2)_factory/$(2).par'; \ - ) && $(CP) '$(TMP_DIR)/$(2)_factory/wrt350n.bin' '$(BIN_DIR)/openwrt-$(2)-$(1)-recovery.bin' && \ - ( \ - cd '$(TMP_DIR)/$(2)_factory'; \ - zip 'wrt350n.zip' 'wrt350n.bin'; \ - ) && '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -z '$(TMP_DIR)/$(2)_factory/wrt350n.zip' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img' - rm -rf '$(TMP_DIR)/$(2)_factory' -endef - - -### -### Image/PreReq -### - -## Dependency for WRT350N v2 factory image -$(eval $(call RequireCommand,zip, \ - Please install zip. \ -)) diff --git a/target/linux/orion/image/harddisk.mk b/target/linux/orion/image/harddisk.mk deleted file mode 100644 index fb2f351b7f..0000000000 --- a/target/linux/orion/image/harddisk.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Image/BuildKernelMachId - echo -en "\x$(2)\x1c\xa0\xe3\x$(3)\x10\x81\xe3" > $(KDIR)/$(1)-zImage - cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/$(1)-zImage - $(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \ - -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \ - -d $(KDIR)/$(1)-zImage $(KDIR)/$(1)-uImage - cp $(KDIR)/$(1)-uImage $(BIN_DIR)/openwrt-$(1)-uImage -endef - -define Image/BuildKernel - # Orion Kernel uImages - # DT2: mach id 1514 (0x5EA) - $(call Image/BuildKernelMachId,dt2,05,ea) - # LaCie 2big Network: mach id 2342 (0x926) - $(call Image/BuildKernelMachId,net2big,09,26) -endef - -define Image/Build/Freecom - # Orion Freecom Images - # backup unwanted files - rm -rf ${TMP_DIR}/$2_backup - mkdir ${TMP_DIR}/$2_backup - -mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup - # add extra files - $(INSTALL_DIR) $(TARGET_DIR)/boot - # TODO: Add special CMDLINE shim for webupgrade image here - $(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage - $(INSTALL_DIR) $(TARGET_DIR)/var - # create image - $(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . - $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3) - # remove extra files - rm -rf $(TARGET_DIR)/{boot,var} - # recover unwanted files - -mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/ - rm -rf ${TMP_DIR}/$2_backup -endef - -define Image/Build -$(call Image/Build/$(1),$(1)) -$(call Image/Build/Freecom,$(1),dt2,DT,$(1)) -endef - -define Image/Build/squashfs -$(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - ( \ - dd if=$(KDIR)/uImage bs=1024k conv=sync; \ - dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ - ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img -endef diff --git a/target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch b/target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch deleted file mode 100644 index 5d52bd0afa..0000000000 --- a/target/linux/orion/patches-4.14/000-arm_openwrt_machtypes.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/arch/arm/tools/mach-types -+++ b/arch/arm/tools/mach-types -@@ -268,6 +268,7 @@ yl9200 MACH_YL9200 YL9200 1507 - rd88f5182 MACH_RD88F5182 RD88F5182 1508 - kurobox_pro MACH_KUROBOX_PRO KUROBOX_PRO 1509 - mx31_3ds MACH_MX31_3DS MX31_3DS 1511 -+dt2 MACH_DT2 DT2 1514 - qong MACH_QONG QONG 1524 - omap2evm MACH_OMAP2EVM OMAP2EVM 1534 - omap3evm MACH_OMAP3EVM OMAP3EVM 1535 -@@ -530,6 +531,7 @@ mx53_loco MACH_MX53_LOCO MX53_LOCO 32 - wario MACH_WARIO WARIO 3288 - cm_t3730 MACH_CM_T3730 CM_T3730 3290 - hrefv60 MACH_HREFV60 HREFV60 3293 -+wn802t MACH_WN802T WN802T 3306 - armlex4210 MACH_ARMLEX4210 ARMLEX4210 3361 - snowball MACH_SNOWBALL SNOWBALL 3363 - xilinx_ep107 MACH_XILINX_EP107 XILINX_EP107 3378 diff --git a/target/linux/orion/patches-4.14/100-wrt350nv2_openwrt_partition_map.patch b/target/linux/orion/patches-4.14/100-wrt350nv2_openwrt_partition_map.patch deleted file mode 100644 index 89c2c9420b..0000000000 --- a/target/linux/orion/patches-4.14/100-wrt350nv2_openwrt_partition_map.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c -+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c -@@ -134,11 +134,11 @@ static struct mtd_partition wrt350n_v2_n - { - .name = "kernel", - .offset = 0x00000000, -- .size = 0x00760000, -+ .size = 0x00140000, // change to kernel mtd size here (1/3) - }, { - .name = "rootfs", -- .offset = 0x001a0000, -- .size = 0x005c0000, -+ .offset = 0x00140000, // change to kernel mtd size here (2/3) -+ .size = 0x00610000, // adopt to kernel mtd size here (3/3) = 0x00750000 - - }, { - .name = "lang", - .offset = 0x00760000, -@@ -151,6 +151,14 @@ static struct mtd_partition wrt350n_v2_n - .name = "u-boot", - .offset = 0x007c0000, - .size = 0x00040000, -+ }, { -+ .name = "eRcOmM_do_not_touch", -+ .offset = 0x00750000, -+ .size = 0x00010000, // erasesize -+ }, { -+ .name = "image", // for sysupgrade -+ .offset = 0x00000000, -+ .size = 0x00750000, - }, - }; - diff --git a/target/linux/orion/patches-4.14/101-wnr854t_partition_map.patch b/target/linux/orion/patches-4.14/101-wnr854t_partition_map.patch deleted file mode 100644 index 881cfb773e..0000000000 --- a/target/linux/orion/patches-4.14/101-wnr854t_partition_map.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/arch/arm/mach-orion5x/wnr854t-setup.c -+++ b/arch/arm/mach-orion5x/wnr854t-setup.c -@@ -57,15 +57,19 @@ static struct mtd_partition wnr854t_nor_ - { - .name = "kernel", - .offset = 0x00000000, -- .size = 0x00100000, -+ .size = 0x00140000, - }, { - .name = "rootfs", -- .offset = 0x00100000, -- .size = 0x00660000, -+ .offset = 0x00140000, -+ .size = 0x00620000, - }, { - .name = "uboot", - .offset = 0x00760000, - .size = 0x00040000, -+ }, { -+ .name = "image", // for sysupgrade -+ .offset = 0x00000000, -+ .size = 0x00760000, - }, - }; - diff --git a/target/linux/orion/patches-4.14/200-dt2_board_support.patch b/target/linux/orion/patches-4.14/200-dt2_board_support.patch deleted file mode 100644 index fcadabcd17..0000000000 --- a/target/linux/orion/patches-4.14/200-dt2_board_support.patch +++ /dev/null @@ -1,557 +0,0 @@ ---- a/arch/arm/mach-orion5x/Kconfig -+++ b/arch/arm/mach-orion5x/Kconfig -@@ -49,6 +49,13 @@ config MACH_RD88F5182_DT - Say 'Y' here if you want your kernel to support the Marvell - Orion-NAS (88F5182) RD2, Flattened Device Tree. - -+config MACH_DT2 -+ bool "Freecom DataTank Gateway" -+ select I2C_BOARDINFO -+ help -+ Say 'Y' here if you want your kernel to support the -+ Freecom DataTank Gateway -+ - config MACH_KUROBOX_PRO - bool "KuroBox Pro" - select I2C_BOARDINFO if I2C ---- a/arch/arm/mach-orion5x/Makefile -+++ b/arch/arm/mach-orion5x/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_MACH_TS78XX) += ts78xx-setu - obj-$(CONFIG_MACH_MV2120) += mv2120-setup.o - obj-$(CONFIG_MACH_NET2BIG) += net2big-setup.o - obj-$(CONFIG_MACH_WNR854T) += wnr854t-setup.o -+obj-$(CONFIG_MACH_DT2) += dt2-setup.o - obj-$(CONFIG_MACH_RD88F5181L_GE) += rd88f5181l-ge-setup.o - obj-$(CONFIG_MACH_RD88F5181L_FXO) += rd88f5181l-fxo-setup.o - obj-$(CONFIG_MACH_RD88F6183AP_GE) += rd88f6183ap-ge-setup.o ---- /dev/null -+++ b/arch/arm/mach-orion5x/dt2-common.h -@@ -0,0 +1,82 @@ -+#ifndef __INC_DT2_COMMON_H -+#define __INC_DT2_COMMON_H -+ -+#define ATAG_MV_UBOOT 0x41000403 -+ -+struct tag_mv_uboot { -+ u32 uboot_version; -+ u32 tclk; -+ u32 sysclk; -+ u32 isUsbHost; -+ u32 overEthAddr; -+ u8 dt2_eeprom[256]; -+}; -+ -+#define DT2_EEPROM_ADDR 0x50 -+#define DT2_EEPROM_OFFSET 0 -+#define DT2_EEPROM_LENGTH 256 -+ -+#define DT2_SERIAL_NUMBER_DEFAULT "run on default\0" -+#define DT2_REVISION_DEFAULT_INIT 0xFF -+#define DT2_CONFIG_FLAGS_DEFAULT 0x00 -+ -+#define _PACKED_ __attribute__((packed)) -+ -+struct DT2_EEPROM_SD_CONFIG { -+ unsigned int ram_1; -+ unsigned int ram_2; -+ unsigned int ram_3; -+ unsigned int ram_4; -+ unsigned char ram_5; -+ unsigned char ram_6; -+ unsigned short ram_7; -+ unsigned int magic_id; -+ } _PACKED_; // 24 Bytes in total -+ -+struct DT2_EEPROM_FC_CONFIG { -+ unsigned char rtc_sts_mask; -+ unsigned char rtc_sts_init; -+ unsigned char rtc_int_mask; -+ unsigned char rtc_int_init; -+ unsigned char rtc_atrim_init; -+ unsigned char rtc_dtrim_init; -+ unsigned char dummy1; -+ unsigned char dummy2; -+ unsigned char dt2_config_flags; /* 0x80 to load rtc_values to RTC */ -+ unsigned char dt2_revision; /* upper nibble is HW, lower nibble is FW */ -+ unsigned char dt2_serial_number[16]; /* Serial number of DT-2 */ -+ } _PACKED_; // 26 Bytes in total -+ -+#define CFG_LOAD_RTC_VALUES 0x80 -+ -+struct DT2_EEPROM_GW_CONFIG { -+ unsigned int dummy1; -+ unsigned int dummy2; -+ unsigned int dummy3; -+ unsigned char dummy4; -+ unsigned char tos_video_val1; -+ unsigned char tos_video_val2; -+ unsigned char tos_voip_val; -+ unsigned char qos_igmp_cfg; -+ unsigned char num_of_ifs; -+ unsigned short vlan_ports_if[3]; -+ unsigned char mac_addr[3][6]; -+ } _PACKED_; // 42 Bytes in total -+ -+#define _SIZE_OF_ALL_STRUCTS_ (sizeof(struct DT2_EEPROM_SD_CONFIG) + sizeof(struct DT2_EEPROM_FC_CONFIG) + sizeof(struct DT2_EEPROM_GW_CONFIG)) -+ -+// MV = EEPROM - SD - FC - GW - CRC -+struct DT2_EEPROM_MV_CONFIG { -+ unsigned int reg_addr[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ - sizeof(unsigned int)) / (sizeof(unsigned int) * 2)]; -+ unsigned int reg_data[(DT2_EEPROM_LENGTH - _SIZE_OF_ALL_STRUCTS_ - sizeof(unsigned int)) / (sizeof(unsigned int) * 2)]; -+ } _PACKED_; -+ -+struct DT2_EEPROM_STRUCT { -+ struct DT2_EEPROM_MV_CONFIG mv; -+ struct DT2_EEPROM_SD_CONFIG sd; -+ struct DT2_EEPROM_FC_CONFIG fc; -+ struct DT2_EEPROM_GW_CONFIG gw; -+ unsigned int crc; -+ } _PACKED_; -+ -+#endif ---- /dev/null -+++ b/arch/arm/mach-orion5x/dt2-setup.c -@@ -0,0 +1,443 @@ -+/* -+ * arch/arm/mach-orion5x/dt2-setup.c -+ * -+ * Freecom DataTank Gateway Setup -+ * -+ * Copyright (C) 2009 Zintis Petersons -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "orion5x.h" -+#include "common.h" -+#include "mpp.h" -+ -+/***************************************************************************** -+ * DT2 local -+ ****************************************************************************/ -+#include -+#include "dt2-common.h" -+ -+u32 mvUbootVer = 0; -+u32 mvTclk = 166666667; -+u32 mvSysclk = 200000000; -+u32 mvIsUsbHost = 1; -+u32 overEthAddr = 0; -+u32 gBoardId = -1; -+struct DT2_EEPROM_STRUCT dt2_eeprom; -+ -+/***************************************************************************** -+ * DT2 Info -+ ****************************************************************************/ -+/* -+ * PCI -+ */ -+ -+#define DT2_PCI_SLOT0_OFFS 7 -+#define DT2_PCI_SLOT0_IRQ_A_PIN 3 -+#define DT2_PCI_SLOT0_IRQ_B_PIN 2 -+ -+#define DT2_PIN_GPIO_SYNC 25 -+#define DT2_PIN_GPIO_POWER 24 -+#define DT2_PIN_GPIO_UNPLUG1 23 -+#define DT2_PIN_GPIO_UNPLUG2 22 -+#define DT2_PIN_GPIO_RESET 4 -+ -+#define DT2_NOR_BOOT_BASE 0xf4000000 -+#define DT2_NOR_BOOT_SIZE SZ_512K -+ -+#define DT2_LEDS_BASE 0xfa000000 -+#define DT2_LEDS_SIZE SZ_1K -+ -+/***************************************************************************** -+ * 512K NOR Flash on Device bus Boot CS -+ ****************************************************************************/ -+ -+static struct mtd_partition dt2_partitions[] = { -+ { -+ .name = "u-boot", -+ .size = 0x00080000, -+ .offset = 0, -+ }, -+}; -+ -+static struct physmap_flash_data dt2_nor_flash_data = { -+ .width = 1, /* 8 bit bus width */ -+ .parts = dt2_partitions, -+ .nr_parts = ARRAY_SIZE(dt2_partitions) -+}; -+ -+static struct resource dt2_nor_flash_resource = { -+ .flags = IORESOURCE_MEM, -+ .start = DT2_NOR_BOOT_BASE, -+ .end = DT2_NOR_BOOT_BASE + DT2_NOR_BOOT_SIZE - 1, -+}; -+ -+static struct platform_device dt2_nor_flash = { -+ .name = "physmap-flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &dt2_nor_flash_data, -+ }, -+ .resource = &dt2_nor_flash_resource, -+ .num_resources = 1, -+}; -+ -+/***************************************************************************** -+ * PCI -+ ****************************************************************************/ -+ -+void __init dt2_pci_preinit(void) -+{ -+ int pin, irq; -+ -+ /* -+ * Configure PCI GPIO IRQ pins -+ */ -+ pin = DT2_PCI_SLOT0_IRQ_A_PIN; -+ if (gpio_request(pin, "PCI IntA") == 0) { -+ if (gpio_direction_input(pin) == 0) { -+ irq = gpio_to_irq(pin); -+ irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW); -+ printk (KERN_INFO "PCI IntA IRQ: %d\n", irq); -+ } else { -+ printk(KERN_ERR "dt2_pci_preinit failed to " -+ "irq_set_irq_type pin %d\n", pin); -+ gpio_free(pin); -+ } -+ } else { -+ printk(KERN_ERR "dt2_pci_preinit failed to request gpio %d\n", pin); -+ } -+ -+ pin = DT2_PCI_SLOT0_IRQ_B_PIN; -+ if (gpio_request(pin, "PCI IntB") == 0) { -+ if (gpio_direction_input(pin) == 0) { -+ irq = gpio_to_irq(pin); -+ irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW); -+ printk (KERN_INFO "PCI IntB IRQ: %d\n", irq); -+ } else { -+ printk(KERN_ERR "dt2_pci_preinit failed to " -+ "irq_set_irq_type pin %d\n", pin); -+ gpio_free(pin); -+ } -+ } else { -+ printk(KERN_ERR "dt2_pci_preinit failed to gpio_request %d\n", pin); -+ } -+} -+ -+static int __init dt2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ int irq; -+ -+ /* -+ * Check for devices with hard-wired IRQs. -+ */ -+ irq = orion5x_pci_map_irq(dev, slot, pin); -+ if (irq != -1){ -+ printk(KERN_INFO "orion5x_pci_map_irq: %d\n", irq); -+ return irq; -+ } -+ -+ /* -+ * PCI IRQs are connected via GPIOs -+ */ -+ switch (slot - DT2_PCI_SLOT0_OFFS) { -+ case 0: -+ if (pin == 1){ -+ irq = gpio_to_irq(DT2_PCI_SLOT0_IRQ_A_PIN); -+ printk(KERN_INFO "dt2_pci_map_irq DT2_PCI_SLOT0_IRQ_A_PIN: %d\n", irq); -+ } -+ else { -+ irq = gpio_to_irq(DT2_PCI_SLOT0_IRQ_B_PIN); -+ printk(KERN_INFO "dt2_pci_map_irq DT2_PCI_SLOT0_IRQ_B_PIN: %d\n", irq); -+ } -+ default: -+ irq = -1; -+ printk(KERN_INFO "dt2_pci_map_irq IRQ: %d\n", irq); -+ } -+ -+ return irq; -+} -+ -+static struct hw_pci dt2_pci __initdata = { -+ .nr_controllers = 2, -+ .preinit = dt2_pci_preinit, -+ .setup = orion5x_pci_sys_setup, -+ .scan = orion5x_pci_sys_scan_bus, -+ .map_irq = dt2_pci_map_irq, -+}; -+ -+static int __init dt2_pci_init(void) -+{ -+ if (machine_is_dt2()) -+ pci_common_init(&dt2_pci); -+ -+ return 0; -+} -+ -+subsys_initcall(dt2_pci_init); -+ -+/***************************************************************************** -+ * Ethernet -+ ****************************************************************************/ -+ -+static struct mv643xx_eth_platform_data dt2_eth_data = { -+ .phy_addr = MV643XX_ETH_PHY_NONE, -+ .speed = SPEED_1000, -+ .duplex = DUPLEX_FULL, -+}; -+ -+static struct dsa_chip_data dt2_switch_chip_data = { -+ .port_names[0] = "wan", -+ .port_names[1] = "lan1", -+ .port_names[2] = "lan2", -+ .port_names[3] = "cpu", -+ .port_names[4] = "lan3", -+ .port_names[5] = "lan4", -+}; -+ -+/***************************************************************************** -+ * RTC ISL1208 on I2C bus -+ ****************************************************************************/ -+static struct i2c_board_info __initdata dt2_i2c_rtc = { -+ I2C_BOARD_INFO("isl1208", 0x6F), -+}; -+ -+/***************************************************************************** -+ * Sata -+ ****************************************************************************/ -+static struct mv_sata_platform_data dt2_sata_data = { -+ .n_ports = 2, -+}; -+ -+/***************************************************************************** -+ * General Setup -+ ****************************************************************************/ -+static unsigned int dt2_mpp_modes[] __initdata = { -+ MPP0_GPIO, // RTC interrupt -+ MPP1_GPIO, // 88e6131 interrupt -+ MPP2_GPIO, // PCI_intB -+ MPP3_GPIO, // PCI_intA -+ MPP4_GPIO, // reset button switch -+ MPP5_GPIO, -+ MPP6_GPIO, -+ MPP7_GPIO, -+ MPP8_GPIO, -+ MPP9_GIGE, /* GE_RXERR */ -+ MPP10_GPIO, // usb -+ MPP11_GPIO, // usb -+ MPP12_GIGE, // GE_TXD[4] -+ MPP13_GIGE, // GE_TXD[5] -+ MPP14_GIGE, // GE_TXD[6] -+ MPP15_GIGE, // GE_TXD[7] -+ MPP16_GIGE, // GE_RXD[4] -+ MPP17_GIGE, // GE_RXD[5] -+ MPP18_GIGE, // GE_RXD[6] -+ MPP19_GIGE, // GE_RXD[7] -+ 0, -+}; -+ -+/***************************************************************************** -+ * LEDS -+ ****************************************************************************/ -+static struct platform_device dt2_leds = { -+ .name = "dt2-led", -+ .id = -1, -+}; -+ -+/**************************************************************************** -+ * GPIO key -+ ****************************************************************************/ -+static irqreturn_t dt2_reset_handler(int irq, void *dev_id) -+{ -+ /* This is the paper-clip reset which does an emergency reboot. */ -+ printk(KERN_INFO "Restarting system.\n"); -+ machine_restart(NULL); -+ -+ /* This should never be reached. */ -+ return IRQ_HANDLED; -+} -+ -+static irqreturn_t dt2_power_handler(int irq, void *dev_id) -+{ -+ printk(KERN_INFO "Shutting down system.\n"); -+ machine_power_off(); -+ return IRQ_HANDLED; -+} -+ -+static void __init dt2_init(void) -+{ -+ /* -+ * Setup basic Orion functions. Need to be called early. -+ */ -+ orion5x_init(); -+ -+ orion5x_mpp_conf(dt2_mpp_modes); -+ -+ /* -+ * Configure peripherals. -+ */ -+ -+ orion5x_uart0_init(); -+ orion5x_ehci0_init(); -+ orion5x_ehci1_init(); -+ orion5x_i2c_init(); -+ orion5x_sata_init(&dt2_sata_data); -+ orion5x_xor_init(); -+ -+ printk(KERN_INFO "U-Boot parameters:\n"); -+ printk(KERN_INFO "Sys Clk = %d, Tclk = %d, BoardID = 0x%02x\n", mvSysclk, mvTclk, gBoardId); -+ -+ printk(KERN_INFO "Serial: %s\n", dt2_eeprom.fc.dt2_serial_number); -+ printk(KERN_INFO "Revision: %016x\n", dt2_eeprom.fc.dt2_revision); -+ printk(KERN_INFO "DT2: Using MAC address %pM for port 0\n", -+ dt2_eeprom.gw.mac_addr[0]); -+ printk(KERN_INFO "DT2: Using MAC address %pM for port 1\n", -+ dt2_eeprom.gw.mac_addr[1]); -+ -+ orion5x_eth_init(&dt2_eth_data); -+ memcpy(dt2_eth_data.mac_addr, dt2_eeprom.gw.mac_addr[0], 6); -+ orion5x_eth_switch_init(&dt2_switch_chip_data); -+ -+ i2c_register_board_info(0, &dt2_i2c_rtc, 1); -+ -+ mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET, -+ ORION_MBUS_DEVBUS_BOOT_ATTR, -+ DT2_NOR_BOOT_BASE, DT2_NOR_BOOT_SIZE); -+ -+ platform_device_register(&dt2_nor_flash); -+ -+ mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(0), -+ ORION_MBUS_DEVBUS_ATTR(0), -+ DT2_LEDS_BASE, DT2_LEDS_SIZE); -+ platform_device_register(&dt2_leds); -+ -+ if (request_irq(gpio_to_irq(DT2_PIN_GPIO_RESET), &dt2_reset_handler, -+ IRQF_TRIGGER_LOW, -+ "DT2: Reset button", NULL) < 0) { -+ -+ printk("DT2: Reset Button IRQ %d not available\n", -+ gpio_to_irq(DT2_PIN_GPIO_RESET)); -+ } -+ -+ if (request_irq(gpio_to_irq(DT2_PIN_GPIO_POWER), &dt2_power_handler, -+ IRQF_TRIGGER_LOW, -+ "DT2: Power button", NULL) < 0) { -+ -+ printk(KERN_DEBUG "DT2: Power Button IRQ %d not available\n", -+ gpio_to_irq(DT2_PIN_GPIO_POWER)); -+ } -+} -+ -+static int __init parse_tag_dt2_uboot(const struct tag *t) -+{ -+ struct tag_mv_uboot *mv_uboot; -+ -+ // Get pointer to our block -+ mv_uboot = (struct tag_mv_uboot*)&t->u; -+ mvTclk = mv_uboot->tclk; -+ mvSysclk = mv_uboot->sysclk; -+ mvUbootVer = mv_uboot->uboot_version; -+ mvIsUsbHost = mv_uboot->isUsbHost; -+ -+ // Some clock fixups -+ if(mvTclk == 166000000) mvTclk = 166666667; -+ else if(mvTclk == 133000000) mvTclk = 133333333; -+ else if(mvSysclk == 166000000) mvSysclk = 166666667; -+ -+ gBoardId = (mvUbootVer & 0xff); -+ -+ //DT2 specific data -+ memcpy(&dt2_eeprom, mv_uboot->dt2_eeprom, sizeof(struct DT2_EEPROM_STRUCT)); -+ -+ return 0; -+} -+__tagtable(ATAG_MV_UBOOT, parse_tag_dt2_uboot); -+ -+/* -+ * This is OpenWrt specific fixup. It includes code from original "tag_fixup_mem32" to -+ * fixup bogus memory tags and also fixes kernel cmdline by adding " init=/etc/preinit" -+ * at the end. It is important to flash OpenWrt image from original Freecom firmware. -+ * -+ * Vanilla kernel should use "tag_fixup_mem32" function. -+ */ -+static void __init openwrt_fixup(struct tag *t, char **from) -+{ -+ char *p = NULL; -+ static char openwrt_init_tag[] __initdata = " init=/etc/preinit"; -+ -+ for (; t->hdr.size; t = tag_next(t)){ -+ /* Locate the Freecom cmdline */ -+ if (t->hdr.tag == ATAG_CMDLINE) { -+ p = t->u.cmdline.cmdline; -+ printk("%s(%d): Found cmdline '%s' at 0x%0lx\n", -+ __FUNCTION__, __LINE__, p, (unsigned long)p); -+ } -+ /* -+ * Many orion-based systems have buggy bootloader implementations. -+ * This is a common fixup for bogus memory tags. -+ */ -+ if (t->hdr.tag == ATAG_MEM && -+ (!t->u.mem.size || t->u.mem.size & ~PAGE_MASK || -+ t->u.mem.start & ~PAGE_MASK)) { -+ printk(KERN_WARNING -+ "Clearing invalid memory bank %dKB@0x%08x\n", -+ t->u.mem.size / 1024, t->u.mem.start); -+ t->hdr.tag = 0; -+ } -+ } -+ -+ printk("%s(%d): End of table at 0x%0lx\n", __FUNCTION__, __LINE__, (unsigned long)t); -+ -+ /* Overwrite the end of the table with a new cmdline tag. */ -+ t->hdr.tag = ATAG_CMDLINE; -+ t->hdr.size = -+ (sizeof (struct tag_header) + -+ strlen(p) + strlen(openwrt_init_tag) + 1 + 4) >> 2; -+ -+ strlcpy(t->u.cmdline.cmdline, p, COMMAND_LINE_SIZE); -+ strlcpy(t->u.cmdline.cmdline + strlen(p), openwrt_init_tag, -+ COMMAND_LINE_SIZE - strlen(p)); -+ -+ printk("%s(%d): New cmdline '%s' at 0x%0lx\n", -+ __FUNCTION__, __LINE__, -+ t->u.cmdline.cmdline, (unsigned long)t->u.cmdline.cmdline); -+ -+ t = tag_next(t); -+ -+ printk("%s(%d): New end of table at 0x%0lx\n", __FUNCTION__, __LINE__, (unsigned long)t); -+ -+ t->hdr.tag = ATAG_NONE; -+ t->hdr.size = 0; -+} -+ -+/* Warning: Freecom uses their own custom bootloader with mach-type (=1500) */ -+MACHINE_START(DT2, "Freecom DataTank Gateway") -+ /* Maintainer: Zintis Petersons */ -+ .atag_offset = 0x100, -+ .init_machine = dt2_init, -+ .map_io = orion5x_map_io, -+ .init_irq = orion5x_init_irq, -+ .init_time = orion5x_timer_init, -+ .fixup = openwrt_fixup, //tag_fixup_mem32, -+MACHINE_END diff --git a/target/linux/orion/patches-4.14/210-wn802t_support.patch b/target/linux/orion/patches-4.14/210-wn802t_support.patch deleted file mode 100644 index 2a3393f283..0000000000 --- a/target/linux/orion/patches-4.14/210-wn802t_support.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/arch/arm/mach-orion5x/Kconfig -+++ b/arch/arm/mach-orion5x/Kconfig -@@ -150,10 +150,13 @@ config MACH_MSS2_DT - Maxtor Shared Storage II platform. - - config MACH_WNR854T -- bool "Netgear WNR854T" -+ bool "Netgear WNR854T / WN802T" - help - Say 'Y' here if you want your kernel to support the -- Netgear WNR854T platform. -+ Netgear WNR854T or WN802T platform. -+ -+config MACH_WN802T -+ def_bool MACH_WNR854T - - config MACH_RD88F5181L_GE - bool "Marvell Orion-VoIP GE Reference Design" ---- a/arch/arm/mach-orion5x/wnr854t-setup.c -+++ b/arch/arm/mach-orion5x/wnr854t-setup.c -@@ -110,6 +110,11 @@ static struct dsa_chip_data wnr854t_swit - .port_names[7] = "lan2", - }; - -+static struct dsa_chip_data wn802t_switch_chip_data = { -+ .port_names[2] = "wan", -+ .port_names[3] = "cpu", -+}; -+ - static void __init wnr854t_init(void) - { - /* -@@ -123,7 +128,10 @@ static void __init wnr854t_init(void) - * Configure peripherals. - */ - orion5x_eth_init(&wnr854t_eth_data); -- orion5x_eth_switch_init(&wnr854t_switch_chip_data); -+ if (machine_is_wn802t()) -+ orion5x_eth_switch_init(&wn802t_switch_chip_data); -+ else -+ orion5x_eth_switch_init(&wnr854t_switch_chip_data); - orion5x_uart0_init(); - - mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET, -@@ -163,7 +171,7 @@ static struct hw_pci wnr854t_pci __initd - - static int __init wnr854t_pci_init(void) - { -- if (machine_is_wnr854t()) -+ if (machine_is_wnr854t() || machine_is_wn802t()) - pci_common_init(&wnr854t_pci); - - return 0; -@@ -177,6 +185,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" - .init_machine = wnr854t_init, - .map_io = orion5x_map_io, - .init_early = orion5x_init_early, -+ .init_irq = orion5x_init_irq, -+ .init_time = orion5x_timer_init, -+ .fixup = tag_fixup_mem32, -+ .restart = orion5x_restart, -+MACHINE_END -+ -+MACHINE_START(WN802T, "Netgear WN802T") -+ /* Maintainer: Imre Kaloz */ -+ .atag_offset = 0x100, -+ .init_machine = wnr854t_init, -+ .map_io = orion5x_map_io, -+ .init_early = orion5x_init_early, - .init_irq = orion5x_init_irq, - .init_time = orion5x_timer_init, - .fixup = tag_fixup_mem32, From 28fd4ac512ec1c08a79ac7a434b2def3cc82f1d5 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 13:57:48 +0100 Subject: [PATCH 271/480] ixp4xx: remove unmaintained target This target is still on kernel 4.9, and it looks like there is no active maintainer for this target anymore. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Adrian Schmutzler --- package/boot/apex/Makefile | 62 - .../boot/apex/patches/001-compile_fix.patch | 20 - .../100-openwrt_nslu2_armeb_config.patch | 23 - .../120-openwrt_nslu2_16mb_armeb_config.patch | 23 - .../140-openwrt_fsg3_armeb_config.patch | 23 - .../apex/patches/150-limit_ram_to_64mb.patch | 22 - .../160-openwrt_nas100d_armeb_config.patch | 20 - package/firmware/ixp4xx-microcode/Makefile | 59 - .../ixp4xx-microcode/src/IxNpeMicrocode.h | 148 -- .../firmware/ixp4xx-microcode/src/LICENSE.IPL | 27 - package/kernel/avila-wdt/Makefile | 34 - package/kernel/avila-wdt/src/Makefile | 1 - package/kernel/avila-wdt/src/avila-wdt.c | 231 -- package/kernel/linux/modules/sound.mk | 19 - target/linux/ixp4xx/Makefile | 24 - target/linux/ixp4xx/base-files/lib/ixp4xx.sh | 34 - .../ixp4xx/base-files/lib/preinit/01_sysinfo | 9 - .../lib/preinit/05_set_ether_mac_ixp4xx | 32 - .../ixp4xx/base-files/lib/upgrade/platform.sh | 137 -- target/linux/ixp4xx/config-4.9 | 245 -- .../ixp4xx/generic/profiles/100-Default.mk | 17 - .../generic/profiles/105-Atheros-ath5k.mk | 17 - .../ixp4xx/generic/profiles/200-NSLU2.mk | 19 - .../ixp4xx/generic/profiles/300-NAS100d.mk | 21 - .../generic/profiles/400-DSMG600RevA.mk | 22 - .../ixp4xx/generic/profiles/500-USR8200.mk | 19 - target/linux/ixp4xx/generic/target.mk | 9 - target/linux/ixp4xx/harddisk/config-default | 20 - .../ixp4xx/harddisk/profiles/100-FSG3.mk | 20 - target/linux/ixp4xx/harddisk/target.mk | 6 - target/linux/ixp4xx/image/Makefile | 76 - target/linux/ixp4xx/modules.mk | 74 - ...ohorent_dma_mask-for-ethernet-platfo.patch | 136 -- ...se-parent-device-for-dma-allocations.patch | 95 - .../patches-4.9/020-gateworks_i2c_pld.patch | 424 ---- .../patches-4.9/030-gpio_line_config.patch | 73 - .../patches-4.9/040-arm_mach_types.patch | 18 - .../090-increase_entropy_pools.patch | 17 - ...00-wg302v2_gateway7001_mac_plat_info.patch | 78 - .../patches-4.9/105-wg302v1_support.patch | 261 -- .../110-pronghorn_series_support.patch | 393 ---- .../111-pronghorn_swap_uarts.patch | 44 - .../patches-4.9/115-sidewinder_support.patch | 286 --- .../116-sidewinder_fis_location.patch | 30 - .../patches-4.9/120-compex_support.patch | 199 -- .../patches-4.9/130-wrt300nv2_support.patch | 227 -- .../131-wrt300nv2_mac_plat_info.patch | 42 - .../patches-4.9/132-wrt300nv2_mac_fix.patch | 72 - .../150-lanready_ap1000_support.patch | 201 -- .../151-lanready_ap1000_mac_plat_info.patch | 44 - .../patches-4.9/160-delayed_uart_io.patch | 133 -- .../patches-4.9/162-wg302v1_mem_fixup.patch | 37 - .../170-ixdpg425_mac_plat_info.patch | 51 - .../175-avila_hss_audio_support.patch | 2093 ----------------- .../patches-4.9/180-tw5334_support.patch | 287 --- .../patches-4.9/185-mi424wr_support.patch | 504 ---- .../patches-4.9/190-cambria_support.patch | 1131 --------- ...01-npe_driver_print_license_location.patch | 11 - ...05-npe_driver_separate_phy_functions.patch | 127 - ...-npe_driver_add_update_link_function.patch | 100 - .../207-npe_driver_multiphy_support.patch | 153 -- .../patches-4.9/295-latch_led_driver.patch | 201 -- .../patches-4.9/300-avila_support.patch | 726 ------ .../304-ixp4xx_eth_jumboframe.patch | 80 - .../patches-4.9/310-gtwx5717_spi_bus.patch | 57 - .../311-gtwx5717_mac_plat_info.patch | 50 - .../312-ixp4xx_pata_optimization.patch | 137 -- .../patches-4.9/500-usr8200_support.patch | 347 --- .../patches-4.9/520-tw2662_support.patch | 316 --- .../patches-4.9/530-ap42x_support.patch | 282 --- .../patches-4.9/600-skb_avoid_dmabounce.patch | 23 - .../900-ixp4xx-crypto-include-module.h.patch | 10 - .../patches-4.9/910-ixp4xx-nr_irq_lines.patch | 22 - 73 files changed, 11031 deletions(-) delete mode 100644 package/boot/apex/Makefile delete mode 100644 package/boot/apex/patches/001-compile_fix.patch delete mode 100644 package/boot/apex/patches/100-openwrt_nslu2_armeb_config.patch delete mode 100644 package/boot/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch delete mode 100644 package/boot/apex/patches/140-openwrt_fsg3_armeb_config.patch delete mode 100644 package/boot/apex/patches/150-limit_ram_to_64mb.patch delete mode 100644 package/boot/apex/patches/160-openwrt_nas100d_armeb_config.patch delete mode 100644 package/firmware/ixp4xx-microcode/Makefile delete mode 100644 package/firmware/ixp4xx-microcode/src/IxNpeMicrocode.h delete mode 100644 package/firmware/ixp4xx-microcode/src/LICENSE.IPL delete mode 100644 package/kernel/avila-wdt/Makefile delete mode 100644 package/kernel/avila-wdt/src/Makefile delete mode 100644 package/kernel/avila-wdt/src/avila-wdt.c delete mode 100644 target/linux/ixp4xx/Makefile delete mode 100644 target/linux/ixp4xx/base-files/lib/ixp4xx.sh delete mode 100644 target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo delete mode 100644 target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx delete mode 100644 target/linux/ixp4xx/base-files/lib/upgrade/platform.sh delete mode 100644 target/linux/ixp4xx/config-4.9 delete mode 100644 target/linux/ixp4xx/generic/profiles/100-Default.mk delete mode 100644 target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk delete mode 100644 target/linux/ixp4xx/generic/profiles/200-NSLU2.mk delete mode 100644 target/linux/ixp4xx/generic/profiles/300-NAS100d.mk delete mode 100644 target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk delete mode 100644 target/linux/ixp4xx/generic/profiles/500-USR8200.mk delete mode 100644 target/linux/ixp4xx/generic/target.mk delete mode 100644 target/linux/ixp4xx/harddisk/config-default delete mode 100644 target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk delete mode 100644 target/linux/ixp4xx/harddisk/target.mk delete mode 100644 target/linux/ixp4xx/image/Makefile delete mode 100644 target/linux/ixp4xx/modules.mk delete mode 100644 target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/120-compex_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/190-cambria_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/300-avila_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch delete mode 100644 target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch diff --git a/package/boot/apex/Makefile b/package/boot/apex/Makefile deleted file mode 100644 index 64c2426802..0000000000 --- a/package/boot/apex/Makefile +++ /dev/null @@ -1,62 +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. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=apex -PKG_VERSION:=1.6.9 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://downloads.openwrt.org/sources/ -PKG_HASH:=1d2bc04c2c6bb3d2d6c1916b6dc559cda2b1ecb045d7801fd49af6af4234abeb -PKG_TARGETS:=bin - -include $(INCLUDE_DIR)/package.mk - -export GCC_HONOUR_COPTS=s - -define Package/apex - SECTION:=boot - CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_ixp4xx - DEFAULT:=y - TITLE:=Boot loader for NSLU2, FSG3, NAS100D and others -endef - -define build_apex - $(MAKE) -C $(PKG_BUILD_DIR) \ - ARCH=arm \ - $(1)_config - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - KBUILD_HAVE_NLS=no \ - ARCH=arm \ - clean all - $(INSTALL_BIN) $(PKG_BUILD_DIR)/apex.bin $(PKG_BUILD_DIR)/out/apex-$(2).bin -endef - -define Build/Compile - $(INSTALL_DIR) $(PKG_BUILD_DIR)/out - $(call build_apex,slugos-nslu2-armeb,nslu2-armeb) - $(call build_apex,slugos-nslu2-16mb-armeb,nslu2-16mb-armeb) - $(call build_apex,slugos-fsg3-armeb,fsg3-armeb) - $(call build_apex,slugos-nas100d-armeb,nas100d-armeb) -endef - -define Package/apex/install - $(INSTALL_DIR) $(STAGING_DIR)/apex - $(CP) $(PKG_BUILD_DIR)/out/*.bin $(1)/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/out/*.bin $(STAGING_DIR_IMAGE)/ -endef - -$(eval $(call BuildPackage,apex)) diff --git a/package/boot/apex/patches/001-compile_fix.patch b/package/boot/apex/patches/001-compile_fix.patch deleted file mode 100644 index 8a25de6570..0000000000 --- a/package/boot/apex/patches/001-compile_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -444,7 +444,7 @@ ifeq ($(config-targets),1) - include $(srctree)/src/arch-$(SRCARCH)/Makefile - export KBUILD_DEFCONFIG - --config %config: scripts_basic outputmakefile FORCE -+%config: scripts_basic outputmakefile FORCE - $(Q)mkdir -p include/linux include/config - $(Q)$(MAKE) $(build)=scripts/kconfig $@ - -@@ -1585,7 +1585,7 @@ endif - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) - - # Modules --/ %/: prepare scripts FORCE -+%/: prepare scripts FORCE - $(cmd_crmodverdir) - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ - $(build)=$(build-dir) diff --git a/package/boot/apex/patches/100-openwrt_nslu2_armeb_config.patch b/package/boot/apex/patches/100-openwrt_nslu2_armeb_config.patch deleted file mode 100644 index d598ff3287..0000000000 --- a/package/boot/apex/patches/100-openwrt_nslu2_armeb_config.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/mach-ixp42x/slugos-nslu2-armeb_config -+++ b/src/mach-ixp42x/slugos-nslu2-armeb_config -@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y - # - # General Setup - # --CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)" -+CONFIG_TARGET_DESCRIPTION="OpenWrt NSLU2 (8MiB Flash)" - CONFIG_CROSS_COMPILE="" - CONFIG_AEABI=y - # CONFIG_DRIVER_LONG_LONG_SIZE is not set -@@ -163,9 +163,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern - # Overrides - # - CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y --CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc" -+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd" - CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y --CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc" -+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd" - # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set - # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set - CONFIG_USES_NOR_BOOTFLASH=y diff --git a/package/boot/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch b/package/boot/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch deleted file mode 100644 index 5e7ecee27c..0000000000 --- a/package/boot/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config -+++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config -@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y - # - # General Setup - # --CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)" -+CONFIG_TARGET_DESCRIPTION="OpenWrt NSLU2 (16MiB Flash)" - CONFIG_CROSS_COMPILE="" - CONFIG_AEABI=y - # CONFIG_DRIVER_LONG_LONG_SIZE is not set -@@ -163,9 +163,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern - # Overrides - # - CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y --CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc" -+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd" - CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y --CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc" -+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd" - # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set - # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set - CONFIG_USES_NOR_BOOTFLASH=y diff --git a/package/boot/apex/patches/140-openwrt_fsg3_armeb_config.patch b/package/boot/apex/patches/140-openwrt_fsg3_armeb_config.patch deleted file mode 100644 index fc0e8b9f3d..0000000000 --- a/package/boot/apex/patches/140-openwrt_fsg3_armeb_config.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/mach-ixp42x/slugos-fsg3-armeb_config -+++ b/src/mach-ixp42x/slugos-fsg3-armeb_config -@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y - # - # General Setup - # --CONFIG_TARGET_DESCRIPTION="SlugOS FSG3/BE" -+CONFIG_TARGET_DESCRIPTION="OpenWrt FSG3" - CONFIG_CROSS_COMPILE="" - CONFIG_AEABI=y - CONFIG_CC_OPTIMIZE_FOR_SIZE=y -@@ -148,9 +148,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern - # Overrides - # - CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y --CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/sda1 rootdelay=10 console=ttyS0,115200" -+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/sda1 rootdelay=10 console=ttyS0,115200 init=/etc/preinit noinitrd" - CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y --CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/sda2 rootdelay=10 console=ttyS0,115200" -+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock2 rootfstype=squashfs console=ttyS0,115200 init=/etc/preinit noinitrd" - # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set - # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set - CONFIG_USES_NOR_BOOTFLASH=y diff --git a/package/boot/apex/patches/150-limit_ram_to_64mb.patch b/package/boot/apex/patches/150-limit_ram_to_64mb.patch deleted file mode 100644 index 3e178166e1..0000000000 --- a/package/boot/apex/patches/150-limit_ram_to_64mb.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/mach-ixp42x/slugos-nslu2-armeb_config -+++ b/src/mach-ixp42x/slugos-nslu2-armeb_config -@@ -137,7 +137,7 @@ CONFIG_AUTOBOOT_DELAY=10 - CONFIG_ENV_STARTUP_KERNEL_COPY=y - # CONFIG_ENV_REGION_KERNEL_SWAP is not set - CONFIG_ENV_STARTUP_PREFIX_P=y --CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m" -+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+64m" - - # - # Regions ---- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config -+++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config -@@ -137,7 +137,7 @@ CONFIG_AUTOBOOT_DELAY=10 - CONFIG_ENV_STARTUP_KERNEL_COPY=y - # CONFIG_ENV_REGION_KERNEL_SWAP is not set - CONFIG_ENV_STARTUP_PREFIX_P=y --CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m" -+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+64m" - - # - # Regions diff --git a/package/boot/apex/patches/160-openwrt_nas100d_armeb_config.patch b/package/boot/apex/patches/160-openwrt_nas100d_armeb_config.patch deleted file mode 100644 index e190964857..0000000000 --- a/package/boot/apex/patches/160-openwrt_nas100d_armeb_config.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/mach-ixp42x/slugos-nas100d-armeb_config -+++ b/src/mach-ixp42x/slugos-nas100d-armeb_config -@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y - # - # General Setup - # --CONFIG_TARGET_DESCRIPTION="SlugOS NAS100D/BE" -+CONFIG_TARGET_DESCRIPTION="OpenWrt NAS100D" - CONFIG_CROSS_COMPILE="" - CONFIG_AEABI=y - # CONFIG_DRIVER_LONG_LONG_SIZE is not set -@@ -158,7 +158,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel" - # Overrides - # - CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y --CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc" -+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd" - # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set - CONFIG_USES_NOR_BOOTFLASH=y - CONFIG_RELOCATE_SIMPLE=y diff --git a/package/firmware/ixp4xx-microcode/Makefile b/package/firmware/ixp4xx-microcode/Makefile deleted file mode 100644 index 78fedfd1aa..0000000000 --- a/package/firmware/ixp4xx-microcode/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ixp4xx-microcode -PKG_VERSION:=2.4 -PKG_RELEASE:=2 - -PKG_SOURCE:=IPL_ixp400NpeLibraryWithCrypto-2_4.zip -PKG_SOURCE_URL:=http://downloads.openwrt.org/sources -PKG_HASH:=1b1170d0657847248589d946048c0aeaa9cd671966fc5bec5933283309485eaa - -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/package.mk - -define Package/ixp4xx-microcode - SECTION:=net - CATEGORY:=Network - TITLE:=Microcode for the IXP4xx network engines - DEPENDS:=@TARGET_ixp4xx -endef - -define Package/ixp4xx-microcode/description - This package contains the microcode needed to use the network engines in IXP4xx CPUs -endef - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) - mv $(PKG_BUILD_DIR)/ixp400_xscale_sw/src/npeDl/IxNpeMicrocode.c $(PKG_BUILD_DIR)/ - rm -rf $(PKG_BUILD_DIR)/ixp400_xscale_sw - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Compile - (cd $(PKG_BUILD_DIR); \ - $(HOSTCC) -Wall -I$(STAGING_DIR_HOST)/include IxNpeMicrocode.c -o IxNpeMicrocode; \ - ./IxNpeMicrocode -be \ - ) -endef - -define Package/ixp4xx-microcode/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DIR) $(1)/usr/share/doc - $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-A $(1)/lib/firmware/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-A-HSS $(1)/lib/firmware/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(1)/lib/firmware/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-C $(1)/lib/firmware/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE.IPL $(1)/usr/share/doc/ -endef - -$(eval $(call BuildPackage,ixp4xx-microcode)) diff --git a/package/firmware/ixp4xx-microcode/src/IxNpeMicrocode.h b/package/firmware/ixp4xx-microcode/src/IxNpeMicrocode.h deleted file mode 100644 index 4a843db104..0000000000 --- a/package/firmware/ixp4xx-microcode/src/IxNpeMicrocode.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file - * - * Copyright (C) 2006 Christian Hohnstaedt - * - * This file is released under the GPLv2 - * - * - * compile with - * - * gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode - * - * Executing the resulting binary on your build-host creates the - * "NPE-[ABC].xxxxxxxx" files containing the selected microcode - * - * fetch the IxNpeMicrocode.c from the Intel Access Library. - * It will include this header. - * - * select Images for every NPE from the following - * (used C++ comments for easy uncommenting ....) - */ - -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_TSLOT_SWITCH -#define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL -#define IX_NPEDL_NPEIMAGE_NPEA_HSS_2_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_DMA -// #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_SPHY_1_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0 -// #define IX_NPEDL_NPEIMAGE_NPEA_WEP - - -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEB_DMA -#define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL - - -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEC_DMA -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL -#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_EXTSHA_ETH -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define to_le32(x) (x) -#define to_be32(x) bswap_32(x) -#else -#define to_be32(x) (x) -#define to_le32(x) bswap_32(x) -#endif - -struct dl_image { - unsigned magic; - unsigned id; - unsigned size; - unsigned data[0]; -}; - -const unsigned IxNpeMicrocode_array[]; - -int main(int argc, char *argv[]) -{ - struct dl_image *image = (struct dl_image *)IxNpeMicrocode_array; - int imgsiz, i, fd, cnt; - const unsigned *arrayptr = IxNpeMicrocode_array; - const char *names[] = { "IXP425", "IXP465", "unknown" }; - int bigendian = 1; - - if (argc > 1) { - if (!strcmp(argv[1], "-le")) - bigendian = 0; - else if (!strcmp(argv[1], "-be")) - bigendian = 1; - else { - printf("Usage: %s <-le|-be>\n", argv[0]); - return EXIT_FAILURE; - } - } - - for (image = (struct dl_image *)arrayptr, cnt=0; - (image->id != 0xfeedf00d) && (image->magic == 0xfeedf00d); - image = (struct dl_image *)(arrayptr), cnt++) - { - unsigned char field[4]; - imgsiz = image->size + 3; - *(unsigned*)field = to_be32(image->id); - char filename[40], slnk[10]; - - sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A', - image->id); - if (image->id == 0x00090000) - sprintf(slnk, "NPE-%c-HSS", (field[0] & 0xf) + 'A'); - else - sprintf(slnk, "NPE-%c", (field[0] & 0xf) + 'A'); - - printf("Writing image: %s.NPE_%c Func: %2x Rev: %02x.%02x " - "Size: %5d to: '%s'\n", - names[field[0] >> 4], (field[0] & 0xf) + 'A', - field[1], field[2], field[3], imgsiz*4, filename); - fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644); - if (fd >= 0) { - for (i=0; i - * - * based on: - * drivers/char/watchdog/ixp4xx_wdt.c - * - * Watchdog driver for Intel IXP4xx network processors - * - * Author: Deepak Saxena - * - * Copyright 2004 (c) MontaVista, Software, Inc. - * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int nowayout = WATCHDOG_NOWAYOUT; -static int heartbeat = 20; /* (secs) Default is 20 seconds */ -static unsigned long wdt_status; -static atomic_t wdt_counter; -struct timer_list wdt_timer; - -#define WDT_IN_USE 0 -#define WDT_OK_TO_CLOSE 1 -#define WDT_RUNNING 2 - -static void wdt_refresh(unsigned long data) -{ - if (test_bit(WDT_RUNNING, &wdt_status)) { - if (atomic_dec_and_test(&wdt_counter)) { - printk(KERN_WARNING "Avila watchdog expired, expect a reboot soon!\n"); - clear_bit(WDT_RUNNING, &wdt_status); - return; - } - } - - /* strobe to the watchdog */ - gpio_line_set(14, IXP4XX_GPIO_HIGH); - gpio_line_set(14, IXP4XX_GPIO_LOW); - - mod_timer(&wdt_timer, jiffies + msecs_to_jiffies(500)); -} - -static void wdt_enable(void) -{ - atomic_set(&wdt_counter, heartbeat * 2); - - /* Disable clock generator output on GPIO 14/15 */ - *IXP4XX_GPIO_GPCLKR &= ~(1 << 8); - - /* activate GPIO 14 out */ - gpio_line_config(14, IXP4XX_GPIO_OUT); - gpio_line_set(14, IXP4XX_GPIO_LOW); - - if (!test_bit(WDT_RUNNING, &wdt_status)) - wdt_refresh(0); - set_bit(WDT_RUNNING, &wdt_status); -} - -static void wdt_disable(void) -{ - /* Re-enable clock generator output on GPIO 14/15 */ - *IXP4XX_GPIO_GPCLKR |= (1 << 8); -} - -static int avila_wdt_open(struct inode *inode, struct file *file) -{ - if (test_and_set_bit(WDT_IN_USE, &wdt_status)) - return -EBUSY; - - clear_bit(WDT_OK_TO_CLOSE, &wdt_status); - wdt_enable(); - return nonseekable_open(inode, file); -} - -static ssize_t -avila_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos) -{ - if (len) { - if (!nowayout) { - size_t i; - - clear_bit(WDT_OK_TO_CLOSE, &wdt_status); - - for (i = 0; i != len; i++) { - char c; - - if (get_user(c, data + i)) - return -EFAULT; - if (c == 'V') - set_bit(WDT_OK_TO_CLOSE, &wdt_status); - } - } - wdt_enable(); - } - return len; -} - -static struct watchdog_info ident = { - .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE | - WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, - .identity = "Avila Watchdog", -}; - - -static long avila_wdt_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - int ret = -ENOTTY; - int time; - - switch (cmd) { - case WDIOC_GETSUPPORT: - ret = copy_to_user((struct watchdog_info *)arg, &ident, - sizeof(ident)) ? -EFAULT : 0; - break; - - case WDIOC_GETSTATUS: - ret = put_user(0, (int *)arg); - break; - - case WDIOC_KEEPALIVE: - wdt_enable(); - ret = 0; - break; - - case WDIOC_SETTIMEOUT: - ret = get_user(time, (int *)arg); - if (ret) - break; - - if (time <= 0 || time > 60) { - ret = -EINVAL; - break; - } - - heartbeat = time; - wdt_enable(); - /* Fall through */ - - case WDIOC_GETTIMEOUT: - ret = put_user(heartbeat, (int *)arg); - break; - } - return ret; -} - -static int avila_wdt_release(struct inode *inode, struct file *file) -{ - if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) - wdt_disable(); - else - printk(KERN_CRIT "WATCHDOG: Device closed unexpectedly - " - "timer will not stop\n"); - clear_bit(WDT_IN_USE, &wdt_status); - clear_bit(WDT_OK_TO_CLOSE, &wdt_status); - - return 0; -} - - -static const struct file_operations avila_wdt_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .write = avila_wdt_write, - .unlocked_ioctl = avila_wdt_ioctl, - .open = avila_wdt_open, - .release = avila_wdt_release, -}; - -static struct miscdevice avila_wdt_miscdev = { - .minor = WATCHDOG_MINOR + 1, - .name = "avila_watchdog", - .fops = &avila_wdt_fops, -}; - -static int __init avila_wdt_init(void) -{ - int ret; - - init_timer(&wdt_timer); - wdt_timer.expires = 0; - wdt_timer.data = 0; - wdt_timer.function = wdt_refresh; - ret = misc_register(&avila_wdt_miscdev); - if (ret == 0) - printk(KERN_INFO "Avila Watchdog Timer: heartbeat %d sec\n", - heartbeat); - return ret; -} - -static void __exit avila_wdt_exit(void) -{ - misc_deregister(&avila_wdt_miscdev); - del_timer(&wdt_timer); - wdt_disable(); -} - - -module_init(avila_wdt_init); -module_exit(avila_wdt_exit); - -MODULE_AUTHOR("Felix Fietkau "); -MODULE_DESCRIPTION("Gateworks Avila Hardware Watchdog"); - -module_param(heartbeat, int, 0); -MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 20s)"); - -module_param(nowayout, int, 0); -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); - -MODULE_LICENSE("GPL"); -MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); - diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index c83e553d8f..aa7eb72756 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -255,25 +255,6 @@ endef $(eval $(call KernelPackage,sound-soc-imx-sgtl5000)) -define KernelPackage/sound-soc-gw_avila - TITLE:=Gateworks Avila SoC sound support - KCONFIG:= \ - CONFIG_SND_GW_AVILA_SOC \ - CONFIG_SND_GW_AVILA_SOC_PCM \ - CONFIG_SND_GW_AVILA_SOC_HSS - FILES:= \ - $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \ - $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \ - $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \ - $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko - AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss) - DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core - $(call AddDepends/sound) -endef - -$(eval $(call KernelPackage,sound-soc-gw_avila)) - - define KernelPackage/pcspkr DEPENDS:=@TARGET_x86 +kmod-input-core TITLE:=PC speaker support diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile deleted file mode 100644 index e1964331a0..0000000000 --- a/target/linux/ixp4xx/Makefile +++ /dev/null @@ -1,24 +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. -# -include $(TOPDIR)/rules.mk - -ARCH:=armeb -BOARD:=ixp4xx -BOARDNAME:=Intel IXP4xx -FEATURES:=squashfs -MAINTAINER:=Ted Hess , \ - Imre Kaloz -SUBTARGETS:=generic harddisk - -KERNEL_PATCHVER:=4.9 - -include $(INCLUDE_DIR)/target.mk - -DEFAULT_PACKAGES += ixp4xx-microcode fconfig -KERNELNAME:=zImage - -$(eval $(call BuildTarget)) diff --git a/target/linux/ixp4xx/base-files/lib/ixp4xx.sh b/target/linux/ixp4xx/base-files/lib/ixp4xx.sh deleted file mode 100644 index 3f73dd98e0..0000000000 --- a/target/linux/ixp4xx/base-files/lib/ixp4xx.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 OpenWrt.org -# - -IXP4XX_BOARD_NAME= -IXP4XX_MODEL= - -ixp4xx_board_detect() { - local machine - local name - - machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /Hardware/ {print $2}' /proc/cpuinfo) - - case "$machine" in - "Gateworks Cambria"*) - name="cambria" - ;; - "Gateworks Avila"*) - name="avila" - ;; - *) - name="generic"; - ;; - esac - - [ -z "$IXP4XX_BOARD_NAME" ] && IXP4XX_BOARD_NAME="$name" - [ -z "$IXP4XX_MODEL" ] && IXP4XX_MODEL="$machine" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$IXP4XX_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$IXP4XX_MODEL" > /tmp/sysinfo/model -} diff --git a/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo b/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo deleted file mode 100644 index 7699e9a10e..0000000000 --- a/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_sysinfo_ixp4xx() { - . /lib/ixp4xx.sh - - ixp4xx_board_detect -} - -boot_hook_add preinit_main do_sysinfo_ixp4xx diff --git a/target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx b/target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx deleted file mode 100644 index adda197b59..0000000000 --- a/target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set_ether_mac() { - - RB_CONFIG="$(grep "RedBoot config" /proc/mtd | cut -d: -f1)" - - for npe in eth0 eth1 eth2 - do - if [ "$(ifconfig $npe 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then - ifconfig $npe hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n npe_"$npe"_esa) - fi - done - - # Some developers should be shot on sight at Zcom/Netgear - # -- Fixup for the WG302v1, need someone with a WAG302v1 to fix that, too - - if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then - ifconfig eth0 hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n zcom_npe_esa) - fi - - # Others (*cough*, Tonze) are dumb enough to not handle mac addresses at all - - if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then - ifconfig eth0 hw ether 00:11:22:33:44:55 - fi - if [ "$(ifconfig eth1 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then - ifconfig eth1 hw ether 00:11:22:33:44:56 - fi -} - -boot_hook_add preinit_main set_ether_mac - diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh deleted file mode 100644 index f83aa430cf..0000000000 --- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,137 +0,0 @@ -CI_BLKSZ=65536 -CI_LDADR=0x00800000 - -platform_find_partitions() { - local first dev size erasesize name - while read dev size erasesize name; do - name=${name#'"'}; name=${name%'"'} - case "$name" in - vmlinux.bin.l7|kernel|linux|rootfs) - if [ -z "$first" ]; then - first="$name" - else - echo "$erasesize:$first:$name" - break - fi - ;; - esac - done < /proc/mtd -} - -platform_find_kernelpart() { - local part - for part in "${1%:*}" "${1#*:}"; do - case "$part" in - vmlinux.bin.l7|kernel|linux) - echo "$part" - break - ;; - esac - done -} - -platform_find_part_size() { - local first dev size erasesize name - while read dev size erasesize name; do - name=${name#'"'}; name=${name%'"'} - [ "$name" = "$1" ] && { - echo "$size" - break - } - done < /proc/mtd -} - -platform_do_upgrade_combined() { - local partitions=$(platform_find_partitions) - local kernelpart=$(platform_find_kernelpart "${partitions#*:}") - local erase_size=$((0x${partitions%%:*})); partitions="${partitions#*:}" - local kern_part_size=0x$(platform_find_part_size "$kernelpart") - local kern_part_blocks=$(($kern_part_size / $CI_BLKSZ)) - local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null) - local kern_blocks=$(($kern_length / $CI_BLKSZ)) - local root_blocks=$((0x$(dd if="$1" bs=2 skip=5 count=4 2>/dev/null) / $CI_BLKSZ)) - - v "platform_do_upgrade_combined" - v "partitions=$partitions" - v "kernelpart=$kernelpart" - v "kernel_part_size=$kern_part_size" - v "kernel_part_blocks=$kern_part_blocks" - v "kern_length=$kern_length" - v "erase_size=$erase_size" - v "kern_blocks=$kern_blocks" - v "root_blocks=$root_blocks" - v "kern_pad_blocks=$(($kern_part_blocks-$kern_blocks))" - - if [ -n "$partitions" ] && [ -n "$kernelpart" ] && \ - [ ${kern_blocks:-0} -gt 0 ] && \ - [ ${root_blocks:-0} -gt 0 ] && \ - [ ${erase_size:-0} -gt 0 ]; - then - local append="" - [ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP" - - # write the kernel - dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null | \ - mtd -F$kernelpart:$kern_part_size:$CI_LDADR write - $kernelpart - # write the rootfs - dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null | \ - mtd $append write - rootfs - else - echo "invalid image" - fi -} - -platform_check_image() { - local board=$(board_name) - local magic="$(get_magic_word "$1")" - local partitions=$(platform_find_partitions) - local kernelpart=$(platform_find_kernelpart "${partitions#*:}") - local kern_part_size=0x$(platform_find_part_size "$kernelpart") - local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null) - - [ "$#" -gt 1 ] && return 1 - - case "$board" in - avila | cambria ) - [ "$magic" != "4349" ] && { - echo "Invalid image. Use *-sysupgrade.bin files on this board" - return 1 - } - - kern_length_b=$(printf '%d' $kern_length) - kern_part_size_b=$(printf '%d' $kern_part_size) - if [ $kern_length_b -gt $kern_part_size_b ]; then - echo "Invalid image. Kernel size ($kern_length) exceeds kernel partition ($kern_part_size)" - return 1 - fi - - local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null) - local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}" - if [ -n "$md5_img" -a -n "$md5_chk" ] && [ "$md5_img" = "$md5_chk" ]; then - return 0 - else - echo "Invalid image. Contents do not match checksum (image:$md5_img calculated:$md5_chk)" - return 1 - fi - - return 0 - ;; - esac - - echo "Sysupgrade is not yet supported on $board." - return 1 -} - -platform_do_upgrade() { - local board=$(board_name) - - v "board=$board" - case "$board" in - avila | cambria ) - platform_do_upgrade_combined "$1" - ;; - *) - default_do_upgrade "$1" - ;; - esac -} diff --git a/target/linux/ixp4xx/config-4.9 b/target/linux/ixp4xx/config-4.9 deleted file mode 100644 index 5623f907a6..0000000000 --- a/target/linux/ixp4xx/config-4.9 +++ /dev/null @@ -1,245 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -# CONFIG_ARCH_ADI_COYOTE is not set -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -# CONFIG_ARCH_HAS_SG_CHAIN is not set -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_IXCDP1100=y -CONFIG_ARCH_IXDP425=y -CONFIG_ARCH_IXDP4XX=y -CONFIG_ARCH_IXP4XX=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_NR_GPIO=0 -# CONFIG_ARCH_PRPMC1100 is not set -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_THUMB is not set -CONFIG_ATAGS=y -CONFIG_BLK_MQ_PCI=y -CONFIG_BOUNCE=y -# CONFIG_CACHE_L2X0 is not set -CONFIG_CLKSRC_MMIO=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_ENDIAN_BE32=y -# CONFIG_CPU_ENDIAN_BE8 is not set -CONFIG_CPU_IXP43X=y -CONFIG_CPU_IXP46X=y -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CPU_XSCALE=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" -CONFIG_DEBUG_UART_8250=y -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set -CONFIG_DEBUG_UART_8250_SHIFT=2 -# CONFIG_DEBUG_UART_8250_WORD is not set -CONFIG_DEBUG_UART_PHYS=0xc8000003 -CONFIG_DEBUG_UART_VIRT=0xfef00003 -# CONFIG_DEBUG_USER is not set -CONFIG_DMABOUNCE=y -CONFIG_DNOTIFY=y -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_EEPROM_AT24=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HWMON=y -CONFIG_HWMON_VID=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_IXP4XX=y -CONFIG_HZ_FIXED=0 -CONFIG_HZ_PERIODIC=y -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -# CONFIG_I2C_IOP3XX is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_IOMMU_HELPER=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -# CONFIG_IWMMXT is not set -CONFIG_IXP4XX_ETH=y -# CONFIG_IXP4XX_INDIRECT_PCI is not set -CONFIG_IXP4XX_NPE=y -CONFIG_IXP4XX_QMGR=y -CONFIG_IXP4XX_WATCHDOG=y -CONFIG_LEDS_FSG=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_LATCH=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_MACH_AP1000=y -CONFIG_MACH_AP42X=y -# CONFIG_MACH_ARCOM_VULCAN is not set -CONFIG_MACH_AVILA=y -CONFIG_MACH_CAMBRIA=y -CONFIG_MACH_COMPEXWP18=y -# CONFIG_MACH_DEVIXP is not set -CONFIG_MACH_DSMG600=y -CONFIG_MACH_FSG=y -CONFIG_MACH_GATEWAY7001=y -# CONFIG_MACH_GORAMO_MLR is not set -# CONFIG_MACH_GTWX5715 is not set -# CONFIG_MACH_IXDP465 is not set -CONFIG_MACH_IXDPG425=y -# CONFIG_MACH_KIXRP435 is not set -CONFIG_MACH_LOFT=y -CONFIG_MACH_MI424WR=y -# CONFIG_MACH_MIC256 is not set -# CONFIG_MACH_MICCPT is not set -CONFIG_MACH_NAS100D=y -CONFIG_MACH_NSLU2=y -CONFIG_MACH_PRONGHORN=y -CONFIG_MACH_PRONGHORNMETRO=y -CONFIG_MACH_SIDEWINDER=y -CONFIG_MACH_TW2662=y -CONFIG_MACH_TW5334=y -CONFIG_MACH_USR8200=y -CONFIG_MACH_WG302V1=y -CONFIG_MACH_WG302V2=y -CONFIG_MACH_WRT300NV2=y -CONFIG_MDIO_BOARDINFO=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_IXP4XX=y -CONFIG_MTD_OTP=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_MACH_IO_H=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NET_VENDOR_XSCALE=y -CONFIG_NO_BOOTMEM=y -CONFIG_NVMEM=y -# CONFIG_OF is not set -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PCI=y -# CONFIG_PCI_DOMAINS_GENERIC is not set -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1672=y -CONFIG_RTC_DRV_ISL1208=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_RTC_DRV_X1205=y -CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set -CONFIG_SENSORS_AD7418=y -CONFIG_SENSORS_MAX6650=y -CONFIG_SENSORS_W83781D=y -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SRCU=y -CONFIG_SWIOTLB=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" -CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y -CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y -CONFIG_USB_SUPPORT=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/ixp4xx/generic/profiles/100-Default.mk b/target/linux/ixp4xx/generic/profiles/100-Default.mk deleted file mode 100644 index c881c8001d..0000000000 --- a/target/linux/ixp4xx/generic/profiles/100-Default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PACKAGES:=kmod-ath5k -endef - -define Profile/Default/Description - Default IXP4xx Profile -endef -$(eval $(call Profile,Default)) - diff --git a/target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk b/target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk deleted file mode 100644 index 8f74277c3b..0000000000 --- a/target/linux/ixp4xx/generic/profiles/105-Atheros-ath5k.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Atheros-ath5k - NAME:=Atheros WiFi (atk5k) - PACKAGES:=kmod-ath5k -endef - -define Profile/Atheros-ath5k/Description - Package set compatible with hardware using Atheros WiFi cards -endef -$(eval $(call Profile,Atheros-ath5k)) - diff --git a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk deleted file mode 100644 index 55073602a0..0000000000 --- a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/NSLU2 - NAME:=Linksys NSLU2 - PACKAGES:=-wpad-basic -kmod-ath5k kmod-scsi-core \ - kmod-usb-ohci-pci kmod-usb2-pci kmod-usb-storage \ - kmod-fs-ext4 -endef - -define Profile/NSLU2/Description - Package set optimized for the Linksys NSLU2 -endef -$(eval $(call Profile,NSLU2)) - diff --git a/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk b/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk deleted file mode 100644 index a50eec09e0..0000000000 --- a/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/NAS100d - NAME:=Iomega NAS 100d - PACKAGES:=kmod-ath5k \ - kmod-scsi-core \ - kmod-ata-core kmod-ata-artop \ - kmod-usb2-pci kmod-usb-storage \ - kmod-fs-ext4 -endef - -define Profile/NAS100d/Description - Package set optimized for the Iomega NAS 100d -endef -$(eval $(call Profile,NAS100d)) - diff --git a/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk b/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk deleted file mode 100644 index fe2b1ccc64..0000000000 --- a/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/DSMG600RevA - NAME:=DSM-G600 Rev A - PACKAGES:=kmod-via-velocity \ - kmod-ath5k \ - kmod-scsi-core \ - kmod-ata-core kmod-ata-artop \ - kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \ - kmod-fs-ext4 -endef - -define Profile/DSMG600RevA/Description - Package set optimized for the DSM-G600 Rev A -endef -$(eval $(call Profile,DSMG600RevA)) - diff --git a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk deleted file mode 100644 index a4c1f7f430..0000000000 --- a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/USR8200 - NAME:=USRobotics USR8200 - PACKAGES:=-wpad-basic kmod-scsi-core \ - kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \ - kmod-fs-ext4 kmod-firewire kmod-firewire-ohci kmod-firewire-sbp2 -endef - -define Profile/USR8200/Description - Package set optimized for the USRobotics USR8200 -endef -$(eval $(call Profile,USR8200)) - diff --git a/target/linux/ixp4xx/generic/target.mk b/target/linux/ixp4xx/generic/target.mk deleted file mode 100644 index 4794755fdc..0000000000 --- a/target/linux/ixp4xx/generic/target.mk +++ /dev/null @@ -1,9 +0,0 @@ -BOARDNAME:=Generic - -DEFAULT_PACKAGES+= wpad-basic - -define Target/Description - Build firmware images for ixp4xx based boards that boot from internal flash - (e.g : Linksys NSLU2, ...) -endef - diff --git a/target/linux/ixp4xx/harddisk/config-default b/target/linux/ixp4xx/harddisk/config-default deleted file mode 100644 index 78e599ca86..0000000000 --- a/target/linux/ixp4xx/harddisk/config-default +++ /dev/null @@ -1,20 +0,0 @@ -CONFIG_ATA=y -CONFIG_BLK_DEV_SD=y -CONFIG_CMDLINE="root=/dev/sda1 noinitrd console=ttyS0,115200" -CONFIG_EXT4_FS=y -CONFIG_JBD=y -CONFIG_REISERFS_FS=y -CONFIG_SATA_VIA=y -CONFIG_USB=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_SPLIT_ISO=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_HCD_PLATFORM is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_STORAGE=y diff --git a/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk b/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk deleted file mode 100644 index 489ef083a8..0000000000 --- a/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/FSG3 - NAME:=Freecom FSG-3 - PACKAGES:= \ - kmod-ath5k \ - kmod-usb-uhci kmod-usb2-pci kmod-usb-storage \ - kmod-fs-ext4 kmod-fs-reiserfs -endef - -define Profile/FSG3/Description - Package set optimized for the Freecom FSG-3 -endef -$(eval $(call Profile,FSG3)) - diff --git a/target/linux/ixp4xx/harddisk/target.mk b/target/linux/ixp4xx/harddisk/target.mk deleted file mode 100644 index c71065e5f1..0000000000 --- a/target/linux/ixp4xx/harddisk/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -BOARDNAME:=Internal Hard-Disk - -define Target/Description - Build firmware images for ixp4xx based boards that boot directly from internal disk storage - (e.g : Freecom FSG-3, ...) -endef diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile deleted file mode 100644 index 5b6ff0b08e..0000000000 --- a/target/linux/ixp4xx/image/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2006-2010 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)/image.mk - -ifdef CONFIG_PACKAGE_apex - define Image/Build/Linksys - BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ - -L $(STAGING_DIR_IMAGE)/apex-$(2)-armeb.bin \ - -k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage \ - -r rootfs:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \ - -p -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).bin - BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ - -F -L $(STAGING_DIR_IMAGE)/apex-$(2)-16mb-armeb.bin \ - -k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage \ - -r rootfs:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \ - -p -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-16mb.bin - endef -endif - -define Image/Build/Freecom - $(INSTALL_DIR) $(TARGET_DIR)/boot - # TODO: Add special CMDLINE shim for webupgrade image here - $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage $(TARGET_DIR)/zImage - $(TAR) cfj $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . - $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).img $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-webupgrade.img - rm -f $(TARGET_DIR)/zImage -endef - -define Image/BuildKernel - cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage - BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)" $(TOPDIR)/scripts/arm-magic.sh -endef - -define Image/BuildKernel/Initramfs - cp $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-initramfs-zImage - BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)-initramfs" $(TOPDIR)/scripts/arm-magic.sh -endef - -# Build sysupgrade image -define BuildFirmware/Generic - dd if=$(KDIR)/zImage of=$(KDIR)/zImage.pad bs=64k conv=sync; \ - dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.$(1).pad bs=128k conv=sync; \ - sh $(TOPDIR)/scripts/combined-image.sh \ - $(KDIR)/zImage.pad \ - $(KDIR)/root.$(1).pad \ - $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-sysupgrade.bin -endef - -define Image/Build - $(call Image/Build/$(1),$(1)) - $(call BuildFirmware/Generic,$(1)) -endef - -define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=65536 conv=sync -endef - -define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync - $(call Image/Build/Linksys,$(1),nslu2,$(1)) - $(call Image/Build/Freecom,$(1),fsg3,$(1)) -endef - -define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync - $(call Image/Build/Linksys,$(1),nslu2,$(1)) - $(call Image/Build/Freecom,$(1),fsg3,$(1)) -endef - -$(eval $(call BuildImage)) diff --git a/target/linux/ixp4xx/modules.mk b/target/linux/ixp4xx/modules.mk deleted file mode 100644 index 2d6446c05b..0000000000 --- a/target/linux/ixp4xx/modules.mk +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define KernelPackage/ata-ixp4xx-cf - SUBMENU:=$(BLOCK_MENU) - TITLE:=IXP4XX Compact Flash support - DEPENDS:=@TARGET_ixp4xx - KCONFIG:=CONFIG_PATA_IXP4XX_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.ko - AUTOLOAD:=$(call AutoLoad,41,pata_ixp4xx_cf,1) - $(call AddDepends/ata) -endef - -define KernelPackage/ata-ixp4xx-cf/description - IXP4XX Compact Flash support. -endef - -$(eval $(call KernelPackage,ata-ixp4xx-cf)) - - -define KernelPackage/ixp4xx-beeper - SUBMENU:=$(OTHER_MENU) - TITLE:=IXP4XX Beeper support - DEPENDS:=@TARGET_ixp4xx +kmod-input-core - KCONFIG:= \ - CONFIG_INPUT_MISC=y \ - CONFIG_INPUT_IXP4XX_BEEPER - FILES:=$(LINUX_DIR)/drivers/input/misc/ixp4xx-beeper.ko - AUTOLOAD:=$(call AutoLoad,50,ixp4xx-beeper) - $(call AddDepends/input) -endef - -define KernelPackage/ixp4xx-beeper/description - IXP4XX Beeper support -endef - -$(eval $(call KernelPackage,ixp4xx-beeper)) - - -define KernelPackage/crypto-hw-ixp4xx - TITLE:=Intel IXP4xx hardware crypto module - DEPENDS:=@TARGET_ixp4xx - KCONFIG:= \ - CONFIG_CRYPTO_DEV_IXP4XX - FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko - AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) - $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des) -endef - -define KernelPackage/crypto-hw-ixp4xx/description - Kernel support for the Intel IXP4xx HW crypto engine. -endef - -$(eval $(call KernelPackage,crypto-hw-ixp4xx)) - - -define KernelPackage/ixp4xx-eth - SUBMENU:=$(NETWORK_DEVICES_MENU) - TITLE:=IXP4xxt Ethernet Adapter kernel support - DEPENDS:=@TARGET_ixp4xx - KCONFIG:=CONFIG_IXP4XX_ETH - FILES:=$(LINUX_DIR)/drivers/net/ethernet/xscale/ixp4xx_eth.ko - AUTOLOAD:=$(call AutoLoad,50,ixp4xx_eth) -endef - -define KernelPackage/ixp4xx-eth/description - Kernel modules for Intel IXP4xx Ethernet chipsets. -endef - -$(eval $(call KernelPackage,ixp4xx-eth)) diff --git a/target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch b/target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch deleted file mode 100644 index 3ca3eb76a6..0000000000 --- a/target/linux/ixp4xx/patches-4.9/001-arm-ixp4xx-set-cohorent_dma_mask-for-ethernet-platfo.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 7113f56b683c5123df5c20724ac813cee66fa21a Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Mon, 1 Jul 2013 16:49:05 +0200 -Subject: [PATCH 1/2] arm: ixp4xx: set cohorent_dma_mask for ethernet platform - devices - -ARM requires the cohorent_dma_mask set, so set it for the platform -devices so that the ethernet driver has access to it. - -Signed-off-by: Jonas Gorski ---- - arch/arm/mach-ixp4xx/fsg-setup.c | 2 ++ - arch/arm/mach-ixp4xx/goramo_mlr.c | 2 ++ - arch/arm/mach-ixp4xx/ixdp425-setup.c | 3 +++ - arch/arm/mach-ixp4xx/nas100d-setup.c | 1 + - arch/arm/mach-ixp4xx/nslu2-setup.c | 1 + - arch/arm/mach-ixp4xx/omixp-setup.c | 3 +++ - arch/arm/mach-ixp4xx/vulcan-setup.c | 2 ++ - 7 files changed, 14 insertions(+) - ---- a/arch/arm/mach-ixp4xx/fsg-setup.c -+++ b/arch/arm/mach-ixp4xx/fsg-setup.c -@@ -142,12 +142,14 @@ static struct platform_device fsg_eth[] - .id = IXP4XX_ETH_NPEB, - .dev = { - .platform_data = fsg_plat_eth, -+ .coherent_dma_mask = DMA_BIT_MASK(32), - }, - }, { - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEC, - .dev = { - .platform_data = fsg_plat_eth + 1, -+ .coherent_dma_mask = DMA_BIT_MASK(32), - }, - } - }; ---- a/arch/arm/mach-ixp4xx/goramo_mlr.c -+++ b/arch/arm/mach-ixp4xx/goramo_mlr.c -@@ -295,10 +295,12 @@ static struct platform_device device_eth - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEB, - .dev.platform_data = eth_plat, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - }, { - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEC, - .dev.platform_data = eth_plat + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - } - }; - ---- a/arch/arm/mach-ixp4xx/ixdp425-setup.c -+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -196,10 +197,12 @@ static struct platform_device ixdp425_et - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEB, - .dev.platform_data = ixdp425_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - }, { - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEC, - .dev.platform_data = ixdp425_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - } - }; - ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -170,6 +170,7 @@ static struct platform_device nas100d_et - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEB, - .dev.platform_data = nas100d_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - } - }; - ---- a/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c -@@ -182,6 +182,7 @@ static struct platform_device nslu2_eth[ - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEB, - .dev.platform_data = nslu2_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - } - }; - ---- a/arch/arm/mach-ixp4xx/omixp-setup.c -+++ b/arch/arm/mach-ixp4xx/omixp-setup.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -188,10 +189,12 @@ static struct platform_device ixdp425_et - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEB, - .dev.platform_data = ixdp425_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - }, { - .name = "ixp4xx_eth", - .id = IXP4XX_ETH_NPEC, - .dev.platform_data = ixdp425_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), - }, - }; - ---- a/arch/arm/mach-ixp4xx/vulcan-setup.c -+++ b/arch/arm/mach-ixp4xx/vulcan-setup.c -@@ -139,6 +139,7 @@ static struct platform_device vulcan_eth - .id = IXP4XX_ETH_NPEB, - .dev = { - .platform_data = &vulcan_plat_eth[0], -+ .coherent_dma_mask = DMA_BIT_MASK(32), - }, - }, - [1] = { -@@ -146,6 +147,7 @@ static struct platform_device vulcan_eth - .id = IXP4XX_ETH_NPEC, - .dev = { - .platform_data = &vulcan_plat_eth[1], -+ .coherent_dma_mask = DMA_BIT_MASK(32), - }, - }, - }; diff --git a/target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch b/target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch deleted file mode 100644 index b369b56f00..0000000000 --- a/target/linux/ixp4xx/patches-4.9/002-ixp4xx_eth-use-parent-device-for-dma-allocations.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 1d67040af0144c549f4db8144d2ccc253ff8639c Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Mon, 1 Jul 2013 16:39:28 +0200 -Subject: [PATCH 2/2] net: ixp4xx_eth: use parent device for dma allocations - -Now that the platfomr device provides a dma_cohorent_mask, use it for -dma operations. - -This fixes ethernet on ixp4xx which was broken since 3.7. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/xscale/ixp4xx_eth.c | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - ---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c -+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -656,10 +656,10 @@ static inline void queue_put_desc(unsign - static inline void dma_unmap_tx(struct port *port, struct desc *desc) - { - #ifdef __ARMEB__ -- dma_unmap_single(&port->netdev->dev, desc->data, -+ dma_unmap_single(port->netdev->dev.parent, desc->data, - desc->buf_len, DMA_TO_DEVICE); - #else -- dma_unmap_single(&port->netdev->dev, desc->data & ~3, -+ dma_unmap_single(port->netdev->dev.parent, desc->data & ~3, - ALIGN((desc->data & 3) + desc->buf_len, 4), - DMA_TO_DEVICE); - #endif -@@ -725,9 +725,9 @@ static int eth_poll(struct napi_struct * - - #ifdef __ARMEB__ - if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) { -- phys = dma_map_single(&dev->dev, skb->data, -+ phys = dma_map_single(dev->dev.parent, skb->data, - RX_BUFF_SIZE, DMA_FROM_DEVICE); -- if (dma_mapping_error(&dev->dev, phys)) { -+ if (dma_mapping_error(dev->dev.parent, phys)) { - dev_kfree_skb(skb); - skb = NULL; - } -@@ -750,10 +750,11 @@ static int eth_poll(struct napi_struct * - #ifdef __ARMEB__ - temp = skb; - skb = port->rx_buff_tab[n]; -- dma_unmap_single(&dev->dev, desc->data - NET_IP_ALIGN, -+ dma_unmap_single(dev->dev.parent, desc->data - NET_IP_ALIGN, - RX_BUFF_SIZE, DMA_FROM_DEVICE); - #else -- dma_sync_single_for_cpu(&dev->dev, desc->data - NET_IP_ALIGN, -+ dma_sync_single_for_cpu(dev->dev.parent, -+ desc->data - NET_IP_ALIGN, - RX_BUFF_SIZE, DMA_FROM_DEVICE); - memcpy_swab32((u32 *)skb->data, (u32 *)port->rx_buff_tab[n], - ALIGN(NET_IP_ALIGN + desc->pkt_len, 4) / 4); -@@ -872,7 +873,7 @@ static int eth_xmit(struct sk_buff *skb, - memcpy_swab32(mem, (u32 *)((int)skb->data & ~3), bytes / 4); - #endif - -- phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE); -+ phys = dma_map_single(dev->dev.parent, mem, bytes, DMA_TO_DEVICE); - if (dma_mapping_error(&dev->dev, phys)) { - dev_kfree_skb(skb); - #ifndef __ARMEB__ -@@ -1107,7 +1108,7 @@ static int init_queues(struct port *port - int i; - - if (!ports_open) { -- dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev, -+ dma_pool = dma_pool_create(DRV_NAME, port->netdev->dev.parent, - POOL_ALLOC_SIZE, 32, 0); - if (!dma_pool) - return -ENOMEM; -@@ -1135,9 +1136,9 @@ static int init_queues(struct port *port - data = buff; - #endif - desc->buf_len = MAX_MRU; -- desc->data = dma_map_single(&port->netdev->dev, data, -+ desc->data = dma_map_single(port->netdev->dev.parent, data, - RX_BUFF_SIZE, DMA_FROM_DEVICE); -- if (dma_mapping_error(&port->netdev->dev, desc->data)) { -+ if (dma_mapping_error(port->netdev->dev.parent, desc->data)) { - free_buffer(buff); - return -EIO; - } -@@ -1157,7 +1158,7 @@ static void destroy_queues(struct port * - struct desc *desc = rx_desc_ptr(port, i); - buffer_t *buff = port->rx_buff_tab[i]; - if (buff) { -- dma_unmap_single(&port->netdev->dev, -+ dma_unmap_single(port->netdev->dev.parent, - desc->data - NET_IP_ALIGN, - RX_BUFF_SIZE, DMA_FROM_DEVICE); - free_buffer(buff); diff --git a/target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch b/target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch deleted file mode 100644 index 185a09fff2..0000000000 --- a/target/linux/ixp4xx/patches-4.9/020-gateworks_i2c_pld.patch +++ /dev/null @@ -1,424 +0,0 @@ ---- a/drivers/gpio/Kconfig -+++ b/drivers/gpio/Kconfig -@@ -656,6 +656,14 @@ config GPIO_WS16C48 - parameter. The interrupt line numbers for the devices may be - configured via the irq module parameter. - -+config GPIO_GW_I2C_PLD -+ tristate "Gateworks I2C PLD GPIO Expander" -+ depends on I2C -+ help -+ Say yes here to provide access to the Gateworks I2C PLD GPIO -+ Expander. This is used at least on the GW2358-4. -+ -+ - endmenu - - menu "I2C GPIO expanders" ---- a/drivers/gpio/Makefile -+++ b/drivers/gpio/Makefile -@@ -48,6 +48,7 @@ obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x - obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o - obj-$(CONFIG_GPIO_GPIO_MM) += gpio-gpio-mm.o - obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o -+obj-$(CONFIG_GPIO_GW_I2C_PLD) += gw_i2c_pld.o - obj-$(CONFIG_HTC_EGPIO) += gpio-htc-egpio.o - obj-$(CONFIG_GPIO_ICH) += gpio-ich.o - obj-$(CONFIG_GPIO_IOP) += gpio-iop.o ---- /dev/null -+++ b/drivers/gpio/gw_i2c_pld.c -@@ -0,0 +1,371 @@ -+/* -+ * Gateworks I2C PLD GPIO expander -+ * -+ * Copyright (C) 2009 Gateworks Corporation -+ * -+ * 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. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static const struct i2c_device_id gw_i2c_pld_id[] = { -+ { "gw_i2c_pld", 8 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, gw_i2c_pld_id); -+ -+/* -+ * The Gateworks I2C PLD chip only expose one read and one -+ * write register. Writing a "one" bit (to match the reset state) lets -+ * that pin be used as an input. It is an open-drain model. -+ */ -+ -+struct gw_i2c_pld { -+ struct gpio_chip chip; -+ struct i2c_client *client; -+ unsigned out; /* software latch */ -+}; -+ -+/*-------------------------------------------------------------------------*/ -+ -+/* -+ * The Gateworks I2C PLD chip does not properly send the acknowledge bit -+ * thus we cannot use standard i2c_smbus functions. We have recreated -+ * our own here, but we still use the rt_mutex_lock to lock the i2c_bus -+ * as the device still exists on the I2C bus. -+*/ -+ -+#define PLD_SCL_GPIO 6 -+#define PLD_SDA_GPIO 7 -+ -+#define SCL_LO() gpio_line_set(PLD_SCL_GPIO, IXP4XX_GPIO_LOW) -+#define SCL_HI() gpio_line_set(PLD_SCL_GPIO, IXP4XX_GPIO_HIGH) -+#define SCL_EN() gpio_line_config(PLD_SCL_GPIO, IXP4XX_GPIO_OUT) -+#define SDA_LO() gpio_line_set(PLD_SDA_GPIO, IXP4XX_GPIO_LOW) -+#define SDA_HI() gpio_line_set(PLD_SDA_GPIO, IXP4XX_GPIO_HIGH) -+#define SDA_EN() gpio_line_config(PLD_SDA_GPIO, IXP4XX_GPIO_OUT) -+#define SDA_DIS() gpio_line_config(PLD_SDA_GPIO, IXP4XX_GPIO_IN) -+#define SDA_IN(x) gpio_line_get(PLD_SDA_GPIO, &x); -+ -+static int i2c_pld_write_byte(int address, int byte) -+{ -+ int i; -+ -+ address = (address << 1) & ~0x1; -+ -+ SDA_HI(); -+ SDA_EN(); -+ SCL_EN(); -+ SCL_HI(); -+ SDA_LO(); -+ SCL_LO(); -+ -+ for (i = 7; i >= 0; i--) -+ { -+ if (address & (1 << i)) -+ SDA_HI(); -+ else -+ SDA_LO(); -+ -+ SCL_HI(); -+ SCL_LO(); -+ } -+ -+ SDA_DIS(); -+ SCL_HI(); -+ SDA_IN(i); -+ SCL_LO(); -+ SDA_EN(); -+ -+ for (i = 7; i >= 0; i--) -+ { -+ if (byte & (1 << i)) -+ SDA_HI(); -+ else -+ SDA_LO(); -+ SCL_HI(); -+ SCL_LO(); -+ } -+ -+ SDA_DIS(); -+ SCL_HI(); -+ SDA_IN(i); -+ SCL_LO(); -+ -+ SDA_HI(); -+ SDA_EN(); -+ -+ SDA_LO(); -+ SCL_HI(); -+ SDA_HI(); -+ SCL_LO(); -+ SCL_HI(); -+ -+ return 0; -+} -+ -+static unsigned int i2c_pld_read_byte(int address) -+{ -+ int i = 0, byte = 0; -+ int bit; -+ -+ address = (address << 1) | 0x1; -+ -+ SDA_HI(); -+ SDA_EN(); -+ SCL_EN(); -+ SCL_HI(); -+ SDA_LO(); -+ SCL_LO(); -+ -+ for (i = 7; i >= 0; i--) -+ { -+ if (address & (1 << i)) -+ SDA_HI(); -+ else -+ SDA_LO(); -+ -+ SCL_HI(); -+ SCL_LO(); -+ } -+ -+ SDA_DIS(); -+ SCL_HI(); -+ SDA_IN(i); -+ SCL_LO(); -+ SDA_EN(); -+ -+ SDA_DIS(); -+ for (i = 7; i >= 0; i--) -+ { -+ SCL_HI(); -+ SDA_IN(bit); -+ byte |= bit << i; -+ SCL_LO(); -+ } -+ -+ SDA_LO(); -+ SCL_HI(); -+ SDA_HI(); -+ SCL_LO(); -+ SCL_HI(); -+ -+ return byte; -+} -+ -+ -+static int gw_i2c_pld_input8(struct gpio_chip *chip, unsigned offset) -+{ -+ int ret; -+ struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip); -+ struct i2c_adapter *adap = gpio->client->adapter; -+ -+ if (in_atomic() || irqs_disabled()) { -+ ret = rt_mutex_trylock(&adap->bus_lock); -+ if (!ret) -+ /* I2C activity is ongoing. */ -+ return -EAGAIN; -+ } else { -+ rt_mutex_lock(&adap->bus_lock); -+ } -+ -+ gpio->out |= (1 << offset); -+ -+ ret = i2c_pld_write_byte(gpio->client->addr, gpio->out); -+ -+ rt_mutex_unlock(&adap->bus_lock); -+ -+ return ret; -+} -+ -+static int gw_i2c_pld_get8(struct gpio_chip *chip, unsigned offset) -+{ -+ int ret; -+ s32 value; -+ struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip); -+ struct i2c_adapter *adap = gpio->client->adapter; -+ -+ if (in_atomic() || irqs_disabled()) { -+ ret = rt_mutex_trylock(&adap->bus_lock); -+ if (!ret) -+ /* I2C activity is ongoing. */ -+ return -EAGAIN; -+ } else { -+ rt_mutex_lock(&adap->bus_lock); -+ } -+ -+ value = i2c_pld_read_byte(gpio->client->addr); -+ -+ rt_mutex_unlock(&adap->bus_lock); -+ -+ return (value < 0) ? 0 : (value & (1 << offset)); -+} -+ -+static int gw_i2c_pld_output8(struct gpio_chip *chip, unsigned offset, int value) -+{ -+ int ret; -+ -+ struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip); -+ struct i2c_adapter *adap = gpio->client->adapter; -+ -+ unsigned bit = 1 << offset; -+ -+ if (in_atomic() || irqs_disabled()) { -+ ret = rt_mutex_trylock(&adap->bus_lock); -+ if (!ret) -+ /* I2C activity is ongoing. */ -+ return -EAGAIN; -+ } else { -+ rt_mutex_lock(&adap->bus_lock); -+ } -+ -+ -+ if (value) -+ gpio->out |= bit; -+ else -+ gpio->out &= ~bit; -+ -+ ret = i2c_pld_write_byte(gpio->client->addr, gpio->out); -+ -+ rt_mutex_unlock(&adap->bus_lock); -+ -+ return ret; -+} -+ -+static void gw_i2c_pld_set8(struct gpio_chip *chip, unsigned offset, int value) -+{ -+ gw_i2c_pld_output8(chip, offset, value); -+} -+ -+/*-------------------------------------------------------------------------*/ -+ -+static int gw_i2c_pld_probe(struct i2c_client *client, -+ const struct i2c_device_id *id) -+{ -+ struct gw_i2c_pld_platform_data *pdata; -+ struct gw_i2c_pld *gpio; -+ int status; -+ -+ pdata = client->dev.platform_data; -+ if (!pdata) -+ return -ENODEV; -+ -+ /* Allocate, initialize, and register this gpio_chip. */ -+ gpio = kzalloc(sizeof *gpio, GFP_KERNEL); -+ if (!gpio) -+ return -ENOMEM; -+ -+ gpio->chip.base = pdata->gpio_base; -+ gpio->chip.can_sleep = 1; -+ gpio->chip.dev = &client->dev; -+ gpio->chip.owner = THIS_MODULE; -+ -+ gpio->chip.ngpio = pdata->nr_gpio; -+ gpio->chip.direction_input = gw_i2c_pld_input8; -+ gpio->chip.get = gw_i2c_pld_get8; -+ gpio->chip.direction_output = gw_i2c_pld_output8; -+ gpio->chip.set = gw_i2c_pld_set8; -+ -+ gpio->chip.label = client->name; -+ -+ gpio->client = client; -+ i2c_set_clientdata(client, gpio); -+ -+ gpio->out = 0xFF; -+ -+ status = gpiochip_add(&gpio->chip); -+ if (status < 0) -+ goto fail; -+ -+ dev_info(&client->dev, "gpios %d..%d on a %s%s\n", -+ gpio->chip.base, -+ gpio->chip.base + gpio->chip.ngpio - 1, -+ client->name, -+ client->irq ? " (irq ignored)" : ""); -+ -+ /* Let platform code set up the GPIOs and their users. -+ * Now is the first time anyone could use them. -+ */ -+ if (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); -+ } -+ -+ return 0; -+ -+fail: -+ dev_dbg(&client->dev, "probe error %d for '%s'\n", -+ status, client->name); -+ kfree(gpio); -+ return status; -+} -+ -+static int gw_i2c_pld_remove(struct i2c_client *client) -+{ -+ struct gw_i2c_pld_platform_data *pdata = client->dev.platform_data; -+ struct gw_i2c_pld *gpio = i2c_get_clientdata(client); -+ int status = 0; -+ -+ if (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); -+ return status; -+ } -+ } -+ -+ gpiochip_remove(&gpio->chip); -+ kfree(gpio); -+ return 0; -+} -+ -+static struct i2c_driver gw_i2c_pld_driver = { -+ .driver = { -+ .name = "gw_i2c_pld", -+ .owner = THIS_MODULE, -+ }, -+ .probe = gw_i2c_pld_probe, -+ .remove = gw_i2c_pld_remove, -+ .id_table = gw_i2c_pld_id, -+}; -+ -+static int __init gw_i2c_pld_init(void) -+{ -+ return i2c_add_driver(&gw_i2c_pld_driver); -+} -+module_init(gw_i2c_pld_init); -+ -+static void __exit gw_i2c_pld_exit(void) -+{ -+ i2c_del_driver(&gw_i2c_pld_driver); -+} -+module_exit(gw_i2c_pld_exit); -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Chris Lang"); ---- /dev/null -+++ b/include/linux/i2c/gw_i2c_pld.h -@@ -0,0 +1,20 @@ -+#ifndef __LINUX_GW_I2C_PLD_H -+#define __LINUX_GW_I2C_PLD_H -+ -+/** -+ * The Gateworks I2C PLD Implements an additional 8 bits of GPIO through the PLD -+ */ -+ -+struct gw_i2c_pld_platform_data { -+ unsigned gpio_base; -+ unsigned nr_gpio; -+ 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; -+}; -+ -+#endif /* __LINUX_GW_I2C_PLD_H */ diff --git a/target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch b/target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch deleted file mode 100644 index 0e51793273..0000000000 --- a/target/linux/ixp4xx/patches-4.9/030-gpio_line_config.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/common.c -+++ b/arch/arm/mach-ixp4xx/common.c -@@ -93,22 +93,7 @@ void __init ixp4xx_map_io(void) - /* - * GPIO-functions - */ --/* -- * The following converted to the real HW bits the gpio_line_config -- */ --/* GPIO pin types */ --#define IXP4XX_GPIO_OUT 0x1 --#define IXP4XX_GPIO_IN 0x2 -- --/* GPIO signal types */ --#define IXP4XX_GPIO_LOW 0 --#define IXP4XX_GPIO_HIGH 1 -- --/* GPIO Clocks */ --#define IXP4XX_GPIO_CLK_0 14 --#define IXP4XX_GPIO_CLK_1 15 -- --static void gpio_line_config(u8 line, u32 direction) -+void gpio_line_config(u8 line, u32 direction) - { - if (direction == IXP4XX_GPIO_IN) - *IXP4XX_GPIO_GPOER |= (1 << line); -@@ -116,17 +101,17 @@ static void gpio_line_config(u8 line, u3 - *IXP4XX_GPIO_GPOER &= ~(1 << line); - } - --static void gpio_line_get(u8 line, int *value) -+void gpio_line_get(u8 line, int *value) - { - *value = (*IXP4XX_GPIO_GPINR >> line) & 0x1; - } - --static void gpio_line_set(u8 line, int value) -+void gpio_line_set(u8 line, int value) - { -- if (value == IXP4XX_GPIO_HIGH) -- *IXP4XX_GPIO_GPOUTR |= (1 << line); -- else if (value == IXP4XX_GPIO_LOW) -+ if (value == IXP4XX_GPIO_LOW) - *IXP4XX_GPIO_GPOUTR &= ~(1 << line); -+ else -+ *IXP4XX_GPIO_GPOUTR |= (1 << line); - } - - /************************************************************************* ---- a/arch/arm/mach-ixp4xx/include/mach/platform.h -+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h -@@ -131,5 +131,21 @@ struct pci_sys_data; - extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); - extern struct pci_ops ixp4xx_ops; - -+/* GPIO pin types */ -+#define IXP4XX_GPIO_OUT 0x1 -+#define IXP4XX_GPIO_IN 0x2 -+ -+/* GPIO signal types */ -+#define IXP4XX_GPIO_LOW 0 -+#define IXP4XX_GPIO_HIGH 1 -+ -+/* GPIO Clocks */ -+#define IXP4XX_GPIO_CLK_0 14 -+#define IXP4XX_GPIO_CLK_1 15 -+ -+void gpio_line_config(u8 line, u32 direction); -+void gpio_line_get(u8 line, int *value); -+void gpio_line_set(u8 line, int value); -+ - #endif // __ASSEMBLY__ - diff --git a/target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch b/target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch deleted file mode 100644 index c6392ef2f8..0000000000 --- a/target/linux/ixp4xx/patches-4.9/040-arm_mach_types.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/arch/arm/tools/mach-types -+++ b/arch/arm/tools/mach-types -@@ -1006,3 +1006,15 @@ eco5_bx2 MACH_ECO5_BX2 ECO5_BX2 4572 - eukrea_cpuimx28sd MACH_EUKREA_CPUIMX28SD EUKREA_CPUIMX28SD 4573 - domotab MACH_DOMOTAB DOMOTAB 4574 - pfla03 MACH_PFLA03 PFLA03 4575 -+wg302v1 MACH_WG302V1 WG302V1 889 -+pronghorn MACH_PRONGHORN PRONGHORN 928 -+pronghorn_metro MACH_PRONGHORNMETRO PRONGHORNMETRO 1040 -+sidewinder MACH_SIDEWINDER SIDEWINDER 1041 -+wrt300nv2 MACH_WRT300NV2 WRT300NV2 1077 -+compex42x MACH_COMPEXWP18 COMPEXWP18 1273 -+cambria MACH_CAMBRIA CAMBRIA 1468 -+ap1000 MACH_AP1000 AP1000 1543 -+tw2662 MACH_TW2662 TW2662 1658 -+tw5334 MACH_TW5334 TW5334 1664 -+usr8200 MACH_USR8200 USR8200 1762 -+mi424wr MACH_MI424WR MI424WR 1778 diff --git a/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch deleted file mode 100644 index 9da213911e..0000000000 --- a/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -279,11 +279,11 @@ - /* - * Configuration information - */ --#define INPUT_POOL_SHIFT 12 -+#define INPUT_POOL_SHIFT 13 - #define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5)) --#define OUTPUT_POOL_SHIFT 10 -+#define OUTPUT_POOL_SHIFT 11 - #define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5)) --#define SEC_XFER_SIZE 512 -+#define SEC_XFER_SIZE 1024 - #define EXTRACT_SIZE 10 - - #define DEBUG_RANDOM_BOOT 0 diff --git a/target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch deleted file mode 100644 index 317103fdab..0000000000 --- a/target/linux/ixp4xx/patches-4.9/100-wg302v2_gateway7001_mac_plat_info.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/gateway7001-setup.c -+++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -75,9 +76,37 @@ static struct platform_device gateway700 - .resource = &gateway7001_uart_resource, - }; - -+static struct eth_plat_info gateway7001_plat_eth[] = { -+ { -+ .phy = 1, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 2, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device gateway7001_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = gateway7001_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = gateway7001_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ - static struct platform_device *gateway7001_devices[] __initdata = { - &gateway7001_flash, -- &gateway7001_uart -+ &gateway7001_uart, -+ &gateway7001_eth[0], -+ &gateway7001_eth[1], - }; - - static void __init gateway7001_init(void) ---- a/arch/arm/mach-ixp4xx/wg302v2-setup.c -+++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c -@@ -76,9 +76,26 @@ static struct platform_device wg302v2_ua - .resource = &wg302v2_uart_resource, - }; - -+static struct eth_plat_info wg302v2_plat_eth[] = { -+ { -+ .phy = 8, -+ .rxq = 3, -+ .txreadyq = 20, -+ } -+}; -+ -+static struct platform_device wg302v2_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = wg302v2_plat_eth, -+ } -+}; -+ - static struct platform_device *wg302v2_devices[] __initdata = { - &wg302v2_flash, - &wg302v2_uart, -+ &wg302v2_eth[0], - }; - - static void __init wg302v2_init(void) diff --git a/target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch b/target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch deleted file mode 100644 index 8793549c64..0000000000 --- a/target/linux/ixp4xx/patches-4.9/105-wg302v1_support.patch +++ /dev/null @@ -1,261 +0,0 @@ ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig -@@ -13,6 +13,7 @@ CONFIG_MACH_AVILA=y - CONFIG_MACH_LOFT=y - CONFIG_ARCH_ADI_COYOTE=y - CONFIG_MACH_GATEWAY7001=y -+CONFIG_MACH_WG302V1=y - CONFIG_MACH_WG302V2=y - CONFIG_ARCH_IXDP425=y - CONFIG_MACH_IXDPG425=y ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -45,6 +45,14 @@ config MACH_GATEWAY7001 - 7001 Access Point. For more information on this platform, - see http://openwrt.org - -+config MACH_WG302V1 -+ bool "Netgear WG302 v1 / WAG302 v1" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support Netgear's -+ WG302 v1 or WAG302 v1 Access Points. For more information -+ on this platform, see http://openwrt.org -+ - config MACH_WG302V2 - bool "Netgear WG302 v2 / WAG302 v2" - select PCI ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p - obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o - obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o - obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o -+obj-pci-$(CONFIG_MACH_WG302V1) += wg302v1-pci.o - obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o - obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o - obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-pci.o -@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup. - obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o - obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o - obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o -+obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o - obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o - obj-$(CONFIG_MACH_FSG) += fsg-setup.o - obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/wg302v1-pci.c -@@ -0,0 +1,63 @@ -+/* -+ * arch/arch/mach-ixp4xx/wg302v1-pci.c -+ * -+ * PCI setup routines for the Netgear WG302 v1 and WAG302 v1 -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Software, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+ -+void __init wg302v1_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init wg302v1_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 1) -+ return IRQ_IXP4XX_GPIO8; -+ else if (slot == 2) -+ return IRQ_IXP4XX_GPIO10; -+ else -+ return -1; -+} -+ -+struct hw_pci wg302v1_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = wg302v1_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = wg302v1_map_irq, -+}; -+ -+int __init wg302v1_pci_init(void) -+{ -+ if (machine_is_wg302v1()) -+ pci_common_init(&wg302v1_pci); -+ return 0; -+} -+ -+subsys_initcall(wg302v1_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c -@@ -0,0 +1,147 @@ -+/* -+ * arch/arm/mach-ixp4xx/wg302v1-setup.c -+ * -+ * Board setup for the Netgear WG302 v1 and WAG302 v1 -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct flash_platform_data wg302v1_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource wg302v1_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device wg302v1_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &wg302v1_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &wg302v1_flash_resource, -+}; -+ -+static struct resource wg302v1_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ } -+}; -+ -+static struct plat_serial8250_port wg302v1_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device wg302v1_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = wg302v1_uart_data, -+ }, -+ .num_resources = 2, -+ .resource = wg302v1_uart_resources, -+}; -+ -+static struct eth_plat_info wg302v1_plat_eth[] = { -+ { -+ .phy = 30, -+ .rxq = 3, -+ .txreadyq = 20, -+ } -+}; -+ -+static struct platform_device wg302v1_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = wg302v1_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *wg302v1_devices[] __initdata = { -+ &wg302v1_flash, -+ &wg302v1_uart, -+ &wg302v1_eth[0], -+}; -+ -+static void __init wg302v1_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ wg302v1_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ wg302v1_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(wg302v1_devices, ARRAY_SIZE(wg302v1_devices)); -+} -+ -+#ifdef CONFIG_MACH_WG302V1 -+MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1") -+ /* Maintainer: Imre Kaloz */ -+ .fixup = wg302v1_fixup, -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = wg302v1_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+#endif diff --git a/target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch deleted file mode 100644 index d1fdfcba49..0000000000 --- a/target/linux/ixp4xx/patches-4.9/110-pronghorn_series_support.patch +++ /dev/null @@ -1,393 +0,0 @@ ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig -@@ -15,6 +15,8 @@ CONFIG_ARCH_ADI_COYOTE=y - CONFIG_MACH_GATEWAY7001=y - CONFIG_MACH_WG302V1=y - CONFIG_MACH_WG302V2=y -+CONFIG_MACH_PRONGHORN=y -+CONFIG_MACH_PRONGHORNMETRO=y - CONFIG_ARCH_IXDP425=y - CONFIG_MACH_IXDPG425=y - CONFIG_MACH_IXDP465=y ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -61,6 +61,22 @@ config MACH_WG302V2 - WG302 v2 or WAG302 v2 Access Points. For more information - on this platform, see http://openwrt.org - -+config MACH_PRONGHORN -+ bool "ADI Pronghorn series" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support the ADI -+ Engineering Pronghorn series. For more -+ information on this platform, see http://www.adiengineering.com -+ -+# -+# There're only minimal differences kernel-wise between the Pronghorn and -+# Pronghorn Metro boards - they use different chip selects to drive the -+# CF slot connected to the expansion bus, so we just enable them together. -+# -+config MACH_PRONGHORNMETRO -+ def_bool MACH_PRONGHORN -+ - config ARCH_IXDP425 - bool "IXDP425" - help ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_WG302V1) += wg302 - obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o - obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o - obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-pci.o -+obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o - - obj-y += common.o - -@@ -39,6 +40,7 @@ obj-$(CONFIG_MACH_WG302V2) += wg302v2-se - obj-$(CONFIG_MACH_FSG) += fsg-setup.o - obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o - obj-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-setup.o -+obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h -+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set - */ - if (machine_is_adi_coyote() || machine_is_gtwx5715() || - machine_is_gateway7001() || machine_is_wg302v2() || -- machine_is_devixp() || machine_is_miccpt() || machine_is_mic256()) -+ machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() || -+ machine_is_pronghorn() || machine_is_pronghorn_metro()) - uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; - else - uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/pronghorn-pci.c -@@ -0,0 +1,69 @@ -+/* -+ * arch/arch/mach-ixp4xx/pronghorn-pci.c -+ * -+ * PCI setup routines for ADI Engineering Pronghorn series -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+ -+void __init pronghorn_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init pronghorn_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 13) -+ return IRQ_IXP4XX_GPIO4; -+ else if (slot == 14) -+ return IRQ_IXP4XX_GPIO6; -+ else if (slot == 15) -+ return IRQ_IXP4XX_GPIO11; -+ else if (slot == 16) -+ return IRQ_IXP4XX_GPIO1; -+ else -+ return -1; -+} -+ -+struct hw_pci pronghorn_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = pronghorn_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = pronghorn_map_irq, -+}; -+ -+int __init pronghorn_pci_init(void) -+{ -+ if (machine_is_pronghorn() || machine_is_pronghorn_metro()) -+ pci_common_init(&pronghorn_pci); -+ return 0; -+} -+ -+subsys_initcall(pronghorn_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c -@@ -0,0 +1,252 @@ -+/* -+ * arch/arm/mach-ixp4xx/pronghorn-setup.c -+ * -+ * Board setup for the ADI Engineering Pronghorn series -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct flash_platform_data pronghorn_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource pronghorn_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device pronghorn_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &pronghorn_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &pronghorn_flash_resource, -+}; -+ -+static struct resource pronghorn_uart_resources [] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port pronghorn_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device pronghorn_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = pronghorn_uart_data, -+ }, -+ .num_resources = 2, -+ .resource = pronghorn_uart_resources, -+}; -+ -+static struct i2c_gpio_platform_data pronghorn_i2c_gpio_data = { -+ .sda_pin = 9, -+ .scl_pin = 10, -+}; -+ -+static struct platform_device pronghorn_i2c_gpio = { -+ .name = "i2c-gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &pronghorn_i2c_gpio_data, -+ }, -+}; -+ -+static struct gpio_led pronghorn_led_pin[] = { -+ { -+ .name = "pronghorn:green:status", -+ .gpio = 7, -+ } -+}; -+ -+static struct gpio_led_platform_data pronghorn_led_data = { -+ .num_leds = 1, -+ .leds = pronghorn_led_pin, -+}; -+ -+static struct platform_device pronghorn_led = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev.platform_data = &pronghorn_led_data, -+}; -+ -+static struct resource pronghorn_pata_resources[] = { -+ { -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .name = "intrq", -+ .start = IRQ_IXP4XX_GPIO0, -+ .end = IRQ_IXP4XX_GPIO0, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct ixp4xx_pata_data pronghorn_pata_data = { -+ .cs0_bits = 0xbfff0043, -+ .cs1_bits = 0xbfff0043, -+}; -+ -+static struct platform_device pronghorn_pata = { -+ .name = "pata_ixp4xx_cf", -+ .id = 0, -+ .dev.platform_data = &pronghorn_pata_data, -+ .num_resources = ARRAY_SIZE(pronghorn_pata_resources), -+ .resource = pronghorn_pata_resources, -+}; -+ -+static struct eth_plat_info pronghorn_plat_eth[] = { -+ { -+ .phy = 0, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device pronghorn_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = pronghorn_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = pronghorn_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *pronghorn_devices[] __initdata = { -+ &pronghorn_flash, -+ &pronghorn_uart, -+ &pronghorn_led, -+ &pronghorn_eth[0], -+ &pronghorn_eth[1], -+}; -+ -+static void __init pronghorn_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ pronghorn_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ pronghorn_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(pronghorn_devices, ARRAY_SIZE(pronghorn_devices)); -+ -+ if (machine_is_pronghorn()) { -+ pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2); -+ pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(2); -+ -+ pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(3); -+ pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(3); -+ -+ pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS2; -+ pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS3; -+ } else { -+ pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3); -+ pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3); -+ -+ pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4); -+ pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4); -+ -+ pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3; -+ pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4; -+ -+ platform_device_register(&pronghorn_i2c_gpio); -+ } -+ -+ platform_device_register(&pronghorn_pata); -+} -+ -+MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = pronghorn_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+ -+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = pronghorn_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END diff --git a/target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch b/target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch deleted file mode 100644 index ed9f7a785d..0000000000 --- a/target/linux/ixp4xx/patches-4.9/111-pronghorn_swap_uarts.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/pronghorn-setup.c -+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c -@@ -52,31 +52,31 @@ static struct platform_device pronghorn_ - - static struct resource pronghorn_uart_resources [] = { - { -- .start = IXP4XX_UART1_BASE_PHYS, -- .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, - .flags = IORESOURCE_MEM - }, - { -- .start = IXP4XX_UART2_BASE_PHYS, -- .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, - .flags = IORESOURCE_MEM - } - }; - - static struct plat_serial8250_port pronghorn_uart_data[] = { - { -- .mapbase = IXP4XX_UART1_BASE_PHYS, -- .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -- .irq = IRQ_IXP4XX_UART1, -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, - .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, - .iotype = UPIO_MEM, - .regshift = 2, - .uartclk = IXP4XX_UART_XTAL, - }, - { -- .mapbase = IXP4XX_UART2_BASE_PHYS, -- .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -- .irq = IRQ_IXP4XX_UART2, -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, - .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, - .iotype = UPIO_MEM, - .regshift = 2, diff --git a/target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch b/target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch deleted file mode 100644 index 20adbb5c04..0000000000 --- a/target/linux/ixp4xx/patches-4.9/115-sidewinder_support.patch +++ /dev/null @@ -1,286 +0,0 @@ -From 95dac4a842a3c66f69f949b48f9075e16275f77b Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 30 Jun 2013 15:48:47 +0200 -Subject: [PATCH 07/36] 115-sidewinder_support.patch - ---- - arch/arm/mach-ixp4xx/Kconfig | 10 +- - arch/arm/mach-ixp4xx/Makefile | 2 + - arch/arm/mach-ixp4xx/sidewinder-pci.c | 68 ++++++++++++++ - arch/arm/mach-ixp4xx/sidewinder-setup.c | 151 +++++++++++++++++++++++++++++++ - 4 files changed, 230 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/mach-ixp4xx/sidewinder-pci.c - create mode 100644 arch/arm/mach-ixp4xx/sidewinder-setup.c - ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -77,6 +77,14 @@ config MACH_PRONGHORN - config MACH_PRONGHORNMETRO - def_bool MACH_PRONGHORN - -+config MACH_SIDEWINDER -+ bool "ADI Sidewinder" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support the ADI -+ Engineering Sidewinder board. For more information on this -+ platform, see http://www.adiengineering.com -+ - config ARCH_IXDP425 - bool "IXDP425" - help -@@ -173,7 +181,7 @@ config MACH_ARCOM_VULCAN - # - config CPU_IXP46X - bool -- depends on MACH_IXDP465 -+ depends on MACH_IXDP465 || MACH_SIDEWINDER - default y - - config CPU_IXP43X ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302 - obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o - obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-pci.o - obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o -+obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o - - obj-y += common.o - -@@ -41,6 +42,7 @@ obj-$(CONFIG_MACH_FSG) += fsg-setup.o - obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o - obj-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-setup.o - obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o -+obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/sidewinder-pci.c -@@ -0,0 +1,67 @@ -+/* -+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c -+ * -+ * PCI setup routines for ADI Engineering Sidewinder -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+void __init sidewinder_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init sidewinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 1) -+ return IRQ_IXP4XX_GPIO11; -+ else if (slot == 2) -+ return IRQ_IXP4XX_GPIO10; -+ else if (slot == 3) -+ return IRQ_IXP4XX_GPIO9; -+ else -+ return -1; -+} -+ -+struct hw_pci sidewinder_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = sidewinder_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = sidewinder_map_irq, -+}; -+ -+int __init sidewinder_pci_init(void) -+{ -+ if (machine_is_sidewinder()) -+ pci_common_init(&sidewinder_pci); -+ return 0; -+} -+ -+subsys_initcall(sidewinder_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c -@@ -0,0 +1,155 @@ -+/* -+ * arch/arm/mach-ixp4xx/sidewinder-setup.c -+ * -+ * Board setup for the ADI Engineering Sidewinder -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+static struct flash_platform_data sidewinder_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource sidewinder_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device sidewinder_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &sidewinder_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &sidewinder_flash_resource, -+}; -+ -+static struct resource sidewinder_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ } -+}; -+ -+static struct plat_serial8250_port sidewinder_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device sidewinder_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = sidewinder_uart_data, -+ }, -+ .num_resources = ARRAY_SIZE(sidewinder_uart_resources), -+ .resource = sidewinder_uart_resources, -+}; -+ -+static struct eth_plat_info sidewinder_plat_eth[] = { -+ { -+ .phy = 5, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x1e, -+ .rxq = 4, -+ .txreadyq = 21, -+ }, { -+ .phy = 31, -+ .rxq = 2, -+ .txreadyq = 19, -+ } -+}; -+ -+static struct platform_device sidewinder_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = sidewinder_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = sidewinder_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEA, -+ .dev.platform_data = sidewinder_plat_eth + 2, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *sidewinder_devices[] __initdata = { -+ &sidewinder_flash, -+ &sidewinder_uart, -+ &sidewinder_eth[0], -+ &sidewinder_eth[1], -+ &sidewinder_eth[2], -+}; -+ -+static void __init sidewinder_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ sidewinder_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ sidewinder_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_64M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(sidewinder_devices, ARRAY_SIZE(sidewinder_devices)); -+} -+ -+MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = sidewinder_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END diff --git a/target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch b/target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch deleted file mode 100644 index 8a28eb0a7a..0000000000 --- a/target/linux/ixp4xx/patches-4.9/116-sidewinder_fis_location.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - struct fis_image_desc { - unsigned char name[16]; // Null terminated name - uint32_t flash_base; // Address within FLASH of image -@@ -48,7 +50,8 @@ struct fis_list { - struct fis_list *next; - }; - --static int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK; -+int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK; -+ - module_param(directory, int, 0); - - static inline int redboot_checksum(struct fis_image_desc *img) -@@ -76,6 +79,8 @@ static int parse_redboot_partitions(stru - #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED - static char nullstring[] = "unallocated"; - #endif -+ if (machine_is_sidewinder()) -+ directory = -5; - - if ( directory < 0 ) { - offset = master->size + directory * master->erasesize; diff --git a/target/linux/ixp4xx/patches-4.9/120-compex_support.patch b/target/linux/ixp4xx/patches-4.9/120-compex_support.patch deleted file mode 100644 index 2abc159f04..0000000000 --- a/target/linux/ixp4xx/patches-4.9/120-compex_support.patch +++ /dev/null @@ -1,199 +0,0 @@ -From 24025a2dcf1248079dd3019fac6ed955252d277f Mon Sep 17 00:00:00 2001 -From: Imre Kaloz -Date: Mon, 14 Jul 2008 21:56:34 +0200 -Subject: [PATCH] Add support for the Compex WP18 / NP18A boards - -Signed-off-by: Imre Kaloz ---- - ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -85,6 +85,14 @@ config MACH_SIDEWINDER - Engineering Sidewinder board. For more information on this - platform, see http://www.adiengineering.com - -+config MACH_COMPEXWP18 -+ bool "Compex WP18 / NP18A" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support Compex' -+ WP18 or NP18A boards. For more information on this -+ platform, see http://www.compex.com.sg/home/OEM/product_ap.htm -+ - config ARCH_IXDP425 - bool "IXDP425" - help ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -21,6 +21,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o - obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-pci.o - obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o - obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o -+obj-pci-$(CONFIG_MACH_COMPEXWP18) += ixdp425-pci.o - - obj-y += common.o - -@@ -43,6 +44,7 @@ obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_ - obj-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-setup.o - obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o - obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o -+obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/compex42x-setup.c -@@ -0,0 +1,141 @@ -+/* -+ * arch/arm/mach-ixp4xx/compex-setup.c -+ * -+ * Compex WP18 / NP18A board-setup -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+static struct flash_platform_data compex42x_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource compex42x_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device compex42x_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &compex42x_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &compex42x_flash_resource, -+}; -+ -+static struct resource compex42x_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port compex42x_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device compex42x_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = compex42x_uart_data, -+ .num_resources = 2, -+ .resource = compex42x_uart_resources, -+}; -+ -+static struct eth_plat_info compex42x_plat_eth[] = { -+ { -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0xf0000, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 3, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device compex42x_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = compex42x_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = compex42x_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *compex42x_devices[] __initdata = { -+ &compex42x_flash, -+ &compex42x_uart, -+ &compex42x_eth[0], -+ &compex42x_eth[1], -+}; -+ -+static void __init compex42x_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ compex42x_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ compex42x_flash_resource.end = -+ IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ platform_add_devices(compex42x_devices, ARRAY_SIZE(compex42x_devices)); -+} -+ -+MACHINE_START(COMPEXWP18, "Compex WP18 / NP18A") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = compex42x_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END ---- a/arch/arm/mach-ixp4xx/ixdp425-pci.c -+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c -@@ -69,7 +69,8 @@ struct hw_pci ixdp425_pci __initdata = { - int __init ixdp425_pci_init(void) - { - if (machine_is_ixdp425() || machine_is_ixcdp1100() || -- machine_is_ixdp465() || machine_is_kixrp435()) -+ machine_is_ixdp465() || machine_is_kixrp435() || -+ machine_is_compex42x()) - pci_common_init(&ixdp425_pci); - return 0; - } diff --git a/target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch deleted file mode 100644 index 49359be447..0000000000 --- a/target/linux/ixp4xx/patches-4.9/130-wrt300nv2_support.patch +++ /dev/null @@ -1,227 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -93,6 +93,14 @@ config MACH_COMPEXWP18 - WP18 or NP18A boards. For more information on this - platform, see http://www.compex.com.sg/home/OEM/product_ap.htm - -+config MACH_WRT300NV2 -+ bool "Linksys WRT300N v2" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support Linksys' -+ WRT300N v2 router. For more information on this -+ platform, see http://openwrt.org -+ - config ARCH_IXDP425 - bool "IXDP425" - help ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += v - obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o - obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o - obj-pci-$(CONFIG_MACH_COMPEXWP18) += ixdp425-pci.o -+obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o - - obj-y += common.o - -@@ -45,6 +46,7 @@ obj-$(CONFIG_MACH_ARCOM_VULCAN) += vulca - obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o - obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o - obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o -+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h -+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -43,7 +43,8 @@ static __inline__ void __arch_decomp_set - if (machine_is_adi_coyote() || machine_is_gtwx5715() || - machine_is_gateway7001() || machine_is_wg302v2() || - machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() || -- machine_is_pronghorn() || machine_is_pronghorn_metro()) -+ machine_is_pronghorn() || machine_is_pronghorn_metro() || -+ machine_is_wrt300nv2()) - uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; - else - uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/wrt300nv2-pci.c -@@ -0,0 +1,64 @@ -+/* -+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c -+ * -+ * PCI setup routines for Linksys WRT300N v2 -+ * -+ * Copyright (C) 2007 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+extern void ixp4xx_pci_preinit(void); -+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); -+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys); -+ -+void __init wrt300nv2_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init wrt300nv2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 1) -+ return IRQ_IXP4XX_GPIO8; -+ else return -1; -+} -+ -+struct hw_pci wrt300nv2_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = wrt300nv2_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = wrt300nv2_map_irq, -+}; -+ -+int __init wrt300nv2_pci_init(void) -+{ -+ if (machine_is_wrt300nv2()) -+ pci_common_init(&wrt300nv2_pci); -+ return 0; -+} -+ -+subsys_initcall(wrt300nv2_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c -@@ -0,0 +1,110 @@ -+/* -+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c -+ * -+ * Board setup for the Linksys WRT300N v2 -+ * -+ * Copyright (C) 2007 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct flash_platform_data wrt300nv2_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource wrt300nv2_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device wrt300nv2_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &wrt300nv2_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &wrt300nv2_flash_resource, -+}; -+ -+static struct resource wrt300nv2_uart_resource = { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct plat_serial8250_port wrt300nv2_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device wrt300nv2_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = wrt300nv2_uart_data, -+ }, -+ .num_resources = 1, -+ .resource = &wrt300nv2_uart_resource, -+}; -+ -+static struct platform_device *wrt300nv2_devices[] __initdata = { -+ &wrt300nv2_flash, -+ &wrt300nv2_uart -+}; -+ -+static void __init wrt300nv2_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices)); -+} -+ -+#ifdef CONFIG_MACH_WRT300NV2 -+MACHINE_START(WRT300NV2, "Linksys WRT300N v2") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = wrt300nv2_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+#endif diff --git a/target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch deleted file mode 100644 index 5debbf1072..0000000000 --- a/target/linux/ixp4xx/patches-4.9/131-wrt300nv2_mac_plat_info.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c -+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c -@@ -76,9 +76,38 @@ static struct platform_device wrt300nv2_ - .resource = &wrt300nv2_uart_resource, - }; - -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info wrt300nv2_plat_eth[] = { -+ { -+ .phy = -1, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device wrt300nv2_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = wrt300nv2_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = wrt300nv2_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ - static struct platform_device *wrt300nv2_devices[] __initdata = { - &wrt300nv2_flash, -- &wrt300nv2_uart -+ &wrt300nv2_uart, -+ &wrt300nv2_eth[0], -+ &wrt300nv2_eth[1], - }; - - static void __init wrt300nv2_init(void) diff --git a/target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch deleted file mode 100644 index 99db2673d0..0000000000 --- a/target/linux/ixp4xx/patches-4.9/132-wrt300nv2_mac_fix.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c -+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c -@@ -3,6 +3,7 @@ - * - * Board setup for the Linksys WRT300N v2 - * -+ * Copyright (C) 2010 Alexandros C. Couloumbis - * Copyright (C) 2007 Imre Kaloz - * - * based on coyote-setup.c: -@@ -18,6 +19,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -79,7 +81,8 @@ static struct platform_device wrt300nv2_ - /* Built-in 10/100 Ethernet MAC interfaces */ - static struct eth_plat_info wrt300nv2_plat_eth[] = { - { -- .phy = -1, -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x0F0000, - .rxq = 3, - .txreadyq = 20, - }, { -@@ -112,6 +115,10 @@ static struct platform_device *wrt300nv2 - - static void __init wrt300nv2_init(void) - { -+ uint8_t __iomem *f; -+ int offset = 0; -+ int i; -+ - ixp4xx_sys_init(); - - wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -@@ -121,6 +128,32 @@ static void __init wrt300nv2_init(void) - *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; - - platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices)); -+ -+ f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x60000); -+ -+ if (f) { -+ for (i = 0; i < 6; i++) { -+#ifdef __ARMEB__ -+ wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + i); -+ if (i == 5) -+ offset = 1; -+ wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset); -+#else -+ wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + (i^3)); -+ if (i == 5) -+ offset = 1; -+ wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset); -+#endif -+ } -+ iounmap(f); -+ } -+ -+ if (!(is_valid_ether_addr(wrt300nv2_plat_eth[0].hwaddr))) -+ random_ether_addr(wrt300nv2_plat_eth[0].hwaddr); -+ if (!(is_valid_ether_addr(wrt300nv2_plat_eth[1].hwaddr))) { -+ memcpy(wrt300nv2_plat_eth[1].hwaddr, wrt300nv2_plat_eth[0].hwaddr, ETH_ALEN); -+ wrt300nv2_plat_eth[1].hwaddr[5] = (wrt300nv2_plat_eth[0].hwaddr[5] + 1); -+ } - } - - #ifdef CONFIG_MACH_WRT300NV2 diff --git a/target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch deleted file mode 100644 index fb5c3adb76..0000000000 --- a/target/linux/ixp4xx/patches-4.9/150-lanready_ap1000_support.patch +++ /dev/null @@ -1,201 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -101,6 +101,14 @@ config MACH_WRT300NV2 - WRT300N v2 router. For more information on this - platform, see http://openwrt.org - -+config MACH_AP1000 -+ bool "Lanready AP-1000" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support Lanready's -+ AP1000 board. For more information on this -+ platform, see http://openwrt.org -+ - config ARCH_IXDP425 - bool "IXDP425" - help ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -23,6 +23,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORN) += pron - obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o - obj-pci-$(CONFIG_MACH_COMPEXWP18) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o -+obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o - - obj-y += common.o - -@@ -47,6 +48,7 @@ obj-$(CONFIG_MACH_PRONGHORN) += pronghor - obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o - obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o - obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o -+obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c -@@ -0,0 +1,152 @@ -+/* -+ * arch/arm/mach-ixp4xx/ap1000-setup.c -+ * -+ * Lanready AP-1000 -+ * -+ * Copyright (C) 2007 Imre Kaloz -+ * -+ * based on ixdp425-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct flash_platform_data ap1000_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource ap1000_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device ap1000_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &ap1000_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &ap1000_flash_resource, -+}; -+ -+static struct resource ap1000_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port ap1000_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device ap1000_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = ap1000_uart_data, -+ .num_resources = 2, -+ .resource = ap1000_uart_resources -+}; -+ -+static struct platform_device *ap1000_devices[] __initdata = { -+ &ap1000_flash, -+ &ap1000_uart -+}; -+ -+static char ap1000_mem_fixup[] __initdata = "mem=64M "; -+ -+static void __init ap1000_fixup(struct tag *tags, char **cmdline) -+{ -+ struct tag *t = tags; -+ char *p = *cmdline; -+ -+ /* Find the end of the tags table, taking note of any cmdline tag. */ -+ for (; t->hdr.size; t = tag_next(t)) { -+ if (t->hdr.tag == ATAG_CMDLINE) { -+ p = t->u.cmdline.cmdline; -+ } -+ } -+ -+ /* Overwrite the end of the table with a new cmdline tag. */ -+ t->hdr.tag = ATAG_CMDLINE; -+ t->hdr.size = (sizeof (struct tag_header) + -+ strlen(ap1000_mem_fixup) + strlen(p) + 1 + 4) >> 2; -+ strlcpy(t->u.cmdline.cmdline, ap1000_mem_fixup, COMMAND_LINE_SIZE); -+ strlcpy(t->u.cmdline.cmdline + strlen(ap1000_mem_fixup), p, -+ COMMAND_LINE_SIZE - strlen(ap1000_mem_fixup)); -+ -+ /* Terminate the table. */ -+ t = tag_next(t); -+ t->hdr.tag = ATAG_NONE; -+ t->hdr.size = 0; -+} -+ -+static void __init ap1000_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ ap1000_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ ap1000_flash_resource.end = -+ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -+ -+ platform_add_devices(ap1000_devices, ARRAY_SIZE(ap1000_devices)); -+} -+ -+#ifdef CONFIG_MACH_AP1000 -+MACHINE_START(AP1000, "Lanready AP-1000") -+ /* Maintainer: Imre Kaloz */ -+ .fixup = ap1000_fixup, -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = ap1000_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+#endif ---- a/arch/arm/mach-ixp4xx/ixdp425-pci.c -+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c -@@ -70,7 +70,7 @@ int __init ixdp425_pci_init(void) - { - if (machine_is_ixdp425() || machine_is_ixcdp1100() || - machine_is_ixdp465() || machine_is_kixrp435() || -- machine_is_compex42x()) -+ machine_is_compex42x() || machine_is_ap1000()) - pci_common_init(&ixdp425_pci); - return 0; - } diff --git a/target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch deleted file mode 100644 index a3ed2d066e..0000000000 --- a/target/linux/ixp4xx/patches-4.9/151-lanready_ap1000_mac_plat_info.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/ap1000-setup.c -+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c -@@ -91,9 +91,39 @@ static struct platform_device ap1000_uar - .resource = ap1000_uart_resources - }; - -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info ap1000_plat_eth[] = { -+ { -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x1e, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 5, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device ap1000_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = ap1000_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = ap1000_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ - static struct platform_device *ap1000_devices[] __initdata = { -- &ap1000_flash, -- &ap1000_uart -+ &ap1000_flash, -+ &ap1000_uart, -+ &ap1000_eth[0], -+ &ap1000_eth[1], - }; - - static char ap1000_mem_fixup[] __initdata = "mem=64M "; diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch deleted file mode 100644 index 95cc5680cd..0000000000 --- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch +++ /dev/null @@ -1,133 +0,0 @@ ---- a/drivers/tty/serial/8250/8250_core.c -+++ b/drivers/tty/serial/8250/8250_core.c -@@ -833,6 +833,7 @@ static int serial8250_probe(struct platf - uart.port.get_mctrl = p->get_mctrl; - uart.port.pm = p->pm; - uart.port.dev = &dev->dev; -+ uart.port.rw_delay = p->rw_delay; - uart.port.irqflags |= irqflag; - ret = serial8250_register_8250_port(&uart); - if (ret < 0) { -@@ -989,6 +990,7 @@ int serial8250_register_8250_port(struct - uart->bugs = up->bugs; - uart->port.mapbase = up->port.mapbase; - uart->port.mapsize = up->port.mapsize; -+ uart->port.rw_delay = up->port.rw_delay; - uart->port.private_data = up->port.private_data; - uart->tx_loadsz = up->tx_loadsz; - uart->capabilities = up->capabilities; ---- a/drivers/tty/serial/serial_core.c -+++ b/drivers/tty/serial/serial_core.c -@@ -2259,6 +2259,7 @@ uart_report_port(struct uart_driver *drv - snprintf(address, sizeof(address), - "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); - break; -+ case UPIO_MEM_DELAY: - case UPIO_MEM: - case UPIO_MEM16: - case UPIO_MEM32: -@@ -2931,6 +2932,7 @@ int uart_match_port(struct uart_port *po - case UPIO_HUB6: - return (port1->iobase == port2->iobase) && - (port1->hub6 == port2->hub6); -+ case UPIO_MEM_DELAY: - case UPIO_MEM: - case UPIO_MEM16: - case UPIO_MEM32: ---- a/include/linux/serial_8250.h -+++ b/include/linux/serial_8250.h -@@ -28,6 +28,7 @@ struct plat_serial8250_port { - void *private_data; - unsigned char regshift; /* register shift */ - unsigned char iotype; /* UPIO_* */ -+ unsigned int rw_delay; /* udelay for slower busses IXP4XX Expansion Bus */ - unsigned char hub6; - upf_t flags; /* UPF_* flags */ - unsigned int type; /* If UPF_FIXED_TYPE */ ---- a/include/linux/serial_core.h -+++ b/include/linux/serial_core.h -@@ -152,6 +152,7 @@ struct uart_port { - #define UPIO_TSI (SERIAL_IO_TSI) /* Tsi108/109 type IO */ - #define UPIO_MEM32BE (SERIAL_IO_MEM32BE) /* 32b big endian */ - #define UPIO_MEM16 (SERIAL_IO_MEM16) /* 16b little endian */ -+#define UPIO_MEM_DELAY (SERIAL_IO_MEM_DELAY) - - unsigned int read_status_mask; /* driver specific */ - unsigned int ignore_status_mask; /* driver specific */ -@@ -234,6 +235,7 @@ struct uart_port { - int hw_stopped; /* sw-assisted CTS flow state */ - unsigned int mctrl; /* current modem ctrl settings */ - unsigned int timeout; /* character-based timeout */ -+ unsigned int rw_delay; /* udelay for slow busses, IXP4XX Expansion Bus */ - unsigned int type; /* port type */ - const struct uart_ops *ops; - unsigned int custom_divisor; ---- a/drivers/tty/serial/8250/8250_port.c -+++ b/drivers/tty/serial/8250/8250_port.c -@@ -383,6 +383,20 @@ static unsigned int mem16_serial_in(stru - return readw(p->membase + offset); - } - -+static unsigned int memdelay_serial_in(struct uart_port *p, int offset) -+{ -+ struct uart_8250_port *up = (struct uart_8250_port *)p; -+ udelay(up->port.rw_delay); -+ return mem_serial_in(p, offset); -+} -+ -+static void memdelay_serial_out(struct uart_port *p, int offset, int value) -+{ -+ struct uart_8250_port *up = (struct uart_8250_port *)p; -+ udelay(up->port.rw_delay); -+ mem_serial_out(p, offset, value); -+} -+ - static void mem32_serial_out(struct uart_port *p, int offset, int value) - { - offset = offset << p->regshift; -@@ -455,6 +469,11 @@ static void set_io_from_upio(struct uart - p->serial_out = mem32be_serial_out; - break; - -+ case UPIO_MEM_DELAY: -+ p->serial_in = memdelay_serial_in; -+ p->serial_out = memdelay_serial_out; -+ break; -+ - #ifdef CONFIG_SERIAL_8250_RT288X - case UPIO_AU: - p->serial_in = au_serial_in; -@@ -482,6 +501,7 @@ serial_port_out_sync(struct uart_port *p - case UPIO_MEM16: - case UPIO_MEM32: - case UPIO_MEM32BE: -+ case UPIO_MEM_DELAY: - case UPIO_AU: - p->serial_out(p, offset, value); - p->serial_in(p, UART_LCR); /* safe, no side-effects */ -@@ -2759,6 +2779,7 @@ static int serial8250_request_std_resour - case UPIO_MEM32BE: - case UPIO_MEM16: - case UPIO_MEM: -+ case UPIO_MEM_DELAY: - if (!port->mapbase) - break; - -@@ -2797,6 +2818,7 @@ static void serial8250_release_std_resou - case UPIO_MEM32BE: - case UPIO_MEM16: - case UPIO_MEM: -+ case UPIO_MEM_DELAY: - if (!port->mapbase) - break; - ---- a/include/uapi/linux/serial.h -+++ b/include/uapi/linux/serial.h -@@ -70,6 +70,7 @@ struct serial_struct { - #define SERIAL_IO_TSI 5 - #define SERIAL_IO_MEM32BE 6 - #define SERIAL_IO_MEM16 7 -+#define SERIAL_IO_MEM_DELAY 10 - - #define UART_CLEAR_FIFO 0x01 - #define UART_USE_FIFO 0x02 diff --git a/target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch deleted file mode 100644 index efa389d786..0000000000 --- a/target/linux/ixp4xx/patches-4.9/162-wg302v1_mem_fixup.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/wg302v1-setup.c -+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c -@@ -117,6 +117,34 @@ static struct platform_device *wg302v1_d - &wg302v1_eth[0], - }; - -+static char wg302v1_mem_fixup[] __initdata = " mem=32M"; -+ -+static void __init wg302v1_fixup(struct tag *tags, char **cmdline) -+{ -+ struct tag *t = tags; -+ char *p = *cmdline; -+ size_t fixlen, cmdlen; -+ -+ /* Find the end of the tags table, taking note of any cmdline tag. */ -+ for (; t->hdr.size; t = tag_next(t)) { -+ if (t->hdr.tag == ATAG_CMDLINE) { -+ p = t->u.cmdline.cmdline; -+ } -+ } -+ -+ fixlen = strlen(wg302v1_mem_fixup); -+ cmdlen = strlen(p); -+ if (fixlen + cmdlen >= COMMAND_LINE_SIZE) -+ return; -+ -+ /* append the fixup to the cmdline */ -+ memmove(p + cmdlen, wg302v1_mem_fixup, fixlen + 1); -+ -+ /* Adjust the size of the atag if there was one */ -+ if (t->hdr.size) -+ t->hdr.size += fixlen; -+} -+ - static void __init wg302v1_init(void) - { - ixp4xx_sys_init(); diff --git a/target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch deleted file mode 100644 index f7090cd1b4..0000000000 --- a/target/linux/ixp4xx/patches-4.9/170-ixdpg425_mac_plat_info.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/coyote-setup.c -+++ b/arch/arm/mach-ixp4xx/coyote-setup.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -81,9 +82,39 @@ static struct platform_device coyote_uar - .resource = &coyote_uart_resource, - }; - -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info ixdpg425_plat_eth[] = { -+ { -+ .phy = 5, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 4, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device ixdpg425_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = ixdpg425_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = ixdpg425_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+ - static struct platform_device *coyote_devices[] __initdata = { - &coyote_flash, -- &coyote_uart -+ &coyote_uart, -+ &ixdpg425_eth[0], -+ &ixdpg425_eth[1], - }; - - static void __init coyote_init(void) diff --git a/target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch b/target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch deleted file mode 100644 index 398344d188..0000000000 --- a/target/linux/ixp4xx/patches-4.9/175-avila_hss_audio_support.patch +++ /dev/null @@ -1,2093 +0,0 @@ ---- a/sound/soc/Kconfig -+++ b/sound/soc/Kconfig -@@ -47,6 +47,7 @@ source "sound/soc/cirrus/Kconfig" - source "sound/soc/davinci/Kconfig" - source "sound/soc/dwc/Kconfig" - source "sound/soc/fsl/Kconfig" -+source "sound/soc/gw-avila/Kconfig" - source "sound/soc/jz4740/Kconfig" - source "sound/soc/nuc900/Kconfig" - source "sound/soc/omap/Kconfig" ---- a/sound/soc/Makefile -+++ b/sound/soc/Makefile -@@ -27,6 +27,7 @@ obj-$(CONFIG_SND_SOC) += cirrus/ - obj-$(CONFIG_SND_SOC) += davinci/ - obj-$(CONFIG_SND_SOC) += dwc/ - obj-$(CONFIG_SND_SOC) += fsl/ -+obj-$(CONFIG_SND_SOC) += gw-avila/ - obj-$(CONFIG_SND_SOC) += jz4740/ - obj-$(CONFIG_SND_SOC) += img/ - obj-$(CONFIG_SND_SOC) += intel/ ---- /dev/null -+++ b/sound/soc/gw-avila/Kconfig -@@ -0,0 +1,17 @@ -+config SND_GW_AVILA_SOC_PCM -+ tristate -+ -+config SND_GW_AVILA_SOC_HSS -+ tristate -+ -+config SND_GW_AVILA_SOC -+ tristate "SoC Audio for the Gateworks AVILA Family" -+ depends on ARCH_IXP4XX && SND_SOC -+ select SND_GW_AVILA_SOC_PCM -+ select SND_GW_AVILA_SOC_HSS -+ select SND_SOC_TLV320AIC3X -+ help -+ Say Y or M if you want to add support for codecs attached to -+ the Gateworks HSS interface. You will also need -+ to select the audio interfaces to support below. -+ ---- /dev/null -+++ b/sound/soc/gw-avila/Makefile -@@ -0,0 +1,8 @@ -+# Gateworks Avila HSS Platform Support -+snd-soc-gw-avila-objs := gw-avila.o ixp4xx_hss.o -+snd-soc-gw-avila-pcm-objs := gw-avila-pcm.o -+snd-soc-gw-avila-hss-objs := gw-avila-hss.o -+ -+obj-$(CONFIG_SND_GW_AVILA_SOC) += snd-soc-gw-avila.o -+obj-$(CONFIG_SND_GW_AVILA_SOC_PCM) += snd-soc-gw-avila-pcm.o -+obj-$(CONFIG_SND_GW_AVILA_SOC_HSS) += snd-soc-gw-avila-hss.o ---- /dev/null -+++ b/sound/soc/gw-avila/gw-avila-hss.c -@@ -0,0 +1,103 @@ -+/* -+ * gw-avila-hss.c -- HSS Audio Support for Gateworks Avila -+ * -+ * Author: Chris Lang -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include "ixp4xx_hss.h" -+#include "gw-avila-hss.h" -+ -+#define gw_avila_hss_suspend NULL -+#define gw_avila_hss_resume NULL -+ -+struct snd_soc_dai_driver gw_avila_hss_dai = { -+ .playback = { -+ .channels_min = 2, -+ .channels_max = 2, -+ .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | -+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | -+ SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | -+ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | -+ SNDRV_PCM_RATE_KNOT), -+ .formats = SNDRV_PCM_FMTBIT_S16_LE, }, -+ .capture = { -+ .channels_min = 2, -+ .channels_max = 2, -+ .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | -+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | -+ SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | -+ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | -+ SNDRV_PCM_RATE_KNOT), -+ .formats = SNDRV_PCM_FMTBIT_S16_LE, }, -+}; -+ -+static const struct snd_soc_component_driver gw_avila_hss_component = { -+ .name = "gw_avila_hss", -+}; -+ -+static int gw_avila_hss_probe(struct platform_device *pdev) -+{ -+ int port = (pdev->id < 2) ? 0 : 1; -+ int channel = (pdev->id % 2); -+ -+ hss_handle[pdev->id] = hss_init(port, channel); -+ if (!hss_handle[pdev->id]) { -+ return -ENODEV; -+ } -+ -+ return snd_soc_register_component(&pdev->dev, &gw_avila_hss_component, -+ &gw_avila_hss_dai, 1); -+} -+ -+static int gw_avila_hss_remove(struct platform_device *pdev) -+{ -+ snd_soc_unregister_component(&pdev->dev); -+ -+ return 0; -+} -+ -+static struct platform_driver gw_avila_hss_driver = { -+ .probe = gw_avila_hss_probe, -+ .remove = gw_avila_hss_remove, -+ .driver = { -+ .name = "gw_avila_hss", -+ .owner = THIS_MODULE, -+ } -+}; -+ -+static int __init gw_avila_hss_init(void) -+{ -+ return platform_driver_register(&gw_avila_hss_driver); -+} -+module_init(gw_avila_hss_init); -+ -+static void __exit gw_avila_hss_exit(void) -+{ -+ platform_driver_unregister(&gw_avila_hss_driver); -+} -+module_exit(gw_avila_hss_exit); -+ -+MODULE_AUTHOR("Chris Lang"); -+MODULE_DESCRIPTION("HSS Audio Driver for Gateworks Avila"); -+MODULE_LICENSE("GPL"); ---- /dev/null -+++ b/sound/soc/gw-avila/gw-avila-hss.h -@@ -0,0 +1,12 @@ -+/* -+ * Author: Chris Lang -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#ifndef _GW_AVILA_HSS_H -+#define _GW_AVILA_HSS_H -+ -+#endif ---- /dev/null -+++ b/sound/soc/gw-avila/gw-avila-pcm.c -@@ -0,0 +1,327 @@ -+/* -+ * ALSA PCM interface for the TI DAVINCI processor -+ * -+ * Author: Chris Lang, -+ * Copyright: (C) 2009 Gateworks Corporation -+ * -+ * Based On: davinci-evm.c, Author: Vladimir Barinov, -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "gw-avila-pcm.h" -+#include "gw-avila-hss.h" -+#include "ixp4xx_hss.h" -+ -+#define GW_AVILA_PCM_DEBUG 0 -+#if GW_AVILA_PCM_DEBUG -+#define DPRINTK(x...) printk(KERN_DEBUG x) -+#else -+#define DPRINTK(x...) -+#endif -+ -+static struct snd_pcm_hardware gw_avila_pcm_hardware = { -+ .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | -+ SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID), -+/* SNDRV_PCM_INFO_PAUSE),*/ -+ .formats = (SNDRV_PCM_FMTBIT_S16_LE), -+ .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | -+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | -+ SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | -+ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | -+ SNDRV_PCM_RATE_KNOT), -+ .rate_min = 8000, -+ .rate_max = 8000, -+ .channels_min = 2, -+ .channels_max = 2, -+ .buffer_bytes_max = 64 * 1024, // All of the lines below may need to be changed -+ .period_bytes_min = 128, -+ .period_bytes_max = 4 * 1024, -+ .periods_min = 16, -+ .periods_max = 32, -+ .fifo_size = 0, -+}; -+ -+struct gw_avila_runtime_data { -+ spinlock_t lock; -+ int period; /* current DMA period */ -+ int master_lch; /* Master DMA channel */ -+ int slave_lch; /* Slave DMA channel */ -+ struct gw_avila_pcm_dma_params *params; /* DMA params */ -+}; -+ -+static void gw_avila_dma_irq(void *data) -+{ -+ struct snd_pcm_substream *substream = data; -+ snd_pcm_period_elapsed(substream); -+} -+ -+static int gw_avila_pcm_trigger(struct snd_pcm_substream *substream, int cmd) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ struct hss_device *hdev = runtime->private_data; -+ int ret = 0; -+ -+ switch (cmd) { -+ case SNDRV_PCM_TRIGGER_START: -+ case SNDRV_PCM_TRIGGER_RESUME: -+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ hss_tx_start(hdev); -+ else -+ hss_rx_start(hdev); -+ break; -+ case SNDRV_PCM_TRIGGER_STOP: -+ case SNDRV_PCM_TRIGGER_SUSPEND: -+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ hss_tx_stop(hdev); -+ else -+ hss_rx_stop(hdev); -+ break; -+ default: -+ ret = -EINVAL; -+ break; -+ } -+ return ret; -+} -+ -+static int gw_avila_pcm_prepare(struct snd_pcm_substream *substream) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ struct hss_device *hdev = runtime->private_data; -+ -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { -+ hss_set_tx_callback(hdev, gw_avila_dma_irq, substream); -+ hss_config_tx_dma(hdev, runtime->dma_area, runtime->buffer_size, runtime->period_size); -+ } else { -+ hss_set_rx_callback(hdev, gw_avila_dma_irq, substream); -+ hss_config_rx_dma(hdev, runtime->dma_area, runtime->buffer_size, runtime->period_size); -+ } -+ -+ return 0; -+} -+ -+static snd_pcm_uframes_t -+gw_avila_pcm_pointer(struct snd_pcm_substream *substream) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ struct hss_device *hdev = runtime->private_data; -+ -+ unsigned int curr = 0; -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ curr = hss_curr_offset_tx(hdev); -+ else -+ curr = hss_curr_offset_rx(hdev); -+ return curr; -+} -+ -+static int gw_avila_pcm_open(struct snd_pcm_substream *substream) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -+ -+ snd_soc_set_runtime_hwparams(substream, &gw_avila_pcm_hardware); -+ -+ if (hss_handle[cpu_dai->id] != NULL) -+ runtime->private_data = hss_handle[cpu_dai->id]; -+ else { -+ pr_err("hss_handle is NULL\n"); -+ return -1; -+ } -+ -+ hss_chan_open(hss_handle[cpu_dai->id]); -+ -+ return 0; -+} -+ -+static int gw_avila_pcm_close(struct snd_pcm_substream *substream) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ struct hss_device *hdev = runtime->private_data; -+ -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { -+ memset(hdev->tx_buf, 0, runtime->buffer_size); -+ } else -+ memset(hdev->rx_buf, 0, runtime->buffer_size); -+ -+ hss_chan_close(hdev); -+ -+ return 0; -+} -+ -+static int gw_avila_pcm_hw_params(struct snd_pcm_substream *substream, -+ struct snd_pcm_hw_params *hw_params) -+{ -+ return snd_pcm_lib_malloc_pages(substream, -+ params_buffer_bytes(hw_params)); -+} -+ -+static int gw_avila_pcm_hw_free(struct snd_pcm_substream *substream) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ memset(runtime->dma_area, 0, runtime->buffer_size); -+ -+ return snd_pcm_lib_free_pages(substream); -+} -+ -+static int gw_avila_pcm_mmap(struct snd_pcm_substream *substream, -+ struct vm_area_struct *vma) -+{ -+ struct snd_pcm_runtime *runtime = substream->runtime; -+ -+ return dma_mmap_writecombine(substream->pcm->card->dev, vma, -+ runtime->dma_area, -+ runtime->dma_addr, -+ runtime->dma_bytes); -+} -+ -+struct snd_pcm_ops gw_avila_pcm_ops = { -+ .open = gw_avila_pcm_open, -+ .close = gw_avila_pcm_close, -+ .ioctl = snd_pcm_lib_ioctl, -+ .hw_params = gw_avila_pcm_hw_params, -+ .hw_free = gw_avila_pcm_hw_free, -+ .prepare = gw_avila_pcm_prepare, -+ .trigger = gw_avila_pcm_trigger, -+ .pointer = gw_avila_pcm_pointer, -+ .mmap = gw_avila_pcm_mmap, -+}; -+ -+static int gw_avila_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) -+{ -+ struct snd_pcm_substream *substream = pcm->streams[stream].substream; -+ struct snd_dma_buffer *buf = &substream->dma_buffer; -+ size_t size = gw_avila_pcm_hardware.buffer_bytes_max; -+ -+ buf->dev.type = SNDRV_DMA_TYPE_DEV; -+ buf->dev.dev = pcm->card->dev; -+ buf->private_data = NULL; -+ -+ buf->area = dma_alloc_coherent(pcm->card->dev, size, -+ &buf->addr, GFP_KERNEL); -+ -+ if (!buf->area) { -+ return -ENOMEM; -+ } -+ -+ memset(buf->area, 0xff, size); -+ -+ DPRINTK("preallocate_dma_buffer: area=%p, addr=%p, size=%d\n", -+ (void *) buf->area, (void *) buf->addr, size); -+ -+ buf->bytes = size; -+ -+ return 0; -+} -+ -+static void gw_avila_pcm_free(struct snd_pcm *pcm) -+{ -+ struct snd_pcm_substream *substream; -+ struct snd_dma_buffer *buf; -+ int stream; -+ -+ for (stream = 0; stream < 2; stream++) { -+ substream = pcm->streams[stream].substream; -+ if (!substream) -+ continue; -+ -+ buf = &substream->dma_buffer; -+ if (!buf->area) -+ continue; -+ -+ dma_free_coherent(NULL, buf->bytes, buf->area, 0); -+ buf->area = NULL; -+ } -+} -+ -+static u64 gw_avila_pcm_dmamask = 0xFFFFFFFF; -+ -+static int gw_avila_pcm_new(struct snd_soc_pcm_runtime *rtd) -+{ -+ struct snd_card *card = rtd->card->snd_card; -+ struct snd_pcm *pcm = rtd->pcm; -+ struct snd_soc_dai *dai = rtd->codec_dai; -+ int ret; -+ -+ if (!card->dev->dma_mask) -+ card->dev->dma_mask = &gw_avila_pcm_dmamask; -+ if (!card->dev->coherent_dma_mask) -+ card->dev->coherent_dma_mask = 0xFFFFFFFF; -+ -+ if (dai->driver->playback.channels_min) { -+ ret = gw_avila_pcm_preallocate_dma_buffer(pcm, -+ SNDRV_PCM_STREAM_PLAYBACK); -+ if (ret) -+ return ret; -+ } -+ -+ if (dai->driver->capture.channels_min) { -+ ret = gw_avila_pcm_preallocate_dma_buffer(pcm, -+ SNDRV_PCM_STREAM_CAPTURE); -+ if (ret) -+ return ret; -+ } -+ -+ return 0; -+} -+ -+struct snd_soc_platform_driver gw_avila_soc_platform = { -+ .ops = &gw_avila_pcm_ops, -+ .pcm_new = gw_avila_pcm_new, -+ .pcm_free = gw_avila_pcm_free, -+}; -+ -+static int gw_avila_pcm_platform_probe(struct platform_device *pdev) -+{ -+ return snd_soc_register_platform(&pdev->dev, &gw_avila_soc_platform); -+} -+ -+static int gw_avila_pcm_platform_remove(struct platform_device *pdev) -+{ -+ snd_soc_unregister_platform(&pdev->dev); -+ return 0; -+} -+ -+static struct platform_driver gw_avila_pcm_driver = { -+ .driver = { -+ .name = "gw_avila-audio", -+ .owner = THIS_MODULE, -+ }, -+ .probe = gw_avila_pcm_platform_probe, -+ .remove = gw_avila_pcm_platform_remove, -+}; -+ -+static int __init gw_avila_soc_platform_init(void) -+{ -+ return platform_driver_register(&gw_avila_pcm_driver); -+} -+module_init(gw_avila_soc_platform_init); -+ -+static void __exit gw_avila_soc_platform_exit(void) -+{ -+ platform_driver_unregister(&gw_avila_pcm_driver); -+} -+module_exit(gw_avila_soc_platform_exit); -+ -+MODULE_AUTHOR("Chris Lang"); -+MODULE_DESCRIPTION("Gateworks Avila PCM DMA module"); -+MODULE_LICENSE("GPL"); ---- /dev/null -+++ b/sound/soc/gw-avila/gw-avila-pcm.h -@@ -0,0 +1,32 @@ -+/* -+ * ALSA PCM interface for the Gateworks Avila platform -+ * -+ * Author: Chris Lang, -+ * Copyright: (C) 2009 Gateworks Corporation -+ * -+ * Based On: davinci-evm.c, Author: Vladimir Barinov, -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#ifndef _GW_AVILA_PCM_H -+#define _GW_AVILA_PCM_H -+ -+#if 0 -+struct gw_avila_pcm_dma_params { -+ char *name; /* stream identifier */ -+ int channel; /* sync dma channel ID */ -+ dma_addr_t dma_addr; /* device physical address for DMA */ -+ unsigned int data_type; /* xfer data type */ -+}; -+ -+struct gw_avila_snd_platform_data { -+ int tx_dma_ch; // XXX Do we need this? -+ int rx_dma_ch; // XXX Do we need this -+}; -+extern struct snd_soc_platform gw_avila_soc_platform[]; -+#endif -+ -+#endif ---- /dev/null -+++ b/sound/soc/gw-avila/gw-avila.c -@@ -0,0 +1,244 @@ -+/* -+ * File: sound/soc/gw-avila/gw_avila.c -+ * Author: Chris Lang -+ * -+ * Created: Tue June 06 2008 -+ * Description: Board driver for Gateworks Avila -+ * -+ * Modified: -+ * Copyright 2009 Gateworks Corporation -+ * -+ * Bugs: What Bugs? -+ * -+ * 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. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, see the file COPYING, or write -+ * to the Free Software Foundation, Inc., -+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "ixp4xx_hss.h" -+#include "gw-avila-hss.h" -+#include "gw-avila-pcm.h" -+ -+#define CODEC_FREQ 33333000 -+ -+static int gw_avila_board_startup(struct snd_pcm_substream *substream) -+{ -+ pr_debug("%s enter\n", __func__); -+ return 0; -+} -+ -+static int gw_avila_hw_params(struct snd_pcm_substream *substream, -+ struct snd_pcm_hw_params *params) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *codec_dai = rtd->codec_dai; -+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -+ -+ int ret = 0; -+ -+ /* set codec DAI configuration */ -+ if (cpu_dai->id % 2) { -+ ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS); -+ snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 1, 32); -+ } else { -+ ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM); -+ snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 0, 32); -+ } -+ -+ if (ret < 0) -+ return ret; -+ -+ /* set the codec system clock */ -+ ret = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_FREQ, SND_SOC_CLOCK_OUT); -+ if (ret < 0) -+ return ret; -+ -+ return 0; -+} -+ -+static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = { -+ SND_SOC_DAPM_HP("Headphone Jack", NULL), -+ SND_SOC_DAPM_LINE("Line Out", NULL), -+ SND_SOC_DAPM_LINE("Line In", NULL), -+}; -+ -+static const struct snd_soc_dapm_route audio_map[] = { -+ {"Headphone Jack", NULL, "HPLOUT"}, -+ {"Headphone Jack", NULL, "HPROUT"}, -+ -+ /* Line Out connected to LLOUT, RLOUT */ -+ {"Line Out", NULL, "LLOUT"}, -+ {"Line Out", NULL, "RLOUT"}, -+ -+ /* Line In connected to (LINE1L | LINE2L), (LINE1R | LINE2R) */ -+ {"LINE1L", NULL, "Line In"}, -+ {"LINE1R", NULL, "Line In"}, -+}; -+ -+/* Logic for a aic3x as connected on a davinci-evm */ -+static int avila_aic3x_init(struct snd_soc_pcm_runtime *rtd) -+{ -+ struct snd_soc_codec *codec = rtd->codec; -+ struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); -+ -+ /* Add davinci-evm specific widgets */ -+ snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets, -+ ARRAY_SIZE(aic3x_dapm_widgets)); -+ -+ /* Set up davinci-evm specific audio path audio_map */ -+ snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); -+ -+ /* not connected */ -+ snd_soc_dapm_disable_pin(dapm, "MONO_LOUT"); -+ //snd_soc_dapm_disable_pin(dapm, "HPLCOM"); -+ //snd_soc_dapm_disable_pin(dapm, "HPRCOM"); -+ snd_soc_dapm_disable_pin(dapm, "MIC3L"); -+ snd_soc_dapm_disable_pin(dapm, "MIC3R"); -+ snd_soc_dapm_disable_pin(dapm, "LINE2L"); -+ snd_soc_dapm_disable_pin(dapm, "LINE2R"); -+ -+ /* always connected */ -+ snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); -+ snd_soc_dapm_enable_pin(dapm, "Line Out"); -+ snd_soc_dapm_enable_pin(dapm, "Line In"); -+ -+ snd_soc_dapm_sync(dapm); -+ -+ return 0; -+} -+ -+static struct snd_soc_ops gw_avila_board_ops = { -+ .startup = gw_avila_board_startup, -+ .hw_params = gw_avila_hw_params, -+}; -+ -+static struct snd_soc_dai_link gw_avila_board_dai[] = { -+ { -+ .name = "HSS-0", -+ .stream_name = "HSS-0", -+ .cpu_dai_name = "gw_avila_hss.0", -+ .codec_dai_name = "tlv320aic3x-hifi", -+ .codec_name = "tlv320aic3x-codec.0-001b", -+ .platform_name = "gw_avila-audio.0", -+ .init = avila_aic3x_init, -+ .ops = &gw_avila_board_ops, -+ },{ -+ .name = "HSS-1", -+ .stream_name = "HSS-1", -+ .cpu_dai_name = "gw_avila_hss.1", -+ .codec_dai_name = "tlv320aic3x-hifi", -+ .codec_name = "tlv320aic3x-codec.0-001a", -+ .platform_name = "gw_avila-audio.1", -+ .init = avila_aic3x_init, -+ .ops = &gw_avila_board_ops, -+ },{ -+ .name = "HSS-2", -+ .stream_name = "HSS-2", -+ .cpu_dai_name = "gw_avila_hss.2", -+ .codec_dai_name = "tlv320aic3x-hifi", -+ .codec_name = "tlv320aic3x-codec.0-0019", -+ .platform_name = "gw_avila-audio.2", -+ .init = avila_aic3x_init, -+ .ops = &gw_avila_board_ops, -+ },{ -+ .name = "HSS-3", -+ .stream_name = "HSS-3", -+ .cpu_dai_name = "gw_avila_hss.3", -+ .codec_dai_name = "tlv320aic3x-hifi", -+ .codec_name = "tlv320aic3x-codec.0-0018", -+ .platform_name = "gw_avila-audio.3", -+ .init = avila_aic3x_init, -+ .ops = &gw_avila_board_ops, -+ }, -+}; -+ -+static struct snd_soc_card gw_avila_board[] = { -+ { -+ .name = "gw_avila-board.0", -+ .owner = THIS_MODULE, -+ .dai_link = &gw_avila_board_dai[0], -+ .num_links = 1, -+ },{ -+ .name = "gw_avila-board.1", -+ .owner = THIS_MODULE, -+ .dai_link = &gw_avila_board_dai[1], -+ .num_links = 1, -+ },{ -+ .name = "gw_avila-board.2", -+ .owner = THIS_MODULE, -+ .dai_link = &gw_avila_board_dai[2], -+ .num_links = 1, -+ },{ -+ .name = "gw_avila-board.3", -+ .owner = THIS_MODULE, -+ .dai_link = &gw_avila_board_dai[3], -+ .num_links = 1, -+ } -+}; -+ -+static struct platform_device *gw_avila_board_snd_device[4]; -+ -+static int __init gw_avila_board_init(void) -+{ -+ int ret; -+ struct port *port; -+ int i; -+ -+ if ((hss_port[0] = kzalloc(sizeof(*port), GFP_KERNEL)) == NULL) -+ return -ENOMEM; -+ -+ if ((hss_port[1] = kzalloc(sizeof(*port), GFP_KERNEL)) == NULL) -+ return -ENOMEM; -+ -+ for (i = 0; i < 4; i++) { -+ gw_avila_board_snd_device[i] = platform_device_alloc("soc-audio", i); -+ if (!gw_avila_board_snd_device[i]) { -+ return -ENOMEM; -+ } -+ -+ platform_set_drvdata(gw_avila_board_snd_device[i], &gw_avila_board[i]); -+ ret = platform_device_add(gw_avila_board_snd_device[i]); -+ -+ if (ret) { -+ platform_device_put(gw_avila_board_snd_device[i]); -+ } -+ } -+ return ret; -+} -+ -+static void __exit gw_avila_board_exit(void) -+{ -+ int i; -+ for (i = 0; i < 4; i++) -+ platform_device_unregister(gw_avila_board_snd_device[i]); -+} -+ -+module_init(gw_avila_board_init); -+module_exit(gw_avila_board_exit); -+ -+/* Module information */ -+MODULE_AUTHOR("Chris Lang"); -+MODULE_DESCRIPTION("ALSA SoC HSS Audio gw_avila board"); -+MODULE_LICENSE("GPL"); ---- /dev/null -+++ b/sound/soc/gw-avila/ixp4xx_hss.c -@@ -0,0 +1,902 @@ -+/* -+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux -+ * -+ * Copyright (C) 2009 Chris Lang -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License -+ * as published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include "ixp4xx_hss.h" -+ -+/***************************************************************************** -+ * global variables -+ ****************************************************************************/ -+ -+void hss_chan_read(unsigned long data); -+static char lock_init = 0; -+static spinlock_t npe_lock; -+static struct npe *npe; -+ -+static const struct { -+ int tx, txdone, rx, rxfree, chan; -+}queue_ids[2] = {{HSS0_PKT_TX0_QUEUE, HSS0_PKT_TXDONE_QUEUE, HSS0_PKT_RX_QUEUE, -+ HSS0_PKT_RXFREE0_QUEUE, HSS0_CHL_RXTRIG_QUEUE}, -+ {HSS1_PKT_TX0_QUEUE, HSS1_PKT_TXDONE_QUEUE, HSS1_PKT_RX_QUEUE, -+ HSS1_PKT_RXFREE0_QUEUE, HSS1_CHL_RXTRIG_QUEUE}, -+}; -+ -+struct port *hss_port[2]; -+struct hss_device *hss_handle[32]; -+EXPORT_SYMBOL(hss_handle); -+ -+/***************************************************************************** -+ * utility functions -+ ****************************************************************************/ -+ -+#ifndef __ARMEB__ -+static inline void memcpy_swab32(u32 *dest, u32 *src, int cnt) -+{ -+ int i; -+ for (i = 0; i < cnt; i++) -+ dest[i] = swab32(src[i]); -+} -+#endif -+ -+static inline unsigned int sub_offset(unsigned int a, unsigned int b, -+ unsigned int modulo) -+{ -+ return (modulo /* make sure the result >= 0 */ + a - b) % modulo; -+} -+ -+/***************************************************************************** -+ * HSS access -+ ****************************************************************************/ -+ -+static void hss_config_load(struct port *port) -+{ -+ struct msg msg; -+ -+ do { -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_LOAD; -+ msg.hss_port = port->id; -+ if (npe_send_message(npe, &msg, "HSS_LOAD_CONFIG")) -+ break; -+ if (npe_recv_message(npe, &msg, "HSS_LOAD_CONFIG")) -+ break; -+ -+ /* HSS_LOAD_CONFIG for port #1 returns port_id = #4 */ -+ if (msg.cmd != PORT_CONFIG_LOAD || msg.data32) -+ break; -+ -+ /* HDLC may stop working without this */ -+ npe_recv_message(npe, &msg, "FLUSH_IT"); -+ return; -+ } while (0); -+ -+ printk(KERN_CRIT "HSS-%i: unable to reload HSS configuration\n", -+ port->id); -+ BUG(); -+} -+ -+static void hss_config_set_pcr(struct port *port) -+{ -+ struct msg msg; -+ -+ do { -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_WRITE; -+ msg.hss_port = port->id; -+ msg.index = HSS_CONFIG_TX_PCR; -+#if 0 -+ msg.data32 = PCR_FRM_SYNC_RISINGEDGE | PCR_MSB_ENDIAN | -+ PCR_TX_DATA_ENABLE | PCR_TX_UNASS_HIGH_IMP | PCR_TX_V56K_HIGH_IMP | PCR_TX_FB_HIGH_IMP; -+#else -+ msg.data32 = PCR_FRM_SYNC_RISINGEDGE | PCR_MSB_ENDIAN | -+ PCR_TX_DATA_ENABLE | PCR_TX_FB_HIGH_IMP | PCR_DCLK_EDGE_RISING; -+#endif -+ if (port->frame_size % 8 == 0) -+ msg.data32 |= PCR_SOF_NO_FBIT; -+ -+ if (npe_send_message(npe, &msg, "HSS_SET_TX_PCR")) -+ break; -+ -+ msg.index = HSS_CONFIG_RX_PCR; -+ msg.data32 &= ~ (PCR_DCLK_EDGE_RISING | PCR_FCLK_EDGE_RISING | PCR_TX_DATA_ENABLE); -+ -+ if (npe_send_message(npe, &msg, "HSS_SET_RX_PCR")) -+ break; -+ return; -+ } while (0); -+ -+ printk(KERN_CRIT "HSS-%i: unable to set HSS PCR registers\n", port->id); -+ BUG(); -+} -+ -+static void hss_config_set_core(struct port *port) -+{ -+ struct msg msg; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_WRITE; -+ msg.hss_port = port->id; -+ msg.index = HSS_CONFIG_CORE_CR; -+#if 0 -+ msg.data32 = 0 | CCR_LOOPBACK | -+ (port->id ? CCR_SECOND_HSS : 0); -+#else -+ msg.data32 = 0 | -+ (port->id ? CCR_SECOND_HSS : 0); -+#endif -+ if (npe_send_message(npe, &msg, "HSS_SET_CORE_CR")) { -+ printk(KERN_CRIT "HSS-%i: unable to set HSS core control" -+ " register\n", port->id); -+ BUG(); -+ } -+} -+ -+static void hss_config_set_line(struct port *port) -+{ -+ struct msg msg; -+ -+ hss_config_set_pcr(port); -+ hss_config_set_core(port); -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_WRITE; -+ msg.hss_port = port->id; -+ msg.index = HSS_CONFIG_CLOCK_CR; -+ msg.data32 = CLK42X_SPEED_8192KHZ /* FIXME */; -+ if (npe_send_message(npe, &msg, "HSS_SET_CLOCK_CR")) { -+ printk(KERN_CRIT "HSS-%i: unable to set HSS clock control" -+ " register\n", port->id); -+ BUG(); -+ } -+} -+ -+static void hss_config_set_rx_frame(struct port *port) -+{ -+ struct msg msg; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_WRITE; -+ msg.hss_port = port->id; -+ msg.index = HSS_CONFIG_RX_FCR; -+ msg.data16a = port->frame_sync_offset; -+ msg.data16b = port->frame_size - 1; -+ if (npe_send_message(npe, &msg, "HSS_SET_RX_FCR")) { -+ printk(KERN_CRIT "HSS-%i: unable to set HSS RX frame size" -+ " and offset\n", port->id); -+ BUG(); -+ } -+} -+ -+static void hss_config_set_frame(struct port *port) -+{ -+ struct msg msg; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_WRITE; -+ msg.hss_port = port->id; -+ msg.index = HSS_CONFIG_TX_FCR; -+ msg.data16a = TX_FRAME_SYNC_OFFSET; -+ msg.data16b = port->frame_size - 1; -+ if (npe_send_message(npe, &msg, "HSS_SET_TX_FCR")) { -+ printk(KERN_CRIT "HSS-%i: unable to set HSS TX frame size" -+ " and offset\n", port->id); -+ BUG(); -+ } -+ hss_config_set_rx_frame(port); -+} -+ -+static void hss_config_set_lut(struct port *port) -+{ -+ struct msg msg; -+ int chan_count = 32; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_CONFIG_WRITE; -+ msg.hss_port = port->id; -+ -+ msg.index = HSS_CONFIG_TX_LUT; -+ msg.data32 = 0xffffffff; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.data32 = 0x0; -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_TX_LUT"); -+ -+ msg.index = HSS_CONFIG_RX_LUT; -+ msg.data32 = 0xffffffff; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.data32 = 0x0; -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ msg.index += 4; -+ npe_send_message(npe, &msg, "HSS_SET_RX_LUT"); -+ -+ hss_config_set_frame(port); -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_NUM_CHANS_WRITE; -+ msg.hss_port = port->id; -+ msg.data8a = chan_count; -+ if (npe_send_message(npe, &msg, "CHAN_NUM_CHANS_WRITE")) { -+ printk(KERN_CRIT "HSS-%i: unable to set HSS channel count\n", -+ port->id); -+ BUG(); -+ } -+} -+ -+static u32 hss_config_get_status(struct port *port) -+{ -+ struct msg msg; -+ -+ do { -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = PORT_ERROR_READ; -+ msg.hss_port = port->id; -+ if (npe_send_message(npe, &msg, "PORT_ERROR_READ")) -+ break; -+ if (npe_recv_message(npe, &msg, "PORT_ERROR_READ")) -+ break; -+ -+ return msg.data32; -+ } while (0); -+ -+ printk(KERN_CRIT "HSS-%i: unable to read HSS status\n", port->id); -+ BUG(); -+} -+ -+static void hss_config_start_chan(struct port *port) -+{ -+ struct msg msg; -+ -+ port->chan_last_tx = 0; -+ port->chan_last_rx = 0; -+ -+ do { -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_RX_BUF_ADDR_WRITE; -+ msg.hss_port = port->id; -+ msg.data32 = port->chan_rx_buf_phys; -+ if (npe_send_message(npe, &msg, "CHAN_RX_BUF_ADDR_WRITE")) -+ break; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_TX_BUF_ADDR_WRITE; -+ msg.hss_port = port->id; -+ msg.data32 = port->chan_tx_pointers_phys; -+ if (npe_send_message(npe, &msg, "CHAN_TX_BUF_ADDR_WRITE")) -+ break; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_FLOW_ENABLE; -+ msg.hss_port = port->id; -+ if (npe_send_message(npe, &msg, "CHAN_FLOW_ENABLE")) -+ break; -+ port->chan_started = 1; -+ return; -+ } while (0); -+ -+ printk(KERN_CRIT "HSS-%i: unable to start channelized flow\n", -+ port->id); -+ BUG(); -+} -+ -+static void hss_config_stop_chan(struct port *port) -+{ -+ struct msg msg; -+ -+ if (!port->chan_started) -+ return; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_FLOW_DISABLE; -+ msg.hss_port = port->id; -+ if (npe_send_message(npe, &msg, "CHAN_FLOW_DISABLE")) { -+ printk(KERN_CRIT "HSS-%i: unable to stop channelized flow\n", -+ port->id); -+ BUG(); -+ } -+ hss_config_get_status(port); /* make sure it's halted */ -+ port->chan_started = 0; -+} -+ -+static int hss_config_load_firmware(struct port *port) -+{ -+ struct msg msg; -+ -+ if (port->initialized) -+ return 0; -+ -+ if (!npe_running(npe)) { -+ int err; -+ if ((err = npe_load_firmware(npe, "NPE-A-HSS", -+ port->dev))) -+ return err; -+ } -+ -+ do { -+ /* HSS main configuration */ -+ hss_config_set_line(port); -+ -+ hss_config_set_frame(port); -+ -+ /* Channelized operation settings */ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_TX_BLK_CFG_WRITE; -+ msg.hss_port = port->id; -+ msg.data8b = (CHAN_TX_LIST_FRAMES & ~7) / 2; -+ msg.data8a = msg.data8b / 4; -+ msg.data8d = CHAN_TX_LIST_FRAMES - msg.data8b; -+ msg.data8c = msg.data8d / 4; -+ if (npe_send_message(npe, &msg, "CHAN_TX_BLK_CFG_WRITE")) -+ break; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_RX_BUF_CFG_WRITE; -+ msg.hss_port = port->id; -+ msg.data8a = CHAN_RX_TRIGGER / 8; -+ msg.data8b = CHAN_RX_FRAMES; -+ if (npe_send_message(npe, &msg, "CHAN_RX_BUF_CFG_WRITE")) -+ break; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = CHAN_TX_BUF_SIZE_WRITE; -+ msg.hss_port = port->id; -+ msg.data8a = CHAN_TX_LISTS; -+ if (npe_send_message(npe, &msg, "CHAN_TX_BUF_SIZE_WRITE")) -+ break; -+ -+ port->initialized = 1; -+ return 0; -+ } while (0); -+ -+ printk(KERN_CRIT "HSS-%i: unable to start HSS operation\n", port->id); -+ BUG(); -+} -+ -+void hss_chan_irq(void *pdev) -+{ -+ struct port *port = pdev; -+ -+ qmgr_disable_irq(queue_ids[port->id].chan); -+ -+ tasklet_hi_schedule(&port->task); -+} -+ -+ -+int hss_prepare_chan(struct port *port) -+{ -+ int err, i, j; -+ u32 *temp; -+ u32 temp2; -+ u8 *temp3; -+ -+ if (port->initialized) -+ return 0; -+ -+ if ((err = hss_config_load_firmware(port))) -+ return err; -+ -+ if ((err = qmgr_request_queue(queue_ids[port->id].chan, -+ CHAN_QUEUE_LEN, 0, 0, "%s:hss", "hss"))) -+ return err; -+ -+ port->chan_tx_buf = dma_alloc_coherent(port->dev, chan_tx_buf_len(port), &port->chan_tx_buf_phys, GFP_DMA); -+ memset(port->chan_tx_buf, 0, chan_tx_buf_len(port)); -+ -+ port->chan_tx_pointers = dma_alloc_coherent(port->dev, chan_tx_buf_len(port) / CHAN_TX_LIST_FRAMES * 4, &port->chan_tx_pointers_phys, GFP_DMA); -+ -+ temp3 = port->chan_tx_buf; -+ for (i = 0; i < CHAN_TX_LISTS; i++) { -+ for (j = 0; j < 8; j++) { -+ port->tx_lists[i][j] = temp3; -+ temp3 += CHAN_TX_LIST_FRAMES * 4; -+ } -+ } -+ -+ temp = port->chan_tx_pointers; -+ temp2 = port->chan_tx_buf_phys; -+ for (i = 0; i < CHAN_TX_LISTS; i++) -+ { -+ for (j = 0; j < 32; j++) -+ { -+ *temp = temp2; -+ temp2 += CHAN_TX_LIST_FRAMES; -+ temp++; -+ } -+ } -+ -+ port->chan_rx_buf = dma_alloc_coherent(port->dev, chan_rx_buf_len(port), &port->chan_rx_buf_phys, GFP_DMA); -+ -+ for (i = 0; i < 8; i++) { -+ temp3 = port->chan_rx_buf + (i * 4 * 128); -+ for (j = 0; j < 8; j++) { -+ port->rx_frames[i][j] = temp3; -+ temp3 += CHAN_RX_TRIGGER; -+ } -+ } -+ -+ qmgr_set_irq(queue_ids[port->id].chan, QUEUE_IRQ_SRC_NOT_EMPTY, -+ hss_chan_irq, port); -+ -+ return 0; -+ -+} -+ -+int hss_tx_start(struct hss_device *hdev) -+{ -+ unsigned long flags; -+ struct port *port = hdev->port; -+ -+ hdev->tx_loc = 0; -+ hdev->tx_frame = 0; -+ -+ set_bit((1 << hdev->id), &port->chan_tx_bitmap); -+ -+ if (!port->chan_started) -+ { -+ qmgr_enable_irq(queue_ids[port->id].chan); -+ spin_lock_irqsave(&npe_lock, flags); -+ hss_config_start_chan(port); -+ spin_unlock_irqrestore(&npe_lock, flags); -+ hss_chan_irq(port); -+ } -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_tx_start); -+ -+int hss_rx_start(struct hss_device *hdev) -+{ -+ unsigned long flags; -+ struct port *port = hdev->port; -+ -+ hdev->rx_loc = 0; -+ hdev->rx_frame = 0; -+ -+ set_bit((1 << hdev->id), &port->chan_rx_bitmap); -+ -+ if (!port->chan_started) -+ { -+ qmgr_enable_irq(queue_ids[port->id].chan); -+ spin_lock_irqsave(&npe_lock, flags); -+ hss_config_start_chan(port); -+ spin_unlock_irqrestore(&npe_lock, flags); -+ hss_chan_irq(port); -+ } -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_rx_start); -+ -+int hss_tx_stop(struct hss_device *hdev) -+{ -+ struct port *port = hdev->port; -+ -+ clear_bit((1 << hdev->id), &port->chan_tx_bitmap); -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_tx_stop); -+ -+int hss_rx_stop(struct hss_device *hdev) -+{ -+ struct port *port = hdev->port; -+ -+ clear_bit((1 << hdev->id), &port->chan_rx_bitmap); -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_rx_stop); -+ -+int hss_chan_open(struct hss_device *hdev) -+{ -+ struct port *port = hdev->port; -+ int i, err = 0; -+ -+ if (port->chan_open) -+ return 0; -+ -+ if (port->mode == MODE_HDLC) { -+ err = -ENOSYS; -+ goto out; -+ } -+ -+ if (port->mode == MODE_G704 && port->channels[0] == hdev->id) { -+ err = -EBUSY; /* channel #0 is used for G.704 signaling */ -+ goto out; -+ } -+ -+ for (i = MAX_CHANNELS; i > port->frame_size / 8; i--) -+ if (port->channels[i - 1] == hdev->id) { -+ err = -ECHRNG; /* frame too short */ -+ goto out; -+ } -+ -+ hdev->rx_loc = hdev->tx_loc = 0; -+ hdev->rx_frame = hdev->tx_frame = 0; -+ -+ //clear_bit((1 << hdev->id), &port->chan_rx_bitmap); -+ //clear_bit((1 << hdev->id), &port->chan_tx_bitmap); -+ -+ if (!port->initialized) { -+ hss_prepare_chan(port); -+ -+ hss_config_stop_chan(port); -+ hdev->open_count++; -+ port->chan_open_count++; -+ -+ hss_config_set_lut(port); -+ hss_config_load(port); -+ -+ } -+ port->chan_open = 1; -+ -+out: -+ return err; -+} -+EXPORT_SYMBOL(hss_chan_open); -+ -+int hss_chan_close(struct hss_device *hdev) -+{ -+ return 0; -+} -+EXPORT_SYMBOL(hss_chan_close); -+ -+void hss_chan_read(unsigned long data) -+{ -+ struct port *port = (void *)data; -+ struct hss_device *hdev; -+ u8 *hw_buf, *save_buf; -+ u8 *buf; -+ u32 v; -+ unsigned int tx_list, rx_frame; -+ int i, j, channel; -+ u8 more_work = 0; -+ -+/* -+ My Data in the hardware buffer is scattered by channels into 4 trunks -+ as follows for rx -+ -+ channel 0 channel 1 channel 2 channel 3 -+Trunk 1 = 0 -> 127 128 -> 255 256 -> 383 384 -> 512 -+Trunk 2 = 513 -> 639 640 -> 768 769 -> 895 896 -> 1023 -+Trunk 3 = 1024 -> 1151 1152 -> 1207 1208 -> 1407 1408 -> 1535 -+Trunk 4 = 1535 -> 1663 1664 -> 1791 1792 -> 1920 1921 -> 2047 -+ -+ I will get CHAN_RX_TRIGGER worth of bytes out of each channel on each trunk -+ with each IRQ -+ -+ For TX Data, it is split into 8 lists with each list containing 16 bytes per -+ channel -+ -+Trunk 1 = 0 -> 16 17 -> 32 33 -> 48 49 -> 64 -+Trunk 2 = 65 -> 80 81 -> 96 97 -> 112 113 -> 128 -+Trunk 3 = 129 -> 144 145 -> 160 161 -> 176 177 -> 192 -+Trunk 4 = 193 -> 208 209 -> 224 225 -> 240 241 -> 256 -+ -+*/ -+ -+ -+ while ((v = qmgr_get_entry(queue_ids[port->id].chan))) -+ { -+ tx_list = (v >> 8) & 0xFF; -+ rx_frame = v & 0xFF; -+ -+ if (tx_list == 7) -+ tx_list = 0; -+ else -+ tx_list++; -+ for (channel = 0; channel < 8; channel++) { -+ -+ hdev = port->chan_devices[channel]; -+ if (!hdev) -+ continue; -+ -+ if (test_bit(1 << channel, &port->chan_tx_bitmap)) { -+ buf = (u8 *)hdev->tx_buf + hdev->tx_loc; -+#if 0 -+ hw_buf = (u8 *)port->chan_tx_buf; -+ hw_buf += (tx_list * CHAN_TX_LIST_FRAMES * 32); -+ hw_buf += (4 * CHAN_TX_LIST_FRAMES * channel); -+ save_buf = hw_buf; -+#else -+ save_buf = port->tx_lists[tx_list][channel]; -+#endif -+ for (i = 0; i < CHAN_TX_LIST_FRAMES; i++) { -+ hw_buf = save_buf + i; -+ for (j = 0; j < 4; j++) { -+ *hw_buf = *(buf++); -+ hw_buf += CHAN_TX_LIST_FRAMES; -+ } -+ -+ hdev->tx_loc += 4; -+ hdev->tx_frame++; -+ if (hdev->tx_loc >= hdev->tx_buffer_size) { -+ hdev->tx_loc = 0; -+ buf = (u8 *)hdev->tx_buf; -+ } -+ } -+ } else { -+#if 0 -+ hw_buf = (u8 *)port->chan_tx_buf; -+ hw_buf += (tx_list * CHAN_TX_LIST_FRAMES * 32); -+ hw_buf += (4 * CHAN_TX_LIST_FRAMES * channel); -+#else -+ hw_buf = port->tx_lists[tx_list][channel]; -+#endif -+ memset(hw_buf, 0, 64); -+ } -+ -+ if (hdev->tx_frame >= hdev->tx_period_size && test_bit(1 << channel, &port->chan_tx_bitmap)) -+ { -+ hdev->tx_frame %= hdev->tx_period_size; -+ if (hdev->tx_callback) -+ hdev->tx_callback(hdev->tx_data); -+ more_work = 1; -+ } -+ -+ if (test_bit(1 << channel, &port->chan_rx_bitmap)) { -+ buf = (u8 *)hdev->rx_buf + hdev->rx_loc; -+#if 0 -+ hw_buf = (u8 *)port->chan_rx_buf; -+ hw_buf += (4 * CHAN_RX_FRAMES * channel); -+ hw_buf += rx_frame; -+ save_buf = hw_buf; -+#else -+ save_buf = port->rx_frames[channel][rx_frame >> 4]; -+#endif -+ for (i = 0; i < CHAN_RX_TRIGGER; i++) { -+ hw_buf = save_buf + i; -+ for (j = 0; j < 4; j++) { -+ *(buf++) = *hw_buf; -+ hw_buf += CHAN_RX_FRAMES; -+ } -+ hdev->rx_loc += 4; -+ hdev->rx_frame++; -+ if (hdev->rx_loc >= hdev->rx_buffer_size) { -+ hdev->rx_loc = 0; -+ buf = (u8 *)hdev->rx_buf; -+ } -+ } -+ } -+ -+ if (hdev->rx_frame >= hdev->rx_period_size && test_bit(1 << channel, &port->chan_rx_bitmap)) -+ { -+ hdev->rx_frame %= hdev->rx_period_size; -+ if (hdev->rx_callback) -+ hdev->rx_callback(hdev->rx_data); -+ more_work = 1; -+ } -+ } -+#if 0 -+ if (more_work) -+ { -+ tasklet_hi_schedule(&port->task); -+ return; -+ } -+#endif -+ } -+ -+ qmgr_enable_irq(queue_ids[port->id].chan); -+ -+ return; -+ -+} -+ -+struct hss_device *hss_chan_create(struct port *port, unsigned int channel) -+{ -+ struct hss_device *chan_dev; -+ unsigned long flags; -+ -+ chan_dev = kzalloc(sizeof(struct hss_device), GFP_KERNEL); -+ -+ spin_lock_irqsave(&npe_lock, flags); -+ -+ chan_dev->id = channel; -+ chan_dev->port = port; -+ -+ port->channels[channel] = channel; -+ -+ port->chan_devices[channel] = chan_dev; -+ -+ spin_unlock_irqrestore(&npe_lock, flags); -+ -+ return chan_dev; -+} -+ -+/***************************************************************************** -+ * initialization -+ ****************************************************************************/ -+ -+static struct platform_device gw_avila_hss_device_0 = { -+ .name = "ixp4xx_hss", -+ .id = 0, -+}; -+ -+static struct platform_device gw_avila_hss_device_1 = { -+ .name = "ixp4xx_hss", -+ .id = 1, -+}; -+ -+static struct platform_device *gw_avila_hss_port_0; -+static struct platform_device *gw_avila_hss_port_1; -+static u64 hss_dmamask = 0xFFFFFFFF; -+ -+struct hss_device *hss_init(int id, int channel) -+{ -+ struct port *port = hss_port[id]; -+ struct hss_device *hdev; -+ int ret; -+ -+ if (!lock_init) -+ { -+ spin_lock_init(&npe_lock); -+ lock_init = 1; -+ npe = npe_request(0); -+ } -+ -+ if (!port->init) { -+ if (id == 0) { -+ gw_avila_hss_port_0 = platform_device_alloc("hss-port", 0); -+ -+ platform_set_drvdata(gw_avila_hss_port_0, &gw_avila_hss_device_0); -+ port->dev = &gw_avila_hss_port_0->dev; -+ -+ if (!port->dev->dma_mask) -+ port->dev->dma_mask = &hss_dmamask; -+ if (!port->dev->coherent_dma_mask) -+ port->dev->coherent_dma_mask = 0xFFFFFFFF; -+ -+ ret = platform_device_add(gw_avila_hss_port_0); -+ -+ if (ret) -+ platform_device_put(gw_avila_hss_port_0); -+ -+ tasklet_init(&port->task, hss_chan_read, (unsigned long) port); -+ } -+ else -+ { -+ gw_avila_hss_port_1 = platform_device_alloc("hss-port", 1); -+ -+ platform_set_drvdata(gw_avila_hss_port_1, &gw_avila_hss_device_1); -+ port->dev = &gw_avila_hss_port_1->dev; -+ -+ if (!port->dev->dma_mask) -+ port->dev->dma_mask = &hss_dmamask; -+ if (!port->dev->coherent_dma_mask) -+ port->dev->coherent_dma_mask = 0xFFFFFFFF; -+ -+ ret = platform_device_add(gw_avila_hss_port_1); -+ -+ if (ret) -+ platform_device_put(gw_avila_hss_port_1); -+ -+ tasklet_init(&port->task, hss_chan_read, (unsigned long) port); -+ } -+ -+ port->init = 1; -+ port->id = id; -+ port->clock_type = CLOCK_EXT; -+ port->clock_rate = 8192000; -+ port->frame_size = 256; /* E1 */ -+ port->mode = MODE_RAW; -+ port->next_rx_frame = 0; -+ memset(port->channels, CHANNEL_UNUSED, sizeof(port->channels)); -+ } -+ -+ hdev = hss_chan_create(port, channel); -+ -+ return hdev; -+} -+EXPORT_SYMBOL(hss_init); -+ -+int hss_set_tx_callback(struct hss_device *hdev, void (*tx_callback)(void *), void *tx_data) -+{ -+ BUG_ON(tx_callback == NULL); -+ hdev->tx_callback = tx_callback; -+ hdev->tx_data = tx_data; -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_set_tx_callback); -+ -+int hss_set_rx_callback(struct hss_device *hdev, void (*rx_callback)(void *), void *rx_data) -+{ -+ BUG_ON(rx_callback == NULL); -+ hdev->rx_callback = rx_callback; -+ hdev->rx_data = rx_data; -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_set_rx_callback); -+ -+int hss_config_rx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size) -+{ -+ /* -+ * Period Size and Buffer Size are in Frames which are u32 -+ * We convert the u32 *buf to u8 in order to make channel reads -+ * and rx_loc easier -+ */ -+ -+ hdev->rx_buf = (u8 *)buf; -+ hdev->rx_buffer_size = buffer_size << 2; -+ hdev->rx_period_size = period_size; -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_config_rx_dma); -+ -+int hss_config_tx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size) -+{ -+ /* -+ * Period Size and Buffer Size are in Frames which are u32 -+ * We convert the u32 *buf to u8 in order to make channel reads -+ * and rx_loc easier -+ */ -+ -+ hdev->tx_buf = (u8 *)buf; -+ hdev->tx_buffer_size = buffer_size << 2; -+ hdev->tx_period_size = period_size; -+ -+ return 0; -+} -+EXPORT_SYMBOL(hss_config_tx_dma); -+ -+unsigned long hss_curr_offset_rx(struct hss_device *hdev) -+{ -+ return hdev->rx_loc >> 2; -+} -+EXPORT_SYMBOL(hss_curr_offset_rx); -+ -+unsigned long hss_curr_offset_tx(struct hss_device *hdev) -+{ -+ return hdev->tx_loc >> 2; -+} -+EXPORT_SYMBOL(hss_curr_offset_tx); -+ -+MODULE_AUTHOR("Chris Lang"); -+MODULE_DESCRIPTION("Intel IXP4xx HSS Audio driver"); -+MODULE_LICENSE("GPL v2"); ---- /dev/null -+++ b/sound/soc/gw-avila/ixp4xx_hss.h -@@ -0,0 +1,401 @@ -+/* -+ * -+ * -+ * Copyright (C) 2009 Gateworks Corporation -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of version 2 of the GNU General Public License -+ * as published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+//#include XXX We aren't HDLC -+ -+#define DEBUG_QUEUES 0 -+#define DEBUG_DESC 0 -+#define DEBUG_RX 0 -+#define DEBUG_TX 0 -+#define DEBUG_PKT_BYTES 0 -+#define DEBUG_CLOSE 0 -+#define DEBUG_FRAMER 0 -+ -+#define DRV_NAME "ixp4xx_hss" -+ -+#define PKT_EXTRA_FLAGS 0 /* orig 1 */ -+#define TX_FRAME_SYNC_OFFSET 0 /* channelized */ -+#define PKT_NUM_PIPES 1 /* 1, 2 or 4 */ -+#define PKT_PIPE_FIFO_SIZEW 4 /* total 4 dwords per HSS */ -+ -+#define RX_DESCS 512 /* also length of all RX queues */ -+#define TX_DESCS 512 /* also length of all TX queues */ -+ -+//#define POOL_ALLOC_SIZE (sizeof(struct desc) * (RX_DESCS + TX_DESCS)) -+#define RX_SIZE (HDLC_MAX_MRU + 4) /* NPE needs more space */ -+#define MAX_CLOSE_WAIT 1000 /* microseconds */ -+#define HSS_COUNT 2 -+#define MIN_FRAME_SIZE 16 /* bits */ -+#define MAX_FRAME_SIZE 257 /* 256 bits + framing bit */ -+#define MAX_CHANNELS (MAX_FRAME_SIZE / 8) -+#define MAX_CHAN_DEVICES 32 -+#define CHANNEL_HDLC 0xFE -+#define CHANNEL_UNUSED 0xFF -+ -+#define NAPI_WEIGHT 16 -+#define CHAN_RX_TRIGGER 16 /* 8 RX frames = 1 ms @ E1 */ -+#define CHAN_RX_FRAMES 128 -+#define CHAN_RX_TRUNKS 1 -+#define MAX_CHAN_RX_BAD_SYNC (CHAN_RX_TRIGGER / 2 /* pairs */ - 3) -+ -+#define CHAN_TX_LIST_FRAMES CHAN_RX_TRIGGER /* bytes/channel per list, 16 - 48 */ -+#define CHAN_TX_LISTS 8 -+#define CHAN_TX_TRUNKS CHAN_RX_TRUNKS -+#define CHAN_TX_FRAMES (CHAN_TX_LIST_FRAMES * CHAN_TX_LISTS) -+ -+#define CHAN_QUEUE_LEN 32 /* minimum possible */ -+ -+#define chan_rx_buf_len(port) (port->frame_size / 8 * CHAN_RX_FRAMES * CHAN_RX_TRUNKS) -+#define chan_tx_buf_len(port) (port->frame_size / 8 * CHAN_TX_FRAMES * CHAN_TX_TRUNKS) -+ -+/* Queue IDs */ -+#define HSS0_CHL_RXTRIG_QUEUE 12 /* orig size = 32 dwords */ -+#define HSS0_PKT_RX_QUEUE 13 /* orig size = 32 dwords */ -+#define HSS0_PKT_TX0_QUEUE 14 /* orig size = 16 dwords */ -+#define HSS0_PKT_TX1_QUEUE 15 -+#define HSS0_PKT_TX2_QUEUE 16 -+#define HSS0_PKT_TX3_QUEUE 17 -+#define HSS0_PKT_RXFREE0_QUEUE 18 /* orig size = 16 dwords */ -+#define HSS0_PKT_RXFREE1_QUEUE 19 -+#define HSS0_PKT_RXFREE2_QUEUE 20 -+#define HSS0_PKT_RXFREE3_QUEUE 21 -+#define HSS0_PKT_TXDONE_QUEUE 22 /* orig size = 64 dwords */ -+ -+#define HSS1_CHL_RXTRIG_QUEUE 10 -+#define HSS1_PKT_RX_QUEUE 0 -+#define HSS1_PKT_TX0_QUEUE 5 -+#define HSS1_PKT_TX1_QUEUE 6 -+#define HSS1_PKT_TX2_QUEUE 7 -+#define HSS1_PKT_TX3_QUEUE 8 -+#define HSS1_PKT_RXFREE0_QUEUE 1 -+#define HSS1_PKT_RXFREE1_QUEUE 2 -+#define HSS1_PKT_RXFREE2_QUEUE 3 -+#define HSS1_PKT_RXFREE3_QUEUE 4 -+#define HSS1_PKT_TXDONE_QUEUE 9 -+ -+#define NPE_PKT_MODE_HDLC 0 -+#define NPE_PKT_MODE_RAW 1 -+#define NPE_PKT_MODE_56KMODE 2 -+#define NPE_PKT_MODE_56KENDIAN_MSB 4 -+ -+/* PKT_PIPE_HDLC_CFG_WRITE flags */ -+#define PKT_HDLC_IDLE_ONES 0x1 /* default = flags */ -+#define PKT_HDLC_CRC_32 0x2 /* default = CRC-16 */ -+#define PKT_HDLC_MSB_ENDIAN 0x4 /* default = LE */ -+ -+ -+/* hss_config, PCRs */ -+/* Frame sync sampling, default = active low */ -+#define PCR_FRM_SYNC_ACTIVE_HIGH 0x40000000 -+#define PCR_FRM_SYNC_FALLINGEDGE 0x80000000 -+#define PCR_FRM_SYNC_RISINGEDGE 0xC0000000 -+ -+/* Frame sync pin: input (default) or output generated off a given clk edge */ -+#define PCR_FRM_SYNC_OUTPUT_FALLING 0x20000000 -+#define PCR_FRM_SYNC_OUTPUT_RISING 0x30000000 -+ -+/* Frame and data clock sampling on edge, default = falling */ -+#define PCR_FCLK_EDGE_RISING 0x08000000 -+#define PCR_DCLK_EDGE_RISING 0x04000000 -+ -+/* Clock direction, default = input */ -+#define PCR_SYNC_CLK_DIR_OUTPUT 0x02000000 -+ -+/* Generate/Receive frame pulses, default = enabled */ -+#define PCR_FRM_PULSE_DISABLED 0x01000000 -+ -+ /* Data rate is full (default) or half the configured clk speed */ -+#define PCR_HALF_CLK_RATE 0x00200000 -+ -+/* Invert data between NPE and HSS FIFOs? (default = no) */ -+#define PCR_DATA_POLARITY_INVERT 0x00100000 -+ -+/* TX/RX endianness, default = LSB */ -+#define PCR_MSB_ENDIAN 0x00080000 -+ -+/* Normal (default) / open drain mode (TX only) */ -+#define PCR_TX_PINS_OPEN_DRAIN 0x00040000 -+ -+/* No framing bit transmitted and expected on RX? (default = framing bit) */ -+#define PCR_SOF_NO_FBIT 0x00020000 -+ -+/* Drive data pins? */ -+#define PCR_TX_DATA_ENABLE 0x00010000 -+ -+/* Voice 56k type: drive the data pins low (default), high, high Z */ -+#define PCR_TX_V56K_HIGH 0x00002000 -+#define PCR_TX_V56K_HIGH_IMP 0x00004000 -+ -+/* Unassigned type: drive the data pins low (default), high, high Z */ -+#define PCR_TX_UNASS_HIGH 0x00000800 -+#define PCR_TX_UNASS_HIGH_IMP 0x00001000 -+ -+/* T1 @ 1.544MHz only: Fbit dictated in FIFO (default) or high Z */ -+#define PCR_TX_FB_HIGH_IMP 0x00000400 -+ -+/* 56k data endiannes - which bit unused: high (default) or low */ -+#define PCR_TX_56KE_BIT_0_UNUSED 0x00000200 -+ -+/* 56k data transmission type: 32/8 bit data (default) or 56K data */ -+#define PCR_TX_56KS_56K_DATA 0x00000100 -+ -+/* hss_config, cCR */ -+/* Number of packetized clients, default = 1 */ -+#define CCR_NPE_HFIFO_2_HDLC 0x04000000 -+#define CCR_NPE_HFIFO_3_OR_4HDLC 0x08000000 -+ -+/* default = no loopback */ -+#define CCR_LOOPBACK 0x02000000 -+ -+/* HSS number, default = 0 (first) */ -+#define CCR_SECOND_HSS 0x01000000 -+ -+ -+/* hss_config, clkCR: main:10, num:10, denom:12 */ -+#define CLK42X_SPEED_EXP ((0x3FF << 22) | ( 2 << 12) | 15) /*65 KHz*/ -+ -+#define CLK42X_SPEED_512KHZ (( 130 << 22) | ( 2 << 12) | 15) -+#define CLK42X_SPEED_1536KHZ (( 43 << 22) | ( 18 << 12) | 47) -+#define CLK42X_SPEED_1544KHZ (( 43 << 22) | ( 33 << 12) | 192) -+#define CLK42X_SPEED_2048KHZ (( 32 << 22) | ( 34 << 12) | 63) -+#define CLK42X_SPEED_4096KHZ (( 16 << 22) | ( 34 << 12) | 127) -+#define CLK42X_SPEED_8192KHZ (( 8 << 22) | ( 34 << 12) | 255) -+ -+#define CLK46X_SPEED_512KHZ (( 130 << 22) | ( 24 << 12) | 127) -+#define CLK46X_SPEED_1536KHZ (( 43 << 22) | (152 << 12) | 383) -+#define CLK46X_SPEED_1544KHZ (( 43 << 22) | ( 66 << 12) | 385) -+#define CLK46X_SPEED_2048KHZ (( 32 << 22) | (280 << 12) | 511) -+#define CLK46X_SPEED_4096KHZ (( 16 << 22) | (280 << 12) | 1023) -+#define CLK46X_SPEED_8192KHZ (( 8 << 22) | (280 << 12) | 2047) -+ -+ -+/* hss_config, LUT entries */ -+#define TDMMAP_UNASSIGNED 0 -+#define TDMMAP_HDLC 1 /* HDLC - packetized */ -+#define TDMMAP_VOICE56K 2 /* Voice56K - 7-bit channelized */ -+#define TDMMAP_VOICE64K 3 /* Voice64K - 8-bit channelized */ -+ -+/* offsets into HSS config */ -+#define HSS_CONFIG_TX_PCR 0x00 /* port configuration registers */ -+#define HSS_CONFIG_RX_PCR 0x04 -+#define HSS_CONFIG_CORE_CR 0x08 /* loopback control, HSS# */ -+#define HSS_CONFIG_CLOCK_CR 0x0C /* clock generator control */ -+#define HSS_CONFIG_TX_FCR 0x10 /* frame configuration registers */ -+#define HSS_CONFIG_RX_FCR 0x14 -+#define HSS_CONFIG_TX_LUT 0x18 /* channel look-up tables */ -+#define HSS_CONFIG_RX_LUT 0x38 -+ -+ -+/* NPE command codes */ -+/* writes the ConfigWord value to the location specified by offset */ -+#define PORT_CONFIG_WRITE 0x40 -+ -+/* triggers the NPE to load the contents of the configuration table */ -+#define PORT_CONFIG_LOAD 0x41 -+ -+/* triggers the NPE to return an HssErrorReadResponse message */ -+#define PORT_ERROR_READ 0x42 -+ -+/* reset NPE internal status and enable the HssChannelized operation */ -+#define CHAN_FLOW_ENABLE 0x43 -+#define CHAN_FLOW_DISABLE 0x44 -+#define CHAN_IDLE_PATTERN_WRITE 0x45 -+#define CHAN_NUM_CHANS_WRITE 0x46 -+#define CHAN_RX_BUF_ADDR_WRITE 0x47 -+#define CHAN_RX_BUF_CFG_WRITE 0x48 -+#define CHAN_TX_BLK_CFG_WRITE 0x49 -+#define CHAN_TX_BUF_ADDR_WRITE 0x4A -+#define CHAN_TX_BUF_SIZE_WRITE 0x4B -+#define CHAN_TSLOTSWITCH_ENABLE 0x4C -+#define CHAN_TSLOTSWITCH_DISABLE 0x4D -+ -+/* downloads the gainWord value for a timeslot switching channel associated -+ with bypassNum */ -+#define CHAN_TSLOTSWITCH_GCT_DOWNLOAD 0x4E -+ -+/* triggers the NPE to reset internal status and enable the HssPacketized -+ operation for the flow specified by pPipe */ -+#define PKT_PIPE_FLOW_ENABLE 0x50 -+#define PKT_PIPE_FLOW_DISABLE 0x51 -+#define PKT_NUM_PIPES_WRITE 0x52 -+#define PKT_PIPE_FIFO_SIZEW_WRITE 0x53 -+#define PKT_PIPE_HDLC_CFG_WRITE 0x54 -+#define PKT_PIPE_IDLE_PATTERN_WRITE 0x55 -+#define PKT_PIPE_RX_SIZE_WRITE 0x56 -+#define PKT_PIPE_MODE_WRITE 0x57 -+ -+/* HDLC packet status values - desc->status */ -+#define ERR_SHUTDOWN 1 /* stop or shutdown occurrance */ -+#define ERR_HDLC_ALIGN 2 /* HDLC alignment error */ -+#define ERR_HDLC_FCS 3 /* HDLC Frame Check Sum error */ -+#define ERR_RXFREE_Q_EMPTY 4 /* RX-free queue became empty while receiving -+ this packet (if buf_len < pkt_len) */ -+#define ERR_HDLC_TOO_LONG 5 /* HDLC frame size too long */ -+#define ERR_HDLC_ABORT 6 /* abort sequence received */ -+#define ERR_DISCONNECTING 7 /* disconnect is in progress */ -+ -+#define CLOCK_EXT 0 -+#define CLOCK_INT 1 -+ -+enum mode {MODE_HDLC = 0, MODE_RAW, MODE_G704}; -+enum rx_tx_bit { -+ TX_BIT = 0, -+ RX_BIT = 1 -+}; -+enum chan_bit { -+ CHAN_0 = (1 << 0), -+ CHAN_1 = (1 << 1), -+ CHAN_2 = (1 << 2), -+ CHAN_3 = (1 << 3), -+ CHAN_4 = (1 << 4), -+ CHAN_5 = (1 << 5), -+ CHAN_6 = (1 << 6), -+ CHAN_7 = (1 << 7), -+ CHAN_8 = (1 << 8), -+ CHAN_9 = (1 << 9), -+ CHAN_10 = (1 << 10), -+ CHAN_11 = (1 << 11), -+ CHAN_12 = (1 << 12), -+ CHAN_13 = (1 << 13), -+ CHAN_14 = (1 << 14), -+ CHAN_15 = (1 << 15) -+}; -+ -+enum alignment { NOT_ALIGNED = 0, EVEN_FIRST, ODD_FIRST }; -+ -+#ifdef __ARMEB__ -+typedef struct sk_buff buffer_t; -+#define free_buffer dev_kfree_skb -+#define free_buffer_irq dev_kfree_skb_irq -+#else -+typedef void buffer_t; -+#define free_buffer kfree -+#define free_buffer_irq kfree -+#endif -+ -+struct hss_device { -+ struct port *port; -+ unsigned int open_count, excl_open; -+ unsigned long tx_loc, rx_loc; /* bytes */ -+ unsigned long tx_frame, rx_frame; /* Frames */ -+ u8 id, chan_count; -+ u8 log_channels[MAX_CHANNELS]; -+ -+ u8 *rx_buf; -+ u8 *tx_buf; -+ -+ size_t rx_buffer_size; -+ size_t rx_period_size; -+ size_t tx_buffer_size; -+ size_t tx_period_size; -+ -+ void (*rx_callback)(void *data); -+ void *rx_data; -+ void (*tx_callback)(void *data); -+ void *tx_data; -+ void *private_data; -+}; -+ -+extern struct hss_device *hss_handle[32]; -+extern struct port *hss_port[2]; -+ -+struct port { -+ unsigned char init; -+ -+ struct device *dev; -+ -+ struct tasklet_struct task; -+ unsigned int id; -+ unsigned long chan_rx_bitmap; -+ unsigned long chan_tx_bitmap; -+ unsigned char chan_open; -+ -+ /* the following fields must be protected by npe_lock */ -+ enum mode mode; -+ unsigned int clock_type, clock_rate, loopback; -+ unsigned int frame_size, frame_sync_offset; -+ unsigned int next_rx_frame; -+ -+ struct hss_device *chan_devices[MAX_CHAN_DEVICES]; -+ u32 chan_tx_buf_phys, chan_rx_buf_phys; -+ u32 chan_tx_pointers_phys; -+ u32 *chan_tx_pointers; -+ u8 *chan_rx_buf; -+ u8 *chan_tx_buf; -+ u8 *tx_lists[CHAN_TX_LISTS][8]; -+ u8 *rx_frames[8][CHAN_TX_LISTS]; -+ unsigned int chan_open_count, hdlc_open; -+ unsigned int chan_started, initialized, just_set_offset; -+ unsigned int chan_last_rx, chan_last_tx; -+ -+ /* assigned channels, may be invalid with given frame length or mode */ -+ u8 channels[MAX_CHANNELS]; -+ int msg_count; -+}; -+ -+/* NPE message structure */ -+struct msg { -+#ifdef __ARMEB__ -+ u8 cmd, unused, hss_port, index; -+ union { -+ struct { u8 data8a, data8b, data8c, data8d; }; -+ struct { u16 data16a, data16b; }; -+ struct { u32 data32; }; -+ }; -+#else -+ u8 index, hss_port, unused, cmd; -+ union { -+ struct { u8 data8d, data8c, data8b, data8a; }; -+ struct { u16 data16b, data16a; }; -+ struct { u32 data32; }; -+ }; -+#endif -+}; -+ -+#define rx_desc_phys(port, n) ((port)->desc_tab_phys + \ -+ (n) * sizeof(struct desc)) -+#define rx_desc_ptr(port, n) (&(port)->desc_tab[n]) -+ -+#define tx_desc_phys(port, n) ((port)->desc_tab_phys + \ -+ ((n) + RX_DESCS) * sizeof(struct desc)) -+#define tx_desc_ptr(port, n) (&(port)->desc_tab[(n) + RX_DESCS]) -+ -+int hss_prepare_chan(struct port *port); -+void hss_chan_stop(struct port *port); -+ -+struct hss_device *hss_init(int id, int channel); -+int hss_chan_open(struct hss_device *hdev); -+int hss_chan_close(struct hss_device *hdev); -+ -+int hss_set_tx_callback(struct hss_device *hdev, void (*tx_callback)(void *), void *tx_data); -+int hss_set_rx_callback(struct hss_device *hdev, void (*rx_callback)(void *), void *rx_data); -+int hss_tx_start(struct hss_device *hdev); -+int hss_tx_stop(struct hss_device *hdev); -+int hss_rx_start(struct hss_device *hdev); -+int hss_rx_stop(struct hss_device *hdev); -+ -+int hss_config_rx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size); -+int hss_config_tx_dma(struct hss_device *hdev, void *buf, size_t buffer_size, size_t period_size); -+unsigned long hss_curr_offset_rx(struct hss_device *hdev); -+unsigned long hss_curr_offset_tx(struct hss_device *hdev); -+ diff --git a/target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch b/target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch deleted file mode 100644 index b56fbb732d..0000000000 --- a/target/linux/ixp4xx/patches-4.9/180-tw5334_support.patch +++ /dev/null @@ -1,287 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -160,6 +160,14 @@ config ARCH_PRPMC1100 - PrPCM1100 Processor Mezanine Module. For more information on - this platform, see . - -+config MACH_TW5334 -+ bool "Titan Wireless TW-533-4" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support the Titan -+ Wireless TW533-4. For more information on this platform, -+ see http://openwrt.org -+ - config MACH_NAS100D - bool - prompt "NAS100D" ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER) += sid - obj-pci-$(CONFIG_MACH_COMPEXWP18) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o - obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o -+obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o - - obj-y += common.o - -@@ -49,6 +50,7 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin - obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o - obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o - obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o -+obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h -+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -44,7 +44,7 @@ static __inline__ void __arch_decomp_set - machine_is_gateway7001() || machine_is_wg302v2() || - machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() || - machine_is_pronghorn() || machine_is_pronghorn_metro() || -- machine_is_wrt300nv2()) -+ machine_is_wrt300nv2() || machine_is_tw5334()) - uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; - else - uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/tw5334-pci.c -@@ -0,0 +1,68 @@ -+/* -+ * arch/arch/mach-ixp4xx/tw5334-pci.c -+ * -+ * PCI setup routines for the Titan Wireless TW-533-4 -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+ -+void __init tw5334_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO0, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init tw5334_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 12) -+ return IRQ_IXP4XX_GPIO6; -+ else if (slot == 13) -+ return IRQ_IXP4XX_GPIO2; -+ else if (slot == 14) -+ return IRQ_IXP4XX_GPIO1; -+ else if (slot == 15) -+ return IRQ_IXP4XX_GPIO0; -+ else return -1; -+} -+ -+struct hw_pci tw5334_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = tw5334_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = tw5334_map_irq, -+}; -+ -+int __init tw5334_pci_init(void) -+{ -+ if (machine_is_tw5334()) -+ pci_common_init(&tw5334_pci); -+ return 0; -+} -+ -+subsys_initcall(tw5334_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/tw5334-setup.c -@@ -0,0 +1,167 @@ -+/* -+ * arch/arm/mach-ixp4xx/tw5334-setup.c -+ * -+ * Board setup for the Titan Wireless TW-533-4 -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct flash_platform_data tw5334_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource tw5334_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device tw5334_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &tw5334_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &tw5334_flash_resource, -+}; -+ -+static struct resource tw5334_uart_resource = { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct plat_serial8250_port tw5334_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device tw5334_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = tw5334_uart_data, -+ }, -+ .num_resources = 1, -+ .resource = &tw5334_uart_resource, -+}; -+ -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info tw5334_plat_eth[] = { -+ { -+ .phy = 0, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device tw5334_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = tw5334_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = tw5334_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *tw5334_devices[] __initdata = { -+ &tw5334_flash, -+ &tw5334_uart, -+ &tw5334_eth[0], -+ &tw5334_eth[1], -+}; -+ -+static void __init tw5334_init(void) -+{ -+ uint8_t __iomem *f; -+ int i; -+ -+ ixp4xx_sys_init(); -+ -+ tw5334_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ tw5334_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(tw5334_devices, ARRAY_SIZE(tw5334_devices)); -+ -+ /* -+ * Map in a portion of the flash and read the MAC addresses. -+ * Since it is stored in BE in the flash itself, we need to -+ * byteswap it if we're in LE mode. -+ */ -+ f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000); -+ if (f) { -+ for (i = 0; i < 6; i++) { -+#ifdef __ARMEB__ -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); -+#else -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); -+#endif -+ } -+ iounmap(f); -+ } -+ -+ printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 0\n", -+ tw5334_plat_eth[0].hwaddr); -+ printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 1\n", -+ tw5334_plat_eth[1].hwaddr); -+} -+ -+#ifdef CONFIG_MACH_TW5334 -+MACHINE_START(TW5334, "Titan Wireless TW-533-4") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = tw5334_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+#endif diff --git a/target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch b/target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch deleted file mode 100644 index 7c229276fc..0000000000 --- a/target/linux/ixp4xx/patches-4.9/185-mi424wr_support.patch +++ /dev/null @@ -1,504 +0,0 @@ ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig -@@ -26,6 +26,7 @@ CONFIG_MACH_NAS100D=y - CONFIG_MACH_DSMG600=y - CONFIG_MACH_FSG=y - CONFIG_MACH_GTWX5715=y -+CONFIG_MACH_MI424WR=y - CONFIG_IXP4XX_QMGR=y - CONFIG_IXP4XX_NPE=y - # CONFIG_ARM_THUMB is not set ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -258,6 +258,13 @@ config MACH_MIC256 - Say 'Y' here if you want your kernel to support the MIC256 - board from OMICRON electronics GmbH. - -+config MACH_MI424WR -+ bool "Actiontec MI424WR" -+ depends on ARCH_IXP4XX -+ select PCI -+ help -+ Add support for the Actiontec MI424-WR. -+ - comment "IXP4xx Options" - - config IXP4XX_INDIRECT_PCI ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_COMPEXWP18) += ixd - obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o - obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o -+obj-pci-$(CONFIG_MACH_MI424WR) += mi424wr-pci.o - - obj-y += common.o - -@@ -51,6 +52,7 @@ obj-$(CONFIG_MACH_COMPEXWP18) += compex4 - obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o - obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o - obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o -+obj-$(CONFIG_MACH_MI424WR) += mi424wr-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/mi424wr-pci.c -@@ -0,0 +1,70 @@ -+/* -+ * arch/arm/mach-ixp4xx/mi424wr-pci.c -+ * -+ * Actiontec MI424WR board-level PCI initialization -+ * -+ * Copyright (C) 2008 Jose Vasconcellos -+ * -+ * Maintainer: Jose Vasconcellos -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+/* PCI controller GPIO to IRQ pin mappings -+ * This information was obtained from Actiontec's GPL release. -+ * -+ * INTA INTB -+ * SLOT 13 8 6 -+ * SLOT 14 7 8 -+ * SLOT 15 6 7 -+ */ -+ -+void __init mi424wr_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init mi424wr_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 13) -+ return IRQ_IXP4XX_GPIO8; -+ if (slot == 14) -+ return IRQ_IXP4XX_GPIO7; -+ if (slot == 15) -+ return IRQ_IXP4XX_GPIO6; -+ -+ return -1; -+} -+ -+struct hw_pci mi424wr_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = mi424wr_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = mi424wr_map_irq, -+}; -+ -+int __init mi424wr_pci_init(void) -+{ -+ if (machine_is_mi424wr()) -+ pci_common_init(&mi424wr_pci); -+ return 0; -+} -+ -+subsys_initcall(mi424wr_pci_init); -+ ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c -@@ -0,0 +1,384 @@ -+/* -+ * arch/arm/mach-ixp4xx/mi424wr-setup.c -+ * -+ * Actiontec MI424-WR board setup -+ * Copyright (c) 2008 Jose Vasconcellos -+ * -+ * Based on Gemtek GTWX5715 by -+ * Copyright (C) 2004 George T. Joseph -+ * Derived from Coyote -+ * -+ * 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. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* -+ * GPIO 2,3,4 and 9 are hard wired to the Micrel/Kendin KS8995M Switch -+ * and operate as an SPI type interface. The details of the interface -+ * are available on Kendin/Micrel's web site. -+ */ -+ -+#define MI424WR_KSSPI_SELECT 9 -+#define MI424WR_KSSPI_TXD 4 -+#define MI424WR_KSSPI_CLOCK 2 -+#define MI424WR_KSSPI_RXD 3 -+ -+/* -+ * The "reset" button is wired to GPIO 10. -+ * The GPIO is brought "low" when the button is pushed. -+ */ -+ -+#define MI424WR_BUTTON_GPIO 10 -+#define MI424WR_BUTTON_IRQ IRQ_IXP4XX_GPIO10 -+ -+#define MI424WR_MOCA_WAN_LED 11 -+ -+/* Latch on CS1 - taken from Actiontec's 2.4 source code -+ * -+ * default latch value -+ * 0 - power alarm led (red) 0 (off) -+ * 1 - power led (green) 0 (off) -+ * 2 - wireless led (green) 1 (off) -+ * 3 - no internet led (red) 0 (off) -+ * 4 - internet ok led (green) 0 (off) -+ * 5 - moca LAN 0 (off) -+ * 6 - WAN alarm led (red) 0 (off) -+ * 7 - PCI reset 1 (not reset) -+ * 8 - IP phone 1 led (green) 1 (off) -+ * 9 - IP phone 2 led (green) 1 (off) -+ * 10 - VOIP ready led (green) 1 (off) -+ * 11 - PSTN relay 1 control 0 (PSTN) -+ * 12 - PSTN relay 1 control 0 (PSTN) -+ * 13 - N/A -+ * 14 - N/A -+ * 15 - N/A -+ */ -+ -+#define MI424WR_LATCH_MASK 0x04 -+#define MI424WR_LATCH_DEFAULT 0x1f86 -+ -+#define MI424WR_LATCH_ALARM_LED 0x00 -+#define MI424WR_LATCH_POWER_LED 0x01 -+#define MI424WR_LATCH_WIRELESS_LED 0x02 -+#define MI424WR_LATCH_INET_DOWN_LED 0x03 -+#define MI424WR_LATCH_INET_OK_LED 0x04 -+#define MI424WR_LATCH_MOCA_LAN_LED 0x05 -+#define MI424WR_LATCH_WAN_ALARM_LED 0x06 -+#define MI424WR_LATCH_PCI_RESET 0x07 -+#define MI424WR_LATCH_PHONE1_LED 0x08 -+#define MI424WR_LATCH_PHONE2_LED 0x09 -+#define MI424WR_LATCH_VOIP_LED 0x10 -+#define MI424WR_LATCH_PSTN_RELAY1 0x11 -+#define MI424WR_LATCH_PSTN_RELAY2 0x12 -+ -+/* initialize CS1 to default timings, Intel style, 16-bit bus */ -+#define MI424WR_CS1_CONFIG 0x80000002 -+ -+/* Define both UARTs but they are not easily accessible. -+ */ -+ -+static struct resource mi424wr_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ } -+}; -+ -+ -+static struct plat_serial8250_port mi424wr_uart_platform_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device mi424wr_uart_device = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = mi424wr_uart_platform_data, -+ .num_resources = ARRAY_SIZE(mi424wr_uart_resources), -+ .resource = mi424wr_uart_resources, -+}; -+ -+static struct flash_platform_data mi424wr_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource mi424wr_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device mi424wr_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev.platform_data = &mi424wr_flash_data, -+ .num_resources = 1, -+ .resource = &mi424wr_flash_resource, -+}; -+ -+static struct spi_gpio_platform_data mi424wr_spi_platform_data = { -+ .sck = MI424WR_KSSPI_CLOCK, -+ .mosi = MI424WR_KSSPI_TXD, -+ .miso = MI424WR_KSSPI_RXD, -+ .num_chipselect = 1, -+}; -+ -+static struct platform_device mi424wr_spi_device = { -+ .name = "spi-gpio", -+ .id = 1, -+ .dev.platform_data = &mi424wr_spi_platform_data, -+}; -+ -+static struct spi_board_info mi424wr_spi_devices[] __initdata = { -+ { -+ .modalias = "spi-ks8995", -+ .max_speed_hz = 500000, -+ .mode = SPI_MODE_0, -+ .bus_num = 1, -+ .chip_select = 0, -+ .controller_data = (void *)MI424WR_KSSPI_SELECT, -+ } -+}; -+ -+static struct gpio_led mi424wr_gpio_led[] = { -+ { -+ .name = "moca-wan", /* green led */ -+ .gpio = MI424WR_MOCA_WAN_LED, -+ .active_low = 0, -+ } -+}; -+ -+static struct gpio_led_platform_data mi424wr_gpio_leds_data = { -+ .num_leds = 1, -+ .leds = mi424wr_gpio_led, -+}; -+ -+static struct platform_device mi424wr_gpio_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev.platform_data = &mi424wr_gpio_leds_data, -+}; -+ -+static uint16_t latch_value = MI424WR_LATCH_DEFAULT; -+static uint16_t __iomem *iobase; -+ -+static void mi424wr_latch_set_led(u8 bit, enum led_brightness value) -+{ -+ -+ if (((MI424WR_LATCH_MASK >> bit) & 1) ^ (value == LED_OFF)) -+ latch_value &= ~(0x1 << bit); -+ else -+ latch_value |= (0x1 << bit); -+ -+ __raw_writew(latch_value, iobase); -+ -+} -+ -+static struct latch_led mi424wr_latch_led[] = { -+ { -+ .name = "power-alarm", -+ .bit = MI424WR_LATCH_ALARM_LED, -+ }, -+ { -+ .name = "power-ok", -+ .bit = MI424WR_LATCH_POWER_LED, -+ }, -+ { -+ .name = "wireless", /* green led */ -+ .bit = MI424WR_LATCH_WIRELESS_LED, -+ }, -+ { -+ .name = "inet-down", /* red led */ -+ .bit = MI424WR_LATCH_INET_DOWN_LED, -+ }, -+ { -+ .name = "inet-up", /* green led */ -+ .bit = MI424WR_LATCH_INET_OK_LED, -+ }, -+ { -+ .name = "moca-lan", /* green led */ -+ .bit = MI424WR_LATCH_MOCA_LAN_LED, -+ }, -+ { -+ .name = "wan-alarm", /* red led */ -+ .bit = MI424WR_LATCH_WAN_ALARM_LED, -+ } -+}; -+ -+static struct latch_led_platform_data mi424wr_latch_leds_data = { -+ .num_leds = ARRAY_SIZE(mi424wr_latch_led), -+ .mem = 0x51000000, -+ .leds = mi424wr_latch_led, -+ .set_led = mi424wr_latch_set_led, -+}; -+ -+static struct platform_device mi424wr_latch_leds = { -+ .name = "leds-latch", -+ .id = -1, -+ .dev.platform_data = &mi424wr_latch_leds_data, -+}; -+ -+static struct eth_plat_info mi424wr_wan_data = { -+ .phy = 17, /* KS8721 */ -+ .rxq = 3, -+ .txreadyq = 20, -+}; -+ -+static struct eth_plat_info mi424wr_lan_data = { -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x1e, /* ports 1-4 of the KS8995 switch */ -+ .rxq = 4, -+ .txreadyq = 21, -+}; -+ -+static struct platform_device mi424wr_npe_devices[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = &mi424wr_lan_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = &mi424wr_wan_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct eth_plat_info mi424wr_wanD_data = { -+ .phy = 5, -+ .rxq = 4, -+ .txreadyq = 21, -+}; -+ -+static struct eth_plat_info mi424wr_lanD_data = { -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x1e, /* ports 1-4 of the KS8995 switch */ -+ .rxq = 3, -+ .txreadyq = 20, -+}; -+ -+static struct platform_device mi424wr_npeD_devices[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = &mi424wr_lanD_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = &mi424wr_wanD_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *mi424wr_devices[] __initdata = { -+ &mi424wr_uart_device, -+ &mi424wr_flash, -+ &mi424wr_spi_device, -+ &mi424wr_gpio_leds, -+ &mi424wr_latch_leds, -+}; -+ -+static void __init mi424wr_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ mi424wr_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ mi424wr_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = MI424WR_CS1_CONFIG; -+ -+ /* configure button as input -+ */ -+ gpio_line_config(MI424WR_BUTTON_GPIO, IXP4XX_GPIO_IN); -+ -+ /* Initialize LEDs and enables PCI bus. -+ */ -+ iobase = ioremap_nocache(IXP4XX_EXP_BUS_BASE(1), 0x1000); -+ __raw_writew(latch_value, iobase); -+ -+ spi_register_board_info(mi424wr_spi_devices, ARRAY_SIZE(mi424wr_spi_devices)); -+ platform_add_devices(mi424wr_devices, ARRAY_SIZE(mi424wr_devices)); -+ -+ /* Need to figure out how to detect revD. -+ * Look for a revision argument sent by redboot. -+ */ -+#define revD 4 -+ if (system_rev == revD) { -+ platform_device_register(&mi424wr_npeD_devices[0]); -+ platform_device_register(&mi424wr_npeD_devices[1]); -+ } else { -+ platform_device_register(&mi424wr_npe_devices[0]); -+ platform_device_register(&mi424wr_npe_devices[1]); -+ } -+} -+ -+ -+MACHINE_START(MI424WR, "Actiontec MI424WR") -+ /* Maintainer: Jose Vasconcellos */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = mi424wr_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+ diff --git a/target/linux/ixp4xx/patches-4.9/190-cambria_support.patch b/target/linux/ixp4xx/patches-4.9/190-cambria_support.patch deleted file mode 100644 index 83a3319261..0000000000 --- a/target/linux/ixp4xx/patches-4.9/190-cambria_support.patch +++ /dev/null @@ -1,1131 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -21,6 +21,14 @@ config MACH_AVILA - Avila Network Platform. For more information on this platform, - see . - -+config MACH_CAMBRIA -+ bool "Cambria" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support the Gateworks -+ Cambria series. For more information on this platform, -+ see . -+ - config MACH_LOFT - bool "Loft" - depends on MACH_AVILA -@@ -218,7 +226,7 @@ config CPU_IXP46X - - config CPU_IXP43X - bool -- depends on MACH_KIXRP435 -+ depends on MACH_KIXRP435 || MACH_CAMBRIA - default y - - config MACH_GTWX5715 ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -7,6 +7,7 @@ obj-pci-n := - - obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o -+obj-pci-$(CONFIG_MACH_CAMBRIA) += cambria-pci.o - obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o - obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o - obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o -@@ -31,6 +32,7 @@ obj-y += common.o - - obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o - obj-$(CONFIG_MACH_AVILA) += avila-setup.o -+obj-$(CONFIG_MACH_CAMBRIA) += cambria-setup.o - obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o - obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/cambria-pci.c -@@ -0,0 +1,78 @@ -+/* -+ * arch/arch/mach-ixp4xx/cambria-pci.c -+ * -+ * PCI setup routines for Gateworks Cambria series -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+extern void ixp4xx_pci_preinit(void); -+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); -+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys); -+ -+void __init cambria_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init cambria_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 1) -+ return IRQ_IXP4XX_GPIO11; -+ else if (slot == 2) -+ return IRQ_IXP4XX_GPIO10; -+ else if (slot == 3) -+ return IRQ_IXP4XX_GPIO9; -+ else if (slot == 4) -+ return IRQ_IXP4XX_GPIO8; -+ else if (slot == 6) -+ return IRQ_IXP4XX_GPIO10; -+ else if (slot == 15) -+ return IRQ_IXP4XX_GPIO8; -+ -+ else return -1; -+} -+ -+struct hw_pci cambria_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = cambria_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = cambria_map_irq, -+}; -+ -+int __init cambria_pci_init(void) -+{ -+ if (machine_is_cambria()) -+ pci_common_init(&cambria_pci); -+ return 0; -+} -+ -+subsys_initcall(cambria_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/cambria-setup.c -@@ -0,0 +1,1003 @@ -+/* -+ * arch/arm/mach-ixp4xx/cambria-setup.c -+ * -+ * Board setup for the Gateworks Cambria series -+ * -+ * Copyright (C) 2008 Imre Kaloz -+ * Copyright (C) 2012 Gateworks Corporation -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ * Tim Harvey -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) -+ -+struct cambria_board_info { -+ unsigned char *model; -+ void (*setup)(void); -+}; -+ -+static struct cambria_board_info *cambria_info __initdata; -+ -+static struct flash_platform_data cambria_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource cambria_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device cambria_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &cambria_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &cambria_flash_resource, -+}; -+ -+static struct i2c_gpio_platform_data cambria_i2c_gpio_data = { -+ .sda_pin = 7, -+ .scl_pin = 6, -+}; -+ -+static struct platform_device cambria_i2c_gpio = { -+ .name = "i2c-gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &cambria_i2c_gpio_data, -+ }, -+}; -+ -+#ifdef SFP_SERIALID -+static struct i2c_gpio_platform_data cambria_i2c_gpio_sfpa_data = { -+ .sda_pin = 113, -+ .scl_pin = 112, -+ .sda_is_open_drain = 0, -+ .scl_is_open_drain = 0, -+}; -+ -+static struct platform_device cambria_i2c_gpio_sfpa = { -+ .name = "i2c-gpio", -+ .id = 1, -+ .dev = { -+ .platform_data = &cambria_i2c_gpio_sfpa_data, -+ }, -+}; -+ -+static struct i2c_gpio_platform_data cambria_i2c_gpio_sfpb_data = { -+ .sda_pin = 115, -+ .scl_pin = 114, -+ .sda_is_open_drain = 0, -+ .scl_is_open_drain = 0, -+}; -+ -+static struct platform_device cambria_i2c_gpio_sfpb = { -+ .name = "i2c-gpio", -+ .id = 2, -+ .dev = { -+ .platform_data = &cambria_i2c_gpio_sfpb_data, -+ }, -+}; -+#endif // #ifdef SFP_SERIALID -+ -+static struct eth_plat_info cambria_npec_data = { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+}; -+ -+static struct eth_plat_info cambria_npea_data = { -+ .phy = 2, -+ .rxq = 2, -+ .txreadyq = 19, -+}; -+ -+static struct platform_device cambria_npec_device = { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = &cambria_npec_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+}; -+ -+static struct platform_device cambria_npea_device = { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEA, -+ .dev.platform_data = &cambria_npea_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+}; -+ -+static struct resource cambria_uart_resource = { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct plat_serial8250_port cambria_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device cambria_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = cambria_uart_data, -+ }, -+ .num_resources = 1, -+ .resource = &cambria_uart_resource, -+}; -+ -+static struct resource cambria_optional_uart_resources[] = { -+ { -+ .start = 0x52000000, -+ .end = 0x52000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x53000000, -+ .end = 0x53000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x52000000, -+ .end = 0x52000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x52000000, -+ .end = 0x52000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x52000000, -+ .end = 0x52000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x52000000, -+ .end = 0x52000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x52000000, -+ .end = 0x52000fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = 0x53000000, -+ .end = 0x53000fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port cambria_optional_uart_data[] = { -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM_DELAY, -+ .regshift = 0, -+ .uartclk = 1843200, -+ .rw_delay = 10, -+ }, -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM_DELAY, -+ .regshift = 0, -+ .uartclk = 1843200, -+ .rw_delay = 10, -+ }, -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ }, -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ }, -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ }, -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ }, -+ { -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ }, -+ { }, -+}; -+ -+static struct platform_device cambria_optional_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM1, -+ .dev.platform_data = cambria_optional_uart_data, -+ .num_resources = 2, -+ .resource = cambria_optional_uart_resources, -+}; -+ -+static struct resource cambria_pata_resources[] = { -+ { -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .name = "intrq", -+ .start = IRQ_IXP4XX_GPIO12, -+ .end = IRQ_IXP4XX_GPIO12, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct ixp4xx_pata_data cambria_pata_data = { -+ .cs0_bits = 0xbfff3c03, -+ .cs1_bits = 0xbfff3c03, -+}; -+ -+static struct platform_device cambria_pata = { -+ .name = "pata_ixp4xx_cf", -+ .id = 0, -+ .dev.platform_data = &cambria_pata_data, -+ .num_resources = ARRAY_SIZE(cambria_pata_resources), -+ .resource = cambria_pata_resources, -+}; -+ -+static struct gpio_led cambria_gpio_leds[] = { -+ { -+ .name = "user", -+ .gpio = 5, -+ .active_low = 1, -+ }, -+ { -+ .name = "user2", -+ .gpio = 0, -+ .active_low = 1, -+ }, -+ { -+ .name = "user3", -+ .gpio = 0, -+ .active_low = 1, -+ }, -+ { -+ .name = "user4", -+ .gpio = 0, -+ .active_low = 1, -+ } -+}; -+ -+static struct gpio_led_platform_data cambria_gpio_leds_data = { -+ .num_leds = 1, -+ .leds = cambria_gpio_leds, -+}; -+ -+static struct platform_device cambria_gpio_leds_device = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev.platform_data = &cambria_gpio_leds_data, -+}; -+ -+static struct resource cambria_gpio_resources[] = { -+ { -+ .name = "gpio", -+ .flags = 0, -+ }, -+}; -+ -+static struct gpio cambria_gpios_gw2350[] = { -+ // ARM GPIO -+#if 0 // configured from bootloader -+ { 0, GPIOF_IN, "ARM_DIO0" }, -+ { 1, GPIOF_IN, "ARM_DIO1" }, -+ { 2, GPIOF_IN, "ARM_DIO2" }, -+ { 3, GPIOF_IN, "ARM_DIO3" }, -+ { 4, GPIOF_IN, "ARM_DIO4" }, -+ { 5, GPIOF_IN, "ARM_DIO5" }, -+ { 12, GPIOF_OUT_INIT_HIGH, "WDOGEN#" }, -+#endif -+ { 8, GPIOF_IN, "ARM_DIO8" }, -+ { 9, GPIOF_IN, "ARM_DIO9" }, -+}; -+ -+static struct gpio cambria_gpios_gw2358[] = { -+ // ARM GPIO -+#if 0 // configured from bootloader -+ { 0, GPIOF_IN, "*VINLOW#" }, -+ { 2, GPIOF_IN, "*GPS_PPS" }, -+ { 3, GPIOF_IN, "*GPS_IRQ#" }, -+ { 4, GPIOF_IN, "*RS485_IRQ#" }, -+ { 5, GPIOF_IN, "*SER_EN#" }, -+ { 14, GPIOF_OUT_INIT_HIGH, "*WDOGEN#" }, -+#endif -+}; -+ -+static struct gpio cambria_gpios_gw2359[] = { -+ // ARM GPIO -+#if 0 // configured from bootloader -+ { 0, GPIOF_IN, "*PCA_IRQ#" }, -+ { 1, GPIOF_IN, "ARM_DIO1" }, -+ { 2, GPIOF_IN, "ARM_DIO2" }, -+ { 3, GPIOF_IN, "ARM_DIO3" }, -+ { 4, GPIOF_IN, "ARM_DIO4" }, -+ { 5, GPIOF_IN, "ARM_DIO5" }, -+ { 8, GPIOF_OUT_INIT_HIGH, "*WDOGEN#" }, -+#endif -+ { 11, GPIOF_OUT_INIT_HIGH, "*SER_EN" }, // console serial enable -+ { 12, GPIOF_IN, "*GSC_IRQ#" }, -+ { 13, GPIOF_OUT_INIT_HIGH, "*PCIE_RST#"}, -+ // GSC GPIO -+#if !(IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED)) -+ {100, GPIOF_IN, "*USER_PB#" }, -+#endif -+ {103, GPIOF_OUT_INIT_HIGH, "*5V_EN" }, // 5V aux supply enable -+ {108, GPIOF_IN, "*SMUXDA0" }, -+ {109, GPIOF_IN, "*SMUXDA1" }, -+ {110, GPIOF_IN, "*SMUXDA2" }, -+ {111, GPIOF_IN, "*SMUXDB0" }, -+ {112, GPIOF_IN, "*SMUXDB1" }, -+ {113, GPIOF_IN, "*SMUXDB2" }, -+ // PCA GPIO -+ {118, GPIOF_IN, "*USIM2_DET#"}, // USIM2 Detect -+ {120, GPIOF_OUT_INIT_LOW, "*USB1_PCI_SEL"}, // USB1 Select (1=PCI, 0=FP) -+ {121, GPIOF_OUT_INIT_LOW, "*USB2_PCI_SEL"}, // USB2 Select (1=PCI, 0=FP) -+ {122, GPIOF_IN, "*USIM1_DET#"}, // USIM1 Detect -+ {123, GPIOF_OUT_INIT_HIGH, "*COM1_DTR#" }, // J21/J10 -+ {124, GPIOF_IN, "*COM1_DSR#" }, // J21/J10 -+ {127, GPIOF_IN, "PCA_DIO0" }, -+ {128, GPIOF_IN, "PCA_DIO1" }, -+ {129, GPIOF_IN, "PCA_DIO2" }, -+ {130, GPIOF_IN, "PCA_DIO3" }, -+ {131, GPIOF_IN, "PCA_DIO4" }, -+}; -+ -+static struct gpio cambria_gpios_gw2360[] = { -+ // ARM GPIO -+ { 0, GPIOF_IN, "*PCA_IRQ#" }, -+ { 11, GPIOF_OUT_INIT_LOW, "*SER0_EN#" }, -+ { 12, GPIOF_IN, "*GSC_IRQ#" }, -+ { 13, GPIOF_OUT_INIT_HIGH, "*PCIE_RST#"}, -+ // GSC GPIO -+#if !(IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED)) -+ {100, GPIOF_IN, "*USER_PB#" }, -+#endif -+ {108, GPIOF_OUT_INIT_LOW, "*ENET1_EN#" }, // ENET1 TX Enable -+ {109, GPIOF_IN, "*ENET1_PRES#" }, // ENET1 Detect (0=SFP present) -+ {110, GPIOF_OUT_INIT_LOW, "*ENET2_EN#" }, // ENET2 TX Enable -+ {111, GPIOF_IN, "*ENET2_PRES#"}, // ENET2 Detect (0=SFP present) -+ // PCA GPIO -+ {116, GPIOF_OUT_INIT_HIGH, "*USIM2_LOC"}, // USIM2 Select (1=Loc, 0=Rem) -+ {117, GPIOF_IN, "*USIM2_DET_LOC#" },// USIM2 Detect (Local Slot) -+ {118, GPIOF_IN, "*USIM2_DET_REM#" },// USIM2 Detect (Remote Slot) -+ {120, GPIOF_OUT_INIT_LOW, "*USB1_PCI_SEL"}, // USB1 Select (1=PCIe1, 0=J1) -+ {121, GPIOF_OUT_INIT_LOW, "*USB2_PCI_SEL"}, // USB2 Select (1=PCIe2, 0=J1) -+ {122, GPIOF_IN, "*USIM1_DET#"}, // USIM1 Detect -+ {127, GPIOF_IN, "DIO0" }, -+ {128, GPIOF_IN, "DIO1" }, -+ {129, GPIOF_IN, "DIO2" }, -+ {130, GPIOF_IN, "DIO3" }, -+ {131, GPIOF_IN, "DIO4" }, -+}; -+ -+static struct latch_led cambria_latch_leds[] = { -+ { -+ .name = "ledA", /* green led */ -+ .bit = 0, -+ }, -+ { -+ .name = "ledB", /* green led */ -+ .bit = 1, -+ }, -+ { -+ .name = "ledC", /* green led */ -+ .bit = 2, -+ }, -+ { -+ .name = "ledD", /* green led */ -+ .bit = 3, -+ }, -+ { -+ .name = "ledE", /* green led */ -+ .bit = 4, -+ }, -+ { -+ .name = "ledF", /* green led */ -+ .bit = 5, -+ }, -+ { -+ .name = "ledG", /* green led */ -+ .bit = 6, -+ }, -+ { -+ .name = "ledH", /* green led */ -+ .bit = 7, -+ } -+}; -+ -+static struct latch_led_platform_data cambria_latch_leds_data = { -+ .num_leds = 8, -+ .leds = cambria_latch_leds, -+ .mem = 0x53F40000, -+}; -+ -+static struct platform_device cambria_latch_leds_device = { -+ .name = "leds-latch", -+ .id = -1, -+ .dev.platform_data = &cambria_latch_leds_data, -+}; -+ -+static struct resource cambria_usb0_resources[] = { -+ { -+ .start = 0xCD000000, -+ .end = 0xCD000300, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = 32, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct resource cambria_usb1_resources[] = { -+ { -+ .start = 0xCE000000, -+ .end = 0xCE000300, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = 33, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static u64 ehci_dma_mask = ~(u32)0; -+ -+static struct usb_ehci_pdata cambria_usb_pdata = { -+ .big_endian_desc = 1, -+ .big_endian_mmio = 1, -+ .has_tt = 1, -+ .caps_offset = 0x100, -+}; -+ -+static struct platform_device cambria_usb0_device = { -+ .name = "ehci-platform", -+ .id = 0, -+ .resource = cambria_usb0_resources, -+ .num_resources = ARRAY_SIZE(cambria_usb0_resources), -+ .dev = { -+ .dma_mask = &ehci_dma_mask, -+ .coherent_dma_mask = 0xffffffff, -+ .platform_data = &cambria_usb_pdata, -+ }, -+}; -+ -+static struct platform_device cambria_usb1_device = { -+ .name = "ehci-platform", -+ .id = 1, -+ .resource = cambria_usb1_resources, -+ .num_resources = ARRAY_SIZE(cambria_usb1_resources), -+ .dev = { -+ .dma_mask = &ehci_dma_mask, -+ .coherent_dma_mask = 0xffffffff, -+ .platform_data = &cambria_usb_pdata, -+ }, -+}; -+ -+static struct gw_i2c_pld_platform_data gw_i2c_pld_data0 = { -+ .gpio_base = 16, -+ .nr_gpio = 8, -+}; -+ -+static struct gw_i2c_pld_platform_data gw_i2c_pld_data1 = { -+ .gpio_base = 24, -+ .nr_gpio = 2, -+}; -+ -+ -+static struct gpio_keys_button cambria_gpio_buttons[] = { -+ { -+ .desc = "user", -+ .type = EV_KEY, -+ .code = BTN_0, -+ .debounce_interval = 6, -+ .gpio = 25, -+ } -+}; -+ -+static struct gpio_keys_platform_data cambria_gpio_buttons_data = { -+ .poll_interval = 500, -+ .nbuttons = 1, -+ .buttons = cambria_gpio_buttons, -+}; -+ -+static struct platform_device cambria_gpio_buttons_device = { -+ .name = "gpio-keys-polled", -+ .id = -1, -+ .dev.platform_data = &cambria_gpio_buttons_data, -+}; -+ -+static struct platform_device *cambria_devices[] __initdata = { -+ &cambria_i2c_gpio, -+ &cambria_flash, -+ &cambria_uart, -+}; -+ -+static int cambria_register_gpio(struct gpio *array, size_t num) -+{ -+ int i, err, ret; -+ -+ ret = 0; -+ for (i = 0; i < num; i++, array++) { -+ const char *label = array->label; -+ if (label[0] == '*') -+ label++; -+ err = gpio_request_one(array->gpio, array->flags, label); -+ if (err) -+ ret = err; -+ else { -+ err = gpio_export(array->gpio, array->label[0] != '*'); -+ } -+ } -+ return ret; -+} -+ -+static void __init cambria_gw23xx_setup(void) -+{ -+ cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\ -+ (1 << 5) | (1 << 8) | (1 << 9) | (1 << 12); -+ cambria_gpio_resources[0].end = cambria_gpio_resources[0].start; -+ -+ platform_device_register(&cambria_npec_device); -+ platform_device_register(&cambria_npea_device); -+} -+ -+static void __init cambria_gw2350_setup(void) -+{ -+ *IXP4XX_EXP_CS2 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); -+ cambria_optional_uart_data[0].mapbase = 0x52FF0000; -+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52FF0000, 0x0fff); -+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3; -+ -+ *IXP4XX_EXP_CS3 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING); -+ cambria_optional_uart_data[1].mapbase = 0x53FF0000; -+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53FF0000, 0x0fff); -+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4; -+ -+ cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\ -+ (1 << 5) | (1 << 8) | (1 << 9) | (1 << 12); -+ cambria_gpio_resources[0].end = cambria_gpio_resources[0].start; -+ -+ platform_device_register(&cambria_optional_uart); -+ platform_device_register(&cambria_npec_device); -+ platform_device_register(&cambria_npea_device); -+ -+ platform_device_register(&cambria_usb0_device); -+ platform_device_register(&cambria_usb1_device); -+ -+ platform_device_register(&cambria_gpio_leds_device); -+ -+ /* gpio config (/sys/class/gpio) */ -+ cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2350)); -+} -+ -+static void __init cambria_gw2358_setup(void) -+{ -+ *IXP4XX_EXP_CS3 = 0xBFFF3C43; // bit0 = 16bit vs 8bit bus -+ irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); -+ cambria_optional_uart_data[0].mapbase = 0x53FC0000; -+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x53FC0000, 0x0fff); -+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO3; -+ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING); -+ cambria_optional_uart_data[1].mapbase = 0x53F80000; -+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53F80000, 0x0fff); -+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO4; -+ -+ cambria_gpio_resources[0].start = (1 << 14) | (1 << 16) | (1 << 17) | (1 << 18) |\ -+ (1 << 19) | (1 << 20) | (1 << 24) | (1 << 25); -+ cambria_gpio_resources[0].end = cambria_gpio_resources[0].start; -+ -+ platform_device_register(&cambria_optional_uart); -+ -+ platform_device_register(&cambria_npec_device); -+ platform_device_register(&cambria_npea_device); -+ -+ platform_device_register(&cambria_usb0_device); -+ platform_device_register(&cambria_usb1_device); -+ -+ platform_device_register(&cambria_pata); -+ -+ cambria_gpio_leds[0].gpio = 24; -+ platform_device_register(&cambria_gpio_leds_device); -+ -+ platform_device_register(&cambria_latch_leds_device); -+ -+ platform_device_register(&cambria_gpio_buttons_device); -+ -+ /* gpio config (/sys/class/gpio) */ -+ cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2358)); -+} -+ -+static void __init cambria_gw2359_setup(void) -+{ -+#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE) -+ /* The mvswitch driver has some hard-coded values which could -+ * easily be turned into a platform resource if needed. For now they -+ * match our hardware configuration: -+ * MV_BASE 0x10 - phy base address -+ * MV_WANPORT 0 - Port0 (ENET2) is WAN (SFP module) -+ * MV_CPUPORT 5 - Port5 is CPU NPEA (eth1) -+ * -+ * The mvswitch driver registers a fixup which forces a driver match -+ * if phy_addr matches MV_BASE -+ * -+ * Two static defautl VLAN's are created: WAN port in 1, and all other ports -+ * in the other. -+ */ -+ cambria_npea_data.phy = 0x10; // mvswitch driver catches this -+#else -+ // Switch Port5 to CPU is MII<->MII (no PHY) - this disables the genphy driver -+ cambria_npea_data.phy = IXP4XX_ETH_PHY_MAX_ADDR; -+ // CPU NPE-C is in bridge bypass mode to Port4 PHY@0x14 -+ cambria_npec_data.phy = 0x14; -+#endif -+ platform_device_register(&cambria_npec_device); -+ platform_device_register(&cambria_npea_device); -+ -+ platform_device_register(&cambria_usb0_device); -+ platform_device_register(&cambria_usb1_device); -+ -+ cambria_gpio_leds_data.num_leds = 3; -+ cambria_gpio_leds[0].name = "user1"; -+ cambria_gpio_leds[0].gpio = 125; // PNLLED1# -+ cambria_gpio_leds[1].gpio = 126; // PNLLED3# -+ cambria_gpio_leds[2].gpio = 119; // PNLLED4# -+ platform_device_register(&cambria_gpio_leds_device); -+ -+#if (IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED)) -+ cambria_gpio_buttons[0].gpio = 100; -+ platform_device_register(&cambria_gpio_buttons_device); -+#endif -+ -+ /* gpio config (/sys/class/gpio) */ -+ cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2359)); -+} -+ -+static void __init cambria_gw2360_setup(void) -+{ -+ /* The GW2360 has 8 UARTs in addition to the 1 IXP4xxx UART. -+ * The chip-selects are expanded via a 3-to-8 decoder and CS2 -+ * and they are 8bit devices -+ */ -+ *IXP4XX_EXP_CS2 = 0xBFFF3C43; -+ cambria_optional_uart_data[0].mapbase = 0x52000000; -+ cambria_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52000000, 0x0fff); -+ cambria_optional_uart_data[0].uartclk = 18432000; -+ cambria_optional_uart_data[0].iotype = UPIO_MEM; -+ cambria_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO2; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart_data[1].mapbase = 0x52000008; -+ cambria_optional_uart_data[1].membase = (void __iomem *)ioremap(0x52000008, 0x0fff); -+ cambria_optional_uart_data[1].uartclk = 18432000; -+ cambria_optional_uart_data[1].iotype = UPIO_MEM; -+ cambria_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO3; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart_data[2].mapbase = 0x52000010; -+ cambria_optional_uart_data[2].membase = (void __iomem *)ioremap(0x52000010, 0x0fff); -+ cambria_optional_uart_data[2].uartclk = 18432000; -+ cambria_optional_uart_data[2].iotype = UPIO_MEM; -+ cambria_optional_uart_data[2].irq = IRQ_IXP4XX_GPIO4; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart_data[3].mapbase = 0x52000018; -+ cambria_optional_uart_data[3].membase = (void __iomem *)ioremap(0x52000018, 0x0fff); -+ cambria_optional_uart_data[3].uartclk = 18432000; -+ cambria_optional_uart_data[3].iotype = UPIO_MEM; -+ cambria_optional_uart_data[3].irq = IRQ_IXP4XX_GPIO5; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO5, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart_data[4].mapbase = 0x52000020; -+ cambria_optional_uart_data[4].membase = (void __iomem *)ioremap(0x52000020, 0x0fff); -+ cambria_optional_uart_data[4].uartclk = 18432000; -+ cambria_optional_uart_data[4].iotype = UPIO_MEM; -+ cambria_optional_uart_data[4].irq = IRQ_IXP4XX_GPIO8; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart_data[5].mapbase = 0x52000028; -+ cambria_optional_uart_data[5].membase = (void __iomem *)ioremap(0x52000028, 0x0fff); -+ cambria_optional_uart_data[5].uartclk = 18432000; -+ cambria_optional_uart_data[5].iotype = UPIO_MEM; -+ cambria_optional_uart_data[5].irq = IRQ_IXP4XX_GPIO9; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart_data[6].mapbase = 0x52000030; -+ cambria_optional_uart_data[6].membase = (void __iomem *)ioremap(0x52000030, 0x0fff); -+ cambria_optional_uart_data[6].uartclk = 18432000; -+ cambria_optional_uart_data[6].iotype = UPIO_MEM; -+ cambria_optional_uart_data[6].irq = IRQ_IXP4XX_GPIO10; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_EDGE_RISING); -+ -+ cambria_optional_uart.num_resources = 7, -+ platform_device_register(&cambria_optional_uart); -+ -+#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE) -+ /* The mvswitch driver has some hard-coded values which could -+ * easily be turned into a platform resource if needed. For now they -+ * match our hardware configuration: -+ * MV_BASE 0x10 - phy base address -+ * MV_WANPORT 0 - Port0 (ENET2) is WAN (SFP module) -+ * MV_CPUPORT 5 - Port5 is CPU NPEA (eth1) -+ * -+ * The mvswitch driver registers a fixup which forces a driver match -+ * if phy_addr matches MV_BASE -+ * -+ * Two static defautl VLAN's are created: WAN port in 1, and all other ports -+ * in the other. -+ */ -+ cambria_npea_data.phy = 0x10; // mvswitch driver catches this -+#else -+ // Switch Port5 to CPU is MII<->MII (no PHY) - this disables the generic PHY driver -+ cambria_npea_data.phy = IXP4XX_ETH_PHY_MAX_ADDR; -+#endif -+ -+ // disable genphy autonegotiation on NPE-C PHY (eth1) as its 100BaseFX -+ //cambria_npec_data.noautoneg = 1; // disable autoneg -+ cambria_npec_data.speed_10 = 0; // 100mbps -+ cambria_npec_data.half_duplex = 0; // full-duplex -+ platform_device_register(&cambria_npec_device); -+ platform_device_register(&cambria_npea_device); -+ -+ platform_device_register(&cambria_usb0_device); -+ platform_device_register(&cambria_usb1_device); -+ -+ cambria_gpio_leds_data.num_leds = 3; -+ cambria_gpio_leds[0].name = "user1"; -+ cambria_gpio_leds[0].gpio = 125; -+ cambria_gpio_leds[1].gpio = 126; -+ cambria_gpio_leds[2].gpio = 119; -+ platform_device_register(&cambria_gpio_leds_device); -+ -+#if (IS_ENABLED(CONFIG_KEYBOARD_GPIO_POLLED)) -+ cambria_gpio_buttons[0].gpio = 100; -+ platform_device_register(&cambria_gpio_buttons_device); -+#endif -+ -+#ifdef SFP_SERIALID -+ /* the SFP modules each have an i2c bus for serial ident via GSC GPIO -+ * To use these the i2c-gpio driver must be changed to use the _cansleep -+ * varients of gpio_get_value/gpio_set_value (I don't know why it doesn't -+ * use that anyway as it doesn't operate in an IRQ context). -+ * Additionally the i2c-gpio module must set the gpio to output-high prior -+ * to changing direction to an input to enable internal Pullups -+ */ -+ platform_device_register(&cambria_i2c_gpio_sfpa); -+ platform_device_register(&cambria_i2c_gpio_sfpb); -+#endif -+ -+ /* gpio config (/sys/class/gpio) */ -+ cambria_register_gpio(ARRAY_AND_SIZE(cambria_gpios_gw2360)); -+} -+ -+static struct cambria_board_info cambria_boards[] __initdata = { -+ { -+ .model = "GW2350", -+ .setup = cambria_gw2350_setup, -+ }, { -+ .model = "GW2351", -+ .setup = cambria_gw2350_setup, -+ }, { -+ .model = "GW2358", -+ .setup = cambria_gw2358_setup, -+ }, { -+ .model = "GW2359", -+ .setup = cambria_gw2359_setup, -+ }, { -+ .model = "GW2360", -+ .setup = cambria_gw2360_setup, -+ }, { -+ .model = "GW2371", -+ .setup = cambria_gw2358_setup, -+ } -+}; -+ -+static struct cambria_board_info * __init cambria_find_board_info(char *model) -+{ -+ int i; -+ model[6] = '\0'; -+ -+ for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) { -+ struct cambria_board_info *info = &cambria_boards[i]; -+ if (strcmp(info->model, model) == 0) -+ return info; -+ } -+ -+ return NULL; -+} -+ -+static struct nvmem_device *at24_nvmem; -+ -+static void at24_setup(struct nvmem_device *mem_acc, void *context) -+{ -+ char mac_addr[ETH_ALEN]; -+ char model[7]; -+ -+ at24_nvmem = mem_acc; -+ -+ /* Read MAC addresses */ -+ if (nvmem_device_read(at24_nvmem, 0x0, 6, mac_addr) == 6) { -+ memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN); -+ } -+ if (nvmem_device_read(at24_nvmem, 0x6, 6, mac_addr) == 6) { -+ memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN); -+ } -+ -+ /* Read the first 6 bytes of the model number */ -+ if (nvmem_device_read(at24_nvmem, 0x20, 6, model) == 6) { -+ cambria_info = cambria_find_board_info(model); -+ } -+ -+} -+ -+static struct at24_platform_data cambria_eeprom_info = { -+ .byte_len = 1024, -+ .page_size = 16, -+ .flags = AT24_FLAG_READONLY, -+ .setup = at24_setup, -+}; -+ -+static struct pca953x_platform_data cambria_pca_data = { -+ .gpio_base = 100, -+ .irq_base = -1, -+}; -+ -+static struct pca953x_platform_data cambria_pca2_data = { -+ .gpio_base = 116, -+ .irq_base = -1, -+}; -+ -+static struct i2c_board_info __initdata cambria_i2c_board_info[] = { -+ { -+ I2C_BOARD_INFO("pca9555", 0x23), -+ .platform_data = &cambria_pca_data, -+ }, -+ { -+ I2C_BOARD_INFO("pca9555", 0x27), -+ .platform_data = &cambria_pca2_data, -+ }, -+ { -+ I2C_BOARD_INFO("ds1672", 0x68), -+ }, -+ { -+ I2C_BOARD_INFO("gsp", 0x29), -+ }, -+ { -+ I2C_BOARD_INFO("ad7418", 0x28), -+ }, -+ { -+ I2C_BOARD_INFO("24c08", 0x51), -+ .platform_data = &cambria_eeprom_info -+ }, -+ { -+ I2C_BOARD_INFO("gw_i2c_pld", 0x56), -+ .platform_data = &gw_i2c_pld_data0, -+ }, -+ { -+ I2C_BOARD_INFO("gw_i2c_pld", 0x57), -+ .platform_data = &gw_i2c_pld_data1, -+ }, -+}; -+ -+static void __init cambria_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ cambria_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ cambria_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; // make sure window is writable -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(ARRAY_AND_SIZE(cambria_devices)); -+ -+ cambria_pata_resources[0].start = 0x53e00000; -+ cambria_pata_resources[0].end = 0x53e3ffff; -+ -+ cambria_pata_resources[1].start = 0x53e40000; -+ cambria_pata_resources[1].end = 0x53e7ffff; -+ -+ cambria_pata_data.cs0_cfg = IXP4XX_EXP_CS3; -+ cambria_pata_data.cs1_cfg = IXP4XX_EXP_CS3; -+ -+ i2c_register_board_info(0, ARRAY_AND_SIZE(cambria_i2c_board_info)); -+} -+ -+static int __init cambria_model_setup(void) -+{ -+ if (!machine_is_cambria()) -+ return 0; -+ -+ if (cambria_info) { -+ printk(KERN_DEBUG "Running on Gateworks Cambria %s\n", -+ cambria_info->model); -+ cambria_info->setup(); -+ } else { -+ printk(KERN_INFO "Unknown/missing Cambria model number" -+ " -- defaults will be used\n"); -+ cambria_gw23xx_setup(); -+ } -+ -+ return 0; -+} -+late_initcall(cambria_model_setup); -+ -+MACHINE_START(CAMBRIA, "Gateworks Cambria series") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = cambria_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END diff --git a/target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch deleted file mode 100644 index f46b9c61bf..0000000000 --- a/target/linux/ixp4xx/patches-4.9/201-npe_driver_print_license_location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c -+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -@@ -586,6 +586,8 @@ int npe_load_firmware(struct npe *npe, c - npe_reset(npe); - #endif - -+ print_npe(KERN_INFO, npe, "firmware's license can be found in /usr/share/doc/LICENSE.IPL\n"); -+ - print_npe(KERN_INFO, npe, "firmware functionality 0x%X, " - "revision 0x%X:%X\n", (image->id >> 16) & 0xFF, - (image->id >> 8) & 0xFF, image->id & 0xFF); diff --git a/target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch deleted file mode 100644 index cc77c5dddc..0000000000 --- a/target/linux/ixp4xx/patches-4.9/205-npe_driver_separate_phy_functions.patch +++ /dev/null @@ -1,127 +0,0 @@ -From e3eab80fb5d0a7d7fdb0f2f231b27161d5ec3804 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 30 Jun 2013 15:52:53 +0200 -Subject: [PATCH 23/36] 205-npe_driver_separate_phy_functions.patch - ---- - drivers/net/ethernet/xscale/ixp4xx_eth.c | 70 ++++++++++++++++++++++-------- - 1 file changed, 51 insertions(+), 19 deletions(-) - ---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c -+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -588,6 +588,51 @@ static void ixp4xx_adjust_link(struct ne - dev->name, port->speed, port->duplex ? "full" : "half"); - } - -+static int ixp4xx_phy_connect(struct net_device *dev) -+{ -+ struct port *port = netdev_priv(dev); -+ struct eth_plat_info *plat = port->plat; -+ char phy_id[MII_BUS_ID_SIZE + 3]; -+ -+ snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, -+ mdio_bus->id, plat->phy); -+ port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, -+ PHY_INTERFACE_MODE_MII); -+ if (IS_ERR(port->phydev)) { -+ printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); -+ return PTR_ERR(port->phydev); -+ } -+ -+ /* mask with MAC supported features */ -+ port->phydev->supported &= PHY_BASIC_FEATURES; -+ port->phydev->advertising = port->phydev->supported; -+ -+ port->phydev->irq = PHY_POLL; -+ -+ return 0; -+} -+ -+static void ixp4xx_phy_disconnect(struct net_device *dev) -+{ -+ struct port *port = netdev_priv(dev); -+ -+ phy_disconnect(port->phydev); -+} -+ -+static void ixp4xx_phy_start(struct net_device *dev) -+{ -+ struct port *port = netdev_priv(dev); -+ -+ port->speed = 0; /* force "link up" message */ -+ phy_start(port->phydev); -+} -+ -+static void ixp4xx_phy_stop(struct net_device *dev) -+{ -+ struct port *port = netdev_priv(dev); -+ -+ phy_stop(port->phydev); -+} - - static inline void debug_pkt(struct net_device *dev, const char *func, - u8 *data, int len) -@@ -1242,8 +1287,7 @@ static int eth_open(struct net_device *d - return err; - } - -- port->speed = 0; /* force "link up" message */ -- phy_start(dev->phydev); -+ ixp4xx_phy_start(dev); - - for (i = 0; i < ETH_ALEN; i++) - __raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]); -@@ -1364,7 +1408,7 @@ static int eth_close(struct net_device * - printk(KERN_CRIT "%s: unable to disable loopback\n", - dev->name); - -- phy_stop(dev->phydev); -+ ixp4xx_phy_stop(dev); - - if (!ports_open) - qmgr_disable_irq(TXDONE_QUEUE); -@@ -1391,7 +1435,6 @@ static int eth_init_one(struct platform_ - struct eth_plat_info *plat = dev_get_platdata(&pdev->dev); - struct phy_device *phydev = NULL; - u32 regs_phys; -- char phy_id[MII_BUS_ID_SIZE + 3]; - int err; - - if (!(dev = alloc_etherdev(sizeof(struct port)))) -@@ -1449,16 +1492,9 @@ static int eth_init_one(struct platform_ - __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); - udelay(50); - -- snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, -- mdio_bus->id, plat->phy); -- phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, -- PHY_INTERFACE_MODE_MII); -- if (IS_ERR(phydev)) { -- err = PTR_ERR(phydev); -+ err = ixp4xx_phy_connect(dev); -+ if (err) - goto err_free_mem; -- } -- -- phydev->irq = PHY_POLL; - - if ((err = register_netdev(dev))) - goto err_phy_dis; -@@ -1469,7 +1505,7 @@ static int eth_init_one(struct platform_ - return 0; - - err_phy_dis: -- phy_disconnect(phydev); -+ ixp4xx_phy_disconnect(phydev); - err_free_mem: - npe_port_tab[NPE_ID(port->id)] = NULL; - release_resource(port->mem_res); -@@ -1487,7 +1523,7 @@ static int eth_remove_one(struct platfor - struct port *port = netdev_priv(dev); - - unregister_netdev(dev); -- phy_disconnect(phydev); -+ ixp4xx_phy_disconnect(phydev); - npe_port_tab[NPE_ID(port->id)] = NULL; - npe_release(port->npe); - release_resource(port->mem_res); diff --git a/target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch b/target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch deleted file mode 100644 index e12764e053..0000000000 --- a/target/linux/ixp4xx/patches-4.9/206-npe_driver_add_update_link_function.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c -+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -171,12 +171,13 @@ struct port { - struct npe *npe; - struct net_device *netdev; - struct napi_struct napi; -+ struct phy_device *phydev; - struct eth_plat_info *plat; - buffer_t *rx_buff_tab[RX_DESCS], *tx_buff_tab[TX_DESCS]; - struct desc *desc_tab; /* coherent */ - u32 desc_tab_phys; - int id; /* logical port ID */ -- int speed, duplex; -+ int link, speed, duplex; - u8 firmware[4]; - int hwts_tx_en; - int hwts_rx_en; -@@ -558,36 +559,46 @@ static void ixp4xx_mdio_remove(void) - } - - --static void ixp4xx_adjust_link(struct net_device *dev) -+static void ixp4xx_update_link(struct net_device *dev) - { - struct port *port = netdev_priv(dev); -- struct phy_device *phydev = dev->phydev; -- -- if (!phydev->link) { -- if (port->speed) { -- port->speed = 0; -- printk(KERN_INFO "%s: link down\n", dev->name); -- } -- return; -- } -- -- if (port->speed == phydev->speed && port->duplex == phydev->duplex) -- return; -- -- port->speed = phydev->speed; -- port->duplex = phydev->duplex; - -- if (port->duplex) -+ if (port->duplex == DUPLEX_FULL) - __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX, - &port->regs->tx_control[0]); - else - __raw_writel(DEFAULT_TX_CNTRL0 | TX_CNTRL0_HALFDUPLEX, - &port->regs->tx_control[0]); - -+ netif_carrier_on(dev); - printk(KERN_INFO "%s: link up, speed %u Mb/s, %s duplex\n", - dev->name, port->speed, port->duplex ? "full" : "half"); - } - -+static void ixp4xx_adjust_link(struct net_device *dev) -+{ -+ struct port *port = netdev_priv(dev); -+ struct phy_device *phydev = port->phydev; -+ int status_change = 0; -+ -+ if (phydev->link) { -+ if (port->duplex != phydev->duplex -+ || port->speed != phydev->speed) { -+ status_change = 1; -+ } -+ } -+ -+ if (phydev->link != port->link) -+ status_change = 1; -+ -+ port->link = phydev->link; -+ port->speed = phydev->speed; -+ port->duplex = phydev->duplex; -+ -+ if (status_change) -+ ixp4xx_update_link(dev); -+} -+ - static int ixp4xx_phy_connect(struct net_device *dev) - { - struct port *port = netdev_priv(dev); -@@ -623,7 +634,6 @@ static void ixp4xx_phy_start(struct net_ - { - struct port *port = netdev_priv(dev); - -- port->speed = 0; /* force "link up" message */ - phy_start(port->phydev); - } - -@@ -1499,6 +1509,10 @@ static int eth_init_one(struct platform_ - if ((err = register_netdev(dev))) - goto err_phy_dis; - -+ port->link = 0; -+ port->speed = 0; -+ port->duplex = -1; -+ - printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy, - npe_name(port->npe)); - diff --git a/target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch b/target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch deleted file mode 100644 index a23644a167..0000000000 --- a/target/linux/ixp4xx/patches-4.9/207-npe_driver_multiphy_support.patch +++ /dev/null @@ -1,153 +0,0 @@ -TODO: take care of additional PHYs through the PHY abstraction layer - ---- a/arch/arm/mach-ixp4xx/include/mach/platform.h -+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h -@@ -95,12 +95,23 @@ struct ixp4xx_pata_data { - #define IXP4XX_ETH_NPEB 0x10 - #define IXP4XX_ETH_NPEC 0x20 - -+#define IXP4XX_ETH_PHY_MAX_ADDR 32 -+ - /* Information about built-in Ethernet MAC interfaces */ - struct eth_plat_info { - u8 phy; /* MII PHY ID, 0 - 31 */ - u8 rxq; /* configurable, currently 0 - 31 only */ - u8 txreadyq; - u8 hwaddr[6]; -+ -+ u32 phy_mask; -+#if 0 -+ int speed; -+ int duplex; -+#else -+ int speed_10; -+ int half_duplex; -+#endif - }; - - /* Information about built-in HSS (synchronous serial) interfaces */ ---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c -+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -605,6 +605,37 @@ static int ixp4xx_phy_connect(struct net - struct eth_plat_info *plat = port->plat; - char phy_id[MII_BUS_ID_SIZE + 3]; - -+ if (plat->phy == IXP4XX_ETH_PHY_MAX_ADDR) { -+#if 0 -+ switch (plat->speed) { -+ case SPEED_10: -+ case SPEED_100: -+ break; -+ default: -+ printk(KERN_ERR "%s: invalid speed (%d)\n", -+ dev->name, plat->speed); -+ return -EINVAL; -+ } -+ -+ switch (plat->duplex) { -+ case DUPLEX_HALF: -+ case DUPLEX_FULL: -+ break; -+ default: -+ printk(KERN_ERR "%s: invalid duplex mode (%d)\n", -+ dev->name, plat->duplex); -+ return -EINVAL; -+ } -+ port->speed = plat->speed; -+ port->duplex = plat->duplex; -+#else -+ port->speed = plat->speed_10 ? SPEED_10 : SPEED_100; -+ port->duplex = plat->half_duplex ? DUPLEX_HALF : DUPLEX_FULL; -+#endif -+ -+ return 0; -+ } -+ - snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, - mdio_bus->id, plat->phy); - port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, -@@ -627,21 +658,32 @@ static void ixp4xx_phy_disconnect(struct - { - struct port *port = netdev_priv(dev); - -- phy_disconnect(port->phydev); -+ if (port->phydev) -+ phy_disconnect(port->phydev); - } - - static void ixp4xx_phy_start(struct net_device *dev) - { - struct port *port = netdev_priv(dev); - -- phy_start(port->phydev); -+ if (port->phydev) { -+ phy_start(port->phydev); -+ } else { -+ port->link = 1; -+ ixp4xx_update_link(dev); -+ } - } - - static void ixp4xx_phy_stop(struct net_device *dev) - { - struct port *port = netdev_priv(dev); - -- phy_stop(port->phydev); -+ if (port->phydev) { -+ phy_stop(port->phydev); -+ } else { -+ port->link = 0; -+ ixp4xx_update_link(dev); -+ } - } - - static inline void debug_pkt(struct net_device *dev, const char *func, -@@ -1030,6 +1072,8 @@ static void eth_set_mcast_list(struct ne - - static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd) - { -+ struct port *port = netdev_priv(dev); -+ - if (!netif_running(dev)) - return -EINVAL; - -@@ -1040,6 +1084,9 @@ static int eth_ioctl(struct net_device * - return hwtstamp_get(dev, req); - } - -+ if (!port->phydev) -+ return -EOPNOTSUPP; -+ - return phy_mii_ioctl(dev->phydev, req, cmd); - } - -@@ -1059,6 +1106,11 @@ static void ixp4xx_get_drvinfo(struct ne - - static int ixp4xx_nway_reset(struct net_device *dev) - { -+ struct port *port = netdev_priv(dev); -+ -+ if (!port->phydev) -+ return -EOPNOTSUPP; -+ - return phy_start_aneg(dev->phydev); - } - -@@ -1519,7 +1571,7 @@ static int eth_init_one(struct platform_ - return 0; - - err_phy_dis: -- ixp4xx_phy_disconnect(phydev); -+ ixp4xx_phy_disconnect(port->netdev); - err_free_mem: - npe_port_tab[NPE_ID(port->id)] = NULL; - release_resource(port->mem_res); -@@ -1537,7 +1589,7 @@ static int eth_remove_one(struct platfor - struct port *port = netdev_priv(dev); - - unregister_netdev(dev); -- ixp4xx_phy_disconnect(phydev); -+ ixp4xx_phy_disconnect(port->netdev); - npe_port_tab[NPE_ID(port->id)] = NULL; - npe_release(port->npe); - release_resource(port->mem_res); diff --git a/target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch deleted file mode 100644 index 66bc3e86b0..0000000000 --- a/target/linux/ixp4xx/patches-4.9/295-latch_led_driver.patch +++ /dev/null @@ -1,201 +0,0 @@ ---- a/drivers/leds/Kconfig -+++ b/drivers/leds/Kconfig -@@ -312,6 +312,12 @@ config LEDS_LP8860 - on the LP8860 4 channel LED driver using the I2C communication - bus. - -+config LEDS_LATCH -+ tristate "LED Support for Memory Latched LEDs" -+ depends on LEDS_CLASS -+ help -+ -- To Do -- -+ - config LEDS_CLEVO_MAIL - tristate "Mail LED on Clevo notebook" - depends on LEDS_CLASS ---- a/drivers/leds/Makefile -+++ b/drivers/leds/Makefile -@@ -25,6 +25,7 @@ obj-$(CONFIG_LEDS_SUNFIRE) += leds-sunf - obj-$(CONFIG_LEDS_PCA9532) += leds-pca9532.o - obj-$(CONFIG_LEDS_GPIO_REGISTER) += leds-gpio-register.o - obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o -+obj-$(CONFIG_LEDS_LATCH) += leds-latch.o - obj-$(CONFIG_LEDS_LP3944) += leds-lp3944.o - obj-$(CONFIG_LEDS_LP3952) += leds-lp3952.o - obj-$(CONFIG_LEDS_LP55XX_COMMON) += leds-lp55xx-common.o ---- /dev/null -+++ b/drivers/leds/leds-latch.c -@@ -0,0 +1,152 @@ -+/* -+ * LEDs driver for Memory Latched Devices -+ * -+ * Copyright (C) 2008 Gateworks Corp. -+ * Chris Lang -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static unsigned int mem_keep = 0xFF; -+static spinlock_t mem_lock; -+static unsigned char *iobase; -+ -+struct latch_led_data { -+ struct led_classdev cdev; -+ struct work_struct work; -+ u8 new_level; -+ u8 bit; -+ void (*set_led)(u8 bit, enum led_brightness value); -+}; -+ -+static void latch_set_led(u8 bit, enum led_brightness value) -+{ -+ if (value == LED_OFF) -+ mem_keep |= (0x1 << bit); -+ else -+ mem_keep &= ~(0x1 << bit); -+ -+ writeb(mem_keep, iobase); -+} -+ -+static void latch_led_set(struct led_classdev *led_cdev, -+ enum led_brightness value) -+{ -+ struct latch_led_data *led_dat = -+ container_of(led_cdev, struct latch_led_data, cdev); -+ -+ raw_spin_lock(mem_lock); -+ -+ led_dat->set_led(led_dat->bit, value); -+ -+ raw_spin_unlock(mem_lock); -+} -+ -+static int latch_led_probe(struct platform_device *pdev) -+{ -+ struct latch_led_platform_data *pdata = pdev->dev.platform_data; -+ struct latch_led *cur_led; -+ struct latch_led_data *leds_data, *led_dat; -+ int i, ret = 0; -+ -+ if (!pdata) -+ return -EBUSY; -+ -+ leds_data = kzalloc(sizeof(struct latch_led_data) * pdata->num_leds, -+ GFP_KERNEL); -+ if (!leds_data) -+ return -ENOMEM; -+ -+ for (i = 0; i < pdata->num_leds; i++) { -+ cur_led = &pdata->leds[i]; -+ led_dat = &leds_data[i]; -+ -+ led_dat->cdev.name = cur_led->name; -+ led_dat->cdev.default_trigger = cur_led->default_trigger; -+ led_dat->cdev.brightness_set = latch_led_set; -+ led_dat->cdev.brightness = LED_OFF; -+ led_dat->bit = cur_led->bit; -+ led_dat->set_led = pdata->set_led ? pdata->set_led : latch_set_led; -+ -+ ret = led_classdev_register(&pdev->dev, &led_dat->cdev); -+ if (ret < 0) { -+ goto err; -+ } -+ } -+ -+ if (!pdata->set_led) { -+ iobase = ioremap_nocache(pdata->mem, 0x1000); -+ writeb(0xFF, iobase); -+ } -+ platform_set_drvdata(pdev, leds_data); -+ -+ return 0; -+ -+err: -+ if (i > 0) { -+ for (i = i - 1; i >= 0; i--) { -+ led_classdev_unregister(&leds_data[i].cdev); -+ } -+ } -+ -+ kfree(leds_data); -+ -+ return ret; -+} -+ -+static int latch_led_remove(struct platform_device *pdev) -+{ -+ int i; -+ struct latch_led_platform_data *pdata = pdev->dev.platform_data; -+ struct latch_led_data *leds_data; -+ -+ leds_data = platform_get_drvdata(pdev); -+ -+ for (i = 0; i < pdata->num_leds; i++) { -+ led_classdev_unregister(&leds_data[i].cdev); -+ cancel_work_sync(&leds_data[i].work); -+ } -+ -+ kfree(leds_data); -+ -+ return 0; -+} -+ -+static struct platform_driver latch_led_driver = { -+ .probe = latch_led_probe, -+ .remove = latch_led_remove, -+ .driver = { -+ .name = "leds-latch", -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init latch_led_init(void) -+{ -+ return platform_driver_register(&latch_led_driver); -+} -+ -+static void __exit latch_led_exit(void) -+{ -+ platform_driver_unregister(&latch_led_driver); -+} -+ -+module_init(latch_led_init); -+module_exit(latch_led_exit); -+ -+MODULE_AUTHOR("Chris Lang "); -+MODULE_DESCRIPTION("Latch LED driver"); ---- a/include/linux/leds.h -+++ b/include/linux/leds.h -@@ -423,4 +423,18 @@ static inline void ledtrig_cpu(enum cpu_ - } - #endif - -+/* For the leds-latch driver */ -+struct latch_led { -+ const char *name; -+ char *default_trigger; -+ unsigned bit; -+}; -+ -+struct latch_led_platform_data { -+ int num_leds; -+ u32 mem; -+ struct latch_led *leds; -+ void (*set_led)(u8 bit, enum led_brightness value); -+}; -+ - #endif /* __LINUX_LEDS_H_INCLUDED */ diff --git a/target/linux/ixp4xx/patches-4.9/300-avila_support.patch b/target/linux/ixp4xx/patches-4.9/300-avila_support.patch deleted file mode 100644 index c801607f4b..0000000000 --- a/target/linux/ixp4xx/patches-4.9/300-avila_support.patch +++ /dev/null @@ -1,726 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/avila-pci.c -+++ b/arch/arm/mach-ixp4xx/avila-pci.c -@@ -27,8 +27,8 @@ - #include - #include - --#define AVILA_MAX_DEV 4 --#define LOFT_MAX_DEV 6 -+#define AVILA_MAX_DEV 6 -+ - #define IRQ_LINES 4 - - /* PCI controller GPIO to IRQ pin mappings */ -@@ -55,10 +55,8 @@ static int __init avila_map_irq(const st - IXP4XX_GPIO_IRQ(INTD) - }; - -- if (slot >= 1 && -- slot <= (machine_is_loft() ? LOFT_MAX_DEV : AVILA_MAX_DEV) && -- pin >= 1 && pin <= IRQ_LINES) -- return pci_irq_table[(slot + pin - 2) % 4]; -+ if (slot >= 1 && slot <= AVILA_MAX_DEV && pin >= 1 && pin <= IRQ_LINES) -+ return pci_irq_table[(slot + pin - 2) % IRQ_LINES]; - - return -1; - } ---- a/arch/arm/mach-ixp4xx/avila-setup.c -+++ b/arch/arm/mach-ixp4xx/avila-setup.c -@@ -14,9 +14,16 @@ - #include - #include - #include -+#include -+#include -+#include - #include - #include - #include -+#include -+#include -+#include -+#include - #include - #include - #include -@@ -26,10 +33,25 @@ - #include - #include - #include -+#include - - #define AVILA_SDA_PIN 7 - #define AVILA_SCL_PIN 6 - -+/* User LEDs */ -+#define AVILA_GW23XX_LED_USER_GPIO 3 -+#define AVILA_GW23X7_LED_USER_GPIO 4 -+ -+/* gpio mask used by platform device */ -+#define AVILA_GPIO_MASK (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9) -+ -+struct avila_board_info { -+ unsigned char *model; -+ void (*setup)(void); -+}; -+ -+static struct avila_board_info *avila_info __initdata; -+ - static struct flash_platform_data avila_flash_data = { - .map_name = "cfi_probe", - .width = 2, -@@ -105,14 +127,69 @@ static struct platform_device avila_uart - .resource = avila_uart_resources - }; - --static struct resource avila_pata_resources[] = { -+static struct resource avila_optional_uart_resources[] = { - { -- .flags = IORESOURCE_MEM -- }, -+ .start = 0x54000000, -+ .end = 0x54000fff, -+ .flags = IORESOURCE_MEM -+ },{ -+ .start = 0x55000000, -+ .end = 0x55000fff, -+ .flags = IORESOURCE_MEM -+ },{ -+ .start = 0x56000000, -+ .end = 0x56000fff, -+ .flags = IORESOURCE_MEM -+ },{ -+ .start = 0x57000000, -+ .end = 0x57000fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port avila_optional_uart_data[] = { - { -- .flags = IORESOURCE_MEM, -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ .rw_delay = 2, -+ },{ -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ .rw_delay = 2, -+ },{ -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ .rw_delay = 2, -+ },{ -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 0, -+ .uartclk = 18432000, -+ .rw_delay = 2, - }, -+ { } -+}; -+ -+static struct platform_device avila_optional_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM1, -+ .dev.platform_data = avila_optional_uart_data, -+ .num_resources = 4, -+ .resource = avila_optional_uart_resources, -+}; -+ -+static struct resource avila_pata_resources[] = { - { -+ .flags = IORESOURCE_MEM -+ },{ -+ .flags = IORESOURCE_MEM, -+ },{ - .name = "intrq", - .start = IRQ_IXP4XX_GPIO12, - .end = IRQ_IXP4XX_GPIO12, -@@ -133,21 +210,237 @@ static struct platform_device avila_pata - .resource = avila_pata_resources, - }; - -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info avila_npeb_data = { -+ .phy = 0, -+ .rxq = 3, -+ .txreadyq = 20, -+}; -+ -+static struct eth_plat_info avila_npec_data = { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+}; -+ -+static struct platform_device avila_npeb_device = { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = &avila_npeb_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+}; -+ -+static struct platform_device avila_npec_device = { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = &avila_npec_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+}; -+ -+static struct gpio_led avila_gpio_leds[] = { -+ { -+ .name = "user", /* green led */ -+ .gpio = AVILA_GW23XX_LED_USER_GPIO, -+ .active_low = 1, -+ }, -+ { -+ .name = "radio1", /* green led */ -+ .gpio = 104, -+ .active_low = 1, -+ }, -+ { -+ .name = "radio2", /* green led */ -+ .gpio = 105, -+ .active_low = 1, -+ }, -+ { -+ .name = "radio3", /* green led */ -+ .gpio = 106, -+ .active_low = 1, -+ }, -+ { -+ .name = "radio4", /* green led */ -+ .gpio = 107, -+ .active_low = 1, -+ }, -+ -+}; -+ -+static struct gpio_led_platform_data avila_gpio_leds_data = { -+ .num_leds = 1, -+ .leds = avila_gpio_leds, -+}; -+ -+static struct platform_device avila_gpio_leds_device = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev.platform_data = &avila_gpio_leds_data, -+}; -+ -+static struct latch_led avila_latch_leds[] = { -+ { -+ .name = "led0", /* green led */ -+ .bit = 0, -+ }, -+ { -+ .name = "led1", /* green led */ -+ .bit = 1, -+ }, -+ { -+ .name = "led2", /* green led */ -+ .bit = 2, -+ }, -+ { -+ .name = "led3", /* green led */ -+ .bit = 3, -+ }, -+ { -+ .name = "led4", /* green led */ -+ .bit = 4, -+ }, -+ { -+ .name = "led5", /* green led */ -+ .bit = 5, -+ }, -+ { -+ .name = "led6", /* green led */ -+ .bit = 6, -+ }, -+ { -+ .name = "led7", /* green led */ -+ .bit = 7, -+ } -+}; -+ -+static struct latch_led_platform_data avila_latch_leds_data = { -+ .num_leds = 8, -+ .leds = avila_latch_leds, -+ .mem = 0x51000000, -+}; -+ -+static struct platform_device avila_latch_leds_device = { -+ .name = "leds-latch", -+ .id = -1, -+ .dev.platform_data = &avila_latch_leds_data, -+}; -+ - static struct platform_device *avila_devices[] __initdata = { - &avila_i2c_gpio, -- &avila_flash, - &avila_uart - }; - --static void __init avila_init(void) -+/* -+ * Audio Devices -+ */ -+ -+static struct platform_device avila_hss_device[] = { -+ { -+ .name = "gw_avila_hss", -+ .id = 0, -+ },{ -+ .name = "gw_avila_hss", -+ .id = 1, -+ },{ -+ .name = "gw_avila_hss", -+ .id = 2, -+ },{ -+ .name = "gw_avila_hss", -+ .id = 3, -+ }, -+}; -+ -+static struct platform_device avila_pcm_device[] = { -+ { -+ .name = "gw_avila-audio", -+ .id = 0, -+ },{ -+ .name = "gw_avila-audio", -+ .id = 1, -+ },{ -+ .name = "gw_avila-audio", -+ .id = 2, -+ },{ -+ .name = "gw_avila-audio", -+ .id = 3, -+ } -+}; -+ -+static void setup_audio_devices(void) { -+ platform_device_register(&avila_hss_device[0]); -+ platform_device_register(&avila_hss_device[1]); -+ platform_device_register(&avila_hss_device[2]); -+ platform_device_register(&avila_hss_device[3]); -+ -+ platform_device_register(&avila_pcm_device[0]); -+ platform_device_register(&avila_pcm_device[1]); -+ platform_device_register(&avila_pcm_device[2]); -+ platform_device_register(&avila_pcm_device[3]); -+} -+ -+static void __init avila_gw23xx_setup(void) - { -- ixp4xx_sys_init(); -+ platform_device_register(&avila_npeb_device); -+ platform_device_register(&avila_npec_device); - -- avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -- avila_flash_resource.end = -- IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -+ platform_device_register(&avila_gpio_leds_device); -+} - -- platform_add_devices(avila_devices, ARRAY_SIZE(avila_devices)); -+static void __init avila_gw2342_setup(void) -+{ -+ platform_device_register(&avila_npeb_device); -+ platform_device_register(&avila_npec_device); -+ -+ platform_device_register(&avila_gpio_leds_device); -+ -+ avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1); -+ avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1); -+ -+ avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2); -+ avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2); -+ -+ avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1; -+ avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2; -+ -+ platform_device_register(&avila_pata); -+} -+ -+static void __init avila_gw2345_setup(void) -+{ -+ avila_npeb_data.phy = IXP4XX_ETH_PHY_MAX_ADDR; -+ avila_npeb_data.phy_mask = 0x1e; /* ports 1-4 of the KS8995 switch */ -+ platform_device_register(&avila_npeb_device); -+ -+ avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */ -+ platform_device_register(&avila_npec_device); -+ -+ platform_device_register(&avila_gpio_leds_device); -+ -+ avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1); -+ avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1); -+ -+ avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2); -+ avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2); -+ -+ avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1; -+ avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2; -+ -+ platform_device_register(&avila_pata); -+} -+ -+static void __init avila_gw2347_setup(void) -+{ -+ platform_device_register(&avila_npeb_device); -+ -+ avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -+ platform_device_register(&avila_gpio_leds_device); -+} -+ -+static void __init avila_gw2348_setup(void) -+{ -+ platform_device_register(&avila_npeb_device); -+ platform_device_register(&avila_npec_device); -+ -+ platform_device_register(&avila_gpio_leds_device); - - avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1); - avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1); -@@ -159,8 +452,335 @@ static void __init avila_init(void) - avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2; - - platform_device_register(&avila_pata); -+} -+ -+static void __init avila_gw2353_setup(void) -+{ -+ platform_device_register(&avila_npeb_device); -+ platform_device_register(&avila_gpio_leds_device); -+} -+ -+static void __init avila_gw2355_setup(void) -+{ -+ avila_npeb_data.phy = IXP4XX_ETH_PHY_MAX_ADDR; -+ avila_npeb_data.phy_mask = 0x1e; /* ports 1-4 of the KS8995 switch */ -+ platform_device_register(&avila_npeb_device); -+ -+ avila_npec_data.phy = 16; -+ platform_device_register(&avila_npec_device); -+ -+ avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -+ platform_device_register(&avila_gpio_leds_device); -+ -+ *IXP4XX_EXP_CS4 |= 0xbfff3c03; -+ avila_latch_leds[0].name = "RXD"; -+ avila_latch_leds[1].name = "TXD"; -+ avila_latch_leds[2].name = "POL"; -+ avila_latch_leds[3].name = "LNK"; -+ avila_latch_leds[4].name = "ERR"; -+ avila_latch_leds_data.num_leds = 5; -+ avila_latch_leds_data.mem = 0x54000000; -+ platform_device_register(&avila_latch_leds_device); -+ -+ avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1); -+ avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1); -+ -+ avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2); -+ avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2); -+ -+ avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1; -+ avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2; -+ -+ platform_device_register(&avila_pata); -+} -+ -+static void __init avila_gw2357_setup(void) -+{ -+ platform_device_register(&avila_npeb_device); -+ -+ avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -+ platform_device_register(&avila_gpio_leds_device); -+ -+ *IXP4XX_EXP_CS1 |= 0xbfff3c03; -+ platform_device_register(&avila_latch_leds_device); -+} -+ -+static void __init avila_gw2365_setup(void) -+{ -+ avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS4 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO0, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[0].mapbase = 0x54000000; -+ avila_optional_uart_data[0].membase = (void __iomem *)ioremap(0x54000000, 0x0fff); -+ avila_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO0; -+ -+ *IXP4XX_EXP_CS5 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO1, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[1].mapbase = 0x55000000; -+ avila_optional_uart_data[1].membase = (void __iomem *)ioremap(0x55000000, 0x0fff); -+ avila_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO1; -+ -+ *IXP4XX_EXP_CS6 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[2].mapbase = 0x56000000; -+ avila_optional_uart_data[2].membase = (void __iomem *)ioremap(0x56000000, 0x0fff); -+ avila_optional_uart_data[2].irq = IRQ_IXP4XX_GPIO2; -+ -+ *IXP4XX_EXP_CS7 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[3].mapbase = 0x57000000; -+ avila_optional_uart_data[3].membase = (void __iomem *)ioremap(0x57000000, 0x0fff); -+ avila_optional_uart_data[3].irq = IRQ_IXP4XX_GPIO3; -+ -+ platform_device_register(&avila_optional_uart); -+ -+ avila_npeb_data.phy = 1; -+ platform_device_register(&avila_npeb_device); -+ -+ avila_npec_data.phy = 2; -+ platform_device_register(&avila_npec_device); -+ -+ avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2); -+ avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(2); -+ -+ avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(3); -+ avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(3); -+ -+ avila_pata_data.cs0_cfg = IXP4XX_EXP_CS2; -+ avila_pata_data.cs1_cfg = IXP4XX_EXP_CS3; -+ -+ platform_device_register(&avila_pata); -+ -+ avila_gpio_leds[0].gpio = 109; -+ avila_gpio_leds_data.num_leds = 5; -+ platform_device_register(&avila_gpio_leds_device); -+ -+ setup_audio_devices(); -+} -+ -+static void __init avila_gw2369_setup(void) -+{ -+ avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ avila_npeb_data.phy = 1; -+ platform_device_register(&avila_npeb_device); -+ -+ avila_npec_data.phy = 2; -+ platform_device_register(&avila_npec_device); -+ -+ setup_audio_devices(); -+} -+ -+static void __init avila_gw2370_setup(void) -+{ -+ avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ avila_npeb_data.phy = 5; -+ platform_device_register(&avila_npeb_device); -+ -+ avila_npec_data.phy = IXP4XX_ETH_PHY_MAX_ADDR; -+ avila_npec_data.phy_mask = 0x1e; /* ports 1-4 of the KS8995 switch */ -+ platform_device_register(&avila_npec_device); -+ -+ *IXP4XX_EXP_CS2 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO2, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[0].mapbase = 0x52000000; -+ avila_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52000000, 0x0fff); -+ avila_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO2; -+ -+ *IXP4XX_EXP_CS3 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[1].mapbase = 0x53000000; -+ avila_optional_uart_data[1].membase = (void __iomem *)ioremap(0x53000000, 0x0fff); -+ avila_optional_uart_data[1].irq = IRQ_IXP4XX_GPIO3; -+ -+ avila_optional_uart.num_resources = 2; -+ -+ platform_device_register(&avila_optional_uart); -+ -+ avila_gpio_leds[0].gpio = 101; -+ platform_device_register(&avila_gpio_leds_device); -+ -+ setup_audio_devices(); -+} -+ -+static void __init avila_gw2375_setup(void) -+{ -+ avila_npeb_data.phy = 1; -+ platform_device_register(&avila_npeb_device); -+ -+ avila_npec_data.phy = 2; -+ platform_device_register(&avila_npec_device); -+ -+ *IXP4XX_EXP_CS2 = 0xBFFF3C43; -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_EDGE_RISING); -+ avila_optional_uart_data[0].mapbase = 0x52000000; -+ avila_optional_uart_data[0].membase = (void __iomem *)ioremap(0x52000000, 0x0fff); -+ avila_optional_uart_data[0].irq = IRQ_IXP4XX_GPIO10; -+ -+ avila_optional_uart.num_resources = 1; -+ -+ platform_device_register(&avila_optional_uart); -+ -+ setup_audio_devices(); -+} -+ -+ -+static struct avila_board_info avila_boards[] __initdata = { -+ { -+ .model = "GW2342", -+ .setup = avila_gw2342_setup, -+ }, { -+ .model = "GW2345", -+ .setup = avila_gw2345_setup, -+ }, { -+ .model = "GW2347", -+ .setup = avila_gw2347_setup, -+ }, { -+ .model = "GW2348", -+ .setup = avila_gw2348_setup, -+ }, { -+ .model = "GW2353", -+ .setup = avila_gw2353_setup, -+ }, { -+ .model = "GW2355", -+ .setup = avila_gw2355_setup, -+ }, { -+ .model = "GW2357", -+ .setup = avila_gw2357_setup, -+ }, { -+ .model = "GW2365", -+ .setup = avila_gw2365_setup, -+ }, { -+ .model = "GW2369", -+ .setup = avila_gw2369_setup, -+ }, { -+ .model = "GW2370", -+ .setup = avila_gw2370_setup, -+ }, { -+ .model = "GW2373", -+ .setup = avila_gw2369_setup, -+ }, { -+ .model = "GW2375", -+ .setup = avila_gw2375_setup, -+ } -+}; -+ -+static struct avila_board_info * __init avila_find_board_info(char *model) -+{ -+ int i; -+ model[6] = '\0'; -+ -+ for (i = 0; i < ARRAY_SIZE(avila_boards); i++) { -+ struct avila_board_info *info = &avila_boards[i]; -+ if (strcmp(info->model, model) == 0) -+ return info; -+ } -+ -+ return NULL; -+} -+ -+static struct nvmem_device *at24_nvmem; -+ -+static void at24_setup(struct nvmem_device *mem_acc, void *context) -+{ -+ char mac_addr[ETH_ALEN]; -+ char model[7]; -+ -+ at24_nvmem = mem_acc; -+ -+ /* Read MAC addresses */ -+ if (nvmem_device_read(at24_nvmem, 0x0, 6, mac_addr) == 6) { -+ memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN); -+ } -+ if (nvmem_device_read(at24_nvmem, 0x6, 6, mac_addr) == 6) { -+ memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN); -+ } -+ -+ /* Read the first 6 bytes of the model number */ -+ if (nvmem_device_read(at24_nvmem, 0x20, 6, model) == 6) { -+ avila_info = avila_find_board_info(model); -+ } -+ -+} -+ -+static struct at24_platform_data avila_eeprom_info = { -+ .byte_len = 1024, -+ .page_size = 16, -+// .flags = AT24_FLAG_READONLY, -+ .setup = at24_setup, -+}; -+ -+static struct pca953x_platform_data avila_pca_data = { -+ .gpio_base = 100, -+}; -+ -+static struct i2c_board_info __initdata avila_i2c_board_info[] = { -+ { -+ I2C_BOARD_INFO("ds1672", 0x68), -+ }, -+ { -+ I2C_BOARD_INFO("gsp", 0x29), -+ }, -+ { -+ I2C_BOARD_INFO("pca9555", 0x23), -+ .platform_data = &avila_pca_data, -+ }, -+ { -+ I2C_BOARD_INFO("ad7418", 0x28), -+ }, -+ { -+ I2C_BOARD_INFO("24c08", 0x51), -+ .platform_data = &avila_eeprom_info -+ }, -+ { -+ I2C_BOARD_INFO("tlv320aic33", 0x1b), -+ }, -+ { -+ I2C_BOARD_INFO("tlv320aic33", 0x1a), -+ }, -+ { -+ I2C_BOARD_INFO("tlv320aic33", 0x19), -+ }, -+ { -+ I2C_BOARD_INFO("tlv320aic33", 0x18), -+ }, -+}; -+ -+static void __init avila_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ platform_add_devices(avila_devices, ARRAY_SIZE(avila_devices)); -+ -+ i2c_register_board_info(0, avila_i2c_board_info, -+ ARRAY_SIZE(avila_i2c_board_info)); -+} -+ -+static int __init avila_model_setup(void) -+{ -+ if (!machine_is_avila()) -+ return 0; -+ -+ /* default 16MB flash */ -+ avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1; -+ -+ if (avila_info) { -+ printk(KERN_DEBUG "Running on Gateworks Avila %s\n", -+ avila_info->model); -+ avila_info->setup(); -+ } else { -+ printk(KERN_INFO "Unknown/missing Avila model number" -+ " -- defaults will be used\n"); -+ avila_gw23xx_setup(); -+ } -+ platform_device_register(&avila_flash); - -+ return 0; - } -+late_initcall(avila_model_setup); - - MACHINE_START(AVILA, "Gateworks Avila Network Platform") - /* Maintainer: Deepak Saxena */ diff --git a/target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch b/target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch deleted file mode 100644 index 108fbcb37a..0000000000 --- a/target/linux/ixp4xx/patches-4.9/304-ixp4xx_eth_jumboframe.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c -+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -57,7 +57,7 @@ - - #define POOL_ALLOC_SIZE (sizeof(struct desc) * (RX_DESCS + TX_DESCS)) - #define REGS_SIZE 0x1000 --#define MAX_MRU 1536 /* 0x600 */ -+#define MAX_MRU (14320 - ETH_HLEN - ETH_FCS_LEN) - #define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4) - - #define NAPI_WEIGHT 16 -@@ -1289,6 +1289,32 @@ static void destroy_queues(struct port * - } - } - -+static int eth_do_change_mtu(struct net_device *dev, int mtu) -+{ -+ struct port *port; -+ struct msg msg; -+ /* adjust for ethernet headers */ -+ int framesize = mtu + ETH_HLEN + ETH_FCS_LEN; -+ -+ port = netdev_priv(dev); -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = NPE_SETMAXFRAMELENGTHS; -+ msg.eth_id = port->id; -+ -+ /* max rx/tx 64 byte blocks */ -+ msg.byte2 = ((framesize + 63) / 64) << 8; -+ msg.byte3 = ((framesize + 63) / 64) << 8; -+ -+ msg.byte4 = msg.byte6 = framesize >> 8; -+ msg.byte5 = msg.byte7 = framesize & 0xff; -+ -+ if (npe_send_recv_message(port->npe, &msg, "ETH_SET_MAX_FRAME_LENGTH")) -+ return -EIO; -+ -+ return 0; -+} -+ - static int eth_open(struct net_device *dev) - { - struct port *port = netdev_priv(dev); -@@ -1340,6 +1366,8 @@ static int eth_open(struct net_device *d - if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE")) - return -EIO; - -+ eth_do_change_mtu(dev, dev->mtu); -+ - if ((err = request_queues(port)) != 0) - return err; - -@@ -1479,7 +1507,26 @@ static int eth_close(struct net_device * - return 0; - } - -+static int ixp_eth_change_mtu(struct net_device *dev, int mtu) -+{ -+ int ret; -+ -+ if (mtu > MAX_MRU) -+ return -EINVAL; -+ -+ if (dev->flags & IFF_UP) { -+ ret = eth_do_change_mtu(dev, mtu); -+ if (ret < 0) -+ return ret; -+ } -+ -+ dev->mtu = mtu; -+ -+ return 0; -+} -+ - static const struct net_device_ops ixp4xx_netdev_ops = { -+ .ndo_change_mtu = ixp_eth_change_mtu, - .ndo_open = eth_open, - .ndo_stop = eth_close, - .ndo_start_xmit = eth_xmit, diff --git a/target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch b/target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch deleted file mode 100644 index 51f3f14510..0000000000 --- a/target/linux/ixp4xx/patches-4.9/310-gtwx5717_spi_bus.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c -+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c -@@ -27,6 +27,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include -@@ -146,9 +148,37 @@ static struct platform_device gtwx5715_f - .resource = >wx5715_flash_resource, - }; - -+static struct spi_gpio_platform_data gtwx5715_spi_platform_data = { -+ .sck = GTWX5715_KSSPI_CLOCK, -+ .mosi = GTWX5715_KSSPI_TXD, -+ .miso = GTWX5715_KSSPI_RXD, -+ .num_chipselect = 1, -+}; -+ -+static struct platform_device gtwx5715_spi_device = { -+ .name = "spi_gpio", -+ .id = 1, -+ .dev = { -+ .platform_data = >wx5715_spi_platform_data, -+ } -+}; -+ -+static struct spi_board_info gtwx5715_spi_devices[] __initdata = { -+ { -+ .modalias = "spi-ks8995", -+ .max_speed_hz = 5000000, -+ .mode = SPI_MODE_0, -+ .bus_num = 1, -+ .chip_select = 0, -+ .controller_data = (void *)GTWX5715_KSSPI_SELECT, -+ } -+}; -+ -+ - static struct platform_device *gtwx5715_devices[] __initdata = { - >wx5715_uart_device, - >wx5715_flash, -+ >wx5715_spi_device, - }; - - static void __init gtwx5715_init(void) -@@ -158,6 +188,7 @@ static void __init gtwx5715_init(void) - gtwx5715_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); - gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1; - -+ spi_register_board_info(gtwx5715_spi_devices, ARRAY_SIZE(gtwx5715_spi_devices)); - platform_add_devices(gtwx5715_devices, ARRAY_SIZE(gtwx5715_devices)); - } - diff --git a/target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch b/target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch deleted file mode 100644 index 85a8f162c6..0000000000 --- a/target/linux/ixp4xx/patches-4.9/311-gtwx5717_mac_plat_info.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c -+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -174,11 +175,39 @@ static struct spi_board_info gtwx5715_sp - } - }; - -+static struct eth_plat_info gtwx5715_npeb_data = { -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x1e, /* ports 1-4 of the KS8995 switch */ -+ .rxq = 3, -+ .txreadyq = 20, -+}; -+ -+static struct eth_plat_info gtwx5715_npec_data = { -+ .phy = 5, /* port 5 of the KS8995 switch */ -+ .rxq = 4, -+ .txreadyq = 21, -+}; -+ -+static struct platform_device gtwx5715_npeb_device = { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = >wx5715_npeb_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+}; -+ -+static struct platform_device gtwx5715_npec_device = { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = >wx5715_npec_data, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+}; - - static struct platform_device *gtwx5715_devices[] __initdata = { - >wx5715_uart_device, - >wx5715_flash, - >wx5715_spi_device, -+ >wx5715_npeb_device, -+ >wx5715_npec_device, - }; - - static void __init gtwx5715_init(void) diff --git a/target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch b/target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch deleted file mode 100644 index 59c2837f0c..0000000000 --- a/target/linux/ixp4xx/patches-4.9/312-ixp4xx_pata_optimization.patch +++ /dev/null @@ -1,137 +0,0 @@ ---- a/drivers/ata/pata_ixp4xx_cf.c -+++ b/drivers/ata/pata_ixp4xx_cf.c -@@ -24,16 +24,58 @@ - #include - - #define DRV_NAME "pata_ixp4xx_cf" --#define DRV_VERSION "0.2" -+#define DRV_VERSION "0.3" - - static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error) - { -+ struct ixp4xx_pata_data *data = link->ap->host->dev->platform_data; -+ unsigned int pio_mask; - struct ata_device *dev; - - ata_for_each_dev(dev, link, ENABLED) { -- ata_dev_info(dev, "configured for PIO0\n"); -- dev->pio_mode = XFER_PIO_0; -- dev->xfer_mode = XFER_PIO_0; -+ if (dev->id[ATA_ID_FIELD_VALID] & (1 << 1)) { -+ pio_mask = dev->id[ATA_ID_PIO_MODES] & 0x03; -+ if (pio_mask & (1 << 1)) { -+ pio_mask = 4; -+ } else { -+ pio_mask = 3; -+ } -+ } else { -+ pio_mask = (dev->id[ATA_ID_OLD_PIO_MODES] >> 8); -+ } -+ -+ switch (pio_mask){ -+ case 0: -+ ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n"); -+ dev->pio_mode = XFER_PIO_0; -+ dev->xfer_mode = XFER_PIO_0; -+ *data->cs0_cfg = 0x8a473c03; -+ break; -+ case 1: -+ ata_dev_printk(dev, KERN_INFO, "configured for PIO1\n"); -+ dev->pio_mode = XFER_PIO_1; -+ dev->xfer_mode = XFER_PIO_1; -+ *data->cs0_cfg = 0x86433c03; -+ break; -+ case 2: -+ ata_dev_printk(dev, KERN_INFO, "configured for PIO2\n"); -+ dev->pio_mode = XFER_PIO_2; -+ dev->xfer_mode = XFER_PIO_2; -+ *data->cs0_cfg = 0x82413c03; -+ break; -+ case 3: -+ ata_dev_printk(dev, KERN_INFO, "configured for PIO3\n"); -+ dev->pio_mode = XFER_PIO_3; -+ dev->xfer_mode = XFER_PIO_3; -+ *data->cs0_cfg = 0x80823c03; -+ break; -+ case 4: -+ ata_dev_printk(dev, KERN_INFO, "configured for PIO4\n"); -+ dev->pio_mode = XFER_PIO_4; -+ dev->xfer_mode = XFER_PIO_4; -+ *data->cs0_cfg = 0x80403c03; -+ break; -+ } - dev->xfer_shift = ATA_SHIFT_PIO; - dev->flags |= ATA_DFLAG_PIO; - } -@@ -46,6 +88,7 @@ static unsigned int ixp4xx_mmio_data_xfe - unsigned int i; - unsigned int words = buflen >> 1; - u16 *buf16 = (u16 *) buf; -+ unsigned int pio_mask; - struct ata_port *ap = dev->link->ap; - void __iomem *mmio = ap->ioaddr.data_addr; - struct ixp4xx_pata_data *data = dev_get_platdata(ap->host->dev); -@@ -53,8 +96,34 @@ static unsigned int ixp4xx_mmio_data_xfe - /* set the expansion bus in 16bit mode and restore - * 8 bit mode after the transaction. - */ -- *data->cs0_cfg &= ~(0x01); -- udelay(100); -+ if (dev->id[ATA_ID_FIELD_VALID] & (1 << 1)){ -+ pio_mask = dev->id[ATA_ID_PIO_MODES] & 0x03; -+ if (pio_mask & (1 << 1)){ -+ pio_mask = 4; -+ }else{ -+ pio_mask = 3; -+ } -+ }else{ -+ pio_mask = (dev->id[ATA_ID_OLD_PIO_MODES] >> 8); -+ } -+ switch (pio_mask){ -+ case 0: -+ *data->cs0_cfg = 0xa9643c42; -+ break; -+ case 1: -+ *data->cs0_cfg = 0x85033c42; -+ break; -+ case 2: -+ *data->cs0_cfg = 0x80b23c42; -+ break; -+ case 3: -+ *data->cs0_cfg = 0x80823c42; -+ break; -+ case 4: -+ *data->cs0_cfg = 0x80403c42; -+ break; -+ } -+ udelay(5); - - /* Transfer multiple of 2 bytes */ - if (rw == READ) -@@ -79,8 +148,24 @@ static unsigned int ixp4xx_mmio_data_xfe - words++; - } - -- udelay(100); -- *data->cs0_cfg |= 0x01; -+ udelay(5); -+ switch (pio_mask){ -+ case 0: -+ *data->cs0_cfg = 0x8a473c03; -+ break; -+ case 1: -+ *data->cs0_cfg = 0x86433c03; -+ break; -+ case 2: -+ *data->cs0_cfg = 0x82413c03; -+ break; -+ case 3: -+ *data->cs0_cfg = 0x80823c03; -+ break; -+ case 4: -+ *data->cs0_cfg = 0x80403c03; -+ break; -+ } - - return words << 1; - } diff --git a/target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch b/target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch deleted file mode 100644 index fb7f03ee1a..0000000000 --- a/target/linux/ixp4xx/patches-4.9/500-usr8200_support.patch +++ /dev/null @@ -1,347 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -93,6 +93,14 @@ config MACH_SIDEWINDER - Engineering Sidewinder board. For more information on this - platform, see http://www.adiengineering.com - -+config MACH_USR8200 -+ bool "USRobotics USR8200" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support the USRobotics -+ USR8200 router board. For more information on this platform, see -+ http://openwrt.org -+ - config MACH_COMPEXWP18 - bool "Compex WP18 / NP18A" - select PCI ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -27,6 +27,7 @@ obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt - obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o - obj-pci-$(CONFIG_MACH_MI424WR) += mi424wr-pci.o -+obj-pci-$(CONFIG_MACH_USR8200) += usr8200-pci.o - - obj-y += common.o - -@@ -55,6 +56,7 @@ obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv - obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o - obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o - obj-$(CONFIG_MACH_MI424WR) += mi424wr-setup.o -+obj-$(CONFIG_MACH_USR8200) += usr8200-setup.o - - obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o ---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h -+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -44,7 +44,8 @@ static __inline__ void __arch_decomp_set - machine_is_gateway7001() || machine_is_wg302v2() || - machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() || - machine_is_pronghorn() || machine_is_pronghorn_metro() || -- machine_is_wrt300nv2() || machine_is_tw5334()) -+ machine_is_wrt300nv2() || machine_is_tw5334() || -+ machine_is_usr8200()) - uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; - else - uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/usr8200-pci.c -@@ -0,0 +1,77 @@ -+/* -+ * arch/arch/mach-ixp4xx/usr8200-pci.c -+ * -+ * PCI setup routines for USRobotics USR8200 -+ * -+ * Copyright (C) 2008 Peter Denison -+ * -+ * based on pronghorn-pci.c -+ * Copyright (C) 2008 Imre Kaloz -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Peter Denison -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+ -+void __init usr8200_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init usr8200_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == 14) -+ return IRQ_IXP4XX_GPIO7; -+ else if (slot == 15) -+ return IRQ_IXP4XX_GPIO8; -+ else if (slot == 16) { -+ if (pin == 1) -+ return IRQ_IXP4XX_GPIO11; -+ else if (pin == 2) -+ return IRQ_IXP4XX_GPIO10; -+ else if (pin == 3) -+ return IRQ_IXP4XX_GPIO9; -+ else -+ return -1; -+ } else -+ return -1; -+} -+ -+struct hw_pci usr8200_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = usr8200_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = usr8200_map_irq, -+}; -+ -+int __init usr8200_pci_init(void) -+{ -+ if (machine_is_usr8200()) -+ pci_common_init(&usr8200_pci); -+ return 0; -+} -+ -+subsys_initcall(usr8200_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/usr8200-setup.c -@@ -0,0 +1,217 @@ -+/* -+ * arch/arm/mach-ixp4xx/usr8200-setup.c -+ * -+ * Board setup for the USRobotics USR8200 -+ * -+ * Copyright (C) 2008 Peter Denison -+ * -+ * based on pronghorn-setup.c: -+ * Copyright (C) 2008 Imre Kaloz -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Peter Denison -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct flash_platform_data usr8200_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource usr8200_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device usr8200_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &usr8200_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &usr8200_flash_resource, -+}; -+ -+static struct resource usr8200_uart_resources [] = { -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port usr8200_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device usr8200_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = usr8200_uart_data, -+ }, -+ .num_resources = 2, -+ .resource = usr8200_uart_resources, -+}; -+ -+static struct gpio_led usr8200_led_pin[] = { -+ { -+ .name = "usr8200:usb1", -+ .gpio = 0, -+ .active_low = 1, -+ }, -+ { -+ .name = "usr8200:usb2", -+ .gpio = 1, -+ .active_low = 1, -+ }, -+ { -+ .name = "usr8200:ieee1394", -+ .gpio = 2, -+ .active_low = 1, -+ }, -+ { -+ .name = "usr8200:internal", -+ .gpio = 3, -+ .active_low = 1, -+ }, -+ { -+ .name = "usr8200:power", -+ .gpio = 14, -+ } -+}; -+ -+static struct gpio_led_platform_data usr8200_led_data = { -+ .num_leds = ARRAY_SIZE(usr8200_led_pin), -+ .leds = usr8200_led_pin, -+}; -+ -+static struct platform_device usr8200_led = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev.platform_data = &usr8200_led_data, -+}; -+ -+static struct eth_plat_info usr8200_plat_eth[] = { -+ { /* NPEC - LAN with Marvell 88E6060 switch */ -+ .phy = IXP4XX_ETH_PHY_MAX_ADDR, -+ .phy_mask = 0x0F0000, -+ .rxq = 4, -+ .txreadyq = 21, -+ }, { /* NPEB - WAN */ -+ .phy = 9, -+ .rxq = 3, -+ .txreadyq = 20, -+ } -+}; -+ -+static struct platform_device usr8200_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = usr8200_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = usr8200_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct resource usr8200_rtc_resources = { -+ .flags = IORESOURCE_MEM -+}; -+ -+static struct platform_device usr8200_rtc = { -+ .name = "rtc7301", -+ .id = 0, -+ .num_resources = 1, -+ .resource = &usr8200_rtc_resources, -+}; -+ -+static struct platform_device *usr8200_devices[] __initdata = { -+ &usr8200_flash, -+ &usr8200_uart, -+ &usr8200_led, -+ &usr8200_eth[0], -+ &usr8200_eth[1], -+ &usr8200_rtc, -+}; -+ -+static void __init usr8200_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ usr8200_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ usr8200_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1; -+ -+ usr8200_rtc_resources.start = IXP4XX_EXP_BUS_BASE(2); -+ usr8200_rtc_resources.end = IXP4XX_EXP_BUS_BASE(2) + 0x01ff; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS2 = 0x3fff000 | IXP4XX_EXP_BUS_SIZE(0) | IXP4XX_EXP_BUS_WR_EN | -+ IXP4XX_EXP_BUS_CS_EN | IXP4XX_EXP_BUS_BYTE_EN; -+ *IXP4XX_GPIO_GPCLKR = 0x01100000; -+ -+ /* configure button as input */ -+ gpio_line_config(12, IXP4XX_GPIO_IN); -+ -+ platform_add_devices(usr8200_devices, ARRAY_SIZE(usr8200_devices)); -+} -+ -+MACHINE_START(USR8200, "USRobotics USR8200") -+ /* Maintainer: Peter Denison */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = usr8200_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END diff --git a/target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch b/target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch deleted file mode 100644 index 39a261b8e0..0000000000 --- a/target/linux/ixp4xx/patches-4.9/520-tw2662_support.patch +++ /dev/null @@ -1,316 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -176,6 +176,15 @@ config ARCH_PRPMC1100 - PrPCM1100 Processor Mezanine Module. For more information on - this platform, see . - -+config MACH_TW2662 -+ bool "Titan Wireless TW-266-2" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support the Titan -+ Wireless TW266-2. For more information on this platform, -+ see http://openwrt.org -+ -+ - config MACH_TW5334 - bool "Titan Wireless TW-533-4" - select PCI ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER) += sid - obj-pci-$(CONFIG_MACH_COMPEXWP18) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o - obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o -+obj-pci-$(CONFIG_MACH_TW2662) += tw2662-pci.o - obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o - obj-pci-$(CONFIG_MACH_MI424WR) += mi424wr-pci.o - obj-pci-$(CONFIG_MACH_USR8200) += usr8200-pci.o -@@ -54,6 +55,7 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin - obj-$(CONFIG_MACH_COMPEXWP18) += compex42x-setup.o - obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o - obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o -+obj-$(CONFIG_MACH_TW2662) += tw2662-setup.o - obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o - obj-$(CONFIG_MACH_MI424WR) += mi424wr-setup.o - obj-$(CONFIG_MACH_USR8200) += usr8200-setup.o ---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h -+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -45,7 +45,7 @@ static __inline__ void __arch_decomp_set - machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() || - machine_is_pronghorn() || machine_is_pronghorn_metro() || - machine_is_wrt300nv2() || machine_is_tw5334() || -- machine_is_usr8200()) -+ machine_is_usr8200() || machine_is_tw2662()) - uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; - else - uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/tw2662-pci.c -@@ -0,0 +1,67 @@ -+/* -+ * arch/arm/mach-ixp4xx/tw2662-pci.c -+ * -+ * PCI setup routines for Tiran Wireless TW-266-2 platform -+ * -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * Copyright (C) 2010 Alexandros C. Couloumbis -+ * Copyright (C) 2010 Gabor Juhos -+ * -+ * Maintainer: Deepak Saxena -+ * Maintainer: Alexandros C. Couloumbis -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define SLOT0_DEVID 1 -+#define SLOT1_DEVID 3 -+ -+/* PCI controller GPIO to IRQ pin mappings */ -+#define SLOT0_INTA 11 -+#define SLOT1_INTA 9 -+ -+void __init tw2662_pci_preinit(void) -+{ -+ irq_set_irq_type(IXP4XX_GPIO_IRQ(SLOT0_INTA), IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IXP4XX_GPIO_IRQ(SLOT1_INTA), IRQ_TYPE_LEVEL_LOW); -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init tw2662_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot == SLOT0_DEVID) -+ return IXP4XX_GPIO_IRQ(SLOT0_INTA); -+ else if (slot == SLOT1_DEVID) -+ return IXP4XX_GPIO_IRQ(SLOT1_INTA); -+ else return -1; -+} -+ -+struct hw_pci tw2662_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = tw2662_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = tw2662_map_irq, -+}; -+ -+int __init tw2662_pci_init(void) -+{ -+ if (machine_is_tw2662()) -+ pci_common_init(&tw2662_pci); -+ return 0; -+} -+ -+subsys_initcall(tw2662_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c -@@ -0,0 +1,196 @@ -+/* -+ * arch/arm/mach-ixp4xx/tw2662-setup.c -+ * -+ * Titan Wireless TW-266-2 -+ * -+ * Copyright (C) 2010 Gabor Juhos -+ * Copyright (C) 2010 Alexandros C. Couloumbis -+ * -+ * based on ap1000-setup.c: -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* gpio mask used by platform device */ -+#define TW2662_GPIO_MASK (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) -+ -+static struct flash_platform_data tw2662_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource tw2662_flash_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device tw2662_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &tw2662_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &tw2662_flash_resource, -+}; -+ -+static struct resource tw2662_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM -+ } -+}; -+ -+static struct plat_serial8250_port tw2662_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device tw2662_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = tw2662_uart_data, -+ .num_resources = 2, -+ .resource = tw2662_uart_resources -+}; -+ -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info tw2662_plat_eth[] = { -+ { -+ .phy = 3, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device tw2662_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = tw2662_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = tw2662_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+ -+static struct platform_device *tw2662_devices[] __initdata = { -+ &tw2662_flash, -+ &tw2662_uart, -+ &tw2662_eth[0], -+ &tw2662_eth[1], -+}; -+ -+static char tw2662_mem_fixup[] __initdata = "mem=64M "; -+ -+static void __init tw2662_fixup(struct tag *tags, char **cmdline) -+{ -+ struct tag *t = tags; -+ char *p = *cmdline; -+ -+ /* Find the end of the tags table, taking note of any cmdline tag. */ -+ for (; t->hdr.size; t = tag_next(t)) { -+ if (t->hdr.tag == ATAG_CMDLINE) { -+ p = t->u.cmdline.cmdline; -+ } -+ } -+ -+ /* Overwrite the end of the table with a new cmdline tag. */ -+ t->hdr.tag = ATAG_CMDLINE; -+ t->hdr.size = (sizeof (struct tag_header) + -+ strlen(tw2662_mem_fixup) + strlen(p) + 1 + 4) >> 2; -+ strlcpy(t->u.cmdline.cmdline, tw2662_mem_fixup, COMMAND_LINE_SIZE); -+ strlcpy(t->u.cmdline.cmdline + strlen(tw2662_mem_fixup), p, -+ COMMAND_LINE_SIZE - strlen(tw2662_mem_fixup)); -+ -+ /* Terminate the table. */ -+ t = tag_next(t); -+ t->hdr.tag = ATAG_NONE; -+ t->hdr.size = 0; -+} -+ -+static void __init tw2662_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ tw2662_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ tw2662_flash_resource.end = -+ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -+ -+ platform_add_devices(tw2662_devices, ARRAY_SIZE(tw2662_devices)); -+ -+ if (!(is_valid_ether_addr(tw2662_plat_eth[0].hwaddr))) -+ random_ether_addr(tw2662_plat_eth[0].hwaddr); -+ if (!(is_valid_ether_addr(tw2662_plat_eth[1].hwaddr))) { -+ memcpy(tw2662_plat_eth[1].hwaddr, tw2662_plat_eth[0].hwaddr, ETH_ALEN); -+ tw2662_plat_eth[1].hwaddr[5] = (tw2662_plat_eth[0].hwaddr[5] + 1); -+ } -+ -+} -+ -+#ifdef CONFIG_MACH_TW2662 -+MACHINE_START(TW2662, "Titan Wireless TW-266-2") -+ /* Maintainer: Alexandros C. Couloumbis */ -+ .fixup = tw2662_fixup, -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x0100, -+ .init_machine = tw2662_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+#endif diff --git a/target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch b/target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch deleted file mode 100644 index 1afbe3d61e..0000000000 --- a/target/linux/ixp4xx/patches-4.9/530-ap42x_support.patch +++ /dev/null @@ -1,282 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -4,6 +4,14 @@ menu "Intel IXP4xx Implementation Option - - comment "IXP4xx Platforms" - -+config MACH_AP42X -+ bool "Tonze AP-422/425" -+ select PCI -+ help -+ Say 'Y' here if you want your kernel to support Tonze's -+ AP-422/425 boards. For more information on this platform, -+ see http://tonze.com.tw -+ - config MACH_NSLU2 - bool - prompt "Linksys NSLU2" ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -5,6 +5,7 @@ - obj-pci-y := - obj-pci-n := - -+obj-pci-$(CONFIG_MACH_AP42X) += ap42x-pci.o - obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o - obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o - obj-pci-$(CONFIG_MACH_CAMBRIA) += cambria-pci.o -@@ -32,6 +33,7 @@ obj-pci-$(CONFIG_MACH_USR8200) += usr82 - - obj-y += common.o - -+obj-$(CONFIG_MACH_AP42X) += ap42x-setup.o - obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o - obj-$(CONFIG_MACH_AVILA) += avila-setup.o - obj-$(CONFIG_MACH_CAMBRIA) += cambria-setup.o ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/ap42x-pci.c -@@ -0,0 +1,63 @@ -+/* -+ * arch/arch/mach-ixp4xx/ap42x-pci.c -+ * -+ * PCI setup routines for Tonze AP-422/425 -+ * -+ * Copyright (C) 2012 Imre Kaloz -+ * -+ * based on coyote-pci.c: -+ * Copyright (C) 2002 Jungo Software Technologies. -+ * Copyright (C) 2003 MontaVista Softwrae, Inc. -+ * -+ * Maintainer: Imre Kaloz -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+#include -+ -+void __init ap42x_pci_preinit(void) -+{ -+ irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init ap42x_map_irq(const struct pci_dev *dev, u8 slot, -+ u8 pin) -+{ -+ if (slot == 1) -+ return IRQ_IXP4XX_GPIO11; -+ else if (slot == 2) -+ return IRQ_IXP4XX_GPIO10; -+ else return -1; -+} -+ -+struct hw_pci ap42x_pci __initdata = { -+ .nr_controllers = 1, -+ .preinit = ap42x_pci_preinit, -+ .ops = &ixp4xx_ops, -+ .setup = ixp4xx_setup, -+ .map_irq = ap42x_map_irq, -+}; -+ -+int __init ap42x_pci_init(void) -+{ -+ if (machine_is_ap42x()) -+ pci_common_init(&ap42x_pci); -+ return 0; -+} -+ -+subsys_initcall(ap42x_pci_init); ---- /dev/null -+++ b/arch/arm/mach-ixp4xx/ap42x-setup.c -@@ -0,0 +1,166 @@ -+/* -+ * arch/arm/mach-ixp4xx/ap42x-setup.c -+ * -+ * Board setup for the Tonze AP-42x boards -+ * -+ * Copyright (C) 2012 Imre Kaloz -+ * -+ * based on coyote-setup.c: -+ * Copyright (C) 2003-2005 MontaVista Software, Inc. -+ * -+ * Author: Imre Kaloz -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static struct mtd_partition ap42x_flash_partitions[] = { -+ { -+ .name = "RedBoot", -+ .offset = 0x00000000, -+ .size = 0x00080000, -+ }, { -+ .name = "linux", -+ .offset = 0x00080000, -+ .size = 0x00100000, -+ }, { -+ .name = "rootfs", -+ .offset = 0x00180000, -+ .size = 0x00660000, -+ }, { -+ .name = "FIS directory", -+ .offset = 0x007f8000, -+ .size = 0x00007000, -+ }, { -+ .name = "RedBoot config", -+ .offset = 0x007ff000, -+ .size = 0x00001000, -+ }, -+}; -+ -+static struct physmap_flash_data ap42x_flash_data = { -+ .width = 2, -+ .parts = ap42x_flash_partitions, -+ .nr_parts = ARRAY_SIZE(ap42x_flash_partitions), -+}; -+ -+static struct resource ap42x_flash_resource = { -+ .flags = IORESOURCE_MEM, -+ .start = IXP4XX_EXP_BUS_BASE_PHYS, -+ .end = IXP4XX_EXP_BUS_BASE_PHYS + SZ_8M - 1, -+}; -+ -+static struct platform_device ap42x_flash = { -+ .name = "physmap-flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &ap42x_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &ap42x_flash_resource, -+}; -+ -+static struct resource ap42x_uart_resource = { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct plat_serial8250_port ap42x_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { }, -+}; -+ -+static struct platform_device ap42x_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev = { -+ .platform_data = ap42x_uart_data, -+ }, -+ .num_resources = 1, -+ .resource = &ap42x_uart_resource, -+}; -+ -+static struct eth_plat_info ap42x_plat_eth[] = { -+ { -+ .phy = 2, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+ } -+}; -+ -+static struct platform_device ap42x_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = ap42x_plat_eth, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = ap42x_plat_eth + 1, -+ .dev.coherent_dma_mask = DMA_BIT_MASK(32), -+ } -+}; -+ -+static struct platform_device *ap42x_devices[] __initdata = { -+ &ap42x_flash, -+ &ap42x_uart, -+ &ap42x_eth[0], -+ &ap42x_eth[1], -+}; -+ -+static void __init ap42x_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ ap42x_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ ap42x_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; -+ -+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; -+ -+ platform_add_devices(ap42x_devices, ARRAY_SIZE(ap42x_devices)); -+} -+ -+#ifdef CONFIG_MACH_AP42X -+MACHINE_START(AP42X, "Tonze AP-422/425") -+ /* Maintainer: Imre Kaloz */ -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .init_time = ixp4xx_timer_init, -+ .atag_offset = 0x100, -+ .init_machine = ap42x_init, -+#if defined(CONFIG_PCI) -+ .dma_zone_size = SZ_64M, -+#endif -+ .restart = ixp4xx_restart, -+MACHINE_END -+#endif ---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h -+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h -@@ -45,7 +45,8 @@ static __inline__ void __arch_decomp_set - machine_is_devixp() || machine_is_miccpt() || machine_is_mic256() || - machine_is_pronghorn() || machine_is_pronghorn_metro() || - machine_is_wrt300nv2() || machine_is_tw5334() || -- machine_is_usr8200() || machine_is_tw2662()) -+ machine_is_usr8200() || machine_is_tw2662() || -+ machine_is_ap42x()) - uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; - else - uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; diff --git a/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch deleted file mode 100644 index cdd9fde8f0..0000000000 --- a/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/net/core/skbuff.c -+++ b/net/core/skbuff.c -@@ -215,6 +215,9 @@ struct sk_buff *__alloc_skb(unsigned int - - if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX)) - gfp_mask |= __GFP_MEMALLOC; -+#ifdef CONFIG_ARCH_IXP4XX -+ gfp_mask |= GFP_DMA; -+#endif - - /* Get the HEAD */ - skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node); -@@ -1228,6 +1231,10 @@ int pskb_expand_head(struct sk_buff *skb - if (skb_shared(skb)) - BUG(); - -+#ifdef CONFIG_ARCH_IXP4XX -+ gfp_mask |= GFP_DMA; -+#endif -+ - size = SKB_DATA_ALIGN(size); - - if (skb_pfmemalloc(skb)) diff --git a/target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch b/target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch deleted file mode 100644 index 24c93dc741..0000000000 --- a/target/linux/ixp4xx/patches-4.9/900-ixp4xx-crypto-include-module.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/crypto/ixp4xx_crypto.c -+++ b/drivers/crypto/ixp4xx_crypto.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch b/target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch deleted file mode 100644 index 06e09f469d..0000000000 --- a/target/linux/ixp4xx/patches-4.9/910-ixp4xx-nr_irq_lines.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/arch/arm/mach-ixp4xx/ixdp425-pci.c -+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c -@@ -53,7 +53,7 @@ static int __init ixdp425_map_irq(const - }; - - if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES) -- return pci_irq_table[(slot + pin - 2) % 4]; -+ return pci_irq_table[(slot + pin - 2) % IRQ_LINES]; - - return -1; - } ---- a/arch/arm/mach-ixp4xx/miccpt-pci.c -+++ b/arch/arm/mach-ixp4xx/miccpt-pci.c -@@ -54,7 +54,7 @@ static int __init miccpt_map_irq(const s - }; - - if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES) -- return pci_irq_table[(slot + pin - 2) % 4]; -+ return pci_irq_table[(slot + pin - 2) % IRQ_LINES]; - - return -1; - } From 57a9633a2c6c3be56c794576157f057a70ac52df Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 14:15:44 +0100 Subject: [PATCH 272/480] kernel: remove support for kernel 4.9 No target uses kernel 4.9 anymore. Signed-off-by: Adrian Schmutzler --- include/kernel-version.mk | 2 - ...dcode-path-to-awk-in-scripts-ld-vers.patch | 29 - .../011-kbuild-export-SUBARCH.patch | 23 - ...-for-controlling-warnings-to-linux-c.patch | 143 - ...te-alias-warning-for-SYSCALL_DEFINEx.patch | 88 - .../020-backport_netfilter_rtcache.patch | 543 -- .../021-bridge-multicast-to-unicast.patch | 499 -- ...rsion-of-alloc_etherdev_mqs-function.patch | 69 - ...024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch | 90 - ...ve-one-locked-operation-in-tcp_wfree.patch | 48 - ...tsq-add-shortcut-in-tcp_tasklet_func.patch | 71 - ...cp-tsq-avoid-one-atomic-in-tcp_wfree.patch | 38 - ...-a-shortcut-in-tcp_small_queue_check.patch | 37 - ...cp_mtu_probe-is-likely-to-exit-early.patch | 55 - ...struct-sock-for-better-data-locality.patch | 158 - ...ove-tsq_flags-close-to-sk_wmem_alloc.patch | 176 - ...-missing-barrier-in-tcp_tasklet_func.patch | 40 - ...tcp-allow-drivers-to-tweak-TSQ-logic.patch | 85 - ...imit-and-delta-fields-from-struct-ub.patch | 82 - ...writeback_interval-value-for-wbuf-ti.patch | 66 - ...or-releasing-multiple-instances-of-a.patch | 75 - ...flash-use-platform_-set-get-_drvdata.patch | 63 - ...h-support-reading-flash-out-of-mappi.patch | 81 - ...move-TRX-parsing-code-to-separated-f.patch | 180 - ...support-layouts-with-multiple-TRX-pa.patch | 112 - ...Macronix-mx25u25635f-to-list-of-know.patch | 22 - ...mtd-spi-nor-fix-spansion-quad-enable.patch | 42 - ...-mtd-spi-nor-fix-flags-for-s25fl128s.patch | 28 - ...td-spi-nor-add-support-for-s25fl208k.patch | 23 - ...-Add-at25df321-spi-nor-flash-support.patch | 26 - ...mtd-spi-nor-Add-support-for-N25Q016A.patch | 29 - ...-mtd-spi-nor-Add-support-for-mr25h40.patch | 25 - ...Add-support-for-S3AN-spi-nor-devices.patch | 312 - ...spi-nor-improve-macronix_quad_enable.patch | 28 - ...ve-WARN_ONCE-message-in-spi_nor_writ.patch | 33 - ...me-SPINOR_OP_-macros-of-the-4-byte-a.patch | 187 - ...a-stateless-method-to-support-memory.patch | 150 - ...Add-lock-unlock-support-for-f25l32pa.patch | 26 - ...-nor-Fix-S3AN-addressing-calculation.patch | 35 - ...-mtd-spi-nor-Add-support-for-gd25q16.patch | 28 - ...mtd-nand-Add-Winbond-manufacturer-id.patch | 34 - ...td-introduce-function-max_bad_blocks.patch | 73 - ...n-device-node-to-mtd-partition-devic.patch | 50 - ...le-stateless-4b-op-codes-for-mx25u25.patch | 29 - ...itioning-on-devices-with-0-erasesize.patch | 77 - ...tions-factor-out-code-calling-parser.patch | 68 - ...ns-add-helper-for-deleting-partition.patch | 119 - ...emove-sysfs-files-when-deleting-all-.patch | 45 - ...ename-master-to-the-parent-where-app.patch | 606 -- ...itions-add-support-for-subpartitions.patch | 96 - ...ns-add-support-for-partition-parsers.patch | 110 - ...parser-out-of-bcm47xxpart-into-a-sep.patch | 320 - ...ding-master-MTD-out-of-mtd_add_devic.patch | 74 - ...rid-of-the-mtd_add_device_partitions.patch | 93 - ...dd-of_match_table-parser-matching-fo.patch | 200 - ...t-parser-to-fixed-partitions-as-it-f.patch | 74 - ...of_match_table-with-fixed-partitions.patch | 44 - ...ding-registering-partitions-to-the-p.patch | 168 - ...-improve-handling-TRX-partition-size.patch | 70 - .../backport-4.9/070-bcma-from-4.11.patch | 85 - ...te-struct-bgmac-just-once-don-t-copy.patch | 139 - ...truct-bcma_mdio-we-don-t-need-anymor.patch | 261 - ...e-PHY-subsystem-for-initializing-PHY.patch | 53 - ...-master-mode-for-BCM54210E-and-B5021.patch | 50 - .../backport-4.9/072-bcma-from-4.12.patch | 47 - ...-Update-Auxiliary-Control-Register-m.patch | 34 - ...y-broadcom-Add-support-for-BCM54612E.patch | 94 - ...phy-broadcom-add-bcm54xx_auxctl_read.patch | 41 - ...-phy-broadcom-Add-BCM54810-PHY-entry.patch | 176 - ...-Move-bcm54xx_auxctl_-read-write-to-.patch | 74 - ...m-Allow-enabling-or-disabling-of-EEE.patch | 87 - ...-Add-support-code-for-reading-PHY-co.patch | 125 - ...et-phy-bcm7xxx-Add-entry-for-BCM7278.patch | 38 - ...-Implement-EGPHY-workaround-for-7278.patch | 68 - ...-use-auxctl-reading-helper-in-BCM546.patch | 45 - ...y-broadcom-add-support-for-BCM54210E.patch | 89 - ...adcom-rehook-BCM54612E-specific-init.patch | 121 - ...-support-new-device-flag-for-setting.patch | 54 - ...-variants-of-LED-registering-functio.patch | 120 - ...-variant-of-LED-registering-function.patch | 60 - ...5-add-thermal-driver-for-bcm2835-SoC.patch | 365 -- ...roadcom-add-Northstar-thermal-driver.patch | 173 - ...B-ports-from-DT-in-the-usbport-LED-t.patch | 106 - ...le-working-over-slow-can_sleep-GPIOs.patch | 84 - .../087-regmap-make-LZO-cache-optional.patch | 69 - ...90-net-generalize-napi_complete_done.patch | 1412 ----- ...issing-tunnel-encapsulation-limit-op.patch | 50 - ...ort-ipv6_push_frag_opts-for-tunnelin.patch | 31 - ...ddress-assignment-via-ifconfig-ioctl.patch | 79 - ...3-0001-rtc-ds1307-add-ds1308-variant.patch | 51 - ...reserve-link-scope-traffic-original-.patch | 32 - ...s3xxx-use-actual-size-reads-for-PCIe.patch | 46 - ...s-trigger-Introduce-a-NETDEV-trigger.patch | 588 -- ...add-of_match_table-with-a-new-DT-bin.patch | 47 - ...add-of_match_table-with-the-new-DT-b.patch | 45 - ...se-DT-info-for-parsing-partitions-wi.patch | 102 - target/linux/generic/config-4.9 | 5345 ----------------- .../generic/hack-4.9/204-module_strip.patch | 214 - .../hack-4.9/207-disable-modorder.patch | 44 - .../hack-4.9/210-darwin_scripts_include.patch | 3065 ---------- .../hack-4.9/211-host_tools_portability.patch | 40 - .../hack-4.9/212-byteshift_portability.patch | 65 - .../hack-4.9/214-spidev_h_portability.patch | 24 - .../generic/hack-4.9/220-gc_sections.patch | 448 -- .../generic/hack-4.9/221-module_exports.patch | 101 - .../hack-4.9/230-openwrt_lzma_options.patch | 71 - .../hack-4.9/250-netfilter_depends.patch | 27 - .../generic/hack-4.9/251-sound_kconfig.patch | 195 - .../generic/hack-4.9/259-regmap_dynamic.patch | 100 - .../260-crypto_test_dependencies.patch | 62 - .../generic/hack-4.9/280-rfkill-stubs.patch | 94 - ...cache-use-more-efficient-cache-blast.patch | 66 - .../301-mips_image_cmdline_hack.patch | 38 - .../321-powerpc_crtsavres_prereq.patch | 26 - .../generic/hack-4.9/531-debloat_lzma.patch | 1040 ---- .../640-bridge-only-accept-EAP-locally.patch | 83 - .../hack-4.9/641-bridge_port_isolate.patch | 76 - .../hack-4.9/651-wireless_mesh_header.patch | 24 - .../hack-4.9/660-fq_codel_defaults.patch | 27 - .../661-use_fq_codel_by_default.patch | 94 - .../hack-4.9/662-remove_pfifo_fast.patch | 159 - .../700-swconfig_switch_drivers.patch | 150 - .../702-phy_add_aneg_done_function.patch | 27 - ...710-phy-add-mdio_register_board_info.patch | 197 - .../generic/hack-4.9/721-phy_packets.patch | 176 - .../hack-4.9/773-bgmac-add-srab-switch.patch | 98 - .../hack-4.9/901-debloat_sock_diag.patch | 95 - .../generic/hack-4.9/902-debloat_proc.patch | 406 -- .../hack-4.9/904-debloat_dma_buf.patch | 64 - .../generic/hack-4.9/910-kobject_uevent.patch | 32 - .../911-kobject_add_broadcast_uevent.patch | 76 - ...ays-create-console-node-in-initramfs.patch | 40 - .../linux/generic/hack-4.9/930-crashlog.patch | 338 -- ...problem-with-platfom-data-in-w1-gpio.patch | 38 - ...fix-cache-flushing-for-highmem-pages.patch | 30 - .../pending-4.9/110-ehci_hcd_ignore_oc.patch | 79 - ...e_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 82 - ...0-add-linux-spidev-compatible-si3210.patch | 18 - ..._value_cansleep-for-setting-chipsele.patch | 20 - ...ame2-and-add-RENAME_WHITEOUT-support.patch | 62 - ...41-jffs2-add-RENAME_EXCHANGE-support.patch | 73 - ...ge_allow_receiption_on_disabled_port.patch | 47 - ...-generic-parsing-of-linux-part-probe.patch | 181 - ...ontrollers-before-the-specified-head.patch | 30 - ...et-phy-at803x-add-support-for-AT8032.patch | 70 - ...ng-comment-related-to-link-detection.patch | 43 - .../pending-4.9/201-extra_optimization.patch | 32 - .../203-kallsyms_uncompressed.patch | 119 - .../205-backtrace_module_info.patch | 45 - .../pending-4.9/220-optimize_inlining.patch | 70 - ...e-filenames-from-deps_initramfs-list.patch | 47 - ...able_wilink_platform_without_drivers.patch | 20 - .../300-mips_expose_boot_raw.patch | 40 - .../302-mips_no_branch_likely.patch | 22 - .../pending-4.9/304-mips_disable_fpu.patch | 137 - .../pending-4.9/305-mips_module_reloc.patch | 370 -- .../306-mips_mem_functions_performance.patch | 106 - .../pending-4.9/307-mips_highmem_offset.patch | 19 - .../pending-4.9/308-mips32r2_tune.patch | 22 - ...CPU-option-reporting-to-proc-cpuinfo.patch | 134 - .../310-arm_module_unresolved_weak_sym.patch | 22 - ...t-command-line-parameters-from-users.patch | 271 - .../332-arc-add-OWRTDTB-section.patch | 80 - ...able-unaligned-access-in-kernel-mode.patch | 24 - ...IPS-mm-remove-mips_dma_mapping_error.patch | 32 - ...ove-no-op-dma_map_ops-where-possible.patch | 140 - .../400-mtd-add-rootfs-split-support.patch | 108 - ...for-different-partition-parser-types.patch | 142 - ...arsers-for-rootfs-and-firmware-split.patch | 44 - .../403-mtd-hook-mtdsplit-to-Kbuild.patch | 32 - .../404-mtd-add-more-helper-functions.patch | 76 - .../411-mtd-partial_eraseblock_write.patch | 154 - .../412-mtd-partial_eraseblock_unlock.patch | 40 - ...t-add-of_match_table-with-DT-binding.patch | 39 - .../pending-4.9/420-mtd-redboot_space.patch | 41 - ...30-mtd-add-myloader-partition-parser.patch | 47 - ...check-for-bad-blocks-when-calculatin.patch | 68 - ...bcm47xxpart-detect-T_Meter-partition.patch | 37 - .../pending-4.9/440-block2mtd_init.patch | 116 - .../pending-4.9/441-block2mtd_probe.patch | 47 - ...-fallback-from-spi_flash_read-to-reg.patch | 36 - ...mtd-cfi_cmdset_0002-no-erase_suspend.patch | 25 - ...et_0002-add-buffer-write-cmd-timeout.patch | 17 - ...25p80-mx-disable-software-protection.patch | 18 - ...or-fix-Spansion-regressions-aliased-.patch | 37 - ...ort-limiting-4K-sectors-support-base.patch | 56 - ...pi-nor-Add-Winbond-w25q128jv-support.patch | 34 - .../476-mtd-spi-nor-add-eon-en25q128.patch | 18 - .../477-mtd-add-spi-nor-add-mx25u3235f.patch | 18 - ...support-for-XM25QH64A-and-XM25QH128A.patch | 30 - .../479-mtd-spi-nor-add-eon-en25qh32.patch | 10 - .../480-mtd-set-rootfs-to-be-root-dev.patch | 38 - ...mtd-device-named-ubi-or-data-on-boot.patch | 97 - ...to-create-ubiblock-device-for-rootfs.patch | 66 - ...ting-ubi0-rootfs-in-init-do_mounts.c.patch | 51 - ...ROOT_DEV-to-ubiblock-rootfs-if-unset.patch | 34 - .../494-mtd-ubi-add-EOF-marker-support.patch | 60 - .../530-jffs2_make_lzma_available.patch | 5180 ---------------- .../pending-4.9/532-jffs2_eofdetect.patch | 65 - ...fs-fix-default-compression-selection.patch | 37 - .../600-netfilter_conntrack_flush.patch | 95 - ...etfilter_match_bypass_default_checks.patch | 110 - ...netfilter_match_bypass_default_table.patch | 119 - ...netfilter_match_reduce_memory_access.patch | 22 - ...-netfilter_optional_tcp_window_check.patch | 44 - .../616-net_optimize_xfrm_calls.patch | 20 - ...del-do-not-defer-queue-length-update.patch | 86 - .../pending-4.9/630-packet_socket_type.patch | 138 - .../pending-4.9/655-increase_skb_pad.patch | 20 - ...Add-support-for-MAP-E-FMRs-mesh-mode.patch | 500 -- ...ng-with-source-address-failed-policy.patch | 255 - ...nes-for-_POLICY_FAILED-until-all-cod.patch | 50 - ...T-skip-GRO-for-foreign-MAC-addresses.patch | 154 - .../681-NET-add-of_get_mac_address_mtd.patch | 127 - .../pending-4.9/701-phy_extension.patch | 72 - ...detach-callback-to-struct-phy_driver.patch | 38 - ...-at803x-allow-to-configure-via-pdata.patch | 142 - ...net-phy-at803x-fix-at8033-sgmii-mode.patch | 51 - .../810-pci_disable_common_quirks.patch | 60 - .../811-pci_disable_usb_common_quirks.patch | 110 - ...ove-annoying-warning-about-bogus-URB.patch | 76 - .../pending-4.9/834-ledtrig-libata.patch | 149 - .../pending-4.9/890-uart_optional_sysrq.patch | 40 - .../pending-4.9/920-mangle_bootargs.patch | 71 - 224 files changed, 36557 deletions(-) delete mode 100644 target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch delete mode 100644 target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch delete mode 100644 target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch delete mode 100644 target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch delete mode 100644 target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch delete mode 100644 target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch delete mode 100644 target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch delete mode 100644 target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch delete mode 100644 target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch delete mode 100644 target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch delete mode 100644 target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch delete mode 100644 target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch delete mode 100644 target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch delete mode 100644 target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch delete mode 100644 target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch delete mode 100644 target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch delete mode 100644 target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch delete mode 100644 target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch delete mode 100644 target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch delete mode 100644 target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch delete mode 100644 target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch delete mode 100644 target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch delete mode 100644 target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch delete mode 100644 target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch delete mode 100644 target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch delete mode 100644 target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch delete mode 100644 target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch delete mode 100644 target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch delete mode 100644 target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch delete mode 100644 target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch delete mode 100644 target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch delete mode 100644 target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch delete mode 100644 target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch delete mode 100644 target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch delete mode 100644 target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch delete mode 100644 target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch delete mode 100644 target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch delete mode 100644 target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch delete mode 100644 target/linux/generic/backport-4.9/070-bcma-from-4.11.patch delete mode 100644 target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch delete mode 100644 target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch delete mode 100644 target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch delete mode 100644 target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch delete mode 100644 target/linux/generic/backport-4.9/072-bcma-from-4.12.patch delete mode 100644 target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch delete mode 100644 target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch delete mode 100644 target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch delete mode 100644 target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch delete mode 100644 target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch delete mode 100644 target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch delete mode 100644 target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch delete mode 100644 target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch delete mode 100644 target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch delete mode 100644 target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch delete mode 100644 target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch delete mode 100644 target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch delete mode 100644 target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch delete mode 100644 target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch delete mode 100644 target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch delete mode 100644 target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch delete mode 100644 target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch delete mode 100644 target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch delete mode 100644 target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch delete mode 100644 target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch delete mode 100644 target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch delete mode 100644 target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch delete mode 100644 target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch delete mode 100644 target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch delete mode 100644 target/linux/generic/config-4.9 delete mode 100644 target/linux/generic/hack-4.9/204-module_strip.patch delete mode 100644 target/linux/generic/hack-4.9/207-disable-modorder.patch delete mode 100644 target/linux/generic/hack-4.9/210-darwin_scripts_include.patch delete mode 100644 target/linux/generic/hack-4.9/211-host_tools_portability.patch delete mode 100644 target/linux/generic/hack-4.9/212-byteshift_portability.patch delete mode 100644 target/linux/generic/hack-4.9/214-spidev_h_portability.patch delete mode 100644 target/linux/generic/hack-4.9/220-gc_sections.patch delete mode 100644 target/linux/generic/hack-4.9/221-module_exports.patch delete mode 100644 target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch delete mode 100644 target/linux/generic/hack-4.9/250-netfilter_depends.patch delete mode 100644 target/linux/generic/hack-4.9/251-sound_kconfig.patch delete mode 100644 target/linux/generic/hack-4.9/259-regmap_dynamic.patch delete mode 100644 target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch delete mode 100644 target/linux/generic/hack-4.9/280-rfkill-stubs.patch delete mode 100644 target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch delete mode 100644 target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch delete mode 100644 target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch delete mode 100644 target/linux/generic/hack-4.9/531-debloat_lzma.patch delete mode 100644 target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch delete mode 100644 target/linux/generic/hack-4.9/641-bridge_port_isolate.patch delete mode 100644 target/linux/generic/hack-4.9/651-wireless_mesh_header.patch delete mode 100644 target/linux/generic/hack-4.9/660-fq_codel_defaults.patch delete mode 100644 target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch delete mode 100644 target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch delete mode 100644 target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch delete mode 100644 target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch delete mode 100644 target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch delete mode 100644 target/linux/generic/hack-4.9/721-phy_packets.patch delete mode 100644 target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch delete mode 100644 target/linux/generic/hack-4.9/901-debloat_sock_diag.patch delete mode 100644 target/linux/generic/hack-4.9/902-debloat_proc.patch delete mode 100644 target/linux/generic/hack-4.9/904-debloat_dma_buf.patch delete mode 100644 target/linux/generic/hack-4.9/910-kobject_uevent.patch delete mode 100644 target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch delete mode 100644 target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch delete mode 100644 target/linux/generic/hack-4.9/930-crashlog.patch delete mode 100644 target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch delete mode 100644 target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch delete mode 100644 target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch delete mode 100644 target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch delete mode 100644 target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch delete mode 100644 target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch delete mode 100644 target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch delete mode 100644 target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch delete mode 100644 target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch delete mode 100644 target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch delete mode 100644 target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch delete mode 100644 target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch delete mode 100644 target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch delete mode 100644 target/linux/generic/pending-4.9/201-extra_optimization.patch delete mode 100644 target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch delete mode 100644 target/linux/generic/pending-4.9/205-backtrace_module_info.patch delete mode 100644 target/linux/generic/pending-4.9/220-optimize_inlining.patch delete mode 100644 target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch delete mode 100644 target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch delete mode 100644 target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch delete mode 100644 target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch delete mode 100644 target/linux/generic/pending-4.9/304-mips_disable_fpu.patch delete mode 100644 target/linux/generic/pending-4.9/305-mips_module_reloc.patch delete mode 100644 target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch delete mode 100644 target/linux/generic/pending-4.9/307-mips_highmem_offset.patch delete mode 100644 target/linux/generic/pending-4.9/308-mips32r2_tune.patch delete mode 100644 target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch delete mode 100644 target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch delete mode 100644 target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch delete mode 100644 target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch delete mode 100644 target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch delete mode 100644 target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch delete mode 100644 target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch delete mode 100644 target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch delete mode 100644 target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch delete mode 100644 target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch delete mode 100644 target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch delete mode 100644 target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch delete mode 100644 target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch delete mode 100644 target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch delete mode 100644 target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch delete mode 100644 target/linux/generic/pending-4.9/420-mtd-redboot_space.patch delete mode 100644 target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch delete mode 100644 target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch delete mode 100644 target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch delete mode 100644 target/linux/generic/pending-4.9/440-block2mtd_init.patch delete mode 100644 target/linux/generic/pending-4.9/441-block2mtd_probe.patch delete mode 100644 target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch delete mode 100644 target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch delete mode 100644 target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch delete mode 100644 target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch delete mode 100644 target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch delete mode 100644 target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch delete mode 100644 target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch delete mode 100644 target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch delete mode 100644 target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch delete mode 100644 target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch delete mode 100644 target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch delete mode 100644 target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch delete mode 100644 target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch delete mode 100644 target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch delete mode 100644 target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch delete mode 100644 target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch delete mode 100644 target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch delete mode 100644 target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch delete mode 100644 target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch delete mode 100644 target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch delete mode 100644 target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch delete mode 100644 target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch delete mode 100644 target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch delete mode 100644 target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch delete mode 100644 target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch delete mode 100644 target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch delete mode 100644 target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch delete mode 100644 target/linux/generic/pending-4.9/630-packet_socket_type.patch delete mode 100644 target/linux/generic/pending-4.9/655-increase_skb_pad.patch delete mode 100644 target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch delete mode 100644 target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch delete mode 100644 target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch delete mode 100644 target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch delete mode 100644 target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch delete mode 100644 target/linux/generic/pending-4.9/701-phy_extension.patch delete mode 100644 target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch delete mode 100644 target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch delete mode 100644 target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch delete mode 100644 target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch delete mode 100644 target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch delete mode 100644 target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch delete mode 100644 target/linux/generic/pending-4.9/834-ledtrig-libata.patch delete mode 100644 target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch delete mode 100644 target/linux/generic/pending-4.9/920-mangle_bootargs.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 50cd4db2d9..eb99bd9e48 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,9 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .208 LINUX_VERSION-4.14 = .162 LINUX_VERSION-4.19 = .93 -LINUX_KERNEL_HASH-4.9.208 = b7ad1c9841d671d026c55a4c91c77205f8b488ca5f980f838591c68662e0525a LINUX_KERNEL_HASH-4.14.162 = f65170224cd4359ce8b2793b492bd8127abdd0b91350484e001bce13f0c98b4b LINUX_KERNEL_HASH-4.19.93 = 2af5d23f82a8bf69a6e4d8407579293b7beeebd3054dc464d48bdb5d2d7f5834 diff --git a/target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch b/target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch deleted file mode 100644 index 1115ee1ba2..0000000000 --- a/target/linux/generic/backport-4.9/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 13b1ecc3401653a355798eb1dee10cc1608202f4 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Mon, 18 Jan 2016 12:27:49 +0100 -Subject: [PATCH 33/34] Kbuild: don't hardcode path to awk in - scripts/ld-version.sh - -On some systems /usr/bin/awk does not exist, or is broken. Find it via -$PATH instead. - -Signed-off-by: Felix Fietkau ---- - scripts/ld-version.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/scripts/ld-version.sh -+++ b/scripts/ld-version.sh -@@ -1,5 +1,6 @@ --#!/usr/bin/awk -f -+#!/bin/sh - # extract linker version number from stdin and turn into single number -+exec awk ' - { - gsub(".*\\)", ""); - gsub(".*version ", ""); -@@ -8,3 +9,4 @@ - print a[1]*100000000 + a[2]*1000000 + a[3]*10000; - exit - } -+' diff --git a/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch deleted file mode 100644 index 4c0e07581d..0000000000 --- a/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sun, 9 Jul 2017 00:26:53 +0200 -Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86 - -Signed-off-by: Felix Fietkau ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -407,8 +407,8 @@ KERNELRELEASE = $(shell cat include/conf - KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) - - export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION --export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC --export CPP AR NM STRIP OBJCOPY OBJDUMP -+export ARCH SRCARCH SUBARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD -+export CC CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE - export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS - diff --git a/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch b/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch deleted file mode 100644 index 5b4b075838..0000000000 --- a/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch +++ /dev/null @@ -1,143 +0,0 @@ -From: Arnd Bergmann -Date: Tue, 19 Jun 2018 13:14:56 -0700 -Subject: [PATCH] kbuild: add macro for controlling warnings to - linux/compiler.h - -I have occasionally run into a situation where it would make sense to -control a compiler warning from a source file rather than doing so from -a Makefile using the $(cc-disable-warning, ...) or $(cc-option, ...) -helpers. - -The approach here is similar to what glibc uses, using __diag() and -related macros to encapsulate a _Pragma("GCC diagnostic ...") statement -that gets turned into the respective "#pragma GCC diagnostic ..." by -the preprocessor when the macro gets expanded. - -Like glibc, I also have an argument to pass the affected compiler -version, but decided to actually evaluate that one. For now, this -supports GCC_4_6, GCC_4_7, GCC_4_8, GCC_4_9, GCC_5, GCC_6, GCC_7, -GCC_8 and GCC_9. Adding support for CLANG_5 and other interesting -versions is straightforward here. GNU compilers starting with gcc-4.2 -could support it in principle, but "#pragma GCC diagnostic push" -was only added in gcc-4.6, so it seems simpler to not deal with those -at all. The same versions show a large number of warnings already, -so it seems easier to just leave it at that and not do a more -fine-grained control for them. - -The use cases I found so far include: - -- turning off the gcc-8 -Wattribute-alias warning inside of the - SYSCALL_DEFINEx() macro without having to do it globally. - -- Reducing the build time for a simple re-make after a change, - once we move the warnings from ./Makefile and - ./scripts/Makefile.extrawarn into linux/compiler.h - -- More control over the warnings based on other configurations, - using preprocessor syntax instead of Makefile syntax. This should make - it easier for the average developer to understand and change things. - -- Adding an easy way to turn the W=1 option on unconditionally - for a subdirectory or a specific file. This has been requested - by several developers in the past that want to have their subsystems - W=1 clean. - -- Integrating clang better into the build systems. Clang supports - more warnings than GCC, and we probably want to classify them - as default, W=1, W=2 etc, but there are cases in which the - warnings should be classified differently due to excessive false - positives from one or the other compiler. - -- Adding a way to turn the default warnings into errors (e.g. using - a new "make E=0" tag) while not also turning the W=1 warnings into - errors. - -This patch for now just adds the minimal infrastructure in order to -do the first of the list above. As the #pragma GCC diagnostic -takes precedence over command line options, the next step would be -to convert a lot of the individual Makefiles that set nonstandard -options to use __diag() instead. - -[paul.burton@mips.com: - - Rebase atop current master. - - Add __diag_GCC, or more generally __diag_, abstraction to - avoid code outside of linux/compiler-gcc.h needing to duplicate - knowledge about different GCC versions. - - Add a comment argument to __diag_{ignore,warn,error} which isn't - used in the expansion of the macros but serves to push people to - document the reason for using them - per feedback from Kees Cook. - - Translate severity to GCC-specific pragmas in linux/compiler-gcc.h - rather than using GCC-specific in linux/compiler_types.h. - - Drop all but GCC 8 macros, since we only need to define macros for - versions that we need to introduce pragmas for, and as of this - series that's just GCC 8. - - Capitalize comments in linux/compiler-gcc.h to match the style of - the rest of the file. - - Line up macro definitions with tabs in linux/compiler-gcc.h.] - -Signed-off-by: Arnd Bergmann -Signed-off-by: Paul Burton -Tested-by: Christophe Leroy -Tested-by: Stafford Horne -Signed-off-by: Masahiro Yamada ---- - ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -351,3 +351,30 @@ - #if GCC_VERSION >= 50100 - #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1 - #endif -+ -+ -+/* -+ * Turn individual warnings and errors on and off locally, depending -+ * on version. -+ */ -+#define __diag_GCC(version, severity, s) \ -+ __diag_GCC_ ## version(__diag_GCC_ ## severity s) -+ -+/* Severity used in pragma directives */ -+#define __diag_GCC_ignore ignored -+#define __diag_GCC_warn warning -+#define __diag_GCC_error error -+ -+/* Compilers before gcc-4.6 do not understand "#pragma GCC diagnostic push" */ -+#if GCC_VERSION >= 40600 -+#define __diag_str1(s) #s -+#define __diag_str(s) __diag_str1(s) -+#define __diag(s) _Pragma(__diag_str(GCC diagnostic s)) -+#endif -+ -+#if GCC_VERSION >= 80000 -+#define __diag_GCC_8(s) __diag(s) -+#else -+#define __diag_GCC_8(s) -+#endif -+ ---- a/include/linux/compiler.h -+++ b/include/linux/compiler.h -@@ -605,4 +605,23 @@ unsigned long read_word_at_a_time(const - # define __kprobes - # define nokprobe_inline inline - #endif -+ -+#ifndef __diag -+#define __diag(string) -+#endif -+ -+#ifndef __diag_GCC -+#define __diag_GCC(version, severity, string) -+#endif -+ -+#define __diag_push() __diag(push) -+#define __diag_pop() __diag(pop) -+ -+#define __diag_ignore(compiler, version, option, comment) \ -+ __diag_ ## compiler(version, ignore, option) -+#define __diag_warn(compiler, version, option, comment) \ -+ __diag_ ## compiler(version, warn, option) -+#define __diag_error(compiler, version, option, comment) \ -+ __diag_ ## compiler(version, error, option) -+ - #endif /* __LINUX_COMPILER_H */ diff --git a/target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch b/target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch deleted file mode 100644 index fc2a26d7cd..0000000000 --- a/target/linux/generic/backport-4.9/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Arnd Bergmann -Date: Tue, 19 Jun 2018 13:14:57 -0700 -Subject: [PATCH] disable -Wattribute-alias warning for SYSCALL_DEFINEx() - -gcc-8 warns for every single definition of a system call entry -point, e.g.: - -include/linux/compat.h:56:18: error: 'compat_sys_rt_sigprocmask' alias between functions of incompatible types 'long int(int, compat_sigset_t *, compat_sigset_t *, compat_size_t)' {aka 'long int(int, struct *, struct *, unsigned int)'} and 'long int(long int, long int, long int, long int)' [-Werror=attribute-alias] - asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\ - ^~~~~~~~~~ -include/linux/compat.h:45:2: note: in expansion of macro 'COMPAT_SYSCALL_DEFINEx' - COMPAT_SYSCALL_DEFINEx(4, _##name, __VA_ARGS__) - ^~~~~~~~~~~~~~~~~~~~~~ -kernel/signal.c:2601:1: note: in expansion of macro 'COMPAT_SYSCALL_DEFINE4' - COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, int, how, compat_sigset_t __user *, nset, - ^~~~~~~~~~~~~~~~~~~~~~ -include/linux/compat.h:60:18: note: aliased declaration here - asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\ - ^~~~~~~~~~ - -The new warning seems reasonable in principle, but it doesn't -help us here, since we rely on the type mismatch to sanitize the -system call arguments. After I reported this as GCC PR82435, a new --Wno-attribute-alias option was added that could be used to turn the -warning off globally on the command line, but I'd prefer to do it a -little more fine-grained. - -Interestingly, turning a warning off and on again inside of -a single macro doesn't always work, in this case I had to add -an extra statement inbetween and decided to copy the __SC_TEST -one from the native syscall to the compat syscall macro. See -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 for more details -about this. - -[paul.burton@mips.com: - - Rebase atop current master. - - Split GCC & version arguments to __diag_ignore() in order to match - changes to the preceding patch. - - Add the comment argument to match the preceding patch.] - -Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435 -Signed-off-by: Arnd Bergmann -Signed-off-by: Paul Burton -Tested-by: Christophe Leroy -Tested-by: Stafford Horne -Signed-off-by: Masahiro Yamada ---- - ---- a/include/linux/compat.h -+++ b/include/linux/compat.h -@@ -47,6 +47,9 @@ - COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__) - - #define COMPAT_SYSCALL_DEFINEx(x, name, ...) \ -+ __diag_push(); \ -+ __diag_ignore(GCC, 8, "-Wattribute-alias", \ -+ "Type aliasing is used to sanitize syscall arguments");\ - asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\ - __attribute__((alias(__stringify(compat_SyS##name)))); \ - static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ -@@ -55,6 +58,7 @@ - { \ - return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \ - } \ -+ __diag_pop(); \ - static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) - - #ifndef compat_user_stack_pointer ---- a/include/linux/syscalls.h -+++ b/include/linux/syscalls.h -@@ -192,6 +192,9 @@ extern struct trace_event_functions exit - - #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__) - #define __SYSCALL_DEFINEx(x, name, ...) \ -+ __diag_push(); \ -+ __diag_ignore(GCC, 8, "-Wattribute-alias", \ -+ "Type aliasing is used to sanitize syscall arguments");\ - asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \ - __attribute__((alias(__stringify(SyS##name)))); \ - static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \ -@@ -203,6 +206,7 @@ extern struct trace_event_functions exit - __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \ - return ret; \ - } \ -+ __diag_pop(); \ - static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) - - asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special, diff --git a/target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch deleted file mode 100644 index e7c9b4c702..0000000000 --- a/target/linux/generic/backport-4.9/020-backport_netfilter_rtcache.patch +++ /dev/null @@ -1,543 +0,0 @@ -From c4d66e57455f5384128753674cc0f9e02db5e1f6 Mon Sep 17 00:00:00 2001 -From: Florian Westphal -Date: Sun, 9 Jul 2017 08:58:30 +0200 -Subject: [PATCH] netfilter: conntrack: cache route for forwarded connections - -... to avoid per-packet FIB lookup if possible. - -The cached dst is re-used provided the input interface -is the same as that of the previous packet in the same direction. - -If not, the cached dst is invalidated. - -For ipv6 we also need to store sernum, else dst_check doesn't work, -pointed out by Eric Dumazet. - -This should speed up forwarding when conntrack is already in use -anyway, especially when using reverse path filtering -- active RPF -enforces two FIB lookups for each packet. - -Before the routing cache removal this didn't matter since RPF was performed -only when route cache didn't yield a result; but without route cache it -comes at higher price. - -Julian Anastasov suggested to add NETDEV_UNREGISTER handler to -avoid holding on to dsts of 'frozen' conntracks. - -Signed-off-by: Florian Westphal ---- - include/net/netfilter/nf_conntrack_extend.h | 4 + - include/net/netfilter/nf_conntrack_rtcache.h | 34 +++ - net/netfilter/Kconfig | 12 + - net/netfilter/Makefile | 3 + - net/netfilter/nf_conntrack_rtcache.c | 413 +++++++++++++++++++++++++++ - 5 files changed, 466 insertions(+) - create mode 100644 include/net/netfilter/nf_conntrack_rtcache.h - create mode 100644 net/netfilter/nf_conntrack_rtcache.c - ---- a/include/net/netfilter/nf_conntrack_extend.h -+++ b/include/net/netfilter/nf_conntrack_extend.h -@@ -27,6 +27,9 @@ enum nf_ct_ext_id { - #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY) - NF_CT_EXT_SYNPROXY, - #endif -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE) -+ NF_CT_EXT_RTCACHE, -+#endif - NF_CT_EXT_NUM, - }; - -@@ -39,6 +42,7 @@ enum nf_ct_ext_id { - #define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout - #define NF_CT_EXT_LABELS_TYPE struct nf_conn_labels - #define NF_CT_EXT_SYNPROXY_TYPE struct nf_conn_synproxy -+#define NF_CT_EXT_RTCACHE_TYPE struct nf_conn_rtcache - - /* Extensions: optional stuff which isn't permanently in struct. */ - struct nf_ct_ext { ---- /dev/null -+++ b/include/net/netfilter/nf_conntrack_rtcache.h -@@ -0,0 +1,34 @@ -+#include -+#include -+#include -+ -+struct dst_entry; -+ -+struct nf_conn_dst_cache { -+ struct dst_entry *dst; -+ int iif; -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) -+ u32 cookie; -+#endif -+ -+}; -+ -+struct nf_conn_rtcache { -+ struct nf_conn_dst_cache cached_dst[IP_CT_DIR_MAX]; -+}; -+ -+static inline -+struct nf_conn_rtcache *nf_ct_rtcache_find(const struct nf_conn *ct) -+{ -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE) -+ return nf_ct_ext_find(ct, NF_CT_EXT_RTCACHE); -+#else -+ return NULL; -+#endif -+} -+ -+static inline int nf_conn_rtcache_iif_get(const struct nf_conn_rtcache *rtc, -+ enum ip_conntrack_dir dir) -+{ -+ return rtc->cached_dst[dir].iif; -+} ---- a/net/netfilter/Kconfig -+++ b/net/netfilter/Kconfig -@@ -114,6 +114,18 @@ config NF_CONNTRACK_EVENTS - - If unsure, say `N'. - -+config NF_CONNTRACK_RTCACHE -+ tristate "Cache route entries in conntrack objects" -+ depends on NETFILTER_ADVANCED -+ depends on NF_CONNTRACK -+ help -+ If this option is enabled, the connection tracking code will -+ cache routing information for each connection that is being -+ forwarded, at a cost of 32 bytes per conntrack object. -+ -+ To compile it as a module, choose M here. If unsure, say N. -+ The module will be called nf_conntrack_rtcache. -+ - config NF_CONNTRACK_TIMEOUT - bool 'Connection tracking timeout' - depends on NETFILTER_ADVANCED ---- a/net/netfilter/Makefile -+++ b/net/netfilter/Makefile -@@ -16,6 +16,9 @@ obj-$(CONFIG_NETFILTER_NETLINK_LOG) += n - # connection tracking - obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o - -+# optional conntrack route cache extension -+obj-$(CONFIG_NF_CONNTRACK_RTCACHE) += nf_conntrack_rtcache.o -+ - # SCTP protocol connection tracking - obj-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o - obj-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o ---- /dev/null -+++ b/net/netfilter/nf_conntrack_rtcache.c -@@ -0,0 +1,413 @@ -+/* route cache for netfilter. -+ * -+ * (C) 2014 Red Hat GmbH -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) -+#include -+#endif -+ -+static void __nf_conn_rtcache_destroy(struct nf_conn_rtcache *rtc, -+ enum ip_conntrack_dir dir) -+{ -+ struct dst_entry *dst = rtc->cached_dst[dir].dst; -+ -+ dst_release(dst); -+} -+ -+static void nf_conn_rtcache_destroy(struct nf_conn *ct) -+{ -+ struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct); -+ -+ if (!rtc) -+ return; -+ -+ __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_ORIGINAL); -+ __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_REPLY); -+} -+ -+static void nf_ct_rtcache_ext_add(struct nf_conn *ct) -+{ -+ struct nf_conn_rtcache *rtc; -+ -+ rtc = nf_ct_ext_add(ct, NF_CT_EXT_RTCACHE, GFP_ATOMIC); -+ if (rtc) { -+ rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif = -1; -+ rtc->cached_dst[IP_CT_DIR_ORIGINAL].dst = NULL; -+ rtc->cached_dst[IP_CT_DIR_REPLY].iif = -1; -+ rtc->cached_dst[IP_CT_DIR_REPLY].dst = NULL; -+ } -+} -+ -+static struct nf_conn_rtcache *nf_ct_rtcache_find_usable(struct nf_conn *ct) -+{ -+ if (nf_ct_is_untracked(ct)) -+ return NULL; -+ return nf_ct_rtcache_find(ct); -+} -+ -+static struct dst_entry * -+nf_conn_rtcache_dst_get(const struct nf_conn_rtcache *rtc, -+ enum ip_conntrack_dir dir) -+{ -+ return rtc->cached_dst[dir].dst; -+} -+ -+static u32 nf_rtcache_get_cookie(int pf, const struct dst_entry *dst) -+{ -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) -+ if (pf == NFPROTO_IPV6) { -+ const struct rt6_info *rt = (const struct rt6_info *)dst; -+ -+ if (rt->rt6i_node) -+ return (u32)rt->rt6i_node->fn_sernum; -+ } -+#endif -+ return 0; -+} -+ -+static void nf_conn_rtcache_dst_set(int pf, -+ struct nf_conn_rtcache *rtc, -+ struct dst_entry *dst, -+ enum ip_conntrack_dir dir, int iif) -+{ -+ if (rtc->cached_dst[dir].iif != iif) -+ rtc->cached_dst[dir].iif = iif; -+ -+ if (rtc->cached_dst[dir].dst != dst) { -+ struct dst_entry *old; -+ -+ dst_hold(dst); -+ -+ old = xchg(&rtc->cached_dst[dir].dst, dst); -+ dst_release(old); -+ -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) -+ if (pf == NFPROTO_IPV6) -+ rtc->cached_dst[dir].cookie = -+ nf_rtcache_get_cookie(pf, dst); -+#endif -+ } -+} -+ -+static void nf_conn_rtcache_dst_obsolete(struct nf_conn_rtcache *rtc, -+ enum ip_conntrack_dir dir) -+{ -+ struct dst_entry *old; -+ -+ pr_debug("Invalidate iif %d for dir %d on cache %p\n", -+ rtc->cached_dst[dir].iif, dir, rtc); -+ -+ old = xchg(&rtc->cached_dst[dir].dst, NULL); -+ dst_release(old); -+ rtc->cached_dst[dir].iif = -1; -+} -+ -+static unsigned int nf_rtcache_in(u_int8_t pf, -+ struct sk_buff *skb, -+ const struct nf_hook_state *state) -+{ -+ struct nf_conn_rtcache *rtc; -+ enum ip_conntrack_info ctinfo; -+ enum ip_conntrack_dir dir; -+ struct dst_entry *dst; -+ struct nf_conn *ct; -+ int iif; -+ u32 cookie; -+ -+ if (skb_dst(skb) || skb->sk) -+ return NF_ACCEPT; -+ -+ ct = nf_ct_get(skb, &ctinfo); -+ if (!ct) -+ return NF_ACCEPT; -+ -+ rtc = nf_ct_rtcache_find_usable(ct); -+ if (!rtc) -+ return NF_ACCEPT; -+ -+ /* if iif changes, don't use cache and let ip stack -+ * do route lookup. -+ * -+ * If rp_filter is enabled it might toss skb, so -+ * we don't want to avoid these checks. -+ */ -+ dir = CTINFO2DIR(ctinfo); -+ iif = nf_conn_rtcache_iif_get(rtc, dir); -+ if (state->in->ifindex != iif) { -+ pr_debug("ct %p, iif %d, cached iif %d, skip cached entry\n", -+ ct, iif, state->in->ifindex); -+ return NF_ACCEPT; -+ } -+ dst = nf_conn_rtcache_dst_get(rtc, dir); -+ if (dst == NULL) -+ return NF_ACCEPT; -+ -+ cookie = nf_rtcache_get_cookie(pf, dst); -+ -+ dst = dst_check(dst, cookie); -+ pr_debug("obtained dst %p for skb %p, cookie %d\n", dst, skb, cookie); -+ if (likely(dst)) -+ skb_dst_set_noref(skb, dst); -+ else -+ nf_conn_rtcache_dst_obsolete(rtc, dir); -+ -+ return NF_ACCEPT; -+} -+ -+static unsigned int nf_rtcache_forward(u_int8_t pf, -+ struct sk_buff *skb, -+ const struct nf_hook_state *state) -+{ -+ struct nf_conn_rtcache *rtc; -+ enum ip_conntrack_info ctinfo; -+ enum ip_conntrack_dir dir; -+ struct nf_conn *ct; -+ struct dst_entry *dst = skb_dst(skb); -+ int iif; -+ -+ ct = nf_ct_get(skb, &ctinfo); -+ if (!ct) -+ return NF_ACCEPT; -+ -+ if (dst && dst_xfrm(dst)) -+ return NF_ACCEPT; -+ -+ if (!nf_ct_is_confirmed(ct)) { -+ if (WARN_ON(nf_ct_rtcache_find(ct))) -+ return NF_ACCEPT; -+ nf_ct_rtcache_ext_add(ct); -+ return NF_ACCEPT; -+ } -+ -+ rtc = nf_ct_rtcache_find_usable(ct); -+ if (!rtc) -+ return NF_ACCEPT; -+ -+ dir = CTINFO2DIR(ctinfo); -+ iif = nf_conn_rtcache_iif_get(rtc, dir); -+ pr_debug("ct %p, skb %p, dir %d, iif %d, cached iif %d\n", -+ ct, skb, dir, iif, state->in->ifindex); -+ if (likely(state->in->ifindex == iif)) -+ return NF_ACCEPT; -+ -+ nf_conn_rtcache_dst_set(pf, rtc, skb_dst(skb), dir, state->in->ifindex); -+ return NF_ACCEPT; -+} -+ -+static unsigned int nf_rtcache_in4(void *priv, -+ struct sk_buff *skb, -+ const struct nf_hook_state *state) -+{ -+ return nf_rtcache_in(NFPROTO_IPV4, skb, state); -+} -+ -+static unsigned int nf_rtcache_forward4(void *priv, -+ struct sk_buff *skb, -+ const struct nf_hook_state *state) -+{ -+ return nf_rtcache_forward(NFPROTO_IPV4, skb, state); -+} -+ -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) -+static unsigned int nf_rtcache_in6(void *priv, -+ struct sk_buff *skb, -+ const struct nf_hook_state *state) -+{ -+ return nf_rtcache_in(NFPROTO_IPV6, skb, state); -+} -+ -+static unsigned int nf_rtcache_forward6(void *priv, -+ struct sk_buff *skb, -+ const struct nf_hook_state *state) -+{ -+ return nf_rtcache_forward(NFPROTO_IPV6, skb, state); -+} -+#endif -+ -+static int nf_rtcache_dst_remove(struct nf_conn *ct, void *data) -+{ -+ struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct); -+ struct net_device *dev = data; -+ -+ if (!rtc) -+ return 0; -+ -+ if (dev->ifindex == rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif || -+ dev->ifindex == rtc->cached_dst[IP_CT_DIR_REPLY].iif) { -+ nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_ORIGINAL); -+ nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_REPLY); -+ } -+ -+ return 0; -+} -+ -+static int nf_rtcache_netdev_event(struct notifier_block *this, -+ unsigned long event, void *ptr) -+{ -+ struct net_device *dev = netdev_notifier_info_to_dev(ptr); -+ struct net *net = dev_net(dev); -+ -+ if (event == NETDEV_DOWN) -+ nf_ct_iterate_cleanup(net, nf_rtcache_dst_remove, dev, 0, 0); -+ -+ return NOTIFY_DONE; -+} -+ -+static struct notifier_block nf_rtcache_notifier = { -+ .notifier_call = nf_rtcache_netdev_event, -+}; -+ -+static struct nf_hook_ops rtcache_ops[] = { -+ { -+ .hook = nf_rtcache_in4, -+ .pf = NFPROTO_IPV4, -+ .hooknum = NF_INET_PRE_ROUTING, -+ .priority = NF_IP_PRI_LAST, -+ }, -+ { -+ .hook = nf_rtcache_forward4, -+ .pf = NFPROTO_IPV4, -+ .hooknum = NF_INET_FORWARD, -+ .priority = NF_IP_PRI_LAST, -+ }, -+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6) -+ { -+ .hook = nf_rtcache_in6, -+ .pf = NFPROTO_IPV6, -+ .hooknum = NF_INET_PRE_ROUTING, -+ .priority = NF_IP_PRI_LAST, -+ }, -+ { -+ .hook = nf_rtcache_forward6, -+ .pf = NFPROTO_IPV6, -+ .hooknum = NF_INET_FORWARD, -+ .priority = NF_IP_PRI_LAST, -+ }, -+#endif -+}; -+ -+static struct nf_ct_ext_type rtcache_extend __read_mostly = { -+ .len = sizeof(struct nf_conn_rtcache), -+ .align = __alignof__(struct nf_conn_rtcache), -+ .id = NF_CT_EXT_RTCACHE, -+ .destroy = nf_conn_rtcache_destroy, -+}; -+ -+static int __init nf_conntrack_rtcache_init(void) -+{ -+ int ret = nf_ct_extend_register(&rtcache_extend); -+ -+ if (ret < 0) { -+ pr_err("nf_conntrack_rtcache: Unable to register extension\n"); -+ return ret; -+ } -+ -+ ret = nf_register_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops)); -+ if (ret < 0) { -+ nf_ct_extend_unregister(&rtcache_extend); -+ return ret; -+ } -+ -+ ret = register_netdevice_notifier(&nf_rtcache_notifier); -+ if (ret) { -+ nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops)); -+ nf_ct_extend_unregister(&rtcache_extend); -+ } -+ -+ return ret; -+} -+ -+static int nf_rtcache_ext_remove(struct nf_conn *ct, void *data) -+{ -+ struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct); -+ -+ return rtc != NULL; -+} -+ -+static bool __exit nf_conntrack_rtcache_wait_for_dying(struct net *net) -+{ -+ bool wait = false; -+ int cpu; -+ -+ for_each_possible_cpu(cpu) { -+ struct nf_conntrack_tuple_hash *h; -+ struct hlist_nulls_node *n; -+ struct nf_conn *ct; -+ struct ct_pcpu *pcpu = per_cpu_ptr(net->ct.pcpu_lists, cpu); -+ -+ rcu_read_lock(); -+ spin_lock_bh(&pcpu->lock); -+ -+ hlist_nulls_for_each_entry(h, n, &pcpu->dying, hnnode) { -+ ct = nf_ct_tuplehash_to_ctrack(h); -+ if (nf_ct_rtcache_find(ct) != NULL) { -+ wait = true; -+ break; -+ } -+ } -+ spin_unlock_bh(&pcpu->lock); -+ rcu_read_unlock(); -+ } -+ -+ return wait; -+} -+ -+static void __exit nf_conntrack_rtcache_fini(void) -+{ -+ struct net *net; -+ int count = 0; -+ -+ /* remove hooks so no new connections get rtcache extension */ -+ nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops)); -+ -+ synchronize_net(); -+ -+ unregister_netdevice_notifier(&nf_rtcache_notifier); -+ -+ rtnl_lock(); -+ -+ /* zap all conntracks with rtcache extension */ -+ for_each_net(net) -+ nf_ct_iterate_cleanup(net, nf_rtcache_ext_remove, NULL, 0, 0); -+ -+ for_each_net(net) { -+ /* .. and make sure they're gone from dying list, too */ -+ while (nf_conntrack_rtcache_wait_for_dying(net)) { -+ msleep(200); -+ WARN_ONCE(++count > 25, "Waiting for all rtcache conntracks to go away\n"); -+ } -+ } -+ -+ rtnl_unlock(); -+ synchronize_net(); -+ nf_ct_extend_unregister(&rtcache_extend); -+} -+module_init(nf_conntrack_rtcache_init); -+module_exit(nf_conntrack_rtcache_fini); -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Florian Westphal "); -+MODULE_DESCRIPTION("Conntrack route cache extension"); diff --git a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch deleted file mode 100644 index 42daacf50d..0000000000 --- a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch +++ /dev/null @@ -1,499 +0,0 @@ -From: Felix Fietkau -Date: Thu, 19 Jan 2017 03:45:10 +0100 -Subject: [PATCH] bridge: multicast to unicast -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Implements an optional, per bridge port flag and feature to deliver -multicast packets to any host on the according port via unicast -individually. This is done by copying the packet per host and -changing the multicast destination MAC to a unicast one accordingly. - -multicast-to-unicast works on top of the multicast snooping feature of -the bridge. Which means unicast copies are only delivered to hosts which -are interested in it and signalized this via IGMP/MLD reports -previously. - -This feature is intended for interface types which have a more reliable -and/or efficient way to deliver unicast packets than broadcast ones -(e.g. wifi). - -However, it should only be enabled on interfaces where no IGMPv2/MLDv1 -report suppression takes place. This feature is disabled by default. - -The initial patch and idea is from Felix Fietkau. - -Signed-off-by: Felix Fietkau -[linus.luessing@c0d3.blue: various bug + style fixes, commit message] -Signed-off-by: Linus Lüssing ---- - ---- a/include/linux/if_bridge.h -+++ b/include/linux/if_bridge.h -@@ -46,6 +46,7 @@ struct br_ip_list { - #define BR_LEARNING_SYNC BIT(9) - #define BR_PROXYARP_WIFI BIT(10) - #define BR_MCAST_FLOOD BIT(11) -+#define BR_MULTICAST_TO_UNICAST BIT(12) - - #define BR_DEFAULT_AGEING_TIME (300 * HZ) - ---- a/include/uapi/linux/if_link.h -+++ b/include/uapi/linux/if_link.h -@@ -319,6 +319,7 @@ enum { - IFLA_BRPORT_MULTICAST_ROUTER, - IFLA_BRPORT_PAD, - IFLA_BRPORT_MCAST_FLOOD, -+ IFLA_BRPORT_MCAST_TO_UCAST, - __IFLA_BRPORT_MAX - }; - #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) ---- a/net/bridge/br_forward.c -+++ b/net/bridge/br_forward.c -@@ -173,6 +173,29 @@ out: - return p; - } - -+static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, -+ const unsigned char *addr, bool local_orig) -+{ -+ struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev; -+ const unsigned char *src = eth_hdr(skb)->h_source; -+ -+ if (!should_deliver(p, skb)) -+ return; -+ -+ /* Even with hairpin, no soliloquies - prevent breaking IPv6 DAD */ -+ if (skb->dev == p->dev && ether_addr_equal(src, addr)) -+ return; -+ -+ skb = skb_copy(skb, GFP_ATOMIC); -+ if (!skb) { -+ dev->stats.tx_dropped++; -+ return; -+ } -+ -+ memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN); -+ __br_forward(p, skb, local_orig); -+} -+ - /* called under rcu_read_lock */ - void br_flood(struct net_bridge *br, struct sk_buff *skb, - enum br_pkt_type pkt_type, bool local_rcv, bool local_orig) -@@ -241,10 +264,20 @@ void br_multicast_flood(struct net_bridg - rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) : - NULL; - -- port = (unsigned long)lport > (unsigned long)rport ? -- lport : rport; -+ if ((unsigned long)lport > (unsigned long)rport) { -+ port = lport; -+ -+ if (p->flags & MDB_PG_FLAGS_MCAST_TO_UCAST) { -+ maybe_deliver_addr(lport, skb, p->eth_addr, -+ local_orig); -+ goto delivered; -+ } -+ } else { -+ port = rport; -+ } - - prev = maybe_deliver(prev, port, skb, local_orig); -+delivered: - if (IS_ERR(prev)) - goto out; - if (prev == port) ---- a/net/bridge/br_mdb.c -+++ b/net/bridge/br_mdb.c -@@ -532,7 +532,7 @@ static int br_mdb_add_group(struct net_b - break; - } - -- p = br_multicast_new_port_group(port, group, *pp, state); -+ p = br_multicast_new_port_group(port, group, *pp, state, NULL); - if (unlikely(!p)) - return -ENOMEM; - rcu_assign_pointer(*pp, p); ---- a/net/bridge/br_multicast.c -+++ b/net/bridge/br_multicast.c -@@ -42,12 +42,14 @@ static void br_multicast_add_router(stru - static void br_ip4_multicast_leave_group(struct net_bridge *br, - struct net_bridge_port *port, - __be32 group, -- __u16 vid); -+ __u16 vid, -+ const unsigned char *src); -+ - #if IS_ENABLED(CONFIG_IPV6) - static void br_ip6_multicast_leave_group(struct net_bridge *br, - struct net_bridge_port *port, - const struct in6_addr *group, -- __u16 vid); -+ __u16 vid, const unsigned char *src); - #endif - unsigned int br_mdb_rehash_seq; - -@@ -658,7 +660,8 @@ struct net_bridge_port_group *br_multica - struct net_bridge_port *port, - struct br_ip *group, - struct net_bridge_port_group __rcu *next, -- unsigned char flags) -+ unsigned char flags, -+ const unsigned char *src) - { - struct net_bridge_port_group *p; - -@@ -673,12 +676,39 @@ struct net_bridge_port_group *br_multica - hlist_add_head(&p->mglist, &port->mglist); - setup_timer(&p->timer, br_multicast_port_group_expired, - (unsigned long)p); -+ -+ if ((port->flags & BR_MULTICAST_TO_UNICAST) && src) { -+ memcpy(p->eth_addr, src, ETH_ALEN); -+ p->flags |= MDB_PG_FLAGS_MCAST_TO_UCAST; -+ } -+ - return p; - } - -+static bool br_port_group_equal(struct net_bridge_port_group *p, -+ struct net_bridge_port *port, -+ const unsigned char *src) -+{ -+ if (p->port != port) -+ return false; -+ -+ if (!(p->flags & MDB_PG_FLAGS_MCAST_TO_UCAST) != -+ !(port->flags & BR_MULTICAST_TO_UNICAST)) -+ return false; -+ -+ if (!(p->flags & MDB_PG_FLAGS_MCAST_TO_UCAST)) -+ return true; -+ -+ if (!src) -+ return false; -+ -+ return ether_addr_equal(src, p->eth_addr); -+} -+ - static int br_multicast_add_group(struct net_bridge *br, - struct net_bridge_port *port, -- struct br_ip *group) -+ struct br_ip *group, -+ const unsigned char *src) - { - struct net_bridge_mdb_entry *mp; - struct net_bridge_port_group *p; -@@ -705,13 +735,13 @@ static int br_multicast_add_group(struct - for (pp = &mp->ports; - (p = mlock_dereference(*pp, br)) != NULL; - pp = &p->next) { -- if (p->port == port) -+ if (br_port_group_equal(p, port, src)) - goto found; - if ((unsigned long)p->port < (unsigned long)port) - break; - } - -- p = br_multicast_new_port_group(port, group, *pp, 0); -+ p = br_multicast_new_port_group(port, group, *pp, 0, src); - if (unlikely(!p)) - goto err; - rcu_assign_pointer(*pp, p); -@@ -730,7 +760,8 @@ err: - static int br_ip4_multicast_add_group(struct net_bridge *br, - struct net_bridge_port *port, - __be32 group, -- __u16 vid) -+ __u16 vid, -+ const unsigned char *src) - { - struct br_ip br_group; - -@@ -741,14 +772,15 @@ static int br_ip4_multicast_add_group(st - br_group.proto = htons(ETH_P_IP); - br_group.vid = vid; - -- return br_multicast_add_group(br, port, &br_group); -+ return br_multicast_add_group(br, port, &br_group, src); - } - - #if IS_ENABLED(CONFIG_IPV6) - static int br_ip6_multicast_add_group(struct net_bridge *br, - struct net_bridge_port *port, - const struct in6_addr *group, -- __u16 vid) -+ __u16 vid, -+ const unsigned char *src) - { - struct br_ip br_group; - -@@ -759,7 +791,7 @@ static int br_ip6_multicast_add_group(st - br_group.proto = htons(ETH_P_IPV6); - br_group.vid = vid; - -- return br_multicast_add_group(br, port, &br_group); -+ return br_multicast_add_group(br, port, &br_group, src); - } - #endif - -@@ -1028,6 +1060,7 @@ static int br_ip4_multicast_igmp3_report - struct sk_buff *skb, - u16 vid) - { -+ const unsigned char *src; - struct igmpv3_report *ih; - struct igmpv3_grec *grec; - int i; -@@ -1070,12 +1103,14 @@ static int br_ip4_multicast_igmp3_report - continue; - } - -+ src = eth_hdr(skb)->h_source; - if ((type == IGMPV3_CHANGE_TO_INCLUDE || - type == IGMPV3_MODE_IS_INCLUDE) && - nsrcs == 0) { -- br_ip4_multicast_leave_group(br, port, group, vid); -+ br_ip4_multicast_leave_group(br, port, group, vid, src); - } else { -- err = br_ip4_multicast_add_group(br, port, group, vid); -+ err = br_ip4_multicast_add_group(br, port, group, vid, -+ src); - if (err) - break; - } -@@ -1090,6 +1125,7 @@ static int br_ip6_multicast_mld2_report( - struct sk_buff *skb, - u16 vid) - { -+ const unsigned char *src = eth_hdr(skb)->h_source; - struct icmp6hdr *icmp6h; - struct mld2_grec *grec; - int i; -@@ -1144,10 +1180,11 @@ static int br_ip6_multicast_mld2_report( - grec->grec_type == MLD2_MODE_IS_INCLUDE) && - nsrcs == 0) { - br_ip6_multicast_leave_group(br, port, &grec->grec_mca, -- vid); -+ vid, src); - } else { - err = br_ip6_multicast_add_group(br, port, -- &grec->grec_mca, vid); -+ &grec->grec_mca, vid, -+ src); - if (err) - break; - } -@@ -1462,7 +1499,8 @@ br_multicast_leave_group(struct net_brid - struct net_bridge_port *port, - struct br_ip *group, - struct bridge_mcast_other_query *other_query, -- struct bridge_mcast_own_query *own_query) -+ struct bridge_mcast_own_query *own_query, -+ const unsigned char *src) - { - struct net_bridge_mdb_htable *mdb; - struct net_bridge_mdb_entry *mp; -@@ -1486,7 +1524,7 @@ br_multicast_leave_group(struct net_brid - for (pp = &mp->ports; - (p = mlock_dereference(*pp, br)) != NULL; - pp = &p->next) { -- if (p->port != port) -+ if (!br_port_group_equal(p, port, src)) - continue; - - if (p->flags & MDB_PG_FLAGS_PERMANENT) -@@ -1520,7 +1558,7 @@ br_multicast_leave_group(struct net_brid - for (p = mlock_dereference(mp->ports, br); - p != NULL; - p = mlock_dereference(p->next, br)) { -- if (p->port != port) -+ if (!br_port_group_equal(p, port, src)) - continue; - - if (!hlist_unhashed(&p->mglist) && -@@ -1571,7 +1609,8 @@ out: - static void br_ip4_multicast_leave_group(struct net_bridge *br, - struct net_bridge_port *port, - __be32 group, -- __u16 vid) -+ __u16 vid, -+ const unsigned char *src) - { - struct br_ip br_group; - struct bridge_mcast_own_query *own_query; -@@ -1586,14 +1625,15 @@ static void br_ip4_multicast_leave_group - br_group.vid = vid; - - br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query, -- own_query); -+ own_query, src); - } - - #if IS_ENABLED(CONFIG_IPV6) - static void br_ip6_multicast_leave_group(struct net_bridge *br, - struct net_bridge_port *port, - const struct in6_addr *group, -- __u16 vid) -+ __u16 vid, -+ const unsigned char *src) - { - struct br_ip br_group; - struct bridge_mcast_own_query *own_query; -@@ -1608,7 +1648,7 @@ static void br_ip6_multicast_leave_group - br_group.vid = vid; - - br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query, -- own_query); -+ own_query, src); - } - #endif - -@@ -1651,6 +1691,7 @@ static int br_multicast_ipv4_rcv(struct - u16 vid) - { - struct sk_buff *skb_trimmed = NULL; -+ const unsigned char *src; - struct igmphdr *ih; - int err; - -@@ -1666,13 +1707,14 @@ static int br_multicast_ipv4_rcv(struct - } - - ih = igmp_hdr(skb); -+ src = eth_hdr(skb)->h_source; - BR_INPUT_SKB_CB(skb)->igmp = ih->type; - - switch (ih->type) { - case IGMP_HOST_MEMBERSHIP_REPORT: - case IGMPV2_HOST_MEMBERSHIP_REPORT: - BR_INPUT_SKB_CB(skb)->mrouters_only = 1; -- err = br_ip4_multicast_add_group(br, port, ih->group, vid); -+ err = br_ip4_multicast_add_group(br, port, ih->group, vid, src); - break; - case IGMPV3_HOST_MEMBERSHIP_REPORT: - err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid); -@@ -1681,7 +1723,7 @@ static int br_multicast_ipv4_rcv(struct - err = br_ip4_multicast_query(br, port, skb_trimmed, vid); - break; - case IGMP_HOST_LEAVE_MESSAGE: -- br_ip4_multicast_leave_group(br, port, ih->group, vid); -+ br_ip4_multicast_leave_group(br, port, ih->group, vid, src); - break; - } - -@@ -1701,6 +1743,7 @@ static int br_multicast_ipv6_rcv(struct - u16 vid) - { - struct sk_buff *skb_trimmed = NULL; -+ const unsigned char *src; - struct mld_msg *mld; - int err; - -@@ -1720,8 +1763,10 @@ static int br_multicast_ipv6_rcv(struct - - switch (mld->mld_type) { - case ICMPV6_MGM_REPORT: -+ src = eth_hdr(skb)->h_source; - BR_INPUT_SKB_CB(skb)->mrouters_only = 1; -- err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid); -+ err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid, -+ src); - break; - case ICMPV6_MLD2_REPORT: - err = br_ip6_multicast_mld2_report(br, port, skb_trimmed, vid); -@@ -1730,7 +1775,8 @@ static int br_multicast_ipv6_rcv(struct - err = br_ip6_multicast_query(br, port, skb_trimmed, vid); - break; - case ICMPV6_MGM_REDUCTION: -- br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid); -+ src = eth_hdr(skb)->h_source; -+ br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src); - break; - } - ---- a/net/bridge/br_netlink.c -+++ b/net/bridge/br_netlink.c -@@ -123,6 +123,7 @@ static inline size_t br_port_info_size(v - + nla_total_size(1) /* IFLA_BRPORT_GUARD */ - + nla_total_size(1) /* IFLA_BRPORT_PROTECT */ - + nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */ -+ + nla_total_size(1) /* IFLA_BRPORT_MCAST_TO_UCAST */ - + nla_total_size(1) /* IFLA_BRPORT_LEARNING */ - + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */ - + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */ -@@ -173,6 +174,8 @@ static int br_port_fill_attrs(struct sk_ - !!(p->flags & BR_ROOT_BLOCK)) || - nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE, - !!(p->flags & BR_MULTICAST_FAST_LEAVE)) || -+ nla_put_u8(skb, IFLA_BRPORT_MCAST_TO_UCAST, -+ !!(p->flags & BR_MULTICAST_TO_UNICAST)) || - nla_put_u8(skb, IFLA_BRPORT_LEARNING, !!(p->flags & BR_LEARNING)) || - nla_put_u8(skb, IFLA_BRPORT_UNICAST_FLOOD, - !!(p->flags & BR_FLOOD)) || -@@ -586,6 +589,7 @@ static const struct nla_policy br_port_p - [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 }, - [IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 }, - [IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 }, -+ [IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 }, - }; - - /* Change the state of the port and notify spanning tree */ -@@ -636,6 +640,7 @@ static int br_setport(struct net_bridge_ - br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING); - br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD); - br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD); -+ br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST); - br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP); - br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI); - ---- a/net/bridge/br_private.h -+++ b/net/bridge/br_private.h -@@ -166,8 +166,9 @@ struct net_bridge_fdb_entry - struct rcu_head rcu; - }; - --#define MDB_PG_FLAGS_PERMANENT BIT(0) --#define MDB_PG_FLAGS_OFFLOAD BIT(1) -+#define MDB_PG_FLAGS_PERMANENT BIT(0) -+#define MDB_PG_FLAGS_OFFLOAD BIT(1) -+#define MDB_PG_FLAGS_MCAST_TO_UCAST BIT(2) - - struct net_bridge_port_group { - struct net_bridge_port *port; -@@ -177,6 +178,7 @@ struct net_bridge_port_group { - struct timer_list timer; - struct br_ip addr; - unsigned char flags; -+ unsigned char eth_addr[ETH_ALEN]; - }; - - struct net_bridge_mdb_entry -@@ -591,7 +593,7 @@ void br_multicast_free_pg(struct rcu_hea - struct net_bridge_port_group * - br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group, - struct net_bridge_port_group __rcu *next, -- unsigned char flags); -+ unsigned char flags, const unsigned char *src); - void br_mdb_init(void); - void br_mdb_uninit(void); - void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port, ---- a/net/bridge/br_sysfs_if.c -+++ b/net/bridge/br_sysfs_if.c -@@ -188,6 +188,7 @@ static BRPORT_ATTR(multicast_router, S_I - store_multicast_router); - - BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE); -+BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UNICAST); - #endif - - static const struct brport_attribute *brport_attrs[] = { -@@ -214,6 +215,7 @@ static const struct brport_attribute *br - #ifdef CONFIG_BRIDGE_IGMP_SNOOPING - &brport_attr_multicast_router, - &brport_attr_multicast_fast_leave, -+ &brport_attr_multicast_to_unicast, - #endif - &brport_attr_proxyarp, - &brport_attr_proxyarp_wifi, diff --git a/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch b/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch deleted file mode 100644 index c5d65b7105..0000000000 --- a/target/linux/generic/backport-4.9/022-net-add-devm-version-of-alloc_etherdev_mqs-function.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Sat, 28 Jan 2017 15:15:42 +0100 -Subject: [PATCH] net: add devm version of alloc_etherdev_mqs function -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev -macro. These can be used for simpler netdev allocation without having to -care about calling free_netdev. - -Thanks to this change drivers, their error paths and removal paths may -get simpler by a bit. - -Signed-off-by: Rafał Miłecki -Signed-off-by: David S. Miller ---- - ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -54,6 +54,11 @@ struct net_device *alloc_etherdev_mqs(in - #define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1) - #define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count) - -+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv, -+ unsigned int txqs, -+ unsigned int rxqs); -+#define devm_alloc_etherdev(dev, sizeof_priv) devm_alloc_etherdev_mqs(dev, sizeof_priv, 1, 1) -+ - struct sk_buff **eth_gro_receive(struct sk_buff **head, - struct sk_buff *skb); - int eth_gro_complete(struct sk_buff *skb, int nhoff); ---- a/net/ethernet/eth.c -+++ b/net/ethernet/eth.c -@@ -391,6 +391,34 @@ struct net_device *alloc_etherdev_mqs(in - } - EXPORT_SYMBOL(alloc_etherdev_mqs); - -+static void devm_free_netdev(struct device *dev, void *res) -+{ -+ free_netdev(*(struct net_device **)res); -+} -+ -+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv, -+ unsigned int txqs, unsigned int rxqs) -+{ -+ struct net_device **dr; -+ struct net_device *netdev; -+ -+ dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL); -+ if (!dr) -+ return NULL; -+ -+ netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs); -+ if (!netdev) { -+ devres_free(dr); -+ return NULL; -+ } -+ -+ *dr = netdev; -+ devres_add(dev, dr); -+ -+ return netdev; -+} -+EXPORT_SYMBOL(devm_alloc_etherdev_mqs); -+ - ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len) - { - return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr); diff --git a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch b/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch deleted file mode 100644 index 853b7d6cc0..0000000000 --- a/target/linux/generic/backport-4.9/024-1-tcp-tsq-add-tsq_flags-tsq_enum.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 40fc3423b983b864bf70b03199191260ae9b2ea6 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:50 -0800 -Subject: [PATCH 01/10] tcp: tsq: add tsq_flags / tsq_enum - -This is a cleanup, to ease code review of following patches. - -Old 'enum tsq_flags' is renamed, and a new enumeration is added -with the flags used in cmpxchg() operations as opposed to -single bit operations. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - include/linux/tcp.h | 11 ++++++++++- - net/ipv4/tcp_output.c | 16 ++++++++-------- - 2 files changed, 18 insertions(+), 9 deletions(-) - ---- a/include/linux/tcp.h -+++ b/include/linux/tcp.h -@@ -368,7 +368,7 @@ struct tcp_sock { - u32 *saved_syn; - }; - --enum tsq_flags { -+enum tsq_enum { - TSQ_THROTTLED, - TSQ_QUEUED, - TCP_TSQ_DEFERRED, /* tcp_tasklet_func() found socket was owned */ -@@ -379,6 +379,15 @@ enum tsq_flags { - */ - }; - -+enum tsq_flags { -+ TSQF_THROTTLED = (1UL << TSQ_THROTTLED), -+ TSQF_QUEUED = (1UL << TSQ_QUEUED), -+ TCPF_TSQ_DEFERRED = (1UL << TCP_TSQ_DEFERRED), -+ TCPF_WRITE_TIMER_DEFERRED = (1UL << TCP_WRITE_TIMER_DEFERRED), -+ TCPF_DELACK_TIMER_DEFERRED = (1UL << TCP_DELACK_TIMER_DEFERRED), -+ TCPF_MTU_REDUCED_DEFERRED = (1UL << TCP_MTU_REDUCED_DEFERRED), -+}; -+ - static inline struct tcp_sock *tcp_sk(const struct sock *sk) - { - return (struct tcp_sock *)sk; ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -790,10 +790,10 @@ static void tcp_tasklet_func(unsigned lo - } - } - --#define TCP_DEFERRED_ALL ((1UL << TCP_TSQ_DEFERRED) | \ -- (1UL << TCP_WRITE_TIMER_DEFERRED) | \ -- (1UL << TCP_DELACK_TIMER_DEFERRED) | \ -- (1UL << TCP_MTU_REDUCED_DEFERRED)) -+#define TCP_DEFERRED_ALL (TCPF_TSQ_DEFERRED | \ -+ TCPF_WRITE_TIMER_DEFERRED | \ -+ TCPF_DELACK_TIMER_DEFERRED | \ -+ TCPF_MTU_REDUCED_DEFERRED) - /** - * tcp_release_cb - tcp release_sock() callback - * @sk: socket -@@ -814,7 +814,7 @@ void tcp_release_cb(struct sock *sk) - nflags = flags & ~TCP_DEFERRED_ALL; - } while (cmpxchg(&tp->tsq_flags, flags, nflags) != flags); - -- if (flags & (1UL << TCP_TSQ_DEFERRED)) -+ if (flags & TCPF_TSQ_DEFERRED) - tcp_tsq_handler(sk); - - /* Here begins the tricky part : -@@ -828,15 +828,15 @@ void tcp_release_cb(struct sock *sk) - */ - sock_release_ownership(sk); - -- if (flags & (1UL << TCP_WRITE_TIMER_DEFERRED)) { -+ if (flags & TCPF_WRITE_TIMER_DEFERRED) { - tcp_write_timer_handler(sk); - __sock_put(sk); - } -- if (flags & (1UL << TCP_DELACK_TIMER_DEFERRED)) { -+ if (flags & TCPF_DELACK_TIMER_DEFERRED) { - tcp_delack_timer_handler(sk); - __sock_put(sk); - } -- if (flags & (1UL << TCP_MTU_REDUCED_DEFERRED)) { -+ if (flags & TCPF_MTU_REDUCED_DEFERRED) { - inet_csk(sk)->icsk_af_ops->mtu_reduced(sk); - __sock_put(sk); - } diff --git a/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch b/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch deleted file mode 100644 index dfd9abf943..0000000000 --- a/target/linux/generic/backport-4.9/024-2-tcp-tsq-remove-one-locked-operation-in-tcp_wfree.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 408f0a6c21e124cc4f6c7aa370b38aa47e55428d Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:51 -0800 -Subject: [PATCH 02/10] tcp: tsq: remove one locked operation in tcp_wfree() - -Instead of atomically clear TSQ_THROTTLED and atomically set TSQ_QUEUED -bits, use one cmpxchg() to perform a single locked operation. - -Since the following patch will also set TCP_TSQ_DEFERRED here, -this cmpxchg() will make this addition free. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/ipv4/tcp_output.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -866,6 +866,7 @@ void tcp_wfree(struct sk_buff *skb) - { - struct sock *sk = skb->sk; - struct tcp_sock *tp = tcp_sk(sk); -+ unsigned long flags, nval, oval; - int wmem; - - /* Keep one reference on sk_wmem_alloc. -@@ -883,11 +884,17 @@ void tcp_wfree(struct sk_buff *skb) - if (wmem >= SKB_TRUESIZE(1) && this_cpu_ksoftirqd() == current) - goto out; - -- if (test_and_clear_bit(TSQ_THROTTLED, &tp->tsq_flags) && -- !test_and_set_bit(TSQ_QUEUED, &tp->tsq_flags)) { -- unsigned long flags; -+ for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) { - struct tsq_tasklet *tsq; - -+ if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED)) -+ goto out; -+ -+ nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED; -+ nval = cmpxchg(&tp->tsq_flags, oval, nval); -+ if (nval != oval) -+ continue; -+ - /* queue this socket to tasklet queue */ - local_irq_save(flags); - tsq = this_cpu_ptr(&tsq_tasklet); diff --git a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch deleted file mode 100644 index 90979c48b8..0000000000 --- a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b223feb9de2a65c533ff95c08e834fa732906ea5 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:52 -0800 -Subject: [PATCH 03/10] tcp: tsq: add shortcut in tcp_tasklet_func() - -Under high stress, I've seen tcp_tasklet_func() consuming -~700 usec, handling ~150 tcp sockets. - -By setting TCP_TSQ_DEFERRED in tcp_wfree(), we give a chance -for other cpus/threads entering tcp_write_xmit() to grab it, -allowing tcp_tasklet_func() to skip sockets that already did -an xmit cycle. - -In the future, we might give to ACK processing an increased -budget to reduce even more tcp_tasklet_func() amount of work. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/ipv4/tcp_output.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -773,19 +773,19 @@ static void tcp_tasklet_func(unsigned lo - list_for_each_safe(q, n, &list) { - tp = list_entry(q, struct tcp_sock, tsq_node); - list_del(&tp->tsq_node); -+ clear_bit(TSQ_QUEUED, &tp->tsq_flags); - - sk = (struct sock *)tp; -- bh_lock_sock(sk); -- -- if (!sock_owned_by_user(sk)) { -- tcp_tsq_handler(sk); -- } else { -- /* defer the work to tcp_release_cb() */ -- set_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags); -+ if (!sk->sk_lock.owned && -+ test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags)) { -+ bh_lock_sock(sk); -+ if (!sock_owned_by_user(sk)) { -+ clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags); -+ tcp_tsq_handler(sk); -+ } -+ bh_unlock_sock(sk); - } -- bh_unlock_sock(sk); - -- clear_bit(TSQ_QUEUED, &tp->tsq_flags); - sk_free(sk); - } - } -@@ -890,7 +890,7 @@ void tcp_wfree(struct sk_buff *skb) - if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED)) - goto out; - -- nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED; -+ nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED | TCPF_TSQ_DEFERRED; - nval = cmpxchg(&tp->tsq_flags, oval, nval); - if (nval != oval) - continue; -@@ -2237,6 +2237,8 @@ static bool tcp_write_xmit(struct sock * - unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) - break; - -+ if (test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags)) -+ clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags); - if (tcp_small_queue_check(sk, skb, 0)) - break; - diff --git a/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch b/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch deleted file mode 100644 index 2b5ef932de..0000000000 --- a/target/linux/generic/backport-4.9/024-4-tcp-tsq-avoid-one-atomic-in-tcp_wfree.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a9b204d1564702b704ad6fe74f10a102c7b87ba3 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:53 -0800 -Subject: [PATCH 04/10] tcp: tsq: avoid one atomic in tcp_wfree() - -Under high load, tcp_wfree() has an atomic operation trying -to schedule a tasklet over and over. - -We can schedule it only if our per cpu list was empty. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/ipv4/tcp_output.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -886,6 +886,7 @@ void tcp_wfree(struct sk_buff *skb) - - for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) { - struct tsq_tasklet *tsq; -+ bool empty; - - if (!(oval & TSQF_THROTTLED) || (oval & TSQF_QUEUED)) - goto out; -@@ -898,8 +899,10 @@ void tcp_wfree(struct sk_buff *skb) - /* queue this socket to tasklet queue */ - local_irq_save(flags); - tsq = this_cpu_ptr(&tsq_tasklet); -+ empty = list_empty(&tsq->head); - list_add(&tp->tsq_node, &tsq->head); -- tasklet_schedule(&tsq->tasklet); -+ if (empty) -+ tasklet_schedule(&tsq->tasklet); - local_irq_restore(flags); - return; - } diff --git a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch deleted file mode 100644 index 0156efa65e..0000000000 --- a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 75eefc6c59fd2c5f1ab95a3a113c217237d12a31 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:54 -0800 -Subject: [PATCH 05/10] tcp: tsq: add a shortcut in tcp_small_queue_check() - -Always allow the two first skbs in write queue to be sent, -regardless of sk_wmem_alloc/sk_pacing_rate values. - -This helps a lot in situations where TX completions are delayed either -because of driver latencies or softirq latencies. - -Test is done with no cache line misses. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/ipv4/tcp_output.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -2142,6 +2142,15 @@ static bool tcp_small_queue_check(struct - limit <<= factor; - - if (atomic_read(&sk->sk_wmem_alloc) > limit) { -+ /* Always send the 1st or 2nd skb in write queue. -+ * No need to wait for TX completion to call us back, -+ * after softirq/tasklet schedule. -+ * This helps when TX completions are delayed too much. -+ */ -+ if (skb == sk->sk_write_queue.next || -+ skb->prev == sk->sk_write_queue.next) -+ return false; -+ - set_bit(TSQ_THROTTLED, &tcp_sk(sk)->tsq_flags); - /* It is possible TX completion already happened - * before we set TSQ_THROTTLED, so we must diff --git a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch deleted file mode 100644 index 5669b897e7..0000000000 --- a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 12a59abc22d6664f7d3944f625ceefee92de8820 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:55 -0800 -Subject: [PATCH 06/10] tcp: tcp_mtu_probe() is likely to exit early - -Adding a likely() in tcp_mtu_probe() moves its code which used to -be inlined in front of tcp_write_xmit() - -We still have a cache line miss to access icsk->icsk_mtup.enabled, -we will probably have to reorganize fields to help data locality. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - net/ipv4/tcp_output.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -1974,26 +1974,26 @@ static bool tcp_can_coalesce_send_queue_ - */ - static int tcp_mtu_probe(struct sock *sk) - { -- struct tcp_sock *tp = tcp_sk(sk); - struct inet_connection_sock *icsk = inet_csk(sk); -+ struct tcp_sock *tp = tcp_sk(sk); - struct sk_buff *skb, *nskb, *next; - struct net *net = sock_net(sk); -- int len; - int probe_size; - int size_needed; -- int copy; -+ int copy, len; - int mss_now; - int interval; - - /* Not currently probing/verifying, - * not in recovery, - * have enough cwnd, and -- * not SACKing (the variable headers throw things off) */ -- if (!icsk->icsk_mtup.enabled || -- icsk->icsk_mtup.probe_size || -- inet_csk(sk)->icsk_ca_state != TCP_CA_Open || -- tp->snd_cwnd < 11 || -- tp->rx_opt.num_sacks || tp->rx_opt.dsack) -+ * not SACKing (the variable headers throw things off) -+ */ -+ if (likely(!icsk->icsk_mtup.enabled || -+ icsk->icsk_mtup.probe_size || -+ inet_csk(sk)->icsk_ca_state != TCP_CA_Open || -+ tp->snd_cwnd < 11 || -+ tp->rx_opt.num_sacks || tp->rx_opt.dsack)) - return -1; - - /* Use binary search for probe_size between tcp_mss_base, diff --git a/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch b/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch deleted file mode 100644 index a43b4037fe..0000000000 --- a/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 9115e8cd2a0c6eaaa900c462721f12e1d45f326c Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:56 -0800 -Subject: [PATCH 07/10] net: reorganize struct sock for better data locality - -Group fields used in TX path, and keep some cache lines mostly read -to permit sharing among cpus. - -Gained two 4 bytes holes on 64bit arches. - -Added a place holder for tcp tsq_flags, next to sk_wmem_alloc -to speed up tcp_wfree() in the following patch. - -I have not added ____cacheline_aligned_in_smp, this might be done later. -I prefer doing this once inet and tcp/udp sockets reorg is also done. - -Tested with both TCP and UDP. - -UDP receiver performance under flood increased by ~20 % : -Accessing sk_filter/sk_wq/sk_napi_id no longer stalls because sk_drops -was moved away from a critical cache line, now mostly read and shared. - - /* --- cacheline 4 boundary (256 bytes) --- */ - unsigned int sk_napi_id; /* 0x100 0x4 */ - int sk_rcvbuf; /* 0x104 0x4 */ - struct sk_filter * sk_filter; /* 0x108 0x8 */ - union { - struct socket_wq * sk_wq; /* 0x8 */ - struct socket_wq * sk_wq_raw; /* 0x8 */ - }; /* 0x110 0x8 */ - struct xfrm_policy * sk_policy[2]; /* 0x118 0x10 */ - struct dst_entry * sk_rx_dst; /* 0x128 0x8 */ - struct dst_entry * sk_dst_cache; /* 0x130 0x8 */ - atomic_t sk_omem_alloc; /* 0x138 0x4 */ - int sk_sndbuf; /* 0x13c 0x4 */ - /* --- cacheline 5 boundary (320 bytes) --- */ - int sk_wmem_queued; /* 0x140 0x4 */ - atomic_t sk_wmem_alloc; /* 0x144 0x4 */ - long unsigned int sk_tsq_flags; /* 0x148 0x8 */ - struct sk_buff * sk_send_head; /* 0x150 0x8 */ - struct sk_buff_head sk_write_queue; /* 0x158 0x18 */ - __s32 sk_peek_off; /* 0x170 0x4 */ - int sk_write_pending; /* 0x174 0x4 */ - long int sk_sndtimeo; /* 0x178 0x8 */ - -Signed-off-by: Eric Dumazet -Tested-by: Paolo Abeni -Signed-off-by: David S. Miller ---- - include/net/sock.h | 51 +++++++++++++++++++++++++++------------------------ - 1 file changed, 27 insertions(+), 24 deletions(-) - ---- a/include/net/sock.h -+++ b/include/net/sock.h -@@ -344,6 +344,9 @@ struct sock { - #define sk_rxhash __sk_common.skc_rxhash - - socket_lock_t sk_lock; -+ atomic_t sk_drops; -+ int sk_rcvlowat; -+ struct sk_buff_head sk_error_queue; - struct sk_buff_head sk_receive_queue; - /* - * The backlog queue is special, it is always used with -@@ -360,14 +363,13 @@ struct sock { - struct sk_buff *tail; - } sk_backlog; - #define sk_rmem_alloc sk_backlog.rmem_alloc -- int sk_forward_alloc; - -- __u32 sk_txhash; -+ int sk_forward_alloc; - #ifdef CONFIG_NET_RX_BUSY_POLL -- unsigned int sk_napi_id; - unsigned int sk_ll_usec; -+ /* ===== mostly read cache line ===== */ -+ unsigned int sk_napi_id; - #endif -- atomic_t sk_drops; - int sk_rcvbuf; - - struct sk_filter __rcu *sk_filter; -@@ -380,11 +382,30 @@ struct sock { - #endif - struct dst_entry *sk_rx_dst; - struct dst_entry __rcu *sk_dst_cache; -- /* Note: 32bit hole on 64bit arches */ -- atomic_t sk_wmem_alloc; - atomic_t sk_omem_alloc; - int sk_sndbuf; -+ -+ /* ===== cache line for TX ===== */ -+ int sk_wmem_queued; -+ atomic_t sk_wmem_alloc; -+ unsigned long sk_tsq_flags; -+ struct sk_buff *sk_send_head; - struct sk_buff_head sk_write_queue; -+ __s32 sk_peek_off; -+ int sk_write_pending; -+ long sk_sndtimeo; -+ struct timer_list sk_timer; -+ __u32 sk_priority; -+ __u32 sk_mark; -+ u32 sk_pacing_rate; /* bytes per second */ -+ u32 sk_max_pacing_rate; -+ struct page_frag sk_frag; -+ netdev_features_t sk_route_caps; -+ netdev_features_t sk_route_nocaps; -+ int sk_gso_type; -+ unsigned int sk_gso_max_size; -+ gfp_t sk_allocation; -+ __u32 sk_txhash; - - /* - * Because of non atomicity rules, all -@@ -400,31 +421,17 @@ struct sock { - #define SK_PROTOCOL_MAX U8_MAX - kmemcheck_bitfield_end(flags); - -- int sk_wmem_queued; -- gfp_t sk_allocation; -- u32 sk_pacing_rate; /* bytes per second */ -- u32 sk_max_pacing_rate; -- netdev_features_t sk_route_caps; -- netdev_features_t sk_route_nocaps; -- int sk_gso_type; -- unsigned int sk_gso_max_size; - u16 sk_gso_max_segs; -- int sk_rcvlowat; - unsigned long sk_lingertime; -- struct sk_buff_head sk_error_queue; - struct proto *sk_prot_creator; - rwlock_t sk_callback_lock; - int sk_err, - sk_err_soft; - u32 sk_ack_backlog; - u32 sk_max_ack_backlog; -- __u32 sk_priority; -- __u32 sk_mark; - struct pid *sk_peer_pid; - const struct cred *sk_peer_cred; - long sk_rcvtimeo; -- long sk_sndtimeo; -- struct timer_list sk_timer; - ktime_t sk_stamp; - #if BITS_PER_LONG==32 - seqlock_t sk_stamp_seq; -@@ -434,10 +441,6 @@ struct sock { - u32 sk_tskey; - struct socket *sk_socket; - void *sk_user_data; -- struct page_frag sk_frag; -- struct sk_buff *sk_send_head; -- __s32 sk_peek_off; -- int sk_write_pending; - #ifdef CONFIG_SECURITY - void *sk_security; - #endif diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch deleted file mode 100644 index 4ac95d3ee4..0000000000 --- a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 7aa5470c2c09265902b5e4289afa82e4e7c2987e Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Sat, 3 Dec 2016 11:14:57 -0800 -Subject: [PATCH 08/10] tcp: tsq: move tsq_flags close to sk_wmem_alloc - -tsq_flags being in the same cache line than sk_wmem_alloc -makes a lot of sense. Both fields are changed from tcp_wfree() -and more generally by various TSQ related functions. - -Prior patch made room in struct sock and added sk_tsq_flags, -this patch deletes tsq_flags from struct tcp_sock. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - include/linux/tcp.h | 1 - - net/ipv4/tcp.c | 4 ++-- - net/ipv4/tcp_ipv4.c | 2 +- - net/ipv4/tcp_output.c | 24 +++++++++++------------- - net/ipv4/tcp_timer.c | 4 ++-- - net/ipv6/tcp_ipv6.c | 2 +- - 6 files changed, 17 insertions(+), 20 deletions(-) - ---- a/include/linux/tcp.h -+++ b/include/linux/tcp.h -@@ -192,7 +192,6 @@ struct tcp_sock { - u32 tsoffset; /* timestamp offset */ - - struct list_head tsq_node; /* anchor in tsq_tasklet.head list */ -- unsigned long tsq_flags; - - /* Data for direct copy to user */ - struct { ---- a/net/ipv4/tcp.c -+++ b/net/ipv4/tcp.c -@@ -665,9 +665,9 @@ static void tcp_push(struct sock *sk, in - if (tcp_should_autocork(sk, skb, size_goal)) { - - /* avoid atomic op if TSQ_THROTTLED bit is already set */ -- if (!test_bit(TSQ_THROTTLED, &tp->tsq_flags)) { -+ if (!test_bit(TSQ_THROTTLED, &sk->sk_tsq_flags)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAUTOCORKING); -- set_bit(TSQ_THROTTLED, &tp->tsq_flags); -+ set_bit(TSQ_THROTTLED, &sk->sk_tsq_flags); - } - /* It is possible TX completion already happened - * before we set TSQ_THROTTLED. ---- a/net/ipv4/tcp_ipv4.c -+++ b/net/ipv4/tcp_ipv4.c -@@ -446,7 +446,7 @@ void tcp_v4_err(struct sk_buff *icmp_skb - if (!sock_owned_by_user(sk)) { - tcp_v4_mtu_reduced(sk); - } else { -- if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags)) -+ if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, &sk->sk_tsq_flags)) - sock_hold(sk); - } - goto out; ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -773,14 +773,15 @@ static void tcp_tasklet_func(unsigned lo - list_for_each_safe(q, n, &list) { - tp = list_entry(q, struct tcp_sock, tsq_node); - list_del(&tp->tsq_node); -- clear_bit(TSQ_QUEUED, &tp->tsq_flags); - - sk = (struct sock *)tp; -+ clear_bit(TSQ_QUEUED, &sk->sk_tsq_flags); -+ - if (!sk->sk_lock.owned && -- test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags)) { -+ test_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags)) { - bh_lock_sock(sk); - if (!sock_owned_by_user(sk)) { -- clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags); -+ clear_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags); - tcp_tsq_handler(sk); - } - bh_unlock_sock(sk); -@@ -803,16 +804,15 @@ static void tcp_tasklet_func(unsigned lo - */ - void tcp_release_cb(struct sock *sk) - { -- struct tcp_sock *tp = tcp_sk(sk); - unsigned long flags, nflags; - - /* perform an atomic operation only if at least one flag is set */ - do { -- flags = tp->tsq_flags; -+ flags = sk->sk_tsq_flags; - if (!(flags & TCP_DEFERRED_ALL)) - return; - nflags = flags & ~TCP_DEFERRED_ALL; -- } while (cmpxchg(&tp->tsq_flags, flags, nflags) != flags); -+ } while (cmpxchg(&sk->sk_tsq_flags, flags, nflags) != flags); - - if (flags & TCPF_TSQ_DEFERRED) - tcp_tsq_handler(sk); -@@ -884,7 +884,7 @@ void tcp_wfree(struct sk_buff *skb) - if (wmem >= SKB_TRUESIZE(1) && this_cpu_ksoftirqd() == current) - goto out; - -- for (oval = READ_ONCE(tp->tsq_flags);; oval = nval) { -+ for (oval = READ_ONCE(sk->sk_tsq_flags);; oval = nval) { - struct tsq_tasklet *tsq; - bool empty; - -@@ -892,7 +892,7 @@ void tcp_wfree(struct sk_buff *skb) - goto out; - - nval = (oval & ~TSQF_THROTTLED) | TSQF_QUEUED | TCPF_TSQ_DEFERRED; -- nval = cmpxchg(&tp->tsq_flags, oval, nval); -+ nval = cmpxchg(&sk->sk_tsq_flags, oval, nval); - if (nval != oval) - continue; - -@@ -2151,7 +2151,7 @@ static bool tcp_small_queue_check(struct - skb->prev == sk->sk_write_queue.next) - return false; - -- set_bit(TSQ_THROTTLED, &tcp_sk(sk)->tsq_flags); -+ set_bit(TSQ_THROTTLED, &sk->sk_tsq_flags); - /* It is possible TX completion already happened - * before we set TSQ_THROTTLED, so we must - * test again the condition. -@@ -2249,8 +2249,8 @@ static bool tcp_write_xmit(struct sock * - unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) - break; - -- if (test_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags)) -- clear_bit(TCP_TSQ_DEFERRED, &tp->tsq_flags); -+ if (test_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags)) -+ clear_bit(TCP_TSQ_DEFERRED, &sk->sk_tsq_flags); - if (tcp_small_queue_check(sk, skb, 0)) - break; - -@@ -3569,8 +3569,6 @@ void __tcp_send_ack(struct sock *sk, u32 - /* We do not want pure acks influencing TCP Small Queues or fq/pacing - * too much. - * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 -- * We also avoid tcp_wfree() overhead (cache line miss accessing -- * tp->tsq_flags) by using regular sock_wfree() - */ - skb_set_tcp_pure_ack(buff); - ---- a/net/ipv4/tcp_timer.c -+++ b/net/ipv4/tcp_timer.c -@@ -327,7 +327,7 @@ static void tcp_delack_timer(unsigned lo - inet_csk(sk)->icsk_ack.blocked = 1; - __NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED); - /* deleguate our work to tcp_release_cb() */ -- if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags)) -+ if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, &sk->sk_tsq_flags)) - sock_hold(sk); - } - bh_unlock_sock(sk); -@@ -610,7 +610,7 @@ static void tcp_write_timer(unsigned lon - tcp_write_timer_handler(sk); - } else { - /* delegate our work to tcp_release_cb() */ -- if (!test_and_set_bit(TCP_WRITE_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags)) -+ if (!test_and_set_bit(TCP_WRITE_TIMER_DEFERRED, &sk->sk_tsq_flags)) - sock_hold(sk); - } - bh_unlock_sock(sk); ---- a/net/ipv6/tcp_ipv6.c -+++ b/net/ipv6/tcp_ipv6.c -@@ -404,7 +404,7 @@ static void tcp_v6_err(struct sk_buff *s - if (!sock_owned_by_user(sk)) - tcp_v6_mtu_reduced(sk); - else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, -- &tp->tsq_flags)) -+ &sk->sk_tsq_flags)) - sock_hold(sk); - goto out; - } diff --git a/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch deleted file mode 100644 index bcdbe8ce39..0000000000 --- a/target/linux/generic/backport-4.9/024-9-tcp-add-a-missing-barrier-in-tcp_tasklet_func.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0a9648f1293966c838dc570da73c15a76f4c89d6 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Wed, 21 Dec 2016 05:42:43 -0800 -Subject: [PATCH 09/10] tcp: add a missing barrier in tcp_tasklet_func() - -Madalin reported crashes happening in tcp_tasklet_func() on powerpc64 - -Before TSQ_QUEUED bit is cleared, we must ensure the changes done -by list_del(&tp->tsq_node); are committed to memory, otherwise -corruption might happen, as an other cpu could catch TSQ_QUEUED -clearance too soon. - -We can notice that old kernels were immune to this bug, because -TSQ_QUEUED was cleared after a bh_lock_sock(sk)/bh_unlock_sock(sk) -section, but they could have missed a kick to write additional bytes, -when NIC interrupts for a given flow are spread to multiple cpus. - -Affected TCP flows would need an incoming ACK or RTO timer to add more -packets to the pipe. So overall situation should be better now. - -Fixes: b223feb9de2a ("tcp: tsq: add shortcut in tcp_tasklet_func()") -Signed-off-by: Eric Dumazet -Reported-by: Madalin Bucur -Tested-by: Madalin Bucur -Tested-by: Xing Lei -Signed-off-by: David S. Miller ---- - net/ipv4/tcp_output.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -775,6 +775,7 @@ static void tcp_tasklet_func(unsigned lo - list_del(&tp->tsq_node); - - sk = (struct sock *)tp; -+ smp_mb__before_atomic(); - clear_bit(TSQ_QUEUED, &sk->sk_tsq_flags); - - if (!sk->sk_lock.owned && diff --git a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch deleted file mode 100644 index 11f1cd565d..0000000000 --- a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ /dev/null @@ -1,85 +0,0 @@ -From: Eric Dumazet -Date: Sat, 11 Nov 2017 15:54:12 -0800 -Subject: [PATCH] tcp: allow drivers to tweak TSQ logic -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -I had many reports that TSQ logic breaks wifi aggregation. - -Current logic is to allow up to 1 ms of bytes to be queued into qdisc -and drivers queues. - -But Wifi aggregation needs a bigger budget to allow bigger rates to -be discovered by various TCP Congestion Controls algorithms. - -This patch adds an extra socket field, allowing wifi drivers to select -another log scale to derive TCP Small Queue credit from current pacing -rate. - -Initial value is 10, meaning that this patch does not change current -behavior. - -We expect wifi drivers to set this field to smaller values (tests have -been done with values from 6 to 9) - -They would have to use following template : - -if (skb->sk && skb->sk->sk_pacing_shift != MY_PACING_SHIFT) - skb->sk->sk_pacing_shift = MY_PACING_SHIFT; - -Ref: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1670041 -Signed-off-by: Eric Dumazet -Cc: Johannes Berg -Cc: Toke Høiland-Jørgensen -Cc: Kir Kolyshkin ---- ---- a/include/net/sock.h -+++ b/include/net/sock.h -@@ -260,6 +260,7 @@ struct sock_common { - * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) - * @sk_gso_max_size: Maximum GSO segment size to build - * @sk_gso_max_segs: Maximum number of GSO segments -+ * @sk_pacing_shift: scaling factor for TCP Small Queues - * @sk_lingertime: %SO_LINGER l_linger setting - * @sk_backlog: always used with the per-socket spinlock held - * @sk_callback_lock: used with the callbacks in the end of this struct -@@ -422,6 +423,8 @@ struct sock { - kmemcheck_bitfield_end(flags); - - u16 sk_gso_max_segs; -+#define sk_pacing_shift sk_pacing_shift /* for backport checks */ -+ u8 sk_pacing_shift; - unsigned long sk_lingertime; - struct proto *sk_prot_creator; - rwlock_t sk_callback_lock; ---- a/net/core/sock.c -+++ b/net/core/sock.c -@@ -2484,6 +2484,7 @@ void sock_init_data(struct socket *sock, - - sk->sk_max_pacing_rate = ~0U; - sk->sk_pacing_rate = ~0U; -+ sk->sk_pacing_shift = 10; - sk->sk_incoming_cpu = -1; - /* - * Before updating sk_refcnt, we must commit prior changes to memory ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -1607,7 +1607,7 @@ u32 tcp_tso_autosize(const struct sock * - { - u32 bytes, segs; - -- bytes = min(sk->sk_pacing_rate >> 10, -+ bytes = min(sk->sk_pacing_rate >> sk->sk_pacing_shift, - sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); - - /* Goal is to send at least one packet per ms, -@@ -2138,7 +2138,7 @@ static bool tcp_small_queue_check(struct - { - unsigned int limit; - -- limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10); -+ limit = max(2 * skb->truesize, sk->sk_pacing_rate >> sk->sk_pacing_shift); - limit = min_t(u32, limit, sysctl_tcp_limit_output_bytes); - limit <<= factor; - diff --git a/target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch b/target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch deleted file mode 100644 index 8e1f312a0b..0000000000 --- a/target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 854826c9d526fd81077742c3b000e3f7fcaef3ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 20 Sep 2016 10:36:14 +0200 -Subject: [PATCH] ubifs: Drop softlimit and delta fields from struct ubifs_wbuf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Values of these fields are set during init and never modified. They are -used (read) in a single function only. There isn't really any reason to -keep them in a struct. It only makes struct just a bit bigger without -any visible gain. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Boris Brezillon -Signed-off-by: Richard Weinberger ---- - fs/ubifs/io.c | 18 ++++++++++-------- - fs/ubifs/ubifs.h | 5 ----- - 2 files changed, 10 insertions(+), 13 deletions(-) - ---- a/fs/ubifs/io.c -+++ b/fs/ubifs/io.c -@@ -452,16 +452,22 @@ static enum hrtimer_restart wbuf_timer_c - */ - static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf) - { -+ ktime_t softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0); -+ unsigned long long delta; -+ -+ delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT; -+ delta *= 1000000000ULL; -+ - ubifs_assert(!hrtimer_active(&wbuf->timer)); -+ ubifs_assert(delta <= ULONG_MAX); - - if (wbuf->no_timer) - return; - dbg_io("set timer for jhead %s, %llu-%llu millisecs", - dbg_jhead(wbuf->jhead), -- div_u64(ktime_to_ns(wbuf->softlimit), USEC_PER_SEC), -- div_u64(ktime_to_ns(wbuf->softlimit) + wbuf->delta, -- USEC_PER_SEC)); -- hrtimer_start_range_ns(&wbuf->timer, wbuf->softlimit, wbuf->delta, -+ div_u64(ktime_to_ns(softlimit), USEC_PER_SEC), -+ div_u64(ktime_to_ns(softlimit) + delta, USEC_PER_SEC)); -+ hrtimer_start_range_ns(&wbuf->timer, softlimit, delta, - HRTIMER_MODE_REL); - } - -@@ -1059,10 +1065,6 @@ int ubifs_wbuf_init(struct ubifs_info *c - - hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - wbuf->timer.function = wbuf_timer_callback_nolock; -- wbuf->softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0); -- wbuf->delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT; -- wbuf->delta *= 1000000000ULL; -- ubifs_assert(wbuf->delta <= ULONG_MAX); - return 0; - } - ---- a/fs/ubifs/ubifs.h -+++ b/fs/ubifs/ubifs.h -@@ -645,9 +645,6 @@ typedef int (*ubifs_lpt_scan_callback)(s - * @io_mutex: serializes write-buffer I/O - * @lock: serializes @buf, @lnum, @offs, @avail, @used, @next_ino and @inodes - * fields -- * @softlimit: soft write-buffer timeout interval -- * @delta: hard and soft timeouts delta (the timer expire interval is @softlimit -- * and @softlimit + @delta) - * @timer: write-buffer timer - * @no_timer: non-zero if this write-buffer does not have a timer - * @need_sync: non-zero if the timer expired and the wbuf needs sync'ing -@@ -676,8 +673,6 @@ struct ubifs_wbuf { - int (*sync_callback)(struct ubifs_info *c, int lnum, int free, int pad); - struct mutex io_mutex; - spinlock_t lock; -- ktime_t softlimit; -- unsigned long long delta; - struct hrtimer timer; - unsigned int no_timer:1; - unsigned int need_sync:1; diff --git a/target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch b/target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch deleted file mode 100644 index 96fa441132..0000000000 --- a/target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 1b7fc2c0069f3864a3dda15430b7aded31c0bfcc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 20 Sep 2016 10:36:15 +0200 -Subject: [PATCH] ubifs: Use dirty_writeback_interval value for wbuf timer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Right now wbuf timer has hardcoded timeouts and there is no place for -manual adjustments. Some projects / cases many need that though. Few -file systems allow doing that by respecting dirty_writeback_interval -that can be set using sysctl (dirty_writeback_centisecs). - -Lowering dirty_writeback_interval could be some way of dealing with user -space apps lacking proper fsyncs. This is definitely *not* a perfect -solution but we don't have ideal (user space) world. There were already -advanced discussions on this matter, mostly when ext4 was introduced and -it wasn't behaving as ext3. Anyway, the final decision was to add some -hacks to the ext4, as trying to fix whole user space or adding new API -was pointless. - -We can't (and shouldn't?) just follow ext4. We can't e.g. sync on close -as this would cause too many commits and flash wearing. On the other -hand we still should allow some trade-off between -o sync and default -wbuf timeout. Respecting dirty_writeback_interval should allow some sane -cutomizations if used warily. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Boris Brezillon -Signed-off-by: Richard Weinberger ---- - fs/ubifs/io.c | 8 ++++---- - fs/ubifs/ubifs.h | 4 ---- - 2 files changed, 4 insertions(+), 8 deletions(-) - ---- a/fs/ubifs/io.c -+++ b/fs/ubifs/io.c -@@ -452,11 +452,11 @@ static enum hrtimer_restart wbuf_timer_c - */ - static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf) - { -- ktime_t softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0); -- unsigned long long delta; -+ ktime_t softlimit = ms_to_ktime(dirty_writeback_interval * 10); -+ unsigned long long delta = dirty_writeback_interval; - -- delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT; -- delta *= 1000000000ULL; -+ /* centi to milli, milli to nano, then 10% */ -+ delta *= 10ULL * NSEC_PER_MSEC / 10ULL; - - ubifs_assert(!hrtimer_active(&wbuf->timer)); - ubifs_assert(delta <= ULONG_MAX); ---- a/fs/ubifs/ubifs.h -+++ b/fs/ubifs/ubifs.h -@@ -83,10 +83,6 @@ - */ - #define BGT_NAME_PATTERN "ubifs_bgt%d_%d" - --/* Write-buffer synchronization timeout interval in seconds */ --#define WBUF_TIMEOUT_SOFTLIMIT 3 --#define WBUF_TIMEOUT_HARDLIMIT 5 -- - /* Maximum possible inode number (only 32-bit inodes are supported now) */ - #define MAX_INUM 0xFFFFFFFF - diff --git a/target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch b/target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch deleted file mode 100644 index 4656bb1db3..0000000000 --- a/target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Alexander Duyck -Date: Wed, 14 Dec 2016 15:05:26 -0800 -Subject: [PATCH] mm: add support for releasing multiple instances of a page - -Add a function that allows us to batch free a page that has multiple -references outstanding. Specifically this function can be used to drop -a page being used in the page frag alloc cache. With this drivers can -make use of functionality similar to the page frag alloc cache without -having to do any workarounds for the fact that there is no function that -frees multiple references. - -Link: http://lkml.kernel.org/r/20161110113606.76501.70752.stgit@ahduyck-blue-test.jf.intel.com -Signed-off-by: Alexander Duyck -Cc: "David S. Miller" -Cc: "James E.J. Bottomley" -Cc: Chris Metcalf -Cc: David Howells -Cc: Geert Uytterhoeven -Cc: Hans-Christian Noren Egtvedt -Cc: Helge Deller -Cc: James Hogan -Cc: Jeff Kirsher -Cc: Jonas Bonn -Cc: Keguang Zhang -Cc: Ley Foon Tan -Cc: Mark Salter -Cc: Max Filippov -Cc: Michael Ellerman -Cc: Michal Simek -Cc: Ralf Baechle -Cc: Rich Felker -Cc: Richard Kuo -Cc: Russell King -Cc: Steven Miao -Cc: Tobias Klauser -Cc: Vineet Gupta -Cc: Yoshinori Sato -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - ---- a/include/linux/gfp.h -+++ b/include/linux/gfp.h -@@ -529,6 +529,8 @@ extern void free_hot_cold_page(struct pa - extern void free_hot_cold_page_list(struct list_head *list, bool cold); - - struct page_frag_cache; -+extern void __page_frag_drain(struct page *page, unsigned int order, -+ unsigned int count); - extern void *__alloc_page_frag(struct page_frag_cache *nc, - unsigned int fragsz, gfp_t gfp_mask); - extern void __free_page_frag(void *addr); ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -3935,6 +3935,20 @@ static struct page *__page_frag_refill(s - return page; - } - -+void __page_frag_drain(struct page *page, unsigned int order, -+ unsigned int count) -+{ -+ VM_BUG_ON_PAGE(page_ref_count(page) == 0, page); -+ -+ if (page_ref_sub_and_test(page, count)) { -+ if (order == 0) -+ free_hot_cold_page(page, false); -+ else -+ __free_pages_ok(page, order); -+ } -+} -+EXPORT_SYMBOL(__page_frag_drain); -+ - void *__alloc_page_frag(struct page_frag_cache *nc, - unsigned int fragsz, gfp_t gfp_mask) - { diff --git a/target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch b/target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch deleted file mode 100644 index d975a26202..0000000000 --- a/target/linux/generic/backport-4.9/060-0002-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch +++ /dev/null @@ -1,63 +0,0 @@ -From be5e5099183301fb7920f8f6b66bd3ac1f820a97 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Mon, 16 Jan 2017 17:28:18 +0100 -Subject: [PATCH] mtd: bcm47xxsflash: use platform_(set|get)_drvdata -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We have generic place & helpers for storing platform driver data so -there is no reason for using custom priv pointer. - -This allows cleaning up struct bcma_sflash from unneeded fields. - -Signed-off-by: Rafał Miłecki -Acked-by: Kalle Valo -Acked-by: Boris Brezillon -Signed-off-by: Brian Norris ---- - drivers/mtd/devices/bcm47xxsflash.c | 6 +++--- - include/linux/bcma/bcma_driver_chipcommon.h | 3 --- - 2 files changed, 3 insertions(+), 6 deletions(-) - ---- a/drivers/mtd/devices/bcm47xxsflash.c -+++ b/drivers/mtd/devices/bcm47xxsflash.c -@@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(stru - b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL); - if (!b47s) - return -ENOMEM; -- sflash->priv = b47s; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { -@@ -320,6 +319,8 @@ static int bcm47xxsflash_bcma_probe(stru - b47s->size = sflash->size; - bcm47xxsflash_fill_mtd(b47s, &pdev->dev); - -+ platform_set_drvdata(pdev, b47s); -+ - err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0); - if (err) { - pr_err("Failed to register MTD device: %d\n", err); -@@ -335,8 +336,7 @@ static int bcm47xxsflash_bcma_probe(stru - - static int bcm47xxsflash_bcma_remove(struct platform_device *pdev) - { -- struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev); -- struct bcm47xxsflash *b47s = sflash->priv; -+ struct bcm47xxsflash *b47s = platform_get_drvdata(pdev); - - mtd_device_unregister(&b47s->mtd); - iounmap(b47s->window); ---- a/include/linux/bcma/bcma_driver_chipcommon.h -+++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -593,9 +593,6 @@ struct bcma_sflash { - u32 blocksize; - u16 numblocks; - u32 size; -- -- struct mtd_info *mtd; -- void *priv; - }; - #endif - diff --git a/target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch b/target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch deleted file mode 100644 index ecdae2a871..0000000000 --- a/target/linux/generic/backport-4.9/060-0003-mtd-bcm47xxsflash-support-reading-flash-out-of-mappi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ccc38234fdc70120be79e7fb2df5c27ca5cd4c8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 8 Feb 2017 23:53:44 +0100 -Subject: [PATCH] mtd: bcm47xxsflash: support reading flash out of mapping - window -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For reading flash content we use MMIO but it's possible to read only -first 16 MiB this way. It's simply an arch design/limitation. -To support flash sizes bigger than 16 MiB implement indirect access -using ChipCommon registers. -This has been tested using MX25L25635F. - -Signed-off-by: Rafał Miłecki -Acked-by: Marek Vasut -Signed-off-by: Brian Norris ---- - drivers/mtd/devices/bcm47xxsflash.c | 24 +++++++++++++++++++++--- - drivers/mtd/devices/bcm47xxsflash.h | 3 +++ - 2 files changed, 24 insertions(+), 3 deletions(-) - ---- a/drivers/mtd/devices/bcm47xxsflash.c -+++ b/drivers/mtd/devices/bcm47xxsflash.c -@@ -105,15 +105,33 @@ static int bcm47xxsflash_read(struct mtd - size_t *retlen, u_char *buf) - { - struct bcm47xxsflash *b47s = mtd->priv; -+ size_t orig_len = len; - - /* Check address range */ - if ((from + len) > mtd->size) - return -EINVAL; - -- memcpy_fromio(buf, b47s->window + from, len); -- *retlen = len; -+ /* Read as much as possible using fast MMIO window */ -+ if (from < BCM47XXSFLASH_WINDOW_SZ) { -+ size_t memcpy_len; - -- return len; -+ memcpy_len = min(len, (size_t)(BCM47XXSFLASH_WINDOW_SZ - from)); -+ memcpy_fromio(buf, b47s->window + from, memcpy_len); -+ from += memcpy_len; -+ len -= memcpy_len; -+ buf += memcpy_len; -+ } -+ -+ /* Use indirect access for content out of the window */ -+ for (; len; len--) { -+ b47s->cc_write(b47s, BCMA_CC_FLASHADDR, from++); -+ bcm47xxsflash_cmd(b47s, OPCODE_ST_READ4B); -+ *buf++ = b47s->cc_read(b47s, BCMA_CC_FLASHDATA); -+ } -+ -+ *retlen = orig_len; -+ -+ return orig_len; - } - - static int bcm47xxsflash_write_st(struct mtd_info *mtd, u32 offset, size_t len, ---- a/drivers/mtd/devices/bcm47xxsflash.h -+++ b/drivers/mtd/devices/bcm47xxsflash.h -@@ -3,6 +3,8 @@ - - #include - -+#define BCM47XXSFLASH_WINDOW_SZ SZ_16M -+ - /* Used for ST flashes only. */ - #define OPCODE_ST_WREN 0x0006 /* Write Enable */ - #define OPCODE_ST_WRDIS 0x0004 /* Write Disable */ -@@ -16,6 +18,7 @@ - #define OPCODE_ST_RES 0x03ab /* Read Electronic Signature */ - #define OPCODE_ST_CSA 0x1000 /* Keep chip select asserted */ - #define OPCODE_ST_SSE 0x0220 /* Sub-sector Erase */ -+#define OPCODE_ST_READ4B 0x6313 /* Read Data Bytes in 4Byte addressing mode */ - - /* Used for Atmel flashes only. */ - #define OPCODE_AT_READ 0x07e8 diff --git a/target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch b/target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch deleted file mode 100644 index 999f544d3b..0000000000 --- a/target/linux/generic/backport-4.9/060-0004-mtd-bcm47xxpart-move-TRX-parsing-code-to-separated-f.patch +++ /dev/null @@ -1,180 +0,0 @@ -From b522d7b0ebe3539340c2a6d46d787ae3d33bcb92 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 10 Jan 2017 23:15:24 +0100 -Subject: [PATCH] mtd: bcm47xxpart: move TRX parsing code to separated function -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This change simplifies main parsing loop logic a bit. In future it may -be useful for moving TRX support to separated module / parser (if we -implement support for them at some point). -Finally parsing TRX at the end puts us in a better position as we have -better flash layout knowledge. It may be useful e.g. if it appears there -is more than 1 TRX partition. - -Signed-off-by: Rafał Miłecki -Acked-by: Marek Vasut -Signed-off-by: Brian Norris ---- - drivers/mtd/bcm47xxpart.c | 121 ++++++++++++++++++++++++++++------------------ - 1 file changed, 74 insertions(+), 47 deletions(-) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -83,6 +83,67 @@ out_default: - return "rootfs"; - } - -+static int bcm47xxpart_parse_trx(struct mtd_info *master, -+ struct mtd_partition *trx, -+ struct mtd_partition *parts, -+ size_t parts_len) -+{ -+ struct trx_header header; -+ size_t bytes_read; -+ int curr_part = 0; -+ int i, err; -+ -+ if (parts_len < 3) { -+ pr_warn("No enough space to add TRX partitions!\n"); -+ return -ENOMEM; -+ } -+ -+ err = mtd_read(master, trx->offset, sizeof(header), &bytes_read, -+ (uint8_t *)&header); -+ if (err && !mtd_is_bitflip(err)) { -+ pr_err("mtd_read error while reading TRX header: %d\n", err); -+ return err; -+ } -+ -+ i = 0; -+ -+ /* We have LZMA loader if offset[2] points to sth */ -+ if (header.offset[2]) { -+ bcm47xxpart_add_part(&parts[curr_part++], "loader", -+ trx->offset + header.offset[i], 0); -+ i++; -+ } -+ -+ if (header.offset[i]) { -+ bcm47xxpart_add_part(&parts[curr_part++], "linux", -+ trx->offset + header.offset[i], 0); -+ i++; -+ } -+ -+ if (header.offset[i]) { -+ size_t offset = trx->offset + header.offset[i]; -+ const char *name = bcm47xxpart_trx_data_part_name(master, -+ offset); -+ -+ bcm47xxpart_add_part(&parts[curr_part++], name, offset, 0); -+ i++; -+ } -+ -+ /* -+ * Assume that every partition ends at the beginning of the one it is -+ * followed by. -+ */ -+ for (i = 0; i < curr_part; i++) { -+ u64 next_part_offset = (i < curr_part - 1) ? -+ parts[i + 1].offset : -+ trx->offset + trx->size; -+ -+ parts[i].size = next_part_offset - parts[i].offset; -+ } -+ -+ return curr_part; -+} -+ - static int bcm47xxpart_parse(struct mtd_info *master, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) -@@ -93,9 +154,7 @@ static int bcm47xxpart_parse(struct mtd_ - size_t bytes_read; - uint32_t offset; - uint32_t blocksize = master->erasesize; -- struct trx_header *trx; - int trx_part = -1; -- int last_trx_part = -1; - int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; - int err; - -@@ -182,54 +241,14 @@ static int bcm47xxpart_parse(struct mtd_ - - /* TRX */ - if (buf[0x000 / 4] == TRX_MAGIC) { -- if (BCM47XXPART_MAX_PARTS - curr_part < 4) { -- pr_warn("Not enough partitions left to register trx, scanning stopped!\n"); -- break; -- } -- -- trx = (struct trx_header *)buf; -+ struct trx_header *trx; - - trx_part = curr_part; - bcm47xxpart_add_part(&parts[curr_part++], "firmware", - offset, 0); - -- i = 0; -- /* We have LZMA loader if offset[2] points to sth */ -- if (trx->offset[2]) { -- bcm47xxpart_add_part(&parts[curr_part++], -- "loader", -- offset + trx->offset[i], -- 0); -- i++; -- } -- -- if (trx->offset[i]) { -- bcm47xxpart_add_part(&parts[curr_part++], -- "linux", -- offset + trx->offset[i], -- 0); -- i++; -- } -- -- /* -- * Pure rootfs size is known and can be calculated as: -- * trx->length - trx->offset[i]. We don't fill it as -- * we want to have jffs2 (overlay) in the same mtd. -- */ -- if (trx->offset[i]) { -- const char *name; -- -- name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]); -- bcm47xxpart_add_part(&parts[curr_part++], -- name, -- offset + trx->offset[i], -- 0); -- i++; -- } -- -- last_trx_part = curr_part - 1; -- - /* Jump to the end of TRX */ -+ trx = (struct trx_header *)buf; - offset = roundup(offset + trx->length, blocksize); - /* Next loop iteration will increase the offset */ - offset -= blocksize; -@@ -307,9 +326,17 @@ static int bcm47xxpart_parse(struct mtd_ - parts[i + 1].offset : master->size; - - parts[i].size = next_part_offset - parts[i].offset; -- if (i == last_trx_part && trx_part >= 0) -- parts[trx_part].size = next_part_offset - -- parts[trx_part].offset; -+ } -+ -+ /* If there was TRX parse it now */ -+ if (trx_part >= 0) { -+ int num_parts; -+ -+ num_parts = bcm47xxpart_parse_trx(master, &parts[trx_part], -+ parts + curr_part, -+ BCM47XXPART_MAX_PARTS - curr_part); -+ if (num_parts > 0) -+ curr_part += num_parts; - } - - *pparts = parts; diff --git a/target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch b/target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch deleted file mode 100644 index bcefee8e87..0000000000 --- a/target/linux/generic/backport-4.9/060-0005-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 89a0d9a9f1941a086a82bc7cd73d275cec98ba14 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 10 Jan 2017 23:15:25 +0100 -Subject: [PATCH] mtd: bcm47xxpart: support layouts with multiple TRX - partitions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some devices may have an extra TRX partition used as failsafe one. If -we detect such partition we should set a proper name for it and don't -parse it. - -Signed-off-by: Rafał Miłecki -Acked-by: Marek Vasut -Signed-off-by: Brian Norris ---- - drivers/mtd/bcm47xxpart.c | 56 ++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 46 insertions(+), 10 deletions(-) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -9,6 +9,7 @@ - * - */ - -+#include - #include - #include - #include -@@ -144,6 +145,30 @@ static int bcm47xxpart_parse_trx(struct - return curr_part; - } - -+/** -+ * bcm47xxpart_bootpartition - gets index of TRX partition used by bootloader -+ * -+ * Some devices may have more than one TRX partition. In such case one of them -+ * is the main one and another a failsafe one. Bootloader may fallback to the -+ * failsafe firmware if it detects corruption of the main image. -+ * -+ * This function provides info about currently used TRX partition. It's the one -+ * containing kernel started by the bootloader. -+ */ -+static int bcm47xxpart_bootpartition(void) -+{ -+ char buf[4]; -+ int bootpartition; -+ -+ /* Check CFE environment variable */ -+ if (bcm47xx_nvram_getenv("bootpartition", buf, sizeof(buf)) > 0) { -+ if (!kstrtoint(buf, 0, &bootpartition)) -+ return bootpartition; -+ } -+ -+ return 0; -+} -+ - static int bcm47xxpart_parse(struct mtd_info *master, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) -@@ -154,7 +179,8 @@ static int bcm47xxpart_parse(struct mtd_ - size_t bytes_read; - uint32_t offset; - uint32_t blocksize = master->erasesize; -- int trx_part = -1; -+ int trx_parts[2]; /* Array with indexes of TRX partitions */ -+ int trx_num = 0; /* Number of found TRX partitions */ - int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; - int err; - -@@ -243,7 +269,11 @@ static int bcm47xxpart_parse(struct mtd_ - if (buf[0x000 / 4] == TRX_MAGIC) { - struct trx_header *trx; - -- trx_part = curr_part; -+ if (trx_num >= ARRAY_SIZE(trx_parts)) -+ pr_warn("No enough space to store another TRX found at 0x%X\n", -+ offset); -+ else -+ trx_parts[trx_num++] = curr_part; - bcm47xxpart_add_part(&parts[curr_part++], "firmware", - offset, 0); - -@@ -329,14 +359,20 @@ static int bcm47xxpart_parse(struct mtd_ - } - - /* If there was TRX parse it now */ -- if (trx_part >= 0) { -- int num_parts; -+ for (i = 0; i < trx_num; i++) { -+ struct mtd_partition *trx = &parts[trx_parts[i]]; - -- num_parts = bcm47xxpart_parse_trx(master, &parts[trx_part], -- parts + curr_part, -- BCM47XXPART_MAX_PARTS - curr_part); -- if (num_parts > 0) -- curr_part += num_parts; -+ if (i == bcm47xxpart_bootpartition()) { -+ int num_parts; -+ -+ num_parts = bcm47xxpart_parse_trx(master, trx, -+ parts + curr_part, -+ BCM47XXPART_MAX_PARTS - curr_part); -+ if (num_parts > 0) -+ curr_part += num_parts; -+ } else { -+ trx->name = "failsafe"; -+ } - } - - *pparts = parts; diff --git a/target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch b/target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch deleted file mode 100644 index a70d827782..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0001-mtd-spi-nor-add-Macronix-mx25u25635f-to-list-of-know.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 355445b86f0f61125409e1217be4f0a8ee362116 Mon Sep 17 00:00:00 2001 -From: Ash Benz -Date: Sat, 19 Nov 2016 07:51:49 +0800 -Subject: [PATCH] mtd: spi-nor: add Macronix mx25u25635f to list of known - devices. - -Signed-off-by: Ash Benz -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -878,6 +878,7 @@ static const struct flash_info spi_nor_i - { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, - { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, - { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, -+ { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K) }, - { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, - { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) }, - { "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) }, diff --git a/target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch b/target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch deleted file mode 100644 index e4563ebeb6..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0002-mtd-spi-nor-fix-spansion-quad-enable.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 807c16253319ee6ccf8873ae64f070f7eb532cd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=ABl=20Esponde?= -Date: Wed, 23 Nov 2016 12:47:40 +0100 -Subject: [PATCH] mtd: spi-nor: fix spansion quad enable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With the S25FL127S nor flash part, each writing to the configuration -register takes hundreds of ms. During that time, no more accesses to -the flash should be done (even reads). - -This commit adds a wait loop after the register writing until the flash -finishes its work. - -This issue could make rootfs mounting fail when the latter was done too -much closely to this quad enable bit setting step. And in this case, a -driver as UBIFS may try to recover the filesystem and may broke it -completely. - -Signed-off-by: Joël Esponde -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1269,6 +1269,13 @@ static int spansion_quad_enable(struct s - return ret; - } - -+ ret = spi_nor_wait_till_ready(nor); -+ if (ret) { -+ dev_err(nor->dev, -+ "timeout while writing configuration register\n"); -+ return ret; -+ } -+ - /* read back and check it */ - ret = read_cr(nor); - if (!(ret > 0 && (ret & CR_QUAD_EN_SPAN))) { diff --git a/target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch b/target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch deleted file mode 100644 index 76c5d2d971..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4287916d7bab2806305d3296b4cf261fa49d959b Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Thu, 27 Oct 2016 23:13:26 +0200 -Subject: [PATCH] mtd: spi-nor: fix flags for s25fl128s - -The Spansion S25FL128S also supports dual read mode. -In addition remove flag SECT_4K. 4K erases are supported, -but not uniformly. - -Signed-off-by: Heiner Kallweit -Reviewed-by: Jagan Teki -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -912,7 +912,7 @@ static const struct flash_info spi_nor_i - { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) }, - { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, - { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, -- { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SECT_4K | SPI_NOR_QUAD_READ) }, -+ { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { "s25sl004a", INFO(0x010212, 0, 64 * 1024, 8, 0) }, diff --git a/target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch b/target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch deleted file mode 100644 index 004c1c5151..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0004-mtd-spi-nor-add-support-for-s25fl208k.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 022a400f90ceeb26405edd5e077d56e2f38c8123 Mon Sep 17 00:00:00 2001 -From: Sean Nyekjaer -Date: Wed, 5 Oct 2016 10:59:49 +0200 -Subject: [PATCH] mtd: spi-nor: add support for s25fl208k - -Signed-off-by: Sean Nyekjaer -Reviewed-by: Jagan Teki -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -928,6 +928,7 @@ static const struct flash_info spi_nor_i - { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, SECT_4K) }, - { "s25fl164k", INFO(0x014017, 0, 64 * 1024, 128, SECT_4K) }, - { "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ) }, -+ { "s25fl208k", INFO(0x014014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ) }, - - /* SST -- large erase sizes are "overlays", "sectors" are 4K */ - { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) }, diff --git a/target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch b/target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch deleted file mode 100644 index b97d8c7857..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0005-mtd-spi-nor-Add-at25df321-spi-nor-flash-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b08618c929b289699a496b8d45a4e1a014187e56 Mon Sep 17 00:00:00 2001 -From: Jagan Teki -Date: Tue, 26 Jul 2016 14:07:54 +0530 -Subject: [PATCH] mtd: spi-nor: Add at25df321 spi-nor flash support - -Add Atmel at25df321 spi-nor flash to the list of spi_nor_ids. - -Cc: Brian Norris -Cc: Wenyou Yang -Signed-off-by: Jagan Teki -Acked-by: Wenyou Yang -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -799,6 +799,7 @@ static const struct flash_info spi_nor_i - { "at25fs040", INFO(0x1f6604, 0, 64 * 1024, 8, SECT_4K) }, - - { "at25df041a", INFO(0x1f4401, 0, 64 * 1024, 8, SECT_4K) }, -+ { "at25df321", INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) }, - { "at25df321a", INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) }, - { "at25df641", INFO(0x1f4800, 0, 64 * 1024, 128, SECT_4K) }, - diff --git a/target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch b/target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch deleted file mode 100644 index 8df61f6ed2..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0006-mtd-spi-nor-Add-support-for-N25Q016A.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 61e4611864b396c7e9040b7335f25d3921bc87cd Mon Sep 17 00:00:00 2001 -From: Moritz Fischer -Date: Fri, 15 Jul 2016 10:03:48 -0700 -Subject: [PATCH] mtd: spi-nor: Add support for N25Q016A - -This commit adds support in the spi-nor driver for the -N25Q016A, a 16Mbit SPI NOR flash from Micron. - -Cc: David Woodhouse -Cc: Brian Norris -Cc: Jagan Teki - -Signed-off-by: Moritz Fischer -Reviewed-by: Jagan Teki -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -885,6 +885,7 @@ static const struct flash_info spi_nor_i - { "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) }, - - /* Micron */ -+ { "n25q016a", INFO(0x20bb15, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_QUAD_READ) }, - { "n25q032", INFO(0x20ba16, 0, 64 * 1024, 64, SPI_NOR_QUAD_READ) }, - { "n25q032a", INFO(0x20bb16, 0, 64 * 1024, 64, SPI_NOR_QUAD_READ) }, - { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_QUAD_READ) }, diff --git a/target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch b/target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch deleted file mode 100644 index 3bae77db7c..0000000000 --- a/target/linux/generic/backport-4.9/061-v4.10-0007-mtd-spi-nor-Add-support-for-mr25h40.patch +++ /dev/null @@ -1,25 +0,0 @@ -From edd0c8f4932dbf3e21036cb443ba5bdf7449d02b Mon Sep 17 00:00:00 2001 -From: IWAMOTO Masahiko -Date: Wed, 5 Oct 2016 08:22:52 +0000 -Subject: [PATCH] mtd: spi-nor: Add support for mr25h40 - -Add Everspin mr25h40 512KB MRAM to the list of supported chips. - -Signed-off-by: Masahiko Iwamoto -Reviewed-by: Jagan Teki -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -826,6 +826,7 @@ static const struct flash_info spi_nor_i - /* Everspin */ - { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, - { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, -+ { "mr25h40", CAT25_INFO(512 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, - - /* Fujitsu */ - { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) }, diff --git a/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch b/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch deleted file mode 100644 index a174984921..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0001-mtd-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch +++ /dev/null @@ -1,312 +0,0 @@ -From 61cba34bd6c1bddfc38f94cc3f80bdfefcc3393b Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda -Date: Fri, 2 Dec 2016 12:31:44 +0100 -Subject: [PATCH] mtd: spi-nor: Add support for S3AN spi-nor devices - -Xilinx Spartan-3AN FPGAs contain an In-System Flash where they keep -their configuration data and (optionally) some user data. - -The protocol of this flash follows most of the spi-nor standard. With -the following differences: - -- Page size might not be a power of two. -- The address calculation (default addressing mode). -- The spi nor commands used. - -Protocol is described on Xilinx User Guide UG333 - -Signed-off-by: Ricardo Ribalda Delgado -Cc: Boris Brezillon -Cc: Brian Norris -Cc: Marek Vasut -Reviewed-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 154 ++++++++++++++++++++++++++++++++++++++++-- - include/linux/mtd/spi-nor.h | 12 ++++ - 2 files changed, 161 insertions(+), 5 deletions(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -75,6 +75,12 @@ struct flash_info { - * bit. Must be used with - * SPI_NOR_HAS_LOCK. - */ -+#define SPI_S3AN BIT(10) /* -+ * Xilinx Spartan 3AN In-System Flash -+ * (MFR cannot be used for probing -+ * because it has the same value as -+ * ATMEL flashes) -+ */ - }; - - #define JEDEC_MFR(info) ((info)->id[0]) -@@ -217,6 +223,21 @@ static inline int set_4byte(struct spi_n - return nor->write_reg(nor, SPINOR_OP_BRWR, nor->cmd_buf, 1); - } - } -+ -+static int s3an_sr_ready(struct spi_nor *nor) -+{ -+ int ret; -+ u8 val; -+ -+ ret = nor->read_reg(nor, SPINOR_OP_XRDSR, &val, 1); -+ if (ret < 0) { -+ dev_err(nor->dev, "error %d reading XRDSR\n", (int) ret); -+ return ret; -+ } -+ -+ return !!(val & XSR_RDY); -+} -+ - static inline int spi_nor_sr_ready(struct spi_nor *nor) - { - int sr = read_sr(nor); -@@ -238,7 +259,11 @@ static inline int spi_nor_fsr_ready(stru - static int spi_nor_ready(struct spi_nor *nor) - { - int sr, fsr; -- sr = spi_nor_sr_ready(nor); -+ -+ if (nor->flags & SNOR_F_READY_XSR_RDY) -+ sr = s3an_sr_ready(nor); -+ else -+ sr = spi_nor_sr_ready(nor); - if (sr < 0) - return sr; - fsr = nor->flags & SNOR_F_USE_FSR ? spi_nor_fsr_ready(nor) : 1; -@@ -320,6 +345,24 @@ static void spi_nor_unlock_and_unprep(st - } - - /* -+ * This code converts an address to the Default Address Mode, that has non -+ * power of two page sizes. We must support this mode because it is the default -+ * mode supported by Xilinx tools, it can access the whole flash area and -+ * changing over to the Power-of-two mode is irreversible and corrupts the -+ * original data. -+ * Addr can safely be unsigned int, the biggest S3AN device is smaller than -+ * 4 MiB. -+ */ -+static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr) -+{ -+ unsigned int offset = addr; -+ -+ offset %= nor->page_size; -+ -+ return ((addr - offset) << 1) | offset; -+} -+ -+/* - * Initiate the erasure of a single sector - */ - static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr) -@@ -327,6 +370,9 @@ static int spi_nor_erase_sector(struct s - u8 buf[SPI_NOR_MAX_ADDR_WIDTH]; - int i; - -+ if (nor->flags & SNOR_F_S3AN_ADDR_DEFAULT) -+ addr = spi_nor_s3an_addr_convert(nor, addr); -+ - if (nor->erase) - return nor->erase(nor, addr); - -@@ -368,7 +414,7 @@ static int spi_nor_erase(struct mtd_info - return ret; - - /* whole-chip erase? */ -- if (len == mtd->size) { -+ if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) { - unsigned long timeout; - - write_enable(nor); -@@ -782,6 +828,19 @@ static int spi_nor_is_locked(struct mtd_ - .addr_width = (_addr_width), \ - .flags = (_flags), - -+#define S3AN_INFO(_jedec_id, _n_sectors, _page_size) \ -+ .id = { \ -+ ((_jedec_id) >> 16) & 0xff, \ -+ ((_jedec_id) >> 8) & 0xff, \ -+ (_jedec_id) & 0xff \ -+ }, \ -+ .id_len = 3, \ -+ .sector_size = (8*_page_size), \ -+ .n_sectors = (_n_sectors), \ -+ .page_size = _page_size, \ -+ .addr_width = 3, \ -+ .flags = SPI_NOR_NO_FR | SPI_S3AN, -+ - /* NOTE: double check command sets and memory organization when you add - * more nor chips. This current list focusses on newer chips, which - * have been converging on command sets which including JEDEC ID. -@@ -1020,6 +1079,13 @@ static const struct flash_info spi_nor_i - { "cat25c09", CAT25_INFO( 128, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, - { "cat25c17", CAT25_INFO( 256, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, - { "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, -+ -+ /* Xilinx S3AN Internal Flash */ -+ { "3S50AN", S3AN_INFO(0x1f2200, 64, 264) }, -+ { "3S200AN", S3AN_INFO(0x1f2400, 256, 264) }, -+ { "3S400AN", S3AN_INFO(0x1f2400, 256, 264) }, -+ { "3S700AN", S3AN_INFO(0x1f2500, 512, 264) }, -+ { "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) }, - { }, - }; - -@@ -1060,7 +1126,12 @@ static int spi_nor_read(struct mtd_info - return ret; - - while (len) { -- ret = nor->read(nor, from, len, buf); -+ loff_t addr = from; -+ -+ if (nor->flags & SNOR_F_S3AN_ADDR_DEFAULT) -+ addr = spi_nor_s3an_addr_convert(nor, addr); -+ -+ ret = nor->read(nor, addr, len, buf); - if (ret == 0) { - /* We shouldn't see 0-length reads */ - ret = -EIO; -@@ -1181,8 +1252,23 @@ static int spi_nor_write(struct mtd_info - - for (i = 0; i < len; ) { - ssize_t written; -+ loff_t addr = to + i; - -- page_offset = (to + i) & (nor->page_size - 1); -+ /* -+ * If page_size is a power of two, the offset can be quickly -+ * calculated with an AND operation. On the other cases we -+ * need to do a modulus operation (more expensive). -+ * Power of two numbers have only one bit set and we can use -+ * the instruction hweight32 to detect if we need to do a -+ * modulus (do_div()) or not. -+ */ -+ if (hweight32(nor->page_size) == 1) { -+ page_offset = addr & (nor->page_size - 1); -+ } else { -+ uint64_t aux = addr; -+ -+ page_offset = do_div(aux, nor->page_size); -+ } - WARN_ONCE(page_offset, - "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.", - page_offset); -@@ -1190,8 +1276,11 @@ static int spi_nor_write(struct mtd_info - page_remain = min_t(size_t, - nor->page_size - page_offset, len - i); - -+ if (nor->flags & SNOR_F_S3AN_ADDR_DEFAULT) -+ addr = spi_nor_s3an_addr_convert(nor, addr); -+ - write_enable(nor); -- ret = nor->write(nor, to + i, page_remain, buf + i); -+ ret = nor->write(nor, addr, page_remain, buf + i); - if (ret < 0) - goto write_err; - written = ret; -@@ -1325,6 +1414,47 @@ static int spi_nor_check(struct spi_nor - return 0; - } - -+static int s3an_nor_scan(const struct flash_info *info, struct spi_nor *nor) -+{ -+ int ret; -+ u8 val; -+ -+ ret = nor->read_reg(nor, SPINOR_OP_XRDSR, &val, 1); -+ if (ret < 0) { -+ dev_err(nor->dev, "error %d reading XRDSR\n", (int) ret); -+ return ret; -+ } -+ -+ nor->erase_opcode = SPINOR_OP_XSE; -+ nor->program_opcode = SPINOR_OP_XPP; -+ nor->read_opcode = SPINOR_OP_READ; -+ nor->flags |= SNOR_F_NO_OP_CHIP_ERASE; -+ -+ /* -+ * This flashes have a page size of 264 or 528 bytes (known as -+ * Default addressing mode). It can be changed to a more standard -+ * Power of two mode where the page size is 256/512. This comes -+ * with a price: there is 3% less of space, the data is corrupted -+ * and the page size cannot be changed back to default addressing -+ * mode. -+ * -+ * The current addressing mode can be read from the XRDSR register -+ * and should not be changed, because is a destructive operation. -+ */ -+ if (val & XSR_PAGESIZE) { -+ /* Flash in Power of 2 mode */ -+ nor->page_size = (nor->page_size == 264) ? 256 : 512; -+ nor->mtd.writebufsize = nor->page_size; -+ nor->mtd.size = 8 * nor->page_size * info->n_sectors; -+ nor->mtd.erasesize = 8 * nor->page_size; -+ } else { -+ /* Flash in Default addressing mode */ -+ nor->flags |= SNOR_F_S3AN_ADDR_DEFAULT; -+ } -+ -+ return 0; -+} -+ - int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) - { - const struct flash_info *info = NULL; -@@ -1373,6 +1503,14 @@ int spi_nor_scan(struct spi_nor *nor, co - mutex_init(&nor->lock); - - /* -+ * Make sure the XSR_RDY flag is set before calling -+ * spi_nor_wait_till_ready(). Xilinx S3AN share MFR -+ * with Atmel spi-nor -+ */ -+ if (info->flags & SPI_S3AN) -+ nor->flags |= SNOR_F_READY_XSR_RDY; -+ -+ /* - * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up - * with the software protection bits set - */ -@@ -1530,6 +1668,12 @@ int spi_nor_scan(struct spi_nor *nor, co - - nor->read_dummy = spi_nor_read_dummy_cycles(nor); - -+ if (info->flags & SPI_S3AN) { -+ ret = s3an_nor_scan(info, nor); -+ if (ret) -+ return ret; -+ } -+ - dev_info(dev, "%s (%lld Kbytes)\n", info->name, - (long long)mtd->size >> 10); - ---- a/include/linux/mtd/spi-nor.h -+++ b/include/linux/mtd/spi-nor.h -@@ -68,6 +68,15 @@ - #define SPINOR_OP_WRDI 0x04 /* Write disable */ - #define SPINOR_OP_AAI_WP 0xad /* Auto address increment word program */ - -+/* Used for S3AN flashes only */ -+#define SPINOR_OP_XSE 0x50 /* Sector erase */ -+#define SPINOR_OP_XPP 0x82 /* Page program */ -+#define SPINOR_OP_XRDSR 0xd7 /* Read status register */ -+ -+#define XSR_PAGESIZE BIT(0) /* Page size in Po2 or Linear */ -+#define XSR_RDY BIT(7) /* Ready */ -+ -+ - /* Used for Macronix and Winbond flashes. */ - #define SPINOR_OP_EN4B 0xb7 /* Enter 4-byte mode */ - #define SPINOR_OP_EX4B 0xe9 /* Exit 4-byte mode */ -@@ -119,6 +128,9 @@ enum spi_nor_ops { - enum spi_nor_option_flags { - SNOR_F_USE_FSR = BIT(0), - SNOR_F_HAS_SR_TB = BIT(1), -+ SNOR_F_NO_OP_CHIP_ERASE = BIT(2), -+ SNOR_F_S3AN_ADDR_DEFAULT = BIT(3), -+ SNOR_F_READY_XSR_RDY = BIT(4), - }; - - /** diff --git a/target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch b/target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch deleted file mode 100644 index ec469d405b..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0002-mtd-spi-nor-improve-macronix_quad_enable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1e99d0d51ec97bf48edd277658004ce030543d98 Mon Sep 17 00:00:00 2001 -From: Cyrille Pitchen -Date: Tue, 6 Dec 2016 17:01:41 +0100 -Subject: [PATCH] mtd: spi-nor: improve macronix_quad_enable() - -The patch checks whether the Quad Enable bit is already set in the Status -Register. If so, the function exits immediately with a successful return -code. - -Signed-off-by: Cyrille Pitchen -Reviewed-by: Jagan Teki -Acked-by: Marek Vasut ---- - drivers/mtd/spi-nor/spi-nor.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1311,6 +1311,9 @@ static int macronix_quad_enable(struct s - val = read_sr(nor); - if (val < 0) - return val; -+ if (val & SR_QUAD_EN_MX) -+ return 0; -+ - write_enable(nor); - - write_sr(nor, val | SR_QUAD_EN_MX); diff --git a/target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch b/target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch deleted file mode 100644 index 790b557611..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0003-mtd-spi-nor-remove-WARN_ONCE-message-in-spi_nor_writ.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dc176595bf184e89bf28fdf91cbc1d050dfe63b3 Mon Sep 17 00:00:00 2001 -From: Cyrille Pitchen -Date: Tue, 6 Dec 2016 18:14:24 +0100 -Subject: [PATCH] mtd: spi-nor: remove WARN_ONCE() message in spi_nor_write() - -This patch removes the WARN_ONCE() test in spi_nor_write(). -This macro triggers the display of a warning message almost every time we -use a UBI file-system because a write operation is performed at offset 64, -which is in the middle of the SPI NOR memory page. This is a valid -operation for ubifs. - -Hence this warning is pretty annoying and useless so we just remove it. - -Signed-off-by: Cyrille Pitchen -Suggested-by: Richard Weinberger -Suggested-by: Andras Szemzo -Acked-by: Boris Brezillon ---- - drivers/mtd/spi-nor/spi-nor.c | 3 --- - 1 file changed, 3 deletions(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1269,9 +1269,6 @@ static int spi_nor_write(struct mtd_info - - page_offset = do_div(aux, nor->page_size); - } -- WARN_ONCE(page_offset, -- "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.", -- page_offset); - /* the size of data remaining on the first page */ - page_remain = min_t(size_t, - nor->page_size - page_offset, len - i); diff --git a/target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch b/target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch deleted file mode 100644 index 34562e197c..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0004-mtd-spi-nor-rename-SPINOR_OP_-macros-of-the-4-byte-a.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 05aba5763dcf35eddc58aaf99c9f16d19730e0a8 Mon Sep 17 00:00:00 2001 -From: Cyrille Pitchen -Date: Thu, 27 Oct 2016 11:55:39 +0200 -Subject: [PATCH] mtd: spi-nor: rename SPINOR_OP_* macros of the 4-byte address - op codes - -This patch renames the SPINOR_OP_* macros of the 4-byte address -instruction set so the new names all share a common pattern: the 4-byte -address name is built from the 3-byte address name appending the "_4B" -suffix. - -The patch also introduces new op codes to support other SPI protocols such -as SPI 1-4-4 and SPI 1-2-2. - -This is a transitional patch and will help a later patch of spi-nor.c -to automate the translation from the 3-byte address op codes into their -4-byte address version. - -Signed-off-by: Cyrille Pitchen -Acked-by: Mark Brown -Acked-by: Marek Vasut ---- - drivers/mtd/devices/serial_flash_cmds.h | 7 ------- - drivers/mtd/devices/st_spi_fsm.c | 28 ++++++++++++++-------------- - drivers/mtd/spi-nor/spi-nor.c | 8 ++++---- - drivers/spi/spi-bcm-qspi.c | 6 +++--- - include/linux/mtd/spi-nor.h | 22 ++++++++++++++++------ - 5 files changed, 37 insertions(+), 34 deletions(-) - ---- a/drivers/mtd/devices/serial_flash_cmds.h -+++ b/drivers/mtd/devices/serial_flash_cmds.h -@@ -18,19 +18,12 @@ - #define SPINOR_OP_RDVCR 0x85 - - /* JEDEC Standard - Serial Flash Discoverable Parmeters (SFDP) Commands */ --#define SPINOR_OP_READ_1_2_2 0xbb /* DUAL I/O READ */ --#define SPINOR_OP_READ_1_4_4 0xeb /* QUAD I/O READ */ -- - #define SPINOR_OP_WRITE 0x02 /* PAGE PROGRAM */ - #define SPINOR_OP_WRITE_1_1_2 0xa2 /* DUAL INPUT PROGRAM */ - #define SPINOR_OP_WRITE_1_2_2 0xd2 /* DUAL INPUT EXT PROGRAM */ - #define SPINOR_OP_WRITE_1_1_4 0x32 /* QUAD INPUT PROGRAM */ - #define SPINOR_OP_WRITE_1_4_4 0x12 /* QUAD INPUT EXT PROGRAM */ - --/* READ commands with 32-bit addressing */ --#define SPINOR_OP_READ4_1_2_2 0xbc --#define SPINOR_OP_READ4_1_4_4 0xec -- - /* Configuration flags */ - #define FLASH_FLAG_SINGLE 0x000000ff - #define FLASH_FLAG_READ_WRITE 0x00000001 ---- a/drivers/mtd/devices/st_spi_fsm.c -+++ b/drivers/mtd/devices/st_spi_fsm.c -@@ -507,13 +507,13 @@ static struct seq_rw_config n25q_read3_c - * - 'FAST' variants configured for 8 dummy cycles (see note above.) - */ - static struct seq_rw_config n25q_read4_configs[] = { -- {FLASH_FLAG_READ_1_4_4, SPINOR_OP_READ4_1_4_4, 0, 4, 4, 0x00, 0, 8}, -- {FLASH_FLAG_READ_1_1_4, SPINOR_OP_READ4_1_1_4, 0, 1, 4, 0x00, 0, 8}, -- {FLASH_FLAG_READ_1_2_2, SPINOR_OP_READ4_1_2_2, 0, 2, 2, 0x00, 0, 8}, -- {FLASH_FLAG_READ_1_1_2, SPINOR_OP_READ4_1_1_2, 0, 1, 2, 0x00, 0, 8}, -- {FLASH_FLAG_READ_FAST, SPINOR_OP_READ4_FAST, 0, 1, 1, 0x00, 0, 8}, -- {FLASH_FLAG_READ_WRITE, SPINOR_OP_READ4, 0, 1, 1, 0x00, 0, 0}, -- {0x00, 0, 0, 0, 0, 0x00, 0, 0}, -+ {FLASH_FLAG_READ_1_4_4, SPINOR_OP_READ_1_4_4_4B, 0, 4, 4, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_1_1_4, SPINOR_OP_READ_1_1_4_4B, 0, 1, 4, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_1_2_2, SPINOR_OP_READ_1_2_2_4B, 0, 2, 2, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_1_1_2, SPINOR_OP_READ_1_1_2_4B, 0, 1, 2, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_FAST, SPINOR_OP_READ_FAST_4B, 0, 1, 1, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_WRITE, SPINOR_OP_READ_4B, 0, 1, 1, 0x00, 0, 0}, -+ {0x00, 0, 0, 0, 0, 0x00, 0, 0}, - }; - - /* -@@ -553,13 +553,13 @@ static int stfsm_mx25_en_32bit_addr_seq( - * entering a state that is incompatible with the SPIBoot Controller. - */ - static struct seq_rw_config stfsm_s25fl_read4_configs[] = { -- {FLASH_FLAG_READ_1_4_4, SPINOR_OP_READ4_1_4_4, 0, 4, 4, 0x00, 2, 4}, -- {FLASH_FLAG_READ_1_1_4, SPINOR_OP_READ4_1_1_4, 0, 1, 4, 0x00, 0, 8}, -- {FLASH_FLAG_READ_1_2_2, SPINOR_OP_READ4_1_2_2, 0, 2, 2, 0x00, 4, 0}, -- {FLASH_FLAG_READ_1_1_2, SPINOR_OP_READ4_1_1_2, 0, 1, 2, 0x00, 0, 8}, -- {FLASH_FLAG_READ_FAST, SPINOR_OP_READ4_FAST, 0, 1, 1, 0x00, 0, 8}, -- {FLASH_FLAG_READ_WRITE, SPINOR_OP_READ4, 0, 1, 1, 0x00, 0, 0}, -- {0x00, 0, 0, 0, 0, 0x00, 0, 0}, -+ {FLASH_FLAG_READ_1_4_4, SPINOR_OP_READ_1_4_4_4B, 0, 4, 4, 0x00, 2, 4}, -+ {FLASH_FLAG_READ_1_1_4, SPINOR_OP_READ_1_1_4_4B, 0, 1, 4, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_1_2_2, SPINOR_OP_READ_1_2_2_4B, 0, 2, 2, 0x00, 4, 0}, -+ {FLASH_FLAG_READ_1_1_2, SPINOR_OP_READ_1_1_2_4B, 0, 1, 2, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_FAST, SPINOR_OP_READ_FAST_4B, 0, 1, 1, 0x00, 0, 8}, -+ {FLASH_FLAG_READ_WRITE, SPINOR_OP_READ_4B, 0, 1, 1, 0x00, 0, 0}, -+ {0x00, 0, 0, 0, 0, 0x00, 0, 0}, - }; - - static struct seq_rw_config stfsm_s25fl_write4_configs[] = { ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1638,16 +1638,16 @@ int spi_nor_scan(struct spi_nor *nor, co - /* Dedicated 4-byte command set */ - switch (nor->flash_read) { - case SPI_NOR_QUAD: -- nor->read_opcode = SPINOR_OP_READ4_1_1_4; -+ nor->read_opcode = SPINOR_OP_READ_1_1_4_4B; - break; - case SPI_NOR_DUAL: -- nor->read_opcode = SPINOR_OP_READ4_1_1_2; -+ nor->read_opcode = SPINOR_OP_READ_1_1_2_4B; - break; - case SPI_NOR_FAST: -- nor->read_opcode = SPINOR_OP_READ4_FAST; -+ nor->read_opcode = SPINOR_OP_READ_FAST_4B; - break; - case SPI_NOR_NORMAL: -- nor->read_opcode = SPINOR_OP_READ4; -+ nor->read_opcode = SPINOR_OP_READ_4B; - break; - } - nor->program_opcode = SPINOR_OP_PP_4B; ---- a/drivers/spi/spi-bcm-qspi.c -+++ b/drivers/spi/spi-bcm-qspi.c -@@ -371,7 +371,7 @@ static int bcm_qspi_bspi_set_flex_mode(s - /* default mode, does not need flex_cmd */ - flex_mode = 0; - else -- command = SPINOR_OP_READ4_FAST; -+ command = SPINOR_OP_READ_FAST_4B; - break; - case SPI_NBITS_DUAL: - bpc = 0x00000001; -@@ -384,7 +384,7 @@ static int bcm_qspi_bspi_set_flex_mode(s - } else { - command = SPINOR_OP_READ_1_1_2; - if (spans_4byte) -- command = SPINOR_OP_READ4_1_1_2; -+ command = SPINOR_OP_READ_1_1_2_4B; - } - break; - case SPI_NBITS_QUAD: -@@ -399,7 +399,7 @@ static int bcm_qspi_bspi_set_flex_mode(s - } else { - command = SPINOR_OP_READ_1_1_4; - if (spans_4byte) -- command = SPINOR_OP_READ4_1_1_4; -+ command = SPINOR_OP_READ_1_1_4_4B; - } - break; - default: ---- a/include/linux/mtd/spi-nor.h -+++ b/include/linux/mtd/spi-nor.h -@@ -43,9 +43,13 @@ - #define SPINOR_OP_WRSR 0x01 /* Write status register 1 byte */ - #define SPINOR_OP_READ 0x03 /* Read data bytes (low frequency) */ - #define SPINOR_OP_READ_FAST 0x0b /* Read data bytes (high frequency) */ --#define SPINOR_OP_READ_1_1_2 0x3b /* Read data bytes (Dual SPI) */ --#define SPINOR_OP_READ_1_1_4 0x6b /* Read data bytes (Quad SPI) */ -+#define SPINOR_OP_READ_1_1_2 0x3b /* Read data bytes (Dual Output SPI) */ -+#define SPINOR_OP_READ_1_2_2 0xbb /* Read data bytes (Dual I/O SPI) */ -+#define SPINOR_OP_READ_1_1_4 0x6b /* Read data bytes (Quad Output SPI) */ -+#define SPINOR_OP_READ_1_4_4 0xeb /* Read data bytes (Quad I/O SPI) */ - #define SPINOR_OP_PP 0x02 /* Page program (up to 256 bytes) */ -+#define SPINOR_OP_PP_1_1_4 0x32 /* Quad page program */ -+#define SPINOR_OP_PP_1_4_4 0x38 /* Quad page program */ - #define SPINOR_OP_BE_4K 0x20 /* Erase 4KiB block */ - #define SPINOR_OP_BE_4K_PMC 0xd7 /* Erase 4KiB block on PMC chips */ - #define SPINOR_OP_BE_32K 0x52 /* Erase 32KiB block */ -@@ -56,11 +60,17 @@ - #define SPINOR_OP_RDFSR 0x70 /* Read flag status register */ - - /* 4-byte address opcodes - used on Spansion and some Macronix flashes. */ --#define SPINOR_OP_READ4 0x13 /* Read data bytes (low frequency) */ --#define SPINOR_OP_READ4_FAST 0x0c /* Read data bytes (high frequency) */ --#define SPINOR_OP_READ4_1_1_2 0x3c /* Read data bytes (Dual SPI) */ --#define SPINOR_OP_READ4_1_1_4 0x6c /* Read data bytes (Quad SPI) */ -+#define SPINOR_OP_READ_4B 0x13 /* Read data bytes (low frequency) */ -+#define SPINOR_OP_READ_FAST_4B 0x0c /* Read data bytes (high frequency) */ -+#define SPINOR_OP_READ_1_1_2_4B 0x3c /* Read data bytes (Dual Output SPI) */ -+#define SPINOR_OP_READ_1_2_2_4B 0xbc /* Read data bytes (Dual I/O SPI) */ -+#define SPINOR_OP_READ_1_1_4_4B 0x6c /* Read data bytes (Quad Output SPI) */ -+#define SPINOR_OP_READ_1_4_4_4B 0xec /* Read data bytes (Quad I/O SPI) */ - #define SPINOR_OP_PP_4B 0x12 /* Page program (up to 256 bytes) */ -+#define SPINOR_OP_PP_1_1_4_4B 0x34 /* Quad page program */ -+#define SPINOR_OP_PP_1_4_4_4B 0x3e /* Quad page program */ -+#define SPINOR_OP_BE_4K_4B 0x21 /* Erase 4KiB block */ -+#define SPINOR_OP_BE_32K_4B 0x5c /* Erase 32KiB block */ - #define SPINOR_OP_SE_4B 0xdc /* Sector erase (usually 64KiB) */ - - /* Used for SST flashes only. */ diff --git a/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch b/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch deleted file mode 100644 index 1d507c1920..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0005-mtd-spi-nor-add-a-stateless-method-to-support-memory.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 3274ba26f27becfc4193ec6e229288140651f240 Mon Sep 17 00:00:00 2001 -From: Cyrille Pitchen -Date: Thu, 27 Oct 2016 12:03:57 +0200 -Subject: [PATCH] mtd: spi-nor: add a stateless method to support memory size - above 128Mib - -This patch provides an alternative mean to support memory above 16MiB -(128Mib) by replacing 3byte address op codes by their associated 4byte -address versions. - -Using the dedicated 4byte address op codes doesn't change the internal -state of the SPI NOR memory as opposed to using other means such as -updating a Base Address Register (BAR) and sending command to enter/leave -the 4byte mode. - -Hence when a CPU reset occurs, early bootloaders don't need to be aware -of BAR value or 4byte mode being enabled: they can still access the first -16MiB of the SPI NOR memory using the regular 3byte address op codes. - -Signed-off-by: Cyrille Pitchen -Tested-by: Vignesh R -Acked-by: Marek Vasut ---- - drivers/mtd/spi-nor/spi-nor.c | 101 +++++++++++++++++++++++++++++++++--------- - 1 file changed, 80 insertions(+), 21 deletions(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -81,6 +81,10 @@ struct flash_info { - * because it has the same value as - * ATMEL flashes) - */ -+#define SPI_NOR_4B_OPCODES BIT(11) /* -+ * Use dedicated 4byte address op codes -+ * to support memory size above 128Mib. -+ */ - }; - - #define JEDEC_MFR(info) ((info)->id[0]) -@@ -194,6 +198,78 @@ static inline struct spi_nor *mtd_to_spi - return mtd->priv; - } - -+ -+static u8 spi_nor_convert_opcode(u8 opcode, const u8 table[][2], size_t size) -+{ -+ size_t i; -+ -+ for (i = 0; i < size; i++) -+ if (table[i][0] == opcode) -+ return table[i][1]; -+ -+ /* No conversion found, keep input op code. */ -+ return opcode; -+} -+ -+static inline u8 spi_nor_convert_3to4_read(u8 opcode) -+{ -+ static const u8 spi_nor_3to4_read[][2] = { -+ { SPINOR_OP_READ, SPINOR_OP_READ_4B }, -+ { SPINOR_OP_READ_FAST, SPINOR_OP_READ_FAST_4B }, -+ { SPINOR_OP_READ_1_1_2, SPINOR_OP_READ_1_1_2_4B }, -+ { SPINOR_OP_READ_1_2_2, SPINOR_OP_READ_1_2_2_4B }, -+ { SPINOR_OP_READ_1_1_4, SPINOR_OP_READ_1_1_4_4B }, -+ { SPINOR_OP_READ_1_4_4, SPINOR_OP_READ_1_4_4_4B }, -+ }; -+ -+ return spi_nor_convert_opcode(opcode, spi_nor_3to4_read, -+ ARRAY_SIZE(spi_nor_3to4_read)); -+} -+ -+static inline u8 spi_nor_convert_3to4_program(u8 opcode) -+{ -+ static const u8 spi_nor_3to4_program[][2] = { -+ { SPINOR_OP_PP, SPINOR_OP_PP_4B }, -+ { SPINOR_OP_PP_1_1_4, SPINOR_OP_PP_1_1_4_4B }, -+ { SPINOR_OP_PP_1_4_4, SPINOR_OP_PP_1_4_4_4B }, -+ }; -+ -+ return spi_nor_convert_opcode(opcode, spi_nor_3to4_program, -+ ARRAY_SIZE(spi_nor_3to4_program)); -+} -+ -+static inline u8 spi_nor_convert_3to4_erase(u8 opcode) -+{ -+ static const u8 spi_nor_3to4_erase[][2] = { -+ { SPINOR_OP_BE_4K, SPINOR_OP_BE_4K_4B }, -+ { SPINOR_OP_BE_32K, SPINOR_OP_BE_32K_4B }, -+ { SPINOR_OP_SE, SPINOR_OP_SE_4B }, -+ }; -+ -+ return spi_nor_convert_opcode(opcode, spi_nor_3to4_erase, -+ ARRAY_SIZE(spi_nor_3to4_erase)); -+} -+ -+static void spi_nor_set_4byte_opcodes(struct spi_nor *nor, -+ const struct flash_info *info) -+{ -+ /* Do some manufacturer fixups first */ -+ switch (JEDEC_MFR(info)) { -+ case SNOR_MFR_SPANSION: -+ /* No small sector erase for 4-byte command set */ -+ nor->erase_opcode = SPINOR_OP_SE; -+ nor->mtd.erasesize = info->sector_size; -+ break; -+ -+ default: -+ break; -+ } -+ -+ nor->read_opcode = spi_nor_convert_3to4_read(nor->read_opcode); -+ nor->program_opcode = spi_nor_convert_3to4_program(nor->program_opcode); -+ nor->erase_opcode = spi_nor_convert_3to4_erase(nor->erase_opcode); -+} -+ - /* Enable/disable 4-byte addressing mode. */ - static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info, - int enable) -@@ -1634,27 +1710,10 @@ int spi_nor_scan(struct spi_nor *nor, co - else if (mtd->size > 0x1000000) { - /* enable 4-byte addressing if the device exceeds 16MiB */ - nor->addr_width = 4; -- if (JEDEC_MFR(info) == SNOR_MFR_SPANSION) { -- /* Dedicated 4-byte command set */ -- switch (nor->flash_read) { -- case SPI_NOR_QUAD: -- nor->read_opcode = SPINOR_OP_READ_1_1_4_4B; -- break; -- case SPI_NOR_DUAL: -- nor->read_opcode = SPINOR_OP_READ_1_1_2_4B; -- break; -- case SPI_NOR_FAST: -- nor->read_opcode = SPINOR_OP_READ_FAST_4B; -- break; -- case SPI_NOR_NORMAL: -- nor->read_opcode = SPINOR_OP_READ_4B; -- break; -- } -- nor->program_opcode = SPINOR_OP_PP_4B; -- /* No small sector erase for 4-byte command set */ -- nor->erase_opcode = SPINOR_OP_SE_4B; -- mtd->erasesize = info->sector_size; -- } else -+ if (JEDEC_MFR(info) == SNOR_MFR_SPANSION || -+ info->flags & SPI_NOR_4B_OPCODES) -+ spi_nor_set_4byte_opcodes(nor, info); -+ else - set_4byte(nor, info, 1); - } else { - nor->addr_width = 3; diff --git a/target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch b/target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch deleted file mode 100644 index be78682193..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0006-mtd-spi-nor-Add-lock-unlock-support-for-f25l32pa.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 252c36bb9c7b98b356f033d16ea83d20fb8b4d3e Mon Sep 17 00:00:00 2001 -From: Victor Shyba -Date: Mon, 2 Jan 2017 22:34:30 -0300 -Subject: [PATCH] mtd: spi-nor: Add lock/unlock support for f25l32pa - -This chip has write protection enabled on power-up, -so this flag is necessary to support write operations. - -Signed-off-by: Victor Shyba -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -956,7 +956,7 @@ static const struct flash_info spi_nor_i - { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) }, - - /* ESMT */ -- { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) }, -+ { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_HAS_LOCK) }, - - /* Everspin */ - { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, diff --git a/target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch b/target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch deleted file mode 100644 index f8d0541428..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5f0e0758efddef5b06994a76d8c7f0b8a4c1daae Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda -Date: Wed, 18 Jan 2017 17:40:16 +0100 -Subject: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation - -The page calculation under spi_nor_s3an_addr_convert() was wrong. On -Default Address Mode we need to perform a divide by page_size. - -Signed-off-by: Ricardo Ribalda Delgado -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -431,11 +431,14 @@ static void spi_nor_unlock_and_unprep(st - */ - static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr) - { -- unsigned int offset = addr; -+ unsigned int offset; -+ unsigned int page; - -- offset %= nor->page_size; -+ offset = addr % nor->page_size; -+ page = addr / nor->page_size; -+ page <<= (nor->page_size > 512) ? 10 : 9; - -- return ((addr - offset) << 1) | offset; -+ return page | offset; - } - - /* diff --git a/target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch b/target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch deleted file mode 100644 index 5253957286..0000000000 --- a/target/linux/generic/backport-4.9/062-v4.11-0008-mtd-spi-nor-Add-support-for-gd25q16.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4c5747a390acc9d1da3b332507c8bae7a8ddfc48 Mon Sep 17 00:00:00 2001 -From: Kamal Dasu -Date: Fri, 20 Jan 2017 14:25:51 -0500 -Subject: [PATCH] mtd: spi-nor: Add support for gd25q16 - -Add GigaDevice GD25Q16 (16M-bit) to supported list. - -Signed-off-by: Kamal Dasu -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -971,6 +971,11 @@ static const struct flash_info spi_nor_i - - /* GigaDevice */ - { -+ "gd25q16", INFO(0xc84015, 0, 64 * 1024, 32, -+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | -+ SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) -+ }, -+ { - "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) diff --git a/target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch b/target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch deleted file mode 100644 index cbab378b2b..0000000000 --- a/target/linux/generic/backport-4.9/063-v4.11-0001-mtd-nand-Add-Winbond-manufacturer-id.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4077ce5871304f8a78f80b74b18b6052a410f1a Mon Sep 17 00:00:00 2001 -From: "Andrey Jr. Melnikov" -Date: Thu, 8 Dec 2016 19:57:08 +0300 -Subject: [PATCH] mtd: nand: Add Winbond manufacturer id - -Add WINBOND manufacturer id. - -Signed-off-by: Andrey Jr. Melnikov -Signed-off-by: Boris Brezillon ---- - drivers/mtd/nand/nand_ids.c | 1 + - include/linux/mtd/nand.h | 1 + - 2 files changed, 2 insertions(+) - ---- a/drivers/mtd/nand/nand_ids.c -+++ b/drivers/mtd/nand/nand_ids.c -@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids - {NAND_MFR_SANDISK, "SanDisk"}, - {NAND_MFR_INTEL, "Intel"}, - {NAND_MFR_ATO, "ATO"}, -+ {NAND_MFR_WINBOND, "Winbond"}, - {0x0, "Unknown"} - }; - ---- a/include/linux/mtd/nand.h -+++ b/include/linux/mtd/nand.h -@@ -928,6 +928,7 @@ static inline void nand_set_controller_d - #define NAND_MFR_SANDISK 0x45 - #define NAND_MFR_INTEL 0x89 - #define NAND_MFR_ATO 0x9b -+#define NAND_MFR_WINBOND 0xef - - /* The maximum expected count of bytes in the NAND ID sequence */ - #define NAND_MAX_ID_LEN 8 diff --git a/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch b/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch deleted file mode 100644 index b2549ca3c4..0000000000 --- a/target/linux/generic/backport-4.9/063-v4.11-0002-mtd-introduce-function-max_bad_blocks.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 6080ef6e7c0a0592cbcca11200d879faf65e27d4 Mon Sep 17 00:00:00 2001 -From: Jeff Westfahl -Date: Tue, 10 Jan 2017 13:30:17 -0600 -Subject: [PATCH] mtd: introduce function max_bad_blocks - -If implemented, 'max_bad_blocks' returns the maximum number of bad -blocks to reserve for a MTD. An implementation for NAND is coming soon. - -Signed-off-by: Jeff Westfahl -Signed-off-by: Zach Brown -Acked-by: Boris Brezillon -Acked-by: Brian Norris -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 10 ++++++++++ - include/linux/mtd/mtd.h | 13 +++++++++++++ - 2 files changed, 23 insertions(+) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -349,6 +349,14 @@ static const struct mtd_ooblayout_ops pa - .free = part_ooblayout_free, - }; - -+static int part_max_bad_blocks(struct mtd_info *mtd, loff_t ofs, size_t len) -+{ -+ struct mtd_part *part = mtd_to_part(mtd); -+ -+ return part->master->_max_bad_blocks(part->master, -+ ofs + part->offset, len); -+} -+ - static inline void free_partition(struct mtd_part *p) - { - kfree(p->mtd.name); -@@ -475,6 +483,8 @@ static struct mtd_part *allocate_partiti - slave->mtd._block_isbad = part_block_isbad; - if (master->_block_markbad) - slave->mtd._block_markbad = part_block_markbad; -+ if (master->_max_bad_blocks) -+ slave->mtd._max_bad_blocks = part_max_bad_blocks; - - if (master->_get_device) - slave->mtd._get_device = part_get_device; ---- a/include/linux/mtd/mtd.h -+++ b/include/linux/mtd/mtd.h -@@ -322,6 +322,7 @@ struct mtd_info { - int (*_block_isreserved) (struct mtd_info *mtd, loff_t ofs); - int (*_block_isbad) (struct mtd_info *mtd, loff_t ofs); - int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs); -+ int (*_max_bad_blocks) (struct mtd_info *mtd, loff_t ofs, size_t len); - int (*_suspend) (struct mtd_info *mtd); - void (*_resume) (struct mtd_info *mtd); - void (*_reboot) (struct mtd_info *mtd); -@@ -397,6 +398,18 @@ static inline u32 mtd_oobavail(struct mt - return ops->mode == MTD_OPS_AUTO_OOB ? mtd->oobavail : mtd->oobsize; - } - -+static inline int mtd_max_bad_blocks(struct mtd_info *mtd, -+ loff_t ofs, size_t len) -+{ -+ if (!mtd->_max_bad_blocks) -+ return -ENOTSUPP; -+ -+ if (mtd->size < (len + ofs) || ofs < 0) -+ return -EINVAL; -+ -+ return mtd->_max_bad_blocks(mtd, ofs, len); -+} -+ - int mtd_wunit_to_pairing_info(struct mtd_info *mtd, int wunit, - struct mtd_pairing_info *info); - int mtd_pairing_info_to_wunit(struct mtd_info *mtd, diff --git a/target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch b/target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch deleted file mode 100644 index ea68fc474f..0000000000 --- a/target/linux/generic/backport-4.9/063-v4.11-0003-mtd-Add-partition-device-node-to-mtd-partition-devic.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42e9401bd1467d22c4dc4d2c637347b874e6a80b Mon Sep 17 00:00:00 2001 -From: Sascha Hauer -Date: Thu, 9 Feb 2017 11:50:24 +0100 -Subject: [PATCH] mtd: Add partition device node to mtd partition devices -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The user visible change here is that mtd partitions get an of_node link -in sysfs. - -Signed-off-by: Sascha Hauer -Signed-off-by: Uwe Kleine-König -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 1 + - drivers/mtd/ofpart.c | 1 + - include/linux/mtd/partitions.h | 1 + - 3 files changed, 3 insertions(+) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -432,6 +432,7 @@ static struct mtd_part *allocate_partiti - slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) ? - &master->dev : - master->dev.parent; -+ slave->mtd.dev.of_node = part->of_node; - - slave->mtd._read = part_read; - slave->mtd._write = part_write; ---- a/drivers/mtd/ofpart.c -+++ b/drivers/mtd/ofpart.c -@@ -108,6 +108,7 @@ static int parse_ofpart_partitions(struc - - parts[i].offset = of_read_number(reg, a_cells); - parts[i].size = of_read_number(reg + a_cells, s_cells); -+ parts[i].of_node = pp; - - partname = of_get_property(pp, "label", &len); - if (!partname) ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -41,6 +41,7 @@ struct mtd_partition { - uint64_t size; /* partition size */ - uint64_t offset; /* offset within the master MTD space */ - uint32_t mask_flags; /* master MTD flags to mask out for this partition */ -+ struct device_node *of_node; - }; - - #define MTDPART_OFS_RETAIN (-3) diff --git a/target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch b/target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch deleted file mode 100644 index d1544b1d36..0000000000 --- a/target/linux/generic/backport-4.9/064-v4.12-mtd-spi-nor-enable-stateless-4b-op-codes-for-mx25u25.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0fcb4b413028376894feaaaf62bcb09ab1b52f2 Mon Sep 17 00:00:00 2001 -From: Mathias Kresin -Date: Thu, 13 Apr 2017 09:23:54 +0200 -Subject: [PATCH] mtd: spi-nor: enable stateless 4b op codes for mx25u25635f - -All required stateless 4-byte op codes are supported by this flash -chip. The stateless 4-byte support can't be autodetected due to a -missing 4-byte Address Instruction Table in SFDP. - -Fixes hangs on reboot for SoCs expecting the flash chip in 3byte mode. - -Signed-off-by: Mathias Kresin -Acked-by: Marek Vasut -Signed-off-by: Cyrille Pitchen ---- - drivers/mtd/spi-nor/spi-nor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1023,7 +1023,7 @@ static const struct flash_info spi_nor_i - { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, - { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, - { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, -- { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K) }, -+ { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) }, - { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, - { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) }, - { "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) }, diff --git a/target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch b/target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch deleted file mode 100644 index d912811850..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0001-mtd-handle-partitioning-on-devices-with-0-erasesize.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1eeef2d7483a7e3f8d2dd2a5b9939b3b814dc549 Mon Sep 17 00:00:00 2001 -From: Chris Packham -Date: Fri, 9 Jun 2017 15:58:31 +1200 -Subject: [PATCH] mtd: handle partitioning on devices with 0 erasesize - -erasesize is meaningful for flash devices but for SRAM there is no -concept of an erase block so erasesize is set to 0. When partitioning -these devices instead of ensuring partitions fall on erasesize -boundaries we ensure they fall on writesize boundaries. - -Helped-by: Boris Brezillon -Signed-off-by: Chris Packham -Acked-by: Boris Brezillon -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -393,8 +393,12 @@ static struct mtd_part *allocate_partiti - const struct mtd_partition *part, int partno, - uint64_t cur_offset) - { -+ int wr_alignment = (master->flags & MTD_NO_ERASE) ? master->writesize: -+ master->erasesize; - struct mtd_part *slave; -+ u32 remainder; - char *name; -+ u64 tmp; - - /* allocate the partition structure */ - slave = kzalloc(sizeof(*slave), GFP_KERNEL); -@@ -499,10 +503,11 @@ static struct mtd_part *allocate_partiti - if (slave->offset == MTDPART_OFS_APPEND) - slave->offset = cur_offset; - if (slave->offset == MTDPART_OFS_NXTBLK) { -+ tmp = cur_offset; - slave->offset = cur_offset; -- if (mtd_mod_by_eb(cur_offset, master) != 0) { -- /* Round up to next erasesize */ -- slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize; -+ remainder = do_div(tmp, wr_alignment); -+ if (remainder) { -+ slave->offset += wr_alignment - remainder; - printk(KERN_NOTICE "Moving partition %d: " - "0x%012llx -> 0x%012llx\n", partno, - (unsigned long long)cur_offset, (unsigned long long)slave->offset); -@@ -567,19 +572,22 @@ static struct mtd_part *allocate_partiti - slave->mtd.erasesize = master->erasesize; - } - -- if ((slave->mtd.flags & MTD_WRITEABLE) && -- mtd_mod_by_eb(slave->offset, &slave->mtd)) { -+ tmp = slave->offset; -+ remainder = do_div(tmp, wr_alignment); -+ if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) { - /* Doesn't start on a boundary of major erase size */ - /* FIXME: Let it be writable if it is on a boundary of - * _minor_ erase size though */ - slave->mtd.flags &= ~MTD_WRITEABLE; -- printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n", -+ printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n", - part->name); - } -- if ((slave->mtd.flags & MTD_WRITEABLE) && -- mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) { -+ -+ tmp = slave->mtd.size; -+ remainder = do_div(tmp, wr_alignment); -+ if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) { - slave->mtd.flags &= ~MTD_WRITEABLE; -- printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n", -+ printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n", - part->name); - } - diff --git a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch deleted file mode 100644 index 70c1462d3f..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 01f9c7240a900d5676a8496496f2974dd36996b1 Mon Sep 17 00:00:00 2001 -From: Brian Norris -Date: Tue, 23 May 2017 07:30:20 +0200 -Subject: [PATCH] mtd: partitions: factor out code calling parser -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This code is going to be reused for parsers matched using OF so let's -factor it out to make this easier. - -Signed-off-by: Brian Norris -Signed-off-by: Rafał Miłecki -Acked-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 33 ++++++++++++++++++++++++--------- - 1 file changed, 24 insertions(+), 9 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -832,6 +832,27 @@ static const char * const default_mtd_pa - NULL - }; - -+static int mtd_part_do_parse(struct mtd_part_parser *parser, -+ struct mtd_info *master, -+ struct mtd_partitions *pparts, -+ struct mtd_part_parser_data *data) -+{ -+ int ret; -+ -+ ret = (*parser->parse_fn)(master, &pparts->parts, data); -+ pr_debug("%s: parser %s: %i\n", master->name, parser->name, ret); -+ if (ret <= 0) -+ return ret; -+ -+ pr_notice("%d %s partitions found on MTD device %s\n", ret, -+ parser->name, master->name); -+ -+ pparts->nr_parts = ret; -+ pparts->parser = parser; -+ -+ return ret; -+} -+ - /** - * parse_mtd_partitions - parse MTD partitions - * @master: the master partition (describes whole MTD device) -@@ -872,16 +893,10 @@ int parse_mtd_partitions(struct mtd_info - parser ? parser->name : NULL); - if (!parser) - continue; -- ret = (*parser->parse_fn)(master, &pparts->parts, data); -- pr_debug("%s: parser %s: %i\n", -- master->name, parser->name, ret); -- if (ret > 0) { -- printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n", -- ret, parser->name, master->name); -- pparts->nr_parts = ret; -- pparts->parser = parser; -+ ret = mtd_part_do_parse(parser, master, pparts, data); -+ /* Found partitions! */ -+ if (ret > 0) - return 0; -- } - mtd_part_parser_put(parser); - /* - * Stash the first error we see; only report it if no parser diff --git a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch deleted file mode 100644 index dea64a1f6d..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 08263a9ae664b24fa777d20b365601534842b236 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:42 +0200 -Subject: [PATCH] mtd: partitions: add helper for deleting partition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There are two similar functions handling deletion. One handles single -partition and another the whole MTD flash device. They share (duplicate) -some code so it makes sense to add a small helper for that part. - -Function del_mtd_partitions has been moved a bit to keep all deleting -stuff together. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 75 +++++++++++++++++++++++++++++---------------------- - 1 file changed, 43 insertions(+), 32 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -363,32 +363,6 @@ static inline void free_partition(struct - kfree(p); - } - --/* -- * This function unregisters and destroy all slave MTD objects which are -- * attached to the given master MTD object. -- */ -- --int del_mtd_partitions(struct mtd_info *master) --{ -- struct mtd_part *slave, *next; -- int ret, err = 0; -- -- mutex_lock(&mtd_partitions_mutex); -- list_for_each_entry_safe(slave, next, &mtd_partitions, list) -- if (slave->master == master) { -- ret = del_mtd_device(&slave->mtd); -- if (ret < 0) { -- err = ret; -- continue; -- } -- list_del(&slave->list); -- free_partition(slave); -- } -- mutex_unlock(&mtd_partitions_mutex); -- -- return err; --} -- - static struct mtd_part *allocate_partition(struct mtd_info *master, - const struct mtd_partition *part, int partno, - uint64_t cur_offset) -@@ -686,6 +660,48 @@ err_remove_part: - } - EXPORT_SYMBOL_GPL(mtd_add_partition); - -+/** -+ * __mtd_del_partition - delete MTD partition -+ * -+ * @priv: internal MTD struct for partition to be deleted -+ * -+ * This function must be called with the partitions mutex locked. -+ */ -+static int __mtd_del_partition(struct mtd_part *priv) -+{ -+ int err; -+ -+ err = del_mtd_device(&priv->mtd); -+ if (err) -+ return err; -+ -+ list_del(&priv->list); -+ free_partition(priv); -+ -+ return 0; -+} -+ -+/* -+ * This function unregisters and destroy all slave MTD objects which are -+ * attached to the given master MTD object. -+ */ -+int del_mtd_partitions(struct mtd_info *master) -+{ -+ struct mtd_part *slave, *next; -+ int ret, err = 0; -+ -+ mutex_lock(&mtd_partitions_mutex); -+ list_for_each_entry_safe(slave, next, &mtd_partitions, list) -+ if (slave->master == master) { -+ ret = __mtd_del_partition(slave); -+ if (ret < 0) -+ err = ret; -+ } -+ mutex_unlock(&mtd_partitions_mutex); -+ -+ return err; -+} -+ - int mtd_del_partition(struct mtd_info *master, int partno) - { - struct mtd_part *slave, *next; -@@ -697,12 +713,7 @@ int mtd_del_partition(struct mtd_info *m - (slave->mtd.index == partno)) { - sysfs_remove_files(&slave->mtd.dev.kobj, - mtd_partition_attrs); -- ret = del_mtd_device(&slave->mtd); -- if (ret < 0) -- break; -- -- list_del(&slave->list); -- free_partition(slave); -+ ret = __mtd_del_partition(slave); - break; - } - mutex_unlock(&mtd_partitions_mutex); diff --git a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch deleted file mode 100644 index 72edb25cc3..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c5ceaba74083daf619bdb34d4871e297a177eebf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:43 +0200 -Subject: [PATCH] mtd: partitions: remove sysfs files when deleting all - master's partitions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When support for sysfs "offset" file was added it missed to update the -del_mtd_partitions function. It deletes partitions just like -mtd_del_partition does so both should also take care of removing sysfs -files. - -This change moves sysfs_remove_files call to the shared function to fix -this issue. - -Fixes: a62c24d755291 ("mtd: part: Add sysfs variable for offset of partition") -Cc: Dan Ehrenberg -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -671,6 +671,8 @@ static int __mtd_del_partition(struct mt - { - int err; - -+ sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs); -+ - err = del_mtd_device(&priv->mtd); - if (err) - return err; -@@ -711,8 +713,6 @@ int mtd_del_partition(struct mtd_info *m - list_for_each_entry_safe(slave, next, &mtd_partitions, list) - if ((slave->master == master) && - (slave->mtd.index == partno)) { -- sysfs_remove_files(&slave->mtd.dev.kobj, -- mtd_partition_attrs); - ret = __mtd_del_partition(slave); - break; - } diff --git a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch deleted file mode 100644 index 490eaa2e7c..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch +++ /dev/null @@ -1,606 +0,0 @@ -From 0a9d72b69da6d8dae1abd7990c6c4c749846ef3e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:44 +0200 -Subject: [PATCH] mtd: partitions: rename "master" to the "parent" where - appropriate -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This prepares mtd subsystem for the new feature: subpartitions. In some -cases flash device partition can be a container with extra subpartitions -(volumes). - -So far there was a flat structure implemented. One master (flash device) -could be partitioned into few partitions. Every partition got its master -and it was enough to get things running. - -To support subpartitions we need to store pointer to the parent for each -partition. This is required to implement more natural tree structure and -handle all recursion and offsets calculation. - -To make code consistent this patch renamed "master" to the "parent" in -places where we can be dealing with subpartitions. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 204 ++++++++++++++++++++++++++------------------------ - 1 file changed, 105 insertions(+), 99 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -37,10 +37,16 @@ - static LIST_HEAD(mtd_partitions); - static DEFINE_MUTEX(mtd_partitions_mutex); - --/* Our partition node structure */ -+/** -+ * struct mtd_part - our partition node structure -+ * -+ * @mtd: struct holding partition details -+ * @parent: parent mtd - flash device or another partition -+ * @offset: partition offset relative to the *flash device* -+ */ - struct mtd_part { - struct mtd_info mtd; -- struct mtd_info *master; -+ struct mtd_info *parent; - uint64_t offset; - struct list_head list; - }; -@@ -67,15 +73,15 @@ static int part_read(struct mtd_info *mt - struct mtd_ecc_stats stats; - int res; - -- stats = part->master->ecc_stats; -- res = part->master->_read(part->master, from + part->offset, len, -+ stats = part->parent->ecc_stats; -+ res = part->parent->_read(part->parent, from + part->offset, len, - retlen, buf); - if (unlikely(mtd_is_eccerr(res))) - mtd->ecc_stats.failed += -- part->master->ecc_stats.failed - stats.failed; -+ part->parent->ecc_stats.failed - stats.failed; - else - mtd->ecc_stats.corrected += -- part->master->ecc_stats.corrected - stats.corrected; -+ part->parent->ecc_stats.corrected - stats.corrected; - return res; - } - -@@ -84,7 +90,7 @@ static int part_point(struct mtd_info *m - { - struct mtd_part *part = mtd_to_part(mtd); - -- return part->master->_point(part->master, from + part->offset, len, -+ return part->parent->_point(part->parent, from + part->offset, len, - retlen, virt, phys); - } - -@@ -92,7 +98,7 @@ static int part_unpoint(struct mtd_info - { - struct mtd_part *part = mtd_to_part(mtd); - -- return part->master->_unpoint(part->master, from + part->offset, len); -+ return part->parent->_unpoint(part->parent, from + part->offset, len); - } - - static unsigned long part_get_unmapped_area(struct mtd_info *mtd, -@@ -103,7 +109,7 @@ static unsigned long part_get_unmapped_a - struct mtd_part *part = mtd_to_part(mtd); - - offset += part->offset; -- return part->master->_get_unmapped_area(part->master, len, offset, -+ return part->parent->_get_unmapped_area(part->parent, len, offset, - flags); - } - -@@ -132,7 +138,7 @@ static int part_read_oob(struct mtd_info - return -EINVAL; - } - -- res = part->master->_read_oob(part->master, from + part->offset, ops); -+ res = part->parent->_read_oob(part->parent, from + part->offset, ops); - if (unlikely(res)) { - if (mtd_is_bitflip(res)) - mtd->ecc_stats.corrected++; -@@ -146,7 +152,7 @@ static int part_read_user_prot_reg(struc - size_t len, size_t *retlen, u_char *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_read_user_prot_reg(part->master, from, len, -+ return part->parent->_read_user_prot_reg(part->parent, from, len, - retlen, buf); - } - -@@ -154,7 +160,7 @@ static int part_get_user_prot_info(struc - size_t *retlen, struct otp_info *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_get_user_prot_info(part->master, len, retlen, -+ return part->parent->_get_user_prot_info(part->parent, len, retlen, - buf); - } - -@@ -162,7 +168,7 @@ static int part_read_fact_prot_reg(struc - size_t len, size_t *retlen, u_char *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_read_fact_prot_reg(part->master, from, len, -+ return part->parent->_read_fact_prot_reg(part->parent, from, len, - retlen, buf); - } - -@@ -170,7 +176,7 @@ static int part_get_fact_prot_info(struc - size_t *retlen, struct otp_info *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_get_fact_prot_info(part->master, len, retlen, -+ return part->parent->_get_fact_prot_info(part->parent, len, retlen, - buf); - } - -@@ -178,7 +184,7 @@ static int part_write(struct mtd_info *m - size_t *retlen, const u_char *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_write(part->master, to + part->offset, len, -+ return part->parent->_write(part->parent, to + part->offset, len, - retlen, buf); - } - -@@ -186,7 +192,7 @@ static int part_panic_write(struct mtd_i - size_t *retlen, const u_char *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_panic_write(part->master, to + part->offset, len, -+ return part->parent->_panic_write(part->parent, to + part->offset, len, - retlen, buf); - } - -@@ -199,14 +205,14 @@ static int part_write_oob(struct mtd_inf - return -EINVAL; - if (ops->datbuf && to + ops->len > mtd->size) - return -EINVAL; -- return part->master->_write_oob(part->master, to + part->offset, ops); -+ return part->parent->_write_oob(part->parent, to + part->offset, ops); - } - - static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from, - size_t len, size_t *retlen, u_char *buf) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_write_user_prot_reg(part->master, from, len, -+ return part->parent->_write_user_prot_reg(part->parent, from, len, - retlen, buf); - } - -@@ -214,14 +220,14 @@ static int part_lock_user_prot_reg(struc - size_t len) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_lock_user_prot_reg(part->master, from, len); -+ return part->parent->_lock_user_prot_reg(part->parent, from, len); - } - - static int part_writev(struct mtd_info *mtd, const struct kvec *vecs, - unsigned long count, loff_t to, size_t *retlen) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_writev(part->master, vecs, count, -+ return part->parent->_writev(part->parent, vecs, count, - to + part->offset, retlen); - } - -@@ -231,7 +237,7 @@ static int part_erase(struct mtd_info *m - int ret; - - instr->addr += part->offset; -- ret = part->master->_erase(part->master, instr); -+ ret = part->parent->_erase(part->parent, instr); - if (ret) { - if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) - instr->fail_addr -= part->offset; -@@ -257,51 +263,51 @@ EXPORT_SYMBOL_GPL(mtd_erase_callback); - static int part_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_lock(part->master, ofs + part->offset, len); -+ return part->parent->_lock(part->parent, ofs + part->offset, len); - } - - static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_unlock(part->master, ofs + part->offset, len); -+ return part->parent->_unlock(part->parent, ofs + part->offset, len); - } - - static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_is_locked(part->master, ofs + part->offset, len); -+ return part->parent->_is_locked(part->parent, ofs + part->offset, len); - } - - static void part_sync(struct mtd_info *mtd) - { - struct mtd_part *part = mtd_to_part(mtd); -- part->master->_sync(part->master); -+ part->parent->_sync(part->parent); - } - - static int part_suspend(struct mtd_info *mtd) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_suspend(part->master); -+ return part->parent->_suspend(part->parent); - } - - static void part_resume(struct mtd_info *mtd) - { - struct mtd_part *part = mtd_to_part(mtd); -- part->master->_resume(part->master); -+ part->parent->_resume(part->parent); - } - - static int part_block_isreserved(struct mtd_info *mtd, loff_t ofs) - { - struct mtd_part *part = mtd_to_part(mtd); - ofs += part->offset; -- return part->master->_block_isreserved(part->master, ofs); -+ return part->parent->_block_isreserved(part->parent, ofs); - } - - static int part_block_isbad(struct mtd_info *mtd, loff_t ofs) - { - struct mtd_part *part = mtd_to_part(mtd); - ofs += part->offset; -- return part->master->_block_isbad(part->master, ofs); -+ return part->parent->_block_isbad(part->parent, ofs); - } - - static int part_block_markbad(struct mtd_info *mtd, loff_t ofs) -@@ -310,7 +316,7 @@ static int part_block_markbad(struct mtd - int res; - - ofs += part->offset; -- res = part->master->_block_markbad(part->master, ofs); -+ res = part->parent->_block_markbad(part->parent, ofs); - if (!res) - mtd->ecc_stats.badblocks++; - return res; -@@ -319,13 +325,13 @@ static int part_block_markbad(struct mtd - static int part_get_device(struct mtd_info *mtd) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->master->_get_device(part->master); -+ return part->parent->_get_device(part->parent); - } - - static void part_put_device(struct mtd_info *mtd) - { - struct mtd_part *part = mtd_to_part(mtd); -- part->master->_put_device(part->master); -+ part->parent->_put_device(part->parent); - } - - static int part_ooblayout_ecc(struct mtd_info *mtd, int section, -@@ -333,7 +339,7 @@ static int part_ooblayout_ecc(struct mtd - { - struct mtd_part *part = mtd_to_part(mtd); - -- return mtd_ooblayout_ecc(part->master, section, oobregion); -+ return mtd_ooblayout_ecc(part->parent, section, oobregion); - } - - static int part_ooblayout_free(struct mtd_info *mtd, int section, -@@ -341,7 +347,7 @@ static int part_ooblayout_free(struct mt - { - struct mtd_part *part = mtd_to_part(mtd); - -- return mtd_ooblayout_free(part->master, section, oobregion); -+ return mtd_ooblayout_free(part->parent, section, oobregion); - } - - static const struct mtd_ooblayout_ops part_ooblayout_ops = { -@@ -353,7 +359,7 @@ static int part_max_bad_blocks(struct mt - { - struct mtd_part *part = mtd_to_part(mtd); - -- return part->master->_max_bad_blocks(part->master, -+ return part->parent->_max_bad_blocks(part->parent, - ofs + part->offset, len); - } - -@@ -363,12 +369,12 @@ static inline void free_partition(struct - kfree(p); - } - --static struct mtd_part *allocate_partition(struct mtd_info *master, -+static struct mtd_part *allocate_partition(struct mtd_info *parent, - const struct mtd_partition *part, int partno, - uint64_t cur_offset) - { -- int wr_alignment = (master->flags & MTD_NO_ERASE) ? master->writesize: -- master->erasesize; -+ int wr_alignment = (parent->flags & MTD_NO_ERASE) ? parent->writesize: -+ parent->erasesize; - struct mtd_part *slave; - u32 remainder; - char *name; -@@ -379,25 +385,25 @@ static struct mtd_part *allocate_partiti - name = kstrdup(part->name, GFP_KERNEL); - if (!name || !slave) { - printk(KERN_ERR"memory allocation error while creating partitions for \"%s\"\n", -- master->name); -+ parent->name); - kfree(name); - kfree(slave); - return ERR_PTR(-ENOMEM); - } - - /* set up the MTD object for this partition */ -- slave->mtd.type = master->type; -- slave->mtd.flags = master->flags & ~part->mask_flags; -+ slave->mtd.type = parent->type; -+ slave->mtd.flags = parent->flags & ~part->mask_flags; - slave->mtd.size = part->size; -- slave->mtd.writesize = master->writesize; -- slave->mtd.writebufsize = master->writebufsize; -- slave->mtd.oobsize = master->oobsize; -- slave->mtd.oobavail = master->oobavail; -- slave->mtd.subpage_sft = master->subpage_sft; -- slave->mtd.pairing = master->pairing; -+ slave->mtd.writesize = parent->writesize; -+ slave->mtd.writebufsize = parent->writebufsize; -+ slave->mtd.oobsize = parent->oobsize; -+ slave->mtd.oobavail = parent->oobavail; -+ slave->mtd.subpage_sft = parent->subpage_sft; -+ slave->mtd.pairing = parent->pairing; - - slave->mtd.name = name; -- slave->mtd.owner = master->owner; -+ slave->mtd.owner = parent->owner; - - /* NOTE: Historically, we didn't arrange MTDs as a tree out of - * concern for showing the same data in multiple partitions. -@@ -408,70 +414,70 @@ static struct mtd_part *allocate_partiti - * distinguish between the master and the partition in sysfs. - */ - slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) ? -- &master->dev : -- master->dev.parent; -+ &parent->dev : -+ parent->dev.parent; - slave->mtd.dev.of_node = part->of_node; - - slave->mtd._read = part_read; - slave->mtd._write = part_write; - -- if (master->_panic_write) -+ if (parent->_panic_write) - slave->mtd._panic_write = part_panic_write; - -- if (master->_point && master->_unpoint) { -+ if (parent->_point && parent->_unpoint) { - slave->mtd._point = part_point; - slave->mtd._unpoint = part_unpoint; - } - -- if (master->_get_unmapped_area) -+ if (parent->_get_unmapped_area) - slave->mtd._get_unmapped_area = part_get_unmapped_area; -- if (master->_read_oob) -+ if (parent->_read_oob) - slave->mtd._read_oob = part_read_oob; -- if (master->_write_oob) -+ if (parent->_write_oob) - slave->mtd._write_oob = part_write_oob; -- if (master->_read_user_prot_reg) -+ if (parent->_read_user_prot_reg) - slave->mtd._read_user_prot_reg = part_read_user_prot_reg; -- if (master->_read_fact_prot_reg) -+ if (parent->_read_fact_prot_reg) - slave->mtd._read_fact_prot_reg = part_read_fact_prot_reg; -- if (master->_write_user_prot_reg) -+ if (parent->_write_user_prot_reg) - slave->mtd._write_user_prot_reg = part_write_user_prot_reg; -- if (master->_lock_user_prot_reg) -+ if (parent->_lock_user_prot_reg) - slave->mtd._lock_user_prot_reg = part_lock_user_prot_reg; -- if (master->_get_user_prot_info) -+ if (parent->_get_user_prot_info) - slave->mtd._get_user_prot_info = part_get_user_prot_info; -- if (master->_get_fact_prot_info) -+ if (parent->_get_fact_prot_info) - slave->mtd._get_fact_prot_info = part_get_fact_prot_info; -- if (master->_sync) -+ if (parent->_sync) - slave->mtd._sync = part_sync; -- if (!partno && !master->dev.class && master->_suspend && -- master->_resume) { -+ if (!partno && !parent->dev.class && parent->_suspend && -+ parent->_resume) { - slave->mtd._suspend = part_suspend; - slave->mtd._resume = part_resume; - } -- if (master->_writev) -+ if (parent->_writev) - slave->mtd._writev = part_writev; -- if (master->_lock) -+ if (parent->_lock) - slave->mtd._lock = part_lock; -- if (master->_unlock) -+ if (parent->_unlock) - slave->mtd._unlock = part_unlock; -- if (master->_is_locked) -+ if (parent->_is_locked) - slave->mtd._is_locked = part_is_locked; -- if (master->_block_isreserved) -+ if (parent->_block_isreserved) - slave->mtd._block_isreserved = part_block_isreserved; -- if (master->_block_isbad) -+ if (parent->_block_isbad) - slave->mtd._block_isbad = part_block_isbad; -- if (master->_block_markbad) -+ if (parent->_block_markbad) - slave->mtd._block_markbad = part_block_markbad; -- if (master->_max_bad_blocks) -+ if (parent->_max_bad_blocks) - slave->mtd._max_bad_blocks = part_max_bad_blocks; - -- if (master->_get_device) -+ if (parent->_get_device) - slave->mtd._get_device = part_get_device; -- if (master->_put_device) -+ if (parent->_put_device) - slave->mtd._put_device = part_put_device; - - slave->mtd._erase = part_erase; -- slave->master = master; -+ slave->parent = parent; - slave->offset = part->offset; - - if (slave->offset == MTDPART_OFS_APPEND) -@@ -489,25 +495,25 @@ static struct mtd_part *allocate_partiti - } - if (slave->offset == MTDPART_OFS_RETAIN) { - slave->offset = cur_offset; -- if (master->size - slave->offset >= slave->mtd.size) { -- slave->mtd.size = master->size - slave->offset -+ if (parent->size - slave->offset >= slave->mtd.size) { -+ slave->mtd.size = parent->size - slave->offset - - slave->mtd.size; - } else { - printk(KERN_ERR "mtd partition \"%s\" doesn't have enough space: %#llx < %#llx, disabled\n", -- part->name, master->size - slave->offset, -+ part->name, parent->size - slave->offset, - slave->mtd.size); - /* register to preserve ordering */ - goto out_register; - } - } - if (slave->mtd.size == MTDPART_SIZ_FULL) -- slave->mtd.size = master->size - slave->offset; -+ slave->mtd.size = parent->size - slave->offset; - - printk(KERN_NOTICE "0x%012llx-0x%012llx : \"%s\"\n", (unsigned long long)slave->offset, - (unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name); - - /* let's do some sanity checks */ -- if (slave->offset >= master->size) { -+ if (slave->offset >= parent->size) { - /* let's register it anyway to preserve ordering */ - slave->offset = 0; - slave->mtd.size = 0; -@@ -515,16 +521,16 @@ static struct mtd_part *allocate_partiti - part->name); - goto out_register; - } -- if (slave->offset + slave->mtd.size > master->size) { -- slave->mtd.size = master->size - slave->offset; -+ if (slave->offset + slave->mtd.size > parent->size) { -+ slave->mtd.size = parent->size - slave->offset; - printk(KERN_WARNING"mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#llx\n", -- part->name, master->name, (unsigned long long)slave->mtd.size); -+ part->name, parent->name, (unsigned long long)slave->mtd.size); - } -- if (master->numeraseregions > 1) { -+ if (parent->numeraseregions > 1) { - /* Deal with variable erase size stuff */ -- int i, max = master->numeraseregions; -+ int i, max = parent->numeraseregions; - u64 end = slave->offset + slave->mtd.size; -- struct mtd_erase_region_info *regions = master->eraseregions; -+ struct mtd_erase_region_info *regions = parent->eraseregions; - - /* Find the first erase regions which is part of this - * partition. */ -@@ -543,7 +549,7 @@ static struct mtd_part *allocate_partiti - BUG_ON(slave->mtd.erasesize == 0); - } else { - /* Single erase size */ -- slave->mtd.erasesize = master->erasesize; -+ slave->mtd.erasesize = parent->erasesize; - } - - tmp = slave->offset; -@@ -566,17 +572,17 @@ static struct mtd_part *allocate_partiti - } - - mtd_set_ooblayout(&slave->mtd, &part_ooblayout_ops); -- slave->mtd.ecc_step_size = master->ecc_step_size; -- slave->mtd.ecc_strength = master->ecc_strength; -- slave->mtd.bitflip_threshold = master->bitflip_threshold; -+ slave->mtd.ecc_step_size = parent->ecc_step_size; -+ slave->mtd.ecc_strength = parent->ecc_strength; -+ slave->mtd.bitflip_threshold = parent->bitflip_threshold; - -- if (master->_block_isbad) { -+ if (parent->_block_isbad) { - uint64_t offs = 0; - - while (offs < slave->mtd.size) { -- if (mtd_block_isreserved(master, offs + slave->offset)) -+ if (mtd_block_isreserved(parent, offs + slave->offset)) - slave->mtd.ecc_stats.bbtblocks++; -- else if (mtd_block_isbad(master, offs + slave->offset)) -+ else if (mtd_block_isbad(parent, offs + slave->offset)) - slave->mtd.ecc_stats.badblocks++; - offs += slave->mtd.erasesize; - } -@@ -610,7 +616,7 @@ static int mtd_add_partition_attrs(struc - return ret; - } - --int mtd_add_partition(struct mtd_info *master, const char *name, -+int mtd_add_partition(struct mtd_info *parent, const char *name, - long long offset, long long length) - { - struct mtd_partition part; -@@ -623,7 +629,7 @@ int mtd_add_partition(struct mtd_info *m - return -EINVAL; - - if (length == MTDPART_SIZ_FULL) -- length = master->size - offset; -+ length = parent->size - offset; - - if (length <= 0) - return -EINVAL; -@@ -633,7 +639,7 @@ int mtd_add_partition(struct mtd_info *m - part.size = length; - part.offset = offset; - -- new = allocate_partition(master, &part, -1, offset); -+ new = allocate_partition(parent, &part, -1, offset); - if (IS_ERR(new)) - return PTR_ERR(new); - -@@ -694,7 +700,7 @@ int del_mtd_partitions(struct mtd_info * - - mutex_lock(&mtd_partitions_mutex); - list_for_each_entry_safe(slave, next, &mtd_partitions, list) -- if (slave->master == master) { -+ if (slave->parent == master) { - ret = __mtd_del_partition(slave); - if (ret < 0) - err = ret; -@@ -711,7 +717,7 @@ int mtd_del_partition(struct mtd_info *m - - mutex_lock(&mtd_partitions_mutex); - list_for_each_entry_safe(slave, next, &mtd_partitions, list) -- if ((slave->master == master) && -+ if ((slave->parent == master) && - (slave->mtd.index == partno)) { - ret = __mtd_del_partition(slave); - break; -@@ -958,6 +964,6 @@ uint64_t mtd_get_device_size(const struc - if (!mtd_is_partition(mtd)) - return mtd->size; - -- return mtd_to_part(mtd)->master->size; -+ return mtd_to_part(mtd)->parent->size; - } - EXPORT_SYMBOL_GPL(mtd_get_device_size); diff --git a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch deleted file mode 100644 index 578e59a8a1..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 97519dc52b44af054d7654776e78eaa211cf1842 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:45 +0200 -Subject: [PATCH] mtd: partitions: add support for subpartitions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some flash device partitions can be containers with extra subpartitions -(volumes). All callbacks are already capable of this additional level of -indirection. - -This patch makes sure we always display subpartitions using a tree -structure and takes care of deleting subpartitions when parent gets -removed. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -413,7 +413,7 @@ static struct mtd_part *allocate_partiti - * parent conditional on that option. Note, this is a way to - * distinguish between the master and the partition in sysfs. - */ -- slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) ? -+ slave->mtd.dev.parent = IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) || mtd_is_partition(parent) ? - &parent->dev : - parent->dev.parent; - slave->mtd.dev.of_node = part->of_node; -@@ -675,8 +675,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); - */ - static int __mtd_del_partition(struct mtd_part *priv) - { -+ struct mtd_part *child, *next; - int err; - -+ list_for_each_entry_safe(child, next, &mtd_partitions, list) { -+ if (child->parent == &priv->mtd) { -+ err = __mtd_del_partition(child); -+ if (err) -+ return err; -+ } -+ } -+ - sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs); - - err = del_mtd_device(&priv->mtd); -@@ -691,16 +700,16 @@ static int __mtd_del_partition(struct mt - - /* - * This function unregisters and destroy all slave MTD objects which are -- * attached to the given master MTD object. -+ * attached to the given MTD object. - */ --int del_mtd_partitions(struct mtd_info *master) -+int del_mtd_partitions(struct mtd_info *mtd) - { - struct mtd_part *slave, *next; - int ret, err = 0; - - mutex_lock(&mtd_partitions_mutex); - list_for_each_entry_safe(slave, next, &mtd_partitions, list) -- if (slave->parent == master) { -+ if (slave->parent == mtd) { - ret = __mtd_del_partition(slave); - if (ret < 0) - err = ret; -@@ -710,14 +719,14 @@ int del_mtd_partitions(struct mtd_info * - return err; - } - --int mtd_del_partition(struct mtd_info *master, int partno) -+int mtd_del_partition(struct mtd_info *mtd, int partno) - { - struct mtd_part *slave, *next; - int ret = -EINVAL; - - mutex_lock(&mtd_partitions_mutex); - list_for_each_entry_safe(slave, next, &mtd_partitions, list) -- if ((slave->parent == master) && -+ if ((slave->parent == mtd) && - (slave->mtd.index == partno)) { - ret = __mtd_del_partition(slave); - break; -@@ -964,6 +973,6 @@ uint64_t mtd_get_device_size(const struc - if (!mtd_is_partition(mtd)) - return mtd->size; - -- return mtd_to_part(mtd)->parent->size; -+ return mtd_get_device_size(mtd_to_part(mtd)->parent); - } - EXPORT_SYMBOL_GPL(mtd_get_device_size); diff --git a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch deleted file mode 100644 index c4c517f238..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 1a0915be192606fee64830b9c5d70b7ed59426b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:46 +0200 -Subject: [PATCH] mtd: partitions: add support for partition parsers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some devices have partitions that are kind of containers with extra -subpartitions / volumes instead of e.g. a simple filesystem data. To -support such cases we need to first create normal flash device -partitions and then take care of these special ones. - -It's very common case for home routers. Depending on the vendor there -are formats like TRX, Seama, TP-Link, WRGG & more. All of them are used -to embed few partitions into a single one / single firmware file. - -Ideally all vendors would use some well documented / standardized format -like UBI (and some probably start doing so), but there are still -countless devices on the market using these poor vendor specific -formats. - -This patch extends MTD subsystem by allowing to specify list of parsers -that should be tried for a given partition. Supporting such poor formats -is highly unlikely to be the top priority so these changes try to -minimize maintenance cost to the minimum. It reuses existing code for -these new parsers and just adds a one property and one new function. - -This implementation requires setting partition parsers in a flash -parser. A proper change of bcm47xxpart will follow and in the future we -will hopefully also find a solution for doing it with ofpart -("fixed-partitions"). - -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 31 +++++++++++++++++++++++++++++++ - include/linux/mtd/partitions.h | 7 +++++++ - 2 files changed, 38 insertions(+) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -369,6 +369,35 @@ static inline void free_partition(struct - kfree(p); - } - -+/** -+ * mtd_parse_part - parse MTD partition looking for subpartitions -+ * -+ * @slave: part that is supposed to be a container and should be parsed -+ * @types: NULL-terminated array with names of partition parsers to try -+ * -+ * Some partitions are kind of containers with extra subpartitions (volumes). -+ * There can be various formats of such containers. This function tries to use -+ * specified parsers to analyze given partition and registers found -+ * subpartitions on success. -+ */ -+static int mtd_parse_part(struct mtd_part *slave, const char *const *types) -+{ -+ struct mtd_partitions parsed; -+ int err; -+ -+ err = parse_mtd_partitions(&slave->mtd, types, &parsed, NULL); -+ if (err) -+ return err; -+ else if (!parsed.nr_parts) -+ return -ENOENT; -+ -+ err = add_mtd_partitions(&slave->mtd, parsed.parts, parsed.nr_parts); -+ -+ mtd_part_parser_cleanup(&parsed); -+ -+ return err; -+} -+ - static struct mtd_part *allocate_partition(struct mtd_info *parent, - const struct mtd_partition *part, int partno, - uint64_t cur_offset) -@@ -778,6 +807,8 @@ int add_mtd_partitions(struct mtd_info * - } - - mtd_add_partition_attrs(slave); -+ if (parts[i].types) -+ mtd_parse_part(slave, parts[i].types); - - cur_offset = slave->offset + slave->mtd.size; - } ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -20,6 +20,12 @@ - * - * For each partition, these fields are available: - * name: string that will be used to label the partition's MTD device. -+ * types: some partitions can be containers using specific format to describe -+ * embedded subpartitions / volumes. E.g. many home routers use "firmware" -+ * partition that contains at least kernel and rootfs. In such case an -+ * extra parser is needed that will detect these dynamic partitions and -+ * report them to the MTD subsystem. If set this property stores an array -+ * of parser names to use when looking for subpartitions. - * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition - * will extend to the end of the master MTD device. - * offset: absolute starting position within the master MTD device; if -@@ -38,6 +44,7 @@ - - struct mtd_partition { - const char *name; /* identifier string */ -+ const char *const *types; /* names of parsers to use if any */ - uint64_t size; /* partition size */ - uint64_t offset; /* offset within the master MTD space */ - uint32_t mask_flags; /* master MTD flags to mask out for this partition */ diff --git a/target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch b/target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch deleted file mode 100644 index 3761a46610..0000000000 --- a/target/linux/generic/backport-4.9/065-v4.13-0008-mtd-extract-TRX-parser-out-of-bcm47xxpart-into-a-sep.patch +++ /dev/null @@ -1,320 +0,0 @@ -From 99352afe8f169c95b294b6b9a8d0e18cd9e3c2a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:47 +0200 -Subject: [PATCH] mtd: extract TRX parser out of bcm47xxpart into a separated - module -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This makes TRX parsing code reusable with other platforms and parsers. - -Please note this patch doesn't really change anything in the existing -code, just moves it. There is still some place for improvement (e.g. -working on non-hacky method of checking rootfs format) but it's not -really a subject of this change. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/Kconfig | 4 ++ - drivers/mtd/Makefile | 1 + - drivers/mtd/bcm47xxpart.c | 99 ++---------------------------- - drivers/mtd/parsers/Kconfig | 8 +++ - drivers/mtd/parsers/Makefile | 1 + - drivers/mtd/parsers/parser_trx.c | 126 +++++++++++++++++++++++++++++++++++++++ - 6 files changed, 145 insertions(+), 94 deletions(-) - create mode 100644 drivers/mtd/parsers/Kconfig - create mode 100644 drivers/mtd/parsers/Makefile - create mode 100644 drivers/mtd/parsers/parser_trx.c - ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -155,6 +155,10 @@ config MTD_BCM47XX_PARTS - This provides partitions parser for devices based on BCM47xx - boards. - -+menu "Partition parsers" -+source "drivers/mtd/parsers/Kconfig" -+endmenu -+ - comment "User Modules And Translation Layers" - - # ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o - obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o - obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o - obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o -+obj-y += parsers/ - - # 'Users' - code which presents functionality to userspace. - obj-$(CONFIG_MTD_BLKDEVS) += mtd_blkdevs.o ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -43,7 +43,8 @@ - #define ML_MAGIC2 0x26594131 - #define TRX_MAGIC 0x30524448 - #define SHSQ_MAGIC 0x71736873 /* shsq (weird ZTE H218N endianness) */ --#define UBI_EC_MAGIC 0x23494255 /* UBI# */ -+ -+static const char * const trx_types[] = { "trx", NULL }; - - struct trx_header { - uint32_t magic; -@@ -62,89 +63,6 @@ static void bcm47xxpart_add_part(struct - part->mask_flags = mask_flags; - } - --static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master, -- size_t offset) --{ -- uint32_t buf; -- size_t bytes_read; -- int err; -- -- err = mtd_read(master, offset, sizeof(buf), &bytes_read, -- (uint8_t *)&buf); -- if (err && !mtd_is_bitflip(err)) { -- pr_err("mtd_read error while parsing (offset: 0x%X): %d\n", -- offset, err); -- goto out_default; -- } -- -- if (buf == UBI_EC_MAGIC) -- return "ubi"; -- --out_default: -- return "rootfs"; --} -- --static int bcm47xxpart_parse_trx(struct mtd_info *master, -- struct mtd_partition *trx, -- struct mtd_partition *parts, -- size_t parts_len) --{ -- struct trx_header header; -- size_t bytes_read; -- int curr_part = 0; -- int i, err; -- -- if (parts_len < 3) { -- pr_warn("No enough space to add TRX partitions!\n"); -- return -ENOMEM; -- } -- -- err = mtd_read(master, trx->offset, sizeof(header), &bytes_read, -- (uint8_t *)&header); -- if (err && !mtd_is_bitflip(err)) { -- pr_err("mtd_read error while reading TRX header: %d\n", err); -- return err; -- } -- -- i = 0; -- -- /* We have LZMA loader if offset[2] points to sth */ -- if (header.offset[2]) { -- bcm47xxpart_add_part(&parts[curr_part++], "loader", -- trx->offset + header.offset[i], 0); -- i++; -- } -- -- if (header.offset[i]) { -- bcm47xxpart_add_part(&parts[curr_part++], "linux", -- trx->offset + header.offset[i], 0); -- i++; -- } -- -- if (header.offset[i]) { -- size_t offset = trx->offset + header.offset[i]; -- const char *name = bcm47xxpart_trx_data_part_name(master, -- offset); -- -- bcm47xxpart_add_part(&parts[curr_part++], name, offset, 0); -- i++; -- } -- -- /* -- * Assume that every partition ends at the beginning of the one it is -- * followed by. -- */ -- for (i = 0; i < curr_part; i++) { -- u64 next_part_offset = (i < curr_part - 1) ? -- parts[i + 1].offset : -- trx->offset + trx->size; -- -- parts[i].size = next_part_offset - parts[i].offset; -- } -- -- return curr_part; --} -- - /** - * bcm47xxpart_bootpartition - gets index of TRX partition used by bootloader - * -@@ -362,17 +280,10 @@ static int bcm47xxpart_parse(struct mtd_ - for (i = 0; i < trx_num; i++) { - struct mtd_partition *trx = &parts[trx_parts[i]]; - -- if (i == bcm47xxpart_bootpartition()) { -- int num_parts; -- -- num_parts = bcm47xxpart_parse_trx(master, trx, -- parts + curr_part, -- BCM47XXPART_MAX_PARTS - curr_part); -- if (num_parts > 0) -- curr_part += num_parts; -- } else { -+ if (i == bcm47xxpart_bootpartition()) -+ trx->types = trx_types; -+ else - trx->name = "failsafe"; -- } - } - - *pparts = parts; ---- /dev/null -+++ b/drivers/mtd/parsers/Kconfig -@@ -0,0 +1,8 @@ -+config MTD_PARSER_TRX -+ tristate "Parser for TRX format partitions" -+ depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) -+ help -+ TRX is a firmware format used by Broadcom on their devices. It -+ may contain up to 3/4 partitions (depending on the version). -+ This driver will parse TRX header and report at least two partitions: -+ kernel and rootfs. ---- /dev/null -+++ b/drivers/mtd/parsers/Makefile -@@ -0,0 +1 @@ -+obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o ---- /dev/null -+++ b/drivers/mtd/parsers/parser_trx.c -@@ -0,0 +1,126 @@ -+/* -+ * Parser for TRX format partitions -+ * -+ * Copyright (C) 2012 - 2017 Rafał Miłecki -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#define TRX_PARSER_MAX_PARTS 4 -+ -+/* Magics */ -+#define TRX_MAGIC 0x30524448 -+#define UBI_EC_MAGIC 0x23494255 /* UBI# */ -+ -+struct trx_header { -+ uint32_t magic; -+ uint32_t length; -+ uint32_t crc32; -+ uint16_t flags; -+ uint16_t version; -+ uint32_t offset[3]; -+} __packed; -+ -+static const char *parser_trx_data_part_name(struct mtd_info *master, -+ size_t offset) -+{ -+ uint32_t buf; -+ size_t bytes_read; -+ int err; -+ -+ err = mtd_read(master, offset, sizeof(buf), &bytes_read, -+ (uint8_t *)&buf); -+ if (err && !mtd_is_bitflip(err)) { -+ pr_err("mtd_read error while parsing (offset: 0x%X): %d\n", -+ offset, err); -+ goto out_default; -+ } -+ -+ if (buf == UBI_EC_MAGIC) -+ return "ubi"; -+ -+out_default: -+ return "rootfs"; -+} -+ -+static int parser_trx_parse(struct mtd_info *mtd, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ struct mtd_partition *parts; -+ struct mtd_partition *part; -+ struct trx_header trx; -+ size_t bytes_read; -+ uint8_t curr_part = 0, i = 0; -+ int err; -+ -+ parts = kzalloc(sizeof(struct mtd_partition) * TRX_PARSER_MAX_PARTS, -+ GFP_KERNEL); -+ if (!parts) -+ return -ENOMEM; -+ -+ err = mtd_read(mtd, 0, sizeof(trx), &bytes_read, (uint8_t *)&trx); -+ if (err) { -+ pr_err("MTD reading error: %d\n", err); -+ kfree(parts); -+ return err; -+ } -+ -+ if (trx.magic != TRX_MAGIC) { -+ kfree(parts); -+ return -ENOENT; -+ } -+ -+ /* We have LZMA loader if there is address in offset[2] */ -+ if (trx.offset[2]) { -+ part = &parts[curr_part++]; -+ part->name = "loader"; -+ part->offset = trx.offset[i]; -+ i++; -+ } -+ -+ if (trx.offset[i]) { -+ part = &parts[curr_part++]; -+ part->name = "linux"; -+ part->offset = trx.offset[i]; -+ i++; -+ } -+ -+ if (trx.offset[i]) { -+ part = &parts[curr_part++]; -+ part->name = parser_trx_data_part_name(mtd, trx.offset[i]); -+ part->offset = trx.offset[i]; -+ i++; -+ } -+ -+ /* -+ * Assume that every partition ends at the beginning of the one it is -+ * followed by. -+ */ -+ for (i = 0; i < curr_part; i++) { -+ u64 next_part_offset = (i < curr_part - 1) ? -+ parts[i + 1].offset : mtd->size; -+ -+ parts[i].size = next_part_offset - parts[i].offset; -+ } -+ -+ *pparts = parts; -+ return i; -+}; -+ -+static struct mtd_part_parser mtd_parser_trx = { -+ .parse_fn = parser_trx_parse, -+ .name = "trx", -+}; -+module_mtd_part_parser(mtd_parser_trx); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_DESCRIPTION("Parser for TRX format partitions"); diff --git a/target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch b/target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch deleted file mode 100644 index 07a456d4c0..0000000000 --- a/target/linux/generic/backport-4.9/066-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2c77c57d22adb05b21cdb333a0c42bdfa0e19835 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 16 Jan 2018 16:45:41 +0100 -Subject: [PATCH] mtd: move code adding master MTD out of - mtd_add_device_partitions() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This change is a small cleanup of mtd_device_parse_register(). When -using MTD_PARTITIONED_MASTER it makes sure a master MTD is registered -before dealing with partitions. The advantage of this is not mixing -code handling master MTD with code handling partitions. - -This commit doesn't change any behavior except from a slightly different -failure code path. The new code may need to call del_mtd_device when -something goes wrong. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/mtdcore.c | 25 +++++++++++++------------ - 1 file changed, 13 insertions(+), 12 deletions(-) - ---- a/drivers/mtd/mtdcore.c -+++ b/drivers/mtd/mtdcore.c -@@ -631,20 +631,12 @@ static int mtd_add_device_partitions(str - { - const struct mtd_partition *real_parts = parts->parts; - int nbparts = parts->nr_parts; -- int ret; - -- if (nbparts == 0 || IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) { -- ret = add_mtd_device(mtd); -- if (ret) -- return ret; -- } -+ if (!nbparts && !device_is_registered(&mtd->dev)) -+ return add_mtd_device(mtd); - -- if (nbparts > 0) { -- ret = add_mtd_partitions(mtd, real_parts, nbparts); -- if (ret && IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) -- del_mtd_device(mtd); -- return ret; -- } -+ if (nbparts > 0) -+ return add_mtd_partitions(mtd, real_parts, nbparts); - - return 0; - } -@@ -704,6 +696,12 @@ int mtd_device_parse_register(struct mtd - - mtd_set_dev_defaults(mtd); - -+ if (IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) { -+ ret = add_mtd_device(mtd); -+ if (ret) -+ return ret; -+ } -+ - memset(&parsed, 0, sizeof(parsed)); - - ret = parse_mtd_partitions(mtd, types, &parsed, parser_data); -@@ -743,6 +741,9 @@ int mtd_device_parse_register(struct mtd - out: - /* Cleanup any parsed partitions */ - mtd_part_parser_cleanup(&parsed); -+ if (ret && device_is_registered(&mtd->dev)) -+ del_mtd_device(mtd); -+ - return ret; - } - EXPORT_SYMBOL_GPL(mtd_device_parse_register); diff --git a/target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch b/target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch deleted file mode 100644 index b629d430a4..0000000000 --- a/target/linux/generic/backport-4.9/066-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 0dbe4ea78d69756efeb0bba0764f6bd4a9ee9567 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 16 Jan 2018 16:45:42 +0100 -Subject: [PATCH] mtd: get rid of the mtd_add_device_partitions() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This simplifies code a bit by: -1) Avoiding an extra (tiny) function -2) Checking for amount of parsed (found) partitions just once -3) Avoiding clearing/filling struct mtd_partitions manually - -With this commit proper functions are called directly from the -mtd_device_parse_register(). It doesn't need to use minor tricks like -memsetting struct to 0 to trigger an expected -mtd_add_device_partitions() behavior. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/mtdcore.c | 43 ++++++++++++------------------------------- - 1 file changed, 12 insertions(+), 31 deletions(-) - ---- a/drivers/mtd/mtdcore.c -+++ b/drivers/mtd/mtdcore.c -@@ -626,21 +626,6 @@ out_error: - return ret; - } - --static int mtd_add_device_partitions(struct mtd_info *mtd, -- struct mtd_partitions *parts) --{ -- const struct mtd_partition *real_parts = parts->parts; -- int nbparts = parts->nr_parts; -- -- if (!nbparts && !device_is_registered(&mtd->dev)) -- return add_mtd_device(mtd); -- -- if (nbparts > 0) -- return add_mtd_partitions(mtd, real_parts, nbparts); -- -- return 0; --} -- - /* - * Set a few defaults based on the parent devices, if not provided by the - * driver -@@ -691,7 +676,7 @@ int mtd_device_parse_register(struct mtd - const struct mtd_partition *parts, - int nr_parts) - { -- struct mtd_partitions parsed; -+ struct mtd_partitions parsed = { }; - int ret; - - mtd_set_dev_defaults(mtd); -@@ -702,24 +687,20 @@ int mtd_device_parse_register(struct mtd - return ret; - } - -- memset(&parsed, 0, sizeof(parsed)); -- -+ /* Prefer parsed partitions over driver-provided fallback */ - ret = parse_mtd_partitions(mtd, types, &parsed, parser_data); -- if ((ret < 0 || parsed.nr_parts == 0) && parts && nr_parts) { -- /* Fall back to driver-provided partitions */ -- parsed = (struct mtd_partitions){ -- .parts = parts, -- .nr_parts = nr_parts, -- }; -- } else if (ret < 0) { -- /* Didn't come up with parsed OR fallback partitions */ -- pr_info("mtd: failed to find partitions; one or more parsers reports errors (%d)\n", -- ret); -- /* Don't abort on errors; we can still use unpartitioned MTD */ -- memset(&parsed, 0, sizeof(parsed)); -+ if (!ret && parsed.nr_parts) { -+ parts = parsed.parts; -+ nr_parts = parsed.nr_parts; - } - -- ret = mtd_add_device_partitions(mtd, &parsed); -+ if (nr_parts) -+ ret = add_mtd_partitions(mtd, parts, nr_parts); -+ else if (!device_is_registered(&mtd->dev)) -+ ret = add_mtd_device(mtd); -+ else -+ ret = 0; -+ - if (ret) - goto out; - diff --git a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch deleted file mode 100644 index cb464996b7..0000000000 --- a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 5b644aa012f67fd211138a067b9f351f30bdcc60 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 14 Mar 2018 13:10:42 +0100 -Subject: [PATCH] mtd: partitions: add of_match_table parser matching for the - "ofpart" type -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In order to properly support compatibility strings as described in the -bindings/mtd/partition.txt "ofpart" type should be treated as an -indication for looking into OF. MTD should check "compatible" property -and search for a matching parser rather than blindly trying the one -supporting "fixed-partitions". - -It also means that existing "fixed-partitions" parser should get renamed -to use a more meaningful name. - -This commit achievies that aim by introducing a new mtd_part_of_parse(). -It works by looking for a matching parser for every string in the -"compatibility" property (starting with the most specific one). - -Please note that driver-specified parsers still take a precedence. It's -assumed that driver providing a parser type has a good reason for that -(e.g. having platform data with device-specific info). Also doing -otherwise could break existing setups. The same applies to using default -parsers (including "cmdlinepart") as some overwrite DT data with cmdline -argument. - -Partition parsers can now provide an of_match_table to enable -flash<-->parser matching via device tree as documented in the -mtd/partition.txt. - -This support is currently limited to built-in parsers as it uses -request_module() and friends. This should be sufficient for most cases -though as compiling parsers as modules isn't a common choice. - -Signed-off-by: Brian Norris -Signed-off-by: Rafał Miłecki -Tested-by: Peter Rosin -Reviewed-by: Richard Weinberger -Signed-off-by: Boris Brezillon ---- - drivers/mtd/mtdpart.c | 116 +++++++++++++++++++++++++++++++++++++---- - include/linux/mtd/partitions.h | 1 + - 2 files changed, 108 insertions(+), 9 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include "mtdcore.h" - -@@ -911,6 +912,92 @@ static int mtd_part_do_parse(struct mtd_ - } - - /** -+ * mtd_part_get_compatible_parser - find MTD parser by a compatible string -+ * -+ * @compat: compatible string describing partitions in a device tree -+ * -+ * MTD parsers can specify supported partitions by providing a table of -+ * compatibility strings. This function finds a parser that advertises support -+ * for a passed value of "compatible". -+ */ -+static struct mtd_part_parser *mtd_part_get_compatible_parser(const char *compat) -+{ -+ struct mtd_part_parser *p, *ret = NULL; -+ -+ spin_lock(&part_parser_lock); -+ -+ list_for_each_entry(p, &part_parsers, list) { -+ const struct of_device_id *matches; -+ -+ matches = p->of_match_table; -+ if (!matches) -+ continue; -+ -+ for (; matches->compatible[0]; matches++) { -+ if (!strcmp(matches->compatible, compat) && -+ try_module_get(p->owner)) { -+ ret = p; -+ break; -+ } -+ } -+ -+ if (ret) -+ break; -+ } -+ -+ spin_unlock(&part_parser_lock); -+ -+ return ret; -+} -+ -+static int mtd_part_of_parse(struct mtd_info *master, -+ struct mtd_partitions *pparts) -+{ -+ struct mtd_part_parser *parser; -+ struct device_node *np; -+ struct property *prop; -+ const char *compat; -+ const char *fixed = "ofpart"; -+ int ret, err = 0; -+ -+ np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); -+ of_property_for_each_string(np, "compatible", prop, compat) { -+ parser = mtd_part_get_compatible_parser(compat); -+ if (!parser) -+ continue; -+ ret = mtd_part_do_parse(parser, master, pparts, NULL); -+ if (ret > 0) { -+ of_node_put(np); -+ return ret; -+ } -+ mtd_part_parser_put(parser); -+ if (ret < 0 && !err) -+ err = ret; -+ } -+ of_node_put(np); -+ -+ /* -+ * For backward compatibility we have to try the "ofpart" -+ * parser. It supports old DT format with partitions specified as a -+ * direct subnodes of a flash device DT node without any compatibility -+ * specified we could match. -+ */ -+ parser = mtd_part_parser_get(fixed); -+ if (!parser && !request_module("%s", fixed)) -+ parser = mtd_part_parser_get(fixed); -+ if (parser) { -+ ret = mtd_part_do_parse(parser, master, pparts, NULL); -+ if (ret > 0) -+ return ret; -+ mtd_part_parser_put(parser); -+ if (ret < 0 && !err) -+ err = ret; -+ } -+ -+ return err; -+} -+ -+/** - * parse_mtd_partitions - parse MTD partitions - * @master: the master partition (describes whole MTD device) - * @types: names of partition parsers to try or %NULL -@@ -942,19 +1029,30 @@ int parse_mtd_partitions(struct mtd_info - types = default_mtd_part_types; - - for ( ; *types; types++) { -- pr_debug("%s: parsing partitions %s\n", master->name, *types); -- parser = mtd_part_parser_get(*types); -- if (!parser && !request_module("%s", *types)) -+ /* -+ * ofpart is a special type that means OF partitioning info -+ * should be used. It requires a bit different logic so it is -+ * handled in a separated function. -+ */ -+ if (!strcmp(*types, "ofpart")) { -+ ret = mtd_part_of_parse(master, pparts); -+ } else { -+ pr_debug("%s: parsing partitions %s\n", master->name, -+ *types); - parser = mtd_part_parser_get(*types); -- pr_debug("%s: got parser %s\n", master->name, -- parser ? parser->name : NULL); -- if (!parser) -- continue; -- ret = mtd_part_do_parse(parser, master, pparts, data); -+ if (!parser && !request_module("%s", *types)) -+ parser = mtd_part_parser_get(*types); -+ pr_debug("%s: got parser %s\n", master->name, -+ parser ? parser->name : NULL); -+ if (!parser) -+ continue; -+ ret = mtd_part_do_parse(parser, master, pparts, data); -+ if (ret <= 0) -+ mtd_part_parser_put(parser); -+ } - /* Found partitions! */ - if (ret > 0) - return 0; -- mtd_part_parser_put(parser); - /* - * Stash the first error we see; only report it if no parser - * succeeds ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -77,6 +77,7 @@ struct mtd_part_parser { - struct list_head list; - struct module *owner; - const char *name; -+ const struct of_device_id *of_match_table; - int (*parse_fn)(struct mtd_info *, const struct mtd_partition **, - struct mtd_part_parser_data *); - void (*cleanup)(const struct mtd_partition *pparts, int nr_parts); diff --git a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch deleted file mode 100644 index b22ddfabd8..0000000000 --- a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +++ /dev/null @@ -1,74 +0,0 @@ -From c0faf43482e7f7dfb6d61847cb93d17748560b24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 14 Mar 2018 13:10:43 +0100 -Subject: [PATCH] mtd: rename "ofpart" parser to "fixed-partitions" as it fits - it better -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Type "ofpart" means that OF should be used to get partitioning info and -this driver supports "fixed-partitions" binding only. Renaming it should -lead to less confusion especially when parsers for new compatibility -strings start to appear. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Richard Weinberger -Signed-off-by: Boris Brezillon ---- - drivers/mtd/mtdpart.c | 4 ++-- - drivers/mtd/ofpart.c | 11 ++++++----- - 2 files changed, 8 insertions(+), 7 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -957,7 +957,7 @@ static int mtd_part_of_parse(struct mtd_ - struct device_node *np; - struct property *prop; - const char *compat; -- const char *fixed = "ofpart"; -+ const char *fixed = "fixed-partitions"; - int ret, err = 0; - - np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); -@@ -977,7 +977,7 @@ static int mtd_part_of_parse(struct mtd_ - of_node_put(np); - - /* -- * For backward compatibility we have to try the "ofpart" -+ * For backward compatibility we have to try the "fixed-partitions" - * parser. It supports old DT format with partitions specified as a - * direct subnodes of a flash device DT node without any compatibility - * specified we could match. ---- a/drivers/mtd/ofpart.c -+++ b/drivers/mtd/ofpart.c -@@ -25,9 +25,9 @@ static bool node_has_compatible(struct d - return of_get_property(pp, "compatible", NULL); - } - --static int parse_ofpart_partitions(struct mtd_info *master, -- const struct mtd_partition **pparts, -- struct mtd_part_parser_data *data) -+static int parse_fixed_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) - { - struct mtd_partition *parts; - struct device_node *mtd_node; -@@ -141,8 +141,8 @@ ofpart_none: - } - - static struct mtd_part_parser ofpart_parser = { -- .parse_fn = parse_ofpart_partitions, -- .name = "ofpart", -+ .parse_fn = parse_fixed_partitions, -+ .name = "fixed-partitions", - }; - - static int parse_ofoldpart_partitions(struct mtd_info *master, -@@ -230,4 +230,5 @@ MODULE_AUTHOR("Vitaly Wool, David Gibson - * with the same name. Since we provide the ofoldpart parser, we should have - * the corresponding alias. - */ -+MODULE_ALIAS("fixed-partitions"); - MODULE_ALIAS("ofoldpart"); diff --git a/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch b/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch deleted file mode 100644 index d6958c3eac..0000000000 --- a/target/linux/generic/backport-4.9/067-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 97b0c7c0df3efd7048ed39d7e2dee34cafd55887 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 14 Mar 2018 13:10:44 +0100 -Subject: [PATCH] mtd: ofpart: add of_match_table with "fixed-partitions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows using this parser with any flash driver that takes care of -setting of_node (using mtd_set_of_node helper) correctly. Up to now -support for "fixed-partitions" DT compatibility string was working only -with flash drivers that were specifying "ofpart" (manually or by letting -mtd use the default set of parsers). - -This matches existing bindings documentation. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Brian Norris -Tested-by: Brian Norris -Reviewed-by: Richard Weinberger -Signed-off-by: Boris Brezillon ---- - drivers/mtd/ofpart.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/mtd/ofpart.c -+++ b/drivers/mtd/ofpart.c -@@ -140,9 +140,16 @@ ofpart_none: - return ret; - } - -+static const struct of_device_id parse_ofpart_match_table[] = { -+ { .compatible = "fixed-partitions" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, parse_ofpart_match_table); -+ - static struct mtd_part_parser ofpart_parser = { - .parse_fn = parse_fixed_partitions, - .name = "fixed-partitions", -+ .of_match_table = parse_ofpart_match_table, - }; - - static int parse_ofoldpart_partitions(struct mtd_info *master, diff --git a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch deleted file mode 100644 index 4bedd54a03..0000000000 --- a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 5ac67ce36cfe38b4c104a42ce52c5c8d526f1c95 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 27 Mar 2018 22:35:41 +0200 -Subject: [PATCH] mtd: move code adding (registering) partitions to the - parse_mtd_partitions() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This commit slightly simplifies the code. Every parse_mtd_partitions() -caller (out of two existing ones) had to add partitions & cleanup parser -on its own. This moves that responsibility into the function. - -That change also allows dropping struct mtd_partitions argument. - -There is one minor behavior change caused by this cleanup. If -parse_mtd_partitions() fails to add partitions (add_mtd_partitions() -return an error) then mtd_device_parse_register() will still try to -add (register) fallback partitions. It's a real corner case affecting -one of uncommon error paths and shouldn't cause any harm. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/mtdcore.c | 14 ++++---------- - drivers/mtd/mtdcore.h | 1 - - drivers/mtd/mtdpart.c | 44 ++++++++++++++++---------------------------- - 3 files changed, 20 insertions(+), 39 deletions(-) - ---- a/drivers/mtd/mtdcore.c -+++ b/drivers/mtd/mtdcore.c -@@ -676,7 +676,6 @@ int mtd_device_parse_register(struct mtd - const struct mtd_partition *parts, - int nr_parts) - { -- struct mtd_partitions parsed = { }; - int ret; - - mtd_set_dev_defaults(mtd); -@@ -688,13 +687,10 @@ int mtd_device_parse_register(struct mtd - } - - /* Prefer parsed partitions over driver-provided fallback */ -- ret = parse_mtd_partitions(mtd, types, &parsed, parser_data); -- if (!ret && parsed.nr_parts) { -- parts = parsed.parts; -- nr_parts = parsed.nr_parts; -- } -- -- if (nr_parts) -+ ret = parse_mtd_partitions(mtd, types, parser_data); -+ if (ret > 0) -+ ret = 0; -+ else if (nr_parts) - ret = add_mtd_partitions(mtd, parts, nr_parts); - else if (!device_is_registered(&mtd->dev)) - ret = add_mtd_device(mtd); -@@ -720,8 +716,6 @@ int mtd_device_parse_register(struct mtd - } - - out: -- /* Cleanup any parsed partitions */ -- mtd_part_parser_cleanup(&parsed); - if (ret && device_is_registered(&mtd->dev)) - del_mtd_device(mtd); - ---- a/drivers/mtd/mtdcore.h -+++ b/drivers/mtd/mtdcore.h -@@ -14,7 +14,6 @@ int del_mtd_partitions(struct mtd_info * - struct mtd_partitions; - - int parse_mtd_partitions(struct mtd_info *master, const char * const *types, -- struct mtd_partitions *pparts, - struct mtd_part_parser_data *data); - - void mtd_part_parser_cleanup(struct mtd_partitions *parts); ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -383,20 +383,7 @@ static inline void free_partition(struct - */ - static int mtd_parse_part(struct mtd_part *slave, const char *const *types) - { -- struct mtd_partitions parsed; -- int err; -- -- err = parse_mtd_partitions(&slave->mtd, types, &parsed, NULL); -- if (err) -- return err; -- else if (!parsed.nr_parts) -- return -ENOENT; -- -- err = add_mtd_partitions(&slave->mtd, parsed.parts, parsed.nr_parts); -- -- mtd_part_parser_cleanup(&parsed); -- -- return err; -+ return parse_mtd_partitions(&slave->mtd, types, NULL); - } - - static struct mtd_part *allocate_partition(struct mtd_info *parent, -@@ -998,30 +985,27 @@ static int mtd_part_of_parse(struct mtd_ - } - - /** -- * parse_mtd_partitions - parse MTD partitions -+ * parse_mtd_partitions - parse and register MTD partitions -+ * - * @master: the master partition (describes whole MTD device) - * @types: names of partition parsers to try or %NULL -- * @pparts: info about partitions found is returned here - * @data: MTD partition parser-specific data - * -- * This function tries to find partition on MTD device @master. It uses MTD -- * partition parsers, specified in @types. However, if @types is %NULL, then -- * the default list of parsers is used. The default list contains only the -+ * This function tries to find & register partitions on MTD device @master. It -+ * uses MTD partition parsers, specified in @types. However, if @types is %NULL, -+ * then the default list of parsers is used. The default list contains only the - * "cmdlinepart" and "ofpart" parsers ATM. - * Note: If there are more then one parser in @types, the kernel only takes the - * partitions parsed out by the first parser. - * - * This function may return: - * o a negative error code in case of failure -- * o zero otherwise, and @pparts will describe the partitions, number of -- * partitions, and the parser which parsed them. Caller must release -- * resources with mtd_part_parser_cleanup() when finished with the returned -- * data. -+ * o number of found partitions otherwise - */ - int parse_mtd_partitions(struct mtd_info *master, const char *const *types, -- struct mtd_partitions *pparts, - struct mtd_part_parser_data *data) - { -+ struct mtd_partitions pparts = { }; - struct mtd_part_parser *parser; - int ret, err = 0; - -@@ -1035,7 +1019,7 @@ int parse_mtd_partitions(struct mtd_info - * handled in a separated function. - */ - if (!strcmp(*types, "ofpart")) { -- ret = mtd_part_of_parse(master, pparts); -+ ret = mtd_part_of_parse(master, &pparts); - } else { - pr_debug("%s: parsing partitions %s\n", master->name, - *types); -@@ -1046,13 +1030,17 @@ int parse_mtd_partitions(struct mtd_info - parser ? parser->name : NULL); - if (!parser) - continue; -- ret = mtd_part_do_parse(parser, master, pparts, data); -+ ret = mtd_part_do_parse(parser, master, &pparts, data); - if (ret <= 0) - mtd_part_parser_put(parser); - } - /* Found partitions! */ -- if (ret > 0) -- return 0; -+ if (ret > 0) { -+ err = add_mtd_partitions(master, pparts.parts, -+ pparts.nr_parts); -+ mtd_part_parser_cleanup(&pparts); -+ return err ? err : pparts.nr_parts; -+ } - /* - * Stash the first error we see; only report it if no parser - * succeeds diff --git a/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch deleted file mode 100644 index e08f8dad32..0000000000 --- a/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 12 Apr 2018 07:24:52 +0200 -Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When bcm47xxpart finds a TRX partition (container) it's supposed to jump -to the end of it and keep looking for more partitions. TRX and its -subpartitions are handled by a separate parser. - -The problem with old code was relying on the length specified in a TRX -header. That isn't reliable as TRX is commonly modified to have checksum -cover only non-changing subpartitions. Otherwise modifying e.g. a rootfs -would result in CRC32 mismatch and bootloader refusing to boot a -firmware. - -Fix it by trying better to figure out a real TRX size. We can securely -assume that TRX has to cover all subpartitions and the last one is at -least of a block size in size. Then compare it with a length field. - -This makes code more optimal & reliable thanks to skipping data that -shouldn't be parsed. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -186,6 +186,8 @@ static int bcm47xxpart_parse(struct mtd_ - /* TRX */ - if (buf[0x000 / 4] == TRX_MAGIC) { - struct trx_header *trx; -+ uint32_t last_subpart; -+ uint32_t trx_size; - - if (trx_num >= ARRAY_SIZE(trx_parts)) - pr_warn("No enough space to store another TRX found at 0x%X\n", -@@ -195,11 +197,23 @@ static int bcm47xxpart_parse(struct mtd_ - bcm47xxpart_add_part(&parts[curr_part++], "firmware", - offset, 0); - -- /* Jump to the end of TRX */ -+ /* -+ * Try to find TRX size. The "length" field isn't fully -+ * reliable as it could be decreased to make CRC32 cover -+ * only part of TRX data. It's commonly used as checksum -+ * can't cover e.g. ever-changing rootfs partition. -+ * Use offsets as helpers for assuming min TRX size. -+ */ - trx = (struct trx_header *)buf; -- offset = roundup(offset + trx->length, blocksize); -- /* Next loop iteration will increase the offset */ -- offset -= blocksize; -+ last_subpart = max3(trx->offset[0], trx->offset[1], -+ trx->offset[2]); -+ trx_size = max(trx->length, last_subpart + blocksize); -+ -+ /* -+ * Skip the TRX data. Decrease offset by block size as -+ * the next loop iteration will increase it. -+ */ -+ offset += roundup(trx_size, blocksize) - blocksize; - continue; - } - diff --git a/target/linux/generic/backport-4.9/070-bcma-from-4.11.patch b/target/linux/generic/backport-4.9/070-bcma-from-4.11.patch deleted file mode 100644 index a3b0321986..0000000000 --- a/target/linux/generic/backport-4.9/070-bcma-from-4.11.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -136,17 +136,17 @@ static bool bcma_is_core_needed_early(u1 - return false; - } - --static struct device_node *bcma_of_find_child_device(struct platform_device *parent, -+static struct device_node *bcma_of_find_child_device(struct device *parent, - struct bcma_device *core) - { - struct device_node *node; - u64 size; - const __be32 *reg; - -- if (!parent || !parent->dev.of_node) -+ if (!parent->of_node) - return NULL; - -- for_each_child_of_node(parent->dev.of_node, node) { -+ for_each_child_of_node(parent->of_node, node) { - reg = of_get_address(node, 0, &size, NULL); - if (!reg) - continue; -@@ -156,7 +156,7 @@ static struct device_node *bcma_of_find_ - return NULL; - } - --static int bcma_of_irq_parse(struct platform_device *parent, -+static int bcma_of_irq_parse(struct device *parent, - struct bcma_device *core, - struct of_phandle_args *out_irq, int num) - { -@@ -169,7 +169,7 @@ static int bcma_of_irq_parse(struct plat - return rc; - } - -- out_irq->np = parent->dev.of_node; -+ out_irq->np = parent->of_node; - out_irq->args_count = 1; - out_irq->args[0] = num; - -@@ -177,13 +177,13 @@ static int bcma_of_irq_parse(struct plat - return of_irq_parse_raw(laddr, out_irq); - } - --static unsigned int bcma_of_get_irq(struct platform_device *parent, -+static unsigned int bcma_of_get_irq(struct device *parent, - struct bcma_device *core, int num) - { - struct of_phandle_args out_irq; - int ret; - -- if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent || !parent->dev.of_node) -+ if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent->of_node) - return 0; - - ret = bcma_of_irq_parse(parent, core, &out_irq, num); -@@ -196,7 +196,7 @@ static unsigned int bcma_of_get_irq(stru - return irq_create_of_mapping(&out_irq); - } - --static void bcma_of_fill_device(struct platform_device *parent, -+static void bcma_of_fill_device(struct device *parent, - struct bcma_device *core) - { - struct device_node *node; -@@ -227,7 +227,7 @@ unsigned int bcma_core_irq(struct bcma_d - return mips_irq <= 4 ? mips_irq + 2 : 0; - } - if (bus->host_pdev) -- return bcma_of_get_irq(bus->host_pdev, core, num); -+ return bcma_of_get_irq(&bus->host_pdev->dev, core, num); - return 0; - case BCMA_HOSTTYPE_SDIO: - return 0; -@@ -253,7 +253,8 @@ void bcma_prepare_core(struct bcma_bus * - if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) { - core->dma_dev = &bus->host_pdev->dev; - core->dev.parent = &bus->host_pdev->dev; -- bcma_of_fill_device(bus->host_pdev, core); -+ if (core->dev.parent) -+ bcma_of_fill_device(core->dev.parent, core); - } else { - core->dev.dma_mask = &core->dev.coherent_dma_mask; - core->dma_dev = &core->dev; diff --git a/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch b/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch deleted file mode 100644 index 4b667bc2f3..0000000000 --- a/target/linux/generic/backport-4.9/071-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 34a5102c3235c470a6c77fba16cb971964d9c136 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 31 Jan 2017 19:37:54 +0100 -Subject: [PATCH 1/3] net: bgmac: allocate struct bgmac just once & don't copy - it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -So far were were allocating struct bgmac in 3 places: platform code, -bcma code and shared bgmac_enet_probe function. The reason for this was -bgmac_enet_probe: -1) Requiring early-filled struct bgmac -2) Calling alloc_etherdev on its own in order to use netdev_priv later - -This solution got few drawbacks: -1) Was duplicating allocating code -2) Required copying early-filled struct -3) Resulted in platform/bcma code having access only to unused struct - -Solve this situation by simply extracting some probe code into the new -bgmac_alloc function. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/broadcom/bgmac-bcma.c | 4 +--- - drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- - drivers/net/ethernet/broadcom/bgmac.c | 25 +++++++++++++++++-------- - drivers/net/ethernet/broadcom/bgmac.h | 3 ++- - 4 files changed, 21 insertions(+), 13 deletions(-) - ---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c -+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c -@@ -100,12 +100,11 @@ static int bgmac_probe(struct bcma_devic - const u8 *mac = NULL; - int err; - -- bgmac = kzalloc(sizeof(*bgmac), GFP_KERNEL); -+ bgmac = bgmac_alloc(&core->dev); - if (!bgmac) - return -ENOMEM; - - bgmac->bcma.core = core; -- bgmac->dev = &core->dev; - bgmac->dma_dev = core->dma_dev; - bgmac->irq = core->irq; - -@@ -292,7 +291,6 @@ static int bgmac_probe(struct bcma_devic - err1: - bcma_mdio_mii_unregister(bgmac->mii_bus); - err: -- kfree(bgmac); - bcma_set_drvdata(core, NULL); - - return err; ---- a/drivers/net/ethernet/broadcom/bgmac-platform.c -+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c -@@ -93,7 +93,7 @@ static int bgmac_probe(struct platform_d - struct resource *regs; - const u8 *mac_addr; - -- bgmac = devm_kzalloc(&pdev->dev, sizeof(*bgmac), GFP_KERNEL); -+ bgmac = bgmac_alloc(&pdev->dev); - if (!bgmac) - return -ENOMEM; - ---- a/drivers/net/ethernet/broadcom/bgmac.c -+++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1460,22 +1460,32 @@ static int bgmac_phy_connect(struct bgma - return 0; - } - --int bgmac_enet_probe(struct bgmac *info) -+struct bgmac *bgmac_alloc(struct device *dev) - { - struct net_device *net_dev; - struct bgmac *bgmac; -- int err; - - /* Allocation and references */ -- net_dev = alloc_etherdev(sizeof(*bgmac)); -+ net_dev = devm_alloc_etherdev(dev, sizeof(*bgmac)); - if (!net_dev) -- return -ENOMEM; -+ return NULL; - - net_dev->netdev_ops = &bgmac_netdev_ops; - net_dev->ethtool_ops = &bgmac_ethtool_ops; -+ - bgmac = netdev_priv(net_dev); -- memcpy(bgmac, info, sizeof(*bgmac)); -+ bgmac->dev = dev; - bgmac->net_dev = net_dev; -+ -+ return bgmac; -+} -+EXPORT_SYMBOL_GPL(bgmac_alloc); -+ -+int bgmac_enet_probe(struct bgmac *bgmac) -+{ -+ struct net_device *net_dev = bgmac->net_dev; -+ int err; -+ - net_dev->irq = bgmac->irq; - SET_NETDEV_DEV(net_dev, bgmac->dev); - -@@ -1502,7 +1512,7 @@ int bgmac_enet_probe(struct bgmac *info) - err = bgmac_dma_alloc(bgmac); - if (err) { - dev_err(bgmac->dev, "Unable to alloc memory for DMA\n"); -- goto err_netdev_free; -+ goto err_out; - } - - bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK; -@@ -1538,8 +1548,7 @@ err_phy_disconnect: - phy_disconnect(net_dev->phydev); - err_dma_free: - bgmac_dma_free(bgmac); --err_netdev_free: -- free_netdev(net_dev); -+err_out: - - return err; - } ---- a/drivers/net/ethernet/broadcom/bgmac.h -+++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -515,7 +515,8 @@ struct bgmac { - u32 set); - }; - --int bgmac_enet_probe(struct bgmac *info); -+struct bgmac *bgmac_alloc(struct device *dev); -+int bgmac_enet_probe(struct bgmac *bgmac); - void bgmac_enet_remove(struct bgmac *bgmac); - - struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr); diff --git a/target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch b/target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch deleted file mode 100644 index 5e3d33375a..0000000000 --- a/target/linux/generic/backport-4.9/071-v4.10-0002-net-bgmac-drop-struct-bcma_mdio-we-don-t-need-anymor.patch +++ /dev/null @@ -1,261 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 31 Jan 2017 19:37:55 +0100 -Subject: [PATCH] net: bgmac: drop struct bcma_mdio we don't need anymore -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Adding struct bcma_mdio was a workaround for bcma code not having access -to the struct bgmac used in the core code. Now we don't duplicate this -struct we can just use it internally in bcma code. - -This simplifies code & allows access to all bgmac driver details from -all places in bcma code. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c -+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c -@@ -166,7 +166,7 @@ static int bgmac_probe(struct bcma_devic - - if (!bgmac_is_bcm4707_family(core) && - !(ci->id == BCMA_CHIP_ID_BCM53573 && core->core_unit == 1)) { -- mii_bus = bcma_mdio_mii_register(core, bgmac->phyaddr); -+ mii_bus = bcma_mdio_mii_register(bgmac); - if (IS_ERR(mii_bus)) { - err = PTR_ERR(mii_bus); - goto err; ---- a/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c -+++ b/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c -@@ -12,11 +12,6 @@ - #include - #include "bgmac.h" - --struct bcma_mdio { -- struct bcma_device *core; -- u8 phyaddr; --}; -- - static bool bcma_mdio_wait_value(struct bcma_device *core, u16 reg, u32 mask, - u32 value, int timeout) - { -@@ -37,7 +32,7 @@ static bool bcma_mdio_wait_value(struct - * PHY ops - **************************************************/ - --static u16 bcma_mdio_phy_read(struct bcma_mdio *bcma_mdio, u8 phyaddr, u8 reg) -+static u16 bcma_mdio_phy_read(struct bgmac *bgmac, u8 phyaddr, u8 reg) - { - struct bcma_device *core; - u16 phy_access_addr; -@@ -56,12 +51,12 @@ static u16 bcma_mdio_phy_read(struct bcm - BUILD_BUG_ON(BGMAC_PC_MCT_SHIFT != BCMA_GMAC_CMN_PC_MCT_SHIFT); - BUILD_BUG_ON(BGMAC_PC_MTE != BCMA_GMAC_CMN_PC_MTE); - -- if (bcma_mdio->core->id.id == BCMA_CORE_4706_MAC_GBIT) { -- core = bcma_mdio->core->bus->drv_gmac_cmn.core; -+ if (bgmac->bcma.core->id.id == BCMA_CORE_4706_MAC_GBIT) { -+ core = bgmac->bcma.core->bus->drv_gmac_cmn.core; - phy_access_addr = BCMA_GMAC_CMN_PHY_ACCESS; - phy_ctl_addr = BCMA_GMAC_CMN_PHY_CTL; - } else { -- core = bcma_mdio->core; -+ core = bgmac->bcma.core; - phy_access_addr = BGMAC_PHY_ACCESS; - phy_ctl_addr = BGMAC_PHY_CNTL; - } -@@ -87,7 +82,7 @@ static u16 bcma_mdio_phy_read(struct bcm - } - - /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphywr */ --static int bcma_mdio_phy_write(struct bcma_mdio *bcma_mdio, u8 phyaddr, u8 reg, -+static int bcma_mdio_phy_write(struct bgmac *bgmac, u8 phyaddr, u8 reg, - u16 value) - { - struct bcma_device *core; -@@ -95,12 +90,12 @@ static int bcma_mdio_phy_write(struct bc - u16 phy_ctl_addr; - u32 tmp; - -- if (bcma_mdio->core->id.id == BCMA_CORE_4706_MAC_GBIT) { -- core = bcma_mdio->core->bus->drv_gmac_cmn.core; -+ if (bgmac->bcma.core->id.id == BCMA_CORE_4706_MAC_GBIT) { -+ core = bgmac->bcma.core->bus->drv_gmac_cmn.core; - phy_access_addr = BCMA_GMAC_CMN_PHY_ACCESS; - phy_ctl_addr = BCMA_GMAC_CMN_PHY_CTL; - } else { -- core = bcma_mdio->core; -+ core = bgmac->bcma.core; - phy_access_addr = BGMAC_PHY_ACCESS; - phy_ctl_addr = BGMAC_PHY_CNTL; - } -@@ -110,8 +105,8 @@ static int bcma_mdio_phy_write(struct bc - tmp |= phyaddr; - bcma_write32(core, phy_ctl_addr, tmp); - -- bcma_write32(bcma_mdio->core, BGMAC_INT_STATUS, BGMAC_IS_MDIO); -- if (bcma_read32(bcma_mdio->core, BGMAC_INT_STATUS) & BGMAC_IS_MDIO) -+ bcma_write32(bgmac->bcma.core, BGMAC_INT_STATUS, BGMAC_IS_MDIO); -+ if (bcma_read32(bgmac->bcma.core, BGMAC_INT_STATUS) & BGMAC_IS_MDIO) - dev_warn(&core->dev, "Error setting MDIO int\n"); - - tmp = BGMAC_PA_START; -@@ -132,39 +127,39 @@ static int bcma_mdio_phy_write(struct bc - } - - /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyinit */ --static void bcma_mdio_phy_init(struct bcma_mdio *bcma_mdio) -+static void bcma_mdio_phy_init(struct bgmac *bgmac) - { -- struct bcma_chipinfo *ci = &bcma_mdio->core->bus->chipinfo; -+ struct bcma_chipinfo *ci = &bgmac->bcma.core->bus->chipinfo; - u8 i; - - if (ci->id == BCMA_CHIP_ID_BCM5356) { - for (i = 0; i < 5; i++) { -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x008b); -- bcma_mdio_phy_write(bcma_mdio, i, 0x15, 0x0100); -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000f); -- bcma_mdio_phy_write(bcma_mdio, i, 0x12, 0x2aaa); -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000b); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x008b); -+ bcma_mdio_phy_write(bgmac, i, 0x15, 0x0100); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000f); -+ bcma_mdio_phy_write(bgmac, i, 0x12, 0x2aaa); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b); - } - } - if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg != 10) || - (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg != 10) || - (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg != 9)) { -- struct bcma_drv_cc *cc = &bcma_mdio->core->bus->drv_cc; -+ struct bcma_drv_cc *cc = &bgmac->bcma.core->bus->drv_cc; - - bcma_chipco_chipctl_maskset(cc, 2, ~0xc0000000, 0); - bcma_chipco_chipctl_maskset(cc, 4, ~0x80000000, 0); - for (i = 0; i < 5; i++) { -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000f); -- bcma_mdio_phy_write(bcma_mdio, i, 0x16, 0x5284); -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000b); -- bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x0010); -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000f); -- bcma_mdio_phy_write(bcma_mdio, i, 0x16, 0x5296); -- bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x1073); -- bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x9073); -- bcma_mdio_phy_write(bcma_mdio, i, 0x16, 0x52b6); -- bcma_mdio_phy_write(bcma_mdio, i, 0x17, 0x9273); -- bcma_mdio_phy_write(bcma_mdio, i, 0x1f, 0x000b); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000f); -+ bcma_mdio_phy_write(bgmac, i, 0x16, 0x5284); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b); -+ bcma_mdio_phy_write(bgmac, i, 0x17, 0x0010); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000f); -+ bcma_mdio_phy_write(bgmac, i, 0x16, 0x5296); -+ bcma_mdio_phy_write(bgmac, i, 0x17, 0x1073); -+ bcma_mdio_phy_write(bgmac, i, 0x17, 0x9073); -+ bcma_mdio_phy_write(bgmac, i, 0x16, 0x52b6); -+ bcma_mdio_phy_write(bgmac, i, 0x17, 0x9273); -+ bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b); - } - } - } -@@ -172,17 +167,17 @@ static void bcma_mdio_phy_init(struct bc - /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyreset */ - static int bcma_mdio_phy_reset(struct mii_bus *bus) - { -- struct bcma_mdio *bcma_mdio = bus->priv; -- u8 phyaddr = bcma_mdio->phyaddr; -+ struct bgmac *bgmac = bus->priv; -+ u8 phyaddr = bgmac->phyaddr; - -- if (bcma_mdio->phyaddr == BGMAC_PHY_NOREGS) -+ if (phyaddr == BGMAC_PHY_NOREGS) - return 0; - -- bcma_mdio_phy_write(bcma_mdio, phyaddr, MII_BMCR, BMCR_RESET); -+ bcma_mdio_phy_write(bgmac, phyaddr, MII_BMCR, BMCR_RESET); - udelay(100); -- if (bcma_mdio_phy_read(bcma_mdio, phyaddr, MII_BMCR) & BMCR_RESET) -- dev_err(&bcma_mdio->core->dev, "PHY reset failed\n"); -- bcma_mdio_phy_init(bcma_mdio); -+ if (bcma_mdio_phy_read(bgmac, phyaddr, MII_BMCR) & BMCR_RESET) -+ dev_err(bgmac->dev, "PHY reset failed\n"); -+ bcma_mdio_phy_init(bgmac); - - return 0; - } -@@ -202,16 +197,12 @@ static int bcma_mdio_mii_write(struct mi - return bcma_mdio_phy_write(bus->priv, mii_id, regnum, value); - } - --struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr) -+struct mii_bus *bcma_mdio_mii_register(struct bgmac *bgmac) - { -- struct bcma_mdio *bcma_mdio; -+ struct bcma_device *core = bgmac->bcma.core; - struct mii_bus *mii_bus; - int err; - -- bcma_mdio = kzalloc(sizeof(*bcma_mdio), GFP_KERNEL); -- if (!bcma_mdio) -- return ERR_PTR(-ENOMEM); -- - mii_bus = mdiobus_alloc(); - if (!mii_bus) { - err = -ENOMEM; -@@ -221,15 +212,12 @@ struct mii_bus *bcma_mdio_mii_register(s - mii_bus->name = "bcma_mdio mii bus"; - sprintf(mii_bus->id, "%s-%d-%d", "bcma_mdio", core->bus->num, - core->core_unit); -- mii_bus->priv = bcma_mdio; -+ mii_bus->priv = bgmac; - mii_bus->read = bcma_mdio_mii_read; - mii_bus->write = bcma_mdio_mii_write; - mii_bus->reset = bcma_mdio_phy_reset; - mii_bus->parent = &core->dev; -- mii_bus->phy_mask = ~(1 << phyaddr); -- -- bcma_mdio->core = core; -- bcma_mdio->phyaddr = phyaddr; -+ mii_bus->phy_mask = ~(1 << bgmac->phyaddr); - - err = mdiobus_register(mii_bus); - if (err) { -@@ -242,23 +230,17 @@ struct mii_bus *bcma_mdio_mii_register(s - err_free_bus: - mdiobus_free(mii_bus); - err: -- kfree(bcma_mdio); - return ERR_PTR(err); - } - EXPORT_SYMBOL_GPL(bcma_mdio_mii_register); - - void bcma_mdio_mii_unregister(struct mii_bus *mii_bus) - { -- struct bcma_mdio *bcma_mdio; -- - if (!mii_bus) - return; - -- bcma_mdio = mii_bus->priv; -- - mdiobus_unregister(mii_bus); - mdiobus_free(mii_bus); -- kfree(bcma_mdio); - } - EXPORT_SYMBOL_GPL(bcma_mdio_mii_unregister); - ---- a/drivers/net/ethernet/broadcom/bgmac.h -+++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -519,7 +519,7 @@ struct bgmac *bgmac_alloc(struct device - int bgmac_enet_probe(struct bgmac *bgmac); - void bgmac_enet_remove(struct bgmac *bgmac); - --struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr); -+struct mii_bus *bcma_mdio_mii_register(struct bgmac *bgmac); - void bcma_mdio_mii_unregister(struct mii_bus *mii_bus); - - static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset) diff --git a/target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch b/target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch deleted file mode 100644 index d1be3e3f4c..0000000000 --- a/target/linux/generic/backport-4.9/071-v4.10-0003-net-bgmac-use-PHY-subsystem-for-initializing-PHY.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8e6f31baba7e2c13ab7e954fe6179420a7545a8b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 31 Jan 2017 19:37:56 +0100 -Subject: [PATCH 3/3] net: bgmac: use PHY subsystem for initializing PHY -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This adds support for using bgmac with PHYs supported by standalone PHY -drivers. Having any PHY initialization in bgmac is hacky and shouldn't -be extended but rather removed if anyone has hardware to test it. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c -+++ b/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c -@@ -132,6 +132,10 @@ static void bcma_mdio_phy_init(struct bg - struct bcma_chipinfo *ci = &bgmac->bcma.core->bus->chipinfo; - u8 i; - -+ /* For some legacy hardware we do chipset-based PHY initialization here -+ * without even detecting PHY ID. It's hacky and should be cleaned as -+ * soon as someone can test it. -+ */ - if (ci->id == BCMA_CHIP_ID_BCM5356) { - for (i = 0; i < 5; i++) { - bcma_mdio_phy_write(bgmac, i, 0x1f, 0x008b); -@@ -140,6 +144,7 @@ static void bcma_mdio_phy_init(struct bg - bcma_mdio_phy_write(bgmac, i, 0x12, 0x2aaa); - bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b); - } -+ return; - } - if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg != 10) || - (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg != 10) || -@@ -161,7 +166,12 @@ static void bcma_mdio_phy_init(struct bg - bcma_mdio_phy_write(bgmac, i, 0x17, 0x9273); - bcma_mdio_phy_write(bgmac, i, 0x1f, 0x000b); - } -+ return; - } -+ -+ /* For all other hw do initialization using PHY subsystem. */ -+ if (bgmac->net_dev && bgmac->net_dev->phydev) -+ phy_init_hw(bgmac->net_dev->phydev); - } - - /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyreset */ diff --git a/target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch b/target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch deleted file mode 100644 index 772ee61c08..0000000000 --- a/target/linux/generic/backport-4.9/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 12acd136913ccdf394eeb2bc8686ff5505368119 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 12 Oct 2017 10:21:26 +0200 -Subject: [PATCH] net: bgmac: enable master mode for BCM54210E and B50212E PHYs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There are 4 very similar PHYs: -0x600d84a1: BCM54210E (rev B0) -0x600d84a2: BCM54210E (rev B1) -0x600d84a5: B50212E (rev B0) -0x600d84a6: B50212E (rev B1) -that need setting master mode manually. It's because they run in slave -mode by default with Automatic Slave/Master configuration disabled which -can lead to unreliable connection with massive ping loss. - -So far it was reported for a board with BCM47189 SoC and B50212E B1 PHY -connected to the bgmac supported ethernet device. Telling PHY driver to -setup PHY properly solves this issue. - -Signed-off-by: Rafał Miłecki -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/broadcom/bgmac-bcma.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c -+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c -@@ -166,13 +166,19 @@ static int bgmac_probe(struct bcma_devic - - if (!bgmac_is_bcm4707_family(core) && - !(ci->id == BCMA_CHIP_ID_BCM53573 && core->core_unit == 1)) { -+ struct phy_device *phydev; -+ - mii_bus = bcma_mdio_mii_register(bgmac); - if (IS_ERR(mii_bus)) { - err = PTR_ERR(mii_bus); - goto err; - } -- - bgmac->mii_bus = mii_bus; -+ -+ phydev = mdiobus_get_phy(bgmac->mii_bus, bgmac->phyaddr); -+ if (ci->id == BCMA_CHIP_ID_BCM53573 && phydev && -+ (phydev->drv->phy_id & phydev->drv->phy_id_mask) == PHY_ID_BCM54210E) -+ phydev->dev_flags |= PHY_BRCM_EN_MASTER_MODE; - } - - if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) { diff --git a/target/linux/generic/backport-4.9/072-bcma-from-4.12.patch b/target/linux/generic/backport-4.9/072-bcma-from-4.12.patch deleted file mode 100644 index 23f2656ab5..0000000000 --- a/target/linux/generic/backport-4.9/072-bcma-from-4.12.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/drivers/bcma/driver_gpio.c -+++ b/drivers/bcma/driver_gpio.c -@@ -185,8 +185,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c - chip->owner = THIS_MODULE; - chip->parent = bcma_bus_get_host_dev(bus); - #if IS_BUILTIN(CONFIG_OF) -- if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC) -- chip->of_node = cc->core->dev.of_node; -+ chip->of_node = cc->core->dev.of_node; - #endif - switch (bus->chipinfo.id) { - case BCMA_CHIP_ID_BCM4707: ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -201,9 +201,6 @@ static void bcma_of_fill_device(struct d - { - struct device_node *node; - -- if (!IS_ENABLED(CONFIG_OF_IRQ)) -- return; -- - node = bcma_of_find_child_device(parent, core); - if (node) - core->dev.of_node = node; -@@ -242,19 +239,18 @@ void bcma_prepare_core(struct bcma_bus * - core->dev.release = bcma_release_core_dev; - core->dev.bus = &bcma_bus_type; - dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index); -+ core->dev.parent = bcma_bus_get_host_dev(bus); -+ if (core->dev.parent) -+ bcma_of_fill_device(core->dev.parent, core); - - switch (bus->hosttype) { - case BCMA_HOSTTYPE_PCI: -- core->dev.parent = &bus->host_pci->dev; - core->dma_dev = &bus->host_pci->dev; - core->irq = bus->host_pci->irq; - break; - case BCMA_HOSTTYPE_SOC: - if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) { - core->dma_dev = &bus->host_pdev->dev; -- core->dev.parent = &bus->host_pdev->dev; -- if (core->dev.parent) -- bcma_of_fill_device(core->dev.parent, core); - } else { - core->dev.dma_mask = &core->dev.coherent_dma_mask; - core->dma_dev = &core->dev; diff --git a/target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch b/target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch deleted file mode 100644 index 9279a7c84c..0000000000 --- a/target/linux/generic/backport-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Xo Wang -Date: Fri, 21 Oct 2016 10:20:12 -0700 -Subject: [PATCH] net: phy: broadcom: Update Auxiliary Control Register macros - -Add the RXD-to-RXC skew (delay) time bit in the Miscellaneous Control -shadow register and a mask for the shadow selector field. - -Remove a re-definition of MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL. - -Signed-off-by: Xo Wang -Reviewed-by: Florian Fainelli -Reviewed-by: Joel Stanley -Signed-off-by: David S. Miller ---- - ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -101,6 +101,7 @@ - * AUXILIARY CONTROL SHADOW ACCESS REGISTERS. (PHY REG 0x18) - */ - #define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000 -+#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW 0x0100 - #define MII_BCM54XX_AUXCTL_ACTL_TX_6DB 0x0400 - #define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA 0x0800 - -@@ -109,7 +110,7 @@ - #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000 - #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 - --#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000 -+#define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007 - - /* - * Broadcom LED source encodings. These are used in BCM5461, BCM5481, diff --git a/target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch b/target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch deleted file mode 100644 index 4caa7b193d..0000000000 --- a/target/linux/generic/backport-4.9/075-v4.10-0002-net-phy-broadcom-Add-support-for-BCM54612E.patch +++ /dev/null @@ -1,94 +0,0 @@ -From: Xo Wang -Date: Fri, 21 Oct 2016 10:20:13 -0700 -Subject: [PATCH] net: phy: broadcom: Add support for BCM54612E - -This PHY has internal delays enabled after reset. This clears the -internal delay enables unless the interface specifically requests them. - -Signed-off-by: Xo Wang -Reviewed-by: Florian Fainelli -Reviewed-by: Joel Stanley -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -337,6 +337,41 @@ static int bcm5481_config_aneg(struct ph - return ret; - } - -+static int bcm54612e_config_aneg(struct phy_device *phydev) -+{ -+ int ret; -+ -+ /* First, auto-negotiate. */ -+ ret = genphy_config_aneg(phydev); -+ -+ /* Clear TX internal delay unless requested. */ -+ if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) && -+ (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) { -+ /* Disable TXD to GTXCLK clock delay (default set) */ -+ /* Bit 9 is the only field in shadow register 00011 */ -+ bcm_phy_write_shadow(phydev, 0x03, 0); -+ } -+ -+ /* Clear RX internal delay unless requested. */ -+ if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) && -+ (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) { -+ u16 reg; -+ -+ /* Errata: reads require filling in the write selector field */ -+ bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, -+ MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC); -+ reg = phy_read(phydev, MII_BCM54XX_AUX_CTL); -+ /* Disable RXD to RXC delay (default set) */ -+ reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; -+ /* Clear shadow selector field */ -+ reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK; -+ bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, -+ MII_BCM54XX_AUXCTL_MISC_WREN | reg); -+ } -+ -+ return ret; -+} -+ - static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set) - { - int val; -@@ -485,6 +520,18 @@ static struct phy_driver broadcom_driver - .ack_interrupt = bcm_phy_ack_intr, - .config_intr = bcm_phy_config_intr, - }, { -+ .phy_id = PHY_ID_BCM54612E, -+ .phy_id_mask = 0xfffffff0, -+ .name = "Broadcom BCM54612E", -+ .features = PHY_GBIT_FEATURES | -+ SUPPORTED_Pause | SUPPORTED_Asym_Pause, -+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, -+ .config_init = bcm54xx_config_init, -+ .config_aneg = bcm54612e_config_aneg, -+ .read_status = genphy_read_status, -+ .ack_interrupt = bcm_phy_ack_intr, -+ .config_intr = bcm_phy_config_intr, -+}, { - .phy_id = PHY_ID_BCM54616S, - .phy_id_mask = 0xfffffff0, - .name = "Broadcom BCM54616S", -@@ -600,6 +647,7 @@ static struct mdio_device_id __maybe_unu - { PHY_ID_BCM5411, 0xfffffff0 }, - { PHY_ID_BCM5421, 0xfffffff0 }, - { PHY_ID_BCM5461, 0xfffffff0 }, -+ { PHY_ID_BCM54612E, 0xfffffff0 }, - { PHY_ID_BCM54616S, 0xfffffff0 }, - { PHY_ID_BCM5464, 0xfffffff0 }, - { PHY_ID_BCM5481, 0xfffffff0 }, ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -18,6 +18,7 @@ - #define PHY_ID_BCM5421 0x002060e0 - #define PHY_ID_BCM5464 0x002060b0 - #define PHY_ID_BCM5461 0x002060c0 -+#define PHY_ID_BCM54612E 0x03625e60 - #define PHY_ID_BCM54616S 0x03625d10 - #define PHY_ID_BCM57780 0x03625d90 - diff --git a/target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch b/target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch deleted file mode 100644 index c9b3b5911e..0000000000 --- a/target/linux/generic/backport-4.9/075-v4.10-0003-net-phy-broadcom-add-bcm54xx_auxctl_read.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Jon Mason -Date: Fri, 4 Nov 2016 01:10:56 -0400 -Subject: [PATCH] net: phy: broadcom: add bcm54xx_auxctl_read - -Add a helper function to read the AUXCTL register for the BCM54xx. This -mirrors the bcm54xx_auxctl_write function already present in the code. - -Signed-off-by: Jon Mason -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -30,6 +30,16 @@ MODULE_DESCRIPTION("Broadcom PHY driver" - MODULE_AUTHOR("Maciej W. Rozycki"); - MODULE_LICENSE("GPL"); - -+static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum) -+{ -+ /* The register must be written to both the Shadow Register Select and -+ * the Shadow Read Register Selector -+ */ -+ phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | -+ regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT); -+ return phy_read(phydev, MII_BCM54XX_AUX_CTL); -+} -+ - static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val) - { - return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val); ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -110,6 +110,7 @@ - #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX 0x0200 - #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000 - #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 -+#define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12 - - #define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007 - diff --git a/target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch b/target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch deleted file mode 100644 index 3d61ec6369..0000000000 --- a/target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch +++ /dev/null @@ -1,176 +0,0 @@ -From: Jon Mason -Date: Fri, 4 Nov 2016 01:10:58 -0400 -Subject: [PATCH] net: phy: broadcom: Add BCM54810 PHY entry - -The BCM54810 PHY requires some semi-unique configuration, which results -in some additional configuration in addition to the standard config. -Also, some users of the BCM54810 require the PHY lanes to be swapped. -Since there is no way to detect this, add a device tree query to see if -it is applicable. - -Inspired-by: Vikas Soni -Signed-off-by: Jon Mason -Reviewed-by: Florian Fainelli -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -18,7 +18,7 @@ - #include - #include - #include -- -+#include - - #define BRCM_PHY_MODEL(phydev) \ - ((phydev)->drv->phy_id & (phydev)->drv->phy_id_mask) -@@ -45,6 +45,34 @@ static int bcm54xx_auxctl_write(struct p - return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val); - } - -+static int bcm54810_config(struct phy_device *phydev) -+{ -+ int rc, val; -+ -+ val = bcm_phy_read_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL); -+ val &= ~BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; -+ rc = bcm_phy_write_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL, -+ val); -+ if (rc < 0) -+ return rc; -+ -+ val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC); -+ val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; -+ val |= MII_BCM54XX_AUXCTL_MISC_WREN; -+ rc = bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, -+ val); -+ if (rc < 0) -+ return rc; -+ -+ val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL); -+ val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN; -+ rc = bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val); -+ if (rc < 0) -+ return rc; -+ -+ return 0; -+} -+ - /* Needs SMDSP clock enabled via bcm54xx_phydsp_config() */ - static int bcm50610_a0_workaround(struct phy_device *phydev) - { -@@ -217,6 +245,12 @@ static int bcm54xx_config_init(struct ph - (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE)) - bcm54xx_adjust_rxrefclk(phydev); - -+ if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) { -+ err = bcm54810_config(phydev); -+ if (err) -+ return err; -+ } -+ - bcm54xx_phydsp_config(phydev); - - return 0; -@@ -314,6 +348,7 @@ static int bcm5482_read_status(struct ph - - static int bcm5481_config_aneg(struct phy_device *phydev) - { -+ struct device_node *np = phydev->mdio.dev.of_node; - int ret; - - /* Aneg firsly. */ -@@ -344,6 +379,14 @@ static int bcm5481_config_aneg(struct ph - phy_write(phydev, 0x18, reg); - } - -+ if (of_property_read_bool(np, "enet-phy-lane-swap")) { -+ /* Lane Swap - Undocumented register...magic! */ -+ ret = bcm_phy_write_exp(phydev, MII_BCM54XX_EXP_SEL_ER + 0x9, -+ 0x11B); -+ if (ret < 0) -+ return ret; -+ } -+ - return ret; - } - -@@ -578,6 +621,18 @@ static struct phy_driver broadcom_driver - .ack_interrupt = bcm_phy_ack_intr, - .config_intr = bcm_phy_config_intr, - }, { -+ .phy_id = PHY_ID_BCM54810, -+ .phy_id_mask = 0xfffffff0, -+ .name = "Broadcom BCM54810", -+ .features = PHY_GBIT_FEATURES | -+ SUPPORTED_Pause | SUPPORTED_Asym_Pause, -+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, -+ .config_init = bcm54xx_config_init, -+ .config_aneg = bcm5481_config_aneg, -+ .read_status = genphy_read_status, -+ .ack_interrupt = bcm_phy_ack_intr, -+ .config_intr = bcm_phy_config_intr, -+}, { - .phy_id = PHY_ID_BCM5482, - .phy_id_mask = 0xfffffff0, - .name = "Broadcom BCM5482", -@@ -661,6 +716,7 @@ static struct mdio_device_id __maybe_unu - { PHY_ID_BCM54616S, 0xfffffff0 }, - { PHY_ID_BCM5464, 0xfffffff0 }, - { PHY_ID_BCM5481, 0xfffffff0 }, -+ { PHY_ID_BCM54810, 0xfffffff0 }, - { PHY_ID_BCM5482, 0xfffffff0 }, - { PHY_ID_BCM50610, 0xfffffff0 }, - { PHY_ID_BCM50610M, 0xfffffff0 }, ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig -@@ -204,7 +204,7 @@ config BROADCOM_PHY - select BCM_NET_PHYLIB - ---help--- - Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464, -- BCM5481 and BCM5482 PHYs. -+ BCM5481, BCM54810 and BCM5482 PHYs. - - config CICADA_PHY - tristate "Cicada PHYs" ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -13,6 +13,7 @@ - #define PHY_ID_BCM5241 0x0143bc30 - #define PHY_ID_BCMAC131 0x0143bc70 - #define PHY_ID_BCM5481 0x0143bca0 -+#define PHY_ID_BCM54810 0x03625d00 - #define PHY_ID_BCM5482 0x0143bcb0 - #define PHY_ID_BCM5411 0x00206070 - #define PHY_ID_BCM5421 0x002060e0 -@@ -56,6 +57,7 @@ - #define PHY_BRCM_EXT_IBND_TX_ENABLE 0x00002000 - #define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000 - #define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000 -+ - /* Broadcom BCM7xxx specific workarounds */ - #define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff) - #define PHY_BRCM_7XXX_PATCH(x) ((x) & 0xff) -@@ -111,6 +113,7 @@ - #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000 - #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 - #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12 -+#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8) - - #define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007 - -@@ -192,6 +195,12 @@ - #define BCM5482_SSD_SGMII_SLAVE_EN 0x0002 /* Slave mode enable */ - #define BCM5482_SSD_SGMII_SLAVE_AD 0x0001 /* Slave auto-detection */ - -+/* BCM54810 Registers */ -+#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL (MII_BCM54XX_EXP_SEL_ER + 0x90) -+#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0) -+#define BCM54810_SHD_CLK_CTL 0x3 -+#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9) -+ - - /*****************************************************************************/ - /* Fast Ethernet Transceiver definitions. */ diff --git a/target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch b/target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch deleted file mode 100644 index c8bf54c781..0000000000 --- a/target/linux/generic/backport-4.9/075-v4.10-0005-net-phy-broadcom-Move-bcm54xx_auxctl_-read-write-to-.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Florian Fainelli -Date: Tue, 22 Nov 2016 11:40:54 -0800 -Subject: [PATCH] net: phy: broadcom: Move bcm54xx_auxctl_{read, write} to - common library - -We are going to need these functions to implement support for Broadcom -Wirespeed, aka downshift. - -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/bcm-phy-lib.c -+++ b/drivers/net/phy/bcm-phy-lib.c -@@ -50,6 +50,23 @@ int bcm_phy_read_exp(struct phy_device * - } - EXPORT_SYMBOL_GPL(bcm_phy_read_exp); - -+int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum) -+{ -+ /* The register must be written to both the Shadow Register Select and -+ * the Shadow Read Register Selector -+ */ -+ phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | -+ regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT); -+ return phy_read(phydev, MII_BCM54XX_AUX_CTL); -+} -+EXPORT_SYMBOL_GPL(bcm54xx_auxctl_read); -+ -+int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val) -+{ -+ return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val); -+} -+EXPORT_SYMBOL(bcm54xx_auxctl_write); -+ - int bcm_phy_write_misc(struct phy_device *phydev, - u16 reg, u16 chl, u16 val) - { ---- a/drivers/net/phy/bcm-phy-lib.h -+++ b/drivers/net/phy/bcm-phy-lib.h -@@ -26,6 +26,9 @@ static inline int bcm_phy_write_exp_sel( - return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val); - } - -+int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val); -+int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum); -+ - int bcm_phy_write_misc(struct phy_device *phydev, - u16 reg, u16 chl, u16 value); - int bcm_phy_read_misc(struct phy_device *phydev, ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -30,21 +30,6 @@ MODULE_DESCRIPTION("Broadcom PHY driver" - MODULE_AUTHOR("Maciej W. Rozycki"); - MODULE_LICENSE("GPL"); - --static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum) --{ -- /* The register must be written to both the Shadow Register Select and -- * the Shadow Read Register Selector -- */ -- phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | -- regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT); -- return phy_read(phydev, MII_BCM54XX_AUX_CTL); --} -- --static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val) --{ -- return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val); --} -- - static int bcm54810_config(struct phy_device *phydev) - { - int rc, val; diff --git a/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch b/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch deleted file mode 100644 index 35eee772dd..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch +++ /dev/null @@ -1,87 +0,0 @@ -From: Florian Fainelli -Date: Tue, 22 Nov 2016 11:40:56 -0800 -Subject: [PATCH] net: phy: broadcom: Allow enabling or disabling of EEE - -In preparation for adding support for Wirespeed/downshift, we need to -change bcm_phy_eee_enable() to allow enabling or disabling EEE, so make -the function take an extra enable/disable boolean parameter and rename -it to illustrate it sets EEE, not necessarily just enables it. - -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/bcm7xxx.c -+++ b/drivers/net/phy/bcm7xxx.c -@@ -199,7 +199,7 @@ static int bcm7xxx_28nm_config_init(stru - if (ret) - return ret; - -- ret = bcm_phy_enable_eee(phydev); -+ ret = bcm_phy_set_eee(phydev, true); - if (ret) - return ret; - ---- a/drivers/net/phy/bcm-cygnus.c -+++ b/drivers/net/phy/bcm-cygnus.c -@@ -104,7 +104,7 @@ static int bcm_cygnus_config_init(struct - return rc; - - /* Advertise EEE */ -- rc = bcm_phy_enable_eee(phydev); -+ rc = bcm_phy_set_eee(phydev, true); - if (rc) - return rc; - ---- a/drivers/net/phy/bcm-phy-lib.c -+++ b/drivers/net/phy/bcm-phy-lib.c -@@ -195,7 +195,7 @@ int bcm_phy_enable_apd(struct phy_device - } - EXPORT_SYMBOL_GPL(bcm_phy_enable_apd); - --int bcm_phy_enable_eee(struct phy_device *phydev) -+int bcm_phy_set_eee(struct phy_device *phydev, bool enable) - { - int val; - -@@ -205,7 +205,10 @@ int bcm_phy_enable_eee(struct phy_device - if (val < 0) - return val; - -- val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X; -+ if (enable) -+ val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X; -+ else -+ val &= ~(LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X); - - phy_write_mmd_indirect(phydev, BRCM_CL45VEN_EEE_CONTROL, - MDIO_MMD_AN, (u32)val); -@@ -216,14 +219,17 @@ int bcm_phy_enable_eee(struct phy_device - if (val < 0) - return val; - -- val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T); -+ if (enable) -+ val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T); -+ else -+ val &= ~(MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T); - - phy_write_mmd_indirect(phydev, BCM_CL45VEN_EEE_ADV, - MDIO_MMD_AN, (u32)val); - - return 0; - } --EXPORT_SYMBOL_GPL(bcm_phy_enable_eee); -+EXPORT_SYMBOL_GPL(bcm_phy_set_eee); - - MODULE_DESCRIPTION("Broadcom PHY Library"); - MODULE_LICENSE("GPL v2"); ---- a/drivers/net/phy/bcm-phy-lib.h -+++ b/drivers/net/phy/bcm-phy-lib.h -@@ -43,5 +43,5 @@ int bcm_phy_config_intr(struct phy_devic - - int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down); - --int bcm_phy_enable_eee(struct phy_device *phydev); -+int bcm_phy_set_eee(struct phy_device *phydev, bool enable); - #endif /* _LINUX_BCM_PHY_LIB_H */ diff --git a/target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch b/target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch deleted file mode 100644 index 83cfe1f5d3..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0002-net-phy-broadcom-Add-support-code-for-reading-PHY-co.patch +++ /dev/null @@ -1,125 +0,0 @@ -From: Florian Fainelli -Date: Tue, 29 Nov 2016 09:57:17 -0800 -Subject: [PATCH] net: phy: broadcom: Add support code for reading PHY counters - -Broadcom PHYs expose a number of PHY error counters: receive errors, -false carrier sense, SerDes BER count, local and remote receive errors. -Add support code to allow retrieving these error counters. Since the -Broadcom PHY library code is used by several drivers, make it possible -for them to specify the storage for the software copy of the statistics. - -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/bcm-phy-lib.c -+++ b/drivers/net/phy/bcm-phy-lib.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #define MII_BCM_CHANNEL_WIDTH 0x2000 - #define BCM_CL45VEN_EEE_ADV 0x3c -@@ -231,6 +232,75 @@ int bcm_phy_set_eee(struct phy_device *p - } - EXPORT_SYMBOL_GPL(bcm_phy_set_eee); - -+struct bcm_phy_hw_stat { -+ const char *string; -+ u8 reg; -+ u8 shift; -+ u8 bits; -+}; -+ -+/* Counters freeze at either 0xffff or 0xff, better than nothing */ -+static const struct bcm_phy_hw_stat bcm_phy_hw_stats[] = { -+ { "phy_receive_errors", MII_BRCM_CORE_BASE12, 0, 16 }, -+ { "phy_serdes_ber_errors", MII_BRCM_CORE_BASE13, 8, 8 }, -+ { "phy_false_carrier_sense_errors", MII_BRCM_CORE_BASE13, 0, 8 }, -+ { "phy_local_rcvr_nok", MII_BRCM_CORE_BASE14, 8, 8 }, -+ { "phy_remote_rcv_nok", MII_BRCM_CORE_BASE14, 0, 8 }, -+}; -+ -+int bcm_phy_get_sset_count(struct phy_device *phydev) -+{ -+ return ARRAY_SIZE(bcm_phy_hw_stats); -+} -+EXPORT_SYMBOL_GPL(bcm_phy_get_sset_count); -+ -+void bcm_phy_get_strings(struct phy_device *phydev, u8 *data) -+{ -+ unsigned int i; -+ -+ for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++) -+ memcpy(data + i * ETH_GSTRING_LEN, -+ bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN); -+} -+EXPORT_SYMBOL_GPL(bcm_phy_get_strings); -+ -+#ifndef UINT64_MAX -+#define UINT64_MAX (u64)(~((u64)0)) -+#endif -+ -+/* Caller is supposed to provide appropriate storage for the library code to -+ * access the shadow copy -+ */ -+static u64 bcm_phy_get_stat(struct phy_device *phydev, u64 *shadow, -+ unsigned int i) -+{ -+ struct bcm_phy_hw_stat stat = bcm_phy_hw_stats[i]; -+ int val; -+ u64 ret; -+ -+ val = phy_read(phydev, stat.reg); -+ if (val < 0) { -+ ret = UINT64_MAX; -+ } else { -+ val >>= stat.shift; -+ val = val & ((1 << stat.bits) - 1); -+ shadow[i] += val; -+ ret = shadow[i]; -+ } -+ -+ return ret; -+} -+ -+void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow, -+ struct ethtool_stats *stats, u64 *data) -+{ -+ unsigned int i; -+ -+ for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++) -+ data[i] = bcm_phy_get_stat(phydev, shadow, i); -+} -+EXPORT_SYMBOL_GPL(bcm_phy_get_stats); -+ - MODULE_DESCRIPTION("Broadcom PHY Library"); - MODULE_LICENSE("GPL v2"); - MODULE_AUTHOR("Broadcom Corporation"); ---- a/drivers/net/phy/bcm-phy-lib.h -+++ b/drivers/net/phy/bcm-phy-lib.h -@@ -44,4 +44,10 @@ int bcm_phy_config_intr(struct phy_devic - int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down); - - int bcm_phy_set_eee(struct phy_device *phydev, bool enable); -+ -+int bcm_phy_get_sset_count(struct phy_device *phydev); -+void bcm_phy_get_strings(struct phy_device *phydev, u8 *data); -+void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow, -+ struct ethtool_stats *stats, u64 *data); -+ - #endif /* _LINUX_BCM_PHY_LIB_H */ ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -234,6 +234,9 @@ - #define LPI_FEATURE_EN_DIG1000X 0x4000 - - /* Core register definitions*/ -+#define MII_BRCM_CORE_BASE12 0x12 -+#define MII_BRCM_CORE_BASE13 0x13 -+#define MII_BRCM_CORE_BASE14 0x14 - #define MII_BRCM_CORE_BASE1E 0x1E - #define MII_BRCM_CORE_EXPB0 0xB0 - #define MII_BRCM_CORE_EXPB1 0xB1 diff --git a/target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch b/target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch deleted file mode 100644 index 8034f4b217..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0003-net-phy-bcm7xxx-Add-entry-for-BCM7278.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Florian Fainelli -Date: Fri, 20 Jan 2017 12:36:33 -0800 -Subject: [PATCH] net: phy: bcm7xxx: Add entry for BCM7278 - -Add support for the BCM7278 28nm process Gigabit Ethernet PHY. - -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/bcm7xxx.c -+++ b/drivers/net/phy/bcm7xxx.c -@@ -334,6 +334,7 @@ static int bcm7xxx_suspend(struct phy_de - - static struct phy_driver bcm7xxx_driver[] = { - BCM7XXX_28NM_GPHY(PHY_ID_BCM7250, "Broadcom BCM7250"), -+ BCM7XXX_28NM_GPHY(PHY_ID_BCM7278, "Broadcom BCM7278"), - BCM7XXX_28NM_GPHY(PHY_ID_BCM7364, "Broadcom BCM7364"), - BCM7XXX_28NM_GPHY(PHY_ID_BCM7366, "Broadcom BCM7366"), - BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"), -@@ -348,6 +349,7 @@ static struct phy_driver bcm7xxx_driver[ - - static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = { - { PHY_ID_BCM7250, 0xfffffff0, }, -+ { PHY_ID_BCM7278, 0xfffffff0, }, - { PHY_ID_BCM7364, 0xfffffff0, }, - { PHY_ID_BCM7366, 0xfffffff0, }, - { PHY_ID_BCM7346, 0xfffffff0, }, ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -24,6 +24,7 @@ - #define PHY_ID_BCM57780 0x03625d90 - - #define PHY_ID_BCM7250 0xae025280 -+#define PHY_ID_BCM7278 0xae0251a0 - #define PHY_ID_BCM7364 0xae025260 - #define PHY_ID_BCM7366 0x600d8490 - #define PHY_ID_BCM7346 0x600d8650 diff --git a/target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch b/target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch deleted file mode 100644 index 7aa4ee2c79..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0004-net-phy-bcm7xxx-Implement-EGPHY-workaround-for-7278.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Florian Fainelli -Date: Fri, 20 Jan 2017 12:36:34 -0800 -Subject: [PATCH] net: phy: bcm7xxx: Implement EGPHY workaround for 7278 - -Implement the HW design team recommended workaround in for 7278. Since -the GPHY now returns its revision information in MII_PHYS_ID[23] we need -to check whether the revision provided in flags is 0 or not. - -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/bcm7xxx.c -+++ b/drivers/net/phy/bcm7xxx.c -@@ -163,12 +163,43 @@ static int bcm7xxx_28nm_e0_plus_afe_conf - return 0; - } - -+static int bcm7xxx_28nm_a0_patch_afe_config_init(struct phy_device *phydev) -+{ -+ /* +1 RC_CAL codes for RL centering for both LT and HT conditions */ -+ bcm_phy_write_misc(phydev, AFE_RXCONFIG_2, 0xd003); -+ -+ /* Cut master bias current by 2% to compensate for RC_CAL offset */ -+ bcm_phy_write_misc(phydev, DSP_TAP10, 0x791b); -+ -+ /* Improve hybrid leakage */ -+ bcm_phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x10e3); -+ -+ /* Change rx_on_tune 8 to 0xf */ -+ bcm_phy_write_misc(phydev, 0x21, 0x2, 0x87f6); -+ -+ /* Change 100Tx EEE bandwidth */ -+ bcm_phy_write_misc(phydev, 0x22, 0x2, 0x017d); -+ -+ /* Enable ffe zero detection for Vitesse interoperability */ -+ bcm_phy_write_misc(phydev, 0x26, 0x2, 0x0015); -+ -+ r_rc_cal_reset(phydev); -+ -+ return 0; -+} -+ - static int bcm7xxx_28nm_config_init(struct phy_device *phydev) - { - u8 rev = PHY_BRCM_7XXX_REV(phydev->dev_flags); - u8 patch = PHY_BRCM_7XXX_PATCH(phydev->dev_flags); - int ret = 0; - -+ /* Newer devices have moved the revision information back into a -+ * standard location in MII_PHYS_ID[23] -+ */ -+ if (rev == 0) -+ rev = phydev->phy_id & ~phydev->drv->phy_id_mask; -+ - pr_info_once("%s: %s PHY revision: 0x%02x, patch: %d\n", - phydev_name(phydev), phydev->drv->name, rev, patch); - -@@ -192,6 +223,9 @@ static int bcm7xxx_28nm_config_init(stru - case 0x10: - ret = bcm7xxx_28nm_e0_plus_afe_config_init(phydev); - break; -+ case 0x01: -+ ret = bcm7xxx_28nm_a0_patch_afe_config_init(phydev); -+ break; - default: - break; - } diff --git a/target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch b/target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch deleted file mode 100644 index 554e3117d8..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0005-net-phy-broadcom-use-auxctl-reading-helper-in-BCM546.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 25 Jan 2017 21:00:25 +0100 -Subject: [PATCH] net: phy: broadcom: use auxctl reading helper in BCM54612E - code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting with commit 5b4e29005123 ("net: phy: broadcom: add -bcm54xx_auxctl_read") we have a reading helper so use it and avoid code -duplication. -It also means we don't need MII_BCM54XX_AUXCTL_SHDWSEL_MISC define as -it's the same as MII_BCM54XX_AUXCTL_SHDWSEL_MISC just for reading needs -(same value shifted by 12 bits). - -Signed-off-by: Rafał Miłecki -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -395,10 +395,8 @@ static int bcm54612e_config_aneg(struct - (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) { - u16 reg; - -- /* Errata: reads require filling in the write selector field */ -- bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, -- MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC); -- reg = phy_read(phydev, MII_BCM54XX_AUX_CTL); -+ reg = bcm54xx_auxctl_read(phydev, -+ MII_BCM54XX_AUXCTL_SHDWSEL_MISC); - /* Disable RXD to RXC delay (default set) */ - reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; - /* Clear shadow selector field */ ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -111,7 +111,6 @@ - - #define MII_BCM54XX_AUXCTL_MISC_WREN 0x8000 - #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX 0x0200 --#define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000 - #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 - #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12 - #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8) diff --git a/target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch b/target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch deleted file mode 100644 index 5fa7e88c53..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0006-net-phy-broadcom-add-support-for-BCM54210E.patch +++ /dev/null @@ -1,89 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 27 Jan 2017 14:07:01 +0100 -Subject: [PATCH] net: phy: broadcom: add support for BCM54210E -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It's Broadcom PHY simply described as single-port -RGMII 10/100/1000BASE-T PHY. It requires disabling delay skew and GTXCLK -bits. - -Signed-off-by: Rafał Miłecki -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -30,6 +30,22 @@ MODULE_DESCRIPTION("Broadcom PHY driver" - MODULE_AUTHOR("Maciej W. Rozycki"); - MODULE_LICENSE("GPL"); - -+static int bcm54210e_config_init(struct phy_device *phydev) -+{ -+ int val; -+ -+ val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC); -+ val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; -+ val |= MII_BCM54XX_AUXCTL_MISC_WREN; -+ bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val); -+ -+ val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL); -+ val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN; -+ bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val); -+ -+ return 0; -+} -+ - static int bcm54810_config(struct phy_device *phydev) - { - int rc, val; -@@ -230,7 +246,11 @@ static int bcm54xx_config_init(struct ph - (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE)) - bcm54xx_adjust_rxrefclk(phydev); - -- if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) { -+ if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) { -+ err = bcm54210e_config_init(phydev); -+ if (err) -+ return err; -+ } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) { - err = bcm54810_config(phydev); - if (err) - return err; -@@ -544,6 +564,17 @@ static struct phy_driver broadcom_driver - .ack_interrupt = bcm_phy_ack_intr, - .config_intr = bcm_phy_config_intr, - }, { -+ .phy_id = PHY_ID_BCM54210E, -+ .phy_id_mask = 0xfffffff0, -+ .name = "Broadcom BCM54210E", -+ .features = PHY_GBIT_FEATURES, -+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, -+ .config_init = bcm54xx_config_init, -+ .config_aneg = genphy_config_aneg, -+ .read_status = genphy_read_status, -+ .ack_interrupt = bcm_phy_ack_intr, -+ .config_intr = bcm_phy_config_intr, -+}, { - .phy_id = PHY_ID_BCM5461, - .phy_id_mask = 0xfffffff0, - .name = "Broadcom BCM5461", -@@ -694,6 +725,7 @@ module_phy_driver(broadcom_drivers); - static struct mdio_device_id __maybe_unused broadcom_tbl[] = { - { PHY_ID_BCM5411, 0xfffffff0 }, - { PHY_ID_BCM5421, 0xfffffff0 }, -+ { PHY_ID_BCM54210E, 0xfffffff0 }, - { PHY_ID_BCM5461, 0xfffffff0 }, - { PHY_ID_BCM54612E, 0xfffffff0 }, - { PHY_ID_BCM54616S, 0xfffffff0 }, ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -17,6 +17,7 @@ - #define PHY_ID_BCM5482 0x0143bcb0 - #define PHY_ID_BCM5411 0x00206070 - #define PHY_ID_BCM5421 0x002060e0 -+#define PHY_ID_BCM54210E 0x600d84a0 - #define PHY_ID_BCM5464 0x002060b0 - #define PHY_ID_BCM5461 0x002060c0 - #define PHY_ID_BCM54612E 0x03625e60 diff --git a/target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch b/target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch deleted file mode 100644 index b7326c3df4..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.11-0007-net-phy-broadcom-rehook-BCM54612E-specific-init.patch +++ /dev/null @@ -1,121 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 31 Jan 2017 22:54:54 +0100 -Subject: [PATCH] net: phy: broadcom: rehook BCM54612E specific init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This extra BCM54612E code in PHY driver isn't really aneg specific. Even -without it aneg works OK but the problem is no packets pass through PHY. - -Moreover putting this code inside config_aneg callback didn't allow -resuming PHY correctly. When driver called phy_stop and phy_start it was -putting PHY machine into RESUMING state. After that machine was -switching into AN and NOLINK without ever calling phy_start_aneg. This -prevented this extra setup from being called and PHY didn't work. - -This change has been verified to fix network on BCM47186B0 SoC device -with BCM54612E. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -46,6 +46,34 @@ static int bcm54210e_config_init(struct - return 0; - } - -+static int bcm54612e_config_init(struct phy_device *phydev) -+{ -+ /* Clear TX internal delay unless requested. */ -+ if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) && -+ (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) { -+ /* Disable TXD to GTXCLK clock delay (default set) */ -+ /* Bit 9 is the only field in shadow register 00011 */ -+ bcm_phy_write_shadow(phydev, 0x03, 0); -+ } -+ -+ /* Clear RX internal delay unless requested. */ -+ if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) && -+ (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) { -+ u16 reg; -+ -+ reg = bcm54xx_auxctl_read(phydev, -+ MII_BCM54XX_AUXCTL_SHDWSEL_MISC); -+ /* Disable RXD to RXC delay (default set) */ -+ reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; -+ /* Clear shadow selector field */ -+ reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK; -+ bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, -+ MII_BCM54XX_AUXCTL_MISC_WREN | reg); -+ } -+ -+ return 0; -+} -+ - static int bcm54810_config(struct phy_device *phydev) - { - int rc, val; -@@ -250,6 +278,10 @@ static int bcm54xx_config_init(struct ph - err = bcm54210e_config_init(phydev); - if (err) - return err; -+ } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54612E) { -+ err = bcm54612e_config_init(phydev); -+ if (err) -+ return err; - } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) { - err = bcm54810_config(phydev); - if (err) -@@ -395,39 +427,6 @@ static int bcm5481_config_aneg(struct ph - return ret; - } - --static int bcm54612e_config_aneg(struct phy_device *phydev) --{ -- int ret; -- -- /* First, auto-negotiate. */ -- ret = genphy_config_aneg(phydev); -- -- /* Clear TX internal delay unless requested. */ -- if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) && -- (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) { -- /* Disable TXD to GTXCLK clock delay (default set) */ -- /* Bit 9 is the only field in shadow register 00011 */ -- bcm_phy_write_shadow(phydev, 0x03, 0); -- } -- -- /* Clear RX internal delay unless requested. */ -- if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) && -- (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) { -- u16 reg; -- -- reg = bcm54xx_auxctl_read(phydev, -- MII_BCM54XX_AUXCTL_SHDWSEL_MISC); -- /* Disable RXD to RXC delay (default set) */ -- reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; -- /* Clear shadow selector field */ -- reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK; -- bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, -- MII_BCM54XX_AUXCTL_MISC_WREN | reg); -- } -- -- return ret; --} -- - static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set) - { - int val; -@@ -594,7 +593,7 @@ static struct phy_driver broadcom_driver - SUPPORTED_Pause | SUPPORTED_Asym_Pause, - .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .config_init = bcm54xx_config_init, -- .config_aneg = bcm54612e_config_aneg, -+ .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, - .ack_interrupt = bcm_phy_ack_intr, - .config_intr = bcm_phy_config_intr, diff --git a/target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch b/target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch deleted file mode 100644 index 334c444692..0000000000 --- a/target/linux/generic/backport-4.9/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 2355a6546a053b1c16ebefd6ce1f0cccc00e1da5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 12 Oct 2017 10:21:25 +0200 -Subject: [PATCH] net: phy: broadcom: support new device flag for setting - master mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some of Broadcom's PHYs run by default in slave mode with Automatic -Slave/Master configuration disabled. It stops them from working properly -with some devices. - -So far it has been verified for BCM54210E and BCM50212E which don't -work well with Intel's I217-LM and I218-LM: -http://ark.intel.com/products/60019/Intel-Ethernet-Connection-I217-LM -http://ark.intel.com/products/71307/Intel-Ethernet-Connection-I218-LM -I was told there is massive ping loss. - -This commit adds support for a new flag which can be set by an ethernet -driver to fixup PHY setup. - -Signed-off-by: Rafał Miłecki -Signed-off-by: David S. Miller ---- - drivers/net/phy/broadcom.c | 6 ++++++ - include/linux/brcmphy.h | 1 + - 2 files changed, 7 insertions(+) - ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -43,6 +43,12 @@ static int bcm54210e_config_init(struct - val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN; - bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val); - -+ if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) { -+ val = phy_read(phydev, MII_CTRL1000); -+ val |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER; -+ phy_write(phydev, MII_CTRL1000, val); -+ } -+ - return 0; - } - ---- a/include/linux/brcmphy.h -+++ b/include/linux/brcmphy.h -@@ -59,6 +59,7 @@ - #define PHY_BRCM_EXT_IBND_TX_ENABLE 0x00002000 - #define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000 - #define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000 -+#define PHY_BRCM_EN_MASTER_MODE 0x00010000 - - /* Broadcom BCM7xxx specific workarounds */ - #define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff) diff --git a/target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch b/target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch deleted file mode 100644 index 5b1b307aec..0000000000 --- a/target/linux/generic/backport-4.9/080-0001-leds-core-add-OF-variants-of-LED-registering-functio.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Mon, 6 Mar 2017 06:19:44 +0100 -Subject: [PATCH] leds: core: add OF variants of LED registering functions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These new functions allow passing an additional device_node argument -that will be internally set for created LED device. Thanks to this LED -core code and triggers will be able to access DT node for reading extra -info. - -The easiest solution for achieving this was reworking old functions to -more generic ones & adding simple defines for API compatibility. - -Signed-off-by: Rafał Miłecki -Acked-by: Pavel Machek -Signed-off-by: Jacek Anaszewski ---- - drivers/leds/led-class.c | 26 ++++++++++++++++---------- - include/linux/leds.h | 14 ++++++++++---- - 2 files changed, 26 insertions(+), 14 deletions(-) - ---- a/drivers/leds/led-class.c -+++ b/drivers/leds/led-class.c -@@ -181,11 +181,14 @@ static int led_classdev_next_name(const - } - - /** -- * led_classdev_register - register a new object of led_classdev class. -- * @parent: The device to register. -+ * of_led_classdev_register - register a new object of led_classdev class. -+ * -+ * @parent: parent of LED device - * @led_cdev: the led_classdev structure for this device. -+ * @np: DT node describing this LED - */ --int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) -+int of_led_classdev_register(struct device *parent, struct device_node *np, -+ struct led_classdev *led_cdev) - { - char name[64]; - int ret; -@@ -198,6 +201,7 @@ int led_classdev_register(struct device - led_cdev, led_cdev->groups, "%s", name); - if (IS_ERR(led_cdev->dev)) - return PTR_ERR(led_cdev->dev); -+ led_cdev->dev->of_node = np; - - if (ret) - dev_warn(parent, "Led %s renamed to %s due to name collision", -@@ -228,7 +232,7 @@ int led_classdev_register(struct device - - return 0; - } --EXPORT_SYMBOL_GPL(led_classdev_register); -+EXPORT_SYMBOL_GPL(of_led_classdev_register); - - /** - * led_classdev_unregister - unregisters a object of led_properties class. -@@ -270,12 +274,14 @@ static void devm_led_classdev_release(st - } - - /** -- * devm_led_classdev_register - resource managed led_classdev_register() -- * @parent: The device to register. -+ * devm_of_led_classdev_register - resource managed led_classdev_register() -+ * -+ * @parent: parent of LED device - * @led_cdev: the led_classdev structure for this device. - */ --int devm_led_classdev_register(struct device *parent, -- struct led_classdev *led_cdev) -+int devm_of_led_classdev_register(struct device *parent, -+ struct device_node *np, -+ struct led_classdev *led_cdev) - { - struct led_classdev **dr; - int rc; -@@ -284,7 +290,7 @@ int devm_led_classdev_register(struct de - if (!dr) - return -ENOMEM; - -- rc = led_classdev_register(parent, led_cdev); -+ rc = of_led_classdev_register(parent, np, led_cdev); - if (rc) { - devres_free(dr); - return rc; -@@ -295,7 +301,7 @@ int devm_led_classdev_register(struct de - - return 0; - } --EXPORT_SYMBOL_GPL(devm_led_classdev_register); -+EXPORT_SYMBOL_GPL(devm_of_led_classdev_register); - - static int devm_led_classdev_match(struct device *dev, void *res, void *data) - { ---- a/include/linux/leds.h -+++ b/include/linux/leds.h -@@ -109,10 +109,16 @@ struct led_classdev { - struct mutex led_access; - }; - --extern int led_classdev_register(struct device *parent, -- struct led_classdev *led_cdev); --extern int devm_led_classdev_register(struct device *parent, -- struct led_classdev *led_cdev); -+extern int of_led_classdev_register(struct device *parent, -+ struct device_node *np, -+ struct led_classdev *led_cdev); -+#define led_classdev_register(parent, led_cdev) \ -+ of_led_classdev_register(parent, NULL, led_cdev) -+extern int devm_of_led_classdev_register(struct device *parent, -+ struct device_node *np, -+ struct led_classdev *led_cdev); -+#define devm_led_classdev_register(parent, led_cdev) \ -+ devm_of_led_classdev_register(parent, NULL, led_cdev) - extern void led_classdev_unregister(struct led_classdev *led_cdev); - extern void devm_led_classdev_unregister(struct device *parent, - struct led_classdev *led_cdev); diff --git a/target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch b/target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch deleted file mode 100644 index 0247fffb2a..0000000000 --- a/target/linux/generic/backport-4.9/080-0002-leds-gpio-use-OF-variant-of-LED-registering-function.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Mon, 6 Mar 2017 06:19:45 +0100 -Subject: [PATCH] leds: gpio: use OF variant of LED registering function -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In leds-gpio we support LEDs specified in DT so we should use -(devm_)of_led_classdev_register. This allows passing DT node as argument -for use by the LED subsystem. - -Signed-off-by: Rafał Miłecki -Acked-by: Pavel Machek -Signed-off-by: Jacek Anaszewski ---- - drivers/leds/leds-gpio.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/drivers/leds/leds-gpio.c -+++ b/drivers/leds/leds-gpio.c -@@ -77,7 +77,7 @@ static int gpio_blink_set(struct led_cla - - static int create_gpio_led(const struct gpio_led *template, - struct gpio_led_data *led_dat, struct device *parent, -- gpio_blink_set_t blink_set) -+ struct device_node *np, gpio_blink_set_t blink_set) - { - int ret, state; - -@@ -139,7 +139,7 @@ static int create_gpio_led(const struct - if (ret < 0) - return ret; - -- return devm_led_classdev_register(parent, &led_dat->cdev); -+ return devm_of_led_classdev_register(parent, np, &led_dat->cdev); - } - - struct gpio_leds_priv { -@@ -206,7 +206,7 @@ static struct gpio_leds_priv *gpio_leds_ - if (fwnode_property_present(child, "panic-indicator")) - led.panic_indicator = 1; - -- ret = create_gpio_led(&led, led_dat, dev, NULL); -+ ret = create_gpio_led(&led, led_dat, dev, np, NULL); - if (ret < 0) { - fwnode_handle_put(child); - return ERR_PTR(ret); -@@ -240,9 +240,9 @@ static int gpio_led_probe(struct platfor - - priv->num_leds = pdata->num_leds; - for (i = 0; i < priv->num_leds; i++) { -- ret = create_gpio_led(&pdata->leds[i], -- &priv->leds[i], -- &pdev->dev, pdata->gpio_blink_set); -+ ret = create_gpio_led(&pdata->leds[i], &priv->leds[i], -+ &pdev->dev, NULL, -+ pdata->gpio_blink_set); - if (ret < 0) - return ret; - } diff --git a/target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch b/target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch deleted file mode 100644 index d1ef21ed0a..0000000000 --- a/target/linux/generic/backport-4.9/081-0001-thermal-bcm2835-add-thermal-driver-for-bcm2835-SoC.patch +++ /dev/null @@ -1,365 +0,0 @@ -From bcb7dd9ef206f7d646ed8dac6fe7772083714253 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Fri, 31 Mar 2017 20:03:06 +0000 -Subject: [PATCH] thermal: bcm2835: add thermal driver for bcm2835 SoC -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add basic thermal driver for bcm2835 SoC. - -This driver currently make sure that tsense HW block is set up -correctly. - -Tested-by: Rafał Miłecki -Signed-off-by: Martin Sperl -Signed-off-by: Stefan Wahren -Acked-by: Eric Anholt -Acked-by: Eduardo Valentin -Signed-off-by: Eduardo Valentin ---- - drivers/thermal/Kconfig | 8 + - drivers/thermal/Makefile | 1 + - drivers/thermal/bcm2835_thermal.c | 314 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 323 insertions(+) - create mode 100644 drivers/thermal/bcm2835_thermal.c - ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -434,4 +434,12 @@ depends on (ARCH_QCOM && OF) || COMPILE_ - source "drivers/thermal/qcom/Kconfig" - endmenu - -+config BCM2835_THERMAL -+ tristate "Thermal sensors on bcm2835 SoC" -+ depends on ARCH_BCM2835 || COMPILE_TEST -+ depends on HAS_IOMEM -+ depends on THERMAL_OF -+ help -+ Support for thermal sensors on Broadcom bcm2835 SoCs. -+ - endif ---- a/drivers/thermal/Makefile -+++ b/drivers/thermal/Makefile -@@ -55,3 +55,4 @@ obj-$(CONFIG_TEGRA_SOCTHERM) += tegra/ - obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o - obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o - obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o -+obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o ---- /dev/null -+++ b/drivers/thermal/bcm2835_thermal.c -@@ -0,0 +1,314 @@ -+/* -+ * Driver for Broadcom BCM2835 SoC temperature sensor -+ * -+ * Copyright (C) 2016 Martin Sperl -+ * -+ * 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. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define BCM2835_TS_TSENSCTL 0x00 -+#define BCM2835_TS_TSENSSTAT 0x04 -+ -+#define BCM2835_TS_TSENSCTL_PRWDW BIT(0) -+#define BCM2835_TS_TSENSCTL_RSTB BIT(1) -+ -+/* -+ * bandgap reference voltage in 6 mV increments -+ * 000b = 1178 mV, 001b = 1184 mV, ... 111b = 1220 mV -+ */ -+#define BCM2835_TS_TSENSCTL_CTRL_BITS 3 -+#define BCM2835_TS_TSENSCTL_CTRL_SHIFT 2 -+#define BCM2835_TS_TSENSCTL_CTRL_MASK \ -+ GENMASK(BCM2835_TS_TSENSCTL_CTRL_BITS + \ -+ BCM2835_TS_TSENSCTL_CTRL_SHIFT - 1, \ -+ BCM2835_TS_TSENSCTL_CTRL_SHIFT) -+#define BCM2835_TS_TSENSCTL_CTRL_DEFAULT 1 -+#define BCM2835_TS_TSENSCTL_EN_INT BIT(5) -+#define BCM2835_TS_TSENSCTL_DIRECT BIT(6) -+#define BCM2835_TS_TSENSCTL_CLR_INT BIT(7) -+#define BCM2835_TS_TSENSCTL_THOLD_SHIFT 8 -+#define BCM2835_TS_TSENSCTL_THOLD_BITS 10 -+#define BCM2835_TS_TSENSCTL_THOLD_MASK \ -+ GENMASK(BCM2835_TS_TSENSCTL_THOLD_BITS + \ -+ BCM2835_TS_TSENSCTL_THOLD_SHIFT - 1, \ -+ BCM2835_TS_TSENSCTL_THOLD_SHIFT) -+/* -+ * time how long the block to be asserted in reset -+ * which based on a clock counter (TSENS clock assumed) -+ */ -+#define BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT 18 -+#define BCM2835_TS_TSENSCTL_RSTDELAY_BITS 8 -+#define BCM2835_TS_TSENSCTL_REGULEN BIT(26) -+ -+#define BCM2835_TS_TSENSSTAT_DATA_BITS 10 -+#define BCM2835_TS_TSENSSTAT_DATA_SHIFT 0 -+#define BCM2835_TS_TSENSSTAT_DATA_MASK \ -+ GENMASK(BCM2835_TS_TSENSSTAT_DATA_BITS + \ -+ BCM2835_TS_TSENSSTAT_DATA_SHIFT - 1, \ -+ BCM2835_TS_TSENSSTAT_DATA_SHIFT) -+#define BCM2835_TS_TSENSSTAT_VALID BIT(10) -+#define BCM2835_TS_TSENSSTAT_INTERRUPT BIT(11) -+ -+struct bcm2835_thermal_data { -+ struct thermal_zone_device *tz; -+ void __iomem *regs; -+ struct clk *clk; -+ struct dentry *debugfsdir; -+}; -+ -+static int bcm2835_thermal_adc2temp(u32 adc, int offset, int slope) -+{ -+ return offset + slope * adc; -+} -+ -+static int bcm2835_thermal_temp2adc(int temp, int offset, int slope) -+{ -+ temp -= offset; -+ temp /= slope; -+ -+ if (temp < 0) -+ temp = 0; -+ if (temp >= BIT(BCM2835_TS_TSENSSTAT_DATA_BITS)) -+ temp = BIT(BCM2835_TS_TSENSSTAT_DATA_BITS) - 1; -+ -+ return temp; -+} -+ -+static int bcm2835_thermal_get_temp(void *d, int *temp) -+{ -+ struct bcm2835_thermal_data *data = d; -+ u32 val = readl(data->regs + BCM2835_TS_TSENSSTAT); -+ -+ if (!(val & BCM2835_TS_TSENSSTAT_VALID)) -+ return -EIO; -+ -+ val &= BCM2835_TS_TSENSSTAT_DATA_MASK; -+ -+ *temp = bcm2835_thermal_adc2temp( -+ val, -+ thermal_zone_get_offset(data->tz), -+ thermal_zone_get_slope(data->tz)); -+ -+ return 0; -+} -+ -+static const struct debugfs_reg32 bcm2835_thermal_regs[] = { -+ { -+ .name = "ctl", -+ .offset = 0 -+ }, -+ { -+ .name = "stat", -+ .offset = 4 -+ } -+}; -+ -+static void bcm2835_thermal_debugfs(struct platform_device *pdev) -+{ -+ struct thermal_zone_device *tz = platform_get_drvdata(pdev); -+ struct bcm2835_thermal_data *data = tz->devdata; -+ struct debugfs_regset32 *regset; -+ -+ data->debugfsdir = debugfs_create_dir("bcm2835_thermal", NULL); -+ if (!data->debugfsdir) -+ return; -+ -+ regset = devm_kzalloc(&pdev->dev, sizeof(*regset), GFP_KERNEL); -+ if (!regset) -+ return; -+ -+ regset->regs = bcm2835_thermal_regs; -+ regset->nregs = ARRAY_SIZE(bcm2835_thermal_regs); -+ regset->base = data->regs; -+ -+ debugfs_create_regset32("regset", 0444, data->debugfsdir, regset); -+} -+ -+static struct thermal_zone_of_device_ops bcm2835_thermal_ops = { -+ .get_temp = bcm2835_thermal_get_temp, -+}; -+ -+/* -+ * Note: as per Raspberry Foundation FAQ -+ * (https://www.raspberrypi.org/help/faqs/#performanceOperatingTemperature) -+ * the recommended temperature range for the SoC -40C to +85C -+ * so the trip limit is set to 80C. -+ * this applies to all the BCM283X SoC -+ */ -+ -+static const struct of_device_id bcm2835_thermal_of_match_table[] = { -+ { -+ .compatible = "brcm,bcm2835-thermal", -+ }, -+ { -+ .compatible = "brcm,bcm2836-thermal", -+ }, -+ { -+ .compatible = "brcm,bcm2837-thermal", -+ }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, bcm2835_thermal_of_match_table); -+ -+static int bcm2835_thermal_probe(struct platform_device *pdev) -+{ -+ const struct of_device_id *match; -+ struct thermal_zone_device *tz; -+ struct bcm2835_thermal_data *data; -+ struct resource *res; -+ int err = 0; -+ u32 val; -+ unsigned long rate; -+ -+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); -+ if (!data) -+ return -ENOMEM; -+ -+ match = of_match_device(bcm2835_thermal_of_match_table, -+ &pdev->dev); -+ if (!match) -+ return -EINVAL; -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ data->regs = devm_ioremap_resource(&pdev->dev, res); -+ if (IS_ERR(data->regs)) { -+ err = PTR_ERR(data->regs); -+ dev_err(&pdev->dev, "Could not get registers: %d\n", err); -+ return err; -+ } -+ -+ data->clk = devm_clk_get(&pdev->dev, NULL); -+ if (IS_ERR(data->clk)) { -+ err = PTR_ERR(data->clk); -+ if (err != -EPROBE_DEFER) -+ dev_err(&pdev->dev, "Could not get clk: %d\n", err); -+ return err; -+ } -+ -+ err = clk_prepare_enable(data->clk); -+ if (err) -+ return err; -+ -+ rate = clk_get_rate(data->clk); -+ if ((rate < 1920000) || (rate > 5000000)) -+ dev_warn(&pdev->dev, -+ "Clock %pCn running at %pCr Hz is outside of the recommended range: 1.92 to 5MHz\n", -+ data->clk, data->clk); -+ -+ /* register of thermal sensor and get info from DT */ -+ tz = thermal_zone_of_sensor_register(&pdev->dev, 0, data, -+ &bcm2835_thermal_ops); -+ if (IS_ERR(tz)) { -+ err = PTR_ERR(tz); -+ dev_err(&pdev->dev, -+ "Failed to register the thermal device: %d\n", -+ err); -+ goto err_clk; -+ } -+ -+ /* -+ * right now the FW does set up the HW-block, so we are not -+ * touching the configuration registers. -+ * But if the HW is not enabled, then set it up -+ * using "sane" values used by the firmware right now. -+ */ -+ val = readl(data->regs + BCM2835_TS_TSENSCTL); -+ if (!(val & BCM2835_TS_TSENSCTL_RSTB)) { -+ int trip_temp, offset, slope; -+ -+ slope = thermal_zone_get_slope(tz); -+ offset = thermal_zone_get_offset(tz); -+ /* -+ * For now we deal only with critical, otherwise -+ * would need to iterate -+ */ -+ err = tz->ops->get_trip_temp(tz, 0, &trip_temp); -+ if (err < 0) { -+ err = PTR_ERR(tz); -+ dev_err(&pdev->dev, -+ "Not able to read trip_temp: %d\n", -+ err); -+ goto err_tz; -+ } -+ -+ /* set bandgap reference voltage and enable voltage regulator */ -+ val = (BCM2835_TS_TSENSCTL_CTRL_DEFAULT << -+ BCM2835_TS_TSENSCTL_CTRL_SHIFT) | -+ BCM2835_TS_TSENSCTL_REGULEN; -+ -+ /* use the recommended reset duration */ -+ val |= (0xFE << BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT); -+ -+ /* trip_adc value from info */ -+ val |= bcm2835_thermal_temp2adc(trip_temp, -+ offset, -+ slope) -+ << BCM2835_TS_TSENSCTL_THOLD_SHIFT; -+ -+ /* write the value back to the register as 2 steps */ -+ writel(val, data->regs + BCM2835_TS_TSENSCTL); -+ val |= BCM2835_TS_TSENSCTL_RSTB; -+ writel(val, data->regs + BCM2835_TS_TSENSCTL); -+ } -+ -+ data->tz = tz; -+ -+ platform_set_drvdata(pdev, tz); -+ -+ bcm2835_thermal_debugfs(pdev); -+ -+ return 0; -+err_tz: -+ thermal_zone_of_sensor_unregister(&pdev->dev, tz); -+err_clk: -+ clk_disable_unprepare(data->clk); -+ -+ return err; -+} -+ -+static int bcm2835_thermal_remove(struct platform_device *pdev) -+{ -+ struct thermal_zone_device *tz = platform_get_drvdata(pdev); -+ struct bcm2835_thermal_data *data = tz->devdata; -+ -+ debugfs_remove_recursive(data->debugfsdir); -+ thermal_zone_of_sensor_unregister(&pdev->dev, tz); -+ clk_disable_unprepare(data->clk); -+ -+ return 0; -+} -+ -+static struct platform_driver bcm2835_thermal_driver = { -+ .probe = bcm2835_thermal_probe, -+ .remove = bcm2835_thermal_remove, -+ .driver = { -+ .name = "bcm2835_thermal", -+ .of_match_table = bcm2835_thermal_of_match_table, -+ }, -+}; -+module_platform_driver(bcm2835_thermal_driver); -+ -+MODULE_AUTHOR("Martin Sperl"); -+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); -+MODULE_LICENSE("GPL"); diff --git a/target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch b/target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch deleted file mode 100644 index 8ba8cb57eb..0000000000 --- a/target/linux/generic/backport-4.9/081-0002-thermal-broadcom-add-Northstar-thermal-driver.patch +++ /dev/null @@ -1,173 +0,0 @@ -From a94cb7eeecc4104a6874339f90c5d0647359c102 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Mon, 3 Apr 2017 17:48:29 +0200 -Subject: [PATCH] thermal: broadcom: add Northstar thermal driver -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Northstar is a SoC family commonly used in home routers. This commit -adds a driver for checking CPU temperature. As Northstar Plus seems to -also have this IP block this new symbol gets ARCH_BCM_IPROC dependency. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Jon Mason -Signed-off-by: Eduardo Valentin ---- - drivers/thermal/Kconfig | 5 ++ - drivers/thermal/Makefile | 1 + - drivers/thermal/broadcom/Kconfig | 8 +++ - drivers/thermal/broadcom/Makefile | 1 + - drivers/thermal/broadcom/ns-thermal.c | 105 ++++++++++++++++++++++++++++++++++ - 5 files changed, 120 insertions(+) - create mode 100644 drivers/thermal/broadcom/Kconfig - create mode 100644 drivers/thermal/broadcom/Makefile - create mode 100644 drivers/thermal/broadcom/ns-thermal.c - ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -381,6 +381,11 @@ config MTK_THERMAL - Enable this option if you want to have support for thermal management - controller present in Mediatek SoCs - -+menu "Broadcom thermal drivers" -+depends on ARCH_BCM || COMPILE_TEST -+source "drivers/thermal/broadcom/Kconfig" -+endmenu -+ - menu "Texas Instruments thermal drivers" - depends on ARCH_HAS_BANDGAP || COMPILE_TEST - depends on HAS_IOMEM ---- a/drivers/thermal/Makefile -+++ b/drivers/thermal/Makefile -@@ -26,6 +26,7 @@ thermal_sys-$(CONFIG_CLOCK_THERMAL) += c - thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o - - # platform thermal drivers -+obj-y += broadcom/ - obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o - obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o - obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o ---- /dev/null -+++ b/drivers/thermal/broadcom/Kconfig -@@ -0,0 +1,8 @@ -+config BCM_NS_THERMAL -+ tristate "Northstar thermal driver" -+ depends on ARCH_BCM_IPROC || COMPILE_TEST -+ help -+ Northstar is a family of SoCs that includes e.g. BCM4708, BCM47081, -+ BCM4709 and BCM47094. It contains DMU (Device Management Unit) block -+ with a thermal sensor that allows checking CPU temperature. This -+ driver provides support for it. ---- /dev/null -+++ b/drivers/thermal/broadcom/Makefile -@@ -0,0 +1 @@ -+obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o ---- /dev/null -+++ b/drivers/thermal/broadcom/ns-thermal.c -@@ -0,0 +1,105 @@ -+/* -+ * Copyright (C) 2017 Rafał Miłecki -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#define PVTMON_CONTROL0 0x00 -+#define PVTMON_CONTROL0_SEL_MASK 0x0000000e -+#define PVTMON_CONTROL0_SEL_TEMP_MONITOR 0x00000000 -+#define PVTMON_CONTROL0_SEL_TEST_MODE 0x0000000e -+#define PVTMON_STATUS 0x08 -+ -+struct ns_thermal { -+ struct thermal_zone_device *tz; -+ void __iomem *pvtmon; -+}; -+ -+static int ns_thermal_get_temp(void *data, int *temp) -+{ -+ struct ns_thermal *ns_thermal = data; -+ int offset = thermal_zone_get_offset(ns_thermal->tz); -+ int slope = thermal_zone_get_slope(ns_thermal->tz); -+ u32 val; -+ -+ val = readl(ns_thermal->pvtmon + PVTMON_CONTROL0); -+ if ((val & PVTMON_CONTROL0_SEL_MASK) != PVTMON_CONTROL0_SEL_TEMP_MONITOR) { -+ /* Clear current mode selection */ -+ val &= ~PVTMON_CONTROL0_SEL_MASK; -+ -+ /* Set temp monitor mode (it's the default actually) */ -+ val |= PVTMON_CONTROL0_SEL_TEMP_MONITOR; -+ -+ writel(val, ns_thermal->pvtmon + PVTMON_CONTROL0); -+ } -+ -+ val = readl(ns_thermal->pvtmon + PVTMON_STATUS); -+ *temp = slope * val + offset; -+ -+ return 0; -+} -+ -+static const struct thermal_zone_of_device_ops ns_thermal_ops = { -+ .get_temp = ns_thermal_get_temp, -+}; -+ -+static int ns_thermal_probe(struct platform_device *pdev) -+{ -+ struct device *dev = &pdev->dev; -+ struct ns_thermal *ns_thermal; -+ -+ ns_thermal = devm_kzalloc(dev, sizeof(*ns_thermal), GFP_KERNEL); -+ if (!ns_thermal) -+ return -ENOMEM; -+ -+ ns_thermal->pvtmon = of_iomap(dev_of_node(dev), 0); -+ if (WARN_ON(!ns_thermal->pvtmon)) -+ return -ENOENT; -+ -+ ns_thermal->tz = devm_thermal_zone_of_sensor_register(dev, 0, -+ ns_thermal, -+ &ns_thermal_ops); -+ if (IS_ERR(ns_thermal->tz)) { -+ iounmap(ns_thermal->pvtmon); -+ return PTR_ERR(ns_thermal->tz); -+ } -+ -+ platform_set_drvdata(pdev, ns_thermal); -+ -+ return 0; -+} -+ -+static int ns_thermal_remove(struct platform_device *pdev) -+{ -+ struct ns_thermal *ns_thermal = platform_get_drvdata(pdev); -+ -+ iounmap(ns_thermal->pvtmon); -+ -+ return 0; -+} -+ -+static const struct of_device_id ns_thermal_of_match[] = { -+ { .compatible = "brcm,ns-thermal", }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, ns_thermal_of_match); -+ -+static struct platform_driver ns_thermal_driver = { -+ .probe = ns_thermal_probe, -+ .remove = ns_thermal_remove, -+ .driver = { -+ .name = "ns-thermal", -+ .of_match_table = ns_thermal_of_match, -+ }, -+}; -+module_platform_driver(ns_thermal_driver); -+ -+MODULE_DESCRIPTION("Northstar thermal driver"); -+MODULE_LICENSE("GPL v2"); diff --git a/target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch b/target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch deleted file mode 100644 index 65d17c8a9e..0000000000 --- a/target/linux/generic/backport-4.9/082-0001-usb-core-read-USB-ports-from-DT-in-the-usbport-LED-t.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 4f04c210d031667e503d6538a72345a36f3b5d71 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 8 Jun 2017 18:08:32 +0200 -Subject: [PATCH] usb: core: read USB ports from DT in the usbport LED trigger - driver -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This uses DT info to read relation description of LEDs and USB ports. If -DT has properly described LEDs, trigger will know when to turn them on. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/core/ledtrig-usbport.c | 56 ++++++++++++++++++++++++++++++++++++++ - 1 file changed, 56 insertions(+) - ---- a/drivers/usb/core/ledtrig-usbport.c -+++ b/drivers/usb/core/ledtrig-usbport.c -@@ -11,8 +11,10 @@ - #include - #include - #include -+#include - #include - #include -+#include - - struct usbport_trig_data { - struct led_classdev *led_cdev; -@@ -123,6 +125,57 @@ static const struct attribute_group port - * Adding & removing ports - ***************************************/ - -+/** -+ * usbport_trig_port_observed - Check if port should be observed -+ */ -+static bool usbport_trig_port_observed(struct usbport_trig_data *usbport_data, -+ struct usb_device *usb_dev, int port1) -+{ -+ struct device *dev = usbport_data->led_cdev->dev; -+ struct device_node *led_np = dev->of_node; -+ struct of_phandle_args args; -+ struct device_node *port_np; -+ int count, i; -+ -+ if (!led_np) -+ return false; -+ -+ /* Get node of port being added */ -+ port_np = usb_of_get_child_node(usb_dev->dev.of_node, port1); -+ if (!port_np) -+ return false; -+ -+ /* Amount of trigger sources for this LED */ -+ count = of_count_phandle_with_args(led_np, "trigger-sources", -+ "#trigger-source-cells"); -+ if (count < 0) { -+ dev_warn(dev, "Failed to get trigger sources for %s\n", -+ led_np->full_name); -+ return false; -+ } -+ -+ /* Check list of sources for this specific port */ -+ for (i = 0; i < count; i++) { -+ int err; -+ -+ err = of_parse_phandle_with_args(led_np, "trigger-sources", -+ "#trigger-source-cells", i, -+ &args); -+ if (err) { -+ dev_err(dev, "Failed to get trigger source phandle at index %d: %d\n", -+ i, err); -+ continue; -+ } -+ -+ of_node_put(args.np); -+ -+ if (args.np == port_np) -+ return true; -+ } -+ -+ return false; -+} -+ - static int usbport_trig_add_port(struct usbport_trig_data *usbport_data, - struct usb_device *usb_dev, - const char *hub_name, int portnum) -@@ -141,6 +194,8 @@ static int usbport_trig_add_port(struct - port->data = usbport_data; - port->hub = usb_dev; - port->portnum = portnum; -+ port->observed = usbport_trig_port_observed(usbport_data, usb_dev, -+ portnum); - - len = strlen(hub_name) + 8; - port->port_name = kzalloc(len, GFP_KERNEL); -@@ -255,6 +310,7 @@ static void usbport_trig_activate(struct - if (err) - goto err_free; - usb_for_each_dev(usbport_data, usbport_trig_add_usb_dev_ports); -+ usbport_trig_update_count(usbport_data); - - /* Notifications */ - usbport_data->nb.notifier_call = usbport_trig_notify, diff --git a/target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch b/target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch deleted file mode 100644 index ead6675e0b..0000000000 --- a/target/linux/generic/backport-4.9/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f11a04464ae57e8db1bb7634547842b43e36a898 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= -Date: Fri, 22 Dec 2017 22:47:16 +0100 -Subject: i2c: gpio: Enable working over slow can_sleep GPIOs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -"Slow" GPIOs (usually those connected over an SPI or an I2C bus) are, -well, slow in their operation. It is generally a good idea to avoid -using them for time-critical operation, but sometimes the hardware just -sucks, and the software has to cope. In addition to that, the I2C bus -itself does not actually define any strict timing limits; the bus is -free to go all the way down to DC. The timeouts (and therefore the -slowest acceptable frequency) are present only in SMBus. - -The `can_sleep` is IMHO a wrong concept to use here. My SPI-to-quad-UART -chip (MAX14830) is connected via a 26MHz SPI bus, and it happily drives -SCL at 200kHz (5µs pulses) during my benchmarks. That's faster than the -maximal allowed speed of the traditional I2C. - -The previous version of this code did not really block operation over -slow GPIO pins, anyway. Instead, it just resorted to printing a warning -with a backtrace each time a GPIO pin was accessed, thereby slowing -things down even more. - -Finally, it's not just me. A similar patch was originally submitted in -2015 [1]. - -[1] https://patchwork.ozlabs.org/patch/450956/ - -Signed-off-by: Jan Kundrát -Acked-by: Uwe Kleine-König -Signed-off-by: Wolfram Sang ---- - drivers/i2c/busses/i2c-gpio.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - ---- a/drivers/i2c/busses/i2c-gpio.c -+++ b/drivers/i2c/busses/i2c-gpio.c -@@ -44,7 +44,7 @@ static void i2c_gpio_setsda_val(void *da - { - struct i2c_gpio_platform_data *pdata = data; - -- gpio_set_value(pdata->sda_pin, state); -+ gpio_set_value_cansleep(pdata->sda_pin, state); - } - - /* Toggle SCL by changing the direction of the pin. */ -@@ -68,21 +68,21 @@ static void i2c_gpio_setscl_val(void *da - { - struct i2c_gpio_platform_data *pdata = data; - -- gpio_set_value(pdata->scl_pin, state); -+ gpio_set_value_cansleep(pdata->scl_pin, state); - } - - static int i2c_gpio_getsda(void *data) - { - struct i2c_gpio_platform_data *pdata = data; - -- return gpio_get_value(pdata->sda_pin); -+ return gpio_get_value_cansleep(pdata->sda_pin); - } - - static int i2c_gpio_getscl(void *data) - { - struct i2c_gpio_platform_data *pdata = data; - -- return gpio_get_value(pdata->scl_pin); -+ return gpio_get_value_cansleep(pdata->scl_pin); - } - - static int of_i2c_gpio_get_pins(struct device_node *np, -@@ -175,6 +175,9 @@ static int i2c_gpio_probe(struct platfor - memcpy(pdata, dev_get_platdata(&pdev->dev), sizeof(*pdata)); - } - -+ if (gpiod_cansleep(gpio_to_desc(pdata->sda_pin)) || gpiod_cansleep(gpio_to_desc(pdata->scl_pin))) -+ dev_warn(&pdev->dev, "Slow GPIO pins might wreak havoc into I2C/SMBus bus timing"); -+ - if (pdata->sda_is_open_drain) { - gpio_direction_output(pdata->sda_pin, 1); - bit_data->setsda = i2c_gpio_setsda_val; diff --git a/target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch b/target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch deleted file mode 100644 index c26994ee35..0000000000 --- a/target/linux/generic/backport-4.9/087-regmap-make-LZO-cache-optional.patch +++ /dev/null @@ -1,69 +0,0 @@ -From de88e9b0354c2e3ff8eae3f97afe43a34f5ed239 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sat, 13 May 2017 13:03:21 +0200 -Subject: [PATCH] regmap: make LZO cache optional - -Commit 2cbbb579bcbe3 ("regmap: Add the LZO cache support") added support -for LZO compression in regcache, but there were never any users added -afterwards. Since LZO support itself has its own size, it currently is -rather a deoptimization. - -So make it optional by introducing a symbol that can be selected by -drivers wanting to make use of it. - -Saves e.g. ~46 kB on MIPS (size of LZO support + regcache LZO code). - -Signed-off-by: Jonas Gorski ---- -I tried using google to find any users (even out-of-tree ones), but at -best I found a single driver submission that was switched to RBTREE in -subsequent resubmissions (MFD_SMSC). - -One could maybe also just drop the code because of no users for 5 years, -but that would be up to the maintainer(s) to decide. - - drivers/base/regmap/Kconfig | 5 ++++- - drivers/base/regmap/Makefile | 3 ++- - drivers/base/regmap/regcache.c | 2 ++ - 3 files changed, 8 insertions(+), 2 deletions(-) - ---- a/drivers/base/regmap/Kconfig -+++ b/drivers/base/regmap/Kconfig -@@ -4,9 +4,12 @@ - - config REGMAP - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ) -+ select IRQ_DOMAIN if REGMAP_IRQ -+ bool -+ -+config REGCACHE_COMPRESSED - select LZO_COMPRESS - select LZO_DECOMPRESS -- select IRQ_DOMAIN if REGMAP_IRQ - bool - - config REGMAP_AC97 ---- a/drivers/base/regmap/Makefile -+++ b/drivers/base/regmap/Makefile -@@ -2,7 +2,8 @@ - CFLAGS_regmap.o := -I$(src) - - obj-$(CONFIG_REGMAP) += regmap.o regcache.o --obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o -+obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o -+obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o - obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o - obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o - obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o ---- a/drivers/base/regmap/regcache.c -+++ b/drivers/base/regmap/regcache.c -@@ -21,7 +21,9 @@ - - static const struct regcache_ops *cache_types[] = { - ®cache_rbtree_ops, -+#if IS_ENABLED(CONFIG_REGCACHE_COMPRESSED) - ®cache_lzo_ops, -+#endif - ®cache_flat_ops, - }; - diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch deleted file mode 100644 index 433788e075..0000000000 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ /dev/null @@ -1,1412 +0,0 @@ -From 6ad20165d376fa07919a70e4f43dfae564601829 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Mon, 30 Jan 2017 08:22:01 -0800 -Subject: drivers: net: generalize napi_complete_done() - -napi_complete_done() allows to opt-in for gro_flush_timeout, -added back in linux-3.19, commit 3b47d30396ba -("net: gro: add a per device gro flush timer") - -This allows for more efficient GRO aggregation without -sacrifying latencies. - -Signed-off-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - drivers/net/can/at91_can.c | 2 +- - drivers/net/can/c_can/c_can.c | 2 +- - drivers/net/can/flexcan.c | 2 +- - drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- - drivers/net/can/janz-ican3.c | 2 +- - drivers/net/can/m_can/m_can.c | 2 +- - drivers/net/can/rcar/rcar_can.c | 2 +- - drivers/net/can/rcar/rcar_canfd.c | 2 +- - drivers/net/can/xilinx_can.c | 2 +- - drivers/net/ethernet/3com/typhoon.c | 2 +- - drivers/net/ethernet/adi/bfin_mac.c | 2 +- - drivers/net/ethernet/agere/et131x.c | 2 +- - drivers/net/ethernet/altera/altera_tse_main.c | 2 +- - drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- - drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 2 +- - drivers/net/ethernet/arc/emac_main.c | 2 +- - drivers/net/ethernet/atheros/alx/main.c | 2 +- - drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- - drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- - drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- - drivers/net/ethernet/broadcom/b44.c | 2 +- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- - drivers/net/ethernet/broadcom/bgmac.c | 2 +- - drivers/net/ethernet/broadcom/bnx2.c | 4 ++-- - drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- - drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- - drivers/net/ethernet/brocade/bna/bnad.c | 2 +- - drivers/net/ethernet/cadence/macb.c | 2 +- - drivers/net/ethernet/calxeda/xgmac.c | 2 +- - drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- - drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- - drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- - drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- - drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- - drivers/net/ethernet/chelsio/cxgb3/sge.c | 4 ++-- - drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- - drivers/net/ethernet/cisco/enic/enic_main.c | 4 ++-- - drivers/net/ethernet/dec/tulip/interrupt.c | 6 +++--- - drivers/net/ethernet/dnet.c | 2 +- - drivers/net/ethernet/emulex/benet/be_main.c | 2 +- - drivers/net/ethernet/ethoc.c | 2 +- - drivers/net/ethernet/ezchip/nps_enet.c | 2 +- - drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- - drivers/net/ethernet/freescale/fec_main.c | 2 +- - .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- - drivers/net/ethernet/freescale/gianfar.c | 4 ++-- - drivers/net/ethernet/freescale/ucc_geth.c | 2 +- - drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- - drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- - drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- - drivers/net/ethernet/ibm/ibmveth.c | 2 +- - drivers/net/ethernet/ibm/ibmvnic.c | 2 +- - drivers/net/ethernet/intel/e100.c | 2 +- - drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- - drivers/net/ethernet/korina.c | 2 +- - drivers/net/ethernet/lantiq_etop.c | 21 +++++++++------------ - drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- - drivers/net/ethernet/marvell/mvneta.c | 6 ++---- - drivers/net/ethernet/marvell/mvpp2.c | 2 +- - drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- - drivers/net/ethernet/moxa/moxart_ether.c | 2 +- - drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- - drivers/net/ethernet/natsemi/natsemi.c | 2 +- - drivers/net/ethernet/neterion/s2io.c | 4 ++-- - drivers/net/ethernet/neterion/vxge/vxge-main.c | 6 +++--- - drivers/net/ethernet/nvidia/forcedeth.c | 2 +- - drivers/net/ethernet/nxp/lpc_eth.c | 2 +- - .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- - drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- - .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +- - drivers/net/ethernet/qlogic/qede/qede_fp.c | 2 +- - drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 10 +++++----- - drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- - drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- - drivers/net/ethernet/realtek/r8169.c | 2 +- - drivers/net/ethernet/rocker/rocker_main.c | 2 +- - drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- - drivers/net/ethernet/sfc/efx.c | 2 +- - drivers/net/ethernet/sfc/falcon/efx.c | 2 +- - drivers/net/ethernet/smsc/smsc9420.c | 2 +- - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- - drivers/net/ethernet/sun/niu.c | 2 +- - drivers/net/ethernet/sun/sungem.c | 2 +- - drivers/net/ethernet/sun/sunvnet_common.c | 2 +- - drivers/net/ethernet/tehuti/tehuti.c | 2 +- - drivers/net/ethernet/ti/cpsw.c | 2 +- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - drivers/net/ethernet/ti/netcp_core.c | 2 +- - drivers/net/ethernet/tile/tilegx.c | 2 +- - drivers/net/ethernet/tile/tilepro.c | 2 +- - drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- - drivers/net/ethernet/toshiba/spider_net.c | 2 +- - drivers/net/ethernet/toshiba/tc35815.c | 2 +- - drivers/net/ethernet/tundra/tsi108_eth.c | 2 +- - drivers/net/ethernet/via/via-rhine.c | 2 +- - drivers/net/ethernet/via/via-velocity.c | 2 +- - drivers/net/ethernet/wiznet/w5100.c | 2 +- - drivers/net/ethernet/wiznet/w5300.c | 2 +- - drivers/net/fjes/fjes_main.c | 2 +- - drivers/net/vmxnet3/vmxnet3_drv.c | 4 ++-- - drivers/net/wan/fsl_ucc_hdlc.c | 2 +- - drivers/net/wan/hd64572.c | 2 +- - drivers/net/wireless/ath/ath10k/pci.c | 2 +- - drivers/net/wireless/ath/wil6210/netdev.c | 2 +- - drivers/net/xen-netback/interface.c | 2 +- - drivers/net/xen-netfront.c | 2 +- - drivers/staging/octeon/ethernet-rx.c | 2 +- - drivers/staging/unisys/visornic/visornic_main.c | 2 +- - 109 files changed, 132 insertions(+), 137 deletions(-) - ---- a/drivers/net/can/at91_can.c -+++ b/drivers/net/can/at91_can.c -@@ -813,7 +813,7 @@ static int at91_poll(struct napi_struct - u32 reg_ier = AT91_IRQ_ERR_FRAME; - reg_ier |= get_irq_mb_rx(priv) & ~AT91_MB_MASK(priv->rx_next); - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - at91_write(priv, AT91_IER, reg_ier); - } - ---- a/drivers/net/can/c_can/c_can.c -+++ b/drivers/net/can/c_can/c_can.c -@@ -1105,7 +1105,7 @@ static int c_can_poll(struct napi_struct - - end: - if (work_done < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - /* enable all IRQs if we are not in bus off state */ - if (priv->can.state != CAN_STATE_BUS_OFF) - c_can_irq_control(priv, true); ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -703,7 +703,7 @@ static int flexcan_poll(struct napi_stru - work_done += flexcan_poll_bus_err(dev, reg_esr); - - if (work_done < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - /* enable IRQs */ - flexcan_write(FLEXCAN_IFLAG_DEFAULT, ®s->imask1); - flexcan_write(priv->reg_ctrl_default, ®s->ctrl); ---- a/drivers/net/can/ifi_canfd/ifi_canfd.c -+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c -@@ -589,7 +589,7 @@ static int ifi_canfd_poll(struct napi_st - work_done += ifi_canfd_do_rx_poll(ndev, quota - work_done); - - if (work_done < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - ifi_canfd_irq_enable(ndev, 1); - } - ---- a/drivers/net/can/janz-ican3.c -+++ b/drivers/net/can/janz-ican3.c -@@ -1475,7 +1475,7 @@ static int ican3_napi(struct napi_struct - /* We have processed all packets that the adapter had, but it - * was less than our budget, stop polling */ - if (received < budget) -- napi_complete(napi); -+ napi_complete_done(napi, received); - - spin_lock_irqsave(&mod->lock, flags); - ---- a/drivers/net/can/m_can/m_can.c -+++ b/drivers/net/can/m_can/m_can.c -@@ -730,7 +730,7 @@ static int m_can_poll(struct napi_struct - work_done += m_can_do_rx_poll(dev, (quota - work_done)); - - if (work_done < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - m_can_enable_all_interrupts(priv); - } - ---- a/drivers/net/can/rcar/rcar_can.c -+++ b/drivers/net/can/rcar/rcar_can.c -@@ -698,7 +698,7 @@ static int rcar_can_rx_poll(struct napi_ - } - /* All packets processed */ - if (num_pkts < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, num_pkts); - priv->ier |= RCAR_CAN_IER_RXFIE; - writeb(priv->ier, &priv->regs->ier); - } ---- a/drivers/net/can/rcar/rcar_canfd.c -+++ b/drivers/net/can/rcar/rcar_canfd.c -@@ -1512,7 +1512,7 @@ static int rcar_canfd_rx_poll(struct nap - - /* All packets processed */ - if (num_pkts < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, num_pkts); - /* Enable Rx FIFO interrupts */ - rcar_canfd_set_bit(priv->base, RCANFD_RFCC(ridx), - RCANFD_RFCC_RFIE); ---- a/drivers/net/can/xilinx_can.c -+++ b/drivers/net/can/xilinx_can.c -@@ -838,7 +838,7 @@ static int xcan_rx_poll(struct napi_stru - } - - if (work_done < quota) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - ier = priv->read_reg(priv, XCAN_IER_OFFSET); - ier |= XCAN_IXR_RXNEMP_MASK; - priv->write_reg(priv, XCAN_IER_OFFSET, ier); ---- a/drivers/net/ethernet/3com/typhoon.c -+++ b/drivers/net/ethernet/3com/typhoon.c -@@ -1748,7 +1748,7 @@ typhoon_poll(struct napi_struct *napi, i - } - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - iowrite32(TYPHOON_INTR_NONE, - tp->ioaddr + TYPHOON_REG_INTR_MASK); - typhoon_post_pci_writes(tp->ioaddr); ---- a/drivers/net/ethernet/adi/bfin_mac.c -+++ b/drivers/net/ethernet/adi/bfin_mac.c -@@ -1274,7 +1274,7 @@ static int bfin_mac_poll(struct napi_str - } - - if (i < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, i); - if (test_and_clear_bit(BFIN_MAC_RX_IRQ_DISABLED, &lp->flags)) - enable_irq(IRQ_MAC_RX); - } ---- a/drivers/net/ethernet/agere/et131x.c -+++ b/drivers/net/ethernet/agere/et131x.c -@@ -3573,7 +3573,7 @@ static int et131x_poll(struct napi_struc - et131x_handle_send_pkts(adapter); - - if (work_done < budget) { -- napi_complete(&adapter->napi); -+ napi_complete_done(&adapter->napi, work_done); - et131x_enable_interrupts(adapter); - } - ---- a/drivers/net/ethernet/altera/altera_tse_main.c -+++ b/drivers/net/ethernet/altera/altera_tse_main.c -@@ -491,7 +491,7 @@ static int tse_poll(struct napi_struct * - - if (rxcomplete < budget) { - -- napi_complete(napi); -+ napi_complete_done(napi, rxcomplete); - - netdev_dbg(priv->dev, - "NAPI Complete, did %d packets with budget %d\n", ---- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c -+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c -@@ -655,7 +655,7 @@ static int xgene_enet_napi(struct napi_s - processed = xgene_enet_process_ring(ring, budget); - - if (processed != budget) { -- napi_complete(napi); -+ napi_complete_done(napi, processed); - enable_irq(ring->irq); - } - ---- a/drivers/net/ethernet/arc/emac_main.c -+++ b/drivers/net/ethernet/arc/emac_main.c -@@ -284,7 +284,7 @@ static int arc_emac_poll(struct napi_str - - work_done = arc_emac_rx(ndev, budget); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - arc_reg_or(priv, R_ENABLE, RXINT_MASK | TXINT_MASK); - } - ---- a/drivers/net/ethernet/atheros/alx/main.c -+++ b/drivers/net/ethernet/atheros/alx/main.c -@@ -292,7 +292,7 @@ static int alx_poll(struct napi_struct * - if (!tx_complete || work == budget) - return budget; - -- napi_complete(&alx->napi); -+ napi_complete_done(&alx->napi, work); - - /* enable interrupt */ - if (alx->flags & ALX_FLAG_USING_MSIX) { ---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -1886,7 +1886,7 @@ static int atl1c_clean(struct napi_struc - - if (work_done < budget) { - quit_polling: -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - adapter->hw.intr_mask |= ISR_RX_PKT; - AT_WRITE_REG(&adapter->hw, REG_IMR, adapter->hw.intr_mask); - } ---- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -1534,7 +1534,7 @@ static int atl1e_clean(struct napi_struc - /* If no Tx and not enough Rx work done, exit the polling mode */ - if (work_done < budget) { - quit_polling: -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - imr_data = AT_READ_REG(&adapter->hw, REG_IMR); - AT_WRITE_REG(&adapter->hw, REG_IMR, imr_data | ISR_RX_EVENT); - /* test debug */ ---- a/drivers/net/ethernet/atheros/atlx/atl1.c -+++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -2457,7 +2457,7 @@ static int atl1_rings_clean(struct napi_ - if (work_done >= budget) - return work_done; - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - /* re-enable Interrupt */ - if (likely(adapter->int_enabled)) - atlx_imr_set(adapter, IMR_NORMAL_MASK); ---- a/drivers/net/ethernet/broadcom/b44.c -+++ b/drivers/net/ethernet/broadcom/b44.c -@@ -902,7 +902,7 @@ static int b44_poll(struct napi_struct * - } - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - b44_enable_ints(bp); - } - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -511,7 +511,7 @@ static int bcm_enet_poll(struct napi_str - - /* no more packet in rx/tx queue, remove device from poll - * queue */ -- napi_complete(napi); -+ napi_complete_done(napi, rx_work_done); - - /* restore rx/tx interrupt */ - enet_dmac_writel(priv, priv->dma_chan_int_mask, ---- a/drivers/net/ethernet/broadcom/bgmac.c -+++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1146,7 +1146,7 @@ static int bgmac_poll(struct napi_struct - return weight; - - if (handled < weight) { -- napi_complete(napi); -+ napi_complete_done(napi, handled); - bgmac_chip_intrs_on(bgmac); - } - ---- a/drivers/net/ethernet/broadcom/bnx2.c -+++ b/drivers/net/ethernet/broadcom/bnx2.c -@@ -3522,7 +3522,7 @@ static int bnx2_poll_msix(struct napi_st - rmb(); - if (likely(!bnx2_has_fast_work(bnapi))) { - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - BNX2_WR(bp, BNX2_PCICFG_INT_ACK_CMD, bnapi->int_num | - BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | - bnapi->last_status_idx); -@@ -3559,7 +3559,7 @@ static int bnx2_poll(struct napi_struct - - rmb(); - if (likely(!bnx2_has_work(bnapi))) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) { - BNX2_WR(bp, BNX2_PCICFG_INT_ACK_CMD, - BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c -@@ -3240,7 +3240,7 @@ static int bnx2x_poll(struct napi_struct - * has been updated when NAPI was scheduled. - */ - if (IS_FCOE_FP(fp)) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_work_done); - } else { - bnx2x_update_fpsb_idx(fp); - /* bnx2x_has_rx_work() reads the status block, ---- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c -+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c -@@ -1799,7 +1799,7 @@ static int bnxt_poll_nitroa0(struct napi - } - - if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_pkts); - BNXT_CP_DB_REARM(cpr->cp_doorbell, cpr->cp_raw_cons); - } - return rx_pkts; ---- a/drivers/net/ethernet/broadcom/sb1250-mac.c -+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c -@@ -2545,7 +2545,7 @@ static int sbmac_poll(struct napi_struct - sbdma_tx_process(sc, &(sc->sbm_txdma), 1); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - #ifdef CONFIG_SBMAC_COALESCE - __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) | ---- a/drivers/net/ethernet/brocade/bna/bnad.c -+++ b/drivers/net/ethernet/brocade/bna/bnad.c -@@ -1881,7 +1881,7 @@ bnad_napi_poll_rx(struct napi_struct *na - return rcvd; - - poll_exit: -- napi_complete(napi); -+ napi_complete_done(napi, rcvd); - - rx_ctrl->rx_complete++; - ---- a/drivers/net/ethernet/cadence/macb.c -+++ b/drivers/net/ethernet/cadence/macb.c -@@ -1069,7 +1069,7 @@ static int macb_poll(struct napi_struct - - work_done = bp->macbgem_ops.mog_rx(bp, budget); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - /* Packets received while interrupts were disabled */ - status = macb_readl(bp, RSR); ---- a/drivers/net/ethernet/calxeda/xgmac.c -+++ b/drivers/net/ethernet/calxeda/xgmac.c -@@ -1247,7 +1247,7 @@ static int xgmac_poll(struct napi_struct - work_done = xgmac_rx(priv, budget); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - __raw_writel(DMA_INTR_DEFAULT_MASK, priv->base + XGMAC_DMA_INTR_ENA); - } - return work_done; ---- a/drivers/net/ethernet/cavium/liquidio/lio_main.c -+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c -@@ -2433,7 +2433,7 @@ static int liquidio_napi_poll(struct nap - } - - if ((work_done < budget) && (tx_done)) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - octeon_process_droq_poll_cmd(droq->oct_dev, droq->q_no, - POLL_EVENT_ENABLE_INTR, 0); - return 0; ---- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c -+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c -@@ -501,7 +501,7 @@ static int octeon_mgmt_napi_poll(struct - - if (work_done < budget) { - /* We stopped because no more packets were available. */ -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - octeon_mgmt_enable_rx_irq(p); - } - octeon_mgmt_update_rx_stats(netdev); ---- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c -+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c -@@ -748,7 +748,7 @@ static int nicvf_poll(struct napi_struct - - if (work_done < budget) { - /* Slow packet rate, exit polling */ -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - /* Re-enable interrupts */ - cq_head = nicvf_queue_reg_read(nic, NIC_QSET_CQ_0_7_HEAD, - cq->cq_idx); ---- a/drivers/net/ethernet/chelsio/cxgb/sge.c -+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c -@@ -1605,7 +1605,7 @@ int t1_poll(struct napi_struct *napi, in - int work_done = process_responses(adapter, budget); - - if (likely(work_done < budget)) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - writel(adapter->sge->respQ.cidx, - adapter->regs + A_SG_SLEEPING); - } ---- a/drivers/net/ethernet/chelsio/cxgb3/sge.c -+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c -@@ -1843,7 +1843,7 @@ static int ofld_poll(struct napi_struct - __skb_queue_head_init(&queue); - skb_queue_splice_init(&q->rx_queue, &queue); - if (skb_queue_empty(&queue)) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - spin_unlock_irq(&q->lock); - return work_done; - } -@@ -2414,7 +2414,7 @@ static int napi_rx_handler(struct napi_s - int work_done = process_responses(adap, qs, budget); - - if (likely(work_done < budget)) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - /* - * Because we don't atomically flush the following ---- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c -+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c -@@ -1889,7 +1889,7 @@ static int napi_rx_handler(struct napi_s - u32 val; - - if (likely(work_done < budget)) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - intr_params = rspq->next_intr_params; - rspq->next_intr_params = rspq->intr_params; - } else ---- a/drivers/net/ethernet/cisco/enic/enic_main.c -+++ b/drivers/net/ethernet/cisco/enic/enic_main.c -@@ -1339,7 +1339,7 @@ static int enic_poll(struct napi_struct - * exit polling - */ - -- napi_complete(napi); -+ napi_complete_done(napi, rq_work_done); - if (enic->rx_coalesce_setting.use_adaptive_rx_coalesce) - enic_set_int_moderation(enic, &enic->rq[0]); - vnic_intr_unmask(&enic->intr[intr]); -@@ -1496,7 +1496,7 @@ static int enic_poll_msix_rq(struct napi - * exit polling - */ - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - if (enic->rx_coalesce_setting.use_adaptive_rx_coalesce) - enic_set_int_moderation(enic, &enic->rq[rq]); - vnic_intr_unmask(&enic->intr[intr]); ---- a/drivers/net/ethernet/dec/tulip/interrupt.c -+++ b/drivers/net/ethernet/dec/tulip/interrupt.c -@@ -319,8 +319,8 @@ int tulip_poll(struct napi_struct *napi, - - /* Remove us from polling list and enable RX intr. */ - -- napi_complete(napi); -- iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7); -+ napi_complete_done(napi, work_done); -+ iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7); - - /* The last op happens after poll completion. Which means the following: - * 1. it can race with disabling irqs in irq handler -@@ -355,7 +355,7 @@ int tulip_poll(struct napi_struct *napi, - * before we did napi_complete(). See? We would lose it. */ - - /* remove ourselves from the polling list */ -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - return work_done; - } ---- a/drivers/net/ethernet/dnet.c -+++ b/drivers/net/ethernet/dnet.c -@@ -415,7 +415,7 @@ static int dnet_poll(struct napi_struct - /* We processed all packets available. Tell NAPI it can - * stop polling then re-enable rx interrupts. - */ -- napi_complete(napi); -+ napi_complete_done(napi, npackets); - int_enable = dnet_readl(bp, INTR_ENB); - int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; - dnet_writel(bp, int_enable, INTR_ENB); ---- a/drivers/net/ethernet/emulex/benet/be_main.c -+++ b/drivers/net/ethernet/emulex/benet/be_main.c -@@ -3344,7 +3344,7 @@ int be_poll(struct napi_struct *napi, in - be_process_mcc(adapter); - - if (max_work < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, max_work); - - /* Skyhawk EQ_DB has a provision to set the rearm to interrupt - * delay via a delay multiplier encoding value ---- a/drivers/net/ethernet/ethoc.c -+++ b/drivers/net/ethernet/ethoc.c -@@ -614,7 +614,7 @@ static int ethoc_poll(struct napi_struct - tx_work_done = ethoc_tx(priv->netdev, budget); - - if (rx_work_done < budget && tx_work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_work_done); - ethoc_enable_irq(priv, INT_MASK_TX | INT_MASK_RX); - } - ---- a/drivers/net/ethernet/ezchip/nps_enet.c -+++ b/drivers/net/ethernet/ezchip/nps_enet.c -@@ -192,7 +192,7 @@ static int nps_enet_poll(struct napi_str - if (work_done < budget) { - u32 buf_int_enable_value = 0; - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - /* set tx_done and rx_rdy bits */ - buf_int_enable_value |= NPS_ENET_ENABLE << RX_RDY_SHIFT; ---- a/drivers/net/ethernet/freescale/fec_main.c -+++ b/drivers/net/ethernet/freescale/fec_main.c -@@ -1623,7 +1623,7 @@ static int fec_enet_rx_napi(struct napi_ - fec_enet_tx(ndev); - - if (pkts < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, pkts); - writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); - } - return pkts; ---- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c -+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c -@@ -301,7 +301,7 @@ static int fs_enet_napi(struct napi_stru - - if (received < budget && tx_left) { - /* done */ -- napi_complete(napi); -+ napi_complete_done(napi, received); - (*fep->ops->napi_enable)(dev); - - return received; ---- a/drivers/net/ethernet/freescale/gianfar.c -+++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -3197,7 +3197,7 @@ static int gfar_poll_rx_sq(struct napi_s - - if (work_done < budget) { - u32 imask; -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - /* Clear the halt bit in RSTAT */ - gfar_write(®s->rstat, gfargrp->rstat); - -@@ -3286,7 +3286,7 @@ static int gfar_poll_rx(struct napi_stru - - if (!num_act_queues) { - u32 imask; -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - /* Clear the halt bit in RSTAT */ - gfar_write(®s->rstat, gfargrp->rstat); ---- a/drivers/net/ethernet/freescale/ucc_geth.c -+++ b/drivers/net/ethernet/freescale/ucc_geth.c -@@ -3303,7 +3303,7 @@ static int ucc_geth_poll(struct napi_str - howmany += ucc_geth_rx(ugeth, i, budget - howmany); - - if (howmany < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, howmany); - setbits32(ugeth->uccf->p_uccm, UCCE_RX_EVENTS | UCCE_TX_EVENTS); - } - ---- a/drivers/net/ethernet/hisilicon/hip04_eth.c -+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c -@@ -561,7 +561,7 @@ refill: - priv->reg_inten |= RCV_INT; - writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN); - } -- napi_complete(napi); -+ napi_complete_done(napi, rx); - done: - /* start a new timer if necessary */ - if (rx < budget && tx_remaining) ---- a/drivers/net/ethernet/hisilicon/hisi_femac.c -+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c -@@ -330,7 +330,7 @@ static int hisi_femac_poll(struct napi_s - } while (ints & DEF_INT_MASK); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - hisi_femac_irq_enable(priv, DEF_INT_MASK & - (~IRQ_INT_TX_PER_PACKET)); - } ---- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c -+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c -@@ -578,7 +578,7 @@ static int hix5hd2_poll(struct napi_stru - } while (ints & DEF_INT_MASK); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - hix5hd2_irq_enable(priv); - } - ---- a/drivers/net/ethernet/ibm/ibmveth.c -+++ b/drivers/net/ethernet/ibm/ibmveth.c -@@ -1323,7 +1323,7 @@ static int ibmveth_poll(struct napi_stru - ibmveth_replenish_task(adapter); - - if (frames_processed < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, frames_processed); - - /* We think we are done - reenable interrupts, - * then check once more to make sure we are done. ---- a/drivers/net/ethernet/ibm/ibmvnic.c -+++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -1028,7 +1028,7 @@ restart_poll: - - if (frames_processed < budget) { - enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]); -- napi_complete(napi); -+ napi_complete_done(napi, frames_processed); - if (pending_scrq(adapter, adapter->rx_scrq[scrq_num]) && - napi_reschedule(napi)) { - disable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]); ---- a/drivers/net/ethernet/intel/e100.c -+++ b/drivers/net/ethernet/intel/e100.c -@@ -2253,7 +2253,7 @@ static int e100_poll(struct napi_struct - - /* If budget not fully consumed, exit the polling mode */ - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - e100_enable_irq(nic); - } - ---- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c -+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c -@@ -1825,7 +1825,7 @@ ixgb_clean(struct napi_struct *napi, int - - /* If budget not fully consumed, exit the polling mode */ - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - if (!test_bit(__IXGB_DOWN, &adapter->flags)) - ixgb_irq_enable(adapter); - } ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -464,7 +464,7 @@ static int korina_poll(struct napi_struc - - work_done = korina_rx(dev, budget); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - writel(readl(&lp->rx_dma_regs->dmasm) & - ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR), ---- a/drivers/net/ethernet/lantiq_etop.c -+++ b/drivers/net/ethernet/lantiq_etop.c -@@ -156,24 +156,21 @@ ltq_etop_poll_rx(struct napi_struct *nap - { - struct ltq_etop_chan *ch = container_of(napi, - struct ltq_etop_chan, napi); -- int rx = 0; -- int complete = 0; -+ int work_done = 0; - -- while ((rx < budget) && !complete) { -+ while (work_done < budget) { - struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc]; - -- if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) == LTQ_DMA_C) { -- ltq_etop_hw_receive(ch); -- rx++; -- } else { -- complete = 1; -- } -+ if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) != LTQ_DMA_C) -+ break; -+ ltq_etop_hw_receive(ch); -+ work_done++; - } -- if (complete || !rx) { -- napi_complete(&ch->napi); -+ if (work_done < budget) { -+ napi_complete_done(&ch->napi, work_done); - ltq_dma_ack_irq(&ch->dma); - } -- return rx; -+ return work_done; - } - - static int ---- a/drivers/net/ethernet/marvell/mv643xx_eth.c -+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c -@@ -2312,7 +2312,7 @@ static int mv643xx_eth_poll(struct napi_ - if (work_done < budget) { - if (mp->oom) - mod_timer(&mp->rx_oom, jiffies + (HZ / 10)); -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - wrlp(mp, INT_MASK, mp->int_mask); - } - ---- a/drivers/net/ethernet/marvell/mvneta.c -+++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -2702,11 +2702,9 @@ static int mvneta_poll(struct napi_struc - rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]); - } - -- budget -= rx_done; -- -- if (budget > 0) { -+ if (rx_done < budget) { - cause_rx_tx = 0; -- napi_complete(&port->napi); -+ napi_complete_done(&port->napi, rx_done); - enable_percpu_irq(pp->dev->irq, 0); - } - ---- a/drivers/net/ethernet/marvell/mvpp2.c -+++ b/drivers/net/ethernet/marvell/mvpp2.c -@@ -5404,7 +5404,7 @@ static int mvpp2_poll(struct napi_struct - - if (budget > 0) { - cause_rx = 0; -- napi_complete(napi); -+ napi_complete_done(napi, rx_done); - - mvpp2_interrupts_enable(port); - } ---- a/drivers/net/ethernet/marvell/pxa168_eth.c -+++ b/drivers/net/ethernet/marvell/pxa168_eth.c -@@ -1264,7 +1264,7 @@ static int pxa168_rx_poll(struct napi_st - } - work_done = rxq_process(dev, budget); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - wrl(pep, INT_MASK, ALL_INTS); - } - ---- a/drivers/net/ethernet/moxa/moxart_ether.c -+++ b/drivers/net/ethernet/moxa/moxart_ether.c -@@ -270,7 +270,7 @@ rx_next: - } - - if (rx < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx); - } - - priv->reg_imr |= RPKT_FINISH_M; ---- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c -+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c -@@ -1678,7 +1678,7 @@ static int myri10ge_poll(struct napi_str - - myri10ge_ss_unlock_napi(ss); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - put_be32(htonl(3), ss->irq_claim); - } - return work_done; ---- a/drivers/net/ethernet/natsemi/natsemi.c -+++ b/drivers/net/ethernet/natsemi/natsemi.c -@@ -2261,7 +2261,7 @@ static int natsemi_poll(struct napi_stru - np->intr_status = readl(ioaddr + IntrStatus); - } while (np->intr_status); - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - /* Reenable interrupts providing nothing is trying to shut - * the chip down. */ ---- a/drivers/net/ethernet/neterion/s2io.c -+++ b/drivers/net/ethernet/neterion/s2io.c -@@ -2783,7 +2783,7 @@ static int s2io_poll_msix(struct napi_st - s2io_chk_rx_buffers(nic, ring); - - if (pkts_processed < budget_org) { -- napi_complete(napi); -+ napi_complete_done(napi, pkts_processed); - /*Re Enable MSI-Rx Vector*/ - addr = (u8 __iomem *)&bar0->xmsi_mask_reg; - addr += 7 - ring->ring_no; -@@ -2817,7 +2817,7 @@ static int s2io_poll_inta(struct napi_st - break; - } - if (pkts_processed < budget_org) { -- napi_complete(napi); -+ napi_complete_done(napi, pkts_processed); - /* Re enable the Rx interrupts for the ring */ - writeq(0, &bar0->rx_traffic_mask); - readl(&bar0->rx_traffic_mask); ---- a/drivers/net/ethernet/neterion/vxge/vxge-main.c -+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c -@@ -1823,8 +1823,8 @@ static int vxge_poll_msix(struct napi_st - vxge_hw_vpath_poll_rx(ring->handle); - pkts_processed = ring->pkts_processed; - -- if (ring->pkts_processed < budget_org) { -- napi_complete(napi); -+ if (pkts_processed < budget_org) { -+ napi_complete_done(napi, pkts_processed); - - /* Re enable the Rx interrupts for the vpath */ - vxge_hw_channel_msix_unmask( -@@ -1863,7 +1863,7 @@ static int vxge_poll_inta(struct napi_st - VXGE_COMPLETE_ALL_TX(vdev); - - if (pkts_processed < budget_org) { -- napi_complete(napi); -+ napi_complete_done(napi, pkts_processed); - /* Re enable the Rx interrupts for the ring */ - vxge_hw_device_unmask_all(hldev); - vxge_hw_device_flush_io(hldev); ---- a/drivers/net/ethernet/nvidia/forcedeth.c -+++ b/drivers/net/ethernet/nvidia/forcedeth.c -@@ -3756,7 +3756,7 @@ static int nv_napi_poll(struct napi_stru - if (rx_work < budget) { - /* re-enable interrupts - (msix not enabled in napi) */ -- napi_complete(napi); -+ napi_complete_done(napi, rx_work); - - writel(np->irqmask, base + NvRegIrqMask); - } ---- a/drivers/net/ethernet/nxp/lpc_eth.c -+++ b/drivers/net/ethernet/nxp/lpc_eth.c -@@ -999,7 +999,7 @@ static int lpc_eth_poll(struct napi_stru - rx_done = __lpc_handle_recv(ndev, budget); - - if (rx_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_done); - lpc_eth_enable_int(pldat->net_base); - } - ---- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c -+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c -@@ -2391,7 +2391,7 @@ static int pch_gbe_napi_poll(struct napi - poll_end_flag = true; - - if (poll_end_flag) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - pch_gbe_irq_enable(adapter); - } - ---- a/drivers/net/ethernet/pasemi/pasemi_mac.c -+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c -@@ -1575,7 +1575,7 @@ static int pasemi_mac_poll(struct napi_s - pkts = pasemi_mac_clean_rx(rx_ring(mac), budget); - if (pkts < budget) { - /* all done, no more packets present */ -- napi_complete(napi); -+ napi_complete_done(napi, pkts); - - pasemi_mac_restart_rx_intr(mac); - pasemi_mac_restart_tx_intr(mac); ---- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c -+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c -@@ -2391,7 +2391,7 @@ static int netxen_nic_poll(struct napi_s - work_done = budget; - - if (work_done < budget) { -- napi_complete(&sds_ring->napi); -+ napi_complete_done(&sds_ring->napi, work_done); - if (test_bit(__NX_DEV_UP, &adapter->state)) - netxen_nic_enable_int(sds_ring); - } ---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c -+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c -@@ -975,7 +975,7 @@ static int qlcnic_poll(struct napi_struc - work_done = budget; - - if (work_done < budget) { -- napi_complete(&sds_ring->napi); -+ napi_complete_done(&sds_ring->napi, work_done); - if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) { - qlcnic_enable_sds_intr(adapter, sds_ring); - qlcnic_enable_tx_intr(adapter, tx_ring); -@@ -1019,7 +1019,7 @@ static int qlcnic_rx_poll(struct napi_st - work_done = qlcnic_process_rcv_ring(sds_ring, budget); - - if (work_done < budget) { -- napi_complete(&sds_ring->napi); -+ napi_complete_done(&sds_ring->napi, work_done); - if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) - qlcnic_enable_sds_intr(adapter, sds_ring); - } -@@ -1966,7 +1966,7 @@ static int qlcnic_83xx_msix_sriov_vf_pol - work_done = budget; - - if (work_done < budget) { -- napi_complete(&sds_ring->napi); -+ napi_complete_done(&sds_ring->napi, work_done); - qlcnic_enable_sds_intr(adapter, sds_ring); - } - -@@ -1994,7 +1994,7 @@ static int qlcnic_83xx_poll(struct napi_ - work_done = budget; - - if (work_done < budget) { -- napi_complete(&sds_ring->napi); -+ napi_complete_done(&sds_ring->napi, work_done); - qlcnic_enable_sds_intr(adapter, sds_ring); - } - -@@ -2032,7 +2032,7 @@ static int qlcnic_83xx_rx_poll(struct na - adapter = sds_ring->adapter; - work_done = qlcnic_83xx_process_rcv_ring(sds_ring, budget); - if (work_done < budget) { -- napi_complete(&sds_ring->napi); -+ napi_complete_done(&sds_ring->napi, work_done); - if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) - qlcnic_enable_sds_intr(adapter, sds_ring); - } ---- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c -+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c -@@ -2334,7 +2334,7 @@ static int ql_napi_poll_msix(struct napi - } - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - ql_enable_completion_interrupt(qdev, rx_ring->irq); - } - return work_done; ---- a/drivers/net/ethernet/qualcomm/emac/emac.c -+++ b/drivers/net/ethernet/qualcomm/emac/emac.c -@@ -129,7 +129,7 @@ static int emac_napi_rtx(struct napi_str - emac_mac_rx_process(adpt, rx_q, &work_done, budget); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - irq->mask |= rx_q->intr; - writel(irq->mask, adpt->base + EMAC_INT_MASK); ---- a/drivers/net/ethernet/realtek/r8169.c -+++ b/drivers/net/ethernet/realtek/r8169.c -@@ -7578,7 +7578,7 @@ static int rtl8169_poll(struct napi_stru - } - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - rtl_irq_enable(tp, enable_mask); - mmiowb(); ---- a/drivers/net/ethernet/rocker/rocker_main.c -+++ b/drivers/net/ethernet/rocker/rocker_main.c -@@ -2480,7 +2480,7 @@ static int rocker_port_poll_rx(struct na - } - - if (credits < budget) -- napi_complete(napi); -+ napi_complete_done(napi, credits); - - rocker_dma_ring_credits_set(rocker, &rocker_port->rx_ring, credits); - ---- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c -+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c -@@ -1578,7 +1578,7 @@ static int sxgbe_poll(struct napi_struct - - work_done = sxgbe_rx(priv, budget); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - priv->hw->dma->enable_dma_irq(priv->ioaddr, qnum); - } - ---- a/drivers/net/ethernet/sfc/efx.c -+++ b/drivers/net/ethernet/sfc/efx.c -@@ -332,7 +332,7 @@ static int efx_poll(struct napi_struct * - * since efx_nic_eventq_read_ack() will have no effect if - * interrupts have already been disabled. - */ -- napi_complete(napi); -+ napi_complete_done(napi, spent); - efx_nic_eventq_read_ack(channel); - } - ---- a/drivers/net/ethernet/smsc/smsc9420.c -+++ b/drivers/net/ethernet/smsc/smsc9420.c -@@ -869,7 +869,7 @@ static int smsc9420_rx_poll(struct napi_ - smsc9420_pci_flush_write(pd); - - if (work_done < budget) { -- napi_complete(&pd->napi); -+ napi_complete_done(&pd->napi, work_done); - - /* re-enable RX DMA interrupts */ - dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA); ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -2700,7 +2700,7 @@ static int stmmac_poll(struct napi_struc - - work_done = stmmac_rx(priv, budget); - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - stmmac_enable_dma_irq(priv); - } - return work_done; ---- a/drivers/net/ethernet/sun/niu.c -+++ b/drivers/net/ethernet/sun/niu.c -@@ -3785,7 +3785,7 @@ static int niu_poll(struct napi_struct * - work_done = niu_poll_core(np, lp, budget); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - niu_ldg_rearm(np, lp, 1); - } - return work_done; ---- a/drivers/net/ethernet/sun/sungem.c -+++ b/drivers/net/ethernet/sun/sungem.c -@@ -924,7 +924,7 @@ static int gem_poll(struct napi_struct * - gp->status = readl(gp->regs + GREG_STAT); - } while (gp->status & GREG_STAT_NAPI); - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - gem_enable_ints(gp); - - return work_done; ---- a/drivers/net/ethernet/sun/sunvnet_common.c -+++ b/drivers/net/ethernet/sun/sunvnet_common.c -@@ -850,7 +850,7 @@ int sunvnet_poll_common(struct napi_stru - int processed = vnet_event_napi(port, budget); - - if (processed < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, processed); - port->rx_event &= ~LDC_EVENT_DATA_READY; - vio_set_intr(vio->vdev->rx_ino, HV_INTR_ENABLED); - } ---- a/drivers/net/ethernet/tehuti/tehuti.c -+++ b/drivers/net/ethernet/tehuti/tehuti.c -@@ -303,7 +303,7 @@ static int bdx_poll(struct napi_struct * - * device lock and allow waiting tasks (eg rmmod) to advance) */ - priv->napi_stop = 0; - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - bdx_enable_interrupts(priv); - } - return work_done; ---- a/drivers/net/ethernet/ti/cpsw.c -+++ b/drivers/net/ethernet/ti/cpsw.c -@@ -844,7 +844,7 @@ static int cpsw_rx_poll(struct napi_stru - } - - if (num_rx < budget) { -- napi_complete(napi_rx); -+ napi_complete_done(napi_rx, num_rx); - writel(0xff, &cpsw->wr_regs->rx_en); - if (cpsw->quirk_irq && cpsw->rx_irq_disabled) { - cpsw->rx_irq_disabled = false; ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -1295,7 +1295,7 @@ static int emac_poll(struct napi_struct - &emac_rxhost_errcodes[cause][0], ch); - } - } else if (num_rx_pkts < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, num_rx_pkts); - emac_int_enable(priv); - } - ---- a/drivers/net/ethernet/ti/netcp_core.c -+++ b/drivers/net/ethernet/ti/netcp_core.c -@@ -939,7 +939,7 @@ static int netcp_rx_poll(struct napi_str - - netcp_rxpool_refill(netcp); - if (packets < budget) { -- napi_complete(&netcp->rx_napi); -+ napi_complete_done(&netcp->rx_napi, packets); - knav_queue_enable_notify(netcp->rx_queue); - } - ---- a/drivers/net/ethernet/tile/tilegx.c -+++ b/drivers/net/ethernet/tile/tilegx.c -@@ -678,7 +678,7 @@ static int tile_net_poll(struct napi_str - } - - /* There are no packets left. */ -- napi_complete(&info_mpipe->napi); -+ napi_complete_done(&info_mpipe->napi, work); - - md = &mpipe_data[instance]; - /* Re-enable hypervisor interrupts. */ ---- a/drivers/net/ethernet/tile/tilepro.c -+++ b/drivers/net/ethernet/tile/tilepro.c -@@ -842,7 +842,7 @@ static int tile_net_poll(struct napi_str - } - } - -- napi_complete(&info->napi); -+ napi_complete_done(&info->napi, work); - - if (!priv->active) - goto done; ---- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c -+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c -@@ -1109,7 +1109,7 @@ static int gelic_net_poll(struct napi_st - } - - if (packets_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, packets_done); - gelic_card_rx_irq_on(card); - } - return packets_done; ---- a/drivers/net/ethernet/toshiba/spider_net.c -+++ b/drivers/net/ethernet/toshiba/spider_net.c -@@ -1270,7 +1270,7 @@ static int spider_net_poll(struct napi_s - /* if all packets are in the stack, enable interrupts and return 0 */ - /* if not, return 1 */ - if (packets_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, packets_done); - spider_net_rx_irq_on(card); - card->ignore_rx_ramfull = 0; - } ---- a/drivers/net/ethernet/toshiba/tc35815.c -+++ b/drivers/net/ethernet/toshiba/tc35815.c -@@ -1641,7 +1641,7 @@ static int tc35815_poll(struct napi_stru - spin_unlock(&lp->rx_lock); - - if (received < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, received); - /* enable interrupts */ - tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl); - } ---- a/drivers/net/ethernet/tundra/tsi108_eth.c -+++ b/drivers/net/ethernet/tundra/tsi108_eth.c -@@ -888,7 +888,7 @@ static int tsi108_poll(struct napi_struc - - if (num_received < budget) { - data->rxpending = 0; -- napi_complete(napi); -+ napi_complete_done(napi, num_received); - - TSI_WRITE(TSI108_EC_INTMASK, - TSI_READ(TSI108_EC_INTMASK) ---- a/drivers/net/ethernet/via/via-rhine.c -+++ b/drivers/net/ethernet/via/via-rhine.c -@@ -861,7 +861,7 @@ static int rhine_napipoll(struct napi_st - } - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - iowrite16(enable_mask, ioaddr + IntrEnable); - mmiowb(); - } ---- a/drivers/net/ethernet/via/via-velocity.c -+++ b/drivers/net/ethernet/via/via-velocity.c -@@ -2160,7 +2160,7 @@ static int velocity_poll(struct napi_str - velocity_tx_srv(vptr); - /* If budget not fully consumed, exit the polling mode */ - if (rx_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_done); - mac_enable_int(vptr->mac_regs); - } - spin_unlock_irqrestore(&vptr->lock, flags); ---- a/drivers/net/ethernet/wiznet/w5100.c -+++ b/drivers/net/ethernet/wiznet/w5100.c -@@ -915,7 +915,7 @@ static int w5100_napi_poll(struct napi_s - } - - if (rx_count < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_count); - w5100_enable_intr(priv); - } - ---- a/drivers/net/ethernet/wiznet/w5300.c -+++ b/drivers/net/ethernet/wiznet/w5300.c -@@ -417,7 +417,7 @@ static int w5300_napi_poll(struct napi_s - } - - if (rx_count < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rx_count); - w5300_write(priv, W5300_IMR, IR_S0); - mmiowb(); - } ---- a/drivers/net/fjes/fjes_main.c -+++ b/drivers/net/fjes/fjes_main.c -@@ -1125,7 +1125,7 @@ static int fjes_poll(struct napi_struct - } - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - if (adapter->unset_rx_last) { - adapter->rx_last_jiffies = jiffies; ---- a/drivers/net/vmxnet3/vmxnet3_drv.c -+++ b/drivers/net/vmxnet3/vmxnet3_drv.c -@@ -1873,7 +1873,7 @@ vmxnet3_poll(struct napi_struct *napi, i - rxd_done = vmxnet3_do_poll(rx_queue->adapter, budget); - - if (rxd_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rxd_done); - vmxnet3_enable_all_intrs(rx_queue->adapter); - } - return rxd_done; -@@ -1904,7 +1904,7 @@ vmxnet3_poll_rx_only(struct napi_struct - rxd_done = vmxnet3_rq_rx_complete(rq, adapter, budget); - - if (rxd_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, rxd_done); - vmxnet3_enable_intr(adapter, rq->comp_ring.intr_idx); - } - return rxd_done; ---- a/drivers/net/wan/fsl_ucc_hdlc.c -+++ b/drivers/net/wan/fsl_ucc_hdlc.c -@@ -573,7 +573,7 @@ static int ucc_hdlc_poll(struct napi_str - howmany += hdlc_rx_done(priv, budget - howmany); - - if (howmany < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, howmany); - qe_setbits32(priv->uccf->p_uccm, - (UCCE_HDLC_RX_EVENTS | UCCE_HDLC_TX_EVENTS) << 16); - } ---- a/drivers/net/wan/hd64572.c -+++ b/drivers/net/wan/hd64572.c -@@ -341,7 +341,7 @@ static int sca_poll(struct napi_struct * - received = sca_rx_done(port, budget); - - if (received < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, received); - enable_intr(port); - } - ---- a/drivers/net/wireless/ath/ath10k/pci.c -+++ b/drivers/net/wireless/ath/ath10k/pci.c -@@ -2804,7 +2804,7 @@ static int ath10k_pci_napi_poll(struct n - done = ath10k_htt_txrx_compl_task(ar, budget); - - if (done < budget) { -- napi_complete(ctx); -+ napi_complete_done(ctx, done); - /* In case of MSI, it is possible that interrupts are received - * while NAPI poll is inprogress. So pending interrupts that are - * received after processing all copy engine pipes by NAPI poll ---- a/drivers/net/wireless/ath/wil6210/netdev.c -+++ b/drivers/net/wireless/ath/wil6210/netdev.c -@@ -84,7 +84,7 @@ static int wil6210_netdev_poll_rx(struct - done = budget - quota; - - if (done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, done); - wil6210_unmask_irq_rx(wil); - wil_dbg_txrx(wil, "NAPI RX complete\n"); - } ---- a/drivers/net/xen-netback/interface.c -+++ b/drivers/net/xen-netback/interface.c -@@ -104,7 +104,7 @@ static int xenvif_poll(struct napi_struc - work_done = xenvif_tx_action(queue, budget); - - if (work_done < budget) { -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - /* If the queue is rate-limited, it shall be - * rescheduled in the timer callback. - */ ---- a/drivers/net/xen-netfront.c -+++ b/drivers/net/xen-netfront.c -@@ -1071,7 +1071,7 @@ err: - if (work_done < budget) { - int more_to_do = 0; - -- napi_complete(napi); -+ napi_complete_done(napi, work_done); - - RING_FINAL_CHECK_FOR_RESPONSES(&queue->rx, more_to_do); - if (more_to_do) ---- a/drivers/staging/octeon/ethernet-rx.c -+++ b/drivers/staging/octeon/ethernet-rx.c -@@ -429,7 +429,7 @@ static int cvm_oct_napi_poll(struct napi - - if (rx_count < budget) { - /* No more work */ -- napi_complete(napi); -+ napi_complete_done(napi, rx_count); - enable_irq(rx_group->irq); - } - return rx_count; ---- a/drivers/staging/unisys/visornic/visornic_main.c -+++ b/drivers/staging/unisys/visornic/visornic_main.c -@@ -1657,7 +1657,7 @@ static int visornic_poll(struct napi_str - - /* If there aren't any more packets to receive stop the poll */ - if (rx_count < budget) -- napi_complete(napi); -+ napi_complete_done(napi, rx_count); - - return rx_count; - } diff --git a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch b/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch deleted file mode 100644 index 7c3c5608c5..0000000000 --- a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 89a23c8b528bd2c89f3981573d6cd7d23840c8a6 Mon Sep 17 00:00:00 2001 -From: Craig Gallek -Date: Wed, 26 Apr 2017 14:37:45 -0400 -Subject: [PATCH] ip6_tunnel: Fix missing tunnel encapsulation limit option - -The IPv6 tunneling code tries to insert IPV6_TLV_TNL_ENCAP_LIMIT and -IPV6_TLV_PADN options when an encapsulation limit is defined (the -default is a limit of 4). An MTU adjustment is done to account for -these options as well. However, the options are never present in the -generated packets. - -The issue appears to be a subtlety between IPV6_DSTOPTS and -IPV6_RTHDRDSTOPTS defined in RFC 3542. When the IPIP tunnel driver was -written, the encap limit options were included as IPV6_RTHDRDSTOPTS in -dst0opt of struct ipv6_txoptions. Later, ipv6_push_nfrags_opts was -(correctly) updated to require IPV6_RTHDR options when IPV6_RTHDRDSTOPTS -are to be used. This caused the options to no longer be included in v6 -encapsulated packets. - -The fix is to use IPV6_DSTOPTS (in dst1opt of struct ipv6_txoptions) -instead. IPV6_DSTOPTS do not have the additional IPV6_RTHDR requirement. - -Fixes: 1df64a8569c7: ("[IPV6]: Add ip6ip6 tunnel driver.") -Fixes: 333fad5364d6: ("[IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542)") -Signed-off-by: Craig Gallek -Signed-off-by: David S. Miller ---- - net/ipv6/ip6_tunnel.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/net/ipv6/ip6_tunnel.c -+++ b/net/ipv6/ip6_tunnel.c -@@ -958,7 +958,7 @@ static void init_tel_txopt(struct ipv6_t - opt->dst_opt[5] = IPV6_TLV_PADN; - opt->dst_opt[6] = 1; - -- opt->ops.dst0opt = (struct ipv6_opt_hdr *) opt->dst_opt; -+ opt->ops.dst1opt = (struct ipv6_opt_hdr *) opt->dst_opt; - opt->ops.opt_nflen = 8; - } - -@@ -1200,7 +1200,7 @@ route_lookup: - - if (encap_limit >= 0) { - init_tel_txopt(&opt, encap_limit); -- ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL); -+ ipv6_push_frag_opts(skb, &opt.ops, &proto); - } - - skb_push(skb, sizeof(struct ipv6hdr)); diff --git a/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch b/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch deleted file mode 100644 index d102e7bb85..0000000000 --- a/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5b8481fa42ac58484d633b558579e302aead64c1 Mon Sep 17 00:00:00 2001 -From: "David S. Miller" -Date: Mon, 1 May 2017 15:10:20 -0400 -Subject: [PATCH] ipv6: Need to export ipv6_push_frag_opts for tunneling now. - -Since that change also made the nfrag function not necessary -for exports, remove it. - -Fixes: 89a23c8b528b ("ip6_tunnel: Fix missing tunnel encapsulation limit option") -Signed-off-by: David S. Miller ---- - net/ipv6/exthdrs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/ipv6/exthdrs.c -+++ b/net/ipv6/exthdrs.c -@@ -729,13 +729,13 @@ void ipv6_push_nfrag_opts(struct sk_buff - if (opt->hopopt) - ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt); - } --EXPORT_SYMBOL(ipv6_push_nfrag_opts); - - void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto) - { - if (opt->dst1opt) - ipv6_push_exthdr(skb, proto, NEXTHDR_DEST, opt->dst1opt); - } -+EXPORT_SYMBOL(ipv6_push_frag_opts); - - struct ipv6_txoptions * - ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt) diff --git a/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch deleted file mode 100644 index b4ff02c4ce..0000000000 --- a/target/linux/generic/backport-4.9/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 46bf067870156abd61fe24d14c2486d15b8b502c Mon Sep 17 00:00:00 2001 -From: Dave Taht -Date: Fri, 14 Dec 2018 18:38:40 +0000 -Subject: [PATCH 1/1] Allow class-e address assignment in ifconfig and early - boot - -While the linux kernel became mostly "class-e clean" a decade ago, -and most distributions long ago switched to the iproute2 suite -of utilities, which allow class-e (240.0.0.0/4) address assignment, -distributions relying on busybox, toybox and other forms of -ifconfig cannot assign class-e addresses without this kernel patch. - -With this patch, also, a boot command line on these addresses is feasible: -(ip=248.0.1.2::248.0.1.1:255.255.255.0). - -While CIDR has been obsolete for 2 decades, and a survey of all the -userspace open source code in the world shows most IN_whatever macros -are also obsolete... rather than obsolete CIDR from this ioctl entirely, -this patch merely enables class-e assignment, sanely. - -H/T to Vince Fuller and his original patch here: - https://lkml.org/lkml/2008/1/7/370 - -Signed-off-by: Dave Taht -Reviewed-by: John Gilmore ---- - include/uapi/linux/in.h | 8 ++++++-- - net/ipv4/devinet.c | 4 +++- - net/ipv4/ipconfig.c | 2 ++ - 3 files changed, 11 insertions(+), 3 deletions(-) - ---- a/include/uapi/linux/in.h -+++ b/include/uapi/linux/in.h -@@ -266,8 +266,12 @@ struct sockaddr_in { - #define IN_MULTICAST(a) IN_CLASSD(a) - #define IN_MULTICAST_NET 0xF0000000 - --#define IN_EXPERIMENTAL(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000) --#define IN_BADCLASS(a) IN_EXPERIMENTAL((a)) -+#define IN_BADCLASS(a) (((long int) (a) ) == (long int)0xffffffff) -+#define IN_EXPERIMENTAL(a) IN_BADCLASS((a)) -+ -+#define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000) -+#define IN_CLASSE_NET 0xffffffff -+#define IN_CLASSE_NSHIFT 0 - - /* Address to accept any incoming messages. */ - #define INADDR_ANY ((unsigned long int) 0x00000000) ---- a/net/ipv4/devinet.c -+++ b/net/ipv4/devinet.c -@@ -906,7 +906,7 @@ static int inet_abc_len(__be32 addr) - { - int rc = -1; /* Something else, probably a multicast. */ - -- if (ipv4_is_zeronet(addr)) -+ if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr)) - rc = 0; - else { - __u32 haddr = ntohl(addr); -@@ -917,6 +917,8 @@ static int inet_abc_len(__be32 addr) - rc = 16; - else if (IN_CLASSC(haddr)) - rc = 24; -+ else if (IN_CLASSE(haddr)) -+ rc = 32; - } - - return rc; ---- a/net/ipv4/ipconfig.c -+++ b/net/ipv4/ipconfig.c -@@ -455,6 +455,8 @@ static int __init ic_defaults(void) - ic_netmask = htonl(IN_CLASSB_NET); - else if (IN_CLASSC(ntohl(ic_myaddr))) - ic_netmask = htonl(IN_CLASSC_NET); -+ else if (IN_CLASSE(ntohl(ic_myaddr))) -+ ic_netmask = htonl(IN_CLASSE_NET); - else { - pr_err("IP-Config: Unable to guess netmask for address %pI4\n", - &ic_myaddr); diff --git a/target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch b/target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch deleted file mode 100644 index 963466143c..0000000000 --- a/target/linux/generic/backport-4.9/095-v4.13-0001-rtc-ds1307-add-ds1308-variant.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 300a7735becf55f7fd18f8cd3dc3b945a0cab712 Mon Sep 17 00:00:00 2001 -From: Sean Nyekjaer -Date: Thu, 8 Jun 2017 12:36:54 +0200 -Subject: rtc: ds1307: add ds1308 variant - -The ds1308 variant is very similar to the already supported ds1338 -variant, it have more debug registers and a square wave clock output. - -Signed-off-by: Sean Nyekjaer -Signed-off-by: Alexandre Belloni ---- - drivers/rtc/rtc-ds1307.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/drivers/rtc/rtc-ds1307.c -+++ b/drivers/rtc/rtc-ds1307.c -@@ -31,6 +31,7 @@ - */ - enum ds_type { - ds_1307, -+ ds_1308, - ds_1337, - ds_1338, - ds_1339, -@@ -144,6 +145,10 @@ static struct chip_desc chips[last_ds_ty - .nvram_offset = 8, - .nvram_size = 56, - }, -+ [ds_1308] = { -+ .nvram_offset = 8, -+ .nvram_size = 56, -+ }, - [ds_1337] = { - .alarm = 1, - }, -@@ -175,6 +180,7 @@ static struct chip_desc chips[last_ds_ty - - static const struct i2c_device_id ds1307_id[] = { - { "ds1307", ds_1307 }, -+ { "ds1308", ds_1308 }, - { "ds1337", ds_1337 }, - { "ds1338", ds_1338 }, - { "ds1339", ds_1339 }, -@@ -1488,6 +1494,7 @@ read_rtc: - goto read_rtc; - } - break; -+ case ds_1308: - case ds_1338: - /* clock halted? turn it on, so clock can tick. */ - if (tmp & DS1307_BIT_CH) diff --git a/target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch b/target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch deleted file mode 100644 index bfb7690dec..0000000000 --- a/target/linux/generic/backport-4.9/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 508b09046c0f21678652fb66fd1e9959d55591d2 Mon Sep 17 00:00:00 2001 -From: Alin Nastac -Date: Wed, 21 Nov 2018 14:00:30 +0100 -Subject: [PATCH] netfilter: ipv6: Preserve link scope traffic original oif - -When ip6_route_me_harder is invoked, it resets outgoing interface of: - - link-local scoped packets sent by neighbor discovery - - multicast packets sent by MLD host - - multicast packets send by MLD proxy daemon that sets outgoing - interface through IPV6_PKTINFO ipi6_ifindex - -Link-local and multicast packets must keep their original oif after -ip6_route_me_harder is called. - -Signed-off-by: Alin Nastac -Signed-off-by: Pablo Neira Ayuso ---- - net/ipv6/netfilter.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/net/ipv6/netfilter.c -+++ b/net/ipv6/netfilter.c -@@ -24,7 +24,8 @@ int ip6_route_me_harder(struct net *net, - unsigned int hh_len; - struct dst_entry *dst; - struct flowi6 fl6 = { -- .flowi6_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0, -+ .flowi6_oif = skb->sk && skb->sk->sk_bound_dev_if ? skb->sk->sk_bound_dev_if : -+ rt6_need_strict(&iph->daddr) ? skb_dst(skb)->dev->ifindex : 0, - .flowi6_mark = skb->mark, - .daddr = iph->daddr, - .saddr = iph->saddr, diff --git a/target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch b/target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch deleted file mode 100644 index 2b3384391a..0000000000 --- a/target/linux/generic/backport-4.9/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4cc30de79d293f1e8c5f50ae3a9c005def9564a0 Mon Sep 17 00:00:00 2001 -From: Koen Vandeputte -Date: Mon, 7 Jan 2019 14:14:27 +0100 -Subject: [PATCH 2/2] arm: cns3xxx: use actual size reads for PCIe - -commit 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors") -reimplemented cns3xxx_pci_read_config() using pci_generic_config_read32(), -which preserved the property of only doing 32-bit reads. - -It also replaced cns3xxx_pci_write_config() with pci_generic_config_write(), -so it changed writes from always being 32 bits to being the actual size, -which works just fine. - -Due to: -- The documentation does not mention that only 32 bit access is allowed. -- Writes are already executed using the actual size -- Extensive testing shows that 8b, 16b and 32b reads work as intended - -It makes perfectly sense to also swap 32 bit reading in favor of actual size. - -Fixes: 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors") -Suggested-by: Bjorn Helgaas -Signed-off-by: Koen Vandeputte -CC: Arnd Bergmann -CC: Krzysztof Halasa -CC: Olof Johansson -CC: Robin Leblon -CC: Rob Herring -CC: Russell King -CC: Tim Harvey -CC: stable@vger.kernel.org # v4.0+ ---- - arch/arm/mach-cns3xxx/pcie.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/mach-cns3xxx/pcie.c -+++ b/arch/arm/mach-cns3xxx/pcie.c -@@ -93,7 +93,7 @@ static int cns3xxx_pci_read_config(struc - u32 mask = (0x1ull << (size * 8)) - 1; - int shift = (where % 4) * 8; - -- ret = pci_generic_config_read32(bus, devfn, where, size, val); -+ ret = pci_generic_config_read(bus, devfn, where, size, val); - - if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn && - (where & 0xffc) == PCI_CLASS_REVISION) diff --git a/target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch b/target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch deleted file mode 100644 index bd58df63c0..0000000000 --- a/target/linux/generic/backport-4.9/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch +++ /dev/null @@ -1,588 +0,0 @@ -From 06f502f57d0d7728f9fa0f157ec5e4111ddb98f6 Mon Sep 17 00:00:00 2001 -From: Ben Whitten -Date: Sun, 10 Dec 2017 21:17:55 +0000 -Subject: [PATCH] leds: trigger: Introduce a NETDEV trigger - -This commit introduces a NETDEV trigger for named device -activity. Available triggers are link, rx, and tx. - -Signed-off-by: Ben Whitten -Acked-by: Pavel Machek -Signed-off-by: Jacek Anaszewski ---- - .../ABI/testing/sysfs-class-led-trigger-netdev | 45 ++ - drivers/leds/trigger/Kconfig | 7 + - drivers/leds/trigger/Makefile | 1 + - drivers/leds/trigger/ledtrig-netdev.c | 496 +++++++++++++++++++++ - 4 files changed, 549 insertions(+) - create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-netdev - create mode 100644 drivers/leds/trigger/ledtrig-netdev.c - ---- /dev/null -+++ b/Documentation/ABI/testing/sysfs-class-led-trigger-netdev -@@ -0,0 +1,45 @@ -+What: /sys/class/leds//device_name -+Date: Dec 2017 -+KernelVersion: 4.16 -+Contact: linux-leds@vger.kernel.org -+Description: -+ Specifies the network device name to monitor. -+ -+What: /sys/class/leds//interval -+Date: Dec 2017 -+KernelVersion: 4.16 -+Contact: linux-leds@vger.kernel.org -+Description: -+ Specifies the duration of the LED blink in milliseconds. -+ Defaults to 50 ms. -+ -+What: /sys/class/leds//link -+Date: Dec 2017 -+KernelVersion: 4.16 -+Contact: linux-leds@vger.kernel.org -+Description: -+ Signal the link state of the named network device. -+ If set to 0 (default), the LED's normal state is off. -+ If set to 1, the LED's normal state reflects the link state -+ of the named network device. -+ Setting this value also immediately changes the LED state. -+ -+What: /sys/class/leds//tx -+Date: Dec 2017 -+KernelVersion: 4.16 -+Contact: linux-leds@vger.kernel.org -+Description: -+ Signal transmission of data on the named network device. -+ If set to 0 (default), the LED will not blink on transmission. -+ If set to 1, the LED will blink for the milliseconds specified -+ in interval to signal transmission. -+ -+What: /sys/class/leds//rx -+Date: Dec 2017 -+KernelVersion: 4.16 -+Contact: linux-leds@vger.kernel.org -+Description: -+ Signal reception of data on the named network device. -+ If set to 0 (default), the LED will not blink on reception. -+ If set to 1, the LED will blink for the milliseconds specified -+ in interval to signal reception. ---- a/drivers/leds/trigger/Kconfig -+++ b/drivers/leds/trigger/Kconfig -@@ -126,4 +126,11 @@ config LEDS_TRIGGER_PANIC - a different trigger. - If unsure, say Y. - -+config LEDS_TRIGGER_NETDEV -+ tristate "LED Netdev Trigger" -+ depends on NET && LEDS_TRIGGERS -+ help -+ This allows LEDs to be controlled by network device activity. -+ If unsure, say Y. -+ - endif # LEDS_TRIGGERS ---- a/drivers/leds/trigger/Makefile -+++ b/drivers/leds/trigger/Makefile -@@ -10,3 +10,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += - obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o - obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o - obj-$(CONFIG_LEDS_TRIGGER_PANIC) += ledtrig-panic.o -+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o ---- /dev/null -+++ b/drivers/leds/trigger/ledtrig-netdev.c -@@ -0,0 +1,496 @@ -+// SPDX-License-Identifier: GPL-2.0 -+// Copyright 2017 Ben Whitten -+// Copyright 2007 Oliver Jowett -+// -+// LED Kernel Netdev Trigger -+// -+// Toggles the LED to reflect the link and traffic state of a named net device -+// -+// Derived from ledtrig-timer.c which is: -+// Copyright 2005-2006 Openedhand Ltd. -+// Author: Richard Purdie -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "../leds.h" -+ -+/* -+ * Configurable sysfs attributes: -+ * -+ * device_name - network device name to monitor -+ * interval - duration of LED blink, in milliseconds -+ * link - LED's normal state reflects whether the link is up -+ * (has carrier) or not -+ * tx - LED blinks on transmitted data -+ * rx - LED blinks on receive data -+ * -+ */ -+ -+struct led_netdev_data { -+ spinlock_t lock; -+ -+ struct delayed_work work; -+ struct notifier_block notifier; -+ -+ struct led_classdev *led_cdev; -+ struct net_device *net_dev; -+ -+ char device_name[IFNAMSIZ]; -+ atomic_t interval; -+ unsigned int last_activity; -+ -+ unsigned long mode; -+#define NETDEV_LED_LINK 0 -+#define NETDEV_LED_TX 1 -+#define NETDEV_LED_RX 2 -+#define NETDEV_LED_MODE_LINKUP 3 -+}; -+ -+enum netdev_led_attr { -+ NETDEV_ATTR_LINK, -+ NETDEV_ATTR_TX, -+ NETDEV_ATTR_RX -+}; -+ -+static void set_baseline_state(struct led_netdev_data *trigger_data) -+{ -+ int current_brightness; -+ struct led_classdev *led_cdev = trigger_data->led_cdev; -+ -+ current_brightness = led_cdev->brightness; -+ if (current_brightness) -+ led_cdev->blink_brightness = current_brightness; -+ if (!led_cdev->blink_brightness) -+ led_cdev->blink_brightness = led_cdev->max_brightness; -+ -+ if (!test_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode)) -+ led_set_brightness(led_cdev, LED_OFF); -+ else { -+ if (test_bit(NETDEV_LED_LINK, &trigger_data->mode)) -+ led_set_brightness(led_cdev, -+ led_cdev->blink_brightness); -+ else -+ led_set_brightness(led_cdev, LED_OFF); -+ -+ /* If we are looking for RX/TX start periodically -+ * checking stats -+ */ -+ if (test_bit(NETDEV_LED_TX, &trigger_data->mode) || -+ test_bit(NETDEV_LED_RX, &trigger_data->mode)) -+ schedule_delayed_work(&trigger_data->work, 0); -+ } -+} -+ -+static ssize_t device_name_show(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ struct led_classdev *led_cdev = dev_get_drvdata(dev); -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ ssize_t len; -+ -+ spin_lock_bh(&trigger_data->lock); -+ len = sprintf(buf, "%s\n", trigger_data->device_name); -+ spin_unlock_bh(&trigger_data->lock); -+ -+ return len; -+} -+ -+static ssize_t device_name_store(struct device *dev, -+ struct device_attribute *attr, const char *buf, -+ size_t size) -+{ -+ struct led_classdev *led_cdev = dev_get_drvdata(dev); -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ -+ if (size >= IFNAMSIZ) -+ return -EINVAL; -+ -+ cancel_delayed_work_sync(&trigger_data->work); -+ -+ spin_lock_bh(&trigger_data->lock); -+ -+ if (trigger_data->net_dev) { -+ dev_put(trigger_data->net_dev); -+ trigger_data->net_dev = NULL; -+ } -+ -+ strncpy(trigger_data->device_name, buf, size); -+ if (size > 0 && trigger_data->device_name[size - 1] == '\n') -+ trigger_data->device_name[size - 1] = 0; -+ -+ if (trigger_data->device_name[0] != 0) -+ trigger_data->net_dev = -+ dev_get_by_name(&init_net, trigger_data->device_name); -+ -+ clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); -+ if (trigger_data->net_dev != NULL) -+ if (netif_carrier_ok(trigger_data->net_dev)) -+ set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); -+ -+ trigger_data->last_activity = 0; -+ -+ set_baseline_state(trigger_data); -+ spin_unlock_bh(&trigger_data->lock); -+ -+ return size; -+} -+ -+static DEVICE_ATTR_RW(device_name); -+ -+static ssize_t netdev_led_attr_show(struct device *dev, char *buf, -+ enum netdev_led_attr attr) -+{ -+ struct led_classdev *led_cdev = dev_get_drvdata(dev); -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ int bit; -+ -+ switch (attr) { -+ case NETDEV_ATTR_LINK: -+ bit = NETDEV_LED_LINK; -+ break; -+ case NETDEV_ATTR_TX: -+ bit = NETDEV_LED_TX; -+ break; -+ case NETDEV_ATTR_RX: -+ bit = NETDEV_LED_RX; -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ return sprintf(buf, "%u\n", test_bit(bit, &trigger_data->mode)); -+} -+ -+static ssize_t netdev_led_attr_store(struct device *dev, const char *buf, -+ size_t size, enum netdev_led_attr attr) -+{ -+ struct led_classdev *led_cdev = dev_get_drvdata(dev); -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ unsigned long state; -+ int ret; -+ int bit; -+ -+ ret = kstrtoul(buf, 0, &state); -+ if (ret) -+ return ret; -+ -+ switch (attr) { -+ case NETDEV_ATTR_LINK: -+ bit = NETDEV_LED_LINK; -+ break; -+ case NETDEV_ATTR_TX: -+ bit = NETDEV_LED_TX; -+ break; -+ case NETDEV_ATTR_RX: -+ bit = NETDEV_LED_RX; -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ cancel_delayed_work_sync(&trigger_data->work); -+ -+ if (state) -+ set_bit(bit, &trigger_data->mode); -+ else -+ clear_bit(bit, &trigger_data->mode); -+ -+ set_baseline_state(trigger_data); -+ -+ return size; -+} -+ -+static ssize_t link_show(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ return netdev_led_attr_show(dev, buf, NETDEV_ATTR_LINK); -+} -+ -+static ssize_t link_store(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t size) -+{ -+ return netdev_led_attr_store(dev, buf, size, NETDEV_ATTR_LINK); -+} -+ -+static DEVICE_ATTR_RW(link); -+ -+static ssize_t tx_show(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ return netdev_led_attr_show(dev, buf, NETDEV_ATTR_TX); -+} -+ -+static ssize_t tx_store(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t size) -+{ -+ return netdev_led_attr_store(dev, buf, size, NETDEV_ATTR_TX); -+} -+ -+static DEVICE_ATTR_RW(tx); -+ -+static ssize_t rx_show(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ return netdev_led_attr_show(dev, buf, NETDEV_ATTR_RX); -+} -+ -+static ssize_t rx_store(struct device *dev, -+ struct device_attribute *attr, const char *buf, size_t size) -+{ -+ return netdev_led_attr_store(dev, buf, size, NETDEV_ATTR_RX); -+} -+ -+static DEVICE_ATTR_RW(rx); -+ -+static ssize_t interval_show(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ struct led_classdev *led_cdev = dev_get_drvdata(dev); -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ -+ return sprintf(buf, "%u\n", -+ jiffies_to_msecs(atomic_read(&trigger_data->interval))); -+} -+ -+static ssize_t interval_store(struct device *dev, -+ struct device_attribute *attr, const char *buf, -+ size_t size) -+{ -+ struct led_classdev *led_cdev = dev_get_drvdata(dev); -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ unsigned long value; -+ int ret; -+ -+ ret = kstrtoul(buf, 0, &value); -+ if (ret) -+ return ret; -+ -+ /* impose some basic bounds on the timer interval */ -+ if (value >= 5 && value <= 10000) { -+ cancel_delayed_work_sync(&trigger_data->work); -+ -+ atomic_set(&trigger_data->interval, msecs_to_jiffies(value)); -+ set_baseline_state(trigger_data); /* resets timer */ -+ } -+ -+ return size; -+} -+ -+static DEVICE_ATTR_RW(interval); -+ -+static int netdev_trig_notify(struct notifier_block *nb, -+ unsigned long evt, void *dv) -+{ -+ struct net_device *dev = -+ netdev_notifier_info_to_dev((struct netdev_notifier_info *)dv); -+ struct led_netdev_data *trigger_data = container_of(nb, -+ struct -+ led_netdev_data, -+ notifier); -+ -+ if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE -+ && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER -+ && evt != NETDEV_CHANGENAME) -+ return NOTIFY_DONE; -+ -+ if (strcmp(dev->name, trigger_data->device_name)) -+ return NOTIFY_DONE; -+ -+ cancel_delayed_work_sync(&trigger_data->work); -+ -+ spin_lock_bh(&trigger_data->lock); -+ -+ clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); -+ switch (evt) { -+ case NETDEV_REGISTER: -+ if (trigger_data->net_dev) -+ dev_put(trigger_data->net_dev); -+ dev_hold(dev); -+ trigger_data->net_dev = dev; -+ break; -+ case NETDEV_CHANGENAME: -+ case NETDEV_UNREGISTER: -+ if (trigger_data->net_dev) { -+ dev_put(trigger_data->net_dev); -+ trigger_data->net_dev = NULL; -+ } -+ break; -+ case NETDEV_UP: -+ case NETDEV_CHANGE: -+ if (netif_carrier_ok(dev)) -+ set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); -+ break; -+ } -+ -+ set_baseline_state(trigger_data); -+ -+ spin_unlock_bh(&trigger_data->lock); -+ -+ return NOTIFY_DONE; -+} -+ -+/* here's the real work! */ -+static void netdev_trig_work(struct work_struct *work) -+{ -+ struct led_netdev_data *trigger_data = container_of(work, -+ struct -+ led_netdev_data, -+ work.work); -+ struct rtnl_link_stats64 *dev_stats; -+ unsigned int new_activity; -+ struct rtnl_link_stats64 temp; -+ unsigned long interval; -+ int invert; -+ -+ /* If we dont have a device, insure we are off */ -+ if (!trigger_data->net_dev) { -+ led_set_brightness(trigger_data->led_cdev, LED_OFF); -+ return; -+ } -+ -+ /* If we are not looking for RX/TX then return */ -+ if (!test_bit(NETDEV_LED_TX, &trigger_data->mode) && -+ !test_bit(NETDEV_LED_RX, &trigger_data->mode)) -+ return; -+ -+ dev_stats = dev_get_stats(trigger_data->net_dev, &temp); -+ new_activity = -+ (test_bit(NETDEV_LED_TX, &trigger_data->mode) ? -+ dev_stats->tx_packets : 0) + -+ (test_bit(NETDEV_LED_RX, &trigger_data->mode) ? -+ dev_stats->rx_packets : 0); -+ -+ if (trigger_data->last_activity != new_activity) { -+ led_stop_software_blink(trigger_data->led_cdev); -+ -+ invert = test_bit(NETDEV_LED_LINK, &trigger_data->mode); -+ interval = jiffies_to_msecs( -+ atomic_read(&trigger_data->interval)); -+ /* base state is ON (link present) */ -+ led_blink_set_oneshot(trigger_data->led_cdev, -+ &interval, -+ &interval, -+ invert); -+ trigger_data->last_activity = new_activity; -+ } -+ -+ schedule_delayed_work(&trigger_data->work, -+ (atomic_read(&trigger_data->interval)*2)); -+} -+ -+static void netdev_trig_activate(struct led_classdev *led_cdev) -+{ -+ struct led_netdev_data *trigger_data; -+ int rc; -+ -+ trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL); -+ if (!trigger_data) -+ return; -+ -+ spin_lock_init(&trigger_data->lock); -+ -+ trigger_data->notifier.notifier_call = netdev_trig_notify; -+ trigger_data->notifier.priority = 10; -+ -+ INIT_DELAYED_WORK(&trigger_data->work, netdev_trig_work); -+ -+ trigger_data->led_cdev = led_cdev; -+ trigger_data->net_dev = NULL; -+ trigger_data->device_name[0] = 0; -+ -+ trigger_data->mode = 0; -+ atomic_set(&trigger_data->interval, msecs_to_jiffies(50)); -+ trigger_data->last_activity = 0; -+ -+ led_cdev->trigger_data = trigger_data; -+ -+ rc = device_create_file(led_cdev->dev, &dev_attr_device_name); -+ if (rc) -+ goto err_out; -+ rc = device_create_file(led_cdev->dev, &dev_attr_link); -+ if (rc) -+ goto err_out_device_name; -+ rc = device_create_file(led_cdev->dev, &dev_attr_rx); -+ if (rc) -+ goto err_out_link; -+ rc = device_create_file(led_cdev->dev, &dev_attr_tx); -+ if (rc) -+ goto err_out_rx; -+ rc = device_create_file(led_cdev->dev, &dev_attr_interval); -+ if (rc) -+ goto err_out_tx; -+ rc = register_netdevice_notifier(&trigger_data->notifier); -+ if (rc) -+ goto err_out_interval; -+ return; -+ -+err_out_interval: -+ device_remove_file(led_cdev->dev, &dev_attr_interval); -+err_out_tx: -+ device_remove_file(led_cdev->dev, &dev_attr_tx); -+err_out_rx: -+ device_remove_file(led_cdev->dev, &dev_attr_rx); -+err_out_link: -+ device_remove_file(led_cdev->dev, &dev_attr_link); -+err_out_device_name: -+ device_remove_file(led_cdev->dev, &dev_attr_device_name); -+err_out: -+ led_cdev->trigger_data = NULL; -+ kfree(trigger_data); -+} -+ -+static void netdev_trig_deactivate(struct led_classdev *led_cdev) -+{ -+ struct led_netdev_data *trigger_data = led_cdev->trigger_data; -+ -+ if (trigger_data) { -+ unregister_netdevice_notifier(&trigger_data->notifier); -+ -+ device_remove_file(led_cdev->dev, &dev_attr_device_name); -+ device_remove_file(led_cdev->dev, &dev_attr_link); -+ device_remove_file(led_cdev->dev, &dev_attr_rx); -+ device_remove_file(led_cdev->dev, &dev_attr_tx); -+ device_remove_file(led_cdev->dev, &dev_attr_interval); -+ -+ cancel_delayed_work_sync(&trigger_data->work); -+ -+ if (trigger_data->net_dev) -+ dev_put(trigger_data->net_dev); -+ -+ kfree(trigger_data); -+ } -+} -+ -+static struct led_trigger netdev_led_trigger = { -+ .name = "netdev", -+ .activate = netdev_trig_activate, -+ .deactivate = netdev_trig_deactivate, -+}; -+ -+static int __init netdev_trig_init(void) -+{ -+ return led_trigger_register(&netdev_led_trigger); -+} -+ -+static void __exit netdev_trig_exit(void) -+{ -+ led_trigger_unregister(&netdev_led_trigger); -+} -+ -+module_init(netdev_trig_init); -+module_exit(netdev_trig_exit); -+ -+MODULE_AUTHOR("Ben Whitten "); -+MODULE_AUTHOR("Oliver Jowett "); -+MODULE_DESCRIPTION("Netdev LED trigger"); -+MODULE_LICENSE("GPL v2"); diff --git a/target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch b/target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch deleted file mode 100644 index 94a4776751..0000000000 --- a/target/linux/generic/backport-4.9/400-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cf589ce71e84d3b8811c65740645af254c5248c0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 9 May 2018 10:17:29 +0200 -Subject: [PATCH] mtd: bcm47xxpart: add of_match_table with a new DT binding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows using bcm47xxpart parser to find partitions on flash -described in DT using the "brcm,bcm947xx-cfe-partitions" compatible -property. It means this parser doesn't have to be explicitly selected by -a flash driver anymore. It can be used e.g. together with a generic -m25p80 / spi-nor if device is just properly described. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/bcm47xxpart.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #include - -@@ -304,9 +305,16 @@ static int bcm47xxpart_parse(struct mtd_ - return curr_part; - }; - -+static const struct of_device_id bcm47xxpart_of_match_table[] = { -+ { .compatible = "brcm,bcm947xx-cfe-partitions" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table); -+ - static struct mtd_part_parser bcm47xxpart_mtd_parser = { - .parse_fn = bcm47xxpart_parse, - .name = "bcm47xxpart", -+ .of_match_table = bcm47xxpart_of_match_table, - }; - module_mtd_part_parser(bcm47xxpart_mtd_parser); - diff --git a/target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch b/target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch deleted file mode 100644 index b92382c1e9..0000000000 --- a/target/linux/generic/backport-4.9/401-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 98534a58c8a40cdc9e3bcb04d74719fbcedfeb52 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 26 Jun 2018 00:05:08 +0200 -Subject: [PATCH] mtd: parsers: trx: add of_match_table with the new DT binding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows using TRX parser to find TRX partitions on flash device -described in DT using a proper binding. It's useful for devices storing -firmware on a separated flash and having rootfs partition in it. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/parsers/parser_trx.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/mtd/parsers/parser_trx.c -+++ b/drivers/mtd/parsers/parser_trx.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #define TRX_PARSER_MAX_PARTS 4 - -@@ -116,9 +117,16 @@ static int parser_trx_parse(struct mtd_i - return i; - }; - -+static const struct of_device_id mtd_parser_trx_of_match_table[] = { -+ { .compatible = "brcm,trx" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, mtd_parser_trx_of_match_table); -+ - static struct mtd_part_parser mtd_parser_trx = { - .parse_fn = parser_trx_parse, - .name = "trx", -+ .of_match_table = mtd_parser_trx_of_match_table, - }; - module_mtd_part_parser(mtd_parser_trx); - diff --git a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch deleted file mode 100644 index 758de9fdf3..0000000000 --- a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 76a832254ab05502c9394cc51ded6f0abe0e0bee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Fri, 13 Jul 2018 16:32:21 +0200 -Subject: [PATCH] mtd: partitions: use DT info for parsing partitions with - "compatible" prop -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -So far only flash devices could be described in DT regarding partitions -parsing. That could be done with "partitions" subnode and a proper -"compatible" string. - -Some devices may use hierarchical (multi-level) layouts and may mix used -layouts (fixed and dynamic). Describing that in DT is done by specifying -"compatible" for DT-represented partition plus optionally more -properties and/or subnodes. - -To support such layouts each DT partition has to be checked for -additional description. - -Please note this implementation will work in parallel with support for -partition type specified for non-DT setups. That already works since -commit 1a0915be1926 ("mtd: partitions: add support for partition -parsers"). - -Signed-off-by: Rafał Miłecki -Signed-off-by: Boris Brezillon ---- - drivers/mtd/mtdpart.c | 33 +++++++++++++-------------------- - 1 file changed, 13 insertions(+), 20 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -370,22 +370,6 @@ static inline void free_partition(struct - kfree(p); - } - --/** -- * mtd_parse_part - parse MTD partition looking for subpartitions -- * -- * @slave: part that is supposed to be a container and should be parsed -- * @types: NULL-terminated array with names of partition parsers to try -- * -- * Some partitions are kind of containers with extra subpartitions (volumes). -- * There can be various formats of such containers. This function tries to use -- * specified parsers to analyze given partition and registers found -- * subpartitions on success. -- */ --static int mtd_parse_part(struct mtd_part *slave, const char *const *types) --{ -- return parse_mtd_partitions(&slave->mtd, types, NULL); --} -- - static struct mtd_part *allocate_partition(struct mtd_info *parent, - const struct mtd_partition *part, int partno, - uint64_t cur_offset) -@@ -795,8 +779,8 @@ int add_mtd_partitions(struct mtd_info * - } - - mtd_add_partition_attrs(slave); -- if (parts[i].types) -- mtd_parse_part(slave, parts[i].types); -+ /* Look for subpartitions */ -+ parse_mtd_partitions(&slave->mtd, parts[i].types, NULL); - - cur_offset = slave->offset + slave->mtd.size; - } -@@ -877,6 +861,12 @@ static const char * const default_mtd_pa - NULL - }; - -+/* Check DT only when looking for subpartitions. */ -+static const char * const default_subpartition_types[] = { -+ "ofpart", -+ NULL -+}; -+ - static int mtd_part_do_parse(struct mtd_part_parser *parser, - struct mtd_info *master, - struct mtd_partitions *pparts, -@@ -947,7 +937,9 @@ static int mtd_part_of_parse(struct mtd_ - const char *fixed = "fixed-partitions"; - int ret, err = 0; - -- np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); -+ np = mtd_get_of_node(master); -+ if (!mtd_is_partition(master)) -+ np = of_get_child_by_name(np, "partitions"); - of_property_for_each_string(np, "compatible", prop, compat) { - parser = mtd_part_get_compatible_parser(compat); - if (!parser) -@@ -1010,7 +1002,8 @@ int parse_mtd_partitions(struct mtd_info - int ret, err = 0; - - if (!types) -- types = default_mtd_part_types; -+ types = mtd_is_partition(master) ? default_subpartition_types : -+ default_mtd_part_types; - - for ( ; *types; types++) { - /* diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 deleted file mode 100644 index d986ec3516..0000000000 --- a/target/linux/generic/config-4.9 +++ /dev/null @@ -1,5345 +0,0 @@ -CONFIG_32BIT=y -# CONFIG_6LOWPAN is not set -# CONFIG_6LOWPAN_DEBUGFS is not set -# CONFIG_6PACK is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_9P_FS is not set -# CONFIG_AB3100_CORE is not set -# CONFIG_AB8500_CORE is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_ACCESSIBILITY is not set -# CONFIG_ACENIC is not set -# CONFIG_ACERHDF is not set -# CONFIG_ACORN_PARTITION is not set -# CONFIG_ACPI_ALS is not set -# CONFIG_ACPI_APEI is not set -# CONFIG_ACPI_BUTTON is not set -# CONFIG_ACPI_CONFIGFS is not set -# CONFIG_ACPI_CUSTOM_METHOD is not set -# CONFIG_ACPI_EXTLOG is not set -# CONFIG_ACPI_HED is not set -# CONFIG_ACPI_NFIT is not set -# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set -# CONFIG_ACPI_TABLE_UPGRADE is not set -# CONFIG_ACPI_VIDEO is not set -# CONFIG_AD2S1200 is not set -# CONFIG_AD2S1210 is not set -# CONFIG_AD2S90 is not set -# CONFIG_AD5064 is not set -# CONFIG_AD525X_DPOT is not set -# CONFIG_AD5360 is not set -# CONFIG_AD5380 is not set -# CONFIG_AD5421 is not set -# CONFIG_AD5446 is not set -# CONFIG_AD5449 is not set -# CONFIG_AD5504 is not set -# CONFIG_AD5592R is not set -# CONFIG_AD5593R is not set -# CONFIG_AD5624R_SPI is not set -# CONFIG_AD5686 is not set -# CONFIG_AD5755 is not set -# CONFIG_AD5761 is not set -# CONFIG_AD5764 is not set -# CONFIG_AD5791 is not set -# CONFIG_AD5933 is not set -# CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set -# CONFIG_AD7192 is not set -# CONFIG_AD7266 is not set -# CONFIG_AD7280 is not set -# CONFIG_AD7291 is not set -# CONFIG_AD7298 is not set -# CONFIG_AD7303 is not set -# CONFIG_AD7476 is not set -# CONFIG_AD7606 is not set -# CONFIG_AD7746 is not set -# CONFIG_AD7780 is not set -# CONFIG_AD7791 is not set -# CONFIG_AD7793 is not set -# CONFIG_AD7816 is not set -# CONFIG_AD7887 is not set -# CONFIG_AD7923 is not set -# CONFIG_AD799X is not set -# CONFIG_AD8366 is not set -# CONFIG_AD8801 is not set -# CONFIG_AD9523 is not set -# CONFIG_AD9832 is not set -# CONFIG_AD9834 is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_ADE7753 is not set -# CONFIG_ADE7754 is not set -# CONFIG_ADE7758 is not set -# CONFIG_ADE7759 is not set -# CONFIG_ADE7854 is not set -# CONFIG_ADF4350 is not set -# CONFIG_ADFS_FS is not set -# CONFIG_ADIS16060 is not set -# CONFIG_ADIS16080 is not set -# CONFIG_ADIS16130 is not set -# CONFIG_ADIS16136 is not set -# CONFIG_ADIS16201 is not set -# CONFIG_ADIS16203 is not set -# CONFIG_ADIS16204 is not set -# CONFIG_ADIS16209 is not set -# CONFIG_ADIS16220 is not set -# CONFIG_ADIS16240 is not set -# CONFIG_ADIS16260 is not set -# CONFIG_ADIS16400 is not set -# CONFIG_ADIS16480 is not set -# CONFIG_ADJD_S311 is not set -# CONFIG_ADM6996_PHY is not set -# CONFIG_ADM8211 is not set -# CONFIG_ADT7316 is not set -CONFIG_ADVISE_SYSCALLS=y -# CONFIG_ADXRS450 is not set -CONFIG_AEABI=y -# CONFIG_AFE4403 is not set -# CONFIG_AFE4404 is not set -# CONFIG_AFFS_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AF_RXRPC_INJECT_LOSS is not set -# CONFIG_AF_RXRPC_IPV6 is not set -# CONFIG_AGP is not set -# CONFIG_AHCI_CEVA is not set -# CONFIG_AHCI_IMX is not set -# CONFIG_AHCI_MVEBU is not set -# CONFIG_AHCI_QORIQ is not set -CONFIG_AIO=y -# CONFIG_AIRO is not set -# CONFIG_AIRO_CS is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_AK09911 is not set -# CONFIG_AK8974 is not set -# CONFIG_AK8975 is not set -# CONFIG_AL3320A is not set -# CONFIG_ALIM7101_WDT is not set -CONFIG_ALLOW_DEV_COREDUMP=y -# CONFIG_ALTERA_MBOX is not set -# CONFIG_ALTERA_STAPL is not set -# CONFIG_ALTERA_TSE is not set -# CONFIG_ALX is not set -# CONFIG_AM2315 is not set -# CONFIG_AM335X_PHY_USB is not set -# CONFIG_AMBA_PL08X is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_AMD_PHY is not set -# CONFIG_AMD_XGBE is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_AMILO_RFKILL is not set -# CONFIG_ANDROID is not set -CONFIG_ANON_INODES=y -# CONFIG_APDS9300 is not set -# CONFIG_APDS9802ALS is not set -# CONFIG_APDS9960 is not set -# CONFIG_APM8018X is not set -# CONFIG_APM_EMULATION is not set -# CONFIG_APPLE_GMUX is not set -# CONFIG_APPLICOM is not set -# CONFIG_AQUANTIA_PHY is not set -# CONFIG_AR5523 is not set -# CONFIG_AR7 is not set -# CONFIG_AR8216_PHY is not set -# CONFIG_AR8216_PHY_LEDS is not set -# CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_ARTPEC is not set -# CONFIG_ARCH_ASPEED is not set -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_BCM is not set -# CONFIG_ARCH_BCM2835 is not set -# CONFIG_ARCH_BCM_21664 is not set -# CONFIG_ARCH_BCM_23550 is not set -# CONFIG_ARCH_BCM_281XX is not set -# CONFIG_ARCH_BCM_5301X is not set -# CONFIG_ARCH_BCM_53573 is not set -# CONFIG_ARCH_BCM_63XX is not set -# CONFIG_ARCH_BCM_CYGNUS is not set -# CONFIG_ARCH_BCM_IPROC is not set -# CONFIG_ARCH_BCM_NSP is not set -# CONFIG_ARCH_BERLIN is not set -# CONFIG_ARCH_BRCMSTB is not set -# CONFIG_ARCH_CLPS711X is not set -# CONFIG_ARCH_CNS3XXX is not set -# CONFIG_ARCH_DAVINCI is not set -# CONFIG_ARCH_DIGICOLOR is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set -# CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_EXYNOS is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_GEMINI is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y -# CONFIG_ARCH_HI3xxx is not set -# CONFIG_ARCH_HIGHBANK is not set -# CONFIG_ARCH_HISI is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_KEYSTONE is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_LAYERSCAPE is not set -# CONFIG_ARCH_LG1K is not set -# CONFIG_ARCH_LPC32XX is not set -# CONFIG_ARCH_MEDIATEK is not set -# CONFIG_ARCH_MESON is not set -CONFIG_ARCH_MMAP_RND_BITS=8 -CONFIG_ARCH_MMAP_RND_BITS_MAX=16 -CONFIG_ARCH_MMAP_RND_BITS_MIN=8 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 -# CONFIG_ARCH_MMP is not set -# CONFIG_ARCH_MULTIPLATFORM is not set -# CONFIG_ARCH_MULTI_V6 is not set -# CONFIG_ARCH_MULTI_V7 is not set -# CONFIG_ARCH_MV78XX0 is not set -# CONFIG_ARCH_MVEBU is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_MXS is not set -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_NOMADIK is not set -# CONFIG_ARCH_NSPIRE is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_OMAP1 is not set -# CONFIG_ARCH_OMAP2 is not set -# CONFIG_ARCH_OMAP2PLUS is not set -# CONFIG_ARCH_OMAP3 is not set -# CONFIG_ARCH_OMAP4 is not set -# CONFIG_ARCH_ORION5X is not set -# CONFIG_ARCH_OXNAS is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_PICOXCELL is not set -# CONFIG_ARCH_PRIMA2 is not set -# CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_RENESAS is not set -# CONFIG_ARCH_ROCKCHIP is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_S3C64XX is not set -# CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_SEATTLE is not set -# CONFIG_ARCH_SHMOBILE is not set -# CONFIG_ARCH_SHMOBILE_MULTI is not set -# CONFIG_ARCH_SIRF is not set -# CONFIG_ARCH_SOCFPGA is not set -# CONFIG_ARCH_SPRD is not set -# CONFIG_ARCH_STI is not set -# CONFIG_ARCH_STRATIX10 is not set -# CONFIG_ARCH_SUNXI is not set -# CONFIG_ARCH_TANGO is not set -# CONFIG_ARCH_TEGRA is not set -# CONFIG_ARCH_THUNDER is not set -# CONFIG_ARCH_U300 is not set -# CONFIG_ARCH_U8500 is not set -# CONFIG_ARCH_UNIPHIER is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_VEXPRESS is not set -# CONFIG_ARCH_VIRT is not set -# CONFIG_ARCH_VT8500 is not set -# CONFIG_ARCH_VULCAN is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set -# CONFIG_ARCH_WM8505 is not set -# CONFIG_ARCH_WM8750 is not set -# CONFIG_ARCH_WM8850 is not set -# CONFIG_ARCH_XGENE is not set -# CONFIG_ARCH_ZX is not set -# CONFIG_ARCH_ZYNQ is not set -# CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCNET is not set -# CONFIG_ARC_EMAC is not set -# CONFIG_ARM64_ERRATUM_1024718 is not set -# CONFIG_ARM64_ERRATUM_819472 is not set -# CONFIG_ARM64_ERRATUM_824069 is not set -# CONFIG_ARM64_ERRATUM_826319 is not set -# CONFIG_ARM64_ERRATUM_827319 is not set -# CONFIG_ARM64_ERRATUM_832075 is not set -# CONFIG_ARM64_ERRATUM_834220 is not set -# CONFIG_ARM64_ERRATUM_843419 is not set -# CONFIG_ARM64_ERRATUM_845719 is not set -# CONFIG_ARM_APPENDED_DTB is not set -# CONFIG_ARM_ARCH_TIMER is not set -# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set -# CONFIG_ARM_CCI is not set -# CONFIG_ARM_CCI400_PMU is not set -# CONFIG_ARM_CCI5xx_PMU is not set -# CONFIG_ARM_CCN is not set -# CONFIG_ARM_CPUIDLE is not set -CONFIG_ARM_CPU_TOPOLOGY=y -# CONFIG_ARM_CRYPTO is not set -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -# CONFIG_ARM_ERRATA_326103 is not set -# CONFIG_ARM_ERRATA_364296 is not set -# CONFIG_ARM_ERRATA_411920 is not set -# CONFIG_ARM_ERRATA_430973 is not set -# CONFIG_ARM_ERRATA_458693 is not set -# CONFIG_ARM_ERRATA_460075 is not set -# CONFIG_ARM_ERRATA_643719 is not set -# CONFIG_ARM_ERRATA_720789 is not set -# CONFIG_ARM_ERRATA_742230 is not set -# CONFIG_ARM_ERRATA_742231 is not set -# CONFIG_ARM_ERRATA_743622 is not set -# CONFIG_ARM_ERRATA_751472 is not set -# CONFIG_ARM_ERRATA_754322 is not set -# CONFIG_ARM_ERRATA_754327 is not set -# CONFIG_ARM_ERRATA_764369 is not set -# CONFIG_ARM_ERRATA_773022 is not set -# CONFIG_ARM_ERRATA_775420 is not set -# CONFIG_ARM_ERRATA_798181 is not set -# CONFIG_ARM_ERRATA_818325_852422 is not set -# CONFIG_ARM_ERRATA_821420 is not set -# CONFIG_ARM_ERRATA_825619 is not set -# CONFIG_ARM_ERRATA_852421 is not set -# CONFIG_ARM_ERRATA_852423 is not set -CONFIG_ARM_GIC_MAX_NR=1 -# CONFIG_ARM_KERNMEM_PERMS is not set -# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set -# CONFIG_ARM_KPROBES_TEST is not set -# CONFIG_ARM_MHU is not set -# CONFIG_ARM_MODULE_PLTS is not set -# CONFIG_ARM_PATCH_PHYS_VIRT is not set -# CONFIG_ARM_PSCI is not set -# CONFIG_ARM_PTDUMP is not set -# CONFIG_ARM_SBSA_WATCHDOG is not set -# CONFIG_ARM_SCPI_PROTOCOL is not set -# CONFIG_ARM_TIMER_SP804 is not set -# CONFIG_ARM_UNWIND is not set -# CONFIG_ARM_VIRT_EXT is not set -# CONFIG_AS3935 is not set -# CONFIG_ASM9260_TIMER is not set -# CONFIG_ASUS_LAPTOP is not set -# CONFIG_ASUS_WIRELESS is not set -# CONFIG_ASYMMETRIC_KEY_TYPE is not set -# CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set -# CONFIG_ASYNC_RAID6_TEST is not set -# CONFIG_ASYNC_TX_DMA is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_AT803X_PHY is not set -# CONFIG_AT91_SAMA5D2_ADC is not set -# CONFIG_ATA is not set -# CONFIG_ATAGS is not set -CONFIG_ATAGS_PROC=y -# CONFIG_ATALK is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_ATA_ACPI is not set -CONFIG_ATA_BMDMA=y -# CONFIG_ATA_GENERIC is not set -# CONFIG_ATA_NONSTANDARD is not set -# CONFIG_ATA_OVER_ETH is not set -# CONFIG_ATA_PIIX is not set -CONFIG_ATA_SFF=y -# CONFIG_ATA_VERBOSE_ERROR is not set -# CONFIG_ATH10K is not set -# CONFIG_ATH25 is not set -# CONFIG_ATH5K is not set -# CONFIG_ATH6KL is not set -# CONFIG_ATH79 is not set -# CONFIG_ATH9K is not set -# CONFIG_ATH9K_HTC is not set -# CONFIG_ATH_DEBUG is not set -# CONFIG_ATL1 is not set -# CONFIG_ATL1C is not set -# CONFIG_ATL1E is not set -# CONFIG_ATL2 is not set -# CONFIG_ATLAS_PH_SENSOR is not set -# CONFIG_ATM is not set -# CONFIG_ATMEL is not set -# CONFIG_ATMEL_PIT is not set -# CONFIG_ATMEL_SSC is not set -# CONFIG_ATM_AMBASSADOR is not set -# CONFIG_ATM_BR2684 is not set -CONFIG_ATM_BR2684_IPFILTER=y -# CONFIG_ATM_CLIP is not set -CONFIG_ATM_CLIP_NO_ICMP=y -# CONFIG_ATM_DRIVERS is not set -# CONFIG_ATM_DUMMY is not set -# CONFIG_ATM_ENI is not set -# CONFIG_ATM_FIRESTREAM is not set -# CONFIG_ATM_FORE200E is not set -# CONFIG_ATM_HE is not set -# CONFIG_ATM_HORIZON is not set -# CONFIG_ATM_IA is not set -# CONFIG_ATM_IDT77252 is not set -# CONFIG_ATM_LANAI is not set -# CONFIG_ATM_LANE is not set -# CONFIG_ATM_MPOA is not set -# CONFIG_ATM_NICSTAR is not set -# CONFIG_ATM_SOLOS is not set -# CONFIG_ATM_TCP is not set -# CONFIG_ATM_ZATM is not set -# CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_ATP is not set -# CONFIG_AUDIT is not set -# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_AURORA_NB8800 is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_AUTO_ZRELADDR is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_AX25 is not set -# CONFIG_AX25_DAMA_SLAVE is not set -# CONFIG_AX88796 is not set -# CONFIG_AXP288_ADC is not set -# CONFIG_AXP288_FUEL_GAUGE is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_B44 is not set -# CONFIG_B53 is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_APPLE is not set -# CONFIG_BACKLIGHT_BD6107 is not set -# CONFIG_BACKLIGHT_GENERIC is not set -# CONFIG_BACKLIGHT_GPIO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -# CONFIG_BACKLIGHT_LM3630A is not set -# CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_LV5207LP is not set -# CONFIG_BACKLIGHT_PANDORA is not set -# CONFIG_BACKLIGHT_PM8941_WLED is not set -# CONFIG_BACKLIGHT_RPI is not set -# CONFIG_BACKLIGHT_SAHARA is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -CONFIG_BASE_FULL=y -CONFIG_BASE_SMALL=0 -# CONFIG_BATMAN_ADV is not set -# CONFIG_BATTERY_BQ27XXX is not set -# CONFIG_BATTERY_DS2760 is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_BATTERY_SBS is not set -# CONFIG_BAYCOM_EPP is not set -# CONFIG_BAYCOM_PAR is not set -# CONFIG_BAYCOM_SER_FDX is not set -# CONFIG_BAYCOM_SER_HDX is not set -# CONFIG_BCACHE is not set -# CONFIG_BCM47XX is not set -# CONFIG_BCM63XX is not set -# CONFIG_BCM63XX_PHY is not set -# CONFIG_BCM7038_WDT is not set -# CONFIG_BCM7XXX_PHY is not set -# CONFIG_BCM87XX_PHY is not set -# CONFIG_BCMA is not set -# CONFIG_BCMA_DRIVER_GPIO is not set -CONFIG_BCMA_POSSIBLE=y -# CONFIG_BCMGENET is not set -# CONFIG_BCM_IPROC_ADC is not set -# CONFIG_BCM_KONA_USB2_PHY is not set -# CONFIG_BDI_SWITCH is not set -# CONFIG_BE2ISCSI is not set -# CONFIG_BE2NET is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_BGMAC is not set -# CONFIG_BH1750 is not set -# CONFIG_BH1780 is not set -# CONFIG_BIG_KEYS is not set -# CONFIG_BIG_LITTLE is not set -# CONFIG_BINARY_PRINTF is not set -# CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_FLAT is not set -# CONFIG_BINFMT_MISC is not set -CONFIG_BINFMT_SCRIPT=y -CONFIG_BITREVERSE=y -# CONFIG_BLK_CMDLINE_PARSER is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_CPQ_DA is not set -CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_BLK_DEV_4DRIVES is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI14XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_ATIIXP is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_BSGLIB is not set -# CONFIG_BLK_DEV_CMD640 is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_CS5535 is not set -# CONFIG_BLK_DEV_CS5536 is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_DELKIN is not set -# CONFIG_BLK_DEV_DRBD is not set -# CONFIG_BLK_DEV_DTC2278 is not set -# CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_HD is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_HT6560B is not set -# CONFIG_BLK_DEV_IDEACPI is not set -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDECS is not set -# CONFIG_BLK_DEV_IDEPCI is not set -# CONFIG_BLK_DEV_IDEPNP is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDE_AU1XXX is not set -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_INITRD=y -# CONFIG_BLK_DEV_INTEGRITY is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_BLK_DEV_IT8172 is not set -# CONFIG_BLK_DEV_IT8213 is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_LOOP is not set -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_BLK_DEV_NVME is not set -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_PLATFORM is not set -# CONFIG_BLK_DEV_PMEM is not set -# CONFIG_BLK_DEV_QD65XX is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_RBD is not set -# CONFIG_BLK_DEV_RSXX is not set -# CONFIG_BLK_DEV_RZ1000 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_SD is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SIS5513 is not set -# CONFIG_BLK_DEV_SKD is not set -# CONFIG_BLK_DEV_SL82C105 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_TC86C001 is not set -# CONFIG_BLK_DEV_THROTTLING is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_UMC8672 is not set -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -CONFIG_BLOCK=y -# CONFIG_BMA180 is not set -# CONFIG_BMA220 is not set -# CONFIG_BMC150_ACCEL is not set -# CONFIG_BMC150_MAGN is not set -# CONFIG_BMC150_MAGN_I2C is not set -# CONFIG_BMC150_MAGN_SPI is not set -# CONFIG_BMG160 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set -# CONFIG_BMIPS_GENERIC is not set -# CONFIG_BMP085 is not set -# CONFIG_BMP085_I2C is not set -# CONFIG_BMP085_SPI is not set -# CONFIG_BMP280 is not set -# CONFIG_BNA is not set -# CONFIG_BNX2 is not set -# CONFIG_BNX2X is not set -# CONFIG_BNXT is not set -# CONFIG_BONDING is not set -# CONFIG_BOOKE_WDT is not set -CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3 -# CONFIG_BOOT_PRINTK_DELAY is not set -CONFIG_BOOT_RAW=y -CONFIG_BPF=y -CONFIG_BPF_JIT=y -CONFIG_BPF_SYSCALL=y -# CONFIG_BPQETHER is not set -CONFIG_BQL=y -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_BRCMFMAC is not set -# CONFIG_BRCMSMAC is not set -# CONFIG_BRCMSTB_GISB_ARB is not set -CONFIG_BRIDGE=y -# CONFIG_BRIDGE_EBT_802_3 is not set -# CONFIG_BRIDGE_EBT_AMONG is not set -# CONFIG_BRIDGE_EBT_ARP is not set -# CONFIG_BRIDGE_EBT_ARPREPLY is not set -# CONFIG_BRIDGE_EBT_BROUTE is not set -# CONFIG_BRIDGE_EBT_DNAT is not set -# CONFIG_BRIDGE_EBT_IP is not set -# CONFIG_BRIDGE_EBT_IP6 is not set -# CONFIG_BRIDGE_EBT_LIMIT is not set -# CONFIG_BRIDGE_EBT_LOG is not set -# CONFIG_BRIDGE_EBT_MARK is not set -# CONFIG_BRIDGE_EBT_MARK_T is not set -# CONFIG_BRIDGE_EBT_NFLOG is not set -# CONFIG_BRIDGE_EBT_PKTTYPE is not set -# CONFIG_BRIDGE_EBT_REDIRECT is not set -# CONFIG_BRIDGE_EBT_SNAT is not set -# CONFIG_BRIDGE_EBT_STP is not set -# CONFIG_BRIDGE_EBT_T_FILTER is not set -# CONFIG_BRIDGE_EBT_T_NAT is not set -# CONFIG_BRIDGE_EBT_VLAN is not set -CONFIG_BRIDGE_IGMP_SNOOPING=y -# CONFIG_BRIDGE_NETFILTER is not set -# CONFIG_BRIDGE_NF_EBTABLES is not set -CONFIG_BRIDGE_VLAN_FILTERING=y -# CONFIG_BROADCOM_PHY is not set -CONFIG_BROKEN_ON_SMP=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_BT is not set -# CONFIG_BTRFS_ASSERT is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_FS is not set -# CONFIG_BTRFS_FS_POSIX_ACL is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BT_ATH3K is not set -# CONFIG_BT_BNEP is not set -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -# CONFIG_BT_BREDR is not set -# CONFIG_BT_CMTP is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBTSDIO is not set -# CONFIG_BT_HCIBTUART is not set -# CONFIG_BT_HCIBTUSB is not set -# CONFIG_BT_HCIBTUSB_RTL is not set -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIUART is not set -# CONFIG_BT_HCIUART_3WIRE is not set -# CONFIG_BT_HCIUART_AG6XX is not set -# CONFIG_BT_HCIUART_ATH3K is not set -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIUART_MRVL is not set -# CONFIG_BT_HCIUART_QCA is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_HIDP is not set -# CONFIG_BT_HS is not set -# CONFIG_BT_LE is not set -# CONFIG_BT_LEDS is not set -# CONFIG_BT_MRVL is not set -# CONFIG_BT_RFCOMM is not set -CONFIG_BT_RFCOMM_TTY=y -# CONFIG_BT_SELFTEST is not set -CONFIG_BUG=y -CONFIG_BUILDTIME_EXTABLE_SORT=y -# CONFIG_BUILD_BIN2C is not set -# CONFIG_C2PORT is not set -CONFIG_CACHE_L2X0_PMU=y -# CONFIG_CADENCE_WATCHDOG is not set -# CONFIG_CAIF is not set -# CONFIG_CAN is not set -# CONFIG_CAN_BCM is not set -# CONFIG_CAN_DEBUG_DEVICES is not set -# CONFIG_CAN_DEV is not set -# CONFIG_CAN_GS_USB is not set -# CONFIG_CAN_GW is not set -# CONFIG_CAN_IFI_CANFD is not set -# CONFIG_CAN_M_CAN is not set -# CONFIG_CAN_RAW is not set -# CONFIG_CAN_RCAR is not set -# CONFIG_CAN_RCAR_CANFD is not set -# CONFIG_CAN_SLCAN is not set -# CONFIG_CAN_SUN4I is not set -# CONFIG_CAN_VCAN is not set -# CONFIG_CAPI_AVM is not set -# CONFIG_CAPI_EICON is not set -# CONFIG_CAPI_TRACE is not set -CONFIG_CARDBUS=y -# CONFIG_CARDMAN_4000 is not set -# CONFIG_CARDMAN_4040 is not set -# CONFIG_CARL9170 is not set -# CONFIG_CASSINI is not set -# CONFIG_CAVIUM_ERRATUM_22375 is not set -# CONFIG_CAVIUM_ERRATUM_23144 is not set -# CONFIG_CAVIUM_ERRATUM_23154 is not set -# CONFIG_CAVIUM_ERRATUM_27456 is not set -# CONFIG_CAVIUM_OCTEON_SOC is not set -# CONFIG_CB710_CORE is not set -# CONFIG_CC10001_ADC is not set -# CONFIG_CC_STACKPROTECTOR is not set -CONFIG_CC_STACKPROTECTOR_NONE=y -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_CEPH_FS is not set -# CONFIG_CEPH_LIB is not set -# CONFIG_CFG80211 is not set -# CONFIG_CFG80211_CERTIFICATION_ONUS is not set -# CONFIG_CGROUPS is not set -# CONFIG_CGROUP_DEBUG is not set -# CONFIG_CGROUP_NET_CLASSID is not set -# CONFIG_CGROUP_NET_PRIO is not set -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_BQ24190 is not set -# CONFIG_CHARGER_BQ24257 is not set -# CONFIG_CHARGER_BQ24735 is not set -# CONFIG_CHARGER_BQ25890 is not set -# CONFIG_CHARGER_GPIO is not set -# CONFIG_CHARGER_ISP1704 is not set -# CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_MANAGER is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_RT9455 is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_CHARGER_TWL4030 is not set -# CONFIG_CHECKPOINT_RESTORE is not set -# CONFIG_CHELSIO_T1 is not set -# CONFIG_CHELSIO_T3 is not set -# CONFIG_CHELSIO_T4 is not set -# CONFIG_CHELSIO_T4VF is not set -# CONFIG_CHROME_PLATFORMS is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_CHR_DEV_SCH is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_CIFS is not set -# CONFIG_CIFS_ACL is not set -# CONFIG_CIFS_DEBUG is not set -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_FSCACHE is not set -# CONFIG_CIFS_NFSD_EXPORT is not set -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB2 is not set -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIO_DAC is not set -# CONFIG_CLEANCACHE is not set -# CONFIG_CLKSRC_VERSATILE is not set -# CONFIG_CLK_QORIQ is not set -# CONFIG_CLOCK_THERMAL is not set -CONFIG_CLS_U32_MARK=y -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CM32181 is not set -# CONFIG_CM3232 is not set -# CONFIG_CM3323 is not set -# CONFIG_CM36651 is not set -# CONFIG_CMA is not set -CONFIG_CMDLINE="" -# CONFIG_CMDLINE_BOOL is not set -# CONFIG_CMDLINE_EXTEND is not set -# CONFIG_CMDLINE_FORCE is not set -# CONFIG_CMDLINE_FROM_BOOTLOADER is not set -# CONFIG_CMDLINE_PARTITION is not set -# CONFIG_CNIC is not set -# CONFIG_CODA_FS is not set -# CONFIG_CODE_PATCHING_SELFTEST is not set -# CONFIG_COMEDI is not set -# CONFIG_COMMON_CLK_CDCE706 is not set -# CONFIG_COMMON_CLK_CDCE925 is not set -# CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_IPROC is not set -# CONFIG_COMMON_CLK_NXP is not set -# CONFIG_COMMON_CLK_PIC32 is not set -# CONFIG_COMMON_CLK_PWM is not set -# CONFIG_COMMON_CLK_PXA is not set -# CONFIG_COMMON_CLK_QCOM is not set -# CONFIG_COMMON_CLK_SI514 is not set -# CONFIG_COMMON_CLK_SI5351 is not set -# CONFIG_COMMON_CLK_SI570 is not set -# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set -CONFIG_COMPACTION=y -# CONFIG_COMPAL_LAPTOP is not set -# CONFIG_COMPAT is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_COMPILE_TEST is not set -# CONFIG_CONFIGFS_FS is not set -# CONFIG_CONNECTOR is not set -CONFIG_CONSTRUCTORS=y -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_COPS is not set -# CONFIG_CORDIC is not set -# CONFIG_COREDUMP is not set -# CONFIG_CORESIGHT is not set -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_CPA_DEBUG is not set -# CONFIG_CPU_DCACHE_DISABLE is not set -# CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_IDLE is not set -# CONFIG_CPU_IDLE_GOV_MENU is not set -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set -# CONFIG_CPU_NO_EFFICIENT_FFS is not set -CONFIG_CPU_SW_DOMAIN_PAN=y -# CONFIG_CRAMFS is not set -CONFIG_CRASHLOG=y -# CONFIG_CRASH_DUMP is not set -# CONFIG_CRC16 is not set -CONFIG_CRC32=y -# CONFIG_CRC32_BIT is not set -CONFIG_CRC32_SARWATE=y -# CONFIG_CRC32_SELFTEST is not set -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SLICEBY8 is not set -# CONFIG_CRC7 is not set -# CONFIG_CRC8 is not set -# CONFIG_CRC_CCITT is not set -# CONFIG_CRC_ITU_T is not set -# CONFIG_CRC_T10DIF is not set -CONFIG_CROSS_COMPILE="" -# CONFIG_CROSS_MEMORY_ATTACH is not set -CONFIG_CRYPTO=y -# CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_AEAD is not set -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_AES_586 is not set -# CONFIG_CRYPTO_AES_ARM is not set -# CONFIG_CRYPTO_AES_ARM_BS is not set -# CONFIG_CRYPTO_AES_NI_INTEL is not set -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_ARC4 is not set -# CONFIG_CRYPTO_AUTHENC is not set -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_CBC is not set -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_CHACHA20 is not set -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set -# CONFIG_CRYPTO_CMAC is not set -# CONFIG_CRYPTO_CRC32 is not set -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_CRC32C_INTEL is not set -# CONFIG_CRYPTO_CRCT10DIF is not set -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_DEV_ATMEL_AES is not set -# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set -# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set -# CONFIG_CRYPTO_DEV_CCP is not set -# CONFIG_CRYPTO_DEV_FSL_CAAM is not set -# CONFIG_CRYPTO_DEV_HIFN_795X is not set -# CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set -# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set -# CONFIG_CRYPTO_DEV_MV_CESA is not set -# CONFIG_CRYPTO_DEV_MXC_SCC is not set -# CONFIG_CRYPTO_DEV_MXS_DCP is not set -# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set -# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set -# CONFIG_CRYPTO_DEV_QAT_C62X is not set -# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set -# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set -# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set -# CONFIG_CRYPTO_DEV_QCE is not set -# CONFIG_CRYPTO_DEV_SAHARA is not set -# CONFIG_CRYPTO_DEV_TALITOS is not set -# CONFIG_CRYPTO_DH is not set -# CONFIG_CRYPTO_DRBG_CTR is not set -# CONFIG_CRYPTO_DRBG_HASH is not set -# CONFIG_CRYPTO_DRBG_MENU is not set -# CONFIG_CRYPTO_ECB is not set -# CONFIG_CRYPTO_ECDH is not set -# CONFIG_CRYPTO_ECHAINIV is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_FIPS is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_GHASH is not set -# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set -# CONFIG_CRYPTO_HASH is not set -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_HW is not set -# CONFIG_CRYPTO_JITTERENTROPY is not set -# CONFIG_CRYPTO_KEYWRAP is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_LZ4 is not set -# CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_LZO is not set -# CONFIG_CRYPTO_MANAGER is not set -# CONFIG_CRYPTO_MANAGER2 is not set -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -# CONFIG_CRYPTO_MCRYPTD is not set -# CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_PCOMP is not set -# CONFIG_CRYPTO_PCOMP2 is not set -CONFIG_CRYPTO_PCRYPT=y -# CONFIG_CRYPTO_POLY1305 is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_RNG is not set -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_586 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SEQIV is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA1_ARM is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA3 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TEST is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_TWOFISH_586 is not set -# CONFIG_CRYPTO_TWOFISH_COMMON is not set -# CONFIG_CRYPTO_USER is not set -# CONFIG_CRYPTO_USER_API_AEAD is not set -# CONFIG_CRYPTO_USER_API_HASH is not set -# CONFIG_CRYPTO_USER_API_RNG is not set -# CONFIG_CRYPTO_USER_API_SKCIPHER is not set -# CONFIG_CRYPTO_VMAC is not set -# CONFIG_CRYPTO_WP512 is not set -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_XTS is not set -# CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CS5535_MFGPT is not set -# CONFIG_CS89x0 is not set -# CONFIG_CUSE is not set -# CONFIG_CW1200 is not set -# CONFIG_CXL_AFU_DRIVER_OPS is not set -# CONFIG_CXL_BASE is not set -# CONFIG_CXL_EEH is not set -# CONFIG_CXL_KERNEL_API is not set -# CONFIG_CYPRESS_FIRMWARE is not set -# CONFIG_DAVICOM_PHY is not set -# CONFIG_DCB is not set -# CONFIG_DDR is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_CREDENTIALS is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_DEBUG_FS=y -# CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_ICEDCC is not set -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_INFO_DWARF4 is not set -CONFIG_DEBUG_INFO_REDUCED=y -# CONFIG_DEBUG_INFO_SPLIT is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_KOBJECT_RELEASE is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_LL is not set -# CONFIG_DEBUG_LL_UART_8250 is not set -# CONFIG_DEBUG_LL_UART_PL01X is not set -# CONFIG_DEBUG_LOCKDEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_NX_TEST is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_PAGE_REF is not set -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_PINCTRL is not set -# CONFIG_DEBUG_PI_LIST is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_RODATA is not set -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -# CONFIG_DEBUG_SEMIHOSTING is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_SHIRQ is not set -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_STACKOVERFLOW is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set -# CONFIG_DEBUG_TIMEKEEPING is not set -# CONFIG_DEBUG_UART_8250_PALMCHIP is not set -# CONFIG_DEBUG_UART_BCM63XX is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_WX is not set -# CONFIG_DEBUG_ZBOOT is not set -# CONFIG_DECNET is not set -CONFIG_DEFAULT_CUBIC=y -CONFIG_DEFAULT_DEADLINE=y -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_DEFAULT_IOSCHED="deadline" -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_DEFAULT_NOOP is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_SECURITY="" -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -# CONFIG_DELL_RBTN is not set -# CONFIG_DELL_SMO8800 is not set -# CONFIG_DEPRECATED_PARAM_STRUCT is not set -# CONFIG_DETECT_HUNG_TASK is not set -# CONFIG_DEVKMEM is not set -# CONFIG_DEVMEM is not set -CONFIG_DEVPORT=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_DEVTMPFS is not set -# CONFIG_DEVTMPFS_MOUNT is not set -# CONFIG_DGAP is not set -# CONFIG_DGNC is not set -# CONFIG_DHT11 is not set -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set -# CONFIG_DISPLAY_CONNECTOR_DVI is not set -# CONFIG_DISPLAY_CONNECTOR_HDMI is not set -# CONFIG_DISPLAY_ENCODER_TFP410 is not set -# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set -# CONFIG_DISPLAY_PANEL_DPI is not set -# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set -# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set -# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set -# CONFIG_DL2K is not set -# CONFIG_DLM is not set -# CONFIG_DM9000 is not set -# CONFIG_DMADEVICES is not set -# CONFIG_DMADEVICES_DEBUG is not set -# CONFIG_DMARD06 is not set -# CONFIG_DMARD09 is not set -# CONFIG_DMASCC is not set -# CONFIG_DMATEST is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_DMA_ENGINE is not set -# CONFIG_DMA_SHARED_BUFFER is not set -# CONFIG_DM_CACHE is not set -# CONFIG_DM_DEBUG is not set -# CONFIG_DM_DELAY is not set -# CONFIG_DM_ERA is not set -# CONFIG_DM_FLAKEY is not set -# CONFIG_DM_LOG_USERSPACE is not set -# CONFIG_DM_LOG_WRITES is not set -# CONFIG_DM_MQ_DEFAULT is not set -# CONFIG_DM_MULTIPATH is not set -# CONFIG_DM_RAID is not set -# CONFIG_DM_SWITCH is not set -# CONFIG_DM_THIN_PROVISIONING is not set -# CONFIG_DM_UEVENT is not set -# CONFIG_DM_VERITY is not set -# CONFIG_DM_ZERO is not set -# CONFIG_DNET is not set -# CONFIG_DNOTIFY is not set -# CONFIG_DNS_RESOLVER is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_DP83848_PHY is not set -# CONFIG_DP83867_PHY is not set -CONFIG_DQL=y -# CONFIG_DRAGONRISE_FF is not set -# CONFIG_DRM is not set -# CONFIG_DRM_AMDGPU is not set -# CONFIG_DRM_ANALOGIX_ANX78XX is not set -# CONFIG_DRM_ARCPGU is not set -# CONFIG_DRM_ARMADA is not set -# CONFIG_DRM_AST is not set -# CONFIG_DRM_BOCHS is not set -# CONFIG_DRM_CIRRUS_QEMU is not set -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DUMB_VGA_DAC is not set -# CONFIG_DRM_ETNAVIV is not set -# CONFIG_DRM_EXYNOS is not set -# CONFIG_DRM_FBDEV_EMULATION is not set -# CONFIG_DRM_FSL_DCU is not set -# CONFIG_DRM_HDLCD is not set -# CONFIG_DRM_HISI_KIRIN is not set -# CONFIG_DRM_I2C_ADV7511 is not set -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_NXP_TDA998X is not set -# CONFIG_DRM_I2C_SIL164 is not set -# CONFIG_DRM_LEGACY is not set -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set -# CONFIG_DRM_MALI_DISPLAY is not set -# CONFIG_DRM_MGAG200 is not set -# CONFIG_DRM_NOUVEAU is not set -# CONFIG_DRM_NXP_PTN3460 is not set -# CONFIG_DRM_OMAP is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set -# CONFIG_DRM_PANEL_LG_LG4573 is not set -# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set -# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set -# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set -# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set -# CONFIG_DRM_PARADE_PS8622 is not set -# CONFIG_DRM_QXL is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_SII902X is not set -# CONFIG_DRM_STI is not set -# CONFIG_DRM_SUN4I is not set -# CONFIG_DRM_TILCDC is not set -# CONFIG_DRM_TOSHIBA_TC358767 is not set -# CONFIG_DRM_UDL is not set -# CONFIG_DRM_VGEM is not set -# CONFIG_DRM_VIRTIO_GPU is not set -# CONFIG_DS1682 is not set -# CONFIG_DS1803 is not set -# CONFIG_DST_CACHE is not set -# CONFIG_DTLK is not set -# CONFIG_DUMMY is not set -CONFIG_DUMMY_CONSOLE_COLUMNS=80 -CONFIG_DUMMY_CONSOLE_ROWS=25 -# CONFIG_DUMMY_IRQ is not set -# CONFIG_DVB_AU8522_V4L is not set -# CONFIG_DVB_CORE is not set -# CONFIG_DVB_DUMMY_FE is not set -# CONFIG_DVB_TUNER_DIB0070 is not set -# CONFIG_DVB_TUNER_DIB0090 is not set -# CONFIG_DWMAC_IPQ806X is not set -# CONFIG_DWMAC_LPC18XX is not set -# CONFIG_DWMAC_MESON is not set -# CONFIG_DWMAC_ROCKCHIP is not set -# CONFIG_DWMAC_SOCFPGA is not set -# CONFIG_DWMAC_STI is not set -# CONFIG_DW_DMAC is not set -# CONFIG_DW_DMAC_PCI is not set -# CONFIG_DW_WATCHDOG is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_E100 is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set -# CONFIG_E1000E_HWTS is not set -# CONFIG_EARLY_PRINTK_8250 is not set -# CONFIG_ECHO is not set -# CONFIG_ECRYPT_FS is not set -# CONFIG_EDAC is not set -# CONFIG_EEEPC_LAPTOP is not set -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_EEPROM_93XX46 is not set -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_DIGSY_MTC_CFG is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set -# CONFIG_EFI is not set -CONFIG_EFI_PARTITION=y -# CONFIG_EFS_FS is not set -CONFIG_ELFCORE=y -# CONFIG_ELF_CORE is not set -# CONFIG_EMAC_ROCKCHIP is not set -CONFIG_EMBEDDED=y -# CONFIG_EM_TIMER_STI is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_ENABLE_WARN_DEPRECATED=y -# CONFIG_ENA_ETHERNET is not set -# CONFIG_ENC28J60 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_ENCRYPTED_KEYS is not set -# CONFIG_ENCX24J600 is not set -# CONFIG_ENIC is not set -# CONFIG_EPAPR_PARAVIRT is not set -# CONFIG_EPIC100 is not set -CONFIG_EPOLL=y -# CONFIG_EQUALIZER is not set -# CONFIG_ET131X is not set -CONFIG_ETHERNET=y -# CONFIG_ETHOC is not set -CONFIG_EVENTFD=y -CONFIG_EXPERT=y -# CONFIG_EXPORTFS is not set -# CONFIG_EXPORTFS_BLOCK_OPS is not set -# CONFIG_EXT2_FS is not set -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT3_FS is not set -# CONFIG_EXT4_DEBUG is not set -# CONFIG_EXT4_ENCRYPTION is not set -# CONFIG_EXT4_FS is not set -# CONFIG_EXT4_FS_POSIX_ACL is not set -# CONFIG_EXT4_FS_SECURITY is not set -CONFIG_EXT4_USE_FOR_EXT2=y -# CONFIG_EXTCON is not set -# CONFIG_EXTCON_ADC_JACK is not set -# CONFIG_EXTCON_AXP288 is not set -# CONFIG_EXTCON_GPIO is not set -# CONFIG_EXTCON_MAX3355 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set -# CONFIG_EXTCON_RT8973A is not set -# CONFIG_EXTCON_SM5502 is not set -# CONFIG_EXTCON_USB_GPIO is not set -CONFIG_EXTRA_FIRMWARE="" -CONFIG_EXTRA_TARGETS="" -# CONFIG_EXYNOS_ADC is not set -# CONFIG_EXYNOS_VIDEO is not set -# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set -# CONFIG_F2FS_FS_POSIX_ACL is not set -# CONFIG_F2FS_IO_TRACE is not set -# CONFIG_FAIR_GROUP_SCHED is not set -# CONFIG_FANOTIFY is not set -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_FAT_FS is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_FB is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_ARMCLCD is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_AUO_K190X is not set -# CONFIG_FB_BACKLIGHT is not set -# CONFIG_FB_BIG_ENDIAN is not set -# CONFIG_FB_BOOT_VESA_SUPPORT is not set -# CONFIG_FB_BOTH_ENDIAN is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_CFB_COPYAREA is not set -# CONFIG_FB_CFB_FILLRECT is not set -# CONFIG_FB_CFB_IMAGEBLIT is not set -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_DA8XX is not set -# CONFIG_FB_DDC is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set -# CONFIG_FB_HGA is not set -# CONFIG_FB_I740 is not set -# CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_IMX is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_LITTLE_ENDIAN is not set -# CONFIG_FB_MACMODES is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_MXS is not set -# CONFIG_FB_N411 is not set -# CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NOTIFY=y -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_OF is not set -# CONFIG_FB_OMAP2 is not set -# CONFIG_FB_OPENCORES is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_PS3 is not set -# CONFIG_FB_PXA is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIMPLE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_SM712 is not set -# CONFIG_FB_SM750 is not set -# CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set -# CONFIG_FB_SVGALIB is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_FOPS is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_TFT is not set -# CONFIG_FB_TILEBLITTING is not set -# CONFIG_FB_TMIO is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_UDL is not set -# CONFIG_FB_UVESA is not set -# CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set -# CONFIG_FCOE is not set -# CONFIG_FCOE_FNIC is not set -# CONFIG_FDDI is not set -# CONFIG_FEALNX is not set -# CONFIG_FENCE_TRACE is not set -# CONFIG_FHANDLE is not set -CONFIG_FIB_RULES=y -CONFIG_FILE_LOCKING=y -# CONFIG_FIREWIRE is not set -# CONFIG_FIREWIRE_NOSY is not set -# CONFIG_FIREWIRE_SERIAL is not set -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FIRMWARE_IN_KERNEL is not set -# CONFIG_FIRMWARE_MEMMAP is not set -# CONFIG_FIXED_PHY is not set -CONFIG_FLATMEM=y -CONFIG_FLATMEM_MANUAL=y -CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_FM10K is not set -# CONFIG_FMC is not set -# CONFIG_FORCEDETH is not set -CONFIG_FORCE_MAX_ZONEORDER=11 -# CONFIG_FPGA is not set -# CONFIG_FRAMEBUFFER_CONSOLE is not set -# CONFIG_FRAME_POINTER is not set -CONFIG_FRAME_WARN=1024 -# CONFIG_FREEZER is not set -# CONFIG_FRONTSWAP is not set -# CONFIG_FSCACHE is not set -# CONFIG_FSL_EDMA is not set -# CONFIG_FSL_MC_BUS is not set -# CONFIG_FSL_PQ_MDIO is not set -# CONFIG_FSL_XGMAC_MDIO is not set -CONFIG_FSNOTIFY=y -# CONFIG_FS_DAX is not set -# CONFIG_FS_ENCRYPTION is not set -# CONFIG_FS_POSIX_ACL is not set -# CONFIG_FTGMAC100 is not set -# CONFIG_FTL is not set -# CONFIG_FTMAC100 is not set -# CONFIG_FTRACE is not set -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_FTR_FIXUP_SELFTEST is not set -# CONFIG_FUJITSU_ES is not set -# CONFIG_FUJITSU_LAPTOP is not set -# CONFIG_FUJITSU_TABLET is not set -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_FUSE_FS is not set -# CONFIG_FUSION is not set -# CONFIG_FUSION_FC is not set -# CONFIG_FUSION_SAS is not set -# CONFIG_FUSION_SPI is not set -CONFIG_FUTEX=y -# CONFIG_FW_CFG_SYSFS is not set -CONFIG_FW_LOADER=y -CONFIG_FW_LOADER_USER_HELPER=y -CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -CONFIG_GACT_PROB=y -# CONFIG_GADGET_UAC1 is not set -# CONFIG_GAMEPORT is not set -# CONFIG_GATEWORKS_GW16083 is not set -# CONFIG_GCC_PLUGINS is not set -# CONFIG_GCOV is not set -# CONFIG_GCOV_KERNEL is not set -# CONFIG_GDB_SCRIPTS is not set -# CONFIG_GENERIC_ADC_BATTERY is not set -# CONFIG_GENERIC_ADC_THERMAL is not set -CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_NET_UTILS=y -# CONFIG_GENERIC_PHY is not set -# CONFIG_GENEVE is not set -# CONFIG_GENWQE is not set -# CONFIG_GFS2_FS is not set -# CONFIG_GIGASET_CAPI is not set -# CONFIG_GIGASET_DEBUG is not set -# CONFIG_GIGASET_DUMMYLL is not set -# CONFIG_GLOB_SELFTEST is not set -# CONFIG_GOLDFISH is not set -# CONFIG_GP2AP020A00F is not set -# CONFIG_GPIOLIB is not set -# CONFIG_GPIO_74X164 is not set -# CONFIG_GPIO_74XX_MMIO is not set -# CONFIG_GPIO_ADNP is not set -# CONFIG_GPIO_ADP5588 is not set -# CONFIG_GPIO_ALTERA is not set -# CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set -# CONFIG_GPIO_BCM_KONA is not set -# CONFIG_GPIO_BT8XX is not set -# CONFIG_GPIO_CS5535 is not set -# CONFIG_GPIO_DWAPB is not set -# CONFIG_GPIO_EM is not set -# CONFIG_GPIO_F7188X is not set -# CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_GPIO_MM is not set -# CONFIG_GPIO_GRGPIO is not set -# CONFIG_GPIO_ICH is not set -# CONFIG_GPIO_IT87 is not set -# CONFIG_GPIO_LYNXPOINT is not set -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_ML_IOH is not set -# CONFIG_GPIO_MOCKUP is not set -# CONFIG_GPIO_MPC8XXX is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set -# CONFIG_GPIO_PCH is not set -# CONFIG_GPIO_PISOSR is not set -# CONFIG_GPIO_PL061 is not set -# CONFIG_GPIO_RCAR is not set -# CONFIG_GPIO_RDC321X is not set -# CONFIG_GPIO_SCH is not set -# CONFIG_GPIO_SCH311X is not set -# CONFIG_GPIO_SX150X is not set -# CONFIG_GPIO_SYSCON is not set -# CONFIG_GPIO_SYSFS is not set -# CONFIG_GPIO_TPIC2810 is not set -# CONFIG_GPIO_TS4900 is not set -# CONFIG_GPIO_TS5500 is not set -# CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_WATCHDOG is not set -# CONFIG_GPIO_WS16C48 is not set -# CONFIG_GPIO_XGENE is not set -# CONFIG_GPIO_XILINX is not set -# CONFIG_GPIO_ZEVIO is not set -# CONFIG_GPIO_ZX is not set -# CONFIG_GREENASIA_FF is not set -# CONFIG_GREYBUS is not set -# CONFIG_GS_FPGABOOT is not set -# CONFIG_GTP is not set -# CONFIG_HAMACHI is not set -# CONFIG_HAMRADIO is not set -# CONFIG_HAPPYMEAL is not set -CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set -# CONFIG_HARDLOCKUP_DETECTOR is not set -# CONFIG_HAVE_AOUT is not set -CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y -# CONFIG_HAVE_ARCH_HASH is not set -CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -# CONFIG_HAVE_ARCH_VMAP_STACK is not set -CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y -# CONFIG_HAVE_ARM_ARCH_TIMER is not set -CONFIG_HAVE_EXIT_THREAD=y -CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_CAT=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_NMI=y -# CONFIG_HCALL_STATS is not set -# CONFIG_HDC100X is not set -# CONFIG_HDLC is not set -# CONFIG_HDLC_CISCO is not set -# CONFIG_HDLC_FR is not set -# CONFIG_HDLC_PPP is not set -# CONFIG_HDLC_RAW is not set -# CONFIG_HDLC_RAW_ETH is not set -# CONFIG_HDQ_MASTER_OMAP is not set -# CONFIG_HEADERS_CHECK is not set -# CONFIG_HERMES is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_HFSPLUS_FS_POSIX_ACL is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFS_FS_POSIX_ACL is not set -# CONFIG_HI8435 is not set -# CONFIG_HIBERNATION is not set -# CONFIG_HID is not set -# CONFIG_HIDRAW is not set -# CONFIG_HID_A4TECH is not set -# CONFIG_HID_ACRUX is not set -# CONFIG_HID_ACRUX_FF is not set -# CONFIG_HID_ALPS is not set -# CONFIG_HID_APPLE is not set -# CONFIG_HID_APPLEIR is not set -# CONFIG_HID_AUREAL is not set -# CONFIG_HID_BATTERY_STRENGTH is not set -# CONFIG_HID_BELKIN is not set -# CONFIG_HID_BETOP_FF is not set -# CONFIG_HID_CHERRY is not set -# CONFIG_HID_CHICONY is not set -# CONFIG_HID_CMEDIA is not set -# CONFIG_HID_CORSAIR is not set -# CONFIG_HID_CP2112 is not set -# CONFIG_HID_CYPRESS is not set -# CONFIG_HID_DRAGONRISE is not set -# CONFIG_HID_ELECOM is not set -# CONFIG_HID_ELO is not set -# CONFIG_HID_EMS_FF is not set -# CONFIG_HID_EZKEY is not set -# CONFIG_HID_GEMBIRD is not set -# CONFIG_HID_GENERIC is not set -# CONFIG_HID_GFRM is not set -# CONFIG_HID_GREENASIA is not set -# CONFIG_HID_GT683R is not set -# CONFIG_HID_GYRATION is not set -# CONFIG_HID_HOLTEK is not set -# CONFIG_HID_ICADE is not set -# CONFIG_HID_KENSINGTON is not set -# CONFIG_HID_KEYTOUCH is not set -# CONFIG_HID_KYE is not set -# CONFIG_HID_LCPOWER is not set -# CONFIG_HID_LED is not set -# CONFIG_HID_LENOVO is not set -# CONFIG_HID_LOGITECH is not set -# CONFIG_HID_LOGITECH_DJ is not set -# CONFIG_HID_LOGITECH_HIDPP is not set -# CONFIG_HID_MAGICMOUSE is not set -# CONFIG_HID_MICROSOFT is not set -# CONFIG_HID_MONTEREY is not set -# CONFIG_HID_MULTITOUCH is not set -# CONFIG_HID_NTRIG is not set -# CONFIG_HID_ORTEK is not set -# CONFIG_HID_PANTHERLORD is not set -# CONFIG_HID_PENMOUNT is not set -# CONFIG_HID_PETALYNX is not set -# CONFIG_HID_PICOLCD is not set -# CONFIG_HID_PID is not set -# CONFIG_HID_PLANTRONICS is not set -# CONFIG_HID_PRIMAX is not set -# CONFIG_HID_PRODIKEYS is not set -# CONFIG_HID_RMI is not set -# CONFIG_HID_ROCCAT is not set -# CONFIG_HID_SAITEK is not set -# CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SENSOR_HUB is not set -# CONFIG_HID_SMARTJOYPLUS is not set -# CONFIG_HID_SONY is not set -# CONFIG_HID_SPEEDLINK is not set -# CONFIG_HID_STEELSERIES is not set -# CONFIG_HID_SUNPLUS is not set -# CONFIG_HID_THINGM is not set -# CONFIG_HID_THRUSTMASTER is not set -# CONFIG_HID_TIVO is not set -# CONFIG_HID_TOPSEED is not set -# CONFIG_HID_TWINHAN is not set -# CONFIG_HID_UCLOGIC is not set -# CONFIG_HID_WACOM is not set -# CONFIG_HID_WALTOP is not set -# CONFIG_HID_WIIMOTE is not set -# CONFIG_HID_XINMO is not set -# CONFIG_HID_ZEROPLUS is not set -# CONFIG_HID_ZYDACRON is not set -# CONFIG_HIGHMEM is not set -CONFIG_HIGH_RES_TIMERS=y -# CONFIG_HIP04_ETH is not set -# CONFIG_HIPPI is not set -# CONFIG_HISI_FEMAC is not set -# CONFIG_HIX5HD2_GMAC is not set -# CONFIG_HMC6352 is not set -# CONFIG_HNS is not set -# CONFIG_HNS_DSAF is not set -# CONFIG_HNS_ENET is not set -# CONFIG_HOSTAP is not set -# CONFIG_HOSTAP_CS is not set -# CONFIG_HOSTAP_PCI is not set -# CONFIG_HOSTAP_PLX is not set -# CONFIG_HOTPLUG_CPU is not set -# CONFIG_HOTPLUG_PCI is not set -# CONFIG_HP03 is not set -# CONFIG_HP100 is not set -# CONFIG_HP206C is not set -CONFIG_HPET_MMAP_DEFAULT=y -# CONFIG_HPFS_FS is not set -# CONFIG_HP_ILO is not set -# CONFIG_HP_WIRELESS is not set -# CONFIG_HSI is not set -# CONFIG_HSR is not set -# CONFIG_HTC_EGPIO is not set -# CONFIG_HTC_I2CPLD is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_HTU21 is not set -# CONFIG_HUGETLB_PAGE is not set -# CONFIG_HVC_DCC is not set -# CONFIG_HVC_UDBG is not set -# CONFIG_HWLAT_TRACER is not set -# CONFIG_HWMON is not set -# CONFIG_HWMON_DEBUG_CHIP is not set -# CONFIG_HWMON_VID is not set -# CONFIG_HWSPINLOCK_OMAP is not set -CONFIG_HW_PERF_EVENTS=y -# CONFIG_HW_RANDOM is not set -# CONFIG_HW_RANDOM_AMD is not set -# CONFIG_HW_RANDOM_ATMEL is not set -# CONFIG_HW_RANDOM_EXYNOS is not set -# CONFIG_HW_RANDOM_GEODE is not set -# CONFIG_HW_RANDOM_INTEL is not set -# CONFIG_HW_RANDOM_IPROC_RNG200 is not set -# CONFIG_HW_RANDOM_OMAP3_ROM is not set -# CONFIG_HW_RANDOM_PPC4XX is not set -# CONFIG_HW_RANDOM_TIMERIOMEM is not set -# CONFIG_HW_RANDOM_TPM is not set -# CONFIG_HW_RANDOM_VIA is not set -# CONFIG_HW_RANDOM_VIRTIO is not set -# CONFIG_HYPERV is not set -# CONFIG_HYSDN is not set -CONFIG_HZ=100 -CONFIG_HZ_100=y -# CONFIG_HZ_1000 is not set -# CONFIG_HZ_1024 is not set -# CONFIG_HZ_128 is not set -# CONFIG_HZ_200 is not set -# CONFIG_HZ_24 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_256 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_48 is not set -# CONFIG_HZ_500 is not set -# CONFIG_HZ_PERIODIC is not set -# CONFIG_I2C is not set -# CONFIG_I2C_ALGOBIT is not set -# CONFIG_I2C_ALGOPCA is not set -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set -# CONFIG_I2C_AU1550 is not set -# CONFIG_I2C_BCM2835 is not set -# CONFIG_I2C_BCM_IPROC is not set -# CONFIG_I2C_CADENCE is not set -# CONFIG_I2C_CBUS_GPIO is not set -# CONFIG_I2C_CHARDEV is not set -# CONFIG_I2C_COMPAT is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEMUX_PINCTRL is not set -# CONFIG_I2C_DESIGNWARE_PCI is not set -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set -# CONFIG_I2C_DIOLAN_U2C is not set -# CONFIG_I2C_EG20T is not set -# CONFIG_I2C_ELEKTOR is not set -# CONFIG_I2C_EMEV2 is not set -# CONFIG_I2C_GPIO is not set -# CONFIG_I2C_HELPER_AUTO is not set -# CONFIG_I2C_HID is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_IBM_IIC is not set -# CONFIG_I2C_IMG is not set -# CONFIG_I2C_ISCH is not set -# CONFIG_I2C_ISMT is not set -# CONFIG_I2C_MPC is not set -# CONFIG_I2C_MUX is not set -# CONFIG_I2C_MUX_GPIO is not set -# CONFIG_I2C_MUX_PCA9541 is not set -# CONFIG_I2C_MUX_PCA954x is not set -# CONFIG_I2C_MUX_PINCTRL is not set -# CONFIG_I2C_MUX_REG is not set -# CONFIG_I2C_MV64XXX is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_NOMADIK is not set -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_OCTEON is not set -# CONFIG_I2C_PARPORT is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PCA_ISA is not set -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_PXA_PCI is not set -# CONFIG_I2C_RCAR is not set -# CONFIG_I2C_RK3X is not set -# CONFIG_I2C_ROBOTFUZZ_OSIF is not set -# CONFIG_I2C_SCMI is not set -# CONFIG_I2C_SH_MOBILE is not set -# CONFIG_I2C_SIMTEC is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_SLAVE is not set -# CONFIG_I2C_SMBUS is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_THUNDERX is not set -# CONFIG_I2C_TINY_USB is not set -# CONFIG_I2C_VERSATILE is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set -# CONFIG_I2C_XILINX is not set -# CONFIG_I40E is not set -# CONFIG_I40EVF is not set -# CONFIG_I6300ESB_WDT is not set -# CONFIG_I82092 is not set -# CONFIG_I82365 is not set -# CONFIG_IAQCORE is not set -# CONFIG_IBM_ASM is not set -# CONFIG_IBM_EMAC_DEBUG is not set -# CONFIG_IBM_EMAC_EMAC4 is not set -# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set -# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_EMAC_RGMII is not set -# CONFIG_IBM_EMAC_TAH is not set -# CONFIG_IBM_EMAC_ZMII is not set -# CONFIG_ICPLUS_PHY is not set -# CONFIG_ICS932S401 is not set -# CONFIG_IDE is not set -# CONFIG_IDEAPAD_LAPTOP is not set -# CONFIG_IDE_GD is not set -# CONFIG_IDE_PROC_FS is not set -# CONFIG_IDE_TASK_IOCTL is not set -# CONFIG_IDLE_PAGE_TRACKING is not set -# CONFIG_IEEE802154 is not set -# CONFIG_IEEE802154_ADF7242 is not set -# CONFIG_IEEE802154_ATUSB is not set -# CONFIG_IFB is not set -# CONFIG_IGB is not set -# CONFIG_IGBVF is not set -# CONFIG_IIO is not set -# CONFIG_IIO_BUFFER_CB is not set -# CONFIG_IIO_CONFIGFS is not set -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -# CONFIG_IIO_INTERRUPT_TRIGGER is not set -# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set -# CONFIG_IIO_SIMPLE_DUMMY is not set -# CONFIG_IIO_SSP_SENSORHUB is not set -# CONFIG_IIO_ST_ACCEL_3AXIS is not set -# CONFIG_IIO_ST_GYRO_3AXIS is not set -# CONFIG_IIO_ST_MAGN_3AXIS is not set -# CONFIG_IIO_ST_PRESS is not set -# CONFIG_IIO_SW_DEVICE is not set -# CONFIG_IIO_SW_TRIGGER is not set -# CONFIG_IIO_SYSFS_TRIGGER is not set -# CONFIG_IKCONFIG is not set -# CONFIG_IKCONFIG_PROC is not set -# CONFIG_IMAGE_CMDLINE_HACK is not set -# CONFIG_IMGPDC_WDT is not set -# CONFIG_IMG_MDC_DMA is not set -# CONFIG_IMX7D_ADC is not set -# CONFIG_IMX_IPUV3_CORE is not set -# CONFIG_IMX_THERMAL is not set -# CONFIG_INA2XX_ADC is not set -CONFIG_INET=y -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_DIAG is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_TCP_DIAG is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_INET_UDP_DIAG is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INFINIBAND is not set -# CONFIG_INFTL is not set -CONFIG_INIT_ENV_ARG_LIMIT=32 -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set -CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -CONFIG_INOTIFY_USER=y -# CONFIG_INPUT is not set -# CONFIG_INPUT_AD714X is not set -# CONFIG_INPUT_ADXL34X is not set -# CONFIG_INPUT_APANEL is not set -# CONFIG_INPUT_ATI_REMOTE2 is not set -# CONFIG_INPUT_ATLAS_BTNS is not set -# CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_AXP20X_PEK is not set -# CONFIG_INPUT_BMA150 is not set -# CONFIG_INPUT_CM109 is not set -# CONFIG_INPUT_CMA3000 is not set -# CONFIG_INPUT_DRV260X_HAPTICS is not set -# CONFIG_INPUT_DRV2665_HAPTICS is not set -# CONFIG_INPUT_DRV2667_HAPTICS is not set -# CONFIG_INPUT_E3X0_BUTTON is not set -# CONFIG_INPUT_EVBUG is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_GP2A is not set -# CONFIG_INPUT_GPIO_BEEPER is not set -# CONFIG_INPUT_GPIO_DECODER is not set -# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set -# CONFIG_INPUT_GPIO_TILT_POLLED is not set -# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set -# CONFIG_INPUT_IMS_PCU is not set -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_KEYSPAN_REMOTE is not set -# CONFIG_INPUT_KXTJ9 is not set -# CONFIG_INPUT_LEDS is not set -# CONFIG_INPUT_MATRIXKMAP is not set -# CONFIG_INPUT_MAX8997_HAPTIC is not set -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_MMA8450 is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_MPU3050 is not set -# CONFIG_INPUT_PALMAS_PWRBUTTON is not set -# CONFIG_INPUT_PCF8574 is not set -# CONFIG_INPUT_PCSPKR is not set -# CONFIG_INPUT_POLLDEV is not set -# CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_PWM_BEEPER is not set -# CONFIG_INPUT_REGULATOR_HAPTIC is not set -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set -# CONFIG_INPUT_SPARSEKMAP is not set -# CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_TPS65218_PWRBUTTON is not set -# CONFIG_INPUT_TWL4030_PWRBUTTON is not set -# CONFIG_INPUT_TWL4030_VIBRA is not set -# CONFIG_INPUT_TWL6040_VIBRA is not set -# CONFIG_INPUT_UINPUT is not set -# CONFIG_INPUT_WISTRON_BTNS is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_INT340X_THERMAL is not set -# CONFIG_INTEL_HID_EVENT is not set -# CONFIG_INTEL_IDLE is not set -# CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_IOATDMA is not set -# CONFIG_INTEL_ISH_HID is not set -# CONFIG_INTEL_MEI is not set -# CONFIG_INTEL_MEI_ME is not set -# CONFIG_INTEL_MEI_TXE is not set -# CONFIG_INTEL_MIC_CARD is not set -# CONFIG_INTEL_MIC_HOST is not set -# CONFIG_INTEL_MID_PTI is not set -# CONFIG_INTEL_OAKTRAIL is not set -# CONFIG_INTEL_PMC_CORE is not set -# CONFIG_INTEL_PUNIT_IPC is not set -# CONFIG_INTEL_RST is not set -# CONFIG_INTEL_SMARTCONNECT is not set -# CONFIG_INTEL_SOC_PMIC is not set -# CONFIG_INTEL_TH is not set -# CONFIG_INTEL_VBTN is not set -# CONFIG_INTEL_XWAY_PHY is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_INV_MPU6050_I2C is not set -# CONFIG_INV_MPU6050_IIO is not set -# CONFIG_INV_MPU6050_SPI is not set -# CONFIG_IOMMU_SUPPORT is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_NOOP=y -CONFIG_IO_STRICT_DEVMEM=y -# CONFIG_IP17XX_PHY is not set -# CONFIG_IP6_NF_FILTER is not set -# CONFIG_IP6_NF_IPTABLES is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_MATCH_AH is not set -# CONFIG_IP6_NF_MATCH_EUI64 is not set -# CONFIG_IP6_NF_MATCH_FRAG is not set -# CONFIG_IP6_NF_MATCH_HL is not set -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_MATCH_MH is not set -# CONFIG_IP6_NF_MATCH_OPTS is not set -# CONFIG_IP6_NF_MATCH_RPFILTER is not set -# CONFIG_IP6_NF_MATCH_RT is not set -# CONFIG_IP6_NF_NAT is not set -# CONFIG_IP6_NF_RAW is not set -# CONFIG_IP6_NF_SECURITY is not set -# CONFIG_IP6_NF_TARGET_HL is not set -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_TARGET_SYNPROXY is not set -# CONFIG_IPACK_BUS is not set -# CONFIG_IPC_NS is not set -# CONFIG_IPMI_HANDLER is not set -# CONFIG_IPV6 is not set -# CONFIG_IPV6_FOU is not set -# CONFIG_IPV6_FOU_TUNNEL is not set -# CONFIG_IPV6_ILA is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_IPV6_MROUTE is not set -# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_ROUTE_INFO is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_IPV6_SIT_6RD is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_VTI is not set -# CONFIG_IPVLAN is not set -# CONFIG_IPW2100 is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2200 is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_IPW2200_MONITOR=y -# CONFIG_IPW2200_PROMISCUOUS is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_RADIOTAP is not set -# CONFIG_IPWIRELESS is not set -# CONFIG_IPX is not set -CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_IP_DCCP is not set -# CONFIG_IP_FIB_TRIE_STATS is not set -# CONFIG_IP_MROUTE is not set -CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_MULTIPLE_TABLES=y -# CONFIG_IP_NF_ARPFILTER is not set -# CONFIG_IP_NF_ARPTABLES is not set -# CONFIG_IP_NF_ARP_MANGLE is not set -# CONFIG_IP_NF_FILTER is not set -# CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_MANGLE is not set -# CONFIG_IP_NF_MATCH_AH is not set -# CONFIG_IP_NF_MATCH_ECN is not set -# CONFIG_IP_NF_MATCH_RPFILTER is not set -# CONFIG_IP_NF_MATCH_TTL is not set -# CONFIG_IP_NF_RAW is not set -# CONFIG_IP_NF_SECURITY is not set -# CONFIG_IP_NF_TARGET_CLUSTERIP is not set -# CONFIG_IP_NF_TARGET_ECN is not set -# CONFIG_IP_NF_TARGET_MASQUERADE is not set -# CONFIG_IP_NF_TARGET_NETMAP is not set -# CONFIG_IP_NF_TARGET_REDIRECT is not set -# CONFIG_IP_NF_TARGET_REJECT is not set -# CONFIG_IP_NF_TARGET_SYNPROXY is not set -# CONFIG_IP_NF_TARGET_TTL is not set -# CONFIG_IP_PIMSM_V1 is not set -# CONFIG_IP_PIMSM_V2 is not set -# CONFIG_IP_PNP is not set -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_SCTP is not set -# CONFIG_IP_SET is not set -# CONFIG_IP_VS is not set -# CONFIG_IRDA is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_IRQ_ALL_CPUS is not set -# CONFIG_IRQ_DOMAIN_DEBUG is not set -# CONFIG_IRQ_POLL is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_IR_GPIO_CIR is not set -# CONFIG_IR_HIX5HD2 is not set -# CONFIG_IR_IGORPLUGUSB is not set -# CONFIG_IR_IGUANA is not set -# CONFIG_IR_IMG is not set -# CONFIG_IR_IMON is not set -# CONFIG_IR_JVC_DECODER is not set -# CONFIG_IR_LIRC_CODEC is not set -# CONFIG_IR_MCEUSB is not set -# CONFIG_IR_NEC_DECODER is not set -# CONFIG_IR_RC5_DECODER is not set -# CONFIG_IR_RC6_DECODER is not set -# CONFIG_IR_REDRAT3 is not set -# CONFIG_IR_SONY_DECODER is not set -# CONFIG_IR_STREAMZAP is not set -# CONFIG_IR_TTUSBIR is not set -# CONFIG_ISA_BUS is not set -# CONFIG_ISA_BUS_API is not set -# CONFIG_ISCSI_BOOT_SYSFS is not set -# CONFIG_ISCSI_TCP is not set -CONFIG_ISDN=y -# CONFIG_ISDN_AUDIO is not set -# CONFIG_ISDN_CAPI is not set -# CONFIG_ISDN_CAPI_CAPIDRV is not set -# CONFIG_ISDN_DIVERSION is not set -# CONFIG_ISDN_DRV_ACT2000 is not set -# CONFIG_ISDN_DRV_GIGASET is not set -# CONFIG_ISDN_DRV_HISAX is not set -# CONFIG_ISDN_DRV_ICN is not set -# CONFIG_ISDN_DRV_LOOP is not set -# CONFIG_ISDN_DRV_PCBIT is not set -# CONFIG_ISDN_DRV_SC is not set -# CONFIG_ISDN_I4L is not set -# CONFIG_ISL29003 is not set -# CONFIG_ISL29020 is not set -# CONFIG_ISL29125 is not set -# CONFIG_ISO9660_FS is not set -# CONFIG_ISS4xx is not set -# CONFIG_ITG3200 is not set -# CONFIG_IWL3945 is not set -# CONFIG_IWLWIFI is not set -# CONFIG_IXGB is not set -# CONFIG_IXGBE is not set -# CONFIG_IXGBEVF is not set -# CONFIG_JBD2_DEBUG is not set -# CONFIG_JFFS2_CMODE_FAVOURLZO is not set -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -# CONFIG_JFFS2_FS_POSIX_ACL is not set -# CONFIG_JFFS2_FS_SECURITY is not set -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -CONFIG_JFFS2_FS_WRITEBUFFER=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_LZMA=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -CONFIG_JFFS2_SUMMARY=y -# CONFIG_JFFS2_ZLIB is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_FS is not set -# CONFIG_JFS_POSIX_ACL is not set -# CONFIG_JFS_SECURITY is not set -# CONFIG_JFS_STATISTICS is not set -# CONFIG_JME is not set -CONFIG_JOLIET=y -# CONFIG_JSA1212 is not set -# CONFIG_JUMP_LABEL is not set -# CONFIG_KALLSYMS is not set -# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set -# CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_BASE_RELATIVE=y -# CONFIG_KALLSYMS_UNCOMPRESSED is not set -# CONFIG_KARMA_PARTITION is not set -# CONFIG_KASAN is not set -# CONFIG_KCOV is not set -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_CAT is not set -# CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_LZ4 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_MODE_NEON=y -CONFIG_KERNEL_XZ=y -CONFIG_KERNFS=y -# CONFIG_KEXEC is not set -# CONFIG_KEYBOARD_ADC is not set -# CONFIG_KEYBOARD_ADP5588 is not set -# CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_BCM is not set -# CONFIG_KEYBOARD_CAP11XX is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_LM8333 is not set -# CONFIG_KEYBOARD_MATRIX is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OMAP4 is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_PXA27x is not set -# CONFIG_KEYBOARD_QT1070 is not set -# CONFIG_KEYBOARD_QT2160 is not set -# CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_KEYBOARD_SH_KEYSC is not set -# CONFIG_KEYBOARD_SNVS_PWRKEY is not set -# CONFIG_KEYBOARD_STMPE is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TCA8418 is not set -# CONFIG_KEYBOARD_TWL4030 is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYS is not set -# CONFIG_KEY_DH_OPERATIONS is not set -# CONFIG_KGDB is not set -# CONFIG_KMEMCHECK is not set -# CONFIG_KMX61 is not set -# CONFIG_KPROBES is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_KS7010 is not set -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set -# CONFIG_KSM is not set -# CONFIG_KSZ884X_PCI is not set -CONFIG_KUSER_HELPERS=y -# CONFIG_KVM_AMD is not set -# CONFIG_KVM_GUEST is not set -# CONFIG_KVM_INTEL is not set -# CONFIG_KXCJK1013 is not set -# CONFIG_KXSD9 is not set -# CONFIG_L2TP is not set -# CONFIG_L2TP_ETH is not set -# CONFIG_L2TP_IP is not set -# CONFIG_L2TP_V3 is not set -# CONFIG_LANMEDIA is not set -# CONFIG_LANTIQ is not set -# CONFIG_LAPB is not set -# CONFIG_LASAT is not set -# CONFIG_LATENCYTOP is not set -# CONFIG_LATTICE_ECP3_CONFIG is not set -CONFIG_LBDAF=y -# CONFIG_LCD_AMS369FG06 is not set -# CONFIG_LCD_HX8357 is not set -# CONFIG_LCD_ILI922X is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LMS501KF03 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -CONFIG_LDISC_AUTOLOAD=y -# CONFIG_LDM_PARTITION is not set -CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y -# CONFIG_LEDS_BCM6328 is not set -# CONFIG_LEDS_BCM6358 is not set -# CONFIG_LEDS_BD2802 is not set -# CONFIG_LEDS_BLINKM is not set -CONFIG_LEDS_CLASS=y -# CONFIG_LEDS_CLASS_FLASH is not set -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_GPIO is not set -# CONFIG_LEDS_INTEL_SS4200 is not set -# CONFIG_LEDS_IS31FL319X is not set -# CONFIG_LEDS_IS31FL32XX is not set -# CONFIG_LEDS_LM3530 is not set -# CONFIG_LEDS_LM355x is not set -# CONFIG_LEDS_LM3642 is not set -# CONFIG_LEDS_LP3944 is not set -# CONFIG_LEDS_LP3952 is not set -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_LP5523 is not set -# CONFIG_LEDS_LP5562 is not set -# CONFIG_LEDS_LP8501 is not set -# CONFIG_LEDS_LP8860 is not set -# CONFIG_LEDS_LT3593 is not set -# CONFIG_LEDS_MLXCPLD is not set -# CONFIG_LEDS_NS2 is not set -# CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set -# CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_PWM is not set -# CONFIG_LEDS_REGULATOR is not set -# CONFIG_LEDS_SYSCON is not set -# CONFIG_LEDS_TCA6507 is not set -# CONFIG_LEDS_TLC591XX is not set -CONFIG_LEDS_TRIGGERS=y -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -# CONFIG_LEDS_TRIGGER_CAMERA is not set -# CONFIG_LEDS_TRIGGER_CPU is not set -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -# CONFIG_LEDS_TRIGGER_DISK is not set -# CONFIG_LEDS_TRIGGER_GPIO is not set -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set -# CONFIG_LEDS_TRIGGER_IDE_DISK is not set -# CONFIG_LEDS_TRIGGER_MTD is not set -CONFIG_LEDS_TRIGGER_NETDEV=y -# CONFIG_LEDS_TRIGGER_ONESHOT is not set -# CONFIG_LEDS_TRIGGER_PANIC is not set -CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_TRANSIENT is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_LGUEST is not set -# CONFIG_LIB80211 is not set -# CONFIG_LIB80211_CRYPT_CCMP is not set -# CONFIG_LIB80211_CRYPT_TKIP is not set -# CONFIG_LIB80211_CRYPT_WEP is not set -# CONFIG_LIB80211_DEBUG is not set -# CONFIG_LIBCRC32C is not set -# CONFIG_LIBERTAS is not set -# CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_LIBERTAS_USB is not set -# CONFIG_LIBFC is not set -# CONFIG_LIBFCOE is not set -# CONFIG_LIBIPW_DEBUG is not set -# CONFIG_LIBNVDIMM is not set -# CONFIG_LIDAR_LITE_V2 is not set -# CONFIG_LIQUIDIO is not set -# CONFIG_LIRC_STAGING is not set -# CONFIG_LIS3L02DQ is not set -# CONFIG_LKDTM is not set -CONFIG_LLC=y -# CONFIG_LLC2 is not set -# CONFIG_LNET is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_LOCKD is not set -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_LOCKD_V4=y -# CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_LOCK_TORTURE_TEST is not set -# CONFIG_LOGFS is not set -# CONFIG_LOGIG940_FF is not set -# CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set -# CONFIG_LOGIWHEELS_FF is not set -# CONFIG_LOGO is not set -CONFIG_LOG_BUF_SHIFT=17 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 -# CONFIG_LOONGSON_MC146818 is not set -# CONFIG_LPC_ICH is not set -# CONFIG_LPC_SCH is not set -# CONFIG_LP_CONSOLE is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_LTC2485 is not set -# CONFIG_LTE_GDM724X is not set -# CONFIG_LTPC is not set -# CONFIG_LTR501 is not set -# CONFIG_LUSTRE_FS is not set -# CONFIG_LWTUNNEL is not set -# CONFIG_LXT_PHY is not set -# CONFIG_LZ4HC_COMPRESS is not set -# CONFIG_LZ4_COMPRESS is not set -# CONFIG_LZ4_DECOMPRESS is not set -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y -# CONFIG_LZO_COMPRESS is not set -# CONFIG_LZO_DECOMPRESS is not set -# CONFIG_M62332 is not set -# CONFIG_MAC80211 is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_MACB is not set -# CONFIG_MACH_ASM9260 is not set -# CONFIG_MACH_DECSTATION is not set -# CONFIG_MACH_INGENIC is not set -# CONFIG_MACH_JAZZ is not set -# CONFIG_MACH_JZ4740 is not set -# CONFIG_MACH_LOONGSON32 is not set -# CONFIG_MACH_LOONGSON64 is not set -# CONFIG_MACH_PIC32 is not set -# CONFIG_MACH_PISTACHIO is not set -# CONFIG_MACH_TX39XX is not set -# CONFIG_MACH_TX49XX is not set -# CONFIG_MACH_VR41XX is not set -# CONFIG_MACH_XILFPGA is not set -# CONFIG_MACINTOSH_DRIVERS is not set -# CONFIG_MACSEC is not set -# CONFIG_MACVLAN is not set -# CONFIG_MACVTAP is not set -# CONFIG_MAC_EMUMOUSEBTN is not set -# CONFIG_MAC_PARTITION is not set -# CONFIG_MAG3110 is not set -# CONFIG_MAGIC_SYSRQ is not set -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 -# CONFIG_MAGIC_SYSRQ_SERIAL is not set -# CONFIG_MAILBOX is not set -# CONFIG_MANDATORY_FILE_LOCKING is not set -# CONFIG_MANGLE_BOOTARGS is not set -# CONFIG_MARVELL_PHY is not set -# CONFIG_MAX1027 is not set -# CONFIG_MAX1363 is not set -# CONFIG_MAX30100 is not set -# CONFIG_MAX44000 is not set -# CONFIG_MAX517 is not set -# CONFIG_MAX5487 is not set -# CONFIG_MAX5821 is not set -# CONFIG_MAX63XX_WATCHDOG is not set -# CONFIG_MAXIM_THERMOCOUPLE is not set -CONFIG_MAY_USE_DEVLINK=y -# CONFIG_MC3230 is not set -# CONFIG_MCB is not set -# CONFIG_MCP320X is not set -# CONFIG_MCP3422 is not set -# CONFIG_MCP4131 is not set -# CONFIG_MCP4531 is not set -# CONFIG_MCP4725 is not set -# CONFIG_MCP4922 is not set -# CONFIG_MCPM is not set -# CONFIG_MD is not set -# CONFIG_MDIO_BCM_UNIMAC is not set -# CONFIG_MDIO_BITBANG is not set -# CONFIG_MDIO_BUS_MUX_GPIO is not set -# CONFIG_MDIO_BUS_MUX_MMIOREG is not set -# CONFIG_MDIO_HISI_FEMAC is not set -# CONFIG_MDIO_OCTEON is not set -# CONFIG_MDIO_THUNDER is not set -# CONFIG_MD_FAULTY is not set -# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set -# CONFIG_MEDIA_ATTACH is not set -# CONFIG_MEDIA_CAMERA_SUPPORT is not set -# CONFIG_MEDIA_CONTROLLER is not set -# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set -# CONFIG_MEDIA_PCI_SUPPORT is not set -# CONFIG_MEDIA_RADIO_SUPPORT is not set -# CONFIG_MEDIA_RC_SUPPORT is not set -# CONFIG_MEDIA_SDR_SUPPORT is not set -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -# CONFIG_MEDIA_SUPPORT is not set -# CONFIG_MEDIA_USB_SUPPORT is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_SAS is not set -CONFIG_MEMBARRIER=y -# CONFIG_MEMORY is not set -# CONFIG_MEMORY_FAILURE is not set -# CONFIG_MEMSTICK is not set -# CONFIG_MEMTEST is not set -# CONFIG_MEN_A21_WDT is not set -# CONFIG_MESON_SM is not set -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -# CONFIG_MFD_88PM800 is not set -# CONFIG_MFD_88PM805 is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_AAT2870_CORE is not set -# CONFIG_MFD_ACT8945A is not set -# CONFIG_MFD_ARIZONA_I2C is not set -# CONFIG_MFD_ARIZONA_SPI is not set -# CONFIG_MFD_AS3711 is not set -# CONFIG_MFD_AS3722 is not set -# CONFIG_MFD_ASIC3 is not set -# CONFIG_MFD_ATMEL_FLEXCOM is not set -# CONFIG_MFD_ATMEL_HLCDC is not set -# CONFIG_MFD_AXP20X is not set -# CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_BCM590XX is not set -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_CROS_EC is not set -# CONFIG_MFD_CS5535 is not set -# CONFIG_MFD_DA9052_I2C is not set -# CONFIG_MFD_DA9052_SPI is not set -# CONFIG_MFD_DA9055 is not set -# CONFIG_MFD_DA9062 is not set -# CONFIG_MFD_DA9063 is not set -# CONFIG_MFD_DA9150 is not set -# CONFIG_MFD_DLN2 is not set -# CONFIG_MFD_EXYNOS_LPASS is not set -# CONFIG_MFD_HI6421_PMIC is not set -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_KEMPLD is not set -# CONFIG_MFD_LM3533 is not set -# CONFIG_MFD_LP3943 is not set -# CONFIG_MFD_LP8788 is not set -# CONFIG_MFD_MAX14577 is not set -# CONFIG_MFD_MAX77620 is not set -# CONFIG_MFD_MAX77686 is not set -# CONFIG_MFD_MAX77693 is not set -# CONFIG_MFD_MAX77843 is not set -# CONFIG_MFD_MAX8907 is not set -# CONFIG_MFD_MAX8925 is not set -# CONFIG_MFD_MAX8997 is not set -# CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_MC13XXX is not set -# CONFIG_MFD_MC13XXX_I2C is not set -# CONFIG_MFD_MC13XXX_SPI is not set -# CONFIG_MFD_MENF21BMC is not set -# CONFIG_MFD_MT6397 is not set -# CONFIG_MFD_OMAP_USB_HOST is not set -# CONFIG_MFD_PALMAS is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_PM8921_CORE is not set -# CONFIG_MFD_RC5T583 is not set -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_RETU is not set -# CONFIG_MFD_RK808 is not set -# CONFIG_MFD_RN5T618 is not set -# CONFIG_MFD_RT5033 is not set -# CONFIG_MFD_RTSX_PCI is not set -# CONFIG_MFD_RTSX_USB is not set -# CONFIG_MFD_SEC_CORE is not set -# CONFIG_MFD_SI476X_CORE is not set -# CONFIG_MFD_SKY81452 is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_SMSC is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set -# CONFIG_MFD_T7L66XB is not set -# CONFIG_MFD_TC3589X is not set -# CONFIG_MFD_TC6387XB is not set -# CONFIG_MFD_TC6393XB is not set -# CONFIG_MFD_TIMBERDALE is not set -# CONFIG_MFD_TI_AM335X_TSCADC is not set -# CONFIG_MFD_TI_LP873X is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_TPS65086 is not set -# CONFIG_MFD_TPS65090 is not set -# CONFIG_MFD_TPS65217 is not set -# CONFIG_MFD_TPS65218 is not set -# CONFIG_MFD_TPS6586X is not set -# CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_TPS80031 is not set -# CONFIG_MFD_VIPERBOARD is not set -# CONFIG_MFD_VX855 is not set -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_WM831X is not set -# CONFIG_MFD_WM831X_I2C is not set -# CONFIG_MFD_WM831X_SPI is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM8994 is not set -# CONFIG_MG_DISK is not set -# CONFIG_MICREL_KS8995MA is not set -# CONFIG_MICREL_PHY is not set -# CONFIG_MICROCHIP_PHY is not set -# CONFIG_MICROSEMI_PHY is not set -# CONFIG_MIGRATION is not set -CONFIG_MII=y -# CONFIG_MIKROTIK_RB532 is not set -# CONFIG_MINIX_FS is not set -# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_MIPS_ALCHEMY is not set -# CONFIG_MIPS_CDMM is not set -# CONFIG_MIPS_COBALT is not set -# CONFIG_MIPS_FPU_EMULATOR is not set -# CONFIG_MIPS_GENERIC is not set -# CONFIG_MIPS_MALTA is not set -# CONFIG_MIPS_O32_FP64_SUPPORT is not set -# CONFIG_MIPS_PARAVIRT is not set -# CONFIG_MIPS_PLATFORM_DEVICES is not set -# CONFIG_MIPS_SEAD3 is not set -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_MISDN is not set -# CONFIG_MISDN_AVMFRITZ is not set -# CONFIG_MISDN_HFCPCI is not set -# CONFIG_MISDN_HFCUSB is not set -# CONFIG_MISDN_INFINEON is not set -# CONFIG_MISDN_NETJET is not set -# CONFIG_MISDN_SPEEDFAX is not set -# CONFIG_MISDN_W6692 is not set -# CONFIG_MKISS is not set -# CONFIG_MLX4_CORE is not set -# CONFIG_MLX4_EN is not set -# CONFIG_MLX5_CORE is not set -# CONFIG_MLX90614 is not set -# CONFIG_MLXSW_CORE is not set -# CONFIG_MMA7455_I2C is not set -# CONFIG_MMA7455_SPI is not set -# CONFIG_MMA7660 is not set -# CONFIG_MMA8452 is not set -# CONFIG_MMA9551 is not set -# CONFIG_MMA9553 is not set -# CONFIG_MMC is not set -# CONFIG_MMC35240 is not set -# CONFIG_MMC_ARMMMCI is not set -# CONFIG_MMC_AU1X is not set -# CONFIG_MMC_BLOCK is not set -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CB710 is not set -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_DW is not set -# CONFIG_MMC_MTK is not set -# CONFIG_MMC_MVSDIO is not set -# CONFIG_MMC_S3C is not set -# CONFIG_MMC_SDHCI is not set -# CONFIG_MMC_SDHCI_ACPI is not set -# CONFIG_MMC_SDHCI_BCM_KONA is not set -# CONFIG_MMC_SDHCI_F_SDH30 is not set -# CONFIG_MMC_SDHCI_IPROC is not set -# CONFIG_MMC_SDHCI_MSM is not set -# CONFIG_MMC_SDHCI_OF_ARASAN is not set -# CONFIG_MMC_SDHCI_OF_AT91 is not set -# CONFIG_MMC_SDHCI_OF_ESDHC is not set -# CONFIG_MMC_SDHCI_OF_HLWD is not set -# CONFIG_MMC_SDHCI_PXAV2 is not set -# CONFIG_MMC_SDHCI_PXAV3 is not set -# CONFIG_MMC_SDRICOH_CS is not set -# CONFIG_MMC_SPI is not set -# CONFIG_MMC_TEST is not set -# CONFIG_MMC_TOSHIBA_PCI is not set -# CONFIG_MMC_USDHI6ROL0 is not set -# CONFIG_MMC_USHC is not set -# CONFIG_MMC_VIA_SDMMC is not set -# CONFIG_MMC_VUB300 is not set -# CONFIG_MMIOTRACE is not set -CONFIG_MMU=y -CONFIG_MODULES=y -# CONFIG_MODULE_COMPRESS is not set -# CONFIG_MODULE_FORCE_LOAD is not set -# CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_MODULE_STRIPPED=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MOST is not set -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_ELAN_I2C is not set -# CONFIG_MOUSE_GPIO is not set -# CONFIG_MOUSE_INPORT is not set -# CONFIG_MOUSE_LOGIBM is not set -# CONFIG_MOUSE_PC110PAD is not set -# CONFIG_MOUSE_PS2_FOCALTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_SYNAPTICS_I2C is not set -# CONFIG_MOUSE_SYNAPTICS_USB is not set -# CONFIG_MPL115 is not set -# CONFIG_MPL115_I2C is not set -# CONFIG_MPL115_SPI is not set -# CONFIG_MPL3115 is not set -# CONFIG_MPLS is not set -# CONFIG_MS5611 is not set -# CONFIG_MS5637 is not set -# CONFIG_MSDOS_FS is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_MSI_BITMAP_SELFTEST is not set -# CONFIG_MSI_LAPTOP is not set -CONFIG_MTD=y -# CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_AFS_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set -CONFIG_MTD_BLKDEVS=y -CONFIG_MTD_BLOCK=y -# CONFIG_MTD_BLOCK2MTD is not set -CONFIG_MTD_CFI=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_CFI_AMDSTD=y -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -CONFIG_MTD_CFI_NOSWAP=y -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=y -# CONFIG_MTD_CMDLINE_PARTS is not set -CONFIG_MTD_COMPLEX_MAPPINGS=y -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_DOCG3 is not set -CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_GPIO_ADDR is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_JEDECPROBE is not set -# CONFIG_MTD_LATCH_ADDR is not set -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_LPDDR2_NVM is not set -# CONFIG_MTD_M25P80 is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -CONFIG_MTD_MAP_BANK_WIDTH_2=y -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MT81xx_NOR is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_MYLOADER_PARTS is not set -# CONFIG_MTD_NAND is not set -# CONFIG_MTD_NAND_AMS_DELTA is not set -# CONFIG_MTD_NAND_AR934X is not set -# CONFIG_MTD_NAND_AR934X_HW_ECC is not set -# CONFIG_MTD_NAND_ATMEL is not set -# CONFIG_MTD_NAND_AU1550 is not set -# CONFIG_MTD_NAND_BCH is not set -# CONFIG_MTD_NAND_BF5XX is not set -# CONFIG_MTD_NAND_BRCMNAND is not set -# CONFIG_MTD_NAND_CAFE is not set -# CONFIG_MTD_NAND_CM_X270 is not set -# CONFIG_MTD_NAND_CS553X is not set -# CONFIG_MTD_NAND_DAVINCI is not set -# CONFIG_MTD_NAND_DENALI is not set -# CONFIG_MTD_NAND_DENALI_DT is not set -# CONFIG_MTD_NAND_DENALI_PCI is not set -CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018 -# CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_MTD_NAND_DOCG4 is not set -# CONFIG_MTD_NAND_ECC is not set -# CONFIG_MTD_NAND_ECC_BCH is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_FSL_ELBC is not set -# CONFIG_MTD_NAND_FSL_IFC is not set -# CONFIG_MTD_NAND_FSL_UPM is not set -# CONFIG_MTD_NAND_FSMC is not set -# CONFIG_MTD_NAND_GPIO is not set -# CONFIG_MTD_NAND_GPMI_NAND is not set -# CONFIG_MTD_NAND_HISI504 is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_JZ4740 is not set -# CONFIG_MTD_NAND_MPC5121_NFC is not set -# CONFIG_MTD_NAND_MTK is not set -# CONFIG_MTD_NAND_MXC is not set -# CONFIG_MTD_NAND_NANDSIM is not set -# CONFIG_MTD_NAND_NDFC is not set -# CONFIG_MTD_NAND_NUC900 is not set -# CONFIG_MTD_NAND_OMAP2 is not set -# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set -# CONFIG_MTD_NAND_ORION is not set -# CONFIG_MTD_NAND_PASEMI is not set -# CONFIG_MTD_NAND_PLATFORM is not set -# CONFIG_MTD_NAND_PXA3xx is not set -# CONFIG_MTD_NAND_RB4XX is not set -# CONFIG_MTD_NAND_RB750 is not set -# CONFIG_MTD_NAND_RICOH is not set -# CONFIG_MTD_NAND_S3C2410 is not set -# CONFIG_MTD_NAND_SHARPSL is not set -# CONFIG_MTD_NAND_SH_FLCTL is not set -# CONFIG_MTD_NAND_SOCRATES is not set -# CONFIG_MTD_NAND_TMIO is not set -# CONFIG_MTD_NAND_TXX9NDFMC is not set -CONFIG_MTD_OF_PARTS=y -# CONFIG_MTD_ONENAND is not set -# CONFIG_MTD_OOPS is not set -# CONFIG_MTD_OTP is not set -# CONFIG_MTD_PARTITIONED_MASTER is not set -# CONFIG_MTD_PCI is not set -# CONFIG_MTD_PCMCIA is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_PHYSMAP_COMPAT is not set -CONFIG_MTD_PHYSMAP_OF=y -# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set -# CONFIG_MTD_PLATRAM is not set -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_RAM is not set -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_ROM is not set -CONFIG_MTD_ROOTFS_ROOT_DEV=y -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_SM_COMMON is not set -# CONFIG_MTD_SPINAND_MT29F is not set -# CONFIG_MTD_SPI_NOR is not set -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096 -CONFIG_MTD_SPLIT=y -# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set -# CONFIG_MTD_SPLIT_EVA_FW is not set -# CONFIG_MTD_SPLIT_FIRMWARE is not set -CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware" -# CONFIG_MTD_SPLIT_FIT_FW is not set -# CONFIG_MTD_SPLIT_JIMAGE_FW is not set -# CONFIG_MTD_SPLIT_LZMA_FW is not set -# CONFIG_MTD_SPLIT_MINOR_FW is not set -# CONFIG_MTD_SPLIT_SEAMA_FW is not set -CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y -CONFIG_MTD_SPLIT_SUPPORT=y -# CONFIG_MTD_SPLIT_TPLINK_FW is not set -# CONFIG_MTD_SPLIT_TRX_FW is not set -# CONFIG_MTD_SPLIT_UIMAGE_FW is not set -# CONFIG_MTD_SPLIT_WRGG_FW is not set -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SWAP is not set -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_UBI is not set -# CONFIG_MTD_UIMAGE_SPLIT is not set -CONFIG_MULTIUSER=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set -# CONFIG_MV643XX_ETH is not set -# CONFIG_MVMDIO is not set -# CONFIG_MVNETA_BM is not set -# CONFIG_MVSW61XX_PHY is not set -# CONFIG_MVSWITCH_PHY is not set -# CONFIG_MV_XOR_V2 is not set -# CONFIG_MWAVE is not set -# CONFIG_MWL8K is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set -# CONFIG_MYRI10GE is not set -# CONFIG_NAMESPACES is not set -# CONFIG_NATIONAL_PHY is not set -# CONFIG_NATSEMI is not set -# CONFIG_NAU7802 is not set -# CONFIG_NBPFAXI_DMA is not set -# CONFIG_NCP_FS is not set -# CONFIG_NE2000 is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_NEC_MARKEINS is not set -CONFIG_NET=y -# CONFIG_NETCONSOLE is not set -CONFIG_NETDEVICES=y -# CONFIG_NETFILTER is not set -# CONFIG_NETFILTER_ADVANCED is not set -# CONFIG_NETFILTER_DEBUG is not set -# CONFIG_NETFILTER_INGRESS is not set -# CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NETFILTER_NETLINK_ACCT is not set -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -# CONFIG_NETFILTER_XTABLES is not set -# CONFIG_NETFILTER_XT_CONNMARK is not set -# CONFIG_NETFILTER_XT_MARK is not set -# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_BPF is not set -# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set -# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set -# CONFIG_NETFILTER_XT_MATCH_CPU is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -# CONFIG_NETFILTER_XT_MATCH_ECN is not set -# CONFIG_NETFILTER_XT_MATCH_ESP is not set -# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_HELPER is not set -# CONFIG_NETFILTER_XT_MATCH_HL is not set -# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set -# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set -# CONFIG_NETFILTER_XT_MATCH_L2TP is not set -# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set -# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_MAC is not set -# CONFIG_NETFILTER_XT_MATCH_MARK is not set -# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set -# CONFIG_NETFILTER_XT_MATCH_OSF is not set -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set -# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set -# CONFIG_NETFILTER_XT_MATCH_STATE is not set -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -# CONFIG_NETFILTER_XT_MATCH_STRING is not set -# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set -# CONFIG_NETFILTER_XT_MATCH_TIME is not set -# CONFIG_NETFILTER_XT_MATCH_U32 is not set -# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set -# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set -# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -# CONFIG_NETFILTER_XT_TARGET_CT is not set -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -# CONFIG_NETFILTER_XT_TARGET_HL is not set -# CONFIG_NETFILTER_XT_TARGET_HMARK is not set -# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set -# CONFIG_NETFILTER_XT_TARGET_LED is not set -# CONFIG_NETFILTER_XT_TARGET_LOG is not set -# CONFIG_NETFILTER_XT_TARGET_MARK is not set -# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set -# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set -# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set -# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set -# CONFIG_NETFILTER_XT_TARGET_TEE is not set -# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set -# CONFIG_NETFILTER_XT_TARGET_TRACE is not set -# CONFIG_NETLINK_DIAG is not set -# CONFIG_NETLINK_MMAP is not set -# CONFIG_NETPOLL is not set -# CONFIG_NETROM is not set -CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETXEN_NIC is not set -# CONFIG_NET_9P is not set -# CONFIG_NET_ACT_BPF is not set -# CONFIG_NET_ACT_CSUM is not set -# CONFIG_NET_ACT_GACT is not set -# CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set -# CONFIG_NET_ACT_MIRRED is not set -# CONFIG_NET_ACT_NAT is not set -# CONFIG_NET_ACT_PEDIT is not set -# CONFIG_NET_ACT_POLICE is not set -# CONFIG_NET_ACT_SIMP is not set -# CONFIG_NET_ACT_SKBEDIT is not set -# CONFIG_NET_ACT_SKBMOD is not set -# CONFIG_NET_ACT_TUNNEL_KEY is not set -# CONFIG_NET_ACT_VLAN is not set -CONFIG_NET_CADENCE=y -# CONFIG_NET_CALXEDA_XGMAC is not set -CONFIG_NET_CLS=y -# CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_BPF is not set -# CONFIG_NET_CLS_FLOW is not set -# CONFIG_NET_CLS_FLOWER is not set -# CONFIG_NET_CLS_FW is not set -CONFIG_NET_CLS_IND=y -# CONFIG_NET_CLS_MATCHALL is not set -# CONFIG_NET_CLS_ROUTE4 is not set -# CONFIG_NET_CLS_RSVP is not set -# CONFIG_NET_CLS_RSVP6 is not set -# CONFIG_NET_CLS_TCINDEX is not set -# CONFIG_NET_CLS_U32 is not set -CONFIG_NET_CORE=y -# CONFIG_NET_DEVLINK is not set -# CONFIG_NET_DROP_MONITOR is not set -# CONFIG_NET_DSA is not set -# CONFIG_NET_DSA_BCM_SF2 is not set -# CONFIG_NET_DSA_MV88E6060 is not set -# CONFIG_NET_DSA_MV88E6123_61_65 is not set -# CONFIG_NET_DSA_MV88E6131 is not set -# CONFIG_NET_DSA_MV88E6171 is not set -# CONFIG_NET_DSA_MV88E6352 is not set -# CONFIG_NET_DSA_MV88E6XXX is not set -# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -# CONFIG_NET_DSA_QCA8K is not set -# CONFIG_NET_DSA_TAG_DSA is not set -# CONFIG_NET_DSA_TAG_EDSA is not set -# CONFIG_NET_EMATCH is not set -# CONFIG_NET_EMATCH_CANID is not set -# CONFIG_NET_EMATCH_CMP is not set -# CONFIG_NET_EMATCH_META is not set -# CONFIG_NET_EMATCH_NBYTE is not set -CONFIG_NET_EMATCH_STACK=32 -# CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_EMATCH_U32 is not set -# CONFIG_NET_FC is not set -# CONFIG_NET_FOU is not set -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_NET_IPGRE is not set -CONFIG_NET_IPGRE_BROADCAST=y -# CONFIG_NET_IPGRE_DEMUX is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPVTI is not set -# CONFIG_NET_IP_TUNNEL is not set -# CONFIG_NET_KEY is not set -# CONFIG_NET_KEY_MIGRATE is not set -# CONFIG_NET_L3_MASTER_DEV is not set -# CONFIG_NET_MPLS_GSO is not set -# CONFIG_NET_NCSI is not set -# CONFIG_NET_PACKET_ENGINE is not set -# CONFIG_NET_PKTGEN is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_NET_PTP_CLASSIFY is not set -CONFIG_NET_RX_BUSY_POLL=y -# CONFIG_NET_SB1000 is not set -CONFIG_NET_SCHED=y -# CONFIG_NET_SCH_ATM is not set -# CONFIG_NET_SCH_CBQ is not set -# CONFIG_NET_SCH_CHOKE is not set -# CONFIG_NET_SCH_CODEL is not set -# CONFIG_NET_SCH_DRR is not set -# CONFIG_NET_SCH_DSMARK is not set -CONFIG_NET_SCH_FIFO=y -# CONFIG_NET_SCH_FQ is not set -CONFIG_NET_SCH_FQ_CODEL=y -# CONFIG_NET_SCH_GRED is not set -# CONFIG_NET_SCH_HFSC is not set -# CONFIG_NET_SCH_HHF is not set -# CONFIG_NET_SCH_HTB is not set -# CONFIG_NET_SCH_INGRESS is not set -# CONFIG_NET_SCH_MQPRIO is not set -# CONFIG_NET_SCH_MULTIQ is not set -# CONFIG_NET_SCH_NETEM is not set -# CONFIG_NET_SCH_PIE is not set -# CONFIG_NET_SCH_PLUG is not set -# CONFIG_NET_SCH_PRIO is not set -# CONFIG_NET_SCH_QFQ is not set -# CONFIG_NET_SCH_RED is not set -# CONFIG_NET_SCH_SFB is not set -# CONFIG_NET_SCH_SFQ is not set -# CONFIG_NET_SCH_TBF is not set -# CONFIG_NET_SCH_TEQL is not set -# CONFIG_NET_SCTPPROBE is not set -# CONFIG_NET_SWITCHDEV is not set -# CONFIG_NET_TCPPROBE is not set -# CONFIG_NET_TEAM is not set -# CONFIG_NET_TULIP is not set -# CONFIG_NET_UDP_TUNNEL is not set -CONFIG_NET_VENDOR_3COM=y -CONFIG_NET_VENDOR_8390=y -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_NET_VENDOR_AGERE=y -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_NET_VENDOR_AMAZON=y -CONFIG_NET_VENDOR_AMD=y -CONFIG_NET_VENDOR_ARC=y -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_NET_VENDOR_AURORA=y -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_NET_VENDOR_CAVIUM=y -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_NET_VENDOR_CIRRUS=y -CONFIG_NET_VENDOR_CISCO=y -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_VENDOR_DLINK=y -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_NET_VENDOR_EXAR=y -CONFIG_NET_VENDOR_EZCHIP=y -CONFIG_NET_VENDOR_FARADAY=y -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_NET_VENDOR_HISILICON=y -CONFIG_NET_VENDOR_HP=y -CONFIG_NET_VENDOR_I825XX=y -CONFIG_NET_VENDOR_IBM=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_NET_VENDOR_MICREL=y -CONFIG_NET_VENDOR_MICROCHIP=y -CONFIG_NET_VENDOR_MYRI=y -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_NETRONOME=y -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_NET_VENDOR_OKI=y -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_NET_VENDOR_QUALCOMM=y -CONFIG_NET_VENDOR_RDC=y -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_NET_VENDOR_RENESAS=y -CONFIG_NET_VENDOR_ROCKER=y -CONFIG_NET_VENDOR_SAMSUNG=y -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_NET_VENDOR_SIS=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_NET_VENDOR_SUN=y -CONFIG_NET_VENDOR_SYNOPSYS=y -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_NET_VENDOR_TI=y -CONFIG_NET_VENDOR_TOSHIBA=y -CONFIG_NET_VENDOR_VIA=y -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_NET_VENDOR_XILINX=y -CONFIG_NET_VENDOR_XIRCOM=y -# CONFIG_NET_VRF is not set -# CONFIG_NET_XGENE is not set -CONFIG_NEW_LEDS=y -# CONFIG_NFC is not set -# CONFIG_NFP_NETVF is not set -# CONFIG_NFSD is not set -# CONFIG_NFSD_V2_ACL is not set -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -# CONFIG_NFSD_V4 is not set -# CONFIG_NFS_ACL_SUPPORT is not set -CONFIG_NFS_COMMON=y -# CONFIG_NFS_FS is not set -# CONFIG_NFS_FSCACHE is not set -# CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V2 is not set -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_V4_1 is not set -# CONFIG_NFTL is not set -# CONFIG_NFT_BRIDGE_META is not set -# CONFIG_NFT_BRIDGE_REJECT is not set -# CONFIG_NFT_DUP_IPV4 is not set -# CONFIG_NFT_DUP_IPV6 is not set -# CONFIG_NF_CONNTRACK is not set -# CONFIG_NF_CONNTRACK_AMANDA is not set -# CONFIG_NF_CONNTRACK_EVENTS is not set -# CONFIG_NF_CONNTRACK_FTP is not set -# CONFIG_NF_CONNTRACK_H323 is not set -# CONFIG_NF_CONNTRACK_IPV4 is not set -# CONFIG_NF_CONNTRACK_IPV6 is not set -# CONFIG_NF_CONNTRACK_IRC is not set -# CONFIG_NF_CONNTRACK_MARK is not set -# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set -# CONFIG_NF_CONNTRACK_PPTP is not set -CONFIG_NF_CONNTRACK_PROCFS=y -# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -# CONFIG_NF_CONNTRACK_SANE is not set -# CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_NF_CONNTRACK_SNMP is not set -# CONFIG_NF_CONNTRACK_TFTP is not set -# CONFIG_NF_CONNTRACK_TIMEOUT is not set -# CONFIG_NF_CONNTRACK_TIMESTAMP is not set -# CONFIG_NF_CONNTRACK_ZONES is not set -# CONFIG_NF_CT_NETLINK is not set -# CONFIG_NF_CT_NETLINK_TIMEOUT is not set -# CONFIG_NF_CT_PROTO_DCCP is not set -# CONFIG_NF_CT_PROTO_GRE is not set -# CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set -# CONFIG_NF_DEFRAG_IPV4 is not set -# CONFIG_NF_DUP_IPV4 is not set -# CONFIG_NF_DUP_IPV6 is not set -# CONFIG_NF_LOG_ARP is not set -# CONFIG_NF_LOG_IPV4 is not set -# CONFIG_NF_NAT is not set -# CONFIG_NF_NAT_AMANDA is not set -# CONFIG_NF_NAT_FTP is not set -# CONFIG_NF_NAT_H323 is not set -# CONFIG_NF_NAT_IPV6 is not set -# CONFIG_NF_NAT_IRC is not set -# CONFIG_NF_NAT_MASQUERADE_IPV4 is not set -# CONFIG_NF_NAT_MASQUERADE_IPV6 is not set -# CONFIG_NF_NAT_NEEDED is not set -# CONFIG_NF_NAT_PPTP is not set -# CONFIG_NF_NAT_PROTO_GRE is not set -# CONFIG_NF_NAT_SIP is not set -# CONFIG_NF_NAT_SNMP_BASIC is not set -# CONFIG_NF_NAT_TFTP is not set -# CONFIG_NF_REJECT_IPV4 is not set -# CONFIG_NF_REJECT_IPV6 is not set -# CONFIG_NF_TABLES is not set -# CONFIG_NF_TABLES_NETDEV is not set -# CONFIG_NI65 is not set -# CONFIG_NI903X_WDT is not set -# CONFIG_NILFS2_FS is not set -# CONFIG_NIU is not set -CONFIG_NLATTR=y -# CONFIG_NLMON is not set -# CONFIG_NLM_XLP_BOARD is not set -# CONFIG_NLM_XLR_BOARD is not set -# CONFIG_NLS is not set -# CONFIG_NLS_ASCII is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_MAC_CELTIC is not set -# CONFIG_NLS_MAC_CENTEURO is not set -# CONFIG_NLS_MAC_CROATIAN is not set -# CONFIG_NLS_MAC_CYRILLIC is not set -# CONFIG_NLS_MAC_GAELIC is not set -# CONFIG_NLS_MAC_GREEK is not set -# CONFIG_NLS_MAC_ICELAND is not set -# CONFIG_NLS_MAC_INUIT is not set -# CONFIG_NLS_MAC_ROMAN is not set -# CONFIG_NLS_MAC_ROMANIAN is not set -# CONFIG_NLS_MAC_TURKISH is not set -# CONFIG_NLS_UTF8 is not set -CONFIG_NMI_LOG_BUF_SHIFT=13 -# CONFIG_NOP_USB_XCEIV is not set -# CONFIG_NORTEL_HERMES is not set -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_NOZOMI is not set -# CONFIG_NO_BOOTMEM is not set -# CONFIG_NO_HZ is not set -# CONFIG_NO_HZ_FULL is not set -# CONFIG_NO_HZ_IDLE is not set -# CONFIG_NS83820 is not set -# CONFIG_NTB is not set -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set -# CONFIG_NTP_PPS is not set -# CONFIG_NVM is not set -# CONFIG_NVMEM is not set -# CONFIG_NVMEM_IMX_OCOTP is not set -# CONFIG_NVME_TARGET is not set -# CONFIG_NVRAM is not set -# CONFIG_NV_TCO is not set -# CONFIG_NXP_STB220 is not set -# CONFIG_NXP_STB225 is not set -# CONFIG_N_GSM is not set -# CONFIG_OABI_COMPAT is not set -# CONFIG_OBS600 is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_OF_OVERLAY is not set -# CONFIG_OF_UNITTEST is not set -# CONFIG_OMAP2_DSS_DEBUG is not set -# CONFIG_OMAP2_DSS_DEBUGFS is not set -# CONFIG_OMAP2_DSS_SDI is not set -# CONFIG_OMAP_OCP2SCP is not set -# CONFIG_OMAP_USB2 is not set -# CONFIG_OMFS_FS is not set -# CONFIG_OPENVSWITCH is not set -# CONFIG_OPROFILE is not set -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -# CONFIG_OPT3001 is not set -# CONFIG_OPTIMIZE_INLINING is not set -# CONFIG_ORANGEFS_FS is not set -# CONFIG_ORION_WATCHDOG is not set -# CONFIG_OSF_PARTITION is not set -CONFIG_OVERLAY_FS=y -# CONFIG_OWL_LOADER is not set -# CONFIG_P54_COMMON is not set -# CONFIG_PA12203001 is not set -CONFIG_PACKET=y -# CONFIG_PACKET_DIAG is not set -# CONFIG_PAGE_EXTENSION is not set -# CONFIG_PAGE_OWNER is not set -# CONFIG_PAGE_POISONING is not set -# CONFIG_PAGE_SIZE_16KB is not set -# CONFIG_PAGE_SIZE_32KB is not set -CONFIG_PAGE_SIZE_4KB=y -# CONFIG_PAGE_SIZE_64KB is not set -# CONFIG_PAGE_SIZE_8KB is not set -# CONFIG_PALMAS_GPADC is not set -# CONFIG_PANASONIC_LAPTOP is not set -# CONFIG_PANEL is not set -CONFIG_PANIC_ON_OOPS=y -CONFIG_PANIC_ON_OOPS_VALUE=1 -CONFIG_PANIC_TIMEOUT=1 -# CONFIG_PANTHERLORD_FF is not set -# CONFIG_PARAVIRT is not set -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -# CONFIG_PARPORT is not set -# CONFIG_PARPORT_1284 is not set -# CONFIG_PARPORT_AX88796 is not set -# CONFIG_PARPORT_GSC is not set -# CONFIG_PARPORT_PC is not set -CONFIG_PARTITION_ADVANCED=y -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -# CONFIG_PATA_ARASAN_CF is not set -# CONFIG_PATA_ARTOP is not set -# CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_ATP867X is not set -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_CMD64X is not set -# CONFIG_PATA_CS5520 is not set -# CONFIG_PATA_CS5530 is not set -# CONFIG_PATA_CS5535 is not set -# CONFIG_PATA_CS5536 is not set -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -# CONFIG_PATA_IMX is not set -# CONFIG_PATA_ISAPNP is not set -# CONFIG_PATA_IT8213 is not set -# CONFIG_PATA_IT821X is not set -# CONFIG_PATA_JMICRON is not set -# CONFIG_PATA_LEGACY is not set -# CONFIG_PATA_MARVELL is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_NETCELL is not set -# CONFIG_PATA_NINJA32 is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OCTEON_CF is not set -# CONFIG_PATA_OF_PLATFORM is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PCMCIA is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_PLATFORM is not set -# CONFIG_PATA_QDI is not set -# CONFIG_PATA_RADISYS is not set -# CONFIG_PATA_RDC is not set -# CONFIG_PATA_RZ1000 is not set -# CONFIG_PATA_SC1200 is not set -# CONFIG_PATA_SCH is not set -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_SIL680 is not set -# CONFIG_PATA_SIS is not set -# CONFIG_PATA_TOSHIBA is not set -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set -# CONFIG_PATA_WINBOND_VLB is not set -# CONFIG_PC300TOO is not set -# CONFIG_PCCARD is not set -# CONFIG_PCH_DMA is not set -# CONFIG_PCH_GBE is not set -# CONFIG_PCH_PHUB is not set -# CONFIG_PCI is not set -# CONFIG_PCI200SYN is not set -# CONFIG_PCIEAER_INJECT is not set -# CONFIG_PCIEASPM is not set -# CONFIG_PCIEPORTBUS is not set -# CONFIG_PCIE_ALTERA is not set -# CONFIG_PCIE_ARMADA_8K is not set -# CONFIG_PCIE_DPC is not set -# CONFIG_PCIE_DW_PLAT is not set -# CONFIG_PCIE_ECRC is not set -# CONFIG_PCIE_IPROC is not set -# CONFIG_PCIE_PTM is not set -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_PCI_ATMEL is not set -# CONFIG_PCI_CNB20LE_QUIRK is not set -# CONFIG_PCI_DEBUG is not set -# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set -# CONFIG_PCI_HERMES is not set -# CONFIG_PCI_HOST_GENERIC is not set -# CONFIG_PCI_HOST_THUNDER_ECAM is not set -# CONFIG_PCI_HOST_THUNDER_PEM is not set -# CONFIG_PCI_IOV is not set -# CONFIG_PCI_LAYERSCAPE is not set -# CONFIG_PCI_MSI is not set -# CONFIG_PCI_PASID is not set -# CONFIG_PCI_PRI is not set -CONFIG_PCI_QUIRKS=y -# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set -# CONFIG_PCI_STUB is not set -CONFIG_PCI_SYSCALL=y -# CONFIG_PCMCIA is not set -# CONFIG_PCMCIA_3C574 is not set -# CONFIG_PCMCIA_3C589 is not set -# CONFIG_PCMCIA_AHA152X is not set -# CONFIG_PCMCIA_ATMEL is not set -# CONFIG_PCMCIA_AXNET is not set -# CONFIG_PCMCIA_DEBUG is not set -# CONFIG_PCMCIA_FDOMAIN is not set -# CONFIG_PCMCIA_FMVJ18X is not set -# CONFIG_PCMCIA_HERMES is not set -# CONFIG_PCMCIA_LOAD_CIS is not set -# CONFIG_PCMCIA_NINJA_SCSI is not set -# CONFIG_PCMCIA_NMCLAN is not set -# CONFIG_PCMCIA_PCNET is not set -# CONFIG_PCMCIA_QLOGIC is not set -# CONFIG_PCMCIA_RAYCS is not set -# CONFIG_PCMCIA_SMC91C92 is not set -# CONFIG_PCMCIA_SPECTRUM is not set -# CONFIG_PCMCIA_SYM53C500 is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_PCMCIA_XIRC2PS is not set -# CONFIG_PCMCIA_XIRCOM is not set -# CONFIG_PCNET32 is not set -# CONFIG_PCSPKR_PLATFORM is not set -# CONFIG_PD6729 is not set -# CONFIG_PDA_POWER is not set -# CONFIG_PDC_ADMA is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_PERF_EVENTS is not set -# CONFIG_PERF_EVENTS_AMD_POWER is not set -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_PHANTOM is not set -# CONFIG_PHONET is not set -# CONFIG_PHYLIB is not set -# CONFIG_PHYS_ADDR_T_64BIT is not set -# CONFIG_PHY_EXYNOS_DP_VIDEO is not set -# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set -# CONFIG_PHY_PXA_28NM_HSIC is not set -# CONFIG_PHY_PXA_28NM_USB2 is not set -# CONFIG_PHY_QCOM_DWC3 is not set -# CONFIG_PHY_SAMSUNG_USB2 is not set -# CONFIG_PID_IN_CONTEXTIDR is not set -# CONFIG_PID_NS is not set -CONFIG_PINCONF=y -# CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_AMD is not set -# CONFIG_PINCTRL_EXYNOS is not set -# CONFIG_PINCTRL_EXYNOS5440 is not set -# CONFIG_PINCTRL_MSM8X74 is not set -CONFIG_PINCTRL_SINGLE=y -CONFIG_PINMUX=y -# CONFIG_PKCS7_MESSAGE_PARSER is not set -# CONFIG_PL320_MBOX is not set -# CONFIG_PL330_DMA is not set -# CONFIG_PLATFORM_MHU is not set -# CONFIG_PLAT_SPEAR is not set -# CONFIG_PLIP is not set -# CONFIG_PLX_HERMES is not set -# CONFIG_PM is not set -# CONFIG_PMBUS is not set -# CONFIG_PMC_MSP is not set -# CONFIG_PMIC_ADP5520 is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_DEVFREQ is not set -# CONFIG_PM_WAKELOCKS is not set -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_POWERCAP is not set -# CONFIG_POWER_AVS is not set -# CONFIG_POWER_RESET is not set -# CONFIG_POWER_RESET_BRCMKONA is not set -# CONFIG_POWER_RESET_BRCMSTB is not set -# CONFIG_POWER_RESET_GPIO is not set -# CONFIG_POWER_RESET_GPIO_RESTART is not set -# CONFIG_POWER_RESET_LTC2952 is not set -# CONFIG_POWER_RESET_RESTART is not set -# CONFIG_POWER_RESET_SYSCON is not set -# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set -# CONFIG_POWER_RESET_VERSATILE is not set -# CONFIG_POWER_RESET_XGENE is not set -# CONFIG_POWER_SUPPLY is not set -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PPC4xx_GPIO is not set -# CONFIG_PPC_16K_PAGES is not set -# CONFIG_PPC_256K_PAGES is not set -CONFIG_PPC_4K_PAGES=y -# CONFIG_PPC_64K_PAGES is not set -CONFIG_PPC_BARRIER_NOSPEC=y -# CONFIG_PPC_DISABLE_WERROR is not set -# CONFIG_PPC_EMULATED_STATS is not set -# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set -# CONFIG_PPP is not set -# CONFIG_PPPOATM is not set -# CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set -# CONFIG_PPP_ASYNC is not set -# CONFIG_PPP_BSDCOMP is not set -# CONFIG_PPP_DEFLATE is not set -CONFIG_PPP_FILTER=y -# CONFIG_PPP_MPPE is not set -CONFIG_PPP_MULTILINK=y -# CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPS is not set -# CONFIG_PPS_CLIENT_GPIO is not set -# CONFIG_PPS_CLIENT_KTIMER is not set -# CONFIG_PPS_CLIENT_LDISC is not set -# CONFIG_PPS_CLIENT_PARPORT is not set -# CONFIG_PPS_DEBUG is not set -# CONFIG_PPTP is not set -# CONFIG_PREEMPT is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y -# CONFIG_PRINTK_TIME is not set -CONFIG_PRINT_STACK_DEPTH=64 -# CONFIG_PRISM2_USB is not set -# CONFIG_PRISM54 is not set -# CONFIG_PROC_CHILDREN is not set -CONFIG_PROC_FS=y -# CONFIG_PROC_KCORE is not set -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_PROC_STRIPPED=y -CONFIG_PROC_SYSCTL=y -# CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILING is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU is not set -# CONFIG_PROVE_RCU_REPEATEDLY is not set -# CONFIG_PSB6970_PHY is not set -# CONFIG_PSTORE is not set -# CONFIG_PTP_1588_CLOCK is not set -# CONFIG_PTP_1588_CLOCK_IXP46X is not set -# CONFIG_PTP_1588_CLOCK_PCH is not set -# CONFIG_PUBLIC_KEY_ALGO_RSA is not set -# CONFIG_PWM is not set -# CONFIG_PWM_FSL_FTM is not set -# CONFIG_PWM_PCA9685 is not set -CONFIG_PWRSEQ_EMMC=y -CONFIG_PWRSEQ_SIMPLE=y -# CONFIG_QCA7000 is not set -# CONFIG_QCOM_EMAC is not set -# CONFIG_QCOM_HIDMA is not set -# CONFIG_QCOM_HIDMA_MGMT is not set -# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set -# CONFIG_QCOM_SPMI_IADC is not set -# CONFIG_QCOM_SPMI_TEMP_ALARM is not set -# CONFIG_QCOM_SPMI_VADC is not set -# CONFIG_QED is not set -# CONFIG_QLA3XXX is not set -# CONFIG_QLCNIC is not set -# CONFIG_QLGE is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX6FS_FS is not set -# CONFIG_QORIQ_CPUFREQ is not set -# CONFIG_QORIQ_THERMAL is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_QUEUED_LOCK_STAT is not set -# CONFIG_QUOTA is not set -# CONFIG_QUOTACTL is not set -# CONFIG_QUOTA_DEBUG is not set -# CONFIG_R3964 is not set -# CONFIG_R6040 is not set -# CONFIG_R8169 is not set -# CONFIG_R8188EU is not set -# CONFIG_R8712U is not set -# CONFIG_R8723AU is not set -# CONFIG_RADIO_ADAPTERS is not set -# CONFIG_RADIO_AZTECH is not set -# CONFIG_RADIO_CADET is not set -# CONFIG_RADIO_GEMTEK is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_RTRACK is not set -# CONFIG_RADIO_RTRACK2 is not set -# CONFIG_RADIO_SF16FMI is not set -# CONFIG_RADIO_SF16FMR2 is not set -# CONFIG_RADIO_TERRATEC is not set -# CONFIG_RADIO_TRUST is not set -# CONFIG_RADIO_TYPHOON is not set -# CONFIG_RADIO_ZOLTRIX is not set -# CONFIG_RAID_ATTRS is not set -# CONFIG_RALINK is not set -# CONFIG_RANDOM32_SELFTEST is not set -# CONFIG_RAPIDIO is not set -# CONFIG_RAS is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_RBTREE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_EQS_DEBUG is not set -# CONFIG_RCU_EXPEDITE_BOOT is not set -CONFIG_RCU_EXPERT=y -CONFIG_RCU_FANOUT=32 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FAST_NO_HZ is not set -CONFIG_RCU_KTHREAD_PRIO=0 -# CONFIG_RCU_NOCB_CPU is not set -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3 -# CONFIG_RCU_TRACE is not set -# CONFIG_RC_ATI_REMOTE is not set -# CONFIG_RC_CORE is not set -# CONFIG_RC_DECODERS is not set -# CONFIG_RC_LOOPBACK is not set -# CONFIG_RC_MAP is not set -# CONFIG_RDS is not set -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_GZIP is not set -# CONFIG_RD_LZ4 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_LZO is not set -# CONFIG_RD_XZ is not set -# CONFIG_READABLE_ASM is not set -# CONFIG_REALTEK_PHY is not set -# CONFIG_REDWOOD is not set -# CONFIG_REGMAP is not set -# CONFIG_REGMAP_I2C is not set -# CONFIG_REGMAP_MMIO is not set -# CONFIG_REGMAP_SPI is not set -# CONFIG_REGULATOR is not set -# CONFIG_REGULATOR_ACT8865 is not set -# CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_ANATOP is not set -# CONFIG_REGULATOR_DA9210 is not set -# CONFIG_REGULATOR_DA9211 is not set -# CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_FAN53555 is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set -# CONFIG_REGULATOR_GPIO is not set -# CONFIG_REGULATOR_ISL6271A is not set -# CONFIG_REGULATOR_ISL9305 is not set -# CONFIG_REGULATOR_LP3971 is not set -# CONFIG_REGULATOR_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set -# CONFIG_REGULATOR_LP8755 is not set -# CONFIG_REGULATOR_LTC3589 is not set -# CONFIG_REGULATOR_LTC3676 is not set -# CONFIG_REGULATOR_MAX1586 is not set -# CONFIG_REGULATOR_MAX8649 is not set -# CONFIG_REGULATOR_MAX8660 is not set -# CONFIG_REGULATOR_MAX8952 is not set -# CONFIG_REGULATOR_MAX8973 is not set -# CONFIG_REGULATOR_MT6311 is not set -# CONFIG_REGULATOR_PFUZE100 is not set -# CONFIG_REGULATOR_PV88060 is not set -# CONFIG_REGULATOR_PV88080 is not set -# CONFIG_REGULATOR_PV88090 is not set -# CONFIG_REGULATOR_PWM is not set -# CONFIG_REGULATOR_TI_ABB is not set -# CONFIG_REGULATOR_TPS51632 is not set -# CONFIG_REGULATOR_TPS62360 is not set -# CONFIG_REGULATOR_TPS65023 is not set -# CONFIG_REGULATOR_TPS6507X is not set -# CONFIG_REGULATOR_TPS6524X is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_FS_POSIX_ACL is not set -# CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_REISERFS_FS_XATTR is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_RELAY is not set -# CONFIG_RELOCATABLE is not set -# CONFIG_RESET_ATH79 is not set -# CONFIG_RESET_BERLIN is not set -# CONFIG_RESET_CONTROLLER is not set -# CONFIG_RESET_LPC18XX is not set -# CONFIG_RESET_MESON is not set -# CONFIG_RESET_PISTACHIO is not set -# CONFIG_RESET_SOCFPGA is not set -# CONFIG_RESET_STM32 is not set -# CONFIG_RESET_SUNXI is not set -# CONFIG_RESET_ZYNQ is not set -# CONFIG_RFD_FTL is not set -CONFIG_RFKILL=y -# CONFIG_RFKILL_FULL is not set -# CONFIG_RFKILL_GPIO is not set -# CONFIG_RFKILL_INPUT is not set -# CONFIG_RFKILL_LEDS is not set -# CONFIG_RFKILL_REGULATOR is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_RMI4_CORE is not set -# CONFIG_ROCKER is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_ROSE is not set -# CONFIG_RPCSEC_GSS_KRB5 is not set -# CONFIG_RPR0521 is not set -# CONFIG_RT2X00 is not set -# CONFIG_RTC_CLASS is not set -# CONFIG_RTC_DEBUG is not set -# CONFIG_RTC_DRV_ABB5ZES3 is not set -# CONFIG_RTC_DRV_ABX80X is not set -# CONFIG_RTC_DRV_ARMADA38X is not set -# CONFIG_RTC_DRV_AU1XXX is not set -# CONFIG_RTC_DRV_BQ32K is not set -# CONFIG_RTC_DRV_BQ4802 is not set -CONFIG_RTC_DRV_CMOS=y -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1302 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1307_CENTURY is not set -# CONFIG_RTC_DRV_DS1307_HWMON is not set -# CONFIG_RTC_DRV_DS1343 is not set -# CONFIG_RTC_DRV_DS1347 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_DS1685_FAMILY is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_DS2404 is not set -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_EM3027 is not set -# CONFIG_RTC_DRV_EP93XX is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_GENERIC is not set -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -# CONFIG_RTC_DRV_HYM8563 is not set -# CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_ISL12057 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_MAX6916 is not set -# CONFIG_RTC_DRV_MCP795 is not set -# CONFIG_RTC_DRV_MOXART is not set -# CONFIG_RTC_DRV_MPC5121 is not set -# CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_OMAP is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_PCF2127 is not set -# CONFIG_RTC_DRV_PCF85063 is not set -# CONFIG_RTC_DRV_PCF8523 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_PL030 is not set -# CONFIG_RTC_DRV_PL031 is not set -# CONFIG_RTC_DRV_PS3 is not set -# CONFIG_RTC_DRV_PT7C4338 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_RTC7301 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set -# CONFIG_RTC_DRV_RV8803 is not set -# CONFIG_RTC_DRV_RX4581 is not set -# CONFIG_RTC_DRV_RX6110 is not set -# CONFIG_RTC_DRV_RX8010 is not set -# CONFIG_RTC_DRV_RX8025 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_SNVS is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_SUN6I is not set -# CONFIG_RTC_DRV_TEST is not set -# CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_XGENE is not set -# CONFIG_RTC_DRV_ZYNQMP is not set -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_LIB=y -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -# CONFIG_RTL8180 is not set -# CONFIG_RTL8187 is not set -# CONFIG_RTL8192E is not set -# CONFIG_RTL8192U is not set -# CONFIG_RTL8306_PHY is not set -# CONFIG_RTL8366RB_PHY is not set -# CONFIG_RTL8366S_PHY is not set -# CONFIG_RTL8366_SMI is not set -# CONFIG_RTL8366_SMI_DEBUG_FS is not set -# CONFIG_RTL8367B_PHY is not set -# CONFIG_RTL8367_PHY is not set -# CONFIG_RTLLIB is not set -# CONFIG_RTL_CARDS is not set -# CONFIG_RTS5208 is not set -CONFIG_RT_MUTEXES=y -# CONFIG_RUNTIME_DEBUG is not set -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_RXKAD=y -# CONFIG_S2IO is not set -# CONFIG_SAMPLES is not set -# CONFIG_SAMSUNG_LAPTOP is not set -# CONFIG_SATA_ACARD_AHCI is not set -# CONFIG_SATA_AHCI is not set -# CONFIG_SATA_AHCI_PLATFORM is not set -# CONFIG_SATA_DWC is not set -# CONFIG_SATA_FSL is not set -# CONFIG_SATA_HIGHBANK is not set -# CONFIG_SATA_INIC162X is not set -# CONFIG_SATA_MV is not set -# CONFIG_SATA_NV is not set -# CONFIG_SATA_PMP is not set -# CONFIG_SATA_PROMISE is not set -# CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_RCAR is not set -# CONFIG_SATA_SIL is not set -# CONFIG_SATA_SIL24 is not set -# CONFIG_SATA_SIS is not set -# CONFIG_SATA_SVW is not set -# CONFIG_SATA_SX4 is not set -# CONFIG_SATA_ULI is not set -# CONFIG_SATA_VIA is not set -# CONFIG_SATA_VITESSE is not set -# CONFIG_SBC_FITPC2_WATCHDOG is not set -CONFIG_SBITMAP=y -# CONFIG_SC92031 is not set -# CONFIG_SCA3000 is not set -# CONFIG_SCACHE_DEBUGFS is not set -# CONFIG_SCC is not set -# CONFIG_SCHEDSTATS is not set -# CONFIG_SCHED_AUTOGROUP is not set -# CONFIG_SCHED_DEBUG is not set -CONFIG_SCHED_HRTICK=y -# CONFIG_SCHED_MC is not set -CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_SCHED_SMT is not set -# CONFIG_SCHED_STACK_END_CHECK is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_3W_SAS is not set -# CONFIG_SCSI_7000FASST is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC94XX is not set -# CONFIG_SCSI_AM53C974 is not set -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_SCSI_BFA_FC is not set -# CONFIG_SCSI_BNX2X_FCOE is not set -# CONFIG_SCSI_BNX2_ISCSI is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_CHELSIO_FCOE is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_CXGB3_ISCSI is not set -# CONFIG_SCSI_CXGB4_ISCSI is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_DH is not set -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_ESAS2R is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set -# CONFIG_SCSI_HISI_SAS is not set -# CONFIG_SCSI_HPSA is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_ISCI is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set -# CONFIG_SCSI_LPFC is not set -CONFIG_SCSI_MOD=y -# CONFIG_SCSI_MPT2SAS is not set -# CONFIG_SCSI_MPT3SAS is not set -# CONFIG_SCSI_MQ_DEFAULT is not set -# CONFIG_SCSI_MVSAS is not set -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVUMI is not set -# CONFIG_SCSI_NCR53C406A is not set -# CONFIG_SCSI_NETLINK is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_INITIATOR is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PM8001 is not set -# CONFIG_SCSI_PMCRAID is not set -CONFIG_SCSI_PROC_FS=y -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLOGIC_FAS is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -# CONFIG_SCSI_SMARTPQI is not set -# CONFIG_SCSI_SNIC is not set -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_STEX is not set -# CONFIG_SCSI_SYM53C416 is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set -# CONFIG_SCSI_UFSHCD is not set -# CONFIG_SCSI_ULTRASTOR is not set -# CONFIG_SCSI_VIRTIO is not set -# CONFIG_SCSI_WD719X is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_SDIO_UART is not set -# CONFIG_SECCOMP is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -# CONFIG_SECURITY is not set -# CONFIG_SECURITYFS is not set -CONFIG_SECURITY_DMESG_RESTRICT=y -CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_ABITUGURU3 is not set -# CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_AD7314 is not set -# CONFIG_SENSORS_AD7414 is not set -# CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADC128D818 is not set -# CONFIG_SENSORS_ADCXX is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1029 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM1275 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ADS1015 is not set -# CONFIG_SENSORS_ADS7828 is not set -# CONFIG_SENSORS_ADS7871 is not set -# CONFIG_SENSORS_ADT7310 is not set -# CONFIG_SENSORS_ADT7410 is not set -# CONFIG_SENSORS_ADT7411 is not set -# CONFIG_SENSORS_ADT7462 is not set -# CONFIG_SENSORS_ADT7470 is not set -# CONFIG_SENSORS_ADT7475 is not set -# CONFIG_SENSORS_AMC6821 is not set -# CONFIG_SENSORS_APDS990X is not set -# CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ASC7621 is not set -# CONFIG_SENSORS_ATK0110 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_BH1770 is not set -# CONFIG_SENSORS_BH1780 is not set -# CONFIG_SENSORS_CORETEMP is not set -# CONFIG_SENSORS_DELL_SMM is not set -# CONFIG_SENSORS_DME1737 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_DS620 is not set -# CONFIG_SENSORS_EMC1403 is not set -# CONFIG_SENSORS_EMC2103 is not set -# CONFIG_SENSORS_EMC6W201 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_F71882FG is not set -# CONFIG_SENSORS_F75375S is not set -# CONFIG_SENSORS_FAM15H_POWER is not set -# CONFIG_SENSORS_FSCHMD is not set -# CONFIG_SENSORS_FTSTEUTATES is not set -# CONFIG_SENSORS_G760A is not set -# CONFIG_SENSORS_G762 is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_GPIO_FAN is not set -# CONFIG_SENSORS_GSC is not set -# CONFIG_SENSORS_HDAPS is not set -# CONFIG_SENSORS_HIH6130 is not set -# CONFIG_SENSORS_HMC5843 is not set -# CONFIG_SENSORS_HMC5843_I2C is not set -# CONFIG_SENSORS_HMC5843_SPI is not set -# CONFIG_SENSORS_HTU21 is not set -# CONFIG_SENSORS_I5500 is not set -# CONFIG_SENSORS_I5K_AMB is not set -# CONFIG_SENSORS_IIO_HWMON is not set -# CONFIG_SENSORS_INA209 is not set -# CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set -# CONFIG_SENSORS_ISL29018 is not set -# CONFIG_SENSORS_ISL29028 is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_JC42 is not set -# CONFIG_SENSORS_K10TEMP is not set -# CONFIG_SENSORS_K8TEMP is not set -# CONFIG_SENSORS_LINEAGE is not set -# CONFIG_SENSORS_LIS3LV02D is not set -# CONFIG_SENSORS_LIS3_I2C is not set -# CONFIG_SENSORS_LIS3_SPI is not set -# CONFIG_SENSORS_LM25066 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM70 is not set -# CONFIG_SENSORS_LM73 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_LM93 is not set -# CONFIG_SENSORS_LM95234 is not set -# CONFIG_SENSORS_LM95241 is not set -# CONFIG_SENSORS_LM95245 is not set -# CONFIG_SENSORS_LTC2945 is not set -# CONFIG_SENSORS_LTC2978 is not set -# CONFIG_SENSORS_LTC2990 is not set -# CONFIG_SENSORS_LTC3815 is not set -# CONFIG_SENSORS_LTC4151 is not set -# CONFIG_SENSORS_LTC4215 is not set -# CONFIG_SENSORS_LTC4222 is not set -# CONFIG_SENSORS_LTC4245 is not set -# CONFIG_SENSORS_LTC4260 is not set -# CONFIG_SENSORS_LTC4261 is not set -# CONFIG_SENSORS_MAX1111 is not set -# CONFIG_SENSORS_MAX16064 is not set -# CONFIG_SENSORS_MAX16065 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_MAX1668 is not set -# CONFIG_SENSORS_MAX197 is not set -# CONFIG_SENSORS_MAX20751 is not set -# CONFIG_SENSORS_MAX31722 is not set -# CONFIG_SENSORS_MAX31790 is not set -# CONFIG_SENSORS_MAX34440 is not set -# CONFIG_SENSORS_MAX6639 is not set -# CONFIG_SENSORS_MAX6642 is not set -# CONFIG_SENSORS_MAX6650 is not set -# CONFIG_SENSORS_MAX6697 is not set -# CONFIG_SENSORS_MAX8688 is not set -# CONFIG_SENSORS_MCP3021 is not set -# CONFIG_SENSORS_NCT6683 is not set -# CONFIG_SENSORS_NCT6775 is not set -# CONFIG_SENSORS_NCT7802 is not set -# CONFIG_SENSORS_NCT7904 is not set -# CONFIG_SENSORS_NSA320 is not set -# CONFIG_SENSORS_NTC_THERMISTOR is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_PMBUS is not set -# CONFIG_SENSORS_POWR1220 is not set -# CONFIG_SENSORS_PWM_FAN is not set -# CONFIG_SENSORS_SCH5627 is not set -# CONFIG_SENSORS_SCH5636 is not set -# CONFIG_SENSORS_SCH56XX_COMMON is not set -# CONFIG_SENSORS_SHT15 is not set -# CONFIG_SENSORS_SHT21 is not set -# CONFIG_SENSORS_SHT3x is not set -# CONFIG_SENSORS_SHTC1 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMM665 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set -# CONFIG_SENSORS_TC74 is not set -# CONFIG_SENSORS_THMC50 is not set -# CONFIG_SENSORS_TMP102 is not set -# CONFIG_SENSORS_TMP103 is not set -# CONFIG_SENSORS_TMP401 is not set -# CONFIG_SENSORS_TMP421 is not set -# CONFIG_SENSORS_TPS40422 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_SENSORS_TSL2563 is not set -# CONFIG_SENSORS_UCD9000 is not set -# CONFIG_SENSORS_UCD9200 is not set -# CONFIG_SENSORS_VEXPRESS is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_VIA_CPUTEMP is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_SENSORS_VT8231 is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83793 is not set -# CONFIG_SENSORS_W83795 is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83L786NG is not set -# CONFIG_SENSORS_XGENE is not set -# CONFIG_SENSORS_ZL6100 is not set -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_ACCENT is not set -# CONFIG_SERIAL_8250_BOCA is not set -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_CS is not set -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_DMA=y -# CONFIG_SERIAL_8250_DW is not set -# CONFIG_SERIAL_8250_EM is not set -# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set -# CONFIG_SERIAL_8250_EXTENDED is not set -# CONFIG_SERIAL_8250_FINTEK is not set -# CONFIG_SERIAL_8250_FOURPORT is not set -# CONFIG_SERIAL_8250_HUB6 is not set -# CONFIG_SERIAL_8250_INGENIC is not set -# CONFIG_SERIAL_8250_LPSS is not set -# CONFIG_SERIAL_8250_MANY_PORTS is not set -# CONFIG_SERIAL_8250_MID is not set -# CONFIG_SERIAL_8250_MOXA is not set -CONFIG_SERIAL_8250_NR_UARTS=2 -# CONFIG_SERIAL_8250_PCI is not set -# CONFIG_SERIAL_8250_RSA is not set -# CONFIG_SERIAL_8250_RT288X is not set -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_AMBA_PL010 is not set -# CONFIG_SERIAL_ARC is not set -# CONFIG_SERIAL_BCM63XX is not set -# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_EARLYCON=y -# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set -# CONFIG_SERIAL_FSL_LPUART is not set -# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set -# CONFIG_SERIAL_IFX6X60 is not set -# CONFIG_SERIAL_JSM is not set -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_SERIAL_OF_PLATFORM is not set -# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set -# CONFIG_SERIAL_PCH_UART is not set -# CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX is not set -# CONFIG_SERIAL_SCCNXP is not set -# CONFIG_SERIAL_SH_SCI is not set -# CONFIG_SERIAL_STM32 is not set -# CONFIG_SERIAL_ST_ASC is not set -# CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_UARTLITE is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -# CONFIG_SERIO is not set -# CONFIG_SERIO_ALTERA_PS2 is not set -# CONFIG_SERIO_AMBAKMI is not set -# CONFIG_SERIO_APBPS2 is not set -# CONFIG_SERIO_ARC_PS2 is not set -# CONFIG_SERIO_I8042 is not set -# CONFIG_SERIO_LIBPS2 is not set -# CONFIG_SERIO_PARKBD is not set -# CONFIG_SERIO_PCIPS2 is not set -# CONFIG_SERIO_PS2MULT is not set -# CONFIG_SERIO_RAW is not set -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_SUN4I_PS2 is not set -# CONFIG_SFC is not set -# CONFIG_SFI is not set -# CONFIG_SGETMASK_SYSCALL is not set -# CONFIG_SGI_IOC4 is not set -# CONFIG_SGI_IP22 is not set -# CONFIG_SGI_IP27 is not set -# CONFIG_SGI_IP28 is not set -# CONFIG_SGI_IP32 is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_SG_POOL is not set -# CONFIG_SG_SPLIT is not set -CONFIG_SHMEM=y -# CONFIG_SH_ETH is not set -# CONFIG_SH_TIMER_CMT is not set -# CONFIG_SH_TIMER_MTU2 is not set -# CONFIG_SH_TIMER_TMU is not set -# CONFIG_SI1145 is not set -# CONFIG_SI7005 is not set -# CONFIG_SI7020 is not set -# CONFIG_SIBYTE_BIGSUR is not set -# CONFIG_SIBYTE_CARMEL is not set -# CONFIG_SIBYTE_CRHINE is not set -# CONFIG_SIBYTE_CRHONE is not set -# CONFIG_SIBYTE_LITTLESUR is not set -# CONFIG_SIBYTE_RHONE is not set -# CONFIG_SIBYTE_SENTOSA is not set -# CONFIG_SIBYTE_SWARM is not set -CONFIG_SIGNALFD=y -# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set -# CONFIG_SIMPLE_GPIO is not set -# CONFIG_SIS190 is not set -# CONFIG_SIS900 is not set -# CONFIG_SKGE is not set -# CONFIG_SKY2 is not set -# CONFIG_SKY2_DEBUG is not set -# CONFIG_SLAB is not set -CONFIG_SLABINFO=y -# CONFIG_SLAB_FREELIST_RANDOM is not set -# CONFIG_SLHC is not set -# CONFIG_SLICOSS is not set -# CONFIG_SLIP is not set -# CONFIG_SLOB is not set -CONFIG_SLUB=y -CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -# CONFIG_SMARTJOYPLUS_FF is not set -# CONFIG_SMC911X is not set -# CONFIG_SMC9194 is not set -# CONFIG_SMC91X is not set -# CONFIG_SMP is not set -# CONFIG_SMSC911X is not set -# CONFIG_SMSC9420 is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_SM_FTL is not set -# CONFIG_SND is not set -# CONFIG_SND_AC97_POWER_SAVE is not set -# CONFIG_SND_AD1816A is not set -# CONFIG_SND_AD1848 is not set -# CONFIG_SND_AD1889 is not set -# CONFIG_SND_ADLIB is not set -# CONFIG_SND_ALI5451 is not set -# CONFIG_SND_ALOOP is not set -# CONFIG_SND_ALS100 is not set -# CONFIG_SND_ALS300 is not set -# CONFIG_SND_ALS4000 is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_ASIHPI is not set -# CONFIG_SND_ATIIXP is not set -# CONFIG_SND_ATIIXP_MODEM is not set -# CONFIG_SND_ATMEL_AC97C is not set -# CONFIG_SND_ATMEL_SOC is not set -# CONFIG_SND_AU8810 is not set -# CONFIG_SND_AU8820 is not set -# CONFIG_SND_AU8830 is not set -# CONFIG_SND_AW2 is not set -# CONFIG_SND_AZT2320 is not set -# CONFIG_SND_AZT3328 is not set -# CONFIG_SND_BCD2000 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_CMI8330 is not set -# CONFIG_SND_CMIPCI is not set -# CONFIG_SND_CS4231 is not set -# CONFIG_SND_CS4236 is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_CS46XX is not set -# CONFIG_SND_CS5530 is not set -# CONFIG_SND_CS5535AUDIO is not set -# CONFIG_SND_CTXFI is not set -# CONFIG_SND_DARLA20 is not set -# CONFIG_SND_DARLA24 is not set -# CONFIG_SND_DEBUG is not set -# CONFIG_SND_DESIGNWARE_I2S is not set -CONFIG_SND_DRIVERS=y -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_ECHO3G is not set -# CONFIG_SND_EDMA_SOC is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set -# CONFIG_SND_EMU10K1_SEQ is not set -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_ES1688 is not set -# CONFIG_SND_ES18XX is not set -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set -# CONFIG_SND_FIREWIRE is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_GINA20 is not set -# CONFIG_SND_GINA24 is not set -# CONFIG_SND_GUSCLASSIC is not set -# CONFIG_SND_GUSEXTREME is not set -# CONFIG_SND_GUSMAX is not set -# CONFIG_SND_HDA_INTEL is not set -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDA_PREALLOC_SIZE=64 -# CONFIG_SND_HDSP is not set -# CONFIG_SND_HDSPM is not set -# CONFIG_SND_HRTIMER is not set -# CONFIG_SND_HWDEP is not set -# CONFIG_SND_ICE1712 is not set -# CONFIG_SND_ICE1724 is not set -# CONFIG_SND_INDIGO is not set -# CONFIG_SND_INDIGODJ is not set -# CONFIG_SND_INDIGODJX is not set -# CONFIG_SND_INDIGOIO is not set -# CONFIG_SND_INDIGOIOX is not set -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_INTEL8X0M is not set -# CONFIG_SND_INTERWAVE is not set -# CONFIG_SND_INTERWAVE_STB is not set -# CONFIG_SND_ISA is not set -# CONFIG_SND_KIRKWOOD_SOC is not set -# CONFIG_SND_KORG1212 is not set -# CONFIG_SND_LAYLA20 is not set -# CONFIG_SND_LAYLA24 is not set -# CONFIG_SND_LOLA is not set -# CONFIG_SND_LX6464ES is not set -# CONFIG_SND_MAESTRO3 is not set -# CONFIG_SND_MIA is not set -# CONFIG_SND_MIPS is not set -# CONFIG_SND_MIRO is not set -# CONFIG_SND_MIXART is not set -# CONFIG_SND_MIXER_OSS is not set -# CONFIG_SND_MONA is not set -# CONFIG_SND_MPC52xx_SOC_EFIKA is not set -# CONFIG_SND_MPU401 is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_MTS64 is not set -# CONFIG_SND_MXS_SOC is not set -# CONFIG_SND_NM256 is not set -# CONFIG_SND_OPL3SA2 is not set -# CONFIG_SND_OPL3_LIB_SEQ is not set -# CONFIG_SND_OPL4_LIB_SEQ is not set -# CONFIG_SND_OPTI92X_AD1848 is not set -# CONFIG_SND_OPTI92X_CS4231 is not set -# CONFIG_SND_OPTI93X is not set -CONFIG_SND_OSSEMUL=y -# CONFIG_SND_OXYGEN is not set -CONFIG_SND_PCI=y -# CONFIG_SND_PCM is not set -# CONFIG_SND_PCMCIA is not set -# CONFIG_SND_PCM_OSS is not set -CONFIG_SND_PCM_OSS_PLUGINS=y -# CONFIG_SND_PCM_TIMER is not set -# CONFIG_SND_PCM_XRUN_DEBUG is not set -# CONFIG_SND_PCXHR is not set -# CONFIG_SND_PDAUDIOCF is not set -# CONFIG_SND_PORTMAN2X4 is not set -# CONFIG_SND_POWERPC_SOC is not set -# CONFIG_SND_PPC is not set -CONFIG_SND_PROC_FS=y -# CONFIG_SND_RAWMIDI is not set -# CONFIG_SND_RAWMIDI_SEQ is not set -# CONFIG_SND_RIPTIDE is not set -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_RTCTIMER is not set -# CONFIG_SND_SB16 is not set -# CONFIG_SND_SB8 is not set -# CONFIG_SND_SBAWE is not set -# CONFIG_SND_SBAWE_SEQ is not set -# CONFIG_SND_SE6X is not set -# CONFIG_SND_SEQUENCER is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_SIMPLE_CARD is not set -# CONFIG_SND_SIMPLE_SCU_CARD is not set -# CONFIG_SND_SIS7019 is not set -# CONFIG_SND_SOC is not set -# CONFIG_SND_SOC_AC97_CODEC is not set -# CONFIG_SND_SOC_ADAU1701 is not set -# CONFIG_SND_SOC_ADAU7002 is not set -# CONFIG_SND_SOC_AK4104 is not set -# CONFIG_SND_SOC_AK4554 is not set -# CONFIG_SND_SOC_AK4613 is not set -# CONFIG_SND_SOC_AK4642 is not set -# CONFIG_SND_SOC_AK5386 is not set -# CONFIG_SND_SOC_ALC5623 is not set -# CONFIG_SND_SOC_AMD_ACP is not set -# CONFIG_SND_SOC_AU1XAUDIO is not set -# CONFIG_SND_SOC_AU1XPSC is not set -# CONFIG_SND_SOC_BT_SCO is not set -# CONFIG_SND_SOC_CS35L32 is not set -# CONFIG_SND_SOC_CS35L33 is not set -# CONFIG_SND_SOC_CS4265 is not set -# CONFIG_SND_SOC_CS4270 is not set -# CONFIG_SND_SOC_CS4271 is not set -# CONFIG_SND_SOC_CS4271_I2C is not set -# CONFIG_SND_SOC_CS4271_SPI is not set -# CONFIG_SND_SOC_CS42L51_I2C is not set -# CONFIG_SND_SOC_CS42L52 is not set -# CONFIG_SND_SOC_CS42L56 is not set -# CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42XX8_I2C is not set -# CONFIG_SND_SOC_CS4349 is not set -# CONFIG_SND_SOC_CS53L30 is not set -# CONFIG_SND_SOC_ES8328 is not set -# CONFIG_SND_SOC_EUKREA_TLV320 is not set -# CONFIG_SND_SOC_FSL_ASOC_CARD is not set -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_ESAI is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_SSI is not set -# CONFIG_SND_SOC_GTM601 is not set -# CONFIG_SND_SOC_ICS43432 is not set -# CONFIG_SND_SOC_IMG is not set -# CONFIG_SND_SOC_IMX_AUDMUX is not set -# CONFIG_SND_SOC_IMX_ES8328 is not set -# CONFIG_SND_SOC_IMX_SPDIF is not set -# CONFIG_SND_SOC_IMX_WM8962 is not set -# CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set -# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set -# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set -# CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH is not set -# CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set -# CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH is not set -# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set -# CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set -# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH is not set -# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH is not set -# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set -# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set -# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set -# CONFIG_SND_SOC_INTEL_SST is not set -# CONFIG_SND_SOC_MAX98504 is not set -# CONFIG_SND_SOC_MAX9860 is not set -# CONFIG_SND_SOC_MEDIATEK is not set -# CONFIG_SND_SOC_MPC5200_AC97 is not set -# CONFIG_SND_SOC_MPC5200_I2S is not set -# CONFIG_SND_SOC_MT2701 is not set -# CONFIG_SND_SOC_MT8173 is not set -# CONFIG_SND_SOC_NAU8810 is not set -# CONFIG_SND_SOC_PCM1681 is not set -# CONFIG_SND_SOC_PCM1792A is not set -# CONFIG_SND_SOC_PCM179X_I2C is not set -# CONFIG_SND_SOC_PCM179X_SPI is not set -# CONFIG_SND_SOC_PCM3168A_I2C is not set -# CONFIG_SND_SOC_PCM3168A_SPI is not set -# CONFIG_SND_SOC_PCM512x_I2C is not set -# CONFIG_SND_SOC_PCM512x_SPI is not set -# CONFIG_SND_SOC_QCOM is not set -# CONFIG_SND_SOC_RT5616 is not set -# CONFIG_SND_SOC_RT5631 is not set -# CONFIG_SND_SOC_RT5677_SPI is not set -# CONFIG_SND_SOC_SGTL5000 is not set -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set -# CONFIG_SND_SOC_SPDIF is not set -# CONFIG_SND_SOC_SSM2602_I2C is not set -# CONFIG_SND_SOC_SSM2602_SPI is not set -# CONFIG_SND_SOC_SSM4567 is not set -# CONFIG_SND_SOC_STA32X is not set -# CONFIG_SND_SOC_STA350 is not set -# CONFIG_SND_SOC_STI_SAS is not set -# CONFIG_SND_SOC_TAS2552 is not set -# CONFIG_SND_SOC_TAS5086 is not set -# CONFIG_SND_SOC_TAS571X is not set -# CONFIG_SND_SOC_TAS5720 is not set -# CONFIG_SND_SOC_TFA9879 is not set -# CONFIG_SND_SOC_TLV320AIC23_I2C is not set -# CONFIG_SND_SOC_TLV320AIC23_SPI is not set -# CONFIG_SND_SOC_TLV320AIC31XX is not set -# CONFIG_SND_SOC_TLV320AIC3X is not set -# CONFIG_SND_SOC_TPA6130A2 is not set -# CONFIG_SND_SOC_TS3A227E is not set -# CONFIG_SND_SOC_WM8510 is not set -# CONFIG_SND_SOC_WM8523 is not set -# CONFIG_SND_SOC_WM8580 is not set -# CONFIG_SND_SOC_WM8711 is not set -# CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8737 is not set -# CONFIG_SND_SOC_WM8741 is not set -# CONFIG_SND_SOC_WM8750 is not set -# CONFIG_SND_SOC_WM8753 is not set -# CONFIG_SND_SOC_WM8770 is not set -# CONFIG_SND_SOC_WM8776 is not set -# CONFIG_SND_SOC_WM8804_I2C is not set -# CONFIG_SND_SOC_WM8804_SPI is not set -# CONFIG_SND_SOC_WM8903 is not set -# CONFIG_SND_SOC_WM8960 is not set -# CONFIG_SND_SOC_WM8962 is not set -# CONFIG_SND_SOC_WM8974 is not set -# CONFIG_SND_SOC_WM8978 is not set -# CONFIG_SND_SOC_WM8985 is not set -# CONFIG_SND_SOC_XTFPGA_I2S is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_SSCAPE is not set -# CONFIG_SND_SUN4I_CODEC is not set -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_TIMER is not set -# CONFIG_SND_TRIDENT is not set -CONFIG_SND_USB=y -# CONFIG_SND_USB_6FIRE is not set -# CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_USB_CAIAQ is not set -# CONFIG_SND_USB_HIFACE is not set -# CONFIG_SND_USB_POD is not set -# CONFIG_SND_USB_PODHD is not set -# CONFIG_SND_USB_TONEPORT is not set -# CONFIG_SND_USB_UA101 is not set -# CONFIG_SND_USB_US122L is not set -# CONFIG_SND_USB_USX2Y is not set -# CONFIG_SND_USB_VARIAX is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -# CONFIG_SND_VIRTUOSO is not set -# CONFIG_SND_VX222 is not set -# CONFIG_SND_VXPOCKET is not set -# CONFIG_SND_WAVEFRONT is not set -# CONFIG_SND_YMFPCI is not set -# CONFIG_SNI_RM is not set -# CONFIG_SOCK_CGROUP_DATA is not set -# CONFIG_SOC_AM33XX is not set -# CONFIG_SOC_AM43XX is not set -# CONFIG_SOC_BRCMSTB is not set -# CONFIG_SOC_CAMERA is not set -# CONFIG_SOC_DRA7XX is not set -# CONFIG_SOC_HAS_OMAP2_SDRC is not set -# CONFIG_SOC_OMAP5 is not set -# CONFIG_SOC_TI is not set -# CONFIG_SOFT_WATCHDOG is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_SONYPI is not set -# CONFIG_SONY_LAPTOP is not set -# CONFIG_SOUND is not set -# CONFIG_SOUND_OSS_CORE is not set -# CONFIG_SOUND_PRIME is not set -# CONFIG_SP5100_TCO is not set -# CONFIG_SPARSEMEM_MANUAL is not set -# CONFIG_SPARSEMEM_STATIC is not set -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -# CONFIG_SPARSE_IRQ is not set -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_SPEAKUP is not set -# CONFIG_SPI is not set -# CONFIG_SPINLOCK_TEST is not set -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AU1550 is not set -# CONFIG_SPI_AXI_SPI_ENGINE is not set -# CONFIG_SPI_BCM2835 is not set -# CONFIG_SPI_BCM_QSPI is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_CADENCE is not set -# CONFIG_SPI_CADENCE_QUADSPI is not set -# CONFIG_SPI_DEBUG is not set -# CONFIG_SPI_DESIGNWARE is not set -# CONFIG_SPI_FSL_DSPI is not set -# CONFIG_SPI_FSL_ESPI is not set -# CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_GPIO_OLD is not set -# CONFIG_SPI_IMG_SPFI is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_LOOPBACK_TEST is not set -# CONFIG_SPI_MASTER is not set -# CONFIG_SPI_MPC52xx is not set -# CONFIG_SPI_MPC52xx_PSC is not set -# CONFIG_SPI_OCTEON is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_ORION is not set -# CONFIG_SPI_PL022 is not set -# CONFIG_SPI_PPC4xx is not set -# CONFIG_SPI_PXA2XX is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_ROCKCHIP is not set -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_THUNDERX is not set -# CONFIG_SPI_TI_QSPI is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_XWAY is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_SPMI is not set -CONFIG_SQUASHFS=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -CONFIG_SQUASHFS_EMBEDDED=y -# CONFIG_SQUASHFS_FILE_CACHE is not set -CONFIG_SQUASHFS_FILE_DIRECT=y -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_SQUASHFS_LZ4 is not set -# CONFIG_SQUASHFS_LZO is not set -# CONFIG_SQUASHFS_XATTR is not set -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZLIB is not set -# CONFIG_SRAM is not set -# CONFIG_SSB is not set -# CONFIG_SSB_DEBUG is not set -# CONFIG_SSB_DRIVER_GPIO is not set -# CONFIG_SSB_HOST_SOC is not set -# CONFIG_SSB_PCMCIAHOST is not set -CONFIG_SSB_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set -# CONFIG_SSB_SILENT is not set -# CONFIG_SSFDC is not set -# CONFIG_STACKTRACE is not set -CONFIG_STACKTRACE_SUPPORT=y -# CONFIG_STACK_TRACER is not set -# CONFIG_STACK_VALIDATION is not set -CONFIG_STAGING=y -# CONFIG_STAGING_BOARD is not set -# CONFIG_STAGING_MEDIA is not set -CONFIG_STANDALONE=y -# CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_STDBINUTILS=y -# CONFIG_STE10XP is not set -# CONFIG_STE_MODEM_RPROC is not set -# CONFIG_STK3310 is not set -# CONFIG_STK8312 is not set -# CONFIG_STK8BA50 is not set -# CONFIG_STM is not set -# CONFIG_STMMAC_ETH is not set -# CONFIG_STMMAC_PCI is not set -# CONFIG_STMMAC_PLATFORM is not set -# CONFIG_STM_DUMMY is not set -# CONFIG_STM_SOURCE_CONSOLE is not set -CONFIG_STP=y -# CONFIG_STREAM_PARSER is not set -# CONFIG_STRICT_DEVMEM is not set -CONFIG_STRIP_ASM_SYMS=y -# CONFIG_STX104 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_SUNGEM is not set -# CONFIG_SUNRPC is not set -# CONFIG_SUNRPC_DEBUG is not set -# CONFIG_SUNRPC_GSS is not set -# CONFIG_SUNXI_SRAM is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_SUSPEND is not set -# CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_SWAP=y -# CONFIG_SWCONFIG is not set -# CONFIG_SWCONFIG_B53 is not set -# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set -# CONFIG_SWCONFIG_LEDS is not set -# CONFIG_SX9500 is not set -# CONFIG_SXGBE_ETH is not set -# CONFIG_SYNCLINK_CS is not set -# CONFIG_SYNC_FILE is not set -# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -CONFIG_SYN_COOKIES=y -# CONFIG_SYSCON_REBOOT_MODE is not set -CONFIG_SYSCTL=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_SYSFS=y -# CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_SYSFS_SYSCALL is not set -# CONFIG_SYSTEMPORT is not set -# CONFIG_SYSTEM_DATA_VERIFICATION is not set -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set -CONFIG_SYSTEM_TRUSTED_KEYS="" -# CONFIG_SYSV68_PARTITION is not set -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_SYSV_FS is not set -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_T5403 is not set -# CONFIG_TARGET_CORE is not set -# CONFIG_TASKSTATS is not set -# CONFIG_TASKS_RCU is not set -# CONFIG_TASK_XACCT is not set -# CONFIG_TC35815 is not set -# CONFIG_TCG_ATMEL is not set -# CONFIG_TCG_CRB is not set -# CONFIG_TCG_INFINEON is not set -# CONFIG_TCG_NSC is not set -# CONFIG_TCG_ST33_I2C is not set -# CONFIG_TCG_TIS is not set -# CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set -# CONFIG_TCG_TIS_SPI is not set -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set -# CONFIG_TCG_TIS_ST33ZP24_SPI is not set -# CONFIG_TCG_TPM is not set -# CONFIG_TCG_VTPM_PROXY is not set -# CONFIG_TCG_XEN is not set -# CONFIG_TCIC is not set -CONFIG_TCP_CONG_ADVANCED=y -# CONFIG_TCP_CONG_BBR is not set -# CONFIG_TCP_CONG_BIC is not set -# CONFIG_TCP_CONG_CDG is not set -CONFIG_TCP_CONG_CUBIC=y -# CONFIG_TCP_CONG_DCTCP is not set -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_ILLINOIS is not set -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_NV is not set -# CONFIG_TCP_CONG_SCALABLE is not set -# CONFIG_TCP_CONG_VEGAS is not set -# CONFIG_TCP_CONG_VENO is not set -# CONFIG_TCP_CONG_WESTWOOD is not set -# CONFIG_TCP_CONG_YEAH is not set -# CONFIG_TCP_MD5SIG is not set -# CONFIG_TCS3414 is not set -# CONFIG_TCS3472 is not set -# CONFIG_TEGRA_AHB is not set -# CONFIG_TEGRA_HOST1X is not set -# CONFIG_TEHUTI is not set -# CONFIG_TERANETICS_PHY is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_POWER is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_UDELAY is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_UUID is not set -CONFIG_TEXTSEARCH=y -# CONFIG_TEXTSEARCH_BM is not set -# CONFIG_TEXTSEARCH_FSM is not set -# CONFIG_TEXTSEARCH_KMP is not set -# CONFIG_THERMAL is not set -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_EMULATION is not set -# CONFIG_THERMAL_GOV_BANG_BANG is not set -# CONFIG_THERMAL_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_THERMAL_HWMON is not set -# CONFIG_THERMAL_WRITABLE_TRIPS is not set -# CONFIG_THINKPAD_ACPI is not set -# CONFIG_THRUSTMASTER_FF is not set -# CONFIG_THUNDERBOLT is not set -# CONFIG_THUNDER_NIC_BGX is not set -# CONFIG_THUNDER_NIC_PF is not set -# CONFIG_THUNDER_NIC_RGX is not set -# CONFIG_THUNDER_NIC_VF is not set -# CONFIG_TICK_CPU_ACCOUNTING is not set -CONFIG_TICK_ONESHOT=y -# CONFIG_TIFM_CORE is not set -# CONFIG_TIGON3 is not set -# CONFIG_TIMB_DMA is not set -CONFIG_TIMERFD=y -# CONFIG_TIMER_STATS is not set -CONFIG_TINY_RCU=y -# CONFIG_TIPC is not set -# CONFIG_TI_ADC081C is not set -# CONFIG_TI_ADC0832 is not set -# CONFIG_TI_ADC12138 is not set -# CONFIG_TI_ADC128S052 is not set -# CONFIG_TI_ADC161S626 is not set -# CONFIG_TI_ADS1015 is not set -# CONFIG_TI_ADS8688 is not set -# CONFIG_TI_AM335X_ADC is not set -# CONFIG_TI_CPSW is not set -# CONFIG_TI_CPSW_ALE is not set -# CONFIG_TI_CPTS is not set -# CONFIG_TI_DAC7512 is not set -# CONFIG_TI_DAVINCI_CPDMA is not set -# CONFIG_TI_DAVINCI_MDIO is not set -# CONFIG_TI_ST is not set -# CONFIG_TI_SYSCON_RESET is not set -# CONFIG_TLAN is not set -# CONFIG_TMD_HERMES is not set -# CONFIG_TMP006 is not set -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -CONFIG_TMPFS_XATTR=y -# CONFIG_TOPSTAR_LAPTOP is not set -# CONFIG_TORTURE_TEST is not set -# CONFIG_TOSHIBA_HAPS is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set -# CONFIG_TOUCHSCREEN_AD7879 is not set -# CONFIG_TOUCHSCREEN_AD7879_I2C is not set -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set -# CONFIG_TOUCHSCREEN_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AR1021_I2C is not set -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set -# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set -# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set -# CONFIG_TOUCHSCREEN_DYNAPRO is not set -# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set -# CONFIG_TOUCHSCREEN_EETI is not set -# CONFIG_TOUCHSCREEN_EGALAX is not set -# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set -# CONFIG_TOUCHSCREEN_EKTF2127 is not set -# CONFIG_TOUCHSCREEN_ELAN is not set -# CONFIG_TOUCHSCREEN_ELO is not set -# CONFIG_TOUCHSCREEN_FT6236 is not set -# CONFIG_TOUCHSCREEN_FUJITSU is not set -# CONFIG_TOUCHSCREEN_GOODIX is not set -# CONFIG_TOUCHSCREEN_GUNZE is not set -# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -# CONFIG_TOUCHSCREEN_ILI210X is not set -# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set -# CONFIG_TOUCHSCREEN_INEXIO is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -# CONFIG_TOUCHSCREEN_MCS5000 is not set -# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set -# CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_TOUCHSCREEN_MMS114 is not set -# CONFIG_TOUCHSCREEN_MTOUCH is not set -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_RM_TS is not set -# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set -# CONFIG_TOUCHSCREEN_S3C2410 is not set -# CONFIG_TOUCHSCREEN_SILEAD is not set -# CONFIG_TOUCHSCREEN_SIS_I2C is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_SUR40 is not set -# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set -# CONFIG_TOUCHSCREEN_SX8654 is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set -# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_TPS6507X is not set -# CONFIG_TOUCHSCREEN_TSC2004 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set -# CONFIG_TOUCHSCREEN_TSC2007 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set -# CONFIG_TOUCHSCREEN_W90X900 is not set -# CONFIG_TOUCHSCREEN_WACOM_I2C is not set -# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set -# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set -# CONFIG_TOUCHSCREEN_WM97XX is not set -# CONFIG_TOUCHSCREEN_ZFORCE is not set -# CONFIG_TPL0102 is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_TRACER_SNAPSHOT is not set -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -# CONFIG_TRACE_BRANCH_PROFILING is not set -# CONFIG_TRACE_ENUM_MAP_FILE is not set -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_TRACE_SINK is not set -# CONFIG_TRACING_EVENTS_GPIO is not set -CONFIG_TRACING_SUPPORT=y -CONFIG_TRAD_SIGNALS=y -# CONFIG_TRANSPARENT_HUGEPAGE is not set -# CONFIG_TREE_RCU is not set -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_TRIM_UNUSED_KSYMS is not set -# CONFIG_TRUSTED_KEYS is not set -# CONFIG_TSL2583 is not set -# CONFIG_TSL2x7x is not set -# CONFIG_TSL4531 is not set -# CONFIG_TSYS01 is not set -# CONFIG_TSYS02D is not set -# CONFIG_TTPCI_EEPROM is not set -CONFIG_TTY=y -# CONFIG_TTY_PRINTK is not set -# CONFIG_TUN is not set -# CONFIG_TUN_VNET_CROSS_LE is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_TWL4030_MADC is not set -# CONFIG_TWL6030_GPADC is not set -# CONFIG_TWL6040_CORE is not set -# CONFIG_TYPHOON is not set -# CONFIG_UACCESS_WITH_MEMCPY is not set -# CONFIG_UBIFS_ATIME_SUPPORT is not set -# CONFIG_UBSAN is not set -# CONFIG_UCB1400_CORE is not set -# CONFIG_UCSI is not set -# CONFIG_UDF_FS is not set -CONFIG_UDF_NLS=y -CONFIG_UEVENT_HELPER=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_UFS_FS is not set -# CONFIG_UHID is not set -CONFIG_UID16=y -# CONFIG_UIO is not set -# CONFIG_ULTRA is not set -# CONFIG_ULTRIX_PARTITION is not set -CONFIG_UNIX=y -CONFIG_UNIX98_PTYS=y -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_UNIX_DIAG is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_UPROBES is not set -# CONFIG_UPROBE_EVENT is not set -# CONFIG_US5182D is not set -# CONFIG_USB is not set -# CONFIG_USBIP_CORE is not set -CONFIG_USBIP_VHCI_HC_PORTS=8 -CONFIG_USBIP_VHCI_NR_HCS=1 -# CONFIG_USBIP_VUDC is not set -# CONFIG_USBPCWATCHDOG is not set -# CONFIG_USB_ACM is not set -# CONFIG_USB_ADUTUX is not set -CONFIG_USB_ALI_M5632=y -# CONFIG_USB_AMD5536UDC is not set -CONFIG_USB_AN2720=y -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set -# CONFIG_USB_APPLEDISPLAY is not set -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_ATM is not set -# CONFIG_USB_BDC_UDC is not set -CONFIG_USB_BELKIN=y -# CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_CATC is not set -# CONFIG_USB_CDC_COMPOSITE is not set -# CONFIG_USB_CHAOSKEY is not set -# CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CONFIGFS is not set -# CONFIG_USB_CXACRU is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -CONFIG_USB_DEFAULT_PERSIST=y -# CONFIG_USB_DSBR is not set -# CONFIG_USB_DUMMY_HCD is not set -# CONFIG_USB_DWC2 is not set -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_DUAL_ROLE is not set -# CONFIG_USB_DWC2_HOST is not set -# CONFIG_USB_DWC2_PERIPHERAL is not set -# CONFIG_USB_DWC3 is not set -# CONFIG_USB_DWC3_EXYNOS is not set -# CONFIG_USB_DWC3_KEYSTONE is not set -# CONFIG_USB_DWC3_OF_SIMPLE is not set -# CONFIG_USB_DWC3_PCI is not set -# CONFIG_USB_DWC3_QCOM is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_EG20T is not set -# CONFIG_USB_EHCI_ATH79 is not set -# CONFIG_USB_EHCI_HCD_AT91 is not set -# CONFIG_USB_EHCI_HCD_OMAP is not set -# CONFIG_USB_EHCI_HCD_PPC_OF is not set -# CONFIG_USB_EHCI_MSM is not set -# CONFIG_USB_EHCI_MV is not set -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_EHSET_TEST_FIXTURE is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EPSON2888 is not set -# CONFIG_USB_EZUSB_FX2 is not set -# CONFIG_USB_FOTG210_HCD is not set -# CONFIG_USB_FOTG210_UDC is not set -# CONFIG_USB_FSL_USB2 is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_FUNCTIONFS is not set -# CONFIG_USB_FUSB300 is not set -# CONFIG_USB_GADGET is not set -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -CONFIG_USB_GADGET_VBUS_DRAW=2 -# CONFIG_USB_GADGET_XILINX is not set -# CONFIG_USB_GL860 is not set -# CONFIG_USB_GOKU is not set -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_USB_GR_UDC is not set -# CONFIG_USB_GSPCA is not set -# CONFIG_USB_GSPCA_BENQ is not set -# CONFIG_USB_GSPCA_CONEX is not set -# CONFIG_USB_GSPCA_CPIA1 is not set -# CONFIG_USB_GSPCA_DTCS033 is not set -# CONFIG_USB_GSPCA_ETOMS is not set -# CONFIG_USB_GSPCA_FINEPIX is not set -# CONFIG_USB_GSPCA_JEILINJ is not set -# CONFIG_USB_GSPCA_JL2005BCD is not set -# CONFIG_USB_GSPCA_KINECT is not set -# CONFIG_USB_GSPCA_KONICA is not set -# CONFIG_USB_GSPCA_MARS is not set -# CONFIG_USB_GSPCA_MR97310A is not set -# CONFIG_USB_GSPCA_NW80X is not set -# CONFIG_USB_GSPCA_OV519 is not set -# CONFIG_USB_GSPCA_OV534 is not set -# CONFIG_USB_GSPCA_OV534_9 is not set -# CONFIG_USB_GSPCA_PAC207 is not set -# CONFIG_USB_GSPCA_PAC7302 is not set -# CONFIG_USB_GSPCA_PAC7311 is not set -# CONFIG_USB_GSPCA_SE401 is not set -# CONFIG_USB_GSPCA_SN9C2028 is not set -# CONFIG_USB_GSPCA_SN9C20X is not set -# CONFIG_USB_GSPCA_SONIXB is not set -# CONFIG_USB_GSPCA_SONIXJ is not set -# CONFIG_USB_GSPCA_SPCA1528 is not set -# CONFIG_USB_GSPCA_SPCA500 is not set -# CONFIG_USB_GSPCA_SPCA501 is not set -# CONFIG_USB_GSPCA_SPCA505 is not set -# CONFIG_USB_GSPCA_SPCA506 is not set -# CONFIG_USB_GSPCA_SPCA508 is not set -# CONFIG_USB_GSPCA_SPCA561 is not set -# CONFIG_USB_GSPCA_SQ905 is not set -# CONFIG_USB_GSPCA_SQ905C is not set -# CONFIG_USB_GSPCA_SQ930X is not set -# CONFIG_USB_GSPCA_STK014 is not set -# CONFIG_USB_GSPCA_STK1135 is not set -# CONFIG_USB_GSPCA_STV0680 is not set -# CONFIG_USB_GSPCA_SUNPLUS is not set -# CONFIG_USB_GSPCA_T613 is not set -# CONFIG_USB_GSPCA_TOPRO is not set -# CONFIG_USB_GSPCA_TOUPTEK is not set -# CONFIG_USB_GSPCA_TV8532 is not set -# CONFIG_USB_GSPCA_VC032X is not set -# CONFIG_USB_GSPCA_VICAM is not set -# CONFIG_USB_GSPCA_XIRLINK_CIT is not set -# CONFIG_USB_GSPCA_ZC3XX is not set -# CONFIG_USB_G_ACM_MS is not set -# CONFIG_USB_G_DBGP is not set -# CONFIG_USB_G_HID is not set -# CONFIG_USB_G_MULTI is not set -# CONFIG_USB_G_NCM is not set -# CONFIG_USB_G_NOKIA is not set -# CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_G_SERIAL is not set -# CONFIG_USB_G_WEBCAM is not set -# CONFIG_USB_HCD_TEST_MODE is not set -# CONFIG_USB_HID is not set -# CONFIG_USB_HIDDEV is not set -# CONFIG_USB_HSIC_USB3503 is not set -# CONFIG_USB_HSIC_USB4604 is not set -# CONFIG_USB_HSO is not set -# CONFIG_USB_HWA_HCD is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_IPHETH is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1301 is not set -# CONFIG_USB_ISP1362_HCD is not set -# CONFIG_USB_ISP1760 is not set -# CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_KBD is not set -# CONFIG_USB_KC2190 is not set -# CONFIG_USB_LAN78XX is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set -# CONFIG_USB_LED_TRIG is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LINK_LAYER_TEST is not set -# CONFIG_USB_M5602 is not set -# CONFIG_USB_M66592 is not set -# CONFIG_USB_MASS_STORAGE is not set -# CONFIG_USB_MAX3421_HCD is not set -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set -# CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_MON is not set -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_MSM_OTG is not set -# CONFIG_USB_MUSB_HDRC is not set -# CONFIG_USB_MV_U3D is not set -# CONFIG_USB_MV_UDC is not set -# CONFIG_USB_MXS_PHY is not set -# CONFIG_USB_NET2272 is not set -# CONFIG_USB_NET2280 is not set -# CONFIG_USB_NET_AX88179_178A is not set -# CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_CDCETHER is not set -# CONFIG_USB_NET_CDC_EEM is not set -# CONFIG_USB_NET_CDC_MBIM is not set -# CONFIG_USB_NET_CDC_NCM is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -# CONFIG_USB_NET_CH9200 is not set -# CONFIG_USB_NET_CX82310_ETH is not set -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_DRIVERS is not set -# CONFIG_USB_NET_GL620A is not set -# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set -# CONFIG_USB_NET_INT51X1 is not set -# CONFIG_USB_NET_KALMIA is not set -# CONFIG_USB_NET_MCS7830 is not set -# CONFIG_USB_NET_NET1080 is not set -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_QMI_WWAN is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_USB_NET_SMSC75XX is not set -# CONFIG_USB_NET_SMSC95XX is not set -# CONFIG_USB_NET_SR9700 is not set -# CONFIG_USB_NET_SR9800 is not set -# CONFIG_USB_NET_ZAURUS is not set -# CONFIG_USB_OHCI_HCD is not set -# CONFIG_USB_OHCI_HCD_PCI is not set -# CONFIG_USB_OHCI_HCD_PPC_OF is not set -# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set -# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set -# CONFIG_USB_OHCI_HCD_SSB is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_OTG_FSM is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_PHY is not set -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_PWC_INPUT_EVDEV is not set -# CONFIG_USB_PXA27X is not set -# CONFIG_USB_R8A66597 is not set -# CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_RCAR_PHY is not set -# CONFIG_USB_RENESAS_USBHS is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_RTL8152 is not set -# CONFIG_USB_S2255 is not set -# CONFIG_USB_SERIAL is not set -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_CP210X is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_DEBUG is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_F81232 is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_GARMIN is not set -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_METRO is not set -# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MXUPORT is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_OPTION is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_QCAUX is not set -# CONFIG_USB_SERIAL_QT2 is not set -# CONFIG_USB_SERIAL_QUALCOMM is not set -# CONFIG_USB_SERIAL_SAFE is not set -CONFIG_USB_SERIAL_SAFE_PADDED=y -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_SIMPLE is not set -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_SSU100 is not set -# CONFIG_USB_SERIAL_SYMBOL is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_WISHBONE is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_XSENS_MT is not set -# CONFIG_USB_SEVSEG is not set -# CONFIG_USB_SIERRA_NET is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_SPEEDTOUCH is not set -# CONFIG_USB_STKWEBCAM is not set -# CONFIG_USB_STORAGE is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set -# CONFIG_USB_STORAGE_REALTEK is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STV06XX is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_USB_SWITCH_FSA9480 is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_TMC is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_UAS is not set -# CONFIG_USB_UEAGLEATM is not set -# CONFIG_USB_ULPI is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_USS720 is not set -# CONFIG_USB_VIDEO_CLASS is not set -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -# CONFIG_USB_VL600 is not set -# CONFIG_USB_WDM is not set -# CONFIG_USB_WHCI_HCD is not set -# CONFIG_USB_WUSB is not set -# CONFIG_USB_WUSB_CBAF is not set -# CONFIG_USB_XHCI_HCD is not set -# CONFIG_USB_XHCI_MVEBU is not set -# CONFIG_USB_XUSBATM is not set -# CONFIG_USB_YUREX is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_ZERO is not set -# CONFIG_USB_ZR364XX is not set -# CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set -# CONFIG_USE_OF is not set -# CONFIG_UTS_NS is not set -# CONFIG_UWB is not set -# CONFIG_U_SERIAL_CONSOLE is not set -# CONFIG_V4L_MEM2MEM_DRIVERS is not set -# CONFIG_V4L_TEST_DRIVERS is not set -# CONFIG_VCNL4000 is not set -# CONFIG_VDSO is not set -# CONFIG_VEML6070 is not set -# CONFIG_VETH is not set -# CONFIG_VEXPRESS_CONFIG is not set -# CONFIG_VF610_ADC is not set -# CONFIG_VF610_DAC is not set -# CONFIG_VFAT_FS is not set -# CONFIG_VGASTATE is not set -# CONFIG_VGA_ARB is not set -# CONFIG_VGA_SWITCHEROO is not set -# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set -# CONFIG_VHOST_NET is not set -# CONFIG_VHOST_VSOCK is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_VIDEO_ADV7170 is not set -# CONFIG_VIDEO_ADV7175 is not set -# CONFIG_VIDEO_ADV7180 is not set -# CONFIG_VIDEO_ADV7183 is not set -# CONFIG_VIDEO_ADV7343 is not set -# CONFIG_VIDEO_ADV7393 is not set -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_AK881X is not set -# CONFIG_VIDEO_BT819 is not set -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_BT856 is not set -# CONFIG_VIDEO_BT866 is not set -# CONFIG_VIDEO_CAFE_CCIC is not set -# CONFIG_VIDEO_CS3308 is not set -# CONFIG_VIDEO_CS5345 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_CX231XX is not set -# CONFIG_VIDEO_CX2341X is not set -# CONFIG_VIDEO_CX25840 is not set -# CONFIG_VIDEO_CX88 is not set -# CONFIG_VIDEO_DEV is not set -# CONFIG_VIDEO_DM6446_CCDC is not set -# CONFIG_VIDEO_DT3155 is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_GO7007 is not set -# CONFIG_VIDEO_HDPVR is not set -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_IR_I2C is not set -# CONFIG_VIDEO_IVTV is not set -# CONFIG_VIDEO_KS0127 is not set -# CONFIG_VIDEO_M52790 is not set -# CONFIG_VIDEO_ML86V7667 is not set -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_MT9M111 is not set -# CONFIG_VIDEO_MT9V011 is not set -# CONFIG_VIDEO_MXB is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OMAP2_VOUT is not set -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV7640 is not set -# CONFIG_VIDEO_OV7670 is not set -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_SAA6588 is not set -# CONFIG_VIDEO_SAA6752HS is not set -# CONFIG_VIDEO_SAA7110 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_SAA717X is not set -# CONFIG_VIDEO_SAA7185 is not set -# CONFIG_VIDEO_SH_MOBILE_CEU is not set -# CONFIG_VIDEO_SONY_BTF_MPX is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_TDA7432 is not set -# CONFIG_VIDEO_TDA9840 is not set -# CONFIG_VIDEO_TEA6415C is not set -# CONFIG_VIDEO_TEA6420 is not set -# CONFIG_VIDEO_THS7303 is not set -# CONFIG_VIDEO_THS8200 is not set -# CONFIG_VIDEO_TIMBERDALE is not set -# CONFIG_VIDEO_TLV320AIC23B is not set -# CONFIG_VIDEO_TM6000 is not set -# CONFIG_VIDEO_TVAUDIO is not set -# CONFIG_VIDEO_TVP514X is not set -# CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_TVP7002 is not set -# CONFIG_VIDEO_TW2804 is not set -# CONFIG_VIDEO_TW9903 is not set -# CONFIG_VIDEO_TW9906 is not set -# CONFIG_VIDEO_UDA1342 is not set -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set -# CONFIG_VIDEO_USBTV is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_VIDEO_V4L2 is not set -# CONFIG_VIDEO_VP27SMPX is not set -# CONFIG_VIDEO_VPX3220 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIRTIO_BALLOON is not set -# CONFIG_VIRTIO_INPUT is not set -# CONFIG_VIRTIO_MMIO is not set -# CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTUALIZATION is not set -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_VIRT_DRIVERS is not set -CONFIG_VIRT_TO_BUS=y -# CONFIG_VITESSE_PHY is not set -CONFIG_VLAN_8021Q=y -# CONFIG_VLAN_8021Q_GVRP is not set -# CONFIG_VLAN_8021Q_MVRP is not set -# CONFIG_VME_BUS is not set -# CONFIG_VMSPLIT_1G is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_2G_OPT is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMWARE_PVSCSI is not set -# CONFIG_VMXNET3 is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_VOP_BUS is not set -# CONFIG_VORTEX is not set -# CONFIG_VSOCKETS is not set -# CONFIG_VT is not set -# CONFIG_VT6655 is not set -# CONFIG_VT6656 is not set -# CONFIG_VXFS_FS is not set -# CONFIG_VXGE is not set -# CONFIG_VXLAN is not set -# CONFIG_VZ89X is not set -# CONFIG_W1 is not set -# CONFIG_W1_CON is not set -# CONFIG_W1_MASTER_DS1WM is not set -# CONFIG_W1_MASTER_DS2482 is not set -# CONFIG_W1_MASTER_DS2490 is not set -# CONFIG_W1_MASTER_GPIO is not set -# CONFIG_W1_MASTER_MATROX is not set -# CONFIG_W1_SLAVE_BQ27000 is not set -# CONFIG_W1_SLAVE_DS2406 is not set -# CONFIG_W1_SLAVE_DS2408 is not set -# CONFIG_W1_SLAVE_DS2413 is not set -# CONFIG_W1_SLAVE_DS2423 is not set -# CONFIG_W1_SLAVE_DS2431 is not set -# CONFIG_W1_SLAVE_DS2433 is not set -# CONFIG_W1_SLAVE_DS2760 is not set -# CONFIG_W1_SLAVE_DS2780 is not set -# CONFIG_W1_SLAVE_DS2781 is not set -# CONFIG_W1_SLAVE_DS28E04 is not set -# CONFIG_W1_SLAVE_SMEM is not set -# CONFIG_W1_SLAVE_THERM is not set -# CONFIG_W83627HF_WDT is not set -# CONFIG_W83877F_WDT is not set -# CONFIG_W83977F_WDT is not set -# CONFIG_WAN is not set -# CONFIG_WANXL is not set -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set -# CONFIG_WATCHDOG_SYSFS is not set -# CONFIG_WD80x3 is not set -# CONFIG_WDAT_WDT is not set -# CONFIG_WDTPCI is not set -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PRIV=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WILINK_PLATFORM_DATA=y -# CONFIG_WIMAX is not set -# CONFIG_WIMAX_GDM72XX is not set -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -# CONFIG_WIZNET_W5100 is not set -# CONFIG_WIZNET_W5300 is not set -# CONFIG_WL1251 is not set -# CONFIG_WL12XX is not set -# CONFIG_WL18XX is not set -CONFIG_WLAN=y -# CONFIG_WLAN_VENDOR_ADMTEK is not set -# CONFIG_WLAN_VENDOR_ATH is not set -# CONFIG_WLAN_VENDOR_ATMEL is not set -# CONFIG_WLAN_VENDOR_BROADCOM is not set -# CONFIG_WLAN_VENDOR_CISCO is not set -# CONFIG_WLAN_VENDOR_INTEL is not set -# CONFIG_WLAN_VENDOR_INTERSIL is not set -# CONFIG_WLAN_VENDOR_MARVELL is not set -# CONFIG_WLAN_VENDOR_MEDIATEK is not set -# CONFIG_WLAN_VENDOR_RALINK is not set -# CONFIG_WLAN_VENDOR_REALTEK is not set -# CONFIG_WLAN_VENDOR_RSI is not set -# CONFIG_WLAN_VENDOR_ST is not set -# CONFIG_WLAN_VENDOR_TI is not set -# CONFIG_WLAN_VENDOR_ZYDAS is not set -# CONFIG_WLCORE is not set -# CONFIG_WL_MEDIATEK is not set -CONFIG_WL_TI=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y -# CONFIG_WQ_WATCHDOG is not set -# CONFIG_X25 is not set -# CONFIG_X509_CERTIFICATE_PARSER is not set -# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set -# CONFIG_X86_PKG_TEMP_THERMAL is not set -CONFIG_X86_SYSFB=y -# CONFIG_XEN is not set -CONFIG_XFRM=y -# CONFIG_XFRM_IPCOMP is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_USER is not set -# CONFIG_XFS_DEBUG is not set -# CONFIG_XFS_FS is not set -# CONFIG_XFS_POSIX_ACL is not set -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_RT is not set -# CONFIG_XFS_WARN is not set -# CONFIG_XILINX_AXI_EMAC is not set -# CONFIG_XILINX_DMA is not set -# CONFIG_XILINX_EMACLITE is not set -# CONFIG_XILINX_GMII2RGMII is not set -# CONFIG_XILINX_LL_TEMAC is not set -# CONFIG_XILINX_WATCHDOG is not set -# CONFIG_XILINX_ZYNQMP_DMA is not set -# CONFIG_XILLYBUS is not set -# CONFIG_XIP_KERNEL is not set -# CONFIG_XMON is not set -CONFIG_XZ_DEC=y -# CONFIG_XZ_DEC_ARM is not set -# CONFIG_XZ_DEC_ARMTHUMB is not set -# CONFIG_XZ_DEC_BCJ is not set -# CONFIG_XZ_DEC_IA64 is not set -# CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_SPARC is not set -# CONFIG_XZ_DEC_TEST is not set -# CONFIG_XZ_DEC_X86 is not set -# CONFIG_YAM is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_YENTA is not set -# CONFIG_YENTA_O2 is not set -# CONFIG_YENTA_RICOH is not set -# CONFIG_YENTA_TI is not set -# CONFIG_YENTA_TOSHIBA is not set -# CONFIG_ZBUD is not set -# CONFIG_ZD1211RW is not set -# CONFIG_ZD1211RW_DEBUG is not set -# CONFIG_ZEROPLUS_FF is not set -# CONFIG_ZIIRAVE_WATCHDOG is not set -# CONFIG_ZISOFS is not set -# CONFIG_ZLIB_DEFLATE is not set -# CONFIG_ZLIB_INFLATE is not set -CONFIG_ZONE_DMA=y -# CONFIG_ZPA2326 is not set -# CONFIG_ZPOOL is not set -# CONFIG_ZRAM is not set -# CONFIG_ZSMALLOC is not set diff --git a/target/linux/generic/hack-4.9/204-module_strip.patch b/target/linux/generic/hack-4.9/204-module_strip.patch deleted file mode 100644 index 2f34791cd9..0000000000 --- a/target/linux/generic/hack-4.9/204-module_strip.patch +++ /dev/null @@ -1,214 +0,0 @@ -From a779a482fb9b9f8fcdf8b2519c789b4b9bb5dd05 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -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 ---- - 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 -@@ -159,6 +159,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) -@@ -202,12 +203,12 @@ extern void cleanup_module(void); - * Author(s), use "Name " 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 const typeof(name) __mod_##type##__##name##_device_table \ -@@ -234,7 +235,9 @@ extern const typeof(name) __mod_##type## - */ - - #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) \ - static struct module_version_attribute ___modver_attr = { \ -@@ -256,7 +259,7 @@ extern const typeof(name) __mod_##type## - /* 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) - - struct notifier_block; - ---- a/include/linux/moduleparam.h -+++ b/include/linux/moduleparam.h -@@ -16,6 +16,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 -+ - #ifdef MODULE - #define __MODULE_INFO(tag, name, info) \ - static const char __UNIQUE_ID(name)[] \ -@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[] - = __stringify(tag) "=" info - #else /* !MODULE */ - /* This struct is here for syntactic coherency, it is not used */ --#define __MODULE_INFO(tag, name, info) \ -- struct __UNIQUE_ID(name) {} -+#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name) - #endif - #define __MODULE_PARM_TYPE(name, _type) \ - __MODULE_INFO(parmtype, name##type, #name ":" _type) -@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[] - /* 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/init/Kconfig -+++ b/init/Kconfig -@@ -2122,6 +2122,13 @@ config TRIM_UNUSED_KSYMS - - If unsure, or if you need to build out-of-tree modules, say N. - -+config MODULE_STRIPPED -+ bool "Reduce module size" -+ depends on MODULES -+ help -+ Remove module parameter descriptions, author info, version, aliases, -+ device tables, etc. -+ - endif # MODULES - - config MODULES_TREE_LOOKUP ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -2970,9 +2970,11 @@ static struct module *setup_load_info(st - - 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; - -@@ -2993,6 +2995,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 -@@ -1979,7 +1979,9 @@ static void read_symbols(char *modname) - symname = remove_dot(info.strtab + sym->st_name); - - handle_modversions(mod, &info, sym, symname); -+#ifndef CONFIG_MODULE_STRIPPED - handle_moddevtable(mod, &info, sym, symname); -+#endif - } - if (!is_vmlinux(modname) || - (is_vmlinux(modname) && vmlinux_section_warnings)) -@@ -2123,7 +2125,9 @@ static void add_header(struct buffer *b, - buf_printf(b, "#include \n"); - buf_printf(b, "#include \n"); - buf_printf(b, "\n"); -+#ifndef CONFIG_MODULE_STRIPPED - buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n"); -+#endif - buf_printf(b, "\n"); - buf_printf(b, "__visible struct module __this_module\n"); - buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); -@@ -2140,24 +2144,30 @@ static void add_header(struct buffer *b, - - static void add_intree_flag(struct buffer *b, int is_intree) - { -+#ifndef CONFIG_MODULE_STRIPPED - if (is_intree) - buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n"); -+#endif - } - - /* Cannot check for assembler */ - static void add_retpoline(struct buffer *b) - { -+#ifndef CONFIG_MODULE_STRIPPED - buf_printf(b, "\n#ifdef RETPOLINE\n"); - buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); - buf_printf(b, "#endif\n"); -+#endif - } - - static void add_staging_flag(struct buffer *b, const char *name) - { -+#ifndef CONFIG_MODULE_STRIPPED - static const char *staging_dir = "drivers/staging"; - - if (strncmp(staging_dir, name, strlen(staging_dir)) == 0) - buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n"); -+#endif - } - - /* In kernel, this size is defined in linux/module.h; -@@ -2261,11 +2271,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_if_changed(struct buffer *b, const char *fname) -@@ -2500,7 +2512,9 @@ int main(int argc, char **argv) - add_staging_flag(&buf, mod->name); - err |= add_versions(&buf, mod); - add_depends(&buf, mod, modules); -+#ifndef CONFIG_MODULE_STRIPPED - add_moddevtable(&buf, mod); -+#endif - add_srcversion(&buf, mod); - - sprintf(fname, "%s.mod.c", mod->name); diff --git a/target/linux/generic/hack-4.9/207-disable-modorder.patch b/target/linux/generic/hack-4.9/207-disable-modorder.patch deleted file mode 100644 index 62f67ac95d..0000000000 --- a/target/linux/generic/hack-4.9/207-disable-modorder.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c9ef4ab0f54356ee9f91d9676ea0ec123840ddc7 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 16:57:33 +0200 -Subject: kernel: do not build modules.order - -It is not needed for anything on the system and skipping this saves some -build time, especially in cases where there is nothing to do. - -lede-commit: afc1675833a7bf5df094f59f7250369520646d04 -Signed-off-by: Felix Fietkau ---- - Makefile | 2 -- - scripts/Makefile.build | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -1240,7 +1240,6 @@ all: modules - - PHONY += modules - modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin -- $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order - @$(kecho) ' Building modules, stage 2.'; - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild -@@ -1270,7 +1269,6 @@ _modinst_: - rm -f $(MODLIB)/build ; \ - ln -s $(CURDIR) $(MODLIB)/build ; \ - fi -- @cp -f $(objtree)/modules.order $(MODLIB)/ - @cp -f $(objtree)/modules.builtin $(MODLIB)/ - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst - ---- a/scripts/Makefile.build -+++ b/scripts/Makefile.build -@@ -93,7 +93,7 @@ modorder-target := $(obj)/modules.order - # We keep a list of all modules in $(MODVERDIR) - - __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ -- $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \ -+ $(if $(KBUILD_MODULES),$(obj-m)) \ - $(subdir-ym) $(always) - @: - diff --git a/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch b/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch deleted file mode 100644 index bdf4114aaa..0000000000 --- a/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch +++ /dev/null @@ -1,3065 +0,0 @@ -From db7c30dcd9a0391bf13b62c9f91e144d762ef43a Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Fri, 7 Jul 2017 17:00:49 +0200 -Subject: Add an OSX specific patch to make the kernel be compiled - -lede-commit: 3fc2a24f0422b2f55f9ed43f116db3111f700526 -Signed-off-by: Florian Fainelli ---- - scripts/kconfig/Makefile | 3 + - scripts/mod/elf.h | 3007 ++++++++++++++++++++++++++++++++++++++++++++ - scripts/mod/mk_elfconfig.c | 4 + - scripts/mod/modpost.h | 4 + - 4 files changed, 3018 insertions(+) - create mode 100644 scripts/mod/elf.h - ---- a/scripts/kconfig/Makefile -+++ b/scripts/kconfig/Makefile -@@ -163,6 +163,9 @@ check-lxdialog := $(srctree)/$(src)/lxd - # we really need to do so. (Do not call gcc as part of make mrproper) - HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ - -DLOCALE -+ifeq ($(shell uname -s),Darwin) -+HOST_LOADLIBES += -lncurses -+endif - - # =========================================================================== - # Shared Makefile for the various kconfig executables: ---- /dev/null -+++ b/scripts/mod/elf.h -@@ -0,0 +1,3007 @@ -+/* This file defines standard ELF types, structures, and macros. -+ Copyright (C) 1995-2012 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#ifndef _ELF_H -+#define _ELF_H 1 -+ -+/* Standard ELF types. */ -+ -+#include -+ -+/* Type for a 16-bit quantity. */ -+typedef uint16_t Elf32_Half; -+typedef uint16_t Elf64_Half; -+ -+/* Types for signed and unsigned 32-bit quantities. */ -+typedef uint32_t Elf32_Word; -+typedef int32_t Elf32_Sword; -+typedef uint32_t Elf64_Word; -+typedef int32_t Elf64_Sword; -+ -+/* Types for signed and unsigned 64-bit quantities. */ -+typedef uint64_t Elf32_Xword; -+typedef int64_t Elf32_Sxword; -+typedef uint64_t Elf64_Xword; -+typedef int64_t Elf64_Sxword; -+ -+/* Type of addresses. */ -+typedef uint32_t Elf32_Addr; -+typedef uint64_t Elf64_Addr; -+ -+/* Type of file offsets. */ -+typedef uint32_t Elf32_Off; -+typedef uint64_t Elf64_Off; -+ -+/* Type for section indices, which are 16-bit quantities. */ -+typedef uint16_t Elf32_Section; -+typedef uint16_t Elf64_Section; -+ -+/* Type for version symbol information. */ -+typedef Elf32_Half Elf32_Versym; -+typedef Elf64_Half Elf64_Versym; -+ -+ -+/* The ELF file header. This appears at the start of every ELF file. */ -+ -+#define EI_NIDENT (16) -+ -+typedef struct -+{ -+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ -+ Elf32_Half e_type; /* Object file type */ -+ Elf32_Half e_machine; /* Architecture */ -+ Elf32_Word e_version; /* Object file version */ -+ Elf32_Addr e_entry; /* Entry point virtual address */ -+ Elf32_Off e_phoff; /* Program header table file offset */ -+ Elf32_Off e_shoff; /* Section header table file offset */ -+ Elf32_Word e_flags; /* Processor-specific flags */ -+ Elf32_Half e_ehsize; /* ELF header size in bytes */ -+ Elf32_Half e_phentsize; /* Program header table entry size */ -+ Elf32_Half e_phnum; /* Program header table entry count */ -+ Elf32_Half e_shentsize; /* Section header table entry size */ -+ Elf32_Half e_shnum; /* Section header table entry count */ -+ Elf32_Half e_shstrndx; /* Section header string table index */ -+} Elf32_Ehdr; -+ -+typedef struct -+{ -+ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ -+ Elf64_Half e_type; /* Object file type */ -+ Elf64_Half e_machine; /* Architecture */ -+ Elf64_Word e_version; /* Object file version */ -+ Elf64_Addr e_entry; /* Entry point virtual address */ -+ Elf64_Off e_phoff; /* Program header table file offset */ -+ Elf64_Off e_shoff; /* Section header table file offset */ -+ Elf64_Word e_flags; /* Processor-specific flags */ -+ Elf64_Half e_ehsize; /* ELF header size in bytes */ -+ Elf64_Half e_phentsize; /* Program header table entry size */ -+ Elf64_Half e_phnum; /* Program header table entry count */ -+ Elf64_Half e_shentsize; /* Section header table entry size */ -+ Elf64_Half e_shnum; /* Section header table entry count */ -+ Elf64_Half e_shstrndx; /* Section header string table index */ -+} Elf64_Ehdr; -+ -+/* Fields in the e_ident array. The EI_* macros are indices into the -+ array. The macros under each EI_* macro are the values the byte -+ may have. */ -+ -+#define EI_MAG0 0 /* File identification byte 0 index */ -+#define ELFMAG0 0x7f /* Magic number byte 0 */ -+ -+#define EI_MAG1 1 /* File identification byte 1 index */ -+#define ELFMAG1 'E' /* Magic number byte 1 */ -+ -+#define EI_MAG2 2 /* File identification byte 2 index */ -+#define ELFMAG2 'L' /* Magic number byte 2 */ -+ -+#define EI_MAG3 3 /* File identification byte 3 index */ -+#define ELFMAG3 'F' /* Magic number byte 3 */ -+ -+/* Conglomeration of the identification bytes, for easy testing as a word. */ -+#define ELFMAG "\177ELF" -+#define SELFMAG 4 -+ -+#define EI_CLASS 4 /* File class byte index */ -+#define ELFCLASSNONE 0 /* Invalid class */ -+#define ELFCLASS32 1 /* 32-bit objects */ -+#define ELFCLASS64 2 /* 64-bit objects */ -+#define ELFCLASSNUM 3 -+ -+#define EI_DATA 5 /* Data encoding byte index */ -+#define ELFDATANONE 0 /* Invalid data encoding */ -+#define ELFDATA2LSB 1 /* 2's complement, little endian */ -+#define ELFDATA2MSB 2 /* 2's complement, big endian */ -+#define ELFDATANUM 3 -+ -+#define EI_VERSION 6 /* File version byte index */ -+ /* Value must be EV_CURRENT */ -+ -+#define EI_OSABI 7 /* OS ABI identification */ -+#define ELFOSABI_NONE 0 /* UNIX System V ABI */ -+#define ELFOSABI_SYSV 0 /* Alias. */ -+#define ELFOSABI_HPUX 1 /* HP-UX */ -+#define ELFOSABI_NETBSD 2 /* NetBSD. */ -+#define ELFOSABI_GNU 3 /* Object uses GNU ELF extensions. */ -+#define ELFOSABI_LINUX ELFOSABI_GNU /* Compatibility alias. */ -+#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ -+#define ELFOSABI_AIX 7 /* IBM AIX. */ -+#define ELFOSABI_IRIX 8 /* SGI Irix. */ -+#define ELFOSABI_FREEBSD 9 /* FreeBSD. */ -+#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ -+#define ELFOSABI_MODESTO 11 /* Novell Modesto. */ -+#define ELFOSABI_OPENBSD 12 /* OpenBSD. */ -+#define ELFOSABI_ARM_AEABI 64 /* ARM EABI */ -+#define ELFOSABI_ARM 97 /* ARM */ -+#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ -+ -+#define EI_ABIVERSION 8 /* ABI version */ -+ -+#define EI_PAD 9 /* Byte index of padding bytes */ -+ -+/* Legal values for e_type (object file type). */ -+ -+#define ET_NONE 0 /* No file type */ -+#define ET_REL 1 /* Relocatable file */ -+#define ET_EXEC 2 /* Executable file */ -+#define ET_DYN 3 /* Shared object file */ -+#define ET_CORE 4 /* Core file */ -+#define ET_NUM 5 /* Number of defined types */ -+#define ET_LOOS 0xfe00 /* OS-specific range start */ -+#define ET_HIOS 0xfeff /* OS-specific range end */ -+#define ET_LOPROC 0xff00 /* Processor-specific range start */ -+#define ET_HIPROC 0xffff /* Processor-specific range end */ -+ -+/* Legal values for e_machine (architecture). */ -+ -+#define EM_NONE 0 /* No machine */ -+#define EM_M32 1 /* AT&T WE 32100 */ -+#define EM_SPARC 2 /* SUN SPARC */ -+#define EM_386 3 /* Intel 80386 */ -+#define EM_68K 4 /* Motorola m68k family */ -+#define EM_88K 5 /* Motorola m88k family */ -+#define EM_860 7 /* Intel 80860 */ -+#define EM_MIPS 8 /* MIPS R3000 big-endian */ -+#define EM_S370 9 /* IBM System/370 */ -+#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ -+ -+#define EM_PARISC 15 /* HPPA */ -+#define EM_VPP500 17 /* Fujitsu VPP500 */ -+#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ -+#define EM_960 19 /* Intel 80960 */ -+#define EM_PPC 20 /* PowerPC */ -+#define EM_PPC64 21 /* PowerPC 64-bit */ -+#define EM_S390 22 /* IBM S390 */ -+ -+#define EM_V800 36 /* NEC V800 series */ -+#define EM_FR20 37 /* Fujitsu FR20 */ -+#define EM_RH32 38 /* TRW RH-32 */ -+#define EM_RCE 39 /* Motorola RCE */ -+#define EM_ARM 40 /* ARM */ -+#define EM_FAKE_ALPHA 41 /* Digital Alpha */ -+#define EM_SH 42 /* Hitachi SH */ -+#define EM_SPARCV9 43 /* SPARC v9 64-bit */ -+#define EM_TRICORE 44 /* Siemens Tricore */ -+#define EM_ARC 45 /* Argonaut RISC Core */ -+#define EM_H8_300 46 /* Hitachi H8/300 */ -+#define EM_H8_300H 47 /* Hitachi H8/300H */ -+#define EM_H8S 48 /* Hitachi H8S */ -+#define EM_H8_500 49 /* Hitachi H8/500 */ -+#define EM_IA_64 50 /* Intel Merced */ -+#define EM_MIPS_X 51 /* Stanford MIPS-X */ -+#define EM_COLDFIRE 52 /* Motorola Coldfire */ -+#define EM_68HC12 53 /* Motorola M68HC12 */ -+#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ -+#define EM_PCP 55 /* Siemens PCP */ -+#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ -+#define EM_NDR1 57 /* Denso NDR1 microprocessor */ -+#define EM_STARCORE 58 /* Motorola Start*Core processor */ -+#define EM_ME16 59 /* Toyota ME16 processor */ -+#define EM_ST100 60 /* STMicroelectronic ST100 processor */ -+#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ -+#define EM_X86_64 62 /* AMD x86-64 architecture */ -+#define EM_PDSP 63 /* Sony DSP Processor */ -+ -+#define EM_FX66 66 /* Siemens FX66 microcontroller */ -+#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ -+#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ -+#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ -+#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ -+#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ -+#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ -+#define EM_SVX 73 /* Silicon Graphics SVx */ -+#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */ -+#define EM_VAX 75 /* Digital VAX */ -+#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ -+#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ -+#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ -+#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ -+#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */ -+#define EM_HUANY 81 /* Harvard University machine-independent object files */ -+#define EM_PRISM 82 /* SiTera Prism */ -+#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ -+#define EM_FR30 84 /* Fujitsu FR30 */ -+#define EM_D10V 85 /* Mitsubishi D10V */ -+#define EM_D30V 86 /* Mitsubishi D30V */ -+#define EM_V850 87 /* NEC v850 */ -+#define EM_M32R 88 /* Mitsubishi M32R */ -+#define EM_MN10300 89 /* Matsushita MN10300 */ -+#define EM_MN10200 90 /* Matsushita MN10200 */ -+#define EM_PJ 91 /* picoJava */ -+#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ -+#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ -+#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ -+#define EM_TILEPRO 188 /* Tilera TILEPro */ -+#define EM_TILEGX 191 /* Tilera TILE-Gx */ -+#define EM_NUM 192 -+ -+/* If it is necessary to assign new unofficial EM_* values, please -+ pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the -+ chances of collision with official or non-GNU unofficial values. */ -+ -+#define EM_ALPHA 0x9026 -+ -+/* Legal values for e_version (version). */ -+ -+#define EV_NONE 0 /* Invalid ELF version */ -+#define EV_CURRENT 1 /* Current version */ -+#define EV_NUM 2 -+ -+/* Section header. */ -+ -+typedef struct -+{ -+ Elf32_Word sh_name; /* Section name (string tbl index) */ -+ Elf32_Word sh_type; /* Section type */ -+ Elf32_Word sh_flags; /* Section flags */ -+ Elf32_Addr sh_addr; /* Section virtual addr at execution */ -+ Elf32_Off sh_offset; /* Section file offset */ -+ Elf32_Word sh_size; /* Section size in bytes */ -+ Elf32_Word sh_link; /* Link to another section */ -+ Elf32_Word sh_info; /* Additional section information */ -+ Elf32_Word sh_addralign; /* Section alignment */ -+ Elf32_Word sh_entsize; /* Entry size if section holds table */ -+} Elf32_Shdr; -+ -+typedef struct -+{ -+ Elf64_Word sh_name; /* Section name (string tbl index) */ -+ Elf64_Word sh_type; /* Section type */ -+ Elf64_Xword sh_flags; /* Section flags */ -+ Elf64_Addr sh_addr; /* Section virtual addr at execution */ -+ Elf64_Off sh_offset; /* Section file offset */ -+ Elf64_Xword sh_size; /* Section size in bytes */ -+ Elf64_Word sh_link; /* Link to another section */ -+ Elf64_Word sh_info; /* Additional section information */ -+ Elf64_Xword sh_addralign; /* Section alignment */ -+ Elf64_Xword sh_entsize; /* Entry size if section holds table */ -+} Elf64_Shdr; -+ -+/* Special section indices. */ -+ -+#define SHN_UNDEF 0 /* Undefined section */ -+#define SHN_LORESERVE 0xff00 /* Start of reserved indices */ -+#define SHN_LOPROC 0xff00 /* Start of processor-specific */ -+#define SHN_BEFORE 0xff00 /* Order section before all others -+ (Solaris). */ -+#define SHN_AFTER 0xff01 /* Order section after all others -+ (Solaris). */ -+#define SHN_HIPROC 0xff1f /* End of processor-specific */ -+#define SHN_LOOS 0xff20 /* Start of OS-specific */ -+#define SHN_HIOS 0xff3f /* End of OS-specific */ -+#define SHN_ABS 0xfff1 /* Associated symbol is absolute */ -+#define SHN_COMMON 0xfff2 /* Associated symbol is common */ -+#define SHN_XINDEX 0xffff /* Index is in extra table. */ -+#define SHN_HIRESERVE 0xffff /* End of reserved indices */ -+ -+/* Legal values for sh_type (section type). */ -+ -+#define SHT_NULL 0 /* Section header table entry unused */ -+#define SHT_PROGBITS 1 /* Program data */ -+#define SHT_SYMTAB 2 /* Symbol table */ -+#define SHT_STRTAB 3 /* String table */ -+#define SHT_RELA 4 /* Relocation entries with addends */ -+#define SHT_HASH 5 /* Symbol hash table */ -+#define SHT_DYNAMIC 6 /* Dynamic linking information */ -+#define SHT_NOTE 7 /* Notes */ -+#define SHT_NOBITS 8 /* Program space with no data (bss) */ -+#define SHT_REL 9 /* Relocation entries, no addends */ -+#define SHT_SHLIB 10 /* Reserved */ -+#define SHT_DYNSYM 11 /* Dynamic linker symbol table */ -+#define SHT_INIT_ARRAY 14 /* Array of constructors */ -+#define SHT_FINI_ARRAY 15 /* Array of destructors */ -+#define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ -+#define SHT_GROUP 17 /* Section group */ -+#define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ -+#define SHT_NUM 19 /* Number of defined types. */ -+#define SHT_LOOS 0x60000000 /* Start OS-specific. */ -+#define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes. */ -+#define SHT_GNU_HASH 0x6ffffff6 /* GNU-style hash table. */ -+#define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */ -+#define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */ -+#define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */ -+#define SHT_SUNW_move 0x6ffffffa -+#define SHT_SUNW_COMDAT 0x6ffffffb -+#define SHT_SUNW_syminfo 0x6ffffffc -+#define SHT_GNU_verdef 0x6ffffffd /* Version definition section. */ -+#define SHT_GNU_verneed 0x6ffffffe /* Version needs section. */ -+#define SHT_GNU_versym 0x6fffffff /* Version symbol table. */ -+#define SHT_HISUNW 0x6fffffff /* Sun-specific high bound. */ -+#define SHT_HIOS 0x6fffffff /* End OS-specific type */ -+#define SHT_LOPROC 0x70000000 /* Start of processor-specific */ -+#define SHT_HIPROC 0x7fffffff /* End of processor-specific */ -+#define SHT_LOUSER 0x80000000 /* Start of application-specific */ -+#define SHT_HIUSER 0x8fffffff /* End of application-specific */ -+ -+/* Legal values for sh_flags (section flags). */ -+ -+#define SHF_WRITE (1 << 0) /* Writable */ -+#define SHF_ALLOC (1 << 1) /* Occupies memory during execution */ -+#define SHF_EXECINSTR (1 << 2) /* Executable */ -+#define SHF_MERGE (1 << 4) /* Might be merged */ -+#define SHF_STRINGS (1 << 5) /* Contains nul-terminated strings */ -+#define SHF_INFO_LINK (1 << 6) /* `sh_info' contains SHT index */ -+#define SHF_LINK_ORDER (1 << 7) /* Preserve order after combining */ -+#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling -+ required */ -+#define SHF_GROUP (1 << 9) /* Section is member of a group. */ -+#define SHF_TLS (1 << 10) /* Section hold thread-local data. */ -+#define SHF_MASKOS 0x0ff00000 /* OS-specific. */ -+#define SHF_MASKPROC 0xf0000000 /* Processor-specific */ -+#define SHF_ORDERED (1 << 30) /* Special ordering requirement -+ (Solaris). */ -+#define SHF_EXCLUDE (1 << 31) /* Section is excluded unless -+ referenced or allocated (Solaris).*/ -+ -+/* Section group handling. */ -+#define GRP_COMDAT 0x1 /* Mark group as COMDAT. */ -+ -+/* Symbol table entry. */ -+ -+typedef struct -+{ -+ Elf32_Word st_name; /* Symbol name (string tbl index) */ -+ Elf32_Addr st_value; /* Symbol value */ -+ Elf32_Word st_size; /* Symbol size */ -+ unsigned char st_info; /* Symbol type and binding */ -+ unsigned char st_other; /* Symbol visibility */ -+ Elf32_Section st_shndx; /* Section index */ -+} Elf32_Sym; -+ -+typedef struct -+{ -+ Elf64_Word st_name; /* Symbol name (string tbl index) */ -+ unsigned char st_info; /* Symbol type and binding */ -+ unsigned char st_other; /* Symbol visibility */ -+ Elf64_Section st_shndx; /* Section index */ -+ Elf64_Addr st_value; /* Symbol value */ -+ Elf64_Xword st_size; /* Symbol size */ -+} Elf64_Sym; -+ -+/* The syminfo section if available contains additional information about -+ every dynamic symbol. */ -+ -+typedef struct -+{ -+ Elf32_Half si_boundto; /* Direct bindings, symbol bound to */ -+ Elf32_Half si_flags; /* Per symbol flags */ -+} Elf32_Syminfo; -+ -+typedef struct -+{ -+ Elf64_Half si_boundto; /* Direct bindings, symbol bound to */ -+ Elf64_Half si_flags; /* Per symbol flags */ -+} Elf64_Syminfo; -+ -+/* Possible values for si_boundto. */ -+#define SYMINFO_BT_SELF 0xffff /* Symbol bound to self */ -+#define SYMINFO_BT_PARENT 0xfffe /* Symbol bound to parent */ -+#define SYMINFO_BT_LOWRESERVE 0xff00 /* Beginning of reserved entries */ -+ -+/* Possible bitmasks for si_flags. */ -+#define SYMINFO_FLG_DIRECT 0x0001 /* Direct bound symbol */ -+#define SYMINFO_FLG_PASSTHRU 0x0002 /* Pass-thru symbol for translator */ -+#define SYMINFO_FLG_COPY 0x0004 /* Symbol is a copy-reloc */ -+#define SYMINFO_FLG_LAZYLOAD 0x0008 /* Symbol bound to object to be lazy -+ loaded */ -+/* Syminfo version values. */ -+#define SYMINFO_NONE 0 -+#define SYMINFO_CURRENT 1 -+#define SYMINFO_NUM 2 -+ -+ -+/* How to extract and insert information held in the st_info field. */ -+ -+#define ELF32_ST_BIND(val) (((unsigned char) (val)) >> 4) -+#define ELF32_ST_TYPE(val) ((val) & 0xf) -+#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) -+ -+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field. */ -+#define ELF64_ST_BIND(val) ELF32_ST_BIND (val) -+#define ELF64_ST_TYPE(val) ELF32_ST_TYPE (val) -+#define ELF64_ST_INFO(bind, type) ELF32_ST_INFO ((bind), (type)) -+ -+/* Legal values for ST_BIND subfield of st_info (symbol binding). */ -+ -+#define STB_LOCAL 0 /* Local symbol */ -+#define STB_GLOBAL 1 /* Global symbol */ -+#define STB_WEAK 2 /* Weak symbol */ -+#define STB_NUM 3 /* Number of defined types. */ -+#define STB_LOOS 10 /* Start of OS-specific */ -+#define STB_GNU_UNIQUE 10 /* Unique symbol. */ -+#define STB_HIOS 12 /* End of OS-specific */ -+#define STB_LOPROC 13 /* Start of processor-specific */ -+#define STB_HIPROC 15 /* End of processor-specific */ -+ -+/* Legal values for ST_TYPE subfield of st_info (symbol type). */ -+ -+#define STT_NOTYPE 0 /* Symbol type is unspecified */ -+#define STT_OBJECT 1 /* Symbol is a data object */ -+#define STT_FUNC 2 /* Symbol is a code object */ -+#define STT_SECTION 3 /* Symbol associated with a section */ -+#define STT_FILE 4 /* Symbol's name is file name */ -+#define STT_COMMON 5 /* Symbol is a common data object */ -+#define STT_TLS 6 /* Symbol is thread-local data object*/ -+#define STT_NUM 7 /* Number of defined types. */ -+#define STT_LOOS 10 /* Start of OS-specific */ -+#define STT_GNU_IFUNC 10 /* Symbol is indirect code object */ -+#define STT_HIOS 12 /* End of OS-specific */ -+#define STT_LOPROC 13 /* Start of processor-specific */ -+#define STT_HIPROC 15 /* End of processor-specific */ -+ -+ -+/* Symbol table indices are found in the hash buckets and chain table -+ of a symbol hash table section. This special index value indicates -+ the end of a chain, meaning no further symbols are found in that bucket. */ -+ -+#define STN_UNDEF 0 /* End of a chain. */ -+ -+ -+/* How to extract and insert information held in the st_other field. */ -+ -+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03) -+ -+/* For ELF64 the definitions are the same. */ -+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o) -+ -+/* Symbol visibility specification encoded in the st_other field. */ -+#define STV_DEFAULT 0 /* Default symbol visibility rules */ -+#define STV_INTERNAL 1 /* Processor specific hidden class */ -+#define STV_HIDDEN 2 /* Sym unavailable in other modules */ -+#define STV_PROTECTED 3 /* Not preemptible, not exported */ -+ -+ -+/* Relocation table entry without addend (in section of type SHT_REL). */ -+ -+typedef struct -+{ -+ Elf32_Addr r_offset; /* Address */ -+ Elf32_Word r_info; /* Relocation type and symbol index */ -+} Elf32_Rel; -+ -+/* I have seen two different definitions of the Elf64_Rel and -+ Elf64_Rela structures, so we'll leave them out until Novell (or -+ whoever) gets their act together. */ -+/* The following, at least, is used on Sparc v9, MIPS, and Alpha. */ -+ -+typedef struct -+{ -+ Elf64_Addr r_offset; /* Address */ -+ Elf64_Xword r_info; /* Relocation type and symbol index */ -+} Elf64_Rel; -+ -+/* Relocation table entry with addend (in section of type SHT_RELA). */ -+ -+typedef struct -+{ -+ Elf32_Addr r_offset; /* Address */ -+ Elf32_Word r_info; /* Relocation type and symbol index */ -+ Elf32_Sword r_addend; /* Addend */ -+} Elf32_Rela; -+ -+typedef struct -+{ -+ Elf64_Addr r_offset; /* Address */ -+ Elf64_Xword r_info; /* Relocation type and symbol index */ -+ Elf64_Sxword r_addend; /* Addend */ -+} Elf64_Rela; -+ -+/* How to extract and insert information held in the r_info field. */ -+ -+#define ELF32_R_SYM(val) ((val) >> 8) -+#define ELF32_R_TYPE(val) ((val) & 0xff) -+#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff)) -+ -+#define ELF64_R_SYM(i) ((i) >> 32) -+#define ELF64_R_TYPE(i) ((i) & 0xffffffff) -+#define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type)) -+ -+/* Program segment header. */ -+ -+typedef struct -+{ -+ Elf32_Word p_type; /* Segment type */ -+ Elf32_Off p_offset; /* Segment file offset */ -+ Elf32_Addr p_vaddr; /* Segment virtual address */ -+ Elf32_Addr p_paddr; /* Segment physical address */ -+ Elf32_Word p_filesz; /* Segment size in file */ -+ Elf32_Word p_memsz; /* Segment size in memory */ -+ Elf32_Word p_flags; /* Segment flags */ -+ Elf32_Word p_align; /* Segment alignment */ -+} Elf32_Phdr; -+ -+typedef struct -+{ -+ Elf64_Word p_type; /* Segment type */ -+ Elf64_Word p_flags; /* Segment flags */ -+ Elf64_Off p_offset; /* Segment file offset */ -+ Elf64_Addr p_vaddr; /* Segment virtual address */ -+ Elf64_Addr p_paddr; /* Segment physical address */ -+ Elf64_Xword p_filesz; /* Segment size in file */ -+ Elf64_Xword p_memsz; /* Segment size in memory */ -+ Elf64_Xword p_align; /* Segment alignment */ -+} Elf64_Phdr; -+ -+/* Special value for e_phnum. This indicates that the real number of -+ program headers is too large to fit into e_phnum. Instead the real -+ value is in the field sh_info of section 0. */ -+ -+#define PN_XNUM 0xffff -+ -+/* Legal values for p_type (segment type). */ -+ -+#define PT_NULL 0 /* Program header table entry unused */ -+#define PT_LOAD 1 /* Loadable program segment */ -+#define PT_DYNAMIC 2 /* Dynamic linking information */ -+#define PT_INTERP 3 /* Program interpreter */ -+#define PT_NOTE 4 /* Auxiliary information */ -+#define PT_SHLIB 5 /* Reserved */ -+#define PT_PHDR 6 /* Entry for header table itself */ -+#define PT_TLS 7 /* Thread-local storage segment */ -+#define PT_NUM 8 /* Number of defined types */ -+#define PT_LOOS 0x60000000 /* Start of OS-specific */ -+#define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ -+#define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ -+#define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ -+#define PT_LOSUNW 0x6ffffffa -+#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ -+#define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ -+#define PT_HISUNW 0x6fffffff -+#define PT_HIOS 0x6fffffff /* End of OS-specific */ -+#define PT_LOPROC 0x70000000 /* Start of processor-specific */ -+#define PT_HIPROC 0x7fffffff /* End of processor-specific */ -+ -+/* Legal values for p_flags (segment flags). */ -+ -+#define PF_X (1 << 0) /* Segment is executable */ -+#define PF_W (1 << 1) /* Segment is writable */ -+#define PF_R (1 << 2) /* Segment is readable */ -+#define PF_MASKOS 0x0ff00000 /* OS-specific */ -+#define PF_MASKPROC 0xf0000000 /* Processor-specific */ -+ -+/* Legal values for note segment descriptor types for core files. */ -+ -+#define NT_PRSTATUS 1 /* Contains copy of prstatus struct */ -+#define NT_FPREGSET 2 /* Contains copy of fpregset struct */ -+#define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */ -+#define NT_PRXREG 4 /* Contains copy of prxregset struct */ -+#define NT_TASKSTRUCT 4 /* Contains copy of task structure */ -+#define NT_PLATFORM 5 /* String from sysinfo(SI_PLATFORM) */ -+#define NT_AUXV 6 /* Contains copy of auxv array */ -+#define NT_GWINDOWS 7 /* Contains copy of gwindows struct */ -+#define NT_ASRS 8 /* Contains copy of asrset struct */ -+#define NT_PSTATUS 10 /* Contains copy of pstatus struct */ -+#define NT_PSINFO 13 /* Contains copy of psinfo struct */ -+#define NT_PRCRED 14 /* Contains copy of prcred struct */ -+#define NT_UTSNAME 15 /* Contains copy of utsname struct */ -+#define NT_LWPSTATUS 16 /* Contains copy of lwpstatus struct */ -+#define NT_LWPSINFO 17 /* Contains copy of lwpinfo struct */ -+#define NT_PRFPXREG 20 /* Contains copy of fprxregset struct */ -+#define NT_PRXFPREG 0x46e62b7f /* Contains copy of user_fxsr_struct */ -+#define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */ -+#define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */ -+#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ -+#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ -+#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ -+#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */ -+ -+/* Legal values for the note segment descriptor types for object files. */ -+ -+#define NT_VERSION 1 /* Contains a version string. */ -+ -+ -+/* Dynamic section entry. */ -+ -+typedef struct -+{ -+ Elf32_Sword d_tag; /* Dynamic entry type */ -+ union -+ { -+ Elf32_Word d_val; /* Integer value */ -+ Elf32_Addr d_ptr; /* Address value */ -+ } d_un; -+} Elf32_Dyn; -+ -+typedef struct -+{ -+ Elf64_Sxword d_tag; /* Dynamic entry type */ -+ union -+ { -+ Elf64_Xword d_val; /* Integer value */ -+ Elf64_Addr d_ptr; /* Address value */ -+ } d_un; -+} Elf64_Dyn; -+ -+/* Legal values for d_tag (dynamic entry type). */ -+ -+#define DT_NULL 0 /* Marks end of dynamic section */ -+#define DT_NEEDED 1 /* Name of needed library */ -+#define DT_PLTRELSZ 2 /* Size in bytes of PLT relocs */ -+#define DT_PLTGOT 3 /* Processor defined value */ -+#define DT_HASH 4 /* Address of symbol hash table */ -+#define DT_STRTAB 5 /* Address of string table */ -+#define DT_SYMTAB 6 /* Address of symbol table */ -+#define DT_RELA 7 /* Address of Rela relocs */ -+#define DT_RELASZ 8 /* Total size of Rela relocs */ -+#define DT_RELAENT 9 /* Size of one Rela reloc */ -+#define DT_STRSZ 10 /* Size of string table */ -+#define DT_SYMENT 11 /* Size of one symbol table entry */ -+#define DT_INIT 12 /* Address of init function */ -+#define DT_FINI 13 /* Address of termination function */ -+#define DT_SONAME 14 /* Name of shared object */ -+#define DT_RPATH 15 /* Library search path (deprecated) */ -+#define DT_SYMBOLIC 16 /* Start symbol search here */ -+#define DT_REL 17 /* Address of Rel relocs */ -+#define DT_RELSZ 18 /* Total size of Rel relocs */ -+#define DT_RELENT 19 /* Size of one Rel reloc */ -+#define DT_PLTREL 20 /* Type of reloc in PLT */ -+#define DT_DEBUG 21 /* For debugging; unspecified */ -+#define DT_TEXTREL 22 /* Reloc might modify .text */ -+#define DT_JMPREL 23 /* Address of PLT relocs */ -+#define DT_BIND_NOW 24 /* Process relocations of object */ -+#define DT_INIT_ARRAY 25 /* Array with addresses of init fct */ -+#define DT_FINI_ARRAY 26 /* Array with addresses of fini fct */ -+#define DT_INIT_ARRAYSZ 27 /* Size in bytes of DT_INIT_ARRAY */ -+#define DT_FINI_ARRAYSZ 28 /* Size in bytes of DT_FINI_ARRAY */ -+#define DT_RUNPATH 29 /* Library search path */ -+#define DT_FLAGS 30 /* Flags for the object being loaded */ -+#define DT_ENCODING 32 /* Start of encoded range */ -+#define DT_PREINIT_ARRAY 32 /* Array with addresses of preinit fct*/ -+#define DT_PREINIT_ARRAYSZ 33 /* size in bytes of DT_PREINIT_ARRAY */ -+#define DT_NUM 34 /* Number used */ -+#define DT_LOOS 0x6000000d /* Start of OS-specific */ -+#define DT_HIOS 0x6ffff000 /* End of OS-specific */ -+#define DT_LOPROC 0x70000000 /* Start of processor-specific */ -+#define DT_HIPROC 0x7fffffff /* End of processor-specific */ -+#define DT_PROCNUM DT_MIPS_NUM /* Most used by any processor */ -+ -+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the -+ Dyn.d_un.d_val field of the Elf*_Dyn structure. This follows Sun's -+ approach. */ -+#define DT_VALRNGLO 0x6ffffd00 -+#define DT_GNU_PRELINKED 0x6ffffdf5 /* Prelinking timestamp */ -+#define DT_GNU_CONFLICTSZ 0x6ffffdf6 /* Size of conflict section */ -+#define DT_GNU_LIBLISTSZ 0x6ffffdf7 /* Size of library list */ -+#define DT_CHECKSUM 0x6ffffdf8 -+#define DT_PLTPADSZ 0x6ffffdf9 -+#define DT_MOVEENT 0x6ffffdfa -+#define DT_MOVESZ 0x6ffffdfb -+#define DT_FEATURE_1 0x6ffffdfc /* Feature selection (DTF_*). */ -+#define DT_POSFLAG_1 0x6ffffdfd /* Flags for DT_* entries, effecting -+ the following DT_* entry. */ -+#define DT_SYMINSZ 0x6ffffdfe /* Size of syminfo table (in bytes) */ -+#define DT_SYMINENT 0x6ffffdff /* Entry size of syminfo */ -+#define DT_VALRNGHI 0x6ffffdff -+#define DT_VALTAGIDX(tag) (DT_VALRNGHI - (tag)) /* Reverse order! */ -+#define DT_VALNUM 12 -+ -+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the -+ Dyn.d_un.d_ptr field of the Elf*_Dyn structure. -+ -+ If any adjustment is made to the ELF object after it has been -+ built these entries will need to be adjusted. */ -+#define DT_ADDRRNGLO 0x6ffffe00 -+#define DT_GNU_HASH 0x6ffffef5 /* GNU-style hash table. */ -+#define DT_TLSDESC_PLT 0x6ffffef6 -+#define DT_TLSDESC_GOT 0x6ffffef7 -+#define DT_GNU_CONFLICT 0x6ffffef8 /* Start of conflict section */ -+#define DT_GNU_LIBLIST 0x6ffffef9 /* Library list */ -+#define DT_CONFIG 0x6ffffefa /* Configuration information. */ -+#define DT_DEPAUDIT 0x6ffffefb /* Dependency auditing. */ -+#define DT_AUDIT 0x6ffffefc /* Object auditing. */ -+#define DT_PLTPAD 0x6ffffefd /* PLT padding. */ -+#define DT_MOVETAB 0x6ffffefe /* Move table. */ -+#define DT_SYMINFO 0x6ffffeff /* Syminfo table. */ -+#define DT_ADDRRNGHI 0x6ffffeff -+#define DT_ADDRTAGIDX(tag) (DT_ADDRRNGHI - (tag)) /* Reverse order! */ -+#define DT_ADDRNUM 11 -+ -+/* The versioning entry types. The next are defined as part of the -+ GNU extension. */ -+#define DT_VERSYM 0x6ffffff0 -+ -+#define DT_RELACOUNT 0x6ffffff9 -+#define DT_RELCOUNT 0x6ffffffa -+ -+/* These were chosen by Sun. */ -+#define DT_FLAGS_1 0x6ffffffb /* State flags, see DF_1_* below. */ -+#define DT_VERDEF 0x6ffffffc /* Address of version definition -+ table */ -+#define DT_VERDEFNUM 0x6ffffffd /* Number of version definitions */ -+#define DT_VERNEED 0x6ffffffe /* Address of table with needed -+ versions */ -+#define DT_VERNEEDNUM 0x6fffffff /* Number of needed versions */ -+#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */ -+#define DT_VERSIONTAGNUM 16 -+ -+/* Sun added these machine-independent extensions in the "processor-specific" -+ range. Be compatible. */ -+#define DT_AUXILIARY 0x7ffffffd /* Shared object to load before self */ -+#define DT_FILTER 0x7fffffff /* Shared object to get values from */ -+#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1) -+#define DT_EXTRANUM 3 -+ -+/* Values of `d_un.d_val' in the DT_FLAGS entry. */ -+#define DF_ORIGIN 0x00000001 /* Object may use DF_ORIGIN */ -+#define DF_SYMBOLIC 0x00000002 /* Symbol resolutions starts here */ -+#define DF_TEXTREL 0x00000004 /* Object contains text relocations */ -+#define DF_BIND_NOW 0x00000008 /* No lazy binding for this object */ -+#define DF_STATIC_TLS 0x00000010 /* Module uses the static TLS model */ -+ -+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1 -+ entry in the dynamic section. */ -+#define DF_1_NOW 0x00000001 /* Set RTLD_NOW for this object. */ -+#define DF_1_GLOBAL 0x00000002 /* Set RTLD_GLOBAL for this object. */ -+#define DF_1_GROUP 0x00000004 /* Set RTLD_GROUP for this object. */ -+#define DF_1_NODELETE 0x00000008 /* Set RTLD_NODELETE for this object.*/ -+#define DF_1_LOADFLTR 0x00000010 /* Trigger filtee loading at runtime.*/ -+#define DF_1_INITFIRST 0x00000020 /* Set RTLD_INITFIRST for this object*/ -+#define DF_1_NOOPEN 0x00000040 /* Set RTLD_NOOPEN for this object. */ -+#define DF_1_ORIGIN 0x00000080 /* $ORIGIN must be handled. */ -+#define DF_1_DIRECT 0x00000100 /* Direct binding enabled. */ -+#define DF_1_TRANS 0x00000200 -+#define DF_1_INTERPOSE 0x00000400 /* Object is used to interpose. */ -+#define DF_1_NODEFLIB 0x00000800 /* Ignore default lib search path. */ -+#define DF_1_NODUMP 0x00001000 /* Object can't be dldump'ed. */ -+#define DF_1_CONFALT 0x00002000 /* Configuration alternative created.*/ -+#define DF_1_ENDFILTEE 0x00004000 /* Filtee terminates filters search. */ -+#define DF_1_DISPRELDNE 0x00008000 /* Disp reloc applied at build time. */ -+#define DF_1_DISPRELPND 0x00010000 /* Disp reloc applied at run-time. */ -+ -+/* Flags for the feature selection in DT_FEATURE_1. */ -+#define DTF_1_PARINIT 0x00000001 -+#define DTF_1_CONFEXP 0x00000002 -+ -+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry. */ -+#define DF_P1_LAZYLOAD 0x00000001 /* Lazyload following object. */ -+#define DF_P1_GROUPPERM 0x00000002 /* Symbols from next object are not -+ generally available. */ -+ -+/* Version definition sections. */ -+ -+typedef struct -+{ -+ Elf32_Half vd_version; /* Version revision */ -+ Elf32_Half vd_flags; /* Version information */ -+ Elf32_Half vd_ndx; /* Version Index */ -+ Elf32_Half vd_cnt; /* Number of associated aux entries */ -+ Elf32_Word vd_hash; /* Version name hash value */ -+ Elf32_Word vd_aux; /* Offset in bytes to verdaux array */ -+ Elf32_Word vd_next; /* Offset in bytes to next verdef -+ entry */ -+} Elf32_Verdef; -+ -+typedef struct -+{ -+ Elf64_Half vd_version; /* Version revision */ -+ Elf64_Half vd_flags; /* Version information */ -+ Elf64_Half vd_ndx; /* Version Index */ -+ Elf64_Half vd_cnt; /* Number of associated aux entries */ -+ Elf64_Word vd_hash; /* Version name hash value */ -+ Elf64_Word vd_aux; /* Offset in bytes to verdaux array */ -+ Elf64_Word vd_next; /* Offset in bytes to next verdef -+ entry */ -+} Elf64_Verdef; -+ -+ -+/* Legal values for vd_version (version revision). */ -+#define VER_DEF_NONE 0 /* No version */ -+#define VER_DEF_CURRENT 1 /* Current version */ -+#define VER_DEF_NUM 2 /* Given version number */ -+ -+/* Legal values for vd_flags (version information flags). */ -+#define VER_FLG_BASE 0x1 /* Version definition of file itself */ -+#define VER_FLG_WEAK 0x2 /* Weak version identifier */ -+ -+/* Versym symbol index values. */ -+#define VER_NDX_LOCAL 0 /* Symbol is local. */ -+#define VER_NDX_GLOBAL 1 /* Symbol is global. */ -+#define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */ -+#define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */ -+ -+/* Auxialiary version information. */ -+ -+typedef struct -+{ -+ Elf32_Word vda_name; /* Version or dependency names */ -+ Elf32_Word vda_next; /* Offset in bytes to next verdaux -+ entry */ -+} Elf32_Verdaux; -+ -+typedef struct -+{ -+ Elf64_Word vda_name; /* Version or dependency names */ -+ Elf64_Word vda_next; /* Offset in bytes to next verdaux -+ entry */ -+} Elf64_Verdaux; -+ -+ -+/* Version dependency section. */ -+ -+typedef struct -+{ -+ Elf32_Half vn_version; /* Version of structure */ -+ Elf32_Half vn_cnt; /* Number of associated aux entries */ -+ Elf32_Word vn_file; /* Offset of filename for this -+ dependency */ -+ Elf32_Word vn_aux; /* Offset in bytes to vernaux array */ -+ Elf32_Word vn_next; /* Offset in bytes to next verneed -+ entry */ -+} Elf32_Verneed; -+ -+typedef struct -+{ -+ Elf64_Half vn_version; /* Version of structure */ -+ Elf64_Half vn_cnt; /* Number of associated aux entries */ -+ Elf64_Word vn_file; /* Offset of filename for this -+ dependency */ -+ Elf64_Word vn_aux; /* Offset in bytes to vernaux array */ -+ Elf64_Word vn_next; /* Offset in bytes to next verneed -+ entry */ -+} Elf64_Verneed; -+ -+ -+/* Legal values for vn_version (version revision). */ -+#define VER_NEED_NONE 0 /* No version */ -+#define VER_NEED_CURRENT 1 /* Current version */ -+#define VER_NEED_NUM 2 /* Given version number */ -+ -+/* Auxiliary needed version information. */ -+ -+typedef struct -+{ -+ Elf32_Word vna_hash; /* Hash value of dependency name */ -+ Elf32_Half vna_flags; /* Dependency specific information */ -+ Elf32_Half vna_other; /* Unused */ -+ Elf32_Word vna_name; /* Dependency name string offset */ -+ Elf32_Word vna_next; /* Offset in bytes to next vernaux -+ entry */ -+} Elf32_Vernaux; -+ -+typedef struct -+{ -+ Elf64_Word vna_hash; /* Hash value of dependency name */ -+ Elf64_Half vna_flags; /* Dependency specific information */ -+ Elf64_Half vna_other; /* Unused */ -+ Elf64_Word vna_name; /* Dependency name string offset */ -+ Elf64_Word vna_next; /* Offset in bytes to next vernaux -+ entry */ -+} Elf64_Vernaux; -+ -+ -+/* Legal values for vna_flags. */ -+#define VER_FLG_WEAK 0x2 /* Weak version identifier */ -+ -+ -+/* Auxiliary vector. */ -+ -+/* This vector is normally only used by the program interpreter. The -+ usual definition in an ABI supplement uses the name auxv_t. The -+ vector is not usually defined in a standard file, but it -+ can't hurt. We rename it to avoid conflicts. The sizes of these -+ types are an arrangement between the exec server and the program -+ interpreter, so we don't fully specify them here. */ -+ -+typedef struct -+{ -+ uint32_t a_type; /* Entry type */ -+ union -+ { -+ uint32_t a_val; /* Integer value */ -+ /* We use to have pointer elements added here. We cannot do that, -+ though, since it does not work when using 32-bit definitions -+ on 64-bit platforms and vice versa. */ -+ } a_un; -+} Elf32_auxv_t; -+ -+typedef struct -+{ -+ uint64_t a_type; /* Entry type */ -+ union -+ { -+ uint64_t a_val; /* Integer value */ -+ /* We use to have pointer elements added here. We cannot do that, -+ though, since it does not work when using 32-bit definitions -+ on 64-bit platforms and vice versa. */ -+ } a_un; -+} Elf64_auxv_t; -+ -+/* Legal values for a_type (entry type). */ -+ -+#define AT_NULL 0 /* End of vector */ -+#define AT_IGNORE 1 /* Entry should be ignored */ -+#define AT_EXECFD 2 /* File descriptor of program */ -+#define AT_PHDR 3 /* Program headers for program */ -+#define AT_PHENT 4 /* Size of program header entry */ -+#define AT_PHNUM 5 /* Number of program headers */ -+#define AT_PAGESZ 6 /* System page size */ -+#define AT_BASE 7 /* Base address of interpreter */ -+#define AT_FLAGS 8 /* Flags */ -+#define AT_ENTRY 9 /* Entry point of program */ -+#define AT_NOTELF 10 /* Program is not ELF */ -+#define AT_UID 11 /* Real uid */ -+#define AT_EUID 12 /* Effective uid */ -+#define AT_GID 13 /* Real gid */ -+#define AT_EGID 14 /* Effective gid */ -+#define AT_CLKTCK 17 /* Frequency of times() */ -+ -+/* Some more special a_type values describing the hardware. */ -+#define AT_PLATFORM 15 /* String identifying platform. */ -+#define AT_HWCAP 16 /* Machine dependent hints about -+ processor capabilities. */ -+ -+/* This entry gives some information about the FPU initialization -+ performed by the kernel. */ -+#define AT_FPUCW 18 /* Used FPU control word. */ -+ -+/* Cache block sizes. */ -+#define AT_DCACHEBSIZE 19 /* Data cache block size. */ -+#define AT_ICACHEBSIZE 20 /* Instruction cache block size. */ -+#define AT_UCACHEBSIZE 21 /* Unified cache block size. */ -+ -+/* A special ignored value for PPC, used by the kernel to control the -+ interpretation of the AUXV. Must be > 16. */ -+#define AT_IGNOREPPC 22 /* Entry should be ignored. */ -+ -+#define AT_SECURE 23 /* Boolean, was exec setuid-like? */ -+ -+#define AT_BASE_PLATFORM 24 /* String identifying real platforms.*/ -+ -+#define AT_RANDOM 25 /* Address of 16 random bytes. */ -+ -+#define AT_EXECFN 31 /* Filename of executable. */ -+ -+/* Pointer to the global system page used for system calls and other -+ nice things. */ -+#define AT_SYSINFO 32 -+#define AT_SYSINFO_EHDR 33 -+ -+/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains -+ log2 of line size; mask those to get cache size. */ -+#define AT_L1I_CACHESHAPE 34 -+#define AT_L1D_CACHESHAPE 35 -+#define AT_L2_CACHESHAPE 36 -+#define AT_L3_CACHESHAPE 37 -+ -+/* Note section contents. Each entry in the note section begins with -+ a header of a fixed form. */ -+ -+typedef struct -+{ -+ Elf32_Word n_namesz; /* Length of the note's name. */ -+ Elf32_Word n_descsz; /* Length of the note's descriptor. */ -+ Elf32_Word n_type; /* Type of the note. */ -+} Elf32_Nhdr; -+ -+typedef struct -+{ -+ Elf64_Word n_namesz; /* Length of the note's name. */ -+ Elf64_Word n_descsz; /* Length of the note's descriptor. */ -+ Elf64_Word n_type; /* Type of the note. */ -+} Elf64_Nhdr; -+ -+/* Known names of notes. */ -+ -+/* Solaris entries in the note section have this name. */ -+#define ELF_NOTE_SOLARIS "SUNW Solaris" -+ -+/* Note entries for GNU systems have this name. */ -+#define ELF_NOTE_GNU "GNU" -+ -+ -+/* Defined types of notes for Solaris. */ -+ -+/* Value of descriptor (one word) is desired pagesize for the binary. */ -+#define ELF_NOTE_PAGESIZE_HINT 1 -+ -+ -+/* Defined note types for GNU systems. */ -+ -+/* ABI information. The descriptor consists of words: -+ word 0: OS descriptor -+ word 1: major version of the ABI -+ word 2: minor version of the ABI -+ word 3: subminor version of the ABI -+*/ -+#define NT_GNU_ABI_TAG 1 -+#define ELF_NOTE_ABI NT_GNU_ABI_TAG /* Old name. */ -+ -+/* Known OSes. These values can appear in word 0 of an -+ NT_GNU_ABI_TAG note section entry. */ -+#define ELF_NOTE_OS_LINUX 0 -+#define ELF_NOTE_OS_GNU 1 -+#define ELF_NOTE_OS_SOLARIS2 2 -+#define ELF_NOTE_OS_FREEBSD 3 -+ -+/* Synthetic hwcap information. The descriptor begins with two words: -+ word 0: number of entries -+ word 1: bitmask of enabled entries -+ Then follow variable-length entries, one byte followed by a -+ '\0'-terminated hwcap name string. The byte gives the bit -+ number to test if enabled, (1U << bit) & bitmask. */ -+#define NT_GNU_HWCAP 2 -+ -+/* Build ID bits as generated by ld --build-id. -+ The descriptor consists of any nonzero number of bytes. */ -+#define NT_GNU_BUILD_ID 3 -+ -+/* Version note generated by GNU gold containing a version string. */ -+#define NT_GNU_GOLD_VERSION 4 -+ -+ -+/* Move records. */ -+typedef struct -+{ -+ Elf32_Xword m_value; /* Symbol value. */ -+ Elf32_Word m_info; /* Size and index. */ -+ Elf32_Word m_poffset; /* Symbol offset. */ -+ Elf32_Half m_repeat; /* Repeat count. */ -+ Elf32_Half m_stride; /* Stride info. */ -+} Elf32_Move; -+ -+typedef struct -+{ -+ Elf64_Xword m_value; /* Symbol value. */ -+ Elf64_Xword m_info; /* Size and index. */ -+ Elf64_Xword m_poffset; /* Symbol offset. */ -+ Elf64_Half m_repeat; /* Repeat count. */ -+ Elf64_Half m_stride; /* Stride info. */ -+} Elf64_Move; -+ -+/* Macro to construct move records. */ -+#define ELF32_M_SYM(info) ((info) >> 8) -+#define ELF32_M_SIZE(info) ((unsigned char) (info)) -+#define ELF32_M_INFO(sym, size) (((sym) << 8) + (unsigned char) (size)) -+ -+#define ELF64_M_SYM(info) ELF32_M_SYM (info) -+#define ELF64_M_SIZE(info) ELF32_M_SIZE (info) -+#define ELF64_M_INFO(sym, size) ELF32_M_INFO (sym, size) -+ -+ -+/* Motorola 68k specific definitions. */ -+ -+/* Values for Elf32_Ehdr.e_flags. */ -+#define EF_CPU32 0x00810000 -+ -+/* m68k relocs. */ -+ -+#define R_68K_NONE 0 /* No reloc */ -+#define R_68K_32 1 /* Direct 32 bit */ -+#define R_68K_16 2 /* Direct 16 bit */ -+#define R_68K_8 3 /* Direct 8 bit */ -+#define R_68K_PC32 4 /* PC relative 32 bit */ -+#define R_68K_PC16 5 /* PC relative 16 bit */ -+#define R_68K_PC8 6 /* PC relative 8 bit */ -+#define R_68K_GOT32 7 /* 32 bit PC relative GOT entry */ -+#define R_68K_GOT16 8 /* 16 bit PC relative GOT entry */ -+#define R_68K_GOT8 9 /* 8 bit PC relative GOT entry */ -+#define R_68K_GOT32O 10 /* 32 bit GOT offset */ -+#define R_68K_GOT16O 11 /* 16 bit GOT offset */ -+#define R_68K_GOT8O 12 /* 8 bit GOT offset */ -+#define R_68K_PLT32 13 /* 32 bit PC relative PLT address */ -+#define R_68K_PLT16 14 /* 16 bit PC relative PLT address */ -+#define R_68K_PLT8 15 /* 8 bit PC relative PLT address */ -+#define R_68K_PLT32O 16 /* 32 bit PLT offset */ -+#define R_68K_PLT16O 17 /* 16 bit PLT offset */ -+#define R_68K_PLT8O 18 /* 8 bit PLT offset */ -+#define R_68K_COPY 19 /* Copy symbol at runtime */ -+#define R_68K_GLOB_DAT 20 /* Create GOT entry */ -+#define R_68K_JMP_SLOT 21 /* Create PLT entry */ -+#define R_68K_RELATIVE 22 /* Adjust by program base */ -+#define R_68K_TLS_GD32 25 /* 32 bit GOT offset for GD */ -+#define R_68K_TLS_GD16 26 /* 16 bit GOT offset for GD */ -+#define R_68K_TLS_GD8 27 /* 8 bit GOT offset for GD */ -+#define R_68K_TLS_LDM32 28 /* 32 bit GOT offset for LDM */ -+#define R_68K_TLS_LDM16 29 /* 16 bit GOT offset for LDM */ -+#define R_68K_TLS_LDM8 30 /* 8 bit GOT offset for LDM */ -+#define R_68K_TLS_LDO32 31 /* 32 bit module-relative offset */ -+#define R_68K_TLS_LDO16 32 /* 16 bit module-relative offset */ -+#define R_68K_TLS_LDO8 33 /* 8 bit module-relative offset */ -+#define R_68K_TLS_IE32 34 /* 32 bit GOT offset for IE */ -+#define R_68K_TLS_IE16 35 /* 16 bit GOT offset for IE */ -+#define R_68K_TLS_IE8 36 /* 8 bit GOT offset for IE */ -+#define R_68K_TLS_LE32 37 /* 32 bit offset relative to -+ static TLS block */ -+#define R_68K_TLS_LE16 38 /* 16 bit offset relative to -+ static TLS block */ -+#define R_68K_TLS_LE8 39 /* 8 bit offset relative to -+ static TLS block */ -+#define R_68K_TLS_DTPMOD32 40 /* 32 bit module number */ -+#define R_68K_TLS_DTPREL32 41 /* 32 bit module-relative offset */ -+#define R_68K_TLS_TPREL32 42 /* 32 bit TP-relative offset */ -+/* Keep this the last entry. */ -+#define R_68K_NUM 43 -+ -+/* Intel 80386 specific definitions. */ -+ -+/* i386 relocs. */ -+ -+#define R_386_NONE 0 /* No reloc */ -+#define R_386_32 1 /* Direct 32 bit */ -+#define R_386_PC32 2 /* PC relative 32 bit */ -+#define R_386_GOT32 3 /* 32 bit GOT entry */ -+#define R_386_PLT32 4 /* 32 bit PLT address */ -+#define R_386_COPY 5 /* Copy symbol at runtime */ -+#define R_386_GLOB_DAT 6 /* Create GOT entry */ -+#define R_386_JMP_SLOT 7 /* Create PLT entry */ -+#define R_386_RELATIVE 8 /* Adjust by program base */ -+#define R_386_GOTOFF 9 /* 32 bit offset to GOT */ -+#define R_386_GOTPC 10 /* 32 bit PC relative offset to GOT */ -+#define R_386_32PLT 11 -+#define R_386_TLS_TPOFF 14 /* Offset in static TLS block */ -+#define R_386_TLS_IE 15 /* Address of GOT entry for static TLS -+ block offset */ -+#define R_386_TLS_GOTIE 16 /* GOT entry for static TLS block -+ offset */ -+#define R_386_TLS_LE 17 /* Offset relative to static TLS -+ block */ -+#define R_386_TLS_GD 18 /* Direct 32 bit for GNU version of -+ general dynamic thread local data */ -+#define R_386_TLS_LDM 19 /* Direct 32 bit for GNU version of -+ local dynamic thread local data -+ in LE code */ -+#define R_386_16 20 -+#define R_386_PC16 21 -+#define R_386_8 22 -+#define R_386_PC8 23 -+#define R_386_TLS_GD_32 24 /* Direct 32 bit for general dynamic -+ thread local data */ -+#define R_386_TLS_GD_PUSH 25 /* Tag for pushl in GD TLS code */ -+#define R_386_TLS_GD_CALL 26 /* Relocation for call to -+ __tls_get_addr() */ -+#define R_386_TLS_GD_POP 27 /* Tag for popl in GD TLS code */ -+#define R_386_TLS_LDM_32 28 /* Direct 32 bit for local dynamic -+ thread local data in LE code */ -+#define R_386_TLS_LDM_PUSH 29 /* Tag for pushl in LDM TLS code */ -+#define R_386_TLS_LDM_CALL 30 /* Relocation for call to -+ __tls_get_addr() in LDM code */ -+#define R_386_TLS_LDM_POP 31 /* Tag for popl in LDM TLS code */ -+#define R_386_TLS_LDO_32 32 /* Offset relative to TLS block */ -+#define R_386_TLS_IE_32 33 /* GOT entry for negated static TLS -+ block offset */ -+#define R_386_TLS_LE_32 34 /* Negated offset relative to static -+ TLS block */ -+#define R_386_TLS_DTPMOD32 35 /* ID of module containing symbol */ -+#define R_386_TLS_DTPOFF32 36 /* Offset in TLS block */ -+#define R_386_TLS_TPOFF32 37 /* Negated offset in static TLS block */ -+/* 38? */ -+#define R_386_TLS_GOTDESC 39 /* GOT offset for TLS descriptor. */ -+#define R_386_TLS_DESC_CALL 40 /* Marker of call through TLS -+ descriptor for -+ relaxation. */ -+#define R_386_TLS_DESC 41 /* TLS descriptor containing -+ pointer to code and to -+ argument, returning the TLS -+ offset for the symbol. */ -+#define R_386_IRELATIVE 42 /* Adjust indirectly by program base */ -+/* Keep this the last entry. */ -+#define R_386_NUM 43 -+ -+/* SUN SPARC specific definitions. */ -+ -+/* Legal values for ST_TYPE subfield of st_info (symbol type). */ -+ -+#define STT_SPARC_REGISTER 13 /* Global register reserved to app. */ -+ -+/* Values for Elf64_Ehdr.e_flags. */ -+ -+#define EF_SPARCV9_MM 3 -+#define EF_SPARCV9_TSO 0 -+#define EF_SPARCV9_PSO 1 -+#define EF_SPARCV9_RMO 2 -+#define EF_SPARC_LEDATA 0x800000 /* little endian data */ -+#define EF_SPARC_EXT_MASK 0xFFFF00 -+#define EF_SPARC_32PLUS 0x000100 /* generic V8+ features */ -+#define EF_SPARC_SUN_US1 0x000200 /* Sun UltraSPARC1 extensions */ -+#define EF_SPARC_HAL_R1 0x000400 /* HAL R1 extensions */ -+#define EF_SPARC_SUN_US3 0x000800 /* Sun UltraSPARCIII extensions */ -+ -+/* SPARC relocs. */ -+ -+#define R_SPARC_NONE 0 /* No reloc */ -+#define R_SPARC_8 1 /* Direct 8 bit */ -+#define R_SPARC_16 2 /* Direct 16 bit */ -+#define R_SPARC_32 3 /* Direct 32 bit */ -+#define R_SPARC_DISP8 4 /* PC relative 8 bit */ -+#define R_SPARC_DISP16 5 /* PC relative 16 bit */ -+#define R_SPARC_DISP32 6 /* PC relative 32 bit */ -+#define R_SPARC_WDISP30 7 /* PC relative 30 bit shifted */ -+#define R_SPARC_WDISP22 8 /* PC relative 22 bit shifted */ -+#define R_SPARC_HI22 9 /* High 22 bit */ -+#define R_SPARC_22 10 /* Direct 22 bit */ -+#define R_SPARC_13 11 /* Direct 13 bit */ -+#define R_SPARC_LO10 12 /* Truncated 10 bit */ -+#define R_SPARC_GOT10 13 /* Truncated 10 bit GOT entry */ -+#define R_SPARC_GOT13 14 /* 13 bit GOT entry */ -+#define R_SPARC_GOT22 15 /* 22 bit GOT entry shifted */ -+#define R_SPARC_PC10 16 /* PC relative 10 bit truncated */ -+#define R_SPARC_PC22 17 /* PC relative 22 bit shifted */ -+#define R_SPARC_WPLT30 18 /* 30 bit PC relative PLT address */ -+#define R_SPARC_COPY 19 /* Copy symbol at runtime */ -+#define R_SPARC_GLOB_DAT 20 /* Create GOT entry */ -+#define R_SPARC_JMP_SLOT 21 /* Create PLT entry */ -+#define R_SPARC_RELATIVE 22 /* Adjust by program base */ -+#define R_SPARC_UA32 23 /* Direct 32 bit unaligned */ -+ -+/* Additional Sparc64 relocs. */ -+ -+#define R_SPARC_PLT32 24 /* Direct 32 bit ref to PLT entry */ -+#define R_SPARC_HIPLT22 25 /* High 22 bit PLT entry */ -+#define R_SPARC_LOPLT10 26 /* Truncated 10 bit PLT entry */ -+#define R_SPARC_PCPLT32 27 /* PC rel 32 bit ref to PLT entry */ -+#define R_SPARC_PCPLT22 28 /* PC rel high 22 bit PLT entry */ -+#define R_SPARC_PCPLT10 29 /* PC rel trunc 10 bit PLT entry */ -+#define R_SPARC_10 30 /* Direct 10 bit */ -+#define R_SPARC_11 31 /* Direct 11 bit */ -+#define R_SPARC_64 32 /* Direct 64 bit */ -+#define R_SPARC_OLO10 33 /* 10bit with secondary 13bit addend */ -+#define R_SPARC_HH22 34 /* Top 22 bits of direct 64 bit */ -+#define R_SPARC_HM10 35 /* High middle 10 bits of ... */ -+#define R_SPARC_LM22 36 /* Low middle 22 bits of ... */ -+#define R_SPARC_PC_HH22 37 /* Top 22 bits of pc rel 64 bit */ -+#define R_SPARC_PC_HM10 38 /* High middle 10 bit of ... */ -+#define R_SPARC_PC_LM22 39 /* Low miggle 22 bits of ... */ -+#define R_SPARC_WDISP16 40 /* PC relative 16 bit shifted */ -+#define R_SPARC_WDISP19 41 /* PC relative 19 bit shifted */ -+#define R_SPARC_GLOB_JMP 42 /* was part of v9 ABI but was removed */ -+#define R_SPARC_7 43 /* Direct 7 bit */ -+#define R_SPARC_5 44 /* Direct 5 bit */ -+#define R_SPARC_6 45 /* Direct 6 bit */ -+#define R_SPARC_DISP64 46 /* PC relative 64 bit */ -+#define R_SPARC_PLT64 47 /* Direct 64 bit ref to PLT entry */ -+#define R_SPARC_HIX22 48 /* High 22 bit complemented */ -+#define R_SPARC_LOX10 49 /* Truncated 11 bit complemented */ -+#define R_SPARC_H44 50 /* Direct high 12 of 44 bit */ -+#define R_SPARC_M44 51 /* Direct mid 22 of 44 bit */ -+#define R_SPARC_L44 52 /* Direct low 10 of 44 bit */ -+#define R_SPARC_REGISTER 53 /* Global register usage */ -+#define R_SPARC_UA64 54 /* Direct 64 bit unaligned */ -+#define R_SPARC_UA16 55 /* Direct 16 bit unaligned */ -+#define R_SPARC_TLS_GD_HI22 56 -+#define R_SPARC_TLS_GD_LO10 57 -+#define R_SPARC_TLS_GD_ADD 58 -+#define R_SPARC_TLS_GD_CALL 59 -+#define R_SPARC_TLS_LDM_HI22 60 -+#define R_SPARC_TLS_LDM_LO10 61 -+#define R_SPARC_TLS_LDM_ADD 62 -+#define R_SPARC_TLS_LDM_CALL 63 -+#define R_SPARC_TLS_LDO_HIX22 64 -+#define R_SPARC_TLS_LDO_LOX10 65 -+#define R_SPARC_TLS_LDO_ADD 66 -+#define R_SPARC_TLS_IE_HI22 67 -+#define R_SPARC_TLS_IE_LO10 68 -+#define R_SPARC_TLS_IE_LD 69 -+#define R_SPARC_TLS_IE_LDX 70 -+#define R_SPARC_TLS_IE_ADD 71 -+#define R_SPARC_TLS_LE_HIX22 72 -+#define R_SPARC_TLS_LE_LOX10 73 -+#define R_SPARC_TLS_DTPMOD32 74 -+#define R_SPARC_TLS_DTPMOD64 75 -+#define R_SPARC_TLS_DTPOFF32 76 -+#define R_SPARC_TLS_DTPOFF64 77 -+#define R_SPARC_TLS_TPOFF32 78 -+#define R_SPARC_TLS_TPOFF64 79 -+#define R_SPARC_GOTDATA_HIX22 80 -+#define R_SPARC_GOTDATA_LOX10 81 -+#define R_SPARC_GOTDATA_OP_HIX22 82 -+#define R_SPARC_GOTDATA_OP_LOX10 83 -+#define R_SPARC_GOTDATA_OP 84 -+#define R_SPARC_H34 85 -+#define R_SPARC_SIZE32 86 -+#define R_SPARC_SIZE64 87 -+#define R_SPARC_WDISP10 88 -+#define R_SPARC_JMP_IREL 248 -+#define R_SPARC_IRELATIVE 249 -+#define R_SPARC_GNU_VTINHERIT 250 -+#define R_SPARC_GNU_VTENTRY 251 -+#define R_SPARC_REV32 252 -+/* Keep this the last entry. */ -+#define R_SPARC_NUM 253 -+ -+/* For Sparc64, legal values for d_tag of Elf64_Dyn. */ -+ -+#define DT_SPARC_REGISTER 0x70000001 -+#define DT_SPARC_NUM 2 -+ -+/* MIPS R3000 specific definitions. */ -+ -+/* Legal values for e_flags field of Elf32_Ehdr. */ -+ -+#define EF_MIPS_NOREORDER 1 /* A .noreorder directive was used */ -+#define EF_MIPS_PIC 2 /* Contains PIC code */ -+#define EF_MIPS_CPIC 4 /* Uses PIC calling sequence */ -+#define EF_MIPS_XGOT 8 -+#define EF_MIPS_64BIT_WHIRL 16 -+#define EF_MIPS_ABI2 32 -+#define EF_MIPS_ABI_ON32 64 -+#define EF_MIPS_ARCH 0xf0000000 /* MIPS architecture level */ -+ -+/* Legal values for MIPS architecture level. */ -+ -+#define EF_MIPS_ARCH_1 0x00000000 /* -mips1 code. */ -+#define EF_MIPS_ARCH_2 0x10000000 /* -mips2 code. */ -+#define EF_MIPS_ARCH_3 0x20000000 /* -mips3 code. */ -+#define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code. */ -+#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code. */ -+#define EF_MIPS_ARCH_32 0x60000000 /* MIPS32 code. */ -+#define EF_MIPS_ARCH_64 0x70000000 /* MIPS64 code. */ -+ -+/* The following are non-official names and should not be used. */ -+ -+#define E_MIPS_ARCH_1 0x00000000 /* -mips1 code. */ -+#define E_MIPS_ARCH_2 0x10000000 /* -mips2 code. */ -+#define E_MIPS_ARCH_3 0x20000000 /* -mips3 code. */ -+#define E_MIPS_ARCH_4 0x30000000 /* -mips4 code. */ -+#define E_MIPS_ARCH_5 0x40000000 /* -mips5 code. */ -+#define E_MIPS_ARCH_32 0x60000000 /* MIPS32 code. */ -+#define E_MIPS_ARCH_64 0x70000000 /* MIPS64 code. */ -+ -+/* Special section indices. */ -+ -+#define SHN_MIPS_ACOMMON 0xff00 /* Allocated common symbols */ -+#define SHN_MIPS_TEXT 0xff01 /* Allocated test symbols. */ -+#define SHN_MIPS_DATA 0xff02 /* Allocated data symbols. */ -+#define SHN_MIPS_SCOMMON 0xff03 /* Small common symbols */ -+#define SHN_MIPS_SUNDEFINED 0xff04 /* Small undefined symbols */ -+ -+/* Legal values for sh_type field of Elf32_Shdr. */ -+ -+#define SHT_MIPS_LIBLIST 0x70000000 /* Shared objects used in link */ -+#define SHT_MIPS_MSYM 0x70000001 -+#define SHT_MIPS_CONFLICT 0x70000002 /* Conflicting symbols */ -+#define SHT_MIPS_GPTAB 0x70000003 /* Global data area sizes */ -+#define SHT_MIPS_UCODE 0x70000004 /* Reserved for SGI/MIPS compilers */ -+#define SHT_MIPS_DEBUG 0x70000005 /* MIPS ECOFF debugging information*/ -+#define SHT_MIPS_REGINFO 0x70000006 /* Register usage information */ -+#define SHT_MIPS_PACKAGE 0x70000007 -+#define SHT_MIPS_PACKSYM 0x70000008 -+#define SHT_MIPS_RELD 0x70000009 -+#define SHT_MIPS_IFACE 0x7000000b -+#define SHT_MIPS_CONTENT 0x7000000c -+#define SHT_MIPS_OPTIONS 0x7000000d /* Miscellaneous options. */ -+#define SHT_MIPS_SHDR 0x70000010 -+#define SHT_MIPS_FDESC 0x70000011 -+#define SHT_MIPS_EXTSYM 0x70000012 -+#define SHT_MIPS_DENSE 0x70000013 -+#define SHT_MIPS_PDESC 0x70000014 -+#define SHT_MIPS_LOCSYM 0x70000015 -+#define SHT_MIPS_AUXSYM 0x70000016 -+#define SHT_MIPS_OPTSYM 0x70000017 -+#define SHT_MIPS_LOCSTR 0x70000018 -+#define SHT_MIPS_LINE 0x70000019 -+#define SHT_MIPS_RFDESC 0x7000001a -+#define SHT_MIPS_DELTASYM 0x7000001b -+#define SHT_MIPS_DELTAINST 0x7000001c -+#define SHT_MIPS_DELTACLASS 0x7000001d -+#define SHT_MIPS_DWARF 0x7000001e /* DWARF debugging information. */ -+#define SHT_MIPS_DELTADECL 0x7000001f -+#define SHT_MIPS_SYMBOL_LIB 0x70000020 -+#define SHT_MIPS_EVENTS 0x70000021 /* Event section. */ -+#define SHT_MIPS_TRANSLATE 0x70000022 -+#define SHT_MIPS_PIXIE 0x70000023 -+#define SHT_MIPS_XLATE 0x70000024 -+#define SHT_MIPS_XLATE_DEBUG 0x70000025 -+#define SHT_MIPS_WHIRL 0x70000026 -+#define SHT_MIPS_EH_REGION 0x70000027 -+#define SHT_MIPS_XLATE_OLD 0x70000028 -+#define SHT_MIPS_PDR_EXCEPTION 0x70000029 -+ -+/* Legal values for sh_flags field of Elf32_Shdr. */ -+ -+#define SHF_MIPS_GPREL 0x10000000 /* Must be part of global data area */ -+#define SHF_MIPS_MERGE 0x20000000 -+#define SHF_MIPS_ADDR 0x40000000 -+#define SHF_MIPS_STRINGS 0x80000000 -+#define SHF_MIPS_NOSTRIP 0x08000000 -+#define SHF_MIPS_LOCAL 0x04000000 -+#define SHF_MIPS_NAMES 0x02000000 -+#define SHF_MIPS_NODUPE 0x01000000 -+ -+ -+/* Symbol tables. */ -+ -+/* MIPS specific values for `st_other'. */ -+#define STO_MIPS_DEFAULT 0x0 -+#define STO_MIPS_INTERNAL 0x1 -+#define STO_MIPS_HIDDEN 0x2 -+#define STO_MIPS_PROTECTED 0x3 -+#define STO_MIPS_PLT 0x8 -+#define STO_MIPS_SC_ALIGN_UNUSED 0xff -+ -+/* MIPS specific values for `st_info'. */ -+#define STB_MIPS_SPLIT_COMMON 13 -+ -+/* Entries found in sections of type SHT_MIPS_GPTAB. */ -+ -+typedef union -+{ -+ struct -+ { -+ Elf32_Word gt_current_g_value; /* -G value used for compilation */ -+ Elf32_Word gt_unused; /* Not used */ -+ } gt_header; /* First entry in section */ -+ struct -+ { -+ Elf32_Word gt_g_value; /* If this value were used for -G */ -+ Elf32_Word gt_bytes; /* This many bytes would be used */ -+ } gt_entry; /* Subsequent entries in section */ -+} Elf32_gptab; -+ -+/* Entry found in sections of type SHT_MIPS_REGINFO. */ -+ -+typedef struct -+{ -+ Elf32_Word ri_gprmask; /* General registers used */ -+ Elf32_Word ri_cprmask[4]; /* Coprocessor registers used */ -+ Elf32_Sword ri_gp_value; /* $gp register value */ -+} Elf32_RegInfo; -+ -+/* Entries found in sections of type SHT_MIPS_OPTIONS. */ -+ -+typedef struct -+{ -+ unsigned char kind; /* Determines interpretation of the -+ variable part of descriptor. */ -+ unsigned char size; /* Size of descriptor, including header. */ -+ Elf32_Section section; /* Section header index of section affected, -+ 0 for global options. */ -+ Elf32_Word info; /* Kind-specific information. */ -+} Elf_Options; -+ -+/* Values for `kind' field in Elf_Options. */ -+ -+#define ODK_NULL 0 /* Undefined. */ -+#define ODK_REGINFO 1 /* Register usage information. */ -+#define ODK_EXCEPTIONS 2 /* Exception processing options. */ -+#define ODK_PAD 3 /* Section padding options. */ -+#define ODK_HWPATCH 4 /* Hardware workarounds performed */ -+#define ODK_FILL 5 /* record the fill value used by the linker. */ -+#define ODK_TAGS 6 /* reserve space for desktop tools to write. */ -+#define ODK_HWAND 7 /* HW workarounds. 'AND' bits when merging. */ -+#define ODK_HWOR 8 /* HW workarounds. 'OR' bits when merging. */ -+ -+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries. */ -+ -+#define OEX_FPU_MIN 0x1f /* FPE's which MUST be enabled. */ -+#define OEX_FPU_MAX 0x1f00 /* FPE's which MAY be enabled. */ -+#define OEX_PAGE0 0x10000 /* page zero must be mapped. */ -+#define OEX_SMM 0x20000 /* Force sequential memory mode? */ -+#define OEX_FPDBUG 0x40000 /* Force floating point debug mode? */ -+#define OEX_PRECISEFP OEX_FPDBUG -+#define OEX_DISMISS 0x80000 /* Dismiss invalid address faults? */ -+ -+#define OEX_FPU_INVAL 0x10 -+#define OEX_FPU_DIV0 0x08 -+#define OEX_FPU_OFLO 0x04 -+#define OEX_FPU_UFLO 0x02 -+#define OEX_FPU_INEX 0x01 -+ -+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry. */ -+ -+#define OHW_R4KEOP 0x1 /* R4000 end-of-page patch. */ -+#define OHW_R8KPFETCH 0x2 /* may need R8000 prefetch patch. */ -+#define OHW_R5KEOP 0x4 /* R5000 end-of-page patch. */ -+#define OHW_R5KCVTL 0x8 /* R5000 cvt.[ds].l bug. clean=1. */ -+ -+#define OPAD_PREFIX 0x1 -+#define OPAD_POSTFIX 0x2 -+#define OPAD_SYMBOL 0x4 -+ -+/* Entry found in `.options' section. */ -+ -+typedef struct -+{ -+ Elf32_Word hwp_flags1; /* Extra flags. */ -+ Elf32_Word hwp_flags2; /* Extra flags. */ -+} Elf_Options_Hw; -+ -+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries. */ -+ -+#define OHWA0_R4KEOP_CHECKED 0x00000001 -+#define OHWA1_R4KEOP_CLEAN 0x00000002 -+ -+/* MIPS relocs. */ -+ -+#define R_MIPS_NONE 0 /* No reloc */ -+#define R_MIPS_16 1 /* Direct 16 bit */ -+#define R_MIPS_32 2 /* Direct 32 bit */ -+#define R_MIPS_REL32 3 /* PC relative 32 bit */ -+#define R_MIPS_26 4 /* Direct 26 bit shifted */ -+#define R_MIPS_HI16 5 /* High 16 bit */ -+#define R_MIPS_LO16 6 /* Low 16 bit */ -+#define R_MIPS_GPREL16 7 /* GP relative 16 bit */ -+#define R_MIPS_LITERAL 8 /* 16 bit literal entry */ -+#define R_MIPS_GOT16 9 /* 16 bit GOT entry */ -+#define R_MIPS_PC16 10 /* PC relative 16 bit */ -+#define R_MIPS_CALL16 11 /* 16 bit GOT entry for function */ -+#define R_MIPS_GPREL32 12 /* GP relative 32 bit */ -+ -+#define R_MIPS_SHIFT5 16 -+#define R_MIPS_SHIFT6 17 -+#define R_MIPS_64 18 -+#define R_MIPS_GOT_DISP 19 -+#define R_MIPS_GOT_PAGE 20 -+#define R_MIPS_GOT_OFST 21 -+#define R_MIPS_GOT_HI16 22 -+#define R_MIPS_GOT_LO16 23 -+#define R_MIPS_SUB 24 -+#define R_MIPS_INSERT_A 25 -+#define R_MIPS_INSERT_B 26 -+#define R_MIPS_DELETE 27 -+#define R_MIPS_HIGHER 28 -+#define R_MIPS_HIGHEST 29 -+#define R_MIPS_CALL_HI16 30 -+#define R_MIPS_CALL_LO16 31 -+#define R_MIPS_SCN_DISP 32 -+#define R_MIPS_REL16 33 -+#define R_MIPS_ADD_IMMEDIATE 34 -+#define R_MIPS_PJUMP 35 -+#define R_MIPS_RELGOT 36 -+#define R_MIPS_JALR 37 -+#define R_MIPS_TLS_DTPMOD32 38 /* Module number 32 bit */ -+#define R_MIPS_TLS_DTPREL32 39 /* Module-relative offset 32 bit */ -+#define R_MIPS_TLS_DTPMOD64 40 /* Module number 64 bit */ -+#define R_MIPS_TLS_DTPREL64 41 /* Module-relative offset 64 bit */ -+#define R_MIPS_TLS_GD 42 /* 16 bit GOT offset for GD */ -+#define R_MIPS_TLS_LDM 43 /* 16 bit GOT offset for LDM */ -+#define R_MIPS_TLS_DTPREL_HI16 44 /* Module-relative offset, high 16 bits */ -+#define R_MIPS_TLS_DTPREL_LO16 45 /* Module-relative offset, low 16 bits */ -+#define R_MIPS_TLS_GOTTPREL 46 /* 16 bit GOT offset for IE */ -+#define R_MIPS_TLS_TPREL32 47 /* TP-relative offset, 32 bit */ -+#define R_MIPS_TLS_TPREL64 48 /* TP-relative offset, 64 bit */ -+#define R_MIPS_TLS_TPREL_HI16 49 /* TP-relative offset, high 16 bits */ -+#define R_MIPS_TLS_TPREL_LO16 50 /* TP-relative offset, low 16 bits */ -+#define R_MIPS_GLOB_DAT 51 -+#define R_MIPS_COPY 126 -+#define R_MIPS_JUMP_SLOT 127 -+/* Keep this the last entry. */ -+#define R_MIPS_NUM 128 -+ -+/* Legal values for p_type field of Elf32_Phdr. */ -+ -+#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */ -+#define PT_MIPS_RTPROC 0x70000001 /* Runtime procedure table. */ -+#define PT_MIPS_OPTIONS 0x70000002 -+ -+/* Special program header types. */ -+ -+#define PF_MIPS_LOCAL 0x10000000 -+ -+/* Legal values for d_tag field of Elf32_Dyn. */ -+ -+#define DT_MIPS_RLD_VERSION 0x70000001 /* Runtime linker interface version */ -+#define DT_MIPS_TIME_STAMP 0x70000002 /* Timestamp */ -+#define DT_MIPS_ICHECKSUM 0x70000003 /* Checksum */ -+#define DT_MIPS_IVERSION 0x70000004 /* Version string (string tbl index) */ -+#define DT_MIPS_FLAGS 0x70000005 /* Flags */ -+#define DT_MIPS_BASE_ADDRESS 0x70000006 /* Base address */ -+#define DT_MIPS_MSYM 0x70000007 -+#define DT_MIPS_CONFLICT 0x70000008 /* Address of CONFLICT section */ -+#define DT_MIPS_LIBLIST 0x70000009 /* Address of LIBLIST section */ -+#define DT_MIPS_LOCAL_GOTNO 0x7000000a /* Number of local GOT entries */ -+#define DT_MIPS_CONFLICTNO 0x7000000b /* Number of CONFLICT entries */ -+#define DT_MIPS_LIBLISTNO 0x70000010 /* Number of LIBLIST entries */ -+#define DT_MIPS_SYMTABNO 0x70000011 /* Number of DYNSYM entries */ -+#define DT_MIPS_UNREFEXTNO 0x70000012 /* First external DYNSYM */ -+#define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in DYNSYM */ -+#define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */ -+#define DT_MIPS_RLD_MAP 0x70000016 /* Address of run time loader map. */ -+#define DT_MIPS_DELTA_CLASS 0x70000017 /* Delta C++ class definition. */ -+#define DT_MIPS_DELTA_CLASS_NO 0x70000018 /* Number of entries in -+ DT_MIPS_DELTA_CLASS. */ -+#define DT_MIPS_DELTA_INSTANCE 0x70000019 /* Delta C++ class instances. */ -+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in -+ DT_MIPS_DELTA_INSTANCE. */ -+#define DT_MIPS_DELTA_RELOC 0x7000001b /* Delta relocations. */ -+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in -+ DT_MIPS_DELTA_RELOC. */ -+#define DT_MIPS_DELTA_SYM 0x7000001d /* Delta symbols that Delta -+ relocations refer to. */ -+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in -+ DT_MIPS_DELTA_SYM. */ -+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the -+ class declaration. */ -+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in -+ DT_MIPS_DELTA_CLASSSYM. */ -+#define DT_MIPS_CXX_FLAGS 0x70000022 /* Flags indicating for C++ flavor. */ -+#define DT_MIPS_PIXIE_INIT 0x70000023 -+#define DT_MIPS_SYMBOL_LIB 0x70000024 -+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025 -+#define DT_MIPS_LOCAL_GOTIDX 0x70000026 -+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027 -+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028 -+#define DT_MIPS_OPTIONS 0x70000029 /* Address of .options. */ -+#define DT_MIPS_INTERFACE 0x7000002a /* Address of .interface. */ -+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b -+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */ -+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve -+ function stored in GOT. */ -+#define DT_MIPS_PERF_SUFFIX 0x7000002e /* Default suffix of dso to be added -+ by rld on dlopen() calls. */ -+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */ -+#define DT_MIPS_GP_VALUE 0x70000030 /* GP value for aux GOTs. */ -+#define DT_MIPS_AUX_DYNAMIC 0x70000031 /* Address of aux .dynamic. */ -+/* The address of .got.plt in an executable using the new non-PIC ABI. */ -+#define DT_MIPS_PLTGOT 0x70000032 -+/* The base of the PLT in an executable using the new non-PIC ABI if that -+ PLT is writable. For a non-writable PLT, this is omitted or has a zero -+ value. */ -+#define DT_MIPS_RWPLT 0x70000034 -+#define DT_MIPS_NUM 0x35 -+ -+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */ -+ -+#define RHF_NONE 0 /* No flags */ -+#define RHF_QUICKSTART (1 << 0) /* Use quickstart */ -+#define RHF_NOTPOT (1 << 1) /* Hash size not power of 2 */ -+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2) /* Ignore LD_LIBRARY_PATH */ -+#define RHF_NO_MOVE (1 << 3) -+#define RHF_SGI_ONLY (1 << 4) -+#define RHF_GUARANTEE_INIT (1 << 5) -+#define RHF_DELTA_C_PLUS_PLUS (1 << 6) -+#define RHF_GUARANTEE_START_INIT (1 << 7) -+#define RHF_PIXIE (1 << 8) -+#define RHF_DEFAULT_DELAY_LOAD (1 << 9) -+#define RHF_REQUICKSTART (1 << 10) -+#define RHF_REQUICKSTARTED (1 << 11) -+#define RHF_CORD (1 << 12) -+#define RHF_NO_UNRES_UNDEF (1 << 13) -+#define RHF_RLD_ORDER_SAFE (1 << 14) -+ -+/* Entries found in sections of type SHT_MIPS_LIBLIST. */ -+ -+typedef struct -+{ -+ Elf32_Word l_name; /* Name (string table index) */ -+ Elf32_Word l_time_stamp; /* Timestamp */ -+ Elf32_Word l_checksum; /* Checksum */ -+ Elf32_Word l_version; /* Interface version */ -+ Elf32_Word l_flags; /* Flags */ -+} Elf32_Lib; -+ -+typedef struct -+{ -+ Elf64_Word l_name; /* Name (string table index) */ -+ Elf64_Word l_time_stamp; /* Timestamp */ -+ Elf64_Word l_checksum; /* Checksum */ -+ Elf64_Word l_version; /* Interface version */ -+ Elf64_Word l_flags; /* Flags */ -+} Elf64_Lib; -+ -+ -+/* Legal values for l_flags. */ -+ -+#define LL_NONE 0 -+#define LL_EXACT_MATCH (1 << 0) /* Require exact match */ -+#define LL_IGNORE_INT_VER (1 << 1) /* Ignore interface version */ -+#define LL_REQUIRE_MINOR (1 << 2) -+#define LL_EXPORTS (1 << 3) -+#define LL_DELAY_LOAD (1 << 4) -+#define LL_DELTA (1 << 5) -+ -+/* Entries found in sections of type SHT_MIPS_CONFLICT. */ -+ -+typedef Elf32_Addr Elf32_Conflict; -+ -+ -+/* HPPA specific definitions. */ -+ -+/* Legal values for e_flags field of Elf32_Ehdr. */ -+ -+#define EF_PARISC_TRAPNIL 0x00010000 /* Trap nil pointer dereference. */ -+#define EF_PARISC_EXT 0x00020000 /* Program uses arch. extensions. */ -+#define EF_PARISC_LSB 0x00040000 /* Program expects little endian. */ -+#define EF_PARISC_WIDE 0x00080000 /* Program expects wide mode. */ -+#define EF_PARISC_NO_KABP 0x00100000 /* No kernel assisted branch -+ prediction. */ -+#define EF_PARISC_LAZYSWAP 0x00400000 /* Allow lazy swapping. */ -+#define EF_PARISC_ARCH 0x0000ffff /* Architecture version. */ -+ -+/* Defined values for `e_flags & EF_PARISC_ARCH' are: */ -+ -+#define EFA_PARISC_1_0 0x020b /* PA-RISC 1.0 big-endian. */ -+#define EFA_PARISC_1_1 0x0210 /* PA-RISC 1.1 big-endian. */ -+#define EFA_PARISC_2_0 0x0214 /* PA-RISC 2.0 big-endian. */ -+ -+/* Additional section indeces. */ -+ -+#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tenatively declared -+ symbols in ANSI C. */ -+#define SHN_PARISC_HUGE_COMMON 0xff01 /* Common blocks in huge model. */ -+ -+/* Legal values for sh_type field of Elf32_Shdr. */ -+ -+#define SHT_PARISC_EXT 0x70000000 /* Contains product specific ext. */ -+#define SHT_PARISC_UNWIND 0x70000001 /* Unwind information. */ -+#define SHT_PARISC_DOC 0x70000002 /* Debug info for optimized code. */ -+ -+/* Legal values for sh_flags field of Elf32_Shdr. */ -+ -+#define SHF_PARISC_SHORT 0x20000000 /* Section with short addressing. */ -+#define SHF_PARISC_HUGE 0x40000000 /* Section far from gp. */ -+#define SHF_PARISC_SBP 0x80000000 /* Static branch prediction code. */ -+ -+/* Legal values for ST_TYPE subfield of st_info (symbol type). */ -+ -+#define STT_PARISC_MILLICODE 13 /* Millicode function entry point. */ -+ -+#define STT_HP_OPAQUE (STT_LOOS + 0x1) -+#define STT_HP_STUB (STT_LOOS + 0x2) -+ -+/* HPPA relocs. */ -+ -+#define R_PARISC_NONE 0 /* No reloc. */ -+#define R_PARISC_DIR32 1 /* Direct 32-bit reference. */ -+#define R_PARISC_DIR21L 2 /* Left 21 bits of eff. address. */ -+#define R_PARISC_DIR17R 3 /* Right 17 bits of eff. address. */ -+#define R_PARISC_DIR17F 4 /* 17 bits of eff. address. */ -+#define R_PARISC_DIR14R 6 /* Right 14 bits of eff. address. */ -+#define R_PARISC_PCREL32 9 /* 32-bit rel. address. */ -+#define R_PARISC_PCREL21L 10 /* Left 21 bits of rel. address. */ -+#define R_PARISC_PCREL17R 11 /* Right 17 bits of rel. address. */ -+#define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ -+#define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ -+#define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ -+#define R_PARISC_DPREL14R 22 /* Right 14 bits of rel. address. */ -+#define R_PARISC_GPREL21L 26 /* GP-relative, left 21 bits. */ -+#define R_PARISC_GPREL14R 30 /* GP-relative, right 14 bits. */ -+#define R_PARISC_LTOFF21L 34 /* LT-relative, left 21 bits. */ -+#define R_PARISC_LTOFF14R 38 /* LT-relative, right 14 bits. */ -+#define R_PARISC_SECREL32 41 /* 32 bits section rel. address. */ -+#define R_PARISC_SEGBASE 48 /* No relocation, set segment base. */ -+#define R_PARISC_SEGREL32 49 /* 32 bits segment rel. address. */ -+#define R_PARISC_PLTOFF21L 50 /* PLT rel. address, left 21 bits. */ -+#define R_PARISC_PLTOFF14R 54 /* PLT rel. address, right 14 bits. */ -+#define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ -+#define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ -+#define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ -+#define R_PARISC_FPTR64 64 /* 64 bits function address. */ -+#define R_PARISC_PLABEL32 65 /* 32 bits function address. */ -+#define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ -+#define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ -+#define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ -+#define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ -+#define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ -+#define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ -+#define R_PARISC_PCREL16F 77 /* 16 bits PC-rel. address. */ -+#define R_PARISC_PCREL16WF 78 /* 16 bits PC-rel. address. */ -+#define R_PARISC_PCREL16DF 79 /* 16 bits PC-rel. address. */ -+#define R_PARISC_DIR64 80 /* 64 bits of eff. address. */ -+#define R_PARISC_DIR14WR 83 /* 14 bits of eff. address. */ -+#define R_PARISC_DIR14DR 84 /* 14 bits of eff. address. */ -+#define R_PARISC_DIR16F 85 /* 16 bits of eff. address. */ -+#define R_PARISC_DIR16WF 86 /* 16 bits of eff. address. */ -+#define R_PARISC_DIR16DF 87 /* 16 bits of eff. address. */ -+#define R_PARISC_GPREL64 88 /* 64 bits of GP-rel. address. */ -+#define R_PARISC_GPREL14WR 91 /* GP-rel. address, right 14 bits. */ -+#define R_PARISC_GPREL14DR 92 /* GP-rel. address, right 14 bits. */ -+#define R_PARISC_GPREL16F 93 /* 16 bits GP-rel. address. */ -+#define R_PARISC_GPREL16WF 94 /* 16 bits GP-rel. address. */ -+#define R_PARISC_GPREL16DF 95 /* 16 bits GP-rel. address. */ -+#define R_PARISC_LTOFF64 96 /* 64 bits LT-rel. address. */ -+#define R_PARISC_LTOFF14WR 99 /* LT-rel. address, right 14 bits. */ -+#define R_PARISC_LTOFF14DR 100 /* LT-rel. address, right 14 bits. */ -+#define R_PARISC_LTOFF16F 101 /* 16 bits LT-rel. address. */ -+#define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ -+#define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ -+#define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ -+#define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */ -+#define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */ -+#define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */ -+#define R_PARISC_PLTOFF16F 117 /* 16 bits LT-rel. address. */ -+#define R_PARISC_PLTOFF16WF 118 /* 16 bits PLT-rel. address. */ -+#define R_PARISC_PLTOFF16DF 119 /* 16 bits PLT-rel. address. */ -+#define R_PARISC_LTOFF_FPTR64 120 /* 64 bits LT-rel. function ptr. */ -+#define R_PARISC_LTOFF_FPTR14WR 123 /* LT-rel. fct. ptr., right 14 bits. */ -+#define R_PARISC_LTOFF_FPTR14DR 124 /* LT-rel. fct. ptr., right 14 bits. */ -+#define R_PARISC_LTOFF_FPTR16F 125 /* 16 bits LT-rel. function ptr. */ -+#define R_PARISC_LTOFF_FPTR16WF 126 /* 16 bits LT-rel. function ptr. */ -+#define R_PARISC_LTOFF_FPTR16DF 127 /* 16 bits LT-rel. function ptr. */ -+#define R_PARISC_LORESERVE 128 -+#define R_PARISC_COPY 128 /* Copy relocation. */ -+#define R_PARISC_IPLT 129 /* Dynamic reloc, imported PLT */ -+#define R_PARISC_EPLT 130 /* Dynamic reloc, exported PLT */ -+#define R_PARISC_TPREL32 153 /* 32 bits TP-rel. address. */ -+#define R_PARISC_TPREL21L 154 /* TP-rel. address, left 21 bits. */ -+#define R_PARISC_TPREL14R 158 /* TP-rel. address, right 14 bits. */ -+#define R_PARISC_LTOFF_TP21L 162 /* LT-TP-rel. address, left 21 bits. */ -+#define R_PARISC_LTOFF_TP14R 166 /* LT-TP-rel. address, right 14 bits.*/ -+#define R_PARISC_LTOFF_TP14F 167 /* 14 bits LT-TP-rel. address. */ -+#define R_PARISC_TPREL64 216 /* 64 bits TP-rel. address. */ -+#define R_PARISC_TPREL14WR 219 /* TP-rel. address, right 14 bits. */ -+#define R_PARISC_TPREL14DR 220 /* TP-rel. address, right 14 bits. */ -+#define R_PARISC_TPREL16F 221 /* 16 bits TP-rel. address. */ -+#define R_PARISC_TPREL16WF 222 /* 16 bits TP-rel. address. */ -+#define R_PARISC_TPREL16DF 223 /* 16 bits TP-rel. address. */ -+#define R_PARISC_LTOFF_TP64 224 /* 64 bits LT-TP-rel. address. */ -+#define R_PARISC_LTOFF_TP14WR 227 /* LT-TP-rel. address, right 14 bits.*/ -+#define R_PARISC_LTOFF_TP14DR 228 /* LT-TP-rel. address, right 14 bits.*/ -+#define R_PARISC_LTOFF_TP16F 229 /* 16 bits LT-TP-rel. address. */ -+#define R_PARISC_LTOFF_TP16WF 230 /* 16 bits LT-TP-rel. address. */ -+#define R_PARISC_LTOFF_TP16DF 231 /* 16 bits LT-TP-rel. address. */ -+#define R_PARISC_GNU_VTENTRY 232 -+#define R_PARISC_GNU_VTINHERIT 233 -+#define R_PARISC_TLS_GD21L 234 /* GD 21-bit left. */ -+#define R_PARISC_TLS_GD14R 235 /* GD 14-bit right. */ -+#define R_PARISC_TLS_GDCALL 236 /* GD call to __t_g_a. */ -+#define R_PARISC_TLS_LDM21L 237 /* LD module 21-bit left. */ -+#define R_PARISC_TLS_LDM14R 238 /* LD module 14-bit right. */ -+#define R_PARISC_TLS_LDMCALL 239 /* LD module call to __t_g_a. */ -+#define R_PARISC_TLS_LDO21L 240 /* LD offset 21-bit left. */ -+#define R_PARISC_TLS_LDO14R 241 /* LD offset 14-bit right. */ -+#define R_PARISC_TLS_DTPMOD32 242 /* DTP module 32-bit. */ -+#define R_PARISC_TLS_DTPMOD64 243 /* DTP module 64-bit. */ -+#define R_PARISC_TLS_DTPOFF32 244 /* DTP offset 32-bit. */ -+#define R_PARISC_TLS_DTPOFF64 245 /* DTP offset 32-bit. */ -+#define R_PARISC_TLS_LE21L R_PARISC_TPREL21L -+#define R_PARISC_TLS_LE14R R_PARISC_TPREL14R -+#define R_PARISC_TLS_IE21L R_PARISC_LTOFF_TP21L -+#define R_PARISC_TLS_IE14R R_PARISC_LTOFF_TP14R -+#define R_PARISC_TLS_TPREL32 R_PARISC_TPREL32 -+#define R_PARISC_TLS_TPREL64 R_PARISC_TPREL64 -+#define R_PARISC_HIRESERVE 255 -+ -+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */ -+ -+#define PT_HP_TLS (PT_LOOS + 0x0) -+#define PT_HP_CORE_NONE (PT_LOOS + 0x1) -+#define PT_HP_CORE_VERSION (PT_LOOS + 0x2) -+#define PT_HP_CORE_KERNEL (PT_LOOS + 0x3) -+#define PT_HP_CORE_COMM (PT_LOOS + 0x4) -+#define PT_HP_CORE_PROC (PT_LOOS + 0x5) -+#define PT_HP_CORE_LOADABLE (PT_LOOS + 0x6) -+#define PT_HP_CORE_STACK (PT_LOOS + 0x7) -+#define PT_HP_CORE_SHM (PT_LOOS + 0x8) -+#define PT_HP_CORE_MMF (PT_LOOS + 0x9) -+#define PT_HP_PARALLEL (PT_LOOS + 0x10) -+#define PT_HP_FASTBIND (PT_LOOS + 0x11) -+#define PT_HP_OPT_ANNOT (PT_LOOS + 0x12) -+#define PT_HP_HSL_ANNOT (PT_LOOS + 0x13) -+#define PT_HP_STACK (PT_LOOS + 0x14) -+ -+#define PT_PARISC_ARCHEXT 0x70000000 -+#define PT_PARISC_UNWIND 0x70000001 -+ -+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr. */ -+ -+#define PF_PARISC_SBP 0x08000000 -+ -+#define PF_HP_PAGE_SIZE 0x00100000 -+#define PF_HP_FAR_SHARED 0x00200000 -+#define PF_HP_NEAR_SHARED 0x00400000 -+#define PF_HP_CODE 0x01000000 -+#define PF_HP_MODIFY 0x02000000 -+#define PF_HP_LAZYSWAP 0x04000000 -+#define PF_HP_SBP 0x08000000 -+ -+ -+/* Alpha specific definitions. */ -+ -+/* Legal values for e_flags field of Elf64_Ehdr. */ -+ -+#define EF_ALPHA_32BIT 1 /* All addresses must be < 2GB. */ -+#define EF_ALPHA_CANRELAX 2 /* Relocations for relaxing exist. */ -+ -+/* Legal values for sh_type field of Elf64_Shdr. */ -+ -+/* These two are primerily concerned with ECOFF debugging info. */ -+#define SHT_ALPHA_DEBUG 0x70000001 -+#define SHT_ALPHA_REGINFO 0x70000002 -+ -+/* Legal values for sh_flags field of Elf64_Shdr. */ -+ -+#define SHF_ALPHA_GPREL 0x10000000 -+ -+/* Legal values for st_other field of Elf64_Sym. */ -+#define STO_ALPHA_NOPV 0x80 /* No PV required. */ -+#define STO_ALPHA_STD_GPLOAD 0x88 /* PV only used for initial ldgp. */ -+ -+/* Alpha relocs. */ -+ -+#define R_ALPHA_NONE 0 /* No reloc */ -+#define R_ALPHA_REFLONG 1 /* Direct 32 bit */ -+#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */ -+#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */ -+#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */ -+#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */ -+#define R_ALPHA_GPDISP 6 /* Add displacement to GP */ -+#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */ -+#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */ -+#define R_ALPHA_SREL16 9 /* PC relative 16 bit */ -+#define R_ALPHA_SREL32 10 /* PC relative 32 bit */ -+#define R_ALPHA_SREL64 11 /* PC relative 64 bit */ -+#define R_ALPHA_GPRELHIGH 17 /* GP relative 32 bit, high 16 bits */ -+#define R_ALPHA_GPRELLOW 18 /* GP relative 32 bit, low 16 bits */ -+#define R_ALPHA_GPREL16 19 /* GP relative 16 bit */ -+#define R_ALPHA_COPY 24 /* Copy symbol at runtime */ -+#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */ -+#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */ -+#define R_ALPHA_RELATIVE 27 /* Adjust by program base */ -+#define R_ALPHA_TLS_GD_HI 28 -+#define R_ALPHA_TLSGD 29 -+#define R_ALPHA_TLS_LDM 30 -+#define R_ALPHA_DTPMOD64 31 -+#define R_ALPHA_GOTDTPREL 32 -+#define R_ALPHA_DTPREL64 33 -+#define R_ALPHA_DTPRELHI 34 -+#define R_ALPHA_DTPRELLO 35 -+#define R_ALPHA_DTPREL16 36 -+#define R_ALPHA_GOTTPREL 37 -+#define R_ALPHA_TPREL64 38 -+#define R_ALPHA_TPRELHI 39 -+#define R_ALPHA_TPRELLO 40 -+#define R_ALPHA_TPREL16 41 -+/* Keep this the last entry. */ -+#define R_ALPHA_NUM 46 -+ -+/* Magic values of the LITUSE relocation addend. */ -+#define LITUSE_ALPHA_ADDR 0 -+#define LITUSE_ALPHA_BASE 1 -+#define LITUSE_ALPHA_BYTOFF 2 -+#define LITUSE_ALPHA_JSR 3 -+#define LITUSE_ALPHA_TLS_GD 4 -+#define LITUSE_ALPHA_TLS_LDM 5 -+ -+/* Legal values for d_tag of Elf64_Dyn. */ -+#define DT_ALPHA_PLTRO (DT_LOPROC + 0) -+#define DT_ALPHA_NUM 1 -+ -+/* PowerPC specific declarations */ -+ -+/* Values for Elf32/64_Ehdr.e_flags. */ -+#define EF_PPC_EMB 0x80000000 /* PowerPC embedded flag */ -+ -+/* Cygnus local bits below */ -+#define EF_PPC_RELOCATABLE 0x00010000 /* PowerPC -mrelocatable flag*/ -+#define EF_PPC_RELOCATABLE_LIB 0x00008000 /* PowerPC -mrelocatable-lib -+ flag */ -+ -+/* PowerPC relocations defined by the ABIs */ -+#define R_PPC_NONE 0 -+#define R_PPC_ADDR32 1 /* 32bit absolute address */ -+#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */ -+#define R_PPC_ADDR16 3 /* 16bit absolute address */ -+#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */ -+#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */ -+#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */ -+#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */ -+#define R_PPC_ADDR14_BRTAKEN 8 -+#define R_PPC_ADDR14_BRNTAKEN 9 -+#define R_PPC_REL24 10 /* PC relative 26 bit */ -+#define R_PPC_REL14 11 /* PC relative 16 bit */ -+#define R_PPC_REL14_BRTAKEN 12 -+#define R_PPC_REL14_BRNTAKEN 13 -+#define R_PPC_GOT16 14 -+#define R_PPC_GOT16_LO 15 -+#define R_PPC_GOT16_HI 16 -+#define R_PPC_GOT16_HA 17 -+#define R_PPC_PLTREL24 18 -+#define R_PPC_COPY 19 -+#define R_PPC_GLOB_DAT 20 -+#define R_PPC_JMP_SLOT 21 -+#define R_PPC_RELATIVE 22 -+#define R_PPC_LOCAL24PC 23 -+#define R_PPC_UADDR32 24 -+#define R_PPC_UADDR16 25 -+#define R_PPC_REL32 26 -+#define R_PPC_PLT32 27 -+#define R_PPC_PLTREL32 28 -+#define R_PPC_PLT16_LO 29 -+#define R_PPC_PLT16_HI 30 -+#define R_PPC_PLT16_HA 31 -+#define R_PPC_SDAREL16 32 -+#define R_PPC_SECTOFF 33 -+#define R_PPC_SECTOFF_LO 34 -+#define R_PPC_SECTOFF_HI 35 -+#define R_PPC_SECTOFF_HA 36 -+ -+/* PowerPC relocations defined for the TLS access ABI. */ -+#define R_PPC_TLS 67 /* none (sym+add)@tls */ -+#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */ -+#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */ -+#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */ -+#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */ -+#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */ -+#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */ -+#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */ -+#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */ -+#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */ -+#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */ -+#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */ -+#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */ -+#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */ -+#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */ -+#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */ -+#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */ -+#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */ -+#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */ -+#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */ -+#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */ -+#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */ -+#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */ -+#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */ -+#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */ -+#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */ -+#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */ -+#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */ -+ -+/* The remaining relocs are from the Embedded ELF ABI, and are not -+ in the SVR4 ELF ABI. */ -+#define R_PPC_EMB_NADDR32 101 -+#define R_PPC_EMB_NADDR16 102 -+#define R_PPC_EMB_NADDR16_LO 103 -+#define R_PPC_EMB_NADDR16_HI 104 -+#define R_PPC_EMB_NADDR16_HA 105 -+#define R_PPC_EMB_SDAI16 106 -+#define R_PPC_EMB_SDA2I16 107 -+#define R_PPC_EMB_SDA2REL 108 -+#define R_PPC_EMB_SDA21 109 /* 16 bit offset in SDA */ -+#define R_PPC_EMB_MRKREF 110 -+#define R_PPC_EMB_RELSEC16 111 -+#define R_PPC_EMB_RELST_LO 112 -+#define R_PPC_EMB_RELST_HI 113 -+#define R_PPC_EMB_RELST_HA 114 -+#define R_PPC_EMB_BIT_FLD 115 -+#define R_PPC_EMB_RELSDA 116 /* 16 bit relative offset in SDA */ -+ -+/* Diab tool relocations. */ -+#define R_PPC_DIAB_SDA21_LO 180 /* like EMB_SDA21, but lower 16 bit */ -+#define R_PPC_DIAB_SDA21_HI 181 /* like EMB_SDA21, but high 16 bit */ -+#define R_PPC_DIAB_SDA21_HA 182 /* like EMB_SDA21, adjusted high 16 */ -+#define R_PPC_DIAB_RELSDA_LO 183 /* like EMB_RELSDA, but lower 16 bit */ -+#define R_PPC_DIAB_RELSDA_HI 184 /* like EMB_RELSDA, but high 16 bit */ -+#define R_PPC_DIAB_RELSDA_HA 185 /* like EMB_RELSDA, adjusted high 16 */ -+ -+/* GNU extension to support local ifunc. */ -+#define R_PPC_IRELATIVE 248 -+ -+/* GNU relocs used in PIC code sequences. */ -+#define R_PPC_REL16 249 /* half16 (sym+add-.) */ -+#define R_PPC_REL16_LO 250 /* half16 (sym+add-.)@l */ -+#define R_PPC_REL16_HI 251 /* half16 (sym+add-.)@h */ -+#define R_PPC_REL16_HA 252 /* half16 (sym+add-.)@ha */ -+ -+/* This is a phony reloc to handle any old fashioned TOC16 references -+ that may still be in object files. */ -+#define R_PPC_TOC16 255 -+ -+/* PowerPC specific values for the Dyn d_tag field. */ -+#define DT_PPC_GOT (DT_LOPROC + 0) -+#define DT_PPC_NUM 1 -+ -+/* PowerPC64 relocations defined by the ABIs */ -+#define R_PPC64_NONE R_PPC_NONE -+#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address */ -+#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned */ -+#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address */ -+#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of address */ -+#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of address. */ -+#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */ -+#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned */ -+#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN -+#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN -+#define R_PPC64_REL24 R_PPC_REL24 /* PC-rel. 26 bit, word aligned */ -+#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit */ -+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN -+#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN -+#define R_PPC64_GOT16 R_PPC_GOT16 -+#define R_PPC64_GOT16_LO R_PPC_GOT16_LO -+#define R_PPC64_GOT16_HI R_PPC_GOT16_HI -+#define R_PPC64_GOT16_HA R_PPC_GOT16_HA -+ -+#define R_PPC64_COPY R_PPC_COPY -+#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT -+#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT -+#define R_PPC64_RELATIVE R_PPC_RELATIVE -+ -+#define R_PPC64_UADDR32 R_PPC_UADDR32 -+#define R_PPC64_UADDR16 R_PPC_UADDR16 -+#define R_PPC64_REL32 R_PPC_REL32 -+#define R_PPC64_PLT32 R_PPC_PLT32 -+#define R_PPC64_PLTREL32 R_PPC_PLTREL32 -+#define R_PPC64_PLT16_LO R_PPC_PLT16_LO -+#define R_PPC64_PLT16_HI R_PPC_PLT16_HI -+#define R_PPC64_PLT16_HA R_PPC_PLT16_HA -+ -+#define R_PPC64_SECTOFF R_PPC_SECTOFF -+#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO -+#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI -+#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA -+#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2 */ -+#define R_PPC64_ADDR64 38 /* doubleword64 S + A */ -+#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */ -+#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A) */ -+#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A) */ -+#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A) */ -+#define R_PPC64_UADDR64 43 /* doubleword64 S + A */ -+#define R_PPC64_REL64 44 /* doubleword64 S + A - P */ -+#define R_PPC64_PLT64 45 /* doubleword64 L + A */ -+#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P */ -+#define R_PPC64_TOC16 47 /* half16* S + A - .TOC */ -+#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.) */ -+#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.) */ -+#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.) */ -+#define R_PPC64_TOC 51 /* doubleword64 .TOC */ -+#define R_PPC64_PLTGOT16 52 /* half16* M + A */ -+#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A) */ -+#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A) */ -+#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A) */ -+ -+#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2 */ -+#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2 */ -+#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2 */ -+#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2 */ -+#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2 */ -+#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2 */ -+#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2 */ -+#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2 */ -+#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2 */ -+#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2 */ -+#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2 */ -+ -+/* PowerPC64 relocations defined for the TLS access ABI. */ -+#define R_PPC64_TLS 67 /* none (sym+add)@tls */ -+#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */ -+#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */ -+#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */ -+#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */ -+#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */ -+#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */ -+#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */ -+#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */ -+#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */ -+#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */ -+#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */ -+#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */ -+#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */ -+#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */ -+#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */ -+#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */ -+#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */ -+#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */ -+#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */ -+#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */ -+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */ -+#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */ -+#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */ -+#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */ -+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */ -+#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */ -+#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */ -+#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */ -+#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */ -+#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */ -+#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */ -+#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */ -+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */ -+#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */ -+#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */ -+#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */ -+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */ -+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */ -+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */ -+ -+/* GNU extension to support local ifunc. */ -+#define R_PPC64_JMP_IREL 247 -+#define R_PPC64_IRELATIVE 248 -+#define R_PPC64_REL16 249 /* half16 (sym+add-.) */ -+#define R_PPC64_REL16_LO 250 /* half16 (sym+add-.)@l */ -+#define R_PPC64_REL16_HI 251 /* half16 (sym+add-.)@h */ -+#define R_PPC64_REL16_HA 252 /* half16 (sym+add-.)@ha */ -+ -+/* PowerPC64 specific values for the Dyn d_tag field. */ -+#define DT_PPC64_GLINK (DT_LOPROC + 0) -+#define DT_PPC64_OPD (DT_LOPROC + 1) -+#define DT_PPC64_OPDSZ (DT_LOPROC + 2) -+#define DT_PPC64_NUM 3 -+ -+ -+/* ARM specific declarations */ -+ -+/* Processor specific flags for the ELF header e_flags field. */ -+#define EF_ARM_RELEXEC 0x01 -+#define EF_ARM_HASENTRY 0x02 -+#define EF_ARM_INTERWORK 0x04 -+#define EF_ARM_APCS_26 0x08 -+#define EF_ARM_APCS_FLOAT 0x10 -+#define EF_ARM_PIC 0x20 -+#define EF_ARM_ALIGN8 0x40 /* 8-bit structure alignment is in use */ -+#define EF_ARM_NEW_ABI 0x80 -+#define EF_ARM_OLD_ABI 0x100 -+#define EF_ARM_SOFT_FLOAT 0x200 -+#define EF_ARM_VFP_FLOAT 0x400 -+#define EF_ARM_MAVERICK_FLOAT 0x800 -+ -+ -+/* Other constants defined in the ARM ELF spec. version B-01. */ -+/* NB. These conflict with values defined above. */ -+#define EF_ARM_SYMSARESORTED 0x04 -+#define EF_ARM_DYNSYMSUSESEGIDX 0x08 -+#define EF_ARM_MAPSYMSFIRST 0x10 -+#define EF_ARM_EABIMASK 0XFF000000 -+ -+/* Constants defined in AAELF. */ -+#define EF_ARM_BE8 0x00800000 -+#define EF_ARM_LE8 0x00400000 -+ -+#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK) -+#define EF_ARM_EABI_UNKNOWN 0x00000000 -+#define EF_ARM_EABI_VER1 0x01000000 -+#define EF_ARM_EABI_VER2 0x02000000 -+#define EF_ARM_EABI_VER3 0x03000000 -+#define EF_ARM_EABI_VER4 0x04000000 -+#define EF_ARM_EABI_VER5 0x05000000 -+ -+/* Additional symbol types for Thumb. */ -+#define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ -+#define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ -+ -+/* ARM-specific values for sh_flags */ -+#define SHF_ARM_ENTRYSECT 0x10000000 /* Section contains an entry point */ -+#define SHF_ARM_COMDEF 0x80000000 /* Section may be multiply defined -+ in the input to a link step. */ -+ -+/* ARM-specific program header flags */ -+#define PF_ARM_SB 0x10000000 /* Segment contains the location -+ addressed by the static base. */ -+#define PF_ARM_PI 0x20000000 /* Position-independent segment. */ -+#define PF_ARM_ABS 0x40000000 /* Absolute segment. */ -+ -+/* Processor specific values for the Phdr p_type field. */ -+#define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ -+ -+/* Processor specific values for the Shdr sh_type field. */ -+#define SHT_ARM_EXIDX (SHT_LOPROC + 1) /* ARM unwind section. */ -+#define SHT_ARM_PREEMPTMAP (SHT_LOPROC + 2) /* Preemption details. */ -+#define SHT_ARM_ATTRIBUTES (SHT_LOPROC + 3) /* ARM attributes section. */ -+ -+ -+/* ARM relocs. */ -+ -+#define R_ARM_NONE 0 /* No reloc */ -+#define R_ARM_PC24 1 /* PC relative 26 bit branch */ -+#define R_ARM_ABS32 2 /* Direct 32 bit */ -+#define R_ARM_REL32 3 /* PC relative 32 bit */ -+#define R_ARM_PC13 4 -+#define R_ARM_ABS16 5 /* Direct 16 bit */ -+#define R_ARM_ABS12 6 /* Direct 12 bit */ -+#define R_ARM_THM_ABS5 7 -+#define R_ARM_ABS8 8 /* Direct 8 bit */ -+#define R_ARM_SBREL32 9 -+#define R_ARM_THM_PC22 10 -+#define R_ARM_THM_PC8 11 -+#define R_ARM_AMP_VCALL9 12 -+#define R_ARM_SWI24 13 /* Obsolete static relocation. */ -+#define R_ARM_TLS_DESC 13 /* Dynamic relocation. */ -+#define R_ARM_THM_SWI8 14 -+#define R_ARM_XPC25 15 -+#define R_ARM_THM_XPC22 16 -+#define R_ARM_TLS_DTPMOD32 17 /* ID of module containing symbol */ -+#define R_ARM_TLS_DTPOFF32 18 /* Offset in TLS block */ -+#define R_ARM_TLS_TPOFF32 19 /* Offset in static TLS block */ -+#define R_ARM_COPY 20 /* Copy symbol at runtime */ -+#define R_ARM_GLOB_DAT 21 /* Create GOT entry */ -+#define R_ARM_JUMP_SLOT 22 /* Create PLT entry */ -+#define R_ARM_RELATIVE 23 /* Adjust by program base */ -+#define R_ARM_GOTOFF 24 /* 32 bit offset to GOT */ -+#define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */ -+#define R_ARM_GOT32 26 /* 32 bit GOT entry */ -+#define R_ARM_PLT32 27 /* 32 bit PLT address */ -+#define R_ARM_ALU_PCREL_7_0 32 -+#define R_ARM_ALU_PCREL_15_8 33 -+#define R_ARM_ALU_PCREL_23_15 34 -+#define R_ARM_LDR_SBREL_11_0 35 -+#define R_ARM_ALU_SBREL_19_12 36 -+#define R_ARM_ALU_SBREL_27_20 37 -+#define R_ARM_TLS_GOTDESC 90 -+#define R_ARM_TLS_CALL 91 -+#define R_ARM_TLS_DESCSEQ 92 -+#define R_ARM_THM_TLS_CALL 93 -+#define R_ARM_GNU_VTENTRY 100 -+#define R_ARM_GNU_VTINHERIT 101 -+#define R_ARM_THM_PC11 102 /* thumb unconditional branch */ -+#define R_ARM_THM_PC9 103 /* thumb conditional branch */ -+#define R_ARM_TLS_GD32 104 /* PC-rel 32 bit for global dynamic -+ thread local data */ -+#define R_ARM_TLS_LDM32 105 /* PC-rel 32 bit for local dynamic -+ thread local data */ -+#define R_ARM_TLS_LDO32 106 /* 32 bit offset relative to TLS -+ block */ -+#define R_ARM_TLS_IE32 107 /* PC-rel 32 bit for GOT entry of -+ static TLS block offset */ -+#define R_ARM_TLS_LE32 108 /* 32 bit offset relative to static -+ TLS block */ -+#define R_ARM_THM_TLS_DESCSEQ 129 -+#define R_ARM_IRELATIVE 160 -+#define R_ARM_RXPC25 249 -+#define R_ARM_RSBREL32 250 -+#define R_ARM_THM_RPC22 251 -+#define R_ARM_RREL32 252 -+#define R_ARM_RABS22 253 -+#define R_ARM_RPC24 254 -+#define R_ARM_RBASE 255 -+/* Keep this the last entry. */ -+#define R_ARM_NUM 256 -+ -+/* IA-64 specific declarations. */ -+ -+/* Processor specific flags for the Ehdr e_flags field. */ -+#define EF_IA_64_MASKOS 0x0000000f /* os-specific flags */ -+#define EF_IA_64_ABI64 0x00000010 /* 64-bit ABI */ -+#define EF_IA_64_ARCH 0xff000000 /* arch. version mask */ -+ -+/* Processor specific values for the Phdr p_type field. */ -+#define PT_IA_64_ARCHEXT (PT_LOPROC + 0) /* arch extension bits */ -+#define PT_IA_64_UNWIND (PT_LOPROC + 1) /* ia64 unwind bits */ -+#define PT_IA_64_HP_OPT_ANOT (PT_LOOS + 0x12) -+#define PT_IA_64_HP_HSL_ANOT (PT_LOOS + 0x13) -+#define PT_IA_64_HP_STACK (PT_LOOS + 0x14) -+ -+/* Processor specific flags for the Phdr p_flags field. */ -+#define PF_IA_64_NORECOV 0x80000000 /* spec insns w/o recovery */ -+ -+/* Processor specific values for the Shdr sh_type field. */ -+#define SHT_IA_64_EXT (SHT_LOPROC + 0) /* extension bits */ -+#define SHT_IA_64_UNWIND (SHT_LOPROC + 1) /* unwind bits */ -+ -+/* Processor specific flags for the Shdr sh_flags field. */ -+#define SHF_IA_64_SHORT 0x10000000 /* section near gp */ -+#define SHF_IA_64_NORECOV 0x20000000 /* spec insns w/o recovery */ -+ -+/* Processor specific values for the Dyn d_tag field. */ -+#define DT_IA_64_PLT_RESERVE (DT_LOPROC + 0) -+#define DT_IA_64_NUM 1 -+ -+/* IA-64 relocations. */ -+#define R_IA64_NONE 0x00 /* none */ -+#define R_IA64_IMM14 0x21 /* symbol + addend, add imm14 */ -+#define R_IA64_IMM22 0x22 /* symbol + addend, add imm22 */ -+#define R_IA64_IMM64 0x23 /* symbol + addend, mov imm64 */ -+#define R_IA64_DIR32MSB 0x24 /* symbol + addend, data4 MSB */ -+#define R_IA64_DIR32LSB 0x25 /* symbol + addend, data4 LSB */ -+#define R_IA64_DIR64MSB 0x26 /* symbol + addend, data8 MSB */ -+#define R_IA64_DIR64LSB 0x27 /* symbol + addend, data8 LSB */ -+#define R_IA64_GPREL22 0x2a /* @gprel(sym + add), add imm22 */ -+#define R_IA64_GPREL64I 0x2b /* @gprel(sym + add), mov imm64 */ -+#define R_IA64_GPREL32MSB 0x2c /* @gprel(sym + add), data4 MSB */ -+#define R_IA64_GPREL32LSB 0x2d /* @gprel(sym + add), data4 LSB */ -+#define R_IA64_GPREL64MSB 0x2e /* @gprel(sym + add), data8 MSB */ -+#define R_IA64_GPREL64LSB 0x2f /* @gprel(sym + add), data8 LSB */ -+#define R_IA64_LTOFF22 0x32 /* @ltoff(sym + add), add imm22 */ -+#define R_IA64_LTOFF64I 0x33 /* @ltoff(sym + add), mov imm64 */ -+#define R_IA64_PLTOFF22 0x3a /* @pltoff(sym + add), add imm22 */ -+#define R_IA64_PLTOFF64I 0x3b /* @pltoff(sym + add), mov imm64 */ -+#define R_IA64_PLTOFF64MSB 0x3e /* @pltoff(sym + add), data8 MSB */ -+#define R_IA64_PLTOFF64LSB 0x3f /* @pltoff(sym + add), data8 LSB */ -+#define R_IA64_FPTR64I 0x43 /* @fptr(sym + add), mov imm64 */ -+#define R_IA64_FPTR32MSB 0x44 /* @fptr(sym + add), data4 MSB */ -+#define R_IA64_FPTR32LSB 0x45 /* @fptr(sym + add), data4 LSB */ -+#define R_IA64_FPTR64MSB 0x46 /* @fptr(sym + add), data8 MSB */ -+#define R_IA64_FPTR64LSB 0x47 /* @fptr(sym + add), data8 LSB */ -+#define R_IA64_PCREL60B 0x48 /* @pcrel(sym + add), brl */ -+#define R_IA64_PCREL21B 0x49 /* @pcrel(sym + add), ptb, call */ -+#define R_IA64_PCREL21M 0x4a /* @pcrel(sym + add), chk.s */ -+#define R_IA64_PCREL21F 0x4b /* @pcrel(sym + add), fchkf */ -+#define R_IA64_PCREL32MSB 0x4c /* @pcrel(sym + add), data4 MSB */ -+#define R_IA64_PCREL32LSB 0x4d /* @pcrel(sym + add), data4 LSB */ -+#define R_IA64_PCREL64MSB 0x4e /* @pcrel(sym + add), data8 MSB */ -+#define R_IA64_PCREL64LSB 0x4f /* @pcrel(sym + add), data8 LSB */ -+#define R_IA64_LTOFF_FPTR22 0x52 /* @ltoff(@fptr(s+a)), imm22 */ -+#define R_IA64_LTOFF_FPTR64I 0x53 /* @ltoff(@fptr(s+a)), imm64 */ -+#define R_IA64_LTOFF_FPTR32MSB 0x54 /* @ltoff(@fptr(s+a)), data4 MSB */ -+#define R_IA64_LTOFF_FPTR32LSB 0x55 /* @ltoff(@fptr(s+a)), data4 LSB */ -+#define R_IA64_LTOFF_FPTR64MSB 0x56 /* @ltoff(@fptr(s+a)), data8 MSB */ -+#define R_IA64_LTOFF_FPTR64LSB 0x57 /* @ltoff(@fptr(s+a)), data8 LSB */ -+#define R_IA64_SEGREL32MSB 0x5c /* @segrel(sym + add), data4 MSB */ -+#define R_IA64_SEGREL32LSB 0x5d /* @segrel(sym + add), data4 LSB */ -+#define R_IA64_SEGREL64MSB 0x5e /* @segrel(sym + add), data8 MSB */ -+#define R_IA64_SEGREL64LSB 0x5f /* @segrel(sym + add), data8 LSB */ -+#define R_IA64_SECREL32MSB 0x64 /* @secrel(sym + add), data4 MSB */ -+#define R_IA64_SECREL32LSB 0x65 /* @secrel(sym + add), data4 LSB */ -+#define R_IA64_SECREL64MSB 0x66 /* @secrel(sym + add), data8 MSB */ -+#define R_IA64_SECREL64LSB 0x67 /* @secrel(sym + add), data8 LSB */ -+#define R_IA64_REL32MSB 0x6c /* data 4 + REL */ -+#define R_IA64_REL32LSB 0x6d /* data 4 + REL */ -+#define R_IA64_REL64MSB 0x6e /* data 8 + REL */ -+#define R_IA64_REL64LSB 0x6f /* data 8 + REL */ -+#define R_IA64_LTV32MSB 0x74 /* symbol + addend, data4 MSB */ -+#define R_IA64_LTV32LSB 0x75 /* symbol + addend, data4 LSB */ -+#define R_IA64_LTV64MSB 0x76 /* symbol + addend, data8 MSB */ -+#define R_IA64_LTV64LSB 0x77 /* symbol + addend, data8 LSB */ -+#define R_IA64_PCREL21BI 0x79 /* @pcrel(sym + add), 21bit inst */ -+#define R_IA64_PCREL22 0x7a /* @pcrel(sym + add), 22bit inst */ -+#define R_IA64_PCREL64I 0x7b /* @pcrel(sym + add), 64bit inst */ -+#define R_IA64_IPLTMSB 0x80 /* dynamic reloc, imported PLT, MSB */ -+#define R_IA64_IPLTLSB 0x81 /* dynamic reloc, imported PLT, LSB */ -+#define R_IA64_COPY 0x84 /* copy relocation */ -+#define R_IA64_SUB 0x85 /* Addend and symbol difference */ -+#define R_IA64_LTOFF22X 0x86 /* LTOFF22, relaxable. */ -+#define R_IA64_LDXMOV 0x87 /* Use of LTOFF22X. */ -+#define R_IA64_TPREL14 0x91 /* @tprel(sym + add), imm14 */ -+#define R_IA64_TPREL22 0x92 /* @tprel(sym + add), imm22 */ -+#define R_IA64_TPREL64I 0x93 /* @tprel(sym + add), imm64 */ -+#define R_IA64_TPREL64MSB 0x96 /* @tprel(sym + add), data8 MSB */ -+#define R_IA64_TPREL64LSB 0x97 /* @tprel(sym + add), data8 LSB */ -+#define R_IA64_LTOFF_TPREL22 0x9a /* @ltoff(@tprel(s+a)), imm2 */ -+#define R_IA64_DTPMOD64MSB 0xa6 /* @dtpmod(sym + add), data8 MSB */ -+#define R_IA64_DTPMOD64LSB 0xa7 /* @dtpmod(sym + add), data8 LSB */ -+#define R_IA64_LTOFF_DTPMOD22 0xaa /* @ltoff(@dtpmod(sym + add)), imm22 */ -+#define R_IA64_DTPREL14 0xb1 /* @dtprel(sym + add), imm14 */ -+#define R_IA64_DTPREL22 0xb2 /* @dtprel(sym + add), imm22 */ -+#define R_IA64_DTPREL64I 0xb3 /* @dtprel(sym + add), imm64 */ -+#define R_IA64_DTPREL32MSB 0xb4 /* @dtprel(sym + add), data4 MSB */ -+#define R_IA64_DTPREL32LSB 0xb5 /* @dtprel(sym + add), data4 LSB */ -+#define R_IA64_DTPREL64MSB 0xb6 /* @dtprel(sym + add), data8 MSB */ -+#define R_IA64_DTPREL64LSB 0xb7 /* @dtprel(sym + add), data8 LSB */ -+#define R_IA64_LTOFF_DTPREL22 0xba /* @ltoff(@dtprel(s+a)), imm22 */ -+ -+/* SH specific declarations */ -+ -+/* Processor specific flags for the ELF header e_flags field. */ -+#define EF_SH_MACH_MASK 0x1f -+#define EF_SH_UNKNOWN 0x0 -+#define EF_SH1 0x1 -+#define EF_SH2 0x2 -+#define EF_SH3 0x3 -+#define EF_SH_DSP 0x4 -+#define EF_SH3_DSP 0x5 -+#define EF_SH4AL_DSP 0x6 -+#define EF_SH3E 0x8 -+#define EF_SH4 0x9 -+#define EF_SH2E 0xb -+#define EF_SH4A 0xc -+#define EF_SH2A 0xd -+#define EF_SH4_NOFPU 0x10 -+#define EF_SH4A_NOFPU 0x11 -+#define EF_SH4_NOMMU_NOFPU 0x12 -+#define EF_SH2A_NOFPU 0x13 -+#define EF_SH3_NOMMU 0x14 -+#define EF_SH2A_SH4_NOFPU 0x15 -+#define EF_SH2A_SH3_NOFPU 0x16 -+#define EF_SH2A_SH4 0x17 -+#define EF_SH2A_SH3E 0x18 -+ -+/* SH relocs. */ -+#define R_SH_NONE 0 -+#define R_SH_DIR32 1 -+#define R_SH_REL32 2 -+#define R_SH_DIR8WPN 3 -+#define R_SH_IND12W 4 -+#define R_SH_DIR8WPL 5 -+#define R_SH_DIR8WPZ 6 -+#define R_SH_DIR8BP 7 -+#define R_SH_DIR8W 8 -+#define R_SH_DIR8L 9 -+#define R_SH_SWITCH16 25 -+#define R_SH_SWITCH32 26 -+#define R_SH_USES 27 -+#define R_SH_COUNT 28 -+#define R_SH_ALIGN 29 -+#define R_SH_CODE 30 -+#define R_SH_DATA 31 -+#define R_SH_LABEL 32 -+#define R_SH_SWITCH8 33 -+#define R_SH_GNU_VTINHERIT 34 -+#define R_SH_GNU_VTENTRY 35 -+#define R_SH_TLS_GD_32 144 -+#define R_SH_TLS_LD_32 145 -+#define R_SH_TLS_LDO_32 146 -+#define R_SH_TLS_IE_32 147 -+#define R_SH_TLS_LE_32 148 -+#define R_SH_TLS_DTPMOD32 149 -+#define R_SH_TLS_DTPOFF32 150 -+#define R_SH_TLS_TPOFF32 151 -+#define R_SH_GOT32 160 -+#define R_SH_PLT32 161 -+#define R_SH_COPY 162 -+#define R_SH_GLOB_DAT 163 -+#define R_SH_JMP_SLOT 164 -+#define R_SH_RELATIVE 165 -+#define R_SH_GOTOFF 166 -+#define R_SH_GOTPC 167 -+/* Keep this the last entry. */ -+#define R_SH_NUM 256 -+ -+/* S/390 specific definitions. */ -+ -+/* Valid values for the e_flags field. */ -+ -+#define EF_S390_HIGH_GPRS 0x00000001 /* High GPRs kernel facility needed. */ -+ -+/* Additional s390 relocs */ -+ -+#define R_390_NONE 0 /* No reloc. */ -+#define R_390_8 1 /* Direct 8 bit. */ -+#define R_390_12 2 /* Direct 12 bit. */ -+#define R_390_16 3 /* Direct 16 bit. */ -+#define R_390_32 4 /* Direct 32 bit. */ -+#define R_390_PC32 5 /* PC relative 32 bit. */ -+#define R_390_GOT12 6 /* 12 bit GOT offset. */ -+#define R_390_GOT32 7 /* 32 bit GOT offset. */ -+#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */ -+#define R_390_COPY 9 /* Copy symbol at runtime. */ -+#define R_390_GLOB_DAT 10 /* Create GOT entry. */ -+#define R_390_JMP_SLOT 11 /* Create PLT entry. */ -+#define R_390_RELATIVE 12 /* Adjust by program base. */ -+#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */ -+#define R_390_GOTPC 14 /* 32 bit PC relative offset to GOT. */ -+#define R_390_GOT16 15 /* 16 bit GOT offset. */ -+#define R_390_PC16 16 /* PC relative 16 bit. */ -+#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */ -+#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */ -+#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */ -+#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */ -+#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */ -+#define R_390_64 22 /* Direct 64 bit. */ -+#define R_390_PC64 23 /* PC relative 64 bit. */ -+#define R_390_GOT64 24 /* 64 bit GOT offset. */ -+#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */ -+#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */ -+#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */ -+#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */ -+#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */ -+#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */ -+#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */ -+#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */ -+#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */ -+#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */ -+#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */ -+#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */ -+#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */ -+#define R_390_TLS_GDCALL 38 /* Tag for function call in general -+ dynamic TLS code. */ -+#define R_390_TLS_LDCALL 39 /* Tag for function call in local -+ dynamic TLS code. */ -+#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic -+ thread local data. */ -+#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic -+ thread local data. */ -+#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS -+ block offset. */ -+#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS -+ block offset. */ -+#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS -+ block offset. */ -+#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic -+ thread local data in LE code. */ -+#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic -+ thread local data in LE code. */ -+#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for -+ negated static TLS block offset. */ -+#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for -+ negated static TLS block offset. */ -+#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for -+ negated static TLS block offset. */ -+#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to -+ static TLS block. */ -+#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to -+ static TLS block. */ -+#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS -+ block. */ -+#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS -+ block. */ -+#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */ -+#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */ -+#define R_390_TLS_TPOFF 56 /* Negated offset in static TLS -+ block. */ -+#define R_390_20 57 /* Direct 20 bit. */ -+#define R_390_GOT20 58 /* 20 bit GOT offset. */ -+#define R_390_GOTPLT20 59 /* 20 bit offset to jump slot. */ -+#define R_390_TLS_GOTIE20 60 /* 20 bit GOT offset for static TLS -+ block offset. */ -+#define R_390_IRELATIVE 61 /* STT_GNU_IFUNC relocation. */ -+/* Keep this the last entry. */ -+#define R_390_NUM 62 -+ -+ -+/* CRIS relocations. */ -+#define R_CRIS_NONE 0 -+#define R_CRIS_8 1 -+#define R_CRIS_16 2 -+#define R_CRIS_32 3 -+#define R_CRIS_8_PCREL 4 -+#define R_CRIS_16_PCREL 5 -+#define R_CRIS_32_PCREL 6 -+#define R_CRIS_GNU_VTINHERIT 7 -+#define R_CRIS_GNU_VTENTRY 8 -+#define R_CRIS_COPY 9 -+#define R_CRIS_GLOB_DAT 10 -+#define R_CRIS_JUMP_SLOT 11 -+#define R_CRIS_RELATIVE 12 -+#define R_CRIS_16_GOT 13 -+#define R_CRIS_32_GOT 14 -+#define R_CRIS_16_GOTPLT 15 -+#define R_CRIS_32_GOTPLT 16 -+#define R_CRIS_32_GOTREL 17 -+#define R_CRIS_32_PLT_GOTREL 18 -+#define R_CRIS_32_PLT_PCREL 19 -+ -+#define R_CRIS_NUM 20 -+ -+ -+/* AMD x86-64 relocations. */ -+#define R_X86_64_NONE 0 /* No reloc */ -+#define R_X86_64_64 1 /* Direct 64 bit */ -+#define R_X86_64_PC32 2 /* PC relative 32 bit signed */ -+#define R_X86_64_GOT32 3 /* 32 bit GOT entry */ -+#define R_X86_64_PLT32 4 /* 32 bit PLT address */ -+#define R_X86_64_COPY 5 /* Copy symbol at runtime */ -+#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */ -+#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */ -+#define R_X86_64_RELATIVE 8 /* Adjust by program base */ -+#define R_X86_64_GOTPCREL 9 /* 32 bit signed PC relative -+ offset to GOT */ -+#define R_X86_64_32 10 /* Direct 32 bit zero extended */ -+#define R_X86_64_32S 11 /* Direct 32 bit sign extended */ -+#define R_X86_64_16 12 /* Direct 16 bit zero extended */ -+#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */ -+#define R_X86_64_8 14 /* Direct 8 bit sign extended */ -+#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */ -+#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -+#define R_X86_64_DTPOFF64 17 /* Offset in module's TLS block */ -+#define R_X86_64_TPOFF64 18 /* Offset in initial TLS block */ -+#define R_X86_64_TLSGD 19 /* 32 bit signed PC relative offset -+ to two GOT entries for GD symbol */ -+#define R_X86_64_TLSLD 20 /* 32 bit signed PC relative offset -+ to two GOT entries for LD symbol */ -+#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -+#define R_X86_64_GOTTPOFF 22 /* 32 bit signed PC relative offset -+ to GOT entry for IE symbol */ -+#define R_X86_64_TPOFF32 23 /* Offset in initial TLS block */ -+#define R_X86_64_PC64 24 /* PC relative 64 bit */ -+#define R_X86_64_GOTOFF64 25 /* 64 bit offset to GOT */ -+#define R_X86_64_GOTPC32 26 /* 32 bit signed pc relative -+ offset to GOT */ -+#define R_X86_64_GOT64 27 /* 64-bit GOT entry offset */ -+#define R_X86_64_GOTPCREL64 28 /* 64-bit PC relative offset -+ to GOT entry */ -+#define R_X86_64_GOTPC64 29 /* 64-bit PC relative offset to GOT */ -+#define R_X86_64_GOTPLT64 30 /* like GOT64, says PLT entry needed */ -+#define R_X86_64_PLTOFF64 31 /* 64-bit GOT relative offset -+ to PLT entry */ -+#define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */ -+#define R_X86_64_SIZE64 33 /* Size of symbol plus 64-bit addend */ -+#define R_X86_64_GOTPC32_TLSDESC 34 /* GOT offset for TLS descriptor. */ -+#define R_X86_64_TLSDESC_CALL 35 /* Marker for call through TLS -+ descriptor. */ -+#define R_X86_64_TLSDESC 36 /* TLS descriptor. */ -+#define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */ -+#define R_X86_64_RELATIVE64 38 /* 64-bit adjust by program base */ -+ -+#define R_X86_64_NUM 39 -+ -+ -+/* AM33 relocations. */ -+#define R_MN10300_NONE 0 /* No reloc. */ -+#define R_MN10300_32 1 /* Direct 32 bit. */ -+#define R_MN10300_16 2 /* Direct 16 bit. */ -+#define R_MN10300_8 3 /* Direct 8 bit. */ -+#define R_MN10300_PCREL32 4 /* PC-relative 32-bit. */ -+#define R_MN10300_PCREL16 5 /* PC-relative 16-bit signed. */ -+#define R_MN10300_PCREL8 6 /* PC-relative 8-bit signed. */ -+#define R_MN10300_GNU_VTINHERIT 7 /* Ancient C++ vtable garbage... */ -+#define R_MN10300_GNU_VTENTRY 8 /* ... collection annotation. */ -+#define R_MN10300_24 9 /* Direct 24 bit. */ -+#define R_MN10300_GOTPC32 10 /* 32-bit PCrel offset to GOT. */ -+#define R_MN10300_GOTPC16 11 /* 16-bit PCrel offset to GOT. */ -+#define R_MN10300_GOTOFF32 12 /* 32-bit offset from GOT. */ -+#define R_MN10300_GOTOFF24 13 /* 24-bit offset from GOT. */ -+#define R_MN10300_GOTOFF16 14 /* 16-bit offset from GOT. */ -+#define R_MN10300_PLT32 15 /* 32-bit PCrel to PLT entry. */ -+#define R_MN10300_PLT16 16 /* 16-bit PCrel to PLT entry. */ -+#define R_MN10300_GOT32 17 /* 32-bit offset to GOT entry. */ -+#define R_MN10300_GOT24 18 /* 24-bit offset to GOT entry. */ -+#define R_MN10300_GOT16 19 /* 16-bit offset to GOT entry. */ -+#define R_MN10300_COPY 20 /* Copy symbol at runtime. */ -+#define R_MN10300_GLOB_DAT 21 /* Create GOT entry. */ -+#define R_MN10300_JMP_SLOT 22 /* Create PLT entry. */ -+#define R_MN10300_RELATIVE 23 /* Adjust by program base. */ -+ -+#define R_MN10300_NUM 24 -+ -+ -+/* M32R relocs. */ -+#define R_M32R_NONE 0 /* No reloc. */ -+#define R_M32R_16 1 /* Direct 16 bit. */ -+#define R_M32R_32 2 /* Direct 32 bit. */ -+#define R_M32R_24 3 /* Direct 24 bit. */ -+#define R_M32R_10_PCREL 4 /* PC relative 10 bit shifted. */ -+#define R_M32R_18_PCREL 5 /* PC relative 18 bit shifted. */ -+#define R_M32R_26_PCREL 6 /* PC relative 26 bit shifted. */ -+#define R_M32R_HI16_ULO 7 /* High 16 bit with unsigned low. */ -+#define R_M32R_HI16_SLO 8 /* High 16 bit with signed low. */ -+#define R_M32R_LO16 9 /* Low 16 bit. */ -+#define R_M32R_SDA16 10 /* 16 bit offset in SDA. */ -+#define R_M32R_GNU_VTINHERIT 11 -+#define R_M32R_GNU_VTENTRY 12 -+/* M32R relocs use SHT_RELA. */ -+#define R_M32R_16_RELA 33 /* Direct 16 bit. */ -+#define R_M32R_32_RELA 34 /* Direct 32 bit. */ -+#define R_M32R_24_RELA 35 /* Direct 24 bit. */ -+#define R_M32R_10_PCREL_RELA 36 /* PC relative 10 bit shifted. */ -+#define R_M32R_18_PCREL_RELA 37 /* PC relative 18 bit shifted. */ -+#define R_M32R_26_PCREL_RELA 38 /* PC relative 26 bit shifted. */ -+#define R_M32R_HI16_ULO_RELA 39 /* High 16 bit with unsigned low */ -+#define R_M32R_HI16_SLO_RELA 40 /* High 16 bit with signed low */ -+#define R_M32R_LO16_RELA 41 /* Low 16 bit */ -+#define R_M32R_SDA16_RELA 42 /* 16 bit offset in SDA */ -+#define R_M32R_RELA_GNU_VTINHERIT 43 -+#define R_M32R_RELA_GNU_VTENTRY 44 -+#define R_M32R_REL32 45 /* PC relative 32 bit. */ -+ -+#define R_M32R_GOT24 48 /* 24 bit GOT entry */ -+#define R_M32R_26_PLTREL 49 /* 26 bit PC relative to PLT shifted */ -+#define R_M32R_COPY 50 /* Copy symbol at runtime */ -+#define R_M32R_GLOB_DAT 51 /* Create GOT entry */ -+#define R_M32R_JMP_SLOT 52 /* Create PLT entry */ -+#define R_M32R_RELATIVE 53 /* Adjust by program base */ -+#define R_M32R_GOTOFF 54 /* 24 bit offset to GOT */ -+#define R_M32R_GOTPC24 55 /* 24 bit PC relative offset to GOT */ -+#define R_M32R_GOT16_HI_ULO 56 /* High 16 bit GOT entry with unsigned -+ low */ -+#define R_M32R_GOT16_HI_SLO 57 /* High 16 bit GOT entry with signed -+ low */ -+#define R_M32R_GOT16_LO 58 /* Low 16 bit GOT entry */ -+#define R_M32R_GOTPC_HI_ULO 59 /* High 16 bit PC relative offset to -+ GOT with unsigned low */ -+#define R_M32R_GOTPC_HI_SLO 60 /* High 16 bit PC relative offset to -+ GOT with signed low */ -+#define R_M32R_GOTPC_LO 61 /* Low 16 bit PC relative offset to -+ GOT */ -+#define R_M32R_GOTOFF_HI_ULO 62 /* High 16 bit offset to GOT -+ with unsigned low */ -+#define R_M32R_GOTOFF_HI_SLO 63 /* High 16 bit offset to GOT -+ with signed low */ -+#define R_M32R_GOTOFF_LO 64 /* Low 16 bit offset to GOT */ -+#define R_M32R_NUM 256 /* Keep this the last entry. */ -+ -+ -+/* TILEPro relocations. */ -+#define R_TILEPRO_NONE 0 /* No reloc */ -+#define R_TILEPRO_32 1 /* Direct 32 bit */ -+#define R_TILEPRO_16 2 /* Direct 16 bit */ -+#define R_TILEPRO_8 3 /* Direct 8 bit */ -+#define R_TILEPRO_32_PCREL 4 /* PC relative 32 bit */ -+#define R_TILEPRO_16_PCREL 5 /* PC relative 16 bit */ -+#define R_TILEPRO_8_PCREL 6 /* PC relative 8 bit */ -+#define R_TILEPRO_LO16 7 /* Low 16 bit */ -+#define R_TILEPRO_HI16 8 /* High 16 bit */ -+#define R_TILEPRO_HA16 9 /* High 16 bit, adjusted */ -+#define R_TILEPRO_COPY 10 /* Copy relocation */ -+#define R_TILEPRO_GLOB_DAT 11 /* Create GOT entry */ -+#define R_TILEPRO_JMP_SLOT 12 /* Create PLT entry */ -+#define R_TILEPRO_RELATIVE 13 /* Adjust by program base */ -+#define R_TILEPRO_BROFF_X1 14 /* X1 pipe branch offset */ -+#define R_TILEPRO_JOFFLONG_X1 15 /* X1 pipe jump offset */ -+#define R_TILEPRO_JOFFLONG_X1_PLT 16 /* X1 pipe jump offset to PLT */ -+#define R_TILEPRO_IMM8_X0 17 /* X0 pipe 8-bit */ -+#define R_TILEPRO_IMM8_Y0 18 /* Y0 pipe 8-bit */ -+#define R_TILEPRO_IMM8_X1 19 /* X1 pipe 8-bit */ -+#define R_TILEPRO_IMM8_Y1 20 /* Y1 pipe 8-bit */ -+#define R_TILEPRO_MT_IMM15_X1 21 /* X1 pipe mtspr */ -+#define R_TILEPRO_MF_IMM15_X1 22 /* X1 pipe mfspr */ -+#define R_TILEPRO_IMM16_X0 23 /* X0 pipe 16-bit */ -+#define R_TILEPRO_IMM16_X1 24 /* X1 pipe 16-bit */ -+#define R_TILEPRO_IMM16_X0_LO 25 /* X0 pipe low 16-bit */ -+#define R_TILEPRO_IMM16_X1_LO 26 /* X1 pipe low 16-bit */ -+#define R_TILEPRO_IMM16_X0_HI 27 /* X0 pipe high 16-bit */ -+#define R_TILEPRO_IMM16_X1_HI 28 /* X1 pipe high 16-bit */ -+#define R_TILEPRO_IMM16_X0_HA 29 /* X0 pipe high 16-bit, adjusted */ -+#define R_TILEPRO_IMM16_X1_HA 30 /* X1 pipe high 16-bit, adjusted */ -+#define R_TILEPRO_IMM16_X0_PCREL 31 /* X0 pipe PC relative 16 bit */ -+#define R_TILEPRO_IMM16_X1_PCREL 32 /* X1 pipe PC relative 16 bit */ -+#define R_TILEPRO_IMM16_X0_LO_PCREL 33 /* X0 pipe PC relative low 16 bit */ -+#define R_TILEPRO_IMM16_X1_LO_PCREL 34 /* X1 pipe PC relative low 16 bit */ -+#define R_TILEPRO_IMM16_X0_HI_PCREL 35 /* X0 pipe PC relative high 16 bit */ -+#define R_TILEPRO_IMM16_X1_HI_PCREL 36 /* X1 pipe PC relative high 16 bit */ -+#define R_TILEPRO_IMM16_X0_HA_PCREL 37 /* X0 pipe PC relative ha() 16 bit */ -+#define R_TILEPRO_IMM16_X1_HA_PCREL 38 /* X1 pipe PC relative ha() 16 bit */ -+#define R_TILEPRO_IMM16_X0_GOT 39 /* X0 pipe 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X1_GOT 40 /* X1 pipe 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X0_GOT_LO 41 /* X0 pipe low 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X1_GOT_LO 42 /* X1 pipe low 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X0_GOT_HI 43 /* X0 pipe high 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X1_GOT_HI 44 /* X1 pipe high 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X0_GOT_HA 45 /* X0 pipe ha() 16-bit GOT offset */ -+#define R_TILEPRO_IMM16_X1_GOT_HA 46 /* X1 pipe ha() 16-bit GOT offset */ -+#define R_TILEPRO_MMSTART_X0 47 /* X0 pipe mm "start" */ -+#define R_TILEPRO_MMEND_X0 48 /* X0 pipe mm "end" */ -+#define R_TILEPRO_MMSTART_X1 49 /* X1 pipe mm "start" */ -+#define R_TILEPRO_MMEND_X1 50 /* X1 pipe mm "end" */ -+#define R_TILEPRO_SHAMT_X0 51 /* X0 pipe shift amount */ -+#define R_TILEPRO_SHAMT_X1 52 /* X1 pipe shift amount */ -+#define R_TILEPRO_SHAMT_Y0 53 /* Y0 pipe shift amount */ -+#define R_TILEPRO_SHAMT_Y1 54 /* Y1 pipe shift amount */ -+#define R_TILEPRO_DEST_IMM8_X1 55 /* X1 pipe destination 8-bit */ -+/* Relocs 56-59 are currently not defined. */ -+#define R_TILEPRO_TLS_GD_CALL 60 /* "jal" for TLS GD */ -+#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61 /* X0 pipe "addi" for TLS GD */ -+#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62 /* X1 pipe "addi" for TLS GD */ -+#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63 /* Y0 pipe "addi" for TLS GD */ -+#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64 /* Y1 pipe "addi" for TLS GD */ -+#define R_TILEPRO_TLS_IE_LOAD 65 /* "lw_tls" for TLS IE */ -+#define R_TILEPRO_IMM16_X0_TLS_GD 66 /* X0 pipe 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X1_TLS_GD 67 /* X1 pipe 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68 /* X0 pipe low 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69 /* X1 pipe low 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70 /* X0 pipe high 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71 /* X1 pipe high 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72 /* X0 pipe ha() 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73 /* X1 pipe ha() 16-bit TLS GD offset */ -+#define R_TILEPRO_IMM16_X0_TLS_IE 74 /* X0 pipe 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_IE 75 /* X1 pipe 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76 /* X0 pipe low 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77 /* X1 pipe low 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78 /* X0 pipe high 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79 /* X1 pipe high 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80 /* X0 pipe ha() 16-bit TLS IE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81 /* X1 pipe ha() 16-bit TLS IE offset */ -+#define R_TILEPRO_TLS_DTPMOD32 82 /* ID of module containing symbol */ -+#define R_TILEPRO_TLS_DTPOFF32 83 /* Offset in TLS block */ -+#define R_TILEPRO_TLS_TPOFF32 84 /* Offset in static TLS block */ -+#define R_TILEPRO_IMM16_X0_TLS_LE 85 /* X0 pipe 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_LE 86 /* X1 pipe 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87 /* X0 pipe low 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88 /* X1 pipe low 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89 /* X0 pipe high 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90 /* X1 pipe high 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91 /* X0 pipe ha() 16-bit TLS LE offset */ -+#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92 /* X1 pipe ha() 16-bit TLS LE offset */ -+ -+#define R_TILEPRO_GNU_VTINHERIT 128 /* GNU C++ vtable hierarchy */ -+#define R_TILEPRO_GNU_VTENTRY 129 /* GNU C++ vtable member usage */ -+ -+#define R_TILEPRO_NUM 130 -+ -+ -+/* TILE-Gx relocations. */ -+#define R_TILEGX_NONE 0 /* No reloc */ -+#define R_TILEGX_64 1 /* Direct 64 bit */ -+#define R_TILEGX_32 2 /* Direct 32 bit */ -+#define R_TILEGX_16 3 /* Direct 16 bit */ -+#define R_TILEGX_8 4 /* Direct 8 bit */ -+#define R_TILEGX_64_PCREL 5 /* PC relative 64 bit */ -+#define R_TILEGX_32_PCREL 6 /* PC relative 32 bit */ -+#define R_TILEGX_16_PCREL 7 /* PC relative 16 bit */ -+#define R_TILEGX_8_PCREL 8 /* PC relative 8 bit */ -+#define R_TILEGX_HW0 9 /* hword 0 16-bit */ -+#define R_TILEGX_HW1 10 /* hword 1 16-bit */ -+#define R_TILEGX_HW2 11 /* hword 2 16-bit */ -+#define R_TILEGX_HW3 12 /* hword 3 16-bit */ -+#define R_TILEGX_HW0_LAST 13 /* last hword 0 16-bit */ -+#define R_TILEGX_HW1_LAST 14 /* last hword 1 16-bit */ -+#define R_TILEGX_HW2_LAST 15 /* last hword 2 16-bit */ -+#define R_TILEGX_COPY 16 /* Copy relocation */ -+#define R_TILEGX_GLOB_DAT 17 /* Create GOT entry */ -+#define R_TILEGX_JMP_SLOT 18 /* Create PLT entry */ -+#define R_TILEGX_RELATIVE 19 /* Adjust by program base */ -+#define R_TILEGX_BROFF_X1 20 /* X1 pipe branch offset */ -+#define R_TILEGX_JUMPOFF_X1 21 /* X1 pipe jump offset */ -+#define R_TILEGX_JUMPOFF_X1_PLT 22 /* X1 pipe jump offset to PLT */ -+#define R_TILEGX_IMM8_X0 23 /* X0 pipe 8-bit */ -+#define R_TILEGX_IMM8_Y0 24 /* Y0 pipe 8-bit */ -+#define R_TILEGX_IMM8_X1 25 /* X1 pipe 8-bit */ -+#define R_TILEGX_IMM8_Y1 26 /* Y1 pipe 8-bit */ -+#define R_TILEGX_DEST_IMM8_X1 27 /* X1 pipe destination 8-bit */ -+#define R_TILEGX_MT_IMM14_X1 28 /* X1 pipe mtspr */ -+#define R_TILEGX_MF_IMM14_X1 29 /* X1 pipe mfspr */ -+#define R_TILEGX_MMSTART_X0 30 /* X0 pipe mm "start" */ -+#define R_TILEGX_MMEND_X0 31 /* X0 pipe mm "end" */ -+#define R_TILEGX_SHAMT_X0 32 /* X0 pipe shift amount */ -+#define R_TILEGX_SHAMT_X1 33 /* X1 pipe shift amount */ -+#define R_TILEGX_SHAMT_Y0 34 /* Y0 pipe shift amount */ -+#define R_TILEGX_SHAMT_Y1 35 /* Y1 pipe shift amount */ -+#define R_TILEGX_IMM16_X0_HW0 36 /* X0 pipe hword 0 */ -+#define R_TILEGX_IMM16_X1_HW0 37 /* X1 pipe hword 0 */ -+#define R_TILEGX_IMM16_X0_HW1 38 /* X0 pipe hword 1 */ -+#define R_TILEGX_IMM16_X1_HW1 39 /* X1 pipe hword 1 */ -+#define R_TILEGX_IMM16_X0_HW2 40 /* X0 pipe hword 2 */ -+#define R_TILEGX_IMM16_X1_HW2 41 /* X1 pipe hword 2 */ -+#define R_TILEGX_IMM16_X0_HW3 42 /* X0 pipe hword 3 */ -+#define R_TILEGX_IMM16_X1_HW3 43 /* X1 pipe hword 3 */ -+#define R_TILEGX_IMM16_X0_HW0_LAST 44 /* X0 pipe last hword 0 */ -+#define R_TILEGX_IMM16_X1_HW0_LAST 45 /* X1 pipe last hword 0 */ -+#define R_TILEGX_IMM16_X0_HW1_LAST 46 /* X0 pipe last hword 1 */ -+#define R_TILEGX_IMM16_X1_HW1_LAST 47 /* X1 pipe last hword 1 */ -+#define R_TILEGX_IMM16_X0_HW2_LAST 48 /* X0 pipe last hword 2 */ -+#define R_TILEGX_IMM16_X1_HW2_LAST 49 /* X1 pipe last hword 2 */ -+#define R_TILEGX_IMM16_X0_HW0_PCREL 50 /* X0 pipe PC relative hword 0 */ -+#define R_TILEGX_IMM16_X1_HW0_PCREL 51 /* X1 pipe PC relative hword 0 */ -+#define R_TILEGX_IMM16_X0_HW1_PCREL 52 /* X0 pipe PC relative hword 1 */ -+#define R_TILEGX_IMM16_X1_HW1_PCREL 53 /* X1 pipe PC relative hword 1 */ -+#define R_TILEGX_IMM16_X0_HW2_PCREL 54 /* X0 pipe PC relative hword 2 */ -+#define R_TILEGX_IMM16_X1_HW2_PCREL 55 /* X1 pipe PC relative hword 2 */ -+#define R_TILEGX_IMM16_X0_HW3_PCREL 56 /* X0 pipe PC relative hword 3 */ -+#define R_TILEGX_IMM16_X1_HW3_PCREL 57 /* X1 pipe PC relative hword 3 */ -+#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */ -+#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */ -+#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */ -+#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */ -+#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */ -+#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */ -+#define R_TILEGX_IMM16_X0_HW0_GOT 64 /* X0 pipe hword 0 GOT offset */ -+#define R_TILEGX_IMM16_X1_HW0_GOT 65 /* X1 pipe hword 0 GOT offset */ -+/* Relocs 66-71 are currently not defined. */ -+#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */ -+#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */ -+#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */ -+#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */ -+/* Relocs 76-77 are currently not defined. */ -+#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78 /* X0 pipe hword 0 TLS GD offset */ -+#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79 /* X1 pipe hword 0 TLS GD offset */ -+#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80 /* X0 pipe hword 0 TLS LE offset */ -+#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81 /* X1 pipe hword 0 TLS LE offset */ -+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */ -+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */ -+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */ -+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */ -+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */ -+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */ -+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */ -+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */ -+/* Relocs 90-91 are currently not defined. */ -+#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92 /* X0 pipe hword 0 TLS IE offset */ -+#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93 /* X1 pipe hword 0 TLS IE offset */ -+/* Relocs 94-99 are currently not defined. */ -+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */ -+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */ -+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */ -+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */ -+/* Relocs 104-105 are currently not defined. */ -+#define R_TILEGX_TLS_DTPMOD64 106 /* 64-bit ID of symbol's module */ -+#define R_TILEGX_TLS_DTPOFF64 107 /* 64-bit offset in TLS block */ -+#define R_TILEGX_TLS_TPOFF64 108 /* 64-bit offset in static TLS block */ -+#define R_TILEGX_TLS_DTPMOD32 109 /* 32-bit ID of symbol's module */ -+#define R_TILEGX_TLS_DTPOFF32 110 /* 32-bit offset in TLS block */ -+#define R_TILEGX_TLS_TPOFF32 111 /* 32-bit offset in static TLS block */ -+#define R_TILEGX_TLS_GD_CALL 112 /* "jal" for TLS GD */ -+#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113 /* X0 pipe "addi" for TLS GD */ -+#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114 /* X1 pipe "addi" for TLS GD */ -+#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115 /* Y0 pipe "addi" for TLS GD */ -+#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116 /* Y1 pipe "addi" for TLS GD */ -+#define R_TILEGX_TLS_IE_LOAD 117 /* "ld_tls" for TLS IE */ -+#define R_TILEGX_IMM8_X0_TLS_ADD 118 /* X0 pipe "addi" for TLS GD/IE */ -+#define R_TILEGX_IMM8_X1_TLS_ADD 119 /* X1 pipe "addi" for TLS GD/IE */ -+#define R_TILEGX_IMM8_Y0_TLS_ADD 120 /* Y0 pipe "addi" for TLS GD/IE */ -+#define R_TILEGX_IMM8_Y1_TLS_ADD 121 /* Y1 pipe "addi" for TLS GD/IE */ -+ -+#define R_TILEGX_GNU_VTINHERIT 128 /* GNU C++ vtable hierarchy */ -+#define R_TILEGX_GNU_VTENTRY 129 /* GNU C++ vtable member usage */ -+ -+#define R_TILEGX_NUM 130 -+ -+#endif /* elf.h */ ---- a/scripts/mod/mk_elfconfig.c -+++ b/scripts/mod/mk_elfconfig.c -@@ -1,7 +1,11 @@ - #include - #include - #include -+#ifndef __APPLE__ - #include -+#else -+#include "elf.h" -+#endif - - int - main(int argc, char **argv) ---- a/scripts/mod/modpost.h -+++ b/scripts/mod/modpost.h -@@ -7,7 +7,11 @@ - #include - #include - #include -+#if !(defined(__APPLE__) || defined(__CYGWIN__)) - #include -+#else -+#include "elf.h" -+#endif - - #include "elfconfig.h" - diff --git a/target/linux/generic/hack-4.9/211-host_tools_portability.patch b/target/linux/generic/hack-4.9/211-host_tools_portability.patch deleted file mode 100644 index e4d6851418..0000000000 --- a/target/linux/generic/hack-4.9/211-host_tools_portability.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7f698012384ccb1ed10cc758acfd085096fdb307 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:02:03 +0200 -Subject: kernel: fix linux 4.9 host tools portability issues - -Signed-off-by: Felix Fietkau ---- - tools/build/Build.include | 2 +- - tools/perf/pmu-events/jevents.c | 1 + - tools/perf/pmu-events/json.c | 1 - - 3 files changed, 2 insertions(+), 2 deletions(-) - ---- a/tools/build/Build.include -+++ b/tools/build/Build.include -@@ -96,4 +96,4 @@ cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $( - ### - ## HOSTCC C flags - --host_c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj)) -+host_c_flags = -MD -MF $(depfile) -MT $@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj)) ---- a/tools/perf/pmu-events/jevents.c -+++ b/tools/perf/pmu-events/jevents.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/tools/perf/pmu-events/json.c -+++ b/tools/perf/pmu-events/json.c -@@ -38,7 +38,6 @@ - #include - #include "jsmn.h" - #include "json.h" --#include - - - static char *mapfile(const char *fn, size_t *size) diff --git a/target/linux/generic/hack-4.9/212-byteshift_portability.patch b/target/linux/generic/hack-4.9/212-byteshift_portability.patch deleted file mode 100644 index 6def12d0cf..0000000000 --- a/target/linux/generic/hack-4.9/212-byteshift_portability.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 48232d3d931c95953ce2ddfe7da7bb164aef6a73 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:03:16 +0200 -Subject: linux-3.6: fix portability of some includes files in tools/ used on the host - -lede-commit: 6040b1d29ab1f047c5e49b748abcb6a3196add28 -Signed-off-by: Felix Fietkau ---- - 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 -@@ -1,6 +1,10 @@ - #ifndef _TOOLS_BE_BYTESHIFT_H - #define _TOOLS_BE_BYTESHIFT_H - -+#ifndef __linux__ -+#include "linux_types.h" -+#endif -+ - #include - - 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 -@@ -1,6 +1,10 @@ - #ifndef _TOOLS_LE_BYTESHIFT_H - #define _TOOLS_LE_BYTESHIFT_H - -+#ifndef __linux__ -+#include "linux_types.h" -+#endif -+ - #include - - static inline uint16_t __get_unaligned_le16(const uint8_t *p) ---- /dev/null -+++ b/tools/include/tools/linux_types.h -@@ -0,0 +1,22 @@ -+#ifndef __LINUX_TYPES_H -+#define __LINUX_TYPES_H -+ -+#include -+ -+typedef uint8_t __u8; -+typedef uint8_t __be8; -+typedef uint8_t __le8; -+ -+typedef uint16_t __u16; -+typedef uint16_t __be16; -+typedef uint16_t __le16; -+ -+typedef uint32_t __u32; -+typedef uint32_t __be32; -+typedef uint32_t __le32; -+ -+typedef uint64_t __u64; -+typedef uint64_t __be64; -+typedef uint64_t __le64; -+ -+#endif diff --git a/target/linux/generic/hack-4.9/214-spidev_h_portability.patch b/target/linux/generic/hack-4.9/214-spidev_h_portability.patch deleted file mode 100644 index ad4706c821..0000000000 --- a/target/linux/generic/hack-4.9/214-spidev_h_portability.patch +++ /dev/null @@ -1,24 +0,0 @@ -From be9be95ff10e16a5b4ad36f903978d0cc5747024 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -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 ---- - 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 -@@ -112,7 +112,7 @@ struct spi_ioc_transfer { - - /* not all platforms use 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)]) - diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch deleted file mode 100644 index bdacb0f3ed..0000000000 --- a/target/linux/generic/hack-4.9/220-gc_sections.patch +++ /dev/null @@ -1,448 +0,0 @@ -From e3d8676f5722b7622685581e06e8f53e6138e3ab Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -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 -Signed-off-by: Jonas Gorski -Signed-off-by: Gabor Juhos ---- - Makefile | 10 +++---- - arch/arm/Kconfig | 1 + - arch/arm/boot/compressed/Makefile | 1 + - arch/arm/kernel/vmlinux.lds.S | 26 ++++++++-------- - arch/mips/Kconfig | 1 + - arch/mips/kernel/vmlinux.lds.S | 4 +-- - include/asm-generic/vmlinux.lds.h | 63 ++++++++++++++++++++------------------- - 7 files changed, 55 insertions(+), 51 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -402,6 +402,11 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s - GCC_PLUGINS_CFLAGS := - CLANG_FLAGS := - -+ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION -+KBUILD_CFLAGS_KERNEL += $(call cc-option,-ffunction-sections,) -+KBUILD_CFLAGS_KERNEL += $(call cc-option,-fdata-sections,) -+endif -+ - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) - KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -@@ -652,11 +657,6 @@ KBUILD_CFLAGS += $(call cc-disable-warni - KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) - KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias) - --ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION --KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,) --KBUILD_CFLAGS += $(call cc-option,-fdata-sections,) --endif -- - ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE - KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) - else ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -81,6 +81,7 @@ config ARM - select HAVE_UID16 - select HAVE_VIRT_CPU_ACCOUNTING_GEN - select IRQ_FORCED_THREADING -+ select LD_DEAD_CODE_DATA_ELIMINATION - select MODULES_USE_ELF_REL - select NO_BOOTMEM - select OF_EARLY_FLATTREE if OF ---- a/arch/arm/boot/compressed/Makefile -+++ b/arch/arm/boot/compressed/Makefile -@@ -102,6 +102,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y) - ORIG_CFLAGS := $(KBUILD_CFLAGS) - KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) - endif -+KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL)) - - # -fstack-protector-strong triggers protection checks in this code, - # but it is being used too early to link to meaningful stack_chk logic. ---- a/arch/arm/kernel/vmlinux.lds.S -+++ b/arch/arm/kernel/vmlinux.lds.S -@@ -17,7 +17,7 @@ - #define PROC_INFO \ - . = ALIGN(4); \ - VMLINUX_SYMBOL(__proc_info_begin) = .; \ -- *(.proc.info.init) \ -+ KEEP(*(.proc.info.init)) \ - VMLINUX_SYMBOL(__proc_info_end) = .; - - #define HYPERVISOR_TEXT \ -@@ -28,11 +28,11 @@ - #define IDMAP_TEXT \ - ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__idmap_text_start) = .; \ -- *(.idmap.text) \ -+ KEEP(*(.idmap.text)) \ - VMLINUX_SYMBOL(__idmap_text_end) = .; \ - . = ALIGN(PAGE_SIZE); \ - VMLINUX_SYMBOL(__hyp_idmap_text_start) = .; \ -- *(.hyp.idmap.text) \ -+ KEEP(*(.hyp.idmap.text)) \ - VMLINUX_SYMBOL(__hyp_idmap_text_end) = .; - - #ifdef CONFIG_HOTPLUG_CPU -@@ -105,7 +105,7 @@ SECTIONS - _stext = .; /* Text and read-only data */ - IDMAP_TEXT - __exception_text_start = .; -- *(.exception.text) -+ KEEP(*(.exception.text)) - __exception_text_end = .; - IRQENTRY_TEXT - SOFTIRQENTRY_TEXT -@@ -134,7 +134,7 @@ SECTIONS - __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { - __start___ex_table = .; - #ifdef CONFIG_MMU -- *(__ex_table) -+ KEEP(*(__ex_table)) - #endif - __stop___ex_table = .; - } -@@ -146,12 +146,12 @@ SECTIONS - . = 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 = .; - } - #endif -@@ -171,14 +171,14 @@ SECTIONS - */ - __vectors_start = .; - .vectors 0xffff0000 : AT(__vectors_start) { -- *(.vectors) -+ KEEP(*(.vectors)) - } - . = __vectors_start + SIZEOF(.vectors); - __vectors_end = .; - - __stubs_start = .; - .stubs ADDR(.vectors) + 0x1000 : AT(__stubs_start) { -- *(.stubs) -+ KEEP(*(.stubs)) - } - . = __stubs_start + SIZEOF(.stubs); - __stubs_end = .; -@@ -194,24 +194,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 = .; - } - .init.data : { ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -56,6 +56,7 @@ config MIPS - select CLONE_BACKWARDS - select HAVE_DEBUG_STACKOVERFLOW - select HAVE_CC_STACKPROTECTOR -+ select LD_DEAD_CODE_DATA_ELIMINATION - select CPU_PM if CPU_IDLE - select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST - select ARCH_BINFMT_ELF_STATE ---- a/arch/mips/kernel/vmlinux.lds.S -+++ b/arch/mips/kernel/vmlinux.lds.S -@@ -71,7 +71,7 @@ SECTIONS - /* Exception table for data bus errors */ - __dbe_table : { - __start___dbe_table = .; -- *(__dbe_table) -+ KEEP(*(__dbe_table)) - __stop___dbe_table = .; - } - -@@ -121,7 +121,7 @@ SECTIONS - . = ALIGN(4); - .mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) { - __mips_machines_start = .; -- *(.mips.machines.init) -+ KEEP(*(.mips.machines.init)) - __mips_machines_end = .; - } - ---- a/include/asm-generic/vmlinux.lds.h -+++ b/include/asm-generic/vmlinux.lds.h -@@ -105,7 +105,7 @@ - #ifdef CONFIG_FTRACE_MCOUNT_RECORD - #define MCOUNT_REC() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_mcount_loc) = .; \ -- *(__mcount_loc) \ -+ KEEP(*(__mcount_loc)) \ - VMLINUX_SYMBOL(__stop_mcount_loc) = .; - #else - #define MCOUNT_REC() -@@ -113,7 +113,7 @@ - - #ifdef CONFIG_TRACE_BRANCH_PROFILING - #define LIKELY_PROFILE() VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \ -- *(_ftrace_annotated_branch) \ -+ KEEP(*(_ftrace_annotated_branch)) \ - VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .; - #else - #define LIKELY_PROFILE() -@@ -121,7 +121,7 @@ - - #ifdef CONFIG_PROFILE_ALL_BRANCHES - #define BRANCH_PROFILE() VMLINUX_SYMBOL(__start_branch_profile) = .; \ -- *(_ftrace_branch) \ -+ KEEP(*(_ftrace_branch)) \ - VMLINUX_SYMBOL(__stop_branch_profile) = .; - #else - #define BRANCH_PROFILE() -@@ -130,7 +130,7 @@ - #ifdef CONFIG_KPROBES - #define KPROBE_BLACKLIST() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \ -- *(_kprobe_blacklist) \ -+ KEEP(*(_kprobe_blacklist)) \ - VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .; - #else - #define KPROBE_BLACKLIST() -@@ -139,10 +139,10 @@ - #ifdef CONFIG_EVENT_TRACING - #define FTRACE_EVENTS() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_ftrace_events) = .; \ -- *(_ftrace_events) \ -+ KEEP(*(_ftrace_events)) \ - VMLINUX_SYMBOL(__stop_ftrace_events) = .; \ - VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .; \ -- *(_ftrace_enum_map) \ -+ KEEP(*(_ftrace_enum_map)) \ - VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .; - #else - #define FTRACE_EVENTS() -@@ -163,7 +163,7 @@ - #ifdef CONFIG_FTRACE_SYSCALLS - #define TRACE_SYSCALLS() . = ALIGN(8); \ - VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \ -- *(__syscalls_metadata) \ -+ KEEP(*(__syscalls_metadata)) \ - VMLINUX_SYMBOL(__stop_syscalls_metadata) = .; - #else - #define TRACE_SYSCALLS() -@@ -172,7 +172,7 @@ - #ifdef CONFIG_SERIAL_EARLYCON - #define EARLYCON_TABLE() . = ALIGN(8); \ - VMLINUX_SYMBOL(__earlycon_table) = .; \ -- *(__earlycon_table) \ -+ KEEP(*(__earlycon_table)) \ - VMLINUX_SYMBOL(__earlycon_table_end) = .; - #else - #define EARLYCON_TABLE() -@@ -185,8 +185,8 @@ - #define _OF_TABLE_1(name) \ - . = ALIGN(8); \ - VMLINUX_SYMBOL(__##name##_of_table) = .; \ -- *(__##name##_of_table) \ -- *(__##name##_of_table_end) -+ KEEP(*(__##name##_of_table)) \ -+ KEEP(*(__##name##_of_table_end)) - - #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) - #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) -@@ -209,7 +209,7 @@ - #define KERNEL_DTB() \ - STRUCT_ALIGN(); \ - VMLINUX_SYMBOL(__dtb_start) = .; \ -- *(.dtb.init.rodata) \ -+ KEEP(*(.dtb.init.rodata)) \ - VMLINUX_SYMBOL(__dtb_end) = .; - - /* -@@ -227,16 +227,17 @@ - /* implement dynamic printk debug */ \ - . = ALIGN(8); \ - VMLINUX_SYMBOL(__start___jump_table) = .; \ -- *(__jump_table) \ -+ KEEP(*(__jump_table)) \ - VMLINUX_SYMBOL(__stop___jump_table) = .; \ - . = ALIGN(8); \ - VMLINUX_SYMBOL(__start___verbose) = .; \ -- *(__verbose) \ -+ KEEP(*(__verbose)) \ - VMLINUX_SYMBOL(__stop___verbose) = .; \ - LIKELY_PROFILE() \ - BRANCH_PROFILE() \ - TRACE_PRINTKS() \ -- TRACEPOINT_STR() -+ TRACEPOINT_STR() \ -+ *(.data.[a-zA-Z_]*) - - /* - * Data section helpers -@@ -304,35 +305,35 @@ - /* PCI quirks */ \ - .pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \ -- *(.pci_fixup_early) \ -+ KEEP(*(.pci_fixup_early)) \ - VMLINUX_SYMBOL(__end_pci_fixups_early) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_header) = .; \ -- *(.pci_fixup_header) \ -+ KEEP(*(.pci_fixup_header)) \ - VMLINUX_SYMBOL(__end_pci_fixups_header) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_final) = .; \ -- *(.pci_fixup_final) \ -+ KEEP(*(.pci_fixup_final)) \ - VMLINUX_SYMBOL(__end_pci_fixups_final) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_enable) = .; \ -- *(.pci_fixup_enable) \ -+ KEEP(*(.pci_fixup_enable)) \ - VMLINUX_SYMBOL(__end_pci_fixups_enable) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_resume) = .; \ -- *(.pci_fixup_resume) \ -+ KEEP(*(.pci_fixup_resume)) \ - VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .; \ -- *(.pci_fixup_resume_early) \ -+ KEEP(*(.pci_fixup_resume_early)) \ - VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \ -- *(.pci_fixup_suspend) \ -+ KEEP(*(.pci_fixup_suspend)) \ - VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \ - VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .; \ -- *(.pci_fixup_suspend_late) \ -+ KEEP(*(.pci_fixup_suspend_late)) \ - VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .; \ - } \ - \ - /* Built-in firmware blobs */ \ - .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_builtin_fw) = .; \ -- *(.builtin_fw) \ -+ KEEP(*(.builtin_fw)) \ - VMLINUX_SYMBOL(__end_builtin_fw) = .; \ - } \ - \ -@@ -410,7 +411,7 @@ - \ - /* Kernel symbol table: strings */ \ - __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ -- KEEP(*(__ksymtab_strings)) \ -+ *(__ksymtab_strings) \ - } \ - \ - /* __*init sections */ \ -@@ -423,14 +424,14 @@ - /* Built-in module parameters. */ \ - __param : AT(ADDR(__param) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___param) = .; \ -- *(__param) \ -+ KEEP(*(__param)) \ - VMLINUX_SYMBOL(__stop___param) = .; \ - } \ - \ - /* Built-in module versions. */ \ - __modver : AT(ADDR(__modver) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___modver) = .; \ -- *(__modver) \ -+ KEEP(*(__modver)) \ - VMLINUX_SYMBOL(__stop___modver) = .; \ - . = ALIGN((align)); \ - VMLINUX_SYMBOL(__end_rodata) = .; \ -@@ -496,7 +497,7 @@ - #define ENTRY_TEXT \ - ALIGN_FUNCTION(); \ - VMLINUX_SYMBOL(__entry_text_start) = .; \ -- *(.entry.text) \ -+ KEEP(*(.entry.text)) \ - VMLINUX_SYMBOL(__entry_text_end) = .; - - #if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) -@@ -534,7 +535,7 @@ - . = ALIGN(align); \ - __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ex_table) = .; \ -- *(__ex_table) \ -+ KEEP(*(__ex_table)) \ - VMLINUX_SYMBOL(__stop___ex_table) = .; \ - } - -@@ -550,9 +551,9 @@ - #ifdef CONFIG_CONSTRUCTORS - #define KERNEL_CTORS() . = ALIGN(8); \ - VMLINUX_SYMBOL(__ctors_start) = .; \ -- *(.ctors) \ -+ KEEP(*(.ctors)) \ - *(SORT(.init_array.*)) \ -- *(.init_array) \ -+ KEEP(*(.init_array)) \ - VMLINUX_SYMBOL(__ctors_end) = .; - #else - #define KERNEL_CTORS() -@@ -609,7 +610,7 @@ - #define SBSS(sbss_align) \ - . = ALIGN(sbss_align); \ - .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ -- *(.sbss) \ -+ *(.sbss .sbss.*) \ - *(.scommon) \ - } - -@@ -676,7 +677,7 @@ - . = ALIGN(8); \ - __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___bug_table) = .; \ -- *(__bug_table) \ -+ KEEP(*(__bug_table)) \ - VMLINUX_SYMBOL(__stop___bug_table) = .; \ - } - #else -@@ -688,7 +689,7 @@ - . = ALIGN(4); \ - .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__tracedata_start) = .; \ -- *(.tracedata) \ -+ KEEP(*(.tracedata)) \ - VMLINUX_SYMBOL(__tracedata_end) = .; \ - } - #else -@@ -705,7 +706,7 @@ - #define INIT_SETUP(initsetup_align) \ - . = ALIGN(initsetup_align); \ - VMLINUX_SYMBOL(__setup_start) = .; \ -- *(.init.setup) \ -+ KEEP(*(.init.setup)) \ - VMLINUX_SYMBOL(__setup_end) = .; - - #define INIT_CALLS_LEVEL(level) \ diff --git a/target/linux/generic/hack-4.9/221-module_exports.patch b/target/linux/generic/hack-4.9/221-module_exports.patch deleted file mode 100644 index f357d73d6a..0000000000 --- a/target/linux/generic/hack-4.9/221-module_exports.patch +++ /dev/null @@ -1,101 +0,0 @@ -From b14784e7883390c20ed3ff904892255404a5914b Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:05:53 +0200 -Subject: add an optional config option for stripping all unnecessary symbol exports from the kernel image - -lede-commit: bb5a40c64b7c4f4848509fa0a6625055fc9e66cc -Signed-off-by: Felix Fietkau ---- - include/asm-generic/vmlinux.lds.h | 18 +++++++++++++++--- - include/linux/export.h | 9 ++++++++- - scripts/Makefile.build | 2 +- - 3 files changed, 24 insertions(+), 5 deletions(-) - ---- a/include/asm-generic/vmlinux.lds.h -+++ b/include/asm-generic/vmlinux.lds.h -@@ -54,6 +54,16 @@ - #define LOAD_OFFSET 0 - #endif - -+#ifndef SYMTAB_KEEP -+#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*))) -+#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*))) -+#endif -+ -+#ifndef SYMTAB_DISCARD -+#define SYMTAB_DISCARD -+#define SYMTAB_DISCARD_GPL -+#endif -+ - #include - - /* Align . to a 8 byte boundary equals to maximum function alignment. */ -@@ -342,14 +352,14 @@ - /* Kernel symbol table: Normal symbols */ \ - __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab) = .; \ -- KEEP(*(SORT(___ksymtab+*))) \ -+ SYMTAB_KEEP \ - VMLINUX_SYMBOL(__stop___ksymtab) = .; \ - } \ - \ - /* Kernel symbol table: GPL-only symbols */ \ - __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start___ksymtab_gpl) = .; \ -- KEEP(*(SORT(___ksymtab_gpl+*))) \ -+ SYMTAB_KEEP_GPL \ - VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \ - } \ - \ -@@ -411,7 +421,7 @@ - \ - /* Kernel symbol table: strings */ \ - __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ -- *(__ksymtab_strings) \ -+ *(__ksymtab_strings+*) \ - } \ - \ - /* __*init sections */ \ -@@ -763,6 +773,8 @@ - EXIT_TEXT \ - EXIT_DATA \ - EXIT_CALL \ -+ SYMTAB_DISCARD \ -+ SYMTAB_DISCARD_GPL \ - *(.discard) \ - *(.discard.*) \ - } ---- a/include/linux/export.h -+++ b/include/linux/export.h -@@ -53,12 +53,19 @@ extern struct module __this_module; - #define __CRC_SYMBOL(sym, sec) - #endif - -+#ifdef MODULE -+#define __EXPORT_SUFFIX(sym) -+#else -+#define __EXPORT_SUFFIX(sym) "+" #sym -+#endif -+ - /* For every exported symbol, place a struct in the __ksymtab section */ - #define ___EXPORT_SYMBOL(sym, sec) \ - extern typeof(sym) sym; \ - __CRC_SYMBOL(sym, sec) \ - static const char __kstrtab_##sym[] \ -- __attribute__((section("__ksymtab_strings"), aligned(1))) \ -+ __attribute__((section("__ksymtab_strings" \ -+ __EXPORT_SUFFIX(sym)), aligned(1))) \ - = VMLINUX_SYMBOL_STR(sym); \ - static const struct kernel_symbol __ksymtab_##sym \ - __used \ ---- a/scripts/Makefile.build -+++ b/scripts/Makefile.build -@@ -409,7 +409,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $( - # Linker scripts preprocessor (.lds.S -> .lds) - # --------------------------------------------------------------------------- - quiet_cmd_cpp_lds_S = LDS $@ -- cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \ -+ cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \ - -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $< - - $(obj)/%.lds: $(src)/%.lds.S FORCE diff --git a/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch b/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch deleted file mode 100644 index b3c444265d..0000000000 --- a/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b3d00b452467f621317953d9e4c6f9ae8dcfd271 Mon Sep 17 00:00:00 2001 -From: Imre Kaloz -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 ---- - lib/decompress.c | 1 + - scripts/Makefile.lib | 2 +- - scripts/gen_initramfs_list.sh | 10 +++++----- - 3 files changed, 7 insertions(+), 6 deletions(-) - ---- a/lib/decompress.c -+++ b/lib/decompress.c -@@ -48,6 +48,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 -@@ -344,7 +344,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) - - quiet_cmd_lzma = LZMA $@ - cmd_lzma = (cat $(filter-out FORCE,$^) | \ -- lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ -+ lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ - (rm -f $@ ; false) - - quiet_cmd_lzo = LZO $@ ---- a/scripts/gen_initramfs_list.sh -+++ b/scripts/gen_initramfs_list.sh -@@ -229,7 +229,7 @@ cpio_list= - output="/dev/stdout" - output_file="" - is_cpio_compressed= --compr="gzip -n -9 -f" -+compr="gzip -n -9 -f -" - - arg="$1" - case "$arg" in -@@ -245,13 +245,13 @@ case "$arg" in - output=${cpio_list} - echo "$output_file" | grep -q "\.gz$" \ - && [ -x "`which gzip 2> /dev/null`" ] \ -- && compr="gzip -n -9 -f" -+ && compr="gzip -n -9 -f -" - echo "$output_file" | grep -q "\.bz2$" \ - && [ -x "`which bzip2 2> /dev/null`" ] \ -- && compr="bzip2 -9 -f" -+ && compr="bzip2 -9 -f -" - echo "$output_file" | grep -q "\.lzma$" \ - && [ -x "`which lzma 2> /dev/null`" ] \ -- && compr="lzma -9 -f" -+ && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so" - echo "$output_file" | grep -q "\.xz$" \ - && [ -x "`which xz 2> /dev/null`" ] \ - && compr="xz --check=crc32 --lzma2=dict=1MiB" -@@ -318,7 +318,7 @@ if [ ! -z ${output_file} ]; then - if [ "${is_cpio_compressed}" = "compressed" ]; then - cat ${cpio_tfile} > ${output_file} - else -- (cat ${cpio_tfile} | ${compr} - > ${output_file}) \ -+ (cat ${cpio_tfile} | ${compr} > ${output_file}) \ - || (rm -f ${output_file} ; false) - fi - [ -z ${cpio_file} ] && rm ${cpio_tfile} diff --git a/target/linux/generic/hack-4.9/250-netfilter_depends.patch b/target/linux/generic/hack-4.9/250-netfilter_depends.patch deleted file mode 100644 index f6e1c1d303..0000000000 --- a/target/linux/generic/hack-4.9/250-netfilter_depends.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Felix Fietkau -Subject: hack: net: remove bogus netfilter dependencies - -lede-commit: 589d2a377dee27d206fc3725325309cf649e4df6 -Signed-off-by: Felix Fietkau ---- - net/netfilter/Kconfig | 2 -- - 1 file changed, 2 deletions(-) - ---- a/net/netfilter/Kconfig -+++ b/net/netfilter/Kconfig -@@ -218,7 +218,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 -@@ -968,7 +967,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 diff --git a/target/linux/generic/hack-4.9/251-sound_kconfig.patch b/target/linux/generic/hack-4.9/251-sound_kconfig.patch deleted file mode 100644 index d01bdfb9b3..0000000000 --- a/target/linux/generic/hack-4.9/251-sound_kconfig.patch +++ /dev/null @@ -1,195 +0,0 @@ -From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Fri, 7 Jul 2017 17:09:21 +0200 -Subject: kconfig: owrt specifc dependencies - -Signed-off-by: John Crispin ---- - 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 -@@ -32,7 +32,7 @@ config CRYPTO_FIPS - this is. - - config CRYPTO_ALGAPI -- tristate -+ tristate "ALGAPI" - select CRYPTO_ALGAPI2 - help - This option provides the API for cryptographic algorithms. -@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2 - tristate - - config CRYPTO_AEAD -- tristate -+ tristate "AEAD" - select CRYPTO_AEAD2 - select CRYPTO_ALGAPI - -@@ -52,7 +52,7 @@ config CRYPTO_AEAD2 - select CRYPTO_RNG2 - - config CRYPTO_BLKCIPHER -- tristate -+ tristate "BLKCIPHER" - select CRYPTO_BLKCIPHER2 - select CRYPTO_ALGAPI - -@@ -63,7 +63,7 @@ config CRYPTO_BLKCIPHER2 - select CRYPTO_WORKQUEUE - - config CRYPTO_HASH -- tristate -+ tristate "HASH" - select CRYPTO_HASH2 - select CRYPTO_ALGAPI - -@@ -72,7 +72,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 -@@ -17,6 +17,7 @@ config BCMA - config BCMA_BLOCKIO - bool - depends on BCMA -+ 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 -@@ -340,16 +340,16 @@ config BCH_CONST_T - # Textsearch support is select'ed if needed - # - config TEXTSEARCH -- bool -+ boolean "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 -@@ -10,7 +10,7 @@ config NETFILTER_INGRESS - infrastructure. - - config NETFILTER_NETLINK -- tristate -+ tristate "Netfilter NFNETLINK interface" - - config NETFILTER_NETLINK_ACCT - tristate "Netfilter NFACCT over NFNETLINK interface" ---- a/net/wireless/Kconfig -+++ b/net/wireless/Kconfig -@@ -1,5 +1,5 @@ - config WIRELESS_EXT -- bool -+ bool "Wireless extensions" - - config WEXT_CORE - def_bool y -@@ -11,10 +11,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" -@@ -188,7 +188,7 @@ config CFG80211_WEXT_EXPORT - wext compatibility symbols to be exported. - - config LIB80211 -- tristate -+ tristate "LIB80211" - default n - help - This options enables a library of common routines used -@@ -197,13 +197,16 @@ config LIB80211 - Drivers should select this themselves if needed. - - config LIB80211_CRYPT_WEP -- tristate -+ tristate "LIB80211_CRYPT_WEP" -+ select LIB80211 - - config LIB80211_CRYPT_CCMP -- tristate -+ tristate "LIB80211_CRYPT_CCMP" -+ select LIB80211 - - config LIB80211_CRYPT_TKIP -- tristate -+ tristate "LIB80211_CRYPT_TKIP" -+ select LIB80211 - - config LIB80211_DEBUG - bool "lib80211 debugging messages" ---- a/sound/core/Kconfig -+++ b/sound/core/Kconfig -@@ -16,13 +16,13 @@ config SND_DMAENGINE_PCM - tristate - - config SND_HWDEP -- tristate -+ tristate "Sound hardware support" - - config SND_RAWMIDI - tristate - - config SND_COMPRESS_OFFLOAD -- tristate -+ tristate "Compression offloading support" - - config SND_JACK - bool diff --git a/target/linux/generic/hack-4.9/259-regmap_dynamic.patch b/target/linux/generic/hack-4.9/259-regmap_dynamic.patch deleted file mode 100644 index a0d79e37bb..0000000000 --- a/target/linux/generic/hack-4.9/259-regmap_dynamic.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 811d9e2268a62b830cfe93cd8bc929afcb8b198b Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 15 Jul 2017 21:12:38 +0200 -Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules - -lede-commit: 96f39119815028073583e4fca3a9c5fe9141e998 -Signed-off-by: Felix Fietkau ---- - drivers/base/regmap/Kconfig | 15 ++++++++++----- - drivers/base/regmap/Makefile | 12 ++++++++---- - drivers/base/regmap/regmap.c | 3 +++ - include/linux/regmap.h | 2 +- - 4 files changed, 22 insertions(+), 10 deletions(-) - ---- a/drivers/base/regmap/Kconfig -+++ b/drivers/base/regmap/Kconfig -@@ -3,9 +3,8 @@ - # subsystems should select the appropriate symbols. - - config REGMAP -- default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ) - select IRQ_DOMAIN if REGMAP_IRQ -- bool -+ tristate - - config REGCACHE_COMPRESSED - select LZO_COMPRESS -@@ -17,18 +16,24 @@ config REGMAP_AC97 - - config REGMAP_I2C - tristate -+ select REGMAP - depends on I2C - - config REGMAP_SPI - tristate -+ select REGMAP -+ depends on SPI_MASTER - depends on SPI - - config REGMAP_SPMI -+ select REGMAP - tristate - depends on SPMI - - config REGMAP_MMIO - tristate -+ select REGMAP - - config REGMAP_IRQ -+ select REGMAP - bool ---- a/drivers/base/regmap/Makefile -+++ b/drivers/base/regmap/Makefile -@@ -1,10 +1,14 @@ - # For include/trace/define_trace.h to include trace.h - CFLAGS_regmap.o := -I$(src) - --obj-$(CONFIG_REGMAP) += regmap.o regcache.o --obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o --obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o --obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o -+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o -+ifdef CONFIG_DEBUG_FS -+regmap-core-objs += regmap-debugfs.o -+endif -+ifdef CONFIG_REGCACHE_COMPRESSED -+regmap-core-objs += regcache-lzo.o -+endif -+obj-$(CONFIG_REGMAP) += regmap-core.o - obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o - obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o - obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o ---- a/drivers/base/regmap/regmap.c -+++ b/drivers/base/regmap/regmap.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -2915,3 +2916,5 @@ static int __init regmap_initcall(void) - return 0; - } - postcore_initcall(regmap_initcall); -+ -+MODULE_LICENSE("GPL"); ---- a/include/linux/regmap.h -+++ b/include/linux/regmap.h -@@ -135,7 +135,7 @@ struct reg_sequence { - pollret ?: ((cond) ? 0 : -ETIMEDOUT); \ - }) - --#ifdef CONFIG_REGMAP -+#if IS_ENABLED(CONFIG_REGMAP) - - enum regmap_endian { - /* Unspecified -> 0 -> Backwards compatible default */ diff --git a/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch b/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch deleted file mode 100644 index f2570f5988..0000000000 --- a/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fd1799b0bf5efa46dd3e6dfbbf3955564807e508 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:12:51 +0200 -Subject: kernel: prevent cryptomgr from pulling in useless extra dependencies for tests that are not run - -Reduces kernel size after LZMA by about 5k on MIPS - -lede-commit: 044c316167e076479a344c59905e5b435b84a77f -Signed-off-by: Felix Fietkau ---- - crypto/Kconfig | 13 ++++++------- - crypto/algboss.c | 4 ++++ - 2 files changed, 10 insertions(+), 7 deletions(-) - ---- a/crypto/Kconfig -+++ b/crypto/Kconfig -@@ -132,12 +132,12 @@ config CRYPTO_MANAGER - cbc(aes). - - config CRYPTO_MANAGER2 -- def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) -- select CRYPTO_AEAD2 -- select CRYPTO_HASH2 -- select CRYPTO_BLKCIPHER2 -- select CRYPTO_AKCIPHER2 -- select CRYPTO_KPP2 -+ def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS) -+ select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS -+ select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS -+ select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS -+ select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS -+ select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS - - config CRYPTO_USER - tristate "Userspace cryptographic algorithm configuration" -@@ -150,7 +150,6 @@ config CRYPTO_USER - config CRYPTO_MANAGER_DISABLE_TESTS - bool "Disable run-time self tests" - default y -- depends on CRYPTO_MANAGER2 - help - Disable run-time self tests that normally take place at - algorithm registration. ---- a/crypto/algboss.c -+++ b/crypto/algboss.c -@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc - type = alg->cra_flags; - - /* This piece of crap needs to disappear into per-type test hooks. */ -+#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS -+ type |= CRYPTO_ALG_TESTED; -+#else - if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) & - CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) && - ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == - CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize : - alg->cra_ablkcipher.ivsize)) - type |= CRYPTO_ALG_TESTED; -+#endif - - param->type = type; - diff --git a/target/linux/generic/hack-4.9/280-rfkill-stubs.patch b/target/linux/generic/hack-4.9/280-rfkill-stubs.patch deleted file mode 100644 index b4dcb45cf0..0000000000 --- a/target/linux/generic/hack-4.9/280-rfkill-stubs.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 236c1acdfef5958010ac9814a9872e0a46fd78ee Mon Sep 17 00:00:00 2001 -From: John Crispin -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 ---- - 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 -@@ -51,7 +51,7 @@ obj-$(CONFIG_MAC80211) += mac80211/ - obj-$(CONFIG_TIPC) += tipc/ - obj-$(CONFIG_NETLABEL) += netlabel/ - obj-$(CONFIG_IUCV) += iucv/ --obj-$(CONFIG_RFKILL) += rfkill/ -+obj-$(CONFIG_RFKILL_FULL) += rfkill/ - obj-$(CONFIG_NET_9P) += 9p/ - obj-$(CONFIG_CAIF) += caif/ - ifneq ($(CONFIG_DCB),) ---- a/net/rfkill/Kconfig -+++ b/net/rfkill/Kconfig -@@ -1,7 +1,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 -@@ -13,19 +17,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_REGULATOR - tristate "Generic rfkill regulator driver" -- depends on RFKILL || !RFKILL -+ depends on RFKILL_FULL || !RFKILL_FULL - depends on REGULATOR - help - This options enable controlling radio transmitters connected to -@@ -36,7 +40,7 @@ config RFKILL_REGULATOR - - 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 -@@ -4,6 +4,6 @@ - - rfkill-y += core.o - rfkill-$(CONFIG_RFKILL_INPUT) += input.o --obj-$(CONFIG_RFKILL) += rfkill.o -+obj-$(CONFIG_RFKILL_FULL) += rfkill.o - obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o - obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o diff --git a/target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch b/target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch deleted file mode 100644 index 690b30ee9b..0000000000 --- a/target/linux/generic/hack-4.9/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Ben Menchaca -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 -Signed-off-by: Felix Fietkau ---- ---- a/arch/mips/include/asm/r4kcache.h -+++ b/arch/mips/include/asm/r4kcache.h -@@ -665,16 +665,48 @@ 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; \ - \ - __##pfx##flush_prologue \ - \ -- 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; \ - } \ - \ - __##pfx##flush_epilogue \ diff --git a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch deleted file mode 100644 index eb6011e813..0000000000 --- a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: John Crispin -Subject: hack: kernel: add generic image_cmdline hack to MIPS targets - -lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976 -Signed-off-by: Gabor Juhos ---- - arch/mips/Kconfig | 4 ++++ - arch/mips/kernel/head.S | 6 ++++++ - 2 files changed, 10 insertions(+) - ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -1158,6 +1158,10 @@ config SYNC_R4K - config MIPS_MACHINE - def_bool n - -+config IMAGE_CMDLINE_HACK -+ bool "OpenWrt specific image command line hack" -+ default n -+ - config NO_IOPORT_MAP - def_bool n - ---- a/arch/mips/kernel/head.S -+++ b/arch/mips/kernel/head.S -@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry) - j kernel_entry - #endif - -+#ifdef CONFIG_IMAGE_CMDLINE_HACK -+ .ascii "CMDLINE:" -+EXPORT(__image_cmdline) -+ .fill 0x400 -+#endif /* CONFIG_IMAGE_CMDLINE_HACK */ -+ - __REF - - NESTED(kernel_entry, 16, sp) # kernel entry point diff --git a/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch deleted file mode 100644 index 8c6ed8c207..0000000000 --- a/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 107c0964cb8db7ca28ac5199426414fdab3c274d Mon Sep 17 00:00:00 2001 -From: "Alexandros C. Couloumbis" -Date: Fri, 7 Jul 2017 17:14:51 +0200 -Subject: hack: arch: powerpc: drop register save/restore library from modules - -Upstream GCC uses a libgcc function for saving/restoring registers. This -makes the code bigger, and upstream kernels need to carry that function -for every single kernel module. Our GCC is patched to avoid those -references, so we can drop the extra bloat for modules. - -lede-commit: e8e1084654f50904e6bf77b70b2de3f137d7b3ec -Signed-off-by: Alexandros C. Couloumbis ---- - arch/powerpc/Makefile | 1 - - 1 file changed, 1 deletion(-) - ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -188,7 +188,6 @@ else - CHECKFLAGS += -D__LITTLE_ENDIAN__ - endif - --KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o - - ifeq ($(CONFIG_476FPE_ERR46),y) - KBUILD_LDFLAGS_MODULE += --ppc476-workaround \ diff --git a/target/linux/generic/hack-4.9/531-debloat_lzma.patch b/target/linux/generic/hack-4.9/531-debloat_lzma.patch deleted file mode 100644 index 2e453cc2f2..0000000000 --- a/target/linux/generic/hack-4.9/531-debloat_lzma.patch +++ /dev/null @@ -1,1040 +0,0 @@ -From 3fd297761ac246c54d7723c57fca95c112b99465 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 15 Jul 2017 21:15:44 +0200 -Subject: lzma: de-bloat the lzma library used by jffs2 - -lede-commit: 3fd1dd08fbcbb78b34efefd32c3032e5c99108d6 -Signed-off-by: Felix Fietkau ---- - include/linux/lzma/LzFind.h | 17 --- - include/linux/lzma/LzmaDec.h | 101 --------------- - include/linux/lzma/LzmaEnc.h | 20 --- - lib/lzma/LzFind.c | 287 ++++--------------------------------------- - lib/lzma/LzmaDec.c | 86 +------------ - lib/lzma/LzmaEnc.c | 172 ++------------------------ - 6 files changed, 42 insertions(+), 641 deletions(-) - ---- a/include/linux/lzma/LzFind.h -+++ b/include/linux/lzma/LzFind.h -@@ -55,11 +55,6 @@ typedef struct _CMatchFinder - - #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos) - --int MatchFinder_NeedMove(CMatchFinder *p); --Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p); --void MatchFinder_MoveBlock(CMatchFinder *p); --void MatchFinder_ReadIfRequired(CMatchFinder *p); -- - void MatchFinder_Construct(CMatchFinder *p); - - /* Conditions: -@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, - UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, - ISzAlloc *alloc); - void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); --void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems); --void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue); -- --UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son, -- UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue, -- UInt32 *distances, UInt32 maxLen); - - /* - Conditions: -@@ -102,12 +91,6 @@ typedef struct _IMatchFinder - - void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable); - --void MatchFinder_Init(CMatchFinder *p); --UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); --UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); --void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); --void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); -- - #ifdef __cplusplus - } - #endif ---- a/include/linux/lzma/LzmaDec.h -+++ b/include/linux/lzma/LzmaDec.h -@@ -31,14 +31,6 @@ typedef struct _CLzmaProps - UInt32 dicSize; - } CLzmaProps; - --/* LzmaProps_Decode - decodes properties --Returns: -- SZ_OK -- SZ_ERROR_UNSUPPORTED - Unsupported properties --*/ -- --SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size); -- - - /* ---------- LZMA Decoder state ---------- */ - -@@ -70,8 +62,6 @@ typedef struct - - #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; } - --void LzmaDec_Init(CLzmaDec *p); -- - /* There are two types of LZMA streams: - 0) Stream with end mark. That end mark adds about 6 bytes to compressed size. - 1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */ -@@ -108,97 +98,6 @@ typedef enum - - /* ELzmaStatus is used only as output value for function call */ - -- --/* ---------- Interfaces ---------- */ -- --/* There are 3 levels of interfaces: -- 1) Dictionary Interface -- 2) Buffer Interface -- 3) One Call Interface -- You can select any of these interfaces, but don't mix functions from different -- groups for same object. */ -- -- --/* There are two variants to allocate state for Dictionary Interface: -- 1) LzmaDec_Allocate / LzmaDec_Free -- 2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs -- You can use variant 2, if you set dictionary buffer manually. -- For Buffer Interface you must always use variant 1. -- --LzmaDec_Allocate* can return: -- SZ_OK -- SZ_ERROR_MEM - Memory allocation error -- SZ_ERROR_UNSUPPORTED - Unsupported properties --*/ -- --SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc); --void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc); -- --SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc); --void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc); -- --/* ---------- Dictionary Interface ---------- */ -- --/* You can use it, if you want to eliminate the overhead for data copying from -- dictionary to some other external buffer. -- You must work with CLzmaDec variables directly in this interface. -- -- STEPS: -- LzmaDec_Constr() -- LzmaDec_Allocate() -- for (each new stream) -- { -- LzmaDec_Init() -- while (it needs more decompression) -- { -- LzmaDec_DecodeToDic() -- use data from CLzmaDec::dic and update CLzmaDec::dicPos -- } -- } -- LzmaDec_Free() --*/ -- --/* LzmaDec_DecodeToDic -- -- The decoding to internal dictionary buffer (CLzmaDec::dic). -- You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! -- --finishMode: -- It has meaning only if the decoding reaches output limit (dicLimit). -- LZMA_FINISH_ANY - Decode just dicLimit bytes. -- LZMA_FINISH_END - Stream must be finished after dicLimit. -- --Returns: -- SZ_OK -- status: -- LZMA_STATUS_FINISHED_WITH_MARK -- LZMA_STATUS_NOT_FINISHED -- LZMA_STATUS_NEEDS_MORE_INPUT -- LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK -- SZ_ERROR_DATA - Data error --*/ -- --SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, -- const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); -- -- --/* ---------- Buffer Interface ---------- */ -- --/* It's zlib-like interface. -- See LzmaDec_DecodeToDic description for information about STEPS and return results, -- but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need -- to work with CLzmaDec variables manually. -- --finishMode: -- It has meaning only if the decoding reaches output limit (*destLen). -- LZMA_FINISH_ANY - Decode just destLen bytes. -- LZMA_FINISH_END - Stream must be finished after (*destLen). --*/ -- --SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, -- const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); -- -- - /* ---------- One Call Interface ---------- */ - - /* LzmaDecode ---- a/include/linux/lzma/LzmaEnc.h -+++ b/include/linux/lzma/LzmaEnc.h -@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps - } CLzmaEncProps; - - void LzmaEncProps_Init(CLzmaEncProps *p); --void LzmaEncProps_Normalize(CLzmaEncProps *p); --UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2); -- - - /* ---------- CLzmaEncHandle Interface ---------- */ - -@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc * - void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig); - SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props); - SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size); --SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, -- ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); - SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, - int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); - --/* ---------- One Call Interface ---------- */ -- --/* LzmaEncode --Return code: -- SZ_OK - OK -- SZ_ERROR_MEM - Memory allocation error -- SZ_ERROR_PARAM - Incorrect paramater -- SZ_ERROR_OUTPUT_EOF - output buffer overflow -- SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) --*/ -- --SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, -- const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, -- ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); -- - #ifdef __cplusplus - } - #endif ---- a/lib/lzma/LzFind.c -+++ b/lib/lzma/LzFind.c -@@ -14,9 +14,15 @@ - - #define kStartMaxLen 3 - -+#if 0 -+#define DIRECT_INPUT p->directInput -+#else -+#define DIRECT_INPUT 1 -+#endif -+ - static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc) - { -- if (!p->directInput) -+ if (!DIRECT_INPUT) - { - alloc->Free(alloc, p->bufferBase); - p->bufferBase = 0; -@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder - static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc) - { - UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv; -- if (p->directInput) -+ if (DIRECT_INPUT) - { - p->blockSize = blockSize; - return 1; -@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde - return (p->bufferBase != 0); - } - --Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; } --Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; } -+static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; } -+static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; } - --UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; } -+static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; } - --void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue) -+static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue) - { - p->posLimit -= subValue; - p->pos -= subValue; -@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch - { - if (p->streamEndWasReached || p->result != SZ_OK) - return; -- if (p->directInput) -+ if (DIRECT_INPUT) - { - UInt32 curSize = 0xFFFFFFFF - p->streamPos; - if (curSize > p->directInputRem) -@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch - } - } - --void MatchFinder_MoveBlock(CMatchFinder *p) -+static void MatchFinder_MoveBlock(CMatchFinder *p) - { - memmove(p->bufferBase, - p->buffer - p->keepSizeBefore, -@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder - p->buffer = p->bufferBase + p->keepSizeBefore; - } - --int MatchFinder_NeedMove(CMatchFinder *p) -+static int MatchFinder_NeedMove(CMatchFinder *p) - { -- if (p->directInput) -+ if (DIRECT_INPUT) - return 0; - /* if (p->streamEndWasReached) return 0; */ - return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter); - } - --void MatchFinder_ReadIfRequired(CMatchFinder *p) --{ -- if (p->streamEndWasReached) -- return; -- if (p->keepSizeAfter >= p->streamPos - p->pos) -- MatchFinder_ReadBlock(p); --} -- - static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p) - { - if (MatchFinder_NeedMove(p)) -@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch - p->posLimit = p->pos + limit; - } - --void MatchFinder_Init(CMatchFinder *p) -+static void MatchFinder_Init(CMatchFinder *p) - { - UInt32 i; - for (i = 0; i < p->hashSizeSum; i++) -@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM - return (p->pos - p->historySize - 1) & kNormalizeMask; - } - --void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems) -+static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems) - { - UInt32 i; - for (i = 0; i < numItems; i++) -@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat - MatchFinder_SetLimits(p); - } - --static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, -- UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, -- UInt32 *distances, UInt32 maxLen) --{ -- son[_cyclicBufferPos] = curMatch; -- for (;;) -- { -- UInt32 delta = pos - curMatch; -- if (cutValue-- == 0 || delta >= _cyclicBufferSize) -- return distances; -- { -- const Byte *pb = cur - delta; -- curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)]; -- if (pb[maxLen] == cur[maxLen] && *pb == *cur) -- { -- UInt32 len = 0; -- while (++len != lenLimit) -- if (pb[len] != cur[len]) -- break; -- if (maxLen < len) -- { -- *distances++ = maxLen = len; -- *distances++ = delta - 1; -- if (len == lenLimit) -- return distances; -- } -- } -- } -- } --} -- --UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, -+static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, - UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, - UInt32 *distances, UInt32 maxLen) - { -@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi - p->buffer++; \ - if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p); - --#define MOVE_POS_RET MOVE_POS return offset; -- - static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; } - -+#define MOVE_POS_RET MatchFinder_MovePos(p); return offset; -+ - #define GET_MATCHES_HEADER2(minLen, ret_op) \ - UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \ - lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \ -@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi - distances + offset, maxLen) - distances); MOVE_POS_RET; - - #define SKIP_FOOTER \ -- SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS; -- --static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) --{ -- UInt32 offset; -- GET_MATCHES_HEADER(2) -- HASH2_CALC; -- curMatch = p->hash[hashValue]; -- p->hash[hashValue] = p->pos; -- offset = 0; -- GET_MATCHES_FOOTER(offset, 1) --} -- --UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) --{ -- UInt32 offset; -- GET_MATCHES_HEADER(3) -- HASH_ZIP_CALC; -- curMatch = p->hash[hashValue]; -- p->hash[hashValue] = p->pos; -- offset = 0; -- GET_MATCHES_FOOTER(offset, 2) --} -- --static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) --{ -- UInt32 hash2Value, delta2, maxLen, offset; -- GET_MATCHES_HEADER(3) -- -- HASH3_CALC; -- -- delta2 = p->pos - p->hash[hash2Value]; -- curMatch = p->hash[kFix3HashSize + hashValue]; -- -- p->hash[hash2Value] = -- p->hash[kFix3HashSize + hashValue] = p->pos; -- -- -- maxLen = 2; -- offset = 0; -- if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) -- { -- for (; maxLen != lenLimit; maxLen++) -- if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) -- break; -- distances[0] = maxLen; -- distances[1] = delta2 - 1; -- offset = 2; -- if (maxLen == lenLimit) -- { -- SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); -- MOVE_POS_RET; -- } -- } -- GET_MATCHES_FOOTER(offset, maxLen) --} -+ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p); - - static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) - { -@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches - GET_MATCHES_FOOTER(offset, maxLen) - } - --static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) --{ -- UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; -- GET_MATCHES_HEADER(4) -- -- HASH4_CALC; -- -- delta2 = p->pos - p->hash[ hash2Value]; -- delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; -- curMatch = p->hash[kFix4HashSize + hashValue]; -- -- p->hash[ hash2Value] = -- p->hash[kFix3HashSize + hash3Value] = -- p->hash[kFix4HashSize + hashValue] = p->pos; -- -- maxLen = 1; -- offset = 0; -- if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) -- { -- distances[0] = maxLen = 2; -- distances[1] = delta2 - 1; -- offset = 2; -- } -- if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) -- { -- maxLen = 3; -- distances[offset + 1] = delta3 - 1; -- offset += 2; -- delta2 = delta3; -- } -- if (offset != 0) -- { -- for (; maxLen != lenLimit; maxLen++) -- if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) -- break; -- distances[offset - 2] = maxLen; -- if (maxLen == lenLimit) -- { -- p->son[p->cyclicBufferPos] = curMatch; -- MOVE_POS_RET; -- } -- } -- if (maxLen < 3) -- maxLen = 3; -- offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), -- distances + offset, maxLen) - (distances)); -- MOVE_POS_RET --} -- --UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) --{ -- UInt32 offset; -- GET_MATCHES_HEADER(3) -- HASH_ZIP_CALC; -- curMatch = p->hash[hashValue]; -- p->hash[hashValue] = p->pos; -- offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), -- distances, 2) - (distances)); -- MOVE_POS_RET --} -- --static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num) --{ -- do -- { -- SKIP_HEADER(2) -- HASH2_CALC; -- curMatch = p->hash[hashValue]; -- p->hash[hashValue] = p->pos; -- SKIP_FOOTER -- } -- while (--num != 0); --} -- --void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) --{ -- do -- { -- SKIP_HEADER(3) -- HASH_ZIP_CALC; -- curMatch = p->hash[hashValue]; -- p->hash[hashValue] = p->pos; -- SKIP_FOOTER -- } -- while (--num != 0); --} -- --static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num) --{ -- do -- { -- UInt32 hash2Value; -- SKIP_HEADER(3) -- HASH3_CALC; -- curMatch = p->hash[kFix3HashSize + hashValue]; -- p->hash[hash2Value] = -- p->hash[kFix3HashSize + hashValue] = p->pos; -- SKIP_FOOTER -- } -- while (--num != 0); --} -- - static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) - { - do -@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF - while (--num != 0); - } - --static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) --{ -- do -- { -- UInt32 hash2Value, hash3Value; -- SKIP_HEADER(4) -- HASH4_CALC; -- curMatch = p->hash[kFix4HashSize + hashValue]; -- p->hash[ hash2Value] = -- p->hash[kFix3HashSize + hash3Value] = -- p->hash[kFix4HashSize + hashValue] = p->pos; -- p->son[p->cyclicBufferPos] = curMatch; -- MOVE_POS -- } -- while (--num != 0); --} -- --void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) --{ -- do -- { -- SKIP_HEADER(3) -- HASH_ZIP_CALC; -- curMatch = p->hash[hashValue]; -- p->hash[hashValue] = p->pos; -- p->son[p->cyclicBufferPos] = curMatch; -- MOVE_POS -- } -- while (--num != 0); --} -- - void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable) - { - vTable->Init = (Mf_Init_Func)MatchFinder_Init; - vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte; - vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes; - vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos; -- if (!p->btMode) -- { -- vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches; -- vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip; -- } -- else if (p->numHashBytes == 2) -- { -- vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches; -- vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip; -- } -- else if (p->numHashBytes == 3) -- { -- vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches; -- vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip; -- } -- else -- { -- vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches; -- vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; -- } -+ vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches; -+ vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; - } ---- a/lib/lzma/LzmaDec.c -+++ b/lib/lzma/LzmaDec.c -@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, - p->needFlush = 0; - } - --void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) -+static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) - { - p->needFlush = 1; - p->remainLen = 0; -@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p - p->needInitState = 1; - } - --void LzmaDec_Init(CLzmaDec *p) -+static void LzmaDec_Init(CLzmaDec *p) - { - p->dicPos = 0; - LzmaDec_InitDicAndState(p, True, True); -@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD - p->needInitState = 0; - } - --SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, -+static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, - ELzmaFinishMode finishMode, ELzmaStatus *status) - { - SizeT inSize = *srcLen; -@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si - return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA; - } - --SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status) --{ -- SizeT outSize = *destLen; -- SizeT inSize = *srcLen; -- *srcLen = *destLen = 0; -- for (;;) -- { -- SizeT inSizeCur = inSize, outSizeCur, dicPos; -- ELzmaFinishMode curFinishMode; -- SRes res; -- if (p->dicPos == p->dicBufSize) -- p->dicPos = 0; -- dicPos = p->dicPos; -- if (outSize > p->dicBufSize - dicPos) -- { -- outSizeCur = p->dicBufSize; -- curFinishMode = LZMA_FINISH_ANY; -- } -- else -- { -- outSizeCur = dicPos + outSize; -- curFinishMode = finishMode; -- } -- -- res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status); -- src += inSizeCur; -- inSize -= inSizeCur; -- *srcLen += inSizeCur; -- outSizeCur = p->dicPos - dicPos; -- memcpy(dest, p->dic + dicPos, outSizeCur); -- dest += outSizeCur; -- outSize -= outSizeCur; -- *destLen += outSizeCur; -- if (res != 0) -- return res; -- if (outSizeCur == 0 || outSize == 0) -- return SZ_OK; -- } --} -- --void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) -+static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) - { - alloc->Free(alloc, p->probs); - p->probs = 0; - } - --static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc) --{ -- alloc->Free(alloc, p->dic); -- p->dic = 0; --} -- --void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc) --{ -- LzmaDec_FreeProbs(p, alloc); -- LzmaDec_FreeDict(p, alloc); --} -- --SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size) -+static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size) - { - UInt32 dicSize; - Byte d; -@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma - return SZ_OK; - } - --SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) -+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) - { - CLzmaProps propNew; - RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, - p->prop = propNew; - return SZ_OK; - } -- --SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) --{ -- CLzmaProps propNew; -- SizeT dicBufSize; -- RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); -- dicBufSize = propNew.dicSize; -- if (p->dic == 0 || dicBufSize != p->dicBufSize) -- { -- LzmaDec_FreeDict(p, alloc); -- p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize); -- if (p->dic == 0) -- { -- LzmaDec_FreeProbs(p, alloc); -- return SZ_ERROR_MEM; -- } -- } -- p->dicBufSize = dicBufSize; -- p->prop = propNew; -- return SZ_OK; --} - - SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, - const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, ---- a/lib/lzma/LzmaEnc.c -+++ b/lib/lzma/LzmaEnc.c -@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p) - p->writeEndMark = 0; - } - --void LzmaEncProps_Normalize(CLzmaEncProps *p) -+static void LzmaEncProps_Normalize(CLzmaEncProps *p) - { - int level = p->level; - if (level < 0) level = 5; -@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp - #endif - } - --UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2) -+static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2) - { - CLzmaEncProps props = *props2; - LzmaEncProps_Normalize(&props); -@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL - - #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); } - --UInt32 GetPosSlot1(UInt32 pos) -+static UInt32 GetPosSlot1(UInt32 pos) - { - UInt32 res; - BSR2_RET(pos, res); -@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos) - #define kNumLogBits (9 + (int)sizeof(size_t) / 2) - #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7) - --void LzmaEnc_FastPosInit(Byte *g_FastPos) -+static void LzmaEnc_FastPosInit(Byte *g_FastPos) - { - int c = 2, slotFast; - g_FastPos[0] = 0; -@@ -339,58 +339,6 @@ typedef struct - CSaveState saveState; - } CLzmaEnc; - --void LzmaEnc_SaveState(CLzmaEncHandle pp) --{ -- CLzmaEnc *p = (CLzmaEnc *)pp; -- CSaveState *dest = &p->saveState; -- int i; -- dest->lenEnc = p->lenEnc; -- dest->repLenEnc = p->repLenEnc; -- dest->state = p->state; -- -- for (i = 0; i < kNumStates; i++) -- { -- memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); -- memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); -- } -- for (i = 0; i < kNumLenToPosStates; i++) -- memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); -- memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); -- memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); -- memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); -- memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); -- memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); -- memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); -- memcpy(dest->reps, p->reps, sizeof(p->reps)); -- memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb)); --} -- --void LzmaEnc_RestoreState(CLzmaEncHandle pp) --{ -- CLzmaEnc *dest = (CLzmaEnc *)pp; -- const CSaveState *p = &dest->saveState; -- int i; -- dest->lenEnc = p->lenEnc; -- dest->repLenEnc = p->repLenEnc; -- dest->state = p->state; -- -- for (i = 0; i < kNumStates; i++) -- { -- memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); -- memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); -- } -- for (i = 0; i < kNumLenToPosStates; i++) -- memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); -- memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); -- memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); -- memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); -- memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); -- memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); -- memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); -- memcpy(dest->reps, p->reps, sizeof(p->reps)); -- memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb)); --} -- - SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2) - { - CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE - while (symbol < 0x10000); - } - --void LzmaEnc_InitPriceTables(UInt32 *ProbPrices) -+static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices) - { - UInt32 i; - for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits)) -@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc - p->matchPriceCount = 0; - } - --void LzmaEnc_Construct(CLzmaEnc *p) -+static void LzmaEnc_Construct(CLzmaEnc *p) - { - RangeEnc_Construct(&p->rc); - MatchFinder_Construct(&p->matchFinderBase); -@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc * - return p; - } - --void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc) -+static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc) - { - alloc->Free(alloc, p->litProbs); - alloc->Free(alloc, p->saveState.litProbs); -@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl - p->saveState.litProbs = 0; - } - --void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig) -+static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig) - { - #ifndef _7ZIP_ST - MatchFinderMt_Destruct(&p->matchFinderMt, allocBig); -@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U - return SZ_OK; - } - --void LzmaEnc_Init(CLzmaEnc *p) -+static void LzmaEnc_Init(CLzmaEnc *p) - { - UInt32 i; - p->state = 0; -@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p) - p->lpMask = (1 << p->lp) - 1; - } - --void LzmaEnc_InitPrices(CLzmaEnc *p) -+static void LzmaEnc_InitPrices(CLzmaEnc *p) - { - if (!p->fastMode) - { -@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn - return SZ_OK; - } - --static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, -- ISzAlloc *alloc, ISzAlloc *allocBig) --{ -- CLzmaEnc *p = (CLzmaEnc *)pp; -- p->matchFinderBase.stream = inStream; -- p->needInit = 1; -- p->rc.outStream = outStream; -- return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig); --} -- --SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, -- ISeqInStream *inStream, UInt32 keepWindowSize, -- ISzAlloc *alloc, ISzAlloc *allocBig) --{ -- CLzmaEnc *p = (CLzmaEnc *)pp; -- p->matchFinderBase.stream = inStream; -- p->needInit = 1; -- return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); --} -- - static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen) - { - p->matchFinderBase.directInput = 1; -@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc - p->matchFinderBase.directInputRem = srcLen; - } - --SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen, -+static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen, - UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) - { - CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p - return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); - } - --void LzmaEnc_Finish(CLzmaEncHandle pp) -+static void LzmaEnc_Finish(CLzmaEncHandle pp) - { - #ifndef _7ZIP_ST - CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo - return size; - } - -- --UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp) --{ -- const CLzmaEnc *p = (CLzmaEnc *)pp; -- return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); --} -- --const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp) --{ -- const CLzmaEnc *p = (CLzmaEnc *)pp; -- return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; --} -- --SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit, -- Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize) --{ -- CLzmaEnc *p = (CLzmaEnc *)pp; -- UInt64 nowPos64; -- SRes res; -- CSeqOutStreamBuf outStream; -- -- outStream.funcTable.Write = MyWrite; -- outStream.data = dest; -- outStream.rem = *destLen; -- outStream.overflow = False; -- -- p->writeEndMark = False; -- p->finished = False; -- p->result = SZ_OK; -- -- if (reInit) -- LzmaEnc_Init(p); -- LzmaEnc_InitPrices(p); -- nowPos64 = p->nowPos64; -- RangeEnc_Init(&p->rc); -- p->rc.outStream = &outStream.funcTable; -- -- res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize); -- -- *unpackSize = (UInt32)(p->nowPos64 - nowPos64); -- *destLen -= outStream.rem; -- if (outStream.overflow) -- return SZ_ERROR_OUTPUT_EOF; -- -- return res; --} -- - static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress) - { - SRes res = SZ_OK; -@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p, - return res; - } - --SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress, -- ISzAlloc *alloc, ISzAlloc *allocBig) --{ -- RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig)); -- return LzmaEnc_Encode2((CLzmaEnc *)pp, progress); --} -- - SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size) - { - CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp - return SZ_ERROR_OUTPUT_EOF; - return res; - } -- --SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, -- const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, -- ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) --{ -- CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc); -- SRes res; -- if (p == 0) -- return SZ_ERROR_MEM; -- -- res = LzmaEnc_SetProps(p, props); -- if (res == SZ_OK) -- { -- res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize); -- if (res == SZ_OK) -- res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen, -- writeEndMark, progress, alloc, allocBig); -- } -- -- LzmaEnc_Destroy(p, alloc, allocBig); -- return res; --} diff --git a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch deleted file mode 100644 index 819314f74a..0000000000 --- a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:18:54 +0200 -Subject: bridge: only accept EAP locally - -When bridging, do not forward EAP frames to other ports, only deliver -them locally, regardless of the state. - -Signed-off-by: Felix Fietkau -[add disable_eap_hack sysfs attribute] -Signed-off-by: Etienne Champetier ---- - ---- a/net/bridge/br_input.c -+++ b/net/bridge/br_input.c -@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *n - } - } - -+ BR_INPUT_SKB_CB(skb)->brdev = br->dev; -+ -+ if (skb->protocol == htons(ETH_P_PAE) && !br->disable_eap_hack) -+ return br_pass_frame_up(skb); -+ - if (p->state == BR_STATE_LEARNING) - goto drop; - -- BR_INPUT_SKB_CB(skb)->brdev = br->dev; -- - if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) - br_do_proxy_arp(skb, br, vid, p); - ---- a/net/bridge/br_private.h -+++ b/net/bridge/br_private.h -@@ -295,6 +295,8 @@ struct net_bridge - u16 group_fwd_mask; - u16 group_fwd_mask_required; - -+ bool disable_eap_hack; -+ - /* STP */ - bridge_id designated_root; - bridge_id bridge_id; ---- a/net/bridge/br_sysfs_br.c -+++ b/net/bridge/br_sysfs_br.c -@@ -169,6 +169,30 @@ static ssize_t group_fwd_mask_store(stru - } - static DEVICE_ATTR_RW(group_fwd_mask); - -+static ssize_t disable_eap_hack_show(struct device *d, -+ struct device_attribute *attr, -+ char *buf) -+{ -+ struct net_bridge *br = to_bridge(d); -+ return sprintf(buf, "%u\n", br->disable_eap_hack); -+} -+ -+static int set_disable_eap_hack(struct net_bridge *br, unsigned long val) -+{ -+ br->disable_eap_hack = !!val; -+ -+ return 0; -+} -+ -+static ssize_t disable_eap_hack_store(struct device *d, -+ struct device_attribute *attr, -+ const char *buf, -+ size_t len) -+{ -+ return store_bridge_parm(d, buf, len, set_disable_eap_hack); -+} -+static DEVICE_ATTR_RW(disable_eap_hack); -+ - static ssize_t priority_show(struct device *d, struct device_attribute *attr, - char *buf) - { -@@ -780,6 +804,7 @@ static struct attribute *bridge_attrs[] - &dev_attr_ageing_time.attr, - &dev_attr_stp_state.attr, - &dev_attr_group_fwd_mask.attr, -+ &dev_attr_disable_eap_hack.attr, - &dev_attr_priority.attr, - &dev_attr_bridge_id.attr, - &dev_attr_root_id.attr, diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch deleted file mode 100644 index a436dd2b1e..0000000000 --- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch +++ /dev/null @@ -1,76 +0,0 @@ -From e988390850731aa1697ed09d47b0932fac1af175 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:20:03 +0200 -Subject: bridge: port isolate - -Isolating individual bridge ports - -Signed-off-by: Felix Fietkau ---- - include/linux/if_bridge.h | 1 + - net/bridge/br_forward.c | 5 +++++ - net/bridge/br_input.c | 3 +++ - net/bridge/br_sysfs_if.c | 2 ++ - 4 files changed, 11 insertions(+) - ---- a/include/linux/if_bridge.h -+++ b/include/linux/if_bridge.h -@@ -47,6 +47,7 @@ struct br_ip_list { - #define BR_PROXYARP_WIFI BIT(10) - #define BR_MCAST_FLOOD BIT(11) - #define BR_MULTICAST_TO_UNICAST BIT(12) -+#define BR_ISOLATE_MODE BIT(13) - - #define BR_DEFAULT_AGEING_TIME (300 * HZ) - ---- a/net/bridge/br_forward.c -+++ b/net/bridge/br_forward.c -@@ -140,6 +140,9 @@ static int deliver_clone(const struct ne - void br_forward(const struct net_bridge_port *to, - struct sk_buff *skb, bool local_rcv, bool local_orig) - { -+ if (to->flags & BR_ISOLATE_MODE && !local_orig) -+ to = NULL; -+ - if (to && should_deliver(to, skb)) { - if (local_rcv) - deliver_clone(to, skb, local_orig); -@@ -205,6 +208,8 @@ void br_flood(struct net_bridge *br, str - struct net_bridge_port *p; - - list_for_each_entry_rcu(p, &br->port_list, list) { -+ if (!local_orig && (p->flags & BR_ISOLATE_MODE)) -+ continue; - /* Do not flood unicast traffic to ports that turn it off */ - if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD)) - continue; ---- a/net/bridge/br_input.c -+++ b/net/bridge/br_input.c -@@ -175,6 +175,9 @@ int br_handle_frame_finish(struct net *n - if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) - br_do_proxy_arp(skb, br, vid, p); - -+ if (p->flags & BR_ISOLATE_MODE) -+ return br_pass_frame_up(skb); -+ - switch (pkt_type) { - case BR_PKT_MULTICAST: - mdst = br_mdb_get(br, skb, vid); ---- a/net/bridge/br_sysfs_if.c -+++ b/net/bridge/br_sysfs_if.c -@@ -172,6 +172,7 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD - BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP); - BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI); - BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD); -+BRPORT_ATTR_FLAG(isolated, BR_ISOLATE_MODE); - - #ifdef CONFIG_BRIDGE_IGMP_SNOOPING - static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf) -@@ -220,6 +221,7 @@ static const struct brport_attribute *br - &brport_attr_proxyarp, - &brport_attr_proxyarp_wifi, - &brport_attr_multicast_flood, -+ &brport_attr_isolated, - NULL - }; - diff --git a/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch b/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch deleted file mode 100644 index a4699ae8ed..0000000000 --- a/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001 -From: Imre Kaloz -Date: Fri, 7 Jul 2017 17:21:05 +0200 -Subject: mac80211: increase wireless mesh header size - -lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1 -Signed-off-by: Imre Kaloz ---- - include/linux/netdevice.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -137,8 +137,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 diff --git a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch b/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch deleted file mode 100644 index db77f691e7..0000000000 --- a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a6ccb238939b25851474a279b20367fd24a0e816 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -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 ---- - 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 -@@ -485,7 +485,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)); - get_random_bytes(&q->perturbation, sizeof(q->perturbation)); diff --git a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch deleted file mode 100644 index 22d5a3893a..0000000000 --- a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1d418f7e88035ed7a94073f6354246c66e9193e9 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:22:58 +0200 -Subject: fq_codel: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast - -Signed-off-by: Felix Fietkau ---- - include/net/sch_generic.h | 3 ++- - net/sched/Kconfig | 3 ++- - net/sched/sch_api.c | 2 +- - net/sched/sch_fq_codel.c | 3 ++- - net/sched/sch_generic.c | 4 ++-- - 5 files changed, 9 insertions(+), 6 deletions(-) - ---- a/include/net/sch_generic.h -+++ b/include/net/sch_generic.h -@@ -344,12 +344,13 @@ extern struct Qdisc_ops noop_qdisc_ops; - extern struct Qdisc_ops pfifo_fast_ops; - extern struct Qdisc_ops mq_qdisc_ops; - extern struct Qdisc_ops noqueue_qdisc_ops; -+extern struct Qdisc_ops fq_codel_qdisc_ops; - extern const struct Qdisc_ops *default_qdisc_ops; - static inline const struct Qdisc_ops * - get_default_qdisc_ops(const struct net_device *dev, int ntx) - { - return ntx < dev->real_num_tx_queues ? -- default_qdisc_ops : &pfifo_fast_ops; -+ default_qdisc_ops : &fq_codel_qdisc_ops; - } - - struct Qdisc_class_common { ---- a/net/sched/Kconfig -+++ b/net/sched/Kconfig -@@ -3,8 +3,9 @@ - # - - menuconfig NET_SCHED -- bool "QoS and/or fair queueing" -+ def_bool y - select NET_SCH_FIFO -+ select NET_SCH_FQ_CODEL - ---help--- - When the kernel has several packets to send out over a network - device, it has to decide which ones to send first, which ones to ---- a/net/sched/sch_api.c -+++ b/net/sched/sch_api.c -@@ -1977,7 +1977,7 @@ static int __init pktsched_init(void) - return err; - } - -- register_qdisc(&pfifo_fast_ops); -+ register_qdisc(&fq_codel_qdisc_ops); - register_qdisc(&pfifo_qdisc_ops); - register_qdisc(&bfifo_qdisc_ops); - register_qdisc(&pfifo_head_drop_qdisc_ops); ---- a/net/sched/sch_fq_codel.c -+++ b/net/sched/sch_fq_codel.c -@@ -715,7 +715,7 @@ static const struct Qdisc_class_ops fq_c - .walk = fq_codel_walk, - }; - --static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = { -+struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = { - .cl_ops = &fq_codel_class_ops, - .id = "fq_codel", - .priv_size = sizeof(struct fq_codel_sched_data), -@@ -730,6 +730,7 @@ static struct Qdisc_ops fq_codel_qdisc_o - .dump_stats = fq_codel_dump_stats, - .owner = THIS_MODULE, - }; -+EXPORT_SYMBOL(fq_codel_qdisc_ops); - - static int __init fq_codel_module_init(void) - { ---- a/net/sched/sch_generic.c -+++ b/net/sched/sch_generic.c -@@ -31,7 +31,7 @@ - #include - - /* Qdisc to use by default */ --const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops; -+const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops; - EXPORT_SYMBOL(default_qdisc_ops); - - /* Main transmission queue. */ -@@ -764,7 +764,7 @@ static void attach_one_default_qdisc(str - void *_unused) - { - struct Qdisc *qdisc; -- const struct Qdisc_ops *ops = default_qdisc_ops; -+ const struct Qdisc_ops *ops = &fq_codel_qdisc_ops; - - if (dev->priv_flags & IFF_NO_QUEUE) - ops = &noqueue_qdisc_ops; diff --git a/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch b/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch deleted file mode 100644 index d9fba6288d..0000000000 --- a/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch +++ /dev/null @@ -1,159 +0,0 @@ -From b531d492d5ef1cf9dba0f4888eb5fd8624a6d762 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:23:42 +0200 -Subject: net: sched: switch default qdisc from pfifo_fast to fq_codel and remove pfifo_fast - -Signed-off-by: Felix Fietkau ---- - net/sched/sch_generic.c | 140 ------------------------------------------------ - 1 file changed, 140 deletions(-) - ---- a/net/sched/sch_generic.c -+++ b/net/sched/sch_generic.c -@@ -449,146 +449,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea - .owner = THIS_MODULE, - }; - --static const u8 prio2band[TC_PRIO_MAX + 1] = { -- 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1 --}; -- --/* 3-band FIFO queue: old style, but should be a bit faster than -- generic prio+fifo combination. -- */ -- --#define PFIFO_FAST_BANDS 3 -- --/* -- * Private data for a pfifo_fast scheduler containing: -- * - queues for the three band -- * - bitmap indicating which of the bands contain skbs -- */ --struct pfifo_fast_priv { -- u32 bitmap; -- struct qdisc_skb_head q[PFIFO_FAST_BANDS]; --}; -- --/* -- * Convert a bitmap to the first band number where an skb is queued, where: -- * bitmap=0 means there are no skbs on any band. -- * bitmap=1 means there is an skb on band 0. -- * bitmap=7 means there are skbs on all 3 bands, etc. -- */ --static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0}; -- --static inline struct qdisc_skb_head *band2list(struct pfifo_fast_priv *priv, -- int band) --{ -- return priv->q + band; --} -- --static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc, -- struct sk_buff **to_free) --{ -- if (qdisc->q.qlen < qdisc_dev(qdisc)->tx_queue_len) { -- int band = prio2band[skb->priority & TC_PRIO_MAX]; -- struct pfifo_fast_priv *priv = qdisc_priv(qdisc); -- struct qdisc_skb_head *list = band2list(priv, band); -- -- priv->bitmap |= (1 << band); -- qdisc->q.qlen++; -- return __qdisc_enqueue_tail(skb, qdisc, list); -- } -- -- return qdisc_drop(skb, qdisc, to_free); --} -- --static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc) --{ -- struct pfifo_fast_priv *priv = qdisc_priv(qdisc); -- int band = bitmap2band[priv->bitmap]; -- -- if (likely(band >= 0)) { -- struct qdisc_skb_head *qh = band2list(priv, band); -- struct sk_buff *skb = __qdisc_dequeue_head(qh); -- -- if (likely(skb != NULL)) { -- qdisc_qstats_backlog_dec(qdisc, skb); -- qdisc_bstats_update(qdisc, skb); -- } -- -- qdisc->q.qlen--; -- if (qh->qlen == 0) -- priv->bitmap &= ~(1 << band); -- -- return skb; -- } -- -- return NULL; --} -- --static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc) --{ -- struct pfifo_fast_priv *priv = qdisc_priv(qdisc); -- int band = bitmap2band[priv->bitmap]; -- -- if (band >= 0) { -- struct qdisc_skb_head *qh = band2list(priv, band); -- -- return qh->head; -- } -- -- return NULL; --} -- --static void pfifo_fast_reset(struct Qdisc *qdisc) --{ -- int prio; -- struct pfifo_fast_priv *priv = qdisc_priv(qdisc); -- -- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) -- __qdisc_reset_queue(band2list(priv, prio)); -- -- priv->bitmap = 0; -- qdisc->qstats.backlog = 0; -- qdisc->q.qlen = 0; --} -- --static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb) --{ -- struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS }; -- -- memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1); -- if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt)) -- goto nla_put_failure; -- return skb->len; -- --nla_put_failure: -- return -1; --} -- --static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt) --{ -- int prio; -- struct pfifo_fast_priv *priv = qdisc_priv(qdisc); -- -- for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) -- qdisc_skb_head_init(band2list(priv, prio)); -- -- /* Can by-pass the queue discipline */ -- qdisc->flags |= TCQ_F_CAN_BYPASS; -- return 0; --} -- --struct Qdisc_ops pfifo_fast_ops __read_mostly = { -- .id = "pfifo_fast", -- .priv_size = sizeof(struct pfifo_fast_priv), -- .enqueue = pfifo_fast_enqueue, -- .dequeue = pfifo_fast_dequeue, -- .peek = pfifo_fast_peek, -- .init = pfifo_fast_init, -- .reset = pfifo_fast_reset, -- .dump = pfifo_fast_dump, -- .owner = THIS_MODULE, --}; --EXPORT_SYMBOL(pfifo_fast_ops); -- - static struct lock_class_key qdisc_tx_busylock; - static struct lock_class_key qdisc_running_key; - diff --git a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch deleted file mode 100644 index af8840fde2..0000000000 --- a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 36e516290611e613aa92996cb4339561452695b4 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:24:23 +0200 -Subject: net: swconfig: adds openwrt switch layer - -Signed-off-by: Felix Fietkau ---- - 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 -@@ -147,6 +147,89 @@ config MDIO_XGENE - This module provides a driver for the MDIO busses found in the - APM X-Gene SoC's. - -+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 switches" -+ select ETHERNET_PACKET_MANGLE -+ select SWCONFIG -+ -+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 MVSWITCH_PHY -+ tristate "Driver for Marvell 88E6060 switches" -+ select ETHERNET_PACKET_MANGLE -+ -+config MVSW61XX_PHY -+ tristate "Driver for Marvell 88E6171/6172 switches" -+ select SWCONFIG -+ -+config PSB6970_PHY -+ tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch" -+ select SWCONFIG -+ select ETHERNET_PACKET_MANGLE -+ -+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 -@@ -5,6 +5,21 @@ libphy-$(CONFIG_SWPHY) += swphy.o - - obj-$(CONFIG_PHYLIB) += libphy.o - -+obj-$(CONFIG_SWCONFIG) += swconfig.o -+obj-$(CONFIG_ADM6996_PHY) += adm6996.o -+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o -+obj-$(CONFIG_SWCONFIG_B53) += b53/ -+obj-$(CONFIG_IP17XX_PHY) += ip17xx.o -+obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o -+obj-$(CONFIG_MVSW61XX_PHY) += mvsw61xx.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_MDIO_BCM_IPROC) += mdio-bcm-iproc.o - obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o - obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o ---- a/include/uapi/linux/Kbuild -+++ b/include/uapi/linux/Kbuild -@@ -399,6 +399,7 @@ header-y += stddef.h - header-y += string.h - header-y += suspend_ioctls.h - header-y += swab.h -+header-y += switch.h - header-y += synclink.h - header-y += sync_file.h - header-y += sysctl.h ---- a/include/linux/platform_data/b53.h -+++ b/include/linux/platform_data/b53.h -@@ -25,6 +25,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; diff --git a/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch deleted file mode 100644 index b58584091b..0000000000 --- a/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -495,6 +495,12 @@ struct phy_driver { - /* Determines the negotiated speed and duplex */ - int (*read_status)(struct phy_device *phydev); - -+ /* -+ * Update the value in phydev->link to reflect the -+ * current link value -+ */ -+ int (*update_link)(struct phy_device *phydev); -+ - /* Clears any pending interrupts */ - int (*ack_interrupt)(struct phy_device *phydev); - ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -1315,6 +1315,9 @@ int genphy_update_link(struct phy_device - { - int status; - -+ if (phydev->drv && phydev->drv->update_link) -+ return phydev->drv->update_link(phydev); -+ - /* Do a fake read */ - status = phy_read(phydev, MII_BMSR); - if (status < 0) diff --git a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch deleted file mode 100644 index 844f747859..0000000000 --- a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch +++ /dev/null @@ -1,197 +0,0 @@ ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -80,6 +80,8 @@ bool mdiobus_is_registered_device(struct - } - EXPORT_SYMBOL(mdiobus_is_registered_device); - -+#include "mdio-boardinfo.h" -+ - /** - * mdiobus_alloc_size - allocate a mii_bus structure - * @size: extra amount of memory to allocate for private storage. -@@ -400,6 +402,17 @@ void mdiobus_free(struct mii_bus *bus) - } - EXPORT_SYMBOL(mdiobus_free); - -+static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus, -+ struct phy_device *phydev, -+ struct mdio_board_info *bi) -+{ -+ if (strcmp(bus->id, bi->bus_id) || -+ bi->phy_addr != phydev->mdio.addr) -+ return; -+ -+ phydev->mdio.dev.platform_data = (void *) bi->platform_data; -+} -+ - /** - * mdiobus_scan - scan a bus for MDIO devices. - * @bus: mii_bus to scan -@@ -415,6 +428,7 @@ EXPORT_SYMBOL(mdiobus_free); - struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) - { - struct phy_device *phydev; -+ struct mdio_board_entry *be; - int err; - - phydev = get_phy_device(bus, addr, false); -@@ -427,6 +441,12 @@ struct phy_device *mdiobus_scan(struct m - */ - of_mdiobus_link_mdiodev(bus, &phydev->mdio); - -+ mutex_lock(&__mdio_board_lock); -+ list_for_each_entry(be, &__mdio_board_list, list) -+ mdiobus_setup_phydev_from_boardinfo(bus, phydev, -+ &be->board_info); -+ mutex_unlock(&__mdio_board_lock); -+ - err = phy_device_register(phydev); - if (err) { - phy_device_free(phydev); ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -870,6 +870,23 @@ void mdio_bus_exit(void); - - extern struct bus_type mdio_bus_type; - -+struct mdio_board_info { -+ const char *bus_id; -+ int phy_addr; -+ -+ const void *platform_data; -+}; -+ -+#ifdef CONFIG_MDIO_BOARDINFO -+int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n); -+#else -+static inline int -+mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n) -+{ -+ return 0; -+} -+#endif -+ - /** - * module_phy_driver() - Helper macro for registering PHY drivers - * @__phy_drivers: array of PHY drivers to register ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig -@@ -149,6 +149,10 @@ config MDIO_XGENE - - comment "Switch configuration API + drivers" - -+config MDIO_BOARDINFO -+ bool -+ default y -+ - config SWCONFIG - tristate "Switch configuration API" - ---help--- ---- a/drivers/net/phy/Makefile -+++ b/drivers/net/phy/Makefile -@@ -3,6 +3,8 @@ - libphy-y := phy.o phy_device.o mdio_bus.o mdio_device.o - libphy-$(CONFIG_SWPHY) += swphy.o - -+obj-$(CONFIG_MDIO_BOARDINFO) += mdio-boardinfo.o -+ - obj-$(CONFIG_PHYLIB) += libphy.o - - obj-$(CONFIG_SWCONFIG) += swconfig.o ---- /dev/null -+++ b/drivers/net/phy/mdio-boardinfo.c -@@ -0,0 +1,58 @@ -+/* -+ * mdio-boardinfo.c - collect pre-declarations of PHY devices -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "mdio-boardinfo.h" -+ -+/* -+ * These symbols are exported ONLY FOR the mdio_bus component. -+ * No other users will be supported. -+ */ -+ -+LIST_HEAD(__mdio_board_list); -+EXPORT_SYMBOL_GPL(__mdio_board_list); -+ -+DEFINE_MUTEX(__mdio_board_lock); -+EXPORT_SYMBOL_GPL(__mdio_board_lock); -+ -+/** -+ * mdio_register_board_info - register PHY devices for a given board -+ * @info: array of chip descriptors -+ * @n: how many descriptors are provided -+ * Context: can sleep -+ * -+ * The board info passed can safely be __initdata ... but be careful of -+ * any embedded pointers (platform_data, etc), they're copied as-is. -+ */ -+int __init -+mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n) -+{ -+ struct mdio_board_entry *be; -+ int i; -+ -+ be = kzalloc(n * sizeof(*be), GFP_KERNEL); -+ if (!be) -+ return -ENOMEM; -+ -+ for (i = 0; i < n; i++, be++, info++) { -+ memcpy(&be->board_info, info, sizeof(*info)); -+ mutex_lock(&__mdio_board_lock); -+ list_add_tail(&be->list, &__mdio_board_list); -+ mutex_unlock(&__mdio_board_lock); -+ } -+ -+ return 0; -+} ---- /dev/null -+++ b/drivers/net/phy/mdio-boardinfo.h -@@ -0,0 +1,22 @@ -+/* -+ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ */ -+ -+#include -+ -+struct mdio_board_entry { -+ struct list_head list; -+ struct mdio_board_info board_info; -+}; -+ -+/* __mdio_board_lock protects __mdio_board_list -+ * only mdio_bus components are allowed to use these symbols. -+ */ -+extern struct mutex __mdio_board_lock; -+extern struct list_head __mdio_board_list; ---- a/drivers/net/Makefile -+++ b/drivers/net/Makefile -@@ -17,7 +17,7 @@ obj-$(CONFIG_MII) += mii.o - obj-$(CONFIG_MDIO) += mdio.o - obj-$(CONFIG_NET) += Space.o loopback.o - obj-$(CONFIG_NETCONSOLE) += netconsole.o --obj-$(CONFIG_PHYLIB) += phy/ -+obj-y += phy/ - obj-$(CONFIG_RIONET) += rionet.o - obj-$(CONFIG_NET_TEAM) += team/ - obj-$(CONFIG_TUN) += tun.o diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch deleted file mode 100644 index e1ad675a76..0000000000 --- a/target/linux/generic/hack-4.9/721-phy_packets.patch +++ /dev/null @@ -1,176 +0,0 @@ -From ffe387740bbe88dd88bbe04d6375902708003d6e Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:25:00 +0200 -Subject: net: add packet mangeling patch - -Signed-off-by: Felix Fietkau ---- - include/linux/netdevice.h | 11 +++++++++++ - include/linux/skbuff.h | 14 ++++---------- - net/Kconfig | 6 ++++++ - net/core/dev.c | 18 ++++++++++++++---- - net/core/skbuff.c | 17 +++++++++++++++++ - net/ethernet/eth.c | 6 ++++++ - 6 files changed, 58 insertions(+), 14 deletions(-) - ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -1400,6 +1400,7 @@ enum netdev_priv_flags { - IFF_PHONY_HEADROOM = 1<<26, - IFF_MACSEC = 1<<27, - IFF_L3MDEV_RX_HANDLER = 1<<28, -+ IFF_NO_IP_ALIGN = 1<<29, - }; - - #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1430,6 +1431,7 @@ enum netdev_priv_flags { - #define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED - #define IFF_MACSEC IFF_MACSEC - #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER -+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN - - /** - * struct net_device - The DEVICE structure. -@@ -1716,6 +1718,11 @@ struct net_device { - const struct ndisc_ops *ndisc_ops; - #endif - -+#ifdef CONFIG_ETHERNET_PACKET_MANGLE -+ void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb); -+ struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb); -+#endif -+ - const struct header_ops *header_ops; - - unsigned int flags; -@@ -1788,6 +1795,10 @@ struct net_device { - struct mpls_dev __rcu *mpls_ptr; - #endif - -+#ifdef CONFIG_ETHERNET_PACKET_MANGLE -+ void *phy_ptr; /* PHY device specific data */ -+#endif -+ - /* - * Cache lines mostly used on receive path (including eth_type_trans()) - */ ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -2340,6 +2340,10 @@ static inline int pskb_trim(struct sk_bu - return (len < skb->len) ? __pskb_trim(skb, len) : 0; - } - -+extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, -+ unsigned int length, gfp_t gfp); -+ -+ - /** - * pskb_trim_unique - remove end from a paged unique (not cloned) buffer - * @skb: buffer to alter -@@ -2460,16 +2464,6 @@ static inline struct sk_buff *dev_alloc_ - } - - --static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, -- unsigned int length, gfp_t gfp) --{ -- struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); -- -- if (NET_IP_ALIGN && skb) -- skb_reserve(skb, NET_IP_ALIGN); -- return skb; --} -- - static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, - unsigned int length) - { ---- a/net/Kconfig -+++ b/net/Kconfig -@@ -25,6 +25,12 @@ menuconfig NET - - if NET - -+config ETHERNET_PACKET_MANGLE -+ bool -+ help -+ This option can be selected by phy drivers that need to mangle -+ packets going in or out of an ethernet device. -+ - config WANT_COMPAT_NETLINK_MESSAGES - bool - help ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -2972,10 +2972,20 @@ static int xmit_one(struct sk_buff *skb, - if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) - dev_queue_xmit_nit(skb, dev); - -- len = skb->len; -- trace_net_dev_start_xmit(skb, dev); -- rc = netdev_start_xmit(skb, dev, txq, more); -- trace_net_dev_xmit(skb, rc, dev, len); -+#ifdef CONFIG_ETHERNET_PACKET_MANGLE -+ if (!dev->eth_mangle_tx || -+ (skb = dev->eth_mangle_tx(dev, skb)) != NULL) -+#else -+ if (1) -+#endif -+ { -+ len = skb->len; -+ trace_net_dev_start_xmit(skb, dev); -+ rc = netdev_start_xmit(skb, dev, txq, more); -+ trace_net_dev_xmit(skb, rc, dev, len); -+ } else { -+ rc = NETDEV_TX_OK; -+ } - - return rc; - } ---- a/net/core/skbuff.c -+++ b/net/core/skbuff.c -@@ -64,6 +64,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -533,6 +534,22 @@ skb_fail: - } - EXPORT_SYMBOL(__napi_alloc_skb); - -+struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, -+ unsigned int length, gfp_t gfp) -+{ -+ struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); -+ -+#ifdef CONFIG_ETHERNET_PACKET_MANGLE -+ if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN)) -+ return skb; -+#endif -+ -+ if (NET_IP_ALIGN && skb) -+ skb_reserve(skb, NET_IP_ALIGN); -+ return skb; -+} -+EXPORT_SYMBOL(__netdev_alloc_skb_ip_align); -+ - void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, - int size, unsigned int truesize) - { ---- a/net/ethernet/eth.c -+++ b/net/ethernet/eth.c -@@ -171,6 +171,12 @@ __be16 eth_type_trans(struct sk_buff *sk - const struct ethhdr *eth; - - skb->dev = dev; -+ -+#ifdef CONFIG_ETHERNET_PACKET_MANGLE -+ if (dev->eth_mangle_rx) -+ dev->eth_mangle_rx(dev, skb); -+#endif -+ - skb_reset_mac_header(skb); - - eth = (struct ethhdr *)skb->data; diff --git a/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch b/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch deleted file mode 100644 index 55ebae7143..0000000000 --- a/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -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 ---- - 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 -@@ -243,6 +243,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; - case BCMA_CHIP_ID_BCM53573: - bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; ---- a/drivers/net/ethernet/broadcom/bgmac.c -+++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -11,6 +11,7 @@ - - #include - #include -+#include - #include - #include "bgmac.h" - -@@ -1388,6 +1389,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 - **************************************************/ -@@ -1534,6 +1546,14 @@ int bgmac_enet_probe(struct bgmac *bgmac - net_dev->hw_features = net_dev->features; - net_dev->vlan_features = net_dev->features; - -+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) { -+ bgmac_b53_pdata.regs = ioremap_nocache(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"); -@@ -1556,6 +1576,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 -@@ -409,6 +409,7 @@ - #define BGMAC_FEAT_CC4_IF_SW_TYPE BIT(17) - #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18) - #define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19) -+#define BGMAC_FEAT_SRAB BIT(20) - - struct bgmac_slot_info { - union { -@@ -513,6 +514,9 @@ struct bgmac { - u32 (*get_bus_clock)(struct bgmac *bgmac); - void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask, - u32 set); -+ -+ /* platform device for associated switch */ -+ struct platform_device *b53_device; - }; - - struct bgmac *bgmac_alloc(struct device *dev); diff --git a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch deleted file mode 100644 index 5e7884130a..0000000000 --- a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 3b6115d6b57a263bdc8c9b1df273bd4a7955eead Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 8 Jul 2017 08:16:31 +0200 -Subject: debloat: add some debloat patches, strip down procfs and make O_DIRECT support optional, saves ~15K after lzma on MIPS - -Signed-off-by: Felix Fietkau ---- - net/Kconfig | 3 +++ - net/core/Makefile | 3 ++- - net/core/sock.c | 2 ++ - net/ipv4/Kconfig | 1 + - net/netlink/Kconfig | 1 + - net/packet/Kconfig | 1 + - net/unix/Kconfig | 1 + - 7 files changed, 11 insertions(+), 1 deletion(-) - ---- a/net/Kconfig -+++ b/net/Kconfig -@@ -95,6 +95,9 @@ source "net/netlabel/Kconfig" - - endif # if INET - -+config SOCK_DIAG -+ bool -+ - config NETWORK_SECMARK - bool "Security Marking" - help ---- a/net/core/Makefile -+++ b/net/core/Makefile -@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core. - - obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \ - neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ -- sock_diag.o dev_ioctl.o tso.o sock_reuseport.o -+ dev_ioctl.o tso.o sock_reuseport.o - -+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o - obj-$(CONFIG_XFRM) += flow.o - obj-y += net-sysfs.o - obj-$(CONFIG_PROC_FS) += net-procfs.o ---- a/net/core/sock.c -+++ b/net/core/sock.c -@@ -1463,9 +1463,11 @@ void sk_destruct(struct sock *sk) - - static void __sk_free(struct sock *sk) - { -+#ifdef CONFIG_SOCK_DIAG - if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk))) - sock_diag_broadcast_destroy(sk); - else -+#endif - sk_destruct(sk); - } - ---- a/net/ipv4/Kconfig -+++ b/net/ipv4/Kconfig -@@ -408,6 +408,7 @@ config INET_XFRM_MODE_BEET - - config INET_DIAG - tristate "INET: socket monitoring interface" -+ select SOCK_DIAG - default y - ---help--- - Support for INET (TCP, DCCP, etc) socket monitoring interface used by ---- a/net/netlink/Kconfig -+++ b/net/netlink/Kconfig -@@ -4,6 +4,7 @@ - - config NETLINK_DIAG - tristate "NETLINK: socket monitoring interface" -+ select SOCK_DIAG - default n - ---help--- - Support for NETLINK socket monitoring interface used by the ss tool. ---- a/net/packet/Kconfig -+++ b/net/packet/Kconfig -@@ -18,6 +18,7 @@ config PACKET - config PACKET_DIAG - tristate "Packet: sockets monitoring interface" - depends on PACKET -+ select SOCK_DIAG - default n - ---help--- - Support for PF_PACKET sockets monitoring interface used by the ss tool. ---- a/net/unix/Kconfig -+++ b/net/unix/Kconfig -@@ -22,6 +22,7 @@ config UNIX - config UNIX_DIAG - tristate "UNIX: socket monitoring interface" - depends on UNIX -+ select SOCK_DIAG - default n - ---help--- - Support for UNIX socket monitoring interface used by the ss tool. diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch deleted file mode 100644 index cb13f0ff02..0000000000 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ /dev/null @@ -1,406 +0,0 @@ -From 9e3f1d0805b2d919904dd9a4ff0d956314cc3cba Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 8 Jul 2017 08:20:09 +0200 -Subject: debloat: procfs - -Signed-off-by: Felix Fietkau ---- - 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 -@@ -2802,6 +2802,8 @@ static const struct file_operations proc - - static int __init proc_locks_init(void) - { -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) -+ return 0; - proc_create("locks", 0, NULL, &proc_locks_operations); - return 0; - } ---- a/fs/proc/Kconfig -+++ b/fs/proc/Kconfig -@@ -81,3 +81,8 @@ 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" ---- a/fs/proc/consoles.c -+++ b/fs/proc/consoles.c -@@ -106,6 +106,9 @@ static const struct file_operations proc - - static int __init proc_consoles_init(void) - { -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) -+ return 0; -+ - proc_create("consoles", 0, NULL, &proc_consoles_operations); - return 0; - } ---- a/fs/proc/proc_tty.c -+++ b/fs/proc/proc_tty.c -@@ -144,7 +144,10 @@ static const struct file_operations proc - 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_fops) - return; -@@ -161,6 +164,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; -@@ -175,6 +181,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 -@@ -123,6 +123,21 @@ struct linux_xfrm_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]) - -@@ -153,8 +168,9 @@ struct linux_xfrm_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 -@@ -1061,6 +1061,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 -@@ -205,6 +205,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 -@@ -118,6 +118,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 -@@ -121,6 +121,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 -@@ -41,6 +41,8 @@ static const struct file_operations exec - - static int __init proc_execdomains_init(void) - { -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) -+ return 0; - proc_create("execdomains", 0, NULL, &execdomains_proc_fops); - return 0; - } ---- a/kernel/irq/proc.c -+++ b/kernel/irq/proc.c -@@ -326,6 +326,9 @@ void register_irq_proc(unsigned int irq, - static DEFINE_MUTEX(register_lock); - 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; - -@@ -374,6 +377,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 -@@ -408,6 +414,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 -@@ -400,6 +400,9 @@ static int __init init_timer_list_procfs - { - struct proc_dir_entry *pe; - -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) -+ return 0; -+ - pe = proc_create("timer_list", 0400, NULL, &timer_list_fops); - if (!pe) - return -ENOMEM; ---- a/mm/vmalloc.c -+++ b/mm/vmalloc.c -@@ -2727,6 +2727,8 @@ static const struct file_operations proc - - static int __init proc_vmalloc_init(void) - { -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) -+ return 0; - proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations); - return 0; - } ---- a/mm/vmstat.c -+++ b/mm/vmstat.c -@@ -1793,10 +1793,12 @@ static int __init setup_vmstat(void) - cpu_notifier_register_done(); - #endif - #ifdef CONFIG_PROC_FS -- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); -- proc_create("pagetypeinfo", 0400, NULL, &pagetypeinfo_file_ops); -+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) { -+ proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); -+ proc_create("pagetypeinfo", 0400, NULL, &pagetypeinfo_file_ops); -+ proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); -+ } - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations); -- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); - #endif - return 0; - } ---- a/net/8021q/vlanproc.c -+++ b/net/8021q/vlanproc.c -@@ -127,6 +127,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); - -@@ -146,6 +149,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("dev", S_IRUGO, net->proc_net, &dev_seq_fops)) - goto out; -- if (!proc_create("softnet_stat", S_IRUGO, net->proc_net, -+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) && -+ !proc_create("softnet_stat", S_IRUGO, net->proc_net, - &softnet_seq_fops)) - goto out_dev; -- if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops)) -+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) && -+ !proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops)) - goto out_softnet; - - if (wext_proc_init(net)) -@@ -331,9 +333,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; -@@ -343,8 +347,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 -@@ -3093,6 +3093,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 -@@ -2677,10 +2677,12 @@ static const struct file_operations fib_ - - int __net_init fib_proc_init(struct net *net) - { -- if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops)) -+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) && -+ !proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops)) - goto out1; - -- if (!proc_create("fib_triestat", S_IRUGO, net->proc_net, -+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) && -+ !proc_create("fib_triestat", S_IRUGO, net->proc_net, - &fib_triestat_fops)) - goto out2; - -@@ -2690,17 +2692,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 -@@ -566,6 +566,9 @@ 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 -@@ -423,6 +423,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); - } - diff --git a/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch b/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch deleted file mode 100644 index da69b7e784..0000000000 --- a/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 8 Jul 2017 08:20:43 +0200 -Subject: debloat: dmabuf - -Signed-off-by: Felix Fietkau ---- - 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 -@@ -244,7 +244,7 @@ config SOC_BUS - source "drivers/base/regmap/Kconfig" - - config DMA_SHARED_BUFFER -- bool -+ tristate - default n - select ANON_INODES - help ---- a/drivers/dma-buf/Makefile -+++ b/drivers/dma-buf/Makefile -@@ -1,3 +1,7 @@ --obj-y := dma-buf.o fence.o reservation.o seqno-fence.o fence-array.o --obj-$(CONFIG_SYNC_FILE) += sync_file.o --obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o -+obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o -+ -+dma-buf-objs-y := dma-buf.o fence.o reservation.o seqno-fence.o fence-array.o -+dma-buf-objs-$(CONFIG_SYNC_FILE) += sync_file.o -+dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o -+ -+dma-shared-buffer-objs := $(dma-buf-objs-y) ---- a/drivers/dma-buf/dma-buf.c -+++ b/drivers/dma-buf/dma-buf.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include - -@@ -977,4 +978,5 @@ static void __exit dma_buf_deinit(void) - { - dma_buf_uninit_debugfs(); - } --__exitcall(dma_buf_deinit); -+module_exit(dma_buf_deinit); -+MODULE_LICENSE("GPL"); ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -2171,6 +2171,7 @@ int wake_up_state(struct task_struct *p, - { - return try_to_wake_up(p, state, 0); - } -+EXPORT_SYMBOL_GPL(wake_up_state); - - /* - * This function clears the sched_dl_entity static params. diff --git a/target/linux/generic/hack-4.9/910-kobject_uevent.patch b/target/linux/generic/hack-4.9/910-kobject_uevent.patch deleted file mode 100644 index 734401e1c6..0000000000 --- a/target/linux/generic/hack-4.9/910-kobject_uevent.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sun, 16 Jul 2017 16:56:10 +0200 -Subject: lib: add uevent_next_seqnum() - -Signed-off-by: Felix Fietkau ---- - 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 -@@ -52,6 +52,18 @@ static const char *kobject_actions[] = { - [KOBJ_OFFLINE] = "offline", - }; - -+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_action_type - translate action string to numeric type - * diff --git a/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch deleted file mode 100644 index d827ace9e0..0000000000 --- a/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sun, 16 Jul 2017 16:56:10 +0200 -Subject: lib: add uevent_next_seqnum() - -Signed-off-by: Felix Fietkau ---- - 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 32 /* 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[]; -@@ -239,4 +241,7 @@ int add_uevent_var(struct kobj_uevent_en - int kobject_action_type(const char *buf, size_t count, - enum kobject_action *type); - -+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 -@@ -423,6 +423,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_init(struct net *net) - { - struct uevent_sock *ue_sk; diff --git a/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch b/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch deleted file mode 100644 index 6eeddcc3c6..0000000000 --- a/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5d301596fdc72f6cb672f72eb3c66e7cddefb103 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 8 Jul 2017 08:26:02 +0200 -Subject: initramfs: always create console node - -Signed-off-by: Felix Fietkau ---- - scripts/gen_initramfs_list.sh | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - ---- a/scripts/gen_initramfs_list.sh -+++ b/scripts/gen_initramfs_list.sh -@@ -59,6 +59,18 @@ default_initramfs() { - EOF - } - -+list_openwrt_initramfs() { -+ : -+} -+ -+openwrt_initramfs() { -+ # make sure that /dev/console exists -+ cat <<-EOF >> ${output} -+ dir /dev 0755 0 0 -+ nod /dev/console 0600 0 0 c 5 1 -+ EOF -+} -+ - filetype() { - local argv1="$1" - -@@ -180,6 +192,8 @@ dir_filelist() { - if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then - ${dep_list}print_mtime "$1" - -+ ${dep_list}openwrt_initramfs -+ - echo "${dirlist}" | \ - while read x; do - ${dep_list}parse ${x} diff --git a/target/linux/generic/hack-4.9/930-crashlog.patch b/target/linux/generic/hack-4.9/930-crashlog.patch deleted file mode 100644 index 61e256e00c..0000000000 --- a/target/linux/generic/hack-4.9/930-crashlog.patch +++ /dev/null @@ -1,338 +0,0 @@ -From 6b1ab74a9917012d0c559edc4ed299d9228ac89f Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 8 Jul 2017 08:26:47 +0200 -Subject: kernel: add the new 'crashlog' feature - -this tries to store kernel oops/panic logs in a fixed location in RAM to -recover them available to user space using debugfs - -Signed-off-by: Felix Fietkau ---- - include/linux/crashlog.h | 17 ++++ - init/Kconfig | 4 + - kernel/Makefile | 1 + - kernel/crashlog.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ - kernel/module.c | 3 + - mm/bootmem.c | 2 + - mm/memblock.c | 5 ++ - 7 files changed, 245 insertions(+) - create mode 100644 include/linux/crashlog.h - create mode 100644 kernel/crashlog.c - ---- /dev/null -+++ b/include/linux/crashlog.h -@@ -0,0 +1,17 @@ -+#ifndef __CRASHLOG_H -+#define __CRASHLOG_H -+ -+#ifdef CONFIG_CRASHLOG -+void crashlog_init_bootmem(struct bootmem_data *bdata); -+void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size); -+#else -+static inline void crashlog_init_bootmem(struct bootmem_data *bdata) -+{ -+} -+ -+static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size) -+{ -+} -+#endif -+ -+#endif ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1298,6 +1298,10 @@ config RELAY - - If unsure, say N. - -+config CRASHLOG -+ bool "Crash logging" -+ depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) -+ - config BLK_DEV_INITRD - bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" - depends on BROKEN || !FRV ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -114,6 +114,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o - obj-$(CONFIG_MEMBARRIER) += membarrier.o - - obj-$(CONFIG_HAS_IOMEM) += memremap.o -+obj-$(CONFIG_CRASHLOG) += crashlog.o - - $(obj)/configs.o: $(obj)/config_data.h - ---- /dev/null -+++ b/kernel/crashlog.c -@@ -0,0 +1,213 @@ -+/* -+ * Crash information logger -+ * Copyright (C) 2010 Felix Fietkau -+ * -+ * Based on ramoops.c -+ * Copyright (C) 2010 Marco Stornelli -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define CRASHLOG_PAGES 4 -+#define CRASHLOG_SIZE (CRASHLOG_PAGES * PAGE_SIZE) -+#define CRASHLOG_MAGIC 0xa1eedead -+ -+/* -+ * Start the log at 1M before the end of RAM, as some boot loaders like -+ * to use the end of the RAM for stack usage and other things -+ * If this fails, fall back to using the last part. -+ */ -+#define CRASHLOG_OFFSET (1024 * 1024) -+ -+struct crashlog_data { -+ u32 magic; -+ u32 len; -+ u8 data[]; -+}; -+ -+static struct debugfs_blob_wrapper crashlog_blob; -+static unsigned long crashlog_addr = 0; -+static struct crashlog_data *crashlog_buf; -+static struct kmsg_dumper dump; -+static bool first = true; -+ -+extern struct list_head *crashlog_modules; -+ -+static bool crashlog_set_addr(phys_addr_t addr, phys_addr_t size) -+{ -+ /* Limit to lower 64 MB to avoid highmem */ -+ phys_addr_t limit = 64 * 1024 * 1024; -+ -+ if (crashlog_addr) -+ return false; -+ -+ if (addr > limit) -+ return false; -+ -+ if (addr + size > limit) -+ size = limit - addr; -+ -+ crashlog_addr = addr; -+ -+ if (addr + size > CRASHLOG_OFFSET) -+ crashlog_addr += size - CRASHLOG_OFFSET; -+ -+ return true; -+} -+ -+#ifndef CONFIG_NO_BOOTMEM -+void __init crashlog_init_bootmem(bootmem_data_t *bdata) -+{ -+ phys_addr_t start, end; -+ -+ start = PFN_PHYS(bdata->node_low_pfn); -+ end = PFN_PHYS(bdata->node_min_pfn); -+ if (!crashlog_set_addr(start, end - start)) -+ return; -+ -+ if (reserve_bootmem(crashlog_addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) { -+ printk("Crashlog failed to allocate RAM at address 0x%lx\n", -+ crashlog_addr); -+ crashlog_addr = 0; -+ } -+} -+#endif -+ -+#ifdef CONFIG_HAVE_MEMBLOCK -+void __init_memblock crashlog_init_memblock(phys_addr_t addr, phys_addr_t size) -+{ -+ if (!crashlog_set_addr(addr, size)) -+ return; -+ -+ if (memblock_reserve(crashlog_addr, CRASHLOG_SIZE)) { -+ printk("Crashlog failed to allocate RAM at address 0x%lx\n", -+ crashlog_addr); -+ crashlog_addr = 0; -+ } -+} -+#endif -+ -+static void __init crashlog_copy(void) -+{ -+ if (crashlog_buf->magic != CRASHLOG_MAGIC) -+ return; -+ -+ if (!crashlog_buf->len || crashlog_buf->len > -+ CRASHLOG_SIZE - sizeof(*crashlog_buf)) -+ return; -+ -+ crashlog_blob.size = crashlog_buf->len; -+ crashlog_blob.data = kmemdup(crashlog_buf->data, -+ crashlog_buf->len, GFP_KERNEL); -+ -+ debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob); -+} -+ -+static int get_maxlen(void) -+{ -+ return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len; -+} -+ -+static void crashlog_printf(const char *fmt, ...) -+{ -+ va_list args; -+ int len = get_maxlen(); -+ -+ if (!len) -+ return; -+ -+ va_start(args, fmt); -+ crashlog_buf->len += vscnprintf( -+ &crashlog_buf->data[crashlog_buf->len], -+ len, fmt, args); -+ va_end(args); -+} -+ -+static void crashlog_do_dump(struct kmsg_dumper *dumper, -+ enum kmsg_dump_reason reason) -+{ -+ struct timeval tv; -+ struct module *m; -+ char *buf; -+ size_t len; -+ -+ if (!first) -+ crashlog_printf("\n===================================\n"); -+ -+ do_gettimeofday(&tv); -+ crashlog_printf("Time: %lu.%lu\n", -+ (long)tv.tv_sec, (long)tv.tv_usec); -+ -+ if (first) { -+ crashlog_printf("Modules:"); -+ list_for_each_entry(m, crashlog_modules, list) { -+ crashlog_printf("\t%s@%p+%x", m->name, -+ m->core_layout.base, m->core_layout.size, -+ m->init_layout.base, m->init_layout.size); -+ } -+ crashlog_printf("\n"); -+ first = false; -+ } -+ -+ buf = (char *)&crashlog_buf->data[crashlog_buf->len]; -+ -+ kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len); -+ -+ crashlog_buf->len += len; -+} -+ -+ -+int __init crashlog_init_fs(void) -+{ -+ struct page *pages[CRASHLOG_PAGES]; -+ pgprot_t prot; -+ int i; -+ -+ if (!crashlog_addr) { -+ printk("No memory allocated for crashlog\n"); -+ return -ENOMEM; -+ } -+ -+ printk("Crashlog allocated RAM at address 0x%lx\n", (unsigned long) crashlog_addr); -+ for (i = 0; i < CRASHLOG_PAGES; i++) -+ pages[i] = pfn_to_page((crashlog_addr >> PAGE_SHIFT) + i); -+ -+ prot = pgprot_writecombine(PAGE_KERNEL); -+ crashlog_buf = vmap(pages, CRASHLOG_PAGES, VM_MAP, prot); -+ -+ crashlog_copy(); -+ -+ crashlog_buf->magic = CRASHLOG_MAGIC; -+ crashlog_buf->len = 0; -+ -+ dump.max_reason = KMSG_DUMP_OOPS; -+ dump.dump = crashlog_do_dump; -+ kmsg_dump_register(&dump); -+ -+ return 0; -+} -+module_init(crashlog_init_fs); ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -253,6 +253,9 @@ static void mod_update_bounds(struct mod - #ifdef CONFIG_KGDB_KDB - struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ - #endif /* CONFIG_KGDB_KDB */ -+#ifdef CONFIG_CRASHLOG -+struct list_head *crashlog_modules = &modules; -+#endif - - static void module_assert_mutex(void) - { ---- a/mm/bootmem.c -+++ b/mm/bootmem.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -174,6 +175,7 @@ static unsigned long __init free_all_boo - if (!bdata->node_bootmem_map) - return 0; - -+ crashlog_init_bootmem(bdata); - map = bdata->node_bootmem_map; - start = bdata->node_min_pfn; - end = bdata->node_low_pfn; ---- a/mm/memblock.c -+++ b/mm/memblock.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -495,6 +496,8 @@ static void __init_memblock memblock_ins - memblock_set_region_node(rgn, nid); - type->cnt++; - type->total_size += size; -+ if (type == &memblock.memory) -+ crashlog_init_memblock(base, size); - } - - /** -@@ -534,6 +537,8 @@ int __init_memblock memblock_add_range(s - type->regions[0].flags = flags; - memblock_set_region_node(&type->regions[0], nid); - type->total_size = size; -+ if (type == &memblock.memory) -+ crashlog_init_memblock(base, size); - return 0; - } - repeat: diff --git a/target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch b/target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch deleted file mode 100644 index 524c6f98df..0000000000 --- a/target/linux/generic/pending-4.9/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d9c8bc8c1408f3e8529db6e4e04017b4c579c342 Mon Sep 17 00:00:00 2001 -From: Pawel Dembicki -Date: Sun, 18 Feb 2018 17:08:04 +0100 -Subject: [PATCH] w1: gpio: fix problem with platfom data in w1-gpio - -In devices, where fdt is used, is impossible to apply platform data -without proper fdt node. - -This patch allow to use platform data in devices with fdt. - -Signed-off-by: Pawel Dembicki ---- - drivers/w1/masters/w1-gpio.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - ---- a/drivers/w1/masters/w1-gpio.c -+++ b/drivers/w1/masters/w1-gpio.c -@@ -113,17 +113,16 @@ static int w1_gpio_probe_dt(struct platf - static int w1_gpio_probe(struct platform_device *pdev) - { - struct w1_bus_master *master; -- struct w1_gpio_platform_data *pdata; -+ struct w1_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev); - int err; - -- if (of_have_populated_dt()) { -+ if (of_have_populated_dt() && !pdata) { - err = w1_gpio_probe_dt(pdev); - if (err < 0) - return err; -+ pdata = dev_get_platdata(&pdev->dev); - } - -- pdata = dev_get_platdata(&pdev->dev); -- - if (!pdata) { - dev_err(&pdev->dev, "No configuration data\n"); - return -ENXIO; diff --git a/target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch b/target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch deleted file mode 100644 index 622fab65b7..0000000000 --- a/target/linux/generic/pending-4.9/100-MIPS-fix-cache-flushing-for-highmem-pages.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Felix Fietkau -Subject: MIPS: fix cache flushing for highmem pages - -Most cache flush ops were no-op for highmem pages. This led to nasty -segfaults and (in the case of page_address(page) == NULL) kernel -crashes. - -Fix this by always flushing highmem pages using kmap/kunmap_atomic -around the actual cache flush. This might be a bit inefficient, but at -least it's stable. - -Signed-off-by: Felix Fietkau ---- - ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -115,6 +115,13 @@ void __flush_anon_page(struct page *page - { - unsigned long addr = (unsigned long) page_address(page); - -+ if (PageHighMem(page)) { -+ addr = (unsigned long)kmap_atomic(page); -+ flush_data_cache_page(addr); -+ __kunmap_atomic((void *)addr); -+ return; -+ } -+ - if (pages_do_alias(addr, vmaddr)) { - if (page_mapcount(page) && !Page_dcache_dirty(page)) { - void *kaddr; diff --git a/target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch b/target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch deleted file mode 100644 index 644d936574..0000000000 --- a/target/linux/generic/pending-4.9/110-ehci_hcd_ignore_oc.patch +++ /dev/null @@ -1,79 +0,0 @@ -From: Florian Fainelli -Subject: USB: EHCI: add ignore_oc flag to disable overcurrent checking - -This patch adds an ignore_oc flag which can be set by EHCI controller -not supporting or wanting to disable overcurrent checking. The EHCI -platform data in include/linux/usb/ehci_pdriver.h is also augmented to -take advantage of this new flag. - -Signed-off-by: Florian Fainelli ---- - drivers/usb/host/ehci-hcd.c | 2 +- - drivers/usb/host/ehci-hub.c | 4 ++-- - drivers/usb/host/ehci-platform.c | 1 + - drivers/usb/host/ehci.h | 1 + - include/linux/usb/ehci_pdriver.h | 1 + - 5 files changed, 6 insertions(+), 3 deletions(-) - ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -651,7 +651,7 @@ static int ehci_run (struct usb_hcd *hcd - "USB %x.%x started, EHCI %x.%02x%s\n", - ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), - temp >> 8, temp & 0xff, -- ignore_oc ? ", overcurrent ignored" : ""); -+ (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : ""); - - ehci_writel(ehci, INTR_MASK, - &ehci->regs->intr_enable); /* Turn On Interrupts */ ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -638,7 +638,7 @@ ehci_hub_status_data (struct usb_hcd *hc - * always set, seem to clear PORT_OCC and PORT_CSC when writing to - * PORT_POWER; that's surprising, but maybe within-spec. - */ -- if (!ignore_oc) -+ if (!ignore_oc && !ehci->ignore_oc) - mask = PORT_CSC | PORT_PEC | PORT_OCC; - else - mask = PORT_CSC | PORT_PEC; -@@ -1008,7 +1008,7 @@ int ehci_hub_control( - if (temp & PORT_PEC) - status |= USB_PORT_STAT_C_ENABLE << 16; - -- if ((temp & PORT_OCC) && !ignore_oc){ -+ if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){ - status |= USB_PORT_STAT_C_OVERCURRENT << 16; - - /* ---- a/drivers/usb/host/ehci-platform.c -+++ b/drivers/usb/host/ehci-platform.c -@@ -259,6 +259,8 @@ static int ehci_platform_probe(struct pl - hcd->has_tt = 1; - if (pdata->reset_on_resume) - priv->reset_on_resume = true; -+ if (pdata->ignore_oc) -+ ehci->ignore_oc = 1; - - #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO - if (ehci->big_endian_mmio) { ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -230,6 +230,7 @@ struct ehci_hcd { /* one per controlle - unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ - unsigned need_oc_pp_cycle:1; /* MPC834X port power */ - unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ -+ unsigned ignore_oc:1; - - /* required for usb32 quirk */ - #define OHCI_CTRL_HCFS (3 << 6) ---- a/include/linux/usb/ehci_pdriver.h -+++ b/include/linux/usb/ehci_pdriver.h -@@ -49,6 +49,7 @@ struct usb_ehci_pdata { - unsigned no_io_watchdog:1; - unsigned reset_on_resume:1; - unsigned dma_mask_64:1; -+ unsigned ignore_oc:1; - - /* Turn on all power and clocks */ - int (*power_on)(struct platform_device *pdev); diff --git a/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch deleted file mode 100644 index 794280eec9..0000000000 --- a/target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Tobias Wolf -Subject: mm: Fix alloc_node_mem_map with ARCH_PFN_OFFSET calculation - -An rt288x (ralink) based router (Belkin F5D8235 v1) does not boot with any -kernel beyond version 4.3 resulting in: - -BUG: Bad page state in process swapper pfn:086ac - -bisect resulted in: - -a1c34a3bf00af2cede839879502e12dc68491ad5 is the first bad commit -commit a1c34a3bf00af2cede839879502e12dc68491ad5 -Author: Laura Abbott -Date: Thu Nov 5 18:48:46 2015 -0800 - - mm: Don't offset memmap for flatmem - - Srinivas Kandagatla reported bad page messages when trying to remove the - bottom 2MB on an ARM based IFC6410 board - - BUG: Bad page state in process swapper pfn:fffa8 - page:ef7fb500 count:0 mapcount:0 mapping: (null) index:0x0 - flags: 0x96640253(locked|error|dirty|active|arch_1|reclaim|mlocked) - page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set - bad because of flags: - flags: 0x200041(locked|active|mlocked) - Modules linked in: - CPU: 0 PID: 0 Comm: swapper Not tainted 3.19.0-rc3-00007-g412f9ba-dirty -#816 - Hardware name: Qualcomm (Flattened Device Tree) - unwind_backtrace - show_stack - dump_stack - bad_page - free_pages_prepare - free_hot_cold_page - __free_pages - free_highmem_page - mem_init - start_kernel - Disabling lock debugging due to kernel taint - [...] -:040000 040000 2de013c372345fd471cd58f0553c9b38b0ef1cc4 -0a8156f848733dfa21e16c196dfb6c0a76290709 M mm - -This fix for ARM does not account ARCH_PFN_OFFSET for mem_map as later used by -page_to_pfn anymore. - -The following output was generated with two hacked in printk statements: - -printk("before %p vs. %p or %p\n", mem_map, mem_map - offset, mem_map - -(pgdat->node_start_pfn - ARCH_PFN_OFFSET)); - if (page_to_pfn(mem_map) != pgdat->node_start_pfn) - mem_map -= offset + (pgdat->node_start_pfn - ARCH_PFN_OFFSET); -printk("after %p\n", mem_map); - -Output: - -[ 0.000000] before 8861b280 vs. 8861b280 or 8851b280 -[ 0.000000] after 8851b280 - -As seen in the first line mem_map with subtraction of offset does not equal the -mem_map after subtraction of ARCH_PFN_OFFSET. - -After adding the offset of ARCH_PFN_OFFSET as well to mem_map as the -previously calculated offset is zero for the named platform it is able to boot -4.4 and 4.9-rc7 again. - -Signed-off-by: Tobias Wolf ---- - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -5923,7 +5923,7 @@ static void __ref alloc_node_mem_map(str - mem_map = NODE_DATA(0)->node_mem_map; - #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) - if (page_to_pfn(mem_map) != pgdat->node_start_pfn) -- mem_map -= offset; -+ mem_map -= offset + (pgdat->node_start_pfn - ARCH_PFN_OFFSET); - #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ - } - #endif diff --git a/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch deleted file mode 100644 index e815976855..0000000000 --- a/target/linux/generic/pending-4.9/130-add-linux-spidev-compatible-si3210.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Giuseppe Lippolis -Subject: Add the linux,spidev compatible in spidev Several device in ramips have this binding in the dts - -Signed-off-by: Giuseppe Lippolis ---- - drivers/spi/spidev.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/spi/spidev.c -+++ b/drivers/spi/spidev.c -@@ -699,6 +699,7 @@ static struct class *spidev_class; - static const struct of_device_id spidev_dt_ids[] = { - { .compatible = "rohm,dh2228fv" }, - { .compatible = "lineartechnology,ltc2488" }, -+ { .compatible = "siliconlabs,si3210" }, - {}, - }; - MODULE_DEVICE_TABLE(of, spidev_dt_ids); diff --git a/target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch b/target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch deleted file mode 100644 index 8c2d68b9db..0000000000 --- a/target/linux/generic/pending-4.9/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Felix Fietkau -Subject: spi: use gpio_set_value_cansleep for setting chipselect GPIO - -Sleeping is safe inside spi_transfer_one_message, and some GPIO chips -need to sleep for setting values - -Signed-off-by: Felix Fietkau ---- - ---- a/drivers/spi/spi.c -+++ b/drivers/spi/spi.c -@@ -700,7 +700,7 @@ static void spi_set_cs(struct spi_device - enable = !enable; - - if (gpio_is_valid(spi->cs_gpio)) -- gpio_set_value(spi->cs_gpio, !enable); -+ gpio_set_value_cansleep(spi->cs_gpio, !enable); - else if (spi->master->set_cs) - spi->master->set_cs(spi, !enable); - } diff --git a/target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch deleted file mode 100644 index c97e93250b..0000000000 --- a/target/linux/generic/pending-4.9/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Felix Fietkau -Subject: jffs2: use .rename2 and add RENAME_WHITEOUT support - -It is required for renames on overlayfs - -Signed-off-by: Felix Fietkau ---- - ---- a/fs/jffs2/dir.c -+++ b/fs/jffs2/dir.c -@@ -752,6 +752,24 @@ static int jffs2_mknod (struct inode *di - return ret; - } - -+static int jffs2_whiteout (struct inode *old_dir, struct dentry *old_dentry) -+{ -+ struct dentry *wh; -+ int err; -+ -+ wh = d_alloc(old_dentry->d_parent, &old_dentry->d_name); -+ if (!wh) -+ return -ENOMEM; -+ -+ err = jffs2_mknod(old_dir, wh, S_IFCHR | WHITEOUT_MODE, -+ WHITEOUT_DEV); -+ if (err) -+ return err; -+ -+ d_rehash(wh); -+ return 0; -+} -+ - static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, - struct inode *new_dir_i, struct dentry *new_dentry, - unsigned int flags) -@@ -762,7 +780,7 @@ static int jffs2_rename (struct inode *o - uint8_t type; - uint32_t now; - -- if (flags & ~RENAME_NOREPLACE) -+ if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT)) - return -EINVAL; - - /* The VFS will check for us and prevent trying to rename a -@@ -828,9 +846,14 @@ static int jffs2_rename (struct inode *o - if (d_is_dir(old_dentry) && !victim_f) - inc_nlink(new_dir_i); - -- /* Unlink the original */ -- ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), -- old_dentry->d_name.name, old_dentry->d_name.len, NULL, now); -+ if (flags & RENAME_WHITEOUT) -+ /* Replace with whiteout */ -+ ret = jffs2_whiteout(old_dir_i, old_dentry); -+ else -+ /* Unlink the original */ -+ ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), -+ old_dentry->d_name.name, -+ old_dentry->d_name.len, NULL, now); - - /* We don't touch inode->i_nlink */ - diff --git a/target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch deleted file mode 100644 index 093a73ab66..0000000000 --- a/target/linux/generic/pending-4.9/141-jffs2-add-RENAME_EXCHANGE-support.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Felix Fietkau -Subject: jffs2: add RENAME_EXCHANGE support - -Signed-off-by: Felix Fietkau ---- - ---- a/fs/jffs2/dir.c -+++ b/fs/jffs2/dir.c -@@ -777,18 +777,31 @@ static int jffs2_rename (struct inode *o - int ret; - struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb); - struct jffs2_inode_info *victim_f = NULL; -+ struct inode *fst_inode = d_inode(old_dentry); -+ struct inode *snd_inode = d_inode(new_dentry); - uint8_t type; - uint32_t now; - -- if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT)) -+ if (flags & ~(RENAME_NOREPLACE|RENAME_WHITEOUT|RENAME_EXCHANGE)) - return -EINVAL; - -+ if ((flags & RENAME_EXCHANGE) && (old_dir_i != new_dir_i)) { -+ if (S_ISDIR(fst_inode->i_mode) && !S_ISDIR(snd_inode->i_mode)) { -+ inc_nlink(new_dir_i); -+ drop_nlink(old_dir_i); -+ } -+ else if (!S_ISDIR(fst_inode->i_mode) && S_ISDIR(snd_inode->i_mode)) { -+ drop_nlink(new_dir_i); -+ inc_nlink(old_dir_i); -+ } -+ } -+ - /* The VFS will check for us and prevent trying to rename a - * file over a directory and vice versa, but if it's a directory, - * the VFS can't check whether the victim is empty. The filesystem - * needs to do that for itself. - */ -- if (d_really_is_positive(new_dentry)) { -+ if (d_really_is_positive(new_dentry) && !(flags & RENAME_EXCHANGE)) { - victim_f = JFFS2_INODE_INFO(d_inode(new_dentry)); - if (d_is_dir(new_dentry)) { - struct jffs2_full_dirent *fd; -@@ -823,7 +836,7 @@ static int jffs2_rename (struct inode *o - if (ret) - return ret; - -- if (victim_f) { -+ if (victim_f && !(flags & RENAME_EXCHANGE)) { - /* There was a victim. Kill it off nicely */ - if (d_is_dir(new_dentry)) - clear_nlink(d_inode(new_dentry)); -@@ -849,6 +862,12 @@ static int jffs2_rename (struct inode *o - if (flags & RENAME_WHITEOUT) - /* Replace with whiteout */ - ret = jffs2_whiteout(old_dir_i, old_dentry); -+ else if (flags & RENAME_EXCHANGE) -+ /* Replace the original */ -+ ret = jffs2_do_link(c, JFFS2_INODE_INFO(old_dir_i), -+ d_inode(new_dentry)->i_ino, type, -+ old_dentry->d_name.name, old_dentry->d_name.len, -+ now); - else - /* Unlink the original */ - ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), -@@ -880,7 +899,7 @@ static int jffs2_rename (struct inode *o - return ret; - } - -- if (d_is_dir(old_dentry)) -+ if (d_is_dir(old_dentry) && !(flags & RENAME_EXCHANGE)) - drop_nlink(old_dir_i); - - new_dir_i->i_mtime = new_dir_i->i_ctime = old_dir_i->i_mtime = old_dir_i->i_ctime = ITIME(now); diff --git a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch deleted file mode 100644 index 9ee93c9a1d..0000000000 --- a/target/linux/generic/pending-4.9/150-bridge_allow_receiption_on_disabled_port.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Stephen Hemminger -Subject: bridge: allow receiption on disabled port - -When an ethernet device is enslaved to a bridge, and the bridge STP -detects loss of carrier (or operational state down), then normally -packet receiption is blocked. - -This breaks control applications like WPA which maybe expecting to -receive packets to negotiate to bring link up. The bridge needs to -block forwarding packets from these disabled ports, but there is no -hard requirement to not allow local packet delivery. - -Signed-off-by: Stephen Hemminger -Signed-off-by: Felix Fietkau - ---- a/net/bridge/br_input.c -+++ b/net/bridge/br_input.c -@@ -231,7 +231,10 @@ static void __br_handle_local_finish(str - /* note: already called with rcu_read_lock */ - static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb) - { -- __br_handle_local_finish(skb); -+ struct net_bridge_port *p = br_port_get_rcu(skb->dev); -+ -+ if (p->state != BR_STATE_DISABLED) -+ __br_handle_local_finish(skb); - - /* return 1 to signal the okfn() was called so it's ok to use the skb */ - return 1; -@@ -321,6 +324,17 @@ rx_handler_result_t br_handle_frame(stru - - forward: - switch (p->state) { -+ case BR_STATE_DISABLED: -+ if (ether_addr_equal(p->br->dev->dev_addr, dest)) -+ skb->pkt_type = PACKET_HOST; -+ -+ if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, -+ dev_net(skb->dev), NULL, skb, skb->dev, NULL, -+ br_handle_local_finish) == 1) { -+ return RX_HANDLER_PASS; -+ } -+ break; -+ - case BR_STATE_FORWARDING: - rhook = rcu_dereference(br_should_route_hook); - if (rhook) { diff --git a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch deleted file mode 100644 index 11a33b7ebf..0000000000 --- a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ /dev/null @@ -1,181 +0,0 @@ -From: Hauke Mehrtens -Subject: mtd: part: add generic parsing of linux,part-probe - -This moves the linux,part-probe device tree parsing code from -physmap_of.c to mtdpart.c. Now all drivers can use this feature by just -providing a reference to their device tree node in struct -mtd_part_parser_data. - -Signed-off-by: Hauke Mehrtens ---- - Documentation/devicetree/bindings/mtd/nand.txt | 16 +++++++++ - drivers/mtd/maps/physmap_of.c | 46 +------------------------- - drivers/mtd/mtdpart.c | 45 +++++++++++++++++++++++++ - 3 files changed, 62 insertions(+), 45 deletions(-) - ---- a/Documentation/devicetree/bindings/mtd/nand.txt -+++ b/Documentation/devicetree/bindings/mtd/nand.txt -@@ -44,6 +44,22 @@ Optional NAND chip properties: - used by the upper layers, and you want to make your NAND - as reliable as possible. - -+- linux,part-probe: list of name as strings of the partition parser -+ which should be used to parse the partition table. -+ They will be tried in the specified ordering and -+ the next one will be used if the previous one -+ failed. -+ -+ Example: linux,part-probe = "cmdlinepart", "ofpart"; -+ -+ This is also the default value, which will be used -+ if this attribute is not specified. It could be -+ that the flash driver in use overwrote the default -+ value and uses some other default. -+ -+ Possible values are: bcm47xxpart, afs, ar7part, -+ ofoldpart, ofpart, bcm63xxpart, RedBoot, cmdlinepart -+ - The ECC strength and ECC step size properties define the correction capability - of a controller. Together, they say a controller can correct "{strength} bit - errors per {size} bytes". ---- a/drivers/mtd/maps/physmap_of.c -+++ b/drivers/mtd/maps/physmap_of.c -@@ -104,47 +104,9 @@ static struct mtd_info *obsolete_probe(s - static const char * const part_probe_types_def[] = { - "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL }; - --static const char * const *of_get_probes(struct device_node *dp) --{ -- const char *cp; -- int cplen; -- unsigned int l; -- unsigned int count; -- const char **res; -- -- cp = of_get_property(dp, "linux,part-probe", &cplen); -- if (cp == NULL) -- return part_probe_types_def; -- -- count = 0; -- for (l = 0; l != cplen; l++) -- if (cp[l] == 0) -- count++; -- -- res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL); -- if (!res) -- return NULL; -- count = 0; -- while (cplen > 0) { -- res[count] = cp; -- l = strlen(cp) + 1; -- cp += l; -- cplen -= l; -- count++; -- } -- return res; --} -- --static void of_free_probes(const char * const *probes) --{ -- if (probes != part_probe_types_def) -- kfree(probes); --} -- - static const struct of_device_id of_flash_match[]; - static int of_flash_probe(struct platform_device *dev) - { -- const char * const *part_probe_types; - const struct of_device_id *match; - struct device_node *dp = dev->dev.of_node; - struct resource res; -@@ -300,14 +262,8 @@ static int of_flash_probe(struct platfor - - info->cmtd->dev.parent = &dev->dev; - mtd_set_of_node(info->cmtd, dp); -- part_probe_types = of_get_probes(dp); -- if (!part_probe_types) { -- err = -ENOMEM; -- goto err_out; -- } -- mtd_device_parse_register(info->cmtd, part_probe_types, NULL, -+ mtd_device_parse_register(info->cmtd, part_probe_types_def, NULL, - NULL, 0); -- of_free_probes(part_probe_types); - - kfree(mtd_list); - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -852,6 +853,42 @@ void deregister_mtd_parser(struct mtd_pa - EXPORT_SYMBOL_GPL(deregister_mtd_parser); - - /* -+ * Parses the linux,part-probe device tree property. -+ * When a non null value is returned it has to be freed with kfree() by -+ * the caller. -+ */ -+static const char * const *of_get_probes(struct device_node *dp) -+{ -+ const char *cp; -+ int cplen; -+ unsigned int l; -+ unsigned int count; -+ const char **res; -+ -+ cp = of_get_property(dp, "linux,part-probe", &cplen); -+ if (cp == NULL) -+ return NULL; -+ -+ count = 0; -+ for (l = 0; l != cplen; l++) -+ if (cp[l] == 0) -+ count++; -+ -+ res = kzalloc((count + 1) * sizeof(*res), GFP_KERNEL); -+ if (!res) -+ return NULL; -+ count = 0; -+ while (cplen > 0) { -+ res[count] = cp; -+ l = strlen(cp) + 1; -+ cp += l; -+ cplen -= l; -+ count++; -+ } -+ return res; -+} -+ -+/* - * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you - * are changing this array! - */ -@@ -1000,6 +1037,13 @@ int parse_mtd_partitions(struct mtd_info - struct mtd_partitions pparts = { }; - struct mtd_part_parser *parser; - int ret, err = 0; -+ const char *const *types_of = NULL; -+ -+ if (mtd_get_of_node(master)) { -+ types_of = of_get_probes(mtd_get_of_node(master)); -+ if (types_of != NULL) -+ types = types_of; -+ } - - if (!types) - types = mtd_is_partition(master) ? default_subpartition_types : -@@ -1041,6 +1085,7 @@ int parse_mtd_partitions(struct mtd_info - if (ret < 0 && !err) - err = ret; - } -+ kfree(types_of); - return err; - } - diff --git a/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch b/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch deleted file mode 100644 index 33f28912a2..0000000000 --- a/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Mathias Kresin -Subject: MIPS: PCI: add controllers before the specified head - -With commit 23dac14d058f ("MIPS: PCI: Use struct list_head lists") new -controllers are added after the specified head where they were added -before the specified head previously. - -Use list_add_tail to restore the former order. - -This patches fixes the following PCI error on lantiq: - - pci 0000:01:00.0: BAR 0: error updating (0x1c000004 != 0x000000) - -Fixes: 23dac14d058f ("MIPS: PCI: Use struct list_head lists") -Signed-off-by: Mathias Kresin ---- - arch/mips/pci/pci-legacy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/pci/pci-legacy.c -+++ b/arch/mips/pci/pci-legacy.c -@@ -194,7 +194,7 @@ void register_pci_controller(struct pci_ - } - - INIT_LIST_HEAD(&hose->list); -- list_add(&hose->list, &controllers); -+ list_add_tail(&hose->list, &controllers); - - /* - * Do not panic here but later - this might happen before console init. diff --git a/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch b/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch deleted file mode 100644 index f2d5df503f..0000000000 --- a/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Felix Fietkau -Subject: net: phy: at803x: add support for AT8032 - -Like AT8030, this PHY needs the GPIO reset workaround - -Signed-off-by: Felix Fietkau ---- - ---- a/drivers/net/phy/at803x.c -+++ b/drivers/net/phy/at803x.c -@@ -62,6 +62,7 @@ - - #define ATH8030_PHY_ID 0x004dd076 - #define ATH8031_PHY_ID 0x004dd074 -+#define ATH8032_PHY_ID 0x004dd023 - #define ATH8035_PHY_ID 0x004dd072 - - MODULE_DESCRIPTION("Atheros 803x PHY driver"); -@@ -259,7 +260,8 @@ static int at803x_probe(struct phy_devic - if (!priv) - return -ENOMEM; - -- if (phydev->drv->phy_id != ATH8030_PHY_ID) -+ if (phydev->drv->phy_id != ATH8030_PHY_ID && -+ phydev->drv->phy_id != ATH8032_PHY_ID) - goto does_not_require_reset_workaround; - - gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); -@@ -335,7 +337,7 @@ static void at803x_link_change_notify(st - struct at803x_priv *priv = phydev->priv; - - /* -- * Conduct a hardware reset for AT8030 every time a link loss is -+ * Conduct a hardware reset for AT8030/2 every time a link loss is - * signalled. This is necessary to circumvent a hardware bug that - * occurs when the cable is unplugged while TX packets are pending - * in the FIFO. In such cases, the FIFO enters an error mode it -@@ -447,6 +449,24 @@ static struct phy_driver at803x_driver[] - .aneg_done = at803x_aneg_done, - .ack_interrupt = &at803x_ack_interrupt, - .config_intr = &at803x_config_intr, -+}, { -+ /* ATHEROS 8032 */ -+ .phy_id = ATH8032_PHY_ID, -+ .name = "Atheros 8032 ethernet", -+ .phy_id_mask = 0xffffffef, -+ .probe = at803x_probe, -+ .config_init = at803x_config_init, -+ .link_change_notify = at803x_link_change_notify, -+ .set_wol = at803x_set_wol, -+ .get_wol = at803x_get_wol, -+ .suspend = at803x_suspend, -+ .resume = at803x_resume, -+ .features = PHY_BASIC_FEATURES, -+ .flags = PHY_HAS_INTERRUPT, -+ .config_aneg = genphy_config_aneg, -+ .read_status = genphy_read_status, -+ .ack_interrupt = at803x_ack_interrupt, -+ .config_intr = at803x_config_intr, - } }; - - module_phy_driver(at803x_driver); -@@ -454,6 +474,7 @@ module_phy_driver(at803x_driver); - static struct mdio_device_id __maybe_unused atheros_tbl[] = { - { ATH8030_PHY_ID, 0xffffffef }, - { ATH8031_PHY_ID, 0xffffffef }, -+ { ATH8032_PHY_ID, 0xffffffef }, - { ATH8035_PHY_ID, 0xffffffef }, - { } - }; diff --git a/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch b/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch deleted file mode 100644 index 8899664fba..0000000000 --- a/target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -From patchwork Fri Jul 21 18:36:24 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [2/5] e1000e: Fix wrong comment related to link detection -From: Benjamin Poirier -X-Patchwork-Id: 9857489 -Message-Id: <20170721183627.13373-2-bpoirier@suse.com> -To: Jeff Kirsher -Cc: Lennart Sorensen , - intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, - linux-kernel@vger.kernel.org -Date: Fri, 21 Jul 2017 11:36:24 -0700 - -Reading e1000e_check_for_copper_link() shows that get_link_status is set to -false after link has been detected. Therefore, it stays TRUE until then. - -Signed-off-by: Benjamin Poirier -Tested-by: Aaron Brown ---- - drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/net/ethernet/intel/e1000e/netdev.c -+++ b/drivers/net/ethernet/intel/e1000e/netdev.c -@@ -5067,7 +5067,7 @@ static bool e1000e_has_link(struct e1000 - - /* get_link_status is set on LSC (link status) interrupt or - * Rx sequence error interrupt. get_link_status will stay -- * false until the check_for_link establishes link -+ * true until the check_for_link establishes link - * for copper adapters ONLY - */ - switch (hw->phy.media_type) { -@@ -5085,7 +5085,7 @@ static bool e1000e_has_link(struct e1000 - break; - case e1000_media_type_internal_serdes: - ret_val = hw->mac.ops.check_for_link(hw); -- link_active = adapter->hw.mac.serdes_has_link; -+ link_active = hw->mac.serdes_has_link; - break; - default: - case e1000_media_type_unknown: diff --git a/target/linux/generic/pending-4.9/201-extra_optimization.patch b/target/linux/generic/pending-4.9/201-extra_optimization.patch deleted file mode 100644 index 813951158c..0000000000 --- a/target/linux/generic/pending-4.9/201-extra_optimization.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Felix Fietkau -Subject: Upgrade to Linux 2.6.19 - -- Includes large parts of the patch from #1021 by dpalffy -- Includes RB532 NAND driver changes by n0-1 - -[john@phrozen.org: feix will add this to his upstream queue] - -lede-commit: bff468813f78f81e36ebb2a3f4354de7365e640f -Signed-off-by: Felix Fietkau ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -658,12 +658,12 @@ KBUILD_CFLAGS += $(call cc-option,-fdata - endif - - ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE --KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) -+KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) - else - ifdef CONFIG_PROFILE_ALL_BRANCHES --KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) -+KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) - else --KBUILD_CFLAGS += -O2 -+KBUILD_CFLAGS += -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION) - endif - endif - diff --git a/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch deleted file mode 100644 index 9bc8055039..0000000000 --- a/target/linux/generic/pending-4.9/203-kallsyms_uncompressed.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Felix Fietkau -Subject: kernel: add a config option for keeping the kallsyms table uncompressed, saving ~9kb kernel size after lzma on ar71xx - -[john@phrozen.org: added to my upstream queue 30.12.2016] -lede-commit: e0e3509b5ce2ccf93d4d67ea907613f5f7ec2eed -Signed-off-by: Felix Fietkau ---- - init/Kconfig | 11 +++++++++++ - kernel/kallsyms.c | 8 ++++++++ - scripts/kallsyms.c | 12 ++++++++++++ - scripts/link-vmlinux.sh | 4 ++++ - 4 files changed, 35 insertions(+) - ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1370,6 +1370,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW - the unaligned access emulation. - see arch/parisc/kernel/unaligned.c for reference - -+config KALLSYMS_UNCOMPRESSED -+ bool "Keep kallsyms uncompressed" -+ depends on KALLSYMS -+ help -+ Normally kallsyms contains compressed symbols (using a token table), -+ reducing the uncompressed kernel image size. Keeping the symbol table -+ uncompressed significantly improves the size of this part in compressed -+ kernel images. -+ -+ Say N unless you need compressed kernel images to be small. -+ - config HAVE_PCSPKR_PLATFORM - bool - ---- a/kernel/kallsyms.c -+++ b/kernel/kallsyms.c -@@ -113,6 +113,11 @@ static unsigned int kallsyms_expand_symb - * For every byte on the compressed symbol data, copy the table - * entry for that byte. - */ -+#ifdef CONFIG_KALLSYMS_UNCOMPRESSED -+ memcpy(result, data + 1, len - 1); -+ result += len - 1; -+ len = 0; -+#endif - while (len) { - tptr = &kallsyms_token_table[kallsyms_token_index[*data]]; - data++; -@@ -145,6 +150,9 @@ tail: - */ - static char kallsyms_get_symbol_type(unsigned int off) - { -+#ifdef CONFIG_KALLSYMS_UNCOMPRESSED -+ return kallsyms_names[off + 1]; -+#endif - /* - * Get just the first code, look it up in the token table, - * and return the first char from this token. ---- a/scripts/kallsyms.c -+++ b/scripts/kallsyms.c -@@ -61,6 +61,7 @@ static struct addr_range percpu_range = - static struct sym_entry *table; - static unsigned int table_size, table_cnt; - static int all_symbols = 0; -+static int uncompressed = 0; - static int absolute_percpu = 0; - static char symbol_prefix_char = '\0'; - static int base_relative = 0; -@@ -449,6 +450,9 @@ static void write_src(void) - - free(markers); - -+ if (uncompressed) -+ return; -+ - output_label("kallsyms_token_table"); - off = 0; - for (i = 0; i < 256; i++) { -@@ -509,6 +513,9 @@ static void *find_token(unsigned char *s - { - int i; - -+ if (uncompressed) -+ return NULL; -+ - for (i = 0; i < len - 1; i++) { - if (str[i] == token[0] && str[i+1] == token[1]) - return &str[i]; -@@ -581,6 +588,9 @@ static void optimize_result(void) - { - int i, best; - -+ if (uncompressed) -+ return; -+ - /* using the '\0' symbol last allows compress_symbols to use standard - * fast string functions */ - for (i = 255; i >= 0; i--) { -@@ -769,6 +779,8 @@ int main(int argc, char **argv) - symbol_prefix_char = *p; - } else if (strcmp(argv[i], "--base-relative") == 0) - base_relative = 1; -+ else if (strcmp(argv[i], "--uncompressed") == 0) -+ uncompressed = 1; - else - usage(); - } ---- a/scripts/link-vmlinux.sh -+++ b/scripts/link-vmlinux.sh -@@ -136,6 +136,10 @@ kallsyms() - kallsymopt="${kallsymopt} --base-relative" - fi - -+ if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then -+ kallsymopt="${kallsymopt} --uncompressed" -+ fi -+ - local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ - ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" - diff --git a/target/linux/generic/pending-4.9/205-backtrace_module_info.patch b/target/linux/generic/pending-4.9/205-backtrace_module_info.patch deleted file mode 100644 index 03c14e048f..0000000000 --- a/target/linux/generic/pending-4.9/205-backtrace_module_info.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Felix Fietkau -Subject: kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries - -[john@phrozen.org: felix will add this to his upstream queue] - -lede-commit 53827cdc824556cda910b23ce5030c363b8f1461 -Signed-off-by: Felix Fietkau ---- - lib/vsprintf.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - ---- a/lib/vsprintf.c -+++ b/lib/vsprintf.c -@@ -669,8 +669,10 @@ char *symbol_string(char *buf, char *end - struct printf_spec spec, const char *fmt) - { - unsigned long value; --#ifdef CONFIG_KALLSYMS - char sym[KSYM_SYMBOL_LEN]; -+#ifndef CONFIG_KALLSYMS -+ struct module *mod; -+ int len; - #endif - - if (fmt[1] == 'R') -@@ -684,11 +686,16 @@ char *symbol_string(char *buf, char *end - sprint_symbol(sym, value); - else - sprint_symbol_no_offset(sym, value); -- -- return string(buf, end, sym, spec); - #else -- return special_hex_number(buf, end, value, sizeof(void *)); -+ len = snprintf(sym, sizeof(sym), "0x%lx", value); -+ -+ mod = __module_address(value); -+ if (mod) -+ snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]", -+ mod->name, mod->core_layout.base, -+ mod->core_layout.size); - #endif -+ return string(buf, end, sym, spec); - } - - static noinline_for_stack diff --git a/target/linux/generic/pending-4.9/220-optimize_inlining.patch b/target/linux/generic/pending-4.9/220-optimize_inlining.patch deleted file mode 100644 index 75c04ea15c..0000000000 --- a/target/linux/generic/pending-4.9/220-optimize_inlining.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/arch/x86/Kconfig.debug -+++ b/arch/x86/Kconfig.debug -@@ -287,20 +287,6 @@ config CPA_DEBUG - ---help--- - Do change_page_attr() self-tests every 30 seconds. - --config OPTIMIZE_INLINING -- bool "Allow gcc to uninline functions marked 'inline'" -- ---help--- -- This option determines if the kernel forces gcc to inline the functions -- developers have marked 'inline'. Doing so takes away freedom from gcc to -- do what it thinks is best, which is desirable for the gcc 3.x series of -- compilers. The gcc 4.x series have a rewritten inlining algorithm and -- enabling this option will generate a smaller kernel there. Hopefully -- this algorithm is so good that allowing gcc 4.x and above to make the -- decision will become the default in the future. Until then this option -- is there to test gcc for this. -- -- If unsure, say N. -- - config DEBUG_ENTRY - bool "Debug low-level entry code" - depends on DEBUG_KERNEL ---- a/lib/Kconfig.debug -+++ b/lib/Kconfig.debug -@@ -117,6 +117,20 @@ endmenu # "printk and dmesg options" - - menu "Compile-time checks and compiler options" - -+config OPTIMIZE_INLINING -+ bool "Allow gcc to uninline functions marked 'inline'" -+ ---help--- -+ This option determines if the kernel forces gcc to inline the functions -+ developers have marked 'inline'. Doing so takes away freedom from gcc to -+ do what it thinks is best, which is desirable for the gcc 3.x series of -+ compilers. The gcc 4.x series have a rewritten inlining algorithm and -+ enabling this option will generate a smaller kernel there. Hopefully -+ this algorithm is so good that allowing gcc 4.x and above to make the -+ decision will become the default in the future. Until then this option -+ is there to test gcc for this. -+ -+ If unsure, say N. -+ - config DEBUG_INFO - bool "Compile the kernel with debug info" - depends on DEBUG_KERNEL && !COMPILE_TEST ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -273,9 +273,6 @@ config ZONE_DMA32 - config AUDIT_ARCH - def_bool y if X86_64 - --config ARCH_SUPPORTS_OPTIMIZED_INLINING -- def_bool y -- - config ARCH_SUPPORTS_DEBUG_PAGEALLOC - def_bool y - ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -89,8 +89,7 @@ - * of extern inline functions at link time. - * A lot of inline functions can cause havoc with function tracing. - */ --#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ -- !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) -+#if !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) - #define inline \ - inline __attribute__((always_inline, unused)) notrace __gnu_inline - #else diff --git a/target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch b/target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch deleted file mode 100644 index 5dc38edfb2..0000000000 --- a/target/linux/generic/pending-4.9/240-remove-unsane-filenames-from-deps_initramfs-list.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Gabor Juhos -Subject: usr: sanitize deps_initramfs list - -If any filename in the intramfs dependency -list contains a colon, that causes a kernel -build error like this: - -/devel/openwrt/build_dir/linux-ar71xx_generic/linux-3.6.6/usr/Makefile:58: *** multiple target patterns. Stop. -make[5]: *** [usr] Error 2 - -Fix it by removing such filenames from the -deps_initramfs list. - -Signed-off-by: Gabor Juhos ---- - usr/Makefile | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data - include $(obj)/.initramfs_data.cpio.d - endif - -+deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v))) -+ - quiet_cmd_initfs = GEN $@ - cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input) - -@@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra - initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \ - initramfs_data.cpio - # do not try to update files included in initramfs --$(deps_initramfs): ; -+$(deps_initramfs_sane): ; - --$(deps_initramfs): klibcdirs -+$(deps_initramfs_sane): klibcdirs - # We rebuild initramfs_data.cpio if: - # 1) Any included file is newer then initramfs_data.cpio - # 2) There are changes in which files are included (added or deleted) - # 3) If gen_init_cpio are newer than initramfs_data.cpio - # 4) arguments to gen_initramfs.sh changes --$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs -+$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs - $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d - $(call if_changed,initfs) diff --git a/target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch b/target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch deleted file mode 100644 index 9955ab3c0b..0000000000 --- a/target/linux/generic/pending-4.9/261-enable_wilink_platform_without_drivers.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Imre Kaloz -Subject: [PATCH] hack: net: wireless: make the wl12xx glue code available with - compat-wireless, too - -Signed-off-by: Imre Kaloz ---- - drivers/net/wireless/ti/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/wireless/ti/Kconfig -+++ b/drivers/net/wireless/ti/Kconfig -@@ -19,7 +19,7 @@ source "drivers/net/wireless/ti/wlcore/K - - config WILINK_PLATFORM_DATA - bool "TI WiLink platform data" -- depends on WLCORE_SDIO || WL1251_SDIO -+ depends on WLCORE_SDIO || WL1251_SDIO || ARCH_OMAP2PLUS - default y - ---help--- - Small platform data bit needed to pass data to the sdio modules. diff --git a/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch deleted file mode 100644 index b52b4cd660..0000000000 --- a/target/linux/generic/pending-4.9/300-mips_expose_boot_raw.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Mark Miller -Subject: mips: expose CONFIG_BOOT_RAW - -This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on -certain Broadcom chipsets running CFE in order to load the kernel. - -Signed-off-by: Mark Miller -Acked-by: Rob Landley ---- ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -1067,9 +1067,6 @@ config FW_ARC - config ARCH_MAY_HAVE_PC_FDC - bool - --config BOOT_RAW -- bool -- - config CEVT_BCM1480 - bool - -@@ -2966,6 +2963,18 @@ choice - bool "Extend builtin kernel arguments with bootloader arguments" - endchoice - -+config BOOT_RAW -+ bool "Enable the kernel to be executed from the load address" -+ default n -+ help -+ Allow the kernel to be executed from the load address for -+ bootloaders which cannot read the ELF format. This places -+ a jump to start_kernel at the load address. -+ -+ If unsure, say N. -+ -+ -+ - endmenu - - config LOCKDEP_SUPPORT diff --git a/target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch b/target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch deleted file mode 100644 index 0e4600237d..0000000000 --- a/target/linux/generic/pending-4.9/302-mips_no_branch_likely.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Felix Fietkau -Subject: mips: use -mno-branch-likely for kernel and userspace - -saves ~11k kernel size after lzma and ~12k squashfs size in the - -lede-commit: 41a039f46450ffae9483d6216422098669da2900 -Signed-off-by: Felix Fietkau ---- - arch/mips/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -90,7 +90,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin - # machines may also. Since BFD is incredibly buggy with respect to - # crossformat linking we rely on the elf2ecoff tool for format conversion. - # --cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -+cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely - cflags-y += -msoft-float - LDFLAGS_vmlinux += -G 0 -static -n -nostdlib - KBUILD_AFLAGS_MODULE += -mlong-calls diff --git a/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch b/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch deleted file mode 100644 index b59b9feee9..0000000000 --- a/target/linux/generic/pending-4.9/304-mips_disable_fpu.patch +++ /dev/null @@ -1,137 +0,0 @@ -From: Manuel Lauss -Subject: [RFC PATCH v4 2/2] MIPS: make FPU emulator optional - -This small patch makes the MIPS FPU emulator optional. The kernel -kills float-users on systems without a hardware FPU by sending a SIGILL. - -Disabling the emulator shrinks vmlinux by about 54kBytes (32bit, -optimizing for size). - -Signed-off-by: Manuel Lauss ---- -v4: rediffed because of patch 1/2, should now work with micromips as well -v3: updated patch description with size savings. -v2: incorporated changes suggested by Jonas Gorski - force the fpu emulator on for micromips: relocating the parts - of the mmips code in the emulator to other areas would be a - much larger change; I went the cheap route instead with this. - - arch/mips/Kbuild | 2 +- - arch/mips/Kconfig | 14 ++++++++++++++ - arch/mips/include/asm/fpu.h | 5 +++-- - arch/mips/include/asm/fpu_emulator.h | 15 +++++++++++++++ - 4 files changed, 33 insertions(+), 3 deletions(-) - ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -2890,6 +2890,20 @@ config MIPS_O32_FP64_SUPPORT - - If unsure, say N. - -+config MIPS_FPU_EMULATOR -+ bool "MIPS FPU Emulator" -+ default y -+ help -+ This option lets you disable the built-in MIPS FPU (Coprocessor 1) -+ emulator, which handles floating-point instructions on processors -+ without a hardware FPU. It is generally a good idea to keep the -+ emulator built-in, unless you are perfectly sure you have a -+ complete soft-float environment. With the emulator disabled, all -+ users of float operations will be killed with an illegal instr- -+ uction exception. -+ -+ Say Y, please. -+ - config USE_OF - bool - select OF ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -287,7 +287,7 @@ OBJCOPYFLAGS += --remove-section=.regin - head-y := arch/mips/kernel/head.o - - libs-y += arch/mips/lib/ --libs-y += arch/mips/math-emu/ -+libs-$(CONFIG_MIPS_FPU_EMULATOR) += arch/mips/math-emu/ - - # See arch/mips/Kbuild for content of core part of the kernel - core-y += arch/mips/ ---- a/arch/mips/include/asm/fpu.h -+++ b/arch/mips/include/asm/fpu.h -@@ -227,8 +227,10 @@ static inline int init_fpu(void) - /* Restore FRE */ - write_c0_config5(config5); - enable_fpu_hazard(); -- } else -+ } else if (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR)) - fpu_emulator_init_fpu(); -+ else -+ ret = SIGILL; - - return ret; - } ---- a/arch/mips/include/asm/fpu_emulator.h -+++ b/arch/mips/include/asm/fpu_emulator.h -@@ -30,6 +30,7 @@ - #include - #include - -+#ifdef CONFIG_MIPS_FPU_EMULATOR - #ifdef CONFIG_DEBUG_FS - - struct mips_fpu_emulator_stats { -@@ -63,6 +64,16 @@ do { \ - extern int fpu_emulator_cop1Handler(struct pt_regs *xcp, - struct mips_fpu_struct *ctx, int has_fpu, - void *__user *fault_addr); -+#else /* no CONFIG_MIPS_FPU_EMULATOR */ -+static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp, -+ struct mips_fpu_struct *ctx, int has_fpu, -+ void *__user *fault_addr) -+{ -+ *fault_addr = NULL; -+ return SIGILL; /* we don't speak MIPS FPU */ -+} -+#endif /* CONFIG_MIPS_FPU_EMULATOR */ -+ - void force_fcr31_sig(unsigned long fcr31, void __user *fault_addr, - struct task_struct *tsk); - int process_fpemu_return(int sig, void __user *fault_addr, ---- a/arch/mips/include/asm/dsemul.h -+++ b/arch/mips/include/asm/dsemul.h -@@ -41,6 +41,7 @@ struct task_struct; - extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir, - unsigned long branch_pc, unsigned long cont_pc); - -+#ifdef CONFIG_MIPS_FPU_EMULATOR - /** - * do_dsemulret() - Return from a delay slot 'emulation' frame - * @xcp: User thread register context. -@@ -88,5 +89,27 @@ extern bool dsemul_thread_rollback(struc - * before @mm is freed in order to avoid memory leaks. - */ - extern void dsemul_mm_cleanup(struct mm_struct *mm); -+#else -+static inline bool do_dsemulret(struct pt_regs *xcp) -+{ -+ return false; -+} -+ -+static inline bool dsemul_thread_cleanup(struct task_struct *tsk) -+{ -+ return false; -+} -+ -+static inline bool dsemul_thread_rollback(struct pt_regs *regs) -+{ -+ return false; -+} -+ -+static inline void dsemul_mm_cleanup(struct mm_struct *mm) -+{ -+ -+} -+ -+#endif - - #endif /* __MIPS_ASM_DSEMUL_H__ */ diff --git a/target/linux/generic/pending-4.9/305-mips_module_reloc.patch b/target/linux/generic/pending-4.9/305-mips_module_reloc.patch deleted file mode 100644 index 10d9f0bdd5..0000000000 --- a/target/linux/generic/pending-4.9/305-mips_module_reloc.patch +++ /dev/null @@ -1,370 +0,0 @@ -From: Felix Fietkau -Subject: mips: replace -mlong-calls with -mno-long-calls to make function calls faster in kernel modules to achieve this, try to - -lede-commit: 3b3d64743ba2a874df9d70cd19e242205b0a788c -Signed-off-by: Felix Fietkau ---- - arch/mips/Makefile | 5 + - arch/mips/include/asm/module.h | 5 + - arch/mips/kernel/module.c | 279 ++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 284 insertions(+), 5 deletions(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -93,8 +93,18 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin - cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely - cflags-y += -msoft-float - LDFLAGS_vmlinux += -G 0 -static -n -nostdlib -+ifdef CONFIG_64BIT - KBUILD_AFLAGS_MODULE += -mlong-calls - KBUILD_CFLAGS_MODULE += -mlong-calls -+else -+ ifdef CONFIG_DYNAMIC_FTRACE -+ KBUILD_AFLAGS_MODULE += -mlong-calls -+ KBUILD_CFLAGS_MODULE += -mlong-calls -+ else -+ KBUILD_AFLAGS_MODULE += -mno-long-calls -+ KBUILD_CFLAGS_MODULE += -mno-long-calls -+ endif -+endif - - ifeq ($(CONFIG_RELOCATABLE),y) - LDFLAGS_vmlinux += --emit-relocs ---- a/arch/mips/include/asm/module.h -+++ b/arch/mips/include/asm/module.h -@@ -11,6 +11,11 @@ struct mod_arch_specific { - const struct exception_table_entry *dbe_start; - const struct exception_table_entry *dbe_end; - struct mips_hi16 *r_mips_hi16_list; -+ -+ void *phys_plt_tbl; -+ void *virt_plt_tbl; -+ unsigned int phys_plt_offset; -+ unsigned int virt_plt_offset; - }; - - typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ ---- a/arch/mips/kernel/module.c -+++ b/arch/mips/kernel/module.c -@@ -44,14 +44,221 @@ struct mips_hi16 { - static LIST_HEAD(dbe_list); - static DEFINE_SPINLOCK(dbe_lock); - --#ifdef MODULE_START -+/* -+ * Get the potential max trampolines size required of the init and -+ * non-init sections. Only used if we cannot find enough contiguous -+ * physically mapped memory to put the module into. -+ */ -+static unsigned int -+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, -+ const char *secstrings, unsigned int symindex, bool is_init) -+{ -+ unsigned long ret = 0; -+ unsigned int i, j; -+ Elf_Sym *syms; -+ -+ /* Everything marked ALLOC (this includes the exported symbols) */ -+ for (i = 1; i < hdr->e_shnum; ++i) { -+ unsigned int info = sechdrs[i].sh_info; -+ -+ if (sechdrs[i].sh_type != SHT_REL -+ && sechdrs[i].sh_type != SHT_RELA) -+ continue; -+ -+ /* Not a valid relocation section? */ -+ if (info >= hdr->e_shnum) -+ continue; -+ -+ /* Don't bother with non-allocated sections */ -+ if (!(sechdrs[info].sh_flags & SHF_ALLOC)) -+ continue; -+ -+ /* If it's called *.init*, and we're not init, we're -+ not interested */ -+ if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0) -+ != is_init) -+ continue; -+ -+ syms = (Elf_Sym *) sechdrs[symindex].sh_addr; -+ if (sechdrs[i].sh_type == SHT_REL) { -+ Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr; -+ unsigned int size = sechdrs[i].sh_size / sizeof(*rel); -+ -+ for (j = 0; j < size; ++j) { -+ Elf_Sym *sym; -+ -+ if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26) -+ continue; -+ -+ sym = syms + ELF_MIPS_R_SYM(rel[j]); -+ if (!is_init && sym->st_shndx != SHN_UNDEF) -+ continue; -+ -+ ret += 4 * sizeof(int); -+ } -+ } else { -+ Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr; -+ unsigned int size = sechdrs[i].sh_size / sizeof(*rela); -+ -+ for (j = 0; j < size; ++j) { -+ Elf_Sym *sym; -+ -+ if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26) -+ continue; -+ -+ sym = syms + ELF_MIPS_R_SYM(rela[j]); -+ if (!is_init && sym->st_shndx != SHN_UNDEF) -+ continue; -+ -+ ret += 4 * sizeof(int); -+ } -+ } -+ } -+ -+ return ret; -+} -+ -+#ifndef MODULE_START -+static void *alloc_phys(unsigned long size) -+{ -+ unsigned order; -+ struct page *page; -+ struct page *p; -+ -+ size = PAGE_ALIGN(size); -+ order = get_order(size); -+ -+ page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN | -+ __GFP_THISNODE, order); -+ if (!page) -+ return NULL; -+ -+ split_page(page, order); -+ -+ /* mark all pages except for the last one */ -+ for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p) -+ set_bit(PG_owner_priv_1, &p->flags); -+ -+ for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p) -+ __free_page(p); -+ -+ return page_address(page); -+} -+#endif -+ -+static void free_phys(void *ptr) -+{ -+ struct page *page; -+ bool free; -+ -+ page = virt_to_page(ptr); -+ do { -+ free = test_and_clear_bit(PG_owner_priv_1, &page->flags); -+ __free_page(page); -+ page++; -+ } while (free); -+} -+ -+ - void *module_alloc(unsigned long size) - { -+#ifdef MODULE_START - return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END, - GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, - __builtin_return_address(0)); -+#else -+ void *ptr; -+ -+ if (size == 0) -+ return NULL; -+ -+ ptr = alloc_phys(size); -+ -+ /* If we failed to allocate physically contiguous memory, -+ * fall back to regular vmalloc. The module loader code will -+ * create jump tables to handle long jumps */ -+ if (!ptr) -+ return vmalloc(size); -+ -+ return ptr; -+#endif - } -+ -+static inline bool is_phys_addr(void *ptr) -+{ -+#ifdef CONFIG_64BIT -+ return (KSEGX((unsigned long)ptr) == CKSEG0); -+#else -+ return (KSEGX(ptr) == KSEG0); - #endif -+} -+ -+/* Free memory returned from module_alloc */ -+void module_memfree(void *module_region) -+{ -+ if (is_phys_addr(module_region)) -+ free_phys(module_region); -+ else -+ vfree(module_region); -+} -+ -+static void *__module_alloc(int size, bool phys) -+{ -+ void *ptr; -+ -+ if (phys) -+ ptr = kmalloc(size, GFP_KERNEL); -+ else -+ ptr = vmalloc(size); -+ return ptr; -+} -+ -+static void __module_free(void *ptr) -+{ -+ if (is_phys_addr(ptr)) -+ kfree(ptr); -+ else -+ vfree(ptr); -+} -+ -+int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, -+ char *secstrings, struct module *mod) -+{ -+ unsigned int symindex = 0; -+ unsigned int core_size, init_size; -+ int i; -+ -+ mod->arch.phys_plt_offset = 0; -+ mod->arch.virt_plt_offset = 0; -+ mod->arch.phys_plt_tbl = NULL; -+ mod->arch.virt_plt_tbl = NULL; -+ -+ if (IS_ENABLED(CONFIG_64BIT)) -+ return 0; -+ -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (sechdrs[i].sh_type == SHT_SYMTAB) -+ symindex = i; -+ -+ core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false); -+ init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true); -+ -+ if ((core_size + init_size) == 0) -+ return 0; -+ -+ mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1); -+ if (!mod->arch.phys_plt_tbl) -+ return -ENOMEM; -+ -+ mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0); -+ if (!mod->arch.virt_plt_tbl) { -+ __module_free(mod->arch.phys_plt_tbl); -+ mod->arch.phys_plt_tbl = NULL; -+ return -ENOMEM; -+ } -+ -+ return 0; -+} - - int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v) - { -@@ -65,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo - return 0; - } - -+static Elf_Addr add_plt_entry_to(unsigned *plt_offset, -+ void *start, Elf_Addr v) -+{ -+ unsigned *tramp = start + *plt_offset; -+ *plt_offset += 4 * sizeof(int); -+ -+ /* adjust carry for addiu */ -+ if (v & 0x00008000) -+ v += 0x10000; -+ -+ tramp[0] = 0x3c190000 | (v >> 16); /* lui t9, hi16 */ -+ tramp[1] = 0x27390000 | (v & 0xffff); /* addiu t9, t9, lo16 */ -+ tramp[2] = 0x03200008; /* jr t9 */ -+ tramp[3] = 0x00000000; /* nop */ -+ -+ return (Elf_Addr) tramp; -+} -+ -+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v) -+{ -+ if (is_phys_addr(location)) -+ return add_plt_entry_to(&me->arch.phys_plt_offset, -+ me->arch.phys_plt_tbl, v); -+ else -+ return add_plt_entry_to(&me->arch.virt_plt_offset, -+ me->arch.virt_plt_tbl, v); -+ -+} -+ - static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v) - { -+ u32 ofs = *location & 0x03ffffff; -+ - if (v % 4) { - pr_err("module %s: dangerous R_MIPS_26 REL relocation\n", - me->name); -@@ -74,13 +312,17 @@ static int apply_r_mips_26_rel(struct mo - } - - if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { -- pr_err("module %s: relocation overflow\n", -- me->name); -- return -ENOEXEC; -+ v = add_plt_entry(me, location, v + (ofs << 2)); -+ if (!v) { -+ pr_err("module %s: relocation overflow\n", -+ me->name); -+ return -ENOEXEC; -+ } -+ ofs = 0; - } - - *location = (*location & ~0x03ffffff) | -- ((*location + (v >> 2)) & 0x03ffffff); -+ ((ofs + (v >> 2)) & 0x03ffffff); - - return 0; - } -@@ -349,9 +591,36 @@ int module_finalize(const Elf_Ehdr *hdr, - list_add(&me->arch.dbe_list, &dbe_list); - spin_unlock_irq(&dbe_lock); - } -+ -+ /* Get rid of the fixup trampoline if we're running the module -+ * from physically mapped address space */ -+ if (me->arch.phys_plt_offset == 0) { -+ __module_free(me->arch.phys_plt_tbl); -+ me->arch.phys_plt_tbl = NULL; -+ } -+ if (me->arch.virt_plt_offset == 0) { -+ __module_free(me->arch.virt_plt_tbl); -+ me->arch.virt_plt_tbl = NULL; -+ } -+ - return 0; - } - -+void module_arch_freeing_init(struct module *mod) -+{ -+ if (mod->state == MODULE_STATE_LIVE) -+ return; -+ -+ if (mod->arch.phys_plt_tbl) { -+ __module_free(mod->arch.phys_plt_tbl); -+ mod->arch.phys_plt_tbl = NULL; -+ } -+ if (mod->arch.virt_plt_tbl) { -+ __module_free(mod->arch.virt_plt_tbl); -+ mod->arch.virt_plt_tbl = NULL; -+ } -+} -+ - void module_arch_cleanup(struct module *mod) - { - spin_lock_irq(&dbe_lock); diff --git a/target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch b/target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch deleted file mode 100644 index 2e404b2236..0000000000 --- a/target/linux/generic/pending-4.9/306-mips_mem_functions_performance.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Felix Fietkau -Subject: [PATCH] mips: allow the compiler to optimize memset, memcmp, memcpy for better performance and (in some instances) smaller code - -lede-commit: 07e59c7bc7f375f792ec9734be42fe4fa391a8bb -Signed-off-by: Felix Fietkau ---- - arch/mips/boot/compressed/Makefile | 3 ++- - arch/mips/include/asm/string.h | 38 ++++++++++++++++++++++++++++++++++++++ - arch/mips/lib/Makefile | 2 +- - arch/mips/lib/memcmp.c | 22 ++++++++++++++++++++++ - 4 files changed, 63 insertions(+), 2 deletions(-) - create mode 100644 arch/mips/lib/memcmp.c - ---- a/arch/mips/boot/compressed/Makefile -+++ b/arch/mips/boot/compressed/Makefile -@@ -23,7 +23,8 @@ KBUILD_CFLAGS := $(shell echo $(KBUILD_C - KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS)) - - KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \ -- -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" -+ -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" \ -+ -D__ZBOOT__ - - KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ - -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \ ---- a/arch/mips/include/asm/string.h -+++ b/arch/mips/include/asm/string.h -@@ -140,4 +140,42 @@ extern void *memcpy(void *__to, __const_ - #define __HAVE_ARCH_MEMMOVE - extern void *memmove(void *__dest, __const__ void *__src, size_t __n); - -+#ifndef __ZBOOT__ -+#define memset(__s, __c, len) \ -+({ \ -+ size_t __len = (len); \ -+ void *__ret; \ -+ if (__builtin_constant_p(len) && __len >= 64) \ -+ __ret = memset((__s), (__c), __len); \ -+ else \ -+ __ret = __builtin_memset((__s), (__c), __len); \ -+ __ret; \ -+}) -+ -+#define memcpy(dst, src, len) \ -+({ \ -+ size_t __len = (len); \ -+ void *__ret; \ -+ if (__builtin_constant_p(len) && __len >= 64) \ -+ __ret = memcpy((dst), (src), __len); \ -+ else \ -+ __ret = __builtin_memcpy((dst), (src), __len); \ -+ __ret; \ -+}) -+ -+#define memmove(dst, src, len) \ -+({ \ -+ size_t __len = (len); \ -+ void *__ret; \ -+ if (__builtin_constant_p(len) && __len >= 64) \ -+ __ret = memmove((dst), (src), __len); \ -+ else \ -+ __ret = __builtin_memmove((dst), (src), __len); \ -+ __ret; \ -+}) -+ -+#define __HAVE_ARCH_MEMCMP -+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len)) -+#endif -+ - #endif /* _ASM_STRING_H */ ---- a/arch/mips/lib/Makefile -+++ b/arch/mips/lib/Makefile -@@ -4,7 +4,7 @@ - - lib-y += bitops.o csum_partial.o delay.o memcpy.o memset.o \ - mips-atomic.o strlen_user.o strncpy_user.o \ -- strnlen_user.o uncached.o -+ strnlen_user.o uncached.o memcmp.o - - obj-y += iomap.o - obj-$(CONFIG_PCI) += iomap-pci.o ---- /dev/null -+++ b/arch/mips/lib/memcmp.c -@@ -0,0 +1,22 @@ -+/* -+ * copied from linux/lib/string.c -+ * -+ * Copyright (C) 1991, 1992 Linus Torvalds -+ */ -+ -+#include -+#include -+ -+#undef memcmp -+int memcmp(const void *cs, const void *ct, size_t count) -+{ -+ const unsigned char *su1, *su2; -+ int res = 0; -+ -+ for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--) -+ if ((res = *su1 - *su2) != 0) -+ break; -+ return res; -+} -+EXPORT_SYMBOL(memcmp); -+ diff --git a/target/linux/generic/pending-4.9/307-mips_highmem_offset.patch b/target/linux/generic/pending-4.9/307-mips_highmem_offset.patch deleted file mode 100644 index 0529b0c5c8..0000000000 --- a/target/linux/generic/pending-4.9/307-mips_highmem_offset.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Felix Fietkau -Subject: kernel: adjust mips highmem offset to avoid the need for -mlong-calls on systems with >256M RAM - -Signed-off-by: Felix Fietkau ---- - arch/mips/include/asm/mach-generic/spaces.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/include/asm/mach-generic/spaces.h -+++ b/arch/mips/include/asm/mach-generic/spaces.h -@@ -46,7 +46,7 @@ - * Memory above this physical address will be considered highmem. - */ - #ifndef HIGHMEM_START --#define HIGHMEM_START _AC(0x20000000, UL) -+#define HIGHMEM_START _AC(0x10000000, UL) - #endif - - #endif /* CONFIG_32BIT */ diff --git a/target/linux/generic/pending-4.9/308-mips32r2_tune.patch b/target/linux/generic/pending-4.9/308-mips32r2_tune.patch deleted file mode 100644 index 9e1efe2713..0000000000 --- a/target/linux/generic/pending-4.9/308-mips32r2_tune.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Felix Fietkau -Subject: kernel: add -mtune=34kc to MIPS CFLAGS when building for mips32r2 - -This provides a good tradeoff across at least 24Kc-74Kc, while also -producing smaller code. - -Signed-off-by: Felix Fietkau ---- - arch/mips/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -153,7 +153,7 @@ cflags-$(CONFIG_CPU_R4X00) += -march=r46 - cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap - cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32 -Wa,--trap --cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ -+cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2 -mtune=34kc,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32r2 -Wa,--trap - cflags-$(CONFIG_CPU_MIPS32_R6) += -march=mips32r6 -Wa,--trap - cflags-$(CONFIG_CPU_MIPS64_R1) += $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \ diff --git a/target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch b/target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch deleted file mode 100644 index b9c072b237..0000000000 --- a/target/linux/generic/pending-4.9/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 87ec87c2ad615c1a177cd08ef5fa29fc739f6e50 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sun, 23 Dec 2018 18:06:53 +0100 -Subject: [PATCH] MIPS: Add CPU option reporting to /proc/cpuinfo - -Many MIPS CPUs have optional CPU features which are not activates for -all CPU cores. Print the CPU options which are implemented in the core -in /proc/cpuinfo. This makes it possible to see what features are -supported and which are not supported. This should cover all standard -MIPS extensions, before it only printed information about the main MIPS -ASEs. - -Signed-off-by: Hauke Mehrtens ---- - arch/mips/kernel/proc.c | 116 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 116 insertions(+) - ---- a/arch/mips/kernel/proc.c -+++ b/arch/mips/kernel/proc.c -@@ -128,6 +128,114 @@ static int show_cpuinfo(struct seq_file - seq_printf(m, "micromips kernel\t: %s\n", - (read_c0_config3() & MIPS_CONF3_ISA_OE) ? "yes" : "no"); - } -+ -+ seq_printf(m, "Options implemented\t:"); -+ if (cpu_has_tlb) -+ seq_printf(m, "%s", " tlb"); -+ if (cpu_has_ftlb) -+ seq_printf(m, "%s", " ftlb"); -+ if (cpu_has_tlbinv) -+ seq_printf(m, "%s", " tlbinv"); -+ if (cpu_has_segments) -+ seq_printf(m, "%s", " segments"); -+ if (cpu_has_rixiex) -+ seq_printf(m, "%s", " rixiex"); -+ if (cpu_has_ldpte) -+ seq_printf(m, "%s", " ldpte"); -+ if (cpu_has_maar) -+ seq_printf(m, "%s", " maar"); -+ if (cpu_has_rw_llb) -+ seq_printf(m, "%s", " rw_llb"); -+ if (cpu_has_4kex) -+ seq_printf(m, "%s", " 4kex"); -+ if (cpu_has_3k_cache) -+ seq_printf(m, "%s", " 3k_cache"); -+ if (cpu_has_4k_cache) -+ seq_printf(m, "%s", " 4k_cache"); -+ if (cpu_has_6k_cache) -+ seq_printf(m, "%s", " 6k_cache"); -+ if (cpu_has_8k_cache) -+ seq_printf(m, "%s", " 8k_cache"); -+ if (cpu_has_tx39_cache) -+ seq_printf(m, "%s", " tx39_cache"); -+ if (cpu_has_octeon_cache) -+ seq_printf(m, "%s", " octeon_cache"); -+ if (cpu_has_fpu) -+ seq_printf(m, "%s", " fpu"); -+ if (cpu_has_32fpr) -+ seq_printf(m, "%s", " 32fpr"); -+ if (cpu_has_cache_cdex_p) -+ seq_printf(m, "%s", " cache_cdex_p"); -+ if (cpu_has_cache_cdex_s) -+ seq_printf(m, "%s", " cache_cdex_s"); -+ if (cpu_has_prefetch) -+ seq_printf(m, "%s", " prefetch"); -+ if (cpu_has_mcheck) -+ seq_printf(m, "%s", " mcheck"); -+ if (cpu_has_ejtag) -+ seq_printf(m, "%s", " ejtag"); -+ if (cpu_has_llsc) -+ seq_printf(m, "%s", " llsc"); -+ if (cpu_has_bp_ghist) -+ seq_printf(m, "%s", " bp_ghist"); -+ if (cpu_has_guestctl0ext) -+ seq_printf(m, "%s", " guestctl0ext"); -+ if (cpu_has_guestctl1) -+ seq_printf(m, "%s", " guestctl1"); -+ if (cpu_has_guestctl2) -+ seq_printf(m, "%s", " guestctl2"); -+ if (cpu_has_guestid) -+ seq_printf(m, "%s", " guestid"); -+ if (cpu_has_drg) -+ seq_printf(m, "%s", " drg"); -+ if (cpu_has_rixi) -+ seq_printf(m, "%s", " rixi"); -+ if (cpu_has_lpa) -+ seq_printf(m, "%s", " lpa"); -+ if (cpu_has_mvh) -+ seq_printf(m, "%s", " mvh"); -+ if (cpu_has_vtag_icache) -+ seq_printf(m, "%s", " vtag_icache"); -+ if (cpu_has_dc_aliases) -+ seq_printf(m, "%s", " dc_aliases"); -+ if (cpu_has_ic_fills_f_dc) -+ seq_printf(m, "%s", " ic_fills_f_dc"); -+ if (cpu_has_pindexed_dcache) -+ seq_printf(m, "%s", " pindexed_dcache"); -+ if (cpu_has_userlocal) -+ seq_printf(m, "%s", " userlocal"); -+ if (cpu_has_nofpuex) -+ seq_printf(m, "%s", " nofpuex"); -+ if (cpu_has_vint) -+ seq_printf(m, "%s", " vint"); -+ if (cpu_has_veic) -+ seq_printf(m, "%s", " veic"); -+ if (cpu_has_inclusive_pcaches) -+ seq_printf(m, "%s", " inclusive_pcaches"); -+ if (cpu_has_perf_cntr_intr_bit) -+ seq_printf(m, "%s", " perf_cntr_intr_bit"); -+ if (cpu_has_fre) -+ seq_printf(m, "%s", " fre"); -+ if (cpu_has_cdmm) -+ seq_printf(m, "%s", " cdmm"); -+ if (cpu_has_small_pages) -+ seq_printf(m, "%s", " small_pages"); -+ if (cpu_has_nan_legacy) -+ seq_printf(m, "%s", " nan_legacy"); -+ if (cpu_has_nan_2008) -+ seq_printf(m, "%s", " nan_2008"); -+ if (cpu_has_ebase_wg) -+ seq_printf(m, "%s", " ebase_wg"); -+ if (cpu_has_badinstr) -+ seq_printf(m, "%s", " badinstr"); -+ if (cpu_has_badinstrp) -+ seq_printf(m, "%s", " badinstrp"); -+ if (cpu_has_contextconfig) -+ seq_printf(m, "%s", " contextconfig"); -+ if (cpu_has_perf) -+ seq_printf(m, "%s", " perf"); -+ seq_printf(m, "\n"); -+ - seq_printf(m, "shadow register sets\t: %d\n", - cpu_data[n].srsets); - seq_printf(m, "kscratch registers\t: %d\n", diff --git a/target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch b/target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch deleted file mode 100644 index cc1a51d17d..0000000000 --- a/target/linux/generic/pending-4.9/310-arm_module_unresolved_weak_sym.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Felix Fietkau -Subject: fix errors in unresolved weak symbols on arm - -lede-commit: 570699d4838a907c3ef9f2819bf19eb72997b32f -Signed-off-by: Felix Fietkau ---- - arch/arm/kernel/module.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/arch/arm/kernel/module.c -+++ b/arch/arm/kernel/module.c -@@ -88,6 +88,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons - return -ENOEXEC; - } - -+ if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) && -+ ELF_ST_BIND(sym->st_info) == STB_WEAK) -+ continue; -+ - loc = dstsec->sh_addr + rel->r_offset; - - switch (ELF32_R_TYPE(rel->r_info)) { diff --git a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch deleted file mode 100644 index 8d50208d5b..0000000000 --- a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ /dev/null @@ -1,271 +0,0 @@ -From: Yousong Zhou -Subject: MIPS: kexec: Accept command line parameters from userspace. - -Signed-off-by: Yousong Zhou ---- - arch/mips/kernel/machine_kexec.c | 153 +++++++++++++++++++++++++++++++----- - arch/mips/kernel/machine_kexec.h | 20 +++++ - arch/mips/kernel/relocate_kernel.S | 21 +++-- - 3 files changed, 167 insertions(+), 27 deletions(-) - create mode 100644 arch/mips/kernel/machine_kexec.h - ---- a/arch/mips/kernel/machine_kexec.c -+++ b/arch/mips/kernel/machine_kexec.c -@@ -10,14 +10,11 @@ - #include - #include - -+#include - #include - #include -- --extern const unsigned char relocate_new_kernel[]; --extern const size_t relocate_new_kernel_size; -- --extern unsigned long kexec_start_address; --extern unsigned long kexec_indirection_page; -+#include -+#include "machine_kexec.h" - - int (*_machine_kexec_prepare)(struct kimage *) = NULL; - void (*_machine_kexec_shutdown)(void) = NULL; -@@ -28,9 +25,117 @@ atomic_t kexec_ready_to_reboot = ATOMIC_ - void (*_crash_smp_send_stop)(void) = NULL; - #endif - -+static void machine_kexec_print_args(void) -+{ -+ unsigned long argc = (int)kexec_args[0]; -+ int i; -+ -+ pr_info("kexec_args[0] (argc): %lu\n", argc); -+ pr_info("kexec_args[1] (argv): %p\n", (void *)kexec_args[1]); -+ pr_info("kexec_args[2] (env ): %p\n", (void *)kexec_args[2]); -+ pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]); -+ -+ for (i = 0; i < argc; i++) { -+ pr_info("kexec_argv[%d] = %p, %s\n", -+ i, kexec_argv[i], kexec_argv[i]); -+ } -+} -+ -+static void machine_kexec_init_argv(struct kimage *image) -+{ -+ void __user *buf = NULL; -+ size_t bufsz; -+ size_t size; -+ int i; -+ -+ bufsz = 0; -+ for (i = 0; i < image->nr_segments; i++) { -+ struct kexec_segment *seg; -+ -+ seg = &image->segment[i]; -+ if (seg->bufsz < 6) -+ continue; -+ -+ if (strncmp((char *) seg->buf, "kexec ", 6)) -+ continue; -+ -+ buf = seg->buf; -+ bufsz = seg->bufsz; -+ break; -+ } -+ -+ if (!buf) -+ return; -+ -+ size = KEXEC_COMMAND_LINE_SIZE; -+ size = min(size, bufsz); -+ if (size < bufsz) -+ pr_warn("kexec command line truncated to %zd bytes\n", size); -+ -+ /* Copy to kernel space */ -+ if (copy_from_user(kexec_argv_buf, buf, size)) -+ pr_warn("kexec command line copy to kernel space failed\n"); -+ -+ kexec_argv_buf[size - 1] = 0; -+} -+ -+static void machine_kexec_parse_argv(struct kimage *image) -+{ -+ char *reboot_code_buffer; -+ int reloc_delta; -+ char *ptr; -+ int argc; -+ int i; -+ -+ ptr = kexec_argv_buf; -+ argc = 0; -+ -+ /* -+ * convert command line string to array of parameters -+ * (as bootloader does). -+ */ -+ while (ptr && *ptr && (KEXEC_MAX_ARGC > argc)) { -+ if (*ptr == ' ') { -+ *ptr++ = '\0'; -+ continue; -+ } -+ -+ kexec_argv[argc++] = ptr; -+ ptr = strchr(ptr, ' '); -+ } -+ -+ if (!argc) -+ return; -+ -+ kexec_args[0] = argc; -+ kexec_args[1] = (unsigned long)kexec_argv; -+ kexec_args[2] = 0; -+ kexec_args[3] = 0; -+ -+ reboot_code_buffer = page_address(image->control_code_page); -+ reloc_delta = reboot_code_buffer - (char *)kexec_relocate_new_kernel; -+ -+ kexec_args[1] += reloc_delta; -+ for (i = 0; i < argc; i++) -+ kexec_argv[i] += reloc_delta; -+} -+ - int - machine_kexec_prepare(struct kimage *kimage) - { -+ /* -+ * Whenever arguments passed from kexec-tools, Init the arguments as -+ * the original ones to try avoiding booting failure. -+ */ -+ -+ kexec_args[0] = fw_arg0; -+ kexec_args[1] = fw_arg1; -+ kexec_args[2] = fw_arg2; -+ kexec_args[3] = fw_arg3; -+ -+ machine_kexec_init_argv(kimage); -+ machine_kexec_parse_argv(kimage); -+ - if (_machine_kexec_prepare) - return _machine_kexec_prepare(kimage); - return 0; -@@ -67,10 +172,12 @@ machine_kexec(struct kimage *image) - unsigned long *ptr; - - reboot_code_buffer = -- (unsigned long)page_address(image->control_code_page); -+ (unsigned long)page_address(image->control_code_page); -+ pr_info("reboot_code_buffer = %p\n", (void *)reboot_code_buffer); - - kexec_start_address = - (unsigned long) phys_to_virt(image->start); -+ pr_info("kexec_start_address = %p\n", (void *)kexec_start_address); - - if (image->type == KEXEC_TYPE_DEFAULT) { - kexec_indirection_page = -@@ -78,9 +185,19 @@ machine_kexec(struct kimage *image) - } else { - kexec_indirection_page = (unsigned long)&image->head; - } -+ pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page); - -- memcpy((void*)reboot_code_buffer, relocate_new_kernel, -- relocate_new_kernel_size); -+ pr_info("Where is memcpy: %p\n", memcpy); -+ pr_info("kexec_relocate_new_kernel = %p, kexec_relocate_new_kernel_end = %p\n", -+ (void *)kexec_relocate_new_kernel, &kexec_relocate_new_kernel_end); -+ pr_info("Copy %lu bytes from %p to %p\n", KEXEC_RELOCATE_NEW_KERNEL_SIZE, -+ (void *)kexec_relocate_new_kernel, (void *)reboot_code_buffer); -+ memcpy((void*)reboot_code_buffer, kexec_relocate_new_kernel, -+ KEXEC_RELOCATE_NEW_KERNEL_SIZE); -+ -+ pr_info("Before _print_args().\n"); -+ machine_kexec_print_args(); -+ pr_info("Before eval loop.\n"); - - /* - * The generic kexec code builds a page list with physical -@@ -102,15 +219,16 @@ machine_kexec(struct kimage *image) - /* - * we do not want to be bothered. - */ -+ pr_info("Before irq_disable.\n"); - local_irq_disable(); - -- printk("Will call new kernel at %08lx\n", image->start); -- printk("Bye ...\n"); -+ pr_info("Will call new kernel at %08lx\n", image->start); -+ pr_info("Bye ...\n"); - __flush_cache_all(); - #ifdef CONFIG_SMP - /* All secondary cpus now may jump to kexec_wait cycle */ - relocated_kexec_smp_wait = reboot_code_buffer + -- (void *)(kexec_smp_wait - relocate_new_kernel); -+ (void *)(kexec_smp_wait - kexec_relocate_new_kernel); - smp_wmb(); - atomic_set(&kexec_ready_to_reboot, 1); - #endif ---- /dev/null -+++ b/arch/mips/kernel/machine_kexec.h -@@ -0,0 +1,20 @@ -+#ifndef _MACHINE_KEXEC_H -+#define _MACHINE_KEXEC_H -+ -+#ifndef __ASSEMBLY__ -+extern const unsigned char kexec_relocate_new_kernel[]; -+extern unsigned long kexec_relocate_new_kernel_end; -+extern unsigned long kexec_start_address; -+extern unsigned long kexec_indirection_page; -+ -+extern char kexec_argv_buf[]; -+extern char *kexec_argv[]; -+ -+#define KEXEC_RELOCATE_NEW_KERNEL_SIZE ((unsigned long)&kexec_relocate_new_kernel_end - (unsigned long)kexec_relocate_new_kernel) -+#endif /* !__ASSEMBLY__ */ -+ -+#define KEXEC_COMMAND_LINE_SIZE 256 -+#define KEXEC_ARGV_SIZE (KEXEC_COMMAND_LINE_SIZE / 16) -+#define KEXEC_MAX_ARGC (KEXEC_ARGV_SIZE / sizeof(long)) -+ -+#endif ---- a/arch/mips/kernel/relocate_kernel.S -+++ b/arch/mips/kernel/relocate_kernel.S -@@ -12,8 +12,9 @@ - #include - #include - #include -+#include "machine_kexec.h" - --LEAF(relocate_new_kernel) -+LEAF(kexec_relocate_new_kernel) - PTR_L a0, arg0 - PTR_L a1, arg1 - PTR_L a2, arg2 -@@ -98,7 +99,7 @@ done: - #endif - /* jump to kexec_start_address */ - j s1 -- END(relocate_new_kernel) -+ END(kexec_relocate_new_kernel) - - #ifdef CONFIG_SMP - /* -@@ -184,9 +185,15 @@ kexec_indirection_page: - PTR 0 - .size kexec_indirection_page, PTRSIZE - --relocate_new_kernel_end: -+kexec_argv_buf: -+ EXPORT(kexec_argv_buf) -+ .skip KEXEC_COMMAND_LINE_SIZE -+ .size kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE -+ -+kexec_argv: -+ EXPORT(kexec_argv) -+ .skip KEXEC_ARGV_SIZE -+ .size kexec_argv, KEXEC_ARGV_SIZE - --relocate_new_kernel_size: -- EXPORT(relocate_new_kernel_size) -- PTR relocate_new_kernel_end - relocate_new_kernel -- .size relocate_new_kernel_size, PTRSIZE -+kexec_relocate_new_kernel_end: -+ EXPORT(kexec_relocate_new_kernel_end) diff --git a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch deleted file mode 100644 index ca89f87594..0000000000 --- a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: Alexey Brodkin -Subject: openwrt: arc - add OWRTDTB section - -This change allows OpenWRT to patch resulting kernel binary with -external .dtb. - -That allows us to re-use exactky the same vmlinux on different boards -given its ARC core configurations match (at least cache line sizes etc). - -""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external -.dtb right after it, keeping the string in place. - -Signed-off-by: Alexey Brodkin ---- - arch/arc/kernel/head.S | 10 ++++++++++ - arch/arc/kernel/setup.c | 4 +++- - arch/arc/kernel/vmlinux.lds.S | 13 +++++++++++++ - 3 files changed, 26 insertions(+), 1 deletion(-) - ---- a/arch/arc/kernel/head.S -+++ b/arch/arc/kernel/head.S -@@ -59,6 +59,16 @@ - #endif - .endm - -+; Here "patch-dtb" will embed external .dtb -+; Note "patch-dtb" searches for ASCII "OWRTDTB:" string -+; and pastes .dtb right after it, hense the string precedes -+; __image_dtb symbol. -+ .section .owrt, "aw",@progbits -+ .ascii "OWRTDTB:" -+ENTRY(__image_dtb) -+ .fill 0x4000 -+END(__image_dtb) -+ - .section .init.text, "ax",@progbits - - ;---------------------------------------------------------------- ---- a/arch/arc/kernel/setup.c -+++ b/arch/arc/kernel/setup.c -@@ -444,7 +444,7 @@ ignore_uboot_args: - #endif - - if (use_embedded_dtb) { -- machine_desc = setup_machine_fdt(__dtb_start); -+ machine_desc = setup_machine_fdt(&__image_dtb); - if (!machine_desc) - panic("Embedded DT invalid\n"); - } -@@ -460,6 +460,8 @@ ignore_uboot_args: - } - } - -+extern struct boot_param_header __image_dtb; -+ - void __init setup_arch(char **cmdline_p) - { - handle_uboot_args(); ---- a/arch/arc/kernel/vmlinux.lds.S -+++ b/arch/arc/kernel/vmlinux.lds.S -@@ -30,6 +30,19 @@ SECTIONS - - . = CONFIG_LINUX_LINK_BASE; - -+ /* -+ * In OpenWRT we want to patch built binary embedding .dtb of choice. -+ * This is implemented with "patch-dtb" utility which searches for -+ * "OWRTDTB:" string in first 16k of image and if it is found -+ * copies .dtb right after mentioned string. -+ * -+ * Note: "OWRTDTB:" won't be overwritten with .dtb, .dtb will follow it. -+ */ -+ .owrt : { -+ *(.owrt) -+ . = ALIGN(PAGE_SIZE); -+ } -+ - _int_vec_base_lds = .; - .vector : { - *(.vector) diff --git a/target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch b/target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch deleted file mode 100644 index 4e0265aef5..0000000000 --- a/target/linux/generic/pending-4.9/333-arc-enable-unaligned-access-in-kernel-mode.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Alexey Brodkin -Subject: arc: enable unaligned access in kernel mode - -This enables misaligned access handling even in kernel mode. -Some wireless drivers (ath9k-htc and mt7601u) use misaligned accesses -here and there and to cope with that without fixing stuff in the drivers -we're just gracefully handling it on ARC. - -Signed-off-by: Alexey Brodkin ---- - arch/arc/kernel/unaligned.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arc/kernel/unaligned.c -+++ b/arch/arc/kernel/unaligned.c -@@ -206,7 +206,7 @@ int misaligned_fixup(unsigned long addre - char buf[TASK_COMM_LEN]; - - /* handle user mode only and only if enabled by sysadmin */ -- if (!user_mode(regs) || !unaligned_enabled) -+ if (!unaligned_enabled) - return 1; - - if (no_unaligned_warning) { diff --git a/target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch b/target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch deleted file mode 100644 index 4091542581..0000000000 --- a/target/linux/generic/pending-4.9/340-MIPS-mm-remove-mips_dma_mapping_error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Felix Fietkau -Date: Tue, 5 Dec 2017 12:34:31 +0100 -Subject: [PATCH] MIPS: mm: remove mips_dma_mapping_error - -dma_mapping_error() already checks if ops->mapping_error is a null -pointer - -Signed-off-by: Felix Fietkau ---- - ---- a/arch/mips/mm/dma-default.c -+++ b/arch/mips/mm/dma-default.c -@@ -394,11 +394,6 @@ static void mips_dma_sync_sg_for_device( - } - } - --int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) --{ -- return 0; --} -- - int mips_dma_supported(struct device *dev, u64 mask) - { - return plat_dma_supported(dev, mask); -@@ -427,7 +422,6 @@ static struct dma_map_ops mips_default_d - .sync_single_for_device = mips_dma_sync_single_for_device, - .sync_sg_for_cpu = mips_dma_sync_sg_for_cpu, - .sync_sg_for_device = mips_dma_sync_sg_for_device, -- .mapping_error = mips_dma_mapping_error, - .dma_supported = mips_dma_supported - }; - diff --git a/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch b/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch deleted file mode 100644 index 0f47f79c68..0000000000 --- a/target/linux/generic/pending-4.9/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch +++ /dev/null @@ -1,140 +0,0 @@ -From: Felix Fietkau -Date: Tue, 5 Dec 2017 12:46:01 +0100 -Subject: [PATCH] MIPS: mm: remove no-op dma_map_ops where possible - -If no post-DMA flush is required, and the platform does not provide -plat_unmap_dma_mem(), there is no need to include unmap or sync_for_cpu -ops. - -With this patch they are compiled out to improve icache footprint -on devices that handle lots of DMA traffic (especially network routers). - -Signed-off-by: Felix Fietkau ---- - ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -215,6 +215,7 @@ config BMIPS_GENERIC - select BRCMSTB_L2_IRQ - select IRQ_MIPS_CPU - select DMA_NONCOHERENT -+ select DMA_UNMAP_POST_FLUSH - select SYS_SUPPORTS_32BIT_KERNEL - select SYS_SUPPORTS_LITTLE_ENDIAN - select SYS_SUPPORTS_BIG_ENDIAN -@@ -340,6 +341,7 @@ config MACH_JAZZ - select CSRC_R4K - select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN - select GENERIC_ISA_DMA -+ select DMA_UNMAP_POST_FLUSH - select HAVE_PCSPKR_PLATFORM - select IRQ_MIPS_CPU - select I8253 -@@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT - bool - select NEED_DMA_MAP_STATE - -+config DMA_UNMAP_POST_FLUSH -+ bool -+ - config NEED_DMA_MAP_STATE - bool - -@@ -1652,6 +1657,7 @@ config CPU_R10000 - select CPU_SUPPORTS_64BIT_KERNEL - select CPU_SUPPORTS_HIGHMEM - select CPU_SUPPORTS_HUGEPAGES -+ select DMA_UNMAP_POST_FLUSH - help - MIPS Technologies R10000-series processors. - -@@ -1897,9 +1903,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 - bool - - config SYS_HAS_CPU_MIPS32_R5 -+ select DMA_UNMAP_POST_FLUSH - bool - - config SYS_HAS_CPU_MIPS32_R6 -+ select DMA_UNMAP_POST_FLUSH - bool - - config SYS_HAS_CPU_MIPS64_R1 -@@ -1909,6 +1917,7 @@ config SYS_HAS_CPU_MIPS64_R2 - bool - - config SYS_HAS_CPU_MIPS64_R6 -+ select DMA_UNMAP_POST_FLUSH - bool - - config SYS_HAS_CPU_R3000 ---- a/arch/mips/mm/dma-default.c -+++ b/arch/mips/mm/dma-default.c -@@ -290,8 +290,9 @@ static inline void __dma_sync(struct pag - } while (left); - } - --static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr, -- size_t size, enum dma_data_direction direction, unsigned long attrs) -+static void __maybe_unused -+mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size, -+ enum dma_data_direction direction, unsigned long attrs) - { - if (cpu_needs_post_dma_flush(dev)) - __dma_sync(dma_addr_to_page(dev, dma_addr), -@@ -330,9 +331,10 @@ static dma_addr_t mips_dma_map_page(stru - return plat_map_dma_mem_page(dev, page) + offset; - } - --static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, -- int nhwentries, enum dma_data_direction direction, -- unsigned long attrs) -+static void __maybe_unused -+mips_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, -+ int nhwentries, enum dma_data_direction direction, -+ unsigned long attrs) - { - int i; - struct scatterlist *sg; -@@ -346,8 +348,9 @@ static void mips_dma_unmap_sg(struct dev - } - } - --static void mips_dma_sync_single_for_cpu(struct device *dev, -- dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) -+static void __maybe_unused -+mips_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, -+ size_t size, enum dma_data_direction direction) - { - if (cpu_needs_post_dma_flush(dev)) - __dma_sync(dma_addr_to_page(dev, dma_handle), -@@ -363,9 +366,9 @@ static void mips_dma_sync_single_for_dev - dma_handle & ~PAGE_MASK, size, direction); - } - --static void mips_dma_sync_sg_for_cpu(struct device *dev, -- struct scatterlist *sglist, int nelems, -- enum dma_data_direction direction) -+static void __maybe_unused -+mips_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist, -+ int nelems, enum dma_data_direction direction) - { - int i; - struct scatterlist *sg; -@@ -415,12 +418,14 @@ static struct dma_map_ops mips_default_d - .free = mips_dma_free_coherent, - .mmap = mips_dma_mmap, - .map_page = mips_dma_map_page, -- .unmap_page = mips_dma_unmap_page, - .map_sg = mips_dma_map_sg, -+#ifdef CONFIG_DMA_UNMAP_POST_FLUSH -+ .unmap_page = mips_dma_unmap_page, - .unmap_sg = mips_dma_unmap_sg, - .sync_single_for_cpu = mips_dma_sync_single_for_cpu, -- .sync_single_for_device = mips_dma_sync_single_for_device, - .sync_sg_for_cpu = mips_dma_sync_sg_for_cpu, -+#endif -+ .sync_single_for_device = mips_dma_sync_single_for_device, - .sync_sg_for_device = mips_dma_sync_sg_for_device, - .dma_supported = mips_dma_supported - }; diff --git a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch deleted file mode 100644 index 4369ed3f4f..0000000000 --- a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: Felix Fietkau -Subject: make rootfs split/detection more generic - patch can be moved to generic-2.6 after testing on other platforms - -lede-commit: 328e660b31f0937d52c5ae3d6e7029409918a9df -Signed-off-by: Felix Fietkau ---- - drivers/mtd/Kconfig | 17 +++++++++++++++++ - drivers/mtd/mtdpart.c | 35 +++++++++++++++++++++++++++++++++++ - include/linux/mtd/partitions.h | 2 ++ - 3 files changed, 54 insertions(+) - ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -12,6 +12,23 @@ menuconfig MTD - - if MTD - -+menu "OpenWrt specific MTD options" -+ -+config MTD_ROOTFS_ROOT_DEV -+ bool "Automatically set 'rootfs' partition to be root filesystem" -+ default y -+ -+config MTD_SPLIT_FIRMWARE -+ bool "Automatically split firmware partition for kernel+rootfs" -+ default y -+ -+config MTD_SPLIT_FIRMWARE_NAME -+ string "Firmware partition name" -+ depends on MTD_SPLIT_FIRMWARE -+ default "firmware" -+ -+endmenu -+ - config MTD_TESTS - tristate "MTD tests support (DANGEROUS)" - depends on m ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -29,11 +29,13 @@ - #include - #include - #include -+#include - #include - #include - #include - - #include "mtdcore.h" -+#include "mtdsplit/mtdsplit.h" - - /* Our partition linked list */ - static LIST_HEAD(mtd_partitions); -@@ -53,6 +55,8 @@ struct mtd_part { - struct list_head list; - }; - -+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part); -+ - /* - * Given a pointer to the MTD object in the mtd_part structure, we can retrieve - * the pointer to that structure. -@@ -653,6 +657,7 @@ int mtd_add_partition(struct mtd_info *p - if (ret) - goto err_remove_part; - -+ mtd_partition_split(parent, new); - mtd_add_partition_attrs(new); - - return 0; -@@ -739,6 +744,29 @@ int mtd_del_partition(struct mtd_info *m - } - EXPORT_SYMBOL_GPL(mtd_del_partition); - -+#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME -+#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME -+#else -+#define SPLIT_FIRMWARE_NAME "unused" -+#endif -+ -+static void split_firmware(struct mtd_info *master, struct mtd_part *part) -+{ -+} -+ -+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) -+{ -+ static int rootfs_found = 0; -+ -+ if (rootfs_found) -+ return; -+ -+ if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) && -+ !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && -+ !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL)) -+ split_firmware(master, part); -+} -+ - /* - * This function, given a master MTD object and a partition table, creates - * and registers slave MTD objects which are bound to the master according to -@@ -779,6 +807,7 @@ int add_mtd_partitions(struct mtd_info * - goto err_del_partitions; - } - -+ mtd_partition_split(master, slave); - mtd_add_partition_attrs(slave); - /* Look for subpartitions */ - parse_mtd_partitions(&slave->mtd, parts[i].types, NULL); diff --git a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch deleted file mode 100644 index eefba9f508..0000000000 --- a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Gabor Juhos -Subject: mtd: add support for different partition parser types - -Signed-off-by: Gabor Juhos ---- - drivers/mtd/mtdpart.c | 56 ++++++++++++++++++++++++++++++++++++++++ - include/linux/mtd/partitions.h | 11 ++++++++ - 2 files changed, 67 insertions(+) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -56,6 +56,10 @@ struct mtd_part { - }; - - static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part); -+static int parse_mtd_partitions_by_type(struct mtd_info *master, -+ enum mtd_parser_type type, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data); - - /* - * Given a pointer to the MTD object in the mtd_part structure, we can retrieve -@@ -744,6 +748,36 @@ int mtd_del_partition(struct mtd_info *m - } - EXPORT_SYMBOL_GPL(mtd_del_partition); - -+static int -+run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type) -+{ -+ struct mtd_partition *parts; -+ int nr_parts; -+ int i; -+ -+ nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, (const struct mtd_partition **)&parts, -+ NULL); -+ if (nr_parts <= 0) -+ return nr_parts; -+ -+ if (WARN_ON(!parts)) -+ return 0; -+ -+ for (i = 0; i < nr_parts; i++) { -+ /* adjust partition offsets */ -+ parts[i].offset += slave->offset; -+ -+ mtd_add_partition(slave->parent, -+ parts[i].name, -+ parts[i].offset, -+ parts[i].size); -+ } -+ -+ kfree(parts); -+ -+ return nr_parts; -+} -+ - #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME - #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME - #else -@@ -1134,6 +1168,61 @@ void mtd_part_parser_cleanup(struct mtd_ - } - } - -+static struct mtd_part_parser * -+get_partition_parser_by_type(enum mtd_parser_type type, -+ struct mtd_part_parser *start) -+{ -+ struct mtd_part_parser *p, *ret = NULL; -+ -+ spin_lock(&part_parser_lock); -+ -+ p = list_prepare_entry(start, &part_parsers, list); -+ if (start) -+ mtd_part_parser_put(start); -+ -+ list_for_each_entry_continue(p, &part_parsers, list) { -+ if (p->type == type && try_module_get(p->owner)) { -+ ret = p; -+ break; -+ } -+ } -+ -+ spin_unlock(&part_parser_lock); -+ -+ return ret; -+} -+ -+static int parse_mtd_partitions_by_type(struct mtd_info *master, -+ enum mtd_parser_type type, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ struct mtd_part_parser *prev = NULL; -+ int ret = 0; -+ -+ while (1) { -+ struct mtd_part_parser *parser; -+ -+ parser = get_partition_parser_by_type(type, prev); -+ if (!parser) -+ break; -+ -+ ret = (*parser->parse_fn)(master, pparts, data); -+ -+ if (ret > 0) { -+ mtd_part_parser_put(parser); -+ printk(KERN_NOTICE -+ "%d %s partitions found on MTD device %s\n", -+ ret, parser->name, master->name); -+ break; -+ } -+ -+ prev = parser; -+ } -+ -+ return ret; -+} -+ - int mtd_is_partition(const struct mtd_info *mtd) - { - struct mtd_part *part; ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -73,6 +73,10 @@ struct mtd_part_parser_data { - * Functions dealing with the various ways of partitioning the space - */ - -+enum mtd_parser_type { -+ MTD_PARSER_TYPE_DEVICE = 0, -+}; -+ - struct mtd_part_parser { - struct list_head list; - struct module *owner; -@@ -81,6 +85,7 @@ struct mtd_part_parser { - int (*parse_fn)(struct mtd_info *, const struct mtd_partition **, - struct mtd_part_parser_data *); - void (*cleanup)(const struct mtd_partition *pparts, int nr_parts); -+ enum mtd_parser_type type; - }; - - /* Container for passing around a set of parsed partitions */ diff --git a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch deleted file mode 100644 index 6085cb8ffb..0000000000 --- a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Gabor Juhos -Subject: kernel/3.10: allow to use partition parsers for rootfs and firmware split - -lede-commit: 3b71cd94bc9517bc25267dccb393b07d4b54564e -Signed-off-by: Gabor Juhos ---- - drivers/mtd/mtdpart.c | 37 +++++++++++++++++++++++++++++++++++++ - include/linux/mtd/partitions.h | 2 ++ - 2 files changed, 39 insertions(+) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -786,6 +786,7 @@ run_parsers_by_type(struct mtd_part *sla - - static void split_firmware(struct mtd_info *master, struct mtd_part *part) - { -+ run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE); - } - - static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) -@@ -795,6 +796,12 @@ static void mtd_partition_split(struct m - if (rootfs_found) - return; - -+ if (!strcmp(part->mtd.name, "rootfs")) { -+ run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS); -+ -+ rootfs_found = 1; -+ } -+ - if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) && - !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && - !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL)) ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -75,6 +75,8 @@ struct mtd_part_parser_data { - - enum mtd_parser_type { - MTD_PARSER_TYPE_DEVICE = 0, -+ MTD_PARSER_TYPE_ROOTFS, -+ MTD_PARSER_TYPE_FIRMWARE, - }; - - struct mtd_part_parser { diff --git a/target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch b/target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch deleted file mode 100644 index 917cd9cafe..0000000000 --- a/target/linux/generic/pending-4.9/403-mtd-hook-mtdsplit-to-Kbuild.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Gabor Juhos -Subject: [PATCH] kernel/3.10: move squashfs check from rootfs split code into a separate file - -lede-commit: d89bea92b31b4e157a0fa438e75370f089f73427 -Signed-off-by: Gabor Juhos ---- - drivers/mtd/Kconfig | 2 ++ - drivers/mtd/Makefile | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -27,6 +27,8 @@ config MTD_SPLIT_FIRMWARE_NAME - depends on MTD_SPLIT_FIRMWARE - default "firmware" - -+source "drivers/mtd/mtdsplit/Kconfig" -+ - endmenu - - config MTD_TESTS ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -6,6 +6,8 @@ - obj-$(CONFIG_MTD) += mtd.o - mtd-y := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o - -+obj-$(CONFIG_MTD_SPLIT) += mtdsplit/ -+ - obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o - obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o - obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o diff --git a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch deleted file mode 100644 index 294a0f6f8b..0000000000 --- a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Gabor Juhos -Subject: kernel/3.10: add separate rootfs partition parser - -lede-commit: daec7ad7688415156e2730e401503d09bd3acf91 -Signed-off-by: Gabor Juhos ---- - drivers/mtd/mtdpart.c | 29 +++++++++++++++++++++++++++++ - include/linux/mtd/mtd.h | 18 ++++++++++++++++++ - include/linux/mtd/partitions.h | 2 ++ - 3 files changed, 49 insertions(+) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -1247,6 +1247,24 @@ int mtd_is_partition(const struct mtd_in - } - EXPORT_SYMBOL_GPL(mtd_is_partition); - -+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd) -+{ -+ if (!mtd_is_partition(mtd)) -+ return (struct mtd_info *)mtd; -+ -+ return mtd_to_part(mtd)->parent; -+} -+EXPORT_SYMBOL_GPL(mtdpart_get_master); -+ -+uint64_t mtdpart_get_offset(const struct mtd_info *mtd) -+{ -+ if (!mtd_is_partition(mtd)) -+ return 0; -+ -+ return mtd_to_part(mtd)->offset; -+} -+EXPORT_SYMBOL_GPL(mtdpart_get_offset); -+ - /* Returns the size of the entire flash chip */ - uint64_t mtd_get_device_size(const struct mtd_info *mtd) - { ---- a/include/linux/mtd/mtd.h -+++ b/include/linux/mtd/mtd.h -@@ -485,6 +485,24 @@ static inline uint32_t mtd_mod_by_eb(uin - return do_div(sz, mtd->erasesize); - } - -+static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd) -+{ -+ if (mtd_mod_by_eb(sz, mtd) == 0) -+ return sz; -+ -+ /* Round up to next erase block */ -+ return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize; -+} -+ -+static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd) -+{ -+ if (mtd_mod_by_eb(sz, mtd) == 0) -+ return sz; -+ -+ /* Round down to the start of the current erase block */ -+ return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize; -+} -+ - static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd) - { - if (mtd->writesize_shift) ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -116,6 +116,8 @@ int mtd_is_partition(const struct mtd_in - int mtd_add_partition(struct mtd_info *master, const char *name, - long long offset, long long length); - int mtd_del_partition(struct mtd_info *master, int partno); -+struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); -+uint64_t mtdpart_get_offset(const struct mtd_info *mtd); - uint64_t mtd_get_device_size(const struct mtd_info *mtd); - - #endif diff --git a/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch deleted file mode 100644 index 5a59dfa0c6..0000000000 --- a/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch +++ /dev/null @@ -1,154 +0,0 @@ -From: Felix Fietkau -Subject: mtd: implement write support for partitions covering only a part of an eraseblock (buffer data that would otherwise be erased) - -lede-commit: 87a8e8ac1067f58ba831c4aae443f3655c31cd80 -Signed-off-by: Felix Fietkau ---- - drivers/mtd/mtdpart.c | 90 ++++++++++++++++++++++++++++++++++++++++++++----- - include/linux/mtd/mtd.h | 4 +++ - 2 files changed, 85 insertions(+), 9 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -37,6 +37,8 @@ - #include "mtdcore.h" - #include "mtdsplit/mtdsplit.h" - -+#define MTD_ERASE_PARTIAL 0x8000 /* partition only covers parts of an erase block */ -+ - /* Our partition linked list */ - static LIST_HEAD(mtd_partitions); - static DEFINE_MUTEX(mtd_partitions_mutex); -@@ -246,13 +248,61 @@ static int part_erase(struct mtd_info *m - struct mtd_part *part = mtd_to_part(mtd); - int ret; - -+ -+ instr->partial_start = false; -+ if (mtd->flags & MTD_ERASE_PARTIAL) { -+ size_t readlen = 0; -+ u64 mtd_ofs; -+ -+ instr->erase_buf = kmalloc(part->parent->erasesize, GFP_ATOMIC); -+ if (!instr->erase_buf) -+ return -ENOMEM; -+ -+ mtd_ofs = part->offset + instr->addr; -+ instr->erase_buf_ofs = do_div(mtd_ofs, part->parent->erasesize); -+ -+ if (instr->erase_buf_ofs > 0) { -+ instr->addr -= instr->erase_buf_ofs; -+ ret = mtd_read(part->parent, -+ instr->addr + part->offset, -+ part->parent->erasesize, -+ &readlen, instr->erase_buf); -+ -+ instr->len += instr->erase_buf_ofs; -+ instr->partial_start = true; -+ } else { -+ mtd_ofs = part->offset + part->mtd.size; -+ instr->erase_buf_ofs = part->parent->erasesize - -+ do_div(mtd_ofs, part->parent->erasesize); -+ -+ if (instr->erase_buf_ofs > 0) { -+ instr->len += instr->erase_buf_ofs; -+ ret = mtd_read(part->parent, -+ part->offset + instr->addr + -+ instr->len - part->parent->erasesize, -+ part->parent->erasesize, &readlen, -+ instr->erase_buf); -+ } else { -+ ret = 0; -+ } -+ } -+ if (ret < 0) { -+ kfree(instr->erase_buf); -+ return ret; -+ } -+ -+ } -+ - instr->addr += part->offset; - ret = part->parent->_erase(part->parent, instr); - if (ret) { - if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) - instr->fail_addr -= part->offset; - instr->addr -= part->offset; -+ if (mtd->flags & MTD_ERASE_PARTIAL) -+ kfree(instr->erase_buf); - } -+ - return ret; - } - -@@ -260,6 +310,25 @@ void mtd_erase_callback(struct erase_inf - { - if (instr->mtd->_erase == part_erase) { - struct mtd_part *part = mtd_to_part(instr->mtd); -+ size_t wrlen = 0; -+ -+ if (instr->mtd->flags & MTD_ERASE_PARTIAL) { -+ if (instr->partial_start) { -+ part->parent->_write(part->parent, -+ instr->addr, instr->erase_buf_ofs, -+ &wrlen, instr->erase_buf); -+ instr->addr += instr->erase_buf_ofs; -+ } else { -+ instr->len -= instr->erase_buf_ofs; -+ part->parent->_write(part->parent, -+ instr->addr + instr->len, -+ instr->erase_buf_ofs, &wrlen, -+ instr->erase_buf + -+ part->parent->erasesize - -+ instr->erase_buf_ofs); -+ } -+ kfree(instr->erase_buf); -+ } - - if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) - instr->fail_addr -= part->offset; -@@ -566,19 +635,22 @@ static struct mtd_part *allocate_partiti - remainder = do_div(tmp, wr_alignment); - if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) { - /* Doesn't start on a boundary of major erase size */ -- /* FIXME: Let it be writable if it is on a boundary of -- * _minor_ erase size though */ -- slave->mtd.flags &= ~MTD_WRITEABLE; -- printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n", -- part->name); -+ slave->mtd.flags |= MTD_ERASE_PARTIAL; -+ if (((u32)slave->mtd.size) > parent->erasesize) -+ slave->mtd.flags &= ~MTD_WRITEABLE; -+ else -+ slave->mtd.erasesize = slave->mtd.size; - } - -- tmp = slave->mtd.size; -+ tmp = slave->offset + slave->mtd.size; - remainder = do_div(tmp, wr_alignment); - if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) { -- slave->mtd.flags &= ~MTD_WRITEABLE; -- printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n", -- part->name); -+ slave->mtd.flags |= MTD_ERASE_PARTIAL; -+ -+ if ((u32)slave->mtd.size > parent->erasesize) -+ slave->mtd.flags &= ~MTD_WRITEABLE; -+ else -+ slave->mtd.erasesize = slave->mtd.size; - } - - mtd_set_ooblayout(&slave->mtd, &part_ooblayout_ops); ---- a/include/linux/mtd/mtd.h -+++ b/include/linux/mtd/mtd.h -@@ -55,6 +55,10 @@ struct erase_info { - u_long priv; - u_char state; - struct erase_info *next; -+ -+ u8 *erase_buf; -+ u32 erase_buf_ofs; -+ bool partial_start; - }; - - struct mtd_erase_region_info { diff --git a/target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch deleted file mode 100644 index 1e8c90931c..0000000000 --- a/target/linux/generic/pending-4.9/412-mtd-partial_eraseblock_unlock.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Tim Harvey -Subject: mtd: allow partial block unlock - -This allows sysupgrade for devices such as the Gateworks Avila/Cambria -product families based on the ixp4xx using the redboot bootloader with -combined FIS directory and RedBoot config partitions on larger FLASH -devices with larger eraseblocks. - -This second iteration of this patch addresses previous issues: -- whitespace breakage fixed -- unlock in all scenarios -- simplification and fix logic bug - -[john@phrozen.org: this should be moved to the ixp4xx folder] - -Signed-off-by: Tim Harvey ---- - drivers/mtd/mtdpart.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -348,7 +348,16 @@ static int part_lock(struct mtd_info *mt - static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) - { - struct mtd_part *part = mtd_to_part(mtd); -- return part->parent->_unlock(part->parent, ofs + part->offset, len); -+ -+ ofs += part->offset; -+ -+ if (mtd->flags & MTD_ERASE_PARTIAL) { -+ /* round up len to next erasesize and round down offset to prev block */ -+ len = (mtd_div_by_eb(len, part->parent) + 1) * part->parent->erasesize; -+ ofs &= ~(part->parent->erasesize - 1); -+ } -+ -+ return part->parent->_unlock(part->parent, ofs, len); - } - - static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len) diff --git a/target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch deleted file mode 100644 index 4da571a60f..0000000000 --- a/target/linux/generic/pending-4.9/419-mtd-redboot-add-of_match_table-with-DT-binding.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Subject: [PATCH] mtd: redboot: add of_match_table with DT binding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows parsing RedBoot compatible partitions for properly described -flash device in DT. - -Signed-off-by: Rafał Miłecki ---- - ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - struct fis_image_desc { - unsigned char name[16]; // Null terminated name -@@ -289,9 +290,16 @@ static int parse_redboot_partitions(stru - return ret; - } - -+static const struct of_device_id redboot_parser_of_match_table[] = { -+ { .compatible = "ecoscentric,redboot-fis-partitions" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, redboot_parser_of_match_table); -+ - static struct mtd_part_parser redboot_parser = { - .parse_fn = parse_redboot_partitions, - .name = "RedBoot", -+ .of_match_table = redboot_parser_of_match_table, - }; - module_mtd_part_parser(redboot_parser); - diff --git a/target/linux/generic/pending-4.9/420-mtd-redboot_space.patch b/target/linux/generic/pending-4.9/420-mtd-redboot_space.patch deleted file mode 100644 index 6a612a0e75..0000000000 --- a/target/linux/generic/pending-4.9/420-mtd-redboot_space.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Felix Fietkau -Subject: add patch for including unpartitioned space in the rootfs partition for redboot devices (if applicable) - -[john@phrozen.org: used by ixp and others] - -lede-commit: 394918851f84e4d00fa16eb900e7700e95091f00 -Signed-off-by: Felix Fietkau ---- - drivers/mtd/redboot.c | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -266,14 +266,21 @@ static int parse_redboot_partitions(stru - #endif - names += strlen(names)+1; - --#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED - if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) { -- i++; -- parts[i].offset = parts[i-1].size + parts[i-1].offset; -- parts[i].size = fl->next->img->flash_base - parts[i].offset; -- parts[i].name = nullname; -- } -+ if (!strcmp(parts[i].name, "rootfs")) { -+ parts[i].size = fl->next->img->flash_base; -+ parts[i].size &= ~(master->erasesize - 1); -+ parts[i].size -= parts[i].offset; -+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED -+ nrparts--; -+ } else { -+ i++; -+ parts[i].offset = parts[i-1].size + parts[i-1].offset; -+ parts[i].size = fl->next->img->flash_base - parts[i].offset; -+ parts[i].name = nullname; - #endif -+ } -+ } - tmp_fl = fl; - fl = fl->next; - kfree(tmp_fl); diff --git a/target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch b/target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch deleted file mode 100644 index eb969a0d91..0000000000 --- a/target/linux/generic/pending-4.9/430-mtd-add-myloader-partition-parser.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Florian Fainelli -Subject: Add myloader partition table parser - -[john@phozen.org: shoud be upstreamable] - -lede-commit: d8bf22859b51faa09d22c056fe221a45d2f7a3b8 -Signed-off-by: Florian Fainelli ---- - drivers/mtd/Kconfig | 16 ++++++++++++++++ - drivers/mtd/Makefile | 1 + - 2 files changed, 17 insertions(+) - ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -178,6 +178,22 @@ menu "Partition parsers" - source "drivers/mtd/parsers/Kconfig" - endmenu - -+config MTD_MYLOADER_PARTS -+ tristate "MyLoader partition parsing" -+ depends on ADM5120 || ATH25 || ATH79 -+ ---help--- -+ MyLoader is a bootloader which allows the user to define partitions -+ in flash devices, by putting a table in the second erase block -+ on the device, similar to a partition table. This table gives the -+ offsets and lengths of the user defined partitions. -+ -+ If you need code which can detect and parse these tables, and -+ register MTD 'partitions' corresponding to each image detected, -+ enable this option. -+ -+ You will still need the parsing functions to be called by the driver -+ for your particular device. It won't happen automatically. -+ - comment "User Modules And Translation Layers" - - # ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -15,6 +15,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o - obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o - obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o - obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o -+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o - obj-y += parsers/ - - # 'Users' - code which presents functionality to userspace. diff --git a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch deleted file mode 100644 index cbd185e0ae..0000000000 --- a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Subject: [PATCH] mtd: bcm47xxpart: check for bad blocks when calculating offsets - -Signed-off-by: Rafał Miłecki ---- - ---- a/drivers/mtd/parsers/parser_trx.c -+++ b/drivers/mtd/parsers/parser_trx.c -@@ -30,6 +30,33 @@ struct trx_header { - uint32_t offset[3]; - } __packed; - -+/* -+ * Calculate real end offset (address) for a given amount of data. It checks -+ * all blocks skipping bad ones. -+ */ -+static size_t parser_trx_real_offset(struct mtd_info *mtd, size_t bytes) -+{ -+ size_t real_offset = 0; -+ -+ if (mtd_block_isbad(mtd, real_offset)) -+ pr_warn("Base offset shouldn't be at bad block"); -+ -+ while (bytes >= mtd->erasesize) { -+ bytes -= mtd->erasesize; -+ real_offset += mtd->erasesize; -+ while (mtd_block_isbad(mtd, real_offset)) { -+ real_offset += mtd->erasesize; -+ -+ if (real_offset >= mtd->size) -+ return real_offset - mtd->erasesize; -+ } -+ } -+ -+ real_offset += bytes; -+ -+ return real_offset; -+} -+ - static const char *parser_trx_data_part_name(struct mtd_info *master, - size_t offset) - { -@@ -84,21 +111,21 @@ static int parser_trx_parse(struct mtd_i - if (trx.offset[2]) { - part = &parts[curr_part++]; - part->name = "loader"; -- part->offset = trx.offset[i]; -+ part->offset = parser_trx_real_offset(mtd, trx.offset[i]); - i++; - } - - if (trx.offset[i]) { - part = &parts[curr_part++]; - part->name = "linux"; -- part->offset = trx.offset[i]; -+ part->offset = parser_trx_real_offset(mtd, trx.offset[i]); - i++; - } - - if (trx.offset[i]) { - part = &parts[curr_part++]; -- part->name = parser_trx_data_part_name(mtd, trx.offset[i]); -- part->offset = trx.offset[i]; -+ part->offset = parser_trx_real_offset(mtd, trx.offset[i]); -+ part->name = parser_trx_data_part_name(mtd, part->offset); - i++; - } - diff --git a/target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch deleted file mode 100644 index 3970641555..0000000000 --- a/target/linux/generic/pending-4.9/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Subject: mtd: bcm47xxpart: detect T_Meter partition - -It can be found on many Netgear devices. It consists of many 0x30 blocks -starting with 4D 54. - -Signed-off-by: Rafał Miłecki ---- - drivers/mtd/bcm47xxpart.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -40,6 +40,7 @@ - #define NVRAM_HEADER 0x48534C46 /* FLSH */ - #define POT_MAGIC1 0x54544f50 /* POTT */ - #define POT_MAGIC2 0x504f /* OP */ -+#define T_METER_MAGIC 0x4D540000 /* MT */ - #define ML_MAGIC1 0x39685a42 - #define ML_MAGIC2 0x26594131 - #define TRX_MAGIC 0x30524448 -@@ -183,6 +184,15 @@ static int bcm47xxpart_parse(struct mtd_ - MTD_WRITEABLE); - continue; - } -+ -+ /* T_Meter */ -+ if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC && -+ (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC && -+ (le32_to_cpu(buf[0x060 / 4]) & 0xFFFF0000) == T_METER_MAGIC) { -+ bcm47xxpart_add_part(&parts[curr_part++], "T_Meter", offset, -+ MTD_WRITEABLE); -+ continue; -+ } - - /* TRX */ - if (buf[0x000 / 4] == TRX_MAGIC) { diff --git a/target/linux/generic/pending-4.9/440-block2mtd_init.patch b/target/linux/generic/pending-4.9/440-block2mtd_init.patch deleted file mode 100644 index 8834788732..0000000000 --- a/target/linux/generic/pending-4.9/440-block2mtd_init.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: Felix Fietkau -Subject: block2mtd - -Signed-off-by: Felix Fietkau ---- - drivers/mtd/devices/block2mtd.c | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - ---- a/drivers/mtd/devices/block2mtd.c -+++ b/drivers/mtd/devices/block2mtd.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -219,7 +220,7 @@ static void block2mtd_free_device(struct - - - static struct block2mtd_dev *add_device(char *devname, int erase_size, -- int timeout) -+ const char *mtdname, int timeout) - { - #ifndef MODULE - int i; -@@ -227,6 +228,7 @@ static struct block2mtd_dev *add_device( - const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL; - struct block_device *bdev = ERR_PTR(-ENODEV); - struct block2mtd_dev *dev; -+ struct mtd_partition *part; - char *name; - - if (!devname) -@@ -283,13 +285,16 @@ static struct block2mtd_dev *add_device( - - /* Setup the MTD structure */ - /* make the name contain the block device in */ -- name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); -+ if (!mtdname) -+ mtdname = devname; -+ name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL); - if (!name) - goto err_destroy_mutex; - -+ strcpy(name, mtdname); - dev->mtd.name = name; - -- dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; -+ dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1); - dev->mtd.erasesize = erase_size; - dev->mtd.writesize = 1; - dev->mtd.writebufsize = PAGE_SIZE; -@@ -302,7 +307,11 @@ static struct block2mtd_dev *add_device( - dev->mtd.priv = dev; - dev->mtd.owner = THIS_MODULE; - -- if (mtd_device_register(&dev->mtd, NULL, 0)) { -+ part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); -+ part->name = name; -+ part->offset = 0; -+ part->size = dev->mtd.size; -+ if (mtd_device_register(&dev->mtd, part, 1)) { - /* Device didn't get added, so free the entry */ - goto err_destroy_mutex; - } -@@ -310,8 +319,7 @@ static struct block2mtd_dev *add_device( - list_add(&dev->list, &blkmtd_device_list); - pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n", - dev->mtd.index, -- dev->mtd.name + strlen("block2mtd: "), -- dev->mtd.erasesize >> 10, dev->mtd.erasesize); -+ mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize); - return dev; - - err_destroy_mutex: -@@ -384,7 +392,7 @@ static int block2mtd_setup2(const char * - /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */ - char buf[80 + 12 + 80 + 8]; - char *str = buf; -- char *token[2]; -+ char *token[3]; - char *name; - size_t erase_size = PAGE_SIZE; - unsigned long timeout = MTD_DEFAULT_TIMEOUT; -@@ -398,7 +406,7 @@ static int block2mtd_setup2(const char * - strcpy(str, val); - kill_final_newline(str); - -- for (i = 0; i < 2; i++) -+ for (i = 0; i < 3; i++) - token[i] = strsep(&str, ","); - - if (str) { -@@ -424,8 +432,10 @@ static int block2mtd_setup2(const char * - return 0; - } - } -+ if (token[2] && (strlen(token[2]) + 1 > 80)) -+ pr_err("mtd device name too long\n"); - -- add_device(name, erase_size, timeout); -+ add_device(name, erase_size, token[2], timeout); - - return 0; - } -@@ -459,7 +469,7 @@ static int block2mtd_setup(const char *v - - - module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); --MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=[,]\""); -+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=[,[,]]\""); - - static int __init block2mtd_init(void) - { diff --git a/target/linux/generic/pending-4.9/441-block2mtd_probe.patch b/target/linux/generic/pending-4.9/441-block2mtd_probe.patch deleted file mode 100644 index fee970ab61..0000000000 --- a/target/linux/generic/pending-4.9/441-block2mtd_probe.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Felix Fietkau -Subject: block2mtd - -Signed-off-by: Felix Fietkau ---- - drivers/mtd/devices/block2mtd.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/drivers/mtd/devices/block2mtd.c -+++ b/drivers/mtd/devices/block2mtd.c -@@ -392,7 +392,7 @@ static int block2mtd_setup2(const char * - /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */ - char buf[80 + 12 + 80 + 8]; - char *str = buf; -- char *token[3]; -+ char *token[4]; - char *name; - size_t erase_size = PAGE_SIZE; - unsigned long timeout = MTD_DEFAULT_TIMEOUT; -@@ -406,7 +406,7 @@ static int block2mtd_setup2(const char * - strcpy(str, val); - kill_final_newline(str); - -- for (i = 0; i < 3; i++) -+ for (i = 0; i < 4; i++) - token[i] = strsep(&str, ","); - - if (str) { -@@ -435,6 +435,9 @@ static int block2mtd_setup2(const char * - if (token[2] && (strlen(token[2]) + 1 > 80)) - pr_err("mtd device name too long\n"); - -+ if (token[3] && kstrtoul(token[3], 0, &timeout)) -+ pr_err("invalid timeout\n"); -+ - add_device(name, erase_size, token[2], timeout); - - return 0; -@@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v - - - module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); --MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=[,[,]]\""); -+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=[,[,[,]]]\""); - - static int __init block2mtd_init(void) - { diff --git a/target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch b/target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch deleted file mode 100644 index feaf8cb25c..0000000000 --- a/target/linux/generic/pending-4.9/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Felix Fietkau -Date: Fri, 23 Feb 2018 17:12:16 +0100 -Subject: [PATCH] mtd: m25p80: allow fallback from spi_flash_read to regular - SPI transfer - -Some flash controllers, e.g. on the ath79 platform can support a fast -flash read via memory mapping, but only if the flash chip is in -3-byte address mode. - -Since spi_flash_read_supported does not have access to the same data as -spi_flash_read, the driver can't detect an unsupported call until m25p80 -has decided to use spi_flash_read. - -Allow the driver to indicate a fallback to a regular SPI transfer by -returning -EOPNOTSUPP - -Signed-off-by: Felix Fietkau ---- - ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -155,9 +155,11 @@ static ssize_t m25p80_read(struct spi_no - msg.data_nbits = m25p80_rx_nbits(nor); - - ret = spi_flash_read(spi, &msg); -- if (ret < 0) -- return ret; -- return msg.retlen; -+ if (ret != -EOPNOTSUPP) { -+ if (ret < 0) -+ return ret; -+ return msg.retlen; -+ } - } - - spi_message_init(&m); diff --git a/target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch deleted file mode 100644 index c52d7de762..0000000000 --- a/target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Felix Fietkau -Subject: kernel: disable cfi cmdset 0002 erase suspend - -on some platforms, erase suspend leads to data corruption and lockups when write -ops collide with erase ops. this has been observed on the buffalo wzr-hp-g300nh. -rather than play whack-a-mole with a hard to reproduce issue on a variety of devices, -simply disable erase suspend, as it will usually not produce any useful gain on -the small filesystems used on embedded hardware. - -Signed-off-by: Felix Fietkau ---- - drivers/mtd/chips/cfi_cmdset_0002.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -807,7 +807,7 @@ static int get_chip(struct map_info *map - return 0; - - case FL_ERASING: -- if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) || -+ if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) || - !(mode == FL_READY || mode == FL_POINT || - (mode == FL_WRITING && (cfip->EraseSuspend & 0x2)))) - goto sleep; diff --git a/target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch deleted file mode 100644 index f78667994c..0000000000 --- a/target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: George Kashperko -Subject: Issue map read after Write Buffer Load command to ensure chip is ready to receive data. - -Signed-off-by: George Kashperko ---- - drivers/mtd/chips/cfi_cmdset_0002.c | 1 + - 1 file changed, 1 insertion(+) ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1835,6 +1835,7 @@ static int __xipram do_write_buffer(stru - - /* Write Buffer Load */ - map_write(map, CMD(0x25), cmd_adr); -+ (void) map_read(map, cmd_adr); - - chip->state = FL_WRITING_TO_BUFFER; - diff --git a/target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch deleted file mode 100644 index 27adddeb30..0000000000 --- a/target/linux/generic/pending-4.9/465-m25p80-mx-disable-software-protection.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Felix Fietkau -Subject: Disable software protection bits for Macronix flashes. - -Signed-off-by: Felix Fietkau ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1601,6 +1601,7 @@ int spi_nor_scan(struct spi_nor *nor, co - - if (JEDEC_MFR(info) == SNOR_MFR_ATMEL || - JEDEC_MFR(info) == SNOR_MFR_INTEL || -+ JEDEC_MFR(info) == SNOR_MFR_MACRONIX || - JEDEC_MFR(info) == SNOR_MFR_SST || - info->flags & SPI_NOR_HAS_LOCK) { - write_enable(nor); diff --git a/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch deleted file mode 100644 index e1681d61dd..0000000000 --- a/target/linux/generic/pending-4.9/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Matthias Schiffer -Date: Tue, 9 Jan 2018 20:41:48 +0100 -Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with - Winbond)" - -This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e. - -The underlying issue breaking Spansion flash has been fixed with "mtd: spi-nor: -wait until lock/unlock operations are ready" and "mtd: spi-nor: wait for SR_WIP -to clear on initial unlock", so we can support unlocking for Winbond flash -again. - -Signed-off-by: Matthias Schiffer ---- - drivers/mtd/spi-nor/spi-nor.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1603,6 +1603,7 @@ int spi_nor_scan(struct spi_nor *nor, co - JEDEC_MFR(info) == SNOR_MFR_INTEL || - JEDEC_MFR(info) == SNOR_MFR_MACRONIX || - JEDEC_MFR(info) == SNOR_MFR_SST || -+ JEDEC_MFR(info) == SNOR_MFR_WINBOND || - info->flags & SPI_NOR_HAS_LOCK) { - write_enable(nor); - write_sr(nor, 0); -@@ -1621,7 +1622,8 @@ int spi_nor_scan(struct spi_nor *nor, co - - /* NOR protection support for STmicro/Micron chips and similar */ - if (JEDEC_MFR(info) == SNOR_MFR_MICRON || -- info->flags & SPI_NOR_HAS_LOCK) { -+ JEDEC_MFR(info) == SNOR_MFR_WINBOND || -+ info->flags & SPI_NOR_HAS_LOCK) { - nor->flash_lock = stm_lock; - nor->flash_unlock = stm_unlock; - nor->flash_is_locked = stm_is_locked; diff --git a/target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch b/target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch deleted file mode 100644 index f4ccc5fc44..0000000000 --- a/target/linux/generic/pending-4.9/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Felix Fietkau -Date: Sat, 4 Nov 2017 07:40:23 +0100 -Subject: [PATCH] mtd: spi-nor: support limiting 4K sectors support based on - flash size - -Some devices need 4K sectors to be able to deal with small flash chips. -For instance, w25x05 is 64 KiB in size, and without 4K sectors, the -entire chip is just one erase block. -On bigger flash chip sizes, using 4K sectors can significantly slow down -many operations, including using a writable filesystem. There are several -platforms where it makes sense to use a single kernel on both kinds of -devices. - -To support this properly, allow configuring an upper flash chip size -limit for 4K sectors support. - -Signed-off-by: Felix Fietkau ---- - ---- a/drivers/mtd/spi-nor/Kconfig -+++ b/drivers/mtd/spi-nor/Kconfig -@@ -29,6 +29,17 @@ config MTD_SPI_NOR_USE_4K_SECTORS - Please note that some tools/drivers/filesystems may not work with - 4096 B erase size (e.g. UBIFS requires 15 KiB as a minimum). - -+config MTD_SPI_NOR_USE_4K_SECTORS_LIMIT -+ int "Maximum flash chip size to use 4K sectors on (in KiB)" -+ depends on MTD_SPI_NOR_USE_4K_SECTORS -+ default "4096" -+ help -+ There are many flash chips that support 4K sectors, but are so large -+ that using them significantly slows down writing large amounts of -+ data or using a writable filesystem. -+ Any flash chip larger than the size specified in this option will -+ not use 4K sectors. -+ - config SPI_ATMEL_QUADSPI - tristate "Atmel Quad SPI Controller" - depends on ARCH_AT91 || (ARM && COMPILE_TEST && !ARCH_EBSA110) ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1648,10 +1648,12 @@ int spi_nor_scan(struct spi_nor *nor, co - - #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS - /* prefer "small sector" erase if possible */ -- if (info->flags & SECT_4K) { -+ if ((info->flags & SECT_4K) && (mtd->size <= -+ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT * 1024)) { - nor->erase_opcode = SPINOR_OP_BE_4K; - mtd->erasesize = 4096; -- } else if (info->flags & SECT_4K_PMC) { -+ } else if ((info->flags & SECT_4K_PMC) && (mtd->size <= -+ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT * 1024)) { - nor->erase_opcode = SPINOR_OP_BE_4K_PMC; - mtd->erasesize = 4096; - } else diff --git a/target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch b/target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch deleted file mode 100644 index d54ee4f25a..0000000000 --- a/target/linux/generic/pending-4.9/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Robert Marko -To: linux-mtd@lists.infradead.org -Subject: mtd: spi-nor: Add Winbond w25q128jv support -Date: Mon, 25 Jun 2018 13:17:48 +0200 - -Datasheet: -http://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf - -Testing done on Mikrotik Routerboard wAP R board. -It does not support Dual or Quad modes. - -Signed-off-by: Robert Marko ---- - -Changes in v2: - - Correct the title ---- - drivers/mtd/spi-nor/spi-nor.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1152,6 +1152,11 @@ static const struct flash_info spi_nor_i - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) - }, -+ { -+ "w25q128jv", INFO(0xef7018, 0, 64 * 1024, 256, -+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | -+ SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) -+ }, - { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, - { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, - { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, diff --git a/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch b/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch deleted file mode 100644 index ac1fda5159..0000000000 --- a/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Piotr Dymacz -Subject: kernel/mtd: add support for EON EN25Q128 - -Signed-off-by: Piotr Dymacz ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -954,6 +954,7 @@ static const struct flash_info spi_nor_i - { "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) }, - { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, - { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, - { "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) }, - { "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) }, - { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) }, diff --git a/target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch b/target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch deleted file mode 100644 index 62f6314e93..0000000000 --- a/target/linux/generic/pending-4.9/477-mtd-add-spi-nor-add-mx25u3235f.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: André Valentin -Subject: linux/mtd: add id for mx25u3235f needed by ZyXEL NBG6817 - -Signed-off-by: André Valentin ---- - drivers/mtd/spi-nor/spi-nor.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1020,6 +1020,7 @@ static const struct flash_info spi_nor_i - { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) }, - { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) }, - { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64, 0) }, - { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, - { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, - { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, diff --git a/target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch b/target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch deleted file mode 100644 index 011f4b4458..0000000000 --- a/target/linux/generic/pending-4.9/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b02f3405c935a28200db26b63e42086057565cf4 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 31 Mar 2018 20:09:54 +0200 -Subject: [PATCH] mtd: spi-nor: Add support for XM25QH64A and XM25QH128A - -These devices are produced by Wuhan Xinxin Semiconductor Manufacturing -Corp. (XMC) and found on some routers from Chinese manufactures. - -The data sheets can be found here: -http://www.xmcwh.com/Uploads/2018-03-01/5a9799e4cb355.pdf -http://www.xmcwh.com/Uploads/2018-02-05/5a77e6dbe968b.pdf - -Signed-off-by: Hauke Mehrtens ---- - drivers/mtd/spi-nor/spi-nor.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1177,6 +1177,10 @@ static const struct flash_info spi_nor_i - { "3S400AN", S3AN_INFO(0x1f2400, 256, 264) }, - { "3S700AN", S3AN_INFO(0x1f2500, 512, 264) }, - { "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) }, -+ -+ /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ -+ { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, -+ { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { }, - }; - diff --git a/target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch b/target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch deleted file mode 100644 index b8d5101514..0000000000 --- a/target/linux/generic/pending-4.9/479-mtd-spi-nor-add-eon-en25qh32.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -955,6 +955,7 @@ static const struct flash_info spi_nor_i - { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, - { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, - { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, -+ { "en25qh32", INFO(0x1c7016, 0, 64 * 1024, 64, 0) }, - { "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) }, - { "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) }, - { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) }, diff --git a/target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch deleted file mode 100644 index 1bc958c2f7..0000000000 --- a/target/linux/generic/pending-4.9/480-mtd-set-rootfs-to-be-root-dev.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Gabor Juhos -Subject: kernel/3.1[02]: move MTD root device setup code to mtdcore - -The current code only allows to automatically set -root device on MTD partitions. Move the code to MTD -core to allow to use it with all MTD devices. - -Signed-off-by: Gabor Juhos ---- - drivers/mtd/mtdcore.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/mtd/mtdcore.c -+++ b/drivers/mtd/mtdcore.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -570,6 +571,15 @@ int add_mtd_device(struct mtd_info *mtd) - of this try_ nonsense, and no bitching about it - either. :) */ - __module_get(THIS_MODULE); -+ -+ if (!strcmp(mtd->name, "rootfs") && -+ IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && -+ ROOT_DEV == 0) { -+ pr_notice("mtd: device %d (%s) set to be root filesystem\n", -+ mtd->index, mtd->name); -+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index); -+ } -+ - return 0; - - fail_added: diff --git a/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch deleted file mode 100644 index 168cfe50ee..0000000000 --- a/target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ /dev/null @@ -1,97 +0,0 @@ -From: Daniel Golle -Subject: ubi: auto-attach mtd device named "ubi" or "data" on boot - -Signed-off-by: Daniel Golle ---- - drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - ---- a/drivers/mtd/ubi/build.c -+++ b/drivers/mtd/ubi/build.c -@@ -1226,6 +1226,73 @@ static struct mtd_info * __init open_mtd - return mtd; - } - -+/* -+ * This function tries attaching mtd partitions named either "ubi" or "data" -+ * during boot. -+ */ -+static void __init ubi_auto_attach(void) -+{ -+ int err; -+ struct mtd_info *mtd; -+ loff_t offset = 0; -+ size_t len; -+ char magic[4]; -+ -+ /* try attaching mtd device named "ubi" or "data" */ -+ mtd = open_mtd_device("ubi"); -+ if (IS_ERR(mtd)) -+ mtd = open_mtd_device("data"); -+ -+ if (IS_ERR(mtd)) -+ return; -+ -+ /* get the first not bad block */ -+ if (mtd_can_have_bb(mtd)) -+ while (mtd_block_isbad(mtd, offset)) { -+ offset += mtd->erasesize; -+ -+ if (offset > mtd->size) { -+ pr_err("UBI error: Failed to find a non-bad " -+ "block on mtd%d\n", mtd->index); -+ goto cleanup; -+ } -+ } -+ -+ /* check if the read from flash was successful */ -+ err = mtd_read(mtd, offset, 4, &len, (void *) magic); -+ if ((err && !mtd_is_bitflip(err)) || len != 4) { -+ pr_err("UBI error: unable to read from mtd%d\n", mtd->index); -+ goto cleanup; -+ } -+ -+ /* check for a valid ubi magic */ -+ if (strncmp(magic, "UBI#", 4)) { -+ pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index); -+ goto cleanup; -+ } -+ -+ /* don't auto-add media types where UBI doesn't makes sense */ -+ if (mtd->type != MTD_NANDFLASH && -+ mtd->type != MTD_NORFLASH && -+ mtd->type != MTD_DATAFLASH && -+ mtd->type != MTD_MLCNANDFLASH) -+ goto cleanup; -+ -+ mutex_lock(&ubi_devices_mutex); -+ pr_notice("UBI: auto-attach mtd%d\n", mtd->index); -+ err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0); -+ mutex_unlock(&ubi_devices_mutex); -+ if (err < 0) { -+ pr_err("UBI error: cannot attach mtd%d\n", mtd->index); -+ goto cleanup; -+ } -+ -+ return; -+ -+cleanup: -+ put_mtd_device(mtd); -+} -+ - static int __init ubi_init(void) - { - int err, i, k; -@@ -1309,6 +1376,12 @@ static int __init ubi_init(void) - } - } - -+ /* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd -+ * parameter was given */ -+ if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && -+ !ubi_is_module() && !mtd_devs) -+ ubi_auto_attach(); -+ - err = ubiblock_init(); - if (err) { - pr_err("UBI error: block: cannot initialize, error %d", err); diff --git a/target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch deleted file mode 100644 index adc653ddcd..0000000000 --- a/target/linux/generic/pending-4.9/491-ubi-auto-create-ubiblock-device-for-rootfs.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Daniel Golle -Subject: ubi: auto-create ubiblock device for rootfs - -Signed-off-by: Daniel Golle ---- - drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - ---- a/drivers/mtd/ubi/block.c -+++ b/drivers/mtd/ubi/block.c -@@ -635,6 +635,44 @@ static void __init ubiblock_create_from_ - } - } - -+#define UBIFS_NODE_MAGIC 0x06101831 -+static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc) -+{ -+ int ret; -+ uint32_t magic_of, magic; -+ ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4); -+ if (ret) -+ return 0; -+ magic = le32_to_cpu(magic_of); -+ return magic == UBIFS_NODE_MAGIC; -+} -+ -+static void __init ubiblock_create_auto_rootfs(void) -+{ -+ int ubi_num, ret, is_ubifs; -+ struct ubi_volume_desc *desc; -+ struct ubi_volume_info vi; -+ -+ for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) { -+ desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY); -+ if (IS_ERR(desc)) -+ continue; -+ -+ ubi_get_volume_info(desc, &vi); -+ is_ubifs = ubi_vol_is_ubifs(desc); -+ ubi_close_volume(desc); -+ if (is_ubifs) -+ break; -+ -+ ret = ubiblock_create(&vi); -+ if (ret) -+ pr_err("UBI error: block: can't add '%s' volume, err=%d\n", -+ vi.name, ret); -+ /* always break if we get here */ -+ break; -+ } -+} -+ - static void ubiblock_remove_all(void) - { - struct ubiblock *next; -@@ -667,6 +705,10 @@ int __init ubiblock_init(void) - */ - ubiblock_create_from_param(); - -+ /* auto-attach "rootfs" volume if existing and non-ubifs */ -+ if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV)) -+ ubiblock_create_auto_rootfs(); -+ - /* - * Block devices are only created upon user requests, so we ignore - * existing volumes. diff --git a/target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch deleted file mode 100644 index 69a35c25e7..0000000000 --- a/target/linux/generic/pending-4.9/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Daniel Golle -Subject: try auto-mounting ubi0:rootfs in init/do_mounts.c - -Signed-off-by: Daniel Golle ---- - init/do_mounts.c | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) - ---- a/init/do_mounts.c -+++ b/init/do_mounts.c -@@ -438,7 +438,28 @@ retry: - out: - put_page(page); - } -- -+ -+static int __init mount_ubi_rootfs(void) -+{ -+ int flags = MS_SILENT; -+ int err, tried = 0; -+ -+ while (tried < 2) { -+ err = do_mount_root("ubi0:rootfs", "ubifs", flags, \ -+ root_mount_data); -+ switch (err) { -+ case -EACCES: -+ flags |= MS_RDONLY; -+ tried++; -+ break; -+ default: -+ return err; -+ } -+ } -+ -+ return -EINVAL; -+} -+ - #ifdef CONFIG_ROOT_NFS - - #define NFSROOT_TIMEOUT_MIN 5 -@@ -532,6 +553,10 @@ void __init mount_root(void) - change_floppy("root floppy"); - } - #endif -+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV -+ if (!mount_ubi_rootfs()) -+ return; -+#endif - #ifdef CONFIG_BLOCK - { - int err = create_dev("/dev/root", ROOT_DEV); diff --git a/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch deleted file mode 100644 index 8b8bef2641..0000000000 --- a/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Daniel Golle -Subject: ubi: set ROOT_DEV to ubiblock "rootfs" if unset - -Signed-off-by: Daniel Golle ---- - drivers/mtd/ubi/block.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/mtd/ubi/block.c -+++ b/drivers/mtd/ubi/block.c -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - - #include "ubi-media.h" - #include "ubi.h" -@@ -447,6 +448,15 @@ int ubiblock_create(struct ubi_volume_in - dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)", - dev->ubi_num, dev->vol_id, vi->name); - mutex_unlock(&devices_mutex); -+ -+ if (!strcmp(vi->name, "rootfs") && -+ IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && -+ ROOT_DEV == 0) { -+ pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n", -+ dev->ubi_num, dev->vol_id, vi->name); -+ ROOT_DEV = MKDEV(gd->major, gd->first_minor); -+ } -+ - return 0; - - out_free_queue: diff --git a/target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch deleted file mode 100644 index 0b2314955b..0000000000 --- a/target/linux/generic/pending-4.9/494-mtd-ubi-add-EOF-marker-support.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Gabor Juhos -Subject: mtd: add EOF marker support to the UBI layer - -Signed-off-by: Gabor Juhos ---- - drivers/mtd/ubi/attach.c | 25 ++++++++++++++++++++++--- - drivers/mtd/ubi/ubi.h | 1 + - 2 files changed, 23 insertions(+), 3 deletions(-) - ---- a/drivers/mtd/ubi/attach.c -+++ b/drivers/mtd/ubi/attach.c -@@ -939,6 +939,13 @@ static bool vol_ignored(int vol_id) - #endif - } - -+static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech) -+{ -+ return ech->padding1[0] == 'E' && -+ ech->padding1[1] == 'O' && -+ ech->padding1[2] == 'F'; -+} -+ - /** - * scan_peb - scan and process UBI headers of a PEB. - * @ubi: UBI device description object -@@ -971,9 +978,21 @@ static int scan_peb(struct ubi_device *u - return 0; - } - -- err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0); -- if (err < 0) -- return err; -+ if (!ai->eof_found) { -+ err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0); -+ if (err < 0) -+ return err; -+ -+ if (ec_hdr_has_eof(ech)) { -+ pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n", -+ pnum); -+ ai->eof_found = true; -+ } -+ } -+ -+ if (ai->eof_found) -+ err = UBI_IO_FF_BITFLIPS; -+ - switch (err) { - case 0: - break; ---- a/drivers/mtd/ubi/ubi.h -+++ b/drivers/mtd/ubi/ubi.h -@@ -779,6 +779,7 @@ struct ubi_attach_info { - int mean_ec; - uint64_t ec_sum; - int ec_count; -+ bool eof_found; - struct kmem_cache *aeb_slab_cache; - struct ubi_ec_hdr *ech; - struct ubi_vid_io_buf *vidb; diff --git a/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch deleted file mode 100644 index e74370f4ba..0000000000 --- a/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch +++ /dev/null @@ -1,5180 +0,0 @@ -From: Alexandros C. Couloumbis -Subject: fs: add jffs2/lzma support (not activated by default yet) - -lede-commit: c2c88d315fa0e881f8b19da07b62859b915b11b2 -Signed-off-by: Alexandros C. Couloumbis ---- - fs/jffs2/Kconfig | 9 + - fs/jffs2/Makefile | 3 + - fs/jffs2/compr.c | 6 + - fs/jffs2/compr.h | 10 +- - fs/jffs2/compr_lzma.c | 128 +++ - fs/jffs2/super.c | 33 +- - include/linux/lzma.h | 62 ++ - include/linux/lzma/LzFind.h | 115 +++ - include/linux/lzma/LzHash.h | 54 + - include/linux/lzma/LzmaDec.h | 231 +++++ - include/linux/lzma/LzmaEnc.h | 80 ++ - include/linux/lzma/Types.h | 226 +++++ - include/uapi/linux/jffs2.h | 1 + - lib/Kconfig | 6 + - lib/Makefile | 12 + - lib/lzma/LzFind.c | 761 ++++++++++++++ - lib/lzma/LzmaDec.c | 999 +++++++++++++++++++ - lib/lzma/LzmaEnc.c | 2271 ++++++++++++++++++++++++++++++++++++++++++ - lib/lzma/Makefile | 7 + - 19 files changed, 5008 insertions(+), 6 deletions(-) - create mode 100644 fs/jffs2/compr_lzma.c - create mode 100644 include/linux/lzma.h - create mode 100644 include/linux/lzma/LzFind.h - create mode 100644 include/linux/lzma/LzHash.h - create mode 100644 include/linux/lzma/LzmaDec.h - create mode 100644 include/linux/lzma/LzmaEnc.h - create mode 100644 include/linux/lzma/Types.h - create mode 100644 lib/lzma/LzFind.c - create mode 100644 lib/lzma/LzmaDec.c - create mode 100644 lib/lzma/LzmaEnc.c - create mode 100644 lib/lzma/Makefile - ---- a/fs/jffs2/Kconfig -+++ b/fs/jffs2/Kconfig -@@ -139,6 +139,15 @@ config JFFS2_LZO - This feature was added in July, 2007. Say 'N' if you need - compatibility with older bootloaders or kernels. - -+config JFFS2_LZMA -+ bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS -+ select LZMA_COMPRESS -+ select LZMA_DECOMPRESS -+ depends on JFFS2_FS -+ default n -+ help -+ JFFS2 wrapper to the LZMA C SDK -+ - config JFFS2_RTIME - bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS - depends on JFFS2_FS ---- a/fs/jffs2/Makefile -+++ b/fs/jffs2/Makefile -@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN) += compr_rub - jffs2-$(CONFIG_JFFS2_RTIME) += compr_rtime.o - jffs2-$(CONFIG_JFFS2_ZLIB) += compr_zlib.o - jffs2-$(CONFIG_JFFS2_LZO) += compr_lzo.o -+jffs2-$(CONFIG_JFFS2_LZMA) += compr_lzma.o - jffs2-$(CONFIG_JFFS2_SUMMARY) += summary.o -+ -+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma ---- a/fs/jffs2/compr.c -+++ b/fs/jffs2/compr.c -@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void) - #ifdef CONFIG_JFFS2_LZO - jffs2_lzo_init(); - #endif -+#ifdef CONFIG_JFFS2_LZMA -+ jffs2_lzma_init(); -+#endif - /* Setting default compression mode */ - #ifdef CONFIG_JFFS2_CMODE_NONE - jffs2_compression_mode = JFFS2_COMPR_MODE_NONE; -@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void) - int jffs2_compressors_exit(void) - { - /* Unregistering compressors */ -+#ifdef CONFIG_JFFS2_LZMA -+ jffs2_lzma_exit(); -+#endif - #ifdef CONFIG_JFFS2_LZO - jffs2_lzo_exit(); - #endif ---- a/fs/jffs2/compr.h -+++ b/fs/jffs2/compr.h -@@ -29,9 +29,9 @@ - #define JFFS2_DYNRUBIN_PRIORITY 20 - #define JFFS2_LZARI_PRIORITY 30 - #define JFFS2_RTIME_PRIORITY 50 --#define JFFS2_ZLIB_PRIORITY 60 --#define JFFS2_LZO_PRIORITY 80 -- -+#define JFFS2_LZMA_PRIORITY 70 -+#define JFFS2_ZLIB_PRIORITY 80 -+#define JFFS2_LZO_PRIORITY 90 - - #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */ - #define JFFS2_DYNRUBIN_DISABLED /* for decompression */ -@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void); - int jffs2_lzo_init(void); - void jffs2_lzo_exit(void); - #endif -+#ifdef CONFIG_JFFS2_LZMA -+int jffs2_lzma_init(void); -+void jffs2_lzma_exit(void); -+#endif - - #endif /* __JFFS2_COMPR_H__ */ ---- /dev/null -+++ b/fs/jffs2/compr_lzma.c -@@ -0,0 +1,128 @@ -+/* -+ * JFFS2 -- Journalling Flash File System, Version 2. -+ * -+ * For licensing information, see the file 'LICENCE' in this directory. -+ * -+ * JFFS2 wrapper to the LZMA C SDK -+ * -+ */ -+ -+#include -+#include "compr.h" -+ -+#ifdef __KERNEL__ -+ static DEFINE_MUTEX(deflate_mutex); -+#endif -+ -+CLzmaEncHandle *p; -+Byte propsEncoded[LZMA_PROPS_SIZE]; -+SizeT propsSize = sizeof(propsEncoded); -+ -+STATIC void lzma_free_workspace(void) -+{ -+ LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc); -+} -+ -+STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props) -+{ -+ if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL) -+ { -+ PRINT_ERROR("Failed to allocate lzma deflate workspace\n"); -+ return -ENOMEM; -+ } -+ -+ if (LzmaEnc_SetProps(p, props) != SZ_OK) -+ { -+ lzma_free_workspace(); -+ return -1; -+ } -+ -+ if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK) -+ { -+ lzma_free_workspace(); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out, -+ uint32_t *sourcelen, uint32_t *dstlen) -+{ -+ SizeT compress_size = (SizeT)(*dstlen); -+ int ret; -+ -+ #ifdef __KERNEL__ -+ mutex_lock(&deflate_mutex); -+ #endif -+ -+ ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen, -+ 0, NULL, &lzma_alloc, &lzma_alloc); -+ -+ #ifdef __KERNEL__ -+ mutex_unlock(&deflate_mutex); -+ #endif -+ -+ if (ret != SZ_OK) -+ return -1; -+ -+ *dstlen = (uint32_t)compress_size; -+ -+ return 0; -+} -+ -+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out, -+ uint32_t srclen, uint32_t destlen) -+{ -+ int ret; -+ SizeT dl = (SizeT)destlen; -+ SizeT sl = (SizeT)srclen; -+ ELzmaStatus status; -+ -+ ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded, -+ propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc); -+ -+ if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen) -+ return -1; -+ -+ return 0; -+} -+ -+static struct jffs2_compressor jffs2_lzma_comp = { -+ .priority = JFFS2_LZMA_PRIORITY, -+ .name = "lzma", -+ .compr = JFFS2_COMPR_LZMA, -+ .compress = &jffs2_lzma_compress, -+ .decompress = &jffs2_lzma_decompress, -+ .disabled = 0, -+}; -+ -+int INIT jffs2_lzma_init(void) -+{ -+ int ret; -+ CLzmaEncProps props; -+ LzmaEncProps_Init(&props); -+ -+ props.dictSize = LZMA_BEST_DICT(0x2000); -+ props.level = LZMA_BEST_LEVEL; -+ props.lc = LZMA_BEST_LC; -+ props.lp = LZMA_BEST_LP; -+ props.pb = LZMA_BEST_PB; -+ props.fb = LZMA_BEST_FB; -+ -+ ret = lzma_alloc_workspace(&props); -+ if (ret < 0) -+ return ret; -+ -+ ret = jffs2_register_compressor(&jffs2_lzma_comp); -+ if (ret) -+ lzma_free_workspace(); -+ -+ return ret; -+} -+ -+void jffs2_lzma_exit(void) -+{ -+ jffs2_unregister_compressor(&jffs2_lzma_comp); -+ lzma_free_workspace(); -+} ---- a/fs/jffs2/super.c -+++ b/fs/jffs2/super.c -@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void) - BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); - BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); - -- pr_info("version 2.2." -+ pr_info("version 2.2" - #ifdef CONFIG_JFFS2_FS_WRITEBUFFER - " (NAND)" - #endif - #ifdef CONFIG_JFFS2_SUMMARY -- " (SUMMARY) " -+ " (SUMMARY)" - #endif -- " © 2001-2006 Red Hat, Inc.\n"); -+#ifdef CONFIG_JFFS2_ZLIB -+ " (ZLIB)" -+#endif -+#ifdef CONFIG_JFFS2_LZO -+ " (LZO)" -+#endif -+#ifdef CONFIG_JFFS2_LZMA -+ " (LZMA)" -+#endif -+#ifdef CONFIG_JFFS2_RTIME -+ " (RTIME)" -+#endif -+#ifdef CONFIG_JFFS2_RUBIN -+ " (RUBIN)" -+#endif -+#ifdef CONFIG_JFFS2_CMODE_NONE -+ " (CMODE_NONE)" -+#endif -+#ifdef CONFIG_JFFS2_CMODE_PRIORITY -+ " (CMODE_PRIORITY)" -+#endif -+#ifdef CONFIG_JFFS2_CMODE_SIZE -+ " (CMODE_SIZE)" -+#endif -+#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO -+ " (CMODE_FAVOURLZO)" -+#endif -+ " (c) 2001-2006 Red Hat, Inc.\n"); - - jffs2_inode_cachep = kmem_cache_create("jffs2_i", - sizeof(struct jffs2_inode_info), ---- /dev/null -+++ b/include/linux/lzma.h -@@ -0,0 +1,62 @@ -+#ifndef __LZMA_H__ -+#define __LZMA_H__ -+ -+#ifdef __KERNEL__ -+ #include -+ #include -+ #include -+ #include -+ #include -+ #define LZMA_MALLOC vmalloc -+ #define LZMA_FREE vfree -+ #define PRINT_ERROR(msg) printk(KERN_WARNING #msg) -+ #define INIT __init -+ #define STATIC static -+#else -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #include -+ #ifndef PAGE_SIZE -+ extern int page_size; -+ #define PAGE_SIZE page_size -+ #endif -+ #define LZMA_MALLOC malloc -+ #define LZMA_FREE free -+ #define PRINT_ERROR(msg) fprintf(stderr, msg) -+ #define INIT -+ #define STATIC -+#endif -+ -+#include "lzma/LzmaDec.h" -+#include "lzma/LzmaEnc.h" -+ -+#define LZMA_BEST_LEVEL (9) -+#define LZMA_BEST_LC (0) -+#define LZMA_BEST_LP (0) -+#define LZMA_BEST_PB (0) -+#define LZMA_BEST_FB (273) -+ -+#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2) -+ -+static void *p_lzma_malloc(void *p, size_t size) -+{ -+ if (size == 0) -+ return NULL; -+ -+ return LZMA_MALLOC(size); -+} -+ -+static void p_lzma_free(void *p, void *address) -+{ -+ if (address != NULL) -+ LZMA_FREE(address); -+} -+ -+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; -+ -+#endif ---- /dev/null -+++ b/include/linux/lzma/LzFind.h -@@ -0,0 +1,115 @@ -+/* LzFind.h -- Match finder for LZ algorithms -+2009-04-22 : Igor Pavlov : Public domain */ -+ -+#ifndef __LZ_FIND_H -+#define __LZ_FIND_H -+ -+#include "Types.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+typedef UInt32 CLzRef; -+ -+typedef struct _CMatchFinder -+{ -+ Byte *buffer; -+ UInt32 pos; -+ UInt32 posLimit; -+ UInt32 streamPos; -+ UInt32 lenLimit; -+ -+ UInt32 cyclicBufferPos; -+ UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */ -+ -+ UInt32 matchMaxLen; -+ CLzRef *hash; -+ CLzRef *son; -+ UInt32 hashMask; -+ UInt32 cutValue; -+ -+ Byte *bufferBase; -+ ISeqInStream *stream; -+ int streamEndWasReached; -+ -+ UInt32 blockSize; -+ UInt32 keepSizeBefore; -+ UInt32 keepSizeAfter; -+ -+ UInt32 numHashBytes; -+ int directInput; -+ size_t directInputRem; -+ int btMode; -+ int bigHash; -+ UInt32 historySize; -+ UInt32 fixedHashSize; -+ UInt32 hashSizeSum; -+ UInt32 numSons; -+ SRes result; -+ UInt32 crc[256]; -+} CMatchFinder; -+ -+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer) -+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)]) -+ -+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos) -+ -+int MatchFinder_NeedMove(CMatchFinder *p); -+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p); -+void MatchFinder_MoveBlock(CMatchFinder *p); -+void MatchFinder_ReadIfRequired(CMatchFinder *p); -+ -+void MatchFinder_Construct(CMatchFinder *p); -+ -+/* Conditions: -+ historySize <= 3 GB -+ keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB -+*/ -+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, -+ UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, -+ ISzAlloc *alloc); -+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); -+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems); -+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue); -+ -+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son, -+ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue, -+ UInt32 *distances, UInt32 maxLen); -+ -+/* -+Conditions: -+ Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func. -+ Mf_GetPointerToCurrentPos_Func's result must be used only before any other function -+*/ -+ -+typedef void (*Mf_Init_Func)(void *object); -+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index); -+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object); -+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object); -+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances); -+typedef void (*Mf_Skip_Func)(void *object, UInt32); -+ -+typedef struct _IMatchFinder -+{ -+ Mf_Init_Func Init; -+ Mf_GetIndexByte_Func GetIndexByte; -+ Mf_GetNumAvailableBytes_Func GetNumAvailableBytes; -+ Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos; -+ Mf_GetMatches_Func GetMatches; -+ Mf_Skip_Func Skip; -+} IMatchFinder; -+ -+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable); -+ -+void MatchFinder_Init(CMatchFinder *p); -+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); -+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); -+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); -+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif ---- /dev/null -+++ b/include/linux/lzma/LzHash.h -@@ -0,0 +1,54 @@ -+/* LzHash.h -- HASH functions for LZ algorithms -+2009-02-07 : Igor Pavlov : Public domain */ -+ -+#ifndef __LZ_HASH_H -+#define __LZ_HASH_H -+ -+#define kHash2Size (1 << 10) -+#define kHash3Size (1 << 16) -+#define kHash4Size (1 << 20) -+ -+#define kFix3HashSize (kHash2Size) -+#define kFix4HashSize (kHash2Size + kHash3Size) -+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size) -+ -+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8); -+ -+#define HASH3_CALC { \ -+ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ -+ hash2Value = temp & (kHash2Size - 1); \ -+ hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; } -+ -+#define HASH4_CALC { \ -+ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ -+ hash2Value = temp & (kHash2Size - 1); \ -+ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ -+ hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; } -+ -+#define HASH5_CALC { \ -+ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ -+ hash2Value = temp & (kHash2Size - 1); \ -+ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ -+ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \ -+ hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \ -+ hash4Value &= (kHash4Size - 1); } -+ -+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */ -+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF; -+ -+ -+#define MT_HASH2_CALC \ -+ hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1); -+ -+#define MT_HASH3_CALC { \ -+ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ -+ hash2Value = temp & (kHash2Size - 1); \ -+ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); } -+ -+#define MT_HASH4_CALC { \ -+ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ -+ hash2Value = temp & (kHash2Size - 1); \ -+ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ -+ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } -+ -+#endif ---- /dev/null -+++ b/include/linux/lzma/LzmaDec.h -@@ -0,0 +1,231 @@ -+/* LzmaDec.h -- LZMA Decoder -+2009-02-07 : Igor Pavlov : Public domain */ -+ -+#ifndef __LZMA_DEC_H -+#define __LZMA_DEC_H -+ -+#include "Types.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* #define _LZMA_PROB32 */ -+/* _LZMA_PROB32 can increase the speed on some CPUs, -+ but memory usage for CLzmaDec::probs will be doubled in that case */ -+ -+#ifdef _LZMA_PROB32 -+#define CLzmaProb UInt32 -+#else -+#define CLzmaProb UInt16 -+#endif -+ -+ -+/* ---------- LZMA Properties ---------- */ -+ -+#define LZMA_PROPS_SIZE 5 -+ -+typedef struct _CLzmaProps -+{ -+ unsigned lc, lp, pb; -+ UInt32 dicSize; -+} CLzmaProps; -+ -+/* LzmaProps_Decode - decodes properties -+Returns: -+ SZ_OK -+ SZ_ERROR_UNSUPPORTED - Unsupported properties -+*/ -+ -+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size); -+ -+ -+/* ---------- LZMA Decoder state ---------- */ -+ -+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case. -+ Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */ -+ -+#define LZMA_REQUIRED_INPUT_MAX 20 -+ -+typedef struct -+{ -+ CLzmaProps prop; -+ CLzmaProb *probs; -+ Byte *dic; -+ const Byte *buf; -+ UInt32 range, code; -+ SizeT dicPos; -+ SizeT dicBufSize; -+ UInt32 processedPos; -+ UInt32 checkDicSize; -+ unsigned state; -+ UInt32 reps[4]; -+ unsigned remainLen; -+ int needFlush; -+ int needInitState; -+ UInt32 numProbs; -+ unsigned tempBufSize; -+ Byte tempBuf[LZMA_REQUIRED_INPUT_MAX]; -+} CLzmaDec; -+ -+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; } -+ -+void LzmaDec_Init(CLzmaDec *p); -+ -+/* There are two types of LZMA streams: -+ 0) Stream with end mark. That end mark adds about 6 bytes to compressed size. -+ 1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */ -+ -+typedef enum -+{ -+ LZMA_FINISH_ANY, /* finish at any point */ -+ LZMA_FINISH_END /* block must be finished at the end */ -+} ELzmaFinishMode; -+ -+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!! -+ -+ You must use LZMA_FINISH_END, when you know that current output buffer -+ covers last bytes of block. In other cases you must use LZMA_FINISH_ANY. -+ -+ If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK, -+ and output value of destLen will be less than output buffer size limit. -+ You can check status result also. -+ -+ You can use multiple checks to test data integrity after full decompression: -+ 1) Check Result and "status" variable. -+ 2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize. -+ 3) Check that output(srcLen) = compressedSize, if you know real compressedSize. -+ You must use correct finish mode in that case. */ -+ -+typedef enum -+{ -+ LZMA_STATUS_NOT_SPECIFIED, /* use main error code instead */ -+ LZMA_STATUS_FINISHED_WITH_MARK, /* stream was finished with end mark. */ -+ LZMA_STATUS_NOT_FINISHED, /* stream was not finished */ -+ LZMA_STATUS_NEEDS_MORE_INPUT, /* you must provide more input bytes */ -+ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK /* there is probability that stream was finished without end mark */ -+} ELzmaStatus; -+ -+/* ELzmaStatus is used only as output value for function call */ -+ -+ -+/* ---------- Interfaces ---------- */ -+ -+/* There are 3 levels of interfaces: -+ 1) Dictionary Interface -+ 2) Buffer Interface -+ 3) One Call Interface -+ You can select any of these interfaces, but don't mix functions from different -+ groups for same object. */ -+ -+ -+/* There are two variants to allocate state for Dictionary Interface: -+ 1) LzmaDec_Allocate / LzmaDec_Free -+ 2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs -+ You can use variant 2, if you set dictionary buffer manually. -+ For Buffer Interface you must always use variant 1. -+ -+LzmaDec_Allocate* can return: -+ SZ_OK -+ SZ_ERROR_MEM - Memory allocation error -+ SZ_ERROR_UNSUPPORTED - Unsupported properties -+*/ -+ -+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc); -+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc); -+ -+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc); -+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc); -+ -+/* ---------- Dictionary Interface ---------- */ -+ -+/* You can use it, if you want to eliminate the overhead for data copying from -+ dictionary to some other external buffer. -+ You must work with CLzmaDec variables directly in this interface. -+ -+ STEPS: -+ LzmaDec_Constr() -+ LzmaDec_Allocate() -+ for (each new stream) -+ { -+ LzmaDec_Init() -+ while (it needs more decompression) -+ { -+ LzmaDec_DecodeToDic() -+ use data from CLzmaDec::dic and update CLzmaDec::dicPos -+ } -+ } -+ LzmaDec_Free() -+*/ -+ -+/* LzmaDec_DecodeToDic -+ -+ The decoding to internal dictionary buffer (CLzmaDec::dic). -+ You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! -+ -+finishMode: -+ It has meaning only if the decoding reaches output limit (dicLimit). -+ LZMA_FINISH_ANY - Decode just dicLimit bytes. -+ LZMA_FINISH_END - Stream must be finished after dicLimit. -+ -+Returns: -+ SZ_OK -+ status: -+ LZMA_STATUS_FINISHED_WITH_MARK -+ LZMA_STATUS_NOT_FINISHED -+ LZMA_STATUS_NEEDS_MORE_INPUT -+ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK -+ SZ_ERROR_DATA - Data error -+*/ -+ -+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, -+ const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); -+ -+ -+/* ---------- Buffer Interface ---------- */ -+ -+/* It's zlib-like interface. -+ See LzmaDec_DecodeToDic description for information about STEPS and return results, -+ but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need -+ to work with CLzmaDec variables manually. -+ -+finishMode: -+ It has meaning only if the decoding reaches output limit (*destLen). -+ LZMA_FINISH_ANY - Decode just destLen bytes. -+ LZMA_FINISH_END - Stream must be finished after (*destLen). -+*/ -+ -+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, -+ const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); -+ -+ -+/* ---------- One Call Interface ---------- */ -+ -+/* LzmaDecode -+ -+finishMode: -+ It has meaning only if the decoding reaches output limit (*destLen). -+ LZMA_FINISH_ANY - Decode just destLen bytes. -+ LZMA_FINISH_END - Stream must be finished after (*destLen). -+ -+Returns: -+ SZ_OK -+ status: -+ LZMA_STATUS_FINISHED_WITH_MARK -+ LZMA_STATUS_NOT_FINISHED -+ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK -+ SZ_ERROR_DATA - Data error -+ SZ_ERROR_MEM - Memory allocation error -+ SZ_ERROR_UNSUPPORTED - Unsupported properties -+ SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src). -+*/ -+ -+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, -+ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, -+ ELzmaStatus *status, ISzAlloc *alloc); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif ---- /dev/null -+++ b/include/linux/lzma/LzmaEnc.h -@@ -0,0 +1,80 @@ -+/* LzmaEnc.h -- LZMA Encoder -+2009-02-07 : Igor Pavlov : Public domain */ -+ -+#ifndef __LZMA_ENC_H -+#define __LZMA_ENC_H -+ -+#include "Types.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define LZMA_PROPS_SIZE 5 -+ -+typedef struct _CLzmaEncProps -+{ -+ int level; /* 0 <= level <= 9 */ -+ UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version -+ (1 << 12) <= dictSize <= (1 << 30) for 64-bit version -+ default = (1 << 24) */ -+ int lc; /* 0 <= lc <= 8, default = 3 */ -+ int lp; /* 0 <= lp <= 4, default = 0 */ -+ int pb; /* 0 <= pb <= 4, default = 2 */ -+ int algo; /* 0 - fast, 1 - normal, default = 1 */ -+ int fb; /* 5 <= fb <= 273, default = 32 */ -+ int btMode; /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */ -+ int numHashBytes; /* 2, 3 or 4, default = 4 */ -+ UInt32 mc; /* 1 <= mc <= (1 << 30), default = 32 */ -+ unsigned writeEndMark; /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */ -+ int numThreads; /* 1 or 2, default = 2 */ -+} CLzmaEncProps; -+ -+void LzmaEncProps_Init(CLzmaEncProps *p); -+void LzmaEncProps_Normalize(CLzmaEncProps *p); -+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2); -+ -+ -+/* ---------- CLzmaEncHandle Interface ---------- */ -+ -+/* LzmaEnc_* functions can return the following exit codes: -+Returns: -+ SZ_OK - OK -+ SZ_ERROR_MEM - Memory allocation error -+ SZ_ERROR_PARAM - Incorrect paramater in props -+ SZ_ERROR_WRITE - Write callback error. -+ SZ_ERROR_PROGRESS - some break from progress callback -+ SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) -+*/ -+ -+typedef void * CLzmaEncHandle; -+ -+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc); -+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig); -+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props); -+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size); -+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, -+ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); -+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, -+ int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); -+ -+/* ---------- One Call Interface ---------- */ -+ -+/* LzmaEncode -+Return code: -+ SZ_OK - OK -+ SZ_ERROR_MEM - Memory allocation error -+ SZ_ERROR_PARAM - Incorrect paramater -+ SZ_ERROR_OUTPUT_EOF - output buffer overflow -+ SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) -+*/ -+ -+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, -+ const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, -+ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif ---- /dev/null -+++ b/include/linux/lzma/Types.h -@@ -0,0 +1,226 @@ -+/* Types.h -- Basic types -+2009-11-23 : Igor Pavlov : Public domain */ -+ -+#ifndef __7Z_TYPES_H -+#define __7Z_TYPES_H -+ -+#include -+ -+#ifdef _WIN32 -+#include -+#endif -+ -+#ifndef EXTERN_C_BEGIN -+#ifdef __cplusplus -+#define EXTERN_C_BEGIN extern "C" { -+#define EXTERN_C_END } -+#else -+#define EXTERN_C_BEGIN -+#define EXTERN_C_END -+#endif -+#endif -+ -+EXTERN_C_BEGIN -+ -+#define SZ_OK 0 -+ -+#define SZ_ERROR_DATA 1 -+#define SZ_ERROR_MEM 2 -+#define SZ_ERROR_CRC 3 -+#define SZ_ERROR_UNSUPPORTED 4 -+#define SZ_ERROR_PARAM 5 -+#define SZ_ERROR_INPUT_EOF 6 -+#define SZ_ERROR_OUTPUT_EOF 7 -+#define SZ_ERROR_READ 8 -+#define SZ_ERROR_WRITE 9 -+#define SZ_ERROR_PROGRESS 10 -+#define SZ_ERROR_FAIL 11 -+#define SZ_ERROR_THREAD 12 -+ -+#define SZ_ERROR_ARCHIVE 16 -+#define SZ_ERROR_NO_ARCHIVE 17 -+ -+typedef int SRes; -+ -+#ifdef _WIN32 -+typedef DWORD WRes; -+#else -+typedef int WRes; -+#endif -+ -+#ifndef RINOK -+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; } -+#endif -+ -+typedef unsigned char Byte; -+typedef short Int16; -+typedef unsigned short UInt16; -+ -+#ifdef _LZMA_UINT32_IS_ULONG -+typedef long Int32; -+typedef unsigned long UInt32; -+#else -+typedef int Int32; -+typedef unsigned int UInt32; -+#endif -+ -+#ifdef _SZ_NO_INT_64 -+ -+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers. -+ NOTES: Some code will work incorrectly in that case! */ -+ -+typedef long Int64; -+typedef unsigned long UInt64; -+ -+#else -+ -+#if defined(_MSC_VER) || defined(__BORLANDC__) -+typedef __int64 Int64; -+typedef unsigned __int64 UInt64; -+#else -+typedef long long int Int64; -+typedef unsigned long long int UInt64; -+#endif -+ -+#endif -+ -+#ifdef _LZMA_NO_SYSTEM_SIZE_T -+typedef UInt32 SizeT; -+#else -+typedef size_t SizeT; -+#endif -+ -+typedef int Bool; -+#define True 1 -+#define False 0 -+ -+ -+#ifdef _WIN32 -+#define MY_STD_CALL __stdcall -+#else -+#define MY_STD_CALL -+#endif -+ -+#ifdef _MSC_VER -+ -+#if _MSC_VER >= 1300 -+#define MY_NO_INLINE __declspec(noinline) -+#else -+#define MY_NO_INLINE -+#endif -+ -+#define MY_CDECL __cdecl -+#define MY_FAST_CALL __fastcall -+ -+#else -+ -+#define MY_CDECL -+#define MY_FAST_CALL -+ -+#endif -+ -+ -+/* The following interfaces use first parameter as pointer to structure */ -+ -+typedef struct -+{ -+ SRes (*Read)(void *p, void *buf, size_t *size); -+ /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream. -+ (output(*size) < input(*size)) is allowed */ -+} ISeqInStream; -+ -+/* it can return SZ_ERROR_INPUT_EOF */ -+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size); -+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType); -+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf); -+ -+typedef struct -+{ -+ size_t (*Write)(void *p, const void *buf, size_t size); -+ /* Returns: result - the number of actually written bytes. -+ (result < size) means error */ -+} ISeqOutStream; -+ -+typedef enum -+{ -+ SZ_SEEK_SET = 0, -+ SZ_SEEK_CUR = 1, -+ SZ_SEEK_END = 2 -+} ESzSeek; -+ -+typedef struct -+{ -+ SRes (*Read)(void *p, void *buf, size_t *size); /* same as ISeqInStream::Read */ -+ SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin); -+} ISeekInStream; -+ -+typedef struct -+{ -+ SRes (*Look)(void *p, void **buf, size_t *size); -+ /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream. -+ (output(*size) > input(*size)) is not allowed -+ (output(*size) < input(*size)) is allowed */ -+ SRes (*Skip)(void *p, size_t offset); -+ /* offset must be <= output(*size) of Look */ -+ -+ SRes (*Read)(void *p, void *buf, size_t *size); -+ /* reads directly (without buffer). It's same as ISeqInStream::Read */ -+ SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin); -+} ILookInStream; -+ -+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size); -+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset); -+ -+/* reads via ILookInStream::Read */ -+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType); -+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size); -+ -+#define LookToRead_BUF_SIZE (1 << 14) -+ -+typedef struct -+{ -+ ILookInStream s; -+ ISeekInStream *realStream; -+ size_t pos; -+ size_t size; -+ Byte buf[LookToRead_BUF_SIZE]; -+} CLookToRead; -+ -+void LookToRead_CreateVTable(CLookToRead *p, int lookahead); -+void LookToRead_Init(CLookToRead *p); -+ -+typedef struct -+{ -+ ISeqInStream s; -+ ILookInStream *realStream; -+} CSecToLook; -+ -+void SecToLook_CreateVTable(CSecToLook *p); -+ -+typedef struct -+{ -+ ISeqInStream s; -+ ILookInStream *realStream; -+} CSecToRead; -+ -+void SecToRead_CreateVTable(CSecToRead *p); -+ -+typedef struct -+{ -+ SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize); -+ /* Returns: result. (result != SZ_OK) means break. -+ Value (UInt64)(Int64)-1 for size means unknown value. */ -+} ICompressProgress; -+ -+typedef struct -+{ -+ void *(*Alloc)(void *p, size_t size); -+ void (*Free)(void *p, void *address); /* address can be 0 */ -+} ISzAlloc; -+ -+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size) -+#define IAlloc_Free(p, a) (p)->Free((p), a) -+ -+EXTERN_C_END -+ -+#endif ---- a/include/uapi/linux/jffs2.h -+++ b/include/uapi/linux/jffs2.h -@@ -46,6 +46,7 @@ - #define JFFS2_COMPR_DYNRUBIN 0x05 - #define JFFS2_COMPR_ZLIB 0x06 - #define JFFS2_COMPR_LZO 0x07 -+#define JFFS2_COMPR_LZMA 0x08 - /* Compatibility flags. */ - #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ - #define JFFS2_NODE_ACCURATE 0x2000 ---- a/lib/Kconfig -+++ b/lib/Kconfig -@@ -241,6 +241,12 @@ config LZ4_DECOMPRESS - - source "lib/xz/Kconfig" - -+config LZMA_COMPRESS -+ tristate -+ -+config LZMA_DECOMPRESS -+ tristate -+ - # - # These all provide a common interface (hence the apparent duplication with - # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.) ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -2,6 +2,16 @@ - # Makefile for some libs needed in the kernel. - # - -+ifdef CONFIG_JFFS2_ZLIB -+ CONFIG_ZLIB_INFLATE:=y -+ CONFIG_ZLIB_DEFLATE:=y -+endif -+ -+ifdef CONFIG_JFFS2_LZMA -+ CONFIG_LZMA_DECOMPRESS:=y -+ CONFIG_LZMA_COMPRESS:=y -+endif -+ - ifdef CONFIG_FUNCTION_TRACER - ORIG_CFLAGS := $(KBUILD_CFLAGS) - KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS)) -@@ -110,6 +120,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/ - obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/ - obj-$(CONFIG_XZ_DEC) += xz/ - obj-$(CONFIG_RAID6_PQ) += raid6/ -+obj-$(CONFIG_LZMA_COMPRESS) += lzma/ -+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/ - - lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o - lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o ---- /dev/null -+++ b/lib/lzma/LzFind.c -@@ -0,0 +1,761 @@ -+/* LzFind.c -- Match finder for LZ algorithms -+2009-04-22 : Igor Pavlov : Public domain */ -+ -+#include -+ -+#include "LzFind.h" -+#include "LzHash.h" -+ -+#define kEmptyHashValue 0 -+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF) -+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */ -+#define kNormalizeMask (~(kNormalizeStepMin - 1)) -+#define kMaxHistorySize ((UInt32)3 << 30) -+ -+#define kStartMaxLen 3 -+ -+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc) -+{ -+ if (!p->directInput) -+ { -+ alloc->Free(alloc, p->bufferBase); -+ p->bufferBase = 0; -+ } -+} -+ -+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */ -+ -+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc) -+{ -+ UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv; -+ if (p->directInput) -+ { -+ p->blockSize = blockSize; -+ return 1; -+ } -+ if (p->bufferBase == 0 || p->blockSize != blockSize) -+ { -+ LzInWindow_Free(p, alloc); -+ p->blockSize = blockSize; -+ p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize); -+ } -+ return (p->bufferBase != 0); -+} -+ -+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; } -+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; } -+ -+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; } -+ -+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue) -+{ -+ p->posLimit -= subValue; -+ p->pos -= subValue; -+ p->streamPos -= subValue; -+} -+ -+static void MatchFinder_ReadBlock(CMatchFinder *p) -+{ -+ if (p->streamEndWasReached || p->result != SZ_OK) -+ return; -+ if (p->directInput) -+ { -+ UInt32 curSize = 0xFFFFFFFF - p->streamPos; -+ if (curSize > p->directInputRem) -+ curSize = (UInt32)p->directInputRem; -+ p->directInputRem -= curSize; -+ p->streamPos += curSize; -+ if (p->directInputRem == 0) -+ p->streamEndWasReached = 1; -+ return; -+ } -+ for (;;) -+ { -+ Byte *dest = p->buffer + (p->streamPos - p->pos); -+ size_t size = (p->bufferBase + p->blockSize - dest); -+ if (size == 0) -+ return; -+ p->result = p->stream->Read(p->stream, dest, &size); -+ if (p->result != SZ_OK) -+ return; -+ if (size == 0) -+ { -+ p->streamEndWasReached = 1; -+ return; -+ } -+ p->streamPos += (UInt32)size; -+ if (p->streamPos - p->pos > p->keepSizeAfter) -+ return; -+ } -+} -+ -+void MatchFinder_MoveBlock(CMatchFinder *p) -+{ -+ memmove(p->bufferBase, -+ p->buffer - p->keepSizeBefore, -+ (size_t)(p->streamPos - p->pos + p->keepSizeBefore)); -+ p->buffer = p->bufferBase + p->keepSizeBefore; -+} -+ -+int MatchFinder_NeedMove(CMatchFinder *p) -+{ -+ if (p->directInput) -+ return 0; -+ /* if (p->streamEndWasReached) return 0; */ -+ return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter); -+} -+ -+void MatchFinder_ReadIfRequired(CMatchFinder *p) -+{ -+ if (p->streamEndWasReached) -+ return; -+ if (p->keepSizeAfter >= p->streamPos - p->pos) -+ MatchFinder_ReadBlock(p); -+} -+ -+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p) -+{ -+ if (MatchFinder_NeedMove(p)) -+ MatchFinder_MoveBlock(p); -+ MatchFinder_ReadBlock(p); -+} -+ -+static void MatchFinder_SetDefaultSettings(CMatchFinder *p) -+{ -+ p->cutValue = 32; -+ p->btMode = 1; -+ p->numHashBytes = 4; -+ p->bigHash = 0; -+} -+ -+#define kCrcPoly 0xEDB88320 -+ -+void MatchFinder_Construct(CMatchFinder *p) -+{ -+ UInt32 i; -+ p->bufferBase = 0; -+ p->directInput = 0; -+ p->hash = 0; -+ MatchFinder_SetDefaultSettings(p); -+ -+ for (i = 0; i < 256; i++) -+ { -+ UInt32 r = i; -+ int j; -+ for (j = 0; j < 8; j++) -+ r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1)); -+ p->crc[i] = r; -+ } -+} -+ -+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc) -+{ -+ alloc->Free(alloc, p->hash); -+ p->hash = 0; -+} -+ -+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc) -+{ -+ MatchFinder_FreeThisClassMemory(p, alloc); -+ LzInWindow_Free(p, alloc); -+} -+ -+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc) -+{ -+ size_t sizeInBytes = (size_t)num * sizeof(CLzRef); -+ if (sizeInBytes / sizeof(CLzRef) != num) -+ return 0; -+ return (CLzRef *)alloc->Alloc(alloc, sizeInBytes); -+} -+ -+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, -+ UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, -+ ISzAlloc *alloc) -+{ -+ UInt32 sizeReserv; -+ if (historySize > kMaxHistorySize) -+ { -+ MatchFinder_Free(p, alloc); -+ return 0; -+ } -+ sizeReserv = historySize >> 1; -+ if (historySize > ((UInt32)2 << 30)) -+ sizeReserv = historySize >> 2; -+ sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19); -+ -+ p->keepSizeBefore = historySize + keepAddBufferBefore + 1; -+ p->keepSizeAfter = matchMaxLen + keepAddBufferAfter; -+ /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */ -+ if (LzInWindow_Create(p, sizeReserv, alloc)) -+ { -+ UInt32 newCyclicBufferSize = historySize + 1; -+ UInt32 hs; -+ p->matchMaxLen = matchMaxLen; -+ { -+ p->fixedHashSize = 0; -+ if (p->numHashBytes == 2) -+ hs = (1 << 16) - 1; -+ else -+ { -+ hs = historySize - 1; -+ hs |= (hs >> 1); -+ hs |= (hs >> 2); -+ hs |= (hs >> 4); -+ hs |= (hs >> 8); -+ hs >>= 1; -+ hs |= 0xFFFF; /* don't change it! It's required for Deflate */ -+ if (hs > (1 << 24)) -+ { -+ if (p->numHashBytes == 3) -+ hs = (1 << 24) - 1; -+ else -+ hs >>= 1; -+ } -+ } -+ p->hashMask = hs; -+ hs++; -+ if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size; -+ if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size; -+ if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size; -+ hs += p->fixedHashSize; -+ } -+ -+ { -+ UInt32 prevSize = p->hashSizeSum + p->numSons; -+ UInt32 newSize; -+ p->historySize = historySize; -+ p->hashSizeSum = hs; -+ p->cyclicBufferSize = newCyclicBufferSize; -+ p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize); -+ newSize = p->hashSizeSum + p->numSons; -+ if (p->hash != 0 && prevSize == newSize) -+ return 1; -+ MatchFinder_FreeThisClassMemory(p, alloc); -+ p->hash = AllocRefs(newSize, alloc); -+ if (p->hash != 0) -+ { -+ p->son = p->hash + p->hashSizeSum; -+ return 1; -+ } -+ } -+ } -+ MatchFinder_Free(p, alloc); -+ return 0; -+} -+ -+static void MatchFinder_SetLimits(CMatchFinder *p) -+{ -+ UInt32 limit = kMaxValForNormalize - p->pos; -+ UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos; -+ if (limit2 < limit) -+ limit = limit2; -+ limit2 = p->streamPos - p->pos; -+ if (limit2 <= p->keepSizeAfter) -+ { -+ if (limit2 > 0) -+ limit2 = 1; -+ } -+ else -+ limit2 -= p->keepSizeAfter; -+ if (limit2 < limit) -+ limit = limit2; -+ { -+ UInt32 lenLimit = p->streamPos - p->pos; -+ if (lenLimit > p->matchMaxLen) -+ lenLimit = p->matchMaxLen; -+ p->lenLimit = lenLimit; -+ } -+ p->posLimit = p->pos + limit; -+} -+ -+void MatchFinder_Init(CMatchFinder *p) -+{ -+ UInt32 i; -+ for (i = 0; i < p->hashSizeSum; i++) -+ p->hash[i] = kEmptyHashValue; -+ p->cyclicBufferPos = 0; -+ p->buffer = p->bufferBase; -+ p->pos = p->streamPos = p->cyclicBufferSize; -+ p->result = SZ_OK; -+ p->streamEndWasReached = 0; -+ MatchFinder_ReadBlock(p); -+ MatchFinder_SetLimits(p); -+} -+ -+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p) -+{ -+ return (p->pos - p->historySize - 1) & kNormalizeMask; -+} -+ -+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems) -+{ -+ UInt32 i; -+ for (i = 0; i < numItems; i++) -+ { -+ UInt32 value = items[i]; -+ if (value <= subValue) -+ value = kEmptyHashValue; -+ else -+ value -= subValue; -+ items[i] = value; -+ } -+} -+ -+static void MatchFinder_Normalize(CMatchFinder *p) -+{ -+ UInt32 subValue = MatchFinder_GetSubValue(p); -+ MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons); -+ MatchFinder_ReduceOffsets(p, subValue); -+} -+ -+static void MatchFinder_CheckLimits(CMatchFinder *p) -+{ -+ if (p->pos == kMaxValForNormalize) -+ MatchFinder_Normalize(p); -+ if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos) -+ MatchFinder_CheckAndMoveAndRead(p); -+ if (p->cyclicBufferPos == p->cyclicBufferSize) -+ p->cyclicBufferPos = 0; -+ MatchFinder_SetLimits(p); -+} -+ -+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, -+ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, -+ UInt32 *distances, UInt32 maxLen) -+{ -+ son[_cyclicBufferPos] = curMatch; -+ for (;;) -+ { -+ UInt32 delta = pos - curMatch; -+ if (cutValue-- == 0 || delta >= _cyclicBufferSize) -+ return distances; -+ { -+ const Byte *pb = cur - delta; -+ curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)]; -+ if (pb[maxLen] == cur[maxLen] && *pb == *cur) -+ { -+ UInt32 len = 0; -+ while (++len != lenLimit) -+ if (pb[len] != cur[len]) -+ break; -+ if (maxLen < len) -+ { -+ *distances++ = maxLen = len; -+ *distances++ = delta - 1; -+ if (len == lenLimit) -+ return distances; -+ } -+ } -+ } -+ } -+} -+ -+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, -+ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, -+ UInt32 *distances, UInt32 maxLen) -+{ -+ CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1; -+ CLzRef *ptr1 = son + (_cyclicBufferPos << 1); -+ UInt32 len0 = 0, len1 = 0; -+ for (;;) -+ { -+ UInt32 delta = pos - curMatch; -+ if (cutValue-- == 0 || delta >= _cyclicBufferSize) -+ { -+ *ptr0 = *ptr1 = kEmptyHashValue; -+ return distances; -+ } -+ { -+ CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1); -+ const Byte *pb = cur - delta; -+ UInt32 len = (len0 < len1 ? len0 : len1); -+ if (pb[len] == cur[len]) -+ { -+ if (++len != lenLimit && pb[len] == cur[len]) -+ while (++len != lenLimit) -+ if (pb[len] != cur[len]) -+ break; -+ if (maxLen < len) -+ { -+ *distances++ = maxLen = len; -+ *distances++ = delta - 1; -+ if (len == lenLimit) -+ { -+ *ptr1 = pair[0]; -+ *ptr0 = pair[1]; -+ return distances; -+ } -+ } -+ } -+ if (pb[len] < cur[len]) -+ { -+ *ptr1 = curMatch; -+ ptr1 = pair + 1; -+ curMatch = *ptr1; -+ len1 = len; -+ } -+ else -+ { -+ *ptr0 = curMatch; -+ ptr0 = pair; -+ curMatch = *ptr0; -+ len0 = len; -+ } -+ } -+ } -+} -+ -+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, -+ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue) -+{ -+ CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1; -+ CLzRef *ptr1 = son + (_cyclicBufferPos << 1); -+ UInt32 len0 = 0, len1 = 0; -+ for (;;) -+ { -+ UInt32 delta = pos - curMatch; -+ if (cutValue-- == 0 || delta >= _cyclicBufferSize) -+ { -+ *ptr0 = *ptr1 = kEmptyHashValue; -+ return; -+ } -+ { -+ CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1); -+ const Byte *pb = cur - delta; -+ UInt32 len = (len0 < len1 ? len0 : len1); -+ if (pb[len] == cur[len]) -+ { -+ while (++len != lenLimit) -+ if (pb[len] != cur[len]) -+ break; -+ { -+ if (len == lenLimit) -+ { -+ *ptr1 = pair[0]; -+ *ptr0 = pair[1]; -+ return; -+ } -+ } -+ } -+ if (pb[len] < cur[len]) -+ { -+ *ptr1 = curMatch; -+ ptr1 = pair + 1; -+ curMatch = *ptr1; -+ len1 = len; -+ } -+ else -+ { -+ *ptr0 = curMatch; -+ ptr0 = pair; -+ curMatch = *ptr0; -+ len0 = len; -+ } -+ } -+ } -+} -+ -+#define MOVE_POS \ -+ ++p->cyclicBufferPos; \ -+ p->buffer++; \ -+ if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p); -+ -+#define MOVE_POS_RET MOVE_POS return offset; -+ -+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; } -+ -+#define GET_MATCHES_HEADER2(minLen, ret_op) \ -+ UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \ -+ lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \ -+ cur = p->buffer; -+ -+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0) -+#define SKIP_HEADER(minLen) GET_MATCHES_HEADER2(minLen, continue) -+ -+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue -+ -+#define GET_MATCHES_FOOTER(offset, maxLen) \ -+ offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \ -+ distances + offset, maxLen) - distances); MOVE_POS_RET; -+ -+#define SKIP_FOOTER \ -+ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS; -+ -+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) -+{ -+ UInt32 offset; -+ GET_MATCHES_HEADER(2) -+ HASH2_CALC; -+ curMatch = p->hash[hashValue]; -+ p->hash[hashValue] = p->pos; -+ offset = 0; -+ GET_MATCHES_FOOTER(offset, 1) -+} -+ -+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) -+{ -+ UInt32 offset; -+ GET_MATCHES_HEADER(3) -+ HASH_ZIP_CALC; -+ curMatch = p->hash[hashValue]; -+ p->hash[hashValue] = p->pos; -+ offset = 0; -+ GET_MATCHES_FOOTER(offset, 2) -+} -+ -+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) -+{ -+ UInt32 hash2Value, delta2, maxLen, offset; -+ GET_MATCHES_HEADER(3) -+ -+ HASH3_CALC; -+ -+ delta2 = p->pos - p->hash[hash2Value]; -+ curMatch = p->hash[kFix3HashSize + hashValue]; -+ -+ p->hash[hash2Value] = -+ p->hash[kFix3HashSize + hashValue] = p->pos; -+ -+ -+ maxLen = 2; -+ offset = 0; -+ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) -+ { -+ for (; maxLen != lenLimit; maxLen++) -+ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) -+ break; -+ distances[0] = maxLen; -+ distances[1] = delta2 - 1; -+ offset = 2; -+ if (maxLen == lenLimit) -+ { -+ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); -+ MOVE_POS_RET; -+ } -+ } -+ GET_MATCHES_FOOTER(offset, maxLen) -+} -+ -+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) -+{ -+ UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; -+ GET_MATCHES_HEADER(4) -+ -+ HASH4_CALC; -+ -+ delta2 = p->pos - p->hash[ hash2Value]; -+ delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; -+ curMatch = p->hash[kFix4HashSize + hashValue]; -+ -+ p->hash[ hash2Value] = -+ p->hash[kFix3HashSize + hash3Value] = -+ p->hash[kFix4HashSize + hashValue] = p->pos; -+ -+ maxLen = 1; -+ offset = 0; -+ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) -+ { -+ distances[0] = maxLen = 2; -+ distances[1] = delta2 - 1; -+ offset = 2; -+ } -+ if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) -+ { -+ maxLen = 3; -+ distances[offset + 1] = delta3 - 1; -+ offset += 2; -+ delta2 = delta3; -+ } -+ if (offset != 0) -+ { -+ for (; maxLen != lenLimit; maxLen++) -+ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) -+ break; -+ distances[offset - 2] = maxLen; -+ if (maxLen == lenLimit) -+ { -+ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); -+ MOVE_POS_RET; -+ } -+ } -+ if (maxLen < 3) -+ maxLen = 3; -+ GET_MATCHES_FOOTER(offset, maxLen) -+} -+ -+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) -+{ -+ UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; -+ GET_MATCHES_HEADER(4) -+ -+ HASH4_CALC; -+ -+ delta2 = p->pos - p->hash[ hash2Value]; -+ delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; -+ curMatch = p->hash[kFix4HashSize + hashValue]; -+ -+ p->hash[ hash2Value] = -+ p->hash[kFix3HashSize + hash3Value] = -+ p->hash[kFix4HashSize + hashValue] = p->pos; -+ -+ maxLen = 1; -+ offset = 0; -+ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) -+ { -+ distances[0] = maxLen = 2; -+ distances[1] = delta2 - 1; -+ offset = 2; -+ } -+ if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) -+ { -+ maxLen = 3; -+ distances[offset + 1] = delta3 - 1; -+ offset += 2; -+ delta2 = delta3; -+ } -+ if (offset != 0) -+ { -+ for (; maxLen != lenLimit; maxLen++) -+ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) -+ break; -+ distances[offset - 2] = maxLen; -+ if (maxLen == lenLimit) -+ { -+ p->son[p->cyclicBufferPos] = curMatch; -+ MOVE_POS_RET; -+ } -+ } -+ if (maxLen < 3) -+ maxLen = 3; -+ offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), -+ distances + offset, maxLen) - (distances)); -+ MOVE_POS_RET -+} -+ -+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) -+{ -+ UInt32 offset; -+ GET_MATCHES_HEADER(3) -+ HASH_ZIP_CALC; -+ curMatch = p->hash[hashValue]; -+ p->hash[hashValue] = p->pos; -+ offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), -+ distances, 2) - (distances)); -+ MOVE_POS_RET -+} -+ -+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num) -+{ -+ do -+ { -+ SKIP_HEADER(2) -+ HASH2_CALC; -+ curMatch = p->hash[hashValue]; -+ p->hash[hashValue] = p->pos; -+ SKIP_FOOTER -+ } -+ while (--num != 0); -+} -+ -+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) -+{ -+ do -+ { -+ SKIP_HEADER(3) -+ HASH_ZIP_CALC; -+ curMatch = p->hash[hashValue]; -+ p->hash[hashValue] = p->pos; -+ SKIP_FOOTER -+ } -+ while (--num != 0); -+} -+ -+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num) -+{ -+ do -+ { -+ UInt32 hash2Value; -+ SKIP_HEADER(3) -+ HASH3_CALC; -+ curMatch = p->hash[kFix3HashSize + hashValue]; -+ p->hash[hash2Value] = -+ p->hash[kFix3HashSize + hashValue] = p->pos; -+ SKIP_FOOTER -+ } -+ while (--num != 0); -+} -+ -+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) -+{ -+ do -+ { -+ UInt32 hash2Value, hash3Value; -+ SKIP_HEADER(4) -+ HASH4_CALC; -+ curMatch = p->hash[kFix4HashSize + hashValue]; -+ p->hash[ hash2Value] = -+ p->hash[kFix3HashSize + hash3Value] = p->pos; -+ p->hash[kFix4HashSize + hashValue] = p->pos; -+ SKIP_FOOTER -+ } -+ while (--num != 0); -+} -+ -+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) -+{ -+ do -+ { -+ UInt32 hash2Value, hash3Value; -+ SKIP_HEADER(4) -+ HASH4_CALC; -+ curMatch = p->hash[kFix4HashSize + hashValue]; -+ p->hash[ hash2Value] = -+ p->hash[kFix3HashSize + hash3Value] = -+ p->hash[kFix4HashSize + hashValue] = p->pos; -+ p->son[p->cyclicBufferPos] = curMatch; -+ MOVE_POS -+ } -+ while (--num != 0); -+} -+ -+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) -+{ -+ do -+ { -+ SKIP_HEADER(3) -+ HASH_ZIP_CALC; -+ curMatch = p->hash[hashValue]; -+ p->hash[hashValue] = p->pos; -+ p->son[p->cyclicBufferPos] = curMatch; -+ MOVE_POS -+ } -+ while (--num != 0); -+} -+ -+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable) -+{ -+ vTable->Init = (Mf_Init_Func)MatchFinder_Init; -+ vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte; -+ vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes; -+ vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos; -+ if (!p->btMode) -+ { -+ vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches; -+ vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip; -+ } -+ else if (p->numHashBytes == 2) -+ { -+ vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches; -+ vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip; -+ } -+ else if (p->numHashBytes == 3) -+ { -+ vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches; -+ vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip; -+ } -+ else -+ { -+ vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches; -+ vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; -+ } -+} ---- /dev/null -+++ b/lib/lzma/LzmaDec.c -@@ -0,0 +1,999 @@ -+/* LzmaDec.c -- LZMA Decoder -+2009-09-20 : Igor Pavlov : Public domain */ -+ -+#include "LzmaDec.h" -+ -+#include -+ -+#define kNumTopBits 24 -+#define kTopValue ((UInt32)1 << kNumTopBits) -+ -+#define kNumBitModelTotalBits 11 -+#define kBitModelTotal (1 << kNumBitModelTotalBits) -+#define kNumMoveBits 5 -+ -+#define RC_INIT_SIZE 5 -+ -+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); } -+ -+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) -+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); -+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits)); -+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \ -+ { UPDATE_0(p); i = (i + i); A0; } else \ -+ { UPDATE_1(p); i = (i + i) + 1; A1; } -+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;) -+ -+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); } -+#define TREE_DECODE(probs, limit, i) \ -+ { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; } -+ -+/* #define _LZMA_SIZE_OPT */ -+ -+#ifdef _LZMA_SIZE_OPT -+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i) -+#else -+#define TREE_6_DECODE(probs, i) \ -+ { i = 1; \ -+ TREE_GET_BIT(probs, i); \ -+ TREE_GET_BIT(probs, i); \ -+ TREE_GET_BIT(probs, i); \ -+ TREE_GET_BIT(probs, i); \ -+ TREE_GET_BIT(probs, i); \ -+ TREE_GET_BIT(probs, i); \ -+ i -= 0x40; } -+#endif -+ -+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); } -+ -+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) -+#define UPDATE_0_CHECK range = bound; -+#define UPDATE_1_CHECK range -= bound; code -= bound; -+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \ -+ { UPDATE_0_CHECK; i = (i + i); A0; } else \ -+ { UPDATE_1_CHECK; i = (i + i) + 1; A1; } -+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;) -+#define TREE_DECODE_CHECK(probs, limit, i) \ -+ { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; } -+ -+ -+#define kNumPosBitsMax 4 -+#define kNumPosStatesMax (1 << kNumPosBitsMax) -+ -+#define kLenNumLowBits 3 -+#define kLenNumLowSymbols (1 << kLenNumLowBits) -+#define kLenNumMidBits 3 -+#define kLenNumMidSymbols (1 << kLenNumMidBits) -+#define kLenNumHighBits 8 -+#define kLenNumHighSymbols (1 << kLenNumHighBits) -+ -+#define LenChoice 0 -+#define LenChoice2 (LenChoice + 1) -+#define LenLow (LenChoice2 + 1) -+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits)) -+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits)) -+#define kNumLenProbs (LenHigh + kLenNumHighSymbols) -+ -+ -+#define kNumStates 12 -+#define kNumLitStates 7 -+ -+#define kStartPosModelIndex 4 -+#define kEndPosModelIndex 14 -+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1)) -+ -+#define kNumPosSlotBits 6 -+#define kNumLenToPosStates 4 -+ -+#define kNumAlignBits 4 -+#define kAlignTableSize (1 << kNumAlignBits) -+ -+#define kMatchMinLen 2 -+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols) -+ -+#define IsMatch 0 -+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax)) -+#define IsRepG0 (IsRep + kNumStates) -+#define IsRepG1 (IsRepG0 + kNumStates) -+#define IsRepG2 (IsRepG1 + kNumStates) -+#define IsRep0Long (IsRepG2 + kNumStates) -+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax)) -+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits)) -+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex) -+#define LenCoder (Align + kAlignTableSize) -+#define RepLenCoder (LenCoder + kNumLenProbs) -+#define Literal (RepLenCoder + kNumLenProbs) -+ -+#define LZMA_BASE_SIZE 1846 -+#define LZMA_LIT_SIZE 768 -+ -+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp))) -+ -+#if Literal != LZMA_BASE_SIZE -+StopCompilingDueBUG -+#endif -+ -+#define LZMA_DIC_MIN (1 << 12) -+ -+/* First LZMA-symbol is always decoded. -+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization -+Out: -+ Result: -+ SZ_OK - OK -+ SZ_ERROR_DATA - Error -+ p->remainLen: -+ < kMatchSpecLenStart : normal remain -+ = kMatchSpecLenStart : finished -+ = kMatchSpecLenStart + 1 : Flush marker -+ = kMatchSpecLenStart + 2 : State Init Marker -+*/ -+ -+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit) -+{ -+ CLzmaProb *probs = p->probs; -+ -+ unsigned state = p->state; -+ UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3]; -+ unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1; -+ unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1; -+ unsigned lc = p->prop.lc; -+ -+ Byte *dic = p->dic; -+ SizeT dicBufSize = p->dicBufSize; -+ SizeT dicPos = p->dicPos; -+ -+ UInt32 processedPos = p->processedPos; -+ UInt32 checkDicSize = p->checkDicSize; -+ unsigned len = 0; -+ -+ const Byte *buf = p->buf; -+ UInt32 range = p->range; -+ UInt32 code = p->code; -+ -+ do -+ { -+ CLzmaProb *prob; -+ UInt32 bound; -+ unsigned ttt; -+ unsigned posState = processedPos & pbMask; -+ -+ prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; -+ IF_BIT_0(prob) -+ { -+ unsigned symbol; -+ UPDATE_0(prob); -+ prob = probs + Literal; -+ if (checkDicSize != 0 || processedPos != 0) -+ prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) + -+ (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc)))); -+ -+ if (state < kNumLitStates) -+ { -+ state -= (state < 4) ? state : 3; -+ symbol = 1; -+ do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100); -+ } -+ else -+ { -+ unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; -+ unsigned offs = 0x100; -+ state -= (state < 10) ? 3 : 6; -+ symbol = 1; -+ do -+ { -+ unsigned bit; -+ CLzmaProb *probLit; -+ matchByte <<= 1; -+ bit = (matchByte & offs); -+ probLit = prob + offs + bit + symbol; -+ GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit) -+ } -+ while (symbol < 0x100); -+ } -+ dic[dicPos++] = (Byte)symbol; -+ processedPos++; -+ continue; -+ } -+ else -+ { -+ UPDATE_1(prob); -+ prob = probs + IsRep + state; -+ IF_BIT_0(prob) -+ { -+ UPDATE_0(prob); -+ state += kNumStates; -+ prob = probs + LenCoder; -+ } -+ else -+ { -+ UPDATE_1(prob); -+ if (checkDicSize == 0 && processedPos == 0) -+ return SZ_ERROR_DATA; -+ prob = probs + IsRepG0 + state; -+ IF_BIT_0(prob) -+ { -+ UPDATE_0(prob); -+ prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; -+ IF_BIT_0(prob) -+ { -+ UPDATE_0(prob); -+ dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; -+ dicPos++; -+ processedPos++; -+ state = state < kNumLitStates ? 9 : 11; -+ continue; -+ } -+ UPDATE_1(prob); -+ } -+ else -+ { -+ UInt32 distance; -+ UPDATE_1(prob); -+ prob = probs + IsRepG1 + state; -+ IF_BIT_0(prob) -+ { -+ UPDATE_0(prob); -+ distance = rep1; -+ } -+ else -+ { -+ UPDATE_1(prob); -+ prob = probs + IsRepG2 + state; -+ IF_BIT_0(prob) -+ { -+ UPDATE_0(prob); -+ distance = rep2; -+ } -+ else -+ { -+ UPDATE_1(prob); -+ distance = rep3; -+ rep3 = rep2; -+ } -+ rep2 = rep1; -+ } -+ rep1 = rep0; -+ rep0 = distance; -+ } -+ state = state < kNumLitStates ? 8 : 11; -+ prob = probs + RepLenCoder; -+ } -+ { -+ unsigned limit, offset; -+ CLzmaProb *probLen = prob + LenChoice; -+ IF_BIT_0(probLen) -+ { -+ UPDATE_0(probLen); -+ probLen = prob + LenLow + (posState << kLenNumLowBits); -+ offset = 0; -+ limit = (1 << kLenNumLowBits); -+ } -+ else -+ { -+ UPDATE_1(probLen); -+ probLen = prob + LenChoice2; -+ IF_BIT_0(probLen) -+ { -+ UPDATE_0(probLen); -+ probLen = prob + LenMid + (posState << kLenNumMidBits); -+ offset = kLenNumLowSymbols; -+ limit = (1 << kLenNumMidBits); -+ } -+ else -+ { -+ UPDATE_1(probLen); -+ probLen = prob + LenHigh; -+ offset = kLenNumLowSymbols + kLenNumMidSymbols; -+ limit = (1 << kLenNumHighBits); -+ } -+ } -+ TREE_DECODE(probLen, limit, len); -+ len += offset; -+ } -+ -+ if (state >= kNumStates) -+ { -+ UInt32 distance; -+ prob = probs + PosSlot + -+ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits); -+ TREE_6_DECODE(prob, distance); -+ if (distance >= kStartPosModelIndex) -+ { -+ unsigned posSlot = (unsigned)distance; -+ int numDirectBits = (int)(((distance >> 1) - 1)); -+ distance = (2 | (distance & 1)); -+ if (posSlot < kEndPosModelIndex) -+ { -+ distance <<= numDirectBits; -+ prob = probs + SpecPos + distance - posSlot - 1; -+ { -+ UInt32 mask = 1; -+ unsigned i = 1; -+ do -+ { -+ GET_BIT2(prob + i, i, ; , distance |= mask); -+ mask <<= 1; -+ } -+ while (--numDirectBits != 0); -+ } -+ } -+ else -+ { -+ numDirectBits -= kNumAlignBits; -+ do -+ { -+ NORMALIZE -+ range >>= 1; -+ -+ { -+ UInt32 t; -+ code -= range; -+ t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */ -+ distance = (distance << 1) + (t + 1); -+ code += range & t; -+ } -+ /* -+ distance <<= 1; -+ if (code >= range) -+ { -+ code -= range; -+ distance |= 1; -+ } -+ */ -+ } -+ while (--numDirectBits != 0); -+ prob = probs + Align; -+ distance <<= kNumAlignBits; -+ { -+ unsigned i = 1; -+ GET_BIT2(prob + i, i, ; , distance |= 1); -+ GET_BIT2(prob + i, i, ; , distance |= 2); -+ GET_BIT2(prob + i, i, ; , distance |= 4); -+ GET_BIT2(prob + i, i, ; , distance |= 8); -+ } -+ if (distance == (UInt32)0xFFFFFFFF) -+ { -+ len += kMatchSpecLenStart; -+ state -= kNumStates; -+ break; -+ } -+ } -+ } -+ rep3 = rep2; -+ rep2 = rep1; -+ rep1 = rep0; -+ rep0 = distance + 1; -+ if (checkDicSize == 0) -+ { -+ if (distance >= processedPos) -+ return SZ_ERROR_DATA; -+ } -+ else if (distance >= checkDicSize) -+ return SZ_ERROR_DATA; -+ state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3; -+ } -+ -+ len += kMatchMinLen; -+ -+ if (limit == dicPos) -+ return SZ_ERROR_DATA; -+ { -+ SizeT rem = limit - dicPos; -+ unsigned curLen = ((rem < len) ? (unsigned)rem : len); -+ SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0); -+ -+ processedPos += curLen; -+ -+ len -= curLen; -+ if (pos + curLen <= dicBufSize) -+ { -+ Byte *dest = dic + dicPos; -+ ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos; -+ const Byte *lim = dest + curLen; -+ dicPos += curLen; -+ do -+ *(dest) = (Byte)*(dest + src); -+ while (++dest != lim); -+ } -+ else -+ { -+ do -+ { -+ dic[dicPos++] = dic[pos]; -+ if (++pos == dicBufSize) -+ pos = 0; -+ } -+ while (--curLen != 0); -+ } -+ } -+ } -+ } -+ while (dicPos < limit && buf < bufLimit); -+ NORMALIZE; -+ p->buf = buf; -+ p->range = range; -+ p->code = code; -+ p->remainLen = len; -+ p->dicPos = dicPos; -+ p->processedPos = processedPos; -+ p->reps[0] = rep0; -+ p->reps[1] = rep1; -+ p->reps[2] = rep2; -+ p->reps[3] = rep3; -+ p->state = state; -+ -+ return SZ_OK; -+} -+ -+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit) -+{ -+ if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart) -+ { -+ Byte *dic = p->dic; -+ SizeT dicPos = p->dicPos; -+ SizeT dicBufSize = p->dicBufSize; -+ unsigned len = p->remainLen; -+ UInt32 rep0 = p->reps[0]; -+ if (limit - dicPos < len) -+ len = (unsigned)(limit - dicPos); -+ -+ if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len) -+ p->checkDicSize = p->prop.dicSize; -+ -+ p->processedPos += len; -+ p->remainLen -= len; -+ while (len-- != 0) -+ { -+ dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; -+ dicPos++; -+ } -+ p->dicPos = dicPos; -+ } -+} -+ -+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit) -+{ -+ do -+ { -+ SizeT limit2 = limit; -+ if (p->checkDicSize == 0) -+ { -+ UInt32 rem = p->prop.dicSize - p->processedPos; -+ if (limit - p->dicPos > rem) -+ limit2 = p->dicPos + rem; -+ } -+ RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit)); -+ if (p->processedPos >= p->prop.dicSize) -+ p->checkDicSize = p->prop.dicSize; -+ LzmaDec_WriteRem(p, limit); -+ } -+ while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart); -+ -+ if (p->remainLen > kMatchSpecLenStart) -+ { -+ p->remainLen = kMatchSpecLenStart; -+ } -+ return 0; -+} -+ -+typedef enum -+{ -+ DUMMY_ERROR, /* unexpected end of input stream */ -+ DUMMY_LIT, -+ DUMMY_MATCH, -+ DUMMY_REP -+} ELzmaDummy; -+ -+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize) -+{ -+ UInt32 range = p->range; -+ UInt32 code = p->code; -+ const Byte *bufLimit = buf + inSize; -+ CLzmaProb *probs = p->probs; -+ unsigned state = p->state; -+ ELzmaDummy res; -+ -+ { -+ CLzmaProb *prob; -+ UInt32 bound; -+ unsigned ttt; -+ unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1); -+ -+ prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; -+ IF_BIT_0_CHECK(prob) -+ { -+ UPDATE_0_CHECK -+ -+ /* if (bufLimit - buf >= 7) return DUMMY_LIT; */ -+ -+ prob = probs + Literal; -+ if (p->checkDicSize != 0 || p->processedPos != 0) -+ prob += (LZMA_LIT_SIZE * -+ ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) + -+ (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc)))); -+ -+ if (state < kNumLitStates) -+ { -+ unsigned symbol = 1; -+ do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100); -+ } -+ else -+ { -+ unsigned matchByte = p->dic[p->dicPos - p->reps[0] + -+ ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)]; -+ unsigned offs = 0x100; -+ unsigned symbol = 1; -+ do -+ { -+ unsigned bit; -+ CLzmaProb *probLit; -+ matchByte <<= 1; -+ bit = (matchByte & offs); -+ probLit = prob + offs + bit + symbol; -+ GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit) -+ } -+ while (symbol < 0x100); -+ } -+ res = DUMMY_LIT; -+ } -+ else -+ { -+ unsigned len; -+ UPDATE_1_CHECK; -+ -+ prob = probs + IsRep + state; -+ IF_BIT_0_CHECK(prob) -+ { -+ UPDATE_0_CHECK; -+ state = 0; -+ prob = probs + LenCoder; -+ res = DUMMY_MATCH; -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ res = DUMMY_REP; -+ prob = probs + IsRepG0 + state; -+ IF_BIT_0_CHECK(prob) -+ { -+ UPDATE_0_CHECK; -+ prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; -+ IF_BIT_0_CHECK(prob) -+ { -+ UPDATE_0_CHECK; -+ NORMALIZE_CHECK; -+ return DUMMY_REP; -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ } -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ prob = probs + IsRepG1 + state; -+ IF_BIT_0_CHECK(prob) -+ { -+ UPDATE_0_CHECK; -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ prob = probs + IsRepG2 + state; -+ IF_BIT_0_CHECK(prob) -+ { -+ UPDATE_0_CHECK; -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ } -+ } -+ } -+ state = kNumStates; -+ prob = probs + RepLenCoder; -+ } -+ { -+ unsigned limit, offset; -+ CLzmaProb *probLen = prob + LenChoice; -+ IF_BIT_0_CHECK(probLen) -+ { -+ UPDATE_0_CHECK; -+ probLen = prob + LenLow + (posState << kLenNumLowBits); -+ offset = 0; -+ limit = 1 << kLenNumLowBits; -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ probLen = prob + LenChoice2; -+ IF_BIT_0_CHECK(probLen) -+ { -+ UPDATE_0_CHECK; -+ probLen = prob + LenMid + (posState << kLenNumMidBits); -+ offset = kLenNumLowSymbols; -+ limit = 1 << kLenNumMidBits; -+ } -+ else -+ { -+ UPDATE_1_CHECK; -+ probLen = prob + LenHigh; -+ offset = kLenNumLowSymbols + kLenNumMidSymbols; -+ limit = 1 << kLenNumHighBits; -+ } -+ } -+ TREE_DECODE_CHECK(probLen, limit, len); -+ len += offset; -+ } -+ -+ if (state < 4) -+ { -+ unsigned posSlot; -+ prob = probs + PosSlot + -+ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << -+ kNumPosSlotBits); -+ TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot); -+ if (posSlot >= kStartPosModelIndex) -+ { -+ int numDirectBits = ((posSlot >> 1) - 1); -+ -+ /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */ -+ -+ if (posSlot < kEndPosModelIndex) -+ { -+ prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1; -+ } -+ else -+ { -+ numDirectBits -= kNumAlignBits; -+ do -+ { -+ NORMALIZE_CHECK -+ range >>= 1; -+ code -= range & (((code - range) >> 31) - 1); -+ /* if (code >= range) code -= range; */ -+ } -+ while (--numDirectBits != 0); -+ prob = probs + Align; -+ numDirectBits = kNumAlignBits; -+ } -+ { -+ unsigned i = 1; -+ do -+ { -+ GET_BIT_CHECK(prob + i, i); -+ } -+ while (--numDirectBits != 0); -+ } -+ } -+ } -+ } -+ } -+ NORMALIZE_CHECK; -+ return res; -+} -+ -+ -+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data) -+{ -+ p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]); -+ p->range = 0xFFFFFFFF; -+ p->needFlush = 0; -+} -+ -+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) -+{ -+ p->needFlush = 1; -+ p->remainLen = 0; -+ p->tempBufSize = 0; -+ -+ if (initDic) -+ { -+ p->processedPos = 0; -+ p->checkDicSize = 0; -+ p->needInitState = 1; -+ } -+ if (initState) -+ p->needInitState = 1; -+} -+ -+void LzmaDec_Init(CLzmaDec *p) -+{ -+ p->dicPos = 0; -+ LzmaDec_InitDicAndState(p, True, True); -+} -+ -+static void LzmaDec_InitStateReal(CLzmaDec *p) -+{ -+ UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp)); -+ UInt32 i; -+ CLzmaProb *probs = p->probs; -+ for (i = 0; i < numProbs; i++) -+ probs[i] = kBitModelTotal >> 1; -+ p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1; -+ p->state = 0; -+ p->needInitState = 0; -+} -+ -+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, -+ ELzmaFinishMode finishMode, ELzmaStatus *status) -+{ -+ SizeT inSize = *srcLen; -+ (*srcLen) = 0; -+ LzmaDec_WriteRem(p, dicLimit); -+ -+ *status = LZMA_STATUS_NOT_SPECIFIED; -+ -+ while (p->remainLen != kMatchSpecLenStart) -+ { -+ int checkEndMarkNow; -+ -+ if (p->needFlush != 0) -+ { -+ for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--) -+ p->tempBuf[p->tempBufSize++] = *src++; -+ if (p->tempBufSize < RC_INIT_SIZE) -+ { -+ *status = LZMA_STATUS_NEEDS_MORE_INPUT; -+ return SZ_OK; -+ } -+ if (p->tempBuf[0] != 0) -+ return SZ_ERROR_DATA; -+ -+ LzmaDec_InitRc(p, p->tempBuf); -+ p->tempBufSize = 0; -+ } -+ -+ checkEndMarkNow = 0; -+ if (p->dicPos >= dicLimit) -+ { -+ if (p->remainLen == 0 && p->code == 0) -+ { -+ *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK; -+ return SZ_OK; -+ } -+ if (finishMode == LZMA_FINISH_ANY) -+ { -+ *status = LZMA_STATUS_NOT_FINISHED; -+ return SZ_OK; -+ } -+ if (p->remainLen != 0) -+ { -+ *status = LZMA_STATUS_NOT_FINISHED; -+ return SZ_ERROR_DATA; -+ } -+ checkEndMarkNow = 1; -+ } -+ -+ if (p->needInitState) -+ LzmaDec_InitStateReal(p); -+ -+ if (p->tempBufSize == 0) -+ { -+ SizeT processed; -+ const Byte *bufLimit; -+ if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) -+ { -+ int dummyRes = LzmaDec_TryDummy(p, src, inSize); -+ if (dummyRes == DUMMY_ERROR) -+ { -+ memcpy(p->tempBuf, src, inSize); -+ p->tempBufSize = (unsigned)inSize; -+ (*srcLen) += inSize; -+ *status = LZMA_STATUS_NEEDS_MORE_INPUT; -+ return SZ_OK; -+ } -+ if (checkEndMarkNow && dummyRes != DUMMY_MATCH) -+ { -+ *status = LZMA_STATUS_NOT_FINISHED; -+ return SZ_ERROR_DATA; -+ } -+ bufLimit = src; -+ } -+ else -+ bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX; -+ p->buf = src; -+ if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0) -+ return SZ_ERROR_DATA; -+ processed = (SizeT)(p->buf - src); -+ (*srcLen) += processed; -+ src += processed; -+ inSize -= processed; -+ } -+ else -+ { -+ unsigned rem = p->tempBufSize, lookAhead = 0; -+ while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize) -+ p->tempBuf[rem++] = src[lookAhead++]; -+ p->tempBufSize = rem; -+ if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) -+ { -+ int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem); -+ if (dummyRes == DUMMY_ERROR) -+ { -+ (*srcLen) += lookAhead; -+ *status = LZMA_STATUS_NEEDS_MORE_INPUT; -+ return SZ_OK; -+ } -+ if (checkEndMarkNow && dummyRes != DUMMY_MATCH) -+ { -+ *status = LZMA_STATUS_NOT_FINISHED; -+ return SZ_ERROR_DATA; -+ } -+ } -+ p->buf = p->tempBuf; -+ if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0) -+ return SZ_ERROR_DATA; -+ lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf)); -+ (*srcLen) += lookAhead; -+ src += lookAhead; -+ inSize -= lookAhead; -+ p->tempBufSize = 0; -+ } -+ } -+ if (p->code == 0) -+ *status = LZMA_STATUS_FINISHED_WITH_MARK; -+ return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA; -+} -+ -+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status) -+{ -+ SizeT outSize = *destLen; -+ SizeT inSize = *srcLen; -+ *srcLen = *destLen = 0; -+ for (;;) -+ { -+ SizeT inSizeCur = inSize, outSizeCur, dicPos; -+ ELzmaFinishMode curFinishMode; -+ SRes res; -+ if (p->dicPos == p->dicBufSize) -+ p->dicPos = 0; -+ dicPos = p->dicPos; -+ if (outSize > p->dicBufSize - dicPos) -+ { -+ outSizeCur = p->dicBufSize; -+ curFinishMode = LZMA_FINISH_ANY; -+ } -+ else -+ { -+ outSizeCur = dicPos + outSize; -+ curFinishMode = finishMode; -+ } -+ -+ res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status); -+ src += inSizeCur; -+ inSize -= inSizeCur; -+ *srcLen += inSizeCur; -+ outSizeCur = p->dicPos - dicPos; -+ memcpy(dest, p->dic + dicPos, outSizeCur); -+ dest += outSizeCur; -+ outSize -= outSizeCur; -+ *destLen += outSizeCur; -+ if (res != 0) -+ return res; -+ if (outSizeCur == 0 || outSize == 0) -+ return SZ_OK; -+ } -+} -+ -+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) -+{ -+ alloc->Free(alloc, p->probs); -+ p->probs = 0; -+} -+ -+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc) -+{ -+ alloc->Free(alloc, p->dic); -+ p->dic = 0; -+} -+ -+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc) -+{ -+ LzmaDec_FreeProbs(p, alloc); -+ LzmaDec_FreeDict(p, alloc); -+} -+ -+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size) -+{ -+ UInt32 dicSize; -+ Byte d; -+ -+ if (size < LZMA_PROPS_SIZE) -+ return SZ_ERROR_UNSUPPORTED; -+ else -+ dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24); -+ -+ if (dicSize < LZMA_DIC_MIN) -+ dicSize = LZMA_DIC_MIN; -+ p->dicSize = dicSize; -+ -+ d = data[0]; -+ if (d >= (9 * 5 * 5)) -+ return SZ_ERROR_UNSUPPORTED; -+ -+ p->lc = d % 9; -+ d /= 9; -+ p->pb = d / 5; -+ p->lp = d % 5; -+ -+ return SZ_OK; -+} -+ -+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc) -+{ -+ UInt32 numProbs = LzmaProps_GetNumProbs(propNew); -+ if (p->probs == 0 || numProbs != p->numProbs) -+ { -+ LzmaDec_FreeProbs(p, alloc); -+ p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb)); -+ p->numProbs = numProbs; -+ if (p->probs == 0) -+ return SZ_ERROR_MEM; -+ } -+ return SZ_OK; -+} -+ -+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) -+{ -+ CLzmaProps propNew; -+ RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -+ RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); -+ p->prop = propNew; -+ return SZ_OK; -+} -+ -+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) -+{ -+ CLzmaProps propNew; -+ SizeT dicBufSize; -+ RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -+ RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); -+ dicBufSize = propNew.dicSize; -+ if (p->dic == 0 || dicBufSize != p->dicBufSize) -+ { -+ LzmaDec_FreeDict(p, alloc); -+ p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize); -+ if (p->dic == 0) -+ { -+ LzmaDec_FreeProbs(p, alloc); -+ return SZ_ERROR_MEM; -+ } -+ } -+ p->dicBufSize = dicBufSize; -+ p->prop = propNew; -+ return SZ_OK; -+} -+ -+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, -+ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, -+ ELzmaStatus *status, ISzAlloc *alloc) -+{ -+ CLzmaDec p; -+ SRes res; -+ SizeT inSize = *srcLen; -+ SizeT outSize = *destLen; -+ *srcLen = *destLen = 0; -+ if (inSize < RC_INIT_SIZE) -+ return SZ_ERROR_INPUT_EOF; -+ -+ LzmaDec_Construct(&p); -+ res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc); -+ if (res != 0) -+ return res; -+ p.dic = dest; -+ p.dicBufSize = outSize; -+ -+ LzmaDec_Init(&p); -+ -+ *srcLen = inSize; -+ res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status); -+ -+ if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT) -+ res = SZ_ERROR_INPUT_EOF; -+ -+ (*destLen) = p.dicPos; -+ LzmaDec_FreeProbs(&p, alloc); -+ return res; -+} ---- /dev/null -+++ b/lib/lzma/LzmaEnc.c -@@ -0,0 +1,2271 @@ -+/* LzmaEnc.c -- LZMA Encoder -+2009-11-24 : Igor Pavlov : Public domain */ -+ -+#include -+ -+/* #define SHOW_STAT */ -+/* #define SHOW_STAT2 */ -+ -+#if defined(SHOW_STAT) || defined(SHOW_STAT2) -+#include -+#endif -+ -+#include "LzmaEnc.h" -+ -+/* disable MT */ -+#define _7ZIP_ST -+ -+#include "LzFind.h" -+#ifndef _7ZIP_ST -+#include "LzFindMt.h" -+#endif -+ -+#ifdef SHOW_STAT -+static int ttt = 0; -+#endif -+ -+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1) -+ -+#define kBlockSize (9 << 10) -+#define kUnpackBlockSize (1 << 18) -+#define kMatchArraySize (1 << 21) -+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX) -+ -+#define kNumMaxDirectBits (31) -+ -+#define kNumTopBits 24 -+#define kTopValue ((UInt32)1 << kNumTopBits) -+ -+#define kNumBitModelTotalBits 11 -+#define kBitModelTotal (1 << kNumBitModelTotalBits) -+#define kNumMoveBits 5 -+#define kProbInitValue (kBitModelTotal >> 1) -+ -+#define kNumMoveReducingBits 4 -+#define kNumBitPriceShiftBits 4 -+#define kBitPrice (1 << kNumBitPriceShiftBits) -+ -+void LzmaEncProps_Init(CLzmaEncProps *p) -+{ -+ p->level = 5; -+ p->dictSize = p->mc = 0; -+ p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1; -+ p->writeEndMark = 0; -+} -+ -+void LzmaEncProps_Normalize(CLzmaEncProps *p) -+{ -+ int level = p->level; -+ if (level < 0) level = 5; -+ p->level = level; -+ if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26))); -+ if (p->lc < 0) p->lc = 3; -+ if (p->lp < 0) p->lp = 0; -+ if (p->pb < 0) p->pb = 2; -+ if (p->algo < 0) p->algo = (level < 5 ? 0 : 1); -+ if (p->fb < 0) p->fb = (level < 7 ? 32 : 64); -+ if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); -+ if (p->numHashBytes < 0) p->numHashBytes = 4; -+ if (p->mc == 0) p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1); -+ if (p->numThreads < 0) -+ p->numThreads = -+ #ifndef _7ZIP_ST -+ ((p->btMode && p->algo) ? 2 : 1); -+ #else -+ 1; -+ #endif -+} -+ -+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2) -+{ -+ CLzmaEncProps props = *props2; -+ LzmaEncProps_Normalize(&props); -+ return props.dictSize; -+} -+ -+/* #define LZMA_LOG_BSR */ -+/* Define it for Intel's CPU */ -+ -+ -+#ifdef LZMA_LOG_BSR -+ -+#define kDicLogSizeMaxCompress 30 -+ -+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); } -+ -+UInt32 GetPosSlot1(UInt32 pos) -+{ -+ UInt32 res; -+ BSR2_RET(pos, res); -+ return res; -+} -+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); } -+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); } -+ -+#else -+ -+#define kNumLogBits (9 + (int)sizeof(size_t) / 2) -+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7) -+ -+void LzmaEnc_FastPosInit(Byte *g_FastPos) -+{ -+ int c = 2, slotFast; -+ g_FastPos[0] = 0; -+ g_FastPos[1] = 1; -+ -+ for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++) -+ { -+ UInt32 k = (1 << ((slotFast >> 1) - 1)); -+ UInt32 j; -+ for (j = 0; j < k; j++, c++) -+ g_FastPos[c] = (Byte)slotFast; -+ } -+} -+ -+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \ -+ (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \ -+ res = p->g_FastPos[pos >> i] + (i * 2); } -+/* -+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \ -+ p->g_FastPos[pos >> 6] + 12 : \ -+ p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; } -+*/ -+ -+#define GetPosSlot1(pos) p->g_FastPos[pos] -+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); } -+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); } -+ -+#endif -+ -+ -+#define LZMA_NUM_REPS 4 -+ -+typedef unsigned CState; -+ -+typedef struct -+{ -+ UInt32 price; -+ -+ CState state; -+ int prev1IsChar; -+ int prev2; -+ -+ UInt32 posPrev2; -+ UInt32 backPrev2; -+ -+ UInt32 posPrev; -+ UInt32 backPrev; -+ UInt32 backs[LZMA_NUM_REPS]; -+} COptimal; -+ -+#define kNumOpts (1 << 12) -+ -+#define kNumLenToPosStates 4 -+#define kNumPosSlotBits 6 -+#define kDicLogSizeMin 0 -+#define kDicLogSizeMax 32 -+#define kDistTableSizeMax (kDicLogSizeMax * 2) -+ -+ -+#define kNumAlignBits 4 -+#define kAlignTableSize (1 << kNumAlignBits) -+#define kAlignMask (kAlignTableSize - 1) -+ -+#define kStartPosModelIndex 4 -+#define kEndPosModelIndex 14 -+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex) -+ -+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1)) -+ -+#ifdef _LZMA_PROB32 -+#define CLzmaProb UInt32 -+#else -+#define CLzmaProb UInt16 -+#endif -+ -+#define LZMA_PB_MAX 4 -+#define LZMA_LC_MAX 8 -+#define LZMA_LP_MAX 4 -+ -+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX) -+ -+ -+#define kLenNumLowBits 3 -+#define kLenNumLowSymbols (1 << kLenNumLowBits) -+#define kLenNumMidBits 3 -+#define kLenNumMidSymbols (1 << kLenNumMidBits) -+#define kLenNumHighBits 8 -+#define kLenNumHighSymbols (1 << kLenNumHighBits) -+ -+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols) -+ -+#define LZMA_MATCH_LEN_MIN 2 -+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1) -+ -+#define kNumStates 12 -+ -+typedef struct -+{ -+ CLzmaProb choice; -+ CLzmaProb choice2; -+ CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits]; -+ CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits]; -+ CLzmaProb high[kLenNumHighSymbols]; -+} CLenEnc; -+ -+typedef struct -+{ -+ CLenEnc p; -+ UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal]; -+ UInt32 tableSize; -+ UInt32 counters[LZMA_NUM_PB_STATES_MAX]; -+} CLenPriceEnc; -+ -+typedef struct -+{ -+ UInt32 range; -+ Byte cache; -+ UInt64 low; -+ UInt64 cacheSize; -+ Byte *buf; -+ Byte *bufLim; -+ Byte *bufBase; -+ ISeqOutStream *outStream; -+ UInt64 processed; -+ SRes res; -+} CRangeEnc; -+ -+typedef struct -+{ -+ CLzmaProb *litProbs; -+ -+ CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX]; -+ CLzmaProb isRep[kNumStates]; -+ CLzmaProb isRepG0[kNumStates]; -+ CLzmaProb isRepG1[kNumStates]; -+ CLzmaProb isRepG2[kNumStates]; -+ CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX]; -+ -+ CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; -+ CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; -+ CLzmaProb posAlignEncoder[1 << kNumAlignBits]; -+ -+ CLenPriceEnc lenEnc; -+ CLenPriceEnc repLenEnc; -+ -+ UInt32 reps[LZMA_NUM_REPS]; -+ UInt32 state; -+} CSaveState; -+ -+typedef struct -+{ -+ IMatchFinder matchFinder; -+ void *matchFinderObj; -+ -+ #ifndef _7ZIP_ST -+ Bool mtMode; -+ CMatchFinderMt matchFinderMt; -+ #endif -+ -+ CMatchFinder matchFinderBase; -+ -+ #ifndef _7ZIP_ST -+ Byte pad[128]; -+ #endif -+ -+ UInt32 optimumEndIndex; -+ UInt32 optimumCurrentIndex; -+ -+ UInt32 longestMatchLength; -+ UInt32 numPairs; -+ UInt32 numAvail; -+ COptimal opt[kNumOpts]; -+ -+ #ifndef LZMA_LOG_BSR -+ Byte g_FastPos[1 << kNumLogBits]; -+ #endif -+ -+ UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits]; -+ UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1]; -+ UInt32 numFastBytes; -+ UInt32 additionalOffset; -+ UInt32 reps[LZMA_NUM_REPS]; -+ UInt32 state; -+ -+ UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax]; -+ UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances]; -+ UInt32 alignPrices[kAlignTableSize]; -+ UInt32 alignPriceCount; -+ -+ UInt32 distTableSize; -+ -+ unsigned lc, lp, pb; -+ unsigned lpMask, pbMask; -+ -+ CLzmaProb *litProbs; -+ -+ CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX]; -+ CLzmaProb isRep[kNumStates]; -+ CLzmaProb isRepG0[kNumStates]; -+ CLzmaProb isRepG1[kNumStates]; -+ CLzmaProb isRepG2[kNumStates]; -+ CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX]; -+ -+ CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; -+ CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; -+ CLzmaProb posAlignEncoder[1 << kNumAlignBits]; -+ -+ CLenPriceEnc lenEnc; -+ CLenPriceEnc repLenEnc; -+ -+ unsigned lclp; -+ -+ Bool fastMode; -+ -+ CRangeEnc rc; -+ -+ Bool writeEndMark; -+ UInt64 nowPos64; -+ UInt32 matchPriceCount; -+ Bool finished; -+ Bool multiThread; -+ -+ SRes result; -+ UInt32 dictSize; -+ UInt32 matchFinderCycles; -+ -+ int needInit; -+ -+ CSaveState saveState; -+} CLzmaEnc; -+ -+void LzmaEnc_SaveState(CLzmaEncHandle pp) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ CSaveState *dest = &p->saveState; -+ int i; -+ dest->lenEnc = p->lenEnc; -+ dest->repLenEnc = p->repLenEnc; -+ dest->state = p->state; -+ -+ for (i = 0; i < kNumStates; i++) -+ { -+ memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); -+ memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); -+ } -+ for (i = 0; i < kNumLenToPosStates; i++) -+ memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); -+ memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); -+ memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); -+ memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); -+ memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); -+ memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); -+ memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); -+ memcpy(dest->reps, p->reps, sizeof(p->reps)); -+ memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb)); -+} -+ -+void LzmaEnc_RestoreState(CLzmaEncHandle pp) -+{ -+ CLzmaEnc *dest = (CLzmaEnc *)pp; -+ const CSaveState *p = &dest->saveState; -+ int i; -+ dest->lenEnc = p->lenEnc; -+ dest->repLenEnc = p->repLenEnc; -+ dest->state = p->state; -+ -+ for (i = 0; i < kNumStates; i++) -+ { -+ memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); -+ memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); -+ } -+ for (i = 0; i < kNumLenToPosStates; i++) -+ memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); -+ memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); -+ memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); -+ memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); -+ memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); -+ memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); -+ memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); -+ memcpy(dest->reps, p->reps, sizeof(p->reps)); -+ memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb)); -+} -+ -+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ CLzmaEncProps props = *props2; -+ LzmaEncProps_Normalize(&props); -+ -+ if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX || -+ props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30)) -+ return SZ_ERROR_PARAM; -+ p->dictSize = props.dictSize; -+ p->matchFinderCycles = props.mc; -+ { -+ unsigned fb = props.fb; -+ if (fb < 5) -+ fb = 5; -+ if (fb > LZMA_MATCH_LEN_MAX) -+ fb = LZMA_MATCH_LEN_MAX; -+ p->numFastBytes = fb; -+ } -+ p->lc = props.lc; -+ p->lp = props.lp; -+ p->pb = props.pb; -+ p->fastMode = (props.algo == 0); -+ p->matchFinderBase.btMode = props.btMode; -+ { -+ UInt32 numHashBytes = 4; -+ if (props.btMode) -+ { -+ if (props.numHashBytes < 2) -+ numHashBytes = 2; -+ else if (props.numHashBytes < 4) -+ numHashBytes = props.numHashBytes; -+ } -+ p->matchFinderBase.numHashBytes = numHashBytes; -+ } -+ -+ p->matchFinderBase.cutValue = props.mc; -+ -+ p->writeEndMark = props.writeEndMark; -+ -+ #ifndef _7ZIP_ST -+ /* -+ if (newMultiThread != _multiThread) -+ { -+ ReleaseMatchFinder(); -+ _multiThread = newMultiThread; -+ } -+ */ -+ p->multiThread = (props.numThreads > 1); -+ #endif -+ -+ return SZ_OK; -+} -+ -+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5}; -+static const int kMatchNextStates[kNumStates] = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10}; -+static const int kRepNextStates[kNumStates] = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11}; -+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11}; -+ -+#define IsCharState(s) ((s) < 7) -+ -+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1) -+ -+#define kInfinityPrice (1 << 30) -+ -+static void RangeEnc_Construct(CRangeEnc *p) -+{ -+ p->outStream = 0; -+ p->bufBase = 0; -+} -+ -+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize) -+ -+#define RC_BUF_SIZE (1 << 16) -+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc) -+{ -+ if (p->bufBase == 0) -+ { -+ p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE); -+ if (p->bufBase == 0) -+ return 0; -+ p->bufLim = p->bufBase + RC_BUF_SIZE; -+ } -+ return 1; -+} -+ -+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc) -+{ -+ alloc->Free(alloc, p->bufBase); -+ p->bufBase = 0; -+} -+ -+static void RangeEnc_Init(CRangeEnc *p) -+{ -+ /* Stream.Init(); */ -+ p->low = 0; -+ p->range = 0xFFFFFFFF; -+ p->cacheSize = 1; -+ p->cache = 0; -+ -+ p->buf = p->bufBase; -+ -+ p->processed = 0; -+ p->res = SZ_OK; -+} -+ -+static void RangeEnc_FlushStream(CRangeEnc *p) -+{ -+ size_t num; -+ if (p->res != SZ_OK) -+ return; -+ num = p->buf - p->bufBase; -+ if (num != p->outStream->Write(p->outStream, p->bufBase, num)) -+ p->res = SZ_ERROR_WRITE; -+ p->processed += num; -+ p->buf = p->bufBase; -+} -+ -+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p) -+{ -+ if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0) -+ { -+ Byte temp = p->cache; -+ do -+ { -+ Byte *buf = p->buf; -+ *buf++ = (Byte)(temp + (Byte)(p->low >> 32)); -+ p->buf = buf; -+ if (buf == p->bufLim) -+ RangeEnc_FlushStream(p); -+ temp = 0xFF; -+ } -+ while (--p->cacheSize != 0); -+ p->cache = (Byte)((UInt32)p->low >> 24); -+ } -+ p->cacheSize++; -+ p->low = (UInt32)p->low << 8; -+} -+ -+static void RangeEnc_FlushData(CRangeEnc *p) -+{ -+ int i; -+ for (i = 0; i < 5; i++) -+ RangeEnc_ShiftLow(p); -+} -+ -+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits) -+{ -+ do -+ { -+ p->range >>= 1; -+ p->low += p->range & (0 - ((value >> --numBits) & 1)); -+ if (p->range < kTopValue) -+ { -+ p->range <<= 8; -+ RangeEnc_ShiftLow(p); -+ } -+ } -+ while (numBits != 0); -+} -+ -+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol) -+{ -+ UInt32 ttt = *prob; -+ UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt; -+ if (symbol == 0) -+ { -+ p->range = newBound; -+ ttt += (kBitModelTotal - ttt) >> kNumMoveBits; -+ } -+ else -+ { -+ p->low += newBound; -+ p->range -= newBound; -+ ttt -= ttt >> kNumMoveBits; -+ } -+ *prob = (CLzmaProb)ttt; -+ if (p->range < kTopValue) -+ { -+ p->range <<= 8; -+ RangeEnc_ShiftLow(p); -+ } -+} -+ -+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol) -+{ -+ symbol |= 0x100; -+ do -+ { -+ RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1); -+ symbol <<= 1; -+ } -+ while (symbol < 0x10000); -+} -+ -+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte) -+{ -+ UInt32 offs = 0x100; -+ symbol |= 0x100; -+ do -+ { -+ matchByte <<= 1; -+ RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1); -+ symbol <<= 1; -+ offs &= ~(matchByte ^ symbol); -+ } -+ while (symbol < 0x10000); -+} -+ -+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices) -+{ -+ UInt32 i; -+ for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits)) -+ { -+ const int kCyclesBits = kNumBitPriceShiftBits; -+ UInt32 w = i; -+ UInt32 bitCount = 0; -+ int j; -+ for (j = 0; j < kCyclesBits; j++) -+ { -+ w = w * w; -+ bitCount <<= 1; -+ while (w >= ((UInt32)1 << 16)) -+ { -+ w >>= 1; -+ bitCount++; -+ } -+ } -+ ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount); -+ } -+} -+ -+ -+#define GET_PRICE(prob, symbol) \ -+ p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits]; -+ -+#define GET_PRICEa(prob, symbol) \ -+ ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits]; -+ -+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits] -+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits] -+ -+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits] -+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits] -+ -+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices) -+{ -+ UInt32 price = 0; -+ symbol |= 0x100; -+ do -+ { -+ price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1); -+ symbol <<= 1; -+ } -+ while (symbol < 0x10000); -+ return price; -+} -+ -+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices) -+{ -+ UInt32 price = 0; -+ UInt32 offs = 0x100; -+ symbol |= 0x100; -+ do -+ { -+ matchByte <<= 1; -+ price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1); -+ symbol <<= 1; -+ offs &= ~(matchByte ^ symbol); -+ } -+ while (symbol < 0x10000); -+ return price; -+} -+ -+ -+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol) -+{ -+ UInt32 m = 1; -+ int i; -+ for (i = numBitLevels; i != 0;) -+ { -+ UInt32 bit; -+ i--; -+ bit = (symbol >> i) & 1; -+ RangeEnc_EncodeBit(rc, probs + m, bit); -+ m = (m << 1) | bit; -+ } -+} -+ -+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol) -+{ -+ UInt32 m = 1; -+ int i; -+ for (i = 0; i < numBitLevels; i++) -+ { -+ UInt32 bit = symbol & 1; -+ RangeEnc_EncodeBit(rc, probs + m, bit); -+ m = (m << 1) | bit; -+ symbol >>= 1; -+ } -+} -+ -+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices) -+{ -+ UInt32 price = 0; -+ symbol |= (1 << numBitLevels); -+ while (symbol != 1) -+ { -+ price += GET_PRICEa(probs[symbol >> 1], symbol & 1); -+ symbol >>= 1; -+ } -+ return price; -+} -+ -+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices) -+{ -+ UInt32 price = 0; -+ UInt32 m = 1; -+ int i; -+ for (i = numBitLevels; i != 0; i--) -+ { -+ UInt32 bit = symbol & 1; -+ symbol >>= 1; -+ price += GET_PRICEa(probs[m], bit); -+ m = (m << 1) | bit; -+ } -+ return price; -+} -+ -+ -+static void LenEnc_Init(CLenEnc *p) -+{ -+ unsigned i; -+ p->choice = p->choice2 = kProbInitValue; -+ for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++) -+ p->low[i] = kProbInitValue; -+ for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++) -+ p->mid[i] = kProbInitValue; -+ for (i = 0; i < kLenNumHighSymbols; i++) -+ p->high[i] = kProbInitValue; -+} -+ -+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState) -+{ -+ if (symbol < kLenNumLowSymbols) -+ { -+ RangeEnc_EncodeBit(rc, &p->choice, 0); -+ RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol); -+ } -+ else -+ { -+ RangeEnc_EncodeBit(rc, &p->choice, 1); -+ if (symbol < kLenNumLowSymbols + kLenNumMidSymbols) -+ { -+ RangeEnc_EncodeBit(rc, &p->choice2, 0); -+ RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols); -+ } -+ else -+ { -+ RangeEnc_EncodeBit(rc, &p->choice2, 1); -+ RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols); -+ } -+ } -+} -+ -+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices) -+{ -+ UInt32 a0 = GET_PRICE_0a(p->choice); -+ UInt32 a1 = GET_PRICE_1a(p->choice); -+ UInt32 b0 = a1 + GET_PRICE_0a(p->choice2); -+ UInt32 b1 = a1 + GET_PRICE_1a(p->choice2); -+ UInt32 i = 0; -+ for (i = 0; i < kLenNumLowSymbols; i++) -+ { -+ if (i >= numSymbols) -+ return; -+ prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices); -+ } -+ for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++) -+ { -+ if (i >= numSymbols) -+ return; -+ prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices); -+ } -+ for (; i < numSymbols; i++) -+ prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices); -+} -+ -+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices) -+{ -+ LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices); -+ p->counters[posState] = p->tableSize; -+} -+ -+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices) -+{ -+ UInt32 posState; -+ for (posState = 0; posState < numPosStates; posState++) -+ LenPriceEnc_UpdateTable(p, posState, ProbPrices); -+} -+ -+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices) -+{ -+ LenEnc_Encode(&p->p, rc, symbol, posState); -+ if (updatePrice) -+ if (--p->counters[posState] == 0) -+ LenPriceEnc_UpdateTable(p, posState, ProbPrices); -+} -+ -+ -+ -+ -+static void MovePos(CLzmaEnc *p, UInt32 num) -+{ -+ #ifdef SHOW_STAT -+ ttt += num; -+ printf("\n MovePos %d", num); -+ #endif -+ if (num != 0) -+ { -+ p->additionalOffset += num; -+ p->matchFinder.Skip(p->matchFinderObj, num); -+ } -+} -+ -+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes) -+{ -+ UInt32 lenRes = 0, numPairs; -+ p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); -+ numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches); -+ #ifdef SHOW_STAT -+ printf("\n i = %d numPairs = %d ", ttt, numPairs / 2); -+ ttt++; -+ { -+ UInt32 i; -+ for (i = 0; i < numPairs; i += 2) -+ printf("%2d %6d | ", p->matches[i], p->matches[i + 1]); -+ } -+ #endif -+ if (numPairs > 0) -+ { -+ lenRes = p->matches[numPairs - 2]; -+ if (lenRes == p->numFastBytes) -+ { -+ const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; -+ UInt32 distance = p->matches[numPairs - 1] + 1; -+ UInt32 numAvail = p->numAvail; -+ if (numAvail > LZMA_MATCH_LEN_MAX) -+ numAvail = LZMA_MATCH_LEN_MAX; -+ { -+ const Byte *pby2 = pby - distance; -+ for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++); -+ } -+ } -+ } -+ p->additionalOffset++; -+ *numDistancePairsRes = numPairs; -+ return lenRes; -+} -+ -+ -+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False; -+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False; -+#define IsShortRep(p) ((p)->backPrev == 0) -+ -+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState) -+{ -+ return -+ GET_PRICE_0(p->isRepG0[state]) + -+ GET_PRICE_0(p->isRep0Long[state][posState]); -+} -+ -+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState) -+{ -+ UInt32 price; -+ if (repIndex == 0) -+ { -+ price = GET_PRICE_0(p->isRepG0[state]); -+ price += GET_PRICE_1(p->isRep0Long[state][posState]); -+ } -+ else -+ { -+ price = GET_PRICE_1(p->isRepG0[state]); -+ if (repIndex == 1) -+ price += GET_PRICE_0(p->isRepG1[state]); -+ else -+ { -+ price += GET_PRICE_1(p->isRepG1[state]); -+ price += GET_PRICE(p->isRepG2[state], repIndex - 2); -+ } -+ } -+ return price; -+} -+ -+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState) -+{ -+ return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] + -+ GetPureRepPrice(p, repIndex, state, posState); -+} -+ -+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur) -+{ -+ UInt32 posMem = p->opt[cur].posPrev; -+ UInt32 backMem = p->opt[cur].backPrev; -+ p->optimumEndIndex = cur; -+ do -+ { -+ if (p->opt[cur].prev1IsChar) -+ { -+ MakeAsChar(&p->opt[posMem]) -+ p->opt[posMem].posPrev = posMem - 1; -+ if (p->opt[cur].prev2) -+ { -+ p->opt[posMem - 1].prev1IsChar = False; -+ p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2; -+ p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2; -+ } -+ } -+ { -+ UInt32 posPrev = posMem; -+ UInt32 backCur = backMem; -+ -+ backMem = p->opt[posPrev].backPrev; -+ posMem = p->opt[posPrev].posPrev; -+ -+ p->opt[posPrev].backPrev = backCur; -+ p->opt[posPrev].posPrev = cur; -+ cur = posPrev; -+ } -+ } -+ while (cur != 0); -+ *backRes = p->opt[0].backPrev; -+ p->optimumCurrentIndex = p->opt[0].posPrev; -+ return p->optimumCurrentIndex; -+} -+ -+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300) -+ -+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes) -+{ -+ UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur; -+ UInt32 matchPrice, repMatchPrice, normalMatchPrice; -+ UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS]; -+ UInt32 *matches; -+ const Byte *data; -+ Byte curByte, matchByte; -+ if (p->optimumEndIndex != p->optimumCurrentIndex) -+ { -+ const COptimal *opt = &p->opt[p->optimumCurrentIndex]; -+ UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex; -+ *backRes = opt->backPrev; -+ p->optimumCurrentIndex = opt->posPrev; -+ return lenRes; -+ } -+ p->optimumCurrentIndex = p->optimumEndIndex = 0; -+ -+ if (p->additionalOffset == 0) -+ mainLen = ReadMatchDistances(p, &numPairs); -+ else -+ { -+ mainLen = p->longestMatchLength; -+ numPairs = p->numPairs; -+ } -+ -+ numAvail = p->numAvail; -+ if (numAvail < 2) -+ { -+ *backRes = (UInt32)(-1); -+ return 1; -+ } -+ if (numAvail > LZMA_MATCH_LEN_MAX) -+ numAvail = LZMA_MATCH_LEN_MAX; -+ -+ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; -+ repMaxIndex = 0; -+ for (i = 0; i < LZMA_NUM_REPS; i++) -+ { -+ UInt32 lenTest; -+ const Byte *data2; -+ reps[i] = p->reps[i]; -+ data2 = data - (reps[i] + 1); -+ if (data[0] != data2[0] || data[1] != data2[1]) -+ { -+ repLens[i] = 0; -+ continue; -+ } -+ for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++); -+ repLens[i] = lenTest; -+ if (lenTest > repLens[repMaxIndex]) -+ repMaxIndex = i; -+ } -+ if (repLens[repMaxIndex] >= p->numFastBytes) -+ { -+ UInt32 lenRes; -+ *backRes = repMaxIndex; -+ lenRes = repLens[repMaxIndex]; -+ MovePos(p, lenRes - 1); -+ return lenRes; -+ } -+ -+ matches = p->matches; -+ if (mainLen >= p->numFastBytes) -+ { -+ *backRes = matches[numPairs - 1] + LZMA_NUM_REPS; -+ MovePos(p, mainLen - 1); -+ return mainLen; -+ } -+ curByte = *data; -+ matchByte = *(data - (reps[0] + 1)); -+ -+ if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2) -+ { -+ *backRes = (UInt32)-1; -+ return 1; -+ } -+ -+ p->opt[0].state = (CState)p->state; -+ -+ posState = (position & p->pbMask); -+ -+ { -+ const CLzmaProb *probs = LIT_PROBS(position, *(data - 1)); -+ p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) + -+ (!IsCharState(p->state) ? -+ LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) : -+ LitEnc_GetPrice(probs, curByte, p->ProbPrices)); -+ } -+ -+ MakeAsChar(&p->opt[1]); -+ -+ matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]); -+ repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]); -+ -+ if (matchByte == curByte) -+ { -+ UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState); -+ if (shortRepPrice < p->opt[1].price) -+ { -+ p->opt[1].price = shortRepPrice; -+ MakeAsShortRep(&p->opt[1]); -+ } -+ } -+ lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]); -+ -+ if (lenEnd < 2) -+ { -+ *backRes = p->opt[1].backPrev; -+ return 1; -+ } -+ -+ p->opt[1].posPrev = 0; -+ for (i = 0; i < LZMA_NUM_REPS; i++) -+ p->opt[0].backs[i] = reps[i]; -+ -+ len = lenEnd; -+ do -+ p->opt[len--].price = kInfinityPrice; -+ while (len >= 2); -+ -+ for (i = 0; i < LZMA_NUM_REPS; i++) -+ { -+ UInt32 repLen = repLens[i]; -+ UInt32 price; -+ if (repLen < 2) -+ continue; -+ price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState); -+ do -+ { -+ UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2]; -+ COptimal *opt = &p->opt[repLen]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = 0; -+ opt->backPrev = i; -+ opt->prev1IsChar = False; -+ } -+ } -+ while (--repLen >= 2); -+ } -+ -+ normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]); -+ -+ len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2); -+ if (len <= mainLen) -+ { -+ UInt32 offs = 0; -+ while (len > matches[offs]) -+ offs += 2; -+ for (; ; len++) -+ { -+ COptimal *opt; -+ UInt32 distance = matches[offs + 1]; -+ -+ UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN]; -+ UInt32 lenToPosState = GetLenToPosState(len); -+ if (distance < kNumFullDistances) -+ curAndLenPrice += p->distancesPrices[lenToPosState][distance]; -+ else -+ { -+ UInt32 slot; -+ GetPosSlot2(distance, slot); -+ curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot]; -+ } -+ opt = &p->opt[len]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = 0; -+ opt->backPrev = distance + LZMA_NUM_REPS; -+ opt->prev1IsChar = False; -+ } -+ if (len == matches[offs]) -+ { -+ offs += 2; -+ if (offs == numPairs) -+ break; -+ } -+ } -+ } -+ -+ cur = 0; -+ -+ #ifdef SHOW_STAT2 -+ if (position >= 0) -+ { -+ unsigned i; -+ printf("\n pos = %4X", position); -+ for (i = cur; i <= lenEnd; i++) -+ printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price); -+ } -+ #endif -+ -+ for (;;) -+ { -+ UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen; -+ UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice; -+ Bool nextIsChar; -+ Byte curByte, matchByte; -+ const Byte *data; -+ COptimal *curOpt; -+ COptimal *nextOpt; -+ -+ cur++; -+ if (cur == lenEnd) -+ return Backward(p, backRes, cur); -+ -+ newLen = ReadMatchDistances(p, &numPairs); -+ if (newLen >= p->numFastBytes) -+ { -+ p->numPairs = numPairs; -+ p->longestMatchLength = newLen; -+ return Backward(p, backRes, cur); -+ } -+ position++; -+ curOpt = &p->opt[cur]; -+ posPrev = curOpt->posPrev; -+ if (curOpt->prev1IsChar) -+ { -+ posPrev--; -+ if (curOpt->prev2) -+ { -+ state = p->opt[curOpt->posPrev2].state; -+ if (curOpt->backPrev2 < LZMA_NUM_REPS) -+ state = kRepNextStates[state]; -+ else -+ state = kMatchNextStates[state]; -+ } -+ else -+ state = p->opt[posPrev].state; -+ state = kLiteralNextStates[state]; -+ } -+ else -+ state = p->opt[posPrev].state; -+ if (posPrev == cur - 1) -+ { -+ if (IsShortRep(curOpt)) -+ state = kShortRepNextStates[state]; -+ else -+ state = kLiteralNextStates[state]; -+ } -+ else -+ { -+ UInt32 pos; -+ const COptimal *prevOpt; -+ if (curOpt->prev1IsChar && curOpt->prev2) -+ { -+ posPrev = curOpt->posPrev2; -+ pos = curOpt->backPrev2; -+ state = kRepNextStates[state]; -+ } -+ else -+ { -+ pos = curOpt->backPrev; -+ if (pos < LZMA_NUM_REPS) -+ state = kRepNextStates[state]; -+ else -+ state = kMatchNextStates[state]; -+ } -+ prevOpt = &p->opt[posPrev]; -+ if (pos < LZMA_NUM_REPS) -+ { -+ UInt32 i; -+ reps[0] = prevOpt->backs[pos]; -+ for (i = 1; i <= pos; i++) -+ reps[i] = prevOpt->backs[i - 1]; -+ for (; i < LZMA_NUM_REPS; i++) -+ reps[i] = prevOpt->backs[i]; -+ } -+ else -+ { -+ UInt32 i; -+ reps[0] = (pos - LZMA_NUM_REPS); -+ for (i = 1; i < LZMA_NUM_REPS; i++) -+ reps[i] = prevOpt->backs[i - 1]; -+ } -+ } -+ curOpt->state = (CState)state; -+ -+ curOpt->backs[0] = reps[0]; -+ curOpt->backs[1] = reps[1]; -+ curOpt->backs[2] = reps[2]; -+ curOpt->backs[3] = reps[3]; -+ -+ curPrice = curOpt->price; -+ nextIsChar = False; -+ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; -+ curByte = *data; -+ matchByte = *(data - (reps[0] + 1)); -+ -+ posState = (position & p->pbMask); -+ -+ curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]); -+ { -+ const CLzmaProb *probs = LIT_PROBS(position, *(data - 1)); -+ curAnd1Price += -+ (!IsCharState(state) ? -+ LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) : -+ LitEnc_GetPrice(probs, curByte, p->ProbPrices)); -+ } -+ -+ nextOpt = &p->opt[cur + 1]; -+ -+ if (curAnd1Price < nextOpt->price) -+ { -+ nextOpt->price = curAnd1Price; -+ nextOpt->posPrev = cur; -+ MakeAsChar(nextOpt); -+ nextIsChar = True; -+ } -+ -+ matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]); -+ repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]); -+ -+ if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0)) -+ { -+ UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState); -+ if (shortRepPrice <= nextOpt->price) -+ { -+ nextOpt->price = shortRepPrice; -+ nextOpt->posPrev = cur; -+ MakeAsShortRep(nextOpt); -+ nextIsChar = True; -+ } -+ } -+ numAvailFull = p->numAvail; -+ { -+ UInt32 temp = kNumOpts - 1 - cur; -+ if (temp < numAvailFull) -+ numAvailFull = temp; -+ } -+ -+ if (numAvailFull < 2) -+ continue; -+ numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes); -+ -+ if (!nextIsChar && matchByte != curByte) /* speed optimization */ -+ { -+ /* try Literal + rep0 */ -+ UInt32 temp; -+ UInt32 lenTest2; -+ const Byte *data2 = data - (reps[0] + 1); -+ UInt32 limit = p->numFastBytes + 1; -+ if (limit > numAvailFull) -+ limit = numAvailFull; -+ -+ for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++); -+ lenTest2 = temp - 1; -+ if (lenTest2 >= 2) -+ { -+ UInt32 state2 = kLiteralNextStates[state]; -+ UInt32 posStateNext = (position + 1) & p->pbMask; -+ UInt32 nextRepMatchPrice = curAnd1Price + -+ GET_PRICE_1(p->isMatch[state2][posStateNext]) + -+ GET_PRICE_1(p->isRep[state2]); -+ /* for (; lenTest2 >= 2; lenTest2--) */ -+ { -+ UInt32 curAndLenPrice; -+ COptimal *opt; -+ UInt32 offset = cur + 1 + lenTest2; -+ while (lenEnd < offset) -+ p->opt[++lenEnd].price = kInfinityPrice; -+ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); -+ opt = &p->opt[offset]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = cur + 1; -+ opt->backPrev = 0; -+ opt->prev1IsChar = True; -+ opt->prev2 = False; -+ } -+ } -+ } -+ } -+ -+ startLen = 2; /* speed optimization */ -+ { -+ UInt32 repIndex; -+ for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++) -+ { -+ UInt32 lenTest; -+ UInt32 lenTestTemp; -+ UInt32 price; -+ const Byte *data2 = data - (reps[repIndex] + 1); -+ if (data[0] != data2[0] || data[1] != data2[1]) -+ continue; -+ for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++); -+ while (lenEnd < cur + lenTest) -+ p->opt[++lenEnd].price = kInfinityPrice; -+ lenTestTemp = lenTest; -+ price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState); -+ do -+ { -+ UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2]; -+ COptimal *opt = &p->opt[cur + lenTest]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = cur; -+ opt->backPrev = repIndex; -+ opt->prev1IsChar = False; -+ } -+ } -+ while (--lenTest >= 2); -+ lenTest = lenTestTemp; -+ -+ if (repIndex == 0) -+ startLen = lenTest + 1; -+ -+ /* if (_maxMode) */ -+ { -+ UInt32 lenTest2 = lenTest + 1; -+ UInt32 limit = lenTest2 + p->numFastBytes; -+ UInt32 nextRepMatchPrice; -+ if (limit > numAvailFull) -+ limit = numAvailFull; -+ for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++); -+ lenTest2 -= lenTest + 1; -+ if (lenTest2 >= 2) -+ { -+ UInt32 state2 = kRepNextStates[state]; -+ UInt32 posStateNext = (position + lenTest) & p->pbMask; -+ UInt32 curAndLenCharPrice = -+ price + p->repLenEnc.prices[posState][lenTest - 2] + -+ GET_PRICE_0(p->isMatch[state2][posStateNext]) + -+ LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]), -+ data[lenTest], data2[lenTest], p->ProbPrices); -+ state2 = kLiteralNextStates[state2]; -+ posStateNext = (position + lenTest + 1) & p->pbMask; -+ nextRepMatchPrice = curAndLenCharPrice + -+ GET_PRICE_1(p->isMatch[state2][posStateNext]) + -+ GET_PRICE_1(p->isRep[state2]); -+ -+ /* for (; lenTest2 >= 2; lenTest2--) */ -+ { -+ UInt32 curAndLenPrice; -+ COptimal *opt; -+ UInt32 offset = cur + lenTest + 1 + lenTest2; -+ while (lenEnd < offset) -+ p->opt[++lenEnd].price = kInfinityPrice; -+ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); -+ opt = &p->opt[offset]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = cur + lenTest + 1; -+ opt->backPrev = 0; -+ opt->prev1IsChar = True; -+ opt->prev2 = True; -+ opt->posPrev2 = cur; -+ opt->backPrev2 = repIndex; -+ } -+ } -+ } -+ } -+ } -+ } -+ /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */ -+ if (newLen > numAvail) -+ { -+ newLen = numAvail; -+ for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2); -+ matches[numPairs] = newLen; -+ numPairs += 2; -+ } -+ if (newLen >= startLen) -+ { -+ UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]); -+ UInt32 offs, curBack, posSlot; -+ UInt32 lenTest; -+ while (lenEnd < cur + newLen) -+ p->opt[++lenEnd].price = kInfinityPrice; -+ -+ offs = 0; -+ while (startLen > matches[offs]) -+ offs += 2; -+ curBack = matches[offs + 1]; -+ GetPosSlot2(curBack, posSlot); -+ for (lenTest = /*2*/ startLen; ; lenTest++) -+ { -+ UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN]; -+ UInt32 lenToPosState = GetLenToPosState(lenTest); -+ COptimal *opt; -+ if (curBack < kNumFullDistances) -+ curAndLenPrice += p->distancesPrices[lenToPosState][curBack]; -+ else -+ curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask]; -+ -+ opt = &p->opt[cur + lenTest]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = cur; -+ opt->backPrev = curBack + LZMA_NUM_REPS; -+ opt->prev1IsChar = False; -+ } -+ -+ if (/*_maxMode && */lenTest == matches[offs]) -+ { -+ /* Try Match + Literal + Rep0 */ -+ const Byte *data2 = data - (curBack + 1); -+ UInt32 lenTest2 = lenTest + 1; -+ UInt32 limit = lenTest2 + p->numFastBytes; -+ UInt32 nextRepMatchPrice; -+ if (limit > numAvailFull) -+ limit = numAvailFull; -+ for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++); -+ lenTest2 -= lenTest + 1; -+ if (lenTest2 >= 2) -+ { -+ UInt32 state2 = kMatchNextStates[state]; -+ UInt32 posStateNext = (position + lenTest) & p->pbMask; -+ UInt32 curAndLenCharPrice = curAndLenPrice + -+ GET_PRICE_0(p->isMatch[state2][posStateNext]) + -+ LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]), -+ data[lenTest], data2[lenTest], p->ProbPrices); -+ state2 = kLiteralNextStates[state2]; -+ posStateNext = (posStateNext + 1) & p->pbMask; -+ nextRepMatchPrice = curAndLenCharPrice + -+ GET_PRICE_1(p->isMatch[state2][posStateNext]) + -+ GET_PRICE_1(p->isRep[state2]); -+ -+ /* for (; lenTest2 >= 2; lenTest2--) */ -+ { -+ UInt32 offset = cur + lenTest + 1 + lenTest2; -+ UInt32 curAndLenPrice; -+ COptimal *opt; -+ while (lenEnd < offset) -+ p->opt[++lenEnd].price = kInfinityPrice; -+ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); -+ opt = &p->opt[offset]; -+ if (curAndLenPrice < opt->price) -+ { -+ opt->price = curAndLenPrice; -+ opt->posPrev = cur + lenTest + 1; -+ opt->backPrev = 0; -+ opt->prev1IsChar = True; -+ opt->prev2 = True; -+ opt->posPrev2 = cur; -+ opt->backPrev2 = curBack + LZMA_NUM_REPS; -+ } -+ } -+ } -+ offs += 2; -+ if (offs == numPairs) -+ break; -+ curBack = matches[offs + 1]; -+ if (curBack >= kNumFullDistances) -+ GetPosSlot2(curBack, posSlot); -+ } -+ } -+ } -+ } -+} -+ -+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist)) -+ -+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes) -+{ -+ UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i; -+ const Byte *data; -+ const UInt32 *matches; -+ -+ if (p->additionalOffset == 0) -+ mainLen = ReadMatchDistances(p, &numPairs); -+ else -+ { -+ mainLen = p->longestMatchLength; -+ numPairs = p->numPairs; -+ } -+ -+ numAvail = p->numAvail; -+ *backRes = (UInt32)-1; -+ if (numAvail < 2) -+ return 1; -+ if (numAvail > LZMA_MATCH_LEN_MAX) -+ numAvail = LZMA_MATCH_LEN_MAX; -+ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; -+ -+ repLen = repIndex = 0; -+ for (i = 0; i < LZMA_NUM_REPS; i++) -+ { -+ UInt32 len; -+ const Byte *data2 = data - (p->reps[i] + 1); -+ if (data[0] != data2[0] || data[1] != data2[1]) -+ continue; -+ for (len = 2; len < numAvail && data[len] == data2[len]; len++); -+ if (len >= p->numFastBytes) -+ { -+ *backRes = i; -+ MovePos(p, len - 1); -+ return len; -+ } -+ if (len > repLen) -+ { -+ repIndex = i; -+ repLen = len; -+ } -+ } -+ -+ matches = p->matches; -+ if (mainLen >= p->numFastBytes) -+ { -+ *backRes = matches[numPairs - 1] + LZMA_NUM_REPS; -+ MovePos(p, mainLen - 1); -+ return mainLen; -+ } -+ -+ mainDist = 0; /* for GCC */ -+ if (mainLen >= 2) -+ { -+ mainDist = matches[numPairs - 1]; -+ while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1) -+ { -+ if (!ChangePair(matches[numPairs - 3], mainDist)) -+ break; -+ numPairs -= 2; -+ mainLen = matches[numPairs - 2]; -+ mainDist = matches[numPairs - 1]; -+ } -+ if (mainLen == 2 && mainDist >= 0x80) -+ mainLen = 1; -+ } -+ -+ if (repLen >= 2 && ( -+ (repLen + 1 >= mainLen) || -+ (repLen + 2 >= mainLen && mainDist >= (1 << 9)) || -+ (repLen + 3 >= mainLen && mainDist >= (1 << 15)))) -+ { -+ *backRes = repIndex; -+ MovePos(p, repLen - 1); -+ return repLen; -+ } -+ -+ if (mainLen < 2 || numAvail <= 2) -+ return 1; -+ -+ p->longestMatchLength = ReadMatchDistances(p, &p->numPairs); -+ if (p->longestMatchLength >= 2) -+ { -+ UInt32 newDistance = matches[p->numPairs - 1]; -+ if ((p->longestMatchLength >= mainLen && newDistance < mainDist) || -+ (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) || -+ (p->longestMatchLength > mainLen + 1) || -+ (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist))) -+ return 1; -+ } -+ -+ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; -+ for (i = 0; i < LZMA_NUM_REPS; i++) -+ { -+ UInt32 len, limit; -+ const Byte *data2 = data - (p->reps[i] + 1); -+ if (data[0] != data2[0] || data[1] != data2[1]) -+ continue; -+ limit = mainLen - 1; -+ for (len = 2; len < limit && data[len] == data2[len]; len++); -+ if (len >= limit) -+ return 1; -+ } -+ *backRes = mainDist + LZMA_NUM_REPS; -+ MovePos(p, mainLen - 2); -+ return mainLen; -+} -+ -+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState) -+{ -+ UInt32 len; -+ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1); -+ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); -+ p->state = kMatchNextStates[p->state]; -+ len = LZMA_MATCH_LEN_MIN; -+ LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); -+ RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1); -+ RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits); -+ RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask); -+} -+ -+static SRes CheckErrors(CLzmaEnc *p) -+{ -+ if (p->result != SZ_OK) -+ return p->result; -+ if (p->rc.res != SZ_OK) -+ p->result = SZ_ERROR_WRITE; -+ if (p->matchFinderBase.result != SZ_OK) -+ p->result = SZ_ERROR_READ; -+ if (p->result != SZ_OK) -+ p->finished = True; -+ return p->result; -+} -+ -+static SRes Flush(CLzmaEnc *p, UInt32 nowPos) -+{ -+ /* ReleaseMFStream(); */ -+ p->finished = True; -+ if (p->writeEndMark) -+ WriteEndMarker(p, nowPos & p->pbMask); -+ RangeEnc_FlushData(&p->rc); -+ RangeEnc_FlushStream(&p->rc); -+ return CheckErrors(p); -+} -+ -+static void FillAlignPrices(CLzmaEnc *p) -+{ -+ UInt32 i; -+ for (i = 0; i < kAlignTableSize; i++) -+ p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices); -+ p->alignPriceCount = 0; -+} -+ -+static void FillDistancesPrices(CLzmaEnc *p) -+{ -+ UInt32 tempPrices[kNumFullDistances]; -+ UInt32 i, lenToPosState; -+ for (i = kStartPosModelIndex; i < kNumFullDistances; i++) -+ { -+ UInt32 posSlot = GetPosSlot1(i); -+ UInt32 footerBits = ((posSlot >> 1) - 1); -+ UInt32 base = ((2 | (posSlot & 1)) << footerBits); -+ tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices); -+ } -+ -+ for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++) -+ { -+ UInt32 posSlot; -+ const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState]; -+ UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState]; -+ for (posSlot = 0; posSlot < p->distTableSize; posSlot++) -+ posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices); -+ for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++) -+ posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits); -+ -+ { -+ UInt32 *distancesPrices = p->distancesPrices[lenToPosState]; -+ UInt32 i; -+ for (i = 0; i < kStartPosModelIndex; i++) -+ distancesPrices[i] = posSlotPrices[i]; -+ for (; i < kNumFullDistances; i++) -+ distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i]; -+ } -+ } -+ p->matchPriceCount = 0; -+} -+ -+void LzmaEnc_Construct(CLzmaEnc *p) -+{ -+ RangeEnc_Construct(&p->rc); -+ MatchFinder_Construct(&p->matchFinderBase); -+ #ifndef _7ZIP_ST -+ MatchFinderMt_Construct(&p->matchFinderMt); -+ p->matchFinderMt.MatchFinder = &p->matchFinderBase; -+ #endif -+ -+ { -+ CLzmaEncProps props; -+ LzmaEncProps_Init(&props); -+ LzmaEnc_SetProps(p, &props); -+ } -+ -+ #ifndef LZMA_LOG_BSR -+ LzmaEnc_FastPosInit(p->g_FastPos); -+ #endif -+ -+ LzmaEnc_InitPriceTables(p->ProbPrices); -+ p->litProbs = 0; -+ p->saveState.litProbs = 0; -+} -+ -+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc) -+{ -+ void *p; -+ p = alloc->Alloc(alloc, sizeof(CLzmaEnc)); -+ if (p != 0) -+ LzmaEnc_Construct((CLzmaEnc *)p); -+ return p; -+} -+ -+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc) -+{ -+ alloc->Free(alloc, p->litProbs); -+ alloc->Free(alloc, p->saveState.litProbs); -+ p->litProbs = 0; -+ p->saveState.litProbs = 0; -+} -+ -+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ #ifndef _7ZIP_ST -+ MatchFinderMt_Destruct(&p->matchFinderMt, allocBig); -+ #endif -+ MatchFinder_Free(&p->matchFinderBase, allocBig); -+ LzmaEnc_FreeLits(p, alloc); -+ RangeEnc_Free(&p->rc, alloc); -+} -+ -+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig); -+ alloc->Free(alloc, p); -+} -+ -+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize) -+{ -+ UInt32 nowPos32, startPos32; -+ if (p->needInit) -+ { -+ p->matchFinder.Init(p->matchFinderObj); -+ p->needInit = 0; -+ } -+ -+ if (p->finished) -+ return p->result; -+ RINOK(CheckErrors(p)); -+ -+ nowPos32 = (UInt32)p->nowPos64; -+ startPos32 = nowPos32; -+ -+ if (p->nowPos64 == 0) -+ { -+ UInt32 numPairs; -+ Byte curByte; -+ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0) -+ return Flush(p, nowPos32); -+ ReadMatchDistances(p, &numPairs); -+ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0); -+ p->state = kLiteralNextStates[p->state]; -+ curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset); -+ LitEnc_Encode(&p->rc, p->litProbs, curByte); -+ p->additionalOffset--; -+ nowPos32++; -+ } -+ -+ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0) -+ for (;;) -+ { -+ UInt32 pos, len, posState; -+ -+ if (p->fastMode) -+ len = GetOptimumFast(p, &pos); -+ else -+ len = GetOptimum(p, nowPos32, &pos); -+ -+ #ifdef SHOW_STAT2 -+ printf("\n pos = %4X, len = %d pos = %d", nowPos32, len, pos); -+ #endif -+ -+ posState = nowPos32 & p->pbMask; -+ if (len == 1 && pos == (UInt32)-1) -+ { -+ Byte curByte; -+ CLzmaProb *probs; -+ const Byte *data; -+ -+ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0); -+ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; -+ curByte = *data; -+ probs = LIT_PROBS(nowPos32, *(data - 1)); -+ if (IsCharState(p->state)) -+ LitEnc_Encode(&p->rc, probs, curByte); -+ else -+ LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1)); -+ p->state = kLiteralNextStates[p->state]; -+ } -+ else -+ { -+ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1); -+ if (pos < LZMA_NUM_REPS) -+ { -+ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1); -+ if (pos == 0) -+ { -+ RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0); -+ RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1)); -+ } -+ else -+ { -+ UInt32 distance = p->reps[pos]; -+ RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1); -+ if (pos == 1) -+ RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0); -+ else -+ { -+ RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1); -+ RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2); -+ if (pos == 3) -+ p->reps[3] = p->reps[2]; -+ p->reps[2] = p->reps[1]; -+ } -+ p->reps[1] = p->reps[0]; -+ p->reps[0] = distance; -+ } -+ if (len == 1) -+ p->state = kShortRepNextStates[p->state]; -+ else -+ { -+ LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); -+ p->state = kRepNextStates[p->state]; -+ } -+ } -+ else -+ { -+ UInt32 posSlot; -+ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); -+ p->state = kMatchNextStates[p->state]; -+ LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); -+ pos -= LZMA_NUM_REPS; -+ GetPosSlot(pos, posSlot); -+ RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot); -+ -+ if (posSlot >= kStartPosModelIndex) -+ { -+ UInt32 footerBits = ((posSlot >> 1) - 1); -+ UInt32 base = ((2 | (posSlot & 1)) << footerBits); -+ UInt32 posReduced = pos - base; -+ -+ if (posSlot < kEndPosModelIndex) -+ RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced); -+ else -+ { -+ RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits); -+ RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask); -+ p->alignPriceCount++; -+ } -+ } -+ p->reps[3] = p->reps[2]; -+ p->reps[2] = p->reps[1]; -+ p->reps[1] = p->reps[0]; -+ p->reps[0] = pos; -+ p->matchPriceCount++; -+ } -+ } -+ p->additionalOffset -= len; -+ nowPos32 += len; -+ if (p->additionalOffset == 0) -+ { -+ UInt32 processed; -+ if (!p->fastMode) -+ { -+ if (p->matchPriceCount >= (1 << 7)) -+ FillDistancesPrices(p); -+ if (p->alignPriceCount >= kAlignTableSize) -+ FillAlignPrices(p); -+ } -+ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0) -+ break; -+ processed = nowPos32 - startPos32; -+ if (useLimits) -+ { -+ if (processed + kNumOpts + 300 >= maxUnpackSize || -+ RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize) -+ break; -+ } -+ else if (processed >= (1 << 15)) -+ { -+ p->nowPos64 += nowPos32 - startPos32; -+ return CheckErrors(p); -+ } -+ } -+ } -+ p->nowPos64 += nowPos32 - startPos32; -+ return Flush(p, nowPos32); -+} -+ -+#define kBigHashDicLimit ((UInt32)1 << 24) -+ -+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ UInt32 beforeSize = kNumOpts; -+ Bool btMode; -+ if (!RangeEnc_Alloc(&p->rc, alloc)) -+ return SZ_ERROR_MEM; -+ btMode = (p->matchFinderBase.btMode != 0); -+ #ifndef _7ZIP_ST -+ p->mtMode = (p->multiThread && !p->fastMode && btMode); -+ #endif -+ -+ { -+ unsigned lclp = p->lc + p->lp; -+ if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp) -+ { -+ LzmaEnc_FreeLits(p, alloc); -+ p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb)); -+ p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb)); -+ if (p->litProbs == 0 || p->saveState.litProbs == 0) -+ { -+ LzmaEnc_FreeLits(p, alloc); -+ return SZ_ERROR_MEM; -+ } -+ p->lclp = lclp; -+ } -+ } -+ -+ p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit); -+ -+ if (beforeSize + p->dictSize < keepWindowSize) -+ beforeSize = keepWindowSize - p->dictSize; -+ -+ #ifndef _7ZIP_ST -+ if (p->mtMode) -+ { -+ RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig)); -+ p->matchFinderObj = &p->matchFinderMt; -+ MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder); -+ } -+ else -+ #endif -+ { -+ if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig)) -+ return SZ_ERROR_MEM; -+ p->matchFinderObj = &p->matchFinderBase; -+ MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder); -+ } -+ return SZ_OK; -+} -+ -+void LzmaEnc_Init(CLzmaEnc *p) -+{ -+ UInt32 i; -+ p->state = 0; -+ for (i = 0 ; i < LZMA_NUM_REPS; i++) -+ p->reps[i] = 0; -+ -+ RangeEnc_Init(&p->rc); -+ -+ -+ for (i = 0; i < kNumStates; i++) -+ { -+ UInt32 j; -+ for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++) -+ { -+ p->isMatch[i][j] = kProbInitValue; -+ p->isRep0Long[i][j] = kProbInitValue; -+ } -+ p->isRep[i] = kProbInitValue; -+ p->isRepG0[i] = kProbInitValue; -+ p->isRepG1[i] = kProbInitValue; -+ p->isRepG2[i] = kProbInitValue; -+ } -+ -+ { -+ UInt32 num = 0x300 << (p->lp + p->lc); -+ for (i = 0; i < num; i++) -+ p->litProbs[i] = kProbInitValue; -+ } -+ -+ { -+ for (i = 0; i < kNumLenToPosStates; i++) -+ { -+ CLzmaProb *probs = p->posSlotEncoder[i]; -+ UInt32 j; -+ for (j = 0; j < (1 << kNumPosSlotBits); j++) -+ probs[j] = kProbInitValue; -+ } -+ } -+ { -+ for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++) -+ p->posEncoders[i] = kProbInitValue; -+ } -+ -+ LenEnc_Init(&p->lenEnc.p); -+ LenEnc_Init(&p->repLenEnc.p); -+ -+ for (i = 0; i < (1 << kNumAlignBits); i++) -+ p->posAlignEncoder[i] = kProbInitValue; -+ -+ p->optimumEndIndex = 0; -+ p->optimumCurrentIndex = 0; -+ p->additionalOffset = 0; -+ -+ p->pbMask = (1 << p->pb) - 1; -+ p->lpMask = (1 << p->lp) - 1; -+} -+ -+void LzmaEnc_InitPrices(CLzmaEnc *p) -+{ -+ if (!p->fastMode) -+ { -+ FillDistancesPrices(p); -+ FillAlignPrices(p); -+ } -+ -+ p->lenEnc.tableSize = -+ p->repLenEnc.tableSize = -+ p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN; -+ LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices); -+ LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices); -+} -+ -+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ UInt32 i; -+ for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++) -+ if (p->dictSize <= ((UInt32)1 << i)) -+ break; -+ p->distTableSize = i * 2; -+ -+ p->finished = False; -+ p->result = SZ_OK; -+ RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig)); -+ LzmaEnc_Init(p); -+ LzmaEnc_InitPrices(p); -+ p->nowPos64 = 0; -+ return SZ_OK; -+} -+ -+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, -+ ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ p->matchFinderBase.stream = inStream; -+ p->needInit = 1; -+ p->rc.outStream = outStream; -+ return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig); -+} -+ -+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, -+ ISeqInStream *inStream, UInt32 keepWindowSize, -+ ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ p->matchFinderBase.stream = inStream; -+ p->needInit = 1; -+ return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); -+} -+ -+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen) -+{ -+ p->matchFinderBase.directInput = 1; -+ p->matchFinderBase.bufferBase = (Byte *)src; -+ p->matchFinderBase.directInputRem = srcLen; -+} -+ -+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen, -+ UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ LzmaEnc_SetInputBuf(p, src, srcLen); -+ p->needInit = 1; -+ -+ return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); -+} -+ -+void LzmaEnc_Finish(CLzmaEncHandle pp) -+{ -+ #ifndef _7ZIP_ST -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ if (p->mtMode) -+ MatchFinderMt_ReleaseStream(&p->matchFinderMt); -+ #else -+ pp = pp; -+ #endif -+} -+ -+typedef struct -+{ -+ ISeqOutStream funcTable; -+ Byte *data; -+ SizeT rem; -+ Bool overflow; -+} CSeqOutStreamBuf; -+ -+static size_t MyWrite(void *pp, const void *data, size_t size) -+{ -+ CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp; -+ if (p->rem < size) -+ { -+ size = p->rem; -+ p->overflow = True; -+ } -+ memcpy(p->data, data, size); -+ p->rem -= size; -+ p->data += size; -+ return size; -+} -+ -+ -+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp) -+{ -+ const CLzmaEnc *p = (CLzmaEnc *)pp; -+ return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); -+} -+ -+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp) -+{ -+ const CLzmaEnc *p = (CLzmaEnc *)pp; -+ return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; -+} -+ -+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit, -+ Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ UInt64 nowPos64; -+ SRes res; -+ CSeqOutStreamBuf outStream; -+ -+ outStream.funcTable.Write = MyWrite; -+ outStream.data = dest; -+ outStream.rem = *destLen; -+ outStream.overflow = False; -+ -+ p->writeEndMark = False; -+ p->finished = False; -+ p->result = SZ_OK; -+ -+ if (reInit) -+ LzmaEnc_Init(p); -+ LzmaEnc_InitPrices(p); -+ nowPos64 = p->nowPos64; -+ RangeEnc_Init(&p->rc); -+ p->rc.outStream = &outStream.funcTable; -+ -+ res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize); -+ -+ *unpackSize = (UInt32)(p->nowPos64 - nowPos64); -+ *destLen -= outStream.rem; -+ if (outStream.overflow) -+ return SZ_ERROR_OUTPUT_EOF; -+ -+ return res; -+} -+ -+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress) -+{ -+ SRes res = SZ_OK; -+ -+ #ifndef _7ZIP_ST -+ Byte allocaDummy[0x300]; -+ int i = 0; -+ for (i = 0; i < 16; i++) -+ allocaDummy[i] = (Byte)i; -+ #endif -+ -+ for (;;) -+ { -+ res = LzmaEnc_CodeOneBlock(p, False, 0, 0); -+ if (res != SZ_OK || p->finished != 0) -+ break; -+ if (progress != 0) -+ { -+ res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc)); -+ if (res != SZ_OK) -+ { -+ res = SZ_ERROR_PROGRESS; -+ break; -+ } -+ } -+ } -+ LzmaEnc_Finish(p); -+ return res; -+} -+ -+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress, -+ ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig)); -+ return LzmaEnc_Encode2((CLzmaEnc *)pp, progress); -+} -+ -+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ int i; -+ UInt32 dictSize = p->dictSize; -+ if (*size < LZMA_PROPS_SIZE) -+ return SZ_ERROR_PARAM; -+ *size = LZMA_PROPS_SIZE; -+ props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc); -+ -+ for (i = 11; i <= 30; i++) -+ { -+ if (dictSize <= ((UInt32)2 << i)) -+ { -+ dictSize = (2 << i); -+ break; -+ } -+ if (dictSize <= ((UInt32)3 << i)) -+ { -+ dictSize = (3 << i); -+ break; -+ } -+ } -+ -+ for (i = 0; i < 4; i++) -+ props[1 + i] = (Byte)(dictSize >> (8 * i)); -+ return SZ_OK; -+} -+ -+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, -+ int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ SRes res; -+ CLzmaEnc *p = (CLzmaEnc *)pp; -+ -+ CSeqOutStreamBuf outStream; -+ -+ LzmaEnc_SetInputBuf(p, src, srcLen); -+ -+ outStream.funcTable.Write = MyWrite; -+ outStream.data = dest; -+ outStream.rem = *destLen; -+ outStream.overflow = False; -+ -+ p->writeEndMark = writeEndMark; -+ -+ p->rc.outStream = &outStream.funcTable; -+ res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig); -+ if (res == SZ_OK) -+ res = LzmaEnc_Encode2(p, progress); -+ -+ *destLen -= outStream.rem; -+ if (outStream.overflow) -+ return SZ_ERROR_OUTPUT_EOF; -+ return res; -+} -+ -+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, -+ const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, -+ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) -+{ -+ CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc); -+ SRes res; -+ if (p == 0) -+ return SZ_ERROR_MEM; -+ -+ res = LzmaEnc_SetProps(p, props); -+ if (res == SZ_OK) -+ { -+ res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize); -+ if (res == SZ_OK) -+ res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen, -+ writeEndMark, progress, alloc, allocBig); -+ } -+ -+ LzmaEnc_Destroy(p, alloc, allocBig); -+ return res; -+} ---- /dev/null -+++ b/lib/lzma/Makefile -@@ -0,0 +1,7 @@ -+lzma_compress-objs := LzFind.o LzmaEnc.o -+lzma_decompress-objs := LzmaDec.o -+ -+obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o -+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o -+ -+EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h diff --git a/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch b/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch deleted file mode 100644 index e9952c6d84..0000000000 --- a/target/linux/generic/pending-4.9/532-jffs2_eofdetect.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Felix Fietkau -Subject: fs: jffs2: EOF marker - -Signed-off-by: Felix Fietkau ---- - fs/jffs2/build.c | 10 ++++++++++ - fs/jffs2/scan.c | 21 +++++++++++++++++++-- - 2 files changed, 29 insertions(+), 2 deletions(-) - ---- a/fs/jffs2/build.c -+++ b/fs/jffs2/build.c -@@ -117,6 +117,16 @@ static int jffs2_build_filesystem(struct - dbg_fsbuild("scanned flash completely\n"); - jffs2_dbg_dump_block_lists_nolock(c); - -+ if (c->flags & (1 << 7)) { -+ printk("%s(): unlocking the mtd device... ", __func__); -+ mtd_unlock(c->mtd, 0, c->mtd->size); -+ printk("done.\n"); -+ -+ printk("%s(): erasing all blocks after the end marker... ", __func__); -+ jffs2_erase_pending_blocks(c, -1); -+ printk("done.\n"); -+ } -+ - dbg_fsbuild("pass 1 starting\n"); - c->flags |= JFFS2_SB_FLAG_BUILDING; - /* Now scan the directory tree, increasing nlink according to every dirent found. */ ---- a/fs/jffs2/scan.c -+++ b/fs/jffs2/scan.c -@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in - /* reset summary info for next eraseblock scan */ - jffs2_sum_reset_collected(s); - -- ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset), -- buf_size, s); -+ if (c->flags & (1 << 7)) { -+ if (mtd_block_isbad(c->mtd, jeb->offset)) -+ ret = BLK_STATE_BADBLOCK; -+ else -+ ret = BLK_STATE_ALLFF; -+ } else -+ ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset), -+ buf_size, s); - - if (ret < 0) - goto out; -@@ -561,6 +567,17 @@ full_scan: - return err; - } - -+ if ((buf[0] == 0xde) && -+ (buf[1] == 0xad) && -+ (buf[2] == 0xc0) && -+ (buf[3] == 0xde)) { -+ /* end of filesystem. erase everything after this point */ -+ printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset); -+ c->flags |= (1 << 7); -+ -+ return BLK_STATE_ALLFF; -+ } -+ - /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ - ofs = 0; - max_ofs = EMPTY_SCAN_SIZE(c->sector_size); diff --git a/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch b/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch deleted file mode 100644 index ca96cbbdb8..0000000000 --- a/target/linux/generic/pending-4.9/551-ubifs-fix-default-compression-selection.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Gabor Juhos -Subject: fs: ubifs: fix default compression selection in ubifs - -Signed-off-by: Gabor Juhos ---- - fs/ubifs/sb.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/fs/ubifs/sb.c -+++ b/fs/ubifs/sb.c -@@ -63,6 +63,17 @@ - /* Default time granularity in nanoseconds */ - #define DEFAULT_TIME_GRAN 1000000000 - -+static int get_default_compressor(void) -+{ -+ if (ubifs_compr_present(UBIFS_COMPR_LZO)) -+ return UBIFS_COMPR_LZO; -+ -+ if (ubifs_compr_present(UBIFS_COMPR_ZLIB)) -+ return UBIFS_COMPR_ZLIB; -+ -+ return UBIFS_COMPR_NONE; -+} -+ - /** - * create_default_filesystem - format empty UBI volume. - * @c: UBIFS file-system description object -@@ -183,7 +194,7 @@ static int create_default_filesystem(str - if (c->mount_opts.override_compr) - sup->default_compr = cpu_to_le16(c->mount_opts.compr_type); - else -- sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO); -+ sup->default_compr = cpu_to_le16(get_default_compressor()); - - generate_random_uuid(sup->uuid); - diff --git a/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch deleted file mode 100644 index 81dac2ab23..0000000000 --- a/target/linux/generic/pending-4.9/600-netfilter_conntrack_flush.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Felix Fietkau -Subject: netfilter: add support for flushing conntrack via /proc - -lede-commit 8193bbe59a74d34d6a26d4a8cb857b1952905314 -Signed-off-by: Felix Fietkau ---- - net/netfilter/nf_conntrack_standalone.c | 59 ++++++++++++++++++++++++++++++++- - 1 file changed, 58 insertions(+), 1 deletion(-) - ---- a/net/netfilter/nf_conntrack_standalone.c -+++ b/net/netfilter/nf_conntrack_standalone.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #ifdef CONFIG_SYSCTL - #include -@@ -298,10 +299,66 @@ static int ct_open(struct inode *inode, - sizeof(struct ct_iter_state)); - } - -+struct kill_request { -+ u16 family; -+ union nf_inet_addr addr; -+}; -+ -+static int kill_matching(struct nf_conn *i, void *data) -+{ -+ struct kill_request *kr = data; -+ struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple; -+ struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple; -+ -+ if (!kr->family) -+ return 1; -+ -+ if (t1->src.l3num != kr->family) -+ return 0; -+ -+ return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) || -+ nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) || -+ nf_inet_addr_cmp(&kr->addr, &t2->src.u3) || -+ nf_inet_addr_cmp(&kr->addr, &t2->dst.u3)); -+} -+ -+static ssize_t ct_file_write(struct file *file, const char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ struct seq_file *seq = file->private_data; -+ struct net *net = seq_file_net(seq); -+ struct kill_request kr = { }; -+ char req[INET6_ADDRSTRLEN] = { }; -+ -+ if (count == 0) -+ return 0; -+ -+ if (count >= INET6_ADDRSTRLEN) -+ count = INET6_ADDRSTRLEN - 1; -+ -+ if (copy_from_user(req, buf, count)) -+ return -EFAULT; -+ -+ if (strnchr(req, count, ':')) { -+ kr.family = AF_INET6; -+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL)) -+ return -EINVAL; -+ } else if (strnchr(req, count, '.')) { -+ kr.family = AF_INET; -+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL)) -+ return -EINVAL; -+ } -+ -+ nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0); -+ -+ return count; -+} -+ - static const struct file_operations ct_file_ops = { - .owner = THIS_MODULE, - .open = ct_open, - .read = seq_read, -+ .write = ct_file_write, - .llseek = seq_lseek, - .release = seq_release_net, - }; -@@ -405,7 +462,7 @@ static int nf_conntrack_standalone_init_ - kuid_t root_uid; - kgid_t root_gid; - -- pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops); -+ pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops); - if (!pde) - goto out_nf_conntrack; - diff --git a/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch deleted file mode 100644 index d3a6afa804..0000000000 --- a/target/linux/generic/pending-4.9/610-netfilter_match_bypass_default_checks.patch +++ /dev/null @@ -1,110 +0,0 @@ -From: Felix Fietkau -Subject: kernel: add a new version of my netfilter speedup patches for linux 2.6.39 and 3.0 - -Signed-off-by: Felix Fietkau ---- - include/uapi/linux/netfilter_ipv4/ip_tables.h | 1 + - net/ipv4/netfilter/ip_tables.c | 37 +++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+) - ---- a/include/uapi/linux/netfilter_ipv4/ip_tables.h -+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h -@@ -88,6 +88,7 @@ struct ipt_ip { - #define IPT_F_FRAG 0x01 /* Set if rule is a fragment rule */ - #define IPT_F_GOTO 0x02 /* Set if jump is a goto */ - #define IPT_F_MASK 0x03 /* All possible flag bits mask. */ -+#define IPT_F_NO_DEF_MATCH 0x80 /* Internal: no default match rules present */ - - /* Values for "inv" field in struct ipt_ip. */ - #define IPT_INV_VIA_IN 0x01 /* Invert the sense of IN IFACE. */ ---- a/net/ipv4/netfilter/ip_tables.c -+++ b/net/ipv4/netfilter/ip_tables.c -@@ -58,6 +58,9 @@ ip_packet_match(const struct iphdr *ip, - { - unsigned long ret; - -+ if (ipinfo->flags & IPT_F_NO_DEF_MATCH) -+ return true; -+ - if (NF_INVF(ipinfo, IPT_INV_SRCIP, - (ip->saddr & ipinfo->smsk.s_addr) != ipinfo->src.s_addr) || - NF_INVF(ipinfo, IPT_INV_DSTIP, -@@ -88,6 +91,29 @@ ip_packet_match(const struct iphdr *ip, - return true; - } - -+static void -+ip_checkdefault(struct ipt_ip *ip) -+{ -+ static const char iface_mask[IFNAMSIZ] = {}; -+ -+ if (ip->invflags || ip->flags & IPT_F_FRAG) -+ return; -+ -+ if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0) -+ return; -+ -+ if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0) -+ return; -+ -+ if (ip->smsk.s_addr || ip->dmsk.s_addr) -+ return; -+ -+ if (ip->proto) -+ return; -+ -+ ip->flags |= IPT_F_NO_DEF_MATCH; -+} -+ - static bool - ip_checkentry(const struct ipt_ip *ip) - { -@@ -550,6 +576,8 @@ find_check_entry(struct ipt_entry *e, st - struct xt_mtchk_param mtpar; - struct xt_entry_match *ematch; - -+ ip_checkdefault(&e->ip); -+ - if (!xt_percpu_counter_alloc(alloc_state, &e->counters)) - return -ENOMEM; - -@@ -830,6 +858,7 @@ copy_entries_to_user(unsigned int total_ - const struct xt_table_info *private = table->private; - int ret = 0; - const void *loc_cpu_entry; -+ u8 flags; - - counters = alloc_counters(table); - if (IS_ERR(counters)) -@@ -857,6 +886,14 @@ copy_entries_to_user(unsigned int total_ - goto free_counters; - } - -+ flags = e->ip.flags & IPT_F_MASK; -+ if (copy_to_user(userptr + off -+ + offsetof(struct ipt_entry, ip.flags), -+ &flags, sizeof(flags)) != 0) { -+ ret = -EFAULT; -+ goto free_counters; -+ } -+ - for (i = sizeof(struct ipt_entry); - i < e->target_offset; - i += m->u.match_size) { -@@ -1246,12 +1283,15 @@ compat_copy_entry_to_user(struct ipt_ent - compat_uint_t origsize; - const struct xt_entry_match *ematch; - int ret = 0; -+ u8 flags = e->ip.flags & IPT_F_MASK; - - origsize = *size; - ce = (struct compat_ipt_entry __user *)*dstptr; - if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 || - copy_to_user(&ce->counters, &counters[i], -- sizeof(counters[i])) != 0) -+ sizeof(counters[i])) != 0 || -+ copy_to_user(&ce->ip.flags, &flags, -+ sizeof(flags)) != 0) - return -EFAULT; - - *dstptr += sizeof(struct compat_ipt_entry); diff --git a/target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch deleted file mode 100644 index 12e4bd5c57..0000000000 --- a/target/linux/generic/pending-4.9/611-netfilter_match_bypass_default_table.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Felix Fietkau -Subject: netfilter: match bypass default table - -Signed-off-by: Felix Fietkau ---- - net/ipv4/netfilter/ip_tables.c | 79 +++++++++++++++++++++++++++++++----------- - 1 file changed, 58 insertions(+), 21 deletions(-) - ---- a/net/ipv4/netfilter/ip_tables.c -+++ b/net/ipv4/netfilter/ip_tables.c -@@ -254,6 +254,33 @@ struct ipt_entry *ipt_next_entry(const s - return (void *)entry + entry->next_offset; - } - -+static bool -+ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict) -+{ -+ struct xt_entry_target *t; -+ struct xt_standard_target *st; -+ -+ if (e->target_offset != sizeof(struct ipt_entry)) -+ return false; -+ -+ if (!(e->ip.flags & IPT_F_NO_DEF_MATCH)) -+ return false; -+ -+ t = ipt_get_target(e); -+ if (t->u.kernel.target->target) -+ return false; -+ -+ st = (struct xt_standard_target *) t; -+ if (st->verdict == XT_RETURN) -+ return false; -+ -+ if (st->verdict >= 0) -+ return false; -+ -+ *verdict = (unsigned)(-st->verdict) - 1; -+ return true; -+} -+ - /* Returns one of the generic firewall policies, like NF_ACCEPT. */ - unsigned int - ipt_do_table(struct sk_buff *skb, -@@ -274,28 +301,8 @@ ipt_do_table(struct sk_buff *skb, - unsigned int addend; - - /* Initialization */ -- stackidx = 0; -- ip = ip_hdr(skb); -- indev = state->in ? state->in->name : nulldevname; -- outdev = state->out ? state->out->name : nulldevname; -- /* We handle fragments by dealing with the first fragment as -- * if it was a normal packet. All other fragments are treated -- * normally, except that they will NEVER match rules that ask -- * things we don't know, ie. tcp syn flag or ports). If the -- * rule is also a fragment-specific rule, non-fragments won't -- * match it. */ -- acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET; -- acpar.thoff = ip_hdrlen(skb); -- acpar.hotdrop = false; -- acpar.net = state->net; -- acpar.in = state->in; -- acpar.out = state->out; -- acpar.family = NFPROTO_IPV4; -- acpar.hooknum = hook; -- - IP_NF_ASSERT(table->valid_hooks & (1 << hook)); - local_bh_disable(); -- addend = xt_write_recseq_begin(); - private = table->private; - cpu = smp_processor_id(); - /* -@@ -304,6 +311,23 @@ ipt_do_table(struct sk_buff *skb, - */ - smp_read_barrier_depends(); - table_base = private->entries; -+ -+ e = get_entry(table_base, private->hook_entry[hook]); -+ if (ipt_handle_default_rule(e, &verdict)) { -+ struct xt_counters *counter; -+ -+ counter = xt_get_this_cpu_counter(&e->counters); -+ ADD_COUNTER(*counter, skb->len, 1); -+ local_bh_enable(); -+ return verdict; -+ } -+ -+ stackidx = 0; -+ ip = ip_hdr(skb); -+ indev = state->in ? state->in->name : nulldevname; -+ outdev = state->out ? state->out->name : nulldevname; -+ -+ addend = xt_write_recseq_begin(); - jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; - - /* Switch to alternate jumpstack if we're being invoked via TEE. -@@ -316,7 +340,20 @@ ipt_do_table(struct sk_buff *skb, - if (static_key_false(&xt_tee_enabled)) - jumpstack += private->stacksize * __this_cpu_read(nf_skb_duplicated); - -- e = get_entry(table_base, private->hook_entry[hook]); -+ /* We handle fragments by dealing with the first fragment as -+ * if it was a normal packet. All other fragments are treated -+ * normally, except that they will NEVER match rules that ask -+ * things we don't know, ie. tcp syn flag or ports). If the -+ * rule is also a fragment-specific rule, non-fragments won't -+ * match it. */ -+ acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET; -+ acpar.thoff = ip_hdrlen(skb); -+ acpar.hotdrop = false; -+ acpar.net = state->net; -+ acpar.in = state->in; -+ acpar.out = state->out; -+ acpar.family = NFPROTO_IPV4; -+ acpar.hooknum = hook; - - do { - const struct xt_entry_target *t; diff --git a/target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch b/target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch deleted file mode 100644 index c6c5172d2f..0000000000 --- a/target/linux/generic/pending-4.9/612-netfilter_match_reduce_memory_access.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Felix Fietkau -Subject: netfilter: reduce match memory access - -Signed-off-by: Felix Fietkau ---- - net/ipv4/netfilter/ip_tables.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/net/ipv4/netfilter/ip_tables.c -+++ b/net/ipv4/netfilter/ip_tables.c -@@ -61,9 +61,9 @@ ip_packet_match(const struct iphdr *ip, - if (ipinfo->flags & IPT_F_NO_DEF_MATCH) - return true; - -- if (NF_INVF(ipinfo, IPT_INV_SRCIP, -+ if (NF_INVF(ipinfo, IPT_INV_SRCIP, ipinfo->smsk.s_addr && - (ip->saddr & ipinfo->smsk.s_addr) != ipinfo->src.s_addr) || -- NF_INVF(ipinfo, IPT_INV_DSTIP, -+ NF_INVF(ipinfo, IPT_INV_DSTIP, ipinfo->dmsk.s_addr && - (ip->daddr & ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr)) - return false; - diff --git a/target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch deleted file mode 100644 index 78a9617762..0000000000 --- a/target/linux/generic/pending-4.9/613-netfilter_optional_tcp_window_check.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Felix Fietkau -Subject: netfilter: optional tcp window check - -Signed-off-by: Felix Fietkau ---- - net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/net/netfilter/nf_conntrack_proto_tcp.c -+++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -33,6 +33,9 @@ - #include - #include - -+/* Do not check the TCP window for incoming packets */ -+static int nf_ct_tcp_no_window_check __read_mostly = 1; -+ - /* "Be conservative in what you do, - be liberal in what you accept from others." - If it's non-zero, we mark only out of window RST segments as INVALID. */ -@@ -513,6 +516,9 @@ static bool tcp_in_window(const struct n - s32 receiver_offset; - bool res, in_recv_win; - -+ if (nf_ct_tcp_no_window_check) -+ return true; -+ - /* - * Get the required data from the packet. - */ -@@ -1479,6 +1485,13 @@ static struct ctl_table tcp_sysctl_table - .mode = 0644, - .proc_handler = proc_dointvec, - }, -+ { -+ .procname = "nf_conntrack_tcp_no_window_check", -+ .data = &nf_ct_tcp_no_window_check, -+ .maxlen = sizeof(unsigned int), -+ .mode = 0644, -+ .proc_handler = proc_dointvec, -+ }, - { } - }; - #endif /* CONFIG_SYSCTL */ diff --git a/target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch b/target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch deleted file mode 100644 index a147f5f94f..0000000000 --- a/target/linux/generic/pending-4.9/616-net_optimize_xfrm_calls.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Felix Fietkau -Subject: kernel: add a small xfrm related performance optimization - -Signed-off-by: Felix Fietkau ---- - net/netfilter/nf_nat_core.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/net/netfilter/nf_nat_core.c -+++ b/net/netfilter/nf_nat_core.c -@@ -93,6 +93,9 @@ int nf_xfrm_me_harder(struct net *net, s - struct dst_entry *dst; - int err; - -+ if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT]) -+ return 0; -+ - err = xfrm_decode_session(skb, &fl, family); - if (err < 0) - return err; diff --git a/target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch b/target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch deleted file mode 100644 index 6fe863a9e5..0000000000 --- a/target/linux/generic/pending-4.9/620-net_sched-codel-do-not-defer-queue-length-update.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Konstantin Khlebnikov -Date: Mon, 21 Aug 2017 11:14:14 +0300 -Subject: [PATCH] net_sched/codel: do not defer queue length update - -When codel wants to drop last packet in ->dequeue() it cannot call -qdisc_tree_reduce_backlog() right away - it will notify parent qdisc -about zero qlen and HTB/HFSC will deactivate class. The same class will -be deactivated second time by caller of ->dequeue(). Currently codel and -fq_codel defer update. This triggers warning in HFSC when it's qlen != 0 -but there is no active classes. - -This patch update parent queue length immediately: just temporary increase -qlen around qdisc_tree_reduce_backlog() to prevent first class deactivation -if we have skb to return. - -This might open another problem in HFSC - now operation peek could fail and -deactivate parent class. - -Signed-off-by: Konstantin Khlebnikov -Link: https://bugzilla.kernel.org/show_bug.cgi?id=109581 ---- - ---- a/net/sched/sch_codel.c -+++ b/net/sched/sch_codel.c -@@ -95,11 +95,17 @@ static struct sk_buff *codel_qdisc_deque - &q->stats, qdisc_pkt_len, codel_get_enqueue_time, - drop_func, dequeue_func); - -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -+ /* If our qlen is 0 qdisc_tree_reduce_backlog() will deactivate -+ * parent class, dequeue in parent qdisc will do the same if we -+ * return skb. Temporary increment qlen if we have skb. - */ -- if (q->stats.drop_count && sch->q.qlen) { -- qdisc_tree_reduce_backlog(sch, q->stats.drop_count, q->stats.drop_len); -+ if (q->stats.drop_count) { -+ if (skb) -+ sch->q.qlen++; -+ qdisc_tree_reduce_backlog(sch, q->stats.drop_count, -+ q->stats.drop_len); -+ if (skb) -+ sch->q.qlen--; - q->stats.drop_count = 0; - q->stats.drop_len = 0; - } ---- a/net/sched/sch_fq_codel.c -+++ b/net/sched/sch_fq_codel.c -@@ -318,6 +318,21 @@ begin: - flow->dropped += q->cstats.drop_count - prev_drop_count; - flow->dropped += q->cstats.ecn_mark - prev_ecn_mark; - -+ /* If our qlen is 0 qdisc_tree_reduce_backlog() will deactivate -+ * parent class, dequeue in parent qdisc will do the same if we -+ * return skb. Temporary increment qlen if we have skb. -+ */ -+ if (q->cstats.drop_count) { -+ if (skb) -+ sch->q.qlen++; -+ qdisc_tree_reduce_backlog(sch, q->cstats.drop_count, -+ q->cstats.drop_len); -+ if (skb) -+ sch->q.qlen--; -+ q->cstats.drop_count = 0; -+ q->cstats.drop_len = 0; -+ } -+ - if (!skb) { - /* force a pass through old_flows to prevent starvation */ - if ((head == &q->new_flows) && !list_empty(&q->old_flows)) -@@ -328,15 +343,6 @@ begin: - } - qdisc_bstats_update(sch, skb); - flow->deficit -= qdisc_pkt_len(skb); -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->cstats.drop_count && sch->q.qlen) { -- qdisc_tree_reduce_backlog(sch, q->cstats.drop_count, -- q->cstats.drop_len); -- q->cstats.drop_count = 0; -- q->cstats.drop_len = 0; -- } - return skb; - } - diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch deleted file mode 100644 index e89bf0cfaa..0000000000 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ /dev/null @@ -1,138 +0,0 @@ -From: Felix Fietkau -Subject: net: add an optimization for dealing with raw sockets - -lede-commit: 4898039703d7315f0f3431c860123338ec3be0f6 -Signed-off-by: Felix Fietkau ---- - include/uapi/linux/if_packet.h | 3 +++ - net/packet/af_packet.c | 34 +++++++++++++++++++++++++++------- - net/packet/internal.h | 1 + - 3 files changed, 31 insertions(+), 7 deletions(-) - ---- a/include/uapi/linux/if_packet.h -+++ b/include/uapi/linux/if_packet.h -@@ -31,6 +31,8 @@ struct sockaddr_ll { - #define PACKET_KERNEL 7 /* To kernel space */ - /* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */ - #define PACKET_FASTROUTE 6 /* Fastrouted frame */ -+#define PACKET_MASK_ANY 0xffffffff /* mask for packet type bits */ -+ - - /* Packet socket options */ - -@@ -56,6 +58,7 @@ struct sockaddr_ll { - #define PACKET_QDISC_BYPASS 20 - #define PACKET_ROLLOVER_STATS 21 - #define PACKET_FANOUT_DATA 22 -+#define PACKET_RECV_TYPE 23 - - #define PACKET_FANOUT_HASH 0 - #define PACKET_FANOUT_LB 1 ---- a/net/packet/af_packet.c -+++ b/net/packet/af_packet.c -@@ -1781,6 +1781,7 @@ static int packet_rcv_spkt(struct sk_buf - { - struct sock *sk; - struct sockaddr_pkt *spkt; -+ struct packet_sock *po; - - /* - * When we registered the protocol we saved the socket in the data -@@ -1788,6 +1789,7 @@ static int packet_rcv_spkt(struct sk_buf - */ - - sk = pt->af_packet_priv; -+ po = pkt_sk(sk); - - /* - * Yank back the headers [hope the device set this -@@ -1800,7 +1802,7 @@ static int packet_rcv_spkt(struct sk_buf - * so that this procedure is noop. - */ - -- if (skb->pkt_type == PACKET_LOOPBACK) -+ if (!(po->pkt_type & (1 << skb->pkt_type))) - goto out; - - if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2038,12 +2040,12 @@ static int packet_rcv(struct sk_buff *sk - unsigned int snaplen, res; - bool is_drop_n_account = false; - -- if (skb->pkt_type == PACKET_LOOPBACK) -- goto drop; -- - sk = pt->af_packet_priv; - po = pkt_sk(sk); - -+ if (!(po->pkt_type & (1 << skb->pkt_type))) -+ goto drop; -+ - if (!net_eq(dev_net(dev), sock_net(sk))) - goto drop; - -@@ -2169,12 +2171,12 @@ static int tpacket_rcv(struct sk_buff *s - BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); - BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); - -- if (skb->pkt_type == PACKET_LOOPBACK) -- goto drop; -- - sk = pt->af_packet_priv; - po = pkt_sk(sk); - -+ if (!(po->pkt_type & (1 << skb->pkt_type))) -+ goto drop; -+ - if (!net_eq(dev_net(dev), sock_net(sk))) - goto drop; - -@@ -3292,6 +3294,7 @@ static int packet_create(struct net *net - mutex_init(&po->pg_vec_lock); - po->rollover = NULL; - po->prot_hook.func = packet_rcv; -+ po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK); - - if (sock->type == SOCK_PACKET) - po->prot_hook.func = packet_rcv_spkt; -@@ -3905,6 +3908,16 @@ packet_setsockopt(struct socket *sock, i - po->xmit = val ? packet_direct_xmit : dev_queue_xmit; - return 0; - } -+ case PACKET_RECV_TYPE: -+ { -+ unsigned int val; -+ if (optlen != sizeof(val)) -+ return -EINVAL; -+ if (copy_from_user(&val, optval, sizeof(val))) -+ return -EFAULT; -+ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); -+ return 0; -+ } - default: - return -ENOPROTOOPT; - } -@@ -3957,6 +3970,13 @@ static int packet_getsockopt(struct sock - case PACKET_VNET_HDR: - val = po->has_vnet_hdr; - break; -+ case PACKET_RECV_TYPE: -+ if (len > sizeof(unsigned int)) -+ len = sizeof(unsigned int); -+ val = po->pkt_type; -+ -+ data = &val; -+ break; - case PACKET_VERSION: - val = po->tp_version; - break; ---- a/net/packet/internal.h -+++ b/net/packet/internal.h -@@ -129,6 +129,7 @@ struct packet_sock { - struct net_device __rcu *cached_dev; - int (*xmit)(struct sk_buff *skb); - struct packet_type prot_hook ____cacheline_aligned_in_smp; -+ unsigned int pkt_type; - }; - - static struct packet_sock *pkt_sk(struct sock *sk) diff --git a/target/linux/generic/pending-4.9/655-increase_skb_pad.patch b/target/linux/generic/pending-4.9/655-increase_skb_pad.patch deleted file mode 100644 index 87f9bb6a95..0000000000 --- a/target/linux/generic/pending-4.9/655-increase_skb_pad.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Felix Fietkau -Subject: kernel: add a few patches for avoiding unnecessary skb reallocations - significantly improves ethernet<->wireless performance - -lede-commit: 6f89cffc9add6939d44a6b54cf9a5e77849aa7fd -Signed-off-by: Felix Fietkau ---- - include/linux/skbuff.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -2304,7 +2304,7 @@ static inline int pskb_network_may_pull( - * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) - */ - #ifndef NET_SKB_PAD --#define NET_SKB_PAD max(32, L1_CACHE_BYTES) -+#define NET_SKB_PAD max(64, L1_CACHE_BYTES) - #endif - - int ___pskb_trim(struct sk_buff *skb, unsigned int len); diff --git a/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch deleted file mode 100644 index 9979c22fc3..0000000000 --- a/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ /dev/null @@ -1,500 +0,0 @@ -From: Steven Barth -Subject: Add support for MAP-E FMRs (mesh mode) - -MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication -between MAP CEs (mesh mode) without the need to forward such data to a -border relay. This is similar to how 6rd works but for IPv4 over IPv6. - -Signed-off-by: Steven Barth ---- - include/net/ip6_tunnel.h | 13 ++ - include/uapi/linux/if_tunnel.h | 13 ++ - net/ipv6/ip6_tunnel.c | 276 +++++++++++++++++++++++++++++++++++++++-- - 3 files changed, 291 insertions(+), 11 deletions(-) - ---- a/include/net/ip6_tunnel.h -+++ b/include/net/ip6_tunnel.h -@@ -17,6 +17,18 @@ - /* determine capability on a per-packet basis */ - #define IP6_TNL_F_CAP_PER_PACKET 0x40000 - -+/* IPv6 tunnel FMR */ -+struct __ip6_tnl_fmr { -+ struct __ip6_tnl_fmr *next; /* next fmr in list */ -+ struct in6_addr ip6_prefix; -+ struct in_addr ip4_prefix; -+ -+ __u8 ip6_prefix_len; -+ __u8 ip4_prefix_len; -+ __u8 ea_len; -+ __u8 offset; -+}; -+ - struct __ip6_tnl_parm { - char name[IFNAMSIZ]; /* name of tunnel device */ - int link; /* ifindex of underlying L2 interface */ -@@ -28,6 +40,7 @@ struct __ip6_tnl_parm { - __u32 flags; /* tunnel flags */ - struct in6_addr laddr; /* local tunnel end-point address */ - struct in6_addr raddr; /* remote tunnel end-point address */ -+ struct __ip6_tnl_fmr *fmrs; /* FMRs */ - - __be16 i_flags; - __be16 o_flags; ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -75,10 +75,23 @@ enum { - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, - IFLA_IPTUN_COLLECT_METADATA, -+ IFLA_IPTUN_FMRS, - __IFLA_IPTUN_MAX, - }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) - -+enum { -+ IFLA_IPTUN_FMR_UNSPEC, -+ IFLA_IPTUN_FMR_IP6_PREFIX, -+ IFLA_IPTUN_FMR_IP4_PREFIX, -+ IFLA_IPTUN_FMR_IP6_PREFIX_LEN, -+ IFLA_IPTUN_FMR_IP4_PREFIX_LEN, -+ IFLA_IPTUN_FMR_EA_LEN, -+ IFLA_IPTUN_FMR_OFFSET, -+ __IFLA_IPTUN_FMR_MAX, -+}; -+#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1) -+ - enum tunnel_encap_types { - TUNNEL_ENCAP_NONE, - TUNNEL_ENCAP_FOU, ---- a/net/ipv6/ip6_tunnel.c -+++ b/net/ipv6/ip6_tunnel.c -@@ -16,6 +16,8 @@ - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * -+ * Changes: -+ * Steven Barth : MAP-E FMR support - */ - - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -@@ -72,9 +74,9 @@ static bool log_ecn_error = true; - module_param(log_ecn_error, bool, 0644); - MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); - --static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2) -+static u32 HASH(const struct in6_addr *addr) - { -- u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2); -+ u32 hash = ipv6_addr_hash(addr); - - return hash_32(hash, IP6_TUNNEL_HASH_SIZE_SHIFT); - } -@@ -141,20 +143,29 @@ static struct net_device_stats *ip6_get_ - static struct ip6_tnl * - ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local) - { -- unsigned int hash = HASH(remote, local); -+ unsigned int hash = HASH(local); - struct ip6_tnl *t; - struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); - struct in6_addr any; -+ struct __ip6_tnl_fmr *fmr; - - for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) { -- if (ipv6_addr_equal(local, &t->parms.laddr) && -- ipv6_addr_equal(remote, &t->parms.raddr) && -- (t->dev->flags & IFF_UP)) -+ if (!ipv6_addr_equal(local, &t->parms.laddr) || -+ !(t->dev->flags & IFF_UP)) -+ continue; -+ -+ if (ipv6_addr_equal(remote, &t->parms.raddr)) - return t; -+ -+ for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { -+ if (ipv6_prefix_equal(remote, &fmr->ip6_prefix, -+ fmr->ip6_prefix_len)) -+ return t; -+ } - } - - memset(&any, 0, sizeof(any)); -- hash = HASH(&any, local); -+ hash = HASH(local); - for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) { - if (ipv6_addr_equal(local, &t->parms.laddr) && - ipv6_addr_any(&t->parms.raddr) && -@@ -162,7 +173,7 @@ ip6_tnl_lookup(struct net *net, const st - return t; - } - -- hash = HASH(remote, &any); -+ hash = HASH(&any); - for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) { - if (ipv6_addr_equal(remote, &t->parms.raddr) && - ipv6_addr_any(&t->parms.laddr) && -@@ -202,7 +213,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, - - if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) { - prio = 1; -- h = HASH(remote, local); -+ h = HASH(local); - } - return &ip6n->tnls[prio][h]; - } -@@ -384,6 +395,12 @@ ip6_tnl_dev_uninit(struct net_device *de - struct net *net = t->net; - struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); - -+ while (t->parms.fmrs) { -+ struct __ip6_tnl_fmr *next = t->parms.fmrs->next; -+ kfree(t->parms.fmrs); -+ t->parms.fmrs = next; -+ } -+ - if (dev == ip6n->fb_tnl_dev) - RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL); - else -@@ -780,6 +797,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t, - } - EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl); - -+/** -+ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR -+ * @dest: destination IPv6 address buffer -+ * @skb: received socket buffer -+ * @fmr: MAP FMR -+ * @xmit: Calculate for xmit or rcv -+ **/ -+static void ip4ip6_fmr_calc(struct in6_addr *dest, -+ const struct iphdr *iph, const uint8_t *end, -+ const struct __ip6_tnl_fmr *fmr, bool xmit) -+{ -+ int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len); -+ u8 *portp = NULL; -+ bool use_dest_addr; -+ const struct iphdr *dsth = iph; -+ -+ if ((u8*)dsth >= end) -+ return; -+ -+ /* find significant IP header */ -+ if (iph->protocol == IPPROTO_ICMP) { -+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); -+ if (ih && ((u8*)&ih[1]) <= end && ( -+ ih->type == ICMP_DEST_UNREACH || -+ ih->type == ICMP_SOURCE_QUENCH || -+ ih->type == ICMP_TIME_EXCEEDED || -+ ih->type == ICMP_PARAMETERPROB || -+ ih->type == ICMP_REDIRECT)) -+ dsth = (const struct iphdr*)&ih[1]; -+ } -+ -+ /* in xmit-path use dest port by default and source port only if -+ this is an ICMP reply to something else; vice versa in rcv-path */ -+ use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph); -+ -+ /* get dst port */ -+ if (((u8*)&dsth[1]) <= end && ( -+ dsth->protocol == IPPROTO_UDP || -+ dsth->protocol == IPPROTO_TCP || -+ dsth->protocol == IPPROTO_SCTP || -+ dsth->protocol == IPPROTO_DCCP)) { -+ /* for UDP, TCP, SCTP and DCCP source and dest port -+ follow IPv4 header directly */ -+ portp = ((u8*)dsth) + dsth->ihl * 4; -+ -+ if (use_dest_addr) -+ portp += sizeof(u16); -+ } else if (iph->protocol == IPPROTO_ICMP) { -+ struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); -+ -+ /* use icmp identifier as port */ -+ if (((u8*)&ih) <= end && ( -+ (use_dest_addr && ( -+ ih->type == ICMP_ECHOREPLY || -+ ih->type == ICMP_TIMESTAMPREPLY || -+ ih->type == ICMP_INFO_REPLY || -+ ih->type == ICMP_ADDRESSREPLY)) || -+ (!use_dest_addr && ( -+ ih->type == ICMP_ECHO || -+ ih->type == ICMP_TIMESTAMP || -+ ih->type == ICMP_INFO_REQUEST || -+ ih->type == ICMP_ADDRESS) -+ ))) -+ portp = (u8*)&ih->un.echo.id; -+ } -+ -+ if ((portp && &portp[2] <= end) || psidlen == 0) { -+ int frombyte = fmr->ip6_prefix_len / 8; -+ int fromrem = fmr->ip6_prefix_len % 8; -+ int bytes = sizeof(struct in6_addr) - frombyte; -+ const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr; -+ u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len); -+ u64 t = 0; -+ -+ /* extract PSID from port and add it to eabits */ -+ u16 psidbits = 0; -+ if (psidlen > 0) { -+ psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]); -+ psidbits >>= 16 - psidlen - fmr->offset; -+ psidbits = (u16)(psidbits << (16 - psidlen)); -+ eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen)); -+ } -+ -+ /* rewrite destination address */ -+ *dest = fmr->ip6_prefix; -+ memcpy(&dest->s6_addr[10], addr, sizeof(*addr)); -+ dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen)); -+ -+ if (bytes > sizeof(u64)) -+ bytes = sizeof(u64); -+ -+ /* insert eabits */ -+ memcpy(&t, &dest->s6_addr[frombyte], bytes); -+ t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1) -+ << (64 - fmr->ea_len - fromrem)); -+ t = cpu_to_be64(t | (eabits >> fromrem)); -+ memcpy(&dest->s6_addr[frombyte], &t, bytes); -+ } -+} -+ -+ - static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb, - const struct tnl_ptk_info *tpi, - struct metadata_dst *tun_dst, -@@ -832,6 +950,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl - skb_reset_network_header(skb); - memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); - -+ if (tpi->proto == htons(ETH_P_IP) && tunnel->parms.fmrs && -+ !ipv6_addr_equal(&ipv6h->saddr, &tunnel->parms.raddr)) { -+ /* Packet didn't come from BR, so lookup FMR */ -+ struct __ip6_tnl_fmr *fmr; -+ struct in6_addr expected = tunnel->parms.raddr; -+ for (fmr = tunnel->parms.fmrs; fmr; fmr = fmr->next) -+ if (ipv6_prefix_equal(&ipv6h->saddr, -+ &fmr->ip6_prefix, fmr->ip6_prefix_len)) -+ break; -+ -+ /* Check that IPv6 matches IPv4 source to prevent spoofing */ -+ if (fmr) -+ ip4ip6_fmr_calc(&expected, ip_hdr(skb), -+ skb_tail_pointer(skb), fmr, false); -+ -+ if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) { -+ rcu_read_unlock(); -+ goto drop; -+ } -+ } -+ - __skb_tunnel_rx(skb, tunnel->dev, tunnel->net); - - err = dscp_ecn_decapsulate(tunnel, ipv6h, skb); -@@ -962,6 +1101,7 @@ static void init_tel_txopt(struct ipv6_t - opt->ops.opt_nflen = 8; - } - -+ - /** - * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own - * @t: the outgoing tunnel device -@@ -1300,6 +1440,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str - { - struct ip6_tnl *t = netdev_priv(dev); - struct ipv6hdr *ipv6h; -+ struct __ip6_tnl_fmr *fmr; - int encap_limit = -1; - __u16 offset; - struct flowi6 fl6; -@@ -1364,6 +1505,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str - - dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h)); - -+ /* try to find matching FMR */ -+ for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { -+ unsigned mshift = 32 - fmr->ip4_prefix_len; -+ if (ntohl(fmr->ip4_prefix.s_addr) >> mshift == -+ ntohl(ip_hdr(skb)->daddr) >> mshift) -+ break; -+ } -+ -+ /* change dstaddr according to FMR */ -+ if (fmr) -+ ip4ip6_fmr_calc(&fl6.daddr, ip_hdr(skb), skb_tail_pointer(skb), fmr, true); -+ - if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) - return -1; - -@@ -1489,6 +1642,14 @@ ip6_tnl_change(struct ip6_tnl *t, const - t->parms.flowinfo = p->flowinfo; - t->parms.link = p->link; - t->parms.proto = p->proto; -+ -+ while (t->parms.fmrs) { -+ struct __ip6_tnl_fmr *next = t->parms.fmrs->next; -+ kfree(t->parms.fmrs); -+ t->parms.fmrs = next; -+ } -+ t->parms.fmrs = p->fmrs; -+ - dst_cache_reset(&t->dst_cache); - ip6_tnl_link_config(t); - return 0; -@@ -1527,6 +1688,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ - p->flowinfo = u->flowinfo; - p->link = u->link; - p->proto = u->proto; -+ p->fmrs = NULL; - memcpy(p->name, u->name, sizeof(u->name)); - } - -@@ -1904,6 +2066,15 @@ static int ip6_tnl_validate(struct nlatt - return 0; - } - -+static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = { -+ [IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) }, -+ [IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) }, -+ [IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 }, -+ [IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 }, -+ [IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 }, -+ [IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 } -+}; -+ - static void ip6_tnl_netlink_parms(struct nlattr *data[], - struct __ip6_tnl_parm *parms) - { -@@ -1938,6 +2109,46 @@ static void ip6_tnl_netlink_parms(struct - - if (data[IFLA_IPTUN_COLLECT_METADATA]) - parms->collect_md = true; -+ -+ if (data[IFLA_IPTUN_FMRS]) { -+ unsigned rem; -+ struct nlattr *fmr; -+ nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) { -+ struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c; -+ struct __ip6_tnl_fmr *nfmr; -+ -+ nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX, -+ fmr, ip6_tnl_fmr_policy); -+ -+ if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL))) -+ continue; -+ -+ nfmr->offset = 6; -+ -+ if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX])) -+ nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX], -+ sizeof(nfmr->ip6_prefix)); -+ -+ if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX])) -+ nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX], -+ sizeof(nfmr->ip4_prefix)); -+ -+ if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN])) -+ nfmr->ip6_prefix_len = nla_get_u8(c); -+ -+ if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN])) -+ nfmr->ip4_prefix_len = nla_get_u8(c); -+ -+ if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN])) -+ nfmr->ea_len = nla_get_u8(c); -+ -+ if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET])) -+ nfmr->offset = nla_get_u8(c); -+ -+ nfmr->next = parms->fmrs; -+ parms->fmrs = nfmr; -+ } -+ } - } - - static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[], -@@ -2051,6 +2262,12 @@ static void ip6_tnl_dellink(struct net_d - - static size_t ip6_tnl_get_size(const struct net_device *dev) - { -+ const struct ip6_tnl *t = netdev_priv(dev); -+ struct __ip6_tnl_fmr *c; -+ int fmrs = 0; -+ for (c = t->parms.fmrs; c; c = c->next) -+ ++fmrs; -+ - return - /* IFLA_IPTUN_LINK */ - nla_total_size(4) + -@@ -2078,6 +2295,24 @@ static size_t ip6_tnl_get_size(const str - nla_total_size(2) + - /* IFLA_IPTUN_COLLECT_METADATA */ - nla_total_size(0) + -+ /* IFLA_IPTUN_FMRS */ -+ nla_total_size(0) + -+ ( -+ /* nest */ -+ nla_total_size(0) + -+ /* IFLA_IPTUN_FMR_IP6_PREFIX */ -+ nla_total_size(sizeof(struct in6_addr)) + -+ /* IFLA_IPTUN_FMR_IP4_PREFIX */ -+ nla_total_size(sizeof(struct in_addr)) + -+ /* IFLA_IPTUN_FMR_EA_LEN */ -+ nla_total_size(1) + -+ /* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */ -+ nla_total_size(1) + -+ /* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */ -+ nla_total_size(1) + -+ /* IFLA_IPTUN_FMR_OFFSET */ -+ nla_total_size(1) -+ ) * fmrs + - 0; - } - -@@ -2085,6 +2320,9 @@ static int ip6_tnl_fill_info(struct sk_b - { - struct ip6_tnl *tunnel = netdev_priv(dev); - struct __ip6_tnl_parm *parm = &tunnel->parms; -+ struct __ip6_tnl_fmr *c; -+ int fmrcnt = 0; -+ struct nlattr *fmrs; - - if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || - nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || -@@ -2093,9 +2331,27 @@ static int ip6_tnl_fill_info(struct sk_b - nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) || - nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || - nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || -- nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto)) -+ nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || -+ !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS))) - goto nla_put_failure; - -+ for (c = parm->fmrs; c; c = c->next) { -+ struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt); -+ if (!fmr || -+ nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX, -+ sizeof(c->ip6_prefix), &c->ip6_prefix) || -+ nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX, -+ sizeof(c->ip4_prefix), &c->ip4_prefix) || -+ nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) || -+ nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) || -+ nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) || -+ nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset)) -+ goto nla_put_failure; -+ -+ nla_nest_end(skb, fmr); -+ } -+ nla_nest_end(skb, fmrs); -+ - if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || - nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || - nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || -@@ -2133,6 +2389,7 @@ static const struct nla_policy ip6_tnl_p - [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, -+ [IFLA_IPTUN_FMRS] = { .type = NLA_NESTED }, - }; - - static struct rtnl_link_ops ip6_link_ops __read_mostly = { diff --git a/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch deleted file mode 100644 index 3f6b406cf2..0000000000 --- a/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ /dev/null @@ -1,255 +0,0 @@ -From: Jonas Gorski -Subject: ipv6: allow rejecting with "source address failed policy" - -RFC6204 L-14 requires rejecting traffic from invalid addresses with -ICMPv6 Destination Unreachable, Code 5 (Source address failed ingress/ -egress policy) on the LAN side, so add an appropriate rule for that. - -Signed-off-by: Jonas Gorski ---- - include/net/netns/ipv6.h | 1 + - include/uapi/linux/fib_rules.h | 4 +++ - include/uapi/linux/rtnetlink.h | 1 + - net/ipv4/fib_semantics.c | 4 +++ - net/ipv4/fib_trie.c | 1 + - net/ipv4/ipmr.c | 1 + - net/ipv6/fib6_rules.c | 4 +++ - net/ipv6/ip6mr.c | 2 ++ - net/ipv6/route.c | 58 +++++++++++++++++++++++++++++++++++++++++- - 9 files changed, 75 insertions(+), 1 deletion(-) - ---- a/include/net/netns/ipv6.h -+++ b/include/net/netns/ipv6.h -@@ -66,6 +66,7 @@ struct netns_ipv6 { - unsigned long ip6_rt_last_gc; - #ifdef CONFIG_IPV6_MULTIPLE_TABLES - struct rt6_info *ip6_prohibit_entry; -+ struct rt6_info *ip6_policy_failed_entry; - struct rt6_info *ip6_blk_hole_entry; - struct fib6_table *fib6_local_tbl; - struct fib_rules_ops *fib6_rules_ops; ---- a/include/uapi/linux/fib_rules.h -+++ b/include/uapi/linux/fib_rules.h -@@ -66,6 +66,10 @@ enum { - FR_ACT_BLACKHOLE, /* Drop without notification */ - FR_ACT_UNREACHABLE, /* Drop with ENETUNREACH */ - FR_ACT_PROHIBIT, /* Drop with EACCES */ -+ FR_ACT_RES9, -+ FR_ACT_RES10, -+ FR_ACT_RES11, -+ FR_ACT_POLICY_FAILED, /* Drop with EACCES */ - __FR_ACT_MAX, - }; - ---- a/include/uapi/linux/rtnetlink.h -+++ b/include/uapi/linux/rtnetlink.h -@@ -215,6 +215,7 @@ enum { - RTN_THROW, /* Not in this table */ - RTN_NAT, /* Translate this address */ - RTN_XRESOLVE, /* Use external resolver */ -+ RTN_POLICY_FAILED, /* Failed ingress/egress policy */ - __RTN_MAX - }; - ---- a/net/ipv4/fib_semantics.c -+++ b/net/ipv4/fib_semantics.c -@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX - .error = -EINVAL, - .scope = RT_SCOPE_NOWHERE, - }, -+ [RTN_POLICY_FAILED] = { -+ .error = -EACCES, -+ .scope = RT_SCOPE_UNIVERSE, -+ }, - }; - - static void rt_fibinfo_free(struct rtable __rcu **rtp) ---- a/net/ipv4/fib_trie.c -+++ b/net/ipv4/fib_trie.c -@@ -2406,6 +2406,7 @@ static const char *const rtn_type_names[ - [RTN_THROW] = "THROW", - [RTN_NAT] = "NAT", - [RTN_XRESOLVE] = "XRESOLVE", -+ [RTN_POLICY_FAILED] = "POLICY_FAILED", - }; - - static inline const char *rtn_type(char *buf, size_t len, unsigned int t) ---- a/net/ipv4/ipmr.c -+++ b/net/ipv4/ipmr.c -@@ -159,6 +159,7 @@ static int ipmr_rule_action(struct fib_r - case FR_ACT_UNREACHABLE: - return -ENETUNREACH; - case FR_ACT_PROHIBIT: -+ case FR_ACT_POLICY_FAILED: - return -EACCES; - case FR_ACT_BLACKHOLE: - default: ---- a/net/ipv6/fib6_rules.c -+++ b/net/ipv6/fib6_rules.c -@@ -77,6 +77,10 @@ static int fib6_rule_action(struct fib_r - err = -EACCES; - rt = net->ipv6.ip6_prohibit_entry; - goto discard_pkt; -+ case FR_ACT_POLICY_FAILED: -+ err = -EACCES; -+ rt = net->ipv6.ip6_policy_failed_entry; -+ goto discard_pkt; - } - - tb_id = fib_rule_get_table(rule, arg); ---- a/net/ipv6/ip6mr.c -+++ b/net/ipv6/ip6mr.c -@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_ - return -ENETUNREACH; - case FR_ACT_PROHIBIT: - return -EACCES; -+ case FR_ACT_POLICY_FAILED: -+ return -EACCES; - case FR_ACT_BLACKHOLE: - default: - return -EINVAL; ---- a/net/ipv6/route.c -+++ b/net/ipv6/route.c -@@ -91,6 +91,8 @@ static int ip6_pkt_discard(struct sk_bu - static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb); - static int ip6_pkt_prohibit(struct sk_buff *skb); - static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb); -+static int ip6_pkt_policy_failed(struct sk_buff *skb); -+static int ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb); - static void ip6_link_failure(struct sk_buff *skb); - static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, - struct sk_buff *skb, u32 mtu); -@@ -300,6 +302,21 @@ static const struct rt6_info ip6_prohibi - .rt6i_ref = ATOMIC_INIT(1), - }; - -+static const struct rt6_info ip6_policy_failed_entry_template = { -+ .dst = { -+ .__refcnt = ATOMIC_INIT(1), -+ .__use = 1, -+ .obsolete = DST_OBSOLETE_FORCE_CHK, -+ .error = -EACCES, -+ .input = ip6_pkt_policy_failed, -+ .output = ip6_pkt_policy_failed_out, -+ }, -+ .rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP), -+ .rt6i_protocol = RTPROT_KERNEL, -+ .rt6i_metric = ~(u32) 0, -+ .rt6i_ref = ATOMIC_INIT(1), -+}; -+ - static const struct rt6_info ip6_blk_hole_entry_template = { - .dst = { - .__refcnt = ATOMIC_INIT(1), -@@ -1970,6 +1987,11 @@ static struct rt6_info *ip6_route_info_c - rt->dst.output = ip6_pkt_prohibit_out; - rt->dst.input = ip6_pkt_prohibit; - break; -+ case RTN_POLICY_FAILED: -+ rt->dst.error = -EACCES; -+ rt->dst.output = ip6_pkt_policy_failed_out; -+ rt->dst.input = ip6_pkt_policy_failed; -+ break; - case RTN_THROW: - case RTN_UNREACHABLE: - default: -@@ -2613,6 +2635,17 @@ static int ip6_pkt_prohibit_out(struct n - return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); - } - -+static int ip6_pkt_policy_failed(struct sk_buff *skb) -+{ -+ return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES); -+} -+ -+static int ip6_pkt_policy_failed_out(struct net *net, struct sock *sk, struct sk_buff *skb) -+{ -+ skb->dev = skb_dst(skb)->dev; -+ return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES); -+} -+ - /* - * Allocate a dst for local (unicast / anycast) address. - */ -@@ -2850,7 +2883,8 @@ static int rtm_to_fib6_config(struct sk_ - if (rtm->rtm_type == RTN_UNREACHABLE || - rtm->rtm_type == RTN_BLACKHOLE || - rtm->rtm_type == RTN_PROHIBIT || -- rtm->rtm_type == RTN_THROW) -+ rtm->rtm_type == RTN_THROW || -+ rtm->rtm_type == RTN_POLICY_FAILED) - cfg->fc_flags |= RTF_REJECT; - - if (rtm->rtm_type == RTN_LOCAL) -@@ -3222,6 +3256,9 @@ static int rt6_fill_node(struct net *net - case -EACCES: - rtm->rtm_type = RTN_PROHIBIT; - break; -+ case -EPERM: -+ rtm->rtm_type = RTN_POLICY_FAILED; -+ break; - case -EAGAIN: - rtm->rtm_type = RTN_THROW; - break; -@@ -3498,6 +3535,8 @@ static int ip6_route_dev_notify(struct n - #ifdef CONFIG_IPV6_MULTIPLE_TABLES - net->ipv6.ip6_prohibit_entry->dst.dev = dev; - net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); -+ net->ipv6.ip6_policy_failed_entry->dst.dev = dev; -+ net->ipv6.ip6_policy_failed_entry->rt6i_idev = in6_dev_get(dev); - net->ipv6.ip6_blk_hole_entry->dst.dev = dev; - net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); - #endif -@@ -3509,6 +3548,7 @@ static int ip6_route_dev_notify(struct n - in6_dev_put(net->ipv6.ip6_null_entry->rt6i_idev); - #ifdef CONFIG_IPV6_MULTIPLE_TABLES - in6_dev_put(net->ipv6.ip6_prohibit_entry->rt6i_idev); -+ in6_dev_put(net->ipv6.ip6_policy_failed_entry->rt6i_idev); - in6_dev_put(net->ipv6.ip6_blk_hole_entry->rt6i_idev); - #endif - } -@@ -3724,6 +3764,17 @@ static int __net_init ip6_route_net_init - net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; - dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, - ip6_template_metrics, true); -+ -+ net->ipv6.ip6_policy_failed_entry = -+ kmemdup(&ip6_policy_failed_entry_template, -+ sizeof(*net->ipv6.ip6_policy_failed_entry), GFP_KERNEL); -+ if (!net->ipv6.ip6_policy_failed_entry) -+ goto out_ip6_blk_hole_entry; -+ net->ipv6.ip6_policy_failed_entry->dst.path = -+ (struct dst_entry *)net->ipv6.ip6_policy_failed_entry; -+ net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops; -+ dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst, -+ ip6_template_metrics, true); - #endif - - net->ipv6.sysctl.flush_delay = 0; -@@ -3742,6 +3793,8 @@ out: - return ret; - - #ifdef CONFIG_IPV6_MULTIPLE_TABLES -+out_ip6_blk_hole_entry: -+ kfree(net->ipv6.ip6_blk_hole_entry); - out_ip6_prohibit_entry: - kfree(net->ipv6.ip6_prohibit_entry); - out_ip6_null_entry: -@@ -3759,6 +3812,7 @@ static void __net_exit ip6_route_net_exi - #ifdef CONFIG_IPV6_MULTIPLE_TABLES - kfree(net->ipv6.ip6_prohibit_entry); - kfree(net->ipv6.ip6_blk_hole_entry); -+ kfree(net->ipv6.ip6_policy_failed_entry); - #endif - dst_entries_destroy(&net->ipv6.ip6_dst_ops); - } -@@ -3832,6 +3886,9 @@ void __init ip6_route_init_special_entri - init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); - init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; - init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); -+ init_net.ipv6.ip6_policy_failed_entry->dst.dev = init_net.loopback_dev; -+ init_net.ipv6.ip6_policy_failed_entry->rt6i_idev = -+ in6_dev_get(init_net.loopback_dev); - #endif - } - diff --git a/target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch b/target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch deleted file mode 100644 index cd627667d3..0000000000 --- a/target/linux/generic/pending-4.9/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Jonas Gorski -Subject: net: provide defines for _POLICY_FAILED until all code is updated - -Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination -unreachable, conflicting with our name. - -Add appropriate defines to allow our code to build with the new -name until we have updated our local patches for older kernels -and userspace packages. - -Signed-off-by: Jonas Gorski ---- - include/uapi/linux/fib_rules.h | 2 ++ - include/uapi/linux/icmpv6.h | 2 ++ - include/uapi/linux/rtnetlink.h | 2 ++ - 3 files changed, 6 insertions(+) - ---- a/include/uapi/linux/fib_rules.h -+++ b/include/uapi/linux/fib_rules.h -@@ -73,6 +73,8 @@ enum { - __FR_ACT_MAX, - }; - -+#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED -+ - #define FR_ACT_MAX (__FR_ACT_MAX - 1) - - #endif ---- a/include/uapi/linux/icmpv6.h -+++ b/include/uapi/linux/icmpv6.h -@@ -118,6 +118,8 @@ struct icmp6hdr { - #define ICMPV6_POLICY_FAIL 5 - #define ICMPV6_REJECT_ROUTE 6 - -+#define ICMPV6_FAILED_POLICY ICMPV6_POLICY_FAIL -+ - /* - * Codes for Time Exceeded - */ ---- a/include/uapi/linux/rtnetlink.h -+++ b/include/uapi/linux/rtnetlink.h -@@ -219,6 +219,8 @@ enum { - __RTN_MAX - }; - -+#define RTN_FAILED_POLICY RTN_POLICY_FAILED -+ - #define RTN_MAX (__RTN_MAX - 1) - - diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch deleted file mode 100644 index e7e1a3a3bc..0000000000 --- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ /dev/null @@ -1,154 +0,0 @@ -From: Felix Fietkau -Subject: net: replace GRO optimization patch with a new one that supports VLANs/bridges with different MAC addresses - -Signed-off-by: Felix Fietkau ---- - include/linux/netdevice.h | 2 ++ - include/linux/skbuff.h | 3 ++- - net/core/dev.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ - net/ethernet/eth.c | 18 +++++++++++++++++- - 4 files changed, 69 insertions(+), 2 deletions(-) - ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -1757,6 +1757,8 @@ struct net_device { - struct netdev_hw_addr_list mc; - struct netdev_hw_addr_list dev_addrs; - -+ unsigned char local_addr_mask[MAX_ADDR_LEN]; -+ - #ifdef CONFIG_SYSFS - struct kset *queues_kset; - #endif ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -747,7 +747,8 @@ struct sk_buff { - #ifdef CONFIG_NET_SWITCHDEV - __u8 offload_fwd_mark:1; - #endif -- /* 2, 4 or 5 bit hole */ -+ __u8 gro_skip:1; -+ /* 1, 3 or 4 bit hole */ - - #ifdef CONFIG_NET_SCHED - __u16 tc_index; /* traffic control index */ ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -4572,6 +4572,9 @@ static enum gro_result dev_gro_receive(s - enum gro_result ret; - int grow; - -+ if (skb->gro_skip) -+ goto normal; -+ - if (!(skb->dev->features & NETIF_F_GRO)) - goto normal; - -@@ -5867,6 +5870,48 @@ static void __netdev_adjacent_dev_unlink - &upper_dev->adj_list.lower); - } - -+static void __netdev_addr_mask(unsigned char *mask, const unsigned char *addr, -+ struct net_device *dev) -+{ -+ int i; -+ -+ for (i = 0; i < dev->addr_len; i++) -+ mask[i] |= addr[i] ^ dev->dev_addr[i]; -+} -+ -+static void __netdev_upper_mask(unsigned char *mask, struct net_device *dev, -+ struct net_device *lower) -+{ -+ struct net_device *cur; -+ struct list_head *iter; -+ -+ netdev_for_each_upper_dev_rcu(dev, cur, iter) { -+ __netdev_addr_mask(mask, cur->dev_addr, lower); -+ __netdev_upper_mask(mask, cur, lower); -+ } -+} -+ -+static void __netdev_update_addr_mask(struct net_device *dev) -+{ -+ unsigned char mask[MAX_ADDR_LEN]; -+ struct net_device *cur; -+ struct list_head *iter; -+ -+ memset(mask, 0, sizeof(mask)); -+ __netdev_upper_mask(mask, dev, dev); -+ memcpy(dev->local_addr_mask, mask, dev->addr_len); -+ -+ netdev_for_each_lower_dev(dev, cur, iter) -+ __netdev_update_addr_mask(cur); -+} -+ -+static void netdev_update_addr_mask(struct net_device *dev) -+{ -+ rcu_read_lock(); -+ __netdev_update_addr_mask(dev); -+ rcu_read_unlock(); -+} -+ - static int __netdev_upper_dev_link(struct net_device *dev, - struct net_device *upper_dev, bool master, - void *upper_priv, void *upper_info) -@@ -5939,6 +5984,7 @@ static int __netdev_upper_dev_link(struc - goto rollback_lower_mesh; - } - -+ netdev_update_addr_mask(dev); - ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, - &changeupper_info.info); - ret = notifier_to_errno(ret); -@@ -6065,6 +6111,7 @@ void netdev_upper_dev_unlink(struct net_ - list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) - __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); - -+ netdev_update_addr_mask(dev); - call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, - &changeupper_info.info); - } -@@ -6668,6 +6715,7 @@ int dev_set_mac_address(struct net_devic - if (err) - return err; - dev->addr_assign_type = NET_ADDR_SET; -+ netdev_update_addr_mask(dev); - call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); - add_device_randomness(dev->dev_addr, dev->addr_len); - return 0; ---- a/net/ethernet/eth.c -+++ b/net/ethernet/eth.c -@@ -143,6 +143,18 @@ u32 eth_get_headlen(void *data, unsigned - } - EXPORT_SYMBOL(eth_get_headlen); - -+static inline bool -+eth_check_local_mask(const void *addr1, const void *addr2, const void *mask) -+{ -+ const u16 *a1 = addr1; -+ const u16 *a2 = addr2; -+ const u16 *m = mask; -+ -+ return (((a1[0] ^ a2[0]) & ~m[0]) | -+ ((a1[1] ^ a2[1]) & ~m[1]) | -+ ((a1[2] ^ a2[2]) & ~m[2])); -+} -+ - /** - * eth_type_trans - determine the packet's protocol ID. - * @skb: received socket data -@@ -171,8 +183,12 @@ __be16 eth_type_trans(struct sk_buff *sk - skb->pkt_type = PACKET_MULTICAST; - } - else if (unlikely(!ether_addr_equal_64bits(eth->h_dest, -- dev->dev_addr))) -+ dev->dev_addr))) { - skb->pkt_type = PACKET_OTHERHOST; -+ if (eth_check_local_mask(eth->h_dest, dev->dev_addr, -+ dev->local_addr_mask)) -+ skb->gro_skip = 1; -+ } - - /* - * Some variants of DSA tagging don't have an ethertype field diff --git a/target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch deleted file mode 100644 index b29b5f11b0..0000000000 --- a/target/linux/generic/pending-4.9/681-NET-add-of_get_mac_address_mtd.patch +++ /dev/null @@ -1,127 +0,0 @@ -From: John Crispin -Subject: NET: add mtd-mac-address support to of_get_mac_address() - -Many embedded devices have information such as mac addresses stored inside mtd -devices. This patch allows us to add a property inside a node describing a -network interface. The new property points at a mtd partition with an offset -where the mac address can be found. - -Signed-off-by: John Crispin -Signed-off-by: Felix Fietkau ---- - drivers/of/of_net.c | 37 +++++++++++++++++++++++++++++++++++++ - include/linux/of_net.h | 1 + - 2 files changed, 38 insertions(+) - ---- a/drivers/of/of_net.c -+++ b/drivers/of/of_net.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - /** - * of_get_phy_mode - Get phy mode for given device_node -@@ -38,7 +39,7 @@ int of_get_phy_mode(struct device_node * - } - EXPORT_SYMBOL_GPL(of_get_phy_mode); - --static const void *of_get_mac_addr(struct device_node *np, const char *name) -+static void *of_get_mac_addr(struct device_node *np, const char *name) - { - struct property *pp = of_find_property(np, name, NULL); - -@@ -47,6 +48,73 @@ static const void *of_get_mac_addr(struc - return NULL; - } - -+static const void *of_get_mac_address_mtd(struct device_node *np) -+{ -+#ifdef CONFIG_MTD -+ struct device_node *mtd_np = NULL; -+ struct property *prop; -+ size_t retlen; -+ int size, ret; -+ struct mtd_info *mtd; -+ const char *part; -+ const __be32 *list; -+ phandle phandle; -+ u32 mac_inc = 0; -+ u8 mac[ETH_ALEN]; -+ void *addr; -+ -+ list = of_get_property(np, "mtd-mac-address", &size); -+ if (!list || (size != (2 * sizeof(*list)))) -+ return NULL; -+ -+ phandle = be32_to_cpup(list++); -+ if (phandle) -+ mtd_np = of_find_node_by_phandle(phandle); -+ -+ if (!mtd_np) -+ return NULL; -+ -+ part = of_get_property(mtd_np, "label", NULL); -+ if (!part) -+ part = mtd_np->name; -+ -+ mtd = get_mtd_device_nm(part); -+ if (IS_ERR(mtd)) -+ return NULL; -+ -+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac); -+ put_mtd_device(mtd); -+ -+ if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc)) -+ mac[5] += mac_inc; -+ -+ if (!is_valid_ether_addr(mac)) -+ return NULL; -+ -+ addr = of_get_mac_addr(np, "mac-address"); -+ if (addr) { -+ memcpy(addr, mac, ETH_ALEN); -+ return addr; -+ } -+ -+ prop = kzalloc(sizeof(*prop), GFP_KERNEL); -+ if (!prop) -+ return NULL; -+ -+ prop->name = "mac-address"; -+ prop->length = ETH_ALEN; -+ prop->value = kmemdup(mac, ETH_ALEN, GFP_KERNEL); -+ if (!prop->value || of_add_property(np, prop)) -+ goto free; -+ -+ return prop->value; -+free: -+ kfree(prop->value); -+ kfree(prop); -+#endif -+ return NULL; -+} -+ - /** - * Search the device tree for the best MAC address to use. 'mac-address' is - * checked first, because that is supposed to contain to "most recent" MAC -@@ -64,11 +132,18 @@ static const void *of_get_mac_addr(struc - * addresses. Some older U-Boots only initialized 'local-mac-address'. In - * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists - * but is all zeros. -+ * -+ * If a mtd-mac-address property exists, try to fetch the MAC address from the -+ * specified mtd device, and store it as a 'mac-address' property - */ - const void *of_get_mac_address(struct device_node *np) - { - const void *addr; - -+ addr = of_get_mac_address_mtd(np); -+ if (addr) -+ return addr; -+ - addr = of_get_mac_addr(np, "mac-address"); - if (addr) - return addr; diff --git a/target/linux/generic/pending-4.9/701-phy_extension.patch b/target/linux/generic/pending-4.9/701-phy_extension.patch deleted file mode 100644 index 628e1d31b9..0000000000 --- a/target/linux/generic/pending-4.9/701-phy_extension.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: John Crispin -Subject: net: phy: add phy_ethtool_ioctl() - -Signed-off-by: John Crispin ---- - drivers/net/phy/phy.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ - include/linux/phy.h | 1 + - 2 files changed, 45 insertions(+) - ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -472,6 +472,50 @@ int phy_ethtool_ksettings_get(struct phy - } - EXPORT_SYMBOL(phy_ethtool_ksettings_get); - -+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr) -+{ -+ u32 cmd; -+ int tmp; -+ struct ethtool_cmd ecmd = { ETHTOOL_GSET }; -+ struct ethtool_value edata = { ETHTOOL_GLINK }; -+ -+ if (get_user(cmd, (u32 *) useraddr)) -+ return -EFAULT; -+ -+ switch (cmd) { -+ case ETHTOOL_GSET: -+ phy_ethtool_gset(phydev, &ecmd); -+ if (copy_to_user(useraddr, &ecmd, sizeof(ecmd))) -+ return -EFAULT; -+ return 0; -+ -+ case ETHTOOL_SSET: -+ if (copy_from_user(&ecmd, useraddr, sizeof(ecmd))) -+ return -EFAULT; -+ return phy_ethtool_sset(phydev, &ecmd); -+ -+ case ETHTOOL_NWAY_RST: -+ /* if autoneg is off, it's an error */ -+ tmp = phy_read(phydev, MII_BMCR); -+ if (tmp & BMCR_ANENABLE) { -+ tmp |= (BMCR_ANRESTART); -+ phy_write(phydev, MII_BMCR, tmp); -+ return 0; -+ } -+ return -EINVAL; -+ -+ case ETHTOOL_GLINK: -+ edata.data = (phy_read(phydev, -+ MII_BMSR) & BMSR_LSTATUS) ? 1 : 0; -+ if (copy_to_user(useraddr, &edata, sizeof(edata))) -+ return -EFAULT; -+ return 0; -+ } -+ -+ return -EOPNOTSUPP; -+} -+EXPORT_SYMBOL(phy_ethtool_ioctl); -+ - /** - * phy_mii_ioctl - generic PHY MII ioctl interface - * @phydev: the phy_device struct ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -827,6 +827,7 @@ int phy_ethtool_ksettings_get(struct phy - struct ethtool_link_ksettings *cmd); - int phy_ethtool_ksettings_set(struct phy_device *phydev, - const struct ethtool_link_ksettings *cmd); -+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr); - int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); - int phy_start_interrupts(struct phy_device *phydev); - void phy_print_status(struct phy_device *phydev); diff --git a/target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch deleted file mode 100644 index 28181d16f1..0000000000 --- a/target/linux/generic/pending-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Gabor Juhos -Subject: generic: add detach callback to struct phy_driver - -lede-commit: fe61fc2d7d0b3fb348b502f68f98243b3ddf5867 - -Signed-off-by: Gabor Juhos ---- - drivers/net/phy/phy_device.c | 3 +++ - include/linux/phy.h | 6 ++++++ - 2 files changed, 9 insertions(+) - ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -1004,6 +1004,9 @@ void phy_detach(struct phy_device *phyde - struct mii_bus *bus; - int i; - -+ if (phydev->drv && phydev->drv->detach) -+ phydev->drv->detach(phydev); -+ - phydev->attached_dev->phydev = NULL; - phydev->attached_dev = NULL; - phy_suspend(phydev); ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -507,6 +507,12 @@ struct phy_driver { - */ - int (*did_interrupt)(struct phy_device *phydev); - -+ /* -+ * Called before an ethernet device is detached -+ * from the PHY. -+ */ -+ void (*detach)(struct phy_device *phydev); -+ - /* Clears up any memory if needed */ - void (*remove)(struct phy_device *phydev); - diff --git a/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch deleted file mode 100644 index 69b21be951..0000000000 --- a/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Gabor Juhos -Subject: net: phy: allow to configure AR803x PHYs via platform data - -Add a patch for the at803x phy driver, in order to be able -to configure some register settings via platform data. - -Signed-off-by: Gabor Juhos ---- - drivers/net/phy/at803x.c | 56 ++++++++++++++++++++++++++++++++ - include/linux/platform_data/phy-at803x.h | 11 +++++++ - 2 files changed, 67 insertions(+) - create mode 100644 include/linux/platform_data/phy-at803x.h - ---- a/drivers/net/phy/at803x.c -+++ b/drivers/net/phy/at803x.c -@@ -12,12 +12,14 @@ - */ - - #include -+#include - #include - #include - #include - #include - #include - #include -+#include - - #define AT803X_INTR_ENABLE 0x12 - #define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15) -@@ -45,6 +47,11 @@ - #define AT803X_REG_CHIP_CONFIG 0x1f - #define AT803X_BT_BX_REG_SEL 0x8000 - -+#define AT803X_PCS_SMART_EEE_CTRL3 0x805D -+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3 -+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT 12 -+#define AT803X_SMART_EEE_CTRL3_LPI_EN BIT(8) -+ - #define AT803X_DEBUG_ADDR 0x1D - #define AT803X_DEBUG_DATA 0x1E - -@@ -72,6 +79,7 @@ MODULE_LICENSE("GPL"); - struct at803x_priv { - bool phy_reset:1; - struct gpio_desc *gpiod_reset; -+ int prev_speed; - }; - - struct at803x_context { -@@ -276,8 +284,16 @@ does_not_require_reset_workaround: - return 0; - } - -+static void at803x_disable_smarteee(struct phy_device *phydev) -+{ -+ phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3, -+ 1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT); -+ phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); -+} -+ - static int at803x_config_init(struct phy_device *phydev) - { -+ struct at803x_platform_data *pdata; - int ret; - - ret = genphy_config_init(phydev); -@@ -298,6 +314,26 @@ static int at803x_config_init(struct phy - return ret; - } - -+ pdata = dev_get_platdata(&phydev->mdio.dev); -+ if (pdata) { -+ if (pdata->disable_smarteee) -+ at803x_disable_smarteee(phydev); -+ -+ if (pdata->enable_rgmii_rx_delay) -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0, -+ AT803X_DEBUG_RX_CLK_DLY_EN); -+ else -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, -+ AT803X_DEBUG_RX_CLK_DLY_EN, 0); -+ -+ if (pdata->enable_rgmii_tx_delay) -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0, -+ AT803X_DEBUG_TX_CLK_DLY_EN); -+ else -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, -+ AT803X_DEBUG_TX_CLK_DLY_EN, 0); -+ } -+ - return 0; - } - -@@ -335,6 +371,8 @@ static int at803x_config_intr(struct phy - static void at803x_link_change_notify(struct phy_device *phydev) - { - struct at803x_priv *priv = phydev->priv; -+ struct at803x_platform_data *pdata; -+ pdata = dev_get_platdata(&phydev->mdio.dev); - - /* - * Conduct a hardware reset for AT8030/2 every time a link loss is -@@ -363,6 +401,24 @@ static void at803x_link_change_notify(st - } else { - priv->phy_reset = false; - } -+ if (pdata && pdata->fixup_rgmii_tx_delay && -+ phydev->speed != priv->prev_speed) { -+ switch (phydev->speed) { -+ case SPEED_10: -+ case SPEED_100: -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0, -+ AT803X_DEBUG_TX_CLK_DLY_EN); -+ break; -+ case SPEED_1000: -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, -+ AT803X_DEBUG_TX_CLK_DLY_EN, 0); -+ break; -+ default: -+ break; -+ } -+ -+ priv->prev_speed = phydev->speed; -+ } - } - - static int at803x_aneg_done(struct phy_device *phydev) ---- /dev/null -+++ b/include/linux/platform_data/phy-at803x.h -@@ -0,0 +1,11 @@ -+#ifndef _PHY_AT803X_PDATA_H -+#define _PHY_AT803X_PDATA_H -+ -+struct at803x_platform_data { -+ int disable_smarteee:1; -+ int enable_rgmii_tx_delay:1; -+ int enable_rgmii_rx_delay:1; -+ int fixup_rgmii_tx_delay:1; -+}; -+ -+#endif /* _PHY_AT803X_PDATA_H */ diff --git a/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch deleted file mode 100644 index 381b2d09fa..0000000000 --- a/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Roman Yeryomin -Subject: kernel: add at803x fix for sgmii mode - -Some (possibly broken) bootloaders incorreclty initialize at8033 -phy. This patch enables sgmii autonegotiation mode. - -[john@phrozen.org: felix added this to his upstream queue] - -Signed-off-by: Roman Yeryomin ---- - drivers/net/phy/at803x.c | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - ---- a/drivers/net/phy/at803x.c -+++ b/drivers/net/phy/at803x.c -@@ -46,6 +46,7 @@ - #define AT803X_FUNC_DATA 0x4003 - #define AT803X_REG_CHIP_CONFIG 0x1f - #define AT803X_BT_BX_REG_SEL 0x8000 -+#define AT803X_SGMII_ANEG_EN 0x1000 - - #define AT803X_PCS_SMART_EEE_CTRL3 0x805D - #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3 -@@ -295,6 +296,27 @@ static int at803x_config_init(struct phy - { - struct at803x_platform_data *pdata; - int ret; -+ u32 v; -+ -+ if (phydev->drv->phy_id == ATH8031_PHY_ID && -+ phydev->interface == PHY_INTERFACE_MODE_SGMII) -+ { -+ v = phy_read(phydev, AT803X_REG_CHIP_CONFIG); -+ /* select SGMII/fiber page */ -+ ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG, -+ v & ~AT803X_BT_BX_REG_SEL); -+ if (ret) -+ return ret; -+ /* enable SGMII autonegotiation */ -+ ret = phy_write(phydev, MII_BMCR, AT803X_SGMII_ANEG_EN); -+ if (ret) -+ return ret; -+ /* select copper page */ -+ ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG, -+ v | AT803X_BT_BX_REG_SEL); -+ if (ret) -+ return ret; -+ } - - ret = genphy_config_init(phydev); - if (ret < 0) diff --git a/target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch deleted file mode 100644 index 6130ac86a9..0000000000 --- a/target/linux/generic/pending-4.9/810-pci_disable_common_quirks.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Gabor Juhos -Subject: debloat: add kernel config option to disabling common PCI quirks - -Signed-off-by: Gabor Juhos ---- - drivers/pci/Kconfig | 6 ++++++ - drivers/pci/quirks.c | 6 ++++++ - 2 files changed, 12 insertions(+) - ---- a/drivers/pci/Kconfig -+++ b/drivers/pci/Kconfig -@@ -71,6 +71,12 @@ config XEN_PCIDEV_FRONTEND - The PCI device frontend driver allows the kernel to import arbitrary - PCI devices from a PCI backend to support PCI driver domains. - -+config PCI_DISABLE_COMMON_QUIRKS -+ bool "PCI disable common quirks" -+ depends on PCI -+ help -+ If you don't know what to do here, say N. -+ - config HT_IRQ - bool "Interrupts on hypertransport devices" - default y ---- a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c -@@ -41,6 +41,7 @@ static void quirk_mmio_always_on(struct - DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); - -+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS - /* The Mellanox Tavor device gives false positive parity errors - * Mark this device with a broken_parity_status, to allow - * PCI scanning code to "skip" this now blacklisted device. -@@ -3055,6 +3056,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); - -+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ - - /* - * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To -@@ -3111,6 +3113,8 @@ static void fixup_debug_report(struct pc - } - } - -+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS -+ - /* - * Some BIOS implementations leave the Intel GPU interrupts enabled, - * even though no one is handling them (f.e. i915 driver is never loaded). -@@ -3149,6 +3153,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); - -+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ -+ - /* - * PCI devices which are on Intel chips can skip the 10ms delay - * before entering D3 mode. diff --git a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch deleted file mode 100644 index 6c8178d187..0000000000 --- a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch +++ /dev/null @@ -1,110 +0,0 @@ -From: Felix Fietkau -Subject: debloat: disable common USB quirks - -Signed-off-by: Felix Fietkau ---- - drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++ - drivers/usb/host/pci-quirks.h | 18 +++++++++++++++++- - include/linux/usb/hcd.h | 7 +++++++ - 3 files changed, 40 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/pci-quirks.c -+++ b/drivers/usb/host/pci-quirks.c -@@ -107,6 +107,8 @@ struct amd_chipset_type { - u8 rev; - }; - -+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS -+ - static struct amd_chipset_info { - struct pci_dev *nb_dev; - struct pci_dev *smbus_dev; -@@ -518,6 +520,10 @@ void usb_amd_dev_put(void) - } - EXPORT_SYMBOL_GPL(usb_amd_dev_put); - -+#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */ -+ -+#if IS_ENABLED(CONFIG_USB_UHCI_HCD) -+ - /* - * Make sure the controller is completely inactive, unable to - * generate interrupts or do DMA. -@@ -597,8 +603,17 @@ reset_needed: - uhci_reset_hc(pdev, base); - return 1; - } -+#else -+int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base) -+{ -+ return 0; -+} -+ -+#endif - EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); - -+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS -+ - static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) - { - u16 cmd; -@@ -1165,3 +1180,4 @@ static void quirk_usb_early_handoff(stru - } - DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); -+#endif ---- a/drivers/usb/host/pci-quirks.h -+++ b/drivers/usb/host/pci-quirks.h -@@ -4,6 +4,9 @@ - #ifdef CONFIG_PCI - void uhci_reset_hc(struct pci_dev *pdev, unsigned long base); - int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base); -+#endif /* CONFIG_PCI */ -+ -+#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS) - int usb_amd_find_chipset_info(void); - int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev); - bool usb_amd_hang_symptom_quirk(void); -@@ -17,12 +20,25 @@ void usb_disable_xhci_ports(struct pci_d - void sb800_prefetch(struct device *dev, int on); - #else - struct pci_dev; -+static inline int usb_amd_find_chipset_info(void) -+{ -+ return 0; -+} -+static inline bool usb_amd_hang_symptom_quirk(void) -+{ -+ return false; -+} -+static inline bool usb_amd_prefetch_quirk(void) -+{ -+ return false; -+} - static inline void usb_amd_quirk_pll_disable(void) {} - static inline void usb_amd_quirk_pll_enable(void) {} - static inline void usb_asmedia_modifyflowcontrol(struct pci_dev *pdev) {} - static inline void usb_amd_dev_put(void) {} - static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {} - static inline void sb800_prefetch(struct device *dev, int on) {} -+static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {} - #endif /* CONFIG_PCI */ - - #endif /* __LINUX_USB_PCI_QUIRKS_H */ ---- a/include/linux/usb/hcd.h -+++ b/include/linux/usb/hcd.h -@@ -461,7 +461,14 @@ extern int usb_hcd_pci_probe(struct pci_ - extern void usb_hcd_pci_remove(struct pci_dev *dev); - extern void usb_hcd_pci_shutdown(struct pci_dev *dev); - -+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS - extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev); -+#else -+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev) -+{ -+ return 0; -+} -+#endif - - #ifdef CONFIG_PM - extern const struct dev_pm_ops usb_hcd_pci_pm_ops; diff --git a/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch b/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch deleted file mode 100644 index 5fac5e0e4f..0000000000 --- a/target/linux/generic/pending-4.9/821-usb-Remove-annoying-warning-about-bogus-URB.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Alexey Brodkin -Subject: usb: Remove annoying warning about bogus URB - -When ath9k-htc Wi-Fi dongle is used with generic OHCI controller -infinite stream of warnings appears in debug console like this: --------------------------->8---------------------- -usb 1-1: new full-speed USB device number 2 using ohci-platform -usb 1-1: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw requested -usb 1-1: ath9k_htc: Transferred FW: ath9k_htc/htc_9271-1.4.0.fw, size: -51008 -------------[ cut here ]------------ -WARNING: CPU: 0 PID: 19 at drivers/usb/core/urb.c:449 -usb_submit_urb+0x1b4/0x498() -usb 1-1: BOGUS urb xfer, pipe 1 != type 3 -Modules linked in: -CPU: 0 PID: 19 Comm: kworker/0:1 Not tainted -4.4.0-rc4-00017-g00e2d79-dirty #3 -Workqueue: events request_firmware_work_func - -Stack Trace: - arc_unwind_core.constprop.1+0xa4/0x110 ----[ end trace 649ef8c342817fc2 ]--- -------------[ cut here ]------------ -WARNING: CPU: 0 PID: 19 at drivers/usb/core/urb.c:449 -usb_submit_urb+0x1b4/0x498() -usb 1-1: BOGUS urb xfer, pipe 1 != type 3 -Modules linked in: -CPU: 0 PID: 19 Comm: kworker/0:1 Tainted: G W -4.4.0-rc4-00017-g00e2d79-dirty #3 -Workqueue: events request_firmware_work_func - -Stack Trace: - arc_unwind_core.constprop.1+0xa4/0x110 ----[ end trace 649ef8c342817fc3 ]--- -------------[ cut here ]------------ --------------------------->8---------------------- - -There're some discussions in mailing lists proposing to disable -that particular check alltogether and magically all seem to work -fine with muted warning. - -Anyways new thread on that regard could be found here: -http://lists.infradead.org/pipermail/linux-snps-arc/2016-July/001310.html - -Let's see what comes out of that new discussion, hopefully patching -of generic USB stuff won't be required then. - -Signed-off-by: Alexey Brodkin ---- - drivers/usb/core/urb.c | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/drivers/usb/core/urb.c -+++ b/drivers/usb/core/urb.c -@@ -322,9 +322,6 @@ EXPORT_SYMBOL_GPL(usb_unanchor_urb); - */ - int usb_submit_urb(struct urb *urb, gfp_t mem_flags) - { -- static int pipetypes[4] = { -- PIPE_CONTROL, PIPE_ISOCHRONOUS, PIPE_BULK, PIPE_INTERRUPT -- }; - int xfertype, max; - struct usb_device *dev; - struct usb_host_endpoint *ep; -@@ -442,11 +439,6 @@ int usb_submit_urb(struct urb *urb, gfp_ - * cause problems in HCDs if they get it wrong. - */ - -- /* Check that the pipe's type matches the endpoint's type */ -- if (usb_pipetype(urb->pipe) != pipetypes[xfertype]) -- dev_WARN(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n", -- usb_pipetype(urb->pipe), pipetypes[xfertype]); -- - /* Check against a simple/standard policy */ - allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT | URB_DIR_MASK | - URB_FREE_BUFFER); diff --git a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch deleted file mode 100644 index 0913f3ebff..0000000000 --- a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch +++ /dev/null @@ -1,149 +0,0 @@ -From: Daniel Golle -Subject: libata: add ledtrig support - -This adds a LED trigger for each ATA port indicating disk activity. - -As this is needed only on specific platforms (NAS SoCs and such), -these platforms should define ARCH_WANTS_LIBATA_LEDS if there -are boards with LED(s) intended to indicate ATA disk activity and -need the OS to take care of that. -In that way, if not selected, LED trigger support not will be -included in libata-core and both, codepaths and structures remain -untouched. - -Signed-off-by: Daniel Golle ---- - drivers/ata/Kconfig | 16 ++++++++++++++++ - drivers/ata/libata-core.c | 41 +++++++++++++++++++++++++++++++++++++++++ - include/linux/libata.h | 9 +++++++++ - 3 files changed, 66 insertions(+) - ---- a/drivers/ata/Kconfig -+++ b/drivers/ata/Kconfig -@@ -46,6 +46,22 @@ config ATA_VERBOSE_ERROR - - If unsure, say Y. - -+config ARCH_WANT_LIBATA_LEDS -+ bool -+ -+config ATA_LEDS -+ bool "support ATA port LED triggers" -+ depends on ARCH_WANT_LIBATA_LEDS -+ select NEW_LEDS -+ select LEDS_CLASS -+ select LEDS_TRIGGERS -+ default y -+ help -+ This option adds a LED trigger for each registered ATA port. -+ It is used to drive disk activity leds connected via GPIO. -+ -+ If unsure, say N. -+ - config ATA_ACPI - bool "ATA ACPI Support" - depends on ACPI ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -731,6 +731,19 @@ u64 ata_tf_read_block(const struct ata_t - return block; - } - -+#ifdef CONFIG_ATA_LEDS -+#define LIBATA_BLINK_DELAY 20 /* ms */ -+static inline void ata_led_act(struct ata_port *ap) -+{ -+ unsigned long led_delay = LIBATA_BLINK_DELAY; -+ -+ if (unlikely(!ap->ledtrig)) -+ return; -+ -+ led_trigger_blink_oneshot(ap->ledtrig, &led_delay, &led_delay, 0); -+} -+#endif -+ - /** - * ata_build_rw_tf - Build ATA taskfile for given read/write request - * @tf: Target ATA taskfile -@@ -4998,6 +5011,9 @@ struct ata_queued_cmd *ata_qc_new_init(s - if (tag < 0) - return NULL; - } -+#ifdef CONFIG_ATA_LEDS -+ ata_led_act(ap); -+#endif - - qc = __ata_qc_from_tag(ap, tag); - qc->tag = tag; -@@ -5899,6 +5915,9 @@ struct ata_port *ata_port_alloc(struct a - ap->stats.unhandled_irq = 1; - ap->stats.idle_irq = 1; - #endif -+#ifdef CONFIG_ATA_LEDS -+ ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL); -+#endif - ata_sff_port_init(ap); - - return ap; -@@ -5920,6 +5939,12 @@ static void ata_host_release(struct devi - - kfree(ap->pmp_link); - kfree(ap->slave_link); -+#ifdef CONFIG_ATA_LEDS -+ if (ap->ledtrig) { -+ led_trigger_unregister(ap->ledtrig); -+ kfree(ap->ledtrig); -+ }; -+#endif - kfree(ap); - host->ports[i] = NULL; - } -@@ -6366,7 +6391,23 @@ int ata_host_register(struct ata_host *h - host->ports[i]->print_id = atomic_inc_return(&ata_print_id); - host->ports[i]->local_port_no = i + 1; - } -+#ifdef CONFIG_ATA_LEDS -+ for (i = 0; i < host->n_ports; i++) { -+ if (unlikely(!host->ports[i]->ledtrig)) -+ continue; - -+ snprintf(host->ports[i]->ledtrig_name, -+ sizeof(host->ports[i]->ledtrig_name), "ata%u", -+ host->ports[i]->print_id); -+ -+ host->ports[i]->ledtrig->name = host->ports[i]->ledtrig_name; -+ -+ if (led_trigger_register(host->ports[i]->ledtrig)) { -+ kfree(host->ports[i]->ledtrig); -+ host->ports[i]->ledtrig = NULL; -+ } -+ } -+#endif - /* Create associated sysfs transport objects */ - for (i = 0; i < host->n_ports; i++) { - rc = ata_tport_add(host->dev,host->ports[i]); ---- a/include/linux/libata.h -+++ b/include/linux/libata.h -@@ -38,6 +38,9 @@ - #include - #include - #include -+#ifdef CONFIG_ATA_LEDS -+#include -+#endif - - /* - * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -884,6 +887,12 @@ struct ata_port { - #ifdef CONFIG_ATA_ACPI - struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ - #endif -+ -+#ifdef CONFIG_ATA_LEDS -+ struct led_trigger *ledtrig; -+ char ledtrig_name[8]; -+#endif -+ - /* owned by EH */ - u8 sector_buf[ATA_SECT_SIZE] ____cacheline_aligned; - }; diff --git a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch deleted file mode 100644 index 8941571329..0000000000 --- a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: John Crispin -Subject: serial: do not accept sysrq characters via serial port - -many embedded boards have a disconnected TTL level serial which can -generate some garbage that can lead to spurious false sysrq detects. - -[john@phrozen.org: sent upstream 22.12.2016] - -Signed-off-by: John Crispin -Signed-off-by: Felix Fietkau ---- - include/linux/serial_core.h | 2 +- - lib/Kconfig.debug | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - ---- a/include/linux/serial_core.h -+++ b/include/linux/serial_core.h -@@ -457,7 +457,7 @@ extern void uart_handle_cts_change(struc - extern void uart_insert_char(struct uart_port *port, unsigned int status, - unsigned int overrun, unsigned int ch, unsigned int flag); - --#ifdef SUPPORT_SYSRQ -+#if defined(SUPPORT_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ_SERIAL) - static inline int - uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) - { ---- a/lib/Kconfig.debug -+++ b/lib/Kconfig.debug -@@ -410,6 +410,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE - This may be set to 1 or 0 to enable or disable them all, or - to a bitmask as described in Documentation/sysrq.txt. - -+config MAGIC_SYSRQ_SERIAL -+ bool "Enable magic SysRq key over serial" -+ depends on MAGIC_SYSRQ -+ default y -+ - config DEBUG_KERNEL - bool "Kernel debugging" - help diff --git a/target/linux/generic/pending-4.9/920-mangle_bootargs.patch b/target/linux/generic/pending-4.9/920-mangle_bootargs.patch deleted file mode 100644 index 3422f41519..0000000000 --- a/target/linux/generic/pending-4.9/920-mangle_bootargs.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Imre Kaloz -Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default - -Enabling this option renames the bootloader supplied root= -and rootfstype= variables, which might have to be know but -would break the automatisms OpenWrt uses. - -Signed-off-by: Imre Kaloz ---- - init/Kconfig | 9 +++++++++ - init/main.c | 24 ++++++++++++++++++++++++ - 2 files changed, 33 insertions(+) - ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1694,6 +1694,15 @@ config EMBEDDED - an embedded system so certain expert options are available - for configuration. - -+config MANGLE_BOOTARGS -+ bool "Rename offending bootargs" -+ depends on EXPERT -+ help -+ Sometimes the bootloader passed bogus root= and rootfstype= -+ parameters to the kernel, and while you want to ignore them, -+ you need to know the values f.e. to support dual firmware -+ layouts on the flash. -+ - config HAVE_PERF_EVENTS - bool - help ---- a/init/main.c -+++ b/init/main.c -@@ -353,6 +353,29 @@ static inline void setup_nr_cpu_ids(void - static inline void smp_prepare_cpus(unsigned int maxcpus) { } - #endif - -+#ifdef CONFIG_MANGLE_BOOTARGS -+static void __init mangle_bootargs(char *command_line) -+{ -+ char *rootdev; -+ char *rootfs; -+ -+ rootdev = strstr(command_line, "root=/dev/mtdblock"); -+ -+ if (rootdev) -+ strncpy(rootdev, "mangled_rootblock=", 18); -+ -+ rootfs = strstr(command_line, "rootfstype"); -+ -+ if (rootfs) -+ strncpy(rootfs, "mangled_fs", 10); -+ -+} -+#else -+static void __init mangle_bootargs(char *command_line) -+{ -+} -+#endif -+ - /* - * We need to store the untouched command line for future reference. - * We also need to store the touched command line since the parameter -@@ -506,6 +529,7 @@ asmlinkage __visible void __init start_k - pr_notice("%s", linux_banner); - setup_arch(&command_line); - mm_init_cpumask(&init_mm); -+ mangle_bootargs(command_line); - setup_command_line(command_line); - setup_nr_cpu_ids(); - setup_per_cpu_areas(); From ab16adf80b61aa5b12229ee15fe836872621d5e7 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 6 Jan 2020 00:13:58 +0100 Subject: [PATCH 273/480] hostapd: disable ft_psk_generate_local for non-PSK networks Without this commit, ft_psk_generate_local is enabled for non-PSK networks by default. This breaks 802.11r for EAP networks. Disable ft_psk_generate_local by default for non-PSK networks resolves this misbehavior. Reported-by: Martin Weinelt Signed-off-by: David Bauer Tested-by: Martin Weinelt --- package/network/services/hostapd/files/hostapd.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 4bf6a6c971..3d4e57db25 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -510,10 +510,18 @@ hostapd_set_bss_options() { json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)" - set_default ft_psk_generate_local 1 set_default ft_over_ds 1 set_default reassociation_deadline 1000 + case "$auth_type" in + psk|sae|psk-sae) + set_default ft_psk_generate_local 1 + ;; + *) + set_default ft_psk_generate_local 0 + ;; + esac + append bss_conf "mobility_domain=$mobility_domain" "$N" append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N" append bss_conf "ft_over_ds=$ft_over_ds" "$N" From 8f0effc462e2c7467e4056c2cb09d9e1da078088 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 9 Jan 2020 12:32:16 +0100 Subject: [PATCH 274/480] ramips: disable image build for HiWiFi HC5962 Image builds for the ramips-mt7621 target currently fail with: > WARNING: Image file ./hiwifi_hc5962-kernel.bin is too big Disable this board for now. It can still be built using the SDK. Signed-off-by: David Bauer --- target/linux/ramips/image/mt7621.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 2baec6aa2f..767e63ccab 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -337,6 +337,8 @@ define Device/hiwifi_hc5962 DEVICE_MODEL := HC5962 DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic SUPPORTED_DEVICES += hc5962 + # Kernel partition too small + DEFAULT := n endef TARGET_DEVICES += hiwifi_hc5962 From 6a2855212096d2c486961a0841b037bae4b75de7 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 9 Jan 2020 15:32:12 +0200 Subject: [PATCH 275/480] dnsmasq: add uci-defaults script for config migration When running sysupgrade from an existing configuration, UCI option dhcp.@dnsmasq[0].resolvfile needs to be modified in case it has not been changed from it's original value. Accomplish that using a uci-defaults script. Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/Makefile | 4 +++- .../dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index d1e0c34e97..60d16f3496 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.80 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=17 +PKG_RELEASE:=18 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq @@ -178,6 +178,8 @@ define Package/dnsmasq/install $(INSTALL_BIN) ./files/dhcp-script.sh $(1)/usr/lib/dnsmasq/dhcp-script.sh $(INSTALL_DIR) $(1)/usr/share/acl.d $(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/ + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/50-dnsmasq-migrate-resolv-conf-auto.sh $(1)/etc/uci-defaults endef Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install) diff --git a/package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh b/package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh new file mode 100755 index 0000000000..c78faa112d --- /dev/null +++ b/package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +[ "$(uci get dhcp.@dnsmasq[0].resolvfile)" = "/tmp/resolv.conf.auto" ] && { + uci set dhcp.@dnsmasq[0].resolvfile="/tmp/resolv.conf.d/resolv.conf.auto" + uci commit dhcp +} From 3a538db60abfc50b47ce1774f66d489700a50c00 Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Wed, 18 Dec 2019 09:48:38 +0300 Subject: [PATCH 276/480] ramips: fix leds for TP-Link Archer C20 v4 - add "gpio" group for wan_orange led - use tpt triggers for wifi led indication - add wifi 5 GHz led support Signed-off-by: Maxim Anisimov [slight commit message adjustment] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 4 +++- target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index 502c271ae2..8e3df9c676 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -42,11 +42,13 @@ wlan5g { label = "archer-c20-v4:green:wlan5g"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; }; wlan2g { label = "archer-c20-v4:green:wlan2g"; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; wps { @@ -82,7 +84,7 @@ &state_default { gpio { - ralink,group = "i2s", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; + ralink,group = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds index f410c47eac..06b78eb195 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds @@ -55,7 +55,6 @@ tama,w06) tplink,archer-c20-v4) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" - ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" "wlan0" ;; tplink,archer-c50-v3|\ tplink,archer-c50-v4) From 86e7353bff2a5de257de8ec62e782f016eed143c Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Wed, 18 Dec 2019 09:52:44 +0300 Subject: [PATCH 277/480] ramips: add support for TP-Link Archer C20 v5 TP-Link Archer C20 v5 is a router with 5-port FE switch and non-detachable antennas. It's based on MediaTek MT7628N+MT7610EN. Specification: - MediaTek MT7628N/N (580 Mhz) - 64 MB of RAM - 8 MB of FLASH - 2T2R 2.4 GHz and 1T1R 5 GHz - 5x 10/100 Mbps Ethernet - 3x external, non-detachable antennas - UART (J1) header on PCB (115200 8n1) - 7x LED (GPIO-controlled*), 2x button, power input switch * WAN LED in this devices is a dual-color, dual-leads type which isn't (fully) supported by gpio-leds driver. This type of LED requires both GPIOs state change at the same time to select color or turn it off. For now, we support/use only the green part of the LED. Create Factory image -------------------- As all installation methods require a U-Boot to be integrated into the Image (and we do not ship one with the image) we are not able to create an image in the OpenWRT build-process. Download a TP-Link image from their Website and a OpenWRT sysupgrade image for the device and build yourself a factory image like following: TP-Link image: tpl.bin OpenWRT sysupgrade image: owrt.bin > dd if=tpl.bin of=boot.bin bs=131584 count=1 > cat owrt.bin >> boot.bin Installing via Web-UI --------------------- Upload the boot.bin via TP-Links firmware upgrade tool in the web-interface. Installing via Recovery ----------------------- Activate Web-Recovery by beginning the upgrade Process with a Firmware-Image from TP-Link. After starting the Firmware Upgrade, wait ~3 seconds (When update status is switching to 0%), then disconnect the power supply from the device. Upgrade flag (which activates Web-Recovery) is written before the OS-image is touched and removed after write is succesfull, so this procedure should be safe. Plug the power back in. It will come up in Recovery-Mode on 192.168.0.1. When active, all LEDs but the WPS LED are off. Remeber to assign yourself a static IP-address as DHCP is not active in this mode. The boot.bin can now be uploaded and flashed using the web-recovery. Installing via TFTP ------------------- Prepare an image like following (Filenames from factory image steps apply here) > dd if=/dev/zero of=tp_recovery.bin bs=196608 count=1 > dd if=tpl.bin of=tmp.bin bs=131584 count=1 > dd if=tmp.bin of=boot.bin bs=512 skip=1 > cat boot.bin >> tp_recovery.bin > cat owrt.bin >> tp_recovery.bin Place tp_recovery.bin in root directory of TFTP server and listen on 192.168.0.66/24. Connect router LAN ports with your computer and power up the router while pressing the reset button. The router will download the image via tftp and after ~1 Minute reboot into OpenWRT. U-Boot CLI ---------- U-Boot CLI can be activated by holding down '4' on bootup. Dual U-Boot ----------- This is TP-Link MediaTek device with a split-uboot feature design like a TP-Link Archer C50 v4. The first (factory-uboot) provides recovery via TFTP and HTTP, jumping straight into the second (firmware-uboot) if no recovery needs to be performed. The firmware-uboot unpacks and executed the kernel. Web-Recovery ------------ TP-Link integrated a new Web-Recovery like the one on the Archer C7v4 / TL-WR1043v5 / Archer C50v4. Stock-firmware sets a flag in the "romfile" partition before beginning to write and removes it afterwards. If the router boots with this flag set, bootloader will automatically start Web-recovery and listens on 192.168.0.1. This way, the vendor-firmware or an OpenWRT factory image can be written. By doing the same while performing sysupgrade, we can take advantage of the Web-recovery in OpenWRT. It is important to note that Web-Recovery is only based on this flag. It can't detect e.g. a crashing kernel or other means. Once activated it won't boot the OS before a recovery action (either via TFTP or HTTP) is performed. This recovery-mode is indicated by an illuminated WPS-LED on boot. Signed-off-by: Maxim Anisimov [adjust some node names for LEDs in DTS] Signed-off-by: Adrian Schmutzler --- .../dts/mt7628an_tplink_archer-c20-v5.dts | 98 +++++++++++++++++++ target/linux/ramips/image/mt76x8.mk | 15 +++ .../mt76x8/base-files/etc/board.d/01_leds | 3 +- .../mt76x8/base-files/etc/board.d/02_network | 2 + .../mt76x8/base-files/lib/upgrade/platform.sh | 1 + 5 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts new file mode 100644 index 0000000000..e01826841d --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7628an_tplink_8m-split-uboot.dtsi" + +#include +#include + +/ { + compatible = "tplink,archer-c20-v5", "mediatek,mt7628an-soc"; + model = "TP-Link Archer C20 v5"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + rfkill { + label = "rfkill"; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "archer-c20-v5:green:power"; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + }; + + wlan2g { + label = "archer-c20-v5:green:wlan2g"; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wlan5g { + label = "archer-c20-v5:green:wlan5g"; + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + lan { + label = "archer-c20-v5:green:lan"; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; + + wan_green { + label = "archer-c20-v5:green:wan"; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + }; + + wan_orange { + label = "archer-c20-v5:orange:wan"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "archer-c20-v5:green:wps"; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&state_default { + gpio { + ralink,group = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", + "p2led_an", "p3led_an", "p4led_an", "wdt"; + ralink,function = "gpio"; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&radio 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + mtd-mac-address = <&rom 0xf100>; + mtd-mac-address-increment = <(-1)>; + }; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 2b5ec60a90..f3a948bf11 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -282,6 +282,21 @@ define Device/tplink_archer-c20-v4 endef TARGET_DEVICES += tplink_archer-c20-v4 +define Device/tplink_archer-c20-v5 + $(Device/tplink) + IMAGE_SIZE := 7616k + DEVICE_MODEL := Archer C20 + DEVICE_VARIANT := v5 + TPLINK_FLASHLAYOUT := 8MSUmtk + TPLINK_HWID := 0xc200005 + TPLINK_HWREV := 0x1 + TPLINK_HWREVADD := 0x5 + TPLINK_HVERSION := 3 + DEVICE_PACKAGES := kmod-mt76x0e + IMAGES := sysupgrade.bin +endef +TARGET_DEVICES += tplink_archer-c20-v5 + define Device/tplink_archer-c50-v3 $(Device/tplink) IMAGE_SIZE := 7808k diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds index 06b78eb195..79f45ba545 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds @@ -52,7 +52,8 @@ tama,w06) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" ;; -tplink,archer-c20-v4) +tplink,archer-c20-v4|\ +tplink,archer-c20-v5) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" ;; diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index a733353f71..646e29235c 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -40,6 +40,7 @@ ramips_setup_interfaces() hiwifi,hc5861b|\ skylab,skw92a|\ tplink,archer-c20-v4|\ + tplink,archer-c20-v5|\ tplink,archer-c50-v3|\ tplink,archer-c50-v4|\ tplink,tl-mr3420-v5|\ @@ -191,6 +192,7 @@ ramips_setup_macs() tplink,tl-wr842n-v5) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0xf100)" 1) ;; + tplink,archer-c20-v5|\ tplink,archer-c50-v4) wan_mac=$(macaddr_add "$(mtd_get_mac_binary rom 0xf100)" 1) ;; diff --git a/target/linux/ramips/mt76x8/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt76x8/base-files/lib/upgrade/platform.sh index a3de97abf7..20adfafc3d 100755 --- a/target/linux/ramips/mt76x8/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt76x8/base-files/lib/upgrade/platform.sh @@ -28,6 +28,7 @@ platform_do_upgrade() { } default_do_upgrade "$1" ;; + tplink,archer-c20-v5|\ tplink,archer-c50-v4) MTD_ARGS="-t romfile" default_do_upgrade "$1" From 62c2199bd85948f4b98bbcc00935713f424b0604 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 8 Jan 2020 17:37:40 -0500 Subject: [PATCH 278/480] wireguard: bump to 0.0.20200105 * socket: mark skbs as not on list when receiving via gro Certain drivers will pass gro skbs to udp, at which point the udp driver simply iterates through them and passes them off to encap_rcv, which is where we pick up. At the moment, we're not attempting to coalesce these into bundles, but we also don't want to wind up having cascaded lists of skbs treated separately. The right behavior here, then, is to just mark each incoming one as not on a list. This can be seen in practice, for example, with Qualcomm's rmnet_perf driver. This lead to crashes on OnePlus devices and possibly other Qualcomm 4.14 devices. But I fear that it could lead to issues on other drivers on weird OpenWRT routers. This commit is upstream in net-next as: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=736775d06bac60d7a353e405398b48b2bd8b1e54 Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index c379b712dd..9593c1d19d 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20191226 +PKG_VERSION:=0.0.20200105 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=7c0e576459c6337bcdea692bdbec561719a15da207dc739e0e3e60ff821a5491 +PKG_HASH:=9f12f68e96f6865325995c38213e09b05751cd1ef03e0bbc9f1bdc3e5680b337 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 7936cb94a930dcff0d30d294efb693648e1768ff Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 8 Jan 2020 17:37:41 -0500 Subject: [PATCH 279/480] wireguard-tools: bump to 1.0.20200102 * systemd: update documentation URL * global: bump copyright Usual house keeping. * Makefile: DEBUG_TOOLS -> DEBUG and document * Makefile: port static analysis check * dns-hatchet: adjust path for new repo layout * Makefile: rework automatic version.h mangling These are some important-ish cleanups for downstream package maintainers that should make packaging this a lot smoother. * man: add documentation about removing explicit listen-port Documentation improvement. * wg-quick: linux: quote ifname for nft This should fix issues with weirdly named ifnames and odd versions of nft(8). * fuzz: find bugs in the config syntax parser * fuzz: find bugs when parsing uapi input These are two fuzzers that have been laying around without a repo for a while. Perhaps somebody with enough compute power will find bugs with them. Signed-off-by: Jason A. Donenfeld --- package/network/utils/wireguard-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index 2f6d307094..afde98abf4 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard-tools -PKG_VERSION:=1.0.20191226 +PKG_VERSION:=1.0.20200102 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ -PKG_HASH:=aa8af0fdc9872d369d8c890a84dbc2a2466b55795dccd5b47721b2d97644b04f +PKG_HASH:=547cd1c2f8dca904faac9e8d3964f1ef956c24bb12e3498da88dde95243c7f08 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From b97247c2e9cd528206dbe5c55055bd913230eba4 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Wed, 8 Jan 2020 20:18:56 +0800 Subject: [PATCH 280/480] ath79: gl-ar750s: reduce kernel size to 2M in image Makefile u-boot splits nand factory firmware at 2M offset, flash the first part as kernel into spi nor and the other part as ubi into nand flash. With previous commit increasing kernel size to 4M, generated factory firmware is broken because ubi is at 4M offset. This commit reduces kernel size definition to 2M in image Makefile, producing proper factory image. Partition size in dts is kept unchanged so that sysupgrade to a firmware with 2M+ kernel still works. Fixes: b496a2294c ("ath79: GL-AR750S: provide NAND support; increase kernel to 4 MB") Reported-by: Jeff Kletsky Signed-off-by: Chuanhong Guo --- target/linux/ath79/image/nand.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index c6a1441ed9..cc775d52b6 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -82,7 +82,7 @@ define Device/glinet_gl-ar750s-common DEVICE_MODEL := GL-AR750S DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \ kmod-usb-storage block-mount - KERNEL_SIZE := 4096k + KERNEL_SIZE := 2048k IMAGE_SIZE := 16000k PAGESIZE := 2048 VID_HDR_OFFSET := 2048 From 35ba9304c60665724803ae142ba971947973012c Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 11 Jan 2020 08:35:23 +0000 Subject: [PATCH 281/480] kmod-sched-cake: bump to 20200110 Keep up with a small amount of churn in the upstream repository. Upstream now represents the version of CAKE as found in the linux kernel from 4.19 onwards but with some compatibility stubs to allow building on <4.19. After a diversion related to an experimental ECN implementation which has now been reverted, the important and relevant changes for us are: 8a8946b sch_cake: avoid possible divide by zero in cake_enqueue() 183b320 RFC 8622 diffserv3, 4 & 8 LE PHB support 6ff4561 sch_cake: Make sure we can write the IP header before changing DSCP bits 9fba602 sch_cake: Use tc_skb_protocol for getting packet protocol Signed-off-by: Kevin Darbyshire-Bryant --- package/kernel/kmod-sched-cake/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/kmod-sched-cake/Makefile b/package/kernel/kmod-sched-cake/Makefile index 35446641ab..7778d48041 100644 --- a/package/kernel/kmod-sched-cake/Makefile +++ b/package/kernel/kmod-sched-cake/Makefile @@ -13,8 +13,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git -PKG_SOURCE_DATE:=2019-03-12 -PKG_SOURCE_VERSION:=057c738801e9dc64e8dd72a3fc4f50734214433c +PKG_SOURCE_DATE:=2020-01-10 +PKG_SOURCE_VERSION:=aeff7a3e61ffa3159a8a95384d33e47a006211f4 PKG_MIRROR_HASH:=5bf06a804824db36ae393fc174aeec7b12633176e05a765c0931b39df5bd34df PKG_MAINTAINER:=Kevin Darbyshire-Bryant From 8f9cd1af0f9c325a902dbd0e79e12015372e6bb0 Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Tue, 3 Dec 2019 22:30:00 +0100 Subject: [PATCH 282/480] swconfig: fix Broadcom b53 support This commit fixes a bug in the main swconfig patch where a function needed by the b53 driver is not exported. Additionally it adds OF support to the b53_mdio driver for devicetree- based probing Signed-off-by: Tobias Schramm --- .../files/drivers/net/phy/b53/b53_mdio.c | 32 +++++++++++++++++++ .../generic/files/drivers/net/phy/swconfig.c | 1 + 2 files changed, 33 insertions(+) diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c index 6de8623612..5675232bef 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c +++ b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c @@ -370,6 +370,26 @@ static int b53_phy_read_status(struct phy_device *phydev) return 0; } +static const struct of_device_id b53_of_match_1[] = { + { .compatible = "brcm,bcm5325" }, + { .compatible = "brcm,bcm5395" }, + { .compatible = "brcm,bcm5397" }, + { .compatible = "brcm,bcm5398" }, + { /* sentinel */ }, +}; + +static const struct of_device_id b53_of_match_2[] = { + { .compatible = "brcm,bcm53115" }, + { .compatible = "brcm,bcm53125" }, + { .compatible = "brcm,bcm53128" }, + { /* sentinel */ }, +}; + +static const struct of_device_id b53_of_match_3[] = { + { .compatible = "brcm,bcm5365" }, + { /* sentinel */ }, +}; + /* BCM5325, BCM539x */ static struct phy_driver b53_phy_driver_id1 = { .phy_id = 0x0143bc00, @@ -381,6 +401,10 @@ static struct phy_driver b53_phy_driver_id1 = { .config_aneg = b53_phy_config_aneg, .config_init = b53_phy_config_init, .read_status = b53_phy_read_status, + .mdiodrv.driver = { + .name = "bcm539x", + .of_match_table = b53_of_match_1, + }, }; /* BCM53125, BCM53128 */ @@ -394,6 +418,10 @@ static struct phy_driver b53_phy_driver_id2 = { .config_aneg = b53_phy_config_aneg, .config_init = b53_phy_config_init, .read_status = b53_phy_read_status, + .mdiodrv.driver = { + .name = "bcm531xx", + .of_match_table = b53_of_match_2, + }, }; /* BCM5365 */ @@ -407,6 +435,10 @@ static struct phy_driver b53_phy_driver_id3 = { .config_aneg = b53_phy_config_aneg, .config_init = b53_phy_config_init, .read_status = b53_phy_read_status, + .mdiodrv.driver = { + .name = "bcm5365", + .of_match_table = b53_of_match_3, + }, }; int __init b53_phy_driver_register(void) diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c index 20d6c693da..abf1a4504b 100644 --- a/target/linux/generic/files/drivers/net/phy/swconfig.c +++ b/target/linux/generic/files/drivers/net/phy/swconfig.c @@ -1256,6 +1256,7 @@ switch_generic_set_link(struct switch_dev *dev, int port, return 0; } +EXPORT_SYMBOL_GPL(switch_generic_set_link); static int __init swconfig_init(void) From d29929be073ad74585043dc4f74e8581dd9e657c Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Tue, 3 Dec 2019 22:33:32 +0100 Subject: [PATCH 283/480] firmware-utils: mkfwimage: add support for Ubiquiti SW devices This commit adds support for Ubiquiti ToughSwitch XP (and probably also EdgeSwitch XP) devices. They are mostly based on the same hardware as MX devices. Signed-off-by: Tobias Schramm --- tools/firmware-utils/src/mkfwimage.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c index c9d838a2e1..d0dca040cd 100644 --- a/tools/firmware-utils/src/mkfwimage.c +++ b/tools/firmware-utils/src/mkfwimage.c @@ -110,6 +110,15 @@ struct fw_info fw_info[] = { }, .sign = false, }, + { + .name = "SW", + .fw_layout = { + .kern_start = 0x9f050000, + .kern_entry = 0x80002000, + .firmware_max_length= 0x00760000, + }, + .sign = false, + }, { .name = "UBDEV01", .fw_layout = { From 7d97fdf5ef71c1c171f8c01dee2c0c1695741bdf Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Tue, 3 Dec 2019 22:39:01 +0100 Subject: [PATCH 284/480] ath79: add support for Ubiquiti SW devices SW devices are Ubiquit ToughSwitch and EdgeSwitch series devices. Hardware-wise they are very similar to the XM device series. Signed-off-by: Tobias Schramm --- target/linux/ath79/image/generic-ubnt.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 05847cc3a2..f6546f369e 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -47,6 +47,18 @@ define Device/ubnt-bz UBNT_VERSION := 6.0.0 endef +define Device/ubnt-sw + $(Device/ubnt) + SOC := ar7242 + DEVICE_PACKAGES += kmod-usb-ohci + IMAGE_SIZE := 7552k + UBNT_BOARD := SW + UBNT_CHIP := ar7240 + UBNT_TYPE := SW + UBNT_VERSION := 1.4.1 + KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma +endef + define Device/ubnt-wa $(Device/ubnt) SOC := ar9342 From b16e5517b52abf0c6564d26ee3f57f33a784b2f0 Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Tue, 3 Dec 2019 22:46:01 +0100 Subject: [PATCH 285/480] kernel: add kmod packages for Broadcom bcm53xxx switch support Signed-off-by: Tobias Schramm --- package/kernel/linux/modules/netdevices.mk | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 5f8d767679..61a19bf42f 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -223,6 +223,36 @@ endef $(eval $(call KernelPackage,swconfig)) +define KernelPackage/switch-bcm53xx + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Broadcom bcm53xx switch support + DEPENDS:=+kmod-swconfig + KCONFIG:=CONFIG_SWCONFIG_B53 + FILES:=$(LINUX_DIR)/drivers/net/phy/b53/b53_common.ko + AUTOLOAD:=$(call AutoLoad,42,b53_common) +endef + +define KernelPackage/switch-bcm53xx/description + Broadcom bcm53xx switch support +endef + +$(eval $(call KernelPackage,switch-bcm53xx)) + +define KernelPackage/switch-bcm53xx-mdio + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Broadcom bcm53xx switch MDIO support + DEPENDS:=+kmod-switch-bcm53xx + KCONFIG:=CONFIG_SWCONFIG_B53_PHY_DRIVER + FILES:=$(LINUX_DIR)/drivers/net/phy/b53/b53_mdio.ko + AUTOLOAD:=$(call AutoLoad,42,b53_mdio) +endef + +define KernelPackage/switch-bcm53xx-mdio/description + Broadcom bcm53xx switch MDIO support +endef + +$(eval $(call KernelPackage,switch-bcm53xx-mdio)) + define KernelPackage/switch-mvsw61xx SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell 88E61xx switch support From 313bde53ce944e9fa67699173cf3be233afa4c49 Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Tue, 3 Dec 2019 23:26:44 +0100 Subject: [PATCH 286/480] generic: update config-4.19 config was missing some SWCONFIG_B53 options Signed-off-by: Tobias Schramm --- target/linux/generic/config-4.19 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index 4cbef51ee1..d261c04326 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -5100,7 +5100,10 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_SWAP=y # CONFIG_SWCONFIG is not set # CONFIG_SWCONFIG_B53 is not set +# CONFIG_SWCONFIG_B53_MDIO_DRIVER is not set +# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set # CONFIG_SWCONFIG_B53_SPI_DRIVER is not set +# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set # CONFIG_SWCONFIG_LEDS is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set From b6946542f85014096c08f58c3c0acbbfe623a734 Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Tue, 3 Dec 2019 22:48:35 +0100 Subject: [PATCH 287/480] ath79: add support for Ubiquiti ToughSwitch/EdgeSwitch 8XP Flash: 8 MB RAM: 64 MB SoC: AR7242 Switch: bcm53128 USB: 1x USB 2.0 Ethernet: 8x GbE, 1x FE The Ubiquiti ToughSwitch 8XP is a 8-port PoE Gigabit switch with a single Fast-Ethernet management port. It supports both 24V passive PoE and 48V 802.11af/at PoE out on all eight ports. By default the single Fast-Ethernet port labeled "MGMT" is configured as the WAN port. Thus access to the device is only possible via the eight switch ports. Installation of the firware is possible either via serial + tftpboot or the factory firmware update function via webinterface. Serial: 3v3 115200 8n1 The serial header is located in the lower left corner of the switches PCB: | | | | o | o RX | o TX | o GND | | ++ +-++-+ ++ ++ + +--+ ++ +--++--++--+ Signed-off-by: Tobias Schramm [fix whitespace issue] Signed-off-by: David Bauer --- .../ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts | 322 ++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 5 + target/linux/ath79/image/generic-ubnt.mk | 7 + 3 files changed, 334 insertions(+) create mode 100644 target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts new file mode 100644 index 0000000000..d5a2b85305 --- /dev/null +++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts @@ -0,0 +1,322 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar7242.dtsi" + +/ { + compatible = "ubnt,edgeswitch-8xp", "qca,ar7242"; + model = "Ubiquiti EdgeSwitch 8XP"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &led_usr; + led-failsafe = &led_usr; + led-running = &led_usr; + led-upgrade = &led_usr; + }; + + leds { + compatible = "gpio-leds"; + + led_usr: usr { + label = "ubnt:yellow:usr"; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + linux,code = ; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + gpio_spi { + compatible = "spi-gpio"; + #address-cells = <0x1>; + ranges; + + sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; + cs-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; + num-chipselects = <1>; + + gpio_hc595: gpio_spi@0 { + compatible = "fairchild,74hc595"; + reg = <0>; + registers-number = <2>; + spi-max-frequency = <100000>; + enable-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; + + gpio-controller; + #gpio-cells = <2>; + }; + }; + + gpio-export { + compatible = "gpio-export"; + + poe_24v_port1 { + gpio-export,name = "ubnt:24v-poe:port1"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 1 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port1 { + gpio-export,name = "ubnt:48v-poe:port1"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 0 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port2 { + gpio-export,name = "ubnt:24v-poe:port2"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 3 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port2 { + gpio-export,name = "ubnt:48v-poe:port2"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 2 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port3 { + gpio-export,name = "ubnt:24v-poe:port3"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 5 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port3 { + gpio-export,name = "ubnt:48v-poe:port3"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 4 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port4 { + gpio-export,name = "ubnt:24v-poe:port4"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 7 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port4 { + gpio-export,name = "ubnt:48v-poe:port4"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 6 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port5 { + gpio-export,name = "ubnt:24v-poe:port5"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 9 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port5 { + gpio-export,name = "ubnt:48v-poe:port5"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 8 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port6 { + gpio-export,name = "ubnt:24v-poe:port6"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 11 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port6 { + gpio-export,name = "ubnt:48v-poe:port6"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 10 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port7 { + gpio-export,name = "ubnt:24v-poe:port7"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 13 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port7 { + gpio-export,name = "ubnt:48v-poe:port7"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 12 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port8 { + gpio-export,name = "ubnt:24v-poe:port8"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 15 GPIO_ACTIVE_HIGH>; + }; + + poe_48v_port8 { + gpio-export,name = "ubnt:48v-poe:port8"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 14 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x040000>; + label = "u-boot"; + read-only; + }; + + partition@40000 { + reg = <0x040000 0x010000>; + label = "u-boot-env"; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + reg = <0x050000 0x760000>; + label = "firmware"; + }; + + partition@7b0000 { + reg = <0x7b0000 0x040000>; + label = "cfg"; + read-only; + }; + + art: partition@7f0000 { + reg = <0x7f0000 0x010000>; + label = "art"; + read-only; + }; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy-mask = <0x10>; + + ethernet-switch@1e { + compatible = "brcm,bcm53128"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1e>; + + ports { + port0@0 { + reg = <0>; + label = "lan1"; + }; + + port1@1 { + reg = <1>; + label = "lan2"; + }; + + port2@2 { + reg = <2>; + label = "lan3"; + }; + + port3@3 { + reg = <3>; + label = "lan4"; + }; + + port4@4 { + reg = <4>; + label = "lan5"; + }; + + port5@5 { + reg = <5>; + label = "lan6"; + }; + + port6@6 { + reg = <6>; + label = "lan7"; + }; + + port7@7 { + reg = <7>; + label = "lan8"; + }; + + phy0: port8@8 { + reg = <8>; + label = "cpu"; + ethernet = <ð0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + }; + }; +}; + +&usb_phy { + status = "okay"; +}; + +&usb { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_port: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + +&pcie { + status = "okay"; +}; + +&uart { + status = "okay"; +}; + +ð0 { + status = "okay"; + + phy-mode = "rgmii-rxid"; + pll-data = <0x16000000 0x00000101 0x00001313>; + mtd-mac-address = <&art 0x0>; + + phy-handle = <&phy0>; + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +ð1 { + status = "okay"; + + mtd-mac-address = <&art 0x6>; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index b1b40087ef..ae857b1771 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -259,6 +259,11 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:3" "4:lan:2" ;; + ubnt,edgeswitch-8xp) + ucidef_set_interface_wan "eth1" + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:lan:5" "5:lan:6" "6:lan:7" "7:lan:8" "8@eth0" + ;; ubnt,routerstation-pro) ucidef_set_interface_wan "eth0" ucidef_add_switch "switch0" \ diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index f6546f369e..87e7f5cc32 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -129,6 +129,13 @@ define Device/ubnt_bullet-m-xw endef TARGET_DEVICES += ubnt_bullet-m-xw +define Device/ubnt_edgeswitch-8xp + $(Device/ubnt-sw) + DEVICE_MODEL := EdgeSwitch 8XP + DEVICE_PACKAGES += switch-bcm53xx-mdio +endef +TARGET_DEVICES += ubnt_edgeswitch-8xp + define Device/ubnt_lap-120 $(Device/ubnt-wa) DEVICE_MODEL := LiteAP ac From a0c0ad728c11751a30bb2c56e9cf54f8d2fe5fd1 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Fri, 10 Jan 2020 23:51:05 +0100 Subject: [PATCH 288/480] ipq40xx: fix usbport trigger on the RT-AC58U with USB 2.0 devices This patch partially reverts "ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U" as the change removed the usb2 port-trigger, so the LED would no longer light-up when a USB 2.0 was inserted into the USB port. Fixes: d0efb1ba95f3 ("ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U") Signed-off-by: Christian Lamparter --- .../files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 7 ++++++- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index f046bdcb5e..56725f94c5 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -69,6 +69,11 @@ reg = <1>; #trigger-source-cells = <0>; }; + + usb3_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; }; }; @@ -143,7 +148,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>; + trigger-sources = <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index 331d8e4d74..a0030f77ce 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -73,6 +73,11 @@ reg = <1>; #trigger-source-cells = <0>; }; + + usb3_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; }; }; @@ -137,7 +142,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>; + trigger-sources = <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; From 2090b8af0a2a796343523e686797c6dd861ed4bf Mon Sep 17 00:00:00 2001 From: Tom Brouwer Date: Sun, 12 Jan 2020 13:13:30 +0100 Subject: [PATCH 289/480] ipq40xx: add support for EZVIZ CS-W3-WD1200G EUP Hardware: SOC: Qualcomm IPQ4018 RAM: 128 MB Nanya NT5CC64M16GP-DI FLASH: 16 MB Macronix MX25L12805D ETH: Qualcomm QCA8075 (4 Gigabit ports, 3xLAN, 1xWAN) WLAN: Qualcomm IPQ4018 (2.4 & 5 Ghz) BUTTON: Shared WPS/Reset button LED: RGB Status/Power LED SERIAL: Header J8 (UART, Left side of board). Numbered from top to bottom: (1) GND, (2) TX, (3) RX, (4) VCC (White triangle next to it). 3.3v, 115200, 8N1 Tested/Working: * Ethernet * WiFi (2.4 and 5GHz) * Status LED * Reset Button (See note below) Implementation notes: * The shared WPS/Reset button is implemented as a Reset button * I could not find a original firmware image to reverse engineer, meaning currently it's not possible to flash OpenWrt through the Web GUI. Installation (Through Serial console & TFTP): 1. Set your PC to fixed IP 192.168.1.12, Netmask 255.255.255.0, and connect to one of the LAN ports 2. Rename the initramfs image to 'C0A8010B.img' and enable a TFTP server on your pc, to serve the image 2. Connect to the router through serial (See connection properties above) 3. Hit a key during startup, to pause startup 4. type `setenv serverip 192.168.1.12`, to set the tftp server address 5. type `tftpboot`, to load the image from the laptop through tftp 6. type `bootm` to run the loaded image from memory 6. (If you want to return to stock firmware later, create an full MTD backup, e.g. using instructions here https://openwrt.org/docs/guide-user/installation/generic.backup#create_full_mtd_backup) 7. Transfer the 'sysupgrade' OpenWrt firmware image from PC to router, e.g.: `scp xxx-squashfs-sysupgrade.bin root@192.168.1.1:/tmp/upgrade.bin` 8. Run sysupgrade to permanently install OpenWrt to flash: `sysupgrade -n /tmp/upgrade.bin` Revert to stock: To revert to stock, you need the MTD backup from step 6 above: 1. Unpack the MTD backup archive 2. Transfer the 'firmware' partition image to the router (e.g. mtd8_firmware.backup) 3. On the router, do `mtd write mtd8_firmware.backup firmware` Signed-off-by: Tom Brouwer [removed BOARD_NAME, OpenWRT->OpenWrt, changed LED device name to board name] Signed-off-by: Christian Lamparter --- package/firmware/ipq-wifi/Makefile | 2 + .../board-ezviz_cs-w3-wd1200g-eup.qca4019 | Bin 0 -> 24340 bytes .../ipq40xx/base-files/etc/board.d/02_network | 8 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 2 + .../lib/preinit/05_set_iface_mac_ipq40xx.sh | 4 + .../preinit/06_set_preinit_iface_ipq40xx.sh | 1 + .../dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts | 242 ++++++++++++++++++ target/linux/ipq40xx/image/Makefile | 16 ++ .../901-arm-boot-add-dts-files.patch | 3 +- 9 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 package/firmware/ipq-wifi/board-ezviz_cs-w3-wd1200g-eup.qca4019 create mode 100644 target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index 906f11ac96..161954fa1f 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -26,6 +26,7 @@ endef ALLWIFIBOARDS:= \ aruba_ap-303 \ avm_fritzrepeater-1200 \ + ezviz_cs-w3-wd1200g-eup \ linksys_ea8300 \ qxwlan_e2600ac @@ -92,6 +93,7 @@ endef $(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303)) $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200)) +$(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP)) $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300)) $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) diff --git a/package/firmware/ipq-wifi/board-ezviz_cs-w3-wd1200g-eup.qca4019 b/package/firmware/ipq-wifi/board-ezviz_cs-w3-wd1200g-eup.qca4019 new file mode 100644 index 0000000000000000000000000000000000000000..987e34c640c95dc46f938d20417837432890bbd2 GIT binary patch literal 24340 zcmeHPdr(tX8b1UOb+K?mKm@#m5FkMkAW#hwc}sbuU{R3(i-3Y8HOj;A3SH3gK_Man zwP1*#Wl$bX5g8XB5R0|7Gs^5A`^V1y(RTLHompGk(eAV}yNi474Hp6=Z31B%;C^t< z`OdlLeCIpAdr0oR-;euNY&0i&UqWzDGAAZAIxP-JrBVQ;G7!rF*bP&@tZY|aQGP(a zRLnV4BrfKN5AO=XYx&3XN)KaIUQj@JUa2_m*oj>Q)#c)9&Y?0+MF^+ja4;_@=m@7k zRt)W0L0fcammXOEt(6t9uBC>iV{`a-!z>qojdqSu0e}X;YazI%KV!2Qm?;24LPCCc z@xn?#TL*sn>xD=nSwjPhln3+2HEU-Aub|97X1MMEPST@6bes)voc|KWowl*b6;Z2c)#*oL#gn)P%9Is zCBFU>lt-Vj{lNH#%7&`^%tUx_NZDK^&fJq2G2VxDgKc~`ps}GMQ%4+Rt%&Q11@Jshdo@gztjhAu{I>(IlmvqFRW0kt*b_`^7gq@?8Ipy^>!!u-MqNgb>*II!@K7ex8~*w*yu7>_UJORM&3b?hB<25# zKt@Jd3WMPZ=lt=<7vD`yVOKzWwvV^A?LXiB`D@)atm9UDJBp3Xe_=ldc*17KzkK=p znYQn8FQ9l3UXQ>@iffw&v4qXXo0b45{!o}qLZj0OZ82?_Efy3elhEjNLR(CmK5P&a zL88%UBp3}wie=Tcr{8UAZC|JW!L-~rNui=tF7*i&aYNm>ZbC=Y5phLh&=_valNclk zP2wgAqtGZM0p+1QF7F8s*@^Dt?i2>0K?on6aYA)XzdGZSKrrJKsV+D_#z5kPIz4wn z+);O~yD%1weIAP>qsiQ4VF()XJOl|x!@1!??Mcwh@u{@XFME#d-QssugSyFQiK6q> zqF2@T_p;cw)o@KpuEChIPohMkWB>tjYZw4#PV<^XX$}Hpg+zcvfJA^qfJA^qU=1U% znYS77q`tv>14*Us;O#&nsp|;=Y56VJh9BzY#I3(+<-$2O5Ms7D*6=ALmu?~gFBgc3 z29~S4u@M4e`z@EB%VbxWU8ER!3IHrC72P9G=a*a#_V}B{q@$Lp;m_t-zR*7l)$m9A zxPKO@Ez`C#o7pIU0H?3nbpQkdU&zn#glr%tq(U)Z!pdf9Fkmn|JQ(w&4Yn_AWiYZ^ znLxm|0zVuFpv?}kiV6jQwH^TiAh5|@hX9H*Wn(rh9UbwYquJI$8nQeDUJcpPD3rr6 z0s*7T6r1($L%9lt@N^W)Qrd(W@WZuxx$_O@HnWDT2Dkm@ffHurk;p`;_*)*ubzm2 znhv7D5vw2F6|)Uim!rnSj8oEc3Y#un=~ds>d}c^rU8u~ihBie*JWvm=hmZ#1rs5DG zD&z`Y#%2xqqI2FIqPK{Vm)9oouoEd(6bc zC-w&U_b8$>3DEN3?bcb_+RQNF0l59jR9gPV8KXM<`z$pGlbzl6 z_H(H*bNiT5Ta#g3a?!?Y5er1g7`M&S2dM{OFZ_U(xl+LOKU(4GEG*A{Wd$mk6wp6N z0R!Jtz|&D{@LXU69L8)wL$PQE_=ePAG$izO`X;18ehGw=w+ z(zSqXkbe)&!H9ubG<_S4h~~>T>TfeTnpY zA7KXe(0lCZ+&hffn!djm-L@}=HEpVLdAca@i#r;nsz#n8;%jcJF3C$o@q8c6u)0Sf zmx%Zt*#C^(f8fUga6qd{Cf_gOP7bLrDvnFiM11v#s#_uvrSJnZzgM-$rJ@)<9UCw< z;pYeNZW4LAJbm)6x>F&O>=o@$-&I_alqSUSd2m3h{3tPCe8P_nChx1SD9WMT*EK`x z4-_>Lkw~D{D3p>D3AO5KIwa)@ z2`qQbsOml3B~Q$y2M<|n0GHaOzMzsRa-mBq)fq*JT%^9K>XJwkqWOW7_te)ERgwdI zH|+qnFSdpjRkfl}o&pbEQB+FyhytM_9del{na`fQt-h=%m82#xu>l`XupvsfG##ok zMUFgfaugmclV?kkpqp1AmQj2Z9_>_BNMaMV-~%4PHJBn6c&SgiWXuU9Q6f8|5h1y!LMe^u@jf#PqRzh^6ldv^c0-mCHFqES#)*y z#PyigzEgEExgWpKo!%5&O_w;NeA;)kC92Lxx+O<3w7-jg(X)mssqf3_ z{@sOqnvuMp(FKdXt}G%KH=8D!T0#5 zJf+S#y=rk++y%M}$?Y2`Qwh#6N*qNaU8PO2H33qWw8tMMH3n2|DRey0H*};szJ*y$ zD{SvSb|tdGx0053y+d3dA@e`tl-zsc_~r1^-leph%YAtr(T!eZ)SR|n@nykT?=q+C z^Gyfd36(Iis8PfHWt}PKSrx7YYj)$13nvj+1qdwlZ5;5OShJ!BkD>Zpz9arN4j&&T z{Dp7gpnH3HF}%`&#k`GUAvd0&->)}Y?0(@K1pR)4+2+s#KiNbgpcjD!^!u0dx*1FU zFn7OsZmhNHFY)iSq;X#+lVO<}_9h#aFMOQNuuu*92AzX~d1-l?AU5m{~{{3Q+Bga`R0>;FQ4RP*u+bwp1OLUCn M-<$he(lmSj12G&o9smFU literal 0 HcmV?d00001 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index ae8cb2efe7..57caa88c85 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -54,6 +54,11 @@ ipq40xx_setup_interfaces() compex,wpj428) ucidef_set_interface_lan "eth0 eth1" ;; + ezviz,cs-w3-wd1200g-eup) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ucidef_add_switch "switch0" \ + "0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "0u@eth1" "5:wan" + ;; glinet,gl-b1300) ucidef_set_interfaces_lan_wan "eth0" "eth1" ucidef_add_switch "switch0" \ @@ -97,6 +102,9 @@ ipq40xx_setup_macs() wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) lan_mac=$(macaddr_add "$wan_mac" 1) ;; + ezviz,cs-w3-wd1200g-eup) + label_mac=$(mtd_get_mac_binary "ART" 0x6) + ;; linksys,ea6350v3) wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) lan_mac=$(macaddr_add "$wan_mac" 1) diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 8b6abc4ff7..3616bff578 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -46,6 +46,7 @@ case "$FIRMWARE" in 8dev,jalapeno |\ alfa-network,ap120c-ac |\ cilab,meshpoint-one |\ + ezviz,cs-w3-wd1200g-eup |\ glinet,gl-b1300 |\ linksys,ea6350v3 |\ qcom,ap-dk01.1-c1) @@ -115,6 +116,7 @@ case "$FIRMWARE" in 8dev,jalapeno |\ alfa-network,ap120c-ac |\ cilab,meshpoint-one |\ + ezviz,cs-w3-wd1200g-eup |\ glinet,gl-b1300 |\ linksys,ea6350v3 |\ qcom,ap-dk01.1-c1) diff --git a/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh b/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh index 192488f377..1bca152a38 100644 --- a/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh +++ b/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh @@ -9,6 +9,10 @@ preinit_set_mac_address() { ip link set dev eth0 address $(macaddr_add "$base_mac" +1) ip link set dev eth1 address $(macaddr_add "$base_mac" +3) ;; + ezviz,cs-w3-wd1200g-eup) + ip link set dev eth0 address $(mtd_get_mac_binary "ART" 0x6) + ip link set dev eth1 address $(mtd_get_mac_binary "ART" 0x0) + ;; linksys,ea8300) base_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) ip link set dev eth0 address "${base_mac}" diff --git a/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh b/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh index a0dec1042a..42667d2dfb 100644 --- a/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh +++ b/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh @@ -7,6 +7,7 @@ set_preinit_iface() { aruba,ap-303| \ asus,rt-ac58u| \ avm,fritzbox-4040| \ + ezviz,cs-w3-wd1200g-eup| \ glinet,gl-b1300| \ linksys,ea8300| \ meraki,mr33| \ diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts new file mode 100644 index 0000000000..d8b9e7ef13 --- /dev/null +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts @@ -0,0 +1,242 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT + +#include "qcom-ipq4019.dtsi" +#include +#include +#include + +/ { + model = "EZVIZ CS-W3-WD1200G EUP"; + compatible = "ezviz,cs-w3-wd1200g-eup"; + + aliases { + led-boot = &led_status_green; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_green; + }; + + soc { + rng@22000 { + status = "okay"; + }; + + mdio@90000 { + status = "okay"; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + reset-gpios = <&tlmm 59 GPIO_ACTIVE_LOW>; + reset-delay-us = <5000>; + }; + + ess-psgmii@98000 { + status = "okay"; + }; + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + tcsr@194b000 { + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; + }; + + ess_tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + + crypto@8e3a000 { + status = "okay"; + }; + + watchdog@b017000 { + status = "okay"; + }; + + ess-switch@c000000 { + status = "okay"; + }; + + edma@c080000 { + status = "okay"; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status_red: status_red { + label = "cs-w3-wd1200g-eup:red:status"; + gpios = <&tlmm 0 GPIO_ACTIVE_LOW>; + }; + + led_status_green: status_green { + label = "cs-w3-wd1200g-eup:green:status"; + gpios = <&tlmm 3 GPIO_ACTIVE_LOW>; + }; + + led_status_blue: status_blue { + label = "cs-w3-wd1200g-eup:blue:status"; + gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&tlmm { + serial_pins: serial_pinmux { + mux { + pins = "gpio60", "gpio61"; + function = "blsp_uart0"; + bias-disable; + }; + }; + + mdio_pins: mdio_pinmux { + mux_1 { + pins = "gpio53"; + function = "mdio"; + bias-pull-up; + }; + + mux_2 { + pins = "gpio52"; + function = "mdc"; + bias-pull-up; + }; + }; + + spi_0_pins: spi_0_pinmux { + pin { + function = "blsp_spi0"; + pins = "gpio55", "gpio56", "gpio57"; + drive-strength = <12>; + bias-disable; + }; + pin_cs { + function = "gpio"; + pins = "gpio54"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; +}; + +&blsp_dma { + status = "okay"; +}; + +&blsp1_spi1 { + pinctrl-0 = <&spi_0_pins>; + pinctrl-names = "default"; + status = "okay"; + cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <24000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition0@0 { + label = "SBL1"; + reg = <0x00000000 0x00040000>; + read-only; + }; + + partition1@40000 { + label = "MIBIB"; + reg = <0x00040000 0x00020000>; + read-only; + }; + + partition2@60000 { + label = "QSEE"; + reg = <0x00060000 0x00060000>; + read-only; + }; + + partition3@c0000 { + label = "CDT"; + reg = <0x000c0000 0x00010000>; + read-only; + }; + + partition4@d0000 { + label = "DDRPARAMS"; + reg = <0x000d0000 0x00010000>; + read-only; + }; + + partition5@E0000 { + label = "APPSBLENV"; + reg = <0x000e0000 0x00010000>; + read-only; + }; + + partition6@F0000 { + label = "APPSBL"; + reg = <0x000f0000 0x00080000>; + read-only; + }; + + partition7@170000 { + label = "ART"; + reg = <0x00170000 0x00010000>; + read-only; + }; + + partition9@580000 { + compatible = "denx,fit"; + label = "firmware"; + reg = <0x00180000 0x00e80000>; + }; + }; + }; +}; + +&blsp1_uart1 { + pinctrl-0 = <&serial_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&cryptobam { + status = "okay"; +}; + +&wifi0 { + status = "okay"; + qcom,ath10k-calibration-variant = "ezviz-cs-w3-wd1200g-eup"; +}; + +&wifi1 { + status = "okay"; + qcom,ath10k-calibration-variant = "ezviz-cs-w3-wd1200g-eup"; +}; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index f68a8d5288..0a8dca26bc 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -257,6 +257,22 @@ define Device/engenius_ens620ext endef TARGET_DEVICES += engenius_ens620ext +define Device/ezviz_cs-w3-wd1200g-eup + $(call Device/FitImage) + DEVICE_VENDOR := EZVIZ + DEVICE_MODEL := CS-W3-WD1200G + DEVICE_VARIANT := EUP + DEVICE_DTS_CONFIG := config@4 + IMAGE_SIZE := 14848k + SOC := qcom-ipq4018 + IMAGES := sysupgrade.bin + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata + DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers \ + ipq-wifi-ezviz_cs-w3-wd1200g-eup +endef +TARGET_DEVICES += ezviz_cs-w3-wd1200g-eup + define Device/glinet_gl-b1300 $(call Device/FitImage) DEVICE_VENDOR := GL.iNet diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch index 8e97b3b51b..d14b148cb2 100644 --- a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch @@ -10,12 +10,13 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -785,11 +785,38 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -785,11 +785,39 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ + qcom-ipq4018-a42.dtb \ + qcom-ipq4018-ap120c-ac.dtb \ ++ qcom-ipq4018-cs-w3-wd1200g-eup.dtb \ + qcom-ipq4018-ea6350v3.dtb \ + qcom-ipq4018-eap1300.dtb \ + qcom-ipq4018-ens620ext.dtb \ From ba8faa0fea45c47068f94734120d560ce083afbb Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 12 Jan 2020 15:34:57 +0100 Subject: [PATCH 290/480] generic: update config-4.14 Builds for kenrel 4.14 targetswere failing because of missing symbols for the B53 swconfig driver. Fixes: 313bde53ce944 ("generic: update config-4.19") Signed-off-by: David Bauer --- target/linux/generic/config-4.14 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index 18f5b1a00a..9681d9c278 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -4841,7 +4841,10 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_SWAP=y # CONFIG_SWCONFIG is not set # CONFIG_SWCONFIG_B53 is not set +# CONFIG_SWCONFIG_B53_MDIO_DRIVER is not set +# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set # CONFIG_SWCONFIG_B53_SPI_DRIVER is not set +# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set # CONFIG_SWCONFIG_LEDS is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set From 97940f876616ad3b6ff7f88d0c1303eaff774a0a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 14:35:15 +0100 Subject: [PATCH 291/480] kernel: remove obsolete kernel version switches After kernel 4.9 has been removed, this removes all (now obsolete) kernel version switches that deal with versions before 4.14. Package kmod-crypto-iv is empty now and thus removed entirely. Signed-off-by: Adrian Schmutzler --- include/netfilter.mk | 26 +++++++-------- .../linux/files/sysctl-tcp-bbr-k4_9.conf | 5 --- package/kernel/linux/modules/block.mk | 3 +- package/kernel/linux/modules/crypto.mk | 32 +++++-------------- package/kernel/linux/modules/fs.mk | 2 +- package/kernel/linux/modules/iio.mk | 6 ++-- package/kernel/linux/modules/lib.mk | 16 +++++----- package/kernel/linux/modules/netdevices.mk | 4 +-- package/kernel/linux/modules/netfilter.mk | 2 +- package/kernel/linux/modules/netsupport.mk | 22 ++++--------- package/kernel/linux/modules/other.mk | 20 ++++++------ package/kernel/linux/modules/sound.mk | 14 ++++---- package/kernel/linux/modules/usb.mk | 14 +++----- package/kernel/linux/modules/video.mk | 4 +-- package/kernel/linux/modules/w1.mk | 2 +- package/kernel/linux/modules/wireless.mk | 3 +- package/kernel/linux/modules/wpan.mk | 5 ++- package/kernel/rtl8812au-ct/Makefile | 2 +- 18 files changed, 69 insertions(+), 113 deletions(-) delete mode 100644 package/kernel/linux/files/sysctl-tcp-bbr-k4_9.conf diff --git a/include/netfilter.mk b/include/netfilter.mk index 009f3502ee..d06ace8e49 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -185,7 +185,7 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt)) # kernel only $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect, ge 3.19.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_MASQUERADE_IPV4, $(P_V4)nf_nat_masquerade_ipv4, lt 4.18),)) @@ -261,8 +261,8 @@ $(eval $(call nf_add,IPT_DEBUG,CONFIG_NETFILTER_XT_TARGET_TRACE, $(P_XT)xt_TRACE # tproxy $(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket)) -$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV4, $(P_V4)nf_socket_ipv4, ge 4.10)) -$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV6, $(P_V6)nf_socket_ipv6, ge 4.10)) +$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV4, $(P_V4)nf_socket_ipv4)) +$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV6, $(P_V6)nf_socket_ipv6)) $(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY)) $(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_TPROXY_IPV4, $(P_V4)nf_tproxy_ipv4, ge 4.18)) $(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_TPROXY_IPV6, $(P_V6)nf_tproxy_ipv6, ge 4.18)) @@ -273,8 +273,8 @@ $(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED)) # tee $(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE)) -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV4, $(P_V4)nf_dup_ipv4, ge 4.3),)) -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_ipv6, ge 4.3),)) +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV4, $(P_V4)nf_dup_ipv4),)) +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_ipv6),)) # u32 @@ -338,12 +338,10 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES, $(P_XT)nf_tables $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_INET, $(P_XT)nf_tables_inet, lt 4.17),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_EXTHDR, $(P_XT)nft_exthdr),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_META, $(P_XT)nft_meta),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_NUMGEN, $(P_XT)nft_numgen, ge 4.9.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_NUMGEN, $(P_XT)nft_numgen),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_RBTREE, $(P_XT)nft_set_rbtree, ge 4.9.0),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_RBTREE, $(P_XT)nft_rbtree, lt 4.9.0),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_HASH, $(P_XT)nft_set_hash, ge 4.9.0),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash, lt 4.9.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_RBTREE, $(P_XT)nft_set_rbtree),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_HASH, $(P_XT)nft_set_hash),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit),)) @@ -353,8 +351,8 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV4, $(P_V4)nf_t $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV6, $(P_V6)nf_tables_ipv6, lt 4.17),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REDIR, $(P_XT)nft_redir, ge 3.19.0),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_QUOTA, $(P_XT)nft_quota, ge 4.9.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REDIR, $(P_XT)nft_redir),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_QUOTA, $(P_XT)nft_quota),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_ARP,CONFIG_NF_TABLES_ARP, $(P_V4)nf_tables_arp, lt 4.17),)) @@ -364,11 +362,11 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_BRIDGE,CONFIG_NFT_BRIDGE_REJECT, $(P_EB $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_NAT, $(P_XT)nft_nat),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_CHAIN_NAT_IPV4, $(P_V4)nft_chain_nat_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_REDIR_IPV4, $(P_V4)nft_redir_ipv4, ge 3.19.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_REDIR_IPV4, $(P_V4)nft_redir_ipv4),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_MASQ, $(P_XT)nft_masq),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_MASQ_IPV4, $(P_V4)nft_masq_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_REDIR_IPV6, $(P_V6)nft_redir_ipv6, ge 3.19.0),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_REDIR_IPV6, $(P_V6)nft_redir_ipv6),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_MASQ_IPV6, $(P_V6)nft_masq_ipv6),)) diff --git a/package/kernel/linux/files/sysctl-tcp-bbr-k4_9.conf b/package/kernel/linux/files/sysctl-tcp-bbr-k4_9.conf deleted file mode 100644 index 2f63b72888..0000000000 --- a/package/kernel/linux/files/sysctl-tcp-bbr-k4_9.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Do not edit, changes to this file will be lost on upgrades -# /etc/sysctl.conf can be used to customize sysctl settings - -net.ipv4.tcp_congestion_control=bbr -net.core.default_qdisc=fq diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index c486a433c2..5530931db4 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -209,7 +209,6 @@ $(eval $(call KernelPackage,block2mtd)) define KernelPackage/dax SUBMENU:=$(BLOCK_MENU) TITLE:=DAX: direct access to differentiated memory - DEPENDS:=@!LINUX_4_9 KCONFIG:=CONFIG_DAX FILES:=$(LINUX_DIR)/drivers/dax/dax.ko endef @@ -220,7 +219,7 @@ $(eval $(call KernelPackage,dax)) define KernelPackage/dm SUBMENU:=$(BLOCK_MENU) TITLE:=Device Mapper - DEPENDS:=+kmod-crypto-manager +!LINUX_4_9:kmod-dax + DEPENDS:=+kmod-crypto-manager +kmod-dax # All the "=n" are unnecessary, they're only there # to stop the config from asking the question. # MIRROR is M because I've needed it for pvmove. diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 9e647eb18f..26873b404a 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -110,8 +110,8 @@ define KernelPackage/crypto-crc32 DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_CRC32 HIDDEN:=1 - FILES:=$(LINUX_DIR)/crypto/crc32_generic.ko@ge4.9 - AUTOLOAD:=$(call AutoLoad,04,crc32_generic@ge4.9,1) + FILES:=$(LINUX_DIR)/crypto/crc32_generic.ko + AUTOLOAD:=$(call AutoLoad,04,crc32_generic,1) $(call AddDepends/crypto) endef @@ -132,7 +132,7 @@ $(eval $(call KernelPackage,crypto-crc32c)) define KernelPackage/crypto-ctr TITLE:=Counter Mode CryptoAPI module - DEPENDS:=+kmod-crypto-manager +kmod-crypto-seqiv +kmod-crypto-iv + DEPENDS:=+kmod-crypto-manager +kmod-crypto-seqiv KCONFIG:=CONFIG_CRYPTO_CTR FILES:=$(LINUX_DIR)/crypto/ctr.ko AUTOLOAD:=$(call AutoLoad,09,ctr) @@ -156,7 +156,7 @@ $(eval $(call KernelPackage,crypto-cts)) define KernelPackage/crypto-deflate TITLE:=Deflate compression CryptoAPI module - DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +!LINUX_4_9:kmod-crypto-acompress + DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-crypto-acompress KCONFIG:=CONFIG_CRYPTO_DEFLATE FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,09,deflate) @@ -297,7 +297,7 @@ $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-hw-ccp TITLE:=AMD Cryptographic Coprocessor - DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +!LINUX_4_9:kmod-crypto-rsa + DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +kmod-crypto-rsa KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_CCP=y \ @@ -403,21 +403,6 @@ endef $(eval $(call KernelPackage,crypto-hw-talitos)) -define KernelPackage/crypto-iv - TITLE:=CryptoAPI initialization vectors - DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq - KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 - HIDDEN:=1 - FILES:= \ - $(LINUX_DIR)/crypto/eseqiv.ko@lt4.9 \ - $(LINUX_DIR)/crypto/chainiv.ko@lt4.9 - AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-iv)) - - define KernelPackage/crypto-kpp TITLE:=Key-agreement Protocol Primitives KCONFIG:=CONFIG_CRYPTO_KPP @@ -656,11 +641,10 @@ define KernelPackage/crypto-rng CONFIG_CRYPTO_JITTERENTROPY \ CONFIG_CRYPTO_RNG2 FILES:= \ - $(LINUX_DIR)/crypto/drbg.ko@ge4.2 \ - $(LINUX_DIR)/crypto/jitterentropy_rng.ko@ge4.2 \ - $(LINUX_DIR)/crypto/krng.ko@lt4.2 \ + $(LINUX_DIR)/crypto/drbg.ko \ + $(LINUX_DIR)/crypto/jitterentropy_rng.ko \ $(LINUX_DIR)/crypto/rng.ko - AUTOLOAD:=$(call AutoLoad,09,drbg@ge4.2 jitterentropy_rng@ge4.2 krng@lt4.2 rng) + AUTOLOAD:=$(call AutoLoad,09,drbg jitterentropy_rng rng) $(call AddDepends/crypto) endef diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 3ffe82cbe8..8709bdcbb1 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -68,7 +68,7 @@ $(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 +!LINUX_4_9:kmod-lib-zstd + 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_POSIX_ACL=n \ diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index 1ec3c968d3..ce6705a59a 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -17,10 +17,8 @@ define KernelPackage/iio-core CONFIG_IIO_TRIGGERED_BUFFER FILES:= \ $(LINUX_DIR)/drivers/iio/industrialio.ko \ - $(if $(CONFIG_IIO_TRIGGERED_BUFFER),$(LINUX_DIR)/drivers/iio/industrialio-triggered-buffer.ko@lt4.4) \ - $(if $(CONFIG_IIO_TRIGGERED_BUFFER),$(LINUX_DIR)/drivers/iio/buffer/industrialio-triggered-buffer.ko@ge4.4) \ - $(LINUX_DIR)/drivers/iio/kfifo_buf.ko@lt4.4 \ - $(LINUX_DIR)/drivers/iio/buffer/kfifo_buf.ko@ge4.4 + $(if $(CONFIG_IIO_TRIGGERED_BUFFER),$(LINUX_DIR)/drivers/iio/buffer/industrialio-triggered-buffer.ko) \ + $(LINUX_DIR)/drivers/iio/buffer/kfifo_buf.ko AUTOLOAD:=$(call AutoLoad,55,industrialio kfifo_buf industrialio-triggered-buffer) endef diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index 3e5a12e926..2aeaf2a858 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -101,17 +101,17 @@ $(eval $(call KernelPackage,lib-crc32c)) define KernelPackage/lib-lzo SUBMENU:=$(LIB_MENU) TITLE:=LZO support - DEPENDS:=+!LINUX_4_9:kmod-crypto-acompress + DEPENDS:=+kmod-crypto-acompress KCONFIG:= \ - CONFIG_CRYPTO_LZO@ge4.9 \ + CONFIG_CRYPTO_LZO \ CONFIG_LZO_COMPRESS \ CONFIG_LZO_DECOMPRESS HIDDEN:=1 FILES:= \ - $(LINUX_DIR)/crypto/lzo.ko@ge4.9 \ + $(LINUX_DIR)/crypto/lzo.ko \ $(LINUX_DIR)/lib/lzo/lzo_compress.ko \ $(LINUX_DIR)/lib/lzo/lzo_decompress.ko - AUTOLOAD:=$(call AutoProbe,lzo@ge4.9 lzo_compress lzo_decompress) + AUTOLOAD:=$(call AutoProbe,lzo lzo_compress lzo_decompress) endef define KernelPackage/lib-lzo/description @@ -146,17 +146,17 @@ $(eval $(call KernelPackage,lib-zstd)) define KernelPackage/lib-lz4 SUBMENU:=$(LIB_MENU) TITLE:=LZ4 support - DEPENDS:=+!LINUX_4_9:kmod-crypto-acompress + DEPENDS:=+kmod-crypto-acompress HIDDEN:=1 KCONFIG:= \ - CONFIG_CRYPTO_LZ4@ge4.9 \ + CONFIG_CRYPTO_LZ4 \ CONFIG_LZ4_COMPRESS \ CONFIG_LZ4_DECOMPRESS FILES:= \ - $(LINUX_DIR)/crypto/lz4.ko@ge4.9 \ + $(LINUX_DIR)/crypto/lz4.ko \ $(LINUX_DIR)/lib/lz4/lz4_compress.ko \ $(LINUX_DIR)/lib/lz4/lz4_decompress.ko - AUTOLOAD:=$(call AutoProbe,lz4@ge4.9 lz4_compress lz4_decompress) + AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress lz4_decompress) endef define KernelPackage/lib-lz4/description diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 61a19bf42f..610f7db82b 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -742,7 +742,7 @@ define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet KCONFIG:=CONFIG_TIGON3 \ CONFIG_TIGON3_HWMON=n - DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +LINUX_4_9:kmod-hwmon-core +kmod-ptp + DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +kmod-ptp SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko AUTOLOAD:=$(call AutoLoad,19,tg3,1) @@ -958,7 +958,7 @@ define KernelPackage/of-mdio DEPENDS:=+kmod-libphy KCONFIG:=CONFIG_OF_MDIO FILES:= \ - $(LINUX_DIR)/drivers/net/phy/fixed_phy.ko@ge4.9 \ + $(LINUX_DIR)/drivers/net/phy/fixed_phy.ko \ $(LINUX_DIR)/drivers/of/of_mdio.ko AUTOLOAD:=$(call AutoLoad,41,of_mdio) endef diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index cc4c5ecb2a..3ecbf868c2 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -152,7 +152,7 @@ define KernelPackage/nf-flow CONFIG_NETFILTER_INGRESS=y \ CONFIG_NF_FLOW_TABLE \ CONFIG_NF_FLOW_TABLE_HW - DEPENDS:=+kmod-nf-conntrack @!LINUX_4_9 + DEPENDS:=+kmod-nf-conntrack FILES:= \ $(LINUX_DIR)/net/netfilter/nf_flow_table.ko \ $(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 7d8a57d11a..3656441650 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -115,8 +115,7 @@ define KernelPackage/geneve +IPV6:kmod-udptunnel6 KCONFIG:=CONFIG_GENEVE FILES:= \ - $(LINUX_DIR)/net/ipv4/geneve.ko@le4.1 \ - $(LINUX_DIR)/drivers/net/geneve.ko@ge4.2 + $(LINUX_DIR)/drivers/net/geneve.ko AUTOLOAD:=$(call AutoLoad,13,geneve) endef @@ -133,7 +132,7 @@ define KernelPackage/nsh TITLE:=Network Service Header (NSH) protocol DEPENDS:= KCONFIG:=CONFIG_NET_NSH - FILES:=$(LINUX_DIR)/net/nsh/nsh.ko@ge4.14 + FILES:=$(LINUX_DIR)/net/nsh/nsh.ko AUTOLOAD:=$(call AutoLoad,13,nsh) endef @@ -247,7 +246,7 @@ define KernelPackage/ipsec DEPENDS:= \ +kmod-crypto-authenc +kmod-crypto-cbc +kmod-crypto-deflate \ +kmod-crypto-des +kmod-crypto-echainiv +kmod-crypto-hmac \ - +kmod-crypto-iv +kmod-crypto-md5 +kmod-crypto-sha1 + +kmod-crypto-md5 +kmod-crypto-sha1 KCONFIG:= \ CONFIG_NET_KEY \ CONFIG_XFRM_USER \ @@ -403,7 +402,7 @@ $(eval $(call KernelPackage,ip6-vti)) define KernelPackage/xfrm-interface SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec XFRM Interface - DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14 @!LINUX_4_9 + DEPENDS:=+kmod-ipsec4 +kmod-ipsec6 @!LINUX_4_14 KCONFIG:=CONFIG_XFRM_INTERFACE FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko AUTOLOAD:=$(call AutoProbe,xfrm_interface) @@ -935,7 +934,6 @@ $(eval $(call KernelPackage,sched)) define KernelPackage/tcp-bbr SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=BBR TCP congestion control - DEPENDS:=+LINUX_4_9:kmod-sched KCONFIG:= \ CONFIG_TCP_CONG_ADVANCED=y \ CONFIG_TCP_CONG_BBR @@ -949,11 +947,7 @@ define KernelPackage/tcp-bbr/description For kernel 4.13+, TCP internal pacing is implemented as fallback. endef -ifdef CONFIG_LINUX_4_9 - TCP_BBR_SYSCTL_CONF:=sysctl-tcp-bbr-k4_9.conf -else - TCP_BBR_SYSCTL_CONF:=sysctl-tcp-bbr.conf -endif +TCP_BBR_SYSCTL_CONF:=sysctl-tcp-bbr.conf define KernelPackage/tcp-bbr/install $(INSTALL_DIR) $(1)/etc/sysctl.d @@ -1135,10 +1129,8 @@ define KernelPackage/rxrpc CONFIG_RXKAD=m \ CONFIG_AF_RXRPC_DEBUG=n FILES:= \ - $(LINUX_DIR)/net/rxrpc/af-rxrpc.ko@lt4.11 \ - $(LINUX_DIR)/net/rxrpc/rxrpc.ko@ge4.11 \ - $(LINUX_DIR)/net/rxrpc/rxkad.ko@lt4.7 - AUTOLOAD:=$(call AutoLoad,30,rxkad@lt4.7 af-rxrpc.ko@lt4.11 rxrpc.ko@ge4.11) + $(LINUX_DIR)/net/rxrpc/rxrpc.ko + AUTOLOAD:=$(call AutoLoad,30,rxrpc.ko) DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt endef diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 0ffaac2014..3ba9bdb82c 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -30,7 +30,7 @@ $(eval $(call KernelPackage,6lowpan)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +kmod-crypto-cmac +kmod-regmap-core +!LINUX_4_9:kmod-crypto-ecdh + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +kmod-crypto-cmac +kmod-regmap-core +kmod-crypto-ecdh KCONFIG:= \ CONFIG_BT \ CONFIG_BT_BREDR=y \ @@ -144,7 +144,7 @@ define KernelPackage/nvmem TITLE:=Non Volatile Memory support KCONFIG:=CONFIG_NVMEM HIDDEN:=1 - FILES:=$(LINUX_DIR)/drivers/nvmem/nvmem_core.ko@ge4.9 + FILES:=$(LINUX_DIR)/drivers/nvmem/nvmem_core.ko endef define KernelPackage/nvmem/description @@ -219,14 +219,13 @@ $(eval $(call KernelPackage,gpio-dev)) define KernelPackage/gpio-mcp23s08 SUBMENU:=$(OTHER_MENU) TITLE:=Microchip MCP23xxx I/O expander - DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +!LINUX_4_9:kmod-regmap-i2c + DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-regmap-i2c KCONFIG:= \ CONFIG_GPIO_MCP23S08 \ CONFIG_PINCTRL_MCP23S08 FILES:= \ - $(LINUX_DIR)/drivers/gpio/gpio-mcp23s08.ko@lt4.13 \ - $(LINUX_DIR)/drivers/pinctrl/pinctrl-mcp23s08.ko@ge4.13 - AUTOLOAD:=$(call AutoLoad,40,gpio-mcp23s08@lt4.13 pinctrl-mcp23s08@ge4.13) + $(LINUX_DIR)/drivers/pinctrl/pinctrl-mcp23s08.ko + AUTOLOAD:=$(call AutoLoad,40,pinctrl-mcp23s08) endef define KernelPackage/gpio-mcp23s08/description @@ -349,8 +348,7 @@ define KernelPackage/mmc CONFIG_SDIO_UART=n FILES:= \ $(LINUX_DIR)/drivers/mmc/core/mmc_core.ko \ - $(LINUX_DIR)/drivers/mmc/card/mmc_block.ko@lt4.10 \ - $(LINUX_DIR)/drivers/mmc/core/mmc_block.ko@ge4.10 + $(LINUX_DIR)/drivers/mmc/core/mmc_block.ko AUTOLOAD:=$(call AutoProbe,mmc_core mmc_block,1) endef @@ -476,7 +474,7 @@ define KernelPackage/rtc-ds1307 SUBMENU:=$(OTHER_MENU) TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support DEFAULT:=m if ALL_KMODS && RTC_SUPPORT - DEPENDS:=+kmod-i2c-core +!LINUX_4_9:kmod-regmap-i2c +!LINUX_4_9:kmod-hwmon-core + DEPENDS:=+kmod-i2c-core +kmod-regmap-i2c +kmod-hwmon-core KCONFIG:=CONFIG_RTC_DRV_DS1307 \ CONFIG_RTC_CLASS=y FILES:=$(LINUX_DIR)/drivers/rtc/rtc-ds1307.ko @@ -734,8 +732,8 @@ define KernelPackage/serial-8250 CONFIG_SERIAL_8250_RSA=n FILES:= \ $(LINUX_DIR)/drivers/tty/serial/8250/8250.ko \ - $(LINUX_DIR)/drivers/tty/serial/8250/8250_base.ko@ge4.4 \ - $(if $(CONFIG_PCI),$(LINUX_DIR)/drivers/tty/serial/8250/8250_pci.ko@ge4.4) + $(LINUX_DIR)/drivers/tty/serial/8250/8250_base.ko \ + $(if $(CONFIG_PCI),$(LINUX_DIR)/drivers/tty/serial/8250/8250_pci.ko) AUTOLOAD:=$(call AutoProbe,8250 8250_base 8250_pci) endef diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index aa7eb72756..8cea4c4a7b 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -24,8 +24,7 @@ SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/soundcore.ko \ $(LINUX_DIR)/sound/core/snd.ko \ $(LINUX_DIR)/sound/core/snd-hwdep.ko \ - $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko@lt4.13 \ - $(LINUX_DIR)/sound/core/snd-seq-device.ko@ge4.13 \ + $(LINUX_DIR)/sound/core/snd-seq-device.ko \ $(LINUX_DIR)/sound/core/snd-rawmidi.ko \ $(LINUX_DIR)/sound/core/snd-timer.ko \ $(LINUX_DIR)/sound/core/snd-pcm.ko \ @@ -292,17 +291,17 @@ define KernelPackage/sound-hda-core SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio Sound Core Support KCONFIG:= \ - CONFIG_SND_HDA_CORE@ge4.1 \ + CONFIG_SND_HDA_CORE \ CONFIG_SND_HDA_HWDEP=y \ CONFIG_SND_HDA_RECONFIG=n \ CONFIG_SND_HDA_INPUT_BEEP=n \ CONFIG_SND_HDA_PATCH_LOADER=n \ CONFIG_SND_HDA_GENERIC FILES:= \ - $(LINUX_DIR)/sound/hda/snd-hda-core.ko@ge4.1 \ + $(LINUX_DIR)/sound/hda/snd-hda-core.ko \ $(LINUX_DIR)/sound/pci/hda/snd-hda-codec.ko \ $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-generic.ko - AUTOLOAD:=$(call AutoProbe,snd-hda-core@ge4.1 snd-hda-codec snd-hda-codec-generic) + AUTOLOAD:=$(call AutoProbe,snd-hda-core snd-hda-codec snd-hda-codec-generic) $(call AddDepends/sound,+kmod-regmap-core) endef @@ -507,9 +506,8 @@ define KernelPackage/sound-hda-intel CONFIG_SOUND_PCI \ CONFIG_SND_HDA_INTEL FILES:= \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-controller.ko@lt4.4 - AUTOLOAD:=$(call AutoProbe,snd-hda-controller@lt4.4 snd-hda-intel) + $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko + AUTOLOAD:=$(call AutoProbe,snd-hda-intel) $(call AddDepends/sound,kmod-sound-hda-core) endef diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index a95528a176..30be6221b7 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -75,8 +75,7 @@ define KernelPackage/usb-phy-qcom-dwc3 DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x) KCONFIG:= CONFIG_PHY_QCOM_DWC3 FILES:= \ - $(LINUX_DIR)/drivers/phy/phy-qcom-dwc3.ko@lt4.13 \ - $(LINUX_DIR)/drivers/phy/qualcomm/phy-qcom-dwc3.ko@ge4.13 + $(LINUX_DIR)/drivers/phy/qualcomm/phy-qcom-dwc3.ko AUTOLOAD:=$(call AutoLoad,45,phy-qcom-dwc3,1) $(call AddDepends/usb) endef @@ -442,9 +441,8 @@ define KernelPackage/usb-dwc2 CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n \ CONFIG_USB_DWC2_DEBUG_PERIODIC=n FILES:= \ - $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \ - $(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko@lt4.3 - AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform@lt4.3,1) + $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko + AUTOLOAD:=$(call AutoLoad,54,dwc2,1) $(call AddDepends/usb) endef @@ -1604,8 +1602,7 @@ define KernelPackage/usb-chipidea CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/extcon/extcon.ko@lt4.9 \ - $(LINUX_DIR)/drivers/extcon/extcon-core.ko@ge4.9 \ + $(LINUX_DIR)/drivers/extcon/extcon-core.ko \ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ $(LINUX_DIR)/drivers/usb/common/ulpi.ko@ge4.18 AUTOLOAD:=$(call AutoLoad,39,ci_hdrc,1) @@ -1629,8 +1626,7 @@ define KernelPackage/usb-chipidea2 CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/extcon/extcon.ko@lt4.9 \ - $(LINUX_DIR)/drivers/extcon/extcon-core.ko@ge4.9 \ + $(LINUX_DIR)/drivers/extcon/extcon-core.ko \ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_usb2.ko AUTOLOAD:=$(call AutoLoad,39,ci_hdrc_usb2,1) $(call AddDepends/usb) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 232dbd1d34..f726d0ef03 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -187,7 +187,7 @@ define KernelPackage/fb-tft SUBMENU:=$(VIDEO_MENU) TITLE:=Support for small TFT LCD display modules DEPENDS:= \ - @GPIO_SUPPORT @!LINUX_4_9 +kmod-backlight \ + @GPIO_SUPPORT +kmod-backlight \ +kmod-fb +kmod-fb-sys-fops +kmod-fb-sys-ram +kmod-spi-bitbang KCONFIG:= \ CONFIG_FB_BACKLIGHT=y \ @@ -447,7 +447,7 @@ define KernelPackage/video-videobuf2 $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-v4l2.ko@ge4.16 \ $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-memops.ko@ge4.16 \ $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-vmalloc.ko@ge4.16 - AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2@ge4.4 videobuf2-memops videobuf2-vmalloc) + AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2 videobuf2-memops videobuf2-vmalloc) $(call AddDepends/video) endef diff --git a/package/kernel/linux/modules/w1.mk b/package/kernel/linux/modules/w1.mk index 5055d78a18..6ac7458e42 100644 --- a/package/kernel/linux/modules/w1.mk +++ b/package/kernel/linux/modules/w1.mk @@ -14,7 +14,7 @@ define KernelPackage/w1 TITLE:=Dallas's 1-wire support KCONFIG:=CONFIG_W1 FILES:=$(LINUX_DIR)/drivers/w1/wire.ko - DEPENDS:=+!LINUX_4_9:kmod-hwmon-core + DEPENDS:=+kmod-hwmon-core endef define KernelPackage/w1/description diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk index 72e2bf477b..f7a40ba10a 100644 --- a/package/kernel/linux/modules/wireless.mk +++ b/package/kernel/linux/modules/wireless.mk @@ -13,8 +13,7 @@ define KernelPackage/net-prism54 DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +prism54-firmware KCONFIG:=CONFIG_PRISM54 FILES:= \ - $(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko@lt4.5 \ - $(LINUX_DIR)/drivers/net/wireless/intersil/prism54/prism54.ko@ge4.5 + $(LINUX_DIR)/drivers/net/wireless/intersil/prism54/prism54.ko AUTOLOAD:=$(call AutoProbe,prism54) endef diff --git a/package/kernel/linux/modules/wpan.mk b/package/kernel/linux/modules/wpan.mk index 1e986ee0ca..b9e9fa5699 100644 --- a/package/kernel/linux/modules/wpan.mk +++ b/package/kernel/linux/modules/wpan.mk @@ -15,7 +15,7 @@ define KernelPackage/ieee802154 CONFIG_IEEE802154_NL802154_EXPERIMENTAL=n FILES:= \ $(LINUX_DIR)/net/ieee802154/ieee802154.ko \ - $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko@ge4.0 + $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket) endef @@ -122,8 +122,7 @@ define KernelPackage/ieee802154_6lowpan DEPENDS:=+kmod-6lowpan +kmod-ieee802154 KCONFIG:=CONFIG_IEEE802154_6LOWPAN FILES:= \ - $(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko@ge4.0 \ - $(LINUX_DIR)/net/ieee802154/ieee802154_6lowpan.ko@lt4.0 + $(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan) endef diff --git a/package/kernel/rtl8812au-ct/Makefile b/package/kernel/rtl8812au-ct/Makefile index c68ae499d4..2d7cfebd54 100644 --- a/package/kernel/rtl8812au-ct/Makefile +++ b/package/kernel/rtl8812au-ct/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/rtl8812au-ct SUBMENU:=Wireless Drivers TITLE:=Driver for Realtek 8812 AU devices comfast 912-ac, etc - DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT @!LINUX_4_9 + DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT FILES:=\ $(PKG_BUILD_DIR)/rtl8812au.ko AUTOLOAD:=$(call AutoProbe,rtl8812au) From 8b86ddf4d5c486ddf76de844976245ba74bb1fdb Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 12 Jan 2020 18:05:52 +0100 Subject: [PATCH 292/480] netfilter: add back nft_hash nft_hash hash falsely removed in commit 97940f876616 ("kernel: remove obsolete kernel version switches"). Add the module back, as otherwise the build fails. Fixes: 97940f876616 ("kernel: remove obsolete kernel version switches") Signed-off-by: David Bauer --- include/netfilter.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/netfilter.mk b/include/netfilter.mk index d06ace8e49..a2af0104eb 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -342,6 +342,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_NUMGEN, $(P_XT)nft_numg $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_RBTREE, $(P_XT)nft_set_rbtree),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_HASH, $(P_XT)nft_set_hash),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit),)) From 3446702cdba0a1998a75468dfc7fbbc20f4a545d Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 12 Jan 2020 22:06:59 +0100 Subject: [PATCH 293/480] ethtool: bump to 5.4 7dc0af7 Release version 5.4. 914912e ethtool: add 0x16 and 0x1c extended compliance codes 600b779 ethtool: mark 10G Base-ER as SFF-8472 revision 10.4 onwards 696565d ethtool: correctly interpret bitrate of 255 2941970 fix unused parameter warning in e1000_get_mac_type() 5e814f2 fix unused parameter warning in fjes_dump_regs() b1a5279 fix unused parameter warning in ixgb_dump_regs() 6608751 fix unused parameter warning in ibm_emac_dump_regs() 1c30119 fix unused parameter warning in et131x_dump_regs() a56aba4 fix unused parameter warning in amd8111e_dump_regs() f40d32d fix unused parameter warning in fec_dump_regs() 8b84f1a fix unused parameter warning in at76c50x_usb_dump_regs() f725f5a fix unused parameter warning in smsc911x_dump_regs() a12cd66 fix unused parameter warning in e1000_dump_regs() e058656 fix unused parameter warning in igb_dump_regs() debac02 fix unused parameter warning in de2104[01]_dump_regs() d434eea fix unused parameter warning in e100_dump_regs() 8df12f3 fix unused parameter warning in vioc_dump_regs() 92d716b fix unused parameter warning in tg3_dump_{eeprom, regs}() 211c99e fix unused parameter warning in fec_8xx_dump_regs() 362fb8b fix unused parameter warning in ixgbevf_dump_regs() 87903c2 fix unused parameter warning in st_{mac100, gmac}_dump_regs() c1eaddf fix unused parameter warning in vmxnet3_dump_regs() 313c9f8 fix unused parameter warning in dsa_dump_regs() 183e8a2 fix unused parameter warning in {skge, sky2}_dump_regs() 7f84c13 fix unused parameter warning in lan78xx_dump_regs() 02d0aaa fix unused parameter warning in realtek_dump_regs() 726d607 fix unused parameter warning in ixgbe_dump_regs() 967177c fix unused parameter warning in netsemi_dump_eeprom() 710a414 fix unused parameter warning in natsemi_dump_regs() 283398a fix unused parameter warning in print_simple_table() 0404267 fix unused parameter warning in sfc_dump_regs() 57c7298 fix unused parameter warning in altera_tse_dump_regs() 302e91a fix unused parameter warning in dump_eeprom() 2054a8c fix unused parameter warning in find_option() d5432a9 fix unused parameter warnings in do_version() and show_usage() c430e75 fix arithmetic on pointer to void is a GNU extension warning e568431 ethtool: implement support for Energy Detect Power Down e391f4c ethtool: sync ethtool-copy.h: adds support for EDPD Signed-off-by: Hans Dedecker --- package/network/utils/ethtool/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index be9da7ff0b..c2f92a4ed9 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool -PKG_VERSION:=5.3 +PKG_VERSION:=5.4 PKG_RELEASE:=1 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/ethtool -PKG_HASH:=f3dac0dbce7066af05fbe92812cc33a042d03fb00a45bcf9959f20455efe24c4 +PKG_HASH:=22f81e4927d6eb6a13a259d705248a96005fce2005e15257f639f5a1c8c52b6b PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 19cbac7d264dfca1f75849de64beb98830fbb1e4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 27 Oct 2019 14:37:45 +0100 Subject: [PATCH 294/480] buildsystem: Make PIE ASLR option tristate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This tristate choose allows to select to build only some applications with PIE enabled. On MIPS binaries are getting about 30% bigger when PIE is activated for the, which is a huge increase. Network exposed applications like dnsmasq should then be build with PIE enabled, but some applications which are normally not parsing data from the network do not have it activated. The regular option should give a good trade off between extra flash and RAM memory usage and security. This changes the default from building no applications with PIE to build some specifically marked applications with PIE enabled. This option is only activated for targets with bigger flash and RAM to not consume extra memory on the very small targets. On SDK builds the Regular option should always be selected, because some tiny targets share the applications with big targets and only the images for the tiny targets should contain the none PIE applications, but the images for the normal targets should use PIE. The shared packages should always use PIE when it should be normally activated. Signed-off-by: Hauke Mehrtens Acked-by: Petr Štetiar --- config/Config-build.in | 22 ++++++++++++++++++---- include/hardening.mk | 9 ++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/config/Config-build.in b/config/Config-build.in index c0e4d869f8..59dfaea8bb 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -216,11 +216,10 @@ menu "Global build settings" this per package by adding PKG_CHECK_FORMAT_SECURITY:=0 in the package Makefile. - config PKG_ASLR_PIE - bool + choice prompt "User space ASLR PIE compilation" - select BUSYBOX_DEFAULT_PIE - default n + default PKG_ASLR_PIE_NONE if ((SMALL_FLASH || LOW_MEMORY_FOOTPRINT) && !SDK) + default PKG_ASLR_PIE_REGULAR help Add -fPIC to CFLAGS and -specs=hardened-build-ld to LDFLAGS. This enables package build as Position Independent Executables (PIE) @@ -231,6 +230,21 @@ menu "Global build settings" to predict when an attacker is attempting a memory-corruption exploit. You can disable this per package by adding PKG_ASLR_PIE:=0 in the package Makefile. + Be ware that ASLR increases the binary size. + config PKG_ASLR_PIE_NONE + bool "None" + help + PIE is deactivated for all applications + config PKG_ASLR_PIE_REGULAR + bool "Regular" + help + PIE is activated for some binaries, mostly network exposed applications + config PKG_ASLR_PIE_ALL + bool "All" + select BUSYBOX_DEFAULT_PIE + help + PIE is activated for all applications + endchoice choice prompt "User space Stack-Smashing Protection" diff --git a/include/hardening.mk b/include/hardening.mk index 60f39428e8..4e49e6b1b9 100644 --- a/include/hardening.mk +++ b/include/hardening.mk @@ -7,6 +7,7 @@ PKG_CHECK_FORMAT_SECURITY ?= 1 PKG_ASLR_PIE ?= 1 +PKG_ASLR_PIE_REGULAR ?= 0 PKG_SSP ?= 1 PKG_FORTIFY_SOURCE ?= 1 PKG_RELRO ?= 1 @@ -16,12 +17,18 @@ ifdef CONFIG_PKG_CHECK_FORMAT_SECURITY TARGET_CFLAGS += -Wformat -Werror=format-security endif endif -ifdef CONFIG_PKG_ASLR_PIE +ifdef CONFIG_PKG_ASLR_PIE_ALL ifeq ($(strip $(PKG_ASLR_PIE)),1) TARGET_CFLAGS += $(FPIC) TARGET_LDFLAGS += $(FPIC) -specs=$(INCLUDE_DIR)/hardened-ld-pie.specs endif endif +ifdef CONFIG_PKG_ASLR_PIE_REGULAR + ifeq ($(strip $(PKG_ASLR_PIE_REGULAR)),1) + TARGET_CFLAGS += $(FPIC) + TARGET_LDFLAGS += $(FPIC) -specs=$(INCLUDE_DIR)/hardened-ld-pie.specs + endif +endif ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR ifeq ($(strip $(PKG_SSP)),1) TARGET_CFLAGS += -fstack-protector From dae0ac77706ad2f1c638713a52bd7817b1a93b16 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 27 Oct 2019 14:48:24 +0100 Subject: [PATCH 295/480] dnsmasq: Activate PIE by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. This increases the binary size by 37% uncompressed and 18% compressed on MIPS BE. old: 146,933 /usr/sbin/dnsmasq 101,837 dnsmasq_2.80-14_mips_24kc.ipk new: 202,020 /usr/sbin/dnsmasq 120,577 dnsmasq_2.80-14_mips_24kc.ipk Signed-off-by: Hauke Mehrtens Acked-by: Petr Štetiar --- package/network/services/dnsmasq/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 60d16f3496..7d690af36d 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -24,6 +24,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_UPSTR PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_ASLR_PIE_REGULAR:=1 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcp \ CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcpv6 \ CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec \ From 7ab66130264a1955c45fa10c3b5acdd3ffc9d3f9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 27 Oct 2019 14:56:27 +0100 Subject: [PATCH 296/480] dropbear: Activate PIE by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. This increases the binary size by 18% uncompressed and 17% compressed on MIPS BE. old: 164,261 /usr/sbin/dropbear 85,648 dropbear_2019.78-2_mips_24kc.ipk new: 194,492 /usr/sbin/dropbear 100,309 dropbear_2019.78-2_mips_24kc.ipk Signed-off-by: Hauke Mehrtens Acked-by: Petr Štetiar --- package/network/services/dropbear/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index c55af45428..d92b94915b 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -22,6 +22,7 @@ PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE PKG_CPE_ID:=cpe:/a:matt_johnston:dropbear_ssh_server PKG_BUILD_PARALLEL:=1 +PKG_ASLR_PIE_REGULAR:=1 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf From 6b2379d048e7bce5148abaf737b3eea8b47fc2ca Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 27 Oct 2019 15:01:42 +0100 Subject: [PATCH 297/480] hostapd: Activate PIE by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. This increases the binary size by 26% uncompressed and 16% compressed on MIPS BE. old: 460,933 /usr/sbin/wpad 283,891 wpad-basic_2019-08-08-ca8c2bd2-1_mips_24kc.ipk new: 584,508 /usr/sbin/wpad 330,281 wpad-basic_2019-08-08-ca8c2bd2-1_mips_24kc.ipk Signed-off-by: Hauke Mehrtens Acked-by: Petr Štetiar --- package/network/services/hostapd/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 408c15390e..11d0d7a9ce 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -20,6 +20,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_CPE_ID:=cpe:/a:w1.fi:hostapd PKG_BUILD_PARALLEL:=1 +PKG_ASLR_PIE_REGULAR:=1 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-ath9k \ From a2571f3c81bcfa9a89df57869eed426ec3d4ce06 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 27 Oct 2019 15:13:30 +0100 Subject: [PATCH 298/480] uhttpd: Activate PIE by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. This increases the binary size by 39% uncompressed and 21% compressed on MIPS BE. old: 33,189 /usr/sbin/uhttpd 23,016 uhttpd_2019-08-17-6b03f960-4_mips_24kc.ipk new: 46,212 /usr/sbin/uhttpd 27,979 uhttpd_2019-08-17-6b03f960-4_mips_24kc.ipk Signed-off-by: Hauke Mehrtens Acked-by: Petr Štetiar --- package/network/services/uhttpd/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index e1418d64c4..36dbe636ae 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -18,6 +18,7 @@ PKG_MIRROR_HASH:=16977c2d7e68f6db3241f874df625af9bd3bafa06fe4499ecb3561c825321e5 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC +PKG_ASLR_PIE_REGULAR:=1 PKG_BUILD_DEPENDS = ustream-ssl PKG_CONFIG_DEPENDS:= CONFIG_uhttpd_lua From d38dd6e1ef2d48ce0a30c1c41cbff388e7903cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 9 Jan 2020 14:04:39 +0100 Subject: [PATCH 299/480] ubus: activate PIE ASLR by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. Size increase on x86/64: ubus Installed-Size: 5602 -> 5950 ubusd Installed-Size: 11643 -> 12119 Signed-off-by: Petr Štetiar --- package/system/ubus/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index aadef43af1..ab2cdbd99a 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -12,9 +12,10 @@ CMAKE_INSTALL:=1 PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:= - PKG_MAINTAINER:=Felix Fietkau +PKG_ASLR_PIE_REGULAR:=1 + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From 9c628cc76c1e3163b2666206cc35f673ee23ef1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 9 Jan 2020 14:05:39 +0100 Subject: [PATCH 300/480] procd: activate PIE ASLR by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. Size increase on x86/64: procd Installed-Size: 44931 -> 47362 Signed-off-by: Petr Štetiar --- package/system/procd/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 03afbadf3a..ee857f281f 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -22,6 +22,7 @@ PKG_LICENSE_FILES:= PKG_MAINTAINER:=John Crispin +PKG_ASLR_PIE_REGULAR:=1 PKG_CONFIG_DEPENDS:= \ CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP \ CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \ From 2b28358a371dc72a153e2937d47f8a9b9ad5007c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 9 Jan 2020 14:06:29 +0100 Subject: [PATCH 301/480] odhcpd: activate PIE ASLR by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. Size increase on x86/64: odhcpd-ipv6only Installed-Size: 36821 -> 38216 Signed-off-by: Petr Štetiar --- package/network/services/odhcpd/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 9994b6f6f6..3aaf70f289 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -21,6 +21,7 @@ PKG_LICENSE:=GPL-2.0 PKG_INSTALL:=1 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_odhcpd_$(BUILD_VARIANT)_ext_cer_id +PKG_ASLR_PIE_REGULAR:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From 3d62463755067656caaa404a0fa133b2e56179f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 9 Jan 2020 14:09:44 +0100 Subject: [PATCH 302/480] rpcd: activate PIE ASLR by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This activates PIE ASLR support by default when the regular option is selected. Signed-off-by: Petr Štetiar --- package/system/rpcd/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index fb0d040b0b..3e85f0ce11 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -21,6 +21,7 @@ PKG_LICENSE:=ISC PKG_LICENSE_FILES:= PKG_BUILD_PARALLEL:=1 +PKG_ASLR_PIE_REGULAR:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From 0f33c6b74a621f2b8bb5793c5e0d3121a1da09b2 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 7 Oct 2019 15:09:48 +0200 Subject: [PATCH 303/480] base-files: use jshn lib for ubus sysupgrade argument generation With this change the well known jshn library will be used, to build the json arguments for the ubus sysupgrade method. This is also used in all other shell program that uses JSON. This commit unifies that. Signed-off-by: Florian Eckert --- package/base-files/files/sbin/sysupgrade | 25 +++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 6c518b780e..abd34bdcfb 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -360,18 +360,15 @@ if [ -n "$FAILSAFE" ]; then printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade lock -u /tmp/.failsafe else - force_attr="" - [ $FORCE -eq 1 ] && force_attr="\"force\": true," - backup_attr="" - [ $SAVE_CONFIG -eq 1 ] && backup_attr="\"backup\": $(json_string $CONF_TAR)," - ubus call system sysupgrade "{ - \"prefix\": $(json_string "$RAM_ROOT"), - \"path\": $(json_string "$IMAGE"), - $force_attr - $backup_attr - \"command\": $(json_string "$COMMAND"), - \"options\": { - \"save_partitions\": $SAVE_PARTITIONS - } - }" + json_init + json_add_string prefix "$RAM_ROOT" + json_add_string path "$IMAGE" + [ $FORCE -eq 1 ] && json_add_boolean force 1 + [ $SAVE_CONFIG -eq 1 ] && json_add_string backup "$CONF_TAR" + json_add_string command "$COMMAND" + json_add_object options + json_add_int save_partitions "$SAVE_PARTITIONS" + json_close_object + + ubus call system sysupgrade "$(json_dump)" fi From 28080d54d217fb4ab112e079f69462fee695dbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 13 Jan 2020 17:52:46 +0100 Subject: [PATCH 304/480] ramips: mt7621: disable images for gehua_ghl-r-001 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This device OOPs during the boot due to broken flash. It can be probably fixed with `broken-flash-reset` once ramips is on 4.19 kernel. So disable images for this device until its fixed. Ref: FS#2695, PR#2483 Signed-off-by: Petr Štetiar --- target/linux/ramips/image/mt7621.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 767e63ccab..6521361868 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -301,6 +301,7 @@ define Device/gehua_ghl-r-001 DEVICE_MODEL := GHL-R-001 DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ kmod-usb-ledtrig-usbport wpad-basic + DEFAULT := n endef TARGET_DEVICES += gehua_ghl-r-001 From 2e05d6185aca35e75f64ab63ddd822166712f6aa Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Wed, 1 Jan 2020 10:00:07 +0100 Subject: [PATCH 305/480] ath79: add generic dtsi for Ubiquiti SW boards Signed-off-by: Tobias Schramm [remove ubnt,sw compatible] Signed-off-by: David Bauer --- .../ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts | 134 +---------------- target/linux/ath79/dts/ar7242_ubnt_sw.dtsi | 142 ++++++++++++++++++ 2 files changed, 143 insertions(+), 133 deletions(-) create mode 100644 target/linux/ath79/dts/ar7242_ubnt_sw.dtsi diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts index d5a2b85305..c7ec5cddc0 100644 --- a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts +++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts @@ -1,67 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include -#include - -#include "ar7242.dtsi" +#include "ar7242_ubnt_sw.dtsi" / { compatible = "ubnt,edgeswitch-8xp", "qca,ar7242"; model = "Ubiquiti EdgeSwitch 8XP"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - - aliases { - led-boot = &led_usr; - led-failsafe = &led_usr; - led-running = &led_usr; - led-upgrade = &led_usr; - }; - - leds { - compatible = "gpio-leds"; - - led_usr: usr { - label = "ubnt:yellow:usr"; - gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - linux,code = ; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; - }; - - gpio_spi { - compatible = "spi-gpio"; - #address-cells = <0x1>; - ranges; - - sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; - mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; - cs-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; - num-chipselects = <1>; - - gpio_hc595: gpio_spi@0 { - compatible = "fairchild,74hc595"; - reg = <0>; - registers-number = <2>; - spi-max-frequency = <100000>; - enable-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; - - gpio-controller; - #gpio-cells = <2>; - }; - }; - gpio-export { compatible = "gpio-export"; @@ -163,54 +108,6 @@ }; }; -&spi { - status = "okay"; - - num-cs = <1>; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - reg = <0x000000 0x040000>; - label = "u-boot"; - read-only; - }; - - partition@40000 { - reg = <0x040000 0x010000>; - label = "u-boot-env"; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - reg = <0x050000 0x760000>; - label = "firmware"; - }; - - partition@7b0000 { - reg = <0x7b0000 0x040000>; - label = "cfg"; - read-only; - }; - - art: partition@7f0000 { - reg = <0x7f0000 0x010000>; - label = "art"; - read-only; - }; - }; - }; -}; - &mdio0 { status = "okay"; @@ -278,29 +175,6 @@ }; }; -&usb_phy { - status = "okay"; -}; - -&usb { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - hub_port: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; -}; - -&pcie { - status = "okay"; -}; - -&uart { - status = "okay"; -}; - ð0 { status = "okay"; @@ -314,9 +188,3 @@ full-duplex; }; }; - -ð1 { - status = "okay"; - - mtd-mac-address = <&art 0x6>; -}; diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi new file mode 100644 index 0000000000..15f204729d --- /dev/null +++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar7242.dtsi" + +/ { + compatible = "qca,ar7242"; + model = "Ubiquiti Networks SW board"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &led_usr; + led-failsafe = &led_usr; + led-running = &led_usr; + led-upgrade = &led_usr; + }; + + leds { + compatible = "gpio-leds"; + + led_usr: usr { + label = "ubnt:yellow:usr"; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + linux,code = ; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + gpio_spi { + compatible = "spi-gpio"; + #address-cells = <0x1>; + ranges; + + sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; + cs-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; + num-chipselects = <1>; + + gpio_hc595: gpio_spi@0 { + compatible = "fairchild,74hc595"; + reg = <0>; + registers-number = <2>; + spi-max-frequency = <100000>; + enable-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; + + gpio-controller; + #gpio-cells = <2>; + + }; + }; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x040000>; + label = "u-boot"; + read-only; + }; + + partition@40000 { + reg = <0x040000 0x010000>; + label = "u-boot-env"; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + reg = <0x050000 0x760000>; + label = "firmware"; + }; + + partition@7b0000 { + reg = <0x7b0000 0x040000>; + label = "cfg"; + read-only; + }; + + art: partition@7f0000 { + reg = <0x7f0000 0x010000>; + label = "art"; + read-only; + }; + }; + }; +}; + +&usb_phy { + status = "okay"; +}; + +&usb { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_port: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + +&pcie { + status = "okay"; +}; + +&uart { + status = "okay"; +}; + +ð1 { + status = "okay"; + + mtd-mac-address = <&art 0x6>; +}; From 66eb88edb66d49939bda444ff36ea4bf0aaf9ae1 Mon Sep 17 00:00:00 2001 From: Tobias Schramm Date: Wed, 1 Jan 2020 10:01:48 +0100 Subject: [PATCH 306/480] ath79: add support for Ubiquiti EdgeSwitch/ToughSwitch 5XP The Ubiquiti ToughSwitch 5XP is a 5-port PoE Gigabit switch with a single Fast-Ethernet management port. It supports both 24V passive PoE out on all five ports. Flash: 8 MB RAM: 64 MB SoC: AR7242 Switch: ar8327 USB: 1x USB 2.0 Ethernet: 5x GbE, 1x FE Installation of the firmware is possible either via serial + tftpboot or the factory firmware update function via webinterface. By default the single Fast-Ethernet port labeled "MGMT" is configured as the WAN port. Thus access to the device is only possible via the five switch ports. Serial: 3v3 115200 8n1 The serial header is located in the lower left corner of the switches PCB: ``` | | | | o | o RX | o TX | o GND | | ++ +-++-+ ++ ++ + +--+ ++ +--++--++--+ ``` Signed-off-by: Tobias Schramm [remove ubnt,sw compatible - fix spelling - wrap commit message - remove superfluous phy-mode property] Signed-off-by: David Bauer --- .../ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts | 77 +++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 5 ++ target/linux/ath79/image/generic-ubnt.mk | 6 ++ 3 files changed, 88 insertions(+) create mode 100644 target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts new file mode 100644 index 0000000000..f524b2e88e --- /dev/null +++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar7242_ubnt_sw.dtsi" + +/ { + compatible = "ubnt,edgeswitch-5xp", "qca,ar7242"; + model = "Ubiquiti EdgeSwitch 5XP"; + + gpio-export { + compatible = "gpio-export"; + + poe_24v_port1 { + gpio-export,name = "ubnt:24v-poe:port1"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 1 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port2 { + gpio-export,name = "ubnt:24v-poe:port2"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 3 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port3 { + gpio-export,name = "ubnt:24v-poe:port3"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 5 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port4 { + gpio-export,name = "ubnt:24v-poe:port4"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 7 GPIO_ACTIVE_HIGH>; + }; + + poe_24v_port5 { + gpio-export,name = "ubnt:24v-poe:port5"; + gpio-export,output = <0>; + gpios = <&gpio_hc595 9 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy0: ethernet-switch@0 { + compatible = "qca,ar8327"; + reg = <0x0>; + + qca,ar8327-initvals = < + 0x04 0x05100000 /* PORT0 PAD MODE CTRL */ + 0x0c 0x05100000 /* PORT6 PAD MODE CTRL */ + 0x50 0x40004000 /* LED_CTRL0 */ + 0x54 0x40004000 /* LED_CTRL1 */ + 0x58 0x40004000 /* LED_CTRL2 */ + 0x5c 0x03ffff00 /* LED_CTRL3 */ + 0x7c 0x0000007e /* PORT0_STATUS */ + 0x94 0x0000007e /* PORT6_STATUS */ + >; + }; +}; + +ð0 { + status = "okay"; + + phy-handle = <&phy0>; + phy-mode = "rgmii"; + + mtd-mac-address = <&art 0x0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index ae857b1771..2bf5751a5c 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -259,6 +259,11 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:3" "4:lan:2" ;; + ubnt,edgeswitch-5xp) + ucidef_set_interface_wan "eth1" + ucidef_add_switch "switch0" \ + "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" + ;; ubnt,edgeswitch-8xp) ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 87e7f5cc32..78364caffe 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -129,6 +129,12 @@ define Device/ubnt_bullet-m-xw endef TARGET_DEVICES += ubnt_bullet-m-xw +define Device/ubnt_edgeswitch-5xp + $(Device/ubnt-sw) + DEVICE_MODEL := EdgeSwitch 5XP +endef +TARGET_DEVICES += ubnt_edgeswitch-5xp + define Device/ubnt_edgeswitch-8xp $(Device/ubnt-sw) DEVICE_MODEL := EdgeSwitch 8XP From c6e972c8772a628a1a2f2e5590d7c6f4acef9ab0 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 12 Jan 2020 00:36:42 +0100 Subject: [PATCH 307/480] ipq40xx: add support for Aruba AP-303H The Aruba AP-303H is the hospitality version of the Aruba AP-303 with a POE-passthrough enabled ethernet switch instead of a sigle PHY. Hardware -------- SoC: Qualcomm IPQ4029 RAM: 512M DDR3 FLASH: - 128MB SPI-NAND (Macronix) - 4MB SPI-NOR (Macronix MX25R3235F) TPM: Atmel AT97SC3203 BLE: Texas Instruments CC2540T attached to ttyMSM1 ETH: Qualcomm QCA8075 LED: WiFi (amber / green) System (red / green /amber) PSE (green) BTN: Reset USB: USB 2.0 To connect to the serial console, you can solder to the labled pads next to the USB port or use your Aruba supplied UARt adapter. Do NOT plug a standard USB cable into the Console labled USB-port! Aruba/HPE simply put UART on the micro-USB pins. You can solder yourself an adapter cable: VCC - NC D+ - TX D- - RX GND - GND The console setting in bootloader and OS is 9600 8N1. Voltage level is 3.3V. To enable a full list of commands in the U-Boot "help" command, execute the literal "diag" command. Installation ------------ 1. Get the OpenWrt initramfs image. Rename it to ipq40xx.ari and put it into the TFTP server root directory. Configure the TFTP server to be reachable at 192.168.1.75/24. Connect the machine running the TFTP server to the E0 (!) ethernet port of the access point, as it only tries to pull from the WAN port. 2. Connect to the serial console. Interrupt autobooting by pressing Enter when prompted. 3. Configure the bootargs and bootcmd for OpenWrt. $ setenv bootargs_openwrt "setenv bootargs console=ttyMSM0,9600n8" $ setenv nandboot_openwrt "run bootargs_openwrt; ubi part aos1; ubi read 0x85000000 kernel; set fdt_high 0x87000000; bootm 0x85000000" $ setenv ramboot_openwrt "run bootargs_openwrt; setenv ipaddr 192.168.1.105; setenv serverip 192.168.1.75; netget; set fdt_high 0x87000000; bootm" $ setenv bootcmd "run nandboot_openwrt" $ saveenv 4. Load OpenWrt into RAM: $ run ramboot_openwrt 5. After OpenWrt booted, transfer the OpenWrt sysupgrade image to the /tmp folder on the device. You will need to plug into E1-E3 ports of the access point to reach OpenWrt, as E0 is the WAN port of the device. 6. Flash OpenWrt: $ ubidetach -p /dev/mtd16 $ ubiformat /dev/mtd16 $ sysupgrade -n /tmp/openwrt-sysupgrade.bin To go back to the stock firmware, simply reset the bootcmd in the bootloader to the original value: $ setenv bootcmd "boot" $ saveenv Signed-off-by: David Bauer --- .../ipq40xx/base-files/etc/board.d/02_network | 5 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 6 +- .../base-files/lib/upgrade/platform.sh | 1 + .../arm/boot/dts/qcom-ipq4029-ap-303h.dts | 421 ++++++++++++++++++ target/linux/ipq40xx/image/Makefile | 10 + .../901-arm-boot-add-dts-files.patch | 3 +- 6 files changed, 443 insertions(+), 3 deletions(-) create mode 100644 target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 57caa88c85..59a2be0fe6 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -17,6 +17,11 @@ ipq40xx_setup_interfaces() engenius,ens620ext) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; + aruba,ap-303h) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ucidef_add_switch "switch0" \ + "0u@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "0u@eth1" "5:wan" + ;; asus,map-ac2200|\ cilab,meshpoint-one|\ openmesh,a42|\ diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 3616bff578..34ea5a5411 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -52,7 +52,8 @@ case "$FIRMWARE" in qcom,ap-dk01.1-c1) caldata_extract "ART" 0x1000 0x2f20 ;; - aruba,ap-303) + aruba,ap-303 |\ + aruba,ap-303h) caldata_extract "ART" 0x1000 0x2f20 ath10k_patch_mac $(mtd_get_mac_binary mfginfo 0x1D) ;; @@ -122,7 +123,8 @@ case "$FIRMWARE" in qcom,ap-dk01.1-c1) caldata_extract "ART" 0x5000 0x2f20 ;; - aruba,ap-303) + aruba,ap-303 |\ + aruba,ap-303h) caldata_extract "ART" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mfginfo 0x1D) +1) ;; diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index 60070fa9e3..cdf7a2b8f2 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -48,6 +48,7 @@ platform_do_upgrade() { case "$(board_name)" in 8dev,jalapeno |\ aruba,ap-303 |\ + aruba,ap-303h |\ avm,fritzbox-7530 |\ avm,fritzrepeater-1200 |\ avm,fritzrepeater-3000 |\ diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts new file mode 100644 index 0000000000..0859f97c9e --- /dev/null +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -0,0 +1,421 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT + +#include "qcom-ipq4019.dtsi" +#include +#include +#include + +/ { + model = "Aruba AP-303H"; + compatible = "aruba,ap-303h"; + + aliases { + led-boot = &led_system_green; + led-failsafe = &led_system_red; + led-running = &led_system_green; + led-upgrade = &led_system_amber; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x10000000>; + }; + + soc { + rng@22000 { + status = "okay"; + }; + + mdio@90000 { + status = "okay"; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + + reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>; + reset-delay-us = <2000>; + }; + + counter@4a1000 { + compatible = "qcom,qca-gcnt"; + reg = <0x4a1000 0x4>; + }; + + ess_tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + tcsr@194b000 { + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + + usb2@60f8800 { + status = "okay"; + }; + + crypto@8e3a000 { + status = "okay"; + }; + + watchdog@b017000 { + status = "okay"; + }; + + ess-switch@c000000 { + status = "okay"; + }; + + edma@c080000 { + status = "okay"; + }; + + i2c_0: i2c@78b7000 { + pinctrl-0 = <&i2c_0_pins>; + pinctrl-names = "default"; + status = "ok"; + + tpm@29 { + /* No Driver */ + compatible = "atmel,at97sc3203"; + reg = <0x29>; + read-only; + }; + + power-monitor@40 { + /* No driver */ + compatible = "isl,isl28022"; + reg = <0x40>; + }; + }; + }; + + leds { + compatible = "gpio-leds"; + + wifi_green { + label = "ap-303h:green:wifi"; + gpios = <&tlmm 27 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; + }; + + wifi_amber { + label = "ap-303h:amber:wifi"; + gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1tpt"; + }; + + pse { + label = "ap-303h:green:pse"; + gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>; + }; + + led_system_red: system_red { + label = "ap-303h:red:system"; + gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; + }; + + led_system_green: system_green { + label = "ap-303h:green:system"; + gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>; + }; + + led_system_amber: system_amber { + label = "ap-303h:amber:system"; + gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset button"; + gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&blsp_dma { + status = "okay"; +}; + +&blsp1_uart1 { + pinctrl-0 = <&serial_0_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&blsp1_uart2 { + /* Texas Instruments CC2540T BLE radio */ + pinctrl-0 = <&serial_1_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&cryptobam { + status = "okay"; +}; + +&qpic_bam { + status = "okay"; +}; + +&tlmm { + /* + * In addition to the Pins listed below, + * the following GPIOs have "features": + * 39 - out - active low to force HW reset + * 32 - out - active low to reset TPM + * 43 - out - active low to reset BLE radio + * 41 - out - pulse to set warm reset status + * 34 - out - active low to enable PSE port + * 22 - in - active low when 802.3at powered + * 29 - in - active high when DC powered + * 40 - in - active low when reset due to cold HW reset + * 30 - in - active low when USB overcurrent detected + * 35 - in - interrupt line for power monitor chip + * 31 - in - active low when PSE port active + */ + mdio_pins: mdio_pinmux { + mux_1 { + pins = "gpio6"; + function = "mdio"; + bias-pull-up; + }; + mux_2 { + pins = "gpio7"; + function = "mdc"; + bias-pull-up; + }; + }; + + spi_0_pins: spi_0_pinmux { + pin { + function = "blsp_spi0"; + pins = "gpio13", "gpio14", "gpio15"; + drive-strength = <12>; + bias-disable; + }; + pin_cs { + function = "gpio"; + pins = "gpio12", "gpio59"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; + + i2c_0_pins: i2c_0_pinmux { + mux { + pins = "gpio20", "gpio21"; + function = "blsp_i2c0"; + drive-strength = <4>; + bias-disable; + }; + }; + + serial_0_pins: serial_0_pinmux { + mux { + pins = "gpio16", "gpio17"; + function = "blsp_uart0"; + bias-disable; + }; + }; + + serial_1_pins: serial_1_pinmux { + mux { + pins = "gpio8", "gpio9"; + function = "blsp_uart1"; + bias-disable; + }; + }; + + usb-power { + line-name = "USB-power"; + gpios = <23 GPIO_ACTIVE_HIGH>; + gpio-hog; + output-high; + }; +}; + +&blsp1_spi1 { + pinctrl-0 = <&spi_0_pins>; + pinctrl-names = "default"; + status = "okay"; + cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>, <&tlmm 59 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <24000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* + * There is no partition map for the NOR flash + * in the stock firmware. + * + * All partitions here are based on offsets + * found in the U-Boot GPL code and information + * from smem. + */ + + partition@0 { + label = "sbl1"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "mibib"; + reg = <0x40000 0x20000>; + read-only; + }; + + partition@60000 { + label = "qsee"; + reg = <0x60000 0x60000>; + read-only; + }; + + partition@c0000 { + label = "cdt"; + reg = <0xc0000 0x10000>; + read-only; + }; + + partition@d0000 { + label = "ddrparams"; + reg = <0xd0000 0x10000>; + read-only; + }; + + partition@e0000 { + label = "appsblenv"; + reg = <0xe0000 0x10000>; + read-only; + }; + + partition@f0000 { + label = "appsbl"; + reg = <0xf0000 0x100000>; + read-only; + }; + + partition@1e0000 { + label = "ART"; + reg = <0x1f0000 0x10000>; + read-only; + }; + + partition@1f0000 { + label = "osss"; + reg = <0x200000 0x170000>; + read-only; + }; + + partition@200000 { + label = "pds"; + reg = <0x370000 0x10000>; + read-only; + }; + + partition@380000 { + label = "apcd"; + reg = <0x380000 0x10000>; + read-only; + }; + + partition@390000 { + label = "mfginfo"; + reg = <0x390000 0x10000>; + read-only; + }; + + partition@3a0000 { + label = "fcache"; + reg = <0x3a0000 0x10000>; + read-only; + }; + + partition@3b0000 { + /* Called osss1 in smem */ + label = "u-boot-env-bak"; + reg = <0x3b0000 0x10000>; + read-only; + }; + + partition@3f0000 { + label = "u-boot-env"; + reg = <0x3c0000 0x40000>; + read-only; + }; + }; + }; + + flash@1 { + status = "okay"; + + compatible = "spi-nand"; + reg = <1>; + spi-max-frequency = <24000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + /* 'aos0' in Aruba firmware */ + label = "aos0"; + reg = <0x0 0x2000000>; + read-only; + }; + + partition@2000000 { + /* 'aos1' in Aruba firmware */ + label = "ubi"; + reg = <0x2000000 0x2000000>; + }; + + partition@4000000 { + label = "aruba-ubifs"; + reg = <0x4000000 0x4000000>; + read-only; + }; + }; + }; +}; + +&usb2_hs_phy { + status = "okay"; +}; + +&wifi0 { + status = "okay"; + qcom,ath10k-calibration-variant = "Aruba-AP-303"; +}; + +&wifi1 { + status = "okay"; + qcom,ath10k-calibration-variant = "Aruba-AP-303"; +}; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 0a8dca26bc..588a24c2fe 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -102,6 +102,16 @@ define Device/aruba_ap-303 endef TARGET_DEVICES += aruba_ap-303 +define Device/aruba_ap-303h + $(call Device/FitImageLzma) + DEVICE_VENDOR := Aruba + DEVICE_MODEL := AP-303H + SOC := qcom-ipq4029 + DEVICE_PACKAGES := ipq-wifi-aruba_ap-303 + IMAGES := sysupgrade.bin +endef +TARGET_DEVICES += aruba_ap-303h + define Device/asus_map-ac2200 $(call Device/FitImageLzma) DEVICE_VENDOR := ASUS diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch index d14b148cb2..099a2c7cdb 100644 --- a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -785,11 +785,39 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -785,11 +785,40 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ @@ -45,6 +45,7 @@ Signed-off-by: John Crispin + qcom-ipq4019-wpj419.dtb \ + qcom-ipq4028-wpj428.dtb \ + qcom-ipq4029-ap-303.dtb \ ++ qcom-ipq4029-ap-303h.dtb \ + qcom-ipq4029-gl-b1300.dtb \ + qcom-ipq4029-mr33.dtb \ qcom-ipq8064-ap148.dtb \ From e845c094d5c9d6afbb1ab3f0815d6ed546b9d429 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 16:27:50 +0100 Subject: [PATCH 308/480] mediatek: split base-files into subtargets This splits some base-files across subtargets, as done previously on ath79 and ramips and also introduced for mt7629 subtarget here already. Most of the existing base-files content is specific to mt7623. While at it, apply the following fixes: - Remove lots of trailing whitespaces - Remove wildcard on unielec,u7623-02-emmc-512m - Remove inconsistent quotation marks in cases Signed-off-by: Adrian Schmutzler Acked-by: John Crispin --- .../mt7622/base-files/etc/board.d/02_network | 29 ++++++++++++++ .../mt7622/base-files/lib/upgrade/platform.sh | 26 ++++++++++++ .../base-files/etc/board.d/02_network | 11 +++-- .../base-files/lib/preinit/07_set_iface_mac | 2 +- .../base-files/lib/preinit/79_move_config | 0 .../base-files/lib/upgrade/platform.sh | 40 +++++++++---------- 6 files changed, 81 insertions(+), 27 deletions(-) create mode 100755 target/linux/mediatek/mt7622/base-files/etc/board.d/02_network create mode 100755 target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh rename target/linux/mediatek/{ => mt7623}/base-files/etc/board.d/02_network (74%) rename target/linux/mediatek/{ => mt7623}/base-files/lib/preinit/07_set_iface_mac (97%) rename target/linux/mediatek/{ => mt7623}/base-files/lib/preinit/79_move_config (100%) rename target/linux/mediatek/{ => mt7623}/base-files/lib/upgrade/platform.sh (50%) diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..d719a35dec --- /dev/null +++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network @@ -0,0 +1,29 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh + +mediatek_setup_interfaces() +{ + local board="$1" + + case $board in + esac +} + +mediatek_setup_macs() +{ + local board="$1" + + case $board in + esac +} + +board_config_update +board=$(board_name) +mediatek_setup_interfaces $board +mediatek_setup_macs $board +board_config_flush + +exit 0 diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..f2264592a4 --- /dev/null +++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh @@ -0,0 +1,26 @@ +platform_do_upgrade() { + local board=$(board_name) + + case "$board" in + *) + default_do_upgrade "$1" + ;; + esac +} + +PART_NAME=firmware + +platform_check_image() { + local board=$(board_name) + + [ "$#" -gt 1 ] && return 1 + + case "$board" in + *) + echo "Sysupgrade is not supported on your board yet." + return 1 + ;; + esac + + return 0 +} diff --git a/target/linux/mediatek/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network similarity index 74% rename from target/linux/mediatek/base-files/etc/board.d/02_network rename to target/linux/mediatek/mt7623/base-files/etc/board.d/02_network index faa2434241..07fd63fba7 100755 --- a/target/linux/mediatek/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network @@ -9,12 +9,12 @@ mediatek_setup_interfaces() local board="$1" case $board in - 'mediatek,mt7623a-rfb-emmc') + mediatek,mt7623a-rfb-emmc) ucidef_set_interface_lan "lan0 lan1 lan2 lan3" ucidef_set_interface_wan eth1 ;; - 'bananapi,bpi-r2'|\ - "unielec,u7623"*) + bananapi,bpi-r2|\ + unielec,u7623-02-emmc-512m) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" "wan" ;; esac @@ -25,9 +25,8 @@ mediatek_setup_macs() local board="$1" case $board in - "unielec,u7623"*) - mac=$(cat /sys/class/net/wan/address) - ucidef_set_interface_macaddr "wan" $mac + unielec,u7623-02-emmc-512m) + ucidef_set_interface_macaddr "wan" "$(cat /sys/class/net/wan/address)" ;; esac } diff --git a/target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac b/target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac similarity index 97% rename from target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac rename to target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac index 3d04000738..7a73a2d84d 100644 --- a/target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac +++ b/target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac @@ -10,7 +10,7 @@ preinit_set_mac_address() { . /lib/functions/system.sh case $(board_name) in - "unielec,u7623"*) + unielec,u7623-02-emmc-512m) if [ -b $RECOVERY_PART ]; then insmod nls_cp437 insmod nls_iso8859-1 diff --git a/target/linux/mediatek/base-files/lib/preinit/79_move_config b/target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config similarity index 100% rename from target/linux/mediatek/base-files/lib/preinit/79_move_config rename to target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config diff --git a/target/linux/mediatek/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh similarity index 50% rename from target/linux/mediatek/base-files/lib/upgrade/platform.sh rename to target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh index 9c99ee1c18..225fec0bca 100755 --- a/target/linux/mediatek/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh @@ -1,7 +1,8 @@ -platform_do_upgrade() { +platform_do_upgrade() { local board=$(board_name) + case "$board" in - "unielec,u7623"*) + unielec,u7623-02-emmc-512m) #Keep the persisten random mac address (if it exists) mkdir -p /tmp/recovery mount -o rw,noatime /dev/mmcblk0p1 /tmp/recovery @@ -26,29 +27,28 @@ platform_do_upgrade() { PART_NAME=firmware -platform_check_image() { - local board=$(board_name) - local magic="$(get_magic_long "$1")" +platform_check_image() { + local board=$(board_name) + local magic="$(get_magic_long "$1")" - [ "$#" -gt 1 ] && return 1 + [ "$#" -gt 1 ] && return 1 - case "$board" in + case "$board" in bananapi,bpi-r2|\ - "unielec,u7623"*) - [ "$magic" != "27051956" ] && { + unielec,u7623-02-emmc-512m) + [ "$magic" != "27051956" ] && { echo "Invalid image type." - return 1 - } - return 0 - ;; - - *) + return 1 + } + return 0 + ;; + *) echo "Sysupgrade is not supported on your board yet." - return 1 - ;; - esac + return 1 + ;; + esac - return 0 + return 0 } platform_copy_config_emmc() { @@ -61,7 +61,7 @@ platform_copy_config_emmc() { platform_copy_config() { case "$(board_name)" in - "unielec,u7623"*) + unielec,u7623-02-emmc-512m) platform_copy_config_emmc ;; esac From fe1818cdbc70331228506a543a9a6ac50cb90018 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 13 Jan 2020 19:38:55 +0100 Subject: [PATCH 309/480] mac80211: renumber subsys patches accepted upstream Signed-off-by: Felix Fietkau --- ...01-mac80211-minstrel-remove-divisions-in-tx-status-path.patch} | 0 ...02-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch} | 0 ...03-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch} | 0 ...04-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename package/kernel/mac80211/patches/subsys/{360-mac80211-minstrel-remove-divisions-in-tx-status-path.patch => 301-mac80211-minstrel-remove-divisions-in-tx-status-path.patch} (100%) rename package/kernel/mac80211/patches/subsys/{361-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch => 302-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch} (100%) rename package/kernel/mac80211/patches/subsys/{362-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch => 303-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch} (100%) rename package/kernel/mac80211/patches/subsys/{364-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch => 304-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch} (100%) diff --git a/package/kernel/mac80211/patches/subsys/360-mac80211-minstrel-remove-divisions-in-tx-status-path.patch b/package/kernel/mac80211/patches/subsys/301-mac80211-minstrel-remove-divisions-in-tx-status-path.patch similarity index 100% rename from package/kernel/mac80211/patches/subsys/360-mac80211-minstrel-remove-divisions-in-tx-status-path.patch rename to package/kernel/mac80211/patches/subsys/301-mac80211-minstrel-remove-divisions-in-tx-status-path.patch diff --git a/package/kernel/mac80211/patches/subsys/361-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch b/package/kernel/mac80211/patches/subsys/302-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch similarity index 100% rename from package/kernel/mac80211/patches/subsys/361-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch rename to package/kernel/mac80211/patches/subsys/302-mac80211-minstrel_ht-replace-rate-stats-ewma-with-a-.patch diff --git a/package/kernel/mac80211/patches/subsys/362-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch b/package/kernel/mac80211/patches/subsys/303-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch similarity index 100% rename from package/kernel/mac80211/patches/subsys/362-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch rename to package/kernel/mac80211/patches/subsys/303-mac80211-minstrel_ht-rename-prob_ewma-to-prob_avg-us.patch diff --git a/package/kernel/mac80211/patches/subsys/364-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch b/package/kernel/mac80211/patches/subsys/304-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch similarity index 100% rename from package/kernel/mac80211/patches/subsys/364-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch rename to package/kernel/mac80211/patches/subsys/304-mac80211-sta-randomize-BA-session-dialog-token-alloc.patch From d5b3024139089e38f57bd1827273d7fba8497635 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 13 Jan 2020 19:43:20 +0100 Subject: [PATCH 310/480] mac80211: fix sta TID stats leak on a few nl80211 calls Signed-off-by: Felix Fietkau --- ...mory-leak-in-nl80211_probe_mesh_link.patch | 22 +++++++++++++++++++ ...ory-leak-in-cfg80211_cqm_rssi_update.patch | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 package/kernel/mac80211/patches/subsys/350-cfg80211-fix-memory-leak-in-nl80211_probe_mesh_link.patch create mode 100644 package/kernel/mac80211/patches/subsys/351-cfg80211-fix-memory-leak-in-cfg80211_cqm_rssi_update.patch diff --git a/package/kernel/mac80211/patches/subsys/350-cfg80211-fix-memory-leak-in-nl80211_probe_mesh_link.patch b/package/kernel/mac80211/patches/subsys/350-cfg80211-fix-memory-leak-in-nl80211_probe_mesh_link.patch new file mode 100644 index 0000000000..aea1c89dce --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/350-cfg80211-fix-memory-leak-in-nl80211_probe_mesh_link.patch @@ -0,0 +1,22 @@ +From: Felix Fietkau +Date: Wed, 8 Jan 2020 18:00:41 +0100 +Subject: [PATCH] cfg80211: fix memory leak in nl80211_probe_mesh_link + +The per-tid statistics need to be released after the call to rdev_get_station + +Cc: stable@vger.kernel.org +Fixes: 5ab92e7fe49a ("cfg80211: add support to probe unexercised mesh link") +Signed-off-by: Felix Fietkau +--- + +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -13808,6 +13808,8 @@ static int nl80211_probe_mesh_link(struc + if (err) + return err; + ++ cfg80211_sinfo_release_content(&sinfo); ++ + return rdev_probe_mesh_link(rdev, dev, dest, buf, len); + } + diff --git a/package/kernel/mac80211/patches/subsys/351-cfg80211-fix-memory-leak-in-cfg80211_cqm_rssi_update.patch b/package/kernel/mac80211/patches/subsys/351-cfg80211-fix-memory-leak-in-cfg80211_cqm_rssi_update.patch new file mode 100644 index 0000000000..77f5f8b306 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/351-cfg80211-fix-memory-leak-in-cfg80211_cqm_rssi_update.patch @@ -0,0 +1,21 @@ +From: Felix Fietkau +Date: Wed, 8 Jan 2020 18:03:04 +0100 +Subject: [PATCH] cfg80211: fix memory leak in cfg80211_cqm_rssi_update + +The per-tid statistics need to be released after the call to rdev_get_station + +Cc: stable@vger.kernel.org +Fixes: 8689c051a201 ("cfg80211: dynamically allocate per-tid stats for station info") +Signed-off-by: Felix Fietkau +--- + +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -10847,6 +10847,7 @@ static int cfg80211_cqm_rssi_update(stru + if (err) + return err; + ++ cfg80211_sinfo_release_content(&sinfo); + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG)) + wdev->cqm_config->last_rssi_event_value = + (s8) sinfo.rx_beacon_signal_avg; From 9501469e1146c6d76b7dde6391479314897ba4d8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 13 Jan 2020 19:43:40 +0100 Subject: [PATCH 311/480] mac80211: fix a page refcounting issue leading to leaks/crashes in rx A-MSDU decap Signed-off-by: Felix Fietkau --- ...-page-refcount-issue-in-A-MSDU-decap.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/kernel/mac80211/patches/subsys/352-cfg80211-fix-page-refcount-issue-in-A-MSDU-decap.patch diff --git a/package/kernel/mac80211/patches/subsys/352-cfg80211-fix-page-refcount-issue-in-A-MSDU-decap.patch b/package/kernel/mac80211/patches/subsys/352-cfg80211-fix-page-refcount-issue-in-A-MSDU-decap.patch new file mode 100644 index 0000000000..b7a291cc46 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/352-cfg80211-fix-page-refcount-issue-in-A-MSDU-decap.patch @@ -0,0 +1,25 @@ +From: Felix Fietkau +Date: Mon, 13 Jan 2020 18:34:31 +0100 +Subject: [PATCH] cfg80211: fix page refcount issue in A-MSDU decap + +The fragments attached to a skb can be part of a compound page. In that case, +page_ref_inc will increment the refcount for the wrong page. Fix this by +using get_page instead, which calls page_ref_inc on the compound head and +also checks for overflow. + +Fixes: 2b67f944f88c ("cfg80211: reuse existing page fragments in A-MSDU rx") +Cc: stable@vger.kernel.org +Signed-off-by: Felix Fietkau +--- + +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -564,7 +564,7 @@ __frame_add_frag(struct sk_buff *skb, st + struct skb_shared_info *sh = skb_shinfo(skb); + int page_offset; + +- page_ref_inc(page); ++ get_page(page); + page_offset = ptr - page_address(page); + skb_add_rx_frag(skb, sh->nr_frags, page, page_offset, len, size); + } From b1a1c222c93bb4e8f2d2e13f50fe6329e523ae3b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 13 Jan 2020 22:10:03 +0100 Subject: [PATCH 312/480] mac80211: fix list_phy_interfaces for multiple wiphys on the same device Network interfaces are looked up based on the device behind a phy, so the phy needs to be checked separately Signed-off-by: Felix Fietkau --- .../mac80211/files/lib/netifd/wireless/mac80211.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index f1882ec509..b0fc5fb37b 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -983,7 +983,7 @@ drv_mac80211_setup() { wireless_set_up } -list_phy_interfaces() { +_list_phy_interfaces() { local phy="$1" if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null; @@ -992,6 +992,15 @@ list_phy_interfaces() { fi } +list_phy_interfaces() { + local phy="$1" + + for dev in $(_list_phy_interfaces "$phy"); do + readlink "/sys/class/net/${dev}/phy80211" | grep -q "/${phy}\$" || continue + echo "$dev" + done +} + drv_mac80211_teardown() { wireless_process_kill_all From 0e05093b12ef1aaedda79194cd7d602b52a2ed60 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 14 Jan 2020 16:50:08 +0100 Subject: [PATCH 313/480] netfilter: package required kmods for nftables Package new kmods "nf_tables_set" and "nft_objref" which got introduced with kernel 4.18 and restrict the old "nft_set_rbtree" and "nft_set_hash" modules to sub-4.18 versions. Also reorder the nftables related netfilter.mk entries alphabetically while touching this code section. Fixes: FS#2699 Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2699#comment7450 Signed-off-by: Jo-Philipp Wich --- include/netfilter.mk | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index a2af0104eb..c62b9a827f 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -336,24 +336,26 @@ $(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nf # nftables $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES, $(P_XT)nf_tables),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_INET, $(P_XT)nf_tables_inet, lt 4.17),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV4, $(P_V4)nf_tables_ipv4, lt 4.17),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV6, $(P_V6)nf_tables_ipv6, lt 4.17),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_SET, $(P_XT)nf_tables_set, ge 4.18),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_EXTHDR, $(P_XT)nft_exthdr),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_META, $(P_XT)nft_meta),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_NUMGEN, $(P_XT)nft_numgen),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_RBTREE, $(P_XT)nft_set_rbtree),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_HASH, $(P_XT)nft_set_hash),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_OBJREF, $(P_XT)nft_objref),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_QUOTA, $(P_XT)nft_quota),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REDIR, $(P_XT)nft_redir),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT, $(P_XT)nft_reject $(P_V4)nft_reject_ipv4 $(P_V6)nft_reject_ipv6),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT_INET, $(P_XT)nft_reject_inet),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV4, $(P_V4)nf_tables_ipv4, lt 4.17),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV6, $(P_V6)nf_tables_ipv6, lt 4.17),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REDIR, $(P_XT)nft_redir),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_QUOTA, $(P_XT)nft_quota),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_HASH, $(P_XT)nft_set_hash, lt 4.18),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_SET_RBTREE, $(P_XT)nft_set_rbtree, lt 4.18),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_ARP,CONFIG_NF_TABLES_ARP, $(P_V4)nf_tables_arp, lt 4.17),)) From 22b07ff73e0b3429b36f75694a082a68a4fdb013 Mon Sep 17 00:00:00 2001 From: David Lam Date: Tue, 14 Jan 2020 00:27:28 -0800 Subject: [PATCH 314/480] hostapd: add support for subject validation The wpa_supplicant supports certificate subject validation via the subject match(2) and altsubject_match(2) fields. domain_match(2) and domain_suffix_match(2) fields are also supported for advanced matches. This validation is especially important when connecting to access points that use PAP as the Phase 2 authentication type. Without proper validation, the user's password can be transmitted to a rogue access point in plaintext without the user's knowledge. Most organizations already require these attributes to be included to ensure that the connection from the STA and the AP is secure. Includes LuCI changes via openwrt/luci#3444. From the documentation: subject_match - Constraint for server certificate subject. This substring is matched against the subject of the authentication server certificate. If this string is set, the server sertificate is only accepted if it contains this string in the subject. The subject string is in following format: /C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as .example.com subject_match2 - Constraint for server certificate subject. This field is like subject_match, but used for phase 2 (inside EAP-TTLS/PEAP/FAST tunnel) authentication. altsubject_match - Constraint for server certificate alt. subject. Semicolon separated string of entries to be matched against the alternative subject name of the authentication server certificate. If this string is set, the server sertificate is only accepted if it contains one of the entries in an alternative subject name extension. altSubjectName string is in following format: TYPE:VALUE Example: EMAIL:server@example.com Example: DNS:server.example.com;DNS:server2.example.com Following types are supported: EMAIL, DNS, URI altsubject_match2 - Constraint for server certificate alt. subject. This field is like altsubject_match, but used for phase 2 (inside EAP-TTLS/PEAP/FAST tunnel) authentication. domain_match - Constraint for server domain name. If set, this FQDN is used as a full match requirement for the server certificate in SubjectAltName dNSName element(s). If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same full match comparison. This behavior is similar to domain_suffix_match, but has the requirement of a full match, i.e., no subdomains or wildcard matches are allowed. Case-insensitive comparison is used, so "Example.com" matches "example.com", but would not match "test.Example.com". More than one match string can be provided by using semicolons to separate the strings (e.g., example.org;example.com). When multiple strings are specified, a match with any one of the values is considered a sufficient match for the certificate, i.e., the conditions are ORed together. domain_match2 - Constraint for server domain name. This field is like domain_match, but used for phase 2 (inside EAP-TTLS/PEAP/FAST tunnel) authentication. domain_suffix_match - Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for the AAA server certificate in SubjectAltName dNSName element(s). If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison. Suffix match here means that the host/domain name is compared one label at a time starting from the top-level domain and all the labels in domain_suffix_match shall be included in the certificate. The certificate may include additional sub-level labels in addition to the required labels. More than one match string can be provided by using semicolons to separate the strings (e.g., example.org;example.com). When multiple strings are specified, a match with any one of the values is considered a sufficient match for the certificate, i.e., the conditions are ORed together. For example, domain_suffix_match=example.com would match test.example.com but would not match test-example.com. This field is like domain_match, but used for phase 2 (inside EAP-TTLS/PEAP/FAST tunnel) authentication. domain_suffix_match2 - Constraint for server domain name. This field is like domain_suffix_match, but used for phase 2 (inside EAP-TTLS/PEAP/FAST tunnel) authentication. Signed-off-by: David Lam --- package/network/services/hostapd/Makefile | 2 +- .../network/services/hostapd/files/hostapd.sh | 92 +++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 11d0d7a9ce..8dfcd89cc4 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 3d4e57db25..dcbabaf8f1 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -202,6 +202,9 @@ hostapd_common_add_bss_config() { config_add_string radius_client_addr config_add_string iapp_interface config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd + config_add_string subject_match subject_match2 + config_add_array altsubject_match altsubject_match2 + config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2 config_add_string ieee80211w_mgmt_cipher config_add_int dynamic_vlan vlan_naming @@ -872,6 +875,36 @@ wpa_supplicant_add_network() { append network_data "client_cert=\"$client_cert\"" "$N$T" append network_data "private_key=\"$priv_key\"" "$N$T" append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T" + + json_get_vars subject_match + [ -n "$subject_match" ] && append network_data "subject_match=\"$subject_match\"" "$N$T" + + json_get_values altsubject_match altsubject_match + if [ -n "$altsubject_match" ]; then + local list= + for x in $altsubject_match; do + append list "$x" ";" + done + append network_data "altsubject_match=\"$list\"" "$N$T" + fi + + json_get_values domain_match domain_match + if [ -n "$domain_match" ]; then + local list= + for x in $domain_match; do + append list "$x" ";" + done + append network_data "domain_match=\"$list\"" "$N$T" + fi + + json_get_values domain_suffix_match domain_suffix_match + if [ -n "$domain_suffix_match" ]; then + local list= + for x in $domain_suffix_match; do + append list "$x" ";" + done + append network_data "domain_suffix_match=\"$list\"" "$N$T" + fi ;; fast|peap|ttls) json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd @@ -887,6 +920,36 @@ wpa_supplicant_add_network() { append network_data "password=\"$password\"" "$N$T" fi + json_get_vars subject_match + [ -n "$subject_match" ] && append network_data "subject_match=\"$subject_match\"" "$N$T" + + json_get_values altsubject_match altsubject_match + if [ -n "$altsubject_match" ]; then + local list= + for x in $altsubject_match; do + append list "$x" ";" + done + append network_data "altsubject_match=\"$list\"" "$N$T" + fi + + json_get_values domain_match domain_match + if [ -n "$domain_match" ]; then + local list= + for x in $domain_match; do + append list "$x" ";" + done + append network_data "domain_match=\"$list\"" "$N$T" + fi + + json_get_values domain_suffix_match domain_suffix_match + if [ -n "$domain_suffix_match" ]; then + local list= + for x in $domain_suffix_match; do + append list "$x" ";" + done + append network_data "domain_suffix_match=\"$list\"" "$N$T" + fi + phase2proto="auth=" case "$auth" in "auth"*) @@ -896,6 +959,35 @@ wpa_supplicant_add_network() { auth="$(echo $auth | cut -b 5- )" [ "$eap_type" = "ttls" ] && phase2proto="autheap=" + json_get_vars subject_match2 + [ -n "$subject_match2" ] && append network_data "subject_match2=\"$subject_match2\"" "$N$T" + + json_get_values altsubject_match2 altsubject_match2 + if [ -n "$altsubject_match2" ]; then + local list= + for x in $altsubject_match2; do + append list "$x" ";" + done + append network_data "altsubject_match2=\"$list\"" "$N$T" + fi + + json_get_values domain_match2 domain_match2 + if [ -n "$domain_match2" ]; then + local list= + for x in $domain_match2; do + append list "$x" ";" + done + append network_data "domain_match2=\"$list\"" "$N$T" + fi + + json_get_values domain_suffix_match2 domain_suffix_match2 + if [ -n "$domain_suffix_match2" ]; then + local list= + for x in $domain_suffix_match2; do + append list "$x" ";" + done + append network_data "domain_suffix_match2=\"$list\"" "$N$T" + fi ;; esac append network_data "phase2=\"$phase2proto$auth\"" "$N$T" From 402b362db447c8163b4069537753b1ede3533d18 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 11 Jan 2020 22:27:39 +0100 Subject: [PATCH 315/480] firmware-utils/dgfirmare: fix possible resource leak Add missing calls to `fclose` in functions `write_img`, `write_rootfs` and `write_kernel`. The not-closed files could lead to resource leaks. Signed-off-by: Andrea Dalla Costa --- tools/firmware-utils/src/dgfirmware.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/firmware-utils/src/dgfirmware.c b/tools/firmware-utils/src/dgfirmware.c index e3257f1077..3ec4712ec9 100644 --- a/tools/firmware-utils/src/dgfirmware.c +++ b/tools/firmware-utils/src/dgfirmware.c @@ -86,6 +86,8 @@ void write_img(unsigned char* img, const char *fname) fclose(fp); exit(-1); } + + fclose(fp); } @@ -104,6 +106,8 @@ void write_rootfs(unsigned char* img, const char *fname) fclose(fp); exit(-1); } + + fclose(fp); } @@ -122,6 +126,8 @@ void write_kernel(unsigned char* img, const char *fname) fclose(fp); exit(-1); } + + fclose(fp); } From 0ae0f48cec08e4698e678f5e145533209491e855 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 11 Jan 2020 22:41:31 +0100 Subject: [PATCH 316/480] firmware-utils: fix possible memory leak and resource leak Add missing calls to `free` for variable `buffer`. This could lead to a memory leak. Add missing call to `close` for file pointer `fdin`. This could lead to a resource leak. Signed-off-by: Andrea Dalla Costa --- tools/firmware-utils/src/dns313-header.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/firmware-utils/src/dns313-header.c b/tools/firmware-utils/src/dns313-header.c index e69e57e7ba..3c72b09bfb 100644 --- a/tools/firmware-utils/src/dns313-header.c +++ b/tools/firmware-utils/src/dns313-header.c @@ -168,11 +168,14 @@ int main(int argc, char **argv) fdin = open(pathin, O_RDONLY); if (!fdin) { printf("ERROR: could not open input file\n"); + free(buffer); return 0; } bytes = read(fdin, buffer + HEADER_SIZE, filesize); if (bytes < filesize) { printf("ERROR: could not read entire file\n"); + free(buffer); + close(fdin); return 0; } close(fdin); From 8e3b3152e5402b574ff66b149cfdc6e42d61db54 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 11 Jan 2020 23:10:51 +0100 Subject: [PATCH 317/480] firmware-utils/mkchkimg: fix possible resource leaks Add missing `fclose` calls for file pointers `kern_fp`, `fs_fp` and `out_fp`. Not closing files could lead to resource leaks. Signed-off-by: Andrea Dalla Costa --- tools/firmware-utils/src/mkchkimg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/firmware-utils/src/mkchkimg.c b/tools/firmware-utils/src/mkchkimg.c index 0fe01f0707..5f2823f154 100644 --- a/tools/firmware-utils/src/mkchkimg.c +++ b/tools/firmware-utils/src/mkchkimg.c @@ -231,6 +231,7 @@ main (int argc, char * argv[]) if (fs_file) { fs_fp = fopen (fs_file, "r"); if (!fs_fp) { + fclose(kern_fp); fatal_error (errno, "Cannot open %s", fs_file); } } @@ -238,6 +239,10 @@ main (int argc, char * argv[]) /* Open the output file */ out_fp = fopen (output_file, "w+"); if (!out_fp) { + fclose(kern_fp); + if (fs_fp) { + fclose(fs_fp); + } fatal_error (errno, "Cannot open %s", output_file); } @@ -285,6 +290,7 @@ main (int argc, char * argv[]) netgear_checksum_add (&chk_part, (unsigned char *)buf, len); netgear_checksum_add (&chk_whole, (unsigned char *)buf, len); } + fclose(kern_fp); hdr->kernel_chksum = netgear_checksum_fini (&chk_part); message (" Kernel Len: %u", hdr->kernel_len); message ("Kernel Checksum: 0x%08x", hdr->kernel_chksum); @@ -306,6 +312,7 @@ main (int argc, char * argv[]) netgear_checksum_add (&chk_part, (unsigned char *)buf, len); netgear_checksum_add (&chk_whole, (unsigned char *)buf, len); } + fclose(fs_fp); hdr->rootfs_chksum = (netgear_checksum_fini (&chk_part)); message (" Rootfs Len: %u", hdr->rootfs_len); message ("Rootfs Checksum: 0x%08x", hdr->rootfs_chksum); @@ -336,6 +343,7 @@ main (int argc, char * argv[]) } /* Success */ + fclose(out_fp); return EXIT_SUCCESS; } From b886d3c8f3d852a5d5bfcb41f439a808d9aa2d58 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 11 Jan 2020 23:27:17 +0100 Subject: [PATCH 318/480] firmware-utils/mkfwimage: fix possible memory and resource leak Add missing calls to `free` for variable `mem`. Add missing call to `fclose` for variable `f`. The same changes were made in both `mkfwimage.c` and `mkfwimage2.c`. Signed-off-by: Andrea Dalla Costa --- tools/firmware-utils/src/mkfwimage.c | 3 +++ tools/firmware-utils/src/mkfwimage2.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c index d0dca040cd..9e6d8f5b9a 100644 --- a/tools/firmware-utils/src/mkfwimage.c +++ b/tools/firmware-utils/src/mkfwimage.c @@ -455,6 +455,7 @@ static int build_image(image_info_t* im) if ((f = fopen(im->outputfile, "w")) == NULL) { ERROR("Can not create output file: '%s'\n", im->outputfile); + free(mem); return -10; } @@ -462,6 +463,8 @@ static int build_image(image_info_t* im) { ERROR("Could not write %d bytes into file: '%s'\n", mem_size, im->outputfile); + free(mem); + fclose(f); return -11; } diff --git a/tools/firmware-utils/src/mkfwimage2.c b/tools/firmware-utils/src/mkfwimage2.c index 89a98051b4..9b7e1a3cd7 100644 --- a/tools/firmware-utils/src/mkfwimage2.c +++ b/tools/firmware-utils/src/mkfwimage2.c @@ -363,12 +363,15 @@ static int build_image(void) /* write in-memory buffer into file */ if ((f = fopen(im.outputfile, "w")) == NULL) { ERROR("Can not create output file: '%s'\n", im.outputfile); + free(mem); return -10; } if (fwrite(mem, mem_size, 1, f) != 1) { ERROR("Could not write %d bytes into file: '%s'\n", mem_size, im.outputfile); + free(mem); + fclose(f); return -11; } From 1775f690d5e3dfc2f70c0e416c91371c848b9f25 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 11 Jan 2020 23:55:25 +0100 Subject: [PATCH 319/480] firmware-utils/mksenaofw: fix possible memory leak Add missing calls to `free` for variable `pmodel`. Signed-off-by: Andrea Dalla Costa --- tools/firmware-utils/src/mksenaofw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/firmware-utils/src/mksenaofw.c b/tools/firmware-utils/src/mksenaofw.c index b0fb7203c3..d9ccfbc1e0 100644 --- a/tools/firmware-utils/src/mksenaofw.c +++ b/tools/firmware-utils/src/mksenaofw.c @@ -316,10 +316,12 @@ int decode_image(const char *input_file_name, const char *output_file_name) if (fread(pmodel, 1, cw_header.model_size, fp_input) != cw_header.model_size) { fprintf(stderr, "Incorrect header size reading model name!!"); + free(pmodel); fclose(fp_input); fclose(fp_output); return -1; } + free(pmodel); } else { fprintf(stderr, "Incorrect header size reading model name!!"); fclose(fp_input); From 8057970d2a32b8f5c9804855b138eceeb757b98e Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sun, 12 Jan 2020 00:05:55 +0100 Subject: [PATCH 320/480] firmware-utils/mktitanimg: fix possible resource leak Add missing call to `fclose` for file pointer `nsp_image`. Signed-off-by: Andrea Dalla Costa --- tools/firmware-utils/src/mktitanimg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/firmware-utils/src/mktitanimg.c b/tools/firmware-utils/src/mktitanimg.c index cca4a0ebae..120d08f0c4 100644 --- a/tools/firmware-utils/src/mktitanimg.c +++ b/tools/firmware-utils/src/mktitanimg.c @@ -225,6 +225,7 @@ int main(int argc, char* argv[], char* env[]) if(fwrite((void*)buf,1,padding,nsp_image)!=padding) { printf("ERROR: can't write to %s.\n", filen_out); free(buf); + fclose(nsp_image); return -1; } free(buf); From 3c77e4ae4d97ec14daeabfab12ec8b451184d0d6 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sun, 12 Jan 2020 00:21:10 +0100 Subject: [PATCH 321/480] wrt350nv2-builder: Fix memory leak Add missing call to `free` for variable `buffer` in function `create_bin_file`. Signed-off-by: Andrea Dalla Costa --- tools/wrt350nv2-builder/src/wrt350nv2-builder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/wrt350nv2-builder/src/wrt350nv2-builder.c b/tools/wrt350nv2-builder/src/wrt350nv2-builder.c index 3ebb40ed51..36f05878c4 100644 --- a/tools/wrt350nv2-builder/src/wrt350nv2-builder.c +++ b/tools/wrt350nv2-builder/src/wrt350nv2-builder.c @@ -556,6 +556,7 @@ int create_bin_file(char *bin_filename) { } } + free(buffer); return exitcode; } From 44304c1d671696ed9598735e71a1635276102511 Mon Sep 17 00:00:00 2001 From: Xu Wang Date: Mon, 6 Jan 2020 17:12:43 +0000 Subject: [PATCH 322/480] base-files: fix build for /sbin/pkg_check Setting CONFIG_IPK_FILES_CHECKSUMS=y causes sha256 checksum files to be included with the packages to check for corruption. This commit fixes two issues: - /sbin/pkg_check was being removed incorrectly if IPK_FILES_CHECKSUMS=y - checksums were being saved in the wrong file Signed-off-by: Xu Wang --- include/package-ipkg.mk | 2 +- package/base-files/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 442d3854f0..c4c8f4a36f 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -207,7 +207,7 @@ $(_endef) (cd $$(IDIR_$(1)); \ ( \ find . -type f \! -path ./CONTROL/\* -exec sha256sum \{\} \; 2> /dev/null | \ - sed 's|\([[:blank:]]\)\./|\1/|' > $$(IDIR_$(1))/CONTROL/files-sha256 \ + sed 's|\([[:blank:]]\)\./|\1/|' > $$(IDIR_$(1))/CONTROL/files-sha256sum \ ) || true \ ) endif diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 35ad80888f..268d7d4cc9 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -204,8 +204,8 @@ define Package/base-files/install mkdir -p $(1)/etc/opkg; \ $(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \ $(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf) - $(if $(CONFIG_IPK_FILES_CHECKSUMS), \ - rm -f $(1)/sbin/pkg_check,) + $(if $(CONFIG_IPK_FILES_CHECKSUMS),, \ + rm -f $(1)/sbin/pkg_check) endef ifneq ($(DUMP),1) From b070101c506ca5541d6f232c2da3e0f7b1383106 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 25 Oct 2019 19:42:09 +0200 Subject: [PATCH 323/480] valgrind: do not strip internal preload libraries and executables Implement the suggestions laid out in README_PACKAGERS, mainly by preventing the stripping of the internal vgpreload*.so libraries. Also retain the symbol information of valgrind's private helper executables and enable LTO as suggested in the packagers readme. Signed-off-by: Jo-Philipp Wich --- package/devel/valgrind/Makefile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile index 956e5ad722..ecb4af8b35 100644 --- a/package/devel/valgrind/Makefile +++ b/package/devel/valgrind/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=valgrind PKG_VERSION:=3.15.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://sourceware.org/pub/valgrind/ @@ -25,6 +25,8 @@ PKG_BUILD_PARALLEL := 1 PKG_USE_MIPS16:=0 PKG_SSP:=0 +STRIP:=: + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -96,6 +98,7 @@ else endif CONFIGURE_ARGS += \ + --enable-lto \ --enable-tls \ --without-x \ --without-mpicc \ @@ -106,7 +109,7 @@ CONFIGURE_ARGS += \ --without-included-gettext \ --with-pagesize=4 \ -define Package/valgrind/install +define Package/valgrind/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/valgrind* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/valgrind @@ -125,6 +128,10 @@ ifneq ($(ARCH),aarch64) $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(CPU)-*.xml \ $(1)/usr/lib/valgrind/ endif + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip -g",$(RSTRIP)) \ + $(PKG_INSTALL_DIR)/usr/lib/valgrind/none-* \ + $(PKG_INSTALL_DIR)/usr/lib/valgrind/memcheck-* endef define Package/valgrind-cachegrind/install @@ -134,6 +141,8 @@ define Package/valgrind-cachegrind/install $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/valgrind/cachegrind-* \ $(1)/usr/lib/valgrind/ + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip -g",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/lib/valgrind/cachegrind-* endef define Package/valgrind-callgrind/install @@ -143,6 +152,8 @@ define Package/valgrind-callgrind/install $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/valgrind/callgrind-* \ $(1)/usr/lib/valgrind/ + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip -g",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/lib/valgrind/callgrind-* endef define Package/valgrind-drd/install @@ -151,6 +162,8 @@ define Package/valgrind-drd/install $(PKG_INSTALL_DIR)/usr/lib/valgrind/drd-* \ $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_drd*.so \ $(1)/usr/lib/valgrind/ + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip -g",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/lib/valgrind/drd-* endef define Package/valgrind-massif/install @@ -161,6 +174,8 @@ define Package/valgrind-massif/install $(PKG_INSTALL_DIR)/usr/lib/valgrind/massif-* \ $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_massif*.so \ $(1)/usr/lib/valgrind/ + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip -g",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/lib/valgrind/massif-* endef define Package/valgrind-helgrind/install @@ -169,11 +184,14 @@ define Package/valgrind-helgrind/install $(PKG_INSTALL_DIR)/usr/lib/valgrind/helgrind-* \ $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_helgrind*.so \ $(1)/usr/lib/valgrind/ + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip -g",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/lib/valgrind/helgrind-* endef define Package/valgrind-vgdb/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgdb $(1)/usr/bin/ + $(patsubst STRIP=%,STRIP="$(TARGET_CROSS)strip",$(RSTRIP)) $(PKG_INSTALL_DIR)/usr/bin endef $(eval $(call BuildPackage,valgrind)) From 355f0444f3622347650776dd8f1e388dc5d000ca Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 17 Dec 2019 01:15:35 +0100 Subject: [PATCH 324/480] lantiq: split base-files into subtargets This splits the device-dependent base-files into subtarget directories, like done recently for ath79 and ramips. While this increases the overall lines of codes, it will make the code per subtarget smaller and easier to keep track of features and devices. While at it, several variables at the top of 02_network are removed, as they were never changed. The values are put directly into the function calls where they are used. Remove unneeded LED setup from 01_leds, and remove 01_leds entirely for falcon subtarget (as it is not used there). Applies alphabetic reordering to device cases in base-files. Signed-off-by: Adrian Schmutzler --- .../lantiq/ase/base-files/etc/board.d/01_leds | 32 +++ .../ase/base-files/etc/board.d/02_network | 52 ++++ .../ase/base-files/lib/upgrade/platform.sh | 10 + .../falcon/base-files/etc/board.d/02_network | 36 +++ .../falcon/base-files/lib/upgrade/platform.sh | 10 + .../base-files/etc/board.d/01_leds | 41 +--- .../base-files/etc/board.d/02_network | 229 ++++-------------- .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 - .../etc/hotplug.d/firmware/12-ath9k-eeprom | 38 +++ .../base-files/lib/upgrade/platform.sh | 2 - .../xway/base-files/etc/board.d/01_leds | 44 ++++ .../xway/base-files/etc/board.d/02_network | 122 ++++++++++ .../etc/hotplug.d/firmware/12-ath9k-eeprom | 17 +- .../xway/base-files/lib/upgrade/platform.sh | 20 ++ .../base-files/etc/board.d/01_leds | 41 ++++ .../base-files/etc/board.d/02_network | 52 ++++ .../base-files/lib/upgrade/platform.sh | 10 + 17 files changed, 533 insertions(+), 224 deletions(-) create mode 100755 target/linux/lantiq/ase/base-files/etc/board.d/01_leds create mode 100755 target/linux/lantiq/ase/base-files/etc/board.d/02_network create mode 100755 target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh create mode 100755 target/linux/lantiq/falcon/base-files/etc/board.d/02_network create mode 100755 target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh rename target/linux/lantiq/{ => xrx200}/base-files/etc/board.d/01_leds (83%) rename target/linux/lantiq/{ => xrx200}/base-files/etc/board.d/02_network (54%) rename target/linux/lantiq/{ => xrx200}/base-files/etc/hotplug.d/firmware/11-ath10k-caldata (87%) create mode 100644 target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom rename target/linux/lantiq/{ => xrx200}/base-files/lib/upgrade/platform.sh (91%) create mode 100755 target/linux/lantiq/xway/base-files/etc/board.d/01_leds create mode 100755 target/linux/lantiq/xway/base-files/etc/board.d/02_network rename target/linux/lantiq/{ => xway}/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom (70%) create mode 100755 target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh create mode 100755 target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds create mode 100755 target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network create mode 100755 target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/01_leds b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..6a8de7d7a5 --- /dev/null +++ b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds @@ -0,0 +1,32 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +led_dsl="$(get_dt_led dsl)" +[ -n "$led_dsl" ] && { + led_internet="$(get_dt_led internet)" + if [ -n "$led_internet" ]; then + ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" + ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" + else + ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0" + fi +} + +board=$(board_name) + +case "$board" in +allnet,all0333cj) + ucidef_set_led_netdev "lan" "lan" "all0333cj:green:lan" "eth0.1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..d37e999243 --- /dev/null +++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network @@ -0,0 +1,52 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +board_config_update + +annex="a" + +lan_mac="" +wan_mac="" + +board=$(board_name) + +case "$board" in +allnet,all0333cj) + annex="b" + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_set_interface_lan 'eth0' + ;; +netgear,dgn1000b) + annex="b" + ucidef_set_interface_lan 'eth0' + ;; +*) + ucidef_set_interface_lan 'eth0' + ;; +esac + +ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ + ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" + +if lantiq_is_vdsl_system; then + ucidef_add_vdsl_modem "$annex" "av" +else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" +fi + +ucidef_set_interface_wan "dsl0" "pppoe" + +[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" +[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" + +board_config_flush + +exit 0 + diff --git a/target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..d088601bb0 --- /dev/null +++ b/target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh @@ -0,0 +1,10 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + default_do_upgrade "$1" +} diff --git a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..76f134d6d4 --- /dev/null +++ b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +board_config_update + +annex="a" + +lan_mac="" +wan_mac="" + +ucidef_set_interface_lan 'eth0' + +ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ + ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" + +if lantiq_is_vdsl_system; then + ucidef_add_vdsl_modem "$annex" "av" +else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" +fi + +ucidef_set_interface_wan "dsl0" "pppoe" + +[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" +[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" + +board_config_flush + +exit 0 + diff --git a/target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..d088601bb0 --- /dev/null +++ b/target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh @@ -0,0 +1,10 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + default_do_upgrade "$1" +} diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds similarity index 83% rename from target/linux/lantiq/base-files/etc/board.d/01_leds rename to target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds index e89de97fbe..b4d26d37ff 100755 --- a/target/linux/lantiq/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds @@ -1,7 +1,6 @@ #!/bin/sh # # Copyright (C) 2011-2015 OpenWrt.org -# based on ar71xx # . /lib/functions/leds.sh @@ -32,35 +31,9 @@ led_dsl="$(get_dt_led dsl)" board=$(board_name) case "$board" in -allnet,all0333cj) - ucidef_set_led_netdev "lan" "lan" "all0333cj:green:lan" "eth0.1" - ;; -arcadyan,arv4525pw) - ucidef_set_led_netdev "wifi" "wifi" "arv4525pw:green:wlan" "wlan0" - ;; -arcadyan,arv7506pw11) - ucidef_set_led_wlan "wifi" "wifi" "arv7506pw11:green:wlan" "phy0radio" - ;; arcadyan,arv7519rw22) ucidef_set_led_netdev "lan" "lan" "arv7519rw22:green:lan" "eth0.1" ;; -arcadyan,arv752dpw22) - ucidef_set_led_wlan "wifi" "wifi" "arv752dpw22:red:wifi" "phy0radio" - ;; -bt,homehub-v5a) - ucidef_set_led_default "dimmed" "dimmed" "dimmed" "0" - ;; -netgear,dm200) - ucidef_set_led_netdev "lan" "lan" "dm200:green:lan" "eth0" - ;; -avm,fritz3370-rev2-hynix|\ -avm,fritz3370-rev2-micron) - ucidef_set_led_switch "lan" "LAN" "fritz3370:green:lan" "switch0" "0x17" - ;; -zyxel,p-2812hnu-f1|\ -zyxel,p-2812hnu-f3) - ucidef_set_led_wlan "wifi" "wifi" "p2812hnufx:green:wlan" "phy0radio" - ;; arcadyan,vgv7510kw22-nor|\ arcadyan,vgv7510kw22-brn) ucidef_set_led_wlan "wifi" "wifi" "vgv7510kw22:green:wlan" "phy0radio" @@ -69,6 +42,13 @@ arcadyan,vgv7519-nor|\ arcadyan,vgv7519-brn) ucidef_set_led_wlan "wifi" "wifi" "vgv7519:green:wireless" "phy0radio" ;; +avm,fritz3370-rev2-hynix|\ +avm,fritz3370-rev2-micron) + ucidef_set_led_switch "lan" "LAN" "fritz3370:green:lan" "switch0" "0x17" + ;; +bt,homehub-v5a) + ucidef_set_led_default "dimmed" "dimmed" "dimmed" "0" + ;; buffalo,wbmr-300hpd) ucidef_set_led_switch "lan1" "LAN1" "wbmr300:green:lan1" "switch0" "0x08" ucidef_set_led_switch "lan2" "LAN2" "wbmr300:green:lan2" "switch0" "0x04" @@ -76,7 +56,12 @@ buffalo,wbmr-300hpd) ucidef_set_led_switch "lan3" "LAN3" "wbmr300:green:lan3" "switch0" "0x20" ucidef_set_led_default "router" "router" "wbmr300:green:router" "1" ;; -*) +netgear,dm200) + ucidef_set_led_netdev "lan" "lan" "dm200:green:lan" "eth0" + ;; +zyxel,p-2812hnu-f1|\ +zyxel,p-2812hnu-f3) + ucidef_set_led_wlan "wifi" "wifi" "p2812hnufx:green:wlan" "phy0radio" ;; esac diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network similarity index 54% rename from target/linux/lantiq/base-files/etc/board.d/02_network rename to target/linux/lantiq/xrx200/base-files/etc/board.d/02_network index d79a30d22d..f56de32614 100755 --- a/target/linux/lantiq/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network @@ -9,132 +9,44 @@ board_config_update -vpi=1 -vci=32 annex="a" -tone="av" -xfer_mode="" -encaps="llc" -payload="bridged" + lan_mac="" wan_mac="" -interface_wan="dsl0" board=$(board_name) case "$board" in -audiocodes,mp-252) - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; - -allnet,all0333cj) - annex="b" - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; - -arcadyan,arv4510pw) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0" - ;; - -arcadyan,arv4519pw|arcadyan,arv7510pw22|arcadyan,arv7518pw) - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; - -arcadyan,arv4520pw) - annex="b" - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" - ;; - -arcadyan,arv4525pw|arcadyan,arv452cqw|arcadyan,arv7525pw|arcadyan,arv752dpw) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; - -arcadyan,arv7506pw11) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; - -arcadyan,arv7519pw) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 1) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - ;; - -arcadyan,arv7519rw22) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0x16)" 1) - ucidef_add_switch "switch0" \ - "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0" - ;; - -arcadyan,arv752dpw22|arcadyan,arv8539pw22) - annex="b" - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; - alphanetworks,asl56026) lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) wan_mac=$(mtd_get_mac_ascii uboot_env wanmac) ucidef_add_switch "switch0"\ "2:lan" "3:lan" "6t@eth0" ;; - -bt,homehub-v2b) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) +arcadyan,arv7519rw22) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0x16)" 1) ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0" + "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0" ;; - -bt,homehub-v3a) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; - -bt,homehub-v5a) - lan_mac=$(mtd_get_mac_binary_ubi caldata 0x110c) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; - -netgear,dgn1000b) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; - -netgear,dgn3500|netgear,dgn3500b) +arcadyan,vg3503j) lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) wan_mac=$(macaddr_add "$lan_mac" 1) ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + "2:lan:2" "4:lan:1" "6t@eth0" ;; - -netgear,dm200) - lan_mac=$(mtd_get_mac_binary ART 0x0) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' +arcadyan,vgv7510kw22-brn|\ +arcadyan,vgv7510kw22-nor) + annex="b" + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) + ucidef_add_switch "switch0" \ + "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0" ;; - -lantiq,easy80920-nand|lantiq,easy80920-nor) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) +arcadyan,vgv7519-brn|\ +arcadyan,vgv7519-nor) + wan_mac=$(mtd_get_mac_binary board_config 0x16) ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" ;; - avm,fritz3370-rev2-hynix|\ avm,fritz3370-rev2-micron) annex="b" @@ -143,21 +55,12 @@ avm,fritz3370-rev2-micron) ucidef_add_switch "switch0" \ "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" ;; - -avm,fritz7312|\ -avm,fritz7320) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) - ucidef_set_interface_lan 'eth0' - ;; - avm,fritz7360sl) annex="b" wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) ucidef_add_switch "switch0" \ "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" ;; - avm,fritz7362sl) annex="b" lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) @@ -165,7 +68,6 @@ avm,fritz7362sl) ucidef_add_switch "switch0" \ "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" ;; - avm,fritz7412) tffsdev=$(find_mtd_chardev "nand-tffs") annex="b" @@ -173,91 +75,64 @@ avm,fritz7412) wan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n macdsl -o) ucidef_set_interface_lan 'eth0' ;; - -siemens,gigaset-sx76x) - annex="b" - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; - -zte,h201l) - annex="b" - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - ;; - -zyxel,p-2601hn) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0" - ;; - -zyxel,p-2812hnu-f1|zyxel,p-2812hnu-f3) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) +bt,homehub-v5a) + lan_mac=$(mtd_get_mac_binary_ubi caldata 0x110c) wan_mac=$(macaddr_add "$lan_mac" 1) ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0" + "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" ;; - -tplink,tdw8970|tplink,tdw8980) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0xf100)" 1) - ucidef_add_switch "switch0" \ - "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0" - ;; - -arcadyan,vg3503j) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "2:lan:2" "4:lan:1" "6t@eth0" - ;; - -tplink,vr200|tplink,vr200v) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 0xf100)" 1) - ucidef_add_switch "switch0" \ - "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" - ;; - -arcadyan,vgv7510kw22-nor|arcadyan,vgv7510kw22-brn) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) - ucidef_add_switch "switch0" \ - "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0" - ;; - -arcadyan,vgv7519-nor|arcadyan,vgv7519-brn) - wan_mac=$(mtd_get_mac_binary board_config 0x16) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; - -buffalo,wbmr-hp-g300h) - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; - buffalo,wbmr-300hpd) lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr) wan_mac="$lan_mac" ucidef_add_switch "switch0" \ "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0" ;; - +lantiq,easy80920-nand|\ +lantiq,easy80920-nor) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" + ;; +netgear,dm200) + lan_mac=$(mtd_get_mac_binary ART 0x0) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_set_interface_lan 'eth0' + ;; +tplink,tdw8970|\ +tplink,tdw8980) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0xf100)" 1) + ucidef_add_switch "switch0" \ + "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0" + ;; +tplink,vr200|\ +tplink,vr200v) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 0xf100)" 1) + ucidef_add_switch "switch0" \ + "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" + ;; +zyxel,p-2812hnu-f1|\ +zyxel,p-2812hnu-f3) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0" + ;; *) ucidef_set_interface_lan 'eth0' ;; - esac ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload" "dsl" + ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "$tone" "$xfer_mode" + ucidef_add_vdsl_modem "$annex" "av" else ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" fi -ucidef_set_interface_wan "$interface_wan" "pppoe" +ucidef_set_interface_wan "dsl0" "pppoe" [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/11-ath10k-caldata similarity index 87% rename from target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata rename to target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 0b48b77d41..4202187d4f 100644 --- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -1,5 +1,4 @@ #!/bin/sh -# Based on ar71xx 11-ath10k-caldata and 10-rt2x00-eeprom [ -e /lib/firmware/$FIRMWARE ] && exit 0 diff --git a/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom new file mode 100644 index 0000000000..6fee72ea8d --- /dev/null +++ b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom @@ -0,0 +1,38 @@ +#!/bin/sh + +[ -e /lib/firmware/$FIRMWARE ] && exit 0 + +. /lib/functions/caldata.sh + +case "$FIRMWARE" in + "ath9k-eeprom-pci-0000:00:0e.0.bin" | \ + "ath9k-eeprom-pci-0000:01:00.0.bin" | \ + "ath9k-eeprom-pci-0000:02:00.0.bin") + board=$(board_name) + + case "$board" in + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron|\ + avm,fritz7362sl) + caldata_extract_reverse "urlader" 0x1541 0x440 + ;; + avm,fritz7360sl) + caldata_extract "urlader" 0x985 0x1000 + ;; + avm,fritz7412) + /usr/bin/fritz_cal_extract -i 1 -s 0x1e000 -e 0x207 -l 4096 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader") + ;; + bt,homehub-v5a) + caldata_extract_ubi "caldata" 0x1000 0x1000 + ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary_ubi caldata 0x110c) +2) 0x10c + ;; + tplink,tdw8970|\ + tplink,tdw8980) + caldata_extract "boardconfig" 0x21000 0x1000 + ;; + *) + caldata_die "board $board is not supported yet" + ;; + esac + ;; +esac diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh similarity index 91% rename from target/linux/lantiq/base-files/lib/upgrade/platform.sh rename to target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh index c47ff78fb2..dcd797c30d 100755 --- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh +++ b/target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh @@ -13,8 +13,6 @@ platform_do_upgrade() { avm,fritz3370-rev2-micron|\ avm,fritz7362sl|\ avm,fritz7412|\ - bt,homehub-v2b|\ - bt,homehub-v3a|\ bt,homehub-v5a|\ zyxel,p-2812hnu-f1|\ zyxel,p-2812hnu-f3) diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..82a39f4648 --- /dev/null +++ b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +led_wifi="$(get_dt_led wifi)" +[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt" + +led_usb="$(get_dt_led usb)" +[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1" + +led_usb2="$(get_dt_led usb2)" +[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1" + +led_dsl="$(get_dt_led dsl)" +[ -n "$led_dsl" ] && { + led_internet="$(get_dt_led internet)" + if [ -n "$led_internet" ]; then + ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" + ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" + else + ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0" + fi +} + +board=$(board_name) + +case "$board" in +arcadyan,arv7506pw11) + ucidef_set_led_wlan "wifi" "wifi" "arv7506pw11:green:wlan" "phy0radio" + ;; +arcadyan,arv752dpw22) + ucidef_set_led_wlan "wifi" "wifi" "arv752dpw22:red:wifi" "phy0radio" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/02_network b/target/linux/lantiq/xway/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..b1b742bd1f --- /dev/null +++ b/target/linux/lantiq/xway/base-files/etc/board.d/02_network @@ -0,0 +1,122 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +board_config_update + +annex="a" + +lan_mac="" +wan_mac="" + +board=$(board_name) + +case "$board" in +arcadyan,arv4510pw) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0" + ;; +arcadyan,arv4519pw|\ +arcadyan,arv7510pw22|\ +arcadyan,arv7518pw) + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" + ;; +arcadyan,arv7506pw11) + annex="b" + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) + ucidef_add_switch "switch0" \ + "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" + ;; +arcadyan,arv7519pw) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 1) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" + ;; +arcadyan,arv7525pw|\ +arcadyan,arv752dpw) + annex="b" + ucidef_set_interface_lan 'eth0' + ;; +arcadyan,arv752dpw22|\ +arcadyan,arv8539pw22) + annex="b" + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" + ;; +audiocodes,mp-252) + ucidef_add_switch "switch0" \ + "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" + ;; +avm,fritz7312|\ +avm,fritz7320) + annex="b" + wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) + ucidef_set_interface_lan 'eth0' + ;; +bt,homehub-v2b) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0" + ;; +bt,homehub-v3a) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_set_interface_lan 'eth0' + ;; +buffalo,wbmr-hp-g300h) + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" + ;; +netgear,dgn3500|\ +netgear,dgn3500b) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + ;; +siemens,gigaset-sx76x) + annex="b" + ucidef_add_switch "switch0" \ + "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" + ;; +zte,h201l) + annex="b" + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" + ;; +zyxel,p-2601hn) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0" + ;; +*) + ucidef_set_interface_lan 'eth0' + ;; +esac + +ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ + ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" + +if lantiq_is_vdsl_system; then + ucidef_add_vdsl_modem "$annex" "av" +else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" +fi + +ucidef_set_interface_wan "dsl0" "pppoe" + +[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" +[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" + +board_config_flush + +exit 0 + diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom similarity index 70% rename from target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom rename to target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom index 5a6e8d360b..1f12da8553 100644 --- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom +++ b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom @@ -41,28 +41,13 @@ case "$FIRMWARE" in caldata_extract_swap "art-copy" 0x0 0x1000 ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii uboot_env ethaddr) +2) 0x10c ;; - bt,homehub-v5a) - caldata_extract_ubi "caldata" 0x1000 0x1000 - ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary_ubi caldata 0x110c) +2) 0x10c - ;; netgear,dgn3500|netgear,dgn3500b) caldata_extract "calibration" 0xf000 0x1000 ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii uboot-env ethaddr) +2) 0x20c ;; - avm,fritz3370-rev2-hynix|\ - avm,fritz3370-rev2-micron|\ - avm,fritz7362sl) - caldata_extract_reverse "urlader" 0x1541 0x440 - ;; - avm,fritz7312|avm,fritz7320|avm,fritz7360sl) + avm,fritz7312|avm,fritz7320) caldata_extract "urlader" 0x985 0x1000 ;; - avm,fritz7412) - /usr/bin/fritz_cal_extract -i 1 -s 0x1e000 -e 0x207 -l 4096 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader") - ;; - tplink,tdw8970|tplink,tdw8980) - caldata_extract "boardconfig" 0x21000 0x1000 - ;; *) caldata_die "board $board is not supported yet" ;; diff --git a/target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..5ef0a0ddb9 --- /dev/null +++ b/target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh @@ -0,0 +1,20 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + local board=$(board_name) + + case "$board" in + bt,homehub-v2b|\ + bt,homehub-v3a) + nand_do_upgrade $1 + ;; + *) + default_do_upgrade "$1" + ;; + esac +} diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..4200dcb0c8 --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds @@ -0,0 +1,41 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +led_wifi="$(get_dt_led wifi)" +[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt" + +led_usb="$(get_dt_led usb)" +[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1" + +led_usb2="$(get_dt_led usb2)" +[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1" + +led_dsl="$(get_dt_led dsl)" +[ -n "$led_dsl" ] && { + led_internet="$(get_dt_led internet)" + if [ -n "$led_internet" ]; then + ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" + ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" + else + ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0" + fi +} + +board=$(board_name) + +case "$board" in +arcadyan,arv4525pw) + ucidef_set_led_netdev "wifi" "wifi" "arv4525pw:green:wlan" "wlan0" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..120857de4c --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network @@ -0,0 +1,52 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +board_config_update + +annex="a" + +lan_mac="" +wan_mac="" + +board=$(board_name) + +case "$board" in +arcadyan,arv4520pw) + annex="b" + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + ;; +arcadyan,arv4525pw|\ +arcadyan,arv452cqw) + annex="b" + ucidef_set_interface_lan 'eth0' + ;; +*) + ucidef_set_interface_lan 'eth0' + ;; +esac + +ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ + ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" + +if lantiq_is_vdsl_system; then + ucidef_add_vdsl_modem "$annex" "av" +else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" +fi + +ucidef_set_interface_wan "dsl0" "pppoe" + +[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" +[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" + +board_config_flush + +exit 0 + diff --git a/target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..d088601bb0 --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh @@ -0,0 +1,10 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + default_do_upgrade "$1" +} From 18e089aaed58cb474c40b63da8562d7805f8b776 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 14 Jan 2020 21:45:43 +0100 Subject: [PATCH 325/480] lantiq: move common DSL setup into lantiq.sh DSL setup consists of the same commands for all subtargets, so move it into a helper function. While at it, remove shebang from library file. Signed-off-by: Adrian Schmutzler --- .../ase/base-files/etc/board.d/02_network | 11 +---------- .../lantiq/base-files/lib/functions/lantiq.sh | 17 +++++++++++++++-- .../falcon/base-files/etc/board.d/02_network | 11 +---------- .../xrx200/base-files/etc/board.d/02_network | 11 +---------- .../xway/base-files/etc/board.d/02_network | 11 +---------- .../base-files/etc/board.d/02_network | 11 +---------- 6 files changed, 20 insertions(+), 52 deletions(-) diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network index d37e999243..2334d6c25b 100755 --- a/target/linux/lantiq/ase/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network @@ -32,16 +32,7 @@ netgear,dgn1000b) ;; esac -ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" - -if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "av" -else - ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" -fi - -ucidef_set_interface_wan "dsl0" "pppoe" +lantiq_setup_dsl_helper "$annex" [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh index 62c7a6b662..e88e638285 100644 --- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh @@ -1,5 +1,18 @@ -#!/bin/sh - lantiq_is_vdsl_system() { grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo } + +lantiq_setup_dsl_helper() { + local annex="$1" + + ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ + ucidef_add_atm_bridge "1" "32" "llc" "bridged" "dsl" + + if lantiq_is_vdsl_system; then + ucidef_add_vdsl_modem "$annex" "av" + else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" + fi + + ucidef_set_interface_wan "dsl0" "pppoe" +} diff --git a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network index 76f134d6d4..997f4c741f 100755 --- a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network @@ -16,16 +16,7 @@ wan_mac="" ucidef_set_interface_lan 'eth0' -ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" - -if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "av" -else - ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" -fi - -ucidef_set_interface_wan "dsl0" "pppoe" +lantiq_setup_dsl_helper "$annex" [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network index f56de32614..05e235b096 100755 --- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network @@ -123,16 +123,7 @@ zyxel,p-2812hnu-f3) ;; esac -ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" - -if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "av" -else - ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" -fi - -ucidef_set_interface_wan "dsl0" "pppoe" +lantiq_setup_dsl_helper "$annex" [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/02_network b/target/linux/lantiq/xway/base-files/etc/board.d/02_network index b1b742bd1f..71d36696db 100755 --- a/target/linux/lantiq/xway/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xway/base-files/etc/board.d/02_network @@ -102,16 +102,7 @@ zyxel,p-2601hn) ;; esac -ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" - -if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "av" -else - ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" -fi - -ucidef_set_interface_wan "dsl0" "pppoe" +lantiq_setup_dsl_helper "$annex" [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network index 120857de4c..2d5dbade62 100755 --- a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network @@ -32,16 +32,7 @@ arcadyan,arv452cqw) ;; esac -ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl" - -if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "av" -else - ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" -fi - -ucidef_set_interface_wan "dsl0" "pppoe" +lantiq_setup_dsl_helper "$annex" [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" From 2fe464a712f8da597475d63a0ad28ec678eb404a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 17 Dec 2019 14:37:26 +0100 Subject: [PATCH 326/480] lantiq: reorganize 02_network board.d files This reorganizes 02_network board.d files based on what's done for ath79 and ramips: Instead of putting all settings into a single big case, the interface/dsl/MAC address setup is put into separate functions with a specific switch case for each of them. This makes grouping of devices much easier and should be easier to read, too. Signed-off-by: Adrian Schmutzler --- .../ase/base-files/etc/board.d/02_network | 71 +++-- .../falcon/base-files/etc/board.d/02_network | 53 +++- .../xrx200/base-files/etc/board.d/02_network | 281 ++++++++++-------- .../xway/base-files/etc/board.d/02_network | 203 +++++++------ .../base-files/etc/board.d/02_network | 76 +++-- 5 files changed, 393 insertions(+), 291 deletions(-) diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network index 2334d6c25b..0bda3e4763 100755 --- a/target/linux/lantiq/ase/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network @@ -7,37 +7,50 @@ . /lib/functions/system.sh . /lib/functions/lantiq.sh +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="b" + + case "$board" in + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + allnet,all0333cj) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + board_config_update - -annex="a" - -lan_mac="" -wan_mac="" - board=$(board_name) - -case "$board" in -allnet,all0333cj) - annex="b" - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; -netgear,dgn1000b) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; -*) - ucidef_set_interface_lan 'eth0' - ;; -esac - -lantiq_setup_dsl_helper "$annex" - -[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" -[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" - +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board board_config_flush exit 0 - diff --git a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network index 997f4c741f..7998efc2a0 100755 --- a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network @@ -7,21 +7,46 @@ . /lib/functions/system.sh . /lib/functions/lantiq.sh +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + board_config_update - -annex="a" - -lan_mac="" -wan_mac="" - -ucidef_set_interface_lan 'eth0' - -lantiq_setup_dsl_helper "$annex" - -[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" -[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" - +board=$(board_name) +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board board_config_flush exit 0 - diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network index 05e235b096..f39898263d 100755 --- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network @@ -7,128 +7,169 @@ . /lib/functions/system.sh . /lib/functions/lantiq.sh +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + alphanetworks,asl56026) + ucidef_add_switch "switch0" \ + "2:lan" "3:lan" "6t@eth0" + ;; + arcadyan,arv7519rw22) + ucidef_add_switch "switch0" \ + "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0" + ;; + arcadyan,vg3503j) + ucidef_add_switch "switch0" \ + "2:lan:2" "4:lan:1" "6t@eth0" + ;; + arcadyan,vgv7510kw22-brn|\ + arcadyan,vgv7510kw22-nor) + ucidef_add_switch "switch0" \ + "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0" + ;; + arcadyan,vgv7519-brn|\ + arcadyan,vgv7519-nor|\ + lantiq,easy80920-nand|\ + lantiq,easy80920-nor) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" + ;; + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron|\ + avm,fritz7360sl|\ + avm,fritz7362sl) + ucidef_add_switch "switch0" \ + "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" + ;; + bt,homehub-v5a) + ucidef_add_switch "switch0" \ + "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" + ;; + buffalo,wbmr-300hpd) + ucidef_add_switch "switch0" \ + "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0" + ;; + tplink,tdw8970|\ + tplink,tdw8980) + ucidef_add_switch "switch0" \ + "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0" + ;; + tplink,vr200|\ + tplink,vr200v) + ucidef_add_switch "switch0" \ + "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" + ;; + zyxel,p-2812hnu-f1|\ + zyxel,p-2812hnu-f3) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0" + ;; + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + arcadyan,vgv7510kw22-brn|\ + arcadyan,vgv7510kw22-nor|\ + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron|\ + avm,fritz7360sl|\ + avm,fritz7362sl|\ + avm,fritz7412) + annex="b" + ;; + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + alphanetworks,asl56026) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(mtd_get_mac_ascii uboot_env wanmac) + ;; + arcadyan,arv7519rw22) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0x16)" 1) + ;; + arcadyan,vg3503j|\ + lantiq,easy80920-nand|\ + lantiq,easy80920-nor|\ + zyxel,p-2812hnu-f1|\ + zyxel,p-2812hnu-f3) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + arcadyan,vgv7510kw22-brn|\ + arcadyan,vgv7510kw22-nor) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) + ;; + arcadyan,vgv7519-brn|\ + arcadyan,vgv7519-nor) + wan_mac=$(mtd_get_mac_binary board_config 0x16) + ;; + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron) + lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) + wan_mac=$(macaddr_add "$lan_mac" 3) + ;; + avm,fritz7360sl) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) + ;; + avm,fritz7362sl) + lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) + wan_mac=$(fritz_tffs -n macdsl -i $(find_mtd_part "tffs (1)")) + ;; + avm,fritz7412) + tffsdev=$(find_mtd_chardev "nand-tffs") + lan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n maca -o) + wan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n macdsl -o) + ;; + bt,homehub-v5a) + lan_mac=$(mtd_get_mac_binary_ubi caldata 0x110c) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + buffalo,wbmr-300hpd) + lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr) + wan_mac="$lan_mac" + ;; + netgear,dm200) + lan_mac=$(mtd_get_mac_binary ART 0x0) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + tplink,tdw8970|\ + tplink,tdw8980) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0xf100)" 1) + ;; + tplink,vr200|\ + tplink,vr200v) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 0xf100)" 1) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + board_config_update - -annex="a" - -lan_mac="" -wan_mac="" - board=$(board_name) - -case "$board" in -alphanetworks,asl56026) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(mtd_get_mac_ascii uboot_env wanmac) - ucidef_add_switch "switch0"\ - "2:lan" "3:lan" "6t@eth0" - ;; -arcadyan,arv7519rw22) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0x16)" 1) - ucidef_add_switch "switch0" \ - "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0" - ;; -arcadyan,vg3503j) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "2:lan:2" "4:lan:1" "6t@eth0" - ;; -arcadyan,vgv7510kw22-brn|\ -arcadyan,vgv7510kw22-nor) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) - ucidef_add_switch "switch0" \ - "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0" - ;; -arcadyan,vgv7519-brn|\ -arcadyan,vgv7519-nor) - wan_mac=$(mtd_get_mac_binary board_config 0x16) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; -avm,fritz3370-rev2-hynix|\ -avm,fritz3370-rev2-micron) - annex="b" - lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) - wan_mac=$(macaddr_add "$lan_mac" 3) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" - ;; -avm,fritz7360sl) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" - ;; -avm,fritz7362sl) - annex="b" - lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) - wan_mac=$(fritz_tffs -n macdsl -i $(find_mtd_part "tffs (1)")) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" - ;; -avm,fritz7412) - tffsdev=$(find_mtd_chardev "nand-tffs") - annex="b" - lan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n maca -o) - wan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n macdsl -o) - ucidef_set_interface_lan 'eth0' - ;; -bt,homehub-v5a) - lan_mac=$(mtd_get_mac_binary_ubi caldata 0x110c) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; -buffalo,wbmr-300hpd) - lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr) - wan_mac="$lan_mac" - ucidef_add_switch "switch0" \ - "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0" - ;; -lantiq,easy80920-nand|\ -lantiq,easy80920-nor) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; -netgear,dm200) - lan_mac=$(mtd_get_mac_binary ART 0x0) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; -tplink,tdw8970|\ -tplink,tdw8980) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0xf100)" 1) - ucidef_add_switch "switch0" \ - "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0" - ;; -tplink,vr200|\ -tplink,vr200v) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 0xf100)" 1) - ucidef_add_switch "switch0" \ - "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" - ;; -zyxel,p-2812hnu-f1|\ -zyxel,p-2812hnu-f3) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0" - ;; -*) - ucidef_set_interface_lan 'eth0' - ;; -esac - -lantiq_setup_dsl_helper "$annex" - -[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" -[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" - +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board board_config_flush exit 0 - diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/02_network b/target/linux/lantiq/xway/base-files/etc/board.d/02_network index 71d36696db..89368d8bfb 100755 --- a/target/linux/lantiq/xway/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xway/base-files/etc/board.d/02_network @@ -7,107 +7,112 @@ . /lib/functions/system.sh . /lib/functions/lantiq.sh +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + arcadyan,arv4510pw) + ucidef_add_switch "switch0" \ + "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0" + ;; + arcadyan,arv4519pw|\ + arcadyan,arv7510pw22|\ + arcadyan,arv7518pw|\ + arcadyan,arv752dpw22|\ + arcadyan,arv8539pw22|\ + buffalo,wbmr-hp-g300h) + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" + ;; + arcadyan,arv7506pw11|\ + audiocodes,mp-252|\ + siemens,gigaset-sx76x) + ucidef_add_switch "switch0" \ + "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" + ;; + arcadyan,arv7519pw|\ + zte,h201l) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" + ;; + bt,homehub-v2b) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0" + ;; + netgear,dgn3500|\ + netgear,dgn3500b) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + ;; + zyxel,p-2601hn) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0" + ;; + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + arcadyan,arv7506pw11|\ + arcadyan,arv7525pw|\ + arcadyan,arv752dpw|\ + arcadyan,arv752dpw22|\ + arcadyan,arv8539pw22|\ + avm,fritz7312|\ + avm,fritz7320|\ + siemens,gigaset-sx76x|\ + zte,h201l) + annex="b" + ;; + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + arcadyan,arv4510pw|\ + bt,homehub-v2b|\ + bt,homehub-v3a|\ + netgear,dgn3500|\ + netgear,dgn3500b) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + arcadyan,arv7506pw11) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) + ;; + arcadyan,arv7519pw) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 1) + ;; + avm,fritz7312|\ + avm,fritz7320) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + board_config_update - -annex="a" - -lan_mac="" -wan_mac="" - board=$(board_name) - -case "$board" in -arcadyan,arv4510pw) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0" - ;; -arcadyan,arv4519pw|\ -arcadyan,arv7510pw22|\ -arcadyan,arv7518pw) - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; -arcadyan,arv7506pw11) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; -arcadyan,arv7519pw) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 1) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - ;; -arcadyan,arv7525pw|\ -arcadyan,arv752dpw) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; -arcadyan,arv752dpw22|\ -arcadyan,arv8539pw22) - annex="b" - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; -audiocodes,mp-252) - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; -avm,fritz7312|\ -avm,fritz7320) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) - ucidef_set_interface_lan 'eth0' - ;; -bt,homehub-v2b) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0" - ;; -bt,homehub-v3a) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; -buffalo,wbmr-hp-g300h) - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; -netgear,dgn3500|\ -netgear,dgn3500b) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" - ;; -siemens,gigaset-sx76x) - annex="b" - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; -zte,h201l) - annex="b" - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - ;; -zyxel,p-2601hn) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0" - ;; -*) - ucidef_set_interface_lan 'eth0' - ;; -esac - -lantiq_setup_dsl_helper "$annex" - -[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" -[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" - +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board board_config_flush exit 0 - diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network index 2d5dbade62..c29beb832d 100755 --- a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network @@ -7,37 +7,55 @@ . /lib/functions/system.sh . /lib/functions/lantiq.sh +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + arcadyan,arv4520pw) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + ;; + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + arcadyan,arv4520pw|\ + arcadyan,arv4525pw|\ + arcadyan,arv452cqw) + annex="b" + ;; + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + board_config_update - -annex="a" - -lan_mac="" -wan_mac="" - board=$(board_name) - -case "$board" in -arcadyan,arv4520pw) - annex="b" - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" - ;; -arcadyan,arv4525pw|\ -arcadyan,arv452cqw) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; -*) - ucidef_set_interface_lan 'eth0' - ;; -esac - -lantiq_setup_dsl_helper "$annex" - -[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" -[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" - +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board board_config_flush exit 0 - From 866790fd827cb0187353cdf484eb46a9b38fb6ba Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 15 Jan 2020 13:54:28 +0100 Subject: [PATCH 327/480] mac80211: fix MAC address allocations if the local bit is set on the base addr If it's set, don't subtract 1 from the interface index encoded into the first byte of the address Signed-off-by: Felix Fietkau --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index b0fc5fb37b..7ac0ce8aac 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -393,7 +393,7 @@ mac80211_generate_mac() { [ "$((0x$mask1))" -gt 0 ] && { b1="0x$1" [ "$id" -gt 0 ] && \ - b1=$(($b1 ^ ((($id - 1) << 2) | 0x2))) + b1=$(($b1 ^ ((($id - !($b1 & 2)) << 2) | 0x2))) printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6 return } From 9b25f833eb840527d07c47930de2c769115844f3 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 15 Jan 2020 15:28:05 -0300 Subject: [PATCH 328/480] cryptodev-linux: remove DEFAULT redefinition The 'DEFAULT:=m if ALL' line prevents the phase1 buildbots from building the package, and users from downloading it, since they use 'ALL_KMODS=y' but 'ALL' is not set. Signed-off-by: Eneas U de Queiroz --- package/kernel/cryptodev-linux/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kernel/cryptodev-linux/Makefile b/package/kernel/cryptodev-linux/Makefile index 2a8890286d..da18c714b0 100644 --- a/package/kernel/cryptodev-linux/Makefile +++ b/package/kernel/cryptodev-linux/Makefile @@ -27,7 +27,6 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/cryptodev SUBMENU:=Cryptographic API modules - DEFAULT:=m if ALL TITLE:=Driver for cryptographic acceleration URL:=http://cryptodev-linux.org/ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) From 2248df303def0a9a93467b05288acd3b51da1d75 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Tue, 14 Jan 2020 17:40:04 +0100 Subject: [PATCH 329/480] ath79: wlr-7100: use ath10k-ct smallbuffers package variant The memory hacks got removed from ath10k with 1e27bef ("mac80211: remove ath10k_pci memory hacks"). As this device has low amount of RAM, switch to ath-10k-ct small buffers variant, to avoid the OOM Reaper. Signed-off-by: Tomasz Maciej Nowak --- target/linux/ath79/image/generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 18dad80d5d..abc6f96a80 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -986,7 +986,7 @@ define Device/sitecom_wlr-7100 DEVICE_VENDOR := Sitecom DEVICE_MODEL := WLR-7100 DEVICE_VARIANT := v1 002 - DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k kmod-usb2 + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct-smallbuffers kmod-usb2 IMAGES += factory.dlf IMAGE/factory.dlf := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ From f704f97e4c57e3f2db1bd2f5c87e1e44aebba42b Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 1 Jan 2020 14:34:11 +0100 Subject: [PATCH 330/480] busybox: Include hdparm by default on nas type device NAS devices certainly need to have hdparm to configure things like spin-down time or their disks will be constantly spinning. Just catenate CONFIG_HDPARM=y on these configs. Signed-off-by: Linus Walleij --- package/utils/busybox/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index c0f3007e5d..9af0f4853e 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -92,6 +92,9 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) endif define Build/Configure +ifeq ($(DEVICE_TYPE),nas) + echo "CONFIG_HDPARM=y" >> $(PKG_BUILD_DIR)/.config +endif grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" > $(PKG_BUILD_DIR)/.config yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) oldconfig endef From 0da193ee6943fc7afd100d2378cd1989d1f1cc03 Mon Sep 17 00:00:00 2001 From: Kyle Copperfield Date: Tue, 19 Nov 2019 18:50:00 +0000 Subject: [PATCH 331/480] dropbear: move failsafe code out of base-files The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Failsafe code of dropbear should be in the dropbear package not the base-files package. Signed-off-by: Kyle Copperfield --- package/base-files/Makefile | 2 +- package/base-files/files/lib/preinit/99_10_failsafe_login | 6 ------ package/network/services/dropbear/Makefile | 3 ++- package/network/services/dropbear/files/dropbear.failsafe | 8 ++++++++ 4 files changed, 11 insertions(+), 8 deletions(-) create mode 100755 package/network/services/dropbear/files/dropbear.failsafe diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 268d7d4cc9..e389148d47 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=212 +PKG_RELEASE:=213 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login index 728c63b2e8..16ad84f4ba 100644 --- a/package/base-files/files/lib/preinit/99_10_failsafe_login +++ b/package/base-files/files/lib/preinit/99_10_failsafe_login @@ -2,11 +2,6 @@ # Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2010 Vertical Communications -failsafe_netlogin () { - dropbearkey -t rsa -s 1024 -f /tmp/dropbear_failsafe_host_key - dropbear -r /tmp/dropbear_failsafe_host_key <> /dev/null 2>&1 -} - failsafe_shell() { local console="$(sed -e 's/ /\n/g' /proc/cmdline | grep '^console=' | head -1 | sed -e 's/^console=//' -e 's/,.*//')" [ -n "$console" ] || console=console @@ -17,5 +12,4 @@ failsafe_shell() { done & } -boot_hook_add failsafe failsafe_netlogin boot_hook_add failsafe failsafe_shell diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index d92b94915b..8b5bc17c9d 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2019.78 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -158,6 +158,7 @@ define Package/dropbear/install $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear $(INSTALL_DIR) $(1)/usr/lib/opkg/info $(INSTALL_DIR) $(1)/etc/dropbear + $(INSTALL_DIR) ./files/dropbear.failsafe $(1)/lib/preinit/99_10_failsafe_dropbear $(if $(CONFIG_DROPBEAR_ECC),touch $(1)/etc/dropbear/dropbear_ecdsa_host_key) touch $(1)/etc/dropbear/dropbear_rsa_host_key endef diff --git a/package/network/services/dropbear/files/dropbear.failsafe b/package/network/services/dropbear/files/dropbear.failsafe new file mode 100755 index 0000000000..a98ede459a --- /dev/null +++ b/package/network/services/dropbear/files/dropbear.failsafe @@ -0,0 +1,8 @@ +#!/bin/sh + +failsafe_dropbear () { + dropbearkey -t rsa -s 1024 -f /tmp/dropbear_failsafe_host_key + dropbear -r /tmp/dropbear_failsafe_host_key <> /dev/null 2>&1 +} + +boot_hook_add failsafe failsafe_dropbear From f0b76d02e8345022d417f02733504cfd862a2d6f Mon Sep 17 00:00:00 2001 From: Jeff Kletsky Date: Wed, 13 Nov 2019 13:09:48 -0800 Subject: [PATCH 332/480] build: define check-kernel-size to remove unflashable images Certain boards have limitations on U-Boot that prevent flashing of images where the kernel size exceeds a threshold, yet sysupgrade can sucessfully manage larger kernels. The current check-size will remove the target artifact if its total size exceeds the threshold. If applied after append-kernel, it will remove the kernel, but the remaining image-assembly steps will continue, resulting in an image without a kernel that is likely unbootable. By defining check-kernel-size, it is now possible to prevent release of such unbootable images through a construct similar to: IMAGE/factory.img := append-kernel | pad-to $$$$(GL_UBOOT_UBI_OFFSET) | \ append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET) Cc: Chuanhong Guo Signed-off-by: Jeff Kletsky --- include/image-commands.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/image-commands.mk b/include/image-commands.mk index 3b091f26ac..37cb083bbf 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -275,6 +275,13 @@ define Build/check-size } endef +define Build/check-kernel-size + @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $(IMAGE_KERNEL))" ] || { \ + echo "WARNING: Kernel for $@ is too big > $(1)" >&2; \ + rm -f $@; \ + } +endef + define Build/combined-image -sh $(TOPDIR)/scripts/combined-image.sh \ "$(IMAGE_KERNEL)" \ From e96bfaedf3a342750d92fbfa773017e40e34bec3 Mon Sep 17 00:00:00 2001 From: Jeff Kletsky Date: Wed, 13 Nov 2019 13:09:49 -0800 Subject: [PATCH 333/480] ath79: GL-AR750S (NOR/NAND): limit factory.img kernel size to 2 MB The present U-Boot for GL-AR750S has a limit of 2 MB for kernel size. While sysupgrade can manage kernels up to the present limit of 4 MB, directly flashing a factory.img with a kernel size greater than 2 MB through U-Boot will result in an unbootable device. This commit uses the newly-introduced check-kernel-size build operation to prevent the output of factory.img when the kernel exceeds 2 MB in size, yet permits output of sysupgrade.img as long as the kernel is within KERNEL_SIZE := 4096k Cc: Chuanhong Guo Signed-off-by: Jeff Kletsky --- target/linux/ath79/image/nand.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index cc775d52b6..00479e4eb5 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -88,12 +88,15 @@ define Device/glinet_gl-ar750s-common VID_HDR_OFFSET := 2048 endef +# NB: The kernel size is intentionally restricted at this time; see commit message define Device/glinet_gl-ar750s-nor-nand $(Device/glinet_gl-ar750s-common) DEVICE_VARIANT := NOR/NAND BLOCKSIZE := 128k + GL_UBOOT_UBI_OFFSET := 2048k IMAGES += factory.img - IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi + IMAGE/factory.img := append-kernel | pad-to $$$$(GL_UBOOT_UBI_OFFSET) | \ + append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata SUPPORTED_DEVICES += glinet,gl-ar750s-nor endef From 30c64825c7ed36452974733e53c591ff2dfd5336 Mon Sep 17 00:00:00 2001 From: Kyle Copperfield Date: Fri, 8 Nov 2019 19:42:56 -0800 Subject: [PATCH 334/480] hostapd: add dtim_period, local_pwr_constraint, spectrum_mgmt_required The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Allows dtim_period to be configurable, the default is from hostapd. Adds additional regulatory tunables for power constraint and spectrum managment. Signed-off-by: Kyle Copperfield --- package/network/services/hostapd/Makefile | 2 +- package/network/services/hostapd/files/hostapd.sh | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 8dfcd89cc4..cc06a7abb6 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index dcbabaf8f1..ba41fcdc3c 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -90,6 +90,8 @@ hostapd_common_add_device_config() { config_add_string country config_add_boolean country_ie doth + config_add_boolean spectrum_mgmt_required + config_add_int local_pwr_constraint config_add_string require_mode config_add_boolean legacy_rates @@ -106,11 +108,13 @@ hostapd_prepare_device_config() { local base="${config%%.conf}" local base_cfg= - json_get_vars country country_ie beacon_int:100 doth require_mode legacy_rates acs_chan_bias + json_get_vars country country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \ + acs_chan_bias local_pwr_constraint spectrum_mgmt_required hostapd_set_log_options base_cfg set_default country_ie 1 + set_default spectrum_mgmt_required 0 set_default doth 1 set_default legacy_rates 1 @@ -119,7 +123,11 @@ hostapd_prepare_device_config() { [ -n "$country" ] && { append base_cfg "country_code=$country" "$N" - [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N" + [ "$country_ie" -gt 0 ] && { + append base_cfg "ieee80211d=1" "$N" + [ -n "$local_pwr_constraint" ] && append base_cfg "local_pwr_constraint=$local_pwr_constraint" "$N" + [ "$spectrum_mgmt_required" -gt 0 ] && append base_cfg "spectrum_mgmt_required=$spectrum_mgmt_required" "$N" + } [ "$hwmode" = "a" -a "$doth" -gt 0 ] && append base_cfg "ieee80211h=1" "$N" } @@ -154,6 +162,7 @@ hostapd_prepare_device_config() { [ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N" [ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N" append base_cfg "beacon_int=$beacon_int" "$N" + append base_cfg "dtim_period=$dtim_period" "$N" json_get_values opts hostapd_options for val in $opts; do From 0fcb4a39813c153669cb5fee552e74ffb24ed42e Mon Sep 17 00:00:00 2001 From: Kyle Copperfield Date: Fri, 8 Nov 2019 19:42:57 -0800 Subject: [PATCH 335/480] hostapd: add wpa_strict_rekey support The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Rekey GTK on STA disassociate Signed-off-by: Kyle Copperfield --- package/network/services/hostapd/files/hostapd.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index ba41fcdc3c..c1f8e7f071 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -185,6 +185,7 @@ hostapd_common_add_bss_config() { config_add_int \ wep_rekey eap_reauth_period \ wpa_group_rekey wpa_pair_rekey wpa_master_rekey + config_add_boolean wpa_strict_rekey config_add_boolean wpa_disable_eapol_key_retries config_add_boolean tdls_prohibit @@ -270,7 +271,7 @@ hostapd_set_bss_options() { local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt json_get_vars \ - wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \ + wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_strict_rekey \ wpa_disable_eapol_key_retries tdls_prohibit \ maxassoc max_inactivity disassoc_low_ack isolate auth_cache \ wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \ @@ -325,6 +326,7 @@ hostapd_set_bss_options() { [ -n "$wpa_group_rekey" ] && append bss_conf "wpa_group_rekey=$wpa_group_rekey" "$N" [ -n "$wpa_pair_rekey" ] && append bss_conf "wpa_ptk_rekey=$wpa_pair_rekey" "$N" [ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey" "$N" + [ -n "$wpa_strict_rekey" ] && append bss_conf "wpa_strict_rekey=$wpa_strict_rekey" "$N" } [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N" From ee2014e68019c4150b9dda0cf9f140cdf6faada9 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 7 Nov 2019 11:40:31 +0100 Subject: [PATCH 336/480] uhttpd: add enable instance option With this change it is now possible to switch off single instances of the uhttpd config. Until now it was only possible to switch all instances of uhttpd on or off. Signed-off-by: Florian Eckert --- package/network/services/uhttpd/Makefile | 2 +- package/network/services/uhttpd/files/uhttpd.init | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 36dbe636ae..daa5667854 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 6322473b97..869f79bea2 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -98,6 +98,10 @@ start_instance() local cfg="$1" local realm="$(uci_get system.@system[0].hostname)" local listen http https interpreter indexes path handler httpdconf haveauth + local enabled + + config_get_bool enabled "$cfg" 'enabled' 1 + [ $enabled -gt 0 ] || return procd_open_instance procd_set_param respawn From 475a504dbc05e7a7e7d38db426c657b8c0c834fd Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 21 Dec 2019 17:51:47 -0800 Subject: [PATCH 337/480] perf: Add libunwind only if selected The depends are totally wrong. libunwind does not work with powerpc and i386 as it needs glibc. Instead of duplicating the platforms, just change the dependency. Signed-off-by: Rosen Penev --- package/devel/perf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile index 6f31c826e5..aa5fb16f60 100644 --- a/package/devel/perf/Makefile +++ b/package/devel/perf/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=perf PKG_VERSION:=$(LINUX_VERSION) -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk define Package/perf SECTION:=devel CATEGORY:=Development - DEPENDS:= +libelf +libdw +(mips||mipsel||powerpc||i386||x86_64||arm||aarch64):libunwind +libpthread +librt +objdump @!IN_SDK @!TARGET_arc770 @KERNEL_PERF_EVENTS + DEPENDS:= +libelf +libdw +PACKAGE_libunwind:libunwind +libpthread +librt +objdump @!IN_SDK @!TARGET_arc770 @KERNEL_PERF_EVENTS TITLE:=Linux performance monitoring tool VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org From c9ac7b17296ff29d9df39db8a68c449ef1514bbd Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 12 Jan 2020 20:20:43 +0100 Subject: [PATCH 338/480] ath79: add support for D-Link DIR-505 This commit adds support for the D-Link DIR-505, previously supported in ar71xx. Hardware -------- SoC: Atheros AR9330 FLASH: 8M SPI-NOR RAM: 64M WIFI: 1T1R 1SS Atheros AR9330 LED: Power green, Status red BTN: WPS, Reset Installation ------------ Currently, installation is only possible by sysupgrading from an earlier OpenWrt version, U-Boot TFTP or a modded U-Boot. I do not have the original bootloader from D-Link on my device anymore, so i cannot test the factory image. Signed-off-by: David Bauer --- .../linux/ath79/dts/ar9330_dlink_dir-505.dts | 149 ++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 4 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 1 + target/linux/ath79/image/generic.mk | 10 ++ 4 files changed, 164 insertions(+) create mode 100644 target/linux/ath79/dts/ar9330_dlink_dir-505.dts diff --git a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts new file mode 100644 index 0000000000..6984176daa --- /dev/null +++ b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar9330.dtsi" + +/ { + model = "D-Link DIR-505"; + compatible = "dlink,dir-505", "qca,ar9330"; + + aliases { + serial0 = &uart; + led-boot = &led_power_green; + led-failsafe = &led_status_red; + led-running = &led_power_green; + led-upgrade = &led_status_red; + }; + + keys { + compatible = "gpio-keys"; + + wps { + label = "WPS button"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + reset { + label = "Reset button"; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&jtag_disable_pins>; + + led_power_green: power { + label = "d-link:green:power"; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; + }; + + led_status_red: status { + label = "d-link:red:status"; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&gpio { + status = "okay"; + + led_enable { + gpio-hog; + output-low; + gpios = <1 GPIO_ACTIVE_LOW>; + line-name = "d-link:power:led"; + }; +}; + +&usb { + dr_mode = "host"; + status = "okay"; +}; + +&usb_phy { + status = "okay"; +}; + +ð0 { + status = "okay"; + + gmac-config { + device = <&gmac>; + switch-phy-addr-swap = <0>; + switch-phy-swap = <0>; + }; +}; + +ð1 { + compatible = "syscon", "simple-mfd"; + status = "okay"; +}; + +&spi { + num-chipselects = <1>; + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x10000>; + read-only; + }; + + art: partition@10000 { + label = "art"; + reg = <0x10000 0x10000>; + read-only; + }; + + mac: partition@20000 { + label = "mac"; + reg = <0x20000 0x10000>; + read-only; + }; + + partition@30000 { + label = "nvram"; + reg = <0x30000 0x10000>; + read-only; + }; + + partition@40000 { + label = "language"; + reg = <0x40000 0x40000>; + read-only; + }; + + partition@80000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x80000 0x780000>; + }; + }; + }; +}; + +&wmac { + status = "okay"; + qca,no-eeprom; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 2bf5751a5c..a96b504d5a 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -18,6 +18,7 @@ ath79_setup_interfaces() devolo,dvl1750c|\ devolo,dvl1750i|\ devolo,dvl1750x|\ + dlink,dir-505|\ engenius,ecb1750|\ glinet,gl-ar300m-lite|\ netgear,ex6400|\ @@ -315,6 +316,9 @@ ath79_setup_macs() lan_mac=$(mtd_get_mac_text "caldata" 0xffa0) wan_mac=$(mtd_get_mac_text "caldata" 0xffb4) ;; + dlink,dir-505) + lan_mac=$(mtd_get_mac_text "mac" 0x4) + ;; dlink,dir-825-c1|\ dlink,dir-835-a1) lan_mac=$(mtd_get_mac_text "mac" 0x4) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 84d840569b..4158116256 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -12,6 +12,7 @@ case "$FIRMWARE" in avm,fritz4020) caldata_extract_reverse "urlader" 0x1541 0x440 ;; + dlink,dir-505|\ dlink,dir-825-c1|\ dlink,dir-835-a1) caldata_extract "art" 0x1000 0x440 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index abc6f96a80..800e1c7a7d 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -373,6 +373,16 @@ define Device/devolo_dvl1750x endef TARGET_DEVICES += devolo_dvl1750x +define Device/dlink_dir-505 + SOC := ar9330 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-505 + IMAGE_SIZE := 7680k + DEVICE_PACKAGES := kmod-usb2 + SUPPORTED_DEVICES += dir-505-a1 +endef +TARGET_DEVICES += dlink_dir-505 + define Device/dlink_dir-825-b1 SOC := ar7161 DEVICE_VENDOR := D-Link From 5f07b6f367ff10ecc029e0b9e41b9fc5eac6968e Mon Sep 17 00:00:00 2001 From: Maxim Storchak Date: Thu, 9 Jan 2020 20:27:44 +0200 Subject: [PATCH 339/480] zram-swap: support swap priority If zram-backed swap is added after an existing swap, it gets a lower priority. Assiming that usually all other swaps are slower, there should be a way to assign a higher priority to zram swap. Signed-off-by: Maxim Storchak --- package/system/zram-swap/Makefile | 2 +- package/system/zram-swap/files/zram.init | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile index bcada98a81..ee5e85927f 100644 --- a/package/system/zram-swap/Makefile +++ b/package/system/zram-swap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zram-swap PKG_VERSION:=1.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init index ae432f3b00..49140ad406 100755 --- a/package/system/zram-swap/files/zram.init +++ b/package/system/zram-swap/files/zram.init @@ -172,6 +172,8 @@ start() local zram_size="$( zram_getsize )" local zram_dev="$( zram_getdev )" zram_applicable "$zram_dev" || return 1 + local zram_priority="$( uci -q get system.@system[0].zram_priority )" + zram_priority=${zram_priority:+-p $zram_priority} logger -s -t zram_start -p daemon.debug "activating '$zram_dev' for swapping ($zram_size MegaBytes)" @@ -180,7 +182,7 @@ start() zram_comp_streams "$zram_dev" echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" )/disksize" mkswap "$zram_dev" - swapon "$zram_dev" + swapon $zram_priority "$zram_dev" } stop() From 4a0a1fc91c4f28e431fa52ba009f2852acbfe07d Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Sun, 22 Dec 2019 21:51:48 +0100 Subject: [PATCH 340/480] mac80211: ath9k: add GPIO mask dts property This patch adds 'qca,gpio-mask=' device tree property to ath9k node. This optional setting is a hack and should only be used in very special (and rare) cases when a button or LED is wired to a GPIO pin normally masked out (due to being one-way etc). Netgear WNDR4300 v2 is one such example - it uses GPI9 for RFKILL. See ath9k/reg.h *_GPIO_MASK constants. Use with caution and expect to see stream of kernel warnings if wrong mask value is provided. Signed-off-by: Michal Cieslakiewicz --- .../patches/ath/553-ath9k_of_gpio_mask.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch diff --git a/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch b/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch new file mode 100644 index 0000000000..72b99050c4 --- /dev/null +++ b/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch @@ -0,0 +1,25 @@ +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -654,6 +654,12 @@ static int ath9k_of_init(struct ath_soft + return 0; + } + ++static void ath9k_of_gpio_mask(struct ath_softc *sc) ++{ ++ of_property_read_u32(sc->dev->of_node, "qca,gpio-mask", ++ &sc->sc_ah->caps.gpio_mask); ++} ++ + static int ath9k_init_softc(u16 devid, struct ath_softc *sc, + const struct ath_bus_ops *bus_ops) + { +@@ -758,6 +764,9 @@ static int ath9k_init_softc(u16 devid, s + if (ret) + goto err_hw; + ++ /* GPIO mask quirk */ ++ ath9k_of_gpio_mask(sc); ++ + ret = ath9k_init_queues(sc); + if (ret) + goto err_queues; From 4e6af8b9efcfc51e217d793239487dd8af1f410e Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Sun, 22 Dec 2019 21:53:29 +0100 Subject: [PATCH 341/480] ath79: WNDR4300: increase kernel partition to 4M Increase kernel partition from 2 MiB to 4 MiB for Netgear WNDR routers with NAND flash. Change affects following devices: * Netgear WNDR3700 v4 * Netgear WNDR4300 Signed-off-by: Michal Cieslakiewicz --- target/linux/ath79/dts/ar9344_netgear_wndr.dtsi | 10 +++++----- target/linux/ath79/image/nand.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi index 38dd052f5f..dd212c0d88 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi @@ -106,9 +106,9 @@ #address-cells = <1>; #size-cells = <1>; - ubi@8c0000 { + ubi@ac0000 { label = "ubi"; - reg = <0x0 0x7700000>; + reg = <0x0 0x7500000>; }; }; }; @@ -167,12 +167,12 @@ kernel@6c0000 { label = "kernel"; - reg = <0x6c0000 0x200000>; + reg = <0x6c0000 0x400000>; }; - ubipart0: partition@8c0000 { + ubipart0: partition@ac0000 { label = "ubipart0"; - reg = <0x8c0000 0x1700000>; + reg = <0xac0000 0x1500000>; }; partition@6c0000 { diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 00479e4eb5..d2018afb61 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -114,7 +114,7 @@ TARGET_DEVICES += glinet_gl-ar750s-nor define Device/netgear_ath79_nand DEVICE_VENDOR := NETGEAR DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport - KERNEL_SIZE := 2048k + KERNEL_SIZE := 4096k BLOCKSIZE := 128k PAGESIZE := 2048 IMAGE_SIZE := 25600k From 37a36a588a015c5f9e57c80c75670cf993955f24 Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Sun, 22 Dec 2019 21:54:33 +0100 Subject: [PATCH 342/480] ath79: add support for Netgear WNDR4300 v2 This patch introduces support for Netgear WNDR4300v2. Specification ============= * Description: Netgear WNDR4300 v2 * Loader: U-boot * SOC: Qualcomm Atheros QCA9563 (775 MHz) * RAM: 128 MiB * Flash: 2 MiB SPI-NOR + 128 MiB SPI-NAND - NOR: U-boot binary: 256 KiB - NOR: U-boot environment: 64 KiB - NOR: ART Backup: 64 KiB - NOR: Config: 64 KiB - NOR: Traffic Meter: 64 KiB - NOR: POT: 64 KiB - NOR: Reserved: 1408 KiB - NOR: ART: 64 KiB - NAND: Firmware: 25600 KiB (see notes for OpenWrt) - NAND: Language: 2048 KiB - NAND: mtdoops Crash Dump: 128 KiB - NAND: Reserved: 103296 KiB * Ethernet: 5 x 10/100/1000 (4 x LAN, 1 x WAN) (AR8337) * Wireless: - 2.4 GHz b/g/n (internal) - 5 GHz a/n (AR9580) * USB: yes, 1 x USB 2.0 * Buttons: - Reset - WiFi (rfkill) - WPS * LEDs: - Power (amber/green) - WAN (amber/green) - WLAN 2G (green) - WLAN 5G (blue) - 4 x LAN (amber/green) - USB (green) - WPS (green) * UART: 4-pin connector JP1, 3.3V (Vcc, TX, RX, GND), 115200 8N1 * Power supply: DC 12V 1.5A * MAC addresses: LAN=WLAN2G on case label, WAN +1, WLAN5G +2 Important Notes =============== 0. NOR Flash (2 MiB) is not touched by OpenWrt installation. 1. NAND Flash (128 MiB) layout under OpenWrt is changed as follows: all space is split between 4 MiB kernel and 124 MiB UBI areas; vendor partitions (language and mtdoops) are removed; kernel space size can be further expanded if needed; maximum image size is set to 25600k for compatibility reasons and can also be increased. 2. CPU clock is 775 MHz, not 750 MHz. 3. 5 GHz wireless radio chip is Atheros AR9580-AR1A with bogus PCI device ID 0xabcd. For ath9k driver to load successfully, this is overriden in DTS with correct value for this chip, 0x0033. 4. RFKILL button is wired to AR9580 pin 9 which is normally disabled by chip definition in ath9k code (0x0000F4FF gpio mask). Therefore 'qca,gpio-mask=<0xf6ff>' hack must be used for button to work properly. 5. USB port is always on, no GPIO for 5V power control has been identified. Installation ============ * TFTP recovery * TFTP via U-boot prompt * sysupgrade * Web interface Test build configuration ======================== CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_nand=y CONFIG_TARGET_ath79_nand_DEVICE_netgear_wndr4300-v2=y CONFIG_ALL_KMODS=y CONFIG_DEVEL=y CONFIG_CCACHE=y CONFIG_COLLECT_KERNEL_DEBUG=y CONFIG_IMAGEOPT=y Signed-off-by: Michal Cieslakiewicz --- package/boot/uboot-envtools/files/ath79 | 1 + .../linux/ath79/dts/qca9563_netgear_wndr.dtsi | 256 ++++++++++++++++++ .../ath79/dts/qca9563_netgear_wndr4300-v2.dts | 19 ++ target/linux/ath79/image/nand.mk | 11 + .../ath79/nand/base-files/etc/board.d/01_leds | 3 +- .../nand/base-files/etc/board.d/02_network | 6 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 6 +- 7 files changed, 297 insertions(+), 5 deletions(-) create mode 100644 target/linux/ath79/dts/qca9563_netgear_wndr.dtsi create mode 100644 target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index f956cf4ed4..85a0342a60 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -26,6 +26,7 @@ glinet,gl-ar750s-nor-nand|\ librerouter,librerouter-v1|\ netgear,ex6400|\ netgear,ex7300|\ +netgear,wndr4300-v2|\ netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ netgear,wnr2200-8m|\ diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi new file mode 100644 index 0000000000..2ab9b0b34a --- /dev/null +++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi @@ -0,0 +1,256 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include +#include + +#include "qca956x.dtsi" + +/ { + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; + label-mac-device = ð0; + }; + + keys { + compatible = "gpio-keys"; + + wps { + label = "wps"; + linux,code = ; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + }; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + }; + }; + + ath9k-keys { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + rfkill { + label = "rfkill"; + linux,code = ; + gpios = <&ath9k 9 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + leds: leds { + compatible = "gpio-leds"; + + pinctrl-names = "default"; + pinctrl-0 = <&jtag_disable_pins>; + + led_power_green: power_green { + label = "netgear:green:power"; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; + }; + + led_power_amber: power_amber { + label = "netgear:amber:power"; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; + default-state = "keep"; + }; + + wan_green { + label = "netgear:green:wan"; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + + wan_amber { + label = "netgear:amber:wan"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + wlan2g_green { + label = "netgear:green:wlan2g"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wps_green { + label = "netgear:green:wps"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + }; + + ath9k-leds { + compatible = "gpio-leds"; + + wlan5g_blue { + label = "netgear:blue:wlan5g"; + gpios = <&ath9k 7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + }; +}; + +&spi { + status = "okay"; + + num-cs = <2>; + cs-gpios = <0>, <0>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x40000 0x10000>; + }; + + partition@50000 { + label = "caldata_backup"; + reg = <0x50000 0x10000>; + read-only; + }; + + partition@60000 { + label = "config"; + reg = <0x60000 0x10000>; + }; + + partition@70000 { + label = "traffic_meter"; + reg = <0x70000 0x10000>; + }; + + partition@80000 { + label = "pot"; + reg = <0x80000 0x10000>; + }; + + partition@90000 { + label = "reserved"; + reg = <0x90000 0x160000>; + }; + + art: partition@1f0000 { + label = "caldata"; + reg = <0x1f0000 0x10000>; + read-only; + }; + }; + }; + + flash@1 { + compatible = "spi-nand"; + reg = <1>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x0 0x400000>; + }; + + partition@400000 { + label = "ubi"; + reg = <0x400000 0x7c00000>; + }; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy-mask = <0>; + + phy0: ethernet-phy@0 { + reg = <0>; + phy-mode = "sgmii"; + qca,mib-poll-interval = <500>; + + qca,ar8327-initvals = < + 0x04 0x00000080 /* PORT0 PAD MODE CTRL */ + 0x10 0x81000080 /* POWER_ON_STRIP */ + 0x50 0xcc35cc35 /* LED_CTRL0 */ + 0x54 0xcb37cb37 /* LED_CTRL1 */ + 0x58 0x00000000 /* LED_CTRL2 */ + 0x5c 0x00f3cf00 /* LED_CTRL3 */ + 0x7c 0x0000007e /* PORT0_STATUS */ + 0x94 0x00000200 /* PORT6_STATUS */ + >; + }; +}; + +ð0 { + status = "okay"; + + pll-data = <0x03000101 0x00000101 0x00001919>; + + mtd-mac-address = <&art 0x0>; + + phy-mode = "sgmii"; + phy-handle = <&phy0>; +}; + +&wmac { + status = "okay"; + + mtd-mac-address = <&art 0x0>; + qca,no-eeprom; +}; + +&pcie { + status = "okay"; + + ath9k: wifi@0,0 { + /* chip is AR9580, override bogus PCI ID 168c:abcd */ + compatible = "pci168c,0033"; + reg = <0x0000 0 0 0 0>; + mtd-mac-address = <&art 0xc>; + qca,no-eeprom; + qca,gpio-mask=<0xf6ff>; /* unmask pin 9 for RFKILL button */ + #gpio-cells = <2>; + gpio-controller; + }; +}; + +&usb_phy0 { + status = "okay"; +}; + +&usb0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_port0: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + +&uart { + status = "okay"; +}; diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts new file mode 100644 index 0000000000..e4b4ba2ac6 --- /dev/null +++ b/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +/dts-v1/; + +#include "qca9563_netgear_wndr.dtsi" + +/ { + compatible = "netgear,wndr4300-v2", "qca,qca9563"; + model = "Netgear WNDR4300 v2"; +}; + +&leds { + usb_green { + label = "netgear:green:usb"; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; + trigger-sources = <&hub_port0>; + linux,default-trigger = "usbport"; + }; +}; diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index d2018afb61..d5213523e4 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -154,6 +154,17 @@ define Device/netgear_wndr4300 endef TARGET_DEVICES += netgear_wndr4300 +define Device/netgear_wndr4300-v2 + SOC := qca9563 + DEVICE_MODEL := WNDR4300 + DEVICE_VARIANT := v2 + NETGEAR_KERNEL_MAGIC := 0x27051956 + NETGEAR_BOARD_ID := WNDR4500series + NETGEAR_HW_ID := 29764821+2+128+128+3x3+3x3+5508012175 + $(Device/netgear_ath79_nand) +endef +TARGET_DEVICES += netgear_wndr4300-v2 + define Device/zyxel_nbg6716 SOC := qca9558 DEVICE_VENDOR := ZyXEL diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds index 49d4005495..0376b7cfc6 100755 --- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds @@ -13,7 +13,8 @@ glinet,gl-ar300m-nor) ucidef_set_led_netdev "lan" "LAN" "gl-ar300m:green:lan" "eth0" ;; netgear,wndr3700-v4|\ -netgear,wndr4300) +netgear,wndr4300|\ +netgear,wndr4300-v2) ucidef_set_led_switch "wan-amber" "WAN (amber)" "netgear:amber:wan" "switch0" "0x20" ;; esac diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network index f7e43addc1..135a06d44b 100755 --- a/target/linux/ath79/nand/base-files/etc/board.d/02_network +++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network @@ -17,7 +17,8 @@ ath79_setup_interfaces() "0@eth0" "2:lan:2" "3:lan:1" "1:wan" ;; netgear,wndr3700-v4|\ - netgear,wndr4300) + netgear,wndr4300|\ + netgear,wndr4300-v2) ucidef_add_switch "switch0" \ "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" ;; @@ -37,7 +38,8 @@ ath79_setup_macs() case "$board" in netgear,wndr3700-v4|\ - netgear,wndr4300) + netgear,wndr4300|\ + netgear,wndr4300-v2) wan_mac=$(mtd_get_mac_binary caldata 0x6) ;; zyxel,nbg6716) diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 25bafe67ac..7ee291d109 100644 --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -10,7 +10,8 @@ case "$FIRMWARE" in "ath9k-eeprom-ahb-18100000.wmac.bin") case $board in netgear,wndr3700-v4|\ - netgear,wndr4300) + netgear,wndr4300|\ + netgear,wndr4300-v2) caldata_extract "caldata" 0x1000 0x440 ;; zyxel,nbg6716) @@ -25,7 +26,8 @@ case "$FIRMWARE" in "ath9k-eeprom-pci-0000:00:00.0.bin") case $board in netgear,wndr3700-v4|\ - netgear,wndr4300) + netgear,wndr4300|\ + netgear,wndr4300-v2) caldata_extract "caldata" 0x5000 0x440 ;; *) From a736f394323689dbbfbe548f93e6aa620016a64a Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Sun, 22 Dec 2019 21:55:54 +0100 Subject: [PATCH 343/480] ath79: add support for Netgear WNDR4500 v3 This patch introduces support for Netgear WNDR4500v3. Router is very similar to WNDR4300v2 and is based on the same PCB. Information gathered from various Internet sources (including https://patchwork.ozlabs.org/patch/809227/) shows following differences to WNDR4300v2: * two USB 2.0 ports with separate LEDs * USB LEDs soldered to secondary pads * WPS and RFKILL buttons soldered to secondary pads * described as N900 device with 3x3:3 MIMO for 2.4GHz radio * power supply requirement is DC 12V 2.5A * vendor HW ID suffix differs in one digit * bigger chassis Signed-off-by: Michal Cieslakiewicz --- package/boot/uboot-envtools/files/ath79 | 1 + .../ath79/dts/qca9563_netgear_wndr4500-v3.dts | 41 +++++++++++++++++++ target/linux/ath79/image/nand.mk | 11 +++++ .../ath79/nand/base-files/etc/board.d/01_leds | 3 +- .../nand/base-files/etc/board.d/02_network | 6 ++- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 6 ++- 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index 85a0342a60..aafced98db 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -27,6 +27,7 @@ librerouter,librerouter-v1|\ netgear,ex6400|\ netgear,ex7300|\ netgear,wndr4300-v2|\ +netgear,wndr4500-v3|\ netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ netgear,wnr2200-8m|\ diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts new file mode 100644 index 0000000000..95e30ea84b --- /dev/null +++ b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +/dts-v1/; + +#include "qca9563_netgear_wndr.dtsi" + +/ { + compatible = "netgear,wndr4500-v3", "qca,qca9563"; + model = "Netgear WNDR4500 v3"; +}; + +&leds { + usb1_green { + label = "netgear:green:usb1"; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; + trigger-sources = <&hub_port0>; + linux,default-trigger = "usbport"; + }; + + usb2_green { + label = "netgear:green:usb2"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + trigger-sources = <&hub_port1>; + linux,default-trigger = "usbport"; + }; +}; + +&usb_phy1 { + status = "okay"; +}; + +&usb1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index d5213523e4..f6929cd88e 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -165,6 +165,17 @@ define Device/netgear_wndr4300-v2 endef TARGET_DEVICES += netgear_wndr4300-v2 +define Device/netgear_wndr4500-v3 + SOC := qca9563 + DEVICE_MODEL := WNDR4500 + DEVICE_VARIANT := v3 + NETGEAR_KERNEL_MAGIC := 0x27051956 + NETGEAR_BOARD_ID := WNDR4500series + NETGEAR_HW_ID := 29764821+2+128+128+3x3+3x3+5508012173 + $(Device/netgear_ath79_nand) +endef +TARGET_DEVICES += netgear_wndr4500-v3 + define Device/zyxel_nbg6716 SOC := qca9558 DEVICE_VENDOR := ZyXEL diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds index 0376b7cfc6..d9989ec538 100755 --- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds @@ -14,7 +14,8 @@ glinet,gl-ar300m-nor) ;; netgear,wndr3700-v4|\ netgear,wndr4300|\ -netgear,wndr4300-v2) +netgear,wndr4300-v2|\ +netgear,wndr4500-v3) ucidef_set_led_switch "wan-amber" "WAN (amber)" "netgear:amber:wan" "switch0" "0x20" ;; esac diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network index 135a06d44b..bd02a4b383 100755 --- a/target/linux/ath79/nand/base-files/etc/board.d/02_network +++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network @@ -18,7 +18,8 @@ ath79_setup_interfaces() ;; netgear,wndr3700-v4|\ netgear,wndr4300|\ - netgear,wndr4300-v2) + netgear,wndr4300-v2|\ + netgear,wndr4500-v3) ucidef_add_switch "switch0" \ "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" ;; @@ -39,7 +40,8 @@ ath79_setup_macs() case "$board" in netgear,wndr3700-v4|\ netgear,wndr4300|\ - netgear,wndr4300-v2) + netgear,wndr4300-v2|\ + netgear,wndr4500-v3) wan_mac=$(mtd_get_mac_binary caldata 0x6) ;; zyxel,nbg6716) diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 7ee291d109..d2f8bae1ca 100644 --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -11,7 +11,8 @@ case "$FIRMWARE" in case $board in netgear,wndr3700-v4|\ netgear,wndr4300|\ - netgear,wndr4300-v2) + netgear,wndr4300-v2|\ + netgear,wndr4500-v3) caldata_extract "caldata" 0x1000 0x440 ;; zyxel,nbg6716) @@ -27,7 +28,8 @@ case "$FIRMWARE" in case $board in netgear,wndr3700-v4|\ netgear,wndr4300|\ - netgear,wndr4300-v2) + netgear,wndr4300-v2|\ + netgear,wndr4500-v3) caldata_extract "caldata" 0x5000 0x440 ;; *) From d9cfa827acd9155429e4f2b00bc0052156aa5d4d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 15 Jan 2020 21:17:13 +0100 Subject: [PATCH 344/480] busybox: fix build issues Fixes: f704f97e4c57 ("busybox: Include hdparm by default on nas type device") Signed-off-by: John Crispin --- package/utils/busybox/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 9af0f4853e..01441d1e87 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -92,10 +92,12 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) endif define Build/Configure + rm -f $(PKG_BUILD_DIR)/.config + touch $(PKG_BUILD_DIR)/.config ifeq ($(DEVICE_TYPE),nas) echo "CONFIG_HDPARM=y" >> $(PKG_BUILD_DIR)/.config endif - grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" > $(PKG_BUILD_DIR)/.config + grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" >> $(PKG_BUILD_DIR)/.config yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) oldconfig endef From 7151054abd5d43bf4c623e311a4c1046af4fff94 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 5 Dec 2019 11:33:38 +0100 Subject: [PATCH 345/480] wireguard: skip peer config if public key of the peer is not defined If a config section of a peer does not have a public key defined, the whole interface does not start. The following log is shown daemon.notice netifd: test (21071): Line unrecognized: `PublicKey=' daemon.notice netifd: test (21071): Configuration parsing erro The command 'wg show' does only show the interface name. With this change we skip the peer for this interface and emit a log message. So the other peers get configured. Signed-off-by: Florian Eckert --- package/network/utils/wireguard-tools/files/wireguard.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/network/utils/wireguard-tools/files/wireguard.sh b/package/network/utils/wireguard-tools/files/wireguard.sh index 4c811c6ba9..ccac34e45f 100644 --- a/package/network/utils/wireguard-tools/files/wireguard.sh +++ b/package/network/utils/wireguard-tools/files/wireguard.sh @@ -42,6 +42,11 @@ proto_wireguard_setup_peer() { config_get endpoint_port "${peer_config}" "endpoint_port" config_get persistent_keepalive "${peer_config}" "persistent_keepalive" + if [ -z "$public_key" ]; then + echo "Skipping peer config $peer_config because public key is not defined." + return 0 + fi + echo "[Peer]" >> "${wg_cfg}" echo "PublicKey=${public_key}" >> "${wg_cfg}" if [ "${preshared_key}" ]; then From a3dd95ef63c7824da6341f97d48f90f30a01e879 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 15 Jan 2020 21:31:12 +0100 Subject: [PATCH 346/480] dropbear: fix compile error Fixes: 0da193ee6943 ("dropbear: move failsafe code out of base-files") Signed-off-by: John Crispin --- package/network/services/dropbear/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 8b5bc17c9d..59b4f54954 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -158,7 +158,8 @@ define Package/dropbear/install $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear $(INSTALL_DIR) $(1)/usr/lib/opkg/info $(INSTALL_DIR) $(1)/etc/dropbear - $(INSTALL_DIR) ./files/dropbear.failsafe $(1)/lib/preinit/99_10_failsafe_dropbear + $(INSTALL_DIR) $(1)/lib/preinit + $(INSTALL_DATA) ./files/dropbear.failsafe $(1)/lib/preinit/99_10_failsafe_dropbear $(if $(CONFIG_DROPBEAR_ECC),touch $(1)/etc/dropbear/dropbear_ecdsa_host_key) touch $(1)/etc/dropbear/dropbear_rsa_host_key endef From 2115dcbfaceedc45767d080bc8645618ef7b20cc Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Mon, 6 Jan 2020 12:02:36 +0100 Subject: [PATCH 347/480] malta: enable HighMem on MIPS32 It allows to use more than 256MB memory on MIPS32. Signed-off-by: Aleksander Jan Bajkowski --- target/linux/malta/be/config-default | 1 + target/linux/malta/le/config-default | 1 + 2 files changed, 2 insertions(+) diff --git a/target/linux/malta/be/config-default b/target/linux/malta/be/config-default index f51301a058..5586be6b7c 100644 --- a/target/linux/malta/be/config-default +++ b/target/linux/malta/be/config-default @@ -1,3 +1,4 @@ CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_CPU_MIPS32_R2=y +CONFIG_HIGHMEM=y diff --git a/target/linux/malta/le/config-default b/target/linux/malta/le/config-default index aab569be3b..2b42a6b5b2 100644 --- a/target/linux/malta/le/config-default +++ b/target/linux/malta/le/config-default @@ -1,3 +1,4 @@ # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS32_R2=y +CONFIG_HIGHMEM=y From bbab32b2e33dad65c0102d47e0263872ac857e32 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 15 Jan 2020 23:03:16 +0100 Subject: [PATCH 348/480] ath79: use caldata partition label consistently Change the caldata partition DTS node label to be consistent with the label property for some Netgear WNDR devices. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar9344_netgear_wndr.dtsi | 8 ++++---- target/linux/ath79/dts/qca9563_netgear_wndr.dtsi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi index dd212c0d88..9fd428a1b3 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi @@ -139,7 +139,7 @@ reg = <0x40000 0x40000>; }; - art: partition@80000 { + caldata: partition@80000 { label = "caldata"; reg = <0x80000 0x40000>; read-only; @@ -233,7 +233,7 @@ /* default for ar934x, except for 1000M */ pll-data = <0x06000000 0x00000101 0x00001616>; - mtd-mac-address = <&art 0x0>; + mtd-mac-address = <&caldata 0x0>; phy-mode = "rgmii"; phy-handle = <&phy0>; @@ -260,7 +260,7 @@ &wmac { status = "okay"; - mtd-mac-address = <&art 0x0>; + mtd-mac-address = <&caldata 0x0>; qca,no-eeprom; }; @@ -270,7 +270,7 @@ ath9k: wifi@0,0 { compatible = "pci168c,0033"; reg = <0x0000 0 0 0 0>; - mtd-mac-address = <&art 0xc>; + mtd-mac-address = <&caldata 0xc>; qca,no-eeprom; #gpio-cells = <2>; gpio-controller; diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi index 2ab9b0b34a..bc06c5bd9d 100644 --- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi @@ -149,7 +149,7 @@ reg = <0x90000 0x160000>; }; - art: partition@1f0000 { + caldata: partition@1f0000 { label = "caldata"; reg = <0x1f0000 0x10000>; read-only; @@ -208,7 +208,7 @@ pll-data = <0x03000101 0x00000101 0x00001919>; - mtd-mac-address = <&art 0x0>; + mtd-mac-address = <&caldata 0x0>; phy-mode = "sgmii"; phy-handle = <&phy0>; @@ -217,7 +217,7 @@ &wmac { status = "okay"; - mtd-mac-address = <&art 0x0>; + mtd-mac-address = <&caldata 0x0>; qca,no-eeprom; }; @@ -228,7 +228,7 @@ /* chip is AR9580, override bogus PCI ID 168c:abcd */ compatible = "pci168c,0033"; reg = <0x0000 0 0 0 0>; - mtd-mac-address = <&art 0xc>; + mtd-mac-address = <&caldata 0xc>; qca,no-eeprom; qca,gpio-mask=<0xf6ff>; /* unmask pin 9 for RFKILL button */ #gpio-cells = <2>; From 5adca1cf2abc0c320be082522ab1ec747c7157b7 Mon Sep 17 00:00:00 2001 From: Andrea Dalla Costa Date: Sat, 28 Dec 2019 17:43:40 +0100 Subject: [PATCH 349/480] uboot-oxnas: fix memory leak in tool mkox820crc In function `main` add calls to `free` for the variable `executable`. This is needed because the variable `executable` is allocated but never freed. This cause a memory leak. Signed-off-by: Andrea Dalla Costa --- package/boot/uboot-oxnas/src/tools/mkox820crc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/boot/uboot-oxnas/src/tools/mkox820crc.c b/package/boot/uboot-oxnas/src/tools/mkox820crc.c index d100191f2d..873706245b 100644 --- a/package/boot/uboot-oxnas/src/tools/mkox820crc.c +++ b/package/boot/uboot-oxnas/src/tools/mkox820crc.c @@ -84,6 +84,7 @@ int main(int argc, char **argv) if (status != file_length) { printf("Failed to load image\n"); + free(executable); return -ENOENT; } @@ -111,6 +112,7 @@ int main(int argc, char **argv) status = lseek(in_file, 0, SEEK_SET); if (status != 0) { printf("failed to rewind\n"); + free(executable); return 1; } len = write(in_file, &img_header, sizeof(img_header)); @@ -118,6 +120,7 @@ int main(int argc, char **argv) len = write(in_file, executable, file_length); assert(len == file_length); close(in_file); + free(executable); return 0; } From 788c8485eb5b71ef7e7b2a2d3077772e526e9746 Mon Sep 17 00:00:00 2001 From: Thomas Nixon Date: Sun, 5 Jan 2020 21:38:36 +0000 Subject: [PATCH 350/480] ar71xx/mikrotik: use ath10k-ct-smallbuffers for 64 MiB devices This image is only needed on one device (wAP AC); since this target is going to be removed anyway it doesn't make sense to add an extra "low RAM" image. Fixes OOM issues on RouterBoard wAP AC. Signed-off-by: Thomas Nixon --- target/linux/ar71xx/image/mikrotik.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk index 91b11f3c7f..dbbccb1c3f 100644 --- a/target/linux/ar71xx/image/mikrotik.mk +++ b/target/linux/ar71xx/image/mikrotik.mk @@ -55,7 +55,7 @@ TARGET_DEVICES += rb-nor-flash-16M define Device/rb-nor-flash-16M-ac $(Device/rb-nor-flash-16M) DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR, 802.11ac) - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct ath10k-firmware-qca9887-ct kmod-usb-ehci + DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct ath10k-firmware-qca9887-ct kmod-usb-ehci SUPPORTED_DEVICES += rb-wapg-5hact2hnd endef TARGET_DEVICES += rb-nor-flash-16M-ac From 6cca6fffa06b1996f9bcc280f766e8ba4fa97d45 Mon Sep 17 00:00:00 2001 From: Johann Neuhauser Date: Thu, 19 Dec 2019 13:07:17 +0100 Subject: [PATCH 351/480] ath79: phy-ar7200-usb: adapt old behavior of arch/mips/ath79/dev-usb.c Do not put usb-phy into reset if clearing the usb-phy reset or setting the suspend_override has failed. Reorder (de)asserts like in arch/mips/ath79/dev-usb.c. Add an optional reset_control "usb-phy-analog", which is needed for ar934x SoCs like in the old mach-driver arch/mips/ath79/dev-usb.c. Signed-off-by: Johann Neuhauser --- .../0004-phy-add-ath79-usb-phys.patch | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch index 6280baf913..fa3487d392 100644 --- a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch +++ b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch @@ -194,7 +194,7 @@ Signed-off-by: John Crispin +MODULE_LICENSE("GPL"); --- /dev/null +++ b/drivers/phy/phy-ar7200-usb.c -@@ -0,0 +1,123 @@ +@@ -0,0 +1,135 @@ +/* + * Copyright (C) 2015 Alban Bedel + * @@ -212,6 +212,7 @@ Signed-off-by: John Crispin + +struct ar7200_usb_phy { + struct reset_control *rst_phy; ++ struct reset_control *rst_phy_analog; + struct reset_control *suspend_override; + struct phy *phy; + int gpio; @@ -222,12 +223,12 @@ Signed-off-by: John Crispin + struct ar7200_usb_phy *priv = phy_get_drvdata(phy); + int err = 0; + -+ if (priv->rst_phy) -+ err = reset_control_deassert(priv->rst_phy); -+ if (!err && priv->suspend_override) ++ if (priv->suspend_override) + err = reset_control_assert(priv->suspend_override); -+ if (err && priv->rst_phy) -+ err = reset_control_assert(priv->rst_phy); ++ if (priv->rst_phy) ++ err |= reset_control_deassert(priv->rst_phy); ++ if (priv->rst_phy_analog) ++ err |= reset_control_deassert(priv->rst_phy_analog); + + return err; +} @@ -241,6 +242,8 @@ Signed-off-by: John Crispin + err = reset_control_deassert(priv->suspend_override); + if (priv->rst_phy) + err |= reset_control_assert(priv->rst_phy); ++ if (priv->rst_phy_analog) ++ err |= reset_control_assert(priv->rst_phy_analog); + + return err; +} @@ -266,6 +269,15 @@ Signed-off-by: John Crispin + return PTR_ERR(priv->rst_phy); + } + ++ priv->rst_phy_analog = devm_reset_control_get_optional( ++ &pdev->dev, "usb-phy-analog"); ++ if (IS_ERR(priv->rst_phy_analog)) { ++ if (PTR_ERR(priv->rst_phy_analog) == -ENOENT) ++ priv->rst_phy_analog = NULL; ++ else ++ return PTR_ERR(priv->rst_phy_analog); ++ } ++ + priv->suspend_override = devm_reset_control_get_optional( + &pdev->dev, "usb-suspend-override"); + if (IS_ERR(priv->suspend_override)) { From bda6b6144dbe3e12d128b500821799ef472de4cb Mon Sep 17 00:00:00 2001 From: Johann Neuhauser Date: Thu, 19 Dec 2019 13:11:26 +0100 Subject: [PATCH 352/480] ath79: ar934x: use reset for usb-phy-analog This was already available on ar71xx, but is missing on ath79. This solves the slow usb speed on TP-Link WDR3600/WDR4300 and similar, as reported in Flyspray [0], OpenWRT Forum [1] and GitHub PR [2]. [0] https://bugs.openwrt.org/index.php?do=details&task_id=2567 [1] https://forum.openwrt.org/t/usb-wdr4300-low-speed-on-external-storage/46794 [2] https://github.com/openwrt/openwrt/pull/964 Signed-off-by: Johann Neuhauser --- target/linux/ath79/dts/ar934x.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index bb6c647452..8cd0b4e086 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -199,8 +199,8 @@ usb_phy: usb-phy { compatible = "qca,ar9340-usb-phy", "qca,ar7200-usb-phy"; - reset-names = "usb-phy", "usb-suspend-override"; - resets = <&rst 4>, <&rst 3>; + reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override"; + resets = <&rst 11>, <&rst 4>, <&rst 3>; #phy-cells = <0>; From 702c70264b388c2b47e171843f297f43c71b86b9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 16 Jan 2020 10:13:51 +0200 Subject: [PATCH 353/480] hostapd: cleanup IBSS-RSN set noscan also for IBSS and remove redundant/obsolete variable. Signed-off-by: Daniel Golle --- package/network/services/hostapd/Makefile | 2 +- package/network/services/hostapd/files/hostapd.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index cc06a7abb6..231c2c1b88 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index c1f8e7f071..b52d305f95 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -729,12 +729,9 @@ wpa_supplicant_prepare_interface() { local ap_scan= _w_mode="$mode" - _w_modestr= [[ "$mode" = adhoc ]] && { ap_scan="ap_scan=2" - - _w_modestr="mode=1" } local country_str= @@ -815,6 +812,7 @@ wpa_supplicant_add_network() { [[ "$_w_mode" = "adhoc" ]] && { append network_data "mode=1" "$N$T" [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" + [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T" scan_ssid="scan_ssid=0" @@ -834,8 +832,6 @@ wpa_supplicant_add_network() { scan_ssid="" } - [ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ] && append network_data "$_w_modestr" "$N$T" - [ "$multi_ap" = 1 -a "$_w_mode" = "sta" ] && append network_data "multi_ap_backhaul_sta=1" "$N$T" case "$auth_type" in From a5f3648a1c273b45dc9df18785e0b5966ac5b47e Mon Sep 17 00:00:00 2001 From: David Lam Date: Thu, 16 Jan 2020 00:01:35 -0800 Subject: [PATCH 354/480] hostapd: add support for system cert bundle validation Currently, it is very cumbersome for a user to connect to a WPA-Enterprise based network securely because the RADIUS server's CA certificate must first be extracted from the EAPOL handshake using tcpdump or other methods before it can be pinned using the ca_cert(2) fields. To make this process easier and more secure (combined with changes in openwrt/openwrt#2654), this commit adds support for validating against the built-in CA bundle when the ca-bundle package is installed. Related LuCI changes in openwrt/luci#3513. Signed-off-by: David Lam [bump PKG_RELEASE] Signed-off-by: Jo-Philipp Wich --- package/network/services/hostapd/Makefile | 2 +- .../network/services/hostapd/files/hostapd.sh | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 231c2c1b88..2642a263dc 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index b52d305f95..ab86638e11 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -212,6 +212,7 @@ hostapd_common_add_bss_config() { config_add_string radius_client_addr config_add_string iapp_interface config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd + config_add_boolean ca_cert_usesystem ca_cert2_usesystem config_add_string subject_match subject_match2 config_add_array altsubject_match altsubject_match2 config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2 @@ -872,8 +873,13 @@ wpa_supplicant_add_network() { hostapd_append_wpa_key_mgmt key_mgmt="$wpa_key_mgmt" - json_get_vars eap_type identity anonymous_identity ca_cert - [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T" + json_get_vars eap_type identity anonymous_identity ca_cert ca_cert_usesystem + + if [ "$ca_cert_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then + append network_data "ca_cert=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T" + else + [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T" + fi [ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T" [ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T" case "$eap_type" in @@ -914,12 +920,15 @@ wpa_supplicant_add_network() { fi ;; fast|peap|ttls) - json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd + json_get_vars auth password ca_cert2 ca_cert2_usesystem client_cert2 priv_key2 priv_key2_pwd set_default auth MSCHAPV2 if [ "$auth" = "EAP-TLS" ]; then - [ -n "$ca_cert2" ] && - append network_data "ca_cert2=\"$ca_cert2\"" "$N$T" + if [ "$ca_cert2_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then + append network_data "ca_cert2=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T" + else + [ -n "$ca_cert2" ] && append network_data "ca_cert2=\"$ca_cert2\"" "$N$T" + fi append network_data "client_cert2=\"$client_cert2\"" "$N$T" append network_data "private_key2=\"$priv_key2\"" "$N$T" append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T" From 68f49df31507454f86b72a5c1e250505176baed7 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Fri, 17 Jan 2020 00:24:43 +0800 Subject: [PATCH 355/480] ramips: fix HiWiFi HC5962 switch configuration HC5962 has only 3 LAN ports, switch port 0 is unused Signed-off-by: DENG Qingfang --- target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 85105c870b..84fc283f4f 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -13,7 +13,6 @@ ramips_setup_interfaces() afoundry,ew1200|\ d-team,pbr-m1|\ firefly,firewrt|\ - hiwifi,hc5962|\ jcg,jhr-ac876m|\ mediatek,ap-mt7621a-v60|\ mediatek,mt7621-eval-board|\ @@ -102,6 +101,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "4:lan" "6@eth0" ;; + hiwifi,hc5962) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" + ;; lenovo,newifi-d1) ucidef_add_switch "switch0" \ "1:lan:2" "2:lan:1" "4:wan" "6@eth0" From 9a3c9a96563c3c3fb1e15b791d9117b193fed7a6 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Fri, 17 Jan 2020 00:27:59 +0800 Subject: [PATCH 356/480] ramips: fix HiWiFi HC5962 status LED Match LED behavior to stock firmware: Red: booting White: running Signed-off-by: DENG Qingfang --- target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts index 0d0e44ca13..f8d7268b92 100644 --- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts +++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts @@ -10,8 +10,8 @@ model = "HiWiFi HC5962"; aliases { - led-boot = &led_status; - led-failsafe = &led_status; + led-boot = &led_system; + led-failsafe = &led_system; led-running = &led_status; led-upgrade = &led_status; }; @@ -28,9 +28,10 @@ gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; - system { + led_system: system { label = "hc5962:red:system"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + panic-indicator; }; }; From 5355baf21f184cdc03206f58b95051ea92c9be68 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Thu, 16 Jan 2020 23:35:00 +0800 Subject: [PATCH 357/480] ccache: update to 3.7.7 Update ccache to 3.7.7 Release notes: https://ccache.dev/releasenotes.html#_ccache_3_7_7 Signed-off-by: DENG Qingfang --- tools/ccache/Makefile | 4 ++-- tools/ccache/patches/100-honour-copts.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index 50a1a412a8..4e99207872 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=ccache -PKG_VERSION:=3.7.6 +PKG_VERSION:=3.7.7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=73e2633ac9bca387b5a39c72a8f85634670c4091dab639228c433898163c86c0 +PKG_HASH:=b7c1d6d6fe42f18e424de92746af863e0bc85794da3d69e44300840c478c98cd include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index 97bacae2d2..a3cef56213 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,6 +1,6 @@ --- a/src/ccache.c +++ b/src/ccache.c -@@ -2224,6 +2224,7 @@ calculate_object_hash(struct args *args, +@@ -2220,6 +2220,7 @@ calculate_object_hash(struct args *args, "CPLUS_INCLUDE_PATH", "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH", // clang From f0c0f92ce4c6e0e2af06d5fda5a5fadba66b8342 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 16 Jan 2020 21:50:11 +0100 Subject: [PATCH 358/480] odhcpd: update to version 2020-01-14 6db312a dhcpv6-ia: use dhcp leasetime to set preferred/valid statefull lifetimes 2520c48 dhcpv6-ia: introduce DHCPv6 pd and ia assignments flags b413d8a dhcpv6-ia: cleanup prefix delegation routes b0902af dhcpv6-ia: remove passing interface as parameter to apply_lease Signed-off-by: Hans Dedecker --- package/network/services/odhcpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 3aaf70f289..c5f724125b 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git -PKG_SOURCE_DATE:=2019-12-15 -PKG_SOURCE_VERSION:=d60f0a6284e8f5fac733a1b269ea614ccdf47fcd -PKG_MIRROR_HASH:=4fb653528ecab08e6ba5aa3f9af020c856d3b4b99d44352552df96b944606154 +PKG_SOURCE_DATE:=2020-01-14 +PKG_SOURCE_VERSION:=6db312a698e920ff61505ef1f42469880829774d +PKG_MIRROR_HASH:=4c9f5effd379fed3119f0a2d2661c5929ac234d9b2e3d7a6a1de72409b04a0f1 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 From 1322190fd355e6d9c0f37a668a77a14bbfb2c375 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Fri, 17 Jan 2020 00:05:53 +0200 Subject: [PATCH 359/480] libcxx: fix build for x86/64 When building libcxx for x86/64, the library is installed in /usr/lib64. As the install section tries to copy the library from /usr/lib, this breaks build on x86/64. Override the lib dir suffix to fix this. Fixes: 856ea2bad3b3 ("libcxx: Add package") Signed-off-by: Stijn Tintel Acked-by: Rosen Penev --- package/libs/libcxx/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile index 53b7f1eaab..8343cbb427 100644 --- a/package/libs/libcxx/Makefile +++ b/package/libs/libcxx/Makefile @@ -45,6 +45,7 @@ CMAKE_OPTIONS += \ -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ -DLIBCXX_INCLUDE_DOCS=OFF \ -DLIBCXX_INCLUDE_TESTS=OFF \ + -DLIBCXX_LIBDIR_SUFFIX="" \ -DLIBCXX_STANDALONE_BUILD=ON \ -DLIBCXX_HAS_MUSL_LIBC=$(if $(CONFIG_USE_MUSL),ON,OFF) From cba5fa0352869c117858bd56bebf3c1290865d99 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Jan 2020 20:43:53 -0800 Subject: [PATCH 360/480] base-files/functions.sh: don't use $var in $(()) It's not needed. It can also lead to subtle bugs. https://github.com/koalaman/shellcheck/wiki/Sc2004 Signed-off-by: Rosen Penev --- package/base-files/files/lib/functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 81176431d1..b118c8368c 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -70,7 +70,7 @@ config () { local cfgtype="$1" local name="$2" - export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1)) + export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$((CONFIG_NUM_SECTIONS + 1)) name="${name:-cfg$CONFIG_NUM_SECTIONS}" append CONFIG_SECTIONS "$name" export ${NO_EXPORT:+-n} CONFIG_SECTION="$name" @@ -93,7 +93,7 @@ list() { config_get len "$CONFIG_SECTION" "${varname}_LENGTH" 0 [ $len = 0 ] && append CONFIG_LIST_STATE "${CONFIG_SECTION}_${varname}" - len=$(($len + 1)) + len=$((len + 1)) config_set "$CONFIG_SECTION" "${varname}_ITEM$len" "$value" config_set "$CONFIG_SECTION" "${varname}_LENGTH" "$len" append "CONFIG_${CONFIG_SECTION}_${varname}" "$value" "$LIST_SEP" @@ -162,7 +162,7 @@ config_list_foreach() { while [ $c -le "$len" ]; do config_get val "${section}" "${option}_ITEM$c" eval "$function \"\$val\" \"\$@\"" - c="$(($c + 1))" + c="$((c + 1))" done } From b8e17aefea91632a70634aa2828a8b548c2b2567 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Jan 2020 20:43:56 -0800 Subject: [PATCH 361/480] base-files/functions.sh: remove useless cat The cut command can take a file as an input. https://github.com/koalaman/shellcheck/wiki/SC2002 Signed-off-by: Rosen Penev --- package/base-files/files/lib/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index b118c8368c..40a7527aa5 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -324,7 +324,7 @@ group_add_next() { echo $gid return fi - gids=$(cat ${IPKG_INSTROOT}/etc/group | cut -d: -f3) + gids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/group) gid=65536 while [ -n "$(echo "$gids" | grep "^$gid$")" ] ; do gid=$((gid + 1)) @@ -352,7 +352,7 @@ user_add() { local shell="${6:-/bin/false}" local rc [ -z "$uid" ] && { - uids=$(cat ${IPKG_INSTROOT}/etc/passwd | cut -d: -f3) + uids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd) uid=65536 while [ -n "$(echo "$uids" | grep "^$uid$")" ] ; do uid=$((uid + 1)) From fb56573dc4a5dda48953916b533a26af68b16f11 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Jan 2020 20:43:57 -0800 Subject: [PATCH 362/480] base-files/functions.sh: use && instead of -a -a is not well defined. https://github.com/koalaman/shellcheck/wiki/SC2166 Signed-off-by: Rosen Penev --- package/base-files/files/lib/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 40a7527aa5..8e189e4f4d 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -143,7 +143,7 @@ config_foreach() { [ -z "$CONFIG_SECTIONS" ] && return 0 for section in ${CONFIG_SECTIONS}; do config_get cfgtype "$section" TYPE - [ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue + [ -n "$___type" ] && [ "x$cfgtype" != "x$___type" ] && continue eval "$___function \"\$section\" \"\$@\"" done } @@ -374,4 +374,4 @@ board_name() { [ -e /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name || echo "generic" } -[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh +[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh From d4009d7985500b0f4ec26dee9b91bdeb3ea16da5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Jan 2020 20:43:59 -0800 Subject: [PATCH 363/480] base-files/system.sh: remove $ in $(()) Not needed. https://github.com/koalaman/shellcheck/wiki/Sc2004 Signed-off-by: Rosen Penev --- package/base-files/files/lib/functions/system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh index c4dc3cc3a9..c9f8eb0c31 100644 --- a/package/base-files/files/lib/functions/system.sh +++ b/package/base-files/files/lib/functions/system.sh @@ -140,7 +140,7 @@ macaddr_add() { local oui=${mac%:*:*:*} local nic=${mac#*:*:*:} - nic=$(printf "%06x" $((0x${nic//:/} + $val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/') + nic=$(printf "%06x" $((0x${nic//:/} + val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/') echo $oui:$nic } From 26105974e7f9758cd4bc443ce0322983f818acd5 Mon Sep 17 00:00:00 2001 From: Jan Alexander Date: Wed, 15 Jan 2020 21:12:33 +0100 Subject: [PATCH 364/480] ramips: fix wps leds/btn for TP-Link TL-WA801ND v5 - fix color and active mode for existing wps led - add green wps led - add wps button Signed-off-by: Jan Alexander [wrap line] Signed-off-by: David Bauer --- .../dts/mt7628an_tplink_tl-wa801nd-v5.dts | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index b4c004b955..d2cb271efb 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -24,6 +24,12 @@ gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; linux,code = ; }; + + wps { + label = "wps"; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + linux,code = ; + }; }; leds { @@ -44,16 +50,22 @@ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; }; - wps { - label = "tl-wa801nd-v5:orange:wps"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + wps_red { + label = "tl-wa801nd-v5:red:wps"; + gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + }; + + wps_green { + label = "tl-wa801nd-v5:green:wps"; + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; }; }; }; &state_default { gpio { - ralink,group = "p0led_an", "perst", "refclk", "wdt", "wled_an"; + ralink,group = "p0led_an", "p1led_an", "perst", "refclk", + "uart1", "wdt", "wled_an"; ralink,function = "gpio"; }; }; From 8df14c229c02a3b9329afc6e3ebf4f8aec5b59ed Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 17 Jan 2020 14:36:29 -0800 Subject: [PATCH 365/480] base-files/functions.sh: use grep -q instead of [] It's cleaner and faster as it does not need to do extra work. Also removed $() to avoid executing the output. The shell can handle it. https://github.com/koalaman/shellcheck/wiki/SC2143 Signed-off-by: Rosen Penev [correct || to && for one conversion] Signed-off-by: Adrian Schmutzler --- package/base-files/files/lib/functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 8e189e4f4d..d2edef1a34 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -326,7 +326,7 @@ group_add_next() { fi gids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/group) gid=65536 - while [ -n "$(echo "$gids" | grep "^$gid$")" ] ; do + while echo "$gids" | grep -q "^$gid$"; do gid=$((gid + 1)) done group_add $1 $gid @@ -336,8 +336,8 @@ group_add_next() { group_add_user() { local grp delim="," grp=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group) - [ -z "$(echo $grp | cut -d: -f4 | grep $2)" ] || return - [ -n "$(echo $grp | grep ":$")" ] && delim="" + echo "$grp" | cut -d: -f4 | grep -q $2 && return + echo "$grp" | grep -q ":$" && delim="" [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd sed -i "s/$grp/$grp$delim$2/g" ${IPKG_INSTROOT}/etc/group [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd @@ -354,7 +354,7 @@ user_add() { [ -z "$uid" ] && { uids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd) uid=65536 - while [ -n "$(echo "$uids" | grep "^$uid$")" ] ; do + while echo "$uids" | grep -q "^$uid$"; do uid=$((uid + 1)) done } From d3c0a944059bb0d45c3b56278249100258378b0c Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Wed, 1 Jan 2020 21:33:10 +0900 Subject: [PATCH 366/480] ramips: mt7620/mt7621: remove invalid mediatek,portmap mt7620 and mt7621 use mt7530 driver, which only accepts "llllw", "wllll", and "lwlll" values. According to its switch setup, Mi Router 3G v2 has a WAN port at port 4, so the correct value should be "llllw". Signed-off-by: Sungbo Eo --- target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi | 1 - target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts | 5 ++--- target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 3b8ba4ec38..1202ac1b69 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -122,7 +122,6 @@ pinctrl-names = "default"; pinctrl-0 = <&rgmii1_pins &mdio_pins &phy_reset_pins>; - mediatek,portmap = "l"; mediatek,mdio-mode = <1>; phy-reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts index dccced0f18..ea42ef2c54 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts @@ -169,9 +169,8 @@ }; ðernet { - mtd-mac-address = <&rom 0xf100>; - mediatek,portmap = "llll"; - }; + mtd-mac-address = <&rom 0xf100>; +}; &ehci { status = "okay"; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts index ec0ee087e8..6e06ed07e8 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts @@ -134,7 +134,7 @@ ðernet { mtd-mac-address = <&factory 0xe000>; - mediatek,portmap = "lllwl"; + mediatek,portmap = "llllw"; }; &state_default { From 7a387bf9a0d73f7c581e2c9aeae6476588100e2c Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Wed, 1 Jan 2020 21:34:10 +0900 Subject: [PATCH 367/480] ramips: mt76x8: fix bogus mediatek,portmap mt76x8 uses esw_rt3050 driver, which does not accept mediatek,portmap with string values. Convert the strings to integers to make it work. According to its switch setup, WRTnode 2P/2R have a WAN port at port 0, so the correct value should be 0x3e. tplink_8m.dtsi uses "llllw", but it does not match switch setups of any device using the DTSI. Remove it from the DTSI and add correct value to DTS for each device. These devices have a WAN port at port 0. Set the value to 0x3e. - tplink,archer-c20-v4 - tplink,archer-c50-v3 - tplink,tl-mr3420-v5 - tplink,tl-wr840n-v4 - tplink,tl-wr841n-v13 - tplink,tl-wr842n-v5 These devices have only one ethernet port. They don't need portmap setting. - tplink,tl-wa801nd-v5 - tplink,tl-wr802n-v4 - tplink,tl-wr902ac-v3 Signed-off-by: Sungbo Eo --- target/linux/ramips/dts/mt7628an_cudy_wr1000.dts | 5 ++++- target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts | 5 ++++- target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 5 ++++- target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 1 - target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 4 ++-- target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 4 ++++ target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts | 4 ++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts | 1 - target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts | 4 ++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts | 5 ++++- target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts | 4 ++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts | 5 ++++- target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts | 4 ++++ target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts | 5 ++++- target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts | 5 ++++- target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi | 5 ++++- target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts | 5 ++++- target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts | 5 ++++- 18 files changed, 62 insertions(+), 14 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index acaffecf8d..71aefcb525 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -136,5 +136,8 @@ ðernet { mtd-mac-address = <&factory 0x28>; - mediatek,portmap = "llllw"; +}; + +&esw { + mediatek,portmap = <0x2f>; }; diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts index 715f4d1ff7..22a8b566e2 100644 --- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts +++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts @@ -82,7 +82,10 @@ ðernet { pinctrl-names = "default"; mtd-mac-address = <&factory 0xd>; - mediatek,portmap = "llllw"; +}; + +&esw { + mediatek,portmap = <0x2f>; }; &wmac { diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi index 8807f7f274..2229060347 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi @@ -84,5 +84,8 @@ ðernet { mtd-mac-address = <&rom 0xf100>; - mediatek,portmap = "wllll"; +}; + +&esw { + mediatek,portmap = <0x3e>; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi index ba3350ed02..5269fd668b 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi @@ -66,5 +66,4 @@ ðernet { mtd-mac-address = <&factory 0xf100>; - mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index 8e3df9c676..3f02b7af3c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -78,8 +78,8 @@ mtd-mac-address-increment = <(-2)>; }; -ðernet { - mediatek,portmap = "wllll"; +&esw { + mediatek,portmap = <0x3e>; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index e0b025d20d..92f581d1ef 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -80,6 +80,10 @@ }; }; +&esw { + mediatek,portmap = <0x3e>; +}; + &pcie { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index 279f9ec69a..76cf0ca249 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -88,3 +88,7 @@ ralink,function = "gpio"; }; }; + +&esw { + mediatek,portmap = <0x3e>; +}; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index fcb483594a..3c615e6061 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -46,5 +46,4 @@ ðernet { mtd-mac-address = <&factory 0xf100>; - mediatek,portmap = "l"; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index 1fc2316d70..3f901d3a7c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -62,3 +62,7 @@ ralink,function = "gpio"; }; }; + +&esw { + mediatek,portmap = <0x3e>; +}; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts index c0ae199d22..3de58a71f6 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts @@ -95,7 +95,10 @@ ðernet { mtd-mac-address = <&factory 0xf100>; - mediatek,portmap = "wllll"; +}; + +&esw { + mediatek,portmap = <0x3e>; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index eedce357c7..89e2923c9c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -88,3 +88,7 @@ ralink,function = "gpio"; }; }; + +&esw { + mediatek,portmap = <0x3e>; +}; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index 6268bd13cc..1654e1819f 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -109,7 +109,10 @@ ðernet { mtd-mac-address = <&factory 0xf100>; - mediatek,portmap = "wllll"; +}; + +&esw { + mediatek,portmap = <0x3e>; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index 10bfe2d655..a0adb160d3 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -88,3 +88,7 @@ ralink,function = "gpio"; }; }; + +&esw { + mediatek,portmap = <0x3e>; +}; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index 2c0815fba4..a38907400c 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -123,5 +123,8 @@ ðernet { mtd-mac-address = <&factory 0x2e>; - mediatek,portmap = "llllw"; +}; + +&esw { + mediatek,portmap = <0x2f>; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index 13f045f13f..330ae58074 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -118,5 +118,8 @@ ðernet { mtd-mac-address = <&factory 0x28>; - mediatek,portmap = "llllw"; +}; + +&esw { + mediatek,portmap = <0x2f>; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi index 206da8b168..89b37f6b37 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi @@ -71,7 +71,10 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "llllw"; +}; + +&esw { + mediatek,portmap = <0x3e>; }; &sdhci { diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index b558a0057f..fb620eae3e 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -107,5 +107,8 @@ ðernet { mtd-mac-address = <&factory 0x2e>; - mediatek,portmap = "llllw"; +}; + +&esw { + mediatek,portmap = <0x2f>; }; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index 5b44808fc6..0fd8c56d03 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -179,7 +179,10 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; +}; + +&esw { + mediatek,portmap = <0x3e>; }; &wmac { From f87281b2956110f10af9eb23fc6d327dfde7ab42 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Wed, 1 Jan 2020 21:34:33 +0900 Subject: [PATCH 368/480] ramips: rt305x: remove unnecessary mediatek,portmap "#mediatek,portmap" is not a valid property name. If mediatek,portmap equals 0x0, then the esw driver ditches it and uses the default value, 0x3f. Signed-off-by: Sungbo Eo --- target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts | 1 - target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts | 1 - 2 files changed, 2 deletions(-) diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts index c2bb9bb20f..cbb8b7b947 100644 --- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts +++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts @@ -115,7 +115,6 @@ &esw { status = "okay"; - #mediatek,portmap = <0x3e>; mediatek,portmap = <0x2f>; }; diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts index 2be3c0b527..56e3f0854d 100644 --- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts +++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts @@ -94,7 +94,6 @@ }; &esw { - mediatek,portmap = <0>; mediatek,portdisable = <0x2f>; }; From 343f27f8b0f8710a34ff09b0e9fbf5fe0984051f Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 18 Jan 2020 10:30:27 +0200 Subject: [PATCH 369/480] tools/cmake: update to 3.16.2 Update cmake to 3.16.2 and refresh patches. Release notes: https://cmake.org/cmake/help/v3.16/release/3.16.html Signed-off-by: Hannu Nyman --- tools/cmake/Makefile | 6 +++--- tools/cmake/patches/100-disable_qt_tests.patch | 8 ++++---- tools/cmake/patches/120-curl-fix-libressl-linking.patch | 2 +- .../cmake/patches/130-bootstrap_parallel_make_flag.patch | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index 33d6d4944f..c8a36b0dba 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.15.1 +PKG_VERSION:=3.16.2 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ - https://cmake.org/files/v3.15/ -PKG_HASH:=18dec548d8f8b04d53c60f9cedcebaa6762f8425339d1e2c889c383d3ccdd7f7 + https://cmake.org/files/v3.16/ +PKG_HASH:=8c09786ec60ca2be354c29829072c38113de9184f29928eb9da8446a5f2ce6a9 HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch index 7f83e279f7..9c0957a390 100644 --- a/tools/cmake/patches/100-disable_qt_tests.patch +++ b/tools/cmake/patches/100-disable_qt_tests.patch @@ -1,8 +1,8 @@ --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt -@@ -325,15 +325,6 @@ add_RunCMake_test(no_install_prefix) - add_RunCMake_test(configure_file) - add_RunCMake_test(CTestTimeoutAfterMatch) +@@ -375,15 +375,6 @@ else() + message(WARNING "Could not find or build ctresalloc") + endif() -find_package(Qt4 QUIET) -find_package(Qt5Core QUIET) @@ -18,7 +18,7 @@ add_RunCMake_test(FindPkgConfig) --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -483,13 +483,6 @@ if(BUILD_TESTING) +@@ -489,13 +489,6 @@ if(BUILD_TESTING) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch b/tools/cmake/patches/120-curl-fix-libressl-linking.patch index e7d9c5ddda..66e3f81c6f 100644 --- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch +++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch @@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich --- --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -453,6 +453,14 @@ if(CMAKE_USE_OPENSSL) +@@ -459,6 +459,14 @@ if(CMAKE_USE_OPENSSL) set(USE_OPENSSL ON) set(HAVE_LIBCRYPTO ON) set(HAVE_LIBSSL ON) diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index 124cf6d9d4..9fcbf63f98 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -1,6 +1,6 @@ --- a/bootstrap +++ b/bootstrap -@@ -1168,7 +1168,10 @@ int main(){ printf("1%c", (char)0x0a); r +@@ -1248,7 +1248,10 @@ int main(){ printf("1%c", (char)0x0a); r ' > "test.c" cmake_original_make_flags="${cmake_make_flags}" if [ "x${cmake_parallel_make}" != "x" ]; then From ca63d175311882b87d02cc0d00bef503b72fe014 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:17:28 +0100 Subject: [PATCH 370/480] octeon: remove redundant network setup No need to have specific setup when default case does the same. Signed-off-by: Adrian Schmutzler --- target/linux/octeon/base-files/etc/board.d/01_network | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/linux/octeon/base-files/etc/board.d/01_network b/target/linux/octeon/base-files/etc/board.d/01_network index 79e508955e..f5c8175c54 100755 --- a/target/linux/octeon/base-files/etc/board.d/01_network +++ b/target/linux/octeon/base-files/etc/board.d/01_network @@ -8,10 +8,6 @@ board_config_update case "$(board_name)" in -erlite) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ;; - *) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; From 95731763002fff9c82b734f09bc34eb797af5bf2 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 18:58:10 +0100 Subject: [PATCH 371/480] ath79: use rssihigh LED instead of WAN LED for status indication Using the LED of network interfaces for status (boot/failsafe/...) indication is somewhat misleading, as the blinking might be mistaken for network activity. This uses rssi LEDs instead, which do not blink normally and thus are less ambiguous. The rssihigh LED has also been used consistently for the TP-Link CPE devices. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts | 10 +++++----- target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts index 66ac718264..b4a5bb4709 100644 --- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts +++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts @@ -12,9 +12,9 @@ aliases { serial0 = &uart; - led-boot = &led_wan; - led-failsafe = &led_wan; - led-upgrade = &led_wan; + led-boot = &led_rssihigh; + led-failsafe = &led_rssihigh; + led-upgrade = &led_rssihigh; label-mac-device = ð0; }; @@ -24,7 +24,7 @@ pinctrl-names = "default"; pinctrl-0 = <&led_rssimediumhigh_pin>; - led_wan: wan { + wan { label = "cf-e120a-v3:green:wan"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; @@ -55,7 +55,7 @@ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - rssihigh { + led_rssihigh: rssihigh { label = "cf-e120a-v3:green:rssihigh"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts index 0d01342685..45e3727daa 100644 --- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts +++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts @@ -12,9 +12,9 @@ aliases { serial0 = &uart; - led-boot = &led_wan; - led-failsafe = &led_wan; - led-upgrade = &led_wan; + led-boot = &led_rssihigh; + led-failsafe = &led_rssihigh; + led-upgrade = &led_rssihigh; }; leds { @@ -23,7 +23,7 @@ pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>; - led_wan: wan { + wan { label = "cf-e110n-v2:green:wan"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; @@ -48,7 +48,7 @@ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - rssihigh { + led_rssihigh: rssihigh { label = "cf-e110n-v2:green:rssihigh"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; From 8d78354d245886d5367990d29750fadee0573754 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 19:02:44 +0100 Subject: [PATCH 372/480] ath79: add led_ prefix for Phicomm K2T LED label Using the led_ prefix for the node label is now common in ath79, so also apply it here. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts index cb5c01b01c..a6aa3a8ad3 100644 --- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts +++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts @@ -11,10 +11,10 @@ compatible = "phicomm,k2t", "qca,qca9563"; aliases { - led-boot = &status_red; - led-failsafe = &status_red; - led-running = &status_red; - led-upgrade = &status_red; + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_red; + led-upgrade = &led_status_red; }; chosen { @@ -29,7 +29,7 @@ gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; - status_red: status_red { + led_status_red: status_red { label = "phicomm:red:status"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; From c26b687e31b788433091a98b65ddc984e2d227c8 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 18 Jan 2020 23:32:01 +0900 Subject: [PATCH 373/480] kernel: remove further obsolete kernel version switches Most of the kernel version switches below 4.14 were removed in commit 97940f876616 ("kernel: remove obsolete kernel version switches"), but some of them still remained. Remove them now. Signed-off-by: Sungbo Eo --- include/image.mk | 19 +++++++------------ include/target.mk | 4 ---- package/kernel/linux/modules/other.mk | 5 +---- target/linux/bcm53xx/modules.mk | 8 ++------ 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/include/image.mk b/include/image.mk index 26da4d6819..46d592e8dc 100644 --- a/include/image.mk +++ b/include/image.mk @@ -157,18 +157,13 @@ endif # Disable noisy checks by default as in upstream -ifeq ($(strip $(call kernel_patchver_ge,4.7.0)),1) - DTC_FLAGS += -Wno-unit_address_vs_reg -endif -ifeq ($(strip $(call kernel_patchver_ge,4.12.0)),1) - DTC_FLAGS += \ - -Wno-unit_address_vs_reg \ - -Wno-simple_bus_reg \ - -Wno-unit_address_format \ - -Wno-pci_bridge \ - -Wno-pci_device_bus_num \ - -Wno-pci_device_reg -endif +DTC_FLAGS += \ + -Wno-unit_address_vs_reg \ + -Wno-simple_bus_reg \ + -Wno-unit_address_format \ + -Wno-pci_bridge \ + -Wno-pci_device_bus_num \ + -Wno-pci_device_reg ifeq ($(strip $(call kernel_patchver_ge,4.17.0)),1) DTC_FLAGS += \ -Wno-avoid_unnecessary_addr_size \ diff --git a/include/target.mk b/include/target.mk index a813ba2d2d..9bd4c14936 100644 --- a/include/target.mk +++ b/include/target.mk @@ -51,10 +51,6 @@ else endif endif -ifneq ($(filter 4.9,$(KERNEL_PATCHVER)),) - DEFAULT_PACKAGES.router:=$(filter-out kmod-ipt-offload,$(DEFAULT_PACKAGES.router)) -endif - # Add device specific packages (here below to allow device type set from subtarget) DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 3ba9bdb82c..b65d0155db 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -53,11 +53,8 @@ define KernelPackage/bluetooth $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ - $(LINUX_DIR)/drivers/bluetooth/btusb.ko -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.1.0)),1) - FILES+= \ + $(LINUX_DIR)/drivers/bluetooth/btusb.ko \ $(LINUX_DIR)/drivers/bluetooth/btintel.ko -endif AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) endef diff --git a/target/linux/bcm53xx/modules.mk b/target/linux/bcm53xx/modules.mk index 2a3149b37b..b3bb42578c 100644 --- a/target/linux/bcm53xx/modules.mk +++ b/target/linux/bcm53xx/modules.mk @@ -9,9 +9,7 @@ define KernelPackage/phy-bcm-ns-usb2 KCONFIG:=CONFIG_PHY_BCM_NS_USB2 DEPENDS:=@TARGET_bcm53xx SUBMENU:=$(USB_MENU) - FILES:=\ - $(LINUX_DIR)/drivers/phy/phy-bcm-ns-usb2.ko@lt4.13 \ - $(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb2.ko@gt4.13 + FILES:=$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb2.ko AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb2,1) endef @@ -27,9 +25,7 @@ define KernelPackage/phy-bcm-ns-usb3 KCONFIG:=CONFIG_PHY_BCM_NS_USB3 DEPENDS:=@TARGET_bcm53xx SUBMENU:=$(USB_MENU) - FILES:=\ - $(LINUX_DIR)/drivers/phy/phy-bcm-ns-usb3.ko@lt4.13 \ - $(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb3.ko@ge4.13 + FILES:=$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb3.ko AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb3,1) endef From 93a4c8afbff550886c0d8413d219d64dc63d72bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=B6rster?= Date: Mon, 23 Dec 2019 22:48:06 +0100 Subject: [PATCH 374/480] ramips: add support for TP-Link RE305 v1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specification: SoC: MediaTek MT7628AN RAM: 64MiB Flash: 8MiB Wifi: - 2.4GHz: MT7628AN - 5GHz: MT7612EN LAN: 1x 10/100 Mbps Flash instructions: Flash factory image through stock firmware WEB UI. Back to stock is possible by using TFTP and stripping down the Firmware provided by TP-Link to a initramfs. The flash space between 0x650000 and 0x7f0000 is blank in the stock firmware so I left it out as well. Signed-off-by: Steffen Förster --- .../ramips/dts/mt7628an_tplink_re305-v1.dts | 150 ++++++++++++++++++ target/linux/ramips/image/mt76x8.mk | 24 +++ .../mt76x8/base-files/etc/board.d/02_network | 1 + tools/firmware-utils/src/tplink-safeloader.c | 36 +++++ 4 files changed, 211 insertions(+) create mode 100644 target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts new file mode 100644 index 0000000000..d1adb1b38a --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7628an.dtsi" + +#include +#include + +/ { + compatible = "tplink,re305-v1", "mediatek,mt7628an-soc"; + model = "TP-Link RE305 v1"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = ðernet; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "re305-v1:blue:power"; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; + }; + + wlan2g { + label = "re305-v1:blue:wlan2g"; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wlan5g { + label = "re305-v1:blue:wlan5g"; + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + rssi1 { + label = "re305-v1:red:rssi"; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + }; + + rssi2 { + label = "re305-v1:blue:rssi"; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + label = "firmware"; + reg = <0x20000 0x5e0000>; + }; + + config: partition@600000 { + label = "config"; + reg = <0x600000 0x50000>; + read-only; + }; + + /* + The flash space between 0x650000 and 0x7f0000 is blank in the + stock firmware so it is left out as well. + */ + + radio: partition@7f0000 { + label = "radio"; + reg = <0x7f0000 0x10000>; + read-only; + }; + }; + }; +}; + +&state_default { + gpio { + ralink,group = "refclk", "wdt", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an"; + ralink,function = "gpio"; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + mt76@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&radio 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + mtd-mac-address = <&config 0x10008>; + mtd-mac-address-increment = <2>; + }; +}; + +&wmac { + status = "okay"; + + mediatek,mtd-eeprom = <&radio 0x0>; + mtd-mac-address = <&config 0x10008>; + mtd-mac-address-increment = <1>; +}; + +ðernet { + mtd-mac-address = <&config 0x10008>; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index f3a948bf11..fe08c77c13 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -267,6 +267,20 @@ endef DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD DEVICE_VARS += TPLINK_HVERSION +define Device/tplink-safeloader + SOC := mt7628an + DEVICE_VENDOR := TP-Link + TPLINK_BOARD_ID := + TPLINK_HWID := 0x0 + TPLINK_HWREV := 0 + TPLINK_HEADER_VERSION := 1 + KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O + IMAGES += factory.bin + IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-rootfs | tplink-safeloader factory +endef + define Device/tplink_archer-c20-v4 $(Device/tplink) IMAGE_SIZE := 7808k @@ -328,6 +342,16 @@ define Device/tplink_archer-c50-v4 endef TARGET_DEVICES += tplink_archer-c50-v4 +define Device/tplink_re305-v1 + $(Device/tplink-safeloader) + IMAGE_SIZE := 6016k + DEVICE_MODEL := RE305 + DEVICE_VARIANT := v1 + DEVICE_PACKAGES := kmod-mt76x2 + TPLINK_BOARD_ID := RE305-V1 +endef +TARGET_DEVICES += tplink_re305-v1 + define Device/tplink_tl-mr3020-v3 $(Device/tplink) IMAGE_SIZE := 7808k diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 646e29235c..b036eb76e6 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -12,6 +12,7 @@ ramips_setup_interfaces() alfa-network,awusfree1|\ d-team,pbr-d1|\ tama,w06|\ + tplink,re305-v1|\ tplink,tl-mr3020-v3|\ tplink,tl-wr802n-v4) ucidef_set_interface_lan "eth0" diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 29ffae80ff..3b17eba0b1 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -1437,6 +1437,42 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "file-system", }, + /** Firmware layout for the RE305 v1 */ + { + .id = "RE305-V1", + .vendor = "", + .support_list = + "SupportList:\n" + "{product_name:RE305,product_ver:1.0.0,special_id:45550000}\n" + "{product_name:RE305,product_ver:1.0.0,special_id:55530000}\n" + "{product_name:RE305,product_ver:1.0.0,special_id:4a500000}\n" + "{product_name:RE305,product_ver:1.0.0,special_id:42520000}\n" + "{product_name:RE305,product_ver:1.0.0,special_id:4b520000}\n" + "{product_name:RE305,product_ver:1.0.0,special_id:41550000}\n" + "{product_name:RE305,product_ver:1.0.0,special_id:43410000}\n", + .support_trail = '\x00', + .soft_ver = NULL, + + .partitions = { + {"fs-uboot", 0x00000, 0x20000}, + {"firmware", 0x20000, 0x5e0000}, + {"partition-table", 0x600000, 0x02000}, + {"default-mac", 0x610000, 0x00020}, + {"pin", 0x610100, 0x00020}, + {"product-info", 0x611100, 0x01000}, + {"soft-version", 0x620000, 0x01000}, + {"support-list", 0x621000, 0x01000}, + {"profile", 0x622000, 0x08000}, + {"user-config", 0x630000, 0x10000}, + {"default-config", 0x640000, 0x10000}, + {"radio", 0x7f0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system" + }, + /** Firmware layout for the RE350 v1 */ { .id = "RE350-V1", From cf2f1fc6871da0320afeefaa799af87fc7c0d1db Mon Sep 17 00:00:00 2001 From: Walter Sonius Date: Fri, 27 Dec 2019 12:25:39 +0100 Subject: [PATCH 375/480] brcm47xx: fix switch port order for Netgear WNR3500 V2 The Netgear WNR3500 V2 switch0 already works for WAN/LAN however the port order for the LAN ports is inverted. Correct physical port order watched from the back of the device is: Internet / 4 / 3 / 2 / 1 this resembles the Linksys E3000 V1. Verfied with imagebuilder edit FILES=/etc/board.d/01_network Signed-off-by: Walter Sonius --- target/linux/brcm47xx/base-files/etc/board.d/01_network | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_network b/target/linux/brcm47xx/base-files/etc/board.d/01_network index a14986356a..99755700ff 100755 --- a/target/linux/brcm47xx/base-files/etc/board.d/01_network +++ b/target/linux/brcm47xx/base-files/etc/board.d/01_network @@ -171,6 +171,7 @@ configure_by_model() { "Asus RT-N16"* | \ "Linksys E3000 V1" | \ + "Netgear WNR3500 V2" | \ "Netgear WNR3500L") ucidef_add_switch "switch0" \ "0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8@eth0" From fbf297be38a93b9ca1119e5aaffecd2299087aa5 Mon Sep 17 00:00:00 2001 From: Stephan Knauss Date: Sat, 18 Jan 2020 19:37:08 +0100 Subject: [PATCH 376/480] kirkwood: fix HDD LED labels for Zyxel NSA325 in 01_leds Change the LED labels for hdd1/hdd2 in 01_leds to match their counterpart in DTS. Signed-off-by: Stephan Knauss [improve commit title and message] Signed-off-by: Adrian Schmutzler --- target/linux/kirkwood/base-files/etc/board.d/01_leds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/kirkwood/base-files/etc/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds index 5cfc4cf309..504be16480 100755 --- a/target/linux/kirkwood/base-files/etc/board.d/01_leds +++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds @@ -46,8 +46,8 @@ case "$board" in "zyxel,nsa325") ucidef_set_led_default "health" "health" "nsa325:green:sys" "1" ucidef_set_led_usbhost "usb" "USB" "nsa325:green:usb" - ucidef_set_led_ataport "hdd1" "HDD1" "nsa325:green:sata1" "1" - ucidef_set_led_ataport "hdd2" "HDD2" "nsa325:green:sata2" "2" + ucidef_set_led_ataport "hdd1" "HDD1" "nsa325:green:hdd1" "1" + ucidef_set_led_ataport "hdd2" "HDD2" "nsa325:green:hdd2" "2" ;; esac From 7a8bfbf0ffaea14e15ae2016a54adf48337c6251 Mon Sep 17 00:00:00 2001 From: Anderson Vulczak Date: Wed, 27 Nov 2019 21:31:52 -0200 Subject: [PATCH 377/480] tools: tplink-safeloader: update soft_ver for TP-Link Archer C6 v2 (EU) This patch updates "soft_ver" for TP-Link Archer C6 v2 (EU). It makes possible to upload OpenWrt on lastest vendor's firmware as the web-based updater checks for major.minor version during upload. Due to that on next major/minor version update TP-Link will stop us from using the web-based firmware update tool, so it will require a new patch on soft_ver to match major and minor version. Up to today's latest stock firmware the patch (major.minor.patch) version does not matters, that allows downgrade from 1.1.4 to 1.1.1 but do not allow downgrade from 1.1.X to 1.0.X. Signed-off-by: Anderson Vulczak --- tools/firmware-utils/src/tplink-safeloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 3b17eba0b1..8749597617 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -891,7 +891,7 @@ static struct device_info boards[] = { "{product_name:Archer C6,product_ver:2.0.0,special_id:52550000}\r\n" "{product_name:Archer C6,product_ver:2.0.0,special_id:4A500000}\r\n", .support_trail = '\x00', - .soft_ver = "soft_ver:1.0.0\n", + .soft_ver = "soft_ver:1.1.1\n", .partitions = { {"fs-uboot", 0x00000, 0x20000}, From 9e799f3eee9878bc8240f1de06d4eabdea7a2093 Mon Sep 17 00:00:00 2001 From: Maximilian Pachl Date: Wed, 13 Nov 2019 12:57:28 +0100 Subject: [PATCH 378/480] ramips: apply LED_POLARITY rt3050-esw on MT7628AN/MT7688 The device tree property "mediatek,led_polarity" is ignored for MT7628AN and MT7688. According to the datasheet both SoCs have the matching register. Therefore the property should be applied on these two devices as well. Signed-off-by: Maximilian Pachl Reviewed-by: Sungbo Eo Tested-by: Sungbo Eo --- .../files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c index 816c588dd7..292f11a170 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c +++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c @@ -617,6 +617,10 @@ static void esw_hw_init(struct rt305x_esw *esw) /* reset EPHY */ fe_reset(RT5350_RESET_EPHY); + /* set the led polarity */ + esw_w32(esw, esw->reg_led_polarity & 0x1F, + RT5350_EWS_REG_LED_POLARITY); + rt305x_mii_write(esw, 0, 31, 0x2000); /* change G2 page */ rt305x_mii_write(esw, 0, 26, 0x0020); From 098cbc68ee23db589ed6f0d081fe26cc385462f2 Mon Sep 17 00:00:00 2001 From: Walter Sonius Date: Fri, 27 Dec 2019 12:41:35 +0100 Subject: [PATCH 379/480] brcm47xx: fix switch port order for Netgear WN2500RP V1 The Netgear WN2500RP V1 switch0 already works for LAN however the port order for the LAN ports is inverted. Correct physical port order watched from the back of the device is: 4 / 3 / 2 / 1 WAN port is absent on this device and therefore removed from switch config. Signed-off-by: Walter Sonius [move block to maintain alphabetic sorting] Signed-off-by: Adrian Schmutzler --- target/linux/brcm47xx/base-files/etc/board.d/01_network | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_network b/target/linux/brcm47xx/base-files/etc/board.d/01_network index 99755700ff..e6311d8139 100755 --- a/target/linux/brcm47xx/base-files/etc/board.d/01_network +++ b/target/linux/brcm47xx/base-files/etc/board.d/01_network @@ -177,6 +177,11 @@ configure_by_model() { "0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8@eth0" ;; + "Netgear WN2500RP V1") + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" + ;; + *) configure_by_boardtype "$boardtype" "$boardnum" ;; From b5480de4d1527216cdc3719670a203fb05e72e88 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 14 Jan 2020 14:39:40 +0100 Subject: [PATCH 380/480] kernel: bump 4.14 to 4.14.164 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 +- ...mtd-cfi_cmdset_0002-force-word-write.patch | 6 +-- .../910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 2 +- ...tree-gpio-hogs-on-dual-role-gpio-pin.patch | 4 +- ...ption-fix-dwm-158-3g-modem-interface.patch | 2 +- ...les-remove-multihook-chains-and-fami.patch | 10 ++-- ...bles-add-flow-table-netlink-frontend.patch | 24 +++++----- ...les-remove-nhooks-field-from-struct-.patch | 2 +- ...les-fix-a-typo-in-nf_tables_getflowt.patch | 2 +- ...les-no-need-for-struct-nft_af_info-t.patch | 4 +- ...les-fix-potential-NULL-ptr-deref-in-.patch | 2 +- ...les-add-single-table-list-for-all-fa.patch | 40 ++++++++-------- ...tfilter-exit_net-cleanup-check-added.patch | 4 +- ...nf_tables-get-rid-of-pernet-families.patch | 10 ++-- ...les-get-rid-of-struct-nft_af_info-ab.patch | 48 +++++++++---------- ...ow_offload-wait-for-garbage-collecto.patch | 2 +- ...tfilter-nf_tables-fix-flowtable-free.patch | 2 +- ...les-allocate-handle-and-delete-objec.patch | 22 ++++----- ...w_table-move-init-code-to-nf_flow_ta.patch | 4 +- ...w_table-fix-priv-pointer-for-netdev-.patch | 2 +- ...w_table-track-flow-tables-in-nf_flow.patch | 2 +- ...w_table-add-hardware-offload-support.patch | 6 +-- ...-support-hardware-flow-table-offload.patch | 4 +- .../301-arch-support-layerscape.patch | 2 +- ...-sun8i-Handle-integrated-external-MD.patch | 10 ++-- ...stmmac-sun8i-Restore-the-compatibles.patch | 2 +- 27 files changed, 112 insertions(+), 112 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index eb99bd9e48..48ccef5363 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .162 +LINUX_VERSION-4.14 = .164 LINUX_VERSION-4.19 = .93 -LINUX_KERNEL_HASH-4.14.162 = f65170224cd4359ce8b2793b492bd8127abdd0b91350484e001bce13f0c98b4b +LINUX_KERNEL_HASH-4.14.164 = a2031061f3f1472b7fa929f7d0274dd985c8d03ca847acfec1c47847fb7deb4b LINUX_KERNEL_HASH-4.19.93 = 2af5d23f82a8bf69a6e4d8407579293b7beeebd3054dc464d48bdb5d2d7f5834 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch index 5a6eb77d0f..bb013c6cf5 100644 --- a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch @@ -35,7 +35,7 @@ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd) -@@ -1800,6 +1804,7 @@ static int cfi_amdstd_write_words(struct +@@ -1798,6 +1802,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1928,7 +1933,6 @@ static int __xipram do_write_buffer(stru +@@ -1926,7 +1931,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -2003,6 +2007,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -2001,6 +2005,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index a3d4ef2853..d1dd056f76 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -757,7 +757,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3874,14 +3874,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index a3a9dcad93..29455b8907 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -737,7 +737,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3874,14 +3874,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 31d2a17946..bbd39811c5 100644 --- a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -1950,7 +1950,8 @@ int gpiochip_add_pingroup_range(struct g +@@ -1958,7 +1958,8 @@ int gpiochip_add_pingroup_range(struct g list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); -@@ -2002,7 +2003,7 @@ int gpiochip_add_pin_range(struct gpio_c +@@ -2010,7 +2011,7 @@ int gpiochip_add_pin_range(struct gpio_c list_add_tail(&pin_range->node, &gdev->pin_ranges); diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch index 817b112f90..59e1cff965 100644 --- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch +++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1968,7 +1968,8 @@ static const struct usb_device_id option +@@ -1970,7 +1970,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, diff --git a/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch b/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch index a2388a1b9b..f43456a99e 100644 --- a/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch +++ b/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch @@ -264,7 +264,7 @@ Signed-off-by: Pablo Neira Ayuso } nft_chain_release_hook(&hook); } -@@ -5156,10 +5144,9 @@ static int nf_tables_commit(struct net * +@@ -5162,10 +5150,9 @@ static int nf_tables_commit(struct net * case NFT_MSG_DELCHAIN: list_del_rcu(&trans->ctx.chain->list); nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN); @@ -278,7 +278,7 @@ Signed-off-by: Pablo Neira Ayuso break; case NFT_MSG_NEWRULE: nft_clear(trans->ctx.net, nft_trans_rule(trans)); -@@ -5296,10 +5283,9 @@ static int nf_tables_abort(struct net *n +@@ -5302,10 +5289,9 @@ static int nf_tables_abort(struct net *n } else { trans->ctx.table->use--; list_del_rcu(&trans->ctx.chain->list); @@ -292,7 +292,7 @@ Signed-off-by: Pablo Neira Ayuso } break; case NFT_MSG_DELCHAIN: -@@ -5402,7 +5388,7 @@ int nft_chain_validate_hooks(const struc +@@ -5408,7 +5394,7 @@ int nft_chain_validate_hooks(const struc if (nft_is_base_chain(chain)) { basechain = nft_base_chain(chain); @@ -301,7 +301,7 @@ Signed-off-by: Pablo Neira Ayuso return 0; return -EOPNOTSUPP; -@@ -5884,8 +5870,7 @@ int __nft_release_basechain(struct nft_c +@@ -5890,8 +5876,7 @@ int __nft_release_basechain(struct nft_c BUG_ON(!nft_is_base_chain(ctx->chain)); @@ -311,7 +311,7 @@ Signed-off-by: Pablo Neira Ayuso list_for_each_entry_safe(rule, nr, &ctx->chain->rules, list) { list_del(&rule->list); ctx->chain->use--; -@@ -5914,8 +5899,7 @@ static void __nft_release_afinfo(struct +@@ -5920,8 +5905,7 @@ static void __nft_release_afinfo(struct list_for_each_entry_safe(table, nt, &afi->tables, list) { list_for_each_entry(chain, &table->chains, list) diff --git a/target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch b/target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch index 3b090a6f19..f0109e4823 100644 --- a/target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch +++ b/target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch @@ -292,7 +292,7 @@ Signed-off-by: Pablo Neira Ayuso list_for_each_entry_safe(obj, ne, &ctx->table->objects, list) { err = nft_delobj(ctx, obj); if (err < 0) -@@ -4856,6 +4900,605 @@ static void nf_tables_obj_notify(const s +@@ -4862,6 +4906,605 @@ static void nf_tables_obj_notify(const s ctx->afi->family, ctx->report, GFP_KERNEL); } @@ -898,7 +898,7 @@ Signed-off-by: Pablo Neira Ayuso static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net, u32 portid, u32 seq) { -@@ -4886,6 +5529,49 @@ nla_put_failure: +@@ -4892,6 +5535,49 @@ nla_put_failure: return -EMSGSIZE; } @@ -948,7 +948,7 @@ Signed-off-by: Pablo Neira Ayuso static void nf_tables_gen_notify(struct net *net, struct sk_buff *skb, int event) { -@@ -5038,6 +5724,21 @@ static const struct nfnl_callback nf_tab +@@ -5044,6 +5730,21 @@ static const struct nfnl_callback nf_tab .attr_count = NFTA_OBJ_MAX, .policy = nft_obj_policy, }, @@ -970,7 +970,7 @@ Signed-off-by: Pablo Neira Ayuso }; static void nft_chain_commit_update(struct nft_trans *trans) -@@ -5086,6 +5787,9 @@ static void nf_tables_commit_release(str +@@ -5092,6 +5793,9 @@ static void nf_tables_commit_release(str case NFT_MSG_DELOBJ: nft_obj_destroy(nft_trans_obj(trans)); break; @@ -980,7 +980,7 @@ Signed-off-by: Pablo Neira Ayuso } kfree(trans); } -@@ -5205,6 +5909,21 @@ static int nf_tables_commit(struct net * +@@ -5211,6 +5915,21 @@ static int nf_tables_commit(struct net * nf_tables_obj_notify(&trans->ctx, nft_trans_obj(trans), NFT_MSG_DELOBJ); break; @@ -1002,7 +1002,7 @@ Signed-off-by: Pablo Neira Ayuso } } -@@ -5242,6 +5961,9 @@ static void nf_tables_abort_release(stru +@@ -5248,6 +5967,9 @@ static void nf_tables_abort_release(stru case NFT_MSG_NEWOBJ: nft_obj_destroy(nft_trans_obj(trans)); break; @@ -1012,7 +1012,7 @@ Signed-off-by: Pablo Neira Ayuso } kfree(trans); } -@@ -5333,6 +6055,17 @@ static int nf_tables_abort(struct net *n +@@ -5339,6 +6061,17 @@ static int nf_tables_abort(struct net *n nft_clear(trans->ctx.net, nft_trans_obj(trans)); nft_trans_destroy(trans); break; @@ -1030,7 +1030,7 @@ Signed-off-by: Pablo Neira Ayuso } } -@@ -5883,6 +6616,7 @@ EXPORT_SYMBOL_GPL(__nft_release_basechai +@@ -5889,6 +6622,7 @@ EXPORT_SYMBOL_GPL(__nft_release_basechai /* Called by nft_unregister_afinfo() from __net_exit path, nfnl_lock is held. */ static void __nft_release_afinfo(struct net *net, struct nft_af_info *afi) { @@ -1038,7 +1038,7 @@ Signed-off-by: Pablo Neira Ayuso struct nft_table *table, *nt; struct nft_chain *chain, *nc; struct nft_object *obj, *ne; -@@ -5896,6 +6630,9 @@ static void __nft_release_afinfo(struct +@@ -5902,6 +6636,9 @@ static void __nft_release_afinfo(struct list_for_each_entry_safe(table, nt, &afi->tables, list) { list_for_each_entry(chain, &table->chains, list) nf_tables_unregister_hook(net, table, chain); @@ -1048,7 +1048,7 @@ Signed-off-by: Pablo Neira Ayuso /* No packets are walking on these chains anymore. */ ctx.table = table; list_for_each_entry(chain, &table->chains, list) { -@@ -5906,6 +6643,11 @@ static void __nft_release_afinfo(struct +@@ -5912,6 +6649,11 @@ static void __nft_release_afinfo(struct nf_tables_rule_release(&ctx, rule); } } @@ -1060,7 +1060,7 @@ Signed-off-by: Pablo Neira Ayuso list_for_each_entry_safe(set, ns, &table->sets, list) { list_del(&set->list); table->use--; -@@ -5949,6 +6691,8 @@ static int __init nf_tables_module_init( +@@ -5955,6 +6697,8 @@ static int __init nf_tables_module_init( if (err < 0) goto err3; @@ -1069,7 +1069,7 @@ Signed-off-by: Pablo Neira Ayuso pr_info("nf_tables: (c) 2007-2009 Patrick McHardy \n"); return register_pernet_subsys(&nf_tables_net_ops); err3: -@@ -5963,6 +6707,7 @@ static void __exit nf_tables_module_exit +@@ -5969,6 +6713,7 @@ static void __exit nf_tables_module_exit { unregister_pernet_subsys(&nf_tables_net_ops); nfnetlink_subsys_unregister(&nf_tables_subsys); diff --git a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch index ec14929992..188ee11b84 100644 --- a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch +++ b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch @@ -82,7 +82,7 @@ Signed-off-by: Pablo Neira Ayuso hook->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY])); type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT]; -@@ -5008,7 +5005,7 @@ static int nf_tables_flowtable_parse_hoo +@@ -5014,7 +5011,7 @@ static int nf_tables_flowtable_parse_hoo return -EINVAL; hooknum = ntohl(nla_get_be32(tb[NFTA_FLOWTABLE_HOOK_NUM])); diff --git a/target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch b/target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch index d4551f2946..1f0a5a2bb3 100644 --- a/target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch +++ b/target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch @@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5432,7 +5432,7 @@ static int nf_tables_getflowtable(struct +@@ -5438,7 +5438,7 @@ static int nf_tables_getflowtable(struct flowtable = nf_tables_flowtable_lookup(table, nla[NFTA_FLOWTABLE_NAME], genmask); diff --git a/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch b/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch index 925a4739ed..f7e7eeaa05 100644 --- a/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch +++ b/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch @@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso if (ret >= 0) { ctx->table->flags &= ~NFT_TABLE_F_DORMANT; nft_trans_table_enable(trans) = true; -@@ -5813,7 +5806,6 @@ static int nf_tables_commit(struct net * +@@ -5819,7 +5812,6 @@ static int nf_tables_commit(struct net * if (nft_trans_table_update(trans)) { if (!nft_trans_table_enable(trans)) { nf_tables_table_disable(net, @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso trans->ctx.table); trans->ctx.table->flags |= NFT_TABLE_F_DORMANT; } -@@ -5977,7 +5969,6 @@ static int nf_tables_abort(struct net *n +@@ -5983,7 +5975,6 @@ static int nf_tables_abort(struct net *n if (nft_trans_table_update(trans)) { if (nft_trans_table_enable(trans)) { nf_tables_table_disable(net, diff --git a/target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch b/target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch index 6d9880d098..f6e1ef0823 100644 --- a/target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch +++ b/target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch @@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5351,8 +5351,10 @@ static int nf_tables_dump_flowtable_done +@@ -5357,8 +5357,10 @@ static int nf_tables_dump_flowtable_done if (!filter) return 0; diff --git a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch index 9108a5e4dc..340d7167ea 100644 --- a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch +++ b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch @@ -859,7 +859,7 @@ Signed-off-by: Pablo Neira Ayuso nfmsg->version = NFNETLINK_V0; nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff); -@@ -3996,7 +3982,7 @@ static int nft_add_set_elem(struct nft_c +@@ -4002,7 +3988,7 @@ static int nft_add_set_elem(struct nft_c list_for_each_entry(binding, &set->bindings, list) { struct nft_ctx bind_ctx = { .net = ctx->net, @@ -868,7 +868,7 @@ Signed-off-by: Pablo Neira Ayuso .table = ctx->table, .chain = (struct nft_chain *)binding->chain, }; -@@ -4548,7 +4534,8 @@ static int nf_tables_newobj(struct net * +@@ -4554,7 +4540,8 @@ static int nf_tables_newobj(struct net * if (IS_ERR(afi)) return PTR_ERR(afi); @@ -878,7 +878,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -4566,7 +4553,7 @@ static int nf_tables_newobj(struct net * +@@ -4572,7 +4559,7 @@ static int nf_tables_newobj(struct net * return 0; } @@ -887,7 +887,7 @@ Signed-off-by: Pablo Neira Ayuso type = nft_obj_type_get(objtype); if (IS_ERR(type)) -@@ -4643,7 +4630,6 @@ struct nft_obj_filter { +@@ -4649,7 +4636,6 @@ struct nft_obj_filter { static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb) { const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh); @@ -895,7 +895,7 @@ Signed-off-by: Pablo Neira Ayuso const struct nft_table *table; unsigned int idx = 0, s_idx = cb->args[0]; struct nft_obj_filter *filter = cb->data; -@@ -4658,38 +4644,37 @@ static int nf_tables_dump_obj(struct sk_ +@@ -4664,38 +4650,37 @@ static int nf_tables_dump_obj(struct sk_ rcu_read_lock(); cb->seq = net->nft.base_seq; @@ -960,7 +960,7 @@ Signed-off-by: Pablo Neira Ayuso } } done: -@@ -4776,7 +4761,8 @@ static int nf_tables_getobj(struct net * +@@ -4782,7 +4767,8 @@ static int nf_tables_getobj(struct net * if (IS_ERR(afi)) return PTR_ERR(afi); @@ -970,7 +970,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -4836,7 +4822,8 @@ static int nf_tables_delobj(struct net * +@@ -4842,7 +4828,8 @@ static int nf_tables_delobj(struct net * if (IS_ERR(afi)) return PTR_ERR(afi); @@ -980,7 +980,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -4847,7 +4834,7 @@ static int nf_tables_delobj(struct net * +@@ -4853,7 +4840,7 @@ static int nf_tables_delobj(struct net * if (obj->use > 0) return -EBUSY; @@ -989,7 +989,7 @@ Signed-off-by: Pablo Neira Ayuso return nft_delobj(&ctx, obj); } -@@ -4885,7 +4872,7 @@ static void nf_tables_obj_notify(const s +@@ -4891,7 +4878,7 @@ static void nf_tables_obj_notify(const s struct nft_object *obj, int event) { nft_obj_notify(ctx->net, ctx->table, obj, ctx->portid, ctx->seq, event, @@ -998,7 +998,7 @@ Signed-off-by: Pablo Neira Ayuso } /* -@@ -5075,7 +5062,7 @@ void nft_flow_table_iterate(struct net * +@@ -5081,7 +5068,7 @@ void nft_flow_table_iterate(struct net * rcu_read_lock(); list_for_each_entry_rcu(afi, &net->nft.af_info, list) { @@ -1007,7 +1007,7 @@ Signed-off-by: Pablo Neira Ayuso list_for_each_entry_rcu(flowtable, &table->flowtables, list) { iter(&flowtable->data, data); } -@@ -5123,7 +5110,8 @@ static int nf_tables_newflowtable(struct +@@ -5129,7 +5116,8 @@ static int nf_tables_newflowtable(struct if (IS_ERR(afi)) return PTR_ERR(afi); @@ -1017,7 +1017,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -5140,7 +5128,7 @@ static int nf_tables_newflowtable(struct +@@ -5146,7 +5134,7 @@ static int nf_tables_newflowtable(struct return 0; } @@ -1026,7 +1026,7 @@ Signed-off-by: Pablo Neira Ayuso flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL); if (!flowtable) -@@ -5221,7 +5209,8 @@ static int nf_tables_delflowtable(struct +@@ -5227,7 +5215,8 @@ static int nf_tables_delflowtable(struct if (IS_ERR(afi)) return PTR_ERR(afi); @@ -1036,7 +1036,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -5232,7 +5221,7 @@ static int nf_tables_delflowtable(struct +@@ -5238,7 +5227,7 @@ static int nf_tables_delflowtable(struct if (flowtable->use > 0) return -EBUSY; @@ -1045,7 +1045,7 @@ Signed-off-by: Pablo Neira Ayuso return nft_delflowtable(&ctx, flowtable); } -@@ -5301,40 +5290,37 @@ static int nf_tables_dump_flowtable(stru +@@ -5307,40 +5296,37 @@ static int nf_tables_dump_flowtable(stru struct net *net = sock_net(skb->sk); int family = nfmsg->nfgen_family; struct nft_flowtable *flowtable; @@ -1107,7 +1107,7 @@ Signed-off-by: Pablo Neira Ayuso } } done: -@@ -5419,7 +5405,8 @@ static int nf_tables_getflowtable(struct +@@ -5425,7 +5411,8 @@ static int nf_tables_getflowtable(struct if (IS_ERR(afi)) return PTR_ERR(afi); @@ -1117,7 +1117,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -5462,7 +5449,7 @@ static void nf_tables_flowtable_notify(s +@@ -5468,7 +5455,7 @@ static void nf_tables_flowtable_notify(s err = nf_tables_fill_flowtable_info(skb, ctx->net, ctx->portid, ctx->seq, event, 0, @@ -1126,7 +1126,7 @@ Signed-off-by: Pablo Neira Ayuso if (err < 0) { kfree_skb(skb); goto err; -@@ -5540,17 +5527,14 @@ static int nf_tables_flowtable_event(str +@@ -5546,17 +5533,14 @@ static int nf_tables_flowtable_event(str struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct nft_flowtable *flowtable; struct nft_table *table; @@ -1147,7 +1147,7 @@ Signed-off-by: Pablo Neira Ayuso } } nfnl_unlock(NFNL_SUBSYS_NFTABLES); -@@ -6576,6 +6560,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump); +@@ -6582,6 +6566,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump); static int __net_init nf_tables_init_net(struct net *net) { INIT_LIST_HEAD(&net->nft.af_info); @@ -1155,7 +1155,7 @@ Signed-off-by: Pablo Neira Ayuso INIT_LIST_HEAD(&net->nft.commit_list); net->nft.base_seq = 1; return 0; -@@ -6612,10 +6597,10 @@ static void __nft_release_afinfo(struct +@@ -6618,10 +6603,10 @@ static void __nft_release_afinfo(struct struct nft_set *set, *ns; struct nft_ctx ctx = { .net = net, diff --git a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch index 8d0d62b1ec..b00675df20 100644 --- a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch +++ b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch @@ -21,7 +21,7 @@ Signed-off-by: Pablo Neira Ayuso static struct pernet_operations clusterip_net_ops = { --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -6566,6 +6566,12 @@ static int __net_init nf_tables_init_net +@@ -6572,6 +6572,12 @@ static int __net_init nf_tables_init_net return 0; } @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso int __nft_release_basechain(struct nft_ctx *ctx) { struct nft_rule *rule, *nr; -@@ -6643,6 +6649,7 @@ static void __nft_release_afinfo(struct +@@ -6649,6 +6655,7 @@ static void __nft_release_afinfo(struct static struct pernet_operations nf_tables_net_ops = { .init = nf_tables_init_net, diff --git a/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch b/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch index da9d4ffd03..a42581a4bb 100644 --- a/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch +++ b/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch @@ -364,7 +364,7 @@ Signed-off-by: Pablo Neira Ayuso if (afi->family == family) return afi; } -@@ -5057,15 +5055,12 @@ void nft_flow_table_iterate(struct net * +@@ -5063,15 +5061,12 @@ void nft_flow_table_iterate(struct net * void *data) { struct nft_flowtable *flowtable; @@ -383,7 +383,7 @@ Signed-off-by: Pablo Neira Ayuso } } rcu_read_unlock(); -@@ -6557,21 +6552,6 @@ int nft_data_dump(struct sk_buff *skb, i +@@ -6563,21 +6558,6 @@ int nft_data_dump(struct sk_buff *skb, i } EXPORT_SYMBOL_GPL(nft_data_dump); @@ -405,7 +405,7 @@ Signed-off-by: Pablo Neira Ayuso int __nft_release_basechain(struct nft_ctx *ctx) { struct nft_rule *rule, *nr; -@@ -6592,8 +6572,7 @@ int __nft_release_basechain(struct nft_c +@@ -6598,8 +6578,7 @@ int __nft_release_basechain(struct nft_c } EXPORT_SYMBOL_GPL(__nft_release_basechain); @@ -415,7 +415,7 @@ Signed-off-by: Pablo Neira Ayuso { struct nft_flowtable *flowtable, *nf; struct nft_table *table, *nt; -@@ -6603,10 +6582,11 @@ static void __nft_release_afinfo(struct +@@ -6609,10 +6588,11 @@ static void __nft_release_afinfo(struct struct nft_set *set, *ns; struct nft_ctx ctx = { .net = net, @@ -428,7 +428,7 @@ Signed-off-by: Pablo Neira Ayuso list_for_each_entry(chain, &table->chains, list) nf_tables_unregister_hook(net, table, chain); list_for_each_entry(flowtable, &table->flowtables, list) -@@ -6647,6 +6627,21 @@ static void __nft_release_afinfo(struct +@@ -6653,6 +6633,21 @@ static void __nft_release_afinfo(struct } } diff --git a/target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch b/target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch index ed159d5208..7816718466 100644 --- a/target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch +++ b/target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch @@ -817,7 +817,7 @@ Signed-off-by: Pablo Neira Ayuso nfmsg->version = NFNETLINK_V0; nfmsg->res_id = htons(net->nft.base_seq & 0xffff); -@@ -4516,7 +4383,6 @@ static int nf_tables_newobj(struct net * +@@ -4522,7 +4389,6 @@ static int nf_tables_newobj(struct net * const struct nft_object_type *type; u8 genmask = nft_genmask_next(net); int family = nfmsg->nfgen_family; @@ -825,7 +825,7 @@ Signed-off-by: Pablo Neira Ayuso struct nft_table *table; struct nft_object *obj; struct nft_ctx ctx; -@@ -4528,11 +4394,7 @@ static int nf_tables_newobj(struct net * +@@ -4534,11 +4400,7 @@ static int nf_tables_newobj(struct net * !nla[NFTA_OBJ_DATA]) return -EINVAL; @@ -838,7 +838,7 @@ Signed-off-by: Pablo Neira Ayuso genmask); if (IS_ERR(table)) return PTR_ERR(table); -@@ -4551,7 +4413,7 @@ static int nf_tables_newobj(struct net * +@@ -4557,7 +4419,7 @@ static int nf_tables_newobj(struct net * return 0; } @@ -847,7 +847,7 @@ Signed-off-by: Pablo Neira Ayuso type = nft_obj_type_get(objtype); if (IS_ERR(type)) -@@ -4643,7 +4505,7 @@ static int nf_tables_dump_obj(struct sk_ +@@ -4649,7 +4511,7 @@ static int nf_tables_dump_obj(struct sk_ cb->seq = net->nft.base_seq; list_for_each_entry_rcu(table, &net->nft.tables, list) { @@ -856,7 +856,7 @@ Signed-off-by: Pablo Neira Ayuso continue; list_for_each_entry_rcu(obj, &table->objects, list) { -@@ -4666,7 +4528,7 @@ static int nf_tables_dump_obj(struct sk_ +@@ -4672,7 +4534,7 @@ static int nf_tables_dump_obj(struct sk_ cb->nlh->nlmsg_seq, NFT_MSG_NEWOBJ, NLM_F_MULTI | NLM_F_APPEND, @@ -865,7 +865,7 @@ Signed-off-by: Pablo Neira Ayuso obj, reset) < 0) goto done; -@@ -4724,7 +4586,6 @@ static int nf_tables_getobj(struct net * +@@ -4730,7 +4592,6 @@ static int nf_tables_getobj(struct net * const struct nfgenmsg *nfmsg = nlmsg_data(nlh); u8 genmask = nft_genmask_cur(net); int family = nfmsg->nfgen_family; @@ -873,7 +873,7 @@ Signed-off-by: Pablo Neira Ayuso const struct nft_table *table; struct nft_object *obj; struct sk_buff *skb2; -@@ -4755,11 +4616,7 @@ static int nf_tables_getobj(struct net * +@@ -4761,11 +4622,7 @@ static int nf_tables_getobj(struct net * !nla[NFTA_OBJ_TYPE]) return -EINVAL; @@ -886,7 +886,7 @@ Signed-off-by: Pablo Neira Ayuso genmask); if (IS_ERR(table)) return PTR_ERR(table); -@@ -4806,7 +4663,6 @@ static int nf_tables_delobj(struct net * +@@ -4812,7 +4669,6 @@ static int nf_tables_delobj(struct net * const struct nfgenmsg *nfmsg = nlmsg_data(nlh); u8 genmask = nft_genmask_next(net); int family = nfmsg->nfgen_family; @@ -894,7 +894,7 @@ Signed-off-by: Pablo Neira Ayuso struct nft_table *table; struct nft_object *obj; struct nft_ctx ctx; -@@ -4816,11 +4672,7 @@ static int nf_tables_delobj(struct net * +@@ -4822,11 +4678,7 @@ static int nf_tables_delobj(struct net * !nla[NFTA_OBJ_NAME]) return -EINVAL; @@ -907,7 +907,7 @@ Signed-off-by: Pablo Neira Ayuso genmask); if (IS_ERR(table)) return PTR_ERR(table); -@@ -4832,7 +4684,7 @@ static int nf_tables_delobj(struct net * +@@ -4838,7 +4690,7 @@ static int nf_tables_delobj(struct net * if (obj->use > 0) return -EBUSY; @@ -916,7 +916,7 @@ Signed-off-by: Pablo Neira Ayuso return nft_delobj(&ctx, obj); } -@@ -5017,33 +4869,31 @@ err1: +@@ -5023,33 +4875,31 @@ err1: return err; } @@ -956,7 +956,7 @@ Signed-off-by: Pablo Neira Ayuso return ERR_PTR(-EAGAIN); } #endif -@@ -5091,7 +4941,6 @@ static int nf_tables_newflowtable(struct +@@ -5097,7 +4947,6 @@ static int nf_tables_newflowtable(struct u8 genmask = nft_genmask_next(net); int family = nfmsg->nfgen_family; struct nft_flowtable *flowtable; @@ -964,7 +964,7 @@ Signed-off-by: Pablo Neira Ayuso struct nft_table *table; struct nft_ctx ctx; int err, i, k; -@@ -5101,12 +4950,8 @@ static int nf_tables_newflowtable(struct +@@ -5107,12 +4956,8 @@ static int nf_tables_newflowtable(struct !nla[NFTA_FLOWTABLE_HOOK]) return -EINVAL; @@ -978,7 +978,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -5123,7 +4968,7 @@ static int nf_tables_newflowtable(struct +@@ -5129,7 +4974,7 @@ static int nf_tables_newflowtable(struct return 0; } @@ -987,7 +987,7 @@ Signed-off-by: Pablo Neira Ayuso flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL); if (!flowtable) -@@ -5136,7 +4981,7 @@ static int nf_tables_newflowtable(struct +@@ -5142,7 +4987,7 @@ static int nf_tables_newflowtable(struct goto err1; } @@ -996,7 +996,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(type)) { err = PTR_ERR(type); goto err2; -@@ -5196,16 +5041,11 @@ static int nf_tables_delflowtable(struct +@@ -5202,16 +5047,11 @@ static int nf_tables_delflowtable(struct u8 genmask = nft_genmask_next(net); int family = nfmsg->nfgen_family; struct nft_flowtable *flowtable; @@ -1014,7 +1014,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -5216,7 +5056,7 @@ static int nf_tables_delflowtable(struct +@@ -5222,7 +5062,7 @@ static int nf_tables_delflowtable(struct if (flowtable->use > 0) return -EBUSY; @@ -1023,7 +1023,7 @@ Signed-off-by: Pablo Neira Ayuso return nft_delflowtable(&ctx, flowtable); } -@@ -5291,7 +5131,7 @@ static int nf_tables_dump_flowtable(stru +@@ -5297,7 +5137,7 @@ static int nf_tables_dump_flowtable(stru cb->seq = net->nft.base_seq; list_for_each_entry_rcu(table, &net->nft.tables, list) { @@ -1032,7 +1032,7 @@ Signed-off-by: Pablo Neira Ayuso continue; list_for_each_entry_rcu(flowtable, &table->flowtables, list) { -@@ -5310,7 +5150,7 @@ static int nf_tables_dump_flowtable(stru +@@ -5316,7 +5156,7 @@ static int nf_tables_dump_flowtable(stru cb->nlh->nlmsg_seq, NFT_MSG_NEWFLOWTABLE, NLM_F_MULTI | NLM_F_APPEND, @@ -1041,7 +1041,7 @@ Signed-off-by: Pablo Neira Ayuso goto done; nl_dump_check_consistent(cb, nlmsg_hdr(skb)); -@@ -5370,7 +5210,6 @@ static int nf_tables_getflowtable(struct +@@ -5376,7 +5216,6 @@ static int nf_tables_getflowtable(struct u8 genmask = nft_genmask_cur(net); int family = nfmsg->nfgen_family; struct nft_flowtable *flowtable; @@ -1049,7 +1049,7 @@ Signed-off-by: Pablo Neira Ayuso const struct nft_table *table; struct sk_buff *skb2; int err; -@@ -5396,12 +5235,8 @@ static int nf_tables_getflowtable(struct +@@ -5402,12 +5241,8 @@ static int nf_tables_getflowtable(struct if (!nla[NFTA_FLOWTABLE_NAME]) return -EINVAL; @@ -1063,7 +1063,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(table)) return PTR_ERR(table); -@@ -6572,7 +6407,7 @@ int __nft_release_basechain(struct nft_c +@@ -6578,7 +6413,7 @@ int __nft_release_basechain(struct nft_c } EXPORT_SYMBOL_GPL(__nft_release_basechain); @@ -1072,7 +1072,7 @@ Signed-off-by: Pablo Neira Ayuso { struct nft_flowtable *flowtable, *nf; struct nft_table *table, *nt; -@@ -6585,7 +6420,7 @@ static void __nft_release_afinfo(struct +@@ -6591,7 +6426,7 @@ static void __nft_release_afinfo(struct }; list_for_each_entry_safe(table, nt, &net->nft.tables, list) { @@ -1081,7 +1081,7 @@ Signed-off-by: Pablo Neira Ayuso list_for_each_entry(chain, &table->chains, list) nf_tables_unregister_hook(net, table, chain); -@@ -6637,7 +6472,7 @@ static int __net_init nf_tables_init_net +@@ -6643,7 +6478,7 @@ static int __net_init nf_tables_init_net static void __net_exit nf_tables_exit_net(struct net *net) { diff --git a/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch b/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch index 7a67f07318..5ae917ff51 100644 --- a/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch +++ b/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch @@ -17,7 +17,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -4907,13 +4907,13 @@ void nft_flow_table_iterate(struct net * +@@ -4913,13 +4913,13 @@ void nft_flow_table_iterate(struct net * struct nft_flowtable *flowtable; const struct nft_table *table; diff --git a/target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch b/target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch index 6335641224..b8c85fc2a7 100644 --- a/target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch +++ b/target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch @@ -118,7 +118,7 @@ Signed-off-by: Pablo Neira Ayuso }; --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5292,17 +5292,12 @@ err: +@@ -5298,17 +5298,12 @@ err: nfnetlink_set_err(ctx->net, ctx->portid, NFNLGRP_NFTABLES, -ENOBUFS); } diff --git a/target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch b/target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch index 3356781cc6..e6c9fd2f74 100644 --- a/target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch +++ b/target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch @@ -327,7 +327,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(set)) return PTR_ERR(set); -@@ -4271,6 +4343,21 @@ struct nft_object *nf_tables_obj_lookup( +@@ -4277,6 +4349,21 @@ struct nft_object *nf_tables_obj_lookup( } EXPORT_SYMBOL_GPL(nf_tables_obj_lookup); @@ -349,7 +349,7 @@ Signed-off-by: Pablo Neira Ayuso static const struct nla_policy nft_obj_policy[NFTA_OBJ_MAX + 1] = { [NFTA_OBJ_TABLE] = { .type = NLA_STRING, .len = NFT_TABLE_MAXNAMELEN - 1 }, -@@ -4278,6 +4365,7 @@ static const struct nla_policy nft_obj_p +@@ -4284,6 +4371,7 @@ static const struct nla_policy nft_obj_p .len = NFT_OBJ_MAXNAMELEN - 1 }, [NFTA_OBJ_TYPE] = { .type = NLA_U32 }, [NFTA_OBJ_DATA] = { .type = NLA_NESTED }, @@ -357,7 +357,7 @@ Signed-off-by: Pablo Neira Ayuso }; static struct nft_object *nft_obj_init(const struct nft_ctx *ctx, -@@ -4425,6 +4513,8 @@ static int nf_tables_newobj(struct net * +@@ -4431,6 +4519,8 @@ static int nf_tables_newobj(struct net * goto err1; } obj->table = table; @@ -366,7 +366,7 @@ Signed-off-by: Pablo Neira Ayuso obj->name = nla_strdup(nla[NFTA_OBJ_NAME], GFP_KERNEL); if (!obj->name) { err = -ENOMEM; -@@ -4471,7 +4561,9 @@ static int nf_tables_fill_obj_info(struc +@@ -4477,7 +4567,9 @@ static int nf_tables_fill_obj_info(struc nla_put_string(skb, NFTA_OBJ_NAME, obj->name) || nla_put_be32(skb, NFTA_OBJ_TYPE, htonl(obj->ops->type->type)) || nla_put_be32(skb, NFTA_OBJ_USE, htonl(obj->use)) || @@ -377,7 +377,7 @@ Signed-off-by: Pablo Neira Ayuso goto nla_put_failure; nlmsg_end(skb, nlh); -@@ -4669,7 +4761,7 @@ static int nf_tables_delobj(struct net * +@@ -4675,7 +4767,7 @@ static int nf_tables_delobj(struct net * u32 objtype; if (!nla[NFTA_OBJ_TYPE] || @@ -386,7 +386,7 @@ Signed-off-by: Pablo Neira Ayuso return -EINVAL; table = nf_tables_table_lookup(net, nla[NFTA_OBJ_TABLE], family, -@@ -4678,7 +4770,12 @@ static int nf_tables_delobj(struct net * +@@ -4684,7 +4776,12 @@ static int nf_tables_delobj(struct net * return PTR_ERR(table); objtype = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE])); @@ -400,7 +400,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(obj)) return PTR_ERR(obj); if (obj->use > 0) -@@ -4750,6 +4847,7 @@ static const struct nla_policy nft_flowt +@@ -4756,6 +4853,7 @@ static const struct nla_policy nft_flowt [NFTA_FLOWTABLE_NAME] = { .type = NLA_STRING, .len = NFT_NAME_MAXLEN - 1 }, [NFTA_FLOWTABLE_HOOK] = { .type = NLA_NESTED }, @@ -408,7 +408,7 @@ Signed-off-by: Pablo Neira Ayuso }; struct nft_flowtable *nf_tables_flowtable_lookup(const struct nft_table *table, -@@ -4767,6 +4865,20 @@ struct nft_flowtable *nf_tables_flowtabl +@@ -4773,6 +4871,20 @@ struct nft_flowtable *nf_tables_flowtabl } EXPORT_SYMBOL_GPL(nf_tables_flowtable_lookup); @@ -429,7 +429,7 @@ Signed-off-by: Pablo Neira Ayuso #define NFT_FLOWTABLE_DEVICE_MAX 8 static int nf_tables_parse_devices(const struct nft_ctx *ctx, -@@ -4975,6 +5087,8 @@ static int nf_tables_newflowtable(struct +@@ -4981,6 +5093,8 @@ static int nf_tables_newflowtable(struct return -ENOMEM; flowtable->table = table; @@ -438,7 +438,7 @@ Signed-off-by: Pablo Neira Ayuso flowtable->name = nla_strdup(nla[NFTA_FLOWTABLE_NAME], GFP_KERNEL); if (!flowtable->name) { err = -ENOMEM; -@@ -5049,8 +5163,14 @@ static int nf_tables_delflowtable(struct +@@ -5055,8 +5169,14 @@ static int nf_tables_delflowtable(struct if (IS_ERR(table)) return PTR_ERR(table); @@ -455,7 +455,7 @@ Signed-off-by: Pablo Neira Ayuso if (IS_ERR(flowtable)) return PTR_ERR(flowtable); if (flowtable->use > 0) -@@ -5083,7 +5203,9 @@ static int nf_tables_fill_flowtable_info +@@ -5089,7 +5209,9 @@ static int nf_tables_fill_flowtable_info if (nla_put_string(skb, NFTA_FLOWTABLE_TABLE, flowtable->table->name) || nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || diff --git a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch index b15a01e062..96acb6887e 100644 --- a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch +++ b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch @@ -236,7 +236,7 @@ Signed-off-by: Felix Fietkau .owner = THIS_MODULE, --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5102,40 +5102,38 @@ static int nf_tables_newflowtable(struct +@@ -5108,40 +5108,38 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -285,7 +285,7 @@ Signed-off-by: Felix Fietkau err3: module_put(type->owner); err2: -@@ -5416,10 +5414,8 @@ err: +@@ -5422,10 +5420,8 @@ err: static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) { diff --git a/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch b/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch index 2e68aef421..ea86e761d7 100644 --- a/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch +++ b/target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -4968,7 +4968,7 @@ static int nf_tables_flowtable_parse_hoo +@@ -4974,7 +4974,7 @@ static int nf_tables_flowtable_parse_hoo flowtable->ops[i].pf = NFPROTO_NETDEV; flowtable->ops[i].hooknum = hooknum; flowtable->ops[i].priority = priority; diff --git a/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch b/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch index e39daf8927..643189b5c0 100644 --- a/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch +++ b/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch @@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau WARN_ON(!nf_flow_offload_gc_step(flow_table)); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5012,23 +5012,6 @@ static const struct nf_flowtable_type *n +@@ -5018,23 +5018,6 @@ static const struct nf_flowtable_type *n return ERR_PTR(-ENOENT); } diff --git a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 9634d3c27a..f2aa14c238 100644 --- a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -4955,6 +4955,14 @@ static int nf_tables_flowtable_parse_hoo +@@ -4961,6 +4961,14 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) goto err1; @@ -521,7 +521,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kzalloc(sizeof(struct nf_hook_ops) * n, GFP_KERNEL); if (!ops) { err = -ENOMEM; -@@ -5085,10 +5093,19 @@ static int nf_tables_newflowtable(struct +@@ -5091,10 +5099,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -541,7 +541,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5186,7 +5203,8 @@ static int nf_tables_fill_flowtable_info +@@ -5192,7 +5209,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch index 4fabfdcb6c..4adad67d54 100644 --- a/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #include "vlan.h" #include "vlanproc.h" -@@ -768,6 +772,27 @@ static int vlan_dev_get_iflink(const str +@@ -769,6 +773,27 @@ static int vlan_dev_get_iflink(const str return real_dev->ifindex; } @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau static const struct ethtool_ops vlan_ethtool_ops = { .get_link_ksettings = vlan_ethtool_get_link_ksettings, .get_drvinfo = vlan_ethtool_get_drvinfo, -@@ -805,6 +830,9 @@ static const struct net_device_ops vlan_ +@@ -806,6 +831,9 @@ static const struct net_device_ops vlan_ .ndo_fix_features = vlan_dev_fix_features, .ndo_get_lock_subclass = vlan_dev_get_lock_subclass, .ndo_get_iflink = vlan_dev_get_iflink, diff --git a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch index e8b730f95c..099b6031b5 100644 --- a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch @@ -285,7 +285,7 @@ Signed-off-by: Zhao Qiang #define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN) --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h -@@ -360,6 +360,11 @@ static inline int pmd_protnone(pmd_t pmd +@@ -356,6 +356,11 @@ static inline int pmd_protnone(pmd_t pmd __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN) #define pgprot_writecombine(prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN) diff --git a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch index b354c13347..9f7f89c7e2 100644 --- a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch +++ b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch @@ -329,7 +329,7 @@ Signed-off-by: David S. Miller } if (!of_property_read_u32(node, "allwinner,tx-delay-ps", &val)) { -@@ -747,81 +896,21 @@ static void sun8i_dwmac_unset_syscon(str +@@ -750,81 +899,21 @@ static void sun8i_dwmac_unset_syscon(str regmap_write(gmac->regmap, SYSCON_EMAC_REG, reg); } @@ -420,7 +420,7 @@ Signed-off-by: David S. Miller clk_disable_unprepare(gmac->tx_clk); -@@ -850,7 +939,7 @@ static struct mac_device_info *sun8i_dwm +@@ -853,7 +942,7 @@ static struct mac_device_info *sun8i_dwm if (!mac) return NULL; @@ -429,7 +429,7 @@ Signed-off-by: David S. Miller if (ret) return NULL; -@@ -892,6 +981,8 @@ static int sun8i_dwmac_probe(struct plat +@@ -895,6 +984,8 @@ static int sun8i_dwmac_probe(struct plat struct sunxi_priv_data *gmac; struct device *dev = &pdev->dev; int ret; @@ -438,7 +438,7 @@ Signed-off-by: David S. Miller ret = stmmac_get_platform_resources(pdev, &stmmac_res); if (ret) -@@ -935,29 +1026,6 @@ static int sun8i_dwmac_probe(struct plat +@@ -938,29 +1029,6 @@ static int sun8i_dwmac_probe(struct plat } plat_dat->interface = of_get_phy_mode(dev->of_node); @@ -468,7 +468,7 @@ Signed-off-by: David S. Miller /* platform data specifying hardware features and callbacks. * hardware features were copied from Allwinner drivers. -@@ -976,9 +1044,34 @@ static int sun8i_dwmac_probe(struct plat +@@ -979,9 +1047,34 @@ static int sun8i_dwmac_probe(struct plat ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) diff --git a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch index 02115c832b..0e8d808b42 100644 --- a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch +++ b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -1075,6 +1075,14 @@ return ret; +@@ -1078,6 +1078,14 @@ return ret; } static const struct of_device_id sun8i_dwmac_match[] = { From 692b91f56b8966519a4faa75667fc2937e458ed3 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 14 Jan 2020 16:34:24 +0100 Subject: [PATCH 381/480] kernel: bump 4.19 to 4.19.95 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../patches-4.19/910-unaligned_access_hacks.patch | 2 +- ...b-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch | 4 ++-- ...78xx-Disable-TCP-Segmentation-Offload-TSO.patch | 2 +- ...bounce-link-events-to-minimize-poll-storm.patch | 2 +- ...78xx-use-default-alignment-for-rx-buffers.patch | 2 +- ...heck-key-sizes-only-when-Secure-Simple-Pa.patch | 2 +- ...lator-gpio-Allow-nonexclusive-GPIO-access.patch | 2 +- ...-Enable-nonexclusive-gpiods-from-DT-nodes.patch | 2 +- ...vice-tree-gpio-hogs-on-dual-role-gpio-pin.patch | 4 ++-- .../linux/generic/hack-4.19/721-phy_packets.patch | 6 +++--- ...f_flow_table-add-hardware-offload-support.patch | 6 +++--- ...8021q-support-hardware-flow-table-offload.patch | 4 ++-- ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 14 +++++++------- .../generic/pending-4.19/834-ledtrig-libata.patch | 6 +++--- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 48ccef5363..fdec85dd9e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.14 = .164 -LINUX_VERSION-4.19 = .93 +LINUX_VERSION-4.19 = .95 LINUX_KERNEL_HASH-4.14.164 = a2031061f3f1472b7fa929f7d0274dd985c8d03ca847acfec1c47847fb7deb4b -LINUX_KERNEL_HASH-4.19.93 = 2af5d23f82a8bf69a6e4d8407579293b7beeebd3054dc464d48bdb5d2d7f5834 +LINUX_KERNEL_HASH-4.19.95 = 4aedca32eec13ac5103fc23e141f9221dfe120d1c0651c0a2efe7de2182f4fb0 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index dba7df5f3a..201ad740f1 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -728,7 +728,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3891,14 +3891,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3894,14 +3894,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/brcm2708/patches-4.19/950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index 17867c330a..5cec38351b 100644 --- a/target/linux/brcm2708/patches-4.19/950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0122-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -2654,7 +2656,7 @@ int gpiod_direction_output(struct gpio_d +@@ -2662,7 +2664,7 @@ int gpiod_direction_output(struct gpio_d value = !!value; /* GPIOs used for IRQs shall not be set as output */ @@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3353,7 +3355,7 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3361,7 +3363,7 @@ int gpiochip_lock_as_irq(struct gpio_chi } } diff --git a/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index ef1bbaac69..28515c9d09 100644 --- a/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3012,8 +3021,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -3009,8 +3018,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index b552cc0b97..b481294674 100644 --- a/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3825,7 +3830,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3822,7 +3827,12 @@ static int lan78xx_probe(struct usb_inte dev->pipe_intr = usb_rcvintpipe(dev->udev, dev->ep_intr->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); diff --git a/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch index f5313aec37..c5eca2e076 100644 --- a/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0415-lan78xx-use-default-alignment-for-rx-buffers.patch @@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing. --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -3259,7 +3259,7 @@ static int rx_submit(struct lan78xx_net +@@ -3256,7 +3256,7 @@ static int rx_submit(struct lan78xx_net size_t size = dev->rx_urb_size; int ret = 0; diff --git a/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch b/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch index 7bbee63f41..ac7a9aea39 100644 --- a/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch +++ b/target/linux/brcm2708/patches-4.19/950-0429-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch @@ -21,7 +21,7 @@ Cc: stable@vger.kernel.org --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c -@@ -1280,8 +1280,13 @@ int hci_conn_check_link_mode(struct hci_ +@@ -1282,8 +1282,13 @@ int hci_conn_check_link_mode(struct hci_ return 0; } diff --git a/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch index e0ffaae209..6bcfab0ea9 100644 --- a/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch +++ b/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch @@ -41,7 +41,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -3979,8 +3979,23 @@ struct gpio_desc *__must_check gpiod_get +@@ -3987,8 +3987,23 @@ struct gpio_desc *__must_check gpiod_get * the device name as label */ status = gpiod_request(desc, con_id ? con_id : devname); diff --git a/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch b/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch index e8e63a2798..8e79dae6af 100644 --- a/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch @@ -23,7 +23,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -4053,6 +4053,8 @@ struct gpio_desc *gpiod_get_from_of_node +@@ -4061,6 +4061,8 @@ struct gpio_desc *gpiod_get_from_of_node transitory = flags & OF_GPIO_TRANSITORY; ret = gpiod_request(desc, label); diff --git a/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 395b17c8de..13225beae6 100644 --- a/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -2197,7 +2197,8 @@ int gpiochip_add_pingroup_range(struct g +@@ -2205,7 +2205,8 @@ int gpiochip_add_pingroup_range(struct g list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); -@@ -2254,7 +2255,7 @@ int gpiochip_add_pin_range(struct gpio_c +@@ -2262,7 +2263,7 @@ int gpiochip_add_pin_range(struct gpio_c list_add_tail(&pin_range->node, &gdev->pin_ranges); diff --git a/target/linux/generic/hack-4.19/721-phy_packets.patch b/target/linux/generic/hack-4.19/721-phy_packets.patch index b6cbef1e49..1ad7d46764 100644 --- a/target/linux/generic/hack-4.19/721-phy_packets.patch +++ b/target/linux/generic/hack-4.19/721-phy_packets.patch @@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau /** * struct net_device - The DEVICE structure. -@@ -1844,6 +1846,11 @@ struct net_device { +@@ -1846,6 +1848,11 @@ struct net_device { const struct tlsdev_ops *tlsdev_ops; #endif @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau const struct header_ops *header_ops; unsigned int flags; -@@ -1924,6 +1931,10 @@ struct net_device { +@@ -1928,6 +1935,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3252,10 +3252,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -3253,10 +3253,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 0a1e017f89..d9274012cb 100644 --- a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5470,6 +5470,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5478,6 +5478,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5601,10 +5608,19 @@ static int nf_tables_newflowtable(struct +@@ -5609,10 +5616,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5730,7 +5746,8 @@ static int nf_tables_fill_flowtable_info +@@ -5738,7 +5754,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch index 724f1c46ca..7547c14bed 100644 --- a/target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #include "vlan.h" #include "vlanproc.h" -@@ -770,6 +774,27 @@ static int vlan_dev_get_iflink(const str +@@ -771,6 +775,27 @@ static int vlan_dev_get_iflink(const str return real_dev->ifindex; } @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau static const struct ethtool_ops vlan_ethtool_ops = { .get_link_ksettings = vlan_ethtool_get_link_ksettings, .get_drvinfo = vlan_ethtool_get_drvinfo, -@@ -807,6 +832,9 @@ static const struct net_device_ops vlan_ +@@ -808,6 +833,9 @@ static const struct net_device_ops vlan_ .ndo_fix_features = vlan_dev_fix_features, .ndo_get_lock_subclass = vlan_dev_get_lock_subclass, .ndo_get_iflink = vlan_dev_get_iflink, diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 1e52d2f2a7..ad7ccdb048 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1887,6 +1887,8 @@ struct net_device { +@@ -1891,6 +1891,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5482,6 +5482,9 @@ static enum gro_result dev_gro_receive(s +@@ -5483,6 +5483,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -6976,6 +6979,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7141,6 +7144,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7023,6 +7068,7 @@ static int __netdev_upper_dev_link(struc +@@ -7191,6 +7236,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,15 +99,15 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7109,6 +7155,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7283,6 +7329,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); + netdev_update_addr_mask(dev); call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); - } -@@ -7733,6 +7780,7 @@ int dev_set_mac_address(struct net_devic + +@@ -7913,6 +7960,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.19/834-ledtrig-libata.patch b/target/linux/generic/pending-4.19/834-ledtrig-libata.patch index de029fafe5..f1dc0e5995 100644 --- a/target/linux/generic/pending-4.19/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-4.19/834-ledtrig-libata.patch @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -6044,6 +6060,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -6068,6 +6084,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -6079,6 +6098,12 @@ static void ata_host_release(struct kref +@@ -6103,6 +6122,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -6542,7 +6567,23 @@ int ata_host_register(struct ata_host *h +@@ -6566,7 +6591,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } From 2b4654f74f6b4a6feefc032617cdb2c870a1090d Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 20 Jan 2020 11:00:59 +0100 Subject: [PATCH 382/480] kernel: bump 4.14 to 4.14.165 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index fdec85dd9e..577946a087 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .164 +LINUX_VERSION-4.14 = .165 LINUX_VERSION-4.19 = .95 -LINUX_KERNEL_HASH-4.14.164 = a2031061f3f1472b7fa929f7d0274dd985c8d03ca847acfec1c47847fb7deb4b +LINUX_KERNEL_HASH-4.14.165 = b0aeb52386404f4e3546f93cf63c857025fc3117ff1b56e3499aa1eae6e088c7 LINUX_KERNEL_HASH-4.19.95 = 4aedca32eec13ac5103fc23e141f9221dfe120d1c0651c0a2efe7de2182f4fb0 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch index 59e1cff965..f70cfef762 100644 --- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch +++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1970,7 +1970,8 @@ static const struct usb_device_id option +@@ -1975,7 +1975,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, From 6cc7498daafd0f7a55b439193af16d43f3de3591 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 20 Jan 2020 11:04:32 +0100 Subject: [PATCH 383/480] kernel: bump 4.19 to 4.19.96 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...42-drm-modes-Support-modes-names-on-the-command-line.patch | 2 +- ...drm-modes-Allow-to-specify-rotation-and-reflection-o.patch | 4 ++-- ...drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 577946a087..63a6503cf5 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.14 = .165 -LINUX_VERSION-4.19 = .95 +LINUX_VERSION-4.19 = .96 LINUX_KERNEL_HASH-4.14.165 = b0aeb52386404f4e3546f93cf63c857025fc3117ff1b56e3499aa1eae6e088c7 -LINUX_KERNEL_HASH-4.19.95 = 4aedca32eec13ac5103fc23e141f9221dfe120d1c0651c0a2efe7de2182f4fb0 +LINUX_KERNEL_HASH-4.19.96 = 23c1d1d5ba7bc14f9850e5ce78006712fe6c65dedcf67d3c99cec9c16a631d4d remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.19/950-0642-drm-modes-Support-modes-names-on-the-command-line.patch b/target/linux/brcm2708/patches-4.19/950-0642-drm-modes-Support-modes-names-on-the-command-line.patch index aee684a955..1cacab25e2 100644 --- a/target/linux/brcm2708/patches-4.19/950-0642-drm-modes-Support-modes-names-on-the-command-line.patch +++ b/target/linux/brcm2708/patches-4.19/950-0642-drm-modes-Support-modes-names-on-the-command-line.patch @@ -45,7 +45,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/18443e0c3bdbbd16cea4ec63bc7f mode->rb ? " reduced blanking" : "", --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -2099,6 +2099,10 @@ struct drm_display_mode *drm_pick_cmdlin +@@ -2104,6 +2104,10 @@ struct drm_display_mode *drm_pick_cmdlin prefer_non_interlace = !cmdline_mode->interlace; again: list_for_each_entry(mode, &fb_helper_conn->connector->modes, head) { diff --git a/target/linux/brcm2708/patches-4.19/950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch b/target/linux/brcm2708/patches-4.19/950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch index f9ba856c44..0b2a185441 100644 --- a/target/linux/brcm2708/patches-4.19/950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch +++ b/target/linux/brcm2708/patches-4.19/950-0643-drm-modes-Allow-to-specify-rotation-and-reflection-o.patch @@ -52,7 +52,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/777da16e42db757c1f5b414b5ca3 What is the VESA(TM) Coordinated Video Timings (CVT)? --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -2464,6 +2464,7 @@ static void drm_setup_crtc_rotation(stru +@@ -2469,6 +2469,7 @@ static void drm_setup_crtc_rotation(stru struct drm_connector *connector) { struct drm_plane *plane = fb_crtc->mode_set.crtc->primary; @@ -60,7 +60,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/777da16e42db757c1f5b414b5ca3 uint64_t valid_mask = 0; int i, rotation; -@@ -2483,6 +2484,35 @@ static void drm_setup_crtc_rotation(stru +@@ -2488,6 +2489,35 @@ static void drm_setup_crtc_rotation(stru rotation = DRM_MODE_ROTATE_0; } diff --git a/target/linux/brcm2708/patches-4.19/950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch b/target/linux/brcm2708/patches-4.19/950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch index 4cb0a543c0..b97d018799 100644 --- a/target/linux/brcm2708/patches-4.19/950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch +++ b/target/linux/brcm2708/patches-4.19/950-0649-drm-modes-Don-t-apply-cmdline-s-rotation-if-it-wasn-.patch @@ -23,7 +23,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -2497,7 +2497,7 @@ static void drm_setup_crtc_rotation(stru +@@ -2502,7 +2502,7 @@ static void drm_setup_crtc_rotation(stru * simple XOR between the two handle the addition nicely. */ cmdline = &connector->cmdline_mode; From ac050025a50a675e1cc91c19635fe6a00a6ecbe7 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 20 Jan 2020 12:23:38 +0100 Subject: [PATCH 384/480] kernel: bump 4.14 to 4.14.166 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../layerscape/patches-4.14/301-arch-support-layerscape.patch | 2 +- .../layerscape/patches-4.14/821-smmu-support-layerscape.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 63a6503cf5..07d5efe8bb 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .165 +LINUX_VERSION-4.14 = .166 LINUX_VERSION-4.19 = .96 -LINUX_KERNEL_HASH-4.14.165 = b0aeb52386404f4e3546f93cf63c857025fc3117ff1b56e3499aa1eae6e088c7 +LINUX_KERNEL_HASH-4.14.166 = 8bb2bf811a2092933a2386a4e679cd0c88de979c10fbb463d8142add4e577c00 LINUX_KERNEL_HASH-4.19.96 = 23c1d1d5ba7bc14f9850e5ce78006712fe6c65dedcf67d3c99cec9c16a631d4d remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch index 099b6031b5..59ed130567 100644 --- a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch @@ -285,7 +285,7 @@ Signed-off-by: Zhao Qiang #define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN) --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h -@@ -356,6 +356,11 @@ static inline int pmd_protnone(pmd_t pmd +@@ -357,6 +357,11 @@ static inline int pmd_protnone(pmd_t pmd __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN) #define pgprot_writecombine(prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN) diff --git a/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch b/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch index 8b845dd715..931e09a9fa 100644 --- a/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/821-smmu-support-layerscape.patch @@ -123,7 +123,7 @@ Signed-off-by: Biwen Li static struct kset *iommu_group_kset; static DEFINE_IDA(iommu_group_ida); -@@ -989,6 +990,26 @@ struct iommu_group *pci_device_group(str +@@ -990,6 +991,26 @@ struct iommu_group *pci_device_group(str return iommu_group_alloc(); } From 7adb0f98103537b98880960fd1a14f2f54aa3574 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 20 Jan 2020 12:25:02 +0100 Subject: [PATCH 385/480] kernel: bump 4.19 to 4.19.97 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...0-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch | 2 +- ...0-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 07d5efe8bb..c4186b8d3e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.14 = .166 -LINUX_VERSION-4.19 = .96 +LINUX_VERSION-4.19 = .97 LINUX_KERNEL_HASH-4.14.166 = 8bb2bf811a2092933a2386a4e679cd0c88de979c10fbb463d8142add4e577c00 -LINUX_KERNEL_HASH-4.19.96 = 23c1d1d5ba7bc14f9850e5ce78006712fe6c65dedcf67d3c99cec9c16a631d4d +LINUX_KERNEL_HASH-4.19.97 = 8fb2a328e05e545274e721cf84baaf612b9330febc6f581b9ead81eaf41496da remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch index 6bcfab0ea9..a940736c3e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch +++ b/target/linux/brcm2708/patches-4.19/950-0700-regulator-gpio-Allow-nonexclusive-GPIO-access.patch @@ -41,7 +41,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -3987,8 +3987,23 @@ struct gpio_desc *__must_check gpiod_get +@@ -3988,8 +3988,23 @@ struct gpio_desc *__must_check gpiod_get * the device name as label */ status = gpiod_request(desc, con_id ? con_id : devname); diff --git a/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch b/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch index 8e79dae6af..a4139e6d38 100644 --- a/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0701-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch @@ -23,7 +23,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -4061,6 +4061,8 @@ struct gpio_desc *gpiod_get_from_of_node +@@ -4062,6 +4062,8 @@ struct gpio_desc *gpiod_get_from_of_node transitory = flags & OF_GPIO_TRANSITORY; ret = gpiod_request(desc, label); From 63000bfaf7163d97ac6feb343c7587e3d339e65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 18 Jan 2020 14:49:11 +0100 Subject: [PATCH 386/480] fstools: update to version 2020-01-18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit f5c7c1813f52 fstools: Add support to read-only MTD partitions (eg. recovery images) 189b41b6b487 libblkid-tiny: fix f2fs labels by increasing label buffer Signed-off-by: Petr Štetiar --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index d1bc704b3e..85a7e77d9c 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=7077c90f3938c7316ff7c8c353a178c4de61ef107b08b79209b93916a67c951d -PKG_SOURCE_DATE:=2020-01-05 -PKG_SOURCE_VERSION:=823faa0f3edb93fac528bc35588cea81f0a77146 +PKG_MIRROR_HASH:=f45915cbc83c0a2358359be0968dc42effb40aa3cfd1129abb1a81977f74e141 +PKG_SOURCE_DATE:=2020-01-18 +PKG_SOURCE_VERSION:=f5c7c1813f52e6d7b59ecfb2f9f95e69b05b1980 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From de80424f706682e8bba27c60bcd2a9c1b4a5e875 Mon Sep 17 00:00:00 2001 From: Bruno Pena Date: Sat, 9 Nov 2019 15:23:58 +0100 Subject: [PATCH 387/480] kernel: mtd: Make subpartitions inherit parent's access mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently it's not possible to effectively mark a "firmware" partition as read-only. The sub-partitions "kernel", "rootfs" and "rootfs_data" are always created as read-write (ignoring the parent access mode). This patch enforces the access mode of sub-partitions to match the parent partition, which is useful for recovery images that are meant to be fully read-only to avoid accidental damage from end-user. An example of such implementation (read-only firmware image) is the recovery image used on the Zsun-SD100 [1]. Please note the related patch for fstools [2] to enable this read-only concept. [1] https://github.com/brunompena/zsun-resources [2] http://lists.infradead.org/pipermail/openwrt-devel/2020-January/021043.html Signed-off-by: Bruno Pena [removed already obsolete 4.9 kernel patch] Signed-off-by: Petr Štetiar --- ...inherit-parent-partition-access-mode.patch | 60 +++++++++++++++++++ ...inherit-parent-partition-access-mode.patch | 60 +++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch create mode 100644 target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch diff --git a/target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch b/target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch new file mode 100644 index 0000000000..dbbe68ff4a --- /dev/null +++ b/target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch @@ -0,0 +1,60 @@ +--- a/drivers/mtd/mtdchar.c ++++ b/drivers/mtd/mtdchar.c +@@ -595,7 +595,10 @@ + /* Sanitize user input */ + p.devname[BLKPG_DEVNAMELTH - 1] = '\0'; + +- return mtd_add_partition(mtd, p.devname, p.start, p.length); ++ /* No mtd flags masking required */ ++ uint32_t mask_flags = 0; ++ ++ return mtd_add_partition(mtd, p.devname, p.start, p.length, mask_flags); + + case BLKPG_DEL_PARTITION: + +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -726,7 +726,7 @@ + } + + int mtd_add_partition(struct mtd_info *parent, const char *name, +- long long offset, long long length) ++ long long offset, long long length, uint32_t mask_flags) + { + struct mtd_partition part; + struct mtd_part *new; +@@ -747,6 +747,7 @@ + part.name = name; + part.size = length; + part.offset = offset; ++ part.mask_flags = mask_flags; + + new = allocate_partition(parent, &part, -1, offset); + if (IS_ERR(new)) +@@ -855,10 +856,14 @@ + /* adjust partition offsets */ + parts[i].offset += slave->offset; + ++ /* adjust partition mask */ ++ parts[i].mask_flags = !(slave->mtd.flags & MTD_WRITEABLE) ? MTD_WRITEABLE : 0; ++ + mtd_add_partition(slave->parent, + parts[i].name, + parts[i].offset, +- parts[i].size); ++ parts[i].size, ++ parts[i].mask_flags); + } + + kfree(parts); +--- a/include/linux/mtd/partitions.h ++++ b/include/linux/mtd/partitions.h +@@ -114,7 +114,7 @@ + + int mtd_is_partition(const struct mtd_info *mtd); + int mtd_add_partition(struct mtd_info *master, const char *name, +- long long offset, long long length); ++ long long offset, long long length, uint32_t mask_flags); + int mtd_del_partition(struct mtd_info *master, int partno); + struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); + uint64_t mtdpart_get_offset(const struct mtd_info *mtd); diff --git a/target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch b/target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch new file mode 100644 index 0000000000..61dd0369a6 --- /dev/null +++ b/target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch @@ -0,0 +1,60 @@ +--- a/drivers/mtd/mtdchar.c ++++ b/drivers/mtd/mtdchar.c +@@ -583,7 +583,10 @@ + /* Sanitize user input */ + p.devname[BLKPG_DEVNAMELTH - 1] = '\0'; + +- return mtd_add_partition(mtd, p.devname, p.start, p.length); ++ /* No mtd flags masking required */ ++ uint32_t mask_flags = 0; ++ ++ return mtd_add_partition(mtd, p.devname, p.start, p.length, mask_flags); + + case BLKPG_DEL_PARTITION: + +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -679,7 +679,7 @@ + } + + int mtd_add_partition(struct mtd_info *parent, const char *name, +- long long offset, long long length) ++ long long offset, long long length, uint32_t mask_flags) + { + struct mtd_partition part; + struct mtd_part *new; +@@ -700,6 +700,7 @@ + part.name = name; + part.size = length; + part.offset = offset; ++ part.mask_flags = mask_flags; + + new = allocate_partition(parent, &part, -1, offset); + if (IS_ERR(new)) +@@ -808,10 +809,14 @@ + /* adjust partition offsets */ + parts[i].offset += slave->offset; + ++ /* adjust partition mask */ ++ parts[i].mask_flags = !(slave->mtd.flags & MTD_WRITEABLE) ? MTD_WRITEABLE : 0; ++ + mtd_add_partition(slave->parent, + parts[i].name, + parts[i].offset, +- parts[i].size); ++ parts[i].size, ++ parts[i].mask_flags); + } + + kfree(parts); +--- a/include/linux/mtd/partitions.h ++++ b/include/linux/mtd/partitions.h +@@ -114,7 +114,7 @@ + + int mtd_is_partition(const struct mtd_info *mtd); + int mtd_add_partition(struct mtd_info *master, const char *name, +- long long offset, long long length); ++ long long offset, long long length, uint32_t mask_flags); + int mtd_del_partition(struct mtd_info *master, int partno); + struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); + uint64_t mtdpart_get_offset(const struct mtd_info *mtd); From 5c73bb12c82c078d8a93cb896348b41598ed9e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 20 Jan 2020 16:22:07 +0100 Subject: [PATCH 388/480] libubox: update to version 2020-01-20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 43a103ff17ee blobmsg: blobmsg_parse and blobmsg_parse_array oob read fixes 5c0faaf4f5e2 tests: prefer dynamically allocated buffers 1ffa41535369 blobmsg_json: prefer snprintf usage 132ecb563da7 blobmsg: blobmsg_vprintf: prefer vsnprintf a2aab30fc918 jshn: prefer snprintf usage b0886a37f39a cmake: add a possibility to set library version a36ee96618a9 blobmsg: blobmsg_add_json_element() 64-bit values f0da3a4283b7 blobmsg_json: fix int16 serialization 20a070f08139 tests: blobmsg/json: add more test cases 379cd33d1992 tests: include json script shunit2 based testing Acked-by: Jo-Philipp Wich Signed-off-by: Petr Štetiar --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 24b5b45068..046aa7ab26 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=90511058f49a178a816d520944cddba421f9eb50c319ef1623bed7aa22f94a3a -PKG_SOURCE_DATE:=2019-12-28 -PKG_SOURCE_VERSION:=cd75136b1342e1e9dabf921be13240c6653640ed +PKG_MIRROR_HASH:=c53aae4b8d5ec15625a4cbf7f37e6b62a6cb258ef0310c0f620064ba94589377 +PKG_SOURCE_DATE:=2020-01-20 +PKG_SOURCE_VERSION:=43a103ff17ee5872669f8712606578c90c14591d CMAKE_INSTALL:=1 PKG_LICENSE:=ISC From 0d28e5d6440d2a37841a207f943e6e5a23172883 Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Mon, 20 Jan 2020 21:34:02 +0100 Subject: [PATCH 389/480] ath79: fix SUPPORTED_DEVICES for WNDR4300 and WNDR3700v4 Kernel partition increase to 4 MiBs for Netgear WNDR3700v4 and WNDR4300 routers breaks sysupgrade image compatibility with ar71xx builds. Therefore, SUPPORTED_DEVICES variable has to be removed for both devices from target makefile. Reported-by: DENG Qingfang Signed-off-by: Michal Cieslakiewicz --- target/linux/ath79/image/nand.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index f6929cd88e..95ddca26b0 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -138,7 +138,6 @@ define Device/netgear_wndr3700-v4 NETGEAR_KERNEL_MAGIC := 0x33373033 NETGEAR_BOARD_ID := WNDR3700v4 NETGEAR_HW_ID := 29763948+128+128 - SUPPORTED_DEVICES += wndr3700v4 $(Device/netgear_ath79_nand) endef TARGET_DEVICES += netgear_wndr3700-v4 @@ -149,7 +148,6 @@ define Device/netgear_wndr4300 NETGEAR_KERNEL_MAGIC := 0x33373033 NETGEAR_BOARD_ID := WNDR4300 NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3 - SUPPORTED_DEVICES += wndr4300 $(Device/netgear_ath79_nand) endef TARGET_DEVICES += netgear_wndr4300 From e4ce8f59f5f1a31961b29ae700829b8372053f77 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 21 Jan 2020 10:18:10 +0200 Subject: [PATCH 390/480] netifd: add basic support for jail network namespaces Prepare netifd for handling procd service jails having their own network namespace. Intefaces having the jail attribute will only be brought up inside the jail's network namespace by procd calling the newly introduced ubus method 'netns_updown'. Currently proto 'static' is supported and configuration changes are not yet being handled (ie. you'll have to restart the jailed service for changes to take effect). Example /etc/config/network snippet: config device 'veth0' option type 'veth' option name 'vhost0' option peer_name 'virt0' config interface 'virt' option type 'bridge' list ifname 'vhost0' option proto 'static' option ipaddr '10.0.0.1' option netmask '255.255.255.0' config interface 'virt0' option ifname 'virt0' option proto 'static' option ipaddr '10.0.0.2' option netmask '255.255.255.0' option gateway '10.0.0.1' option dns '10.0.0.1' option jail 'transmission' Signed-off-by: Daniel Golle --- package/network/config/netifd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 06c1aeac49..8a1bab8c44 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2020-01-07 -PKG_SOURCE_VERSION:=64f4eb79fe2977320660f8940bc908fa4def807b -PKG_MIRROR_HASH:=d6c819856030118640e61bbc3abe20fdb6bca2b64b7adc437bcc2f71c8c01b64 +PKG_SOURCE_DATE:=2020-01-18 +PKG_SOURCE_VERSION:=1321c1bd8fe921986c4eb39c3783ddd827b79543 +PKG_MIRROR_HASH:=7e93ba79727e84cc391121be8a190cfa373dee8e2511f75d6f2fcb179928f5fa PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From 97a03a4760d8fcb86533d709939b2cc231c9e789 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 21 Jan 2020 12:52:12 +0200 Subject: [PATCH 391/480] procd: update to latest git HEAD 58c12f7 jail: add basic support for network namespaces ba69639 jail: create resolv.conf symlink for netns jails 81b88b1 jail: more strict mount options for /tmp/resolv.conf.d/ Add new 'netns' flag for procd_add_jail to make ujail setup a new network namespace for the jailed service. See previous netifd commit for example configuration for netns jailed service. Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index ee857f281f..b9dc5d026a 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_MIRROR_HASH:=036a42aa87741fa5e587195255c01b6b561bcb7b3858be12e8781949ecb1bda0 -PKG_SOURCE_DATE:=2020-01-04 -PKG_SOURCE_VERSION:=a5af33ce9a16f6aa599f19cc7161e067fab9495d +PKG_SOURCE_DATE:=2020-01-21 +PKG_SOURCE_VERSION:=81b88b1c63770542985f8cb0665eff37e27eb412 +PKG_MIRROR_HASH:=4ed6340f15e5ee267d31789f71294d4ef259f6880c0db528061ddb24be7fcdde CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -52,7 +52,7 @@ endef define Package/procd-ujail SECTION:=base CATEGORY:=Base system - DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS +libubox +libblobmsg-json + DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS +libubox +libubus +libblobmsg-json TITLE:=OpenWrt process jail helper endef From 83708f233daceacebd1c49da44711cc87b49162a Mon Sep 17 00:00:00 2001 From: Lech Perczak Date: Sun, 17 Nov 2019 20:57:10 +0100 Subject: [PATCH 392/480] ar71xx: ubnt-rocket-m-ti: fix RSSI LED definitions When mapping for RSSI LEDs was defined for interface wlan0 on Ubiquiti Rocket M Titanium, it missed connection to actual interface. Therefore create the mapping to interface, so RSSI LEDs work without additional configuration, after starting rssileds service. While at that, split RSSI into ~equal intervals for 6 LEDs, and remove coefficients needed for PWM LEDs, as this board does not support PWM LEDs. Finally, for complete support, enable 'rssileds' package in per-device rootfs, so the indicator works out of box. Signed-off-by: Lech Perczak --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 13 +++++++------ target/linux/ar71xx/image/generic-ubnt.mk | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index 0a63820de7..54727a6e52 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -724,12 +724,13 @@ rme-eg200) ucidef_set_led_default "etactica" "etactica" "eg200:red:etactica" "ignore" ;; rocket-m-ti) - ucidef_set_led_rssi "rssiverylow" "RSSIVERYLOW" "ubnt:green:link1" "wlan0" "1" "100" "0" "13" - ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:green:link2" "wlan0" "26" "100" "-25" "13" - ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:green:link3" "wlan0" "51" "100" "-50" "13" - ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:green:link4" "wlan0" "76" "100" "-75" "13" - ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:green:link5" "wlan0" "76" "100" "-75" "13" - ucidef_set_led_rssi "rssiveryhigh" "RSSIVERYHIGH" "ubnt:green:link4" "wlan0" "76" "100" "-75" "13" + ucidef_set_rssimon "wlan0" "200000" "1" + ucidef_set_led_rssi "rssiverylow" "RSSIVERYLOW" "ubnt:green:link1" "wlan0" "1" "100" + ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:green:link2" "wlan0" "18" "100" + ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:green:link3" "wlan0" "34" "100" + ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:green:link4" "wlan0" "51" "100" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:green:link5" "wlan0" "67" "100" + ucidef_set_led_rssi "rssiveryhigh" "RSSIVERYHIGH" "ubnt:green:link6" "wlan0" "84" "100" ;; rut900) ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth1" diff --git a/target/linux/ar71xx/image/generic-ubnt.mk b/target/linux/ar71xx/image/generic-ubnt.mk index 7d78e330e3..539f0d82b3 100644 --- a/target/linux/ar71xx/image/generic-ubnt.mk +++ b/target/linux/ar71xx/image/generic-ubnt.mk @@ -217,6 +217,7 @@ TARGET_DEVICES += ubnt-rocket-m-xw define Device/ubnt-rocket-m-ti $(Device/ubnt-xw) DEVICE_TITLE := Ubiquiti Rocket M TI + DEVICE_PACKAGES += rssileds BOARDNAME := UBNT-RM-TI UBNT_TYPE := TI endef From b99b60b2f164cb62212dd9812ddc8ce8df9f90a9 Mon Sep 17 00:00:00 2001 From: Enrico Mioso Date: Fri, 17 Jan 2020 13:15:52 +0100 Subject: [PATCH 393/480] ath79: add support for TP-Link TL-MR6400 This device is an LTE router supported in ar71xx so far. As per original commit, hardware specifications (v1.0 EU): - SoC: QCA9531 - Flash: Winbond W25Q64FV (8MiB) - RAM: EtronTech EM6AB160TSE-5G (64MiB) - Wireless: SoC platform only (2.4GHz b/g/n, 2x internal antenna) - Ethernet: 2NIC (3x100M + 1x100M) - WWAN: TP-LINK LTE MODULE (2x external detachable antenna) - Power: DC 12V 1A Flashing instructions: You can flash via tftp recovery (serve factory image as /mr6400_tp_recovery.bin on 192.168.0.66/24, connect to any ethernet port and power on device while holding the reset button). Flashing via OEM web interface does not work. Known issues: - LTE module does not always come up during boot (showing USB enumeration errors). Similar behavior has been reported at least from one user for ar71xx, too. Turning USB off and on again will serve as a workaround. - eth0 (LAN) always shows carrier as 1 even if no cable is plugged in (this works "correctly" on ar71xx) Signed-off-by: Enrico Mioso [several adjustments] Signed-off-by: Adrian Schmutzler Tested-by: Filip Moc --- .../ath79/dts/qca9531_tplink_tl-mr6400-v1.dts | 167 ++++++++++++++++++ .../generic/base-files/etc/board.d/01_leds | 5 + .../generic/base-files/etc/board.d/02_network | 5 + target/linux/ath79/image/generic-tp-link.mk | 12 ++ 4 files changed, 189 insertions(+) create mode 100644 target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts new file mode 100644 index 0000000000..7299257cda --- /dev/null +++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts @@ -0,0 +1,167 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/dts-v1/; + +#include +#include + +#include "qca953x.dtsi" + +/ { + compatible = "tplink,tl-mr6400-v1", "qca,qca9531"; + model = "TP-Link TL-MR6400 v1"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = &wmac; + }; + + leds { + compatible = "gpio-leds"; + + /* D12 */ + wan { + label = "tp-link:white:wan"; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; + }; + + /* D11 */ + 4g { + label = "tp-link:white:4g"; + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; + }; + + /* D5 */ + wps { + label = "tp-link:white:wps"; + gpios = <&gpio 3 GPIO_ACTIVE_HIGH>; + }; + + /* D3 */ + wlan { + label = "tp-link:white:wlan"; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; + }; + + /* D2 */ + led_power: power { + label = "tp-link:white:power"; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + }; + + /* D4 */ + lan { + label = "tp-link:white:lan"; + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + + /* SW2 */ + reset { + label = "Reset button"; + linux,code = ; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + /* SW3 */ + rfkill { + label = "RF kill button"; + linux,code = ; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + gpio-export { + compatible = "gpio-export"; + + gpio_usb_power { + gpio-export,name = "tp-link:power:lte"; + gpio-export,output = <0>; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x000000 0x020000>; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + label = "firmware"; + reg = <0x020000 0x7d0000>; + }; + + art: partition@7f0000 { + label = "art"; + reg = <0x7f0000 0x010000>; + read-only; + }; + }; + }; +}; + +ð0 { + status = "okay"; + + phy-handle = <&swphy0>; + + mtd-mac-address = <&uboot 0x1fc00>; + mtd-mac-address-increment = <1>; +}; + +ð1 { + mtd-mac-address = <&uboot 0x1fc00>; + mtd-mac-address-increment = <(-1)>; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&uboot 0x1fc00>; +}; + +&usb0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_port: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + +&usb_phy { + status = "okay"; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index de4e8b4a7f..1023ba7a39 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -215,6 +215,11 @@ tplink,re450-v2) ucidef_set_led_netdev "lan_data" "LAN Data" "tp-link:green:lan_data" "eth0" "tx rx" ucidef_set_led_netdev "lan_link" "LAN Link" "tp-link:green:lan_link" "eth0" "link" ;; +tplink,tl-mr6400-v1) + ucidef_set_led_switch "lan" "LAN" "tp-link:white:lan" "switch0" "0x0e" + ucidef_set_led_netdev "wan" "WAN" "tp-link:white:wan" "eth1" + ucidef_set_led_netdev "4g" "4G" "tp-link:white:4g" "usb0" + ;; tplink,tl-wr842n-v2) ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04" diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index a96b504d5a..0bae9dc384 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -236,6 +236,11 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "1:wan" ;; + tplink,tl-mr6400-v1) + ucidef_set_interfaces_lan_wan "eth0.1 eth1" "usb0" + ucidef_add_switch "switch0" \ + "0@eth0" "1:lan:1" "2:lan:3" "3:lan:2" + ;; tplink,tl-wr842n-v2) ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index a7266f05a9..53138e343b 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -374,6 +374,18 @@ define Device/tplink_re450-v2 endef TARGET_DEVICES += tplink_re450-v2 +define Device/tplink_tl-mr6400-v1 + $(Device/tplink-8mlzma) + SOC := qca9531 + DEVICE_MODEL := TL-MR6400 + DEVICE_VARIANT := v1 + TPLINK_HWID := 0x64000001 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial \ + kmod-usb-serial-option adb-enablemodem + SUPPORTED_DEVICES += tl-mr6400 +endef +TARGET_DEVICES += tplink_tl-mr6400-v1 + define Device/tplink_tl-wdr3500-v1 $(Device/tplink-8mlzma) SOC := ar9344 From 0a388b5bf7b5dbc60df94594c77d932bdd95cba6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:21:11 +0100 Subject: [PATCH 394/480] mvebu: move subtarget image Makefile switch to parent Makefile This moves the if conditions for choosing which image Makefiles are used to the parent image/Makefile. It seems more convenient to have "codeflow" in the parent while the subtarget-specific files only contain the definitions. Signed-off-by: Adrian Schmutzler Acked-by: Tomasz Maciej Nowak --- target/linux/mvebu/image/Makefile | 8 ++++++++ target/linux/mvebu/image/cortex-a53.mk | 4 ---- target/linux/mvebu/image/cortex-a72.mk | 4 ---- target/linux/mvebu/image/cortex-a9.mk | 4 ---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index ce1344a547..6dd7bde7ae 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -116,8 +116,16 @@ define Device/NAND-512K PAGESIZE := 4096 endef +ifeq ($(SUBTARGET),cortexa9) include cortex-a9.mk +endif + +ifeq ($(SUBTARGET),cortexa53) include cortex-a53.mk +endif + +ifeq ($(SUBTARGET),cortexa72) include cortex-a72.mk +endif $(eval $(call BuildImage)) diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk index f5313429af..e58a3c42b9 100644 --- a/target/linux/mvebu/image/cortex-a53.mk +++ b/target/linux/mvebu/image/cortex-a53.mk @@ -1,5 +1,3 @@ -ifeq ($(SUBTARGET),cortexa53) - define Device/globalscale_espressobin $(call Device/Default-arm64) DEVICE_VENDOR := Marvell @@ -73,5 +71,3 @@ define Device/methode_udpu BOOT_SCRIPT := udpu endef TARGET_DEVICES += methode_udpu - -endif diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk index 5e619804e8..6abee2d8b9 100644 --- a/target/linux/mvebu/image/cortex-a72.mk +++ b/target/linux/mvebu/image/cortex-a72.mk @@ -1,5 +1,3 @@ -ifeq ($(SUBTARGET),cortexa72) - define Device/marvell_macchiatobin $(call Device/Default-arm64) DEVICE_VENDOR := SolidRun @@ -29,5 +27,3 @@ define Device/marvell_armada7040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata endef TARGET_DEVICES += marvell_armada7040-db - -endif diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index c2ada75c2d..389082e426 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -6,8 +6,6 @@ # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa9) - define Device/linksys $(Device/NAND-128K) DEVICE_VENDOR := Linksys @@ -218,5 +216,3 @@ define Device/cznic_turris-omnia SUPPORTED_DEVICES += armada-385-turris-omnia endef TARGET_DEVICES += cznic_turris-omnia - -endif From e93626f1f47ec6c1995067c9ed3798ebd468cda3 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:21:12 +0100 Subject: [PATCH 395/480] mvebu: use SOC to derive DEVICE_DTS This introduces the SOC variable to mvebu target to derive some of the DEVICE_DTS variables based on the SOC prefix and the device definition name. Since DTS names and compatible are inconsistent also in the kernel for this target, the scheme cannot be applied to all devices, though. Signed-off-by: Adrian Schmutzler Acked-by: Tomasz Maciej Nowak --- target/linux/mvebu/image/Makefile | 1 + target/linux/mvebu/image/cortex-a53.mk | 8 ++++---- target/linux/mvebu/image/cortex-a9.mk | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 6dd7bde7ae..c08b113b36 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -77,6 +77,7 @@ endef define Device/Default PROFILES := Default + DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) BOARD_NAME = $$(DEVICE_DTS) KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk index e58a3c42b9..73bd61f22e 100644 --- a/target/linux/mvebu/image/cortex-a53.mk +++ b/target/linux/mvebu/image/cortex-a53.mk @@ -6,7 +6,7 @@ define Device/globalscale_espressobin DEVICE_ALT0_VENDOR := Marvell DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_VARIANT := Non-eMMC - DEVICE_DTS := armada-3720-espressobin + SOC := armada-3720 endef TARGET_DEVICES += globalscale_espressobin @@ -18,7 +18,7 @@ define Device/globalscale_espressobin-emmc DEVICE_ALT0_VENDOR := Marvell DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_VARIANT := eMMC - DEVICE_DTS := armada-3720-espressobin-emmc + SOC := armada-3720 endef TARGET_DEVICES += globalscale_espressobin-emmc @@ -30,7 +30,7 @@ define Device/globalscale_espressobin-v7 DEVICE_ALT0_VENDOR := Marvell DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_VARIANT := V7 Non-eMMC - DEVICE_DTS := armada-3720-espressobin-v7 + SOC := armada-3720 endef TARGET_DEVICES += globalscale_espressobin-v7 @@ -42,7 +42,7 @@ define Device/globalscale_espressobin-v7-emmc DEVICE_ALT0_VENDOR := Marvell DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_VARIANT := V7 eMMC - DEVICE_DTS := armada-3720-espressobin-v7-emmc + SOC := armada-3720 endef TARGET_DEVICES += globalscale_espressobin-v7-emmc diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index 389082e426..79253049c7 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -93,7 +93,7 @@ define Device/plathome_openblocks-ax3-4 DEVICE_VENDOR := Plat'Home DEVICE_MODEL := OpenBlocks AX3 DEVICE_VARIANT := 4 ports - DEVICE_DTS := armada-xp-openblocks-ax3-4 + SOC := armada-xp SUPPORTED_DEVICES += openblocks-ax3-4 BLOCKSIZE := 128k PAGESIZE := 1 @@ -193,7 +193,7 @@ define Device/globalscale_mirabox $(Device/NAND-512K) DEVICE_VENDOR := Globalscale DEVICE_MODEL := Mirabox - DEVICE_DTS := armada-370-mirabox + SOC := armada-370 SUPPORTED_DEVICES += mirabox endef TARGET_DEVICES += globalscale_mirabox @@ -212,7 +212,7 @@ define Device/cznic_turris-omnia IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-img | sdcard-img | gzip | append-metadata IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip IMAGE_NAME = $$(2) - DEVICE_DTS := armada-385-turris-omnia + SOC := armada-385 SUPPORTED_DEVICES += armada-385-turris-omnia endef TARGET_DEVICES += cznic_turris-omnia From 1fa04b5d9fb1cba56a8597d6da9e1d52b8030f6b Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:21:13 +0100 Subject: [PATCH 396/480] mvebu: split base-files across subtargets For the mvebu target in particular, there is a lot of files in base-files that are only relevant for one subtarget. Improve overview and reduce size per subtarget by moving/splitting base-files depending on the subtarget they belong to. While at it, consolidate 01_leds by using the model part of the board name as variable. Signed-off-by: Adrian Schmutzler Acked-by: Tomasz Maciej Nowak --- .../mvebu/base-files/etc/board.d/01_leds | 55 ----------------- .../mvebu/base-files/lib/upgrade/platform.sh | 52 ---------------- .../base-files/etc/board.d/02_network | 31 ++++++++++ .../base-files/lib/preinit/82_uDPU | 0 .../base-files/lib/upgrade/platform.sh | 52 ++++++++++++++++ .../base-files/lib/upgrade/uDPU.sh | 0 .../base-files/etc/board.d/02_network | 30 ++++++++++ .../base-files/lib/upgrade/platform.sh | 37 ++++++++++++ .../cortexa9/base-files/etc/board.d/01_leds | 40 +++++++++++++ .../base-files/etc/board.d/02_network | 24 +------- .../base-files/etc/init.d/bootcount | 0 .../base-files/etc/uci-defaults/03_wireless | 0 .../base-files/etc/uci-defaults/04_mambafan | 0 .../base-files/lib/preinit/06_set_iface_mac | 0 .../base-files/lib/preinit/81_linksys_syscfg | 0 .../base-files/lib/upgrade/linksys.sh | 0 .../base-files/lib/upgrade/platform.sh | 59 +++++++++++++++++++ 17 files changed, 251 insertions(+), 129 deletions(-) delete mode 100755 target/linux/mvebu/base-files/etc/board.d/01_leds delete mode 100755 target/linux/mvebu/base-files/lib/upgrade/platform.sh create mode 100755 target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network rename target/linux/mvebu/{ => cortexa53}/base-files/lib/preinit/82_uDPU (100%) create mode 100755 target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh rename target/linux/mvebu/{ => cortexa53}/base-files/lib/upgrade/uDPU.sh (100%) create mode 100755 target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network create mode 100755 target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh create mode 100755 target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds rename target/linux/mvebu/{ => cortexa9}/base-files/etc/board.d/02_network (66%) rename target/linux/mvebu/{ => cortexa9}/base-files/etc/init.d/bootcount (100%) rename target/linux/mvebu/{ => cortexa9}/base-files/etc/uci-defaults/03_wireless (100%) rename target/linux/mvebu/{ => cortexa9}/base-files/etc/uci-defaults/04_mambafan (100%) rename target/linux/mvebu/{ => cortexa9}/base-files/lib/preinit/06_set_iface_mac (100%) rename target/linux/mvebu/{ => cortexa9}/base-files/lib/preinit/81_linksys_syscfg (100%) rename target/linux/mvebu/{ => cortexa9}/base-files/lib/upgrade/linksys.sh (100%) create mode 100755 target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds deleted file mode 100755 index 14313ee664..0000000000 --- a/target/linux/mvebu/base-files/etc/board.d/01_leds +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014-2016 OpenWrt.org -# Copyright (C) 2016 LEDE-Project.org -# - -. /lib/functions/uci-defaults.sh - -board_config_update - -board=$(board_name) - -case "$board" in -linksys,caiman) - ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "eth1" - ucidef_set_led_usbport "usb1" "USB 1" "pca963x:caiman:white:usb2" "usb1-port1" - ucidef_set_led_usbport "usb2" "USB 2" "pca963x:caiman:white:usb3_1" "usb2-port1" "usb3-port1" - ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:caiman:white:usb3_2" "usb3-port1" - ;; -linksys,cobra) - ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "eth1" - ucidef_set_led_usbport "usb1" "USB 1" "pca963x:cobra:white:usb2" "usb1-port1" - ucidef_set_led_usbport "usb2" "USB 2" "pca963x:cobra:white:usb3_1" "usb2-port1" "usb3-port1" - ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:cobra:white:usb3_2" "usb3-port1" - ;; -linksys,mamba) - ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1" - ucidef_set_led_usbport "usb1" "USB 1" "mamba:white:usb2" "usb1-port1" - ucidef_set_led_usbport "usb2" "USB 2" "mamba:white:usb3_1" "usb2-port1" "usb3-port1" - ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "mamba:white:usb3_2" "usb3-port2" - ;; -linksys,rango) - ucidef_set_led_netdev "wan" "WAN" "pca963x:rango:white:wan" "eth1" - ucidef_set_led_usbport "usb1" "USB 1" "pca963x:rango:white:usb2" "usb1-port1" - ucidef_set_led_usbport "usb2" "USB 2" "pca963x:rango:white:usb3_1" "usb2-port1" "usb3-port1" - ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:rango:white:usb3_2" "usb3-port1" - ;; -linksys,shelby) - ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "eth1" - ucidef_set_led_usbport "usb1" "USB 1" "pca963x:shelby:white:usb2" "usb1-port1" - ucidef_set_led_usbport "usb2" "USB 2" "pca963x:shelby:white:usb3_1" "usb2-port1" "usb3-port1" - ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:shelby:white:usb3_2" "usb3-port1" - ;; -linksys,venom) - ucidef_set_led_netdev "wan" "WAN" "pca963x:venom:blue:wan" "eth1" - ucidef_set_led_usbport "usb1" "USB 1" "pca963x:venom:blue:usb2" "usb1-port1" - ucidef_set_led_usbport "usb2" "USB 2" "pca963x:venom:blue:usb3_1" "usb2-port1" "usb3-port1" - ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:venom:blue:usb3_2" "usb3-port1" - ;; - -esac - -board_config_flush - -exit 0 diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh deleted file mode 100755 index 0223b72d71..0000000000 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2014-2016 OpenWrt.org -# Copyright (C) 2016 LEDE-Project.org -# - -RAMFS_COPY_BIN='fw_printenv fw_setenv' -RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock' -REQUIRE_IMAGE_METADATA=1 - -platform_check_image() { - case "$(board_name)" in - cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ - marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) - platform_check_image_sdcard "$1" - ;; - *) - return 0 - ;; - esac -} - -platform_do_upgrade() { - case "$(board_name)" in - linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) - platform_do_upgrade_linksys "$1" - ;; - cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ - marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) - platform_do_upgrade_sdcard "$1" - ;; - methode,udpu) - platform_do_upgrade_uDPU "$1" - ;; - *) - default_do_upgrade "$1" - ;; - esac -} -platform_copy_config() { - case "$(board_name)" in - linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) - platform_copy_config_linksys - ;; - cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ - marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) - platform_copy_config_sdcard - ;; - methode,udpu) - platform_copy_config_uDPU - ;; - esac -} diff --git a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..ba4b930426 --- /dev/null +++ b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Copyright (C) 2014-2016 OpenWrt.org +# Copyright (C) 2016 LEDE-Project.org +# + +. /lib/functions/uci-defaults.sh + +board_config_update + +board=$(board_name) + +case "$board" in +globalscale,espressobin|\ +globalscale,espressobin-emmc|\ +globalscale,espressobin-v7|\ +globalscale,espressobin-v7-emmc) + ucidef_set_interfaces_lan_wan "lan0 lan1" "wan" + ;; +marvell,armada-3720-db|\ +methode,udpu) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; +*) + ucidef_set_interface_lan "eth0" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/mvebu/base-files/lib/preinit/82_uDPU b/target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU similarity index 100% rename from target/linux/mvebu/base-files/lib/preinit/82_uDPU rename to target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU diff --git a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..cdf5933272 --- /dev/null +++ b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/platform.sh @@ -0,0 +1,52 @@ +# +# Copyright (C) 2014-2016 OpenWrt.org +# Copyright (C) 2016 LEDE-Project.org +# + +RAMFS_COPY_BIN='fw_printenv fw_setenv' +RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock' +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + case "$(board_name)" in + globalscale,espressobin|\ + globalscale,espressobin-emmc|\ + globalscale,espressobin-v7|\ + globalscale,espressobin-v7-emmc) + platform_check_image_sdcard "$1" + ;; + *) + return 0 + ;; + esac +} + +platform_do_upgrade() { + case "$(board_name)" in + globalscale,espressobin|\ + globalscale,espressobin-emmc|\ + globalscale,espressobin-v7|\ + globalscale,espressobin-v7-emmc) + platform_do_upgrade_sdcard "$1" + ;; + methode,udpu) + platform_do_upgrade_uDPU "$1" + ;; + *) + default_do_upgrade "$1" + ;; + esac +} +platform_copy_config() { + case "$(board_name)" in + globalscale,espressobin|\ + globalscale,espressobin-emmc|\ + globalscale,espressobin-v7|\ + globalscale,espressobin-v7-emmc) + platform_copy_config_sdcard + ;; + methode,udpu) + platform_copy_config_uDPU + ;; + esac +} diff --git a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh similarity index 100% rename from target/linux/mvebu/base-files/lib/upgrade/uDPU.sh rename to target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..080e32ada3 --- /dev/null +++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2014-2016 OpenWrt.org +# Copyright (C) 2016 LEDE-Project.org +# + +. /lib/functions/uci-defaults.sh + +board_config_update + +board=$(board_name) + +case "$board" in +marvell,armada8040-mcbin) + ucidef_set_interfaces_lan_wan "eth0 eth1 eth3" "eth2" + ;; +marvell,armada8040-db) + ucidef_set_interfaces_lan_wan "eth0 eth2 eth3" "eth1" + ;; +marvell,armada7040-db) + ucidef_set_interfaces_lan_wan "eth0 eth2" "eth1" + ;; +*) + ucidef_set_interface_lan "eth0" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..2428de08c4 --- /dev/null +++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh @@ -0,0 +1,37 @@ +# +# Copyright (C) 2014-2016 OpenWrt.org +# Copyright (C) 2016 LEDE-Project.org +# + +RAMFS_COPY_BIN='fw_printenv fw_setenv' +RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock' +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + case "$(board_name)" in + marvell,armada8040-mcbin) + platform_check_image_sdcard "$1" + ;; + *) + return 0 + ;; + esac +} + +platform_do_upgrade() { + case "$(board_name)" in + marvell,armada8040-mcbin) + platform_do_upgrade_sdcard "$1" + ;; + *) + default_do_upgrade "$1" + ;; + esac +} +platform_copy_config() { + case "$(board_name)" in + marvell,armada8040-mcbin) + platform_copy_config_sdcard + ;; + esac +} diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..a7762f0080 --- /dev/null +++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Copyright (C) 2014-2016 OpenWrt.org +# Copyright (C) 2016 LEDE-Project.org +# + +. /lib/functions/uci-defaults.sh + +board_config_update + +board=$(board_name) +boardname="${board##*,}" + +case "$board" in +linksys,caiman|\ +linksys,cobra|\ +linksys,rango|\ +linksys,shelby) + ucidef_set_led_netdev "wan" "WAN" "pca963x:$boardname:white:wan" "eth1" + ucidef_set_led_usbport "usb1" "USB 1" "pca963x:$boardname:white:usb2" "usb1-port1" + ucidef_set_led_usbport "usb2" "USB 2" "pca963x:$boardname:white:usb3_1" "usb2-port1" "usb3-port1" + ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:$boardname:white:usb3_2" "usb3-port1" + ;; +linksys,mamba) + ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1" + ucidef_set_led_usbport "usb1" "USB 1" "mamba:white:usb2" "usb1-port1" + ucidef_set_led_usbport "usb2" "USB 2" "mamba:white:usb3_1" "usb2-port1" "usb3-port1" + ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "mamba:white:usb3_2" "usb3-port2" + ;; +linksys,venom) + ucidef_set_led_netdev "wan" "WAN" "pca963x:venom:blue:wan" "eth1" + ucidef_set_led_usbport "usb1" "USB 1" "pca963x:venom:blue:usb2" "usb1-port1" + ucidef_set_led_usbport "usb2" "USB 2" "pca963x:venom:blue:usb3_1" "usb2-port1" "usb3-port1" + ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:venom:blue:usb3_2" "usb3-port1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network similarity index 66% rename from target/linux/mvebu/base-files/etc/board.d/02_network rename to target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network index 283a856258..b10e1419b5 100755 --- a/target/linux/mvebu/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network @@ -15,12 +15,6 @@ cznic,turris-omnia) ucidef_set_interface_lan "lan0 lan1 lan2 lan3 lan4" ucidef_set_interface_wan "eth2" ;; -globalscale,espressobin|\ -globalscale,espressobin-emmc|\ -globalscale,espressobin-v7|\ -globalscale,espressobin-v7-emmc) - ucidef_set_interfaces_lan_wan "lan0 lan1" "wan" - ;; linksys,caiman|\ linksys,cobra|\ linksys,mamba|\ @@ -34,25 +28,11 @@ linksys,venom) marvell,a385-db-ap) ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2" ;; -marvell,armada8040-mcbin) - ucidef_set_interfaces_lan_wan "eth0 eth1 eth3" "eth2" - ;; -marvell,armada8040-db) - ucidef_set_interfaces_lan_wan "eth0 eth2 eth3" "eth1" - ;; -marvell,armada7040-db) - ucidef_set_interfaces_lan_wan "eth0 eth2" "eth1" - ;; -marvell,armada-3720-db) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; marvell,axp-gp) ucidef_set_interface_lan "eth0 eth1 eth2 eth3" ;; -methode,udpu) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; -solidrun,clearfog-a1|solidrun,clearfog-pro-a1) +solidrun,clearfog-a1|\ +solidrun,clearfog-pro-a1) # eth0 is standalone ethernet # eth1 is switch # eth2 is SFP diff --git a/target/linux/mvebu/base-files/etc/init.d/bootcount b/target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount similarity index 100% rename from target/linux/mvebu/base-files/etc/init.d/bootcount rename to target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless b/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/03_wireless similarity index 100% rename from target/linux/mvebu/base-files/etc/uci-defaults/03_wireless rename to target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/03_wireless diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan b/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/04_mambafan similarity index 100% rename from target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan rename to target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/04_mambafan diff --git a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac b/target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac similarity index 100% rename from target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac rename to target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac diff --git a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg similarity index 100% rename from target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg rename to target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh similarity index 100% rename from target/linux/mvebu/base-files/lib/upgrade/linksys.sh rename to target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..8baed969a3 --- /dev/null +++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh @@ -0,0 +1,59 @@ +# +# Copyright (C) 2014-2016 OpenWrt.org +# Copyright (C) 2016 LEDE-Project.org +# + +RAMFS_COPY_BIN='fw_printenv fw_setenv' +RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock' +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + case "$(board_name)" in + cznic,turris-omnia|\ + solidrun,clearfog-base-a1|\ + solidrun,clearfog-pro-a1) + platform_check_image_sdcard "$1" + ;; + *) + return 0 + ;; + esac +} + +platform_do_upgrade() { + case "$(board_name)" in + cznic,turris-omnia|\ + solidrun,clearfog-base-a1|\ + solidrun,clearfog-pro-a1) + platform_do_upgrade_sdcard "$1" + ;; + linksys,caiman|\ + linksys,cobra|\ + linksys,mamba|\ + linksys,rango|\ + linksys,shelby|\ + linksys,venom) + platform_do_upgrade_linksys "$1" + ;; + *) + default_do_upgrade "$1" + ;; + esac +} +platform_copy_config() { + case "$(board_name)" in + cznic,turris-omnia|\ + solidrun,clearfog-base-a1|\ + solidrun,clearfog-pro-a1) + platform_copy_config_sdcard + ;; + linksys,caiman|\ + linksys,cobra|\ + linksys,mamba|\ + linksys,rango|\ + linksys,shelby|\ + linksys,venom) + platform_copy_config_linksys + ;; + esac +} From 2cb413de1c97777e4375eace8c863f91b2c0452d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:21:14 +0100 Subject: [PATCH 397/480] zynq: derive DEVICE_DTS from device definition name In zynq target, the DEVICE_DTS variable is always set consistent with the model part of the device definition name. This patch replaces the redundant definitions for the individual devices with a common recipe. Signed-off-by: Adrian Schmutzler --- target/linux/zynq/image/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile index 39305a6d54..7cec38ca68 100644 --- a/target/linux/zynq/image/Makefile +++ b/target/linux/zynq/image/Makefile @@ -31,6 +31,7 @@ endef define Device/Default PROFILES := Default + DEVICE_DTS := $(lastword $(subst _, ,$(1))) KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs KERNEL_PREFIX := $$(IMAGE_PREFIX) @@ -53,7 +54,6 @@ define Device/avnet_zynq-zed $(call Device/FitImageGzip) DEVICE_VENDOR := Avnet DEVICE_MODEL := ZedBoard - DEVICE_DTS := zynq-zed endef TARGET_DEVICES += avnet_zynq-zed @@ -61,7 +61,6 @@ define Device/digilent_zynq-zybo $(call Device/FitImageGzip) DEVICE_VENDOR := Digilent DEVICE_MODEL := Zybo - DEVICE_DTS := zynq-zybo endef TARGET_DEVICES += digilent_zynq-zybo @@ -69,7 +68,6 @@ define Device/digilent_zynq-zybo-z7 $(call Device/FitImageGzip) DEVICE_VENDOR := Digilent DEVICE_MODEL := Zybo Z7 - DEVICE_DTS := zynq-zybo-z7 endef TARGET_DEVICES += digilent_zynq-zybo-z7 @@ -77,7 +75,6 @@ define Device/xlnx_zynq-zc702 $(call Device/FitImageGzip) DEVICE_VENDOR := Xilinx DEVICE_MODEL := ZC702 - DEVICE_DTS := zynq-zc702 DEVICE_PACKAGES:=kmod-can kmod-can-xilinx-can endef TARGET_DEVICES += xlnx_zynq-zc702 From 3d8edd9bb4759f56df4482b3ed9c7fc26ed86028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 21 Jan 2020 17:03:21 +0100 Subject: [PATCH 398/480] urngd: update to version 2020-01-21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit c7f7b6b65b82 Tag version 1.0.2 236b7a0aef21 Fix blocked entropy generation Signed-off-by: Petr Štetiar --- package/system/urngd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/urngd/Makefile b/package/system/urngd/Makefile index fff689e85f..9e26f222b6 100644 --- a/package/system/urngd/Makefile +++ b/package/system/urngd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/urngd.git -PKG_SOURCE_DATE:=2019-10-21 -PKG_SOURCE_VERSION:=40f939d57c67bbe2987a863500cca02e91d34b90 -PKG_MIRROR_HASH:=52efcc11a099fc2c11a88e45e71c751b307741bf30e5d80f56ae662cd886a7ff +PKG_SOURCE_DATE:=2020-01-21 +PKG_SOURCE_VERSION:=c7f7b6b65b82eda4675b42d8cd28d76ea7aebf1a +PKG_MIRROR_HASH:=2d31025b79fe130c579d6c3f4bf4dc12abc43a7319b20a5cdca24ae363ec70f3 PKG_LICENSE:=GPL-2.0 BSD-3-Clause PKG_LICENSE_FILES:= From 0f81a0979c5515d4204437d4f0c753196f29df92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 21 Jan 2020 17:14:57 +0100 Subject: [PATCH 399/480] fstools: update to version 2020-01-21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit deb745f82b93 Revert "fstools: Add support to read-only MTD partitions (eg. recovery images)" Signed-off-by: Petr Štetiar --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 85a7e77d9c..df4d2601ba 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=f45915cbc83c0a2358359be0968dc42effb40aa3cfd1129abb1a81977f74e141 -PKG_SOURCE_DATE:=2020-01-18 -PKG_SOURCE_VERSION:=f5c7c1813f52e6d7b59ecfb2f9f95e69b05b1980 +PKG_MIRROR_HASH:=c8d9b32d7f860ff558c1c2658da35e0523bbc54d5b96068b04b9562ae8644682 +PKG_SOURCE_DATE:=2020-01-21 +PKG_SOURCE_VERSION:=deb745f82b93b3bd12273cfb16deb7417fc555ef CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 0c707d37b7f767daca655e02558299fe100fd3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 21 Jan 2020 17:05:19 +0100 Subject: [PATCH 400/480] Revert "kernel: mtd: Make subpartitions inherit parent's access mode" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit de80424f706682e8bba27c60bcd2a9c1b4a5e875 which needs more work and testing as it broke at least jffs2 overlays at least on ath79 platform, marking them as read-only, thus unusable: jffs2_build_filesystem(): erasing all blocks after the end marker... jffs2: Erase at 0x009e0000 failed immediately: -EROFS. Is the sector locked? Ref: http://lists.infradead.org/pipermail/openwrt-devel/2020-January/021344.html Reported-by: Steve Brown Signed-off-by: Petr Štetiar --- ...inherit-parent-partition-access-mode.patch | 60 ------------------- ...inherit-parent-partition-access-mode.patch | 60 ------------------- 2 files changed, 120 deletions(-) delete mode 100644 target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch delete mode 100644 target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch diff --git a/target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch b/target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch deleted file mode 100644 index dbbe68ff4a..0000000000 --- a/target/linux/generic/hack-4.14/401-inherit-parent-partition-access-mode.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/drivers/mtd/mtdchar.c -+++ b/drivers/mtd/mtdchar.c -@@ -595,7 +595,10 @@ - /* Sanitize user input */ - p.devname[BLKPG_DEVNAMELTH - 1] = '\0'; - -- return mtd_add_partition(mtd, p.devname, p.start, p.length); -+ /* No mtd flags masking required */ -+ uint32_t mask_flags = 0; -+ -+ return mtd_add_partition(mtd, p.devname, p.start, p.length, mask_flags); - - case BLKPG_DEL_PARTITION: - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -726,7 +726,7 @@ - } - - int mtd_add_partition(struct mtd_info *parent, const char *name, -- long long offset, long long length) -+ long long offset, long long length, uint32_t mask_flags) - { - struct mtd_partition part; - struct mtd_part *new; -@@ -747,6 +747,7 @@ - part.name = name; - part.size = length; - part.offset = offset; -+ part.mask_flags = mask_flags; - - new = allocate_partition(parent, &part, -1, offset); - if (IS_ERR(new)) -@@ -855,10 +856,14 @@ - /* adjust partition offsets */ - parts[i].offset += slave->offset; - -+ /* adjust partition mask */ -+ parts[i].mask_flags = !(slave->mtd.flags & MTD_WRITEABLE) ? MTD_WRITEABLE : 0; -+ - mtd_add_partition(slave->parent, - parts[i].name, - parts[i].offset, -- parts[i].size); -+ parts[i].size, -+ parts[i].mask_flags); - } - - kfree(parts); ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -114,7 +114,7 @@ - - int mtd_is_partition(const struct mtd_info *mtd); - int mtd_add_partition(struct mtd_info *master, const char *name, -- long long offset, long long length); -+ long long offset, long long length, uint32_t mask_flags); - int mtd_del_partition(struct mtd_info *master, int partno); - struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); - uint64_t mtdpart_get_offset(const struct mtd_info *mtd); diff --git a/target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch b/target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch deleted file mode 100644 index 61dd0369a6..0000000000 --- a/target/linux/generic/hack-4.19/401-inherit-parent-partition-access-mode.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/drivers/mtd/mtdchar.c -+++ b/drivers/mtd/mtdchar.c -@@ -583,7 +583,10 @@ - /* Sanitize user input */ - p.devname[BLKPG_DEVNAMELTH - 1] = '\0'; - -- return mtd_add_partition(mtd, p.devname, p.start, p.length); -+ /* No mtd flags masking required */ -+ uint32_t mask_flags = 0; -+ -+ return mtd_add_partition(mtd, p.devname, p.start, p.length, mask_flags); - - case BLKPG_DEL_PARTITION: - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -679,7 +679,7 @@ - } - - int mtd_add_partition(struct mtd_info *parent, const char *name, -- long long offset, long long length) -+ long long offset, long long length, uint32_t mask_flags) - { - struct mtd_partition part; - struct mtd_part *new; -@@ -700,6 +700,7 @@ - part.name = name; - part.size = length; - part.offset = offset; -+ part.mask_flags = mask_flags; - - new = allocate_partition(parent, &part, -1, offset); - if (IS_ERR(new)) -@@ -808,10 +809,14 @@ - /* adjust partition offsets */ - parts[i].offset += slave->offset; - -+ /* adjust partition mask */ -+ parts[i].mask_flags = !(slave->mtd.flags & MTD_WRITEABLE) ? MTD_WRITEABLE : 0; -+ - mtd_add_partition(slave->parent, - parts[i].name, - parts[i].offset, -- parts[i].size); -+ parts[i].size, -+ parts[i].mask_flags); - } - - kfree(parts); ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -114,7 +114,7 @@ - - int mtd_is_partition(const struct mtd_info *mtd); - int mtd_add_partition(struct mtd_info *master, const char *name, -- long long offset, long long length); -+ long long offset, long long length, uint32_t mask_flags); - int mtd_del_partition(struct mtd_info *master, int partno); - struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); - uint64_t mtdpart_get_offset(const struct mtd_info *mtd); From 111a7a3d01c26b38b083b80d4c394553c8658fe9 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 21 Jan 2020 18:00:31 +0100 Subject: [PATCH 401/480] ath79: remove usused TPLINK_BOARD_NAME variable for DEVICE_VARS TPLINK_BOARD_NAME has been renamed to TPLINK_BOARD_ID a long time ago (7d6c63d87542: "build: rename TPLINK_BOARD_NAME to TPLINK_BOARD_ID" for ar71xx), and before introducing ath79 target at all. TPLINK_BOARD_NAME seems to have been introduced into ath79 target only by mistake. It has never been used. Remove it. Fixes: 53c474abbdfe ("ath79: add new OF only target for QCA MIPS silicon") Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/common-tp-link.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index fa396bbb42..8aa6a5a2be 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -1,5 +1,5 @@ DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION -DEVICE_VARS += TPLINK_BOARD_NAME TPLINK_BOARD_ID +DEVICE_VARS += TPLINK_BOARD_ID define Build/uImageArcher mkimage -A $(LINUX_KARCH) \ From 96e9d48664786d7cb5171fa34f63d8974868c23a Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 18 Jan 2020 20:56:33 +0200 Subject: [PATCH 402/480] tools/bison: update to 3.5 Update bison to 3.5 Release notes: https://lists.gnu.org/archive/html/info-gnu/2019-12/msg00002.html Note for future: release notes mention that YYPRINT macro is declared deprecated, but apparently still works for now. I found one possible use of that in scripts/config/zconf.tab.c_shipped That might be modernized at some point, but as the file is synced with the one from upstream Linux, it might get fixed there. Signed-off-by: Hannu Nyman --- tools/bison/Makefile | 4 ++-- tools/bison/patches/100-fix-gets-removal.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bison/Makefile b/tools/bison/Makefile index 45255da4fb..4028c80445 100644 --- a/tools/bison/Makefile +++ b/tools/bison/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bison -PKG_VERSION:=3.4.1 +PKG_VERSION:=3.5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d +PKG_HASH:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641 HOST_BUILD_PARALLEL:=1 diff --git a/tools/bison/patches/100-fix-gets-removal.patch b/tools/bison/patches/100-fix-gets-removal.patch index 8650b8226f..e671113b2c 100644 --- a/tools/bison/patches/100-fix-gets-removal.patch +++ b/tools/bison/patches/100-fix-gets-removal.patch @@ -1,6 +1,6 @@ --- a/lib/stdio.in.h +++ b/lib/stdio.in.h -@@ -746,14 +746,6 @@ _GL_WARN_ON_USE (getline, "getline is un +@@ -778,14 +778,6 @@ _GL_WARN_ON_USE (getline, "getline is un # endif #endif From 2982997f1b4e29af86c9041cf391ed5e21d12f55 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Fri, 10 Jan 2020 16:42:33 +0100 Subject: [PATCH 403/480] curl: update to version 7.68.0 (security fix) Fixes CVE-2019-15601 Signed-off-by: Jan Pavlinec --- package/network/utils/curl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 8ccfaedc46..3dc295a222 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.67.0 -PKG_RELEASE:=2 +PKG_VERSION:=7.68.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ https://curl.mirror.anstey.ca/ \ https://curl.askapache.com/download/ \ https://curl.haxx.se/download/ -PKG_HASH:=f5d2e7320379338c3952dcc7566a140abb49edb575f9f99272455785c40e536c +PKG_HASH:=b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING From e81a5b055658c599c37a07c3e83a7b08df81dd31 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Nov 2019 11:45:15 +0000 Subject: [PATCH 404/480] kernel: remove obsolete phylink/SFP patches Remove the old phylink/SFP patches from the OpenWRT build; these will be updated with a new set in subsequent. 450-reprobe_sfp_phy is also removed for several reasons: 1) it is not in mainline. 2) it breaks copper modules that do not have a PHY. 3) it makes backporting the current patch set harder. Discussion is ongoing with the patch author for a mainline Linux kernel patch for this. Signed-off-by: Russell King --- ...etdev-sfp_bus-and-use-for-start-stop.patch | 39 --- ...5-net-phy-marvell10g-add-SFP-support.patch | 155 --------- .../406-sfp-add-sfp-compatible.patch | 24 -- ...7-sfp-display-SFP-module-information.patch | 297 ------------------ .../408-sfp-more-cotsworks-fixes.patch | 44 --- .../patches-4.19/450-reprobe_sfp_phy.patch | 94 ------ 6 files changed, 653 deletions(-) delete mode 100644 target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch delete mode 100644 target/linux/mvebu/patches-4.19/405-net-phy-marvell10g-add-SFP-support.patch delete mode 100644 target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch delete mode 100644 target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch delete mode 100644 target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch delete mode 100644 target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch diff --git a/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch b/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch deleted file mode 100644 index f2581ca6b7..0000000000 --- a/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0068a89747e7c1d9a0bbb7282a34382a4274638a Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Fri, 14 Apr 2017 16:41:55 +0100 -Subject: [PATCH] sfp: provide netdev sfp_bus and use for start/stop - -Add a netdev sfp_bus pointer for propagating the phylink start/stop -actions to the SFP cage: the SFP cage may not be directly connected to -phylink, but may be the other side of a fixed PHY, and SFP needs to -know when the netdev is brought up or taken down. - -Signed-off-by: Russell King ---- - drivers/net/phy/phylink.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/net/phy/phylink.c -+++ b/drivers/net/phy/phylink.c -@@ -949,8 +949,8 @@ void phylink_start(struct phylink *pl) - - if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) - mod_timer(&pl->link_poll, jiffies + HZ); -- if (pl->sfp_bus) -- sfp_upstream_start(pl->sfp_bus); -+ if (pl->netdev->sfp_bus) -+ sfp_upstream_start(pl->netdev->sfp_bus); - if (pl->phydev) - phy_start(pl->phydev); - } -@@ -971,8 +971,8 @@ void phylink_stop(struct phylink *pl) - - if (pl->phydev) - phy_stop(pl->phydev); -- if (pl->sfp_bus) -- sfp_upstream_stop(pl->sfp_bus); -+ if (pl->netdev->sfp_bus) -+ sfp_upstream_stop(pl->netdev->sfp_bus); - if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) - del_timer_sync(&pl->link_poll); - diff --git a/target/linux/mvebu/patches-4.19/405-net-phy-marvell10g-add-SFP-support.patch b/target/linux/mvebu/patches-4.19/405-net-phy-marvell10g-add-SFP-support.patch deleted file mode 100644 index 9624b6cd81..0000000000 --- a/target/linux/mvebu/patches-4.19/405-net-phy-marvell10g-add-SFP-support.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 5f3ac54810055fec0cc667bb04c16f783830abff Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Fri, 14 Apr 2017 14:21:25 +0100 -Subject: [PATCH] net: phy: marvell10g: add SFP+ support - -Add support for SFP+ cages to the Marvell 10G PHY driver. This is -slightly complicated by the way phylib works in that we need to use -a multi-step process to attach the SFP bus, and we also need to track -the phylink state machine to know when the module's transmit disable -signal should change state. - -With appropriate DT changes, this allows the SFP+ canges on the -Macchiatobin platform to be functional. - -Signed-off-by: Russell King ---- - drivers/net/phy/marvell10g.c | 80 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 80 insertions(+) - ---- a/drivers/net/phy/marvell10g.c -+++ b/drivers/net/phy/marvell10g.c -@@ -25,6 +25,8 @@ - #include - #include - #include -+#include -+#include - - enum { - MV_PMA_BOOT = 0xc050, -@@ -56,6 +58,11 @@ enum { - }; - - struct mv3310_priv { -+ struct fwnode_handle *sfp_fwnode; -+ struct sfp_bus *sfp_bus; -+ enum phy_state state; -+ bool running; -+ - struct device *hwmon_dev; - char *hwmon_name; - }; -@@ -219,6 +226,27 @@ static int mv3310_hwmon_probe(struct phy - } - #endif - -+static int mv3310_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) -+{ -+ struct phy_device *phydev = upstream; -+ struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev); -+ __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; -+ phy_interface_t iface; -+ -+ sfp_parse_support(priv->sfp_bus, id, support); -+ iface = sfp_select_interface(priv->sfp_bus, id, support); -+ -+ if (iface != PHY_INTERFACE_MODE_10GKR) { -+ dev_err(&phydev->mdio.dev, "incompatible SFP module inserted\n"); -+ return -EINVAL; -+ } -+ return 0; -+} -+ -+static const struct sfp_upstream_ops mv3310_sfp_ops = { -+ .module_insert = mv3310_sfp_insert, -+}; -+ - static int mv3310_probe(struct phy_device *phydev) - { - struct mv3310_priv *priv; -@@ -249,9 +277,30 @@ static int mv3310_probe(struct phy_devic - if (ret) - return ret; - -+ if (phydev->mdio.dev.fwnode) { -+ struct fwnode_reference_args ref; -+ int ret; -+ -+ ret = fwnode_property_get_reference_args(phydev->mdio.dev.fwnode, -+ "sfp", NULL, 0, 0, -+ &ref); -+ if (ret == 0) -+ priv->sfp_fwnode = ref.fwnode; -+ } -+ - return 0; - } - -+static void mv3310_remove(struct phy_device *phydev) -+{ -+ struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev); -+ -+ if (priv->sfp_bus) -+ sfp_unregister_upstream(priv->sfp_bus); -+ -+ fwnode_handle_put(priv->sfp_fwnode); -+} -+ - static int mv3310_suspend(struct phy_device *phydev) - { - return 0; -@@ -262,8 +311,29 @@ static int mv3310_resume(struct phy_devi - return mv3310_hwmon_config(phydev, true); - } - -+static void mv3310_link_change_notify(struct phy_device *phydev) -+{ -+ struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev); -+ enum phy_state state = phydev->state; -+ bool running; -+ -+ if (priv->sfp_bus && priv->state != state) { -+ priv->state = state; -+ -+ running = state >= PHY_UP && state < PHY_HALTED; -+ if (priv->running != running) { -+ priv->running = running; -+ if (running) -+ sfp_upstream_start(priv->sfp_bus); -+ else -+ sfp_upstream_stop(priv->sfp_bus); -+ } -+ } -+} -+ - static int mv3310_config_init(struct phy_device *phydev) - { -+ struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev); - __ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, }; - u32 mask; - int val; -@@ -357,6 +427,14 @@ static int mv3310_config_init(struct phy - phydev->supported &= mask; - phydev->advertising &= phydev->supported; - -+ /* Would be nice to do this in the probe function, but unfortunately, -+ * phylib doesn't have phydev->attached_dev set there. -+ */ -+ if (priv->sfp_fwnode && !priv->sfp_bus) -+ priv->sfp_bus = sfp_register_upstream(priv->sfp_fwnode, -+ phydev->attached_dev, -+ phydev, &mv3310_sfp_ops); -+ - return 0; - } - -@@ -566,6 +644,8 @@ static struct phy_driver mv3310_drivers[ - .config_aneg = mv3310_config_aneg, - .aneg_done = mv3310_aneg_done, - .read_status = mv3310_read_status, -+ .remove = mv3310_remove, -+ .link_change_notify = mv3310_link_change_notify, - }, - }; - diff --git a/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch b/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch deleted file mode 100644 index 0c6cb72cb9..0000000000 --- a/target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7e8bf5227f87601d8d74948bcae8846d2bdd6995 Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Fri, 14 Apr 2017 20:17:13 +0100 -Subject: [PATCH] sfp: add sfp+ compatible - -Add a compatible for SFP+ cages. SFP+ cages are backwards compatible, -but the ethernet device behind them may not support the slower speeds -of SFP modules. - -Signed-off-by: Russell King ---- - drivers/net/phy/sfp.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -230,6 +230,7 @@ static const struct sff_data sfp_data = - static const struct of_device_id sfp_of_match[] = { - { .compatible = "sff,sff", .data = &sff_data, }, - { .compatible = "sff,sfp", .data = &sfp_data, }, -+ { .compatible = "sff,sfp+", .data = &sfp_data, }, - { }, - }; - MODULE_DEVICE_TABLE(of, sfp_of_match); diff --git a/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch b/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch deleted file mode 100644 index 854ac68769..0000000000 --- a/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch +++ /dev/null @@ -1,297 +0,0 @@ -From 4ce55fb01c473bf1ad2048f8b4db62dca392e6d2 Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Sun, 13 Sep 2015 01:06:31 +0100 -Subject: [PATCH] sfp: display SFP module information - -Signed-off-by: Russell King ---- - drivers/net/phy/sfp.c | 261 +++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 258 insertions(+), 3 deletions(-) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -1132,6 +1132,184 @@ static void sfp_hwmon_remove(struct sfp - } - #endif - -+static const char *sfp_link_len(char *buf, size_t size, unsigned int length, -+ unsigned int multiplier) -+{ -+ if (length == 0) -+ return "unsupported/unspecified"; -+ -+ if (length == 255) { -+ *buf++ = '>'; -+ size -= 1; -+ length -= 1; -+ } -+ -+ length *= multiplier; -+ -+ if (length >= 1000) -+ snprintf(buf, size, "%u.%0*ukm", -+ length / 1000, -+ multiplier > 100 ? 1 : -+ multiplier > 10 ? 2 : 3, -+ length % 1000); -+ else -+ snprintf(buf, size, "%um", length); -+ -+ return buf; -+} -+ -+struct bitfield { -+ unsigned int mask; -+ unsigned int val; -+ const char *str; -+}; -+ -+static const struct bitfield sfp_options[] = { -+ { -+ .mask = SFP_OPTIONS_HIGH_POWER_LEVEL, -+ .val = SFP_OPTIONS_HIGH_POWER_LEVEL, -+ .str = "hpl", -+ }, { -+ .mask = SFP_OPTIONS_PAGING_A2, -+ .val = SFP_OPTIONS_PAGING_A2, -+ .str = "paginga2", -+ }, { -+ .mask = SFP_OPTIONS_RETIMER, -+ .val = SFP_OPTIONS_RETIMER, -+ .str = "retimer", -+ }, { -+ .mask = SFP_OPTIONS_COOLED_XCVR, -+ .val = SFP_OPTIONS_COOLED_XCVR, -+ .str = "cooled", -+ }, { -+ .mask = SFP_OPTIONS_POWER_DECL, -+ .val = SFP_OPTIONS_POWER_DECL, -+ .str = "powerdecl", -+ }, { -+ .mask = SFP_OPTIONS_RX_LINEAR_OUT, -+ .val = SFP_OPTIONS_RX_LINEAR_OUT, -+ .str = "rxlinear", -+ }, { -+ .mask = SFP_OPTIONS_RX_DECISION_THRESH, -+ .val = SFP_OPTIONS_RX_DECISION_THRESH, -+ .str = "rxthresh", -+ }, { -+ .mask = SFP_OPTIONS_TUNABLE_TX, -+ .val = SFP_OPTIONS_TUNABLE_TX, -+ .str = "tunabletx", -+ }, { -+ .mask = SFP_OPTIONS_RATE_SELECT, -+ .val = SFP_OPTIONS_RATE_SELECT, -+ .str = "ratesel", -+ }, { -+ .mask = SFP_OPTIONS_TX_DISABLE, -+ .val = SFP_OPTIONS_TX_DISABLE, -+ .str = "txdisable", -+ }, { -+ .mask = SFP_OPTIONS_TX_FAULT, -+ .val = SFP_OPTIONS_TX_FAULT, -+ .str = "txfault", -+ }, { -+ .mask = SFP_OPTIONS_LOS_INVERTED, -+ .val = SFP_OPTIONS_LOS_INVERTED, -+ .str = "los-", -+ }, { -+ .mask = SFP_OPTIONS_LOS_NORMAL, -+ .val = SFP_OPTIONS_LOS_NORMAL, -+ .str = "los+", -+ }, { } -+}; -+ -+static const struct bitfield diagmon[] = { -+ { -+ .mask = SFP_DIAGMON_DDM, -+ .val = SFP_DIAGMON_DDM, -+ .str = "ddm", -+ }, { -+ .mask = SFP_DIAGMON_INT_CAL, -+ .val = SFP_DIAGMON_INT_CAL, -+ .str = "intcal", -+ }, { -+ .mask = SFP_DIAGMON_EXT_CAL, -+ .val = SFP_DIAGMON_EXT_CAL, -+ .str = "extcal", -+ }, { -+ .mask = SFP_DIAGMON_RXPWR_AVG, -+ .val = SFP_DIAGMON_RXPWR_AVG, -+ .str = "rxpwravg", -+ }, { } -+}; -+ -+static const char *sfp_bitfield(char *out, size_t outsz, const struct bitfield *bits, unsigned int val) -+{ -+ char *p = out; -+ int n; -+ -+ *p = '\0'; -+ while (bits->mask) { -+ if ((val & bits->mask) == bits->val) { -+ n = snprintf(p, outsz, "%s%s", -+ out != p ? ", " : "", -+ bits->str); -+ if (n == outsz) -+ break; -+ p += n; -+ outsz -= n; -+ } -+ bits++; -+ } -+ -+ return out; -+} -+ -+static const char *sfp_connector(unsigned int connector) -+{ -+ switch (connector) { -+ case SFP_CONNECTOR_UNSPEC: -+ return "unknown/unspecified"; -+ case SFP_CONNECTOR_SC: -+ return "SC"; -+ case SFP_CONNECTOR_FIBERJACK: -+ return "Fiberjack"; -+ case SFP_CONNECTOR_LC: -+ return "LC"; -+ case SFP_CONNECTOR_MT_RJ: -+ return "MT-RJ"; -+ case SFP_CONNECTOR_MU: -+ return "MU"; -+ case SFP_CONNECTOR_SG: -+ return "SG"; -+ case SFP_CONNECTOR_OPTICAL_PIGTAIL: -+ return "Optical pigtail"; -+ case SFP_CONNECTOR_HSSDC_II: -+ return "HSSDC II"; -+ case SFP_CONNECTOR_COPPER_PIGTAIL: -+ return "Copper pigtail"; -+ default: -+ return "unknown"; -+ } -+} -+ -+static const char *sfp_encoding(unsigned int encoding) -+{ -+ switch (encoding) { -+ case SFP_ENCODING_UNSPEC: -+ return "unspecified"; -+ case SFP_ENCODING_8472_64B66B: -+ return "64b66b"; -+ case SFP_ENCODING_8B10B: -+ return "8b10b"; -+ case SFP_ENCODING_4B5B: -+ return "4b5b"; -+ case SFP_ENCODING_NRZ: -+ return "NRZ"; -+ case SFP_ENCODING_8472_MANCHESTER: -+ return "MANCHESTER"; -+ default: -+ return "unknown"; -+ } -+} -+ - /* Helpers */ - static void sfp_module_tx_disable(struct sfp *sfp) - { -@@ -1376,6 +1554,8 @@ static int sfp_sm_mod_probe(struct sfp * - { - /* SFP module inserted - read I2C data */ - struct sfp_eeprom_id id; -+ char date[9]; -+ char options[80]; - bool cotsworks; - u8 check; - int ret; -@@ -1432,12 +1612,87 @@ static int sfp_sm_mod_probe(struct sfp * - - sfp->id = id; - -- dev_info(sfp->dev, "module %.*s %.*s rev %.*s sn %.*s dc %.*s\n", -+ date[0] = sfp->id.ext.datecode[4]; -+ date[1] = sfp->id.ext.datecode[5]; -+ date[2] = '-'; -+ date[3] = sfp->id.ext.datecode[2]; -+ date[4] = sfp->id.ext.datecode[3]; -+ date[5] = '-'; -+ date[6] = sfp->id.ext.datecode[0]; -+ date[7] = sfp->id.ext.datecode[1]; -+ date[8] = '\0'; -+ -+ dev_info(sfp->dev, "module %.*s %.*s rev %.*s sn %.*s dc %s\n", - (int)sizeof(id.base.vendor_name), id.base.vendor_name, - (int)sizeof(id.base.vendor_pn), id.base.vendor_pn, - (int)sizeof(id.base.vendor_rev), id.base.vendor_rev, -- (int)sizeof(id.ext.vendor_sn), id.ext.vendor_sn, -- (int)sizeof(id.ext.datecode), id.ext.datecode); -+ (int)sizeof(id.ext.vendor_sn), id.ext.vendor_sn, date); -+ dev_info(sfp->dev, " %s connector, encoding %s, nominal bitrate %u.%uGbps +%u%% -%u%%\n", -+ sfp_connector(sfp->id.base.connector), -+ sfp_encoding(sfp->id.base.encoding), -+ sfp->id.base.br_nominal / 10, -+ sfp->id.base.br_nominal % 10, -+ sfp->id.ext.br_max, sfp->id.ext.br_min); -+ dev_info(sfp->dev, " 1000BaseSX%c 1000BaseLX%c 1000BaseCX%c 1000BaseT%c 100BaseLX%c 100BaseFX%c BaseBX10%c BasePX%c\n", -+ sfp->id.base.e1000_base_sx ? '+' : '-', -+ sfp->id.base.e1000_base_lx ? '+' : '-', -+ sfp->id.base.e1000_base_cx ? '+' : '-', -+ sfp->id.base.e1000_base_t ? '+' : '-', -+ sfp->id.base.e100_base_lx ? '+' : '-', -+ sfp->id.base.e100_base_fx ? '+' : '-', -+ sfp->id.base.e_base_bx10 ? '+' : '-', -+ sfp->id.base.e_base_px ? '+' : '-'); -+ dev_info(sfp->dev, " 10GBaseSR%c 10GBaseLR%c 10GBaseLRM%c 10GBaseER%c\n", -+ sfp->id.base.e10g_base_sr ? '+' : '-', -+ sfp->id.base.e10g_base_lr ? '+' : '-', -+ sfp->id.base.e10g_base_lrm ? '+' : '-', -+ sfp->id.base.e10g_base_er ? '+' : '-'); -+ -+ if (!sfp->id.base.sfp_ct_passive && !sfp->id.base.sfp_ct_active && -+ !sfp->id.base.e1000_base_t) { -+ char len_9um[16], len_om[16]; -+ -+ dev_info(sfp->dev, " Wavelength %unm, fiber lengths:\n", -+ be16_to_cpup(&sfp->id.base.optical_wavelength)); -+ -+ if (sfp->id.base.link_len[0] == 255) -+ strcpy(len_9um, ">254km"); -+ else if (sfp->id.base.link_len[1] && sfp->id.base.link_len[1] != 255) -+ sprintf(len_9um, "%um", -+ sfp->id.base.link_len[1] * 100); -+ else if (sfp->id.base.link_len[0]) -+ sprintf(len_9um, "%ukm", sfp->id.base.link_len[0]); -+ else if (sfp->id.base.link_len[1] == 255) -+ strcpy(len_9um, ">25.4km"); -+ else -+ strcpy(len_9um, "unsupported"); -+ -+ dev_info(sfp->dev, " 9µm SM : %s\n", len_9um); -+ dev_info(sfp->dev, " 62.5µm MM OM1: %s\n", -+ sfp_link_len(len_om, sizeof(len_om), -+ sfp->id.base.link_len[3], 10)); -+ dev_info(sfp->dev, " 50µm MM OM2: %s\n", -+ sfp_link_len(len_om, sizeof(len_om), -+ sfp->id.base.link_len[2], 10)); -+ dev_info(sfp->dev, " 50µm MM OM3: %s\n", -+ sfp_link_len(len_om, sizeof(len_om), -+ sfp->id.base.link_len[5], 10)); -+ dev_info(sfp->dev, " 50µm MM OM4: %s\n", -+ sfp_link_len(len_om, sizeof(len_om), -+ sfp->id.base.link_len[4], 10)); -+ } else { -+ char len[16]; -+ dev_info(sfp->dev, " Copper length: %s\n", -+ sfp_link_len(len, sizeof(len), -+ sfp->id.base.link_len[4], 1)); -+ } -+ -+ dev_info(sfp->dev, " Options: %s\n", -+ sfp_bitfield(options, sizeof(options), sfp_options, -+ be16_to_cpu(sfp->id.ext.options))); -+ dev_info(sfp->dev, " Diagnostics: %s\n", -+ sfp_bitfield(options, sizeof(options), diagmon, -+ sfp->id.ext.diagmon)); - - /* Check whether we support this module */ - if (!sfp->type->module_supported(&sfp->id)) { diff --git a/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch b/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch deleted file mode 100644 index 69a31cb9f0..0000000000 --- a/target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e26af2726067ff260b77485df6af8375b82bfb1d Mon Sep 17 00:00:00 2001 -From: Russell King -Date: Sat, 23 Dec 2017 12:22:58 +0000 -Subject: [PATCH] sfp: more cotsworks fixes - -Cotsworks also gets the date code wrong. - -Signed-off-by: Russell King ---- - drivers/net/phy/sfp.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -1571,9 +1571,9 @@ static int sfp_sm_mod_probe(struct sfp * - return -EAGAIN; - } - -- /* Cotsworks do not seem to update the checksums when they -- * do the final programming with the final module part number, -- * serial number and date code. -+ /* Cotsworks do not seem to update the checksums when they update the -+ * module part number, serial number and date code. They also format -+ * the date code incorrectly. - */ - cotsworks = !memcmp(id.base.vendor_name, "COTSWORKS ", 16); - -@@ -1612,11 +1612,12 @@ static int sfp_sm_mod_probe(struct sfp * - - sfp->id = id; - -- date[0] = sfp->id.ext.datecode[4]; -- date[1] = sfp->id.ext.datecode[5]; -+ /* Cotsworks also gets the date code wrong. */ -+ date[0] = sfp->id.ext.datecode[4 - 2 * cotsworks]; -+ date[1] = sfp->id.ext.datecode[5 - 2 * cotsworks]; - date[2] = '-'; -- date[3] = sfp->id.ext.datecode[2]; -- date[4] = sfp->id.ext.datecode[3]; -+ date[3] = sfp->id.ext.datecode[2 + 2 * cotsworks]; -+ date[4] = sfp->id.ext.datecode[3 + 2 * cotsworks]; - date[5] = '-'; - date[6] = sfp->id.ext.datecode[0]; - date[7] = sfp->id.ext.datecode[1]; diff --git a/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch b/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch deleted file mode 100644 index 833c515a11..0000000000 --- a/target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 28baa5e2635285b178326b301f534ed95c65dd01 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 29 Sep 2016 11:44:39 +0200 -Subject: [PATCH] sfp: retry phy probe if unsuccessful - -Some phys seem to take longer than 50 ms to come out of reset, so retry -until we find a phy. - -Signed-off-by: Jonas Gorski ---- - drivers/net/phy/sfp.c | 38 +++++++++++++++++++++++++------------- - 1 file changed, 25 insertions(+), 13 deletions(-) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -1374,7 +1374,7 @@ static void sfp_sm_phy_detach(struct sfp - sfp->mod_phy = NULL; - } - --static void sfp_sm_probe_phy(struct sfp *sfp) -+static int sfp_sm_probe_phy(struct sfp *sfp) - { - struct phy_device *phy; - int err; -@@ -1384,11 +1384,11 @@ static void sfp_sm_probe_phy(struct sfp - phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); - if (phy == ERR_PTR(-ENODEV)) { - dev_info(sfp->dev, "no PHY detected\n"); -- return; -+ return -EAGAIN; - } - if (IS_ERR(phy)) { - dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); -- return; -+ return PTR_ERR(phy); - } - - err = sfp_add_phy(sfp->sfp_bus, phy); -@@ -1396,11 +1396,13 @@ static void sfp_sm_probe_phy(struct sfp - phy_device_remove(phy); - phy_device_free(phy); - dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); -- return; -+ return err; - } - - sfp->mod_phy = phy; - phy_start(phy); -+ -+ return 0; - } - - static void sfp_sm_link_up(struct sfp *sfp) -@@ -1464,14 +1466,9 @@ static void sfp_sm_fault(struct sfp *sfp - - static void sfp_sm_mod_init(struct sfp *sfp) - { -- sfp_module_tx_enable(sfp); -+ int ret = 0; - -- /* Wait t_init before indicating that the link is up, provided the -- * current state indicates no TX_FAULT. If TX_FAULT clears before -- * this time, that's fine too. -- */ -- sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); -- sfp->sm_retries = 5; -+ sfp_module_tx_enable(sfp); - - /* Setting the serdes link mode is guesswork: there's no - * field in the EEPROM which indicates what mode should -@@ -1485,7 +1482,22 @@ static void sfp_sm_mod_init(struct sfp * - if (sfp->id.base.e1000_base_t || - sfp->id.base.e100_base_lx || - sfp->id.base.e100_base_fx) -- sfp_sm_probe_phy(sfp); -+ ret = sfp_sm_probe_phy(sfp); -+ -+ if (!ret) { -+ /* Wait t_init before indicating that the link is up, provided -+ * the current state indicates no TX_FAULT. If TX_FAULT clears -+ * this time, that's fine too. -+ */ -+ sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); -+ sfp->sm_retries = 5; -+ return; -+ } -+ -+ if (ret == -EAGAIN) -+ sfp_sm_set_timer(sfp, T_PROBE_RETRY); -+ else -+ sfp_sm_next(sfp, SFP_S_TX_DISABLE, 0); - } - - static int sfp_sm_mod_hpower(struct sfp *sfp) From a07638eb24b8310a35ea6c3b09f6db59bb31cd68 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Nov 2019 11:45:20 +0000 Subject: [PATCH 405/480] kernel: move phylink patches from mvebu to generic Move two phylink patches from mvebu to generic, so that everyone can benefit from them. Signed-off-by: Russell King [jonas.gorski: add kernel version to file names] Signed-off-by: Jonas Gorski --- ....1-net-phylink-only-call-mac_config-during-resolve-when.patch} | 0 .../701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename target/linux/{mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch => generic/backport-4.19/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch} (100%) rename target/linux/{mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch => generic/backport-4.19/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch} (100%) diff --git a/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch b/target/linux/generic/backport-4.19/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch similarity index 100% rename from target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch rename to target/linux/generic/backport-4.19/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch diff --git a/target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch b/target/linux/generic/backport-4.19/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch similarity index 100% rename from target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch rename to target/linux/generic/backport-4.19/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch From 1c16b574c4f77a30a0268acee30be96ae0dc5948 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Nov 2019 11:45:25 +0000 Subject: [PATCH 406/480] kernel: add backported phy/phylink/sfp patches Backport the phy/phylink/sfp patches currently queued in netdev or in mainline necessary to support GPON popular modules, specifically to support Huawei and Nokia GPON modules. Signed-off-by: Russell King [jonas.gorski: include kernel version in file names, refresh patches] Signed-off-by: Jonas Gorski --- ...-helper-for-MACs-which-support-asym-.patch | 49 +++ ...-helper-for-set_pauseparam-for-Asym-.patch | 66 +++ ...t-phy-Stop-with-excessive-soft-reset.patch | 40 ++ ...full-set-of-accessor-functions-to-MM.patch | 375 ++++++++++++++++++ ...ster-modifying-helpers-returning-1-o.patch | 217 ++++++++++ ...dd-genphy_c45_check_and_restart_aneg.patch | 64 +++ ...ve-netdev-from-phylink-mii-ioctl-emu.patch | 59 +++ ...link-support-for-link-gpio-interrupt.patch | 90 +++++ ...allow-Clause-45-access-via-mii-ioctl.patch | 77 ++++ ...atory-attach-detach-methods-for-sfp-.patch | 94 +++++ ...et-sfp-remove-sfp-bus-use-of-netdevs.patch | 118 ++++++ ...-phylink-avoid-reducing-support-mask.patch | 84 ++++ ...-polling-and-interrupt-handling-duri.patch | 94 +++++ ...t-start-and-stop-SGMII-PHYs-in-SFP-m.patch | 141 +++++++ ...ve-fwnode-parsing-into-sfp-bus-layer.patch | 179 +++++++++ ....5-net-sfp-rework-upstream-interface.patch | 254 ++++++++++++ ...fix-sfp_bus_put-kernel-documentation.patch | 27 ++ ...sfp-fix-sfp_bus_add_upstream-warning.patch | 27 ++ ...-sub-state-machines-into-separate-fu.patch | 124 ++++++ ...disable-on-device-down-to-main-state.patch | 41 ++ ...e-sfp_sm_ins_next-as-sfp_sm_mod_next.patch | 71 ++++ ...-module-remove-outside-state-machine.patch | 53 +++ ...-sfp-rename-T_PROBE_WAIT-to-T_SERIAL.patch | 51 +++ ...-parse-SFP-power-requirement-earlier.patch | 115 ++++++ ...wer-switch-on-address-change-modules.patch | 65 +++ ...TX_DISABLE-and-phy-only-from-main-st.patch | 52 +++ ...t-the-PHY-probe-from-sfp_sm_mod_init.patch | 53 +++ ...-sfp-eliminate-mdelay-from-PHY-probe.patch | 130 ++++++ ...ult-processing-to-transition-to-othe.patch | 69 ++++ ...X_FAULT-has-deasserted-before-probin.patch | 80 ++++ ...stream-s-attachment-state-in-state-m.patch | 153 +++++++ ...plit-power-mode-switching-from-probe.patch | 184 +++++++++ ...module-insert-reporting-out-of-probe.patch | 159 ++++++++ ...p-to-probe-slow-to-initialise-GPON-m.patch | 110 +++++ ...dules-with-slow-diagnostics-to-probe.patch | 198 +++++++++ ...-net-phy-add-core-phylib-sfp-support.patch | 183 +++++++++ ...5-net-phy-marvell10g-add-SFP-support.patch | 67 ++++ ...update-to-use-phy_support_asym_pause.patch | 45 +++ ...-matching-all-ones-clause-45-PHY-IDs.patch | 63 +++ ...x-link-mode-modification-in-PHY-mode.patch | 66 +++ ...et-sfp-add-support-for-module-quirks.patch | 111 ++++++ ...sfp-add-some-quirks-for-GPON-modules.patch | 52 +++ ...-sfp-soft-status-and-control-support.patch | 225 +++++++++++ 43 files changed, 4575 insertions(+) create mode 100644 target/linux/generic/backport-4.19/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch create mode 100644 target/linux/generic/backport-4.19/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch create mode 100644 target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch create mode 100644 target/linux/generic/backport-4.19/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch create mode 100644 target/linux/generic/backport-4.19/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch create mode 100644 target/linux/generic/backport-4.19/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch create mode 100644 target/linux/generic/backport-4.19/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch create mode 100644 target/linux/generic/backport-4.19/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch create mode 100644 target/linux/generic/backport-4.19/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch create mode 100644 target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch create mode 100644 target/linux/generic/backport-4.19/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch create mode 100644 target/linux/generic/backport-4.19/713-v5.2-net-phylink-avoid-reducing-support-mask.patch create mode 100644 target/linux/generic/backport-4.19/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch create mode 100644 target/linux/generic/backport-4.19/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch create mode 100644 target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch create mode 100644 target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch create mode 100644 target/linux/generic/backport-4.19/718-v5.5-net-sfp-fix-sfp_bus_put-kernel-documentation.patch create mode 100644 target/linux/generic/backport-4.19/719-v5.5-net-sfp-fix-sfp_bus_add_upstream-warning.patch create mode 100644 target/linux/generic/backport-4.19/720-v5.5-net-sfp-move-sfp-sub-state-machines-into-separate-fu.patch create mode 100644 target/linux/generic/backport-4.19/721-v5.5-net-sfp-move-tx-disable-on-device-down-to-main-state.patch create mode 100644 target/linux/generic/backport-4.19/722-v5.5-net-sfp-rename-sfp_sm_ins_next-as-sfp_sm_mod_next.patch create mode 100644 target/linux/generic/backport-4.19/723-v5.5-net-sfp-handle-module-remove-outside-state-machine.patch create mode 100644 target/linux/generic/backport-4.19/724-v5.5-net-sfp-rename-T_PROBE_WAIT-to-T_SERIAL.patch create mode 100644 target/linux/generic/backport-4.19/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch create mode 100644 target/linux/generic/backport-4.19/726-v5.5-net-sfp-avoid-power-switch-on-address-change-modules.patch create mode 100644 target/linux/generic/backport-4.19/727-v5.5-net-sfp-control-TX_DISABLE-and-phy-only-from-main-st.patch create mode 100644 target/linux/generic/backport-4.19/728-v5.5-net-sfp-split-the-PHY-probe-from-sfp_sm_mod_init.patch create mode 100644 target/linux/generic/backport-4.19/729-v5.5-net-sfp-eliminate-mdelay-from-PHY-probe.patch create mode 100644 target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch create mode 100644 target/linux/generic/backport-4.19/731-v5.5-net-sfp-ensure-TX_FAULT-has-deasserted-before-probin.patch create mode 100644 target/linux/generic/backport-4.19/732-v5.5-net-sfp-track-upstream-s-attachment-state-in-state-m.patch create mode 100644 target/linux/generic/backport-4.19/733-v5.5-net-sfp-split-power-mode-switching-from-probe.patch create mode 100644 target/linux/generic/backport-4.19/734-v5.5-net-sfp-move-module-insert-reporting-out-of-probe.patch create mode 100644 target/linux/generic/backport-4.19/735-v5.5-net-sfp-allow-sfp-to-probe-slow-to-initialise-GPON-m.patch create mode 100644 target/linux/generic/backport-4.19/736-v5.5-net-sfp-allow-modules-with-slow-diagnostics-to-probe.patch create mode 100644 target/linux/generic/backport-4.19/737-v5.5-net-phy-add-core-phylib-sfp-support.patch create mode 100644 target/linux/generic/backport-4.19/738-v5.5-net-phy-marvell10g-add-SFP-support.patch create mode 100644 target/linux/generic/backport-4.19/739-v5.5-net-phylink-update-to-use-phy_support_asym_pause.patch create mode 100644 target/linux/generic/backport-4.19/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch create mode 100644 target/linux/generic/backport-4.19/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch create mode 100644 target/linux/generic/backport-4.19/742-v5.5-net-sfp-add-support-for-module-quirks.patch create mode 100644 target/linux/generic/backport-4.19/743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch create mode 100644 target/linux/generic/backport-4.19/744-v5.5-net-sfp-soft-status-and-control-support.patch diff --git a/target/linux/generic/backport-4.19/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch b/target/linux/generic/backport-4.19/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch new file mode 100644 index 0000000000..ee6e6a6dac --- /dev/null +++ b/target/linux/generic/backport-4.19/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch @@ -0,0 +1,49 @@ +From 1da223db3a0c522300b519ecbe1dc45927e28088 Mon Sep 17 00:00:00 2001 +From: Andrew Lunn +Date: Wed, 12 Sep 2018 01:53:15 +0200 +Subject: [PATCH 600/660] net: ethernet: Add helper for MACs which support asym + pause + +Rather than have the MAC drivers manipulate phydev members to indicate +they support Asym Pause, add a helper function. + +Signed-off-by: Andrew Lunn +Reviewed-by: Florian Fainelli +Signed-off-by: David S. Miller +--- + drivers/net/phy/phy_device.c | 13 +++++++++++++ + include/linux/phy.h | 1 + + 2 files changed, 14 insertions(+) + +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -1776,6 +1776,19 @@ int phy_set_max_speed(struct phy_device + } + EXPORT_SYMBOL(phy_set_max_speed); + ++/** ++ * phy_support_asym_pause - Enable support of asym pause ++ * @phydev: target phy_device struct ++ * ++ * Description: Called by the MAC to indicate is supports Asym Pause. ++ */ ++void phy_support_asym_pause(struct phy_device *phydev) ++{ ++ phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; ++ phydev->advertising = phydev->supported; ++} ++EXPORT_SYMBOL(phy_support_asym_pause); ++ + static void of_set_phy_supported(struct phy_device *phydev) + { + struct device_node *node = phydev->mdio.dev.of_node; +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -1049,6 +1049,7 @@ int phy_mii_ioctl(struct phy_device *phy + int phy_start_interrupts(struct phy_device *phydev); + void phy_print_status(struct phy_device *phydev); + int phy_set_max_speed(struct phy_device *phydev, u32 max_speed); ++void phy_support_asym_pause(struct phy_device *phydev); + + int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, + int (*run)(struct phy_device *)); diff --git a/target/linux/generic/backport-4.19/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch b/target/linux/generic/backport-4.19/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch new file mode 100644 index 0000000000..8d68fbfe0f --- /dev/null +++ b/target/linux/generic/backport-4.19/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch @@ -0,0 +1,66 @@ +From ce825df56e0480a2cbb296e38976babafb57e503 Mon Sep 17 00:00:00 2001 +From: Andrew Lunn +Date: Wed, 12 Sep 2018 01:53:17 +0200 +Subject: [PATCH 601/660] net: ethernet: Add helper for set_pauseparam for Asym + Pause + +ethtool can be used to enable/disable pause. Add a helper to configure +the PHY when asym pause is supported. + +Signed-off-by: Andrew Lunn +Reviewed-by: Florian Fainelli +Signed-off-by: David S. Miller +--- + drivers/net/phy/phy_device.c | 30 ++++++++++++++++++++++++++++++ + include/linux/phy.h | 1 + + 2 files changed, 31 insertions(+) + +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -1789,6 +1789,36 @@ void phy_support_asym_pause(struct phy_d + } + EXPORT_SYMBOL(phy_support_asym_pause); + ++/** ++ * phy_set_asym_pause - Configure Pause and Asym Pause ++ * @phydev: target phy_device struct ++ * @rx: Receiver Pause is supported ++ * @tx: Transmit Pause is supported ++ * ++ * Description: Configure advertised Pause support depending on if ++ * transmit and receiver pause is supported. If there has been a ++ * change in adverting, trigger a new autoneg. Generally called from ++ * the set_pauseparam .ndo. ++ */ ++void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx) ++{ ++ u16 oldadv = phydev->advertising; ++ u16 newadv = oldadv &= ~(SUPPORTED_Pause | SUPPORTED_Asym_Pause); ++ ++ if (rx) ++ newadv |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; ++ if (tx) ++ newadv ^= SUPPORTED_Asym_Pause; ++ ++ if (oldadv != newadv) { ++ phydev->advertising = newadv; ++ ++ if (phydev->autoneg) ++ phy_start_aneg(phydev); ++ } ++} ++EXPORT_SYMBOL(phy_set_asym_pause); ++ + static void of_set_phy_supported(struct phy_device *phydev) + { + struct device_node *node = phydev->mdio.dev.of_node; +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -1050,6 +1050,7 @@ int phy_start_interrupts(struct phy_devi + void phy_print_status(struct phy_device *phydev); + int phy_set_max_speed(struct phy_device *phydev, u32 max_speed); + void phy_support_asym_pause(struct phy_device *phydev); ++void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx); + + int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, + int (*run)(struct phy_device *)); diff --git a/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch b/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch new file mode 100644 index 0000000000..77ad5b96dd --- /dev/null +++ b/target/linux/generic/backport-4.19/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch @@ -0,0 +1,40 @@ +From 1541649a9dd79e9b941d399de564475e426a2d0b Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Tue, 25 Sep 2018 11:28:45 -0700 +Subject: [PATCH 602/660] net: phy: Stop with excessive soft reset + +While consolidating the PHY reset in phy_init_hw() an unconditionaly +BMCR soft-reset I became quite trigger happy with those. This was later +on deactivated for the Generic PHY driver on the premise that a prior +software entity (e.g: bootloader) might have applied workarounds in +commit 0878fff1f42c ("net: phy: Do not perform software reset for +Generic PHY"). + +Since we have a hook to wire-up a soft_reset callback, just use that and +get rid of the call to genphy_soft_reset() entirely. This speeds up +initialization and link establishment for most PHYs out there that do +not require a reset. + +Fixes: 87aa9f9c61ad ("net: phy: consolidate PHY reset in phy_init_hw()") +Tested-by: Wang, Dongsheng +Tested-by: Chris Healy +Tested-by: Andrew Lunn +Tested-by: Clemens Gruber +Signed-off-by: Florian Fainelli +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phy_device.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -885,8 +885,6 @@ int phy_init_hw(struct phy_device *phyde + + if (phydev->drv->soft_reset) + ret = phydev->drv->soft_reset(phydev); +- else +- ret = genphy_soft_reset(phydev); + + if (ret < 0) + return ret; diff --git a/target/linux/generic/backport-4.19/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch b/target/linux/generic/backport-4.19/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch new file mode 100644 index 0000000000..9a587ad3a6 --- /dev/null +++ b/target/linux/generic/backport-4.19/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch @@ -0,0 +1,375 @@ +From 80758d9542205cd2e9fa730067bc3888d4f5a096 Mon Sep 17 00:00:00 2001 +From: Nikita Yushchenko +Date: Wed, 6 Feb 2019 07:36:40 +0100 +Subject: [PATCH 603/660] net: phy: provide full set of accessor functions to + MMD registers + +This adds full set of locked and unlocked accessor functions to read and +write PHY MMD registers and/or bitfields. + +Set of functions exactly matches what is already available for PHY +legacy registers. + +Signed-off-by: Nikita Yushchenko +Signed-off-by: Andrew Lunn +Signed-off-by: Heiner Kallweit +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phy-core.c | 116 ++++++++++++++++++++++++++++---- + include/linux/phy.h | 134 ++++++++++++++++++++++++++++++------- + 2 files changed, 214 insertions(+), 36 deletions(-) + +--- a/drivers/net/phy/phy-core.c ++++ b/drivers/net/phy/phy-core.c +@@ -247,15 +247,15 @@ static void mmd_phy_indirect(struct mii_ + } + + /** +- * phy_read_mmd - Convenience function for reading a register ++ * __phy_read_mmd - Convenience function for reading a register + * from an MMD on a given PHY. + * @phydev: The phy_device struct + * @devad: The MMD to read from (0..31) + * @regnum: The register on the MMD to read (0..65535) + * +- * Same rules as for phy_read(); ++ * Same rules as for __phy_read(); + */ +-int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) ++int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) + { + int val; + +@@ -267,33 +267,52 @@ int phy_read_mmd(struct phy_device *phyd + } else if (phydev->is_c45) { + u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); + +- val = mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, addr); ++ val = __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, addr); + } else { + struct mii_bus *bus = phydev->mdio.bus; + int phy_addr = phydev->mdio.addr; + +- mutex_lock(&bus->mdio_lock); + mmd_phy_indirect(bus, phy_addr, devad, regnum); + + /* Read the content of the MMD's selected register */ + val = __mdiobus_read(bus, phy_addr, MII_MMD_DATA); +- mutex_unlock(&bus->mdio_lock); + } + return val; + } ++EXPORT_SYMBOL(__phy_read_mmd); ++ ++/** ++ * phy_read_mmd - Convenience function for reading a register ++ * from an MMD on a given PHY. ++ * @phydev: The phy_device struct ++ * @devad: The MMD to read from ++ * @regnum: The register on the MMD to read ++ * ++ * Same rules as for phy_read(); ++ */ ++int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) ++{ ++ int ret; ++ ++ mutex_lock(&phydev->mdio.bus->mdio_lock); ++ ret = __phy_read_mmd(phydev, devad, regnum); ++ mutex_unlock(&phydev->mdio.bus->mdio_lock); ++ ++ return ret; ++} + EXPORT_SYMBOL(phy_read_mmd); + + /** +- * phy_write_mmd - Convenience function for writing a register ++ * __phy_write_mmd - Convenience function for writing a register + * on an MMD on a given PHY. + * @phydev: The phy_device struct + * @devad: The MMD to read from + * @regnum: The register on the MMD to read + * @val: value to write to @regnum + * +- * Same rules as for phy_write(); ++ * Same rules as for __phy_write(); + */ +-int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) ++int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) + { + int ret; + +@@ -305,23 +324,43 @@ int phy_write_mmd(struct phy_device *phy + } else if (phydev->is_c45) { + u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); + +- ret = mdiobus_write(phydev->mdio.bus, phydev->mdio.addr, +- addr, val); ++ ret = __mdiobus_write(phydev->mdio.bus, phydev->mdio.addr, ++ addr, val); + } else { + struct mii_bus *bus = phydev->mdio.bus; + int phy_addr = phydev->mdio.addr; + +- mutex_lock(&bus->mdio_lock); + mmd_phy_indirect(bus, phy_addr, devad, regnum); + + /* Write the data into MMD's selected register */ + __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val); +- mutex_unlock(&bus->mdio_lock); + + ret = 0; + } + return ret; + } ++EXPORT_SYMBOL(__phy_write_mmd); ++ ++/** ++ * phy_write_mmd - Convenience function for writing a register ++ * on an MMD on a given PHY. ++ * @phydev: The phy_device struct ++ * @devad: The MMD to read from ++ * @regnum: The register on the MMD to read ++ * @val: value to write to @regnum ++ * ++ * Same rules as for phy_write(); ++ */ ++int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) ++{ ++ int ret; ++ ++ mutex_lock(&phydev->mdio.bus->mdio_lock); ++ ret = __phy_write_mmd(phydev, devad, regnum, val); ++ mutex_unlock(&phydev->mdio.bus->mdio_lock); ++ ++ return ret; ++} + EXPORT_SYMBOL(phy_write_mmd); + + /** +@@ -371,6 +410,57 @@ int phy_modify(struct phy_device *phydev + } + EXPORT_SYMBOL_GPL(phy_modify); + ++/** ++ * __phy_modify_mmd - Convenience function for modifying a register on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @mask: bit mask of bits to clear ++ * @set: new value of bits set in mask to write to @regnum ++ * ++ * Unlocked helper function which allows a MMD register to be modified as ++ * new register value = (old register value & ~mask) | set ++ */ ++int __phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set) ++{ ++ int ret; ++ ++ ret = __phy_read_mmd(phydev, devad, regnum); ++ if (ret < 0) ++ return ret; ++ ++ ret = __phy_write_mmd(phydev, devad, regnum, (ret & ~mask) | set); ++ ++ return ret < 0 ? ret : 0; ++} ++EXPORT_SYMBOL_GPL(__phy_modify_mmd); ++ ++/** ++ * phy_modify_mmd - Convenience function for modifying a register on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @mask: bit mask of bits to clear ++ * @set: new value of bits set in mask to write to @regnum ++ * ++ * NOTE: MUST NOT be called from interrupt context, ++ * because the bus read/write functions may wait for an interrupt ++ * to conclude the operation. ++ */ ++int phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set) ++{ ++ int ret; ++ ++ mutex_lock(&phydev->mdio.bus->mdio_lock); ++ ret = __phy_modify_mmd(phydev, devad, regnum, mask, set); ++ mutex_unlock(&phydev->mdio.bus->mdio_lock); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(phy_modify_mmd); ++ + static int __phy_read_page(struct phy_device *phydev) + { + return phydev->drv->read_page(phydev); +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -695,17 +695,6 @@ size_t phy_speeds(unsigned int *speeds, + void phy_resolve_aneg_linkmode(struct phy_device *phydev); + + /** +- * phy_read_mmd - Convenience function for reading a register +- * from an MMD on a given PHY. +- * @phydev: The phy_device struct +- * @devad: The MMD to read from +- * @regnum: The register on the MMD to read +- * +- * Same rules as for phy_read(); +- */ +-int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum); +- +-/** + * phy_read - Convenience function for reading a given PHY register + * @phydev: the phy_device struct + * @regnum: register number to read +@@ -760,9 +749,60 @@ static inline int __phy_write(struct phy + val); + } + ++/** ++ * phy_read_mmd - Convenience function for reading a register ++ * from an MMD on a given PHY. ++ * @phydev: The phy_device struct ++ * @devad: The MMD to read from ++ * @regnum: The register on the MMD to read ++ * ++ * Same rules as for phy_read(); ++ */ ++int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum); ++ ++/** ++ * __phy_read_mmd - Convenience function for reading a register ++ * from an MMD on a given PHY. ++ * @phydev: The phy_device struct ++ * @devad: The MMD to read from ++ * @regnum: The register on the MMD to read ++ * ++ * Same rules as for __phy_read(); ++ */ ++int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum); ++ ++/** ++ * phy_write_mmd - Convenience function for writing a register ++ * on an MMD on a given PHY. ++ * @phydev: The phy_device struct ++ * @devad: The MMD to write to ++ * @regnum: The register on the MMD to read ++ * @val: value to write to @regnum ++ * ++ * Same rules as for phy_write(); ++ */ ++int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val); ++ ++/** ++ * __phy_write_mmd - Convenience function for writing a register ++ * on an MMD on a given PHY. ++ * @phydev: The phy_device struct ++ * @devad: The MMD to write to ++ * @regnum: The register on the MMD to read ++ * @val: value to write to @regnum ++ * ++ * Same rules as for __phy_write(); ++ */ ++int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val); ++ + int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set); + int phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set); + ++int __phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set); ++int phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set); ++ + /** + * __phy_set_bits - Convenience function for setting bits in a PHY register + * @phydev: the phy_device struct +@@ -813,6 +853,66 @@ static inline int phy_clear_bits(struct + } + + /** ++ * __phy_set_bits_mmd - Convenience function for setting bits in a register ++ * on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @val: bits to set ++ * ++ * The caller must have taken the MDIO bus lock. ++ */ ++static inline int __phy_set_bits_mmd(struct phy_device *phydev, int devad, ++ u32 regnum, u16 val) ++{ ++ return __phy_modify_mmd(phydev, devad, regnum, 0, val); ++} ++ ++/** ++ * __phy_clear_bits_mmd - Convenience function for clearing bits in a register ++ * on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @val: bits to clear ++ * ++ * The caller must have taken the MDIO bus lock. ++ */ ++static inline int __phy_clear_bits_mmd(struct phy_device *phydev, int devad, ++ u32 regnum, u16 val) ++{ ++ return __phy_modify_mmd(phydev, devad, regnum, val, 0); ++} ++ ++/** ++ * phy_set_bits_mmd - Convenience function for setting bits in a register ++ * on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @val: bits to set ++ */ ++static inline int phy_set_bits_mmd(struct phy_device *phydev, int devad, ++ u32 regnum, u16 val) ++{ ++ return phy_modify_mmd(phydev, devad, regnum, 0, val); ++} ++ ++/** ++ * phy_clear_bits_mmd - Convenience function for clearing bits in a register ++ * on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @val: bits to clear ++ */ ++static inline int phy_clear_bits_mmd(struct phy_device *phydev, int devad, ++ u32 regnum, u16 val) ++{ ++ return phy_modify_mmd(phydev, devad, regnum, val, 0); ++} ++ ++/** + * phy_interrupt_is_valid - Convenience function for testing a given PHY irq + * @phydev: the phy_device struct + * +@@ -888,18 +988,6 @@ static inline bool phy_is_pseudo_fixed_l + return phydev->is_pseudo_fixed_link; + } + +-/** +- * phy_write_mmd - Convenience function for writing a register +- * on an MMD on a given PHY. +- * @phydev: The phy_device struct +- * @devad: The MMD to read from +- * @regnum: The register on the MMD to read +- * @val: value to write to @regnum +- * +- * Same rules as for phy_write(); +- */ +-int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val); +- + int phy_save_page(struct phy_device *phydev); + int phy_select_page(struct phy_device *phydev, int page); + int phy_restore_page(struct phy_device *phydev, int oldpage, int ret); diff --git a/target/linux/generic/backport-4.19/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch b/target/linux/generic/backport-4.19/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch new file mode 100644 index 0000000000..dddfcc2018 --- /dev/null +++ b/target/linux/generic/backport-4.19/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch @@ -0,0 +1,217 @@ +From c1e3f753f6b85d7636024159bb78f764e09492f1 Mon Sep 17 00:00:00 2001 +From: Heiner Kallweit +Date: Sun, 10 Feb 2019 19:57:56 +0100 +Subject: [PATCH 604/660] net: phy: add register modifying helpers returning 1 + on change + +When modifying registers there are scenarios where we need to know +whether the register content actually changed. This patch adds +new helpers to not break users of the current ones, phy_modify() etc. + +Signed-off-by: Heiner Kallweit +Reviewed-by: Andrew Lunn +Reviewed-by: Florian Fainelli +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phy-core.c | 127 ++++++++++++++++++++++++++++++++++--- + include/linux/phy.h | 12 +++- + 2 files changed, 128 insertions(+), 11 deletions(-) + +--- a/drivers/net/phy/phy-core.c ++++ b/drivers/net/phy/phy-core.c +@@ -364,7 +364,7 @@ int phy_write_mmd(struct phy_device *phy + EXPORT_SYMBOL(phy_write_mmd); + + /** +- * __phy_modify() - Convenience function for modifying a PHY register ++ * __phy_modify_changed() - Convenience function for modifying a PHY register + * @phydev: a pointer to a &struct phy_device + * @regnum: register number + * @mask: bit mask of bits to clear +@@ -372,16 +372,69 @@ EXPORT_SYMBOL(phy_write_mmd); + * + * Unlocked helper function which allows a PHY register to be modified as + * new register value = (old register value & ~mask) | set ++ * ++ * Returns negative errno, 0 if there was no change, and 1 in case of change + */ +-int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) ++int __phy_modify_changed(struct phy_device *phydev, u32 regnum, u16 mask, ++ u16 set) + { +- int ret; ++ int new, ret; + + ret = __phy_read(phydev, regnum); + if (ret < 0) + return ret; + +- ret = __phy_write(phydev, regnum, (ret & ~mask) | set); ++ new = (ret & ~mask) | set; ++ if (new == ret) ++ return 0; ++ ++ ret = __phy_write(phydev, regnum, new); ++ ++ return ret < 0 ? ret : 1; ++} ++EXPORT_SYMBOL_GPL(__phy_modify_changed); ++ ++/** ++ * phy_modify_changed - Function for modifying a PHY register ++ * @phydev: the phy_device struct ++ * @regnum: register number to modify ++ * @mask: bit mask of bits to clear ++ * @set: new value of bits set in mask to write to @regnum ++ * ++ * NOTE: MUST NOT be called from interrupt context, ++ * because the bus read/write functions may wait for an interrupt ++ * to conclude the operation. ++ * ++ * Returns negative errno, 0 if there was no change, and 1 in case of change ++ */ ++int phy_modify_changed(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) ++{ ++ int ret; ++ ++ mutex_lock(&phydev->mdio.bus->mdio_lock); ++ ret = __phy_modify_changed(phydev, regnum, mask, set); ++ mutex_unlock(&phydev->mdio.bus->mdio_lock); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(phy_modify_changed); ++ ++/** ++ * __phy_modify - Convenience function for modifying a PHY register ++ * @phydev: the phy_device struct ++ * @regnum: register number to modify ++ * @mask: bit mask of bits to clear ++ * @set: new value of bits set in mask to write to @regnum ++ * ++ * NOTE: MUST NOT be called from interrupt context, ++ * because the bus read/write functions may wait for an interrupt ++ * to conclude the operation. ++ */ ++int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) ++{ ++ int ret; ++ ++ ret = __phy_modify_changed(phydev, regnum, mask, set); + + return ret < 0 ? ret : 0; + } +@@ -411,7 +464,7 @@ int phy_modify(struct phy_device *phydev + EXPORT_SYMBOL_GPL(phy_modify); + + /** +- * __phy_modify_mmd - Convenience function for modifying a register on MMD ++ * __phy_modify_mmd_changed - Function for modifying a register on MMD + * @phydev: the phy_device struct + * @devad: the MMD containing register to modify + * @regnum: register number to modify +@@ -420,17 +473,73 @@ EXPORT_SYMBOL_GPL(phy_modify); + * + * Unlocked helper function which allows a MMD register to be modified as + * new register value = (old register value & ~mask) | set ++ * ++ * Returns negative errno, 0 if there was no change, and 1 in case of change + */ +-int __phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, +- u16 mask, u16 set) ++int __phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set) + { +- int ret; ++ int new, ret; + + ret = __phy_read_mmd(phydev, devad, regnum); + if (ret < 0) + return ret; + +- ret = __phy_write_mmd(phydev, devad, regnum, (ret & ~mask) | set); ++ new = (ret & ~mask) | set; ++ if (new == ret) ++ return 0; ++ ++ ret = __phy_write_mmd(phydev, devad, regnum, new); ++ ++ return ret < 0 ? ret : 1; ++} ++EXPORT_SYMBOL_GPL(__phy_modify_mmd_changed); ++ ++/** ++ * phy_modify_mmd_changed - Function for modifying a register on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @mask: bit mask of bits to clear ++ * @set: new value of bits set in mask to write to @regnum ++ * ++ * NOTE: MUST NOT be called from interrupt context, ++ * because the bus read/write functions may wait for an interrupt ++ * to conclude the operation. ++ * ++ * Returns negative errno, 0 if there was no change, and 1 in case of change ++ */ ++int phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set) ++{ ++ int ret; ++ ++ mutex_lock(&phydev->mdio.bus->mdio_lock); ++ ret = __phy_modify_mmd_changed(phydev, devad, regnum, mask, set); ++ mutex_unlock(&phydev->mdio.bus->mdio_lock); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(phy_modify_mmd_changed); ++ ++/** ++ * __phy_modify_mmd - Convenience function for modifying a register on MMD ++ * @phydev: the phy_device struct ++ * @devad: the MMD containing register to modify ++ * @regnum: register number to modify ++ * @mask: bit mask of bits to clear ++ * @set: new value of bits set in mask to write to @regnum ++ * ++ * NOTE: MUST NOT be called from interrupt context, ++ * because the bus read/write functions may wait for an interrupt ++ * to conclude the operation. ++ */ ++int __phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set) ++{ ++ int ret; ++ ++ ret = __phy_modify_mmd_changed(phydev, devad, regnum, mask, set); + + return ret < 0 ? ret : 0; + } +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -795,13 +795,21 @@ int phy_write_mmd(struct phy_device *phy + */ + int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val); + ++int __phy_modify_changed(struct phy_device *phydev, u32 regnum, u16 mask, ++ u16 set); ++int phy_modify_changed(struct phy_device *phydev, u32 regnum, u16 mask, ++ u16 set); + int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set); + int phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set); + ++int __phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set); ++int phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum, ++ u16 mask, u16 set); + int __phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, +- u16 mask, u16 set); ++ u16 mask, u16 set); + int phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, +- u16 mask, u16 set); ++ u16 mask, u16 set); + + /** + * __phy_set_bits - Convenience function for setting bits in a PHY register diff --git a/target/linux/generic/backport-4.19/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch b/target/linux/generic/backport-4.19/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch new file mode 100644 index 0000000000..6d47fa9634 --- /dev/null +++ b/target/linux/generic/backport-4.19/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch @@ -0,0 +1,64 @@ +From 2c3db705737cf52d7d24c993f0889b25b956c718 Mon Sep 17 00:00:00 2001 +From: Heiner Kallweit +Date: Mon, 18 Feb 2019 21:27:18 +0100 +Subject: [PATCH 605/660] net: phy: add genphy_c45_check_and_restart_aneg + +This function will be used by config_aneg callback implementations of +PHY drivers and allows to reduce boilerplate code. + +Signed-off-by: Heiner Kallweit +Signed-off-by: David S. Miller +--- + drivers/net/phy/phy-c45.c | 30 ++++++++++++++++++++++++++++++ + include/linux/phy.h | 1 + + 2 files changed, 31 insertions(+) + +--- a/drivers/net/phy/phy-c45.c ++++ b/drivers/net/phy/phy-c45.c +@@ -110,6 +110,36 @@ int genphy_c45_restart_aneg(struct phy_d + EXPORT_SYMBOL_GPL(genphy_c45_restart_aneg); + + /** ++ * genphy_c45_check_and_restart_aneg - Enable and restart auto-negotiation ++ * @phydev: target phy_device struct ++ * @restart: whether aneg restart is requested ++ * ++ * This assumes that the auto-negotiation MMD is present. ++ * ++ * Check, and restart auto-negotiation if needed. ++ */ ++int genphy_c45_check_and_restart_aneg(struct phy_device *phydev, bool restart) ++{ ++ int ret = 0; ++ ++ if (!restart) { ++ /* Configure and restart aneg if it wasn't set before */ ++ ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1); ++ if (ret < 0) ++ return ret; ++ ++ if (!(ret & MDIO_AN_CTRL1_ENABLE)) ++ restart = true; ++ } ++ ++ if (restart) ++ ret = genphy_c45_restart_aneg(phydev); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(genphy_c45_check_and_restart_aneg); ++ ++/** + * genphy_c45_aneg_done - return auto-negotiation complete status + * @phydev: target phy_device struct + * +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -1098,6 +1098,7 @@ int genphy_write_mmd_unsupported(struct + + /* Clause 45 PHY */ + int genphy_c45_restart_aneg(struct phy_device *phydev); ++int genphy_c45_check_and_restart_aneg(struct phy_device *phydev, bool restart); + int genphy_c45_aneg_done(struct phy_device *phydev); + int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask); + int genphy_c45_read_lpa(struct phy_device *phydev); diff --git a/target/linux/generic/backport-4.19/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch b/target/linux/generic/backport-4.19/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch new file mode 100644 index 0000000000..1c3f1cc01a --- /dev/null +++ b/target/linux/generic/backport-4.19/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch @@ -0,0 +1,59 @@ +From 4c4323084e9a67210c8d269dceba1be99356c414 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 28 May 2019 10:57:18 +0100 +Subject: [PATCH 606/660] net: phylink: remove netdev from phylink mii ioctl + emulation + +The netdev used in the phylink ioctl emulation is never used, so let's +remove it. + +Signed-off-by: Russell King +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1360,8 +1360,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_ee + * + * FIXME: should deal with negotiation state too. + */ +-static int phylink_mii_emul_read(struct net_device *ndev, unsigned int reg, +- struct phylink_link_state *state, bool aneg) ++static int phylink_mii_emul_read(unsigned int reg, ++ struct phylink_link_state *state) + { + struct fixed_phy_status fs; + int val; +@@ -1376,8 +1376,6 @@ static int phylink_mii_emul_read(struct + if (reg == MII_BMSR) { + if (!state->an_complete) + val &= ~BMSR_ANEGCOMPLETE; +- if (!aneg) +- val &= ~BMSR_ANEGCAPABLE; + } + return val; + } +@@ -1473,8 +1471,7 @@ static int phylink_mii_read(struct phyli + case MLO_AN_FIXED: + if (phy_id == 0) { + phylink_get_fixed_state(pl, &state); +- val = phylink_mii_emul_read(pl->netdev, reg, &state, +- true); ++ val = phylink_mii_emul_read(reg, &state); + } + break; + +@@ -1487,8 +1484,7 @@ static int phylink_mii_read(struct phyli + if (val < 0) + return val; + +- val = phylink_mii_emul_read(pl->netdev, reg, &state, +- true); ++ val = phylink_mii_emul_read(reg, &state); + } + break; + } diff --git a/target/linux/generic/backport-4.19/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch b/target/linux/generic/backport-4.19/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch new file mode 100644 index 0000000000..84a1c853d1 --- /dev/null +++ b/target/linux/generic/backport-4.19/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch @@ -0,0 +1,90 @@ +From cba0aba37d2228556e0d1f776d403435868cdbfa Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 28 May 2019 10:57:23 +0100 +Subject: [PATCH 607/660] net: phylink: support for link gpio interrupt + +Add support for using GPIO interrupts with a fixed-link GPIO rather than +polling the GPIO every second and invoking the phylink resolution. This +avoids unnecessary calls to mac_config(). + +Reviewed-by: Florian Fainelli +Signed-off-by: Russell King +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 36 ++++++++++++++++++++++++++++++++---- + 1 file changed, 32 insertions(+), 4 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -59,6 +59,7 @@ struct phylink { + phy_interface_t cur_interface; + + struct gpio_desc *link_gpio; ++ unsigned int link_irq; + struct timer_list link_poll; + void (*get_fixed_state)(struct net_device *dev, + struct phylink_link_state *s); +@@ -645,7 +646,7 @@ void phylink_destroy(struct phylink *pl) + { + if (pl->sfp_bus) + sfp_unregister_upstream(pl->sfp_bus); +- if (!IS_ERR_OR_NULL(pl->link_gpio)) ++ if (pl->link_gpio) + gpiod_put(pl->link_gpio); + + cancel_work_sync(&pl->resolve); +@@ -912,6 +913,15 @@ void phylink_mac_change(struct phylink * + } + EXPORT_SYMBOL_GPL(phylink_mac_change); + ++static irqreturn_t phylink_link_handler(int irq, void *data) ++{ ++ struct phylink *pl = data; ++ ++ phylink_run_resolve(pl); ++ ++ return IRQ_HANDLED; ++} ++ + /** + * phylink_start() - start a phylink instance + * @pl: a pointer to a &struct phylink returned from phylink_create() +@@ -947,7 +957,22 @@ void phylink_start(struct phylink *pl) + clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); + phylink_run_resolve(pl); + +- if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) ++ if (pl->link_an_mode == MLO_AN_FIXED && pl->link_gpio) { ++ int irq = gpiod_to_irq(pl->link_gpio); ++ ++ if (irq > 0) { ++ if (!request_irq(irq, phylink_link_handler, ++ IRQF_TRIGGER_RISING | ++ IRQF_TRIGGER_FALLING, ++ "netdev link", pl)) ++ pl->link_irq = irq; ++ else ++ irq = 0; ++ } ++ if (irq <= 0) ++ mod_timer(&pl->link_poll, jiffies + HZ); ++ } ++ if (pl->link_an_mode == MLO_AN_FIXED && pl->get_fixed_state) + mod_timer(&pl->link_poll, jiffies + HZ); + if (pl->sfp_bus) + sfp_upstream_start(pl->sfp_bus); +@@ -973,8 +998,11 @@ void phylink_stop(struct phylink *pl) + phy_stop(pl->phydev); + if (pl->sfp_bus) + sfp_upstream_stop(pl->sfp_bus); +- if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) +- del_timer_sync(&pl->link_poll); ++ del_timer_sync(&pl->link_poll); ++ if (pl->link_irq) { ++ free_irq(pl->link_irq, pl); ++ pl->link_irq = 0; ++ } + + phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED); + } diff --git a/target/linux/generic/backport-4.19/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch b/target/linux/generic/backport-4.19/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch new file mode 100644 index 0000000000..3a601c65b0 --- /dev/null +++ b/target/linux/generic/backport-4.19/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch @@ -0,0 +1,77 @@ +From eb5df3d026824832831376bbdf04e01a52776eea Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 28 May 2019 10:57:29 +0100 +Subject: [PATCH 608/660] net: phy: allow Clause 45 access via mii ioctl + +Allow userspace to generate Clause 45 MII access cycles via phylib. +This is useful for tools such as mii-diag to be able to inspect Clause +45 PHYs. + +Reviewed-by: Florian Fainelli +Signed-off-by: Russell King +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phy.c | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -397,6 +397,7 @@ int phy_mii_ioctl(struct phy_device *phy + struct mii_ioctl_data *mii_data = if_mii(ifr); + u16 val = mii_data->val_in; + bool change_autoneg = false; ++ int prtad, devad; + + switch (cmd) { + case SIOCGMIIPHY: +@@ -404,14 +405,29 @@ int phy_mii_ioctl(struct phy_device *phy + /* fall through */ + + case SIOCGMIIREG: +- mii_data->val_out = mdiobus_read(phydev->mdio.bus, +- mii_data->phy_id, +- mii_data->reg_num); ++ if (mdio_phy_id_is_c45(mii_data->phy_id)) { ++ prtad = mdio_phy_id_prtad(mii_data->phy_id); ++ devad = mdio_phy_id_devad(mii_data->phy_id); ++ devad = MII_ADDR_C45 | devad << 16 | mii_data->reg_num; ++ } else { ++ prtad = mii_data->phy_id; ++ devad = mii_data->reg_num; ++ } ++ mii_data->val_out = mdiobus_read(phydev->mdio.bus, prtad, ++ devad); + return 0; + + case SIOCSMIIREG: +- if (mii_data->phy_id == phydev->mdio.addr) { +- switch (mii_data->reg_num) { ++ if (mdio_phy_id_is_c45(mii_data->phy_id)) { ++ prtad = mdio_phy_id_prtad(mii_data->phy_id); ++ devad = mdio_phy_id_devad(mii_data->phy_id); ++ devad = MII_ADDR_C45 | devad << 16 | mii_data->reg_num; ++ } else { ++ prtad = mii_data->phy_id; ++ devad = mii_data->reg_num; ++ } ++ if (prtad == phydev->mdio.addr) { ++ switch (devad) { + case MII_BMCR: + if ((val & (BMCR_RESET | BMCR_ANENABLE)) == 0) { + if (phydev->autoneg == AUTONEG_ENABLE) +@@ -443,11 +459,10 @@ int phy_mii_ioctl(struct phy_device *phy + } + } + +- mdiobus_write(phydev->mdio.bus, mii_data->phy_id, +- mii_data->reg_num, val); ++ mdiobus_write(phydev->mdio.bus, prtad, devad, val); + +- if (mii_data->phy_id == phydev->mdio.addr && +- mii_data->reg_num == MII_BMCR && ++ if (prtad == phydev->mdio.addr && ++ devad == MII_BMCR && + val & BMCR_RESET) + return phy_init_hw(phydev); + diff --git a/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch b/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch new file mode 100644 index 0000000000..74dc39fa7f --- /dev/null +++ b/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch @@ -0,0 +1,94 @@ +From aeabfaa63285470e81fa341e14f92d68880aa160 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 28 May 2019 10:57:34 +0100 +Subject: [PATCH 609/660] net: sfp: add mandatory attach/detach methods for sfp + buses + +Add attach and detach methods for SFP buses, which will allow us to get +rid of the netdev storage in sfp-bus. + +Signed-off-by: Russell King +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 16 ++++++++++++++++ + drivers/net/phy/sfp-bus.c | 4 ++-- + include/linux/sfp.h | 6 ++++++ + 3 files changed, 24 insertions(+), 2 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1615,6 +1615,20 @@ int phylink_mii_ioctl(struct phylink *pl + } + EXPORT_SYMBOL_GPL(phylink_mii_ioctl); + ++static void phylink_sfp_attach(void *upstream, struct sfp_bus *bus) ++{ ++ struct phylink *pl = upstream; ++ ++ pl->netdev->sfp_bus = bus; ++} ++ ++static void phylink_sfp_detach(void *upstream, struct sfp_bus *bus) ++{ ++ struct phylink *pl = upstream; ++ ++ pl->netdev->sfp_bus = NULL; ++} ++ + static int phylink_sfp_module_insert(void *upstream, + const struct sfp_eeprom_id *id) + { +@@ -1733,6 +1747,8 @@ static void phylink_sfp_disconnect_phy(v + } + + static const struct sfp_upstream_ops sfp_phylink_ops = { ++ .attach = phylink_sfp_attach, ++ .detach = phylink_sfp_detach, + .module_insert = phylink_sfp_module_insert, + .link_up = phylink_sfp_link_up, + .link_down = phylink_sfp_link_down, +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -350,7 +350,7 @@ static int sfp_register_bus(struct sfp_b + bus->socket_ops->attach(bus->sfp); + if (bus->started) + bus->socket_ops->start(bus->sfp); +- bus->netdev->sfp_bus = bus; ++ bus->upstream_ops->attach(bus->upstream, bus); + bus->registered = true; + return 0; + } +@@ -359,8 +359,8 @@ static void sfp_unregister_bus(struct sf + { + const struct sfp_upstream_ops *ops = bus->upstream_ops; + +- bus->netdev->sfp_bus = NULL; + if (bus->registered) { ++ bus->upstream_ops->detach(bus->upstream, bus); + if (bus->started) + bus->socket_ops->stop(bus->sfp); + bus->socket_ops->detach(bus->sfp); +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -469,6 +469,10 @@ struct sfp_bus; + + /** + * struct sfp_upstream_ops - upstream operations structure ++ * @attach: called when the sfp socket driver is bound to the upstream ++ * (mandatory). ++ * @detach: called when the sfp socket driver is unbound from the upstream ++ * (mandatory). + * @module_insert: called after a module has been detected to determine + * whether the module is supported for the upstream device. + * @module_remove: called after the module has been removed. +@@ -481,6 +485,8 @@ struct sfp_bus; + * been removed. + */ + struct sfp_upstream_ops { ++ void (*attach)(void *priv, struct sfp_bus *bus); ++ void (*detach)(void *priv, struct sfp_bus *bus); + int (*module_insert)(void *priv, const struct sfp_eeprom_id *id); + void (*module_remove)(void *priv); + void (*link_down)(void *priv); diff --git a/target/linux/generic/backport-4.19/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch b/target/linux/generic/backport-4.19/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch new file mode 100644 index 0000000000..8f0c37e092 --- /dev/null +++ b/target/linux/generic/backport-4.19/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch @@ -0,0 +1,118 @@ +From 60d756717d772be90d07a07cd2cc140c76da3e4a Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 28 May 2019 10:57:39 +0100 +Subject: [PATCH 610/660] net: sfp: remove sfp-bus use of netdevs + +The sfp-bus code now no longer has any use for the network device +structure, so remove its use. + +Signed-off-by: Russell King +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 3 +-- + drivers/net/phy/sfp-bus.c | 10 +++------- + include/linux/sfp.h | 6 ++---- + 3 files changed, 6 insertions(+), 13 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -555,8 +555,7 @@ static int phylink_register_sfp(struct p + return ret; + } + +- pl->sfp_bus = sfp_register_upstream(ref.fwnode, pl->netdev, pl, +- &sfp_phylink_ops); ++ pl->sfp_bus = sfp_register_upstream(ref.fwnode, pl, &sfp_phylink_ops); + if (!pl->sfp_bus) + return -ENOMEM; + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -23,7 +23,6 @@ struct sfp_bus { + + const struct sfp_upstream_ops *upstream_ops; + void *upstream; +- struct net_device *netdev; + struct phy_device *phydev; + + bool registered; +@@ -442,13 +441,11 @@ static void sfp_upstream_clear(struct sf + { + bus->upstream_ops = NULL; + bus->upstream = NULL; +- bus->netdev = NULL; + } + + /** + * sfp_register_upstream() - Register the neighbouring device + * @fwnode: firmware node for the SFP bus +- * @ndev: network device associated with the interface + * @upstream: the upstream private data + * @ops: the upstream's &struct sfp_upstream_ops + * +@@ -459,7 +456,7 @@ static void sfp_upstream_clear(struct sf + * On error, returns %NULL. + */ + struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode, +- struct net_device *ndev, void *upstream, ++ void *upstream, + const struct sfp_upstream_ops *ops) + { + struct sfp_bus *bus = sfp_bus_get(fwnode); +@@ -469,7 +466,6 @@ struct sfp_bus *sfp_register_upstream(st + rtnl_lock(); + bus->upstream_ops = ops; + bus->upstream = upstream; +- bus->netdev = ndev; + + if (bus->sfp) { + ret = sfp_register_bus(bus); +@@ -591,7 +587,7 @@ struct sfp_bus *sfp_register_socket(stru + bus->sfp = sfp; + bus->socket_ops = ops; + +- if (bus->netdev) { ++ if (bus->upstream_ops) { + ret = sfp_register_bus(bus); + if (ret) + sfp_socket_clear(bus); +@@ -611,7 +607,7 @@ EXPORT_SYMBOL_GPL(sfp_register_socket); + void sfp_unregister_socket(struct sfp_bus *bus) + { + rtnl_lock(); +- if (bus->netdev) ++ if (bus->upstream_ops) + sfp_unregister_bus(bus); + sfp_socket_clear(bus); + rtnl_unlock(); +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -464,7 +464,6 @@ enum { + struct fwnode_handle; + struct ethtool_eeprom; + struct ethtool_modinfo; +-struct net_device; + struct sfp_bus; + + /** +@@ -510,7 +509,7 @@ int sfp_get_module_eeprom(struct sfp_bus + void sfp_upstream_start(struct sfp_bus *bus); + void sfp_upstream_stop(struct sfp_bus *bus); + struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode, +- struct net_device *ndev, void *upstream, ++ void *upstream, + const struct sfp_upstream_ops *ops); + void sfp_unregister_upstream(struct sfp_bus *bus); + #else +@@ -555,8 +554,7 @@ static inline void sfp_upstream_stop(str + } + + static inline struct sfp_bus *sfp_register_upstream( +- struct fwnode_handle *fwnode, +- struct net_device *ndev, void *upstream, ++ struct fwnode_handle *fwnode, void *upstream, + const struct sfp_upstream_ops *ops) + { + return (struct sfp_bus *)-1; diff --git a/target/linux/generic/backport-4.19/713-v5.2-net-phylink-avoid-reducing-support-mask.patch b/target/linux/generic/backport-4.19/713-v5.2-net-phylink-avoid-reducing-support-mask.patch new file mode 100644 index 0000000000..3aa8d9e571 --- /dev/null +++ b/target/linux/generic/backport-4.19/713-v5.2-net-phylink-avoid-reducing-support-mask.patch @@ -0,0 +1,84 @@ +From 8ac1d3e5cf7d277769ba3403d99f643fab1e3fae Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Sat, 23 Nov 2019 14:19:54 +0000 +Subject: [PATCH 611/660] net: phylink: avoid reducing support mask + +Avoid reducing the support mask as a result of the interface type +selected for SFP modules, or when setting the link settings through +ethtool - this should only change when the supported link modes of +the hardware combination change. + +Signed-off-by: Russell King +Signed-off-by: David S. Miller +--- + drivers/net/phy/phylink.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1137,6 +1137,7 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_ksetti + int phylink_ethtool_ksettings_set(struct phylink *pl, + const struct ethtool_link_ksettings *kset) + { ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(support); + struct ethtool_link_ksettings our_kset; + struct phylink_link_state config; + int ret; +@@ -1147,11 +1148,12 @@ int phylink_ethtool_ksettings_set(struct + kset->base.autoneg != AUTONEG_ENABLE) + return -EINVAL; + ++ linkmode_copy(support, pl->supported); + config = pl->link_config; + + /* Mask out unsupported advertisements */ + linkmode_and(config.advertising, kset->link_modes.advertising, +- pl->supported); ++ support); + + /* FIXME: should we reject autoneg if phy/mac does not support it? */ + if (kset->base.autoneg == AUTONEG_DISABLE) { +@@ -1161,7 +1163,7 @@ int phylink_ethtool_ksettings_set(struct + * duplex. + */ + s = phy_lookup_setting(kset->base.speed, kset->base.duplex, +- pl->supported, ++ support, + __ETHTOOL_LINK_MODE_MASK_NBITS, false); + if (!s) + return -EINVAL; +@@ -1191,7 +1193,7 @@ int phylink_ethtool_ksettings_set(struct + __set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising); + } + +- if (phylink_validate(pl, pl->supported, &config)) ++ if (phylink_validate(pl, support, &config)) + return -EINVAL; + + /* If autonegotiation is enabled, we must have an advertisement */ +@@ -1633,6 +1635,7 @@ static int phylink_sfp_module_insert(voi + { + struct phylink *pl = upstream; + __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(support1); + struct phylink_link_state config; + phy_interface_t iface; + int ret = 0; +@@ -1660,6 +1663,8 @@ static int phylink_sfp_module_insert(voi + return ret; + } + ++ linkmode_copy(support1, support); ++ + iface = sfp_select_interface(pl->sfp_bus, id, config.advertising); + if (iface == PHY_INTERFACE_MODE_NA) { + netdev_err(pl->netdev, +@@ -1669,7 +1674,7 @@ static int phylink_sfp_module_insert(voi + } + + config.interface = iface; +- ret = phylink_validate(pl, support, &config); ++ ret = phylink_validate(pl, support1, &config); + if (ret) { + netdev_err(pl->netdev, "validation of %s/%s with support %*pb failed: %d\n", + phylink_an_mode_str(MLO_AN_INBAND), diff --git a/target/linux/generic/backport-4.19/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch b/target/linux/generic/backport-4.19/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch new file mode 100644 index 0000000000..0509950296 --- /dev/null +++ b/target/linux/generic/backport-4.19/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch @@ -0,0 +1,94 @@ +From 254236a22109efa84c9e9f5a9c76a1719439e309 Mon Sep 17 00:00:00 2001 +From: Robert Hancock +Date: Fri, 7 Jun 2019 10:42:35 -0600 +Subject: [PATCH 612/660] net: sfp: Stop SFP polling and interrupt handling + during shutdown + +SFP device polling can cause problems during the shutdown process if the +parent devices of the network controller have been shut down already. +This problem was seen on the iMX6 platform with PCIe devices, where +accessing the device after the bus is shut down causes a hang. + +Free any acquired GPIO interrupts and stop all delayed work in the SFP +driver during the shutdown process, so that we ensure that no pending +operations are still occurring after the SFP shutdown completes. + +Signed-off-by: Robert Hancock +Signed-off-by: David S. Miller +--- + drivers/net/phy/sfp.c | 31 ++++++++++++++++++++++++++----- + 1 file changed, 26 insertions(+), 5 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -183,6 +183,7 @@ struct sfp { + int (*write)(struct sfp *, bool, u8, void *, size_t); + + struct gpio_desc *gpio[GPIO_MAX]; ++ int gpio_irq[GPIO_MAX]; + + bool attached; + struct mutex st_mutex; /* Protects state */ +@@ -1803,7 +1804,7 @@ static int sfp_probe(struct platform_dev + const struct sff_data *sff; + struct sfp *sfp; + bool poll = false; +- int irq, err, i; ++ int err, i; + + sfp = sfp_alloc(&pdev->dev); + if (IS_ERR(sfp)) +@@ -1885,19 +1886,22 @@ static int sfp_probe(struct platform_dev + if (gpio_flags[i] != GPIOD_IN || !sfp->gpio[i]) + continue; + +- irq = gpiod_to_irq(sfp->gpio[i]); +- if (!irq) { ++ sfp->gpio_irq[i] = gpiod_to_irq(sfp->gpio[i]); ++ if (!sfp->gpio_irq[i]) { + poll = true; + continue; + } + +- err = devm_request_threaded_irq(sfp->dev, irq, NULL, sfp_irq, ++ err = devm_request_threaded_irq(sfp->dev, sfp->gpio_irq[i], ++ NULL, sfp_irq, + IRQF_ONESHOT | + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING, + dev_name(sfp->dev), sfp); +- if (err) ++ if (err) { ++ sfp->gpio_irq[i] = 0; + poll = true; ++ } + } + + if (poll) +@@ -1928,9 +1932,26 @@ static int sfp_remove(struct platform_de + return 0; + } + ++static void sfp_shutdown(struct platform_device *pdev) ++{ ++ struct sfp *sfp = platform_get_drvdata(pdev); ++ int i; ++ ++ for (i = 0; i < GPIO_MAX; i++) { ++ if (!sfp->gpio_irq[i]) ++ continue; ++ ++ devm_free_irq(sfp->dev, sfp->gpio_irq[i], sfp); ++ } ++ ++ cancel_delayed_work_sync(&sfp->poll); ++ cancel_delayed_work_sync(&sfp->timeout); ++} ++ + static struct platform_driver sfp_driver = { + .probe = sfp_probe, + .remove = sfp_remove, ++ .shutdown = sfp_shutdown, + .driver = { + .name = "sfp", + .of_match_table = sfp_of_match, diff --git a/target/linux/generic/backport-4.19/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch b/target/linux/generic/backport-4.19/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch new file mode 100644 index 0000000000..94fb2fb3e4 --- /dev/null +++ b/target/linux/generic/backport-4.19/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch @@ -0,0 +1,141 @@ +From b8803113537a1c1f457eba6270d46e3af305031f Mon Sep 17 00:00:00 2001 +From: Arseny Solokha +Date: Wed, 24 Jul 2019 20:31:39 +0700 +Subject: [PATCH 613/660] net: phylink: don't start and stop SGMII PHYs in SFP + modules twice + +SFP modules connected using the SGMII interface have their own PHYs which +are handled by the struct phylink's phydev field. On the other hand, for +the modules connected using 1000Base-X interface that field is not set. + +Since commit ce0aa27ff3f6 ("sfp: add sfp-bus to bridge between network +devices and sfp cages") phylink_start() ends up setting the phydev field +using the sfp-bus infrastructure, which eventually calls phy_start() on it, +and then calling phy_start() again on the same phydev from phylink_start() +itself. Similar call sequence holds for phylink_stop(), only in the reverse +order. This results in WARNs during network interface bringup and shutdown +when a copper SFP module is connected, as phy_start() and phy_stop() are +called twice in a row for the same phy_device: + + % ip link set up dev eth0 + ------------[ cut here ]------------ + called from state UP + WARNING: CPU: 1 PID: 155 at drivers/net/phy/phy.c:895 phy_start+0x74/0xc0 + Modules linked in: + CPU: 1 PID: 155 Comm: backend Not tainted 5.2.0+ #1 + NIP: c0227bf0 LR: c0227bf0 CTR: c004d224 + REGS: df547720 TRAP: 0700 Not tainted (5.2.0+) + MSR: 00029000 CR: 24002822 XER: 00000000 + + GPR00: c0227bf0 df5477d8 df5d7080 00000014 df9d2370 df9d5ac4 1f4eb000 00000001 + GPR08: c061fe58 00000000 00000000 df5477d8 0000003c 100c8768 00000000 00000000 + GPR16: df486a00 c046f1c8 c046eea0 00000000 c046e904 c0239604 db68449c 00000000 + GPR24: e9083204 00000000 00000001 db684460 e9083404 00000000 db6dce00 db6dcc00 + NIP [c0227bf0] phy_start+0x74/0xc0 + LR [c0227bf0] phy_start+0x74/0xc0 + Call Trace: + [df5477d8] [c0227bf0] phy_start+0x74/0xc0 (unreliable) + [df5477e8] [c023cad0] startup_gfar+0x398/0x3f4 + [df547828] [c023cf08] gfar_enet_open+0x364/0x374 + [df547898] [c029d870] __dev_open+0xe4/0x140 + [df5478c8] [c029db70] __dev_change_flags+0xf0/0x188 + [df5478f8] [c029dc28] dev_change_flags+0x20/0x54 + [df547918] [c02ae304] do_setlink+0x310/0x818 + [df547a08] [c02b1eb8] __rtnl_newlink+0x384/0x6b0 + [df547c28] [c02b222c] rtnl_newlink+0x48/0x68 + [df547c48] [c02ad7c8] rtnetlink_rcv_msg+0x240/0x27c + [df547c98] [c02cc068] netlink_rcv_skb+0x8c/0xf0 + [df547cd8] [c02cba3c] netlink_unicast+0x114/0x19c + [df547d08] [c02cbd74] netlink_sendmsg+0x2b0/0x2c0 + [df547d58] [c027b668] sock_sendmsg_nosec+0x20/0x40 + [df547d68] [c027d080] ___sys_sendmsg+0x17c/0x1dc + [df547e98] [c027df7c] __sys_sendmsg+0x68/0x84 + [df547ef8] [c027e430] sys_socketcall+0x1a0/0x204 + [df547f38] [c000d1d8] ret_from_syscall+0x0/0x38 + --- interrupt: c01 at 0xfd4e030 + LR = 0xfd4e010 + Instruction dump: + 813f0188 38800000 2b890005 419d0014 3d40c046 5529103a 394aa208 7c8a482e + 3c60c046 3863a1b8 4cc63182 4be009a1 <0fe00000> 48000030 3c60c046 3863a1d0 + ---[ end trace d4c095aeaf6ea998 ]--- + +and + + % ip link set down dev eth0 + ------------[ cut here ]------------ + called from state HALTED + WARNING: CPU: 1 PID: 184 at drivers/net/phy/phy.c:858 phy_stop+0x3c/0x88 + + <...> + + Call Trace: + [df581788] [c0228450] phy_stop+0x3c/0x88 (unreliable) + [df581798] [c022d548] sfp_sm_phy_detach+0x1c/0x44 + [df5817a8] [c022e8cc] sfp_sm_event+0x4b0/0x87c + [df581848] [c022f04c] sfp_upstream_stop+0x34/0x44 + [df581858] [c0225608] phylink_stop+0x7c/0xe4 + [df581868] [c023c57c] stop_gfar+0x7c/0x94 + [df581888] [c023c5b8] gfar_close+0x24/0x94 + [df5818a8] [c0298688] __dev_close_many+0xdc/0xf8 + [df5818c8] [c029db58] __dev_change_flags+0xd8/0x188 + [df5818f8] [c029dc28] dev_change_flags+0x20/0x54 + [df581918] [c02ae304] do_setlink+0x310/0x818 + [df581a08] [c02b1eb8] __rtnl_newlink+0x384/0x6b0 + [df581c28] [c02b222c] rtnl_newlink+0x48/0x68 + [df581c48] [c02ad7c8] rtnetlink_rcv_msg+0x240/0x27c + [df581c98] [c02cc068] netlink_rcv_skb+0x8c/0xf0 + [df581cd8] [c02cba3c] netlink_unicast+0x114/0x19c + [df581d08] [c02cbd74] netlink_sendmsg+0x2b0/0x2c0 + [df581d58] [c027b668] sock_sendmsg_nosec+0x20/0x40 + [df581d68] [c027d080] ___sys_sendmsg+0x17c/0x1dc + [df581e98] [c027df7c] __sys_sendmsg+0x68/0x84 + [df581ef8] [c027e430] sys_socketcall+0x1a0/0x204 + [df581f38] [c000d1d8] ret_from_syscall+0x0/0x38 + + <...> + + ---[ end trace d4c095aeaf6ea999 ]--- + +SFP modules with the 1000Base-X interface are not affected. + +Place explicit calls to phy_start() and phy_stop() before enabling or after +disabling an attached SFP module, where phydev is not yet set (or is +already unset), so they will be made only from the inside of sfp-bus, if +needed. + +Fixes: 217962615662 ("net: phy: warn if phy_start is called from invalid state") +Signed-off-by: Arseny Solokha +Acked-by: Russell King +Signed-off-by: David S. Miller +--- + drivers/net/phy/phylink.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -973,10 +973,10 @@ void phylink_start(struct phylink *pl) + } + if (pl->link_an_mode == MLO_AN_FIXED && pl->get_fixed_state) + mod_timer(&pl->link_poll, jiffies + HZ); +- if (pl->sfp_bus) +- sfp_upstream_start(pl->sfp_bus); + if (pl->phydev) + phy_start(pl->phydev); ++ if (pl->sfp_bus) ++ sfp_upstream_start(pl->sfp_bus); + } + EXPORT_SYMBOL_GPL(phylink_start); + +@@ -993,10 +993,10 @@ void phylink_stop(struct phylink *pl) + { + ASSERT_RTNL(); + +- if (pl->phydev) +- phy_stop(pl->phydev); + if (pl->sfp_bus) + sfp_upstream_stop(pl->sfp_bus); ++ if (pl->phydev) ++ phy_stop(pl->phydev); + del_timer_sync(&pl->link_poll); + if (pl->link_irq) { + free_irq(pl->link_irq, pl); diff --git a/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch b/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch new file mode 100644 index 0000000000..27ab78f3ee --- /dev/null +++ b/target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch @@ -0,0 +1,179 @@ +From 4054955f0da08c81d42220cb445820d474f1ac92 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Sat, 14 Sep 2019 14:21:22 +0100 +Subject: [PATCH 614/660] net: sfp: move fwnode parsing into sfp-bus layer + +Rather than parsing the sfp firmware node in phylink, parse it in the +sfp-bus code, so we can re-use this code for PHYs without having to +duplicate the parsing. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 21 ++++--------- + drivers/net/phy/sfp-bus.c | 65 +++++++++++++++++++++++++-------------- + include/linux/sfp.h | 10 +++--- + 3 files changed, 53 insertions(+), 43 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -538,26 +538,17 @@ static const struct sfp_upstream_ops sfp + static int phylink_register_sfp(struct phylink *pl, + struct fwnode_handle *fwnode) + { +- struct fwnode_reference_args ref; ++ struct sfp_bus *bus; + int ret; + +- if (!fwnode) +- return 0; +- +- ret = fwnode_property_get_reference_args(fwnode, "sfp", NULL, +- 0, 0, &ref); +- if (ret < 0) { +- if (ret == -ENOENT) +- return 0; +- +- netdev_err(pl->netdev, "unable to parse \"sfp\" node: %d\n", +- ret); ++ bus = sfp_register_upstream_node(fwnode, pl, &sfp_phylink_ops); ++ if (IS_ERR(bus)) { ++ ret = PTR_ERR(bus); ++ netdev_err(pl->netdev, "unable to attach SFP bus: %d\n", ret); + return ret; + } + +- pl->sfp_bus = sfp_register_upstream(ref.fwnode, pl, &sfp_phylink_ops); +- if (!pl->sfp_bus) +- return -ENOMEM; ++ pl->sfp_bus = bus; + + return 0; + } +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -444,45 +445,63 @@ static void sfp_upstream_clear(struct sf + } + + /** +- * sfp_register_upstream() - Register the neighbouring device +- * @fwnode: firmware node for the SFP bus ++ * sfp_register_upstream_node() - parse and register the neighbouring device ++ * @fwnode: firmware node for the parent device (MAC or PHY) + * @upstream: the upstream private data + * @ops: the upstream's &struct sfp_upstream_ops + * +- * Register the upstream device (eg, PHY) with the SFP bus. MAC drivers +- * should use phylink, which will call this function for them. Returns +- * a pointer to the allocated &struct sfp_bus. ++ * Parse the parent device's firmware node for a SFP bus, and register the ++ * SFP bus using sfp_register_upstream(). + * +- * On error, returns %NULL. ++ * Returns: on success, a pointer to the sfp_bus structure, ++ * %NULL if no SFP is specified, ++ * on failure, an error pointer value: ++ * corresponding to the errors detailed for ++ * fwnode_property_get_reference_args(). ++ * %-ENOMEM if we failed to allocate the bus. ++ * an error from the upstream's connect_phy() method. + */ +-struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode, +- void *upstream, +- const struct sfp_upstream_ops *ops) +-{ +- struct sfp_bus *bus = sfp_bus_get(fwnode); +- int ret = 0; +- +- if (bus) { +- rtnl_lock(); +- bus->upstream_ops = ops; +- bus->upstream = upstream; ++struct sfp_bus *sfp_register_upstream_node(struct fwnode_handle *fwnode, ++ void *upstream, ++ const struct sfp_upstream_ops *ops) ++{ ++ struct fwnode_reference_args ref; ++ struct sfp_bus *bus; ++ int ret; + +- if (bus->sfp) { +- ret = sfp_register_bus(bus); +- if (ret) +- sfp_upstream_clear(bus); +- } +- rtnl_unlock(); ++ ret = fwnode_property_get_reference_args(fwnode, "sfp", NULL, ++ 0, 0, &ref); ++ if (ret == -ENOENT) ++ return NULL; ++ else if (ret < 0) ++ return ERR_PTR(ret); ++ ++ bus = sfp_bus_get(ref.fwnode); ++ fwnode_handle_put(ref.fwnode); ++ if (!bus) ++ return ERR_PTR(-ENOMEM); ++ ++ rtnl_lock(); ++ bus->upstream_ops = ops; ++ bus->upstream = upstream; ++ ++ if (bus->sfp) { ++ ret = sfp_register_bus(bus); ++ if (ret) ++ sfp_upstream_clear(bus); ++ } else { ++ ret = 0; + } ++ rtnl_unlock(); + + if (ret) { + sfp_bus_put(bus); +- bus = NULL; ++ bus = ERR_PTR(ret); + } + + return bus; + } +-EXPORT_SYMBOL_GPL(sfp_register_upstream); ++EXPORT_SYMBOL_GPL(sfp_register_upstream_node); + + /** + * sfp_unregister_upstream() - Unregister sfp bus +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -508,9 +508,9 @@ int sfp_get_module_eeprom(struct sfp_bus + u8 *data); + void sfp_upstream_start(struct sfp_bus *bus); + void sfp_upstream_stop(struct sfp_bus *bus); +-struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode, +- void *upstream, +- const struct sfp_upstream_ops *ops); ++struct sfp_bus *sfp_register_upstream_node(struct fwnode_handle *fwnode, ++ void *upstream, ++ const struct sfp_upstream_ops *ops); + void sfp_unregister_upstream(struct sfp_bus *bus); + #else + static inline int sfp_parse_port(struct sfp_bus *bus, +@@ -553,11 +553,11 @@ static inline void sfp_upstream_stop(str + { + } + +-static inline struct sfp_bus *sfp_register_upstream( ++static inline struct sfp_bus *sfp_register_upstream_node( + struct fwnode_handle *fwnode, void *upstream, + const struct sfp_upstream_ops *ops) + { +- return (struct sfp_bus *)-1; ++ return NULL; + } + + static inline void sfp_unregister_upstream(struct sfp_bus *bus) diff --git a/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch b/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch new file mode 100644 index 0000000000..f7dd187c16 --- /dev/null +++ b/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch @@ -0,0 +1,254 @@ +From 863b5b6941f9f43b924393b6ba2b36647e7dee42 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 7 Nov 2019 17:06:08 +0000 +Subject: [PATCH 615/660] net: sfp: rework upstream interface + +The current upstream interface is an all-or-nothing, which is +sub-optimal for future changes, as it doesn't allow the upstream driver +to prepare for the SFP module becoming available, as it is at boot. + +Switch to a find-sfp-bus, add-upstream, del-upstream, put-sfp-bus +interface structure instead, which allows the upstream driver to +prepare for a module being available as soon as add-upstream is called. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 10 +++-- + drivers/net/phy/sfp-bus.c | 92 +++++++++++++++++++++++++++------------ + include/linux/sfp.h | 25 +++++++---- + 3 files changed, 88 insertions(+), 39 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -541,7 +541,7 @@ static int phylink_register_sfp(struct p + struct sfp_bus *bus; + int ret; + +- bus = sfp_register_upstream_node(fwnode, pl, &sfp_phylink_ops); ++ bus = sfp_bus_find_fwnode(fwnode); + if (IS_ERR(bus)) { + ret = PTR_ERR(bus); + netdev_err(pl->netdev, "unable to attach SFP bus: %d\n", ret); +@@ -550,7 +550,10 @@ static int phylink_register_sfp(struct p + + pl->sfp_bus = bus; + +- return 0; ++ ret = sfp_bus_add_upstream(bus, pl, &sfp_phylink_ops); ++ sfp_bus_put(bus); ++ ++ return ret; + } + + /** +@@ -634,8 +637,7 @@ EXPORT_SYMBOL_GPL(phylink_create); + */ + void phylink_destroy(struct phylink *pl) + { +- if (pl->sfp_bus) +- sfp_unregister_upstream(pl->sfp_bus); ++ sfp_bus_del_upstream(pl->sfp_bus); + if (pl->link_gpio) + gpiod_put(pl->link_gpio); + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -328,10 +328,19 @@ static void sfp_bus_release(struct kref + kfree(bus); + } + +-static void sfp_bus_put(struct sfp_bus *bus) ++/** ++ * sfp_bus_put() - put a reference on the &struct sfp_bus ++ * bus: the &struct sfp_bus found via sfp_bus_find_fwnode() ++ * ++ * Put a reference on the &struct sfp_bus and free the underlying structure ++ * if this was the last reference. ++ */ ++void sfp_bus_put(struct sfp_bus *bus) + { +- kref_put_mutex(&bus->kref, sfp_bus_release, &sfp_mutex); ++ if (bus) ++ kref_put_mutex(&bus->kref, sfp_bus_release, &sfp_mutex); + } ++EXPORT_SYMBOL_GPL(sfp_bus_put); + + static int sfp_register_bus(struct sfp_bus *bus) + { +@@ -347,11 +356,11 @@ static int sfp_register_bus(struct sfp_b + return ret; + } + } ++ bus->registered = true; + bus->socket_ops->attach(bus->sfp); + if (bus->started) + bus->socket_ops->start(bus->sfp); + bus->upstream_ops->attach(bus->upstream, bus); +- bus->registered = true; + return 0; + } + +@@ -445,13 +454,12 @@ static void sfp_upstream_clear(struct sf + } + + /** +- * sfp_register_upstream_node() - parse and register the neighbouring device ++ * sfp_bus_find_fwnode() - parse and locate the SFP bus from fwnode + * @fwnode: firmware node for the parent device (MAC or PHY) +- * @upstream: the upstream private data +- * @ops: the upstream's &struct sfp_upstream_ops + * +- * Parse the parent device's firmware node for a SFP bus, and register the +- * SFP bus using sfp_register_upstream(). ++ * Parse the parent device's firmware node for a SFP bus, and locate ++ * the sfp_bus structure, incrementing its reference count. This must ++ * be put via sfp_bus_put() when done. + * + * Returns: on success, a pointer to the sfp_bus structure, + * %NULL if no SFP is specified, +@@ -461,9 +469,7 @@ static void sfp_upstream_clear(struct sf + * %-ENOMEM if we failed to allocate the bus. + * an error from the upstream's connect_phy() method. + */ +-struct sfp_bus *sfp_register_upstream_node(struct fwnode_handle *fwnode, +- void *upstream, +- const struct sfp_upstream_ops *ops) ++struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode) + { + struct fwnode_reference_args ref; + struct sfp_bus *bus; +@@ -481,7 +487,39 @@ struct sfp_bus *sfp_register_upstream_no + if (!bus) + return ERR_PTR(-ENOMEM); + ++ return bus; ++} ++EXPORT_SYMBOL_GPL(sfp_bus_find_fwnode); ++ ++/** ++ * sfp_bus_add_upstream() - parse and register the neighbouring device ++ * @bus: the &struct sfp_bus found via sfp_bus_find_fwnode() ++ * @upstream: the upstream private data ++ * @ops: the upstream's &struct sfp_upstream_ops ++ * ++ * Add upstream driver for the SFP bus, and if the bus is complete, register ++ * the SFP bus using sfp_register_upstream(). This takes a reference on the ++ * bus, so it is safe to put the bus after this call. ++ * ++ * Returns: on success, a pointer to the sfp_bus structure, ++ * %NULL if no SFP is specified, ++ * on failure, an error pointer value: ++ * corresponding to the errors detailed for ++ * fwnode_property_get_reference_args(). ++ * %-ENOMEM if we failed to allocate the bus. ++ * an error from the upstream's connect_phy() method. ++ */ ++int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, ++ const struct sfp_upstream_ops *ops) ++{ ++ int ret; ++ ++ /* If no bus, return success */ ++ if (!bus) ++ return 0; ++ + rtnl_lock(); ++ kref_get(&bus->kref); + bus->upstream_ops = ops; + bus->upstream = upstream; + +@@ -494,33 +532,33 @@ struct sfp_bus *sfp_register_upstream_no + } + rtnl_unlock(); + +- if (ret) { ++ if (ret) + sfp_bus_put(bus); +- bus = ERR_PTR(ret); +- } + +- return bus; ++ return ret; + } +-EXPORT_SYMBOL_GPL(sfp_register_upstream_node); ++EXPORT_SYMBOL_GPL(sfp_bus_add_upstream); + + /** +- * sfp_unregister_upstream() - Unregister sfp bus ++ * sfp_bus_del_upstream() - Delete a sfp bus + * @bus: a pointer to the &struct sfp_bus structure for the sfp module + * +- * Unregister a previously registered upstream connection for the SFP +- * module. @bus is returned from sfp_register_upstream(). ++ * Delete a previously registered upstream connection for the SFP ++ * module. @bus should have been added by sfp_bus_add_upstream(). + */ +-void sfp_unregister_upstream(struct sfp_bus *bus) ++void sfp_bus_del_upstream(struct sfp_bus *bus) + { +- rtnl_lock(); +- if (bus->sfp) +- sfp_unregister_bus(bus); +- sfp_upstream_clear(bus); +- rtnl_unlock(); ++ if (bus) { ++ rtnl_lock(); ++ if (bus->sfp) ++ sfp_unregister_bus(bus); ++ sfp_upstream_clear(bus); ++ rtnl_unlock(); + +- sfp_bus_put(bus); ++ sfp_bus_put(bus); ++ } + } +-EXPORT_SYMBOL_GPL(sfp_unregister_upstream); ++EXPORT_SYMBOL_GPL(sfp_bus_del_upstream); + + /* Socket driver entry points */ + int sfp_add_phy(struct sfp_bus *bus, struct phy_device *phydev) +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -508,10 +508,11 @@ int sfp_get_module_eeprom(struct sfp_bus + u8 *data); + void sfp_upstream_start(struct sfp_bus *bus); + void sfp_upstream_stop(struct sfp_bus *bus); +-struct sfp_bus *sfp_register_upstream_node(struct fwnode_handle *fwnode, +- void *upstream, +- const struct sfp_upstream_ops *ops); +-void sfp_unregister_upstream(struct sfp_bus *bus); ++void sfp_bus_put(struct sfp_bus *bus); ++struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode); ++int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, ++ const struct sfp_upstream_ops *ops); ++void sfp_bus_del_upstream(struct sfp_bus *bus); + #else + static inline int sfp_parse_port(struct sfp_bus *bus, + const struct sfp_eeprom_id *id, +@@ -553,14 +554,22 @@ static inline void sfp_upstream_stop(str + { + } + +-static inline struct sfp_bus *sfp_register_upstream_node( +- struct fwnode_handle *fwnode, void *upstream, +- const struct sfp_upstream_ops *ops) ++static inline void sfp_bus_put(struct sfp_bus *bus) ++{ ++} ++ ++static inline struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode) + { + return NULL; + } + +-static inline void sfp_unregister_upstream(struct sfp_bus *bus) ++static int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, ++ const struct sfp_upstream_ops *ops) ++{ ++ return 0; ++} ++ ++static inline void sfp_bus_del_upstream(struct sfp_bus *bus) + { + } + #endif diff --git a/target/linux/generic/backport-4.19/718-v5.5-net-sfp-fix-sfp_bus_put-kernel-documentation.patch b/target/linux/generic/backport-4.19/718-v5.5-net-sfp-fix-sfp_bus_put-kernel-documentation.patch new file mode 100644 index 0000000000..59d2ce588c --- /dev/null +++ b/target/linux/generic/backport-4.19/718-v5.5-net-sfp-fix-sfp_bus_put-kernel-documentation.patch @@ -0,0 +1,27 @@ +From ea7bfd81921827d334c2a23bd11ef0e4e2abafd2 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Sat, 9 Nov 2019 08:13:50 +0000 +Subject: [PATCH 616/660] net: sfp: fix sfp_bus_put() kernel documentation + +The kbuild test robot found a problem with htmldocs with the recent +change to the SFP interfaces. Fix the kernel documentation for +sfp_bus_put() which was missing an '@' before the argument name +description. + +Fixes: 727b3668b730 ("net: sfp: rework upstream interface") +Signed-off-by: Russell King +--- + drivers/net/phy/sfp-bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -330,7 +330,7 @@ static void sfp_bus_release(struct kref + + /** + * sfp_bus_put() - put a reference on the &struct sfp_bus +- * bus: the &struct sfp_bus found via sfp_bus_find_fwnode() ++ * @bus: the &struct sfp_bus found via sfp_bus_find_fwnode() + * + * Put a reference on the &struct sfp_bus and free the underlying structure + * if this was the last reference. diff --git a/target/linux/generic/backport-4.19/719-v5.5-net-sfp-fix-sfp_bus_add_upstream-warning.patch b/target/linux/generic/backport-4.19/719-v5.5-net-sfp-fix-sfp_bus_add_upstream-warning.patch new file mode 100644 index 0000000000..9528049e1b --- /dev/null +++ b/target/linux/generic/backport-4.19/719-v5.5-net-sfp-fix-sfp_bus_add_upstream-warning.patch @@ -0,0 +1,27 @@ +From f76d84cd85f8bd3f083495f7ca723822cba8abc9 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Mon, 11 Nov 2019 10:23:35 +0000 +Subject: [PATCH 617/660] net: sfp: fix sfp_bus_add_upstream() warning + +When building with SFP disabled, the stub for sfp_bus_add_upstream() +missed "inline". Add it. + +Fixes: 727b3668b730 ("net: sfp: rework upstream interface") +Signed-off-by: Russell King +--- + include/linux/sfp.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -563,8 +563,8 @@ static inline struct sfp_bus *sfp_bus_fi + return NULL; + } + +-static int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, +- const struct sfp_upstream_ops *ops) ++static inline int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, ++ const struct sfp_upstream_ops *ops) + { + return 0; + } diff --git a/target/linux/generic/backport-4.19/720-v5.5-net-sfp-move-sfp-sub-state-machines-into-separate-fu.patch b/target/linux/generic/backport-4.19/720-v5.5-net-sfp-move-sfp-sub-state-machines-into-separate-fu.patch new file mode 100644 index 0000000000..2f90b00438 --- /dev/null +++ b/target/linux/generic/backport-4.19/720-v5.5-net-sfp-move-sfp-sub-state-machines-into-separate-fu.patch @@ -0,0 +1,124 @@ +From b9d6ed5cdb67533feda7f221eb06f2f9f1ff5047 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 11 Oct 2019 19:33:58 +0100 +Subject: [PATCH 618/660] net: sfp: move sfp sub-state machines into separate + functions + +Move the SFP sub-state machines out of the main state machine function, +in preparation for it doing a bit more with the device state. By doing +so, we ensure that our debug after the main state machine is always +printed. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 74 +++++++++++++++++++++++++------------------ + 1 file changed, 43 insertions(+), 31 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1479,19 +1479,34 @@ static void sfp_sm_mod_remove(struct sfp + dev_info(sfp->dev, "module removed\n"); + } + +-static void sfp_sm_event(struct sfp *sfp, unsigned int event) ++/* This state machine tracks the netdev up/down state */ ++static void sfp_sm_device(struct sfp *sfp, unsigned int event) + { +- mutex_lock(&sfp->sm_mutex); ++ switch (sfp->sm_dev_state) { ++ default: ++ if (event == SFP_E_DEV_UP) ++ sfp->sm_dev_state = SFP_DEV_UP; ++ break; + +- dev_dbg(sfp->dev, "SM: enter %s:%s:%s event %s\n", +- mod_state_to_str(sfp->sm_mod_state), +- dev_state_to_str(sfp->sm_dev_state), +- sm_state_to_str(sfp->sm_state), +- event_to_str(event)); ++ case SFP_DEV_UP: ++ if (event == SFP_E_DEV_DOWN) { ++ /* If the module has a PHY, avoid raising TX disable ++ * as this resets the PHY. Otherwise, raise it to ++ * turn the laser off. ++ */ ++ if (!sfp->mod_phy) ++ sfp_module_tx_disable(sfp); ++ sfp->sm_dev_state = SFP_DEV_DOWN; ++ } ++ break; ++ } ++} + +- /* This state machine tracks the insert/remove state of +- * the module, and handles probing the on-board EEPROM. +- */ ++/* This state machine tracks the insert/remove state of ++ * the module, and handles probing the on-board EEPROM. ++ */ ++static void sfp_sm_module(struct sfp *sfp, unsigned int event) ++{ + switch (sfp->sm_mod_state) { + default: + if (event == SFP_E_INSERT && sfp->attached) { +@@ -1531,27 +1546,10 @@ static void sfp_sm_event(struct sfp *sfp + } + break; + } ++} + +- /* This state machine tracks the netdev up/down state */ +- switch (sfp->sm_dev_state) { +- default: +- if (event == SFP_E_DEV_UP) +- sfp->sm_dev_state = SFP_DEV_UP; +- break; +- +- case SFP_DEV_UP: +- if (event == SFP_E_DEV_DOWN) { +- /* If the module has a PHY, avoid raising TX disable +- * as this resets the PHY. Otherwise, raise it to +- * turn the laser off. +- */ +- if (!sfp->mod_phy) +- sfp_module_tx_disable(sfp); +- sfp->sm_dev_state = SFP_DEV_DOWN; +- } +- break; +- } +- ++static void sfp_sm_main(struct sfp *sfp, unsigned int event) ++{ + /* Some events are global */ + if (sfp->sm_state != SFP_S_DOWN && + (sfp->sm_mod_state != SFP_MOD_PRESENT || +@@ -1562,7 +1560,6 @@ static void sfp_sm_event(struct sfp *sfp + if (sfp->mod_phy) + sfp_sm_phy_detach(sfp); + sfp_sm_next(sfp, SFP_S_DOWN, 0); +- mutex_unlock(&sfp->sm_mutex); + return; + } + +@@ -1617,6 +1614,21 @@ static void sfp_sm_event(struct sfp *sfp + case SFP_S_TX_DISABLE: + break; + } ++} ++ ++static void sfp_sm_event(struct sfp *sfp, unsigned int event) ++{ ++ mutex_lock(&sfp->sm_mutex); ++ ++ dev_dbg(sfp->dev, "SM: enter %s:%s:%s event %s\n", ++ mod_state_to_str(sfp->sm_mod_state), ++ dev_state_to_str(sfp->sm_dev_state), ++ sm_state_to_str(sfp->sm_state), ++ event_to_str(event)); ++ ++ sfp_sm_module(sfp, event); ++ sfp_sm_device(sfp, event); ++ sfp_sm_main(sfp, event); + + dev_dbg(sfp->dev, "SM: exit %s:%s:%s\n", + mod_state_to_str(sfp->sm_mod_state), diff --git a/target/linux/generic/backport-4.19/721-v5.5-net-sfp-move-tx-disable-on-device-down-to-main-state.patch b/target/linux/generic/backport-4.19/721-v5.5-net-sfp-move-tx-disable-on-device-down-to-main-state.patch new file mode 100644 index 0000000000..5b3caaf0fd --- /dev/null +++ b/target/linux/generic/backport-4.19/721-v5.5-net-sfp-move-tx-disable-on-device-down-to-main-state.patch @@ -0,0 +1,41 @@ +From 7e89b737c97a9e7a81dd1584000bc136b92f12fd Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 11 Oct 2019 22:14:47 +0100 +Subject: [PATCH 619/660] net: sfp: move tx disable on device down to main + state machine + +Move the tx disable assertion on device down to the main state +machine. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1489,15 +1489,8 @@ static void sfp_sm_device(struct sfp *sf + break; + + case SFP_DEV_UP: +- if (event == SFP_E_DEV_DOWN) { +- /* If the module has a PHY, avoid raising TX disable +- * as this resets the PHY. Otherwise, raise it to +- * turn the laser off. +- */ +- if (!sfp->mod_phy) +- sfp_module_tx_disable(sfp); ++ if (event == SFP_E_DEV_DOWN) + sfp->sm_dev_state = SFP_DEV_DOWN; +- } + break; + } + } +@@ -1559,6 +1552,7 @@ static void sfp_sm_main(struct sfp *sfp, + sfp_sm_link_down(sfp); + if (sfp->mod_phy) + sfp_sm_phy_detach(sfp); ++ sfp_module_tx_disable(sfp); + sfp_sm_next(sfp, SFP_S_DOWN, 0); + return; + } diff --git a/target/linux/generic/backport-4.19/722-v5.5-net-sfp-rename-sfp_sm_ins_next-as-sfp_sm_mod_next.patch b/target/linux/generic/backport-4.19/722-v5.5-net-sfp-rename-sfp_sm_ins_next-as-sfp_sm_mod_next.patch new file mode 100644 index 0000000000..ed84e76fdf --- /dev/null +++ b/target/linux/generic/backport-4.19/722-v5.5-net-sfp-rename-sfp_sm_ins_next-as-sfp_sm_mod_next.patch @@ -0,0 +1,71 @@ +From f2a1ccfc4ad4f97c98c3cc18eb32992151ce089a Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 11 Oct 2019 22:27:21 +0100 +Subject: [PATCH 620/660] net: sfp: rename sfp_sm_ins_next() as + sfp_sm_mod_next() + +sfp_sm_ins_next() modifies the module state machine. Change it's name +to reflect this. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1180,7 +1180,7 @@ static void sfp_sm_next(struct sfp *sfp, + sfp_sm_set_timer(sfp, timeout); + } + +-static void sfp_sm_ins_next(struct sfp *sfp, unsigned int state, ++static void sfp_sm_mod_next(struct sfp *sfp, unsigned int state, + unsigned int timeout) + { + sfp->sm_mod_state = state; +@@ -1504,22 +1504,22 @@ static void sfp_sm_module(struct sfp *sf + default: + if (event == SFP_E_INSERT && sfp->attached) { + sfp_module_tx_disable(sfp); +- sfp_sm_ins_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT); ++ sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT); + } + break; + + case SFP_MOD_PROBE: + if (event == SFP_E_REMOVE) { +- sfp_sm_ins_next(sfp, SFP_MOD_EMPTY, 0); ++ sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); + } else if (event == SFP_E_TIMEOUT) { + int val = sfp_sm_mod_probe(sfp); + + if (val == 0) +- sfp_sm_ins_next(sfp, SFP_MOD_PRESENT, 0); ++ sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0); + else if (val > 0) +- sfp_sm_ins_next(sfp, SFP_MOD_HPOWER, val); ++ sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, val); + else if (val != -EAGAIN) +- sfp_sm_ins_next(sfp, SFP_MOD_ERROR, 0); ++ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); + else + sfp_sm_set_timer(sfp, T_PROBE_RETRY); + } +@@ -1527,7 +1527,7 @@ static void sfp_sm_module(struct sfp *sf + + case SFP_MOD_HPOWER: + if (event == SFP_E_TIMEOUT) { +- sfp_sm_ins_next(sfp, SFP_MOD_PRESENT, 0); ++ sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0); + break; + } + /* fallthrough */ +@@ -1535,7 +1535,7 @@ static void sfp_sm_module(struct sfp *sf + case SFP_MOD_ERROR: + if (event == SFP_E_REMOVE) { + sfp_sm_mod_remove(sfp); +- sfp_sm_ins_next(sfp, SFP_MOD_EMPTY, 0); ++ sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); + } + break; + } diff --git a/target/linux/generic/backport-4.19/723-v5.5-net-sfp-handle-module-remove-outside-state-machine.patch b/target/linux/generic/backport-4.19/723-v5.5-net-sfp-handle-module-remove-outside-state-machine.patch new file mode 100644 index 0000000000..542aeaea77 --- /dev/null +++ b/target/linux/generic/backport-4.19/723-v5.5-net-sfp-handle-module-remove-outside-state-machine.patch @@ -0,0 +1,53 @@ +From d2591ea5520e2ee8fa557f96bb64c23cafac4b20 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 15 Oct 2019 10:33:13 +0100 +Subject: [PATCH 621/660] net: sfp: handle module remove outside state machine + +Removing a module resets the module state machine back to its initial +state. Rather than explicitly handling this in every state, handle it +early on outside of the state machine. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1500,6 +1500,14 @@ static void sfp_sm_device(struct sfp *sf + */ + static void sfp_sm_module(struct sfp *sfp, unsigned int event) + { ++ /* Handle remove event globally, it resets this state machine */ ++ if (event == SFP_E_REMOVE) { ++ if (sfp->sm_mod_state > SFP_MOD_PROBE) ++ sfp_sm_mod_remove(sfp); ++ sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); ++ return; ++ } ++ + switch (sfp->sm_mod_state) { + default: + if (event == SFP_E_INSERT && sfp->attached) { +@@ -1509,9 +1517,7 @@ static void sfp_sm_module(struct sfp *sf + break; + + case SFP_MOD_PROBE: +- if (event == SFP_E_REMOVE) { +- sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); +- } else if (event == SFP_E_TIMEOUT) { ++ if (event == SFP_E_TIMEOUT) { + int val = sfp_sm_mod_probe(sfp); + + if (val == 0) +@@ -1533,10 +1539,6 @@ static void sfp_sm_module(struct sfp *sf + /* fallthrough */ + case SFP_MOD_PRESENT: + case SFP_MOD_ERROR: +- if (event == SFP_E_REMOVE) { +- sfp_sm_mod_remove(sfp); +- sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); +- } + break; + } + } diff --git a/target/linux/generic/backport-4.19/724-v5.5-net-sfp-rename-T_PROBE_WAIT-to-T_SERIAL.patch b/target/linux/generic/backport-4.19/724-v5.5-net-sfp-rename-T_PROBE_WAIT-to-T_SERIAL.patch new file mode 100644 index 0000000000..e0c35feea3 --- /dev/null +++ b/target/linux/generic/backport-4.19/724-v5.5-net-sfp-rename-T_PROBE_WAIT-to-T_SERIAL.patch @@ -0,0 +1,51 @@ +From 615090acb3c0b41691f3a03522ea38350387c0e4 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 15 Oct 2019 10:54:15 +0100 +Subject: [PATCH 622/660] net: sfp: rename T_PROBE_WAIT to T_SERIAL + +SFF-8472 rev 12.2 defines the time for the serial bus to become ready +using t_serial. Use this as our identifier for this timeout to make +it clear what we are referring to. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -147,11 +147,10 @@ static const enum gpiod_flags gpio_flags + * the same length on the PCB, which means it's possible for MOD DEF 0 to + * connect before the I2C bus on MOD DEF 1/2. + * +- * The SFP MSA specifies 300ms as t_init (the time taken for TX_FAULT to +- * be deasserted) but makes no mention of the earliest time before we can +- * access the I2C EEPROM. However, Avago modules require 300ms. ++ * The SFF-8472 specifies t_serial ("Time from power on until module is ++ * ready for data transmission over the two wire serial bus.") as 300ms. + */ +-#define T_PROBE_INIT msecs_to_jiffies(300) ++#define T_SERIAL msecs_to_jiffies(300) + #define T_HPOWER_LEVEL msecs_to_jiffies(300) + #define T_PROBE_RETRY msecs_to_jiffies(100) + +@@ -1495,8 +1494,8 @@ static void sfp_sm_device(struct sfp *sf + } + } + +-/* This state machine tracks the insert/remove state of +- * the module, and handles probing the on-board EEPROM. ++/* This state machine tracks the insert/remove state of the module, probes ++ * the on-board EEPROM, and sets up the power level. + */ + static void sfp_sm_module(struct sfp *sfp, unsigned int event) + { +@@ -1512,7 +1511,7 @@ static void sfp_sm_module(struct sfp *sf + default: + if (event == SFP_E_INSERT && sfp->attached) { + sfp_module_tx_disable(sfp); +- sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT); ++ sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL); + } + break; + diff --git a/target/linux/generic/backport-4.19/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch b/target/linux/generic/backport-4.19/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch new file mode 100644 index 0000000000..0b358f86d2 --- /dev/null +++ b/target/linux/generic/backport-4.19/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch @@ -0,0 +1,115 @@ +From d4b8746219e8c0361e5ed6e440ab3a8a600d1f76 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 11 Oct 2019 17:24:40 +0100 +Subject: [PATCH 623/660] net: sfp: parse SFP power requirement earlier + +Parse the SFP power requirement earlier, in preparation for moving the +power level setup code. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 42 +++++++++++++++++++++++++++++------------- + 1 file changed, 29 insertions(+), 13 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -196,6 +196,8 @@ struct sfp { + unsigned int sm_retries; + + struct sfp_eeprom_id id; ++ unsigned int module_power_mW; ++ + #if IS_ENABLED(CONFIG_HWMON) + struct sfp_diag diag; + struct device *hwmon_dev; +@@ -1309,17 +1311,14 @@ static void sfp_sm_mod_init(struct sfp * + sfp_sm_probe_phy(sfp); + } + +-static int sfp_sm_mod_hpower(struct sfp *sfp) ++static int sfp_module_parse_power(struct sfp *sfp) + { +- u32 power; +- u8 val; +- int err; ++ u32 power_mW = 1000; + +- power = 1000; + if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_POWER_DECL)) +- power = 1500; ++ power_mW = 1500; + if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_HIGH_POWER_LEVEL)) +- power = 2000; ++ power_mW = 2000; + + if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE && + (sfp->id.ext.diagmon & (SFP_DIAGMON_DDM | SFP_DIAGMON_ADDRMODE)) != +@@ -1328,23 +1327,33 @@ static int sfp_sm_mod_hpower(struct sfp + * or requires an address change sequence, so assume that + * the module powers up in the indicated power mode. + */ +- if (power > sfp->max_power_mW) { ++ if (power_mW > sfp->max_power_mW) { + dev_err(sfp->dev, + "Host does not support %u.%uW modules\n", +- power / 1000, (power / 100) % 10); ++ power_mW / 1000, (power_mW / 100) % 10); + return -EINVAL; + } + return 0; + } + +- if (power > sfp->max_power_mW) { ++ if (power_mW > sfp->max_power_mW) { + dev_warn(sfp->dev, + "Host does not support %u.%uW modules, module left in power mode 1\n", +- power / 1000, (power / 100) % 10); ++ power_mW / 1000, (power_mW / 100) % 10); + return 0; + } + +- if (power <= 1000) ++ sfp->module_power_mW = power_mW; ++ ++ return 0; ++} ++ ++static int sfp_sm_mod_hpower(struct sfp *sfp) ++{ ++ u8 val; ++ int err; ++ ++ if (sfp->module_power_mW <= 1000) + return 0; + + err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val)); +@@ -1364,7 +1373,8 @@ static int sfp_sm_mod_hpower(struct sfp + } + + dev_info(sfp->dev, "Module switched to %u.%uW power level\n", +- power / 1000, (power / 100) % 10); ++ sfp->module_power_mW / 1000, ++ (sfp->module_power_mW / 100) % 10); + return T_HPOWER_LEVEL; + + err: +@@ -1451,6 +1461,11 @@ static int sfp_sm_mod_probe(struct sfp * + dev_warn(sfp->dev, + "module address swap to access page 0xA2 is not supported.\n"); + ++ /* Parse the module power requirement */ ++ ret = sfp_module_parse_power(sfp); ++ if (ret < 0) ++ return ret; ++ + ret = sfp_hwmon_insert(sfp); + if (ret < 0) + return ret; +@@ -1474,6 +1489,7 @@ static void sfp_sm_mod_remove(struct sfp + sfp_module_tx_disable(sfp); + + memset(&sfp->id, 0, sizeof(sfp->id)); ++ sfp->module_power_mW = 0; + + dev_info(sfp->dev, "module removed\n"); + } diff --git a/target/linux/generic/backport-4.19/726-v5.5-net-sfp-avoid-power-switch-on-address-change-modules.patch b/target/linux/generic/backport-4.19/726-v5.5-net-sfp-avoid-power-switch-on-address-change-modules.patch new file mode 100644 index 0000000000..2ddd4c4d02 --- /dev/null +++ b/target/linux/generic/backport-4.19/726-v5.5-net-sfp-avoid-power-switch-on-address-change-modules.patch @@ -0,0 +1,65 @@ +From dca678b8838945572cf50584cb33a7199c1fd397 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 17 Oct 2019 00:24:18 +0100 +Subject: [PATCH 624/660] net: sfp: avoid power switch on address-change + modules + +If the module indicates that it requires an address change sequence to +switch between address 0x50 and 0x51, which we don't support, we can't +write to the register that controls the power mode to switch to high +power mode. Warn the user that the module may not be functional in +this case, and don't try to change the power mode. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1320,25 +1320,34 @@ static int sfp_module_parse_power(struct + if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_HIGH_POWER_LEVEL)) + power_mW = 2000; + +- if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE && +- (sfp->id.ext.diagmon & (SFP_DIAGMON_DDM | SFP_DIAGMON_ADDRMODE)) != +- SFP_DIAGMON_DDM) { +- /* The module appears not to implement bus address 0xa2, +- * or requires an address change sequence, so assume that +- * the module powers up in the indicated power mode. +- */ +- if (power_mW > sfp->max_power_mW) { ++ if (power_mW > sfp->max_power_mW) { ++ /* Module power specification exceeds the allowed maximum. */ ++ if (sfp->id.ext.sff8472_compliance == ++ SFP_SFF8472_COMPLIANCE_NONE && ++ !(sfp->id.ext.diagmon & SFP_DIAGMON_DDM)) { ++ /* The module appears not to implement bus address ++ * 0xa2, so assume that the module powers up in the ++ * indicated mode. ++ */ + dev_err(sfp->dev, + "Host does not support %u.%uW modules\n", + power_mW / 1000, (power_mW / 100) % 10); + return -EINVAL; ++ } else { ++ dev_warn(sfp->dev, ++ "Host does not support %u.%uW modules, module left in power mode 1\n", ++ power_mW / 1000, (power_mW / 100) % 10); ++ return 0; + } +- return 0; + } + +- if (power_mW > sfp->max_power_mW) { ++ /* If the module requires a higher power mode, but also requires ++ * an address change sequence, warn the user that the module may ++ * not be functional. ++ */ ++ if (sfp->id.ext.diagmon & SFP_DIAGMON_ADDRMODE && power_mW > 1000) { + dev_warn(sfp->dev, +- "Host does not support %u.%uW modules, module left in power mode 1\n", ++ "Address Change Sequence not supported but module requies %u.%uW, module may not be functional\n", + power_mW / 1000, (power_mW / 100) % 10); + return 0; + } diff --git a/target/linux/generic/backport-4.19/727-v5.5-net-sfp-control-TX_DISABLE-and-phy-only-from-main-st.patch b/target/linux/generic/backport-4.19/727-v5.5-net-sfp-control-TX_DISABLE-and-phy-only-from-main-st.patch new file mode 100644 index 0000000000..0eac6abb88 --- /dev/null +++ b/target/linux/generic/backport-4.19/727-v5.5-net-sfp-control-TX_DISABLE-and-phy-only-from-main-st.patch @@ -0,0 +1,52 @@ +From df5c4d93c5a59cba0f7479a4cd4e22b50726ce88 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 17 Oct 2019 11:12:42 +0100 +Subject: [PATCH 625/660] net: sfp: control TX_DISABLE and phy only from main + state machine + +We initialise TX_DISABLE when the sfp cage is probed, and then +maintain its state in the main state machine. However, the module +state machine: +- negates it when detecting a newly inserted module when it's already + guaranteed to be negated. +- negates it when the module is removed, but the main state machine + will do this anyway. + +Make TX_DISABLE entirely controlled by the main state machine. + +The main state machine also probes the module for a PHY, and removes +the PHY when the the module is removed. Hence, removing the PHY in +sfp_sm_module_remove() is also redundant, and is a left-over from +when we tried to probe for the PHY from the module state machine. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1492,11 +1492,6 @@ static void sfp_sm_mod_remove(struct sfp + + sfp_hwmon_remove(sfp); + +- if (sfp->mod_phy) +- sfp_sm_phy_detach(sfp); +- +- sfp_module_tx_disable(sfp); +- + memset(&sfp->id, 0, sizeof(sfp->id)); + sfp->module_power_mW = 0; + +@@ -1534,10 +1529,8 @@ static void sfp_sm_module(struct sfp *sf + + switch (sfp->sm_mod_state) { + default: +- if (event == SFP_E_INSERT && sfp->attached) { +- sfp_module_tx_disable(sfp); ++ if (event == SFP_E_INSERT && sfp->attached) + sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL); +- } + break; + + case SFP_MOD_PROBE: diff --git a/target/linux/generic/backport-4.19/728-v5.5-net-sfp-split-the-PHY-probe-from-sfp_sm_mod_init.patch b/target/linux/generic/backport-4.19/728-v5.5-net-sfp-split-the-PHY-probe-from-sfp_sm_mod_init.patch new file mode 100644 index 0000000000..7830b9268f --- /dev/null +++ b/target/linux/generic/backport-4.19/728-v5.5-net-sfp-split-the-PHY-probe-from-sfp_sm_mod_init.patch @@ -0,0 +1,53 @@ +From 5ed0bd49b2d3ac4439c2d7f44e5a82b7cf6f409a Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 18 Oct 2019 10:09:02 +0100 +Subject: [PATCH 626/660] net: sfp: split the PHY probe from sfp_sm_mod_init() + +Move the PHY probe into a separate function, splitting it from +sfp_sm_mod_init(). This will allow us to eliminate the 50ms mdelay() +inside the state machine. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1288,14 +1288,10 @@ static void sfp_sm_fault(struct sfp *sfp + static void sfp_sm_mod_init(struct sfp *sfp) + { + sfp_module_tx_enable(sfp); ++} + +- /* Wait t_init before indicating that the link is up, provided the +- * current state indicates no TX_FAULT. If TX_FAULT clears before +- * this time, that's fine too. +- */ +- sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); +- sfp->sm_retries = 5; +- ++static void sfp_sm_probe_for_phy(struct sfp *sfp) ++{ + /* Setting the serdes link mode is guesswork: there's no + * field in the EEPROM which indicates what mode should + * be used. +@@ -1580,8 +1576,17 @@ static void sfp_sm_main(struct sfp *sfp, + switch (sfp->sm_state) { + case SFP_S_DOWN: + if (sfp->sm_mod_state == SFP_MOD_PRESENT && +- sfp->sm_dev_state == SFP_DEV_UP) ++ sfp->sm_dev_state == SFP_DEV_UP) { + sfp_sm_mod_init(sfp); ++ sfp_sm_probe_for_phy(sfp); ++ ++ /* Wait t_init before indicating that the link is up, ++ * provided the current state indicates no TX_FAULT. If ++ * TX_FAULT clears before this time, that's fine too. ++ */ ++ sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); ++ sfp->sm_retries = 5; ++ } + break; + + case SFP_S_INIT: diff --git a/target/linux/generic/backport-4.19/729-v5.5-net-sfp-eliminate-mdelay-from-PHY-probe.patch b/target/linux/generic/backport-4.19/729-v5.5-net-sfp-eliminate-mdelay-from-PHY-probe.patch new file mode 100644 index 0000000000..5dc92bd10e --- /dev/null +++ b/target/linux/generic/backport-4.19/729-v5.5-net-sfp-eliminate-mdelay-from-PHY-probe.patch @@ -0,0 +1,130 @@ +From 0fe72afaa31f98ebd71bd6683fc47021105d0157 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 18 Oct 2019 10:21:46 +0100 +Subject: [PATCH 627/660] net: sfp: eliminate mdelay() from PHY probe + +Rather than using mdelay() to wait before probing the PHY (which holds +several locks, including the rtnl lock), add an extra wait state to +the state machine to introduce the 50ms delay without holding any +locks. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 52 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 40 insertions(+), 12 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -52,6 +52,7 @@ enum { + SFP_DEV_UP, + + SFP_S_DOWN = 0, ++ SFP_S_WAIT, + SFP_S_INIT, + SFP_S_WAIT_LOS, + SFP_S_LINK_UP, +@@ -108,6 +109,7 @@ static const char *event_to_str(unsigned + + static const char * const sm_state_strings[] = { + [SFP_S_DOWN] = "down", ++ [SFP_S_WAIT] = "wait", + [SFP_S_INIT] = "init", + [SFP_S_WAIT_LOS] = "wait_los", + [SFP_S_LINK_UP] = "link_up", +@@ -139,6 +141,7 @@ static const enum gpiod_flags gpio_flags + GPIOD_ASIS, + }; + ++#define T_WAIT msecs_to_jiffies(50) + #define T_INIT_JIFFIES msecs_to_jiffies(300) + #define T_RESET_US 10 + #define T_FAULT_RECOVER msecs_to_jiffies(1000) +@@ -159,9 +162,6 @@ static const enum gpiod_flags gpio_flags + */ + #define SFP_PHY_ADDR 22 + +-/* Give this long for the PHY to reset. */ +-#define T_PHY_RESET_MS 50 +- + struct sff_data { + unsigned int gpios; + bool (*module_supported)(const struct sfp_eeprom_id *id); +@@ -1202,8 +1202,6 @@ static void sfp_sm_probe_phy(struct sfp + struct phy_device *phy; + int err; + +- msleep(T_PHY_RESET_MS); +- + phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); + if (phy == ERR_PTR(-ENODEV)) { + dev_info(sfp->dev, "no PHY detected\n"); +@@ -1558,6 +1556,8 @@ static void sfp_sm_module(struct sfp *sf + + static void sfp_sm_main(struct sfp *sfp, unsigned int event) + { ++ unsigned long timeout; ++ + /* Some events are global */ + if (sfp->sm_state != SFP_S_DOWN && + (sfp->sm_mod_state != SFP_MOD_PRESENT || +@@ -1575,17 +1575,45 @@ static void sfp_sm_main(struct sfp *sfp, + /* The main state machine */ + switch (sfp->sm_state) { + case SFP_S_DOWN: +- if (sfp->sm_mod_state == SFP_MOD_PRESENT && +- sfp->sm_dev_state == SFP_DEV_UP) { +- sfp_sm_mod_init(sfp); +- sfp_sm_probe_for_phy(sfp); ++ if (sfp->sm_mod_state != SFP_MOD_PRESENT || ++ sfp->sm_dev_state != SFP_DEV_UP) ++ break; ++ ++ sfp_sm_mod_init(sfp); ++ ++ /* Initialise the fault clearance retries */ ++ sfp->sm_retries = 5; ++ ++ /* We need to check the TX_FAULT state, which is not defined ++ * while TX_DISABLE is asserted. The earliest we want to do ++ * anything (such as probe for a PHY) is 50ms. ++ */ ++ sfp_sm_next(sfp, SFP_S_WAIT, T_WAIT); ++ break; ++ ++ case SFP_S_WAIT: ++ if (event != SFP_E_TIMEOUT) ++ break; ++ ++ sfp_sm_probe_for_phy(sfp); + ++ if (sfp->state & SFP_F_TX_FAULT) { + /* Wait t_init before indicating that the link is up, + * provided the current state indicates no TX_FAULT. If + * TX_FAULT clears before this time, that's fine too. + */ +- sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); +- sfp->sm_retries = 5; ++ timeout = T_INIT_JIFFIES; ++ if (timeout > T_WAIT) ++ timeout -= T_WAIT; ++ else ++ timeout = 1; ++ ++ sfp_sm_next(sfp, SFP_S_INIT, timeout); ++ } else { ++ /* TX_FAULT is not asserted, assume the module has ++ * finished initialising. ++ */ ++ goto init_done; + } + break; + +@@ -1593,7 +1621,7 @@ static void sfp_sm_main(struct sfp *sfp, + if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) + sfp_sm_fault(sfp, true); + else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) +- sfp_sm_link_check_los(sfp); ++ init_done: sfp_sm_link_check_los(sfp); + break; + + case SFP_S_WAIT_LOS: diff --git a/target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch b/target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch new file mode 100644 index 0000000000..6e34e6cc0f --- /dev/null +++ b/target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch @@ -0,0 +1,69 @@ +From 2aa424ee7fbe43e2cd24e28c2f6388c4e1796bd2 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 18 Oct 2019 09:58:33 +0100 +Subject: [PATCH 628/660] net: sfp: allow fault processing to transition to + other states + +Add the next state to sfp_sm_fault() so that it can branch to other +states. This will be necessary to improve the initialisation path. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1269,7 +1269,7 @@ static bool sfp_los_event_inactive(struc + event == SFP_E_LOS_LOW); + } + +-static void sfp_sm_fault(struct sfp *sfp, bool warn) ++static void sfp_sm_fault(struct sfp *sfp, unsigned int next_state, bool warn) + { + if (sfp->sm_retries && !--sfp->sm_retries) { + dev_err(sfp->dev, +@@ -1279,7 +1279,7 @@ static void sfp_sm_fault(struct sfp *sfp + if (warn) + dev_err(sfp->dev, "module transmit fault indicated\n"); + +- sfp_sm_next(sfp, SFP_S_TX_FAULT, T_FAULT_RECOVER); ++ sfp_sm_next(sfp, next_state, T_FAULT_RECOVER); + } + } + +@@ -1619,14 +1619,14 @@ static void sfp_sm_main(struct sfp *sfp, + + case SFP_S_INIT: + if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) +- sfp_sm_fault(sfp, true); ++ sfp_sm_fault(sfp, SFP_S_TX_FAULT, true); + else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) + init_done: sfp_sm_link_check_los(sfp); + break; + + case SFP_S_WAIT_LOS: + if (event == SFP_E_TX_FAULT) +- sfp_sm_fault(sfp, true); ++ sfp_sm_fault(sfp, SFP_S_TX_FAULT, true); + else if (sfp_los_event_inactive(sfp, event)) + sfp_sm_link_up(sfp); + break; +@@ -1634,7 +1634,7 @@ static void sfp_sm_main(struct sfp *sfp, + case SFP_S_LINK_UP: + if (event == SFP_E_TX_FAULT) { + sfp_sm_link_down(sfp); +- sfp_sm_fault(sfp, true); ++ sfp_sm_fault(sfp, SFP_S_TX_FAULT, true); + } else if (sfp_los_event_active(sfp, event)) { + sfp_sm_link_down(sfp); + sfp_sm_next(sfp, SFP_S_WAIT_LOS, 0); +@@ -1650,7 +1650,7 @@ static void sfp_sm_main(struct sfp *sfp, + + case SFP_S_REINIT: + if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) { +- sfp_sm_fault(sfp, false); ++ sfp_sm_fault(sfp, SFP_S_TX_FAULT, false); + } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { + dev_info(sfp->dev, "module transmit fault recovered\n"); + sfp_sm_link_check_los(sfp); diff --git a/target/linux/generic/backport-4.19/731-v5.5-net-sfp-ensure-TX_FAULT-has-deasserted-before-probin.patch b/target/linux/generic/backport-4.19/731-v5.5-net-sfp-ensure-TX_FAULT-has-deasserted-before-probin.patch new file mode 100644 index 0000000000..03415fb6e7 --- /dev/null +++ b/target/linux/generic/backport-4.19/731-v5.5-net-sfp-ensure-TX_FAULT-has-deasserted-before-probin.patch @@ -0,0 +1,80 @@ +From 38b62a12231be4b86fc5ca5477579d29831c02a5 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 18 Oct 2019 10:31:07 +0100 +Subject: [PATCH 629/660] net: sfp: ensure TX_FAULT has deasserted before + probing the PHY + +TX_FAULT should be deasserted to indicate that the module has completed +its initialisation. This may include the on-board PHY, so wait until +the module has deasserted TX_FAULT before probing the PHY. + +This means that we need an extra state to handle a TX_FAULT that +remains set for longer than t_init, since using the existing handling +state would bypass the PHY probe. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 31 +++++++++++++++++++++++++------ + 1 file changed, 25 insertions(+), 6 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -54,6 +54,7 @@ enum { + SFP_S_DOWN = 0, + SFP_S_WAIT, + SFP_S_INIT, ++ SFP_S_INIT_TX_FAULT, + SFP_S_WAIT_LOS, + SFP_S_LINK_UP, + SFP_S_TX_FAULT, +@@ -111,6 +112,7 @@ static const char * const sm_state_strin + [SFP_S_DOWN] = "down", + [SFP_S_WAIT] = "wait", + [SFP_S_INIT] = "init", ++ [SFP_S_INIT_TX_FAULT] = "init_tx_fault", + [SFP_S_WAIT_LOS] = "wait_los", + [SFP_S_LINK_UP] = "link_up", + [SFP_S_TX_FAULT] = "tx_fault", +@@ -1595,8 +1597,6 @@ static void sfp_sm_main(struct sfp *sfp, + if (event != SFP_E_TIMEOUT) + break; + +- sfp_sm_probe_for_phy(sfp); +- + if (sfp->state & SFP_F_TX_FAULT) { + /* Wait t_init before indicating that the link is up, + * provided the current state indicates no TX_FAULT. If +@@ -1618,10 +1618,29 @@ static void sfp_sm_main(struct sfp *sfp, + break; + + case SFP_S_INIT: +- if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) +- sfp_sm_fault(sfp, SFP_S_TX_FAULT, true); +- else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) +- init_done: sfp_sm_link_check_los(sfp); ++ if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) { ++ /* TX_FAULT is still asserted after t_init, so assume ++ * there is a fault. ++ */ ++ sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, ++ sfp->sm_retries == 5); ++ } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { ++ init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT ++ * clear. Probe for the PHY and check the LOS state. ++ */ ++ sfp_sm_probe_for_phy(sfp); ++ sfp_sm_link_check_los(sfp); ++ ++ /* Reset the fault retry count */ ++ sfp->sm_retries = 5; ++ } ++ break; ++ ++ case SFP_S_INIT_TX_FAULT: ++ if (event == SFP_E_TIMEOUT) { ++ sfp_module_tx_fault_reset(sfp); ++ sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); ++ } + break; + + case SFP_S_WAIT_LOS: diff --git a/target/linux/generic/backport-4.19/732-v5.5-net-sfp-track-upstream-s-attachment-state-in-state-m.patch b/target/linux/generic/backport-4.19/732-v5.5-net-sfp-track-upstream-s-attachment-state-in-state-m.patch new file mode 100644 index 0000000000..5ee44dbf0c --- /dev/null +++ b/target/linux/generic/backport-4.19/732-v5.5-net-sfp-track-upstream-s-attachment-state-in-state-m.patch @@ -0,0 +1,153 @@ +From ec6036a58f979c66bbd5cd9d0d1c783a98c2c644 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 12:57:40 +0000 +Subject: [PATCH 630/660] net: sfp: track upstream's attachment state in state + machine + +Track the upstream's attachment state in the state machine rather than +maintaining a boolean, which ensures that we have a strict order of +ATTACH followed by an UP event - we can never believe that a newly +attached upstream will be anything but down. + +Rearrange the order of state machines so we run the module state +machine after the upstream device's state machine, so the module state +machine can check the current state of the device and take action to +e.g. reset back to empty state when the upstream is detached. + +This is to allow the module detection to run independently of the +network device becoming available. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 42 +++++++++++++++++++++++++++++------------- + 1 file changed, 29 insertions(+), 13 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -34,6 +34,8 @@ enum { + + SFP_E_INSERT = 0, + SFP_E_REMOVE, ++ SFP_E_DEV_ATTACH, ++ SFP_E_DEV_DETACH, + SFP_E_DEV_DOWN, + SFP_E_DEV_UP, + SFP_E_TX_FAULT, +@@ -48,7 +50,8 @@ enum { + SFP_MOD_PRESENT, + SFP_MOD_ERROR, + +- SFP_DEV_DOWN = 0, ++ SFP_DEV_DETACHED = 0, ++ SFP_DEV_DOWN, + SFP_DEV_UP, + + SFP_S_DOWN = 0, +@@ -78,6 +81,7 @@ static const char *mod_state_to_str(unsi + } + + static const char * const dev_state_strings[] = { ++ [SFP_DEV_DETACHED] = "detached", + [SFP_DEV_DOWN] = "down", + [SFP_DEV_UP] = "up", + }; +@@ -92,6 +96,8 @@ static const char *dev_state_to_str(unsi + static const char * const event_strings[] = { + [SFP_E_INSERT] = "insert", + [SFP_E_REMOVE] = "remove", ++ [SFP_E_DEV_ATTACH] = "dev_attach", ++ [SFP_E_DEV_DETACH] = "dev_detach", + [SFP_E_DEV_DOWN] = "dev_down", + [SFP_E_DEV_UP] = "dev_up", + [SFP_E_TX_FAULT] = "tx_fault", +@@ -186,7 +192,6 @@ struct sfp { + struct gpio_desc *gpio[GPIO_MAX]; + int gpio_irq[GPIO_MAX]; + +- bool attached; + struct mutex st_mutex; /* Protects state */ + unsigned int state; + struct delayed_work poll; +@@ -1494,17 +1499,26 @@ static void sfp_sm_mod_remove(struct sfp + dev_info(sfp->dev, "module removed\n"); + } + +-/* This state machine tracks the netdev up/down state */ ++/* This state machine tracks the upstream's state */ + static void sfp_sm_device(struct sfp *sfp, unsigned int event) + { + switch (sfp->sm_dev_state) { + default: +- if (event == SFP_E_DEV_UP) ++ if (event == SFP_E_DEV_ATTACH) ++ sfp->sm_dev_state = SFP_DEV_DOWN; ++ break; ++ ++ case SFP_DEV_DOWN: ++ if (event == SFP_E_DEV_DETACH) ++ sfp->sm_dev_state = SFP_DEV_DETACHED; ++ else if (event == SFP_E_DEV_UP) + sfp->sm_dev_state = SFP_DEV_UP; + break; + + case SFP_DEV_UP: +- if (event == SFP_E_DEV_DOWN) ++ if (event == SFP_E_DEV_DETACH) ++ sfp->sm_dev_state = SFP_DEV_DETACHED; ++ else if (event == SFP_E_DEV_DOWN) + sfp->sm_dev_state = SFP_DEV_DOWN; + break; + } +@@ -1515,17 +1529,20 @@ static void sfp_sm_device(struct sfp *sf + */ + static void sfp_sm_module(struct sfp *sfp, unsigned int event) + { +- /* Handle remove event globally, it resets this state machine */ +- if (event == SFP_E_REMOVE) { ++ /* Handle remove event globally, it resets this state machine. ++ * Also deal with upstream detachment. ++ */ ++ if (event == SFP_E_REMOVE || sfp->sm_dev_state < SFP_DEV_DOWN) { + if (sfp->sm_mod_state > SFP_MOD_PROBE) + sfp_sm_mod_remove(sfp); +- sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); ++ if (sfp->sm_mod_state != SFP_MOD_EMPTY) ++ sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); + return; + } + + switch (sfp->sm_mod_state) { + default: +- if (event == SFP_E_INSERT && sfp->attached) ++ if (event == SFP_E_INSERT) + sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL); + break; + +@@ -1691,8 +1708,8 @@ static void sfp_sm_event(struct sfp *sfp + sm_state_to_str(sfp->sm_state), + event_to_str(event)); + +- sfp_sm_module(sfp, event); + sfp_sm_device(sfp, event); ++ sfp_sm_module(sfp, event); + sfp_sm_main(sfp, event); + + dev_dbg(sfp->dev, "SM: exit %s:%s:%s\n", +@@ -1705,15 +1722,14 @@ static void sfp_sm_event(struct sfp *sfp + + static void sfp_attach(struct sfp *sfp) + { +- sfp->attached = true; ++ sfp_sm_event(sfp, SFP_E_DEV_ATTACH); + if (sfp->state & SFP_F_PRESENT) + sfp_sm_event(sfp, SFP_E_INSERT); + } + + static void sfp_detach(struct sfp *sfp) + { +- sfp->attached = false; +- sfp_sm_event(sfp, SFP_E_REMOVE); ++ sfp_sm_event(sfp, SFP_E_DEV_DETACH); + } + + static void sfp_start(struct sfp *sfp) diff --git a/target/linux/generic/backport-4.19/733-v5.5-net-sfp-split-power-mode-switching-from-probe.patch b/target/linux/generic/backport-4.19/733-v5.5-net-sfp-split-power-mode-switching-from-probe.patch new file mode 100644 index 0000000000..06b3cb5428 --- /dev/null +++ b/target/linux/generic/backport-4.19/733-v5.5-net-sfp-split-power-mode-switching-from-probe.patch @@ -0,0 +1,184 @@ +From fdff863a4ce3677907f64396e34c45025abb6600 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 12:59:36 +0000 +Subject: [PATCH 631/660] net: sfp: split power mode switching from probe + +Switch the power mode switching from the probe, so that we don't +repeatedly re-probe the SFP device if there is a problem accessing +the registers at I2C address 0x51. + +In splitting this out, we can also fix a bug where we leave the module +in high-power mode when the upstream device is detached but the module +is still inserted. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 101 ++++++++++++++++++++++++++---------------- + 1 file changed, 64 insertions(+), 37 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -47,6 +47,7 @@ enum { + SFP_MOD_EMPTY = 0, + SFP_MOD_PROBE, + SFP_MOD_HPOWER, ++ SFP_MOD_WAITPWR, + SFP_MOD_PRESENT, + SFP_MOD_ERROR, + +@@ -69,6 +70,7 @@ static const char * const mod_state_str + [SFP_MOD_EMPTY] = "empty", + [SFP_MOD_PROBE] = "probe", + [SFP_MOD_HPOWER] = "hpower", ++ [SFP_MOD_WAITPWR] = "waitpwr", + [SFP_MOD_PRESENT] = "present", + [SFP_MOD_ERROR] = "error", + }; +@@ -1358,37 +1360,34 @@ static int sfp_module_parse_power(struct + return 0; + } + +-static int sfp_sm_mod_hpower(struct sfp *sfp) ++static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable) + { + u8 val; + int err; + +- if (sfp->module_power_mW <= 1000) +- return 0; +- + err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val)); + if (err != sizeof(val)) { + dev_err(sfp->dev, "Failed to read EEPROM: %d\n", err); +- err = -EAGAIN; +- goto err; ++ return -EAGAIN; + } + +- val |= BIT(0); ++ if (enable) ++ val |= BIT(0); ++ else ++ val &= ~BIT(0); + + err = sfp_write(sfp, true, SFP_EXT_STATUS, &val, sizeof(val)); + if (err != sizeof(val)) { + dev_err(sfp->dev, "Failed to write EEPROM: %d\n", err); +- err = -EAGAIN; +- goto err; ++ return -EAGAIN; + } + +- dev_info(sfp->dev, "Module switched to %u.%uW power level\n", +- sfp->module_power_mW / 1000, +- (sfp->module_power_mW / 100) % 10); +- return T_HPOWER_LEVEL; ++ if (enable) ++ dev_info(sfp->dev, "Module switched to %u.%uW power level\n", ++ sfp->module_power_mW / 1000, ++ (sfp->module_power_mW / 100) % 10); + +-err: +- return err; ++ return 0; + } + + static int sfp_sm_mod_probe(struct sfp *sfp) +@@ -1484,7 +1483,7 @@ static int sfp_sm_mod_probe(struct sfp * + if (ret < 0) + return ret; + +- return sfp_sm_mod_hpower(sfp); ++ return 0; + } + + static void sfp_sm_mod_remove(struct sfp *sfp) +@@ -1529,13 +1528,22 @@ static void sfp_sm_device(struct sfp *sf + */ + static void sfp_sm_module(struct sfp *sfp, unsigned int event) + { +- /* Handle remove event globally, it resets this state machine. +- * Also deal with upstream detachment. +- */ +- if (event == SFP_E_REMOVE || sfp->sm_dev_state < SFP_DEV_DOWN) { ++ int err; ++ ++ /* Handle remove event globally, it resets this state machine */ ++ if (event == SFP_E_REMOVE) { + if (sfp->sm_mod_state > SFP_MOD_PROBE) + sfp_sm_mod_remove(sfp); +- if (sfp->sm_mod_state != SFP_MOD_EMPTY) ++ sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); ++ return; ++ } ++ ++ /* Handle device detach globally */ ++ if (sfp->sm_dev_state < SFP_DEV_DOWN) { ++ if (sfp->module_power_mW > 1000 && ++ sfp->sm_mod_state > SFP_MOD_HPOWER) ++ sfp_sm_mod_hpower(sfp, false); ++ if (sfp->sm_mod_state > SFP_MOD_EMPTY) + sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); + return; + } +@@ -1547,26 +1555,45 @@ static void sfp_sm_module(struct sfp *sf + break; + + case SFP_MOD_PROBE: +- if (event == SFP_E_TIMEOUT) { +- int val = sfp_sm_mod_probe(sfp); ++ if (event != SFP_E_TIMEOUT) ++ break; + +- if (val == 0) +- sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0); +- else if (val > 0) +- sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, val); +- else if (val != -EAGAIN) +- sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); +- else +- sfp_sm_set_timer(sfp, T_PROBE_RETRY); ++ err = sfp_sm_mod_probe(sfp); ++ if (err == -EAGAIN) { ++ sfp_sm_set_timer(sfp, T_PROBE_RETRY); ++ break; + } +- break; ++ if (err < 0) { ++ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); ++ break; ++ } ++ ++ /* If this is a power level 1 module, we are done */ ++ if (sfp->module_power_mW <= 1000) ++ goto insert; + ++ sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, 0); ++ /* fall through */ + case SFP_MOD_HPOWER: +- if (event == SFP_E_TIMEOUT) { +- sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0); ++ /* Enable high power mode */ ++ err = sfp_sm_mod_hpower(sfp, true); ++ if (err == 0) ++ sfp_sm_mod_next(sfp, SFP_MOD_WAITPWR, T_HPOWER_LEVEL); ++ else if (err != -EAGAIN) ++ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); ++ else ++ sfp_sm_set_timer(sfp, T_PROBE_RETRY); ++ break; ++ ++ case SFP_MOD_WAITPWR: ++ /* Wait for T_HPOWER_LEVEL to time out */ ++ if (event != SFP_E_TIMEOUT) + break; +- } +- /* fallthrough */ ++ ++ insert: ++ sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0); ++ break; ++ + case SFP_MOD_PRESENT: + case SFP_MOD_ERROR: + break; diff --git a/target/linux/generic/backport-4.19/734-v5.5-net-sfp-move-module-insert-reporting-out-of-probe.patch b/target/linux/generic/backport-4.19/734-v5.5-net-sfp-move-module-insert-reporting-out-of-probe.patch new file mode 100644 index 0000000000..26b6a6b0e4 --- /dev/null +++ b/target/linux/generic/backport-4.19/734-v5.5-net-sfp-move-module-insert-reporting-out-of-probe.patch @@ -0,0 +1,159 @@ +From 57cbf7453551db1df619b79410d79fc418d862d5 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 13:00:45 +0000 +Subject: [PATCH 632/660] net: sfp: move module insert reporting out of probe + +Move the module insertion reporting out of the probe handling, but +after we have detected that the upstream has attached (since that is +whom we are reporting insertion to.) + +Only report module removal if we had previously reported a module +insertion. + +This gives cleaner semantics, and means we can probe the module before +we have an upstream attached. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 58 +++++++++++++++++++++++++++++-------------- + 1 file changed, 40 insertions(+), 18 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -45,11 +45,12 @@ enum { + SFP_E_TIMEOUT, + + SFP_MOD_EMPTY = 0, ++ SFP_MOD_ERROR, + SFP_MOD_PROBE, ++ SFP_MOD_WAITDEV, + SFP_MOD_HPOWER, + SFP_MOD_WAITPWR, + SFP_MOD_PRESENT, +- SFP_MOD_ERROR, + + SFP_DEV_DETACHED = 0, + SFP_DEV_DOWN, +@@ -68,11 +69,12 @@ enum { + + static const char * const mod_state_strings[] = { + [SFP_MOD_EMPTY] = "empty", ++ [SFP_MOD_ERROR] = "error", + [SFP_MOD_PROBE] = "probe", ++ [SFP_MOD_WAITDEV] = "waitdev", + [SFP_MOD_HPOWER] = "hpower", + [SFP_MOD_WAITPWR] = "waitpwr", + [SFP_MOD_PRESENT] = "present", +- [SFP_MOD_ERROR] = "error", + }; + + static const char *mod_state_to_str(unsigned short mod_state) +@@ -1479,16 +1481,13 @@ static int sfp_sm_mod_probe(struct sfp * + if (ret < 0) + return ret; + +- ret = sfp_module_insert(sfp->sfp_bus, &sfp->id); +- if (ret < 0) +- return ret; +- + return 0; + } + + static void sfp_sm_mod_remove(struct sfp *sfp) + { +- sfp_module_remove(sfp->sfp_bus); ++ if (sfp->sm_mod_state > SFP_MOD_WAITDEV) ++ sfp_module_remove(sfp->sfp_bus); + + sfp_hwmon_remove(sfp); + +@@ -1539,12 +1538,12 @@ static void sfp_sm_module(struct sfp *sf + } + + /* Handle device detach globally */ +- if (sfp->sm_dev_state < SFP_DEV_DOWN) { ++ if (sfp->sm_dev_state < SFP_DEV_DOWN && ++ sfp->sm_mod_state > SFP_MOD_WAITDEV) { + if (sfp->module_power_mW > 1000 && + sfp->sm_mod_state > SFP_MOD_HPOWER) + sfp_sm_mod_hpower(sfp, false); +- if (sfp->sm_mod_state > SFP_MOD_EMPTY) +- sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0); ++ sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0); + return; + } + +@@ -1555,6 +1554,7 @@ static void sfp_sm_module(struct sfp *sf + break; + + case SFP_MOD_PROBE: ++ /* Wait for T_PROBE_INIT to time out */ + if (event != SFP_E_TIMEOUT) + break; + +@@ -1568,6 +1568,20 @@ static void sfp_sm_module(struct sfp *sf + break; + } + ++ sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0); ++ /* fall through */ ++ case SFP_MOD_WAITDEV: ++ /* Ensure that the device is attached before proceeding */ ++ if (sfp->sm_dev_state < SFP_DEV_DOWN) ++ break; ++ ++ /* Report the module insertion to the upstream device */ ++ err = sfp_module_insert(sfp->sfp_bus, &sfp->id); ++ if (err < 0) { ++ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); ++ break; ++ } ++ + /* If this is a power level 1 module, we are done */ + if (sfp->module_power_mW <= 1000) + goto insert; +@@ -1577,12 +1591,17 @@ static void sfp_sm_module(struct sfp *sf + case SFP_MOD_HPOWER: + /* Enable high power mode */ + err = sfp_sm_mod_hpower(sfp, true); +- if (err == 0) +- sfp_sm_mod_next(sfp, SFP_MOD_WAITPWR, T_HPOWER_LEVEL); +- else if (err != -EAGAIN) +- sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); +- else +- sfp_sm_set_timer(sfp, T_PROBE_RETRY); ++ if (err < 0) { ++ if (err != -EAGAIN) { ++ sfp_module_remove(sfp->sfp_bus); ++ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); ++ } else { ++ sfp_sm_set_timer(sfp, T_PROBE_RETRY); ++ } ++ break; ++ } ++ ++ sfp_sm_mod_next(sfp, SFP_MOD_WAITPWR, T_HPOWER_LEVEL); + break; + + case SFP_MOD_WAITPWR: +@@ -1750,8 +1769,6 @@ static void sfp_sm_event(struct sfp *sfp + static void sfp_attach(struct sfp *sfp) + { + sfp_sm_event(sfp, SFP_E_DEV_ATTACH); +- if (sfp->state & SFP_F_PRESENT) +- sfp_sm_event(sfp, SFP_E_INSERT); + } + + static void sfp_detach(struct sfp *sfp) +@@ -2001,6 +2018,11 @@ static int sfp_probe(struct platform_dev + sfp->state |= SFP_F_RATE_SELECT; + sfp_set_state(sfp, sfp->state); + sfp_module_tx_disable(sfp); ++ if (sfp->state & SFP_F_PRESENT) { ++ rtnl_lock(); ++ sfp_sm_event(sfp, SFP_E_INSERT); ++ rtnl_unlock(); ++ } + + for (i = 0; i < GPIO_MAX; i++) { + if (gpio_flags[i] != GPIOD_IN || !sfp->gpio[i]) diff --git a/target/linux/generic/backport-4.19/735-v5.5-net-sfp-allow-sfp-to-probe-slow-to-initialise-GPON-m.patch b/target/linux/generic/backport-4.19/735-v5.5-net-sfp-allow-sfp-to-probe-slow-to-initialise-GPON-m.patch new file mode 100644 index 0000000000..6cbd0864f7 --- /dev/null +++ b/target/linux/generic/backport-4.19/735-v5.5-net-sfp-allow-sfp-to-probe-slow-to-initialise-GPON-m.patch @@ -0,0 +1,110 @@ +From fb56cd08880aff8fb030e684fa4311bef712a499 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 13:02:30 +0000 +Subject: [PATCH 633/660] net: sfp: allow sfp to probe slow to initialise GPON + modules + +Some GPON modules (e.g. Huawei MA5671A) take a significant amount of +time to start responding on the I2C bus, contary to the SFF +specifications. + +Work around this by implementing a two-level timeout strategy, where +we initially quickly retry for the module, and then use a slower retry +after we exceed a maximum number of quick attempts. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 38 ++++++++++++++++++++++++++++---------- + 1 file changed, 28 insertions(+), 10 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -165,9 +165,12 @@ static const enum gpiod_flags gpio_flags + * The SFF-8472 specifies t_serial ("Time from power on until module is + * ready for data transmission over the two wire serial bus.") as 300ms. + */ +-#define T_SERIAL msecs_to_jiffies(300) +-#define T_HPOWER_LEVEL msecs_to_jiffies(300) +-#define T_PROBE_RETRY msecs_to_jiffies(100) ++#define T_SERIAL msecs_to_jiffies(300) ++#define T_HPOWER_LEVEL msecs_to_jiffies(300) ++#define T_PROBE_RETRY_INIT msecs_to_jiffies(100) ++#define R_PROBE_RETRY_INIT 10 ++#define T_PROBE_RETRY_SLOW msecs_to_jiffies(5000) ++#define R_PROBE_RETRY_SLOW 12 + + /* SFP modules appear to always have their PHY configured for bus address + * 0x56 (which with mdio-i2c, translates to a PHY address of 22). +@@ -202,6 +205,8 @@ struct sfp { + struct delayed_work timeout; + struct mutex sm_mutex; /* Protects state machine */ + unsigned char sm_mod_state; ++ unsigned char sm_mod_tries_init; ++ unsigned char sm_mod_tries; + unsigned char sm_dev_state; + unsigned short sm_state; + unsigned int sm_retries; +@@ -1392,7 +1397,7 @@ static int sfp_sm_mod_hpower(struct sfp + return 0; + } + +-static int sfp_sm_mod_probe(struct sfp *sfp) ++static int sfp_sm_mod_probe(struct sfp *sfp, bool report) + { + /* SFP module inserted - read I2C data */ + struct sfp_eeprom_id id; +@@ -1402,7 +1407,8 @@ static int sfp_sm_mod_probe(struct sfp * + + ret = sfp_read(sfp, false, 0, &id, sizeof(id)); + if (ret < 0) { +- dev_err(sfp->dev, "failed to read EEPROM: %d\n", ret); ++ if (report) ++ dev_err(sfp->dev, "failed to read EEPROM: %d\n", ret); + return -EAGAIN; + } + +@@ -1549,8 +1555,11 @@ static void sfp_sm_module(struct sfp *sf + + switch (sfp->sm_mod_state) { + default: +- if (event == SFP_E_INSERT) ++ if (event == SFP_E_INSERT) { + sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL); ++ sfp->sm_mod_tries_init = R_PROBE_RETRY_INIT; ++ sfp->sm_mod_tries = R_PROBE_RETRY_SLOW; ++ } + break; + + case SFP_MOD_PROBE: +@@ -1558,10 +1567,19 @@ static void sfp_sm_module(struct sfp *sf + if (event != SFP_E_TIMEOUT) + break; + +- err = sfp_sm_mod_probe(sfp); ++ err = sfp_sm_mod_probe(sfp, sfp->sm_mod_tries == 1); + if (err == -EAGAIN) { +- sfp_sm_set_timer(sfp, T_PROBE_RETRY); +- break; ++ if (sfp->sm_mod_tries_init && ++ --sfp->sm_mod_tries_init) { ++ sfp_sm_set_timer(sfp, T_PROBE_RETRY_INIT); ++ break; ++ } else if (sfp->sm_mod_tries && --sfp->sm_mod_tries) { ++ if (sfp->sm_mod_tries == R_PROBE_RETRY_SLOW - 1) ++ dev_warn(sfp->dev, ++ "please wait, module slow to respond\n"); ++ sfp_sm_set_timer(sfp, T_PROBE_RETRY_SLOW); ++ break; ++ } + } + if (err < 0) { + sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); +@@ -1596,7 +1614,7 @@ static void sfp_sm_module(struct sfp *sf + sfp_module_remove(sfp->sfp_bus); + sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0); + } else { +- sfp_sm_set_timer(sfp, T_PROBE_RETRY); ++ sfp_sm_set_timer(sfp, T_PROBE_RETRY_INIT); + } + break; + } diff --git a/target/linux/generic/backport-4.19/736-v5.5-net-sfp-allow-modules-with-slow-diagnostics-to-probe.patch b/target/linux/generic/backport-4.19/736-v5.5-net-sfp-allow-modules-with-slow-diagnostics-to-probe.patch new file mode 100644 index 0000000000..fe1e6c4822 --- /dev/null +++ b/target/linux/generic/backport-4.19/736-v5.5-net-sfp-allow-modules-with-slow-diagnostics-to-probe.patch @@ -0,0 +1,198 @@ +From 559391fc20fae506adcb311b904cc544c76436c0 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 7 Nov 2019 18:52:07 +0000 +Subject: [PATCH 634/660] net: sfp: allow modules with slow diagnostics to + probe + +When a module is inserted, we attempt to read read the ID from address +0x50. Once we are able to read the ID, we immediately attempt to +initialise the hwmon support by reading from address 0x51. If this +fails, then we fall into error state, and assume that the module is +not usable. + +Modules such as the ALCATELLUCENT 3FE46541AA use a real EEPROM for +I2C address 0x50, which responds immediately. However, address 0x51 +is an emulated, which only becomes available once the on-board firmware +has booted. This prompts us to fall into the error state. + +Since the module may be usable without diagnostics, arrange for the +hwmon probe independent of the rest of the SFP itself, retrying every +5s for up to about 60s for the monitoring to become available, and +print an error message if it doesn't become available. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 96 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 74 insertions(+), 22 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -216,6 +216,8 @@ struct sfp { + + #if IS_ENABLED(CONFIG_HWMON) + struct sfp_diag diag; ++ struct delayed_work hwmon_probe; ++ unsigned int hwmon_tries; + struct device *hwmon_dev; + char *hwmon_name; + #endif +@@ -1094,29 +1096,27 @@ static const struct hwmon_chip_info sfp_ + .info = sfp_hwmon_info, + }; + +-static int sfp_hwmon_insert(struct sfp *sfp) ++static void sfp_hwmon_probe(struct work_struct *work) + { ++ struct sfp *sfp = container_of(work, struct sfp, hwmon_probe.work); + int err, i; + +- if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE) +- return 0; +- +- if (!(sfp->id.ext.diagmon & SFP_DIAGMON_DDM)) +- return 0; +- +- if (sfp->id.ext.diagmon & SFP_DIAGMON_ADDRMODE) +- /* This driver in general does not support address +- * change. +- */ +- return 0; +- + err = sfp_read(sfp, true, 0, &sfp->diag, sizeof(sfp->diag)); +- if (err < 0) +- return err; ++ if (err < 0) { ++ if (sfp->hwmon_tries--) { ++ mod_delayed_work(system_wq, &sfp->hwmon_probe, ++ T_PROBE_RETRY_SLOW); ++ } else { ++ dev_warn(sfp->dev, "hwmon probe failed: %d\n", err); ++ } ++ return; ++ } + + sfp->hwmon_name = kstrdup(dev_name(sfp->dev), GFP_KERNEL); +- if (!sfp->hwmon_name) +- return -ENODEV; ++ if (!sfp->hwmon_name) { ++ dev_err(sfp->dev, "out of memory for hwmon name\n"); ++ return; ++ } + + for (i = 0; sfp->hwmon_name[i]; i++) + if (hwmon_is_bad_char(sfp->hwmon_name[i])) +@@ -1126,18 +1126,52 @@ static int sfp_hwmon_insert(struct sfp * + sfp->hwmon_name, sfp, + &sfp_hwmon_chip_info, + NULL); ++ if (IS_ERR(sfp->hwmon_dev)) ++ dev_err(sfp->dev, "failed to register hwmon device: %ld\n", ++ PTR_ERR(sfp->hwmon_dev)); ++} ++ ++static int sfp_hwmon_insert(struct sfp *sfp) ++{ ++ if (sfp->id.ext.sff8472_compliance == SFP_SFF8472_COMPLIANCE_NONE) ++ return 0; ++ ++ if (!(sfp->id.ext.diagmon & SFP_DIAGMON_DDM)) ++ return 0; ++ ++ if (sfp->id.ext.diagmon & SFP_DIAGMON_ADDRMODE) ++ /* This driver in general does not support address ++ * change. ++ */ ++ return 0; ++ ++ mod_delayed_work(system_wq, &sfp->hwmon_probe, 1); ++ sfp->hwmon_tries = R_PROBE_RETRY_SLOW; + +- return PTR_ERR_OR_ZERO(sfp->hwmon_dev); ++ return 0; + } + + static void sfp_hwmon_remove(struct sfp *sfp) + { ++ cancel_delayed_work_sync(&sfp->hwmon_probe); + if (!IS_ERR_OR_NULL(sfp->hwmon_dev)) { + hwmon_device_unregister(sfp->hwmon_dev); + sfp->hwmon_dev = NULL; + kfree(sfp->hwmon_name); + } + } ++ ++static int sfp_hwmon_init(struct sfp *sfp) ++{ ++ INIT_DELAYED_WORK(&sfp->hwmon_probe, sfp_hwmon_probe); ++ ++ return 0; ++} ++ ++static void sfp_hwmon_exit(struct sfp *sfp) ++{ ++ cancel_delayed_work_sync(&sfp->hwmon_probe); ++} + #else + static int sfp_hwmon_insert(struct sfp *sfp) + { +@@ -1147,6 +1181,15 @@ static int sfp_hwmon_insert(struct sfp * + static void sfp_hwmon_remove(struct sfp *sfp) + { + } ++ ++static int sfp_hwmon_init(struct sfp *sfp) ++{ ++ return 0; ++} ++ ++static void sfp_hwmon_exit(struct sfp *sfp) ++{ ++} + #endif + + /* Helpers */ +@@ -1483,10 +1526,6 @@ static int sfp_sm_mod_probe(struct sfp * + if (ret < 0) + return ret; + +- ret = sfp_hwmon_insert(sfp); +- if (ret < 0) +- return ret; +- + return 0; + } + +@@ -1635,6 +1674,15 @@ static void sfp_sm_module(struct sfp *sf + case SFP_MOD_ERROR: + break; + } ++ ++#if IS_ENABLED(CONFIG_HWMON) ++ if (sfp->sm_mod_state >= SFP_MOD_WAITDEV && ++ IS_ERR_OR_NULL(sfp->hwmon_dev)) { ++ err = sfp_hwmon_insert(sfp); ++ if (err) ++ dev_warn(sfp->dev, "hwmon probe failed: %d\n", err); ++ } ++#endif + } + + static void sfp_sm_main(struct sfp *sfp, unsigned int event) +@@ -1936,6 +1984,8 @@ static struct sfp *sfp_alloc(struct devi + INIT_DELAYED_WORK(&sfp->poll, sfp_poll); + INIT_DELAYED_WORK(&sfp->timeout, sfp_timeout); + ++ sfp_hwmon_init(sfp); ++ + return sfp; + } + +@@ -1943,6 +1993,8 @@ static void sfp_cleanup(void *data) + { + struct sfp *sfp = data; + ++ sfp_hwmon_exit(sfp); ++ + cancel_delayed_work_sync(&sfp->poll); + cancel_delayed_work_sync(&sfp->timeout); + if (sfp->i2c_mii) { diff --git a/target/linux/generic/backport-4.19/737-v5.5-net-phy-add-core-phylib-sfp-support.patch b/target/linux/generic/backport-4.19/737-v5.5-net-phy-add-core-phylib-sfp-support.patch new file mode 100644 index 0000000000..8dcad2fa58 --- /dev/null +++ b/target/linux/generic/backport-4.19/737-v5.5-net-phy-add-core-phylib-sfp-support.patch @@ -0,0 +1,183 @@ +From eb156db588ac583cdae7b91eaac9c0ad3a358e63 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Sun, 15 Sep 2019 20:05:34 +0100 +Subject: [PATCH 635/660] net: phy: add core phylib sfp support + +Add core phylib help for supporting SFP sockets on PHYs. This provides +a mechanism to inform the SFP layer about PHY up/down events, and also +unregister the SFP bus when the PHY is going away. + +Signed-off-by: Russell King +--- + drivers/net/phy/phy.c | 7 ++++ + drivers/net/phy/phy_device.c | 66 ++++++++++++++++++++++++++++++++++++ + include/linux/phy.h | 11 ++++++ + 3 files changed, 84 insertions(+) + +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -871,6 +872,9 @@ void phy_stop(struct phy_device *phydev) + if (phy_interrupt_is_valid(phydev)) + phy_disable_interrupts(phydev); + ++ if (phydev->sfp_bus) ++ sfp_upstream_stop(phydev->sfp_bus); ++ + phydev->state = PHY_HALTED; + + out_unlock: +@@ -899,6 +903,9 @@ void phy_start(struct phy_device *phydev + + mutex_lock(&phydev->lock); + ++ if (phydev->sfp_bus) ++ sfp_upstream_start(phydev->sfp_bus); ++ + switch (phydev->state) { + case PHY_STARTING: + phydev->state = PHY_PENDING; +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -943,6 +944,65 @@ void phy_attached_print(struct phy_devic + EXPORT_SYMBOL(phy_attached_print); + + /** ++ * phy_sfp_attach - attach the SFP bus to the PHY upstream network device ++ * @upstream: pointer to the phy device ++ * @bus: sfp bus representing cage being attached ++ * ++ * This is used to fill in the sfp_upstream_ops .attach member. ++ */ ++void phy_sfp_attach(void *upstream, struct sfp_bus *bus) ++{ ++ struct phy_device *phydev = upstream; ++ ++ if (phydev->attached_dev) ++ phydev->attached_dev->sfp_bus = bus; ++ phydev->sfp_bus_attached = true; ++} ++EXPORT_SYMBOL(phy_sfp_attach); ++ ++/** ++ * phy_sfp_detach - detach the SFP bus from the PHY upstream network device ++ * @upstream: pointer to the phy device ++ * @bus: sfp bus representing cage being attached ++ * ++ * This is used to fill in the sfp_upstream_ops .detach member. ++ */ ++void phy_sfp_detach(void *upstream, struct sfp_bus *bus) ++{ ++ struct phy_device *phydev = upstream; ++ ++ if (phydev->attached_dev) ++ phydev->attached_dev->sfp_bus = NULL; ++ phydev->sfp_bus_attached = false; ++} ++EXPORT_SYMBOL(phy_sfp_detach); ++ ++/** ++ * phy_sfp_probe - probe for a SFP cage attached to this PHY device ++ * @phydev: Pointer to phy_device ++ * @ops: SFP's upstream operations ++ */ ++int phy_sfp_probe(struct phy_device *phydev, ++ const struct sfp_upstream_ops *ops) ++{ ++ struct sfp_bus *bus; ++ int ret; ++ ++ if (phydev->mdio.dev.fwnode) { ++ bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode); ++ if (IS_ERR(bus)) ++ return PTR_ERR(bus); ++ ++ phydev->sfp_bus = bus; ++ ++ ret = sfp_bus_add_upstream(bus, phydev, ops); ++ sfp_bus_put(bus); ++ } ++ return 0; ++} ++EXPORT_SYMBOL(phy_sfp_probe); ++ ++/** + * phy_attach_direct - attach a network device to a given PHY device pointer + * @dev: network device to attach + * @phydev: Pointer to phy_device to attach +@@ -1015,6 +1075,9 @@ int phy_attach_direct(struct net_device + phydev->attached_dev = dev; + dev->phydev = phydev; + ++ if (phydev->sfp_bus_attached) ++ dev->sfp_bus = phydev->sfp_bus; ++ + /* Some Ethernet drivers try to connect to a PHY device before + * calling register_netdevice() -> netdev_register_kobject() and + * does the dev->dev.kobj initialization. Here we only check for +@@ -1949,6 +2012,9 @@ static int phy_remove(struct device *dev + phydev->state = PHY_DOWN; + mutex_unlock(&phydev->lock); + ++ sfp_bus_del_upstream(phydev->sfp_bus); ++ phydev->sfp_bus = NULL; ++ + if (phydev->drv && phydev->drv->remove) { + phydev->drv->remove(phydev); + +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -184,6 +184,8 @@ static inline const char *phy_modes(phy_ + + struct device; + struct phylink; ++struct sfp_bus; ++struct sfp_upstream_ops; + struct sk_buff; + + /* +@@ -382,6 +384,8 @@ struct phy_c45_device_ids { + * irq: IRQ number of the PHY's interrupt (-1 if none) + * phy_timer: The timer for handling the state machine + * phy_queue: A work_queue for the phy_mac_interrupt ++ * sfp_bus_attached: flag indicating whether the SFP bus has been attached ++ * sfp_bus: SFP bus attached to this PHY's fiber port + * attached_dev: The attached enet driver's device instance ptr + * adjust_link: Callback for the enet controller to respond to + * changes in the link state. +@@ -471,6 +475,9 @@ struct phy_device { + + struct mutex lock; + ++ /* This may be modified under the rtnl lock */ ++ bool sfp_bus_attached; ++ struct sfp_bus *sfp_bus; + struct phylink *phylink; + struct net_device *attached_dev; + +@@ -1031,6 +1038,10 @@ int phy_suspend(struct phy_device *phyde + int phy_resume(struct phy_device *phydev); + int __phy_resume(struct phy_device *phydev); + int phy_loopback(struct phy_device *phydev, bool enable); ++void phy_sfp_attach(void *upstream, struct sfp_bus *bus); ++void phy_sfp_detach(void *upstream, struct sfp_bus *bus); ++int phy_sfp_probe(struct phy_device *phydev, ++ const struct sfp_upstream_ops *ops); + struct phy_device *phy_attach(struct net_device *dev, const char *bus_id, + phy_interface_t interface); + struct phy_device *phy_find_first(struct mii_bus *bus); diff --git a/target/linux/generic/backport-4.19/738-v5.5-net-phy-marvell10g-add-SFP-support.patch b/target/linux/generic/backport-4.19/738-v5.5-net-phy-marvell10g-add-SFP-support.patch new file mode 100644 index 0000000000..a67431ce5c --- /dev/null +++ b/target/linux/generic/backport-4.19/738-v5.5-net-phy-marvell10g-add-SFP-support.patch @@ -0,0 +1,67 @@ +From 0836d9fb41ed90090ef4af0d7abe784ee7706f80 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 14 Apr 2017 14:21:25 +0100 +Subject: [PATCH 636/660] net: phy: marvell10g: add SFP+ support + +Add support for SFP+ cages to the Marvell 10G PHY driver. This is +slightly complicated by the way phylib works in that we need to use +a multi-step process to attach the SFP bus, and we also need to track +the phylink state machine to know when the module's transmit disable +signal should change state. + +With appropriate DT changes, this allows the SFP+ canges on the +Macchiatobin platform to be functional. + +Signed-off-by: Russell King +--- + drivers/net/phy/marvell10g.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +--- a/drivers/net/phy/marvell10g.c ++++ b/drivers/net/phy/marvell10g.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + enum { + MV_PMA_BOOT = 0xc050, +@@ -219,6 +220,28 @@ static int mv3310_hwmon_probe(struct phy + } + #endif + ++static int mv3310_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) ++{ ++ struct phy_device *phydev = upstream; ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; ++ phy_interface_t iface; ++ ++ sfp_parse_support(phydev->sfp_bus, id, support); ++ iface = sfp_select_interface(phydev->sfp_bus, id, support); ++ ++ if (iface != PHY_INTERFACE_MODE_10GKR) { ++ dev_err(&phydev->mdio.dev, "incompatible SFP module inserted\n"); ++ return -EINVAL; ++ } ++ return 0; ++} ++ ++static const struct sfp_upstream_ops mv3310_sfp_ops = { ++ .attach = phy_sfp_attach, ++ .detach = phy_sfp_detach, ++ .module_insert = mv3310_sfp_insert, ++}; ++ + static int mv3310_probe(struct phy_device *phydev) + { + struct mv3310_priv *priv; +@@ -249,7 +272,7 @@ static int mv3310_probe(struct phy_devic + if (ret) + return ret; + +- return 0; ++ return phy_sfp_probe(phydev, &mv3310_sfp_ops); + } + + static int mv3310_suspend(struct phy_device *phydev) diff --git a/target/linux/generic/backport-4.19/739-v5.5-net-phylink-update-to-use-phy_support_asym_pause.patch b/target/linux/generic/backport-4.19/739-v5.5-net-phylink-update-to-use-phy_support_asym_pause.patch new file mode 100644 index 0000000000..15db0abc96 --- /dev/null +++ b/target/linux/generic/backport-4.19/739-v5.5-net-phylink-update-to-use-phy_support_asym_pause.patch @@ -0,0 +1,45 @@ +From 09d7d8395ec61fba4392b35baa6f71c4e36489df Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 8 Nov 2019 15:18:02 +0000 +Subject: [PATCH 637/660] net: phylink: update to use phy_support_asym_pause() + +Use phy_support_asym_pause() rather than open-coding it. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -678,12 +678,6 @@ static int phylink_bringup_phy(struct ph + u32 advertising; + int ret; + +- memset(&config, 0, sizeof(config)); +- ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported); +- ethtool_convert_legacy_u32_to_link_mode(config.advertising, +- phy->advertising); +- config.interface = pl->link_config.interface; +- + /* + * This is the new way of dealing with flow control for PHYs, + * as described by Timur Tabi in commit 529ed1275263 ("net: phy: +@@ -691,10 +685,13 @@ static int phylink_bringup_phy(struct ph + * using our validate call to the MAC, we rely upon the MAC + * clearing the bits from both supported and advertising fields. + */ +- if (phylink_test(supported, Pause)) +- phylink_set(config.advertising, Pause); +- if (phylink_test(supported, Asym_Pause)) +- phylink_set(config.advertising, Asym_Pause); ++ phy_support_asym_pause(phy); ++ ++ memset(&config, 0, sizeof(config)); ++ ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported); ++ ethtool_convert_legacy_u32_to_link_mode(config.advertising, ++ phy->advertising); ++ config.interface = pl->link_config.interface; + + ret = phylink_validate(pl, supported, &config); + if (ret) diff --git a/target/linux/generic/backport-4.19/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch b/target/linux/generic/backport-4.19/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch new file mode 100644 index 0000000000..d6c0120197 --- /dev/null +++ b/target/linux/generic/backport-4.19/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch @@ -0,0 +1,63 @@ +From 1be8018db381200c24854e0c299206c557f76fe0 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Mon, 11 Nov 2019 11:58:09 +0000 +Subject: [PATCH 638/660] net: phy: avoid matching all-ones clause 45 PHY IDs + +We currently match clause 45 PHYs using any ID read from a MMD marked +as present in the "Devices in package" registers 5 and 6. However, +this is incorrect. 45.2 says: + + "The definition of the term package is vendor specific and could be + a chip, module, or other similar entity." + +so a package could be more or less than the whole PHY - a PHY could be +made up of several modules instantiated onto a single chip such as the +Marvell 88x3310, or some of the MMDs could be disabled according to +chip configuration, such as the Broadcom 84881. + +In the case of Broadcom 84881, the "Devices in package" registers +contain 0xc000009b, meaning that there is a PHYXS present in the +package, but all registers in MMD 4 return 0xffff. This leads to our +matching code incorrectly binding this PHY to one of our generic PHY +drivers. + +This patch changes the way we determine whether to attempt to match a +MMD identifier, or use it to request a module - if the identifier is +all-ones, then we skip over it. When reading the identifiers, we +initialise phydev->c45_ids.device_ids to all-ones, only reading the +device ID if the "Devices in package" registers indicates we should. + +This avoids the generic drivers incorrectly matching on a PHY ID of +0xffffffff. + +Signed-off-by: Russell King +--- + drivers/net/phy/phy_device.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -334,7 +334,7 @@ static int phy_bus_match(struct device * + + if (phydev->is_c45) { + for (i = 1; i < num_ids; i++) { +- if (!(phydev->c45_ids.devices_in_package & (1 << i))) ++ if (phydev->c45_ids.device_ids[i] == 0xffffffff) + continue; + + if ((phydrv->phy_id & phydrv->phy_id_mask) == +@@ -622,10 +622,13 @@ static int get_phy_id(struct mii_bus *bu + */ + struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) + { +- struct phy_c45_device_ids c45_ids = {0}; ++ struct phy_c45_device_ids c45_ids; + u32 phy_id = 0; + int r; + ++ c45_ids.devices_in_package = 0; ++ memset(c45_ids.device_ids, 0xff, sizeof(c45_ids.device_ids)); ++ + r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids); + if (r) + return ERR_PTR(r); diff --git a/target/linux/generic/backport-4.19/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch b/target/linux/generic/backport-4.19/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch new file mode 100644 index 0000000000..596ecc8272 --- /dev/null +++ b/target/linux/generic/backport-4.19/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch @@ -0,0 +1,66 @@ +From 4c9633f75dc35abe1b9261e0415d77802f35741d Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 11:58:00 +0000 +Subject: [PATCH 639/660] net: phylink: fix link mode modification in PHY mode + +Modifying the link settings via phylink_ethtool_ksettings_set() and +phylink_ethtool_set_pauseparam() didn't always work as intended for +PHY based setups, as calling phylink_mac_config() would result in the +unresolved configuration being committed to the MAC, rather than the +configuration with the speed and duplex setting. + +This would work fine if the update caused the link to renegotiate, +but if no settings have changed, phylib won't trigger a renegotiation +cycle, and the MAC will be left incorrectly configured. + +Avoid calling phylink_mac_config() unless we are using an inband mode +in phylink_ethtool_ksettings_set(), and use phy_set_asym_pause() as +introduced in 4.20 to set the PHY settings in +phylink_ethtool_set_pauseparam(). + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1210,7 +1210,13 @@ int phylink_ethtool_ksettings_set(struct + pl->link_config.duplex = our_kset.base.duplex; + pl->link_config.an_enabled = our_kset.base.autoneg != AUTONEG_DISABLE; + +- if (!test_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state)) { ++ /* If we have a PHY, phylib will call our link state function if the ++ * mode has changed, which will trigger a resolve and update the MAC ++ * configuration. For a fixed link, this isn't able to change any ++ * parameters, which just leaves inband mode. ++ */ ++ if (pl->link_an_mode == MLO_AN_INBAND && ++ !test_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state)) { + phylink_mac_config(pl, &pl->link_config); + phylink_mac_an_restart(pl); + } +@@ -1290,14 +1296,16 @@ int phylink_ethtool_set_pauseparam(struc + if (pause->tx_pause) + config->pause |= MLO_PAUSE_TX; + +- if (!test_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state)) { ++ /* If we have a PHY, phylib will call our link state function if the ++ * mode has changed, which will trigger a resolve and update the MAC ++ * configuration. ++ */ ++ if (pl->phydev) { ++ phy_set_asym_pause(pl->phydev, pause->rx_pause, ++ pause->tx_pause); ++ } else if (!test_bit(PHYLINK_DISABLE_STOPPED, ++ &pl->phylink_disable_state)) { + switch (pl->link_an_mode) { +- case MLO_AN_PHY: +- /* Silently mark the carrier down, and then trigger a resolve */ +- netif_carrier_off(pl->netdev); +- phylink_run_resolve(pl); +- break; +- + case MLO_AN_FIXED: + /* Should we allow fixed links to change against the config? */ + phylink_resolve_flow(pl, config); diff --git a/target/linux/generic/backport-4.19/742-v5.5-net-sfp-add-support-for-module-quirks.patch b/target/linux/generic/backport-4.19/742-v5.5-net-sfp-add-support-for-module-quirks.patch new file mode 100644 index 0000000000..5068bd468c --- /dev/null +++ b/target/linux/generic/backport-4.19/742-v5.5-net-sfp-add-support-for-module-quirks.patch @@ -0,0 +1,111 @@ +From 8df5dd55cef48c0769379e04dbc085a899b106d4 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 8 Mar 2019 14:02:25 +0000 +Subject: [PATCH 640/660] net: sfp: add support for module quirks + +Add support for applying module quirks to the list of supported +ethtool link modes. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp-bus.c | 54 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 54 insertions(+) + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -9,6 +9,12 @@ + + #include "sfp.h" + ++struct sfp_quirk { ++ const char *vendor; ++ const char *part; ++ void (*modes)(const struct sfp_eeprom_id *id, unsigned long *modes); ++}; ++ + /** + * struct sfp_bus - internal representation of a sfp bus + */ +@@ -21,6 +27,7 @@ struct sfp_bus { + const struct sfp_socket_ops *socket_ops; + struct device *sfp_dev; + struct sfp *sfp; ++ const struct sfp_quirk *sfp_quirk; + + const struct sfp_upstream_ops *upstream_ops; + void *upstream; +@@ -30,6 +37,46 @@ struct sfp_bus { + bool started; + }; + ++static const struct sfp_quirk sfp_quirks[] = { ++}; ++ ++static size_t sfp_strlen(const char *str, size_t maxlen) ++{ ++ size_t size, i; ++ ++ /* Trailing characters should be filled with space chars */ ++ for (i = 0, size = 0; i < maxlen; i++) ++ if (str[i] != ' ') ++ size = i + 1; ++ ++ return size; ++} ++ ++static bool sfp_match(const char *qs, const char *str, size_t len) ++{ ++ if (!qs) ++ return true; ++ if (strlen(qs) != len) ++ return false; ++ return !strncmp(qs, str, len); ++} ++ ++static const struct sfp_quirk *sfp_lookup_quirk(const struct sfp_eeprom_id *id) ++{ ++ const struct sfp_quirk *q; ++ unsigned int i; ++ size_t vs, ps; ++ ++ vs = sfp_strlen(id->base.vendor_name, ARRAY_SIZE(id->base.vendor_name)); ++ ps = sfp_strlen(id->base.vendor_pn, ARRAY_SIZE(id->base.vendor_pn)); ++ ++ for (i = 0, q = sfp_quirks; i < ARRAY_SIZE(sfp_quirks); i++, q++) ++ if (sfp_match(q->vendor, id->base.vendor_name, vs) && ++ sfp_match(q->part, id->base.vendor_pn, ps)) ++ return q; ++ ++ return NULL; ++} + /** + * sfp_parse_port() - Parse the EEPROM base ID, setting the port type + * @bus: a pointer to the &struct sfp_bus structure for the sfp module +@@ -233,6 +280,9 @@ void sfp_parse_support(struct sfp_bus *b + phylink_set(modes, 1000baseX_Full); + } + ++ if (bus->sfp_quirk) ++ bus->sfp_quirk->modes(id, modes); ++ + bitmap_or(support, support, modes, __ETHTOOL_LINK_MODE_MASK_NBITS); + + phylink_set(support, Autoneg); +@@ -609,6 +659,8 @@ int sfp_module_insert(struct sfp_bus *bu + const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus); + int ret = 0; + ++ bus->sfp_quirk = sfp_lookup_quirk(id); ++ + if (ops && ops->module_insert) + ret = ops->module_insert(bus->upstream, id); + +@@ -622,6 +674,8 @@ void sfp_module_remove(struct sfp_bus *b + + if (ops && ops->module_remove) + ops->module_remove(bus->upstream); ++ ++ bus->sfp_quirk = NULL; + } + EXPORT_SYMBOL_GPL(sfp_module_remove); + diff --git a/target/linux/generic/backport-4.19/743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch b/target/linux/generic/backport-4.19/743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch new file mode 100644 index 0000000000..10c34881d8 --- /dev/null +++ b/target/linux/generic/backport-4.19/743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch @@ -0,0 +1,52 @@ +From ecaa542cfed078dbc356dadff0bad4b6a8e704a0 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 17 May 2019 10:14:45 +0100 +Subject: [PATCH 641/660] net: sfp: add some quirks for GPON modules + +Marc Micalizzi reports that Huawei MA5671A and Alcatel/Lucent G-010S-P +modules are capable of 2500base-X, but incorrectly report their +capabilities in the EEPROM. It seems rather common that GPON modules +mis-report. + +Let's fix these modules by adding some quirks. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp-bus.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -37,7 +37,32 @@ struct sfp_bus { + bool started; + }; + ++static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id, ++ unsigned long *modes) ++{ ++ phylink_set(modes, 2500baseX_Full); ++} ++ + static const struct sfp_quirk sfp_quirks[] = { ++ { ++ // Alcatel Lucent G-010S-P can operate at 2500base-X, but ++ // incorrectly report 2500MBd NRZ in their EEPROM ++ .vendor = "ALCATELLUCENT", ++ .part = "G010SP", ++ .modes = sfp_quirk_2500basex, ++ }, { ++ // Alcatel Lucent G-010S-A can operate at 2500base-X, but ++ // report 3.2GBd NRZ in their EEPROM ++ .vendor = "ALCATELLUCENT", ++ .part = "3FE46541AA", ++ .modes = sfp_quirk_2500basex, ++ }, { ++ // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd ++ // NRZ in their EEPROM ++ .vendor = "HUAWEI", ++ .part = "MA5671A", ++ .modes = sfp_quirk_2500basex, ++ }, + }; + + static size_t sfp_strlen(const char *str, size_t maxlen) diff --git a/target/linux/generic/backport-4.19/744-v5.5-net-sfp-soft-status-and-control-support.patch b/target/linux/generic/backport-4.19/744-v5.5-net-sfp-soft-status-and-control-support.patch new file mode 100644 index 0000000000..163d8072e6 --- /dev/null +++ b/target/linux/generic/backport-4.19/744-v5.5-net-sfp-soft-status-and-control-support.patch @@ -0,0 +1,225 @@ +From 40e0b3b15f7da92e6b065292b14af7b9bfb1c6e0 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 13 Sep 2019 23:00:35 +0100 +Subject: [PATCH 642/660] net: sfp: soft status and control support + +Add support for the soft status and control register, which allows +TX_FAULT and RX_LOS to be monitored and TX_DISABLE to be set. We +make use of this when the board does not support GPIOs for these +signals. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 110 ++++++++++++++++++++++++++++++++++-------- + include/linux/sfp.h | 4 ++ + 2 files changed, 94 insertions(+), 20 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -199,7 +199,10 @@ struct sfp { + struct gpio_desc *gpio[GPIO_MAX]; + int gpio_irq[GPIO_MAX]; + ++ bool need_poll; ++ + struct mutex st_mutex; /* Protects state */ ++ unsigned int state_soft_mask; + unsigned int state; + struct delayed_work poll; + struct delayed_work timeout; +@@ -393,24 +396,90 @@ static int sfp_i2c_configure(struct sfp + } + + /* Interface */ +-static unsigned int sfp_get_state(struct sfp *sfp) ++static int sfp_read(struct sfp *sfp, bool a2, u8 addr, void *buf, size_t len) + { +- return sfp->get_state(sfp); ++ return sfp->read(sfp, a2, addr, buf, len); + } + +-static void sfp_set_state(struct sfp *sfp, unsigned int state) ++static int sfp_write(struct sfp *sfp, bool a2, u8 addr, void *buf, size_t len) + { +- sfp->set_state(sfp, state); ++ return sfp->write(sfp, a2, addr, buf, len); + } + +-static int sfp_read(struct sfp *sfp, bool a2, u8 addr, void *buf, size_t len) ++static unsigned int sfp_soft_get_state(struct sfp *sfp) + { +- return sfp->read(sfp, a2, addr, buf, len); ++ unsigned int state = 0; ++ u8 status; ++ ++ if (sfp_read(sfp, true, SFP_STATUS, &status, sizeof(status)) == ++ sizeof(status)) { ++ if (status & SFP_STATUS_RX_LOS) ++ state |= SFP_F_LOS; ++ if (status & SFP_STATUS_TX_FAULT) ++ state |= SFP_F_TX_FAULT; ++ } ++ ++ return state & sfp->state_soft_mask; + } + +-static int sfp_write(struct sfp *sfp, bool a2, u8 addr, void *buf, size_t len) ++static void sfp_soft_set_state(struct sfp *sfp, unsigned int state) + { +- return sfp->write(sfp, a2, addr, buf, len); ++ u8 status; ++ ++ if (sfp_read(sfp, true, SFP_STATUS, &status, sizeof(status)) == ++ sizeof(status)) { ++ if (state & SFP_F_TX_DISABLE) ++ status |= SFP_STATUS_TX_DISABLE_FORCE; ++ else ++ status &= ~SFP_STATUS_TX_DISABLE_FORCE; ++ ++ sfp_write(sfp, true, SFP_STATUS, &status, sizeof(status)); ++ } ++} ++ ++static void sfp_soft_start_poll(struct sfp *sfp) ++{ ++ const struct sfp_eeprom_id *id = &sfp->id; ++ ++ sfp->state_soft_mask = 0; ++ if (id->ext.enhopts & SFP_ENHOPTS_SOFT_TX_DISABLE && ++ !sfp->gpio[GPIO_TX_DISABLE]) ++ sfp->state_soft_mask |= SFP_F_TX_DISABLE; ++ if (id->ext.enhopts & SFP_ENHOPTS_SOFT_TX_FAULT && ++ !sfp->gpio[GPIO_TX_FAULT]) ++ sfp->state_soft_mask |= SFP_F_TX_FAULT; ++ if (id->ext.enhopts & SFP_ENHOPTS_SOFT_RX_LOS && ++ !sfp->gpio[GPIO_LOS]) ++ sfp->state_soft_mask |= SFP_F_LOS; ++ ++ if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) && ++ !sfp->need_poll) ++ mod_delayed_work(system_wq, &sfp->poll, poll_jiffies); ++} ++ ++static void sfp_soft_stop_poll(struct sfp *sfp) ++{ ++ sfp->state_soft_mask = 0; ++} ++ ++static unsigned int sfp_get_state(struct sfp *sfp) ++{ ++ unsigned int state = sfp->get_state(sfp); ++ ++ if (state & SFP_F_PRESENT && ++ sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT)) ++ state |= sfp_soft_get_state(sfp); ++ ++ return state; ++} ++ ++static void sfp_set_state(struct sfp *sfp, unsigned int state) ++{ ++ sfp->set_state(sfp, state); ++ ++ if (state & SFP_F_PRESENT && ++ sfp->state_soft_mask & SFP_F_TX_DISABLE) ++ sfp_soft_set_state(sfp, state); + } + + static unsigned int sfp_check(void *buf, size_t len) +@@ -1342,11 +1411,6 @@ static void sfp_sm_fault(struct sfp *sfp + } + } + +-static void sfp_sm_mod_init(struct sfp *sfp) +-{ +- sfp_module_tx_enable(sfp); +-} +- + static void sfp_sm_probe_for_phy(struct sfp *sfp) + { + /* Setting the serdes link mode is guesswork: there's no +@@ -1509,7 +1573,7 @@ static int sfp_sm_mod_probe(struct sfp * + (int)sizeof(id.ext.datecode), id.ext.datecode); + + /* Check whether we support this module */ +- if (!sfp->type->module_supported(&sfp->id)) { ++ if (!sfp->type->module_supported(&id)) { + dev_err(sfp->dev, + "module is not supported - phys id 0x%02x 0x%02x\n", + sfp->id.base.phys_id, sfp->id.base.phys_ext_id); +@@ -1699,6 +1763,7 @@ static void sfp_sm_main(struct sfp *sfp, + if (sfp->mod_phy) + sfp_sm_phy_detach(sfp); + sfp_module_tx_disable(sfp); ++ sfp_soft_stop_poll(sfp); + sfp_sm_next(sfp, SFP_S_DOWN, 0); + return; + } +@@ -1710,7 +1775,10 @@ static void sfp_sm_main(struct sfp *sfp, + sfp->sm_dev_state != SFP_DEV_UP) + break; + +- sfp_sm_mod_init(sfp); ++ if (!(sfp->id.ext.diagmon & SFP_DIAGMON_ADDRMODE)) ++ sfp_soft_start_poll(sfp); ++ ++ sfp_module_tx_enable(sfp); + + /* Initialise the fault clearance retries */ + sfp->sm_retries = 5; +@@ -1966,7 +2034,10 @@ static void sfp_poll(struct work_struct + struct sfp *sfp = container_of(work, struct sfp, poll.work); + + sfp_check_state(sfp); +- mod_delayed_work(system_wq, &sfp->poll, poll_jiffies); ++ ++ if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) || ++ sfp->need_poll) ++ mod_delayed_work(system_wq, &sfp->poll, poll_jiffies); + } + + static struct sfp *sfp_alloc(struct device *dev) +@@ -2010,7 +2081,6 @@ static int sfp_probe(struct platform_dev + { + const struct sff_data *sff; + struct sfp *sfp; +- bool poll = false; + int err, i; + + sfp = sfp_alloc(&pdev->dev); +@@ -2100,7 +2170,7 @@ static int sfp_probe(struct platform_dev + + sfp->gpio_irq[i] = gpiod_to_irq(sfp->gpio[i]); + if (!sfp->gpio_irq[i]) { +- poll = true; ++ sfp->need_poll = true; + continue; + } + +@@ -2112,11 +2182,11 @@ static int sfp_probe(struct platform_dev + dev_name(sfp->dev), sfp); + if (err) { + sfp->gpio_irq[i] = 0; +- poll = true; ++ sfp->need_poll = true; + } + } + +- if (poll) ++ if (sfp->need_poll) + mod_delayed_work(system_wq, &sfp->poll, poll_jiffies); + + /* We could have an issue in cases no Tx disable pin is available or +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -428,6 +428,10 @@ enum { + SFP_TEC_CUR = 0x6c, + + SFP_STATUS = 0x6e, ++ SFP_STATUS_TX_DISABLE = BIT(7), ++ SFP_STATUS_TX_DISABLE_FORCE = BIT(6), ++ SFP_STATUS_TX_FAULT = BIT(2), ++ SFP_STATUS_RX_LOS = BIT(1), + SFP_ALARM0 = 0x70, + SFP_ALARM0_TEMP_HIGH = BIT(7), + SFP_ALARM0_TEMP_LOW = BIT(6), From a1358fc7ae638b7dafe682ae764fc4d1d189b05e Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Nov 2019 11:45:30 +0000 Subject: [PATCH 407/480] kernel: add SFP support for Methode DM7052 NBASE-T module Add support for Methode DM7052 NBASE-T module to OpenWRT. These patches are taken from my "phy" branch, and will be sent for the next kernel merge window. Signed-off-by: Russell King [jonas.gorski: move patches to pending, refresh patches] Signed-off-by: Jonas Gorski --- package/kernel/linux/modules/netdevices.mk | 17 + target/linux/generic/config-4.19 | 1 + .../702-phy_add_aneg_done_function.patch | 4 +- ...detach-callback-to-struct-phy_driver.patch | 4 +- ...ncomplete-100BASE-FX-and-100BASE-LX-.patch | 52 +++ ...nterface-mode-from-ethtool-link-mode.patch | 89 +++++ ...p-add-more-extended-compliance-codes.patch | 251 +++++++++++++ ...le-start-stop-upstream-notifications.patch | 131 +++++++ ...p-move-phy_start-phy_stop-to-phylink.patch | 72 ++++ ...c-add-support-for-Clause-45-accesses.patch | 74 ++++ ...ylink-re-split-__phylink_connect_phy.patch | 93 +++++ ...upport-Clause-45-PHYs-on-SFP-modules.patch | 89 +++++ ...t-link_an_mode-configured-and-curren.patch | 254 +++++++++++++ ...link-split-phylink_sfp_module_insert.patch | 120 +++++++ ...y-MAC-configuration-for-copper-SFP-m.patch | 204 +++++++++++ ...ke-Broadcom-BCM84881-based-SFPs-work.patch | 58 +++ ...phy-add-Broadcom-BCM84881-PHY-driver.patch | 333 ++++++++++++++++++ ...t-sfp-add-support-for-Clause-45-PHYs.patch | 94 +++++ 18 files changed, 1936 insertions(+), 4 deletions(-) create mode 100644 target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch create mode 100644 target/linux/generic/pending-4.19/741-net-sfp-derive-interface-mode-from-ethtool-link-mode.patch create mode 100644 target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch create mode 100644 target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch create mode 100644 target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch create mode 100644 target/linux/generic/pending-4.19/745-net-mdio-i2c-add-support-for-Clause-45-accesses.patch create mode 100644 target/linux/generic/pending-4.19/746-net-phylink-re-split-__phylink_connect_phy.patch create mode 100644 target/linux/generic/pending-4.19/747-net-phylink-support-Clause-45-PHYs-on-SFP-modules.patch create mode 100644 target/linux/generic/pending-4.19/748-net-phylink-split-link_an_mode-configured-and-curren.patch create mode 100644 target/linux/generic/pending-4.19/749-net-phylink-split-phylink_sfp_module_insert.patch create mode 100644 target/linux/generic/pending-4.19/750-net-phylink-delay-MAC-configuration-for-copper-SFP-m.patch create mode 100644 target/linux/generic/pending-4.19/751-net-phylink-make-Broadcom-BCM84881-based-SFPs-work.patch create mode 100644 target/linux/generic/pending-4.19/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch create mode 100644 target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 610f7db82b..5bfd1617a3 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -192,6 +192,23 @@ endef $(eval $(call KernelPackage,phy-broadcom)) +define KernelPackage/phy-bcm84881 + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Broadcom BCM84881 PHY driver + KCONFIG:=CONFIG_BCM84881_PHY + DEPENDS:=+kmod-libphy + FILES:=$(LINUX_DIR)/drivers/net/phy/bcm84881.ko + AUTOLOAD:=$(call AutoLoad,18,bcm84881,1) +endef + +define KernelPackage/phy-bcm84881/description + Supports the Broadcom 84881 PHY. +endef + +$(eval $(call KernelPackage,phy-bcm84881)) + + + define KernelPackage/phy-realtek SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Realtek Ethernet PHY driver diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index d261c04326..d8ea243fc7 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -479,6 +479,7 @@ CONFIG_BASE_SMALL=0 # CONFIG_BCM63XX_PHY is not set # CONFIG_BCM7038_WDT is not set # CONFIG_BCM7XXX_PHY is not set +# CONFIG_BCM84881_PHY is not set # CONFIG_BCM87XX_PHY is not set # CONFIG_BCMA is not set # CONFIG_BCMA_DRIVER_GPIO is not set diff --git a/target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch index 9a9097d91f..22e87632fd 100644 --- a/target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/hack-4.19/702-phy_add_aneg_done_function.patch @@ -1,6 +1,6 @@ --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -548,6 +548,12 @@ struct phy_driver { +@@ -555,6 +555,12 @@ struct phy_driver { /* Determines the negotiated speed and duplex */ int (*read_status)(struct phy_device *phydev); @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1512,6 +1512,9 @@ int genphy_update_link(struct phy_device +@@ -1576,6 +1576,9 @@ int genphy_update_link(struct phy_device { int status; diff --git a/target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch index f863238209..dafd84759e 100644 --- a/target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/pending-4.19/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1136,6 +1136,9 @@ void phy_detach(struct phy_device *phyde +@@ -1200,6 +1200,9 @@ void phy_detach(struct phy_device *phyde struct module *ndev_owner = dev->dev.parent->driver->owner; struct mii_bus *bus; @@ -23,7 +23,7 @@ Signed-off-by: Gabor Juhos sysfs_remove_link(&phydev->mdio.dev.kobj, "attached_dev"); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -560,6 +560,12 @@ struct phy_driver { +@@ -567,6 +567,12 @@ struct phy_driver { */ int (*did_interrupt)(struct phy_device *phydev); diff --git a/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch b/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch new file mode 100644 index 0000000000..aaeb65763b --- /dev/null +++ b/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch @@ -0,0 +1,52 @@ +From 29cd215aaf6c2050c43e4de03aee436c16f90b96 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 21 Nov 2019 17:27:14 +0000 +Subject: [PATCH 643/660] net: sfp: remove incomplete 100BASE-FX and 100BASE-LX + support + +The 100BASE-FX and 100BASE-LX support assumes a PHY is present; this +is probably an incorrect assumption. In any case, sfp_parse_support() +will fail such a module. Let's stop pretending we support these +modules. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp-bus.c | 4 +--- + drivers/net/phy/sfp.c | 13 +------------ + 2 files changed, 2 insertions(+), 15 deletions(-) + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -341,9 +341,7 @@ phy_interface_t sfp_select_interface(str + if (phylink_test(link_modes, 2500baseX_Full)) + return PHY_INTERFACE_MODE_2500BASEX; + +- if (id->base.e1000_base_t || +- id->base.e100_base_lx || +- id->base.e100_base_fx) ++ if (id->base.e1000_base_t) + return PHY_INTERFACE_MODE_SGMII; + + if (phylink_test(link_modes, 1000baseX_Full)) +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1413,18 +1413,7 @@ static void sfp_sm_fault(struct sfp *sfp + + static void sfp_sm_probe_for_phy(struct sfp *sfp) + { +- /* Setting the serdes link mode is guesswork: there's no +- * field in the EEPROM which indicates what mode should +- * be used. +- * +- * If it's a gigabit-only fiber module, it probably does +- * not have a PHY, so switch to 802.3z negotiation mode. +- * Otherwise, switch to SGMII mode (which is required to +- * support non-gigabit speeds) and probe for a PHY. +- */ +- if (sfp->id.base.e1000_base_t || +- sfp->id.base.e100_base_lx || +- sfp->id.base.e100_base_fx) ++ if (sfp->id.base.e1000_base_t) + sfp_sm_probe_phy(sfp); + } + diff --git a/target/linux/generic/pending-4.19/741-net-sfp-derive-interface-mode-from-ethtool-link-mode.patch b/target/linux/generic/pending-4.19/741-net-sfp-derive-interface-mode-from-ethtool-link-mode.patch new file mode 100644 index 0000000000..f20b66eae7 --- /dev/null +++ b/target/linux/generic/pending-4.19/741-net-sfp-derive-interface-mode-from-ethtool-link-mode.patch @@ -0,0 +1,89 @@ +From dc45d9e04572b5cd6d32f51cdf9f62b18022e6dd Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 21 Nov 2019 17:32:59 +0000 +Subject: [PATCH 644/660] net: sfp: derive interface mode from ethtool link + modes + +We don't need the EEPROM ID to derive the phy interface mode as we can +derive it merely from the ethtool link modes. Remove the EEPROM ID +argument to sfp_select_interface(). + +Signed-off-by: Russell King +--- + drivers/net/phy/marvell10g.c | 2 +- + drivers/net/phy/phylink.c | 2 +- + drivers/net/phy/sfp-bus.c | 11 ++++------- + include/linux/sfp.h | 2 -- + 4 files changed, 6 insertions(+), 11 deletions(-) + +--- a/drivers/net/phy/marvell10g.c ++++ b/drivers/net/phy/marvell10g.c +@@ -227,7 +227,7 @@ static int mv3310_sfp_insert(void *upstr + phy_interface_t iface; + + sfp_parse_support(phydev->sfp_bus, id, support); +- iface = sfp_select_interface(phydev->sfp_bus, id, support); ++ iface = sfp_select_interface(phydev->sfp_bus, support); + + if (iface != PHY_INTERFACE_MODE_10GKR) { + dev_err(&phydev->mdio.dev, "incompatible SFP module inserted\n"); +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1663,7 +1663,7 @@ static int phylink_sfp_module_insert(voi + + linkmode_copy(support1, support); + +- iface = sfp_select_interface(pl->sfp_bus, id, config.advertising); ++ iface = sfp_select_interface(pl->sfp_bus, config.advertising); + if (iface == PHY_INTERFACE_MODE_NA) { + netdev_err(pl->netdev, + "selection of interface failed, advertisement %*pb\n", +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -319,16 +319,12 @@ EXPORT_SYMBOL_GPL(sfp_parse_support); + /** + * sfp_select_interface() - Select appropriate phy_interface_t mode + * @bus: a pointer to the &struct sfp_bus structure for the sfp module +- * @id: a pointer to the module's &struct sfp_eeprom_id + * @link_modes: ethtool link modes mask + * +- * Derive the phy_interface_t mode for the information found in the +- * module's identifying EEPROM and the link modes mask. There is no +- * standard or defined way to derive this information, so we decide +- * based upon the link mode mask. ++ * Derive the phy_interface_t mode for the SFP module from the link ++ * modes mask. + */ + phy_interface_t sfp_select_interface(struct sfp_bus *bus, +- const struct sfp_eeprom_id *id, + unsigned long *link_modes) + { + if (phylink_test(link_modes, 10000baseCR_Full) || +@@ -341,7 +337,8 @@ phy_interface_t sfp_select_interface(str + if (phylink_test(link_modes, 2500baseX_Full)) + return PHY_INTERFACE_MODE_2500BASEX; + +- if (id->base.e1000_base_t) ++ if (phylink_test(link_modes, 1000baseT_Half) || ++ phylink_test(link_modes, 1000baseT_Full)) + return PHY_INTERFACE_MODE_SGMII; + + if (phylink_test(link_modes, 1000baseX_Full)) +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -504,7 +504,6 @@ int sfp_parse_port(struct sfp_bus *bus, + void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id, + unsigned long *support); + phy_interface_t sfp_select_interface(struct sfp_bus *bus, +- const struct sfp_eeprom_id *id, + unsigned long *link_modes); + + int sfp_get_module_info(struct sfp_bus *bus, struct ethtool_modinfo *modinfo); +@@ -532,7 +531,6 @@ static inline void sfp_parse_support(str + } + + static inline phy_interface_t sfp_select_interface(struct sfp_bus *bus, +- const struct sfp_eeprom_id *id, + unsigned long *link_modes) + { + return PHY_INTERFACE_MODE_NA; diff --git a/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch b/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch new file mode 100644 index 0000000000..266c7c27e3 --- /dev/null +++ b/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch @@ -0,0 +1,251 @@ +From c66a4e76c8554c84e64b9315314576ac403c6641 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 26 Sep 2019 15:14:18 +0100 +Subject: [PATCH 645/660] net: sfp: add more extended compliance codes + +SFF-8024 is used to define various constants re-used in several SFF +SFP-related specifications. Split these constants from the enum, and +rename them to indicate that they're defined by SFF-8024. + +Add and use updated SFF-8024 extended compliance code definitions for +10GBASE-T, 5GBASE-T and 2.5GBASE-T modules. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp-bus.c | 60 ++++++++++++++++------------ + drivers/net/phy/sfp.c | 4 +- + include/linux/sfp.h | 82 ++++++++++++++++++++++++++------------- + 3 files changed, 93 insertions(+), 53 deletions(-) + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -123,35 +123,35 @@ int sfp_parse_port(struct sfp_bus *bus, + + /* port is the physical connector, set this from the connector field. */ + switch (id->base.connector) { +- case SFP_CONNECTOR_SC: +- case SFP_CONNECTOR_FIBERJACK: +- case SFP_CONNECTOR_LC: +- case SFP_CONNECTOR_MT_RJ: +- case SFP_CONNECTOR_MU: +- case SFP_CONNECTOR_OPTICAL_PIGTAIL: ++ case SFF8024_CONNECTOR_SC: ++ case SFF8024_CONNECTOR_FIBERJACK: ++ case SFF8024_CONNECTOR_LC: ++ case SFF8024_CONNECTOR_MT_RJ: ++ case SFF8024_CONNECTOR_MU: ++ case SFF8024_CONNECTOR_OPTICAL_PIGTAIL: ++ case SFF8024_CONNECTOR_MPO_1X12: ++ case SFF8024_CONNECTOR_MPO_2X16: + port = PORT_FIBRE; + break; + +- case SFP_CONNECTOR_RJ45: ++ case SFF8024_CONNECTOR_RJ45: + port = PORT_TP; + break; + +- case SFP_CONNECTOR_COPPER_PIGTAIL: ++ case SFF8024_CONNECTOR_COPPER_PIGTAIL: + port = PORT_DA; + break; + +- case SFP_CONNECTOR_UNSPEC: ++ case SFF8024_CONNECTOR_UNSPEC: + if (id->base.e1000_base_t) { + port = PORT_TP; + break; + } + /* fallthrough */ +- case SFP_CONNECTOR_SG: /* guess */ +- case SFP_CONNECTOR_MPO_1X12: +- case SFP_CONNECTOR_MPO_2X16: +- case SFP_CONNECTOR_HSSDC_II: +- case SFP_CONNECTOR_NOSEPARATE: +- case SFP_CONNECTOR_MXC_2X16: ++ case SFF8024_CONNECTOR_SG: /* guess */ ++ case SFF8024_CONNECTOR_HSSDC_II: ++ case SFF8024_CONNECTOR_NOSEPARATE: ++ case SFF8024_CONNECTOR_MXC_2X16: + port = PORT_OTHER; + break; + default: +@@ -260,22 +260,33 @@ void sfp_parse_support(struct sfp_bus *b + } + + switch (id->base.extended_cc) { +- case 0x00: /* Unspecified */ ++ case SFF8024_ECC_UNSPEC: + break; +- case 0x02: /* 100Gbase-SR4 or 25Gbase-SR */ ++ case SFF8024_ECC_100GBASE_SR4_25GBASE_SR: + phylink_set(modes, 100000baseSR4_Full); + phylink_set(modes, 25000baseSR_Full); + break; +- case 0x03: /* 100Gbase-LR4 or 25Gbase-LR */ +- case 0x04: /* 100Gbase-ER4 or 25Gbase-ER */ ++ case SFF8024_ECC_100GBASE_LR4_25GBASE_LR: ++ case SFF8024_ECC_100GBASE_ER4_25GBASE_ER: + phylink_set(modes, 100000baseLR4_ER4_Full); + break; +- case 0x0b: /* 100Gbase-CR4 or 25Gbase-CR CA-L */ +- case 0x0c: /* 25Gbase-CR CA-S */ +- case 0x0d: /* 25Gbase-CR CA-N */ ++ case SFF8024_ECC_100GBASE_CR4: + phylink_set(modes, 100000baseCR4_Full); ++ /* fallthrough */ ++ case SFF8024_ECC_25GBASE_CR_S: ++ case SFF8024_ECC_25GBASE_CR_N: + phylink_set(modes, 25000baseCR_Full); + break; ++ case SFF8024_ECC_10GBASE_T_SFI: ++ case SFF8024_ECC_10GBASE_T_SR: ++ phylink_set(modes, 10000baseT_Full); ++ break; ++ case SFF8024_ECC_5GBASE_T: ++ phylink_set(modes, 5000baseT_Full); ++ break; ++ case SFF8024_ECC_2_5GBASE_T: ++ phylink_set(modes, 2500baseT_Full); ++ break; + default: + dev_warn(bus->sfp_dev, + "Unknown/unsupported extended compliance code: 0x%02x\n", +@@ -300,7 +311,7 @@ void sfp_parse_support(struct sfp_bus *b + */ + if (bitmap_empty(modes, __ETHTOOL_LINK_MODE_MASK_NBITS)) { + /* If the encoding and bit rate allows 1000baseX */ +- if (id->base.encoding == SFP_ENCODING_8B10B && br_nom && ++ if (id->base.encoding == SFF8024_ENCODING_8B10B && br_nom && + br_min <= 1300 && br_max >= 1200) + phylink_set(modes, 1000baseX_Full); + } +@@ -331,7 +342,8 @@ phy_interface_t sfp_select_interface(str + phylink_test(link_modes, 10000baseSR_Full) || + phylink_test(link_modes, 10000baseLR_Full) || + phylink_test(link_modes, 10000baseLRM_Full) || +- phylink_test(link_modes, 10000baseER_Full)) ++ phylink_test(link_modes, 10000baseER_Full) || ++ phylink_test(link_modes, 10000baseT_Full)) + return PHY_INTERFACE_MODE_10GKR; + + if (phylink_test(link_modes, 2500baseX_Full)) +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -229,7 +229,7 @@ struct sfp { + + static bool sff_module_supported(const struct sfp_eeprom_id *id) + { +- return id->base.phys_id == SFP_PHYS_ID_SFF && ++ return id->base.phys_id == SFF8024_ID_SFF_8472 && + id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP; + } + +@@ -240,7 +240,7 @@ static const struct sff_data sff_data = + + static bool sfp_module_supported(const struct sfp_eeprom_id *id) + { +- return id->base.phys_id == SFP_PHYS_ID_SFP && ++ return id->base.phys_id == SFF8024_ID_SFP && + id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP; + } + +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -275,6 +275,61 @@ struct sfp_diag { + __be16 cal_v_offset; + } __packed; + ++/* SFF8024 defined constants */ ++enum { ++ SFF8024_ID_UNK = 0x00, ++ SFF8024_ID_SFF_8472 = 0x02, ++ SFF8024_ID_SFP = 0x03, ++ SFF8024_ID_DWDM_SFP = 0x0b, ++ SFF8024_ID_QSFP_8438 = 0x0c, ++ SFF8024_ID_QSFP_8436_8636 = 0x0d, ++ SFF8024_ID_QSFP28_8636 = 0x11, ++ ++ SFF8024_ENCODING_UNSPEC = 0x00, ++ SFF8024_ENCODING_8B10B = 0x01, ++ SFF8024_ENCODING_4B5B = 0x02, ++ SFF8024_ENCODING_NRZ = 0x03, ++ SFF8024_ENCODING_8472_MANCHESTER= 0x04, ++ SFF8024_ENCODING_8472_SONET = 0x05, ++ SFF8024_ENCODING_8472_64B66B = 0x06, ++ SFF8024_ENCODING_8436_MANCHESTER= 0x06, ++ SFF8024_ENCODING_8436_SONET = 0x04, ++ SFF8024_ENCODING_8436_64B66B = 0x05, ++ SFF8024_ENCODING_256B257B = 0x07, ++ SFF8024_ENCODING_PAM4 = 0x08, ++ ++ SFF8024_CONNECTOR_UNSPEC = 0x00, ++ /* codes 01-05 not supportable on SFP, but some modules have single SC */ ++ SFF8024_CONNECTOR_SC = 0x01, ++ SFF8024_CONNECTOR_FIBERJACK = 0x06, ++ SFF8024_CONNECTOR_LC = 0x07, ++ SFF8024_CONNECTOR_MT_RJ = 0x08, ++ SFF8024_CONNECTOR_MU = 0x09, ++ SFF8024_CONNECTOR_SG = 0x0a, ++ SFF8024_CONNECTOR_OPTICAL_PIGTAIL= 0x0b, ++ SFF8024_CONNECTOR_MPO_1X12 = 0x0c, ++ SFF8024_CONNECTOR_MPO_2X16 = 0x0d, ++ SFF8024_CONNECTOR_HSSDC_II = 0x20, ++ SFF8024_CONNECTOR_COPPER_PIGTAIL= 0x21, ++ SFF8024_CONNECTOR_RJ45 = 0x22, ++ SFF8024_CONNECTOR_NOSEPARATE = 0x23, ++ SFF8024_CONNECTOR_MXC_2X16 = 0x24, ++ ++ SFF8024_ECC_UNSPEC = 0x00, ++ SFF8024_ECC_100G_25GAUI_C2M_AOC = 0x01, ++ SFF8024_ECC_100GBASE_SR4_25GBASE_SR = 0x02, ++ SFF8024_ECC_100GBASE_LR4_25GBASE_LR = 0x03, ++ SFF8024_ECC_100GBASE_ER4_25GBASE_ER = 0x04, ++ SFF8024_ECC_100GBASE_SR10 = 0x05, ++ SFF8024_ECC_100GBASE_CR4 = 0x0b, ++ SFF8024_ECC_25GBASE_CR_S = 0x0c, ++ SFF8024_ECC_25GBASE_CR_N = 0x0d, ++ SFF8024_ECC_10GBASE_T_SFI = 0x16, ++ SFF8024_ECC_10GBASE_T_SR = 0x1c, ++ SFF8024_ECC_5GBASE_T = 0x1d, ++ SFF8024_ECC_2_5GBASE_T = 0x1e, ++}; ++ + /* SFP EEPROM registers */ + enum { + SFP_PHYS_ID = 0x00, +@@ -309,34 +364,7 @@ enum { + SFP_SFF8472_COMPLIANCE = 0x5e, + SFP_CC_EXT = 0x5f, + +- SFP_PHYS_ID_SFF = 0x02, +- SFP_PHYS_ID_SFP = 0x03, + SFP_PHYS_EXT_ID_SFP = 0x04, +- SFP_CONNECTOR_UNSPEC = 0x00, +- /* codes 01-05 not supportable on SFP, but some modules have single SC */ +- SFP_CONNECTOR_SC = 0x01, +- SFP_CONNECTOR_FIBERJACK = 0x06, +- SFP_CONNECTOR_LC = 0x07, +- SFP_CONNECTOR_MT_RJ = 0x08, +- SFP_CONNECTOR_MU = 0x09, +- SFP_CONNECTOR_SG = 0x0a, +- SFP_CONNECTOR_OPTICAL_PIGTAIL = 0x0b, +- SFP_CONNECTOR_MPO_1X12 = 0x0c, +- SFP_CONNECTOR_MPO_2X16 = 0x0d, +- SFP_CONNECTOR_HSSDC_II = 0x20, +- SFP_CONNECTOR_COPPER_PIGTAIL = 0x21, +- SFP_CONNECTOR_RJ45 = 0x22, +- SFP_CONNECTOR_NOSEPARATE = 0x23, +- SFP_CONNECTOR_MXC_2X16 = 0x24, +- SFP_ENCODING_UNSPEC = 0x00, +- SFP_ENCODING_8B10B = 0x01, +- SFP_ENCODING_4B5B = 0x02, +- SFP_ENCODING_NRZ = 0x03, +- SFP_ENCODING_8472_MANCHESTER = 0x04, +- SFP_ENCODING_8472_SONET = 0x05, +- SFP_ENCODING_8472_64B66B = 0x06, +- SFP_ENCODING_256B257B = 0x07, +- SFP_ENCODING_PAM4 = 0x08, + SFP_OPTIONS_HIGH_POWER_LEVEL = BIT(13), + SFP_OPTIONS_PAGING_A2 = BIT(12), + SFP_OPTIONS_RETIMER = BIT(11), diff --git a/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch b/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch new file mode 100644 index 0000000000..e0eea5e605 --- /dev/null +++ b/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch @@ -0,0 +1,131 @@ +From f9a5a54b59cb904b37bf7409a43635ab195d0214 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 19 Nov 2019 10:13:25 +0000 +Subject: [PATCH 646/660] net: sfp: add module start/stop upstream + notifications + +When dealing with some copper modules, we can't positively know the +module capabilities are until we have probed the PHY. Without the full +capabilities, we may end up failing a module that we could otherwise +drive with a restricted set of capabilities. + +An example of this would be a module with a NBASE-T PHY plugged into +a host that supports phy interface modes 2500BASE-X and SGMII. The +PHY supports 10GBASE-R, 5000BASE-X, 2500BASE-X, SGMII interface modes, +which means a subset of the capabilities are compatible with the host. + +However, reading the module EEPROM leads us to believe that the module +only supports ethtool link mode 10GBASE-T, which is incompatible with +the host - and thus results in the module being rejected. + +This patch adds an extra notification which are triggered after the +SFP module's PHY probe, and a corresponding notification just before +the PHY is removed. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp-bus.c | 21 +++++++++++++++++++++ + drivers/net/phy/sfp.c | 8 ++++++++ + drivers/net/phy/sfp.h | 2 ++ + include/linux/sfp.h | 4 ++++ + 4 files changed, 35 insertions(+) + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -711,6 +711,27 @@ void sfp_module_remove(struct sfp_bus *b + } + EXPORT_SYMBOL_GPL(sfp_module_remove); + ++int sfp_module_start(struct sfp_bus *bus) ++{ ++ const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus); ++ int ret = 0; ++ ++ if (ops && ops->module_start) ++ ret = ops->module_start(bus->upstream); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(sfp_module_start); ++ ++void sfp_module_stop(struct sfp_bus *bus) ++{ ++ const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus); ++ ++ if (ops && ops->module_stop) ++ ops->module_stop(bus->upstream); ++} ++EXPORT_SYMBOL_GPL(sfp_module_stop); ++ + static void sfp_socket_clear(struct sfp_bus *bus) + { + bus->sfp_dev = NULL; +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -57,6 +57,7 @@ enum { + SFP_DEV_UP, + + SFP_S_DOWN = 0, ++ SFP_S_FAIL, + SFP_S_WAIT, + SFP_S_INIT, + SFP_S_INIT_TX_FAULT, +@@ -120,6 +121,7 @@ static const char *event_to_str(unsigned + + static const char * const sm_state_strings[] = { + [SFP_S_DOWN] = "down", ++ [SFP_S_FAIL] = "fail", + [SFP_S_WAIT] = "wait", + [SFP_S_INIT] = "init", + [SFP_S_INIT_TX_FAULT] = "init_tx_fault", +@@ -1749,6 +1751,8 @@ static void sfp_sm_main(struct sfp *sfp, + if (sfp->sm_state == SFP_S_LINK_UP && + sfp->sm_dev_state == SFP_DEV_UP) + sfp_sm_link_down(sfp); ++ if (sfp->sm_state > SFP_S_INIT) ++ sfp_module_stop(sfp->sfp_bus); + if (sfp->mod_phy) + sfp_sm_phy_detach(sfp); + sfp_module_tx_disable(sfp); +@@ -1815,6 +1819,10 @@ static void sfp_sm_main(struct sfp *sfp, + * clear. Probe for the PHY and check the LOS state. + */ + sfp_sm_probe_for_phy(sfp); ++ if (sfp_module_start(sfp->sfp_bus)) { ++ sfp_sm_next(sfp, SFP_S_FAIL, 0); ++ break; ++ } + sfp_sm_link_check_los(sfp); + + /* Reset the fault retry count */ +--- a/drivers/net/phy/sfp.h ++++ b/drivers/net/phy/sfp.h +@@ -22,6 +22,8 @@ void sfp_link_up(struct sfp_bus *bus); + void sfp_link_down(struct sfp_bus *bus); + int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id); + void sfp_module_remove(struct sfp_bus *bus); ++int sfp_module_start(struct sfp_bus *bus); ++void sfp_module_stop(struct sfp_bus *bus); + int sfp_link_configure(struct sfp_bus *bus, const struct sfp_eeprom_id *id); + struct sfp_bus *sfp_register_socket(struct device *dev, struct sfp *sfp, + const struct sfp_socket_ops *ops); +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -507,6 +507,8 @@ struct sfp_bus; + * @module_insert: called after a module has been detected to determine + * whether the module is supported for the upstream device. + * @module_remove: called after the module has been removed. ++ * @module_start: called after the PHY probe step ++ * @module_stop: called before the PHY is removed + * @link_down: called when the link is non-operational for whatever + * reason. + * @link_up: called when the link is operational. +@@ -520,6 +522,8 @@ struct sfp_upstream_ops { + void (*detach)(void *priv, struct sfp_bus *bus); + int (*module_insert)(void *priv, const struct sfp_eeprom_id *id); + void (*module_remove)(void *priv); ++ int (*module_start)(void *priv); ++ void (*module_stop)(void *priv); + void (*link_down)(void *priv); + void (*link_up)(void *priv); + int (*connect_phy)(void *priv, struct phy_device *); diff --git a/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch b/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch new file mode 100644 index 0000000000..b3c47a054f --- /dev/null +++ b/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch @@ -0,0 +1,72 @@ +From e2dc261b872a92a055eb2e86ac136baf9b20f2f2 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 21 Nov 2019 17:21:33 +0000 +Subject: [PATCH 647/660] net: sfp: move phy_start()/phy_stop() to phylink + +Move phy_start() and phy_stop() into the module_start and module_stop +notifications in phylink, rather than having them in the SFP code. +This gives phylink responsibility for controlling the PHY, rather +than having SFP start and stop the PHY state machine. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 22 ++++++++++++++++++++++ + drivers/net/phy/sfp.c | 2 -- + 2 files changed, 22 insertions(+), 2 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1717,6 +1717,26 @@ static int phylink_sfp_module_insert(voi + return ret; + } + ++static int phylink_sfp_module_start(void *upstream) ++{ ++ struct phylink *pl = upstream; ++ ++ /* If this SFP module has a PHY, start the PHY now. */ ++ if (pl->phydev) ++ phy_start(pl->phydev); ++ ++ return 0; ++} ++ ++static void phylink_sfp_module_stop(void *upstream) ++{ ++ struct phylink *pl = upstream; ++ ++ /* If this SFP module has a PHY, stop it. */ ++ if (pl->phydev) ++ phy_stop(pl->phydev); ++} ++ + static void phylink_sfp_link_down(void *upstream) + { + struct phylink *pl = upstream; +@@ -1752,6 +1772,8 @@ static const struct sfp_upstream_ops sfp + .attach = phylink_sfp_attach, + .detach = phylink_sfp_detach, + .module_insert = phylink_sfp_module_insert, ++ .module_start = phylink_sfp_module_start, ++ .module_stop = phylink_sfp_module_stop, + .link_up = phylink_sfp_link_up, + .link_down = phylink_sfp_link_down, + .connect_phy = phylink_sfp_connect_phy, +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1320,7 +1320,6 @@ static void sfp_sm_mod_next(struct sfp * + + static void sfp_sm_phy_detach(struct sfp *sfp) + { +- phy_stop(sfp->mod_phy); + sfp_remove_phy(sfp->sfp_bus); + phy_device_remove(sfp->mod_phy); + phy_device_free(sfp->mod_phy); +@@ -1351,7 +1350,6 @@ static void sfp_sm_probe_phy(struct sfp + } + + sfp->mod_phy = phy; +- phy_start(phy); + } + + static void sfp_sm_link_up(struct sfp *sfp) diff --git a/target/linux/generic/pending-4.19/745-net-mdio-i2c-add-support-for-Clause-45-accesses.patch b/target/linux/generic/pending-4.19/745-net-mdio-i2c-add-support-for-Clause-45-accesses.patch new file mode 100644 index 0000000000..9a4bb5bb78 --- /dev/null +++ b/target/linux/generic/pending-4.19/745-net-mdio-i2c-add-support-for-Clause-45-accesses.patch @@ -0,0 +1,74 @@ +From c9de73988a35c6c85810a992954ac568cca503e5 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Wed, 2 Oct 2019 10:31:10 +0100 +Subject: [PATCH 648/660] net: mdio-i2c: add support for Clause 45 accesses + +Some SFP+ modules have PHYs on them just like SFP modules do, except +they are Clause 45 PHYs. The I2C protocol used to access them is +modified slightly in order to send the device address and 16-bit +register index. + +Signed-off-by: Russell King +--- + drivers/net/phy/mdio-i2c.c | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +--- a/drivers/net/phy/mdio-i2c.c ++++ b/drivers/net/phy/mdio-i2c.c +@@ -36,17 +36,24 @@ static int i2c_mii_read(struct mii_bus * + { + struct i2c_adapter *i2c = bus->priv; + struct i2c_msg msgs[2]; +- u8 data[2], dev_addr = reg; ++ u8 addr[3], data[2], *p; + int bus_addr, ret; + + if (!i2c_mii_valid_phy_id(phy_id)) + return 0xffff; + ++ p = addr; ++ if (reg & MII_ADDR_C45) { ++ *p++ = 0x20 | ((reg >> 16) & 31); ++ *p++ = reg >> 8; ++ } ++ *p++ = reg; ++ + bus_addr = i2c_mii_phy_addr(phy_id); + msgs[0].addr = bus_addr; + msgs[0].flags = 0; +- msgs[0].len = 1; +- msgs[0].buf = &dev_addr; ++ msgs[0].len = p - addr; ++ msgs[0].buf = addr; + msgs[1].addr = bus_addr; + msgs[1].flags = I2C_M_RD; + msgs[1].len = sizeof(data); +@@ -64,18 +71,23 @@ static int i2c_mii_write(struct mii_bus + struct i2c_adapter *i2c = bus->priv; + struct i2c_msg msg; + int ret; +- u8 data[3]; ++ u8 data[5], *p; + + if (!i2c_mii_valid_phy_id(phy_id)) + return 0; + +- data[0] = reg; +- data[1] = val >> 8; +- data[2] = val; ++ p = data; ++ if (reg & MII_ADDR_C45) { ++ *p++ = (reg >> 16) & 31; ++ *p++ = reg >> 8; ++ } ++ *p++ = reg; ++ *p++ = val >> 8; ++ *p++ = val; + + msg.addr = i2c_mii_phy_addr(phy_id); + msg.flags = 0; +- msg.len = 3; ++ msg.len = p - data; + msg.buf = data; + + ret = i2c_transfer(i2c, &msg, 1); diff --git a/target/linux/generic/pending-4.19/746-net-phylink-re-split-__phylink_connect_phy.patch b/target/linux/generic/pending-4.19/746-net-phylink-re-split-__phylink_connect_phy.patch new file mode 100644 index 0000000000..c74a56c575 --- /dev/null +++ b/target/linux/generic/pending-4.19/746-net-phylink-re-split-__phylink_connect_phy.patch @@ -0,0 +1,93 @@ +From 0db7fba746b5608c30d4e2ba1c99a2a309e2d288 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 8 Nov 2019 15:22:48 +0000 +Subject: [PATCH 649/660] net: phylink: re-split __phylink_connect_phy() + +In order to support Clause 45 PHYs on SFP+ modules, which have an +indeterminant phy interface mode, we need to be able to call +phylink_bringup_phy() with a different interface mode to that used when +binding the PHY. Reduce __phylink_connect_phy() to an attach operation, +and move the call to phylink_bringup_phy() to its call sites. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 39 ++++++++++++++++++++++++--------------- + 1 file changed, 24 insertions(+), 15 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -728,11 +728,9 @@ static int phylink_bringup_phy(struct ph + return 0; + } + +-static int __phylink_connect_phy(struct phylink *pl, struct phy_device *phy, +- phy_interface_t interface) ++static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy, ++ phy_interface_t interface) + { +- int ret; +- + if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED || + (pl->link_an_mode == MLO_AN_INBAND && + phy_interface_mode_is_8023z(interface)))) +@@ -741,15 +739,7 @@ static int __phylink_connect_phy(struct + if (pl->phydev) + return -EBUSY; + +- ret = phy_attach_direct(pl->netdev, phy, 0, interface); +- if (ret) +- return ret; +- +- ret = phylink_bringup_phy(pl, phy); +- if (ret) +- phy_detach(phy); +- +- return ret; ++ return phy_attach_direct(pl->netdev, phy, 0, interface); + } + + /** +@@ -769,13 +759,23 @@ static int __phylink_connect_phy(struct + */ + int phylink_connect_phy(struct phylink *pl, struct phy_device *phy) + { ++ int ret; ++ + /* Use PHY device/driver interface */ + if (pl->link_interface == PHY_INTERFACE_MODE_NA) { + pl->link_interface = phy->interface; + pl->link_config.interface = pl->link_interface; + } + +- return __phylink_connect_phy(pl, phy, pl->link_interface); ++ ret = phylink_attach_phy(pl, phy, pl->link_interface); ++ if (ret < 0) ++ return ret; ++ ++ ret = phylink_bringup_phy(pl, phy); ++ if (ret) ++ phy_detach(phy); ++ ++ return ret; + } + EXPORT_SYMBOL_GPL(phylink_connect_phy); + +@@ -1759,8 +1759,17 @@ static void phylink_sfp_link_up(void *up + static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) + { + struct phylink *pl = upstream; ++ int ret; + +- return __phylink_connect_phy(upstream, phy, pl->link_config.interface); ++ ret = phylink_attach_phy(pl, phy, pl->link_config.interface); ++ if (ret < 0) ++ return ret; ++ ++ ret = phylink_bringup_phy(pl, phy); ++ if (ret) ++ phy_detach(phy); ++ ++ return ret; + } + + static void phylink_sfp_disconnect_phy(void *upstream) diff --git a/target/linux/generic/pending-4.19/747-net-phylink-support-Clause-45-PHYs-on-SFP-modules.patch b/target/linux/generic/pending-4.19/747-net-phylink-support-Clause-45-PHYs-on-SFP-modules.patch new file mode 100644 index 0000000000..2cea118c82 --- /dev/null +++ b/target/linux/generic/pending-4.19/747-net-phylink-support-Clause-45-PHYs-on-SFP-modules.patch @@ -0,0 +1,89 @@ +From caf32f96f13df7d3ae6cb8bf8001c88ae22025ca Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 8 Nov 2019 15:28:22 +0000 +Subject: [PATCH 650/660] net: phylink: support Clause 45 PHYs on SFP+ modules + +Some SFP+ modules have Clause 45 PHYs embedded on them, which need a +little more handling in order to ensure that they are correctly setup, +as they switch the PHY link mode according to the negotiated speed. + +With Clause 22 PHYs, we assumed that they would operate in SGMII mode, +but this assumption is now false. Adapt phylink to support Clause 45 +PHYs on SFP+ modules. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -671,7 +671,8 @@ static void phylink_phy_change(struct ph + phy_duplex_to_str(phydev->duplex)); + } + +-static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy) ++static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy, ++ phy_interface_t interface) + { + struct phylink_link_state config; + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); +@@ -691,7 +692,7 @@ static int phylink_bringup_phy(struct ph + ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported); + ethtool_convert_legacy_u32_to_link_mode(config.advertising, + phy->advertising); +- config.interface = pl->link_config.interface; ++ config.interface = interface; + + ret = phylink_validate(pl, supported, &config); + if (ret) +@@ -707,6 +708,7 @@ static int phylink_bringup_phy(struct ph + mutex_lock(&phy->lock); + mutex_lock(&pl->state_mutex); + pl->phydev = phy; ++ pl->phy_state.interface = interface; + linkmode_copy(pl->supported, supported); + linkmode_copy(pl->link_config.advertising, config.advertising); + +@@ -771,7 +773,7 @@ int phylink_connect_phy(struct phylink * + if (ret < 0) + return ret; + +- ret = phylink_bringup_phy(pl, phy); ++ ret = phylink_bringup_phy(pl, phy, pl->link_config.interface); + if (ret) + phy_detach(phy); + +@@ -824,7 +826,7 @@ int phylink_of_phy_connect(struct phylin + if (!phy_dev) + return -ENODEV; + +- ret = phylink_bringup_phy(pl, phy_dev); ++ ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface); + if (ret) + phy_detach(phy_dev); + +@@ -1759,13 +1761,22 @@ static void phylink_sfp_link_up(void *up + static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) + { + struct phylink *pl = upstream; ++ phy_interface_t interface = pl->link_config.interface; + int ret; + + ret = phylink_attach_phy(pl, phy, pl->link_config.interface); + if (ret < 0) + return ret; + +- ret = phylink_bringup_phy(pl, phy); ++ /* Clause 45 PHYs switch their Serdes lane between several different ++ * modes, normally 10GBASE-R, SGMII. Some use 2500BASE-X for 2.5G ++ * speeds. We really need to know which interface modes the PHY and ++ * MAC supports to properly work out which linkmodes can be supported. ++ */ ++ if (phy->is_c45) ++ interface = PHY_INTERFACE_MODE_NA; ++ ++ ret = phylink_bringup_phy(pl, phy, interface); + if (ret) + phy_detach(phy); + diff --git a/target/linux/generic/pending-4.19/748-net-phylink-split-link_an_mode-configured-and-curren.patch b/target/linux/generic/pending-4.19/748-net-phylink-split-link_an_mode-configured-and-curren.patch new file mode 100644 index 0000000000..f30d37f0c6 --- /dev/null +++ b/target/linux/generic/pending-4.19/748-net-phylink-split-link_an_mode-configured-and-curren.patch @@ -0,0 +1,254 @@ +From d1339d6956f0255b6ce2412328a98945be8cc3ca Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Sat, 16 Nov 2019 11:30:18 +0000 +Subject: [PATCH 651/660] net: phylink: split link_an_mode configured and + current settings + +Split link_an_mode between the configured setting and the current +operating setting. This is an important distinction to make when we +need to configure PHY mode for a plugged SFP+ module that does not +use in-band signalling. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 59 ++++++++++++++++++++------------------- + 1 file changed, 31 insertions(+), 28 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -48,7 +48,8 @@ struct phylink { + unsigned long phylink_disable_state; /* bitmask of disables */ + struct phy_device *phydev; + phy_interface_t link_interface; /* PHY_INTERFACE_xxx */ +- u8 link_an_mode; /* MLO_AN_xxx */ ++ u8 cfg_link_an_mode; /* MLO_AN_xxx */ ++ u8 cur_link_an_mode; + u8 link_port; /* The current non-phy ethtool port */ + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); + +@@ -253,12 +254,12 @@ static int phylink_parse_mode(struct phy + + dn = fwnode_get_named_child_node(fwnode, "fixed-link"); + if (dn || fwnode_property_present(fwnode, "fixed-link")) +- pl->link_an_mode = MLO_AN_FIXED; ++ pl->cfg_link_an_mode = MLO_AN_FIXED; + fwnode_handle_put(dn); + + if (fwnode_property_read_string(fwnode, "managed", &managed) == 0 && + strcmp(managed, "in-band-status") == 0) { +- if (pl->link_an_mode == MLO_AN_FIXED) { ++ if (pl->cfg_link_an_mode == MLO_AN_FIXED) { + netdev_err(pl->netdev, + "can't use both fixed-link and in-band-status\n"); + return -EINVAL; +@@ -270,7 +271,7 @@ static int phylink_parse_mode(struct phy + phylink_set(pl->supported, Asym_Pause); + phylink_set(pl->supported, Pause); + pl->link_config.an_enabled = true; +- pl->link_an_mode = MLO_AN_INBAND; ++ pl->cfg_link_an_mode = MLO_AN_INBAND; + + switch (pl->link_config.interface) { + case PHY_INTERFACE_MODE_SGMII: +@@ -330,14 +331,14 @@ static void phylink_mac_config(struct ph + { + netdev_dbg(pl->netdev, + "%s: mode=%s/%s/%s/%s adv=%*pb pause=%02x link=%u an=%u\n", +- __func__, phylink_an_mode_str(pl->link_an_mode), ++ __func__, phylink_an_mode_str(pl->cur_link_an_mode), + phy_modes(state->interface), + phy_speed_to_str(state->speed), + phy_duplex_to_str(state->duplex), + __ETHTOOL_LINK_MODE_MASK_NBITS, state->advertising, + state->pause, state->link, state->an_enabled); + +- pl->ops->mac_config(pl->netdev, pl->link_an_mode, state); ++ pl->ops->mac_config(pl->netdev, pl->cur_link_an_mode, state); + } + + static void phylink_mac_config_up(struct phylink *pl, +@@ -446,7 +447,7 @@ static void phylink_resolve(struct work_ + } else if (pl->mac_link_dropped) { + link_state.link = false; + } else { +- switch (pl->link_an_mode) { ++ switch (pl->cur_link_an_mode) { + case MLO_AN_PHY: + link_state = pl->phy_state; + phylink_resolve_flow(pl, &link_state); +@@ -483,12 +484,12 @@ static void phylink_resolve(struct work_ + if (link_state.link != netif_carrier_ok(ndev)) { + if (!link_state.link) { + netif_carrier_off(ndev); +- pl->ops->mac_link_down(ndev, pl->link_an_mode, ++ pl->ops->mac_link_down(ndev, pl->cur_link_an_mode, + pl->cur_interface); + netdev_info(ndev, "Link is Down\n"); + } else { + pl->cur_interface = link_state.interface; +- pl->ops->mac_link_up(ndev, pl->link_an_mode, ++ pl->ops->mac_link_up(ndev, pl->cur_link_an_mode, + pl->cur_interface, pl->phydev); + + netif_carrier_on(ndev); +@@ -610,7 +611,7 @@ struct phylink *phylink_create(struct ne + return ERR_PTR(ret); + } + +- if (pl->link_an_mode == MLO_AN_FIXED) { ++ if (pl->cfg_link_an_mode == MLO_AN_FIXED) { + ret = phylink_parse_fixedlink(pl, fwnode); + if (ret < 0) { + kfree(pl); +@@ -618,6 +619,8 @@ struct phylink *phylink_create(struct ne + } + } + ++ pl->cur_link_an_mode = pl->cfg_link_an_mode; ++ + ret = phylink_register_sfp(pl, fwnode); + if (ret < 0) { + kfree(pl); +@@ -733,8 +736,8 @@ static int phylink_bringup_phy(struct ph + static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy, + phy_interface_t interface) + { +- if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED || +- (pl->link_an_mode == MLO_AN_INBAND && ++ if (WARN_ON(pl->cfg_link_an_mode == MLO_AN_FIXED || ++ (pl->cfg_link_an_mode == MLO_AN_INBAND && + phy_interface_mode_is_8023z(interface)))) + return -EINVAL; + +@@ -801,8 +804,8 @@ int phylink_of_phy_connect(struct phylin + int ret; + + /* Fixed links and 802.3z are handled without needing a PHY */ +- if (pl->link_an_mode == MLO_AN_FIXED || +- (pl->link_an_mode == MLO_AN_INBAND && ++ if (pl->cfg_link_an_mode == MLO_AN_FIXED || ++ (pl->cfg_link_an_mode == MLO_AN_INBAND && + phy_interface_mode_is_8023z(pl->link_interface))) + return 0; + +@@ -813,7 +816,7 @@ int phylink_of_phy_connect(struct phylin + phy_node = of_parse_phandle(dn, "phy-device", 0); + + if (!phy_node) { +- if (pl->link_an_mode == MLO_AN_PHY) ++ if (pl->cfg_link_an_mode == MLO_AN_PHY) + return -ENODEV; + return 0; + } +@@ -876,7 +879,7 @@ int phylink_fixed_state_cb(struct phylin + /* It does not make sense to let the link be overriden unless we use + * MLO_AN_FIXED + */ +- if (pl->link_an_mode != MLO_AN_FIXED) ++ if (pl->cfg_link_an_mode != MLO_AN_FIXED) + return -EINVAL; + + mutex_lock(&pl->state_mutex); +@@ -926,7 +929,7 @@ void phylink_start(struct phylink *pl) + ASSERT_RTNL(); + + netdev_info(pl->netdev, "configuring for %s/%s link mode\n", +- phylink_an_mode_str(pl->link_an_mode), ++ phylink_an_mode_str(pl->cur_link_an_mode), + phy_modes(pl->link_config.interface)); + + /* Always set the carrier off */ +@@ -948,7 +951,7 @@ void phylink_start(struct phylink *pl) + clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); + phylink_run_resolve(pl); + +- if (pl->link_an_mode == MLO_AN_FIXED && pl->link_gpio) { ++ if (pl->cfg_link_an_mode == MLO_AN_FIXED && pl->link_gpio) { + int irq = gpiod_to_irq(pl->link_gpio); + + if (irq > 0) { +@@ -963,7 +966,7 @@ void phylink_start(struct phylink *pl) + if (irq <= 0) + mod_timer(&pl->link_poll, jiffies + HZ); + } +- if (pl->link_an_mode == MLO_AN_FIXED && pl->get_fixed_state) ++ if (pl->cfg_link_an_mode == MLO_AN_FIXED && pl->get_fixed_state) + mod_timer(&pl->link_poll, jiffies + HZ); + if (pl->phydev) + phy_start(pl->phydev); +@@ -1090,7 +1093,7 @@ int phylink_ethtool_ksettings_get(struct + + linkmode_copy(kset->link_modes.supported, pl->supported); + +- switch (pl->link_an_mode) { ++ switch (pl->cur_link_an_mode) { + case MLO_AN_FIXED: + /* We are using fixed settings. Report these as the + * current link settings - and note that these also +@@ -1163,7 +1166,7 @@ int phylink_ethtool_ksettings_set(struct + /* If we have a fixed link (as specified by firmware), refuse + * to change link parameters. + */ +- if (pl->link_an_mode == MLO_AN_FIXED && ++ if (pl->cur_link_an_mode == MLO_AN_FIXED && + (s->speed != pl->link_config.speed || + s->duplex != pl->link_config.duplex)) + return -EINVAL; +@@ -1175,7 +1178,7 @@ int phylink_ethtool_ksettings_set(struct + __clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising); + } else { + /* If we have a fixed link, refuse to enable autonegotiation */ +- if (pl->link_an_mode == MLO_AN_FIXED) ++ if (pl->cur_link_an_mode == MLO_AN_FIXED) + return -EINVAL; + + config.speed = SPEED_UNKNOWN; +@@ -1217,7 +1220,7 @@ int phylink_ethtool_ksettings_set(struct + * configuration. For a fixed link, this isn't able to change any + * parameters, which just leaves inband mode. + */ +- if (pl->link_an_mode == MLO_AN_INBAND && ++ if (pl->cur_link_an_mode == MLO_AN_INBAND && + !test_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state)) { + phylink_mac_config(pl, &pl->link_config); + phylink_mac_an_restart(pl); +@@ -1307,7 +1310,7 @@ int phylink_ethtool_set_pauseparam(struc + pause->tx_pause); + } else if (!test_bit(PHYLINK_DISABLE_STOPPED, + &pl->phylink_disable_state)) { +- switch (pl->link_an_mode) { ++ switch (pl->cur_link_an_mode) { + case MLO_AN_FIXED: + /* Should we allow fixed links to change against the config? */ + phylink_resolve_flow(pl, config); +@@ -1496,7 +1499,7 @@ static int phylink_mii_read(struct phyli + struct phylink_link_state state; + int val = 0xffff; + +- switch (pl->link_an_mode) { ++ switch (pl->cur_link_an_mode) { + case MLO_AN_FIXED: + if (phy_id == 0) { + phylink_get_fixed_state(pl, &state); +@@ -1524,7 +1527,7 @@ static int phylink_mii_read(struct phyli + static int phylink_mii_write(struct phylink *pl, unsigned int phy_id, + unsigned int reg, unsigned int val) + { +- switch (pl->link_an_mode) { ++ switch (pl->cur_link_an_mode) { + case MLO_AN_FIXED: + break; + +@@ -1698,10 +1701,10 @@ static int phylink_sfp_module_insert(voi + linkmode_copy(pl->link_config.advertising, config.advertising); + } + +- if (pl->link_an_mode != MLO_AN_INBAND || ++ if (pl->cur_link_an_mode != MLO_AN_INBAND || + pl->link_config.interface != config.interface) { + pl->link_config.interface = config.interface; +- pl->link_an_mode = MLO_AN_INBAND; ++ pl->cur_link_an_mode = MLO_AN_INBAND; + + changed = true; + diff --git a/target/linux/generic/pending-4.19/749-net-phylink-split-phylink_sfp_module_insert.patch b/target/linux/generic/pending-4.19/749-net-phylink-split-phylink_sfp_module_insert.patch new file mode 100644 index 0000000000..87d70d1434 --- /dev/null +++ b/target/linux/generic/pending-4.19/749-net-phylink-split-phylink_sfp_module_insert.patch @@ -0,0 +1,120 @@ +From 36569971241ae6b81376da4937d2c8760122d10b Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 21 Nov 2019 17:58:58 +0000 +Subject: [PATCH 652/660] net: phylink: split phylink_sfp_module_insert() + +Split out the configuration step from phylink_sfp_module_insert() so +we can re-use this later. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 47 +++++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 19 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1633,25 +1633,21 @@ static void phylink_sfp_detach(void *ups + pl->netdev->sfp_bus = NULL; + } + +-static int phylink_sfp_module_insert(void *upstream, +- const struct sfp_eeprom_id *id) ++static int phylink_sfp_config(struct phylink *pl, u8 mode, u8 port, ++ const unsigned long *supported, ++ const unsigned long *advertising) + { +- struct phylink *pl = upstream; +- __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; + __ETHTOOL_DECLARE_LINK_MODE_MASK(support1); ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(support); + struct phylink_link_state config; + phy_interface_t iface; +- int ret = 0; + bool changed; +- u8 port; ++ int ret; + +- ASSERT_RTNL(); +- +- sfp_parse_support(pl->sfp_bus, id, support); +- port = sfp_parse_port(pl->sfp_bus, id, support); ++ linkmode_copy(support, supported); + + memset(&config, 0, sizeof(config)); +- linkmode_copy(config.advertising, support); ++ linkmode_copy(config.advertising, advertising); + config.interface = PHY_INTERFACE_MODE_NA; + config.speed = SPEED_UNKNOWN; + config.duplex = DUPLEX_UNKNOWN; +@@ -1666,8 +1662,6 @@ static int phylink_sfp_module_insert(voi + return ret; + } + +- linkmode_copy(support1, support); +- + iface = sfp_select_interface(pl->sfp_bus, config.advertising); + if (iface == PHY_INTERFACE_MODE_NA) { + netdev_err(pl->netdev, +@@ -1677,18 +1671,18 @@ static int phylink_sfp_module_insert(voi + } + + config.interface = iface; ++ linkmode_copy(support1, support); + ret = phylink_validate(pl, support1, &config); + if (ret) { + netdev_err(pl->netdev, "validation of %s/%s with support %*pb failed: %d\n", +- phylink_an_mode_str(MLO_AN_INBAND), ++ phylink_an_mode_str(mode), + phy_modes(config.interface), + __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret); + return ret; + } + + netdev_dbg(pl->netdev, "requesting link mode %s/%s with support %*pb\n", +- phylink_an_mode_str(MLO_AN_INBAND), +- phy_modes(config.interface), ++ phylink_an_mode_str(mode), phy_modes(config.interface), + __ETHTOOL_LINK_MODE_MASK_NBITS, support); + + if (phy_interface_mode_is_8023z(iface) && pl->phydev) +@@ -1701,15 +1695,15 @@ static int phylink_sfp_module_insert(voi + linkmode_copy(pl->link_config.advertising, config.advertising); + } + +- if (pl->cur_link_an_mode != MLO_AN_INBAND || ++ if (pl->cur_link_an_mode != mode || + pl->link_config.interface != config.interface) { + pl->link_config.interface = config.interface; +- pl->cur_link_an_mode = MLO_AN_INBAND; ++ pl->cur_link_an_mode = mode; + + changed = true; + + netdev_info(pl->netdev, "switched to %s/%s link mode\n", +- phylink_an_mode_str(MLO_AN_INBAND), ++ phylink_an_mode_str(mode), + phy_modes(config.interface)); + } + +@@ -1722,6 +1716,21 @@ static int phylink_sfp_module_insert(voi + return ret; + } + ++static int phylink_sfp_module_insert(void *upstream, ++ const struct sfp_eeprom_id *id) ++{ ++ struct phylink *pl = upstream; ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; ++ u8 port; ++ ++ ASSERT_RTNL(); ++ ++ sfp_parse_support(pl->sfp_bus, id, support); ++ port = sfp_parse_port(pl->sfp_bus, id, support); ++ ++ return phylink_sfp_config(pl, MLO_AN_INBAND, port, support, support); ++} ++ + static int phylink_sfp_module_start(void *upstream) + { + struct phylink *pl = upstream; diff --git a/target/linux/generic/pending-4.19/750-net-phylink-delay-MAC-configuration-for-copper-SFP-m.patch b/target/linux/generic/pending-4.19/750-net-phylink-delay-MAC-configuration-for-copper-SFP-m.patch new file mode 100644 index 0000000000..358b9a1082 --- /dev/null +++ b/target/linux/generic/pending-4.19/750-net-phylink-delay-MAC-configuration-for-copper-SFP-m.patch @@ -0,0 +1,204 @@ +From eb514428f75bc67d12ff019c44a8f8ca9f33c54c Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 21 Nov 2019 17:42:49 +0000 +Subject: [PATCH 653/660] net: phylink: delay MAC configuration for copper SFP + modules + +Knowing whether we need to delay the MAC configuration because a module +may have a PHY is useful to phylink to allow NBASE-T modules to work on +systems supporting no more than 2.5G speeds. + +This commit allows us to delay such configuration until after the PHY +has been probed by recording the parsed capabilities, and if the module +may have a PHY, doing no more until the module_start() notification is +called. At that point, we either have a PHY, or we don't. + +We move the PHY-based setup a little later, and use the PHYs support +capabilities rather than the EEPROM parsed capabilities to determine +whether we can support the PHY. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 59 +++++++++++++++++++++++++++++++-------- + drivers/net/phy/sfp-bus.c | 28 +++++++++++++++++++ + include/linux/sfp.h | 7 +++++ + 3 files changed, 83 insertions(+), 11 deletions(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -72,6 +72,9 @@ struct phylink { + bool mac_link_dropped; + + struct sfp_bus *sfp_bus; ++ bool sfp_may_have_phy; ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support); ++ u8 sfp_port; + }; + + static inline void linkmode_zero(unsigned long *dst) +@@ -1633,7 +1636,7 @@ static void phylink_sfp_detach(void *ups + pl->netdev->sfp_bus = NULL; + } + +-static int phylink_sfp_config(struct phylink *pl, u8 mode, u8 port, ++static int phylink_sfp_config(struct phylink *pl, u8 mode, + const unsigned long *supported, + const unsigned long *advertising) + { +@@ -1707,7 +1710,7 @@ static int phylink_sfp_config(struct phy + phy_modes(config.interface)); + } + +- pl->link_port = port; ++ pl->link_port = pl->sfp_port; + + if (changed && !test_bit(PHYLINK_DISABLE_STOPPED, + &pl->phylink_disable_state)) +@@ -1720,15 +1723,20 @@ static int phylink_sfp_module_insert(voi + const struct sfp_eeprom_id *id) + { + struct phylink *pl = upstream; +- __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; +- u8 port; ++ unsigned long *support = pl->sfp_support; + + ASSERT_RTNL(); + ++ linkmode_zero(support); + sfp_parse_support(pl->sfp_bus, id, support); +- port = sfp_parse_port(pl->sfp_bus, id, support); ++ pl->sfp_port = sfp_parse_port(pl->sfp_bus, id, support); + +- return phylink_sfp_config(pl, MLO_AN_INBAND, port, support, support); ++ /* If this module may have a PHY connecting later, defer until later */ ++ pl->sfp_may_have_phy = sfp_may_have_phy(pl->sfp_bus, id); ++ if (pl->sfp_may_have_phy) ++ return 0; ++ ++ return phylink_sfp_config(pl, MLO_AN_INBAND, support, support); + } + + static int phylink_sfp_module_start(void *upstream) +@@ -1736,10 +1744,19 @@ static int phylink_sfp_module_start(void + struct phylink *pl = upstream; + + /* If this SFP module has a PHY, start the PHY now. */ +- if (pl->phydev) ++ if (pl->phydev) { + phy_start(pl->phydev); +- +- return 0; ++ return 0; ++ } ++ ++ /* If the module may have a PHY but we didn't detect one we ++ * need to configure the MAC here. ++ */ ++ if (!pl->sfp_may_have_phy) ++ return 0; ++ ++ return phylink_sfp_config(pl, MLO_AN_INBAND, ++ pl->sfp_support, pl->sfp_support); + } + + static void phylink_sfp_module_stop(void *upstream) +@@ -1773,10 +1790,30 @@ static void phylink_sfp_link_up(void *up + static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) + { + struct phylink *pl = upstream; +- phy_interface_t interface = pl->link_config.interface; ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); ++ __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising); ++ phy_interface_t interface; + int ret; + +- ret = phylink_attach_phy(pl, phy, pl->link_config.interface); ++ /* ++ * This is the new way of dealing with flow control for PHYs, ++ * as described by Timur Tabi in commit 529ed1275263 ("net: phy: ++ * phy drivers should not set SUPPORTED_[Asym_]Pause") except ++ * using our validate call to the MAC, we rely upon the MAC ++ * clearing the bits from both supported and advertising fields. ++ */ ++ phy_support_asym_pause(phy); ++ ++ ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported); ++ ethtool_convert_legacy_u32_to_link_mode(advertising, phy->advertising); ++ ++ /* Do the initial configuration */ ++ ret = phylink_sfp_config(pl, ML_AN_INBAND, supported, advertising); ++ if (ret < 0) ++ return ret; ++ ++ interface = pl->link_config.interface; ++ ret = phylink_attach_phy(pl, phy, interface); + if (ret < 0) + return ret; + +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -102,6 +102,7 @@ static const struct sfp_quirk *sfp_looku + + return NULL; + } ++ + /** + * sfp_parse_port() - Parse the EEPROM base ID, setting the port type + * @bus: a pointer to the &struct sfp_bus structure for the sfp module +@@ -178,6 +179,33 @@ int sfp_parse_port(struct sfp_bus *bus, + EXPORT_SYMBOL_GPL(sfp_parse_port); + + /** ++ * sfp_may_have_phy() - indicate whether the module may have a PHY ++ * @bus: a pointer to the &struct sfp_bus structure for the sfp module ++ * @id: a pointer to the module's &struct sfp_eeprom_id ++ * ++ * Parse the EEPROM identification given in @id, and return whether ++ * this module may have a PHY. ++ */ ++bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id) ++{ ++ if (id->base.e1000_base_t) ++ return true; ++ ++ if (id->base.phys_id != SFF8024_ID_DWDM_SFP) { ++ switch (id->base.extended_cc) { ++ case SFF8024_ECC_10GBASE_T_SFI: ++ case SFF8024_ECC_10GBASE_T_SR: ++ case SFF8024_ECC_5GBASE_T: ++ case SFF8024_ECC_2_5GBASE_T: ++ return true; ++ } ++ } ++ ++ return false; ++} ++EXPORT_SYMBOL_GPL(sfp_may_have_phy); ++ ++/** + * sfp_parse_support() - Parse the eeprom id for supported link modes + * @bus: a pointer to the &struct sfp_bus structure for the sfp module + * @id: a pointer to the module's &struct sfp_eeprom_id +--- a/include/linux/sfp.h ++++ b/include/linux/sfp.h +@@ -533,6 +533,7 @@ struct sfp_upstream_ops { + #if IS_ENABLED(CONFIG_SFP) + int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id, + unsigned long *support); ++bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id); + void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id, + unsigned long *support); + phy_interface_t sfp_select_interface(struct sfp_bus *bus, +@@ -556,6 +557,12 @@ static inline int sfp_parse_port(struct + return PORT_OTHER; + } + ++static inline bool sfp_may_have_phy(struct sfp_bus *bus, ++ const struct sfp_eeprom_id *id) ++{ ++ return false; ++} ++ + static inline void sfp_parse_support(struct sfp_bus *bus, + const struct sfp_eeprom_id *id, + unsigned long *support) diff --git a/target/linux/generic/pending-4.19/751-net-phylink-make-Broadcom-BCM84881-based-SFPs-work.patch b/target/linux/generic/pending-4.19/751-net-phylink-make-Broadcom-BCM84881-based-SFPs-work.patch new file mode 100644 index 0000000000..1724d445b7 --- /dev/null +++ b/target/linux/generic/pending-4.19/751-net-phylink-make-Broadcom-BCM84881-based-SFPs-work.patch @@ -0,0 +1,58 @@ +From 3d8592a23dd67fb78ad85ddf711a059d3880fcb4 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 8 Nov 2019 17:19:16 +0000 +Subject: [PATCH 654/660] net: phylink: make Broadcom BCM84881 based SFPs work + +The Broadcom BCM84881 does not appear to send the SGMII control word +when operating in SGMII mode, which causes network adapters to fail +to link with the PHY, or decide to operate at fixed 1G speed, even if +the PHY negotiated 100M. + +Work around this by detecting the Broadcom BCM84881 and switch to phy +mode rather than inband mode. + +Signed-off-by: Russell King +--- + drivers/net/phy/phylink.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +--- a/drivers/net/phy/phylink.c ++++ b/drivers/net/phy/phylink.c +@@ -1787,12 +1787,22 @@ static void phylink_sfp_link_up(void *up + phylink_run_resolve(pl); + } + ++/* The Broadcom BCM84881 in the Methode DM7052 is unable to provide a SGMII ++ * or 802.3z control word, so inband will not work. ++ */ ++static bool phylink_phy_no_inband(struct phy_device *phy) ++{ ++ return phy->is_c45 && ++ (phy->c45_ids.device_ids[1] & 0xfffffff0) == 0xae025150; ++} ++ + static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) + { + struct phylink *pl = upstream; + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); + __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising); + phy_interface_t interface; ++ u8 mode; + int ret; + + /* +@@ -1807,8 +1817,13 @@ static int phylink_sfp_connect_phy(void + ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported); + ethtool_convert_legacy_u32_to_link_mode(advertising, phy->advertising); + ++ if (phylink_phy_no_inband(phy)) ++ mode = MLO_AN_PHY; ++ else ++ mode = MLO_AN_INBAND; ++ + /* Do the initial configuration */ +- ret = phylink_sfp_config(pl, ML_AN_INBAND, supported, advertising); ++ ret = phylink_sfp_config(pl, mode, supported, advertising); + if (ret < 0) + return ret; + diff --git a/target/linux/generic/pending-4.19/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch b/target/linux/generic/pending-4.19/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch new file mode 100644 index 0000000000..a69cf397aa --- /dev/null +++ b/target/linux/generic/pending-4.19/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch @@ -0,0 +1,333 @@ +From 0f669e10ede7f06bb998373de6a9d169f47fcc66 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 11:54:30 +0000 +Subject: [PATCH 655/660] net: phy: add Broadcom BCM84881 PHY driver + +Add a rudimentary Clause 45 driver for the BCM84881 PHY, found on +Methode DM7052 SFPs. + +Signed-off-by: Russell King +--- + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm84881.c | 290 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 296 insertions(+) + create mode 100644 drivers/net/phy/bcm84881.c + +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -280,6 +280,11 @@ config BROADCOM_PHY + Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464, + BCM5481, BCM54810 and BCM5482 PHYs. + ++config BCM84881_PHY ++ tristate "Broadcom BCM84881 PHY" ++ ---help--- ++ Support the Broadcom BCM84881 PHY. ++ + config CICADA_PHY + tristate "Cicada PHYs" + ---help--- +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -54,6 +54,7 @@ obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o + obj-$(CONFIG_BCM_CYGNUS_PHY) += bcm-cygnus.o + obj-$(CONFIG_BCM_NET_PHYLIB) += bcm-phy-lib.o + obj-$(CONFIG_BROADCOM_PHY) += broadcom.o ++obj-$(CONFIG_BCM84881_PHY) += bcm84881.o + obj-$(CONFIG_CICADA_PHY) += cicada.o + obj-$(CONFIG_CORTINA_PHY) += cortina.o + obj-$(CONFIG_DAVICOM_PHY) += davicom.o +--- /dev/null ++++ b/drivers/net/phy/bcm84881.c +@@ -0,0 +1,290 @@ ++// SPDX-License-Identifier: GPL-2.0 ++// Broadcom BCM84881 NBASE-T PHY driver, as found on a SFP+ module. ++// Copyright (C) 2019 Russell King, Deep Blue Solutions Ltd. ++// ++// Like the Marvell 88x3310, the Broadcom 84881 changes its host-side ++// interface according to the operating speed between 10GBASE-R, ++// 2500BASE-X and SGMII (but unlike the 88x3310, without the control ++// word). ++// ++// This driver only supports those aspects of the PHY that I'm able to ++// observe and test with the SFP+ module, which is an incomplete subset ++// of what this PHY is able to support. For example, I only assume it ++// supports a single lane Serdes connection, but it may be that the PHY ++// is able to support more than that. ++#include ++#include ++#include ++ ++enum { ++ MDIO_AN_C22 = 0xffe0, ++}; ++ ++static int bcm84881_wait_init(struct phy_device *phydev) ++{ ++ unsigned int tries = 20; ++ int ret, val; ++ ++ do { ++ val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1); ++ if (val < 0) { ++ ret = val; ++ break; ++ } ++ if (!(val & MDIO_CTRL1_RESET)) { ++ ret = 0; ++ break; ++ } ++ if (!--tries) { ++ ret = -ETIMEDOUT; ++ break; ++ } ++ msleep(100); ++ } while (1); ++ ++ if (ret) ++ phydev_err(phydev, "%s failed: %d\n", __func__, ret); ++ ++ return ret; ++} ++ ++static int bcm84881_config_init(struct phy_device *phydev) ++{ ++ switch (phydev->interface) { ++ case PHY_INTERFACE_MODE_SGMII: ++ case PHY_INTERFACE_MODE_2500BASEX: ++ case PHY_INTERFACE_MODE_10GKR: ++ break; ++ default: ++ return -ENODEV; ++ } ++ return 0; ++} ++ ++static int bcm84881_probe(struct phy_device *phydev) ++{ ++ /* This driver requires PMAPMD and AN blocks */ ++ const u32 mmd_mask = MDIO_DEVS_PMAPMD | MDIO_DEVS_AN; ++ ++ if (!phydev->is_c45 || ++ (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask) ++ return -ENODEV; ++ ++ return 0; ++} ++ ++static int genphy_c45_an_config_aneg(struct phy_device *phydev) ++{ ++ bool changed = false; ++ u32 advertising; ++ int ret; ++ ++ phydev->advertising &= phydev->supported; ++ advertising = phydev->advertising; ++ ++ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, ++ ADVERTISE_ALL | ADVERTISE_100BASE4 | ++ ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM, ++ ethtool_adv_to_mii_adv_t(advertising)); ++ if (ret < 0) ++ return ret; ++ if (ret > 0) ++ changed = true; ++ ++ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, ++ MDIO_AN_10GBT_CTRL_ADV10G, ++ advertising & ADVERTISED_10000baseT_Full ? ++ MDIO_AN_10GBT_CTRL_ADV10G : 0); ++ if (ret < 0) ++ return ret; ++ if (ret > 0) ++ changed = true; ++ ++ return genphy_c45_check_and_restart_aneg(phydev, changed); ++} ++ ++static int bcm84881_config_aneg(struct phy_device *phydev) ++{ ++ bool changed = false; ++ u32 adv; ++ int ret; ++ ++ /* Wait for the PHY to finish initialising, otherwise our ++ * advertisement may be overwritten. ++ */ ++ ret = bcm84881_wait_init(phydev); ++ if (ret) ++ return ret; ++ ++ /* We don't support manual MDI control */ ++ phydev->mdix_ctrl = ETH_TP_MDI_AUTO; ++ ++ /* disabled autoneg doesn't seem to work with this PHY */ ++ if (phydev->autoneg == AUTONEG_DISABLE) ++ return -EINVAL; ++ ++ ret = genphy_c45_an_config_aneg(phydev); ++ if (ret < 0) ++ return ret; ++ if (ret > 0) ++ changed = true; ++ ++ adv = ethtool_adv_to_mii_ctrl1000_t(phydev->advertising); ++ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, ++ MDIO_AN_C22 + MII_CTRL1000, ++ ADVERTISE_1000FULL | ADVERTISE_1000HALF, ++ adv); ++ if (ret < 0) ++ return ret; ++ if (ret > 0) ++ changed = true; ++ ++ return genphy_c45_check_and_restart_aneg(phydev, changed); ++} ++ ++static int bcm84881_aneg_done(struct phy_device *phydev) ++{ ++ int bmsr, val; ++ ++ val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1); ++ if (val < 0) ++ return val; ++ ++ bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR); ++ if (bmsr < 0) ++ return val; ++ ++ return !!(val & MDIO_AN_STAT1_COMPLETE) && ++ !!(bmsr & BMSR_ANEGCOMPLETE); ++} ++ ++static int bcm84881_read_status(struct phy_device *phydev) ++{ ++ bool autoneg_complete; ++ unsigned int mode; ++ int bmsr, val; ++ ++ val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1); ++ if (val < 0) ++ return val; ++ ++ if (val & MDIO_AN_CTRL1_RESTART) { ++ phydev->link = 0; ++ return 0; ++ } ++ ++ val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1); ++ if (val < 0) ++ return val; ++ ++ bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR); ++ if (bmsr < 0) ++ return val; ++ ++ autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) && ++ !!(bmsr & BMSR_ANEGCOMPLETE); ++ phydev->link = !!(val & MDIO_STAT1_LSTATUS) && ++ !!(bmsr & BMSR_LSTATUS); ++ if (phydev->autoneg == AUTONEG_ENABLE && !autoneg_complete) ++ phydev->link = false; ++ ++ if (!phydev->link) ++ return 0; ++ ++ phydev->lp_advertising = 0; ++ phydev->speed = SPEED_UNKNOWN; ++ phydev->duplex = DUPLEX_UNKNOWN; ++ phydev->pause = 0; ++ phydev->asym_pause = 0; ++ phydev->mdix = 0; ++ ++ if (autoneg_complete) { ++ val = genphy_c45_read_lpa(phydev); ++ if (val < 0) ++ return val; ++ ++ val = phy_read_mmd(phydev, MDIO_MMD_AN, ++ MDIO_AN_C22 + MII_STAT1000); ++ if (val < 0) ++ return val; ++ ++ phydev->lp_advertising |= mii_stat1000_to_ethtool_lpa_t(val); ++ ++ if (phydev->autoneg == AUTONEG_ENABLE) ++ phy_resolve_aneg_linkmode(phydev); ++ } ++ ++ if (phydev->autoneg == AUTONEG_DISABLE) { ++ /* disabled autoneg doesn't seem to work, so force the link ++ * down. ++ */ ++ phydev->link = 0; ++ return 0; ++ } ++ ++ /* Set the host link mode - we set the phy interface mode and ++ * the speed according to this register so that downshift works. ++ * We leave the duplex setting as per the resolution from the ++ * above. ++ */ ++ val = phy_read_mmd(phydev, MDIO_MMD_VEND1, 0x4011); ++ mode = (val & 0x1e) >> 1; ++ if (mode == 1 || mode == 2) ++ phydev->interface = PHY_INTERFACE_MODE_SGMII; ++ else if (mode == 3) ++ phydev->interface = PHY_INTERFACE_MODE_10GKR; ++ else if (mode == 4) ++ phydev->interface = PHY_INTERFACE_MODE_2500BASEX; ++ switch (mode & 7) { ++ case 1: ++ phydev->speed = SPEED_100; ++ break; ++ case 2: ++ phydev->speed = SPEED_1000; ++ break; ++ case 3: ++ phydev->speed = SPEED_10000; ++ break; ++ case 4: ++ phydev->speed = SPEED_2500; ++ break; ++ case 5: ++ phydev->speed = SPEED_5000; ++ break; ++ } ++ ++ return genphy_c45_read_mdix(phydev); ++} ++ ++static struct phy_driver bcm84881_drivers[] = { ++ { ++ .phy_id = 0xae025150, ++ .phy_id_mask = 0xfffffff0, ++ .name = "Broadcom BCM84881", ++ .features = SUPPORTED_100baseT_Full | ++ SUPPORTED_100baseT_Half | ++ SUPPORTED_1000baseT_Full | ++ SUPPORTED_Autoneg | ++ SUPPORTED_TP | ++ SUPPORTED_FIBRE | ++ SUPPORTED_10000baseT_Full | ++ SUPPORTED_Backplane, ++ .config_init = bcm84881_config_init, ++ .probe = bcm84881_probe, ++ .config_aneg = bcm84881_config_aneg, ++ .aneg_done = bcm84881_aneg_done, ++ .read_status = bcm84881_read_status, ++ }, ++}; ++ ++module_phy_driver(bcm84881_drivers); ++ ++/* FIXME: module auto-loading for Clause 45 PHYs seems non-functional */ ++static struct mdio_device_id __maybe_unused bcm84881_tbl[] = { ++ { 0xae025150, 0xfffffff0 }, ++ { }, ++}; ++MODULE_AUTHOR("Russell King"); ++MODULE_DESCRIPTION("Broadcom BCM84881 PHY driver"); ++MODULE_DEVICE_TABLE(mdio, bcm84881_tbl); ++MODULE_LICENSE("GPL"); diff --git a/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch b/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch new file mode 100644 index 0000000000..a710901690 --- /dev/null +++ b/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch @@ -0,0 +1,94 @@ +From 6df6709dc3d00e0bc948d45dfa8d8f18ba379c48 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 5 Nov 2019 11:56:18 +0000 +Subject: [PATCH 656/660] net: sfp: add support for Clause 45 PHYs + +Some SFP+ modules have a Clause 45 PHY onboard, which is accessible via +the normal I2C address. Detect 10G BASE-T PHYs which may have an +accessible PHY and probe for it. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 44 +++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 40 insertions(+), 4 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1326,12 +1326,12 @@ static void sfp_sm_phy_detach(struct sfp + sfp->mod_phy = NULL; + } + +-static void sfp_sm_probe_phy(struct sfp *sfp) ++static void sfp_sm_probe_phy(struct sfp *sfp, bool is_c45) + { + struct phy_device *phy; + int err; + +- phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); ++ phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45); + if (phy == ERR_PTR(-ENODEV)) { + dev_info(sfp->dev, "no PHY detected\n"); + return; +@@ -1341,6 +1341,13 @@ static void sfp_sm_probe_phy(struct sfp + return; + } + ++ err = phy_device_register(phy); ++ if (err) { ++ phy_device_free(phy); ++ dev_err(sfp->dev, "phy_device_register failed: %d\n", err); ++ return; ++ } ++ + err = sfp_add_phy(sfp->sfp_bus, phy); + if (err) { + phy_device_remove(phy); +@@ -1411,10 +1418,32 @@ static void sfp_sm_fault(struct sfp *sfp + } + } + ++/* Probe a SFP for a PHY device if the module supports copper - the PHY ++ * normally sits at I2C bus address 0x56, and may either be a clause 22 ++ * or clause 45 PHY. ++ * ++ * Clause 22 copper SFP modules normally operate in Cisco SGMII mode with ++ * negotiation enabled, but some may be in 1000base-X - which is for the ++ * PHY driver to determine. ++ * ++ * Clause 45 copper SFP+ modules (10G) appear to switch their interface ++ * mode according to the negotiated line speed. ++ */ + static void sfp_sm_probe_for_phy(struct sfp *sfp) + { +- if (sfp->id.base.e1000_base_t) +- sfp_sm_probe_phy(sfp); ++ switch (sfp->id.base.extended_cc) { ++ case SFF8024_ECC_10GBASE_T_SFI: ++ case SFF8024_ECC_10GBASE_T_SR: ++ case SFF8024_ECC_5GBASE_T: ++ case SFF8024_ECC_2_5GBASE_T: ++ sfp_sm_probe_phy(sfp, true); ++ break; ++ ++ default: ++ if (sfp->id.base.e1000_base_t) ++ sfp_sm_probe_phy(sfp, false); ++ break; ++ } + } + + static int sfp_module_parse_power(struct sfp *sfp) +@@ -1474,6 +1503,13 @@ static int sfp_sm_mod_hpower(struct sfp + return -EAGAIN; + } + ++ /* DM7052 reports as a high power module, responds to reads (with ++ * all bytes 0xff) at 0x51 but does not accept writes. In any case, ++ * if the bit is already set, we're already in high power mode. ++ */ ++ if (!!(val & BIT(0)) == enable) ++ return 0; ++ + if (enable) + val |= BIT(0); + else From 46678fbdca914c1de61a87357337eb680c4c4512 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Nov 2019 11:45:35 +0000 Subject: [PATCH 408/480] mvebu: add uDPU update patches Update the uDPU kernel support, fixing a number of issues: * make ethernet work again by adding comphy definitions * slow the I2C bus to give it more chance of actually working * the SFP cages are designed to support up to 3W modules, which would be prevented from initialising without this patch. Signed-off-by: Russell King [jonas.gorski: rename to mvebu, refresh patches] Signed-off-by: Jonas Gorski --- ...rm64-dts-uDPU-fix-comphy-definitions.patch | 35 +++++++++++++++++++ ...-arm64-dts-uDPU-remove-i2c-fast-mode.patch | 30 ++++++++++++++++ ...ts-uDPU-SFP-cages-support-3W-modules.patch | 33 +++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 target/linux/mvebu/patches-4.19/544-arm64-dts-uDPU-fix-comphy-definitions.patch create mode 100644 target/linux/mvebu/patches-4.19/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch create mode 100644 target/linux/mvebu/patches-4.19/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch diff --git a/target/linux/mvebu/patches-4.19/544-arm64-dts-uDPU-fix-comphy-definitions.patch b/target/linux/mvebu/patches-4.19/544-arm64-dts-uDPU-fix-comphy-definitions.patch new file mode 100644 index 0000000000..f72ea93b97 --- /dev/null +++ b/target/linux/mvebu/patches-4.19/544-arm64-dts-uDPU-fix-comphy-definitions.patch @@ -0,0 +1,35 @@ +From 9c222a1d78a1700220e38feb270f00d2ddd3c5ab Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Wed, 6 Nov 2019 13:44:21 +0000 +Subject: [PATCH 657/660] arm64: dts: uDPU: fix comphy definitions + +The uDPU uses both ethernet controllers, which ties up COMPHY 0 for +eth1 and COMPHY 1 for eth0, with no USB3 comphy. The addition of +COMPHY support made the kernel override the setup by the boot loader +breaking this platform. Delete the USB3 COMPHY definition at platform +level, and add phy specifications for the ethernet channels. + +Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with their PHYs") +Signed-off-by: Russell King +--- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts ++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts +@@ -143,6 +143,7 @@ + status = "okay"; + phy-mode = "sgmii"; + managed = "in-band-status"; ++ phys = <&comphy1 0>; + sfp = <&sfp_eth0>; + }; + +@@ -150,6 +151,7 @@ + status = "okay"; + phy-mode = "sgmii"; + managed = "in-band-status"; ++ phys = <&comphy0 1>; + sfp = <&sfp_eth1>; + }; + diff --git a/target/linux/mvebu/patches-4.19/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch b/target/linux/mvebu/patches-4.19/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch new file mode 100644 index 0000000000..b984eb4ba1 --- /dev/null +++ b/target/linux/mvebu/patches-4.19/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch @@ -0,0 +1,30 @@ +From 662eb8fc87f982e63ccb9a9df25c7aeabf9fe341 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 14 Nov 2019 00:23:35 +0000 +Subject: [PATCH 658/660] arm64: dts: uDPU: remove i2c-fast-mode + +The I2C bus violates the timing specifications when run in fast mode +on the uDPU, so switch to 100kHz mode. + +Signed-off-by: Russell King +--- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts ++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts +@@ -119,12 +119,14 @@ + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; ++ /delete-property/mrvl,i2c-fast-mode; + }; + + &i2c1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins>; ++ /delete-property/mrvl,i2c-fast-mode; + + lm75@48 { + status = "okay"; diff --git a/target/linux/mvebu/patches-4.19/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch b/target/linux/mvebu/patches-4.19/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch new file mode 100644 index 0000000000..d025f36a53 --- /dev/null +++ b/target/linux/mvebu/patches-4.19/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch @@ -0,0 +1,33 @@ +From 1cb114a20854e34324a2cb308f23054ff8227ffa Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 19 Nov 2019 22:48:50 +0000 +Subject: [PATCH 659/660] arm64: dts: uDPU: SFP cages support 3W modules + +The SFP cages are designed to support up to 3W modules, such as G.hn, +G.fast and MoCA modules. Although there is no way for such modules to +declare to software that they consume 3W, we document in DT that this +is the designed power level for these cages. + +Signed-off-by: Russell King +--- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts ++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts +@@ -69,6 +69,7 @@ + mod-def0-gpio = <&gpiosb 3 GPIO_ACTIVE_LOW>; + tx-disable-gpio = <&gpiosb 4 GPIO_ACTIVE_HIGH>; + tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>; ++ maximum-power-milliwatt = <3000>; + }; + + sfp_eth1: sfp-eth1 { +@@ -78,6 +79,7 @@ + mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>; + tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>; ++ maximum-power-milliwatt = <3000>; + }; + }; + From 10b12b5d687215d4f9dfd3bb4012d861ebdad84f Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 4 Dec 2019 23:09:41 +0100 Subject: [PATCH 409/480] kernel: sfp: add two fixes submitted to upstream Add two small fixes for SFP that were submitted upstream. Signed-off-by: Jonas Gorski --- .../pending-4.19/754-net-sfp-fix-unbind.patch | 28 ++++++++++++ .../pending-4.19/755-net-sfp-fix-hwmon.patch | 44 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch create mode 100644 target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch diff --git a/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch b/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch new file mode 100644 index 0000000000..3172249a10 --- /dev/null +++ b/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch @@ -0,0 +1,28 @@ +From 729fd05aac22cdf1e502fbf1bf80e5ebba0d9fbc Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 3 Dec 2019 17:48:28 +0000 +Subject: [PATCH] net: sfp: fix unbind + +When unbinding, we don't correctly tear down the module state, leaving +(for example) the hwmon registration behind. Ensure everything is +properly removed by sending a remove event at unbind. + +Fixes: 6b0da5c9c1a3 ("net: sfp: track upstream's attachment state in state machine") +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -2242,6 +2242,10 @@ static int sfp_remove(struct platform_de + + sfp_unregister_socket(sfp->sfp_bus); + ++ rtnl_lock(); ++ sfp_sm_event(sfp, SFP_E_REMOVE); ++ rtnl_unlock(); ++ + return 0; + } + diff --git a/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch b/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch new file mode 100644 index 0000000000..9e13fbd0f2 --- /dev/null +++ b/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch @@ -0,0 +1,44 @@ +From 5eb0df5023c6ae8a71a7848fd5e1f788d86e51ae Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 3 Dec 2019 18:46:04 +0000 +Subject: [PATCH] net: sfp: fix hwmon + +The referenced commit below allowed more than one hwmon device to be +created per SFP, which is definitely not what we want. Avoid this by +only creating the hwmon device just as we transition to WAITDEV state. + +Fixes: 139d3a212a1f ("net: sfp: allow modules with slow diagnostics to probe") +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1714,6 +1714,10 @@ static void sfp_sm_module(struct sfp *sf + break; + } + ++ err = sfp_hwmon_insert(sfp); ++ if (err) ++ dev_warn(sfp->dev, "hwmon probe failed: %d\n", err); ++ + sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0); + /* fall through */ + case SFP_MOD_WAITDEV: +@@ -1763,15 +1767,6 @@ static void sfp_sm_module(struct sfp *sf + case SFP_MOD_ERROR: + break; + } +- +-#if IS_ENABLED(CONFIG_HWMON) +- if (sfp->sm_mod_state >= SFP_MOD_WAITDEV && +- IS_ERR_OR_NULL(sfp->hwmon_dev)) { +- err = sfp_hwmon_insert(sfp); +- if (err) +- dev_warn(sfp->dev, "hwmon probe failed: %d\n", err); +- } +-#endif + } + + static void sfp_sm_main(struct sfp *sfp, unsigned int event) From 947163b9d28db96923f91301d2289ec195a3f61f Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 4 Dec 2019 23:11:34 +0100 Subject: [PATCH 410/480] kernel: sfp: re-attempt probing for phy Add patches retrying to probe the PHY to restore support for PHYs taking longer to initialize without breaking modules without PHYs. Patches taken from http://git.armlinux.org.uk/cgit/linux-arm.git/log/?h=phy Signed-off-by: Jonas Gorski --- ...finition-for-the-fault-recovery-atte.patch | 55 ++++++++ .../757-net-sfp-rename-sm_retries.patch | 60 ++++++++ ...net-sfp-error-handling-for-phy-probe.patch | 97 +++++++++++++ ...9-net-sfp-re-attempt-probing-for-phy.patch | 132 ++++++++++++++++++ 4 files changed, 344 insertions(+) create mode 100644 target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch create mode 100644 target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch create mode 100644 target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch create mode 100644 target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch diff --git a/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch b/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch new file mode 100644 index 0000000000..0e5005ed19 --- /dev/null +++ b/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch @@ -0,0 +1,55 @@ +From 4d6bfb6fbb00af38402db4d1ce464e22def9fd9e Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Thu, 28 Nov 2019 14:24:40 +0000 +Subject: [PATCH 1/4] net: sfp: use a definition for the fault recovery + attempts + +Signed-off-by: Russell King +--- + 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 +@@ -160,6 +160,14 @@ static const enum gpiod_flags gpio_flags + #define T_RESET_US 10 + #define T_FAULT_RECOVER msecs_to_jiffies(1000) + ++/* N_FAULT_INIT is the number of recovery attempts at module initialisation ++ * time. If the TX_FAULT signal is not deasserted after this number of ++ * attempts at clearing it, we decide that the module is faulty. ++ * N_FAULT is the same but after the module has initialised. ++ */ ++#define N_FAULT_INIT 5 ++#define N_FAULT 5 ++ + /* SFP module presence detection is poor: the three MOD DEF signals are + * the same length on the PCB, which means it's possible for MOD DEF 0 to + * connect before the I2C bus on MOD DEF 1/2. +@@ -1803,7 +1811,7 @@ static void sfp_sm_main(struct sfp *sfp, + sfp_module_tx_enable(sfp); + + /* Initialise the fault clearance retries */ +- sfp->sm_retries = 5; ++ sfp->sm_retries = N_FAULT_INIT; + + /* We need to check the TX_FAULT state, which is not defined + * while TX_DISABLE is asserted. The earliest we want to do +@@ -1842,7 +1850,7 @@ static void sfp_sm_main(struct sfp *sfp, + * there is a fault. + */ + sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, +- sfp->sm_retries == 5); ++ sfp->sm_retries == N_FAULT_INIT); + } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { + init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT + * clear. Probe for the PHY and check the LOS state. +@@ -1855,7 +1863,7 @@ static void sfp_sm_main(struct sfp *sfp, + sfp_sm_link_check_los(sfp); + + /* Reset the fault retry count */ +- sfp->sm_retries = 5; ++ sfp->sm_retries = N_FAULT; + } + break; + diff --git a/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch b/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch new file mode 100644 index 0000000000..b347d2c90a --- /dev/null +++ b/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch @@ -0,0 +1,60 @@ +From bfa3cbb01c7ea34d7369c9bd2ec1b2dc67082b04 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Mon, 2 Dec 2019 18:06:44 +0000 +Subject: [PATCH 2/4] net: sfp: rename sm_retries + +Rename sm_retries as sm_fault_retries, as this is what this member is +tracking. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -222,7 +222,7 @@ struct sfp { + unsigned char sm_mod_tries; + unsigned char sm_dev_state; + unsigned short sm_state; +- unsigned int sm_retries; ++ unsigned char sm_fault_retries; + + struct sfp_eeprom_id id; + unsigned int module_power_mW; +@@ -1414,7 +1414,7 @@ static bool sfp_los_event_inactive(struc + + static void sfp_sm_fault(struct sfp *sfp, unsigned int next_state, bool warn) + { +- if (sfp->sm_retries && !--sfp->sm_retries) { ++ if (sfp->sm_fault_retries && !--sfp->sm_fault_retries) { + dev_err(sfp->dev, + "module persistently indicates fault, disabling\n"); + sfp_sm_next(sfp, SFP_S_TX_DISABLE, 0); +@@ -1811,7 +1811,7 @@ static void sfp_sm_main(struct sfp *sfp, + sfp_module_tx_enable(sfp); + + /* Initialise the fault clearance retries */ +- sfp->sm_retries = N_FAULT_INIT; ++ sfp->sm_fault_retries = N_FAULT_INIT; + + /* We need to check the TX_FAULT state, which is not defined + * while TX_DISABLE is asserted. The earliest we want to do +@@ -1850,7 +1850,7 @@ static void sfp_sm_main(struct sfp *sfp, + * there is a fault. + */ + sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, +- sfp->sm_retries == N_FAULT_INIT); ++ sfp->sm_fault_retries == N_FAULT_INIT); + } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { + init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT + * clear. Probe for the PHY and check the LOS state. +@@ -1863,7 +1863,7 @@ static void sfp_sm_main(struct sfp *sfp, + sfp_sm_link_check_los(sfp); + + /* Reset the fault retry count */ +- sfp->sm_retries = N_FAULT; ++ sfp->sm_fault_retries = N_FAULT; + } + break; + diff --git a/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch b/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch new file mode 100644 index 0000000000..00896dfa26 --- /dev/null +++ b/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch @@ -0,0 +1,97 @@ +From 1fba543dc8edf4a43bff3276306648bb27c1e207 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 29 Nov 2019 00:30:08 +0000 +Subject: [PATCH 3/4] net: sfp: error handling for phy probe + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -1334,7 +1334,7 @@ static void sfp_sm_phy_detach(struct sfp + sfp->mod_phy = NULL; + } + +-static void sfp_sm_probe_phy(struct sfp *sfp, bool is_c45) ++static int sfp_sm_probe_phy(struct sfp *sfp, bool is_c45) + { + struct phy_device *phy; + int err; +@@ -1342,18 +1342,18 @@ static void sfp_sm_probe_phy(struct sfp + phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45); + if (phy == ERR_PTR(-ENODEV)) { + dev_info(sfp->dev, "no PHY detected\n"); +- return; ++ return 0; + } + if (IS_ERR(phy)) { + dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); +- return; ++ return PTR_ERR(phy); + } + + err = phy_device_register(phy); + if (err) { + phy_device_free(phy); + dev_err(sfp->dev, "phy_device_register failed: %d\n", err); +- return; ++ return err; + } + + err = sfp_add_phy(sfp->sfp_bus, phy); +@@ -1361,10 +1361,12 @@ static void sfp_sm_probe_phy(struct sfp + phy_device_remove(phy); + phy_device_free(phy); + dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); +- return; ++ return err; + } + + sfp->mod_phy = phy; ++ ++ return 0; + } + + static void sfp_sm_link_up(struct sfp *sfp) +@@ -1437,21 +1439,24 @@ static void sfp_sm_fault(struct sfp *sfp + * Clause 45 copper SFP+ modules (10G) appear to switch their interface + * mode according to the negotiated line speed. + */ +-static void sfp_sm_probe_for_phy(struct sfp *sfp) ++static int sfp_sm_probe_for_phy(struct sfp *sfp) + { ++ int err = 0; ++ + switch (sfp->id.base.extended_cc) { + case SFF8024_ECC_10GBASE_T_SFI: + case SFF8024_ECC_10GBASE_T_SR: + case SFF8024_ECC_5GBASE_T: + case SFF8024_ECC_2_5GBASE_T: +- sfp_sm_probe_phy(sfp, true); ++ err = sfp_sm_probe_phy(sfp, true); + break; + + default: + if (sfp->id.base.e1000_base_t) +- sfp_sm_probe_phy(sfp, false); ++ err = sfp_sm_probe_phy(sfp, false); + break; + } ++ return err; + } + + static int sfp_module_parse_power(struct sfp *sfp) +@@ -1855,7 +1860,10 @@ static void sfp_sm_main(struct sfp *sfp, + init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT + * clear. Probe for the PHY and check the LOS state. + */ +- sfp_sm_probe_for_phy(sfp); ++ if (sfp_sm_probe_for_phy(sfp)) { ++ sfp_sm_next(sfp, SFP_S_FAIL, 0); ++ break; ++ } + if (sfp_module_start(sfp->sfp_bus)) { + sfp_sm_next(sfp, SFP_S_FAIL, 0); + break; diff --git a/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch b/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch new file mode 100644 index 0000000000..526c7962cc --- /dev/null +++ b/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch @@ -0,0 +1,132 @@ +From 6c4efe83a0acf6f06c89ae17b885fa5739eb5be7 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Mon, 2 Dec 2019 18:20:22 +0000 +Subject: [PATCH 4/4] net: sfp: re-attempt probing for phy + +Some 1000BASE-T PHY modules take a while for the PHY to wake up. +Retry the probe a number of times before deciding that the module has +no PHY. + +Tested with: + Sourcephotonics SPGBTXCNFC - PHY takes less than 50ms to respond. + Champion One 1000SFPT - PHY takes about 200ms to respond. + Mikrotik S-RJ01 - no PHY + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 59 ++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 42 insertions(+), 17 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -60,6 +60,7 @@ enum { + SFP_S_FAIL, + SFP_S_WAIT, + SFP_S_INIT, ++ SFP_S_INIT_PHY, + SFP_S_INIT_TX_FAULT, + SFP_S_WAIT_LOS, + SFP_S_LINK_UP, +@@ -124,6 +125,7 @@ static const char * const sm_state_strin + [SFP_S_FAIL] = "fail", + [SFP_S_WAIT] = "wait", + [SFP_S_INIT] = "init", ++ [SFP_S_INIT_PHY] = "init_phy", + [SFP_S_INIT_TX_FAULT] = "init_tx_fault", + [SFP_S_WAIT_LOS] = "wait_los", + [SFP_S_LINK_UP] = "link_up", +@@ -168,6 +170,12 @@ static const enum gpiod_flags gpio_flags + #define N_FAULT_INIT 5 + #define N_FAULT 5 + ++/* T_PHY_RETRY is the time interval between attempts to probe the PHY. ++ * R_PHY_RETRY is the number of attempts. ++ */ ++#define T_PHY_RETRY msecs_to_jiffies(50) ++#define R_PHY_RETRY 12 ++ + /* SFP module presence detection is poor: the three MOD DEF signals are + * the same length on the PCB, which means it's possible for MOD DEF 0 to + * connect before the I2C bus on MOD DEF 1/2. +@@ -223,6 +231,7 @@ struct sfp { + unsigned char sm_dev_state; + unsigned short sm_state; + unsigned char sm_fault_retries; ++ unsigned char sm_phy_retries; + + struct sfp_eeprom_id id; + unsigned int module_power_mW; +@@ -1340,10 +1349,8 @@ static int sfp_sm_probe_phy(struct sfp * + int err; + + phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45); +- if (phy == ERR_PTR(-ENODEV)) { +- dev_info(sfp->dev, "no PHY detected\n"); +- return 0; +- } ++ if (phy == ERR_PTR(-ENODEV)) ++ return PTR_ERR(phy); + if (IS_ERR(phy)) { + dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); + return PTR_ERR(phy); +@@ -1785,6 +1792,7 @@ static void sfp_sm_module(struct sfp *sf + static void sfp_sm_main(struct sfp *sfp, unsigned int event) + { + unsigned long timeout; ++ int ret; + + /* Some events are global */ + if (sfp->sm_state != SFP_S_DOWN && +@@ -1857,22 +1865,39 @@ static void sfp_sm_main(struct sfp *sfp, + sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, + sfp->sm_fault_retries == N_FAULT_INIT); + } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { +- init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT +- * clear. Probe for the PHY and check the LOS state. +- */ +- if (sfp_sm_probe_for_phy(sfp)) { +- sfp_sm_next(sfp, SFP_S_FAIL, 0); +- break; +- } +- if (sfp_module_start(sfp->sfp_bus)) { +- sfp_sm_next(sfp, SFP_S_FAIL, 0); ++ init_done: ++ sfp->sm_phy_retries = R_PHY_RETRY; ++ goto phy_probe; ++ } ++ break; ++ ++ case SFP_S_INIT_PHY: ++ if (event != SFP_E_TIMEOUT) ++ break; ++ phy_probe: ++ /* TX_FAULT deasserted or we timed out with TX_FAULT ++ * clear. Probe for the PHY and check the LOS state. ++ */ ++ ret = sfp_sm_probe_for_phy(sfp); ++ if (ret == -ENODEV) { ++ if (--sfp->sm_phy_retries) { ++ sfp_sm_next(sfp, SFP_S_INIT_PHY, T_PHY_RETRY); + break; ++ } else { ++ dev_info(sfp->dev, "no PHY detected\n"); + } +- sfp_sm_link_check_los(sfp); +- +- /* Reset the fault retry count */ +- sfp->sm_fault_retries = N_FAULT; ++ } else if (ret) { ++ sfp_sm_next(sfp, SFP_S_FAIL, 0); ++ break; + } ++ if (sfp_module_start(sfp->sfp_bus)) { ++ sfp_sm_next(sfp, SFP_S_FAIL, 0); ++ break; ++ } ++ sfp_sm_link_check_los(sfp); ++ ++ /* Reset the fault retry count */ ++ sfp->sm_fault_retries = N_FAULT; + break; + + case SFP_S_INIT_TX_FAULT: From 3d6c571083d324567ec1a9c4fcac1712e7d2e42a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 22 Jan 2020 14:14:14 +0200 Subject: [PATCH 411/480] mac80211: add support for wds_bridge hostapd feature hostapd allows putting WDS (4addr mode) clients into a separate bridge other than the bridge regular (3addr mode) clients end up in. This is useful for example giving WDS clients access to several VLANs (trunking) while regular clients will end up inside a specific VLAN. Add 'wds_bridge' config parameter for wifi-iface which contains the name of the bridge. hostapd-mini already supports this feature, so all needed is to add the UCI wrapping in mac80211.sh. Signed-off-by: Daniel Golle --- .../kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 7ac0ce8aac..d6f460b932 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -62,6 +62,7 @@ drv_mac80211_init_iface_config() { config_add_string 'macaddr:macaddr' ifname config_add_boolean wds powersave enable + config_add_string wds_bridge config_add_int maxassoc config_add_int max_listen_int config_add_int dtim_period @@ -340,12 +341,15 @@ mac80211_hostapd_setup_bss() { append hostapd_cfg "$type=$ifname" "$N" hostapd_set_bss_options hostapd_cfg "$vif" || return 1 - json_get_vars wds dtim_period max_listen_int start_disabled + json_get_vars wds wds_bridge dtim_period max_listen_int start_disabled set_default wds 0 set_default start_disabled 0 - [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N" + [ "$wds" -gt 0 ] && { + append hostapd_cfg "wds_sta=1" "$N" + [ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N" + } [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N" cat >> /var/run/hostapd-$phy.conf < Date: Mon, 9 Dec 2019 14:51:07 +0100 Subject: [PATCH 412/480] ath79: add support for TP-Link TL-WA850RE v1 This ports support for the TL-WA850RE v1 range extender from ar71xx to ath79. Specifications: Board: AP123 / AR9341 rev. 3 Flash/RAM: 4/32 MiB CPU: 535 MHz WiFi: 2.4 GHz b/g/n Ethernet: 1 port (100M) Flashing instructions: Upload the factory image via the vendor firmware upgrade option. Recovery: Note that this device does not provide TFTP via ethernet like many other TP-Link devices do. You will have to open the case if you require recovery beyond failsafe. Signed-off-by: Adrian Schmutzler --- .../linux/ath79/dts/ar9341_tplink_tl-wa.dtsi | 82 +++++++++++++++++++ .../ath79/dts/ar9341_tplink_tl-wa850re-v1.dts | 79 ++++++++++++++++++ target/linux/ath79/image/tiny-tp-link.mk | 11 +++ .../ath79/tiny/base-files/etc/board.d/01_leds | 9 ++ .../tiny/base-files/etc/board.d/02_network | 1 + 5 files changed, 182 insertions(+) create mode 100644 target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi create mode 100644 target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi new file mode 100644 index 0000000000..07cf2063df --- /dev/null +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include +#include + +#include "ar9341.dtsi" + +/ { + aliases { + serial0 = &uart; + label-mac-device = &wmac; + }; +}; + +&ref { + clock-frequency = <25000000>; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x000000 0x020000>; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + label = "firmware"; + reg = <0x020000 0x3d0000>; + }; + + art: partition@3f0000 { + label = "art"; + reg = <0x3f0000 0x010000>; + read-only; + }; + }; + }; +}; + +&uart { + status = "okay"; +}; + +ð0 { + status = "okay"; + + phy-handle = <&swphy0>; + + mtd-mac-address = <&uboot 0x1fc00>; + + gmac-config { + device = <&gmac>; + + switch-phy-swap = <1>; + }; +}; + +ð1 { + compatible = "syscon", "simple-mfd"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&uboot 0x1fc00>; +}; diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts new file mode 100644 index 0000000000..bb0b498b67 --- /dev/null +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9341_tplink_tl-wa.dtsi" + +/ { + model = "TP-Link TL-WA850RE v1"; + compatible = "tplink,tl-wa850re-v1", "qca,ar9341"; + + aliases { + led-boot = &led_re; + led-failsafe = &led_re; + led-running = &led_re; + led-upgrade = &led_re; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + wps { + label = "WPS"; + linux,code = ; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + + lan { + label = "tp-link:blue:lan"; + gpios = <&gpio 20 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "tp-link:blue:wlan"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + led_re: re { + label = "tp-link:blue:re"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + signal1 { + label = "tp-link:blue:signal1"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + }; + + signal2 { + label = "tp-link:blue:signal2"; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + }; + + signal3 { + label = "tp-link:blue:signal3"; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + }; + + signal4 { + label = "tp-link:blue:signal4"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + + signal5 { + label = "tp-link:blue:signal5"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + }; +}; diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 070ede9721..3c15f843a9 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -66,6 +66,17 @@ define Device/tplink_tl-mr3420-v2 endef TARGET_DEVICES += tplink_tl-mr3420-v2 +define Device/tplink_tl-wa850re-v1 + $(Device/tplink-4mlzma) + SOC := ar9341 + DEVICE_MODEL := TL-WA850RE + DEVICE_VARIANT := v1 + TPLINK_HWID := 0x08500001 + DEVICE_PACKAGES := rssileds + SUPPORTED_DEVICES += tl-wa850re +endef +TARGET_DEVICES += tplink_tl-wa850re-v1 + define Device/tplink_tl-wa901nd-v2 $(Device/tplink-4m) SOC := ar9132 diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds index 199ad94bec..32c99304aa 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds @@ -54,6 +54,15 @@ tplink,tl-wr841-v8) ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10" ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" ;; +tplink,tl-wa850re-v1) + ucidef_set_led_netdev "lan" "LAN" "tp-link:blue:lan" "eth0" + ucidef_set_rssimon "wlan0" "200000" "1" + ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:blue:signal1" "wlan0" "1" "100" + ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:blue:signal2" "wlan0" "20" "100" + ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "tp-link:blue:signal3" "wlan0" "40" "100" + ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:blue:signal4" "wlan0" "60" "100" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:blue:signal5" "wlan0" "80" "100" + ;; tplink,tl-wr740n-v1|\ tplink,tl-wr740n-v3|\ tplink,tl-wr741-v1|\ diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network index b325c7cf8b..114c19b48a 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network +++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network @@ -32,6 +32,7 @@ ath79_setup_interfaces() tplink,tl-mr10u|\ tplink,tl-mr3020-v1|\ tplink,tl-mr3040-v2|\ + tplink,tl-wa850re-v1|\ tplink,tl-wa901nd-v2|\ tplink,tl-wr703n) ucidef_set_interface_lan "eth0" From a8898f1a1126279e4c316fd217365bc463f7db0b Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 21 Jan 2020 21:11:19 +0100 Subject: [PATCH 413/480] ath79: use upstream properties to disable EEE The hack-patch which introduced the "at803x-disable-smarteee" for disabling SmartEEE did in fact not disable SmartEEE but rather disabled 802.3az "standard" EEE. This can be done by using the upstream properties "eee-broken-100tx" and "eee-broken-1000t". EEE is then disabled by the PHY subsystem. Tested on devolo WiFi pro 1200e. Signed-off-by: David Bauer --- target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi | 3 ++- target/linux/ath79/dts/qca9558_engenius_ecb1750.dts | 3 ++- target/linux/ath79/dts/qca9558_ocedo_koala.dts | 3 ++- target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi index 2cdb1b8373..42b45c5900 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi @@ -105,7 +105,8 @@ phy4: ethernet-phy@4 { reg = <4>; - at803x-disable-smarteee; + eee-broken-100tx; + eee-broken-1000t; }; }; diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts index 7953ed1325..3ccf92a9f7 100644 --- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts +++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts @@ -125,7 +125,8 @@ phy5: ethernet-phy@5 { reg = <5>; - at803x-disable-smarteee; + eee-broken-100tx; + eee-broken-1000t; }; }; diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts index 5e3abdbbb8..77c332cc4e 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts @@ -142,7 +142,8 @@ phy5: ethernet-phy@5 { reg = <5>; - at803x-disable-smarteee; + eee-broken-100tx; + eee-broken-1000t; }; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index a78a9d5be1..a797750e7e 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -92,7 +92,8 @@ reg = <4>; phy-mode = "rgmii-rxid"; - at803x-disable-smarteee; + eee-broken-100tx; + eee-broken-1000t; }; }; }; From 5f4f269ce12558e90743512e08be0f2b8b701279 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 21 Jan 2020 21:11:20 +0100 Subject: [PATCH 414/480] generic at803x: remove unneeded patches - Remove the "RGMII TX delay fixup" hack and the associated DT-property. It was never used in a DT-based platform and solved a problem which can be mitigated by using correct delays on the MAC side. - Remove the patch to enable platform-data support for the at803x driver. It was only used by ar71xx which does not (and never will) support kernel 4.19 or later. - Remove the SmartEEE DT-configuration patch. As explained previously, this patch never disabled the Atheros SmartEEE implementation, but rather "standard" EEE. This can be done on device-tree compatible platforms by adding the "eee-broken-1000t" or "eee-broken-100tx" properties to the PHY node. As all usages of the old properties are migrated, this patch can be removed. Signed-off-by: David Bauer Acked-by: Christian Lamparter --- ...phy-at803x-allow-to-configure-via-dt.patch | 47 ------ ...-at803x-allow-to-configure-via-pdata.patch | 142 ------------------ ...phy-at803x-allow-to-configure-via-dt.patch | 47 ------ 3 files changed, 236 deletions(-) delete mode 100644 target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch delete mode 100644 target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch delete mode 100644 target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch diff --git a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch deleted file mode 100644 index 6bc626dd6a..0000000000 --- a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/drivers/net/phy/at803x.c -+++ b/drivers/net/phy/at803x.c -@@ -354,6 +354,14 @@ static int at803x_config_init(struct phy - AT803X_DEBUG_TX_CLK_DLY_EN, 0); - } - -+#ifdef CONFIG_OF_MDIO -+ if (phydev->mdio.dev.of_node && -+ of_property_read_bool(phydev->mdio.dev.of_node, -+ "at803x-disable-smarteee")) { -+ at803x_disable_smarteee(phydev); -+ } -+#endif -+ - return 0; - } - -@@ -392,6 +400,7 @@ static void at803x_link_change_notify(st - { - struct at803x_priv *priv = phydev->priv; - struct at803x_platform_data *pdata; -+ u8 fixup_rgmii_tx_delay = 0; - pdata = dev_get_platdata(&phydev->mdio.dev); - - /* -@@ -421,8 +430,19 @@ static void at803x_link_change_notify(st - } else { - priv->phy_reset = false; - } -- if (pdata && pdata->fixup_rgmii_tx_delay && -- phydev->speed != priv->prev_speed) { -+ -+ if (pdata && pdata->fixup_rgmii_tx_delay) -+ fixup_rgmii_tx_delay = 1; -+ -+#ifdef CONFIG_OF_MDIO -+ if (phydev->mdio.dev.of_node && -+ of_property_read_bool(phydev->mdio.dev.of_node, -+ "at803x-fixup-rgmii-tx-delay")) { -+ fixup_rgmii_tx_delay = 1; -+ } -+#endif -+ -+ if (fixup_rgmii_tx_delay && phydev->speed != priv->prev_speed) { - switch (phydev->speed) { - case SPEED_10: - case SPEED_100: diff --git a/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch deleted file mode 100644 index e56e77addf..0000000000 --- a/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Gabor Juhos -Subject: net: phy: allow to configure AR803x PHYs via platform data - -Add a patch for the at803x phy driver, in order to be able -to configure some register settings via platform data. - -Signed-off-by: Gabor Juhos ---- - drivers/net/phy/at803x.c | 56 ++++++++++++++++++++++++++++++++ - include/linux/platform_data/phy-at803x.h | 11 +++++++ - 2 files changed, 67 insertions(+) - create mode 100644 include/linux/platform_data/phy-at803x.h - ---- a/drivers/net/phy/at803x.c -+++ b/drivers/net/phy/at803x.c -@@ -12,12 +12,14 @@ - */ - - #include -+#include - #include - #include - #include - #include - #include - #include -+#include - - #define AT803X_INTR_ENABLE 0x12 - #define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15) -@@ -45,6 +47,11 @@ - #define AT803X_REG_CHIP_CONFIG 0x1f - #define AT803X_BT_BX_REG_SEL 0x8000 - -+#define AT803X_PCS_SMART_EEE_CTRL3 0x805D -+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3 -+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT 12 -+#define AT803X_SMART_EEE_CTRL3_LPI_EN BIT(8) -+ - #define AT803X_DEBUG_ADDR 0x1D - #define AT803X_DEBUG_DATA 0x1E - -@@ -73,6 +80,7 @@ MODULE_LICENSE("GPL"); - - struct at803x_priv { - bool phy_reset:1; -+ int prev_speed; - }; - - struct at803x_context { -@@ -249,8 +257,16 @@ static int at803x_probe(struct phy_devic - return 0; - } - -+static void at803x_disable_smarteee(struct phy_device *phydev) -+{ -+ phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3, -+ 1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT); -+ phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); -+} -+ - static int at803x_config_init(struct phy_device *phydev) - { -+ struct at803x_platform_data *pdata; - int ret; - - ret = genphy_config_init(phydev); -@@ -271,6 +287,26 @@ static int at803x_config_init(struct phy - return ret; - } - -+ pdata = dev_get_platdata(&phydev->mdio.dev); -+ if (pdata) { -+ if (pdata->disable_smarteee) -+ at803x_disable_smarteee(phydev); -+ -+ if (pdata->enable_rgmii_rx_delay) -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0, -+ AT803X_DEBUG_RX_CLK_DLY_EN); -+ else -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, -+ AT803X_DEBUG_RX_CLK_DLY_EN, 0); -+ -+ if (pdata->enable_rgmii_tx_delay) -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0, -+ AT803X_DEBUG_TX_CLK_DLY_EN); -+ else -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, -+ AT803X_DEBUG_TX_CLK_DLY_EN, 0); -+ } -+ - return 0; - } - -@@ -308,6 +344,8 @@ static int at803x_config_intr(struct phy - static void at803x_link_change_notify(struct phy_device *phydev) - { - struct at803x_priv *priv = phydev->priv; -+ struct at803x_platform_data *pdata; -+ pdata = dev_get_platdata(&phydev->mdio.dev); - - /* - * Conduct a hardware reset for AT8030/2 every time a link loss is -@@ -336,6 +374,24 @@ static void at803x_link_change_notify(st - } else { - priv->phy_reset = false; - } -+ if (pdata && pdata->fixup_rgmii_tx_delay && -+ phydev->speed != priv->prev_speed) { -+ switch (phydev->speed) { -+ case SPEED_10: -+ case SPEED_100: -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0, -+ AT803X_DEBUG_TX_CLK_DLY_EN); -+ break; -+ case SPEED_1000: -+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, -+ AT803X_DEBUG_TX_CLK_DLY_EN, 0); -+ break; -+ default: -+ break; -+ } -+ -+ priv->prev_speed = phydev->speed; -+ } - } - - static int at803x_aneg_done(struct phy_device *phydev) ---- /dev/null -+++ b/include/linux/platform_data/phy-at803x.h -@@ -0,0 +1,11 @@ -+#ifndef _PHY_AT803X_PDATA_H -+#define _PHY_AT803X_PDATA_H -+ -+struct at803x_platform_data { -+ int disable_smarteee:1; -+ int enable_rgmii_tx_delay:1; -+ int enable_rgmii_rx_delay:1; -+ int fixup_rgmii_tx_delay:1; -+}; -+ -+#endif /* _PHY_AT803X_PDATA_H */ diff --git a/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch deleted file mode 100644 index 496700f377..0000000000 --- a/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/drivers/net/phy/at803x.c -+++ b/drivers/net/phy/at803x.c -@@ -329,6 +329,14 @@ static int at803x_config_init(struct phy - AT803X_DEBUG_TX_CLK_DLY_EN, 0); - } - -+#ifdef CONFIG_OF_MDIO -+ if (phydev->mdio.dev.of_node && -+ of_property_read_bool(phydev->mdio.dev.of_node, -+ "at803x-disable-smarteee")) { -+ at803x_disable_smarteee(phydev); -+ } -+#endif -+ - return 0; - } - -@@ -367,6 +375,7 @@ static void at803x_link_change_notify(st - { - struct at803x_priv *priv = phydev->priv; - struct at803x_platform_data *pdata; -+ u8 fixup_rgmii_tx_delay = 0; - pdata = dev_get_platdata(&phydev->mdio.dev); - - /* -@@ -396,8 +405,19 @@ static void at803x_link_change_notify(st - } else { - priv->phy_reset = false; - } -- if (pdata && pdata->fixup_rgmii_tx_delay && -- phydev->speed != priv->prev_speed) { -+ -+ if (pdata && pdata->fixup_rgmii_tx_delay) -+ fixup_rgmii_tx_delay = 1; -+ -+#ifdef CONFIG_OF_MDIO -+ if (phydev->mdio.dev.of_node && -+ of_property_read_bool(phydev->mdio.dev.of_node, -+ "at803x-fixup-rgmii-tx-delay")) { -+ fixup_rgmii_tx_delay = 1; -+ } -+#endif -+ -+ if (fixup_rgmii_tx_delay && phydev->speed != priv->prev_speed) { - switch (phydev->speed) { - case SPEED_10: - case SPEED_100: From b2102be8a54ad14043035527d8ed33f4611f1553 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 16 Jan 2020 15:37:22 +0100 Subject: [PATCH 415/480] ar71xx: use dynamic partitioning for TP-Link TL-WA850RE v2 This moves the TP-Link TL-WA850RE v2 to dynamic partitioning and will allow to use this for ath79 as well. Signed-off-by: Adrian Schmutzler --- target/linux/ar71xx/image/tiny-tp-link.mk | 2 +- tools/firmware-utils/src/tplink-safeloader.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/target/linux/ar71xx/image/tiny-tp-link.mk b/target/linux/ar71xx/image/tiny-tp-link.mk index e738393caf..5874808d21 100644 --- a/target/linux/ar71xx/image/tiny-tp-link.mk +++ b/target/linux/ar71xx/image/tiny-tp-link.mk @@ -248,7 +248,7 @@ define Device/tl-wa850re-v2 TPLINK_HWID := 0x08500002 TPLINK_HWREV := 0 IMAGE_SIZE := 3648k - MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),2304k(rootfs),256k(config)ro,64k(art)ro,3648k@0x20000(firmware) + MTDPARTS := spi0.0:128k(u-boot)ro,3648k(firmware),256k(config)ro,64k(art)ro endef TARGET_DEVICES += tl-wa850re-v2 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 8749597617..43c4bafe00 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -1240,8 +1240,7 @@ static struct device_info boards[] = { */ .partitions = { {"fs-uboot", 0x00000, 0x20000}, - {"os-image", 0x20000, 0x150000}, - {"file-system", 0x170000, 0x240000}, + {"firmware", 0x20000, 0x390000}, {"partition-table", 0x3b0000, 0x02000}, {"default-mac", 0x3c0000, 0x00020}, {"pin", 0x3c0100, 0x00020}, From a66a1eb9c5f07095d8ed266b733b379bc9a8e8d4 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 16 Jan 2020 14:41:44 +0100 Subject: [PATCH 416/480] ath79: add support for TP-Link TL-WA850RE v2 TP-Link TL-WA850RE v2 is a wall-plug N300 Wi-Fi range extender, based on Qualcomm/Atheros QCA9533 v2. Short specification: - 550/391/195 MHz (CPU/DDR/AHB) - 1x 10/100 Mbps Ethernet - 32 MB of RAM (DDR1) - 4 MB of FLASH - 2T2R 2.4 GHz - 2x internal antennas (embedded on PCB) - 9x LED (all can be turned off with GPIO15), 2x button - UART (J3) header on PCB Flash instruction: use "factory" image directly in vendor GUI. Warning: this device does not include any kind of recovery mechanism in the bootloader and disassembling process is not trivial. You can access vendor firmware over serial line using: - login: root - password: sohoadmin Stock firmware uses label MAC address for WiFi and same with local bit set for ethernet. Since this is difficult to reproduce with the toolset of OpenWrt, we just keep both ethernet and WiFi to the same address here. This is the first tiny device with tplink-safeloader in ath79. Firmware partition is only 3648k and thus even smaller than for the tplink-4m(lzma) devices. Signed-off-by: Adrian Schmutzler --- .../dts/qca9533_tplink_tl-wa850re-v2.dts | 164 ++++++++++++++++++ target/linux/ath79/image/tiny-tp-link.mk | 14 ++ .../ath79/tiny/base-files/etc/board.d/01_leds | 3 +- .../tiny/base-files/etc/board.d/02_network | 1 + 4 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts new file mode 100644 index 0000000000..5236912047 --- /dev/null +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca953x.dtsi" + +/ { + compatible = "tplink,tl-wa850re-v2", "qca,qca9533"; + model = "TP-Link TL-WA850RE v2"; + + aliases { + led-boot = &led_re; + led-failsafe = &led_re; + led-running = &led_re; + led-upgrade = &led_re; + label-mac-device = &wmac; + }; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + pinctrl-names = "default"; + pinctrl-0 = <&jtag_disable_pins>; + + lan { + label = "tp-link:blue:lan"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + led_re: re { + label = "tp-link:blue:re"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + signal1 { + label = "tp-link:blue:signal1"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + }; + + signal2 { + label = "tp-link:blue:signal2"; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + }; + + signal3 { + label = "tp-link:blue:signal3"; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + }; + + signal4 { + label = "tp-link:blue:signal4"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + + led_signal5: signal5 { + label = "tp-link:blue:signal5"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "tp-link:blue:wlan"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset button"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "WPS button"; + linux,code = ; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&gpio { + led_enable { + gpio-hog; + gpios = <15 GPIO_ACTIVE_HIGH>; + line-name = "tp-link:power:led"; + output-high; + }; +}; + +&uart { + status = "okay"; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x020000>; + read-only; + }; + + partition@20000 { + label = "firmware"; + reg = <0x020000 0x390000>; + compatible = "tplink,firmware"; + }; + + config: partition@3b0000 { + label = "config"; + reg = <0x3b0000 0x040000>; + read-only; + }; + + art: partition@3f0000 { + label = "art"; + reg = <0x3f0000 0x010000>; + read-only; + }; + }; + }; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&config 0x10008>; +}; + +ð0 { + status = "okay"; + + phy-handle = <&swphy4>; + + mtd-mac-address = <&config 0x10008>; +}; + +ð1 { + compatible = "syscon", "simple-mfd"; +}; diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 3c15f843a9..e5208530d6 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -77,6 +77,20 @@ define Device/tplink_tl-wa850re-v1 endef TARGET_DEVICES += tplink_tl-wa850re-v1 +define Device/tplink_tl-wa850re-v2 + $(Device/tplink-safeloader) + SOC := qca9533 + IMAGE_SIZE := 3648k + DEVICE_MODEL := TL-WA850RE + DEVICE_VARIANT := v2 + TPLINK_BOARD_ID := TLWA850REV2 + TPLINK_HWID := 0x08500002 + TPLINK_HWREV := 0x0 + DEVICE_PACKAGES := rssileds + SUPPORTED_DEVICES += tl-wa850re-v2 +endef +TARGET_DEVICES += tplink_tl-wa850re-v2 + define Device/tplink_tl-wa901nd-v2 $(Device/tplink-4m) SOC := ar9132 diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds index 32c99304aa..75de6f3aad 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds @@ -54,7 +54,8 @@ tplink,tl-wr841-v8) ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10" ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" ;; -tplink,tl-wa850re-v1) +tplink,tl-wa850re-v1|\ +tplink,tl-wa850re-v2) ucidef_set_led_netdev "lan" "LAN" "tp-link:blue:lan" "eth0" ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:blue:signal1" "wlan0" "1" "100" diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network index 114c19b48a..56200de59e 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network +++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network @@ -33,6 +33,7 @@ ath79_setup_interfaces() tplink,tl-mr3020-v1|\ tplink,tl-mr3040-v2|\ tplink,tl-wa850re-v1|\ + tplink,tl-wa850re-v2|\ tplink,tl-wa901nd-v2|\ tplink,tl-wr703n) ucidef_set_interface_lan "eth0" From 2c1cfacddedc82c7a34eeb2a26529a5f3ab423d8 Mon Sep 17 00:00:00 2001 From: Kimmo Vuorinen Date: Wed, 22 Jan 2020 23:38:35 +0200 Subject: [PATCH 417/480] ar71xx: change u-boot-env to read-write for gl-ar150/-domino/mifi Change u-boot-env partitions to be mounted as read-write for gl-ar150, gl-domino and gl-mifi so uboot-envtools support is possible. Signed-off-by: Kimmo Vuorinen [commit title/message facelift] Signed-off-by: Adrian Schmutzler --- target/linux/ar71xx/image/generic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 8f495f54b8..5098650ec7 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -462,7 +462,7 @@ define Device/gl-ar150 BOARDNAME := GL-AR150 IMAGE_SIZE := 16000k CONSOLE := ttyATH0,115200 - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-ar150 @@ -516,7 +516,7 @@ define Device/gl-domino BOARDNAME := DOMINO IMAGE_SIZE := 16000k CONSOLE := ttyATH0,115200 - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-domino @@ -526,7 +526,7 @@ define Device/gl-mifi BOARDNAME := GL-MIFI IMAGE_SIZE := 16000k CONSOLE := ttyATH0,115200 - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-mifi From dc6dfaac80f392baef1d0d7b06bb1fc19812e041 Mon Sep 17 00:00:00 2001 From: Kimmo Vuorinen Date: Wed, 22 Jan 2020 23:34:58 +0200 Subject: [PATCH 418/480] uboot-envtools: ar71xx: add support for gl-ar150/-domino/-mifi Add ubootenv uci config for gl-ar150, gl-domino and gl-mifi Signed-off-by: Kimmo Vuorinen [commit message/title facelift] Signed-off-by: Adrian Schmutzler --- package/boot/uboot-envtools/files/ar71xx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx index bc415e3b8c..9625c6bdd1 100644 --- a/package/boot/uboot-envtools/files/ar71xx +++ b/package/boot/uboot-envtools/files/ar71xx @@ -85,6 +85,11 @@ dr342|\ dr531) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0xf800" "0x10000" ;; +gl-ar150|\ +gl-domino|\ +gl-mifi) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000" + ;; rambutan) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000" ubootenv_add_uci_config "/dev/mtd1" "0x100000" "0x20000" "0x20000" From a8723c48add5cc8381d88234b9cdda2bb6a866aa Mon Sep 17 00:00:00 2001 From: Kimmo Vuorinen Date: Wed, 22 Jan 2020 23:36:26 +0200 Subject: [PATCH 419/480] uboot-envtools: ath79: add support for glinet,gl-ar150 Add ubootenv uci config for GL.inet GL-AR150 Signed-off-by: Kimmo Vuorinen [commit title/message facelift] Signed-off-by: Adrian Schmutzler --- package/boot/uboot-envtools/files/ath79 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index aafced98db..50e1c80073 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -44,6 +44,9 @@ yuncore,xd4200) buffalo,wzr-hp-ag300h) ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000" ;; +glinet,gl-ar150) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000" + ;; netgear,wndr3700) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x10000" ;; From d0d8584b4187da38b484da3290fbb23ca472abad Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 23 Jan 2020 14:21:19 +0100 Subject: [PATCH 420/480] sunxi: tidy up and sort alphabetically in image Makefiles This tidies up the image Makefiles for the sunxi target by: - Move the if-condition for the subtarget to the parent Makefile - Remove lots of unnecessary empty lines - Sort device definitions alphabetically - Harmonize line wrapping for DEVICE_PACKAGES Signed-off-by: Adrian Schmutzler --- target/linux/sunxi/image/Makefile | 8 + target/linux/sunxi/image/cortex-a53.mk | 28 +-- target/linux/sunxi/image/cortex-a7.mk | 259 ++++++++++--------------- target/linux/sunxi/image/cortex-a8.mk | 63 +++--- 4 files changed, 148 insertions(+), 210 deletions(-) diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 888c1c5a9b..705d409ac5 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -42,8 +42,16 @@ define Device/Default SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1))) endef +ifeq ($(SUBTARGET),cortexa7) include cortex-a7.mk +endif + +ifeq ($(SUBTARGET),cortexa8) include cortex-a8.mk +endif + +ifeq ($(SUBTARGET),cortexa53) include cortex-a53.mk +endif $(eval $(call BuildImage)) diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index ac82138938..eeaaa887d7 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -5,7 +5,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa53) define Device/friendlyarm_nanopi-neo-plus2 DEVICE_VENDOR := FriendlyARM @@ -16,7 +15,6 @@ define Device/friendlyarm_nanopi-neo-plus2 KERNEL_NAME := Image KERNEL := kernel-bin endef - TARGET_DEVICES += friendlyarm_nanopi-neo-plus2 define Device/friendlyarm_nanopi-neo2 @@ -28,7 +26,6 @@ define Device/friendlyarm_nanopi-neo2 KERNEL_NAME := Image KERNEL := kernel-bin endef - TARGET_DEVICES += friendlyarm_nanopi-neo2 define Device/pine64_pine64-plus @@ -39,7 +36,6 @@ define Device/pine64_pine64-plus KERNEL_NAME := Image KERNEL := kernel-bin endef - TARGET_DEVICES += pine64_pine64-plus define Device/pine64_sopine-baseboard @@ -50,21 +46,8 @@ define Device/pine64_sopine-baseboard KERNEL_NAME := Image KERNEL := kernel-bin endef - TARGET_DEVICES += pine64_sopine-baseboard - -define Device/xunlong_orangepi-zero-plus - DEVICE_VENDOR := Xunlong - DEVICE_MODEL := Orange Pi Zero Plus - SUNXI_DTS_DIR := allwinner/ - SOC := sun50i-h5 - KERNEL_NAME := Image - KERNEL := kernel-bin -endef - -TARGET_DEVICES += xunlong_orangepi-zero-plus - define Device/xunlong_orangepi-pc2 DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi PC 2 @@ -73,7 +56,14 @@ define Device/xunlong_orangepi-pc2 KERNEL_NAME := Image KERNEL := kernel-bin endef - TARGET_DEVICES += xunlong_orangepi-pc2 -endif +define Device/xunlong_orangepi-zero-plus + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi Zero Plus + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-h5 + KERNEL_NAME := Image + KERNEL := kernel-bin +endef +TARGET_DEVICES += xunlong_orangepi-zero-plus diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index 3dad8b19b4..cc67f4dd62 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -6,7 +6,95 @@ # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa7) +define Device/cubietech_cubieboard2 + DEVICE_VENDOR := Cubietech + DEVICE_MODEL := Cubieboard2 + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi + SOC := sun7i-a20 +endef +TARGET_DEVICES += cubietech_cubieboard2 + +define Device/cubietech_cubietruck + DEVICE_VENDOR := Cubietech + DEVICE_MODEL := Cubietruck + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac + SOC := sun7i-a20 +endef +TARGET_DEVICES += cubietech_cubietruck + +define Device/friendlyarm_nanopi-m1-plus + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi M1 Plus + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ + kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic + SOC := sun8i-h3 +endef +TARGET_DEVICES += friendlyarm_nanopi-m1-plus + +define Device/friendlyarm_nanopi-neo + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO + SOC := sun8i-h3 +endef +TARGET_DEVICES += friendlyarm_nanopi-neo + +define Device/friendlyarm_nanopi-neo-air + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO Air + DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ + kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic + SOC := sun8i-h3 +endef +TARGET_DEVICES += friendlyarm_nanopi-neo-air + +define Device/lamobo_lamobo-r1 + DEVICE_VENDOR := Lamobo + DEVICE_MODEL := Lamobo R1 + DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic + SOC := sun7i-a20 +endef +TARGET_DEVICES += lamobo_lamobo-r1 + +define Device/lemaker_bananapi + DEVICE_VENDOR := LeMaker + DEVICE_MODEL := Banana Pi + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi + SOC := sun7i-a20 +endef +TARGET_DEVICES += lemaker_bananapi + +define Device/lemaker_bananapi-m2-ultra + DEVICE_VENDOR := LeMaker + DEVICE_MODEL := Banana Pi M2 Ultra + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi + SOC := sun8i-r40 +endef +TARGET_DEVICES += lemaker_bananapi-m2-ultra + +define Device/lemaker_bananapro + DEVICE_VENDOR := LeMaker + DEVICE_MODEL := Banana Pro + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac + SOC := sun7i-a20 +endef +TARGET_DEVICES += lemaker_bananapro + +define Device/linksprite_pcduino3 + DEVICE_VENDOR := LinkSprite + DEVICE_MODEL := pcDuino3 + DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi \ + kmod-rtl8xxxu rtl8188eu-firmware + SOC := sun7i-a20 +endef +TARGET_DEVICES += linksprite_pcduino3 + +define Device/mele_m9 + DEVICE_VENDOR := Mele + DEVICE_MODEL := M9 + DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu + SOC := sun6i-a31 +endef +TARGET_DEVICES += mele_m9 define Device/olimex_a20-olinuxino-lime DEVICE_VENDOR := Olimex @@ -14,20 +102,16 @@ define Device/olimex_a20-olinuxino-lime DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi SOC := sun7i endef - TARGET_DEVICES += olimex_a20-olinuxino-lime - define Device/olimex_a20-olinuxino-lime2 DEVICE_VENDOR := Olimex DEVICE_MODEL := A20-OLinuXino-LIME2 DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid SOC := sun7i endef - TARGET_DEVICES += olimex_a20-olinuxino-lime2 - define Device/olimex_a20-olinuxino-lime2-emmc DEVICE_VENDOR := Olimex DEVICE_MODEL := A20-OLinuXino-LIME2 @@ -35,208 +119,77 @@ define Device/olimex_a20-olinuxino-lime2-emmc DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid SOC := sun7i endef - TARGET_DEVICES += olimex_a20-olinuxino-lime2-emmc - define Device/olimex_a20-olinuxino-micro DEVICE_VENDOR := Olimex DEVICE_MODEL := A20-OLinuXino-MICRO DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi SOC := sun7i endef - TARGET_DEVICES += olimex_a20-olinuxino-micro - -define Device/lemaker_bananapi - DEVICE_VENDOR := LeMaker - DEVICE_MODEL := Banana Pi - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi - SOC := sun7i-a20 -endef - -TARGET_DEVICES += lemaker_bananapi - - -define Device/lemaker_bananapro - DEVICE_VENDOR := LeMaker - DEVICE_MODEL := Banana Pro - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac - SOC := sun7i-a20 -endef - -TARGET_DEVICES += lemaker_bananapro - - -define Device/cubietech_cubieboard2 - DEVICE_VENDOR := Cubietech - DEVICE_MODEL := Cubieboard2 - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SOC := sun7i-a20 -endef - -TARGET_DEVICES += cubietech_cubieboard2 - - -define Device/cubietech_cubietruck - DEVICE_VENDOR := Cubietech - DEVICE_MODEL := Cubietruck - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac - SOC := sun7i-a20 -endef - -TARGET_DEVICES += cubietech_cubietruck - - -define Device/lamobo_lamobo-r1 - DEVICE_VENDOR := Lamobo - DEVICE_MODEL := Lamobo R1 - DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic - SOC := sun7i-a20 -endef - -TARGET_DEVICES += lamobo_lamobo-r1 - - -define Device/mele_m9 - DEVICE_VENDOR := Mele - DEVICE_MODEL := M9 - DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu - SOC := sun6i-a31 -endef - -TARGET_DEVICES += mele_m9 - - -define Device/xunlong_orangepi-zero - DEVICE_VENDOR := Xunlong - DEVICE_MODEL := Orange Pi Zero - DEVICE_PACKAGES:=kmod-rtc-sunxi - SOC := sun8i-h2-plus -endef - -TARGET_DEVICES += xunlong_orangepi-zero - - -define Device/xunlong_orangepi-r1 - DEVICE_VENDOR := Xunlong - DEVICE_MODEL := Orange Pi R1 - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152 - SOC := sun8i-h2-plus -endef - -TARGET_DEVICES += xunlong_orangepi-r1 - define Device/sinovoip_bananapi-m2-plus DEVICE_VENDOR := Sinovoip DEVICE_MODEL := Banana Pi M2+ - DEVICE_PACKAGES:=kmod-rtc-sunxi \ - kmod-leds-gpio kmod-ledtrig-heartbeat \ + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic SOC := sun8i-h3 endef - TARGET_DEVICES += sinovoip_bananapi-m2-plus -define Device/friendlyarm_nanopi-m1-plus - DEVICE_VENDOR := FriendlyARM - DEVICE_MODEL := NanoPi M1 Plus - DEVICE_PACKAGES:=kmod-rtc-sunxi \ - kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic - SOC := sun8i-h3 -endef - -TARGET_DEVICES += friendlyarm_nanopi-m1-plus - - -define Device/friendlyarm_nanopi-neo - DEVICE_VENDOR := FriendlyARM - DEVICE_MODEL := NanoPi NEO - SOC := sun8i-h3 -endef - -TARGET_DEVICES += friendlyarm_nanopi-neo - - -define Device/friendlyarm_nanopi-neo-air - DEVICE_VENDOR := FriendlyARM - DEVICE_MODEL := NanoPi NEO Air - DEVICE_PACKAGES := kmod-rtc-sunxi \ - kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic - SOC := sun8i-h3 -endef - -TARGET_DEVICES += friendlyarm_nanopi-neo-air - - define Device/xunlong_orangepi-one DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi One DEVICE_PACKAGES:=kmod-rtc-sunxi SOC := sun8i-h3 endef - TARGET_DEVICES += xunlong_orangepi-one - define Device/xunlong_orangepi-pc DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi PC DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug SOC := sun8i-h3 endef - TARGET_DEVICES += xunlong_orangepi-pc - define Device/xunlong_orangepi-pc-plus DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi PC Plus DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug SOC := sun8i-h3 endef - TARGET_DEVICES += xunlong_orangepi-pc-plus - define Device/xunlong_orangepi-plus DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi Plus DEVICE_PACKAGES:=kmod-rtc-sunxi SOC := sun8i-h3 endef - TARGET_DEVICES += xunlong_orangepi-plus +define Device/xunlong_orangepi-r1 + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi R1 + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152 + SOC := sun8i-h2-plus +endef +TARGET_DEVICES += xunlong_orangepi-r1 + +define Device/xunlong_orangepi-zero + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi Zero + DEVICE_PACKAGES:=kmod-rtc-sunxi + SOC := sun8i-h2-plus +endef +TARGET_DEVICES += xunlong_orangepi-zero + define Device/xunlong_orangepi-2 DEVICE_VENDOR := Xunlong DEVICE_MODEL := Orange Pi 2 DEVICE_PACKAGES:=kmod-rtc-sunxi SOC := sun8i-h3 endef - TARGET_DEVICES += xunlong_orangepi-2 - - -define Device/linksprite_pcduino3 - DEVICE_VENDOR := LinkSprite - DEVICE_MODEL := pcDuino3 - DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-rtl8xxxu rtl8188eu-firmware - SOC := sun7i-a20 -endef - -TARGET_DEVICES += linksprite_pcduino3 - -define Device/lemaker_bananapi-m2-ultra - DEVICE_VENDOR := LeMaker - DEVICE_MODEL := Banana Pi M2 Ultra - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi - SOC := sun8i-r40 -endef - -TARGET_DEVICES += lemaker_bananapi-m2-ultra - -endif diff --git a/target/linux/sunxi/image/cortex-a8.mk b/target/linux/sunxi/image/cortex-a8.mk index fdebfa716c..de10d5d6cc 100644 --- a/target/linux/sunxi/image/cortex-a8.mk +++ b/target/linux/sunxi/image/cortex-a8.mk @@ -5,7 +5,31 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa8) + +define Device/cubietech_a10-cubieboard + DEVICE_VENDOR := Cubietech + DEVICE_MODEL := Cubieboard + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi + SOC := sun4i +endef +TARGET_DEVICES += cubietech_a10-cubieboard + +define Device/linksprite_a10-pcduino + DEVICE_VENDOR := LinkSprite + DEVICE_MODEL := pcDuino + DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu + SOC := sun4i +endef +TARGET_DEVICES += linksprite_a10-pcduino + +define Device/marsboard_a10-marsboard + DEVICE_VENDOR := HAOYU Electronics + DEVICE_MODEL := MarsBoard A10 + DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi \ + sound-soc-sunxi + SOC := sun4i +endef +TARGET_DEVICES += marsboard_a10-marsboard define Device/olimex_a10-olinuxino-lime DEVICE_VENDOR := Olimex @@ -13,10 +37,8 @@ define Device/olimex_a10-olinuxino-lime DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi SOC := sun4i endef - TARGET_DEVICES += olimex_a10-olinuxino-lime - define Device/olimex_a13-olimex-som DEVICE_VENDOR := Olimex DEVICE_MODEL := A13-SOM @@ -25,47 +47,12 @@ define Device/olimex_a13-olimex-som SOC := sun5i-a13 SUNXI_DTS := sun5i-a13-olinuxino endef - TARGET_DEVICES += olimex_a13-olimex-som - define Device/olimex_a13-olinuxino DEVICE_VENDOR := Olimex DEVICE_MODEL := A13-OLinuXino DEVICE_PACKAGES:=kmod-rtl8192cu SOC := sun5i endef - TARGET_DEVICES += olimex_a13-olinuxino - - -define Device/cubietech_a10-cubieboard - DEVICE_VENDOR := Cubietech - DEVICE_MODEL := Cubieboard - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SOC := sun4i -endef - -TARGET_DEVICES += cubietech_a10-cubieboard - - -define Device/linksprite_a10-pcduino - DEVICE_VENDOR := LinkSprite - DEVICE_MODEL := pcDuino - DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu - SOC := sun4i -endef - -TARGET_DEVICES += linksprite_a10-pcduino - - -define Device/marsboard_a10-marsboard - DEVICE_VENDOR := HAOYU Electronics - DEVICE_MODEL := MarsBoard A10 - DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi sound-soc-sunxi - SOC := sun4i -endef - -TARGET_DEVICES += marsboard_a10-marsboard - -endif From 6fe31abc5a466f533547d91aed6b747cd3c44efe Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:21:15 +0100 Subject: [PATCH 421/480] kirkwood: exploit BOARD_NAME to set DEVICE_DTS and SUPPORTED_DEVICES Due to the history of the target, all devices added before a certain point have the same device string in BOARD_NAME, DEVICE_DTS and added to SUPPORTED_DEVICES. Thus, we can set this one automatically for all devices where BOARD_NAME is specified, removing the explicit DEVICE_DTS and SUPPORTED_DEVICES addition there. For new devices, nothing has changed, and just DEVICE_DTS has to be set manually. Signed-off-by: Adrian Schmutzler --- target/linux/kirkwood/image/Makefile | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 7b59b69c1d..9c5681901c 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -12,6 +12,7 @@ KERNEL_LOADADDR:=0x8000 define Device/Default PROFILES := Default + DEVICE_DTS = $$(if $$(BOARD_NAME),kirkwood-$$(BOARD_NAME),) KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL := kernel-bin | append-dtb | uImage none KERNEL_NAME := zImage @@ -24,13 +25,12 @@ define Device/Default IMAGES := sysupgrade.bin factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-ubi - SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) $$(BOARD_NAME) endef define Device/cisco_on100 DEVICE_VENDOR := Cisco Systems DEVICE_MODEL := ON100 - DEVICE_DTS := kirkwood-on100 DEVICE_PACKAGES := kmod-i2c-mv64xxx KERNEL_SIZE := 5376k KERNEL_IN_UBI := @@ -43,9 +43,7 @@ TARGET_DEVICES += cisco_on100 define Device/cloudengines_pogoe02 DEVICE_VENDOR := Cloud Engines DEVICE_MODEL := Pogoplug E02 - DEVICE_DTS := kirkwood-pogo_e02 BOARD_NAME := pogo_e02 - SUPPORTED_DEVICES += pogo_e02 endef TARGET_DEVICES += cloudengines_pogoe02 @@ -60,9 +58,7 @@ TARGET_DEVICES += cloudengines_pogoplugv4 define Device/iom_iconnect-1.1 DEVICE_VENDOR := Iomega DEVICE_MODEL := Iconnect - DEVICE_DTS := kirkwood-iconnect BOARD_NAME := iconnect - SUPPORTED_DEVICES += iconnect endef TARGET_DEVICES += iom_iconnect-1.1 @@ -87,7 +83,6 @@ define Device/linksys_audi DEVICE_VENDOR := Linksys DEVICE_MODEL := EA3500 (Audi) DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug - DEVICE_DTS := kirkwood-linksys-audi PAGESIZE := 512 SUBPAGESIZE := 256 BLOCKSIZE := 16KiB @@ -96,7 +91,6 @@ define Device/linksys_audi UBINIZE_OPTS := -E 5 IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi BOARD_NAME := linksys-audi - SUPPORTED_DEVICES += linksys-audi endef TARGET_DEVICES += linksys_audi @@ -104,56 +98,45 @@ define Device/linksys_viper DEVICE_VENDOR := Linksys DEVICE_MODEL := E4200v2 / EA4500 (Viper) DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug - DEVICE_DTS := kirkwood-linksys-viper KERNEL_SIZE := 2688k KERNEL_IN_UBI := UBINIZE_OPTS := -E 5 IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi BOARD_NAME := linksys-viper - SUPPORTED_DEVICES += linksys-viper endef TARGET_DEVICES += linksys_viper define Device/raidsonic_ib-nas62x0 DEVICE_VENDOR := RaidSonic DEVICE_MODEL := ICY BOX IB-NAS62x0 - DEVICE_DTS := kirkwood-ib62x0 BOARD_NAME := ib62x0 - SUPPORTED_DEVICES += ib62x0 endef TARGET_DEVICES += raidsonic_ib-nas62x0 define Device/seagate_dockstar DEVICE_VENDOR := Seagate DEVICE_MODEL := FreeAgent Dockstar - DEVICE_DTS := kirkwood-dockstar BOARD_NAME := dockstar - SUPPORTED_DEVICES += dockstar endef TARGET_DEVICES += seagate_dockstar define Device/seagate_goflexnet DEVICE_VENDOR := Seagate DEVICE_MODEL := GoFlexNet - DEVICE_DTS := kirkwood-goflexnet BOARD_NAME := goflexnet - SUPPORTED_DEVICES += goflexnet endef TARGET_DEVICES += seagate_goflexnet define Device/seagate_goflexhome DEVICE_VENDOR := Seagate DEVICE_MODEL := GoFlexHome - DEVICE_DTS := kirkwood-goflexhome BOARD_NAME := goflexhome - SUPPORTED_DEVICES += goflexhome endef TARGET_DEVICES += seagate_goflexhome define Device/zyxel_nsa310b DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NSA310b - DEVICE_DTS := kirkwood-nsa310b DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85 BOARD_NAME := nsa310b endef @@ -163,7 +146,6 @@ define Device/zyxel_nsa325 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NSA325 DEVICE_VARIANT := v1/v2 - DEVICE_DTS := kirkwood-nsa325 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-rtc-pcf8563 kmod-usb3 BOARD_NAME := nsa325 endef From c07f6e8659ea1348c75c04dac2924616f0042293 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 23 Jan 2020 14:51:58 +0100 Subject: [PATCH 422/480] hostapd: fix faulty WMM IE parameters with ETSI regulatory domains hostapd sets minimum values for CWmin/CWmax/AIFS and maximum for TXOP. The code for applying those values had a few bugs leading to bogus values, which caused significant latency and packet loss. Signed-off-by: Felix Fietkau --- ...ix-WMM-queue-mapping-for-regulatory-.patch | 41 ++++++++++++++++ ...ix-regulatory-limits-for-wmm-cwmin-c.patch | 47 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch create mode 100644 package/network/services/hostapd/patches/071-driver_nl80211-fix-regulatory-limits-for-wmm-cwmin-c.patch diff --git a/package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch b/package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch new file mode 100644 index 0000000000..240411236a --- /dev/null +++ b/package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch @@ -0,0 +1,41 @@ +From: Felix Fietkau +Date: Thu, 23 Jan 2020 13:50:47 +0100 +Subject: [PATCH] driver_nl80211: fix WMM queue mapping for regulatory + limit + +nl80211 uses a different queue mapping from hostap, so AC indexes need to +be converted. + +Signed-off-by: Felix Fietkau +--- + +--- a/src/drivers/driver_nl80211_capa.c ++++ b/src/drivers/driver_nl80211_capa.c +@@ -1403,6 +1403,12 @@ static void phy_info_freq(struct hostapd + [NL80211_WMMR_AIFSN] = { .type = NLA_U8 }, + [NL80211_WMMR_TXOP] = { .type = NLA_U16 }, + }; ++ static const u8 wmm_map[4] = { ++ [NL80211_AC_BE] = WMM_AC_BE, ++ [NL80211_AC_BK] = WMM_AC_BK, ++ [NL80211_AC_VI] = WMM_AC_VI, ++ [NL80211_AC_VO] = WMM_AC_VO, ++ }; + struct nlattr *nl_wmm; + struct nlattr *tb_wmm[NL80211_WMMR_MAX + 1]; + int rem_wmm, ac, count = 0; +@@ -1424,12 +1430,13 @@ static void phy_info_freq(struct hostapd + return; + } + ac = nl_wmm->nla_type; +- if (ac < 0 || ac >= WMM_AC_NUM) { ++ if (ac >= ARRAY_SIZE(wmm_map)) { + wpa_printf(MSG_DEBUG, + "nl80211: Invalid AC value %d", ac); + return; + } + ++ ac = wmm_map[ac]; + chan->wmm_rules[ac].min_cwmin = + nla_get_u16(tb_wmm[NL80211_WMMR_CW_MIN]); + chan->wmm_rules[ac].min_cwmax = diff --git a/package/network/services/hostapd/patches/071-driver_nl80211-fix-regulatory-limits-for-wmm-cwmin-c.patch b/package/network/services/hostapd/patches/071-driver_nl80211-fix-regulatory-limits-for-wmm-cwmin-c.patch new file mode 100644 index 0000000000..fe41e2b788 --- /dev/null +++ b/package/network/services/hostapd/patches/071-driver_nl80211-fix-regulatory-limits-for-wmm-cwmin-c.patch @@ -0,0 +1,47 @@ +From: Felix Fietkau +Date: Thu, 23 Jan 2020 14:10:20 +0100 +Subject: [PATCH] driver_nl80211: fix regulatory limits for wmm cwmin/cwmax + values + +The internal WMM AC parameters use just the exponent of the CW value, while +nl80211 reports the full CW value. +This led to completely bogus CWmin/CWmax values in the WMM IE when a regulatory +limit was present. Fix this by converting the value to the exponent before +passing it on + +Signed-off-by: Felix Fietkau +--- + +--- a/src/drivers/driver_nl80211_capa.c ++++ b/src/drivers/driver_nl80211_capa.c +@@ -1336,6 +1336,18 @@ static void phy_info_vht_capa(struct hos + } + } + ++static inline int cw2ecw(unsigned int cw) ++{ ++ int bit; ++ ++ if (cw == 0) ++ return 0; ++ ++ for (bit = 1; cw != 1; bit++) ++ cw >>= 1; ++ ++ return bit; ++} + + static void phy_info_freq(struct hostapd_hw_modes *mode, + struct hostapd_channel_data *chan, +@@ -1438,9 +1450,9 @@ static void phy_info_freq(struct hostapd + + ac = wmm_map[ac]; + chan->wmm_rules[ac].min_cwmin = +- nla_get_u16(tb_wmm[NL80211_WMMR_CW_MIN]); ++ cw2ecw(nla_get_u16(tb_wmm[NL80211_WMMR_CW_MIN])); + chan->wmm_rules[ac].min_cwmax = +- nla_get_u16(tb_wmm[NL80211_WMMR_CW_MAX]); ++ cw2ecw(nla_get_u16(tb_wmm[NL80211_WMMR_CW_MAX])); + chan->wmm_rules[ac].min_aifs = + nla_get_u8(tb_wmm[NL80211_WMMR_AIFSN]); + chan->wmm_rules[ac].max_txop = From 51526bcf1e4f67dae8d6d0266dd6b740cb3ae364 Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Thu, 28 Nov 2019 13:11:59 +0100 Subject: [PATCH 423/480] rbcfg: make package available for ath79 Signed-off-by: Roger Pueyo Centelles --- package/boot/rbcfg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boot/rbcfg/Makefile b/package/boot/rbcfg/Makefile index 9d9b97524a..55e0ea7490 100644 --- a/package/boot/rbcfg/Makefile +++ b/package/boot/rbcfg/Makefile @@ -21,7 +21,7 @@ define Package/rbcfg CATEGORY:=Utilities SUBMENU:=Boot Loaders TITLE:=RouterBOOT configuration tool - DEPENDS:=@TARGET_ar71xx + DEPENDS:=@(TARGET_ar71xx||TARGET_ath79) endef define Package/rbcfg/description From ba730d61af3b860e5d5a086a318a6c2a84e68c9c Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Thu, 28 Nov 2019 13:23:34 +0100 Subject: [PATCH 424/480] rbextract: add package This utility extracts the radio calibration data, as well as other board-related information (model, serial number, etc.), from MikroTik Routerboard devices' flash. Signed-off-by: Roger Pueyo Centelles Acked-by: Koen Vandeputte --- package/utils/rbextract/Makefile | 37 ++ package/utils/rbextract/src/CMakeLists.txt | 14 + package/utils/rbextract/src/rbextract.c | 457 +++++++++++++++++++++ package/utils/rbextract/src/rle.c | 80 ++++ package/utils/rbextract/src/rle.h | 8 + package/utils/rbextract/src/routerboot.h | 258 ++++++++++++ 6 files changed, 854 insertions(+) create mode 100644 package/utils/rbextract/Makefile create mode 100644 package/utils/rbextract/src/CMakeLists.txt create mode 100644 package/utils/rbextract/src/rbextract.c create mode 100644 package/utils/rbextract/src/rle.c create mode 100644 package/utils/rbextract/src/rle.h create mode 100644 package/utils/rbextract/src/routerboot.h diff --git a/package/utils/rbextract/Makefile b/package/utils/rbextract/Makefile new file mode 100644 index 0000000000..b055a615cf --- /dev/null +++ b/package/utils/rbextract/Makefile @@ -0,0 +1,37 @@ +# +# Copyright (C) 2010 Gabor Juhos +# Copyright (C) 2018 Chris Schimp +# Copyright (C) 2019 Robert Marko +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=rbextract +PKG_RELEASE:=1 +CMAKE_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/rbextract + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Boot Loaders + TITLE:=RouterBOOT ART Extractor + DEPENDS:=@TARGET_ath79 +liblzo +endef + +define Package/rbextract/description + This utility is for extracting the WLAN radio calibration data from Mikrotik + Routerboards. +endef + +define Package/rbextract/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rbextract $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,rbextract)) diff --git a/package/utils/rbextract/src/CMakeLists.txt b/package/utils/rbextract/src/CMakeLists.txt new file mode 100644 index 0000000000..0ed5168fb0 --- /dev/null +++ b/package/utils/rbextract/src/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 2.6) + +PROJECT(rbextract C) +ADD_DEFINITIONS(-Wall --std=gnu99 -Wmissing-declarations) + +SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") + +FIND_PATH(lzo_include_dir lzo/lzo1x.h) +INCLUDE_DIRECTORIES(${lzo_include_dir}) + +ADD_EXECUTABLE(rbextract rbextract.c rle.c) +TARGET_LINK_LIBRARIES(rbextract lzo2) + +INSTALL(TARGETS rbextract RUNTIME DESTINATION sbin) diff --git a/package/utils/rbextract/src/rbextract.c b/package/utils/rbextract/src/rbextract.c new file mode 100644 index 0000000000..0985497f3f --- /dev/null +++ b/package/utils/rbextract/src/rbextract.c @@ -0,0 +1,457 @@ +/* + * RouterBoot helper routines + * + * Copyright (C) 2012 Gabor Juhos + * Copyright (C) 2018 Chris Schimp + * Copyright (C) 2019 Robert Marko + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "rle.h" +#include "routerboot.h" + +inline uint32_t +get_u32(const void *buf) +{ +#if __BYTE_ORDER == __LITTLE_ENDIAN + return *(uint32_t *)buf; +#elif __BYTE_ORDER == __BIG_ENDIAN + const uint8_t *p = buf; + return ((uint32_t) p[3] + ((uint32_t) p[2] << 8) + + ((uint32_t) p[1] << 16) + ((uint32_t) p[0] << 24)); +#else +#error "Unknown byte order!" +#endif +} + +int +routerboot_find_tag(uint8_t *buf, unsigned int buflen, uint16_t tag_id, + uint8_t **tag_data, uint16_t *tag_len) +{ + uint16_t id; + uint16_t len; + uint32_t magic; + bool align = false; + int ret; + + if (buflen < 4) + return 1; + + magic = get_u32(buf); + + switch (magic) { + case RB_MAGIC_LZOR: + buf += 4; + buflen -= 4; + break; + case RB_MAGIC_ERD: + align = true; + /* fall trough */ + case RB_MAGIC_HARD: + /* skip magic value */ + buf += 4; + buflen -= 4; + break; + + case RB_MAGIC_SOFT: + if (buflen < 8) + return 1; + + /* skip magic and CRC value */ + buf += 8; + buflen -= 8; + + break; + + default: + return 1; + } + + ret = 1; + while (buflen > 4){ + uint32_t id_and_len = get_u32(buf); + buf += 4; + buflen -= 4; + id = id_and_len & 0xFFFF; + len = id_and_len >> 16; + + if (align) + len += (4 - len % 4) % 4; + + if (id == RB_ID_TERMINATOR) { + break; + } + + if (buflen < len) + break; + + if (id == tag_id) { + *tag_len = len; + *tag_data = buf; + ret = 0; + break; + } + + buf += len; + buflen -= len; + } + + return ret; +} + +inline int +rb_find_hard_cfg_tag(uint16_t tag_id, uint8_t **tag_data, uint16_t *tag_len) +{ + if (!rb_hardconfig || + !rb_hardconfig_len) + return 1; + + return routerboot_find_tag(rb_hardconfig, + rb_hardconfig_len, + tag_id, tag_data, tag_len); +} + +const uint8_t * +rb_get_board_product_code(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_BOARD_PRODUCT_CODE, &tag, &tag_len); + if (err) + return NULL; + + return tag; +} + +uint32_t +rb_get_board_mac(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_MAC_ADDRESS_PACK, &tag, &tag_len); + if (err) + return 0; + + return htonl(get_u32(tag)); +} + +const uint8_t * +rb_get_board_serial(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_SERIAL_NUMBER, &tag, &tag_len); + if (err) + return NULL; + + return tag; +} + +const uint8_t * +rb_get_board_identifier(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_BOARD_IDENTIFIER, &tag, &tag_len); + if (err) + return NULL; + + return tag; +} + +const uint8_t * +rb_get_board_name(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_BOARD_NAME, &tag, &tag_len); + if (err) + return NULL; + + return tag; +} + +const uint8_t * +rb_get_factory_booter_version(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_BIOS_VERSION, &tag, &tag_len); + if (err) + return NULL; + + return tag; +} + +uint32_t +rb_get_flash_info(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_FLASH_INFO, &tag, &tag_len); + if (err) + return 0; + + return htonl(get_u32(tag)); +} + +uint32_t +rb_get_hw_options(void) +{ + uint16_t tag_len; + uint8_t *tag; + int err; + + err = rb_find_hard_cfg_tag(RB_ID_HW_OPTIONS, &tag, &tag_len); + if (err) + return 0; + + return htonl(get_u32(tag)); +} + +uint8_t * +__rb_get_wlan_data(void) +{ + uint16_t tag_len; + uint8_t *tag; + uint16_t erd_tag_len; + uint8_t *erd_tag; + uint8_t *buf_lzo_in; + uint8_t *buf_lzo_out; + uint8_t *buf_rle_out; + int err; + uint32_t magic; + uint32_t erd_magic; + uint32_t erd_offset; + size_t lzo_out_len; + + err = rb_find_hard_cfg_tag(RB_ID_WLAN_DATA, &tag, &tag_len); + if (err) { + printf("no calibration data found\n"); + goto err; + } + + buf_lzo_in = malloc(RB_ART_SIZE); + if (buf_lzo_in == NULL) { + printf("no memory for calibration data\n"); + goto err; + } + + buf_rle_out = malloc(RB_ART_SIZE); + if (buf_rle_out == NULL) { + printf("no memory for calibration data\n"); + goto err_free_lzo_out; + } + + buf_lzo_out = malloc(RB_ART_SIZE); + if (buf_lzo_out == NULL) { + printf("no memory for calibration data\n"); + goto err_free_lzo_in; + } + + magic = get_u32(tag); + if (magic == RB_MAGIC_LZOR) { + tag += 4; + tag_len -= 4; + if (tag_len + sizeof(lzo_prefix) > RB_ART_SIZE) { + printf("Calibration data too large\n"); + goto err_free_lzo_in; + } + printf("Copying fixed LZO prefix (size: %d)\n", sizeof(lzo_prefix)); + memcpy(buf_lzo_in, lzo_prefix, sizeof(lzo_prefix)); + + printf("Copying input data (size: %d)\n", tag_len); + memcpy(buf_lzo_in + sizeof(lzo_prefix), tag, tag_len); + + printf("Decompressing with LZO\n"); + lzo_out_len = RB_ART_SIZE; + err = lzo1x_decompress_safe(buf_lzo_in, tag_len + sizeof(lzo_prefix), + buf_lzo_out, &lzo_out_len, NULL); + /* For some reason, I get this "input not consumed" error + * even though the output is correct, so ignore it. */ + if (err && err != LZO_E_INPUT_NOT_CONSUMED) { + printf("unable to decompress calibration data: %d\n", + err); + goto err_free_lzo_out; + } + + printf("Looking for ERD data in decompressed output\n"); + erd_magic = 0; + for (erd_offset = 0; erd_offset < lzo_out_len; erd_offset++) { + erd_magic = get_u32(buf_lzo_out + erd_offset); + if (erd_magic == RB_MAGIC_ERD) + break; + } + if (erd_magic != RB_MAGIC_ERD) { + printf("no ERD data found\n"); + goto err_free_lzo_out; + } + printf("Found ERD magic at offset %d\n", erd_offset); + + err = routerboot_find_tag(buf_lzo_out + erd_offset, + lzo_out_len - erd_offset, + 0x1, &erd_tag, &erd_tag_len); + if (err) { + printf("No ERD chunk found\n"); + goto err_free_lzo_out; + } + + printf("Decompress ERD data with RLE\n"); + err = rle_decode(erd_tag, erd_tag_len, buf_rle_out, RB_ART_SIZE, + NULL, NULL); + if (err) { + printf("unable to decode ERD data\n"); + goto err_free_rle_out; + } + } + + return buf_rle_out; + +err_free_rle_out: + free(buf_rle_out); +err_free_lzo_out: + free(buf_lzo_out); +err_free_lzo_in: + free(buf_lzo_in); +err: + return NULL; +} + +int +main(int argc, char **argv) +{ + FILE *infile; + FILE *outfile; + uint8_t *buf; + uint32_t magic; + uint32_t i; + + if(argc < 2){ + printf("Not enough arguments\n"); + printf("Use -h for help\n"); + exit(1); + } + + if(strcmp(argv[1], "-h") == 0){ + printf("This program can extract various data from MikroTik devices hard_config partition\n"); + printf("Usage: rbextract (Optional)\n"); + printf("Options:\n"); + printf("-a Prints all possible info\n"); + printf("-n Prints board name\n"); + printf("-p Prints board product code\n"); + printf("-i Prints board identifier\n"); + printf("-s Prints board serial number\n"); + printf("-m Prints board MAC\n"); + printf("-o Prints board HW options\n"); + printf("-r Prints board RouterBoot factory version\n"); + printf("-f Prints board flash identifier\n"); + printf("-e Extract board radio calibration\n"); + printf("hard_config_location: Path to hard_config partiton\n"); + printf("output_file: Path to where caldata will be output\n"); + } else { + infile = fopen(argv[2], "r"); + + if(infile == NULL){ + printf("Cant open given path\n"); + return 1; + } + + fseek(infile, 0L, SEEK_END); + rb_hardconfig_len = ftell(infile); + + fseek(infile, 0L, SEEK_SET); + + rb_hardconfig = (uint8_t*)calloc(rb_hardconfig_len, sizeof(uint8_t)); + if(rb_hardconfig == NULL) + return 1; + + fread(rb_hardconfig, sizeof(uint8_t), rb_hardconfig_len, infile); + fclose(infile); + + magic = get_u32(rb_hardconfig); + if(magic != RB_MAGIC_HARD){ + printf("Routerboot Hard Config not found\n"); + exit(1); + } + + if(strcmp(argv[1], "-a") == 0){ + printf("Board name: %s\n", rb_get_board_name()); + printf("Board product code: %s\n", rb_get_board_product_code()); + printf("Board identifier: %s\n", rb_get_board_identifier()); + printf("Board serial: %s\n", rb_get_board_serial()); + printf("Board MAC: %X\n", rb_get_board_mac()); + printf("HW Options %x\n", rb_get_hw_options()); + printf("Factory RouterBoot version: %s\n", rb_get_factory_booter_version()); + printf("Flash identifier: %x\n", rb_get_flash_info()); + } else if(strcmp(argv[1], "-n") == 0){ + printf("%s\n", rb_get_board_name()); + } else if(strcmp(argv[1], "-p") == 0){ + printf("%s\n", rb_get_board_product_code()); + } else if(strcmp(argv[1], "-i") == 0){ + printf("%s\n", rb_get_board_identifier()); + } else if(strcmp(argv[1], "-s") == 0){ + printf("%s\n", rb_get_board_serial()); + } else if(strcmp(argv[1], "-m") == 0){ + printf("%x\n", rb_get_board_mac()); + } else if(strcmp(argv[1], "-o") == 0){ + printf("%x\n", rb_get_hw_options()); + } else if(strcmp(argv[1], "-r") == 0){ + printf("%s\n", rb_get_factory_booter_version()); + } else if(strcmp(argv[1], "-f") == 0){ + printf("%x\n", rb_get_flash_info()); + } else if(strcmp(argv[1], "-e") == 0){ + buf = __rb_get_wlan_data(); + if (buf == NULL) { + printf("Could not extract calibration data\n"); + return 1; + } + + if(argv[3] == NULL){ + printf("Missing output file argument\n"); + return 1; + } + + outfile = fopen(argv[3], "wb"); + if(outfile == NULL){ + printf("Cant open given path\n"); + return 1; + } + + /* Write 65536 bytes of caldata */ + for(i = 0; i + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include + +#include "rle.h" + +int rle_decode(const unsigned char *src, size_t srclen, + unsigned char *dst, size_t dstlen, + size_t *src_done, size_t *dst_done) +{ + size_t srcpos, dstpos; + int ret; + + srcpos = 0; + dstpos = 0; + ret = 1; + + /* sanity checks */ + if (!src || !srclen || !dst || !dstlen) + goto out; + + while (1) { + signed char count; + + if (srcpos >= srclen) + break; + + count = (signed char) src[srcpos++]; + if (count == 0) { + ret = 0; + break; + } + + if (count > 0) { + unsigned char c; + + if (srcpos >= srclen) + break; + + c = src[srcpos++]; + + while (count--) { + if (dstpos >= dstlen) + break; + + dst[dstpos++] = c; + } + } else { + count *= -1; + + while (count--) { + if (srcpos >= srclen) + break; + if (dstpos >= dstlen) + break; + dst[dstpos++] = src[srcpos++]; + } + } + } + +out: + if (src_done) + *src_done = srcpos; + if (dst_done) + *dst_done = dstpos; + + return ret; +} diff --git a/package/utils/rbextract/src/rle.h b/package/utils/rbextract/src/rle.h new file mode 100644 index 0000000000..21cf66c993 --- /dev/null +++ b/package/utils/rbextract/src/rle.h @@ -0,0 +1,8 @@ +#ifndef _RLE_H_ +#define _RLE_H_ + +int rle_decode(const unsigned char *src, size_t srclen, + unsigned char *dst, size_t dstlen, + size_t *src_done, size_t *dst_done); + +#endif /* _RLE_H_ */ diff --git a/package/utils/rbextract/src/routerboot.h b/package/utils/rbextract/src/routerboot.h new file mode 100644 index 0000000000..13809d97fc --- /dev/null +++ b/package/utils/rbextract/src/routerboot.h @@ -0,0 +1,258 @@ +/* + * RouterBoot/RBextract definitions + * + * Copyright (C) 2012 Gabor Juhos + * Copyright (C) 2019 Robert Marko + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#ifndef _RBEXTRACT_H +#define _RBEXTRACT_H + +/* Used on some newer boards (ipq40xx). This fixed data is concatenated + with data extracted from the hard_config partition, then decompressed + with LZO. There may also be a second decoding step with RLE. */ +uint8_t lzo_prefix[] = { + 0x00, 0x05, 0x4c, 0x4c, 0x44, 0x00, 0x34, 0xfe, + 0xfe, 0x34, 0x11, 0x3c, 0x1e, 0x3c, 0x2e, 0x3c, + 0x4c, 0x34, 0x00, 0x52, 0x62, 0x92, 0xa2, 0xb2, + 0xc3, 0x2a, 0x14, 0x00, 0x00, 0x05, 0xfe, 0x6a, + 0x3c, 0x16, 0x32, 0x16, 0x11, 0x1e, 0x12, 0x46, + 0x32, 0x46, 0x11, 0x4e, 0x12, 0x36, 0x32, 0x36, + 0x11, 0x3e, 0x12, 0x5a, 0x9a, 0x64, 0x00, 0x04, + 0xfe, 0x10, 0x3c, 0x00, 0x01, 0x00, 0x00, 0x28, + 0x0c, 0x00, 0x0f, 0xfe, 0x14, 0x00, 0x24, 0x24, + 0x23, 0x24, 0x24, 0x23, 0x25, 0x22, 0x21, 0x21, + 0x23, 0x22, 0x21, 0x22, 0x21, 0x2d, 0x38, 0x00, + 0x0c, 0x25, 0x25, 0x24, 0x25, 0x25, 0x24, 0x23, + 0x22, 0x21, 0x20, 0x23, 0x21, 0x21, 0x22, 0x21, + 0x2d, 0x38, 0x00, 0x28, 0xb0, 0x00, 0x00, 0x22, + 0x00, 0x00, 0xc0, 0xfe, 0x03, 0x00, 0xc0, 0x00, + 0x62, 0xff, 0x62, 0xff, 0xfe, 0x06, 0x00, 0xbb, + 0xff, 0xba, 0xff, 0xfe, 0x08, 0x00, 0x9e, 0xff, + 0xfe, 0x0a, 0x00, 0x53, 0xff, 0xfe, 0x02, 0x00, + 0x20, 0xff, 0xb1, 0xfe, 0xfe, 0xb2, 0xfe, 0xfe, + 0xed, 0xfe, 0xfe, 0xfe, 0x04, 0x00, 0x3a, 0xff, + 0x3a, 0xff, 0xde, 0xfd, 0x5f, 0x04, 0x33, 0xff, + 0x4c, 0x74, 0x03, 0x05, 0x05, 0xff, 0x6d, 0xfe, + 0xfe, 0x6d, 0xfe, 0xfe, 0xaf, 0x08, 0x63, 0xff, + 0x64, 0x6f, 0x08, 0xac, 0xff, 0xbf, 0x6d, 0x08, + 0x7a, 0x6d, 0x08, 0x96, 0x74, 0x04, 0x00, 0x08, + 0x79, 0xff, 0xda, 0xfe, 0xfe, 0xdb, 0xfe, 0xfe, + 0x56, 0xff, 0xfe, 0x04, 0x00, 0x5e, 0xff, 0x5e, + 0xff, 0x6c, 0xfe, 0xfe, 0xfe, 0x06, 0x00, 0x41, + 0xff, 0x7f, 0x74, 0x03, 0x00, 0x11, 0x44, 0xff, + 0xa9, 0xfe, 0xfe, 0xa9, 0xfe, 0xfe, 0xa5, 0x8f, + 0x01, 0x00, 0x08, 0x01, 0x01, 0x02, 0x04, 0x08, + 0x02, 0x04, 0x08, 0x08, 0x01, 0x01, 0xfe, 0x22, + 0x00, 0x4c, 0x60, 0x64, 0x8c, 0x90, 0xd0, 0xd4, + 0xd8, 0x5c, 0x10, 0x09, 0xd8, 0xff, 0xb0, 0xff, + 0x00, 0x00, 0xba, 0xff, 0x14, 0x00, 0xba, 0xff, + 0x64, 0x00, 0x00, 0x08, 0xfe, 0x06, 0x00, 0x74, + 0xff, 0x42, 0xff, 0xce, 0xff, 0x60, 0xff, 0x0a, + 0x00, 0xb4, 0x00, 0xa0, 0x00, 0xa0, 0xfe, 0x07, + 0x00, 0x0a, 0x00, 0xb0, 0xff, 0x96, 0x4d, 0x00, + 0x56, 0x57, 0x18, 0xa6, 0xff, 0x92, 0x70, 0x11, + 0x00, 0x12, 0x90, 0x90, 0x76, 0x5a, 0x54, 0x54, + 0x4c, 0x46, 0x38, 0x00, 0x10, 0x10, 0x08, 0xfe, + 0x05, 0x00, 0x38, 0x29, 0x25, 0x23, 0x22, 0x22, + 0x1f, 0x00, 0x00, 0x00, 0xf6, 0xe1, 0xdd, 0xf8, + 0xfe, 0x00, 0xfe, 0x15, 0x00, 0x00, 0xd0, 0x02, + 0x74, 0x02, 0x08, 0xf8, 0xe5, 0xde, 0x02, 0x04, + 0x04, 0xfd, 0x00, 0x00, 0x00, 0x07, 0x50, 0x2d, + 0x01, 0x90, 0x90, 0x76, 0x60, 0xb0, 0x07, 0x07, + 0x0c, 0x0c, 0x04, 0xfe, 0x05, 0x00, 0x66, 0x66, + 0x5a, 0x56, 0xbc, 0x01, 0x06, 0xfc, 0xfc, 0xf1, + 0xfe, 0x07, 0x00, 0x24, 0x95, 0x70, 0x64, 0x18, + 0x06, 0x2c, 0xff, 0xb5, 0xfe, 0xfe, 0xb5, 0xfe, + 0xfe, 0xe2, 0x8c, 0x24, 0x02, 0x2f, 0xff, 0x2f, + 0xff, 0xb4, 0x78, 0x02, 0x05, 0x73, 0xff, 0xed, + 0xfe, 0xfe, 0x4f, 0xff, 0x36, 0x74, 0x1e, 0x09, + 0x4f, 0xff, 0x50, 0xff, 0xfe, 0x16, 0x00, 0x70, + 0xac, 0x70, 0x8e, 0xac, 0x40, 0x0e, 0x01, 0x70, + 0x7f, 0x8e, 0xac, 0x6c, 0x00, 0x0b, 0xfe, 0x02, + 0x00, 0xfe, 0x0a, 0x2c, 0x2a, 0x2a, 0x28, 0x26, + 0x1e, 0x1e, 0xfe, 0x02, 0x20, 0x65, 0x20, 0x00, + 0x00, 0x05, 0x12, 0x00, 0x11, 0x1e, 0x11, 0x11, + 0x41, 0x1e, 0x41, 0x11, 0x31, 0x1e, 0x31, 0x11, + 0x70, 0x75, 0x7a, 0x7f, 0x84, 0x89, 0x8e, 0x93, + 0x98, 0x30, 0x20, 0x00, 0x02, 0x00, 0xfe, 0x06, + 0x3c, 0xbc, 0x32, 0x0c, 0x00, 0x00, 0x2a, 0x12, + 0x1e, 0x12, 0x2e, 0x12, 0xcc, 0x12, 0x11, 0x1a, + 0x1e, 0x1a, 0x2e, 0x1a, 0x4c, 0x10, 0x1e, 0x10, + 0x11, 0x18, 0x1e, 0x42, 0x1e, 0x42, 0x2e, 0x42, + 0xcc, 0x42, 0x11, 0x4a, 0x1e, 0x4a, 0x2e, 0x4a, + 0x4c, 0x40, 0x1e, 0x40, 0x11, 0x48, 0x1e, 0x32, + 0x1e, 0x32, 0x2e, 0x32, 0xcc, 0x32, 0x11, 0x3a, + 0x1e, 0x3a, 0x2e, 0x3a, 0x4c, 0x30, 0x1e, 0x30, + 0x11, 0x38, 0x1e, 0x27, 0x9a, 0x01, 0x9d, 0xa2, + 0x2f, 0x28, 0x00, 0x00, 0x46, 0xde, 0xc4, 0xbf, + 0xa6, 0x9d, 0x81, 0x7b, 0x5c, 0x61, 0x40, 0xc7, + 0xc0, 0xae, 0xa9, 0x8c, 0x83, 0x6a, 0x62, 0x50, + 0x3e, 0xce, 0xc2, 0xae, 0xa3, 0x8c, 0x7b, 0x6a, + 0x5a, 0x50, 0x35, 0xd7, 0xc2, 0xb7, 0xa4, 0x95, + 0x7e, 0x72, 0x5a, 0x59, 0x37, 0xfe, 0x02, 0xf8, + 0x8c, 0x95, 0x90, 0x8f, 0x00, 0xd7, 0xc0, 0xb7, + 0xa2, 0x95, 0x7b, 0x72, 0x56, 0x59, 0x32, 0xc7, + 0xc3, 0xae, 0xad, 0x8c, 0x85, 0x6a, 0x63, 0x50, + 0x3e, 0xce, 0xc3, 0xae, 0xa4, 0x8c, 0x7c, 0x6a, + 0x59, 0x50, 0x34, 0xd7, 0xc2, 0xb7, 0xa5, 0x95, + 0x7e, 0x72, 0x59, 0x59, 0x36, 0xfc, 0x05, 0x00, + 0x02, 0xce, 0xc5, 0xae, 0xa5, 0x95, 0x83, 0x72, + 0x5c, 0x59, 0x36, 0xbf, 0xc6, 0xa5, 0xab, 0x8c, + 0x8c, 0x6a, 0x67, 0x50, 0x41, 0x64, 0x07, 0x00, + 0x02, 0x95, 0x8c, 0x72, 0x65, 0x59, 0x3f, 0xce, + 0xc7, 0xae, 0xa8, 0x95, 0x86, 0x72, 0x5f, 0x59, + 0x39, 0xfe, 0x02, 0xf8, 0x8b, 0x7c, 0x0b, 0x09, + 0xb7, 0xc2, 0x9d, 0xa4, 0x83, 0x85, 0x6a, 0x6b, + 0x50, 0x44, 0xb7, 0xc1, 0x64, 0x01, 0x00, 0x06, + 0x61, 0x5d, 0x48, 0x3d, 0xae, 0xc4, 0x9d, 0xad, + 0x7b, 0x85, 0x61, 0x66, 0x48, 0x46, 0xae, 0xc3, + 0x95, 0xa3, 0x72, 0x7c, 0x59, 0x56, 0x38, 0x31, + 0x7c, 0x0b, 0x00, 0x0c, 0x96, 0x91, 0x8f, 0x00, + 0xb7, 0xc0, 0xa5, 0xab, 0x8c, 0x8a, 0x6a, 0x64, + 0x50, 0x3c, 0xb7, 0xc0, 0x9d, 0xa0, 0x83, 0x80, + 0x6a, 0x64, 0x50, 0x3d, 0xb7, 0xc5, 0x9d, 0xa5, + 0x83, 0x87, 0x6c, 0x08, 0x07, 0xae, 0xc0, 0x9d, + 0xa8, 0x83, 0x88, 0x6a, 0x6d, 0x50, 0x46, 0xfc, + 0x05, 0x00, 0x16, 0xbf, 0xc0, 0xa5, 0xa2, 0x8c, + 0x7f, 0x6a, 0x57, 0x50, 0x2f, 0xb7, 0xc7, 0xa5, + 0xb1, 0x8c, 0x8e, 0x72, 0x6d, 0x59, 0x45, 0xbf, + 0xc6, 0xa5, 0xa8, 0x8c, 0x87, 0x6a, 0x5f, 0x50, + 0x37, 0xbf, 0xc2, 0xa5, 0xa4, 0x8c, 0x83, 0x6a, + 0x5c, 0x50, 0x34, 0xbc, 0x05, 0x00, 0x0e, 0x90, + 0x00, 0xc7, 0xc2, 0xae, 0xaa, 0x95, 0x82, 0x7b, + 0x60, 0x61, 0x3f, 0xb7, 0xc6, 0xa5, 0xb1, 0x8c, + 0x8d, 0x72, 0x6b, 0x61, 0x51, 0xbf, 0xc4, 0xa5, + 0xa5, 0x8c, 0x82, 0x72, 0x61, 0x59, 0x39, 0x6c, + 0x26, 0x03, 0x95, 0x82, 0x7b, 0x61, 0x61, 0x40, + 0xfc, 0x05, 0x00, 0x00, 0x7e, 0xd7, 0xc3, 0xb7, + 0xa8, 0x9d, 0x80, 0x83, 0x5d, 0x6a, 0x3f, 0xbf, + 0xc7, 0xa5, 0xa8, 0x8c, 0x84, 0x72, 0x60, 0x61, + 0x46, 0xbf, 0xc2, 0xae, 0xb0, 0x9d, 0x92, 0x83, + 0x6f, 0x6a, 0x50, 0xd7, 0xc3, 0xb7, 0xa7, 0x9d, + 0x80, 0x83, 0x5e, 0x6a, 0x40, 0xfe, 0x02, 0xf8, + 0x8d, 0x96, 0x90, 0x90, 0xfe, 0x05, 0x00, 0x8a, + 0xc4, 0x63, 0xb8, 0x3c, 0xa6, 0x29, 0x97, 0x16, + 0x81, 0x84, 0xb7, 0x5b, 0xa9, 0x33, 0x94, 0x1e, + 0x83, 0x11, 0x70, 0xb8, 0xc2, 0x70, 0xb1, 0x4d, + 0xa3, 0x2a, 0x8d, 0x1b, 0x7b, 0xa8, 0xbc, 0x68, + 0xab, 0x47, 0x9d, 0x27, 0x87, 0x18, 0x75, 0xae, + 0xc6, 0x7d, 0xbb, 0x4d, 0xaa, 0x1c, 0x84, 0x11, + 0x72, 0xa3, 0xbb, 0x6e, 0xad, 0x3c, 0x97, 0x24, + 0x85, 0x16, 0x71, 0x80, 0xb2, 0x57, 0xa4, 0x30, + 0x8e, 0x1c, 0x7c, 0x10, 0x68, 0xbb, 0xbd, 0x75, + 0xac, 0x4f, 0x9e, 0x2b, 0x87, 0x1a, 0x76, 0x96, + 0xc5, 0x5e, 0xb5, 0x3e, 0xa5, 0x1f, 0x8c, 0x12, + 0x7a, 0xc1, 0xc6, 0x42, 0x9f, 0x27, 0x8c, 0x16, + 0x77, 0x0f, 0x67, 0x9d, 0xbc, 0x68, 0xad, 0x36, + 0x95, 0x20, 0x83, 0x11, 0x6d, 0x9b, 0xb8, 0x67, + 0xa8, 0x34, 0x90, 0x1f, 0x7c, 0x10, 0x67, 0x9e, + 0xc9, 0x6a, 0xbb, 0x37, 0xa4, 0x20, 0x90, 0x11, + 0x7b, 0xc6, 0xc8, 0x47, 0xa4, 0x2a, 0x90, 0x18, + 0x7b, 0x10, 0x6c, 0xae, 0xc4, 0x5d, 0xad, 0x37, + 0x9a, 0x1f, 0x85, 0x13, 0x75, 0x70, 0xad, 0x42, + 0x99, 0x25, 0x84, 0x17, 0x74, 0x0b, 0x56, 0x87, + 0xc8, 0x57, 0xb8, 0x2b, 0x9e, 0x19, 0x8a, 0x0d, + 0x74, 0xa7, 0xc8, 0x6e, 0xb9, 0x36, 0xa0, 0x1f, + 0x8b, 0x11, 0x75, 0x94, 0xbe, 0x4b, 0xa5, 0x2a, + 0x92, 0x18, 0x7c, 0x0f, 0x6b, 0xaf, 0xc0, 0x58, + 0xa8, 0x34, 0x94, 0x1d, 0x7d, 0x12, 0x6d, 0x82, + 0xc0, 0x52, 0xb0, 0x25, 0x94, 0x14, 0x7f, 0x0c, + 0x68, 0x84, 0xbf, 0x3e, 0xa4, 0x22, 0x8e, 0x10, + 0x76, 0x0b, 0x65, 0x88, 0xb6, 0x42, 0x9b, 0x26, + 0x87, 0x14, 0x70, 0x0c, 0x5f, 0xc5, 0xc2, 0x3e, + 0x97, 0x23, 0x83, 0x13, 0x6c, 0x0c, 0x5c, 0xb1, + 0xc9, 0x76, 0xbc, 0x4a, 0xaa, 0x20, 0x8d, 0x12, + 0x78, 0x93, 0xbf, 0x46, 0xa3, 0x26, 0x8d, 0x14, + 0x74, 0x0c, 0x62, 0xc8, 0xc4, 0x3b, 0x97, 0x21, + 0x82, 0x11, 0x6a, 0x0a, 0x59, 0xa3, 0xb9, 0x68, + 0xa9, 0x30, 0x8d, 0x1a, 0x78, 0x0f, 0x61, 0xa0, + 0xc9, 0x73, 0xbe, 0x50, 0xb1, 0x30, 0x9f, 0x14, + 0x80, 0x83, 0xb7, 0x3c, 0x9a, 0x20, 0x84, 0x0e, + 0x6a, 0x0a, 0x57, 0xac, 0xc2, 0x68, 0xb0, 0x2e, + 0x92, 0x19, 0x7c, 0x0d, 0x63, 0x93, 0xbe, 0x62, + 0xb0, 0x3c, 0x9e, 0x1a, 0x80, 0x0e, 0x6b, 0xbb, + 0x02, 0xa0, 0x02, 0xa0, 0x02, 0x6f, 0x00, 0x75, + 0x00, 0x75, 0x00, 0x00, 0x00, 0xad, 0x02, 0xb3, + 0x02, 0x6f, 0x00, 0x87, 0x00, 0x85, 0xfe, 0x03, + 0x00, 0xc2, 0x02, 0x82, 0x4d, 0x92, 0x6e, 0x4d, + 0xb1, 0xa8, 0x84, 0x01, 0x00, 0x07, 0x7e, 0x00, + 0xa8, 0x02, 0xa4, 0x02, 0xa4, 0x02, 0xa2, 0x00, + 0xa6, 0x00, 0xa6, 0x00, 0x00, 0x00, 0xb4, 0x02, + 0xb4, 0x02, 0x92, 0x00, 0x96, 0x00, 0x96, 0x46, + 0x04, 0xb0, 0x02, 0x64, 0x02, 0x0a, 0x8c, 0x00, + 0x90, 0x02, 0x98, 0x02, 0x98, 0x02, 0x0e, 0x01, + 0x11, 0x01, 0x11, 0x50, 0xc3, 0x08, 0x88, 0x02, + 0x88, 0x02, 0x19, 0x01, 0x02, 0x01, 0x02, 0x01, + 0xf3, 0x2d, 0x00, 0x00 +}; + +uint8_t *rb_hardconfig; +long rb_hardconfig_len; + +static inline uint32_t get_u32(const void *buf); + +int routerboot_find_tag(uint8_t *buf, unsigned int buflen, uint16_t tag_id, + uint8_t **tag_data, uint16_t *tag_len); + +static inline int +rb_find_hard_cfg_tag(uint16_t tag_id, uint8_t **tag_data, uint16_t *tag_len); + +const uint8_t * rb_get_board_product_code(void); + +uint32_t rb_get_board_mac(void); + +const uint8_t * rb_get_board_serial(void); + +const uint8_t * rb_get_board_identifier(void); + +const uint8_t * rb_get_board_name(void); + +const uint8_t * rb_get_factory_booter_version(void); + +uint32_t rb_get_flash_info(void); + +uint32_t rb_get_hw_options(void); + +int routerboot_find_magic(uint8_t *buf, unsigned int buflen, uint32_t *offset, bool hard); + +uint8_t * __rb_get_wlan_data(void); + +/* + * Magic numbers + */ +#define RB_ART_SIZE 0x10000 +#define RB_MAGIC_HARD 0x64726148 /* "Hard" */ +#define RB_MAGIC_SOFT 0x74666F53 /* "Soft" */ +#define RB_MAGIC_ERD 0x00455244 /* extended radio data */ +#define RB_MAGIC_LZOR 0x524F5A4C + +#define RB_ID_TERMINATOR 0 + +/* + * ID values for Hardware settings + */ +#define RB_ID_HARD_01 1 +#define RB_ID_HARD_02 2 +#define RB_ID_FLASH_INFO 3 +#define RB_ID_MAC_ADDRESS_PACK 4 +#define RB_ID_BOARD_PRODUCT_CODE 5 +#define RB_ID_BIOS_VERSION 6 +#define RB_ID_HARD_07 7 +#define RB_ID_SDRAM_TIMINGS 8 +#define RB_ID_DEVICE_TIMINGS 9 +#define RB_ID_SOFTWARE_ID 10 +#define RB_ID_SERIAL_NUMBER 11 +#define RB_ID_HARD_12 12 +#define RB_ID_MEMORY_SIZE 13 +#define RB_ID_MAC_ADDRESS_COUNT 14 +#define RB_ID_HW_OPTIONS 21 +#define RB_ID_WLAN_DATA 22 +#define RB_ID_BOARD_IDENTIFIER 23 +#define RB_ID_BOARD_NAME 33 + +#endif /* _RBEXTRACT_H */ From 7d39946ea0fe954bcd0c4d52fffc6d9dc6248cf6 Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Thu, 28 Nov 2019 13:29:12 +0100 Subject: [PATCH 425/480] rbextract: support devices directly showing ERD magic Older ath79-based MikroTik devices have the ERD calibration data compressed and stored different to newer IPQ40xx ones. This commit adds support for these former ones. Signed-off-by: Roger Pueyo Centelles Acked-by: Koen Vandeputte --- package/utils/rbextract/Makefile | 3 ++- package/utils/rbextract/src/rbextract.c | 28 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/package/utils/rbextract/Makefile b/package/utils/rbextract/Makefile index b055a615cf..4bc6898b11 100644 --- a/package/utils/rbextract/Makefile +++ b/package/utils/rbextract/Makefile @@ -2,6 +2,7 @@ # Copyright (C) 2010 Gabor Juhos # Copyright (C) 2018 Chris Schimp # Copyright (C) 2019 Robert Marko +# Copyright (C) 2019 Roger Pueyo Centelles # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rbextract -PKG_RELEASE:=1 +PKG_RELEASE:=2 CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/rbextract/src/rbextract.c b/package/utils/rbextract/src/rbextract.c index 0985497f3f..ceed2494a1 100644 --- a/package/utils/rbextract/src/rbextract.c +++ b/package/utils/rbextract/src/rbextract.c @@ -333,7 +333,35 @@ __rb_get_wlan_data(void) goto err_free_rle_out; } } + /* Older ath79-based boards directly show the RB_MAGIC_ERD bytes followed by + the LZO-compressed calibration data with no RLE */ + if (magic == RB_MAGIC_ERD) { + if (tag_len > RB_ART_SIZE) { + printf("Calibration data too large\n"); + goto err_free_lzo_in; + } + err = routerboot_find_tag(tag, tag_len, + 0x1, &buf_lzo_in, &erd_tag_len); + if (err) { + printf("No ERD chunk found\n"); + goto err_free_lzo_out; + } + + printf("Decompressing with LZO\n"); + lzo_out_len = RB_ART_SIZE; + err = lzo1x_decompress_safe(buf_lzo_in, tag_len, + buf_lzo_out, &lzo_out_len, NULL); + /* For some reason, I get this "input not consumed" error + * even though the output is correct, so ignore it. */ + if (err && err != LZO_E_INPUT_NOT_CONSUMED) { + printf("unable to decompress calibration data: %d\n", + err); + goto err_free_lzo_out; + } + + buf_rle_out = buf_lzo_out; + } return buf_rle_out; err_free_rle_out: From 0d416a8d3b990e3b78628f0e7546527709c877f7 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 11 Apr 2019 17:59:43 +0200 Subject: [PATCH 426/480] ath79: add QCA955x SGMII link loss workaround This commit adds a workaround for the loss of the SGMII link observed on the QCA955x generation of SoCs. The workaround originates part from the U-Boot source code, part from the implementation from AVM found in the GPL tarball for the AVM FRITZ!WLAN Repeater 450E. The bug results in a stuck SGMII link between the PHY device and the SoC side. This has only been observed with the Atheros AR8033 PHY and most likely all devices using such combination are affected. It is worked around by reading a hidden SGMII status register and issuing a SGMII PHY reset until the link becomes useable again. Signed-off-by: David Bauer --- .../net/ethernet/atheros/ag71xx/ag71xx_main.c | 108 ++++++++++++++++++ ...9-add-missing-QCA955x-GMAC-registers.patch | 91 +++++++++++++++ ...9-add-missing-QCA955x-GMAC-registers.patch | 91 +++++++++++++++ 3 files changed, 290 insertions(+) create mode 100644 target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch create mode 100644 target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index 0924b81b92..6123a26f2c 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -559,6 +559,112 @@ static void ath79_set_pll(struct ag71xx *ag) udelay(100); } +static void ag71xx_bit_set(void __iomem *reg, u32 bit) +{ + u32 val; + + val = __raw_readl(reg) | bit; + __raw_writel(val, reg); + __raw_readl(reg); +} + +static void ag71xx_bit_clear(void __iomem *reg, u32 bit) +{ + u32 val; + + val = __raw_readl(reg) & ~bit; + __raw_writel(val, reg); + __raw_readl(reg); +} + +static void ag71xx_sgmii_init_qca955x(struct device_node *np) +{ + struct device_node *np_dev; + void __iomem *gmac_base; + u32 mr_an_status; + u32 sgmii_status; + u8 tries = 0; + int err = 0; + + np = of_get_child_by_name(np, "gmac-config"); + if (!np) + return; + + np_dev = of_parse_phandle(np, "device", 0); + if (!np_dev) + goto out; + + gmac_base = of_iomap(np_dev, 0); + if (!gmac_base) { + pr_err("%pOF: can't map GMAC registers\n", np_dev); + err = -ENOMEM; + goto err_iomap; + } + + mr_an_status = __raw_readl(gmac_base + QCA955X_GMAC_REG_MR_AN_STATUS); + if (!(mr_an_status & QCA955X_MR_AN_STATUS_AN_ABILITY)) + goto sgmii_out; + + /* SGMII reset sequence */ + __raw_writel(QCA955X_SGMII_RESET_RX_CLK_N_RESET, + gmac_base + QCA955X_GMAC_REG_SGMII_RESET); + __raw_readl(gmac_base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + ag71xx_bit_set(gmac_base + QCA955X_GMAC_REG_SGMII_RESET, + QCA955X_SGMII_RESET_HW_RX_125M_N); + udelay(10); + + ag71xx_bit_set(gmac_base + QCA955X_GMAC_REG_SGMII_RESET, + QCA955X_SGMII_RESET_RX_125M_N); + udelay(10); + + ag71xx_bit_set(gmac_base + QCA955X_GMAC_REG_SGMII_RESET, + QCA955X_SGMII_RESET_TX_125M_N); + udelay(10); + + ag71xx_bit_set(gmac_base + QCA955X_GMAC_REG_SGMII_RESET, + QCA955X_SGMII_RESET_RX_CLK_N); + udelay(10); + + ag71xx_bit_set(gmac_base + QCA955X_GMAC_REG_SGMII_RESET, + QCA955X_SGMII_RESET_TX_CLK_N); + udelay(10); + + /* + * The following is what QCA has to say about what happens here: + * + * Across resets SGMII link status goes to weird state. + * If SGMII_DEBUG register reads other than 0x1f or 0x10, + * we are for sure in a bad state. + * + * Issue a PHY reset in MR_AN_CONTROL to keep going. + */ + do { + ag71xx_bit_set(gmac_base + QCA955X_GMAC_REG_MR_AN_CONTROL, + QCA955X_MR_AN_CONTROL_PHY_RESET | + QCA955X_MR_AN_CONTROL_AN_ENABLE); + udelay(200); + ag71xx_bit_clear(gmac_base + QCA955X_GMAC_REG_MR_AN_CONTROL, + QCA955X_MR_AN_CONTROL_PHY_RESET); + mdelay(300); + sgmii_status = __raw_readl(gmac_base + QCA955X_GMAC_REG_SGMII_DEBUG) & + QCA955X_SGMII_DEBUG_TX_STATE_MASK; + + if (tries++ >= 20) { + pr_err("ag71xx: max retries for SGMII fixup exceeded\n"); + break; + } + } while (!(sgmii_status == 0xf || sgmii_status == 0x10)); + +sgmii_out: + iounmap(gmac_base); +err_iomap: + of_node_put(np_dev); +out: + of_node_put(np); +} + static void ath79_mii_ctrl_set_if(struct ag71xx *ag, unsigned int mii_if) { u32 t; @@ -707,6 +813,8 @@ __ag71xx_link_adjust(struct ag71xx *ag, bool update) of_device_is_compatible(np, "qca,qca9550-eth") || of_device_is_compatible(np, "qca,qca9560-eth")) { ath79_set_pllval(ag); + if (of_property_read_bool(np, "qca955x-sgmii-fixup")) + ag71xx_sgmii_init_qca955x(np); } } diff --git a/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch b/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch new file mode 100644 index 0000000000..111c1553d3 --- /dev/null +++ b/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch @@ -0,0 +1,91 @@ +From 60efe35257b063ce584968f9f80b437030ce6ba6 Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Mon, 18 Mar 2019 00:54:06 +0100 +Subject: [PATCH] MIPS: ath79: add missing QCA955x GMAC registers + +This adds missing GMAC register definitions for the Qualcomm Atheros +QCA955X series MIPS SoCs. + +They originate from the platforms U-Boot code and the AVM FRITZ!WLAN +Repeater 450E's GPL tarball. + +Signed-off-by: David Bauer +--- + .../mips/include/asm/mach-ath79/ar71xx_regs.h | 54 +++++++++++++++++++ + 1 file changed, 54 insertions(+) + +--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h ++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +@@ -1245,7 +1245,12 @@ + */ + + #define QCA955X_GMAC_REG_ETH_CFG 0x00 ++#define QCA955X_GMAC_REG_SGMII_RESET 0x14 + #define QCA955X_GMAC_REG_SGMII_SERDES 0x18 ++#define QCA955X_GMAC_REG_MR_AN_CONTROL 0x1c ++#define QCA955X_GMAC_REG_MR_AN_STATUS 0x20 ++#define QCA955X_GMAC_REG_SGMII_CONFIG 0x34 ++#define QCA955X_GMAC_REG_SGMII_DEBUG 0x58 + + #define QCA955X_ETH_CFG_RGMII_EN BIT(0) + #define QCA955X_ETH_CFG_MII_GE0 BIT(1) +@@ -1267,9 +1272,58 @@ + #define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 + #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 + ++#define QCA955X_SGMII_RESET_RX_CLK_N_RESET 0 ++#define QCA955X_SGMII_RESET_RX_CLK_N BIT(0) ++#define QCA955X_SGMII_RESET_TX_CLK_N BIT(1) ++#define QCA955X_SGMII_RESET_RX_125M_N BIT(2) ++#define QCA955X_SGMII_RESET_TX_125M_N BIT(3) ++#define QCA955X_SGMII_RESET_HW_RX_125M_N BIT(4) ++ + #define QCA955X_SGMII_SERDES_LOCK_DETECT_STATUS BIT(15) + #define QCA955X_SGMII_SERDES_RES_CALIBRATION_SHIFT 23 + #define QCA955X_SGMII_SERDES_RES_CALIBRATION_MASK 0xf ++ ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL1 BIT(6) ++#define QCA955X_MR_AN_CONTROL_DUPLEX_MODE BIT(8) ++#define QCA955X_MR_AN_CONTROL_RESTART_AN BIT(9) ++#define QCA955X_MR_AN_CONTROL_POWER_DOWN BIT(11) ++#define QCA955X_MR_AN_CONTROL_AN_ENABLE BIT(12) ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL0 BIT(13) ++#define QCA955X_MR_AN_CONTROL_LOOPBACK BIT(14) ++#define QCA955X_MR_AN_CONTROL_PHY_RESET BIT(15) ++ ++#define QCA955X_MR_AN_STATUS_EXT_CAP BIT(0) ++#define QCA955X_MR_AN_STATUS_LINK_UP BIT(2) ++#define QCA955X_MR_AN_STATUS_AN_ABILITY BIT(3) ++#define QCA955X_MR_AN_STATUS_REMOTE_FAULT BIT(4) ++#define QCA955X_MR_AN_STATUS_AN_COMPLETE BIT(5) ++#define QCA955X_MR_AN_STATUS_NO_PREAMBLE BIT(6) ++#define QCA955X_MR_AN_STATUS_BASE_PAGE BIT(7) ++ ++#define QCA955X_SGMII_CONFIG_MODE_CTRL_SHIFT 0 ++#define QCA955X_SGMII_CONFIG_MODE_CTRL_MASK 0x7 ++#define QCA955X_SGMII_CONFIG_ENABLE_SGMII_TX_PAUSE BIT(3) ++#define QCA955X_SGMII_CONFIG_MR_REG4_CHANGED BIT(4) ++#define QCA955X_SGMII_CONFIG_FORCE_SPEED BIT(5) ++#define QCA955X_SGMII_CONFIG_SPEED_SHIFT 6 ++#define QCA955X_SGMII_CONFIG_SPEED_MASK 0xc0 ++#define QCA955X_SGMII_CONFIG_REMOTE_PHY_LOOPBACK BIT(8) ++#define QCA955X_SGMII_CONFIG_NEXT_PAGE_LOADED BIT(9) ++#define QCA955X_SGMII_CONFIG_MDIO_ENABLE BIT(10) ++#define QCA955X_SGMII_CONFIG_MDIO_PULSE BIT(11) ++#define QCA955X_SGMII_CONFIG_MDIO_COMPLETE BIT(12) ++#define QCA955X_SGMII_CONFIG_PRBS_ENABLE BIT(13) ++#define QCA955X_SGMII_CONFIG_BERT_ENABLE BIT(14) ++ ++#define QCA955X_SGMII_DEBUG_TX_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_TX_STATE_SHIFT 0 ++#define QCA955X_SGMII_DEBUG_RX_STATE_MASK 0xff00 ++#define QCA955X_SGMII_DEBUG_RX_STATE_SHIFT 8 ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_MASK 0xff0000 ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_SHIFT 16 ++#define QCA955X_SGMII_DEBUG_ARB_STATE_MASK 0xf000000 ++#define QCA955X_SGMII_DEBUG_ARB_STATE_SHIFT 24 ++ + /* + * QCA956X GMAC Interface + */ + diff --git a/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch b/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch new file mode 100644 index 0000000000..111c1553d3 --- /dev/null +++ b/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch @@ -0,0 +1,91 @@ +From 60efe35257b063ce584968f9f80b437030ce6ba6 Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Mon, 18 Mar 2019 00:54:06 +0100 +Subject: [PATCH] MIPS: ath79: add missing QCA955x GMAC registers + +This adds missing GMAC register definitions for the Qualcomm Atheros +QCA955X series MIPS SoCs. + +They originate from the platforms U-Boot code and the AVM FRITZ!WLAN +Repeater 450E's GPL tarball. + +Signed-off-by: David Bauer +--- + .../mips/include/asm/mach-ath79/ar71xx_regs.h | 54 +++++++++++++++++++ + 1 file changed, 54 insertions(+) + +--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h ++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +@@ -1245,7 +1245,12 @@ + */ + + #define QCA955X_GMAC_REG_ETH_CFG 0x00 ++#define QCA955X_GMAC_REG_SGMII_RESET 0x14 + #define QCA955X_GMAC_REG_SGMII_SERDES 0x18 ++#define QCA955X_GMAC_REG_MR_AN_CONTROL 0x1c ++#define QCA955X_GMAC_REG_MR_AN_STATUS 0x20 ++#define QCA955X_GMAC_REG_SGMII_CONFIG 0x34 ++#define QCA955X_GMAC_REG_SGMII_DEBUG 0x58 + + #define QCA955X_ETH_CFG_RGMII_EN BIT(0) + #define QCA955X_ETH_CFG_MII_GE0 BIT(1) +@@ -1267,9 +1272,58 @@ + #define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 + #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 + ++#define QCA955X_SGMII_RESET_RX_CLK_N_RESET 0 ++#define QCA955X_SGMII_RESET_RX_CLK_N BIT(0) ++#define QCA955X_SGMII_RESET_TX_CLK_N BIT(1) ++#define QCA955X_SGMII_RESET_RX_125M_N BIT(2) ++#define QCA955X_SGMII_RESET_TX_125M_N BIT(3) ++#define QCA955X_SGMII_RESET_HW_RX_125M_N BIT(4) ++ + #define QCA955X_SGMII_SERDES_LOCK_DETECT_STATUS BIT(15) + #define QCA955X_SGMII_SERDES_RES_CALIBRATION_SHIFT 23 + #define QCA955X_SGMII_SERDES_RES_CALIBRATION_MASK 0xf ++ ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL1 BIT(6) ++#define QCA955X_MR_AN_CONTROL_DUPLEX_MODE BIT(8) ++#define QCA955X_MR_AN_CONTROL_RESTART_AN BIT(9) ++#define QCA955X_MR_AN_CONTROL_POWER_DOWN BIT(11) ++#define QCA955X_MR_AN_CONTROL_AN_ENABLE BIT(12) ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL0 BIT(13) ++#define QCA955X_MR_AN_CONTROL_LOOPBACK BIT(14) ++#define QCA955X_MR_AN_CONTROL_PHY_RESET BIT(15) ++ ++#define QCA955X_MR_AN_STATUS_EXT_CAP BIT(0) ++#define QCA955X_MR_AN_STATUS_LINK_UP BIT(2) ++#define QCA955X_MR_AN_STATUS_AN_ABILITY BIT(3) ++#define QCA955X_MR_AN_STATUS_REMOTE_FAULT BIT(4) ++#define QCA955X_MR_AN_STATUS_AN_COMPLETE BIT(5) ++#define QCA955X_MR_AN_STATUS_NO_PREAMBLE BIT(6) ++#define QCA955X_MR_AN_STATUS_BASE_PAGE BIT(7) ++ ++#define QCA955X_SGMII_CONFIG_MODE_CTRL_SHIFT 0 ++#define QCA955X_SGMII_CONFIG_MODE_CTRL_MASK 0x7 ++#define QCA955X_SGMII_CONFIG_ENABLE_SGMII_TX_PAUSE BIT(3) ++#define QCA955X_SGMII_CONFIG_MR_REG4_CHANGED BIT(4) ++#define QCA955X_SGMII_CONFIG_FORCE_SPEED BIT(5) ++#define QCA955X_SGMII_CONFIG_SPEED_SHIFT 6 ++#define QCA955X_SGMII_CONFIG_SPEED_MASK 0xc0 ++#define QCA955X_SGMII_CONFIG_REMOTE_PHY_LOOPBACK BIT(8) ++#define QCA955X_SGMII_CONFIG_NEXT_PAGE_LOADED BIT(9) ++#define QCA955X_SGMII_CONFIG_MDIO_ENABLE BIT(10) ++#define QCA955X_SGMII_CONFIG_MDIO_PULSE BIT(11) ++#define QCA955X_SGMII_CONFIG_MDIO_COMPLETE BIT(12) ++#define QCA955X_SGMII_CONFIG_PRBS_ENABLE BIT(13) ++#define QCA955X_SGMII_CONFIG_BERT_ENABLE BIT(14) ++ ++#define QCA955X_SGMII_DEBUG_TX_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_TX_STATE_SHIFT 0 ++#define QCA955X_SGMII_DEBUG_RX_STATE_MASK 0xff00 ++#define QCA955X_SGMII_DEBUG_RX_STATE_SHIFT 8 ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_MASK 0xff0000 ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_SHIFT 16 ++#define QCA955X_SGMII_DEBUG_ARB_STATE_MASK 0xf000000 ++#define QCA955X_SGMII_DEBUG_ARB_STATE_SHIFT 24 ++ + /* + * QCA956X GMAC Interface + */ + From 26c25567751646f2ac45c389019a08e37170da73 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 11 Apr 2019 17:59:44 +0200 Subject: [PATCH 427/480] ath79: allow to override AR8033 SGMII aneg status In order to make the QCA955x SGMII workaround work, the unsuccessful SGMII autonegotiation on the AR8033 should not block the PHY state-machine. Otherwise, the ag71xx driver never becomes aware of the copper-side link-establishment and the workaround is never executed. Signed-off-by: David Bauer [remove one trailing whitespace per file] Signed-off-by: Adrian Schmutzler --- .../425-at803x-allow-sgmii-aneg-override.patch | 16 ++++++++++++++++ .../425-at803x-allow-sgmii-aneg-override.patch | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch create mode 100644 target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch diff --git a/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch new file mode 100644 index 0000000000..b0a1942b7a --- /dev/null +++ b/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch @@ -0,0 +1,16 @@ +--- a/drivers/net/phy/at803x.c ++++ b/drivers/net/phy/at803x.c +@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d + if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { + pr_warn("803x_aneg_done: SGMII link is not ok\n"); + aneg_done = 0; ++#ifdef CONFIG_OF_MDIO ++ if (phydev->mdio.dev.of_node && ++ of_property_read_bool(phydev->mdio.dev.of_node, ++ "at803x-override-sgmii-link-check")) { ++ aneg_done = 1; ++ } ++#endif + } + /* switch back to copper page */ + phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL); diff --git a/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch new file mode 100644 index 0000000000..b0a1942b7a --- /dev/null +++ b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch @@ -0,0 +1,16 @@ +--- a/drivers/net/phy/at803x.c ++++ b/drivers/net/phy/at803x.c +@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d + if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { + pr_warn("803x_aneg_done: SGMII link is not ok\n"); + aneg_done = 0; ++#ifdef CONFIG_OF_MDIO ++ if (phydev->mdio.dev.of_node && ++ of_property_read_bool(phydev->mdio.dev.of_node, ++ "at803x-override-sgmii-link-check")) { ++ aneg_done = 1; ++ } ++#endif + } + /* switch back to copper page */ + phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL); From 6aaa5ce2c5138877e0f0504c3bd536b40e9af928 Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Thu, 28 Nov 2019 12:53:01 +0100 Subject: [PATCH 428/480] ath79: add support for MikroTik RouterBOARD wAP G-5HacT2HnD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds support for the MikroTik RouterBOARD wAP G-5HacT2HnD (wAP AC), a small weatherproof dual band, dual-radio 802.11ac wireless AP with integrated omnidirectional anntennae and one 10/100/1000 Mbps Ethernet port. See https://mikrotik.com/product/RBwAPG-5HacT2HnD for more info. Specifications: - SoC: Qualcomm Atheros QCA9556 - RAM: 64 MB - Storage: 16 MB NOR - Wireless: · Atheros AR9550 (SoC) 802.11b/g/n 2x2:2, 2 dBi antennae · Qualcomm QCA9880 802.11a/n/ac 3x3:3, 2 dBi antennae - Ethernet: Atheros AG71xx (SoC, AR8033), 1x 1000/100/10 port, passive PoE in Working: - Board/system detection - Sysupgrade - Serial console - Ethernet - 2.4 GHz radio - 5 GHz radio and LED - Reset button Not working/Unsupported: - 2.4 GHz LED - AP/CAP LED - ZT2046Q SPI temperature and voltage sensor This adds the basic features for supporting MikroTik devices: - a common recipe for mikrotik images in common-mikrotik.mk - support for minor (MikroTik NOR) split firmware (only for generic subtarget so far) Acknowledgments: Robert Marko Andrew Cameron Koen Vandeputte Chuanhong Guo Signed-off-by: Roger Pueyo Centelles Co-developed-by: Adrian Schmutzler Signed-off-by: Adrian Schmutzler Tested-by: Koen Vandeputte --- ...6_mikrotik_routerboard-wap-g-5hact2hnd.dts | 138 ++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 5 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 4 + .../lib/functions/mikrotik-caldata.sh | 21 +++ target/linux/ath79/generic/config-default | 1 + target/linux/ath79/generic/target.mk | 4 +- target/linux/ath79/image/common-mikrotik.mk | 7 + target/linux/ath79/image/generic.mk | 14 ++ 9 files changed, 192 insertions(+), 3 deletions(-) create mode 100644 target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts create mode 100644 target/linux/ath79/generic/base-files/lib/functions/mikrotik-caldata.sh create mode 100644 target/linux/ath79/image/common-mikrotik.mk diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts new file mode 100644 index 0000000000..e13b58b600 --- /dev/null +++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca9557.dtsi" + +/ { + compatible = "mikrotik,routerboard-wap-g-5hact2hnd", "qca,qca9556"; + model = "MikroTik RouterBOARD wAP G-5HacT2HnD"; + + aliases { + label-mac-device = ð1; + mdio-gpio1 = &mdio2; + serial0 = &uart; + }; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + mdio2: mdio { + compatible = "virtual,mdio-gpio"; + + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio 11 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy@0 { + reg = <0>; + device_type = "ethernet-phy"; + + phy-mode = "sgmii"; + + at803x-override-sgmii-link-check; + }; + }; +}; + +ð1 { + status = "okay"; + + mtd-mac-address = <&art 0x10>; + + pll-data = <0x03000101 0x80000101 0x80001313>; + phy-handle = <&phy0>; + + qca955x-sgmii-fixup; + + gmac-config { + device = <&gmac>; + }; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <104000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "routerboot"; + reg = <0x000000 0x00e000>; + read-only; + }; + + art: partition@e000 { + label = "art"; + reg = <0x000e000 0x001000>; + read-only; + }; + + partition@f000 { + label = "bios"; + reg = <0x000f000 0x001000>; + read-only; + }; + + partition@10000 { + label = "routerboot2"; + reg = <0x010000 0x00f000>; + read-only; + }; + + partition@1f000 { + label = "soft_config"; + reg = <0x001f000 0x001000>; + }; + + partition@20000 { + compatible = "mikrotik,minor"; + label = "firmware"; + reg = <0x020000 0xfe0000>; + }; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&wmac { + status = "okay"; + + qca,no-eeprom; +}; + +&pcie0 { + status = "okay"; + + wifi@0,0 { + compatible = "qcom,ath10k"; + reg = <0 0 0 0 0>; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 0bae9dc384..15f2e18e0c 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -21,6 +21,7 @@ ath79_setup_interfaces() dlink,dir-505|\ engenius,ecb1750|\ glinet,gl-ar300m-lite|\ + mikrotik,routerboard-wap-g-5hact2hnd|\ netgear,ex6400|\ netgear,ex7300|\ ocedo,koala|\ diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 4158116256..7a813b0db1 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -3,6 +3,7 @@ [ -e /lib/firmware/$FIRMWARE ] && exit 0 . /lib/functions/caldata.sh +. /lib/functions/mikrotik-caldata.sh board=$(board_name) @@ -40,6 +41,10 @@ case "$FIRMWARE" in caldata_extract "art" 0x1000 0x440 ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env ethaddr) ;; + mikrotik,routerboard-wap-g-5hact2hnd) + mikrotik_caldata_extract "art" 0x1000 0x440 + ath9k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x10) +2) + ;; nec,wg800hp) caldata_extract "art" 0x1000 0x440 ath9k_patch_mac $(mtd_get_mac_text board_data 0x680) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index c24e062b5c..3be2d337b9 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -4,6 +4,7 @@ . /lib/functions/caldata.sh . /lib/functions/k2t.sh +. /lib/functions/mikrotik-caldata.sh board=$(board_name) @@ -64,6 +65,9 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2) ;; + mikrotik,routerboard-wap-g-5hact2hnd) + mikrotik_caldata_extract "art" 0x5000 0x844 + ;; nec,wg800hp) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(mtd_get_mac_text board_data 0x880) diff --git a/target/linux/ath79/generic/base-files/lib/functions/mikrotik-caldata.sh b/target/linux/ath79/generic/base-files/lib/functions/mikrotik-caldata.sh new file mode 100644 index 0000000000..9c4016ee5d --- /dev/null +++ b/target/linux/ath79/generic/base-files/lib/functions/mikrotik-caldata.sh @@ -0,0 +1,21 @@ +# Copyright (C) 2019 Robert Marko +# Copyright (C) 2019 Roger Pueyo Centelles +# +# Helper function to extract MAC addresses and calibration data for MikroTik +# + +mikrotik_caldata_extract() { + local part=$1 + local offset=$(($2)) + local count=$(($3)) + local mtd + local erdfile="/lib/firmware/erd.bin" + + mtd=$(find_mtd_chardev $part) + [ -n "$mtd" ] || caldata_die "no mtd device found for partition $part" + + rbextract -e $mtd $erdfile + + dd if=$erdfile of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \ + caldata_die "failed to extract calibration data from $mtd" +} diff --git a/target/linux/ath79/generic/config-default b/target/linux/ath79/generic/config-default index 20da0b8ba1..2d8f7f20c2 100644 --- a/target/linux/ath79/generic/config-default +++ b/target/linux/ath79/generic/config-default @@ -9,6 +9,7 @@ CONFIG_MICREL_PHY=y CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3 CONFIG_MTD_SPLIT_EVA_FW=y +CONFIG_MTD_SPLIT_MINOR_FW=y CONFIG_PHY_AR7100_USB=y CONFIG_PHY_AR7200_USB=y CONFIG_REGULATOR=y diff --git a/target/linux/ath79/generic/target.mk b/target/linux/ath79/generic/target.mk index 0a26110d27..488aa6df16 100644 --- a/target/linux/ath79/generic/target.mk +++ b/target/linux/ath79/generic/target.mk @@ -1,10 +1,8 @@ BOARDNAME:=Generic -FEATURES += squashfs +FEATURES += minor squashfs DEFAULT_PACKAGES += wpad-basic define Target/Description Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards. endef - - diff --git a/target/linux/ath79/image/common-mikrotik.mk b/target/linux/ath79/image/common-mikrotik.mk new file mode 100644 index 0000000000..292237c76a --- /dev/null +++ b/target/linux/ath79/image/common-mikrotik.mk @@ -0,0 +1,7 @@ +define Device/mikrotik + DEVICE_VENDOR := MikroTik + DEVICE_PACKAGES := rbextract rbcfg + LOADER_TYPE := elf + KERNEL := kernel-bin | append-dtb | lzma | loader-kernel + KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel +endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 800e1c7a7d..e5243dc095 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1,4 +1,5 @@ include ./common-buffalo.mk +include ./common-mikrotik.mk include ./common-netgear.mk include ./common-tp-link.mk include ./common-yuncore.mk @@ -703,6 +704,19 @@ define Device/librerouter_librerouter-v1 endef TARGET_DEVICES += librerouter_librerouter-v1 +define Device/mikrotik_routerboard-wap-g-5hact2hnd + $(Device/mikrotik) + SOC := qca9556 + DEVICE_MODEL := RouterBOARD wAP G-5HacT2HnD (wAP AC) + IMAGE_SIZE := 16256k + IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | \ + pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct + SUPPORTED_DEVICES += rb-wapg-5hact2hnd +endef +TARGET_DEVICES += mikrotik_routerboard-wap-g-5hact2hnd + define Device/nec_wg1200cr SOC := qca9563 DEVICE_VENDOR := NEC From 071a6372762d289b2fa5a8d1a138eff944c93c9e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 22 Jan 2020 18:06:07 +0100 Subject: [PATCH 429/480] ath79: move lzma-loader to the end of available RAM In certain cases, the uncompressed initramfs image will overwrite the lzma-loader, which is currently only 10 MB away from kernel image start. To prevent this, change LZMA_TEXT_START to 24 MB, so loader and compressed image have 8 MB at the end of RAM and uncompressed image has 24 MB available. This is only enabled for ath79 at the moment, as there we can be sure that all devices have 32+ MB RAM and TARGET_INITRAMFS_COMPRESSION_LZMA is not enabled there. Despite, since lzma-loader is currently build specifically for ath79 anyway, there is no need to re-specify LOADADDR and LZMA_TEXT_START in image/Makefile, so the values are set directly in image/lzma-loader/Makefile and the overwrite in image/Makefile is removed. Signed-off-by: Adrian Schmutzler Tested-by: Koen Vandeputte --- target/linux/ath79/image/Makefile | 1 - target/linux/ath79/image/lzma-loader/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index 34bd0a2490..a28658ec0b 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -10,7 +10,6 @@ define Build/loader-common $(MAKE) -C lzma-loader \ PKG_BUILD_DIR="$@.src" \ TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \ - LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \ $(1) compile loader.$(LOADER_TYPE) mv "$@.$(LOADER_TYPE)" "$@" rm -rf $@.src diff --git a/target/linux/ath79/image/lzma-loader/Makefile b/target/linux/ath79/image/lzma-loader/Makefile index 738093a958..0ff59bc56a 100644 --- a/target/linux/ath79/image/lzma-loader/Makefile +++ b/target/linux/ath79/image/lzma-loader/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk -LZMA_TEXT_START := 0x80a00000 +LZMA_TEXT_START := 0x81800000 LOADADDR := 0x80060000 LOADER := loader.bin LOADER_NAME := $(basename $(notdir $(LOADER))) -LOADER_DATA := +LOADER_DATA := TARGET_DIR := FLASH_OFFS := FLASH_MAX := From 07ce940b77e6aceb095b0a16dda41e190dfc5b87 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 23 Jan 2020 15:42:48 +0100 Subject: [PATCH 430/480] ath79: fix SUPPORTED_DEVICES not matching ar71xx board names Based on a script for comparison, this fixes (hopefully) all errors in SUPPORTED_DEVICES for ar71xx->ath79 upgrade. Devices where old string is removed as the device does not exist in ar71xx: - dlink_dir-859-a1 - tplink_archer-a7-v5 - tplink_cpe510-v3 Devices where string is changed because it did not match the board name in ar71xx: - tplink_tl-mr3220-v1 - tplink_tl-mr3420-v1 - tplink_tl-wr2543-v1 - tplink_tl-wr741nd-v4 - tplink_tl-wr841-v7 - ubnt_unifiac-mesh - ubnt_unifiac-mesh-pro - ubnt_unifiac-pro For this device, the correct string could not be found, but we could not determine the correct one. Thus, the string is removed for now: - tplink_tl-wr740n-v4 The script for checking this is quite simple (note that newer entries, i.e. ath79->ath79 upgrade, are displayed as missing): newpath=target/linux/ath79/image/ oldpath=target/linux/ar71xx/base-files/lib/ar71xx.sh for s in $(grep -roh "SUPPORTED_DEVICES.*" $newpath | sed 's/SUPPORTED_DEVICES *.= *//'); do found="Missing" grep -q -r "\"$s\"" $oldpath && found="Found" echo "$s: $found." done The errors might be filtered by appending 'grep "Missing"' to the script. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/generic-tp-link.mk | 4 +--- target/linux/ath79/image/generic-ubnt.mk | 6 +++--- target/linux/ath79/image/generic.mk | 1 - target/linux/ath79/image/tiny-tp-link.mk | 9 ++++----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 53138e343b..7ac27759cc 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -10,7 +10,6 @@ define Device/tplink_archer-a7-v5 ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-A7-V5 BOARDNAME := ARCHER-A7-V5 - SUPPORTED_DEVICES += archer-a7-v5 endef TARGET_DEVICES += tplink_archer-a7-v5 @@ -306,7 +305,6 @@ define Device/tplink_cpe510-v3 DEVICE_VARIANT := v3 DEVICE_PACKAGES := rssileds TPLINK_BOARD_ID := CPE510V3 - SUPPORTED_DEVICES += cpe510-v3 endef TARGET_DEVICES += tplink_cpe510-v3 @@ -517,7 +515,7 @@ define Device/tplink_tl-wr2543-v1 IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -v 3.13.99 | \ append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := tplink-v1-image factory -v 3.13.99 - SUPPORTED_DEVICES += tl-wr2543-v1 + SUPPORTED_DEVICES += tl-wr2543n endef TARGET_DEVICES += tplink_tl-wr2543-v1 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 78364caffe..49564201e2 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -268,14 +268,14 @@ TARGET_DEVICES += ubnt_unifiac-lr define Device/ubnt_unifiac-mesh $(Device/ubnt_unifiac) DEVICE_MODEL := UniFi AC-Mesh - SUPPORTED_DEVICES += ubnt-unifiac-mesh + SUPPORTED_DEVICES += unifiac-lite endef TARGET_DEVICES += ubnt_unifiac-mesh define Device/ubnt_unifiac-mesh-pro $(Device/ubnt_unifiac) DEVICE_MODEL := UniFi AC-Mesh Pro - SUPPORTED_DEVICES += ubnt-unifiac-mesh-pro + SUPPORTED_DEVICES += unifiac-pro endef TARGET_DEVICES += ubnt_unifiac-mesh-pro @@ -283,6 +283,6 @@ define Device/ubnt_unifiac-pro $(Device/ubnt_unifiac) DEVICE_MODEL := UniFi AC-Pro DEVICE_PACKAGES += kmod-usb2 - SUPPORTED_DEVICES += ubnt-unifiac-pro + SUPPORTED_DEVICES += unifiac-pro endef TARGET_DEVICES += ubnt_unifiac-pro diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index e5243dc095..4f45b122ce 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -486,7 +486,6 @@ define Device/dlink_dir-859-a1 IMAGE_SIZE := 15872k DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct SEAMA_SIGNATURE := wrgac37_dlink.2013gui_dir859 - SUPPORTED_DEVICES += dir-859-a1 endef TARGET_DEVICES += dlink_dir-859-a1 diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index e5208530d6..2107e47cc3 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -40,7 +40,7 @@ define Device/tplink_tl-mr3220-v1 DEVICE_VARIANT := v1 TPLINK_HWID := 0x32200001 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport - SUPPORTED_DEVICES += tl-mr3220-v1 + SUPPORTED_DEVICES += tl-mr3220 endef TARGET_DEVICES += tplink_tl-mr3220-v1 @@ -51,7 +51,7 @@ define Device/tplink_tl-mr3420-v1 DEVICE_VARIANT := v1 TPLINK_HWID := 0x34200001 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport - SUPPORTED_DEVICES += tl-mr3420-v1 + SUPPORTED_DEVICES += tl-mr3420 endef TARGET_DEVICES += tplink_tl-mr3420-v1 @@ -134,7 +134,6 @@ define Device/tplink_tl-wr740n-v4 DEVICE_MODEL := TL-WR740N DEVICE_VARIANT := v4 TPLINK_HWID := 0x07400004 - SUPPORTED_DEVICES += tl-wr740n-v4 endef TARGET_DEVICES += tplink_tl-wr740n-v4 @@ -153,7 +152,7 @@ define Device/tplink_tl-wr741nd-v4 DEVICE_MODEL := TL-WR741N/ND DEVICE_VARIANT := v4 TPLINK_HWID := 0x07410004 - SUPPORTED_DEVICES += tl-wr741n-v4 + SUPPORTED_DEVICES += tl-wr741nd-v4 endef TARGET_DEVICES += tplink_tl-wr741nd-v4 @@ -181,7 +180,7 @@ define Device/tplink_tl-wr841-v7 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v7 TPLINK_HWID := 0x08410007 - SUPPORTED_DEVICES += tl-wr841-v7 + SUPPORTED_DEVICES += tl-wr841n-v7 endef TARGET_DEVICES += tplink_tl-wr841-v7 From c6c4701def07cd01a1b077cee93f64a9b2e3b5be Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 23 Jan 2020 17:40:06 +0100 Subject: [PATCH 431/480] kernel: fix dst reference leak in flow offload Fixes a significant amount of leaked memory with lots of connections Signed-off-by: Felix Fietkau --- .../650-netfilter-add-xt_OFFLOAD-target.patch | 23 ++++++++++--------- .../650-netfilter-add-xt_OFFLOAD-target.patch | 23 ++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch index a78b4cdf9c..7c93feccdc 100644 --- a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch +++ b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o --- /dev/null +++ b/net/netfilter/xt_FLOWOFFLOAD.c -@@ -0,0 +1,421 @@ +@@ -0,0 +1,422 @@ +/* + * Copyright (C) 2018 Felix Fietkau + * @@ -330,15 +330,16 @@ Signed-off-by: Felix Fietkau + + this_dst = xt_flowoffload_dst(ct, !dir, par, xt_out(par)->ifindex); + other_dst = xt_flowoffload_dst(ct, dir, par, xt_in(par)->ifindex); ++ ++ route->tuple[dir].dst = this_dst; ++ route->tuple[!dir].dst = other_dst; ++ + if (!this_dst || !other_dst) + return -ENOENT; + + if (dst_xfrm(this_dst) || dst_xfrm(other_dst)) + return -EINVAL; + -+ route->tuple[dir].dst = this_dst; -+ route->tuple[!dir].dst = other_dst; -+ + return 0; +} + @@ -350,7 +351,7 @@ Signed-off-by: Felix Fietkau + enum ip_conntrack_info ctinfo; + enum ip_conntrack_dir dir; + struct nf_flow_route route; -+ struct flow_offload *flow; ++ struct flow_offload *flow = NULL; + struct nf_conn *ct; + struct net *net; + @@ -392,12 +393,14 @@ Signed-off-by: Felix Fietkau + + dir = CTINFO2DIR(ctinfo); + -+ if (xt_flowoffload_route(skb, ct, par, &route, dir) < 0) -+ goto err_flow_route; ++ if (xt_flowoffload_route(skb, ct, par, &route, dir) == 0) ++ flow = flow_offload_alloc(ct, &route); ++ ++ dst_release(route.tuple[dir].dst); ++ dst_release(route.tuple[!dir].dst); + -+ flow = flow_offload_alloc(ct, &route); + if (!flow) -+ goto err_flow_alloc; ++ goto err_flow_route; + + if (tcph) { + ct->proto.tcp.seen[0].flags |= IP_CT_TCP_FLAG_BE_LIBERAL; @@ -421,8 +424,6 @@ Signed-off-by: Felix Fietkau + +err_flow_add: + flow_offload_free(flow); -+err_flow_alloc: -+ dst_release(route.tuple[!dir].dst); +err_flow_route: + clear_bit(IPS_OFFLOAD_BIT, &ct->status); + return XT_CONTINUE; diff --git a/target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch index b41e238eae..55247bc2a3 100644 --- a/target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch +++ b/target/linux/generic/hack-4.19/650-netfilter-add-xt_OFFLOAD-target.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o --- /dev/null +++ b/net/netfilter/xt_FLOWOFFLOAD.c -@@ -0,0 +1,421 @@ +@@ -0,0 +1,422 @@ +/* + * Copyright (C) 2018 Felix Fietkau + * @@ -330,15 +330,16 @@ Signed-off-by: Felix Fietkau + + this_dst = xt_flowoffload_dst(ct, !dir, par, xt_out(par)->ifindex); + other_dst = xt_flowoffload_dst(ct, dir, par, xt_in(par)->ifindex); ++ ++ route->tuple[dir].dst = this_dst; ++ route->tuple[!dir].dst = other_dst; ++ + if (!this_dst || !other_dst) + return -ENOENT; + + if (dst_xfrm(this_dst) || dst_xfrm(other_dst)) + return -EINVAL; + -+ route->tuple[dir].dst = this_dst; -+ route->tuple[!dir].dst = other_dst; -+ + return 0; +} + @@ -350,7 +351,7 @@ Signed-off-by: Felix Fietkau + enum ip_conntrack_info ctinfo; + enum ip_conntrack_dir dir; + struct nf_flow_route route; -+ struct flow_offload *flow; ++ struct flow_offload *flow = NULL; + struct nf_conn *ct; + struct net *net; + @@ -392,12 +393,14 @@ Signed-off-by: Felix Fietkau + + dir = CTINFO2DIR(ctinfo); + -+ if (xt_flowoffload_route(skb, ct, par, &route, dir) < 0) -+ goto err_flow_route; ++ if (xt_flowoffload_route(skb, ct, par, &route, dir) == 0) ++ flow = flow_offload_alloc(ct, &route); ++ ++ dst_release(route.tuple[dir].dst); ++ dst_release(route.tuple[!dir].dst); + -+ flow = flow_offload_alloc(ct, &route); + if (!flow) -+ goto err_flow_alloc; ++ goto err_flow_route; + + if (tcph) { + ct->proto.tcp.seen[0].flags |= IP_CT_TCP_FLAG_BE_LIBERAL; @@ -421,8 +424,6 @@ Signed-off-by: Felix Fietkau + +err_flow_add: + flow_offload_free(flow); -+err_flow_alloc: -+ dst_release(route.tuple[!dir].dst); +err_flow_route: + clear_bit(IPS_OFFLOAD_BIT, &ct->status); + return XT_CONTINUE; From 76bbe4b960dcdfe5ae8b5d0dc078ca712dafaa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Fri, 24 Jan 2020 06:41:56 +0100 Subject: [PATCH 432/480] procd: update to version 2020-01-24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 00aafc4f439e procd: show process's exit code 856b5f8be046 state: fix reboot causing shutdown inside LXC container b44417c20c7f instance: provide error feedback if ujail binary is missing Signed-off-by: Petr Štetiar --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index b9dc5d026a..978da29dd0 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-01-21 -PKG_SOURCE_VERSION:=81b88b1c63770542985f8cb0665eff37e27eb412 -PKG_MIRROR_HASH:=4ed6340f15e5ee267d31789f71294d4ef259f6880c0db528061ddb24be7fcdde +PKG_SOURCE_DATE:=2020-01-24 +PKG_SOURCE_VERSION:=00aafc4f439ec3ace834c1a803b899bd1ceba9db +PKG_MIRROR_HASH:=0d5abe409f8dd5979fa753c2f9999c0434a4b465079fcdd861494814992f1980 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 2d758129ca000620ab07f78e774464a96e8f212d Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Tue, 21 Jan 2020 01:06:22 +0800 Subject: [PATCH 433/480] ath10k-firmware: fix mirror hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix PKG_MIRROR_HASH hash mismatch. Fixes: 641a93f0f226 ("ath10k-firmware: update wave 1 firmware to 10.2.4-1.0-00047") Signed-off-by: DENG Qingfang [added missing commit description] Signed-off-by: Petr Štetiar --- package/firmware/ath10k-firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index 394580549b..9f1e7e676b 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ath10k-firmware PKG_SOURCE_DATE:=2019-10-03 PKG_SOURCE_VERSION:=d622d160e9f552ead68d9ae81b715422892dc2ef -PKG_MIRROR_HASH:=9d56a9942b7be7effdeed6d0688a9bdcfae76a2921a630714c3e2d8390ea8934 +PKG_MIRROR_HASH:=2e504e071c3f896d629c4cfffe7ff4b5f1acdb4fecd3f01e8ff8c73e87a67cc7 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git From ec13b341186b4be0a594e226120dc0776ec83f86 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 21 Jan 2020 16:42:57 +0100 Subject: [PATCH 434/480] wireguard: bump to 0.0.20200121 * Makefile: strip prefixed v from version.h This fixes a mistake in dmesg output and when parsing the sysfs entry in the filesystem. * device: skb_list_walk_safe moved upstream This is a 5.6 change, which we won't support here, but it does make the code cleaner, so we make this change to keep things in sync. * curve25519: x86_64: replace with formally verified implementation This comes from INRIA's HACL*/Vale. It implements the same algorithm and implementation strategy as the code it replaces, only this code has been formally verified, sans the base point multiplication, which uses code similar to prior, only it uses the formally verified field arithmetic alongside reproducable ladder generation steps. This doesn't have a pure-bmi2 version, which means haswell no longer benefits, but the increased (doubled) code complexity is not worth it for a single generation of chips that's already old. Performance-wise, this is around 1% slower on older microarchitectures, and slightly faster on newer microarchitectures, mainly 10nm ones or backports of 10nm to 14nm. This implementation is "everest" below: Xeon E5-2680 v4 (Broadwell) armfazh: 133340 cycles per call everest: 133436 cycles per call Xeon Gold 5120 (Sky Lake Server) armfazh: 112636 cycles per call everest: 113906 cycles per call Core i5-6300U (Sky Lake Client) armfazh: 116810 cycles per call everest: 117916 cycles per call Core i7-7600U (Kaby Lake) armfazh: 119523 cycles per call everest: 119040 cycles per call Core i7-8750H (Coffee Lake) armfazh: 113914 cycles per call everest: 113650 cycles per call Core i9-9880H (Coffee Lake Refresh) armfazh: 112616 cycles per call everest: 114082 cycles per call Core i3-8121U (Cannon Lake) armfazh: 113202 cycles per call everest: 111382 cycles per call Core i7-8265U (Whiskey Lake) armfazh: 127307 cycles per call everest: 127697 cycles per call Core i7-8550U (Kaby Lake Refresh) armfazh: 127522 cycles per call everest: 127083 cycles per call Xeon Platinum 8275CL (Cascade Lake) armfazh: 114380 cycles per call everest: 114656 cycles per call Achieving these kind of results with formally verified code is quite remarkable, especialy considering that performance is favorable for newer chips. Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 9593c1d19d..7f0827af7b 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20200105 +PKG_VERSION:=0.0.20200121 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=9f12f68e96f6865325995c38213e09b05751cd1ef03e0bbc9f1bdc3e5680b337 +PKG_HASH:=7726c2994d11913c4543fd3dc83636f7ce573ca689b15e11b83e980acc04422b PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 4576a753f2afd9dcfa7ca129c57bc0712dca2fca Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 21 Jan 2020 16:42:58 +0100 Subject: [PATCH 435/480] wireguard-tools: bump to 1.0.20200121 * Makefile: remove pwd from compile output * Makefile: add standard 'all' target * Makefile: evaluate git version lazily Quality of life improvements for packagers. * ipc: simplify inflatable buffer and add fuzzer * fuzz: add generic command argument fuzzer * fuzz: add set and setconf fuzzers More fuzzers and a slicker string list implementation. These fuzzers now find themselves configuring wireguard interfaces from scratch after several million mutations, which is fun to watch. * netlink: make sure to clear return value when trying again Prior, if a dump was interrupted by a concurrent set operation, we'd try again, but forget to reset an error flag, so we'd keep trying again forever. Now we do the right thing and succeed when we succeed. * Makefile: sort inputs to linker so that build is reproducible Earlier versions of make(1) passed GLOB_NOSORT to glob(3), resulting in the linker receiving its inputs in a filesystem-dependent order. This screwed up reproducible builds. Signed-off-by: Jason A. Donenfeld --- package/network/utils/wireguard-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index afde98abf4..4203045b42 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard-tools -PKG_VERSION:=1.0.20200102 +PKG_VERSION:=1.0.20200121 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ -PKG_HASH:=547cd1c2f8dca904faac9e8d3964f1ef956c24bb12e3498da88dde95243c7f08 +PKG_HASH:=15bfdbdbecbd3870ced9a7e68286c871bfcb2071d165f113808081f2e428faa3 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 7a57e82f28a262b319ee2e1792d917778c95fe93 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 24 Jan 2020 11:21:47 +0000 Subject: [PATCH 436/480] kernel: act_ctinfo: backport memory leak fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ Upstream commit 09d4f10a5e78d76a53e3e584f1e6a701b6d24108 ] Implement a cleanup method to properly free ci->params BUG: memory leak unreferenced object 0xffff88811746e2c0 (size 64): comm "syz-executor617", pid 7106, jiffies 4294943055 (age 14.250s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ c0 34 60 84 ff ff ff ff 00 00 00 00 00 00 00 00 .4`............. backtrace: [<0000000015aa236f>] kmemleak_alloc_recursive include/linux/kmemleak.h:43 [inline] [<0000000015aa236f>] slab_post_alloc_hook mm/slab.h:586 [inline] [<0000000015aa236f>] slab_alloc mm/slab.c:3320 [inline] [<0000000015aa236f>] kmem_cache_alloc_trace+0x145/0x2c0 mm/slab.c:3549 [<000000002c946bd1>] kmalloc include/linux/slab.h:556 [inline] [<000000002c946bd1>] kzalloc include/linux/slab.h:670 [inline] [<000000002c946bd1>] tcf_ctinfo_init+0x21a/0x530 net/sched/act_ctinfo.c:236 [<0000000086952cca>] tcf_action_init_1+0x400/0x5b0 net/sched/act_api.c:944 [<000000005ab29bf8>] tcf_action_init+0x135/0x1c0 net/sched/act_api.c:1000 [<00000000392f56f9>] tcf_action_add+0x9a/0x200 net/sched/act_api.c:1410 [<0000000088f3c5dd>] tc_ctl_action+0x14d/0x1bb net/sched/act_api.c:1465 [<000000006b39d986>] rtnetlink_rcv_msg+0x178/0x4b0 net/core/rtnetlink.c:5424 [<00000000fd6ecace>] netlink_rcv_skb+0x61/0x170 net/netlink/af_netlink.c:2477 [<0000000047493d02>] rtnetlink_rcv+0x1d/0x30 net/core/rtnetlink.c:5442 [<00000000bdcf8286>] netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline] [<00000000bdcf8286>] netlink_unicast+0x223/0x310 net/netlink/af_netlink.c:1328 [<00000000fc5b92d9>] netlink_sendmsg+0x2c0/0x570 net/netlink/af_netlink.c:1917 [<00000000da84d076>] sock_sendmsg_nosec net/socket.c:639 [inline] [<00000000da84d076>] sock_sendmsg+0x54/0x70 net/socket.c:659 [<0000000042fb2eee>] ____sys_sendmsg+0x2d0/0x300 net/socket.c:2330 [<000000008f23f67e>] ___sys_sendmsg+0x8a/0xd0 net/socket.c:2384 [<00000000d838e4f6>] __sys_sendmsg+0x80/0xf0 net/socket.c:2417 [<00000000289a9cb1>] __do_sys_sendmsg net/socket.c:2426 [inline] [<00000000289a9cb1>] __se_sys_sendmsg net/socket.c:2424 [inline] [<00000000289a9cb1>] __x64_sys_sendmsg+0x23/0x30 net/socket.c:2424 Fixes: 24ec483cec98 ("net: sched: Introduce act_ctinfo action") Signed-off-by: Eric Dumazet Reported-by: syzbot Cc: Kevin 'ldir' Darbyshire-Bryant Cc: Cong Wang Cc: Toke Høiland-Jørgensen Acked-by: Kevin 'ldir' Darbyshire-Bryant Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Kevin Darbyshire-Bryant --- ...et-sched-Introduce-act_ctinfo-action.patch | 18 ++++++++++++++---- ...et-sched-Introduce-act_ctinfo-action.patch | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index 64f6620b2a..617112186e 100644 --- a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -1,4 +1,4 @@ -From 147b0d133b53635db0cc572294840652c9c7b662 Mon Sep 17 00:00:00 2001 +From 85fc2a6db8279c5e43c38ef7e715d14e57287997 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 13 Mar 2019 20:54:49 +0000 Subject: [PATCH] net: sched: Backport Introduce act_ctinfo action @@ -112,8 +112,8 @@ Signed-off-by: Kevin Darbyshire-Bryant include/uapi/linux/tc_act/tc_ctinfo.h | 29 ++ net/sched/Kconfig | 13 + net/sched/Makefile | 1 + - net/sched/act_ctinfo.c | 394 ++++++++++++++++++++++++++ - 6 files changed, 472 insertions(+), 1 deletion(-) + net/sched/act_ctinfo.c | 404 ++++++++++++++++++++++++++ + 6 files changed, 482 insertions(+), 1 deletion(-) create mode 100644 include/net/tc_act/tc_ctinfo.h create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h create mode 100644 net/sched/act_ctinfo.c @@ -232,7 +232,7 @@ Signed-off-by: Kevin Darbyshire-Bryant obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o --- /dev/null +++ b/net/sched/act_ctinfo.c -@@ -0,0 +1,394 @@ +@@ -0,0 +1,404 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* net/sched/act_ctinfo.c netfilter ctinfo connmark actions + * @@ -579,6 +579,15 @@ Signed-off-by: Kevin Darbyshire-Bryant + return tcf_idr_search(tn, a, index); +} + ++{ ++ struct tcf_ctinfo *ci = to_ctinfo(a); ++ struct tcf_ctinfo_params *cp; ++ ++ cp = rcu_dereference_protected(ci->params, 1); ++ if (cp) ++ kfree_rcu(cp, rcu); ++} ++ +static struct tc_action_ops act_ctinfo_ops = { + .kind = "ctinfo", + .type = TCA_ID_CTINFO, @@ -586,6 +595,7 @@ Signed-off-by: Kevin Darbyshire-Bryant + .act = tcf_ctinfo_act, + .dump = tcf_ctinfo_dump, + .init = tcf_ctinfo_init, ++ .cleanup= tcf_ctinfo_cleanup, + .walk = tcf_ctinfo_walker, + .lookup = tcf_ctinfo_search, + .size = sizeof(struct tcf_ctinfo), diff --git a/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index 8e04dce309..a680402f26 100644 --- a/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -1,4 +1,4 @@ -From 6d8071bbbdcd9d3a2fbb49e55b51617906e3b816 Mon Sep 17 00:00:00 2001 +From d129a72f465dab2d9fc8f1580c38600a8b808327 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 13 Mar 2019 20:54:49 +0000 Subject: [PATCH] net: sched: Backport Introduce act_ctinfo action @@ -112,9 +112,9 @@ Signed-off-by: Kevin Darbyshire-Bryant include/uapi/linux/tc_act/tc_ctinfo.h | 29 ++ net/sched/Kconfig | 17 + net/sched/Makefile | 1 + - net/sched/act_ctinfo.c | 409 ++++++++++++++++++++++ + net/sched/act_ctinfo.c | 420 ++++++++++++++++++++++ tools/testing/selftests/tc-testing/config | 1 + - 7 files changed, 492 insertions(+), 1 deletion(-) + 7 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 include/net/tc_act/tc_ctinfo.h create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h create mode 100644 net/sched/act_ctinfo.c @@ -237,7 +237,7 @@ Signed-off-by: Kevin Darbyshire-Bryant obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o --- /dev/null +++ b/net/sched/act_ctinfo.c -@@ -0,0 +1,409 @@ +@@ -0,0 +1,420 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* net/sched/act_ctinfo.c netfilter ctinfo connmark actions + * @@ -601,6 +601,16 @@ Signed-off-by: Kevin Darbyshire-Bryant + return tcf_idr_search(tn, a, index); +} + ++static void tcf_ctinfo_cleanup(struct tc_action *a) ++{ ++ struct tcf_ctinfo *ci = to_ctinfo(a); ++ struct tcf_ctinfo_params *cp; ++ ++ cp = rcu_dereference_protected(ci->params, 1); ++ if (cp) ++ kfree_rcu(cp, rcu); ++} ++ +static struct tc_action_ops act_ctinfo_ops = { + .kind = "ctinfo", + .type = TCA_ID_CTINFO, @@ -609,6 +619,7 @@ Signed-off-by: Kevin Darbyshire-Bryant + .dump = tcf_ctinfo_dump, + .init = tcf_ctinfo_init, + .walk = tcf_ctinfo_walker, ++ .cleanup= tcf_ctinfo_cleanup, + .lookup = tcf_ctinfo_search, + .size = sizeof(struct tcf_ctinfo), +}; From 76254cb75e4abc2a87e13134915cd0c422926fde Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 24 Jan 2020 11:13:35 +0100 Subject: [PATCH 437/480] kernel: bump 4.14 to 4.14.167 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../patches-4.14/902-at803x-add-reset-gpio-pdata.patch | 2 +- .../903-at803x-add-sgmii-aneg-override-pdata.patch | 4 ++-- .../ar71xx/patches-4.14/910-unaligned_access_hacks.patch | 2 +- .../0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch | 5 ++--- .../patches-4.14/425-at803x-allow-sgmii-aneg-override.patch | 2 +- .../ath79/patches-4.14/910-unaligned_access_hacks.patch | 2 +- ...30-USB-serial-option-fix-dwm-158-3g-modem-interface.patch | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index c4186b8d3e..71c2ae7c6d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .166 +LINUX_VERSION-4.14 = .167 LINUX_VERSION-4.19 = .97 -LINUX_KERNEL_HASH-4.14.166 = 8bb2bf811a2092933a2386a4e679cd0c88de979c10fbb463d8142add4e577c00 +LINUX_KERNEL_HASH-4.14.167 = 2bb78fc7a902faf4f5dad47fdbc2f4bf3df3cf9b41f408e7260f36656659fe43 LINUX_KERNEL_HASH-4.19.97 = 8fb2a328e05e545274e721cf84baaf612b9330febc6f581b9ead81eaf41496da remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch b/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch index 81de68c9cb..e4e51963bb 100644 --- a/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch +++ b/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(gpiod_reset)) return PTR_ERR(gpiod_reset); -@@ -411,15 +418,23 @@ static void at803x_link_change_notify(st +@@ -402,15 +409,23 @@ static void at803x_link_change_notify(st * cannot recover from by software. */ if (phydev->state == PHY_NOLINK) { diff --git a/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch b/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch index 8948fd4954..600f8ff6de 100644 --- a/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch +++ b/target/linux/ar71xx/patches-4.14/903-at803x-add-sgmii-aneg-override-pdata.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c -@@ -478,12 +478,15 @@ static void at803x_link_change_notify(st +@@ -458,12 +458,15 @@ static void at803x_link_change_notify(st static int at803x_aneg_done(struct phy_device *phydev) { @@ -16,7 +16,7 @@ /* * in SGMII mode, if copper side autoneg is successful, * also check SGMII side autoneg result -@@ -498,7 +501,8 @@ static int at803x_aneg_done(struct phy_d +@@ -478,7 +481,8 @@ static int at803x_aneg_done(struct phy_d /* check if the SGMII link is OK. */ if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { pr_warn("803x_aneg_done: SGMII link is not ok\n"); diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index d1dd056f76..f2732ebb20 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -757,7 +757,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch b/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch index 111c1553d3..dc0af2fe9c 100644 --- a/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch +++ b/target/linux/ath79/patches-4.14/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -1245,7 +1245,12 @@ +@@ -1249,7 +1249,12 @@ */ #define QCA955X_GMAC_REG_ETH_CFG 0x00 @@ -29,7 +29,7 @@ Signed-off-by: David Bauer #define QCA955X_ETH_CFG_RGMII_EN BIT(0) #define QCA955X_ETH_CFG_MII_GE0 BIT(1) -@@ -1267,9 +1272,58 @@ +@@ -1271,9 +1276,58 @@ #define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 @@ -88,4 +88,3 @@ Signed-off-by: David Bauer /* * QCA956X GMAC Interface */ - diff --git a/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch index b0a1942b7a..3b302dcd9e 100644 --- a/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch +++ b/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c -@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d +@@ -472,6 +472,13 @@ static int at803x_aneg_done(struct phy_d if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { pr_warn("803x_aneg_done: SGMII link is not ok\n"); aneg_done = 0; diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index 29455b8907..6234ba4703 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -737,7 +737,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3877,14 +3877,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3878,14 +3878,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch index f70cfef762..c09a5e47f8 100644 --- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch +++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1975,7 +1975,8 @@ static const struct usb_device_id option +@@ -1981,7 +1981,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, From 40842167d2fffc053698e17f5dbadbc7b78644cf Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 24 Jan 2020 11:20:03 +0100 Subject: [PATCH 438/480] kernel: bump 4.19 to 4.19.98 Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch | 5 ++--- .../patches-4.19/0038-at803x-disable-delays.patch | 2 +- .../425-at803x-allow-sgmii-aneg-override.patch | 2 +- .../patches-4.19/910-unaligned_access_hacks.patch | 2 +- .../patches-4.19/950-0039-Add-dwc_otg-driver.patch | 2 +- ...x-Debounce-link-events-to-minimize-poll-storm.patch | 2 +- ...er-nf_flow_table-add-hardware-offload-support.patch | 6 +++--- .../735-net-phy-at803x-fix-at8033-sgmii-mode.patch | 10 +++++----- .../patches-4.19/700-net-add-qualcomm-mdio.patch | 2 +- .../patches-4.19/705-net-add-qualcomm-ar40xx-phy.patch | 2 +- .../mediatek/patches-4.19/0003-switch-add-mt7531.patch | 2 +- 12 files changed, 20 insertions(+), 21 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 71c2ae7c6d..429256f400 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.14 = .167 -LINUX_VERSION-4.19 = .97 +LINUX_VERSION-4.19 = .98 LINUX_KERNEL_HASH-4.14.167 = 2bb78fc7a902faf4f5dad47fdbc2f4bf3df3cf9b41f408e7260f36656659fe43 -LINUX_KERNEL_HASH-4.19.97 = 8fb2a328e05e545274e721cf84baaf612b9330febc6f581b9ead81eaf41496da +LINUX_KERNEL_HASH-4.19.98 = 91feb13bc22d60d69596ab1d01dfecbec13ef70f00c89a483e0733af94dd2937 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch b/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch index 111c1553d3..dc0af2fe9c 100644 --- a/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch +++ b/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -1245,7 +1245,12 @@ +@@ -1249,7 +1249,12 @@ */ #define QCA955X_GMAC_REG_ETH_CFG 0x00 @@ -29,7 +29,7 @@ Signed-off-by: David Bauer #define QCA955X_ETH_CFG_RGMII_EN BIT(0) #define QCA955X_ETH_CFG_MII_GE0 BIT(1) -@@ -1267,9 +1272,58 @@ +@@ -1271,9 +1276,58 @@ #define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 @@ -88,4 +88,3 @@ Signed-off-by: David Bauer /* * QCA956X GMAC Interface */ - diff --git a/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch b/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch index 56325a831e..c7a9b3cc78 100644 --- a/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch +++ b/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch @@ -10,7 +10,7 @@ with kernel 5.1 and higher. It can be safely dropped with kernel 5.1. --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c -@@ -295,6 +295,14 @@ static int at803x_config_init(struct phy +@@ -279,6 +279,14 @@ static int at803x_config_init(struct phy if (ret < 0) return ret; diff --git a/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch index b0a1942b7a..43c11386c7 100644 --- a/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch +++ b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c -@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d +@@ -391,6 +391,13 @@ static int at803x_aneg_done(struct phy_d if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { pr_warn("803x_aneg_done: SGMII link is not ok\n"); aneg_done = 0; diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index 201ad740f1..6f36dc683c 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -728,7 +728,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3894,14 +3894,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3895,14 +3895,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/brcm2708/patches-4.19/950-0039-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.19/950-0039-Add-dwc_otg-driver.patch index 346a575050..79c2aa17f0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0039-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0039-Add-dwc_otg-driver.patch @@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408 } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5221,7 +5221,7 @@ static void port_event(struct usb_hub *h +@@ -5222,7 +5222,7 @@ static void port_event(struct usb_hub *h u16 status = 0, unused; port_dev->over_current_count++; diff --git a/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index b481294674..98e97706b0 100644 --- a/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.19/950-0261-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3822,7 +3827,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3823,7 +3828,12 @@ static int lan78xx_probe(struct usb_inte dev->pipe_intr = usb_rcvintpipe(dev->udev, dev->ep_intr->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index d9274012cb..a4996efbc8 100644 --- a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5478,6 +5478,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5490,6 +5490,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5609,10 +5616,19 @@ static int nf_tables_newflowtable(struct +@@ -5621,10 +5628,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5738,7 +5754,8 @@ static int nf_tables_fill_flowtable_info +@@ -5750,7 +5766,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch index 1f81b37f71..5c00b8781f 100644 --- a/target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch +++ b/target/linux/generic/pending-4.19/735-net-phy-at803x-fix-at8033-sgmii-mode.patch @@ -13,17 +13,17 @@ Signed-off-by: Roman Yeryomin --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c -@@ -46,6 +46,7 @@ +@@ -44,6 +44,7 @@ #define AT803X_FUNC_DATA 0x4003 #define AT803X_REG_CHIP_CONFIG 0x1f #define AT803X_BT_BX_REG_SEL 0x8000 +#define AT803X_SGMII_ANEG_EN 0x1000 - #define AT803X_PCS_SMART_EEE_CTRL3 0x805D - #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3 -@@ -268,6 +269,27 @@ static int at803x_config_init(struct phy + #define AT803X_DEBUG_ADDR 0x1D + #define AT803X_DEBUG_DATA 0x1E +@@ -252,6 +253,27 @@ static int at803x_probe(struct phy_devic + static int at803x_config_init(struct phy_device *phydev) { - struct at803x_platform_data *pdata; int ret; + u32 v; + diff --git a/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch b/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch index e939597b8e..847e2e8701 100644 --- a/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch +++ b/target/linux/ipq40xx/patches-4.19/700-net-add-qualcomm-mdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -519,6 +519,13 @@ config XILINX_GMII2RGMII +@@ -524,6 +524,13 @@ config XILINX_GMII2RGMII the Reduced Gigabit Media Independent Interface(RGMII) between Ethernet physical media devices and the Gigabit Ethernet controller. diff --git a/target/linux/ipq40xx/patches-4.19/705-net-add-qualcomm-ar40xx-phy.patch b/target/linux/ipq40xx/patches-4.19/705-net-add-qualcomm-ar40xx-phy.patch index 5feea6d4e0..4247ef10c6 100644 --- a/target/linux/ipq40xx/patches-4.19/705-net-add-qualcomm-ar40xx-phy.patch +++ b/target/linux/ipq40xx/patches-4.19/705-net-add-qualcomm-ar40xx-phy.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -526,6 +526,13 @@ config MDIO_IPQ40XX +@@ -531,6 +531,13 @@ config MDIO_IPQ40XX This driver supports the MDIO interface found in Qualcomm Atheros ipq40xx Soc chip. diff --git a/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch b/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch index 096802a30e..43c8d01da7 100644 --- a/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch +++ b/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch @@ -11,7 +11,7 @@ config SFP --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -100,3 +100,5 @@ obj-$(CONFIG_STE10XP) += ste10Xp.o +@@ -101,3 +101,5 @@ obj-$(CONFIG_STE10XP) += ste10Xp.o obj-$(CONFIG_TERANETICS_PHY) += teranetics.o obj-$(CONFIG_VITESSE_PHY) += vitesse.o obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o From 943cc81b0fc910ddcc27d7d434288e1928c4e5c2 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 24 Jan 2020 13:37:58 +0000 Subject: [PATCH 439/480] kernel: act_ctinfo: fixup build error on 4.14 Signed-off-by: Kevin Darbyshire-Bryant --- .../380-v5.3-net-sched-Introduce-act_ctinfo-action.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index 617112186e..e8e9173d20 100644 --- a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -112,7 +112,7 @@ Signed-off-by: Kevin Darbyshire-Bryant include/uapi/linux/tc_act/tc_ctinfo.h | 29 ++ net/sched/Kconfig | 13 + net/sched/Makefile | 1 + - net/sched/act_ctinfo.c | 404 ++++++++++++++++++++++++++ + net/sched/act_ctinfo.c | 405 ++++++++++++++++++++++++++ 6 files changed, 482 insertions(+), 1 deletion(-) create mode 100644 include/net/tc_act/tc_ctinfo.h create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h @@ -232,7 +232,7 @@ Signed-off-by: Kevin Darbyshire-Bryant obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o --- /dev/null +++ b/net/sched/act_ctinfo.c -@@ -0,0 +1,404 @@ +@@ -0,0 +1,405 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* net/sched/act_ctinfo.c netfilter ctinfo connmark actions + * @@ -579,6 +579,7 @@ Signed-off-by: Kevin Darbyshire-Bryant + return tcf_idr_search(tn, a, index); +} + ++static void tcf_ctinfo_cleanup(struct tc_action *a) +{ + struct tcf_ctinfo *ci = to_ctinfo(a); + struct tcf_ctinfo_params *cp; From daa218a28858ec4786fd22cb4f282754e4aab003 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 24 Jan 2020 14:18:26 +0000 Subject: [PATCH 440/480] kernel: act_ctinfo: really fix backport this time Signed-off-by: Kevin Darbyshire-Bryant --- .../380-v5.3-net-sched-Introduce-act_ctinfo-action.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index e8e9173d20..96f458f9c9 100644 --- a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -579,7 +579,7 @@ Signed-off-by: Kevin Darbyshire-Bryant + return tcf_idr_search(tn, a, index); +} + -+static void tcf_ctinfo_cleanup(struct tc_action *a) ++static void tcf_ctinfo_cleanup(struct tc_action *a, int bind) +{ + struct tcf_ctinfo *ci = to_ctinfo(a); + struct tcf_ctinfo_params *cp; From dc862be3019299cc280053d73474c7f838ce15a0 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 21 Jan 2020 21:54:50 +0100 Subject: [PATCH 441/480] ramips: define SOC only once for uniform targets In ramips, all devices in mt7621, mt76x8 and rt288x subtarget have the same value set to the SOC variable for each device individually. This patch introduces a non-device-dependent variable DEFAULT_SOC, which is used if no specific SOC is set for a device, and thus reduces the number of redundant definitions drastically. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/image/Makefile | 1 + target/linux/ramips/image/mt7621.mk | 68 +---------------------------- target/linux/ramips/image/mt76x8.mk | 42 +----------------- target/linux/ramips/image/rt288x.mk | 10 +---- 4 files changed, 7 insertions(+), 114 deletions(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index b6f82c1151..1d865aa567 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -23,6 +23,7 @@ KERNEL_DTB = kernel-bin | append-dtb | lzma define Device/Default PROFILES = Default KERNEL := $(KERNEL_DTB) | uImage lzma + SOC := $(DEFAULT_SOC) DEVICE_DTS_DIR := ../dts DEVICE_DTS = $$(SOC)_$(1) IMAGES := sysupgrade.bin diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 6521361868..be2a329524 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -2,6 +2,8 @@ # MT7621 Profiles # +DEFAULT_SOC := mt7621 + KERNEL_DTB += -d21 DEVICE_VARS += TPLINK_BOARD_ID TPLINK_HEADER_VERSION TPLINK_HWID TPLINK_HWREV @@ -85,7 +87,6 @@ define Build/wr1201-factory-header endef define Device/afoundry_ew1200 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := AFOUNDRY DEVICE_MODEL := EW1200 @@ -96,7 +97,6 @@ endef TARGET_DEVICES += afoundry_ew1200 define Device/alfa-network_quad-e4g - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := Quad-E4G @@ -106,7 +106,6 @@ endef TARGET_DEVICES += alfa-network_quad-e4g define Device/asiarf_ap7621-001 - SOC := mt7621 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-001 @@ -115,7 +114,6 @@ endef TARGET_DEVICES += asiarf_ap7621-001 define Device/asiarf_ap7621-nv1 - SOC := mt7621 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-NV1 @@ -124,7 +122,6 @@ endef TARGET_DEVICES += asiarf_ap7621-nv1 define Device/asus_rt-ac57u - SOC := mt7621 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U IMAGE_SIZE := 16064k @@ -134,7 +131,6 @@ endef TARGET_DEVICES += asus_rt-ac57u define Device/asus_rt-ac65p - SOC := mt7621 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC65P IMAGE_SIZE := 51200k @@ -151,7 +147,6 @@ endef TARGET_DEVICES += asus_rt-ac65p define Device/asus_rt-ac85p - SOC := mt7621 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC85P IMAGE_SIZE := 51200k @@ -168,7 +163,6 @@ endef TARGET_DEVICES += asus_rt-ac85p define Device/buffalo_wsr-1166dhp - SOC := mt7621 IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata IMAGE_SIZE := 15936k DEVICE_VENDOR := Buffalo @@ -179,7 +173,6 @@ endef TARGET_DEVICES += buffalo_wsr-1166dhp define Device/buffalo_wsr-600dhp - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WSR-600DHP @@ -190,7 +183,6 @@ TARGET_DEVICES += buffalo_wsr-600dhp define Device/dlink_dir-860l-b1 $(Device/seama) - SOC := mt7621 BLOCKSIZE := 64k SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma @@ -204,7 +196,6 @@ endef TARGET_DEVICES += dlink_dir-860l-b1 define Device/d-team_newifi-d2 - SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D2 @@ -214,7 +205,6 @@ endef TARGET_DEVICES += d-team_newifi-d2 define Device/d-team_pbr-m1 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := PandoraBox DEVICE_MODEL := PBR-M1 @@ -225,7 +215,6 @@ endef TARGET_DEVICES += d-team_pbr-m1 define Device/edimax_ra21s - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Edimax DEVICE_MODEL := RA21S @@ -239,7 +228,6 @@ endef TARGET_DEVICES += edimax_ra21s define Device/edimax_rg21s - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Edimax DEVICE_MODEL := Gemini AC2600 RG21S @@ -251,7 +239,6 @@ endef TARGET_DEVICES += edimax_rg21s define Device/elecom_wrc-1167ghbk2-s - SOC := mt7621 IMAGE_SIZE := 15488k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1167GHBK2-S @@ -263,7 +250,6 @@ endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s define Device/elecom_wrc-1900gst - SOC := mt7621 IMAGE_SIZE := 11264k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1900GST @@ -274,7 +260,6 @@ endef TARGET_DEVICES += elecom_wrc-1900gst define Device/elecom_wrc-2533gst - SOC := mt7621 IMAGE_SIZE := 11264k DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-2533GST @@ -285,7 +270,6 @@ endef TARGET_DEVICES += elecom_wrc-2533gst define Device/firefly_firewrt - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Firefly DEVICE_MODEL := FireWRT @@ -295,7 +279,6 @@ endef TARGET_DEVICES += firefly_firewrt define Device/gehua_ghl-r-001 - SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := GeHua DEVICE_MODEL := GHL-R-001 @@ -306,7 +289,6 @@ endef TARGET_DEVICES += gehua_ghl-r-001 define Device/gnubee_gb-pc1 - SOC := mt7621 DEVICE_VENDOR := GnuBee DEVICE_MODEL := Personal Cloud One DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620 @@ -315,7 +297,6 @@ endef TARGET_DEVICES += gnubee_gb-pc1 define Device/gnubee_gb-pc2 - SOC := mt7621 DEVICE_VENDOR := GnuBee DEVICE_MODEL := Personal Cloud Two DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620 @@ -324,7 +305,6 @@ endef TARGET_DEVICES += gnubee_gb-pc2 define Device/hiwifi_hc5962 - SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 2097152 @@ -344,7 +324,6 @@ endef TARGET_DEVICES += hiwifi_hc5962 define Device/iodata_wn-ax1167gr - SOC := mt7621 IMAGE_SIZE := 15552k KERNEL_INITRAMFS := $$(KERNEL) | \ iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin @@ -355,7 +334,6 @@ endef TARGET_DEVICES += iodata_wn-ax1167gr define Device/iodata_wn-gx300gr - SOC := mt7621 IMAGE_SIZE := 7616k DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-GX300GR @@ -364,7 +342,6 @@ endef TARGET_DEVICES += iodata_wn-gx300gr define Device/iodata_wnpr2600g - SOC := mt7621 DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WNPR2600G IMAGE_SIZE := 13952k @@ -376,7 +353,6 @@ endef TARGET_DEVICES += iodata_wnpr2600g define Device/iptime_a6ns-m - SOC := mt7621 IMAGE_SIZE := 16128k UIMAGE_NAME := a6nm DEVICE_VENDOR := ipTIME @@ -386,7 +362,6 @@ endef TARGET_DEVICES += iptime_a6ns-m define Device/iptime_a8004t - SOC := mt7621 IMAGE_SIZE := 16128k UIMAGE_NAME := a8004t DEVICE_VENDOR := ipTIME @@ -396,7 +371,6 @@ endef TARGET_DEVICES += iptime_a8004t define Device/jcg_jhr-ac876m - SOC := mt7621 IMAGE_SIZE := 16064k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -409,7 +383,6 @@ endef TARGET_DEVICES += jcg_jhr-ac876m define Device/lenovo_newifi-d1 - SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D1 @@ -420,7 +393,6 @@ endef TARGET_DEVICES += lenovo_newifi-d1 define Device/linksys_re6500 - SOC := mt7621 IMAGE_SIZE := 7872k DEVICE_VENDOR := Linksys DEVICE_MODEL := RE6500 @@ -430,7 +402,6 @@ endef TARGET_DEVICES += linksys_re6500 define Device/mediatek_ap-mt7621a-v60 - SOC := mt7621 IMAGE_SIZE := 7872k DEVICE_VENDOR := Mediatek DEVICE_MODEL := AP-MT7621A-V60 EVB @@ -439,7 +410,6 @@ endef TARGET_DEVICES += mediatek_ap-mt7621a-v60 define Device/mediatek_mt7621-eval-board - SOC := mt7621 BLOCKSIZE := 64k IMAGE_SIZE := 15104k DEVICE_VENDOR := MediaTek @@ -449,7 +419,6 @@ endef TARGET_DEVICES += mediatek_mt7621-eval-board define Device/MikroTik - SOC := mt7621 DEVICE_VENDOR := MikroTik BLOCKSIZE := 64k IMAGE_SIZE := 16128k @@ -483,7 +452,6 @@ endef TARGET_DEVICES += mikrotik_rbm33g define Device/mqmaker_witi - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := MQmaker DEVICE_MODEL := WiTi @@ -494,7 +462,6 @@ endef TARGET_DEVICES += mqmaker_witi define Device/mtc_wr1201 - SOC := mt7621 IMAGE_SIZE := 16000k DEVICE_VENDOR := MTC DEVICE_MODEL := Wireless Router WR1201 @@ -505,7 +472,6 @@ endef TARGET_DEVICES += mtc_wr1201 define Device/netgear_ex6150 - SOC := mt7621 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6150 DEVICE_PACKAGES := kmod-mt76x2 wpad-basic @@ -518,7 +484,6 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand - SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 4096k @@ -586,7 +551,6 @@ endef TARGET_DEVICES += netgear_r6850 define Device/netgear_wndr3700-v5 - SOC := mt7621 BLOCKSIZE := 64k IMAGE_SIZE := 15232k SERCOMM_HWID := AYB @@ -610,7 +574,6 @@ endef TARGET_DEVICES += netgear_wndr3700-v5 define Device/netis_wf-2881 - SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 FILESYSTEMS := squashfs @@ -627,7 +590,6 @@ endef TARGET_DEVICES += netis_wf-2881 define Device/phicomm_k2p - SOC := mt7621 IMAGE_SIZE := 15744k DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2P @@ -639,7 +601,6 @@ endef TARGET_DEVICES += phicomm_k2p define Device/planex_vr500 - SOC := mt7621 IMAGE_SIZE := 65216k DEVICE_VENDOR := Planex DEVICE_MODEL := VR500 @@ -649,7 +610,6 @@ endef TARGET_DEVICES += planex_vr500 define Device/samknows_whitebox-v8 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := SamKnows DEVICE_MODEL := Whitebox 8 @@ -660,7 +620,6 @@ endef TARGET_DEVICES += samknows_whitebox-v8 define Device/storylink_sap-g3200u3 - SOC := mt7621 IMAGE_SIZE := 7872k DEVICE_VENDOR := STORYLiNK DEVICE_MODEL := SAP-G3200U3 @@ -670,7 +629,6 @@ endef TARGET_DEVICES += storylink_sap-g3200u3 define Device/telco-electronics_x1 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Telco Electronics DEVICE_MODEL := X1 @@ -679,7 +637,6 @@ endef TARGET_DEVICES += telco-electronics_x1 define Device/thunder_timecloud - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Thunder DEVICE_MODEL := Timecloud @@ -689,7 +646,6 @@ endef TARGET_DEVICES += thunder_timecloud define Device/totolink_a7000r - SOC := mt7621 IMAGE_SIZE := 16064k UIMAGE_NAME := C8340R1C-9999 DEVICE_VENDOR := TOTOLINK @@ -699,7 +655,6 @@ endef TARGET_DEVICES += totolink_a7000r define Device/adslr_g7 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := ADSLR DEVICE_MODEL := G7 @@ -708,7 +663,6 @@ endef TARGET_DEVICES += adslr_g7 define Device/tplink-safeloader - SOC := mt7621 DEVICE_VENDOR := TP-Link TPLINK_BOARD_ID := TPLINK_HWID := 0x0 @@ -743,7 +697,6 @@ endef TARGET_DEVICES += tplink_re650-v1 define Device/ubiquiti_edgerouterx - SOC := mt7621 IMAGE_SIZE := 256768k FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 @@ -766,7 +719,6 @@ endef TARGET_DEVICES += ubiquiti_edgerouterx-sfp define Device/unielec_u7621-06-16m - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7621-06 @@ -777,7 +729,6 @@ endef TARGET_DEVICES += unielec_u7621-06-16m define Device/unielec_u7621-06-64m - SOC := mt7621 IMAGE_SIZE := 65216k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7621-06 @@ -788,7 +739,6 @@ endef TARGET_DEVICES += unielec_u7621-06-64m define Device/wevo_11acnas - SOC := mt7621 IMAGE_SIZE := 16064k UIMAGE_NAME := 11AC-NAS-Router(0.0.0) DEVICE_VENDOR := WeVO @@ -800,7 +750,6 @@ endef TARGET_DEVICES += wevo_11acnas define Device/wevo_w2914ns-v2 - SOC := mt7621 IMAGE_SIZE := 16064k UIMAGE_NAME := W2914NS-V2(0.0.0) DEVICE_VENDOR := WeVO @@ -813,7 +762,6 @@ endef TARGET_DEVICES += wevo_w2914ns-v2 define Device/xiaomi_mir3g - SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 4096k @@ -833,7 +781,6 @@ endef TARGET_DEVICES += xiaomi_mir3g define Device/xiaomi_mir3g-v2 - SOC := mt7621 IMAGE_SIZE := 14848k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 3G @@ -846,7 +793,6 @@ endef TARGET_DEVICES += xiaomi_mir3g-v2 define Device/xiaomi_mir3p - SOC := mt7621 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE:= 4096k @@ -864,7 +810,6 @@ endef TARGET_DEVICES += xiaomi_mir3p define Device/xiaoyu_xy-c5 - SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := XiaoYu DEVICE_MODEL := XY-C5 @@ -873,7 +818,6 @@ endef TARGET_DEVICES += xiaoyu_xy-c5 define Device/xzwifi_creativebox-v1 - SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := CreativeBox DEVICE_MODEL := v1 @@ -883,7 +827,6 @@ endef TARGET_DEVICES += xzwifi_creativebox-v1 define Device/youhua_wr1200js - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := YouHua DEVICE_MODEL := WR1200JS @@ -893,7 +836,6 @@ endef TARGET_DEVICES += youhua_wr1200js define Device/youku_yk-l2 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Youku DEVICE_MODEL := YK-L2 @@ -903,7 +845,6 @@ endef TARGET_DEVICES += youku_yk-l2 define Device/zbtlink_zbt-we1326 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 @@ -914,7 +855,6 @@ endef TARGET_DEVICES += zbtlink_zbt-we1326 define Device/zbtlink_zbt-we3526 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 @@ -924,7 +864,6 @@ endef TARGET_DEVICES += zbtlink_zbt-we3526 define Device/zbtlink_zbt-wg2626 - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 @@ -935,7 +874,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 @@ -947,7 +885,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m - SOC := mt7621 IMAGE_SIZE := 32448k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 @@ -959,7 +896,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-32m define Device/zio_freezio - SOC := mt7621 IMAGE_SIZE := 16064k DEVICE_VENDOR := ZIO DEVICE_MODEL := FREEZIO diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index fe08c77c13..5ddeec14d5 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -2,8 +2,9 @@ # MT76x8 Profiles # +DEFAULT_SOC := mt7628an + define Device/alfa-network_awusfree1 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := AWUSFREE1 @@ -12,7 +13,6 @@ endef TARGET_DEVICES += alfa-network_awusfree1 define Device/buffalo_wcr-1166ds - SOC := mt7628an IMAGE_SIZE := 7936k BUFFALO_TAG_PLATFORM := MTK BUFFALO_TAG_VERSION := 9.99 @@ -30,7 +30,6 @@ endef TARGET_DEVICES += buffalo_wcr-1166ds define Device/cudy_wr1000 - SOC := mt7628an IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ @@ -44,7 +43,6 @@ endef TARGET_DEVICES += cudy_wr1000 define Device/d-team_pbr-d1 - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := PandoraBox DEVICE_MODEL := PBR-D1 @@ -54,7 +52,6 @@ endef TARGET_DEVICES += d-team_pbr-d1 define Device/duzun_dm06 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := DuZun DEVICE_MODEL := DM06 @@ -64,7 +61,6 @@ endef TARGET_DEVICES += duzun_dm06 define Device/glinet_gl-mt300n-v2 - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-MT300N @@ -75,7 +71,6 @@ endef TARGET_DEVICES += glinet_gl-mt300n-v2 define Device/glinet_vixmini - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := GL.iNet DEVICE_MODEL := VIXMINI @@ -84,7 +79,6 @@ endef TARGET_DEVICES += glinet_vixmini define Device/hilink_hlk-7628n - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := HILINK DEVICE_MODEL := HLK-7628N @@ -92,7 +86,6 @@ endef TARGET_DEVICES += hilink_hlk-7628n define Device/hiwifi_hc5661a - SOC := mt7628an IMAGE_SIZE := 15808k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5661A @@ -101,7 +94,6 @@ endef TARGET_DEVICES += hiwifi_hc5661a define Device/hiwifi_hc5761a - SOC := mt7628an IMAGE_SIZE := 15808k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5761A @@ -110,7 +102,6 @@ endef TARGET_DEVICES += hiwifi_hc5761a define Device/hiwifi_hc5861b - SOC := mt7628an IMAGE_SIZE := 15808k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5861B @@ -119,7 +110,6 @@ endef TARGET_DEVICES += hiwifi_hc5861b define Device/iptime_a3 - SOC := mt7628an IMAGE_SIZE := 7936k UIMAGE_NAME := a3 DEVICE_VENDOR := ipTIME @@ -129,7 +119,6 @@ endef TARGET_DEVICES += iptime_a3 define Device/iptime_a604m - SOC := mt7628an IMAGE_SIZE := 7936k UIMAGE_NAME := a604m DEVICE_VENDOR := ipTIME @@ -139,7 +128,6 @@ endef TARGET_DEVICES += iptime_a604m define Device/mediatek_linkit-smart-7688 - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := MediaTek DEVICE_MODEL := LinkIt Smart 7688 @@ -149,7 +137,6 @@ endef TARGET_DEVICES += mediatek_linkit-smart-7688 define Device/mediatek_mt7628an-eval-board - SOC := mt7628an BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := MediaTek @@ -160,7 +147,6 @@ endef TARGET_DEVICES += mediatek_mt7628an-eval-board define Device/mercury_mac1200r-v2 - SOC := mt7628an IMAGE_SIZE := 7936k DEVICE_VENDOR := Mercury DEVICE_MODEL := MAC1200R @@ -172,7 +158,6 @@ endef TARGET_DEVICES += mercury_mac1200r-v2 define Device/netgear_r6120 - SOC := mt7628an BLOCKSIZE := 64k IMAGE_SIZE := 15744k DEVICE_VENDOR := NETGEAR @@ -193,7 +178,6 @@ endef TARGET_DEVICES += netgear_r6120 define Device/onion_omega2 - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Onion DEVICE_MODEL := Omega2 @@ -203,7 +187,6 @@ endef TARGET_DEVICES += onion_omega2 define Device/onion_omega2p - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := Onion DEVICE_MODEL := Omega2+ @@ -213,7 +196,6 @@ endef TARGET_DEVICES += onion_omega2p define Device/rakwireless_rak633 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Rakwireless DEVICE_MODEL := RAK633 @@ -222,7 +204,6 @@ endef TARGET_DEVICES += rakwireless_rak633 define Device/skylab_skw92a - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Skylab DEVICE_MODEL := SKW92A @@ -231,7 +212,6 @@ endef TARGET_DEVICES += skylab_skw92a define Device/tama_w06 - SOC := mt7628an IMAGE_SIZE := 15040k DEVICE_VENDOR := Tama DEVICE_MODEL := W06 @@ -240,7 +220,6 @@ endef TARGET_DEVICES += tama_w06 define Device/totolink_lr1200 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := TOTOLINK DEVICE_MODEL := LR1200 @@ -249,7 +228,6 @@ endef TARGET_DEVICES += totolink_lr1200 define Device/tplink - SOC := mt7628an DEVICE_VENDOR := TP-Link TPLINK_FLASHLAYOUT := TPLINK_HWID := @@ -268,7 +246,6 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD DEVICE_VARS += TPLINK_HVERSION define Device/tplink-safeloader - SOC := mt7628an DEVICE_VENDOR := TP-Link TPLINK_BOARD_ID := TPLINK_HWID := 0x0 @@ -421,7 +398,6 @@ endef TARGET_DEVICES += tplink_tl-wr840n-v4 define Device/tplink_tl-wr840n-v5 - SOC := mt7628an IMAGE_SIZE := 3904k DEVICE_VENDOR := TP-Link DEVICE_MODEL := TL-WR840N @@ -497,7 +473,6 @@ endef TARGET_DEVICES += tplink_tl-wr902ac-v3 define Device/unielec_u7628-01-16m - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := UniElec DEVICE_MODEL := U7628-01 @@ -508,7 +483,6 @@ endef TARGET_DEVICES += unielec_u7628-01-16m define Device/vocore_vocore2 - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2 @@ -519,7 +493,6 @@ endef TARGET_DEVICES += vocore_vocore2 define Device/vocore_vocore2-lite - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2-Lite @@ -530,7 +503,6 @@ endef TARGET_DEVICES += vocore_vocore2-lite define Device/wavlink_wl-wn570ha1 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Wavlink DEVICE_MODEL := WL-WN570HA1 @@ -539,7 +511,6 @@ endef TARGET_DEVICES += wavlink_wl-wn570ha1 define Device/wavlink_wl-wn575a3 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Wavlink DEVICE_MODEL := WL-WN575A3 @@ -549,7 +520,6 @@ endef TARGET_DEVICES += wavlink_wl-wn575a3 define Device/widora_neo-16m - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Widora DEVICE_MODEL := Widora-NEO @@ -560,7 +530,6 @@ endef TARGET_DEVICES += widora_neo-16m define Device/widora_neo-32m - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := Widora DEVICE_MODEL := Widora-NEO @@ -570,7 +539,6 @@ endef TARGET_DEVICES += widora_neo-32m define Device/wiznet_wizfi630s - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := WIZnet DEVICE_MODEL := WizFi630S @@ -578,7 +546,6 @@ endef TARGET_DEVICES += wiznet_wizfi630s define Device/wrtnode_wrtnode2p - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := WRTnode DEVICE_MODEL := WRTnode 2P @@ -588,7 +555,6 @@ endef TARGET_DEVICES += wrtnode_wrtnode2p define Device/wrtnode_wrtnode2r - SOC := mt7628an IMAGE_SIZE := 32448k DEVICE_VENDOR := WRTnode DEVICE_MODEL := WRTnode 2R @@ -598,7 +564,6 @@ endef TARGET_DEVICES += wrtnode_wrtnode2r define Device/xiaomi_mir4a-100m - SOC := mt7628an IMAGE_SIZE := 14976k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 4A @@ -608,7 +573,6 @@ endef TARGET_DEVICES += xiaomi_mir4a-100m define Device/xiaomi_miwifi-nano - SOC := mt7628an IMAGE_SIZE := 16064k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := MiWiFi Nano @@ -618,7 +582,6 @@ endef TARGET_DEVICES += xiaomi_miwifi-nano define Device/zbtlink_zbt-we1226 - SOC := mt7628an IMAGE_SIZE := 7872k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1226 @@ -626,7 +589,6 @@ endef TARGET_DEVICES += zbtlink_zbt-we1226 define Device/zyxel_keenetic-extra-ii - SOC := mt7628an IMAGE_SIZE := 14912k BLOCKSIZE := 64k DEVICE_VENDOR := ZyXEL diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index 1b4880682a..800dc553a2 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -2,6 +2,8 @@ # RT288X Profiles # +DEFAULT_SOC := rt2880 + define Build/gemtek-header if [ -f $@ ]; then \ mkheader_gemtek $@ $@.new $(1) && \ @@ -10,7 +12,6 @@ define Build/gemtek-header endef define Device/airlink101_ar670w - SOC := rt2880 BLOCKSIZE := 64k DEVICE_VENDOR := Airlink DEVICE_MODEL := AR670W @@ -24,7 +25,6 @@ endef TARGET_DEVICES += airlink101_ar670w define Device/airlink101_ar725w - SOC := rt2880 IMAGE_SIZE := 3776k DEVICE_VENDOR := Airlink DEVICE_MODEL := AR725W @@ -36,7 +36,6 @@ endef TARGET_DEVICES += airlink101_ar725w define Device/asus_rt-n15 - SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Asus @@ -47,7 +46,6 @@ endef TARGET_DEVICES += asus_rt-n15 define Device/belkin_f5d8235-v1 - SOC := rt2880 IMAGE_SIZE := 7872k DEVICE_VENDOR := Belkin DEVICE_MODEL := F5D8235 @@ -59,7 +57,6 @@ endef TARGET_DEVICES += belkin_f5d8235-v1 define Device/buffalo_wli-tx4-ag300n - SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Buffalo @@ -70,7 +67,6 @@ endef TARGET_DEVICES += buffalo_wli-tx4-ag300n define Device/buffalo_wzr-agl300nh - SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Buffalo @@ -81,7 +77,6 @@ endef TARGET_DEVICES += buffalo_wzr-agl300nh define Device/dlink_dap-1522-a1 - SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3712k DEVICE_VENDOR := D-Link @@ -97,7 +92,6 @@ endef TARGET_DEVICES += dlink_dap-1522-a1 define Device/ralink_v11st-fe - SOC := rt2880 BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Ralink From 44cb4fd5e681ee72ef5e81c0442c2651e18ae6f6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 24 Jan 2020 18:32:11 +0100 Subject: [PATCH 442/480] lantiq: fix model name for BT Home Hub 3 Type A The number 3 was accidentally removed from the name during split of DEVICE_TITLE. Fixes: fd666870582f ("lantiq: split up DEVICE_TITLE") Signed-off-by: Adrian Schmutzler --- target/linux/lantiq/image/ar9.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index f86e2d1c68..73e2ab89b2 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -30,7 +30,7 @@ TARGET_DEVICES += avm_fritz7320 define Device/bt_homehub-v3a $(Device/NAND) DEVICE_VENDOR := British Telecom - DEVICE_MODEL := Home Hub + DEVICE_MODEL := Home Hub 3 DEVICE_VARIANT := Type A BOARD_NAME := BTHOMEHUBV3A SOC := ar9 From d9a0794f8d56236b2984c15948d93aa5d320e16e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 24 Jan 2020 18:35:25 +0100 Subject: [PATCH 443/480] lantiq: move DTS_DIR variable out of Device definition The DTS_DIR variable is not a device variable, thus it should not be set inside Device/Default but globally. Fixes: c640370939d7 ("lantiq: use soc_vendor_device scheme on DTS file") Signed-off-by: Adrian Schmutzler --- target/linux/lantiq/image/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 3060ff920b..68de191283 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -52,6 +52,8 @@ define Build/fullimage rm $@.tmp endef +DTS_DIR := $(DTS_DIR)/lantiq + # Shared device definition: applies to every defined device define Device/Default PROFILES = Default @@ -61,7 +63,6 @@ define Device/Default KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma FILESYSTEMS := squashfs IMAGE_SIZE := - DTS_DIR := $(DTS_DIR)/lantiq DEVICE_DTS = $$(SOC)_$(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGES := sysupgrade.bin From 09ee51c614d95904010f3646938b5b85c73bebec Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 24 Jan 2020 18:38:53 +0100 Subject: [PATCH 444/480] lantiq: define SOC only once for uniform targets In lantiq there are several subtarget where all devices have the same value set to the SOC variable for each device individually. This patch introduces a non-device-dependent variable DEFAULT_SOC, which is used if no specific SOC is set for a device, and thus reduces the number of redundant definitions drastically. This is applied to all subtargets except xway, as only the latter has two different SOCs. Signed-off-by: Adrian Schmutzler --- target/linux/lantiq/image/Makefile | 4 ++++ target/linux/lantiq/image/amazonse.mk | 2 -- target/linux/lantiq/image/falcon.mk | 12 ------------ target/linux/lantiq/image/tp-link.mk | 1 - target/linux/lantiq/image/vr9.mk | 18 ------------------ target/linux/lantiq/image/xway_legacy.mk | 5 ----- 6 files changed, 4 insertions(+), 38 deletions(-) diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 68de191283..d385cdca7b 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -111,10 +111,12 @@ define Device/AVM endef ifeq ($(SUBTARGET),ase) +DEFAULT_SOC := amazonse include amazonse.mk endif ifeq ($(SUBTARGET),xway_legacy) +DEFAULT_SOC := danube include xway_legacy.mk endif @@ -125,12 +127,14 @@ endif ifeq ($(SUBTARGET),xrx200) +DEFAULT_SOC := vr9 include tp-link.mk include vr9.mk endif ifeq ($(SUBTARGET),falcon) +DEFAULT_SOC := falcon include falcon.mk endif diff --git a/target/linux/lantiq/image/amazonse.mk b/target/linux/lantiq/image/amazonse.mk index c9329a4dd9..4a23a68e40 100644 --- a/target/linux/lantiq/image/amazonse.mk +++ b/target/linux/lantiq/image/amazonse.mk @@ -2,7 +2,6 @@ define Device/allnet_all0333cj DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL0333CJ IMAGE_SIZE := 3700k - SOC := amazonse DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ ltq-adsl-app ppp-mod-pppoe @@ -13,7 +12,6 @@ define Device/netgear_dgn1000b DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DGN1000B IMAGE_SIZE := 6000k - SOC := amazonse DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ ltq-adsl-app ppp-mod-pppoe diff --git a/target/linux/lantiq/image/falcon.mk b/target/linux/lantiq/image/falcon.mk index e6aae1240b..a5490f6e68 100644 --- a/target/linux/lantiq/image/falcon.mk +++ b/target/linux/lantiq/image/falcon.mk @@ -2,7 +2,6 @@ define Device/lantiq_easy88388 DEVICE_VENDOR := Lantiq DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy88388 @@ -10,7 +9,6 @@ define Device/lantiq_easy88444 DEVICE_VENDOR := Lantiq DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy88444 @@ -19,7 +17,6 @@ define Device/lantiq_easy98020 DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) DEVICE_VARIANT := v1.0-v1.7 IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy98020 @@ -28,7 +25,6 @@ define Device/lantiq_easy98020-v18 DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) DEVICE_VARIANT := v1.8 IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy98020-v18 @@ -36,7 +32,6 @@ define Device/lantiq_easy98021 DEVICE_VENDOR := Lantiq DEVICE_MODEL := Falcon HGU Reference Board (EASY98021) IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy98021 @@ -45,7 +40,6 @@ define Device/lantiq_easy98035synce DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE) DEVICE_VARIANT := with Synchronous Ethernet IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy98035synce @@ -54,7 +48,6 @@ define Device/lantiq_easy98035synce1588 DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588) DEVICE_VARIANT := with SyncE and IEEE1588 IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_easy98035synce1588 @@ -63,7 +56,6 @@ define Device/lantiq_easy98000-nand DEVICE_MODEL := EASY98000 Falcon Eval Board DEVICE_VARIANT := NAND IMAGE_SIZE := 3904k - SOC := falcon DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 endef TARGET_DEVICES += lantiq_easy98000-nand @@ -73,7 +65,6 @@ define Device/lantiq_easy98000-nor DEVICE_MODEL := EASY98000 Falcon Eval Board DEVICE_VARIANT := NOR IMAGE_SIZE := 3904k - SOC := falcon DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 endef TARGET_DEVICES += lantiq_easy98000-nor @@ -83,7 +74,6 @@ define Device/lantiq_easy98000-sflash DEVICE_MODEL := EASY98000 Falcon Eval Board DEVICE_VARIANT := SFLASH IMAGE_SIZE := 7424k - SOC := falcon DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 endef TARGET_DEVICES += lantiq_easy98000-sflash @@ -92,7 +82,6 @@ define Device/lantiq_falcon-mdu DEVICE_VENDOR := Lantiq DEVICE_MODEL := Falcon / VINAXdp MDU Board IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_falcon-mdu @@ -100,6 +89,5 @@ define Device/lantiq_falcon-sfp DEVICE_VENDOR := Lantiq DEVICE_MODEL := Falcon SFP Stick IMAGE_SIZE := 7424k - SOC := falcon endef TARGET_DEVICES += lantiq_falcon-sfp diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk index fa98f31f59..acbc32b46a 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -2,7 +2,6 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLIN define Device/lantiqTpLink DEVICE_VENDOR := TP-Link - SOC := vr9 TPLINK_HWREVADD := 0 TPLINK_HVERSION := 2 KERNEL := kernel-bin | append-dtb | lzma diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index cd43c61e6e..083d8efe0f 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -3,7 +3,6 @@ define Device/alphanetworks_asl56026 DEVICE_MODEL := ASL56026 DEVICE_ALT0_VENDOR := BT Openreach DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I - SOC := vr9 IMAGE_SIZE := 7488k endef TARGET_DEVICES += alphanetworks_asl56026 @@ -17,7 +16,6 @@ define Device/arcadyan_arv7519rw22 DEVICE_ALT1_VENDOR := Astoria Networks DEVICE_ALT1_MODEL := ARV7519RW22 IMAGE_SIZE := 31232k - SOC := vr9 DEVICE_PACKAGES := kmod-usb-dwc2 SUPPORTED_DEVICES += ARV7519RW22 endef @@ -27,7 +25,6 @@ define Device/arcadyan_vg3503j DEVICE_VENDOR := BT Openreach DEVICE_MODEL := ECI VDSL Modem V-2FUb/R IMAGE_SIZE := 8000k - SOC := vr9 SUPPORTED_DEVICES += VG3503J endef TARGET_DEVICES += arcadyan_vg3503j @@ -41,7 +38,6 @@ define Device/arcadyan_vgv7510kw22-brn DEVICE_ALT0_MODEL := Box 6431 DEVICE_ALT0_VARIANT := BRN IMAGE_SIZE := 7168k - SOC := vr9 SIGNATURE := BRNDA6431 MAGIC := 0x12345678 CRC32_POLY := 0x04c11db7 @@ -58,7 +54,6 @@ define Device/arcadyan_vgv7510kw22-nor DEVICE_ALT0_MODEL := Box 6431 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15232k - SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7510KW22NOR endef @@ -73,7 +68,6 @@ define Device/arcadyan_vgv7519-brn DEVICE_ALT0_MODEL := Experiabox 8 DEVICE_ALT0_VARIANT := BRN IMAGE_SIZE := 7168k - SOC := vr9 SIGNATURE := 5D00008000 MAGIC := 0x12345678 CRC32_POLY := 0x2083b8ed @@ -90,7 +84,6 @@ define Device/arcadyan_vgv7519-nor DEVICE_ALT0_MODEL := Experiabox 8 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15360k - SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VGV7519NOR endef @@ -101,7 +94,6 @@ define Device/avm_fritz3370 $(Device/NAND) DEVICE_MODEL := FRITZ!Box 3370 DEVICE_VARIANT := Rev. 2 - SOC := vr9 KERNEL_SIZE := 4096k UBINIZE_OPTS := -E 5 IMAGES += eva-kernel.bin eva-filesystem.bin @@ -128,7 +120,6 @@ define Device/avm_fritz7360sl $(Device/AVM) DEVICE_MODEL := FRITZ!Box 7360 SL IMAGE_SIZE := 15744k - SOC := vr9 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += FRITZ7360SL endef @@ -140,7 +131,6 @@ define Device/avm_fritz7362sl DEVICE_MODEL := FRITZ!Box 7362 SL KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - SOC := vr9 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs endef TARGET_DEVICES += avm_fritz7362sl @@ -150,7 +140,6 @@ define Device/avm_fritz7412 $(Device/NAND) DEVICE_MODEL := FRITZ!Box 7412 BOARD_NAME := FRITZ7412 - SOC := vr9 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata @@ -163,7 +152,6 @@ define Device/bt_homehub-v5a DEVICE_MODEL := Home Hub 5 DEVICE_VARIANT := Type A BOARD_NAME := BTHOMEHUBV5A - SOC := vr9 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += BTHOMEHUBV5A @@ -174,7 +162,6 @@ define Device/buffalo_wbmr-300hpd DEVICE_VENDOR := Buffalo DEVICE_MODEL := WBMR-300HPD IMAGE_SIZE := 15616k - SOC := vr9 DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += WBMR300 endef @@ -185,7 +172,6 @@ define Device/lantiq_easy80920-nand DEVICE_VENDOR := Lantiq DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NAND - SOC := vr9 IMAGE_SIZE := 64512k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport endef @@ -195,7 +181,6 @@ define Device/lantiq_easy80920-nor DEVICE_VENDOR := Lantiq DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NOR - SOC := vr9 IMAGE_SIZE := 7936k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport endef @@ -204,7 +189,6 @@ TARGET_DEVICES += lantiq_easy80920-nor define Device/netgear_dm200 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DM200 - SOC := vr9 IMAGES := sysupgrade.bin factory.img IMAGE/sysupgrade.bin := append-kernel | \ pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ @@ -224,7 +208,6 @@ define Device/zyxel_p-2812hnu-f1 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F1 BOARD_NAME := P2812HNUF1 - SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport KERNEL_SIZE := 3072k SUPPORTED_DEVICES += P2812HNUF1 @@ -237,7 +220,6 @@ define Device/zyxel_p-2812hnu-f3 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F3 BOARD_NAME := P2812HNUF3 - SOC := vr9 DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += P2812HNUF3 endef diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk index 8af2e1c3fc..52a29ab2f0 100644 --- a/target/linux/lantiq/image/xway_legacy.mk +++ b/target/linux/lantiq/image/xway_legacy.mk @@ -2,7 +2,6 @@ define Device/arcadyan_arv4518pwr01 DEVICE_VENDOR := Arcadyan DEVICE_MODEL := ARV4518PWR01 IMAGE_SIZE := 3776k - SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -16,7 +15,6 @@ define Device/arcadyan_arv4518pwr01a DEVICE_VENDOR := Arcadyan DEVICE_MODEL := ARV4518PWR01A IMAGE_SIZE := 3776k - SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -34,7 +32,6 @@ define Device/arcadyan_arv4520pw DEVICE_ALT1_VENDOR := Airties DEVICE_ALT1_MODEL := WAV-281 IMAGE_SIZE := 3648k - SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -51,7 +48,6 @@ define Device/arcadyan_arv4525pw DEVICE_ALT0_MODEL := Speedport W502V DEVICE_ALT0_VARIANT := Typ A IMAGE_SIZE := 3776k - SOC := danube DEVICE_PACKAGES := kmod-ath5k wpad-mini \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -66,7 +62,6 @@ define Device/arcadyan_arv452cqw DEVICE_ALT0_VENDOR := Vodafone DEVICE_ALT0_MODEL := Easybox 801 IMAGE_SIZE := 3776k - SOC := danube DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ kmod-ath5k wpad-mini \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ From 719e106855399b0679d174f2368c3e3b15b90d30 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 24 Jan 2020 18:48:47 +0100 Subject: [PATCH 445/480] lantiq: fix setting SOC to DEFAULT_SOC This adds the missing assignment of DEFAULT_SOC to the SOC variable by default. Fixes: 09ee51c614d9 ("lantiq: define SOC only once for uniform targets") Signed-off-by: Adrian Schmutzler --- target/linux/lantiq/image/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index d385cdca7b..4cd9b4ab48 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -63,6 +63,7 @@ define Device/Default KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma FILESYSTEMS := squashfs IMAGE_SIZE := + SOC := $(DEFAULT_SOC) DEVICE_DTS = $$(SOC)_$(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGES := sysupgrade.bin From 2dc0a8c18080a7e447e9b41b037ce9635665e809 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 24 Jan 2020 18:51:36 +0100 Subject: [PATCH 446/480] lantiq: tidy up image/Makefile This harmonizes indent for Build blocks and removes multiple empty lines. Signed-off-by: Adrian Schmutzler --- target/linux/lantiq/image/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 4cd9b4ab48..d0dc49730b 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -15,9 +15,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk ifeq ($(SUBTARGET),xway) - UBIFS_OPTS := -m 512 -e 15872 -c 1959 + UBIFS_OPTS := -m 512 -e 15872 -c 1959 else - UBIFS_OPTS := -m 2048 -e 126KiB -c 4096 + UBIFS_OPTS := -m 2048 -e 126KiB -c 4096 endif define Build/append-avm-fakeroot @@ -29,12 +29,12 @@ define Build/dgn3500-sercom-footer endef define Build/mkbrncmdline - mkbrncmdline -i $@ -o $@.new BRN-BOOT - mv $@.new $@ + mkbrncmdline -i $@ -o $@.new BRN-BOOT + mv $@.new $@ endef define Build/mkbrnimg - mkbrnimg -s $(SIGNATURE) -m $(MAGIC) -p $(CRC32_POLY) -o $@ $(IMAGE_KERNEL) $(IMAGE_ROOTFS) + mkbrnimg -s $(SIGNATURE) -m $(MAGIC) -p $(CRC32_POLY) -o $@ $(IMAGE_KERNEL) $(IMAGE_ROOTFS) endef define Build/fullimage @@ -126,14 +126,12 @@ include danube.mk include ar9.mk endif - ifeq ($(SUBTARGET),xrx200) DEFAULT_SOC := vr9 include tp-link.mk include vr9.mk endif - ifeq ($(SUBTARGET),falcon) DEFAULT_SOC := falcon include falcon.mk From b77ce0c7209ee26aed271f894ac1580dce45db0c Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 25 Jan 2020 11:24:38 +0200 Subject: [PATCH 447/480] tools/gmp: update to 6.2.0 Update GNU gmp to version 6.2.0 Release notes: https://gmplib.org/gmp6.2.html Signed-off-by: Hannu Nyman --- tools/gmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile index 19dc8215f3..16a4410c31 100644 --- a/tools/gmp/Makefile +++ b/tools/gmp/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gmp -PKG_VERSION:=6.1.2 +PKG_VERSION:=6.2.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gmp/ -PKG_HASH:=87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 +PKG_HASH:=258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526 HOST_FIXUP:=autoreconf From 52b8c7a8928ccdc80436c76955f237960ea3bf1f Mon Sep 17 00:00:00 2001 From: Fredrik Olofsson Date: Tue, 10 Sep 2019 11:25:53 +0200 Subject: [PATCH 448/480] ipq40xx: Add support for D-Link DAP-2610 Specifications ============== - SOC: IPQ4018 - RAM: DDR3 256MB - Flash: SPI NOR 16MB - WiFi: - 2.4GHz: IPQ4018, 2x2, front end SKY85303-11 - 5GHz: IPQ4018, 2x2, front end SKY85717-21 - Ethernet: 1x 10/100/1000Mbps, POE 802.3af - PHY: QCA8072 - UART: GND, blocked, 3.3V, RX, TX / 115200 8N1 - LED: 1x red / green - Button: 1x reset / factory default - U-Boot bootloader with tftp and "emergency web server" accessible using serial port. Installation ============ Flash factory image from D-Link web UI. Constraints in the D-Link web UI makes the factory image unnecessarily large. Flash again using sysupgrade from inside OpenWrt to reclaim some flash space. Return to stock D-Link firmware =============================== Partition layout is preserved, and it is possible to return to the stock firmware simply by downloading it from D-Link and writing it to the firmware partition. # mtd -r write dap2610-firmware.bin firmware Quirks ====== To be flashable from the D-Link http server, the firmware must be larger then 6MB, and the size in the firmware header must match the actual file size. Also, the boot loader verifies the checksum of the firmware before each boot, thus the jffs2 must be after the checksum covered part. This is solved in the factory image by having the rootfs at the very end of the image (without pad-rootfs). The sysupgrade image which does not have to be flashable from the D-Link web UI may be smaller, and the checksum in the firmware header only covers the kernel part of the image. Signed-off-by: Fredrik Olofsson [added WRGG Variables to DEVICE_VARS, squashed spi pinconf/mux, added emd1's gmac0 config,fix dtc warnings] Signed-off-by: Christian Lamparter --- package/firmware/ipq-wifi/Makefile | 5 +- .../ipq-wifi/board-dlink_dap2610.qca4019 | Bin 0 -> 24316 bytes .../ipq40xx/base-files/etc/board.d/02_network | 5 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 8 + target/linux/ipq40xx/config-4.19 | 1 + .../arm/boot/dts/qcom-ipq4018-dap-2610.dts | 241 ++++++++++++++++++ target/linux/ipq40xx/image/Makefile | 39 ++- .../901-arm-boot-add-dts-files.patch | 3 +- 8 files changed, 299 insertions(+), 3 deletions(-) create mode 100644 package/firmware/ipq-wifi/board-dlink_dap2610.qca4019 create mode 100644 target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index 161954fa1f..065cda160d 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -14,6 +14,8 @@ endef define Build/Compile endef +# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git +# to generate the board-* files here. # # This is intended to be used on an interim basis until device-specific # board data for new devices is available through the upstream compilation @@ -21,11 +23,11 @@ endef # Please send a mail with your device-specific board files upstream. # You can find instructions and examples on the linux-wireless wiki: # -# ALLWIFIBOARDS:= \ aruba_ap-303 \ avm_fritzrepeater-1200 \ + dlink_dap2610 \ ezviz_cs-w3-wd1200g-eup \ linksys_ea8300 \ qxwlan_e2600ac @@ -93,6 +95,7 @@ endef $(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303)) $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200)) +$(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610)) $(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP)) $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300)) $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) diff --git a/package/firmware/ipq-wifi/board-dlink_dap2610.qca4019 b/package/firmware/ipq-wifi/board-dlink_dap2610.qca4019 new file mode 100644 index 0000000000000000000000000000000000000000..08ed731a4cf020b1f79e12649a9cf89153ec0b50 GIT binary patch literal 24316 zcmeHPTToL;8g7uAipojCEeVH^gj^Vi5Lk$S0s)x-5gFDCM8`!$B>^OYaxqRxxu}Q{ z8BvCd5wuWI@T{wpt23+2u8!+$Y0BN&s(JHe-{wK8tgS6y*4gfJI3bZlh={}G{GtE; z`~LTLI_K6O`64qTCS#K(E;cVly)mOO3shBA0VtKLkp>_YhSGzzYj>8HMweFUV|JD6 zjWPPNwXtNXw0dVv8A`?_M%V4E(eK=MU~O5YeqTj&*-m4OGBGaJ1GX2yz67hK|MKtv zOOCJ-wxE8a`k^WTV3}_KGys5F7!PAV_;Dt3c|7V0fcW_M|Ga(;QaL{0&A-p2(P0V4 zS*xk@1i<6TyS3V>k-#rd-Ys*TUS%r^fU`j#T9A*lJrSol_4uwEBT{`WBfWj}%pVBG zKNDk67Kde@<9yr)Zj6g&W*^uvjRJo>z{o9GzI^3Mw;DL9EOe6hYh)SQhS9Pa7e^0X z4&H2SHRyA6X)kZ~wltRM@^aQZywQ82wMPF%PU6EMXw~WqbAIy%%I&*yDR_0`=CRfa z{RUn7%c0)mjpaIRPU^$!sG2S(M+F<4YORNPDO3Y#6nHgo^KfI4E;%O}Hf?U)rOSfV zuJ*RVrg$@$FYSMKBfim!4F zv0H=EhA-B(B$Y*O=H@-PvA;X}gsdi{qbp0bimB)Cd3@1$ID5A+hn@Urpt?D?TCzDP>)KU)m!|cz zdS3bcn{|DwkAxf9CG!g<##Ca}(o2?jdwctgi|=52Ly6|;(E=GqEEd7PNMS^TNEjg$Zt?O186CB_FzIppL5L#3o$_(@O_4M-kA6eA{IBQS!GJD!M z4DUx^_r@b_!ziGUWDX)03UDgp<5&_g-QP?tXQ*I!D4v1m;BojG+<5TNk>-ua`9Y6t~MP{$27PS zS1OdxlvpyJtVq_z;<1=&!W+wFn?DXFh?L0WQJ+Q0WwL8CHziWKvq9&k7>b0Hff<`u zQ4eBqB$O-8O|DIPY!=sr$+5{fo5is=r|f}^vtO|>9?nznw3&G3t4u5p&r{@Sd&^Zd!AFxt{aIKzafIW)|jwHXz!^<8$M&%nyUyt5mOafPue1k~aYm2Sga; zQ9^^KrtBtyfEO~O?c7m&b=2;hwqR4y z_L8!4bNjij3;hFw!?#B6J^0HHKR$QA07$6q(#hKW0vr#6!sAh=P-<(9)b1CA;gn2r z%l!gC?t^MsE%Z((xd*CMx6r$w5t*+TDtx(}ku7C<^_0^=F;tN>1~8*|Dds^Ws(F?&#lK*#bLXW@3kjN08l4 zp&?9CX~cVV7|B7QH07(krt*W7K^V@;R%T=QtVCrZwvMIiL7&Ob_4IX)j_1oGj=P-u zq$xS~)-OFgAmP5Don(Lq_CrKU00{J@kb$?8B%nR5@h2WfQpP|iIZ z<$K4G0GJ8q9&z8_<=i75(HOYHK+d`EAHcb{_3DyyZ>xa}=i|D=xd&`E+i8H;7=VJm zzrQC)Nc+^2K;IWL_4e}e-oE)zpTLoUlE7r|6nL(HGgCZ;xz;H*X)1 z&=#Q=-4CAIJzhANQ=L4bj(o(rSNf{Bg((gcLcC&mxx70uT`+?o3*P29ogNy&# z(V$C^9&9`+ro z)MP4R!ouzi?(a-LDz9N}esn|Mk=7)t4B7FxueL;;7|9Ru|MQi~y&4TJ3}Bmk^N+!JuXXEN)*X!6%g(zxSlyG-EUMw`xOT=^nw28r^Eo|Vm+fAk8?6lF zo^IRvRf0jdjg@};M(u_C)3W-I-HUeNFcW7GSO5sj^cOgM?ZpWm{Vhg~szH~klto6u zXHhZy^$me2B0?Ck#e2^D0tdsncXHsEti_GMbO|3HyWZkP9dYd$&iyR%_2(wje!{D{ zzWfIvm!9IjV++Y-8(+YftC@ntXdSHp9868MZKH zIQMp7Q0Awg@6R)8y-RmL1-0Jg8001^RFjUN`vnZ=o&pgeN5g4vGo1U`zG}X||NjGr C`f|_! literal 0 HcmV?d00001 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 59a2be0fe6..9cfc43f1f9 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -47,6 +47,7 @@ ipq40xx_setup_interfaces() ;; aruba,ap-303|\ avm,fritzrepeater-1200|\ + dlink,dap-2610 |\ engenius,eap1300|\ meraki,mr33|\ netgear,ex6100v2|\ @@ -103,6 +104,10 @@ ipq40xx_setup_macs() cilab,meshpoint-one) label_mac=$(mtd_get_mac_binary "ART" 0x1006) ;; + dlink,dap-2610) + lan_mac=$(mtd_get_mac_ascii bdcfg lanmac) + label_mac=$lan_mac + ;; engenius,ens620ext) wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) lan_mac=$(macaddr_add "$wan_mac" 1) diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 34ea5a5411..22ac6eefc5 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -87,6 +87,10 @@ case "$FIRMWARE" in unielec,u4019-32m) caldata_extract "0:ART" 0x1000 0x2f20 ;; + dlink,dap-2610) + caldata_extract "ART" 0x1000 0x2f20 + ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac) + ;; engenius,ens620ext) caldata_extract "ART" 0x1000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2) @@ -158,6 +162,10 @@ case "$FIRMWARE" in unielec,u4019-32m) caldata_extract "0:ART" 0x5000 0x2f20 ;; + dlink,dap-2610) + caldata_extract "ART" 0x5000 0x2f20 + ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a) + ;; engenius,ens620ext) caldata_extract "ART" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3) diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19 index e9c1bcd199..a28497aaec 100644 --- a/target/linux/ipq40xx/config-4.19 +++ b/target/linux/ipq40xx/config-4.19 @@ -305,6 +305,7 @@ CONFIG_MTD_SPI_NAND=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIT_FW=y +CONFIG_MTD_SPLIT_WRGG_FW=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_MTD_UBI_BLOCK=y diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts new file mode 100644 index 0000000000..0fd4318527 --- /dev/null +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -0,0 +1,241 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qcom-ipq4019.dtsi" +#include +#include +#include + +/ { + model = "D-Link DAP 2610"; + compatible = "dlink,dap-2610"; + + aliases { + led-boot = &led_red; + led-failsafe = &led_red; + led-running = &led_green; + led-upgrade = &led_red; + }; + + soc { + edma@c080000 { + qcom,num_gmac = <1>; + status = "ok"; + }; + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + ess_tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + + rng@22000 { + status = "ok"; + }; + + crypto@8e3a000 { + status = "ok"; + }; + + watchdog@b017000 { + status = "ok"; + }; + + ess-switch@c000000 { + status = "ok"; + switch_lan_bmp = <0x20>; + switch_wan_bmp = <0x00>; + }; + + ess-psgmii@98000 { + status = "ok"; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_red: red { + label = "dap-2610:red:power"; + gpios = <&tlmm 4 GPIO_ACTIVE_LOW>; + }; + + led_green: green { + label = "dap-2610:green:power"; + gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&blsp1_spi1 { + pinctrl-0 = <&spi_0_pins>; + pinctrl-names = "default"; + status = "ok"; + cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <24000000>; + + partitions { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fixed-partitions"; + + partition@0 { + label = "SBL1"; + reg = <0x0 0x40000>; + read-only; + }; + partition@40000 { + label = "MIBIB"; + reg = <0x40000 0x20000>; + read-only; + }; + partition@60000 { + label = "QSEE"; + reg = <0x60000 0x60000>; + read-only; + }; + partition@c0000 { + label = "CDT"; + reg = <0xc0000 0x10000>; + read-only; + }; + partition@d0000 { + label = "DDRPARAMS"; + reg = <0xd0000 0x10000>; + read-only; + }; + partition@e0000 { + label = "APPSBLENV"; + reg = <0xe0000 0x10000>; + read-only; + }; + partition@f0000 { + label = "APPSBL"; + reg = <0xf0000 0x80000>; + read-only; + }; + partition@170000 { + label = "ART"; + reg = <0x170000 0x10000>; + read-only; + }; + partition@180000 { + compatible = "wrg"; + label = "firmware"; + reg = <0x180000 0xdc0000>; + }; + partition@fb0000 { + label = "rgbd"; + reg = <0xfb0000 0x10000>; + read-only; + }; + partition@fc0000 { + label = "bdcfg"; + reg = <0xfc0000 0x10000>; + read-only; + }; + partition@fd0000 { + label = "langpack"; + reg = <0xfd0000 0x20000>; + read-only; + }; + partition@ff0000 { + label = "certificate"; + reg = <0xff0000 0x10000>; + read-only; + }; + partition@f40000 { + label = "captival"; + reg = <0xf40000 0x70000>; + read-only; + }; + }; + }; +}; + +&blsp_dma { + status = "ok"; +}; + +&blsp1_uart1 { + pinctrl-0 = <&serial_pins>; + pinctrl-names = "default"; + status = "ok"; +}; + +&cryptobam { + status = "ok"; +}; + +&gmac0 { + qcom,phy_mdio_addr = <4>; + qcom,poll_required = <1>; + qcom,forced_speed = <1000>; + qcom,forced_duplex = <1>; + vlan_tag = <1 0x20>; +}; + +&mdio { + status = "ok"; +}; + +&tlmm { + serial_pins: serial_pinmux { + mux { + pins = "gpio60", "gpio61"; + function = "blsp_uart0"; + bias-disable; + }; + }; + + spi_0_pins: spi_0_pinmux { + mux { + function = "blsp_spi0"; + pins = "gpio55", "gpio56", "gpio57"; + drive-strength = <12>; + bias-disable; + }; + mux_cs { + function = "gpio"; + pins = "gpio54"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; +}; + +&wifi0 { + status = "ok"; + qcom,ath10k-calibration-variant = "dlink,dap-2610"; +}; + +&wifi1 { + status = "ok"; + qcom,ath10k-calibration-variant = "dlink,dap-2610"; +}; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 588a24c2fe..41a65280c3 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -1,7 +1,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION +DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION \ + WRGG_DEVNAME WRGG_SIGNATURE define Device/Default PROFILES := Default @@ -61,6 +62,15 @@ define Build/SenaoFW @cp $@.new $@ endef +define Build/wrgg-image + mkwrggimg -i $@ \ + -o $@.new \ + -d "$(WRGG_DEVNAME)" \ + -s "$(WRGG_SIGNATURE)" \ + -v "" -m "" -B "" + mv $@.new $@ +endef + define Device/8dev_jalapeno-common $(call Device/FitImage) $(call Device/UbiFit) @@ -227,6 +237,33 @@ define Device/compex_wpj428 endef TARGET_DEVICES += compex_wpj428 +define Device/dlink_dap-2610 + $(call Device/FitImageLzma) + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DAP-2610 + SOC := qcom-ipq4018 + DEVICE_DTS_CONFIG := config@ap.dk01.1-c1 + BLOCKSIZE := 64k + WRGG_DEVNAME := /dev/mtdblock/8 + WRGG_SIGNATURE := wapac30_dkbs_dap2610 + IMAGE_SIZE := 14080k + IMAGES := sysupgrade.bin factory.bin + # Bootloader expects a special 160 byte header which is added by + # wrgg-image. + # Factory image size must be larger than 6MB, and size in wrgg header must + # match actual factory image size to be flashable from D-Link http server. + # Bootloader verifies checksum of wrgg image before booting, thus jffs2 + # cannot be part of the wrgg image. This is solved in the factory image by + # having the rootfs at the end of the image (without pad-rootfs). And in + # the sysupgrade image only the kernel is included in the wrgg checksum, + # but this is not flashable from the D-link http server. + # append-rootfs must start on an erase block boundary. + IMAGE/factory.bin := append-kernel | pad-offset 6144k 160 | append-rootfs | wrgg-image | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | wrgg-image | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | append-metadata + DEVICE_PACKAGES := ipq-wifi-dlink_dap2610 +endef +TARGET_DEVICES += dlink_dap-2610 + define Device/engenius_eap1300 $(call Device/FitImage) DEVICE_VENDOR := EnGenius diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch index 099a2c7cdb..9c9a31e436 100644 --- a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch @@ -10,12 +10,13 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -785,11 +785,40 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -785,11 +785,41 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ + qcom-ipq4018-a42.dtb \ + qcom-ipq4018-ap120c-ac.dtb \ ++ qcom-ipq4018-dap-2610.dtb \ + qcom-ipq4018-cs-w3-wd1200g-eup.dtb \ + qcom-ipq4018-ea6350v3.dtb \ + qcom-ipq4018-eap1300.dtb \ From 51f30359783938a1be7ffbd08e508c1b6c9c449f Mon Sep 17 00:00:00 2001 From: Yen-Ting-Shen Date: Fri, 1 Nov 2019 14:00:40 +0800 Subject: [PATCH 449/480] ipq40xx: add support for EnGenius EMD1 SOC: IPQ4018 / QCA Dakota CPU: Quad-Core ARMv7 Processor rev 5 (v7l) Cortex-A7 DRAM: 256 MiB NOR: 32 MiB ETH: Qualcomm Atheros QCA8072 (1 port) WLAN1: Qualcomm Atheros QCA4018 2.4GHz 802.11bgn 2:2x2 WLAN2: Qualcomm Atheros QCA4018 5GHz 802.11a/n/ac 2:2x2 INPUT: RESET Button LEDS: White, Blue, Red, Orange Flash instruction: From EnGenius firmware to OpenWrt firmware: In Firmware Upgrade page, upgrade your openwrt-ipq40xx-generic-engenius_emd1-squashfs-factory.bin directly. From OpenWrt firmware to EnGenius firmware: 1. Setup a TFTP server on your computer and configure static IP to 192.168.99.8 Put the EnGenius firmware in the TFTP server directory on your computer. 2. Power up EMD1. Press 4 and then press any key to enter u-boot. 3. Download EnGenius firmware (IPQ40xx) # tftpboot 0x84000000 openwrt-ipq40xx-emd1-nor-fw-s.img 4. Flash the firmware (IPQ40xx) # imgaddr=0x84000000 && source 0x84000000:script 5. Reboot (IPQ40xx) # reset Signed-off-by: Yen-Ting-Shen [removed BOARD_NAME] Signed-off-by: Christian Lamparter --- package/firmware/ipq-wifi/Makefile | 2 + .../ipq-wifi/board-engenius_emd1.qca4019 | Bin 0 -> 24316 bytes .../ipq40xx/base-files/etc/board.d/02_network | 5 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 8 + .../arch/arm/boot/dts/qcom-ipq4018-emd1.dts | 233 ++++++++++++++++++ target/linux/ipq40xx/image/Makefile | 13 + .../901-arm-boot-add-dts-files.patch | 3 +- 7 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 package/firmware/ipq-wifi/board-engenius_emd1.qca4019 create mode 100644 target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-emd1.dts diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index 065cda160d..eada8baf6f 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -28,6 +28,7 @@ ALLWIFIBOARDS:= \ aruba_ap-303 \ avm_fritzrepeater-1200 \ dlink_dap2610 \ + engenius_emd1 \ ezviz_cs-w3-wd1200g-eup \ linksys_ea8300 \ qxwlan_e2600ac @@ -96,6 +97,7 @@ endef $(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303)) $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200)) $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610)) +$(eval $(call generate-ipq-wifi-package,engenius_emd1,EnGenius EMD1)) $(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP)) $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300)) $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) diff --git a/package/firmware/ipq-wifi/board-engenius_emd1.qca4019 b/package/firmware/ipq-wifi/board-engenius_emd1.qca4019 new file mode 100644 index 0000000000000000000000000000000000000000..3a2d77597df2899722962245a3832e45b9f3bfa2 GIT binary patch literal 24316 zcmeHPdr(tX8b1UOb+K|ocnEk2;TeShfohZ}PmxDNi;4tT1nPsN26-3|Ll^A$pb$}k zDi8vZ(#WeRBIDupYTaDoZ|Fn=Qg*NkUeE(aS5fQX2QAD=$85wezmpZ|O| znoPDV<9=pX?@aG=j+hBNhcdm*bbTc_&W;7K33hNT#1GjQi;>jzW%TSL)(--;<#_Gh zLr1`#{DB5GZk)_mOlmEf<>268Z*Ol)5ddymuu>N|95uPZIyF&eGe=(u#hiYxL!aV? z0c_h$iebc~1FHJU{aLBWg3+t0rb=1XuH?AUKGo^EQpsD%>qh&bRwhYLe)DH2_rKr< zg3*svb(IBK$*^%yb*@s9wIg}+XfM_c+62&{zOEumlpKXSJP2F^Mz5&Oz!|nBZy5aq zI!JK`EgYmUD^(B#hij}X&Po@AO*#Y`#`l6+C6pI*F>IzC4Dm2tTL>r_U)k$r?XJ(S z*swn^!z=Y}Q)zXgjJMY%?si{EYvSpkQun;p{_NHbr`cuB`P#aC`G$gkovV{?ohz!^ zA_>lR+5CBL<;Cr%d1b5LzR_RNx~)E>!t22BnZl!+_j5Cl4L4!G1Sv1udGlqhq$R0t zZG~sy^^eOtL#w@uo%3EVl;~(l1neD_{c6QZ#M#AdmFH^m1)ox4ud%-*a2$9;gk=l{ z!v@Q3ZQ;M=C6nUNQrATu*Pjl=PV zbN=+x)9)uHusa|D*WZ`0{pb6yzN6Z(j;kFV7{f4G4QW=<321Y;^ zDLtgLbbJVZ{Y6XK4>p>e#phjB;>n!-yF#h@`r z63R#UJpMyIvJu_L+b9Y{!w>;V2GOFPil;?QM$`nYKtqPo({5bVPIc%q-od!lgd4di zP3M$mplYY&BjX*6Tc^CVR5ubzlcjzzJ?l=)_Iit=`oDomdljkXlN8_KwBdKUA zFI5zQMm&i?qR=Q_l;~JB+!`&|RcYvgsj201J2qGwk#}Ls&`>Re-ib*Ek$;3qH`PMu z`smu)i1?@$LdW)Q@%!-lQg5ug#E5ug#E5ug!R#0a?Y-4Ji)R{mCGJ99mMJrd1aN(x9XXzUugN6m$^ zl9_WXBgJZSEaFQ@FWo`}p3M*o2binw=AICk+i$MooTG6?IfcsMM*zU`s8TchXnHw6 zKl7%eves$D9BnJB4I2Xx;QSr827qu70QouIkPYMqNl+Y^u<{%;9G=v8d0{((D$US7 z)5_uGH2DFczy|zy7=UI6#3m*ZfS{!a5CWlH-Vy{bTo}u9VCm$9A39oX9rQr+4}s@{ zjx2`VK6nBFPnQ{XOD{sX1ci)r1j@_UM49l#RWtmhsWLFY-|tl>;^dAvt0PY5L_2n6 z=H%@wRGw>YY1ef33=9sB-2U|bmyaxO0JFMneVv>Dehw;P){-Zo_!+1uu9iFn#m_%Q z{95t^)N&9_dMtc&U#Fe0fMPZ0%s4G0_dvsi4z2Fm*cYbs1q6w~Qdko##0&M}d5Ksc zVIlz$p(370lmH?pA`u}fmTCaDVh1&H#7OKt%E&ciW)`DgfSrzJPNto-@w!EZtKo=N;QF&z zEPy3aTwPrOmPoO%z5)vAI@^*1mY8sjVQE;uW8HCKyY6tUaUIl0X`=sh^FIjrY`WdB z-rhbw-mY!(R-Xdz@H}k?-}& z)F(H$$TwtWDOTs)Q|R|yQ!xpJQ^C;cjO$|#B<6g6LVO2;n&VRu(9d~}y*N_&_L%;X zlzV?sCiX%1?MH_1F!VKS&R>$RhsK)K<%$e(=-1cBRO%{4u2?X3O?^R8B2EicOcV2l|nl2XThSeIWRGcOV9{a7jQ6Uq@3D}s! z?Yn`20PiMMWGFJmZ|K^Ua_LU-dfg4>1!-wgf`AVlniPjfhta!%Trhr1*P$$jx-q3ndL(H}kUKuZJJM_-q_Mj&r19%ImHN0+Cfzc2Mc1XSgU)HXo61&c zc~Vl4=h%q)13V;eETlX4g17)KwNrOiEm!8jkksmv$`XZGcSYSPl_kXrLdS3Fx|EgD zJpvEHfg6CWp;3KIc|ef{8#|Oor8~r-FpyS-T%0Q4j$hNYDNCi>ll(A;Pw#ReN>|5P z)n&?DMZ)+9Y%EjcNK;^#mmrog0u;8kt1G1ONvm*&`*01G$UMB&r$aL50@5haD49TD zA#4p3OQX$;7J-(bqRY|EA+?_6mvp~YC7cbcT2*x9LgEQ-iARBB;+^jOXErH(54wpj z4IQ~0*A!aoDIXdk%yNKeUynD@A)%-#3;Bu&vZzK7g%tNM3$gw%SJzmeZJSn**@Lr|4lp;DE0 zGW>|ko)ufJ_ZBp6tY*LClKt6rMc;N+;Bi-(?uxuCs*Y36+*{YW{ZwSRyVx=5YX9C3 z1n+svTynKKNoT@Ywj9ap?JrXcPjX6}#KWDX4e?dMGS~D6pQO|WSFSqXw5NCQpeC`= z?-=VqOJ7k(bX~wvR{rHyN$qC&nuE@%+MdI0Q73#$S-EY!`K___K4r|@X04=6c*?iT zIp<8no_8aqoNQ*yP+wVl+L@pV_x+1@F_sgs{hY|Q`6ODjT1ZGg~pH1s# zF5$!4{icPn*s3(=e*Qj92jh^>^)r6v|9&U9_5qMZ(+#OZevU9f7EBD};4kmy)?g{+ zuD-;1^9;L5-aN2LfQ+d%8~jS<|2pXirz3!I;_VNDd*mD z5a*|d$qQx02FrJe<&&G-C01-O+?SM^73VPL%-9sqo@#H?YTG*|A3R6ZHCk;~w-GzF z4^@ZXd2++P_cSSPq@q@82o}plH@p?q +#include +#include + +/ { + model = "EnGenius EMD1"; + compatible = "engenius,emd1"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + soc { + rng@22000 { + status = "okay"; + }; + + mdio@90000 { + status = "okay"; + }; + + ess-psgmii@98000 { + status = "okay"; + }; + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + ess_tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + + crypto@8e3a000 { + status = "okay"; + }; + + watchdog@b017000 { + status = "okay"; + }; + + ess-switch@c000000 { + status = "okay"; + switch_lan_bmp = <0x20>; + switch_wan_bmp = <0x00>; + }; + + edma@c080000 { + status = "okay"; + qcom,num_gmac = <1>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "emd1:white:power"; + gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; + }; + + wlan2g { + label = "emd1:red:wlan2g"; + gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; + }; + + wlan5g { + label = "emd1:blue:wlan5g"; + gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1tpt"; + }; + + mesh { + label = "emd1:orange:mesh"; + gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&tlmm { + serial_pins: serial_pinmux { + mux { + pins = "gpio60", "gpio61"; + function = "blsp_uart0"; + bias-disable; + }; + }; + + spi_0_pins: spi_0_pinmux { + pin { + function = "blsp_spi0"; + pins = "gpio54", "gpio55", "gpio56", "gpio57"; + drive-strength = <12>; + bias-disable; + }; + + pin_cs { + function = "gpio"; + pins = "gpio54"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; +}; + +&blsp_dma { + status = "okay"; +}; + +&blsp1_spi1 { + pinctrl-0 = <&spi_0_pins>; + pinctrl-names = "default"; + status = "okay"; + cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <24000000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition0@0 { + label = "0:SBL1"; + reg = <0x00000000 0x00040000>; + read-only; + }; + partition1@40000 { + label = "0:MIBIB"; + reg = <0x00040000 0x00020000>; + read-only; + }; + partition2@60000 { + label = "0:QSEE"; + reg = <0x00060000 0x00060000>; + read-only; + }; + partition3@c0000 { + label = "0:CDT"; + reg = <0x000c0000 0x00010000>; + read-only; + }; + partition4@d0000 { + label = "0:DDRPARAMS"; + reg = <0x000d0000 0x00010000>; + read-only; + }; + partition5@e0000 { + label = "0:APPSBLENV"; + reg = <0x000e0000 0x00010000>; + read-only; + }; + partition6@f0000 { + label = "0:APPSBL"; + reg = <0x000f0000 0x00080000>; + read-only; + }; + partition7@170000 { + label = "0:ART"; + reg = <0x00170000 0x00010000>; + read-only; + }; + partition8@180000 { + label = "userconfig"; + reg = <0x00180000 0x00080000>; + read-only; + }; + partition9@200000 { + compatible = "denx,fit"; + label = "firmware"; + reg = <0x200000 0x01e00000>; + }; + }; + }; +}; + +&blsp1_uart1 { + pinctrl-0 = <&serial_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&gmac0 { + qcom,phy_mdio_addr = <4>; + qcom,poll_required = <1>; + qcom,forced_speed = <1000>; + qcom,forced_duplex = <1>; + vlan_tag = <1 0x20>; +}; + +&cryptobam { + status = "okay"; +}; + +&wifi0 { + status = "okay"; + qcom,ath10k-calibration-variant = "EnGenius-EMD1"; +}; + +&wifi1 { + status = "okay"; + qcom,ath10k-calibration-variant = "EnGenius-EMD1"; +}; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 41a65280c3..bbe4df9df4 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -278,6 +278,19 @@ define Device/engenius_eap1300 endef TARGET_DEVICES += engenius_eap1300 +define Device/engenius_emd1 + $(call Device/FitImage) + DEVICE_VENDOR := EnGenius + DEVICE_MODEL := EMD1 + DEVICE_DTS_CONFIG := config@4 + SOC := qcom-ipq4018 + IMAGE_SIZE := 30720k + IMAGES := sysupgrade.bin factory.bin + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata + IMAGE/factory.bin := qsdk-ipq-factory-nor | check-size $$$$(IMAGE_SIZE) +endef +TARGET_DEVICES += engenius_emd1 + define Device/engenius_ens620ext $(call Device/FitImage) DEVICE_VENDOR := EnGenius diff --git a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch index 9c9a31e436..11e775a5dc 100644 --- a/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch +++ b/target/linux/ipq40xx/patches-4.19/901-arm-boot-add-dts-files.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -785,11 +785,41 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -785,11 +785,42 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ @@ -20,6 +20,7 @@ Signed-off-by: John Crispin + qcom-ipq4018-cs-w3-wd1200g-eup.dtb \ + qcom-ipq4018-ea6350v3.dtb \ + qcom-ipq4018-eap1300.dtb \ ++ qcom-ipq4018-emd1.dtb \ + qcom-ipq4018-ens620ext.dtb \ + qcom-ipq4018-ex6100v2.dtb \ + qcom-ipq4018-ex6150v2.dtb \ From a59f1ec30f3316c8afffbaae39234cb562973f26 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 19 Jan 2020 00:00:52 +0100 Subject: [PATCH 450/480] ipq-wifi: drop deprecated .bin support This patch converts the Qxwlan E2600AC image away from the deprecated .bin file and to the new .qca4019 method. As a result, we no longer need to carry around the legacy support for handling .bin files. Signed-off-by: Christian Lamparter --- package/firmware/ipq-wifi/Makefile | 4 +--- package/firmware/ipq-wifi/board-qxwlan_e2600ac.bin | 1 - ...lan-e2600ac.bin => board-qxwlan_e2600ac.qca4019} | Bin 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 120000 package/firmware/ipq-wifi/board-qxwlan_e2600ac.bin rename package/firmware/ipq-wifi/{board-qxwlan-e2600ac.bin => board-qxwlan_e2600ac.qca4019} (100%) diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index eada8baf6f..610dee18e0 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -48,10 +48,8 @@ define ipq-wifi-install-one-to $(INSTALL_DATA) $(1) $(2)/lib/firmware/ath10k/$(3)/board-2.bin endef -# Note: .bin deprecated; supports existing boards - define ipq-wifi-install-one - $(if $(filter $(suffix $(1)),.QCA4019 .qca4019 .bin),\ + $(if $(filter $(suffix $(1)),.QCA4019 .qca4019),\ $(call ipq-wifi-install-one-to,$(1),$(2),QCA4019/hw1.0),\ $(if $(filter $(suffix $(1)),.QCA9888 .qca9888),\ $(call ipq-wifi-install-one-to,$(1),$(2),QCA9888/hw2.0),\ diff --git a/package/firmware/ipq-wifi/board-qxwlan_e2600ac.bin b/package/firmware/ipq-wifi/board-qxwlan_e2600ac.bin deleted file mode 120000 index acccf886ef..0000000000 --- a/package/firmware/ipq-wifi/board-qxwlan_e2600ac.bin +++ /dev/null @@ -1 +0,0 @@ -board-qxwlan-e2600ac.bin \ No newline at end of file diff --git a/package/firmware/ipq-wifi/board-qxwlan-e2600ac.bin b/package/firmware/ipq-wifi/board-qxwlan_e2600ac.qca4019 similarity index 100% rename from package/firmware/ipq-wifi/board-qxwlan-e2600ac.bin rename to package/firmware/ipq-wifi/board-qxwlan_e2600ac.qca4019 From 016339ba42498affb178edec2609bd5358db9b20 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 26 Jan 2020 01:12:50 +0100 Subject: [PATCH 451/480] ipq40xx: fix misplaced cells-sizes in WPJ419's dts This patch fixes the occurences of the following warning message from the dtc: Warning (reg_format): /soc/spi@78b5000/flash0@0/partitions/partition@0:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1) Signed-off-by: Christian Lamparter --- .../files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts index e75d07606a..6cf9d46767 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts @@ -151,8 +151,6 @@ num-cs = <2>; flash0@0 { - #address-cells = <1>; - #size-cells = <1>; reg = <0>; compatible = "jedec,spi-nor"; spi-max-frequency = <24000000>; @@ -160,6 +158,8 @@ partitions { compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; partition@0 { label = "0:SBL1"; From 6e96fd90471a49185bcfe9dcb4844d444674ecab Mon Sep 17 00:00:00 2001 From: Magnus Kroken Date: Sat, 25 Jan 2020 18:33:41 +0100 Subject: [PATCH 452/480] mbedtls: update to 2.16.4 Fixes side channel vulnerabilities in mbed TLS' implementation of ECDSA. Release announcement: https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.4-and-2.7.13-released Security advisory: https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2019-12 Fixes: * CVE-2019-18222: Side channel attack on ECDSA Signed-off-by: Magnus Kroken --- package/libs/mbedtls/Makefile | 4 +- package/libs/mbedtls/patches/200-config.patch | 44 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 307d03432e..618a74703a 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=2.16.3 +PKG_VERSION:=2.16.4 PKG_RELEASE:=1 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz PKG_SOURCE_URL:=https://tls.mbed.org/download/ -PKG_HASH:=fd01fe4b289116df7781d05e1ef712b6c98823c5334f4a27404f13a8d066ef6a +PKG_HASH:=5fdb9c43ab43fd9bcc3631508170b089ede7b86dd655253a93cb0ffeb42309f3 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0+ diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch index a09cf1f49b..298fa4aa79 100644 --- a/package/libs/mbedtls/patches/200-config.patch +++ b/package/libs/mbedtls/patches/200-config.patch @@ -17,7 +17,7 @@ /** * \def MBEDTLS_CIPHER_NULL_CIPHER -@@ -750,19 +750,19 @@ +@@ -757,19 +757,19 @@ * * Comment macros to disable the curve and functions for it */ @@ -46,7 +46,7 @@ /** * \def MBEDTLS_ECP_NIST_OPTIM -@@ -864,7 +864,7 @@ +@@ -871,7 +871,7 @@ * See dhm.h for more details. * */ @@ -55,7 +55,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED -@@ -884,7 +884,7 @@ +@@ -891,7 +891,7 @@ * MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA * MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA */ @@ -64,7 +64,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED -@@ -909,7 +909,7 @@ +@@ -916,7 +916,7 @@ * MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA */ @@ -73,7 +73,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED -@@ -1043,7 +1043,7 @@ +@@ -1050,7 +1050,7 @@ * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 */ @@ -82,7 +82,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED -@@ -1067,7 +1067,7 @@ +@@ -1074,7 +1074,7 @@ * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 */ @@ -91,7 +91,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED -@@ -1171,7 +1171,7 @@ +@@ -1178,7 +1178,7 @@ * This option is only useful if both MBEDTLS_SHA256_C and * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used. */ @@ -100,7 +100,7 @@ /** * \def MBEDTLS_ENTROPY_NV_SEED -@@ -1266,14 +1266,14 @@ +@@ -1273,14 +1273,14 @@ * Uncomment this macro to disable the use of CRT in RSA. * */ @@ -117,7 +117,7 @@ /** * \def MBEDTLS_SHA256_SMALLER -@@ -1427,7 +1427,7 @@ +@@ -1434,7 +1434,7 @@ * configuration of this extension). * */ @@ -126,7 +126,7 @@ /** * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO -@@ -1602,7 +1602,7 @@ +@@ -1609,7 +1609,7 @@ * * Comment this macro to disable support for SSL session tickets */ @@ -135,7 +135,7 @@ /** * \def MBEDTLS_SSL_EXPORT_KEYS -@@ -1632,7 +1632,7 @@ +@@ -1639,7 +1639,7 @@ * * Comment this macro to disable support for truncated HMAC in SSL */ @@ -144,7 +144,7 @@ /** * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT -@@ -1691,7 +1691,7 @@ +@@ -1698,7 +1698,7 @@ * * Comment this to disable run-time checking and save ROM space */ @@ -153,7 +153,7 @@ /** * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 -@@ -2021,7 +2021,7 @@ +@@ -2028,7 +2028,7 @@ * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 */ @@ -162,7 +162,7 @@ /** * \def MBEDTLS_ARIA_C -@@ -2087,7 +2087,7 @@ +@@ -2094,7 +2094,7 @@ * This module enables the AES-CCM ciphersuites, if other requisites are * enabled as well. */ @@ -171,7 +171,7 @@ /** * \def MBEDTLS_CERTS_C -@@ -2099,7 +2099,7 @@ +@@ -2106,7 +2106,7 @@ * * This module is used for testing (ssl_client/server). */ @@ -180,7 +180,7 @@ /** * \def MBEDTLS_CHACHA20_C -@@ -2203,7 +2203,7 @@ +@@ -2214,7 +2214,7 @@ * \warning DES is considered a weak cipher and its use constitutes a * security risk. We recommend considering stronger ciphers instead. */ @@ -189,7 +189,7 @@ /** * \def MBEDTLS_DHM_C -@@ -2366,7 +2366,7 @@ +@@ -2377,7 +2377,7 @@ * This module adds support for the Hashed Message Authentication Code * (HMAC)-based key derivation function (HKDF). */ @@ -198,7 +198,7 @@ /** * \def MBEDTLS_HMAC_DRBG_C -@@ -2676,7 +2676,7 @@ +@@ -2687,7 +2687,7 @@ * * This module enables abstraction of common (libc) functions. */ @@ -207,7 +207,7 @@ /** * \def MBEDTLS_POLY1305_C -@@ -2697,7 +2697,7 @@ +@@ -2708,7 +2708,7 @@ * Caller: library/md.c * */ @@ -216,7 +216,7 @@ /** * \def MBEDTLS_RSA_C -@@ -2804,7 +2804,7 @@ +@@ -2815,7 +2815,7 @@ * * Requires: MBEDTLS_CIPHER_C */ @@ -225,7 +225,7 @@ /** * \def MBEDTLS_SSL_CLI_C -@@ -2904,7 +2904,7 @@ +@@ -2915,7 +2915,7 @@ * * This module provides run-time version information. */ @@ -234,7 +234,7 @@ /** * \def MBEDTLS_X509_USE_C -@@ -3014,7 +3014,7 @@ +@@ -3025,7 +3025,7 @@ * Module: library/xtea.c * Caller: */ From 996f02e5bafad2815e72821c19d41fb5297e4dad Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Tue, 21 Jan 2020 10:42:33 +0100 Subject: [PATCH 453/480] lantiq: ltq-ptm: vr9: fix skb handling in ptm_hard_start_xmit() Call skb_orphan(skb) to call the owner's destructor function and make the skb unowned. This is necessary to prevent sk_wmem_alloc of a socket from overflowing, which leads to ENOBUFS errors on application level. Signed-off-by: Martin Schiller --- package/kernel/lantiq/ltq-ptm/Makefile | 2 +- package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile index 73fd63f42b..8f4db69411 100644 --- a/package/kernel/lantiq/ltq-ptm/Makefile +++ b/package/kernel/lantiq/ltq-ptm/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-ptm -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0+ diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c index 9e24c69d94..46a52e29d8 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c @@ -336,6 +336,9 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dma_cache_wback((unsigned long)skb->data, skb->len); } + /* make the skb unowned */ + skb_orphan(skb); + *(struct sk_buff **)((unsigned int)skb->data - byteoff - sizeof(struct sk_buff *)) = skb; /* write back to physical memory */ dma_cache_wback((unsigned long)skb->data - byteoff - sizeof(struct sk_buff *), skb->len + byteoff + sizeof(struct sk_buff *)); From a461f984c450a49bce1cac191620a8ee2a3329c0 Mon Sep 17 00:00:00 2001 From: Scott Roberts Date: Thu, 23 Jan 2020 21:45:53 -0700 Subject: [PATCH 454/480] kernel: sfp: add Nokia SFP fix from net-next Add Nokia GPON ONT SFP fix for tx_fault in net-next. Signed-off-by: Scott Roberts --- ...void-tx-fault-with-Nokia-GPON-module.patch | 108 ++++++++++++++++++ ...ncomplete-100BASE-FX-and-100BASE-LX-.patch | 2 +- ...p-add-more-extended-compliance-codes.patch | 4 +- ...le-start-stop-upstream-notifications.patch | 4 +- ...p-move-phy_start-phy_stop-to-phylink.patch | 4 +- ...t-sfp-add-support-for-Clause-45-PHYs.patch | 8 +- .../pending-4.19/754-net-sfp-fix-unbind.patch | 2 +- .../pending-4.19/755-net-sfp-fix-hwmon.patch | 4 +- ...finition-for-the-fault-recovery-atte.patch | 14 +-- .../757-net-sfp-rename-sm_retries.patch | 12 +- ...net-sfp-error-handling-for-phy-probe.patch | 10 +- ...9-net-sfp-re-attempt-probing-for-phy.patch | 10 +- 12 files changed, 145 insertions(+), 37 deletions(-) create mode 100644 target/linux/generic/pending-4.19/739-net-avoid-tx-fault-with-Nokia-GPON-module.patch diff --git a/target/linux/generic/pending-4.19/739-net-avoid-tx-fault-with-Nokia-GPON-module.patch b/target/linux/generic/pending-4.19/739-net-avoid-tx-fault-with-Nokia-GPON-module.patch new file mode 100644 index 0000000000..b540e1dbc1 --- /dev/null +++ b/target/linux/generic/pending-4.19/739-net-avoid-tx-fault-with-Nokia-GPON-module.patch @@ -0,0 +1,108 @@ +From 283b211aa01bdae94dffb3121655dbb20bf237f4 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Tue, 3 Dec 2019 15:22:05 +0000 +Subject: net: sfp: avoid tx-fault with Nokia GPON module + +The Nokia GPON module can hold tx-fault active while it is initialising +which can take up to 60s. Avoid this causing the module to be declared +faulty after the SFP MSA defined non-cooled module timeout. + +Signed-off-by: Russell King +--- + drivers/net/phy/sfp.c | 42 ++++++++++++++++++++++++++++++------------ + 1 file changed, 30 insertions(+), 12 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -153,10 +153,20 @@ static const enum gpiod_flags gpio_flags + GPIOD_ASIS, + }; + +-#define T_WAIT msecs_to_jiffies(50) +-#define T_INIT_JIFFIES msecs_to_jiffies(300) +-#define T_RESET_US 10 +-#define T_FAULT_RECOVER msecs_to_jiffies(1000) ++/* t_start_up (SFF-8431) or t_init (SFF-8472) is the time required for a ++ * non-cooled module to initialise its laser safety circuitry. We wait ++ * an initial T_WAIT period before we check the tx fault to give any PHY ++ * on board (for a copper SFP) time to initialise. ++ */ ++#define T_WAIT msecs_to_jiffies(50) ++#define T_START_UP msecs_to_jiffies(300) ++#define T_START_UP_BAD_GPON msecs_to_jiffies(60000) ++ ++/* t_reset is the time required to assert the TX_DISABLE signal to reset ++ * an indicated TX_FAULT. ++ */ ++#define T_RESET_US 10 ++#define T_FAULT_RECOVER msecs_to_jiffies(1000) + + /* SFP module presence detection is poor: the three MOD DEF signals are + * the same length on the PCB, which means it's possible for MOD DEF 0 to +@@ -216,6 +226,7 @@ struct sfp { + + struct sfp_eeprom_id id; + unsigned int module_power_mW; ++ unsigned int module_t_start_up; + + #if IS_ENABLED(CONFIG_HWMON) + struct sfp_diag diag; +@@ -1590,6 +1601,12 @@ static int sfp_sm_mod_probe(struct sfp * + if (ret < 0) + return ret; + ++ if (!memcmp(id.base.vendor_name, "ALCATELLUCENT ", 16) && ++ !memcmp(id.base.vendor_pn, "3FE46541AA ", 16)) ++ sfp->module_t_start_up = T_START_UP_BAD_GPON; ++ else ++ sfp->module_t_start_up = T_START_UP; ++ + return 0; + } + +@@ -1795,11 +1812,12 @@ static void sfp_sm_main(struct sfp *sfp, + break; + + if (sfp->state & SFP_F_TX_FAULT) { +- /* Wait t_init before indicating that the link is up, +- * provided the current state indicates no TX_FAULT. If +- * TX_FAULT clears before this time, that's fine too. ++ /* Wait up to t_init (SFF-8472) or t_start_up (SFF-8431) ++ * from the TX_DISABLE deassertion for the module to ++ * initialise, which is indicated by TX_FAULT ++ * deasserting. + */ +- timeout = T_INIT_JIFFIES; ++ timeout = sfp->module_t_start_up; + if (timeout > T_WAIT) + timeout -= T_WAIT; + else +@@ -1816,8 +1834,8 @@ static void sfp_sm_main(struct sfp *sfp, + + case SFP_S_INIT: + if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) { +- /* TX_FAULT is still asserted after t_init, so assume +- * there is a fault. ++ /* TX_FAULT is still asserted after t_init or ++ * or t_start_up, so assume there is a fault. + */ + sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, + sfp->sm_retries == 5); +@@ -1836,7 +1854,7 @@ static void sfp_sm_main(struct sfp *sfp, + case SFP_S_INIT_TX_FAULT: + if (event == SFP_E_TIMEOUT) { + sfp_module_tx_fault_reset(sfp); +- sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES); ++ sfp_sm_next(sfp, SFP_S_INIT, sfp->module_t_start_up); + } + break; + +@@ -1860,7 +1878,7 @@ static void sfp_sm_main(struct sfp *sfp, + case SFP_S_TX_FAULT: + if (event == SFP_E_TIMEOUT) { + sfp_module_tx_fault_reset(sfp); +- sfp_sm_next(sfp, SFP_S_REINIT, T_INIT_JIFFIES); ++ sfp_sm_next(sfp, SFP_S_REINIT, sfp->module_t_start_up); + } + break; + diff --git a/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch b/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch index aaeb65763b..304d9b40bd 100644 --- a/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch +++ b/target/linux/generic/pending-4.19/740-net-sfp-remove-incomplete-100BASE-FX-and-100BASE-LX-.patch @@ -30,7 +30,7 @@ Signed-off-by: Russell King if (phylink_test(link_modes, 1000baseX_Full)) --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1413,18 +1413,7 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1424,18 +1424,7 @@ static void sfp_sm_fault(struct sfp *sfp static void sfp_sm_probe_for_phy(struct sfp *sfp) { diff --git a/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch b/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch index 266c7c27e3..4ca0ded55d 100644 --- a/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch +++ b/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch @@ -132,7 +132,7 @@ Signed-off-by: Russell King if (phylink_test(link_modes, 2500baseX_Full)) --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -229,7 +229,7 @@ struct sfp { +@@ -240,7 +240,7 @@ struct sfp { static bool sff_module_supported(const struct sfp_eeprom_id *id) { @@ -141,7 +141,7 @@ Signed-off-by: Russell King id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP; } -@@ -240,7 +240,7 @@ static const struct sff_data sff_data = +@@ -251,7 +251,7 @@ static const struct sff_data sff_data = static bool sfp_module_supported(const struct sfp_eeprom_id *id) { diff --git a/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch b/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch index e0eea5e605..c0c3e9e57e 100644 --- a/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch +++ b/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch @@ -78,7 +78,7 @@ Signed-off-by: Russell King [SFP_S_WAIT] = "wait", [SFP_S_INIT] = "init", [SFP_S_INIT_TX_FAULT] = "init_tx_fault", -@@ -1749,6 +1751,8 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1766,6 +1768,8 @@ static void sfp_sm_main(struct sfp *sfp, if (sfp->sm_state == SFP_S_LINK_UP && sfp->sm_dev_state == SFP_DEV_UP) sfp_sm_link_down(sfp); @@ -87,7 +87,7 @@ Signed-off-by: Russell King if (sfp->mod_phy) sfp_sm_phy_detach(sfp); sfp_module_tx_disable(sfp); -@@ -1815,6 +1819,10 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1833,6 +1837,10 @@ static void sfp_sm_main(struct sfp *sfp, * clear. Probe for the PHY and check the LOS state. */ sfp_sm_probe_for_phy(sfp); diff --git a/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch b/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch index b3c47a054f..a646fcd409 100644 --- a/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch +++ b/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch @@ -54,7 +54,7 @@ Signed-off-by: Russell King .connect_phy = phylink_sfp_connect_phy, --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1320,7 +1320,6 @@ static void sfp_sm_mod_next(struct sfp * +@@ -1331,7 +1331,6 @@ static void sfp_sm_mod_next(struct sfp * static void sfp_sm_phy_detach(struct sfp *sfp) { @@ -62,7 +62,7 @@ Signed-off-by: Russell King sfp_remove_phy(sfp->sfp_bus); phy_device_remove(sfp->mod_phy); phy_device_free(sfp->mod_phy); -@@ -1351,7 +1350,6 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1362,7 +1361,6 @@ static void sfp_sm_probe_phy(struct sfp } sfp->mod_phy = phy; diff --git a/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch b/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch index a710901690..ea26770841 100644 --- a/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch +++ b/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch @@ -14,7 +14,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1326,12 +1326,12 @@ static void sfp_sm_phy_detach(struct sfp +@@ -1337,12 +1337,12 @@ static void sfp_sm_phy_detach(struct sfp sfp->mod_phy = NULL; } @@ -29,7 +29,7 @@ Signed-off-by: Russell King if (phy == ERR_PTR(-ENODEV)) { dev_info(sfp->dev, "no PHY detected\n"); return; -@@ -1341,6 +1341,13 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1352,6 +1352,13 @@ static void sfp_sm_probe_phy(struct sfp return; } @@ -43,7 +43,7 @@ Signed-off-by: Russell King err = sfp_add_phy(sfp->sfp_bus, phy); if (err) { phy_device_remove(phy); -@@ -1411,10 +1418,32 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1422,10 +1429,32 @@ static void sfp_sm_fault(struct sfp *sfp } } @@ -78,7 +78,7 @@ Signed-off-by: Russell King } static int sfp_module_parse_power(struct sfp *sfp) -@@ -1474,6 +1503,13 @@ static int sfp_sm_mod_hpower(struct sfp +@@ -1485,6 +1514,13 @@ static int sfp_sm_mod_hpower(struct sfp return -EAGAIN; } diff --git a/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch b/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch index 3172249a10..55fabafa81 100644 --- a/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch +++ b/target/linux/generic/pending-4.19/754-net-sfp-fix-unbind.patch @@ -15,7 +15,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -2242,6 +2242,10 @@ static int sfp_remove(struct platform_de +@@ -2260,6 +2260,10 @@ static int sfp_remove(struct platform_de sfp_unregister_socket(sfp->sfp_bus); diff --git a/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch b/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch index 9e13fbd0f2..d003df4e13 100644 --- a/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch +++ b/target/linux/generic/pending-4.19/755-net-sfp-fix-hwmon.patch @@ -15,7 +15,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1714,6 +1714,10 @@ static void sfp_sm_module(struct sfp *sf +@@ -1731,6 +1731,10 @@ static void sfp_sm_module(struct sfp *sf break; } @@ -26,7 +26,7 @@ Signed-off-by: Russell King sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0); /* fall through */ case SFP_MOD_WAITDEV: -@@ -1763,15 +1767,6 @@ static void sfp_sm_module(struct sfp *sf +@@ -1780,15 +1784,6 @@ static void sfp_sm_module(struct sfp *sf case SFP_MOD_ERROR: break; } diff --git a/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch b/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch index 0e5005ed19..8362f73f46 100644 --- a/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch +++ b/target/linux/generic/pending-4.19/756-net-sfp-use-a-definition-for-the-fault-recovery-atte.patch @@ -11,9 +11,9 @@ Signed-off-by: Russell King --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -160,6 +160,14 @@ static const enum gpiod_flags gpio_flags - #define T_RESET_US 10 - #define T_FAULT_RECOVER msecs_to_jiffies(1000) +@@ -170,6 +170,14 @@ static const enum gpiod_flags gpio_flags + #define T_RESET_US 10 + #define T_FAULT_RECOVER msecs_to_jiffies(1000) +/* N_FAULT_INIT is the number of recovery attempts at module initialisation + * time. If the TX_FAULT signal is not deasserted after this number of @@ -26,7 +26,7 @@ Signed-off-by: Russell King /* SFP module presence detection is poor: the three MOD DEF signals are * the same length on the PCB, which means it's possible for MOD DEF 0 to * connect before the I2C bus on MOD DEF 1/2. -@@ -1803,7 +1811,7 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1820,7 +1828,7 @@ static void sfp_sm_main(struct sfp *sfp, sfp_module_tx_enable(sfp); /* Initialise the fault clearance retries */ @@ -35,8 +35,8 @@ Signed-off-by: Russell King /* We need to check the TX_FAULT state, which is not defined * while TX_DISABLE is asserted. The earliest we want to do -@@ -1842,7 +1850,7 @@ static void sfp_sm_main(struct sfp *sfp, - * there is a fault. +@@ -1860,7 +1868,7 @@ 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_retries == 5); @@ -44,7 +44,7 @@ Signed-off-by: Russell King } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT * clear. Probe for the PHY and check the LOS state. -@@ -1855,7 +1863,7 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1873,7 +1881,7 @@ static void sfp_sm_main(struct sfp *sfp, sfp_sm_link_check_los(sfp); /* Reset the fault retry count */ diff --git a/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch b/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch index b347d2c90a..c6f43729da 100644 --- a/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch +++ b/target/linux/generic/pending-4.19/757-net-sfp-rename-sm_retries.patch @@ -13,7 +13,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -222,7 +222,7 @@ struct sfp { +@@ -232,7 +232,7 @@ struct sfp { unsigned char sm_mod_tries; unsigned char sm_dev_state; unsigned short sm_state; @@ -22,7 +22,7 @@ Signed-off-by: Russell King struct sfp_eeprom_id id; unsigned int module_power_mW; -@@ -1414,7 +1414,7 @@ static bool sfp_los_event_inactive(struc +@@ -1425,7 +1425,7 @@ static bool sfp_los_event_inactive(struc static void sfp_sm_fault(struct sfp *sfp, unsigned int next_state, bool warn) { @@ -31,7 +31,7 @@ Signed-off-by: Russell King dev_err(sfp->dev, "module persistently indicates fault, disabling\n"); sfp_sm_next(sfp, SFP_S_TX_DISABLE, 0); -@@ -1811,7 +1811,7 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1828,7 +1828,7 @@ static void sfp_sm_main(struct sfp *sfp, sfp_module_tx_enable(sfp); /* Initialise the fault clearance retries */ @@ -40,8 +40,8 @@ Signed-off-by: Russell King /* We need to check the TX_FAULT state, which is not defined * while TX_DISABLE is asserted. The earliest we want to do -@@ -1850,7 +1850,7 @@ static void sfp_sm_main(struct sfp *sfp, - * there is a fault. +@@ -1868,7 +1868,7 @@ 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_retries == N_FAULT_INIT); @@ -49,7 +49,7 @@ Signed-off-by: Russell King } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT * clear. Probe for the PHY and check the LOS state. -@@ -1863,7 +1863,7 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1881,7 +1881,7 @@ static void sfp_sm_main(struct sfp *sfp, sfp_sm_link_check_los(sfp); /* Reset the fault retry count */ diff --git a/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch b/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch index 00896dfa26..8191e622a1 100644 --- a/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch +++ b/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1334,7 +1334,7 @@ static void sfp_sm_phy_detach(struct sfp +@@ -1345,7 +1345,7 @@ static void sfp_sm_phy_detach(struct sfp sfp->mod_phy = NULL; } @@ -19,7 +19,7 @@ Signed-off-by: Russell King { struct phy_device *phy; int err; -@@ -1342,18 +1342,18 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1353,18 +1353,18 @@ static void sfp_sm_probe_phy(struct sfp phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45); if (phy == ERR_PTR(-ENODEV)) { dev_info(sfp->dev, "no PHY detected\n"); @@ -41,7 +41,7 @@ Signed-off-by: Russell King } err = sfp_add_phy(sfp->sfp_bus, phy); -@@ -1361,10 +1361,12 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1372,10 +1372,12 @@ static void sfp_sm_probe_phy(struct sfp phy_device_remove(phy); phy_device_free(phy); dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); @@ -55,7 +55,7 @@ Signed-off-by: Russell King } static void sfp_sm_link_up(struct sfp *sfp) -@@ -1437,21 +1439,24 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1448,21 +1450,24 @@ static void sfp_sm_fault(struct sfp *sfp * Clause 45 copper SFP+ modules (10G) appear to switch their interface * mode according to the negotiated line speed. */ @@ -83,7 +83,7 @@ Signed-off-by: Russell King } static int sfp_module_parse_power(struct sfp *sfp) -@@ -1855,7 +1860,10 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1873,7 +1878,10 @@ static void sfp_sm_main(struct sfp *sfp, init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT * clear. Probe for the PHY and check the LOS state. */ diff --git a/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch b/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch index 526c7962cc..46d987344f 100644 --- a/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch +++ b/target/linux/generic/pending-4.19/759-net-sfp-re-attempt-probing-for-phy.patch @@ -35,7 +35,7 @@ Signed-off-by: Russell King [SFP_S_INIT_TX_FAULT] = "init_tx_fault", [SFP_S_WAIT_LOS] = "wait_los", [SFP_S_LINK_UP] = "link_up", -@@ -168,6 +170,12 @@ static const enum gpiod_flags gpio_flags +@@ -178,6 +180,12 @@ static const enum gpiod_flags gpio_flags #define N_FAULT_INIT 5 #define N_FAULT 5 @@ -48,7 +48,7 @@ Signed-off-by: Russell King /* SFP module presence detection is poor: the three MOD DEF signals are * the same length on the PCB, which means it's possible for MOD DEF 0 to * connect before the I2C bus on MOD DEF 1/2. -@@ -223,6 +231,7 @@ struct sfp { +@@ -233,6 +241,7 @@ struct sfp { unsigned char sm_dev_state; unsigned short sm_state; unsigned char sm_fault_retries; @@ -56,7 +56,7 @@ Signed-off-by: Russell King struct sfp_eeprom_id id; unsigned int module_power_mW; -@@ -1340,10 +1349,8 @@ static int sfp_sm_probe_phy(struct sfp * +@@ -1351,10 +1360,8 @@ static int sfp_sm_probe_phy(struct sfp * int err; phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45); @@ -69,7 +69,7 @@ Signed-off-by: Russell King if (IS_ERR(phy)) { dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); return PTR_ERR(phy); -@@ -1785,6 +1792,7 @@ static void sfp_sm_module(struct sfp *sf +@@ -1802,6 +1809,7 @@ static void sfp_sm_module(struct sfp *sf static void sfp_sm_main(struct sfp *sfp, unsigned int event) { unsigned long timeout; @@ -77,7 +77,7 @@ Signed-off-by: Russell King /* Some events are global */ if (sfp->sm_state != SFP_S_DOWN && -@@ -1857,22 +1865,39 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1875,22 +1883,39 @@ static void sfp_sm_main(struct sfp *sfp, sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, sfp->sm_fault_retries == N_FAULT_INIT); } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { From eec50c73c4c9cca89a4bca13a40517b262192fea Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 17 Jan 2020 18:47:33 +0100 Subject: [PATCH 455/480] build: Add KBUILD_HOSTLDLIBS In Linux kernel commit 8377bd2b9ee1 ("kbuild: Rename HOST_LOADLIBES to KBUILD_HOSTLDLIBS") HOST_LOADLIBES was renamed to KBUILD_HOSTLDLIBS. This patch adapts the OpenWrt kernel build to this new variable. Without this change the kernel host tools would not link against the libraries found in the staging directory. Signed-off-by: Hauke Mehrtens --- include/kernel.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/kernel.mk b/include/kernel.mk index 439e910ebf..02d0949a72 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -114,6 +114,7 @@ KERNEL_MAKE_FLAGS = \ KBUILD_BUILD_TIMESTAMP="$(KBUILD_BUILD_TIMESTAMP)" \ KBUILD_BUILD_VERSION="0" \ HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib" \ + KBUILD_HOSTLDLIBS="-L$(STAGING_DIR_HOST)/lib" \ CONFIG_SHELL="$(BASH)" \ $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \ $(if $(PKG_BUILD_ID),LDFLAGS_MODULE=--build-id=0x$(PKG_BUILD_ID)) \ From 0fecc997f88b7f0a44c0f724d6de30083a14b908 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Wed, 25 Dec 2019 18:39:00 +0100 Subject: [PATCH 456/480] base-files: remove some bashisms "[[" is a bash extension for test. As the ash-implementation is not fully compatible we drop its usage. Also change to "=" for simple test, which is sufficient. (see d6ac8ca76c04ed) Signed-off-by: Sven Roederer [split patch, removed shebang] Signed-off-by: Adrian Schmutzler --- package/base-files/files/lib/functions/caldata.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/lib/functions/caldata.sh b/package/base-files/files/lib/functions/caldata.sh index 1ff69ce1ae..3bdb1e4dd5 100644 --- a/package/base-files/files/lib/functions/caldata.sh +++ b/package/base-files/files/lib/functions/caldata.sh @@ -69,7 +69,7 @@ caldata_valid() { local expected="$1" magic=$(hexdump -v -n 2 -e '1/1 "%02x"' /lib/firmware/$FIRMWARE) - [[ "$magic" == "$expected" ]] + [ "$magic" = "$expected" ] return $? } From a20069e1af3977a34280e9ae4d388da5bae8f66f Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Wed, 25 Dec 2019 18:39:00 +0100 Subject: [PATCH 457/480] mvebu: remove bashism "[[" is a bash extension for test. As the ash-implementation is not fully compatible we drop its usage. Signed-off-by: Sven Roederer [split patch, remove shebang, adjust commit title/message] Signed-off-by: Adrian Schmutzler --- target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh index 032c706605..0bb1dd12cc 100644 --- a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh +++ b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh @@ -31,7 +31,7 @@ udpu_do_part_check() { # Check if the block devices exist for num in ${emmc_parts}; do - [[ ! -b ${emmc_dev}p${num} ]] && part_valid="0" + [ ! -b ${emmc_dev}p${num} ] && part_valid="0" done # If partitions are missing create a new partition table From bc357aaa2b112b349f0349efe89d52aa57d5f582 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Wed, 25 Dec 2019 18:42:13 +0100 Subject: [PATCH 458/480] netifd/config.sh: remove some bashism (usage of [[) "[[" is a bash extension for test. As the ash-implementation is not fully compatible we drop its usage. Signed-off-by: Sven Roederer --- package/network/config/netifd/files/lib/network/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/config/netifd/files/lib/network/config.sh b/package/network/config/netifd/files/lib/network/config.sh index 0ded45edc4..2a1aa65fe0 100755 --- a/package/network/config/netifd/files/lib/network/config.sh +++ b/package/network/config/netifd/files/lib/network/config.sh @@ -12,7 +12,7 @@ find_config() { json_load "$(ifstatus $interface)" json_get_var ifdev device json_get_var ifl3dev l3_device - if [[ "$device" = "$ifdev" ]] || [[ "$device" = "$ifl3dev" ]]; then + if [ "$device" = "$ifdev" ] || [ "$device" = "$ifl3dev" ]; then echo "$interface" exit 0 else From bad59fd51bbcb9e37119ef05ea6f8970db26ce85 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Wed, 25 Dec 2019 18:43:45 +0100 Subject: [PATCH 459/480] 6in4/6in4.sh: remove some bashism (usage of [[) "[[" is a bash extension for test. As the ash-implementation is not fully compatible we drop its usage. Signed-off-by: Sven Roederer --- package/network/ipv6/6in4/files/6in4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index 0f631b78ba..5b5c7b36af 100755 --- a/package/network/ipv6/6in4/files/6in4.sh +++ b/package/network/ipv6/6in4/files/6in4.sh @@ -75,7 +75,7 @@ proto_6in4_setup() { [ -n "$ip6addr" ] && { local local6="${ip6addr%%/*}" local mask6="${ip6addr##*/}" - [[ "$local6" = "$mask6" ]] && mask6= + [ "$local6" = "$mask6" ] && mask6= proto_add_ipv6_address "$local6" "$mask6" proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" } From 3519bf4976b41ca8071faaa0f13c48dbf8edff0b Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Wed, 25 Dec 2019 18:46:14 +0100 Subject: [PATCH 460/480] hostapd: remove some bashisms "[[" is a bash extension for test. As the ash-implementation is not fully compatible we drop its usage. Signed-off-by: Sven Roederer [remove shebang, slightly facelift commit title/message] Signed-off-by: Adrian Schmutzler --- package/network/services/hostapd/files/hostapd.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index ab86638e11..189760157e 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -731,7 +731,7 @@ wpa_supplicant_prepare_interface() { _w_mode="$mode" - [[ "$mode" = adhoc ]] && { + [ "$mode" = adhoc ] && { ap_scan="ap_scan=2" } @@ -810,7 +810,7 @@ wpa_supplicant_add_network() { local scan_ssid="scan_ssid=1" local freq wpa_key_mgmt - [[ "$_w_mode" = "adhoc" ]] && { + [ "$_w_mode" = "adhoc" ] && { append network_data "mode=1" "$N$T" [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T" @@ -820,7 +820,7 @@ wpa_supplicant_add_network() { [ "$_w_driver" = "nl80211" ] || append wpa_key_mgmt "WPA-NONE" } - [[ "$_w_mode" = "mesh" ]] && { + [ "$_w_mode" = "mesh" ] && { json_get_vars mesh_id mesh_fwding mesh_rssi_threshold [ -n "$mesh_id" ] && ssid="${mesh_id}" From 9e0aab44b656be530b7b92ac03588ffc4d4cd1fa Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 24 Jan 2020 23:40:22 +0100 Subject: [PATCH 461/480] kernel: use older kernel for explicitly setting dependencies It is generally more desirable to use older kernel versions for dependencies, as this will require less changes when newer kernels are added (they will by default select the newer packages). Since we currently only have two kernels (4.14 and 4.19) in master, this patch applies this logic by converting all LINUX_4_19 symbols to their inverted LINUX_4_14 equivalents. Signed-off-by: Adrian Schmutzler --- package/kernel/i2c-gpio-custom/Makefile | 2 +- package/kernel/linux/modules/iio.mk | 2 +- package/kernel/linux/modules/netdevices.mk | 2 +- package/kernel/linux/modules/netfilter.mk | 2 +- package/kernel/linux/modules/netsupport.mk | 2 +- package/kernel/linux/modules/other.mk | 8 ++++---- package/kernel/linux/modules/usb.mk | 2 +- package/kernel/linux/modules/video.mk | 2 +- package/kernel/spi-gpio-custom/Makefile | 2 +- package/kernel/w1-gpio-custom/Makefile | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/kernel/i2c-gpio-custom/Makefile b/package/kernel/i2c-gpio-custom/Makefile index 4891423d5c..11095abbb8 100644 --- a/package/kernel/i2c-gpio-custom/Makefile +++ b/package/kernel/i2c-gpio-custom/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/i2c-gpio-custom SUBMENU:=I2C support TITLE:=Custom GPIO-based I2C device - DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-i2c-gpio @!LINUX_4_19 + DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-i2c-gpio @LINUX_4_14 FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.ko KCONFIG:= endef diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index ce6705a59a..cd46697168 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -131,7 +131,7 @@ $(eval $(call KernelPackage,iio-dht11)) define KernelPackage/iio-bme680 SUBMENU:=$(IIO_MENU) TITLE:=BME680 gas/humidity/pressure/temperature sensor - DEPENDS:=@LINUX_4_19 +kmod-iio-core +kmod-regmap-core + DEPENDS:=@!LINUX_4_14 +kmod-iio-core +kmod-regmap-core KCONFIG:=CONFIG_BME680 FILES:=$(LINUX_DIR)/drivers/iio/chemical/bme680_core.ko endef diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 5bfd1617a3..2854ce31fa 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -541,7 +541,7 @@ $(eval $(call KernelPackage,8139cp)) define KernelPackage/r8169 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support - DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +LINUX_4_19:kmod-phy-realtek + DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +!LINUX_4_14:kmod-phy-realtek KCONFIG:=CONFIG_R8169 \ CONFIG_R8169_NAPI=y \ CONFIG_R8169_VLAN=n diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 3ecbf868c2..7eda8e6270 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -540,7 +540,7 @@ define KernelPackage/nf-nathelper-extra KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA) FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m))) - DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +LINUX_4_19:kmod-asn1-decoder + DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +!LINUX_4_14:kmod-asn1-decoder endef define KernelPackage/nf-nathelper-extra/description diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 3656441650..ada35acddc 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1143,7 +1143,7 @@ $(eval $(call KernelPackage,rxrpc)) define KernelPackage/mpls SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=MPLS support - DEPENDS:=+LINUX_4_19:kmod-iptunnel + DEPENDS:=+!LINUX_4_14:kmod-iptunnel KCONFIG:= \ CONFIG_MPLS=y \ CONFIG_LWTUNNEL=y \ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index b65d0155db..d3e062743d 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -169,7 +169,7 @@ define KernelPackage/eeprom-at24 SUBMENU:=$(OTHER_MENU) TITLE:=EEPROM AT24 support KCONFIG:=CONFIG_EEPROM_AT24 - DEPENDS:=+kmod-i2c-core +kmod-nvmem +LINUX_4_19:kmod-regmap-i2c + DEPENDS:=+kmod-i2c-core +kmod-nvmem +!LINUX_4_14:kmod-regmap-i2c FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at24.ko AUTOLOAD:=$(call AutoProbe,at24) endef @@ -938,7 +938,7 @@ $(eval $(call KernelPackage,ptp)) define KernelPackage/ptp-gianfar SUBMENU:=$(OTHER_MENU) TITLE:=Freescale Gianfar PTP support - DEPENDS:=@TARGET_mpc85xx +kmod-ptp @!LINUX_4_19 + DEPENDS:=@TARGET_mpc85xx +kmod-ptp @LINUX_4_14 KCONFIG:=CONFIG_PTP_1588_CLOCK_GIANFAR FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_ptp.ko AUTOLOAD:=$(call AutoProbe,gianfar_ptp) @@ -954,7 +954,7 @@ $(eval $(call KernelPackage,ptp-gianfar)) define KernelPackage/ptp-qoriq SUBMENU:=$(OTHER_MENU) TITLE:=Freescale QorIQ PTP support - DEPENDS:=@TARGET_mpc85xx +kmod-ptp @LINUX_4_19 + DEPENDS:=@TARGET_mpc85xx +kmod-ptp @!LINUX_4_14 KCONFIG:=CONFIG_PTP_1588_CLOCK_QORIQ FILES:=$(LINUX_DIR)/drivers/ptp/ptp_qoriq.o AUTOLOAD:=$(call AutoProbe,ptp_qoriq) @@ -987,7 +987,7 @@ define KernelPackage/random-tpm TITLE:=Hardware Random Number Generator TPM support KCONFIG:=CONFIG_HW_RANDOM_TPM FILES:=$(LINUX_DIR)/drivers/char/hw_random/tpm-rng.ko - DEPENDS:= +kmod-random-core +kmod-tpm @!LINUX_4_19 + DEPENDS:= +kmod-random-core +kmod-tpm @LINUX_4_14 AUTOLOAD:=$(call AutoProbe,tpm-rng) endef diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 30be6221b7..6ea112634c 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -496,7 +496,7 @@ $(eval $(call KernelPackage,usb-dwc3-of-simple)) define KernelPackage/usb-dwc3-qcom TITLE:=DWC3 Qualcomm USB driver - DEPENDS:=@LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3 + DEPENDS:=@!LINUX_4_14 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3 KCONFIG:= CONFIG_USB_DWC3_QCOM FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index f726d0ef03..d385a427c6 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -511,7 +511,7 @@ $(eval $(call KernelPackage,video-uvc)) define KernelPackage/video-gspca-core MENU:=1 TITLE:=GSPCA webcam core support framework - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core +LINUX_4_19:kmod-video-videobuf2 + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core +!LINUX_4_14:kmod-video-videobuf2 KCONFIG:=CONFIG_USB_GSPCA FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_main.ko AUTOLOAD:=$(call AutoProbe,gspca_main) diff --git a/package/kernel/spi-gpio-custom/Makefile b/package/kernel/spi-gpio-custom/Makefile index b0da3db188..34a478fb5d 100644 --- a/package/kernel/spi-gpio-custom/Makefile +++ b/package/kernel/spi-gpio-custom/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/spi-gpio-custom SUBMENU:=SPI Support TITLE:=Custom GPIO-based SPI device - DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang +kmod-spi-gpio +kmod-spi-dev @!LINUX_4_19 + DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang +kmod-spi-gpio +kmod-spi-dev @LINUX_4_14 FILES:=$(PKG_BUILD_DIR)/spi-gpio-custom.ko KCONFIG:= endef diff --git a/package/kernel/w1-gpio-custom/Makefile b/package/kernel/w1-gpio-custom/Makefile index 021791ff94..5445097a81 100644 --- a/package/kernel/w1-gpio-custom/Makefile +++ b/package/kernel/w1-gpio-custom/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/w1-gpio-custom SUBMENU:=W1 support TITLE:=Custom GPIO-based 1-wire device - DEPENDS:=kmod-w1 +kmod-w1-master-gpio @!LINUX_4_19 + DEPENDS:=kmod-w1 +kmod-w1-master-gpio @LINUX_4_14 FILES:=$(PKG_BUILD_DIR)/w1-gpio-custom.ko KCONFIG:= endef From 49d66e0468c14d8a05bd6c33056708d2051437cb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 14 Jan 2020 15:38:51 +0100 Subject: [PATCH 462/480] mediatek: use consistent naming scheme for device nodes This harmonizes the device node names (and thus the image names, too) between subtargets of the mediatek target. So far, each subtarget has somewhat used its own naming scheme. Now, we use the vendor_device syntax there, too. Since DTS names have different patterns and the target only contains a few devices, this does not replace DEVICE_DTS by a calculated default value (like for other targets). SUPPORTED_DEVICES is adjusted based on the node rename where necessary, though it looks like for several older devices it was not set up correctly so far. While at it, this also changes the DTS name for u7623-02-emmc-512m to all-lower-case. Cc: John Crispin Signed-off-by: Adrian Schmutzler --- target/linux/mediatek/image/mt7622.mk | 14 ++++++++------ target/linux/mediatek/image/mt7623.mk | 14 ++++++-------- target/linux/mediatek/image/mt7629.mk | 1 - .../0227-arm-dts-Add-Unielec-U7623-DTS.patch | 8 ++++---- .../0227-arm-dts-Add-Unielec-U7623-DTS.patch | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index b84a3a6b50..9a5aedc88d 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -1,4 +1,4 @@ -define Device/MTK-RFB1 +define Device/mediatek_mt7622-rfb1 DEVICE_VENDOR := MediaTek DEVICE_MODEL := MTK7622 rfb1 AP DEVICE_DTS := mt7622-rfb1 @@ -6,24 +6,26 @@ define Device/MTK-RFB1 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \ kmod-ata-core kmod-ata-ahci-mtk endef -TARGET_DEVICES += MTK-RFB1 +TARGET_DEVICES += mediatek_mt7622-rfb1 -define Device/MTK-LYNX-RFB1 +define Device/mediatek_mt7622-lynx-rfb1 DEVICE_VENDOR := MediaTek DEVICE_MODEL := MTK7622 Lynx rfb1 AP DEVICE_DTS := mt7622-lynx-rfb1 DEVICE_DTS_DIR := $(DTS_DIR)/mediatek + SUPPORTED_DEVICES := mediatek,mt7622-rfb1 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \ kmod-ata-core kmod-ata-ahci-mtk endef -TARGET_DEVICES += MTK-LYNX-RFB1 +TARGET_DEVICES += mediatek_mt7622-lynx-rfb1 -define Device/BPI-R64 +define Device/lemaker_bananapi-bpi-r64 DEVICE_VENDOR := LeMaker DEVICE_MODEL := Banana Pi R64 DEVICE_DTS := mt7622-bananapi-bpi-r64 DEVICE_DTS_DIR := $(DTS_DIR)/mediatek + SUPPORTED_DEVICES := bananapi,bpi-r64 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \ kmod-ata-core kmod-ata-ahci-mtk endef -TARGET_DEVICES += BPI-R64 +TARGET_DEVICES += lemaker_bananapi-bpi-r64 diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 3f72979849..fd609d22fa 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -1,20 +1,18 @@ -define Device/7623a-unielec-u7623-02-emmc-512m +define Device/unielec_u7623-02-emmc-512m DEVICE_VENDOR := UniElec DEVICE_MODEL := U7623-02 DEVICE_VARIANT := eMMC/512MB RAM - DEVICE_DTS := mt7623a-unielec-u7623-02-emmc-512M + DEVICE_DTS := mt7623a-unielec-u7623-02-emmc-512m DEVICE_PACKAGES := mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 kmod-mmc - SUPPORTED_DEVICES := unielec,u7623-02-emmc-512m IMAGES := sysupgrade-emmc.bin.gz IMAGE/sysupgrade-emmc.bin.gz := sysupgrade-emmc | gzip | append-metadata endef +TARGET_DEVICES += unielec_u7623-02-emmc-512m -TARGET_DEVICES += 7623a-unielec-u7623-02-emmc-512m - -define Device/7623n-bananapi-bpi-r2 +define Device/lemaker_bananapi-bpi-r2 DEVICE_VENDOR := LeMaker DEVICE_MODEL := Banana Pi R2 DEVICE_DTS := mt7623n-bananapi-bpi-r2 + SUPPORTED_DEVICES := bananapi,bpi-r2 endef - -TARGET_DEVICES += 7623n-bananapi-bpi-r2 +TARGET_DEVICES += lemaker_bananapi-bpi-r2 diff --git a/target/linux/mediatek/image/mt7629.mk b/target/linux/mediatek/image/mt7629.mk index ba1daefa03..71fb3dda09 100644 --- a/target/linux/mediatek/image/mt7629.mk +++ b/target/linux/mediatek/image/mt7629.mk @@ -5,4 +5,3 @@ define Device/mediatek_mt7629-lynx-rfb DEVICE_PACKAGES := swconfig endef TARGET_DEVICES += mediatek_mt7629-lynx-rfb - diff --git a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch index 996b309e8f..46fc9abab9 100644 --- a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch +++ b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch @@ -5,10 +5,10 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS --- arch/arm/boot/dts/Makefile | 1 + - .../dts/mt7623a-unielec-u7623-02-emmc-512M.dts | 18 + + .../dts/mt7623a-unielec-u7623-02-emmc-512m.dts | 18 + .../boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi | 366 +++++++++++++++++++++ 3 files changed, 385 insertions(+) - create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts + create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi --- a/arch/arm/boot/dts/Makefile @@ -17,12 +17,12 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS mt6589-aquaris5.dtb \ mt6592-evb.dtb \ mt7623a-rfb-emmc.dtb \ -+ mt7623a-unielec-u7623-02-emmc-512M.dtb \ ++ mt7623a-unielec-u7623-02-emmc-512m.dtb \ mt7623n-rfb-nand.dtb \ mt7623n-bananapi-bpi-r2.dtb \ mt8127-moose.dtb \ --- /dev/null -+++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts ++++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts @@ -0,0 +1,18 @@ +/* + * Copyright 2018 Kristian Evensen diff --git a/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch index 6561e8d5a7..7b92141c5f 100644 --- a/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch +++ b/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch @@ -5,10 +5,10 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS --- arch/arm/boot/dts/Makefile | 1 + - .../dts/mt7623a-unielec-u7623-02-emmc-512M.dts | 18 + + .../dts/mt7623a-unielec-u7623-02-emmc-512m.dts | 18 + .../boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi | 366 +++++++++++++++++++++ 3 files changed, 385 insertions(+) - create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts + create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi --- a/arch/arm/boot/dts/Makefile @@ -17,12 +17,12 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS mt7623a-rfb-nand.dtb \ mt7623n-rfb-emmc.dtb \ mt7623n-bananapi-bpi-r2.dtb \ -+ mt7623a-unielec-u7623-02-emmc-512M.dtb \ ++ mt7623a-unielec-u7623-02-emmc-512m.dtb \ mt8127-moose.dtb \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb --- /dev/null -+++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts ++++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512m.dts @@ -0,0 +1,18 @@ +/* + * Copyright 2018 Kristian Evensen From 1e3bfbafd37ccb32d0ed6618f4886e1dec6643d2 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:18:49 +0100 Subject: [PATCH 463/480] octeon: apply vendor_model scheme to device definition/image name This updates the device definition name for octeon target to provide more useful names for the images and be consistent with the increasing number of targets following that scheme. Since the target is not using device tree yet, this does not touch board_name and thus sets BOARD_NAME in image Makefile to ensure sysupgrade is still working. While at it, move Build block before Device blocks and remove trailing whitespace for CMDLINE. Signed-off-by: Adrian Schmutzler --- target/linux/octeon/image/Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile index 42bd5df1da..e083e823c2 100644 --- a/target/linux/octeon/image/Makefile +++ b/target/linux/octeon/image/Makefile @@ -7,6 +7,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +define Build/strip-kernel + # Workaround pre-SDK-1.9.0 u-boot versions not handling the .notes section + $(TARGET_CROSS)strip -R .notes $@ -o $@.stripped && mv $@.stripped $@ +endef + define Device/Default PROFILES = Default $$(DEVICE_NAME) KERNEL_NAME := vmlinux.elf @@ -17,11 +22,6 @@ define Device/Default IMAGE/sysupgrade.tar := sysupgrade-tar endef -define Build/strip-kernel - # Workaround pre-SDK-1.9.0 u-boot versions not handling the .notes section - $(TARGET_CROSS)strip -R .notes $@ -o $@.stripped && mv $@.stripped $@ -endef - define Device/generic DEVICE_VENDOR := Generic DEVICE_MODEL := Octeon @@ -30,19 +30,21 @@ endef TARGET_DEVICES += generic ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait -define Device/er +define Device/ubnt_edgerouter DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := EdgeRouter - CMDLINE := $(ER_CMDLINE) + BOARD_NAME := er + CMDLINE := $(ER_CMDLINE) endef -TARGET_DEVICES += er +TARGET_DEVICES += ubnt_edgerouter ERLITE_CMDLINE:=-mtdparts=phys_mapped_flash:512k(boot0)ro,512k(boot1)ro,64k(eeprom)ro root=/dev/sda2 rootfstype=squashfs,ext4 rootwait -define Device/erlite +define Device/ubnt_edgerouter-lite DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := EdgeRouter Lite - CMDLINE := $(ERLITE_CMDLINE) + BOARD_NAME := erlite + CMDLINE := $(ERLITE_CMDLINE) endef -TARGET_DEVICES += erlite +TARGET_DEVICES += ubnt_edgerouter-lite $(eval $(call BuildImage)) From 03e9e4ba9ea8f00ff7c6f076f2cdc322e18cd3a4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 28 Jan 2020 14:12:08 +0100 Subject: [PATCH 464/480] hostapd: unconditionally enable ap/mesh for wpa-cli Without this change, wpa-cli features depend on which wpad build variant was used to build the wpa-cli package Signed-off-by: Felix Fietkau --- .../services/hostapd/patches/431-wpa_cli_ifdef.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch index 2c9fe28a1d..65c31c567f 100644 --- a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch +++ b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch @@ -1,11 +1,17 @@ --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c -@@ -26,6 +26,9 @@ +@@ -26,6 +26,15 @@ #include #endif /* ANDROID */ +#ifndef CONFIG_P2P +#define CONFIG_P2P ++#endif ++#ifndef CONFIG_AP ++#define CONFIG_AP ++#endif ++#ifndef CONFIG_MESH ++#define CONFIG_MESH +#endif static const char *const wpa_cli_version = From c2859bf126e02f2f09bc505882f33a39ca84ff7f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 28 Jan 2020 16:55:16 +0100 Subject: [PATCH 465/480] wireguard: bump to 0.0.20200128 This fixes a few small oversights for the 5.5 compat layer. Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 7f0827af7b..435c50ece6 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20200121 +PKG_VERSION:=0.0.20200128 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=7726c2994d11913c4543fd3dc83636f7ce573ca689b15e11b83e980acc04422b +PKG_HASH:=8610c6d8712cfd885f50b1a8c572518edf318c094d68491ea218bb50566a9a8a PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From e0ab33ea496f371a0683b18d5555d651f8df1f5e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 18 Jan 2020 18:41:08 +0100 Subject: [PATCH 466/480] mac80211: backport fix for an no-ack tx status issue Signed-off-by: Felix Fietkau --- ...80211-fix-tx-status-for-no-ack-cases.patch | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 package/kernel/mac80211/patches/subsys/305-mac80211-fix-tx-status-for-no-ack-cases.patch diff --git a/package/kernel/mac80211/patches/subsys/305-mac80211-fix-tx-status-for-no-ack-cases.patch b/package/kernel/mac80211/patches/subsys/305-mac80211-fix-tx-status-for-no-ack-cases.patch new file mode 100644 index 0000000000..3ea78fb4ab --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/305-mac80211-fix-tx-status-for-no-ack-cases.patch @@ -0,0 +1,82 @@ +From: Markus Theil +Date: Wed, 18 Dec 2019 15:27:36 +0100 +Subject: [PATCH] mac80211: fix tx status for no ack cases + +Before this patch, frames which where successfully transmitted without +requiring acks where accounted as lost frames. + +Signed-off-by: Markus Theil +Link: https://lore.kernel.org/r/20191218142736.15843-1-markus.theil@tu-ilmenau.de +Signed-off-by: Johannes Berg +--- + +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -881,6 +881,7 @@ static void __ieee80211_tx_status(struct + int rates_idx; + bool send_to_cooked; + bool acked; ++ bool noack_success; + struct ieee80211_bar *bar; + int shift = 0; + int tid = IEEE80211_NUM_TIDS; +@@ -898,6 +899,8 @@ static void __ieee80211_tx_status(struct + clear_sta_flag(sta, WLAN_STA_SP); + + acked = !!(info->flags & IEEE80211_TX_STAT_ACK); ++ noack_success = !!(info->flags & ++ IEEE80211_TX_STAT_NOACK_TRANSMITTED); + + /* mesh Peer Service Period support */ + if (ieee80211_vif_is_mesh(&sta->sdata->vif) && +@@ -962,12 +965,12 @@ static void __ieee80211_tx_status(struct + ieee80211_handle_filtered_frame(local, sta, skb); + return; + } else { +- if (!acked) ++ if (!acked && !noack_success) + sta->status_stats.retry_failed++; + sta->status_stats.retry_count += retry_count; + + if (ieee80211_is_data_present(fc)) { +- if (!acked) ++ if (!acked && !noack_success) + sta->status_stats.msdu_failed[tid]++; + + sta->status_stats.msdu_retries[tid] += +@@ -994,7 +997,7 @@ static void __ieee80211_tx_status(struct + info->status.tx_time, 0); + + if (ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) { +- if (info->flags & IEEE80211_TX_STAT_ACK) { ++ if (acked) { + if (sta->status_stats.lost_packets) + sta->status_stats.lost_packets = 0; + +@@ -1002,6 +1005,8 @@ static void __ieee80211_tx_status(struct + if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH)) + sta->status_stats.last_tdls_pkt_time = + jiffies; ++ } else if (noack_success) { ++ /* nothing to do here, do not account as lost */ + } else { + ieee80211_lost_packet(sta, info); + } +@@ -1127,7 +1132,7 @@ void ieee80211_tx_status_ext(struct ieee + + sta = container_of(pubsta, struct sta_info, sta); + +- if (!acked) ++ if (!acked && !noack_success) + sta->status_stats.retry_failed++; + sta->status_stats.retry_count += retry_count; + +@@ -1142,6 +1147,8 @@ void ieee80211_tx_status_ext(struct ieee + sta->status_stats.last_tdls_pkt_time = jiffies; + } else if (test_sta_flag(sta, WLAN_STA_PS_STA)) { + return; ++ } else if (noack_success) { ++ /* nothing to do here, do not account as lost */ + } else { + ieee80211_lost_packet(sta, info); + } From ea5078014d3f8a6f662e41cf9dec23028ca303e3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 18 Jan 2020 18:44:00 +0100 Subject: [PATCH 467/480] mac80211: backport airtime queue limits support Signed-off-by: Felix Fietkau --- ...ore-skb-ack-code-to-its-own-function.patch | 78 ++ ...the-size-of-ack_frame_id-to-make-roo.patch | 67 ++ ...new-sta_info-getter-by-sta-vif-addrs.patch | 78 ++ ...t-airtime-calculation-code-from-mt76.patch | 690 ++++++++++++++++++ ...lement-Airtime-based-Queue-Limit-AQL.patch | 446 +++++++++++ ...time-based-Queue-Limits-AQL-on-packe.patch | 146 ++++ ...-Fix-an-off-by-one-in-ieee80211_calc.patch | 31 + ...Turn-AQL-into-an-NL80211_EXT_FEATURE.patch | 253 +++++++ ...80211-use-more-bits-for-ack_frame_id.patch | 70 ++ .../500-mac80211_configure_antenna_gain.patch | 10 +- 10 files changed, 1864 insertions(+), 5 deletions(-) create mode 100644 package/kernel/mac80211/patches/subsys/306-mac80211-move-store-skb-ack-code-to-its-own-function.patch create mode 100644 package/kernel/mac80211/patches/subsys/307-mac80211-Shrink-the-size-of-ack_frame_id-to-make-roo.patch create mode 100644 package/kernel/mac80211/patches/subsys/308-mac80211-Add-new-sta_info-getter-by-sta-vif-addrs.patch create mode 100644 package/kernel/mac80211/patches/subsys/309-mac80211-Import-airtime-calculation-code-from-mt76.patch create mode 100644 package/kernel/mac80211/patches/subsys/310-mac80211-Implement-Airtime-based-Queue-Limit-AQL.patch create mode 100644 package/kernel/mac80211/patches/subsys/311-mac80211-Use-Airtime-based-Queue-Limits-AQL-on-packe.patch create mode 100644 package/kernel/mac80211/patches/subsys/312-mac80211-airtime-Fix-an-off-by-one-in-ieee80211_calc.patch create mode 100644 package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch create mode 100644 package/kernel/mac80211/patches/subsys/353-mac80211-use-more-bits-for-ack_frame_id.patch diff --git a/package/kernel/mac80211/patches/subsys/306-mac80211-move-store-skb-ack-code-to-its-own-function.patch b/package/kernel/mac80211/patches/subsys/306-mac80211-move-store-skb-ack-code-to-its-own-function.patch new file mode 100644 index 0000000000..3289aae151 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/306-mac80211-move-store-skb-ack-code-to-its-own-function.patch @@ -0,0 +1,78 @@ +From: John Crispin +Date: Tue, 29 Oct 2019 10:13:02 +0100 +Subject: [PATCH] mac80211: move store skb ack code to its own function + +This patch moves the code handling SKBTX_WIFI_STATUS inside the TX path +into an extra function. This allows us to reuse it inside the 802.11 encap +offloading datapath. + +Signed-off-by: John Crispin +Link: https://lore.kernel.org/r/20191029091304.7330-2-john@phrozen.org +Signed-off-by: Johannes Berg +--- + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -2430,6 +2430,33 @@ static int ieee80211_lookup_ra_sta(struc + return 0; + } + ++static int ieee80211_store_ack_skb(struct ieee80211_local *local, ++ struct sk_buff *skb, ++ u32 *info_flags) ++{ ++ struct sk_buff *ack_skb = skb_clone_sk(skb); ++ u16 info_id = 0; ++ ++ if (ack_skb) { ++ unsigned long flags; ++ int id; ++ ++ spin_lock_irqsave(&local->ack_status_lock, flags); ++ id = idr_alloc(&local->ack_status_frames, ack_skb, ++ 1, 0x10000, GFP_ATOMIC); ++ spin_unlock_irqrestore(&local->ack_status_lock, flags); ++ ++ if (id >= 0) { ++ info_id = id; ++ *info_flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; ++ } else { ++ kfree_skb(ack_skb); ++ } ++ } ++ ++ return info_id; ++} ++ + /** + * ieee80211_build_hdr - build 802.11 header in the given frame + * @sdata: virtual interface to build the header for +@@ -2723,26 +2750,8 @@ static struct sk_buff *ieee80211_build_h + } + + if (unlikely(!multicast && skb->sk && +- skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { +- struct sk_buff *ack_skb = skb_clone_sk(skb); +- +- if (ack_skb) { +- unsigned long flags; +- int id; +- +- spin_lock_irqsave(&local->ack_status_lock, flags); +- id = idr_alloc(&local->ack_status_frames, ack_skb, +- 1, 0x10000, GFP_ATOMIC); +- spin_unlock_irqrestore(&local->ack_status_lock, flags); +- +- if (id >= 0) { +- info_id = id; +- info_flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; +- } else { +- kfree_skb(ack_skb); +- } +- } +- } ++ skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) ++ info_id = ieee80211_store_ack_skb(local, skb, &info_flags); + + /* + * If the skb is shared we need to obtain our own copy. diff --git a/package/kernel/mac80211/patches/subsys/307-mac80211-Shrink-the-size-of-ack_frame_id-to-make-roo.patch b/package/kernel/mac80211/patches/subsys/307-mac80211-Shrink-the-size-of-ack_frame_id-to-make-roo.patch new file mode 100644 index 0000000000..8b3e666731 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/307-mac80211-Shrink-the-size-of-ack_frame_id-to-make-roo.patch @@ -0,0 +1,67 @@ +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Wed, 23 Oct 2019 11:59:00 +0200 +Subject: [PATCH] mac80211: Shrink the size of ack_frame_id to make room for + tx_time_est +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To implement airtime queue limiting, we need to keep a running account of +the estimated airtime of all skbs queued into the device. Do to this +correctly, we need to store the airtime estimate into the skb so we can +decrease the outstanding balance when the skb is freed. This means that the +time estimate must be stored somewhere that will survive for the lifetime +of the skb. + +To get this, decrease the size of the ack_frame_id field to 6 bits, and +lower the size of the ID space accordingly. This leaves 10 bits for use for +tx_time_est, which is enough to store a maximum of 4096 us, if we shift the +values so they become units of 4us. + +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/157182474063.150713.16132669599100802716.stgit@toke.dk +Signed-off-by: Johannes Berg +--- + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -967,6 +967,7 @@ ieee80211_rate_get_vht_nss(const struct + * @band: the band to transmit on (use for checking for races) + * @hw_queue: HW queue to put the frame on, skb_get_queue_mapping() gives the AC + * @ack_frame_id: internal frame ID for TX status, used internally ++ * @tx_time_est: TX time estimate in units of 4us, used internally + * @control: union part for control data + * @control.rates: TX rates array to try + * @control.rts_cts_rate_idx: rate for RTS or CTS +@@ -1007,7 +1008,8 @@ struct ieee80211_tx_info { + + u8 hw_queue; + +- u16 ack_frame_id; ++ u16 ack_frame_id:6; ++ u16 tx_time_est:10; + + union { + struct { +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -3427,7 +3427,7 @@ int ieee80211_attach_ack_skb(struct ieee + + spin_lock_irqsave(&local->ack_status_lock, spin_flags); + id = idr_alloc(&local->ack_status_frames, ack_skb, +- 1, 0x10000, GFP_ATOMIC); ++ 1, 0x40, GFP_ATOMIC); + spin_unlock_irqrestore(&local->ack_status_lock, spin_flags); + + if (id < 0) { +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -2443,7 +2443,7 @@ static int ieee80211_store_ack_skb(struc + + spin_lock_irqsave(&local->ack_status_lock, flags); + id = idr_alloc(&local->ack_status_frames, ack_skb, +- 1, 0x10000, GFP_ATOMIC); ++ 1, 0x40, GFP_ATOMIC); + spin_unlock_irqrestore(&local->ack_status_lock, flags); + + if (id >= 0) { diff --git a/package/kernel/mac80211/patches/subsys/308-mac80211-Add-new-sta_info-getter-by-sta-vif-addrs.patch b/package/kernel/mac80211/patches/subsys/308-mac80211-Add-new-sta_info-getter-by-sta-vif-addrs.patch new file mode 100644 index 0000000000..2c4b978230 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/308-mac80211-Add-new-sta_info-getter-by-sta-vif-addrs.patch @@ -0,0 +1,78 @@ +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Tue, 12 Nov 2019 14:08:35 +0100 +Subject: [PATCH] mac80211: Add new sta_info getter by sta/vif addrs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In ieee80211_tx_status() we don't have an sdata struct when looking up the +destination sta. Instead, we just do a lookup by the vif addr that is the +source of the packet being completed. Factor this out into a new sta_info +getter helper, since we need to use it for accounting AQL as well. + +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20191112130835.382062-1-toke@redhat.com +[remove internal rcu_read_lock(), document instead] +Signed-off-by: Johannes Berg +--- + +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -210,6 +210,20 @@ struct sta_info *sta_info_get_bss(struct + return NULL; + } + ++struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local, ++ const u8 *sta_addr, const u8 *vif_addr) ++{ ++ struct rhlist_head *tmp; ++ struct sta_info *sta; ++ ++ for_each_sta_info(local, sta_addr, sta, tmp) { ++ if (ether_addr_equal(vif_addr, sta->sdata->vif.addr)) ++ return sta; ++ } ++ ++ return NULL; ++} ++ + struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata, + int idx) + { +--- a/net/mac80211/sta_info.h ++++ b/net/mac80211/sta_info.h +@@ -725,6 +725,10 @@ struct sta_info *sta_info_get(struct iee + struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata, + const u8 *addr); + ++/* user must hold sta_mtx or be in RCU critical section */ ++struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local, ++ const u8 *sta_addr, const u8 *vif_addr); ++ + #define for_each_sta_info(local, _addr, _sta, _tmp) \ + rhl_for_each_entry_rcu(_sta, _tmp, \ + sta_info_hash_lookup(local, _addr), hash_node) +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -1085,19 +1085,13 @@ void ieee80211_tx_status(struct ieee8021 + .skb = skb, + .info = IEEE80211_SKB_CB(skb), + }; +- struct rhlist_head *tmp; + struct sta_info *sta; + + rcu_read_lock(); + +- for_each_sta_info(local, hdr->addr1, sta, tmp) { +- /* skip wrong virtual interface */ +- if (!ether_addr_equal(hdr->addr2, sta->sdata->vif.addr)) +- continue; +- ++ sta = sta_info_get_by_addrs(local, hdr->addr1, hdr->addr2); ++ if (sta) + status.sta = &sta->sta; +- break; +- } + + __ieee80211_tx_status(hw, &status); + rcu_read_unlock(); diff --git a/package/kernel/mac80211/patches/subsys/309-mac80211-Import-airtime-calculation-code-from-mt76.patch b/package/kernel/mac80211/patches/subsys/309-mac80211-Import-airtime-calculation-code-from-mt76.patch new file mode 100644 index 0000000000..7bfe299cf4 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/309-mac80211-Import-airtime-calculation-code-from-mt76.patch @@ -0,0 +1,690 @@ +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Mon, 18 Nov 2019 22:06:08 -0800 +Subject: [PATCH] mac80211: Import airtime calculation code from mt76 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Felix recently added code to calculate airtime of packets to the mt76 +driver. Import this into mac80211 so we can use it for airtime queue limit +calculations. + +The airtime.c file is copied verbatim from the mt76 driver, and adjusted to +be usable in mac80211. This involves: + +- Switching to mac80211 data structures. +- Adding support for 160 MHz channels and HE mode. +- Moving the symbol and duration calculations around a bit to avoid + rounding with the higher rates and longer symbol times used for HE rates. + +The per-rate TX rate calculation is also split out to its own function so +it can be used directly for the AQL calculations later. + +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20191119060610.76681-3-kyan@google.com +[fix HE_GROUP_IDX() to use 3 * bw, since there are 3 _gi values] +Signed-off-by: Johannes Berg +--- + create mode 100644 net/mac80211/airtime.c + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -6417,4 +6417,33 @@ void ieee80211_nan_func_match(struct iee + struct cfg80211_nan_match_params *match, + gfp_t gfp); + ++/** ++ * ieee80211_calc_rx_airtime - calculate estimated transmission airtime for RX. ++ * ++ * This function calculates the estimated airtime usage of a frame based on the ++ * rate information in the RX status struct and the frame length. ++ * ++ * @hw: pointer as obtained from ieee80211_alloc_hw() ++ * @status: &struct ieee80211_rx_status containing the transmission rate ++ * information. ++ * @len: frame length in bytes ++ */ ++u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw, ++ struct ieee80211_rx_status *status, ++ int len); ++ ++/** ++ * ieee80211_calc_tx_airtime - calculate estimated transmission airtime for TX. ++ * ++ * This function calculates the estimated airtime usage of a frame based on the ++ * rate information in the TX info struct and the frame length. ++ * ++ * @hw: pointer as obtained from ieee80211_alloc_hw() ++ * @info: &struct ieee80211_tx_info of the frame. ++ * @len: frame length in bytes ++ */ ++u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw, ++ struct ieee80211_tx_info *info, ++ int len); ++ + #endif /* MAC80211_H */ +--- a/net/mac80211/Makefile ++++ b/net/mac80211/Makefile +@@ -31,7 +31,8 @@ mac80211-y := \ + chan.o \ + trace.o mlme.o \ + tdls.o \ +- ocb.o ++ ocb.o \ ++ airtime.o + + mac80211-$(CPTCFG_MAC80211_LEDS) += led.o + mac80211-$(CPTCFG_MAC80211_DEBUGFS) += \ +--- /dev/null ++++ b/net/mac80211/airtime.c +@@ -0,0 +1,597 @@ ++// SPDX-License-Identifier: ISC ++/* ++ * Copyright (C) 2019 Felix Fietkau ++ */ ++ ++#include ++#include "ieee80211_i.h" ++#include "sta_info.h" ++ ++#define AVG_PKT_SIZE 1024 ++ ++/* Number of bits for an average sized packet */ ++#define MCS_NBITS (AVG_PKT_SIZE << 3) ++ ++/* Number of kilo-symbols (symbols * 1024) for a packet with (bps) bits per ++ * symbol. We use k-symbols to avoid rounding in the _TIME macros below. ++ */ ++#define MCS_N_KSYMS(bps) DIV_ROUND_UP(MCS_NBITS << 10, (bps)) ++ ++/* Transmission time (in 1024 * usec) for a packet containing (ksyms) * 1024 ++ * symbols. ++ */ ++#define MCS_SYMBOL_TIME(sgi, ksyms) \ ++ (sgi ? \ ++ ((ksyms) * 4 * 18) / 20 : /* 3.6 us per sym */ \ ++ ((ksyms) * 4) /* 4.0 us per sym */ \ ++ ) ++ ++/* Transmit duration for the raw data part of an average sized packet */ ++#define MCS_DURATION(streams, sgi, bps) \ ++ ((u32)MCS_SYMBOL_TIME(sgi, MCS_N_KSYMS((streams) * (bps)))) ++ ++#define MCS_DURATION_S(shift, streams, sgi, bps) \ ++ ((u16)((MCS_DURATION(streams, sgi, bps) >> shift))) ++ ++/* These should match the values in enum nl80211_he_gi */ ++#define HE_GI_08 0 ++#define HE_GI_16 1 ++#define HE_GI_32 2 ++ ++/* Transmission time (1024 usec) for a packet containing (ksyms) * k-symbols */ ++#define HE_SYMBOL_TIME(gi, ksyms) \ ++ (gi == HE_GI_08 ? \ ++ ((ksyms) * 16 * 17) / 20 : /* 13.6 us per sym */ \ ++ (gi == HE_GI_16 ? \ ++ ((ksyms) * 16 * 18) / 20 : /* 14.4 us per sym */ \ ++ ((ksyms) * 16) /* 16.0 us per sym */ \ ++ )) ++ ++/* Transmit duration for the raw data part of an average sized packet */ ++#define HE_DURATION(streams, gi, bps) \ ++ ((u32)HE_SYMBOL_TIME(gi, MCS_N_KSYMS((streams) * (bps)))) ++ ++#define HE_DURATION_S(shift, streams, gi, bps) \ ++ (HE_DURATION(streams, gi, bps) >> shift) ++ ++#define BW_20 0 ++#define BW_40 1 ++#define BW_80 2 ++#define BW_160 3 ++ ++/* ++ * Define group sort order: HT40 -> SGI -> #streams ++ */ ++#define IEEE80211_MAX_STREAMS 4 ++#define IEEE80211_HT_STREAM_GROUPS 4 /* BW(=2) * SGI(=2) */ ++#define IEEE80211_VHT_STREAM_GROUPS 8 /* BW(=4) * SGI(=2) */ ++ ++#define IEEE80211_HE_MAX_STREAMS 8 ++#define IEEE80211_HE_STREAM_GROUPS 12 /* BW(=4) * GI(=3) */ ++ ++#define IEEE80211_HT_GROUPS_NB (IEEE80211_MAX_STREAMS * \ ++ IEEE80211_HT_STREAM_GROUPS) ++#define IEEE80211_VHT_GROUPS_NB (IEEE80211_MAX_STREAMS * \ ++ IEEE80211_VHT_STREAM_GROUPS) ++#define IEEE80211_HE_GROUPS_NB (IEEE80211_HE_MAX_STREAMS * \ ++ IEEE80211_HE_STREAM_GROUPS) ++#define IEEE80211_GROUPS_NB (IEEE80211_HT_GROUPS_NB + \ ++ IEEE80211_VHT_GROUPS_NB + \ ++ IEEE80211_HE_GROUPS_NB) ++ ++#define IEEE80211_HT_GROUP_0 0 ++#define IEEE80211_VHT_GROUP_0 (IEEE80211_HT_GROUP_0 + IEEE80211_HT_GROUPS_NB) ++#define IEEE80211_HE_GROUP_0 (IEEE80211_VHT_GROUP_0 + IEEE80211_VHT_GROUPS_NB) ++ ++#define MCS_GROUP_RATES 12 ++ ++#define HT_GROUP_IDX(_streams, _sgi, _ht40) \ ++ IEEE80211_HT_GROUP_0 + \ ++ IEEE80211_MAX_STREAMS * 2 * _ht40 + \ ++ IEEE80211_MAX_STREAMS * _sgi + \ ++ _streams - 1 ++ ++#define _MAX(a, b) (((a)>(b))?(a):(b)) ++ ++#define GROUP_SHIFT(duration) \ ++ _MAX(0, 16 - __builtin_clz(duration)) ++ ++/* MCS rate information for an MCS group */ ++#define __MCS_GROUP(_streams, _sgi, _ht40, _s) \ ++ [HT_GROUP_IDX(_streams, _sgi, _ht40)] = { \ ++ .shift = _s, \ ++ .duration = { \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 54 : 26), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 108 : 52), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 162 : 78), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 216 : 104), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 324 : 156), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 432 : 208), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 486 : 234), \ ++ MCS_DURATION_S(_s, _streams, _sgi, _ht40 ? 540 : 260) \ ++ } \ ++} ++ ++#define MCS_GROUP_SHIFT(_streams, _sgi, _ht40) \ ++ GROUP_SHIFT(MCS_DURATION(_streams, _sgi, _ht40 ? 54 : 26)) ++ ++#define MCS_GROUP(_streams, _sgi, _ht40) \ ++ __MCS_GROUP(_streams, _sgi, _ht40, \ ++ MCS_GROUP_SHIFT(_streams, _sgi, _ht40)) ++ ++#define VHT_GROUP_IDX(_streams, _sgi, _bw) \ ++ (IEEE80211_VHT_GROUP_0 + \ ++ IEEE80211_MAX_STREAMS * 2 * (_bw) + \ ++ IEEE80211_MAX_STREAMS * (_sgi) + \ ++ (_streams) - 1) ++ ++#define BW2VBPS(_bw, r4, r3, r2, r1) \ ++ (_bw == BW_160 ? r4 : _bw == BW_80 ? r3 : _bw == BW_40 ? r2 : r1) ++ ++#define __VHT_GROUP(_streams, _sgi, _bw, _s) \ ++ [VHT_GROUP_IDX(_streams, _sgi, _bw)] = { \ ++ .shift = _s, \ ++ .duration = { \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 234, 117, 54, 26)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 468, 234, 108, 52)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 702, 351, 162, 78)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 936, 468, 216, 104)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 1404, 702, 324, 156)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 1872, 936, 432, 208)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 2106, 1053, 486, 234)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 2340, 1170, 540, 260)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 2808, 1404, 648, 312)), \ ++ MCS_DURATION_S(_s, _streams, _sgi, \ ++ BW2VBPS(_bw, 3120, 1560, 720, 346)) \ ++ } \ ++} ++ ++#define VHT_GROUP_SHIFT(_streams, _sgi, _bw) \ ++ GROUP_SHIFT(MCS_DURATION(_streams, _sgi, \ ++ BW2VBPS(_bw, 243, 117, 54, 26))) ++ ++#define VHT_GROUP(_streams, _sgi, _bw) \ ++ __VHT_GROUP(_streams, _sgi, _bw, \ ++ VHT_GROUP_SHIFT(_streams, _sgi, _bw)) ++ ++ ++#define HE_GROUP_IDX(_streams, _gi, _bw) \ ++ (IEEE80211_HE_GROUP_0 + \ ++ IEEE80211_HE_MAX_STREAMS * 3 * (_bw) + \ ++ IEEE80211_HE_MAX_STREAMS * (_gi) + \ ++ (_streams) - 1) ++ ++#define __HE_GROUP(_streams, _gi, _bw, _s) \ ++ [HE_GROUP_IDX(_streams, _gi, _bw)] = { \ ++ .shift = _s, \ ++ .duration = { \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 979, 489, 230, 115)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 1958, 979, 475, 230)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 2937, 1468, 705, 345)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 3916, 1958, 936, 475)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 5875, 2937, 1411, 705)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 7833, 3916, 1872, 936)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 8827, 4406, 2102, 1051)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 9806, 4896, 2347, 1166)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 11764, 5875, 2808, 1411)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 13060, 6523, 3124, 1555)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 14702, 7344, 3513, 1756)), \ ++ HE_DURATION_S(_s, _streams, _gi, \ ++ BW2VBPS(_bw, 16329, 8164, 3902, 1944)) \ ++ } \ ++} ++ ++#define HE_GROUP_SHIFT(_streams, _gi, _bw) \ ++ GROUP_SHIFT(HE_DURATION(_streams, _gi, \ ++ BW2VBPS(_bw, 979, 489, 230, 115))) ++ ++#define HE_GROUP(_streams, _gi, _bw) \ ++ __HE_GROUP(_streams, _gi, _bw, \ ++ HE_GROUP_SHIFT(_streams, _gi, _bw)) ++struct mcs_group { ++ u8 shift; ++ u16 duration[MCS_GROUP_RATES]; ++}; ++ ++static const struct mcs_group airtime_mcs_groups[] = { ++ MCS_GROUP(1, 0, BW_20), ++ MCS_GROUP(2, 0, BW_20), ++ MCS_GROUP(3, 0, BW_20), ++ MCS_GROUP(4, 0, BW_20), ++ ++ MCS_GROUP(1, 1, BW_20), ++ MCS_GROUP(2, 1, BW_20), ++ MCS_GROUP(3, 1, BW_20), ++ MCS_GROUP(4, 1, BW_20), ++ ++ MCS_GROUP(1, 0, BW_40), ++ MCS_GROUP(2, 0, BW_40), ++ MCS_GROUP(3, 0, BW_40), ++ MCS_GROUP(4, 0, BW_40), ++ ++ MCS_GROUP(1, 1, BW_40), ++ MCS_GROUP(2, 1, BW_40), ++ MCS_GROUP(3, 1, BW_40), ++ MCS_GROUP(4, 1, BW_40), ++ ++ VHT_GROUP(1, 0, BW_20), ++ VHT_GROUP(2, 0, BW_20), ++ VHT_GROUP(3, 0, BW_20), ++ VHT_GROUP(4, 0, BW_20), ++ ++ VHT_GROUP(1, 1, BW_20), ++ VHT_GROUP(2, 1, BW_20), ++ VHT_GROUP(3, 1, BW_20), ++ VHT_GROUP(4, 1, BW_20), ++ ++ VHT_GROUP(1, 0, BW_40), ++ VHT_GROUP(2, 0, BW_40), ++ VHT_GROUP(3, 0, BW_40), ++ VHT_GROUP(4, 0, BW_40), ++ ++ VHT_GROUP(1, 1, BW_40), ++ VHT_GROUP(2, 1, BW_40), ++ VHT_GROUP(3, 1, BW_40), ++ VHT_GROUP(4, 1, BW_40), ++ ++ VHT_GROUP(1, 0, BW_80), ++ VHT_GROUP(2, 0, BW_80), ++ VHT_GROUP(3, 0, BW_80), ++ VHT_GROUP(4, 0, BW_80), ++ ++ VHT_GROUP(1, 1, BW_80), ++ VHT_GROUP(2, 1, BW_80), ++ VHT_GROUP(3, 1, BW_80), ++ VHT_GROUP(4, 1, BW_80), ++ ++ VHT_GROUP(1, 0, BW_160), ++ VHT_GROUP(2, 0, BW_160), ++ VHT_GROUP(3, 0, BW_160), ++ VHT_GROUP(4, 0, BW_160), ++ ++ VHT_GROUP(1, 1, BW_160), ++ VHT_GROUP(2, 1, BW_160), ++ VHT_GROUP(3, 1, BW_160), ++ VHT_GROUP(4, 1, BW_160), ++ ++ HE_GROUP(1, HE_GI_08, BW_20), ++ HE_GROUP(2, HE_GI_08, BW_20), ++ HE_GROUP(3, HE_GI_08, BW_20), ++ HE_GROUP(4, HE_GI_08, BW_20), ++ HE_GROUP(5, HE_GI_08, BW_20), ++ HE_GROUP(6, HE_GI_08, BW_20), ++ HE_GROUP(7, HE_GI_08, BW_20), ++ HE_GROUP(8, HE_GI_08, BW_20), ++ ++ HE_GROUP(1, HE_GI_16, BW_20), ++ HE_GROUP(2, HE_GI_16, BW_20), ++ HE_GROUP(3, HE_GI_16, BW_20), ++ HE_GROUP(4, HE_GI_16, BW_20), ++ HE_GROUP(5, HE_GI_16, BW_20), ++ HE_GROUP(6, HE_GI_16, BW_20), ++ HE_GROUP(7, HE_GI_16, BW_20), ++ HE_GROUP(8, HE_GI_16, BW_20), ++ ++ HE_GROUP(1, HE_GI_32, BW_20), ++ HE_GROUP(2, HE_GI_32, BW_20), ++ HE_GROUP(3, HE_GI_32, BW_20), ++ HE_GROUP(4, HE_GI_32, BW_20), ++ HE_GROUP(5, HE_GI_32, BW_20), ++ HE_GROUP(6, HE_GI_32, BW_20), ++ HE_GROUP(7, HE_GI_32, BW_20), ++ HE_GROUP(8, HE_GI_32, BW_20), ++ ++ HE_GROUP(1, HE_GI_08, BW_40), ++ HE_GROUP(2, HE_GI_08, BW_40), ++ HE_GROUP(3, HE_GI_08, BW_40), ++ HE_GROUP(4, HE_GI_08, BW_40), ++ HE_GROUP(5, HE_GI_08, BW_40), ++ HE_GROUP(6, HE_GI_08, BW_40), ++ HE_GROUP(7, HE_GI_08, BW_40), ++ HE_GROUP(8, HE_GI_08, BW_40), ++ ++ HE_GROUP(1, HE_GI_16, BW_40), ++ HE_GROUP(2, HE_GI_16, BW_40), ++ HE_GROUP(3, HE_GI_16, BW_40), ++ HE_GROUP(4, HE_GI_16, BW_40), ++ HE_GROUP(5, HE_GI_16, BW_40), ++ HE_GROUP(6, HE_GI_16, BW_40), ++ HE_GROUP(7, HE_GI_16, BW_40), ++ HE_GROUP(8, HE_GI_16, BW_40), ++ ++ HE_GROUP(1, HE_GI_32, BW_40), ++ HE_GROUP(2, HE_GI_32, BW_40), ++ HE_GROUP(3, HE_GI_32, BW_40), ++ HE_GROUP(4, HE_GI_32, BW_40), ++ HE_GROUP(5, HE_GI_32, BW_40), ++ HE_GROUP(6, HE_GI_32, BW_40), ++ HE_GROUP(7, HE_GI_32, BW_40), ++ HE_GROUP(8, HE_GI_32, BW_40), ++ ++ HE_GROUP(1, HE_GI_08, BW_80), ++ HE_GROUP(2, HE_GI_08, BW_80), ++ HE_GROUP(3, HE_GI_08, BW_80), ++ HE_GROUP(4, HE_GI_08, BW_80), ++ HE_GROUP(5, HE_GI_08, BW_80), ++ HE_GROUP(6, HE_GI_08, BW_80), ++ HE_GROUP(7, HE_GI_08, BW_80), ++ HE_GROUP(8, HE_GI_08, BW_80), ++ ++ HE_GROUP(1, HE_GI_16, BW_80), ++ HE_GROUP(2, HE_GI_16, BW_80), ++ HE_GROUP(3, HE_GI_16, BW_80), ++ HE_GROUP(4, HE_GI_16, BW_80), ++ HE_GROUP(5, HE_GI_16, BW_80), ++ HE_GROUP(6, HE_GI_16, BW_80), ++ HE_GROUP(7, HE_GI_16, BW_80), ++ HE_GROUP(8, HE_GI_16, BW_80), ++ ++ HE_GROUP(1, HE_GI_32, BW_80), ++ HE_GROUP(2, HE_GI_32, BW_80), ++ HE_GROUP(3, HE_GI_32, BW_80), ++ HE_GROUP(4, HE_GI_32, BW_80), ++ HE_GROUP(5, HE_GI_32, BW_80), ++ HE_GROUP(6, HE_GI_32, BW_80), ++ HE_GROUP(7, HE_GI_32, BW_80), ++ HE_GROUP(8, HE_GI_32, BW_80), ++ ++ HE_GROUP(1, HE_GI_08, BW_160), ++ HE_GROUP(2, HE_GI_08, BW_160), ++ HE_GROUP(3, HE_GI_08, BW_160), ++ HE_GROUP(4, HE_GI_08, BW_160), ++ HE_GROUP(5, HE_GI_08, BW_160), ++ HE_GROUP(6, HE_GI_08, BW_160), ++ HE_GROUP(7, HE_GI_08, BW_160), ++ HE_GROUP(8, HE_GI_08, BW_160), ++ ++ HE_GROUP(1, HE_GI_16, BW_160), ++ HE_GROUP(2, HE_GI_16, BW_160), ++ HE_GROUP(3, HE_GI_16, BW_160), ++ HE_GROUP(4, HE_GI_16, BW_160), ++ HE_GROUP(5, HE_GI_16, BW_160), ++ HE_GROUP(6, HE_GI_16, BW_160), ++ HE_GROUP(7, HE_GI_16, BW_160), ++ HE_GROUP(8, HE_GI_16, BW_160), ++ ++ HE_GROUP(1, HE_GI_32, BW_160), ++ HE_GROUP(2, HE_GI_32, BW_160), ++ HE_GROUP(3, HE_GI_32, BW_160), ++ HE_GROUP(4, HE_GI_32, BW_160), ++ HE_GROUP(5, HE_GI_32, BW_160), ++ HE_GROUP(6, HE_GI_32, BW_160), ++ HE_GROUP(7, HE_GI_32, BW_160), ++ HE_GROUP(8, HE_GI_32, BW_160), ++}; ++ ++static u32 ++ieee80211_calc_legacy_rate_duration(u16 bitrate, bool short_pre, ++ bool cck, int len) ++{ ++ u32 duration; ++ ++ if (cck) { ++ duration = 144 + 48; /* preamble + PLCP */ ++ if (short_pre) ++ duration >>= 1; ++ ++ duration += 10; /* SIFS */ ++ } else { ++ duration = 20 + 16; /* premable + SIFS */ ++ } ++ ++ len <<= 3; ++ duration += (len * 10) / bitrate; ++ ++ return duration; ++} ++ ++u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw, ++ struct ieee80211_rx_status *status, ++ int len) ++{ ++ struct ieee80211_supported_band *sband; ++ const struct ieee80211_rate *rate; ++ bool sgi = status->enc_flags & RX_ENC_FLAG_SHORT_GI; ++ bool sp = status->enc_flags & RX_ENC_FLAG_SHORTPRE; ++ int bw, streams; ++ int group, idx; ++ u32 duration; ++ bool cck; ++ ++ switch (status->bw) { ++ case RATE_INFO_BW_20: ++ bw = BW_20; ++ break; ++ case RATE_INFO_BW_40: ++ bw = BW_40; ++ break; ++ case RATE_INFO_BW_80: ++ bw = BW_80; ++ break; ++ case RATE_INFO_BW_160: ++ bw = BW_160; ++ break; ++ default: ++ WARN_ON_ONCE(1); ++ return 0; ++ } ++ ++ switch (status->encoding) { ++ case RX_ENC_LEGACY: ++ if (WARN_ON_ONCE(status->band > NL80211_BAND_5GHZ)) ++ return 0; ++ ++ sband = hw->wiphy->bands[status->band]; ++ if (!sband || status->rate_idx > sband->n_bitrates) ++ return 0; ++ ++ rate = &sband->bitrates[status->rate_idx]; ++ cck = rate->flags & IEEE80211_RATE_MANDATORY_B; ++ ++ return ieee80211_calc_legacy_rate_duration(rate->bitrate, sp, ++ cck, len); ++ ++ case RX_ENC_VHT: ++ streams = status->nss; ++ idx = status->rate_idx; ++ group = VHT_GROUP_IDX(streams, sgi, bw); ++ break; ++ case RX_ENC_HT: ++ streams = ((status->rate_idx >> 3) & 3) + 1; ++ idx = status->rate_idx & 7; ++ group = HT_GROUP_IDX(streams, sgi, bw); ++ break; ++ case RX_ENC_HE: ++ streams = status->nss; ++ idx = status->rate_idx; ++ group = HE_GROUP_IDX(streams, status->he_gi, bw); ++ break; ++ default: ++ WARN_ON_ONCE(1); ++ return 0; ++ } ++ ++ if (WARN_ON_ONCE((status->encoding != RX_ENC_HE && streams > 4) || ++ (status->encoding == RX_ENC_HE && streams > 8))) ++ return 0; ++ ++ duration = airtime_mcs_groups[group].duration[idx]; ++ duration <<= airtime_mcs_groups[group].shift; ++ duration *= len; ++ duration /= AVG_PKT_SIZE; ++ duration /= 1024; ++ ++ duration += 36 + (streams << 2); ++ ++ return duration; ++} ++EXPORT_SYMBOL_GPL(ieee80211_calc_rx_airtime); ++ ++static u32 ieee80211_calc_tx_airtime_rate(struct ieee80211_hw *hw, ++ struct ieee80211_tx_rate *rate, ++ u8 band, int len) ++{ ++ struct ieee80211_rx_status stat = { ++ .band = band, ++ }; ++ ++ if (rate->idx < 0 || !rate->count) ++ return 0; ++ ++ if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH) ++ stat.bw = RATE_INFO_BW_80; ++ else if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ++ stat.bw = RATE_INFO_BW_40; ++ else ++ stat.bw = RATE_INFO_BW_20; ++ ++ stat.enc_flags = 0; ++ if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) ++ stat.enc_flags |= RX_ENC_FLAG_SHORTPRE; ++ if (rate->flags & IEEE80211_TX_RC_SHORT_GI) ++ stat.enc_flags |= RX_ENC_FLAG_SHORT_GI; ++ ++ stat.rate_idx = rate->idx; ++ if (rate->flags & IEEE80211_TX_RC_VHT_MCS) { ++ stat.encoding = RX_ENC_VHT; ++ stat.rate_idx = ieee80211_rate_get_vht_mcs(rate); ++ stat.nss = ieee80211_rate_get_vht_nss(rate); ++ } else if (rate->flags & IEEE80211_TX_RC_MCS) { ++ stat.encoding = RX_ENC_HT; ++ } else { ++ stat.encoding = RX_ENC_LEGACY; ++ } ++ ++ return ieee80211_calc_rx_airtime(hw, &stat, len); ++} ++ ++u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw, ++ struct ieee80211_tx_info *info, ++ int len) ++{ ++ u32 duration = 0; ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(info->status.rates); i++) { ++ struct ieee80211_tx_rate *rate = &info->status.rates[i]; ++ u32 cur_duration; ++ ++ cur_duration = ieee80211_calc_tx_airtime_rate(hw, rate, ++ info->band, len); ++ if (!cur_duration) ++ break; ++ ++ duration += cur_duration * rate->count; ++ } ++ ++ return duration; ++} ++EXPORT_SYMBOL_GPL(ieee80211_calc_tx_airtime); ++ ++u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ struct ieee80211_sta *pubsta, ++ int len) ++{ ++ struct ieee80211_supported_band *sband; ++ struct ieee80211_chanctx_conf *conf; ++ int rateidx, shift = 0; ++ bool cck, short_pream; ++ u32 basic_rates; ++ u8 band = 0; ++ u16 rate; ++ ++ len += 38; /* Ethernet header length */ ++ ++ conf = rcu_dereference(vif->chanctx_conf); ++ if (conf) { ++ band = conf->def.chan->band; ++ shift = ieee80211_chandef_get_shift(&conf->def); ++ } ++ ++ if (pubsta) { ++ struct sta_info *sta = container_of(pubsta, struct sta_info, ++ sta); ++ ++ return ieee80211_calc_tx_airtime_rate(hw, ++ &sta->tx_stats.last_rate, ++ band, len); ++ } ++ ++ if (!conf) ++ return 0; ++ ++ /* No station to get latest rate from, so calculate the worst-case ++ * duration using the lowest configured basic rate. ++ */ ++ sband = hw->wiphy->bands[band]; ++ ++ basic_rates = vif->bss_conf.basic_rates; ++ short_pream = vif->bss_conf.use_short_preamble; ++ ++ rateidx = basic_rates ? ffs(basic_rates) - 1 : 0; ++ rate = sband->bitrates[rateidx].bitrate << shift; ++ cck = sband->bitrates[rateidx].flags & IEEE80211_RATE_MANDATORY_B; ++ ++ return ieee80211_calc_legacy_rate_duration(rate, short_pream, cck, len); ++} +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -2253,6 +2253,10 @@ const char *ieee80211_get_reason_code_st + + extern const struct ethtool_ops ieee80211_ethtool_ops; + ++u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ struct ieee80211_sta *pubsta, ++ int len); + #ifdef CPTCFG_MAC80211_NOINLINE + #define debug_noinline noinline + #else diff --git a/package/kernel/mac80211/patches/subsys/310-mac80211-Implement-Airtime-based-Queue-Limit-AQL.patch b/package/kernel/mac80211/patches/subsys/310-mac80211-Implement-Airtime-based-Queue-Limit-AQL.patch new file mode 100644 index 0000000000..4eb5eb63a2 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/310-mac80211-Implement-Airtime-based-Queue-Limit-AQL.patch @@ -0,0 +1,446 @@ +From: Kan Yan +Date: Mon, 18 Nov 2019 22:06:09 -0800 +Subject: [PATCH] mac80211: Implement Airtime-based Queue Limit (AQL) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In order for the Fq_CoDel algorithm integrated in mac80211 layer to operate +effectively to control excessive queueing latency, the CoDel algorithm +requires an accurate measure of how long packets stays in the queue, AKA +sojourn time. The sojourn time measured at the mac80211 layer doesn't +include queueing latency in the lower layer (firmware/hardware) and CoDel +expects lower layer to have a short queue. However, most 802.11ac chipsets +offload tasks such TX aggregation to firmware or hardware, thus have a deep +lower layer queue. + +Without a mechanism to control the lower layer queue size, packets only +stay in mac80211 layer transiently before being sent to firmware queue. +As a result, the sojourn time measured by CoDel in the mac80211 layer is +almost always lower than the CoDel latency target, hence CoDel does little +to control the latency, even when the lower layer queue causes excessive +latency. + +The Byte Queue Limits (BQL) mechanism is commonly used to address the +similar issue with wired network interface. However, this method cannot be +applied directly to the wireless network interface. "Bytes" is not a +suitable measure of queue depth in the wireless network, as the data rate +can vary dramatically from station to station in the same network, from a +few Mbps to over Gbps. + +This patch implements an Airtime-based Queue Limit (AQL) to make CoDel work +effectively with wireless drivers that utilized firmware/hardware +offloading. AQL allows each txq to release just enough packets to the lower +layer to form 1-2 large aggregations to keep hardware fully utilized and +retains the rest of the frames in mac80211 layer to be controlled by the +CoDel algorithm. + +Signed-off-by: Kan Yan +[ Toke: Keep API to set pending airtime internal, fix nits in commit msg ] +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20191119060610.76681-4-kyan@google.com +Signed-off-by: Johannes Berg +--- + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -2603,6 +2603,13 @@ enum wiphy_params_flags { + + #define IEEE80211_DEFAULT_AIRTIME_WEIGHT 256 + ++/* The per TXQ device queue limit in airtime */ ++#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L 5000 ++#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H 12000 ++ ++/* The per interface airtime threshold to switch to lower queue limit */ ++#define IEEE80211_AQL_THRESHOLD 24000 ++ + /** + * struct cfg80211_pmksa - PMK Security Association + * +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -5559,6 +5559,18 @@ void ieee80211_sta_register_airtime(stru + u32 tx_airtime, u32 rx_airtime); + + /** ++ * ieee80211_txq_airtime_check - check if a txq can send frame to device ++ * ++ * @hw: pointer obtained from ieee80211_alloc_hw() ++ * @txq: pointer obtained from station or virtual interface ++ * ++ * Return true if the AQL's airtime limit has not been reached and the txq can ++ * continue to send more packets to the device. Otherwise return false. ++ */ ++bool ++ieee80211_txq_airtime_check(struct ieee80211_hw *hw, struct ieee80211_txq *txq); ++ ++/** + * ieee80211_iter_keys - iterate keys programmed into the device + * @hw: pointer obtained from ieee80211_alloc_hw() + * @vif: virtual interface to iterate, may be %NULL for all +--- a/net/mac80211/debugfs.c ++++ b/net/mac80211/debugfs.c +@@ -148,6 +148,87 @@ static const struct file_operations aqm_ + .llseek = default_llseek, + }; + ++static ssize_t aql_txq_limit_read(struct file *file, ++ char __user *user_buf, ++ size_t count, ++ loff_t *ppos) ++{ ++ struct ieee80211_local *local = file->private_data; ++ char buf[400]; ++ int len = 0; ++ ++ len = scnprintf(buf, sizeof(buf), ++ "AC AQL limit low AQL limit high\n" ++ "VO %u %u\n" ++ "VI %u %u\n" ++ "BE %u %u\n" ++ "BK %u %u\n", ++ local->aql_txq_limit_low[IEEE80211_AC_VO], ++ local->aql_txq_limit_high[IEEE80211_AC_VO], ++ local->aql_txq_limit_low[IEEE80211_AC_VI], ++ local->aql_txq_limit_high[IEEE80211_AC_VI], ++ local->aql_txq_limit_low[IEEE80211_AC_BE], ++ local->aql_txq_limit_high[IEEE80211_AC_BE], ++ local->aql_txq_limit_low[IEEE80211_AC_BK], ++ local->aql_txq_limit_high[IEEE80211_AC_BK]); ++ return simple_read_from_buffer(user_buf, count, ppos, ++ buf, len); ++} ++ ++static ssize_t aql_txq_limit_write(struct file *file, ++ const char __user *user_buf, ++ size_t count, ++ loff_t *ppos) ++{ ++ struct ieee80211_local *local = file->private_data; ++ char buf[100]; ++ size_t len; ++ u32 ac, q_limit_low, q_limit_high, q_limit_low_old, q_limit_high_old; ++ struct sta_info *sta; ++ ++ if (count > sizeof(buf)) ++ return -EINVAL; ++ ++ if (copy_from_user(buf, user_buf, count)) ++ return -EFAULT; ++ ++ buf[sizeof(buf) - 1] = 0; ++ len = strlen(buf); ++ if (len > 0 && buf[len - 1] == '\n') ++ buf[len - 1] = 0; ++ ++ if (sscanf(buf, "%u %u %u", &ac, &q_limit_low, &q_limit_high) != 3) ++ return -EINVAL; ++ ++ if (ac >= IEEE80211_NUM_ACS) ++ return -EINVAL; ++ ++ q_limit_low_old = local->aql_txq_limit_low[ac]; ++ q_limit_high_old = local->aql_txq_limit_high[ac]; ++ ++ local->aql_txq_limit_low[ac] = q_limit_low; ++ local->aql_txq_limit_high[ac] = q_limit_high; ++ ++ mutex_lock(&local->sta_mtx); ++ list_for_each_entry(sta, &local->sta_list, list) { ++ /* If a sta has customized queue limits, keep it */ ++ if (sta->airtime[ac].aql_limit_low == q_limit_low_old && ++ sta->airtime[ac].aql_limit_high == q_limit_high_old) { ++ sta->airtime[ac].aql_limit_low = q_limit_low; ++ sta->airtime[ac].aql_limit_high = q_limit_high; ++ } ++ } ++ mutex_unlock(&local->sta_mtx); ++ return count; ++} ++ ++static const struct file_operations aql_txq_limit_ops = { ++ .write = aql_txq_limit_write, ++ .read = aql_txq_limit_read, ++ .open = simple_open, ++ .llseek = default_llseek, ++}; ++ + static ssize_t force_tx_status_read(struct file *file, + char __user *user_buf, + size_t count, +@@ -441,6 +522,10 @@ void debugfs_hw_add(struct ieee80211_loc + debugfs_create_u16("airtime_flags", 0600, + phyd, &local->airtime_flags); + ++ DEBUGFS_ADD(aql_txq_limit); ++ debugfs_create_u32("aql_threshold", 0600, ++ phyd, &local->aql_threshold); ++ + statsd = debugfs_create_dir("statistics", phyd); + + /* if the dir failed, don't put all the other things into the root! */ +--- a/net/mac80211/debugfs_sta.c ++++ b/net/mac80211/debugfs_sta.c +@@ -197,10 +197,12 @@ static ssize_t sta_airtime_read(struct f + { + struct sta_info *sta = file->private_data; + struct ieee80211_local *local = sta->sdata->local; +- size_t bufsz = 200; ++ size_t bufsz = 400; + char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; + u64 rx_airtime = 0, tx_airtime = 0; + s64 deficit[IEEE80211_NUM_ACS]; ++ u32 q_depth[IEEE80211_NUM_ACS]; ++ u32 q_limit_l[IEEE80211_NUM_ACS], q_limit_h[IEEE80211_NUM_ACS]; + ssize_t rv; + int ac; + +@@ -212,19 +214,22 @@ static ssize_t sta_airtime_read(struct f + rx_airtime += sta->airtime[ac].rx_airtime; + tx_airtime += sta->airtime[ac].tx_airtime; + deficit[ac] = sta->airtime[ac].deficit; ++ q_limit_l[ac] = sta->airtime[ac].aql_limit_low; ++ q_limit_h[ac] = sta->airtime[ac].aql_limit_high; + spin_unlock_bh(&local->active_txq_lock[ac]); ++ q_depth[ac] = atomic_read(&sta->airtime[ac].aql_tx_pending); + } + + p += scnprintf(p, bufsz + buf - p, + "RX: %llu us\nTX: %llu us\nWeight: %u\n" +- "Deficit: VO: %lld us VI: %lld us BE: %lld us BK: %lld us\n", +- rx_airtime, +- tx_airtime, +- sta->airtime_weight, +- deficit[0], +- deficit[1], +- deficit[2], +- deficit[3]); ++ "Deficit: VO: %lld us VI: %lld us BE: %lld us BK: %lld us\n" ++ "Q depth: VO: %u us VI: %u us BE: %u us BK: %u us\n" ++ "Q limit[low/high]: VO: %u/%u VI: %u/%u BE: %u/%u BK: %u/%u\n", ++ rx_airtime, tx_airtime, sta->airtime_weight, ++ deficit[0], deficit[1], deficit[2], deficit[3], ++ q_depth[0], q_depth[1], q_depth[2], q_depth[3], ++ q_limit_l[0], q_limit_h[0], q_limit_l[1], q_limit_h[1], ++ q_limit_l[2], q_limit_h[2], q_limit_l[3], q_limit_h[3]), + + rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); + kfree(buf); +@@ -236,7 +241,25 @@ static ssize_t sta_airtime_write(struct + { + struct sta_info *sta = file->private_data; + struct ieee80211_local *local = sta->sdata->local; +- int ac; ++ u32 ac, q_limit_l, q_limit_h; ++ char _buf[100] = {}, *buf = _buf; ++ ++ if (count > sizeof(_buf)) ++ return -EINVAL; ++ ++ if (copy_from_user(buf, userbuf, count)) ++ return -EFAULT; ++ ++ buf[sizeof(_buf) - 1] = '\0'; ++ if (sscanf(buf, "queue limit %u %u %u", &ac, &q_limit_l, &q_limit_h) ++ != 3) ++ return -EINVAL; ++ ++ if (ac >= IEEE80211_NUM_ACS) ++ return -EINVAL; ++ ++ sta->airtime[ac].aql_limit_low = q_limit_l; ++ sta->airtime[ac].aql_limit_high = q_limit_h; + + for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { + spin_lock_bh(&local->active_txq_lock[ac]); +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -1142,6 +1142,10 @@ struct ieee80211_local { + u16 schedule_round[IEEE80211_NUM_ACS]; + + u16 airtime_flags; ++ u32 aql_txq_limit_low[IEEE80211_NUM_ACS]; ++ u32 aql_txq_limit_high[IEEE80211_NUM_ACS]; ++ u32 aql_threshold; ++ atomic_t aql_total_pending_airtime; + + const struct ieee80211_ops *ops; + +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -669,8 +669,16 @@ struct ieee80211_hw *ieee80211_alloc_hw_ + for (i = 0; i < IEEE80211_NUM_ACS; i++) { + INIT_LIST_HEAD(&local->active_txqs[i]); + spin_lock_init(&local->active_txq_lock[i]); ++ local->aql_txq_limit_low[i] = IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L; ++ local->aql_txq_limit_high[i] = ++ IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H; + } +- local->airtime_flags = AIRTIME_USE_TX | AIRTIME_USE_RX; ++ ++ local->airtime_flags = AIRTIME_USE_TX | ++ AIRTIME_USE_RX | ++ AIRTIME_USE_AQL; ++ local->aql_threshold = IEEE80211_AQL_THRESHOLD; ++ atomic_set(&local->aql_total_pending_airtime, 0); + + INIT_LIST_HEAD(&local->chanctx_list); + mutex_init(&local->chanctx_mtx); +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -411,6 +411,9 @@ struct sta_info *sta_info_alloc(struct i + skb_queue_head_init(&sta->ps_tx_buf[i]); + skb_queue_head_init(&sta->tx_filtered[i]); + sta->airtime[i].deficit = sta->airtime_weight; ++ atomic_set(&sta->airtime[i].aql_tx_pending, 0); ++ sta->airtime[i].aql_limit_low = local->aql_txq_limit_low[i]; ++ sta->airtime[i].aql_limit_high = local->aql_txq_limit_high[i]; + } + + for (i = 0; i < IEEE80211_NUM_TIDS; i++) +@@ -1908,6 +1911,41 @@ void ieee80211_sta_register_airtime(stru + } + EXPORT_SYMBOL(ieee80211_sta_register_airtime); + ++void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local, ++ struct sta_info *sta, u8 ac, ++ u16 tx_airtime, bool tx_completed) ++{ ++ int tx_pending; ++ ++ if (!tx_completed) { ++ if (sta) ++ atomic_add(tx_airtime, ++ &sta->airtime[ac].aql_tx_pending); ++ ++ atomic_add(tx_airtime, &local->aql_total_pending_airtime); ++ return; ++ } ++ ++ if (sta) { ++ tx_pending = atomic_sub_return(tx_airtime, ++ &sta->airtime[ac].aql_tx_pending); ++ if (WARN_ONCE(tx_pending < 0, ++ "STA %pM AC %d txq pending airtime underflow: %u, %u", ++ sta->addr, ac, tx_pending, tx_airtime)) ++ atomic_cmpxchg(&sta->airtime[ac].aql_tx_pending, ++ tx_pending, 0); ++ } ++ ++ tx_pending = atomic_sub_return(tx_airtime, ++ &local->aql_total_pending_airtime); ++ if (WARN_ONCE(tx_pending < 0, ++ "Device %s AC %d pending airtime underflow: %u, %u", ++ wiphy_name(local->hw.wiphy), ac, tx_pending, ++ tx_airtime)) ++ atomic_cmpxchg(&local->aql_total_pending_airtime, ++ tx_pending, 0); ++} ++ + int sta_info_move_state(struct sta_info *sta, + enum ieee80211_sta_state new_state) + { +--- a/net/mac80211/sta_info.h ++++ b/net/mac80211/sta_info.h +@@ -127,13 +127,21 @@ enum ieee80211_agg_stop_reason { + /* Debugfs flags to enable/disable use of RX/TX airtime in scheduler */ + #define AIRTIME_USE_TX BIT(0) + #define AIRTIME_USE_RX BIT(1) ++#define AIRTIME_USE_AQL BIT(2) + + struct airtime_info { + u64 rx_airtime; + u64 tx_airtime; + s64 deficit; ++ atomic_t aql_tx_pending; /* Estimated airtime for frames pending */ ++ u32 aql_limit_low; ++ u32 aql_limit_high; + }; + ++void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local, ++ struct sta_info *sta, u8 ac, ++ u16 tx_airtime, bool tx_completed); ++ + struct sta_info; + + /** +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -3667,7 +3667,8 @@ struct ieee80211_txq *ieee80211_next_txq + { + struct ieee80211_local *local = hw_to_local(hw); + struct ieee80211_txq *ret = NULL; +- struct txq_info *txqi = NULL; ++ struct txq_info *txqi = NULL, *head = NULL; ++ bool found_eligible_txq = false; + + spin_lock_bh(&local->active_txq_lock[ac]); + +@@ -3678,13 +3679,30 @@ struct ieee80211_txq *ieee80211_next_txq + if (!txqi) + goto out; + ++ if (txqi == head) { ++ if (!found_eligible_txq) ++ goto out; ++ else ++ found_eligible_txq = false; ++ } ++ ++ if (!head) ++ head = txqi; ++ + if (txqi->txq.sta) { + struct sta_info *sta = container_of(txqi->txq.sta, +- struct sta_info, sta); ++ struct sta_info, sta); ++ bool aql_check = ieee80211_txq_airtime_check(hw, &txqi->txq); ++ s64 deficit = sta->airtime[txqi->txq.ac].deficit; + +- if (sta->airtime[txqi->txq.ac].deficit < 0) { ++ if (aql_check) ++ found_eligible_txq = true; ++ ++ if (deficit < 0) + sta->airtime[txqi->txq.ac].deficit += + sta->airtime_weight; ++ ++ if (deficit < 0 || !aql_check) { + list_move_tail(&txqi->schedule_order, + &local->active_txqs[txqi->txq.ac]); + goto begin; +@@ -3738,6 +3756,33 @@ void __ieee80211_schedule_txq(struct iee + } + EXPORT_SYMBOL(__ieee80211_schedule_txq); + ++bool ieee80211_txq_airtime_check(struct ieee80211_hw *hw, ++ struct ieee80211_txq *txq) ++{ ++ struct sta_info *sta; ++ struct ieee80211_local *local = hw_to_local(hw); ++ ++ if (!(local->airtime_flags & AIRTIME_USE_AQL)) ++ return true; ++ ++ if (!txq->sta) ++ return true; ++ ++ sta = container_of(txq->sta, struct sta_info, sta); ++ if (atomic_read(&sta->airtime[txq->ac].aql_tx_pending) < ++ sta->airtime[txq->ac].aql_limit_low) ++ return true; ++ ++ if (atomic_read(&local->aql_total_pending_airtime) < ++ local->aql_threshold && ++ atomic_read(&sta->airtime[txq->ac].aql_tx_pending) < ++ sta->airtime[txq->ac].aql_limit_high) ++ return true; ++ ++ return false; ++} ++EXPORT_SYMBOL(ieee80211_txq_airtime_check); ++ + bool ieee80211_txq_may_transmit(struct ieee80211_hw *hw, + struct ieee80211_txq *txq) + { diff --git a/package/kernel/mac80211/patches/subsys/311-mac80211-Use-Airtime-based-Queue-Limits-AQL-on-packe.patch b/package/kernel/mac80211/patches/subsys/311-mac80211-Use-Airtime-based-Queue-Limits-AQL-on-packe.patch new file mode 100644 index 0000000000..3069d624f5 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/311-mac80211-Use-Airtime-based-Queue-Limits-AQL-on-packe.patch @@ -0,0 +1,146 @@ +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Mon, 18 Nov 2019 22:06:10 -0800 +Subject: [PATCH] mac80211: Use Airtime-based Queue Limits (AQL) on packet + dequeue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous commit added the ability to throttle stations when they queue +too much airtime in the hardware. This commit enables the functionality by +calculating the expected airtime usage of each packet that is dequeued from +the TXQs in mac80211, and accounting that as pending airtime. + +The estimated airtime for each skb is stored in the tx_info, so we can +subtract the same amount from the running total when the skb is freed or +recycled. The throttling mechanism relies on this accounting to be +accurate (i.e., that we are not freeing skbs without subtracting any +airtime they were accounted for), so we put the subtraction into +ieee80211_report_used_skb(). As an optimisation, we also subtract the +airtime on regular TX completion, zeroing out the value stored in the +packet afterwards, to avoid having to do an expensive lookup of the station +from the packet data on every packet. + +This patch does *not* include any mechanism to wake a throttled TXQ again, +on the assumption that this will happen anyway as a side effect of whatever +freed the skb (most commonly a TX completion). + +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20191119060610.76681-5-kyan@google.com +Signed-off-by: Johannes Berg +--- + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -1060,6 +1060,22 @@ struct ieee80211_tx_info { + }; + }; + ++static inline u16 ++ieee80211_info_set_tx_time_est(struct ieee80211_tx_info *info, u16 tx_time_est) ++{ ++ /* We only have 10 bits in tx_time_est, so store airtime ++ * in increments of 4us and clamp the maximum to 2**12-1 ++ */ ++ info->tx_time_est = min_t(u16, tx_time_est, 4095) >> 2; ++ return info->tx_time_est << 2; ++} ++ ++static inline u16 ++ieee80211_info_get_tx_time_est(struct ieee80211_tx_info *info) ++{ ++ return info->tx_time_est << 2; ++} ++ + /** + * struct ieee80211_tx_status - extended tx staus info for rate control + * +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -670,12 +670,26 @@ static void ieee80211_report_used_skb(st + struct sk_buff *skb, bool dropped) + { + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); ++ u16 tx_time_est = ieee80211_info_get_tx_time_est(info); + struct ieee80211_hdr *hdr = (void *)skb->data; + bool acked = info->flags & IEEE80211_TX_STAT_ACK; + + if (dropped) + acked = false; + ++ if (tx_time_est) { ++ struct sta_info *sta; ++ ++ rcu_read_lock(); ++ ++ sta = sta_info_get_by_addrs(local, hdr->addr1, hdr->addr2); ++ ieee80211_sta_update_pending_airtime(local, sta, ++ skb_get_queue_mapping(skb), ++ tx_time_est, ++ true); ++ rcu_read_unlock(); ++ } ++ + if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) { + struct ieee80211_sub_if_data *sdata; + +@@ -885,6 +899,7 @@ static void __ieee80211_tx_status(struct + struct ieee80211_bar *bar; + int shift = 0; + int tid = IEEE80211_NUM_TIDS; ++ u16 tx_time_est; + + rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count); + +@@ -996,6 +1011,17 @@ static void __ieee80211_tx_status(struct + ieee80211_sta_register_airtime(&sta->sta, tid, + info->status.tx_time, 0); + ++ if ((tx_time_est = ieee80211_info_get_tx_time_est(info)) > 0) { ++ /* Do this here to avoid the expensive lookup of the sta ++ * in ieee80211_report_used_skb(). ++ */ ++ ieee80211_sta_update_pending_airtime(local, sta, ++ skb_get_queue_mapping(skb), ++ tx_time_est, ++ true); ++ ieee80211_info_set_tx_time_est(info, 0); ++ } ++ + if (ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) { + if (acked) { + if (sta->status_stats.lost_packets) +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -3544,6 +3544,9 @@ struct sk_buff *ieee80211_tx_dequeue(str + + WARN_ON_ONCE(softirq_count() == 0); + ++ if (!ieee80211_txq_airtime_check(hw, txq)) ++ return NULL; ++ + begin: + spin_lock_bh(&fq->lock); + +@@ -3654,6 +3657,21 @@ begin: + } + + IEEE80211_SKB_CB(skb)->control.vif = vif; ++ ++ if (local->airtime_flags & AIRTIME_USE_AQL) { ++ u32 airtime; ++ ++ airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta, ++ skb->len); ++ if (airtime) { ++ airtime = ieee80211_info_set_tx_time_est(info, airtime); ++ ieee80211_sta_update_pending_airtime(local, tx.sta, ++ txq->ac, ++ airtime, ++ false); ++ } ++ } ++ + return skb; + + out: diff --git a/package/kernel/mac80211/patches/subsys/312-mac80211-airtime-Fix-an-off-by-one-in-ieee80211_calc.patch b/package/kernel/mac80211/patches/subsys/312-mac80211-airtime-Fix-an-off-by-one-in-ieee80211_calc.patch new file mode 100644 index 0000000000..4ff496c12e --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/312-mac80211-airtime-Fix-an-off-by-one-in-ieee80211_calc.patch @@ -0,0 +1,31 @@ +From: Dan Carpenter +Date: Tue, 26 Nov 2019 15:09:39 +0300 +Subject: [PATCH] mac80211: airtime: Fix an off by one in + ieee80211_calc_rx_airtime() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This code was copied from mt76 and inherited an off by one bug from +there. The > should be >= so that we don't read one element beyond +the end of the array. + +Fixes: db3e1c40cf2f ("mac80211: Import airtime calculation code from mt76") +Reported-by: Toke Høiland-Jørgensen +Signed-off-by: Dan Carpenter +Acked-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20191126120910.ftr4t7me3by32aiz@kili.mountain +Signed-off-by: Johannes Berg +--- + +--- a/net/mac80211/airtime.c ++++ b/net/mac80211/airtime.c +@@ -442,7 +442,7 @@ u32 ieee80211_calc_rx_airtime(struct iee + return 0; + + sband = hw->wiphy->bands[status->band]; +- if (!sband || status->rate_idx > sband->n_bitrates) ++ if (!sband || status->rate_idx >= sband->n_bitrates) + return 0; + + rate = &sband->bitrates[status->rate_idx]; diff --git a/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch b/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch new file mode 100644 index 0000000000..3803b37922 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch @@ -0,0 +1,253 @@ +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Thu, 12 Dec 2019 12:14:37 +0100 +Subject: [PATCH] mac80211: Turn AQL into an NL80211_EXT_FEATURE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Instead of just having an airtime flag in debugfs, turn AQL into a proper +NL80211_EXT_FEATURE, so drivers can turn it on when they are ready, and so +we also expose the presence of the feature to userspace. + +This also has the effect of flipping the default, so drivers have to opt in +to using AQL instead of getting it by default with TXQs. To keep +functionality the same as pre-patch, we set this feature for ath10k (which +is where it is needed the most). + +While we're at it, split out the debugfs interface so AQL gets its own +per-station debugfs file instead of using the 'airtime' file. + +[Johannes:] +This effectively disables AQL for iwlwifi, where it fixes a number of +issues: + * TSO in iwlwifi is causing underflows and associated warnings in AQL + * HE (802.11ax) rates aren't reported properly so at HE rates, AQL could + never have a valid estimate (it'd use 6 Mbps instead of up to 2400!) + +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20191212111437.224294-1-toke@redhat.com +Fixes: 3ace10f5b5ad ("mac80211: Implement Airtime-based Queue Limit (AQL)") +Signed-off-by: Johannes Berg +--- + +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -8868,6 +8868,7 @@ int ath10k_mac_register(struct ath10k *a + wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VHT_IBSS); + wiphy_ext_feature_set(ar->hw->wiphy, + NL80211_EXT_FEATURE_SET_SCAN_DWELL); ++ wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL); + + if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar->wmi.svc_map) || + test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, ar->wmi.svc_map)) +--- a/include/uapi/linux/nl80211.h ++++ b/include/uapi/linux/nl80211.h +@@ -5484,6 +5484,10 @@ enum nl80211_feature_flags { + * @NL80211_EXT_FEATURE_SAE_OFFLOAD: Device wants to do SAE authentication in + * station mode (SAE password is passed as part of the connect command). + * ++ * @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL) ++ * feature, which prevents bufferbloat by using the expected transmission ++ * time to limit the amount of data buffered in the hardware. ++ * + * @NUM_NL80211_EXT_FEATURES: number of extended features. + * @MAX_NL80211_EXT_FEATURES: highest extended feature index. + */ +@@ -5529,6 +5533,8 @@ enum nl80211_ext_feature_index { + NL80211_EXT_FEATURE_EXT_KEY_ID, + NL80211_EXT_FEATURE_STA_TX_PWR, + NL80211_EXT_FEATURE_SAE_OFFLOAD, ++ NL80211_EXT_FEATURE_VLAN_OFFLOAD, ++ NL80211_EXT_FEATURE_AQL, + + /* add new features before the definition below */ + NUM_NL80211_EXT_FEATURES, +--- a/net/mac80211/debugfs_sta.c ++++ b/net/mac80211/debugfs_sta.c +@@ -201,8 +201,6 @@ static ssize_t sta_airtime_read(struct f + char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; + u64 rx_airtime = 0, tx_airtime = 0; + s64 deficit[IEEE80211_NUM_ACS]; +- u32 q_depth[IEEE80211_NUM_ACS]; +- u32 q_limit_l[IEEE80211_NUM_ACS], q_limit_h[IEEE80211_NUM_ACS]; + ssize_t rv; + int ac; + +@@ -214,6 +212,56 @@ static ssize_t sta_airtime_read(struct f + rx_airtime += sta->airtime[ac].rx_airtime; + tx_airtime += sta->airtime[ac].tx_airtime; + deficit[ac] = sta->airtime[ac].deficit; ++ spin_unlock_bh(&local->active_txq_lock[ac]); ++ } ++ ++ p += scnprintf(p, bufsz + buf - p, ++ "RX: %llu us\nTX: %llu us\nWeight: %u\n" ++ "Deficit: VO: %lld us VI: %lld us BE: %lld us BK: %lld us\n", ++ rx_airtime, tx_airtime, sta->airtime_weight, ++ deficit[0], deficit[1], deficit[2], deficit[3]); ++ ++ rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); ++ kfree(buf); ++ return rv; ++} ++ ++static ssize_t sta_airtime_write(struct file *file, const char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ struct sta_info *sta = file->private_data; ++ struct ieee80211_local *local = sta->sdata->local; ++ int ac; ++ ++ for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { ++ spin_lock_bh(&local->active_txq_lock[ac]); ++ sta->airtime[ac].rx_airtime = 0; ++ sta->airtime[ac].tx_airtime = 0; ++ sta->airtime[ac].deficit = sta->airtime_weight; ++ spin_unlock_bh(&local->active_txq_lock[ac]); ++ } ++ ++ return count; ++} ++STA_OPS_RW(airtime); ++ ++static ssize_t sta_aql_read(struct file *file, char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ struct sta_info *sta = file->private_data; ++ struct ieee80211_local *local = sta->sdata->local; ++ size_t bufsz = 400; ++ char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; ++ u32 q_depth[IEEE80211_NUM_ACS]; ++ u32 q_limit_l[IEEE80211_NUM_ACS], q_limit_h[IEEE80211_NUM_ACS]; ++ ssize_t rv; ++ int ac; ++ ++ if (!buf) ++ return -ENOMEM; ++ ++ for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { ++ spin_lock_bh(&local->active_txq_lock[ac]); + q_limit_l[ac] = sta->airtime[ac].aql_limit_low; + q_limit_h[ac] = sta->airtime[ac].aql_limit_high; + spin_unlock_bh(&local->active_txq_lock[ac]); +@@ -221,12 +269,8 @@ static ssize_t sta_airtime_read(struct f + } + + p += scnprintf(p, bufsz + buf - p, +- "RX: %llu us\nTX: %llu us\nWeight: %u\n" +- "Deficit: VO: %lld us VI: %lld us BE: %lld us BK: %lld us\n" + "Q depth: VO: %u us VI: %u us BE: %u us BK: %u us\n" + "Q limit[low/high]: VO: %u/%u VI: %u/%u BE: %u/%u BK: %u/%u\n", +- rx_airtime, tx_airtime, sta->airtime_weight, +- deficit[0], deficit[1], deficit[2], deficit[3], + q_depth[0], q_depth[1], q_depth[2], q_depth[3], + q_limit_l[0], q_limit_h[0], q_limit_l[1], q_limit_h[1], + q_limit_l[2], q_limit_h[2], q_limit_l[3], q_limit_h[3]), +@@ -236,11 +280,10 @@ static ssize_t sta_airtime_read(struct f + return rv; + } + +-static ssize_t sta_airtime_write(struct file *file, const char __user *userbuf, ++static ssize_t sta_aql_write(struct file *file, const char __user *userbuf, + size_t count, loff_t *ppos) + { + struct sta_info *sta = file->private_data; +- struct ieee80211_local *local = sta->sdata->local; + u32 ac, q_limit_l, q_limit_h; + char _buf[100] = {}, *buf = _buf; + +@@ -251,7 +294,7 @@ static ssize_t sta_airtime_write(struct + return -EFAULT; + + buf[sizeof(_buf) - 1] = '\0'; +- if (sscanf(buf, "queue limit %u %u %u", &ac, &q_limit_l, &q_limit_h) ++ if (sscanf(buf, "limit %u %u %u", &ac, &q_limit_l, &q_limit_h) + != 3) + return -EINVAL; + +@@ -261,17 +304,10 @@ static ssize_t sta_airtime_write(struct + sta->airtime[ac].aql_limit_low = q_limit_l; + sta->airtime[ac].aql_limit_high = q_limit_h; + +- for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { +- spin_lock_bh(&local->active_txq_lock[ac]); +- sta->airtime[ac].rx_airtime = 0; +- sta->airtime[ac].tx_airtime = 0; +- sta->airtime[ac].deficit = sta->airtime_weight; +- spin_unlock_bh(&local->active_txq_lock[ac]); +- } +- + return count; + } +-STA_OPS_RW(airtime); ++STA_OPS_RW(aql); ++ + + static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf, + size_t count, loff_t *ppos) +@@ -1001,6 +1037,10 @@ void ieee80211_sta_debugfs_add(struct st + NL80211_EXT_FEATURE_AIRTIME_FAIRNESS)) + DEBUGFS_ADD(airtime); + ++ if (wiphy_ext_feature_isset(local->hw.wiphy, ++ NL80211_EXT_FEATURE_AQL)) ++ DEBUGFS_ADD(aql); ++ + if (sizeof(sta->driver_buffered_tids) == sizeof(u32)) + debugfs_create_x32("driver_buffered_tids", 0400, + sta->debugfs_dir, +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -674,9 +674,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_ + IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H; + } + +- local->airtime_flags = AIRTIME_USE_TX | +- AIRTIME_USE_RX | +- AIRTIME_USE_AQL; ++ local->airtime_flags = AIRTIME_USE_TX | AIRTIME_USE_RX; + local->aql_threshold = IEEE80211_AQL_THRESHOLD; + atomic_set(&local->aql_total_pending_airtime, 0); + +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -1917,6 +1917,9 @@ void ieee80211_sta_update_pending_airtim + { + int tx_pending; + ++ if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) ++ return; ++ + if (!tx_completed) { + if (sta) + atomic_add(tx_airtime, +--- a/net/mac80211/sta_info.h ++++ b/net/mac80211/sta_info.h +@@ -127,7 +127,6 @@ enum ieee80211_agg_stop_reason { + /* Debugfs flags to enable/disable use of RX/TX airtime in scheduler */ + #define AIRTIME_USE_TX BIT(0) + #define AIRTIME_USE_RX BIT(1) +-#define AIRTIME_USE_AQL BIT(2) + + struct airtime_info { + u64 rx_airtime; +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -3658,7 +3658,7 @@ begin: + + IEEE80211_SKB_CB(skb)->control.vif = vif; + +- if (local->airtime_flags & AIRTIME_USE_AQL) { ++ if (wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) { + u32 airtime; + + airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta, +@@ -3780,7 +3780,7 @@ bool ieee80211_txq_airtime_check(struct + struct sta_info *sta; + struct ieee80211_local *local = hw_to_local(hw); + +- if (!(local->airtime_flags & AIRTIME_USE_AQL)) ++ if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) + return true; + + if (!txq->sta) diff --git a/package/kernel/mac80211/patches/subsys/353-mac80211-use-more-bits-for-ack_frame_id.patch b/package/kernel/mac80211/patches/subsys/353-mac80211-use-more-bits-for-ack_frame_id.patch new file mode 100644 index 0000000000..ea9168e9be --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/353-mac80211-use-more-bits-for-ack_frame_id.patch @@ -0,0 +1,70 @@ +From: Johannes Berg +Date: Wed, 15 Jan 2020 12:25:50 +0100 +Subject: [PATCH] mac80211: use more bits for ack_frame_id +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It turns out that this wasn't a good idea, I hit a test failure in +hwsim due to this. That particular failure was easily worked around, +but it raised questions: if an AP needs to, for example, send action +frames to each connected station, the current limit is nowhere near +enough (especially if those stations are sleeping and the frames are +queued for a while.) + +Shuffle around some bits to make more room for ack_frame_id to allow +up to 8192 queued up frames, that's enough for queueing 4 frames to +each connected station, even at the maximum of 2007 stations on a +single AP. + +We take the bits from band (which currently only 2 but I leave 3 in +case we add another band) and from the hw_queue, which can only need +4 since it has a limit of 16 queues. + +Fixes: 6912daed05e1 ("mac80211: Shrink the size of ack_frame_id to make room for tx_time_est") +Signed-off-by: Johannes Berg +Acked-by: Toke Høiland-Jørgensen +--- + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -1004,12 +1004,11 @@ ieee80211_rate_get_vht_nss(const struct + struct ieee80211_tx_info { + /* common information */ + u32 flags; +- u8 band; +- +- u8 hw_queue; +- +- u16 ack_frame_id:6; +- u16 tx_time_est:10; ++ u32 band:3, ++ ack_frame_id:13, ++ hw_queue:4, ++ tx_time_est:10; ++ /* 2 free bits */ + + union { + struct { +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -3427,7 +3427,7 @@ int ieee80211_attach_ack_skb(struct ieee + + spin_lock_irqsave(&local->ack_status_lock, spin_flags); + id = idr_alloc(&local->ack_status_frames, ack_skb, +- 1, 0x40, GFP_ATOMIC); ++ 1, 0x2000, GFP_ATOMIC); + spin_unlock_irqrestore(&local->ack_status_lock, spin_flags); + + if (id < 0) { +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -2443,7 +2443,7 @@ static int ieee80211_store_ack_skb(struc + + spin_lock_irqsave(&local->ack_status_lock, flags); + id = idr_alloc(&local->ack_status_frames, ack_skb, +- 1, 0x40, GFP_ATOMIC); ++ 1, 0x2000, GFP_ATOMIC); + spin_unlock_irqrestore(&local->ack_status_lock, flags); + + if (id >= 0) { diff --git a/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch index 768cca6046..dcdfe20dc8 100644 --- a/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -3447,6 +3447,7 @@ struct cfg80211_update_owe_info { +@@ -3454,6 +3454,7 @@ struct cfg80211_update_owe_info { * (as advertised by the nl80211 feature flag.) * @get_tx_power: store the current TX power into the dbm variable; * return 0 if successful @@ -8,7 +8,7 @@ * * @set_wds_peer: set the WDS peer for a WDS interface * -@@ -3759,6 +3760,7 @@ struct cfg80211_ops { +@@ -3766,6 +3767,7 @@ struct cfg80211_ops { enum nl80211_tx_power_setting type, int mbm); int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev, int *dbm); @@ -18,7 +18,7 @@ const u8 *addr); --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1484,6 +1484,7 @@ enum ieee80211_smps_mode { +@@ -1501,6 +1501,7 @@ enum ieee80211_smps_mode { * * @power_level: requested transmit power (in dBm), backward compatibility * value only that is set to the minimum of all interfaces @@ -26,7 +26,7 @@ * * @chandef: the channel definition to tune to * @radar_enabled: whether radar detection is enabled -@@ -1504,6 +1505,7 @@ enum ieee80211_smps_mode { +@@ -1521,6 +1522,7 @@ enum ieee80211_smps_mode { struct ieee80211_conf { u32 flags; int power_level, dynamic_ps_timeout; @@ -87,7 +87,7 @@ CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1372,6 +1372,7 @@ struct ieee80211_local { +@@ -1376,6 +1376,7 @@ struct ieee80211_local { int dynamic_ps_forced_timeout; int user_power_level; /* in dBm, for all interfaces */ From b3e86cbb4f54d92eb4d145c62a7165067c6a7612 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 28 Jan 2020 16:27:53 +0100 Subject: [PATCH 468/480] hostapd: add back support for passing CSA events from sta/mesh to AP interfaces Fixes handling CSA when using AP+STA or AP+Mesh This change was accidentally dropped in commit 167028b75 ("hostapd: Update to version 2.9 (2019-08-08)") Signed-off-by: Felix Fietkau --- .../hostapd/patches/370-ap_sta_support.patch | 129 ++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/package/network/services/hostapd/patches/370-ap_sta_support.patch b/package/network/services/hostapd/patches/370-ap_sta_support.patch index f8d4206529..a861ce4153 100644 --- a/package/network/services/hostapd/patches/370-ap_sta_support.patch +++ b/package/network/services/hostapd/patches/370-ap_sta_support.patch @@ -272,3 +272,132 @@ hapd->beacon_set_done = 1; if (ieee802_11_build_ap_params(hapd, ¶ms) < 0) +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -4184,6 +4184,60 @@ static void wpas_event_assoc_reject(stru + } + + ++static void ++supplicant_ch_switch_started(struct wpa_supplicant *wpa_s, ++ union wpa_event_data *data) ++{ ++ char buf[256]; ++ size_t len = sizeof(buf); ++ char *cmd = NULL; ++ int width = 20; ++ int ret; ++ ++ if (!wpa_s->hostapd) ++ return; ++ ++ wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CHANNEL_SWITCH ++ "count=%d freq=%d ht_enabled=%d ch_offset=%d ch_width=%s cf1=%d cf2=%d", ++ data->ch_switch.count, ++ data->ch_switch.freq, ++ data->ch_switch.ht_enabled, ++ data->ch_switch.ch_offset, ++ channel_width_to_string(data->ch_switch.ch_width), ++ data->ch_switch.cf1, ++ data->ch_switch.cf2); ++ ++ switch (data->ch_switch.ch_width) { ++ case CHAN_WIDTH_20_NOHT: ++ case CHAN_WIDTH_20: ++ width = 20; ++ break; ++ case CHAN_WIDTH_40: ++ width = 40; ++ break; ++ case CHAN_WIDTH_80: ++ width = 80; ++ break; ++ case CHAN_WIDTH_160: ++ case CHAN_WIDTH_80P80: ++ width = 160; ++ break; ++ } ++ ++ asprintf(&cmd, "CHAN_SWITCH %d %d sec_channel_offset=%d center_freq1=%d center_freq2=%d, bandwidth=%d auto-ht\n", ++ data->ch_switch.count - 1, ++ data->ch_switch.freq, ++ data->ch_switch.ch_offset, ++ data->ch_switch.cf1, ++ data->ch_switch.cf2, ++ width); ++ ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL); ++ free(cmd); ++ ++ if (ret < 0) ++ wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n"); ++} ++ + void supplicant_event(void *ctx, enum wpa_event_type event, + union wpa_event_data *data) + { +@@ -4485,8 +4539,10 @@ void supplicant_event(void *ctx, enum wp + channel_width_to_string(data->ch_switch.ch_width), + data->ch_switch.cf1, + data->ch_switch.cf2); +- if (event == EVENT_CH_SWITCH_STARTED) ++ if (event == EVENT_CH_SWITCH_STARTED) { ++ supplicant_ch_switch_started(wpa_s, data); + break; ++ } + + wpa_s->assoc_freq = data->ch_switch.freq; + wpa_s->current_ssid->frequency = data->ch_switch.freq; +--- a/src/drivers/driver.h ++++ b/src/drivers/driver.h +@@ -5478,6 +5478,7 @@ union wpa_event_data { + + /** + * struct ch_switch ++ * @count: Count until channel switch activates + * @freq: Frequency of new channel in MHz + * @ht_enabled: Whether this is an HT channel + * @ch_offset: Secondary channel offset +@@ -5486,6 +5487,7 @@ union wpa_event_data { + * @cf2: Center frequency 2 + */ + struct ch_switch { ++ int count; + int freq; + int ht_enabled; + int ch_offset; +--- a/src/drivers/driver_nl80211_event.c ++++ b/src/drivers/driver_nl80211_event.c +@@ -536,7 +536,7 @@ static void mlme_event_ch_switch(struct + struct nlattr *ifindex, struct nlattr *freq, + struct nlattr *type, struct nlattr *bw, + struct nlattr *cf1, struct nlattr *cf2, +- int finished) ++ struct nlattr *count, int finished) + { + struct i802_bss *bss; + union wpa_event_data data; +@@ -595,6 +595,8 @@ static void mlme_event_ch_switch(struct + data.ch_switch.cf1 = nla_get_u32(cf1); + if (cf2) + data.ch_switch.cf2 = nla_get_u32(cf2); ++ if (count) ++ data.ch_switch.count = nla_get_u32(count); + + if (finished) + bss->freq = data.ch_switch.freq; +@@ -2544,6 +2546,7 @@ static void do_process_drv_event(struct + tb[NL80211_ATTR_CHANNEL_WIDTH], + tb[NL80211_ATTR_CENTER_FREQ1], + tb[NL80211_ATTR_CENTER_FREQ2], ++ tb[NL80211_ATTR_CH_SWITCH_COUNT], + 0); + break; + case NL80211_CMD_CH_SWITCH_NOTIFY: +@@ -2554,6 +2557,7 @@ static void do_process_drv_event(struct + tb[NL80211_ATTR_CHANNEL_WIDTH], + tb[NL80211_ATTR_CENTER_FREQ1], + tb[NL80211_ATTR_CENTER_FREQ2], ++ NULL, + 1); + break; + case NL80211_CMD_DISCONNECT: From b30f2281cce6649567e0194d203f06517d173115 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 6 Jan 2020 00:31:24 +0100 Subject: [PATCH 469/480] ramips: add support for GL.iNet microuter-N300 The GL.iNet microuter-N300 (internally referred as MT300N-v4) is a pocket-size travel router. It is essentially identical to the VIXMINI (internally referred as MT300N-v3) but with double the RAM and SPI-flash. Additionally, set the label-mac for both the VIXMINI as well as the microuter-N300. Hardware -------- SoC: MediaTek MT7628NN RAM: 128M DDR2 FLASH: 16M LED: Power - WLAN BTN: Reset UART: 115200 8N1 TX and RX are labled on the board as pads next to the SoC Installation via web-interface ------------------------------ 1. Visit the web-interface at 192.168.8.1 Note: The ethernet port is by default WAN. So you need to connect to the router via WiFi 2. Navigate to the Update tab on the left side. 3. Select "Local Update" 4. Upload the OpenWrt sysupgrade image. Note: Make sure you select not to preserve the configuration. Installation via U-Boot ----------------------- 1. Hold down the reset button while powering on the device. Wait for the LED to flash 5 times. 2. Assign yourself a static IPv4 in 192.168.1.0/24 3. Upload the OpenWrt sysupgrade image at 192.168.1.1. Signed-off-by: David Bauer --- .../dts/mt7628an_glinet_microuter-n300.dts | 21 ++++ .../ramips/dts/mt7628an_glinet_vixmini.dts | 99 ++--------------- .../mt7628an_glinet_vixmini_microuter.dtsi | 104 ++++++++++++++++++ target/linux/ramips/image/mt76x8.mk | 8 ++ .../mt76x8/base-files/etc/board.d/02_network | 1 + 5 files changed, 142 insertions(+), 91 deletions(-) create mode 100644 target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts create mode 100644 target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi diff --git a/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts b/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts new file mode 100644 index 0000000000..5a965f96bc --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7628an_glinet_vixmini_microuter.dtsi" + +/ { + compatible = "glinet,microuter-n300", "mediatek,mt7628an-soc"; + model = "GL.iNet microuter-N300"; +}; + +&led_power_blue { + label = "microuter-n300:blue:power"; +}; + +&led_wlan_white { + label = "microuter-n300:white:wlan"; +}; + +&firmware_part { + reg = <0x50000 0xfb0000>; +}; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts index 0935ec869b..770998a87a 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts @@ -1,104 +1,21 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7628an.dtsi" +#include "mt7628an_glinet_vixmini_microuter.dtsi" -#include -#include - -/{ +/ { compatible = "glinet,vixmini", "mediatek,mt7628an-soc"; model = "GL.iNet VIXMINI"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - chosen { - bootargs = "console=ttyS0,115200"; - }; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "vixmini:blue:power"; - default-state = "on"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; - }; - - wlan { - label = "vixmini:white:wlan"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; }; -&state_default { - gpio { - ralink,group = "wdt", "wled_an", "p1led_an"; - ralink,function = "gpio"; - }; +&led_power_blue { + label = "vixmini:blue:power"; }; -ðernet { - mtd-mac-address = <&factory 0x4>; +&led_wlan_white { + label = "vixmini:white:wlan"; }; -&wmac { - status = "okay"; -}; - -&spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; - }; +&firmware_part { + reg = <0x50000 0x7b0000>; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi new file mode 100644 index 0000000000..b88f9e7356 --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi @@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7628an.dtsi" + +#include +#include + +/ { + aliases { + led-boot = &led_power_blue; + led-failsafe = &led_power_blue; + led-running = &led_power_blue; + led-upgrade = &led_power_blue; + + label-mac-device = ðernet; + }; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + leds { + compatible = "gpio-leds"; + + led_power_blue: power { + /* Name is set device-specific */ + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; + + led_wlan_white: wlan { + /* Name is set device-specific */ + gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&state_default { + gpio { + ralink,group = "wdt", "wled_an", "p1led_an"; + ralink,function = "gpio"; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&wmac { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + + partitions: partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + /* + * Firmware-partition size is model-specific + * due to different flash sizes. + */ + firmware_part: partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + }; + }; + }; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 5ddeec14d5..37cac84229 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -70,6 +70,14 @@ define Device/glinet_gl-mt300n-v2 endef TARGET_DEVICES += glinet_gl-mt300n-v2 +define Device/glinet_microuter-n300 + IMAGE_SIZE := 16064k + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := microuter-N300 + SUPPORTED_DEVICES += microuter-n300 +endef +TARGET_DEVICES += glinet_microuter-n300 + define Device/glinet_vixmini IMAGE_SIZE := 7872k DEVICE_VENDOR := GL.iNet diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index b036eb76e6..259a257f16 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -33,6 +33,7 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan" "0:wan" "6@eth0" ;; + glinet,microuter-n300|\ glinet,vixmini) ucidef_add_switch "switch0" \ "0:lan" "6@eth0" From 4716c843d62a5a4c37e7886f54bcf446aa26e786 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 28 Jan 2020 21:19:16 +0100 Subject: [PATCH 470/480] ramips: fix NETGEAR R6260 EEPROM offset The EEPROM offset for the NETGEAR R6260 is incorrect, thus no valid calibration data is used. Fix this only for the NETGEAR R6260, as it's currently unknown whether or not other boards are affected. Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7621_netgear_r6260.dts | 8 ++++++++ target/linux/ramips/dts/mt7621_netgear_r6350.dts | 8 ++++++++ target/linux/ramips/dts/mt7621_netgear_r6850.dts | 8 ++++++++ target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi | 6 ++---- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_netgear_r6260.dts b/target/linux/ramips/dts/mt7621_netgear_r6260.dts index 8251fe595c..2f2dbb05f8 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6260.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6260.dts @@ -23,3 +23,11 @@ &led_wifi { label = "r6260:green:wifi"; }; + +&wifi2 { + mediatek,mtd-eeprom = <&factory 0x20000>; +}; + +&wifi5 { + mediatek,mtd-eeprom = <&factory 0x28000>; +}; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6350.dts b/target/linux/ramips/dts/mt7621_netgear_r6350.dts index c1e3a08897..3f730808dd 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6350.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6350.dts @@ -23,3 +23,11 @@ &led_wifi { label = "r6350:green:wifi"; }; + +&wifi2 { + mediatek,mtd-eeprom = <&factory 0x0>; +}; + +&wifi5 { + mediatek,mtd-eeprom = <&factory 0x8000>; +}; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6850.dts b/target/linux/ramips/dts/mt7621_netgear_r6850.dts index 5accbbdbd8..4ac1cd092a 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6850.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6850.dts @@ -23,3 +23,11 @@ &led_wifi { label = "r6850:green:wifi"; }; + +&wifi2 { + mediatek,mtd-eeprom = <&factory 0x0>; +}; + +&wifi5 { + mediatek,mtd-eeprom = <&factory 0x8000>; +}; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi index 52af14723e..03bfd7d442 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi @@ -78,19 +78,17 @@ }; &pcie0 { - wifi@0,0 { + wifi5: wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; ieee80211-freq-limit = <5000000 6000000>; }; }; &pcie1 { - wifi@0,0 { + wifi2: wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0>; ieee80211-freq-limit = <2400000 2500000>; }; }; From c69c20c6670081d1eaab000734d89de57eb64148 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 25 Jan 2020 14:27:10 +0100 Subject: [PATCH 471/480] opkg: update to latest Git HEAD 80d161e opkg: Fix -Wformat-overflow warning c09fe20 libopkg: fix skipping of leading whitespace when parsing checksums Fixes: CVE-2020-7982 Signed-off-by: Jo-Philipp Wich --- package/system/opkg/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index ed3cd5ebf4..b40d6b610a 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -14,9 +14,9 @@ PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git -PKG_SOURCE_DATE:=2019-06-14 -PKG_SOURCE_VERSION:=dcbc142e51f5f5f2fb9e4e44657e013d3c36a52b -PKG_MIRROR_HASH:=fca7e71dd06f0d5ee0af0d0a493d641d4d5d7e403d64c67879a462a020aa2299 +PKG_SOURCE_DATE:=2020-01-25 +PKG_SOURCE_VERSION:=c09fe2098718807ddbca13ee36e3e38801822946 +PKG_MIRROR_HASH:=b2fba519fb3bf2da2e325a33eee951b85c7c1886e48ebaac3892435a71ae33d5 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From b4d3110ac1f1f1962f812ac139c437837a448cff Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 8 Dec 2019 20:18:58 +0100 Subject: [PATCH 472/480] ath79: add support for GL.iNet 6408/6416 (GL.iNet V1) This ports the GL.iNet 6408/6416 from ar71xx. The GL-Connect GL.iNet v1 routers are basically a TP-Link TL-WR710N with more DRAM/Flash and console/GPIO header in the same small form-factor. Specifications: - SoC: Atheros AR9331 - CPU: 400 MHz - Flash: 8/16 MiB - RAM: 64 MiB - WiFi: 2.4 GHz b/g/n (SoC) - Ethernet: 2x 100M ports (LAN/WAN) - USB: 1x 2.0 The difference between 6408 and 6416 is just the flash size. It looks like only the 16 MiB version has been advertised, while the 6408 is a modified version. There are also 1-port versions sold by third parties. Installation: Install the sysupgrade image via stock firmware GUI or upload it via uboot (web-based). The device will be available at 192.168.1.1. Attention: In ar71xx, the same board name is used for both flash versions. So, please make sure you flash the correct ath79 image when upgrading. This has been device-tested on a GL.iNet 6416. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar9331_glinet_6408.dts | 45 +++++++++ target/linux/ath79/dts/ar9331_glinet_6416.dts | 45 +++++++++ .../linux/ath79/dts/ar9331_glinet_64xx.dtsi | 91 +++++++++++++++++++ .../generic/base-files/etc/board.d/01_leds | 4 + target/linux/ath79/image/generic.mk | 26 ++++++ 5 files changed, 211 insertions(+) create mode 100644 target/linux/ath79/dts/ar9331_glinet_6408.dts create mode 100644 target/linux/ath79/dts/ar9331_glinet_6416.dts create mode 100644 target/linux/ath79/dts/ar9331_glinet_64xx.dtsi diff --git a/target/linux/ath79/dts/ar9331_glinet_6408.dts b/target/linux/ath79/dts/ar9331_glinet_6408.dts new file mode 100644 index 0000000000..1215607469 --- /dev/null +++ b/target/linux/ath79/dts/ar9331_glinet_6408.dts @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9331_glinet_64xx.dtsi" + +/ { + model = "GL.iNet 6408"; + compatible = "glinet,6408", "qca,ar9331"; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + reg = <0x0 0x20000>; + label = "u-boot"; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + reg = <0x20000 0x7d0000>; + label = "firmware"; + }; + + art: partition@7f0000 { + reg = <0x7f0000 0x10000>; + label = "art"; + read-only; + }; + }; + }; +}; diff --git a/target/linux/ath79/dts/ar9331_glinet_6416.dts b/target/linux/ath79/dts/ar9331_glinet_6416.dts new file mode 100644 index 0000000000..5f10b6aada --- /dev/null +++ b/target/linux/ath79/dts/ar9331_glinet_6416.dts @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9331_glinet_64xx.dtsi" + +/ { + model = "GL.iNet 6416"; + compatible = "glinet,6416", "qca,ar9331"; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + reg = <0x0 0x20000>; + label = "u-boot"; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + reg = <0x20000 0xfd0000>; + label = "firmware"; + }; + + art: partition@ff0000 { + reg = <0xff0000 0x10000>; + label = "art"; + read-only; + }; + }; + }; +}; diff --git a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi new file mode 100644 index 0000000000..2fa970248a --- /dev/null +++ b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include +#include + +#include "ar9331.dtsi" + +/ { + aliases { + serial0 = &uart; + label-mac-device = &wmac; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + + wlan { + label = "gl-inet:red:wlan"; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; + }; + + lan { + label = "gl-inet:green:lan"; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + }; + }; + + reg_usb_vbus: reg_usb_vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + }; +}; + +ð0 { + status = "okay"; + + mtd-mac-address = <&uboot 0x1fc00>; + + gmac-config { + device = <&gmac>; + + switch-phy-addr-swap = <0>; + switch-phy-swap = <0>; + }; +}; + +ð1 { + status = "okay"; + + mtd-mac-address = <&uboot 0x1fc00>; +}; + +&gpio { + status = "okay"; +}; + +&uart { + status = "okay"; +}; + +&usb { + dr_mode = "host"; + vbus-supply = <®_usb_vbus>; + status = "okay"; +}; + +&usb_phy { + status = "okay"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&uboot 0x1fc00>; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index 1023ba7a39..43c685b81c 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -90,6 +90,10 @@ etactica,eg200) ucidef_set_led_netdev "lan" "LAN" "$boardname:red:eth0" "eth0" ucidef_set_led_oneshot "modbus" "Modbus" "$boardname:red:modbus" "100" "33" ;; +glinet,6408|\ +glinet,6416) + ucidef_set_led_netdev "lan" "LAN" "gl-inet:green:lan" "eth0" + ;; glinet,gl-ar150) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x02" diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 4f45b122ce..1bc7b2d68e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -567,6 +567,32 @@ define Device/etactica_eg200 endef TARGET_DEVICES += etactica_eg200 +define Device/glinet_6408 + $(Device/tplink-8mlzma) + SOC := ar9331 + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := 6408 + DEVICE_PACKAGES := kmod-usb2 + IMAGE_SIZE := 8000k + TPLINK_HWID := 0x08000001 + IMAGES := sysupgrade.bin + SUPPORTED_DEVICES += gl-inet +endef +TARGET_DEVICES += glinet_6408 + +define Device/glinet_6416 + $(Device/tplink-16mlzma) + SOC := ar9331 + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := 6416 + DEVICE_PACKAGES := kmod-usb2 + IMAGE_SIZE := 16192k + TPLINK_HWID := 0x08000001 + IMAGES := sysupgrade.bin + SUPPORTED_DEVICES += gl-inet +endef +TARGET_DEVICES += glinet_6416 + define Device/glinet_gl-ar150 SOC := ar9330 DEVICE_VENDOR := GL.iNet From 4ecd6510bf8877dcd07561045852726ffbab8814 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 29 Jan 2020 20:27:25 +0100 Subject: [PATCH 473/480] ramips: remove duplicate DEVICE_PACKAGES for TP-Link Archer C20i DEVICE_PACKAGES is specified twice for the same device. Remove the first (=older) assignment. Fixes: 40692f0fb55c ("ramips: mt7620: select only the matching mt76 driver") Signed-off-by: Adrian Schmutzler --- target/linux/ramips/image/mt7620.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 72310f9e7e..61f2c898f5 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -871,7 +871,6 @@ define Device/tplink_archer-c20i TPLINK_HWID := 0xc2000001 TPLINK_HWREV := 58 IMAGES += factory.bin - DEVICE_PACKAGES := kmod-mt76x0e DEVICE_MODEL := Archer C20i DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci SUPPORTED_DEVICES += c20i From 6015659e2bd825b92d06b117f5e4c74cccdd4a3f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 30 Jan 2020 11:31:26 +0200 Subject: [PATCH 474/480] kernel: add support for XTX xt25f128 SPI-NOR flash chips This fixes support for Teltonika RUT9xx which in recent versions of the device uses xt25f128b flash. Signed-off-by: Daniel Golle --- ...-nor-add-xtx-xt25f128a-and-xt25f128b.patch | 43 +++++++++++++++++++ ...-nor-add-xtx-xt25f128a-and-xt25f128b.patch | 43 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch create mode 100644 target/linux/generic/pending-4.19/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch diff --git a/target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch b/target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch new file mode 100644 index 0000000000..fb9cd9c330 --- /dev/null +++ b/target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch @@ -0,0 +1,43 @@ +From patchwork Thu Jan 30 08:55:12 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Daniel Golle +X-Patchwork-Id: 1231340 +Date: Thu, 30 Jan 2020 10:55:12 +0200 +From: Daniel Golle +To: linux-mtd@lists.infradead.org +Subject: [PATCH] mtd: spi-nor: Add support for xt25f128 chips +Message-ID: <20200130085512.GA243814@makrotopia.org> +MIME-Version: 1.0 +Content-Disposition: inline +List-Subscribe: , + +Cc: Eitan Cohen , Piotr Dymacz , + Tudor Ambarus +Sender: "linux-mtd" +Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org + +Add XT25F128A and XT25F128B made by XTX Technology (Shenzhen) Limited. +Both chips supports dual and quad read and uniform 4K-byte erase. +Verified on Teltonika RUT955 which comes with XT25F128B in recent +versions of the device. + +Signed-off-by: Daniel Golle +--- + drivers/mtd/spi-nor/spi-nor.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -1198,6 +1198,10 @@ static const struct flash_info spi_nor_i + /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ + { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ ++ /* XTX Technology (Shenzhen) Limited */ ++ { "xt25f128a", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { }, + }; + diff --git a/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch b/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch new file mode 100644 index 0000000000..6ae1fee989 --- /dev/null +++ b/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-xtx-xt25f128a-and-xt25f128b.patch @@ -0,0 +1,43 @@ +From patchwork Thu Jan 30 08:55:12 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Daniel Golle +X-Patchwork-Id: 1231340 +Date: Thu, 30 Jan 2020 10:55:12 +0200 +From: Daniel Golle +To: linux-mtd@lists.infradead.org +Subject: [PATCH] mtd: spi-nor: Add support for xt25f128 chips +Message-ID: <20200130085512.GA243814@makrotopia.org> +MIME-Version: 1.0 +Content-Disposition: inline +List-Subscribe: , + +Cc: Eitan Cohen , Piotr Dymacz , + Tudor Ambarus +Sender: "linux-mtd" +Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org + +Add XT25F128A and XT25F128B made by XTX Technology (Shenzhen) Limited. +Both chips supports dual and quad read and uniform 4K-byte erase. +Verified on Teltonika RUT955 which comes with XT25F128B in recent +versions of the device. + +Signed-off-by: Daniel Golle +--- + drivers/mtd/spi-nor/spi-nor.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -1273,6 +1273,10 @@ static const struct flash_info spi_nor_i + /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ + { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ ++ /* XTX Technology (Shenzhen) Limited */ ++ { "xt25f128a", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { }, + }; + From 0cf889db00f81575568b19cb470e97aad7765f32 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 30 Jan 2020 12:37:28 +0100 Subject: [PATCH 475/480] Revert "ramips: fix NETGEAR R6260 EEPROM offset" This reverts commit 4716c843d62a5a4c37e7886f54bcf446aa26e786. Netgear seems to use different partition layouts on the R6260, which would require us to dynamically detect the position of (at least) the factory partition. Revert this fix to avoid breaking existing installations until a better solution has been worked out. Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7621_netgear_r6260.dts | 8 -------- target/linux/ramips/dts/mt7621_netgear_r6350.dts | 8 -------- target/linux/ramips/dts/mt7621_netgear_r6850.dts | 8 -------- target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi | 6 ++++-- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_netgear_r6260.dts b/target/linux/ramips/dts/mt7621_netgear_r6260.dts index 2f2dbb05f8..8251fe595c 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6260.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6260.dts @@ -23,11 +23,3 @@ &led_wifi { label = "r6260:green:wifi"; }; - -&wifi2 { - mediatek,mtd-eeprom = <&factory 0x20000>; -}; - -&wifi5 { - mediatek,mtd-eeprom = <&factory 0x28000>; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6350.dts b/target/linux/ramips/dts/mt7621_netgear_r6350.dts index 3f730808dd..c1e3a08897 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6350.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6350.dts @@ -23,11 +23,3 @@ &led_wifi { label = "r6350:green:wifi"; }; - -&wifi2 { - mediatek,mtd-eeprom = <&factory 0x0>; -}; - -&wifi5 { - mediatek,mtd-eeprom = <&factory 0x8000>; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6850.dts b/target/linux/ramips/dts/mt7621_netgear_r6850.dts index 4ac1cd092a..5accbbdbd8 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6850.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6850.dts @@ -23,11 +23,3 @@ &led_wifi { label = "r6850:green:wifi"; }; - -&wifi2 { - mediatek,mtd-eeprom = <&factory 0x0>; -}; - -&wifi5 { - mediatek,mtd-eeprom = <&factory 0x8000>; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi index 03bfd7d442..52af14723e 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi @@ -78,17 +78,19 @@ }; &pcie0 { - wifi5: wifi@0,0 { + wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; ieee80211-freq-limit = <5000000 6000000>; }; }; &pcie1 { - wifi2: wifi@0,0 { + wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0>; ieee80211-freq-limit = <2400000 2500000>; }; }; From 20eb45da4fc19c12ea2073471992eeaf9d602fa5 Mon Sep 17 00:00:00 2001 From: Jan Alexander Date: Wed, 29 Jan 2020 15:03:18 +0100 Subject: [PATCH 476/480] ramips: use tpt DTS trigger for TP-Link TL-MR3020 v3 and TL-WA801ND v5 This converts the TP-Link TL-MR3020v3 board to use the WLAN throughput LED trigger in order to react to all VAPs. It also moves the WLAN trigger config of the TP-Link TL-WA801NDv5 to the DTS and merges the now identical LAN LED configs. Verified these changes on a TL-MR3020v3. Signed-off-by: Jan Alexander [changed commit title and extended commit message] Signed-off-by: Adrian Schmutzler --- .../linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts | 1 + .../linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts | 1 + .../linux/ramips/mt76x8/base-files/etc/board.d/01_leds | 10 +++------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index fa69110d45..cf0f5eb796 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -61,6 +61,7 @@ wlan { label = "tl-mr3020-v3:green:wlan"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; wps { diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index d2cb271efb..7b9033202c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -48,6 +48,7 @@ wlan { label = "tl-wa801nd-v5:green:wlan"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; wps_red { diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds index 79f45ba545..877dbb60bd 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds @@ -64,9 +64,9 @@ tplink,archer-c50-v4) ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan2g" "phy0tpt" ucidef_set_led_wlan "wlan5g" "wlan5g" "$boardname:green:wlan5g" "phy1tpt" ;; -tplink,tl-mr3020-v3) - set_wifi_led "$boardname:green:wlan" - ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0" +tplink,tl-mr3020-v3|\ +tplink,tl-wa801nd-v5) + ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" ;; tplink,tl-mr3420-v5|\ tplink,tl-wr842n-v5) @@ -74,10 +74,6 @@ tplink,tl-wr842n-v5) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" ;; -tplink,tl-wa801nd-v5) - ucidef_set_led_wlan "wlan" "wlan" "$boardname:green:wlan" "phy0tpt" - ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" - ;; tplink,tl-wr840n-v4) ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" From 1ab81bf02d750c9a2a447dbf4fdb323921f291d7 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 30 Jan 2020 18:55:21 +0100 Subject: [PATCH 477/480] mediatek: mt7623: remove left-over fragments of mt7623a-rfb-emmc The image creation for the mt7623a-rfb-emmc has been removed during a patch refresh without specific comment. The corresponding base-files entries and DTS patches for 4.14 are still there. Since mt7623 is pretty dead and nobody has missed this device, let's just remove the rest. Fixes: 050da2107a7e ("mediatek: backport upstream mediatek patches") Signed-off-by: Adrian Schmutzler Acked-by: John Crispin --- .../mt7623/base-files/etc/board.d/02_network | 4 - .../mediatek/patches-4.14/0064-dts.patch | 462 ------------------ .../0227-arm-dts-Add-Unielec-U7623-DTS.patch | 4 +- 3 files changed, 2 insertions(+), 468 deletions(-) diff --git a/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network index 07fd63fba7..391b1ddc07 100755 --- a/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network @@ -9,10 +9,6 @@ mediatek_setup_interfaces() local board="$1" case $board in - mediatek,mt7623a-rfb-emmc) - ucidef_set_interface_lan "lan0 lan1 lan2 lan3" - ucidef_set_interface_wan eth1 - ;; bananapi,bpi-r2|\ unielec,u7623-02-emmc-512m) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" "wan" diff --git a/target/linux/mediatek/patches-4.14/0064-dts.patch b/target/linux/mediatek/patches-4.14/0064-dts.patch index a2f5000d4d..ec9adfbb48 100644 --- a/target/linux/mediatek/patches-4.14/0064-dts.patch +++ b/target/linux/mediatek/patches-4.14/0064-dts.patch @@ -115,468 +115,6 @@ &i2c0 { pinctrl-names = "default"; ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1061,6 +1061,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ - mt6580-evbp1.dtb \ - mt6589-aquaris5.dtb \ - mt6592-evb.dtb \ -+ mt7623a-rfb-emmc.dtb \ - mt7623n-rfb-nand.dtb \ - mt7623n-bananapi-bpi-r2.dtb \ - mt8127-moose.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts -@@ -0,0 +1,449 @@ -+/* -+ * Copyright 2017 Sean Wang -+ * -+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+ */ -+ -+/dts-v1/; -+#include -+#include "mt7623.dtsi" -+#include "mt6323.dtsi" -+ -+/ { -+ model = "MediaTek MT7623N NAND reference board"; -+ compatible = "mediatek,mt7623a-rfb-emmc", "mediatek,mt7623"; -+ -+ aliases { -+ serial2 = &uart2; -+ }; -+ -+ chosen { -+ bootargs = "earlyprintk block2mtd.block2mtd=/dev/mmcblk0,65536,eMMC,5 mtdparts=eMMC:256k(mbr)ro,512k(uboot)ro,256k(config)ro,256k(factory)ro,32M(kernel),32M(recovery),1024M(rootfs),2048M(usrdata),-(bmtpool) rootfstype=squashfs,jffs2"; -+ -+ stdout-path = "serial2:115200n8"; -+ }; -+ -+ memory { -+ reg = <0 0x80000000 0 0x20000000>; -+ }; -+ -+ cpus { -+ cpu@0 { -+ proc-supply = <&mt6323_vproc_reg>; -+ }; -+ -+ cpu@1 { -+ proc-supply = <&mt6323_vproc_reg>; -+ }; -+ -+ cpu@2 { -+ proc-supply = <&mt6323_vproc_reg>; -+ }; -+ -+ cpu@3 { -+ proc-supply = <&mt6323_vproc_reg>; -+ }; -+ }; -+ -+ memory@80000000 { -+ reg = <0 0x80000000 0 0x40000000>; -+ }; -+ -+ mt7530: switch@0 { -+ compatible = "mediatek,mt7530"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; -+}; -+ -+&crypto { -+ status = "okay"; -+}; -+ -+ð { -+ status = "okay"; -+ -+ gmac0: mac@0 { -+ compatible = "mediatek,eth-mac"; -+ reg = <0>; -+ phy-mode = "trgmii"; -+ -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ pause; -+ }; -+ }; -+ -+ gmac1: mac@1 { -+ compatible = "mediatek,eth-mac"; -+ reg = <1>; -+ phy-mode = "rgmiii-rxid"; -+ phy-handle = <&phy5>; -+ }; -+ -+ mdio: mdio-bus { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ phy5: ethernet-phy@5 { -+ reg = <5>; -+ phy-mode = "rgmii-rxid"; -+ }; -+ }; -+}; -+ -+&mt7530 { -+ compatible = "mediatek,mt7530"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0>; -+ pinctrl-names = "default"; -+ mediatek,mcm; -+ resets = <ðsys 2>; -+ reset-names = "mcm"; -+ core-supply = <&mt6323_vpa_reg>; -+ io-supply = <&mt6323_vemc3v3_reg>; -+ -+ dsa,mii-bus = <&mdio>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0>; -+ -+ port@0 { -+ reg = <0>; -+ label = "lan0"; -+ cpu = <&cpu_port0>; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ label = "lan1"; -+ cpu = <&cpu_port0>; -+ }; -+ -+ port@2 { -+ reg = <2>; -+ label = "lan2"; -+ cpu = <&cpu_port0>; -+ }; -+ -+ port@3 { -+ reg = <3>; -+ label = "lan3"; -+ cpu = <&cpu_port0>; -+ }; -+ -+ cpu_port0: port@6 { -+ reg = <6>; -+ label = "cpu"; -+ ethernet = <&gmac0>; -+ phy-mode = "trgmii"; -+ -+ fixed-link { -+ speed = <1000>; -+ full-duplex; -+ }; -+ }; -+ }; -+}; -+ -+&i2c0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c0_pins_a>; -+ status = "okay"; -+}; -+ -+&i2c1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins_a>; -+ status = "okay"; -+}; -+ -+&mmc0 { -+ pinctrl-names = "default", "state_uhs"; -+ pinctrl-0 = <&mmc0_pins_default>; -+ pinctrl-1 = <&mmc0_pins_uhs>; -+ status = "okay"; -+ bus-width = <8>; -+ max-frequency = <50000000>; -+ cap-mmc-highspeed; -+ vmmc-supply = <&mt6323_vemc3v3_reg>; -+ vqmmc-supply = <&mt6323_vio18_reg>; -+ non-removable; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default", "state_uhs"; -+ pinctrl-0 = <&mmc1_pins_default>; -+ pinctrl-1 = <&mmc1_pins_uhs>; -+ status = "okay"; -+ bus-width = <4>; -+ max-frequency = <50000000>; -+ cap-sd-highspeed; -+ cd-gpios = <&pio 261 0>; -+ vmmc-supply = <&mt6323_vmch_reg>; -+ vqmmc-supply = <&mt6323_vio18_reg>; -+}; -+ -+&pio { -+ cir_pins_a:cir@0 { -+ pins_cir { -+ pinmux = ; -+ bias-disable; -+ }; -+ }; -+ -+ i2c0_pins_a: i2c@0 { -+ pins_i2c0 { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ i2c1_pins_a: i2c@1 { -+ pin_i2c1 { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ i2s0_pins_a: i2s@0 { -+ pin_i2s0 { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ drive-strength = ; -+ bias-pull-down; -+ }; -+ }; -+ -+ i2s1_pins_a: i2s@1 { -+ pin_i2s1 { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ drive-strength = ; -+ bias-pull-down; -+ }; -+ }; -+ -+ mmc0_pins_default: mmc0default { -+ pins_cmd_dat { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ input-enable; -+ bias-pull-up; -+ }; -+ -+ pins_clk { -+ pinmux = ; -+ bias-pull-down; -+ }; -+ -+ pins_rst { -+ pinmux = ; -+ bias-pull-up; -+ }; -+ }; -+ -+ mmc0_pins_uhs: mmc0 { -+ pins_cmd_dat { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ input-enable; -+ drive-strength = ; -+ bias-pull-up = ; -+ }; -+ -+ pins_clk { -+ pinmux = ; -+ drive-strength = ; -+ bias-pull-down = ; -+ }; -+ -+ pins_rst { -+ pinmux = ; -+ bias-pull-up; -+ }; -+ }; -+ -+ mmc1_pins_default: mmc1default { -+ pins_cmd_dat { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ input-enable; -+ drive-strength = ; -+ bias-pull-up = ; -+ }; -+ -+ pins_clk { -+ pinmux = ; -+ bias-pull-down; -+ drive-strength = ; -+ }; -+ -+ pins_wp { -+ pinmux = ; -+ input-enable; -+ bias-pull-up; -+ }; -+ -+ pins_insert { -+ pinmux = ; -+ bias-pull-up; -+ }; -+ }; -+ -+ mmc1_pins_uhs: mmc1 { -+ pins_cmd_dat { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ input-enable; -+ drive-strength = ; -+ bias-pull-up = ; -+ }; -+ -+ pins_clk { -+ pinmux = ; -+ drive-strength = ; -+ bias-pull-down = ; -+ }; -+ }; -+ -+ pwm_pins_a: pwm@0 { -+ pins_pwm { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ }; -+ }; -+ -+ spi0_pins_a: spi@0 { -+ pins_spi { -+ pinmux = , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ uart0_pins_a: uart@0 { -+ pins_dat { -+ pinmux = , -+ ; -+ }; -+ }; -+ -+ uart1_pins_a: uart@1 { -+ pins_dat { -+ pinmux = , -+ ; -+ }; -+ }; -+}; -+ -+&pwm { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwm_pins_a>; -+ status = "okay"; -+}; -+ -+&pwrap { -+ mt6323 { -+ mt6323led: led { -+ compatible = "mediatek,mt6323-led"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ led@0 { -+ reg = <0>; -+ label = "bpi-r2:isink:green"; -+ default-state = "off"; -+ }; -+ -+ led@1 { -+ reg = <1>; -+ label = "bpi-r2:isink:red"; -+ default-state = "off"; -+ }; -+ -+ led@2 { -+ reg = <2>; -+ label = "bpi-r2:isink:blue"; -+ default-state = "off"; -+ }; -+ }; -+ }; -+}; -+ -+&spi0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi0_pins_a>; -+ status = "okay"; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pins_a>; -+ status = "disabled"; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins_a>; -+ status = "disabled"; -+}; -+ -+&uart2 { -+ status = "okay"; -+}; -+ -+&usb1 { -+ vusb33-supply = <&mt6323_vusb_reg>; -+ status = "okay"; -+}; -+ -+&usb2 { -+ vusb33-supply = <&mt6323_vusb_reg>; -+ status = "okay"; -+}; -+ -+&u3phy1 { -+ status = "okay"; -+}; -+ -+&u3phy2 { -+ status = "okay"; -+}; -+ --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -326,6 +326,7 @@ diff --git a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch index 46fc9abab9..cc3758119a 100644 --- a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch +++ b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch @@ -13,10 +13,10 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1062,6 +1062,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1061,6 +1061,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ + mt6580-evbp1.dtb \ mt6589-aquaris5.dtb \ mt6592-evb.dtb \ - mt7623a-rfb-emmc.dtb \ + mt7623a-unielec-u7623-02-emmc-512m.dtb \ mt7623n-rfb-nand.dtb \ mt7623n-bananapi-bpi-r2.dtb \ From c8190713cb69063db13c89f4041c71dc6c7b20d9 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 27 Jan 2020 14:15:56 +0100 Subject: [PATCH 478/480] ath79: harmonize ethernet-phy naming scheme A minority of ethernet-phy definitions seems to use numbers in label, name and reg property relatively random. This patch aligns their use to have the same numeric value for all of them. While at it, improve order of properties/add newlines for the ethX nodes where necessary. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts | 4 ++-- target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts | 4 ++-- target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 7 ++++--- target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi | 9 ++++++--- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 8 +++++--- target/linux/ath79/dts/qca9563_tplink_re450-v2.dts | 8 ++++++-- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts index 804b71170e..3e6dd2daea 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts @@ -110,7 +110,7 @@ &mdio0 { status = "okay"; - phy0: ethernet-phy@c { + phy12: ethernet-phy@c { reg = <0xc>; phy-mode = "mii"; }; @@ -122,7 +122,7 @@ phy-mode = "mii"; mtd-mac-address = <&uboot 0x1fc00>; - phy-handle = <&phy0>; + phy-handle = <&phy12>; }; &wmac { diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts index 6ac79b0c1e..eac2a4268a 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts @@ -17,7 +17,7 @@ phy4-mii-enable; phy-mask = <0x23>; - phy4: ethernet-phy@0 { + phy0: ethernet-phy@0 { reg = <0>; phy-mode = "mii"; }; @@ -27,7 +27,7 @@ status = "okay"; phy-mode = "mii"; - phy-handle = <&phy4>; + phy-handle = <&phy0>; gmac-config { device = <&gmac>; diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index a797750e7e..f802de271e 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -88,7 +88,7 @@ gpios = <&gpio 23 GPIO_ACTIVE_HIGH>, <&gpio 18 GPIO_ACTIVE_HIGH>; - phy0: ethernet-phy@4 { + phy4: ethernet-phy@4 { reg = <4>; phy-mode = "rgmii-rxid"; @@ -101,9 +101,10 @@ ð0 { status = "okay"; - mtd-mac-address = <&config 0x10008>; + phy-handle = <&phy4>; pll-data = <0x9e000000 0x80000101 0x80001313>; - phy-handle = <&phy0>; + + mtd-mac-address = <&config 0x10008>; gmac-config { device = <&gmac>; diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi index 17e172d547..8827990eb5 100644 --- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi @@ -93,7 +93,7 @@ #address-cells = <1>; #size-cells = <0>; - phy0: ethernet-phy@4 { + phy4: ethernet-phy@4 { reg = <4>; reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; @@ -167,13 +167,16 @@ ð0 { status = "okay"; - mtd-mac-address = <&info 0x8>; + + phy-handle = <&phy4>; pll-data = <0xa6000000 0x00000101 0x00001616>; - phy-handle = <&phy0>; + + mtd-mac-address = <&info 0x8>; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; mtd-mac-address-increment = <(-1)>; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 5a896d52bc..4ad65c31e8 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -200,8 +200,8 @@ &mdio0 { status = "okay"; - phy0: ethernet-phy@0 { - reg = <17>; + phy17: ethernet-phy@11 { + reg = <0x11>; phy-mode = "rgmii-id"; }; @@ -236,7 +236,8 @@ status = "okay"; pll-data = <0xa6000000 0x00000101 0x00001616>; - phy-handle = <&phy0>; + phy-handle = <&phy17>; + fixed-link { speed = <1000>; full-duplex; @@ -248,6 +249,7 @@ pll-data = <0x03000101 0x00000101 0x00001616>; phy-handle = <&phy1>; + fixed-link { speed = <1000>; full-duplex; diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts index 464be73449..28fefe224d 100644 --- a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts @@ -103,7 +103,7 @@ #address-cells = <1>; #size-cells = <0>; - phy0: ethernet-phy@4 { + phy4: ethernet-phy@4 { reg = <4>; device_type = "ethernet-phy"; reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>; @@ -125,6 +125,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -178,12 +179,15 @@ ð0 { status = "okay"; + + phy-handle = <&phy4>; + mtd-mac-address = <&info 0x8>; - phy-handle = <&phy0>; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; From 6c407fb5db02bc54de2098563c584509bec44432 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 27 Jan 2020 15:36:32 +0100 Subject: [PATCH 479/480] ath79: do not set inherited phy-mode/status properties again There are several cases where phy-mode and status properties are set again in DTS(I) files although those were set to the same values in parent DTSI files already. Remove those cases (and thus also stop their proliferation by copy/paste). Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7240.dtsi | 1 - target/linux/ath79/dts/ar7241.dtsi | 1 - target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts | 1 - target/linux/ath79/dts/ar9330.dtsi | 1 - target/linux/ath79/dts/ar9341.dtsi | 4 ---- target/linux/ath79/dts/ar9341_pcs_cr3000.dts | 6 ++---- target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts | 1 - target/linux/ath79/dts/qca953x.dtsi | 2 -- target/linux/ath79/dts/qca9561_avm_fritz4020.dts | 1 - target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 1 - target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi | 1 - target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi | 1 - target/linux/ath79/dts/qca956x.dtsi | 2 -- target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi | 1 - 14 files changed, 2 insertions(+), 22 deletions(-) diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 268c8780f4..5382a710f9 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -65,7 +65,6 @@ resets = <&rst 9>; reset-names = "mac"; - phy-mode = "mii"; phy-handle = <&swphy4>; }; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 8f0eb3b270..59fcd05f5e 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -46,7 +46,6 @@ resets = <&rst 9>; reset-names = "mac"; - phy-mode = "mii"; phy-handle = <&swphy4>; }; diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts index 3e6dd2daea..e55affdf20 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts @@ -119,7 +119,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; mtd-mac-address = <&uboot 0x1fc00>; phy-handle = <&phy12>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 64c135405b..042b70e0bb 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -170,7 +170,6 @@ resets = <&rst 9>; reset-names = "mac"; - phy-mode = "mii"; phy-handle = <&swphy4>; }; diff --git a/target/linux/ath79/dts/ar9341.dtsi b/target/linux/ath79/dts/ar9341.dtsi index a7c5ac6262..10161f32ac 100644 --- a/target/linux/ath79/dts/ar9341.dtsi +++ b/target/linux/ath79/dts/ar9341.dtsi @@ -17,10 +17,6 @@ interrupts = <2>; }; -ð0 { - phy-mode = "mii"; -}; - ð1 { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts index 222516f9b7..272b0909b5 100644 --- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts +++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts @@ -150,13 +150,11 @@ }; ð1 { - status = "okay"; - phy-handle = <&swphy4>; - mtd-mac-address = <&art 0x0>; - phy-mode = "gmii"; pll-data = <0x06000000 0x00000101 0x00001616>; + mtd-mac-address = <&art 0x0>; + gmac-config { device = <&gmac>; switch-phy-swap = <1>; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts index eac2a4268a..7ca61fe27a 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts @@ -26,7 +26,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&phy0>; gmac-config { diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index f127d4d01b..73a6ad91e5 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -231,8 +231,6 @@ reset-names = "mac"; resets = <&rst 9>; - - phy-mode = "mii"; }; &mdio1 { diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts index 6412252590..75cc5761ba 100644 --- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts +++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts @@ -153,7 +153,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy0>; gmac-config { diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts index f894fc8672..e7b30df81f 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts @@ -181,7 +181,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy4>; mtd-mac-address = <&info 0x8>; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi index 00cd413bd2..c8e4710b39 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi @@ -136,7 +136,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy0>; mtd-mac-address = <&mac 0x8>; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index cee30a13b6..9b51ebf689 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -88,7 +88,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy4>; mtd-mac-address = <&mac 0x8>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index ee645aa02f..03541b86fb 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -307,8 +307,6 @@ resets = <&rst 13>; reset-names = "mac"; - status = "disabled"; - fixed-link { speed = <1000>; full-duplex; diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi index fb5941657d..aeb5525308 100644 --- a/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi +++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr94x.dtsi @@ -73,7 +73,6 @@ ð0 { status = "okay"; - phy-mode = "mii"; phy-handle = <&swphy4>; mtd-mac-address = <&uboot 0x1fc00>; From 633c4304ad42d18d180ba65a264ba668de445d91 Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Wed, 18 Sep 2019 15:17:56 +0200 Subject: [PATCH 480/480] ath79: add support for Ubiquiti NanoStation Loco M (XW) This commit adds support for the NanoStation Loco M2/M5 XW devices on the ath79 target (support was long ago available on ar71xx). Specifications: - AR9342 SoC @ 535 MHz - 64 MB RAM - 8 MB SPI flash - 1x 10/100 Mbps Ethernet, 24 Vdc PoE-in - AR8032 switch - 2T2R 5 GHz radio, 22 dBm - 13 dBi built-in antenna - POWER/LAN green LEDs - 4x RSSI LEDs (red, orange, green, green) - UART (115200 8N1) on PCB Flashing via TFTP: - Use a pointy tool (e.g., pen cap, paper clip) and keep the reset button on the device or on the PoE supply pressed - Power on the device via PoE (keep reset button pressed) - Keep pressing until LEDs flash alternatively LED1+LED3 => LED2+LED4 => LED1+LED3, etc. - Release reset button - The device starts a TFTP server at 192.168.1.20 - Set a static IP on the computer (e.g., 192.168.1.21/24) - Upload via tftp the factory image: $ tftp 192.168.1.20 tftp> bin tftp> trace tftp> put openwrt-ath79-generic-xxxxx-ubnt_nanostation-loco-m-xw-squashfs-factory.bin Signed-off-by: Roger Pueyo Centelles --- .../dts/ar9342_ubnt_nanostation-loco-m-xw.dts | 29 +++++++++++++++++++ .../generic/base-files/etc/board.d/01_leds | 1 + .../generic/base-files/etc/board.d/02_network | 1 + target/linux/ath79/image/generic-ubnt.mk | 8 +++++ 4 files changed, 39 insertions(+) create mode 100644 target/linux/ath79/dts/ar9342_ubnt_nanostation-loco-m-xw.dts diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-loco-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-loco-m-xw.dts new file mode 100644 index 0000000000..8fb05eda24 --- /dev/null +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-loco-m-xw.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar9342_ubnt_xw.dtsi" + +/ { + compatible = "ubnt,nanostation-loco-m-xw", "ubnt,xw", "qca,ar9342"; + model = "Ubiquiti Nanostation Loco M (XW)"; +}; + +&mdio0 { + status = "okay"; + + phy-mask = <0x1>; + + phy1: ethernet-phy@1 { + reg = <1>; + phy-mode = "mii"; + }; +}; + +ð0 { + status = "okay"; + + phy-handle = <&phy1>; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index 43c685b81c..15a467ccca 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -236,6 +236,7 @@ trendnet,tew-823dru) ;; ubnt,bullet-m|\ ubnt,bullet-m-xw|\ +ubnt,nanostation-loco-m-xw|\ ubnt,nanostation-m|\ ubnt,nanostation-m-xw|\ ubnt,rocket-m) diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 15f2e18e0c..4630cf8447 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -46,6 +46,7 @@ ath79_setup_interfaces() ubnt,litebeam-ac-gen2|\ ubnt,nanobeam-ac|\ ubnt,nanostation-ac-loco|\ + ubnt,nanostation-loco-m-xw|\ ubnt,rocket-m|\ ubnt,unifiac-lite|\ ubnt,unifiac-lr|\ diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 49564201e2..ffae83eda5 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -179,6 +179,14 @@ define Device/ubnt_nanostation-ac-loco endef TARGET_DEVICES += ubnt_nanostation-ac-loco +define Device/ubnt_nanostation-loco-m-xw + $(Device/ubnt-xw) + DEVICE_MODEL := Nanostation Loco M + DEVICE_PACKAGES += rssileds + SUPPORTED_DEVICES += loco-m-xw +endef +TARGET_DEVICES += ubnt_nanostation-loco-m-xw + define Device/ubnt_nanostation-m $(Device/ubnt-xm) DEVICE_MODEL := Nanostation M